From bd4b0c5dd4b368a5ba1d49e04306eef0ecdd4dc1 Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefankangas@gmail.com>
Date: Sat, 14 Sep 2019 15:35:09 +0200
Subject: [PATCH 3/4] Remove XEmacs compat code from url-*.el

* lisp/url/url-file.el (url-file-build-filename, url-file)
* lisp/url/url-privacy.el (url-setup-privacy-info): Remove XEmacs
compat code.
(url-device-type): Declare obsolete.
---
 lisp/url/url-file.el    | 14 +-------------
 lisp/url/url-privacy.el |  9 ++++-----
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/lisp/url/url-file.el b/lisp/url/url-file.el
index b953ce7694..41ffb4cd4a 100644
--- a/lisp/url/url-file.el
+++ b/lisp/url/url-file.el
@@ -120,9 +120,6 @@ url-file-build-filename
 	 (cond
 	  ((featurep 'ange-ftp)
 	   (ange-ftp-set-passwd host user pass))
-	  ((when (featurep 'xemacs)
-             (or (featurep 'efs) (featurep 'efs-auto)
-                 (efs-set-passwd host user pass))))
 	  (t
 	   nil)))
 
@@ -202,16 +199,7 @@ url-file
 					     (list #'url-file-asynch-callback
 						   new (current-buffer)
 						   callback cbargs)
-					     t)
-              (when (featurep 'xemacs)
-                (autoload 'efs-copy-file-internal "efs")
-                (efs-copy-file-internal filename (efs-ftp-path filename)
-                                        new (efs-ftp-path new)
-                                        t nil 0
-                                        (list #'url-file-asynch-callback
-                                              new (current-buffer)
-                                              callback cbargs)
-                                        0 nil)))))))
+					     t))))))
     buffer))
 
 (defmacro url-file-create-wrapper (method args)
diff --git a/lisp/url/url-privacy.el b/lisp/url/url-privacy.el
index ef9ff84d56..8f8fbef550 100644
--- a/lisp/url/url-privacy.el
+++ b/lisp/url/url-privacy.el
@@ -24,9 +24,8 @@
 (require 'url-vars)
 
 (defun url-device-type (&optional device)
-  (if (fboundp 'device-type)
-      (device-type device)              ; XEmacs
-    (or window-system 'tty)))
+  (declare (obsolete nil "27.1"))
+  (or window-system 'tty))
 
 ;;;###autoload
 (defun url-setup-privacy-info ()
@@ -42,9 +41,9 @@ url-setup-privacy-info
 	 ;; combinations
 	 ((eq system-type 'windows-nt) "Windows-NT; 32bit")
 	 ((eq system-type 'ms-dos) "MS-DOS; 32bit")
-	 ((memq (url-device-type) '(win32 w32)) "Windows; 32bit")
+	 ((memq (or window-system 'tty) '(win32 w32)) "Windows; 32bit")
 	 (t
-	  (pcase (url-device-type)
+	  (pcase (or window-system 'tty)
 	    ('x "X11")
 	    ('ns "OpenStep")
 	    ('tty "TTY")
-- 
2.20.1