Merge from emacs-23 branch

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

diff --git a/lisp/url/url-imap.el b/lisp/url/url-imap.el
index c13f4fa..3f7d1ec 100644 (file)
--- a/lisp/url/url-imap.el
+++ b/lisp/url/url-imap.el
@@ -1,6 +1,6 @@
 ;;; url-imap.el --- IMAP retrieval routines
 
-;; Copyright (C) 1999, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2004-2011 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <jas@pdc.kth.se>
 ;; Keywords: comm, data, processes
@@ -52,8 +52,7 @@
 (defun url-imap (url)
   (unless (vectorp url)
     (signal 'wrong-type-error (list "Need a pre-parsed URL." url)))
-  (save-excursion
-    (set-buffer (generate-new-buffer " *url-imap*"))
+  (with-current-buffer (generate-new-buffer " *url-imap*")
     (mm-disable-multibyte)
     (let* ((host (url-host url))
           (port (url-port url))
@@ -77,5 +76,4 @@
             )))
     (current-buffer)))
 
-;; arch-tag: 034991ff-5425-48ea-b911-c96c90e6f47d
 ;;; url-imap.el ends here