Commit 9ee4e581 authored by Glenn Morris's avatar Glenn Morris
Browse files

Update for diary-lib name changes.

parent efe9409a
2008-04-06 Glenn Morris <rgm@gnu.org>
* calendar/diary-lib.el (diary-sexp-entry-symbol):
Rename sexp-diary-entry-symbol. Keep old name as alias, update users.
(diary-list-entries-hook): Rename list-diary-entries-hook.
Keep old name as alias, update users.
(diary-mark-entries-hook): Rename mark-diary-entries-hook.
Keep old name as alias, update users.
(diary-nongregorian-listing-hook): Rename
nongregorian-diary-listing-hook. Keep old name as alias, update users.
(diary-nongregorian-marking-hook): Rename
nongregorian-diary-marking-hook. Keep old name as alias, update users.
(diary-print-entries-hook): Rename print-diary-entries-hook.
Keep old name as alias, update users.
(diary-abbreviated-year-flag): Rename abbreviated-calendar-year.
Keep old name as alias, update users.
(diary-number-of-entries): Rename number-of-diary-entries.
Keep old name as alias, update users.
(view-diary-entries, list-diary-entries, show-all-diary-entries):
Give version of obsolescence.
(diary-view-other-diary-entries): Rename view-other-diary-entries.
Keep old name as alias, update callers.
(diary-add-to-list): Rename add-to-diary-list. Keep old name as alias,
update callers.
(diary-include-other-diary-files): Rename include-other-diary-files.
Keep old name as alias, update callers.
(diary-simple-display): Rename simple-diary-display.
Keep old name as alias, update callers.
(diary-fancy-display): Rename fancy-diary-display.
Keep old name as alias, update callers.
(diary-print-entries): Rename print-diary-entries.
Keep old name as alias, update callers.
(diary-marking-entries-flag): Rename marking-diary-entries.
Update users.
(diary-marking-entry-flag): Rename marking-diary-entry. Update users.
(diary-mark-entries): Rename mark-diary-entries.
Keep old name as alias, update callers.
(diary-mark-sexp-entries): Rename mark-sexp-diary-entries.
Keep old name as alias, update callers.
(diary-mark-included-diary-files): Rename mark-included-diary-files.
Keep old name as alias, update callers.
(calendar-mark-days-named): Rename mark-calendar-days-named.
Keep old name as alias, update callers.
(calendar-mark-month): Rename mark-calendar-month.
Keep old name as alias, update callers.
(calendar-mark-date-pattern): Rename mark-calendar-date-pattern.
Keep old name as alias, update callers.
(diary-sort-entries): Rename sort-diary-entries.
Keep old name as alias, update callers.
(diary-list-sexp-entries): Rename list-sexp-diary-entries.
Keep old name as alias, update callers.
(diary-make-entry): Rename make-diary-entry. Keep old name as alias,
update callers.
(diary-insert-entry): Rename insert-diary-entry.
Keep old name as alias.
(diary-insert-weekly-entry): Rename insert-weekly-diary-entry.
Keep old name as alias.
(diary-insert-monthly-entry): Rename insert-monthly-diary-entry.
Keep old name as alias.
(diary-insert-yearly-entry): Rename insert-yearly-diary-entry.
Keep old name as alias.
(diary-insert-anniversary-entry): Rename insert-anniversary-diary-entry.
Keep old name as alias.
(diary-insert-block-entry): Rename insert-block-diary-entry.
Keep old name as alias.
(diary-insert-cyclic-entry): Rename insert-cyclic-diary-entry.
Keep old name as alias.
(diary-fancy-font-lock-keywords): Rename fancy-diary-font-lock-keywords.
Keep old name as alias, update users.
(diary-fancy-display-mode): Rename fancy-diary-display-mode.
Keep old name as alias, update callers.
* calendar/cal-bahai.el, calendar/cal-hebrew.el, calendar/cal-islam.el:
* calendar/cal-menu.el, calendar/cal-x.el, calendar/calendar.el
* calendar/icalendar.el: Update for diary-lib name changes.
2008-04-06 Chong Yidong <cyd@stupidchicken.com> 2008-04-06 Chong Yidong <cyd@stupidchicken.com>
   
* dired-aux.el (dired-overwrite-confirmed): Revert last change. * dired-aux.el (dired-overwrite-confirmed): Revert last change.
......
...@@ -268,7 +268,7 @@ abbreviated. The Bahá'í months are numbered from 1 to 19 with Bahá being ...@@ -268,7 +268,7 @@ abbreviated. The Bahá'í months are numbered from 1 to 19 with Bahá being
1 and 19 being `Alá. If a Bahá'í date diary entry begins with 1 and 19 being `Alá. If a Bahá'í date diary entry begins with
`diary-nonmarking-symbol', the entry will appear in the diary listing, but `diary-nonmarking-symbol', the entry will appear in the diary listing, but
will not be marked in the calendar. This function is provided for use with will not be marked in the calendar. This function is provided for use with
`nongregorian-diary-listing-hook'." `diary-nongregorian-listing-hook'."
(diary-list-entries-1 calendar-bahai-month-name-array (diary-list-entries-1 calendar-bahai-month-name-array
diary-bahai-entry-symbol diary-bahai-entry-symbol
'calendar-bahai-from-absolute)) 'calendar-bahai-from-absolute))
...@@ -349,7 +349,7 @@ Prefix argument ARG will make the entry nonmarking." ...@@ -349,7 +349,7 @@ Prefix argument ARG will make the entry nonmarking."
(defvar date) (defvar date)
;; To be called from list-sexp-diary-entries, where DATE is bound. ;; To be called from diary-list-sexp-entries, where DATE is bound.
;;;###diary-autoload ;;;###diary-autoload
(defun diary-bahai-date () (defun diary-bahai-date ()
"Bahá'í calendar equivalent of date diary entry." "Bahá'í calendar equivalent of date diary entry."
......
...@@ -631,7 +631,7 @@ Adar II; you must use `Adar I' if you want Adar of a common ...@@ -631,7 +631,7 @@ Adar II; you must use `Adar I' if you want Adar of a common
Hebrew year. If a Hebrew date diary entry begins with Hebrew year. If a Hebrew date diary entry begins with
`diary-nonmarking-symbol', the entry will appear in the diary `diary-nonmarking-symbol', the entry will appear in the diary
listing, but will not be marked in the calendar. This function listing, but will not be marked in the calendar. This function
is provided for use with `nongregorian-diary-listing-hook'." is provided for use with `diary-nongregorian-listing-hook'."
(diary-list-entries-1 calendar-hebrew-month-name-array-leap-year (diary-list-entries-1 calendar-hebrew-month-name-array-leap-year
diary-hebrew-entry-symbol diary-hebrew-entry-symbol
'calendar-hebrew-from-absolute)) 'calendar-hebrew-from-absolute))
...@@ -796,7 +796,7 @@ from the cursor position." ...@@ -796,7 +796,7 @@ from the cursor position."
(defvar date) (defvar date)
;; To be called from list-sexp-diary-entries, where DATE is bound. ;; To be called from diary-list-sexp-entries, where DATE is bound.
;;;###diary-autoload ;;;###diary-autoload
(defun diary-hebrew-date () (defun diary-hebrew-date ()
"Hebrew calendar equivalent of date diary entry." "Hebrew calendar equivalent of date diary entry."
...@@ -1132,7 +1132,7 @@ use when highlighting the day in the calendar." ...@@ -1132,7 +1132,7 @@ use when highlighting the day in the calendar."
(defvar calendar-time-zone) (defvar calendar-time-zone)
;; To be called from list-sexp-diary-entries, where DATE is bound. ;; To be called from diary-list-sexp-entries, where DATE is bound.
;;;###diary-autoload ;;;###diary-autoload
(defun diary-hebrew-sabbath-candles (&optional mark) (defun diary-hebrew-sabbath-candles (&optional mark)
"Local time of candle lighting diary entry--applies if date is a Friday. "Local time of candle lighting diary entry--applies if date is a Friday.
......
...@@ -257,7 +257,7 @@ from 1 to 12 with Muharram being 1 and 12 being Dhu al-Hijjah. ...@@ -257,7 +257,7 @@ from 1 to 12 with Muharram being 1 and 12 being Dhu al-Hijjah.
If an Islamic date diary entry begins with `diary-nonmarking-symbol', If an Islamic date diary entry begins with `diary-nonmarking-symbol',
the entry will appear in the diary listing, but will not be the entry will appear in the diary listing, but will not be
marked in the calendar. This function is provided for use with marked in the calendar. This function is provided for use with
`nongregorian-diary-listing-hook'." `diary-nongregorian-listing-hook'."
(diary-list-entries-1 calendar-islamic-month-name-array (diary-list-entries-1 calendar-islamic-month-name-array
diary-islamic-entry-symbol diary-islamic-entry-symbol
'calendar-islamic-from-absolute)) 'calendar-islamic-from-absolute))
......
...@@ -40,17 +40,17 @@ ...@@ -40,17 +40,17 @@
(defconst cal-menu-diary-menu (defconst cal-menu-diary-menu
'("Diary" '("Diary"
["Other File" view-other-diary-entries] ["Other File" diary-view-other-diary-entries]
["Cursor Date" diary-view-entries] ["Cursor Date" diary-view-entries]
["Mark All" mark-diary-entries] ["Mark All" diary-mark-entries]
["Show All" diary-show-all-entries] ["Show All" diary-show-all-entries]
["Insert Diary Entry" insert-diary-entry] ["Insert Diary Entry" diary-insert-entry]
["Insert Weekly" insert-weekly-diary-entry] ["Insert Weekly" diary-insert-weekly-entry]
["Insert Monthly" insert-monthly-diary-entry] ["Insert Monthly" diary-insert-monthly-entry]
["Insert Yearly" insert-yearly-diary-entry] ["Insert Yearly" diary-insert-yearly-entry]
["Insert Anniversary" insert-anniversary-diary-entry] ["Insert Anniversary" diary-insert-anniversary-entry]
["Insert Block" insert-block-diary-entry] ["Insert Block" diary-insert-block-entry]
["Insert Cyclic" insert-cyclic-diary-entry] ["Insert Cyclic" diary-insert-cyclic-entry]
("Insert Baha'i" ("Insert Baha'i"
["One time" diary-bahai-insert-entry] ["One time" diary-bahai-insert-entry]
["Monthly" diary-bahai-insert-monthly-entry] ["Monthly" diary-bahai-insert-monthly-entry]
...@@ -265,7 +265,7 @@ is non-nil." ...@@ -265,7 +265,7 @@ is non-nil."
(interactive) (interactive)
(save-excursion (save-excursion
(calendar-mouse-goto-date (calendar-event-to-date)) (calendar-mouse-goto-date (calendar-event-to-date))
(insert-diary-entry nil))) (diary-insert-entry nil)))
(defun calendar-mouse-set-mark () (defun calendar-mouse-set-mark ()
"Mark the date under the cursor." "Mark the date under the cursor."
...@@ -421,7 +421,7 @@ EVENT is the event that invoked this command." ...@@ -421,7 +421,7 @@ EVENT is the event that invoked this command."
'("Calendar" '("Calendar"
["Scroll forward" calendar-scroll-left-three-months] ["Scroll forward" calendar-scroll-left-three-months]
["Scroll backward" calendar-scroll-right-three-months] ["Scroll backward" calendar-scroll-right-three-months]
["Mark diary entries" mark-diary-entries] ["Mark diary entries" diary-mark-entries]
["List holidays" calendar-list-holidays] ["List holidays" calendar-list-holidays]
["Mark holidays" calendar-mark-holidays] ["Mark holidays" calendar-mark-holidays]
["Unmark" calendar-unmark] ["Unmark" calendar-unmark]
......
...@@ -95,7 +95,8 @@ Runs `calendar-after-frame-setup-hook', selects frame, iconifies if needed." ...@@ -95,7 +95,8 @@ Runs `calendar-after-frame-setup-hook', selects frame, iconifies if needed."
"Display and dedicate the window associated with the diary buffer." "Display and dedicate the window associated with the diary buffer."
(set-window-dedicated-p (set-window-dedicated-p
(display-buffer (display-buffer
(if (not (memq 'fancy-diary-display diary-display-hook)) (if (not (or (memq 'diary-fancy-display diary-display-hook)
(memq 'fancy-diary-display diary-display-hook)))
(get-file-buffer diary-file) (get-file-buffer diary-file)
;; If there are no diary entries, there won't be a fancy-diary ;; If there are no diary entries, there won't be a fancy-diary
;; to dedicate, so make a basic one. ;; to dedicate, so make a basic one.
......
...@@ -105,10 +105,10 @@ ...@@ -105,10 +105,10 @@
;; central month of the 3 month calendar window ;; central month of the 3 month calendar window
;; original-date, number: bound in diary-list-entries, the arguments ;; original-date, number: bound in diary-list-entries, the arguments
;; with which that function was called. ;; with which that function was called.
;; date, entry: bound in list-sexp-diary-entries (qv) ;; date, entry: bound in diary-list-sexp-entries (qv)
;; Bound in diary-list-entries: ;; Bound in diary-list-entries:
;; diary-entries-list: use in d-l, appt.el, and by add-to-diary-list ;; diary-entries-list: use in d-l, appt.el, and by diary-add-to-list
;; diary-saved-point: only used in diary-lib.el, passed to the display func ;; diary-saved-point: only used in diary-lib.el, passed to the display func
;; date-string: only used in diary-lib.el ;; date-string: only used in diary-lib.el
;; list-only: don't modify the diary-buffer, just return a list of entries ;; list-only: don't modify the diary-buffer, just return a list of entries
...@@ -193,7 +193,7 @@ movement commands will not work correctly." ...@@ -193,7 +193,7 @@ movement commands will not work correctly."
"Non-nil means display current date's diary entries on entry to calendar. "Non-nil means display current date's diary entries on entry to calendar.
The diary is displayed in another window when the calendar is first displayed, The diary is displayed in another window when the calendar is first displayed,
if the current date is visible. The number of days of diary entries displayed if the current date is visible. The number of days of diary entries displayed
is governed by the variable `number-of-diary-entries'. This variable can is governed by the variable `diary-number-of-entries'. This variable can
be overridden by the value of `calendar-setup'." be overridden by the value of `calendar-setup'."
:type 'boolean :type 'boolean
:group 'diary) :group 'diary)
...@@ -349,7 +349,7 @@ uses the forms of `american-date-diary-pattern': ...@@ -349,7 +349,7 @@ uses the forms of `american-date-diary-pattern':
with the remainder of the line being the diary entry string for with the remainder of the line being the diary entry string for
that date. MONTH and DAY are one or two digit numbers, YEAR is a that date. MONTH and DAY are one or two digit numbers, YEAR is a
number and may be written in full or abbreviated to the final two number and may be written in full or abbreviated to the final two
digits (if `abbreviated-calendar-year' is non-nil). MONTHNAME digits (if `diary-abbreviated-year-flag' is non-nil). MONTHNAME
and DAYNAME can be spelled in full (as specified by the variables and DAYNAME can be spelled in full (as specified by the variables
`calendar-month-name-array' and `calendar-day-name-array'), or `calendar-month-name-array' and `calendar-day-name-array'), or
abbreviated (as specified by `calendar-month-abbrev-array' and abbreviated (as specified by `calendar-month-abbrev-array' and
...@@ -410,16 +410,16 @@ Diary entries can be based on Lisp sexps. For example, the diary entry ...@@ -410,16 +410,16 @@ Diary entries can be based on Lisp sexps. For example, the diary entry
causes the diary entry \"Vacation\" to appear from November 1 through causes the diary entry \"Vacation\" to appear from November 1 through
November 10, 1990. See the documentation for the function November 10, 1990. See the documentation for the function
`list-sexp-diary-entries' for more details. `diary-list-sexp-entries' for more details.
Diary entries based on the Hebrew, the Islamic and/or the Baha'i Diary entries based on the Hebrew, the Islamic and/or the Baha'i
calendar are also possible, but because these are somewhat slow, they calendar are also possible, but because these are somewhat slow, they
are ignored unless you set the `nongregorian-diary-listing-hook' and are ignored unless you set the `diary-nongregorian-listing-hook' and
the `nongregorian-diary-marking-hook' appropriately. See the the `diary-nongregorian-marking-hook' appropriately. See the
documentation of these hooks for details. documentation of these hooks for details.
Diary files can contain directives to include the contents of other files; for Diary files can contain directives to include the contents of other files; for
details, see the documentation for the variable `list-diary-entries-hook'." details, see the documentation for the variable `diary-list-entries-hook'."
:type 'file :type 'file
:group 'diary) :group 'diary)
...@@ -712,7 +712,7 @@ Can be used for appointment notification." ...@@ -712,7 +712,7 @@ Can be used for appointment notification."
(defcustom diary-display-hook nil (defcustom diary-display-hook nil
"List of functions that handle the display of the diary. "List of functions that handle the display of the diary.
If nil (the default), `simple-diary-display' is used. Use If nil (the default), `diary-simple-display' is used. Use
`ignore' for no diary display. `ignore' for no diary display.
Ordinarily, this just displays the diary buffer (with holidays Ordinarily, this just displays the diary buffer (with holidays
...@@ -724,7 +724,7 @@ string is the diary entry for the given date. This can be used, ...@@ -724,7 +724,7 @@ string is the diary entry for the given date. This can be used,
for example, a different buffer for display (perhaps combined for example, a different buffer for display (perhaps combined
with holidays), or produce hard copy output. with holidays), or produce hard copy output.
A function `fancy-diary-display' is provided for use with this A function `diary-fancy-display' is provided for use with this
hook; this function prepares a special noneditable diary buffer hook; this function prepares a special noneditable diary buffer
with the relevant diary entries that has neat day-by-day with the relevant diary entries that has neat day-by-day
arrangement with headings. The fancy diary buffer will show the arrangement with headings. The fancy diary buffer will show the
...@@ -734,7 +734,7 @@ which there are no diary entries, even if that day is a holiday; ...@@ -734,7 +734,7 @@ which there are no diary entries, even if that day is a holiday;
if you want such days to be shown in the fancy diary buffer, set if you want such days to be shown in the fancy diary buffer, set
the variable `diary-list-include-blanks' non-nil." the variable `diary-list-include-blanks' non-nil."
:type 'hook :type 'hook
:options '(fancy-diary-display) :options '(diary-fancy-display)
:initialize 'custom-initialize-default :initialize 'custom-initialize-default
:set 'diary-set-maybe-redraw :set 'diary-set-maybe-redraw
:group 'diary) :group 'diary)
...@@ -1382,7 +1382,7 @@ separate frame, depending on the value of `calendar-setup'. ...@@ -1382,7 +1382,7 @@ separate frame, depending on the value of `calendar-setup'.
If `view-diary-entries-initially' is non-nil, also displays the If `view-diary-entries-initially' is non-nil, also displays the
diary entries for the current date (or however many days diary entries for the current date (or however many days
`number-of-diary-entries' specifies). This variable can be `diary-number-of-entries' specifies). This variable can be
overridden by `calendar-setup'. As well as being displayed, overridden by `calendar-setup'. As well as being displayed,
diary entries can also be marked on the calendar (see diary entries can also be marked on the calendar (see
`mark-diary-entries-in-calendar'). `mark-diary-entries-in-calendar').
...@@ -1466,7 +1466,7 @@ Optional integers MON and YR are used instead of today's date." ...@@ -1466,7 +1466,7 @@ Optional integers MON and YR are used instead of today's date."
(calendar-mark-holidays) (calendar-mark-holidays)
(and in-calendar-window (sit-for 0))) (and in-calendar-window (sit-for 0)))
(unwind-protect (unwind-protect
(if mark-diary-entries-in-calendar (mark-diary-entries)) (if mark-diary-entries-in-calendar (diary-mark-entries))
(if today-visible (if today-visible
(run-hooks 'today-visible-calendar-hook) (run-hooks 'today-visible-calendar-hook)
(run-hooks 'today-invisible-calendar-hook))))) (run-hooks 'today-invisible-calendar-hook)))))
...@@ -1634,9 +1634,9 @@ after the inserted text. Returns t." ...@@ -1634,9 +1634,9 @@ after the inserted text. Returns t."
(define-key map "h" 'calendar-cursor-holidays) (define-key map "h" 'calendar-cursor-holidays)
(define-key map "x" 'calendar-mark-holidays) (define-key map "x" 'calendar-mark-holidays)
(define-key map "u" 'calendar-unmark) (define-key map "u" 'calendar-unmark)
(define-key map "m" 'mark-diary-entries) (define-key map "m" 'diary-mark-entries)
(define-key map "d" 'diary-view-entries) (define-key map "d" 'diary-view-entries)
(define-key map "D" 'view-other-diary-entries) (define-key map "D" 'diary-view-other-diary-entries)
(define-key map "s" 'diary-show-all-entries) (define-key map "s" 'diary-show-all-entries)
(define-key map "pd" 'calendar-print-day-of-year) (define-key map "pd" 'calendar-print-day-of-year)
(define-key map "pC" 'calendar-chinese-print-date) (define-key map "pC" 'calendar-chinese-print-date)
...@@ -1652,13 +1652,13 @@ after the inserted text. Returns t." ...@@ -1652,13 +1652,13 @@ after the inserted text. Returns t."
(define-key map "pf" 'calendar-french-print-date) (define-key map "pf" 'calendar-french-print-date)
(define-key map "pm" 'calendar-mayan-print-date) (define-key map "pm" 'calendar-mayan-print-date)
(define-key map "po" 'calendar-print-other-dates) (define-key map "po" 'calendar-print-other-dates)
(define-key map "id" 'insert-diary-entry) (define-key map "id" 'diary-insert-entry)
(define-key map "iw" 'insert-weekly-diary-entry) (define-key map "iw" 'diary-insert-weekly-entry)
(define-key map "im" 'insert-monthly-diary-entry) (define-key map "im" 'diary-insert-monthly-entry)
(define-key map "iy" 'insert-yearly-diary-entry) (define-key map "iy" 'diary-insert-yearly-entry)
(define-key map "ia" 'insert-anniversary-diary-entry) (define-key map "ia" 'diary-insert-anniversary-entry)
(define-key map "ib" 'insert-block-diary-entry) (define-key map "ib" 'diary-insert-block-entry)
(define-key map "ic" 'insert-cyclic-diary-entry) (define-key map "ic" 'diary-insert-cyclic-entry)
(define-key map "ihd" 'diary-hebrew-insert-entry) (define-key map "ihd" 'diary-hebrew-insert-entry)
(define-key map "ihm" 'diary-hebrew-insert-monthly-entry) (define-key map "ihm" 'diary-hebrew-insert-monthly-entry)
(define-key map "ihy" 'diary-hebrew-insert-yeary-entry) (define-key map "ihy" 'diary-hebrew-insert-yeary-entry)
......
...@@ -2126,8 +2126,11 @@ the entry." ...@@ -2126,8 +2126,11 @@ the entry."
(unless diary-file (unless diary-file
(setq diary-file (setq diary-file
(read-file-name "Add appointment to this diary file: "))) (read-file-name "Add appointment to this diary file: ")))
;; Note: make-diary-entry will add a trailing blank char.... :( ;; Note: diary-make-entry will add a trailing blank char.... :(
(make-diary-entry string non-marking diary-file))) (funcall (if (fboundp 'diary-make-entry)
'diary-make-entry
'make-diary-entry)
string non-marking diary-file)))
;; return diary-file in case it has been changed interactively ;; return diary-file in case it has been changed interactively
diary-file) diary-file)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment