aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2008-03-18 03:35:58 +0000
committerGlenn Morris2008-03-18 03:35:58 +0000
commitacab8b97406fd465afd3811f6b5f0c4b5fb95e4d (patch)
tree63de59ba7f72dfdc5e76c613ea16942a97ded2a1
parent57671b7218249e42f7c84d2c202a1d56966f233b (diff)
downloademacs-acab8b97406fd465afd3811f6b5f0c4b5fb95e4d.tar.gz
emacs-acab8b97406fd465afd3811f6b5f0c4b5fb95e4d.zip
(initial-calendar-window-hook, today-visible-calendar-hook): Doc fixes.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/calendar/calendar.el7
2 files changed, 8 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7da2e61e36d..491a69e2bd9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12008-03-18 Glenn Morris <rgm@gnu.org>
2
3 * calendar/calendar.el (initial-calendar-window-hook)
4 (today-visible-calendar-hook): Doc fixes.
5
12008-03-17 Michael Albinus <michael.albinus@gmx.de> 62008-03-17 Michael Albinus <michael.albinus@gmx.de>
2 7
3 * net/tramp.el (tramp-root-regexp): Simplify. 8 * net/tramp.el (tramp-root-regexp): Simplify.
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index bf314499682..c5a1d372e23 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -288,7 +288,7 @@ This is the place to add key bindings to `calendar-mode-map'."
288 288
289(defcustom initial-calendar-window-hook nil 289(defcustom initial-calendar-window-hook nil
290 "List of functions to be called when the calendar window is created. 290 "List of functions to be called when the calendar window is created.
291Qutting the calendar and re-entering it will cause these functions 291Quitting the calendar and re-entering it will cause these functions
292to be called again." 292to be called again."
293 :type 'hook 293 :type 'hook
294 :group 'calendar-hooks) 294 :group 'calendar-hooks)
@@ -297,11 +297,10 @@ to be called again."
297 "List of functions called whenever the current date is visible. 297 "List of functions called whenever the current date is visible.
298To mark today's date, add the function `calendar-mark-today'. 298To mark today's date, add the function `calendar-mark-today'.
299To replace the date with asterisks, add the function `calendar-star-date'. 299To replace the date with asterisks, add the function `calendar-star-date'.
300
301See also `today-invisible-calendar-hook'. 300See also `today-invisible-calendar-hook'.
302 301
303Changing characters in the calendar buffer, except via the provided 302In general, be careful about changing characters in the calendar buffer,
304functions, may cause the calendar movement commands to fail." 303since it may cause the movement commands to fail."
305 :type 'hook 304 :type 'hook
306 :options '(calendar-mark-today calendar-star-date) 305 :options '(calendar-mark-today calendar-star-date)
307 :group 'calendar-hooks) 306 :group 'calendar-hooks)