From eecd19cf095e53a99734000b9eca4d82b7a4531d Mon Sep 17 00:00:00 2001 From: Tassilo Horn Date: Wed, 5 Nov 2014 12:10:20 +0100 Subject: [PATCH] Fix void-function string-trim error * lisp/net/eww.el (subr-x): Require subr-x because eww uses string-trim. --- lisp/ChangeLog | 5 +++++ lisp/net/eww.el | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 66c6c472991..92062a1c4c7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-11-05 Tassilo Horn + + * net/eww.el (subr-x): Require subr-x because eww uses + string-trim. + 2014-11-05 Daiki Ueno * epg.el (epg-context): Add new slot ERROR-OUTPUT. diff --git a/lisp/net/eww.el b/lisp/net/eww.el index d23b71cf62a..c5e79a3e866 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -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))) -- 2.11.4.GIT