[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/info.el,v
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/info.el,v |
Date: |
Sun, 09 Mar 2008 21:35:04 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Stefan Monnier <monnier> 08/03/09 21:35:03
Index: info.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/info.el,v
retrieving revision 1.523
retrieving revision 1.524
diff -u -b -r1.523 -r1.524
--- info.el 9 Mar 2008 03:05:33 -0000 1.523
+++ info.el 9 Mar 2008 21:35:00 -0000 1.524
@@ -3375,7 +3375,6 @@
(defvar tool-bar-map)
(defvar bookmark-make-record-function)
-(defvar bookmark-make-name-function)
;; Autoload cookie needed by desktop.el
;;;###autoload
@@ -3490,8 +3489,6 @@
(Info-set-mode-line)
(set (make-local-variable 'bookmark-make-record-function)
'Info-bookmark-make-record)
- (set (make-local-variable 'bookmark-make-name-function)
- 'Info-bookmark-make-name)
(run-mode-hooks 'Info-mode-hook))
;; When an Info buffer is killed, make sure the associated tags buffer
@@ -4329,15 +4326,9 @@
;; This is only called from bookmark.el.
(declare-function bookmark-buffer-file-name "bookmark" ())
-
-(defun Info-bookmark-make-name (&optional file)
- "Return the default name for the bookmark.
-When FILE is non-nil, return the Info file instead."
- (if file Info-current-file Info-current-node))
-
-
(defun Info-bookmark-make-record ()
- `((filename . ,(bookmark-buffer-file-name))
+ `(,Info-current-node
+ (filename . ,(bookmark-buffer-file-name))
(front-context-string
. ,(if (>= (- (point-max) (point)) bookmark-search-size)
(buffer-substring-no-properties
- [Emacs-diffs] Changes to emacs/lisp/info.el,v, Stefan Monnier, 2008/03/06
- [Emacs-diffs] Changes to emacs/lisp/info.el,v, Stefan Monnier, 2008/03/06
- [Emacs-diffs] Changes to emacs/lisp/info.el,v, Stefan Monnier, 2008/03/07
- [Emacs-diffs] Changes to emacs/lisp/info.el,v, Karl Fogel, 2008/03/07
- [Emacs-diffs] Changes to emacs/lisp/info.el,v, Tassilo Horn, 2008/03/07
- [Emacs-diffs] Changes to emacs/lisp/info.el,v, Bastien Guerry, 2008/03/07
- [Emacs-diffs] Changes to emacs/lisp/info.el,v, Juanma Barranquero, 2008/03/07
- [Emacs-diffs] Changes to emacs/lisp/info.el,v, Juanma Barranquero, 2008/03/07
- [Emacs-diffs] Changes to emacs/lisp/info.el,v, Stefan Monnier, 2008/03/08
- [Emacs-diffs] Changes to emacs/lisp/info.el,v, Stefan Monnier, 2008/03/08
- [Emacs-diffs] Changes to emacs/lisp/info.el,v,
Stefan Monnier <=
- [Emacs-diffs] Changes to emacs/lisp/info.el,v, Johan Bockgård, 2008/03/25