Commit eb604e34 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

* lisp/vc/vc-bzr.el (vc-bzr-revision-keywords): Update.

(vc-bzr-revision-completion-table): Add support for annotate and date.
parent 1a1e3f32
2011-07-01 Stefan Monnier <monnier@iro.umontreal.ca>
* vc/vc-bzr.el (vc-bzr-revision-keywords): Update.
(vc-bzr-revision-completion-table): Add support for annotate and date.
* emacs-lisp/derived.el (define-derived-mode): Make abbrev-table
inherit from parent.
......@@ -27,7 +30,7 @@
(cfengine3-class-selector-regex cfengine3-category-regex)
(cfengine3-vartypes cfengine3-font-lock-keywords)
(cfengine3-beginning-of-defun, cfengine3-end-of-defun)
(cfengine3-indent-line): Added from cfengine3.el.
(cfengine3-indent-line): Add from cfengine3.el.
2011-07-01 Michael Albinus <michael.albinus@gmx.de>
......
......@@ -1172,8 +1172,9 @@ stream. Standard error output is discarded."
(eval-and-compile
(defconst vc-bzr-revision-keywords
'("revno" "revid" "last" "before"
"tag" "date" "ancestor" "branch" "submit")))
;; bzr help revisionspec | sed -ne 's/^\([a-z]*\):$/"\1"/p' | sort -u
'("ancestor" "annotate" "before" "branch" "date" "last" "mainline" "revid"
"revno" "submit" "svn" "tag")))
(defun vc-bzr-revision-completion-table (files)
(lexical-let ((files files))
......@@ -1211,6 +1212,19 @@ stream. Standard error output is discarded."
(push (match-string-no-properties 1) table)))
(completion-table-with-context prefix table tag pred action)))
((string-match "\\`annotate:" string)
(completion-table-with-context
(substring string 0 (match-end 0))
(apply-partially #'completion-table-with-terminator '(":" . "\\`a\\`")
#'completion-file-name-table)
(substring string (match-end 0)) pred action))
((string-match "\\`date:" string)
(completion-table-with-context
(substring string 0 (match-end 0))
'("yesterday" "today" "tomorrow")
(substring string (match-end 0)) pred action))
((string-match "\\`\\([a-z]+\\):" string)
;; no actual completion for the remaining keywords.
(completion-table-with-context (substring string 0 (match-end 0))
......
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