Mercurial > emacs
annotate lisp/completion.el @ 16306:450f26426101 libc-960925 libc-960926 libc-960927 libc-960928 libc-960929 libc-961001 libc-961004 libc-961005 libc-961006 libc-961007 libc-961008 libc-961009 libc-961010 libc-961011 libc-961012 libc-961013 libc-961014 libc-961015 libc-961016 libc-961017 libc-961018 libc-961019 libc-961020 libc-961021 libc-961022 libc-961023 libc-961024 libc-961025 libc-961026 libc-961027 libc-961028
(-vxsim*): New operating system.
author | Richard Kenner <kenner@gnu.org> |
---|---|
date | Tue, 24 Sep 1996 02:44:17 +0000 |
parents | e3cfe2afed17 |
children | 2a9fdbfcb993 |
rev | line source |
---|---|
662
8a533acedb77
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
190
diff
changeset
|
1 ;;; completion.el --- dynamic word-completion code |
14169 | 2 |
11431 | 3 ;; Copyright (C) 1990, 1993, 1995 Free Software Foundation, Inc. |
662
8a533acedb77
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
190
diff
changeset
|
4 |
3846 | 5 ;; Maintainer: FSF |
2247
2c7997f249eb
Add or correct keywords
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
1356
diff
changeset
|
6 ;; Keywords: abbrev |
13636
a120308bfe29
(cmpl-make-standard-completion-syntax-table)
Richard M. Stallman <rms@gnu.org>
parents:
11431
diff
changeset
|
7 ;; Author: Jim Salem <alem@bbnplanet.com> of Thinking Machines Inc. |
11295 | 8 ;; (ideas suggested by Brewster Kahle) |
4434
265397236749
(completion-version): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
4218
diff
changeset
|
9 |
265397236749
(completion-version): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
4218
diff
changeset
|
10 ;; This file is part of GNU Emacs. |
265397236749
(completion-version): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
4218
diff
changeset
|
11 |
265397236749
(completion-version): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
4218
diff
changeset
|
12 ;; GNU Emacs is free software; you can redistribute it and/or modify |
265397236749
(completion-version): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
4218
diff
changeset
|
13 ;; it under the terms of the GNU General Public License as published by |
265397236749
(completion-version): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
4218
diff
changeset
|
14 ;; the Free Software Foundation; either version 2, or (at your option) |
265397236749
(completion-version): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
4218
diff
changeset
|
15 ;; any later version. |
265397236749
(completion-version): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
4218
diff
changeset
|
16 |
265397236749
(completion-version): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
4218
diff
changeset
|
17 ;; GNU Emacs is distributed in the hope that it will be useful, |
265397236749
(completion-version): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
4218
diff
changeset
|
18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of |
265397236749
(completion-version): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
4218
diff
changeset
|
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
265397236749
(completion-version): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
4218
diff
changeset
|
20 ;; GNU General Public License for more details. |
265397236749
(completion-version): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
4218
diff
changeset
|
21 |
265397236749
(completion-version): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
4218
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 |
24 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
25 ;; Boston, MA 02111-1307, USA. | |
795
c693d56ef36d
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
732
diff
changeset
|
26 |
c693d56ef36d
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
732
diff
changeset
|
27 ;;; Commentary: |
14169 | 28 |
29 ;; What to put in .emacs | |
30 ;;----------------------- | |
31 ;; (load "completion") | |
32 ;; (initialize-completions) | |
56 | 33 |
14169 | 34 ;;--------------------------------------------------------------------------- |
35 ;; Documentation [Slightly out of date] | |
36 ;;--------------------------------------------------------------------------- | |
37 ;; (also check the documentation string of the functions) | |
38 ;; | |
39 ;; Introduction | |
40 ;;--------------- | |
41 ;; | |
42 ;; After you type a few characters, pressing the "complete" key inserts | |
43 ;; the rest of the word you are likely to type. | |
44 ;; | |
45 ;; This watches all the words that you type and remembers them. When | |
46 ;; typing a new word, pressing "complete" (meta-return) "completes" the | |
47 ;; word by inserting the most recently used word that begins with the | |
48 ;; same characters. If you press meta-return repeatedly, it cycles | |
49 ;; through all the words it knows about. | |
50 ;; | |
51 ;; If you like the completion then just continue typing, it is as if you | |
52 ;; entered the text by hand. If you want the inserted extra characters | |
53 ;; to go away, type control-w or delete. More options are described below. | |
54 ;; | |
55 ;; The guesses are made in the order of the most recently "used". Typing | |
56 ;; in a word and then typing a separator character (such as a space) "uses" | |
57 ;; the word. So does moving a cursor over the word. If no words are found, | |
58 ;; it uses an extended version of the dabbrev style completion. | |
59 ;; | |
60 ;; You automatically save the completions you use to a file between | |
61 ;; sessions. | |
62 ;; | |
63 ;; Completion enables programmers to enter longer, more descriptive | |
64 ;; variable names while typing fewer keystrokes than they normally would. | |
65 ;; | |
66 ;; | |
67 ;; Full documentation | |
68 ;;--------------------- | |
69 ;; | |
70 ;; A "word" is any string containing characters with either word or symbol | |
71 ;; syntax. [E.G. Any alphanumeric string with hyphens, underscores, etc.] | |
72 ;; Unless you change the constants, you must type at least three characters | |
73 ;; for the word to be recognized. Only words longer than 6 characters are | |
74 ;; saved. | |
75 ;; | |
76 ;; When you load this file, completion will be on. I suggest you use the | |
77 ;; compiled version (because it is noticeably faster). | |
78 ;; | |
79 ;; M-X completion-mode toggles whether or not new words are added to the | |
80 ;; database by changing the value of enable-completion. | |
81 ;; | |
82 ;; SAVING/LOADING COMPLETIONS | |
83 ;; Completions are automatically saved from one session to another | |
84 ;; (unless save-completions-flag or enable-completion is nil). | |
85 ;; Loading this file (or calling initialize-completions) causes EMACS | |
86 ;; to load a completions database for a saved completions file | |
87 ;; (default: ~/.completions). When you exit, EMACS saves a copy of the | |
88 ;; completions that you | |
89 ;; often use. When you next start, EMACS loads in the saved completion file. | |
90 ;; | |
91 ;; The number of completions saved depends loosely on | |
92 ;; *saved-completions-decay-factor*. Completions that have never been | |
93 ;; inserted via "complete" are not saved. You are encouraged to experiment | |
94 ;; with different functions (see compute-completion-min-num-uses). | |
95 ;; | |
96 ;; Some completions are permanent and are always saved out. These | |
97 ;; completions have their num-uses slot set to T. Use | |
98 ;; add-permanent-completion to do this | |
99 ;; | |
100 ;; Completions are saved only if enable-completion is T. The number of old | |
101 ;; versions kept of the saved completions file is controlled by | |
102 ;; completions-file-versions-kept. | |
103 ;; | |
104 ;; COMPLETE KEY OPTIONS | |
105 ;; The complete function takes a numeric arguments. | |
106 ;; control-u :: leave the point at the beginning of the completion rather | |
107 ;; than the middle. | |
108 ;; a number :: rotate through the possible completions by that amount | |
109 ;; `-' :: same as -1 (insert previous completion) | |
110 ;; | |
111 ;; HOW THE DATABASE IS MAINTAINED | |
112 ;; <write> | |
113 ;; | |
114 ;; UPDATING THE DATABASE MANUALLY | |
115 ;; m-x kill-completion | |
116 ;; kills the completion at point. | |
117 ;; m-x add-completion | |
118 ;; m-x add-permanent-completion | |
119 ;; | |
120 ;; UPDATING THE DATABASE FROM A SOURCE CODE FILE | |
121 ;; m-x add-completions-from-buffer | |
122 ;; Parses all the definition names from a C or LISP mode buffer and | |
123 ;; adds them to the completion database. | |
124 ;; | |
125 ;; m-x add-completions-from-lisp-file | |
126 ;; Parses all the definition names from a C or Lisp mode file and | |
127 ;; adds them to the completion database. | |
128 ;; | |
129 ;; UPDATING THE DATABASE FROM A TAGS TABLE | |
130 ;; m-x add-completions-from-tags-table | |
131 ;; Adds completions from the current tags-table-buffer. | |
132 ;; | |
133 ;; HOW A COMPLETION IS FOUND | |
134 ;; <write> | |
135 ;; | |
136 ;; STRING CASING | |
137 ;; Completion is string case independent if case-fold-search has its | |
138 ;; normal default of T. Also when the completion is inserted the case of the | |
139 ;; entry is coerced appropriately. | |
140 ;; [E.G. APP --> APPROPRIATELY app --> appropriately | |
141 ;; App --> Appropriately] | |
142 ;; | |
143 ;; INITIALIZATION | |
144 ;; The form `(initialize-completions)' initializes the completion system by | |
145 ;; trying to load in the user's completions. After the first cal, further | |
146 ;; calls have no effect so one should be careful not to put the form in a | |
147 ;; site's standard site-init file. | |
148 ;; | |
149 ;;--------------------------------------------------------------------------- | |
150 ;; | |
151 ;; | |
56 | 152 |
14169 | 153 ;;--------------------------------------------------------------------------- |
154 ;; Functions you might like to call | |
155 ;;--------------------------------------------------------------------------- | |
156 ;; | |
157 ;; add-completion string &optional num-uses | |
158 ;; Adds a new string to the database | |
159 ;; | |
160 ;; add-permanent-completion string | |
161 ;; Adds a new string to the database with num-uses = T | |
162 ;; | |
56 | 163 |
14169 | 164 ;; kill-completion string |
165 ;; Kills the completion from the database. | |
166 ;; | |
167 ;; clear-all-completions | |
168 ;; Clears the database | |
169 ;; | |
170 ;; list-all-completions | |
171 ;; Returns a list of all completions. | |
172 ;; | |
173 ;; | |
174 ;; next-completion string &optional index | |
175 ;; Returns a completion entry that starts with string. | |
176 ;; | |
177 ;; find-exact-completion string | |
178 ;; Returns a completion entry that exactly matches string. | |
179 ;; | |
180 ;; complete | |
181 ;; Inserts a completion at point | |
182 ;; | |
183 ;; initialize-completions | |
184 ;; Loads the completions file and sets up so that exiting emacs will | |
185 ;; save them. | |
186 ;; | |
187 ;; save-completions-to-file &optional filename | |
188 ;; load-completions-from-file &optional filename | |
189 ;; | |
190 ;;----------------------------------------------- | |
191 ;; Other functions | |
192 ;;----------------------------------------------- | |
193 ;; | |
194 ;; get-completion-list string | |
195 ;; | |
196 ;; These things are for manipulating the structure | |
197 ;; make-completion string num-uses | |
198 ;; completion-num-uses completion | |
199 ;; completion-string completion | |
200 ;; set-completion-num-uses completion num-uses | |
201 ;; set-completion-string completion string | |
202 ;; | |
203 ;; | |
56 | 204 |
14169 | 205 ;;----------------------------------------------- |
206 ;; To Do :: (anybody ?) | |
207 ;;----------------------------------------------- | |
208 ;; | |
209 ;; Implement Lookup and keyboard interface in C | |
210 ;; Add package prefix smarts (for Common Lisp) | |
211 ;; Add autoprompting of possible completions after every keystroke (fast | |
212 ;; terminals only !) | |
213 ;; Add doc. to texinfo | |
214 ;; | |
215 ;; | |
216 ;;----------------------------------------------- | |
14231
069791dced1e
Fix Change Log comment line.
Erik Naggum <erik@naggum.no>
parents:
14169
diff
changeset
|
217 ;;; Change Log: |
14169 | 218 ;;----------------------------------------------- |
219 ;; Sometime in '84 Brewster implemented a somewhat buggy version for | |
220 ;; Symbolics LISPMs. | |
221 ;; Jan. '85 Jim became enamored of the idea and implemented a faster, | |
222 ;; more robust version. | |
223 ;; With input from many users at TMC, (rose, craig, and gls come to mind), | |
224 ;; the current style of interface was developed. | |
225 ;; 9/87, Jim and Brewster took terminals home. Yuck. After | |
226 ;; complaining for a while Brewster implemented a subset of the current | |
227 ;; LISPM version for GNU Emacs. | |
228 ;; 8/88 After complaining for a while (and with sufficient | |
229 ;; promised rewards), Jim reimplemented a version of GNU completion | |
230 ;; superior to that of the LISPM version. | |
231 ;; | |
232 ;;----------------------------------------------- | |
233 ;; Acknowledgements | |
234 ;;----------------------------------------------- | |
235 ;; Cliff Lasser (cal@think.com), Kevin Herbert (kph@cisco.com), | |
236 ;; eero@media-lab, kgk@cs.brown.edu, jla@ai.mit.edu, | |
237 ;; | |
238 ;;----------------------------------------------- | |
239 ;; Change Log | |
240 ;;----------------------------------------------- | |
241 ;; From version 9 to 10 | |
242 ;; - Allowance for non-integral *completion-version* nos. | |
243 ;; - Fix cmpl-apply-as-top-level for keyboard macros | |
244 ;; - Fix broken completion merging (in save-completions-to-file) | |
245 ;; - More misc. fixes for version 19.0 of emacs | |
246 ;; | |
247 ;; From Version 8 to 9 | |
248 ;; - Ported to version 19.0 of emacs (backcompatible with version 18) | |
249 ;; - Added add-completions-from-tags-table (with thanks to eero@media-lab) | |
250 ;; | |
251 ;; From Version 7 to 8 | |
252 ;; - Misc. changes to comments | |
253 ;; - new completion key bindings: c-x o, M->, M-<, c-a, c-e | |
254 ;; - cdabbrev now checks all the visible window buffers and the "other buffer" | |
255 ;; - `%' is now a symbol character rather than a separator (except in C mode) | |
256 ;; | |
257 ;; From Version 6 to 7 | |
258 ;; - Fixed bug with saving out .completion file the first time | |
259 ;; | |
260 ;; From Version 5 to 6 | |
261 ;; - removed statistics recording | |
262 ;; - reworked advise to handle autoloads | |
263 ;; - Fixed fortran mode support | |
264 ;; - Added new cursor motion triggers | |
265 ;; | |
266 ;; From Version 4 to 5 | |
267 ;; - doesn't bother saving if nothing has changed | |
268 ;; - auto-save if haven't used for a 1/2 hour | |
269 ;; - save period extended to two weeks | |
270 ;; - minor fix to capitalization code | |
271 ;; - added *completion-auto-save-period* to variables recorded. | |
272 ;; - added reenter protection to cmpl-record-statistics-filter | |
273 ;; - added backup protection to save-completions-to-file (prevents | |
274 ;; problems with disk full errors) | |
56 | 275 |
795
c693d56ef36d
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
732
diff
changeset
|
276 ;;; Code: |
c693d56ef36d
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
732
diff
changeset
|
277 |
14169 | 278 ;;--------------------------------------------------------------------------- |
279 ;; User changeable parameters | |
280 ;;--------------------------------------------------------------------------- | |
56 | 281 |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
282 (defvar enable-completion t |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
283 "*Non-nil means enable recording and saving of completions. |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
284 If nil, no new words added to the database or saved to the init file.") |
56 | 285 |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
286 (defvar save-completions-flag t |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
287 "*Non-nil means save most-used completions when exiting Emacs. |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
288 See also `saved-completions-retention-time'.") |
56 | 289 |
13910
8c5388b7b1f5
(save-completions-file-name): Use convert-standard-filename.
Richard M. Stallman <rms@gnu.org>
parents:
13793
diff
changeset
|
290 (defvar save-completions-file-name (convert-standard-filename "~/.completions") |
56 | 291 "*The filename to save completions to.") |
292 | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
293 (defvar save-completions-retention-time 336 |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
294 "*Discard a completion if unused for this many hours. |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
295 \(1 day = 24, 1 week = 168). If this is 0, non-permanent completions |
190 | 296 will not be saved unless these are used. Default is two weeks.") |
56 | 297 |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
298 (defvar completion-on-separator-character nil |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
299 "*Non-nil means separator characters mark previous word as used. |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
300 This means the word will be saved as a completion.") |
56 | 301 |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
302 (defvar completions-file-versions-kept kept-new-versions |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
303 "*Number of versions to keep for the saved completions file.") |
56 | 304 |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
305 (defvar completion-prompt-speed-threshold 4800 |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
306 "*Minimum output speed at which to display next potential completion.") |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
307 |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
308 (defvar completion-cdabbrev-prompt-flag nil |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
309 "*If non-nil, the next completion prompt does a cdabbrev search. |
56 | 310 This can be time consuming.") |
311 | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
312 (defvar completion-search-distance 15000 |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
313 "*How far to search in the buffer when looking for completions. |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
314 In number of characters. If nil, search the whole buffer.") |
56 | 315 |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
316 (defvar completions-merging-modes '(lisp c) |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
317 "*List of modes {`c' or `lisp'} for automatic completions merging. |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
318 Definitions from visited files which have these modes |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
319 are automatically added to the completion database.") |
56 | 320 |
14169 | 321 ;;(defvar *record-cmpl-statistics-p* nil |
322 ;; "*If non-nil, record completion statistics.") | |
56 | 323 |
14169 | 324 ;;(defvar *completion-auto-save-period* 1800 |
325 ;; "*The period in seconds to wait for emacs to be idle before autosaving | |
326 ;;the completions. Default is a 1/2 hour.") | |
56 | 327 |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
328 (defconst completion-min-length nil ;; defined below in eval-when |
56 | 329 "*The minimum length of a stored completion. |
330 DON'T CHANGE WITHOUT RECOMPILING ! This is used by macros.") | |
331 | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
332 (defconst completion-max-length nil ;; defined below in eval-when |
56 | 333 "*The maximum length of a stored completion. |
334 DON'T CHANGE WITHOUT RECOMPILING ! This is used by macros.") | |
335 | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
336 (defconst completion-prefix-min-length nil ;; defined below in eval-when |
56 | 337 "The minimum length of a completion search string. |
338 DON'T CHANGE WITHOUT RECOMPILING ! This is used by macros.") | |
339 | |
340 (defmacro eval-when-compile-load-eval (&rest body) | |
341 ;; eval everything before expanding | |
342 (mapcar 'eval body) | |
190 | 343 (cons 'progn body)) |
56 | 344 |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
345 (eval-when-compile |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
346 (defvar completion-gensym-counter 0) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
347 (defun completion-gensym (&optional arg) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
348 "Generate a new uninterned symbol. |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
349 The name is made by appending a number to PREFIX, default \"G\"." |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
350 (let ((prefix (if (stringp arg) arg "G")) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
351 (num (if (integerp arg) arg |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
352 (prog1 completion-gensym-counter |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
353 (setq completion-gensym-counter (1+ completion-gensym-counter)))))) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
354 (make-symbol (format "%s%d" prefix num))))) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
355 |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
356 (defmacro completion-dolist (spec &rest body) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
357 "(completion-dolist (VAR LIST [RESULT]) BODY...): loop over a list. |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
358 Evaluate BODY with VAR bound to each `car' from LIST, in turn. |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
359 Then evaluate RESULT to get return value, default nil." |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
360 (let ((temp (completion-gensym "--dolist-temp--"))) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
361 (append (list 'let (list (list temp (nth 1 spec)) (car spec)) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
362 (append (list 'while temp |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
363 (list 'setq (car spec) (list 'car temp))) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
364 body (list (list 'setq temp |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
365 (list 'cdr temp))))) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
366 (if (cdr (cdr spec)) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
367 (cons (list 'setq (car spec) nil) (cdr (cdr spec))) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
368 '(nil))))) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
369 |
56 | 370 (defun completion-eval-when () |
371 (eval-when-compile-load-eval | |
372 ;; These vars. are defined at both compile and load time. | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
373 (setq completion-min-length 6) |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
374 (setq completion-max-length 200) |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
375 (setq completion-prefix-min-length 3))) |
56 | 376 |
377 (completion-eval-when) | |
378 | |
14169 | 379 ;;--------------------------------------------------------------------------- |
380 ;; Internal Variables | |
381 ;;--------------------------------------------------------------------------- | |
56 | 382 |
383 (defvar cmpl-initialized-p nil | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
384 "Set to t when the completion system is initialized. |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
385 Indicates that the old completion file has been read in.") |
56 | 386 |
387 (defvar cmpl-completions-accepted-p nil | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
388 "Set to t as soon as the first completion has been accepted. |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
389 Used to decide whether to save completions.") |
56 | 390 |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
391 (defvar cmpl-preceding-syntax) |
10639
dc32b19de050
(completion-string): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents:
10638
diff
changeset
|
392 |
dc32b19de050
(completion-string): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents:
10638
diff
changeset
|
393 (defvar completion-string) |
56 | 394 |
14169 | 395 ;;--------------------------------------------------------------------------- |
396 ;; Low level tools | |
397 ;;--------------------------------------------------------------------------- | |
56 | 398 |
14169 | 399 ;;----------------------------------------------- |
400 ;; Misc. | |
401 ;;----------------------------------------------- | |
56 | 402 |
403 (defun minibuffer-window-selected-p () | |
404 "True iff the current window is the minibuffer." | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
405 (window-minibuffer-p (selected-window))) |
56 | 406 |
4435
4ad99dc50f6f
(cmpl-read-time-eval): Make it no-op.
Richard M. Stallman <rms@gnu.org>
parents:
4434
diff
changeset
|
407 ;; This used to be `(eval form)'. Eval FORM at run time now. |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
408 (defmacro cmpl-read-time-eval (form) |
4435
4ad99dc50f6f
(cmpl-read-time-eval): Make it no-op.
Richard M. Stallman <rms@gnu.org>
parents:
4434
diff
changeset
|
409 form) |
56 | 410 |
14169 | 411 ;;----------------------------------------------- |
412 ;; String case coercion | |
413 ;;----------------------------------------------- | |
56 | 414 |
415 (defun cmpl-string-case-type (string) | |
416 "Returns :capitalized, :up, :down, :mixed, or :neither." | |
417 (let ((case-fold-search nil)) | |
418 (cond ((string-match "[a-z]" string) | |
419 (cond ((string-match "[A-Z]" string) | |
420 (cond ((and (> (length string) 1) | |
421 (null (string-match "[A-Z]" string 1))) | |
422 ':capitalized) | |
423 (t | |
424 ':mixed))) | |
425 (t ':down))) | |
426 (t | |
427 (cond ((string-match "[A-Z]" string) | |
428 ':up) | |
429 (t ':neither)))) | |
430 )) | |
431 | |
14169 | 432 ;; Tests - |
433 ;; (cmpl-string-case-type "123ABCDEF456") --> :up | |
434 ;; (cmpl-string-case-type "123abcdef456") --> :down | |
435 ;; (cmpl-string-case-type "123aBcDeF456") --> :mixed | |
436 ;; (cmpl-string-case-type "123456") --> :neither | |
437 ;; (cmpl-string-case-type "Abcde123") --> :capitalized | |
56 | 438 |
439 (defun cmpl-coerce-string-case (string case-type) | |
440 (cond ((eq case-type ':down) (downcase string)) | |
441 ((eq case-type ':up) (upcase string)) | |
442 ((eq case-type ':capitalized) | |
443 (setq string (downcase string)) | |
444 (aset string 0 (logand ?\337 (aref string 0))) | |
445 string) | |
446 (t string) | |
447 )) | |
448 | |
449 (defun cmpl-merge-string-cases (string-to-coerce given-string) | |
450 (let ((string-case-type (cmpl-string-case-type string-to-coerce)) | |
451 ) | |
452 (cond ((memq string-case-type '(:down :up :capitalized)) | |
453 ;; Found string is in a standard case. Coerce to a type based on | |
454 ;; the given string | |
455 (cmpl-coerce-string-case string-to-coerce | |
456 (cmpl-string-case-type given-string)) | |
457 ) | |
458 (t | |
459 ;; If the found string is in some unusual case, just insert it | |
460 ;; as is | |
461 string-to-coerce) | |
462 ))) | |
463 | |
14169 | 464 ;; Tests - |
465 ;; (cmpl-merge-string-cases "AbCdEf456" "abc") --> AbCdEf456 | |
466 ;; (cmpl-merge-string-cases "abcdef456" "ABC") --> ABCDEF456 | |
467 ;; (cmpl-merge-string-cases "ABCDEF456" "Abc") --> Abcdef456 | |
468 ;; (cmpl-merge-string-cases "ABCDEF456" "abc") --> abcdef456 | |
56 | 469 |
470 | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
471 (defun cmpl-hours-since-origin () |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
472 (let ((time (current-time))) |
15774
e3cfe2afed17
(cmpl-hours-since-origin): Fix bug:
Richard M. Stallman <rms@gnu.org>
parents:
15031
diff
changeset
|
473 (floor (+ (* 65536.0 (nth 0 time)) (nth 1 time)) 3600))) |
56 | 474 |
14169 | 475 ;;--------------------------------------------------------------------------- |
476 ;; "Symbol" parsing functions | |
477 ;;--------------------------------------------------------------------------- | |
478 ;; The functions symbol-before-point, symbol-under-point, etc. quickly return | |
479 ;; an appropriate symbol string. The strategy is to temporarily change | |
480 ;; the syntax table to enable fast symbol searching. There are three classes | |
481 ;; of syntax in these "symbol" syntax tables :: | |
482 ;; | |
483 ;; syntax (?_) - "symbol" chars (e.g. alphanumerics) | |
484 ;; syntax (?w) - symbol chars to ignore at end of words (e.g. period). | |
485 ;; syntax (? ) - everything else | |
486 ;; | |
487 ;; Thus by judicious use of scan-sexps and forward-word, we can get | |
488 ;; the word we want relatively fast and without consing. | |
489 ;; | |
490 ;; Why do we need a separate category for "symbol chars to ignore at ends" ? | |
491 ;; For example, in LISP we want starting :'s trimmed | |
492 ;; so keyword argument specifiers also define the keyword completion. And, | |
493 ;; for example, in C we want `.' appearing in a structure ref. to | |
494 ;; be kept intact in order to store the whole structure ref.; however, if | |
495 ;; it appears at the end of a symbol it should be discarded because it is | |
496 ;; probably used as a period. | |
56 | 497 |
14169 | 498 ;; Here is the default completion syntax :: |
499 ;; Symbol chars :: A-Z a-z 0-9 @ / \ * + ~ $ < > % | |
500 ;; Symbol chars to ignore at ends :: _ : . - | |
501 ;; Separator chars. :: <tab> <space> ! ^ & ( ) = ` | { } [ ] ; " ' # | |
502 ;; , ? <Everything else> | |
56 | 503 |
14169 | 504 ;; Mode specific differences and notes :: |
505 ;; LISP diffs -> | |
506 ;; Symbol chars :: ! & ? = ^ | |
507 ;; | |
508 ;; C diffs -> | |
509 ;; Separator chars :: + * / : % | |
510 ;; A note on the hyphen (`-'). Perhaps the hyphen should also be a separator | |
511 ;; char., however, we wanted to have completion symbols include pointer | |
512 ;; references. For example, "foo->bar" is a symbol as far as completion is | |
513 ;; concerned. | |
514 ;; | |
515 ;; FORTRAN diffs -> | |
516 ;; Separator chars :: + - * / : | |
517 ;; | |
518 ;; Pathname diffs -> | |
519 ;; Symbol chars :: . | |
520 ;; Of course there is no pathname "mode" and in fact we have not implemented | |
521 ;; this table. However, if there was such a mode, this is what it would look | |
522 ;; like. | |
56 | 523 |
14169 | 524 ;;----------------------------------------------- |
525 ;; Table definitions | |
526 ;;----------------------------------------------- | |
56 | 527 |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
528 (defun cmpl-make-standard-completion-syntax-table () |
15031 | 529 (let ((table (make-syntax-table)) |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
530 i) |
15031 | 531 ;; Default syntax is whitespace. |
532 (setq i 0) | |
533 (while (< i 256) | |
534 (modify-syntax-entry i " " table) | |
535 (setq i (1+ i))) | |
56 | 536 ;; alpha chars |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
537 (setq i 0) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
538 (while (< i 26) |
56 | 539 (modify-syntax-entry (+ ?a i) "_" table) |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
540 (modify-syntax-entry (+ ?A i) "_" table) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
541 (setq i (1+ i))) |
56 | 542 ;; digit chars. |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
543 (setq i 0) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
544 (while (< i 10) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
545 (modify-syntax-entry (+ ?0 i) "_" table) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
546 (setq i (1+ i))) |
56 | 547 ;; Other ones |
548 (let ((symbol-chars '(?@ ?/ ?\\ ?* ?+ ?~ ?$ ?< ?> ?%)) | |
549 (symbol-chars-ignore '(?_ ?- ?: ?.)) | |
550 ) | |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
551 (completion-dolist (char symbol-chars) |
56 | 552 (modify-syntax-entry char "_" table)) |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
553 (completion-dolist (char symbol-chars-ignore) |
56 | 554 (modify-syntax-entry char "w" table) |
555 ) | |
556 ) | |
557 table)) | |
558 | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
559 (defconst cmpl-standard-syntax-table (cmpl-make-standard-completion-syntax-table)) |
56 | 560 |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
561 (defun cmpl-make-lisp-completion-syntax-table () |
56 | 562 (let ((table (copy-syntax-table cmpl-standard-syntax-table)) |
563 (symbol-chars '(?! ?& ?? ?= ?^)) | |
564 ) | |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
565 (completion-dolist (char symbol-chars) |
56 | 566 (modify-syntax-entry char "_" table)) |
567 table)) | |
568 | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
569 (defun cmpl-make-c-completion-syntax-table () |
56 | 570 (let ((table (copy-syntax-table cmpl-standard-syntax-table)) |
571 (separator-chars '(?+ ?* ?/ ?: ?%)) | |
572 ) | |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
573 (completion-dolist (char separator-chars) |
56 | 574 (modify-syntax-entry char " " table)) |
575 table)) | |
576 | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
577 (defun cmpl-make-fortran-completion-syntax-table () |
56 | 578 (let ((table (copy-syntax-table cmpl-standard-syntax-table)) |
579 (separator-chars '(?+ ?- ?* ?/ ?:)) | |
580 ) | |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
581 (completion-dolist (char separator-chars) |
56 | 582 (modify-syntax-entry char " " table)) |
583 table)) | |
584 | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
585 (defconst cmpl-lisp-syntax-table (cmpl-make-lisp-completion-syntax-table)) |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
586 (defconst cmpl-c-syntax-table (cmpl-make-c-completion-syntax-table)) |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
587 (defconst cmpl-fortran-syntax-table (cmpl-make-fortran-completion-syntax-table)) |
56 | 588 |
589 (defvar cmpl-syntax-table cmpl-standard-syntax-table | |
590 "This variable holds the current completion syntax table.") | |
591 (make-variable-buffer-local 'cmpl-syntax-table) | |
592 | |
14169 | 593 ;;----------------------------------------------- |
594 ;; Installing the appropriate mode tables | |
595 ;;----------------------------------------------- | |
56 | 596 |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
597 (add-hook 'lisp-mode-hook |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
598 '(lambda () |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
599 (setq cmpl-syntax-table cmpl-lisp-syntax-table))) |
56 | 600 |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
601 (add-hook 'c-mode-hook |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
602 '(lambda () |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
603 (setq cmpl-syntax-table cmpl-c-syntax-table))) |
56 | 604 |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
605 (add-hook 'fortran-mode-hook |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
606 '(lambda () |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
607 (setq cmpl-syntax-table cmpl-fortran-syntax-table) |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
608 (completion-setup-fortran-mode))) |
56 | 609 |
14169 | 610 ;;----------------------------------------------- |
611 ;; Symbol functions | |
612 ;;----------------------------------------------- | |
56 | 613 (defvar cmpl-symbol-start nil |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
614 "Holds first character of symbol, after any completion symbol function.") |
56 | 615 (defvar cmpl-symbol-end nil |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
616 "Holds last character of symbol, after any completion symbol function.") |
14169 | 617 ;; These are temp. vars. we use to avoid using let. |
618 ;; Why ? Small speed improvement. | |
56 | 619 (defvar cmpl-saved-syntax nil) |
620 (defvar cmpl-saved-point nil) | |
621 | |
622 (defun symbol-under-point () | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
623 "Returns the symbol that the point is currently on. |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
624 But only if it is longer than `completion-min-length'." |
56 | 625 (setq cmpl-saved-syntax (syntax-table)) |
13793
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
626 (unwind-protect |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
627 (progn |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
628 (set-syntax-table cmpl-syntax-table) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
629 (cond |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
630 ;; Cursor is on following-char and after preceding-char |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
631 ((memq (char-syntax (following-char)) '(?w ?_)) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
632 (setq cmpl-saved-point (point) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
633 cmpl-symbol-start (scan-sexps (1+ cmpl-saved-point) -1) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
634 cmpl-symbol-end (scan-sexps cmpl-saved-point 1)) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
635 ;; Remove chars to ignore at the start. |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
636 (cond ((= (char-syntax (char-after cmpl-symbol-start)) ?w) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
637 (goto-char cmpl-symbol-start) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
638 (forward-word 1) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
639 (setq cmpl-symbol-start (point)) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
640 (goto-char cmpl-saved-point) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
641 )) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
642 ;; Remove chars to ignore at the end. |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
643 (cond ((= (char-syntax (char-after (1- cmpl-symbol-end))) ?w) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
644 (goto-char cmpl-symbol-end) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
645 (forward-word -1) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
646 (setq cmpl-symbol-end (point)) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
647 (goto-char cmpl-saved-point) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
648 )) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
649 ;; Return completion if the length is reasonable. |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
650 (if (and (<= (cmpl-read-time-eval completion-min-length) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
651 (- cmpl-symbol-end cmpl-symbol-start)) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
652 (<= (- cmpl-symbol-end cmpl-symbol-start) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
653 (cmpl-read-time-eval completion-max-length))) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
654 (buffer-substring cmpl-symbol-start cmpl-symbol-end))))) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
655 (set-syntax-table cmpl-saved-syntax))) |
56 | 656 |
14169 | 657 ;; tests for symbol-under-point |
658 ;; `^' indicates cursor pos. where value is returned | |
659 ;; simple-word-test | |
660 ;; ^^^^^^^^^^^^^^^^ --> simple-word-test | |
661 ;; _harder_word_test_ | |
662 ;; ^^^^^^^^^^^^^^^^^^ --> harder_word_test | |
663 ;; .___.______. | |
664 ;; --> nil | |
665 ;; /foo/bar/quux.hello | |
666 ;; ^^^^^^^^^^^^^^^^^^^ --> /foo/bar/quux.hello | |
667 ;; | |
56 | 668 |
669 (defun symbol-before-point () | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
670 "Returns a string of the symbol immediately before point. |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
671 Returns nil if there isn't one longer than `completion-min-length'." |
56 | 672 ;; This is called when a word separator is typed so it must be FAST ! |
673 (setq cmpl-saved-syntax (syntax-table)) | |
13793
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
674 (unwind-protect |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
675 (progn |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
676 (set-syntax-table cmpl-syntax-table) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
677 ;; Cursor is on following-char and after preceding-char |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
678 (cond ((= (setq cmpl-preceding-syntax (char-syntax (preceding-char))) ?_) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
679 ;; Number of chars to ignore at end. |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
680 (setq cmpl-symbol-end (point) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
681 cmpl-symbol-start (scan-sexps cmpl-symbol-end -1) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
682 ) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
683 ;; Remove chars to ignore at the start. |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
684 (cond ((= (char-syntax (char-after cmpl-symbol-start)) ?w) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
685 (goto-char cmpl-symbol-start) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
686 (forward-word 1) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
687 (setq cmpl-symbol-start (point)) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
688 (goto-char cmpl-symbol-end) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
689 )) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
690 ;; Return value if long enough. |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
691 (if (>= cmpl-symbol-end |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
692 (+ cmpl-symbol-start |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
693 (cmpl-read-time-eval completion-min-length))) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
694 (buffer-substring cmpl-symbol-start cmpl-symbol-end)) |
56 | 695 ) |
13793
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
696 ((= cmpl-preceding-syntax ?w) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
697 ;; chars to ignore at end |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
698 (setq cmpl-saved-point (point) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
699 cmpl-symbol-start (scan-sexps cmpl-saved-point -1)) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
700 ;; take off chars. from end |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
701 (forward-word -1) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
702 (setq cmpl-symbol-end (point)) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
703 ;; remove chars to ignore at the start |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
704 (cond ((= (char-syntax (char-after cmpl-symbol-start)) ?w) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
705 (goto-char cmpl-symbol-start) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
706 (forward-word 1) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
707 (setq cmpl-symbol-start (point)) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
708 )) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
709 ;; Restore state. |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
710 (goto-char cmpl-saved-point) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
711 ;; Return completion if the length is reasonable |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
712 (if (and (<= (cmpl-read-time-eval completion-min-length) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
713 (- cmpl-symbol-end cmpl-symbol-start)) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
714 (<= (- cmpl-symbol-end cmpl-symbol-start) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
715 (cmpl-read-time-eval completion-max-length))) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
716 (buffer-substring cmpl-symbol-start cmpl-symbol-end))))) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
717 (set-syntax-table cmpl-saved-syntax))) |
56 | 718 |
14169 | 719 ;; tests for symbol-before-point |
720 ;; `^' indicates cursor pos. where value is returned | |
721 ;; simple-word-test | |
722 ;; ^ --> nil | |
723 ;; ^ --> nil | |
724 ;; ^ --> simple-w | |
725 ;; ^ --> simple-word-test | |
726 ;; _harder_word_test_ | |
727 ;; ^ --> harder_word_test | |
728 ;; ^ --> harder_word_test | |
729 ;; ^ --> harder | |
730 ;; .___.... | |
731 ;; --> nil | |
56 | 732 |
733 (defun symbol-under-or-before-point () | |
14169 | 734 ;; This could be made slightly faster but it is better to avoid |
735 ;; copying all the code. | |
736 ;; However, it is only used by the completion string prompter. | |
737 ;; If it comes into common use, it could be rewritten. | |
13793
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
738 (cond ((memq (progn |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
739 (setq cmpl-saved-syntax (syntax-table)) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
740 (unwind-protect |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
741 (progn |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
742 (set-syntax-table cmpl-syntax-table) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
743 (char-syntax (following-char))) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
744 (set-syntax-table cmpl-saved-syntax))) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
745 '(?w ?_)) |
56 | 746 (symbol-under-point)) |
747 (t | |
13793
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
748 (symbol-before-point)))) |
56 | 749 |
750 | |
751 (defun symbol-before-point-for-complete () | |
752 ;; "Returns a string of the symbol immediately before point | |
753 ;; or nil if there isn't one. Like symbol-before-point but doesn't trim the | |
754 ;; end chars." | |
755 ;; Cursor is on following-char and after preceding-char | |
756 (setq cmpl-saved-syntax (syntax-table)) | |
13793
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
757 (unwind-protect |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
758 (progn |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
759 (set-syntax-table cmpl-syntax-table) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
760 (cond ((memq (setq cmpl-preceding-syntax (char-syntax (preceding-char))) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
761 '(?_ ?w)) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
762 (setq cmpl-symbol-end (point) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
763 cmpl-symbol-start (scan-sexps cmpl-symbol-end -1) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
764 ) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
765 ;; Remove chars to ignore at the start. |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
766 (cond ((= (char-syntax (char-after cmpl-symbol-start)) ?w) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
767 (goto-char cmpl-symbol-start) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
768 (forward-word 1) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
769 (setq cmpl-symbol-start (point)) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
770 (goto-char cmpl-symbol-end) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
771 )) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
772 ;; Return completion if the length is reasonable. |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
773 (if (and (<= (cmpl-read-time-eval |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
774 completion-prefix-min-length) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
775 (- cmpl-symbol-end cmpl-symbol-start)) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
776 (<= (- cmpl-symbol-end cmpl-symbol-start) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
777 (cmpl-read-time-eval completion-max-length))) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
778 (buffer-substring cmpl-symbol-start cmpl-symbol-end))))) |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
779 ;; Restore syntax table. |
b51b78fa556e
(symbol-under-point, symbol-before-point)
Karl Heuer <kwzh@gnu.org>
parents:
13636
diff
changeset
|
780 (set-syntax-table cmpl-saved-syntax))) |
56 | 781 |
14169 | 782 ;; tests for symbol-before-point-for-complete |
783 ;; `^' indicates cursor pos. where value is returned | |
784 ;; simple-word-test | |
785 ;; ^ --> nil | |
786 ;; ^ --> nil | |
787 ;; ^ --> simple-w | |
788 ;; ^ --> simple-word-test | |
789 ;; _harder_word_test_ | |
790 ;; ^ --> harder_word_test | |
791 ;; ^ --> harder_word_test_ | |
792 ;; ^ --> harder_ | |
793 ;; .___.... | |
794 ;; --> nil | |
56 | 795 |
796 | |
797 | |
14169 | 798 ;;--------------------------------------------------------------------------- |
799 ;; Statistics Recording | |
800 ;;--------------------------------------------------------------------------- | |
56 | 801 |
14169 | 802 ;; Note that the guts of this has been turned off. The guts |
803 ;; are in completion-stats.el. | |
56 | 804 |
14169 | 805 ;;----------------------------------------------- |
806 ;; Conditionalizing code on *record-cmpl-statistics-p* | |
807 ;;----------------------------------------------- | |
808 ;; All statistics code outside this block should use this | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
809 (defmacro cmpl-statistics-block (&rest body)) |
14169 | 810 ;; "Only executes body if we are recording statistics." |
811 ;; (list 'cond | |
812 ;; (list* '*record-cmpl-statistics-p* body) | |
813 ;; )) | |
56 | 814 |
14169 | 815 ;;----------------------------------------------- |
816 ;; Completion Sources | |
817 ;;----------------------------------------------- | |
56 | 818 |
819 ;; ID numbers | |
820 (defconst cmpl-source-unknown 0) | |
821 (defconst cmpl-source-init-file 1) | |
822 (defconst cmpl-source-file-parsing 2) | |
823 (defconst cmpl-source-separator 3) | |
824 (defconst cmpl-source-cursor-moves 4) | |
825 (defconst cmpl-source-interactive 5) | |
826 (defconst cmpl-source-cdabbrev 6) | |
827 (defconst num-cmpl-sources 7) | |
828 (defvar current-completion-source cmpl-source-unknown) | |
829 | |
830 | |
831 | |
14169 | 832 ;;--------------------------------------------------------------------------- |
833 ;; Completion Method #2: dabbrev-expand style | |
834 ;;--------------------------------------------------------------------------- | |
835 ;; | |
836 ;; This method is used if there are no useful stored completions. It is | |
837 ;; based on dabbrev-expand with these differences : | |
838 ;; 1) Faster (we don't use regexps) | |
839 ;; 2) case coercion handled correctly | |
840 ;; This is called cdabbrev to differentiate it. | |
841 ;; We simply search backwards through the file looking for words which | |
842 ;; start with the same letters we are trying to complete. | |
843 ;; | |
56 | 844 |
845 (defvar cdabbrev-completions-tried nil) | |
14169 | 846 ;; "A list of all the cdabbrev completions since the last reset.") |
56 | 847 |
848 (defvar cdabbrev-current-point 0) | |
14169 | 849 ;; "The current point position the cdabbrev search is at.") |
56 | 850 |
851 (defvar cdabbrev-current-window nil) | |
14169 | 852 ;; "The current window we are looking for cdabbrevs in. T if looking in |
853 ;; (other-buffer), NIL if no more cdabbrevs.") | |
56 | 854 |
855 (defvar cdabbrev-wrapped-p nil) | |
14169 | 856 ;; "T if the cdabbrev search has wrapped around the file.") |
56 | 857 |
858 (defvar cdabbrev-abbrev-string "") | |
859 (defvar cdabbrev-start-point 0) | |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
860 (defvar cdabbrev-stop-point) |
56 | 861 |
14169 | 862 ;; Test strings for cdabbrev |
863 ;; cdat-upcase ;;same namestring | |
864 ;; CDAT-UPCASE ;;ok | |
865 ;; cdat2 ;;too short | |
866 ;; cdat-1-2-3-4 ;;ok | |
867 ;; a-cdat-1 ;;doesn't start correctly | |
868 ;; cdat-simple ;;ok | |
56 | 869 |
870 | |
871 (defun reset-cdabbrev (abbrev-string &optional initial-completions-tried) | |
872 "Resets the cdabbrev search to search for abbrev-string. | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
873 INITIAL-COMPLETIONS-TRIED is a list of downcased strings to ignore |
56 | 874 during the search." |
875 (setq cdabbrev-abbrev-string abbrev-string | |
876 cdabbrev-completions-tried | |
877 (cons (downcase abbrev-string) initial-completions-tried) | |
878 ) | |
879 (reset-cdabbrev-window t) | |
880 ) | |
881 | |
882 (defun set-cdabbrev-buffer () | |
883 ;; cdabbrev-current-window must not be NIL | |
884 (set-buffer (if (eq cdabbrev-current-window t) | |
885 (other-buffer) | |
886 (window-buffer cdabbrev-current-window))) | |
887 ) | |
888 | |
889 | |
890 (defun reset-cdabbrev-window (&optional initializep) | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
891 "Resets the cdabbrev search to search for abbrev-string." |
56 | 892 ;; Set the window |
893 (cond (initializep | |
894 (setq cdabbrev-current-window (selected-window)) | |
895 ) | |
896 ((eq cdabbrev-current-window t) | |
897 ;; Everything has failed | |
898 (setq cdabbrev-current-window nil)) | |
899 (cdabbrev-current-window | |
900 (setq cdabbrev-current-window (next-window cdabbrev-current-window)) | |
901 (if (eq cdabbrev-current-window (selected-window)) | |
902 ;; No more windows, try other buffer. | |
903 (setq cdabbrev-current-window t))) | |
904 ) | |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
905 (if cdabbrev-current-window |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
906 (save-excursion |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
907 (set-cdabbrev-buffer) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
908 (setq cdabbrev-current-point (point) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
909 cdabbrev-start-point cdabbrev-current-point |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
910 cdabbrev-stop-point |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
911 (if completion-search-distance |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
912 (max (point-min) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
913 (- cdabbrev-start-point completion-search-distance)) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
914 (point-min)) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
915 cdabbrev-wrapped-p nil) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
916 ))) |
56 | 917 |
918 (defun next-cdabbrev () | |
919 "Return the next possible cdabbrev expansion or nil if there isn't one. | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
920 `reset-cdabbrev' must've been called already. |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
921 This is sensitive to `case-fold-search'." |
56 | 922 ;; note that case-fold-search affects the behavior of this function |
923 ;; Bug: won't pick up an expansion that starts at the top of buffer | |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
924 (if cdabbrev-current-window |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
925 (let (saved-point |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
926 saved-syntax |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
927 (expansion nil) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
928 downcase-expansion tried-list syntax saved-point-2) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
929 (save-excursion |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
930 (unwind-protect |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
931 (progn |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
932 ;; Switch to current completion buffer |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
933 (set-cdabbrev-buffer) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
934 ;; Save current buffer state |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
935 (setq saved-point (point) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
936 saved-syntax (syntax-table)) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
937 ;; Restore completion state |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
938 (set-syntax-table cmpl-syntax-table) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
939 (goto-char cdabbrev-current-point) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
940 ;; Loop looking for completions |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
941 (while |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
942 ;; This code returns t if it should loop again |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
943 (cond |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
944 (;; search for the string |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
945 (search-backward cdabbrev-abbrev-string cdabbrev-stop-point t) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
946 ;; return nil if the completion is valid |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
947 (not |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
948 (and |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
949 ;; does it start with a separator char ? |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
950 (or (= (setq syntax (char-syntax (preceding-char))) ? ) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
951 (and (= syntax ?w) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
952 ;; symbol char to ignore at end. Are we at end ? |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
953 (progn |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
954 (setq saved-point-2 (point)) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
955 (forward-word -1) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
956 (prog1 |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
957 (= (char-syntax (preceding-char)) ? ) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
958 (goto-char saved-point-2) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
959 )))) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
960 ;; is the symbol long enough ? |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
961 (setq expansion (symbol-under-point)) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
962 ;; have we not tried this one before |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
963 (progn |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
964 ;; See if we've already used it |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
965 (setq tried-list cdabbrev-completions-tried |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
966 downcase-expansion (downcase expansion)) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
967 (while (and tried-list |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
968 (not (string-equal downcase-expansion |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
969 (car tried-list)))) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
970 ;; Already tried, don't choose this one |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
971 (setq tried-list (cdr tried-list)) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
972 ) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
973 ;; at this point tried-list will be nil if this |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
974 ;; expansion has not yet been tried |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
975 (if tried-list |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
976 (setq expansion nil) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
977 t) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
978 )))) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
979 ;; search failed |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
980 (cdabbrev-wrapped-p |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
981 ;; If already wrapped, then we've failed completely |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
982 nil) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
983 (t |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
984 ;; need to wrap |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
985 (goto-char (setq cdabbrev-current-point |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
986 (if completion-search-distance |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
987 (min (point-max) (+ cdabbrev-start-point completion-search-distance)) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
988 (point-max)))) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
989 |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
990 (setq cdabbrev-wrapped-p t)) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
991 )) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
992 ;; end of while loop |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
993 (cond (expansion |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
994 ;; successful |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
995 (setq cdabbrev-completions-tried |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
996 (cons downcase-expansion cdabbrev-completions-tried) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
997 cdabbrev-current-point (point)))) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
998 ) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
999 (set-syntax-table saved-syntax) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1000 (goto-char saved-point) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1001 )) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1002 ;; If no expansion, go to next window |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1003 (cond (expansion) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1004 (t (reset-cdabbrev-window) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1005 (next-cdabbrev)))))) |
56 | 1006 |
14169 | 1007 ;; The following must be eval'd in the minibuffer :: |
1008 ;; (reset-cdabbrev "cdat") | |
1009 ;; (next-cdabbrev) --> "cdat-simple" | |
1010 ;; (next-cdabbrev) --> "cdat-1-2-3-4" | |
1011 ;; (next-cdabbrev) --> "CDAT-UPCASE" | |
1012 ;; (next-cdabbrev) --> "cdat-wrapping" | |
1013 ;; (next-cdabbrev) --> "cdat_start_sym" | |
1014 ;; (next-cdabbrev) --> nil | |
1015 ;; (next-cdabbrev) --> nil | |
1016 ;; (next-cdabbrev) --> nil | |
56 | 1017 |
14169 | 1018 ;; _cdat_start_sym |
1019 ;; cdat-wrapping | |
56 | 1020 |
1021 | |
14169 | 1022 ;;--------------------------------------------------------------------------- |
1023 ;; Completion Database | |
1024 ;;--------------------------------------------------------------------------- | |
56 | 1025 |
14169 | 1026 ;; We use two storage modes for the two search types :: |
1027 ;; 1) Prefix {cmpl-prefix-obarray} for looking up possible completions | |
1028 ;; Used by search-completion-next | |
1029 ;; the value of the symbol is nil or a cons of head and tail pointers | |
1030 ;; 2) Interning {cmpl-obarray} to see if it's in the database | |
1031 ;; Used by find-exact-completion, completion-in-database-p | |
1032 ;; The value of the symbol is the completion entry | |
56 | 1033 |
14169 | 1034 ;; bad things may happen if this length is changed due to the way |
1035 ;; GNU implements obarrays | |
56 | 1036 (defconst cmpl-obarray-length 511) |
1037 | |
1038 (defvar cmpl-prefix-obarray (make-vector cmpl-obarray-length 0) | |
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3186
diff
changeset
|
1039 "An obarray used to store the downcased completion prefixes. |
56 | 1040 Each symbol is bound to a list of completion entries.") |
1041 | |
1042 (defvar cmpl-obarray (make-vector cmpl-obarray-length 0) | |
1043 "An obarray used to store the downcased completions. | |
1044 Each symbol is bound to a single completion entry.") | |
1045 | |
14169 | 1046 ;;----------------------------------------------- |
1047 ;; Completion Entry Structure Definition | |
1048 ;;----------------------------------------------- | |
56 | 1049 |
14169 | 1050 ;; A completion entry is a LIST of string, prefix-symbol num-uses, and |
1051 ;; last-use-time (the time the completion was last used) | |
1052 ;; last-use-time is T if the string should be kept permanently | |
1053 ;; num-uses is incremented every time the completion is used. | |
56 | 1054 |
14169 | 1055 ;; We chose lists because (car foo) is faster than (aref foo 0) and the |
1056 ;; creation time is about the same. | |
56 | 1057 |
14169 | 1058 ;; READER MACROS |
56 | 1059 |
1060 (defmacro completion-string (completion-entry) | |
1061 (list 'car completion-entry)) | |
1062 | |
1063 (defmacro completion-num-uses (completion-entry) | |
1064 ;; "The number of times it has used. Used to decide whether to save | |
1065 ;; it." | |
1066 (list 'car (list 'cdr completion-entry))) | |
1067 | |
1068 (defmacro completion-last-use-time (completion-entry) | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1069 ;; "The time it was last used. In hours since origin. Used to decide |
56 | 1070 ;; whether to save it. T if one should always save it." |
1071 (list 'nth 2 completion-entry)) | |
1072 | |
1073 (defmacro completion-source (completion-entry) | |
1074 (list 'nth 3 completion-entry)) | |
1075 | |
14169 | 1076 ;; WRITER MACROS |
56 | 1077 (defmacro set-completion-string (completion-entry string) |
1078 (list 'setcar completion-entry string)) | |
1079 | |
1080 (defmacro set-completion-num-uses (completion-entry num-uses) | |
1081 (list 'setcar (list 'cdr completion-entry) num-uses)) | |
1082 | |
1083 (defmacro set-completion-last-use-time (completion-entry last-use-time) | |
1084 (list 'setcar (list 'cdr (list 'cdr completion-entry)) last-use-time)) | |
1085 | |
14169 | 1086 ;; CONSTRUCTOR |
56 | 1087 (defun make-completion (string) |
1088 "Returns a list of a completion entry." | |
1089 (list (list string 0 nil current-completion-source))) | |
1090 | |
1091 ;; Obsolete | |
1092 ;;(defmacro cmpl-prefix-entry-symbol (completion-entry) | |
1093 ;; (list 'car (list 'cdr completion-entry))) | |
1094 | |
1095 | |
1096 | |
14169 | 1097 ;;----------------------------------------------- |
1098 ;; Prefix symbol entry definition | |
1099 ;;----------------------------------------------- | |
1100 ;; A cons of (head . tail) | |
56 | 1101 |
14169 | 1102 ;; READER Macros |
56 | 1103 |
1104 (defmacro cmpl-prefix-entry-head (prefix-entry) | |
1105 (list 'car prefix-entry)) | |
1106 | |
1107 (defmacro cmpl-prefix-entry-tail (prefix-entry) | |
1108 (list 'cdr prefix-entry)) | |
1109 | |
14169 | 1110 ;; WRITER Macros |
56 | 1111 |
1112 (defmacro set-cmpl-prefix-entry-head (prefix-entry new-head) | |
1113 (list 'setcar prefix-entry new-head)) | |
1114 | |
1115 (defmacro set-cmpl-prefix-entry-tail (prefix-entry new-tail) | |
1116 (list 'setcdr prefix-entry new-tail)) | |
1117 | |
14169 | 1118 ;; Constructor |
56 | 1119 |
1120 (defun make-cmpl-prefix-entry (completion-entry-list) | |
1121 "Makes a new prefix entry containing only completion-entry." | |
1122 (cons completion-entry-list completion-entry-list)) | |
1123 | |
14169 | 1124 ;;----------------------------------------------- |
1125 ;; Completion Database - Utilities | |
1126 ;;----------------------------------------------- | |
56 | 1127 |
1128 (defun clear-all-completions () | |
1129 "Initializes the completion storage. All existing completions are lost." | |
1130 (interactive) | |
1131 (setq cmpl-prefix-obarray (make-vector cmpl-obarray-length 0)) | |
1132 (setq cmpl-obarray (make-vector cmpl-obarray-length 0)) | |
1133 (cmpl-statistics-block | |
1134 (record-clear-all-completions)) | |
1135 ) | |
1136 | |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1137 (defvar completions-list-return-value) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1138 |
56 | 1139 (defun list-all-completions () |
1140 "Returns a list of all the known completion entries." | |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1141 (let ((completions-list-return-value nil)) |
56 | 1142 (mapatoms 'list-all-completions-1 cmpl-prefix-obarray) |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1143 completions-list-return-value)) |
56 | 1144 |
1145 (defun list-all-completions-1 (prefix-symbol) | |
1146 (if (boundp prefix-symbol) | |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1147 (setq completions-list-return-value |
56 | 1148 (append (cmpl-prefix-entry-head (symbol-value prefix-symbol)) |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1149 completions-list-return-value)))) |
56 | 1150 |
1151 (defun list-all-completions-by-hash-bucket () | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1152 "Return list of lists of known completion entries, organized by hash bucket." |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1153 (let ((completions-list-return-value nil)) |
56 | 1154 (mapatoms 'list-all-completions-by-hash-bucket-1 cmpl-prefix-obarray) |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1155 completions-list-return-value)) |
56 | 1156 |
1157 (defun list-all-completions-by-hash-bucket-1 (prefix-symbol) | |
1158 (if (boundp prefix-symbol) | |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1159 (setq completions-list-return-value |
56 | 1160 (cons (cmpl-prefix-entry-head (symbol-value prefix-symbol)) |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1161 completions-list-return-value)))) |
56 | 1162 |
1163 | |
14169 | 1164 ;;----------------------------------------------- |
1165 ;; Updating the database | |
1166 ;;----------------------------------------------- | |
1167 ;; | |
1168 ;; These are the internal functions used to update the datebase | |
1169 ;; | |
1170 ;; | |
56 | 1171 (defvar completion-to-accept nil) |
1172 ;;"Set to a string that is pending its acceptance." | |
1173 ;; this checked by the top level reading functions | |
1174 | |
1175 (defvar cmpl-db-downcase-string nil) | |
1176 ;; "Setup by find-exact-completion, etc. The given string, downcased." | |
1177 (defvar cmpl-db-symbol nil) | |
1178 ;; "The interned symbol corresponding to cmpl-db-downcase-string. | |
1179 ;; Set up by cmpl-db-symbol." | |
1180 (defvar cmpl-db-prefix-symbol nil) | |
1181 ;; "The interned prefix symbol corresponding to cmpl-db-downcase-string." | |
1182 (defvar cmpl-db-entry nil) | |
1183 (defvar cmpl-db-debug-p nil | |
1184 "Set to T if you want to debug the database.") | |
1185 | |
14169 | 1186 ;; READS |
56 | 1187 (defun find-exact-completion (string) |
1188 "Returns the completion entry for string or nil. | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1189 Sets up `cmpl-db-downcase-string' and `cmpl-db-symbol'." |
56 | 1190 (and (boundp (setq cmpl-db-symbol |
1191 (intern (setq cmpl-db-downcase-string (downcase string)) | |
1192 cmpl-obarray))) | |
1193 (symbol-value cmpl-db-symbol) | |
1194 )) | |
1195 | |
1196 (defun find-cmpl-prefix-entry (prefix-string) | |
1356 | 1197 "Returns the prefix entry for string. |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1198 Sets `cmpl-db-prefix-symbol'. |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1199 Prefix-string must be exactly `completion-prefix-min-length' long |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1200 and downcased. Sets up `cmpl-db-prefix-symbol'." |
56 | 1201 (and (boundp (setq cmpl-db-prefix-symbol |
1202 (intern prefix-string cmpl-prefix-obarray))) | |
1203 (symbol-value cmpl-db-prefix-symbol))) | |
1204 | |
1205 (defvar inside-locate-completion-entry nil) | |
1206 ;; used to trap lossage in silent error correction | |
1207 | |
1208 (defun locate-completion-entry (completion-entry prefix-entry) | |
1356 | 1209 "Locates the completion entry. |
1210 Returns a pointer to the element before the completion entry or nil if | |
1211 the completion entry is at the head. | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1212 Must be called after `find-exact-completion'." |
56 | 1213 (let ((prefix-list (cmpl-prefix-entry-head prefix-entry)) |
1214 next-prefix-list | |
1215 ) | |
1216 (cond | |
1217 ((not (eq (car prefix-list) completion-entry)) | |
1218 ;; not already at head | |
1219 (while (and prefix-list | |
1220 (not (eq completion-entry | |
1221 (car (setq next-prefix-list (cdr prefix-list))) | |
1222 ))) | |
1223 (setq prefix-list next-prefix-list)) | |
1224 (cond (;; found | |
1225 prefix-list) | |
1226 ;; Didn't find it. Database is messed up. | |
1227 (cmpl-db-debug-p | |
1228 ;; not found, error if debug mode | |
1229 (error "Completion entry exists but not on prefix list - %s" | |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1230 completion-string)) |
56 | 1231 (inside-locate-completion-entry |
1232 ;; recursive error: really scrod | |
1233 (locate-completion-db-error)) | |
1234 (t | |
1235 ;; Patch out | |
1236 (set cmpl-db-symbol nil) | |
1237 ;; Retry | |
1238 (locate-completion-entry-retry completion-entry) | |
1239 )))))) | |
1240 | |
1241 (defun locate-completion-entry-retry (old-entry) | |
1242 (let ((inside-locate-completion-entry t)) | |
1243 (add-completion (completion-string old-entry) | |
1244 (completion-num-uses old-entry) | |
1245 (completion-last-use-time old-entry)) | |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1246 (let* ((cmpl-entry (find-exact-completion (completion-string old-entry))) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1247 (pref-entry |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1248 (if cmpl-entry |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1249 (find-cmpl-prefix-entry |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1250 (substring cmpl-db-downcase-string |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1251 0 completion-prefix-min-length)))) |
56 | 1252 ) |
1253 (if (and cmpl-entry pref-entry) | |
1254 ;; try again | |
1255 (locate-completion-entry cmpl-entry pref-entry) | |
1256 ;; still losing | |
1257 (locate-completion-db-error)) | |
1258 ))) | |
1259 | |
1260 (defun locate-completion-db-error () | |
1261 ;; recursive error: really scrod | |
1262 (error "Completion database corrupted. Try M-x clear-all-completions. Send bug report.") | |
1263 ) | |
1264 | |
14169 | 1265 ;; WRITES |
56 | 1266 (defun add-completion-to-tail-if-new (string) |
1356 | 1267 "If STRING is not in the database add it to appropriate prefix list. |
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3186
diff
changeset
|
1268 STRING is added to the end of the appropriate prefix list with |
1356 | 1269 num-uses = 0. The database is unchanged if it is there. STRING must be |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1270 longer than `completion-prefix-min-length'. |
56 | 1271 This must be very fast. |
1272 Returns the completion entry." | |
1273 (or (find-exact-completion string) | |
1274 ;; not there | |
1275 (let (;; create an entry | |
1276 (entry (make-completion string)) | |
1277 ;; setup the prefix | |
1278 (prefix-entry (find-cmpl-prefix-entry | |
1279 (substring cmpl-db-downcase-string 0 | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1280 (cmpl-read-time-eval |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1281 completion-prefix-min-length)))) |
56 | 1282 ) |
1283 ;; The next two forms should happen as a unit (atomically) but | |
1284 ;; no fatal errors should result if that is not the case. | |
1285 (cond (prefix-entry | |
1286 ;; These two should be atomic, but nothing fatal will happen | |
1287 ;; if they're not. | |
1288 (setcdr (cmpl-prefix-entry-tail prefix-entry) entry) | |
1289 (set-cmpl-prefix-entry-tail prefix-entry entry)) | |
1290 (t | |
1291 (set cmpl-db-prefix-symbol (make-cmpl-prefix-entry entry)) | |
1292 )) | |
1293 ;; statistics | |
1294 (cmpl-statistics-block | |
1295 (note-added-completion)) | |
1296 ;; set symbol | |
1297 (set cmpl-db-symbol (car entry)) | |
1298 ))) | |
1299 | |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1300 (defun add-completion-to-head (completion-string) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1301 "If COMPLETION-STRING is not in the database, add it to prefix list. |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1302 We add COMPLETION-STRING to the head of the appropriate prefix list, |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1303 or it to the head of the list. |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1304 COMPLETION-STRING must be longer than `completion-prefix-min-length'. |
56 | 1305 Updates the saved string with the supplied string. |
1306 This must be very fast. | |
1307 Returns the completion entry." | |
1308 ;; Handle pending acceptance | |
1309 (if completion-to-accept (accept-completion)) | |
1310 ;; test if already in database | |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1311 (if (setq cmpl-db-entry (find-exact-completion completion-string)) |
56 | 1312 ;; found |
1313 (let* ((prefix-entry (find-cmpl-prefix-entry | |
1314 (substring cmpl-db-downcase-string 0 | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1315 (cmpl-read-time-eval |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1316 completion-prefix-min-length)))) |
56 | 1317 (splice-ptr (locate-completion-entry cmpl-db-entry prefix-entry)) |
1318 (cmpl-ptr (cdr splice-ptr)) | |
1319 ) | |
1320 ;; update entry | |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1321 (set-completion-string cmpl-db-entry completion-string) |
56 | 1322 ;; move to head (if necessary) |
1323 (cond (splice-ptr | |
1324 ;; These should all execute atomically but it is not fatal if | |
1325 ;; they don't. | |
1326 ;; splice it out | |
1327 (or (setcdr splice-ptr (cdr cmpl-ptr)) | |
1328 ;; fix up tail if necessary | |
1329 (set-cmpl-prefix-entry-tail prefix-entry splice-ptr)) | |
1330 ;; splice in at head | |
1331 (setcdr cmpl-ptr (cmpl-prefix-entry-head prefix-entry)) | |
1332 (set-cmpl-prefix-entry-head prefix-entry cmpl-ptr) | |
1333 )) | |
1334 cmpl-db-entry) | |
1335 ;; not there | |
1336 (let (;; create an entry | |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1337 (entry (make-completion completion-string)) |
56 | 1338 ;; setup the prefix |
1339 (prefix-entry (find-cmpl-prefix-entry | |
1340 (substring cmpl-db-downcase-string 0 | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1341 (cmpl-read-time-eval |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1342 completion-prefix-min-length)))) |
56 | 1343 ) |
1344 (cond (prefix-entry | |
1345 ;; Splice in at head | |
1346 (setcdr entry (cmpl-prefix-entry-head prefix-entry)) | |
1347 (set-cmpl-prefix-entry-head prefix-entry entry)) | |
1348 (t | |
1349 ;; Start new prefix entry | |
1350 (set cmpl-db-prefix-symbol (make-cmpl-prefix-entry entry)) | |
1351 )) | |
1352 ;; statistics | |
1353 (cmpl-statistics-block | |
1354 (note-added-completion)) | |
1355 ;; Add it to the symbol | |
1356 (set cmpl-db-symbol (car entry)) | |
1357 ))) | |
1358 | |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1359 (defun delete-completion (completion-string) |
1356 | 1360 "Deletes the completion from the database. |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1361 String must be longer than `completion-prefix-min-length'." |
56 | 1362 ;; Handle pending acceptance |
1363 (if completion-to-accept (accept-completion)) | |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1364 (if (setq cmpl-db-entry (find-exact-completion completion-string)) |
56 | 1365 ;; found |
1366 (let* ((prefix-entry (find-cmpl-prefix-entry | |
1367 (substring cmpl-db-downcase-string 0 | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1368 (cmpl-read-time-eval |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1369 completion-prefix-min-length)))) |
56 | 1370 (splice-ptr (locate-completion-entry cmpl-db-entry prefix-entry)) |
1371 ) | |
1372 ;; delete symbol reference | |
1373 (set cmpl-db-symbol nil) | |
1374 ;; remove from prefix list | |
1375 (cond (splice-ptr | |
1376 ;; not at head | |
1377 (or (setcdr splice-ptr (cdr (cdr splice-ptr))) | |
1378 ;; fix up tail if necessary | |
1379 (set-cmpl-prefix-entry-tail prefix-entry splice-ptr)) | |
1380 ) | |
1381 (t | |
1382 ;; at head | |
1383 (or (set-cmpl-prefix-entry-head | |
1384 prefix-entry (cdr (cmpl-prefix-entry-head prefix-entry))) | |
1385 ;; List is now empty | |
1386 (set cmpl-db-prefix-symbol nil)) | |
1387 )) | |
1388 (cmpl-statistics-block | |
1389 (note-completion-deleted)) | |
1390 ) | |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1391 (error "Unknown completion `%s'" completion-string) |
56 | 1392 )) |
1393 | |
14169 | 1394 ;; Tests -- |
1395 ;; - Add and Find - | |
1396 ;; (add-completion-to-head "banana") --> ("banana" 0 nil 0) | |
1397 ;; (find-exact-completion "banana") --> ("banana" 0 nil 0) | |
1398 ;; (find-exact-completion "bana") --> nil | |
1399 ;; (car (find-cmpl-prefix-entry "ban")) --> (("banana" ...)) | |
1400 ;; (cdr (find-cmpl-prefix-entry "ban")) --> (("banana" ...)) | |
1401 ;; (add-completion-to-head "banish") --> ("banish" 0 nil 0) | |
1402 ;; (find-exact-completion "banish") --> ("banish" 0 nil 0) | |
1403 ;; (car (find-cmpl-prefix-entry "ban")) --> (("banish" ...) ("banana" ...)) | |
1404 ;; (cdr (find-cmpl-prefix-entry "ban")) --> (("banana" ...)) | |
1405 ;; (add-completion-to-head "banana") --> ("banana" 0 nil 0) | |
1406 ;; (car (find-cmpl-prefix-entry "ban")) --> (("banana" ...) ("banish" ...)) | |
1407 ;; (cdr (find-cmpl-prefix-entry "ban")) --> (("banish" ...)) | |
1408 ;; | |
1409 ;; - Deleting - | |
1410 ;; (add-completion-to-head "banner") --> ("banner" 0 nil 0) | |
1411 ;; (delete-completion "banner") | |
1412 ;; (find-exact-completion "banner") --> nil | |
1413 ;; (car (find-cmpl-prefix-entry "ban")) --> (("banana" ...) ("banish" ...)) | |
1414 ;; (cdr (find-cmpl-prefix-entry "ban")) --> (("banish" ...)) | |
1415 ;; (add-completion-to-head "banner") --> ("banner" 0 nil 0) | |
1416 ;; (delete-completion "banana") | |
1417 ;; (car (find-cmpl-prefix-entry "ban")) --> (("banner" ...) ("banish" ...)) | |
1418 ;; (cdr (find-cmpl-prefix-entry "ban")) --> (("banish" ...)) | |
1419 ;; (delete-completion "banner") | |
1420 ;; (delete-completion "banish") | |
1421 ;; (find-cmpl-prefix-entry "ban") --> nil | |
1422 ;; (delete-completion "banner") --> error | |
1423 ;; | |
1424 ;; - Tail - | |
1425 ;; (add-completion-to-tail-if-new "banana") --> ("banana" 0 nil 0) | |
1426 ;; (car (find-cmpl-prefix-entry "ban")) --> (("banana" ...)) | |
1427 ;; (cdr (find-cmpl-prefix-entry "ban")) --> (("banana" ...)) | |
1428 ;; (add-completion-to-tail-if-new "banish") --> ("banish" 0 nil 0) | |
1429 ;; (car (find-cmpl-prefix-entry "ban")) -->(("banana" ...) ("banish" ...)) | |
1430 ;; (cdr (find-cmpl-prefix-entry "ban")) -->(("banish" ...)) | |
1431 ;; | |
56 | 1432 |
1433 | |
14169 | 1434 ;;--------------------------------------------------------------------------- |
1435 ;; Database Update :: Interface level routines | |
1436 ;;--------------------------------------------------------------------------- | |
1437 ;; | |
1438 ;; These lie on top of the database ref. functions but below the standard | |
1439 ;; user interface level | |
56 | 1440 |
1441 | |
1442 (defun interactive-completion-string-reader (prompt) | |
1443 (let* ((default (symbol-under-or-before-point)) | |
1444 (new-prompt | |
1445 (if default | |
1446 (format "%s: (default: %s) " prompt default) | |
1447 (format "%s: " prompt)) | |
1448 ) | |
1449 (read (completing-read new-prompt cmpl-obarray)) | |
1450 ) | |
1451 (if (zerop (length read)) (setq read (or default ""))) | |
1452 (list read) | |
1453 )) | |
1454 | |
1455 (defun check-completion-length (string) | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1456 (if (< (length string) completion-min-length) |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1457 (error "The string `%s' is too short to be saved as a completion" |
56 | 1458 string) |
1459 (list string))) | |
1460 | |
1461 (defun add-completion (string &optional num-uses last-use-time) | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1462 "Add STRING to completion list, or move it to head of list. |
56 | 1463 The completion is altered appropriately if num-uses and/or last-use-time is |
1464 specified." | |
1465 (interactive (interactive-completion-string-reader "Completion to add")) | |
1466 (check-completion-length string) | |
1467 (let* ((current-completion-source (if (interactive-p) | |
1468 cmpl-source-interactive | |
1469 current-completion-source)) | |
1470 (entry (add-completion-to-head string))) | |
1471 | |
1472 (if num-uses (set-completion-num-uses entry num-uses)) | |
1473 (if last-use-time | |
1474 (set-completion-last-use-time entry last-use-time)) | |
1475 )) | |
1476 | |
1477 (defun add-permanent-completion (string) | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1478 "Add STRING if it isn't already listed, and mark it permanent." |
56 | 1479 (interactive |
1480 (interactive-completion-string-reader "Completion to add permanently")) | |
1481 (let ((current-completion-source (if (interactive-p) | |
1482 cmpl-source-interactive | |
1483 current-completion-source)) | |
1484 ) | |
1485 (add-completion string nil t) | |
1486 )) | |
1487 | |
1488 (defun kill-completion (string) | |
1489 (interactive (interactive-completion-string-reader "Completion to kill")) | |
1490 (check-completion-length string) | |
1491 (delete-completion string) | |
1492 ) | |
1493 | |
1494 (defun accept-completion () | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1495 "Accepts the pending completion in `completion-to-accept'. |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1496 This bumps num-uses. Called by `add-completion-to-head' and |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1497 `completion-search-reset'." |
56 | 1498 (let ((string completion-to-accept) |
1499 ;; if this is added afresh here, then it must be a cdabbrev | |
1500 (current-completion-source cmpl-source-cdabbrev) | |
1501 entry | |
1502 ) | |
1503 (setq completion-to-accept nil) | |
1504 (setq entry (add-completion-to-head string)) | |
1505 (set-completion-num-uses entry (1+ (completion-num-uses entry))) | |
1506 (setq cmpl-completions-accepted-p t) | |
1507 )) | |
1508 | |
1509 (defun use-completion-under-point () | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1510 "Add the completion symbol underneath the point into the completion buffer." |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1511 (let ((string (and enable-completion (symbol-under-point))) |
56 | 1512 (current-completion-source cmpl-source-cursor-moves)) |
1513 (if string (add-completion-to-head string)))) | |
1514 | |
1515 (defun use-completion-before-point () | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1516 "Add the completion symbol before point into the completion buffer." |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1517 (let ((string (and enable-completion (symbol-before-point))) |
56 | 1518 (current-completion-source cmpl-source-cursor-moves)) |
1519 (if string (add-completion-to-head string)))) | |
1520 | |
1521 (defun use-completion-under-or-before-point () | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1522 "Add the completion symbol before point into the completion buffer." |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1523 (let ((string (and enable-completion (symbol-under-or-before-point))) |
56 | 1524 (current-completion-source cmpl-source-cursor-moves)) |
1525 (if string (add-completion-to-head string)))) | |
1526 | |
1527 (defun use-completion-before-separator () | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1528 "Add the completion symbol before point into the completion buffer. |
1356 | 1529 Completions added this way will automatically be saved if |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1530 `completion-on-separator-character' is non-nil." |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1531 (let ((string (and enable-completion (symbol-before-point))) |
56 | 1532 (current-completion-source cmpl-source-separator) |
1533 entry) | |
1534 (cmpl-statistics-block | |
1535 (note-separator-character string) | |
1536 ) | |
1537 (cond (string | |
1538 (setq entry (add-completion-to-head string)) | |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1539 (if (and completion-on-separator-character |
56 | 1540 (zerop (completion-num-uses entry))) |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1541 (progn |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1542 (set-completion-num-uses entry 1) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1543 (setq cmpl-completions-accepted-p t))))) |
56 | 1544 )) |
1545 | |
14169 | 1546 ;; Tests -- |
1547 ;; - Add and Find - | |
1548 ;; (add-completion "banana" 5 10) | |
1549 ;; (find-exact-completion "banana") --> ("banana" 5 10 0) | |
1550 ;; (add-completion "banana" 6) | |
1551 ;; (find-exact-completion "banana") --> ("banana" 6 10 0) | |
1552 ;; (add-completion "banish") | |
1553 ;; (car (find-cmpl-prefix-entry "ban")) --> (("banish" ...) ("banana" ...)) | |
1554 ;; | |
1555 ;; - Accepting - | |
1556 ;; (setq completion-to-accept "banana") | |
1557 ;; (accept-completion) | |
1558 ;; (find-exact-completion "banana") --> ("banana" 7 10) | |
1559 ;; (car (find-cmpl-prefix-entry "ban")) --> (("banana" ...) ("banish" ...)) | |
1560 ;; (setq completion-to-accept "banish") | |
1561 ;; (add-completion "banner") | |
1562 ;; (car (find-cmpl-prefix-entry "ban")) | |
1563 ;; --> (("banner" ...) ("banish" 1 ...) ("banana" 7 ...)) | |
1564 ;; | |
1565 ;; - Deleting - | |
1566 ;; (kill-completion "banish") | |
1567 ;; (car (find-cmpl-prefix-entry "ban")) --> (("banner" ...) ("banana" ...)) | |
56 | 1568 |
1569 | |
14169 | 1570 ;;--------------------------------------------------------------------------- |
1571 ;; Searching the database | |
1572 ;;--------------------------------------------------------------------------- | |
1573 ;; Functions outside this block must call completion-search-reset followed | |
1574 ;; by calls to completion-search-next or completion-search-peek | |
1575 ;; | |
56 | 1576 |
14169 | 1577 ;; Status variables |
56 | 1578 ;; Commented out to improve loading speed |
1579 (defvar cmpl-test-string "") | |
1580 ;; "The current string used by completion-search-next." | |
1581 (defvar cmpl-test-regexp "") | |
1582 ;; "The current regexp used by completion-search-next. | |
1583 ;; (derived from cmpl-test-string)" | |
1584 (defvar cmpl-last-index 0) | |
1585 ;; "The last index that completion-search-next was called with." | |
1586 (defvar cmpl-cdabbrev-reset-p nil) | |
1587 ;; "Set to t when cdabbrevs have been reset." | |
1588 (defvar cmpl-next-possibilities nil) | |
1589 ;; "A pointer to the element BEFORE the next set of possible completions. | |
1590 ;; cadr of this is the cmpl-next-possibility" | |
1591 (defvar cmpl-starting-possibilities nil) | |
1592 ;; "The initial list of starting possibilities." | |
1593 (defvar cmpl-next-possibility nil) | |
1594 ;; "The cached next possibility." | |
1595 (defvar cmpl-tried-list nil) | |
1596 ;; "A downcased list of all the completions we have tried." | |
1597 | |
1598 | |
1599 (defun completion-search-reset (string) | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1600 "Set up the for completion searching for STRING. |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1601 STRING must be longer than `completion-prefix-min-length'." |
56 | 1602 (if completion-to-accept (accept-completion)) |
1603 (setq cmpl-starting-possibilities | |
1604 (cmpl-prefix-entry-head | |
4435
4ad99dc50f6f
(cmpl-read-time-eval): Make it no-op.
Richard M. Stallman <rms@gnu.org>
parents:
4434
diff
changeset
|
1605 (find-cmpl-prefix-entry |
4ad99dc50f6f
(cmpl-read-time-eval): Make it no-op.
Richard M. Stallman <rms@gnu.org>
parents:
4434
diff
changeset
|
1606 (downcase (substring string 0 completion-prefix-min-length)))) |
56 | 1607 cmpl-test-string string |
1608 cmpl-test-regexp (concat (regexp-quote string) ".")) | |
1609 (completion-search-reset-1) | |
1610 ) | |
1611 | |
1612 (defun completion-search-reset-1 () | |
1613 (setq cmpl-next-possibilities cmpl-starting-possibilities | |
1614 cmpl-next-possibility nil | |
1615 cmpl-cdabbrev-reset-p nil | |
1616 cmpl-last-index -1 | |
1617 cmpl-tried-list nil | |
1618 )) | |
1619 | |
1620 (defun completion-search-next (index) | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1621 "Return the next completion entry. |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1622 If INDEX is out of sequence, reset and start from the top. |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1623 If there are no more entries, try cdabbrev and returns only a string." |
56 | 1624 (cond |
1625 ((= index (setq cmpl-last-index (1+ cmpl-last-index))) | |
1626 (completion-search-peek t)) | |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1627 ((< index 0) |
56 | 1628 (completion-search-reset-1) |
1629 (setq cmpl-last-index index) | |
1630 ;; reverse the possibilities list | |
1631 (setq cmpl-next-possibilities (reverse cmpl-starting-possibilities)) | |
1632 ;; do a "normal" search | |
1633 (while (and (completion-search-peek nil) | |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1634 (< (setq index (1+ index)) 0)) |
56 | 1635 (setq cmpl-next-possibility nil) |
1636 ) | |
1637 (cond ((not cmpl-next-possibilities)) | |
1638 ;; If no more possibilities, leave it that way | |
1639 ((= -1 cmpl-last-index) | |
1640 ;; next completion is at index 0. reset next-possibility list | |
1641 ;; to start at beginning | |
1642 (setq cmpl-next-possibilities cmpl-starting-possibilities)) | |
1643 (t | |
1644 ;; otherwise point to one before current | |
1645 (setq cmpl-next-possibilities | |
1646 (nthcdr (- (length cmpl-starting-possibilities) | |
1647 (length cmpl-next-possibilities)) | |
1648 cmpl-starting-possibilities)) | |
1649 ))) | |
1650 (t | |
1651 ;; non-negative index, reset and search | |
1652 ;;(prin1 'reset) | |
1653 (completion-search-reset-1) | |
1654 (setq cmpl-last-index index) | |
1655 (while (and (completion-search-peek t) | |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1656 (not (< (setq index (1- index)) 0))) |
56 | 1657 (setq cmpl-next-possibility nil) |
1658 )) | |
1659 ) | |
1660 (prog1 | |
1661 cmpl-next-possibility | |
1662 (setq cmpl-next-possibility nil) | |
1663 )) | |
1664 | |
1665 | |
1666 (defun completion-search-peek (use-cdabbrev) | |
1667 "Returns the next completion entry without actually moving the pointers. | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1668 Calling this again or calling `completion-search-next' results in the same |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1669 string being returned. Depends on `case-fold-search'. |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1670 If there are no more entries, try cdabbrev and then return only a string." |
56 | 1671 (cond |
1672 ;; return the cached value if we have it | |
1673 (cmpl-next-possibility) | |
1674 ((and cmpl-next-possibilities | |
1675 ;; still a few possibilities left | |
1676 (progn | |
1677 (while | |
1678 (and (not (eq 0 (string-match cmpl-test-regexp | |
1679 (completion-string (car cmpl-next-possibilities))))) | |
1680 (setq cmpl-next-possibilities (cdr cmpl-next-possibilities)) | |
1681 )) | |
1682 cmpl-next-possibilities | |
1683 )) | |
1684 ;; successful match | |
1685 (setq cmpl-next-possibility (car cmpl-next-possibilities) | |
1686 cmpl-tried-list (cons (downcase (completion-string cmpl-next-possibility)) | |
1687 cmpl-tried-list) | |
1688 cmpl-next-possibilities (cdr cmpl-next-possibilities) | |
1689 ) | |
1690 cmpl-next-possibility) | |
1691 (use-cdabbrev | |
1692 ;; unsuccessful, use cdabbrev | |
1693 (cond ((not cmpl-cdabbrev-reset-p) | |
1694 (reset-cdabbrev cmpl-test-string cmpl-tried-list) | |
1695 (setq cmpl-cdabbrev-reset-p t) | |
1696 )) | |
1697 (setq cmpl-next-possibility (next-cdabbrev)) | |
1698 ) | |
1699 ;; Completely unsuccessful, return nil | |
1700 )) | |
1701 | |
14169 | 1702 ;; Tests -- |
1703 ;; - Add and Find - | |
1704 ;; (add-completion "banana") | |
1705 ;; (completion-search-reset "ban") | |
1706 ;; (completion-search-next 0) --> "banana" | |
1707 ;; | |
1708 ;; - Discrimination - | |
1709 ;; (add-completion "cumberland") | |
1710 ;; (add-completion "cumberbund") | |
1711 ;; cumbering | |
1712 ;; (completion-search-reset "cumb") | |
1713 ;; (completion-search-peek t) --> "cumberbund" | |
1714 ;; (completion-search-next 0) --> "cumberbund" | |
1715 ;; (completion-search-peek t) --> "cumberland" | |
1716 ;; (completion-search-next 1) --> "cumberland" | |
1717 ;; (completion-search-peek nil) --> nil | |
1718 ;; (completion-search-next 2) --> "cumbering" {cdabbrev} | |
1719 ;; (completion-search-next 3) --> nil or "cumming"{depends on context} | |
1720 ;; (completion-search-next 1) --> "cumberland" | |
1721 ;; (completion-search-peek t) --> "cumbering" {cdabbrev} | |
1722 ;; | |
1723 ;; - Accepting - | |
1724 ;; (completion-search-next 1) --> "cumberland" | |
1725 ;; (setq completion-to-accept "cumberland") | |
1726 ;; (completion-search-reset "foo") | |
1727 ;; (completion-search-reset "cum") | |
1728 ;; (completion-search-next 0) --> "cumberland" | |
1729 ;; | |
1730 ;; - Deleting - | |
1731 ;; (kill-completion "cumberland") | |
1732 ;; cummings | |
1733 ;; (completion-search-reset "cum") | |
1734 ;; (completion-search-next 0) --> "cumberbund" | |
1735 ;; (completion-search-next 1) --> "cummings" | |
1736 ;; | |
1737 ;; - Ignoring Capitalization - | |
1738 ;; (completion-search-reset "CuMb") | |
1739 ;; (completion-search-next 0) --> "cumberbund" | |
56 | 1740 |
1741 | |
1742 | |
14169 | 1743 ;;----------------------------------------------- |
1744 ;; COMPLETE | |
1745 ;;----------------------------------------------- | |
56 | 1746 |
1747 (defun completion-mode () | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1748 "Toggles whether or not to add new words to the completion database." |
56 | 1749 (interactive) |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1750 (setq enable-completion (not enable-completion)) |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1751 (message "Completion mode is now %s." (if enable-completion "ON" "OFF")) |
56 | 1752 ) |
1753 | |
1754 (defvar cmpl-current-index 0) | |
1755 (defvar cmpl-original-string nil) | |
1756 (defvar cmpl-last-insert-location -1) | |
1757 (defvar cmpl-leave-point-at-start nil) | |
1758 | |
1759 (defun complete (&optional arg) | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1760 "Fill out a completion of the word before point. |
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3186
diff
changeset
|
1761 Point is left at end. Consecutive calls rotate through all possibilities. |
56 | 1762 Prefix args :: |
1763 control-u :: leave the point at the beginning of the completion rather | |
1764 than at the end. | |
1765 a number :: rotate through the possible completions by that amount | |
1766 `-' :: same as -1 (insert previous completion) | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1767 {See the comments at the top of `completion.el' for more info.}" |
56 | 1768 (interactive "*p") |
1769 ;;; Set up variables | |
1770 (cond ((eq last-command this-command) | |
1771 ;; Undo last one | |
1772 (delete-region cmpl-last-insert-location (point)) | |
1773 ;; get next completion | |
1774 (setq cmpl-current-index (+ cmpl-current-index (or arg 1))) | |
1775 ) | |
1776 (t | |
1777 (if (not cmpl-initialized-p) | |
1778 (initialize-completions)) ;; make sure everything's loaded | |
1779 (cond ((consp current-prefix-arg) ;; control-u | |
1780 (setq arg 0) | |
1781 (setq cmpl-leave-point-at-start t) | |
1782 ) | |
1783 (t | |
1784 (setq cmpl-leave-point-at-start nil) | |
1785 )) | |
1786 ;; get string | |
1787 (setq cmpl-original-string (symbol-before-point-for-complete)) | |
1788 (cond ((not cmpl-original-string) | |
1789 (setq this-command 'failed-complete) | |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1790 (error "To complete, point must be after a symbol at least %d character long" |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1791 completion-prefix-min-length))) |
56 | 1792 ;; get index |
1793 (setq cmpl-current-index (if current-prefix-arg arg 0)) | |
1794 ;; statistics | |
1795 (cmpl-statistics-block | |
1796 (note-complete-entered-afresh cmpl-original-string)) | |
1797 ;; reset database | |
1798 (completion-search-reset cmpl-original-string) | |
1799 ;; erase what we've got | |
1800 (delete-region cmpl-symbol-start cmpl-symbol-end) | |
1801 )) | |
1802 | |
1803 ;; point is at the point to insert the new symbol | |
1804 ;; Get the next completion | |
1805 (let* ((print-status-p | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1806 (and (>= baud-rate completion-prompt-speed-threshold) |
56 | 1807 (not (minibuffer-window-selected-p)))) |
1808 (insert-point (point)) | |
1809 (entry (completion-search-next cmpl-current-index)) | |
1810 string | |
1811 ) | |
1812 ;; entry is either a completion entry or a string (if cdabbrev) | |
1813 | |
1814 ;; If found, insert | |
1815 (cond (entry | |
1816 ;; Setup for proper case | |
1817 (setq string (if (stringp entry) | |
1818 entry (completion-string entry))) | |
1819 (setq string (cmpl-merge-string-cases | |
1820 string cmpl-original-string)) | |
1821 ;; insert | |
1822 (insert string) | |
1823 ;; accept it | |
1824 (setq completion-to-accept string) | |
1825 ;; fixup and cache point | |
1826 (cond (cmpl-leave-point-at-start | |
1827 (setq cmpl-last-insert-location (point)) | |
1828 (goto-char insert-point)) | |
1829 (t;; point at end, | |
1830 (setq cmpl-last-insert-location insert-point)) | |
1831 ) | |
1832 ;; statistics | |
1833 (cmpl-statistics-block | |
1834 (note-complete-inserted entry cmpl-current-index)) | |
1835 ;; Done ! cmpl-stat-complete-successful | |
1836 ;;display the next completion | |
1837 (cond | |
1838 ((and print-status-p | |
1839 ;; This updates the display and only prints if there | |
1840 ;; is no typeahead | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1841 (sit-for 0) |
56 | 1842 (setq entry |
1843 (completion-search-peek | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1844 completion-cdabbrev-prompt-flag))) |
56 | 1845 (setq string (if (stringp entry) |
1846 entry (completion-string entry))) | |
1847 (setq string (cmpl-merge-string-cases | |
1848 string cmpl-original-string)) | |
1849 (message "Next completion: %s" string) | |
1850 )) | |
1851 ) | |
1852 (t;; none found, insert old | |
1853 (insert cmpl-original-string) | |
1854 ;; Don't accept completions | |
1855 (setq completion-to-accept nil) | |
1856 ;; print message | |
4218
8e42b7df5c4f
(complete): Use sit-for, not cmpl19-sit-for.
Richard M. Stallman <rms@gnu.org>
parents:
3846
diff
changeset
|
1857 ;; This used to call cmpl19-sit-for, an undefined function. |
8e42b7df5c4f
(complete): Use sit-for, not cmpl19-sit-for.
Richard M. Stallman <rms@gnu.org>
parents:
3846
diff
changeset
|
1858 ;; I hope that sit-for does the right thing; I don't know -- rms. |
8e42b7df5c4f
(complete): Use sit-for, not cmpl19-sit-for.
Richard M. Stallman <rms@gnu.org>
parents:
3846
diff
changeset
|
1859 (if (and print-status-p (sit-for 0)) |
56 | 1860 (message "No %scompletions." |
1861 (if (eq this-command last-command) "more " ""))) | |
1862 ;; statistics | |
1863 (cmpl-statistics-block | |
1864 (record-complete-failed cmpl-current-index)) | |
1865 ;; Pretend that we were never here | |
1866 (setq this-command 'failed-complete) | |
1867 )))) | |
1868 | |
14169 | 1869 ;;----------------------------------------------- |
1870 ;; "Complete" Key Keybindings | |
1871 ;;----------------------------------------------- | |
56 | 1872 |
1873 (global-set-key "\M-\r" 'complete) | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1874 (global-set-key [?\C-\r] 'complete) |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1875 (define-key function-key-map [C-return] [?\C-\r]) |
56 | 1876 |
14169 | 1877 ;; Tests - |
1878 ;; (add-completion "cumberland") | |
1879 ;; (add-completion "cumberbund") | |
1880 ;; cum | |
1881 ;; Cumber | |
1882 ;; cumbering | |
1883 ;; cumb | |
56 | 1884 |
1885 | |
14169 | 1886 ;;--------------------------------------------------------------------------- |
1887 ;; Parsing definitions from files into the database | |
1888 ;;--------------------------------------------------------------------------- | |
56 | 1889 |
14169 | 1890 ;;----------------------------------------------- |
1891 ;; Top Level functions :: | |
1892 ;;----------------------------------------------- | |
56 | 1893 |
14169 | 1894 ;; User interface |
56 | 1895 (defun add-completions-from-file (file) |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1896 "Parse possible completions from a file and add them to data base." |
56 | 1897 (interactive "fFile: ") |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1898 (setq file (expand-file-name file)) |
56 | 1899 (let* ((buffer (get-file-buffer file)) |
1900 (buffer-already-there-p buffer) | |
1901 ) | |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1902 (if (not buffer-already-there-p) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1903 (let ((completions-merging-modes nil)) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1904 (setq buffer (find-file-noselect file)))) |
56 | 1905 (unwind-protect |
1906 (save-excursion | |
1907 (set-buffer buffer) | |
1908 (add-completions-from-buffer) | |
1909 ) | |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1910 (if (not buffer-already-there-p) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1911 (kill-buffer buffer))))) |
56 | 1912 |
1913 (defun add-completions-from-buffer () | |
1914 (interactive) | |
1915 (let ((current-completion-source cmpl-source-file-parsing) | |
1916 (start-num | |
1917 (cmpl-statistics-block | |
1918 (aref completion-add-count-vector cmpl-source-file-parsing))) | |
1919 mode | |
1920 ) | |
1921 (cond ((memq major-mode '(emacs-lisp-mode lisp-mode)) | |
1922 (add-completions-from-lisp-buffer) | |
1923 (setq mode 'lisp) | |
1924 ) | |
1925 ((memq major-mode '(c-mode)) | |
1926 (add-completions-from-c-buffer) | |
1927 (setq mode 'c) | |
1928 ) | |
1929 (t | |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1930 (error "Cannot parse completions in %s buffers" |
56 | 1931 major-mode) |
1932 )) | |
1933 (cmpl-statistics-block | |
1934 (record-cmpl-parse-file | |
1935 mode (point-max) | |
1936 (- (aref completion-add-count-vector cmpl-source-file-parsing) | |
1937 start-num))) | |
1938 )) | |
1939 | |
14169 | 1940 ;; Find file hook |
56 | 1941 (defun cmpl-find-file-hook () |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1942 (cond (enable-completion |
56 | 1943 (cond ((and (memq major-mode '(emacs-lisp-mode lisp-mode)) |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1944 (memq 'lisp completions-merging-modes) |
56 | 1945 ) |
1946 (add-completions-from-buffer)) | |
1947 ((and (memq major-mode '(c-mode)) | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1948 (memq 'c completions-merging-modes) |
56 | 1949 ) |
1950 (add-completions-from-buffer) | |
1951 ))) | |
1952 )) | |
1953 | |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
1954 (add-hook 'find-file-hooks 'cmpl-find-file-hook) |
56 | 1955 |
14169 | 1956 ;;----------------------------------------------- |
1957 ;; Tags Table Completions | |
1958 ;;----------------------------------------------- | |
56 | 1959 |
1960 (defun add-completions-from-tags-table () | |
1961 ;; Inspired by eero@media-lab.media.mit.edu | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
1962 "Add completions from the current tags table." |
56 | 1963 (interactive) |
1964 (visit-tags-table-buffer) ;this will prompt if no tags-table | |
1965 (save-excursion | |
1966 (goto-char (point-min)) | |
1967 (let (string) | |
1968 (condition-case e | |
1969 (while t | |
1970 (search-forward "\177") | |
1971 (backward-char 3) | |
1972 (and (setq string (symbol-under-point)) | |
1973 (add-completion-to-tail-if-new string)) | |
1974 (forward-char 3) | |
1975 ) | |
1976 (search-failed) | |
1977 )))) | |
1978 | |
1979 | |
14169 | 1980 ;;----------------------------------------------- |
1981 ;; Lisp File completion parsing | |
1982 ;;----------------------------------------------- | |
1983 ;; This merely looks for phrases beginning with (def.... or | |
1984 ;; (package:def ... and takes the next word. | |
1985 ;; | |
1986 ;; We tried using forward-lines and explicit searches but the regexp technique | |
1987 ;; was faster. (About 100K characters per second) | |
1988 ;; | |
56 | 1989 (defconst *lisp-def-regexp* |
1990 "\n(\\(\\w*:\\)?def\\(\\w\\|\\s_\\)*\\s +(*" | |
1991 "A regexp that searches for lisp definition form." | |
1992 ) | |
1993 | |
14169 | 1994 ;; Tests - |
1995 ;; (and (string-match *lisp-def-regexp* "\n(defun foo") (match-end 0)) -> 8 | |
1996 ;; (and (string-match *lisp-def-regexp* "\n(si:def foo") (match-end 0)) -> 9 | |
1997 ;; (and (string-match *lisp-def-regexp* "\n(def-bar foo")(match-end 0)) -> 10 | |
1998 ;; (and (string-match *lisp-def-regexp* "\n(defun (foo") (match-end 0)) -> 9 | |
56 | 1999 |
14169 | 2000 ;; Parses all the definition names from a Lisp mode buffer and adds them to |
2001 ;; the completion database. | |
56 | 2002 (defun add-completions-from-lisp-buffer () |
2003 ;;; Benchmarks | |
2004 ;;; Sun-3/280 - 1500 to 3000 lines of lisp code per second | |
2005 (let (string) | |
2006 (save-excursion | |
2007 (goto-char (point-min)) | |
2008 (condition-case e | |
2009 (while t | |
2010 (re-search-forward *lisp-def-regexp*) | |
2011 (and (setq string (symbol-under-point)) | |
2012 (add-completion-to-tail-if-new string)) | |
2013 ) | |
2014 (search-failed) | |
2015 )))) | |
2016 | |
2017 | |
14169 | 2018 ;;----------------------------------------------- |
2019 ;; C file completion parsing | |
2020 ;;----------------------------------------------- | |
2021 ;; C : | |
2022 ;; Looks for #define or [<storage class>] [<type>] <name>{,<name>} | |
2023 ;; or structure, array or pointer defs. | |
2024 ;; It gets most of the definition names. | |
2025 ;; | |
2026 ;; As you might suspect by now, we use some symbol table hackery | |
2027 ;; | |
2028 ;; Symbol separator chars (have whitespace syntax) --> , ; * = ( | |
2029 ;; Opening char --> [ { | |
2030 ;; Closing char --> ] } | |
2031 ;; opening and closing must be skipped over | |
2032 ;; Whitespace chars (have symbol syntax) | |
2033 ;; Everything else has word syntax | |
56 | 2034 |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2035 (defun cmpl-make-c-def-completion-syntax-table () |
13636
a120308bfe29
(cmpl-make-standard-completion-syntax-table)
Richard M. Stallman <rms@gnu.org>
parents:
11431
diff
changeset
|
2036 (let ((table (make-syntax-table)) |
56 | 2037 (whitespace-chars '(? ?\n ?\t ?\f ?\v ?\r)) |
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3186
diff
changeset
|
2038 ;; unfortunately the ?( causes the parens to appear unbalanced |
56 | 2039 (separator-chars '(?, ?* ?= ?\( ?\; |
2040 )) | |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2041 i) |
56 | 2042 ;; default syntax is whitespace |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2043 (setq i 0) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2044 (while (< i 256) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2045 (modify-syntax-entry i "w" table) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2046 (setq i (1+ i))) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2047 (completion-dolist (char whitespace-chars) |
56 | 2048 (modify-syntax-entry char "_" table)) |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2049 (completion-dolist (char separator-chars) |
56 | 2050 (modify-syntax-entry char " " table)) |
2051 (modify-syntax-entry ?\[ "(]" table) | |
2052 (modify-syntax-entry ?\{ "(}" table) | |
2053 (modify-syntax-entry ?\] ")[" table) | |
2054 (modify-syntax-entry ?\} "){" table) | |
2055 table)) | |
2056 | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2057 (defconst cmpl-c-def-syntax-table (cmpl-make-c-def-completion-syntax-table)) |
56 | 2058 |
14169 | 2059 ;; Regexps |
56 | 2060 (defconst *c-def-regexp* |
2061 ;; This stops on lines with possible definitions | |
2062 "\n[_a-zA-Z#]" | |
2063 ;; This stops after the symbol to add. | |
2064 ;;"\n\\(#define\\s +.\\|\\(\\(\\w\\|\\s_\\)+\\b\\s *\\)+[(;,[*{=]\\)" | |
2065 ;; This stops before the symbol to add. {Test cases in parens. below} | |
2066 ;;"\n\\(\\(\\w\\|\\s_\\)+\\s *(\\|\\(\\(#define\\|auto\\|extern\\|register\\|static\\|int\\|long\\|short\\|unsigned\\|char\\|void\\|float\\|double\\|enum\\|struct\\|union\\|typedef\\)\\s +\\)+\\)" | |
2067 ;; this simple version picks up too much extraneous stuff | |
2068 ;; "\n\\(\\w\\|\\s_\\|#\\)\\B" | |
2069 "A regexp that searches for a definition form." | |
2070 ) | |
2071 ; | |
2072 ;(defconst *c-cont-regexp* | |
2073 ; "\\(\\w\\|\\s_\\)+\\b\\s *\\({\\|\\(\\[[0-9\t ]*\\]\\s *\\)*,\\(*\\|\\s \\)*\\b\\)" | |
2074 ; "This regexp should be used in a looking-at to parse for lists of variables.") | |
2075 ; | |
2076 ;(defconst *c-struct-regexp* | |
2077 ; "\\(*\\|\\s \\)*\\b" | |
2078 ; "This regexp should be used to test whether a symbol follows a structure definition.") | |
2079 | |
2080 ;(defun test-c-def-regexp (regexp string) | |
2081 ; (and (eq 0 (string-match regexp string)) (match-end 0)) | |
2082 ; ) | |
2083 | |
14169 | 2084 ;; Tests - |
2085 ;; (test-c-def-regexp *c-def-regexp* "\n#define foo") -> 10 (9) | |
2086 ;; (test-c-def-regexp *c-def-regexp* "\nfoo (x, y) {") -> 6 (6) | |
2087 ;; (test-c-def-regexp *c-def-regexp* "\nint foo (x, y)") -> 10 (5) | |
2088 ;; (test-c-def-regexp *c-def-regexp* "\n int foo (x, y)") -> nil | |
2089 ;; (test-c-def-regexp *c-cont-regexp* "oo, bar") -> 4 | |
2090 ;; (test-c-def-regexp *c-cont-regexp* "oo, *bar") -> 5 | |
2091 ;; (test-c-def-regexp *c-cont-regexp* "a [5][6], bar") -> 10 | |
2092 ;; (test-c-def-regexp *c-cont-regexp* "oo(x,y)") -> nil | |
2093 ;; (test-c-def-regexp *c-cont-regexp* "a [6] ,\t bar") -> 9 | |
2094 ;; (test-c-def-regexp *c-cont-regexp* "oo {trout =1} my_carp;") -> 14 | |
2095 ;; (test-c-def-regexp *c-cont-regexp* "truct_p complex foon") -> nil | |
56 | 2096 |
14169 | 2097 ;; Parses all the definition names from a C mode buffer and adds them to the |
2098 ;; completion database. | |
56 | 2099 (defun add-completions-from-c-buffer () |
2100 ;; Benchmark -- | |
2101 ;; Sun 3/280-- 1250 lines/sec. | |
2102 | |
2103 (let (string next-point char | |
2104 (saved-syntax (syntax-table)) | |
2105 ) | |
2106 (save-excursion | |
2107 (goto-char (point-min)) | |
2108 (catch 'finish-add-completions | |
2109 (unwind-protect | |
2110 (while t | |
2111 ;; we loop here only when scan-sexps fails | |
2112 ;; (i.e. unbalance exps.) | |
2113 (set-syntax-table cmpl-c-def-syntax-table) | |
2114 (condition-case e | |
2115 (while t | |
2116 (re-search-forward *c-def-regexp*) | |
2117 (cond | |
2118 ((= (preceding-char) ?#) | |
2119 ;; preprocessor macro, see if it's one we handle | |
2120 (setq string (buffer-substring (point) (+ (point) 6))) | |
2121 (cond ((or (string-equal string "define") | |
2122 (string-equal string "ifdef ") | |
2123 ) | |
2124 ;; skip forward over definition symbol | |
2125 ;; and add it to database | |
2126 (and (forward-word 2) | |
2127 (setq string (symbol-before-point)) | |
2128 ;;(push string foo) | |
2129 (add-completion-to-tail-if-new string) | |
2130 )))) | |
2131 (t | |
2132 ;; C definition | |
2133 (setq next-point (point)) | |
2134 (while (and | |
2135 next-point | |
2136 ;; scan to next separator char. | |
2137 (setq next-point (scan-sexps next-point 1)) | |
2138 ) | |
2139 ;; position the point on the word we want to add | |
2140 (goto-char next-point) | |
2141 (while (= (setq char (following-char)) ?*) | |
2142 ;; handle pointer ref | |
2143 ;; move to next separator char. | |
2144 (goto-char | |
2145 (setq next-point (scan-sexps (point) 1))) | |
2146 ) | |
2147 (forward-word -1) | |
2148 ;; add to database | |
2149 (if (setq string (symbol-under-point)) | |
2150 ;; (push string foo) | |
2151 (add-completion-to-tail-if-new string) | |
2152 ;; Local TMC hack (useful for parsing paris.h) | |
2153 (if (and (looking-at "_AP") ;; "ansi prototype" | |
2154 (progn | |
2155 (forward-word -1) | |
2156 (setq string | |
2157 (symbol-under-point)) | |
2158 )) | |
2159 (add-completion-to-tail-if-new string) | |
2160 ) | |
2161 ) | |
2162 ;; go to next | |
2163 (goto-char next-point) | |
2164 ;; (push (format "%c" (following-char)) foo) | |
2165 (if (= (char-syntax char) ?\() | |
2166 ;; if on an opening delimiter, go to end | |
2167 (while (= (char-syntax char) ?\() | |
2168 (setq next-point (scan-sexps next-point 1) | |
2169 char (char-after next-point)) | |
2170 ) | |
2171 (or (= char ?,) | |
2172 ;; Current char is an end char. | |
2173 (setq next-point nil) | |
2174 )) | |
2175 )))) | |
2176 (search-failed ;;done | |
2177 (throw 'finish-add-completions t) | |
2178 ) | |
2179 (error | |
2180 ;; Check for failure in scan-sexps | |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2181 (if (or (string-equal (nth 1 e) |
56 | 2182 "Containing expression ends prematurely") |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2183 (string-equal (nth 1 e) "Unbalanced parentheses")) |
56 | 2184 ;; unbalanced paren., keep going |
2185 ;;(ding) | |
2186 (forward-line 1) | |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2187 (message "Error parsing C buffer for completions--please send bug report") |
56 | 2188 (throw 'finish-add-completions t) |
2189 )) | |
2190 )) | |
2191 (set-syntax-table saved-syntax) | |
2192 ))))) | |
2193 | |
2194 | |
14169 | 2195 ;;--------------------------------------------------------------------------- |
2196 ;; Init files | |
2197 ;;--------------------------------------------------------------------------- | |
56 | 2198 |
14169 | 2199 ;; The version of save-completions-to-file called at kill-emacs time. |
56 | 2200 (defun kill-emacs-save-completions () |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2201 (if (and save-completions-flag enable-completion cmpl-initialized-p) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2202 (cond |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2203 ((not cmpl-completions-accepted-p) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2204 (message "Completions database has not changed - not writing.")) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2205 (t |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2206 (save-completions-to-file))))) |
56 | 2207 |
4434
265397236749
(completion-version): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
4218
diff
changeset
|
2208 ;; There is no point bothering to change this again |
265397236749
(completion-version): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
4218
diff
changeset
|
2209 ;; unless the package changes so much that it matters |
265397236749
(completion-version): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
4218
diff
changeset
|
2210 ;; for people that have saved completions. |
265397236749
(completion-version): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
4218
diff
changeset
|
2211 (defconst completion-version "11") |
265397236749
(completion-version): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
4218
diff
changeset
|
2212 |
56 | 2213 (defconst saved-cmpl-file-header |
2214 ";;; Completion Initialization file. | |
14169 | 2215 ;; Version = %s |
2216 ;; Format is (<string> . <last-use-time>) | |
2217 ;; <string> is the completion | |
2218 ;; <last-use-time> is the time the completion was last used | |
2219 ;; If it is t, the completion will never be pruned from the file. | |
2220 ;; Otherwise it is in hours since origin. | |
56 | 2221 \n") |
2222 | |
2223 (defun completion-backup-filename (filename) | |
2224 (concat filename ".BAK")) | |
2225 | |
2226 (defun save-completions-to-file (&optional filename) | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2227 "Save completions in init file FILENAME. |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2228 If file name is not specified, use `save-completions-file-name'." |
56 | 2229 (interactive) |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2230 (setq filename (expand-file-name (or filename save-completions-file-name))) |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2231 (if (file-writable-p filename) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2232 (progn |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2233 (if (not cmpl-initialized-p) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2234 (initialize-completions));; make sure everything's loaded |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2235 (message "Saving completions to file %s" filename) |
56 | 2236 |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2237 (let* ((delete-old-versions t) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2238 (kept-old-versions 0) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2239 (kept-new-versions completions-file-versions-kept) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2240 last-use-time |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2241 (current-time (cmpl-hours-since-origin)) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2242 (total-in-db 0) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2243 (total-perm 0) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2244 (total-saved 0) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2245 (backup-filename (completion-backup-filename filename)) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2246 ) |
56 | 2247 |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2248 (save-excursion |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2249 (get-buffer-create " *completion-save-buffer*") |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2250 (set-buffer " *completion-save-buffer*") |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2251 (setq buffer-file-name filename) |
56 | 2252 |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2253 (if (not (verify-visited-file-modtime (current-buffer))) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2254 (progn |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2255 ;; file has changed on disk. Bring us up-to-date |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2256 (message "Completion file has changed. Merging. . .") |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2257 (load-completions-from-file filename t) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2258 (message "Merging finished. Saving completions to file %s" filename))) |
56 | 2259 |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2260 ;; prepare the buffer to be modified |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2261 (clear-visited-file-modtime) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2262 (erase-buffer) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2263 ;; (/ 1 0) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2264 (insert (format saved-cmpl-file-header completion-version)) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2265 (completion-dolist (completion (list-all-completions)) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2266 (setq total-in-db (1+ total-in-db)) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2267 (setq last-use-time (completion-last-use-time completion)) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2268 ;; Update num uses and maybe write completion to a file |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2269 (cond ((or;; Write to file if |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2270 ;; permanent |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2271 (and (eq last-use-time t) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2272 (setq total-perm (1+ total-perm))) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2273 ;; or if |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2274 (if (> (completion-num-uses completion) 0) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2275 ;; it's been used |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2276 (setq last-use-time current-time) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2277 ;; or it was saved before and |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2278 (and last-use-time |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2279 ;; save-completions-retention-time is nil |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2280 (or (not save-completions-retention-time) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2281 ;; or time since last use is < ...retention-time* |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2282 (< (- current-time last-use-time) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2283 save-completions-retention-time)) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2284 ))) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2285 ;; write to file |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2286 (setq total-saved (1+ total-saved)) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2287 (insert (prin1-to-string (cons (completion-string completion) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2288 last-use-time)) "\n") |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2289 ))) |
56 | 2290 |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2291 ;; write the buffer |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2292 (condition-case e |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2293 (let ((file-exists-p (file-exists-p filename))) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2294 (if file-exists-p |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2295 (progn |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2296 ;; If file exists . . . |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2297 ;; Save a backup(so GNU doesn't screw us when we're out of disk) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2298 ;; (GNU leaves a 0 length file if it gets a disk full error!) |
56 | 2299 |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2300 ;; If backup doesn't exit, Rename current to backup |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2301 ;; {If backup exists the primary file is probably messed up} |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2302 (or (file-exists-p backup-filename) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2303 (rename-file filename backup-filename)) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2304 ;; Copy the backup back to the current name |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2305 ;; (so versioning works) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2306 (copy-file backup-filename filename t))) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2307 ;; Save it |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2308 (save-buffer) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2309 (if file-exists-p |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2310 ;; If successful, remove backup |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2311 (delete-file backup-filename))) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2312 (error |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2313 (set-buffer-modified-p nil) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2314 (message "Couldn't save completion file `%s'" filename) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2315 )) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2316 ;; Reset accepted-p flag |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2317 (setq cmpl-completions-accepted-p nil) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2318 ) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2319 (cmpl-statistics-block |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2320 (record-save-completions total-in-db total-perm total-saved)) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2321 )))) |
56 | 2322 |
14169 | 2323 ;;(defun autosave-completions () |
2324 ;; (if (and save-completions-flag enable-completion cmpl-initialized-p | |
2325 ;; *completion-auto-save-period* | |
2326 ;; (> cmpl-emacs-idle-time *completion-auto-save-period*) | |
2327 ;; cmpl-completions-accepted-p) | |
2328 ;; (save-completions-to-file))) | |
56 | 2329 |
14169 | 2330 ;;(add-hook 'cmpl-emacs-idle-time-hooks 'autosave-completions) |
56 | 2331 |
2332 (defun load-completions-from-file (&optional filename no-message-p) | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2333 "Loads a completion init file FILENAME. |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2334 If file is not specified, then use `save-completions-file-name'." |
56 | 2335 (interactive) |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2336 (setq filename (expand-file-name (or filename save-completions-file-name))) |
56 | 2337 (let* ((backup-filename (completion-backup-filename filename)) |
2338 (backup-readable-p (file-readable-p backup-filename)) | |
2339 ) | |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2340 (if backup-readable-p (setq filename backup-filename)) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2341 (if (file-readable-p filename) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2342 (progn |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2343 (if (not no-message-p) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2344 (message "Loading completions from %sfile %s . . ." |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2345 (if backup-readable-p "backup " "") filename)) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2346 (save-excursion |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2347 (get-buffer-create " *completion-save-buffer*") |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2348 (set-buffer " *completion-save-buffer*") |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2349 (setq buffer-file-name filename) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2350 ;; prepare the buffer to be modified |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2351 (clear-visited-file-modtime) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2352 (erase-buffer) |
56 | 2353 |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2354 (let ((insert-okay-p nil) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2355 (buffer (current-buffer)) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2356 (current-time (cmpl-hours-since-origin)) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2357 string num-uses entry last-use-time |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2358 cmpl-entry cmpl-last-use-time |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2359 (current-completion-source cmpl-source-init-file) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2360 (start-num |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2361 (cmpl-statistics-block |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2362 (aref completion-add-count-vector cmpl-source-file-parsing))) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2363 (total-in-file 0) (total-perm 0) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2364 ) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2365 ;; insert the file into a buffer |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2366 (condition-case e |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2367 (progn (insert-file-contents filename t) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2368 (setq insert-okay-p t)) |
56 | 2369 |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2370 (file-error |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2371 (message "File error trying to load completion file %s." |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2372 filename))) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2373 ;; parse it |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2374 (if insert-okay-p |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2375 (progn |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2376 (goto-char (point-min)) |
56 | 2377 |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2378 (condition-case e |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2379 (while t |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2380 (setq entry (read buffer)) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2381 (setq total-in-file (1+ total-in-file)) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2382 (cond |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2383 ((and (consp entry) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2384 (stringp (setq string (car entry))) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2385 (cond |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2386 ((eq (setq last-use-time (cdr entry)) 'T) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2387 ;; handle case sensitivity |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2388 (setq total-perm (1+ total-perm)) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2389 (setq last-use-time t)) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2390 ((eq last-use-time t) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2391 (setq total-perm (1+ total-perm))) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2392 ((integerp last-use-time)) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2393 )) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2394 ;; Valid entry |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2395 ;; add it in |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2396 (setq cmpl-last-use-time |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2397 (completion-last-use-time |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2398 (setq cmpl-entry |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2399 (add-completion-to-tail-if-new string)) |
56 | 2400 )) |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2401 (if (or (eq last-use-time t) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2402 (and (> last-use-time 1000);;backcompatibility |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2403 (not (eq cmpl-last-use-time t)) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2404 (or (not cmpl-last-use-time) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2405 ;; more recent |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2406 (> last-use-time cmpl-last-use-time)) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2407 )) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2408 ;; update last-use-time |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2409 (set-completion-last-use-time cmpl-entry last-use-time) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2410 )) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2411 (t |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2412 ;; Bad format |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2413 (message "Error: invalid saved completion - %s" |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2414 (prin1-to-string entry)) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2415 ;; try to get back in sync |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2416 (search-forward "\n(") |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2417 ))) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2418 (search-failed |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2419 (message "End of file while reading completions.") |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2420 ) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2421 (end-of-file |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2422 (if (= (point) (point-max)) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2423 (if (not no-message-p) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2424 (message "Loading completions from file %s . . . Done." |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2425 filename)) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2426 (message "End of file while reading completions.") |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2427 )) |
56 | 2428 ))) |
2429 | |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2430 (cmpl-statistics-block |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2431 (record-load-completions |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2432 total-in-file total-perm |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2433 (- (aref completion-add-count-vector cmpl-source-init-file) |
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2434 start-num))) |
56 | 2435 |
10638
f587ee9a25f6
Don't use cl. Eliminate use of when, unless,
Richard M. Stallman <rms@gnu.org>
parents:
10465
diff
changeset
|
2436 )))))) |
56 | 2437 |
2438 (defun initialize-completions () | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2439 "Load the default completions file. |
1356 | 2440 Also sets up so that exiting emacs will automatically save the file." |
56 | 2441 (interactive) |
2442 (cond ((not cmpl-initialized-p) | |
2443 (load-completions-from-file) | |
2444 )) | |
2445 (setq cmpl-initialized-p t) | |
2446 ) | |
2447 | |
2448 | |
14169 | 2449 ;;----------------------------------------------- |
2450 ;; Kill EMACS patch | |
2451 ;;----------------------------------------------- | |
56 | 2452 |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2453 (add-hook 'kill-emacs-hook |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2454 '(lambda () |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2455 (kill-emacs-save-completions) |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2456 (cmpl-statistics-block |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2457 (record-cmpl-kill-emacs)))) |
56 | 2458 |
14169 | 2459 ;;----------------------------------------------- |
2460 ;; Kill region patch | |
2461 ;;----------------------------------------------- | |
56 | 2462 |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2463 (defun completion-kill-region (&optional beg end) |
56 | 2464 "Kill between point and mark. |
2465 The text is deleted but saved in the kill ring. | |
2466 The command \\[yank] can retrieve it from there. | |
2467 /(If you want to kill and then yank immediately, use \\[copy-region-as-kill].) | |
2468 | |
2469 This is the primitive for programs to kill text (as opposed to deleting it). | |
2470 Supply two arguments, character numbers indicating the stretch of text | |
2471 to be killed. | |
2472 Any command that calls this function is a \"kill command\". | |
2473 If the previous command was also a kill command, | |
2474 the text killed this time appends to the text killed last time | |
2475 to make one entry in the kill ring. | |
2476 Patched to remove the most recent completion." | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2477 (interactive "r") |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2478 (cond ((eq last-command 'complete) |
56 | 2479 (delete-region (point) cmpl-last-insert-location) |
2480 (insert cmpl-original-string) | |
2481 (setq completion-to-accept nil) | |
2482 (cmpl-statistics-block | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2483 (record-complete-failed))) |
56 | 2484 (t |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2485 (kill-region beg end)))) |
56 | 2486 |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2487 (global-set-key "\C-w" 'completion-kill-region) |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2488 |
14169 | 2489 ;;----------------------------------------------- |
2490 ;; Patches to self-insert-command. | |
2491 ;;----------------------------------------------- | |
56 | 2492 |
14169 | 2493 ;; Need 2 versions: generic separator chars. and space (to get auto fill |
2494 ;; to work) | |
56 | 2495 |
14169 | 2496 ;; All common separators (eg. space "(" ")" """) characters go through a |
2497 ;; function to add new words to the list of words to complete from: | |
2498 ;; COMPLETION-SEPARATOR-SELF-INSERT-COMMAND (arg). | |
2499 ;; If the character before this was an alpha-numeric then this adds the | |
2500 ;; symbol before point to the completion list (using ADD-COMPLETION). | |
56 | 2501 |
2502 (defun completion-separator-self-insert-command (arg) | |
2503 (interactive "p") | |
2504 (use-completion-before-separator) | |
2505 (self-insert-command arg) | |
2506 ) | |
2507 | |
2508 (defun completion-separator-self-insert-autofilling (arg) | |
2509 (interactive "p") | |
2510 (use-completion-before-separator) | |
2511 (self-insert-command arg) | |
10465
00e1546cc687
(completion-separator-self-insert-autofilling):
Richard M. Stallman <rms@gnu.org>
parents:
8678
diff
changeset
|
2512 (and auto-fill-function |
732 | 2513 (funcall auto-fill-function)) |
56 | 2514 ) |
2515 | |
14169 | 2516 ;;----------------------------------------------- |
2517 ;; Wrapping Macro | |
2518 ;;----------------------------------------------- | |
56 | 2519 |
14169 | 2520 ;; Note that because of the way byte compiling works, none of |
2521 ;; the functions defined with this macro get byte compiled. | |
56 | 2522 |
2523 (defmacro def-completion-wrapper (function-name type &optional new-name) | |
1356 | 2524 "Add a call to update the completion database before function execution. |
2525 TYPE is the type of the wrapper to be added. Can be :before or :under." | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2526 (cond ((eq type ':separator) |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2527 (list 'put (list 'quote function-name) ''completion-function |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2528 ''use-completion-before-separator)) |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2529 ((eq type ':before) |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2530 (list 'put (list 'quote function-name) ''completion-function |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2531 ''use-completion-before-point)) |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2532 ((eq type ':backward-under) |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2533 (list 'put (list 'quote function-name) ''completion-function |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2534 ''use-completion-backward-under)) |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2535 ((eq type ':backward) |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2536 (list 'put (list 'quote function-name) ''completion-function |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2537 ''use-completion-backward)) |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2538 ((eq type ':under) |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2539 (list 'put (list 'quote function-name) ''completion-function |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2540 ''use-completion-under-point)) |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2541 ((eq type ':under-or-before) |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2542 (list 'put (list 'quote function-name) ''completion-function |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2543 ''use-completion-under-or-before-point)) |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2544 ((eq type ':minibuffer-separator) |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2545 (list 'put (list 'quote function-name) ''completion-function |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2546 ''use-completion-minibuffer-separator)))) |
56 | 2547 |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2548 (defun use-completion-minibuffer-separator () |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2549 (let ((cmpl-syntax-table cmpl-standard-syntax-table)) |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2550 (use-completion-before-separator))) |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2551 |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2552 (defun use-completion-backward-under () |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2553 (use-completion-under-point) |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2554 (if (eq last-command 'complete) |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2555 ;; probably a failed completion if you have to back up |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2556 (cmpl-statistics-block (record-complete-failed)))) |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2557 |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2558 (defun use-completion-backward () |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2559 (if (eq last-command 'complete) |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2560 ;; probably a failed completion if you have to back up |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2561 (cmpl-statistics-block (record-complete-failed)))) |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2562 |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2563 (defun completion-before-command () |
8678
0107ce4d48af
(completion-before-command): Don't call get on a non-symbol.
Richard M. Stallman <rms@gnu.org>
parents:
8156
diff
changeset
|
2564 (funcall (or (and (symbolp this-command) |
0107ce4d48af
(completion-before-command): Don't call get on a non-symbol.
Richard M. Stallman <rms@gnu.org>
parents:
8156
diff
changeset
|
2565 (get this-command 'completion-function)) |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2566 'use-completion-under-or-before-point))) |
5895
f7f69d049b0b
Fix spelling of pre-command-hook.
Karl Heuer <kwzh@gnu.org>
parents:
4435
diff
changeset
|
2567 (add-hook 'pre-command-hook 'completion-before-command) |
56 | 2568 |
2569 | |
14169 | 2570 ;;--------------------------------------------------------------------------- |
2571 ;; Patches to standard keymaps insert completions | |
2572 ;;--------------------------------------------------------------------------- | |
56 | 2573 |
14169 | 2574 ;;----------------------------------------------- |
2575 ;; Separators | |
2576 ;;----------------------------------------------- | |
2577 ;; We've used the completion syntax table given as a guide. | |
2578 ;; | |
2579 ;; Global separator chars. | |
2580 ;; We left out <tab> because there are too many special cases for it. Also, | |
2581 ;; in normal coding it's rarely typed after a word. | |
56 | 2582 (global-set-key " " 'completion-separator-self-insert-autofilling) |
2583 (global-set-key "!" 'completion-separator-self-insert-command) | |
2584 (global-set-key "%" 'completion-separator-self-insert-command) | |
2585 (global-set-key "^" 'completion-separator-self-insert-command) | |
2586 (global-set-key "&" 'completion-separator-self-insert-command) | |
2587 (global-set-key "(" 'completion-separator-self-insert-command) | |
2588 (global-set-key ")" 'completion-separator-self-insert-command) | |
2589 (global-set-key "=" 'completion-separator-self-insert-command) | |
2590 (global-set-key "`" 'completion-separator-self-insert-command) | |
2591 (global-set-key "|" 'completion-separator-self-insert-command) | |
2592 (global-set-key "{" 'completion-separator-self-insert-command) | |
2593 (global-set-key "}" 'completion-separator-self-insert-command) | |
2594 (global-set-key "[" 'completion-separator-self-insert-command) | |
2595 (global-set-key "]" 'completion-separator-self-insert-command) | |
2596 (global-set-key ";" 'completion-separator-self-insert-command) | |
2597 (global-set-key "\"" 'completion-separator-self-insert-command) | |
2598 (global-set-key "'" 'completion-separator-self-insert-command) | |
2599 (global-set-key "#" 'completion-separator-self-insert-command) | |
2600 (global-set-key "," 'completion-separator-self-insert-command) | |
2601 (global-set-key "?" 'completion-separator-self-insert-command) | |
2602 | |
14169 | 2603 ;; We include period and colon even though they are symbol chars because : |
2604 ;; - in text we want to pick up the last word in a sentence. | |
2605 ;; - in C pointer refs. we want to pick up the first symbol | |
2606 ;; - it won't make a difference for lisp mode (package names are short) | |
56 | 2607 (global-set-key "." 'completion-separator-self-insert-command) |
2608 (global-set-key ":" 'completion-separator-self-insert-command) | |
2609 | |
14169 | 2610 ;; Lisp Mode diffs |
56 | 2611 (define-key lisp-mode-map "!" 'self-insert-command) |
2612 (define-key lisp-mode-map "&" 'self-insert-command) | |
2613 (define-key lisp-mode-map "%" 'self-insert-command) | |
2614 (define-key lisp-mode-map "?" 'self-insert-command) | |
2615 (define-key lisp-mode-map "=" 'self-insert-command) | |
2616 (define-key lisp-mode-map "^" 'self-insert-command) | |
2617 | |
15031 | 2618 ;; Avoid warnings. |
2619 (defvar c-mode-map) | |
2620 (defvar fortran-mode-map) | |
2621 | |
14169 | 2622 ;; C mode diffs. |
13636
a120308bfe29
(cmpl-make-standard-completion-syntax-table)
Richard M. Stallman <rms@gnu.org>
parents:
11431
diff
changeset
|
2623 (defun completion-c-mode-hook () |
a120308bfe29
(cmpl-make-standard-completion-syntax-table)
Richard M. Stallman <rms@gnu.org>
parents:
11431
diff
changeset
|
2624 (def-completion-wrapper electric-c-semi :separator) |
a120308bfe29
(cmpl-make-standard-completion-syntax-table)
Richard M. Stallman <rms@gnu.org>
parents:
11431
diff
changeset
|
2625 (define-key c-mode-map "+" 'completion-separator-self-insert-command) |
a120308bfe29
(cmpl-make-standard-completion-syntax-table)
Richard M. Stallman <rms@gnu.org>
parents:
11431
diff
changeset
|
2626 (define-key c-mode-map "*" 'completion-separator-self-insert-command) |
a120308bfe29
(cmpl-make-standard-completion-syntax-table)
Richard M. Stallman <rms@gnu.org>
parents:
11431
diff
changeset
|
2627 (define-key c-mode-map "/" 'completion-separator-self-insert-command)) |
a120308bfe29
(cmpl-make-standard-completion-syntax-table)
Richard M. Stallman <rms@gnu.org>
parents:
11431
diff
changeset
|
2628 ;; Do this either now or whenever C mode is loaded. |
a120308bfe29
(cmpl-make-standard-completion-syntax-table)
Richard M. Stallman <rms@gnu.org>
parents:
11431
diff
changeset
|
2629 (if (featurep 'cc-mode) |
a120308bfe29
(cmpl-make-standard-completion-syntax-table)
Richard M. Stallman <rms@gnu.org>
parents:
11431
diff
changeset
|
2630 (completion-c-mode-hook) |
a120308bfe29
(cmpl-make-standard-completion-syntax-table)
Richard M. Stallman <rms@gnu.org>
parents:
11431
diff
changeset
|
2631 (add-hook 'c-mode-hook 'completion-c-mode-hook)) |
56 | 2632 |
14169 | 2633 ;; FORTRAN mode diffs. (these are defined when fortran is called) |
56 | 2634 (defun completion-setup-fortran-mode () |
2635 (define-key fortran-mode-map "+" 'completion-separator-self-insert-command) | |
2636 (define-key fortran-mode-map "-" 'completion-separator-self-insert-command) | |
2637 (define-key fortran-mode-map "*" 'completion-separator-self-insert-command) | |
2638 (define-key fortran-mode-map "/" 'completion-separator-self-insert-command) | |
2639 ) | |
2640 | |
14169 | 2641 ;;----------------------------------------------- |
2642 ;; End of line chars. | |
2643 ;;----------------------------------------------- | |
56 | 2644 (def-completion-wrapper newline :separator) |
2645 (def-completion-wrapper newline-and-indent :separator) | |
3176 | 2646 (def-completion-wrapper comint-send-input :separator) |
56 | 2647 (def-completion-wrapper exit-minibuffer :minibuffer-separator) |
2648 (def-completion-wrapper eval-print-last-sexp :separator) | |
2649 (def-completion-wrapper eval-last-sexp :separator) | |
2650 ;;(def-completion-wrapper minibuffer-complete-and-exit :minibuffer) | |
2651 | |
14169 | 2652 ;;----------------------------------------------- |
2653 ;; Cursor movement | |
2654 ;;----------------------------------------------- | |
56 | 2655 |
2656 (def-completion-wrapper next-line :under-or-before) | |
2657 (def-completion-wrapper previous-line :under-or-before) | |
2658 (def-completion-wrapper beginning-of-buffer :under-or-before) | |
2659 (def-completion-wrapper end-of-buffer :under-or-before) | |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2660 (def-completion-wrapper beginning-of-line :under-or-before) |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2661 (def-completion-wrapper end-of-line :under-or-before) |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2662 (def-completion-wrapper forward-char :under-or-before) |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2663 (def-completion-wrapper forward-word :under-or-before) |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2664 (def-completion-wrapper forward-sexp :under-or-before) |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2665 (def-completion-wrapper backward-char :backward-under) |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2666 (def-completion-wrapper backward-word :backward-under) |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2667 (def-completion-wrapper backward-sexp :backward-under) |
56 | 2668 |
3175
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2669 (def-completion-wrapper delete-backward-char :backward) |
15d3c2e32922
Pervasive changes to use Emacs 19 features
Richard M. Stallman <rms@gnu.org>
parents:
3169
diff
changeset
|
2670 (def-completion-wrapper delete-backward-char-untabify :backward) |
56 | 2671 |
14169 | 2672 ;; Tests -- |
2673 ;; foobarbiz | |
2674 ;; foobar | |
2675 ;; fooquux | |
2676 ;; fooper | |
56 | 2677 |
2678 (cmpl-statistics-block | |
2679 (record-completion-file-loaded)) | |
662
8a533acedb77
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
190
diff
changeset
|
2680 |
15031 | 2681 (provide 'completion) |
2682 | |
662
8a533acedb77
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
190
diff
changeset
|
2683 ;;; completion.el ends here |