diff options
author | Andy Wingo <wingo@pobox.com> | 2012-01-10 00:41:42 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2012-01-10 00:41:42 +0100 |
commit | 91ee7515da0bad91330ce5c87b250d6cf12a2789 (patch) | |
tree | ce023c92c0d9bf895c1265b107b270c35ba59b94 /module/language | |
parent | 0bdd43515eb3c62839512181cf33e5aea383e661 (diff) | |
parent | 0e947e1d14597651c5762a4209225c472bdaef45 (diff) | |
download | guile-91ee7515da0bad91330ce5c87b250d6cf12a2789.tar.gz |
Merge remote-tracking branch 'origin/stable-2.0'
Conflicts:
libguile/__scm.h
libguile/array-map.c
libguile/procprop.c
libguile/tags.h
module/ice-9/deprecated.scm
module/ice-9/psyntax-pp.scm
module/ice-9/psyntax.scm
test-suite/standalone/test-num2integral.c
test-suite/tests/regexp.test
Diffstat (limited to 'module/language')
-rw-r--r-- | module/language/elisp/runtime/macros.scm | 2 | ||||
-rw-r--r-- | module/language/tree-il/fix-letrec.scm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/module/language/elisp/runtime/macros.scm b/module/language/elisp/runtime/macros.scm index a62f721e7..b28706781 100644 --- a/module/language/elisp/runtime/macros.scm +++ b/module/language/elisp/runtime/macros.scm @@ -81,7 +81,7 @@ (progn ,@(cdr cur)) ,rest)))))))) -;;; The and and or forms can also be easily defined with macros. +;;; The `and' and `or' forms can also be easily defined with macros. (built-in-macro and (case-lambda diff --git a/module/language/tree-il/fix-letrec.scm b/module/language/tree-il/fix-letrec.scm index 2a18342d3..f83d77e76 100644 --- a/module/language/tree-il/fix-letrec.scm +++ b/module/language/tree-il/fix-letrec.scm @@ -238,7 +238,7 @@ c) (list body))) (else - ;; Otherwise for plain letrec, evaluate the the "complex" + ;; Otherwise for plain letrec, evaluate the "complex" ;; bindings, in a `let' to indicate that order doesn't ;; matter, and bind to their variables. (list |