Mercurial > emacs

--- a/lisp/ChangeLog	Wed Mar 12 21:55:02 2008 +0000
+++ b/lisp/ChangeLog	Thu Mar 13 01:57:05 2008 +0000
@@ -1,3 +1,7 @@
+2008-03-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* bookmark.el (Info-current-node): Remove.
+
 2008-03-12  Juri Linkov  <juri@jurta.org>

 	* help.el (describe-project): Remove defaliases for view-todo and
@@ -24,7 +28,8 @@
 	* comint.el: Fix up indentation and comment style.  Remove `function'.

 	* international/mule-cmds.el (reset-language-environment)
-	(set-language-environment-nonascii-translation): Don't set-unibyte-charset.
+	(set-language-environment-nonascii-translation):
+	Don't set-unibyte-charset.

 	* doc-view.el: Remove all cb-args, use closures instead.
 	(doc-view-sentinel): Merge doc-view-dvi->pdf-sentinel,
--- a/lisp/bookmark.el	Wed Mar 12 21:55:02 2008 +0000
+++ b/lisp/bookmark.el	Thu Mar 13 01:57:05 2008 +0000
@@ -297,7 +297,6 @@
 (defvar bookmark-yank-point 0)
 (defvar bookmark-current-buffer nil)

-(defvar Info-current-node)
 (defvar Info-suffix-list)

 ;; Helper functions.
@@ -850,8 +849,7 @@


 (defun bookmark-buffer-name ()
-  "Return the name of the current buffer's file, non-directory.
-In Info, return the current node."
+  "Return the name of the current buffer's file, non-directory."
   (cond
    ;; Or are we a file?
    (buffer-file-name (file-name-nondirectory buffer-file-name))
@@ -885,12 +883,8 @@
                        (setq bookmark-yank-point (point)))))))
     (insert string)))

-
-(defvar Info-current-file)
-
 (defun bookmark-buffer-file-name ()
-  "Return the current buffer's file in a way useful for bookmarks.
-For example, if this is a Info buffer, return the Info file's name."
+  "Return the current buffer's file in a way useful for bookmarks."
   (cond
    (buffer-file-name
     ;; Abbreviate the path, both so it's shorter and so it's more