[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/calendar/diary-lib.el,v
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/calendar/diary-lib.el,v |
Date: |
Sat, 07 Apr 2007 21:53:17 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 07/04/07 21:53:17
Index: diary-lib.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/diary-lib.el,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -b -r1.122 -r1.123
--- diary-lib.el 27 Mar 2007 02:47:50 -0000 1.122
+++ diary-lib.el 7 Apr 2007 21:53:17 -0000 1.123
@@ -263,6 +263,16 @@
(setq attr-list (cdr attr-list)))))
(list entry ret-attr))))
+(defun diary-set-maybe-redraw (symbol value)
+ "Set SYMBOL's value to VALUE, and redraw the diary if necessary.
+Redraws the diary if it is being displayed (note this is not the same as
+just visiting the `diary-file'), and SYMBOL's value is to be changed."
+ (let ((oldvalue (eval symbol)))
+ (custom-set-default symbol value)
+ (and (not (equal value oldvalue))
+ (diary-live-p)
+ ;; Note this assumes diary was called without prefix arg.
+ (diary))))
;; This can be removed once the kill/yank treatment of invisible text
;; (see etc/TODO) is fixed. -- gm
@@ -309,17 +319,6 @@
(and diary-file
(find-buffer-visiting (substitute-in-file-name diary-file)))))
-(defun diary-set-maybe-redraw (symbol value)
- "Set SYMBOL's value to VALUE, and redraw the diary if necessary.
-Redraws the diary if it is being displayed (note this is not the same as
-just visiting the `diary-file'), and SYMBOL's value is to be changed."
- (let ((oldvalue (eval symbol)))
- (custom-set-default symbol value)
- (and (not (equal value oldvalue))
- (diary-live-p)
- ;; Note this assumes diary was called without prefix arg.
- (diary))))
-
(defcustom number-of-diary-entries 1
"Specifies how many days of diary entries are to be displayed initially.
This variable affects the diary display when the command \\[diary] is used,
@@ -1996,7 +1995,8 @@
(eval-when-compile (require 'cal-hebrew)
(require 'cal-islam))
-(defvar diary-font-lock-keywords
+(defun diary-font-lock-keywords ()
+ "Return a value for the variable `diary-font-lock-keywords'."
(append
(diary-font-lock-date-forms calendar-month-name-array
nil calendar-month-abbrev-array)
@@ -2038,9 +2038,10 @@
'(diary-font-lock-sexps . font-lock-keyword-face)
`(,(concat "\\(^\\|\\s-\\)"
diary-time-regexp "\\(-" diary-time-regexp "\\)?")
- . 'diary-time)))
- "Forms to highlight in `diary-mode'.")
+ . 'diary-time))))
+(defvar diary-font-lock-keywords (diary-font-lock-keywords)
+ "Forms to highlight in `diary-mode'.")
;; Following code from Dave Love <address@hidden>.
;; Import Outlook-format appointments from mail messages in Gnus or
- [Emacs-diffs] Changes to emacs/lisp/calendar/diary-lib.el,v,
Glenn Morris <=