[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/progmodes/ada-prj.el
From: |
Juanma Barranquero |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/progmodes/ada-prj.el |
Date: |
Tue, 04 Feb 2003 08:24:36 -0500 |
Index: emacs/lisp/progmodes/ada-prj.el
diff -c emacs/lisp/progmodes/ada-prj.el:1.9 emacs/lisp/progmodes/ada-prj.el:1.10
*** emacs/lisp/progmodes/ada-prj.el:1.9 Thu Jun 20 13:17:32 2002
--- emacs/lisp/progmodes/ada-prj.el Tue Feb 4 08:24:34 2003
***************
*** 75,81 ****
prj)))
(if (not (string= (file-name-extension filename t) ".adp"))
(error "File name extension for project files must be .adp"))
!
(ada-customize nil filename)))
(defun ada-prj-edit ()
--- 75,81 ----
prj)))
(if (not (string= (file-name-extension filename t) ".adp"))
(error "File name extension for project files must be .adp"))
!
(ada-customize nil filename)))
(defun ada-prj-edit ()
***************
*** 105,123 ****
;; Else use the active one
(set 'prj ada-prj-default-project-file))
!
(if (and prj
(not (string= prj ""))
(assoc prj ada-xref-project-files))
(set symbol (copy-sequence (cdr (assoc prj ada-xref-project-files))))
!
;; Set default values (except for the file name if this was given
;; in the buffer
(ada-xref-set-default-prj-values symbol ada-buffer)
(if (and prj (not (string= prj "")))
(set symbol (plist-put (eval symbol) 'filename prj)))
)))
!
(defun ada-prj-save-specific-option (field)
"Returns the string to print in the project file to save FIELD.
--- 105,123 ----
;; Else use the active one
(set 'prj ada-prj-default-project-file))
!
(if (and prj
(not (string= prj ""))
(assoc prj ada-xref-project-files))
(set symbol (copy-sequence (cdr (assoc prj ada-xref-project-files))))
!
;; Set default values (except for the file name if this was given
;; in the buffer
(ada-xref-set-default-prj-values symbol ada-buffer)
(if (and prj (not (string= prj "")))
(set symbol (plist-put (eval symbol) 'filename prj)))
)))
!
(defun ada-prj-save-specific-option (field)
"Returns the string to print in the project file to save FIELD.
***************
*** 138,144 ****
;; Save the fields that do not depend on the current buffer
;; only if they are different from the default value
!
(ada-prj-save-specific-option 'comp_opt)
(ada-prj-save-specific-option 'bind_opt)
(ada-prj-save-specific-option 'link_opt)
--- 138,144 ----
;; Save the fields that do not depend on the current buffer
;; only if they are different from the default value
!
(ada-prj-save-specific-option 'comp_opt)
(ada-prj-save-specific-option 'bind_opt)
(ada-prj-save-specific-option 'link_opt)
***************
*** 173,179 ****
(plist-get ada-prj-current-values 'debug_post_cmd))
"\n"
))
!
(find-file file-name)
(erase-buffer)
(insert output)
--- 173,179 ----
(plist-get ada-prj-current-values 'debug_post_cmd))
"\n"
))
!
(find-file file-name)
(erase-buffer)
(insert output)
***************
*** 264,272 ****
widget-field-list nil)
(mapcar (lambda (x) (delete-overlay x)) (car (overlay-lists)))
(mapcar (lambda (x) (delete-overlay x)) (cdr (overlay-lists)))))
!
;; Display the tabs
!
(widget-insert "\n Project and Editor configuration.\n
___________ ____________ ____________ ____________
____________\n / ")
(widget-create 'push-button :notify
--- 264,272 ----
widget-field-list nil)
(mapcar (lambda (x) (delete-overlay x)) (car (overlay-lists)))
(mapcar (lambda (x) (delete-overlay x)) (cdr (overlay-lists)))))
!
;; Display the tabs
!
(widget-insert "\n Project and Editor configuration.\n
___________ ____________ ____________ ____________
____________\n / ")
(widget-create 'push-button :notify
***************
*** 286,294 ****
(widget-insert " \\\n")
;; Display the currently selected page
!
(cond
!
;;
;; First page (General)
;;
--- 286,294 ----
(widget-insert " \\\n")
;; Display the currently selected page
!
(cond
!
;;
;; First page (General)
;;
***************
*** 335,341 ****
To use JGNAT, enter 'j'.")
)
!
;;
;; Second page (Paths)
;;
--- 335,341 ----
To use JGNAT, enter 'j'.")
)
!
;;
;; Second page (Paths)
;;
***************
*** 347,353 ****
(plist-get ada-prj-current-values 'cross_prefix))
(ada-initialize-runtime-library ada-old-cross-prefix)))
!
(widget-insert "/_____________\\/
\\/______________\\/______________\\/______________\\\n")
(ada-prj-field 'src_dir "Source directories"
"Enter the list of directories where your Ada
--- 347,353 ----
(plist-get ada-prj-current-values 'cross_prefix))
(ada-initialize-runtime-library ada-old-cross-prefix)))
!
(widget-insert "/_____________\\/
\\/______________\\/______________\\/______________\\\n")
(ada-prj-field 'src_dir "Source directories"
"Enter the list of directories where your Ada
***************
*** 363,369 ****
"\n")
)
(widget-insert "\n\n")
!
(ada-prj-field 'obj_dir "Object directories"
"Enter the list of directories where the GNAT
library files (ALI files) can be found. These
--- 363,369 ----
"\n")
)
(widget-insert "\n\n")
!
(ada-prj-field 'obj_dir "Object directories"
"Enter the list of directories where the GNAT
library files (ALI files) can be found. These
***************
*** 397,403 ****
command and are passed to the linker")
(ada-prj-field 'gnatmake_opt "Switches for gnatmake"
"These switches are used in the default gnatmake
! command.")
(ada-prj-field 'gnatfind_opt "Switches for gnatfind"
"The command gnatfind is run every time the Ada/Goto/List_References menu.
You should for instance add -a if you are working in an environment
--- 397,403 ----
command and are passed to the linker")
(ada-prj-field 'gnatmake_opt "Switches for gnatmake"
"These switches are used in the default gnatmake
! command.")
(ada-prj-field 'gnatfind_opt "Switches for gnatfind"
"The command gnatfind is run every time the Ada/Goto/List_References menu.
You should for instance add -a if you are working in an environment
***************
*** 455,461 ****
debugger"
"The following commands are executed one after the other before starting
the debugger. These can be used to set up your environment." t)
!
(ada-prj-field 'debug_cmd "Debugging the application"
"Specifies how to debug the application, possibly
remotely if remote_machine has been set. We
--- 455,461 ----
debugger"
"The following commands are executed one after the other before starting
the debugger. These can be used to set up your environment." t)
!
(ada-prj-field 'debug_cmd "Debugging the application"
"Specifies how to debug the application, possibly
remotely if remote_machine has been set. We
***************
*** 469,475 ****
started. These can be used to initialize the debugger, for instance to
connect to the target when working with cross-environments" t)
)
!
)
--- 469,475 ----
started. These can be used to initialize the debugger, for instance to
connect to the target when working with cross-environments" t)
)
!
)
***************
*** 505,511 ****
;; We can only edit interactively the standard ada-mode project files. If
;; the user is using other formats for the project file (through hooks in
;; `ada-load-project-hook', we simply edit the file
!
(if (and (not new-file)
(or ada-prj-default-project-file filename)
(string= (file-name-extension
--- 505,511 ----
;; We can only edit interactively the standard ada-mode project files. If
;; the user is using other formats for the project file (through hooks in
;; `ada-load-project-hook', we simply edit the file
!
(if (and (not new-file)
(or ada-prj-default-project-file filename)
(string= (file-name-extension
***************
*** 519,540 ****
;; Else start the interactive editor
(switch-to-buffer "*Customize Ada Mode*")
(kill-all-local-variables)
!
(ada-xref-set-default-prj-values 'ada-prj-default-values ada-buffer)
(ada-prj-initialize-values
'ada-prj-current-values ada-buffer filename)
!
(set (make-local-variable 'ada-prj-ada-buffer) ada-buffer)
!
(use-local-map (copy-keymap custom-mode-map))
(local-set-key "\C-x\C-s" 'ada-prj-save)
!
(make-local-variable 'widget-keymap)
(define-key widget-keymap "\C-x\C-s" 'ada-prj-save)
!
(set (make-local-variable 'ada-old-cross-prefix)
(ada-xref-get-project-field 'cross-prefix))
!
(ada-prj-display-page 1)
)))
--- 519,540 ----
;; Else start the interactive editor
(switch-to-buffer "*Customize Ada Mode*")
(kill-all-local-variables)
!
(ada-xref-set-default-prj-values 'ada-prj-default-values ada-buffer)
(ada-prj-initialize-values
'ada-prj-current-values ada-buffer filename)
!
(set (make-local-variable 'ada-prj-ada-buffer) ada-buffer)
!
(use-local-map (copy-keymap custom-mode-map))
(local-set-key "\C-x\C-s" 'ada-prj-save)
!
(make-local-variable 'widget-keymap)
(define-key widget-keymap "\C-x\C-s" 'ada-prj-save)
!
(set (make-local-variable 'ada-old-cross-prefix)
(ada-xref-get-project-field 'cross-prefix))
!
(ada-prj-display-page 1)
)))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/progmodes/ada-prj.el,
Juanma Barranquero <=