X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/328c069714ae705f93fc09607e47f5c19ddf2353..9c0c2af5a157eca18c86f644121f7eac5488dbda:/lisp/complete.el

diff --git a/lisp/complete.el b/lisp/complete.el
index c12e2ce95c..567e0fee10 100644
--- a/lisp/complete.el
+++ b/lisp/complete.el
@@ -1,10 +1,10 @@
 ;;; complete.el --- partial completion mechanism plus other goodies
 
-;; Copyright (C) 1990, 1991, 1992, 1993 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 1999, 2000
+;;  Free Software Foundation, Inc.
 
 ;; Author: Dave Gillespie <daveg@synaptics.com>
-;; Keywords: abbrev
-;; Version: 2.02
+;; Keywords: abbrev convenience
 ;; Special thanks to Hallvard Furuseth for his many ideas and contributions.
 
 ;; This file is part of GNU Emacs.
@@ -47,7 +47,7 @@
 ;; and the partial completer will use the Meta versions of the keys.
 
 
-;; Usage:  Load this file.  Now, during completable minibuffer entry,
+;; Usage:  M-x partial-completion-mode.  During completable minibuffer entry,
 ;;
 ;;     TAB    means to do a partial completion;
 ;;     SPC    means to do a partial complete-word;
@@ -62,7 +62,7 @@
 ;;
 ;; in your .emacs file.  To load partial completion automatically, put
 ;;
-;;       (load "complete")
+;;       (partial-completion-mode t)
 ;;
 ;; in your .emacs file, too.  Things will be faster if you byte-compile
 ;; this file when you install it.
@@ -78,17 +78,6 @@
 ;; The regular M-TAB (lisp-complete-symbol) command also supports
 ;; partial completion in this package.
 
-;; This package also contains a wildcard feature for C-x C-f (find-file).
-;; For example, `C-x C-f *.c RET' loads all .c files at once, exactly
-;; as if you had typed C-x C-f separately for each file.  Completion
-;; is supported in connection with wildcards.  Currently only the `*'
-;; wildcard character works.
-
-;; File name completion does not do partial completion of directories
-;; on the path, e.g., "/u/b/f" will not complete to "/usr/bin/foo",
-;; but you can put *'s in the path to accomplish this:  "/u*/b*/f".
-;; Stars are required for performance reasons.
-
 ;; In addition, this package includes a feature for accessing include
 ;; files.  For example, `C-x C-f <sys/time.h> RET' reads the file
 ;; /usr/include/sys/time.h.  The variable PC-include-file-path is a
@@ -98,71 +87,149 @@
 
 ;;; Code:
 
-(defvar PC-meta-flag t
-  "*If nil, TAB does normal Emacs completion and M-TAB does Partial Completion.
-If t, TAB does Partial Completion and M-TAB does normal completion.")
-
-
-(defvar PC-word-delimiters "-_. "
-  "*A string of characters which are to be treated as word delimiters
-by the Partial Completion system.
-
-Some arcane rules:  If `]' is in this string it must come first.
-If `^' is in this string it must NOT come first.  If `-' is in this
-string, it must come first or right after `]'.  In other words, if
-S is this string, then `[S]' must be a legal Emacs regular expression
-\(not containing character ranges like `a-z').")
-
-
-(defvar PC-first-char 'x
-  "*If t, first character of a string to be completed is always taken literally.
-If nil, word delimiters are handled even if they appear as first character.
-This controls whether \".e\" matches \".e*\" (t) or \"*.e*\" (nil).
-If neither nil nor t, first char is literal only for filename completion.")
-
-
-(defvar PC-include-file-path '("/usr/include")
-  "*List of directories in which to look for include files.
-If this is nil, uses the colon-separated path in $INCPATH instead.")
-
-
-(defvar PC-disable-wildcards nil
-  "Set this to non-nil to disable wildcard support in \\[find-file].")
-
-(defvar PC-disable-includes nil
-  "Set this to non-nil to disable include-file support in \\[find-file].")
-
+(defgroup partial-completion nil
+  "Partial Completion of items."
+  :prefix "pc-"
+  :group 'minibuffer
+  :group 'convenience)
+
+(defcustom PC-first-char 'find-file
+  "*Control how the first character of a string is to be interpreted.
+If nil, the first character of a string is not taken literally if it is a word
+delimiter, so that \".e\" matches \"*.e*\".
+If t, the first character of a string is always taken literally even if it is a
+word delimiter, so that \".e\" matches \".e*\".
+If non-nil and non-t, the first character is taken literally only for file name
+completion."
+  :type '(choice (const :tag "delimiter" nil)
+		 (const :tag "literal" t)
+		 (other :tag "find-file" find-file))
+  :group 'partial-completion)
+
+(defcustom PC-meta-flag t
+  "*If non-nil, TAB means PC completion and M-TAB means normal completion.
+Otherwise, TAB means normal completion and M-TAB means Partial Completion."
+  :type 'boolean
+  :group 'partial-completion)
+
+(defcustom PC-word-delimiters "-_. "
+  "*A string of characters treated as word delimiters for completion.
+Some arcane rules:
+If `]' is in this string, it must come first.
+If `^' is in this string, it must not come first.
+If `-' is in this string, it must come first or right after `]'.
+In other words, if S is this string, then `[S]' must be a legal Emacs regular
+expression (not containing character ranges like `a-z')."
+  :type 'string
+  :group 'partial-completion)
+
+(defcustom PC-include-file-path '("/usr/include" "/usr/local/include")
+  "*A list of directories in which to look for include files.
+If nil, means use the colon-separated path in the variable $INCPATH instead."
+  :type '(repeat directory)
+  :group 'partial-completion)
+
+(defcustom PC-disable-includes nil
+  "*If non-nil, include-file support in \\[find-file] is disabled."
+  :type 'boolean
+  :group 'partial-completion)
 
 (defvar PC-default-bindings t
-  "Set this to nil to suppress the default partial completion key bindings.")
-
-(if PC-default-bindings (progn
-(define-key minibuffer-local-completion-map "\t" 'PC-complete)
-(define-key minibuffer-local-completion-map " "  'PC-complete-word)
-(define-key minibuffer-local-completion-map "?"  'PC-completion-help)
-
-(define-key minibuffer-local-completion-map "\e\t" 'PC-complete)
-(define-key minibuffer-local-completion-map "\e "  'PC-complete-word)
-(define-key minibuffer-local-completion-map "\e\r" 'PC-force-complete-and-exit)
-(define-key minibuffer-local-completion-map "\e\n" 'PC-force-complete-and-exit)
-(define-key minibuffer-local-completion-map "\e?"  'PC-completion-help)
-
-(define-key minibuffer-local-must-match-map "\t" 'PC-complete)
-(define-key minibuffer-local-must-match-map " "  'PC-complete-word)
-(define-key minibuffer-local-must-match-map "\r" 'PC-complete-and-exit)
-(define-key minibuffer-local-must-match-map "\n" 'PC-complete-and-exit)
-(define-key minibuffer-local-must-match-map "?"  'PC-completion-help)
+  "If non-nil, default partial completion key bindings are suppressed.")
 
-(define-key minibuffer-local-must-match-map "\e\t" 'PC-complete)
-(define-key minibuffer-local-must-match-map "\e "  'PC-complete-word)
-(define-key minibuffer-local-must-match-map "\e\r" 'PC-complete-and-exit)
-(define-key minibuffer-local-must-match-map "\e\n" 'PC-complete-and-exit)
-(define-key minibuffer-local-must-match-map "\e?"  'PC-completion-help)
+(defvar PC-env-vars-alist nil
+  "A list of the environment variable names and values.")
 
-(define-key global-map "\e\t" 'PC-lisp-complete-symbol)
-))
+
+(defvar PC-old-read-file-name-internal nil)
 
+(defun PC-bindings (bind)
+  (let ((completion-map minibuffer-local-completion-map)
+	(must-match-map minibuffer-local-must-match-map))
+    (cond ((not bind)
+	   ;; These bindings are the default bindings.  It would be better to
+	   ;; restore the previous bindings.
+	   (define-key completion-map "\t"	'minibuffer-complete)
+	   (define-key completion-map " "	'minibuffer-complete-word)
+	   (define-key completion-map "?"	'minibuffer-completion-help)
+
+	   (define-key must-match-map "\t"	'minibuffer-complete)
+	   (define-key must-match-map " "	'minibuffer-complete-word)
+	   (define-key must-match-map "\r"	'minibuffer-complete-and-exit)
+	   (define-key must-match-map "\n"	'minibuffer-complete-and-exit)
+	   (define-key must-match-map "?"	'minibuffer-completion-help)
+
+	   (define-key global-map "\e\t"	'complete-symbol))
+	  (PC-default-bindings
+	   (define-key completion-map "\t"	'PC-complete)
+	   (define-key completion-map " "	'PC-complete-word)
+	   (define-key completion-map "?"	'PC-completion-help)
+
+	   (define-key completion-map "\e\t"	'PC-complete)
+	   (define-key completion-map "\e "	'PC-complete-word)
+	   (define-key completion-map "\e\r"	'PC-force-complete-and-exit)
+	   (define-key completion-map "\e\n"	'PC-force-complete-and-exit)
+	   (define-key completion-map "\e?"	'PC-completion-help)
+
+	   (define-key must-match-map "\t"	'PC-complete)
+	   (define-key must-match-map " "	'PC-complete-word)
+	   (define-key must-match-map "\r"	'PC-complete-and-exit)
+	   (define-key must-match-map "\n"	'PC-complete-and-exit)
+	   (define-key must-match-map "?"	'PC-completion-help)
+
+	   (define-key must-match-map "\e\t"	'PC-complete)
+	   (define-key must-match-map "\e "	'PC-complete-word)
+	   (define-key must-match-map "\e\r"	'PC-complete-and-exit)
+	   (define-key must-match-map "\e\n"	'PC-complete-and-exit)
+	   (define-key must-match-map "\e?"	'PC-completion-help)
+
+	   (define-key global-map "\e\t"	'PC-lisp-complete-symbol)))))
+
+;;;###autoload
+(define-minor-mode partial-completion-mode
+  "Toggle Partial Completion mode.
+With prefix ARG, turn Partial Completion mode on if ARG is positive.
+
+When Partial Completion mode is enabled, TAB (or M-TAB if `PC-meta-flag' is
+nil) is enhanced so that if some string is divided into words and each word is
+delimited by a character in `PC-word-delimiters', partial words are completed
+as much as possible and `*' characters are treated likewise in file names.
+
+For example, M-x p-c-m expands to M-x partial-completion-mode since no other
+command begins with that sequence of characters, and
+\\[find-file] f_b.c TAB might complete to foo_bar.c if that file existed and no
+other file in that directory begin with that sequence of characters.
+
+Unless `PC-disable-includes' is non-nil, the `<...>' sequence is interpreted
+specially in \\[find-file].  For example,
+\\[find-file] <sys/time.h> RET finds the file `/usr/include/sys/time.h'.
+See also the variable `PC-include-file-path'."
+  :global t :group 'partial-completion
+  ;; Deal with key bindings...
+  (PC-bindings partial-completion-mode)
+  ;; Deal with include file feature...
+  (cond ((not partial-completion-mode)
+	 (remove-hook 'find-file-not-found-hooks 'PC-look-for-include-file))
+	((not PC-disable-includes)
+	 (add-hook 'find-file-not-found-hooks 'PC-look-for-include-file)))
+  ;; ... with some underhand redefining.
+  (cond ((and (not partial-completion-mode)
+	      (functionp PC-old-read-file-name-internal))
+	 (fset 'read-file-name-internal PC-old-read-file-name-internal))
+	((and (not PC-disable-includes) (not PC-old-read-file-name-internal))
+	 (setq PC-old-read-file-name-internal
+	       (symbol-function 'read-file-name-internal))
+	 (fset 'read-file-name-internal
+	       'PC-read-include-file-name-internal)))
+    (when (and partial-completion-mode (null PC-env-vars-alist))
+      (setq PC-env-vars-alist
+	    (mapcar (lambda (string)
+		      (let ((d (string-match "=" string)))
+			(cons (concat "$" (substring string 0 d))
+			      (and d (substring string (1+ d))))))
+		    process-environment))))
 
+
 (defun PC-complete ()
   "Like minibuffer-complete, but allows \"b--di\"-style abbreviations.
 For example, \"M-x b--di\" would match `byte-recompile-directory', or any
@@ -237,7 +304,7 @@ See `PC-complete' for details."
     (PC-do-complete-and-exit)))
 
 (defun PC-do-complete-and-exit ()
-  (if (= (buffer-size) 0)  ; Duplicate the "bug" that Info-menu relies on...
+  (if (= (point-max) (minibuffer-prompt-end))  ; Duplicate the "bug" that Info-menu relies on...
       (exit-minibuffer)
     (let ((flag (PC-do-completion 'exit)))
       (and flag
@@ -281,17 +348,18 @@ The function takes no arguments, and typically looks at the value
 of `minibuffer-completion-table' and the minibuffer contents.")
 
 (defun PC-do-completion (&optional mode beg end)
-  (or beg (setq beg (point-min)))
+  (or beg (setq beg (minibuffer-prompt-end)))
   (or end (setq end (point-max)))
   (let* ((table minibuffer-completion-table)
 	 (pred minibuffer-completion-predicate)
 	 (filename (funcall PC-completion-as-file-name-predicate))
 	 (dirname nil)
-	 dirlength
+	 (dirlength 0)
 	 (str (buffer-substring beg end))
 	 (incname (and filename (string-match "<\\([^\"<>]*\\)>?$" str)))
 	 (ambig nil)
 	 basestr
+	 env-on
 	 regex
 	 p offset
 	 (poss nil)
@@ -303,20 +371,18 @@ of `minibuffer-completion-table' and the minibuffer contents.")
 	     (PC-is-complete-p str table pred))
 	'complete
 
-      ;; Record how many characters at the beginning are not included
-      ;; in completion.
-      (setq dirlength
-	    (if filename
-		(length (file-name-directory str))
-	      0))
-
       ;; Do substitutions in directory names
       (and filename
-	   (not (equal str (setq p (substitute-in-file-name str))))
-	   (progn
+           (setq basestr (or (file-name-directory str) ""))
+           (setq dirlength (length basestr))
+	   ;; Do substitutions in directory names
+           (setq p (substitute-in-file-name basestr))
+           (not (string-equal basestr p))
+           (setq str (concat p (file-name-nondirectory str)))
+           (progn
 	     (delete-region beg end)
-	     (insert p)
-	     (setq str p end (+ beg (length str)))))
+	     (insert str)
+	     (setq end (+ beg (length str)))))
 
       ;; Prepare various delimiter strings
       (or (equal PC-word-delimiters PC-delims)
@@ -325,6 +391,19 @@ of `minibuffer-completion-table' and the minibuffer contents.")
 		PC-ndelims-regex (concat "[^" PC-delims "]*")
 		PC-delims-list (append PC-delims nil)))
 
+      ;; Add wildcards if necessary
+      (and filename
+           (let ((dir (file-name-directory str))
+                 (file (file-name-nondirectory str)))
+             (while (and (stringp dir) (not (file-directory-p dir)))
+               (setq dir (directory-file-name dir))
+               (setq file (concat (replace-regexp-in-string
+                                   PC-delim-regex "*\\&"
+                                   (file-name-nondirectory dir))
+                                  "*/" file))
+               (setq dir (file-name-directory dir)))
+             (setq str (concat dir file))))
+
       ;; Look for wildcard expansions in directory name
       (and filename
 	   (string-match "\\*.*/" str)
@@ -357,7 +436,11 @@ of `minibuffer-completion-table' and the minibuffer contents.")
 	      (setq basestr (substring str incname)
 		    dirname (substring str 0 incname))
 	    (setq basestr (file-name-nondirectory str)
-		  dirname (file-name-directory str)))
+		  dirname (file-name-directory str))
+	    ;; Make sure str is consistent with its directory and basename
+	    ;; parts.  This is important on DOZe'NT systems when str only
+	    ;; includes a drive letter, like in "d:".
+	    (setq str (concat dirname basestr)))
 	(setq basestr str))
 
       ;; Convert search pattern to a standard regular expression
@@ -390,6 +473,12 @@ of `minibuffer-completion-table' and the minibuffer contents.")
       ;;(setq the-regex regex)
       (setq regex (concat "\\`" regex))
 
+      (and (> (length basestr) 0)
+           (= (aref basestr 0) ?$)
+           (setq env-on t
+                 table PC-env-vars-alist
+                 pred nil))
+
       ;; Find an initial list of possible completions
       (if (not (setq p (string-match (concat PC-delim-regex
 					     (if filename "\\|\\*" ""))
@@ -397,15 +486,18 @@ of `minibuffer-completion-table' and the minibuffer contents.")
 				     (+ (length dirname) offset))))
 
 	  ;; Minibuffer contains no hyphens -- simple case!
-	  (setq poss (all-completions str
+	  (setq poss (all-completions (if env-on
+					  basestr str)
 				      table
 				      pred))
 
 	;; Use all-completions to do an initial cull.  This is a big win,
 	;; since all-completions is written in C!
-	(let ((compl (all-completions (substring str 0 p)
-				      table
-				      pred)))
+	(let ((compl (all-completions (if env-on
+					  (file-name-nondirectory (substring str 0 p))
+					(substring str 0 p))
+                                        table
+                                        pred)))
 	  (setq p compl)
 	  (while p
 	    (and (string-match regex (car p))
@@ -452,10 +544,12 @@ of `minibuffer-completion-table' and the minibuffer contents.")
 				  "\\|")
 				 "\\)\\'")))
 
-	       ;; Check if there are any without an ignored extension
+	       ;; Check if there are any without an ignored extension.
+	       ;; Also ignore `.' and `..'.
 	       (setq p nil)
 	       (while p2
 		 (or (string-match PC-ignored-regexp (car p2))
+		     (string-match "\\(\\`\\|/\\)[.][.]?/?\\'" (car p2))
 		     (setq p (cons (car p2) p)))
 		 (setq p2 (cdr p2)))
 
@@ -551,10 +645,12 @@ of `minibuffer-completion-table' and the minibuffer contents.")
 
 		  ;; We changed it... enough to be complete?
 		  (and (eq mode 'exit)
-		       (PC-is-complete-p (buffer-string) table pred))
+		       (PC-is-complete-p (field-string) table pred))
 
 		;; If totally ambiguous, display a list of completions
-		(if (or completion-auto-help
+		(if (or (eq completion-auto-help t)
+			(and completion-auto-help
+			     (eq last-command this-command))
 			(eq mode 'help))
 		    (with-output-to-temp-buffer "*Completions*"
 		      (display-completion-list (sort helpposs 'string-lessp))
@@ -569,7 +665,8 @@ of `minibuffer-completion-table' and the minibuffer contents.")
 
        ;; Only one possible completion
        (t
-	(if (equal basestr (car poss))
+	(if (and (equal basestr (car poss))
+		 (not (and env-on filename)))
 	    (if (null mode)
 		(PC-temp-minibuffer-message " [Sole completion]"))
 	  (delete-region beg end)
@@ -606,25 +703,25 @@ of `minibuffer-completion-table' and the minibuffer contents.")
 
 (defvar PC-not-minibuffer nil)
 
-(defun PC-temp-minibuffer-message (m)
+(defun PC-temp-minibuffer-message (message)
   "A Lisp version of `temp_minibuffer_message' from minibuf.c."
-  (if PC-not-minibuffer
-      (progn
-	(message m)
-	(sit-for 2)
-	(message ""))
-    (if (fboundp 'temp-minibuffer-message)
-	(temp-minibuffer-message m)
-      (let ((savemax (point-max)))
-	(save-excursion
-	  (goto-char (point-max))
-	  (insert m))
-	(let ((inhibit-quit t))
-	  (sit-for 2)
-	  (delete-region savemax (point-max))
-	  (if quit-flag
-	      (setq quit-flag nil
-		    unread-command-char 7)))))))
+  (cond (PC-not-minibuffer
+	 (message message)
+	 (sit-for 2)
+	 (message ""))
+	((fboundp 'temp-minibuffer-message)
+	 (temp-minibuffer-message message))
+	(t
+	 (let ((point-max (point-max)))
+	   (save-excursion
+	     (goto-char point-max)
+	     (insert message))
+	   (let ((inhibit-quit t))
+	     (sit-for 2)
+	     (delete-region point-max (point-max))
+	     (when quit-flag
+	       (setq quit-flag nil
+		     unread-command-events '(7))))))))
 
 
 (defun PC-lisp-complete-symbol ()
@@ -658,57 +755,23 @@ or properties are considered."
 	 (PC-not-minibuffer t))
     (PC-do-completion nil beg end)))
 
-
-;;; Wildcards in `C-x C-f' command.  This is independent from the main
-;;; completion code, except for `PC-expand-many-files' which is called
-;;; when "*"'s are found in the path during filename completion.  (The
-;;; above completion code always understands "*"'s, except in file paths,
-;;; without relying on the following code.)
-
-(defvar PC-many-files-list nil)
-
-(defun PC-try-load-many-files ()
-  (if (string-match "\\*" buffer-file-name)
-      (let* ((pat buffer-file-name)
-	     (files (PC-expand-many-files pat))
-	     (first (car files))
-	     (next files))
-	(kill-buffer (current-buffer))
-	(or files
-	    (error "No matching files"))
-	;; Bring the other files (not the first) into buffers.
-	(save-window-excursion
-	  (while (setq next (cdr next))
-	    (let ((buf (find-file-noselect (car next))))
-	      ;; Put this buffer at the front of the buffer list.
-	      (switch-to-buffer buf))))
-	;; This modifies the `buf' variable inside find-file-noselect.
-	(setq buf (get-file-buffer first))
-	(if buf
-	    nil   ; should do verify-visited-file-modtime stuff.
-	  (setq filename first)
-	  (setq buf (create-file-buffer filename))
-	  ;; This modified `truename' inside find-file-noselect.
-	  (setq truename (abbreviate-file-name (file-truename filename)))
-	  (set-buffer buf)
-	  (erase-buffer)
-	  (insert-file-contents filename t))
-	(if (cdr files)
-	    (setq PC-many-files-list (mapconcat
-				      (if (string-match "\\*.*/" pat)
-					  'identity
-					'file-name-nondirectory)
-				      (cdr files) ", ")
-		  find-file-hooks (cons 'PC-after-load-many-files
-					find-file-hooks)))
-	;; This modifies the "error" variable inside find-file-noselect.
-	(setq error nil)
-	t)
-    nil))
-
-(defun PC-after-load-many-files ()
-  (setq find-file-hooks (delq 'PC-after-load-many-files find-file-hooks))
-  (message "Also loaded %s." PC-many-files-list))
+(defun PC-complete-as-file-name ()
+   "Perform completion on file names preceding point.
+ Environment vars are converted to their values."
+   (interactive)
+   (let* ((end (point))
+          (beg (if (re-search-backward "[^\\][ \t\n\"\`\'][^ \t\n\"\`\']"
+				       (point-min) t)
+                   (+ (point) 2)
+                   (point-min)))
+          (minibuffer-completion-table 'read-file-name-internal)
+          (minibuffer-completion-predicate "")
+          (PC-not-minibuffer t))
+     (goto-char end)
+     (PC-do-completion nil beg end)))
+
+;;; Use the shell to do globbing.
+;;; This could now use file-expand-wildcards instead.
 
 (defun PC-expand-many-files (name)
   (save-excursion
@@ -726,16 +789,23 @@ or properties are considered."
       (delete-backward-char 1)
       (insert "\")")
       (goto-char (point-min))
-      (let ((files (read (current-buffer))))
+      (let ((files (read (current-buffer))) (p nil))
 	(kill-buffer (current-buffer))
-	files))))
-
-(or PC-disable-wildcards
-    (memq 'PC-try-load-many-files find-file-not-found-hooks)
-    (setq find-file-not-found-hooks (cons 'PC-try-load-many-files
-					  find-file-not-found-hooks)))
-
-
+	(or (equal completion-ignored-extensions PC-ignored-extensions)
+	    (setq PC-ignored-regexp
+		  (concat "\\("
+			  (mapconcat
+			   'regexp-quote
+			   (setq PC-ignored-extensions
+				 completion-ignored-extensions)
+			   "\\|")
+			  "\\)\\'")))
+	(setq p nil)
+	(while files
+	  (or (string-match PC-ignored-regexp (car files))
+	      (setq p (cons (car files) p)))
+	  (setq files (cdr files)))
+	p))))
 
 ;;; Facilities for loading C header files.  This is independent from the
 ;;; main completion code.  See also the variable `PC-include-file-path'
@@ -776,7 +846,7 @@ or properties are considered."
 			  (or (string-match "\\.el$" name)
 			      (setq name (concat name ".el")))))
 		    (error "Not on an #include line"))))))
-	(or (string-match "\\.[a-zA-Z0-9]+$" name)
+	(or (string-match "\\.[[:alnum:]]+$" name)
 	    (setq name (concat name ".h")))
 	(if (eq punc ?\<)
 	    (let ((path (or path (PC-include-file-path))))
@@ -793,7 +863,7 @@ or properties are considered."
 		       default-directory)))
 	    (if (file-exists-p (concat dir name))
 		(setq name (concat dir name))
-	      (error "No such include file: \"%s\"" name))))
+	      (error "No such include file: `%s'" name))))
 	(setq new-buf (get-file-buffer name))
 	(if new-buf
 	    ;; no need to verify last-modified time for this!
@@ -802,9 +872,8 @@ or properties are considered."
 	  (set-buffer new-buf)
 	  (erase-buffer)
 	  (insert-file-contents name t))
-	(setq filename name
-	      error nil
-	      buf new-buf)
+	;; Returning non-nil with the new buffer current
+	;; is sufficient to tell find-file to use it.
 	t)
     nil))
 
@@ -822,17 +891,17 @@ or properties are considered."
 ;;; This is adapted from lib-complete.el, by Mike Williams.
 (defun PC-include-file-all-completions (file search-path &optional full)
   "Return all completions for FILE in any directory on SEARCH-PATH.
-If optional third argument FULL is non-nil, returned pathnames should be 
+If optional third argument FULL is non-nil, returned pathnames should be
 absolute rather than relative to some directory on the SEARCH-PATH."
   (setq search-path
-	(mapcar '(lambda (dir)
-		   (if dir (file-name-as-directory dir) default-directory))
+	(mapcar (lambda (dir)
+		  (if dir (file-name-as-directory dir) default-directory))
 		search-path))
   (if (file-name-absolute-p file)
       ;; It's an absolute file name, so don't need search-path
       (progn
 	(setq file (expand-file-name file))
-	(file-name-all-completions 
+	(file-name-all-completions
 	 (file-name-nondirectory file) (file-name-directory file)))
     (let ((subdir (file-name-directory file))
 	  (ndfile (file-name-nondirectory file))
@@ -840,7 +909,7 @@ absolute rather than relative to some directory on the SEARCH-PATH."
       ;; Append subdirectory part to each element of search-path
       (if subdir
 	  (setq search-path
-		(mapcar '(lambda (dir) (concat dir subdir))
+		(mapcar (lambda (dir) (concat dir subdir))
 			search-path)
 		file ))
       ;; Make list of completions in each directory on search-path
@@ -850,15 +919,15 @@ absolute rather than relative to some directory on the SEARCH-PATH."
 	  (if (file-directory-p dir)
 	      (progn
 		(setq file-lists
-		      (cons 
-		       (mapcar '(lambda (file) (concat subdir file))
-			       (file-name-all-completions ndfile 
+		      (cons
+		       (mapcar (lambda (file) (concat subdir file))
+			       (file-name-all-completions ndfile
 							  (car search-path)))
 		       file-lists))))
 	  (setq search-path (cdr search-path))))
       ;; Compress out duplicates while building complete list (slloooow!)
       (let ((sorted (sort (apply 'nconc file-lists)
-			  '(lambda (x y) (not (string-lessp x y)))))
+			  (lambda (x y) (not (string-lessp x y)))))
 	    compressed)
 	(while sorted
 	  (if (equal (car sorted) (car compressed)) nil
@@ -866,8 +935,6 @@ absolute rather than relative to some directory on the SEARCH-PATH."
 	  (setq sorted (cdr sorted)))
 	compressed))))
 
-(defvar PC-old-read-file-name-internal nil)
-
 (defun PC-read-include-file-name-internal (string dir action)
   (if (string-match "<\\([^\"<>]*\\)>?$" string)
       (let* ((name (substring string (match-beginning 1) (match-end 1)))
@@ -883,20 +950,9 @@ absolute rather than relative to some directory on the SEARCH-PATH."
 	 ((eq action 'lambda)
 	  (eq (try-completion str2 completion-table nil) t))))
     (funcall PC-old-read-file-name-internal string dir action)))
-
-(or PC-disable-includes
-    (memq 'PC-look-for-include-file find-file-not-found-hooks)
-    (setq find-file-not-found-hooks (cons 'PC-look-for-include-file
-					  find-file-not-found-hooks)))
-
-(or PC-disable-includes
-    PC-old-read-file-name-internal
-    (progn
-      (setq PC-old-read-file-name-internal
-	    (symbol-function 'read-file-name-internal))
-      (fset 'read-file-name-internal 'PC-read-include-file-name-internal)))
-
 
+
 (provide 'complete)
 
-;;; End.
+;;; arch-tag: fc7e2768-ff44-4e22-b579-4d825b968458
+;;; complete.el ends here