aboutsummaryrefslogtreecommitdiffstats
path: root/doc/misc
diff options
context:
space:
mode:
Diffstat (limited to 'doc/misc')
-rw-r--r--doc/misc/ChangeLog4
-rw-r--r--doc/misc/emacs-mime.texi7
2 files changed, 7 insertions, 4 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index c0a47b4db8d..d065f22a97a 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
12014-01-24 Glenn Morris <rgm@gnu.org>
2
3 * emacs-mime.texi (time-date): Use float-time.
4
12014-01-22 David Engster <deng@randomsample.de> 52014-01-22 David Engster <deng@randomsample.de>
2 6
3 * eieio.texi (Introduction): Move introductory paragraph about 7 * eieio.texi (Introduction): Move introductory paragraph about
diff --git a/doc/misc/emacs-mime.texi b/doc/misc/emacs-mime.texi
index 601269d405b..7931ab298f0 100644
--- a/doc/misc/emacs-mime.texi
+++ b/doc/misc/emacs-mime.texi
@@ -1511,7 +1511,7 @@ Here's a bunch of time/date/second/day examples:
1511(date-to-time "Sat Sep 12 12:21:54 1998 +0200") 1511(date-to-time "Sat Sep 12 12:21:54 1998 +0200")
1512@result{} (13818 19266) 1512@result{} (13818 19266)
1513 1513
1514(time-to-seconds '(13818 19266)) 1514(float-time '(13818 19266))
1515@result{} 905595714.0 1515@result{} 905595714.0
1516 1516
1517(seconds-to-time 905595714.0) 1517(seconds-to-time 905595714.0)
@@ -1583,9 +1583,8 @@ These are the functions available:
1583@item date-to-time 1583@item date-to-time
1584Take a date and return a time. 1584Take a date and return a time.
1585 1585
1586@item time-to-seconds 1586@item float-time
1587Take a time and return seconds. Note that Emacs has a built-in 1587Take a time and return seconds. (This is a built-in function.)
1588function, @code{float-time}, that does this.
1589 1588
1590@item seconds-to-time 1589@item seconds-to-time
1591Take seconds and return a time. 1590Take seconds and return a time.