From: Kenjiro NAKAYAMA Date: Sun, 5 Jan 2014 09:25:05 +0000 (+0100) Subject: * net/eww.el (eww): Support single/double quote for search. X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~65 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f4018140ec4bd45e88f9a8848ccae9d1db2260e2;p=emacs.git * net/eww.el (eww): Support single/double quote for search. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d68d7ea88c2..343b225c029 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2014-01-05 Kenjiro NAKAYAMA + + * net/eww.el (eww): Support single/double quote for search. + 2014-01-05 Paul Eggert Fix misspelling of 'chinese' in rx (Bug#16237). diff --git a/lisp/net/eww.el b/lisp/net/eww.el index cb34a741248..fdd9982ff57 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -157,8 +157,9 @@ word(s) will be searched for via `eww-search-prefix'." (user-error "FTP is not supported.")) (t (if (and (= (length (split-string url)) 1) - (or (> (length (split-string url "\\.")) 1) - (string-match eww-local-regex url))) + (or (and (not (string-match-p "\\`[\"\'].*[\"\']\\'" url)) + (> (length (split-string url "\\.")) 1)) + (string-match eww-local-regex url))) (progn (unless (string-match-p "\\`[a-zA-Z][-a-zA-Z0-9+.]*://" url) (setq url (concat "http://" url)))