[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master c518b06ae6 2/2: Drop obsolete rsh/rlogin from two user options
From: |
Stefan Kangas |
Subject: |
master c518b06ae6 2/2: Drop obsolete rsh/rlogin from two user options |
Date: |
Tue, 12 Jul 2022 11:00:56 -0400 (EDT) |
branch: master
commit c518b06ae65091d24132e8c6768a8b06e03b6d87
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>
Drop obsolete rsh/rlogin from two user options
* lisp/net/ange-ftp.el (ange-ftp-gateway-program):
* lisp/net/imap.el (imap-shell-program): Drop obsolete "rsh"/"rlogin".
---
lisp/net/ange-ftp.el | 10 +++-------
lisp/net/imap.el | 7 +++----
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index 9937c022d9..8355ca4838 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -1,7 +1,6 @@
;;; ange-ftp.el --- transparent FTP support for GNU Emacs -*-
lexical-binding:t -*-
-;; Copyright (C) 1989-1996, 1998, 2000-2022 Free Software Foundation,
-;; Inc.
+;; Copyright (C) 1989-2022 Free Software Foundation, Inc.
;; Author: Andy Norman (ange@hplb.hpl.hp.com)
;; Maintainer: emacs-devel@gnu.org
@@ -870,13 +869,10 @@ Both telnet and rlogin do something like this."
(defcustom ange-ftp-gateway-program remote-shell-program
"Name of program to spawn a shell on the gateway machine.
-Valid candidates are rsh (remsh on some systems), telnet and rlogin.
See also the gateway variable above."
:group 'ange-ftp
- :type '(choice (const "rsh")
- (const "telnet")
- (const "rlogin")
- string))
+ :type 'string
+ :version "29.1")
(defcustom ange-ftp-gateway-prompt-pattern "^[^#$%>;\n]*[#$%>;] *"
"Regexp matching prompt after complete login sequence on gateway machine.
diff --git a/lisp/net/imap.el b/lisp/net/imap.el
index ac24efdccb..0b6488292d 100644
--- a/lisp/net/imap.el
+++ b/lisp/net/imap.el
@@ -175,16 +175,15 @@ the list is tried until a successful connection is made."
:type '(repeat string))
(defcustom imap-shell-program '("ssh %s imapd"
- "rsh %s imapd"
- "ssh %g ssh %s imapd"
- "rsh %g rsh %s imapd")
+ "ssh %g ssh %s imapd")
"A list of strings, containing commands for IMAP connection.
Within a string, %s is replaced with the server address, %p with port
number on server, %g with `imap-shell-host', and %l with
`imap-default-user'. The program should read IMAP commands from stdin
and write IMAP response to stdout. Each entry in the list is tried
until a successful connection is made."
- :type '(repeat string))
+ :type '(repeat string)
+ :version "29.1")
(defcustom imap-process-connection-type nil
"Value for `process-connection-type' to use for Kerberos4, GSSAPI, shell and
SSL.