Mercurial > emacs
annotate lisp/complete.el @ 79358:5bb58f3a8da8
*** empty log message ***
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Fri, 09 Nov 2007 16:59:24 +0000 |
parents | 9355f9b7bbff |
children | 73661ddc7ac7 b98604865ea0 |
rev | line source |
---|---|
15261 | 1 ;;; complete.el --- partial completion mechanism plus other goodies |
3725 | 2 |
74439 | 3 ;; Copyright (C) 1990, 1991, 1992, 1993, 1999, 2000, 2001, 2002, 2003, |
75347 | 4 ;; 2004, 2005, 2006, 2007 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 |
78236
9355f9b7bbff
Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents:
77211
diff
changeset
|
14 ;; the Free Software Foundation; either version 3, or (at your option) |
6736
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. |
76389
dea4a6c39682
(PC-bindings): Rebind M-TAB in read-expression-map.
Chong Yidong <cyd@stupidchicken.com>
parents:
76378
diff
changeset
|
150 (define-key read-expression-map "\e\t" 'lisp-complete-symbol) |
dea4a6c39682
(PC-bindings): Rebind M-TAB in read-expression-map.
Chong Yidong <cyd@stupidchicken.com>
parents:
76378
diff
changeset
|
151 |
18981
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 "\t" 'minibuffer-complete) |
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
153 (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
|
154 (define-key completion-map "?" 'minibuffer-completion-help) |
3725 | 155 |
18981
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 "\t" 'minibuffer-complete) |
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 " " 'minibuffer-complete-word) |
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 "\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
|
159 (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
|
160 (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
|
161 |
76378
7722d7feb5cc
(PC-bindings): Remap lisp-complete-symbol to
Kim F. Storm <storm@cua.dk>
parents:
76375
diff
changeset
|
162 (define-key global-map [remap lisp-complete-symbol] nil)) |
18981
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
163 (PC-default-bindings |
76389
dea4a6c39682
(PC-bindings): Rebind M-TAB in read-expression-map.
Chong Yidong <cyd@stupidchicken.com>
parents:
76378
diff
changeset
|
164 (define-key read-expression-map "\e\t" 'PC-lisp-complete-symbol) |
dea4a6c39682
(PC-bindings): Rebind M-TAB in read-expression-map.
Chong Yidong <cyd@stupidchicken.com>
parents:
76378
diff
changeset
|
165 |
18981
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 "\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 " " '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 "?" 'PC-completion-help) |
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
169 |
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\t" 'PC-complete) |
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
171 (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
|
172 (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
|
173 (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
|
174 (define-key completion-map "\e?" 'PC-completion-help) |
3725 | 175 |
18981
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 "\t" 'PC-complete) |
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
177 (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
|
178 (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
|
179 (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
|
180 (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
|
181 |
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\t" 'PC-complete) |
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
183 (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
|
184 (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
|
185 (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
|
186 (define-key must-match-map "\e?" 'PC-completion-help) |
3725 | 187 |
76378
7722d7feb5cc
(PC-bindings): Remap lisp-complete-symbol to
Kim F. Storm <storm@cua.dk>
parents:
76375
diff
changeset
|
188 (define-key global-map [remap lisp-complete-symbol] 'PC-lisp-complete-symbol))))) |
3725 | 189 |
76774
a98404fc2d91
(PC-do-completion-end): New variable.
Glenn Morris <rgm@gnu.org>
parents:
76756
diff
changeset
|
190 (defvar PC-do-completion-end nil |
a98404fc2d91
(PC-do-completion-end): New variable.
Glenn Morris <rgm@gnu.org>
parents:
76756
diff
changeset
|
191 "Internal variable used by `PC-do-completion'.") |
a98404fc2d91
(PC-do-completion-end): New variable.
Glenn Morris <rgm@gnu.org>
parents:
76756
diff
changeset
|
192 |
77211
43c40e825164
(PC-goto-end, PC-do-completion-end): Make buffer-local.
Glenn Morris <rgm@gnu.org>
parents:
77208
diff
changeset
|
193 (make-variable-buffer-local 'PC-do-completion-end) |
43c40e825164
(PC-goto-end, PC-do-completion-end): Make buffer-local.
Glenn Morris <rgm@gnu.org>
parents:
77208
diff
changeset
|
194 |
77208 | 195 (defvar PC-goto-end nil |
196 "Internal variable set in `PC-do-completion', used in | |
197 `choose-completion-string-functions'.") | |
198 | |
77211
43c40e825164
(PC-goto-end, PC-do-completion-end): Make buffer-local.
Glenn Morris <rgm@gnu.org>
parents:
77208
diff
changeset
|
199 (make-variable-buffer-local 'PC-goto-end) |
43c40e825164
(PC-goto-end, PC-do-completion-end): Make buffer-local.
Glenn Morris <rgm@gnu.org>
parents:
77208
diff
changeset
|
200 |
31971
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
201 ;;;###autoload |
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
202 (define-minor-mode partial-completion-mode |
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
203 "Toggle Partial Completion mode. |
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
204 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
|
205 |
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
206 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
|
207 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
|
208 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
|
209 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
|
210 |
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
211 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
|
212 command begins with that sequence of characters, and |
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
213 \\[find-file] f_b.c TAB might complete to foo_bar.c if that file existed and no |
71436
d51a5dc58935
(PC-do-completion): Retain capitalization of user input, when possible, even
Eli Zaretskii <eliz@gnu.org>
parents:
70840
diff
changeset
|
214 other file in that directory begins with that sequence of characters. |
31971
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
215 |
36033
0a150990aa8c
(partial-completion-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
33183
diff
changeset
|
216 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
|
217 specially in \\[find-file]. For example, |
36033
0a150990aa8c
(partial-completion-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
33183
diff
changeset
|
218 \\[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
|
219 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
|
220 |
13e3867c55fb
(partial-completion-mode): Mention completion-auto-help in the doc string.
Eli Zaretskii <eliz@gnu.org>
parents:
64762
diff
changeset
|
221 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
|
222 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
|
223 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
|
224 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
|
225 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
|
226 :global t :group 'partial-completion |
31971
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
227 ;; Deal with key bindings... |
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
228 (PC-bindings partial-completion-mode) |
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
229 ;; Deal with include file feature... |
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
230 (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
|
231 (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
|
232 ((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
|
233 (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
|
234 ;; ... 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
|
235 (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
|
236 (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
|
237 (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
|
238 ((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
|
239 (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
|
240 (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
|
241 ;; 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
|
242 ;; 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
|
243 ;; 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
|
244 ;; 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
|
245 ;; 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
|
246 ;; 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
|
247 ;; 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
|
248 ;; 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
|
249 (funcall |
10e0b8ee9993
(partial-completion-mode): Use 'choose-completion-string-functions to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69309
diff
changeset
|
250 (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
|
251 'choose-completion-string-functions |
71517
983727db2901
(partial-completion-mode): In lambda for
Juri Linkov <juri@jurta.org>
parents:
71436
diff
changeset
|
252 (lambda (choice buffer mini-p base-size) |
77208 | 253 ;; When completing M-: (lisp- ) with point before the ), it is |
254 ;; not appropriate to go to point-max (unlike the filename case). | |
255 (if (and (not PC-goto-end) | |
256 mini-p) | |
257 (goto-char (point-max)) | |
76774
a98404fc2d91
(PC-do-completion-end): New variable.
Glenn Morris <rgm@gnu.org>
parents:
76756
diff
changeset
|
258 ;; Need a similar hack for the non-minibuffer-case -- gm. |
76787
960eefe0c8c4
(partial-completion-mode): Set PC-do-completion-end to nil after use.
Glenn Morris <rgm@gnu.org>
parents:
76774
diff
changeset
|
259 (when PC-do-completion-end |
960eefe0c8c4
(partial-completion-mode): Set PC-do-completion-end to nil after use.
Glenn Morris <rgm@gnu.org>
parents:
76774
diff
changeset
|
260 (goto-char PC-do-completion-end) |
960eefe0c8c4
(partial-completion-mode): Set PC-do-completion-end to nil after use.
Glenn Morris <rgm@gnu.org>
parents:
76774
diff
changeset
|
261 (setq PC-do-completion-end nil))) |
77208 | 262 (setq PC-goto-end nil) |
71517
983727db2901
(partial-completion-mode): In lambda for
Juri Linkov <juri@jurta.org>
parents:
71436
diff
changeset
|
263 nil)) |
70076
10e0b8ee9993
(partial-completion-mode): Use 'choose-completion-string-functions to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69309
diff
changeset
|
264 ;; 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
|
265 (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
|
266 (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
|
267 (mapcar (lambda (string) |
10e0b8ee9993
(partial-completion-mode): Use 'choose-completion-string-functions to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69309
diff
changeset
|
268 (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
|
269 (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
|
270 (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
|
271 process-environment)))) |
31971
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
272 |
18981
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
273 |
3725 | 274 (defun PC-complete () |
275 "Like minibuffer-complete, but allows \"b--di\"-style abbreviations. | |
276 For example, \"M-x b--di\" would match `byte-recompile-directory', or any | |
277 name which consists of three or more words, the first beginning with \"b\" | |
278 and the third beginning with \"di\". | |
279 | |
280 The pattern \"b--d\" is ambiguous for `byte-recompile-directory' and | |
281 `beginning-of-defun', so this would produce a list of completions | |
282 just like when normal Emacs completions are ambiguous. | |
283 | |
284 Word-delimiters for the purposes of Partial Completion are \"-\", \"_\", | |
285 \".\", and SPC." | |
286 (interactive) | |
287 (if (PC-was-meta-key) | |
288 (minibuffer-complete) | |
15802
1595df9ed1e8
(PC-complete): When command is repeated,
Richard M. Stallman <rms@gnu.org>
parents:
15261
diff
changeset
|
289 ;; 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
|
290 ;; never scroll, always retry completion. |
1595df9ed1e8
(PC-complete): When command is repeated,
Richard M. Stallman <rms@gnu.org>
parents:
15261
diff
changeset
|
291 (or (eq last-command this-command) |
1595df9ed1e8
(PC-complete): When command is repeated,
Richard M. Stallman <rms@gnu.org>
parents:
15261
diff
changeset
|
292 (setq minibuffer-scroll-window nil)) |
1595df9ed1e8
(PC-complete): When command is repeated,
Richard M. Stallman <rms@gnu.org>
parents:
15261
diff
changeset
|
293 (let ((window minibuffer-scroll-window)) |
1595df9ed1e8
(PC-complete): When command is repeated,
Richard M. Stallman <rms@gnu.org>
parents:
15261
diff
changeset
|
294 ;; 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
|
295 ;; 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
|
296 (if (and window (window-buffer window) |
1595df9ed1e8
(PC-complete): When command is repeated,
Richard M. Stallman <rms@gnu.org>
parents:
15261
diff
changeset
|
297 (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
|
298 (with-current-buffer (window-buffer window) |
15802
1595df9ed1e8
(PC-complete): When command is repeated,
Richard M. Stallman <rms@gnu.org>
parents:
15261
diff
changeset
|
299 (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
|
300 (set-window-start window (point-min) nil) |
1595df9ed1e8
(PC-complete): When command is repeated,
Richard M. Stallman <rms@gnu.org>
parents:
15261
diff
changeset
|
301 (scroll-other-window))) |
1595df9ed1e8
(PC-complete): When command is repeated,
Richard M. Stallman <rms@gnu.org>
parents:
15261
diff
changeset
|
302 (PC-do-completion nil))))) |
3725 | 303 |
304 | |
305 (defun PC-complete-word () | |
306 "Like `minibuffer-complete-word', but allows \"b--di\"-style abbreviations. | |
307 See `PC-complete' for details. | |
308 This can be bound to other keys, like `-' and `.', if you wish." | |
309 (interactive) | |
310 (if (eq (PC-was-meta-key) PC-meta-flag) | |
311 (if (eq last-command-char ? ) | |
312 (minibuffer-complete-word) | |
313 (self-insert-command 1)) | |
314 (self-insert-command 1) | |
315 (if (eobp) | |
316 (PC-do-completion 'word)))) | |
317 | |
318 | |
319 (defun PC-complete-space () | |
320 "Like `minibuffer-complete-word', but allows \"b--di\"-style abbreviations. | |
321 See `PC-complete' for details. | |
322 This is suitable for binding to other keys which should act just like SPC." | |
323 (interactive) | |
324 (if (eq (PC-was-meta-key) PC-meta-flag) | |
325 (minibuffer-complete-word) | |
326 (insert " ") | |
327 (if (eobp) | |
328 (PC-do-completion 'word)))) | |
329 | |
330 | |
331 (defun PC-complete-and-exit () | |
332 "Like `minibuffer-complete-and-exit', 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-complete-and-exit) | |
337 (PC-do-complete-and-exit))) | |
338 | |
339 (defun PC-force-complete-and-exit () | |
340 "Like `minibuffer-complete-and-exit', but allows \"b--di\"-style abbreviations. | |
341 See `PC-complete' for details." | |
342 (interactive) | |
343 (let ((minibuffer-completion-confirm nil)) | |
344 (PC-do-complete-and-exit))) | |
345 | |
346 (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
|
347 (if (= (point-max) (minibuffer-prompt-end)) ; Duplicate the "bug" that Info-menu relies on... |
3725 | 348 (exit-minibuffer) |
349 (let ((flag (PC-do-completion 'exit))) | |
350 (and flag | |
351 (if (or (eq flag 'complete) | |
352 (not minibuffer-completion-confirm)) | |
353 (exit-minibuffer) | |
10164
d16e46a4e34c
(PC-do-completion): If complete but not unique,
Richard M. Stallman <rms@gnu.org>
parents:
8478
diff
changeset
|
354 (PC-temp-minibuffer-message " [Confirm]")))))) |
3725 | 355 |
356 | |
357 (defun PC-completion-help () | |
358 "Like `minibuffer-completion-help', but allows \"b--di\"-style abbreviations. | |
359 See `PC-complete' for details." | |
360 (interactive) | |
361 (if (eq (PC-was-meta-key) PC-meta-flag) | |
362 (minibuffer-completion-help) | |
363 (PC-do-completion 'help))) | |
364 | |
365 (defun PC-was-meta-key () | |
366 (or (/= (length (this-command-keys)) 1) | |
367 (let ((key (aref (this-command-keys) 0))) | |
368 (if (integerp key) | |
369 (>= key 128) | |
370 (not (null (memq 'meta (event-modifiers key)))))))) | |
371 | |
372 | |
373 (defvar PC-ignored-extensions 'empty-cache) | |
374 (defvar PC-delims 'empty-cache) | |
375 (defvar PC-ignored-regexp nil) | |
376 (defvar PC-word-failed-flag nil) | |
377 (defvar PC-delim-regex nil) | |
378 (defvar PC-ndelims-regex nil) | |
379 (defvar PC-delims-list nil) | |
380 | |
14765
844686eabff0
(PC-completion-as-file-name-predicate):
Richard M. Stallman <rms@gnu.org>
parents:
14759
diff
changeset
|
381 (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
|
382 (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
|
383 "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
|
384 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
|
385 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
|
386 |
71436
d51a5dc58935
(PC-do-completion): Retain capitalization of user input, when possible, even
Eli Zaretskii <eliz@gnu.org>
parents:
70840
diff
changeset
|
387 ;; Returns the sequence of non-delimiter characters that follow regexp in string. |
d51a5dc58935
(PC-do-completion): Retain capitalization of user input, when possible, even
Eli Zaretskii <eliz@gnu.org>
parents:
70840
diff
changeset
|
388 (defun PC-chunk-after (string regexp) |
d51a5dc58935
(PC-do-completion): Retain capitalization of user input, when possible, even
Eli Zaretskii <eliz@gnu.org>
parents:
70840
diff
changeset
|
389 (if (not (string-match regexp string)) |
d51a5dc58935
(PC-do-completion): Retain capitalization of user input, when possible, even
Eli Zaretskii <eliz@gnu.org>
parents:
70840
diff
changeset
|
390 (let ((message (format "String %s didn't match regexp %s" string regexp))) |
d51a5dc58935
(PC-do-completion): Retain capitalization of user input, when possible, even
Eli Zaretskii <eliz@gnu.org>
parents:
70840
diff
changeset
|
391 (message message) |
d51a5dc58935
(PC-do-completion): Retain capitalization of user input, when possible, even
Eli Zaretskii <eliz@gnu.org>
parents:
70840
diff
changeset
|
392 (error message))) |
d51a5dc58935
(PC-do-completion): Retain capitalization of user input, when possible, even
Eli Zaretskii <eliz@gnu.org>
parents:
70840
diff
changeset
|
393 (let ((result (substring string (match-end 0)))) |
d51a5dc58935
(PC-do-completion): Retain capitalization of user input, when possible, even
Eli Zaretskii <eliz@gnu.org>
parents:
70840
diff
changeset
|
394 ;; result may contain multiple chunks |
d51a5dc58935
(PC-do-completion): Retain capitalization of user input, when possible, even
Eli Zaretskii <eliz@gnu.org>
parents:
70840
diff
changeset
|
395 (if (string-match PC-delim-regex result) |
d51a5dc58935
(PC-do-completion): Retain capitalization of user input, when possible, even
Eli Zaretskii <eliz@gnu.org>
parents:
70840
diff
changeset
|
396 (setq result (substring result 0 (match-beginning 0)))) |
d51a5dc58935
(PC-do-completion): Retain capitalization of user input, when possible, even
Eli Zaretskii <eliz@gnu.org>
parents:
70840
diff
changeset
|
397 result)) |
d51a5dc58935
(PC-do-completion): Retain capitalization of user input, when possible, even
Eli Zaretskii <eliz@gnu.org>
parents:
70840
diff
changeset
|
398 |
d51a5dc58935
(PC-do-completion): Retain capitalization of user input, when possible, even
Eli Zaretskii <eliz@gnu.org>
parents:
70840
diff
changeset
|
399 (defun test-completion-ignore-case (str table pred) |
d51a5dc58935
(PC-do-completion): Retain capitalization of user input, when possible, even
Eli Zaretskii <eliz@gnu.org>
parents:
70840
diff
changeset
|
400 "Like `test-completion', but ignores case when possible." |
d51a5dc58935
(PC-do-completion): Retain capitalization of user input, when possible, even
Eli Zaretskii <eliz@gnu.org>
parents:
70840
diff
changeset
|
401 ;; Binding completion-ignore-case to nil ensures, for compatibility with |
d51a5dc58935
(PC-do-completion): Retain capitalization of user input, when possible, even
Eli Zaretskii <eliz@gnu.org>
parents:
70840
diff
changeset
|
402 ;; standard completion, that the return value is exactly one of the |
d51a5dc58935
(PC-do-completion): Retain capitalization of user input, when possible, even
Eli Zaretskii <eliz@gnu.org>
parents:
70840
diff
changeset
|
403 ;; possibilities. Do this binding only if pred is nil, out of paranoia; |
d51a5dc58935
(PC-do-completion): Retain capitalization of user input, when possible, even
Eli Zaretskii <eliz@gnu.org>
parents:
70840
diff
changeset
|
404 ;; perhaps it is safe even if pred is non-nil. |
d51a5dc58935
(PC-do-completion): Retain capitalization of user input, when possible, even
Eli Zaretskii <eliz@gnu.org>
parents:
70840
diff
changeset
|
405 (if pred |
d51a5dc58935
(PC-do-completion): Retain capitalization of user input, when possible, even
Eli Zaretskii <eliz@gnu.org>
parents:
70840
diff
changeset
|
406 (test-completion str table pred) |
d51a5dc58935
(PC-do-completion): Retain capitalization of user input, when possible, even
Eli Zaretskii <eliz@gnu.org>
parents:
70840
diff
changeset
|
407 (let ((completion-ignore-case nil)) |
d51a5dc58935
(PC-do-completion): Retain capitalization of user input, when possible, even
Eli Zaretskii <eliz@gnu.org>
parents:
70840
diff
changeset
|
408 (test-completion str table pred)))) |
d51a5dc58935
(PC-do-completion): Retain capitalization of user input, when possible, even
Eli Zaretskii <eliz@gnu.org>
parents:
70840
diff
changeset
|
409 |
76404
51826bf423f3
(PC-try-completion): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
76389
diff
changeset
|
410 ;; The following function is an attempt to work around two problems: |
51826bf423f3
(PC-try-completion): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
76389
diff
changeset
|
411 |
51826bf423f3
(PC-try-completion): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
76389
diff
changeset
|
412 ;; (1) When complete.el was written, (try-completion "" '(("") (""))) used to |
51826bf423f3
(PC-try-completion): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
76389
diff
changeset
|
413 ;; return the value "". With a change from 2002-07-07 it returns t which caused |
51826bf423f3
(PC-try-completion): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
76389
diff
changeset
|
414 ;; `PC-lisp-complete-symbol' to fail with a "Wrong type argument: sequencep, t" |
51826bf423f3
(PC-try-completion): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
76389
diff
changeset
|
415 ;; error. `PC-try-completion' returns STRING in this case. |
51826bf423f3
(PC-try-completion): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
76389
diff
changeset
|
416 |
51826bf423f3
(PC-try-completion): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
76389
diff
changeset
|
417 ;; (2) (try-completion "" '((""))) returned t before the above-mentioned change. |
51826bf423f3
(PC-try-completion): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
76389
diff
changeset
|
418 ;; Since `PC-chop-word' operates on the return value of `try-completion' this |
51826bf423f3
(PC-try-completion): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
76389
diff
changeset
|
419 ;; case might have provoked a similar error as in (1). `PC-try-completion' |
51826bf423f3
(PC-try-completion): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
76389
diff
changeset
|
420 ;; returns "" instead. I don't know whether this is a real problem though. |
51826bf423f3
(PC-try-completion): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
76389
diff
changeset
|
421 |
51826bf423f3
(PC-try-completion): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
76389
diff
changeset
|
422 ;; Since `PC-try-completion' is not a guaranteed to fix these bugs reliably, you |
51826bf423f3
(PC-try-completion): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
76389
diff
changeset
|
423 ;; should try to look at the following discussions when you encounter problems: |
51826bf423f3
(PC-try-completion): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
76389
diff
changeset
|
424 ;; - emacs-pretest-bug ("Partial Completion" starting 2007-02-23), |
51826bf423f3
(PC-try-completion): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
76389
diff
changeset
|
425 ;; - emacs-devel ("[address-of-OP: Partial completion]" starting 2007-02-24), |
51826bf423f3
(PC-try-completion): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
76389
diff
changeset
|
426 ;; - emacs-devel ("[address-of-OP: EVAL and mouse selection in *Completions*]" |
51826bf423f3
(PC-try-completion): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
76389
diff
changeset
|
427 ;; starting 2007-03-05). |
51826bf423f3
(PC-try-completion): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
76389
diff
changeset
|
428 (defun PC-try-completion (string alist &optional predicate) |
51826bf423f3
(PC-try-completion): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
76389
diff
changeset
|
429 "Like `try-completion' but return STRING instead of t." |
51826bf423f3
(PC-try-completion): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
76389
diff
changeset
|
430 (let ((result (try-completion string alist predicate))) |
51826bf423f3
(PC-try-completion): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
76389
diff
changeset
|
431 (if (eq result t) string result))) |
51826bf423f3
(PC-try-completion): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
76389
diff
changeset
|
432 |
77208 | 433 ;; TODO document MODE magic... |
434 (defun PC-do-completion (&optional mode beg end goto-end) | |
435 "Internal function to do the work of partial completion. | |
436 Text to be completed lies between BEG and END. Normally when | |
437 replacing text in the minibuffer, this function replaces up to | |
438 point-max (as is appropriate for completing a file name). If | |
439 GOTO-END is non-nil, however, it instead replaces up to END." | |
26341
6063383b77d5
(PC-do-completion): Use minibuffer-prompt-end to
Gerd Moellmann <gerd@gnu.org>
parents:
25207
diff
changeset
|
440 (or beg (setq beg (minibuffer-prompt-end))) |
3725 | 441 (or end (setq end (point-max))) |
442 (let* ((table minibuffer-completion-table) | |
443 (pred minibuffer-completion-predicate) | |
14765
844686eabff0
(PC-completion-as-file-name-predicate):
Richard M. Stallman <rms@gnu.org>
parents:
14759
diff
changeset
|
444 (filename (funcall PC-completion-as-file-name-predicate)) |
76756
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
445 (dirname nil) ; non-nil only if a filename is being completed |
76439
2a096eef08d4
(PC-do-completion): Bind dirlength to nil to avoid
Martin Rudalics <rudalics@gmx.at>
parents:
76406
diff
changeset
|
446 ;; The following used to be "(dirlength 0)" which caused the erasure of |
2a096eef08d4
(PC-do-completion): Bind dirlength to nil to avoid
Martin Rudalics <rudalics@gmx.at>
parents:
76406
diff
changeset
|
447 ;; the entire buffer text before `point' when inserting a completion |
2a096eef08d4
(PC-do-completion): Bind dirlength to nil to avoid
Martin Rudalics <rudalics@gmx.at>
parents:
76406
diff
changeset
|
448 ;; into a buffer. |
2a096eef08d4
(PC-do-completion): Bind dirlength to nil to avoid
Martin Rudalics <rudalics@gmx.at>
parents:
76406
diff
changeset
|
449 dirlength |
3725 | 450 (str (buffer-substring beg end)) |
451 (incname (and filename (string-match "<\\([^\"<>]*\\)>?$" str))) | |
452 (ambig nil) | |
70840
b599bb78c1fc
(PC-do-completion): Undo the addition of implicit
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70076
diff
changeset
|
453 basestr origstr |
29674
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
454 env-on |
3725 | 455 regex |
456 p offset | |
457 (poss nil) | |
458 helpposs | |
459 (case-fold-search completion-ignore-case)) | |
460 | |
461 ;; Check if buffer contents can already be considered complete | |
462 (if (and (eq mode 'exit) | |
76336
d24bffa1374c
(PC-do-completion): If completion-ignore-case is non-nil, replace
Chong Yidong <cyd@stupidchicken.com>
parents:
75347
diff
changeset
|
463 (test-completion str table pred)) |
d24bffa1374c
(PC-do-completion): If completion-ignore-case is non-nil, replace
Chong Yidong <cyd@stupidchicken.com>
parents:
75347
diff
changeset
|
464 (progn |
d24bffa1374c
(PC-do-completion): If completion-ignore-case is non-nil, replace
Chong Yidong <cyd@stupidchicken.com>
parents:
75347
diff
changeset
|
465 ;; If completion-ignore-case is non-nil, insert the |
d24bffa1374c
(PC-do-completion): If completion-ignore-case is non-nil, replace
Chong Yidong <cyd@stupidchicken.com>
parents:
75347
diff
changeset
|
466 ;; completion string since that may have a different case. |
d24bffa1374c
(PC-do-completion): If completion-ignore-case is non-nil, replace
Chong Yidong <cyd@stupidchicken.com>
parents:
75347
diff
changeset
|
467 (when completion-ignore-case |
76406
101916c7faf3
(PC-do-completion): Replace first call to try-completion with new
Glenn Morris <rgm@gnu.org>
parents:
76404
diff
changeset
|
468 (setq str (PC-try-completion str table pred)) |
76336
d24bffa1374c
(PC-do-completion): If completion-ignore-case is non-nil, replace
Chong Yidong <cyd@stupidchicken.com>
parents:
75347
diff
changeset
|
469 (delete-region beg end) |
d24bffa1374c
(PC-do-completion): If completion-ignore-case is non-nil, replace
Chong Yidong <cyd@stupidchicken.com>
parents:
75347
diff
changeset
|
470 (insert str)) |
d24bffa1374c
(PC-do-completion): If completion-ignore-case is non-nil, replace
Chong Yidong <cyd@stupidchicken.com>
parents:
75347
diff
changeset
|
471 'complete) |
3725 | 472 |
473 ;; Do substitutions in directory names | |
474 (and filename | |
29674
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
475 (setq basestr (or (file-name-directory str) "")) |
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
476 (setq dirlength (length basestr)) |
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
477 ;; Do substitutions in directory names |
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
478 (setq p (substitute-in-file-name basestr)) |
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
479 (not (string-equal basestr p)) |
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
480 (setq str (concat p (file-name-nondirectory str))) |
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
481 (progn |
3725 | 482 (delete-region beg end) |
29674
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
483 (insert str) |
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
484 (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
|
485 |
3725 | 486 ;; Prepare various delimiter strings |
487 (or (equal PC-word-delimiters PC-delims) | |
488 (setq PC-delims PC-word-delimiters | |
489 PC-delim-regex (concat "[" PC-delims "]") | |
490 PC-ndelims-regex (concat "[^" PC-delims "]*") | |
491 PC-delims-list (append PC-delims nil))) | |
492 | |
48225
75ced2cd606e
(PC-do-completion): Make partial-completion work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
493 ;; 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
|
494 (and filename |
79a38ce36eb1
(PC-do-completion): Do not add wildcards to pattern unless filename is
Noah Friedman <friedman@splode.com>
parents:
48225
diff
changeset
|
495 (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
|
496 (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
|
497 ;; 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
|
498 (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
|
499 (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
|
500 (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
|
501 (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
|
502 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
|
503 (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
|
504 "*/" file)) |
79a38ce36eb1
(PC-do-completion): Do not add wildcards to pattern unless filename is
Noah Friedman <friedman@splode.com>
parents:
48225
diff
changeset
|
505 (setq dir (file-name-directory dir))) |
70840
b599bb78c1fc
(PC-do-completion): Undo the addition of implicit
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70076
diff
changeset
|
506 (setq origstr str str (concat dir file)))) |
48611
79a38ce36eb1
(PC-do-completion): Do not add wildcards to pattern unless filename is
Noah Friedman <friedman@splode.com>
parents:
48225
diff
changeset
|
507 |
3725 | 508 ;; Look for wildcard expansions in directory name |
509 (and filename | |
510 (string-match "\\*.*/" str) | |
511 (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
|
512 ;; 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
|
513 (default-directory (expand-file-name pred)) |
3725 | 514 files) |
515 (setq p (1+ (string-match "/[^/]*\\'" pat))) | |
516 (while (setq p (string-match PC-delim-regex pat p)) | |
517 (setq pat (concat (substring pat 0 p) | |
518 "*" | |
519 (substring pat p)) | |
520 p (+ p 2))) | |
521 (setq files (PC-expand-many-files (concat pat "*"))) | |
522 (if files | |
523 (let ((dir (file-name-directory (car files))) | |
524 (p files)) | |
525 (while (and (setq p (cdr p)) | |
526 (equal dir (file-name-directory (car p))))) | |
527 (if p | |
528 (setq filename nil table nil pred nil | |
529 ambig t) | |
530 (delete-region beg end) | |
531 (setq str (concat dir (file-name-nondirectory str))) | |
532 (insert str) | |
533 (setq end (+ beg (length str))))) | |
70840
b599bb78c1fc
(PC-do-completion): Undo the addition of implicit
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70076
diff
changeset
|
534 (if origstr |
b599bb78c1fc
(PC-do-completion): Undo the addition of implicit
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70076
diff
changeset
|
535 ;; If the wildcards were introduced by us, it's possible |
b599bb78c1fc
(PC-do-completion): Undo the addition of implicit
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70076
diff
changeset
|
536 ;; that read-file-name-internal (especially our |
b599bb78c1fc
(PC-do-completion): Undo the addition of implicit
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70076
diff
changeset
|
537 ;; PC-include-file advice) can still find matches for the |
b599bb78c1fc
(PC-do-completion): Undo the addition of implicit
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70076
diff
changeset
|
538 ;; original string even if we couldn't, so remove the |
b599bb78c1fc
(PC-do-completion): Undo the addition of implicit
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70076
diff
changeset
|
539 ;; added wildcards. |
b599bb78c1fc
(PC-do-completion): Undo the addition of implicit
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70076
diff
changeset
|
540 (setq str origstr) |
b599bb78c1fc
(PC-do-completion): Undo the addition of implicit
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70076
diff
changeset
|
541 (setq filename nil table nil pred nil))))) |
3725 | 542 |
543 ;; Strip directory name if appropriate | |
544 (if filename | |
545 (if incname | |
546 (setq basestr (substring str incname) | |
547 dirname (substring str 0 incname)) | |
548 (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
|
549 dirname (file-name-directory str)) |
e62d2121822f
(PC-do-completion): If completing on file name,
Eli Zaretskii <eliz@gnu.org>
parents:
24624
diff
changeset
|
550 ;; 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
|
551 ;; 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
|
552 ;; 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
|
553 (setq str (concat dirname basestr))) |
3725 | 554 (setq basestr str)) |
555 | |
556 ;; Convert search pattern to a standard regular expression | |
557 (setq regex (regexp-quote basestr) | |
558 offset (if (and (> (length regex) 0) | |
559 (not (eq (aref basestr 0) ?\*)) | |
560 (or (eq PC-first-char t) | |
561 (and PC-first-char filename))) 1 0) | |
562 p offset) | |
563 (while (setq p (string-match PC-delim-regex regex p)) | |
564 (if (eq (aref regex p) ? ) | |
565 (setq regex (concat (substring regex 0 p) | |
566 PC-ndelims-regex | |
567 PC-delim-regex | |
568 (substring regex (1+ p))) | |
569 p (+ p (length PC-ndelims-regex) (length PC-delim-regex))) | |
570 (let ((bump (if (memq (aref regex p) | |
571 '(?$ ?^ ?\. ?* ?+ ?? ?[ ?] ?\\)) | |
572 -1 0))) | |
573 (setq regex (concat (substring regex 0 (+ p bump)) | |
574 PC-ndelims-regex | |
575 (substring regex (+ p bump))) | |
576 p (+ p (length PC-ndelims-regex) 1))))) | |
577 (setq p 0) | |
578 (if filename | |
579 (while (setq p (string-match "\\\\\\*" regex p)) | |
580 (setq regex (concat (substring regex 0 p) | |
581 "[^/]*" | |
582 (substring regex (+ p 2)))))) | |
583 ;;(setq the-regex regex) | |
584 (setq regex (concat "\\`" regex)) | |
585 | |
29674
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
586 (and (> (length basestr) 0) |
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
587 (= (aref basestr 0) ?$) |
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
588 (setq env-on t |
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
589 table PC-env-vars-alist |
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
590 pred nil)) |
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
591 |
3725 | 592 ;; Find an initial list of possible completions |
593 (if (not (setq p (string-match (concat PC-delim-regex | |
594 (if filename "\\|\\*" "")) | |
595 str | |
596 (+ (length dirname) offset)))) | |
597 | |
598 ;; Minibuffer contains no hyphens -- simple case! | |
29674
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
599 (setq poss (all-completions (if env-on |
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
600 basestr str) |
3725 | 601 table |
602 pred)) | |
603 | |
604 ;; Use all-completions to do an initial cull. This is a big win, | |
605 ;; since all-completions is written in C! | |
29674
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
606 (let ((compl (all-completions (if env-on |
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
607 (file-name-nondirectory (substring str 0 p)) |
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
608 (substring str 0 p)) |
72310
e45c648eb3ad
(PC-do-completion): Strip out completion-ignored-extensions
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72243
diff
changeset
|
609 table |
e45c648eb3ad
(PC-do-completion): Strip out completion-ignored-extensions
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72243
diff
changeset
|
610 pred))) |
3725 | 611 (setq p compl) |
612 (while p | |
613 (and (string-match regex (car p)) | |
16608
e2858bcbed43
(PC-do-completion): Remove text properties from
Karl Heuer <kwzh@gnu.org>
parents:
15802
diff
changeset
|
614 (progn |
e2858bcbed43
(PC-do-completion): Remove text properties from
Karl Heuer <kwzh@gnu.org>
parents:
15802
diff
changeset
|
615 (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
|
616 (setq poss (cons (car p) poss)))) |
3725 | 617 (setq p (cdr p))))) |
618 | |
76375
3183de2acda4
(PC-do-completion): Delete duplicates in the list of possible completions.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents:
76336
diff
changeset
|
619 ;; If table had duplicates, they can be here. |
3183de2acda4
(PC-do-completion): Delete duplicates in the list of possible completions.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents:
76336
diff
changeset
|
620 (delete-dups poss) |
3183de2acda4
(PC-do-completion): Delete duplicates in the list of possible completions.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents:
76336
diff
changeset
|
621 |
72310
e45c648eb3ad
(PC-do-completion): Strip out completion-ignored-extensions
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72243
diff
changeset
|
622 ;; Handle completion-ignored-extensions |
e45c648eb3ad
(PC-do-completion): Strip out completion-ignored-extensions
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72243
diff
changeset
|
623 (and filename |
e45c648eb3ad
(PC-do-completion): Strip out completion-ignored-extensions
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72243
diff
changeset
|
624 (not (eq mode 'help)) |
e45c648eb3ad
(PC-do-completion): Strip out completion-ignored-extensions
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72243
diff
changeset
|
625 (let ((p2 poss)) |
e45c648eb3ad
(PC-do-completion): Strip out completion-ignored-extensions
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72243
diff
changeset
|
626 |
e45c648eb3ad
(PC-do-completion): Strip out completion-ignored-extensions
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72243
diff
changeset
|
627 ;; Build a regular expression representing the extensions list |
e45c648eb3ad
(PC-do-completion): Strip out completion-ignored-extensions
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72243
diff
changeset
|
628 (or (equal completion-ignored-extensions PC-ignored-extensions) |
e45c648eb3ad
(PC-do-completion): Strip out completion-ignored-extensions
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72243
diff
changeset
|
629 (setq PC-ignored-regexp |
e45c648eb3ad
(PC-do-completion): Strip out completion-ignored-extensions
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72243
diff
changeset
|
630 (concat "\\(" |
e45c648eb3ad
(PC-do-completion): Strip out completion-ignored-extensions
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72243
diff
changeset
|
631 (mapconcat |
e45c648eb3ad
(PC-do-completion): Strip out completion-ignored-extensions
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72243
diff
changeset
|
632 'regexp-quote |
e45c648eb3ad
(PC-do-completion): Strip out completion-ignored-extensions
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72243
diff
changeset
|
633 (setq PC-ignored-extensions |
e45c648eb3ad
(PC-do-completion): Strip out completion-ignored-extensions
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72243
diff
changeset
|
634 completion-ignored-extensions) |
e45c648eb3ad
(PC-do-completion): Strip out completion-ignored-extensions
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72243
diff
changeset
|
635 "\\|") |
e45c648eb3ad
(PC-do-completion): Strip out completion-ignored-extensions
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72243
diff
changeset
|
636 "\\)\\'"))) |
e45c648eb3ad
(PC-do-completion): Strip out completion-ignored-extensions
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72243
diff
changeset
|
637 |
e45c648eb3ad
(PC-do-completion): Strip out completion-ignored-extensions
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72243
diff
changeset
|
638 ;; Check if there are any without an ignored extension. |
e45c648eb3ad
(PC-do-completion): Strip out completion-ignored-extensions
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72243
diff
changeset
|
639 ;; Also ignore `.' and `..'. |
e45c648eb3ad
(PC-do-completion): Strip out completion-ignored-extensions
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72243
diff
changeset
|
640 (setq p nil) |
e45c648eb3ad
(PC-do-completion): Strip out completion-ignored-extensions
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72243
diff
changeset
|
641 (while p2 |
e45c648eb3ad
(PC-do-completion): Strip out completion-ignored-extensions
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72243
diff
changeset
|
642 (or (string-match PC-ignored-regexp (car p2)) |
e45c648eb3ad
(PC-do-completion): Strip out completion-ignored-extensions
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72243
diff
changeset
|
643 (string-match "\\(\\`\\|/\\)[.][.]?/?\\'" (car p2)) |
e45c648eb3ad
(PC-do-completion): Strip out completion-ignored-extensions
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72243
diff
changeset
|
644 (setq p (cons (car p2) p))) |
e45c648eb3ad
(PC-do-completion): Strip out completion-ignored-extensions
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72243
diff
changeset
|
645 (setq p2 (cdr p2))) |
e45c648eb3ad
(PC-do-completion): Strip out completion-ignored-extensions
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72243
diff
changeset
|
646 |
e45c648eb3ad
(PC-do-completion): Strip out completion-ignored-extensions
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72243
diff
changeset
|
647 ;; If there are "good" names, use them |
e45c648eb3ad
(PC-do-completion): Strip out completion-ignored-extensions
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72243
diff
changeset
|
648 (and p (setq poss p)))) |
e45c648eb3ad
(PC-do-completion): Strip out completion-ignored-extensions
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72243
diff
changeset
|
649 |
3725 | 650 ;; Now we have a list of possible completions |
651 (cond | |
652 | |
653 ;; No valid completions found | |
654 ((null poss) | |
655 (if (and (eq mode 'word) | |
656 (not PC-word-failed-flag)) | |
657 (let ((PC-word-failed-flag t)) | |
658 (delete-backward-char 1) | |
659 (PC-do-completion 'word)) | |
660 (beep) | |
661 (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
|
662 " [Ambiguous dir name]" |
3725 | 663 (if (eq mode 'help) |
10164
d16e46a4e34c
(PC-do-completion): If complete but not unique,
Richard M. Stallman <rms@gnu.org>
parents:
8478
diff
changeset
|
664 " [No completions]" |
d16e46a4e34c
(PC-do-completion): If complete but not unique,
Richard M. Stallman <rms@gnu.org>
parents:
8478
diff
changeset
|
665 " [No match]"))) |
3725 | 666 nil)) |
667 | |
668 ;; More than one valid completion found | |
669 ((or (cdr (setq helpposs poss)) | |
670 (memq mode '(help word))) | |
671 | |
672 ;; Is the actual string one of the possible completions? | |
673 (setq p (and (not (eq mode 'help)) poss)) | |
674 (while (and p | |
16608
e2858bcbed43
(PC-do-completion): Remove text properties from
Karl Heuer <kwzh@gnu.org>
parents:
15802
diff
changeset
|
675 (not (string-equal (car p) basestr))) |
3725 | 676 (setq p (cdr p))) |
10164
d16e46a4e34c
(PC-do-completion): If complete but not unique,
Richard M. Stallman <rms@gnu.org>
parents:
8478
diff
changeset
|
677 (and p (null mode) |
d16e46a4e34c
(PC-do-completion): If complete but not unique,
Richard M. Stallman <rms@gnu.org>
parents:
8478
diff
changeset
|
678 (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
|
679 (if (and p |
d16e46a4e34c
(PC-do-completion): If complete but not unique,
Richard M. Stallman <rms@gnu.org>
parents:
8478
diff
changeset
|
680 (not (and (null mode) |
d16e46a4e34c
(PC-do-completion): If complete but not unique,
Richard M. Stallman <rms@gnu.org>
parents:
8478
diff
changeset
|
681 (eq this-command last-command)))) |
d16e46a4e34c
(PC-do-completion): If complete but not unique,
Richard M. Stallman <rms@gnu.org>
parents:
8478
diff
changeset
|
682 t |
3725 | 683 |
684 ;; If ambiguous, try for a partial completion | |
685 (let ((improved nil) | |
686 prefix | |
687 (pt nil) | |
688 (skip "\\`")) | |
689 | |
690 ;; Check if next few letters are the same in all cases | |
691 (if (and (not (eq mode 'help)) | |
76404
51826bf423f3
(PC-try-completion): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
76389
diff
changeset
|
692 (setq prefix (PC-try-completion |
51826bf423f3
(PC-try-completion): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
76389
diff
changeset
|
693 (PC-chunk-after basestr skip) poss))) |
3725 | 694 (let ((first t) i) |
71436
d51a5dc58935
(PC-do-completion): Retain capitalization of user input, when possible, even
Eli Zaretskii <eliz@gnu.org>
parents:
70840
diff
changeset
|
695 ;; Retain capitalization of user input even if |
d51a5dc58935
(PC-do-completion): Retain capitalization of user input, when possible, even
Eli Zaretskii <eliz@gnu.org>
parents:
70840
diff
changeset
|
696 ;; completion-ignore-case is set. |
3725 | 697 (if (eq mode 'word) |
698 (setq prefix (PC-chop-word prefix basestr))) | |
699 (goto-char (+ beg (length dirname))) | |
700 (while (and (progn | |
71436
d51a5dc58935
(PC-do-completion): Retain capitalization of user input, when possible, even
Eli Zaretskii <eliz@gnu.org>
parents:
70840
diff
changeset
|
701 (setq i 0) ; index into prefix string |
3725 | 702 (while (< i (length prefix)) |
703 (if (and (< (point) end) | |
71436
d51a5dc58935
(PC-do-completion): Retain capitalization of user input, when possible, even
Eli Zaretskii <eliz@gnu.org>
parents:
70840
diff
changeset
|
704 (eq (downcase (aref prefix i)) |
d51a5dc58935
(PC-do-completion): Retain capitalization of user input, when possible, even
Eli Zaretskii <eliz@gnu.org>
parents:
70840
diff
changeset
|
705 (downcase (following-char)))) |
d51a5dc58935
(PC-do-completion): Retain capitalization of user input, when possible, even
Eli Zaretskii <eliz@gnu.org>
parents:
70840
diff
changeset
|
706 ;; same char (modulo case); no action |
3725 | 707 (forward-char 1) |
708 (if (and (< (point) end) | |
71436
d51a5dc58935
(PC-do-completion): Retain capitalization of user input, when possible, even
Eli Zaretskii <eliz@gnu.org>
parents:
70840
diff
changeset
|
709 (and (looking-at " ") |
76756
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
710 (memq (aref prefix i) |
71436
d51a5dc58935
(PC-do-completion): Retain capitalization of user input, when possible, even
Eli Zaretskii <eliz@gnu.org>
parents:
70840
diff
changeset
|
711 PC-delims-list))) |
d51a5dc58935
(PC-do-completion): Retain capitalization of user input, when possible, even
Eli Zaretskii <eliz@gnu.org>
parents:
70840
diff
changeset
|
712 ;; replace " " by the actual delimiter |
3725 | 713 (progn |
714 (delete-char 1) | |
71436
d51a5dc58935
(PC-do-completion): Retain capitalization of user input, when possible, even
Eli Zaretskii <eliz@gnu.org>
parents:
70840
diff
changeset
|
715 (insert (substring prefix i (1+ i)))) |
d51a5dc58935
(PC-do-completion): Retain capitalization of user input, when possible, even
Eli Zaretskii <eliz@gnu.org>
parents:
70840
diff
changeset
|
716 ;; insert a new character |
d51a5dc58935
(PC-do-completion): Retain capitalization of user input, when possible, even
Eli Zaretskii <eliz@gnu.org>
parents:
70840
diff
changeset
|
717 (progn |
76756
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
718 (and filename (looking-at "\\*") |
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
719 (progn |
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
720 (delete-char 1) |
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
721 (setq end (1- end)))) |
71436
d51a5dc58935
(PC-do-completion): Retain capitalization of user input, when possible, even
Eli Zaretskii <eliz@gnu.org>
parents:
70840
diff
changeset
|
722 (setq improved t) |
76756
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
723 (insert (substring prefix i (1+ i))) |
71436
d51a5dc58935
(PC-do-completion): Retain capitalization of user input, when possible, even
Eli Zaretskii <eliz@gnu.org>
parents:
70840
diff
changeset
|
724 (setq end (1+ end))))) |
3725 | 725 (setq i (1+ i))) |
67622
bd00b5fc4e4d
(PC-do-completion): Remove `(equal (point) beg)' to
Juri Linkov <juri@jurta.org>
parents:
67596
diff
changeset
|
726 (or pt (setq pt (point))) |
3725 | 727 (looking-at PC-delim-regex)) |
728 (setq skip (concat skip | |
729 (regexp-quote prefix) | |
730 PC-ndelims-regex) | |
76404
51826bf423f3
(PC-try-completion): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
76389
diff
changeset
|
731 prefix (PC-try-completion |
71436
d51a5dc58935
(PC-do-completion): Retain capitalization of user input, when possible, even
Eli Zaretskii <eliz@gnu.org>
parents:
70840
diff
changeset
|
732 (PC-chunk-after |
d51a5dc58935
(PC-do-completion): Retain capitalization of user input, when possible, even
Eli Zaretskii <eliz@gnu.org>
parents:
70840
diff
changeset
|
733 ;; not basestr, because that does |
d51a5dc58935
(PC-do-completion): Retain capitalization of user input, when possible, even
Eli Zaretskii <eliz@gnu.org>
parents:
70840
diff
changeset
|
734 ;; not reflect insertions |
d51a5dc58935
(PC-do-completion): Retain capitalization of user input, when possible, even
Eli Zaretskii <eliz@gnu.org>
parents:
70840
diff
changeset
|
735 (buffer-substring |
d51a5dc58935
(PC-do-completion): Retain capitalization of user input, when possible, even
Eli Zaretskii <eliz@gnu.org>
parents:
70840
diff
changeset
|
736 (+ beg (length dirname)) end) |
d51a5dc58935
(PC-do-completion): Retain capitalization of user input, when possible, even
Eli Zaretskii <eliz@gnu.org>
parents:
70840
diff
changeset
|
737 skip) |
3725 | 738 (mapcar |
72310
e45c648eb3ad
(PC-do-completion): Strip out completion-ignored-extensions
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72243
diff
changeset
|
739 (lambda (x) |
e45c648eb3ad
(PC-do-completion): Strip out completion-ignored-extensions
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72243
diff
changeset
|
740 (when (string-match skip x) |
e45c648eb3ad
(PC-do-completion): Strip out completion-ignored-extensions
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72243
diff
changeset
|
741 (substring x (match-end 0)))) |
3725 | 742 poss))) |
743 (or (> i 0) (> (length prefix) 0)) | |
744 (or (not (eq mode 'word)) | |
745 (and first (> (length prefix) 0) | |
746 (setq first nil | |
747 prefix (substring prefix 0 1)))))) | |
748 (goto-char (if (eq mode 'word) end | |
749 (or pt beg))))) | |
750 | |
751 (if (and (eq mode 'word) | |
752 (not PC-word-failed-flag)) | |
753 | |
754 (if improved | |
755 | |
756 ;; 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
|
757 (if (test-completion (buffer-substring 1 (1- end)) |
76756
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
758 table pred) |
3725 | 759 (delete-region (1- end) end))) |
760 | |
761 (if improved | |
762 | |
763 ;; We changed it... enough to be complete? | |
764 (and (eq mode 'exit) | |
71436
d51a5dc58935
(PC-do-completion): Retain capitalization of user input, when possible, even
Eli Zaretskii <eliz@gnu.org>
parents:
70840
diff
changeset
|
765 (test-completion-ignore-case (field-string) table pred)) |
3725 | 766 |
767 ;; 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
|
768 (if (or (eq completion-auto-help t) |
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
769 (and completion-auto-help |
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
770 (eq last-command this-command)) |
3725 | 771 (eq mode 'help)) |
76756
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
772 (let ((prompt-end (minibuffer-prompt-end))) |
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
773 (with-output-to-temp-buffer "*Completions*" |
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
774 (display-completion-list (sort helpposs 'string-lessp)) |
77211
43c40e825164
(PC-goto-end, PC-do-completion-end): Make buffer-local.
Glenn Morris <rgm@gnu.org>
parents:
77208
diff
changeset
|
775 (setq PC-do-completion-end end |
43c40e825164
(PC-goto-end, PC-do-completion-end): Make buffer-local.
Glenn Morris <rgm@gnu.org>
parents:
77208
diff
changeset
|
776 PC-goto-end goto-end) |
76756
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
777 (with-current-buffer standard-output |
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
778 ;; Record which part of the buffer we are completing |
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
779 ;; so that choosing a completion from the list |
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
780 ;; knows how much old text to replace. |
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
781 ;; This was briefly nil in the non-dirname case. |
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
782 ;; However, if one calls PC-lisp-complete-symbol |
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
783 ;; on "(ne-f" with point on the hyphen, PC offers |
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
784 ;; all completions starting with "(ne", some of |
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
785 ;; which do not match the "-f" part (maybe it |
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
786 ;; should not, but it does). In such cases, |
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
787 ;; completion gets confused trying to figure out |
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
788 ;; how much to replace, so we tell it explicitly |
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
789 ;; (ie, the number of chars in the buffer before beg). |
76774
a98404fc2d91
(PC-do-completion-end): New variable.
Glenn Morris <rgm@gnu.org>
parents:
76756
diff
changeset
|
790 ;; |
a98404fc2d91
(PC-do-completion-end): New variable.
Glenn Morris <rgm@gnu.org>
parents:
76756
diff
changeset
|
791 ;; Note that choose-completion-string-functions |
a98404fc2d91
(PC-do-completion-end): New variable.
Glenn Morris <rgm@gnu.org>
parents:
76756
diff
changeset
|
792 ;; plays around with point. |
76756
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
793 (setq completion-base-size (if dirname |
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
794 dirlength |
77211
43c40e825164
(PC-goto-end, PC-do-completion-end): Make buffer-local.
Glenn Morris <rgm@gnu.org>
parents:
77208
diff
changeset
|
795 (- beg prompt-end)))))) |
10164
d16e46a4e34c
(PC-do-completion): If complete but not unique,
Richard M. Stallman <rms@gnu.org>
parents:
8478
diff
changeset
|
796 (PC-temp-minibuffer-message " [Next char not unique]")) |
3725 | 797 nil))))) |
798 | |
799 ;; Only one possible completion | |
800 (t | |
29674
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
801 (if (and (equal basestr (car poss)) |
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
802 (not (and env-on filename))) |
3725 | 803 (if (null mode) |
10164
d16e46a4e34c
(PC-do-completion): If complete but not unique,
Richard M. Stallman <rms@gnu.org>
parents:
8478
diff
changeset
|
804 (PC-temp-minibuffer-message " [Sole completion]")) |
3725 | 805 (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
|
806 (insert (format "%s" |
1335cec8a016
(PC-do-completion): Clear text props from inserted text.
Richard M. Stallman <rms@gnu.org>
parents:
7639
diff
changeset
|
807 (if filename |
1335cec8a016
(PC-do-completion): Clear text props from inserted text.
Richard M. Stallman <rms@gnu.org>
parents:
7639
diff
changeset
|
808 (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
|
809 (car poss))))) |
3725 | 810 t))))) |
811 | |
812 (defun PC-chop-word (new old) | |
813 (let ((i -1) | |
814 (j -1)) | |
815 (while (and (setq i (string-match PC-delim-regex old (1+ i))) | |
816 (setq j (string-match PC-delim-regex new (1+ j))))) | |
817 (if (and j | |
818 (or (not PC-word-failed-flag) | |
819 (setq j (string-match PC-delim-regex new (1+ j))))) | |
820 (substring new 0 (1+ j)) | |
821 new))) | |
822 | |
823 (defvar PC-not-minibuffer nil) | |
824 | |
18981
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
825 (defun PC-temp-minibuffer-message (message) |
3725 | 826 "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
|
827 (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
|
828 (message message) |
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
829 (sit-for 2) |
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
830 (message "")) |
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
831 ((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
|
832 (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
|
833 (t |
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
834 (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
|
835 (save-excursion |
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
836 (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
|
837 (insert message)) |
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
838 (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
|
839 (sit-for 2) |
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
840 (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
|
841 (when quit-flag |
6681f7141d2b
customise & make installation/deinstallation happen on mode command not file load.
Simon Marshall <simon@gnu.org>
parents:
17352
diff
changeset
|
842 (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
|
843 unread-command-events '(7)))))))) |
3725 | 844 |
76787
960eefe0c8c4
(partial-completion-mode): Set PC-do-completion-end to nil after use.
Glenn Morris <rgm@gnu.org>
parents:
76774
diff
changeset
|
845 ;; Does not need to be buffer-local (?) because only used when one |
960eefe0c8c4
(partial-completion-mode): Set PC-do-completion-end to nil after use.
Glenn Morris <rgm@gnu.org>
parents:
76774
diff
changeset
|
846 ;; PC-l-c-s immediately follows another. |
76756
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
847 (defvar PC-lisp-complete-end nil |
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
848 "Internal variable used by `PC-lisp-complete-symbol'.") |
3725 | 849 |
850 (defun PC-lisp-complete-symbol () | |
851 "Perform completion on Lisp symbol preceding point. | |
852 That symbol is compared against the symbols that exist | |
853 and any additional characters determined by what is there | |
854 are inserted. | |
855 If the symbol starts just after an open-parenthesis, | |
856 only symbols with function definitions are considered. | |
857 Otherwise, all symbols with function definitions, values | |
858 or properties are considered." | |
859 (interactive) | |
860 (let* ((end (point)) | |
76787
960eefe0c8c4
(partial-completion-mode): Set PC-do-completion-end to nil after use.
Glenn Morris <rgm@gnu.org>
parents:
76774
diff
changeset
|
861 ;; To complete the word under point, rather than just the portion |
960eefe0c8c4
(partial-completion-mode): Set PC-do-completion-end to nil after use.
Glenn Morris <rgm@gnu.org>
parents:
76774
diff
changeset
|
862 ;; before point, use this: |
960eefe0c8c4
(partial-completion-mode): Set PC-do-completion-end to nil after use.
Glenn Morris <rgm@gnu.org>
parents:
76774
diff
changeset
|
863 ;;; (save-excursion |
960eefe0c8c4
(partial-completion-mode): Set PC-do-completion-end to nil after use.
Glenn Morris <rgm@gnu.org>
parents:
76774
diff
changeset
|
864 ;;; (with-syntax-table lisp-mode-syntax-table |
960eefe0c8c4
(partial-completion-mode): Set PC-do-completion-end to nil after use.
Glenn Morris <rgm@gnu.org>
parents:
76774
diff
changeset
|
865 ;;; (forward-sexp 1) |
960eefe0c8c4
(partial-completion-mode): Set PC-do-completion-end to nil after use.
Glenn Morris <rgm@gnu.org>
parents:
76774
diff
changeset
|
866 ;;; (point)))) |
67161
759b69f39057
(PC-completion-as-file-name-predicate): Use minibuffer-completing-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67008
diff
changeset
|
867 (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
|
868 (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
|
869 (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
|
870 (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
|
871 (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
|
872 (point)))) |
3725 | 873 (minibuffer-completion-table obarray) |
874 (minibuffer-completion-predicate | |
875 (if (eq (char-after (1- beg)) ?\() | |
876 'fboundp | |
877 (function (lambda (sym) | |
878 (or (boundp sym) (fboundp sym) | |
879 (symbol-plist sym)))))) | |
880 (PC-not-minibuffer t)) | |
76756
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
881 ;; http://lists.gnu.org/archive/html/emacs-devel/2007-03/msg01211.html |
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
882 ;; |
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
883 ;; This deals with cases like running PC-l-c-s on "M-: (n-f". |
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
884 ;; The first call to PC-l-c-s expands this to "(ne-f", and moves |
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
885 ;; point to the hyphen [1]. If one calls PC-l-c-s immediately after, |
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
886 ;; then without the last-command check, one is offered all |
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
887 ;; completions of "(ne", which is presumably not what one wants. |
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
888 ;; |
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
889 ;; This is arguably (at least, it seems to be the existing intended |
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
890 ;; behaviour) what one _does_ want if point has been explicitly |
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
891 ;; positioned on the hyphen. Note that if PC-do-completion (qv) binds |
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
892 ;; completion-base-size to nil, then completion does not replace the |
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
893 ;; correct amount of text in such cases. |
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
894 ;; |
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
895 ;; Neither of these problems occur when using PC for filenames in the |
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
896 ;; minibuffer, because in that case PC-do-completion is called without |
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
897 ;; an explicit value for END, and so uses (point-max). This is fine for |
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
898 ;; a filename, because the end of the filename must be at the end of |
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
899 ;; the minibuffer. The same is not true for lisp symbols. |
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
900 ;; |
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
901 ;; [1] An alternate fix would be to not move point to the hyphen |
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
902 ;; in such cases, but that would make the behaviour different from |
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
903 ;; that for filenames. It seems PC moves point to the site of the |
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
904 ;; first difference between the possible completions. |
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
905 ;; |
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
906 ;; Alternatively alternatively, maybe end should be computed in |
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
907 ;; the same way as beg. That would change the behaviour though. |
63293afecf15
(PC-do-completion): Compute completion-base-size in
Glenn Morris <rgm@gnu.org>
parents:
76655
diff
changeset
|
908 (if (equal last-command 'PC-lisp-complete-symbol) |
77208 | 909 (PC-do-completion nil beg PC-lisp-complete-end t) |
76787
960eefe0c8c4
(partial-completion-mode): Set PC-do-completion-end to nil after use.
Glenn Morris <rgm@gnu.org>
parents:
76774
diff
changeset
|
910 (if PC-lisp-complete-end |
960eefe0c8c4
(partial-completion-mode): Set PC-do-completion-end to nil after use.
Glenn Morris <rgm@gnu.org>
parents:
76774
diff
changeset
|
911 (move-marker PC-lisp-complete-end end) |
960eefe0c8c4
(partial-completion-mode): Set PC-do-completion-end to nil after use.
Glenn Morris <rgm@gnu.org>
parents:
76774
diff
changeset
|
912 (setq PC-lisp-complete-end (copy-marker end t))) |
77208 | 913 (PC-do-completion nil beg end t)))) |
3725 | 914 |
29674
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
915 (defun PC-complete-as-file-name () |
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
916 "Perform completion on file names preceding point. |
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
917 Environment vars are converted to their values." |
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
918 (interactive) |
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
919 (let* ((end (point)) |
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
920 (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
|
921 (point-min) t) |
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
922 (+ (point) 2) |
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
923 (point-min))) |
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
924 (minibuffer-completion-table 'read-file-name-internal) |
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
925 (minibuffer-completion-predicate "") |
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
926 (PC-not-minibuffer t)) |
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
927 (goto-char end) |
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
928 (PC-do-completion nil beg end))) |
611062a8c71e
(PC-env-vars-alist): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
29088
diff
changeset
|
929 |
67161
759b69f39057
(PC-completion-as-file-name-predicate): Use minibuffer-completing-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67008
diff
changeset
|
930 ;; 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
|
931 ;; This could now use file-expand-wildcards instead. |
3725 | 932 |
933 (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
|
934 (with-current-buffer (generate-new-buffer " *Glob Output*") |
3725 | 935 (erase-buffer) |
72243
0fc019770d97
(PC-expand-many-files): Avoid signalling an error when
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71517
diff
changeset
|
936 (when (and (file-name-absolute-p name) |
0fc019770d97
(PC-expand-many-files): Avoid signalling an error when
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71517
diff
changeset
|
937 (not (file-directory-p default-directory))) |
0fc019770d97
(PC-expand-many-files): Avoid signalling an error when
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71517
diff
changeset
|
938 ;; If the current working directory doesn't exist `shell-command' |
0fc019770d97
(PC-expand-many-files): Avoid signalling an error when
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71517
diff
changeset
|
939 ;; signals an error. So if the file names we're looking for don't |
0fc019770d97
(PC-expand-many-files): Avoid signalling an error when
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71517
diff
changeset
|
940 ;; depend on the working directory, switch to a valid directory first. |
0fc019770d97
(PC-expand-many-files): Avoid signalling an error when
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71517
diff
changeset
|
941 (setq default-directory "/")) |
3725 | 942 (shell-command (concat "echo " name) t) |
943 (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
|
944 ;; 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
|
945 ;; 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
|
946 (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
|
947 (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
|
948 "\\|" |
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
|
949 (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
|
950 "\\)\\( \\|$\\)")) |
3725 | 951 nil |
952 (insert "(\"") | |
953 (while (search-forward " " nil t) | |
954 (delete-backward-char 1) | |
955 (insert "\" \"")) | |
956 (goto-char (point-max)) | |
957 (delete-backward-char 1) | |
958 (insert "\")") | |
959 (goto-char (point-min)) | |
21266
af9641af8877
(PC-expand-many-files): Apply completion-ignored-extensions.
Karl Heuer <kwzh@gnu.org>
parents:
20709
diff
changeset
|
960 (let ((files (read (current-buffer))) (p nil)) |
3725 | 961 (kill-buffer (current-buffer)) |
21266
af9641af8877
(PC-expand-many-files): Apply completion-ignored-extensions.
Karl Heuer <kwzh@gnu.org>
parents:
20709
diff
changeset
|
962 (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
|
963 (setq PC-ignored-regexp |
af9641af8877
(PC-expand-many-files): Apply completion-ignored-extensions.
Karl Heuer <kwzh@gnu.org>
parents:
20709
diff
changeset
|
964 (concat "\\(" |
af9641af8877
(PC-expand-many-files): Apply completion-ignored-extensions.
Karl Heuer <kwzh@gnu.org>
parents:
20709
diff
changeset
|
965 (mapconcat |
af9641af8877
(PC-expand-many-files): Apply completion-ignored-extensions.
Karl Heuer <kwzh@gnu.org>
parents:
20709
diff
changeset
|
966 'regexp-quote |
af9641af8877
(PC-expand-many-files): Apply completion-ignored-extensions.
Karl Heuer <kwzh@gnu.org>
parents:
20709
diff
changeset
|
967 (setq PC-ignored-extensions |
af9641af8877
(PC-expand-many-files): Apply completion-ignored-extensions.
Karl Heuer <kwzh@gnu.org>
parents:
20709
diff
changeset
|
968 completion-ignored-extensions) |
af9641af8877
(PC-expand-many-files): Apply completion-ignored-extensions.
Karl Heuer <kwzh@gnu.org>
parents:
20709
diff
changeset
|
969 "\\|") |
af9641af8877
(PC-expand-many-files): Apply completion-ignored-extensions.
Karl Heuer <kwzh@gnu.org>
parents:
20709
diff
changeset
|
970 "\\)\\'"))) |
af9641af8877
(PC-expand-many-files): Apply completion-ignored-extensions.
Karl Heuer <kwzh@gnu.org>
parents:
20709
diff
changeset
|
971 (setq p nil) |
af9641af8877
(PC-expand-many-files): Apply completion-ignored-extensions.
Karl Heuer <kwzh@gnu.org>
parents:
20709
diff
changeset
|
972 (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
|
973 ;; 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
|
974 ;; 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
|
975 ;; 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
|
976 ;; 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
|
977 ;; 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
|
978 ;; 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
|
979 (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
|
980 (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
|
981 (setq p (cons (car files) p))) |
af9641af8877
(PC-expand-many-files): Apply completion-ignored-extensions.
Karl Heuer <kwzh@gnu.org>
parents:
20709
diff
changeset
|
982 (setq files (cdr files))) |
af9641af8877
(PC-expand-many-files): Apply completion-ignored-extensions.
Karl Heuer <kwzh@gnu.org>
parents:
20709
diff
changeset
|
983 p)))) |
3725 | 984 |
67161
759b69f39057
(PC-completion-as-file-name-predicate): Use minibuffer-completing-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67008
diff
changeset
|
985 ;; 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
|
986 ;; 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
|
987 ;; at top of this file. |
3725 | 988 |
989 (defun PC-look-for-include-file () | |
990 (if (string-match "[\"<]\\([^\"<>]*\\)[\">]?$" (buffer-file-name)) | |
991 (let ((name (substring (buffer-file-name) | |
992 (match-beginning 1) (match-end 1))) | |
993 (punc (aref (buffer-file-name) (match-beginning 0))) | |
994 (path nil) | |
995 new-buf) | |
996 (kill-buffer (current-buffer)) | |
997 (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
|
998 (with-current-buffer (car (buffer-list)) |
3725 | 999 (save-excursion |
1000 (beginning-of-line) | |
1001 (if (looking-at | |
1002 "[ \t]*#[ \t]*include[ \t]+[<\"]\\(.+\\)[>\"][ \t]*[\n/]") | |
1003 (setq name (buffer-substring (match-beginning 1) | |
1004 (match-end 1)) | |
1005 punc (char-after (1- (match-beginning 1)))) | |
1006 ;; Suggested by Frank Siebenlist: | |
1007 (if (or (looking-at | |
1008 "[ \t]*([ \t]*load[ \t]+\"\\([^\"]+\\)\"") | |
1009 (looking-at | |
1010 "[ \t]*([ \t]*load-library[ \t]+\"\\([^\"]+\\)\"") | |
1011 (looking-at | |
1012 "[ \t]*([ \t]*require[ \t]+'\\([^\t )]+\\)[\t )]")) | |
1013 (progn | |
1014 (setq name (buffer-substring (match-beginning 1) | |
1015 (match-end 1)) | |
1016 punc ?\< | |
1017 path load-path) | |
1018 (if (string-match "\\.elc$" name) | |
1019 (setq name (substring name 0 -1)) | |
1020 (or (string-match "\\.el$" name) | |
1021 (setq name (concat name ".el"))))) | |
1022 (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
|
1023 (or (string-match "\\.[[:alnum:]]+$" name) |
3725 | 1024 (setq name (concat name ".h"))) |
1025 (if (eq punc ?\<) | |
1026 (let ((path (or path (PC-include-file-path)))) | |
1027 (while (and path | |
1028 (not (file-exists-p | |
1029 (concat (file-name-as-directory (car path)) | |
1030 name)))) | |
1031 (setq path (cdr path))) | |
1032 (if path | |
1033 (setq name (concat (file-name-as-directory (car path)) name)) | |
1034 (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
|
1035 (let ((dir (with-current-buffer (car (buffer-list)) |
3725 | 1036 default-directory))) |
1037 (if (file-exists-p (concat dir name)) | |
1038 (setq name (concat dir name)) | |
24624
07ae57ea2a18
Delete the wildcard expansion feature
Karl Heuer <kwzh@gnu.org>
parents:
24534
diff
changeset
|
1039 (error "No such include file: `%s'" name)))) |
3725 | 1040 (setq new-buf (get-file-buffer name)) |
1041 (if new-buf | |
1042 ;; no need to verify last-modified time for this! | |
1043 (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
|
1044 (set-buffer (create-file-buffer name)) |
3725 | 1045 (erase-buffer) |
1046 (insert-file-contents name t)) | |
24624
07ae57ea2a18
Delete the wildcard expansion feature
Karl Heuer <kwzh@gnu.org>
parents:
24534
diff
changeset
|
1047 ;; Returning non-nil with the new buffer current |
07ae57ea2a18
Delete the wildcard expansion feature
Karl Heuer <kwzh@gnu.org>
parents:
24534
diff
changeset
|
1048 ;; is sufficient to tell find-file to use it. |
3725 | 1049 t) |
1050 nil)) | |
1051 | |
1052 (defun PC-include-file-path () | |
1053 (or PC-include-file-path | |
1054 (let ((env (getenv "INCPATH")) | |
1055 (path nil) | |
1056 pos) | |
1057 (or env (error "No include file path specified")) | |
1058 (while (setq pos (string-match ":[^:]+$" env)) | |
1059 (setq path (cons (substring env (1+ pos)) path) | |
1060 env (substring env 0 pos))) | |
1061 path))) | |
1062 | |
67161
759b69f39057
(PC-completion-as-file-name-predicate): Use minibuffer-completing-file-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67008
diff
changeset
|
1063 ;; This is adapted from lib-complete.el, by Mike Williams. |
3725 | 1064 (defun PC-include-file-all-completions (file search-path &optional full) |
1065 "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
|
1066 If optional third argument FULL is non-nil, returned pathnames should be |
3725 | 1067 absolute rather than relative to some directory on the SEARCH-PATH." |
1068 (setq search-path | |
31971
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
1069 (mapcar (lambda (dir) |
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
1070 (if dir (file-name-as-directory dir) default-directory)) |
3725 | 1071 search-path)) |
1072 (if (file-name-absolute-p file) | |
1073 ;; It's an absolute file name, so don't need search-path | |
1074 (progn | |
1075 (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
|
1076 (file-name-all-completions |
3725 | 1077 (file-name-nondirectory file) (file-name-directory file))) |
1078 (let ((subdir (file-name-directory file)) | |
1079 (ndfile (file-name-nondirectory file)) | |
1080 file-lists) | |
1081 ;; Append subdirectory part to each element of search-path | |
1082 (if subdir | |
1083 (setq search-path | |
31971
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
1084 (mapcar (lambda (dir) (concat dir subdir)) |
3725 | 1085 search-path) |
1086 file )) | |
1087 ;; Make list of completions in each directory on search-path | |
1088 (while search-path | |
1089 (let* ((dir (car search-path)) | |
1090 (subdir (if full dir subdir))) | |
1091 (if (file-directory-p dir) | |
1092 (progn | |
1093 (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
|
1094 (cons |
31971
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
1095 (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
|
1096 (file-name-all-completions ndfile |
3725 | 1097 (car search-path))) |
1098 file-lists)))) | |
1099 (setq search-path (cdr search-path)))) | |
1100 ;; Compress out duplicates while building complete list (slloooow!) | |
1101 (let ((sorted (sort (apply 'nconc file-lists) | |
31971
fa083a5fbf0c
(partial-completion-mode) <defcustom>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29674
diff
changeset
|
1102 (lambda (x y) (not (string-lessp x y))))) |
3725 | 1103 compressed) |
1104 (while sorted | |
1105 (if (equal (car sorted) (car compressed)) nil | |
1106 (setq compressed (cons (car sorted) compressed))) | |
1107 (setq sorted (cdr sorted))) | |
1108 compressed)))) | |
1109 | |
70076
10e0b8ee9993
(partial-completion-mode): Use 'choose-completion-string-functions to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69309
diff
changeset
|
1110 (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
|
1111 (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
|
1112 (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
|
1113 (action (ad-get-arg 2)) |
76655
adb0ab836e5d
(read-file-name-internal): Don't add the final > if the completion is not
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
76439
diff
changeset
|
1114 (name (match-string 1 string)) |
3725 | 1115 (str2 (substring string (match-beginning 0))) |
1116 (completion-table | |
76655
adb0ab836e5d
(read-file-name-internal): Don't add the final > if the completion is not
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
76439
diff
changeset
|
1117 (mapcar (lambda (x) |
adb0ab836e5d
(read-file-name-internal): Don't add the final > if the completion is not
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
76439
diff
changeset
|
1118 (format (if (string-match "/\\'" x) "<%s" "<%s>") x)) |
3725 | 1119 (PC-include-file-all-completions |
1120 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
|
1121 (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
|
1122 (cond |
10e0b8ee9993
(partial-completion-mode): Use 'choose-completion-string-functions to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69309
diff
changeset
|
1123 ((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
|
1124 ((eq action 'lambda) (test-completion str2 completion-table nil)) |
76404
51826bf423f3
(PC-try-completion): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
76389
diff
changeset
|
1125 ((eq action nil) (PC-try-completion str2 completion-table nil)) |
70076
10e0b8ee9993
(partial-completion-mode): Use 'choose-completion-string-functions to make
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69309
diff
changeset
|
1126 ((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
|
1127 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
|
1128 |
3725 | 1129 |
1130 (provide 'complete) | |
1131 | |
61042
31060527396c
(PC-read-include-file-name-internal): Use test-completion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60920
diff
changeset
|
1132 ;; 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
|
1133 ;;; complete.el ends here |