(menu-bar-games-menu): Add Bubbles and Pong. Add :help for Solitaire and Tetris.

3 files changed, 25 insertions, 3 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 1dd563007d..8393b5ea0f 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -295,7 +295,8 @@ any invalid parts of your document.
 attribute name or data value by using information about what is
 allowed by the schema in that context.
 
-** A new game called `bubbles' has been added.
+** A new game called `bubbles' has been added.  This is a version of
+the "Same Game" with configurable difficulty level.
 
 ** minibuffer-indicate-depth-mode shows the minibuffer depth in the prompt.
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c22c36407a..51a687ade6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2008-02-23  Glenn Morris  <[email protected]>
+
+	* menu-bar.el (menu-bar-games-menu): Add Bubbles and Pong.
+	Add :help for Solitaire and Tetris.
+
+	* mail/smtpmail.el: Remove leading `*' from defcustom doc-strings.
+	(smtpmail-code-conv-from): Doc fix.  Fix custom type.
+	(smtpmail-queue-index-file): Make it a defcustom.
+	(smtpmail-queue-index): Delete.
+	(smtpmail-send-it, smtpmail-send-queued-mail):
+	Use smtpmail-queue-index-file and smtpmail-queue-dir rather than
+	smtpmail-queue-index.
+
 2008-02-23  Dan Nicolaescu  <[email protected]>
 
 	* vc.el (vc-find-revision): Make vc-parent-buffer local before
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 36cf45b55c..9d6303314c 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -1096,12 +1096,17 @@ mail status in mode line"))
   '(menu-item "Zone Out"  zone
 	      :help "Play tricks with Emacs display when Emacs is idle"))
 (define-key menu-bar-games-menu [tetris]
-  '(menu-item "Tetris"  tetris))
+  '(menu-item "Tetris"  tetris
+              :help "Falling blocks game"))
 (define-key menu-bar-games-menu [solitaire]
-  '(menu-item "Solitaire"  solitaire))
+  '(menu-item "Solitaire"  solitaire
+              :help "Get rid of all the stones"))
 (define-key menu-bar-games-menu [snake]
   '(menu-item "Snake"  snake
 	      :help "Move snake around avoiding collisions"))
+(define-key menu-bar-games-menu [pong]
+  '(menu-item "Pong" pong
+	      :help "Bounce the ball to your opponent"))
 (define-key menu-bar-games-menu [mult]
   '(menu-item "Multiplication Puzzle"  mpuz
 	      :help "Exercise brain with multiplication"))
@@ -1114,6 +1119,9 @@ mail status in mode line"))
 (define-key menu-bar-games-menu [gomoku]
   '(menu-item "Gomoku"  gomoku
 	      :help "Mark 5 contiguous squares (like tic-tac-toe)"))
+(define-key menu-bar-games-menu [bubbles]
+  '(menu-item "Bubbles" bubbles
+	      :help "Remove all bubbles using the fewest moves"))
 (define-key menu-bar-games-menu [black-box]
   '(menu-item "Blackbox"  blackbox
 	      :help "Find balls in a black box by shooting rays"))