aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2008-11-21 10:32:39 +0000
committerJuanma Barranquero2008-11-21 10:32:39 +0000
commit0f219a97ca8cb0b8e2c85324e90c001f34c57359 (patch)
tree88afe424d20626376f0183d0d4ecbeaaab7f673b
parent6a4cfb0c8f7899643a4adc2c5b4a2c2ba802f950 (diff)
downloademacs-0f219a97ca8cb0b8e2c85324e90c001f34c57359.tar.gz
emacs-0f219a97ca8cb0b8e2c85324e90c001f34c57359.zip
* bookmark.el (bookmark-jump-noselect): Add obsolescence declaration
and remove redundant info from docstring.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/bookmark.el8
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5c053175ee0..62417c7aacc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12008-11-21 Juanma Barranquero <lekktu@gmail.com> 12008-11-21 Juanma Barranquero <lekktu@gmail.com>
2 2
3 * bookmark.el (bookmark-jump-noselect): Add obsolescence declaration
4 and remove redundant info from docstring.
5
3 * isearch.el (isearch-search-string): Doc fix. 6 * isearch.el (isearch-search-string): Doc fix.
4 (search-exit-option, search-slow-window-lines, search-slow-speed) 7 (search-exit-option, search-slow-window-lines, search-slow-speed)
5 (search-upper-case, search-nonincremental-instead) 8 (search-upper-case, search-nonincremental-instead)
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 658097c8bf0..8a48cf3e18b 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -750,7 +750,7 @@ the list of bookmarks.\)"
750 nil nil default)))) 750 nil nil default))))
751 (and (string-equal str "") (setq str default)) 751 (and (string-equal str "") (setq str default))
752 (bookmark-store str (cdr record) parg) 752 (bookmark-store str (cdr record) parg)
753 753
754 ;; Ask for an annotation buffer for this bookmark 754 ;; Ask for an annotation buffer for this bookmark
755 (if bookmark-use-annotations 755 (if bookmark-use-annotations
756 (bookmark-edit-annotation str) 756 (bookmark-edit-annotation str)
@@ -947,7 +947,7 @@ Useful for example to unhide text in `outline-mode'.")
947 ;; if there is an annotation for this bookmark, 947 ;; if there is an annotation for this bookmark,
948 ;; show it in a buffer. 948 ;; show it in a buffer.
949 (bookmark-show-annotation bookmark))) 949 (bookmark-show-annotation bookmark)))
950 950
951 951
952;;;###autoload 952;;;###autoload
953(defun bookmark-jump (bookmark) 953(defun bookmark-jump (bookmark)
@@ -1009,11 +1009,13 @@ be retrieved from a VC backend, else return nil."
1009The return value has the form (BUFFER . POINT). 1009The return value has the form (BUFFER . POINT).
1010 1010
1011Note: this function is deprecated and is present for Emacs 22 1011Note: this function is deprecated and is present for Emacs 22
1012compatibility only. Use `bookmark-handle-bookmark' instead." 1012compatibility only."
1013 (save-excursion 1013 (save-excursion
1014 (bookmark-handle-bookmark bookmark) 1014 (bookmark-handle-bookmark bookmark)
1015 (cons (current-buffer) (point)))) 1015 (cons (current-buffer) (point))))
1016 1016
1017(make-obsolete 'bookmark-jump-noselect 'bookmark-handle-bookmark "23.1")
1018
1017(defun bookmark-handle-bookmark (bookmark) 1019(defun bookmark-handle-bookmark (bookmark)
1018 "Call BOOKMARK's handler or `bookmark-default-handler' if it has none. 1020 "Call BOOKMARK's handler or `bookmark-default-handler' if it has none.
1019Changes current buffer and point and returns nil, or signals a `file-error'. 1021Changes current buffer and point and returns nil, or signals a `file-error'.