Bug fix for vc-dispatcher split.

[bpt/emacs.git] / update-subdirs

diff --git a/update-subdirs b/update-subdirs
index 801b150..302a8f2 100755 (executable)
--- a/update-subdirs
+++ b/update-subdirs
@@ -1,13 +1,14 @@
 #!/bin/sh
 # Write into $1/subdirs.el a list of subdirs of directory $1.
 
-# Copyright (C) 1994, 1995, 1997, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1997, 1999, 2001, 2002, 2003, 2004, 2005,
+#   2006, 2007, 2008  Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
 # GNU Emacs is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 #
 # GNU Emacs is distributed in the hope that it will be useful,
@@ -17,14 +18,14 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 cd $1
 for file in *; do
     case $file in
        *.elc | *.el | term | RCS | CVS | Old | . | .. | =* | *~ | *.orig | *.rej)
-         ;;    
+         ;;
        *)
            if [ -d $file ]; then
              subdirs="\"$file\" $subdirs"
@@ -36,11 +37,16 @@ done
 if [ "x$subdirs" = x ]; then
   rm -f subdirs.el
 else
-
-  echo ";; -*- no-byte-compile: t -*-" > subdirs.el
-
-  echo ";; In load-path, after this directory should come
-;; certain of its subdirectories.  Here we specify them." >> subdirs.el
-
-  echo "(normal-top-level-add-to-load-path '($subdirs))" >> subdirs.el
+  rm -f subdirs.el~
+  echo ";; -*- no-byte-compile: t -*-
+;; 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:
+;; version-control: never
+;; no-byte-compile: t
+;; End:" > subdirs.el~
+  mv subdirs.el~ subdirs.el
 fi
+
+# arch-tag: 56ebcf1b-5c30-4934-b0b4-72d374064704