From: Juanma Barranquero Date: Wed, 2 Nov 2011 01:58:59 +0000 (+0100) Subject: Fix bug#9935 X-Git-Tag: emacs-pretest-24.0.92~235 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ebe06da995f8f7b9b8e502c123ad4e8677e34dec;p=emacs.git Fix bug#9935 * lisp/vc/vc-bzr.el: Accept status with more than 9 shelves. Reported by Colin D Bennett . --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ad381e67cf8..a577dc1f382 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2011-11-02 Juanma Barranquero + + * 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 . + 2011-11-01 Martin Rudalics * help.el (with-help-window): Don't reference diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el index cc28db689e9..f6b6a56f31c 100644 --- 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)))