Commit a0bd2457 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(pascal-end-of-statement, pascal-calculate-indent):

Set parse-sexp-ignore-comments to t before parsing.
(pascal-indent-case): Save position of cursor, and restores it
after reindenting the code.
parent 9bf7b6aa
......@@ -612,7 +612,8 @@ area. See also `pascal-comment-area'."
(defun pascal-end-of-statement ()
"Move forward to end of current statement."
(interactive)
(let ((nest 0) pos
(let ((parse-sexp-ignore-comments t)
(nest 0) pos
(regexp (concat "\\(" pascal-beg-block-re "\\)\\|\\("
pascal-end-block-re "\\)")))
(if (not (looking-at "[ \t\n]")) (forward-sexp -1))
......@@ -784,7 +785,8 @@ on the line which ends a function or procedure named NAME."
"Calculate the indent of the current Pascal line.
Return a list of two elements: (INDENT-TYPE INDENT-LEVEL)."
(save-excursion
(let* ((oldpos (point))
(let* ((parse-sexp-ignore-comments t)
(oldpos (point))
(state (save-excursion (parse-partial-sexp (point-min) (point))))
(nest 0) (par 0) (complete (looking-at "[ \t]*end\\>"))
(elsed (looking-at "[ \t]*else\\>"))
......@@ -895,8 +897,8 @@ column number the line should be indented to."
(defun pascal-indent-case ()
"Indent within case statements."
(skip-chars-forward ": \t")
(let ((end (prog2
(let ((savepos (point-marker))
(end (prog2
(end-of-line)
(point-marker)
(re-search-backward "\\<case\\>" nil t)))
......@@ -930,7 +932,7 @@ column number the line should be indented to."
(insert " "))
(setq oldpos (point))
(pascal-end-of-statement))
(goto-char oldpos)))
(goto-char savepos)))
(defun pascal-indent-paramlist (&optional arg)
"Indent current line in parameterlist.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment