diff options
| author | Joakim Verona | 2011-08-08 17:08:48 +0200 |
|---|---|---|
| committer | Joakim Verona | 2011-08-08 17:08:48 +0200 |
| commit | 1e3f7bd2cdb85abfbf572cc1a13e615e5c4299de (patch) | |
| tree | cf8b108fccada9dca76dc616e5333739d8825728 /src/composite.c | |
| parent | 23e9910c1fc51657f08b4ab125c0c44e5860d942 (diff) | |
| parent | d56176114c8c9226a43db4bf68df562486e454ed (diff) | |
| download | emacs-1e3f7bd2cdb85abfbf572cc1a13e615e5c4299de.tar.gz emacs-1e3f7bd2cdb85abfbf572cc1a13e615e5c4299de.zip | |
merge upstream
Diffstat (limited to 'src/composite.c')
| -rw-r--r-- | src/composite.c | 2 |
1 files changed, 0 insertions, 2 deletions
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 | |||
| 960 | args[4] = font_object; | 960 | args[4] = font_object; |
| 961 | args[5] = string; | 961 | args[5] = string; |
| 962 | lgstring = safe_call (6, args); | 962 | lgstring = safe_call (6, args); |
| 963 | if (NILP (string)) | ||
| 964 | TEMP_SET_PT_BOTH (pt, pt_byte); | ||
| 965 | } | 963 | } |
| 966 | return unbind_to (count, lgstring); | 964 | return unbind_to (count, lgstring); |
| 967 | } | 965 | } |