diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-06-01 11:19:45 -0300 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-06-01 11:19:45 -0300 |
| commit | 2462470b9ec3876a54f1ce4c70561c478ceaf714 (patch) | |
| tree | 1a2f4e03d44dca8c018b85005dbbbdc09a2584f8 /lisp/international/ccl.el | |
| parent | 18613c7e90dbb95c077dfaee632ad4910c512db5 (diff) | |
| download | emacs-2462470b9ec3876a54f1ce4c70561c478ceaf714.tar.gz | |
Miscellaneous tweaks.
* lisp/emacs-lisp/cl-macs.el (dolist, dotimes): Use the same strategy for
lexical scoping as in subr.el's dolist and dotimes.
* lisp/emacs-lisp/bytecomp.el (byte-compile-unfold-bcf):
Silence compiler warning.
* lisp/thingatpt.el (forward-whitespace): Trivial coding style fix.
* lisp/subr.el (with-output-to-temp-buffer): Provide an edebug spec.
* lisp/international/ccl.el (ccl-compile): Trivial simplification.
* lisp/help-fns.el (help-do-arg-highlight): Silence compiler warning.
* lisp/emacs-lisp/testcover.el (testcover-end): Remove spurious
`printflag' argument.
* lisp/emacs-lisp/byte-run.el (make-obsolete, make-obsolete-variable):
Purecopy the whole obsolescence data.
Diffstat (limited to 'lisp/international/ccl.el')
| -rw-r--r-- | lisp/international/ccl.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/international/ccl.el b/lisp/international/ccl.el index 2cae1262521..9614479072a 100644 --- a/lisp/international/ccl.el +++ b/lisp/international/ccl.el @@ -280,10 +280,10 @@ the current loop.") ;;;###autoload (defun ccl-compile (ccl-program) "Return the compiled code of CCL-PROGRAM as a vector of integers." - (if (or (null (consp ccl-program)) - (null (integerp (car ccl-program))) - (null (listp (car (cdr ccl-program))))) - (error "CCL: Invalid CCL program: %s" ccl-program)) + (unless (and (consp ccl-program) + (integerp (car ccl-program)) + (listp (car (cdr ccl-program)))) + (error "CCL: Invalid CCL program: %s" ccl-program)) (if (null (vectorp ccl-program-vector)) (setq ccl-program-vector (make-vector 8192 0))) (setq ccl-loop-head nil ccl-breaks nil) |