diff options
| author | Glenn Morris <rgm@gnu.org> | 2015-12-07 23:28:18 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2015-12-07 23:28:18 -0800 |
| commit | 741d0afe021fbe0ff4f3933242526c684ed8c806 (patch) | |
| tree | 5f27e768583542b84cec5af7ac743406260ffc5c /lisp/calendar/diary-lib.el | |
| parent | 5ec9d8ff4fdc2769d674ebe1f63c019cc6137273 (diff) | |
| download | emacs-741d0afe021fbe0ff4f3933242526c684ed8c806.tar.gz | |
Fix some display-warning usage.
* lisp/files.el (hack-local-variables, hack-dir-local-variables):
* lisp/calendar/diary-lib.el (diary-include-files, diary-sexp-entry):
* lisp/calendar/holidays.el (calendar-holiday-list):
* lisp/mail/rmailout.el (rmail-output-read-file-name):
Fix display-warning usage.
Diffstat (limited to 'lisp/calendar/diary-lib.el')
| -rw-r--r-- | lisp/calendar/diary-lib.el | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el index 93891bf2f16..0720d8266a0 100644 --- a/lisp/calendar/diary-lib.el +++ b/lisp/calendar/diary-lib.el @@ -909,13 +909,15 @@ This is recursive; that is, included files may include other files." (append diary-entries-list (diary-list-entries original-date number t))))) (display-warning - :error + 'diary (format-message "Can't read included diary file %s\n" - diary-file))) + diary-file) + :error)) (display-warning - :error + 'diary (format-message "Can't find included diary file %s\n" - diary-file))))) + diary-file) + :error)))) (goto-char (point-min))) (defun diary-include-other-diary-files () @@ -1410,11 +1412,12 @@ marks. This is intended to deal with deleted diary entries." (eval (car (read-from-string sexp))) (error (display-warning - :error + 'diary (format "Bad diary sexp at line %d in %s:\n%s\n\ Error: %s\n" (count-lines (point-min) (point)) - diary-file sexp err)) + diary-file sexp err) + :error) nil)))))) (cond ((stringp result) result) ((and (consp result) |