From 7676efad0e6f8e90306950c8426a56928c4739e0 Mon Sep 17 00:00:00 2001 From: Teodor Zlatanov Date: Thu, 23 Sep 2010 03:57:10 +0000 Subject: [PATCH] netrc.el (netrc-parse): Remove encrypt.el mentions. --- lisp/ChangeLog | 4 ++++ lisp/net/netrc.el | 10 +--------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 49393728f07..2e11356ded1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2010-09-23 Teodor Zlatanov + + * net/netrc.el (netrc-parse): Remove encrypt.el mentions. + 2010-09-22 Dan Christensen * calendar/time-date.el (date-to-time): Try using parse-time-string diff --git a/lisp/net/netrc.el b/lisp/net/netrc.el index 3636c892726..2644659e20d 100644 --- a/lisp/net/netrc.el +++ b/lisp/net/netrc.el @@ -34,14 +34,10 @@ ;;; .netrc and .authinfo rc parsing ;;; -;; use encrypt if loaded (encrypt-file-alist has to be set as well) -(autoload 'encrypt-find-model "encrypt") -(autoload 'encrypt-insert-file-contents "encrypt") (defalias 'netrc-point-at-eol (if (fboundp 'point-at-eol) 'point-at-eol 'line-end-position)) -(defvar encrypt-file-alist) (eval-when-compile ;; This is unnecessary in the compiled version as it is a macro. (if (fboundp 'bound-and-true-p) @@ -74,12 +70,8 @@ (let ((tokens '("machine" "default" "login" "password" "account" "macdef" "force" "port")) - (encryption-model (when (netrc-bound-and-true-p encrypt-file-alist) - (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)) -- 2.39.2