diff options
Diffstat (limited to 'lisp/progmodes/ada-xref.el')
| -rw-r--r-- | lisp/progmodes/ada-xref.el | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el index c37d11910d4..00be89553a7 100644 --- a/lisp/progmodes/ada-xref.el +++ b/lisp/progmodes/ada-xref.el @@ -564,7 +564,7 @@ Completion is available." (let ((file (ada-find-src-file-in-dir filename))) (if file (find-file file) - (error (concat filename " not found in src_dir"))))) + (error "%s not found in src_dir" filename)))) ;; ----- Utilities ------------------------------------------------- @@ -1706,7 +1706,7 @@ Information is extracted from the ali file." (beginning-of-line) ;; while we have a continuation line, go up one line (while (looking-at "^\\.") - (previous-line 1) + (forward-line -1) (beginning-of-line)) (unless (looking-at (concat "[0-9]+.[0-9]+[ *]" (ada-name-of identlist) "[ <{=\(\[]")) @@ -1722,8 +1722,8 @@ Information is extracted from the ali file." ;; No more idea to find the declaration. Give up (progn (kill-buffer ali-buffer) - (error (concat "No declaration of " (ada-name-of identlist) - " found.")) + + (error "No declaration of %s found." (ada-name-of identlist)) ))) ) @@ -1735,11 +1735,11 @@ Information is extracted from the ali file." (let ((current-line (buffer-substring (point) (save-excursion (end-of-line) (point))))) (save-excursion - (next-line 1) + (forward-line 1) (beginning-of-line) (while (looking-at "^\\.\\(.*\\)") (set 'current-line (concat current-line (match-string 1))) - (next-line 1)) + (forward-line 1)) ) (if (re-search-backward "^X [0-9]+ \\([a-zA-Z0-9_.-]+\\)" nil t) @@ -1808,10 +1808,8 @@ This function is disabled for operators, and only works for identifiers." ;; none => error ((= len 0) (kill-buffer (current-buffer)) - (error (concat "No declaration of " - (ada-name-of identlist) - " recorded in .ali file"))) - + (error "No declaration of %s recorded in .ali file" + (ada-name-of identlist))) ;; one => should be the right one ((= len 1) (goto-line (caar declist))) @@ -2011,7 +2009,7 @@ the declaration and documentation of the subprograms one is using." (string-to-number (nth 2 (car list))) identlist other-frame) - (error (concat (caar list) " not found in src_dir"))) + (error "%s not found in src_dir" (caar list))) (message "This is only a (good) guess at the cross-reference.") ) |