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

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/05/27 01:13:25

Index: vc-dispatcher.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc-dispatcher.el,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- vc-dispatcher.el    26 May 2008 23:49:34 -0000      1.56
+++ vc-dispatcher.el    27 May 2008 01:13:25 -0000      1.57
@@ -1024,6 +1024,10 @@
            (funcall mark-unmark-function))))
     (funcall mark-unmark-function)))
 
+(defun vc-string-prefix-p (prefix string)
+  (and (>= (length string) (length prefix))
+       (eq t (compare-strings prefix nil nil string nil (length prefix)))))
+
 (defun vc-dir-parent-marked-p (arg)
   ;; Return nil if none of the parent directories of arg is marked.
   (let* ((argdir (vc-dir-node-directory arg))
@@ -1036,7 +1040,7 @@
       (setq data (ewoc-data crt))
       (setq dir (vc-dir-node-directory crt))
       (when (and (vc-dir-fileinfo->directory data)
-                (string-equal (substring argdir 0 (length dir)) dir))
+                (vc-string-prefix-p dir argdir))
        (when (vc-dir-fileinfo->marked data)
          (error "Cannot mark `%s', parent directory `%s' marked"
                 (vc-dir-fileinfo->name (ewoc-data arg))