Commits

youngs  committed 7d73bd1

Patch from Mike Sperber to make pcl-cvs build again

  • Participants
  • Parent commits b5eb0a4
  • Tags pcl-cvs-1_54

Comments (0)

Files changed (4)

+2001-04-12  Mike Sperber  <mike@xemacs.org>
+
+	* pcl-cvs.el (cvs-mode-diff): Remove call to
+	`cvs-prepare-diff-mode'.
+	Use diff-mode again.
+
+	* cvs-compat.el (cvs-prepare-diff-mode): Remove again.
+
+	* Makefile (REQUIRES): Add prog-modes.
+
 2001-02-24  Ben Wing  <ben@xemacs.org>
 
 	* Makefile (REQUIRES):
 # the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-VERSION = 1.53
+VERSION = 1.54
 AUTHOR_VERSION = R-2_9_9
 MAINTAINER = XEmacs Development Team <xemacs-beta@xemacs.org>
 PACKAGE = pcl-cvs
 PKG_TYPE = regular
-REQUIRES = xemacs-base elib vc dired edebug ediff edit-utils mail-lib
+REQUIRES = xemacs-base elib vc dired edebug ediff edit-utils mail-lib \
+	prog-modes
 CATEGORY = prog
 
 ELCS = cvs-compat.elc cvs-edit.elc cvs-log.elc cvs-status.elc \

File cvs-compat.el

   (defmacro defface (sym val str &rest rest)
     `(defvar ,sym (make-face ',sym) ,str)))
 
-(defun cvs-prepare-diff-mode (flags files)
-  "Gross hack to support XEmacs's diff-mode."
-  (if (boundp 'diff-hunk-pattern) ; recognize old diff.el from EFS/Dired
-      (catch 'done
-	(let ((flags (or flags (list nil))))
-	  (while flags
-	    (let* ((flag (car flags))
-		   (flag-char (and (stringp flag) (aref flag 1)))
-		   (patterns (assq flag-char diff-search-pattern-alist)))
-	      (if patterns
-		  (progn
-		    (let ((old (car files))
-			  (new (car files)))
-		      (setq old-buffer (diff-get-file-buffer old)
-			    new-buffer (diff-get-file-buffer new)
-			    diff-old-file (cons old (cdr old-buffer))
-			    diff-new-file (cons new (cdr new-buffer))))
-		    (setq diff-old-file-pattern (nth 2 patterns)
-			  diff-new-file-pattern (nth 3 patterns)
-			  diff-hunk-pattern (nth 1 patterns))
-		    (throw 'done nil)))
-	      (setq flags (cdr flags))))))))
-
 ;;;;
 ;;;; missing functions in Emacs
 ;;;;
 (require 'pcl-cvs-util)
 (require 'pcl-cvs-parse)
 (require 'pcl-cvs-info)
-(require 'diff)
+(require 'diff-mode)
 
 
 ;;;;
    (list (cvs-add-branch-prefix
 	  (cvs-add-secondary-branch-prefix
 	   (cvs-flags-query 'cvs-diff-flags "cvs diff flags")))))
-  (cvs-prepare-diff-mode flags
-			 (mapcar (function cvs-fileinfo->full-path)
-				 (cvs-mode-marked 'diff "diff")))
   (cvs-mode-do "diff" flags 'diff
 	       :show t)) ;; :ignore-exit t
 
-
 ;;----------
 (defun-cvs-mode (cvs-mode-diff-head . SIMPLE) (flags)
   "Diff the selected files against the head of the current branch.