diff options
| author | Eli Zaretskii | 2020-02-29 09:51:43 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2020-02-29 09:51:43 +0200 |
| commit | 9908b5a61438ab82964d43bcfbcbe968d9bf601b (patch) | |
| tree | 66b696cf1610ca31dfd167149a34956f872a2897 /src | |
| parent | d767c357ca8ca59097d8ee7c06309efc1688f368 (diff) | |
| parent | 6dc2ebe00e88d9fb6923bea9125700eb286726c7 (diff) | |
| download | emacs-9908b5a61438ab82964d43bcfbcbe968d9bf601b.tar.gz emacs-9908b5a61438ab82964d43bcfbcbe968d9bf601b.zip | |
Merge branch 'emacs-27' of git.savannah.gnu.org:/srv/git/emacs into emacs-27
Diffstat (limited to 'src')
| -rw-r--r-- | src/timefns.c | 4 |
1 files changed, 1 insertions, 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) | |||
| 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. */ | ||
| 1039 | static Lisp_Object | 1037 | static Lisp_Object |
| 1040 | time_arith (Lisp_Object a, Lisp_Object b, bool subtract) | 1038 | time_arith (Lisp_Object a, Lisp_Object b, bool subtract) |
| 1041 | { | 1039 | { |