[Emacs-diffs] Changes to emacs/lisp/net/ldap.el

[Pavel Janík]

Index: emacs/lisp/net/ldap.el
diff -c emacs/lisp/net/ldap.el:1.7 emacs/lisp/net/ldap.el:1.8
*** emacs/lisp/net/ldap.el:1.7  Sun Jan  6 11:29:19 2002
--- emacs/lisp/net/ldap.el      Sun Jan  6 12:55:53 2002
***************
*** 570,575 ****
--- 570,578 ----
        (if (looking-at "usage")
          (error "Incorrect ldapsearch invocation")
        (message "Parsing results... ")
+       ;; Skip error message when retrieving attribute list
+       (if (looking-at "Size limit exceeded")
+           (forward-line 1))
        (while (progn
                 (skip-chars-forward " \t\n")
                 (not (eobp)))
***************
*** 580,592 ****
          (while (looking-at "^\\(\\w*\\)[=:\t ]+\\(<[\t 
]*file://\\)?\\(.*\\)$")
            (setq name (match-string 1)
                  value (match-string 3))
!           (save-excursion
!             (set-buffer bufval)
!             (erase-buffer)
!             (set-buffer-multibyte nil)
!             (insert-file-contents-literally value)
!             (delete-file value)
!             (setq value (buffer-string)))
            (setq record (cons (list name value)
                               record))
            (forward-line 1))
--- 583,598 ----
          (while (looking-at "^\\(\\w*\\)[=:\t ]+\\(<[\t 
]*file://\\)?\\(.*\\)$")
            (setq name (match-string 1)
                  value (match-string 3))
!           ;; Do not try to open non-existent files
!           (if (equal value "")
!               (setq value " ")
!             (save-excursion
!               (set-buffer bufval)
!               (erase-buffer)
!               (set-buffer-multibyte nil)
!               (insert-file-contents-literally value)
!               (delete-file value)
!               (setq value (buffer-string))))
            (setq record (cons (list name value)
                               record))
            (forward-line 1))