[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/calendar/calendar.el,v
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/calendar/calendar.el,v |
Date: |
Fri, 14 Sep 2007 04:30:30 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 07/09/14 04:30:30
Index: calendar.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/calendar.el,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -b -r1.206 -r1.207
--- calendar.el 13 Aug 2007 13:41:27 -0000 1.206
+++ calendar.el 14 Sep 2007 04:30:30 -0000 1.207
@@ -1212,11 +1212,11 @@
you can eliminate unwanted categories of holidays.
The aforementioned variables control the holiday choices offered
-by the function `list-holidays' when it is called interactively.
+by the function `holiday-list' when it is called interactively.
They also initialize the default value of `calendar-holidays',
which is the default list of holidays used by the function
-`list-holidays' in the non-interactive case. Note that these
+`holiday-list' in the non-interactive case. Note that these
variables have no effect on `calendar-holidays' after it has been
set (e.g. after the calendar is loaded). In that case, customize
`calendar-holidays' directly.
@@ -1616,7 +1616,7 @@
calendar."
t)
-(autoload 'list-calendar-holidays "holidays"
+(autoload 'calendar-list-holidays "holidays"
"Create a buffer containing the holidays for the current calendar window.
The holidays are those in the list `calendar-notable-days'. Returns t if any
holidays are found, nil if not."
@@ -1688,7 +1688,7 @@
(diary-window (if diary-buffer (get-buffer-window diary-buffer)))
(split-height-threshold (if diary-window 2 1000)))
(if view-calendar-holidays-initially
- (list-calendar-holidays)))
+ (calendar-list-holidays)))
(run-hooks 'initial-calendar-window-hook))
(autoload 'view-other-diary-entries "diary-lib"
@@ -2284,7 +2284,7 @@
(define-key map "." 'calendar-goto-today)
(define-key map "o" 'calendar-other-month)
(define-key map "q" 'exit-calendar)
- (define-key map "a" 'list-calendar-holidays)
+ (define-key map "a" 'calendar-list-holidays)
(define-key map "h" 'calendar-cursor-holidays)
(define-key map "x" 'mark-calendar-holidays)
(define-key map "u" 'calendar-unmark)
- [Emacs-diffs] Changes to emacs/lisp/calendar/calendar.el,v,
Glenn Morris <=