X-Git-Url: https://git.hcoop.net/bpt/guile.git/blobdiff_plain/9ab0d7881769e2b1732d9bbf666104783553ebff..d3d6614791099f962aa6462f937d41da2baa6d42:/emacs/guile-emacs.scm

diff --git a/emacs/guile-emacs.scm b/emacs/guile-emacs.scm
index fa61ddbf2..4d99002b6 100644
--- a/emacs/guile-emacs.scm
+++ b/emacs/guile-emacs.scm
@@ -2,20 +2,20 @@
 
 ;; Copyright (C) 2001 Keisuke Nishida <kxn30@po.cwru.edu>
 
-;; 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)
-;; any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;;;; This library is free software; you can redistribute it and/or
+;;;; modify it under the terms of the GNU Lesser General Public
+;;;; License as published by the Free Software Foundation; either
+;;;; version 3 of the License, or (at your option) any later version.
+;;;; 
+;;;; This library is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;;;; Lesser General Public License for more details.
+;;;; 
+;;;; You should have received a copy of the GNU Lesser General Public
+;;;; License along with this library; if not, write to the Free
+;;;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+;;;; 02111-1307 USA
 
 ;;; Code:
 
@@ -55,7 +55,7 @@
 
 
 ;;;
-;;; for guile-import and guile-use-modules
+;;; for guile-import and guile-import-module
 ;;;
 
 (define (guile-emacs-export-procedure name proc docs)
@@ -93,7 +93,7 @@
 	(docs (and docs (object-documentation proc))))
     `(defun ,name ,args
        ,@(if docs (list docs) '())
-       (guile-lisp-flat-eval ,@(procedure-call name args)))))
+       (guile-lisp-flat-eval ,@(procedure-call (procedure-name proc) args)))))
 
 (define (guile-emacs-export proc-name func-name docs)
   (let ((proc (module-ref (current-module) proc-name)))
@@ -111,7 +111,7 @@
 
 
 ;;;
-;;; for guile-emacs-complete-symbol
+;;; for guile-scheme-complete-symbol
 ;;;
 
 (define (guile-emacs-complete-alist str)
@@ -125,4 +125,30 @@
 		       apropos-fold-all)
 	 (lambda (p1 p2) (string<? (car p1) (car p2)))))
 
+
+;;;
+;;; for guile-scheme-apropos
+;;;
+
+(define (guile-emacs-apropos regexp)
+  (with-output-to-string (lambda () (apropos regexp))))
+
+
+;;;
+;;; for guile-scheme-describe
+;;;
+
+(define (guile-emacs-describe sym)
+  (object-documentation (eval sym (current-module))))
+
+
+;;;
+;;; Guile 1.4 compatibility
+;;;
+
+(define object->string
+  (if (defined? 'object->string)
+    object->string
+    (lambda (x) (format #f "~S" x))))
+
 ;;; guile-emacs.scm ends here