(grep-regexp-alist): Replace complex regexp

[gnu-emacs] / lisp / progmodes / ada-prj.el

diff --git a/lisp/progmodes/ada-prj.el b/lisp/progmodes/ada-prj.el
index 40bd382a34d6dd25c84c3c3ad2c820a5e48d6c31..d9bfb891ee31ad8c0dafd160bf36b7397eebe6c2 100644 (file)
--- a/lisp/progmodes/ada-prj.el
+++ b/lisp/progmodes/ada-prj.el
@@ -1,9 +1,9 @@
 ;;; ada-prj.el --- easy editing of project files for the ada-mode
 
-;; Copyright (C) 1998, 99, 2000-2003 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 
+;; Free Software Foundation, Inc.
 
 ;; Author: Emmanuel Briot <briot@gnat.com>
-;; Ada Core Technologies's version:   $Revision: 1.60 $
 ;; Keywords: languages, ada, project file
 
 ;; This file is part of GNU Emacs.
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -38,19 +38,20 @@
 
 ;; ----- Requirements -----------------------------------------------------
 
-(eval-when-compile
- (require 'ada-mode))
 (require 'cus-edit)
 (require 'ada-xref)
 
+(eval-when-compile
+   (require 'ada-mode))
+
 ;; ----- Buffer local variables -------------------------------------------
 
 (defvar ada-prj-current-values nil
-  "Hold the current value of the fields; this is a property list.")
+  "Hold the current value of the fields, This is a property list.")
 (make-variable-buffer-local 'ada-prj-current-values)
 
 (defvar ada-prj-default-values nil
-  "Hold the default value for the fields; this is a property list.")
+  "Hold the default value for the fields, This is a property list.")
 (make-variable-buffer-local 'ada-prj-default-values)
 
 (defvar ada-prj-ada-buffer nil
@@ -245,7 +246,7 @@ The current buffer must be the project editing buffer."
     (erase-buffer))
 
   ;;  Widget support in Emacs 21 requires that we clear the buffer first
-  (if (and (not ada-xemacs) (>= emacs-major-version 21))
+  (if (and (not (featurep 'xemacs)) (>= emacs-major-version 21))
       (progn
        (setq widget-field-new  nil
              widget-field-list nil)
@@ -680,4 +681,5 @@ AFTER-TEXT is inserted just after the widget."
 
 (provide 'ada-prj)
 
+;;; arch-tag: 65978c77-816e-49c6-896e-6905605d1b4c
 ;;; ada-prj.el ends here