Mercurial > emacs
comparison lisp/info.el @ 90268:d88caeac70d7
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-2
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (base, patch 1-3)
- tag of miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-704
- Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0 (patch 700-704)
- Update from CVS
- Merge from gnus--rel--5.10
- Update from CVS: lisp/cus-edit.el (customize-rogue): Minor doc fix.
* miles@gnu.org--gnu-2005/gnus--rel--5.10 (patch 185-186)
- Merge from emacs--cvs-trunk--0
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 19 Jan 2006 07:11:42 +0000 |
parents | 7beb78bc1f8e 51ca63f92c59 |
children | 5b7d410e31f9 |
comparison
equal
deleted
inserted
replaced
90267:e5855ea89245 | 90268:d88caeac70d7 |
---|---|
729 (old-nodename Info-current-node) | 729 (old-nodename Info-current-node) |
730 (pcolumn (current-column)) | 730 (pcolumn (current-column)) |
731 (pline (count-lines (point-min) (line-beginning-position))) | 731 (pline (count-lines (point-min) (line-beginning-position))) |
732 (wline (count-lines (point-min) (window-start))) | 732 (wline (count-lines (point-min) (window-start))) |
733 (old-history Info-history) | 733 (old-history Info-history) |
734 (new-history (list Info-current-file Info-current-node (point)))) | 734 (new-history (and Info-current-file |
735 (list Info-current-file Info-current-node (point))))) | |
735 (kill-buffer (current-buffer)) | 736 (kill-buffer (current-buffer)) |
736 (Info-find-node filename nodename) | 737 (Info-find-node filename nodename) |
737 (setq Info-history old-history) | 738 (setq Info-history old-history) |
738 (if (and (equal old-filename Info-current-file) | 739 (if (and (equal old-filename Info-current-file) |
739 (equal old-nodename Info-current-node)) | 740 (equal old-nodename Info-current-node)) |
1397 (Info-fontify-node)) | 1398 (Info-fontify-node)) |
1398 (Info-display-images-node) | 1399 (Info-display-images-node) |
1399 (Info-hide-cookies-node) | 1400 (Info-hide-cookies-node) |
1400 (run-hooks 'Info-selection-hook))))) | 1401 (run-hooks 'Info-selection-hook))))) |
1401 | 1402 |
1403 (defvar Info-mode-line-node-keymap | |
1404 (let ((map (make-sparse-keymap))) | |
1405 (define-key map [mode-line mouse-1] 'Info-scroll-up) | |
1406 (define-key map [mode-line mouse-3] 'Info-scroll-down) | |
1407 map) | |
1408 "Keymap to put on the Info node name in the mode line.") | |
1409 | |
1402 (defun Info-set-mode-line () | 1410 (defun Info-set-mode-line () |
1403 (setq mode-line-buffer-identification | 1411 (setq mode-line-buffer-identification |
1404 (nconc (propertized-buffer-identification "%b") | 1412 (nconc (propertized-buffer-identification "%b") |
1405 (list | 1413 (list |
1406 (concat " (" | 1414 (concat |
1407 (if Info-current-file | 1415 " (" |
1408 (file-name-nondirectory Info-current-file) | 1416 (if (stringp Info-current-file) |
1409 " ") | 1417 (file-name-nondirectory Info-current-file) |
1410 ") " (or Info-current-node "")))))) | 1418 "") |
1419 ") " | |
1420 (if Info-current-node | |
1421 (propertize Info-current-node | |
1422 'face 'mode-line-buffer-id | |
1423 'help-echo | |
1424 "mouse-1: scroll forward, mouse-3: scroll back" | |
1425 'mouse-face 'mode-line-highlight | |
1426 'local-map Info-mode-line-node-keymap) | |
1427 "")))))) | |
1411 | 1428 |
1412 ;; Go to an Info node specified with a filename-and-nodename string | 1429 ;; Go to an Info node specified with a filename-and-nodename string |
1413 ;; of the sort that is found in pointers in nodes. | 1430 ;; of the sort that is found in pointers in nodes. |
1414 | 1431 |
1415 ;; Don't autoload this function: the correct entry point for other packages | 1432 ;; Don't autoload this function: the correct entry point for other packages |