Renamed lisp/epa-file-hook.el to lisp/epa-hook.el.

6 files changed, 16 insertions, 4 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 90083938e1c..1b64f54cbdd 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-08  Eli Zaretskii  <eliz@gnu.org>
+
+        * makefile.w32-in (lisp2): Rename epa-file-hook.elc to epa-hook.elc.
+
 2008-05-03  Eli Zaretskii  <eliz@gnu.org>
 
         * makefile.w32-in (lisp2): Add epa-file-hook.elc, to track the
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 91a07f24683..8a168b3842e 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -281,7 +281,7 @@ lisp2 = \
         $(lispsource)jka-cmpr-hook.elc \
         $(lispsource)vc-hooks.elc \
         $(lispsource)ediff-hook.elc \
-        $(lispsource)epa-file-hook.elc \
+        $(lispsource)epa-hook.elc \
         $(TOOLTIP_SUPPORT) \
         $(WINNT_SUPPORT) \
         $(WINDOW_SUPPORT) \
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 87b5a0885d5..97b84e2b001 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2008-05-08  Eli Zaretskii  <eliz@gnu.org>
 
+        * epa-hook.el: Renamed from epa-file-hook.el, to avoid
+        file-names clashes on 8+3 filesystems.
+
         * org/org-jsinfo.el: Renamed from org-infojs.el, to avoid
         file-names clashes on 8+3 filesystems.
 
diff --git a/lisp/epa-file-hook.el b/lisp/epa-hook.el
index 18ee43e13b8..57c5304c45f 100644
--- a/lisp/epa-file-hook.el
+++ b/lisp/epa-hook.el
@@ -1,4 +1,4 @@
-;;; epa-file-hook.el --- preloaded code to enable epa-file.el
+;;; epa-hook.el --- preloaded code to enable epa-file.el
 ;; Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
diff --git a/src/ChangeLog b/src/ChangeLog
index e68efb42094..9ed1805d31a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-08  Eli Zaretskii  <eliz@gnu.org>
+
+        * Makefile.in (lisp, shortlisp): Rename epa-file-hook.elc to
+        epa-hook.elc.
+
 2008-05-08  Juanma Barranquero  <lekktu@gmail.com>
 
         * font.c (Ffont_match_p): Don't use `iff' in docstring.
diff --git a/src/Makefile.in b/src/Makefile.in
index 62cb3daf424..80df9a66a93 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -779,7 +779,7 @@ lisp= \
         ${lispsource}jka-cmpr-hook.elc \
         ${lispsource}vc-hooks.elc \
         ${lispsource}ediff-hook.elc \
-        ${lispsource}epa-file-hook.elc \
+        ${lispsource}epa-hook.elc \
         TOOLTIP_SUPPORT \
         VMS_SUPPORT \
         MSDOS_SUPPORT \
@@ -871,7 +871,7 @@ shortlisp= \
         ../lisp/vc-hooks.elc \
         ../lisp/jka-cmpr-hook.elc \
         ../lisp/ediff-hook.elc \
-        ../lisp/epa-file-hook.elc \
+        ../lisp/epa-hook.elc \
         ../lisp/widget.elc \
         ../lisp/window.elc \
         ../lisp/version.el