From: Chong Yidong Date: Tue, 12 Aug 2008 18:36:15 +0000 (+0000) Subject: (ldap-search-internal): Tweak URL regexp. X-Git-Tag: emacs-pretest-22.2.90~5 X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/d35a5141a520f29b29ba5e5e7f1f2e339a719b5d (ldap-search-internal): Tweak URL regexp. --- diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el index d0bbe32c65..bff7cf7180 100644 --- a/lisp/net/ldap.el +++ b/lisp/net/ldap.el @@ -586,7 +586,9 @@ an alist of attribute/value pairs." (end-of-line) (point)))) (forward-line 1) - (while (looking-at "^\\(\\w*\\)\\(;\\w*\\)?[=:\t ]+\\(<[\t ]*file://\\)\\(.*\\)$") + (while (looking-at "^\\([A-Za-z][-A-Za-z0-9]*\ +\\|[0-9]+\\(?:\\.[0-9]+\\)*\\)\\(;[-A-Za-z0-9]+\\)*[=:\t ]+\ +\\(<[\t ]*file://\\)\\(.*\\)$") (setq name (match-string 1) value (match-string 4)) ;; Need to handle file:///D:/... as generated by OpenLDAP