Mercurial > emacs
changeset 110489:b3141c4861e2
netrc.el (netrc-parse): Remove encrypt.el mentions.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Thu, 23 Sep 2010 03:57:10 +0000 |
| parents | 4ead2c32359c |
| children | 7c3194dcf52d |
| files | lisp/ChangeLog lisp/net/netrc.el |
| diffstat | 2 files changed, 5 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Sep 23 01:51:43 2010 +0000 +++ b/lisp/ChangeLog Thu Sep 23 03:57:10 2010 +0000 @@ -1,3 +1,7 @@ +2010-09-23 Teodor Zlatanov <tzz@lifelogs.com> + + * net/netrc.el (netrc-parse): Remove encrypt.el mentions. + 2010-09-22 Dan Christensen <jdc@uwo.ca> * calendar/time-date.el (date-to-time): Try using parse-time-string
--- a/lisp/net/netrc.el Thu Sep 23 01:51:43 2010 +0000 +++ b/lisp/net/netrc.el Thu Sep 23 03:57:10 2010 +0000 @@ -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))