Convert consecutive FSF copyright years to ranges.

[bpt/emacs.git] / lisp / url / url-cid.el

diff --git a/lisp/url/url-cid.el b/lisp/url/url-cid.el
index 9c44835..c476f04 100644 (file)
--- a/lisp/url/url-cid.el
+++ b/lisp/url/url-cid.el
@@ -1,15 +1,16 @@
 ;;; url-cid.el --- Content-ID URL loader
 
-;; Copyright (c) 1998 - 1999 Free Software Foundation, Inc.
+;; Copyright (C) 1998-1999, 2004-2011
+;;   Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,9 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Code:
 
@@ -36,8 +35,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)))
@@ -45,7 +43,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"
@@ -56,11 +54,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