X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/6f048d2655820d07c6c39745bebd7df793aa7f02..b0c9a334c2f0eb881eff47f590997e746cc3bdb3:/lisp/cmuscheme.el diff --git a/lisp/cmuscheme.el b/lisp/cmuscheme.el index 8cc467fe0d..82d39fd2c0 100644 --- a/lisp/cmuscheme.el +++ b/lisp/cmuscheme.el @@ -1,6 +1,7 @@ ;;; cmuscheme.el --- Scheme process in a buffer. Adapted from tea.el -;; Copyright (C) 1988, 1994, 1997, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1988, 1994, 1997, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Olin Shivers ;; Maintainer: FSF @@ -25,7 +26,7 @@ ;;; Commentary: -;; This is a customisation of comint-mode (see comint.el) +;; This is a customization of comint-mode (see comint.el) ;; ;; Written by Olin Shivers (olin.shivers@cs.cmu.edu). With bits and pieces ;; lifted from scheme.el, shell.el, clisp.el, newclisp.el, cobol.el, et al.. @@ -105,7 +106,7 @@ ;;;============================================================================ (defcustom inferior-scheme-mode-hook nil - "*Hook for customising inferior-scheme mode." + "*Hook for customizing inferior-scheme mode." :type 'hook :group 'cmuscheme) @@ -171,7 +172,7 @@ The following commands are available: A Scheme process can be fired up with M-x run-scheme. -Customisation: Entry to this mode runs the hooks on comint-mode-hook and +Customization: Entry to this mode runs the hooks on comint-mode-hook and inferior-scheme-mode-hook (in that order). You can send text to the inferior Scheme process from other buffers containing @@ -200,7 +201,7 @@ C-M-q does Tab on each line starting within following expression. Paragraphs are separated only by blank lines. Semicolons start comments. If you accidentally suspend your process, use \\[comint-continue-subjob] to continue it." - ;; Customise in inferior-scheme-mode-hook + ;; Customize in inferior-scheme-mode-hook (setq comint-prompt-regexp "^[^>\n]*>+ *") ; OK for cscheme, oaklisp, T,... (scheme-mode-variables) (setq mode-line-process '(":%s")) @@ -271,7 +272,7 @@ order. Return nil if no start file found." (start-file (concat "~/" name))) (if (file-exists-p start-file) start-file - (let ((start-file (concat user-emacs-directory name))) + (let ((start-file (concat "~/.emacs.d/" name))) (and (file-exists-p start-file) start-file))))) (defun scheme-send-region (start end) @@ -348,7 +349,7 @@ With a prefix argument switch off tracing of procedure PROC." (when (= (length proc) 0) (error "Invalid procedure name")) (comint-send-string (scheme-proc) - (format + (format (if untrace scheme-untrace-command scheme-trace-command) proc)) (comint-send-string (scheme-proc) "\n")) @@ -366,10 +367,10 @@ For Scheme 48 and Scsh use \",expand %s\"." (if current-form (progn (comint-send-string (scheme-proc) - (format + (format scheme-macro-expand-command current-form)) - (comint-send-string (scheme-proc) "\n")) + (comint-send-string (scheme-proc) "\n")) (error "Not at a form")))) (defun scheme-form-at-point () @@ -431,8 +432,8 @@ Used by these commands to determine defaults." (defvar scheme-prev-l/c-dir/file nil "Caches the last (directory . file) pair. Caches the last pair used in the last `scheme-load-file' or -`scheme-compile-file' command. Used for determining the default in the -next one.") +`scheme-compile-file' command. Used for determining the default +in the next one.") (defun scheme-load-file (file-name) "Load a Scheme file FILE-NAME into the inferior Scheme process." @@ -505,7 +506,7 @@ for a minimal, simple implementation. Feel free to extend it.") "Return the current Scheme process, starting one if necessary. See variable `scheme-buffer'." (unless (and scheme-buffer - (get-buffer scheme-buffer) + (get-buffer scheme-buffer) (comint-check-proc scheme-buffer)) (scheme-interactively-start-process)) (or (scheme-get-process) @@ -524,7 +525,7 @@ command to run." (save-window-excursion (run-scheme (read-string "Run Scheme: " scheme-program-name)))) -;;; Do the user's customisation... +;;; Do the user's customization... (defcustom cmuscheme-load-hook nil "This hook is run when cmuscheme is loaded in.