Mercurial > emacs
comparison lisp/calendar/appt.el @ 90399:a5812696f7bf unicode-pre-font-backend
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 274-284)
- Update from CVS
- Update etc/MORE.STUFF.
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 101)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-62
author | Miles Bader <miles@gnu.org> |
---|---|
date | Wed, 17 May 2006 07:46:49 +0000 |
parents | c156f6a9e7b5 95f7f08b0a17 |
children | 138ce2701550 |
comparison
equal
deleted
inserted
replaced
90398:1f8d5cd37cf0 | 90399:a5812696f7bf |
---|---|
351 (diary) | 351 (diary) |
352 ;; If the diary buffer existed before this command, | 352 ;; If the diary buffer existed before this command, |
353 ;; restore its display state. Otherwise, kill it. | 353 ;; restore its display state. Otherwise, kill it. |
354 (if d-buff | 354 (if d-buff |
355 ;; Displays the diary buffer. | 355 ;; Displays the diary buffer. |
356 (or selective (show-all-diary-entries)) | 356 (or selective (diary-show-all-entries)) |
357 (and | 357 (and |
358 (setq d-buff (find-buffer-visiting | 358 (setq d-buff (find-buffer-visiting |
359 (substitute-in-file-name diary-file))) | 359 (substitute-in-file-name diary-file))) |
360 (kill-buffer d-buff))))) | 360 (kill-buffer d-buff))))) |
361 (error nil))) | 361 (error nil))) |
534 (defun appt-make-list () | 534 (defun appt-make-list () |
535 "Update the appointments list from today's diary buffer. | 535 "Update the appointments list from today's diary buffer. |
536 The time must be at the beginning of a line for it to be | 536 The time must be at the beginning of a line for it to be |
537 put in the appointments list (see examples in documentation of | 537 put in the appointments list (see examples in documentation of |
538 the function `appt-check'). We assume that the variables DATE and | 538 the function `appt-check'). We assume that the variables DATE and |
539 NUMBER hold the arguments that `list-diary-entries' received. | 539 NUMBER hold the arguments that `diary-list-entries' received. |
540 They specify the range of dates that the diary is being processed for. | 540 They specify the range of dates that the diary is being processed for. |
541 | 541 |
542 Any appointments made with `appt-add' are not affected by this | 542 Any appointments made with `appt-add' are not affected by this |
543 function. | 543 function. |
544 | 544 |