mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-28 07:45:00 +00:00
Code Issues Releases Activity

Fix bug#5435: ada-mode; pragma parameter list indented incorrectly.

Browse Source
This commit is contained in:
Stephen Leake 2010-01-23 13:42:22 +01:00 committed by Juanma Barranquero
commit 5336c3ec74
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -1,3 +1,8 @@
2010-01-23 Stephen Leake <stephen_leake@member.fsf.org>
* progmodes/ada-mode.el (ada-in-paramlist-p): Pragma syntax
is the same as subprogram call, not declaration. (Bug#5435).
2010-01-23 Michael Albinus <michael.albinus@gmx.de>
* net/tramp-smb.el (tramp-smb-conf): New defcustom.

6
lisp/progmodes/ada-mode.el
View File

@ -257,7 +257,7 @@ Note that indentation is calculated only if `ada-indent-comment-as-code' is t.
For instance:
A := 1; -- A multi-line comment
-- aligned if ada-indent-align-comments is t"
-- aligned if `ada-indent-align-comments' is t"
:type 'boolean :group 'ada)
(defcustom ada-indent-comment-as-code t
@ -4163,7 +4163,7 @@ Return nil if the private is part of the package name, as in
(defun ada-in-paramlist-p ()
"Return t if point is inside a parameter-list."
"Return t if point is inside the parameter-list of a declaration, but not a subprogram call or aggregate."
(save-excursion
(and
(ada-search-ignore-string-comment "(\\|)" t nil t)
@ -4194,13 +4194,13 @@ Return nil if the private is part of the package name, as in
;; right keyword two words before parenthesis ?
;; Type is in this list because of discriminants
;; pragma is not, because the syntax is that of a subprogram call.
(looking-at (eval-when-compile
(concat "\\<\\("
"procedure\\|function\\|body\\|"
"task\\|entry\\|accept\\|"
"access[ \t]+procedure\\|"
"access[ \t]+function\\|"
"pragma\\|"
"type\\)\\>"))))))
(defun ada-search-ignore-complex-boolean (regexp backwardp)