[Emacs-diffs] Changes to emacs/lisp/calendar/diary-lib.el,v

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/04/05 20:58:26

Index: diary-lib.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/diary-lib.el,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -b -r1.161 -r1.162
--- diary-lib.el        5 Apr 2008 20:20:38 -0000       1.161
+++ diary-lib.el        5 Apr 2008 20:58:26 -0000       1.162
@@ -166,26 +166,26 @@
   "List of functions called for listing diary file and included files.
 As the files are processed for diary entries, these functions are used
 to cull relevant entries.  You can use any or all of
-`list-hebrew-diary-entries', `diary-islamic-list-entries' and
-`diary-bahai-list-entries'.  The documentation for these functions
+`diary-bahai-list-entries', `diary-hebrew-list-entries', and
+`diary-islamic-list-entries'.  The documentation for these functions
 describes the style of such diary entries."
   :type 'hook
-  :options '(list-hebrew-diary-entries
-             diary-islamic-list-entries
-             diary-bahai-list-entries)
+  :options '(diary-bahai-list-entries
+             diary-hebrew-list-entries
+             diary-islamic-list-entries)
   :group 'diary)
 
 (defcustom nongregorian-diary-marking-hook nil
   "List of functions called for marking diary file and included files.
 As the files are processed for diary entries, these functions are used
 to cull relevant entries.  You can use any or all of
-`mark-hebrew-diary-entries', `diary-islamic-mark-entries' and
-`bahai-mark-diary-entries'.  The documentation for these functions
+`diary-bahai-mark-entries', `diary-hebrew-mark-entries' and
+`diary-islamic-mark-entries'.  The documentation for these functions
 describes the style of such diary entries."
   :type 'hook
-  :options '(mark-hebrew-diary-entries
-             diary-islamic-mark-entries
-             diary-bahai-mark-entries)
+  :options '(diary-bahai-mark-entries
+             diary-hebrew-mark-entries
+             diary-islamic-mark-entries)
   :group 'diary)
 
 (defcustom print-diary-entries-hook 'lpr-buffer
@@ -1540,7 +1540,7 @@
     is independent of whether the entry *itself* is a marking or
     non-marking one.
 
-  %%(diary-yahrzeit MONTH DAY YEAR) text
+  %%(diary-hebrew-yahrzeit MONTH DAY YEAR) text
     Text is assumed to be the name of the person; the date is the
     date of death on the *civil* calendar.  The diary entry will
     appear on the proper Hebrew-date anniversary and on the day
@@ -1564,9 +1564,9 @@
 Theses functions only produce output on certain dates:
 
 `diary-phases-of-moon'  - phases of moon (on the appropriate days)
-`diary-omer'            - Omer count, within 50 days after Passover
-`diary-parasha'         - weekly parasha, every Saturday
-`diary-rosh-hodesh'     - Rosh Hodesh, or the day or Saturday before
+`diary-hebrew-omer'        - Omer count, within 50 days after Passover
+`diary-hebrew-parasha'     - weekly parasha, every Saturday
+`diary-hebrew-rosh-hodesh' - Rosh Hodesh, or the day or Saturday before
 `diary-sabbath-candles' - local time of candle lighting, on Fridays
 
 
@@ -2090,8 +2090,8 @@
   (append
    (diary-font-lock-date-forms calendar-month-name-array
                                nil calendar-month-abbrev-array)
-   (diary-font-lock-keywords-1 mark-hebrew-diary-entries
-                               list-hebrew-diary-entries
+   (diary-font-lock-keywords-1 diary-hebrew-mark-entries
+                               diary-hebrew-list-entries
                                cal-hebrew
                                calendar-hebrew-month-name-array-leap-year
                                diary-hebrew-entry-symbol)