aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChong Yidong2011-08-30 18:38:07 -0400
committerChong Yidong2011-08-30 18:38:07 -0400
commit6e20a0d47c053a9524edfc6af390bf1e562a5020 (patch)
tree60b1e621112ea0d6651ccb1469703c69d9b74808 /src
parent1f403cb99165f3acc8b07639610f9340e8c2b97f (diff)
downloademacs-6e20a0d47c053a9524edfc6af390bf1e562a5020.tar.gz
emacs-6e20a0d47c053a9524edfc6af390bf1e562a5020.zip
Fix syntax scanning bug causing fontification crashes.
* src/syntax.c (find_defun_start): Update all cache variables if exiting early. Fixes: debbugs:9401
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/syntax.c5
2 files changed, 10 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 8c050b3a3ec..6c8f5a9305a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12011-08-30 Chong Yidong <cyd@stupidchicken.com>
2
3 * syntax.c (find_defun_start): Update all cache variables if
4 exiting early (Bug#9401).
5
12011-08-19 Andreas Schwab <schwab@linux-m68k.org> 62011-08-19 Andreas Schwab <schwab@linux-m68k.org>
2 7
3 * keyboard.c: Include "process.h" 8 * keyboard.c: Include "process.h"
diff --git a/src/syntax.c b/src/syntax.c
index bfdf0e5ee6d..ba3810227eb 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -364,7 +364,12 @@ find_defun_start (pos, pos_byte)
364 364
365 if (!open_paren_in_column_0_is_defun_start) 365 if (!open_paren_in_column_0_is_defun_start)
366 { 366 {
367 find_start_value = BEGV;
367 find_start_value_byte = BEGV_BYTE; 368 find_start_value_byte = BEGV_BYTE;
369 find_start_buffer = current_buffer;
370 find_start_modiff = MODIFF;
371 find_start_begv = BEGV;
372 find_start_pos = pos;
368 return BEGV; 373 return BEGV;
369 } 374 }
370 375