From: Juanma Barranquero <lekktu@gmail.com>
Date: Tue, 25 Nov 2008 02:01:58 +0000 (+0000)
Subject: * play/bubbles.el (bubbles-mode): Define with `define-derived-mode'.
X-Git-Tag: emacs-pretest-23.0.90~1549
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e73da1296b85b2422b0546473e6d611fae33e8c5;p=emacs.git

* play/bubbles.el (bubbles-mode): Define with `define-derived-mode'.
  (bubbles-shift-mode, bubbles--update-score): Fix typos in docstrings.
  (bubbles--empty-char): Use "\s".
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5e8a6917d55..58923033a2b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-25  Juanma Barranquero  <lekktu@gmail.com>
+
+	* play/bubbles.el (bubbles-mode): Define with `define-derived-mode'.
+	(bubbles-shift-mode, bubbles--update-score): Fix typos in docstrings.
+	(bubbles--empty-char): Use "\s".
+
 2008-11-25  Jay Belanger  <jay.p.belanger@gmail.com>
 
 	* calc/calc.el (calc-settings-file, calc-language-alist)
@@ -14939,7 +14945,6 @@
 	standard-display-table.
 	(latin1-display-identities): Adjust for the change of what is
 	returned by (get-language-info charset 'charset).
-
 	* international/mule-util.el (char-displayable-p): Fix for Latin-1
 	characters and terminal case.
 
diff --git a/lisp/play/bubbles.el b/lisp/play/bubbles.el
index 290a43c0a7e..abf9ec7c553 100644
--- a/lisp/play/bubbles.el
+++ b/lisp/play/bubbles.el
@@ -209,7 +209,7 @@ the number of colors, see `bubbles-colors'."
 (defcustom bubbles-shift-mode
   'default
   "Shift mode.
-Available modes are `shift-default' and`shift-always'."
+Available modes are `shift-default' and `shift-always'."
   :type '(radio (const :tag "Default" default)
                 (const :tag "Shifter" always)
                 ;;(const :tag "Mega Shifter" 'mega)
@@ -782,7 +782,7 @@ static char * dot3d_xpm[] = {
 
 (defsubst bubbles--empty-char ()
   "The character used for removed bubbles (empty grid cells)."
-  ? )
+  ?\s)
 
 (defun bubbles-set-graphics-theme-ascii ()
   "Set graphics theme to `ascii'."
@@ -918,20 +918,14 @@ static char * dot3d_xpm[] = {
     map)
   "Mode map for bubbles.")
 
-(defun bubbles-mode ()
+(define-derived-mode bubbles-mode nil "Bubbles"
   "Major mode for playing bubbles.
 \\{bubbles-mode-map}"
-  (kill-all-local-variables)
-  (use-local-map bubbles-mode-map)
-  (setq major-mode 'bubbles-mode)
-  (setq mode-name "Bubbles")
   (setq buffer-read-only t)
   (buffer-disable-undo)
-  (setq buffer-undo-list t)
   (force-mode-line-update)
   (redisplay)
-  (add-hook 'post-command-hook 'bubbles--mark-neighbourhood t t)
-  (run-hooks 'bubbles-mode-hook))
+  (add-hook 'post-command-hook 'bubbles--mark-neighbourhood t t))
 
 ;;;###autoload
 (defun bubbles ()
@@ -1154,7 +1148,7 @@ Use optional parameter POS instead of point if given."
   (bubbles--update-score))
 
 (defun bubbles--update-score ()
-  "Calculate and display new bubble score."
+  "Calculate and display new bubbles score."
   (setq bubbles--score (+ bubbles--score bubbles--neighbourhood-score))
   (bubbles--show-scores))