Mercurial > emacs

changeset 86963:d549ccffa35b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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.
author Glenn Morris <rgm@gnu.org>
date Sun, 02 Dec 2007 18:57:17 +0000
parents 4a055549d556
children ab3221b29d61
files lisp/net/netrc.el
diffstat 1 files changed, 3 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/net/netrc.el	Sun Dec 02 18:51:38 2007 +0000
+++ b/lisp/net/netrc.el	Sun Dec 02 18:57:17 2007 +0000
@@ -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 @@
     (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 @@
     (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)