+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.
(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
(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
;; 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)