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/xmenu.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/xmenu.c')
| -rw-r--r-- | src/xmenu.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/xmenu.c b/src/xmenu.c index 0f69ee28e84..fd667a84343 100644 --- a/src/xmenu.c +++ b/src/xmenu.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* X Communication module for terminals which understand the X protocol. | 1 | /* X Communication module for terminals which understand the X protocol. |
| 2 | 2 | ||
| 3 | Copyright (C) 1986, 1988, 1993-1994, 1996, 1999-2014 Free Software | 3 | Copyright (C) 1986, 1988, 1993-1994, 1996, 1999-2015 Free Software |
| 4 | Foundation, Inc. | 4 | Foundation, Inc. |
| 5 | 5 | ||
| 6 | This file is part of GNU Emacs. | 6 | This file is part of GNU Emacs. |
| @@ -108,8 +108,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 108 | #define TRUE 1 | 108 | #define TRUE 1 |
| 109 | #endif /* no TRUE */ | 109 | #endif /* no TRUE */ |
| 110 | 110 | ||
| 111 | static Lisp_Object Qdebug_on_next_call; | 111 | |
| 112 | |||
| 113 | /* Flag which when set indicates a dialog or menu has been posted by | 112 | /* Flag which when set indicates a dialog or menu has been posted by |
| 114 | Xt on behalf of one of the widget sets. */ | 113 | Xt on behalf of one of the widget sets. */ |
| 115 | static int popup_activated_flag; | 114 | static int popup_activated_flag; |