[Emacs-diffs] /srv/bzr/emacs/trunk r101548: netrc.el (netrc-parse): Remove encrypt.el mentions.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 101548
author: Teodor Zlatanov <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Thu 2010-09-23 03:57:10 +0000
message:
  netrc.el (netrc-parse): Remove encrypt.el mentions.
modified:
  lisp/ChangeLog
  lisp/net/netrc.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-09-23 00:30:37 +0000
+++ b/lisp/ChangeLog    2010-09-23 03:57:10 +0000
@@ -1,3 +1,7 @@
+2010-09-23  Teodor Zlatanov  <address@hidden>
+
+       * net/netrc.el (netrc-parse): Remove encrypt.el mentions.
+
 2010-09-22  Dan Christensen  <address@hidden>
 
        * calendar/time-date.el (date-to-time): Try using parse-time-string

=== modified file 'lisp/net/netrc.el'
--- a/lisp/net/netrc.el 2010-09-18 10:02:19 +0000
+++ b/lisp/net/netrc.el 2010-09-23 03:57:10 +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))