aboutsummaryrefslogtreecommitdiffstats
path: root/src/xterm.c
diff options
context:
space:
mode:
authorJan Djärv2010-04-02 11:45:27 +0200
committerJan Djärv2010-04-02 11:45:27 +0200
commit7a5a264fc27bde6870f08ecc5d85eddc36fa0336 (patch)
tree54106d60bd5f2273821bb5e3fb73bebf31a5599e /src/xterm.c
parentd0b228766f1471ed104d2e038f63cd4627d79b57 (diff)
parent9cb52861f287cbad4608a5fceddae5bac1a90ba6 (diff)
downloademacs-7a5a264fc27bde6870f08ecc5d85eddc36fa0336.tar.gz
emacs-7a5a264fc27bde6870f08ecc5d85eddc36fa0336.zip
Merge from trunk
Diffstat (limited to 'src/xterm.c')
-rw-r--r--src/xterm.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/xterm.c b/src/xterm.c
index 1114fcccc53..90db15d9ed4 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -309,8 +309,6 @@ extern Lisp_Object Vx_no_window_manager;
309 309
310extern Lisp_Object Qeql; 310extern Lisp_Object Qeql;
311 311
312extern int errno;
313
314/* A mask of extra modifier bits to put into every keyboard char. */ 312/* A mask of extra modifier bits to put into every keyboard char. */
315 313
316extern EMACS_INT extra_keyboard_modifiers; 314extern EMACS_INT extra_keyboard_modifiers;