Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
f082900a
Commit
f082900a
authored
May 30, 2008
by
Glenn Morris
Browse files
(calendar-dedicate-diary): Update for diary-display-function replacing
diary-display-hook.
parent
0f9aa26a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
10 deletions
+14
-10
lisp/calendar/cal-x.el
lisp/calendar/cal-x.el
+14
-10
No files found.
lisp/calendar/cal-x.el
View file @
f082900a
...
...
@@ -90,21 +90,25 @@ Runs `calendar-after-frame-setup-hook', selects frame, iconifies if needed."
(
iconify-or-deiconify-frame
)))
;; c-d-d is only called after (diary) has been run.
(
defvar
diary-display-
hook
)
(
defvar
diary-display-
function
)
(
defun
calendar-dedicate-diary
()
"Display and dedicate the window associated with the diary buffer."
(
set-window-dedicated-p
(
display-buffer
(
if
(
not
(
or
(
memq
'diary-fancy-display
diary-display-hook
)
(
memq
'fancy-diary-display
diary-display-hook
)))
(
get-file-buffer
diary-file
)
;; If there are no diary entries, there won't be a fancy-diary
;; to dedicate, so make a basic one.
(
or
(
get-buffer
diary-fancy-buffer
)
(
calendar-in-read-only-buffer
diary-fancy-buffer
(
calendar-set-mode-line
"Diary Entries"
)))
diary-fancy-buffer
))
(
if
(
if
(
listp
diary-display-function
)
(
or
(
memq
'diary-fancy-display
diary-display-function
)
(
memq
'fancy-diary-display
diary-display-function
))
(
memq
diary-display-function
'
(
diary-fancy-display
fancy-diary-display
)))
(
progn
;; If there are no diary entries, there won't be a fancy-diary
;; to dedicate, so make a basic one.
(
or
(
get-buffer
diary-fancy-buffer
)
(
calendar-in-read-only-buffer
diary-fancy-buffer
(
calendar-set-mode-line
"Diary Entries"
)))
diary-fancy-buffer
)
(
get-file-buffer
diary-file
)))
t
))
;;;###cal-autoload
...
...
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