[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
|
From: |
Glenn Morris |
|
Subject: |
[Emacs-diffs] Changes to emacs/lisp/calendar/diary-lib.el |
|
Date: |
Sat, 21 Jun 2003 21:02:23 -0400 |
Index: emacs/lisp/calendar/diary-lib.el
diff -c emacs/lisp/calendar/diary-lib.el:1.67
emacs/lisp/calendar/diary-lib.el:1.68
*** emacs/lisp/calendar/diary-lib.el:1.67 Thu May 8 15:52:47 2003
--- emacs/lisp/calendar/diary-lib.el Sat Jun 21 21:02:22 2003
***************
*** 1,7 ****
;;; diary-lib.el --- diary functions
! ;; Copyright (C) 1989, 1990, 1992, 1993, 1994, 1995 Free Software
! ;; Foundation, Inc.
;; Author: Edward M. Reingold <address@hidden>
;; Keywords: calendar
--- 1,7 ----
;;; diary-lib.el --- diary functions
! ;; Copyright (C) 1989, 1990, 1992, 1993, 1994, 1995, 2003
! ;; Free Software Foundation, Inc.
;; Author: Edward M. Reingold <address@hidden>
;; Keywords: calendar
***************
*** 38,43 ****
--- 38,53 ----
(require 'calendar)
+ (defun diary-check-diary-file ()
+ "Check that the file specified by `diary-file' exists and is readable.
+ If so, return the expanded file name, otherwise signal an error."
+ (let ((d-file (substitute-in-file-name diary-file)))
+ (if (and d-file (file-exists-p d-file))
+ (if (file-readable-p d-file)
+ d-file
+ (error "Diary file `%s' is not readable" diary-file))
+ (error "Diary file `%s' does not exist" diary-file))))
+
;;;###autoload
(defun diary (&optional arg)
"Generate the diary window for ARG days starting with the current date.
***************
*** 45,63 ****
by the variable `number-of-diary-entries'. This function is suitable for
execution in a `.emacs' file."
(interactive "P")
! (let ((d-file (substitute-in-file-name diary-file))
! (date (calendar-current-date)))
! (if (and d-file (file-exists-p d-file))
! (if (file-readable-p d-file)
! (list-diary-entries
! date
! (cond
! (arg (prefix-numeric-value arg))
! ((vectorp number-of-diary-entries)
! (aref number-of-diary-entries (calendar-day-of-week date)))
! (t number-of-diary-entries)))
! (error "Your diary file is not readable!"))
! (error "You don't have a diary file!"))))
(defun view-diary-entries (arg)
"Prepare and display a buffer with diary entries.
--- 55,68 ----
by the variable `number-of-diary-entries'. This function is suitable for
execution in a `.emacs' file."
(interactive "P")
! (diary-check-diary-file)
! (let ((date (calendar-current-date)))
! (list-diary-entries
! date
! (cond (arg (prefix-numeric-value arg))
! ((vectorp number-of-diary-entries)
! (aref number-of-diary-entries (calendar-day-of-week date)))
! (t number-of-diary-entries)))))
(defun view-diary-entries (arg)
"Prepare and display a buffer with diary entries.
***************
*** 65,86 ****
match ARG days starting with the date indicated by the cursor position
in the displayed three-month calendar."
(interactive "p")
! (let ((d-file (substitute-in-file-name diary-file)))
! (if (and d-file (file-exists-p d-file))
! (if (file-readable-p d-file)
! (list-diary-entries (calendar-cursor-to-date t) arg)
! (error "Diary file is not readable!"))
! (error "You don't have a diary file!"))))
(defun view-other-diary-entries (arg d-file)
"Prepare and display buffer of diary entries from an alternative diary file.
! Prompts for a file name and searches that file for entries that match ARG
! days starting with the date indicated by the cursor position in the displayed
! three-month calendar."
(interactive
! (list (cond ((null current-prefix-arg) 1)
! ((listp current-prefix-arg) (car current-prefix-arg))
! (t current-prefix-arg))
(read-file-name "Enter diary file name: " default-directory nil t)))
(let ((diary-file d-file))
(view-diary-entries arg)))
--- 70,85 ----
match ARG days starting with the date indicated by the cursor position
in the displayed three-month calendar."
(interactive "p")
! (diary-check-diary-file)
! (list-diary-entries (calendar-cursor-to-date t) arg))
(defun view-other-diary-entries (arg d-file)
"Prepare and display buffer of diary entries from an alternative diary file.
! Searches for entries that match ARG days, starting with the date indicated
! by the cursor position in the displayed three-month calendar.
! D-FILE specifies the file to use as the diary file."
(interactive
! (list (if arg (prefix-numeric-value arg) 1)
(read-file-name "Enter diary file name: " default-directory nil t)))
(let ((diary-file d-file))
(view-diary-entries arg)))
***************
*** 169,180 ****
(defvar diary-syntax-table (copy-syntax-table (standard-syntax-table))
"The syntax table used when parsing dates in the diary file.
It is the standard syntax table used in Fundamental mode, but with the
! syntax of `*' changed to be a word constituent.")
(modify-syntax-entry ?* "w" diary-syntax-table)
(modify-syntax-entry ?: "w" diary-syntax-table)
- (defvar diary-modified)
(defvar diary-entries-list)
(defvar displayed-year)
(defvar displayed-month)
--- 168,178 ----
(defvar diary-syntax-table (copy-syntax-table (standard-syntax-table))
"The syntax table used when parsing dates in the diary file.
It is the standard syntax table used in Fundamental mode, but with the
! syntax of `*' and `:' changed to be word constituents.")
(modify-syntax-entry ?* "w" diary-syntax-table)
(modify-syntax-entry ?: "w" diary-syntax-table)
(defvar diary-entries-list)
(defvar displayed-year)
(defvar displayed-month)
***************
*** 182,193 ****
(defvar date)
(defvar number)
(defvar date-string)
- (defvar d-file)
(defvar original-date)
(defun diary-attrtype-convert (attrvalue type)
! "Convert the attrvalue from a string to the appropriate type for using
! in a face description"
(let (ret)
(setq ret (cond ((eq type 'string) attrvalue)
((eq type 'symbol) (read attrvalue))
--- 180,190 ----
(defvar date)
(defvar number)
(defvar date-string)
(defvar original-date)
(defun diary-attrtype-convert (attrvalue type)
! "Convert string ATTRVALUE to TYPE appropriate for a face description.
! Valid TYPEs are: string, symbol, int, stringtnil, tnil."
(let (ret)
(setq ret (cond ((eq type 'string) attrvalue)
((eq type 'symbol) (read attrvalue))
***************
*** 297,308 ****
notification function."
(if (< 0 number)
! (let* ((original-date date);; save for possible use in the hooks
! old-diary-syntax-table
! diary-entries-list
! file-glob-attrs
! (date-string (calendar-date-string date))
! (d-file (substitute-in-file-name diary-file)))
(message "Preparing diary...")
(save-excursion
(let ((diary-buffer (find-buffer-visiting d-file)))
--- 294,305 ----
notification function."
(if (< 0 number)
! (let ((original-date date);; save for possible use in the hooks
! old-diary-syntax-table
! diary-entries-list
! file-glob-attrs
! (date-string (calendar-date-string date))
! (d-file (substitute-in-file-name diary-file)))
(message "Preparing diary...")
(save-excursion
(let ((diary-buffer (find-buffer-visiting d-file)))
***************
*** 491,497 ****
(setq buffer-read-only t)
(display-buffer holiday-buffer)
(message "No diary entries for %s" date-string))
! (display-buffer (find-buffer-visiting d-file))
(message "Preparing diary...done"))))
(defface diary-button-face '((((type pc) (class color))
--- 488,495 ----
(setq buffer-read-only t)
(display-buffer holiday-buffer)
(message "No diary entries for %s" date-string))
! (display-buffer (find-buffer-visiting
! (substitute-in-file-name diary-file)))
(message "Preparing diary...done"))))
(defface diary-button-face '((((type pc) (class color))
***************
*** 641,647 ****
(save-excursion
(set-buffer (get-buffer-create fancy-diary-buffer))
(setq buffer-read-only nil)
- (make-local-variable 'mode-line-format)
(calendar-set-mode-line "Diary Entries")
(erase-buffer)
(set-buffer-modified-p nil)
--- 639,644 ----
***************
*** 694,729 ****
all entries, not just some, are visible. If there is no diary buffer, one
is created."
(interactive)
! (let ((d-file (substitute-in-file-name diary-file)))
! (if (and d-file (file-exists-p d-file))
! (if (file-readable-p d-file)
! (save-excursion
! (let ((diary-buffer (find-buffer-visiting d-file)))
! (set-buffer (if diary-buffer
! diary-buffer
! (find-file-noselect d-file t)))
! (let ((buffer-read-only nil)
! (diary-modified (buffer-modified-p)))
! (subst-char-in-region (point-min) (point-max) ?\^M ?\n t)
! (setq selective-display nil)
! (make-local-variable 'mode-line-format)
! (setq mode-line-format default-mode-line-format)
! (display-buffer (current-buffer))
! (set-buffer-modified-p diary-modified))))
! (error "Your diary file is not readable!"))
! (error "You don't have a diary file!"))))
!
!
(defcustom diary-mail-addr
! (if (boundp 'user-mail-address) user-mail-address nil)
"*Email address that `diary-mail-entries' will send email to."
:group 'diary
! :type '(choice string (const nil))
:version "20.3")
(defcustom diary-mail-days 7
! "*Number of days for `diary-mail-entries' to check."
:group 'diary
:type 'integer
:version "20.3")
--- 691,717 ----
all entries, not just some, are visible. If there is no diary buffer, one
is created."
(interactive)
! (let ((d-file (diary-check-diary-file)))
! (save-excursion
! (set-buffer (or (find-buffer-visiting d-file)
! (find-file-noselect d-file t)))
! (let ((buffer-read-only nil)
! (diary-modified (buffer-modified-p)))
! (subst-char-in-region (point-min) (point-max) ?\^M ?\n t)
! (setq selective-display nil
! mode-line-format default-mode-line-format)
! (display-buffer (current-buffer))
! (set-buffer-modified-p diary-modified)))))
(defcustom diary-mail-addr
! (if (boundp 'user-mail-address) user-mail-address "")
"*Email address that `diary-mail-entries' will send email to."
:group 'diary
! :type 'string
:version "20.3")
(defcustom diary-mail-days 7
! "*Default number of days for `diary-mail-entries' to check."
:group 'diary
:type 'integer
:version "20.3")
***************
*** 732,737 ****
--- 720,726 ----
(defun diary-mail-entries (&optional ndays)
"Send a mail message showing diary entries for next NDAYS days.
If no prefix argument is given, NDAYS is set to `diary-mail-days'.
+ Mail is sent to the address specified by `diary-mail-addr'.
You can call `diary-mail-entries' every night using an at/cron job.
For example, this script will run the program at 2am daily. Since
***************
*** 742,747 ****
--- 731,737 ----
# diary-rem.sh -- repeatedly run the Emacs diary-reminder
emacs -batch \\
-eval \"(setq diary-mail-days 3 \\
+ diary-file \\\"/path/to/diary.file\\\" \\
european-calendar-style t \\
diary-mail-addr \\\"address@hidden" )\" \\
-l diary-lib -f diary-mail-entries
***************
*** 752,769 ****
0 1 * * * diary-rem.sh
to run it every morning at 1am."
(interactive "P")
! (let ((diary-display-hook 'fancy-diary-display))
! (list-diary-entries (calendar-current-date) (or ndays diary-mail-days)))
! (compose-mail diary-mail-addr
! (concat "Diary entries generated "
! (calendar-date-string (calendar-current-date))))
! (insert
! (if (get-buffer fancy-diary-buffer)
! (save-excursion
! (set-buffer fancy-diary-buffer)
! (buffer-substring (point-min) (point-max)))
! "No entries found"))
! (call-interactively (get mail-user-agent 'sendfunc)))
(defun diary-name-pattern (string-array &optional fullname)
--- 742,761 ----
0 1 * * * diary-rem.sh
to run it every morning at 1am."
(interactive "P")
! (if (string-equal diary-mail-addr "")
! (error "You must set `diary-mail-addr' to use this command")
! (let ((diary-display-hook 'fancy-diary-display))
! (list-diary-entries (calendar-current-date) (or ndays diary-mail-days)))
! (compose-mail diary-mail-addr
! (concat "Diary entries generated "
! (calendar-date-string (calendar-current-date))))
! (insert
! (if (get-buffer fancy-diary-buffer)
! (save-excursion
! (set-buffer fancy-diary-buffer)
! (buffer-substring (point-min) (point-max)))
! "No entries found"))
! (call-interactively (get mail-user-agent 'sendfunc))))
(defun diary-name-pattern (string-array &optional fullname)
***************
*** 799,925 ****
`mark-diary-entries-hook' are run."
(interactive)
(setq mark-diary-entries-in-calendar t)
! (let (file-glob-attrs
! marks
! (d-file (substitute-in-file-name diary-file))
! (marking-diary-entries t))
! (if (and d-file (file-exists-p d-file))
! (if (file-readable-p d-file)
! (save-excursion
! (message "Marking diary entries...")
! (set-buffer (find-file-noselect d-file t))
! (setq file-glob-attrs (nth 1 (diary-pull-attrs nil '())))
! (let ((d diary-date-forms)
! (old-diary-syntax-table (syntax-table))
! temp)
! (set-syntax-table diary-syntax-table)
! (while d
! (let*
! ((date-form (if (equal (car (car d)) 'backup)
! (cdr (car d))
! (car d)));; ignore 'backup directive
! (dayname (diary-name-pattern calendar-day-name-array))
! (monthname
! (concat
! (diary-name-pattern calendar-month-name-array)
! "\\|\\*"))
! (month "[0-9]+\\|\\*")
! (day "[0-9]+\\|\\*")
! (year "[0-9]+\\|\\*")
! (l (length date-form))
! (d-name-pos (- l (length (memq 'dayname date-form))))
! (d-name-pos (if (/= l d-name-pos) (+ 2 d-name-pos)))
! (m-name-pos (- l (length (memq 'monthname date-form))))
! (m-name-pos (if (/= l m-name-pos) (+ 2 m-name-pos)))
! (d-pos (- l (length (memq 'day date-form))))
! (d-pos (if (/= l d-pos) (+ 2 d-pos)))
! (m-pos (- l (length (memq 'month date-form))))
! (m-pos (if (/= l m-pos) (+ 2 m-pos)))
! (y-pos (- l (length (memq 'year date-form))))
! (y-pos (if (/= l y-pos) (+ 2 y-pos)))
! (regexp
! (concat
! "\\(\\`\\|\^M\\|\n\\)\\("
! (mapconcat 'eval date-form "\\)\\(")
! "\\)"))
! (case-fold-search t))
! (goto-char (point-min))
! (while (re-search-forward regexp nil t)
! (let* ((dd-name
! (if d-name-pos
! (buffer-substring-no-properties
! (match-beginning d-name-pos)
! (match-end d-name-pos))))
! (mm-name
! (if m-name-pos
! (buffer-substring-no-properties
! (match-beginning m-name-pos)
! (match-end m-name-pos))))
! (mm (string-to-int
! (if m-pos
! (buffer-substring-no-properties
! (match-beginning m-pos)
! (match-end m-pos))
! "")))
! (dd (string-to-int
! (if d-pos
! (buffer-substring-no-properties
! (match-beginning d-pos)
! (match-end d-pos))
! "")))
! (y-str (if y-pos
! (buffer-substring-no-properties
! (match-beginning y-pos)
! (match-end y-pos))))
! (yy (if (not y-str)
! 0
! (if (and (= (length y-str) 2)
! abbreviated-calendar-year)
! (let* ((current-y
! (extract-calendar-year
! (calendar-current-date)))
! (y (+ (string-to-int y-str)
! (* 100
! (/ current-y 100)))))
! (if (> (- y current-y) 50)
! (- y 100)
! (if (> (- current-y y) 50)
! (+ y 100)
! y)))
! (string-to-int y-str))))
! (save-excursion
! (setq entry (buffer-substring-no-properties
(point) (line-end-position))
! temp (diary-pull-attrs entry
file-glob-attrs)
! entry (nth 0 temp)
! marks (nth 1 temp))))
! (if dd-name
! (mark-calendar-days-named
! (cdr (assoc-ignore-case
! (substring dd-name 0 3)
! (calendar-make-alist
! calendar-day-name-array
! 0
! (lambda (x) (substring x 0 3))))) marks)
! (if mm-name
! (if (string-equal mm-name "*")
! (setq mm 0)
! (setq mm
! (cdr (assoc-ignore-case
! (substring mm-name 0 3)
! (calendar-make-alist
! calendar-month-name-array
! 1
! (lambda (x) (substring x 0 3)))
! )))))
! (mark-calendar-date-pattern mm dd yy marks))))
! (setq d (cdr d))))
! (mark-sexp-diary-entries)
! (run-hooks 'nongregorian-diary-marking-hook
! 'mark-diary-entries-hook)
! (set-syntax-table old-diary-syntax-table)
! (message "Marking diary entries...done")))
! (error "Your diary file is not readable!"))
! (error "You don't have a diary file!"))))
(defun mark-sexp-diary-entries ()
"Mark days in the calendar window that have sexp diary entries.
--- 791,910 ----
`mark-diary-entries-hook' are run."
(interactive)
(setq mark-diary-entries-in-calendar t)
! (let ((marking-diary-entries t)
! file-glob-attrs marks)
! (save-excursion
! (set-buffer (find-file-noselect (diary-check-diary-file) t))
! (message "Marking diary entries...")
! (setq file-glob-attrs (nth 1 (diary-pull-attrs nil '())))
! (let ((d diary-date-forms)
! (old-diary-syntax-table (syntax-table))
! temp)
! (set-syntax-table diary-syntax-table)
! (while d
! (let* ((date-form (if (equal (car (car d)) 'backup)
! (cdr (car d))
! (car d)));; ignore 'backup directive
! (dayname (diary-name-pattern calendar-day-name-array))
! (monthname
! (concat
! (diary-name-pattern calendar-month-name-array)
! "\\|\\*"))
! (month "[0-9]+\\|\\*")
! (day "[0-9]+\\|\\*")
! (year "[0-9]+\\|\\*")
! (l (length date-form))
! (d-name-pos (- l (length (memq 'dayname date-form))))
! (d-name-pos (if (/= l d-name-pos) (+ 2 d-name-pos)))
! (m-name-pos (- l (length (memq 'monthname date-form))))
! (m-name-pos (if (/= l m-name-pos) (+ 2 m-name-pos)))
! (d-pos (- l (length (memq 'day date-form))))
! (d-pos (if (/= l d-pos) (+ 2 d-pos)))
! (m-pos (- l (length (memq 'month date-form))))
! (m-pos (if (/= l m-pos) (+ 2 m-pos)))
! (y-pos (- l (length (memq 'year date-form))))
! (y-pos (if (/= l y-pos) (+ 2 y-pos)))
! (regexp
! (concat
! "\\(\\`\\|\^M\\|\n\\)\\("
! (mapconcat 'eval date-form "\\)\\(")
! "\\)"))
! (case-fold-search t))
! (goto-char (point-min))
! (while (re-search-forward regexp nil t)
! (let* ((dd-name
! (if d-name-pos
! (buffer-substring-no-properties
! (match-beginning d-name-pos)
! (match-end d-name-pos))))
! (mm-name
! (if m-name-pos
! (buffer-substring-no-properties
! (match-beginning m-name-pos)
! (match-end m-name-pos))))
! (mm (string-to-int
! (if m-pos
! (buffer-substring-no-properties
! (match-beginning m-pos)
! (match-end m-pos))
! "")))
! (dd (string-to-int
! (if d-pos
! (buffer-substring-no-properties
! (match-beginning d-pos)
! (match-end d-pos))
! "")))
! (y-str (if y-pos
! (buffer-substring-no-properties
! (match-beginning y-pos)
! (match-end y-pos))))
! (yy (if (not y-str)
! 0
! (if (and (= (length y-str) 2)
! abbreviated-calendar-year)
! (let* ((current-y
! (extract-calendar-year
! (calendar-current-date)))
! (y (+ (string-to-int y-str)
! (* 100
! (/ current-y 100)))))
! (if (> (- y current-y) 50)
! (- y 100)
! (if (> (- current-y y) 50)
! (+ y 100)
! y)))
! (string-to-int y-str))))
! (save-excursion
! (setq entry (buffer-substring-no-properties
! (point) (line-end-position))
! temp (diary-pull-attrs entry file-glob-attrs)
! entry (nth 0 temp)
! marks (nth 1 temp))))
! (if dd-name
! (mark-calendar-days-named
! (cdr (assoc-ignore-case
! (substring dd-name 0 3)
! (calendar-make-alist
! calendar-day-name-array
! 0
! (lambda (x) (substring x 0 3))))) marks)
! (if mm-name
! (if (string-equal mm-name "*")
! (setq mm 0)
! (setq mm
! (cdr (assoc-ignore-case
! (substring mm-name 0 3)
! (calendar-make-alist
! calendar-month-name-array
! 1
! (lambda (x) (substring x 0 3))))))))
! (mark-calendar-date-pattern mm dd yy marks))))
! (setq d (cdr d))))
! (mark-sexp-diary-entries)
! (run-hooks 'nongregorian-diary-marking-hook
! 'mark-diary-entries-hook)
! (set-syntax-table old-diary-syntax-table)
! (message "Marking diary entries...done")))))
(defun mark-sexp-diary-entries ()
"Mark days in the calendar window that have sexp diary entries.
***************
*** 927,942 ****
is marked. See the documentation for the function `list-sexp-diary-entries'."
(let* ((sexp-mark (regexp-quote sexp-diary-entry-symbol))
(s-entry (concat "\\(\\`\\|\^M\\|\n\\)\\("
! (regexp-quote sexp-mark) "(\\)\\|\\("
(regexp-quote diary-nonmarking-symbol)
! (regexp-quote sexp-mark) "(diary-remind\\)"))
! (m)
! (y)
! (first-date)
! (last-date)
! (mark)
! file-glob-attrs)
! (setq file-glob-attrs (nth 1 (diary-pull-attrs nil '())))
(save-excursion
(set-buffer calendar-buffer)
(setq m displayed-month)
--- 912,922 ----
is marked. See the documentation for the function `list-sexp-diary-entries'."
(let* ((sexp-mark (regexp-quote sexp-diary-entry-symbol))
(s-entry (concat "\\(\\`\\|\^M\\|\n\\)\\("
! sexp-mark "(\\)\\|\\("
(regexp-quote diary-nonmarking-symbol)
! sexp-mark "(diary-remind\\)"))
! (file-glob-attrs (nth 1 (diary-pull-attrs nil '())))
! m y first-date last-date mark file-glob-attrs)
(save-excursion
(set-buffer calendar-buffer)
(setq m displayed-month)
***************
*** 950,958 ****
(list m (calendar-last-day-of-month m y) y)))
(goto-char (point-min))
(while (re-search-forward s-entry nil t)
! (if (char-equal (preceding-char) ?\()
! (setq marking-diary-entry t)
! (setq marking-diary-entry nil))
(re-search-backward "(")
(let ((sexp-start (point))
sexp entry entry-start line-start marks)
--- 930,936 ----
(list m (calendar-last-day-of-month m y) y)))
(goto-char (point-min))
(while (re-search-forward s-entry nil t)
! (setq marking-diary-entry (char-equal (preceding-char) ?\())
(re-search-backward "(")
(let ((sexp-start (point))
sexp entry entry-start line-start marks)
***************
*** 1288,1308 ****
Marking these entries is *extremely* time consuming, so these entries are
best if they are nonmarking."
! (let* ((mark (regexp-quote diary-nonmarking-symbol))
! (sexp-mark (regexp-quote sexp-diary-entry-symbol))
! (s-entry (concat "\\(\\`\\|\^M\\|\n\\)" mark "?" sexp-mark "("))
! entry-found file-glob-attrs marks)
(goto-char (point-min))
(save-excursion
(setq file-glob-attrs (nth 1 (diary-pull-attrs nil '()))))
(while (re-search-forward s-entry nil t)
(backward-char 1)
(let ((sexp-start (point))
! (sexp)
! (entry)
! (specifier)
! (entry-start)
! (line-start))
(forward-sexp)
(setq sexp (buffer-substring-no-properties sexp-start (point)))
(save-excursion
--- 1266,1284 ----
Marking these entries is *extremely* time consuming, so these entries are
best if they are nonmarking."
! (let ((s-entry (concat "\\(\\`\\|\^M\\|\n\\)"
! (regexp-quote diary-nonmarking-symbol)
! "?"
! (regexp-quote sexp-diary-entry-symbol)
! "("))
! entry-found file-glob-attrs marks)
(goto-char (point-min))
(save-excursion
(setq file-glob-attrs (nth 1 (diary-pull-attrs nil '()))))
(while (re-search-forward s-entry nil t)
(backward-char 1)
(let ((sexp-start (point))
! sexp entry specifier entry-start line-start)
(forward-sexp)
(setq sexp (buffer-substring-no-properties sexp-start (point)))
(save-excursion
***************
*** 1382,1396 ****
An optional parameter MARK specifies a face or single-character string to
use when highlighting the day in the calendar."
! (let* ((dd (if european-calendar-style
month
day))
! (mm (if european-calendar-style
day
month))
! (m (extract-calendar-month date))
! (y (extract-calendar-year date))
! (d (extract-calendar-day date)))
(if (and
(or (and (listp dd) (memq d dd))
(equal d dd)
--- 1358,1372 ----
An optional parameter MARK specifies a face or single-character string to
use when highlighting the day in the calendar."
! (let ((dd (if european-calendar-style
month
day))
! (mm (if european-calendar-style
day
month))
! (m (extract-calendar-month date))
! (y (extract-calendar-year date))
! (d (extract-calendar-day date)))
(if (and
(or (and (listp dd) (memq d dd))
(equal d dd)
***************
*** 1616,1624 ****
(defun make-diary-entry (string &optional nonmarking file)
"Insert a diary entry STRING which may be NONMARKING in FILE.
! If omitted, NONMARKING defaults to nil and FILE defaults to diary-file."
! (find-file-other-window
! (substitute-in-file-name (if file file diary-file)))
(widen)
(goto-char (point-max))
(when (let ((case-fold-search t))
--- 1592,1599 ----
(defun make-diary-entry (string &optional nonmarking file)
"Insert a diary entry STRING which may be NONMARKING in FILE.
! If omitted, NONMARKING defaults to nil and FILE defaults to `diary-file'."
! (find-file-other-window (substitute-in-file-name (or file diary-file)))
(widen)
(goto-char (point-max))
(when (let ((case-fold-search t))
***************
*** 1651,1660 ****
"Insert a monthly diary entry for the day of the month indicated by point.
Prefix arg will make the entry nonmarking."
(interactive "P")
! (let* ((calendar-date-display-form
! (if european-calendar-style
! '(day " * ")
! '("* " day))))
(make-diary-entry (calendar-date-string (calendar-cursor-to-date t) t)
arg)))
--- 1626,1635 ----
"Insert a monthly diary entry for the day of the month indicated by point.
Prefix arg will make the entry nonmarking."
(interactive "P")
! (let ((calendar-date-display-form
! (if european-calendar-style
! '(day " * ")
! '("* " day))))
(make-diary-entry (calendar-date-string (calendar-cursor-to-date t) t)
arg)))
***************
*** 1662,1671 ****
"Insert an annual diary entry for the day of the year indicated by point.
Prefix arg will make the entry nonmarking."
(interactive "P")
! (let* ((calendar-date-display-form
! (if european-calendar-style
! '(day " " monthname)
! '(monthname " " day))))
(make-diary-entry (calendar-date-string (calendar-cursor-to-date t) t)
arg)))
--- 1637,1646 ----
"Insert an annual diary entry for the day of the year indicated by point.
Prefix arg will make the entry nonmarking."
(interactive "P")
! (let ((calendar-date-display-form
! (if european-calendar-style
! '(day " " monthname)
! '(monthname " " day))))
(make-diary-entry (calendar-date-string (calendar-cursor-to-date t) t)
arg)))
***************
*** 1673,1682 ****
"Insert an anniversary diary entry for the date given by point.
Prefix arg will make the entry nonmarking."
(interactive "P")
! (let* ((calendar-date-display-form
! (if european-calendar-style
! '(day " " month " " year)
! '(month " " day " " year))))
(make-diary-entry
(format "%s(diary-anniversary %s)"
sexp-diary-entry-symbol
--- 1648,1657 ----
"Insert an anniversary diary entry for the date given by point.
Prefix arg will make the entry nonmarking."
(interactive "P")
! (let ((calendar-date-display-form
! (if european-calendar-style
! '(day " " month " " year)
! '(month " " day " " year))))
(make-diary-entry
(format "%s(diary-anniversary %s)"
sexp-diary-entry-symbol
***************
*** 1687,1701 ****
"Insert a block diary entry for the days between the point and marked date.
Prefix arg will make the entry nonmarking."
(interactive "P")
! (let* ((calendar-date-display-form
! (if european-calendar-style
! '(day " " month " " year)
! '(month " " day " " year)))
(cursor (calendar-cursor-to-date t))
(mark (or (car calendar-mark-ring)
(error "No mark set in this buffer")))
! (start)
! (end))
(if (< (calendar-absolute-from-gregorian mark)
(calendar-absolute-from-gregorian cursor))
(setq start mark
--- 1662,1675 ----
"Insert a block diary entry for the days between the point and marked date.
Prefix arg will make the entry nonmarking."
(interactive "P")
! (let ((calendar-date-display-form
! (if european-calendar-style
! '(day " " month " " year)
! '(month " " day " " year)))
(cursor (calendar-cursor-to-date t))
(mark (or (car calendar-mark-ring)
(error "No mark set in this buffer")))
! start end)
(if (< (calendar-absolute-from-gregorian mark)
(calendar-absolute-from-gregorian cursor))
(setq start mark
***************
*** 1713,1722 ****
"Insert a cyclic diary entry starting at the date given by point.
Prefix arg will make the entry nonmarking."
(interactive "P")
! (let* ((calendar-date-display-form
! (if european-calendar-style
! '(day " " month " " year)
! '(month " " day " " year))))
(make-diary-entry
(format "%s(diary-cyclic %d %s)"
sexp-diary-entry-symbol
--- 1687,1696 ----
"Insert a cyclic diary entry starting at the date given by point.
Prefix arg will make the entry nonmarking."
(interactive "P")
! (let ((calendar-date-display-form
! (if european-calendar-style
! '(day " " month " " year)
! '(month " " day " " year))))
(make-diary-entry
(format "%s(diary-cyclic %d %s)"
sexp-diary-entry-symbol
***************
*** 1788,1801 ****
"Create a list of font-lock patterns for `diary-date-forms' with MONTH-LIST.
If given, optional SYMBOL must be a prefix to entries.
If optional NOABBREV is t, do not allow abbreviations in names."
! (let* ((dayname
! (concat "\\(" (diary-name-pattern calendar-day-name-array) "\\)"))
! (monthname (concat "\\("
! (diary-name-pattern month-list noabbrev)
! "\\|\\*\\)"))
! (month "\\([0-9]+\\|\\*\\)")
! (day "\\([0-9]+\\|\\*\\)")
! (year "-?\\([0-9]+\\|\\*\\)"))
(mapcar '(lambda (x)
(cons
(concat "^" (regexp-quote diary-nonmarking-symbol) "?"
--- 1762,1775 ----
"Create a list of font-lock patterns for `diary-date-forms' with MONTH-LIST.
If given, optional SYMBOL must be a prefix to entries.
If optional NOABBREV is t, do not allow abbreviations in names."
! (let ((dayname
! (concat "\\(" (diary-name-pattern calendar-day-name-array) "\\)"))
! (monthname (concat "\\("
! (diary-name-pattern month-list noabbrev)
! "\\|\\*\\)"))
! (month "\\([0-9]+\\|\\*\\)")
! (day "\\([0-9]+\\|\\*\\)")
! (year "-?\\([0-9]+\\|\\*\\)"))
(mapcar '(lambda (x)
(cons
(concat "^" (regexp-quote diary-nonmarking-symbol) "?"
***************
*** 1817,1840 ****
(defvar diary-font-lock-keywords
(append
(font-lock-diary-date-forms calendar-month-name-array)
! (if (or (memq 'mark-hebrew-diary-entries
! nongregorian-diary-marking-hook)
! (memq 'list-hebrew-diary-entries
! nongregorian-diary-listing-hook))
! (progn
! (require 'cal-hebrew)
! (font-lock-diary-date-forms
! calendar-hebrew-month-name-array-leap-year
! hebrew-diary-entry-symbol t)))
! (if (or (memq 'mark-islamic-diary-entries
! nongregorian-diary-marking-hook)
! (memq 'list-islamic-diary-entries
! nongregorian-diary-listing-hook))
! (progn
! (require 'cal-islamic)
! (font-lock-diary-date-forms
! calendar-islamic-month-name-array-leap-year
! islamic-diary-entry-symbol t)))
(list
(cons
(concat "^" (regexp-quote diary-include-string) ".*$")
--- 1791,1812 ----
(defvar diary-font-lock-keywords
(append
(font-lock-diary-date-forms calendar-month-name-array)
! (when (or (memq 'mark-hebrew-diary-entries
! nongregorian-diary-marking-hook)
! (memq 'list-hebrew-diary-entries
! nongregorian-diary-listing-hook))
! (require 'cal-hebrew)
! (font-lock-diary-date-forms
! calendar-hebrew-month-name-array-leap-year
! hebrew-diary-entry-symbol t))
! (when (or (memq 'mark-islamic-diary-entries
! nongregorian-diary-marking-hook)
! (memq 'list-islamic-diary-entries
! nongregorian-diary-listing-hook))
! (require 'cal-islam)
! (font-lock-diary-date-forms
! calendar-islamic-month-name-array
! islamic-diary-entry-symbol t))
(list
(cons
(concat "^" (regexp-quote diary-include-string) ".*$")
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/calendar/diary-lib.el,
Glenn Morris <=