[Emacs-diffs] Changes to emacs/lisp/vc-cvs.el,v

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   07/07/22 19:04:12

Index: vc-cvs.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc-cvs.el,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- vc-cvs.el   20 Jul 2007 03:56:53 -0000      1.87
+++ vc-cvs.el   22 Jul 2007 19:04:10 -0000      1.88
@@ -258,14 +258,25 @@
 Compared to the default implementation, this function does two things:
 Handle the special case of a CVS file that is added but not yet
 committed and support display of sticky tags."
-  (let ((sticky-tag (vc-file-getprop file 'vc-cvs-sticky-tag))
-       (string (if (string= (vc-workfile-version file) "0")
+  (let* ((sticky-tag (vc-file-getprop file 'vc-cvs-sticky-tag))
+        help-echo
+        (string 
+         (if (string= (vc-workfile-version file) "0")
                    ;; A file that is added but not yet committed.
-                   "CVS @@"
-                 (vc-default-mode-line-string 'CVS file))))
+             (progn
+               (setq help-echo "Added file (needs commit) under CVS")
+               "CVS @@")
+           (let ((def-ml (vc-default-mode-line-string 'CVS file)))
+             (setq help-echo 
+                   (get-text-property 0 'help-echo def-ml))
+             def-ml))))
+    (propertize 
     (if (zerop (length sticky-tag))
        string
-      (concat string "[" sticky-tag "]"))))
+       (setq help-echo (format "%s on the '%s' branch" 
+                              help-echo sticky-tag))
+       (concat string "[" sticky-tag "]"))
+     'help-echo help-echo)))
 
 (defun vc-cvs-dired-state-info (file)
   "CVS-specific version of `vc-dired-state-info'."