# HG changeset patch # User Eli Zaretskii # Date 978817405 0 # Node ID 1b58126efb711be0d848e30803c9c5b3642d53b9 # Parent 3e97804526edb5abf89be959f9bf3fda6abed400 (noninteractive): Don't load generic-sc on MS-DOS systems without long file-name support. diff -r 3e97804526ed -r 1b58126efb71 lisp/ediff-vers.el --- a/lisp/ediff-vers.el Sat Jan 06 21:38:18 2001 +0000 +++ b/lisp/ediff-vers.el Sat Jan 06 21:43:25 2001 +0000 @@ -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