From cb11d61498063c1bc42bf76e8dd78de18feeca40 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 2 Dec 2007 18:57:36 +0000 Subject: [PATCH] (top-level): Don't load `encrypt' features. (netrc-parse): Don't use encrypt. (netrc-find-service-name, netrc-find-service-number): Don't use caddr. --- lisp/ChangeLog | 4 ++++ lisp/net/netrc.el | 18 +++--------------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c2d0a82932c..4024af1b9dd 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -10,6 +10,10 @@ (uudecode-decoder-program, uudecode-decoder-switches) (uudecode-use-external): Move to the uudecode custom group. + * net/netrc.el (top-level): Don't load `encrypt' features. + (netrc-parse): Don't use encrypt. + (netrc-find-service-name, netrc-find-service-number): Don't use caddr. + 2007-12-02 Agustin Martin * textmodes/flyspell.el (flyspell-large-region): Explicitly set diff --git a/lisp/net/netrc.el b/lisp/net/netrc.el index 8c4b0a08f51..da9182e7cdd 100644 --- a/lisp/net/netrc.el +++ b/lisp/net/netrc.el @@ -39,11 +39,6 @@ (if (fboundp 'point-at-eol) 'point-at-eol 'line-end-position)) -;; autoload encrypt - -(eval-and-compile - (autoload 'encrypt-find-model "encrypt") - (autoload 'encrypt-insert-file-contents "encrypt")) (defgroup netrc nil "Netrc configuration." @@ -60,13 +55,8 @@ (let ((tokens '("machine" "default" "login" "password" "account" "macdef" "force" "port")) - (encryption-model (encrypt-find-model file)) alist elem result pair) - - (if encryption-model - (encrypt-insert-file-contents file encryption-model) - (insert-file-contents file)) - + (insert-file-contents file) (goto-char (point-min)) ;; Go through the file, line by line. (while (not (eobp)) @@ -190,8 +180,7 @@ MODE can be \"login\" or \"password\", suitable for passing to (setq type (or type 'tcp)) (while (and (setq service (pop services)) (not (and (= number (cadr service)) - (eq type (caddr service))))) - ) + (eq type (car (cddr service))))))) (car service))) (defun netrc-find-service-number (name &optional type) @@ -200,8 +189,7 @@ MODE can be \"login\" or \"password\", suitable for passing to (setq type (or type 'tcp)) (while (and (setq service (pop services)) (not (and (string= name (car service)) - (eq type (caddr service))))) - ) + (eq type (car (cddr service))))))) (cadr service))) (provide 'netrc) -- 2.39.2