From 01c5c7da9f081fa715dc906537843746f0660fff Mon Sep 17 00:00:00 2001 From: Chris Hanson Date: Fri, 10 May 1991 05:13:43 +0000 Subject: [PATCH] Rename various lisp definition and evaluation commands to match Emacs. --- v7/src/edwin/lspcom.scm | 26 +++++++++++--------------- v7/src/edwin/modefs.scm | 14 +++++++------- v7/src/edwin/schmod.scm | 12 ++++++------ 3 files changed, 24 insertions(+), 28 deletions(-) diff --git a/v7/src/edwin/lspcom.scm b/v7/src/edwin/lspcom.scm index 4e36010d5..ba7324f2e 100644 --- a/v7/src/edwin/lspcom.scm +++ b/v7/src/edwin/lspcom.scm @@ -1,6 +1,6 @@ ;;; -*-Scheme-*- ;;; -;;; $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/lspcom.scm,v 1.151 1991/03/11 01:14:28 cph Exp $ +;;; $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/lspcom.scm,v 1.152 1991/05/10 05:13:10 cph Exp $ ;;; ;;; Copyright (c) 1986, 1989-91 Massachusetts Institute of Technology ;;; @@ -155,26 +155,22 @@ A negative argument means move forward but still to a less deep spot." ;;;; Definition Commands -(define-command beginning-of-definition - "Move to beginning of this or previous definition. -Leaves the mark behind, in case typed by accident. -With a negative argument, moves forward to the beginning of a definition. -The beginning of a definition is determined by Definition Start." +(define-command beginning-of-defun + "Move backward to next beginning-of-defun. +With argument, do this that many times." "p" (lambda (argument) (move-thing backward-definition-start argument))) -(define-command end-of-definition - "Move to end of this or next definition. -Leaves the mark behind, in case typed by accident. -With argument of 2, finds end of following definition. -With argument of -1, finds end of previous definition, etc." +(define-command end-of-defun + "Move forward to next end of defun. +An end of a defun is found by moving forward from the beginning of one." "p" (lambda (argument) (move-thing forward-definition-end (if (zero? argument) 1 argument)))) -(define-command mark-definition - "Put mark at end of definition, point at beginning." +(define-command mark-defun + "Put mark at end of defun, point at beginning." () (lambda () (let ((point (current-point))) @@ -186,8 +182,8 @@ With argument of -1, finds end of previous definition, etc." (or (re-search-backward "^\n" start (mark-1+ start)) start))))))) -(define-command align-definition - "Reposition window so current definition is at the top. +(define-command align-defun + "Reposition window so current defun is at the top. If this would place point off screen, nothing happens." () (lambda () diff --git a/v7/src/edwin/modefs.scm b/v7/src/edwin/modefs.scm index 9d022a74f..87193d6f3 100644 --- a/v7/src/edwin/modefs.scm +++ b/v7/src/edwin/modefs.scm @@ -1,6 +1,6 @@ ;;; -*-Scheme-*- ;;; -;;; $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/modefs.scm,v 1.127 1991/05/06 22:29:22 cph Exp $ +;;; $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/modefs.scm,v 1.128 1991/05/10 05:13:26 cph Exp $ ;;; ;;; Copyright (c) 1985, 1989-91 Massachusetts Institute of Technology ;;; @@ -211,20 +211,20 @@ Like Fundamental mode, but no self-inserting characters.") (define-key 'fundamental #\c-m-@ 'mark-sexp) (define-key 'fundamental #\c-m-\; 'kill-comment) (define-key 'fundamental #\c-m-\[ 'eval-expression) -(define-key 'fundamental #\c-m-a 'beginning-of-definition) +(define-key 'fundamental #\c-m-a 'beginning-of-defun) (define-key 'fundamental #\c-m-b 'backward-sexp) (define-key 'fundamental #\c-m-c 'exit-recursive-edit) (define-key 'fundamental #\c-m-d 'down-list) -(define-key 'fundamental #\c-m-e 'end-of-definition) +(define-key 'fundamental #\c-m-e 'end-of-defun) (define-key 'fundamental #\c-m-f 'forward-sexp) -(define-key 'fundamental #\c-m-h 'mark-definition) +(define-key 'fundamental #\c-m-h 'mark-defun) (define-key 'fundamental #\c-m-j 'indent-new-comment-line) (define-key 'fundamental #\c-m-k 'kill-sexp) (define-key 'fundamental #\c-m-l 'twiddle-buffers) (define-key 'fundamental #\c-m-n 'forward-list) (define-key 'fundamental #\c-m-o 'split-line) (define-key 'fundamental #\c-m-p 'backward-list) -(define-key 'fundamental #\c-m-r 'align-definition) +(define-key 'fundamental #\c-m-r 'align-defun) (define-key 'fundamental #\c-m-s 'isearch-forward-regexp) (define-key 'fundamental #\c-m-t 'transpose-sexps) (define-key 'fundamental #\c-m-u 'backward-up-list) @@ -237,7 +237,7 @@ Like Fundamental mode, but no self-inserting characters.") (define-key 'fundamental '(#\c-h #\a) 'command-apropos) (define-key 'fundamental '(#\c-h #\b) 'describe-bindings) (define-key 'fundamental '(#\c-h #\c) 'describe-key-briefly) -(define-key 'fundamental '(#\c-h #\f) 'describe-command) +(define-key 'fundamental '(#\c-h #\f) 'describe-function) (define-key 'fundamental '(#\c-h #\i) 'info) (define-key 'fundamental '(#\c-h #\k) 'describe-key) (define-key 'fundamental '(#\c-h #\l) 'view-lossage) @@ -250,7 +250,7 @@ Like Fundamental mode, but no self-inserting characters.") (define-key 'fundamental '(#\c-x #\c-b) 'list-buffers) (define-key 'fundamental '(#\c-x #\c-c) 'save-buffers-kill-scheme) (define-key 'fundamental '(#\c-x #\c-d) 'list-directory) -(define-key 'fundamental '(#\c-x #\c-e) 'eval-previous-sexp) +(define-key 'fundamental '(#\c-x #\c-e) 'eval-last-sexp) (define-key 'fundamental '(#\c-x #\c-f) 'find-file) (define-key 'fundamental '(#\c-x #\c-i) 'indent-rigidly) (define-key 'fundamental '(#\c-x #\c-l) 'downcase-region) diff --git a/v7/src/edwin/schmod.scm b/v7/src/edwin/schmod.scm index 115361546..5302805d8 100644 --- a/v7/src/edwin/schmod.scm +++ b/v7/src/edwin/schmod.scm @@ -1,6 +1,6 @@ ;;; -*-Scheme-*- ;;; -;;; $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/schmod.scm,v 1.15 1991/04/23 06:47:05 cph Exp $ +;;; $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/schmod.scm,v 1.16 1991/05/10 05:13:43 cph Exp $ ;;; ;;; Copyright (c) 1986, 1989-91 Massachusetts Institute of Technology ;;; @@ -61,9 +61,9 @@ The following commands evaluate Scheme expressions; normally they record the associated output in a transcript buffer: \\[eval-expression] reads and evaluates an expression in minibuffer. -\\[eval-previous-sexp] evaluates the expression preceding point. -\\[eval-definition] evaluates the current definition. -\\[eval-buffer] evaluates the buffer. +\\[eval-last-sexp] evaluates the expression preceding point. +\\[eval-defun] evaluates the current definition. +\\[eval-current-buffer] evaluates the buffer. \\[eval-region] evaluates the current region." (local-set-variable! syntax-table scheme-mode:syntax-table) @@ -89,8 +89,8 @@ normally they record the associated output in a transcript buffer: (define-key 'scheme #\rubout 'backward-delete-char-untabify) (define-key 'scheme #\tab 'lisp-indent-line) (define-key 'scheme #\) 'lisp-insert-paren) -(define-key 'scheme #\m-o 'eval-buffer) -(define-key 'scheme #\m-z 'eval-definition) +(define-key 'scheme #\m-o 'eval-current-buffer) +(define-key 'scheme #\m-z 'eval-defun) (define-key 'scheme #\c-m-q 'indent-sexp) (define-key 'scheme #\c-m-z 'eval-region) -- 2.25.1