X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fnetrc.el;h=0c5e02054d289b1c4dbe02b9b3de54fe4157c526;hb=4cacb5f23eb830e6950dba987063f413977708d7;hp=a4ca0f0cc6672db03aba13585d54cab38b39afa0;hpb=ca20dcfbe645984941fde803c51a8b98fff87c0e;p=elisp%2Fgnus.git- diff --git a/lisp/netrc.el b/lisp/netrc.el index a4ca0f0..0c5e020 100644 --- a/lisp/netrc.el +++ b/lisp/netrc.el @@ -1,6 +1,6 @@ ;;; netrc.el --- .netrc parsing functionality -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 -;; Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Modularizer: Ted Zlatanov @@ -20,8 +20,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -34,13 +34,14 @@ ;;; .netrc and .authinfo rc parsing ;;; -;; autoload gnus-encrypt +;; autoload encrypt (eval-and-compile - (autoload 'gnus-encrypt-find-model "gnus-encrypt") - (autoload 'gnus-encrypt-insert-file-contents "gnus-encrypt")) + (autoload 'encrypt-find-model "encrypt") + (autoload 'encrypt-insert-file-contents "encrypt")) (defgroup netrc nil - "Netrc configuration.") + "Netrc configuration." + :group 'comm) (defvar netrc-services-file "/etc/services" "The name of the services file.") @@ -53,11 +54,11 @@ (let ((tokens '("machine" "default" "login" "password" "account" "macdef" "force" "port")) - (encryption-model (gnus-encrypt-find-model file)) + (encryption-model (encrypt-find-model file)) alist elem result pair) (if encryption-model - (gnus-encrypt-insert-file-contents file encryption-model) + (encrypt-insert-file-contents file encryption-model) (insert-file-contents file)) (goto-char (point-min))