In adjust_frame_size don't count minibuffer height twice (Bug#21643)

[gnu-emacs] / src / category.c

diff --git a/src/category.c b/src/category.c
index b20493e5949ff3e5dd21bac10f2848146bd78fcd..400116f6e0370b98aa1e33dcc7add2fa8124e6f7 100644 (file)
--- a/src/category.c
+++ b/src/category.c
@@ -41,7 +41,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 static void
 bset_category_table (struct buffer *b, Lisp_Object val)
 {
 static void
 bset_category_table (struct buffer *b, Lisp_Object val)
 {

-  b->INTERNAL_FIELD (category_table) = val;
+  b->category_table_ = val;

 }
 
 /* The version number of the latest category table.  Each category
 }
 
 /* The version number of the latest category table.  Each category


@@ -464,7 +464,7 @@ Emacs treats a sequence of word constituent characters as a single
 word (i.e. finds no word boundary between them) only if they belong to
 the same script.  But, exceptions are allowed in the following cases.
 
 word (i.e. finds no word boundary between them) only if they belong to
 the same script.  But, exceptions are allowed in the following cases.
 

-\(1) The case that characters are in different scripts is controlled
+(1) The case that characters are in different scripts is controlled

 by the variable `word-combining-categories'.
 
 Emacs finds no word boundary between characters of different scripts
 by the variable `word-combining-categories'.
 
 Emacs finds no word boundary between characters of different scripts


@@ -478,7 +478,7 @@ For instance, to tell that Han characters followed by Hiragana
 characters can form a single word, the element `(?C . ?H)' should be
 in this list.
 
 characters can form a single word, the element `(?C . ?H)' should be
 in this list.
 

-\(2) The case that character are in the same script is controlled by
+(2) The case that character are in the same script is controlled by

 the variable `word-separating-categories'.
 
 Emacs finds a word boundary between characters of the same script
 the variable `word-separating-categories'.
 
 Emacs finds a word boundary between characters of the same script


@@ -491,7 +491,7 @@ between C1 and C2.
 
 For instance, to tell that there's a word boundary between Hiragana
 and Katakana (both are in the same script `kana'),
 
 For instance, to tell that there's a word boundary between Hiragana
 and Katakana (both are in the same script `kana'),

-the element `(?H . ?K) should be in this list.  */);
+the element `(?H . ?K)' should be in this list.  */);

 
   Vword_combining_categories = Qnil;
 
 
   Vword_combining_categories = Qnil;