diff options
author | Glenn Morris <[email protected]> | 2012-12-02 17:08:31 -0800 |
---|---|---|
committer | Glenn Morris <[email protected]> | 2012-12-02 17:08:31 -0800 |
commit | c5bc2d1d0558bbaa29ef04f9bd7bef50146382ab (patch) | |
tree | beabc46c767d32fe6cda79f0567834d5ea8225ee /lisp/calendar | |
parent | 1bf3989cd4ebffdeeebfaaca83c6866416c3908a (diff) | |
parent | 328dac0d42a2b395a327c0eda0ed4bbcec4f6c55 (diff) |
Merge from emacs-24; up to 2012-11-23T06:23:[email protected]
Diffstat (limited to 'lisp/calendar')
-rw-r--r-- | lisp/calendar/diary-lib.el | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el index 27c6f76581..46a7f70301 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'. |