diff options
| author | Stefan Monnier | 2014-02-17 13:04:17 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2014-02-17 13:04:17 -0500 |
| commit | 6faf982a0e21895e1a3aa682a5cecd74b609a30d (patch) | |
| tree | c8032c1193080cbb84a55045bb2004c1098242d2 /doc/lispref | |
| parent | 2a77e3e22282c105f53a17dcd73771bbe222a822 (diff) | |
| download | emacs-6faf982a0e21895e1a3aa682a5cecd74b609a30d.tar.gz emacs-6faf982a0e21895e1a3aa682a5cecd74b609a30d.zip | |
* doc/emacs/killing.texi (CUA Bindings): Document the new relationship between
cua-mode and delete-selection mode.
(CUA Bindings): Mention that rectangle mode can be used on its own.
* doc/emacs/programs.texi (Matching): Fix typo.
* doc/lispref/minibuf.texi (Completion Commands): Don't document obsolete
`common-substring' arg of display-completion-list.
Diffstat (limited to 'doc/lispref')
| -rw-r--r-- | doc/lispref/minibuf.texi | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi index 63e9e2bbc23..d618912de8a 100644 --- a/doc/lispref/minibuf.texi +++ b/doc/lispref/minibuf.texi | |||
| @@ -1142,7 +1142,7 @@ The list of completions is displayed as text in a buffer named | |||
| 1142 | @file{*Completions*}. | 1142 | @file{*Completions*}. |
| 1143 | @end deffn | 1143 | @end deffn |
| 1144 | 1144 | ||
| 1145 | @defun display-completion-list completions &optional common-substring | 1145 | @defun display-completion-list completions |
| 1146 | This function displays @var{completions} to the stream in | 1146 | This function displays @var{completions} to the stream in |
| 1147 | @code{standard-output}, usually a buffer. (@xref{Read and Print}, for more | 1147 | @code{standard-output}, usually a buffer. (@xref{Read and Print}, for more |
| 1148 | information about streams.) The argument @var{completions} is normally | 1148 | information about streams.) The argument @var{completions} is normally |
| @@ -1153,13 +1153,6 @@ which is printed as if the strings were concatenated. The first of | |||
| 1153 | the two strings is the actual completion, the second string serves as | 1153 | the two strings is the actual completion, the second string serves as |
| 1154 | annotation. | 1154 | annotation. |
| 1155 | 1155 | ||
| 1156 | The argument @var{common-substring} is the prefix that is common to | ||
| 1157 | all the completions. With normal Emacs completion, it is usually the | ||
| 1158 | same as the string that was completed. @code{display-completion-list} | ||
| 1159 | uses this to highlight text in the completion list for better visual | ||
| 1160 | feedback. This is not needed in the minibuffer; for minibuffer | ||
| 1161 | completion, you can pass @code{nil}. | ||
| 1162 | |||
| 1163 | This function is called by @code{minibuffer-completion-help}. A | 1156 | This function is called by @code{minibuffer-completion-help}. A |
| 1164 | common way to use it is together with | 1157 | common way to use it is together with |
| 1165 | @code{with-output-to-temp-buffer}, like this: | 1158 | @code{with-output-to-temp-buffer}, like this: |
| @@ -1167,8 +1160,7 @@ common way to use it is together with | |||
| 1167 | @example | 1160 | @example |
| 1168 | (with-output-to-temp-buffer "*Completions*" | 1161 | (with-output-to-temp-buffer "*Completions*" |
| 1169 | (display-completion-list | 1162 | (display-completion-list |
| 1170 | (all-completions (buffer-string) my-alist) | 1163 | (all-completions (buffer-string) my-alist))) |
| 1171 | (buffer-string))) | ||
| 1172 | @end example | 1164 | @end example |
| 1173 | @end defun | 1165 | @end defun |
| 1174 | 1166 | ||