(ldap-search-internal): Use with-current-buffer and push.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 75c697ca72ddac5308ff91cd88f72f7fba57f39d..f2c2fbda65e5749045929e3d57659369d479ac33 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2009-08-30  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * net/ldap.el (ldap-search-internal): Use with-current-buffer and push.
+
        * net/imap.el (imap-send-command): Simplify.
        (imap-wait-for-tag): point-max - buffer-size.
 

diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el
index 68afee6a1a21383370bd663cd63ea2d2b72df292..20b41aeded426d16403dab383530fdf799110f1e 100644 (file)
--- a/lisp/net/ldap.el
+++ b/lisp/net/ldap.el
@@ -524,8 +524,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)))
@@ -597,8 +596,7 @@ an alist of attribute/value pairs."
            ;; Do not try to open non-existent files
            (if (equal value "")
                (setq value " ")
-             (save-excursion
-               (set-buffer bufval)
+             (with-current-buffer bufval
                (erase-buffer)
                (set-buffer-multibyte nil)
                (insert-file-contents-literally value)
@@ -607,9 +605,9 @@ an alist of attribute/value pairs."
            (setq record (cons (list name value)
                               record))
            (forward-line 1))
-         (setq result (cons (if withdn
-                                (cons dn (nreverse record))
-                              (nreverse record)) result))
+         (push (if withdn
+                   (cons dn (nreverse record))
+                 (nreverse record)) result)
          (setq record nil)
          (skip-chars-forward " \t\n")
          (message "Parsing results... %d" numres)