(texinfo-make-menu): Make region-end a marker.

[gnu-emacs] / lisp / forms.el

diff --git a/lisp/forms.el b/lisp/forms.el
index 669d188337a4b77f667cbbdefac279c183965017..df683ae13639aa936ea8aedee5c27ed60b9bb0be 100644 (file)
--- a/lisp/forms.el
+++ b/lisp/forms.el
@@ -296,10 +296,10 @@
 (provide 'forms)                       ;;; official
 (provide 'forms-mode)                  ;;; for compatibility
 
-(defconst forms-version (substring "$Revision: 2.31 $" 11 -2)
+(defconst forms-version (substring "$Revision: 2.36 $" 11 -2)
   "The version number of forms-mode (as string).  The complete RCS id is:
 
-  $Id: forms.el,v 2.31 1997/06/11 21:07:22 rms Exp rms $")
+  $Id: forms.el,v 2.36 1998/10/06 23:19:46 kwzh Exp rms $")
 
 (defcustom forms-mode-hooks nil
   "Hook functions to be run upon entering Forms mode."
@@ -327,11 +327,9 @@
 (defvar forms-field-sep "\t"
   "Field separator character (default TAB).")
 
-(defcustom forms-read-only nil
-  "*Non-nil means: visit the file in view (read-only) mode.
-\(Default is to allow write access on the data file)."
-  :group 'forms
-  :type 'boolean)
+(defvar forms-read-only nil
+  "Non-nil means: visit the file in view (read-only) mode.
+This is set automatically if the file permissions don't let you write it.")
 
 (defvar forms-multi-line "\C-k" "\
 If not nil: use this character to separate multi-line fields (default C-k).")
@@ -448,19 +446,19 @@ Also, initial position is at last record."
 
 Commands:                        Equivalent keys in read-only mode:
  TAB            forms-next-field          TAB
- \\C-c TAB       forms-next-field          
- \\C-c <         forms-first-record         <
- \\C-c >         forms-last-record          >
- \\C-c ?         describe-mode              ?
- \\C-c \\C-k      forms-delete-record
- \\C-c \\C-q      forms-toggle-read-only     q
- \\C-c \\C-o      forms-insert-record
- \\C-c \\C-l      forms-jump-record          l
- \\C-c \\C-n      forms-next-record          n
- \\C-c \\C-p      forms-prev-record          p
- \\C-c \\C-r      forms-search-reverse       r
- \\C-c \\C-s      forms-search-forward       s
- \\C-c \\C-x      forms-exit                 x
+ C-c TAB        forms-next-field          
+ C-c <          forms-first-record         <
+ C-c >          forms-last-record          >
+ C-c ?          describe-mode              ?
+ C-c C-k        forms-delete-record
+ C-c C-q        forms-toggle-read-only     q
+ C-c C-o        forms-insert-record
+ C-c C-l        forms-jump-record          l
+ C-c C-n        forms-next-record          n
+ C-c C-p        forms-prev-record          p
+ C-c C-r        forms-search-reverse       r
+ C-c C-s        forms-search-forward       s
+ C-c C-x        forms-exit                 x
 "
   (interactive)
 
@@ -591,7 +589,7 @@ Commands:                        Equivalent keys in read-only mode:
        ;; Dynamic text support.
        (make-local-variable 'forms--dynamic-text)
 
-       ;; Prevent accidental overwrite of the control file and autosave.
+       ;; Prevent accidental overwrite of the control file and auto-save.
        (set-visited-file-name nil)
 
        ;; Prepare this buffer for further processing.
@@ -1547,7 +1545,8 @@ Commands:                        Equivalent keys in read-only mode:
   (set-buffer-modified-p nil)
   (setq buffer-read-only forms-read-only)
   (setq mode-line-process
-       (concat " " forms--current-record "/" forms--total-records)))
+       (concat " " (int-to-string forms--current-record)
+               "/" (int-to-string forms--total-records))))
 
 (defun forms--parse-form ()
   "Parse contents of form into list of strings."
@@ -2003,6 +2002,7 @@ after writing out the data."
   (interactive)
   (let ((inhibit-read-only t)
        (save-record forms--current-record)
+       (total-nb-records forms--total-records)
        (nb-record 1)
        (record nil))
     (while (<= nb-record forms--total-records)
@@ -2013,7 +2013,7 @@ after writing out the data."
        (goto-char (buffer-end 1))
        (insert record)
        (setq buffer-read-only nil)
-       (if (< nb-record forms--total-records)
+       (if (< nb-record total-nb-records)
            (insert "\n\f\n")))
       (setq nb-record (1+ nb-record)))
     (save-excursion