[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/objed d35abd5 30/59: Improve eval context op for commen
From: |
Clemens Radermacher |
Subject: |
[elpa] externals/objed d35abd5 30/59: Improve eval context op for comments and change its binding |
Date: |
Sun, 24 Mar 2019 06:06:39 -0400 (EDT) |
branch: externals/objed
commit d35abd52dbc1357f3623cddab9c9c5ca8a500536
Author: Clemens Radermacher <address@hidden>
Commit: Clemens Radermacher <address@hidden>
Improve eval context op for comments and change its binding
---
objed.el | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/objed.el b/objed.el
index 8b5ccc0..fd4bbef 100644
--- a/objed.el
+++ b/objed.el
@@ -836,15 +836,15 @@ Other single character keys are bound to
`objed-undefined'."
(defvar objed-op-map
(let ((map (objed--define-prefix "x" 'objed-op-map)))
;; apply region command on object
- (define-key map "x" 'objed-op-x)
+ (define-key map (kbd "TAB") 'objed-op-x)
;; todo: show object op hydra command
(define-key map "c"
;; upcase, downcase, capitalize, reformat
(objed-define-op nil objed-case-op))
+ (define-key map "x" 'objed-eval-context)
(define-key map "q"
(objed-define-op nil objed-reformat-op ignore))
- (define-key map "e" 'objed-eval-context)
(define-key map "r" ctl-x-r-map)
(define-key map "n" 'objed-narrow)
@@ -897,7 +897,7 @@ To define new operations see `objed-define-op'.")
(defvar objed-object-map
(let ((map (objed--define-prefix "c" 'objed-object-map)))
;; choose via completion
- (define-key map "x" 'objed-object-x)
+ (define-key map (kbd "TAB") 'objed-object-x)
(define-key map (kbd "SPC") 'objed-region-object)
;; default objects
(define-key map "c" 'objed-char-object)
@@ -2801,12 +2801,16 @@ If REPLACE is non-nil replace evaluated code with
result."
(when (and beg end)
(goto-char beg)
(funcall 'objed--eval-func beg end replace)))))
+ (set-transient-map '(keymap (?x . objed-eval-context)))
+ (unless objed--buffer
+ (objed--init 'char))
(when (and (objed--at-object-p 'bracket)
(not (eq objed--object 'bracket)))
(objed--switch-to 'bracket))
- (unless (and (not (eq last-command this-command))
- (apply 'objed--eval-func
- (append (objed--current) (list replace))))
+ (when (or (eq last-command this-command)
+ (not (apply 'objed--eval-func
+ (append (objed--current) (list replace))))
+ (objed--in-string-or-comment-p))
(objed--switch-to 'defun)
(apply 'objed--eval-func
(append (objed--current) (list replace))))))
- [elpa] externals/objed a09e198 36/59: Improve objed-eval-exp, (continued)
- [elpa] externals/objed a09e198 36/59: Improve objed-eval-exp, Clemens Radermacher, 2019/03/24
- [elpa] externals/objed 5af62e2 35/59: Default to char if current buffer has no objed--object set, Clemens Radermacher, 2019/03/24
- [elpa] externals/objed 26cd732 32/59: Exit with exit code or op name, Clemens Radermacher, 2019/03/24
- [elpa] externals/objed 4c878f8 21/59: Change objed-append-mode activation rules, Clemens Radermacher, 2019/03/24
- [elpa] externals/objed c17de45 48/59: Convert toggle state to shrink context command, Clemens Radermacher, 2019/03/24
- [elpa] externals/objed fe2b5f1 34/59: Improve objed-copy, Clemens Radermacher, 2019/03/24
- [elpa] externals/objed 08cb11c 31/59: Eval op improvements/fixes, Clemens Radermacher, 2019/03/24
- [elpa] externals/objed 951af46 28/59: Convert eval op to eval-context, Clemens Radermacher, 2019/03/24
- [elpa] externals/objed 20d776a 04/59: Improve identifier command, Clemens Radermacher, 2019/03/24
- [elpa] externals/objed 084c9ea 39/59: Adding toggle identifier place command, Clemens Radermacher, 2019/03/24
- [elpa] externals/objed d35abd5 30/59: Improve eval context op for comments and change its binding,
Clemens Radermacher <=
- [elpa] externals/objed 26235a7 44/59: Improve duplicate op, Clemens Radermacher, 2019/03/24
- [elpa] externals/objed 5f9a7f6 37/59: Give feedback message on reformat, Clemens Radermacher, 2019/03/24
- [elpa] externals/objed bc5aa6c 26/59: Add left/right char to cmd-alist, Clemens Radermacher, 2019/03/24
- [elpa] externals/objed 041109d 27/59: Change object at point semantics (rules for o/[/]), Clemens Radermacher, 2019/03/24
- [elpa] externals/objed bad4e56 25/59: Add objed append mode binding "W", Clemens Radermacher, 2019/03/24
- [elpa] externals/objed d2e3da3 24/59: Add objed-eval binding ":", Clemens Radermacher, 2019/03/24
- [elpa] externals/objed 23005a3 23/59: Add object to register functionality, Clemens Radermacher, 2019/03/24
- [elpa] externals/objed a341a60 22/59: Fix identifier movement, Clemens Radermacher, 2019/03/24
- [elpa] externals/objed 6f50de1 20/59: Add objed-append-mode for objed-copy repeat, Clemens Radermacher, 2019/03/24
- [elpa] externals/objed 850c2e9 16/59: Improve object next identifier, Clemens Radermacher, 2019/03/24