Synch to No Gnus 200506270911.

[elisp/gnus.git-] / lisp / encrypt.el

diff --git a/lisp/encrypt.el b/lisp/encrypt.el
index 61c21a6..9337272 100644 (file)
--- a/lisp/encrypt.el
+++ b/lisp/encrypt.el
@@ -1,5 +1,5 @@
 ;;; encrypt.el --- file encryption routines
-;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Teodor Zlatanov <tzz@lifelogs.com>
 ;; Created: 2003/01/24
@@ -39,17 +39,10 @@
   (autoload 'password-cache-remove "password")
   (defvar password-cache-expiry))
 
-(defgroup encrypt nil
-  "File encryption configuration.")
-
-(defcustom encrypt-password-cache-expiry 200
-  "Encryption password timeout.
-When set, directly sets password-cache-expiry"
-  :type 'integer
-  :group 'encrypt
-  :set (lambda (symbol value)
-        (set symbol value)
-        (setq password-cache-expiry value)))
+(defgroup encrypt '((password-cache custom-variable)
+                   (password-cache-expiry custom-variable))
+  "File encryption configuration."
+  :group 'applications)
 
 (defcustom encrypt-file-alist nil
   "List of file names or regexes matched with encryptions.
@@ -225,7 +218,7 @@ Format example:
        (progn
          (setq new-list (reverse (split-string bs)))
          (dolist (x new-list)
-           (setq x (string-to-int x))
+           (setq x (string-to-number x))
            (insert (format "%c" (logxor x passphrase-sum))))))
       (buffer-substring-no-properties (point-min) (point-max)))))