HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge changes made in Gnus master
[bpt/emacs.git]
/
lisp
/
net
/
telnet.el
diff --git
a/lisp/net/telnet.el
b/lisp/net/telnet.el
index
d4850fe
..
e3c42f5
100644
(file)
--- a/
lisp/net/telnet.el
+++ b/
lisp/net/telnet.el
@@
-1,7
+1,7
@@
;;; telnet.el --- run a telnet session from within an Emacs buffer
;;; telnet.el --- run a telnet session from within an Emacs buffer
-;; Copyright (C) 1985, 1988, 1992, 1994, 2001-201
1
-;;
Free Software
Foundation, Inc.
+;; Copyright (C) 1985, 1988, 1992, 1994, 2001-201
3 Free Software
+;; Foundation, Inc.
;; Author: William F. Schelter
;; Maintainer: FSF
;; Author: William F. Schelter
;; Maintainer: FSF
@@
-190,8
+190,6
@@
rejecting one login and prompting again for a username and password.")
(delete-region comint-last-input-start
comint-last-input-end)))
(delete-region comint-last-input-start
comint-last-input-end)))
-;;;###autoload (add-hook 'same-window-regexps (purecopy "\\*telnet-.*\\*\\(\\|<[0-9]+>\\)"))
-
;;;###autoload
(defun telnet (host &optional port)
"Open a network login connection to host named HOST (a string).
;;;###autoload
(defun telnet (host &optional port)
"Open a network login connection to host named HOST (a string).
@@
-219,8
+217,8
@@
Normally input is edited in Emacs and sent a line at a time."
(telnet-options (if (cdr properties) (cons "-l" (cdr properties))))
process)
(if (and buffer (get-buffer-process buffer))
(telnet-options (if (cdr properties) (cons "-l" (cdr properties))))
process)
(if (and buffer (get-buffer-process buffer))
- (
pop
-to-buffer (concat "*" name "*"))
- (
pop
-to-buffer
+ (
switch
-to-buffer (concat "*" name "*"))
+ (
switch
-to-buffer
(apply 'make-comint name telnet-program nil telnet-options))
(setq process (get-buffer-process (current-buffer)))
(set-process-filter process 'telnet-initial-filter)
(apply 'make-comint name telnet-program nil telnet-options))
(setq process (get-buffer-process (current-buffer)))
(set-process-filter process 'telnet-initial-filter)
@@
-246,8
+244,6
@@
Data is sent to the remote host when RET is typed."
(set (make-local-variable 'comint-prompt-regexp) telnet-prompt-pattern)
(set (make-local-variable 'comint-use-prompt-regexp) 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 (purecopy "\\*rsh-[^-]*\\*\\(\\|<[0-9]*>\\)"))
-
;;;###autoload
(defun rsh (host)
"Open a network login connection to host named HOST (a string).
;;;###autoload
(defun rsh (host)
"Open a network login connection to host named HOST (a string).
@@
-256,7
+252,7
@@
Normally input is edited in Emacs and sent a line at a time."
(interactive "sOpen rsh connection to host: ")
(require 'shell)
(let ((name (concat "rsh-" host )))
(interactive "sOpen rsh connection to host: ")
(require 'shell)
(let ((name (concat "rsh-" host )))
- (
pop
-to-buffer (make-comint name remote-shell-program nil host))
+ (
switch
-to-buffer (make-comint name remote-shell-program nil host))
(set-process-filter (get-process name) 'telnet-initial-filter)
(telnet-mode)
(setq telnet-count -16)))
(set-process-filter (get-process name) 'telnet-initial-filter)
(telnet-mode)
(setq telnet-count -16)))