# HG changeset patch # User Richard M. Stallman # Date 718526698 0 # Node ID 35a17cd4ae62cc5e187c376a459cb8bec1645f38 # Parent 475a8122e0a5d6d30dc3ecc94a3dfefa8a3c2dc9 (cmulisp-mode): Eliminate compatibility code calling lisp-mode-variables with no arg. (cmulisp-mode-map): Use shared-lisp-mode-map as tail. (cmulisp-args-to-list): Fix typo in recursive call. (cmulisp-buffer): Define variable. diff -r 475a8122e0a5 -r 35a17cd4ae62 lisp/=cmulisp.el --- a/lisp/=cmulisp.el Thu Oct 08 06:44:43 1992 +0000 +++ b/lisp/=cmulisp.el Thu Oct 08 06:44:58 1992 +0000 @@ -135,8 +135,8 @@ (defvar cmulisp-mode-map nil) (cond ((not cmulisp-mode-map) (setq cmulisp-mode-map - (full-copy-sparse-keymap comint-mode-map)) - (lisp-mode-commands cmulisp-mode-map) + (nconc (full-copy-sparse-keymap comint-mode-map) + shared-lisp-mode-map)) (define-key cmulisp-mode-map "\C-x\C-e" 'lisp-eval-last-sexp) (define-key cmulisp-mode-map "\C-c\C-l" 'lisp-load-file) (define-key cmulisp-mode-map "\C-c\C-k" 'lisp-compile-file) @@ -160,6 +160,7 @@ (define-key lisp-mode-map "\C-c\C-f" 'lisp-show-function-documentation) (define-key lisp-mode-map "\C-c\C-v" 'lisp-show-variable-documentation) +(defvar cmulisp-buffer) ;;; This function exists for backwards compatibility. ;;; Previous versions of this package bound commands to C-c @@ -266,9 +267,7 @@ (setq major-mode 'cmulisp-mode) (setq mode-name "CMU Lisp") (setq mode-line-process '(": %s")) - (if (string-match "^18.4" emacs-version) ; hack. - (lisp-mode-variables) ; This is right for 18.49 - (lisp-mode-variables t)) ; This is right for 18.50 + (lisp-mode-variables t) (use-local-map cmulisp-mode-map) ;c-c c-k for "kompile" file (setq comint-get-old-input (function lisp-get-old-input)) (setq comint-input-filter (function lisp-input-filter)) @@ -317,7 +316,7 @@ (t (let ((pos (string-match "[^ \t]" string))) (if (null pos) nil - (cmulsip-args-to-list (substring string pos + (cmulisp-args-to-list (substring string pos (length string))))))))) (defun lisp-eval-region (start end &optional and-go)