* lisp/emacs-lisp/cconv.el (cconv--analyse-function): Improve warning.

2 files changed, 10 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b8ffbc48471..6c9afcc5630 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-08-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/cconv.el (cconv--analyse-function): Improve warning.
+
 2013-08-27  Juri Linkov  <juri@jurta.org>
 
         * isearch.el (isearch-other-meta-char): Don't store kmacro commands
@@ -12,8 +16,8 @@
 2013-08-27  Martin Rudalics  <rudalics@gmx.at>
 
         * window.el (display-buffer-use-some-window): Add missing
-        argument in call of get-largest-window (Bug#15185).  Reported by
-        Stephen Leake.
+        argument in call of get-largest-window (Bug#15185).
+        Reported by Stephen Leake.
 
 2013-08-27  Glenn Morris  <rgm@gnu.org>
 
@@ -38,8 +42,8 @@
         * net/tramp-adb.el (tramp-adb-maybe-open-connection):
         * net/tramp-gvfs.el (tramp-gvfs-maybe-open-connection):
         * net/tramp-sh.el (tramp-maybe-open-connection):
-        * net/tramp-smb.el (tramp-smb-maybe-open-connection): Apply
-        `tramp-check-proper-host'.
+        * net/tramp-smb.el (tramp-smb-maybe-open-connection):
+        Apply `tramp-check-proper-host'.
 
 2013-08-26  Tassilo Horn  <tsdh@gnu.org>
 
diff --git a/lisp/emacs-lisp/cconv.el b/lisp/emacs-lisp/cconv.el
index 70fa71a0da4..f688bff6f85 100644
--- a/lisp/emacs-lisp/cconv.el
+++ b/lisp/emacs-lisp/cconv.el
@@ -552,7 +552,8 @@ FORM is the parent form that binds this var."
       (cond
        ((byte-compile-not-lexical-var-p arg)
         (byte-compile-log-warning
-         (format "Argument %S is not a lexical variable" arg)))
+         (format "Lexical argument shadows the dynamic variable %S"
+                 arg)))
        ((eq ?& (aref (symbol-name arg) 0)) nil) ;Ignore &rest, &optional, ...
        (t (let ((varstruct (list arg nil nil nil nil)))
             (cl-pushnew arg byte-compile-lexical-variables)