diff lisp/ediff.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.el	Wed Oct 31 04:08:29 2007 +0000
+++ b/lisp/ediff.el	Wed Oct 31 06:28:09 2007 +0000
@@ -1303,20 +1303,6 @@
      (intern (format "ediff-%S-merge-internal" ediff-version-control-package))
      rev1 rev2 ancestor-rev startup-hooks merge-buffer-file)))
 
-;; MK: Check. This function doesn't seem to be used any more by pcvs or pcl-cvs
-;;;###autoload
-(defun run-ediff-from-cvs-buffer (pos)
-  "Run Ediff-merge on appropriate revisions of the selected file.
-First run after `M-x cvs-update'.  Then place the cursor on a line describing a
-file and then run `run-ediff-from-cvs-buffer'."
-  (interactive "d")
-  (ediff-load-version-control)
-  (let ((tin (tin-locate cvs-cookie-handle pos)))
-    (if tin
-	(cvs-run-ediff-on-file-descriptor tin)
-      (error "There is no file to merge"))))
-
-
 ;;; Apply patch
 
 ;;;###autoload