aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/play
diff options
context:
space:
mode:
authorAlan Mackenzie2015-04-05 12:41:45 +0000
committerAlan Mackenzie2015-04-05 12:49:14 +0000
commit2056db3fada56038664c4fa079ef1e034f64e3a5 (patch)
tree5a3d864152cb9793353fa4be3578907af1cf1989 /lisp/play
parent5842e489eef061766a747e26ca81e1ef6e2ece5a (diff)
downloademacs-2056db3fada56038664c4fa079ef1e034f64e3a5.tar.gz
emacs-2056db3fada56038664c4fa079ef1e034f64e3a5.zip
Rationalize use of c[ad]+r, expunging cl-c[ad]\{3,4\}r.
Also expunge eudc-c[ad]+r. * subr.el (internal--compiler-macro-cXXr): "New" function, copied from cl--compiler-macro-cXXr. (caar, cadr, cdar, cddr): Change from defsubsts to defuns with the above compiler-macro. * net/eudc.el (eudc-cadr, eudc-cdar, eudc-caar, eudc-cdaar): Remove. * emacs-lisp/cl.el (Top level dolist doing defaliases): Remove caaar, etc., from list of new alias functions. * emacs-lisp/cl-lib.el (cl-caaar, etc): Rename to caaar, etc. (gen-cXXr--rawname, gen-cXXr-all-cl-aliases): New function/macro which generate obsolete cl- aliases for caaar, etc. Invoke them. * desktop.el: * edmacro.el: * emacs-lisp/cl-macs.el: * frameset.el: * ibuffer.el: * mail/footnote.el: * net/dbus.el: * net/eudc-export.el: * net/eudc.el: * net/eudcb-ph.el: * net/rcirc.el: * net/secrets.el: * play/5x5.el: * play/decipher.el: * play/hanoi.el: * progmodes/hideif.el: * ses.el: Replace cl-caaar, eudc-cadr, etc. with caaar and cadr, etc.
Diffstat (limited to 'lisp/play')
-rw-r--r--lisp/play/5x5.el8
-rw-r--r--lisp/play/decipher.el4
-rw-r--r--lisp/play/hanoi.el2
3 files changed, 7 insertions, 7 deletions
diff --git a/lisp/play/5x5.el b/lisp/play/5x5.el
index 0258f1e4e4a..8b1b2171d5c 100644
--- a/lisp/play/5x5.el
+++ b/lisp/play/5x5.el
@@ -322,7 +322,7 @@ Quit current game \\[5x5-quit-game]"
322 (save-excursion 322 (save-excursion
323 (goto-char grid-org) 323 (goto-char grid-org)
324 (beginning-of-line (+ 1 (/ 5x5-y-scale 2))) 324 (beginning-of-line (+ 1 (/ 5x5-y-scale 2)))
325 (let ((solution-grid (cl-cdadr 5x5-solver-output))) 325 (let ((solution-grid (cdadr 5x5-solver-output)))
326 (dotimes (y 5x5-grid-size) 326 (dotimes (y 5x5-grid-size)
327 (save-excursion 327 (save-excursion
328 (forward-char (+ 1 (/ (1+ 5x5-x-scale) 2))) 328 (forward-char (+ 1 (/ (1+ 5x5-x-scale) 2)))
@@ -747,9 +747,9 @@ Solutions are sorted from least to greatest Hamming weight."
747 ;; The Hamming Weight is computed by matrix reduction 747 ;; The Hamming Weight is computed by matrix reduction
748 ;; with an ad-hoc operator. 748 ;; with an ad-hoc operator.
749 (math-reduce-vec 749 (math-reduce-vec
750 ;; (cl-cadadr '(vec (mod x 2))) => x 750 ;; (cadadr '(vec (mod x 2))) => x
751 (lambda (r x) (+ (if (integerp r) r (cl-cadadr r)) 751 (lambda (r x) (+ (if (integerp r) r (cadadr r))
752 (cl-cadadr x))) 752 (cadadr x)))
753 solution); car 753 solution); car
754 (5x5-vec-to-grid 754 (5x5-vec-to-grid
755 (calcFunc-arrange solution 5x5-grid-size));cdr 755 (calcFunc-arrange solution 5x5-grid-size));cdr
diff --git a/lisp/play/decipher.el b/lisp/play/decipher.el
index f42ae90f3c8..98a3ae247fe 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."
792 (while temp-list 792 (while temp-list
793 (insert (caar temp-list) 793 (insert (caar temp-list)
794 (format "%4d%3d%% " 794 (format "%4d%3d%% "
795 (cl-cadar temp-list) 795 (cadar temp-list)
796 (/ (* 100 (cl-cadar temp-list)) total))) 796 (/ (* 100 (cadar temp-list)) total)))
797 (setq temp-list (nthcdr 4 temp-list))) 797 (setq temp-list (nthcdr 4 temp-list)))
798 (insert ?\n) 798 (insert ?\n)
799 (setq freq-list (cdr freq-list) 799 (setq freq-list (cdr freq-list)
diff --git a/lisp/play/hanoi.el b/lisp/play/hanoi.el
index b868db68f30..d2734450593 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."
277 ;; Disable display of line and column numbers, for speed. 277 ;; Disable display of line and column numbers, for speed.
278 (line-number-mode nil) (column-number-mode nil)) 278 (line-number-mode nil) (column-number-mode nil))
279 ;; do it! 279 ;; do it!
280 (hanoi-n bits rings (car poles) (cadr poles) (cl-caddr poles) 280 (hanoi-n bits rings (car poles) (cadr poles) (caddr poles)
281 start-time)) 281 start-time))
282 (message "Done")) 282 (message "Done"))
283 (setq buffer-read-only t) 283 (setq buffer-read-only t)