Drop support for XEmacs package EFS

EFS is a long defunct XEmacs-specific fork of Ange FTP that is
superseded by TRAMP.
* lisp/ffap.el (ffap-ftp-default-user)
(ffap-replace-file-component, ffap-host-to-filename):
* lisp/gnus/mml.el (mml-parse-file-name):
* lisp/gnus/nnheader.el (nnheader-re-read-dir):
* lisp/net/browse-url.el (browse-url-filename-alist):
* lisp/speedbar.el (speedbar-check-vc): Drop support for XEmacs
package EFS.
This commit is contained in:
Stefan Kangas 2022-07-27 23:33:03 +02:00
parent faa007cebf
commit fcaad99053
5 changed files with 13 additions and 32 deletions

View file

@ -173,7 +173,7 @@ well-formed, such as \"user@host\" or \"<user@host>\"."
(defcustom ffap-ftp-default-user "anonymous"
"User name in FTP file names generated by `ffap-host-to-filename'.
Note this name may be omitted if it equals the default
\(either `efs-default-user' or `ange-ftp-default-user')."
(`ange-ftp-default-user')."
:type 'string
:group 'ffap)
@ -495,12 +495,9 @@ Returned values:
(defun ffap-replace-file-component (fullname name)
"In remote FULLNAME, replace path with NAME. May return nil."
;; Use efs if loaded, but do not load it otherwise.
(if (fboundp 'efs-replace-path-component)
(funcall 'efs-replace-path-component fullname name)
(and (stringp fullname)
(stringp name)
(concat (file-remote-p fullname) name))))
(and (stringp fullname)
(stringp name)
(concat (file-remote-p fullname) name)))
;; (ffap-replace-file-component "/who@foo.com:/whatever" "/new")
(defun ffap-file-suffix (file)
@ -569,9 +566,8 @@ Looks at `ffap-ftp-default-user', returns \"\" for \"localhost\"."
""
(let ((user ffap-ftp-default-user))
;; Avoid including the user if it is same as default:
(if (or (equal user (ffap-symbol-value 'ange-ftp-default-user))
(equal user (ffap-symbol-value 'efs-default-user)))
(setq user nil))
(when (equal user (ffap-symbol-value 'ange-ftp-default-user))
(setq user nil))
(concat "/" user (and user "@") host ":"))))
(defun ffap-fixup-machine (mach)

View file

@ -980,13 +980,10 @@ type detected."
(symbol-name type) value))))))
(defvar ange-ftp-name-format)
(defvar efs-path-regexp)
(defun mml-parse-file-name (path)
(if (if (boundp 'efs-path-regexp)
(string-match efs-path-regexp path)
(if (boundp 'ange-ftp-name-format)
(string-match (car ange-ftp-name-format) path)))
(if (and (boundp 'ange-ftp-name-format)
(string-match (car ange-ftp-name-format) path))
(list (match-string 1 path) (match-string 2 path)
(substring path (1+ (match-end 2))))
path))

View file

@ -918,15 +918,11 @@ first. Otherwise, find the newest one, though it may take a time."
(car (sort results #'file-newer-than-file-p)))))
(defvar ange-ftp-path-format)
(defvar efs-path-regexp)
(defun nnheader-re-read-dir (path)
"Re-read directory PATH if PATH is on a remote system."
(if (and (fboundp 'efs-re-read-dir) (boundp 'efs-path-regexp))
(when (string-match efs-path-regexp path)
(efs-re-read-dir path))
(when (and (fboundp 'ange-ftp-re-read-dir) (boundp 'ange-ftp-path-format))
(when (string-match (car ange-ftp-path-format) path)
(ange-ftp-re-read-dir path)))))
(when (and (fboundp 'ange-ftp-re-read-dir) (boundp 'ange-ftp-path-format))
(when (string-match (car ange-ftp-path-format) path)
(ange-ftp-re-read-dir path))))
(defun nnheader-insert-file-contents (filename &optional visit beg end replace)
"Like `insert-file-contents', q.v., but only reads in the file.

View file

@ -403,7 +403,7 @@ commands reverses the effect of this variable."
Any substring of a filename matching one of the REGEXPs is replaced by
the corresponding STRING using `replace-match', not treating STRING
literally. All pairs are applied in the order given. The default
value converts ange-ftp/EFS-style file names into ftp URLs and prepends
value converts ange-ftp-style file names into ftp URLs and prepends
`file:' to any file name beginning with `/'.
For example, adding to the default a specific translation of an ange-ftp

View file

@ -2789,15 +2789,7 @@ to add more types of version control systems."
(not (or (and (featurep 'ange-ftp)
(string-match
(car (symbol-value 'ange-ftp-name-format))
(expand-file-name default-directory)))
;; efs support: Bob Weiner
(and (featurep 'efs)
(string-match
(let ((reg (symbol-value 'efs-directory-regexp)))
(if (stringp reg)
reg
(car reg)))
(expand-file-name default-directory))))))
(expand-file-name default-directory))))))
(setq speedbar-vc-to-do-point 0))
(if (numberp speedbar-vc-to-do-point)
(progn