diff options
| author | Joakim Verona | 2015-01-11 18:40:21 +0100 |
|---|---|---|
| committer | Joakim Verona | 2015-01-11 18:40:21 +0100 |
| commit | cc7cb20d6abc0f862e5513b24831bba0eaecaa5f (patch) | |
| tree | afc2fc05401504aa0c28699dc3bc155c5b0d7f58 /src/keymap.h | |
| parent | d972b504f30ff4300ba368940751e8736dddf0b4 (diff) | |
| parent | 9a57bda31569294ecaf8138a06e5edda9c0d87e3 (diff) | |
| download | emacs-cc7cb20d6abc0f862e5513b24831bba0eaecaa5f.tar.gz emacs-cc7cb20d6abc0f862e5513b24831bba0eaecaa5f.zip | |
merge master, fix conflicts
Diffstat (limited to 'src/keymap.h')
| -rw-r--r-- | src/keymap.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/keymap.h b/src/keymap.h index 4649acb719f..215dd3f289f 100644 --- a/src/keymap.h +++ b/src/keymap.h | |||
| @@ -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); |