Mercurial > hg > xemacs-beta
annotate lisp/fontl-hooks.el @ 5634:2014ff433daf
Support hash COLLECTIONs, #'{all,try}-completion{s,}; add #'test-completion
src/ChangeLog addition:
2012-01-01 Aidan Kehoe <kehoea@parhasard.net>
Add #'test-completion, API from GNU.
Accept hash table COLLECTIONs in it and in the other
completion-oriented functions, #'try-completion,
#'all-completions, and those Lisp functions implemented in terms
of them.
* lisp.h: Update the prototype of map_obarray(), making FN
compatible with the FUNCTION argument of elisp_maphash();
* abbrev.c (abbrev_match_mapper):
* abbrev.c (record_symbol):
* doc.c (verify_doc_mapper):
* symbols.c (mapatoms_1):
* symbols.c (apropos_mapper):
Update these mapper functions to reflect the new argument to
map_obarray().
* symbols.c (map_obarray):
Call FN with two arguments, the string name of the symbol, and the
symbol itself, for API (mapper) compatibility with
elisp_maphash().
* minibuf.c (map_completion): New. Map a maphash_function_t across
a non function COLLECTION, as appropriate for #'try-completion and
friends.
* minibuf.c (map_completion_list): New. Map a maphash_function_t
across a pseudo-alist, as appropriate for the completion
functions.
* minibuf.c (ignore_completion_p): PRED needs to be called with
two args if and only if the collection is a hash table. Implement
this.
* minibuf.c (try_completion_mapper): New. The loop body of
#'try-completion, refactored out.
* minibuf.c (Ftry_completion): Use try_completion_mapper(),
map_completion().
* minibuf.c (all_completions_mapper): New. The loop body of
#'all-completions, refactored out.
* minibuf.c (Fall_completions): Use all_completions_mapper(),
map_completion().
* minibuf.c (test_completion_mapper): New. The loop body of
#'test-completion.
* minibuf.c (Ftest_completion): New, API from GNU.
* minibuf.c (syms_of_minibuf): Make Ftest_completion available.
tests/ChangeLog addition:
2012-01-01 Aidan Kehoe <kehoea@parhasard.net>
* automated/completion-tests.el: New.
Test #'try-completion, #'all-completion and #'test-completion with
list, vector and hash-table COLLECTION arguments.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 01 Jan 2012 15:18:52 +0000 |
parents | 308d34e9f07d |
children |
rev | line source |
---|---|
217 | 1 ;;; fontl-hooks.el --- pre-loaded stuff for font-lock. |
2 | |
3 ;; Copyright (C) 1992, 1993, 1994, 1995 Free Software Foundation, Inc. | |
4 ;; Copyright (C) 1995 Amdahl Corporation. | |
5 ;; Copyright (C) 1996 Ben Wing. | |
6 | |
7 ;; This file is part of XEmacs. | |
8 | |
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
217
diff
changeset
|
9 ;; XEmacs is free software: you can redistribute it and/or modify it |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
217
diff
changeset
|
10 ;; under the terms of the GNU General Public License as published by the |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
217
diff
changeset
|
11 ;; Free Software Foundation, either version 3 of the License, or (at your |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
217
diff
changeset
|
12 ;; option) any later version. |
217 | 13 |
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
217
diff
changeset
|
14 ;; XEmacs is distributed in the hope that it will be useful, but WITHOUT |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
217
diff
changeset
|
15 ;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
217
diff
changeset
|
16 ;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
217
diff
changeset
|
17 ;; for more details. |
217 | 18 |
19 ;; You should have received a copy of the GNU General Public License | |
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
217
diff
changeset
|
20 ;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>. |
217 | 21 |
22 ;;; Synched up with: FSF 19.30. (font-lock.el) | |
23 | |
24 ;;; Commentary: | |
25 | |
26 ;; The reason for the existence of this file is so that modes can | |
27 ;; call `font-lock-set-defaults' without worrying about whether | |
28 ;; font-lock is loaded. We don't autoload this from font-lock.el | |
29 ;; because loading font-lock.el automatically turns font-lock on. | |
30 | |
31 ;;; Code: | |
32 | |
33 (defun font-lock-set-defaults (&optional explicit-defaults) | |
34 "Set fontification defaults appropriately for this mode. | |
35 Sets `font-lock-keywords', `font-lock-keywords-only', `font-lock-syntax-table', | |
36 `font-lock-beginning-of-syntax-function' and | |
37 `font-lock-keywords-case-fold-search'. | |
38 | |
39 If `font-lock-defaults' is currently set, it is used. Otherwise, the | |
40 symbol naming the major mode is examined for a `font-lock-defaults' | |
41 property. If that is not present, but a variable `foo-mode-font-lock-keywords' | |
42 is, the value of that variable is used as the default for | |
43 `font-lock-keywords'. Various other backward-compatible behaviors also | |
44 exist -- if you're curious, look at the source. | |
45 | |
46 The value of `font-lock-maximum-decoration' is used to determine which | |
47 set of keywords applies, if more than one exists. | |
48 | |
49 This will also put the buffer into Font Lock mode if any keywords exist | |
50 and if auto-fontification is called for, as determined by | |
51 `font-lock-auto-fontify', `font-lock-mode-enable-list', and | |
52 `font-lock-mode-disable-list'. | |
53 | |
54 Calling this function multiple times in the same buffer is safe -- this | |
55 function keeps track of whether it has already been called in this | |
56 buffer, and does nothing if so. This allows for multiple ways of getting | |
57 Font Lock properly initialized in a buffer, to deal with existing major | |
58 modes that do not call this function. (For example, Font Lock adds this | |
59 function to `find-file-hooks'.) | |
60 | |
61 Major modes that have any font-lock defaults specified should call this | |
62 function during their initialization process, after they have set | |
63 the variable `major-mode'. | |
64 | |
65 If EXPLICIT-DEFAULTS is t, this function will not check whether it | |
66 has already been run in this buffer, and will always do the full | |
67 computation. | |
68 | |
69 If EXPLICIT-DEFAULTS is not nil and not t, it should be something | |
70 that is allowable as a value for `font-lock-defaults' and will be | |
71 used to initialize the Font Lock variables." | |
72 | |
73 (when | |
74 (and | |
75 (featurep 'font-lock) | |
76 (if font-lock-auto-fontify | |
77 (not (memq major-mode font-lock-mode-disable-list)) | |
78 (memq major-mode font-lock-mode-enable-list)) | |
79 (font-lock-set-defaults-1 explicit-defaults) | |
80 font-lock-keywords) | |
81 (turn-on-font-lock))) | |
82 | |
83 (provide 'fontl-hooks) | |
84 | |
85 ;;; fontl-hooks.el ends here |