summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2010-10-26 20:03:34 +0200
committerEli Zaretskii <eliz@gnu.org>2010-10-26 20:03:34 +0200
commit2e35f1a27ee68db4e29b30fc365d1531aece808f (patch)
tree30dd35fa7f99f0560e9e531c9150867bd6cd9ffb
parentb94a5a43d1c117473b57db9bd9f6a07162a0351a (diff)
downloademacs-2e35f1a27ee68db4e29b30fc365d1531aece808f.tar.gz
emacs-2e35f1a27ee68db4e29b30fc365d1531aece808f.tar.bz2
emacs-2e35f1a27ee68db4e29b30fc365d1531aece808f.zip
Fix bug #7281.
cmds.c (internal_self_insert): Don't insert if argument N is zero.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/cmds.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 11cfd232e45..abd336cfbd5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-26 Eli Zaretskii <eliz@gnu.org>
+
+ * cmds.c (internal_self_insert): Don't insert if argument N is
+ zero. (Bug#7281)
+
2010-10-26 Jan Djärv <jan.h.d@swipnet.se>
* gtkutil.c (qttip_cb): Set title to empty for ATK (Bug#7278).
diff --git a/src/cmds.c b/src/cmds.c
index 19eca771941..2682e54132a 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -453,7 +453,7 @@ internal_self_insert (int c, EMACS_INT n)
&& SINGLE_BYTE_CHAR_P (c))
? UNIBYTE_TO_CHAR (c) : c);
Lisp_Object string = Fmake_string (make_number (n), make_number (mc));
-
+
if (spaces_to_insert)
{
tem = Fmake_string (make_number (spaces_to_insert),
@@ -474,7 +474,7 @@ internal_self_insert (int c, EMACS_INT n)
insert_and_inherit (strn, p - strn);
SAFE_FREE ();
}
- else
+ else if (n)
insert_and_inherit (str, len);
if ((CHAR_TABLE_P (Vauto_fill_chars)