Merge from emacs-23

[gnu-emacs] / lisp / forms.el

diff --git a/lisp/forms.el b/lisp/forms.el
index 5e4c4f84c14b9a8b1d0147e5f79dc301d311f88c..1d5cc9f4197af1391797929360ae100e027b55a4 100644 (file)
--- a/lisp/forms.el
+++ b/lisp/forms.el
@@ -1,7 +1,7 @@
 ;;; forms.el --- Forms mode: edit a file as a form to fill in
 
 ;; Copyright (C) 1991, 1994, 1995, 1996, 1997, 2001, 2002, 2003,
-;;   2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 ;; Author: Johan Vromans <jvromans@squirrel.nl>
 
@@ -319,7 +319,7 @@
 ;;; Optional variables with default values.
 
 (defcustom forms-check-number-of-fields t
-  "*If non-nil, warn about records with wrong number of fields."
+  "If non-nil, warn about records with wrong number of fields."
   :group 'forms
   :type 'boolean)
 
@@ -334,13 +334,13 @@ This is set automatically if the file permissions don't let you write it.")
 If not nil: use this character to separate multi-line fields (default C-k).")
 
 (defcustom forms-forms-scroll nil
-  "*Non-nil means replace scroll-up/down commands in Forms mode.
+  "Non-nil means replace scroll-up/down commands in Forms mode.
 The replacement commands performs forms-next/prev-record."
   :group 'forms
   :type 'boolean)
 
 (defcustom forms-forms-jump nil
-  "*Non-nil means redefine beginning/end-of-buffer in Forms mode.
+  "Non-nil means redefine beginning/end-of-buffer in Forms mode.
 The replacement commands performs forms-first/last-record."
   :group 'forms
   :type 'boolean)
@@ -366,13 +366,13 @@ This variable is for use by the filter routines only.
 The contents may NOT be modified.")
 
 (defcustom forms-use-text-properties t
-  "*Non-nil means: use text properties.
+  "Non-nil means: use text properties.
 Defaults to t if this Emacs is capable of handling text properties."
   :group 'forms
   :type 'boolean)
 
 (defcustom forms-insert-after nil
-  "*Non-nil means: inserts of new records go after current record.
+  "Non-nil means: inserts of new records go after current record.
 Also, initial position is at last record."
   :group 'forms
   :type 'boolean)
@@ -1407,7 +1407,9 @@ Commands:                        Equivalent keys in read-only mode:
   (if forms-forms-scroll
       (progn
        (local-set-key [remap scroll-up] 'forms-next-record)
-       (local-set-key [remap scroll-down] 'forms-prev-record)))
+       (local-set-key [remap scroll-down] 'forms-prev-record)
+       (local-set-key [remap scroll-up-command] 'forms-next-record)
+       (local-set-key [remap scroll-down-command] 'forms-prev-record)))
   ;;
   ;; beginning-of-buffer -> forms-first-record
   ;; end-of-buffer -> forms-end-record