diff options
| author | Jan D <jan.h.d@swipnet.se> | 2010-08-13 15:26:13 +0200 |
|---|---|---|
| committer | Jan D <jan.h.d@swipnet.se> | 2010-08-13 15:26:13 +0200 |
| commit | 2b4e627726bc1dfcbf95f069fb97f932471efad8 (patch) | |
| tree | 8dad1c6b6bafa7531bdac10e432742258ddae9f5 /src | |
| parent | 9dec0f7642296c34dfd3700c6094808ce6ed289e (diff) | |
| download | emacs-2b4e627726bc1dfcbf95f069fb97f932471efad8.tar.gz | |
Fix handling of tool-bar-position, also put into default-frame-alist.
* lisp/menu-bar.el (menu-bar-set-tool-bar-position): New function.
(menu-bar-showhide-tool-bar-menu-customize-enable-left)
(menu-bar-showhide-tool-bar-menu-customize-enable-right)
(menu-bar-showhide-tool-bar-menu-customize-enable-top)
(menu-bar-showhide-tool-bar-menu-customize-enable-bottom): Call
menu-bar-set-tool-bar-position.
* src/frame.h (Qtool_bar_position): Declare.
* src/xfns.c (Fx_create_frame): Call x_default_parameter for
Qtool_bar_position.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/frame.h | 2 | ||||
| -rw-r--r-- | src/xfns.c | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 024cf18efb6..69b1e9866d5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2010-08-13 Jan Djärv <jan.h.d@swipnet.se> + + * frame.h (Qtool_bar_position): Declare. + + * xfns.c (Fx_create_frame): Call x_default_parameter for + Qtool_bar_position. + 2010-08-13 Eli Zaretskii <eliz@gnu.org> * unexcoff.c: Remove the parts used when "emacs" is not defined. diff --git a/src/frame.h b/src/frame.h index 088b477dfce..6b307c7c3b1 100644 --- a/src/frame.h +++ b/src/frame.h @@ -1050,7 +1050,7 @@ extern Lisp_Object Qbackground_color, Qforeground_color; extern Lisp_Object Qicon, Qicon_name, Qicon_type, Qicon_left, Qicon_top; extern Lisp_Object Qinternal_border_width; extern Lisp_Object Qtooltip; -extern Lisp_Object Qmenu_bar_lines, Qtool_bar_lines; +extern Lisp_Object Qmenu_bar_lines, Qtool_bar_lines, Qtool_bar_position; extern Lisp_Object Qmouse_color; extern Lisp_Object Qname, Qtitle; extern Lisp_Object Qparent_id; diff --git a/src/xfns.c b/src/xfns.c index e2d571a847f..cb6733e8fa1 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -3392,6 +3392,8 @@ This function is an internal primitive--use `make-frame' instead. */) "waitForWM", "WaitForWM", RES_TYPE_BOOLEAN); x_default_parameter (f, parms, Qfullscreen, Qnil, "fullscreen", "Fullscreen", RES_TYPE_SYMBOL); + x_default_parameter (f, parms, Qtool_bar_position, + f->tool_bar_position, 0, 0, RES_TYPE_SYMBOL); /* Compute the size of the X window. */ window_prompting = x_figure_window_size (f, parms, 1); |