diff options
| author | Dmitry Antipov | 2012-08-14 08:47:05 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2012-08-14 08:47:05 +0400 |
| commit | 41a62dd97860c5154838ee87745fd380b45a4883 (patch) | |
| tree | 0e31c7c678c30878bfc50e425fb538f2e1087443 /src | |
| parent | 7d806b1e6762e57ec5f2ff76b2a9451d6a92ba28 (diff) | |
| download | emacs-41a62dd97860c5154838ee87745fd380b45a4883.tar.gz emacs-41a62dd97860c5154838ee87745fd380b45a4883.zip | |
* gtkutil.c (update_frame_tool_bar): Use EQ where appropriate.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/gtkutil.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index fd39d7bdc0c..febf65b270f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-08-14 Dmitry Antipov <dmantipov@yandex.ru> | ||
| 2 | |||
| 3 | * gtkutil.c (update_frame_tool_bar): Use EQ where appropriate. | ||
| 4 | |||
| 1 | 2012-08-14 Paul Eggert <eggert@cs.ucla.edu> | 5 | 2012-08-14 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 6 | ||
| 3 | * gtkutil.c (xg_mark_data): Don't assume C99. | 7 | * gtkutil.c (xg_mark_data): Don't assume C99. |
diff --git a/src/gtkutil.c b/src/gtkutil.c index 623f32a7b56..e538c358069 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c | |||
| @@ -4583,8 +4583,8 @@ update_frame_tool_bar (FRAME_PTR f) | |||
| 4583 | && tbinfo->n_last_items == f->n_tool_bar_items | 4583 | && tbinfo->n_last_items == f->n_tool_bar_items |
| 4584 | && tbinfo->hmargin == hmargin && tbinfo->vmargin == vmargin | 4584 | && tbinfo->hmargin == hmargin && tbinfo->vmargin == vmargin |
| 4585 | && tbinfo->dir == dir | 4585 | && tbinfo->dir == dir |
| 4586 | && Fequal (tbinfo->style, style) == Qt | 4586 | && EQ (Fequal (tbinfo->style, style), Qt) |
| 4587 | && Fequal (tbinfo->last_tool_bar, f->tool_bar_items) == Qt) | 4587 | && EQ (Fequal (tbinfo->last_tool_bar, f->tool_bar_items), Qt)) |
| 4588 | { | 4588 | { |
| 4589 | UNBLOCK_INPUT; | 4589 | UNBLOCK_INPUT; |
| 4590 | return; | 4590 | return; |