diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-05-09 10:59:29 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-05-09 10:59:29 -0700 |
| commit | c8b7a6abd90aab76185202def7049a0ea981d335 (patch) | |
| tree | abd2edd93ad2fdd4e31e25a0e0ce1c24adde62ff /doc/misc | |
| parent | 9418ab39bf970dd82b5d6f2e7b40a5d8cd134a43 (diff) | |
| parent | 3b478989df59cc33886d260137c433da5cfe4863 (diff) | |
Merge from origin/emacs-25
3b47898 Fix doc string in `insert'
b479dea * doc/misc/emacs-mime.texi (time-date): Document now-builtins...
cd27f73 Say 'All results processed' at the end
4ffec91 Document automatic adjustment of process' logical window dime...
dc66271 ; Fix typos and stylistic glitches in NEWS
Diffstat (limited to 'doc/misc')
| -rw-r--r-- | doc/misc/emacs-mime.texi | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/misc/emacs-mime.texi b/doc/misc/emacs-mime.texi index 2b3bba39ad..2b935870da 100644 --- a/doc/misc/emacs-mime.texi +++ b/doc/misc/emacs-mime.texi @@ -1554,7 +1554,7 @@ Here's a bunch of time/date/second/day examples: (time-less-p '(13818 19266) '(13818 19145)) @result{} nil -(subtract-time '(13818 19266) '(13818 19145)) +(time-subtract '(13818 19266) '(13818 19145)) @result{} (0 121) (days-between "Sat Sep 12 12:21:54 1998 +0200" @@ -1632,14 +1632,14 @@ return a ``zero'' time. @item time-less-p Take two times and say whether the first time is less (i.e., earlier) -than the second time. +than the second time. (This is a built-in function.) @item time-since Take a time and return a time saying how long it was since that time. -@item subtract-time +@item time-subtract Take two times and subtract the second from the first. I.e., return -the time between the two times. +the time between the two times. (This is a built-in function.) @item days-between Take two days and return the number of days between those two days. |