diff lisp/efs/dired.el @ 169:15872534500d r20-3b11

Import from CVS: tag r20-3b11
author cvs
date Mon, 13 Aug 2007 09:46:53 +0200
parents 28f395d8dc7a
children 9ad43877534d
line wrap: on
line diff
--- a/lisp/efs/dired.el	Mon Aug 13 09:45:48 2007 +0200
+++ b/lisp/efs/dired.el	Mon Aug 13 09:46:53 2007 +0200
@@ -75,7 +75,9 @@
 (require 'backquote) ; For macros.
 
 ;; Compatibility requirements for the file-name-handler-alist.
-(let ((lucid-p (string-match "Lucid" emacs-version))
+;; Testing against the string `Lucid' breaks InfoDock.  How many years has
+;; it been since Lucid went away?
+(let ((lucid-p (string-match "XEmacs" emacs-version))
       ver subver)
   (or (string-match "^\\([0-9]+\\)\\.\\([0-9]+\\)" emacs-version)
       (error "dired does not work with emacs version %s" emacs-version))
@@ -108,7 +110,7 @@
 Will use the variable default-directory-function if it non-nil."
   (if default-directory-function
       (funcall default-directory-function)
-    (if (string-match "Lucid" emacs-version)
+    (if (string-match "XEmacs" emacs-version)
 	(abbreviate-file-name default-directory t)
       (abbreviate-file-name default-directory))))
 
@@ -6373,7 +6375,7 @@
 ;;;; Multi-flavour Emacs support
 ;;;; --------------------------------------------------------------
 
-(let ((lucid-p (string-match "Lucid" emacs-version))
+(let ((lucid-p (string-match "XEmacs" emacs-version))
       ver)
   (or (string-match "^\\([0-9]+\\)\\." emacs-version)
       (error "Weird emacs version %s" emacs-version))