Mercurial > emacs

comparison lisp/calendar/diary-lib.el @ 90224:2d92f5c9d6ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-78 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 514-518) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 104-105) - Update from CVS
author Miles Bader <miles@gnu.org>
date Fri, 26 Aug 2005 09:51:52 +0000
parents f9a65d7ebd29 3c2360bf81c4
children fa0da9b57058
comparison
equal deleted inserted replaced
90223:edf295560b5a 90224:2d92f5c9d6ae
1648 ;; Diary entry may apply to one of a list of days before date 1648 ;; Diary entry may apply to one of a list of days before date
1649 ((and (listp days) days) 1649 ((and (listp days) days)
1650 (or (diary-remind sexp (car days) marking) 1650 (or (diary-remind sexp (car days) marking)
1651 (diary-remind sexp (cdr days) marking)))))) 1651 (diary-remind sexp (cdr days) marking))))))
1652 1652
1653 (defvar diary-modify-entry-list-string-function nil
1654 "Function applied to entry string before putting it into the entries list.
1655 Can be used by programs integrating a diary list into other buffers (e.g.
1656 org.el and planner.el) to modify the string or add properties to it.
1657 The function takes a string argument and must return a string.")
1658
1653 (defun add-to-diary-list (date string specifier &optional marker globcolor) 1659 (defun add-to-diary-list (date string specifier &optional marker globcolor)
1654 "Add the entry (DATE STRING SPECIFIER MARKER GLOBCOLOR) to `diary-entries-list'. 1660 "Add the entry (DATE STRING SPECIFIER MARKER GLOBCOLOR) to `diary-entries-list'.
1655 Do nothing if DATE or STRING is nil." 1661 Do nothing if DATE or STRING is nil."
1656 (when (and date string) 1662 (when (and date string)
1657 (if diary-file-name-prefix 1663 (if diary-file-name-prefix
1658 (let ((prefix (funcall diary-file-name-prefix-function 1664 (let ((prefix (funcall diary-file-name-prefix-function
1659 (buffer-file-name)))) 1665 (buffer-file-name))))
1660 (or (string= prefix "") 1666 (or (string= prefix "")
1661 (setq string (format "[%s] %s" prefix string))))) 1667 (setq string (format "[%s] %s" prefix string)))))
1668 (and diary-modify-entry-list-string-function
1669 (setq string (funcall diary-modify-entry-list-string-function
1670 string)))
1662 (setq diary-entries-list 1671 (setq diary-entries-list
1663 (append diary-entries-list 1672 (append diary-entries-list
1664 (list (list date string specifier marker globcolor)))))) 1673 (list (list date string specifier marker globcolor))))))
1665 1674
1666 (defun diary-redraw-calendar () 1675 (defun diary-redraw-calendar ()