procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Eli Zaretskii 2020-02-29 09:51:43 +02:00
commit 9908b5a614
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lisp/international/mule.el
View file

@ -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,

4
src/timefns.c
View file

@ -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)
{ {