summaryrefslogtreecommitdiff
path: root/lisp/loadup.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2017-04-26 12:32:10 -0400
committerGlenn Morris <rgm@gnu.org>2017-04-26 12:32:10 -0400
commite39441bf6f7990b00da1f9b20ebdc25804978be5 (patch)
tree9119a564546701d6978d2d283a971fde734beafa /lisp/loadup.el
parent2d93d0d5bbe597972a715f7a02ddd039dc17da93 (diff)
downloademacs-e39441bf6f7990b00da1f9b20ebdc25804978be5.tar.gz
* lisp/loadup.el: Get charprop.el into etc/DOC again.
Diffstat (limited to 'lisp/loadup.el')
-rw-r--r--lisp/loadup.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/loadup.el b/lisp/loadup.el
index 9dc43daa3a0..7876a85c78d 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -1,3 +1,4 @@
+
;;; loadup.el --- load up standardly loaded Lisp files for Emacs
;; Copyright (C) 1985-1986, 1992, 1994, 2001-2017 Free Software
@@ -184,7 +185,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.
-(if (load "international/charprop.el" t)
+(if ; this formatting is for the Makefile
+ (load "international/charprop.el" t)
(setq redisplay--inhibit-bidi nil))
(load "international/characters")
(load "composite")