[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master a985d2b 5/6: Merge from origin/emacs-25

From: Paul Eggert
Subject: [Emacs-diffs] master a985d2b 5/6: Merge from origin/emacs-25
Date: Sun, 19 Jun 2016 02:33:05 +0000 (UTC)

branch: master
commit a985d2b09bb88f31b27b02c3131cb34c5879d767
Merge: f016843 d1efbaf
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Merge from origin/emacs-25
    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
 doc/emacs/display.texi   |   12 +++++++++---
 doc/lispref/minibuf.texi |    4 ++--
 doc/misc/cl.texi         |    5 +++++
 src/syntax.c             |    5 +++--
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index 3f5aac1..738d72d 100644
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -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
 '((c-mode . 1) (c++-mode . 1)))
diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi
index e6d8f8a..8d53475 100644
--- a/doc/lispref/minibuf.texi
+++ b/doc/lispref/minibuf.texi
@@ -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}
diff --git a/doc/misc/cl.texi b/doc/misc/cl.texi
index a98d0ac..c62fa72 100644
--- a/doc/misc/cl.texi
+++ b/doc/misc/cl.texi
@@ -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
address@hidden  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
diff --git a/src/syntax.c b/src/syntax.c
index 587335a..f8d987b 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -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);

reply via email to

[Prev in Thread] Current Thread [Next in Thread]