change remaining %nil -> #nil

* doc/ref/vm.texi:
* libguile/boolean.h:
* libguile/pairs.h:
* module/language/elisp/README:
* test-suite/tests/elisp-compiler.test:
* test-suite/tests/load.test: Change remaining mentions of %nil to #nil.

6 files changed, 21 insertions, 19 deletions

diff --git a/doc/ref/vm.texi b/doc/ref/vm.texi
index 0e9ba7b30..0b56b4b84 100644
--- a/doc/ref/vm.texi
+++ b/doc/ref/vm.texi
@@ -823,7 +823,7 @@ Push @code{#t} onto the stack.
 @end deffn
 
 @deffn Instruction make-nil
-Push @code{%nil} onto the stack.
+Push @code{#nil} onto the stack.
 @end deffn
 
 @deffn Instruction make-eol
diff --git a/libguile/boolean.h b/libguile/boolean.h
index 3e9debd20..7084fdf29 100644
--- a/libguile/boolean.h
+++ b/libguile/boolean.h
@@ -35,13 +35,13 @@
 
 /*
  * Use these macros if it's important (for correctness)
- * that %nil MUST be considered true
+ * that #nil MUST be considered true
  */
 #define scm_is_false_and_not_nil(x)     (scm_is_eq ((x), SCM_BOOL_F))
 #define scm_is_true_or_nil(x)          (!scm_is_eq ((x), SCM_BOOL_F))
 
 /*
- * Use these macros if %nil will never be tested,
+ * Use these macros if #nil will never be tested,
  * for increased efficiency.
  */
 #define scm_is_false_assume_not_nil(x)  (scm_is_eq ((x), SCM_BOOL_F))
@@ -56,7 +56,8 @@
   (SCM_MATCHES_BITS_IN_COMMON ((x), SCM_ELISP_NIL, SCM_BOOL_F))
 #define scm_is_true_and_not_nil(x) (!scm_is_false_or_nil (x))
 
-/* %nil is false. */
+/* 
+#nil is false. */
 #define scm_is_false(x)  (scm_is_false_or_nil (x))
 #define scm_is_true(x)   (!scm_is_false (x))
 
diff --git a/libguile/pairs.h b/libguile/pairs.h
index a5b6fcd93..0e9816227 100644
--- a/libguile/pairs.h
+++ b/libguile/pairs.h
@@ -36,12 +36,13 @@
 
 /*
  * Use scm_is_null_and_not_nil if it's important (for correctness)
- * that %nil must NOT be considered null.
+ * that #nil must NOT be considered null.
  */
 #define scm_is_null_and_not_nil(x)     (scm_is_eq ((x), SCM_EOL))
 
 /*
- * Use scm_is_null_assume_not_nil if %nil will never be tested,
+ * Use scm_is_null_assume_not_nil if 
+#nil will never be tested,
  * for increased efficiency.
  */
 #define scm_is_null_assume_not_nil(x)  (scm_is_eq ((x), SCM_EOL))
@@ -60,7 +61,7 @@
 #define SCM_NULL_OR_NIL_P(x) (scm_is_null_or_nil (x))
 
 
-/* %nil is null. */
+/* #nil is null. */
 #define scm_is_null(x)		(scm_is_null_or_nil(x))
 
 #define SCM_CAR(x)		(SCM_VALIDATE_PAIR (x, SCM_CELL_OBJECT_0 (x)))
diff --git a/module/language/elisp/README b/module/language/elisp/README
index 4f33711de..b93550fdf 100644
--- a/module/language/elisp/README
+++ b/module/language/elisp/README
@@ -31,7 +31,7 @@ Especially still missing:
   * anonymous macros
 
 Other ideas and things to think about:
-  * %nil vs. #f/'() handling in Guile
+  * #nil vs. #f/'() handling in Guile
 
 Compiler options implemented:
   * #:disable-void-check ['all / '(sym1 sym2 sym3)] to disable the check
diff --git a/test-suite/tests/elisp-compiler.test b/test-suite/tests/elisp-compiler.test
index 3d3bb1d6e..61f0acd81 100644
--- a/test-suite/tests/elisp-compiler.test
+++ b/test-suite/tests/elisp-compiler.test
@@ -1,6 +1,6 @@
-;;;; elisp-compiler.test --- Test the compiler for Elisp.
+;;;; elisp-compiler.test --- Test the compiler for Elisp.  -*- scheme -*-
 ;;;;
-;;;; Copyright (C) 2009 Free Software Foundation, Inc.
+;;;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 ;;;; Daniel Kraft
 ;;;;
 ;;;; This library is free software; you can redistribute it and/or
diff --git a/test-suite/tests/load.test b/test-suite/tests/load.test
index 59f9dbb61..50e5fa73f 100644
--- a/test-suite/tests/load.test
+++ b/test-suite/tests/load.test
@@ -1,7 +1,7 @@
 ;;;; load.test --- test LOAD and path searching functions  -*- scheme -*-
 ;;;; Jim Blandy <jimb@red-bean.com> --- September 1999
 ;;;;
-;;;; 	Copyright (C) 1999, 2001, 2006 Free Software Foundation, Inc.
+;;;; 	Copyright (C) 1999, 2001, 2006, 2010 Free Software Foundation, Inc.
 ;;;; 
 ;;;; This library is free software; you can redistribute it and/or
 ;;;; modify it under the terms of the GNU Lesser General Public
@@ -115,13 +115,13 @@
 (try-search-with-extensions path "ugly.scm" extensions "dir3/ugly.scm")
 (try-search-with-extensions path "ugly.ss"  extensions #f)
 
-(if (defined? '%nil)
-    ;; Check that search-path accepts Elisp nil-terminated lists for
-    ;; PATH and EXTENSIONS.
-    (with-test-prefix "elisp-nil"
-      (set-cdr! (last-pair path) %nil)
-      (set-cdr! (last-pair extensions) %nil)
-      (try-search-with-extensions path "ugly.scm" extensions "dir3/ugly.scm")
-      (try-search-with-extensions path "ugly.ss"  extensions #f)))
+;; Check that search-path accepts Elisp nil-terminated lists for
+;; PATH and EXTENSIONS.
+(with-test-prefix "elisp-nil"
+  (set-cdr! (last-pair path) 
+#nil)
+  (set-cdr! (last-pair extensions) #nil)
+  (try-search-with-extensions path "ugly.scm" extensions "dir3/ugly.scm")
+  (try-search-with-extensions path "ugly.ss"  extensions #f))
       
 (delete-tree temp-dir)