diff options
| author | Richard M. Stallman <rms@gnu.org> | 1992-10-08 06:44:58 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1992-10-08 06:44:58 +0000 |
| commit | 7b02ee3c41fdbf75c122ad96099e7b6407d9c5ff (patch) | |
| tree | 549dbb1d7a254b8c6a3bd15be928a8f92872c965 | |
| parent | 67f3e2fdf0f56b27821b328c3573fa6ecfd0ba1b (diff) | |
| download | emacs-7b02ee3c41fdbf75c122ad96099e7b6407d9c5ff.tar.gz | |
(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.
| -rw-r--r-- | lisp/cmulisp.el | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lisp/cmulisp.el b/lisp/cmulisp.el index 11fc14af064..8a406e7e85f 100644 --- a/lisp/cmulisp.el +++ b/lisp/cmulisp.el @@ -135,8 +135,8 @@ mode. Default is whitespace followed by 0 or 1 single-letter :keyword (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 @@ mode. Default is whitespace followed by 0 or 1 single-letter :keyword (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 <letter> @@ -266,9 +267,7 @@ to continue it." (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 @@ comint-mode-hook is run). (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) |