(bookmark-jump-noselect): Move the deprecation notice into the doc

string, following up to 2008-10-29T17:42:49Z!cyd@stupidchicken.com.

2 files changed, 9 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c619e861f1c..39fc2682527 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-19  Karl Fogel  <kfogel@red-bean.com>
+
+        * bookmark.el (bookmark-jump-noselect): Move the deprecation
+        notice into the doc string, following up to 2008-10-29T17:42:49Z!cyd@stupidchicken.com.
+
 2008-11-19  Lute Kamstra  <lute@gnu.org>
 
         * autoinsert.el (auto-insert-alist): Don't use match data.
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 07ec40ec827..658097c8bf0 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -1004,10 +1004,12 @@ be retrieved from a VC backend, else return nil."
      ;; Last possibility: try VC
      (if (vc-backend file) file))))
 
-;; This function is present for Emacs 22 compatibility only.
 (defun bookmark-jump-noselect (bookmark)
   "Return the location pointed to by the bookmark BOOKMARK.
-The return value has the form (BUFFER . POINT)."
+The return value has the form (BUFFER . POINT).
+
+Note: this function is deprecated and is present for Emacs 22
+compatibility only.  Use `bookmark-handle-bookmark' instead."
   (save-excursion
     (bookmark-handle-bookmark bookmark)
     (cons (current-buffer) (point))))