summaryrefslogtreecommitdiff
path: root/doc/emacs
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2017-12-12 19:43:33 -0800
committerGlenn Morris <rgm@gnu.org>2017-12-12 19:43:33 -0800
commit0beba8d16419ac592dd3dd7af7c177d80d490c4d (patch)
treed515a266d3593f934abfe43b82fd4703816b69ac /doc/emacs
parent92ca51cc5e9d30818f5abf60a5a13f08f2ea7e96 (diff)
parentb0369d0536cd510e8b7120ccf04ee98c4e323b59 (diff)
downloademacs-0beba8d16419ac592dd3dd7af7c177d80d490c4d.tar.gz
Merge from origin/emacs-26
b0369d0536 Import the latest IVD_Sequences.txt cd53b6399b Fix dired-do-compress when tar doesn't default to stdin (B... 51911dae14 Suppress warnings during elisp completion macroexpansion a36a090a95 * lisp/progmodes/verilog-mode.el (verilog-mode): Fix typo ... 6a6e8e6e8d Make tramp-interrupt-process more robust 5bcd468a9e Make quail-input-method work when inhibit-read-only is non... 87baf1242e Fix 'fontset-name-p' d23158777d Fix fontset documentation inconsistencies for bug#29630 a829cb8c8b Remove sentence from child frames section in Elisp manual ad491c80e4 Avoid crashes in 'font-at' after 'set-fontset-font' c73d2cdfd7 * lisp/files-x.el (connection-local-set-profile-variables)... cefca2b8ac Add /etc/ssl/cert.pem to gnutls-trustfiles for macOS 122e7264b8 Fix tool-tip display when display margins are non-zero by ... e1cc2037a9 Handle hash tables and vectors when reading/writing EIEIO ... cda219c3df Improve interactive debugging commands in xdisp.c 1056b3cbcd Fix calculation of continuation_pixel_width in display engine 90e20804f5 Improve documentation of 'save-abbrevs'. 14f0230a48 Improve documentation of Dired 161b0e5493 * lisp/bookmark.el (bookmark-alist): Doc fix. (Bug#29551)
Diffstat (limited to 'doc/emacs')
-rw-r--r--doc/emacs/abbrevs.texi3
-rw-r--r--doc/emacs/dired.texi5
2 files changed, 5 insertions, 3 deletions
diff --git a/doc/emacs/abbrevs.texi b/doc/emacs/abbrevs.texi
index 5f400a2399a..4e2e92c776b 100644
--- a/doc/emacs/abbrevs.texi
+++ b/doc/emacs/abbrevs.texi
@@ -315,7 +315,8 @@ batch mode. @xref{Initial Options}, for a description of batch mode.)
any of them, whenever it offers to save all files (for @kbd{C-x s} or
@kbd{C-x C-c}). It saves them in the file specified by
@code{abbrev-file-name}. This feature can be inhibited by setting the
-variable @code{save-abbrevs} to @code{nil}.
+variable @code{save-abbrevs} to @code{nil}; setting it to
+@code{silently} will save the abbrevs automatically without asking.
@findex insert-abbrevs
@findex define-abbrevs
diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi
index 9348ef5042d..6a83f42b82e 100644
--- a/doc/emacs/dired.texi
+++ b/doc/emacs/dired.texi
@@ -14,8 +14,9 @@ optionally some of its subdirectories as well. You can use the normal
Emacs commands to move around in this buffer, and special Dired
commands to operate on the listed files.
- The Dired buffer is read-only, and inserting text in it is not
-allowed. Ordinary printing characters such as @kbd{d} and @kbd{x} are
+ The Dired buffer is normally read-only, and inserting text in it is
+not allowed (however, the Wdired mode allows that, @pxref{Wdired}).
+Ordinary printing characters such as @kbd{d} and @kbd{x} are
redefined for special Dired commands. Some Dired commands @dfn{mark}
or @dfn{flag} the @dfn{current file} (that is, the file on the current
line); other commands operate on the marked files or on the flagged