User: scop Date: 05/12/05 12:26:29 Modified: packages/unsupported/scop/vc ChangeLog Makefile log-edit.el package-info.in vc-xemacs.el Removed: packages/unsupported/scop/vc pcvs-util.el Log: Make log-edit.el use pcl-cvs-util.el. Revision Changes Path 1.38 +7 -0 XEmacs/packages/unsupported/scop/vc/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/ChangeLog,v retrieving revision 1.37 retrieving revision 1.38 diff -u -p -r1.37 -r1.38 --- ChangeLog 2005/12/05 10:37:57 1.37 +++ ChangeLog 2005/12/05 11:26:28 1.38 ＠＠ -2,6 +2,13 ＠＠ * log-edit.el: Sync with upstream. + * log-edit.el: Use pcl-cvs-util (already in the packages tree). + * Makefile (REQUIRES): Add pcl-cvs. + * Makefile (ELCS): Remove pcvs-util.elc. + * package-info-in (provides): Remove pcvs-util. + * pcvs-util.el: Remove. + * vc-xemacs.el (compare-strings): Remove, only used by pcvs-util. + 2005-11-28 Ville Skyttä <scop(a)xemacs.org&gt; * log-edit.el: Sync with upstream. 1.4 +2 -2 XEmacs/packages/unsupported/scop/vc/Makefile Index: Makefile =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- Makefile 2004/12/12 22:34:58 1.3 +++ Makefile 2005/12/05 11:26:28 1.4 ＠＠ -22,10 +22,10 ＠＠ AUTHOR_VERSION = MAINTAINER = Ville Skyttä <scop(a)xemacs.org&gt; PACKAGE = vc PKG_TYPE = regular -REQUIRES = dired xemacs-base vc mail-lib ediff sh-script +REQUIRES = dired xemacs-base vc mail-lib ediff sh-script pcl-cvs CATEGORY = unsupported ELCS = vc-hooks.elc vc.elc vc-arch.elc vc-cvs.elc vc-mcvs.elc vc-rcs.elc \ - vc-sccs.elc vc-svn.elc vc-xemacs.elc log-edit.elc pcvs-util.elc + vc-sccs.elc vc-svn.elc vc-xemacs.elc log-edit.elc include ../../../XEmacs.rules 1.9 +2 -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.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- log-edit.el 2005/12/05 10:37:58 1.8 +++ log-edit.el 2005/12/05 11:26:28 1.9 ＠＠ -34,7 +34,8 ＠＠ (eval-when-compile (require 'cl)) (require 'add-log) ; for all the ChangeLog goodies -(require 'pcvs-util) +;; XEmacs change: pcvs-util -> pcl-cvs-util +(require 'pcl-cvs-util) (require 'ring) ;;;; 1.4 +1 -1 XEmacs/packages/unsupported/scop/vc/package-info.in Index: package-info.in =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/package-info.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- package-info.in 2004/12/12 22:34:58 1.3 +++ package-info.in 2005/12/05 11:26:28 1.4 ＠＠ -13,7 +13,7 ＠＠ filename FILENAME md5sum MD5SUM size SIZE - provides (vc vc-hooks vc-arch vc-cvs vc-mcvs vc-rcs vc-sccs vc-svn vc-xemacs log-edit pcvs-util) + provides (vc vc-hooks vc-arch vc-cvs vc-mcvs vc-rcs vc-sccs vc-svn vc-xemacs log-edit) requires (REQUIRES) type regular )) 1.5 +0 -42 XEmacs/packages/unsupported/scop/vc/vc-xemacs.el Index: vc-xemacs.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/vc-xemacs.el,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- vc-xemacs.el 2005/11/14 22:52:33 1.4 +++ vc-xemacs.el 2005/12/05 11:26:29 1.5 ＠＠ -84,46 +84,4 ＠＠ Unless optional argument INPLACE is non- (unless (boundp 'find-file-hook) (defvaralias 'find-file-hook 'find-file-hooks)) -;; From ecb/ecb-util.el -(unless (fboundp 'compare-strings) - (defun compare-strings (str1 start1 end1 str2 start2 end2 &optional ignore-case) - "Compare the contents of two strings. -In string STR1, skip the first START1 characters and stop at END1. -In string STR2, skip the first START2 characters and stop at END2. -END1 and END2 default to the full lengths of the respective strings. - -Case is significant in this comparison if IGNORE-CASE is nil. - -The value is t if the strings (or specified portions) match. -If string STR1 is less, the value is a negative number N; - - 1 - N is the number of characters that match at the beginning. -If string STR1 is greater, the value is a positive number N; - N - 1 is the number of characters that match at the beginning." - (or start1 (setq start1 0)) - (or start2 (setq start2 0)) - (setq end1 (if end1 - (min end1 (length str1)) - (length str1))) - (setq end2 (if end2 - (min end2 (length str2)) - (length str2))) - (let ((i1 start1) - (i2 start2) - result c1 c2) - (while (and (not result) (< i1 end1) (< i2 end2)) - (setq c1 (aref str1 i1) - c2 (aref str2 i2) - i1 (1+ i1) - i2 (1+ i2)) - (if ignore-case - (setq c1 (upcase c1) - c2 (upcase c2))) - (setq result (cond ((< c1 c2) (- i1)) - ((> c1 c2) i1)))) - (or result - (cond ((< i1 end1) (1+ (- i1 start1))) - ((< i2 end2) (1- (- start1 i1))) - (t))) - ))) - (provide 'vc-xemacs)