2006-10-31 01:02:41 +00:00
|
|
|
;;; ada-prj.el --- GUI editing of project files for the ada-mode
|
1999-10-07 14:31:47 +00:00
|
|
|
|
2011-01-24 20:08:28 -08:00
|
|
|
;; Copyright (C) 1998-2011 Free Software Foundation, Inc.
|
1999-10-07 14:31:47 +00:00
|
|
|
|
|
|
|
;; Author: Emmanuel Briot <briot@gnat.com>
|
2006-10-31 01:02:41 +00:00
|
|
|
;; Maintainer: Stephen Leake <stephen_leake@stephe-leake.org>
|
1999-10-07 14:31:47 +00:00
|
|
|
;; Keywords: languages, ada, project file
|
2010-08-29 12:17:13 -04:00
|
|
|
;; Package: ada-mode
|
1999-10-07 14:31:47 +00:00
|
|
|
|
2001-07-11 10:21:04 +00:00
|
|
|
;; This file is part of GNU Emacs.
|
1999-10-07 14:31:47 +00:00
|
|
|
|
2008-05-06 07:25:26 +00:00
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
1999-10-07 14:31:47 +00:00
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 07:25:26 +00:00
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
;; (at your option) any later version.
|
1999-10-07 14:31:47 +00:00
|
|
|
|
2001-07-13 12:59:13 +00:00
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
1999-10-07 14:31:47 +00:00
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2008-05-06 07:25:26 +00:00
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
1999-10-07 14:31:47 +00:00
|
|
|
|
2001-07-16 07:46:48 +00:00
|
|
|
;;; Commentary:
|
|
|
|
|
1999-10-07 14:31:47 +00:00
|
|
|
;;; This package provides a set of functions to easily edit the project
|
|
|
|
;;; files used by the ada-mode.
|
2000-07-24 11:14:01 +00:00
|
|
|
;;; The only function publicly available here is `ada-customize'.
|
|
|
|
;;; See the documentation of the Ada mode for more information on the project
|
|
|
|
;;; files.
|
|
|
|
;;; Internally, a project file is represented as a property list, with each
|
|
|
|
;;; field of the project file matching one property of the list.
|
1999-10-07 14:31:47 +00:00
|
|
|
|
2006-10-31 01:02:41 +00:00
|
|
|
|
|
|
|
;;; History:
|
|
|
|
;;
|
|
|
|
|
2001-07-16 07:46:48 +00:00
|
|
|
;;; Code:
|
1999-10-07 14:31:47 +00:00
|
|
|
|
|
|
|
|
|
|
|
;; ----- Requirements -----------------------------------------------------
|
|
|
|
|
|
|
|
(require 'cus-edit)
|
2003-04-29 23:43:00 +00:00
|
|
|
(require 'ada-xref)
|
1999-10-07 14:31:47 +00:00
|
|
|
|
2003-05-04 19:55:38 +00:00
|
|
|
(eval-when-compile
|
|
|
|
(require 'ada-mode))
|
|
|
|
|
1999-10-07 14:31:47 +00:00
|
|
|
;; ----- Buffer local variables -------------------------------------------
|
|
|
|
|
2000-07-24 11:14:01 +00:00
|
|
|
(defvar ada-prj-current-values nil
|
2003-05-04 19:55:38 +00:00
|
|
|
"Hold the current value of the fields, This is a property list.")
|
2000-07-24 11:14:01 +00:00
|
|
|
(make-variable-buffer-local 'ada-prj-current-values)
|
|
|
|
|
|
|
|
(defvar ada-prj-default-values nil
|
2003-05-04 19:55:38 +00:00
|
|
|
"Hold the default value for the fields, This is a property list.")
|
2000-07-24 11:14:01 +00:00
|
|
|
(make-variable-buffer-local 'ada-prj-default-values)
|
|
|
|
|
|
|
|
(defvar ada-prj-ada-buffer nil
|
|
|
|
"Indicates what Ada source file was being edited.")
|
|
|
|
|
2002-04-09 18:56:34 +00:00
|
|
|
(defvar ada-old-cross-prefix nil
|
|
|
|
"The cross-prefix associated with the currently loaded runtime library.")
|
|
|
|
|
2000-07-24 11:14:01 +00:00
|
|
|
|
|
|
|
;; ----- Functions --------------------------------------------------------
|
|
|
|
|
|
|
|
(defun ada-prj-new ()
|
2006-10-31 01:02:41 +00:00
|
|
|
"Open a new project file."
|
1999-10-07 14:31:47 +00:00
|
|
|
(interactive)
|
2000-07-24 11:14:01 +00:00
|
|
|
(let* ((prj
|
2002-04-09 18:56:34 +00:00
|
|
|
(if (and ada-prj-default-project-file
|
|
|
|
(not (string= ada-prj-default-project-file "")))
|
|
|
|
ada-prj-default-project-file
|
2000-07-24 11:14:01 +00:00
|
|
|
"default.adp"))
|
|
|
|
(filename (read-file-name "Project file: "
|
|
|
|
(if prj "" nil)
|
|
|
|
nil
|
|
|
|
nil
|
|
|
|
prj)))
|
|
|
|
(if (not (string= (file-name-extension filename t) ".adp"))
|
|
|
|
(error "File name extension for project files must be .adp"))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
2000-07-24 11:14:01 +00:00
|
|
|
(ada-customize nil filename)))
|
|
|
|
|
|
|
|
(defun ada-prj-edit ()
|
|
|
|
"Editing the project file associated with the current Ada buffer.
|
Typo fixes for Ada mode.
* progmodes/ada-mode.el (ada-batch-reformat): Doc fix.
(ada-create-case-exception): Fix typo in docstring.
(ada-no-auto-case): Return nil, not the docstring.
(ada-indent-current): Reflow docstring.
* progmodes/ada-prj.el (ada-prj-edit, ada-prj-initialize-values)
(ada-prj-save-specific-option, ada-prj-field): Fix typos in docstrings.
(ada-prj-load-from-file): Reflow docstring.
(ada-prj-display-page): Fix typo in widget.
* progmodes/ada-stmt.el (ada-case, ada-package-body, ada-private):
Fix typos in docstrings.
* progmodes/ada-xref.el (ada-find-executable, ada-gnat-parse-gpr)
(ada-compile-current, ada-check-current, ada-run-application)
(ada-get-ali-file-name): Fix typos in docstrings.
(ada-xref-confirm-compile, ada-find-references)
(ada-find-local-references, ada-find-any-references): Doc fixes.
(ada-get-all-references): Fix typo in error message.
(ada-xref-current-project): Use `let', not `let*'.
(ada-do-file-completion, ada-xref-change-buffer): Reflow docstring.
2008-07-29 13:20:39 +00:00
|
|
|
If there is none, opens a new project file."
|
2000-07-24 11:14:01 +00:00
|
|
|
(interactive)
|
2002-06-20 17:17:32 +00:00
|
|
|
(if ada-prj-default-project-file
|
|
|
|
(ada-customize)
|
|
|
|
(ada-prj-new)))
|
1999-10-07 14:31:47 +00:00
|
|
|
|
2003-04-29 23:43:00 +00:00
|
|
|
(defun ada-prj-initialize-values (symbol ada-buffer filename)
|
2000-07-24 11:14:01 +00:00
|
|
|
"Set SYMBOL to the property list of the project file FILENAME.
|
Typo fixes for Ada mode.
* progmodes/ada-mode.el (ada-batch-reformat): Doc fix.
(ada-create-case-exception): Fix typo in docstring.
(ada-no-auto-case): Return nil, not the docstring.
(ada-indent-current): Reflow docstring.
* progmodes/ada-prj.el (ada-prj-edit, ada-prj-initialize-values)
(ada-prj-save-specific-option, ada-prj-field): Fix typos in docstrings.
(ada-prj-load-from-file): Reflow docstring.
(ada-prj-display-page): Fix typo in widget.
* progmodes/ada-stmt.el (ada-case, ada-package-body, ada-private):
Fix typos in docstrings.
* progmodes/ada-xref.el (ada-find-executable, ada-gnat-parse-gpr)
(ada-compile-current, ada-check-current, ada-run-application)
(ada-get-ali-file-name): Fix typos in docstrings.
(ada-xref-confirm-compile, ada-find-references)
(ada-find-local-references, ada-find-any-references): Doc fixes.
(ada-get-all-references): Fix typo in error message.
(ada-xref-current-project): Use `let', not `let*'.
(ada-do-file-completion, ada-xref-change-buffer): Reflow docstring.
2008-07-29 13:20:39 +00:00
|
|
|
If FILENAME is null, read the file associated with ADA-BUFFER.
|
|
|
|
If no project file is found, return the default values."
|
2006-10-31 01:02:41 +00:00
|
|
|
;; FIXME: rationalize arguments; make ada-buffer optional?
|
2003-04-29 23:43:00 +00:00
|
|
|
(if (and filename
|
|
|
|
(not (string= filename ""))
|
|
|
|
(assoc filename ada-xref-project-files))
|
|
|
|
(set symbol (copy-sequence (cdr (assoc filename ada-xref-project-files))))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
2003-04-29 23:43:00 +00:00
|
|
|
;; Set default values (except for the file name if this was given
|
|
|
|
;; in the buffer
|
2008-07-30 09:42:46 +00:00
|
|
|
(set symbol (ada-default-prj-properties))
|
2003-04-29 23:43:00 +00:00
|
|
|
(if (and filename (not (string= filename "")))
|
|
|
|
(set symbol (plist-put (eval symbol) 'filename filename)))
|
|
|
|
))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
1999-10-07 14:31:47 +00:00
|
|
|
|
2000-07-24 11:14:01 +00:00
|
|
|
(defun ada-prj-save-specific-option (field)
|
2006-10-31 01:02:41 +00:00
|
|
|
"Return the string to print in the project file to save FIELD.
|
Typo fixes for Ada mode.
* progmodes/ada-mode.el (ada-batch-reformat): Doc fix.
(ada-create-case-exception): Fix typo in docstring.
(ada-no-auto-case): Return nil, not the docstring.
(ada-indent-current): Reflow docstring.
* progmodes/ada-prj.el (ada-prj-edit, ada-prj-initialize-values)
(ada-prj-save-specific-option, ada-prj-field): Fix typos in docstrings.
(ada-prj-load-from-file): Reflow docstring.
(ada-prj-display-page): Fix typo in widget.
* progmodes/ada-stmt.el (ada-case, ada-package-body, ada-private):
Fix typos in docstrings.
* progmodes/ada-xref.el (ada-find-executable, ada-gnat-parse-gpr)
(ada-compile-current, ada-check-current, ada-run-application)
(ada-get-ali-file-name): Fix typos in docstrings.
(ada-xref-confirm-compile, ada-find-references)
(ada-find-local-references, ada-find-any-references): Doc fixes.
(ada-get-all-references): Fix typo in error message.
(ada-xref-current-project): Use `let', not `let*'.
(ada-do-file-completion, ada-xref-change-buffer): Reflow docstring.
2008-07-29 13:20:39 +00:00
|
|
|
If the current value of FIELD is the default value, return an empty string."
|
2000-07-24 11:14:01 +00:00
|
|
|
(if (string= (plist-get ada-prj-current-values field)
|
|
|
|
(plist-get ada-prj-default-values field))
|
|
|
|
""
|
|
|
|
(concat (symbol-name field)
|
|
|
|
"=" (plist-get ada-prj-current-values field) "\n")))
|
1999-10-07 14:31:47 +00:00
|
|
|
|
|
|
|
(defun ada-prj-save ()
|
2000-07-24 11:14:01 +00:00
|
|
|
"Save the edited project file."
|
1999-10-07 14:31:47 +00:00
|
|
|
(interactive)
|
2008-07-28 11:03:42 +00:00
|
|
|
(let ((file-name (or (plist-get ada-prj-current-values 'filename)
|
|
|
|
(read-file-name "Save project as: ")))
|
2000-07-24 11:14:01 +00:00
|
|
|
output)
|
|
|
|
(set 'output
|
|
|
|
(concat
|
|
|
|
|
|
|
|
;; Save the fields that do not depend on the current buffer
|
|
|
|
;; only if they are different from the default value
|
2003-02-04 13:24:35 +00:00
|
|
|
|
2000-07-24 11:14:01 +00:00
|
|
|
(ada-prj-save-specific-option 'comp_opt)
|
|
|
|
(ada-prj-save-specific-option 'bind_opt)
|
|
|
|
(ada-prj-save-specific-option 'link_opt)
|
|
|
|
(ada-prj-save-specific-option 'gnatmake_opt)
|
2002-04-09 18:56:34 +00:00
|
|
|
(ada-prj-save-specific-option 'gnatfind_opt)
|
2000-07-24 11:14:01 +00:00
|
|
|
(ada-prj-save-specific-option 'cross_prefix)
|
|
|
|
(ada-prj-save-specific-option 'remote_machine)
|
|
|
|
(ada-prj-save-specific-option 'debug_cmd)
|
|
|
|
|
|
|
|
;; Always save the fields that depend on the current buffer
|
2002-04-09 18:56:34 +00:00
|
|
|
"main=" (plist-get ada-prj-current-values 'main) "\n"
|
|
|
|
"build_dir=" (plist-get ada-prj-current-values 'build_dir) "\n"
|
|
|
|
(ada-prj-set-list "check_cmd"
|
|
|
|
(plist-get ada-prj-current-values 'check_cmd)) "\n"
|
|
|
|
(ada-prj-set-list "make_cmd"
|
|
|
|
(plist-get ada-prj-current-values 'make_cmd)) "\n"
|
|
|
|
(ada-prj-set-list "comp_cmd"
|
|
|
|
(plist-get ada-prj-current-values 'comp_cmd)) "\n"
|
|
|
|
(ada-prj-set-list "run_cmd"
|
|
|
|
(plist-get ada-prj-current-values 'run_cmd)) "\n"
|
2000-07-24 11:14:01 +00:00
|
|
|
(ada-prj-set-list "src_dir"
|
2002-04-09 18:56:34 +00:00
|
|
|
(plist-get ada-prj-current-values 'src_dir)
|
|
|
|
t) "\n"
|
2000-07-24 11:14:01 +00:00
|
|
|
(ada-prj-set-list "obj_dir"
|
2002-04-09 18:56:34 +00:00
|
|
|
(plist-get ada-prj-current-values 'obj_dir)
|
|
|
|
t) "\n"
|
|
|
|
(ada-prj-set-list "debug_pre_cmd"
|
|
|
|
(plist-get ada-prj-current-values 'debug_pre_cmd))
|
|
|
|
"\n"
|
|
|
|
(ada-prj-set-list "debug_post_cmd"
|
|
|
|
(plist-get ada-prj-current-values 'debug_post_cmd))
|
|
|
|
"\n"
|
2000-07-24 11:14:01 +00:00
|
|
|
))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
1999-10-07 14:31:47 +00:00
|
|
|
(find-file file-name)
|
|
|
|
(erase-buffer)
|
|
|
|
(insert output)
|
|
|
|
(save-buffer)
|
|
|
|
;; kill the project buffer
|
|
|
|
(kill-buffer nil)
|
|
|
|
|
|
|
|
;; kill the editor buffer
|
2006-10-31 01:02:41 +00:00
|
|
|
(kill-buffer "*Edit Ada Mode Project*")
|
1999-10-07 14:31:47 +00:00
|
|
|
|
2002-04-09 18:56:34 +00:00
|
|
|
;; automatically set the new project file as the active one
|
|
|
|
(set 'ada-prj-default-project-file file-name)
|
1999-10-07 14:31:47 +00:00
|
|
|
|
2000-07-24 11:14:01 +00:00
|
|
|
;; force Emacs to reread the project files
|
|
|
|
(ada-reread-prj-file file-name)
|
1999-10-07 14:31:47 +00:00
|
|
|
)
|
|
|
|
)
|
|
|
|
|
2000-07-24 11:14:01 +00:00
|
|
|
(defun ada-prj-load-from-file (symbol)
|
Typo fixes for Ada mode.
* progmodes/ada-mode.el (ada-batch-reformat): Doc fix.
(ada-create-case-exception): Fix typo in docstring.
(ada-no-auto-case): Return nil, not the docstring.
(ada-indent-current): Reflow docstring.
* progmodes/ada-prj.el (ada-prj-edit, ada-prj-initialize-values)
(ada-prj-save-specific-option, ada-prj-field): Fix typos in docstrings.
(ada-prj-load-from-file): Reflow docstring.
(ada-prj-display-page): Fix typo in widget.
* progmodes/ada-stmt.el (ada-case, ada-package-body, ada-private):
Fix typos in docstrings.
* progmodes/ada-xref.el (ada-find-executable, ada-gnat-parse-gpr)
(ada-compile-current, ada-check-current, ada-run-application)
(ada-get-ali-file-name): Fix typos in docstrings.
(ada-xref-confirm-compile, ada-find-references)
(ada-find-local-references, ada-find-any-references): Doc fixes.
(ada-get-all-references): Fix typo in error message.
(ada-xref-current-project): Use `let', not `let*'.
(ada-do-file-completion, ada-xref-change-buffer): Reflow docstring.
2008-07-29 13:20:39 +00:00
|
|
|
"Load SYMBOL value from file.
|
|
|
|
One item per line should be found in the file."
|
2000-07-24 11:14:01 +00:00
|
|
|
(save-excursion
|
|
|
|
(let ((file (read-file-name "File name: " nil nil t))
|
|
|
|
(buffer (current-buffer))
|
|
|
|
line
|
|
|
|
list)
|
|
|
|
(find-file file)
|
|
|
|
(widen)
|
|
|
|
(goto-char (point-min))
|
|
|
|
(while (not (eobp))
|
Replace end-of-line, save-excursion etc with point-at-eol, point-at-bol.
* lisp/mh-e/mh-seq.el (mh-read-msg-list): Use point-at-eol.
* lisp/gnus/gnus-bookmark.el (gnus-bookmark-bmenu-show-infos)
(gnus-bookmark-kill-line): Use point-at-eol.
* lisp/cedet/ede/proj-elisp.el (ede-proj-flush-autoconf): Use point-at-bol.
* lisp/emacs-lisp/chart.el (chart-zap-chars):
* lisp/play/decipher.el (decipher-set-map):
* lisp/progmodes/ada-mode.el (ada-get-current-indent)
(ada-search-ignore-string-comment, ada-tab-hard, ada-untab-hard):
* lisp/progmodes/ada-prj.el (ada-prj-load-from-file, ada-prj-display-help):
* lisp/progmodes/ada-xref.el (ada-initialize-runtime-library)
(ada-get-all-references):
* lisp/progmodes/cperl-mode.el (cperl-electric-paren)
(cperl-electric-rparen, cperl-electric-keyword, cperl-electric-else)
(cperl-linefeed, cperl-sniff-for-indent, cperl-to-comment-or-eol)
(cperl-find-pods-heres, cperl-indent-exp, cperl-fix-line-spacing)
(cperl-word-at-point-hard):
* lisp/progmodes/idlw-shell.el (idlwave-shell-move-or-history)
(idlwave-shell-filename-string, idlwave-shell-batch-command)
(idlwave-shell-display-line):
* lisp/progmodes/idlwave.el (idlwave-show-begin, idlwave-fill-paragraph)
(idlwave-calc-hanging-indent, idlwave-auto-fill, idlwave-template):
* lisp/progmodes/js.el (js--re-search-forward-inner)
(js--re-search-backward-inner):
* lisp/progmodes/vhdl-mode.el (vhdl-align-region-1, vhdl-align-region-2)
(vhdl-fix-clause, vhdl-compose-configuration-architecture):
* lisp/progmodes/ruby-mode.el (ruby-parse-partial, eval-when-compile):
* lisp/textmodes/flyspell.el (flyspell-process-localwords):
* lisp/textmodes/ispell.el (ispell-buffer-local-parsing)
(ispell-buffer-local-dict, ispell-buffer-local-words):
Use point-at-bol and point-at-eol.
2010-11-06 18:36:33 -07:00
|
|
|
(set 'line (buffer-substring-no-properties (point) (point-at-eol)))
|
2000-07-24 11:14:01 +00:00
|
|
|
(add-to-list 'list line)
|
Replace end-of-line, save-excursion etc with point-at-eol, point-at-bol.
* lisp/mh-e/mh-seq.el (mh-read-msg-list): Use point-at-eol.
* lisp/gnus/gnus-bookmark.el (gnus-bookmark-bmenu-show-infos)
(gnus-bookmark-kill-line): Use point-at-eol.
* lisp/cedet/ede/proj-elisp.el (ede-proj-flush-autoconf): Use point-at-bol.
* lisp/emacs-lisp/chart.el (chart-zap-chars):
* lisp/play/decipher.el (decipher-set-map):
* lisp/progmodes/ada-mode.el (ada-get-current-indent)
(ada-search-ignore-string-comment, ada-tab-hard, ada-untab-hard):
* lisp/progmodes/ada-prj.el (ada-prj-load-from-file, ada-prj-display-help):
* lisp/progmodes/ada-xref.el (ada-initialize-runtime-library)
(ada-get-all-references):
* lisp/progmodes/cperl-mode.el (cperl-electric-paren)
(cperl-electric-rparen, cperl-electric-keyword, cperl-electric-else)
(cperl-linefeed, cperl-sniff-for-indent, cperl-to-comment-or-eol)
(cperl-find-pods-heres, cperl-indent-exp, cperl-fix-line-spacing)
(cperl-word-at-point-hard):
* lisp/progmodes/idlw-shell.el (idlwave-shell-move-or-history)
(idlwave-shell-filename-string, idlwave-shell-batch-command)
(idlwave-shell-display-line):
* lisp/progmodes/idlwave.el (idlwave-show-begin, idlwave-fill-paragraph)
(idlwave-calc-hanging-indent, idlwave-auto-fill, idlwave-template):
* lisp/progmodes/js.el (js--re-search-forward-inner)
(js--re-search-backward-inner):
* lisp/progmodes/vhdl-mode.el (vhdl-align-region-1, vhdl-align-region-2)
(vhdl-fix-clause, vhdl-compose-configuration-architecture):
* lisp/progmodes/ruby-mode.el (ruby-parse-partial, eval-when-compile):
* lisp/textmodes/flyspell.el (flyspell-process-localwords):
* lisp/textmodes/ispell.el (ispell-buffer-local-parsing)
(ispell-buffer-local-dict, ispell-buffer-local-words):
Use point-at-bol and point-at-eol.
2010-11-06 18:36:33 -07:00
|
|
|
(forward-line 1))
|
2000-07-24 11:14:01 +00:00
|
|
|
(kill-buffer nil)
|
|
|
|
(set-buffer buffer)
|
|
|
|
(set 'ada-prj-current-values
|
|
|
|
(plist-put ada-prj-current-values
|
|
|
|
symbol
|
|
|
|
(append (plist-get ada-prj-current-values symbol)
|
Replace end-of-line, save-excursion etc with point-at-eol, point-at-bol.
* lisp/mh-e/mh-seq.el (mh-read-msg-list): Use point-at-eol.
* lisp/gnus/gnus-bookmark.el (gnus-bookmark-bmenu-show-infos)
(gnus-bookmark-kill-line): Use point-at-eol.
* lisp/cedet/ede/proj-elisp.el (ede-proj-flush-autoconf): Use point-at-bol.
* lisp/emacs-lisp/chart.el (chart-zap-chars):
* lisp/play/decipher.el (decipher-set-map):
* lisp/progmodes/ada-mode.el (ada-get-current-indent)
(ada-search-ignore-string-comment, ada-tab-hard, ada-untab-hard):
* lisp/progmodes/ada-prj.el (ada-prj-load-from-file, ada-prj-display-help):
* lisp/progmodes/ada-xref.el (ada-initialize-runtime-library)
(ada-get-all-references):
* lisp/progmodes/cperl-mode.el (cperl-electric-paren)
(cperl-electric-rparen, cperl-electric-keyword, cperl-electric-else)
(cperl-linefeed, cperl-sniff-for-indent, cperl-to-comment-or-eol)
(cperl-find-pods-heres, cperl-indent-exp, cperl-fix-line-spacing)
(cperl-word-at-point-hard):
* lisp/progmodes/idlw-shell.el (idlwave-shell-move-or-history)
(idlwave-shell-filename-string, idlwave-shell-batch-command)
(idlwave-shell-display-line):
* lisp/progmodes/idlwave.el (idlwave-show-begin, idlwave-fill-paragraph)
(idlwave-calc-hanging-indent, idlwave-auto-fill, idlwave-template):
* lisp/progmodes/js.el (js--re-search-forward-inner)
(js--re-search-backward-inner):
* lisp/progmodes/vhdl-mode.el (vhdl-align-region-1, vhdl-align-region-2)
(vhdl-fix-clause, vhdl-compose-configuration-architecture):
* lisp/progmodes/ruby-mode.el (ruby-parse-partial, eval-when-compile):
* lisp/textmodes/flyspell.el (flyspell-process-localwords):
* lisp/textmodes/ispell.el (ispell-buffer-local-parsing)
(ispell-buffer-local-dict, ispell-buffer-local-words):
Use point-at-bol and point-at-eol.
2010-11-06 18:36:33 -07:00
|
|
|
(reverse list)))))
|
|
|
|
(ada-prj-display-page 2)))
|
2000-07-24 11:14:01 +00:00
|
|
|
|
|
|
|
(defun ada-prj-subdirs-of (dir)
|
2006-10-31 01:02:41 +00:00
|
|
|
"Return a list of all the subdirectories of DIR, recursively."
|
2000-07-24 11:14:01 +00:00
|
|
|
(let ((subdirs (directory-files dir t "^[^.].*"))
|
|
|
|
(dirlist (list dir)))
|
|
|
|
(while subdirs
|
|
|
|
(if (file-directory-p (car subdirs))
|
|
|
|
(let ((sub (ada-prj-subdirs-of (car subdirs))))
|
|
|
|
(if sub
|
|
|
|
(set 'dirlist (append sub dirlist)))))
|
|
|
|
(set 'subdirs (cdr subdirs)))
|
|
|
|
dirlist))
|
|
|
|
|
|
|
|
(defun ada-prj-load-directory (field &optional file-name)
|
2006-10-31 01:02:41 +00:00
|
|
|
"Append to FIELD in the current project the subdirectories of FILE-NAME.
|
2000-07-24 11:14:01 +00:00
|
|
|
If FILE-NAME is nil, ask the user for the name."
|
2002-06-20 17:17:32 +00:00
|
|
|
|
|
|
|
;; Do not use an external dialog for this, since it wouldn't allow
|
|
|
|
;; the user to select a directory
|
|
|
|
(let ((use-dialog-box nil))
|
|
|
|
(unless file-name
|
|
|
|
(set 'file-name (read-file-name "Root directory: " nil nil t))))
|
2000-07-24 11:14:01 +00:00
|
|
|
|
|
|
|
(set 'ada-prj-current-values
|
|
|
|
(plist-put ada-prj-current-values
|
|
|
|
field
|
|
|
|
(append (plist-get ada-prj-current-values field)
|
|
|
|
(reverse (ada-prj-subdirs-of
|
|
|
|
(expand-file-name file-name))))))
|
|
|
|
(ada-prj-display-page 2))
|
|
|
|
|
|
|
|
(defun ada-prj-display-page (tab-num)
|
2006-10-31 01:02:41 +00:00
|
|
|
"Display page TAB-NUM in the notebook.
|
2000-07-24 11:14:01 +00:00
|
|
|
The current buffer must be the project editing buffer."
|
|
|
|
|
|
|
|
(let ((inhibit-read-only t))
|
|
|
|
(erase-buffer))
|
|
|
|
|
2002-04-09 18:56:34 +00:00
|
|
|
;; Widget support in Emacs 21 requires that we clear the buffer first
|
2003-05-04 19:55:38 +00:00
|
|
|
(if (and (not (featurep 'xemacs)) (>= emacs-major-version 21))
|
2002-04-09 18:56:34 +00:00
|
|
|
(progn
|
|
|
|
(setq widget-field-new nil
|
|
|
|
widget-field-list nil)
|
2007-09-26 00:24:29 +00:00
|
|
|
(mapc (lambda (x) (delete-overlay x)) (car (overlay-lists)))
|
|
|
|
(mapc (lambda (x) (delete-overlay x)) (cdr (overlay-lists)))))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
2000-07-24 11:14:01 +00:00
|
|
|
;; Display the tabs
|
2003-02-04 13:24:35 +00:00
|
|
|
|
2006-10-31 01:02:41 +00:00
|
|
|
(widget-insert "\n Project configuration.\n
|
2002-04-09 18:56:34 +00:00
|
|
|
___________ ____________ ____________ ____________ ____________\n / ")
|
2000-07-24 11:14:01 +00:00
|
|
|
(widget-create 'push-button :notify
|
|
|
|
(lambda (&rest dummy) (ada-prj-display-page 1)) "General")
|
|
|
|
(widget-insert " \\ / ")
|
|
|
|
(widget-create 'push-button :notify
|
|
|
|
(lambda (&rest dummy) (ada-prj-display-page 2)) "Paths")
|
|
|
|
(widget-insert " \\ / ")
|
|
|
|
(widget-create 'push-button :notify
|
|
|
|
(lambda (&rest dummy) (ada-prj-display-page 3)) "Switches")
|
|
|
|
(widget-insert " \\ / ")
|
|
|
|
(widget-create 'push-button :notify
|
|
|
|
(lambda (&rest dummy) (ada-prj-display-page 4)) "Ada Menu")
|
2002-04-09 18:56:34 +00:00
|
|
|
(widget-insert " \\ / ")
|
|
|
|
(widget-create 'push-button :notify
|
|
|
|
(lambda (&rest dummy) (ada-prj-display-page 5)) "Debugger")
|
2000-07-24 11:14:01 +00:00
|
|
|
(widget-insert " \\\n")
|
|
|
|
|
|
|
|
;; Display the currently selected page
|
2003-02-04 13:24:35 +00:00
|
|
|
|
2000-07-24 11:14:01 +00:00
|
|
|
(cond
|
2003-02-04 13:24:35 +00:00
|
|
|
|
2000-07-24 11:14:01 +00:00
|
|
|
;;
|
|
|
|
;; First page (General)
|
|
|
|
;;
|
|
|
|
((= tab-num 1)
|
2002-04-09 18:56:34 +00:00
|
|
|
(widget-insert "/ \\/______________\\/______________\\/______________\\/______________\\\n")
|
2000-07-24 11:14:01 +00:00
|
|
|
|
|
|
|
(widget-insert "Project file name:\n")
|
|
|
|
(widget-insert (plist-get ada-prj-current-values 'filename))
|
|
|
|
(widget-insert "\n\n")
|
2008-07-28 11:03:42 +00:00
|
|
|
(ada-prj-field 'casing "Casing Exceptions"
|
|
|
|
"List of files that contain casing exception
|
|
|
|
dictionaries. All these files contain one
|
|
|
|
identifier per line, with a special casing.
|
|
|
|
The first file has the highest priority."
|
|
|
|
t nil
|
|
|
|
(mapconcat (lambda(x)
|
|
|
|
(concat " " x))
|
|
|
|
(ada-xref-get-project-field 'casing)
|
|
|
|
"\n")
|
|
|
|
)
|
2000-07-24 11:14:01 +00:00
|
|
|
(ada-prj-field 'main "Executable file name"
|
|
|
|
"Name of the executable generated when you
|
|
|
|
compile your application. This should include
|
|
|
|
the full directory name, using ${build_dir} if
|
|
|
|
you wish.")
|
|
|
|
(ada-prj-field 'build_dir "Build directory"
|
|
|
|
"Reference directory for relative paths in
|
|
|
|
src_dir and obj_dir below. This is also the directory
|
|
|
|
where the compilation is done.")
|
|
|
|
(ada-prj-field 'remote_machine "Name of the remote machine (if any)"
|
|
|
|
"If you want to remotely compile, debug and
|
|
|
|
run your application, specify the name of a
|
|
|
|
remote machine here. This capability requires
|
|
|
|
the 'rsh' protocol on the remote machine.")
|
|
|
|
(ada-prj-field 'cross_prefix "Prefix used in for the cross tool chain"
|
|
|
|
"When working on multiple cross targets, it is
|
|
|
|
most convenient to specify the prefix of the
|
|
|
|
tool chain here. For instance, on PowerPc
|
|
|
|
vxworks, you would enter 'powerpc-wrs-vxworks-'.
|
|
|
|
To use JGNAT, enter 'j'.")
|
|
|
|
)
|
1999-10-07 14:31:47 +00:00
|
|
|
|
2003-02-04 13:24:35 +00:00
|
|
|
|
2000-07-24 11:14:01 +00:00
|
|
|
;;
|
|
|
|
;; Second page (Paths)
|
|
|
|
;;
|
|
|
|
((= tab-num 2)
|
2002-04-09 18:56:34 +00:00
|
|
|
(if (not (equal (plist-get ada-prj-current-values 'cross_prefix)
|
|
|
|
ada-old-cross-prefix))
|
|
|
|
(progn
|
|
|
|
(setq ada-old-cross-prefix
|
|
|
|
(plist-get ada-prj-current-values 'cross_prefix))
|
|
|
|
(ada-initialize-runtime-library ada-old-cross-prefix)))
|
|
|
|
|
2003-02-04 13:24:35 +00:00
|
|
|
|
2002-04-09 18:56:34 +00:00
|
|
|
(widget-insert "/_____________\\/ \\/______________\\/______________\\/______________\\\n")
|
2000-07-24 11:14:01 +00:00
|
|
|
(ada-prj-field 'src_dir "Source directories"
|
|
|
|
"Enter the list of directories where your Ada
|
|
|
|
sources can be found. These directories will be
|
|
|
|
used for the cross-references and for the default
|
|
|
|
compilation commands.
|
|
|
|
Note that src_dir includes both the build directory
|
|
|
|
and the standard runtime."
|
|
|
|
t t
|
|
|
|
(mapconcat (lambda(x)
|
2006-10-31 01:02:41 +00:00
|
|
|
(concat " " x))
|
|
|
|
ada-xref-runtime-library-specs-path
|
|
|
|
"\n")
|
2000-07-24 11:14:01 +00:00
|
|
|
)
|
|
|
|
(widget-insert "\n\n")
|
2003-02-04 13:24:35 +00:00
|
|
|
|
2000-07-24 11:14:01 +00:00
|
|
|
(ada-prj-field 'obj_dir "Object directories"
|
|
|
|
"Enter the list of directories where the GNAT
|
|
|
|
library files (ALI files) can be found. These
|
|
|
|
files are used for cross-references and by the
|
|
|
|
gnatmake command.
|
|
|
|
Note that obj_dir includes both the build directory
|
|
|
|
and the standard runtime."
|
|
|
|
t t
|
|
|
|
(mapconcat (lambda(x)
|
2006-10-31 01:02:41 +00:00
|
|
|
(concat " " x))
|
|
|
|
ada-xref-runtime-library-ali-path
|
|
|
|
"\n")
|
2000-07-24 11:14:01 +00:00
|
|
|
)
|
|
|
|
(widget-insert "\n\n")
|
|
|
|
)
|
1999-10-07 14:31:47 +00:00
|
|
|
|
2000-07-24 11:14:01 +00:00
|
|
|
;;
|
|
|
|
;; Third page (Switches)
|
|
|
|
;;
|
|
|
|
((= tab-num 3)
|
2002-04-09 18:56:34 +00:00
|
|
|
(widget-insert "/_____________\\/______________\\/ \\/______________\\/______________\\\n")
|
2000-07-24 11:14:01 +00:00
|
|
|
(ada-prj-field 'comp_opt "Switches for the compiler"
|
|
|
|
"These switches are used in the default
|
|
|
|
compilation commands, both for compiling a
|
|
|
|
single file and rebuilding the whole project")
|
|
|
|
(ada-prj-field 'bind_opt "Switches for the binder"
|
|
|
|
"These switches are used in the default build
|
|
|
|
command and are passed to the binder")
|
|
|
|
(ada-prj-field 'link_opt "Switches for the linker"
|
|
|
|
"These switches are used in the default build
|
|
|
|
command and are passed to the linker")
|
|
|
|
(ada-prj-field 'gnatmake_opt "Switches for gnatmake"
|
|
|
|
"These switches are used in the default gnatmake
|
2003-02-04 13:24:35 +00:00
|
|
|
command.")
|
2002-04-09 18:56:34 +00:00
|
|
|
(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
|
|
|
|
where most ALI files are write-protected, since otherwise they get
|
|
|
|
ignored by gnatfind and you don't see the references within.")
|
2000-07-24 11:14:01 +00:00
|
|
|
)
|
1999-10-07 14:31:47 +00:00
|
|
|
|
2000-07-24 11:14:01 +00:00
|
|
|
;;
|
|
|
|
;; Fourth page
|
|
|
|
;;
|
|
|
|
((= tab-num 4)
|
2002-04-09 18:56:34 +00:00
|
|
|
(widget-insert "/_____________\\/______________\\/______________\\/ \\/______________\\\n")
|
2000-07-24 11:14:01 +00:00
|
|
|
(widget-insert
|
Typo fixes for Ada mode.
* progmodes/ada-mode.el (ada-batch-reformat): Doc fix.
(ada-create-case-exception): Fix typo in docstring.
(ada-no-auto-case): Return nil, not the docstring.
(ada-indent-current): Reflow docstring.
* progmodes/ada-prj.el (ada-prj-edit, ada-prj-initialize-values)
(ada-prj-save-specific-option, ada-prj-field): Fix typos in docstrings.
(ada-prj-load-from-file): Reflow docstring.
(ada-prj-display-page): Fix typo in widget.
* progmodes/ada-stmt.el (ada-case, ada-package-body, ada-private):
Fix typos in docstrings.
* progmodes/ada-xref.el (ada-find-executable, ada-gnat-parse-gpr)
(ada-compile-current, ada-check-current, ada-run-application)
(ada-get-ali-file-name): Fix typos in docstrings.
(ada-xref-confirm-compile, ada-find-references)
(ada-find-local-references, ada-find-any-references): Doc fixes.
(ada-get-all-references): Fix typo in error message.
(ada-xref-current-project): Use `let', not `let*'.
(ada-do-file-completion, ada-xref-change-buffer): Reflow docstring.
2008-07-29 13:20:39 +00:00
|
|
|
"All the fields below can use variable substitution. The syntax is ${name},
|
2002-04-09 18:56:34 +00:00
|
|
|
where name is the name that appears after the Help buttons in this buffer. As
|
|
|
|
a special case, ${current} is replaced with the name of the file currently
|
|
|
|
edited, with directory name but no extension, whereas ${full_current} is
|
|
|
|
replaced with the name of the current file with directory name and
|
|
|
|
extension.\n")
|
2000-07-24 11:14:01 +00:00
|
|
|
(widget-insert
|
2002-04-09 18:56:34 +00:00
|
|
|
"The environment variables ADA_INCLUDE_PATH and ADA_OBJECTS_PATH are set to
|
|
|
|
${src_dir} and ${obj_dir} before running the compilation commands, so that you
|
|
|
|
don't need to specify the -aI and -aO switches on the command line\n")
|
2000-07-24 11:14:01 +00:00
|
|
|
(widget-insert
|
2002-04-09 18:56:34 +00:00
|
|
|
"You can reference any environment variable using the same ${...} syntax as
|
|
|
|
above, and put the name of the variable between the quotes.\n\n")
|
2000-07-24 11:14:01 +00:00
|
|
|
(ada-prj-field 'check_cmd
|
|
|
|
"Check syntax of a single file (menu Ada->Check File)"
|
|
|
|
"This command is run to check the syntax and semantics of a file.
|
2002-04-09 18:56:34 +00:00
|
|
|
The file name is added at the end of this command." t)
|
2000-07-24 11:14:01 +00:00
|
|
|
(ada-prj-field 'comp_cmd
|
|
|
|
"Compiling a single file (menu Ada->Compile File)"
|
|
|
|
"This command is run when the recompilation
|
|
|
|
of a single file is needed. The file name is
|
2002-04-09 18:56:34 +00:00
|
|
|
added at the end of this command." t)
|
2000-07-24 11:14:01 +00:00
|
|
|
(ada-prj-field 'make_cmd "Rebuilding the whole project (menu Ada->Build)"
|
|
|
|
"This command is run when you want to rebuild
|
|
|
|
your whole application. It is never issues
|
|
|
|
automatically and you will need to ask for it.
|
|
|
|
If remote_machine has been set, this command
|
2002-04-09 18:56:34 +00:00
|
|
|
will be executed on the remote machine." t)
|
2000-07-24 11:14:01 +00:00
|
|
|
(ada-prj-field 'run_cmd "Running the application (menu Ada->Run)"
|
|
|
|
"This command specifies how to run the
|
|
|
|
application, including any switch you need to
|
|
|
|
specify. If remote_machine has been set, this
|
2002-04-09 18:56:34 +00:00
|
|
|
command will be executed on the remote host." t)
|
|
|
|
)
|
|
|
|
|
|
|
|
;;
|
|
|
|
;; Fifth page
|
|
|
|
;;
|
|
|
|
((= tab-num 5)
|
|
|
|
(widget-insert "/_____________\\/______________\\/______________\\/______________\\/ \\\n")
|
|
|
|
(ada-prj-field 'debug_pre_cmd "Commands to execute before launching the
|
|
|
|
debugger"
|
|
|
|
"The following commands are executed one after the other before starting
|
|
|
|
the debugger. These can be used to set up your environment." t)
|
2003-02-04 13:24:35 +00:00
|
|
|
|
2000-07-24 11:14:01 +00:00
|
|
|
(ada-prj-field 'debug_cmd "Debugging the application"
|
|
|
|
"Specifies how to debug the application, possibly
|
|
|
|
remotely if remote_machine has been set. We
|
|
|
|
recommend the following debuggers:
|
|
|
|
> gdb
|
2002-04-09 18:56:34 +00:00
|
|
|
> gvd --tty
|
2000-07-24 11:14:01 +00:00
|
|
|
> ddd --tty -fullname -toolbar")
|
2002-04-09 18:56:34 +00:00
|
|
|
|
|
|
|
(ada-prj-field 'debug_post_cmd "Commands to execute in the debugger"
|
|
|
|
"The following commands are executed one in the debugger once it has been
|
|
|
|
started. These can be used to initialize the debugger, for instance to
|
|
|
|
connect to the target when working with cross-environments" t)
|
2000-07-24 11:14:01 +00:00
|
|
|
)
|
2003-02-04 13:24:35 +00:00
|
|
|
|
2000-07-24 11:14:01 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
(widget-insert "______________________________________________________________________\n\n ")
|
|
|
|
(widget-create 'push-button
|
|
|
|
:notify (lambda (&rest ignore)
|
2008-07-30 09:42:46 +00:00
|
|
|
(setq ada-prj-current-values (ada-default-prj-properties))
|
2000-07-24 11:14:01 +00:00
|
|
|
(ada-prj-display-page 1))
|
|
|
|
"Reset to Default Values")
|
|
|
|
(widget-insert " ")
|
|
|
|
(widget-create 'push-button :notify (lambda (&rest ignore) (kill-buffer nil))
|
|
|
|
"Cancel")
|
|
|
|
(widget-insert " ")
|
|
|
|
(widget-create 'push-button :notify (lambda (&rest ignore) (ada-prj-save))
|
|
|
|
"Save")
|
|
|
|
(widget-insert "\n\n")
|
|
|
|
|
|
|
|
(widget-setup)
|
2005-08-09 02:55:43 +00:00
|
|
|
(with-no-warnings
|
|
|
|
(beginning-of-buffer))
|
2000-07-24 11:14:01 +00:00
|
|
|
)
|
1999-10-07 14:31:47 +00:00
|
|
|
|
|
|
|
|
2000-07-24 11:14:01 +00:00
|
|
|
(defun ada-customize (&optional new-file filename)
|
|
|
|
"Edit the project file associated with the current buffer.
|
|
|
|
If there is none or NEW-FILE is non-nil, make a new one.
|
|
|
|
If FILENAME is given, edit that file."
|
|
|
|
(interactive)
|
1999-10-07 14:31:47 +00:00
|
|
|
|
2000-07-24 11:14:01 +00:00
|
|
|
(let ((ada-buffer (current-buffer))
|
|
|
|
(inhibit-read-only t))
|
1999-10-07 14:31:47 +00:00
|
|
|
|
2002-06-20 17:17:32 +00:00
|
|
|
;; 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
|
2003-02-04 13:24:35 +00:00
|
|
|
|
2002-06-20 17:17:32 +00:00
|
|
|
(if (and (not new-file)
|
|
|
|
(or ada-prj-default-project-file filename)
|
|
|
|
(string= (file-name-extension
|
|
|
|
(or filename ada-prj-default-project-file))
|
|
|
|
"gpr"))
|
|
|
|
(progn
|
|
|
|
(find-file ada-prj-default-project-file)
|
|
|
|
(add-hook 'after-save-hook 'ada-reread-prj-file t t)
|
|
|
|
)
|
2002-04-09 18:56:34 +00:00
|
|
|
|
2003-04-29 23:43:00 +00:00
|
|
|
(if filename
|
|
|
|
(ada-reread-prj-file filename)
|
|
|
|
(if (not (string= ada-prj-default-project-file ""))
|
|
|
|
(ada-reread-prj-file ada-prj-default-project-file)
|
|
|
|
(ada-reread-prj-file)))
|
|
|
|
|
2006-10-31 01:02:41 +00:00
|
|
|
(switch-to-buffer "*Edit Ada Mode Project*")
|
2003-02-04 13:24:35 +00:00
|
|
|
|
2003-04-29 23:43:00 +00:00
|
|
|
(ada-prj-initialize-values 'ada-prj-current-values
|
|
|
|
ada-buffer
|
|
|
|
ada-prj-default-project-file)
|
2003-02-04 13:24:35 +00:00
|
|
|
|
2002-06-20 17:17:32 +00:00
|
|
|
(set (make-local-variable 'ada-prj-ada-buffer) ada-buffer)
|
2003-02-04 13:24:35 +00:00
|
|
|
|
Derive from prog-mode, use derived-mode-p, and fix up various
minor style issues in lisp/progmodes.
* lisp/progmodes/vhdl-mode.el (vhdl-write-file-hooks-init)
(vhdl-hs-minor-mode, vhdl-ps-print-init): Fix make-local-variable ->
make-local-hook.
* lisp/progmodes/sh-script.el (sh-require-final-newline): Remove.
(sh-set-shell): Don't set require-final-newline since it's already done
by prog-mode.
* lisp/progmodes/modula2.el (m2-mode): Don't make m2-end-comment-column
since we never set it.
* lisp/progmodes/ebrowse.el (ebrowse-set-tree-indentation):
Use read-string and standard prompt.
* lisp/progmodes/dcl-mode.el (dcl-mode-map): Move init into declaration.
* lisp/progmodes/meta-mode.el (meta-mode-abbrev-table): Merge init and decl.
(meta-common-mode-syntax-table): Rename from meta-mode-syntax-table.
(meta-common-mode-map): Rename from meta-mode-map.
Remove C-m binding, which is a user preference, not mode specific.
(meta-common-mode): New major mode; replace meta-common-initialization.
* lisp/progmodes/js.el (js-mode): Call syntax-propertize rather than messing
around with font-lock.
* lisp/progmodes/etags.el (select-tags-table-mode):
Derive from special-mode.
* lisp/progmodes/octave-mod.el (octave-mode):
* lisp/progmodes/gdb-mi.el (gdb-inferior-io-mode, gdb-threads-mode)
(gdb-memory-mode, gdb-disassembly-mode, gdb-breakpoints-mode)
(gdb-frames-mode, gdb-locals-mode, gdb-registers-mode):
Let define-derived-mode do its job.
* lisp/progmodes/cpp.el (cpp-edit-mode-map):
Move initialization into declaration.
(cpp-edit-mode): Use define-derived-mode.
(cpp-edit-load): Use derived-mode-p.
* lisp/progmodes/mixal-mode.el (mixal-mode):
* lisp/progmodes/f90.el (f90-mode):
* lisp/progmodes/cfengine.el (cfengine-mode): Don't bother setting
require-final-newline since prog-mode does it already.
* lisp/progmodes/cc-cmds.el (c-update-modeline): Use match-string.
* lisp/progmodes/asm-mode.el (asm-mode-map): Fix menu setup.
* lisp/progmodes/antlr-mode.el: Require cc-mode upfront.
(antlr-mode-syntax-table, antlr-action-syntax-table): Initialize in
the declaration.
(antlr-directory-dependencies, antlr-show-makefile-rules):
Use derived-mode-p.
(antlr-language-option): Don't assume point-min==1.
(antlr-mode): Use define-derived-mode.
* lisp/progmodes/ada-mode.el: Use derived-mode-p.
(ada-mode): Use define-derived-mode.
Use hack-local-variables-hook.
* lisp/progmodes/vhdl-mode.el (vhdl-mode):
* lisp/progmodes/verilog-mode.el (verilog-mode):
* lisp/progmodes/vera-mode.el (vera-mode):
* lisp/progmodes/sql.el (sql-mode):
* lisp/progmodes/scheme.el (scheme-mode):
* lisp/progmodes/perl-mode.el (perl-mode):
* lisp/progmodes/octave-inf.el (inferior-octave-mode):
* lisp/progmodes/autoconf.el (autoconf-mode):
* lisp/progmodes/m4-mode.el (m4-mode):
* lisp/progmodes/inf-lisp.el (inferior-lisp-mode):
* lisp/progmodes/idlwave.el (idlwave-mode):
* lisp/progmodes/icon.el (icon-mode):
* lisp/progmodes/idlw-help.el (idlwave-help-mode):
* lisp/progmodes/dcl-mode.el (dcl-mode):
* lisp/progmodes/idlw-shell.el (idlwave-shell-mode):
* lisp/progmodes/ebrowse.el (ebrowse-tree-mode, ebrowse-electric-list-mode)
(ebrowse-member-mode, ebrowse-electric-position-mode):
Use define-derived-mode.
* lisp/progmodes/xscheme.el (xscheme-start)
(local-set-scheme-interaction-buffer, scheme-interaction-mode):
* lisp/progmodes/which-func.el (which-function):
* lisp/progmodes/vhdl-mode.el (vhdl-set-style):
* lisp/progmodes/verilog-mode.el (verilog-set-compile-command)
(verilog-modify-compile-command, verilog-error-regexp-add-xemacs)
(verilog-set-define, verilog-auto-reeval-locals):
* lisp/progmodes/sql.el (sql-product-font-lock, sql-interactive-mode):
* lisp/progmodes/simula.el (simula-mode):
* lisp/progmodes/scheme.el (scheme-mode-variables, dsssl-mode):
* lisp/progmodes/python.el (python-check, python-mode):
* lisp/progmodes/prolog.el (prolog-mode-variables):
* lisp/progmodes/gud.el (gud-tooltip-activate-mouse-motions):
* lisp/progmodes/ebrowse.el (ebrowse-view-file-other-frame):
* lisp/progmodes/delphi.el (delphi-mode):
* lisp/progmodes/cc-styles.el (c-setup-paragraph-variables):
* lisp/progmodes/cc-mode.el (c-basic-common-init, c-common-init)
(c-font-lock-init): Move make-local-variable to their setq.
* lisp/progmodes/xscheme.el (exit-scheme-interaction-mode)
(xscheme-enter-interaction-mode, xscheme-enter-debugger-mode)
(xscheme-debugger-mode-p, xscheme-send-string-1):
* lisp/progmodes/tcl.el (inferior-tcl-proc, tcl-current-word)
(tcl-load-file, tcl-restart-with-file):
* lisp/progmodes/ps-mode.el (ps-run-running):
* lisp/progmodes/gdb-mi.el (gud-watch, gdb-mouse-set-clear-breakpoint):
* lisp/progmodes/js.el (js--get-all-known-symbols):
* lisp/progmodes/inf-lisp.el (inferior-lisp-proc):
* lisp/progmodes/idlwave.el (idlwave-beginning-of-statement)
(idlwave-template, idlwave-update-buffer-routine-info)
(idlwave-update-current-buffer-info)
(idlwave-get-routine-info-from-buffers, idlwave-choose)
(idlwave-scan-class-info, idlwave-fix-keywords)
(idlwave-list-buffer-load-path-shadows):
* lisp/progmodes/idlw-toolbar.el (idlwave-toolbar, idlwave-toolbar-add)
(idlwave-toolbar-remove):
* lisp/progmodes/idlw-shell.el (idlwave-shell-save-and-action)
(idlwave-shell-file-name, idlwave-shell-electric-debug-all-off)
(idlwave-shell-menu-def):
* lisp/progmodes/idlw-complete-structtag.el
(idlwave-prepare-structure-tag-completion):
* lisp/progmodes/gud.el (gud-set-buffer):
* lisp/progmodes/f90.el (f90-backslash-not-special):
* lisp/progmodes/delphi.el (delphi-find-unit): Use derived-mode-p.
2010-12-10 15:00:25 -05:00
|
|
|
(use-local-map
|
|
|
|
(let ((map (make-sparse-keymap)))
|
|
|
|
(set-keymap-parent map custom-mode-map)
|
|
|
|
(define-key map "\C-x\C-s" 'ada-prj-save)
|
|
|
|
map))
|
|
|
|
|
|
|
|
;; FIXME: Not sure if this works!!
|
|
|
|
(set (make-local-variable 'widget-keymap)
|
|
|
|
(let ((map (make-sparse-keymap)))
|
|
|
|
(set-keymap-parent map widget-keymap)
|
|
|
|
(define-key map "\C-x\C-s" 'ada-prj-save)
|
|
|
|
map))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
2002-06-20 17:17:32 +00:00
|
|
|
(set (make-local-variable 'ada-old-cross-prefix)
|
|
|
|
(ada-xref-get-project-field 'cross-prefix))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
2002-06-20 17:17:32 +00:00
|
|
|
(ada-prj-display-page 1)
|
|
|
|
)))
|
1999-10-07 14:31:47 +00:00
|
|
|
|
|
|
|
;; ---------------- Utilities --------------------------------
|
|
|
|
|
2002-04-09 18:56:34 +00:00
|
|
|
(defun ada-prj-set-list (string ada-list &optional is-directory)
|
2006-10-31 01:02:41 +00:00
|
|
|
"Prepend STRING to strings in ADA-LIST, return new-line separated string.
|
|
|
|
If IS-DIRECTORY is non-nil, each element of ADA-LIST is explicitly
|
|
|
|
converted to a directory name."
|
2002-04-09 18:56:34 +00:00
|
|
|
|
|
|
|
(mapconcat (lambda (x) (concat string "="
|
|
|
|
(if is-directory
|
|
|
|
(file-name-as-directory x)
|
|
|
|
x)))
|
2006-10-31 01:02:41 +00:00
|
|
|
ada-list "\n"))
|
1999-10-07 14:31:47 +00:00
|
|
|
|
2000-07-24 11:14:01 +00:00
|
|
|
|
|
|
|
(defun ada-prj-field-modified (widget &rest dummy)
|
2006-10-31 01:02:41 +00:00
|
|
|
"Callback for modification of WIDGET.
|
|
|
|
Remaining args DUMMY are ignored.
|
|
|
|
Save the change in `ada-prj-current-values' so that selecting
|
|
|
|
another page and coming back keeps the new value."
|
2000-07-24 11:14:01 +00:00
|
|
|
(set 'ada-prj-current-values
|
|
|
|
(plist-put ada-prj-current-values
|
2002-04-09 18:56:34 +00:00
|
|
|
(widget-get widget ':prj-field)
|
2000-07-24 11:14:01 +00:00
|
|
|
(widget-value widget))))
|
|
|
|
|
|
|
|
(defun ada-prj-display-help (widget widget-modified event)
|
2006-10-31 01:02:41 +00:00
|
|
|
"Callback for help button in WIDGET.
|
|
|
|
Parameters WIDGET-MODIFIED, EVENT match :notify for the widget."
|
2000-07-24 11:14:01 +00:00
|
|
|
(let ((text (widget-get widget 'prj-help)))
|
|
|
|
(if event
|
|
|
|
;; If we have a mouse-event, popup a menu
|
|
|
|
(widget-choose "Help"
|
|
|
|
(mapcar (lambda (a) (cons a t))
|
|
|
|
(split-string text "\n"))
|
|
|
|
event)
|
|
|
|
;; Else display the help string just before the next group of
|
|
|
|
;; variables
|
|
|
|
(momentary-string-display
|
|
|
|
(concat "*****Help*****\n" text "\n**************\n")
|
Replace end-of-line, save-excursion etc with point-at-eol, point-at-bol.
* lisp/mh-e/mh-seq.el (mh-read-msg-list): Use point-at-eol.
* lisp/gnus/gnus-bookmark.el (gnus-bookmark-bmenu-show-infos)
(gnus-bookmark-kill-line): Use point-at-eol.
* lisp/cedet/ede/proj-elisp.el (ede-proj-flush-autoconf): Use point-at-bol.
* lisp/emacs-lisp/chart.el (chart-zap-chars):
* lisp/play/decipher.el (decipher-set-map):
* lisp/progmodes/ada-mode.el (ada-get-current-indent)
(ada-search-ignore-string-comment, ada-tab-hard, ada-untab-hard):
* lisp/progmodes/ada-prj.el (ada-prj-load-from-file, ada-prj-display-help):
* lisp/progmodes/ada-xref.el (ada-initialize-runtime-library)
(ada-get-all-references):
* lisp/progmodes/cperl-mode.el (cperl-electric-paren)
(cperl-electric-rparen, cperl-electric-keyword, cperl-electric-else)
(cperl-linefeed, cperl-sniff-for-indent, cperl-to-comment-or-eol)
(cperl-find-pods-heres, cperl-indent-exp, cperl-fix-line-spacing)
(cperl-word-at-point-hard):
* lisp/progmodes/idlw-shell.el (idlwave-shell-move-or-history)
(idlwave-shell-filename-string, idlwave-shell-batch-command)
(idlwave-shell-display-line):
* lisp/progmodes/idlwave.el (idlwave-show-begin, idlwave-fill-paragraph)
(idlwave-calc-hanging-indent, idlwave-auto-fill, idlwave-template):
* lisp/progmodes/js.el (js--re-search-forward-inner)
(js--re-search-backward-inner):
* lisp/progmodes/vhdl-mode.el (vhdl-align-region-1, vhdl-align-region-2)
(vhdl-fix-clause, vhdl-compose-configuration-architecture):
* lisp/progmodes/ruby-mode.el (ruby-parse-partial, eval-when-compile):
* lisp/textmodes/flyspell.el (flyspell-process-localwords):
* lisp/textmodes/ispell.el (ispell-buffer-local-parsing)
(ispell-buffer-local-dict, ispell-buffer-local-words):
Use point-at-bol and point-at-eol.
2010-11-06 18:36:33 -07:00
|
|
|
(point-at-bol 2)))))
|
2000-07-24 11:14:01 +00:00
|
|
|
|
|
|
|
(defun ada-prj-show-value (widget widget-modified event)
|
2006-10-31 01:02:41 +00:00
|
|
|
"Show the current field value in WIDGET.
|
|
|
|
Parameters WIDGET-MODIFIED, EVENT match :notify for the widget."
|
2002-04-09 18:56:34 +00:00
|
|
|
(let* ((field (widget-get widget ':prj-field))
|
|
|
|
(value (plist-get ada-prj-current-values field))
|
|
|
|
(inhibit-read-only t)
|
|
|
|
w)
|
2000-07-24 11:14:01 +00:00
|
|
|
|
|
|
|
;; If the other widget is already visible, delete it
|
|
|
|
(if (widget-get widget 'prj-other-widget)
|
|
|
|
(progn
|
|
|
|
(widget-delete (widget-get widget 'prj-other-widget))
|
|
|
|
(widget-put widget 'prj-other-widget nil)
|
2002-04-09 18:56:34 +00:00
|
|
|
(widget-put widget ':prj-field field)
|
2000-07-24 11:14:01 +00:00
|
|
|
(widget-default-value-set widget "Show Value")
|
|
|
|
)
|
|
|
|
|
|
|
|
;; Else create it
|
|
|
|
(save-excursion
|
|
|
|
(mouse-set-point event)
|
|
|
|
(forward-line 1)
|
|
|
|
(beginning-of-line)
|
2002-04-09 18:56:34 +00:00
|
|
|
(setq w (widget-create 'editable-list
|
|
|
|
:entry-format "%i%d %v"
|
|
|
|
:notify 'ada-prj-field-modified
|
|
|
|
:help-echo (widget-get widget 'prj-help)
|
|
|
|
:value value
|
|
|
|
(list 'editable-field :keymap widget-keymap)))
|
|
|
|
(widget-put widget 'prj-other-widget w)
|
|
|
|
(widget-put w ':prj-field field)
|
|
|
|
(widget-put widget ':prj-field field)
|
2000-07-24 11:14:01 +00:00
|
|
|
(widget-default-value-set widget "Hide Value")
|
|
|
|
)
|
|
|
|
)
|
|
|
|
(widget-setup)
|
|
|
|
))
|
|
|
|
|
|
|
|
(defun ada-prj-field (field text help-text &optional is-list is-paths after-text)
|
|
|
|
"Create a widget to edit FIELD in the current buffer.
|
|
|
|
TEXT is a short explanation of what the field means, whereas HELP-TEXT
|
|
|
|
is the text displayed when the user pressed the help button.
|
Typo fixes for Ada mode.
* progmodes/ada-mode.el (ada-batch-reformat): Doc fix.
(ada-create-case-exception): Fix typo in docstring.
(ada-no-auto-case): Return nil, not the docstring.
(ada-indent-current): Reflow docstring.
* progmodes/ada-prj.el (ada-prj-edit, ada-prj-initialize-values)
(ada-prj-save-specific-option, ada-prj-field): Fix typos in docstrings.
(ada-prj-load-from-file): Reflow docstring.
(ada-prj-display-page): Fix typo in widget.
* progmodes/ada-stmt.el (ada-case, ada-package-body, ada-private):
Fix typos in docstrings.
* progmodes/ada-xref.el (ada-find-executable, ada-gnat-parse-gpr)
(ada-compile-current, ada-check-current, ada-run-application)
(ada-get-ali-file-name): Fix typos in docstrings.
(ada-xref-confirm-compile, ada-find-references)
(ada-find-local-references, ada-find-any-references): Doc fixes.
(ada-get-all-references): Fix typo in error message.
(ada-xref-current-project): Use `let', not `let*'.
(ada-do-file-completion, ada-xref-change-buffer): Reflow docstring.
2008-07-29 13:20:39 +00:00
|
|
|
If IS-LIST is non-nil, the field contains a list. Otherwise, it contains
|
2000-07-24 11:14:01 +00:00
|
|
|
a single string.
|
Typo fixes for Ada mode.
* progmodes/ada-mode.el (ada-batch-reformat): Doc fix.
(ada-create-case-exception): Fix typo in docstring.
(ada-no-auto-case): Return nil, not the docstring.
(ada-indent-current): Reflow docstring.
* progmodes/ada-prj.el (ada-prj-edit, ada-prj-initialize-values)
(ada-prj-save-specific-option, ada-prj-field): Fix typos in docstrings.
(ada-prj-load-from-file): Reflow docstring.
(ada-prj-display-page): Fix typo in widget.
* progmodes/ada-stmt.el (ada-case, ada-package-body, ada-private):
Fix typos in docstrings.
* progmodes/ada-xref.el (ada-find-executable, ada-gnat-parse-gpr)
(ada-compile-current, ada-check-current, ada-run-application)
(ada-get-ali-file-name): Fix typos in docstrings.
(ada-xref-confirm-compile, ada-find-references)
(ada-find-local-references, ada-find-any-references): Doc fixes.
(ada-get-all-references): Fix typo in error message.
(ada-xref-current-project): Use `let', not `let*'.
(ada-do-file-completion, ada-xref-change-buffer): Reflow docstring.
2008-07-29 13:20:39 +00:00
|
|
|
If IS-PATHS is true, some special buttons are added to load paths,...
|
2000-07-24 11:14:01 +00:00
|
|
|
AFTER-TEXT is inserted just after the widget."
|
|
|
|
(let ((value (plist-get ada-prj-current-values field))
|
|
|
|
(inhibit-read-only t)
|
|
|
|
widget)
|
|
|
|
(unless value
|
|
|
|
(set 'value
|
|
|
|
(if is-list '() "")))
|
|
|
|
(widget-insert text)
|
|
|
|
(widget-insert ":")
|
|
|
|
(move-to-column 54 t)
|
|
|
|
(widget-put (widget-create 'push-button
|
|
|
|
:notify 'ada-prj-display-help
|
|
|
|
"Help")
|
|
|
|
'prj-help
|
|
|
|
help-text)
|
|
|
|
(widget-insert (concat " (" (symbol-name field) ")\n"))
|
|
|
|
(if is-paths
|
|
|
|
(progn
|
|
|
|
(widget-create 'push-button
|
|
|
|
:notify
|
|
|
|
(list 'lambda '(&rest dummy) '(interactive)
|
|
|
|
(list 'ada-prj-load-from-file
|
|
|
|
(list 'quote field)))
|
|
|
|
"Load From File")
|
|
|
|
(widget-insert " ")
|
|
|
|
(widget-create 'push-button
|
|
|
|
:notify
|
|
|
|
(list 'lambda '(&rest dummy) '(interactive)
|
|
|
|
(list 'ada-prj-load-directory
|
|
|
|
(list 'quote field)))
|
|
|
|
"Load Recursive Directory")
|
|
|
|
(widget-insert "\n ${build_dir}\n")))
|
2002-04-09 18:56:34 +00:00
|
|
|
|
2000-07-24 11:14:01 +00:00
|
|
|
(set 'widget
|
|
|
|
(if is-list
|
|
|
|
(if (< (length value) 15)
|
|
|
|
(widget-create 'editable-list
|
|
|
|
:entry-format "%i%d %v"
|
|
|
|
:notify 'ada-prj-field-modified
|
|
|
|
:help-echo help-text
|
|
|
|
:value value
|
|
|
|
(list 'editable-field :keymap widget-keymap))
|
2002-04-09 18:56:34 +00:00
|
|
|
|
2000-07-24 11:14:01 +00:00
|
|
|
(let ((w (widget-create 'push-button
|
|
|
|
:notify 'ada-prj-show-value
|
|
|
|
"Show value")))
|
|
|
|
(widget-insert "\n")
|
|
|
|
(widget-put w 'prj-help help-text)
|
|
|
|
(widget-put w 'prj-other-widget nil)
|
|
|
|
w)
|
|
|
|
)
|
|
|
|
(widget-create 'editable-field
|
|
|
|
:format "%v"
|
|
|
|
:notify 'ada-prj-field-modified
|
|
|
|
:help-echo help-text
|
|
|
|
:keymap widget-keymap
|
|
|
|
value)))
|
2002-04-09 18:56:34 +00:00
|
|
|
(widget-put widget ':prj-field field)
|
2000-07-24 11:14:01 +00:00
|
|
|
(if after-text
|
|
|
|
(widget-insert after-text))
|
|
|
|
(widget-insert "\n")
|
|
|
|
))
|
1999-10-07 14:31:47 +00:00
|
|
|
|
|
|
|
|
|
|
|
(provide 'ada-prj)
|
2001-07-16 07:46:48 +00:00
|
|
|
|
|
|
|
;;; ada-prj.el ends here
|