diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2011-08-07 15:40:08 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2011-08-07 15:40:08 -0400 |
| commit | 588728344d5fe74ed583f764a458603913f68c31 (patch) | |
| tree | 3e6638a4845fe66f1003f9d1ddb5148b2d489262 | |
| parent | 98fdd2b837df46c77527bdd73a7eeb055eb60fa4 (diff) | |
| download | emacs-588728344d5fe74ed583f764a458603913f68c31.tar.gz | |
* composite.c (autocmp_chars): Don't reset point.
That is done by restore_point_unwind (Bug#5984).
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/composite.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index ef4efb0ad35..ddd580fcc4c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-08-07 Chong Yidong <cyd@stupidchicken.com> + + * composite.c (autocmp_chars): Don't reset point. That is done by + restore_point_unwind (Bug#5984). + 2011-08-07 Juri Linkov <juri@jurta.org> * editfns.c (Fformat_time_string): Doc fix, add tag `usage:' diff --git a/src/composite.c b/src/composite.c index d402d5ad0c4..3308a028042 100644 --- a/src/composite.c +++ b/src/composite.c @@ -960,8 +960,6 @@ autocmp_chars (Lisp_Object rule, EMACS_INT charpos, EMACS_INT bytepos, EMACS_INT args[4] = font_object; args[5] = string; lgstring = safe_call (6, args); - if (NILP (string)) - TEMP_SET_PT_BOTH (pt, pt_byte); } return unbind_to (count, lgstring); } |