diff options
| author | Xue Fuqiao | 2013-12-26 06:27:00 +0800 |
|---|---|---|
| committer | Xue Fuqiao | 2013-12-26 06:27:00 +0800 |
| commit | 77bbf3713d459c45492e6daed68437edcf863a0c (patch) | |
| tree | 0e2ea82f80e907cea52eb683a362504a3813a463 /src/keymap.c | |
| parent | 3bc1e1880f232ccaea7c35a0c51bac61df9ac23c (diff) | |
| parent | 83fa295c1236aba5a73d565082dcb58a32f3e446 (diff) | |
| download | emacs-77bbf3713d459c45492e6daed68437edcf863a0c.tar.gz emacs-77bbf3713d459c45492e6daed68437edcf863a0c.zip | |
Merge from mainline.
Diffstat (limited to 'src/keymap.c')
| -rw-r--r-- | src/keymap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/keymap.c b/src/keymap.c index 562787ee8a5..9ef5a0b294f 100644 --- a/src/keymap.c +++ b/src/keymap.c | |||
| @@ -3753,7 +3753,7 @@ it is provided for major modes to bind locally. */); | |||
| 3753 | Vminor_mode_overriding_map_alist = Qnil; | 3753 | Vminor_mode_overriding_map_alist = Qnil; |
| 3754 | 3754 | ||
| 3755 | DEFVAR_LISP ("emulation-mode-map-alists", Vemulation_mode_map_alists, | 3755 | DEFVAR_LISP ("emulation-mode-map-alists", Vemulation_mode_map_alists, |
| 3756 | doc: /* List of keymap alists to use for emulations modes. | 3756 | doc: /* List of keymap alists to use for emulation modes. |
| 3757 | It is intended for modes or packages using multiple minor-mode keymaps. | 3757 | It is intended for modes or packages using multiple minor-mode keymaps. |
| 3758 | Each element is a keymap alist just like `minor-mode-map-alist', or a | 3758 | Each element is a keymap alist just like `minor-mode-map-alist', or a |
| 3759 | symbol with a variable binding which is a keymap alist, and it is used | 3759 | symbol with a variable binding which is a keymap alist, and it is used |