Merge from origin/emacs-25

[gnu-emacs] / src / buffer.c

diff --git a/src/buffer.c b/src/buffer.c
index 0e5e64f58a1e14321c38120c830765aca1e04e97..55a16b237e5355851bb3c3371b82872c56ca30f3 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1073,7 +1073,7 @@ is first appended to NAME, to speed up finding a non-existent buffer.  */)
        return genbase;
     }
 
-  for (ptrdiff_t count = 1; ; count++)
+  for (ptrdiff_t count = 2; ; count++)
     {
       char number[INT_BUFSIZE_BOUND (ptrdiff_t) + sizeof "<>"];
       AUTO_STRING_WITH_LEN (lnumber, number,
@@ -6225,6 +6225,8 @@ Values are interpreted as follows:
   (hbar . HEIGHT) display a horizontal bar cursor with height HEIGHT
   ANYTHING ELSE   display a hollow box cursor
 
+WIDTH and HEIGHT can't exceed the frame's canonical character size.
+
 When the buffer is displayed in a non-selected window, the
 cursor's appearance is instead controlled by the variable
 `cursor-in-non-selected-windows'.  */);