diff options
| author | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:40:28 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:40:28 -0800 |
| commit | 9f2f14a0725211b13a744573344636b57b9c98b9 (patch) | |
| tree | 7190e0fb3d4aa06018d8cf997f06b806fb09a9c8 /lisp/calendar/diary-lib.el | |
| parent | d259328fb87db8cc67d52771efcfa653e52c5b71 (diff) | |
| parent | e823c34072bf045800d91e12c7ddb61fa23c6e30 (diff) | |
| download | emacs-9f2f14a0725211b13a744573344636b57b9c98b9.tar.gz | |
Merge emacs-25 into master (using imerge)
Diffstat (limited to 'lisp/calendar/diary-lib.el')
| -rw-r--r-- | lisp/calendar/diary-lib.el | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el index 7382abf67fc..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 () @@ -1190,7 +1192,7 @@ ensure that all relevant variables are set. \(setq diary-mail-days 3 diary-file \"/path/to/diary.file\" - calendar-date-style 'european + calendar-date-style \\='european diary-mail-addr \"user@host.name\") \(diary-mail-entries) @@ -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) |