From c3f2772bfcd3e9bdd2bdbdaee2492f1f5bf5bca3 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 6 Jan 2001 21:46:48 +0000 Subject: (noninteractive): Don't load generic-sc on MS-DOS systems without long file-name support. --- lisp/ediff-vers.el | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'lisp/ediff-vers.el') diff --git a/lisp/ediff-vers.el b/lisp/ediff-vers.el index 49eeb31eaf5..71ac8bb7afe 100644 --- 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 -- cgit v1.2.1