diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2020-02-29 09:51:43 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2020-02-29 09:51:43 +0200 |
| commit | 9908b5a61438ab82964d43bcfbcbe968d9bf601b (patch) | |
| tree | 66b696cf1610ca31dfd167149a34956f872a2897 | |
| parent | d767c357ca8ca59097d8ee7c06309efc1688f368 (diff) | |
| parent | 6dc2ebe00e88d9fb6923bea9125700eb286726c7 (diff) | |
| download | emacs-9908b5a61438ab82964d43bcfbcbe968d9bf601b.tar.gz | |
Merge branch 'emacs-27' of git.savannah.gnu.org:/srv/git/emacs into emacs-27
| -rw-r--r-- | lisp/international/mule.el | 2 | ||||
| -rw-r--r-- | src/timefns.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/lisp/international/mule.el b/lisp/international/mule.el index 66594791209..86f3d2a34bf 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 46f9193d6a1..a08d3b816ff 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) { |