[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/mines 226776a 25/43: * mines: Fix compilation warnings
From: |
Stefan Monnier |
Subject: |
[elpa] externals/mines 226776a 25/43: * mines: Fix compilation warnings |
Date: |
Mon, 30 Nov 2020 18:44:17 -0500 (EST) |
branch: externals/mines
commit 226776ad14bb45d17c947b59b9d4ac47afa853e9
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Tino Calancha <tino.calancha@gmail.com>
* mines: Fix compilation warnings
---
mines-tests.el | 21 +++++++++++----------
mines.el | 10 ++++++----
2 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/mines-tests.el b/mines-tests.el
index e19c557..9bdf9ca 100644
--- a/mines-tests.el
+++ b/mines-tests.el
@@ -50,7 +50,7 @@
(should-not (mines-first-move-p))
;; 2nd trial might end the game.
(cl-letf (((symbol-function 'yes-or-no-p)
- (lambda (&rest arg) (error "Fail"))))
+ (lambda (&rest _) (error "Fail"))))
(should-error (mines-dig))))
(when (buffer-live-p buf) (kill-buffer buf))))
@@ -94,19 +94,20 @@
(when (buffer-live-p buf) (kill-buffer buf)))))
(ert-deftest mines-test-indices ()
- (= 0 (mines-matrix-2-index 0 0))
- (= 1 (mines-matrix-2-index 0 1))
- (= (1- mines-number-cols)
- (mines-matrix-2-index 0 (1- mines-number-cols)))
- (= (* mines-number-cols (1- mines-number-rows))
- (mines-matrix-2-index (1- mines-number-rows) 0))
- (= (1- mines-number-cells)
- (mines-matrix-2-index (1- mines-number-rows) (1- mines-number-cols)))
+ (should (= 0 (mines-matrix-2-index 0 0)))
+ (should (= 1 (mines-matrix-2-index 0 1)))
+ (should (= (1- mines-number-cols)
+ (mines-matrix-2-index 0 (1- mines-number-cols))))
+ (should (= (* mines-number-cols (1- mines-number-rows))
+ (mines-matrix-2-index (1- mines-number-rows) 0)))
+ (should (= (1- mines-number-cells)
+ (mines-matrix-2-index (1- mines-number-rows)
+ (1- mines-number-cols))))
;; `mines-matrix-2-index' consistent with `mines-index-2-matrix'.
(dolist (idx (list 0 1 (1- mines-number-cols)
(* mines-number-cols (1- mines-number-rows))
(1- mines-number-cells)))
- (= idx (apply #'mines-matrix-2-index (mines-index-2-matrix idx)))))
+ (should (= idx (apply #'mines-matrix-2-index (mines-index-2-matrix
idx))))))
(ert-deftest mines-test-neighbours ()
(cl-flet ((set-equalp (x y)
diff --git a/mines.el b/mines.el
index 02bfc9b..9304622 100644
--- a/mines.el
+++ b/mines.el
@@ -454,8 +454,8 @@ If called again then unflag it."
(interactive)
(when (mines-mines-mode-p)
(if mines-game-over
- (user-error "Current game is over. Try `%s' to start a new one."
- (substitute-command-keys "\\[mines\]"))
+ (user-error "Current game is over. Try `%s' to start a new one"
+ (substitute-command-keys "\\[mines]"))
(skip-chars-forward "[:blank:]") ; Set point in the center of the cell.
(cl-labels ((uncover-fn
()
@@ -484,7 +484,7 @@ If called again then unflag it."
(aset mines-grid pos t))
;; Update the numbers on neighbour cells.
(mines-set-numbers)
- ;; Update current element.
+ ;; Update current element.
(setq elt (aref mines-grid idx))))
;; If the cell is flagged ask for confirmation.
(if (and (not show-mines) (eq (following-char)
mines-flagged-cell-char))
@@ -511,6 +511,8 @@ If called again then unflag it."
;;;###autoload
(defun mines (&optional arg)
+ ;; FIXME: I think most of this doc should be moved to `mines-mode' so it
+ ;; is shown to the user when he uses the standard `describe-mode' command.
"Play the minesweeper game.
Called with a prefix prompt for the difficulty level.
@@ -534,7 +536,7 @@ For instance, following is a possible configuration:
@ @ @ @ @
You can move between cells using the arrow keys, or using vi
-or emacs keystrokes (↑↓→←) = (kjlh) = (pnfb).
+or Emacs keystrokes (↑↓→←) = (kjlh) = (pnfb).
You can flag a cell as having a mine with \\[mines-flag-cell\]; if you
call this command again, the cell is unflagged."
- [elpa] externals/mines b490060 39/43: * packages/mines/mines.el: Streamline mines--insert, (continued)
- [elpa] externals/mines b490060 39/43: * packages/mines/mines.el: Streamline mines--insert, Stefan Monnier, 2020/11/30
- [elpa] externals/mines 82f1a92 17/43: Refactor code, Stefan Monnier, 2020/11/30
- [elpa] externals/mines 5ada7d3 06/43: * Readme: Add more screenshots, Stefan Monnier, 2020/11/30
- [elpa] externals/mines 9f7404e 07/43: Delete file, Stefan Monnier, 2020/11/30
- [elpa] externals/mines dd8b0e3 11/43: Delete screenshots, Stefan Monnier, 2020/11/30
- [elpa] externals/mines 1efe0e0 12/43: updated screenshots, Stefan Monnier, 2020/11/30
- [elpa] externals/mines 909152f 19/43: * mines.el (mines-dig): Update element at point after avoid gameover in 1st trial, Stefan Monnier, 2020/11/30
- [elpa] externals/mines 7660b39 21/43: Add test suite, Stefan Monnier, 2020/11/30
- [elpa] externals/mines 3de39fb 22/43: * README.md: Show build state, Stefan Monnier, 2020/11/30
- [elpa] externals/mines 6e7fc5c 24/43: * mines.el: Update dependency to Emacs-24.4, Stefan Monnier, 2020/11/30
- [elpa] externals/mines 226776a 25/43: * mines: Fix compilation warnings,
Stefan Monnier <=
- [elpa] externals/mines abc8c9d 26/43: Move game documentation into `mines-mode' docstring, Stefan Monnier, 2020/11/30
- [elpa] externals/mines 7133550 28/43: * mines/mines.el (mines-mode): Move the docstring to where it belongs., Stefan Monnier, 2020/11/30
- [elpa] externals/mines 2241dcd 36/43: * mines/mines.el: Various minor changes, wave 1, Stefan Monnier, 2020/11/30
- [elpa] externals/mines 3308a99 38/43: * packages/mines/mines.el: Keep flag in mines-state, Stefan Monnier, 2020/11/30
- [elpa] externals/mines e090a90 40/43: * mines.el: Make sure the first move is successful, Stefan Monnier, 2020/11/30
- [elpa] externals/mines bea3ad8 42/43: * packages/mines/mines.el (mines-auto-flag): New custom var, Stefan Monnier, 2020/11/30
- [elpa] externals/mines 97e0a05 43/43: * mines.el: Adjust docs for the @ => SPC change, Stefan Monnier, 2020/11/30
- [elpa] externals/mines 92399df 29/43: * packages/mines/mines.el: Bump version to 1.2, Stefan Monnier, 2020/11/30
- [elpa] externals/mines 868e9b9 35/43: * mines.el: Bump version to v1.6, Stefan Monnier, 2020/11/30
- [elpa] externals/mines e127c84 30/43: Add fallback function for read-multiple-choice, Stefan Monnier, 2020/11/30