Replace version 24.2 with 24.3 where appropriate (hopefully)

[bpt/emacs.git] / lisp / emulation / crisp.el

diff --git a/lisp/emulation/crisp.el b/lisp/emulation/crisp.el
index b2806e8..c9822b7 100644 (file)
--- a/lisp/emulation/crisp.el
+++ b/lisp/emulation/crisp.el
@@ -1,6 +1,6 @@
 ;;; crisp.el --- CRiSP/Brief Emacs emulator
 
 ;;; crisp.el --- CRiSP/Brief Emacs emulator
 

-;; Copyright (C) 1997-1999, 2001-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1997-1999, 2001-2012  Free Software Foundation, Inc.

 
 ;; Author: Gary D. Foster <Gary.Foster@Corp.Sun.COM>
 ;; Keywords: emulations brief crisp
 
 ;; Author: Gary D. Foster <Gary.Foster@Corp.Sun.COM>
 ;; Keywords: emulations brief crisp


@@ -34,7 +34,7 @@
 ;; you put (setq crisp-load-scroll-all t) in your .emacs before
 ;; loading this package.  If this feature is enabled, it will bind
 ;; meta-f1 to the scroll-all mode toggle.  The scroll-all package
 ;; you put (setq crisp-load-scroll-all t) in your .emacs before
 ;; loading this package.  If this feature is enabled, it will bind
 ;; meta-f1 to the scroll-all mode toggle.  The scroll-all package

-;; duplicates the scroll-alling feature in CRiSP.
+;; duplicates the scroll-all feature in CRiSP.

 
 ;; Also, the default keybindings for brief/CRiSP override the M-x
 ;; key to exit the editor.  If you don't like this functionality, you
 
 ;; Also, the default keybindings for brief/CRiSP override the M-x
 ;; key to exit the editor.  If you don't like this functionality, you


@@ -44,9 +44,9 @@
 ;; by default run `save-buffers-kill-emacs' instead of the command
 ;; `execute-extended-command'.
 
 ;; by default run `save-buffers-kill-emacs' instead of the command
 ;; `execute-extended-command'.
 

-;; Finally, if you want to change the string displayed in the modeline
-;; when this mode is in effect, override the definition of
-;; `crisp-mode-modeline-string' in your .emacs.  The default value is
+;; Finally, if you want to change the string displayed in the mode
+;; line when this mode is in effect, override the definition of
+;; `crisp-mode-mode-line-string' in your .emacs.  The default value is

 ;; " *Crisp*" which may be a bit lengthy if you have a lot of things
 ;; being displayed there.
 
 ;; " *Crisp*" which may be a bit lengthy if you have a lot of things
 ;; being displayed there.
 


@@ -54,8 +54,6 @@
 
 ;;; Code:
 
 
 ;;; Code:
 

-(eval-when-compile (require 'cl))
-

 ;; local variables
 
 (defgroup crisp nil
 ;; local variables
 
 (defgroup crisp nil


@@ -71,8 +69,8 @@
     (define-key map [(f2) (left)]    'shrink-window-horizontally)
     (define-key map [(f2) (right)]   'enlarge-window-horizontally)
     (define-key map [(f2) (up)]      'shrink-window)
     (define-key map [(f2) (left)]    'shrink-window-horizontally)
     (define-key map [(f2) (right)]   'enlarge-window-horizontally)
     (define-key map [(f2) (up)]      'shrink-window)

-    (define-key map [(f3) (down)]    'split-window-vertically)
-    (define-key map [(f3) (right)]   'split-window-horizontally)
+    (define-key map [(f3) (down)]    'split-window-below)
+    (define-key map [(f3) (right)]   'split-window-right)

 
     (define-key map [(f4)]           'delete-window)
     (define-key map [(control f4)]   'delete-other-windows)
 
     (define-key map [(f4)]           'delete-window)
     (define-key map [(control f4)]   'delete-other-windows)


@@ -173,11 +171,14 @@
 All the bindings are done here instead of globally to try and be
 nice to the world.")
 
 All the bindings are done here instead of globally to try and be
 nice to the world.")
 

-(defcustom crisp-mode-modeline-string " *CRiSP*"
-  "String to display in the modeline when CRiSP emulation mode is enabled."
+(defcustom crisp-mode-mode-line-string " *CRiSP*"
+  "String to display in the mode line when CRiSP emulation mode is enabled."

   :type 'string
   :group 'crisp)
 
   :type 'string
   :group 'crisp)
 

+(define-obsolete-variable-alias 'crisp-mode-modeline-string
+  'crisp-mode-mode-line-string "24.3")
+

 ;;;###autoload
 (defcustom crisp-mode nil
   "Track status of CRiSP emulation mode.
 ;;;###autoload
 (defcustom crisp-mode nil
   "Track status of CRiSP emulation mode.


@@ -349,14 +350,16 @@ normal CRiSP binding) and when it is nil M-x will run
 
 ;;;###autoload
 (define-minor-mode crisp-mode
 
 ;;;###autoload
 (define-minor-mode crisp-mode

-  "Toggle CRiSP/Brief emulation minor mode.
-With ARG, turn CRiSP mode on if ARG is positive, off otherwise."
+  "Toggle CRiSP/Brief emulation (CRiSP mode).
+With a prefix argument ARG, enable CRiSP mode if ARG is positive,
+and disable it otherwise.  If called from Lisp, enable the mode
+if ARG is omitted or nil."

   :keymap crisp-mode-map
   :keymap crisp-mode-map

-  :lighter crisp-mode-modeline-string
+  :lighter crisp-mode-mode-line-string

   (when crisp-mode
     ;; Make menu entries show M-u or f14 in preference to C-x u.
     (put 'undo :advertised-binding
   (when crisp-mode
     ;; Make menu entries show M-u or f14 in preference to C-x u.
     (put 'undo :advertised-binding

-         (list* [?\M-u] [f14] (get 'undo :advertised-binding)))
+         `([?\M-u] [f14] ,@(get 'undo :advertised-binding)))

     ;; Force transient-mark-mode, so that the marking routines work as
     ;; expected.  If the user turns off transient mark mode, most
     ;; things will still work fine except the crisp-(copy|kill)
     ;; Force transient-mark-mode, so that the marking routines work as
     ;; expected.  If the user turns off transient mark mode, most
     ;; things will still work fine except the crisp-(copy|kill)