Mercurial > emacs
comparison src/gtkutil.c @ 90751:52a7f3f50b89
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 624-636)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 200-201)
- Merge from emacs--devo--0
- Update from CVS: lisp/nnweb.el (nnweb-google-parse-1): Update parser.
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-171
author | Miles Bader <miles@gnu.org> |
---|---|
date | Tue, 13 Feb 2007 12:14:16 +0000 |
parents | f83d17e1ace6 e852dba095f9 |
children | 4ef881a120fe |
comparison
equal
deleted
inserted
replaced
90750:f8cc067aba62 | 90751:52a7f3f50b89 |
---|---|
3685 FRAME_PTR f; | 3685 FRAME_PTR f; |
3686 { | 3686 { |
3687 int i; | 3687 int i; |
3688 GtkRequisition old_req, new_req; | 3688 GtkRequisition old_req, new_req; |
3689 struct x_output *x = f->output_data.x; | 3689 struct x_output *x = f->output_data.x; |
3690 int hmargin, vmargin; | 3690 int hmargin = 0, vmargin = 0; |
3691 GtkToolItem *ti; | 3691 GtkToolItem *ti; |
3692 | 3692 |
3693 if (! FRAME_GTK_WIDGET (f)) | 3693 if (! FRAME_GTK_WIDGET (f)) |
3694 return; | 3694 return; |
3695 | 3695 |