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/menu.h | |
| parent | d972b504f30ff4300ba368940751e8736dddf0b4 (diff) | |
| parent | 9a57bda31569294ecaf8138a06e5edda9c0d87e3 (diff) | |
| download | emacs-cc7cb20d6abc0f862e5513b24831bba0eaecaa5f.tar.gz emacs-cc7cb20d6abc0f862e5513b24831bba0eaecaa5f.zip | |
merge master, fix conflicts
Diffstat (limited to 'src/menu.h')
| -rw-r--r-- | src/menu.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/menu.h b/src/menu.h index 182a1819b35..de586a5e101 100644 --- a/src/menu.h +++ b/src/menu.h | |||
| @@ -22,10 +22,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 22 | #include "systime.h" /* for Time */ | 22 | #include "systime.h" /* for Time */ |
| 23 | #include "../lwlib/lwlib-widget.h" | 23 | #include "../lwlib/lwlib-widget.h" |
| 24 | 24 | ||
| 25 | #ifdef HAVE_NTGUI | ||
| 26 | extern Lisp_Object Qunsupported__w32_dialog; | ||
| 27 | #endif | ||
| 28 | |||
| 29 | /* Bit fields used by terminal-specific menu_show_hook. */ | 25 | /* Bit fields used by terminal-specific menu_show_hook. */ |
| 30 | 26 | ||
| 31 | enum { | 27 | enum { |