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

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

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) \

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.
 

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>

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.

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