Mercurial > emacs
comparison lisp/net/ldap.el @ 104735:214b3e5da89a
(ldap-search-internal): Use with-current-buffer and push.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Sun, 30 Aug 2009 14:24:09 +0000 |
parents | a9dc0e7c3f2b |
children | 1d1d5d9bd884 |
comparison
equal
deleted
inserted
replaced
104734:714ab1b8092b | 104735:214b3e5da89a |
---|---|
522 arglist dn name value record result) | 522 arglist dn name value record result) |
523 (if (or (null filter) | 523 (if (or (null filter) |
524 (equal "" filter)) | 524 (equal "" filter)) |
525 (error "No search filter")) | 525 (error "No search filter")) |
526 (setq filter (cons filter attributes)) | 526 (setq filter (cons filter attributes)) |
527 (save-excursion | 527 (with-current-buffer buf |
528 (set-buffer buf) | |
529 (erase-buffer) | 528 (erase-buffer) |
530 (if (and host | 529 (if (and host |
531 (not (equal "" host))) | 530 (not (equal "" host))) |
532 (setq arglist (nconc arglist (list (format "-h%s" host))))) | 531 (setq arglist (nconc arglist (list (format "-h%s" host))))) |
533 (if (and attrsonly | 532 (if (and attrsonly |
595 (eq (string-match "/\\(.:.*\\)$" value) 0)) | 594 (eq (string-match "/\\(.:.*\\)$" value) 0)) |
596 (setq value (match-string 1 value))) | 595 (setq value (match-string 1 value))) |
597 ;; Do not try to open non-existent files | 596 ;; Do not try to open non-existent files |
598 (if (equal value "") | 597 (if (equal value "") |
599 (setq value " ") | 598 (setq value " ") |
600 (save-excursion | 599 (with-current-buffer bufval |
601 (set-buffer bufval) | |
602 (erase-buffer) | 600 (erase-buffer) |
603 (set-buffer-multibyte nil) | 601 (set-buffer-multibyte nil) |
604 (insert-file-contents-literally value) | 602 (insert-file-contents-literally value) |
605 (delete-file value) | 603 (delete-file value) |
606 (setq value (buffer-string)))) | 604 (setq value (buffer-string)))) |
607 (setq record (cons (list name value) | 605 (setq record (cons (list name value) |
608 record)) | 606 record)) |
609 (forward-line 1)) | 607 (forward-line 1)) |
610 (setq result (cons (if withdn | 608 (push (if withdn |
611 (cons dn (nreverse record)) | 609 (cons dn (nreverse record)) |
612 (nreverse record)) result)) | 610 (nreverse record)) result) |
613 (setq record nil) | 611 (setq record nil) |
614 (skip-chars-forward " \t\n") | 612 (skip-chars-forward " \t\n") |
615 (message "Parsing results... %d" numres) | 613 (message "Parsing results... %d" numres) |
616 (1+ numres)) | 614 (1+ numres)) |
617 (message "Parsing results... done") | 615 (message "Parsing results... done") |