[Emacs-diffs] Changes to emacs/lisp/info.el,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/03/09 03:05:35

Index: info.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/info.el,v
retrieving revision 1.522
retrieving revision 1.523
diff -u -b -r1.522 -r1.523
--- info.el     8 Mar 2008 22:07:23 -0000       1.522
+++ info.el     9 Mar 2008 03:05:33 -0000       1.523
@@ -4336,8 +4336,7 @@
   (if file Info-current-file Info-current-node))
 
 
-(defun Info-bookmark-make-record (annotation)
-  (let ((the-record
+(defun Info-bookmark-make-record ()
          `((filename . ,(bookmark-buffer-file-name))
            (front-context-string
             . ,(if (>= (- (point-max) (point)) bookmark-search-size)
@@ -4352,18 +4351,7 @@
                     (- (point) bookmark-search-size))
                 nil))
           (info-node . ,Info-current-node)
-          (handler . Info-bookmark-jump))))
-
-    ;; Now fill in the optional parts:
-
-    ;; Take no chances with text properties
-    (set-text-properties 0 (length annotation) nil annotation)
-
-    (if annotation
-        (nconc the-record (list (cons 'annotation annotation))))
-
-    ;; Finally, return the completed record.
-    the-record))
+    (handler . Info-bookmark-jump)))
 
 
 (defvar bookmark-current-bookmark)