mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-02-08 20:58:58 +00:00
Code Issues Releases Activity

Merge from origin/emacs-25

Browse Source 
d1efbaf Fix documentation of completion functions
65c96cc Clarify documentation of 'font-lock-maximum-decoration'
2ad3d01 * doc/misc/cl.texi (Usage): Add some more details.
b49cb0a Fbackward_prefix_chars: stay within buffer bounds
This commit is contained in:
Paul Eggert 2016-06-19 00:54:28 +02:00
commit a985d2b09b
4 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/emacs/display.texi
View File

@ -853,9 +853,15 @@ to alter the amount of fontification applied by Font Lock mode, for
major modes that support this feature. The value should be a number
(with 1 representing a minimal amount of fontification; some modes
support levels as high as 3); or @code{t}, meaning ``as high as
possible'' (the default). You can also specify different numbers for
particular major modes; for example, to use level 1 for C/C++ modes,
and the default level otherwise, use the value
possible'' (the default). To be effective for a given file buffer,
the customization of @code{font-lock-maximum-decoration} should be
done @emph{before} the file is visited; if you already have the file
visited in a buffer when you customize this variable, kill the buffer
and visit the file again after the customization.
You can also specify different numbers for particular major modes; for
example, to use level 1 for C/C++ modes, and the default level
otherwise, use the value
@example
'((c-mode . 1) (c++-mode . 1)))

4
doc/lispref/minibuf.texi
View File

@ -750,8 +750,8 @@ list contains elements of any other type, those are ignored.
If @var{collection} is an obarray (@pxref{Creating Symbols}), the names
of all symbols in the obarray form the set of permissible completions.
If @var{collection} is a hash table, then the keys that are strings
are the possible completions. Other keys are ignored.
If @var{collection} is a hash table, then the keys that are strings or
symbols are the possible completions. Other keys are ignored.
You can also use a function as @var{collection}. Then the function is
solely responsible for performing completion; @code{try-completion}

5
doc/misc/cl.texi
View File

@ -148,6 +148,11 @@ the beginning:
You may wish to add such a statement to your init file, if you
make frequent use of features from this package.
Code that only uses macros from this package can enclose the above in
@code{eval-when-compile}. Internally, this library is divided into
several files, @pxref{Organization}. Your code should only ever load
the main @file{cl-lib} file, which will load the others as needed.
@node Organization
@section Organization

5
src/syntax.c
View File

@ -3128,8 +3128,9 @@ the prefix syntax flag (p). */)
opoint = pos;
opoint_byte = pos_byte;
if (pos + 1 > beg)
DEC_BOTH (pos, pos_byte);
if (pos <= beg)
break;
DEC_BOTH (pos, pos_byte);
}
SET_PT_BOTH (opoint, opoint_byte);