Mercurial > emacs
diff lisp/net/ldap.el @ 90100:72cf6261961e
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-11
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-69
- miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-71
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-72
src/dispextern.h (xassert): Enable unconditionally.
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-73
- miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-81
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-82
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-12
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-13
Update from CVS
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Sun, 06 Feb 2005 12:06:02 +0000 |
| parents | 4c90ffeb71c5 654691f40a53 |
| children | 3ebd9bdb4fe5 |
line wrap: on
line diff
--- a/lisp/net/ldap.el Wed Feb 02 01:54:00 2005 +0000 +++ b/lisp/net/ldap.el Sun Feb 06 12:06:02 2005 +0000 @@ -579,9 +579,9 @@ (end-of-line) (point)))) (forward-line 1) - (while (looking-at "^\\(\\w*\\)[=:\t ]+\\(<[\t ]*file://\\)?\\(.*\\)$") + (while (looking-at "^\\(\\w*\\)\\(;\\w*\\)?[=:\t ]+\\(<[\t ]*file://\\)?\\(.*\\)$") (setq name (match-string 1) - value (match-string 3)) + value (match-string 4)) ;; Need to handle file:///D:/... as generated by OpenLDAP ;; on DOS/Windows as local files. (if (and (memq system-type '(windows-nt ms-dos))