aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/international/mule.el2
-rw-r--r--src/timefns.c4
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'."
2601 (detect-coding-region (point-min) size t))))) 2601 (detect-coding-region (point-min) size t)))))
2602 ;; Pure ASCII always comes back as undecided. 2602 ;; Pure ASCII always comes back as undecided.
2603 (if (memq detected 2603 (if (memq detected
2604 '(utf-8 'utf-8-with-signature 'utf-8-hfs undecided)) 2604 '(utf-8 utf-8-with-signature utf-8-hfs undecided))
2605 'utf-8 2605 'utf-8
2606 (warn "File contents detected as %s. 2606 (warn "File contents detected as %s.
2607 Consider adding an encoding attribute to the xml declaration, 2607 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)
1033} 1033}
1034 1034
1035/* Given Lisp operands A and B, add their values, and return the 1035/* Given Lisp operands A and B, add their values, and return the
1036 result as a Lisp timestamp that is in (TICKS . HZ) form if either A 1036 result as a Lisp timestamp. Subtract instead of adding if SUBTRACT. */
1037 or B are in that form or are floats, (HI LO US PS) form otherwise.
1038 Subtract instead of adding if SUBTRACT. */
1039static Lisp_Object 1037static Lisp_Object
1040time_arith (Lisp_Object a, Lisp_Object b, bool subtract) 1038time_arith (Lisp_Object a, Lisp_Object b, bool subtract)
1041{ 1039{