merge from trunk

4 files changed, 25 insertions, 5 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index ea977e80cfa..145028ec815 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,16 @@
+2012-08-28  Glenn Morris  <rgm@gnu.org>
+
+        * bzrmerge.el (bzrmerge-merges): Allow unversioned files in the tree.
+
+2012-08-28  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * charsets/mule-charsets.el (header): Fix typo.
+
+2012-08-24  Paul Eggert  <eggert@cs.ucla.edu>
+
+        On assertion failure, print backtrace if available.
+        * merge-gnulib (GNULIB_MODULES): Add execinfo.
+
 2012-08-16  Paul Eggert  <eggert@cs.ucla.edu>
 
         Use ASCII tests for character types.
diff --git a/admin/bzrmerge.el b/admin/bzrmerge.el
index e174312143d..8d64dd9edbf 100644
--- a/admin/bzrmerge.el
+++ b/admin/bzrmerge.el
@@ -45,16 +45,23 @@ The list returned is sorted by oldest-first."
     (erase-buffer)
     ;; We generally want to make sure we start with a clean tree, but we also
     ;; want to allow restarts (i.e. with some part of FROM already merged but
-    ;; not yet committed).
+    ;; not yet committed).  Unversioned (unknown) files in the tree
+    ;; are also ok.
     (call-process "bzr" nil t nil "status" "-v")
     (goto-char (point-min))
     (when (re-search-forward "^conflicts:\n" nil t)
       (error "You still have unresolved conflicts"))
-    (let ((merges ()))
+    (let ((merges ())
+          found)
       (if (not (re-search-forward "^pending merges:\n" nil t))
           (when (save-excursion
                   (goto-char (point-min))
-                  (re-search-forward "^[a-z ]*:\n" nil t))
+                  (while (and
+                          (re-search-forward "^\\([a-z ]*\\):\n" nil t)
+                          (not
+                           (setq found
+                                 (not (equal "unknown" (match-string 1)))))))
+                  found)
             (error "You still have uncommitted changes"))
         ;; This is really stupid, but it seems there's no easy way to figure
         ;; out which revisions have been merged already.  The only info I can
diff --git a/admin/charsets/mule-charsets.el b/admin/charsets/mule-charsets.el
index 9ac08bef724..4a48d994b1b 100644
--- a/admin/charsets/mule-charsets.el
+++ b/admin/charsets/mule-charsets.el
@@ -45,7 +45,7 @@
 
 (defconst header
   (format
-   "# Generated by running amdin/charsets/mule-charsets.el in Emacs %d.%d.\n"
+   "# Generated by running admin/charsets/mule-charsets.el in Emacs %d.%d.\n"
    emacs-major-version emacs-minor-version))
 
 (dolist (elt charset-alist)
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index 63865edf3ce..775d43e68d3 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -28,7 +28,7 @@ GNULIB_URL=git://git.savannah.gnu.org/gnulib.git
 GNULIB_MODULES='
   alloca-opt c-ctype c-strcase
   careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512
-  dtoastr dtotimespec dup2 environ
+  dtoastr dtotimespec dup2 environ execinfo
   filemode getloadavg getopt-gnu gettime gettimeofday
   ignore-value intprops largefile lstat
   manywarnings mktime pselect pthread_sigmask readlink