From fadcaf2d0cb2bad334490f057f3aba8daf66efe6 Mon Sep 17 00:00:00 2001
From: jgarcia <jgarcia>
Date: Sat, 9 Feb 2008 19:38:50 +0000
Subject: [PATCH] Calls to functions defined later in the same file were still
 done directly

---
 src/cmp/cmpcall.lsp   | 13 +++++++------
 src/lsp/config.lsp.in |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/cmp/cmpcall.lsp b/src/cmp/cmpcall.lsp
index 3e8807fd2..097f296d8 100644
--- a/src/cmp/cmpcall.lsp
+++ b/src/cmp/cmpcall.lsp
@@ -163,12 +163,13 @@
 	   (setq loc (inline-function fname args return-type)))
       loc)
 
-     ;; Call to a function defined in the same file.
-     ((and (fun-p loc) (<= *debug* 1))
-      (call-loc fname loc narg args))
-
-     ((and (null loc) (setf loc (find fname *global-funs* :test #'same-fname-p
-				      :key #'fun-name)))
+     ;; Call to a function defined in the same file. Direct calls are
+     ;; only emitted for low or neutral values of DEBUG is >= 2.
+     ((and (<= *debug* 1)
+	   (or (fun-p loc)
+	       (and (null loc)
+		    (setf loc (find fname *global-funs* :test #'same-fname-p
+				      :key #'fun-name)))))
       (call-loc fname loc narg args))
 
      ;; Call to a global (SETF ...) function
diff --git a/src/lsp/config.lsp.in b/src/lsp/config.lsp.in
index 27c904a7c..f584dad71 100644
--- a/src/lsp/config.lsp.in
+++ b/src/lsp/config.lsp.in
@@ -24,7 +24,7 @@ Returns, as a string, the location of the machine on which ECL runs."
 (defun lisp-implementation-version ()
   "Args:()
 Returns the version of your ECL as a string."
-  "@PACKAGE_VERSION@ (CVS 2008-02-09 16:27)")
+  "@PACKAGE_VERSION@ (CVS 2008-02-09 20:37)")
 
 (defun machine-type ()
   "Args: ()