Remove XEmacs compat code from url-*.el (Bug#37524)
* 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.
This commit is contained in:
parent
b6a8014fbe
commit
12f6b90c85
2 changed files with 5 additions and 18 deletions
|
@ -120,9 +120,6 @@ to them."
|
|||
(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 @@ to them."
|
|||
(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)
|
||||
|
|
|
@ -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 @@
|
|||
;; 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")
|
||||
|
|
Loading…
Add table
Reference in a new issue