Mercurial > emacs
annotate lisp/complete.el @ 70229:b85aa1663ba3
(posn-string, posn-image, posn-object): Doc fix.
| author | Kim F. Storm <storm@cua.dk> |
|---|---|
| date | Wed, 26 Apr 2006 08:56:32 +0000 |
| parents | 10e0b8ee9993 |
| children | b599bb78c1fc 72dea2ff0142 |
| rev | line source |
|---|---|
| 15261 | 1 ;;; complete.el --- partial completion mechanism plus other goodies |
| 3725 | 2 |
|
64762
41bb365f41c4
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64091
diff
changeset
|
3 ;; Copyright (C) 1990, 1991, 1992, 1993, 1999, 2000, 2002, 2003, 2004, |
|
68651
3bd95f4f2941
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
67622
diff
changeset
|
4 ;; 2005, 2006 Free Software Foundation, Inc. |
| 3725 | 5 |
| 6 ;; Author: Dave Gillespie <daveg@synaptics.com> | |
|
22250
a77d473867b8
*** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents:
22142
diff
changeset
|
7 ;; Keywords: abbrev convenience |
| 3725 | 8 ;; Special thanks to Hallvard Furuseth for his many ideas and contributions. |
| 9 | |
| 10 ;; This file is part of GNU Emacs. | |
| 11 | |
|
6736
3e1323443b1a
Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents:
3725
diff
changeset
|
12 ;; GNU Emacs is free software; you can redistribute it and/or modify |
|
3e1323443b1a
Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents:
3725
diff
changeset
|
13 ;; it under the terms of the GNU General Public License as published by |
|
3e1323443b1a
Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents:
3725
diff
changeset
|
14 ;; the Free Software Foundation; either version 2, or (at your option) |
|
3e1323443b1a
Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents:
3725
diff
changeset
|
15 ;; any later version. |
| 3725 | 16 |
|
6736
3e1323443b1a
Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents:
3725
diff
changeset
|
17 ;; GNU Emacs is distributed in the hope that it will be useful, |
|
3e1323443b1a
Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents:
3725
diff
changeset
|
18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
3e1323443b1a
Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents:
3725
diff
changeset
|
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
3e1323443b1a
Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents:
3725
diff
changeset
|
20 ;; GNU General Public License for more details. |
| 3725 | 21 |
|
6736
3e1323443b1a
Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents:
3725
diff
changeset
|
22 ;; You should have received a copy of the GNU General Public License |
| 14169 | 23 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
| 64091 | 24 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
| 25 ;; Boston, MA 02110-1301, USA. | |
| 3725 | 26 |
| 7942 | 27 ;;; Commentary: |
| 3725 | 28 |
| 29 ;; Extended completion for the Emacs minibuffer. | |
| 30 ;; | |
| 31 ;; The basic idea is that the command name or other completable text is | |
| 32 ;; divided into words and each word is completed separately, so that | |
| 33 ;; "M-x p-b" expands to "M-x print-buffer". If the entry is ambiguous | |
| 34 ;; each word is completed as much as possible and then the cursor is | |
| 35 ;; left at the first position where typing another letter will resolve | |
| 36 ;; the ambiguity. | |
| 37 ;; | |
| 38 ;; Word separators for this purpose are hyphen, space, and period. | |
| 39 ;; These would most likely occur in command names, Info menu items, | |
| 40 ;; and file names, respectively. But all word separators are treated | |
| 41 ;; alike at all times. | |
| 42 ;; | |
| 43 ;; This completion package replaces the old-style completer's key | |
| 44 ;; bindings for TAB, SPC, RET, and `?'. The old completer is still | |
| 45 ;; available on the Meta versions of those keys. If you set | |
| 46 ;; PC-meta-flag to nil, the old completion keys will be left alone | |
| 47 ;; and the partial completer will use the Meta versions of the keys. | |
| 48 | |
| 49 | |
| 22142 | 50 ;; Usage: M-x partial-completion-mode. During completable minibuffer entry, |
| 3725 | 51 ;; |
| 52 ;; TAB means to do a partial completion; | |
| 53 ;; SPC means to do a partial complete-word; | |
| 54 ;; RET means to do a partial complete-and-exit; | |
| 55 ;; ? means to do a partial completion-help. | |
| 56 ;; | |
| 57 ;; If you set PC-meta-flag to nil, then TAB, SPC, RET, and ? perform | |
| 58 ;; original Emacs completions, and M-TAB etc. do partial completion. | |
| 59 ;; To do this, put the command, | |
| 60 ;; | |
| 61 ;; (setq PC-meta-flag nil) | |
| 62 ;; | |
| 63 ;; in your .emacs file. To load partial completion automatically, put | |
| 64 ;; | |
| 22142 | 65 ;; (partial-completion-mode t) |
| 3725 | 66 ;; |
| 67 ;; in your .emacs file, too. Things will be faster if you byte-compile | |
| 68 ;; this file when you install it. | |
| 69 ;; | |
| 70 ;; As an extra feature, in cases where RET would not normally | |
| 71 ;; complete (such as `C-x b'), the M-RET key will always do a partial | |
| 72 ;; complete-and-exit. Thus `C-x b f.c RET' will select or create a | |
| 73 ;; buffer called "f.c", but `C-x b f.c M-RET' will select the existing | |
| 74 ;; buffer whose name matches that pattern (perhaps "filing.c"). | |
| 75 ;; (PC-meta-flag does not affect this behavior; M-RET used to be | |
| 76 ;; undefined in this situation.) | |
| 77 ;; | |
| 78 ;; The regular M-TAB (lisp-complete-symbol) command also supports | |
| 79 ;; partial completion in this package. | |
| 80 | |
| 81 ;; In addition, this package includes a feature for accessing include | |
| 82 ;; files. For example, `C-x C-f <sys/time.h> RET' reads the file | |
| 83 ;; /usr/include/sys/time.h. The variable PC-include-file-path is a | |
| 84 ;; list of directories in which to search for include files. Completion | |
| 85 ;; is supported in include file names. | |
| 86 | |
| 87 | |
| 7942 | 88 ;;; Code: |
| 3725 | 89 |
|
18981
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
90 (defgroup partial-completion nil |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
91 "Partial Completion of items." |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
92 :prefix "pc-" |
|
22250
a77d473867b8
*** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents:
22142
diff
changeset
|
93 :group 'minibuffer |
|
a77d473867b8
*** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents:
22142
diff
changeset
|
94 :group 'convenience) |
| 3725 | 95 |
|
18981
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
96 (defcustom PC-first-char 'find-file |
|
69309
f0678aafb24e
(PC-expand-many-files): Try be more careful when parsing the shell's output.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
97 "Control how the first character of a string is to be interpreted. |
|
18981
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
98 If nil, the first character of a string is not taken literally if it is a word |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
99 delimiter, so that \".e\" matches \"*.e*\". |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
100 If t, the first character of a string is always taken literally even if it is a |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
101 word delimiter, so that \".e\" matches \".e*\". |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
102 If non-nil and non-t, the first character is taken literally only for file name |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
103 completion." |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
104 :type '(choice (const :tag "delimiter" nil) |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
105 (const :tag "literal" t) |
|
22570
6cfe82c80677
(PC-first-char): Use `other' widget type.
Andreas Schwab <schwab@suse.de>
parents:
22250
diff
changeset
|
106 (other :tag "find-file" find-file)) |
|
18981
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
107 :group 'partial-completion) |
| 3725 | 108 |
|
18981
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
109 (defcustom PC-meta-flag t |
|
69309
f0678aafb24e
(PC-expand-many-files): Try be more careful when parsing the shell's output.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
110 "If non-nil, TAB means PC completion and M-TAB means normal completion. |
|
18981
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
111 Otherwise, TAB means normal completion and M-TAB means Partial Completion." |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
112 :type 'boolean |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
113 :group 'partial-completion) |
| 3725 | 114 |
|
18981
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
115 (defcustom PC-word-delimiters "-_. " |
|
69309
f0678aafb24e
(PC-expand-many-files): Try be more careful when parsing the shell's output.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
116 "A string of characters treated as word delimiters for completion. |
|
18981
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
117 Some arcane rules: |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
118 If `]' is in this string, it must come first. |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
119 If `^' is in this string, it must not come first. |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
120 If `-' is in this string, it must come first or right after `]'. |
|
60920
242e5edee3ce
* complete.el, thumbs.el: Replace `legal' with `valid'.
Werner LEMBERG <wl@gnu.org>
parents:
53258
diff
changeset
|
121 In other words, if S is this string, then `[S]' must be a valid Emacs regular |
|
18981
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
122 expression (not containing character ranges like `a-z')." |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
123 :type 'string |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
124 :group 'partial-completion) |
| 3725 | 125 |
|
18981
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
126 (defcustom PC-include-file-path '("/usr/include" "/usr/local/include") |
|
69309
f0678aafb24e
(PC-expand-many-files): Try be more careful when parsing the shell's output.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
127 "A list of directories in which to look for include files. |
|
18981
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
128 If nil, means use the colon-separated path in the variable $INCPATH instead." |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
129 :type '(repeat directory) |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
130 :group 'partial-completion) |
| 3725 | 131 |
|
18981
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
132 (defcustom PC-disable-includes nil |
|
69309
f0678aafb24e
(PC-expand-many-files): Try be more careful when parsing the shell's output.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
133 "If non-nil, include-file support in \\[find-file] is disabled." |
|
18981
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
134 :type 'boolean |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
135 :group 'partial-completion) |
| 3725 | 136 |
| 137 (defvar PC-default-bindings t | |
|
18981
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
138 "If non-nil, default partial completion key bindings are suppressed.") |
|
29674
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
139 |
|
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
140 (defvar PC-env-vars-alist nil |
|
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
141 "A list of the environment variable names and values.") |
|
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
142 |
|
18981
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
143 |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
144 (defun PC-bindings (bind) |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
145 (let ((completion-map minibuffer-local-completion-map) |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
146 (must-match-map minibuffer-local-must-match-map)) |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
147 (cond ((not bind) |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
148 ;; These bindings are the default bindings. It would be better to |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
149 ;; restore the previous bindings. |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
150 (define-key completion-map "\t" 'minibuffer-complete) |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
151 (define-key completion-map " " 'minibuffer-complete-word) |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
152 (define-key completion-map "?" 'minibuffer-completion-help) |
| 3725 | 153 |
|
18981
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
154 (define-key must-match-map "\t" 'minibuffer-complete) |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
155 (define-key must-match-map " " 'minibuffer-complete-word) |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
156 (define-key must-match-map "\r" 'minibuffer-complete-and-exit) |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
157 (define-key must-match-map "\n" 'minibuffer-complete-and-exit) |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
158 (define-key must-match-map "?" 'minibuffer-completion-help) |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
159 |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
160 (define-key global-map "\e\t" 'complete-symbol)) |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
161 (PC-default-bindings |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
162 (define-key completion-map "\t" 'PC-complete) |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
163 (define-key completion-map " " 'PC-complete-word) |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
164 (define-key completion-map "?" 'PC-completion-help) |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
165 |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
166 (define-key completion-map "\e\t" 'PC-complete) |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
167 (define-key completion-map "\e " 'PC-complete-word) |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
168 (define-key completion-map "\e\r" 'PC-force-complete-and-exit) |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
169 (define-key completion-map "\e\n" 'PC-force-complete-and-exit) |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
170 (define-key completion-map "\e?" 'PC-completion-help) |
| 3725 | 171 |
|
18981
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
172 (define-key must-match-map "\t" 'PC-complete) |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
173 (define-key must-match-map " " 'PC-complete-word) |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
174 (define-key must-match-map "\r" 'PC-complete-and-exit) |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
175 (define-key must-match-map "\n" 'PC-complete-and-exit) |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
176 (define-key must-match-map "?" 'PC-completion-help) |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
177 |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
178 (define-key must-match-map "\e\t" 'PC-complete) |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
179 (define-key must-match-map "\e " 'PC-complete-word) |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
180 (define-key must-match-map "\e\r" 'PC-complete-and-exit) |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
181 (define-key must-match-map "\e\n" 'PC-complete-and-exit) |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
182 (define-key must-match-map "\e?" 'PC-completion-help) |
| 3725 | 183 |
|
18981
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
184 (define-key global-map "\e\t" 'PC-lisp-complete-symbol))))) |
| 3725 | 185 |
|
31971
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
186 ;;;###autoload |
|
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
187 (define-minor-mode partial-completion-mode |
|
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
188 "Toggle Partial Completion mode. |
|
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
189 With prefix ARG, turn Partial Completion mode on if ARG is positive. |
|
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
190 |
|
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
191 When Partial Completion mode is enabled, TAB (or M-TAB if `PC-meta-flag' is |
|
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
192 nil) is enhanced so that if some string is divided into words and each word is |
|
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
193 delimited by a character in `PC-word-delimiters', partial words are completed |
|
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
194 as much as possible and `*' characters are treated likewise in file names. |
|
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
195 |
|
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
196 For example, M-x p-c-m expands to M-x partial-completion-mode since no other |
|
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
197 command begins with that sequence of characters, and |
|
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
198 \\[find-file] f_b.c TAB might complete to foo_bar.c if that file existed and no |
|
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
199 other file in that directory begin with that sequence of characters. |
|
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
200 |
|
36033
0a150990aa8c
(partial-completion-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
33183
diff
changeset
|
201 Unless `PC-disable-includes' is non-nil, the `<...>' sequence is interpreted |
|
31971
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
202 specially in \\[find-file]. For example, |
|
36033
0a150990aa8c
(partial-completion-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
33183
diff
changeset
|
203 \\[find-file] <sys/time.h> RET finds the file `/usr/include/sys/time.h'. |
|
67008
13e3867c55fb
(partial-completion-mode): Mention completion-auto-help in the doc string.
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
204 See also the variable `PC-include-file-path'. |
|
13e3867c55fb
(partial-completion-mode): Mention completion-auto-help in the doc string.
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
205 |
|
13e3867c55fb
(partial-completion-mode): Mention completion-auto-help in the doc string.
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
206 Partial Completion mode extends the meaning of `completion-auto-help' (which |
|
67596
b5e49d33eeef
(partial-completion-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
67161
diff
changeset
|
207 see), so that if it is neither nil nor t, Emacs shows the `*Completions*' |
|
b5e49d33eeef
(partial-completion-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
67161
diff
changeset
|
208 buffer only on the second attempt to complete. That is, if TAB finds nothing |
|
b5e49d33eeef
(partial-completion-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
67161
diff
changeset
|
209 to complete, the first TAB just says \"Next char not unique\" and the |
|
67622
bd00b5fc4e4d
(PC-do-completion): Remove `(equal (point) beg)' to
Juri Linkov <juri@jurta.org>
parents:
67596
diff
changeset
|
210 second TAB brings up the `*Completions*' buffer." |
|
33183
1988cb3ecd2f
(partial-completion-mode): Drop unneeded positional args.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31971
diff
changeset
|
211 :global t :group 'partial-completion |
|
31971
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
212 ;; Deal with key bindings... |
|
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
213 (PC-bindings partial-completion-mode) |
|
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
214 ;; Deal with include file feature... |
|
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
215 (cond ((not partial-completion-mode) |
|
67161
759b69f39057
(PC-completion-as-file-name-predicate): Use minibuffer-completing-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67008
diff
changeset
|
216 (remove-hook 'find-file-not-found-functions 'PC-look-for-include-file)) |
|
31971
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
217 ((not PC-disable-includes) |
|
67161
759b69f39057
(PC-completion-as-file-name-predicate): Use minibuffer-completing-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67008
diff
changeset
|
218 (add-hook 'find-file-not-found-functions 'PC-look-for-include-file))) |
|
31971
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
219 ;; ... with some underhand redefining. |
|
70076
10e0b8ee9993
(partial-completion-mode): Use 'choose-completion-string-functions to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69309
diff
changeset
|
220 (cond ((not partial-completion-mode) |
|
10e0b8ee9993
(partial-completion-mode): Use 'choose-completion-string-functions to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69309
diff
changeset
|
221 (ad-disable-advice 'read-file-name-internal 'around 'PC-include-file) |
|
10e0b8ee9993
(partial-completion-mode): Use 'choose-completion-string-functions to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69309
diff
changeset
|
222 (ad-activate 'read-file-name-internal)) |
|
10e0b8ee9993
(partial-completion-mode): Use 'choose-completion-string-functions to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69309
diff
changeset
|
223 ((not PC-disable-includes) |
|
10e0b8ee9993
(partial-completion-mode): Use 'choose-completion-string-functions to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69309
diff
changeset
|
224 (ad-enable-advice 'read-file-name-internal 'around 'PC-include-file) |
|
10e0b8ee9993
(partial-completion-mode): Use 'choose-completion-string-functions to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69309
diff
changeset
|
225 (ad-activate 'read-file-name-internal))) |
|
10e0b8ee9993
(partial-completion-mode): Use 'choose-completion-string-functions to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69309
diff
changeset
|
226 ;; Adjust the completion selection in *Completion* buffers to the way |
|
10e0b8ee9993
(partial-completion-mode): Use 'choose-completion-string-functions to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69309
diff
changeset
|
227 ;; we work. The default minibuffer completion code only completes the |
|
10e0b8ee9993
(partial-completion-mode): Use 'choose-completion-string-functions to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69309
diff
changeset
|
228 ;; text before point and leaves the text after point alone (new in |
|
10e0b8ee9993
(partial-completion-mode): Use 'choose-completion-string-functions to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69309
diff
changeset
|
229 ;; Emacs-22). In contrast we use the whole text and we even sometimes |
|
10e0b8ee9993
(partial-completion-mode): Use 'choose-completion-string-functions to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69309
diff
changeset
|
230 ;; move point to a place before EOB, to indicate the first position where |
|
10e0b8ee9993
(partial-completion-mode): Use 'choose-completion-string-functions to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69309
diff
changeset
|
231 ;; there's a difference, so when the user uses choose-completion, we have |
|
10e0b8ee9993
(partial-completion-mode): Use 'choose-completion-string-functions to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69309
diff
changeset
|
232 ;; to trick choose-completion into replacing the whole minibuffer text |
|
10e0b8ee9993
(partial-completion-mode): Use 'choose-completion-string-functions to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69309
diff
changeset
|
233 ;; rather than only the text before point. --Stef |
|
10e0b8ee9993
(partial-completion-mode): Use 'choose-completion-string-functions to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69309
diff
changeset
|
234 (funcall |
|
10e0b8ee9993
(partial-completion-mode): Use 'choose-completion-string-functions to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69309
diff
changeset
|
235 (if partial-completion-mode 'add-hook 'remove-hook) |
|
10e0b8ee9993
(partial-completion-mode): Use 'choose-completion-string-functions to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69309
diff
changeset
|
236 'choose-completion-string-functions |
|
10e0b8ee9993
(partial-completion-mode): Use 'choose-completion-string-functions to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69309
diff
changeset
|
237 (lambda (&rest x) (goto-char (point-max)) nil)) |
|
10e0b8ee9993
(partial-completion-mode): Use 'choose-completion-string-functions to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69309
diff
changeset
|
238 ;; Build the env-completion and mapping table. |
|
10e0b8ee9993
(partial-completion-mode): Use 'choose-completion-string-functions to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69309
diff
changeset
|
239 (when (and partial-completion-mode (null PC-env-vars-alist)) |
|
10e0b8ee9993
(partial-completion-mode): Use 'choose-completion-string-functions to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69309
diff
changeset
|
240 (setq PC-env-vars-alist |
|
10e0b8ee9993
(partial-completion-mode): Use 'choose-completion-string-functions to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69309
diff
changeset
|
241 (mapcar (lambda (string) |
|
10e0b8ee9993
(partial-completion-mode): Use 'choose-completion-string-functions to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69309
diff
changeset
|
242 (let ((d (string-match "=" string))) |
|
10e0b8ee9993
(partial-completion-mode): Use 'choose-completion-string-functions to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69309
diff
changeset
|
243 (cons (concat "$" (substring string 0 d)) |
|
10e0b8ee9993
(partial-completion-mode): Use 'choose-completion-string-functions to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69309
diff
changeset
|
244 (and d (substring string (1+ d)))))) |
|
10e0b8ee9993
(partial-completion-mode): Use 'choose-completion-string-functions to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69309
diff
changeset
|
245 process-environment)))) |
|
31971
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
246 |
|
18981
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
247 |
| 3725 | 248 (defun PC-complete () |
| 249 "Like minibuffer-complete, but allows \"b--di\"-style abbreviations. | |
| 250 For example, \"M-x b--di\" would match `byte-recompile-directory', or any | |
| 251 name which consists of three or more words, the first beginning with \"b\" | |
| 252 and the third beginning with \"di\". | |
| 253 | |
| 254 The pattern \"b--d\" is ambiguous for `byte-recompile-directory' and | |
| 255 `beginning-of-defun', so this would produce a list of completions | |
| 256 just like when normal Emacs completions are ambiguous. | |
| 257 | |
| 258 Word-delimiters for the purposes of Partial Completion are \"-\", \"_\", | |
| 259 \".\", and SPC." | |
| 260 (interactive) | |
| 261 (if (PC-was-meta-key) | |
| 262 (minibuffer-complete) | |
|
15802
1595df9ed1e8
(PC-complete): When command is repeated,
Richard M. Stallman <rms@gnu.org>
parents:
15261
diff
changeset
|
263 ;; If the previous command was not this one, |
|
1595df9ed1e8
(PC-complete): When command is repeated,
Richard M. Stallman <rms@gnu.org>
parents:
15261
diff
changeset
|
264 ;; never scroll, always retry completion. |
|
1595df9ed1e8
(PC-complete): When command is repeated,
Richard M. Stallman <rms@gnu.org>
parents:
15261
diff
changeset
|
265 (or (eq last-command this-command) |
|
1595df9ed1e8
(PC-complete): When command is repeated,
Richard M. Stallman <rms@gnu.org>
parents:
15261
diff
changeset
|
266 (setq minibuffer-scroll-window nil)) |
|
1595df9ed1e8
(PC-complete): When command is repeated,
Richard M. Stallman <rms@gnu.org>
parents:
15261
diff
changeset
|
267 (let ((window minibuffer-scroll-window)) |
|
1595df9ed1e8
(PC-complete): When command is repeated,
Richard M. Stallman <rms@gnu.org>
parents:
15261
diff
changeset
|
268 ;; If there's a fresh completion window with a live buffer, |
|
1595df9ed1e8
(PC-complete): When command is repeated,
Richard M. Stallman <rms@gnu.org>
parents:
15261
diff
changeset
|
269 ;; and this command is repeated, scroll that window. |
|
1595df9ed1e8
(PC-complete): When command is repeated,
Richard M. Stallman <rms@gnu.org>
parents:
15261
diff
changeset
|
270 (if (and window (window-buffer window) |
|
1595df9ed1e8
(PC-complete): When command is repeated,
Richard M. Stallman <rms@gnu.org>
parents:
15261
diff
changeset
|
271 (buffer-name (window-buffer window))) |
|
67161
759b69f39057
(PC-completion-as-file-name-predicate): Use minibuffer-completing-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67008
diff
changeset
|
272 (with-current-buffer (window-buffer window) |
|
15802
1595df9ed1e8
(PC-complete): When command is repeated,
Richard M. Stallman <rms@gnu.org>
parents:
15261
diff
changeset
|
273 (if (pos-visible-in-window-p (point-max) window) |
|
1595df9ed1e8
(PC-complete): When command is repeated,
Richard M. Stallman <rms@gnu.org>
parents:
15261
diff
changeset
|
274 (set-window-start window (point-min) nil) |
|
1595df9ed1e8
(PC-complete): When command is repeated,
Richard M. Stallman <rms@gnu.org>
parents:
15261
diff
changeset
|
275 (scroll-other-window))) |
|
1595df9ed1e8
(PC-complete): When command is repeated,
Richard M. Stallman <rms@gnu.org>
parents:
15261
diff
changeset
|
276 (PC-do-completion nil))))) |
| 3725 | 277 |
| 278 | |
| 279 (defun PC-complete-word () | |
| 280 "Like `minibuffer-complete-word', but allows \"b--di\"-style abbreviations. | |
| 281 See `PC-complete' for details. | |
| 282 This can be bound to other keys, like `-' and `.', if you wish." | |
| 283 (interactive) | |
| 284 (if (eq (PC-was-meta-key) PC-meta-flag) | |
| 285 (if (eq last-command-char ? ) | |
| 286 (minibuffer-complete-word) | |
| 287 (self-insert-command 1)) | |
| 288 (self-insert-command 1) | |
| 289 (if (eobp) | |
| 290 (PC-do-completion 'word)))) | |
| 291 | |
| 292 | |
| 293 (defun PC-complete-space () | |
| 294 "Like `minibuffer-complete-word', but allows \"b--di\"-style abbreviations. | |
| 295 See `PC-complete' for details. | |
| 296 This is suitable for binding to other keys which should act just like SPC." | |
| 297 (interactive) | |
| 298 (if (eq (PC-was-meta-key) PC-meta-flag) | |
| 299 (minibuffer-complete-word) | |
| 300 (insert " ") | |
| 301 (if (eobp) | |
| 302 (PC-do-completion 'word)))) | |
| 303 | |
| 304 | |
| 305 (defun PC-complete-and-exit () | |
| 306 "Like `minibuffer-complete-and-exit', but allows \"b--di\"-style abbreviations. | |
| 307 See `PC-complete' for details." | |
| 308 (interactive) | |
| 309 (if (eq (PC-was-meta-key) PC-meta-flag) | |
| 310 (minibuffer-complete-and-exit) | |
| 311 (PC-do-complete-and-exit))) | |
| 312 | |
| 313 (defun PC-force-complete-and-exit () | |
| 314 "Like `minibuffer-complete-and-exit', but allows \"b--di\"-style abbreviations. | |
| 315 See `PC-complete' for details." | |
| 316 (interactive) | |
| 317 (let ((minibuffer-completion-confirm nil)) | |
| 318 (PC-do-complete-and-exit))) | |
| 319 | |
| 320 (defun PC-do-complete-and-exit () | |
|
26508
8548cb8ad6e2
(PC-do-complete-and-exit): use minibuffer-prompt-end to
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26341
diff
changeset
|
321 (if (= (point-max) (minibuffer-prompt-end)) ; Duplicate the "bug" that Info-menu relies on... |
| 3725 | 322 (exit-minibuffer) |
| 323 (let ((flag (PC-do-completion 'exit))) | |
| 324 (and flag | |
| 325 (if (or (eq flag 'complete) | |
| 326 (not minibuffer-completion-confirm)) | |
| 327 (exit-minibuffer) | |
|
10164
d16e46a4e34c
(PC-do-completion): If complete but not unique,
Richard M. Stallman <rms@gnu.org>
parents:
8478
diff
changeset
|
328 (PC-temp-minibuffer-message " [Confirm]")))))) |
| 3725 | 329 |
| 330 | |
| 331 (defun PC-completion-help () | |
| 332 "Like `minibuffer-completion-help', but allows \"b--di\"-style abbreviations. | |
| 333 See `PC-complete' for details." | |
| 334 (interactive) | |
| 335 (if (eq (PC-was-meta-key) PC-meta-flag) | |
| 336 (minibuffer-completion-help) | |
| 337 (PC-do-completion 'help))) | |
| 338 | |
| 339 (defun PC-was-meta-key () | |
| 340 (or (/= (length (this-command-keys)) 1) | |
| 341 (let ((key (aref (this-command-keys) 0))) | |
| 342 (if (integerp key) | |
| 343 (>= key 128) | |
| 344 (not (null (memq 'meta (event-modifiers key)))))))) | |
| 345 | |
| 346 | |
| 347 (defvar PC-ignored-extensions 'empty-cache) | |
| 348 (defvar PC-delims 'empty-cache) | |
| 349 (defvar PC-ignored-regexp nil) | |
| 350 (defvar PC-word-failed-flag nil) | |
| 351 (defvar PC-delim-regex nil) | |
| 352 (defvar PC-ndelims-regex nil) | |
| 353 (defvar PC-delims-list nil) | |
| 354 | |
|
14765
844686eabff0
(PC-completion-as-file-name-predicate):
Richard M. Stallman <rms@gnu.org>
parents:
14759
diff
changeset
|
355 (defvar PC-completion-as-file-name-predicate |
|
67161
759b69f39057
(PC-completion-as-file-name-predicate): Use minibuffer-completing-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67008
diff
changeset
|
356 (lambda () minibuffer-completing-file-name) |
|
759b69f39057
(PC-completion-as-file-name-predicate): Use minibuffer-completing-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67008
diff
changeset
|
357 "A function testing whether a minibuffer completion now will work filename-style. |
|
14765
844686eabff0
(PC-completion-as-file-name-predicate):
Richard M. Stallman <rms@gnu.org>
parents:
14759
diff
changeset
|
358 The function takes no arguments, and typically looks at the value |
|
844686eabff0
(PC-completion-as-file-name-predicate):
Richard M. Stallman <rms@gnu.org>
parents:
14759
diff
changeset
|
359 of `minibuffer-completion-table' and the minibuffer contents.") |
|
14759
f93ed65c0584
(PC-do-completion-filename-completers): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
360 |
| 3725 | 361 (defun PC-do-completion (&optional mode beg end) |
|
26341
6063383b77d5
(PC-do-completion): Use minibuffer-prompt-end to
Gerd Moellmann <gerd@gnu.org>
parents:
25207
diff
changeset
|
362 (or beg (setq beg (minibuffer-prompt-end))) |
| 3725 | 363 (or end (setq end (point-max))) |
| 364 (let* ((table minibuffer-completion-table) | |
| 365 (pred minibuffer-completion-predicate) | |
|
14765
844686eabff0
(PC-completion-as-file-name-predicate):
Richard M. Stallman <rms@gnu.org>
parents:
14759
diff
changeset
|
366 (filename (funcall PC-completion-as-file-name-predicate)) |
| 3725 | 367 (dirname nil) |
|
29674
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
368 (dirlength 0) |
| 3725 | 369 (str (buffer-substring beg end)) |
| 370 (incname (and filename (string-match "<\\([^\"<>]*\\)>?$" str))) | |
| 371 (ambig nil) | |
| 372 basestr | |
|
29674
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
373 env-on |
| 3725 | 374 regex |
| 375 p offset | |
| 376 (poss nil) | |
| 377 helpposs | |
| 378 (case-fold-search completion-ignore-case)) | |
| 379 | |
| 380 ;; Check if buffer contents can already be considered complete | |
| 381 (if (and (eq mode 'exit) | |
|
53258
f94a302ee4c0
(PC-is-complete-p): delete.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52883
diff
changeset
|
382 (test-completion str table pred)) |
| 3725 | 383 'complete |
| 384 | |
| 385 ;; Do substitutions in directory names | |
| 386 (and filename | |
|
29674
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
387 (setq basestr (or (file-name-directory str) "")) |
|
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
388 (setq dirlength (length basestr)) |
|
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
389 ;; Do substitutions in directory names |
|
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
390 (setq p (substitute-in-file-name basestr)) |
|
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
391 (not (string-equal basestr p)) |
|
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
392 (setq str (concat p (file-name-nondirectory str))) |
|
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
393 (progn |
| 3725 | 394 (delete-region beg end) |
|
29674
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
395 (insert str) |
|
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
396 (setq end (+ beg (length str))))) |
|
48611
79a38ce36eb1
(PC-do-completion): Do not add wildcards to pattern unless filename is
Noah Friedman <friedman@splode.com>
parents:
48225
diff
changeset
|
397 |
| 3725 | 398 ;; Prepare various delimiter strings |
| 399 (or (equal PC-word-delimiters PC-delims) | |
| 400 (setq PC-delims PC-word-delimiters | |
| 401 PC-delim-regex (concat "[" PC-delims "]") | |
| 402 PC-ndelims-regex (concat "[^" PC-delims "]*") | |
| 403 PC-delims-list (append PC-delims nil))) | |
| 404 | |
|
48225
75ced2cd606e
(PC-do-completion): Make partial-completion work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
405 ;; Add wildcards if necessary |
|
48611
79a38ce36eb1
(PC-do-completion): Do not add wildcards to pattern unless filename is
Noah Friedman <friedman@splode.com>
parents:
48225
diff
changeset
|
406 (and filename |
|
79a38ce36eb1
(PC-do-completion): Do not add wildcards to pattern unless filename is
Noah Friedman <friedman@splode.com>
parents:
48225
diff
changeset
|
407 (let ((dir (file-name-directory str)) |
|
52883
cc2b636ab1db
(PC-do-completion): Do not forget to use `pred' as the default-directory
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
408 (file (file-name-nondirectory str)) |
|
cc2b636ab1db
(PC-do-completion): Do not forget to use `pred' as the default-directory
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
409 ;; The base dir for file-completion is passed in `predicate'. |
|
cc2b636ab1db
(PC-do-completion): Do not forget to use `pred' as the default-directory
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
410 (default-directory (expand-file-name pred))) |
|
48611
79a38ce36eb1
(PC-do-completion): Do not add wildcards to pattern unless filename is
Noah Friedman <friedman@splode.com>
parents:
48225
diff
changeset
|
411 (while (and (stringp dir) (not (file-directory-p dir))) |
|
79a38ce36eb1
(PC-do-completion): Do not add wildcards to pattern unless filename is
Noah Friedman <friedman@splode.com>
parents:
48225
diff
changeset
|
412 (setq dir (directory-file-name dir)) |
|
79a38ce36eb1
(PC-do-completion): Do not add wildcards to pattern unless filename is
Noah Friedman <friedman@splode.com>
parents:
48225
diff
changeset
|
413 (setq file (concat (replace-regexp-in-string |
|
79a38ce36eb1
(PC-do-completion): Do not add wildcards to pattern unless filename is
Noah Friedman <friedman@splode.com>
parents:
48225
diff
changeset
|
414 PC-delim-regex "*\\&" |
|
79a38ce36eb1
(PC-do-completion): Do not add wildcards to pattern unless filename is
Noah Friedman <friedman@splode.com>
parents:
48225
diff
changeset
|
415 (file-name-nondirectory dir)) |
|
79a38ce36eb1
(PC-do-completion): Do not add wildcards to pattern unless filename is
Noah Friedman <friedman@splode.com>
parents:
48225
diff
changeset
|
416 "*/" file)) |
|
79a38ce36eb1
(PC-do-completion): Do not add wildcards to pattern unless filename is
Noah Friedman <friedman@splode.com>
parents:
48225
diff
changeset
|
417 (setq dir (file-name-directory dir))) |
|
79a38ce36eb1
(PC-do-completion): Do not add wildcards to pattern unless filename is
Noah Friedman <friedman@splode.com>
parents:
48225
diff
changeset
|
418 (setq str (concat dir file)))) |
|
79a38ce36eb1
(PC-do-completion): Do not add wildcards to pattern unless filename is
Noah Friedman <friedman@splode.com>
parents:
48225
diff
changeset
|
419 |
| 3725 | 420 ;; Look for wildcard expansions in directory name |
| 421 (and filename | |
| 422 (string-match "\\*.*/" str) | |
| 423 (let ((pat str) | |
|
52883
cc2b636ab1db
(PC-do-completion): Do not forget to use `pred' as the default-directory
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
424 ;; The base dir for file-completion is passed in `predicate'. |
|
cc2b636ab1db
(PC-do-completion): Do not forget to use `pred' as the default-directory
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
425 (default-directory (expand-file-name pred)) |
| 3725 | 426 files) |
| 427 (setq p (1+ (string-match "/[^/]*\\'" pat))) | |
| 428 (while (setq p (string-match PC-delim-regex pat p)) | |
| 429 (setq pat (concat (substring pat 0 p) | |
| 430 "*" | |
| 431 (substring pat p)) | |
| 432 p (+ p 2))) | |
| 433 (setq files (PC-expand-many-files (concat pat "*"))) | |
| 434 (if files | |
| 435 (let ((dir (file-name-directory (car files))) | |
| 436 (p files)) | |
| 437 (while (and (setq p (cdr p)) | |
| 438 (equal dir (file-name-directory (car p))))) | |
| 439 (if p | |
| 440 (setq filename nil table nil pred nil | |
| 441 ambig t) | |
| 442 (delete-region beg end) | |
| 443 (setq str (concat dir (file-name-nondirectory str))) | |
| 444 (insert str) | |
| 445 (setq end (+ beg (length str))))) | |
| 446 (setq filename nil table nil pred nil)))) | |
| 447 | |
| 448 ;; Strip directory name if appropriate | |
| 449 (if filename | |
| 450 (if incname | |
| 451 (setq basestr (substring str incname) | |
| 452 dirname (substring str 0 incname)) | |
| 453 (setq basestr (file-name-nondirectory str) | |
|
25207
e62d2121822f
(PC-do-completion): If completing on file name,
Eli Zaretskii <eliz@gnu.org>
parents:
24624
diff
changeset
|
454 dirname (file-name-directory str)) |
|
e62d2121822f
(PC-do-completion): If completing on file name,
Eli Zaretskii <eliz@gnu.org>
parents:
24624
diff
changeset
|
455 ;; Make sure str is consistent with its directory and basename |
|
e62d2121822f
(PC-do-completion): If completing on file name,
Eli Zaretskii <eliz@gnu.org>
parents:
24624
diff
changeset
|
456 ;; parts. This is important on DOZe'NT systems when str only |
|
e62d2121822f
(PC-do-completion): If completing on file name,
Eli Zaretskii <eliz@gnu.org>
parents:
24624
diff
changeset
|
457 ;; includes a drive letter, like in "d:". |
|
e62d2121822f
(PC-do-completion): If completing on file name,
Eli Zaretskii <eliz@gnu.org>
parents:
24624
diff
changeset
|
458 (setq str (concat dirname basestr))) |
| 3725 | 459 (setq basestr str)) |
| 460 | |
| 461 ;; Convert search pattern to a standard regular expression | |
| 462 (setq regex (regexp-quote basestr) | |
| 463 offset (if (and (> (length regex) 0) | |
| 464 (not (eq (aref basestr 0) ?\*)) | |
| 465 (or (eq PC-first-char t) | |
| 466 (and PC-first-char filename))) 1 0) | |
| 467 p offset) | |
| 468 (while (setq p (string-match PC-delim-regex regex p)) | |
| 469 (if (eq (aref regex p) ? ) | |
| 470 (setq regex (concat (substring regex 0 p) | |
| 471 PC-ndelims-regex | |
| 472 PC-delim-regex | |
| 473 (substring regex (1+ p))) | |
| 474 p (+ p (length PC-ndelims-regex) (length PC-delim-regex))) | |
| 475 (let ((bump (if (memq (aref regex p) | |
| 476 '(?$ ?^ ?\. ?* ?+ ?? ?[ ?] ?\\)) | |
| 477 -1 0))) | |
| 478 (setq regex (concat (substring regex 0 (+ p bump)) | |
| 479 PC-ndelims-regex | |
| 480 (substring regex (+ p bump))) | |
| 481 p (+ p (length PC-ndelims-regex) 1))))) | |
| 482 (setq p 0) | |
| 483 (if filename | |
| 484 (while (setq p (string-match "\\\\\\*" regex p)) | |
| 485 (setq regex (concat (substring regex 0 p) | |
| 486 "[^/]*" | |
| 487 (substring regex (+ p 2)))))) | |
| 488 ;;(setq the-regex regex) | |
| 489 (setq regex (concat "\\`" regex)) | |
| 490 | |
|
29674
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
491 (and (> (length basestr) 0) |
|
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
492 (= (aref basestr 0) ?$) |
|
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
493 (setq env-on t |
|
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
494 table PC-env-vars-alist |
|
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
495 pred nil)) |
|
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
496 |
| 3725 | 497 ;; Find an initial list of possible completions |
| 498 (if (not (setq p (string-match (concat PC-delim-regex | |
| 499 (if filename "\\|\\*" "")) | |
| 500 str | |
| 501 (+ (length dirname) offset)))) | |
| 502 | |
| 503 ;; Minibuffer contains no hyphens -- simple case! | |
|
29674
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
504 (setq poss (all-completions (if env-on |
|
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
505 basestr str) |
| 3725 | 506 table |
| 507 pred)) | |
| 508 | |
| 509 ;; Use all-completions to do an initial cull. This is a big win, | |
| 510 ;; since all-completions is written in C! | |
|
29674
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
511 (let ((compl (all-completions (if env-on |
|
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
512 (file-name-nondirectory (substring str 0 p)) |
|
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
513 (substring str 0 p)) |
|
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
514 table |
|
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
515 pred))) |
| 3725 | 516 (setq p compl) |
| 517 (while p | |
| 518 (and (string-match regex (car p)) | |
|
16608
e2858bcbed43
(PC-do-completion): Remove text properties from
Karl Heuer <kwzh@gnu.org>
parents:
15802
diff
changeset
|
519 (progn |
|
e2858bcbed43
(PC-do-completion): Remove text properties from
Karl Heuer <kwzh@gnu.org>
parents:
15802
diff
changeset
|
520 (set-text-properties 0 (length (car p)) '() (car p)) |
|
e2858bcbed43
(PC-do-completion): Remove text properties from
Karl Heuer <kwzh@gnu.org>
parents:
15802
diff
changeset
|
521 (setq poss (cons (car p) poss)))) |
| 3725 | 522 (setq p (cdr p))))) |
| 523 | |
| 524 ;; Now we have a list of possible completions | |
| 525 (cond | |
| 526 | |
| 527 ;; No valid completions found | |
| 528 ((null poss) | |
| 529 (if (and (eq mode 'word) | |
| 530 (not PC-word-failed-flag)) | |
| 531 (let ((PC-word-failed-flag t)) | |
| 532 (delete-backward-char 1) | |
| 533 (PC-do-completion 'word)) | |
| 534 (beep) | |
| 535 (PC-temp-minibuffer-message (if ambig | |
|
10164
d16e46a4e34c
(PC-do-completion): If complete but not unique,
Richard M. Stallman <rms@gnu.org>
parents:
8478
diff
changeset
|
536 " [Ambiguous dir name]" |
| 3725 | 537 (if (eq mode 'help) |
|
10164
d16e46a4e34c
(PC-do-completion): If complete but not unique,
Richard M. Stallman <rms@gnu.org>
parents:
8478
diff
changeset
|
538 " [No completions]" |
|
d16e46a4e34c
(PC-do-completion): If complete but not unique,
Richard M. Stallman <rms@gnu.org>
parents:
8478
diff
changeset
|
539 " [No match]"))) |
| 3725 | 540 nil)) |
| 541 | |
| 542 ;; More than one valid completion found | |
| 543 ((or (cdr (setq helpposs poss)) | |
| 544 (memq mode '(help word))) | |
| 545 | |
| 546 ;; Handle completion-ignored-extensions | |
| 547 (and filename | |
| 548 (not (eq mode 'help)) | |
| 549 (let ((p2 poss)) | |
| 550 | |
| 551 ;; Build a regular expression representing the extensions list | |
| 552 (or (equal completion-ignored-extensions PC-ignored-extensions) | |
| 553 (setq PC-ignored-regexp | |
| 554 (concat "\\(" | |
| 555 (mapconcat | |
| 556 'regexp-quote | |
| 557 (setq PC-ignored-extensions | |
| 558 completion-ignored-extensions) | |
| 559 "\\|") | |
| 560 "\\)\\'"))) | |
| 561 | |
|
23009
9ffaa505edc7
(PC-do-completion): Exclude ./ and ../ from completion.
Richard M. Stallman <rms@gnu.org>
parents:
22570
diff
changeset
|
562 ;; Check if there are any without an ignored extension. |
|
9ffaa505edc7
(PC-do-completion): Exclude ./ and ../ from completion.
Richard M. Stallman <rms@gnu.org>
parents:
22570
diff
changeset
|
563 ;; Also ignore `.' and `..'. |
| 3725 | 564 (setq p nil) |
| 565 (while p2 | |
| 566 (or (string-match PC-ignored-regexp (car p2)) | |
|
23009
9ffaa505edc7
(PC-do-completion): Exclude ./ and ../ from completion.
Richard M. Stallman <rms@gnu.org>
parents:
22570
diff
changeset
|
567 (string-match "\\(\\`\\|/\\)[.][.]?/?\\'" (car p2)) |
| 3725 | 568 (setq p (cons (car p2) p))) |
| 569 (setq p2 (cdr p2))) | |
| 570 | |
| 571 ;; If there are "good" names, use them | |
| 572 (and p (setq poss p)))) | |
| 573 | |
| 574 ;; Is the actual string one of the possible completions? | |
| 575 (setq p (and (not (eq mode 'help)) poss)) | |
| 576 (while (and p | |
|
16608
e2858bcbed43
(PC-do-completion): Remove text properties from
Karl Heuer <kwzh@gnu.org>
parents:
15802
diff
changeset
|
577 (not (string-equal (car p) basestr))) |
| 3725 | 578 (setq p (cdr p))) |
|
10164
d16e46a4e34c
(PC-do-completion): If complete but not unique,
Richard M. Stallman <rms@gnu.org>
parents:
8478
diff
changeset
|
579 (and p (null mode) |
|
d16e46a4e34c
(PC-do-completion): If complete but not unique,
Richard M. Stallman <rms@gnu.org>
parents:
8478
diff
changeset
|
580 (PC-temp-minibuffer-message " [Complete, but not unique]")) |
|
d16e46a4e34c
(PC-do-completion): If complete but not unique,
Richard M. Stallman <rms@gnu.org>
parents:
8478
diff
changeset
|
581 (if (and p |
|
d16e46a4e34c
(PC-do-completion): If complete but not unique,
Richard M. Stallman <rms@gnu.org>
parents:
8478
diff
changeset
|
582 (not (and (null mode) |
|
d16e46a4e34c
(PC-do-completion): If complete but not unique,
Richard M. Stallman <rms@gnu.org>
parents:
8478
diff
changeset
|
583 (eq this-command last-command)))) |
|
d16e46a4e34c
(PC-do-completion): If complete but not unique,
Richard M. Stallman <rms@gnu.org>
parents:
8478
diff
changeset
|
584 t |
| 3725 | 585 |
| 586 ;; If ambiguous, try for a partial completion | |
| 587 (let ((improved nil) | |
| 588 prefix | |
| 589 (pt nil) | |
| 590 (skip "\\`")) | |
| 591 | |
| 592 ;; Check if next few letters are the same in all cases | |
| 593 (if (and (not (eq mode 'help)) | |
| 594 (setq prefix (try-completion "" (mapcar 'list poss)))) | |
| 595 (let ((first t) i) | |
| 596 (if (eq mode 'word) | |
| 597 (setq prefix (PC-chop-word prefix basestr))) | |
| 598 (goto-char (+ beg (length dirname))) | |
| 599 (while (and (progn | |
| 600 (setq i 0) | |
| 601 (while (< i (length prefix)) | |
| 602 (if (and (< (point) end) | |
| 603 (eq (aref prefix i) | |
| 604 (following-char))) | |
| 605 (forward-char 1) | |
| 606 (if (and (< (point) end) | |
| 607 (or (and (looking-at " ") | |
| 608 (memq (aref prefix i) | |
| 609 PC-delims-list)) | |
| 610 (eq (downcase (aref prefix i)) | |
| 611 (downcase | |
| 612 (following-char))))) | |
| 613 (progn | |
| 614 (delete-char 1) | |
| 615 (setq end (1- end))) | |
| 616 (and filename (looking-at "\\*") | |
| 617 (progn | |
| 618 (delete-char 1) | |
| 619 (setq end (1- end)))) | |
| 620 (setq improved t)) | |
|
16608
e2858bcbed43
(PC-do-completion): Remove text properties from
Karl Heuer <kwzh@gnu.org>
parents:
15802
diff
changeset
|
621 (insert (substring prefix i (1+ i))) |
| 3725 | 622 (setq end (1+ end))) |
| 623 (setq i (1+ i))) | |
|
67622
bd00b5fc4e4d
(PC-do-completion): Remove `(equal (point) beg)' to
Juri Linkov <juri@jurta.org>
parents:
67596
diff
changeset
|
624 (or pt (setq pt (point))) |
| 3725 | 625 (looking-at PC-delim-regex)) |
| 626 (setq skip (concat skip | |
| 627 (regexp-quote prefix) | |
| 628 PC-ndelims-regex) | |
| 629 prefix (try-completion | |
| 630 "" | |
| 631 (mapcar | |
| 632 (function | |
| 633 (lambda (x) | |
| 634 (list | |
| 635 (and (string-match skip x) | |
| 636 (substring | |
| 637 x | |
| 638 (match-end 0)))))) | |
| 639 poss))) | |
| 640 (or (> i 0) (> (length prefix) 0)) | |
| 641 (or (not (eq mode 'word)) | |
| 642 (and first (> (length prefix) 0) | |
| 643 (setq first nil | |
| 644 prefix (substring prefix 0 1)))))) | |
| 645 (goto-char (if (eq mode 'word) end | |
| 646 (or pt beg))))) | |
| 647 | |
| 648 (if (and (eq mode 'word) | |
| 649 (not PC-word-failed-flag)) | |
| 650 | |
| 651 (if improved | |
| 652 | |
| 653 ;; We changed it... would it be complete without the space? | |
|
53258
f94a302ee4c0
(PC-is-complete-p): delete.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52883
diff
changeset
|
654 (if (test-completion (buffer-substring 1 (1- end)) |
| 3725 | 655 table pred) |
| 656 (delete-region (1- end) end))) | |
| 657 | |
| 658 (if improved | |
| 659 | |
| 660 ;; We changed it... enough to be complete? | |
| 661 (and (eq mode 'exit) | |
|
53258
f94a302ee4c0
(PC-is-complete-p): delete.
Luc Teirlinck <teirllm@auburn.edu>
parents:
52883
diff
changeset
|
662 (test-completion (field-string) table pred)) |
| 3725 | 663 |
| 664 ;; If totally ambiguous, display a list of completions | |
|
31971
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
665 (if (or (eq completion-auto-help t) |
|
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
666 (and completion-auto-help |
|
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
667 (eq last-command this-command)) |
| 3725 | 668 (eq mode 'help)) |
|
7844
86402e8c677b
(PC-do-completion): Likewise.
Richard M. Stallman <rms@gnu.org>
parents:
7792
diff
changeset
|
669 (with-output-to-temp-buffer "*Completions*" |
|
8478
9d3d84a3c3fa
(PC-do-completion): Set completion-base-size.
Richard M. Stallman <rms@gnu.org>
parents:
7942
diff
changeset
|
670 (display-completion-list (sort helpposs 'string-lessp)) |
|
67161
759b69f39057
(PC-completion-as-file-name-predicate): Use minibuffer-completing-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67008
diff
changeset
|
671 (with-current-buffer standard-output |
|
8478
9d3d84a3c3fa
(PC-do-completion): Set completion-base-size.
Richard M. Stallman <rms@gnu.org>
parents:
7942
diff
changeset
|
672 ;; Record which part of the buffer we are completing |
|
9d3d84a3c3fa
(PC-do-completion): Set completion-base-size.
Richard M. Stallman <rms@gnu.org>
parents:
7942
diff
changeset
|
673 ;; so that choosing a completion from the list |
|
9d3d84a3c3fa
(PC-do-completion): Set completion-base-size.
Richard M. Stallman <rms@gnu.org>
parents:
7942
diff
changeset
|
674 ;; knows how much old text to replace. |
|
9d3d84a3c3fa
(PC-do-completion): Set completion-base-size.
Richard M. Stallman <rms@gnu.org>
parents:
7942
diff
changeset
|
675 (setq completion-base-size dirlength))) |
|
10164
d16e46a4e34c
(PC-do-completion): If complete but not unique,
Richard M. Stallman <rms@gnu.org>
parents:
8478
diff
changeset
|
676 (PC-temp-minibuffer-message " [Next char not unique]")) |
| 3725 | 677 nil))))) |
| 678 | |
| 679 ;; Only one possible completion | |
| 680 (t | |
|
29674
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
681 (if (and (equal basestr (car poss)) |
|
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
682 (not (and env-on filename))) |
| 3725 | 683 (if (null mode) |
|
10164
d16e46a4e34c
(PC-do-completion): If complete but not unique,
Richard M. Stallman <rms@gnu.org>
parents:
8478
diff
changeset
|
684 (PC-temp-minibuffer-message " [Sole completion]")) |
| 3725 | 685 (delete-region beg end) |
|
7792
1335cec8a016
(PC-do-completion): Clear text props from inserted text.
Richard M. Stallman <rms@gnu.org>
parents:
7639
diff
changeset
|
686 (insert (format "%s" |
|
1335cec8a016
(PC-do-completion): Clear text props from inserted text.
Richard M. Stallman <rms@gnu.org>
parents:
7639
diff
changeset
|
687 (if filename |
|
1335cec8a016
(PC-do-completion): Clear text props from inserted text.
Richard M. Stallman <rms@gnu.org>
parents:
7639
diff
changeset
|
688 (substitute-in-file-name (concat dirname (car poss))) |
|
1335cec8a016
(PC-do-completion): Clear text props from inserted text.
Richard M. Stallman <rms@gnu.org>
parents:
7639
diff
changeset
|
689 (car poss))))) |
| 3725 | 690 t))))) |
| 691 | |
| 692 (defun PC-chop-word (new old) | |
| 693 (let ((i -1) | |
| 694 (j -1)) | |
| 695 (while (and (setq i (string-match PC-delim-regex old (1+ i))) | |
| 696 (setq j (string-match PC-delim-regex new (1+ j))))) | |
| 697 (if (and j | |
| 698 (or (not PC-word-failed-flag) | |
| 699 (setq j (string-match PC-delim-regex new (1+ j))))) | |
| 700 (substring new 0 (1+ j)) | |
| 701 new))) | |
| 702 | |
| 703 (defvar PC-not-minibuffer nil) | |
| 704 | |
|
18981
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
705 (defun PC-temp-minibuffer-message (message) |
| 3725 | 706 "A Lisp version of `temp_minibuffer_message' from minibuf.c." |
|
18981
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
707 (cond (PC-not-minibuffer |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
708 (message message) |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
709 (sit-for 2) |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
710 (message "")) |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
711 ((fboundp 'temp-minibuffer-message) |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
712 (temp-minibuffer-message message)) |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
713 (t |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
714 (let ((point-max (point-max))) |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
715 (save-excursion |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
716 (goto-char point-max) |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
717 (insert message)) |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
718 (let ((inhibit-quit t)) |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
719 (sit-for 2) |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
720 (delete-region point-max (point-max)) |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
721 (when quit-flag |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
722 (setq quit-flag nil |
|
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
723 unread-command-events '(7)))))))) |
| 3725 | 724 |
| 725 | |
| 726 (defun PC-lisp-complete-symbol () | |
| 727 "Perform completion on Lisp symbol preceding point. | |
| 728 That symbol is compared against the symbols that exist | |
| 729 and any additional characters determined by what is there | |
| 730 are inserted. | |
| 731 If the symbol starts just after an open-parenthesis, | |
| 732 only symbols with function definitions are considered. | |
| 733 Otherwise, all symbols with function definitions, values | |
| 734 or properties are considered." | |
| 735 (interactive) | |
| 736 (let* ((end (point)) | |
|
67161
759b69f39057
(PC-completion-as-file-name-predicate): Use minibuffer-completing-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67008
diff
changeset
|
737 (beg (save-excursion |
|
759b69f39057
(PC-completion-as-file-name-predicate): Use minibuffer-completing-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67008
diff
changeset
|
738 (with-syntax-table lisp-mode-syntax-table |
|
759b69f39057
(PC-completion-as-file-name-predicate): Use minibuffer-completing-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67008
diff
changeset
|
739 (backward-sexp 1) |
|
759b69f39057
(PC-completion-as-file-name-predicate): Use minibuffer-completing-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67008
diff
changeset
|
740 (while (= (char-syntax (following-char)) ?\') |
|
759b69f39057
(PC-completion-as-file-name-predicate): Use minibuffer-completing-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67008
diff
changeset
|
741 (forward-char 1)) |
|
759b69f39057
(PC-completion-as-file-name-predicate): Use minibuffer-completing-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67008
diff
changeset
|
742 (point)))) |
| 3725 | 743 (minibuffer-completion-table obarray) |
| 744 (minibuffer-completion-predicate | |
| 745 (if (eq (char-after (1- beg)) ?\() | |
| 746 'fboundp | |
| 747 (function (lambda (sym) | |
| 748 (or (boundp sym) (fboundp sym) | |
| 749 (symbol-plist sym)))))) | |
| 750 (PC-not-minibuffer t)) | |
| 751 (PC-do-completion nil beg end))) | |
| 752 | |
|
29674
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
753 (defun PC-complete-as-file-name () |
|
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
754 "Perform completion on file names preceding point. |
|
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
755 Environment vars are converted to their values." |
|
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
756 (interactive) |
|
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
757 (let* ((end (point)) |
|
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
758 (beg (if (re-search-backward "[^\\][ \t\n\"\`\'][^ \t\n\"\`\']" |
|
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
759 (point-min) t) |
|
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
760 (+ (point) 2) |
|
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
761 (point-min))) |
|
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
762 (minibuffer-completion-table 'read-file-name-internal) |
|
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
763 (minibuffer-completion-predicate "") |
|
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
764 (PC-not-minibuffer t)) |
|
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
765 (goto-char end) |
|
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
766 (PC-do-completion nil beg end))) |
|
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
767 |
|
67161
759b69f39057
(PC-completion-as-file-name-predicate): Use minibuffer-completing-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67008
diff
changeset
|
768 ;; Use the shell to do globbing. |
|
759b69f39057
(PC-completion-as-file-name-predicate): Use minibuffer-completing-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67008
diff
changeset
|
769 ;; This could now use file-expand-wildcards instead. |
| 3725 | 770 |
| 771 (defun PC-expand-many-files (name) | |
|
67161
759b69f39057
(PC-completion-as-file-name-predicate): Use minibuffer-completing-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67008
diff
changeset
|
772 (with-current-buffer (generate-new-buffer " *Glob Output*") |
| 3725 | 773 (erase-buffer) |
| 774 (shell-command (concat "echo " name) t) | |
| 775 (goto-char (point-min)) | |
|
69309
f0678aafb24e
(PC-expand-many-files): Try be more careful when parsing the shell's output.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
776 ;; CSH-style shells were known to output "No match", whereas |
|
f0678aafb24e
(PC-expand-many-files): Try be more careful when parsing the shell's output.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
777 ;; SH-style shells tend to simply output `name' when no match is found. |
|
f0678aafb24e
(PC-expand-many-files): Try be more careful when parsing the shell's output.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
778 (if (looking-at (concat ".*No match\\|\\(^\\| \\)\\(" |
|
f0678aafb24e
(PC-expand-many-files): Try be more careful when parsing the shell's output.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
779 (regexp-quote name) |
|
f0678aafb24e
(PC-expand-many-files): Try be more careful when parsing the shell's output.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
780 "\\|" |
|
f0678aafb24e
(PC-expand-many-files): Try be more careful when parsing the shell's output.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
781 (regexp-quote (expand-file-name name)) |
|
f0678aafb24e
(PC-expand-many-files): Try be more careful when parsing the shell's output.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
782 "\\)\\( \\|$\\)")) |
| 3725 | 783 nil |
| 784 (insert "(\"") | |
| 785 (while (search-forward " " nil t) | |
| 786 (delete-backward-char 1) | |
| 787 (insert "\" \"")) | |
| 788 (goto-char (point-max)) | |
| 789 (delete-backward-char 1) | |
| 790 (insert "\")") | |
| 791 (goto-char (point-min)) | |
|
21266
af9641af8877
(PC-expand-many-files): Apply completion-ignored-extensions.
Karl Heuer <kwzh@gnu.org>
parents:
20709
diff
changeset
|
792 (let ((files (read (current-buffer))) (p nil)) |
| 3725 | 793 (kill-buffer (current-buffer)) |
|
21266
af9641af8877
(PC-expand-many-files): Apply completion-ignored-extensions.
Karl Heuer <kwzh@gnu.org>
parents:
20709
diff
changeset
|
794 (or (equal completion-ignored-extensions PC-ignored-extensions) |
|
af9641af8877
(PC-expand-many-files): Apply completion-ignored-extensions.
Karl Heuer <kwzh@gnu.org>
parents:
20709
diff
changeset
|
795 (setq PC-ignored-regexp |
|
af9641af8877
(PC-expand-many-files): Apply completion-ignored-extensions.
Karl Heuer <kwzh@gnu.org>
parents:
20709
diff
changeset
|
796 (concat "\\(" |
|
af9641af8877
(PC-expand-many-files): Apply completion-ignored-extensions.
Karl Heuer <kwzh@gnu.org>
parents:
20709
diff
changeset
|
797 (mapconcat |
|
af9641af8877
(PC-expand-many-files): Apply completion-ignored-extensions.
Karl Heuer <kwzh@gnu.org>
parents:
20709
diff
changeset
|
798 'regexp-quote |
|
af9641af8877
(PC-expand-many-files): Apply completion-ignored-extensions.
Karl Heuer <kwzh@gnu.org>
parents:
20709
diff
changeset
|
799 (setq PC-ignored-extensions |
|
af9641af8877
(PC-expand-many-files): Apply completion-ignored-extensions.
Karl Heuer <kwzh@gnu.org>
parents:
20709
diff
changeset
|
800 completion-ignored-extensions) |
|
af9641af8877
(PC-expand-many-files): Apply completion-ignored-extensions.
Karl Heuer <kwzh@gnu.org>
parents:
20709
diff
changeset
|
801 "\\|") |
|
af9641af8877
(PC-expand-many-files): Apply completion-ignored-extensions.
Karl Heuer <kwzh@gnu.org>
parents:
20709
diff
changeset
|
802 "\\)\\'"))) |
|
af9641af8877
(PC-expand-many-files): Apply completion-ignored-extensions.
Karl Heuer <kwzh@gnu.org>
parents:
20709
diff
changeset
|
803 (setq p nil) |
|
af9641af8877
(PC-expand-many-files): Apply completion-ignored-extensions.
Karl Heuer <kwzh@gnu.org>
parents:
20709
diff
changeset
|
804 (while files |
|
69309
f0678aafb24e
(PC-expand-many-files): Try be more careful when parsing the shell's output.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
805 ;; This whole process of going through to shell, to echo, and |
|
f0678aafb24e
(PC-expand-many-files): Try be more careful when parsing the shell's output.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
806 ;; finally parsing the output is a hack. It breaks as soon as |
|
f0678aafb24e
(PC-expand-many-files): Try be more careful when parsing the shell's output.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
807 ;; there are spaces in the file names or when the no-match |
|
f0678aafb24e
(PC-expand-many-files): Try be more careful when parsing the shell's output.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
808 ;; message changes. To make up for it, we check that what we read |
|
f0678aafb24e
(PC-expand-many-files): Try be more careful when parsing the shell's output.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
809 ;; indeed exists, so we may miss some files, but we at least won't |
|
f0678aafb24e
(PC-expand-many-files): Try be more careful when parsing the shell's output.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
810 ;; list non-existent ones. |
|
f0678aafb24e
(PC-expand-many-files): Try be more careful when parsing the shell's output.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
811 (or (not (file-exists-p (car files))) |
|
f0678aafb24e
(PC-expand-many-files): Try be more careful when parsing the shell's output.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
812 (string-match PC-ignored-regexp (car files)) |
|
21266
af9641af8877
(PC-expand-many-files): Apply completion-ignored-extensions.
Karl Heuer <kwzh@gnu.org>
parents:
20709
diff
changeset
|
813 (setq p (cons (car files) p))) |
|
af9641af8877
(PC-expand-many-files): Apply completion-ignored-extensions.
Karl Heuer <kwzh@gnu.org>
parents:
20709
diff
changeset
|
814 (setq files (cdr files))) |
|
af9641af8877
(PC-expand-many-files): Apply completion-ignored-extensions.
Karl Heuer <kwzh@gnu.org>
parents:
20709
diff
changeset
|
815 p)))) |
| 3725 | 816 |
|
67161
759b69f39057
(PC-completion-as-file-name-predicate): Use minibuffer-completing-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67008
diff
changeset
|
817 ;; Facilities for loading C header files. This is independent from the |
|
759b69f39057
(PC-completion-as-file-name-predicate): Use minibuffer-completing-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67008
diff
changeset
|
818 ;; main completion code. See also the variable `PC-include-file-path' |
|
759b69f39057
(PC-completion-as-file-name-predicate): Use minibuffer-completing-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67008
diff
changeset
|
819 ;; at top of this file. |
| 3725 | 820 |
| 821 (defun PC-look-for-include-file () | |
| 822 (if (string-match "[\"<]\\([^\"<>]*\\)[\">]?$" (buffer-file-name)) | |
| 823 (let ((name (substring (buffer-file-name) | |
| 824 (match-beginning 1) (match-end 1))) | |
| 825 (punc (aref (buffer-file-name) (match-beginning 0))) | |
| 826 (path nil) | |
| 827 new-buf) | |
| 828 (kill-buffer (current-buffer)) | |
| 829 (if (equal name "") | |
|
67161
759b69f39057
(PC-completion-as-file-name-predicate): Use minibuffer-completing-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67008
diff
changeset
|
830 (with-current-buffer (car (buffer-list)) |
| 3725 | 831 (save-excursion |
| 832 (beginning-of-line) | |
| 833 (if (looking-at | |
| 834 "[ \t]*#[ \t]*include[ \t]+[<\"]\\(.+\\)[>\"][ \t]*[\n/]") | |
| 835 (setq name (buffer-substring (match-beginning 1) | |
| 836 (match-end 1)) | |
| 837 punc (char-after (1- (match-beginning 1)))) | |
| 838 ;; Suggested by Frank Siebenlist: | |
| 839 (if (or (looking-at | |
| 840 "[ \t]*([ \t]*load[ \t]+\"\\([^\"]+\\)\"") | |
| 841 (looking-at | |
| 842 "[ \t]*([ \t]*load-library[ \t]+\"\\([^\"]+\\)\"") | |
| 843 (looking-at | |
| 844 "[ \t]*([ \t]*require[ \t]+'\\([^\t )]+\\)[\t )]")) | |
| 845 (progn | |
| 846 (setq name (buffer-substring (match-beginning 1) | |
| 847 (match-end 1)) | |
| 848 punc ?\< | |
| 849 path load-path) | |
| 850 (if (string-match "\\.elc$" name) | |
| 851 (setq name (substring name 0 -1)) | |
| 852 (or (string-match "\\.el$" name) | |
| 853 (setq name (concat name ".el"))))) | |
| 854 (error "Not on an #include line")))))) | |
|
29088
6dce569d0615
(PC-look-for-include-file): Use :alnum: character class.
Dave Love <fx@gnu.org>
parents:
26508
diff
changeset
|
855 (or (string-match "\\.[[:alnum:]]+$" name) |
| 3725 | 856 (setq name (concat name ".h"))) |
| 857 (if (eq punc ?\<) | |
| 858 (let ((path (or path (PC-include-file-path)))) | |
| 859 (while (and path | |
| 860 (not (file-exists-p | |
| 861 (concat (file-name-as-directory (car path)) | |
| 862 name)))) | |
| 863 (setq path (cdr path))) | |
| 864 (if path | |
| 865 (setq name (concat (file-name-as-directory (car path)) name)) | |
| 866 (error "No such include file: <%s>" name))) | |
|
67161
759b69f39057
(PC-completion-as-file-name-predicate): Use minibuffer-completing-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67008
diff
changeset
|
867 (let ((dir (with-current-buffer (car (buffer-list)) |
| 3725 | 868 default-directory))) |
| 869 (if (file-exists-p (concat dir name)) | |
| 870 (setq name (concat dir name)) | |
|
24624
07ae57ea2a18
Delete the wildcard expansion feature
Karl Heuer <kwzh@gnu.org>
parents:
24534
diff
changeset
|
871 (error "No such include file: `%s'" name)))) |
| 3725 | 872 (setq new-buf (get-file-buffer name)) |
| 873 (if new-buf | |
| 874 ;; no need to verify last-modified time for this! | |
| 875 (set-buffer new-buf) | |
|
67161
759b69f39057
(PC-completion-as-file-name-predicate): Use minibuffer-completing-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67008
diff
changeset
|
876 (set-buffer (create-file-buffer name)) |
| 3725 | 877 (erase-buffer) |
| 878 (insert-file-contents name t)) | |
|
24624
07ae57ea2a18
Delete the wildcard expansion feature
Karl Heuer <kwzh@gnu.org>
parents:
24534
diff
changeset
|
879 ;; Returning non-nil with the new buffer current |
|
07ae57ea2a18
Delete the wildcard expansion feature
Karl Heuer <kwzh@gnu.org>
parents:
24534
diff
changeset
|
880 ;; is sufficient to tell find-file to use it. |
| 3725 | 881 t) |
| 882 nil)) | |
| 883 | |
| 884 (defun PC-include-file-path () | |
| 885 (or PC-include-file-path | |
| 886 (let ((env (getenv "INCPATH")) | |
| 887 (path nil) | |
| 888 pos) | |
| 889 (or env (error "No include file path specified")) | |
| 890 (while (setq pos (string-match ":[^:]+$" env)) | |
| 891 (setq path (cons (substring env (1+ pos)) path) | |
| 892 env (substring env 0 pos))) | |
| 893 path))) | |
| 894 | |
|
67161
759b69f39057
(PC-completion-as-file-name-predicate): Use minibuffer-completing-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67008
diff
changeset
|
895 ;; This is adapted from lib-complete.el, by Mike Williams. |
| 3725 | 896 (defun PC-include-file-all-completions (file search-path &optional full) |
| 897 "Return all completions for FILE in any directory on SEARCH-PATH. | |
|
48611
79a38ce36eb1
(PC-do-completion): Do not add wildcards to pattern unless filename is
Noah Friedman <friedman@splode.com>
parents:
48225
diff
changeset
|
898 If optional third argument FULL is non-nil, returned pathnames should be |
| 3725 | 899 absolute rather than relative to some directory on the SEARCH-PATH." |
| 900 (setq search-path | |
|
31971
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
901 (mapcar (lambda (dir) |
|
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
902 (if dir (file-name-as-directory dir) default-directory)) |
| 3725 | 903 search-path)) |
| 904 (if (file-name-absolute-p file) | |
| 905 ;; It's an absolute file name, so don't need search-path | |
| 906 (progn | |
| 907 (setq file (expand-file-name file)) | |
|
48611
79a38ce36eb1
(PC-do-completion): Do not add wildcards to pattern unless filename is
Noah Friedman <friedman@splode.com>
parents:
48225
diff
changeset
|
908 (file-name-all-completions |
| 3725 | 909 (file-name-nondirectory file) (file-name-directory file))) |
| 910 (let ((subdir (file-name-directory file)) | |
| 911 (ndfile (file-name-nondirectory file)) | |
| 912 file-lists) | |
| 913 ;; Append subdirectory part to each element of search-path | |
| 914 (if subdir | |
| 915 (setq search-path | |
|
31971
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
916 (mapcar (lambda (dir) (concat dir subdir)) |
| 3725 | 917 search-path) |
| 918 file )) | |
| 919 ;; Make list of completions in each directory on search-path | |
| 920 (while search-path | |
| 921 (let* ((dir (car search-path)) | |
| 922 (subdir (if full dir subdir))) | |
| 923 (if (file-directory-p dir) | |
| 924 (progn | |
| 925 (setq file-lists | |
|
48611
79a38ce36eb1
(PC-do-completion): Do not add wildcards to pattern unless filename is
Noah Friedman <friedman@splode.com>
parents:
48225
diff
changeset
|
926 (cons |
|
31971
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
927 (mapcar (lambda (file) (concat subdir file)) |
|
48611
79a38ce36eb1
(PC-do-completion): Do not add wildcards to pattern unless filename is
Noah Friedman <friedman@splode.com>
parents:
48225
diff
changeset
|
928 (file-name-all-completions ndfile |
| 3725 | 929 (car search-path))) |
| 930 file-lists)))) | |
| 931 (setq search-path (cdr search-path)))) | |
| 932 ;; Compress out duplicates while building complete list (slloooow!) | |
| 933 (let ((sorted (sort (apply 'nconc file-lists) | |
|
31971
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
934 (lambda (x y) (not (string-lessp x y))))) |
| 3725 | 935 compressed) |
| 936 (while sorted | |
| 937 (if (equal (car sorted) (car compressed)) nil | |
| 938 (setq compressed (cons (car sorted) compressed))) | |
| 939 (setq sorted (cdr sorted))) | |
| 940 compressed)))) | |
| 941 | |
|
70076
10e0b8ee9993
(partial-completion-mode): Use 'choose-completion-string-functions to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69309
diff
changeset
|
942 (defadvice read-file-name-internal (around PC-include-file disable) |
|
10e0b8ee9993
(partial-completion-mode): Use 'choose-completion-string-functions to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69309
diff
changeset
|
943 (if (string-match "<\\([^\"<>]*\\)>?\\'" (ad-get-arg 0)) |
|
10e0b8ee9993
(partial-completion-mode): Use 'choose-completion-string-functions to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69309
diff
changeset
|
944 (let* ((string (ad-get-arg 0)) |
|
10e0b8ee9993
(partial-completion-mode): Use 'choose-completion-string-functions to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69309
diff
changeset
|
945 (action (ad-get-arg 2)) |
|
10e0b8ee9993
(partial-completion-mode): Use 'choose-completion-string-functions to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69309
diff
changeset
|
946 (name (substring string (match-beginning 1) (match-end 1))) |
| 3725 | 947 (str2 (substring string (match-beginning 0))) |
| 948 (completion-table | |
|
70076
10e0b8ee9993
(partial-completion-mode): Use 'choose-completion-string-functions to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69309
diff
changeset
|
949 (mapcar (lambda (x) (format "<%s>" x)) |
| 3725 | 950 (PC-include-file-all-completions |
| 951 name (PC-include-file-path))))) | |
|
70076
10e0b8ee9993
(partial-completion-mode): Use 'choose-completion-string-functions to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69309
diff
changeset
|
952 (setq ad-return-value |
|
10e0b8ee9993
(partial-completion-mode): Use 'choose-completion-string-functions to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69309
diff
changeset
|
953 (cond |
|
10e0b8ee9993
(partial-completion-mode): Use 'choose-completion-string-functions to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69309
diff
changeset
|
954 ((not completion-table) nil) |
|
10e0b8ee9993
(partial-completion-mode): Use 'choose-completion-string-functions to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69309
diff
changeset
|
955 ((eq action 'lambda) (test-completion str2 completion-table nil)) |
|
10e0b8ee9993
(partial-completion-mode): Use 'choose-completion-string-functions to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69309
diff
changeset
|
956 ((eq action nil) (try-completion str2 completion-table nil)) |
|
10e0b8ee9993
(partial-completion-mode): Use 'choose-completion-string-functions to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69309
diff
changeset
|
957 ((eq action t) (all-completions str2 completion-table nil))))) |
|
10e0b8ee9993
(partial-completion-mode): Use 'choose-completion-string-functions to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69309
diff
changeset
|
958 ad-do-it)) |
|
18981
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
959 |
| 3725 | 960 |
| 961 (provide 'complete) | |
| 962 | |
|
61042
31060527396c
(PC-read-include-file-name-internal): Use test-completion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60920
diff
changeset
|
963 ;; arch-tag: fc7e2768-ff44-4e22-b579-4d825b968458 |
|
38436
b174db545cfd
Some fixes to follow coding conventions.
Pavel Jan?k <Pavel@Janik.cz>
parents:
36033
diff
changeset
|
964 ;;; complete.el ends here |
