diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index de6a83b5205..3da51e6f9d6 100644
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -1110,13 +1110,15 @@ End:
 -->
 @end example
 
-@vindex time-stamp-format
 By default the time stamp is
 formatted according to your locale setting (@pxref{Environment}) and
 time zone (@pxref{Time of Day,,, elisp, The Emacs Lisp Reference
 Manual}).
+@vindex time-stamp-time-zone
+Set @code{time-stamp-time-zone} to override the time zone used.
+@vindex time-stamp-format
 See the built-in documentation for the variable @code{time-stamp-format}
-for specifics and other variables that affect the formatting.
+for specifics on formatting and other variables that affect it.
 
 @node Time Stamps for One File
 @subsubsection Forcing Time Stamps for One File
diff --git a/doc/lispref/tips.texi b/doc/lispref/tips.texi
index 6515e8d0b9b..d54019bb7cd 100644
--- a/doc/lispref/tips.texi
+++ b/doc/lispref/tips.texi
@@ -1217,10 +1217,10 @@ lines.  Here is a table of them:
 @table @samp
 @item ;;; Commentary:
 This begins introductory comments that explain how the library works.
-It should come right after the copying permissions, terminated by a
-@samp{Change Log}, @samp{History} or @samp{Code} comment line.  This
-text is used by the Finder package, so it should make sense in that
-context.
+It should come right after the copying permissions, and is terminated by
+one of the comment lines described below: @samp{Change Log},
+@samp{History} or @samp{Code}.  This text is used by the Finder package,
+so it should make sense in that context.
 
 @item ;;; Change Log:
 This begins an optional log of changes to the file over time.  Don't
diff --git a/lisp/gnus/mail-source.el b/lisp/gnus/mail-source.el
index 954dce92e84..5bf7c7c2b94 100644
--- a/lisp/gnus/mail-source.el
+++ b/lisp/gnus/mail-source.el
@@ -201,8 +201,8 @@ Leave mails for this many days" :value 14)))))
 					   (string :tag "Program"))
 				    (group :inline t
 					   (const :format ""
-						  :value :authenticator)
-					   (choice :tag "Authenticator"
+						  :value :authentication)
+					   (choice :tag "Authentication"
 						   :value login
 						   ,@mail-source-imap-authenticators))
 				    (group :inline t
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 63d5332faf2..64ad3d4996e 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -3117,7 +3117,9 @@ will be used."
 			(let ((pid (tramp-send-command-and-read v "echo $$")))
 			  (setq p (tramp-get-connection-process v))
 			  (process-put p 'remote-pid pid))
-			(when (memq connection-type '(nil pipe))
+			(when
+			    (or (memq connection-type '(nil pipe))
+				(tramp-check-remote-uname v tramp-sunos-unames))
 			  ;; Disable carriage return to newline
 			  ;; translation.  This does not work on
 			  ;; macOS, see Bug#50748.
@@ -3133,6 +3135,9 @@ will be used."
 			  ;; should set a timeout
 			  ;; instead.  See `tramp-pipe-stty-settings'.
 			  ;; (Bug#62093)
+			  ;; On Solaris, the maximum line length
+			  ;; depends also on MAX_CANON (256).  So we
+			  ;; disable buffering as well.
 			  ;; FIXME: Shall we rather use "stty raw"?
 			  (tramp-send-command
 			   v (format
diff --git a/lisp/nxml/nxml-mode.el b/lisp/nxml/nxml-mode.el
index 1f2c7e81a09..ae27824fdc9 100644
--- a/lisp/nxml/nxml-mode.el
+++ b/lisp/nxml/nxml-mode.el
@@ -1523,6 +1523,8 @@ of the line.  This expects the xmltok-* variables to be set up as by
 	((progn
 	   (goto-char pos)
 	   (forward-line -1)
+           (while (looking-at "^[[:blank:]]*$")
+             (forward-line -1))
 	   (<= (point) xmltok-start))
 	 (goto-char (+ xmltok-start (length open-delim)))
 	 (when (and (string= open-delim "<!--")
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 69cc28b0cec..a10dbe1d445 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -2524,14 +2524,12 @@ the function."
         ;; `functionp'.
         ((alist-get exp treesit-simple-indent-presets))
         ((functionp exp) exp)
-        ((symbolp exp)
-         (if (null exp)
-             exp
-           ;; Matchers only return lambdas, anchors only return
-           ;; integer, so we should never see a variable.
-           (signal 'treesit-indent-error
-                   (list "Couldn't find the preset corresponding to expression"
-                         exp))))
+        ;; There are higher-order presets that take arguments, like
+        ;; (nth-sibling 1 t), so it's possible for exp to be something
+        ;; other than numbers and functions.  Don't signal an error if
+        ;; exp isn't a function nor a number.  In fact, allow exp to be
+        ;; any symbol or keyword, so users can define higher-order
+        ;; presets that takes keyword or symbol as arguments.
         (t exp)))
 
 ;; This variable might seem unnecessary: why split
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index eeb90539f61..1c11b0e285c 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -5393,6 +5393,12 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
 	    (with-timeout (10 (tramp--test-timeout-handler))
 	      (while (< (- (point-max) (point-min)) (length "foo"))
 		(while (accept-process-output proc 0 nil t))))
+            ;; Some `cat' implementations do not support the `cat -'
+            ;; call.  We skip then.
+            (skip-unless
+             (not
+              (string-match-p (rx "cat: -: input file is output file\n")
+                              (buffer-string))))
 	    (should (string-match-p "foo" (buffer-string))))
 
 	;; Cleanup.
@@ -5587,6 +5593,12 @@ If UNSTABLE is non-nil, the test is tagged as `:unstable'."
 	    (with-timeout (10 (tramp--test-timeout-handler))
 	      (while (< (- (point-max) (point-min)) (length "foo"))
 		(while (accept-process-output proc 0 nil t))))
+            ;; Some `cat' implementations do not support the `cat -'
+            ;; call.  We skip then.
+            (skip-unless
+             (not
+              (string-match-p (rx "cat: -: input file is output file\n")
+                              (buffer-string))))
 	    (should (string-match-p "foo" (buffer-string))))
 
 	;; Cleanup.