Commit 64ba814f authored by Juanma Barranquero's avatar Juanma Barranquero

* 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'.
parent 0aec90c9
2008-11-30 Juanma Barranquero <lekktu@gmail.com>
* 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'.
2008-11-29 Chong Yidong <cyd@stupidchicken.com>
* complete.el (PC-do-complete-and-exit): Use
......
This diff is collapsed.
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment