diff options
| author | Chong Yidong | 2010-01-18 11:29:00 -0500 |
|---|---|---|
| committer | Chong Yidong | 2010-01-18 11:29:00 -0500 |
| commit | 244b023e520f102619156e93be9cd7424fe7d6a0 (patch) | |
| tree | 05de920a6d4109d139c7108d5a613618d022ada2 /src | |
| parent | 07e606735e20e41eea60ab07905922e4445cff3f (diff) | |
| download | emacs-244b023e520f102619156e93be9cd7424fe7d6a0.tar.gz emacs-244b023e520f102619156e93be9cd7424fe7d6a0.zip | |
Doc fix for current-time-string and date-to-time (Bug#5408)
* src/editfns.c (Fcurrent_time_string): Doc fix.
* lisp/calendar/time-date.el (date-to-time): Doc fix.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/editfns.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index e1d2ba440ab..190e35d923f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2010-01-18 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * editfns.c (Fcurrent_time_string): Doc fix (Bug#5408). | ||
| 4 | |||
| 1 | 2010-01-16 Stefan Monnier <monnier@iro.umontreal.ca> | 5 | 2010-01-16 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 6 | ||
| 3 | * xterm.c (event_handler_gdk): Block input (Bug#5037). | 7 | * xterm.c (event_handler_gdk): Block input (Bug#5037). |
diff --git a/src/editfns.c b/src/editfns.c index 00ac0ca0fa9..093f141bff2 100644 --- a/src/editfns.c +++ b/src/editfns.c | |||
| @@ -1897,7 +1897,7 @@ usage: (encode-time SECOND MINUTE HOUR DAY MONTH YEAR &optional ZONE) */) | |||
| 1897 | } | 1897 | } |
| 1898 | 1898 | ||
| 1899 | DEFUN ("current-time-string", Fcurrent_time_string, Scurrent_time_string, 0, 1, 0, | 1899 | DEFUN ("current-time-string", Fcurrent_time_string, Scurrent_time_string, 0, 1, 0, |
| 1900 | doc: /* Return the current time, as a human-readable string. | 1900 | doc: /* Return the current local time, as a human-readable string. |
| 1901 | Programs can use this function to decode a time, | 1901 | Programs can use this function to decode a time, |
| 1902 | since the number of columns in each field is fixed | 1902 | since the number of columns in each field is fixed |
| 1903 | if the year is in the range 1000-9999. | 1903 | if the year is in the range 1000-9999. |