Merge from emacs-23

[gnu-emacs] / lisp / textmodes / enriched.el

diff --git a/lisp/textmodes/enriched.el b/lisp/textmodes/enriched.el
index 308e6fc0d2660c4e59a6cd26a32f813e52d4bfbf..1e46d9453f729c09d7f108b430d52d59f6d82dee 100644 (file)
--- a/lisp/textmodes/enriched.el
+++ b/lisp/textmodes/enriched.el
@@ -1,7 +1,7 @@
 ;;; enriched.el --- read and save files in text/enriched format
 
 ;; Copyright (C) 1994, 1995, 1996, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;;   2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 ;; Author: Boris Goldowsky <boris@gnu.org>
 ;; Keywords: wp, faces
@@ -50,7 +50,7 @@
   :group 'wp)
 
 (defcustom enriched-verbose t
-  "*If non-nil, give status messages when reading and writing files."
+  "If non-nil, give status messages when reading and writing files."
   :type 'boolean
   :group 'enriched)
 
@@ -251,9 +251,10 @@ Commands:
          (cons (cons 'enriched-mode enriched-mode-map)
                minor-mode-map-alist)))
 
-(define-key enriched-mode-map "\C-a" 'beginning-of-line-text)
+(define-key enriched-mode-map [remap move-beginning-of-line] 'beginning-of-line-text)
 (define-key enriched-mode-map "\C-m" 'reindent-then-newline-and-indent)
-(define-key enriched-mode-map "\C-j" 'reindent-then-newline-and-indent)
+(define-key enriched-mode-map
+  [remap newline-and-indent] 'reindent-then-newline-and-indent)
 (define-key enriched-mode-map "\M-j" 'facemenu-justification-menu)
 (define-key enriched-mode-map "\M-S" 'set-justification-center)
 (define-key enriched-mode-map "\C-x\t" 'increase-left-margin)