From b8a47412d30e73a12c1919d0109f9272096e9ce6 Mon Sep 17 00:00:00 2001
From: Chong Yidong
Date: Tue, 19 Oct 2010 11:43:27 -0400
Subject: Decouple C-d and delete, so that the former does not delete the
 region.

* lisp/bindings.el (global-map): Bind C-d to delete-char and deletechar
to delete-forward-char.

* lisp/simple.el (normal-erase-is-backspace-mode): Remap delete to
deletechar, and hence delete-forward-char.

* src/cmds.c (Fdelete_char): Doc fix.
---
 src/cmds.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/cmds.c')

diff --git a/src/cmds.c b/src/cmds.c
index e12d7c370d9..19eca771941 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -230,7 +230,7 @@ Optional second arg KILLFLAG non-nil means kill instead (save in kill ring).
 Interactively, N is the prefix arg, and KILLFLAG is set if
 N was explicitly specified.
 
-The command `delete-forward' is preferable for interactive use.  */)
+The command `delete-forward-char' is preferable for interactive use.  */)
   (Lisp_Object n, Lisp_Object killflag)
 {
   EMACS_INT pos;
-- 
cgit v1.2.1


From 2e35f1a27ee68db4e29b30fc365d1531aece808f Mon Sep 17 00:00:00 2001
From: Eli Zaretskii
Date: Tue, 26 Oct 2010 20:03:34 +0200
Subject: Fix bug #7281.

 cmds.c (internal_self_insert): Don't insert if argument N is zero.
---
 src/cmds.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/cmds.c')

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)
-- 
cgit v1.2.1


From 84b288883d97278b28b82cebade5dd1a0f7d92a3 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii
Date: Tue, 26 Oct 2010 20:47:19 +0200
Subject: cmds.c: (internal_self_insert): Don't insert for negative arguments.

---
 src/cmds.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/cmds.c')

diff --git a/src/cmds.c b/src/cmds.c
index 2682e54132a..2d0814abd98 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -474,7 +474,7 @@ internal_self_insert (int c, EMACS_INT n)
       insert_and_inherit (strn, p - strn);
       SAFE_FREE ();
     }
-  else if (n)
+  else if (n > 0)
     insert_and_inherit (str, len);
 
   if ((CHAR_TABLE_P (Vauto_fill_chars)
-- 
cgit v1.2.1


From 1a4236eaba106cda719f9de42cb7f72ad20f5d45 Mon Sep 17 00:00:00 2001
From: Stefan Monnier
Date: Thu, 11 Nov 2010 16:11:17 -0500
Subject: * src/cmds.c (Fself_insert_command): Don't call XFASTINT without
 checking it's not negative.

---
 src/cmds.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/cmds.c')

diff --git a/src/cmds.c b/src/cmds.c
index 2d0814abd98..b2f454199f5 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -276,7 +276,7 @@ After insertion, the value of `auto-fill-function' is called if the
   (Lisp_Object n)
 {
   int remove_boundary = 1;
-  CHECK_NUMBER (n);
+  CHECK_NATNUM (n);
 
   if (!EQ (Vthis_command, current_kboard->Vlast_command))
     nonundocount = 0;
-- 
cgit v1.2.1