Mercurial > emacs
comparison lisp/calendar/diary-lib.el @ 27842:cfa579c1229f
(include-other-diary-files): Undo the selective
display in any included file and don't kill it.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Thu, 24 Feb 2000 13:47:36 +0000 |
| parents | d0f895577892 |
| children | a71031623500 |
comparison
equal
deleted
inserted
replaced
| 27841:d3dca8568200 | 27842:cfa579c1229f |
|---|---|
| 361 (concat | 361 (concat |
| 362 "\\(\\`\\|\^M\\|\n\\)" | 362 "\\(\\`\\|\^M\\|\n\\)" |
| 363 (regexp-quote diary-include-string) | 363 (regexp-quote diary-include-string) |
| 364 " \"\\([^\"]*\\)\"") | 364 " \"\\([^\"]*\\)\"") |
| 365 nil t) | 365 nil t) |
| 366 (let ((diary-file (substitute-in-file-name | 366 (let* ((diary-file (substitute-in-file-name |
| 367 (buffer-substring-no-properties | 367 (buffer-substring-no-properties |
| 368 (match-beginning 2) (match-end 2)))) | 368 (match-beginning 2) (match-end 2)))) |
| 369 (diary-list-include-blanks nil) | 369 (diary-list-include-blanks nil) |
| 370 (list-diary-entries-hook 'include-other-diary-files) | 370 (list-diary-entries-hook 'include-other-diary-files) |
| 371 (diary-display-hook 'ignore) | 371 (diary-display-hook 'ignore) |
| 372 (diary-hook nil)) | 372 (diary-hook nil) |
| 373 (d-buffer (find-buffer-visiting diary-file)) | |
| 374 (diary-modified (if d-buffer | |
| 375 (save-excursion | |
| 376 (set-buffer d-buffer) | |
| 377 (buffer-modified-p))))) | |
| 373 (if (file-exists-p diary-file) | 378 (if (file-exists-p diary-file) |
| 374 (if (file-readable-p diary-file) | 379 (if (file-readable-p diary-file) |
| 375 (unwind-protect | 380 (unwind-protect |
| 376 (setq diary-entries-list | 381 (setq diary-entries-list |
| 377 (append diary-entries-list | 382 (append diary-entries-list |
| 378 (list-diary-entries original-date number))) | 383 (list-diary-entries original-date number))) |
| 379 (kill-buffer (find-buffer-visiting diary-file))) | 384 (set-buffer (find-buffer-visiting diary-file)) |
| 385 (subst-char-in-region (point-min) (point-max) ?\^M ?\n t) | |
| 386 (setq selective-display nil) | |
| 387 (set-buffer-modified-p diary-modified)) | |
| 380 (beep) | 388 (beep) |
| 381 (message "Can't read included diary file %s" diary-file) | 389 (message "Can't read included diary file %s" diary-file) |
| 382 (sleep-for 2)) | 390 (sleep-for 2)) |
| 383 (beep) | 391 (beep) |
| 384 (message "Can't find included diary file %s" diary-file) | 392 (message "Can't find included diary file %s" diary-file) |