summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Jerram <neil@ossau.uklinux.net>2003-11-11 23:09:23 +0000
committerNeil Jerram <neil@ossau.uklinux.net>2003-11-11 23:09:23 +0000
commit651f2c7854771245b2cf522db47f18db22c4b4f1 (patch)
tree2395f4cefbe3eb9ab220c0377acb5a18272dc7c0
parent560434b36940df287672ef1db6bafe46008a8b7e (diff)
downloadguile-651f2c7854771245b2cf522db47f18db22c4b4f1.tar.gz
Avoid duplicate binding warnings from (lang elisp) modules.
-rw-r--r--lang/elisp/ChangeLog6
-rw-r--r--lang/elisp/internals/format.scm4
-rw-r--r--lang/elisp/internals/load.scm4
-rw-r--r--lang/elisp/internals/signal.scm2
4 files changed, 11 insertions, 5 deletions
diff --git a/lang/elisp/ChangeLog b/lang/elisp/ChangeLog
index 1f976e58e..57a99e8a4 100644
--- a/lang/elisp/ChangeLog
+++ b/lang/elisp/ChangeLog
@@ -1,3 +1,9 @@
+2003-11-01 Neil Jerram <neil@ossau.uklinux.net>
+
+ * internals/format.scm (format), internals/signal.scm (error),
+ internals/load.scm (load): Export using #:replace to avoid
+ duplicate binding warnings.
+
2003-01-05 Marius Vollmer <mvo@zagadka.ping.de>
* primitives/Makefile.am (elisp_sources): Added char-table.scm.
diff --git a/lang/elisp/internals/format.scm b/lang/elisp/internals/format.scm
index 6862dab27..7ea562a2e 100644
--- a/lang/elisp/internals/format.scm
+++ b/lang/elisp/internals/format.scm
@@ -4,8 +4,8 @@
#:use-module ((ice-9 format) #:select ((format . scheme:format)))
#:use-module (lang elisp internals fset)
#:use-module (lang elisp internals signal)
- #:export (format
- message))
+ #:replace (format)
+ #:export (message))
(define (format control-string . args)
diff --git a/lang/elisp/internals/load.scm b/lang/elisp/internals/load.scm
index 88d14b802..e55c8b50f 100644
--- a/lang/elisp/internals/load.scm
+++ b/lang/elisp/internals/load.scm
@@ -3,8 +3,8 @@
#:use-module (lang elisp internals signal)
#:use-module (lang elisp internals format)
#:use-module (lang elisp internals evaluation)
- #:export (load-path
- load))
+ #:replace (load)
+ #:export (load-path))
(define load-path '("/usr/share/emacs/20.7/lisp/"
"/usr/share/emacs/20.7/lisp/emacs-lisp/"))
diff --git a/lang/elisp/internals/signal.scm b/lang/elisp/internals/signal.scm
index 09e2c05a6..7055a9b92 100644
--- a/lang/elisp/internals/signal.scm
+++ b/lang/elisp/internals/signal.scm
@@ -1,7 +1,7 @@
(define-module (lang elisp internals signal)
#:use-module (lang elisp internals format)
+ #:replace (error)
#:export (signal
- error
wta))
(define (signal error-symbol data)