diff options
Diffstat (limited to 'lisp/calendar/appt.el')
| -rw-r--r-- | lisp/calendar/appt.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/calendar/appt.el b/lisp/calendar/appt.el index 97b20f6b02b..d5d8a400218 100644 --- a/lisp/calendar/appt.el +++ b/lisp/calendar/appt.el @@ -1,6 +1,6 @@ ;;; appt.el --- appointment notification functions -;; Copyright (C) 1989-1990, 1994, 1998, 2001-2013 Free Software +;; Copyright (C) 1989-1990, 1994, 1998, 2001-2015 Free Software ;; Foundation, Inc. ;; Author: Neil Mager <neilm@juliet.ll.mit.edu> @@ -228,7 +228,7 @@ also calls `beep' for an audible reminder." string (car string))) (cond ((eq appt-display-format 'window) ;; TODO use calendar-month-abbrev-array rather than %b? - (let ((time (format-time-string "%a %b %e " (current-time))) + (let ((time (format-time-string "%a %b %e ")) err) (condition-case err (funcall appt-disp-window-function @@ -511,13 +511,13 @@ The default is `appt-message-warning-time'." (interactive "sTime (hh:mm[am/pm]): \nsMessage: \n\ sMinutes before the appointment to start warning: ") (unless (string-match appt-time-regexp time) - (error "Unacceptable time-string")) + (user-error "Unacceptable time-string")) (and (stringp warntime) (setq warntime (unless (string-equal warntime "") (string-to-number warntime)))) (and warntime (not (integerp warntime)) - (error "Argument WARNTIME must be an integer, or nil")) + (user-error "Argument WARNTIME must be an integer, or nil")) (or appt-timer (appt-activate)) (let ((time-msg (list (list (appt-convert-time time)) (concat time " " msg) t))) |