Commit cb8325bf authored by Gerd Moellmann's avatar Gerd Moellmann

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

display in any included file and don't kill it.
parent d066de8e
...@@ -363,20 +363,28 @@ changing the variable `diary-include-string'." ...@@ -363,20 +363,28 @@ changing the variable `diary-include-string'."
(regexp-quote diary-include-string) (regexp-quote diary-include-string)
" \"\\([^\"]*\\)\"") " \"\\([^\"]*\\)\"")
nil t) nil t)
(let ((diary-file (substitute-in-file-name (let* ((diary-file (substitute-in-file-name
(buffer-substring-no-properties (buffer-substring-no-properties
(match-beginning 2) (match-end 2)))) (match-beginning 2) (match-end 2))))
(diary-list-include-blanks nil) (diary-list-include-blanks nil)
(list-diary-entries-hook 'include-other-diary-files) (list-diary-entries-hook 'include-other-diary-files)
(diary-display-hook 'ignore) (diary-display-hook 'ignore)
(diary-hook nil)) (diary-hook nil)
(d-buffer (find-buffer-visiting diary-file))
(diary-modified (if d-buffer
(set-buffer d-buffer)
(if (file-exists-p diary-file) (if (file-exists-p diary-file)
(if (file-readable-p diary-file) (if (file-readable-p diary-file)
(unwind-protect (unwind-protect
(setq diary-entries-list (setq diary-entries-list
(append diary-entries-list (append diary-entries-list
(list-diary-entries original-date number))) (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) (beep)
(message "Can't read included diary file %s" diary-file) (message "Can't read included diary file %s" diary-file)
(sleep-for 2)) (sleep-for 2))
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment