diff options
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/bookmark.el | 10 |
2 files changed, 12 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ebc8755c2ca..35362f1f4e4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,11 @@ | |||
| 1 | 2009-10-10 Karl Fogel <kfogel@red-bean.com> | 1 | 2009-10-10 Karl Fogel <kfogel@red-bean.com> |
| 2 | 2 | ||
| 3 | * bookmark.el: (bookmark-yank-word, bookmark-insert-current-bookmark): | ||
| 4 | Update documentation to refer to the variables documented in r1.135. | ||
| 5 | (Bug#4188) | ||
| 6 | |||
| 7 | 2009-10-10 Karl Fogel <kfogel@red-bean.com> | ||
| 8 | |||
| 3 | * bookmark.el (Info-suffix-list): Remove this unused variable. | 9 | * bookmark.el (Info-suffix-list): Remove this unused variable. |
| 4 | (bookmark-current-point): Remove this obsolete variable. | 10 | (bookmark-current-point): Remove this obsolete variable. |
| 5 | (bookmark-set, bookmark-rename, bookmark-send-edited-annotation): | 11 | (bookmark-set, bookmark-rename, bookmark-send-edited-annotation): |
diff --git a/lisp/bookmark.el b/lisp/bookmark.el index 6c9559de5ae..340f020ed36 100644 --- a/lisp/bookmark.el +++ b/lisp/bookmark.el | |||
| @@ -878,8 +878,9 @@ BOOKMARK is a bookmark name (a string) or a bookmark record." | |||
| 878 | 878 | ||
| 879 | 879 | ||
| 880 | (defun bookmark-insert-current-bookmark () | 880 | (defun bookmark-insert-current-bookmark () |
| 881 | "Insert this buffer's value of `bookmark-current-bookmark'. | 881 | "Insert into the bookmark name currently being set the value of |
| 882 | Default to file name if it's nil." | 882 | `bookmark-current-bookmark' in `bookmark-current-buffer', defaulting |
| 883 | to the buffer's file name if `bookmark-current-bookmark' is nil." | ||
| 883 | (interactive) | 884 | (interactive) |
| 884 | (let ((str | 885 | (let ((str |
| 885 | (with-current-buffer bookmark-current-buffer | 886 | (with-current-buffer bookmark-current-buffer |
| @@ -911,8 +912,9 @@ way that is suitable as a bookmark name." | |||
| 911 | 912 | ||
| 912 | 913 | ||
| 913 | (defun bookmark-yank-word () | 914 | (defun bookmark-yank-word () |
| 914 | "Get the next word from the buffer and append it to the name of the | 915 | "Get the next word from buffer `bookmark-current-buffer' and append |
| 915 | bookmark currently being set, advancing point by one word." | 916 | it to the name of the bookmark currently being set, advancing |
| 917 | `bookmark-yank-point' by one word." | ||
| 916 | (interactive) | 918 | (interactive) |
| 917 | (let ((string (with-current-buffer bookmark-current-buffer | 919 | (let ((string (with-current-buffer bookmark-current-buffer |
| 918 | (goto-char bookmark-yank-point) | 920 | (goto-char bookmark-yank-point) |