emacs: lisp/calendar/diary-lib.el comparison

comparison lisp/calendar/diary-lib.el @ 46826:e020f18c490a

(diary-mail-entries): Use `compose-mail' and `mail-user-agent' instead of straight sendmail. (diary-modified, diary-entries-list, displayed-year) (displayed-month, entry, date, number, date-string, d-file) (original-date): defvar without binding to avoid compiler warnings.

author	Sam Steingold <sds@gnu.org>
date	Tue, 06 Aug 2002 15:11:26 +0000
parents	f367f20901c0
children	88f34e3227e6

comparison

equal deleted inserted replaced

-:f43392bbb789
+:e020f18c490a
 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)
+(defvar entry)
+(defvar date)
+(defvar number)
+(defvar date-string)
+(defvar d-file)
+(defvar original-date)
 (defun list-diary-entries (date number)
 "Create and display a buffer containing the relevant lines in diary-file.
 The arguments are DATE and NUMBER; the entries selected are those
 for NUMBER days starting with date DATE.  The other entries are hidden
 using selective display.
 `diary-hook' is run last.  This can be used for an appointment
 notification function."
 (if (< 0 number)
 (let* ((original-date date);; save for possible use in the hooks
-(old-diary-syntax-table)
+old-diary-syntax-table
-(diary-entries-list)
+diary-entries-list
 (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)))
 (diary-list-include-blanks t)
 (text (progn (list-diary-entries (calendar-current-date)
 (if ndays ndays diary-mail-days))
 (set-buffer fancy-diary-buffer)
 (buffer-substring (point-min) (point-max)))))
-(mail)
+(compose-mail diary-mail-addr
-(mail-to) (insert diary-mail-addr)
+(concat "Diary entries generated "
-(mail-subject) (insert "Diary entries generated "
+(calendar-date-string (calendar-current-date))))
-(calendar-date-string (calendar-current-date)))
+(insert text)
-(mail-text) (insert text)
+(funcall (get mail-user-agent 'sendfunc))))
-(mail-send-and-exit nil)))
 (defun diary-name-pattern (string-array &optional fullname)
 "Convert an STRING-ARRAY, an array of strings to a pattern.
 The pattern will match any of the strings, either entirely or abbreviated
 (aset entry (match-beginning 0) ?\n )))
 (calendar-for-loop date from first-date to last-date do
 (if (setq mark (diary-sexp-entry sexp entry
 (calendar-gregorian-from-absolute date)))
 (mark-visible-calendar-date
 (calendar-gregorian-from-absolute date)
 (if (consp mark)
 (car mark)))))))))
 (defun mark-included-diary-files ()
 "Mark the diary entries from other diary files with those of the diary file.
 %%(diary-date MONTH DAY YEAR &optional MARK) text
 Entry applies if date is MONTH, DAY, YEAR if
 `european-calendar-style' is nil, and DAY, MONTH, YEAR if
 `european-calendar-style' is t.  DAY, MONTH, and YEAR
 can be lists of integers, the constant t, or an integer.
 The constant t means all values.  An optional parameter
 MARK specifies a face or single-character string to use
 when highlighting the day in the calendar.
 %%(diary-float MONTH DAYNAME N &optional DAY MARK) text
 Entry will appear on the Nth DAYNAME of MONTH.
 (DAYNAME=0 means Sunday, 1 means Monday, and so on;
 if N is negative it counts backward from the end of
 the month.  MONTH can be a list of months, a single
 month, or t to specify all months. Optional DAY means
 Nth DAYNAME of MONTH on or after/before DAY.  DAY defaults
 to 1 if N>0 and the last day of the month if N<0.  An
 optional parameter MARK specifies a face or single-character
 string to use when highlighting the day in the calendar.
 %%(diary-block M1 D1 Y1 M2 D2 Y2 &optional MARK) text
 Entry will appear on dates between M1/D1/Y1 and M2/D2/Y2,
 inclusive.  (If `european-calendar-style' is t, the
 order of the parameters should be changed to D1, M1, Y1,
 D2, M2, Y2.)  An optional parameter MARK specifies a face
 or single-character string to use when highlighting the
 day in the calendar.
 %%(diary-anniversary MONTH DAY YEAR &optional MARK) text
 Entry will appear on anniversary dates of MONTH DAY, YEAR.
 (If `european-calendar-style' is t, the order of the
 parameters should be changed to DAY, MONTH, YEAR.)  Text
 can contain %d or %d%s; %d will be replaced by the number
 of years since the MONTH DAY, YEAR and %s will be replaced
 by the ordinal ending of that number (that is, `st', `nd',
 `rd' or `th', as appropriate.  The anniversary of February
 29 is considered to be March 1 in a non-leap year.  An
 optional parameter MARK specifies a face or single-character
 string to use when highlighting the day in the calendar.
 %%(diary-cyclic N MONTH DAY YEAR &optional MARK) text
 Entry will appear every N days, starting MONTH DAY, YEAR.
 (If `european-calendar-style' is t, the order of the
 parameters should be changed to N, DAY, MONTH, YEAR.)  Text
 can contain %d or %d%s; %d will be replaced by the number
 of repetitions since the MONTH DAY, YEAR and %s will
 be replaced by the ordinal ending of that number (that is,
 `st', `nd', `rd' or `th', as appropriate.  An optional
 parameter MARK specifies a face or single-character string
 to use when highlighting the day in the calendar.
 %%(diary-remind SEXP DAYS &optional MARKING) text
 Entry is a reminder for diary sexp SEXP.  DAYS is either a
 single number or a list of numbers indicating the number(s)
 (while (string-match "[\^M]" entry)
 (aset entry (match-beginning 0) ?\n )))
 (let ((diary-entry (diary-sexp-entry sexp entry date)))
 (if diary-entry
 (subst-char-in-region line-start (point) ?\^M ?\n t))
 (add-to-diary-list date
 			     (if (consp diary-entry)
 				 (cdr diary-entry)
 			       diary-entry)
 			     specifier)
 	  (setq entry-found (or entry-found diary-entry)))))
 Entry applies if date is MONTH, DAY, YEAR if `european-calendar-style' is nil,
 and DAY, MONTH, YEAR if `european-calendar-style' is t.  DAY, MONTH, and YEAR
 can be lists of integers, the constant t, or an integer.  The constant t means
 all values.
 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
 Entry applies if date is between, or on one of, two dates.
 The order of the parameters is
 M1, D1, Y1, M2, D2, Y2 if `european-calendar-style' is nil, and
 D1, M1, Y1, D2, M2, Y2 if `european-calendar-style' is t.
 An optional parameter MARK specifies a face or single-character string to
 use when highlighting the day in the calendar."
 (let ((date1 (calendar-absolute-from-gregorian
 (if european-calendar-style
 (list d1 m1 y1)
 Parameters are MONTH, DAYNAME, N.  MONTH can be a list of months, the constant
 t, or an integer.  The constant t means all months.  If N is negative, count
 backward from the end of the month.
 An optional parameter DAY means the Nth DAYNAME on or after/before MONTH DAY.
 Optional MARK specifies a face or single-character string to use when
 highlighting the day in the calendar."
 ;; This is messy because the diary entry may apply, but the date on which it
 ;; is based can be in a different month/year.  For example, asking for the
 ;; first Monday after December 30.  For large values of |n| the problem is
 ;; more grotesque.
 %d will be replaced by the number of years since the MONTH DAY, YEAR and the
 %s will be replaced by the ordinal ending of that number (that is, `st', `nd',
 `rd' or `th', as appropriate.  The anniversary of February 29 is considered
 to be March 1 in non-leap years.
 An optional parameter MARK specifies a face or single-character string to
 use when highlighting the day in the calendar."
 (let* ((d (if european-calendar-style
 month
 day))
 (m (if european-calendar-style
 ENTRY can contain `%d' or `%d%s'; the %d will be replaced by the number of
 repetitions since the MONTH DAY, YEAR and %s will be replaced by the
 ordinal ending of that number (that is, `st', `nd', `rd' or `th', as
 appropriate.
 An optional parameter MARK specifies a face or single-character string to
 use when highlighting the day in the calendar."
 (let* ((d (if european-calendar-style
 month
 day))
 (m (if european-calendar-style

Mercurial > emacs

comparison lisp/calendar/diary-lib.el @ 46826:e020f18c490a