From 327576483cd198b11b39bb88a42d0495f5724684 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 20 Aug 2012 14:13:03 -0400 Subject: [PATCH] Use display-warning in a few places in calendar * lisp/calendar/diary-lib.el (diary-include-files, diary-sexp-entry): * lisp/calendar/holidays.el (calendar-holiday-list): Report errors with display-warning rather than beep'n'sleep. --- lisp/ChangeLog | 6 ++++++ lisp/calendar/diary-lib.el | 31 +++++++++++++++++-------------- lisp/calendar/holidays.el | 13 ++++++++----- 3 files changed, 31 insertions(+), 19 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f16d8c36344..a1464b52e6c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2012-08-20 Glenn Morris + + * calendar/diary-lib.el (diary-include-files, diary-sexp-entry): + * calendar/holidays.el (calendar-holiday-list): + Report errors with display-warning rather than beep'n'sleep. + 2012-08-20 Michael Albinus * net/tramp.el (tramp-accept-process-output): Accept only output diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el index 2e073fd1267..8fa5b0ddb07 100644 --- a/lisp/calendar/diary-lib.el +++ b/lisp/calendar/diary-lib.el @@ -951,12 +951,12 @@ This is recursive; that is, included files may include other files." (setq diary-entries-list (append diary-entries-list (diary-list-entries original-date number t))))) - (beep) - (message "Can't read included diary file %s" diary-file) - (sleep-for 2)) - (beep) - (message "Can't find included diary file %s" diary-file) - (sleep-for 2)))) + (display-warning + :error + (format "Can't read included diary file %s\n" diary-file))) + (display-warning + :error + (format "Can't find included diary file %s\n" diary-file))))) (goto-char (point-min))) (defun diary-include-other-diary-files () @@ -1456,14 +1456,17 @@ marks. This is intended to deal with deleted diary entries." (let ((result (if calendar-debug-sexp (let ((debug-on-error t)) (eval (car (read-from-string sexp)))) - (condition-case nil - (eval (car (read-from-string sexp))) - (error - (beep) - (message "Bad sexp at line %d in %s: %s" - (count-lines (point-min) (point)) - diary-file sexp) - (sleep-for 2)))))) + (let (err) + (condition-case err + (eval (car (read-from-string sexp))) + (error + (display-warning + :error + (format "Bad diary sexp at line %d in %s:\n%s\n\ +Error: %s\n" + (count-lines (point-min) (point)) + diary-file sexp err)) + nil)))))) (cond ((stringp result) result) ((and (consp result) (stringp (cdr result))) result) diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el index 0bb3c231840..043d402f612 100644 --- a/lisp/calendar/holidays.el +++ b/lisp/calendar/holidays.el @@ -458,17 +458,20 @@ with descriptive strings such as (defun calendar-holiday-list () "Form the list of holidays that occur on dates in the calendar window. The holidays are those in the list `calendar-holidays'." - (let (res h) + (let (res h err) (sort (dolist (p calendar-holidays res) (if (setq h (if calendar-debug-sexp (let ((debug-on-error t)) (eval p)) - (condition-case nil + (condition-case err (eval p) - (error (beep) - (message "Bad holiday list item: %s" p) - (sleep-for 2))))) + (error + (display-warning + :error + (format "Bad holiday list item: %s\nError: %s\n" + p err)) + nil)))) (setq res (append h res)))) 'calendar-date-compare))) -- 2.11.4.GIT