Mercurial > emacs
comparison src/keymap.c @ 91005:424b655804ca
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 846-851)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 88-92)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 242-244)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-246
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Mon, 13 Aug 2007 13:48:35 +0000 |
| parents | f55f9811f5d7 e5a68f18fcb9 |
| children | fd549372af1b |
comparison
equal
deleted
inserted
replaced
| 91004:f72cf5b2ab11 | 91005:424b655804ca |
|---|---|
| 3896 Vminibuffer_local_must_match_map); | 3896 Vminibuffer_local_must_match_map); |
| 3897 | 3897 |
| 3898 DEFVAR_LISP ("minor-mode-map-alist", &Vminor_mode_map_alist, | 3898 DEFVAR_LISP ("minor-mode-map-alist", &Vminor_mode_map_alist, |
| 3899 doc: /* Alist of keymaps to use for minor modes. | 3899 doc: /* Alist of keymaps to use for minor modes. |
| 3900 Each element looks like (VARIABLE . KEYMAP); KEYMAP is used to read | 3900 Each element looks like (VARIABLE . KEYMAP); KEYMAP is used to read |
| 3901 key sequences and look up bindings iff VARIABLE's value is non-nil. | 3901 key sequences and look up bindings if VARIABLE's value is non-nil. |
| 3902 If two active keymaps bind the same key, the keymap appearing earlier | 3902 If two active keymaps bind the same key, the keymap appearing earlier |
| 3903 in the list takes precedence. */); | 3903 in the list takes precedence. */); |
| 3904 Vminor_mode_map_alist = Qnil; | 3904 Vminor_mode_map_alist = Qnil; |
| 3905 | 3905 |
| 3906 DEFVAR_LISP ("minor-mode-overriding-map-alist", &Vminor_mode_overriding_map_alist, | 3906 DEFVAR_LISP ("minor-mode-overriding-map-alist", &Vminor_mode_overriding_map_alist, |