summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2016-02-23 13:56:05 +1100
committerLars Ingebrigtsen <larsi@gnus.org>2016-02-23 13:56:05 +1100
commit335c098a66f507ac6a6296e9daaa8ba6e7c1b0c0 (patch)
tree5ac8dd896089f005f041e8b8ecf26d091efd8b40
parentdfcdc1cbed773041e907a389b8901ca845af49bb (diff)
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.
-rw-r--r--lisp/gnus/auth-source.el12
1 files changed, 4 insertions, 8 deletions
diff --git a/lisp/gnus/auth-source.el b/lisp/gnus/auth-source.el
index b9341f5ce8..cfd21a523c 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.