Update copyright year to 2015

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

diff --git a/lisp/url/url-cid.el b/lisp/url/url-cid.el
index c251eef2c6fda42ff9add5f5376a6d76a7c3b07f..55713c7d14bd144cf864ea14aecbfeea1a40423d 100644 (file)
--- a/lisp/url/url-cid.el
+++ b/lisp/url/url-cid.el
@@ -1,6 +1,6 @@
 ;;; url-cid.el --- Content-ID URL loader
 
-;; Copyright (C) 1998, 1999, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1998-1999, 2004-2015 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes
 
@@ -34,8 +34,7 @@
     (setq part (mm-get-content-id cid))
     (if (not part)
        (message "Unknown CID encountered: %s" cid)
-      (setq data (save-excursion
-                  (set-buffer (mm-handle-buffer part))
+      (setq data (with-current-buffer (mm-handle-buffer part)
                   (buffer-string))
            content-type (mm-handle-type part)
            encoding (symbol-name (mm-handle-encoding part)))
@@ -43,7 +42,7 @@
       (if (= 0 (length encoding)) (setq encoding "8bit"))
       (if (listp content-type)
          (setq content-type (car content-type)))
-      (insert (format "Content-type: %d\r\n"  (length data))
+      (insert (format "Content-length: %d\r\n"  (length data))
              "Content-type: " content-type "\r\n"
              "Content-transfer-encoding: " encoding "\r\n"
              "\r\n"
@@ -54,11 +53,9 @@
   (cond
    ((fboundp 'mm-get-content-id)
     ;; Using Pterodactyl Gnus or later
-    (save-excursion
-      (set-buffer (generate-new-buffer " *url-cid*"))
+    (with-current-buffer (generate-new-buffer " *url-cid*")
       (url-cid-gnus (url-filename url))))
    (t
     (message "Unable to handle CID URL: %s" url))))
 
-;; arch-tag: 23d9ab74-fad4-4dba-b1e7-292871e8bda5
 ;;; url-cid.el ends here