aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2001-12-28 06:29:37 +0000
committerRichard M. Stallman2001-12-28 06:29:37 +0000
commitcf3b69c44ce3f19c87ba4fa500b788a66b2b5965 (patch)
tree5a96d480e56405e33163a5ed3b1456720efe9014
parent4e02881b8064ff871dacef3c0e88ea1017a172de (diff)
downloademacs-cf3b69c44ce3f19c87ba4fa500b788a66b2b5965.tar.gz
emacs-cf3b69c44ce3f19c87ba4fa500b788a66b2b5965.zip
(ldap-search-internal): Handle <file://...> in results.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/net/ldap.el4
2 files changed, 4 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7b5430304ab..e5f85d0afe9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12001-12-28 Richard M. Stallman <rms@gnu.org> 12001-12-28 Richard M. Stallman <rms@gnu.org>
2 2
3 * net/ldap.el (ldap-search-internal): Handle <file://...> in results.
4
3 * simple.el (line-move-invisible): New subroutine. 5 * simple.el (line-move-invisible): New subroutine.
4 (line-move-to-column): New subroutine--smarter about advancing over 6 (line-move-to-column): New subroutine--smarter about advancing over
5 invisible parts of a line, or lines, but only as long as hpos grows. 7 invisible parts of a line, or lines, but only as long as hpos grows.
diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el
index ddbdfa0b1ef..ee8b3ba4577 100644
--- a/lisp/net/ldap.el
+++ b/lisp/net/ldap.el
@@ -584,9 +584,9 @@ an alist of attribute/value pairs."
584 (end-of-line) 584 (end-of-line)
585 (point)))) 585 (point))))
586 (forward-line 1) 586 (forward-line 1)
587 (while (looking-at "^\\(\\w*\\)[=:\t ]+\\(.*\\)$") 587 (while (looking-at "^\\(\\w*\\)[=:\t ]+\\(<[\t ]*file://\\)?\\(.*\\)$")
588 (setq name (match-string 1) 588 (setq name (match-string 1)
589 value (match-string 2)) 589 value (match-string 3))
590 (save-excursion 590 (save-excursion
591 (set-buffer bufval) 591 (set-buffer bufval)
592 (erase-buffer) 592 (erase-buffer)