From: Chong Yidong Date: Tue, 12 Aug 2008 18:35:18 +0000 (+0000) Subject: (ldap-search-internal): Tweak URL regexp. X-Git-Tag: emacs-pretest-23.0.90~3519 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6430562b71fd9983281d54dc650c37bb13ad824a;p=emacs.git (ldap-search-internal): Tweak URL regexp. --- diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el index 7ab737d8126..6cf96f3fe07 100644 --- a/lisp/net/ldap.el +++ b/lisp/net/ldap.el @@ -584,7 +584,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