summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/emacs-lisp/byte-lexbind.el8
-rw-r--r--src/ChangeLog4
-rw-r--r--src/eval.c4
4 files changed, 15 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 856d4ea3898..f5b18ef6bec 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-18 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * emacs-lisp/byte-lexbind.el (byte-compile-compute-lforminfo):
+ specialp -> special-variable-p.
+
2010-06-15 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/bytecomp.el (byte-compile-initial-macro-environment):
diff --git a/lisp/emacs-lisp/byte-lexbind.el b/lisp/emacs-lisp/byte-lexbind.el
index a01829abf50..df463c17549 100644
--- a/lisp/emacs-lisp/byte-lexbind.el
+++ b/lisp/emacs-lisp/byte-lexbind.el
@@ -1,6 +1,6 @@
;;; byte-lexbind.el --- Lexical binding support for byte-compiler
;;
-;; Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2010 Free Software Foundation, Inc.
;;
;; Author: Miles Bader <miles@gnu.org>
;; Keywords: lisp, compiler, lexical binding
@@ -9,7 +9,7 @@
;; GNU Emacs is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
;; any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
@@ -123,7 +123,7 @@ The result is an `lforminfo' data structure."
;; Find the bound variables
(dolist (clause (cadr form))
(let ((var (if (consp clause) (car clause) clause)))
- (unless (or (specialp var) (memq var special))
+ (unless (or (special-variable-p var) (memq var special))
(byte-compile-lforminfo-add-var lforminfo var t))))
;; Analyze the body
(unless (null (byte-compile-lforminfo-vars lforminfo))
@@ -137,7 +137,7 @@ The result is an `lforminfo' data structure."
(when (and (consp clause) lforminfo)
(byte-compile-lforminfo-analyze lforminfo (cadr clause)
special nil))
- (unless (or (specialp var) (memq var special))
+ (unless (or (special-variable-p var) (memq var special))
(byte-compile-lforminfo-add-var lforminfo var t))))
;; Analyze the body
(unless (null (byte-compile-lforminfo-vars lforminfo))
diff --git a/src/ChangeLog b/src/ChangeLog
index 017b3eb2553..e70aefd75b5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-18 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * eval.c (Fspecial_variable_p): Rename from `specialp'.
+
2010-06-15 Stefan Monnier <monnier@iro.umontreal.ca>
* bytecode.c (exec_byte_code):
diff --git a/src/eval.c b/src/eval.c
index 71a0b111849..a6290618753 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -3753,7 +3753,7 @@ unbind_to (count, value)
-DEFUN ("specialp", Fspecialp, Sspecialp, 1, 1, 0,
+DEFUN ("special-variable-p", Fspecial_variable_p, Sspecial_variable_p, 1, 1, 0,
doc: /* Return non-nil if SYMBOL's global binding has been declared special.
A special variable is one that will be bound dynamically, even in a
context where binding is lexical by default. */)
@@ -4138,7 +4138,7 @@ alist of active lexical bindings. */);
defsubr (&Sbacktrace);
defsubr (&Sbacktrace_frame);
defsubr (&Scurry);
- defsubr (&Sspecialp);
+ defsubr (&Sspecial_variable_p);
defsubr (&Sfunctionp);
}