Remove nnml-retrieve-groups that is unnecessary and somewhat problematic

[gnus] / lisp / smime-ldap.el

diff --git a/lisp/smime-ldap.el b/lisp/smime-ldap.el
index 0480735..66ae9c5 100644 (file)
--- a/lisp/smime-ldap.el
+++ b/lisp/smime-ldap.el
@@ -20,9 +20,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., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -53,28 +51,8 @@ Additional search parameters can be specified through
   ;; for XEmacs
   (if (fboundp 'ldap-search-entries)
       (ldap-search-entries filter host attributes attrsonly)
-    ;; for Emacs 22
-    (if (>= emacs-major-version 22)
-       (cdr (ldap-search filter host attributes attrsonly))
-      ;; for Emacs 21.x
-      (or host
-         (setq host ldap-default-host)
-         (error "No LDAP host specified"))
-      (let ((host-plist (cdr (assoc host ldap-host-parameters-alist)))
-           result)
-       (setq result (smime-ldap-search-internal
-                     (append host-plist
-                             (list 'host host
-                                   'filter filter
-                                   'attributes attributes
-                                   'attrsonly attrsonly
-                                   'withdn withdn))))
-       (cdr (if ldap-ignore-attribute-codings
-                result
-              (mapcar (function
-                       (lambda (record)
-                         (mapcar 'ldap-decode-attribute record)))
-                      result)))))))
+    ;; for Emacs
+    (cdr (ldap-search filter host attributes attrsonly))))
 
 (defun smime-ldap-search-internal (search-plist)
   "Perform a search on a LDAP server.
@@ -120,8 +98,7 @@ an alist of attribute/value pairs."
            (equal "" filter))
        (error "No search filter"))
     (setq filter (cons filter attributes))
-    (save-excursion
-      (set-buffer buf)
+    (with-current-buffer buf
       (erase-buffer)
       (if (and host
               (not (equal "" host)))
@@ -181,8 +158,7 @@ an alist of attribute/value pairs."
                                     "\\(<[\t ]*file://\\)?\\(.*\\)$"))
            (setq name (match-string 1)
                  value (match-string 4))
-           (save-excursion
-             (set-buffer bufval)
+           (with-current-buffer bufval
              (erase-buffer)
              (insert-file-contents-literally value)
              (delete-file value)