aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorKarl Fogel2010-07-14 15:09:28 -0400
committerKarl Fogel2010-07-14 15:09:28 -0400
commit077e075349cd013dbef8761f692bb79be45907d7 (patch)
treead1fd80a0263cdee4e54424dce77b52ee7d3e63c /lisp
parentf9d71b4284fa1009f8c38a9d389e2202ef1e4dd9 (diff)
downloademacs-077e075349cd013dbef8761f692bb79be45907d7.tar.gz
emacs-077e075349cd013dbef8761f692bb79be45907d7.zip
* lisp/bookmark.el (bookmark-load-hook): Fix doc string as suggested
by Drew Adams (Bug#5504).
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/bookmark.el2
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 @@
12010-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
12010-07-14 Chong Yidong <cyd@stupidchicken.com> 62010-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