diff options
author | Chong Yidong <[email protected]> | 2011-08-30 18:43:43 -0400 |
---|---|---|
committer | Chong Yidong <[email protected]> | 2011-08-30 18:43:43 -0400 |
commit | 51751aa26f9935609630f04e781a954b54ecc82e (patch) | |
tree | c4db86b365c0cec3590a0bb22f8f22404bd5689d /src | |
parent | 3eacc9cdefe67614635205305834411d7d1136b0 (diff) | |
parent | 6e20a0d47c053a9524edfc6af390bf1e562a5020 (diff) |
Merge changes from emacs-23 branch
Diffstat (limited to 'src')
-rw-r--r-- | src/ChangeLog | 5 | ||||
-rw-r--r-- | src/syntax.c | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index e0f2ad096b..52ec796d6c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-08-30 Chong Yidong <[email protected]> + + * syntax.c (find_defun_start): Update all cache variables if + exiting early (Bug#9401). + 2011-08-30 Eli Zaretskii <[email protected]> * image.c (x_bitmap_pixmap): Cast to int to avoid compiler warnings. diff --git a/src/syntax.c b/src/syntax.c index 8c2d5ded21..3e51099794 100644 --- a/src/syntax.c +++ b/src/syntax.c @@ -398,7 +398,12 @@ find_defun_start (EMACS_INT pos, EMACS_INT pos_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; } |