[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r104854: * lisp/vc/vc-bzr.el (vc-bzr-
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r104854: * lisp/vc/vc-bzr.el (vc-bzr-revision-keywords): Update. |
Date: |
Fri, 01 Jul 2011 13:45:31 -0400 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 104854
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Fri 2011-07-01 13:45:31 -0400
message:
* lisp/vc/vc-bzr.el (vc-bzr-revision-keywords): Update.
(vc-bzr-revision-completion-table): Add support for annotate and date.
modified:
lisp/ChangeLog
lisp/vc/vc-bzr.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-07-01 16:41:02 +0000
+++ b/lisp/ChangeLog 2011-07-01 17:45:31 +0000
@@ -1,5 +1,8 @@
2011-07-01 Stefan Monnier <address@hidden>
+ * 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 <address@hidden>
=== modified file 'lisp/vc/vc-bzr.el'
--- a/lisp/vc/vc-bzr.el 2011-05-24 08:22:58 +0000
+++ b/lisp/vc/vc-bzr.el 2011-07-01 17:45:31 +0000
@@ -1172,8 +1172,9 @@
(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 @@
(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))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r104854: * lisp/vc/vc-bzr.el (vc-bzr-revision-keywords): Update.,
Stefan Monnier <=