[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/objed fa3b6db 161/216: Add include leading/trailing whi
From: |
Stefan Monnier |
Subject: |
[elpa] externals/objed fa3b6db 161/216: Add include leading/trailing whitespace commands |
Date: |
Tue, 8 Jan 2019 12:29:32 -0500 (EST) |
branch: externals/objed
commit fa3b6dbba44b9ed029ca1bd53258d4e15a6a59d0
Author: Clemera <address@hidden>
Commit: Clemera <address@hidden>
Add include leading/trailing whitespace commands
---
README.asc | 2 +-
objed.el | 53 +++++++++++++++++++----------------------------------
2 files changed, 20 insertions(+), 35 deletions(-)
diff --git a/README.asc b/README.asc
index b5ac068..88663a2 100644
--- a/README.asc
+++ b/README.asc
@@ -405,7 +405,7 @@ You can add your own prefix bindings using
`objed-define-dispatch`.
|Activate part from point forward until boundary of some object.
|kbd:[-/+]
-|Extend current object forward/backward until boundary of some object.
+|Extend current object forward/backward by including leading/trailing
whitespace.
|===
diff --git a/objed.el b/objed.el
index fb8c931..a587196 100644
--- a/objed.el
+++ b/objed.el
@@ -585,8 +585,7 @@ BEFORE and AFTER are forms to execute before/after calling
the command."
;; TODO: birdview mode/scroll mode
(define-key map (kbd "C-v") 'scroll-up-command)
(define-key map "\ev" 'scroll-down-command)
- ;; "visual"
- (define-key map "v" 'objed-extend)
+
;;(define-key map (kbd "C-h") which-key-C-h-map)
(define-key map (kbd "C-h k") 'describe-key)
@@ -656,6 +655,10 @@ BEFORE and AFTER are forms to execute before/after calling
the command."
(define-key map "M" 'objed-toggle-mark-backward)
(define-key map "U" 'objed-unmark-all)
+ ;; "visual"
+ (define-key map "v" 'objed-extend)
+ (define-key map "+" 'objed-include-trailing-ws)
+ (define-key map "-" 'objed-include-leading-ws)
;; basic edit ops
(define-key map "k" 'objed-kill)
@@ -810,14 +813,6 @@ To define new operations see `objed-define-op'.")
(define-key map "h" 'objed-buffer-object)
(define-key map "z" 'objed-ace-object)
-
- (define-key map "+" 'objed-trailing-object)
- (define-key map "-" 'objed-leading-object)
-
- ;; handled by basic movement..
-
- ;; (define-key map "s" 'objed-symbol-object)
-
map)
"Keymap used for additional text-objects by `objed'.
@@ -837,8 +832,7 @@ Use `objed-define-dispatch' to define a dispatch command.")
(objed-define-dispatch ">" objed--forward-until)
(objed-define-dispatch "*" objed--mark-all-inside)
(objed-define-dispatch "#" objed--ace-switch-object)
-(objed-define-dispatch "+" objed--extend-forward)
-(objed-define-dispatch "-" objed--extend-backward)
+
(defun objed--backward-until (name)
"Activate part from point backward until object NAME."
@@ -852,17 +846,6 @@ Use `objed-define-dispatch' to define a dispatch command.")
:ibeg (objed--min o)
:iend start))))
-(defun objed--extend-backward (name)
- "Activate part from point backward until object NAME."
- (let* ((start (objed--end))
- (o (objed--until name t)))
- (objed--switch-to
- name nil
- (objed-make-object
- :beg (point)
- :end start
- :ibeg (objed--min o)
- :iend start))))
(defun objed--forward-until (name)
"Activate part from point forward until object NAME."
@@ -877,17 +860,6 @@ Use `objed-define-dispatch' to define a dispatch command.")
:beg start
:end (objed--max o))))))
-(defun objed--extend-forward (name)
- "Activate part from point backward until object NAME."
- (let* ((start (objed--beg)))
- (when (objed--until name)
- (objed--switch-to
- name nil
- (objed-make-object
- :ibeg start
- :beg start
- :iend (point)
- :end (point))))))
(defmacro objed--save-state (&rest body)
" Preserve state during execution of BODY."
@@ -1731,6 +1703,19 @@ movement commands."
(objed--end))
t t))
+(defun objed-include-trailing-ws ()
+ "Include trailing ws for current object."
+ (interactive)
+ (objed--change-to
+ :end (objed--skip-forward (objed--end) 'ws)))
+
+(defun objed-include-leading-ws ()
+ "Include leading ws for current object."
+ (interactive)
+ (objed--change-to
+ :beg
+ (objed--skip-backward (objed--beg) 'ws)))
+
(defun objed-contents-object ()
"Switch to reference of an object.
- [elpa] externals/objed 6ed0f62 146/216: Merge remote-tracking branch 'origin/master', (continued)
- [elpa] externals/objed 6ed0f62 146/216: Merge remote-tracking branch 'origin/master', Stefan Monnier, 2019/01/08
- [elpa] externals/objed 862d168 164/216: Fix ipipe schedule timer, Stefan Monnier, 2019/01/08
- [elpa] externals/objed a0a8f81 158/216: Improve exchange point and mark, Stefan Monnier, 2019/01/08
- [elpa] externals/objed e9bfd92 156/216: Switch code order to avoid confusing compile warnings, Stefan Monnier, 2019/01/08
- [elpa] externals/objed add4b8f 154/216: Markup again, Stefan Monnier, 2019/01/08
- [elpa] externals/objed cf1db37 140/216: Allow users to define a function to allow/prevent objed init, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 26c88ba 168/216: Revert to 0, 1 is needed for 10>, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 39095c2 143/216: Add type specifications to defcustom calls, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 5c20c43 176/216: Improve org element/block object, don't inherit from paragraph, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 30eb150 166/216: Improve exit minibuffer for ipipe, Stefan Monnier, 2019/01/08
- [elpa] externals/objed fa3b6db 161/216: Add include leading/trailing whitespace commands,
Stefan Monnier <=
- [elpa] externals/objed de2d6e1 162/216: Toggle for repeating objed-extend, Stefan Monnier, 2019/01/08
- [elpa] externals/objed ec04ce3 182/216: Simplify exit-op logic, Stefan Monnier, 2019/01/08
- [elpa] externals/objed d0bc8c7 165/216: Update docs for ipipe, Stefan Monnier, 2019/01/08
- [elpa] externals/objed ee50345 170/216: Rephrase, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 76779dc 197/216: Adjust activation condition again, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 74b3595 181/216: Adjust textblock object, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 3a983ab 205/216: Read arguments of rcmd after region is established, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 6092485 173/216: Ignore cases where object could not be found (range = nil), Stefan Monnier, 2019/01/08
- [elpa] externals/objed 736c331 193/216: Improve undo, repeat will proceed undo in object region, Stefan Monnier, 2019/01/08
- [elpa] externals/objed 723fe2c 204/216: Adjust objed-activate again, Stefan Monnier, 2019/01/08