[Emacs-diffs] /srv/bzr/emacs/trunk r106653: update-subdirs: Don't set no-byte-compile twice (bug#10260).

[Juanma Barranquero]

------------------------------------------------------------
revno: 106653
fixes bug(s): http://debbugs.gnu.org/10260
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Sat 2011-12-10 13:49:33 +0100
message:
  update-subdirs: Don't set no-byte-compile twice (bug#10260).
  lisp/makefile.w32-in (update-subdirs-CMD): Use a Local Variables section.
modified:
  ChangeLog
  lisp/ChangeLog
  lisp/makefile.w32-in
  update-subdirs

=== modified file 'ChangeLog'
--- a/ChangeLog 2011-12-10 12:33:07 +0000
+++ b/ChangeLog 2011-12-10 12:49:33 +0000
@@ -1,3 +1,7 @@
+2011-12-10  Juanma Barranquero  <address@hidden>
+
+       * update-subdirs: Don't set no-byte-compile twice (bug#10260).
+
 2011-12-10  Jan Djärv  <address@hidden>
 
        * configure.in (HAVE_ALSA, HAVE_GSETTINGS): Save and restore LIBS

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-12-10 12:22:25 +0000
+++ b/lisp/ChangeLog    2011-12-10 12:49:33 +0000
@@ -1,3 +1,7 @@
+2011-12-10  Juanma Barranquero  <address@hidden>
+
+       * makefile.w32-in (update-subdirs-CMD): Use a Local Variables section.
+
 2011-12-10  Eli Zaretskii  <address@hidden>
 
        * textmodes/texnfo-upd.el: Update commentary.  Add a warning not

=== modified file 'lisp/makefile.w32-in'
--- a/lisp/makefile.w32-in      2011-04-02 08:55:47 +0000
+++ b/lisp/makefile.w32-in      2011-12-10 12:49:33 +0000
@@ -232,12 +232,15 @@
 update-subdirs: update-subdirs-$(SHELLTYPE)
 
 update-subdirs-CMD: doit
-       echo ;; -*- no-byte-compile: t -*-> $(lisp)/subdirs.el
-       echo ;; In load-path, after this directory should come>> 
$(lisp)/subdirs.el
+       echo ;; In load-path, after this directory should come> 
$(lisp)/subdirs.el
        echo ;; certain of its subdirectories.  Here we specify them.>> 
$(lisp)/subdirs.el
        echo (normal-top-level-add-to-load-path $(SQUOTE)(>> $(lisp)/subdirs.el
        @for %%d in ($(WINS_SUBDIR) cedet) do echo "%%d">> $(lisp)/subdirs.el
        echo ))>> $(lisp)/subdirs.el
+       echo ;; Local Variables:>> $(lisp)/subdirs.el
+       echo ;; version-control: never>> $(lisp)/subdirs.el
+       echo ;; no-byte-compile: t>> $(lisp)/subdirs.el
+       echo ;; End:>> $(lisp)/subdirs.el
 
 update-subdirs-SH: doit
        $(srcdir)/update-subdirs $(lisp); \

=== modified file 'update-subdirs'
--- a/update-subdirs    2011-02-01 17:09:25 +0000
+++ b/update-subdirs    2011-12-10 12:49:33 +0000
@@ -41,8 +41,7 @@
   rm -f subdirs.el
 else
   rm -f subdirs.el~
-  echo ";; -*- no-byte-compile: t -*-
-;; In load-path, after this directory should come
+  echo ";; In load-path, after this directory should come
 ;; certain of its subdirectories.  Here we specify them.
 (normal-top-level-add-to-load-path '($subdirs))
 ;; Local" "Variables: