upstream

5 files changed, 32 insertions, 7 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 71dc8a8ff89..09958f6b7e0 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,23 @@
+2011-09-19  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * errors.texi (Standard Errors): Remove apparent placeholder text
+        (bug#9491).
+
+2011-09-18  Chong Yidong  <cyd@stupidchicken.com>
+
+        * frames.texi (Management Parameters): Fix description of
+        icon-type parameter.
+
+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
+        most-positive-fixnum and most-negative-fixnum.  (Bug#9525)
+
 2011-09-14  Dani Moncayo  <dmoncayo@gmail.com>  (tiny change)
 
         * lists.texi (Sets And Lists): Fix typo.  (Bug#9393)
diff --git a/doc/lispref/errors.texi b/doc/lispref/errors.texi
index 2c7549d0443..98967b708b3 100644
--- a/doc/lispref/errors.texi
+++ b/doc/lispref/errors.texi
@@ -28,9 +28,6 @@ condition @code{error}, because quitting is not considered an error.
 handled.
 
 @table @code
-@item @var{symbol}
-@var{string}; @var{reference}.
-
 @item error
 @code{"error"}@*
 @xref{Errors}.
diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index e799cfa6b7f..d619b92e4d3 100644
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -779,10 +779,10 @@ Whether deselecting the frame lowers it (non-@code{nil} means yes).
 
 @vindex icon-type, a frame parameter
 @item icon-type
-The type of icon to use for this frame when it is iconified.  If the
-value is a string, that specifies a file containing a bitmap to use.
-Any other non-@code{nil} value specifies the default bitmap icon (a
-picture of a gnu); @code{nil} specifies a text icon.
+The type of icon to use for this frame.  If the value is a string,
+that specifies a file containing a bitmap to use; @code{nil} specifies
+no icon (in which case the window manager decides what to show); any
+other non-@code{nil} value specifies the default Emacs icon.
 
 @vindex icon-name, a frame parameter
 @item icon-name
diff --git a/doc/lispref/numbers.texi b/doc/lispref/numbers.texi
index 65921f444e0..3efddebffb4 100644
--- a/doc/lispref/numbers.texi
+++ b/doc/lispref/numbers.texi
@@ -148,11 +148,15 @@ arguments to such functions may be either numbers or markers, we often
 give these arguments the name @var{number-or-marker}.  When the argument
 value is a marker, its position value is used and its buffer is ignored.
 
+@cindex largest Lisp integer number
+@cindex maximum Lisp integer number
 @defvar most-positive-fixnum
 The value of this variable is the largest integer that Emacs Lisp
 can handle.
 @end defvar
 
+@cindex smallest Lisp integer number
+@cindex minimum Lisp integer number
 @defvar most-negative-fixnum
 The value of this variable is the smallest integer that Emacs Lisp can
 handle.  It is negative.
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
@@ -320,6 +320,10 @@ 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
 @kbd{@key{ESC} @key{ESC} @key{ESC}} as a way to escape.