summaryrefslogtreecommitdiff
path: root/lisp/loadup.el
diff options
context:
space:
mode:
authorPo Lu <luangruo@yahoo.com>2023-12-06 10:34:41 +0800
committerPo Lu <luangruo@yahoo.com>2023-12-06 10:34:41 +0800
commitd8a00879309a3bf62f6ffcae103aa3bdba776ee9 (patch)
treeaca5c7620d0700cc0fc5fdcc9e18ce388ba2c03f /lisp/loadup.el
parentdc744fe6f3cd185bd9d29f61b08cd4c524e3969e (diff)
downloademacs-d8a00879309a3bf62f6ffcae103aa3bdba776ee9.tar.gz
Cease preloading touch-screen.el outside X and Android
* lisp/calc/calc.el (touch-screen-display-keyboard): * lisp/minibuffer.el (clear-minibuffer-message): * lisp/term.el (touch-screen-display-keyboard): Declare touch-screen-display-keyboard before binding or setting it. * lisp/loadup.el: Don't autoload touch-screen.el outside X and Android. * lisp/touch-screen.el: Autoload functions called from commands responding to touch screen events.
Diffstat (limited to 'lisp/loadup.el')
-rw-r--r--lisp/loadup.el6
1 files changed, 2 insertions, 4 deletions
diff --git a/lisp/loadup.el b/lisp/loadup.el
index d447523dc42..ef4203917d4 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -298,12 +298,9 @@
(if (featurep 'dynamic-setting)
(load "dynamic-setting"))
-;; touch-screen.el is tiny and is used liberally throughout the button
-;; code etc, so it may as well be preloaded everywhere.
-(load "touch-screen")
-
(if (featurep 'x)
(progn
+ (load "touch-screen")
(load "x-dnd")
(load "term/common-win")
(load "term/x-win")))
@@ -316,6 +313,7 @@
(if (featurep 'android)
(progn
(load "ls-lisp")
+ (load "touch-screen")
(load "term/common-win")
(load "term/android-win")))