Merge from trunk.

[gnu-emacs] / lisp / net / eudc.el

diff --git a/lisp/net/eudc.el b/lisp/net/eudc.el
index 8616c805f415739babdfd5271530944c1f02f93b..3f24a78cbbe403b4b3be655e419ed8ea6d8d1256 100644 (file)
--- a/lisp/net/eudc.el
+++ b/lisp/net/eudc.el
@@ -1,6 +1,6 @@
 ;;; eudc.el --- Emacs Unified Directory Client
 
-;; Copyright (C) 1998-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1998-2012 Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;; Maintainer: Pavel Janík <Pavel@Janik.cz>
@@ -133,7 +133,7 @@
       (setq plist (cdr (cdr plist))))
     nil))
 
-;; Emacs' plist-get lacks third parameter
+;; Emacs's plist-get lacks third parameter
 (defun eudc-plist-get (plist prop &optional default)
   "Extract a value from a property list.
 PLIST is a property list, which is a list of the form
@@ -351,12 +351,12 @@ accordingly. Otherwise it is set to its EUDC default binding"
 The translation is done according to
 `eudc-protocol-attributes-translation-alist'."
   (if eudc-protocol-attributes-translation-alist
-      (mapcar '(lambda (attribute)
-                (let ((trans (assq (car attribute)
-                                   (symbol-value eudc-protocol-attributes-translation-alist))))
-                  (if trans
-                      (cons (cdr trans) (cdr attribute))
-                    attribute)))
+      (mapcar (lambda (attribute)
+                (let ((trans (assq (car attribute)
+                                   (symbol-value eudc-protocol-attributes-translation-alist))))
+                  (if trans
+                      (cons (cdr trans) (cdr attribute))
+                    attribute)))
              query)
     query))
 
@@ -366,7 +366,7 @@ The translation is done according to
 `eudc-protocol-attributes-translation-alist'."
   (if eudc-protocol-attributes-translation-alist
       (let (trans)
-       (mapcar '(lambda (attribute)
+       (mapcar (lambda (attribute)
                   (setq trans (assq attribute
                                     (symbol-value eudc-protocol-attributes-translation-alist)))
                   (if trans
@@ -692,7 +692,7 @@ server for future sessions."
   (interactive (list
                (read-from-minibuffer "Directory Server: ")
                (intern (completing-read "Protocol: "
-                                        (mapcar '(lambda (elt)
+                                        (mapcar (lambda (elt)
                                                    (cons (symbol-name elt)
                                                          elt))
                                                 eudc-known-protocols)))))
@@ -796,7 +796,7 @@ If none try N - 1 and so forth."
                (> n 0))
       (setq formats
            (delq nil
-                 (mapcar '(lambda (format)
+                 (mapcar (lambda (format)
                             (if (= n
                                    (length format))
                                 format