[Emacs-diffs] Changes to emacs/lisp/play/solitaire.el

[Miles Bader]

Index: emacs/lisp/play/solitaire.el
diff -c emacs/lisp/play/solitaire.el:1.11 emacs/lisp/play/solitaire.el:1.12
*** emacs/lisp/play/solitaire.el:1.11   Sun Jan 12 15:50:32 2003
--- emacs/lisp/play/solitaire.el        Tue Feb  4 08:20:41 2003
***************
*** 76,84 ****
    (define-key solitaire-mode-map [kp-5] 'solitaire-center-point)
  
    (define-key solitaire-mode-map [S-kp-6] 'solitaire-move-right)
!   (define-key solitaire-mode-map [S-kp-4] 'solitaire-move-left) 
!   (define-key solitaire-mode-map [S-kp-8] 'solitaire-move-up)   
!   (define-key solitaire-mode-map [S-kp-2] 'solitaire-move-down) 
  
    (define-key solitaire-mode-map [kp-enter] 'solitaire-move)
    (define-key solitaire-mode-map [kp-0] 'solitaire-undo)
--- 76,84 ----
    (define-key solitaire-mode-map [kp-5] 'solitaire-center-point)
  
    (define-key solitaire-mode-map [S-kp-6] 'solitaire-move-right)
!   (define-key solitaire-mode-map [S-kp-4] 'solitaire-move-left)
!   (define-key solitaire-mode-map [S-kp-8] 'solitaire-move-up)
!   (define-key solitaire-mode-map [S-kp-2] 'solitaire-move-down)
  
    (define-key solitaire-mode-map [kp-enter] 'solitaire-move)
    (define-key solitaire-mode-map [kp-0] 'solitaire-undo)
***************
*** 154,175 ****
  its origin seems to be northern Africa.  Here's how to play:
  Initially, the board will look similar to this:
  
!       Le Solitaire             
!       ============             
!       
!               o   o   o        
!       
!               o   o   o        
!       
        o   o   o   o   o   o   o
!       
        o   o   o   .   o   o   o
!       
        o   o   o   o   o   o   o
!       
!               o   o   o        
!       
!               o   o   o        
  
  Let's call the o's stones and the .'s holes.  One stone fits into one
  hole.  As you can see, all holes but one are occupied by stones.  The
--- 154,175 ----
  its origin seems to be northern Africa.  Here's how to play:
  Initially, the board will look similar to this:
  
!       Le Solitaire
!       ============
! 
!               o   o   o
! 
!               o   o   o
! 
        o   o   o   o   o   o   o
! 
        o   o   o   .   o   o   o
! 
        o   o   o   o   o   o   o
! 
!               o   o   o
! 
!               o   o   o
  
  Let's call the o's stones and the .'s holes.  One stone fits into one
  hole.  As you can see, all holes but one are occupied by stones.  The
***************
*** 186,203 ****
  
  That's all.  Here's the board after two moves:
  
!               o   o   o        
!       
!               .   o   o        
!       
        o   o   .   o   o   o   o
!       
        o   .   o   o   o   o   o
!       
        o   o   o   o   o   o   o
!       
!               o   o   o        
!       
                o   o   o
  
  Pick your favourite shortcuts:
--- 186,203 ----
  
  That's all.  Here's the board after two moves:
  
!               o   o   o
! 
!               .   o   o
! 
        o   o   .   o   o   o   o
! 
        o   .   o   o   o   o   o
! 
        o   o   o   o   o   o   o
! 
!               o   o   o
! 
                o   o   o
  
  Pick your favourite shortcuts:
***************
*** 312,318 ****
                (not (eolp))))
      (if (or (= 0 (following-char))
            (= ?\  (following-char))
!           (= ?\n (following-char)))   
        (goto-char start))))
  
  (defun solitaire-center-point ()
--- 312,318 ----
                (not (eolp))))
      (if (or (= 0 (following-char))
            (= ?\  (following-char))
!           (= ?\n (following-char)))
        (goto-char start))))
  
  (defun solitaire-center-point ()
***************
*** 354,360 ****
        (error class)
        (let ((start (car class))
            (skip (car (cdr class)))
!           (target (car (cdr (cdr class)))))   
        (goto-char start)
        (delete-char 1)
        (insert ?.)
--- 354,360 ----
        (error class)
        (let ((start (car class))
            (skip (car (cdr class)))
!           (target (car (cdr (cdr class)))))
        (goto-char start)
        (delete-char 1)
        (insert ?.)
***************
*** 385,391 ****
                   (<= (solitaire-current-line) solitaire-end-y)
                   (setq count (1+ count))))
            count)))
!   (solitaire-build-modeline)  
    (if solitaire-auto-eval (solitaire-do-check)))
  
  (defun solitaire-check ()
--- 385,391 ----
                   (<= (solitaire-current-line) solitaire-end-y)
                   (setq count (1+ count))))
            count)))
!   (solitaire-build-modeline)
    (if solitaire-auto-eval (solitaire-do-check)))
  
  (defun solitaire-check ()