Fix bug#9935

* lisp/vc/vc-bzr.el: Accept status with more than 9 shelves.
  Reported by Colin D Bennett <colin@gibibit.com>.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ad381e67cf873506b67c927824e97e4cc5c732d5..a577dc1f38280bddbb8674c2006745c7dd1843bd 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-02  Juanma Barranquero  <lekktu@gmail.com>
+
+       * vc/vc-bzr.el (vc-bzr-state, vc-bzr-after-dir-status):
+       Accept status with more than 9 shelves.  (Bug#9935)
+       Reported by Colin D Bennett <colin@gibibit.com>.
+
 2011-11-01  Martin Rudalics  <rudalics@gmx.at>
 
        * help.el (with-help-window): Don't reference

diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el
index cc28db689e93e5b8fec90bd7bed12f7d86c2df05..f6b6a56f31c88925075316f2c625fcd05215574a 100644 (file)
--- a/lisp/vc/vc-bzr.el
+++ b/lisp/vc/vc-bzr.el
@@ -444,7 +444,7 @@ If any error occurred in running `bzr status', then return nil."
       (let ((warnings (cdr result)))
         (when warnings
           ;; bzr 2.3.0 returns info about shelves, which is not really a warning
-          (when (string-match "[1-9]+ shel\\(f\\|ves\\) exists?\\..*?\n" warnings)
+          (when (string-match "[0-9]+ shel\\(f\\|ves\\) exists?\\..*?\n" warnings)
             (setq warnings (replace-match "" nil nil warnings)))
           (unless (string= warnings "")
             (message "Warnings in `bzr' output: %s" warnings))))
@@ -891,7 +891,7 @@ stream.  Standard error output is discarded."
       (goto-char (point-min))
       (while (not (eobp))
         ;; Bzr 2.3.0 added this if there are shelves.  (Bug#8170)
-        (unless (looking-at "[1-9]+ shel\\(f\\|ves\\) exists?\\.")
+        (unless (looking-at "[0-9]+ shel\\(f\\|ves\\) exists?\\.")
           (setq status-str
                 (buffer-substring-no-properties (point) (+ (point) 3)))
           (setq translated (cdr (assoc status-str translation)))