diff options
| author | Jan D | 2010-08-13 15:26:13 +0200 |
|---|---|---|
| committer | Jan D | 2010-08-13 15:26:13 +0200 |
| commit | 2b4e627726bc1dfcbf95f069fb97f932471efad8 (patch) | |
| tree | 8dad1c6b6bafa7531bdac10e432742258ddae9f5 /src | |
| parent | 9dec0f7642296c34dfd3700c6094808ce6ed289e (diff) | |
| download | emacs-2b4e627726bc1dfcbf95f069fb97f932471efad8.tar.gz emacs-2b4e627726bc1dfcbf95f069fb97f932471efad8.zip | |
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 @@ | |||
| 1 | 2010-08-13 Jan Djärv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * frame.h (Qtool_bar_position): Declare. | ||
| 4 | |||
| 5 | * xfns.c (Fx_create_frame): Call x_default_parameter for | ||
| 6 | Qtool_bar_position. | ||
| 7 | |||
| 1 | 2010-08-13 Eli Zaretskii <eliz@gnu.org> | 8 | 2010-08-13 Eli Zaretskii <eliz@gnu.org> |
| 2 | 9 | ||
| 3 | * unexcoff.c: Remove the parts used when "emacs" is not defined. | 10 | * 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; | |||
| 1050 | extern Lisp_Object Qicon, Qicon_name, Qicon_type, Qicon_left, Qicon_top; | 1050 | extern Lisp_Object Qicon, Qicon_name, Qicon_type, Qicon_left, Qicon_top; |
| 1051 | extern Lisp_Object Qinternal_border_width; | 1051 | extern Lisp_Object Qinternal_border_width; |
| 1052 | extern Lisp_Object Qtooltip; | 1052 | extern Lisp_Object Qtooltip; |
| 1053 | extern Lisp_Object Qmenu_bar_lines, Qtool_bar_lines; | 1053 | extern Lisp_Object Qmenu_bar_lines, Qtool_bar_lines, Qtool_bar_position; |
| 1054 | extern Lisp_Object Qmouse_color; | 1054 | extern Lisp_Object Qmouse_color; |
| 1055 | extern Lisp_Object Qname, Qtitle; | 1055 | extern Lisp_Object Qname, Qtitle; |
| 1056 | extern Lisp_Object Qparent_id; | 1056 | 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. */) | |||
| 3392 | "waitForWM", "WaitForWM", RES_TYPE_BOOLEAN); | 3392 | "waitForWM", "WaitForWM", RES_TYPE_BOOLEAN); |
| 3393 | x_default_parameter (f, parms, Qfullscreen, Qnil, | 3393 | x_default_parameter (f, parms, Qfullscreen, Qnil, |
| 3394 | "fullscreen", "Fullscreen", RES_TYPE_SYMBOL); | 3394 | "fullscreen", "Fullscreen", RES_TYPE_SYMBOL); |
| 3395 | x_default_parameter (f, parms, Qtool_bar_position, | ||
| 3396 | f->tool_bar_position, 0, 0, RES_TYPE_SYMBOL); | ||
| 3395 | 3397 | ||
| 3396 | /* Compute the size of the X window. */ | 3398 | /* Compute the size of the X window. */ |
| 3397 | window_prompting = x_figure_window_size (f, parms, 1); | 3399 | window_prompting = x_figure_window_size (f, parms, 1); |