(noninteractive): Don't load generic-sc on MS-DOS

systems without long file-name support.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6c5b287913d47cca8b168e7f6e034da9ebfb749f..610b1af90507b0f19f219002b65d2f51eedc3e24 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-06  Eli Zaretskii  <eliz@is.elta.co.il>
+
+       * ediff-ve.el (noninteractive): Don't load generic-sc on MS-DOS
+       systems without long file-name support.
+
 2001-01-06  Andrew Innes  <andrewi@gnu.org>
 
        * makefile.w32-in (custom-deps): Set EMACSLOADPATH explicitly.

diff --git a/lisp/ediff-vers.el b/lisp/ediff-vers.el
index 49eeb31eaf52935c42b06c172ad0eb5a2320a072..71ac8bb7afe69c6c6ef2a826bc0fcdca682a8551 100644 (file)
--- a/lisp/ediff-vers.el
+++ b/lisp/ediff-vers.el
@@ -36,7 +36,13 @@
      (eval-when-compile
        (load "pcl-cvs" 'noerror)
        (load "rcs" 'noerror)
-       (load "generic-sc" '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)))
 ;; end pacifier