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
289a4391
Commit
289a4391
authored
Oct 08, 2014
by
Glenn Morris
Browse files
* cal-x.el (calendar-dedicate-diary): Drop support for deleted aliases.
parent
97272dad
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
5 deletions
+8
-5
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/calendar/cal-x.el
lisp/calendar/cal-x.el
+3
-5
No files found.
lisp/ChangeLog
View file @
289a4391
2014-10-08 Glenn Morris <rgm@gnu.org>
* calendar/cal-x.el (calendar-dedicate-diary):
Drop support for recently deleted aliases.
2014-10-08 Leo Liu <sdl.web@gmail.com>
* progmodes/cfengine.el (cfengine3-make-syntax-cache): Always
...
...
lisp/calendar/cal-x.el
View file @
289a4391
...
...
@@ -94,12 +94,10 @@ Runs `calendar-after-frame-setup-hook', selects frame, iconifies if needed."
(
set-window-dedicated-p
(
display-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
)))
(
memq
'diary-fancy-display
diary-display-function
)
(
eq
diary-display-function
'diary-fancy-display
))
(
progn
;; If there are no diary entries, there won't be a
fancy-diary
;; If there are no diary entries, there won't be a
buffer
;; to dedicate, so make a basic one.
(
or
(
get-buffer
diary-fancy-buffer
)
(
calendar-in-read-only-buffer
diary-fancy-buffer
...
...
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