Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-18 02:47:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix bug#9935

Browse source 
* lisp/vc/vc-bzr.el: Accept status with more than 9 shelves.
  Reported by Colin D Bennett <colin@gibibit.com>.
This commit is contained in:
Juanma Barranquero 2011-11-02 02:58:59 +01:00
parent 00b77525cb
commit ebe06da995
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -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

4
lisp/vc/vc-bzr.el
View file

@ -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)))