(cmuscheme-program-name): Renamed from

scheme-program-name because xscheme.el contains a defcustom with
the same name.  As a consequence, customizing group `cmuscheme'
loaded `xscheme' which redefined run-scheme.
(run-scheme): Use cmuscheme-program-name.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c2ba74a7495bd807ab5c8e7f7069fb5531212d62..1c993d7ea0a611c11bde67158de8b86a14380713 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
 2000-10-19  Gerd Moellmann  <gerd@gnu.org>
 
+       * cmuscheme.el (cmuscheme-program-name): Renamed from
+       scheme-program-name because xscheme.el contains a defcustom with
+       the same name.  As a consequence, customizing group `cmuscheme'
+       loaded `xscheme' which redefined run-scheme.
+       (run-scheme): Use cmuscheme-program-name.
+
        * ps-print.el (ps-print-emacs-type): Move into the
        eval-and-compile.
 

diff --git a/lisp/cmuscheme.el b/lisp/cmuscheme.el
index 71040bd4030902bfca6ef2e7c4add6cba8e8f59d..3c280306323f84b94ec75c734d120502b9bd8fd5 100644 (file)
--- a/lisp/cmuscheme.el
+++ b/lisp/cmuscheme.el
@@ -231,7 +231,7 @@ Defaults to a regexp ignoring all inputs of 0, 1, or 2 letters."
                 (scheme-args-to-list (substring string pos
                                                 (length string)))))))))
 
-(defcustom scheme-program-name "scheme"
+(defcustom cmuscheme-program-name "scheme"
   "*Program invoked by the run-scheme command"
   :type 'string
   :group 'cmuscheme)
@@ -241,19 +241,19 @@ Defaults to a regexp ignoring all inputs of 0, 1, or 2 letters."
   "Run an inferior Scheme process, input and output via buffer *scheme*.
 If there is a process already running in `*scheme*', switch to that buffer.
 With argument, allows you to edit the command line (default is value
-of `scheme-program-name').  Runs the hooks `inferior-scheme-mode-hook'
+of `cmuscheme-program-name').  Runs the hooks `inferior-scheme-mode-hook'
 \(after the `comint-mode-hook' is run).
 \(Type \\[describe-mode] in the process buffer for a list of commands.)"
 
   (interactive (list (if current-prefix-arg
-                        (read-string "Run Scheme: " scheme-program-name)
-                        scheme-program-name)))
+                        (read-string "Run Scheme: " cmuscheme-program-name)
+                        cmuscheme-program-name)))
   (if (not (comint-check-proc "*scheme*"))
       (let ((cmdlist (scheme-args-to-list cmd)))
        (set-buffer (apply 'make-comint "scheme" (car cmdlist)
                           nil (cdr cmdlist)))
        (inferior-scheme-mode)))
-  (setq scheme-program-name cmd)
+  (setq cmuscheme-program-name cmd)
   (setq scheme-buffer "*scheme*")
   (pop-to-buffer "*scheme*"))
 ;;;###autoload (add-hook 'same-window-buffer-names "*scheme*")