summaryrefslogtreecommitdiff
path: root/lisp/calendar/appt.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2015-06-10 17:04:54 -0400
committerGlenn Morris <rgm@gnu.org>2015-06-10 17:04:54 -0400
commitfb7234019fe279e9122c4178fce975bffa0d8c55 (patch)
tree4f63c7a58e4727099cc2151ef36b187383dd24fe /lisp/calendar/appt.el
parent7de8137710f3abf96b19c15bb7ba3a05a950b505 (diff)
downloademacs-fb7234019fe279e9122c4178fce975bffa0d8c55.tar.gz
Use 'user-error' in a few calendar files.
* lisp/calendar/appt.el (appt-add): * lisp/calendar/calendar.el (calendar-absolute-from-gregorian) (calendar-generate): * lisp/calendar/diary-lib.el (diary-mail-entries, diary-cyclic): Replace 'error' with 'user-error'.
Diffstat (limited to 'lisp/calendar/appt.el')
-rw-r--r--lisp/calendar/appt.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/calendar/appt.el b/lisp/calendar/appt.el
index f143b2dfcb7..d5d8a400218 100644
--- a/lisp/calendar/appt.el
+++ b/lisp/calendar/appt.el
@@ -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)))