From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Tue, 23 Feb 2016 02:56:05 +0000 (+1100)
Subject: Remove Gnus functions from auth-source.el
X-Git-Tag: emacs-26.0.90~2511
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=335c098a66f507ac6a6296e9daaa8ba6e7c1b0c0;p=emacs.git

Remove Gnus functions from auth-source.el

* lisp/gnus/auth-source.el (auth-source-netrc-parse-entries):
Remove usage of Gnus utility function.
(mm-util, gnus-util): Don't require.
---

diff --git a/lisp/gnus/auth-source.el b/lisp/gnus/auth-source.el
index b9341f5ce8e..cfd21a523cd 100644
--- a/lisp/gnus/auth-source.el
+++ b/lisp/gnus/auth-source.el
@@ -40,8 +40,6 @@
 ;;; Code:
 
 (require 'password-cache)
-(require 'mm-util)
-(require 'gnus-util)
 
 (eval-when-compile (require 'cl))
 (require 'eieio)
@@ -1088,12 +1086,10 @@ Note that the MAX parameter is used so we can exit the parse early."
         (when (setq item2 (auth-source-netrc-parse-one))
           ;; Did we get a "machine" value?
           (if (equal item2 "machine")
-              (progn
-                (gnus-error 1
-                 "%s: Unexpected `machine' token at line %d"
-                 "auth-source-netrc-parse-entries"
-                 (auth-source-current-line))
-                (forward-line 1))
+	      (error
+	       "%s: Unexpected `machine' token at line %d"
+	       "auth-source-netrc-parse-entries"
+	       (auth-source-current-line))
             (push (cons item item2) alist)))))
 
     ;; Clean up: if there's an entry left over, use it.