Commit 85a55d38 authored by Glenn Morris's avatar Glenn Morris
Browse files

* lisp/vc/vc-bzr.el (vc-bzr-after-dir-status): Handle bzr 2.3.0. (Bug#8170)

parent 38c179c9
2011-03-04 Glenn Morris <rgm@gnu.org>
* vc/vc-bzr.el (vc-bzr-after-dir-status): Handle bzr 2.3.0. (Bug#8170)
2011-03-04 Tom Tromey <tromey@redhat.com>
 
* progmodes/gud.el (gdb-script-mode): Derive from prog-mode.
......
......@@ -879,6 +879,8 @@ stream. Standard error output is discarded."
(result nil))
(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?\\.")
(setq status-str
(buffer-substring-no-properties (point) (+ (point) 3)))
(setq translated (cdr (assoc status-str translation)))
......@@ -909,7 +911,7 @@ stream. Standard error output is discarded."
(buffer-substring-no-properties
(+ (point) 4)
(line-end-position)) relative-dir)
translated) result)))
translated) result))))
(forward-line))
(funcall update-function result)))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment