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