diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2008-11-30 01:01:18 +0000 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2008-11-30 01:01:18 +0000 |
| commit | 64ba814f12fea7884d6cc2c9e58f63b12b7d79f5 (patch) | |
| tree | 8209080c6587ae2e5d5c7b17563a4791b7e94862 /lisp/emacs-lisp | |
| parent | 0aec90c95b73d821a311a811163695d57f33ef05 (diff) | |
| download | emacs-64ba814f12fea7884d6cc2c9e58f63b12b7d79f5.tar.gz emacs-64ba814f12fea7884d6cc2c9e58f63b12b7d79f5.tar.bz2 emacs-64ba814f12fea7884d6cc2c9e58f63b12b7d79f5.zip | |
* calendar/diary-lib.el (diary-cyclic): Doc fix.
(diary-remind-message, diary-number-of-entries)
(diary-include-other-diary-files, diary-mark-included-diary-files)
(diary-view-entries, diary-date, diary-block, diary-insert-entry-1)
(diary-font-lock-keywords-1): Reflow docstrings.
(diary-add-to-list, calendar-mark-1, diary-entry-time, diary-make-date)
(diary-anniversary, diary-date-display-form): Fix typos in docstrings.
* emacs-lisp/timer.el (timer-duration-words): Fix typo in docstring.
(timer-duration): Use `string-match-p'.
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/timer.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/timer.el b/lisp/emacs-lisp/timer.el index 9f5f72d81fe..03d41936248 100644 --- a/lisp/emacs-lisp/timer.el +++ b/lisp/emacs-lisp/timer.el @@ -487,7 +487,7 @@ The argument should be a value previously returned by `with-timeout-suspend'." (dolist (elt timer-spec-list) (let ((timer (car elt)) (delay (cadr elt))) - (timer-set-time timer (time-add (current-time) delay)) + (timer-set-time timer (time-add (current-time) delay)) (timer-activate timer)))) (defun y-or-n-p-with-timeout (prompt seconds default-value) @@ -512,7 +512,7 @@ If the user does not answer after SECONDS seconds, return DEFAULT-VALUE." (cons "month" (* 30 24 60 60)) ; Approximation (cons "year" (* 365.25 24 60 60)) ; Approximation ) - "Alist mapping temporal words to durations in seconds") + "Alist mapping temporal words to durations in seconds.") (defun timer-duration (string) "Return number of seconds specified by STRING, or nil if parsing fails." @@ -534,7 +534,7 @@ If the user does not answer after SECONDS seconds, return DEFAULT-VALUE." start (length string))))) (if (= start (length string)) secs - (if (string-match "\\`[0-9.]+\\'" string) + (if (string-match-p "\\`[0-9.]+\\'" string) (string-to-number string))))) (provide 'timer) |