]> git.eshelyaron.com Git - emacs.git/commit
Merge from origin/emacs-26
authorGlenn Morris <rgm@gnu.org>
Sat, 2 Jun 2018 17:29:37 +0000 (10:29 -0700)
committerGlenn Morris <rgm@gnu.org>
Sat, 2 Jun 2018 17:29:37 +0000 (10:29 -0700)
commit02c7d45d490dd28a1c4effa928f9a8b9373149b0
tree670652f24cf21779b201e11a55ebce64158fb39c
parent0aaf14a441041fa8b5810ae0eec624011b53bb4c
parent90bea37d466f47a65f3790b4bc46b11af9a4a27a
Merge from origin/emacs-26

90bea37 ; * etc/PROBLEMS: Fix fvwm version number in last commit
af82d1f * etc/PROBLEMS: Document stickyness problem with FVWM (Bug#31...
4a3aed2 Update Emacs Lisp Intro to match current behavior
21f2247 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emac...
3257085 Fix previous commit
6d23525 Fix typos in several manuals (Bug#31610)
9188291 Add detailed documentation about lock files
e5471b2 Add commentary for subtle aspect of frame.el

Conflicts:
doc/lispintro/emacs-lisp-intro.texi
doc/emacs/files.texi
doc/lispintro/emacs-lisp-intro.texi
doc/lispref/files.texi
doc/misc/org.texi
etc/PROBLEMS
lisp/frame.el