[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/info.el
From: |
Richard M. Stallman |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/info.el |
Date: |
Thu, 05 Jan 2006 16:05:50 +0000 |
Index: emacs/lisp/info.el
diff -u emacs/lisp/info.el:1.469 emacs/lisp/info.el:1.470
--- emacs/lisp/info.el:1.469 Fri Dec 23 21:52:00 2005
+++ emacs/lisp/info.el Thu Jan 5 16:05:49 2006
@@ -568,8 +568,10 @@
(if (and (stringp file-or-node) (string-match "(.*)" file-or-node))
file-or-node
(concat "(" file-or-node ")")))
- (if (zerop (buffer-size))
- (Info-directory))))
+ (if (and (zerop (buffer-size))
+ (null Info-history))
+ ;; If we just created the Info buffer, go to the directory.
+ (Info-directory))))
;;;###autoload
(defun info-emacs-manual ()
@@ -688,11 +690,12 @@
(setq filename (Info-find-file filename))
;; Go into Info buffer.
(or (eq major-mode 'Info-mode) (pop-to-buffer "*info*"))
- ;; Record the node we are leaving.
- (if (not no-going-back)
- (setq Info-history
- (cons (list Info-current-file Info-current-node (point))
- Info-history)))
+ ;; Record the node we are leaving, if we were in one.
+ (and (not no-going-back)
+ Info-current-file
+ (setq Info-history
+ (cons (list Info-current-file Info-current-node (point))
+ Info-history)))
(Info-find-node-2 filename nodename no-going-back))
;;;###autoload
- [Emacs-diffs] Changes to emacs/lisp/info.el,
Richard M. Stallman <=