diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index bda57d2b30e..8f22e3c88da 100644
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -175,6 +175,9 @@ scroll the current window by one line at a time.  If you intend to use
 any of these commands, you might want to give them key bindings
 (@pxref{Init Rebinding}).
 
+  On graphical displays, you can also scroll a window using the scroll
+bar; @pxref{Scroll Bars}.
+
 @node Recentering
 @section Recentering
 
@@ -405,6 +408,10 @@ than the amount you previously set by @code{scroll-left}.  When
 other than the one showing the cursor will be scrolled by that minimal
 amount.
 
+  On graphical displays, you can scroll a window horizontally using
+the horizontal scroll bar, if you turn on the optional
+@code{horizontal-scroll-bar-mode}; @pxref{Scroll Bars}.
+
 @node Narrowing
 @section Narrowing
 @cindex widening
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index 8e6cbeed70b..6c62fde4ffb 100644
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -1146,11 +1146,11 @@ text or moving point with a keyboard command will usually bring it back
 into view.
 
 @findex horizontal-scroll-bar-mode
-  To toggle the use of horizontal scroll bars, type @kbd{M-x
-horizontal-scroll-bar-mode}.  This command applies to all frames,
+  To toggle the use of horizontal scroll bars, type @w{@kbd{M-x
+horizontal-scroll-bar-mode}}.  This command applies to all frames,
 including frames yet to be created.  To toggle horizontal scroll bars
-for just the selected frame, use the command @kbd{M-x
-toggle-horizontal-scroll-bar}.
+for just the selected frame, use the command @w{@kbd{M-x
+toggle-horizontal-scroll-bar}}.
 
 @vindex horizontal-scroll-bar-mode
   To control the use of horizontal scroll bars at startup, customize the
diff --git a/doc/misc/auth.texi b/doc/misc/auth.texi
index f51a1446170..8d802be535c 100644
--- a/doc/misc/auth.texi
+++ b/doc/misc/auth.texi
@@ -527,7 +527,7 @@ while searching for an entry matching the @code{rms} user on host
 @code{gnu.org} and port @code{22}, then the entry
 @file{gnu.org:22/rms.gpg} is preferred over @file{gnu.org.gpg}.
 However, such processing is not applied when the option
-@code{auth-source-pass-extra-parameters} is set to @code{t}.
+@code{auth-source-pass-extra-query-keywords} is set to @code{t}.
 
 Users of @code{pass} may also be interested in functionality provided
 by other Emacs packages:
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 2922f5a384c..77856087367 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -3402,7 +3402,7 @@ for further discussion.
 
 * Runtime problems specific to macOS
 
-** Error message when opening Emacs on macOS
+** Error message about malicious software when opening Emacs on macOS
 
 When opening Emacs, you may see an error message saying something like
 this:
@@ -3419,6 +3419,22 @@ the Emacs app icon, and then choose Open.  This adds a security
 exception for Emacs and from now on you should be able to open it by
 double-clicking on its icon, like any other app.
 
+** Error message about color list unarchiver when starting Emacs on macOS
+
+The error message looks like this:
+
+  Failed to initialize color list unarchiver:
+  Error Domain=NSCocoaErrorDomain Code=4864 "*** -[NSKeyedUnarchiver
+  _initForReadingFromData:error:throwLegacyExceptions:]: non-keyed archive cannot be decoded by NSKeyedUnarchiver"
+  UserInfo={NSDebugDescription=*** -[NSKeyedUnarchiver
+  _initForReadingFromData:error:throwLegacyExceptions:]: non-keyed archive cannot be decoded by NSKeyedUnarchiver}
+
+After showing this message, Emacs usually works normally.
+
+The usual reason for this is that the color file,
+~/Library/Colors/Emacs.clr, is stale or corrupted.  The solution is to
+delete that file and restart Emacs.
+
 ** macOS doesn't come with libxpm, so only XPM3 is supported.
 
 Libxpm is available for macOS as part of the XQuartz project.
diff --git a/lisp/image/image-dired-tags.el b/lisp/image/image-dired-tags.el
index 2b5248cb14b..54595adc147 100644
--- a/lisp/image/image-dired-tags.el
+++ b/lisp/image/image-dired-tags.el
@@ -32,8 +32,6 @@
 
 (require 'image-dired-util)
 
-(declare-function image-dired--with-marked "image-dired")
-
 (defvar image-dired-dir)
 (defvar image-dired-thumbnail-storage)
 (defvar image-dired-tags-db-file)
@@ -156,18 +154,6 @@ With prefix ARG, tag the file at point."
         (cons x tag))
       files))))
 
-(defun image-dired-tag-thumbnail ()
-  "Tag current or marked thumbnails."
-  (interactive nil image-dired-thumbnail-mode)
-  (let ((tag (completing-read
-              "Tags to add (separate tags with a semicolon): "
-              image-dired-tag-history nil nil nil 'image-dired-tag-history)))
-    (image-dired--with-marked
-     (image-dired-write-tags
-      (list (cons (image-dired-original-file-name) tag)))
-     (image-dired-update-property
-      'tags (image-dired-list-tags (image-dired-original-file-name))))))
-
 ;;;###autoload
 (defun image-dired-delete-tag (arg)
   "Remove tag for selected file(s).
@@ -181,16 +167,6 @@ With prefix argument ARG, remove tag from file at point."
       (setq files (dired-get-marked-files)))
     (image-dired-remove-tag files tag)))
 
-(defun image-dired-tag-thumbnail-remove ()
-  "Remove tag from current or marked thumbnails."
-  (interactive nil image-dired-thumbnail-mode)
-  (let ((tag (completing-read "Tag to remove: " image-dired-tag-history
-                              nil nil nil 'image-dired-tag-history)))
-    (image-dired--with-marked
-     (image-dired-remove-tag (image-dired-original-file-name) tag)
-     (image-dired-update-property
-      'tags (image-dired-list-tags (image-dired-original-file-name))))))
-
 (defun image-dired-write-comments (file-comments)
   "Write file comments specified by FILE-COMMENTS comments to database.
 FILE-COMMENTS is an alist on the following form:
diff --git a/lisp/image/image-dired.el b/lisp/image/image-dired.el
index 9eb68e240fe..ca808bcb5ab 100644
--- a/lisp/image/image-dired.el
+++ b/lisp/image/image-dired.el
@@ -1757,6 +1757,28 @@ Dired."
                   (cons (list tag file) (cdr image-dired-tag-file-list))))
       (setq image-dired-tag-file-list (list (list tag file))))))
 
+(defun image-dired-tag-thumbnail-remove ()
+  "Remove tag from current or marked thumbnails."
+  (interactive nil image-dired-thumbnail-mode)
+  (let ((tag (completing-read "Tag to remove: " image-dired-tag-history
+                              nil nil nil 'image-dired-tag-history)))
+    (image-dired--with-marked
+     (image-dired-remove-tag (image-dired-original-file-name) tag)
+     (image-dired-update-property
+      'tags (image-dired-list-tags (image-dired-original-file-name))))))
+
+(defun image-dired-tag-thumbnail ()
+  "Tag current or marked thumbnails."
+  (interactive nil image-dired-thumbnail-mode)
+  (let ((tag (completing-read
+              "Tags to add (separate tags with a semicolon): "
+              image-dired-tag-history nil nil nil 'image-dired-tag-history)))
+    (image-dired--with-marked
+     (image-dired-write-tags
+      (list (cons (image-dired-original-file-name) tag)))
+     (image-dired-update-property
+      'tags (image-dired-list-tags (image-dired-original-file-name))))))
+
 (defvar image-dired-slideshow-count 0
   "Keeping track on number of images in slideshow.")
 (make-obsolete-variable 'image-dired-slideshow-count "no longer used." "29.1")
diff --git a/lisp/scroll-bar.el b/lisp/scroll-bar.el
index 1358bff6da8..01e47ccebbe 100644
--- a/lisp/scroll-bar.el
+++ b/lisp/scroll-bar.el
@@ -172,7 +172,7 @@ created in the future."
 
 (defun toggle-scroll-bar (arg)
   "Toggle whether or not the selected frame has vertical scroll bars.
-With ARG, turn vertical scroll bars on if and only if ARG is positive.
+With ARG, turn on vertical scroll bars if and only if ARG is positive.
 The variable `scroll-bar-mode' controls which side the scroll bars are on
 when they are turned on; if it is nil, they go on the left."
   (interactive "P")
@@ -188,7 +188,7 @@ when they are turned on; if it is nil, they go on the left."
 
 (defun toggle-horizontal-scroll-bar (arg)
   "Toggle whether or not the selected frame has horizontal scroll bars.
-With ARG, turn vertical scroll bars on if and only if ARG is positive."
+With ARG, turn on horizontal scroll bars if and only if ARG is positive."
   (interactive "P")
   (if (null arg)
       (setq arg
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 17af1f1d926..f523df9881e 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -4059,6 +4059,10 @@ You can bind this to the key C-c i in GNUS or mail by adding to
 	    (if (re-search-forward "^Subject: *" end-of-headers t)
 		(progn
 		  (goto-char (match-end 0))
+                  ;; Don't spell-check Subject if it comes from a
+                  ;; received message: "Re:" indicates this is a reply
+                  ;; to someone else's message, "[...]" indicates this
+                  ;; is a subject of a forwarded message.
 		  (if (and (not (looking-at ".*\\<Re\\>"))
 			   (not (looking-at "\\[")))
 		      (progn