From: Glenn Morris <rgm@gnu.org>
Date: Tue, 8 Dec 2015 07:28:18 +0000 (-0800)
Subject: Fix some display-warning usage.
X-Git-Tag: emacs-25.0.90~512
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=741d0afe021fbe0ff4f3933242526c684ed8c806;p=emacs.git

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.
---

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)
diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el
index 307ab4deb82..3e7289bb030 100644
--- a/lisp/calendar/holidays.el
+++ b/lisp/calendar/holidays.el
@@ -346,9 +346,10 @@ The holidays are those in the list `calendar-holidays'."
                          (eval p)
                        (error
                         (display-warning
-                         :error
+                         'holidays
                          (format "Bad holiday list item: %s\nError: %s\n"
-                                 p err))
+                                 p err)
+                         :error)
                         nil))))
            (setq res (append h res))))
      'calendar-date-compare)))
diff --git a/lisp/files.el b/lisp/files.el
index d20bb1401fa..10c0cea5064 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -3419,7 +3419,7 @@ local variables, but directory-local variables may still be applied."
 			       (unless hack-local-variables--warned-lexical
 				 (setq hack-local-variables--warned-lexical t)
 				 (display-warning
-                                  :warning
+                                  'files
                                   (format-message
                                    "%s: `lexical-binding' at end of file unreliable"
                                    (file-name-nondirectory
@@ -3883,7 +3883,7 @@ This does nothing if either `enable-local-variables' or
 	      (if (eq (car elt) 'coding)
                   (unless hack-dir-local-variables--warned-coding
                     (setq hack-dir-local-variables--warned-coding t)
-                    (display-warning :warning
+                    (display-warning 'files
                                      "Coding cannot be specified by dir-locals"))
 		(unless (memq (car elt) '(eval mode))
 		  (setq dir-local-variables-alist
diff --git a/lisp/mail/rmailout.el b/lisp/mail/rmailout.el
index 1e770e6fea6..587d75f09b9 100644
--- a/lisp/mail/rmailout.el
+++ b/lisp/mail/rmailout.el
@@ -84,13 +84,14 @@ This uses `rmail-output-file-alist'."
 					(eval (cdar tail))
 				      (error
 				       (display-warning
-					:error
+					'rmail-output
 					(format-message "\
 Error evaluating `rmail-output-file-alist' element:
 regexp: %s
 action: %s
 error: %S\n"
-						(caar tail) (cdar tail) err))
+						(caar tail) (cdar tail) err)
+                                        :error)
 				       nil))))
 			  (setq tail (cdr tail)))
 			answer))))))