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