diff options
| -rw-r--r-- | lisp/url/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/url/url-misc.el | 36 |
2 files changed, 20 insertions, 21 deletions
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index 59222bcc957..fb4839358b9 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog @@ -1,3 +1,8 @@ +2012-12-03 Chong Yidong <cyd@gnu.org> + + * url-misc.el (url-do-terminal-emulator): Use make-term instead of + terminal-emulator. + 2012-10-13 Liam Stitt <stittl@cuug.ab.ca> (tiny change) * url-vars.el (url-uncompressor-alist): diff --git a/lisp/url/url-misc.el b/lisp/url/url-misc.el index dd521ccd690..8cf9cffdf6b 100644 --- a/lisp/url/url-misc.el +++ b/lisp/url/url-misc.el @@ -44,27 +44,21 @@ nil)) (defun url-do-terminal-emulator (type server port user) - (terminal-emulator - (generate-new-buffer (format "%s%s" (if user (concat user "@") "") server)) - (pcase type - (`rlogin "rlogin") - (`telnet "telnet") - (`tn3270 "tn3270") - (_ - (error "Unknown terminal emulator required: %s" type))) - (pcase type - (`rlogin - (if user - (list server "-l" user) - (list server))) - (`telnet - (if user (message "Please log in as user: %s" user)) - (if port - (list server port) - (list server))) - (`tn3270 - (if user (message "Please log in as user: %s" user)) - (list server))))) + (switch-to-buffer + (apply + 'make-term + (format "%s%s" (if user (concat user "@") "") server) + (cond ((eq type 'rlogin) "rlogin") + ((eq type 'telnet) "telnet") + ((eq type 'tn3270) "tn3270") + (t (error "Unknown terminal emulator required: %s" type))) + nil + (cond ((eq type 'rlogin) + (if user (list server "-l" user) (list server))) + ((eq type 'telnet) + (if port (list server port) (list server))) + ((eq type 'tn3270) + (list server)))))) ;;;###autoload (defun url-generic-emulator-loader (url) |