[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 1f6e6ee 05/18: Remove XEmacs and old Emacs compat c
From: |
Lars Ingebrigtsen |
Subject: |
[Emacs-diffs] master 1f6e6ee 05/18: Remove XEmacs and old Emacs compat code from gamegrid.el |
Date: |
Thu, 20 Jun 2019 06:51:56 -0400 (EDT) |
branch: master
commit 1f6e6ee4f78457dca0165773b964874229005e9c
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>
Remove XEmacs and old Emacs compat code from gamegrid.el
* lisp/play/gamegrid.el (gamegrid-event-x, gamegrid-event-y)
(gamegrid-make-glyph, image-size, gamegrid-initialize-display)
(gamegrid-start-timer, gamegrid-set-timer)
(gamegrid-kill-timer)
(gamegrid-add-score-with-update-game-score-1)
(gamegrid-add-score-insecure): Removed XEmacs compat code.
(gamegrid-characterp, gamegrid-set-display-table): Removed functions.
---
lisp/play/gamegrid.el | 69 ++++++++++-----------------------------------------
1 file changed, 13 insertions(+), 56 deletions(-)
diff --git a/lisp/play/gamegrid.el b/lisp/play/gamegrid.el
index 54eeafd..2d19c14 100644
--- a/lisp/play/gamegrid.el
+++ b/lisp/play/gamegrid.el
@@ -240,20 +240,11 @@ format."
;; ;;;;;;;;;;;;;;;; miscellaneous functions ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(defsubst gamegrid-characterp (arg)
- (if (fboundp 'characterp)
- (characterp arg)
- (integerp arg)))
-
(defsubst gamegrid-event-x (event)
- (if (fboundp 'event-x)
- (event-x event)
- (car (posn-col-row (event-end event)))))
+ (car (posn-col-row (event-end event))))
(defsubst gamegrid-event-y (event)
- (if (fboundp 'event-y)
- (event-y event)
- (cdr (posn-col-row (event-end event)))))
+ (cdr (posn-col-row (event-end event))))
;; ;;;;;;;;;;;;; display functions ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -365,7 +356,7 @@ format."
(defun gamegrid-make-glyph (data-spec-list color-spec-list)
(let ((data (gamegrid-match-spec-list data-spec-list))
(color (gamegrid-match-spec-list color-spec-list)))
- (cond ((gamegrid-characterp data)
+ (cond ((characterp data)
(vector data))
((eq data 'colorize)
(gamegrid-colorize-glyph color))
@@ -399,15 +390,6 @@ format."
(t
'emacs-tty)))
-(defun gamegrid-set-display-table ()
- (if (featurep 'xemacs)
- (add-spec-to-specifier current-display-table
- gamegrid-display-table
- (current-buffer)
- nil
- 'remove-locale)
- (setq buffer-display-table gamegrid-display-table)))
-
(declare-function image-size "image.c" (spec &optional pixels frame))
(defun gamegrid-setup-default-font ()
@@ -444,7 +426,7 @@ format."
(aset gamegrid-face-table c face)
(aset gamegrid-display-table c glyph)))
(gamegrid-setup-default-font)
- (gamegrid-set-display-table)
+ (setq buffer-display-table gamegrid-display-table)
(setq cursor-type nil))
@@ -506,34 +488,19 @@ format."
(defun gamegrid-start-timer (period func)
(setq gamegrid-timer
- (if (featurep 'xemacs)
- (start-itimer "Gamegrid"
- func
- period
- period
- nil
- t
- (current-buffer))
- (run-with-timer period
- period
- func
- (current-buffer)))))
+ (run-with-timer period period func (current-buffer))))
(defun gamegrid-set-timer (delay)
(if gamegrid-timer
- (if (fboundp 'set-itimer-restart)
- (set-itimer-restart gamegrid-timer delay)
- (timer-set-time gamegrid-timer
- (list (aref gamegrid-timer 1)
- (aref gamegrid-timer 2)
- (aref gamegrid-timer 3))
- delay))))
+ (timer-set-time gamegrid-timer
+ (list (aref gamegrid-timer 1)
+ (aref gamegrid-timer 2)
+ (aref gamegrid-timer 3))
+ delay)))
(defun gamegrid-kill-timer ()
(if gamegrid-timer
- (if (featurep 'xemacs)
- (delete-itimer gamegrid-timer)
- (cancel-timer gamegrid-timer)))
+ (cancel-timer gamegrid-timer))
(setq gamegrid-timer nil))
;; ;;;;;;;;;;;;;;; high score functions ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -627,13 +594,7 @@ FILE is created there."
(errbuf (generate-new-buffer " *update-game-score loss*"))
(marker-string (concat
(user-full-name)
- " <"
- (cond ((fboundp 'user-mail-address)
- (user-mail-address))
- ((boundp 'user-mail-address)
- user-mail-address)
- (t ""))
- "> "
+ " <" user-mail-address "> "
(current-time-string))))
;; This can be called from a timer, so enable local quits.
(with-local-quit
@@ -681,11 +642,7 @@ FILE is created there."
score
(current-time-string)
(user-full-name)
- (cond ((fboundp 'user-mail-address)
- (user-mail-address))
- ((boundp 'user-mail-address)
- user-mail-address)
- (t ""))))
+ user-mail-address))
(sort-fields 1 (point-min) (point-max))
(reverse-region (point-min) (point-max))
(goto-char (point-min))
- [Emacs-diffs] master updated (920745e -> 77e8d41), Lars Ingebrigtsen, 2019/06/20
- [Emacs-diffs] master 3c16eda 02/18: Remove XEmacs compat code from pascal.el, Lars Ingebrigtsen, 2019/06/20
- [Emacs-diffs] master ac3219c 03/18: Remove XEmacs compat code from uudecode.el, Lars Ingebrigtsen, 2019/06/20
- [Emacs-diffs] master ec45664 04/18: Remove XEmacs compat code from binhex.el, Lars Ingebrigtsen, 2019/06/20
- [Emacs-diffs] master 954b58f 12/18: Remove XEmacs compat code from dns-mode.el, Lars Ingebrigtsen, 2019/06/20
- [Emacs-diffs] master 82aeaf1 07/18: Remove XEmacs compat code from viper-macs.el, Lars Ingebrigtsen, 2019/06/20
- [Emacs-diffs] master b67a6cb 11/18: Clean up eieio-custom slightly, Lars Ingebrigtsen, 2019/06/20
- [Emacs-diffs] master 717a99d 09/18: Clean up after previous viper patch, Lars Ingebrigtsen, 2019/06/20
- [Emacs-diffs] master 4e0baad 10/18: Remove XEmacs compat code from checkdoc.el, Lars Ingebrigtsen, 2019/06/20
- [Emacs-diffs] master c2e2794 01/18: Remove XEmacs support from cperl-mode, Lars Ingebrigtsen, 2019/06/20
- [Emacs-diffs] master 1f6e6ee 05/18: Remove XEmacs and old Emacs compat code from gamegrid.el,
Lars Ingebrigtsen <=
- [Emacs-diffs] master 86c3d92 15/18: Remove XEmacs compat code from gravatar.el, Lars Ingebrigtsen, 2019/06/20
- [Emacs-diffs] master 77e8d41 18/18: Declare semantic-*overlay* aliases obsolete, Lars Ingebrigtsen, 2019/06/20
- [Emacs-diffs] master a4047f9 06/18: Remove XEmacs compat code from viper-cmd.el, Lars Ingebrigtsen, 2019/06/20
- [Emacs-diffs] master 45a0ce0 13/18: Remove XEmacs compat code from table.el, Lars Ingebrigtsen, 2019/06/20
- [Emacs-diffs] master 9f4cced 14/18: Remove XEmacs compat code from erc, Lars Ingebrigtsen, 2019/06/20
- [Emacs-diffs] master e383aad 16/18: Remove XEmacs compat code from cedet, Lars Ingebrigtsen, 2019/06/20
- [Emacs-diffs] master dfec2bc 08/18: Remove most of the XEmacs compat code from viper*.el, Lars Ingebrigtsen, 2019/06/20
- [Emacs-diffs] master 31b1e4c 17/18: Throughout cedet, don't use semantic-overlay-* compat aliases, Lars Ingebrigtsen, 2019/06/20