Commit cb11d614 authored by Glenn Morris's avatar Glenn Morris
Browse files

(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.
parent 1ac4605f
......@@ -10,6 +10,10 @@
(uudecode-decoder-program, uudecode-decoder-switches)
(uudecode-use-external): Move to the uudecode custom group.
* net/netrc.el (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.
2007-12-02 Agustin Martin <agustin.martin@hispalinux.es>
* textmodes/flyspell.el (flyspell-large-region): Explicitly set
......
......@@ -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 @@ MODE can be \"login\" or \"password\", suitable for passing to
(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 @@ MODE can be \"login\" or \"password\", suitable for passing to
(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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment