diff options
| author | K. Handa | 2015-01-07 22:51:41 +0900 |
|---|---|---|
| committer | K. Handa | 2015-01-07 22:51:41 +0900 |
| commit | 88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf (patch) | |
| tree | 18da116400703b67738bdbbd38cc4abf4c1e929f /src/keymap.h | |
| parent | 3f79d3131629f73da16ec121d2a0056f11b70e65 (diff) | |
| parent | 95295df44cc2b6e0e2442aeff96b0fe2ceac405c (diff) | |
| download | emacs-88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf.tar.gz emacs-88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf.zip | |
Merge branch master of git.sv.gnu.org:/srv/git/emacs.
Diffstat (limited to 'src/keymap.h')
| -rw-r--r-- | src/keymap.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/keymap.h b/src/keymap.h index b01886dfa61..215dd3f289f 100644 --- a/src/keymap.h +++ b/src/keymap.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* Functions to manipulate keymaps. | 1 | /* Functions to manipulate keymaps. |
| 2 | Copyright (C) 2001-2014 Free Software Foundation, Inc. | 2 | Copyright (C) 2001-2015 Free Software Foundation, Inc. |
| 3 | 3 | ||
| 4 | This file is part of GNU Emacs. | 4 | This file is part of GNU Emacs. |
| 5 | 5 | ||
| @@ -30,9 +30,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 30 | #define KEY_DESCRIPTION_SIZE ((2 * 6) + 1 + (CHARACTERBITS / 3) + 1 + 1) | 30 | #define KEY_DESCRIPTION_SIZE ((2 * 6) + 1 + (CHARACTERBITS / 3) + 1 + 1) |
| 31 | 31 | ||
| 32 | #define KEYMAPP(m) (!NILP (get_keymap (m, false, false))) | 32 | #define KEYMAPP(m) (!NILP (get_keymap (m, false, false))) |
| 33 | extern Lisp_Object Qkeymap, Qmenu_bar; | ||
| 34 | extern Lisp_Object Qremap; | ||
| 35 | extern Lisp_Object Qmenu_item; | ||
| 36 | extern Lisp_Object current_global_map; | 33 | extern Lisp_Object current_global_map; |
| 37 | extern char *push_key_description (EMACS_INT, char *); | 34 | extern char *push_key_description (EMACS_INT, char *); |
| 38 | extern Lisp_Object access_keymap (Lisp_Object, Lisp_Object, bool, bool, bool); | 35 | extern Lisp_Object access_keymap (Lisp_Object, Lisp_Object, bool, bool, bool); |