From: Glenn Morris <rgm@gnu.org>
Date: Tue, 2 May 2017 20:59:51 +0000 (-0400)
Subject: Tweak auth-source-pass.el to avoid run-time subr-x
X-Git-Tag: emacs-26.0.90~521^2~483
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=47081bf23bedf8e2e567f2adfe2e5cc9466caa27;p=emacs.git

Tweak auth-source-pass.el to avoid run-time subr-x

* lisp/auth-source-pass.el (auth-source-pass--parse-data):
Avoid needing subr-x at run-time.
---

diff --git a/lisp/auth-source-pass.el b/lisp/auth-source-pass.el
index e5de18456b9..529e3024a62 100644
--- a/lisp/auth-source-pass.el
+++ b/lisp/auth-source-pass.el
@@ -32,7 +32,7 @@
 ;;; Code:
 
 (require 'seq)
-(require 'subr-x)
+(eval-when-compile (require 'subr-x))
 (eval-when-compile
   (require 'cl-lib))
 (require 'auth-source)
@@ -132,7 +132,7 @@ CONTENTS is the contents of a password-store formatted file."
   (let ((lines (split-string contents "\\\n" t "\\\s")))
     (seq-remove #'null
                 (mapcar (lambda (line)
-                          (let ((pair (mapcar #'string-trim
+                          (let ((pair (mapcar (lambda (s) (string-trim s))
                                               (split-string line ":"))))
                             (when (> (length pair) 1)
                               (cons (car pair)