;;; telnet.el --- run a telnet session from within an Emacs buffer
-;; Copyright (C) 1985, 1988, 1992, 1994 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1988, 1992, 1994, 2001, 2002, 2003, 2004,
+;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
;; Author: William F. Schelter
;; Maintainer: FSF
;; This file is part of GNU Emacs.
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
rejecting one login and prompting again for a username and password.")
(defun telnet-interrupt-subjob ()
- (interactive)
"Interrupt the program running through telnet on the remote host."
- (send-string nil telnet-interrupt-string))
+ (interactive)
+ (process-send-string nil telnet-interrupt-string))
(defun telnet-c-z ()
(interactive)
- (send-string nil "\C-z"))
+ (process-send-string nil "\C-z"))
(defun send-process-next-char ()
(interactive)
- (send-string nil
- (char-to-string
- (let ((inhibit-quit t))
- (prog1 (read-char)
- (setq quit-flag nil))))))
+ (process-send-string nil
+ (char-to-string
+ (let ((inhibit-quit t))
+ (prog1 (read-char)
+ (setq quit-flag nil))))))
; initialization on first load.
(if telnet-mode-map
((string-match "passw" string)
(telnet-filter proc string)
(setq telnet-count 0)
- (send-string proc (concat (comint-read-noecho "Password: " t)
- telnet-new-line))
+ (process-send-string proc (concat (comint-read-noecho "Password: " t)
+ telnet-new-line))
(clear-this-command-keys))
(t (telnet-check-software-type-initialize string)
(telnet-filter proc string)
(comint-send-string proc telnet-new-line)))
(defun telnet-filter (proc string)
- (save-excursion
- (set-buffer (process-buffer proc))
+ (with-current-buffer (process-buffer proc)
(let* ((last-insertion (marker-position (process-mark proc)))
(delta (- (point) last-insertion))
(ie (and comint-last-input-end
(w (get-buffer-window (current-buffer)))
(ws (and w (window-start w))))
(goto-char last-insertion)
- (insert-before-markers string)
+ (insert string)
(set-marker comint-last-output-start last-insertion)
(set-marker (process-mark proc) (point))
(if ws (set-window-start w ws t))
;;;###autoload (add-hook 'same-window-regexps "\\*telnet-.*\\*\\(\\|<[0-9]+>\\)")
;;;###autoload
-(defun telnet (host)
+(defun telnet (host &optional port)
"Open a network login connection to host named HOST (a string).
+Optional arg PORT specifies alternative port to connect to.
+Interactively, use \\[universal-argument] prefix to be prompted for port number.
+
Communication with HOST is recorded in a buffer `*PROGRAM-HOST*'
where PROGRAM is the telnet program being used. This program
is controlled by the contents of the global variable `telnet-host-properties',
falling back on the value of the global variable `telnet-program'.
Normally input is edited in Emacs and sent a line at a time."
- (interactive "sOpen connection to host: ")
+ (interactive (list (read-string "Open connection to host: ")
+ (cond
+ ((null current-prefix-arg) nil)
+ ((consp current-prefix-arg) (read-string "Port: "))
+ (t (prefix-numeric-value current-prefix-arg)))))
+ (if (and port (numberp port))
+ (setq port (int-to-string port)))
(let* ((comint-delimiter-argument-list '(?\ ?\t))
(properties (cdr (assoc host telnet-host-properties)))
(telnet-program (if properties (car properties) telnet-program))
- (name (concat telnet-program "-" (comint-arguments host 0 nil) ))
+ (hname (if port (concat host ":" port) host))
+ (name (concat telnet-program "-" (comint-arguments hname 0 nil) ))
(buffer (get-buffer (concat "*" name "*")))
(telnet-options (if (cdr properties) (cons "-l" (cdr properties))))
process)
;; Don't send the `open' cmd till telnet is ready for it.
(accept-process-output process)
(erase-buffer)
- (send-string process (concat "open " host "\n"))
+ (process-send-string process (concat "open " host
+ (if port " " "") (or port "")
+ "\n"))
(telnet-mode)
(setq comint-input-sender 'telnet-simple-send)
(setq telnet-count telnet-initial-count))))
(put 'telnet-mode 'mode-class 'special)
-(defun telnet-mode ()
+(define-derived-mode telnet-mode comint-mode "Telnet"
"This mode is for using telnet (or rsh) from a buffer to another host.
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.
-
-\\{telnet-mode-map}
-"
- (interactive)
- (comint-mode)
- (setq major-mode 'telnet-mode
- mode-name "Telnet"
- comint-prompt-regexp telnet-prompt-pattern)
- (use-local-map telnet-mode-map)
- (run-hooks 'telnet-mode-hook))
+Data is sent to the remote host when RET is typed."
+ (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))
;;;###autoload (add-hook 'same-window-regexps "\\*rsh-[^-]*\\*\\(\\|<[0-9]*>\\)")
(provide 'telnet)
+;; arch-tag: 98218821-d04a-48b6-9058-57d0d4677a56
;;; telnet.el ends here
HCoop / bpt / emacs.git / blobdiff