[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-24 r117351: * src/syntax.c (find_defun_start): Try t
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] emacs-24 r117351: * src/syntax.c (find_defun_start): Try the cache even |
Date: |
Sat, 05 Jul 2014 02:17:21 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117351
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16526
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Fri 2014-07-04 22:17:14 -0400
message:
* src/syntax.c (find_defun_start): Try the cache even
if !open_paren_in_column_0_is_defun_start.
(back_comment): If find_defun_start was pessimistic, use the
scan_sexps_forward result to improve the cache.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/syntax.c syntax.c-20091113204419-o5vbwnq5f7feedwu-180
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-07-04 15:15:02 +0000
+++ b/src/ChangeLog 2014-07-05 02:17:14 +0000
@@ -1,3 +1,10 @@
+2014-07-05 Stefan Monnier <address@hidden>
+
+ * syntax.c (find_defun_start): Try the cache even
+ if !open_paren_in_column_0_is_defun_start.
+ (back_comment): If find_defun_start was pessimistic, use the
+ scan_sexps_forward result to improve the cache (bug#16526).
+
2014-07-04 Daniel Colascione <address@hidden>
Backport from trunk.
@@ -7,8 +14,7 @@
and stop caching xic_style across different displays (Bug#17928).
(supported_xim_styles): Make const.
(best_xim_style): Remove first parameter: it's always just
- supported_xim_styles. Change to look at supported_xim_styles
- directly.
+ supported_xim_styles. Change to look at supported_xim_styles directly.
2014-07-04 Eli Zaretskii <address@hidden>
=== modified file 'src/syntax.c'
--- a/src/syntax.c 2014-02-08 05:12:47 +0000
+++ b/src/syntax.c 2014-07-05 02:17:14 +0000
@@ -530,17 +530,6 @@
{
ptrdiff_t opoint = PT, opoint_byte = PT_BYTE;
- if (!open_paren_in_column_0_is_defun_start)
- {
- find_start_value = BEGV;
- find_start_value_byte = BEGV_BYTE;
- find_start_buffer = current_buffer;
- find_start_modiff = MODIFF;
- find_start_begv = BEGV;
- find_start_pos = pos;
- return BEGV;
- }
-
/* Use previous finding, if it's valid and applies to this inquiry. */
if (current_buffer == find_start_buffer
/* Reuse the defun-start even if POS is a little farther on.
@@ -552,6 +541,13 @@
&& MODIFF == find_start_modiff)
return find_start_value;
+ if (!open_paren_in_column_0_is_defun_start)
+ {
+ find_start_value = BEGV;
+ find_start_value_byte = BEGV_BYTE;
+ goto found;
+ }
+
/* Back up to start of line. */
scan_newline (pos, pos_byte, BEGV, BEGV_BYTE, -1, 1);
@@ -582,13 +578,14 @@
/* Record what we found, for the next try. */
find_start_value = PT;
find_start_value_byte = PT_BYTE;
+ TEMP_SET_PT_BOTH (opoint, opoint_byte);
+
+ found:
find_start_buffer = current_buffer;
find_start_modiff = MODIFF;
find_start_begv = BEGV;
find_start_pos = pos;
- TEMP_SET_PT_BOTH (opoint, opoint_byte);
-
return find_start_value;
}
@@ -841,7 +838,9 @@
else
{
struct lisp_parse_state state;
+ bool adjusted;
lossage:
+ adjusted = true;
/* We had two kinds of string delimiters mixed up
together. Decode this going forwards.
Scan fwd from a known safe place (beginning-of-defun)
@@ -852,6 +851,7 @@
{
defun_start = find_defun_start (comment_end, comment_end_byte);
defun_start_byte = find_start_value_byte;
+ adjusted = (defun_start > BEGV);
}
do
{
@@ -860,6 +860,16 @@
comment_end, TYPE_MINIMUM (EMACS_INT),
0, Qnil, 0);
defun_start = comment_end;
+ if (!adjusted)
+ {
+ adjusted = true;
+ find_start_value
+ = CONSP (state.levelstarts) ? XINT (XCAR (state.levelstarts))
+ : state.thislevelstart >= 0 ? state.thislevelstart
+ : find_start_value;
+ find_start_value_byte = CHAR_TO_BYTE (find_start_value);
+ }
+
if (state.incomment == (comnested ? 1 : -1)
&& state.comstyle == comstyle)
from = state.comstr_start;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-24 r117351: * src/syntax.c (find_defun_start): Try the cache even,
Stefan Monnier <=