Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
cb8325bf
Commit
cb8325bf
authored
Feb 24, 2000
by
Gerd Moellmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(include-other-diary-files): Undo the selective
display in any included file and don't kill it.
parent
d066de8e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
8 deletions
+16
-8
lisp/calendar/diary-lib.el
lisp/calendar/diary-lib.el
+16
-8
No files found.
lisp/calendar/diary-lib.el
View file @
cb8325bf
...
...
@@ -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
))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment