Mercurial > emacs
comparison src/editfns.c @ 106907:9d769a0fc9cd
Merge from trunk
| author | Jan D. <jan.h.d@swipnet.se> |
|---|---|
| date | Tue, 19 Jan 2010 11:52:59 +0100 |
| parents | e3970f7c14d4 |
| children | 969a1a50d14c |
comparison
equal
deleted
inserted
replaced
| 106857:f12233437424 | 106907:9d769a0fc9cd |
|---|---|
| 1895 | 1895 |
| 1896 return make_time (time); | 1896 return make_time (time); |
| 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. |
| 1904 The format is `Sun Sep 16 01:03:52 1973'. | 1904 The format is `Sun Sep 16 01:03:52 1973'. |
| 1905 However, see also the functions `decode-time' and `format-time-string' | 1905 However, see also the functions `decode-time' and `format-time-string' |