eschulte pushed a commit to branch go in repository elpa. commit 240f8cd3f19f91481f232d114ec693ffb20bec53 Author: Eric Schulte <schulte.e...@gmail.com> Date: Sun May 19 13:18:31 2013 -0600
replace flet with cl-flet --- back-ends/igs.el | 2 +- back-ends/sgf2el.el | 2 +- go-board.el | 8 ++++---- go-tests.el | 2 +- go-util.el | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/back-ends/igs.el b/back-ends/igs.el index 04c7f5c..4188387 100644 --- a/back-ends/igs.el +++ b/back-ends/igs.el @@ -165,7 +165,7 @@ This is used to re-send messages to keep the IGS server from timing out.") (defun igs-connect (igs) "Open a connection to `igs-server'." (interactive) - (flet ((wait (prompt) + (cl-flet ((wait (prompt) (while (and (goto-char (or comint-last-input-end (point-min))) (not (re-search-forward prompt nil t))) (accept-process-output proc)))) diff --git a/back-ends/sgf2el.el b/back-ends/sgf2el.el index e8a136b..4b37630 100644 --- a/back-ends/sgf2el.el +++ b/back-ends/sgf2el.el @@ -150,7 +150,7 @@ (add-to-list 'sgf2el-special-properties (cons :DT #'process-date)) (defun process-position (position-string) - (flet ((char-to-num (char) + (cl-flet ((char-to-num (char) (cond ((or (< char ?A) (< ?z char)) (error "sgf: invalid char %s" char)) diff --git a/go-board.el b/go-board.el index 1e71c3f..c20fc03 100644 --- a/go-board.el +++ b/go-board.el @@ -90,7 +90,7 @@ (update-display (current-buffer)))) (defun apply-move (board move) - (flet ((bset (val data) + (cl-flet ((bset (val data) (let ((data (if (listp (car data)) data (list data)))) (setf (aref board (pos-to-index (aget data :pos) (board-size board))) @@ -163,7 +163,7 @@ ;;; Visualization (defun board-header (board) - (flet ((hd (str hd) + (cl-flet ((hd (str hd) (put-text-property 0 1 :type `(,hd . :offboard) str) str)) (let ((size (board-size board))) @@ -177,7 +177,7 @@ (defun board-pos-to-string (board pos) (let ((size (board-size board))) - (flet ((emph (n) + (cl-flet ((emph (n) (cond ((= size 19) (or (= 3 n) @@ -241,7 +241,7 @@ (defun go-board-paint (&optional start end) (interactive "r") - (flet ((ov (point face &optional back) + (cl-flet ((ov (point face &optional back) (let ((ovly (make-overlay point (1+ point)))) (overlay-put ovly 'go-pt point) (overlay-put ovly 'face (sym-cat 'go-board face)) diff --git a/go-tests.el b/go-tests.el index 076fd49..e9d4bb1 100644 --- a/go-tests.el +++ b/go-tests.el @@ -276,7 +276,7 @@ (defun go-stone-counts () (let ((pieces (car *history*))) - (flet ((count-for (color) (length (remove-if-not + (cl-flet ((count-for (color) (length (remove-if-not (lambda (piece) (equal color (car piece))) pieces)))) (cons (count-for :B) (count-for :W))))) diff --git a/go-util.el b/go-util.el index 448f143..4483369 100644 --- a/go-util.el +++ b/go-util.el @@ -87,7 +87,7 @@ str))) (defun char-to-num (char) - (flet ((err () (error "gtp: invalid char %s" char))) + (cl-flet ((err () (error "gtp: invalid char %s" char))) (cond ((< char ?A) (err)) ((< char ?I) (- char ?A)) @@ -98,7 +98,7 @@ (t (err))))) (defun num-to-char (num) - (flet ((err () (error "gtp: invalid num %s" num))) + (cl-flet ((err () (error "gtp: invalid num %s" num))) (cond ((< num 1) (err)) ((< num 9) (+ ?A (1- num)))