Add a couple cells to lisp-prettify-symbols-alist

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

diff --git a/lisp/url/url-misc.el b/lisp/url/url-misc.el
index dd521ccd690954e31e9390bafea99eff6de21fab..14b9f7eab44cb475c443462baa31dd1751af9cbf 100644 (file)
--- a/lisp/url/url-misc.el
+++ b/lisp/url/url-misc.el
@@ -1,6 +1,7 @@
 ;;; url-misc.el --- Misc Uniform Resource Locator retrieval code
 
-;; Copyright (C) 1996-1999, 2002, 2004-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1996-1999, 2002, 2004-2016 Free Software Foundation,
+;; Inc.
 
 ;; Keywords: comm, data, processes
 
@@ -23,6 +24,7 @@
 
 (require 'url-vars)
 (require 'url-parse)
+(declare-function mm-disable-multibyte "mm-util" ())
 (autoload 'Info-goto-node "info" "" t)
 (autoload 'man "man" nil t)
 
@@ -44,27 +46,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)
@@ -94,19 +90,19 @@
     (save-excursion
       (if (not (string-match "\\([^,]*\\)?," desc))
          (error "Malformed data URL: %s" desc)
-       (setq mediatype (match-string 1 desc))
+       (setq mediatype (match-string 1 desc)
+             data (url-unhex-string (substring desc (match-end 0))))
        (if (and mediatype (string-match ";base64\\'" mediatype))
            (setq mediatype (substring mediatype 0 (match-beginning 0))
                  encoding "base64"))
        (if (or (null mediatype)
                (eq ?\; (aref mediatype 0)))
-         (setq mediatype (concat "text/plain" mediatype)))
-       (setq data (url-unhex-string (substring desc (match-end 0)))))
+         (setq mediatype (concat "text/plain" mediatype))))
       (set-buffer (generate-new-buffer " *url-data*"))
       (mm-disable-multibyte)
       (insert (format "Content-Length: %d\n" (length data))
              "Content-Type: " mediatype "\n"
-             "Content-Encoding: " encoding "\n"
+             "Content-Transfer-Encoding: " encoding "\n"
              "\n")
       (if data (insert data))
       (current-buffer))))