[Emacs-diffs] Changes to emacs/lisp/ediff-init.el,v

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   08/03/05 04:09:26

Index: ediff-init.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ediff-init.el,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- ediff-init.el       4 Mar 2008 03:49:55 -0000       1.86
+++ ediff-init.el       5 Mar 2008 04:09:24 -0000       1.87
@@ -795,12 +795,9 @@
 
 (defun ediff-color-display-p ()
   (condition-case nil
-      (ediff-cond-compile-for-xemacs-or-emacs
+      (if (featurep 'xemacs)
        (eq (device-class (selected-device)) 'color) ; xemacs form
-       (if (fboundp 'display-color-p) ; emacs form
-          (display-color-p)
-        (x-display-color-p))
-       )
+       (display-color-p)) ; emacs form
     (error nil)))
 
 
@@ -1822,9 +1819,6 @@
   "Don't skip difference regions."
   nil)
 
-(defsubst Xor (a b)
-  (or (and a (not b)) (and (not a) b)))
-
 (defsubst ediff-message-if-verbose (string &rest args)
   (if ediff-verbose-p
       (apply 'message string args)))
@@ -1846,8 +1840,9 @@
       (convert-standard-filename fname)
     fname))
 
-
-(if (fboundp 'with-syntax-table)
+(if (featurep 'emacs)
+    (defalias 'ediff-with-syntax-table 'with-syntax-table)
+  (if (fboundp 'with-syntax-table)
     (defalias 'ediff-with-syntax-table 'with-syntax-table)
   ;; stolen from subr.el in emacs 21
   (defmacro ediff-with-syntax-table (table &rest body)
@@ -1861,7 +1856,7 @@
               ,@body)
           (save-current-buffer
             (set-buffer ,old-buffer)
-            (set-syntax-table ,old-table)))))))
+              (set-syntax-table ,old-table))))))))
 
 
 (provide 'ediff-init)