diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/bookmark.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 70d37987b6a..13990c03203 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-07-14 Karl Fogel <kfogel@red-bean.com> | ||
| 2 | |||
| 3 | * bookmark.el (bookmark-load-hook): Fix doc string as suggested | ||
| 4 | by Drew Adams (Bug#5504). | ||
| 5 | |||
| 1 | 2010-07-14 Chong Yidong <cyd@stupidchicken.com> | 6 | 2010-07-14 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 7 | ||
| 3 | * term/x-win.el (x-select-enable-clipboard): Default to t. | 8 | * term/x-win.el (x-select-enable-clipboard): Default to t. |
diff --git a/lisp/bookmark.el b/lisp/bookmark.el index 958997ccfcd..0eec76f4da7 100644 --- a/lisp/bookmark.el +++ b/lisp/bookmark.el | |||
| @@ -2196,7 +2196,7 @@ strings returned are not." | |||
| 2196 | 2196 | ||
| 2197 | ;; Load Hook | 2197 | ;; Load Hook |
| 2198 | (defvar bookmark-load-hook nil | 2198 | (defvar bookmark-load-hook nil |
| 2199 | "Hook run at the end of loading bookmark.") | 2199 | "Hook run at the end of loading library `bookmark.el'.") |
| 2200 | 2200 | ||
| 2201 | ;; Exit Hook, called from kill-emacs-hook | 2201 | ;; Exit Hook, called from kill-emacs-hook |
| 2202 | (defvar bookmark-exit-hook nil | 2202 | (defvar bookmark-exit-hook nil |