Dired recognize dirs when file size in human units

[gnu-emacs] / lisp / calendar / holidays.el

diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el
index 307ab4deb8277cadcd15f4d252275f66f024ce33..27932aa9ea216a4b8ec8c1af1b334b74a86cf478 100644 (file)
--- a/lisp/calendar/holidays.el
+++ b/lisp/calendar/holidays.el
@@ -1,6 +1,6 @@
 ;;; holidays.el --- holiday functions for the calendar package
 
-;; Copyright (C) 1989-1990, 1992-1994, 1997, 2001-2015 Free Software
+;; Copyright (C) 1989-1990, 1992-1994, 1997, 2001-2016 Free Software
 ;; Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
@@ -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)))