summaryrefslogtreecommitdiff
path: root/src/ccl.h
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2008-02-13 15:10:57 +0000
committerStefan Monnier <monnier@iro.umontreal.ca>2008-02-13 15:10:57 +0000
commit02dfeba8a4ce93dadd7f5fa7f462fca12fdf28f8 (patch)
tree6f3af2c8cce69d443906f83ed834d82ec34b4a2f /src/ccl.h
parent78dc87a23feb2a1a5d5dc0c2a5abc3a310493dcf (diff)
(smerge-auto-combine-max-separation): New var.
(smerge-auto-combine): New fun.
Diffstat (limited to 'src/ccl.h')
-rw-r--r--src/ccl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ccl.h b/src/ccl.h
index 3afb135fb5..4ac8b990fe 100644
--- a/src/ccl.h
+++ b/src/ccl.h
@@ -117,7 +117,7 @@ EXFUN (Fccl_program_p, 1);
#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 */