summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorRoland Winkler <winkler@gnu.org>2012-11-27 09:40:49 -0600
committerRoland Winkler <winkler@gnu.org>2012-11-27 09:40:49 -0600
commit34755291c144ab134b71ddf3e8f50d848525734c (patch)
tree29435a1844deda690afe368b846a5a27a90ff3df /lisp
parentc2f5b60af59697cfad9307da0f29f2942d9f65fa (diff)
downloademacs-34755291c144ab134b71ddf3e8f50d848525734c.tar.gz
diary-header-line-format: Use keybinding of diary-show-all-entries in the diary buffer
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/calendar/diary-lib.el3
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 618b407fbea..330439457e1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-27 Roland Winkler <winkler@gnu.org>
+
+ * calendar/diary-lib.el (diary-header-line-format): Use keybinding
+ of diary-show-all-entries in the diary buffer (Bug#12994).
+
2012-11-27 Michael Albinus <michael.albinus@gmx.de>
* net/tramp-sh.el (tramp-perl-encode): Use "read STDIN" instead of
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index 27c6f76581c..46a7f703019 100644
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -444,8 +444,7 @@ The format of the header is specified by `diary-header-line-format'."
(defcustom diary-header-line-format
'(:eval (calendar-string-spread
(list (if diary-selective-display
- "Some text is hidden - press \"s\" in calendar \
-before edit/copy"
+ "Some text is hidden - press \"C-c C-s\" before edit/copy"
"Diary"))
?\s (window-width)))
"Format of the header line displayed by `diary-simple-display'.