[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/objed f50dee4 184/216: Allow to use eval-region instead
From: |
Stefan Monnier |
Subject: |
[elpa] externals/objed f50dee4 184/216: Allow to use eval-region instead ielm repl for Elisp |
Date: |
Tue, 8 Jan 2019 12:29:36 -0500 (EST) |
branch: externals/objed
commit f50dee4e8b9a2cb5ae192e9dd638db0605699230
Author: Clemera <address@hidden>
Commit: Clemera <address@hidden>
Allow to use eval-region instead ielm repl for Elisp
---
objed.el | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/objed.el b/objed.el
index 69c43fa..313291b 100644
--- a/objed.el
+++ b/objed.el
@@ -714,7 +714,7 @@ BEFORE and AFTER are forms to execute before/after calling
the command."
(define-key map (kbd "<C-return>")
(objed-define-op
- nil objed-run-or-eval))
+ nil objed-run-or-eval ignore))
(define-key map (kbd "<M-return>")
'objed-insert-new-object)
@@ -2830,6 +2830,10 @@ Commands can be shell commands or region commands."
(sh-mode . shell))
"Map major mode symbols to `eval-in-repl' REPL names.")
+(defvar objed-use-ielm-for-eval-p nil
+ "Whether to use ielm for `objed-run-or-eval' for Elisp.
+
+If nil eval-region is used instead.")
(defun objed-run-or-eval (beg end)
"Evalate region between beg and end using `eval-in-repl'."
@@ -2839,10 +2843,12 @@ Commands can be shell commands or region commands."
(let* ((name (symbol-name (cdr (assq major-mode objed--eir-alist))))
(lib (intern (concat "eval-in-repl-" name)))
(cmd (intern (concat "eir-eval-in-" name))))
- (when (and lib
- (require lib nil t)
- (commandp cmd))
- (call-interactively cmd)))))
+ (cond ((and (eq lib 'eval-in-repl-ielm)
+ (not objed-use-ielm-for-eval-p))
+ (eval-region beg end t))
+ ((and (require lib nil t)
+ (commandp cmd))
+ (call-interactively cmd))))))
;; * Exit active state
- [elpa] externals/objed 8fc9649 199/216: Fix markup, (continued)
- [elpa] externals/objed 8fc9649 199/216: Fix markup, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 806c681 209/216: Improve objed-activate conditions, Stefan Monnier, 2019/01/08
- [elpa] externals/objed d7a7c74 175/216: Improve python defun object, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 1af3cc7 190/216: Allow minibuffer input in non interactive function ops, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 101fd9f 179/216: Improve org section object, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 60d4e97 214/216: Dont init when starting commit message, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 72f1807 188/216: Use anzu if available, Stefan Monnier, 2019/01/08
- [elpa] externals/objed a30956f 202/216: Make objed-activate callable from hooks (init with char), Stefan Monnier, 2019/01/08
- [elpa] externals/objed ea2ac9e 137/216: Face used in mode line should be less prominent, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 03520df 208/216: Ignore user remappings for objed-quit-window, Stefan Monnier, 2019/01/08
- [elpa] externals/objed f50dee4 184/216: Allow to use eval-region instead ielm repl for Elisp,
Stefan Monnier <=
- [elpa] externals/objed d826c0f 216/216: Improve non interactive init, Stefan Monnier, 2019/01/08