# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 971966714 0
# Node ID 5668b454db5a1a6c13152b40e355e7563248ccb0
# Parent  51b05505a602016d888afba9e83fccabf2c8c06e
(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 -r 51b05505a602 -r 5668b454db5a lisp/cmuscheme.el
--- a/lisp/cmuscheme.el	Thu Oct 19 14:44:49 2000 +0000
+++ b/lisp/cmuscheme.el	Thu Oct 19 14:45:14 2000 +0000
@@ -231,7 +231,7 @@
 		 (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 @@
   "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*")