[Emacs-diffs] trunk r118292: Fix void-function string-trim error

[Tassilo Horn]

------------------------------------------------------------
revno: 118292
revision-id: address@hidden
parent: address@hidden
committer: Tassilo Horn <address@hidden>
branch nick: build
timestamp: Wed 2014-11-05 12:10:20 +0100
message:
  Fix void-function string-trim error
  
  * lisp/net/eww.el (subr-x): Require subr-x because eww uses
  string-trim.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/net/eww.el                eww.el-20130610114603-80ap3gwnw4x4m5ix-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-11-05 09:38:37 +0000
+++ b/lisp/ChangeLog    2014-11-05 11:10:20 +0000
@@ -1,3 +1,8 @@
+2014-11-05  Tassilo Horn  <address@hidden>
+
+       * net/eww.el (subr-x): Require subr-x because eww uses
+       string-trim.
+
 2014-11-05  Daiki Ueno  <address@hidden>
 
        * epg.el (epg-context): Add new slot ERROR-OUTPUT.

=== modified file 'lisp/net/eww.el'
--- a/lisp/net/eww.el   2014-11-04 16:31:33 +0000
+++ b/lisp/net/eww.el   2014-11-05 11:10:20 +0000
@@ -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 @@
          (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)))