[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp ChangeLog info.el
From: |
Juri Linkov |
Subject: |
[Emacs-diffs] emacs/lisp ChangeLog info.el |
Date: |
Sat, 05 Dec 2009 19:49:51 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Juri Linkov <jurta> 09/12/05 19:49:51
Modified files:
lisp : ChangeLog info.el
Log message:
(Info-find-node-2): Set `Info-current-subfile' to nil
for virtual nodes. (Bug#4147)
(Info-find-node-2): Set `Info-current-node-virtual' to nil
when moving from a virtual node.
(Info-mode-menu): Add `Info-virtual-index' to the menu.
(Info-mode): Add `Info-virtual-index' to the docstring.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16827&r2=1.16828
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/info.el?cvsroot=emacs&r1=1.570&r2=1.571
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16827
retrieving revision 1.16828
diff -u -b -r1.16827 -r1.16828
--- ChangeLog 5 Dec 2009 19:10:42 -0000 1.16827
+++ ChangeLog 5 Dec 2009 19:49:47 -0000 1.16828
@@ -1,3 +1,12 @@
+2009-12-05 Juri Linkov <address@hidden>
+
+ * info.el (Info-find-node-2): Set `Info-current-subfile' to nil
+ for virtual nodes. (Bug#4147)
+ (Info-find-node-2): Set `Info-current-node-virtual' to nil
+ when moving from a virtual node.
+ (Info-mode-menu): Add `Info-virtual-index' to the menu.
+ (Info-mode): Add `Info-virtual-index' to the docstring.
+
2009-12-05 Eric Ludlam <address@hidden>
* cedet/semantic/bovine/c.el (semantic-c-describe-environment):
Index: info.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/info.el,v
retrieving revision 1.570
retrieving revision 1.571
diff -u -b -r1.570 -r1.571
--- info.el 11 Nov 2009 05:49:13 -0000 1.570
+++ info.el 5 Dec 2009 19:49:51 -0000 1.571
@@ -912,10 +912,12 @@
(cond
((functionp virtual-fun)
(let ((filename (or filename Info-current-file)))
- (setq buffer-file-name nil)
(setq buffer-read-only nil)
+ (setq Info-current-file filename
+ Info-current-subfile nil
+ Info-current-file-completions nil
+ buffer-file-name nil)
(erase-buffer)
- (setq Info-current-file filename)
(Info-virtual-call virtual-fun filename nodename no-going-back)
(set-marker Info-tag-table-marker nil)
(setq buffer-read-only t)
@@ -928,8 +930,11 @@
(equal Info-current-file filename))))
;; Switch files if necessary
(let ((inhibit-read-only t))
- (if (and Info-current-node-virtual (null filename))
- (setq filename Info-current-file))
+ (when Info-current-node-virtual
+ ;; When moving from a virtual node.
+ (set (make-local-variable 'Info-current-node-virtual) nil)
+ (if (null filename)
+ (setq filename Info-current-file)))
(setq Info-current-file nil
Info-current-subfile nil
Info-current-file-completions nil
@@ -3650,6 +3655,8 @@
:help "Look for a string in the index items"]
["Next Matching Item" Info-index-next :active Info-index-alternatives
:help "Look for another occurrence of previous item"]
+ ["Lookup a string and display index of results..." Info-virtual-index
+ :help "Look for a string in the index items and display node with
results"]
["Lookup a string in all indices..." info-apropos
:help "Look for a string in the indices of all manuals"])
["Copy Node Name" Info-copy-current-node-name
@@ -3824,6 +3831,7 @@
\\[isearch-forward], \\[isearch-forward-regexp] Use Isearch to search
through multiple Info nodes.
\\[Info-index] Search for a topic in this manual's Index and go to index entry.
\\[Info-index-next] (comma) Move to the next match from a previous
\\<Info-mode-map>\\[Info-index] command.
+\\[Info-virtual-index] Look for a string and display the index node with
results.
\\[info-apropos] Look for a string in the indices of all manuals.
\\[Info-goto-node] Move to node specified by name.
You may include a filename as well, as (FILENAME)NODENAME.
- [Emacs-diffs] emacs/lisp ChangeLog info.el,
Juri Linkov <=