diff options
author | Xue Fuqiao <xfq.free@gmail.com> | 2013-09-04 08:39:34 +0800 |
---|---|---|
committer | Xue Fuqiao <xfq.free@gmail.com> | 2013-09-04 08:39:34 +0800 |
commit | adf2fc4a01efe77d73cd52bc9173914ed56ff531 (patch) | |
tree | a5a280a5554a7bffeaf94fccae29fa3ac1a5d066 /lisp/emacs-lisp/cconv.el | |
parent | 63191d9f2043d2e67657e85a7b3842805dd1dad6 (diff) | |
parent | 38726039b77db432989fed106c88e9f1aa463281 (diff) | |
download | emacs-adf2fc4a01efe77d73cd52bc9173914ed56ff531.tar.gz emacs-adf2fc4a01efe77d73cd52bc9173914ed56ff531.tar.bz2 emacs-adf2fc4a01efe77d73cd52bc9173914ed56ff531.zip |
Merge from mainline.
Diffstat (limited to 'lisp/emacs-lisp/cconv.el')
-rw-r--r-- | lisp/emacs-lisp/cconv.el | 3 |
1 files changed, 2 insertions, 1 deletions
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) |