aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2010-08-03 23:54:16 +0200
committerJuanma Barranquero2010-08-03 23:54:16 +0200
commite0d62a9b7b7cb411d8b2638fa0cc3788d8ea8e6b (patch)
treed1c7e18dd0777c6234a49b3c77ce886749754a13 /src
parent8d1d9587c92457e1a7171493fdd1bccf682d26f0 (diff)
downloademacs-e0d62a9b7b7cb411d8b2638fa0cc3788d8ea8e6b.tar.gz
emacs-e0d62a9b7b7cb411d8b2638fa0cc3788d8ea8e6b.zip
src/ChangeLog: Add missing bug reference.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog21
1 files changed, 10 insertions, 11 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 7c619c2ce57..7e286f6eea7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,7 @@
12010-08-03 Johan Bockgård <bojohan@gnu.org> 12010-08-03 Johan Bockgård <bojohan@gnu.org>
2 2
3 * data.c (Flocal_variable_p): Handle variable aliases correctly. 3 * data.c (Flocal_variable_p): Handle variable aliases correctly.
4 (Bug#6744)
4 5
52010-08-02 Jan Djärv <jan.h.d@swipnet.se> 62010-08-02 Jan Djärv <jan.h.d@swipnet.se>
6 7
@@ -9,9 +10,8 @@
9 10
10 * gtkutil.c (hierarchy_ch_cb, qttip_cb): Do not define unless 11 * gtkutil.c (hierarchy_ch_cb, qttip_cb): Do not define unless
11 USE_GTK_TOOLTIP. 12 USE_GTK_TOOLTIP.
12 (xg_prepare_tooltip): Return 0 unless USE_GTK_TOOLTIP 13 (xg_prepare_tooltip): Return 0 unless USE_GTK_TOOLTIP.
13 (xg_show_tooltip, xg_hide_tooltip): Do nothing unless 14 (xg_show_tooltip, xg_hide_tooltip): Do nothing unless USE_GTK_TOOLTIP.
14 USE_GTK_TOOLTIP.
15 (xg_create_frame_widgets): Surround tooltip-related code with ifdef 15 (xg_create_frame_widgets): Surround tooltip-related code with ifdef
16 USE_GTK_TOOLTIP. 16 USE_GTK_TOOLTIP.
17 (xg_free_frame_widgets): Don't delete ttip_* unless USE_GTK_TOOLTIP. 17 (xg_free_frame_widgets): Don't delete ttip_* unless USE_GTK_TOOLTIP.
@@ -46,8 +46,8 @@
46 (xg_show_tooltip, xg_hide_tooltip): Declare. 46 (xg_show_tooltip, xg_hide_tooltip): Declare.
47 47
48 * gtkutil.c (hierarchy_ch_cb, qttip_cb, xg_prepare_tooltip) 48 * gtkutil.c (hierarchy_ch_cb, qttip_cb, xg_prepare_tooltip)
49 (xg_show_tooltip, xg_hide_tooltip, xg_free_frame_widgets): New 49 (xg_show_tooltip, xg_hide_tooltip, xg_free_frame_widgets):
50 functions. 50 New functions.
51 (xg_create_frame_widgets): Set ttip_* to 0. Set a dummy tooltip 51 (xg_create_frame_widgets): Set ttip_* to 0. Set a dummy tooltip
52 text so qttip_cb is called. Connect query-tooltip to qttip_cb. 52 text so qttip_cb is called. Connect query-tooltip to qttip_cb.
53 Remove code that is commented out. 53 Remove code that is commented out.
@@ -87,9 +87,9 @@
87 * xfns.c (x_set_tool_bar_position): Remove debug fprintf. 87 * xfns.c (x_set_tool_bar_position): Remove debug fprintf.
88 88
89 * xterm.h (struct x_output): Add toolbar_top_height, 89 * xterm.h (struct x_output): Add toolbar_top_height,
90 toolbar_bottom_height, toolbar_left_width, toolbar_right_width. Remove 90 toolbar_bottom_height, toolbar_left_width, toolbar_right_width.
91 toolbar_height. 91 Remove toolbar_height.
92 if USE_GTK: Add hbox_widget and toolbar_in_hbox. 92 If USE_GTK: Add hbox_widget and toolbar_in_hbox.
93 (FRAME_TOOLBAR_TOP_HEIGHT, FRAME_TOOLBAR_BOTTOM_HEIGHT) 93 (FRAME_TOOLBAR_TOP_HEIGHT, FRAME_TOOLBAR_BOTTOM_HEIGHT)
94 (FRAME_TOOLBAR_LEFT_WIDTH, FRAME_TOOLBAR_RIGHT_WIDTH): New macros. 94 (FRAME_TOOLBAR_LEFT_WIDTH, FRAME_TOOLBAR_RIGHT_WIDTH): New macros.
95 (FRAME_TOOLBAR_HEIGHT): Is now TOP_HEIGHT + BOTTOM_HEIGHT. 95 (FRAME_TOOLBAR_HEIGHT): Is now TOP_HEIGHT + BOTTOM_HEIGHT.
@@ -99,7 +99,7 @@
99 * xfns.c (x_set_tool_bar_position): New function. 99 * xfns.c (x_set_tool_bar_position): New function.
100 (xic_set_statusarea): Use FRAME_TOOLBAR_TOP_HEIGHT. 100 (xic_set_statusarea): Use FRAME_TOOLBAR_TOP_HEIGHT.
101 (x_frame_parm_handlers): Add x_set_tool_bar_position. 101 (x_frame_parm_handlers): Add x_set_tool_bar_position.
102 (syms_of_xfns): if USE_GTK, provide move-toolbar. 102 (syms_of_xfns): If USE_GTK, provide move-toolbar.
103 103
104 * window.c (calc_absolute_offset): Check for FRAME_TOOLBAR_TOP_HEIGHT 104 * window.c (calc_absolute_offset): Check for FRAME_TOOLBAR_TOP_HEIGHT
105 and FRAME_TOOLBAR_LEFT_WIDTH. 105 and FRAME_TOOLBAR_LEFT_WIDTH.
@@ -119,8 +119,7 @@
119 size correctly. Remove hardcoded 4, instead use handlebox size - 119 size correctly. Remove hardcoded 4, instead use handlebox size -
120 toolbar size. 120 toolbar size.
121 (xg_tool_bar_attach_callback): Update left/right/top/bottom tool bar 121 (xg_tool_bar_attach_callback): Update left/right/top/bottom tool bar
122 size correctly. Use handlebox size + toolbar size as additional 122 size correctly. Use handlebox size + toolbar size as additional size.
123 size.
124 (xg_pack_tool_bar): POS is a new parameter. 123 (xg_pack_tool_bar): POS is a new parameter.
125 Set orientation of tool bar based on pos. 124 Set orientation of tool bar based on pos.
126 Only make handlebox_widget if NULL. 125 Only make handlebox_widget if NULL.