From: Glenn Morris <rgm@gnu.org>
Date: Wed, 26 Apr 2017 16:32:10 +0000 (-0400)
Subject: * lisp/loadup.el: Get charprop.el into etc/DOC again.
X-Git-Tag: emacs-26.0.90~521^2~542
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e39441bf6f7990b00da1f9b20ebdc25804978be5;p=emacs.git

* lisp/loadup.el: Get charprop.el into etc/DOC again.
---

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")