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