From: Karl Heuer <kwzh@gnu.org>
Date: Mon, 29 Jan 1996 23:09:15 +0000 (+0000)
Subject: (ada-indent-region, ada-check-matching-start, ada-check-defun-name): Fix error
X-Git-Tag: emacs-19.34~1445
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4dd3b396429410d5033375cfb80f93560bf9d461;p=emacs.git

(ada-indent-region, ada-check-matching-start, ada-check-defun-name): Fix error
format string.
---

diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el
index d34f08b8586..cf74a914ea2 100644
--- a/lisp/progmodes/ada-mode.el
+++ b/lisp/progmodes/ada-mode.el
@@ -1408,9 +1408,7 @@ Moves to 'begin' if in a declarative part."
 	  (setq lines-remaining (1- lines-remaining)))
       ;; show line number where the error occurred
       (error
-       (error (format "line %d: %s"
-                      (1+ (count-lines (point-min) (point)))
-                      err) nil)))
+       (error "line %d: %s" (1+ (count-lines (point-min) (point))) err)))
     (message "indenting ... done")))
 
 
@@ -2501,9 +2499,7 @@ This works by two steps:
   ;; Moves point to the matching block start.
   (ada-goto-matching-start 0)
   (if (not (looking-at (concat "\\<" keyword "\\>")))
-      (error (concat
-              "matching start is not '"
-              keyword "'"))))
+      (error "matching start is not '%s'" keyword)))
 
 
 (defun ada-check-defun-name (defun-name)
@@ -2542,14 +2538,9 @@ This works by two steps:
     ;; should be looking-at the correct name
     ;;
     (if (not (looking-at (concat "\\<" defun-name "\\>")))
-        (error
-         (concat
-          "matching defun has different name: "
-          (buffer-substring
-           (point)
-           (progn
-             (forward-sexp 1)
-             (point))))))))
+        (error "matching defun has different name: %s"
+	       (buffer-substring (point)
+				 (progn (forward-sexp 1) (point)))))))
 
 
 (defun ada-goto-matching-decl-start (&optional noerror nogeneric)