HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* emacs-lisp/package.el (package-untar-buffer): Handle problematic tarfile content...
[bpt/emacs.git]
/
lisp
/
forms.el
diff --git
a/lisp/forms.el
b/lisp/forms.el
index
1d5cc9f
..
4626b28
100644
(file)
--- a/
lisp/forms.el
+++ b/
lisp/forms.el
@@
-1,7
+1,6
@@
;;; forms.el --- Forms mode: edit a file as a form to fill in
;;; 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, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1991, 1994-1997, 2001-2012 Free Software Foundation, Inc.
;; Author: Johan Vromans <jvromans@squirrel.nl>
;; Author: Johan Vromans <jvromans@squirrel.nl>
@@
-22,7
+21,7
@@
;;; Commentary:
;;; Commentary:
-;; Visit a file using a form. See
forms-d2.el
for examples.
+;; Visit a file using a form. See
etc/forms
for examples.
;;
;; === Naming conventions
;;
;;
;; === Naming conventions
;;
@@
-582,7
+581,7
@@
Commands: Equivalent keys in read-only mode:
(error (concat "Forms control file error: "
"`forms-modified-record-filter' is not a function")))
(error (concat "Forms control file error: "
"`forms-modified-record-filter' is not a function")))
- ;; The filters acces the contents of the forms using `forms-fields'.
+ ;; The filters acces
s
the contents of the forms using `forms-fields'.
(make-local-variable 'forms-fields)
;; Dynamic text support.
(make-local-variable 'forms-fields)
;; Dynamic text support.
@@
-670,7
+669,7
@@
Commands: Equivalent keys in read-only mode:
;;(message "forms: proceeding setup...")
;;(message "forms: proceeding setup...")
- ;; Since we aren't really implementing a minor mode, we hack the modeline
+ ;; Since we aren't really implementing a minor mode, we hack the mode
line
;; directly to get the text " View " into forms-read-only form buffers. For
;; that reason, this variable must be buffer only.
(make-local-variable 'minor-mode-alist)
;; directly to get the text " View " into forms-read-only form buffers. For
;; that reason, this variable must be buffer only.
(make-local-variable 'minor-mode-alist)
@@
-710,7
+709,7
@@
Commands: Equivalent keys in read-only mode:
(forms-first-record))
)
(forms-first-record))
)
- ;; user customi
s
ing
+ ;; user customi
z
ing
;;(message "forms: proceeding setup (user hooks)...")
(run-mode-hooks 'forms-mode-hook 'forms-mode-hooks)
;;(message "forms: setting up... done.")
;;(message "forms: proceeding setup (user hooks)...")
(run-mode-hooks 'forms-mode-hook 'forms-mode-hooks)
;;(message "forms: setting up... done.")
@@
-846,7
+845,7
@@
Commands: Equivalent keys in read-only mode:
(defvar forms--iif-properties nil
"Original properties of the character being overridden.")
(defvar forms--iif-properties nil
"Original properties of the character being overridden.")
-(defun forms--iif-hook (
begin
end)
+(defun forms--iif-hook (
_begin _
end)
"`insert-in-front-hooks' function for read-only segments."
;; Note start location. By making it a marker that points one
"`insert-in-front-hooks' function for read-only segments."
;; Note start location. By making it a marker that points one
@@
-1198,6
+1197,8
@@
Commands: Equivalent keys in read-only mode:
(setq forms--field nil)))
))
\f
(setq forms--field nil)))
))
\f
+(defvar read-file-filter) ; bound in forms--intuit-from-file
+
(defun forms--intuit-from-file ()
"Get number of fields and a default form using the data file."
(defun forms--intuit-from-file ()
"Get number of fields and a default form using the data file."
@@
-1294,7
+1295,7
@@
Commands: Equivalent keys in read-only mode:
)
(defun forms--mode-menu-ro (map)
)
(defun forms--mode-menu-ro (map)
-;;; Menu initiali
s
ation
+;;; Menu initiali
z
ation
; (define-key map [menu-bar] (make-sparse-keymap))
(define-key map [menu-bar forms]
(cons "Forms" (make-sparse-keymap "Forms")))
; (define-key map [menu-bar] (make-sparse-keymap))
(define-key map [menu-bar forms]
(cons "Forms" (make-sparse-keymap "Forms")))
@@
-1340,7
+1341,7
@@
Commands: Equivalent keys in read-only mode:
(put 'forms-delete-record 'menu-enable '(not forms-read-only))
)
(defun forms--mode-menu-edit (map)
(put 'forms-delete-record 'menu-enable '(not forms-read-only))
)
(defun forms--mode-menu-edit (map)
-;;; Menu initiali
s
ation
+;;; Menu initiali
z
ation
; (define-key map [menu-bar] (make-sparse-keymap))
(define-key map [menu-bar forms]
(cons "Forms" (make-sparse-keymap "Forms")))
; (define-key map [menu-bar] (make-sparse-keymap))
(define-key map [menu-bar forms]
(cons "Forms" (make-sparse-keymap "Forms")))
@@
-1920,7
+1921,7
@@
after writing out the data."
(forms-jump-record cur))
t)
(forms-jump-record cur))
t)
-(defun forms--revert-buffer (&optional arg noconfirm)
+(defun forms--revert-buffer (&optional
_
arg noconfirm)
"Reverts current form to un-modified."
(interactive "P")
(if (or noconfirm
"Reverts current form to un-modified."
(interactive "P")
(if (or noconfirm
@@
-2029,8
+2030,10
@@
Usage: (setq forms-number-of-fields
\f
;;; Debugging
\f
;;; Debugging
-(defvar forms--debug nil
- "*Enables forms-mode debugging if not nil.")
+(defcustom forms--debug nil
+ "If non-nil, enable Forms mode debugging."
+ :type 'boolean
+ :group 'forms)
(defun forms--debug (&rest args)
"Internal debugging routine."
(defun forms--debug (&rest args)
"Internal debugging routine."
@@
-2055,5
+2058,4
@@
Usage: (setq forms-number-of-fields
(goto-char (point-max))
(insert ret)))))
(goto-char (point-max))
(insert ret)))))
-;; arch-tag: 4a6695c7-d47a-4a21-809b-5cec7f8ec7a1
;;; forms.el ends here
;;; forms.el ends here