From: Glenn Morris <rgm@gnu.org>
Date: Sat, 2 Jun 2018 17:29:37 +0000 (-0700)
Subject: Merge from origin/emacs-26
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~19^2~5348
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=02c7d45d490dd28a1c4effa928f9a8b9373149b0;p=emacs.git

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
---

02c7d45d490dd28a1c4effa928f9a8b9373149b0