diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2016-03-22 11:01:30 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-03-22 11:01:30 -0700 |
commit | 37b9099068c10383e959ee366a52a22516846163 (patch) | |
tree | f135528cdacc4313be84f7bf1ceade19327d5fe7 /lisp/loadup.el | |
parent | 6bd1e2203486ace170f5de15cf7d66146fc8cc87 (diff) | |
parent | 56df61712ac446d3dcd9c897f687cc74a04be314 (diff) | |
download | emacs-37b9099068c10383e959ee366a52a22516846163.tar.gz |
-
Diffstat (limited to 'lisp/loadup.el')
-rw-r--r-- | lisp/loadup.el | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/lisp/loadup.el b/lisp/loadup.el index 5f29c01c77e..53fc2215a90 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -47,6 +47,13 @@ ;;; Code: +;; This is used in xdisp.c to determine when bidi reordering is safe. +;; (It starts non-nil in temacs, but we set it non-nil here anyway, in +;; case someone loads loadup one more time.) We reset it after +;; successfully loading charprop.el, which defines the Unicode tables +;; bidi.c needs for its job. +(setq redisplay--inhibit-bidi t) + ;; Add subdirectories to the load-path for files that might get ;; autoloaded when bootstrapping. ;; This is because PATH_DUMPLOADSEARCH is just "../lisp". @@ -114,6 +121,10 @@ (load "format") (load "bindings") (load "window") ; Needed here for `replace-buffer-in-windows'. +;; We are now capable of resizing the mini-windows, so give the +;; variable its advertised default value (it starts as nil, see +;; xdisp.c). +(setq resize-mini-windows 'grow-only) (setq load-source-file-function 'load-with-code-conversion) (load "files") @@ -167,7 +178,8 @@ (load "case-table") ;; This file doesn't exist when building a development version of Emacs ;; from the repository. It is generated just after temacs is built. -(load "international/charprop.el" t) +(if (load "international/charprop.el" t) + (setq redisplay--inhibit-bidi nil)) (load "international/characters") (load "composite") @@ -420,6 +432,9 @@ lost after dumping"))) (if (null (garbage-collect)) (setq pure-space-overflow t)) +;; Make sure we will attempt bidi reordering henceforth. +(setq redisplay--inhibit-bidi nil) + (if (member (car (last command-line-args)) '("dump" "bootstrap")) (progn (message "Dumping under the name emacs") |