[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/net/netrc.el,v
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/net/netrc.el,v |
Date: |
Sun, 02 Dec 2007 18:57:18 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 07/12/02 18:57:17
Index: netrc.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/netrc.el,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- netrc.el 28 Oct 2007 09:18:39 -0000 1.9
+++ netrc.el 2 Dec 2007 18:57:17 -0000 1.10
@@ -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)
- [Emacs-diffs] Changes to emacs/lisp/net/netrc.el,v,
Glenn Morris <=