Merge from origin/emacs-25
commit80fcf41d31ae2a4815a1cb63bf08a88a3c7910b5
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 5 Aug 2016 21:06:59 +0000 (5 14:06 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 5 Aug 2016 21:06:59 +0000 (5 14:06 -0700)
tree6fd85620c6a3ae3667720695cfc42c659b665f64
parent8d9ad899f11ec2a6763617ba069fdaf3889ac4e1
parent850ba444a7be542c8dc92efbeb4031868f3f779d
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
doc/lispref/variables.texi
lisp/net/tramp-sh.el
lisp/progmodes/elisp-mode.el
src/dispextern.h
src/w32.c