emacs-27 9908b5a 3/3: Merge branch 'emacs-27' of git.savannah.gnu.org:/srv/git/emacs into emacs-27

[Eli Zaretskii]

branch: emacs-27
commit 9908b5a61438ab82964d43bcfbcbe968d9bf601b
Merge: d767c35 6dc2ebe
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Merge branch 'emacs-27' of git.savannah.gnu.org:/srv/git/emacs into emacs-27
---
 lisp/international/mule.el | 2 +-
 src/timefns.c              | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 6659479..86f3d2a 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -2601,7 +2601,7 @@ This function is intended to be added to 
`auto-coding-functions'."
                     (detect-coding-region (point-min) size t)))))
             ;; Pure ASCII always comes back as undecided.
             (if (memq detected
-                      '(utf-8 'utf-8-with-signature 'utf-8-hfs undecided))
+                      '(utf-8 utf-8-with-signature utf-8-hfs undecided))
                 'utf-8
               (warn "File contents detected as %s.
   Consider adding an encoding attribute to the xml declaration,
diff --git a/src/timefns.c b/src/timefns.c
index 46f9193..a08d3b8 100644
--- a/src/timefns.c
+++ b/src/timefns.c
@@ -1033,9 +1033,7 @@ lispint_arith (Lisp_Object a, Lisp_Object b, bool 
subtract)
 }
 
 /* Given Lisp operands A and B, add their values, and return the
-   result as a Lisp timestamp that is in (TICKS . HZ) form if either A
-   or B are in that form or are floats, (HI LO US PS) form otherwise.
-   Subtract instead of adding if SUBTRACT.  */
+   result as a Lisp timestamp.  Subtract instead of adding if SUBTRACT.  */
 static Lisp_Object
 time_arith (Lisp_Object a, Lisp_Object b, bool subtract)
 {