On 6 Jul 2016, at 15:29, Simon Wright <[email protected]> wrote:
>
> See attached patch.
The patch for ada-mode.el is wrong (if ada-xref-tool is already set, neither
tool's .el will be loaded). This should be better:
--- ada-mode.el 5d3ee13a5fdc3658f01565579b0303a7a5fcb393
+++ ada-mode.el 1aca529fa5f972d29d8a094b95109f2ffe21d5f0
@@ -2890,17 +2890,15 @@ The paragraph is indented on the first l
(unless (featurep 'ada-indent-engine)
(require 'ada-wisi))
-(unless (featurep 'ada-xref-tool)
- (cl-case ada-xref-tool
- (gnat (require 'ada-gnat-xref))
- (gpr_query (require 'gpr-query))
- (t
- (if (locate-file "gpr_query" exec-path '("" ".exe"))
- (require 'gpr-query)
- (require 'ada-gnat-xref)))
- )
- ;; FIXME: warn if gnat version >= gpl 2016, fsf 6 and no gpr_query installed
+(cl-case ada-xref-tool
+ (gnat (require 'ada-gnat-xref))
+ (gpr_query (require 'gpr-query))
+ (t
+ (if (locate-file "gpr_query" exec-path '("" ".exe"))
+ (require 'gpr-query)
+ (require 'ada-gnat-xref)))
)
+;; FIXME: warn if gnat version >= gpl 2016, fsf 6 and no gpr_query installed
(unless (featurep 'ada-compiler)
(require 'ada-gnat-compile))
_______________________________________________
Emacs-ada-mode mailing list
[email protected]
http://host114.hostmonster.com/mailman/listinfo/emacs-ada-mode_stephe-leake.org
