From 5cca73dd82cc18322c88721f311f8e6a081849fa Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 28 Feb 2020 12:58:28 -0800 Subject: [PATCH 1/2] * src/timefns.c (time_arith): Omit incorrect comment. --- src/timefns.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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) { From 6dc2ebe00e88d9fb6923bea9125700eb286726c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20Engdeg=C3=A5rd?= Date: Fri, 28 Feb 2020 22:13:45 +0100 Subject: [PATCH 2/2] Fix overquoting in mule.el * lisp/international/mule.el (sgml-xml-auto-coding-function): Remove accidental quote. --- lisp/international/mule.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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,