aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Steingold2016-12-19 11:44:18 -0500
committerSam Steingold2016-12-19 11:44:18 -0500
commit657bcaf5ac30449915e070c3fa80a2eaaf1ee7e1 (patch)
treeca3c051b03b7574543b2049f8b72743daac2f99f
parent516b4c389ab7221726ac675bb7659476eae7ae35 (diff)
downloademacs-657bcaf5ac30449915e070c3fa80a2eaaf1ee7e1.tar.gz
emacs-657bcaf5ac30449915e070c3fa80a2eaaf1ee7e1.zip
avoid Eager macro-expansion failure: (void-function string-to-list)
* loadup.el [ns]: "ucs-normalize" uses `string-to-list' which is defined in "mule-util", so we have to load "mule-util" before "ucs-normalize", otherwise I get "Eager macro-expansion failure" on "make bootstrap"
-rw-r--r--lisp/loadup.el1
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/loadup.el b/lisp/loadup.el
index e9dd683b283..53500240319 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -301,6 +301,7 @@
301 ;; already produced, because it needs uni-*.el files that might 301 ;; already produced, because it needs uni-*.el files that might
302 ;; not be built early enough during bootstrap. 302 ;; not be built early enough during bootstrap.
303 (when (load-history-filename-element "charprop\\.el") 303 (when (load-history-filename-element "charprop\\.el")
304 (load "international/mule-util")
304 (load "international/ucs-normalize") 305 (load "international/ucs-normalize")
305 (load "term/ns-win")))) 306 (load "term/ns-win"))))
306(if (fboundp 'x-create-frame) 307(if (fboundp 'x-create-frame)