Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-21 20:37:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

(include-other-diary-files): Undo the selective

Browse source 
display in any included file and don't kill it.
This commit is contained in:
Gerd Moellmann 2000-02-24 13:47:36 +00:00
parent d066de8eb4
commit cb8325bf52
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lisp/calendar/diary-lib.el
View file

@ -363,20 +363,28 @@ changing the variable `diary-include-string'."
(regexp-quote diary-include-string)
" \"\\([^\"]*\\)\"")
nil t)
(let ((diary-file (substitute-in-file-name
(buffer-substring-no-properties
(match-beginning 2) (match-end 2))))
(diary-list-include-blanks nil)
(list-diary-entries-hook 'include-other-diary-files)
(diary-display-hook 'ignore)
(diary-hook nil))
(let* ((diary-file (substitute-in-file-name
(buffer-substring-no-properties
(match-beginning 2) (match-end 2))))
(diary-list-include-blanks nil)
(list-diary-entries-hook 'include-other-diary-files)
(diary-display-hook 'ignore)
(diary-hook nil)
(d-buffer (find-buffer-visiting diary-file))
(diary-modified (if d-buffer
(save-excursion
(set-buffer d-buffer)
(buffer-modified-p)))))
(if (file-exists-p diary-file)
(if (file-readable-p diary-file)
(unwind-protect
(setq diary-entries-list
(append diary-entries-list
(list-diary-entries original-date number)))
(kill-buffer (find-buffer-visiting diary-file)))
(set-buffer (find-buffer-visiting diary-file))
(subst-char-in-region (point-min) (point-max) ?\^M ?\n t)
(setq selective-display nil)
(set-buffer-modified-p diary-modified))
(beep)
(message "Can't read included diary file %s" diary-file)
(sleep-for 2))