aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorEli Zaretskii2008-05-08 11:24:15 +0000
committerEli Zaretskii2008-05-08 11:24:15 +0000
commit3fe687288678f10dd6697a2daf86cd15340fc6bb (patch)
treee8f45b35b057d13e722ef774f80be7082ff26ccf /lisp
parent8900c52ceeeb46301967ec8b3f0e0101be684a82 (diff)
downloademacs-3fe687288678f10dd6697a2daf86cd15340fc6bb.tar.gz
emacs-3fe687288678f10dd6697a2daf86cd15340fc6bb.zip
Provide/require epa-hook, not epa-file-hook.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/epa-file.el2
-rw-r--r--lisp/epa-hook.el2
3 files changed, 5 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ad8edc65b34..685be52cf06 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,9 +1,11 @@
12008-05-08 Eli Zaretskii <eliz@gnu.org> 12008-05-08 Eli Zaretskii <eliz@gnu.org>
2 2
3 * epa-file.el: Require epa-hook.
4
3 * loadup.el ("epa-hook"): Load epa-hook instead of epa-file-hook. 5 * loadup.el ("epa-hook"): Load epa-hook instead of epa-file-hook.
4 6
5 * epa-hook.el: Renamed from epa-file-hook.el, to avoid 7 * epa-hook.el: Renamed from epa-file-hook.el, to avoid
6 file-names clashes on 8+3 filesystems. 8 file-names clashes on 8+3 filesystems. Provide epa-hook.
7 9
8 * org/org-jsinfo.el: Renamed from org-infojs.el, to avoid 10 * org/org-jsinfo.el: Renamed from org-infojs.el, to avoid
9 file-names clashes on 8+3 filesystems. 11 file-names clashes on 8+3 filesystems.
diff --git a/lisp/epa-file.el b/lisp/epa-file.el
index ce0fe74962b..25edba5a2dc 100644
--- a/lisp/epa-file.el
+++ b/lisp/epa-file.el
@@ -22,7 +22,7 @@
22;;; Code: 22;;; Code:
23 23
24(require 'epa) 24(require 'epa)
25(require 'epa-file-hook) 25(require 'epa-hook)
26 26
27(defcustom epa-file-cache-passphrase-for-symmetric-encryption nil 27(defcustom epa-file-cache-passphrase-for-symmetric-encryption nil
28 "If non-nil, cache passphrase for symmetric encryption." 28 "If non-nil, cache passphrase for symmetric encryption."
diff --git a/lisp/epa-hook.el b/lisp/epa-hook.el
index 57c5304c45f..a84308fbe3f 100644
--- a/lisp/epa-hook.el
+++ b/lisp/epa-hook.el
@@ -102,7 +102,7 @@ Return the new status of auto encryption (non-nil means on)."
102(put 'epa-file-handler 'safe-magic t) 102(put 'epa-file-handler 'safe-magic t)
103(put 'epa-file-handler 'operations '(write-region insert-file-contents)) 103(put 'epa-file-handler 'operations '(write-region insert-file-contents))
104 104
105(provide 'epa-file-hook) 105(provide 'epa-hook)
106 106
107;; arch-tag: f75c8a50-d32e-4eb3-9ec6-9e940c1fc8b5 107;; arch-tag: f75c8a50-d32e-4eb3-9ec6-9e940c1fc8b5
108;;; epa-file-hook.el ends here 108;;; epa-file-hook.el ends here