aboutsummaryrefslogtreecommitdiffstats
path: root/src/xfns.c
diff options
context:
space:
mode:
authorMartin Rudalics2014-09-03 17:10:29 +0200
committerMartin Rudalics2014-09-03 17:10:29 +0200
commit568df136f13451a098d166918b9602cf8dedf976 (patch)
treed9870a3b614c9f10d2f626e7481c796b750f171b /src/xfns.c
parent62fca47221fc9d248511cd94fbcb41ddb46763e6 (diff)
downloademacs-568df136f13451a098d166918b9602cf8dedf976.tar.gz
emacs-568df136f13451a098d166918b9602cf8dedf976.zip
Clean up initialization and customization of horizontal scroll bars.
* frame.el (frame-initialize): Remove horizontal-scroll-bars from frame-initial-frame-alist. * scroll-bar.el (previous-horizontal-scroll-bar-mode) (horizontal-scroll-bar-mode-explicit) (set-horizontal-scroll-bar-mode, get-horizontal-scroll-bar-mode) (toggle-horizontal-scroll-bar): Remove. (horizontal-scroll-bar-mode): Remove defcustom. (horizontal-scroll-bar-mode): Fix doc-string. (scroll-bar-toolkit-scroll) (scroll-bar-toolkit-horizontal-scroll): Add doc-strings stubs. * buffer.c (scroll-bar-height): Fix typo in doc-string. * frame.c (Vdefault_frame_horizontal_scroll_bars): Remove variable. * nsfns.m (Fx_create_frame): * w32fns.c (Fx_create_frame): * xfns.c (Fx_create_frame): Default horizontal scroll bars to nil.
Diffstat (limited to 'src/xfns.c')
-rw-r--r--src/xfns.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/xfns.c b/src/xfns.c
index 0c07d6cb03d..ec915a69f80 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3112,15 +3112,9 @@ This function is an internal primitive--use `make-frame' instead. */)
3112#endif 3112#endif
3113 "verticalScrollBars", "ScrollBars", 3113 "verticalScrollBars", "ScrollBars",
3114 RES_TYPE_SYMBOL); 3114 RES_TYPE_SYMBOL);
3115 x_default_parameter (f, parms, Qhorizontal_scroll_bars, 3115 x_default_parameter (f, parms, Qhorizontal_scroll_bars, Qnil,
3116#if defined (USE_GTK) && defined (USE_TOOLKIT_SCROLL_BARS)
3117 Qt,
3118#else
3119 Qnil,
3120#endif
3121 "horizontalScrollBars", "ScrollBars", 3116 "horizontalScrollBars", "ScrollBars",
3122 RES_TYPE_SYMBOL); 3117 RES_TYPE_SYMBOL);
3123
3124 /* Also do the stuff which must be set before the window exists. */ 3118 /* Also do the stuff which must be set before the window exists. */
3125 x_default_parameter (f, parms, Qforeground_color, build_string ("black"), 3119 x_default_parameter (f, parms, Qforeground_color, build_string ("black"),
3126 "foreground", "Foreground", RES_TYPE_STRING); 3120 "foreground", "Foreground", RES_TYPE_STRING);