[Emacs-diffs] feature/tramp-thread-safe 853ade4 1/2: Merge remote-tracking branch 'origin/master' into feature/tramp-thread-safe

[Michael Albinus]

branch: feature/tramp-thread-safe
commit 853ade4a65496205b6d58b1adc5577805c308ccf
Merge: 89b80ad a65fe6f
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>

    Merge remote-tracking branch 'origin/master' into feature/tramp-thread-safe
---
 src/charset.c | 7 +++++++
 src/window.c  | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/charset.c b/src/charset.c
index e11a836..6e2bf17 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -1886,6 +1886,13 @@ Return nil if CHARSET doesn't support CH.  */)
   code = ENCODE_CHAR (charsetp, c);
   if (code == CHARSET_INVALID_CODE (charsetp))
     return Qnil;
+  /* There are much fewer codepoints in the world than we have positive
+     fixnums, so it could be argued that we never really need a bignum,
+     e.g. Unicode codepoints only need 21bit, and China's GB-10830
+     can fit in 22bit.  Yet we encode GB-10830's chars in a sparse way
+     (we just take the 4byte sequences as a 32bit int), so some
+     GB-10830 chars (such as 0x81308130 in etc/charsets/gb108304.map) end
+     up represented as bignums here.  */
   return INT_TO_INTEGER (code);
 }
 
diff --git a/src/window.c b/src/window.c
index c0974d4..6cdc52f 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3470,8 +3470,8 @@ run_window_size_change_functions (Lisp_Object frame)
             with FRAME as its argument and as such oblivious to the
             window checked below.  */
          if (window_size_changed (XWINDOW (window))
-             && NILP (Fmemq (buffer, buffers))
-             && !NILP (Flocal_variable_p (Qwindow_size_change_functions, 
buffer)))
+             && !NILP (Flocal_variable_p (Qwindow_size_change_functions, 
buffer))
+             && NILP (Fmemq (buffer, buffers)))
            {
              Lisp_Object locals
                = Fbuffer_local_value (Qwindow_size_change_functions, buffer);