diff options
| author | Kenjiro NAKAYAMA | 2014-01-05 10:25:05 +0100 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen | 2014-01-05 10:25:05 +0100 |
| commit | f4018140ec4bd45e88f9a8848ccae9d1db2260e2 (patch) | |
| tree | 3bd470246b3ca7d019ed474937d4c471ef2782ea | |
| parent | 73dbf960bfdb3a4e9a34804eefecdd76fd769f0c (diff) | |
| download | emacs-f4018140ec4bd45e88f9a8848ccae9d1db2260e2.tar.gz emacs-f4018140ec4bd45e88f9a8848ccae9d1db2260e2.zip | |
* net/eww.el (eww): Support single/double quote for search.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/net/eww.el | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d68d7ea88c2..343b225c029 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2014-01-05 Kenjiro NAKAYAMA <nakayamakenjiro@gmail.com> | ||
| 2 | |||
| 3 | * net/eww.el (eww): Support single/double quote for search. | ||
| 4 | |||
| 1 | 2014-01-05 Paul Eggert <eggert@cs.ucla.edu> | 5 | 2014-01-05 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 6 | ||
| 3 | Fix misspelling of 'chinese' in rx (Bug#16237). | 7 | 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'." | |||
| 157 | (user-error "FTP is not supported.")) | 157 | (user-error "FTP is not supported.")) |
| 158 | (t | 158 | (t |
| 159 | (if (and (= (length (split-string url)) 1) | 159 | (if (and (= (length (split-string url)) 1) |
| 160 | (or (> (length (split-string url "\\.")) 1) | 160 | (or (and (not (string-match-p "\\`[\"\'].*[\"\']\\'" url)) |
| 161 | (string-match eww-local-regex url))) | 161 | (> (length (split-string url "\\.")) 1)) |
| 162 | (string-match eww-local-regex url))) | ||
| 162 | (progn | 163 | (progn |
| 163 | (unless (string-match-p "\\`[a-zA-Z][-a-zA-Z0-9+.]*://" url) | 164 | (unless (string-match-p "\\`[a-zA-Z][-a-zA-Z0-9+.]*://" url) |
| 164 | (setq url (concat "http://" url))) | 165 | (setq url (concat "http://" url))) |