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

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   07/11/01 03:18:43

Index: ediff-util.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ediff-util.el,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- ediff-util.el       31 Oct 2007 16:16:12 -0000      1.76
+++ ediff-util.el       1 Nov 2007 03:18:41 -0000       1.77
@@ -4071,11 +4071,9 @@
      )
    ))
 
-(cond ((fboundp 'nuke-selective-display)
-       ;; XEmacs has nuke-selective-display
-       (defalias 'ediff-nuke-selective-display 'nuke-selective-display))
-      (t
-       (defun ediff-nuke-selective-display ()
+(defun ediff-nuke-selective-display ()
+  (if (featurep 'xemacs)
+      (nuke-selective-display)
         (save-excursion
           (save-restriction
             (widen)
@@ -4091,8 +4089,7 @@
                        (delete-char -1)
                        (insert "\^J"))))
               (set-buffer-modified-p mod-p)
-              (setq selective-display nil)))))
-       ))
+         (setq selective-display nil))))))
 
 
 ;; The next two are modified versions from emerge.el.