diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/ediff-vers.el | 8 |
2 files changed, 12 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6c5b287913..610b1af905 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2001-01-06 Eli Zaretskii <[email protected]> + + * ediff-ve.el (noninteractive): Don't load generic-sc on MS-DOS + systems without long file-name support. + 2001-01-06 Andrew Innes <[email protected]> * makefile.w32-in (custom-deps): Set EMACSLOADPATH explicitly. diff --git a/lisp/ediff-vers.el b/lisp/ediff-vers.el index 49eeb31eaf..71ac8bb7af 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 |