From 391c084355a66aa74f8f6864474bd595f3fd3461 Mon Sep 17 00:00:00 2001 From: Po Lu Date: Tue, 18 Jul 2023 12:08:04 +0800 Subject: [PATCH] Don't enable scroll-bar-mode by default on Android * src/frame.c (syms_of_frame): Default to nil if HAVE_ANDROID. --- src/frame.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/frame.c b/src/frame.c index 35881ce6de1..da00cbf4bce 100644 --- a/src/frame.c +++ b/src/frame.c @@ -6489,7 +6489,7 @@ Setting this variable does not affect existing frames, only new ones. */); DEFVAR_LISP ("default-frame-scroll-bars", Vdefault_frame_scroll_bars, doc: /* Default position of vertical scroll bars on this window-system. */); -#ifdef HAVE_WINDOW_SYSTEM +#if defined HAVE_WINDOW_SYSTEM && !defined HAVE_ANDROID #if defined (HAVE_NTGUI) || defined (NS_IMPL_COCOA) || (defined (USE_GTK) && defined (USE_TOOLKIT_SCROLL_BARS)) /* MS-Windows, macOS, and GTK have scroll bars on the right by default. */ @@ -6497,9 +6497,9 @@ Setting this variable does not affect existing frames, only new ones. */); #else Vdefault_frame_scroll_bars = Qleft; #endif -#else +#else /* !HAVE_WINDOW_SYSTEM || HAVE_ANDROID */ Vdefault_frame_scroll_bars = Qnil; -#endif +#endif /* HAVE_WINDOW_SYSTEM && !HAVE_ANDROID */ DEFVAR_BOOL ("scroll-bar-adjust-thumb-portion", scroll_bar_adjust_thumb_portion_p, -- 2.39.2