(quail-show-guidance): Don't create a guidance-frame if current buffer is

[gnu-emacs] / lisp / vc-hg.el

diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el
index 60d6fce27175197dec87315744678e7c64e0b069..cad3ebbbb8469216ba22b89c7aab02f58a8f5790 100644 (file)
--- a/lisp/vc-hg.el
+++ b/lisp/vc-hg.el
@@ -42,12 +42,15 @@
 ;; * registered (file)                         OK
 ;; * state (file)                              OK
 ;; - state-heuristic (file)                    NOT NEEDED
+;; - dir-status (dir update-function)          OK
+;; - dir-status-files (dir files ds uf)        OK
+;; - dir-extra-headers (dir)                OK
+;; - dir-printer (fileinfo)                 OK
 ;; * working-revision (file)                   OK
 ;; - latest-on-branch-p (file)                 ??
 ;; * checkout-model (files)                    OK
 ;; - workfile-unchanged-p (file)               OK
 ;; - mode-line-string (file)                   NOT NEEDED
-;; - prettify-state-info (file)                OK
 ;; STATE-CHANGING FUNCTIONS
 ;; * register (files &optional rev comment)    OK
 ;; * create-repo ()                            OK
@@ -426,12 +429,12 @@ REV is the revision to check out into WORKFILE."
   rename-state        ;; rename or copy state
   extra-name)         ;; original name for copies and rename targets, new name for
 
-(declare-function vc-default-status-printer "vc-dir" (backend fileentry))
+(declare-function vc-default-dir-printer "vc-dir" (backend fileentry))
 
-(defun vc-hg-status-printer (info)
+(defun vc-hg-dir-printer (info)
   "Pretty-printer for the vc-dir-fileinfo structure."
   (let ((extra (vc-dir-fileinfo->extra info)))
-    (vc-default-status-printer 'Hg info)
+    (vc-default-dir-printer 'Hg info)
     (when extra
       (insert (propertize
               (format "   (%s %s)"
@@ -499,7 +502,12 @@ REV is the revision to check out into WORKFILE."
   (vc-exec-after
    `(vc-hg-after-dir-status (quote ,update-function))))
 
-(defun vc-hg-status-extra-header (name &rest commands)
+(defun vc-hg-dir-status-files (dir files default-state update-function)
+  (apply 'vc-hg-command (current-buffer) 'async dir "status" "-C" files)
+  (vc-exec-after
+   `(vc-hg-after-dir-status (quote ,update-function))))
+
+(defun vc-hg-dir-extra-header (name &rest commands)
   (concat (propertize name 'face 'font-lock-type-face)
           (propertize
            (with-temp-buffer
@@ -507,16 +515,16 @@ REV is the revision to check out into WORKFILE."
              (buffer-substring-no-properties (point-min) (1- (point-max))))
            'face 'font-lock-variable-name-face)))
 
-(defun vc-hg-status-extra-headers (dir)
+(defun vc-hg-dir-extra-headers (dir)
   "Generate extra status headers for a Mercurial tree."
   (let ((default-directory dir))
     (concat
-     (vc-hg-status-extra-header "Root       : " "root") "\n"
-     (vc-hg-status-extra-header "Branch     : " "id" "-b") "\n"
-     (vc-hg-status-extra-header "Tags       : " "id" "-t") ; "\n"
+     (vc-hg-dir-extra-header "Root       : " "root") "\n"
+     (vc-hg-dir-extra-header "Branch     : " "id" "-b") "\n"
+     (vc-hg-dir-extra-header "Tags       : " "id" "-t") ; "\n"
      ;; these change after each commit
-     ;; (vc-hg-status-extra-header "Local num  : " "id" "-n") "\n"
-     ;; (vc-hg-status-extra-header "Global id  : " "id" "-i")
+     ;; (vc-hg-dir-extra-header "Local num  : " "id" "-n") "\n"
+     ;; (vc-hg-dir-extra-header "Global id  : " "id" "-i")
      )))
 
 ;; FIXME: this adds another top level menu, instead figure out how to