Update copyright year to 2016

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

diff --git a/lisp/url/url-ldap.el b/lisp/url/url-ldap.el
index b50bd714aa649c8bab71fd0409f3983cbdadcd55..4ae638dbaee98efb6c2bab2c2e9ed8572e3d7f82 100644 (file)
--- a/lisp/url/url-ldap.el
+++ b/lisp/url/url-ldap.el
@@ -1,25 +1,23 @@
 ;;; url-ldap.el --- LDAP Uniform Resource Locator retrieval code
 
-;; Copyright (C) 1998, 1999, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 1998-1999, 2004-2016 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
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; 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., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -66,7 +64,7 @@
     ("facsimiletelephonenumber" . "Fax")
     ("postaladdress"            . "Mailing Address")
     ("description"              . "Notes"))
-  "*An assoc list mapping LDAP attribute names to pretty descriptions of them.")
+  "An assoc list mapping LDAP attribute names to pretty descriptions of them.")
 
 (defvar url-ldap-attribute-formatters
   '(("mail"       . (lambda (x) (format "<a href='mailto:%s'>%s</a>" x x)))
@@ -78,7 +76,7 @@
     ("namingcontexts" . url-ldap-dn-formatter)
     ("defaultnamingcontext" . url-ldap-dn-formatter)
     ("member"     . url-ldap-dn-formatter))
-  "*An assoc list mapping LDAP attribute names to pretty formatters for them.")
+  "An assoc list mapping LDAP attribute names to pretty formatters for them.")
 
 (defsubst url-ldap-attribute-pretty-name (n)
   (or (cdr-safe (assoc (downcase n) url-ldap-pretty-names)) n))
@@ -123,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))
@@ -176,7 +173,7 @@ URL can be a URL string, or a URL vector of the type returned by
        (if attributes
            (setq attributes (mapcar 'url-unhex-string (split-string attributes ","))))
 
-       ;; Parse out the exentions
+       ;; Parse out the extensions.
        (if extensions
            (setq extensions (mapcar (lambda (ext)
                                       (if (string-match "\\([^=]*\\)=\\(.*\\)" ext)
@@ -240,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