[xemacs-hg @ 2001-05-04 22:41:46 by ben] ----------------------- byte-comp warning fixes ----------------- New functions for cleanly eliminating byte-compiler warnings. Their definitions require no changes at all in bytecomp.el, meaning that any package that wants to use them and be compatible with older versions of XEmacs need only copy the code and rename the functions (i.e. prefix them with the package name). Eliminate byte-compiler warnings using the new functions in bytecomp-runtime.el. Move coding-system-put,get,category, since they're not Mule-specific and are used in prefer-coding-system. font.el was incredibly ugly. Clean it up. Avoid using defsubst for any exported functions, to avoid possible compatibility problems if we later change the internal interface. (It happened before, with face accessors, between 19.8 and 19.9). Fix tons of warnings. Clean up (new function gpm-is-supported-p eliminates duplicate code in gpm-create/delete-device-hook) and eliminate warnings. ---------- make byte-recompile-directory work in the --------- core `lisp' dir, even in the absence of a Mule XEmacs (i.e. make it skip the Mule files rather than trying to compile them). now you should be able to do `touch *.el' in the `lisp' dir, then M-x byte-recompile-directory, and get no warnings. Avoid trying to compile Mule files in byte-recompile-directory when we're not in a Mule XEmacs, since we're highly likely to get syntax errors. Add a coding-system cookie to all Mule files so that byte-recompile-directory ignores them. Magic cookie function moved to files.el from code-files.el (for use by bytecomp even in a non-coding-system XEmacs), and changed names and semantics for use by bytecomp. NOTE: IMO this is an internal function that we can change as we like (and there is absolutely no code anywhere else using the function). ---------------- GUI improvements: menus, help ------------------- Rearrange order of keymap declarations to be alphabetical. Improve help on help to include all bindings, and group by category. Add bindings for new Info commands. Remove warnings. Use command-hyper-apropos in place of command-apropos. Add a function to do the equivalent of command-apropos. Evals its help-text argument so you can put expressions there. Used now by help-for-help. Add binding to continue text searches. Expand index searches to work over multiple info documents. Add commands to search text/index in User and Lispref. Add new entry, "Uncomment Region" (parallels "Comment Out Region"). Redo Help menu; add bindings for new Info commands to search the index or text of the User and Lispref manuals. Add command for mark-paragraph, activate-region. Make Edit->R accelerator be rectangle, not register (more commonly used), and put rectangle first. Fix the Edit Init File entry to never load the .elc file. Simplify the default-popup-menu. Add Cmds->Tabs menu. Use kp-left not kp_left, etc. ---------------- Miscellaneous bug fixes/cleanup ------------------- byte-compiler-options: Correct doc string. easy-menu-do-define: fix extra quote. fill-paragraph-or-region:Rewrite to be more correct -- use call-interactively so that we always get exactly the same behavior as if the functions were called directly. No need to fiddle with zmacs-region-stays, now that bogus clearing of it (2001-04-28 src/ChangeLog) is removed. Put dialog titles back in -- this time correctly. Fix various other problems with leaks and such. key-sequence-list-description: Clean up fun to always correctly canonicalize. Clean up Kinsoku comments, synch comment-region with FSF 20.7. * simple.el (region-exists-p): * simple.el (region-active-p): Add comment about which one is correct to use in menu specs. * sound.el (load-sound-file): Minor code clean up. * startup.el: * startup.el (command-line-early): * startup.el (initial-scratch-message): Comment changes. Add info about sample.init.el to splash screen. Improve initial-scratch-message and clarify purpose of Scratch buffer. Fix byte-compile warning. ------------------------ Added features ------------------------- Add new variable to control whether etags checks all parent directories for tag files. (On by default.) * hash-table.el: New file, useful utility functions. * dumped-lisp.el (preloaded-file-list): Dump hash-table.el. ------------ notable bug fix: Windows event code -------------- Get critical quit working. ------------ notable bug fix and new feature: regex code -------------- Shy groups were implemented in a horrible, half-assed way that would cause them to screw up regex searching in most cases. Fixed to work correctly. Also extended back-reference syntax past 9. Only is recognized as such if there are at least that many non-shy groups; and optionally will warn about such uses, to catch old code that might be using them differently. (Added variable to control this in search.c -- `warn-about-possibly-incompatible-back- references', on by default for the moment. Declared in lisp.h. ---------------- process/SIGIO improvements ------------------- define USE_GETADDRINFO to replace more complex conditional, and use it. the code conditionalized on this in unix_open_network_stream had *serious* problems handling errors. it's now fixed, and major amounts of duplicate code between the two versions were combined. don't disable SIGIO and other interrupts unless CONNECT_NEEDS_SLOWED_INTERRUPTS is defined -- don't penalize OS's without bugs. similarly for a freebsd bug that was affecting all OS's. * s\ultrix.h: define CONNECT_NEEDS_SLOWED_INTERRUPTS, since that's the OS mentioned as having a kernel bug. * sysdep.c (request_sigio_on_device): * sysdep.c (unrequest_sigio_on_device): fix SIGIO problems on Linux. add check for O_ASYNC in case it's defined and FASYNC isn't. add comment about other ways to do SIGIO on Linux. * callproc.c (Fold_call_process_internal): * process.c (Fstart_process_internal): Deal with the possibility that `default-directory' doesn't have terminating slash. Correct comments about vfork. ---------------- Miscellaneous bug fixes/cleanup ------------------- * callint.c (Finteractive): Add lots of documentation -- exactly what the Lisp equivalents of all the interactive specs are. * console.h (struct console): change type of quit_char to Emchar. * event-msw.c (lstream_type_create_mswindows_selectable): spacing change. Eliminate events-mod.h and combine into events.h. * emacs.c: * emacs.c (make_arg_list_1): * emacs.c (main_1): A couple of char->Extbyte changes, add a comment. * glyphs-msw.c: Correct indentation of function defns to not exceed 80 cols. Try (sort of) to fix some code that sets the colors of the progress gauge. (Commented out) * keymap.c (syms_of_keymap): use DEFSYMBOL. * process.c (read_process_output): No need to fiddle with zmacs_region_stays, now that bogus clearing of it (see below) is removed. * search.c (Freplace_match): warning fix.

--- a/lisp/info.el	Thu May 03 21:08:39 2001 +0000
+++ b/lisp/info.el	Fri May 04 22:42:35 2001 +0000
@@ -6,7 +6,7 @@
 ;; Author: Dave Gillespie <daveg@synaptics.com>
 ;;	   Richard Stallman <rms@gnu.ai.mit.edu>
 ;; Maintainer: Dave Gillespie <daveg@synaptics.com>
-;; Version: 1.07 of 7/22/93
+;; Version: diverged at version 1.07 of 7/22/93
 ;; Keywords: docs, help
 
 ;; This file is part of XEmacs.
@@ -26,7 +26,8 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
-;;; Synched up with: Not synched with FSF.
+;;; Synched up with: Not synched with FSF.  Highly divergent, and with
+;;; many new features added for XEmacs.
 
 ;; Commentary:
 
@@ -37,7 +38,8 @@
 ;; Also, Info tries adding ".info" to a file name if the name itself
 ;; is not found.
 ;;
-;; See the change log below for further details.
+;; See the partial change log below for further details, and look into
+;; ChangeLog for the rest.
 
 
 ;; LCD Archive Entry:
@@ -1795,7 +1797,16 @@
       (Info-select-node)
       (or (and (equal onode Info-current-node)
                (equal ofile Info-current-file))
-          (Info-history-add ofile onode opoint)))))
+          (Info-history-add ofile onode opoint))))
+  (message "Found \"%s\" in %s.  Press `z' to continue search."
+	   regexp Info-current-node)
+  )
+
+(defun Info-search-next ()
+  "Repeat search starting from point with last regexp used in `Info-search'."
+  (interactive)
+  (Info-search Info-last-search))
+
 
 ;; Extract the value of the node-pointer named NAME.
 ;; If there is none, use ERRORNAME in the error message;
@@ -2255,17 +2266,9 @@
 	(Info-page-prev)
 	(setq this-command 'Info))
     (scroll-down arg)))
+
 
-(defun Info-index (topic)
-  "Look up a string in the index for this file.
-The index is defined as the first node in the top-level menu whose
-name contains the word \"Index\", plus any immediately following
-nodes whose names also contain the word \"Index\".
-If there are no exact matches to the specified topic, this chooses
-the first match which is a case-insensitive substring of a topic.
-Use the `,' command to see the other matches.
-Give a blank topic name to go to the Index node itself."
-  (interactive "sIndex topic: ")
+(defun Info-find-index-alternatives (topic)
   (let ((pattern (format "\n\\* \\([^\n:]*%s[^\n:]*\\):[ \t]*%s"
 			 (regexp-quote topic)
 			 "\\(.*\\)\\.[ t]*\\([0-9]*\\)$"))
@@ -2283,9 +2286,7 @@
       (Info-goto-node (Info-extract-menu-node-name)))
     (or (equal topic "")
 	(let ((matches nil)
-	      (exact nil)
-	      (Info-keeping-history nil)
-	      found)
+	      (Info-keeping-history nil))
 	  (while
 	      (progn
 		(goto-char (point-min))
@@ -2305,17 +2306,41 @@
 		     (string-match "\\<Index\\>" node)))
 	    (let ((Info-fontify nil))
 	      (Info-goto-node node)))
-	  (or matches
-	      (progn
-		(Info-last)
-		(error "No \"%s\" in index" topic)))
-	  ;; Here it is a feature that assoc is case-sensitive.
-	  (while (setq found (assoc topic matches))
-	    (setq exact (cons found exact)
-		  matches (delq found matches)))
-	  (setq Info-index-alternatives (nconc exact (nreverse matches))
-		Info-index-first-alternative (car Info-index-alternatives))
-	  (Info-index-next 0)))))
+	  (nreverse matches)))))
+
+(defun Info-index (topic &optional starting-nodes)
+  "Look up a string in the index for this file.
+The index is defined as the first node in the top-level menu whose
+name contains the word \"Index\", plus any immediately following
+nodes whose names also contain the word \"Index\".
+If there are no exact matches to the specified topic, this chooses
+the first match which is a case-insensitive substring of a topic.
+Use the `,' command to see the other matches.
+Give a blank topic name to go to the Index node itself.
+
+If STARTING-NODES is given, it should be a list of nodes specifying
+files in which the indices will be searched.  The results will be
+combined together."
+  (interactive "sIndex topic: ")
+  (let ((matches (if starting-nodes
+		     (mapcan #'(lambda (node)
+				 (Info-goto-node node)
+				 (Info-find-index-alternatives topic))
+			     starting-nodes)
+		   (Info-find-index-alternatives topic)))
+	exact found)
+    (or matches
+	(progn
+	  (if (or (not starting-nodes) (< (length starting-nodes) 2))
+	      (Info-last))
+	  (error "No \"%s\" in index" topic)))
+    ;; Here it is a feature that assoc is case-sensitive.
+    (while (setq found (assoc topic matches))
+      (setq exact (cons found exact)
+	    matches (delq found matches)))
+  (setq Info-index-alternatives (nconc exact matches)
+	Info-index-first-alternative (car Info-index-alternatives))
+  (Info-index-next 0)))
 
 (defun Info-index-next (num)
   "Go to the next matching index item from the last `i' command."
@@ -2441,6 +2466,43 @@
       (error (Info-find-node "elisp" "Top")))
     (Info-index (symbol-name func)))
   (pop-to-buffer "*info*"))
+
+(defun Info-read-search-text-regexp ()
+  (read-from-minibuffer
+   (if (and (boundp 'Info-last-search) Info-last-search)
+       (format "Search (regexp, default %s): "
+	       Info-last-search)
+     "Search (regexp): ")
+   nil nil nil nil nil (and (boundp 'Info-last-search) Info-last-search)))
+
+;;;###autoload
+(defun Info-search-text-in-lispref (regexp)
+  "Search for REGEXP in Lispref text and select node it's found in."
+  (interactive (list (Info-read-search-text-regexp)))
+  (Info-goto-node "(Lispref)")
+  (Info-search regexp))
+
+;;;###autoload
+(defun Info-search-text-in-xemacs (regexp)
+  "Search for REGEXP in User's Manual text and select node it's found in."
+  (interactive (list (Info-read-search-text-regexp)))
+  (Info-goto-node "(XEmacs)")
+  (Info-search regexp))
+
+;;;###autoload
+(defun Info-search-index-in-lispref (regexp)
+  "Search for REGEXP in Lispref index and select node it's found in."
+  (interactive "sIndex topic: ")
+  (Info-goto-node "(Lispref)")
+  (Info-index regexp))
+
+;;;###autoload
+(defun Info-search-index-in-xemacs-and-lispref (regexp)
+  "Search for REGEXP in both User's Manual and Lispref indices.
+Select node it's found in."
+  (interactive "sIndex topic: ")
+  (Info-index regexp '("(XEmacs)" "(Lispref)")))
+
 
 (defun Info-reannotate-node ()
   (let ((bufs (delq nil (mapcar 'get-file-buffer Info-annotations-path))))
@@ -2852,6 +2914,7 @@
   (define-key Info-mode-map "u" 'Info-up)
   (define-key Info-mode-map "v" 'Info-visit-file)
   (define-key Info-mode-map "x" 'Info-bookmark)
+  (define-key Info-mode-map "z" 'Info-search-next)
   (define-key Info-mode-map "<" 'Info-top)
   (define-key Info-mode-map ">" 'Info-end)
   (define-key Info-mode-map "[" 'Info-global-prev)