[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/progmodes/dcl-mode.el
|
From: |
Juanma Barranquero |
|
Subject: |
[Emacs-diffs] Changes to emacs/lisp/progmodes/dcl-mode.el |
|
Date: |
Tue, 04 Feb 2003 08:24:41 -0500 |
Index: emacs/lisp/progmodes/dcl-mode.el
diff -c emacs/lisp/progmodes/dcl-mode.el:1.9
emacs/lisp/progmodes/dcl-mode.el:1.10
*** emacs/lisp/progmodes/dcl-mode.el:1.9 Fri Aug 30 07:02:54 2002
--- emacs/lisp/progmodes/dcl-mode.el Tue Feb 4 08:24:34 2003
***************
*** 31,40 ****
;;
;; Type `C-h m' when you are editing a .COM file to get more
;; information about this mode.
! ;;
;; To use templates you will need a version of tempo.el that is at
;; least later than the buggy 1.1.1, which was included with my versions of
! ;; Emacs. I used version 1.2.4.
;; The latest tempo.el distribution can be fetched from
;; ftp.lysator.liu.se in the directory /pub/emacs.
;; I recommend setting (setq tempo-interactive t). This will make
--- 31,40 ----
;;
;; Type `C-h m' when you are editing a .COM file to get more
;; information about this mode.
! ;;
;; To use templates you will need a version of tempo.el that is at
;; least later than the buggy 1.1.1, which was included with my versions of
! ;; Emacs. I used version 1.2.4.
;; The latest tempo.el distribution can be fetched from
;; ftp.lysator.liu.se in the directory /pub/emacs.
;; I recommend setting (setq tempo-interactive t). This will make
***************
*** 47,54 ****
;;
;; Any feedback will be welcomed. If you write functions for
;; dcl-calc-command-indent-function or dcl-calc-cont-indent-function,
! ;; please send them to the maintainer.
! ;;
;;
;; Ideas for improvement:
;; * Change meaning of `left margin' when dcl-tab-always-indent is nil.
--- 47,54 ----
;;
;; Any feedback will be welcomed. If you write functions for
;; dcl-calc-command-indent-function or dcl-calc-cont-indent-function,
! ;; please send them to the maintainer.
! ;;
;;
;; Ideas for improvement:
;; * Change meaning of `left margin' when dcl-tab-always-indent is nil.
***************
*** 98,104 ****
(defcustom dcl-margin-offset 8
"*Indentation for the first command line in DCL.
! The first command line in a file or after a SUBROUTINE statement is indented
this much. Other command lines are indented the same number of columns as
the preceding command line.
A command line is a line that starts with `$'."
--- 98,104 ----
(defcustom dcl-margin-offset 8
"*Indentation for the first command line in DCL.
! The first command line in a file or after a SUBROUTINE statement is indented
this much. Other command lines are indented the same number of columns as
the preceding command line.
A command line is a line that starts with `$'."
***************
*** 137,147 ****
(defcustom dcl-calc-command-indent-function nil
"*Function to calculate indentation for a command line in DCL.
! If this variable is non-nil it is called as a function:
\(func INDENT-TYPE CUR-INDENT EXTRA-INDENT LAST-POINT THIS-POINT)
! The function must return the number of columns to indent the current line or
nil to get the default indentation.
INDENT-TYPE is a symbol indicating what kind of indentation should be done.
--- 137,147 ----
(defcustom dcl-calc-command-indent-function nil
"*Function to calculate indentation for a command line in DCL.
! If this variable is non-nil it is called as a function:
\(func INDENT-TYPE CUR-INDENT EXTRA-INDENT LAST-POINT THIS-POINT)
! The function must return the number of columns to indent the current line or
nil to get the default indentation.
INDENT-TYPE is a symbol indicating what kind of indentation should be done.
***************
*** 150,163 ****
outdent the lines indentation should be decreased, e.g a line with
ENDIF.
first-line indentation for the first line in a buffer or SUBROUTINE.
CUR-INDENT is the indentation of the preceding command line.
! EXTRA-INDENT is the default change in indentation for this line
\(a negative number for 'outdent).
LAST-POINT is the buffer position of the first significant word on the
previous line or nil if the current line is the first line.
THIS-POINT is the buffer position of the first significant word on the
current line.
! If this variable is nil, the indentation is calculated as
CUR-INDENT + EXTRA-INDENT.
This package includes two functions suitable for this:
--- 150,163 ----
outdent the lines indentation should be decreased, e.g a line with
ENDIF.
first-line indentation for the first line in a buffer or SUBROUTINE.
CUR-INDENT is the indentation of the preceding command line.
! EXTRA-INDENT is the default change in indentation for this line
\(a negative number for 'outdent).
LAST-POINT is the buffer position of the first significant word on the
previous line or nil if the current line is the first line.
THIS-POINT is the buffer position of the first significant word on the
current line.
! If this variable is nil, the indentation is calculated as
CUR-INDENT + EXTRA-INDENT.
This package includes two functions suitable for this:
***************
*** 169,182 ****
(defcustom dcl-calc-cont-indent-function 'dcl-calc-cont-indent-relative
"*Function to calculate indentation for a continuation line.
! If this variable is non-nil it is called as a function:
\(func CUR-INDENT EXTRA-INDENT)
! The function must return the number of columns to indent the current line or
nil to get the default indentation.
! If this variable is nil, the indentation is calculated as
CUR-INDENT + EXTRA-INDENT.
This package includes one function suitable for this:
--- 169,182 ----
(defcustom dcl-calc-cont-indent-function 'dcl-calc-cont-indent-relative
"*Function to calculate indentation for a continuation line.
! If this variable is non-nil it is called as a function:
\(func CUR-INDENT EXTRA-INDENT)
! The function must return the number of columns to indent the current line or
nil to get the default indentation.
! If this variable is nil, the indentation is calculated as
CUR-INDENT + EXTRA-INDENT.
This package includes one function suitable for this:
***************
*** 189,195 ****
"*Controls the operation of the TAB key in DCL mode.
If t, pressing TAB always indents the current line.
If nil, pressing TAB indents the current line if point is at the left margin.
! Data lines (i.e. lines not part of a command line or continuation line) are
never indented."
:type 'boolean
:group 'dcl)
--- 189,195 ----
"*Controls the operation of the TAB key in DCL mode.
If t, pressing TAB always indents the current line.
If nil, pressing TAB indents the current line if point is at the left margin.
! Data lines (i.e. lines not part of a command line or continuation line) are
never indented."
:type 'boolean
:group 'dcl)
***************
*** 246,252 ****
"*Default imenu generic expression for DCL.
The default includes SUBROUTINE labels in the main listing and
! sub-listings for other labels, CALL, GOTO and GOSUB statements.
See `imenu-generic-expression' for details."
:type '(repeat (sexp :tag "Imenu Expression"))
:group 'dcl)
--- 246,252 ----
"*Default imenu generic expression for DCL.
The default includes SUBROUTINE labels in the main listing and
! sub-listings for other labels, CALL, GOTO and GOSUB statements.
See `imenu-generic-expression' for details."
:type '(repeat (sexp :tag "Imenu Expression"))
:group 'dcl)
***************
*** 270,276 ****
(modify-syntax-entry ?\n ">" dcl-mode-syntax-table) ; comment end
(modify-syntax-entry ?< "(>" dcl-mode-syntax-table) ; < and ...
(modify-syntax-entry ?> ")<" dcl-mode-syntax-table) ; > is a matching pair
! )
(defvar dcl-mode-map ()
--- 270,276 ----
(modify-syntax-entry ?\n ">" dcl-mode-syntax-table) ; comment end
(modify-syntax-entry ?< "(>" dcl-mode-syntax-table) ; < and ...
(modify-syntax-entry ?> ")<" dcl-mode-syntax-table) ; > is a matching pair
! )
(defvar dcl-mode-map ()
***************
*** 357,363 ****
:group 'dcl)
! (defcustom dcl-cmd-r
"^\\$\\(.*-[
\t]*\\(!.*\\)*\n\\)*[^!\"\n]*\\(\".*\\(\"\".*\\)*\"\\)*[^!\"\n]*"
"Regular expression describing a DCL command line up to a trailing comment.
A line starting with $, optionally followed by continuation lines,
--- 357,363 ----
:group 'dcl)
! (defcustom dcl-cmd-r
"^\\$\\(.*-[
\t]*\\(!.*\\)*\n\\)*[^!\"\n]*\\(\".*\\(\"\".*\\)*\"\\)*[^!\"\n]*"
"Regular expression describing a DCL command line up to a trailing comment.
A line starting with $, optionally followed by continuation lines,
***************
*** 368,374 ****
:group 'dcl)
! (defcustom dcl-command-regexp
"^\\$\\(.*-[ \t]*\\(!.*\\)*\n\\)*.*\\(\".*\\(\"\".*\\)*\"\\)*"
"Regular expression describing a DCL command line.
A line starting with $, optionally followed by continuation lines,
--- 368,374 ----
:group 'dcl)
! (defcustom dcl-command-regexp
"^\\$\\(.*-[ \t]*\\(!.*\\)*\n\\)*.*\\(\".*\\(\"\".*\\)*\"\\)*"
"Regular expression describing a DCL command line.
A line starting with $, optionally followed by continuation lines,
***************
*** 392,398 ****
:group 'dcl)
! (defvar dcl-option-alist
'((dcl-basic-offset dcl-option-value-basic)
(dcl-continuation-offset curval)
(dcl-margin-offset dcl-option-value-margin-offset)
--- 392,398 ----
:group 'dcl)
! (defvar dcl-option-alist
'((dcl-basic-offset dcl-option-value-basic)
(dcl-continuation-offset curval)
(dcl-margin-offset dcl-option-value-margin-offset)
***************
*** 400,411 ****
(dcl-comment-line-regexp dcl-option-value-comment-line)
(dcl-block-begin-regexp curval)
(dcl-block-end-regexp curval)
! (dcl-tab-always-indent toggle)
! (dcl-electric-characters toggle)
(dcl-electric-reindent-regexps curval)
! (dcl-tempo-comma curval)
! (dcl-tempo-left-paren curval)
! (dcl-tempo-right-paren curval)
(dcl-calc-command-indent-function curval)
(dcl-calc-cont-indent-function curval)
(comment-start curval)
--- 400,411 ----
(dcl-comment-line-regexp dcl-option-value-comment-line)
(dcl-block-begin-regexp curval)
(dcl-block-end-regexp curval)
! (dcl-tab-always-indent toggle)
! (dcl-electric-characters toggle)
(dcl-electric-reindent-regexps curval)
! (dcl-tempo-comma curval)
! (dcl-tempo-left-paren curval)
! (dcl-tempo-right-paren curval)
(dcl-calc-command-indent-function curval)
(dcl-calc-cont-indent-function curval)
(comment-start curval)
***************
*** 421,427 ****
toggle the opposite of the current value (for t/nil)")
! (defvar dcl-option-history
(mapcar (lambda (option-assoc)
(format "%s" (car option-assoc)))
dcl-option-alist)
--- 421,427 ----
toggle the opposite of the current value (for t/nil)")
! (defvar dcl-option-history
(mapcar (lambda (option-assoc)
(format "%s" (car option-assoc)))
dcl-option-alist)
***************
*** 443,449 ****
; "*Default imenu generic expression for DCL.
;The default includes SUBROUTINE labels in the main listing and
! ;sub-listings for other labels, CALL, GOTO and GOSUB statements.
;See `imenu-generic-expression' in a recent (e.g. Emacs 19.30) imenu.el
;for details.")
--- 443,449 ----
; "*Default imenu generic expression for DCL.
;The default includes SUBROUTINE labels in the main listing and
! ;sub-listings for other labels, CALL, GOTO and GOSUB statements.
;See `imenu-generic-expression' in a recent (e.g. Emacs 19.30) imenu.el
;for details.")
***************
*** 460,466 ****
dcl-block-end-regexp.)
Labels are indented to a fixed position unless they begin or end a block.
! Whole-line comments (matching dcl-comment-line-regexp) are not indented.
Data lines are not indented.
Key bindings:
--- 460,466 ----
dcl-block-end-regexp.)
Labels are indented to a fixed position unless they begin or end a block.
! Whole-line comments (matching dcl-comment-line-regexp) are not indented.
Data lines are not indented.
Key bindings:
***************
*** 488,494 ****
Indentation for a label.
dcl-comment-line-regexp
! Lines matching this regexp will not be indented.
dcl-block-begin-regexp
dcl-block-end-regexp
--- 488,494 ----
Indentation for a label.
dcl-comment-line-regexp
! Lines matching this regexp will not be indented.
dcl-block-begin-regexp
dcl-block-end-regexp
***************
*** 511,520 ****
dcl-tab-always-indent
If t, pressing TAB always indents the current line.
! If nil, pressing TAB indents the current line if point is at the left
margin.
! dcl-electric-characters
Non-nil causes lines to be indented at once when a label, ELSE or ENDIF is
typed.
--- 511,520 ----
dcl-tab-always-indent
If t, pressing TAB always indents the current line.
! If nil, pressing TAB indents the current line if point is at the left
margin.
! dcl-electric-characters
Non-nil causes lines to be indented at once when a label, ELSE or ENDIF is
typed.
***************
*** 530,536 ****
dcl-imenu-generic-expression
Default value for imenu-generic-expression. The default includes
SUBROUTINE labels in the main listing and sub-listings for
! other labels, CALL, GOTO and GOSUB statements.
dcl-imenu-label-labels
dcl-imenu-label-goto
--- 530,536 ----
dcl-imenu-generic-expression
Default value for imenu-generic-expression. The default includes
SUBROUTINE labels in the main listing and sub-listings for
! other labels, CALL, GOTO and GOSUB statements.
dcl-imenu-label-labels
dcl-imenu-label-goto
***************
*** 539,568 ****
Change the text that is used as sub-listing labels in imenu.
Loading this package calls the value of the variable
! `dcl-mode-load-hook' with no args, if that value is non-nil.
! Turning on DCL mode calls the value of the variable `dcl-mode-hook'
with no args, if that value is non-nil.
The following example uses the default values for all variables:
! $! This is a comment line that is not indented (it matches
$! dcl-comment-line-regexp)
$! Next follows the first command line. It is indented dcl-margin-offset.
$ i = 1
$ ! Other comments are indented like command lines.
$ ! A margin label indented dcl-margin-label-offset:
! $ label:
$ if i.eq.1
$ then
! $ ! Lines between THEN-ELSE and ELSE-ENDIF are
$ ! indented dcl-basic-offset
$ loop1: ! This matches dcl-block-begin-regexp...
$ ! ...so this line is indented dcl-basic-offset
! $ text = \"This \" + - ! is a continued line
\"lined up with the command line\"
$ type sys$input
! Data lines are not indented at all.
$ endloop1: ! This matches dcl-block-end-regexp
$ endif
$
--- 539,568 ----
Change the text that is used as sub-listing labels in imenu.
Loading this package calls the value of the variable
! `dcl-mode-load-hook' with no args, if that value is non-nil.
! Turning on DCL mode calls the value of the variable `dcl-mode-hook'
with no args, if that value is non-nil.
The following example uses the default values for all variables:
! $! This is a comment line that is not indented (it matches
$! dcl-comment-line-regexp)
$! Next follows the first command line. It is indented dcl-margin-offset.
$ i = 1
$ ! Other comments are indented like command lines.
$ ! A margin label indented dcl-margin-label-offset:
! $ label:
$ if i.eq.1
$ then
! $ ! Lines between THEN-ELSE and ELSE-ENDIF are
$ ! indented dcl-basic-offset
$ loop1: ! This matches dcl-block-begin-regexp...
$ ! ...so this line is indented dcl-basic-offset
! $ text = \"This \" + - ! is a continued line
\"lined up with the command line\"
$ type sys$input
! Data lines are not indented at all.
$ endloop1: ! This matches dcl-block-end-regexp
$ endif
$
***************
*** 582,588 ****
(make-local-variable 'comment-multi-line)
(setq comment-multi-line nil)
!
;; This used to be "^\\$[ \t]*![ \t]*" which looks more correct.
;; The drawback was that you couldn't make empty comment lines by pressing
;; C-M-j repeatedly - only the first line became a comment line.
--- 582,588 ----
(make-local-variable 'comment-multi-line)
(setq comment-multi-line nil)
!
;; This used to be "^\\$[ \t]*![ \t]*" which looks more correct.
;; The drawback was that you couldn't make empty comment lines by pressing
;; C-M-j repeatedly - only the first line became a comment line.
***************
*** 608,614 ****
(make-local-variable 'dcl-calc-command-indent-function)
(make-local-variable 'dcl-calc-cont-indent-function)
(make-local-variable 'dcl-electric-reindent-regexps)
!
(setq major-mode 'dcl-mode)
(setq mode-name "DCL")
(use-local-map dcl-mode-map)
--- 608,614 ----
(make-local-variable 'dcl-calc-command-indent-function)
(make-local-variable 'dcl-calc-cont-indent-function)
(make-local-variable 'dcl-electric-reindent-regexps)
!
(setq major-mode 'dcl-mode)
(setq mode-name "DCL")
(use-local-map dcl-mode-map)
***************
*** 668,674 ****
"Move backward to a command.
Move point to the preceding command line that is not a comment line,
a command line with only a comment, only contains a `$' or only
! contains a label.
Returns point of the found command line or nil if not able to move."
(interactive)
--- 668,674 ----
"Move backward to a command.
Move point to the preceding command line that is not a comment line,
a command line with only a comment, only contains a `$' or only
! contains a label.
Returns point of the found command line or nil if not able to move."
(interactive)
***************
*** 712,718 ****
"Move forward to a command.
Move point to the end of the next command line that is not a comment line,
a command line with only a comment, only contains a `$' or only
! contains a label.
Returns point of the found command line or nil if not able to move."
(interactive)
--- 712,718 ----
"Move forward to a command.
Move point to the end of the next command line that is not a comment line,
a command line with only a comment, only contains a `$' or only
! contains a label.
Returns point of the found command line or nil if not able to move."
(interactive)
***************
*** 762,770 ****
If this is a comment line then move to the first non-whitespace character
in the comment.
! Typing \\[dcl-back-to-indentation] several times in a row will move point to
other
`interesting' points closer to the left margin, and then back to the
! rightmost point again.
E.g. on the following line, point would go to the positions indicated
by the numbers in order 1-2-3-1-... :
--- 762,770 ----
If this is a comment line then move to the first non-whitespace character
in the comment.
! Typing \\[dcl-back-to-indentation] several times in a row will move point to
other
`interesting' points closer to the left margin, and then back to the
! rightmost point again.
E.g. on the following line, point would go to the positions indicated
by the numbers in order 1-2-3-1-... :
***************
*** 785,791 ****
;; $ ! text
;; 3 2 1
;;
! ;; $ l: command !
;; 3 2 1
;;
;; text
--- 785,791 ----
;; $ ! text
;; 3 2 1
;;
! ;; $ l: command !
;; 3 2 1
;;
;; text
***************
*** 807,813 ****
(setq last-good-point (point)))
(cond
! ;; Special treatment for comment lines. We are trying to allow
;; things like "$ !*" as comment lines.
((looking-at dcl-comment-line-regexp)
(re-search-forward (concat dcl-comment-line-regexp "[ \t]*") limit t)
--- 807,813 ----
(setq last-good-point (point)))
(cond
! ;; Special treatment for comment lines. We are trying to allow
;; things like "$ !*" as comment lines.
((looking-at dcl-comment-line-regexp)
(re-search-forward (concat dcl-comment-line-regexp "[ \t]*") limit t)
***************
*** 901,907 ****
(dcl-back-to-indentation)
(point)))
!
;;;---------------------------------------------------------------------------
(defun dcl-show-line-type ()
"Test dcl-get-line-type."
--- 901,907 ----
(dcl-back-to-indentation)
(point)))
!
;;;---------------------------------------------------------------------------
(defun dcl-show-line-type ()
"Test dcl-get-line-type."
***************
*** 979,985 ****
If you use this function you will probably want to add \"then\" to
dcl-electric-reindent-regexps and define the key \"n\" as
! dcl-electric-character.
"
(let ((case-fold-search t))
(save-excursion
--- 979,985 ----
If you use this function you will probably want to add \"then\" to
dcl-electric-reindent-regexps and define the key \"n\" as
! dcl-electric-character.
"
(let ((case-fold-search t))
(save-excursion
***************
*** 1003,1009 ****
(- (+ cur-indent extra-indent) 2))
((looking-at "\\belse\\b")
(- (+ cur-indent extra-indent) 2))))
! ;; Outdent, this word is `endif' or `else': + 2
((equal indent-type 'outdent)
(goto-char this-point)
(cond
--- 1003,1009 ----
(- (+ cur-indent extra-indent) 2))
((looking-at "\\belse\\b")
(- (+ cur-indent extra-indent) 2))))
! ;; Outdent, this word is `endif' or `else': + 2
((equal indent-type 'outdent)
(goto-char this-point)
(cond
***************
*** 1028,1046 ****
If the current line should be outdented, calculate its indentation,
either with the default method or by calling
! dcl-calc-command-indent-function if it is non-nil.
Rules for default indentation:
If it is the first line in the buffer, indent dcl-margin-offset.
! Go to the previous command line with a command on it.
Find out how much it is indented (cur-indent).
Look at the first word on the line to see if the indentation should be
adjusted. Skip margin-label, continuations and comments while looking for
the first word. Save this buffer position as `last-point'.
! If the first word after a label is SUBROUTINE, set extra-indent to
dcl-margin-offset.
First word extra-indent
--- 1028,1046 ----
If the current line should be outdented, calculate its indentation,
either with the default method or by calling
! dcl-calc-command-indent-function if it is non-nil.
Rules for default indentation:
If it is the first line in the buffer, indent dcl-margin-offset.
! Go to the previous command line with a command on it.
Find out how much it is indented (cur-indent).
Look at the first word on the line to see if the indentation should be
adjusted. Skip margin-label, continuations and comments while looking for
the first word. Save this buffer position as `last-point'.
! If the first word after a label is SUBROUTINE, set extra-indent to
dcl-margin-offset.
First word extra-indent
***************
*** 1050,1056 ****
Then return to the current line and look at the first word to see if the
indentation should be adjusted again. Save this buffer position as
! `this-point'.
First word extra-indent
ELSE -dcl-basic-offset
--- 1050,1056 ----
Then return to the current line and look at the first word to see if the
indentation should be adjusted again. Save this buffer position as
! `this-point'.
First word extra-indent
ELSE -dcl-basic-offset
***************
*** 1063,1069 ****
If an extra adjustment is necessary and if
dcl-calc-command-indent-function is nil or returns nil set cur-indent
! to cur-indent+extra-indent.
See also documentation for dcl-calc-command-indent-function.
The indent-type classification could probably be expanded upon.
--- 1063,1069 ----
If an extra adjustment is necessary and if
dcl-calc-command-indent-function is nil or returns nil set cur-indent
! to cur-indent+extra-indent.
See also documentation for dcl-calc-command-indent-function.
The indent-type classification could probably be expanded upon.
***************
*** 1106,1112 ****
;; We couldn't go further back, so this must have been the
;; first line.
(setq cur-indent dcl-margin-offset
! last-point (dcl-indentation-point))
(setq done t)))
;; Examine the line to get current indentation and possibly a
;; reason to indent.
--- 1106,1112 ----
;; We couldn't go further back, so this must have been the
;; first line.
(setq cur-indent dcl-margin-offset
! last-point (dcl-indentation-point))
(setq done t)))
;; Examine the line to get current indentation and possibly a
;; reason to indent.
***************
*** 1202,1208 ****
yyy)))
"
(let ((case-fold-search t)
! indent)
(save-excursion
(dcl-beginning-of-statement)
(let ((end (save-excursion (forward-line 1) (point))))
--- 1202,1208 ----
yyy)))
"
(let ((case-fold-search t)
! indent)
(save-excursion
(dcl-beginning-of-statement)
(let ((end (save-excursion (forward-line 1) (point))))
***************
*** 1221,1227 ****
(skip-chars-forward " \t:=" end)))
;; This could be the position to indent to
(setq indent (current-column))
!
;; Move to the next word unless we have seen an
;; assignment. If it starts with `/' it's a
;; qualifier and we will indent to that position
--- 1221,1227 ----
(skip-chars-forward " \t:=" end)))
;; This could be the position to indent to
(setq indent (current-column))
!
;; Move to the next word unless we have seen an
;; assignment. If it starts with `/' it's a
;; qualifier and we will indent to that position
***************
*** 1328,1334 ****
(re-search-forward dcl-label-r)))
(dcl-indent-to indent 1)
)
! ;;
(if (> (- (point-max) pos) (point))
(goto-char (- (point-max) pos)))
))
--- 1328,1334 ----
(re-search-forward dcl-label-r)))
(dcl-indent-to indent 1)
)
! ;;
(if (> (- (point-max) pos) (point))
(goto-char (- (point-max) pos)))
))
***************
*** 1376,1382 ****
(t
(message "dcl-indent-line: unknown type"))
)))
!
;;;-------------------------------------------------------------------------
(defun dcl-indent-command ()
--- 1376,1382 ----
(t
(message "dcl-indent-line: unknown type"))
)))
!
;;;-------------------------------------------------------------------------
(defun dcl-indent-command ()
***************
*** 1406,1414 ****
(start-point (point)))
(cond
;; Data line : always insert tab
! ((or (equal type 'data) (equal type 'empty-data))
(tab-to-tab-stop))
! ;; Indent only at start of line
((not dcl-tab-always-indent) ; nil
(let ((search-end-point
(save-excursion
--- 1406,1414 ----
(start-point (point)))
(cond
;; Data line : always insert tab
! ((or (equal type 'data) (equal type 'empty-data))
(tab-to-tab-stop))
! ;; Indent only at start of line
((not dcl-tab-always-indent) ; nil
(let ((search-end-point
(save-excursion
***************
*** 1428,1434 ****
;;;-------------------------------------------------------------------------
(defun dcl-electric-character (arg)
"Inserts a character and indents if necessary.
! Insert a character if the user gave a numeric argument or the flag
`dcl-electric-characters' is not set. If an argument was given,
insert that many characters.
--- 1428,1434 ----
;;;-------------------------------------------------------------------------
(defun dcl-electric-character (arg)
"Inserts a character and indents if necessary.
! Insert a character if the user gave a numeric argument or the flag
`dcl-electric-characters' is not set. If an argument was given,
insert that many characters.
***************
*** 1443,1449 ****
(self-insert-command 1)
(let ((case-fold-search t))
;; There must be a better way than (memq t ...).
! ;; (apply 'or ...) didn't work
(if (memq t (mapcar 'dcl-was-looking-at dcl-electric-reindent-regexps))
(dcl-indent-line)))))
--- 1443,1449 ----
(self-insert-command 1)
(let ((case-fold-search t))
;; There must be a better way than (memq t ...).
! ;; (apply 'or ...) didn't work
(if (memq t (mapcar 'dcl-was-looking-at dcl-electric-reindent-regexps))
(dcl-indent-line)))))
***************
*** 1463,1469 ****
(progn
(dcl-delete-chars " \t")
(indent-to col minimum)))))
!
;;;-------------------------------------------------------------------------
(defun dcl-split-line ()
--- 1463,1469 ----
(progn
(dcl-delete-chars " \t")
(indent-to col minimum)))))
!
;;;-------------------------------------------------------------------------
(defun dcl-split-line ()
***************
*** 1511,1517 ****
(if (not done) ; normal M-LFD action
(indent-new-comment-line))))
!
;;;-------------------------------------------------------------------------
(defun dcl-delete-indentation (&optional arg)
"Join this line to previous like delete-indentation.
--- 1511,1517 ----
(if (not done) ; normal M-LFD action
(indent-new-comment-line))))
!
;;;-------------------------------------------------------------------------
(defun dcl-delete-indentation (&optional arg)
"Join this line to previous like delete-indentation.
***************
*** 1582,1588 ****
(defun dcl-option-value-margin-offset (option-assoc)
"Guess a value for margin offset.
Find the column of the first non-blank character on the line, not
! counting labels.
Returns a number as a string."
(save-excursion
(beginning-of-line)
--- 1582,1588 ----
(defun dcl-option-value-margin-offset (option-assoc)
"Guess a value for margin offset.
Find the column of the first non-blank character on the line, not
! counting labels.
Returns a number as a string."
(save-excursion
(beginning-of-line)
***************
*** 1610,1616 ****
(let ((regexp (buffer-substring (match-beginning 0) (match-end 0))))
(concat "^" (regexp-quote regexp)))
dcl-comment-line-regexp))))
!
;;;-------------------------------------------------------------------------
(defun dcl-guess-option-value (option)
--- 1610,1616 ----
(let ((regexp (buffer-substring (match-beginning 0) (match-end 0))))
(concat "^" (regexp-quote regexp)))
dcl-comment-line-regexp))))
!
;;;-------------------------------------------------------------------------
(defun dcl-guess-option-value (option)
***************
*** 1701,1707 ****
(and next-indent
(/= (- this-indent next-indent) 0))))))
"dcl-basic-offset")
! ;; No more guesses.
(t
""))))
--- 1701,1707 ----
(and next-indent
(/= (- this-indent next-indent) 0))))))
"dcl-basic-offset")
! ;; No more guesses.
(t
""))))
***************
*** 1739,1746 ****
;;;-------------------------------------------------------------------------
(defun dcl-save-local-variable (var &optional def-prefix def-suffix)
"Save a variable in a `Local Variables' list.
! Set or update the value of VAR in the current buffers
! `Local Variables:' list."
;; Look for "Local variables:" line in last page.
(save-excursion
(goto-char (point-max))
--- 1739,1746 ----
;;;-------------------------------------------------------------------------
(defun dcl-save-local-variable (var &optional def-prefix def-suffix)
"Save a variable in a `Local Variables' list.
! Set or update the value of VAR in the current buffers
! `Local Variables:' list."
;; Look for "Local variables:" line in last page.
(save-excursion
(goto-char (point-max))
***************
*** 1790,1796 ****
;; Not found. Insert a new entry before this line
(setq continue nil)
(beginning-of-line)
! (insert (concat prefix-string (symbol-name var) ": "
(prin1-to-string (eval var)) " "
suffix-string "\n")))
;; Is it the variable we are looking for?
--- 1790,1796 ----
;; Not found. Insert a new entry before this line
(setq continue nil)
(beginning-of-line)
! (insert (concat prefix-string (symbol-name var) ": "
(prin1-to-string (eval var)) " "
suffix-string "\n")))
;; Is it the variable we are looking for?
***************
*** 1836,1842 ****
comment-end
(concat " " comment-end))))))
(insert (concat def-prefix "Local variables:" def-suffix "\n"))
! (insert (concat def-prefix (symbol-name var) ": "
(prin1-to-string (eval var)) def-suffix "\n"))
(insert (concat def-prefix "end:" def-suffix)))
)))
--- 1836,1842 ----
comment-end
(concat " " comment-end))))))
(insert (concat def-prefix "Local variables:" def-suffix "\n"))
! (insert (concat def-prefix (symbol-name var) ": "
(prin1-to-string (eval var)) def-suffix "\n"))
(insert (concat def-prefix "end:" def-suffix)))
)))
***************
*** 1909,1917 ****
(require 'tempo)
(defvar dcl-tempo-tags nil
"Tempo tags for DCL mode.")
!
(tempo-define-template "dcl-f$context"
! '("f$context" dcl-tempo-left-paren
(p "context-type: ") dcl-tempo-comma
(p "context-symbol: ") dcl-tempo-comma
(p "selection-item: ") dcl-tempo-comma
--- 1909,1917 ----
(require 'tempo)
(defvar dcl-tempo-tags nil
"Tempo tags for DCL mode.")
!
(tempo-define-template "dcl-f$context"
! '("f$context" dcl-tempo-left-paren
(p "context-type: ") dcl-tempo-comma
(p "context-symbol: ") dcl-tempo-comma
(p "selection-item: ") dcl-tempo-comma
***************
*** 1920,1952 ****
"f$context" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$csid"
! '("f$csid" dcl-tempo-left-paren
(p "context-symbol: ") dcl-tempo-right-paren)
"f$csid" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$cvsi"
! '("f$cvsi" dcl-tempo-left-paren
(p "start-bit: ") dcl-tempo-comma
(p "number-of-bits: ") dcl-tempo-comma
(p "string: ") dcl-tempo-right-paren)
"f$cvsi" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$cvtime"
! '("f$cvtime" dcl-tempo-left-paren
(p "[input_time]: ") dcl-tempo-comma
(p "[output_time_format]: ") dcl-tempo-comma
(p "[output_field]: ") dcl-tempo-right-paren)
"f$cvtime" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$cvui"
! '("f$cvui" dcl-tempo-left-paren
(p "start-bit: ") dcl-tempo-comma
(p "number-of-bits: ") dcl-tempo-comma
(p "string") dcl-tempo-right-paren)
"f$cvui" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$device"
! '("f$device" dcl-tempo-left-paren
(p "[search_devnam]: ") dcl-tempo-comma
(p "[devclass]: ") dcl-tempo-comma
(p "[devtype]: ") dcl-tempo-comma
--- 1920,1952 ----
"f$context" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$csid"
! '("f$csid" dcl-tempo-left-paren
(p "context-symbol: ") dcl-tempo-right-paren)
"f$csid" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$cvsi"
! '("f$cvsi" dcl-tempo-left-paren
(p "start-bit: ") dcl-tempo-comma
(p "number-of-bits: ") dcl-tempo-comma
(p "string: ") dcl-tempo-right-paren)
"f$cvsi" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$cvtime"
! '("f$cvtime" dcl-tempo-left-paren
(p "[input_time]: ") dcl-tempo-comma
(p "[output_time_format]: ") dcl-tempo-comma
(p "[output_field]: ") dcl-tempo-right-paren)
"f$cvtime" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$cvui"
! '("f$cvui" dcl-tempo-left-paren
(p "start-bit: ") dcl-tempo-comma
(p "number-of-bits: ") dcl-tempo-comma
(p "string") dcl-tempo-right-paren)
"f$cvui" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$device"
! '("f$device" dcl-tempo-left-paren
(p "[search_devnam]: ") dcl-tempo-comma
(p "[devclass]: ") dcl-tempo-comma
(p "[devtype]: ") dcl-tempo-comma
***************
*** 1959,2014 ****
"f$directory" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$edit"
! '("f$edit" dcl-tempo-left-paren
(p "string: ") dcl-tempo-comma
(p "edit-list: ") dcl-tempo-right-paren)
"f$edit" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$element"
! '("f$element" dcl-tempo-left-paren
(p "element-number: ") dcl-tempo-comma
(p "delimiter: ") dcl-tempo-comma
(p "string: ") dcl-tempo-right-paren)
"f$element" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$environment"
! '("f$environment" dcl-tempo-left-paren
(p "item: ") dcl-tempo-right-paren)
"f$environment" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$extract"
! '("f$extract" dcl-tempo-left-paren
(p "start: ") dcl-tempo-comma
(p "length: ") dcl-tempo-comma
(p "string: ") dcl-tempo-right-paren)
"f$extract" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$fao"
! '("f$fao" dcl-tempo-left-paren
(p "control-string: ") dcl-tempo-comma
("argument[,...]: ") dcl-tempo-right-paren)
"f$fao" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$file_attributes"
! '("f$file_attributes" dcl-tempo-left-paren
(p "filespec: ") dcl-tempo-comma
(p "item: ") dcl-tempo-right-paren)
"f$file_attributes" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$getdvi"
! '("f$getdvi" dcl-tempo-left-paren
(p "device-name: ") dcl-tempo-comma
(p "item: ") dcl-tempo-right-paren)
"f$getdvi" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$getjpi"
! '("f$getjpi" dcl-tempo-left-paren
(p "pid: ") dcl-tempo-comma
(p "item: ") dcl-tempo-right-paren )
"f$getjpi" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$getqui"
! '("f$getqui" dcl-tempo-left-paren
(p "function: ") dcl-tempo-comma
(p "[item]: ") dcl-tempo-comma
(p "[object-id]: ") dcl-tempo-comma
--- 1959,2014 ----
"f$directory" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$edit"
! '("f$edit" dcl-tempo-left-paren
(p "string: ") dcl-tempo-comma
(p "edit-list: ") dcl-tempo-right-paren)
"f$edit" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$element"
! '("f$element" dcl-tempo-left-paren
(p "element-number: ") dcl-tempo-comma
(p "delimiter: ") dcl-tempo-comma
(p "string: ") dcl-tempo-right-paren)
"f$element" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$environment"
! '("f$environment" dcl-tempo-left-paren
(p "item: ") dcl-tempo-right-paren)
"f$environment" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$extract"
! '("f$extract" dcl-tempo-left-paren
(p "start: ") dcl-tempo-comma
(p "length: ") dcl-tempo-comma
(p "string: ") dcl-tempo-right-paren)
"f$extract" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$fao"
! '("f$fao" dcl-tempo-left-paren
(p "control-string: ") dcl-tempo-comma
("argument[,...]: ") dcl-tempo-right-paren)
"f$fao" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$file_attributes"
! '("f$file_attributes" dcl-tempo-left-paren
(p "filespec: ") dcl-tempo-comma
(p "item: ") dcl-tempo-right-paren)
"f$file_attributes" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$getdvi"
! '("f$getdvi" dcl-tempo-left-paren
(p "device-name: ") dcl-tempo-comma
(p "item: ") dcl-tempo-right-paren)
"f$getdvi" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$getjpi"
! '("f$getjpi" dcl-tempo-left-paren
(p "pid: ") dcl-tempo-comma
(p "item: ") dcl-tempo-right-paren )
"f$getjpi" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$getqui"
! '("f$getqui" dcl-tempo-left-paren
(p "function: ") dcl-tempo-comma
(p "[item]: ") dcl-tempo-comma
(p "[object-id]: ") dcl-tempo-comma
***************
*** 2016,2035 ****
"f$getqui" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$getsyi"
! '("f$getsyi" dcl-tempo-left-paren
(p "item: ") dcl-tempo-comma
(p "[node-name]: ") dcl-tempo-comma
(p "[cluster-id]: ") dcl-tempo-right-paren)
"f$getsyi" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$identifier"
! '("f$identifier" dcl-tempo-left-paren
(p "identifier: ") dcl-tempo-comma
(p "conversion-type: ") dcl-tempo-right-paren)
"f$identifier" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$integer"
! '("f$integer" dcl-tempo-left-paren
(p "expression: ") dcl-tempo-right-paren)
"f$integer" "" 'dcl-tempo-tags)
--- 2016,2035 ----
"f$getqui" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$getsyi"
! '("f$getsyi" dcl-tempo-left-paren
(p "item: ") dcl-tempo-comma
(p "[node-name]: ") dcl-tempo-comma
(p "[cluster-id]: ") dcl-tempo-right-paren)
"f$getsyi" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$identifier"
! '("f$identifier" dcl-tempo-left-paren
(p "identifier: ") dcl-tempo-comma
(p "conversion-type: ") dcl-tempo-right-paren)
"f$identifier" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$integer"
! '("f$integer" dcl-tempo-left-paren
(p "expression: ") dcl-tempo-right-paren)
"f$integer" "" 'dcl-tempo-tags)
***************
*** 2039,2051 ****
"f$length" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$locate"
! '("f$locate" dcl-tempo-left-paren
(p "substring: ") dcl-tempo-comma
(p "string: ") dcl-tempo-right-paren)
"f$locate" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$message"
! '("f$message" dcl-tempo-left-paren
(p "status-code: ") dcl-tempo-right-paren )
"f$message" "" 'dcl-tempo-tags)
--- 2039,2051 ----
"f$length" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$locate"
! '("f$locate" dcl-tempo-left-paren
(p "substring: ") dcl-tempo-comma
(p "string: ") dcl-tempo-right-paren)
"f$locate" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$message"
! '("f$message" dcl-tempo-left-paren
(p "status-code: ") dcl-tempo-right-paren )
"f$message" "" 'dcl-tempo-tags)
***************
*** 2054,2060 ****
"f$mode" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$parse"
! '("f$parse" dcl-tempo-left-paren
(p "filespec: ") dcl-tempo-comma
(p "[default-spec]: ") dcl-tempo-comma
(p "[related-spec]: ") dcl-tempo-comma
--- 2054,2060 ----
"f$mode" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$parse"
! '("f$parse" dcl-tempo-left-paren
(p "filespec: ") dcl-tempo-comma
(p "[default-spec]: ") dcl-tempo-comma
(p "[related-spec]: ") dcl-tempo-comma
***************
*** 2063,2074 ****
"f$parse" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$pid"
! '("f$pid" dcl-tempo-left-paren
(p "context-symbol: ") dcl-tempo-right-paren)
"f$pid" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$privilege"
! '("f$privilege" dcl-tempo-left-paren
(p "priv-states: ") dcl-tempo-right-paren)
"f$privilege" "" 'dcl-tempo-tags)
--- 2063,2074 ----
"f$parse" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$pid"
! '("f$pid" dcl-tempo-left-paren
(p "context-symbol: ") dcl-tempo-right-paren)
"f$pid" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$privilege"
! '("f$privilege" dcl-tempo-left-paren
(p "priv-states: ") dcl-tempo-right-paren)
"f$privilege" "" 'dcl-tempo-tags)
***************
*** 2077,2094 ****
"f$process" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$search"
! '("f$search" dcl-tempo-left-paren
(p "filespec: ") dcl-tempo-comma
(p "[stream-id]: ") dcl-tempo-right-paren)
"f$search" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$setprv"
! '("f$setprv" dcl-tempo-left-paren
(p "priv-states: ") dcl-tempo-right-paren)
"f$setprv" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$string"
! '("f$string" dcl-tempo-left-paren
(p "expression: ") dcl-tempo-right-paren)
"f$string" "" 'dcl-tempo-tags)
--- 2077,2094 ----
"f$process" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$search"
! '("f$search" dcl-tempo-left-paren
(p "filespec: ") dcl-tempo-comma
(p "[stream-id]: ") dcl-tempo-right-paren)
"f$search" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$setprv"
! '("f$setprv" dcl-tempo-left-paren
(p "priv-states: ") dcl-tempo-right-paren)
"f$setprv" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$string"
! '("f$string" dcl-tempo-left-paren
(p "expression: ") dcl-tempo-right-paren)
"f$string" "" 'dcl-tempo-tags)
***************
*** 2097,2103 ****
"f$time" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$trnlnm"
! '("f$trnlnm" dcl-tempo-left-paren
(p "logical-name: ") dcl-tempo-comma
(p "[table]: ") dcl-tempo-comma
(p "[index]: ") dcl-tempo-comma
--- 2097,2103 ----
"f$time" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$trnlnm"
! '("f$trnlnm" dcl-tempo-left-paren
(p "logical-name: ") dcl-tempo-comma
(p "[table]: ") dcl-tempo-comma
(p "[index]: ") dcl-tempo-comma
***************
*** 2107,2113 ****
"f$trnlnm" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$type"
! '("f$type" dcl-tempo-left-paren
(p "symbol-name: ") dcl-tempo-right-paren)
"f$type" "" 'dcl-tempo-tags)
--- 2107,2113 ----
"f$trnlnm" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$type"
! '("f$type" dcl-tempo-left-paren
(p "symbol-name: ") dcl-tempo-right-paren)
"f$type" "" 'dcl-tempo-tags)
***************
*** 2116,2122 ****
"f$user" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$verify"
! '("f$verify" dcl-tempo-left-paren
(p "[procedure-value]: ") dcl-tempo-comma
(p "[image-value]: ") dcl-tempo-right-paren)
"f$verify" "" 'dcl-tempo-tags)
--- 2116,2122 ----
"f$user" "" 'dcl-tempo-tags)
(tempo-define-template "dcl-f$verify"
! '("f$verify" dcl-tempo-left-paren
(p "[procedure-value]: ") dcl-tempo-comma
(p "[image-value]: ") dcl-tempo-right-paren)
"f$verify" "" 'dcl-tempo-tags)
***************
*** 2171,2177 ****
()
(equal start (match-end 0))))))
!
;;;-------------------------------------------------------------------------
(defun dcl-imenu-create-index-function ()
"Jacket routine to make imenu searches non case sensitive."
--- 2171,2177 ----
()
(equal start (match-end 0))))))
!
;;;-------------------------------------------------------------------------
(defun dcl-imenu-create-index-function ()
"Jacket routine to make imenu searches non case sensitive."
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/progmodes/dcl-mode.el,
Juanma Barranquero <=