aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2008-04-21 16:18:12 +0000
committerDan Nicolaescu2008-04-21 16:18:12 +0000
commit47302633b2d8234d166d9df2bf88e7ddbae5cd5f (patch)
treeeb7660cf85a57ae7076f4fb7c2943af7a38d2b87
parentd55fe5bb3eb98fc19dbab064b5adfbe3a16a6c1b (diff)
downloademacs-47302633b2d8234d166d9df2bf88e7ddbae5cd5f.tar.gz
emacs-47302633b2d8234d166d9df2bf88e7ddbae5cd5f.zip
(vc-cvs-status-extra-headers): New function.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/vc-cvs.el14
2 files changed, 15 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0f065ec2a31..b9a9713273c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -6,6 +6,8 @@
6 6
72008-04-21 Dan Nicolaescu <dann@ics.uci.edu> 72008-04-21 Dan Nicolaescu <dann@ics.uci.edu>
8 8
9 * vc-cvs.el (vc-cvs-status-extra-headers): New function.
10
9 * vc-hooks.el (vc-insert-file, vc-state, vc-working-revision) 11 * vc-hooks.el (vc-insert-file, vc-state, vc-working-revision)
10 (vc-check-master-templates, vc-file-not-found-hook) 12 (vc-check-master-templates, vc-file-not-found-hook)
11 (vc-kill-buffer-hook): 13 (vc-kill-buffer-hook):
diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el
index d976213f187..67830b48fd5 100644
--- a/lisp/vc-cvs.el
+++ b/lisp/vc-cvs.el
@@ -939,7 +939,6 @@ state."
939 ;; (funcall update-function result))) 939 ;; (funcall update-function result)))
940 ) 940 )
941 941
942;; XXX Experimental function for the vc-dired replacement.
943(defun vc-cvs-dir-status (dir update-function) 942(defun vc-cvs-dir-status (dir update-function)
944 "Create a list of conses (file . state) for DIR." 943 "Create a list of conses (file . state) for DIR."
945 (vc-cvs-command (current-buffer) 'async dir "status") 944 (vc-cvs-command (current-buffer) 'async dir "status")
@@ -951,6 +950,19 @@ state."
951 (vc-exec-after 950 (vc-exec-after
952 `(vc-cvs-after-dir-status (quote ,update-function)))) 951 `(vc-cvs-after-dir-status (quote ,update-function))))
953 952
953(defun vc-cvs-status-extra-headers (dir)
954 (concat
955 ;; FIXME: see how PCL-CVS gets the data to print all these
956 (propertize "Module : " 'face 'font-lock-type-face)
957 (propertize "ADD CODE TO PRINT THE MODULE\n"
958 'face 'font-lock-warning-face)
959 (propertize "Repository : " 'face 'font-lock-type-face)
960 (propertize "ADD CODE TO PRINT THE REPOSITORY\n"
961 'face 'font-lock-warning-face)
962 (propertize "Branch : " 'face 'font-lock-type-face)
963 (propertize "ADD CODE TO PRINT THE BRANCH NAME\n"
964 'face 'font-lock-warning-face)))
965
954(defun vc-cvs-get-entries (dir) 966(defun vc-cvs-get-entries (dir)
955 "Insert the CVS/Entries file from below DIR into the current buffer. 967 "Insert the CVS/Entries file from below DIR into the current buffer.
956This function ensures that the correct coding system is used for that, 968This function ensures that the correct coding system is used for that,