Mercurial > emacs
diff src/ccl.h @ 91813:ca1e1298a3d8
(smerge-auto-combine-max-separation): New var.
(smerge-auto-combine): New fun.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Wed, 13 Feb 2008 15:10:57 +0000 |
| parents | 606f2d163a64 |
| children | 4e76a03232e5 |
line wrap: on
line diff
--- a/src/ccl.h Tue Feb 12 23:41:59 2008 +0000 +++ b/src/ccl.h Wed Feb 13 15:10:57 2008 +0000 @@ -117,7 +117,7 @@ #define CHECK_CCL_PROGRAM(x) \ do { \ if (NILP (Fccl_program_p (x))) \ - x = wrong_type_argument (Qcclp, (x)); \ + wrong_type_argument (Qcclp, (x)); \ } while (0); #endif /* EMACS_CCL_H */
