summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd Moellmann <gerd@gnu.org>2001-01-30 15:18:45 +0000
committerGerd Moellmann <gerd@gnu.org>2001-01-30 15:18:45 +0000
commitef9cabee85214bed5724c44465e5ecf9a340c41b (patch)
tree907c515c12cffa7359f25916a27c2cbf22bd4c63
parent50d45c50bebe699b1bc6be57cae4f52d768c9110 (diff)
downloademacs-ef9cabee85214bed5724c44465e5ecf9a340c41b.tar.gz
*** empty log message ***
-rw-r--r--lisp/ChangeLog3
-rw-r--r--src/ChangeLog12
2 files changed, 15 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a27407e97d1..f1f9375518e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
2001-01-30 Gerd Moellmann <gerd@gnu.org>
+ * frame.el (frame-notice-user-settings): Do the tool-bar
+ stuff only for graphical displays. Fix a braino.
+
* frame.el (frame-initialize): Create initial frame visible.
(frame-notice-user-settings): When tool-bar has been switched off,
correct the frame size and sync too-bar-mode.
diff --git a/src/ChangeLog b/src/ChangeLog
index 706ff7979b1..54dbe552901 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,15 @@
+2001-01-30 Gerd Moellmann <gerd@gnu.org>
+
+ * xdisp.c (build_desired_tool_bar_string, syms_of_xdisp): Use
+ DEFAULT_TOOL_BAR_BUTTON_MARGIN and DEFAULT_TOOL_BAR_BUTTON_RELIEF.
+
+ * dispextern.h (Vtool_bar_button_margin:): Declare extern.
+ (DEFAULT_TOOL_BAR_BUTTON_MARGIN, DEFAULT_TOOL_BAR_BUTTON_RELIEF)
+ (DEFAULT_TOOL_BAR_IMAGE_HEIGHT): New defines.
+
+ * xfns.c (Fx_create_frame): Add the tool bar height to the frame
+ height.
+
2001-01-30 Dave Love <fx@gnu.org>
* bytecode.c (Fbyte_code) <Bgeq>: Add BEFORE_POTENTIAL_GC and