[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: |
Bastien Guerry |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/info.el,v |
Date: |
Fri, 07 Mar 2008 19:32:01 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Bastien Guerry <bastien1> 08/03/07 19:32:00
Index: info.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/info.el,v
retrieving revision 1.518
retrieving revision 1.519
diff -u -b -r1.518 -r1.519
--- info.el 7 Mar 2008 16:00:13 -0000 1.518
+++ info.el 7 Mar 2008 19:31:59 -0000 1.519
@@ -3489,6 +3489,8 @@
(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
@@ -4326,6 +4328,13 @@
;; 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 (annotation)
(let ((the-record
`((filename . ,(bookmark-buffer-file-name))
@@ -4356,15 +4365,19 @@
;; Finally, return the completed record.
the-record))
+
(defvar bookmark-current-bookmark)
(declare-function bookmark-get-filename "bookmark" (bookmark))
(declare-function bookmark-get-front-context-string "bookmark" (bookmark))
(declare-function bookmark-get-rear-context-string "bookmark" (bookmark))
(declare-function bookmark-get-position "bookmark" (bookmark))
-(declare-function bookmark-get-info-node "bookmark" (bookmark))
(declare-function bookmark-file-or-variation-thereof "bookmark" (file))
(declare-function bookmark-jump-noselect "bookmark" (str))
+(defun bookmark-get-info-node (bookmark)
+ "Get the info node associated with BOOKMARK."
+ (cdr (assq 'info-node (bookmark-get-bookmark-record bookmark))))
+
;;;###autoload
(defun Info-bookmark-jump (bmk)
;; This implements the `handler' function interface for record type returned
- [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 <=
- [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, 2008/03/09
- [Emacs-diffs] Changes to emacs/lisp/info.el,v, Johan Bockgård, 2008/03/25