Fix void-function string-trim error

* lisp/net/eww.el (subr-x): Require subr-x because eww uses
string-trim.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 66c6c47299189c73230f5329adb6e8e52b95e134..92062a1c4c7c745a3e88ef05f6528d86d18ca418 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+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.

diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index d23b71cf62ac4ecd7c20593257c3cf758969ec54..c5e79a3e8669097e8fc223bf188fd3148c35afef 100644 (file)
--- 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)))