[Emacs-diffs] /srv/bzr/emacs/trunk r106267: Fix bug#9935

[Juanma Barranquero]

------------------------------------------------------------
revno: 106267
fixes bug(s): http://debbugs.gnu.org/9935
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Wed 2011-11-02 02:58:59 +0100
message:
  Fix bug#9935
  * lisp/vc/vc-bzr.el: Accept status with more than 9 shelves.
    Reported by Colin D Bennett <address@hidden>.
modified:
  lisp/ChangeLog
  lisp/vc/vc-bzr.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-11-01 19:22:57 +0000
+++ b/lisp/ChangeLog    2011-11-02 01:58:59 +0000
@@ -1,3 +1,9 @@
+2011-11-02  Juanma Barranquero  <address@hidden>
+
+       * 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 <address@hidden>.
+
 2011-11-01  Martin Rudalics  <address@hidden>
 
        * help.el (with-help-window): Don't reference

=== modified file 'lisp/vc/vc-bzr.el'
--- a/lisp/vc/vc-bzr.el 2011-10-19 16:42:20 +0000
+++ b/lisp/vc/vc-bzr.el 2011-11-02 01:58:59 +0000
@@ -444,7 +444,7 @@
       (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 @@
       (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)))