Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca

[gnu-emacs] / lisp / url / url-misc.el

diff --git a/lisp/url/url-misc.el b/lisp/url/url-misc.el
index aca3aff6327c475df045c94719fcc4def57fdc0c..c8e9b591790f32f1b69fce641622ed763c5f102b 100644 (file)
--- a/lisp/url/url-misc.el
+++ b/lisp/url/url-misc.el
@@ -45,27 +45,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)