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/w32term.c | |
| 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/w32term.c')
| -rw-r--r-- | src/w32term.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/w32term.c b/src/w32term.c index fb8648ca4f9..8a53a58189a 100644 --- a/src/w32term.c +++ b/src/w32term.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* Implementation of GUI terminal on the Microsoft Windows API. | 1 | /* Implementation of GUI terminal on the Microsoft Windows API. |
| 2 | 2 | ||
| 3 | Copyright (C) 1989, 1993-2014 Free Software Foundation, Inc. | 3 | Copyright (C) 1989, 1993-2015 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | This file is part of GNU Emacs. | 5 | This file is part of GNU Emacs. |
| 6 | 6 | ||
| @@ -220,10 +220,6 @@ static void w32fullscreen_hook (struct frame *); | |||
| 220 | static void x_check_font (struct frame *, struct font *); | 220 | static void x_check_font (struct frame *, struct font *); |
| 221 | #endif | 221 | #endif |
| 222 | 222 | ||
| 223 | static Lisp_Object Qvendor_specific_keysyms; | ||
| 224 | static Lisp_Object Qadded, Qremoved, Qmodified; | ||
| 225 | static Lisp_Object Qrenamed_from, Qrenamed_to; | ||
| 226 | |||
| 227 | 223 | ||
| 228 | /*********************************************************************** | 224 | /*********************************************************************** |
| 229 | Debugging | 225 | Debugging |