From: Paul Eggert <eggert@Penguin.CS.UCLA.EDU>
Date: Mon, 17 Apr 2017 14:56:08 +0000 (-0700)
Subject: * src/lisp.h (STRING_SET_CHARS): Simplify assertion.
X-Git-Tag: emacs-26.0.90~521^2~612
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=630df0587e1069b2cd2f2536d5fb61175adac3a2;p=emacs.git

* src/lisp.h (STRING_SET_CHARS): Simplify assertion.
---

diff --git a/src/lisp.h b/src/lisp.h
index e0bad58f758..daf57ed906f 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -1371,8 +1371,9 @@ STRING_SET_CHARS (Lisp_Object string, ptrdiff_t newsize)
 {
   /* This function cannot change the size of data allocated for the
      string when it was created.  */
-  eassert ((STRING_MULTIBYTE (string) && newsize <= SBYTES (string))
-	   || (!STRING_MULTIBYTE (string) && newsize == SCHARS (string)));
+  eassert (STRING_MULTIBYTE (string)
+	   ? newsize <= SBYTES (string)
+	   : newsize == SCHARS (string));
   XSTRING (string)->size = newsize;
 }