From: Bruno Haible <bruno@clisp.org>
Date: Mon, 11 Mar 2002 21:03:56 +0000 (+0000)
Subject: Fix last patch.
X-Git-Tag: v0.11.1~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3f32c7c0fb709c3110a40b4a53202b58ed4c9d1;p=thirdparty%2Fgettext.git

Fix last patch.
---

diff --git a/misc/ChangeLog b/misc/ChangeLog
index 817133c98..4433f632b 100644
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,7 +1,14 @@
+2002-03-11  Karl Eichwalder  <ke@suse.de>
+
+	* po-mode.el (po-find-file-coding-system-guts): Checking
+	'insert-file-contents' must come first to avoid messing up with
+	arguments.
+	Reported by Neil Darlow; fixed by Andreas Schwab.
+
 2002-03-09  Karl Eichwalder  <ke@suse.de>
 
 	* po-mode.el (po-find-file-coding-system-guts): Don't try to
-	detect the coding system when filename does not exists.
+	detect the coding system when filename does not exist.
 	(po-compute-counters): Search for "^msgid" not 'po-next-entry' if
 	we don't know for sure any entry will follow at all.
 
diff --git a/misc/po-mode.el b/misc/po-mode.el
index 6d4f2be18..b67bb0eed 100644
--- a/misc/po-mode.el
+++ b/misc/po-mode.el
@@ -964,8 +964,8 @@ Content-Type into a Mule coding system.")
 	"\
 Return a Mule (DECODING . ENCODING) pair, according to PO file charset.
 Called through file-coding-system-alist, before the file is visited for real."
-	(and (file-exists-p filename)
-	     (eq operation 'insert-file-contents)
+	(and (eq operation 'insert-file-contents)
+	     (file-exists-p filename)
 	     (po-with-temp-buffer
 	       (let ((coding-system-for-read 'no-conversion))
                  (let* ((charset (or (po-find-charset filename)