From: Eli Zaretskii <eliz@gnu.org>
Date: Thu, 8 May 2008 11:16:22 +0000 (+0000)
Subject: ("epa-hook"): Load epa-hook instead of epa-file-hook.
X-Git-Tag: emacs-pretest-23.0.90~5718
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8900c52ceeeb46301967ec8b3f0e0101be684a82;p=emacs.git

("epa-hook"): Load epa-hook instead of epa-file-hook.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 97b84e2b001..ad8edc65b34 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2008-05-08  Eli Zaretskii  <eliz@gnu.org>
 
+	* loadup.el ("epa-hook"): Load epa-hook instead of epa-file-hook.
+
 	* epa-hook.el: Renamed from epa-file-hook.el, to avoid
 	file-names clashes on 8+3 filesystems.
 
diff --git a/lisp/loadup.el b/lisp/loadup.el
index 44a73c901ce..805f82c09f4 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -93,7 +93,7 @@
 (load "help")
 
 (load "jka-cmpr-hook")
-(load "epa-file-hook")
+(load "epa-hook")
 ;; Any Emacs Lisp source file (*.el) loaded here after can contain
 ;; multilingual text.
 (load "international/mule-cmds")