• Glenn Morris's avatar
    Merge from origin/emacs-27 · 16b7f413
    Glenn Morris authored
    8576297b (origin/emacs-27) ; lisp/so-long.el: Prevent potential err...
    986c12b2 ; * lisp/so-long.el: Byte-compilation bug fix
    19f8f36f ; * lisp/so-long.el (so-long-variable-overrides): Improve doc
    83bc4ad3 ; * so-long.el: Documentation and spelling
    72c5f71c Avoid segfaults if XIM is set but not xim_styles
    f54ddb01 (emacs-27) ; * test/lisp/emacs-lisp/generator-tests.el: St...
    
    # Conflicts:
    #	test/lisp/emacs-lisp/generator-tests.el
    16b7f413