diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/Makefile.in | 3 | ||||
| -rw-r--r-- | lisp/cus-start.el | 1 |
3 files changed, 9 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 126f10ae79b..435581799b6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2013-12-18 Glenn Morris <rgm@gnu.org> + + * Makefile.in (BYTE_COMPILE_FLAGS): Set load-prefer-newer to t. + 2013-12-18 Le Wang <l26wang@gmail.com> * comint.el (comint-previous-matching-input-from-input): Retain @@ -9,6 +13,8 @@ 2013-12-18 Glenn Morris <rgm@gnu.org> + * cus-start.el (load-prefer-newer): New option. + * mail/emacsbug.el (report-emacs-bug): Only mention enable-multibyte-characters if non-standard. diff --git a/lisp/Makefile.in b/lisp/Makefile.in index 2ac2f3e8d6b..39452edcbf4 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -88,7 +88,8 @@ AUTOGEN_VCS = \ BIG_STACK_DEPTH = 2200 BIG_STACK_OPTS = --eval "(setq max-lisp-eval-depth $(BIG_STACK_DEPTH))" -BYTE_COMPILE_FLAGS = $(BIG_STACK_OPTS) $(BYTE_COMPILE_EXTRA_FLAGS) +# Set load-prefer-newer for the benefit of the non-bootstrappers. +BYTE_COMPILE_FLAGS = $(BIG_STACK_OPTS) --eval '(setq load-prefer-newer t)' $(BYTE_COMPILE_EXTRA_FLAGS) # Files to compile before others during a bootstrap. This is done to # speed up the bootstrap process. They're ordered by size, so we use diff --git a/lisp/cus-start.el b/lisp/cus-start.el index 8e94e85f84c..32013b71125 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -312,6 +312,7 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of ;; :format "%[Current dir?%] %v" ;; (const :tag " current dir" nil) ;; (directory :format "%v")))) + (load-prefer-newer lisp boolean "24.4") ;; minibuf.c (enable-recursive-minibuffers minibuffer boolean) (history-length minibuffer |