diff options
| author | Miles Bader <miles@gnu.org> | 2005-02-06 12:06:02 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2005-02-06 12:06:02 +0000 |
| commit | a359f0e0ff878285654e2f0bcc7bd3b4340c778c (patch) | |
| tree | cc0aff13c751bb8ab7ccaae29082bab32e15fd13 /lisp/net | |
| parent | f3d3402885646e6fa79f1ad59fb8a1f9017851d7 (diff) | |
| parent | 56c30d721096a64f151f9ea6e3c76562380da895 (diff) | |
| download | emacs-a359f0e0ff878285654e2f0bcc7bd3b4340c778c.tar.gz emacs-a359f0e0ff878285654e2f0bcc7bd3b4340c778c.tar.bz2 emacs-a359f0e0ff878285654e2f0bcc7bd3b4340c778c.zip | |
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
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/ldap.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el index f093fb1cbcc..16af42ffc27 100644 --- a/lisp/net/ldap.el +++ b/lisp/net/ldap.el @@ -579,9 +579,9 @@ an alist of attribute/value pairs." (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)) |