CVS update by scop packages/unsupported/scop/vc, vc-hooks.el ...

[xemacs-cvs at xemacs.org]

  User: scop    
  Date: 07/06/06 20:09:43

  Modified:    packages/unsupported/scop/vc ChangeLog log-edit.el
                        vc-hooks.el
Log:
Sync vc with upstream.

Revision  Changes    Path
1.85      +1 -1      XEmacs/packages/unsupported/scop/STATUS

Index: STATUS
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/STATUS,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- STATUS	2007/05/21 17:10:55	1.84
+++ STATUS	2007/06/06 18:09:35	1.85
@@ -17,6 +17,6 @@ generic-modes: generic.el and generic-x.
 - Compiles, seems to work, auto-mode-alist and autoloads may need spanking.
 
 vc: vc*.el and a few other related files from GNU Emacs, vc-git.el from git
-- Up to date with GNU Emacs CVS HEAD, hg, git upstream as of 2007-05-21.
+- Up to date with GNU Emacs CVS HEAD, hg, git upstream as of 2007-06-06.
 - Approaching usable state.
 - smerge-mode.el needs work.



1.75      +5 -0      XEmacs/packages/unsupported/scop/vc/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/ChangeLog,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- ChangeLog	2007/05/21 17:14:13	1.74
+++ ChangeLog	2007/06/06 18:09:41	1.75
@@ -1,3 +1,8 @@
+2007-06-06  Ville Skyttä  <scop at xemacs.org>
+
+	* vc-hooks.el: Sync with upstream.
+	* log-edit.el: Ditto.
+
 2007-05-21  Ville Skyttä  <scop at xemacs.org>
 
 	* Makefile (VERSION): 0.91.



1.14      +1 -1      XEmacs/packages/unsupported/scop/vc/log-edit.el

Index: log-edit.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/log-edit.el,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- log-edit.el	2007/02/03 13:08:38	1.13
+++ log-edit.el	2007/06/06 18:09:41	1.14
@@ -540,7 +540,7 @@ If we are between paragraphs, return the
             (point))
           (if (re-search-forward "^[ \t\n]*$" nil t)
               (match-beginning 0)
-            (point)))))
+            (point-max)))))
 
 (defun log-edit-changelog-subparagraph ()
   "Return the bounds of the ChangeLog subparagraph containing point.



1.19      +1 -1      XEmacs/packages/unsupported/scop/vc/vc-hooks.el

Index: vc-hooks.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/vc-hooks.el,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- vc-hooks.el	2007/05/21 16:33:27	1.18
+++ vc-hooks.el	2007/06/06 18:09:41	1.19
@@ -338,7 +338,7 @@ If WITNESS if not found, return nil, oth
                    ;; to another user.  This should save us from looking in
                    ;; things like /net and /afs.  This assumes that all the
                    ;; files inside a project belong to the same user.
-                   (not (equal user (file-attributes file)))
+                   (not (equal user (nth 2 (file-attributes file))))
                    (string-match vc-ignore-dir-regexp file)))
       (if (file-exists-p (expand-file-name witness file))
          (setq root file)