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

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/06/16 20:36:55

Index: vc-dispatcher.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc-dispatcher.el,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- vc-dispatcher.el    12 Jun 2008 03:49:52 -0000      1.62
+++ vc-dispatcher.el    16 Jun 2008 20:36:55 -0000      1.63
@@ -1258,13 +1258,10 @@
                       data)
                  (while
                      (and (setq crt (ewoc-next vc-ewoc crt))
-                          (string-equal
-                           (substring
+                          (vc-string-prefix-p dir
                             (progn
                               (setq data (ewoc-data crt))
-                              (vc-dir-node-directory crt))
-                            0 dirlen)
-                           dir))
+                                                 (vc-dir-node-directory crt))))
                    (unless (vc-dir-fileinfo->directory data)
                      (push (expand-file-name (vc-dir-fileinfo->name data)) 
result))))
              (push (expand-file-name (vc-dir-fileinfo->name crt-data)) result)
@@ -1284,13 +1281,9 @@
               data)
          (while
              (and (setq crt (ewoc-next vc-ewoc crt))
-                  (string-equal
-                   (substring
-                    (progn
+                   (vc-string-prefix-p dir (progn
                       (setq data (ewoc-data crt))
-                      (vc-dir-node-directory crt))
-                    0 dirlen)
-                   dir))
+                                             (vc-dir-node-directory crt))))
            (unless (vc-dir-fileinfo->directory data)
              (push (expand-file-name (vc-dir-fileinfo->name data)) result))))
       (push (expand-file-name (vc-dir-fileinfo->name crt-data)) result))
@@ -1315,19 +1308,21 @@
              (let ((ddir (expand-file-name default-directory)))
                (when (vc-string-prefix-p ddir file)
                  (let*
+                      ;; FIXME: Any reason we don't use file-relative-name?
                      ((file-short (substring file (length ddir)))
-                      (state
-                       (funcall (vc-client-object->file-to-state 
vc-client-mode)
+                      (state (funcall (vc-client-object->file-to-state
+                                        vc-client-mode)
                                 file))
-                      (extra
-                       (funcall (vc-client-object->file-to-extra 
vc-client-mode)
+                      (extra (funcall (vc-client-object->file-to-extra
+                                        vc-client-mode)
                                 file))
                       (entry
                        (list file-short state extra)))
                    (vc-dir-update (list entry) status-buf))))))
          ;; We didn't find any vc-dir buffers, remove the hook, it is
          ;; not needed.
-         (unless found-vc-dir-buf (remove-hook 'after-save-hook 
'vc-dir-resynch-file)))))))
+         (unless found-vc-dir-buf
+            (remove-hook 'after-save-hook 'vc-dir-resynch-file)))))))
 
 (defun vc-dir-mode (client-object)
   "Major mode for dispatcher directory buffers.