diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-10-23 09:39:11 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-10-23 09:39:11 -0700 |
| commit | 5aa41f775e1e69dba7c6f2b2a8d0334ca9c2cfdb (patch) | |
| tree | c0bff44180b6b35e3d690a1a385d006ea8ba8adb /lisp/dired-aux.el | |
| parent | 5c5bed72a6b2963a28443f70c8c5c8e510b81f26 (diff) | |
| parent | 2efd40076c8977aaf54d7478db96e5dbf623f37d (diff) | |
| download | emacs-5aa41f775e1e69dba7c6f2b2a8d0334ca9c2cfdb.tar.gz emacs-5aa41f775e1e69dba7c6f2b2a8d0334ca9c2cfdb.tar.bz2 emacs-5aa41f775e1e69dba7c6f2b2a8d0334ca9c2cfdb.zip | |
Merge from origin/emacs-26
2efd400 (origin/emacs-26) Correct typo in GNU ELPA url
6239016 * doc/misc/dired-x.texi (Omitting Variables): Fix wording. (B...
1531bca Fix help-form binding in dired-create-files
cf79327 Fix a pasto in a Gnus doc string
a4e40f6 ; * doc/emacs/files.texi (Reverting): Improve wording in last...
f632ecb Update revert-buffer documentation
eb67689 * lisp/mail/smtpmail.el (smtpmail-send-queued-mail): Load fil...
433e364 ; * etc/NEWS: Announce that emacs-module.h is now installed.
# Conflicts:
# lisp/mail/smtpmail.el
Diffstat (limited to 'lisp/dired-aux.el')
| -rw-r--r-- | lisp/dired-aux.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el index 90bfa096b08..72c16da63f8 100644 --- a/lisp/dired-aux.el +++ b/lisp/dired-aux.el @@ -1738,7 +1738,7 @@ or with the current marker character if MARKER-CHAR is t." (let* ((overwrite (file-exists-p to)) (dired-overwrite-confirmed ; for dired-handle-overwrite (and overwrite - (let ((help-form '(format-message "\ + (let ((help-form (format-message "\ Type SPC or `y' to overwrite file `%s', DEL or `n' to skip to next, ESC or `q' to not overwrite any of the remaining files, |