Merge from emacs-24

2 files changed, 22 insertions, 7 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 900da6aefa4..96a98e56109 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-16  Glenn Morris  <rgm@gnu.org>
+
+        * update_autogen: Auto-detect VCS in use.
+        (vcs): New variable.
+        (status, commit, main): Handle git.
+
 2014-11-13  Andreas Schwab  <schwab@suse.de>
 
         * make-tarball.txt: Make annotated tag and push it out.
@@ -10,8 +16,8 @@
 
 2014-11-10  Eli Zaretskii  <eliz@gnu.org>
 
-        * unidata/Makefile.in (${top_srcdir}/src/macuvs.h): Use
-        unmsys--file-name.  (Bug#18955)
+        * unidata/Makefile.in (${top_srcdir}/src/macuvs.h):
+        Use unmsys--file-name.  (Bug#18955)
 
 2014-11-10  Glenn Morris  <rgm@gnu.org>
 
@@ -28,7 +34,7 @@
 
         * grammars/c.by (template-type): Add :template-specifier and
         :typevar to capture extra details about the template.
-        (opt-post-fcn-modifiers): Splice in the found symbol into the
+        (opt-post-fcn-modifiers): Splice in the found symbol into the
         return value correctly.
         (QUESTION): New punctuation.
         (expression): Add ternary conditional support.
@@ -36,8 +42,8 @@
         * grammars/scheme.by (MODULE): New token.
         (scheme): Handle expanding the MODULE tag.
         (scheme-list): Remove closeparen required match.
-        (scheme-in-list): Remove extraneous matches for DEFINE.  Add
-        support for MODULE Simplify matching for code & make work.
+        (scheme-in-list): Remove extraneous matches for DEFINE.
+        Add support for MODULE Simplify matching for code & make work.
         (name-args, name-arg-list, name-arg-expand): Make it work.
 
 2014-11-09  David Engster <dengste@eml.cc>
diff --git a/admin/update_autogen b/admin/update_autogen
index 8b0ae67028a..4c4f52e2d2d 100755
--- a/admin/update_autogen
+++ b/admin/update_autogen
@@ -47,7 +47,9 @@ cd $PD
 cd ../
 [ -d admin ] || die "Could not locate admin directory"
 
-if [ -d .git ]; then
+if [ -d .bzr ]; then
+    vcs=bzr
+elif [ -d .git ]; then
     vcs=git
 else
     die "Cannot determine vcs"
@@ -303,6 +305,9 @@ EOF
 
     modified=$(status $basegen) || die
 
+    ## bzr status output is always relative to top-level, not PWD.
+    [ "$vcs" = "bzr" ] && cd $oldpwd
+
     commit "generated" $modified || die "commit error"
 
     exit 0
@@ -374,7 +379,11 @@ echo "Checking status of loaddef files..."
 ## It probably would be fine to just check+commit lisp/, since
 ## making autoloads should not effect any other files.  But better
 ## safe than sorry.
-modified=$(status $genfiles $ldefs_out) || die
+modified=$(status $genfiles ${ldefs_out#lisp/}) || die
+
+
+## bzr status output is always relative to top-level, not PWD.
+[ "$vcs" = "bzr" ] && cd ../
 
 
 commit "loaddefs" $modified || die "commit error"