[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r109703: Use display-warning in a few
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r109703: Use display-warning in a few places in calendar |
Date: |
Mon, 20 Aug 2012 14:13:03 -0400 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 109703
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2012-08-20 14:13:03 -0400
message:
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.
modified:
lisp/ChangeLog
lisp/calendar/diary-lib.el
lisp/calendar/holidays.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2012-08-20 14:06:06 +0000
+++ b/lisp/ChangeLog 2012-08-20 18:13:03 +0000
@@ -1,3 +1,9 @@
+2012-08-20 Glenn Morris <address@hidden>
+
+ * 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 <address@hidden>
* net/tramp.el (tramp-accept-process-output): Accept only output
=== modified file 'lisp/calendar/diary-lib.el'
--- a/lisp/calendar/diary-lib.el 2012-02-18 03:08:15 +0000
+++ b/lisp/calendar/diary-lib.el 2012-08-20 18:13:03 +0000
@@ -951,12 +951,12 @@
(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 @@
(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)
=== modified file 'lisp/calendar/holidays.el'
--- a/lisp/calendar/holidays.el 2012-05-05 20:58:14 +0000
+++ b/lisp/calendar/holidays.el 2012-08-20 18:13:03 +0000
@@ -458,17 +458,20 @@
(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)))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r109703: Use display-warning in a few places in calendar,
Glenn Morris <=