Support opening a new connection when reverting a telnet buffer

* net/telnet.el (telnet-connect-command): New variable.
(telnet-revert-buffer): New function.
(telnet-mode): Use `telnet-revert-buffer' as `revert-buffer-function'.
(telnet, rsh): Set `telnet-connect-command' accordingly (bug#18312).

Copyright-paperwork-exempt: yes

diff --git a/etc/NEWS b/etc/NEWS
index d237e4ccb0f9a994e7e61e35211aa3128bcab4c3..7de94a7b11d52eae3e394bd228c5f03c72fd9c74 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -475,6 +475,11 @@ current and the previous or the next line, as before.
 \f
 * Changes in Specialized Modes and Packages in Emacs 27.1
 
+---
+** telnet-mode
+*** Reverting a buffer in `telnet-mode' will restart a closed
+connection.
+
 ** goto-addr
 *** A way to more conveniently specify what URI address schemes that
 should be ignored have been added via the

diff --git a/lisp/net/telnet.el b/lisp/net/telnet.el
index cf3634f7d92ac7f006c5f90ba0f2e0919b5b1171..5d23ee3dce75c8290ded1f352249ea7b3b4c6656 100644 (file)
--- a/lisp/net/telnet.el
+++ b/lisp/net/telnet.el
@@ -95,11 +95,22 @@ After this many passes, we stop looking for initial setup data.
 Should be set to the number of terminal writes telnet will make
 rejecting one login and prompting again for a username and password.")
 
+(defvar telnet-connect-command nil
+  "Command used to start the `telnet' (or `rsh') connection.")
+
 (defun telnet-interrupt-subjob ()
   "Interrupt the program running through telnet on the remote host."
   (interactive)
   (process-send-string nil telnet-interrupt-string))
 
+(defun telnet-revert-buffer (ignore-auto noconfirm)
+  (if buffer-file-name
+      (let (revert-buffer-function)
+        (revert-buffer ignore-auto noconfirm))
+    (if (or noconfirm
+            (yes-or-no-p (format "Restart connection? ")))
+        (apply telnet-connect-command))))
+
 (defun telnet-c-z ()
   (interactive)
   (process-send-string nil "\C-z"))
@@ -229,6 +240,7 @@ Normally input is edited in Emacs and sent a line at a time."
                                            (if port " " "") (or port "")
                                            "\n"))
       (telnet-mode)
+      (setq-local telnet-connect-command (list 'telnet host port))
       (setq comint-input-sender 'telnet-simple-send)
       (setq telnet-count telnet-initial-count))))
 
@@ -240,6 +252,7 @@ It has most of the same commands as comint-mode.
 There is a variable `telnet-interrupt-string' which is the character
 sent to try to stop execution of a job on the remote host.
 Data is sent to the remote host when RET is typed."
+  (setq-local revert-buffer-function 'telnet-revert-buffer)
   (set (make-local-variable 'window-point-insertion-type) t)
   (set (make-local-variable 'comint-prompt-regexp) telnet-prompt-pattern)
   (set (make-local-variable 'comint-use-prompt-regexp) t))
@@ -255,6 +268,7 @@ Normally input is edited in Emacs and sent a line at a time."
     (switch-to-buffer (make-comint name remote-shell-program nil host))
     (set-process-filter (get-process name) 'telnet-initial-filter)
     (telnet-mode)
+    (setq-local telnet-connect-command (list 'rsh host))
     (setq telnet-count -16)))
 
 (provide 'telnet)