aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2007-09-14 04:34:09 +0000
committerGlenn Morris2007-09-14 04:34:09 +0000
commitf5d58dd1908aff823f27dd126d6e78d5cac12840 (patch)
tree99ad77610b9560debac29a7bfa34e5a26d76d86a
parent0d7f185bf650e4e1be637468bb2f47591ddf9550 (diff)
downloademacs-f5d58dd1908aff823f27dd126d6e78d5cac12840.tar.gz
emacs-f5d58dd1908aff823f27dd126d6e78d5cac12840.zip
Rename all list-holidays instances to holiday-list.
-rw-r--r--lisp/ChangeLog11
-rw-r--r--lisp/calendar/holidays.el2
2 files changed, 12 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 66552fd5409..384d2da4a8d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
12007-09-14 Glenn Morris <rgm@gnu.org>
2
3 * calendar/cal-hebrew.el, calendar/cal-menu.el
4 * calendar/calendar.el, calendar/diary-lib.el
5 * calendar/holidays.el: Rename all instances of
6 list-calendar-holidays callers to calendar-list-holidays,
7 list-holidays to holiday-list, check-calendar-holidays to
8 calendar-check-holidays, mark-calendar-holidays to
9 calendar-mark-holidays, and filter-visible-calendar-holidays to
10 holiday-filter-visible-calendar.
11
12007-09-14 Dan Nicolaescu <dann@ics.uci.edu> 122007-09-14 Dan Nicolaescu <dann@ics.uci.edu>
2 13
3 * term/xterm.el (xterm-function-map): Add C-M- bindings. 14 * term/xterm.el (xterm-function-map): Add C-M- bindings.
diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el
index abcc84b2b15..a86fdad4d6e 100644
--- a/lisp/calendar/holidays.el
+++ b/lisp/calendar/holidays.el
@@ -117,7 +117,7 @@ The optional list of holidays L defaults to `calendar-holidays'.
117If you want to control what holidays are displayed, use a 117If you want to control what holidays are displayed, use a
118different list. For example, 118different list. For example,
119 119
120 (list-holidays 2006 2006 120 (holiday-list 2006 2006
121 (append general-holidays local-holidays other-holidays)) 121 (append general-holidays local-holidays other-holidays))
122 122
123will display holidays for the year 2006 defined in the 3 123will display holidays for the year 2006 defined in the 3