diff lisp/ediff-vers.el @ 85825:13163bbed0bf

* progmodes/mixal-mode.el (mixal-run, mixal-debug): Call mixvm only if it is bound. * textmodes/reftex.el: Move autoloads for before all uses. (reftex-make-overlay, reftex-overlay-put, reftex-move-overlay) (reftex-delete-overlay): Move to the top level with the condition in the body. * progmodes/simula.el: Use when instead of if. * iimage.el (iimage-locate-file): Define unconditionally. * mail/mailabbrev.el (mail-abbrev-next-line): * emulation/vip.el (vip-enlarge-region, vip-line) (vip-next-line-at-bol, vip-previous-line) (vip-previous-line-at-bol, vip-find-char, vip-put-back, ex-read): Wrap with-no-warnings around uses of next-line and previous-line. * ediff.el (run-ediff-from-cvs-buffer): * ediff-vers.el (cvs-run-ediff-on-file-descriptor): Remove function not used by pcl-cvs anymore. (noninteractive, generic-sc-get-latest-rev) (ediff-generic-sc-internal, ediff-generic-sc-merge-internal): Delete support for long obsolete generic-sc.el.

--- a/lisp/ediff-vers.el	Wed Oct 31 04:08:29 2007 +0000
+++ b/lisp/ediff-vers.el	Wed Oct 31 06:28:09 2007 +0000
@@ -39,13 +39,6 @@
        (let ((load-path (cons (expand-file-name ".") load-path)))
 	 (load "pcl-cvs" 'noerror)
 	 (load "rcs" 'noerror)
-	 ;; On 8+3 MS-DOS filesystems, generic-x.el is loaded
-	 ;; instead of (the missing) generic-sc.el.  Since the
-	 ;; version of Emacs which supports MS-DOS doesn't have
-	 ;; generic-sc, we simply avoid loading it.
-	 (or (and (fboundp 'msdos-long-file-names)
-		  (not (msdos-long-file-names)))
-	     (load "generic-sc" 'noerror))
 	 ;; (load "vc" 'noerror) ; this sometimes causes compiler error
 	 (or (featurep 'ediff-init)
 	     (load "ediff-init.el" nil nil 'nosuffix))
@@ -157,32 +150,6 @@
     (ediff-buffers rev1buf rev2buf startup-hooks 'ediff-revision)
     ))
 
-
-;; GENERIC-SC.el support
-
-(defun generic-sc-get-latest-rev ()
-  (cond ((eq sc-mode 'CCASE)
-	 (eval "main/LATEST"))
-	(t (eval ""))))
-
-(defun ediff-generic-sc-internal (rev1 rev2 &optional startup-hooks)
-;; Run Ediff on versions of the current buffer.
-;; If REV2 is "" then compare current buffer with REV1.
-;; If the current buffer is named `F', the version is named `F.~REV~'.
-;; If `F.~REV~' already exists, it is used instead of being re-created.
-  (let (rev1buf rev2buf)
-    (save-excursion
-      (if (or (not rev1) (string= rev1 ""))
-	  (setq rev1 (generic-sc-get-latest-rev)))
-      (sc-visit-previous-revision rev1)
-      (setq rev1buf (current-buffer)))
-    (save-excursion
-      (or (string= rev2 "") 		; use current buffer
-	  (sc-visit-previous-revision rev2))
-      (setq rev2buf (current-buffer)))
-    (ediff-buffers rev1buf rev2buf startup-hooks 'ediff-revision)))
-
-
 ;;; Merge with Version Control
 
 (defun ediff-vc-merge-internal (rev1 rev2 ancestor-rev
@@ -245,76 +212,6 @@
       (ediff-merge-buffers
        buf1 buf2 startup-hooks 'ediff-merge-revisions merge-buffer-file))))
 
-(defun ediff-generic-sc-merge-internal (rev1 rev2 ancestor-rev
-					     &optional
-					     startup-hooks merge-buffer-file)
-  ;; If ANCESTOR-REV non-nil, merge with ancestor
-  (let (buf1 buf2 ancestor-buf)
-    (save-excursion
-      (if (string= rev1 "")
-	  (setq rev1 (generic-sc-get-latest-rev)))
-      (sc-visit-previous-revision rev1)
-      (setq buf1 (current-buffer)))
-    (save-excursion
-      (or (string= rev2 "")
-	  (sc-visit-previous-revision rev2))
-      (setq buf2 (current-buffer)))
-    (if ancestor-rev
-	(save-excursion
-	  (or (string= ancestor-rev "")
-	      (sc-visit-previous-revision ancestor-rev))
-	  (setq ancestor-buf (current-buffer))))
-    (if ancestor-rev
-	(ediff-merge-buffers-with-ancestor
-	 buf1 buf2 ancestor-buf
-	 startup-hooks 'ediff-merge-revisions-with-ancestor merge-buffer-file)
-      (ediff-merge-buffers
-       buf1 buf2 startup-hooks 'ediff-merge-revisions merge-buffer-file))))
-
-
-;; PCL-CVS.el support
-
-;; MK: Check. This function doesn't seem to be used any more by pcvs or pcl-cvs
-(defun cvs-run-ediff-on-file-descriptor (tin)
-;; This is a replacement for cvs-emerge-mode
-;; Runs after cvs-update.
-;; Ediff-merge appropriate revisions of the selected file.
-  (let* ((fileinfo (tin-cookie cvs-cookie-handle tin))
-	 (type (cvs-fileinfo->type fileinfo))
-	 (tmp-file
-	  (cvs-retrieve-revision-to-tmpfile fileinfo))
-	 (default-directory
-	   (file-name-as-directory (cvs-fileinfo->dir fileinfo)))
-	 ancestor-file)
-
-    (or (memq type '(MERGED CONFLICT MODIFIED))
-	(error
-	 "Can only merge `Modified', `Merged' or `Conflict' files"))
-
-    (cond ((memq type '(MERGED CONFLICT))
-	   (setq ancestor-file
-		 (cvs-retrieve-revision-to-tmpfile
-		  fileinfo
-		  ;; revision
-		  (cvs-fileinfo->base-revision fileinfo)))
-	   (ediff-merge-buffers-with-ancestor
-	    (find-file-noselect tmp-file)
-	    (find-file-noselect (cvs-fileinfo->backup-file fileinfo))
-	    (find-file-noselect ancestor-file)
-	    nil ; startup-hooks
-	    'ediff-merge-revisions-with-ancestor))
-	  ((eq type 'MODIFIED)
-	   (ediff-buffers
-	    (find-file-noselect tmp-file)
-	    (if (featurep 'xemacs)
-		;; XEmacs doesn't seem to have cvs-fileinfo->full-name
-		(find-file-noselect (cvs-fileinfo->full-path fileinfo))
-	      (find-file-noselect (cvs-fileinfo->full-name fileinfo)))
-	    nil ; startup-hooks
-	    'ediff-revisions)))
-    (if (stringp tmp-file) (ediff-delete-version-file tmp-file))
-    (if (stringp ancestor-file) (ediff-delete-version-file ancestor-file))))
-
 
 ;; delete version file on exit unless ediff-keep-tmp-versions is true
 (defun ediff-delete-version-file (file)