Commit 9908b5a6 authored by Eli Zaretskii's avatar Eli Zaretskii

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

parents d767c357 6dc2ebe0
Pipeline #4893 failed with stage
in 54 minutes and 40 seconds
...@@ -2601,7 +2601,7 @@ This function is intended to be added to `auto-coding-functions'." ...@@ -2601,7 +2601,7 @@ This function is intended to be added to `auto-coding-functions'."
(detect-coding-region (point-min) size t))))) (detect-coding-region (point-min) size t)))))
;; Pure ASCII always comes back as undecided. ;; Pure ASCII always comes back as undecided.
(if (memq detected (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 'utf-8
(warn "File contents detected as %s. (warn "File contents detected as %s.
Consider adding an encoding attribute to the xml declaration, Consider adding an encoding attribute to the xml declaration,
......
...@@ -1033,9 +1033,7 @@ lispint_arith (Lisp_Object a, Lisp_Object b, bool subtract) ...@@ -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 /* 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 result as a Lisp timestamp. Subtract instead of adding if SUBTRACT. */
or B are in that form or are floats, (HI LO US PS) form otherwise.
Subtract instead of adding if SUBTRACT. */
static Lisp_Object static Lisp_Object
time_arith (Lisp_Object a, Lisp_Object b, bool subtract) time_arith (Lisp_Object a, Lisp_Object b, bool subtract)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment