aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndreas Schwab2011-04-14 09:56:52 +0200
committerAndreas Schwab2011-04-14 09:56:52 +0200
commit8b913b570b95f17c9380a9b1f3a487e7c098ecaa (patch)
treeacf003aa8b8662476d394ea5f06800a4721be25d /src
parente240cc21882f0af6826018218f5b451d7d03313d (diff)
downloademacs-8b913b570b95f17c9380a9b1f3a487e7c098ecaa.tar.gz
emacs-8b913b570b95f17c9380a9b1f3a487e7c098ecaa.zip
* fileio.c (Finsert_file_contents): Fix typo in 2005-05-13 change. (Bug#8496)
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/fileio.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index d2c95aee4c4..11ae63fe4d7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12011-04-14 Andreas Schwab <schwab@linux-m68k.org>
2
3 * fileio.c (Finsert_file_contents): Fix typo in 2005-05-13
4 change. (Bug#8496)
5
12011-04-13 Eli Zaretskii <eliz@gnu.org> 62011-04-13 Eli Zaretskii <eliz@gnu.org>
2 7
3 * xdisp.c (handle_invisible_prop): Don't call bidi_paragraph_init 8 * xdisp.c (handle_invisible_prop): Don't call bidi_paragraph_init
diff --git a/src/fileio.c b/src/fileio.c
index 7e2d888b227..8fd89957adb 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -3800,7 +3800,7 @@ variable `last-coding-system-used' to the coding system actually used. */)
3800 /* For a special file, all we can do is guess. */ 3800 /* For a special file, all we can do is guess. */
3801 total = READ_BUF_SIZE; 3801 total = READ_BUF_SIZE;
3802 3802
3803 if (NILP (visit) && inserted > 0) 3803 if (NILP (visit) && total > 0)
3804 { 3804 {
3805#ifdef CLASH_DETECTION 3805#ifdef CLASH_DETECTION
3806 if (!NILP (BVAR (current_buffer, file_truename)) 3806 if (!NILP (BVAR (current_buffer, file_truename))