diff options
| author | Miles Bader | 2007-02-26 23:03:45 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-02-26 23:03:45 +0000 |
| commit | a73d7753f965734247be482efa125da5235996da (patch) | |
| tree | 56af26fb1a12a2c93c146aac923947968c4c9d76 /src/w32term.h | |
| parent | 55a5664de23c07003d4d2584fc065619609500b6 (diff) | |
| parent | f6f3d0b9133d06b29523c7bc744130cddc5c8d6b (diff) | |
| download | emacs-a73d7753f965734247be482efa125da5235996da.tar.gz emacs-a73d7753f965734247be482efa125da5235996da.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 638-652)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 202)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-177
Diffstat (limited to 'src/w32term.h')
| -rw-r--r-- | src/w32term.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/w32term.h b/src/w32term.h index c1ad423ca67..6a3f7267e25 100644 --- a/src/w32term.h +++ b/src/w32term.h | |||
| @@ -380,9 +380,6 @@ struct w32_output | |||
| 380 | /* Nonzero means menubar is currently active. */ | 380 | /* Nonzero means menubar is currently active. */ |
| 381 | char menubar_active; | 381 | char menubar_active; |
| 382 | 382 | ||
| 383 | /* Nonzero means a menu command is being processed. */ | ||
| 384 | char menu_command_in_progress; | ||
| 385 | |||
| 386 | /* Nonzero means menubar is about to become active, but should be | 383 | /* Nonzero means menubar is about to become active, but should be |
| 387 | brought up to date first. */ | 384 | brought up to date first. */ |
| 388 | volatile char pending_menu_activation; | 385 | volatile char pending_menu_activation; |