procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make sure scroll-bar.el is loaded on Android

Browse source 
* lisp/loadup.el: Update commentary.
* src/androidterm.c (syms_of_androidterm): Define
Vx_toolkit_scroll_bars.
* src/xterm.c (syms_of_xterm): Update doc string.xf64
This commit is contained in:
Po Lu 2023-02-23 21:49:02 +08:00
parent e3595debd0
commit 0b7d9bbc8a
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lisp/loadup.el
View file

@ -258,6 +258,9 @@
(load "jit-lock")
(load "mouse")
;; This loading happens on Android despite scroll bars being
;; unsupported, because scroll-bar-mode (the variable) must be
;; defined.
(if (boundp 'x-toolkit-scroll-bars)
(load "scroll-bar"))
(load "select")

5
src/androidterm.c
View file

@ -5570,6 +5570,11 @@ If set to a non-float value, there will be no wait at all. */);
This is a string that uniquely identifies the version of Android
Emacs is running on. */);
/* Only defined so loadup.el loads scroll-bar.el. */
DEFVAR_LISP ("x-toolkit-scroll-bars", Vx_toolkit_scroll_bars,
doc: /* SKIP: real doc in xterm.c. */);
Vx_toolkit_scroll_bars = Qnil;
/* Avoid dumping Vandroid_build_fingerprint. */
pdumper_do_now_and_after_load (android_set_build_fingerprint);

4
src/xterm.c
View file

@ -31955,7 +31955,9 @@ adjusted if the default value does not work for whatever reason. */);
A value of nil means Emacs doesn't use toolkit scroll bars.
With the X Window system, the value is a symbol describing the
X toolkit. Possible values are: gtk, motif, xaw, or xaw3d.
With MS Windows, Haiku windowing or Nextstep, the value is t. */);
With MS Windows, Haiku windowing or Nextstep, the value is t.
With Android, the value is nil, but that is because Emacs on
Android does not support scroll bars at all. */);
#ifdef USE_TOOLKIT_SCROLL_BARS
#ifdef USE_MOTIF
Vx_toolkit_scroll_bars = intern_c_string ("motif");