summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/emacs/files.texi2
-rw-r--r--doc/lispref/internals.texi3
-rw-r--r--lisp/emacs-lisp/regexp-opt.el10
-rw-r--r--lisp/ido.el15
-rw-r--r--lisp/net/tramp-sh.el6
-rw-r--r--lisp/textmodes/css-mode.el3
6 files changed, 27 insertions, 12 deletions
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index f902baee9c2..f0a11fde555 100644
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -779,7 +779,7 @@ visiting a file, Emacs records that the file is @dfn{locked} by you.
(It does this by creating a specially-named symbolic link@footnote{If
your file system does not support symbolic links, a regular file is
used.} with special contents in the same directory. @xref{File
-Locks,,, elisp} for more details.) Emacs removes the lock when you
+Locks,,, elisp}, for more details.) Emacs removes the lock when you
save the changes. The idea is that the file is locked whenever an
Emacs buffer visiting it has unsaved changes.
diff --git a/doc/lispref/internals.texi b/doc/lispref/internals.texi
index faaf26f4f7e..65752860bf6 100644
--- a/doc/lispref/internals.texi
+++ b/doc/lispref/internals.texi
@@ -724,7 +724,8 @@ less than 8.
@cindex interactive specification in primitives
@item interactive
This is an interactive specification, a string such as might be used
-as the argument of @code{interactive} in a Lisp function. In the case
+as the argument of @code{interactive} in a Lisp function
+(@pxref{Using Interactive}). In the case
of @code{or}, it is 0 (a null pointer), indicating that @code{or}
cannot be called interactively. A value of @code{""} indicates a
function that should receive no arguments when called interactively.
diff --git a/lisp/emacs-lisp/regexp-opt.el b/lisp/emacs-lisp/regexp-opt.el
index 3e05b6cb8c9..8de4959c10a 100644
--- a/lisp/emacs-lisp/regexp-opt.el
+++ b/lisp/emacs-lisp/regexp-opt.el
@@ -117,12 +117,12 @@ than that of a simplified version:
(defun simplified-regexp-opt (strings &optional paren)
(let ((parens
(cond ((stringp paren) (cons paren \"\\\\)\"))
- ((eq paren 'words) '(\"\\\\\\=<\\\\(\" . \"\\\\)\\\\>\"))
- ((eq paren 'symbols) '(\"\\\\_<\\\\(\" . \"\\\\)\\\\_>\"))
- ((null paren) '(\"\\\\(?:\" . \"\\\\)\"))
- (t '(\"\\\\(\" . \"\\\\)\")))))
+ ((eq paren \\='words) \\='(\"\\\\\\=<\\\\(\" . \"\\\\)\\\\>\"))
+ ((eq paren \\='symbols) \\='(\"\\\\_<\\\\(\" . \"\\\\)\\\\_>\"))
+ ((null paren) \\='(\"\\\\(?:\" . \"\\\\)\"))
+ (t \\='(\"\\\\(\" . \"\\\\)\")))))
(concat (car paren)
- (mapconcat 'regexp-quote strings \"\\\\|\")
+ (mapconcat \\='regexp-quote strings \"\\\\|\")
(cdr paren))))"
(save-match-data
;; Recurse on the sorted list.
diff --git a/lisp/ido.el b/lisp/ido.el
index 705e7dd6301..3b102e07c55 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -1242,6 +1242,9 @@ Only used if `ido-use-virtual-buffers' is non-nil.")
;; Dynamically bound in ido-read-internal.
(defvar ido-completing-read)
+;; If dynamically set when ido-exit is 'fallback, overrides fallback command.
+(defvar ido-fallback nil)
+
;;; FUNCTIONS
(defun ido-active (&optional merge)
@@ -2220,6 +2223,7 @@ If cursor is not at the end of the user input, move to end of input."
(run-hook-with-args 'ido-before-fallback-functions
(or fallback 'switch-to-buffer))
(call-interactively (or fallback 'switch-to-buffer)))
+ (setq ido-fallback nil)
(let* ((ido-context-switch-command switch-cmd)
(ido-current-directory nil)
(ido-directory-nonreadable nil)
@@ -2245,7 +2249,7 @@ If cursor is not at the end of the user input, move to end of input."
((eq ido-exit 'fallback)
(let ((read-buffer-function nil))
- (setq this-command (or fallback 'switch-to-buffer))
+ (setq this-command (or ido-fallback fallback 'switch-to-buffer))
(run-hook-with-args 'ido-before-fallback-functions this-command)
(call-interactively this-command)))
@@ -2341,6 +2345,7 @@ If cursor is not at the end of the user input, move to end of input."
;; Internal function for ido-find-file and friends
(unless item
(setq item 'file))
+ (setq ido-fallback nil)
(let ((ido-current-directory (ido-expand-directory default))
(ido-context-switch-command switch-cmd)
ido-directory-nonreadable ido-directory-too-big
@@ -2412,7 +2417,7 @@ If cursor is not at the end of the user input, move to end of input."
;; we don't want to change directory of current buffer.
(let ((default-directory ido-current-directory)
(read-file-name-function nil))
- (setq this-command (or fallback 'find-file))
+ (setq this-command (or ido-fallback fallback 'find-file))
(run-hook-with-args 'ido-before-fallback-functions this-command)
(call-interactively this-command)))
@@ -2821,13 +2826,15 @@ If no buffer or file exactly matching the prompt exists, maybe create a new one.
(setq ido-exit 'takeprompt)
(exit-minibuffer))
-(defun ido-fallback-command ()
- "Fallback to non-Ido version of current command."
+(defun ido-fallback-command (&optional fallback-command)
+ "Fallback to non-Ido version of current command.
+The optional FALLBACK-COMMAND argument indicates which command to run."
(interactive)
(let ((i (length ido-text)))
(while (> i 0)
(push (aref ido-text (setq i (1- i))) unread-command-events)))
(setq ido-exit 'fallback)
+ (setq ido-fallback fallback-command)
(exit-minibuffer))
(defun ido-enter-find-file ()
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 63b39a0378e..a400a3c5277 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -2037,7 +2037,9 @@ file names."
(unless (memq op '(copy rename))
(error "Unknown operation `%s', must be `copy' or `rename'" op))
- (if (file-directory-p filename)
+ (if (and
+ (file-directory-p filename)
+ (not (tramp-equal-remote filename newname)))
(progn
(copy-directory filename newname keep-date t)
(when (eq op 'rename) (delete-directory filename 'recursive)))
@@ -2200,6 +2202,8 @@ the uid and gid from FILENAME."
(localname2 (if t2 (file-remote-p newname 'localname) newname))
(prefix (file-remote-p (if t1 filename newname)))
cmd-result)
+ (when (and (eq op 'copy) (file-directory-p filename))
+ (setq cmd (concat cmd " -R")))
(cond
;; Both files are on a remote host, with same user.
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index 6d06dddadca..31ce638b316 100644
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -1583,6 +1583,9 @@ Use `\\[info-lookup-symbol]' to look up documentation of CSS properties, at-rule
pseudo-classes, and pseudo-elements on the Mozilla Developer
Network (MDN).
+Use `\\[fill-paragraph]' to reformat CSS declaration blocks. It can also
+be used to fill comments.
+
\\{css-mode-map}"
(setq-local font-lock-defaults css-font-lock-defaults)
(setq-local comment-start "/*")