xemacs-beta: lisp/packages/info.el comparison

comparison lisp/packages/info.el @ 183:e121b013d1f0 r20-3b18

Import from CVS: tag r20-3b18

author	cvs
date	Mon, 13 Aug 2007 09:54:23 +0200
parents	bfd6434d15b3
children	3d6bfa290dbd

comparison

equal deleted inserted replaced

-:f07455f06202
+:e121b013d1f0
 :group 'info)
 (defcustom Info-default-directory-list nil
 "*List of default directories to search for Info documentation
 files.  This value is used as the default for `Info-directory-list'.
-It is set in startup.el."
+It is set in startup.el.  The first directory in this list must
+contain a `dir' file that will become the basis for the toplevel Info
+directory."
 :type '(repeat directory)
 :group 'info)
 (defcustom Info-additional-directory-list nil
 "List of additional directories to search for Info documentation
 	    (setq idx (or (string-match path-separator path) (length path))
 		  list (cons (substring path 0 idx) list)
 		  path (substring path (min (1+ idx)
 					    (length path)))))
 	  (nreverse list))
-Info-default-directory-list))
+(reverse Info-default-directory-list)))
 "List of directories to search for Info documentation files.
 Default is to use the environment variable INFOPATH if it exists,
 else to use Info-default-directory-list.")
 ;; Is this right for NT?  .zip, with -c for to stdout, right?
 		(set-buffer info-buffer)
 		(goto-char (point-max))
 		(cond
 		 ((re-search-backward "^ *\\* *Locals *: *\n" nil t)
 		  (delete-region (match-beginning 0) (match-end 0)))
-		 ((re-search-backward "^Local" nil t)
+		 ((re-search-backward "^[ \t]*Local" nil t)
-		  (end-of-line))
+		  ;; This is for people who underline topic headings with
+		  ;; equal signs or dashes.
+		  (when (save-excursion
+			  (forward-line 1)
+			  (beginning-of-line)
+			  (looking-at "^[ \t]*[-=]+"))
+		    (forward-line 1))
+		  (forward-line 1)
+		  (beginning-of-line))
 		 (t (search-backward "\^L" nil t)))
 		;; Insert menu part of the file
 		(let* ((pt (point))
 		       (len (length (buffer-string nil nil other))))
-		  (insert "\n" (buffer-string nil nil other))
+		  (insert (buffer-string nil nil other))
 		  (goto-char (+ pt len))
 		  (save-excursion
 		    (goto-char pt)
 		    (if (search-forward "* menu:" (+ pt len) t)
 			(progn
 			       (substring name 0 -5)
 			     name))
 		       "")
 		     ")"
 		     (or Info-current-node ""))))))
 ;; Go to an info node specified with a filename-and-nodename string
 ;; of the sort that is found in pointers in nodes.
 ;;;###autoload
 (defun Info-goto-node (nodename &optional no-going-back tryfile)
 (goto-char found)
 (Info-select-node)
 (or (and (equal onode Info-current-node)
 (equal ofile Info-current-file))
 (Info-history-add ofile onode opoint)))))
 ;; Extract the value of the node-pointer named NAME.
 ;; If there is none, use ERRORNAME in the error message;
 ;; if ERRORNAME is nil, just return nil.
 (defun Info-extract-pointer (name &optional errorname)
 (save-excursion
 (defun Info-directory ()
 "Go to the Info directory node."
 (interactive)
 (Info-find-node "dir" "top"))
 (defun Info-follow-reference (footnotename)
 "Follow cross reference named NAME to the node it refers to.
 NAME may be an abbreviation of the reference name."
 (interactive
 (let ((completion-ignore-case t)
 	  (delete-region (match-beginning 0) (match-end 0))
 	(goto-char end))
 (or (equal tag "")
 	  (insert "<<" tag ">>"))))
 (Info-cease-annotate))
 (defun Info-exit ()
 "Exit Info by selecting some other buffer."
 (interactive)
 (if Info-standalone
 (save-buffers-kill-emacs)
 	       (setq event (event-point event))))
 	(let* ((data (Info-find-nearest-node event))
 	       (name (nth 1 (nth 1 data))))
 	  (and name (nth 1 data))))
 (error nil)))
 (defvar Info-mode-map nil
 "Keymap containing Info commands.")
 (if Info-mode-map
 nil
 ;; XEmacs addition
 (define-key Info-mode-map 'backspace 'Info-scroll-prev)
 (define-key Info-mode-map 'delete 'Info-scroll-prev)
 (define-key Info-mode-map 'button2 'Info-follow-clicked-node)
 (define-key Info-mode-map 'button3 'Info-select-node-menu))
 ;; Info mode is suitable only for specially formatted data.
 (put 'info-mode 'mode-class 'special)
 (defun Info-mode ()
 				   (match-beginning 1)
 				   (match-end 1))
 				  0)
 			    where)))
 where)))
 ;;; fontification and mousability for info
 (defun Info-highlight-region (start end face)
 (let ((extent nil)
 		 Info-up
 		 t
 		 "Up entry to enclosing section"]
 		)))
 ;))
 (provide 'info)
 (run-hooks 'Info-load-hook)

Mercurial > hg > xemacs-beta

comparison lisp/packages/info.el @ 183:e121b013d1f0 r20-3b18