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

1 files changed, 2 insertions, 2 deletions

diff --git a/lisp/leim/quail/indian.el b/lisp/leim/quail/indian.el
index d9438a20434..728e3529218 100644
--- a/lisp/leim/quail/indian.el
+++ b/lisp/leim/quail/indian.el
@@ -472,8 +472,8 @@ Full key sequences are listed below:")
 
 ;; Probhat Input Method
 (quail-define-package
- "probhat" "Bengali-probhat" "probhat" t
- "Porbhat for Bangla" nil t nil nil nil nil nil nil nil nil t)
+ "bengali-probhat" "Bengali" "BngPB" t
+ "Probhat keyboard for Bengali/Bangla" nil t nil nil nil nil nil nil nil nil t)
 
 (quail-define-rules
   ("!" ?!)