From: Glenn Morris Date: Mon, 3 Aug 2020 15:32:39 +0000 (-0700) Subject: Merge from origin/emacs-27 X-Git-Tag: emacs-28.0.90~6846 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=16b7f413a9ff819c374e07ee927c1fd2b4138109;p=emacs.git Merge from origin/emacs-27 8576297b2a (origin/emacs-27) ; lisp/so-long.el: Prevent potential err... 986c12b20f ; * lisp/so-long.el: Byte-compilation bug fix 19f8f36f11 ; * lisp/so-long.el (so-long-variable-overrides): Improve doc 83bc4ad369 ; * so-long.el: Documentation and spelling 72c5f71cd4 Avoid segfaults if XIM is set but not xim_styles f54ddb0198 (emacs-27) ; * test/lisp/emacs-lisp/generator-tests.el: St... # Conflicts: # test/lisp/emacs-lisp/generator-tests.el --- 16b7f413a9ff819c374e07ee927c1fd2b4138109