Merge from emacs-23

[gnu-emacs] / lisp / emulation / crisp.el

diff --git a/lisp/emulation/crisp.el b/lisp/emulation/crisp.el
index 09e48b0a4c162009b22f3b7a5f13cb6ce54aa17b..f3145227dfa148048d36e2e6aaa841a7c73ec811 100644 (file)
--- a/lisp/emulation/crisp.el
+++ b/lisp/emulation/crisp.el
@@ -175,7 +175,7 @@ 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."
+  "String to display in the modeline when CRiSP emulation mode is enabled."
   :type 'string
   :group 'crisp)
 
@@ -195,7 +195,7 @@ use either M-x customize or the function `crisp-mode'."
   :group 'crisp)
 
 (defcustom crisp-override-meta-x t
-  "*Controls overriding the normal Emacs M-x key binding in the CRiSP emulator.
+  "Controls overriding the normal Emacs M-x key binding in the CRiSP emulator.
 Normally the CRiSP emulator rebinds M-x to `save-buffers-exit-emacs', and
 provides the usual M-x functionality on the F10 key.  If this variable
 is non-nil, M-x will exit Emacs."