diff options
| author | Stefan Monnier | 2008-02-13 15:10:57 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2008-02-13 15:10:57 +0000 |
| commit | 02dfeba8a4ce93dadd7f5fa7f462fca12fdf28f8 (patch) | |
| tree | 6f3af2c8cce69d443906f83ed834d82ec34b4a2f /src/ccl.h | |
| parent | 78dc87a23feb2a1a5d5dc0c2a5abc3a310493dcf (diff) | |
| download | emacs-02dfeba8a4ce93dadd7f5fa7f462fca12fdf28f8.tar.gz emacs-02dfeba8a4ce93dadd7f5fa7f462fca12fdf28f8.zip | |
(smerge-auto-combine-max-separation): New var.
(smerge-auto-combine): New fun.
Diffstat (limited to 'src/ccl.h')
| -rw-r--r-- | src/ccl.h | 2 |
1 files changed, 1 insertions, 1 deletions
| @@ -117,7 +117,7 @@ EXFUN (Fccl_program_p, 1); | |||
| 117 | #define CHECK_CCL_PROGRAM(x) \ | 117 | #define CHECK_CCL_PROGRAM(x) \ |
| 118 | do { \ | 118 | do { \ |
| 119 | if (NILP (Fccl_program_p (x))) \ | 119 | if (NILP (Fccl_program_p (x))) \ |
| 120 | x = wrong_type_argument (Qcclp, (x)); \ | 120 | wrong_type_argument (Qcclp, (x)); \ |
| 121 | } while (0); | 121 | } while (0); |
| 122 | 122 | ||
| 123 | #endif /* EMACS_CCL_H */ | 123 | #endif /* EMACS_CCL_H */ |