diff options
| author | Eli Zaretskii | 2010-01-22 15:40:56 -0500 |
|---|---|---|
| committer | Eli Zaretskii | 2010-01-22 15:40:56 -0500 |
| commit | cf206f28eb11467aed7f5e03f3e4df7724fd98d2 (patch) | |
| tree | 2f5695e6a774a918874b82c286f140abd052d860 /src/editfns.c | |
| parent | 5a876cd5f810b611f78dd4cf7a1673bffeea19a9 (diff) | |
| parent | c893016b07f33eb8d56e1011245fe59a67cb4ee0 (diff) | |
| download | emacs-cf206f28eb11467aed7f5e03f3e4df7724fd98d2.tar.gz emacs-cf206f28eb11467aed7f5e03f3e4df7724fd98d2.zip | |
Merge from mainline.
Diffstat (limited to 'src/editfns.c')
| -rw-r--r-- | src/editfns.c | 2 |
1 files changed, 1 insertions, 1 deletions
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. |