Re: update of the EasyPG integration patch (Re: minor fixes for EasyPG

[Daiki Ueno]

>>>>> In <address@hidden> 
>>>>>   Stefan Monnier <address@hidden> wrote:
> >  ;;;###autoload
> > -(define-minor-mode epa-file-mode
> > +(define-minor-mode auto-encryption-mode
> >    "Toggle automatic file encryption and decryption.
> >  With prefix argument ARG, turn auto encryption on if positive, else off.
> >  Return the new status of auto encryption (non-nil means on)."
> > -  :global t :init-value nil :group 'epa-file :version "23.1"
> > +  :global t :init-value t :group 'epa-file :version "23.1"

> This sets the variable to t by default, but doesn't run the body
> accordingly, so auto-encryption-mode is non-nil, but
> file-name-handler-alist does not contain epa-file-handler.

Yes.  Though I previously wrote "it turned out that just setting
:init-value of define-minor-mode runs the body of auto-encryption-mode
as expected", it was my misunderstanding.

> Maybe you want to add a call to custom-reevaluate-setting to deal
> with this problem (but it should be in a preloaded file).

Here is a patch to do this.  I've separated epa-file-hook.el, which is
preloaded, from epa-file.el.

P.S.  With this patch, I wonder why `C-h v auto-encryption-mode' shows
"Not documented as a variable."  Am I missing something?

2008-04-30  Daiki Ueno  <address@hidden>

        * epa-file-hook.el: New file which is separated from epa-file.el.
        * loadup.el: Load "epa-file-hook".
        * startup.el (command-line): Eval the body of
        auto-encryption-mode.

diff --git a/lisp/epa-file-hook.el b/lisp/epa-file-hook.el
new file mode 100644
index 0000000..852ad8d
--- /dev/null
+++ b/lisp/epa-file-hook.el
@@ -0,0 +1,109 @@
+;;; epa-file-hook.el --- preloaded code to enable epa-file.el
+;; Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
+
+;; Author: Daiki Ueno <address@hidden>
+;; Keywords: PGP, GnuPG
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; 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., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Code:
+
+(defgroup epa-file nil
+  "The EasyPG Assistant hooks for transparent file encryption"
+  :version "23.1"
+  :group 'epa)
+
+(defun epa-file--file-name-regexp-set (variable value)
+  (set-default variable value)
+  (if (fboundp 'epa-file-name-regexp-update)
+      (epa-file-name-regexp-update)))
+
+(defcustom epa-file-name-regexp "\\.gpg\\(~\\|\\.~[0-9]+~\\)?\\'"
+  "Regexp which matches filenames to be encrypted with GnuPG.
+
+If you set this outside Custom while epa-file is already enabled, you
+have to call `epa-file-name-regexp-update' after setting it to
+properly update file-name-handler-alist.  Setting this through Custom
+does that automatically."
+  :type 'regexp
+  :group 'epa-file
+  :set 'epa-file--file-name-regexp-set)
+
+(defcustom epa-file-inhibit-auto-save t
+  "If non-nil, disable auto-saving when opening an encrypted file."
+  :type 'boolean
+  :group 'epa-file)
+
+(defvar epa-file-encrypt-to nil
+  "*Recipient(s) used for encrypting files.
+May either be a string or a list of strings.")
+
+(put 'epa-file-encrypt-to 'safe-local-variable
+     (lambda (val)
+       (or (stringp val)
+          (and (listp val)
+               (catch 'safe
+                 (mapc (lambda (elt)
+                         (unless (stringp elt)
+                           (throw 'safe nil)))
+                       val)
+                 t)))))
+
+(put 'epa-file-encrypt-to 'permanent-local t)
+
+(defvar epa-file-handler
+  (cons epa-file-name-regexp 'epa-file-handler))
+
+(defvar epa-file-auto-mode-alist-entry
+  (list epa-file-name-regexp nil 'epa-file))
+
+(defun epa-file-name-regexp-update ()
+  (interactive)
+  (unless (equal (car epa-file-handler) epa-file-name-regexp)
+    (setcar epa-file-handler epa-file-name-regexp)))
+
+(defun epa-file-find-file-hook ()
+  (if (and buffer-file-name
+          (string-match epa-file-name-regexp buffer-file-name)
+          epa-file-inhibit-auto-save)
+      (auto-save-mode 0))
+  (set-buffer-modified-p nil))
+
+(define-minor-mode auto-encryption-mode
+  "Toggle automatic file encryption and decryption.
+With prefix argument ARG, turn auto encryption on if positive, else off.
+Return the new status of auto encryption (non-nil means on)."
+  :global t :init-value t :group 'epa-file :version "23.1"
+  (setq file-name-handler-alist
+       (delq epa-file-handler file-name-handler-alist))
+  (remove-hook 'find-file-hooks 'epa-file-find-file-hook)
+  (setq auto-mode-alist (delq epa-file-auto-mode-alist-entry
+                             auto-mode-alist))
+  (when auto-encryption-mode
+    (setq file-name-handler-alist
+         (cons epa-file-handler file-name-handler-alist))
+    (add-hook 'find-file-hook 'epa-file-find-file-hook)
+    (setq auto-mode-alist (cons epa-file-auto-mode-alist-entry
+                               auto-mode-alist))))
+
+(put 'epa-file-handler 'safe-magic t)
+(put 'epa-file-handler 'operations '(write-region insert-file-contents))
+
+(provide 'epa-file-hook)
+
+;;; epa-file-hook.el ends here
diff --git a/lisp/epa-file.el b/lisp/epa-file.el
index d7076d4..3b13469 100644
--- a/lisp/epa-file.el
+++ b/lisp/epa-file.el
@@ -24,68 +24,18 @@
 ;;; Code:
 
 (require 'epa)
-
-(defgroup epa-file nil
-  "The EasyPG Assistant hooks for transparent file encryption"
-  :version "23.1"
-  :group 'epa)
-
-(defun epa-file--file-name-regexp-set (variable value)
-  (set-default variable value)
-  (if (fboundp 'epa-file-name-regexp-update)
-      (epa-file-name-regexp-update)))
-
-(defcustom epa-file-name-regexp "\\.gpg\\(~\\|\\.~[0-9]+~\\)?\\'"
-  "Regexp which matches filenames to be encrypted with GnuPG.
-
-If you set this outside Custom while epa-file is already enabled, you
-have to call `epa-file-name-regexp-update' after setting it to
-properly update file-name-handler-alist.  Setting this through Custom
-does that automatically."
-  :type 'regexp
-  :group 'epa-file
-  :set 'epa-file--file-name-regexp-set)
+(require 'epa-file-hook)
 
 (defcustom epa-file-cache-passphrase-for-symmetric-encryption nil
   "If non-nil, cache passphrase for symmetric encryption."
   :type 'boolean
   :group 'epa-file)
 
-(defcustom epa-file-inhibit-auto-save t
-  "If non-nil, disable auto-saving when opening an encrypted file."
-  :type 'boolean
-  :group 'epa-file)
-
 (defcustom epa-file-select-keys nil
   "If non-nil, always asks user to select recipients."
   :type 'boolean
   :group 'epa-file)
 
-(defvar epa-file-encrypt-to nil
-  "*Recipient(s) used for encrypting files.
-May either be a string or a list of strings.")
-
-;;;###autoload
-(put 'epa-file-encrypt-to 'safe-local-variable
-     (lambda (val)
-       (or (stringp val)
-          (and (listp val)
-               (catch 'safe
-                 (mapc (lambda (elt)
-                         (unless (stringp elt)
-                           (throw 'safe nil)))
-                       val)
-                 t)))))
-
-;;;###autoload
-(put 'epa-file-encrypt-to 'permanent-local t)
-
-(defvar epa-file-handler
-  (cons epa-file-name-regexp 'epa-file-handler))
-
-(defvar epa-file-auto-mode-alist-entry
-  (list epa-file-name-regexp nil 'epa-file))
-
 (defvar epa-file-passphrase-alist nil)
 
 (eval-and-compile
@@ -98,11 +48,6 @@ May either be a string or a list of strings.")
       (defalias 'epa-file--decode-coding-string 'decode-coding-string)
     (defalias 'epa-file--decode-coding-string 'identity)))
 
-(defun epa-file-name-regexp-update ()
-  (interactive)
-  (unless (equal (car epa-file-handler) epa-file-name-regexp)
-    (setcar epa-file-handler epa-file-name-regexp)))
-
 (defun epa-file-passphrase-callback-function (context key-id file)
   (if (and epa-file-cache-passphrase-for-symmetric-encryption
           (eq key-id 'SYM))
@@ -123,6 +68,7 @@ May either be a string or a list of strings.")
                passphrase))))
     (epa-passphrase-callback-function context key-id nil)))
 
+;;;###autoload
 (defun epa-file-handler (operation &rest args)
   (save-match-data
     (let ((op (get operation 'epa-file)))
@@ -273,13 +219,6 @@ If no one is selected, symmetric encryption will be 
performed.  "
        (message "Wrote %s" buffer-file-name))))
 (put 'write-region 'epa-file 'epa-file-write-region)
 
-(defun epa-file-find-file-hook ()
-  (if (and buffer-file-name
-          (string-match epa-file-name-regexp buffer-file-name)
-          epa-file-inhibit-auto-save)
-      (auto-save-mode 0))
-  (set-buffer-modified-p nil))
-
 (defun epa-file-select-keys ()
   "Select recipients for encryption."
   (interactive)
@@ -317,29 +256,6 @@ If no one is selected, symmetric encryption will be 
performed.  "))))
        (message "`epa-file' disabled"))
     (message "`epa-file' already disabled")))
 
-;;;###autoload
-(define-minor-mode auto-encryption-mode
-  "Toggle automatic file encryption and decryption.
-With prefix argument ARG, turn auto encryption on if positive, else off.
-Return the new status of auto encryption (non-nil means on)."
-  :global t :init-value t :group 'epa-file :version "23.1"
-  (setq file-name-handler-alist
-       (delq epa-file-handler file-name-handler-alist))
-  (remove-hook 'find-file-hooks 'epa-file-find-file-hook)
-  (setq auto-mode-alist (delq epa-file-auto-mode-alist-entry
-                             auto-mode-alist))
-  (when auto-encryption-mode
-    (setq file-name-handler-alist
-         (cons epa-file-handler file-name-handler-alist))
-    (add-hook 'find-file-hook 'epa-file-find-file-hook)
-    (add-hook 'find-file-not-found-functions
-             'epa-file-find-file-not-found-functions)
-    (setq auto-mode-alist (cons epa-file-auto-mode-alist-entry
-                               auto-mode-alist))))
-
-(put 'epa-file-handler 'safe-magic t)
-(put 'epa-file-handler 'operations '(write-region insert-file-contents))
-
 (provide 'epa-file)
 
 ;; arch-tag: 5715152f-0eb1-4dbc-9008-07098775314d
diff --git a/lisp/loadup.el b/lisp/loadup.el
index 1bf413b..153b53f 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -95,6 +95,7 @@
 (load "help")
 
 (load "jka-cmpr-hook")
+(load "epa-file-hook")
 ;; Any Emacs Lisp source file (*.el) loaded here after can contain
 ;; multilingual text.
 (load "international/mule-cmds")
diff --git a/lisp/startup.el b/lisp/startup.el
index f5ce1b7..a4f5c6b 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -847,6 +847,7 @@ opening the first frame (e.g. open a connection to an X 
server).")
   (custom-reevaluate-setting 'focus-follows-mouse)
   (custom-reevaluate-setting 'global-auto-composition-mode)
   (custom-reevaluate-setting 'transient-mark-mode)
+  (custom-reevaluate-setting 'auto-encryption-mode)
 
   (normal-erase-is-backspace-setup-frame)
 

Regards,
-- 
Daiki Ueno