diff options
| author | Miles Bader | 2007-08-03 05:27:43 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-08-03 05:27:43 +0000 |
| commit | 49b23c2a404cf31fb1aeecc7932a7304aaf16a67 (patch) | |
| tree | 259f81c54acb77cd4aeb47ce88e5e56ff7141a99 /src/gtkutil.c | |
| parent | 9899d01a0ccec166e04caa60657a44e614be50cd (diff) | |
| parent | 4211679b08d6a9c369cb22f085b9bb61d5d4eeda (diff) | |
| download | emacs-49b23c2a404cf31fb1aeecc7932a7304aaf16a67.tar.gz emacs-49b23c2a404cf31fb1aeecc7932a7304aaf16a67.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 839-842)
- Update from CVS
- Change capitalization of VC backend names for new backends
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-29
Diffstat (limited to 'src/gtkutil.c')
| -rw-r--r-- | src/gtkutil.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/gtkutil.c b/src/gtkutil.c index ca8c380abb5..a4c0522c49b 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c | |||
| @@ -3374,11 +3374,6 @@ xg_tool_bar_callback (w, client_data) | |||
| 3374 | XSETFRAME (frame, f); | 3374 | XSETFRAME (frame, f); |
| 3375 | event.kind = TOOL_BAR_EVENT; | 3375 | event.kind = TOOL_BAR_EVENT; |
| 3376 | event.frame_or_window = frame; | 3376 | event.frame_or_window = frame; |
| 3377 | event.arg = frame; | ||
| 3378 | kbd_buffer_store_event (&event); | ||
| 3379 | |||
| 3380 | event.kind = TOOL_BAR_EVENT; | ||
| 3381 | event.frame_or_window = frame; | ||
| 3382 | event.arg = key; | 3377 | event.arg = key; |
| 3383 | /* Convert between the modifier bits GDK uses and the modifier bits | 3378 | /* Convert between the modifier bits GDK uses and the modifier bits |
| 3384 | Emacs uses. This assumes GDK an X masks are the same, which they are when | 3379 | Emacs uses. This assumes GDK an X masks are the same, which they are when |