diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index a5db84e8777..24108cc6a46 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-17  Chong Yidong  <cyd@stupidchicken.com>
+
+	* tips.texi (Key Binding Conventions): Don't bind a key sequence
+	ending in C-g.  Suggested by Edward O'Connor.
+
 2011-09-17  Eli Zaretskii  <eliz@gnu.org>
 
 	* numbers.texi (Integer Basics): Add indexing for
diff --git a/doc/lispref/tips.texi b/doc/lispref/tips.texi
index be37eb2034b..fd875b45be9 100644
--- a/doc/lispref/tips.texi
+++ b/doc/lispref/tips.texi
@@ -319,6 +319,10 @@ The reason for this rule is that a non-prefix binding for @key{ESC} in
 any context prevents recognition of escape sequences as function keys in
 that context.
 
+@item
+Similarly, don't bind a key sequence ending in @key{C-g}, since that
+is commonly used to cancel a key sequence.
+
 @item
 Anything which acts like a temporary mode or state which the user can
 enter and leave should define @kbd{@key{ESC} @key{ESC}} or