Mercurial > emacs

changeset 35109:1b58126efb71

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(noninteractive): Don't load generic-sc on MS-DOS systems without long file-name support.
author Eli Zaretskii <eliz@gnu.org>
date Sat, 06 Jan 2001 21:43:25 +0000
parents 3e97804526ed
children a8e4c70c77c2
files lisp/ediff-vers.el
diffstat 1 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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