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