From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Thu, 1 Nov 2007 03:18:42 +0000 (+0000)
Subject: * ediff-util.el (ediff-nuke-selective-display): Move definition to
X-Git-Tag: emacs-pretest-23.0.90~9917
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=399f21c18888bab8c0712928d4812d0b420ad27e;p=emacs.git

* ediff-util.el (ediff-nuke-selective-display): Move definition to
top level, make it dependent on the emacs flavor.

* play/gamegrid.el (gamegrid-kill-timer, gamegrid-start-timer):
Test for XEmacs not for itimer.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9ff79e5e8f0..2e1222e6b65 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,18 @@
+2007-11-01  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* ediff-util.el (ediff-nuke-selective-display): Move definition to
+	top level, make it dependent on the emacs flavor.
+
+	* play/gamegrid.el (gamegrid-kill-timer, gamegrid-start-timer):
+	Test for XEmacs not for itimer.
+
+	* term/sun-mouse.el:
+	* obsolete/sun-fns.el:
+	* obsolete/sun-curs.el: Remove files.
+
+	* term/sun.el (select-previous-complex-command): Remove
+	obsolete code.
+
 2007-10-31  Tassilo Horn  <tassilo@member.fsf.org>
 
 	* doc-view.el (doc-view-cache-directory): Fix bug where an integer
diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el
index 4583e754793..3bc82dd4daf 100644
--- a/lisp/ediff-util.el
+++ b/lisp/ediff-util.el
@@ -4071,28 +4071,25 @@ Mail anyway? (y or n) ")
      )
    ))
 
-(cond ((fboundp 'nuke-selective-display)
-       ;; XEmacs has nuke-selective-display
-       (defalias 'ediff-nuke-selective-display 'nuke-selective-display))
-      (t
-       (defun ediff-nuke-selective-display ()
-	 (save-excursion
-	   (save-restriction
-	     (widen)
-	     (goto-char (point-min))
-	     (let ((mod-p (buffer-modified-p))
-		   buffer-read-only end)
-	       (and (eq t selective-display)
-		    (while (search-forward "\^M" nil t)
-		      (end-of-line)
-		      (setq end (point))
-		      (beginning-of-line)
-		      (while (search-forward "\^M" end t)
-			(delete-char -1)
-			(insert "\^J"))))
-	       (set-buffer-modified-p mod-p)
-	       (setq selective-display nil)))))
-       ))
+(defun ediff-nuke-selective-display ()
+  (if (featurep 'xemacs)
+      (nuke-selective-display)
+    (save-excursion
+      (save-restriction
+	(widen)
+	(goto-char (point-min))
+	(let ((mod-p (buffer-modified-p))
+	      buffer-read-only end)
+	  (and (eq t selective-display)
+	       (while (search-forward "\^M" nil t)
+		 (end-of-line)
+		 (setq end (point))
+		 (beginning-of-line)
+		 (while (search-forward "\^M" end t)
+		   (delete-char -1)
+		   (insert "\^J"))))
+	  (set-buffer-modified-p mod-p)
+	  (setq selective-display nil))))))
 
 
 ;; The next two are modified versions from emerge.el.
diff --git a/lisp/play/gamegrid.el b/lisp/play/gamegrid.el
index 813c75d1731..d604715d4d7 100644
--- a/lisp/play/gamegrid.el
+++ b/lisp/play/gamegrid.el
@@ -395,7 +395,7 @@ static unsigned char gamegrid_bits[] = {
 
 (defun gamegrid-start-timer (period func)
   (setq gamegrid-timer
-	(if (featurep 'itimer)
+	(if (featurep 'xemacs)
 	    (start-itimer "Gamegrid"
 			  func
 			  period
@@ -420,7 +420,7 @@ static unsigned char gamegrid_bits[] = {
 
 (defun gamegrid-kill-timer ()
   (if gamegrid-timer
-      (if (featurep 'itimer)
+      (if (featurep 'xemacs)
           (delete-itimer gamegrid-timer)
         (cancel-timer gamegrid-timer)))
   (setq gamegrid-timer nil))