mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Merge from origin/emacs-24

Browse source 
1a941d6 Fix incorrect usage of @key in the User Manual  (Bug#20135)
14c47d3 doc/misc/efaq-w32.texi: Spell-check.
ac85901 doc/misc/efaq-w32.texi: Remove outdated information and update.
c43762d Fix description of fullscreen mode on MS-Windows (Bug#20110).
ea8cab3 doc/lispref/minibuf.texi (Basic Completion): Fix a typo.  (Bug#20108)
2fdec80 Improve indexing in Emacs manual  (Bug#20105)
cc11321 Fix --no-bitmap-icon

Conflicts:
	doc/emacs/ChangeLog
	doc/lispref/ChangeLog
	doc/misc/ChangeLog
	src/ChangeLog
This commit is contained in:
Paul Eggert 2015-03-18 11:45:36 -07:00
commit 81deba3d7a
17 changed files with 292 additions and 255 deletions
Download patch file Download diff file Expand all files Collapse all files

4
doc/lispref/ChangeLog
View file

@ -1,3 +1,7 @@
2015-03-18 Eli Zaretskii <eliz@gnu.org>
* minibuf.texi (Basic Completion): Fix a typo. (Bug#20108)
2015-03-09 Nicolas Petton <nicolas@petton.fr>
* sequences.texi (seq-into): Add documentation for the new

2
doc/lispref/minibuf.texi
View file

@ -723,7 +723,7 @@ just one matching completion, and the match is exact, it returns
@code{t}. Otherwise, it returns the longest initial sequence common
to all possible matching completions.
If @var{collection} is an list, the permissible completions are
If @var{collection} is a list, the permissible completions are
specified by the elements of the list, each of which should be either
a string, or a cons cell whose @sc{car} is either a string or a symbol
(a symbol is converted to a string using @code{symbol-name}). If the