Commit eecd19cf authored by Tassilo Horn's avatar Tassilo Horn
Browse files

Fix void-function string-trim error

* lisp/net/eww.el (subr-x): Require subr-x because eww uses
string-trim.
parent 5e284614
2014-11-05 Tassilo Horn <tsdh@gnu.org>
* net/eww.el (subr-x): Require subr-x because eww uses
string-trim.
2014-11-05 Daiki Ueno <ueno@gnu.org>
* epg.el (epg-context): Add new slot ERROR-OUTPUT.
......
......@@ -30,6 +30,7 @@
(require 'url)
(require 'url-queue)
(require 'mm-url)
(require 'subr-x) ;; for string-trim
(defgroup eww nil
"Emacs Web Wowser"
......@@ -166,9 +167,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 (and (not (string-match-p "\\`[\"\'].*[\"\']\\'" url))
(> (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)))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment