netrc.el (netrc-parse): Remove encrypt.el mentions.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 49393728f073ca13f94760b243793beaf636a9ed..2e11356ded1c3f177cfa33a3bc687d7d54dce7e6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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

diff --git a/lisp/net/netrc.el b/lisp/net/netrc.el
index 3636c892726140ac8afd3389493470542ce93e6f..2644659e20dbd4cdf67cfe1178ab1c133cb44b23 100644 (file)
--- 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))