diff options
| author | Glenn Morris | 2017-04-26 12:32:10 -0400 |
|---|---|---|
| committer | Glenn Morris | 2017-04-26 12:32:10 -0400 |
| commit | e39441bf6f7990b00da1f9b20ebdc25804978be5 (patch) | |
| tree | 9119a564546701d6978d2d283a971fde734beafa | |
| parent | 2d93d0d5bbe597972a715f7a02ddd039dc17da93 (diff) | |
| download | emacs-e39441bf6f7990b00da1f9b20ebdc25804978be5.tar.gz emacs-e39441bf6f7990b00da1f9b20ebdc25804978be5.zip | |
* lisp/loadup.el: Get charprop.el into etc/DOC again.
| -rw-r--r-- | lisp/loadup.el | 4 |
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 @@ | |||
| 1 | |||
| 1 | ;;; loadup.el --- load up standardly loaded Lisp files for Emacs | 2 | ;;; loadup.el --- load up standardly loaded Lisp files for Emacs |
| 2 | 3 | ||
| 3 | ;; Copyright (C) 1985-1986, 1992, 1994, 2001-2017 Free Software | 4 | ;; Copyright (C) 1985-1986, 1992, 1994, 2001-2017 Free Software |
| @@ -184,7 +185,8 @@ | |||
| 184 | (load "case-table") | 185 | (load "case-table") |
| 185 | ;; This file doesn't exist when building a development version of Emacs | 186 | ;; This file doesn't exist when building a development version of Emacs |
| 186 | ;; from the repository. It is generated just after temacs is built. | 187 | ;; from the repository. It is generated just after temacs is built. |
| 187 | (if (load "international/charprop.el" t) | 188 | (if ; this formatting is for the Makefile |
| 189 | (load "international/charprop.el" t) | ||
| 188 | (setq redisplay--inhibit-bidi nil)) | 190 | (setq redisplay--inhibit-bidi nil)) |
| 189 | (load "international/characters") | 191 | (load "international/characters") |
| 190 | (load "composite") | 192 | (load "composite") |