[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r107394: Checked mini.texi
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r107394: Checked mini.texi |
Date: |
Thu, 23 Feb 2012 00:32:18 -0800 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 107394
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2012-02-23 00:32:18 -0800
message:
Checked mini.texi
* doc/emacs/mini.texi (Minibuffer File, Completion Options, Repetition):
Copyedits.
(Completion Example): Other M-x au* commands may be defined.
(Completion Styles): Mention emacs21 and completion-category-overrides.
* lisp/minibuffer.el (completion-category-overrides): Doc fix.
* admin/FOR-RELEASE: Related markup.
modified:
admin/FOR-RELEASE
doc/emacs/ChangeLog
doc/emacs/mini.texi
lisp/ChangeLog
lisp/minibuffer.el
=== modified file 'admin/FOR-RELEASE'
--- a/admin/FOR-RELEASE 2012-02-23 05:36:08 +0000
+++ b/admin/FOR-RELEASE 2012-02-23 08:32:18 +0000
@@ -151,7 +151,7 @@
macos.texi rgm (can't actually test any of it though)
maintaining.texi cyd
mark.texi cyd
-mini.texi
+mini.texi rgm
misc.texi cyd
modes.texi cyd
msdog.texi rgm (can't actually test any of it though)
=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog 2012-02-23 05:36:08 +0000
+++ b/doc/emacs/ChangeLog 2012-02-23 08:32:18 +0000
@@ -1,5 +1,10 @@
2012-02-23 Glenn Morris <address@hidden>
+ * mini.texi (Minibuffer File, Completion Options, Repetition):
+ Copyedits.
+ (Completion Example): Other M-x au* commands may be defined.
+ (Completion Styles): Mention emacs21 and completion-category-overrides.
+
* msdog.texi (Text and Binary, ls in Lisp, Windows HOME)
(Windows Keyboard, Windows Mouse, Windows Processes)
(Windows Printing, Windows Misc): Copyedits.
=== modified file 'doc/emacs/mini.texi'
--- a/doc/emacs/mini.texi 2012-02-10 07:44:39 +0000
+++ b/doc/emacs/mini.texi 2012-02-23 08:32:18 +0000
@@ -58,11 +58,11 @@
directory}. For example, it may start out like this:
@example
-Find File: /u2/emacs/src/
+Find file: /u2/emacs/src/
@end example
@noindent
-Here, @samp{Find File:@: } is the prompt and @samp{/u2/emacs/src/} is
+Here, @samp{Find file:@: } is the prompt and @samp{/u2/emacs/src/} is
the default directory. If you now type @kbd{buffer.c} as input, that
specifies the file @file{/u2/emacs/src/buffer.c}. @xref{File Names},
for information about the default directory.
@@ -79,7 +79,7 @@
For example, you can specify @file{/etc/termcap} as follows:
@example
-Find File: /u2/emacs/src//etc/termcap
+Find file: /u2/emacs/src//etc/termcap
@end example
@noindent
@@ -247,7 +247,10 @@
completion alternatives (in this case, command names) that start with
@samp{au}. There are several, including @code{auto-fill-mode} and
@code{autoconf-mode}, but they all begin with @code{auto}, so the
address@hidden in the minibuffer completes to @samp{auto}.
address@hidden in the minibuffer completes to @samp{auto}. (More commands
+may be defined in your Emacs session. For example, if a command
+called @code{authorize-me} was defined, Emacs could only complete
+as far as @samp{aut}.)
If you type @key{TAB} again immediately, it cannot determine the
next character; it could be @samp{-}, @samp{a}, or @samp{c}. So it
@@ -385,7 +388,7 @@
@item
@dfn{Permissive completion with confirmation} is like permissive
completion, with an exception: if you typed @key{TAB} and this
-completed the text up to some intermediate state (i.e. one that is not
+completed the text up to some intermediate state (i.e., one that is not
yet an exact completion match), typing @key{RET} right afterward does
not submit the argument. Instead, Emacs asks for confirmation by
momentarily displaying @samp{[Confirm]} after the text; type @key{RET}
@@ -450,8 +453,7 @@
@item emacs22
This completion style is similar to @code{basic}, except that it
ignores the text in the minibuffer after point. It is so-named
-because it corresponds to the completion behavior in Emacs 22 and
-earlier.
+because it corresponds to the completion behavior in Emacs 22.
@end table
@noindent
@@ -476,6 +478,18 @@
matches @samp{lch} to @samp{list-command-history}.
@end table
address@hidden
+There is also a very simple completion style called @code{emacs21}.
+In this style, if the text in the minibuffer is @samp{foobar},
+only matches starting with @samp{foobar} are considered.
+
address@hidden completion-category-overrides
+You can use different completion styles in different situations,
+by setting the variable @code{completion-category-overrides}.
+For example, the default setting says to use only @code{basic}
+and @code{substring} completion for buffer names.
+
+
@node Completion Options
@subsection Completion Options
@@ -521,7 +535,7 @@
@kbd{?} to display the list. If the value is @code{lazy}, Emacs only
shows the completion list buffer on the second attempt to complete.
In other words, if there is nothing to complete, the first @key{TAB}
-echoes @samp{Next char not unique}; the second @key{TAB} does the
+echoes @samp{Next char not unique}; the second @key{TAB} shows the
completion list buffer.
@vindex completion-cycle-threshold
@@ -688,7 +702,7 @@
@vindex command-history
The list of previous minibuffer-using commands is stored as a Lisp
list in the variable @code{command-history}. Each element is a Lisp
-expression which describes one command and its arguments. Lisp programs
+expression that describes one command and its arguments. Lisp programs
can re-execute a command by calling @code{eval} with the
@code{command-history} element.
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2012-02-23 08:13:48 +0000
+++ b/lisp/ChangeLog 2012-02-23 08:32:18 +0000
@@ -3,6 +3,10 @@
* emacs-lisp/lisp.el (beginning-of-defun-raw): Don't call end-of-defun
when it might call us back infinitely (bug#10797).
+2012-02-23 Glenn Morris <address@hidden>
+
+ * minibuffer.el (completion-category-overrides): Doc fix.
+
2012-02-23 Stefan Monnier <address@hidden>
* minibuffer.el (completion-table-with-context): Fix inf-loop.
=== modified file 'lisp/minibuffer.el'
--- a/lisp/minibuffer.el 2012-02-23 04:38:29 +0000
+++ b/lisp/minibuffer.el 2012-02-23 08:32:18 +0000
@@ -510,7 +510,9 @@
Each override has the shape (CATEGORY . ALIST) where ALIST is
an association list that can specify properties such as:
- `styles': the list of `completion-styles' to use for that category.
-- `cycle': the `completion-cycle-threshold' to use for that category."
+- `cycle': the `completion-cycle-threshold' to use for that category.
+Categories are symbols such as `buffer' and `file', used when
+completing buffer and file names, respectively."
:version "24.1"
:type `(alist :key-type (choice :tag "Category"
(const buffer)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r107394: Checked mini.texi,
Glenn Morris <=