diff options
| author | Fabián Ezequiel Gallina <fgallina@gnu.org> | 2014-12-27 13:31:20 -0300 |
|---|---|---|
| committer | Fabián Ezequiel Gallina <fgallina@gnu.org> | 2014-12-27 13:31:20 -0300 |
| commit | 35e1f9d9fcbaab51808e05f514e63927f959ae51 (patch) | |
| tree | e9d7d0ef8b1d61d728d4d076e46088a3b9b29d73 /doc/lispref/control.texi | |
| parent | f315b69922db769f3358e15616aa76c965be8a89 (diff) | |
| parent | a5f38fa1cc8eafe13f2073ebfaa8205b5e919d17 (diff) | |
| download | emacs-35e1f9d9fcbaab51808e05f514e63927f959ae51.tar.gz | |
Merge from origin/emacs-24
a5f38fa Fix ChangeLog typo
c6400e1 Fix composition of characters from Syriac and Arabis scripts.
7e9dfde python.el: Fix message when sending region.
800260c python.el: Cleanup temp files even with eval errors.
ed65b91 Fix for previous commit
2dd5163 python.el: Handle file encoding for shell.
7aa506e Spelling fixes
4cd6d77 * automated/tramp-tests.el (tramp-test17-insert-directory): Do not expect a given order of "." and "..".
a41d07b Fix rendering of composed caharacters on the mode line. (Bug#19435)
b70977c Small doc markup fixes
73c050c * doc/lispref/modes.texi (Defining Minor Modes, SMIE Lexer): Markup fixes.
1783e6c ChangeLog fix
c741b1b TUTORIAL.es: Improve style consistency
f89efea TUTORIAL.es: spelling fixes
0d48826 Avoid compiler warning.
Conflicts:
doc/lispref/ChangeLog
doc/lispref/control.texi
etc/ChangeLog
lisp/ChangeLog
src/ChangeLog
test/ChangeLog
Diffstat (limited to 'doc/lispref/control.texi')
| -rw-r--r-- | doc/lispref/control.texi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/lispref/control.texi b/doc/lispref/control.texi index fa760c45d6a..1e9f3461d0f 100644 --- a/doc/lispref/control.texi +++ b/doc/lispref/control.texi @@ -370,8 +370,8 @@ that location. More specifically, a Q-pattern can take the following forms: @table @code @item (@var{qpattern1} . @var{qpattern2}) -This pattern matches any cons cell whose @code{car} matches @var{QPATTERN1} and -whose @code{cdr} matches @var{PATTERN2}. +This pattern matches any cons cell whose @code{car} matches @var{qpattern1} and +whose @code{cdr} matches @var{pattern2}. @item [@var{qpattern1} @var{qpattern2} @dots{} @var{qpatternm}] This pattern matches a vector of length @var{M} whose 0..(@var{M}-1)th elements match @var{qpattern1}, @var{qpattern2} @dots{} @var{qpatternm}, |