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