From: Glenn Morris <rgm@gnu.org>
Date: Wed, 10 Jan 2018 06:58:08 +0000 (-0800)
Subject: Remove some obsolete compat code in supercite.el
X-Git-Tag: emacs-27.0.90~5905
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=641b817c5c37b2256f85fd54ffea0fbfc572eeae;p=emacs.git

Remove some obsolete compat code in supercite.el

* lisp/mail/supercite.el (sc-ask, sc-cite-original):
Remove obsolete compat code.  This file uses modern features.
---

diff --git a/lisp/mail/supercite.el b/lisp/mail/supercite.el
index 60669a0212c..ce061e2d8c2 100644
--- a/lisp/mail/supercite.el
+++ b/lisp/mail/supercite.el
@@ -634,12 +634,7 @@ the list should be unique."
 		(deallocate-event event))
 	    (setq quit-flag nil)
 	    (signal 'quit '())))
-      (let ((char
-	     (if (featurep 'xemacs)
-		 (let* ((key (and (key-press-event-p event) (event-key event)))
-			(char (and key (event-to-character event))))
-		   char)
-	       event))
+      (let ((char event)
 	    elt)
 	(if char (setq char (downcase char)))
 	(cond
@@ -651,9 +646,7 @@ the list should be unique."
 	  nil)
 	 (t
 	  (message "%s%s" p (single-key-description event))
-	  (if (featurep 'xemacs)
-	      (ding nil 'y-or-n-p)
-	    (ding))
+	  (ding)
 	  (discard-input)
 	  (if (eq p prompt)
 	      (setq p (concat "Try again.  " prompt)))))))
@@ -1887,8 +1880,7 @@ and `sc-post-hook' is run after the guts of this function."
   ;; grab point and mark since the region is probably not active when
   ;; this function gets automatically called. we want point to be a
   ;; mark so any deleting before point works properly
-  (let* ((zmacs-regions nil)		; for XEemacs
-	 (mark-active t)		; for Emacs
+  (let* ((mark-active t)
 	 (point (point-marker))
 	 (mark  (copy-marker (mark-marker))))