diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-08-05 14:06:59 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-08-05 14:06:59 -0700 |
| commit | 80fcf41d31ae2a4815a1cb63bf08a88a3c7910b5 (patch) | |
| tree | 6fd85620c6a3ae3667720695cfc42c659b665f64 /lisp | |
| parent | 8d9ad899f11ec2a6763617ba069fdaf3889ac4e1 (diff) | |
| parent | 850ba444a7be542c8dc92efbeb4031868f3f779d (diff) | |
| download | emacs-80fcf41d31ae2a4815a1cb63bf08a88a3c7910b5.tar.gz | |
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
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/leim/quail/indian.el | 4 | ||||
| -rw-r--r-- | lisp/net/tramp-sh.el | 8 | ||||
| -rw-r--r-- | lisp/progmodes/elisp-mode.el | 8 |
3 files changed, 14 insertions, 6 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 ("!" ?!) diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 62bf1a6c081..f79394ac9b7 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -529,13 +529,15 @@ tilde expansion, all directory names starting with `~' will be ignored. `Default Directories' represent the list of directories given by the command \"getconf PATH\". It is recommended to use this -entry on top of this list, because these are the default +entry on head of this list, because these are the default directories for POSIX compatible commands. On remote hosts which do not offer the getconf command (like cygwin), the value -\"/bin:/usr/bin\" is used instead of. +\"/bin:/usr/bin\" is used instead. This entry is represented in +the list by the special value `tramp-default-remote-path'. `Private Directories' are the settings of the $PATH environment, -as given in your `~/.profile'." +as given in your `~/.profile'. This entry is represented in +the list by the special value `tramp-own-remote-path'." :group 'tramp :type '(repeat (choice (const :tag "Default Directories" tramp-default-remote-path) diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el index 2fbd60db0dd..49d39126c05 100644 --- a/lisp/progmodes/elisp-mode.el +++ b/lisp/progmodes/elisp-mode.el @@ -452,7 +452,13 @@ It can be quoted, or be inside a quoted form." ((facep sym) (find-definition-noselect sym 'defface))))) (defun elisp-completion-at-point () - "Function used for `completion-at-point-functions' in `emacs-lisp-mode'." + "Function used for `completion-at-point-functions' in `emacs-lisp-mode'. +If the context at point allows only a certain category of +symbols (e.g. functions, or variables) then the returned +completions are restricted to that category. In contexts where +any symbol is possible (following a quote, for example), +functions are annotated with \"<f>\" via the +`:annotation-function' property." (with-syntax-table emacs-lisp-mode-syntax-table (let* ((pos (point)) (beg (condition-case nil |