Fix cut'n'paste during a multi-display session (Mark Plaksin, Robert Chassell).

[gnu-emacs] / lisp / loadup.el

diff --git a/lisp/loadup.el b/lisp/loadup.el
index 4b52515894759bdad1647bd0a4befe5ef5c6276b..82f6b1d664178ad73446bd71c6931781953e6d48 100644 (file)
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -67,6 +67,8 @@
 (setq load-source-file-function 'load-with-code-conversion)
 (load "files")
 
+(load "startup")
+
 (load "cus-face")
 (load "faces")  ; after here, `defface' may be used.
 
@@ -102,6 +104,7 @@
 (load "language/devanagari")    ; This should be loaded after indian.
 (load "language/malayalam")     ; This should be loaded after indian.
 (load "language/tamil")                 ; This should be loaded after indian.
+(load "language/kannada")       ; This should be loaded after indian.
 (load "language/english")
 (load "language/ethiopic")
 (load "language/european")
@@ -145,7 +148,6 @@
 (message "%s" (garbage-collect))
 (load "menu-bar")
 (load "paths.el")  ;Don't get confused if someone compiled paths by mistake.
-(load "startup")
 (load "emacs-lisp/lisp")
 (load "textmodes/page")
 (load "register")
@@ -188,6 +190,15 @@
       (load "emacs-lisp/float-sup")))
 (message "%s" (garbage-collect))
 
+;; Load auxiliary settings for X displays if we support them.
+(when (fboundp 'x-create-frame)
+  (load "mouse")
+  (load "international/fontset")
+  (load "x-dnd")
+  (load "term/x-win"))
+
+(message "%s" (garbage-collect))
+
 (load "vc-hooks")
 (load "ediff-hook")
 (message "%s" (garbage-collect))
@@ -301,6 +312,9 @@
 ;;; At this point, we're ready to resume undo recording for scratch.
 (buffer-enable-undo "*scratch*")
 
+(if (null (garbage-collect))
+    (setq pure-space-overflow t))
+
 (if (or (member (nth 3 command-line-args) '("dump" "bootstrap"))
        (member (nth 4 command-line-args) '("dump" "bootstrap")))
     (if (eq system-type 'vax-vms)
@@ -353,4 +367,6 @@
 ;;; no-byte-compile: t
 ;;; no-update-autoloads: t
 ;;; End:
+
+;;; arch-tag: 121e1dd4-36e1-45ac-860e-239f577a6335
 ;;; loadup.el ends here