Merge from emacs-23; up to 2010-06-12T17:12:15Z!cyd@stupidchicken.com.

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

diff --git a/lisp/url/url-ldap.el b/lisp/url/url-ldap.el
index cdc69306f9b1cec0aabc733f7dc96eae7af311c7..bb937a44423dece54b9f227699c736af83ad8974 100644 (file)
--- a/lisp/url/url-ldap.el
+++ b/lisp/url/url-ldap.el
@@ -1,6 +1,6 @@
 ;;; url-ldap.el --- LDAP Uniform Resource Locator retrieval code
 
-;; Copyright (C) 1998, 1999, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1998-1999, 2004-2011 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes
 
@@ -121,8 +121,7 @@ URL can be a URL string, or a URL vector of the type returned by
       (setq url (url-generic-parse-url (url-unhex-string url)))
     (if (not (vectorp url))
         (error "Argument is not a valid URL")))
-  (save-excursion
-    (set-buffer (generate-new-buffer " *url-ldap*"))
+  (with-current-buffer (generate-new-buffer " *url-ldap*")
     (setq url-current-object url)
     (insert "Content-type: text/html\r\n\r\n")
     (if (not (fboundp 'ldap-search-internal))
@@ -238,5 +237,4 @@ URL can be a URL string, or a URL vector of the type returned by
 
 (provide 'url-ldap)
 
-;; arch-tag: 6230e21c-41ae-4174-bd83-82c835676fc8
 ;;; url-ldap.el ends here