mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-03 10:31:37 -08:00
Code Issues Projects Releases Wiki Activity

* progmodes/ada-mode.el (ada-get-indent-end, ada-goto-matching-start):

Browse source 
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.
This commit is contained in:
Juanma Barranquero 2008-10-12 23:06:29 +00:00
parent f6c2397a85
commit dd4fdc44b1
3 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lisp/ChangeLog
View file

@ -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.

14
lisp/progmodes/ada-mode.el
View file

@ -2840,12 +2840,15 @@ ORGPOINT is the limit position used in the calculation."
(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 @@ If GOTOTHEN is non-nil, point moves to the 'then' following 'if'."
(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

4
lisp/progmodes/ada-xref.el
View file

@ -406,8 +406,8 @@ Assumes environment variable ADA_PROJECT_PATH is set properly."
;; 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)