]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 078d75f 8576297)
Merge from origin/emacs-27
authorGlenn Morris <rgm@gnu.org>
Mon, 3 Aug 2020 15:32:39 +0000 (08:32 -0700)
committerGlenn Morris <rgm@gnu.org>
Mon, 3 Aug 2020 15:32:39 +0000 (08:32 -0700)
commit16b7f413a9ff819c374e07ee927c1fd2b4138109
tree9016754a5e2c0f1fda01b3b8acf0e92175e0d024tree | snapshot
parent078d75fb475c1c81853de93df5a4090777a8b2ffcommit | diff
parent8576297b2a657d1944b7d824b30a1cb6459685c6commit | diff
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
lisp/so-long.el diff1 | diff2 | blob | history
src/xfns.c diff1 | diff2 | blob | history
test/lisp/emacs-lisp/generator-tests.el diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.