Merge branch 'master' of https://github.com/emacs-mirror/emacs

Author: Yuuki Harano

doc/emacs/maintaining.texi

@@ -1033,7 +1033,6 @@ systems support modifying change comments.
 Visit the revision indicated at the current line.
 
 @item d
-@itemx =
 Display a diff between the revision at point and the next earlier
 revision, for the specific file.
 
@@ -1048,16 +1047,6 @@ L}), toggle between showing and hiding the full log entry for the
 revision at point.
 @end table
 
-To compare two arbitrary revisions, activate the region: set the
-beginning of the region to the line with the first revision and the
-end of the region to the line with the second revision to compare,
-then type @kbd{d} or @kbd{=}.  When the beginning of the region is on
-the top line that has no revision, it uses the current working revision
-as the first revision to compare.  When the end of the region is on
-the bottom non-revision line after the last revision line, then it
-uses the next earlier revision after the last displayed revision as
-the second revision to compare.
-
 @vindex vc-log-show-limit
 Because fetching many log entries can be slow, the
 @file{*vc-change-log*} buffer displays no more than 2000 revisions by

doc/emacs/modes.texi

@@ -207,7 +207,7 @@ amount of work you can lose in case of a crash.  @xref{Auto Save}.
 
 @item
 Electric Quote mode automatically converts quotation marks.  For
-example, it requotes text typed @t{`like this'} to text @t{‘like
+example, it requotes text typed @kbd{`like this'} to text @t{‘like
 this’}.  You can control what kind of text it operates in, and you can
 disable it entirely in individual buffers.  @xref{Quotation Marks}.
 

doc/emacs/text.texi

@@ -429,7 +429,7 @@ this"}.  Another common way is the curved quote convention, which uses
 left and right single or double quotation marks `@t{like this}' or
 ``@t{like this}''@footnote{
 The curved single quote characters are U+2018 @sc{left single quotation
-mark} and U+2018 @sc{right single quotation mark}; the curved double quotes
+mark} and U+2019 @sc{right single quotation mark}; the curved double quotes
 are U+201C @sc{left double quotation mark} and U+201D @sc{right double
 quotation mark}.  On text terminals which cannot display these
 characters, the Info reader might show them as the typewriter ASCII

doc/lispref/compile.texi

@@ -505,8 +505,25 @@ current lexical scope, or file if at top-level.)  @xref{Defining
 Variables}.
 @end itemize
 
-  You can also suppress any and all compiler warnings within a certain
-expression using the construct @code{with-no-warnings}:
+  You can also suppress compiler warnings within a certain expression
+using the @code{with-suppressed-warnings} macro:
+
+@defspec with-suppressed-warnings warnings body@dots{}
+In execution, this is equivalent to @code{(progn @var{body}...)}, but
+the compiler does not issue warnings for the specified conditions in
+@var{body}.  @var{warnings} is an associative list of warning symbols
+and function/variable symbols they apply to.  For instance, if you
+wish to call an obsolete function called @code{foo}, but want to
+suppress the compilation warning, say:
+
+@lisp
+(with-suppressed-warnings ((obsolete foo))
+  (foo ...))
+@end lisp
+@end defspec
+
+For more coarse-grained suppression of compiler warnings, you can use
+the @code{with-no-warnings} construct:
 
 @c This is implemented with a defun, but conceptually it is
 @c a special form.
@@ -516,8 +533,9 @@ In execution, this is equivalent to @code{(progn @var{body}...)},
 but the compiler does not issue warnings for anything that occurs
 inside @var{body}.
 
-We recommend that you use this construct around the smallest
-possible piece of code, to avoid missing possible warnings other than
+We recommend that you use @code{with-suppressed-warnings} instead, but
+if you do use this construct, that you use it around the smallest
+possible piece of code to avoid missing possible warnings other than
 one you intend to suppress.
 @end defspec
 

doc/lispref/modes.texi

@@ -392,7 +392,9 @@ it provides a command that does the same job in a way better
 suited to the text this mode is used for.  For example, a major mode
 for editing a programming language might redefine @kbd{C-M-a} to
 move to the beginning of a function in a way that works better for
-that language.
+that language.  The recommended way of tailoring @kbd{C-M-a} to the
+needs of a major mode is to set @code{beginning-of-defun-function}
+(@pxref{List Motion}) to invoke the function specific to the mode.
 
 It is also legitimate for a major mode to rebind a standard key
 sequence whose standard meaning is rarely useful in that mode.  For

doc/lispref/text.texi

@@ -4560,8 +4560,8 @@ the output is just one long line.
 
 @deffn Command base64url-encode-region beg end &optional no-pad
 This function is like @code{base64-encode-region}, but it implements
-the URL variant if base 64 encoding, per RFC 4648, and it doesn't
-inserts newline characters into the encoded text, so the output is
+the URL variant of base 64 encoding, per RFC 4648, and it doesn't
+insert newline characters into the encoded text, so the output is
 just one long line.
 
 If the optional argument @var{no-pad} is non-@code{nil} then this

doc/lispref/windows.texi

@@ -2598,6 +2598,9 @@ If @var{alist} has a @code{previous-window} entry and the window
 specified by that entry is live and not dedicated to another buffer,
 that window will be preferred, even if it never showed @var{buffer}
 before.
+
+This function will not choose the selected window if it finds another
+eligible window that has shown @var{buffer} previously.
 @end defun
 
 @defun display-buffer-use-some-window buffer alist

doc/misc/efaq-w32.texi

@@ -1820,7 +1820,8 @@ If you want a quick solution without installing extra tools, a poor
 substitute that works for simple text searches is to specify the built
 in Windows command @command{findstr} as the command to run at the
 @kbd{M-x grep} prompt.  Normally you will want to use the @option{/n}
-argument to @command{findstr}.
+argument to @command{findstr}, to have it print the line numbers for
+each hit.
 
 @menu
 * Recursive grep::
@@ -1860,7 +1861,8 @@ path to the findutils @command{find} command.
 An alternative if you have a recent version of grep is to customize
 @code{grep-find-command} to use @samp{grep -r} instead of both find
 and grep.  Another alternative if you don't need the full capabilities
-of grep is to use @samp{findstr /n /r}.
+of grep is to use @samp{findstr /n /r}; add the @samp{/s} option if
+you want a recursive search.
 
 @c ------------------------------------------------------------
 @node Developing with Emacs

etc/NEWS

@@ -580,6 +580,11 @@ remapped to these, respectively.
 +++
 *** New command 'dired-create-empty-file'.
 
+** Find-Dired
+
+*** New customizable variable 'find-dired-refine-function'.
+The default value is 'find-dired-sort-by-filename'.
+
 ** Change Logs and VC
 
 *** Recording ChangeLog entries doesn't require an actual file.
@@ -1507,6 +1512,18 @@ the new variable 'buffer-auto-revert-by-notification' to a non-nil
 value.  Auto Revert mode can use this information to avoid polling the
 buffer periodically when 'auto-revert-avoid-polling' is non-nil.
 
+** Bookmarks
+
++++
+*** 'bookmark-file' is now an obsolete alias of
+'bookmark-default-file'.
+
+** Bookmarks
+
+---
+*** 'bookmark-old-default-file' is now an obsolete alias of
+'bookmark-default-file'.
+
 
 * New Modes and Packages in Emacs 27.1
 
@@ -1675,6 +1692,10 @@ valid event type.
 
 * Lisp Changes in Emacs 27.1
 
++++
+** The new macro `with-suppressed-warnings' can be used to suppress
+specific byte-compile warnings.
+
 +++
 ** The 'append' arg of 'add-hook' is generalized to a finer notion of 'depth'
 This makes it possible to control the ordering of functions more precisely,

lisp/autorevert.el

@@ -347,6 +347,8 @@ the list of old buffers.")
 
 (add-hook 'find-file-hook
 	  #'auto-revert-find-file-function)
+(add-hook 'after-set-visited-file-name-hook
+          #'auto-revert-set-visited-file-name)
 
 (defvar auto-revert--buffers-by-watch-descriptor
   (make-hash-table :test 'equal)
@@ -508,8 +510,6 @@ specifies in the mode line."
             (auto-revert--global-add-current-buffer)))
         ;; Make sure future buffers are added as well.
         (add-hook 'find-file-hook #'auto-revert--global-adopt-current-buffer)
-        (add-hook 'after-set-visited-file-name-hook
-                  #'auto-revert--global-set-visited-file-name)
         ;; To track non-file buffers, we need to listen in to buffer
         ;; creation in general.  Listening to major-mode changes is
         ;; suitable, since we then know whether it's a mode that is tracked.
@@ -520,8 +520,6 @@ specifies in the mode line."
     ;; Turn global-auto-revert-mode OFF.
     (remove-hook 'after-change-major-mode-hook
                  #'auto-revert--global-adopt-current-buffer)
-    (remove-hook 'after-set-visited-file-name-hook
-                 #'auto-revert--global-set-visited-file-name)
     (remove-hook 'find-file-hook #'auto-revert--global-adopt-current-buffer)
     (dolist (buf (buffer-list))
       (with-current-buffer buf
@@ -551,14 +549,17 @@ specifies in the mode line."
   (auto-revert--global-add-current-buffer)
   (auto-revert-set-timer))
 
-(defun auto-revert--global-set-visited-file-name ()
-  "Update Global Auto-Revert management of the current buffer.
+(defun auto-revert-set-visited-file-name ()
+  "Update Auto-Revert management of the current buffer.
 Called after `set-visited-file-name'."
-  ;; Remove any existing notifier first so that we don't track the
-  ;; wrong file in case the file name was changed.
   (when auto-revert-notify-watch-descriptor
+    ;; Remove any existing notifier so that we don't track the wrong
+    ;; file in case the file name was changed.
     (auto-revert-notify-rm-watch))
-  (auto-revert--global-adopt-current-buffer))
+    (cond (global-auto-revert-mode
+           (auto-revert--global-adopt-current-buffer))
+          ((or auto-revert-mode auto-revert-tail-mode)
+           (auto-revert-set-timer))))
 
 (defun auto-revert--polled-buffers ()
   "List of buffers that need to be polled."