HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* lisp/emacs-lisp/lisp-mode.el (eval-defun-2): Simplify, using lexical-binding.
[bpt/emacs.git]
/
lisp
/
ielm.el
diff --git
a/lisp/ielm.el
b/lisp/ielm.el
index
ba05bbc
..
4280a49
100644
(file)
--- a/
lisp/ielm.el
+++ b/
lisp/ielm.el
@@
-1,6
+1,6
@@
;;; ielm.el --- interaction mode for Emacs Lisp
;;; ielm.el --- interaction mode for Emacs Lisp
-;; Copyright (C) 1994, 2001-201
2
Free Software Foundation, Inc.
+;; Copyright (C) 1994, 2001-201
3
Free Software Foundation, Inc.
;; Author: David Smith <maa036@lancaster.ac.uk>
;; Maintainer: FSF
;; Author: David Smith <maa036@lancaster.ac.uk>
;; Maintainer: FSF
@@
-167,7
+167,7
@@
This variable is buffer-local.")
(defvar ielm-map
(let ((map (make-sparse-keymap)))
(defvar ielm-map
(let ((map (make-sparse-keymap)))
- (define-key map "\t" 'com
int-dynamic-complete
)
+ (define-key map "\t" 'com
pletion-at-point
)
(define-key map "\C-m" 'ielm-return)
(define-key map "\C-j" 'ielm-send-input)
(define-key map "\e\C-x" 'eval-defun) ; for consistency with
(define-key map "\C-m" 'ielm-return)
(define-key map "\C-j" 'ielm-send-input)
(define-key map "\e\C-x" 'eval-defun) ; for consistency with
@@
-184,6
+184,13
@@
This variable is buffer-local.")
"Keymap for IELM mode.")
(defvaralias 'inferior-emacs-lisp-mode-map 'ielm-map)
"Keymap for IELM mode.")
(defvaralias 'inferior-emacs-lisp-mode-map 'ielm-map)
+(easy-menu-define ielm-menu ielm-map
+ "IELM mode menu."
+ '("IELM"
+ ["Change Working Buffer" ielm-change-working-buffer t]
+ ["Display Working Buffer" ielm-display-working-buffer t]
+ ["Print Working Buffer" ielm-print-working-buffer t]))
+
(defvar ielm-font-lock-keywords
'(("\\(^\\*\\*\\*[^*]+\\*\\*\\*\\)\\(.*$\\)"
(1 font-lock-comment-face)
(defvar ielm-font-lock-keywords
'(("\\(^\\*\\*\\*[^*]+\\*\\*\\*\\)\\(.*$\\)"
(1 font-lock-comment-face)
@@
-202,12
+209,13
@@
This variable is buffer-local.")
(defun ielm-complete-symbol nil
"Complete the Lisp symbol before point."
(defun ielm-complete-symbol nil
"Complete the Lisp symbol before point."
- ;; A wrapper for
lisp-complete symbol
that returns non-nil if
+ ;; A wrapper for
completion-at-point
that returns non-nil if
;; completion has occurred
(let* ((btick (buffer-modified-tick))
(cbuffer (get-buffer "*Completions*"))
;; completion has occurred
(let* ((btick (buffer-modified-tick))
(cbuffer (get-buffer "*Completions*"))
- (ctick (and cbuffer (buffer-modified-tick cbuffer))))
- (lisp-complete-symbol)
+ (ctick (and cbuffer (buffer-modified-tick cbuffer)))
+ (completion-at-point-functions '(lisp-completion-at-point)))
+ (completion-at-point)
;; completion has occurred if:
(or
;; the buffer has been modified
;; completion has occurred if:
(or
;; the buffer has been modified
@@
-454,7
+462,7
@@
Uses the interface provided by `comint-mode' (which see).
Inputs longer than one line are moved to the line following the
prompt (but see variable `ielm-dynamic-multiline-inputs').
Inputs longer than one line are moved to the line following the
prompt (but see variable `ielm-dynamic-multiline-inputs').
-* \\[com
int-dynamic-complete
] completes Lisp symbols (or filenames, within strings),
+* \\[com
pletion-at-point
] completes Lisp symbols (or filenames, within strings),
or indents the line if there is nothing to complete.
The current working buffer may be changed (with a call to `set-buffer',
or indents the line if there is nothing to complete.
The current working buffer may be changed (with a call to `set-buffer',
@@
-491,7
+499,7
@@
Customized bindings may be defined in `ielm-map', which currently contains:
(set (make-local-variable 'paragraph-start) comint-prompt-regexp)
(setq comint-input-sender 'ielm-input-sender)
(setq comint-process-echoes nil)
(set (make-local-variable 'paragraph-start) comint-prompt-regexp)
(setq comint-input-sender 'ielm-input-sender)
(setq comint-process-echoes nil)
- (set (make-local-variable 'com
int-dynamic-complete
-functions)
+ (set (make-local-variable 'com
pletion-at-point
-functions)
'(ielm-tab comint-replace-by-expanded-history
ielm-complete-filename ielm-complete-symbol))
(set (make-local-variable 'ielm-prompt-internal) ielm-prompt)
'(ielm-tab comint-replace-by-expanded-history
ielm-complete-filename ielm-complete-symbol))
(set (make-local-variable 'ielm-prompt-internal) ielm-prompt)
@@
-499,12
+507,13
@@
Customized bindings may be defined in `ielm-map', which currently contains:
(setq comint-get-old-input 'ielm-get-old-input)
(set (make-local-variable 'comint-completion-addsuffix) '("/" . ""))
(setq mode-line-process '(":%s on " (:eval (buffer-name ielm-working-buffer))))
(setq comint-get-old-input 'ielm-get-old-input)
(set (make-local-variable 'comint-completion-addsuffix) '("/" . ""))
(setq mode-line-process '(":%s on " (:eval (buffer-name ielm-working-buffer))))
+ ;; Useful for `hs-minor-mode'.
+ (setq-local comment-start ";")
+ (setq-local comment-use-global-state t)
(set (make-local-variable 'indent-line-function) 'ielm-indent-line)
(set (make-local-variable 'ielm-working-buffer) (current-buffer))
(set (make-local-variable 'fill-paragraph-function) 'lisp-fill-paragraph)
(set (make-local-variable 'indent-line-function) 'ielm-indent-line)
(set (make-local-variable 'ielm-working-buffer) (current-buffer))
(set (make-local-variable 'fill-paragraph-function) 'lisp-fill-paragraph)
- (add-hook 'completion-at-point-functions
- 'lisp-completion-at-point nil 'local)
;; Value holders
(set (make-local-variable '*) nil)
;; Value holders
(set (make-local-variable '*) nil)