From ff6d2a9e33dd163c6fe9dec2fe8813ab4d689d7e Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Wed, 30 Jul 2008 09:42:46 +0000 Subject: [PATCH] * lisp/ada-prj.el (ada-prj-initialize-values): Fix use of deleted ada-xref-set-default-prj-values. (ada-prj-display-page): Ditto. * list/ada-xref.el (ada-gnatstub-opts): Fix doc string. (ada-make-filename-from-adaname): Fix free variable. --- lisp/ChangeLog | 19 +++++++++++++------ lisp/progmodes/ada-prj.el | 5 ++--- lisp/progmodes/ada-xref.el | 4 ++-- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8dbf24f1163..74b23a8f461 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2008-07-30 Stepehen Leake + + * lisp/ada-prj.el (ada-prj-initialize-values): Fix use of deleted + ada-xref-set-default-prj-values. + (ada-prj-display-page): Ditto. + + * list/ada-xref.el (ada-gnatstub-opts): Fix doc string. + (ada-make-filename-from-adaname): Fix free variable. + 2008-07-30 Dan Nicolaescu * vc-git.el (vc-git-status-printer): Synchronize with the default. @@ -17,12 +26,11 @@ tasks, as well as extern declarations of tasks for indenting and for foward/backward expression. -2008-07-30 Wilson Snyder +2008-07-30 Wilson Snyder * verilog-mode (verilog-read-decls): Allow AUTORESET to work with SV 'logic' signals. [Julian Gorfajn] - (verilog-auto-inst-column): Make verilog-auto-inst-column - customizable. + (verilog-auto-inst-column): Make verilog-auto-inst-column customizable. (verilog-string-replace-matches): Avoid recursion with small replacements. (verilog-auto-inst-param-value, verilog-mode-version) @@ -31,10 +39,9 @@ (verilog-auto-inst-port, verilog-simplify-range-expression): Add verilog-auto-inst-param-value option for AUTOINST. [David Rogoff] This allows parameters to be replaced with their values, on the - expansion of an AUTOINST with Verilog 2001 style parameter - settings. + expansion of an AUTOINST with Verilog 2001 style parameter settings. -2008-07-30 David Lord +2008-07-30 David Lord * calendar/timeclock.el (timeclock-day-projects): Change a `cdr' to `cddr'. diff --git a/lisp/progmodes/ada-prj.el b/lisp/progmodes/ada-prj.el index 9f1aa36cee3..f70906bae0d 100644 --- a/lisp/progmodes/ada-prj.el +++ b/lisp/progmodes/ada-prj.el @@ -104,7 +104,7 @@ If no project file is found, return the default values." ;; Set default values (except for the file name if this was given ;; in the buffer - (ada-xref-set-default-prj-values symbol ada-buffer) + (set symbol (ada-default-prj-properties)) (if (and filename (not (string= filename ""))) (set symbol (plist-put (eval symbol) 'filename filename))) )) @@ -463,8 +463,7 @@ connect to the target when working with cross-environments" t) (widget-insert "______________________________________________________________________\n\n ") (widget-create 'push-button :notify (lambda (&rest ignore) - (ada-xref-set-default-prj-values - 'ada-prj-current-values ada-prj-ada-buffer) + (setq ada-prj-current-values (ada-default-prj-properties)) (ada-prj-display-page 1)) "Reset to Default Values") (widget-insert " ") diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el index 7470f8ca6b4..d38795658cd 100644 --- a/lisp/progmodes/ada-xref.el +++ b/lisp/progmodes/ada-xref.el @@ -157,7 +157,7 @@ this string is not empty. It is set whenever a project file is found." :type '(file :must-match t) :group 'ada) (defcustom ada-gnatstub-opts "-q -I${src_dir}" - "*List of the options to pass to `gnatsub' to generate the body of a package. + "*Options to pass to `gnatsub' to generate the body of a package. This has the same syntax as in the project file (with variable substitution)." :type 'string :group 'ada) @@ -2276,7 +2276,7 @@ Return the position of the declaration in the buffer, or nil if not found." "Determine the filename in which ADANAME is found. This is a GNAT specific function that uses gnatkrunch." (let ((krunch-buf (generate-new-buffer "*gkrunch*")) - (cross-prefix (plist-get plist 'cross_prefix))) + (cross-prefix (plist-get (cdr (ada-xref-current-project)) 'cross_prefix))) (save-excursion (set-buffer krunch-buf) ;; send adaname to external process `gnatkr'. -- 2.39.2