Mercurial > emacs
changeset 98674:bde81f3667cd
* progmodes/ada-mode.el (ada-get-indent-end, ada-goto-matching-start):
Add support for extended return statement.
* progmodes/ada-xref.el (ada-gnat-parse-gpr): Don't reverse src-dir
and obj-dir; keep user order.
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Sun, 12 Oct 2008 23:06:29 +0000 |
| parents | a3c0dcf1e950 |
| children | 2cae4bd13e67 |
| files | lisp/ChangeLog lisp/progmodes/ada-mode.el lisp/progmodes/ada-xref.el |
| diffstat | 3 files changed, 18 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sun Oct 12 22:46:38 2008 +0000 +++ b/lisp/ChangeLog Sun Oct 12 23:06:29 2008 +0000 @@ -1,3 +1,11 @@ +2008-10-12 Stephen Leake <stephen_leake@member.fsf.org> + + * progmodes/ada-mode.el (ada-get-indent-end, ada-goto-matching-start): + Add support for extended return statement. + + * progmodes/ada-xref.el (ada-gnat-parse-gpr): Don't reverse src-dir + and obj-dir; keep user order. + 2008-10-12 Glenn Morris <rgm@gnu.org> * Makefile.in (ELCFILES): Update.
--- a/lisp/progmodes/ada-mode.el Sun Oct 12 22:46:38 2008 +0000 +++ b/lisp/progmodes/ada-mode.el Sun Oct 12 23:06:29 2008 +0000 @@ -2840,12 +2840,15 @@ (forward-word 1) (ada-goto-next-non-ws) (cond - ((looking-at "\\<\\(loop\\|select\\|if\\|case\\)\\>") + ;; + ;; loop/select/if/case/return + ;; + ((looking-at "\\<\\(loop\\|select\\|if\\|case\\|return\\)\\>") (save-excursion (ada-check-matching-start (match-string 0))) (list (save-excursion (back-to-indentation) (point)) 0)) ;; - ;; loop/select/if/case/record/select + ;; record ;; ((looking-at "\\<record\\>") (save-excursion @@ -3897,13 +3900,12 @@ (goto-char (match-beginning 0))) ;; - ;; found 'do' => skip back to 'accept' + ;; found 'do' => skip back to 'accept' or 'return' ;; ((looking-at "do") (unless (ada-search-ignore-string-comment - "accept" t nil nil - 'word-search-backward) - (error "Missing 'accept' in front of 'do'")))) + "\\<accept\\|return\\>" t) + (error "Missing 'accept' or 'return' in front of 'do'")))) (point)) (if noerror
--- a/lisp/progmodes/ada-xref.el Sun Oct 12 22:46:38 2008 +0000 +++ b/lisp/progmodes/ada-xref.el Sun Oct 12 23:06:29 2008 +0000 @@ -406,8 +406,8 @@ ;; Set properties (setq plist (plist-put plist 'gpr_file gpr-file)) - (setq plist (plist-put plist 'src_dir (reverse src-dir))) - (plist-put plist 'obj_dir (reverse obj-dir)) + (setq plist (plist-put plist 'src_dir src-dir)) + (plist-put plist 'obj_dir obj-dir) ) (kill-buffer nil) (message "Parsing %s ... done" gpr-file)