diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2015-04-10 01:50:22 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2015-04-10 01:50:22 -0400 |
| commit | 26f8a384978c6b1d1db1c6b091fa1e51d9ff5a5b (patch) | |
| tree | 1009712ed76be8785abbfa2cfb6ddc9359b46ced /lisp/play | |
| parent | 519489089197ce2d41c72e20773438d415ce8564 (diff) | |
| download | emacs-26f8a384978c6b1d1db1c6b091fa1e51d9ff5a5b.tar.gz | |
cl-lib.el: Partial revert of "2015-04-05 Rationalize c[ad]+r"
* lisp/emacs-lisp/cl-lib.el: Partial revert of "2015-04-05 Rationalize
use of c[ad]+r", so as to keep the "cl-" prefix on all
cl-lib definitions.
Diffstat (limited to 'lisp/play')
| -rw-r--r-- | lisp/play/5x5.el | 8 | ||||
| -rw-r--r-- | lisp/play/decipher.el | 4 | ||||
| -rw-r--r-- | lisp/play/hanoi.el | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/lisp/play/5x5.el b/lisp/play/5x5.el index 8b1b2171d5c..0258f1e4e4a 100644 --- a/lisp/play/5x5.el +++ b/lisp/play/5x5.el @@ -322,7 +322,7 @@ Quit current game \\[5x5-quit-game]" (save-excursion (goto-char grid-org) (beginning-of-line (+ 1 (/ 5x5-y-scale 2))) - (let ((solution-grid (cdadr 5x5-solver-output))) + (let ((solution-grid (cl-cdadr 5x5-solver-output))) (dotimes (y 5x5-grid-size) (save-excursion (forward-char (+ 1 (/ (1+ 5x5-x-scale) 2))) @@ -747,9 +747,9 @@ Solutions are sorted from least to greatest Hamming weight." ;; The Hamming Weight is computed by matrix reduction ;; with an ad-hoc operator. (math-reduce-vec - ;; (cadadr '(vec (mod x 2))) => x - (lambda (r x) (+ (if (integerp r) r (cadadr r)) - (cadadr x))) + ;; (cl-cadadr '(vec (mod x 2))) => x + (lambda (r x) (+ (if (integerp r) r (cl-cadadr r)) + (cl-cadadr x))) solution); car (5x5-vec-to-grid (calcFunc-arrange solution 5x5-grid-size));cdr diff --git a/lisp/play/decipher.el b/lisp/play/decipher.el index 98a3ae247fe..f42ae90f3c8 100644 --- a/lisp/play/decipher.el +++ b/lisp/play/decipher.el @@ -792,8 +792,8 @@ TOTAL is the total number of letters in the ciphertext." (while temp-list (insert (caar temp-list) (format "%4d%3d%% " - (cadar temp-list) - (/ (* 100 (cadar temp-list)) total))) + (cl-cadar temp-list) + (/ (* 100 (cl-cadar temp-list)) total))) (setq temp-list (nthcdr 4 temp-list))) (insert ?\n) (setq freq-list (cdr freq-list) diff --git a/lisp/play/hanoi.el b/lisp/play/hanoi.el index d2734450593..635e4a95bc3 100644 --- a/lisp/play/hanoi.el +++ b/lisp/play/hanoi.el @@ -277,7 +277,7 @@ BITS must be of length nrings. Start at START-TIME." ;; Disable display of line and column numbers, for speed. (line-number-mode nil) (column-number-mode nil)) ;; do it! - (hanoi-n bits rings (car poles) (cadr poles) (caddr poles) + (hanoi-n bits rings (nth 0 poles) (nth 1 poles) (nth 2 poles) start-time)) (message "Done")) (setq buffer-read-only t) |