From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 5 Aug 2016 21:06:59 +0000 (-0700)
Subject: Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~1798
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=80fcf41d31ae2a4815a1cb63bf08a88a3c7910b5;p=emacs.git

Merge from origin/emacs-25

850ba44 Clarify lexical binding with symbol args behavior
f981b31 * lisp/net/tramp-sh.el (tramp-remote-path): Doc fix.
68fc964 * lisp/net/tramp-sh.el (tramp-remote-path): Doc fix.  (Bug#23...
21110af Avoid assertion violations when rendering some fonts
6192b6c Document more details of package activation
272ddc6 Fixup warning message regarding HOME a bit more
43206d6 * lisp/leim/quail/indian.el ("bengali-probhat"): Change indic...
d41f7ff Fix input method "probhat" for Bengali
c150a64 ; Fix typo in commit before last
ebf0472 Add to elisp-completion-at-point's docstring
fd9fad0 Give more helpful warning about setting HOME
ea6b01d ; * lisp/term.el (term-mode): FIXME comment about bidi reorde...

# Conflicts:
#	lisp/term.el
---

80fcf41d31ae2a4815a1cb63bf08a88a3c7910b5