[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/org-real a909323 017/160: Shift other things to the rig
From: |
ELPA Syncer |
Subject: |
[elpa] externals/org-real a909323 017/160: Shift other things to the right or below when merging |
Date: |
Wed, 6 Oct 2021 16:58:06 -0400 (EDT) |
branch: externals/org-real
commit a90932310491bf7a4608cbc4341fc8a8c9301cfb
Author: Tyler Grinn <tylergrinn@gmail.com>
Commit: Tyler Grinn <tylergrinn@gmail.com>
Shift other things to the right or below when merging
---
garage.org | 2 ++
org-real.el | 14 ++++++++++++--
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/garage.org b/garage.org
index b8ebb4b..f7d1775 100644
--- a/garage.org
+++ b/garage.org
@@ -6,3 +6,5 @@
- [[real://garage/east wall?rel=in/rake?rel=on/shovel?rel=to the left
of][shovel]]
- [[real://garage/east wall?rel=in/rake?rel=on/hoe?rel=to the left of][hoe]]
-
[[real://garage/workbench?rel=in/wrench?rel=on/paintbrush?rel=above][paintbrush]]
+ - [[real://garage/workbench?rel=in/ratchet?rel=on/hammer?rel=to the right
of][hammer]]
+ - [[real://garage/workbench?rel=in/ratchet?rel=on/nails?rel=to the right
of][nails]]
diff --git a/org-real.el b/org-real.el
index ff858f1..be394f6 100644
--- a/org-real.el
+++ b/org-real.el
@@ -274,11 +274,21 @@ of BOX."
(oset next :x-order (oref match :x-order))
(oset next :behind (oref match :behind)))
((string= rel "below")
+ (let ((y-order (oref match :y-order)))
+ (oset next :y-order (+ 1 y-order))
+ (org-real--map-immediate
+ (lambda (box) (when (> (oref box :y-order) y-order)
+ (oset box :y-order (+ 1 (oref box :y-order)))))
+ match))
(oset next :x-order (oref match :x-order))
- (oset next :y-order (+ 1 (oref match :y-order)))
(oset next :behind (oref match :behind)))
((string= rel "to the right of")
- (oset next :x-order (+ 1 (oref match :x-order)))
+ (let ((x-order (oref match :x-order)))
+ (oset next :x-order (+ 1 x-order))
+ (org-real--map-immediate
+ (lambda (box) (when (> (oref box :x-order) x-order)
+ (oset box :x-order (+ 1 (oref box :x-order)))))
+ match))
(oset next :y-order (oref match :y-order))
(oset next :behind (oref match :behind))
(oset next :in-front (oref match :in-front)))
- [elpa] externals/org-real dab4fc9 154/160: Updated readme, (continued)
- [elpa] externals/org-real dab4fc9 154/160: Updated readme, ELPA Syncer, 2021/10/06
- [elpa] externals/org-real 497ea6c 152/160: Added license, ELPA Syncer, 2021/10/06
- [elpa] externals/org-real 2ee4b19 006/160: More edge cases, ELPA Syncer, 2021/10/06
- [elpa] externals/org-real 8b3b5c2 005/160: org-real--merge and org-real-world, ELPA Syncer, 2021/10/06
- [elpa] externals/org-real 883497d 009/160: Use .el file instead of .tar in release job, ELPA Syncer, 2021/10/06
- [elpa] externals/org-real e039322 012/160: Add new line after pp text, ELPA Syncer, 2021/10/06
- [elpa] externals/org-real d557262 011/160: Switched to before and after advice for advising `org-insert-link', ELPA Syncer, 2021/10/06
- [elpa] externals/org-real 1fa4417 015/160: Updated README, ELPA Syncer, 2021/10/06
- [elpa] externals/org-real dfcddef 013/160: Added more documentation, ELPA Syncer, 2021/10/06
- [elpa] externals/org-real 9ea4553 018/160: Modified logic to allow multiple children, ELPA Syncer, 2021/10/06
- [elpa] externals/org-real a909323 017/160: Shift other things to the right or below when merging,
ELPA Syncer <=
- [elpa] externals/org-real 6fcc3b9 031/160: Updated md5 command to see tar files, ELPA Syncer, 2021/10/06
- [elpa] externals/org-real d07bf14 020/160: find-last index returns nil if no match, ELPA Syncer, 2021/10/06
- [elpa] externals/org-real a16fed2 032/160: Linting, ELPA Syncer, 2021/10/06
- [elpa] externals/org-real 9608f53 030/160: Satisfying elc compiler, ELPA Syncer, 2021/10/06
- [elpa] externals/org-real dbd7b45 037/160: Check for compiler warnings in CI/CD pipeline, ELPA Syncer, 2021/10/06
- [elpa] externals/org-real 463da8b 029/160: Refactoring, ELPA Syncer, 2021/10/06
- [elpa] externals/org-real 6d8351f 038/160: Renamed org-real--box to org-real-box, ELPA Syncer, 2021/10/06
- [elpa] externals/org-real 4a569a1 039/160: Merge branch 'next' into 'main', ELPA Syncer, 2021/10/06
- [elpa] externals/org-real d161250 041/160: Removed reference to org-real-box, ELPA Syncer, 2021/10/06
- [elpa] externals/org-real 9ac40b5 042/160: v0.1.0, ELPA Syncer, 2021/10/06