From f9f334f0c2568ece5724b1a32d3e852d52573517 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 25 May 2012 18:13:24 -0400 Subject: [PATCH] * lisp/paths.el: Remove no-byte-compile. * lisp/loadup.el: No need to load lisp/paths.el uncompiled. * src/lisp.mk (lisp): Update for this change. --- lisp/ChangeLog | 3 +++ lisp/loadup.el | 2 +- lisp/paths.el | 2 +- src/lisp.mk | 7 ++++--- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 36d81234a78..9e2f17d4fc8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2012-05-25 Glenn Morris + * paths.el: Remove no-byte-compile. + * loadup.el: No need to load paths.el uncompiled. + * image.el (imagemagick-types-inhibit): Doc fix. * version.el: Remove no-byte-compile and associated formatting. diff --git a/lisp/loadup.el b/lisp/loadup.el index 38c1f82568b..c5180e9ff6c 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -177,7 +177,7 @@ (load "rfn-eshadow") (load "menu-bar") -(load "paths.el") ;Don't get confused if someone compiled paths by mistake. +(load "paths") (load "emacs-lisp/lisp") (load "textmodes/page") (load "register") diff --git a/lisp/paths.el b/lisp/paths.el index 8ed05344f0a..7df70376266 100644 --- a/lisp/paths.el +++ b/lisp/paths.el @@ -1,4 +1,4 @@ -;;; paths.el --- define pathnames for use by various Emacs commands -*- no-byte-compile: t -*- +;;; paths.el --- define pathnames for use by various Emacs commands ;; Copyright (C) 1986, 1988, 1994, 1999-2012 Free Software Foundation, Inc. diff --git a/src/lisp.mk b/src/lisp.mk index bd0ec223787..c9966c6506c 100644 --- a/src/lisp.mk +++ b/src/lisp.mk @@ -30,8 +30,9 @@ ## sed -e 's/"[ )].*//' -n -e '/(load "/ s/.*load "//p' loadup.el | \ ## grep -vE 'site-|ldefs-boot' ## minus any duplicates. -## Note that you cannot just add a ".elc" extension to every file, -## since some of them are no-byte-compile (eg some language/ ones). +## Note that you can generally just add a ".elc" extension to every file +## that does not have an explicit .el extension, but beware of any +## no-byte-compile ones. ## Confusingly, term/internal is not in loadup, but is unconditionally ## loaded by pc-win, which is. @@ -120,7 +121,7 @@ lisp = \ $(lispsource)/isearch.elc \ $(lispsource)/rfn-eshadow.elc \ $(lispsource)/menu-bar.elc \ - $(lispsource)/paths.el \ + $(lispsource)/paths.elc \ $(lispsource)/emacs-lisp/lisp.elc \ $(lispsource)/textmodes/page.elc \ $(lispsource)/register.elc \ -- 2.39.2