diff options
| author | Paul Eggert | 2016-06-19 00:54:28 +0200 |
|---|---|---|
| committer | Paul Eggert | 2016-06-19 00:54:28 +0200 |
| commit | a985d2b09bb88f31b27b02c3131cb34c5879d767 (patch) | |
| tree | 2fa504710c533f7f9557987ba14b5b1747a9b851 /src/syntax.c | |
| parent | f01684313faa9803ddc69e71b66d9a469f955348 (diff) | |
| parent | d1efbafdf2cad59b80981d18bb7c6cfdf4d44850 (diff) | |
| download | emacs-a985d2b09bb88f31b27b02c3131cb34c5879d767.tar.gz emacs-a985d2b09bb88f31b27b02c3131cb34c5879d767.zip | |
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
Diffstat (limited to 'src/syntax.c')
| -rw-r--r-- | src/syntax.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/syntax.c b/src/syntax.c index 587335acef8..f8d987b377c 100644 --- a/src/syntax.c +++ b/src/syntax.c | |||
| @@ -3128,8 +3128,9 @@ the prefix syntax flag (p). */) | |||
| 3128 | opoint = pos; | 3128 | opoint = pos; |
| 3129 | opoint_byte = pos_byte; | 3129 | opoint_byte = pos_byte; |
| 3130 | 3130 | ||
| 3131 | if (pos + 1 > beg) | 3131 | if (pos <= beg) |
| 3132 | DEC_BOTH (pos, pos_byte); | 3132 | break; |
| 3133 | DEC_BOTH (pos, pos_byte); | ||
| 3133 | } | 3134 | } |
| 3134 | 3135 | ||
| 3135 | SET_PT_BOTH (opoint, opoint_byte); | 3136 | SET_PT_BOTH (opoint, opoint_byte); |