diff options
author | Glenn Morris <[email protected]> | 2007-09-15 19:59:25 +0000 |
---|---|---|
committer | Glenn Morris <[email protected]> | 2007-09-15 19:59:25 +0000 |
commit | 5fceaf9cab889a1c15d332f1a6485faec0bfda5e (patch) | |
tree | f564ce619d092ce429c327bebda14c742ad8dc03 | |
parent | 24c6be9f956a54bd72eddfdef9e60869583c6cea (diff) |
(holiday-list): Rename it back to `list-holidays', but leave
`holiday-list' as an alias.
-rw-r--r-- | doc/emacs/ChangeLog | 5 | ||||
-rw-r--r-- | lisp/calendar/holidays.el | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index c005fbaca0..5cc472a1d9 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,8 @@ +2007-09-15 Glenn Morris <[email protected]> + + * calendar.texi (Holidays): Change all instances of `holiday-list' back + to `list-holidays'. + 2007-09-14 Glenn Morris <[email protected]> * calendar.texi: Update all instances of mark-calendar-holidays, diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el index a86fdad4d6..eaa6e4cb47 100644 --- a/lisp/calendar/holidays.el +++ b/lisp/calendar/holidays.el @@ -109,15 +109,17 @@ This function is suitable for execution in a .emacs file." (displayed-year (extract-calendar-year date))) (calendar-list-holidays)))) +;; rms: "Emacs commands to display a list of something generally start +;; with `list-'. Please make `list-holidays' the principal name." ;;;###autoload -(defun holiday-list (y1 y2 &optional l label) +(defun list-holidays (y1 y2 &optional l label) "Display holidays for years Y1 to Y2 (inclusive). The optional list of holidays L defaults to `calendar-holidays'. If you want to control what holidays are displayed, use a different list. For example, - (holiday-list 2006 2006 + (list-holidays 2006 2006 (append general-holidays local-holidays other-holidays)) will display holidays for the year 2006 defined in the 3 @@ -206,6 +208,7 @@ The optional LABEL is used to label the buffer created." (display-buffer holiday-buffer) (message "Computing holidays...done")))) +(defalias 'holiday-list 'list-holidays) (defun calendar-check-holidays (date) "Check the list of holidays for any that occur on DATE. |