From: Glenn Morris Date: Wed, 31 Jul 2019 04:42:34 +0000 (-0700) Subject: Merge from origin/emacs-26 X-Git-Tag: emacs-27.0.90~1812 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1ac0cfa2642ac026e09a7555f000e895b49289d5;p=emacs.git Merge from origin/emacs-26 8fbe462 (origin/emacs-26) ; * doc/lispref/positions.texi (List Motion... 1d9efc0 Add index for "\( in strings" (Bug#25195) 304e96f Fix doc-string of 'fit-window-to-buffer' (Bug#36848) d4c4987 Update view-mode docstring d6ca1fc ; * lisp/term.el: Add missing / to esc seq commentary. b3e2073 Fix subproc listening when setting filter to non-t (Bug#36591) f671950 * etc/NEWS.25: Belatedly announce rcirc-reconnect-delay. 7f42277 Mention term.el's \032 dir tracking in commentary (Bug#19524) 16a529e Remove upload functionality of package-x from the elisp manual 78e6c2a * etc/AUTHORS: Update. 086a56e Clarify Gravatar docs 0592467 * doc/lispref/display.texi (Defining Faces): Say a face can't... # Conflicts: # doc/emacs/programs.texi # etc/AUTHORS # lisp/term.el --- 1ac0cfa2642ac026e09a7555f000e895b49289d5 diff --cc lisp/view.el index e4489b391a9,5e6f3e2caa9..deda061cd39 --- a/lisp/view.el +++ b/lisp/view.el @@@ -381,10 -381,13 +381,10 @@@ own View-like bindings. ;; bindings instead of using the \\[] construction. The reason for this ;; is that most commands have more than one key binding. "Toggle View mode, a minor mode for viewing text but not editing it. -With a prefix argument ARG, enable View mode if ARG is positive, -and disable it otherwise. If called from Lisp, enable View mode -if ARG is omitted or nil. When View mode is enabled, commands that do not change the buffer - contents are available as usual. Kill commands insert text in - kill buffers but do not delete. Most other commands beep and + contents are available as usual. Kill commands save text but + do not delete it from the buffer. Most other commands beep and tell the user that the buffer is read-only. \\