Merge from origin/emacs-25

[gnu-emacs] / lisp / forms.el

diff --git a/lisp/forms.el b/lisp/forms.el
index 22ddd65c0a41531bb7f2c2ffde2905ee0eb36ca4..c141188788b533829b2e31b347c1b36002769d59 100644 (file)
--- a/lisp/forms.el
+++ b/lisp/forms.el
@@ -1,6 +1,6 @@
 ;;; forms.el --- Forms mode: edit a file as a form to fill in
 
-;; Copyright (C) 1991, 1994-1997, 2001-2015 Free Software Foundation,
+;; Copyright (C) 1991, 1994-1997, 2001-2016 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Johan Vromans <jvromans@squirrel.nl>
@@ -297,9 +297,6 @@
 
 ;;; Global variables and constants:
 
-(provide 'forms)                       ;;; official
-(provide 'forms-mode)                  ;;; for compatibility
-
 (defcustom forms-mode-hook nil
   "Hook run upon entering Forms mode."
   :group 'forms
@@ -443,6 +440,7 @@ Also, initial position is at last record."
 
 ;;;###autoload
 (defun forms-mode (&optional primary)
+  ;; FIXME: use define-derived-mode
   "Major mode to visit files in a field-structured manner using a form.
 
 Commands:                        Equivalent keys in read-only mode:
@@ -637,6 +635,8 @@ Commands:                        Equivalent keys in read-only mode:
   (setq major-mode 'forms-mode)
   (setq mode-name "Forms")
 
+  (cursor-intangible-mode 1)
+
   ;; find the data file
   (setq forms--file-buffer (find-file-noselect forms-file))
 
@@ -647,7 +647,7 @@ Commands:                        Equivalent keys in read-only mode:
        (with-current-buffer forms--file-buffer
          (let ((inhibit-read-only t)
                (file-modified (buffer-modified-p)))
-           (run-hooks 'read-file-filter)
+           (mapc #'funcall read-file-filter)
            (if (not file-modified) (set-buffer-modified-p nil)))
          (if write-file-filter
              (add-hook 'write-file-functions write-file-filter nil t)))
@@ -692,10 +692,12 @@ Commands:                        Equivalent keys in read-only mode:
        (insert
         "GNU Emacs Forms Mode\n\n"
         (if (file-exists-p forms-file)
-            (concat "No records available in file `" forms-file "'\n\n")
-          (format "Creating new file `%s'\nwith %d field%s per record\n\n"
-                  forms-file forms-number-of-fields
-                  (if (= 1 forms-number-of-fields) "" "s")))
+            (format-message
+             "No records available in file `%s'\n\n" forms-file)
+          (format-message
+           "Creating new file `%s'\nwith %d field%s per record\n\n"
+           forms-file forms-number-of-fields
+           (if (= 1 forms-number-of-fields) "" "s")))
         "Use " (substitute-command-keys "\\[forms-insert-record]")
         " to create new records.\n")
        (setq forms--current-record 1)
@@ -921,7 +923,7 @@ Commands:                        Equivalent keys in read-only mode:
              ,@(if (numberp (car forms-format-list))
                    nil
                  '((add-text-properties (point-min) (1+ (point-min))
-                                        '(front-sticky (read-only intangible)))))
+                                        '(front-sticky (read-only cursor-intangible)))))
              ;; Prevent insertion after the last text.
              (remove-text-properties (1- (point)) (point)
                                      '(rear-nonsticky)))
@@ -1005,10 +1007,10 @@ Commands:                        Equivalent keys in read-only mode:
         (point))
        (list 'face forms--ro-face      ; read-only appearance
             'read-only ,@(list (1+ forms--marker))
-            'intangible ,@(list (1+ forms--marker))
+            'cursor-intangible ,@(list (1+ forms--marker))
             'insert-in-front-hooks '(forms--iif-hook)
             'rear-nonsticky '(face read-only insert-in-front-hooks
-                                   intangible)))))
+                                   cursor-intangible)))))
 
    ((numberp el)
     `((let ((here (point)))
@@ -1034,10 +1036,10 @@ Commands:                        Equivalent keys in read-only mode:
         (point))
        (list 'face forms--ro-face
             'read-only ,@(list (1+ forms--marker))
-            'intangible ,@(list (1+ forms--marker))
+            'cursor-intangible ,@(list (1+ forms--marker))
             'insert-in-front-hooks '(forms--iif-hook)
             'rear-nonsticky '(read-only face insert-in-front-hooks
-                                        intangible)))))
+                                        cursor-intangible)))))
 
    ;; end of cond
    ))
@@ -1755,7 +1757,7 @@ Otherwise enables edit mode if the visited file is writable."
 With ARG: store the record after the current one.
 If `forms-new-record-filter' contains the name of a function,
 it is called to fill (some of) the fields with default values.
-If `forms-insert-after is non-nil, the default behavior is to insert
+If `forms-insert-after' is non-nil, the default behavior is to insert
 after the current record."
 
   (interactive "P")
@@ -2055,4 +2057,6 @@ Usage: (setq forms-number-of-fields
          (goto-char (point-max))
          (insert ret)))))
 
+(provide 'forms-mode)                  ; for compatibility
+(provide 'forms)
 ;;; forms.el ends here