diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-11-20 20:47:55 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-11-20 20:47:55 -0800 |
| commit | 6ef2e5ef5278a807132b78c42de402925b20bfb3 (patch) | |
| tree | e5711cdfcdf8a152416c2a96e399695285a4a3a8 /lisp/calendar/time-date.el | |
| parent | eadf1faa3cb5eea8c25a5166a9a97ebd63525c56 (diff) | |
| parent | b6729a180f4b81ac26bd7b61f5330643b2d5e994 (diff) | |
| download | emacs-6ef2e5ef5278a807132b78c42de402925b20bfb3.tar.gz | |
Merge from emacs-24; up to 2012-11-17T22:12:47Z!eggert@cs.ucla.edu
Diffstat (limited to 'lisp/calendar/time-date.el')
| -rw-r--r-- | lisp/calendar/time-date.el | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lisp/calendar/time-date.el b/lisp/calendar/time-date.el index b953a6fb2b0..9cac659d848 100644 --- a/lisp/calendar/time-date.el +++ b/lisp/calendar/time-date.el @@ -30,11 +30,10 @@ ;; value equal to HIGH * 2^16 + LOW + USEC * 10^-6 + PSEC * 10^-12 ;; seconds, where missing components are treated as zero. HIGH can be ;; negative, either because the value is a time difference, or because -;; the machine supports negative time stamps that fall before the -;; epoch. The macro `with-decoded-time-value' and the -;; function `encode-time-value' make it easier to deal with these -;; three formats. See `time-subtract' for an example of how to use -;; them. +;; the machine supports negative time stamps that fall before the epoch. +;; The macro `with-decoded-time-value' and the function +;; `encode-time-value' make it easier to deal with these formats. +;; See `time-subtract' for an example of how to use them. ;;; Code: |