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