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/xmenu.c | |
| parent | d972b504f30ff4300ba368940751e8736dddf0b4 (diff) | |
| parent | 9a57bda31569294ecaf8138a06e5edda9c0d87e3 (diff) | |
| download | emacs-cc7cb20d6abc0f862e5513b24831bba0eaecaa5f.tar.gz emacs-cc7cb20d6abc0f862e5513b24831bba0eaecaa5f.zip | |
merge master, fix conflicts
Diffstat (limited to 'src/xmenu.c')
| -rw-r--r-- | src/xmenu.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/xmenu.c b/src/xmenu.c index c6bb9faee66..fd667a84343 100644 --- a/src/xmenu.c +++ b/src/xmenu.c | |||
| @@ -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; |