]> git.eshelyaron.com Git - emacs.git/commitdiff
Remove Gnus functions from auth-source.el
authorLars Ingebrigtsen <larsi@gnus.org>
Tue, 23 Feb 2016 02:56:05 +0000 (13:56 +1100)
committerLars Ingebrigtsen <larsi@gnus.org>
Tue, 23 Feb 2016 02:56:05 +0000 (13:56 +1100)
* lisp/gnus/auth-source.el (auth-source-netrc-parse-entries):
Remove usage of Gnus utility function.
(mm-util, gnus-util): Don't require.

lisp/gnus/auth-source.el

index b9341f5ce8ebbdec1477f1f7164dcba65e8f6c66..cfd21a523cd9f4192bd84506bbe64166e4da9561 100644 (file)
@@ -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.