From 40b7e4de5ee61b24cad2e025417c4c10959182ad Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Mon, 2 Jan 2017 21:10:26 -0500
Subject: [PATCH] org: add (in|de)dent-or-(next|prev)-field functions

---
 modules/defuns/defuns-org.el | 60 ++++++++++++++++++++++++------------
 1 file changed, 41 insertions(+), 19 deletions(-)

diff --git a/modules/defuns/defuns-org.el b/modules/defuns/defuns-org.el
index 5f43bfe4f..87b193cab 100644
--- a/modules/defuns/defuns-org.el
+++ b/modules/defuns/defuns-org.el
@@ -28,29 +28,53 @@
 
 ;;;###autoload
 (defun doom/org-indent ()
+  "Indent the current item (header or item). Otherwise, forward to
+`self-insert-command'."
   (interactive)
-  (cond
-   ((and (org-on-heading-p)
-         (looking-back "^\\*+ +" (line-beginning-position)))
-    (ignore-errors
-      (org-demote)))
-   (t (call-interactively 'self-insert-command))))
+  (cond ((org-at-item-p)
+         (org-indent-item-tree))
+        ((and (org-on-heading-p)
+              (looking-back "^\\*+ +.*" (line-beginning-position)))
+         (ignore-errors (org-demote)))
+        (t (call-interactively 'self-insert-command))))
+
+;;;###autoload
+(defun doom/org-indent-or-next-field ()
+  "Depending on the context either indent the current item or go the next table field."
+  (interactive)
+  (call-interactively (if (org-at-table-p) 'org-table-next-field 'doom/org-indent)))
 
 ;;;###autoload
 (defun doom/org-dedent ()
+  "Dedent the current item (header or item). Otherwise, forward to
+`self-insert-command'."
   (interactive)
-  (cond
-   ((and (org-on-heading-p)
-         (looking-back "^\\*+ +" (line-beginning-position)))
-    (ignore-errors
-      (org-promote)))
-   (t (call-interactively 'self-insert-command))))
+  (cond ((org-at-item-p)
+         (let ((struct (if (org-region-active-p)
+                           (save-excursion (goto-char (region-beginning))
+                                           (org-list-struct))
+                         (org-list-struct))))
+           (org-list-indent-item-generic -1 nil struct)))
+        ((and (org-on-heading-p)
+              (looking-back "^\\*+ +.*" (line-beginning-position)))
+         (ignore-errors
+           (org-promote)))
+        (t (call-interactively 'self-insert-command))))
+
+;;;###autoload
+(defun doom/org-dedent-or-prev-field ()
+  "Depending on the context either dedent the current item or go the previous table field."
+  (interactive)
+  (call-interactively (if (org-at-table-p) 'org-table-previous-field 'doom/org-dedent)))
 
 ;;;###autoload
 (defun doom/org-insert-item (direction)
-  "Inserts a new heading or item, depending on the context. I use this instead of
-`org-insert-item' or `org-insert-heading' because they try to do too much and end up doing
-this otherwise simple task wrong (e.g. whitespace in the wrong places)."
+  "Inserts a new heading, table cell or item, depending on the context.
+DIRECTION can be 'above or 'below.
+
+I use this instead of `org-insert-item' or `org-insert-heading' which are too
+opinionated and perform this simple task incorrectly (e.g. whitespace in the
+wrong places)."
   (interactive)
   (let* ((context (org-element-lineage
                    (org-element-context)
@@ -71,10 +95,8 @@ this otherwise simple task wrong (e.g. whitespace in the wrong places)."
              (insert "[ ] ")))
           ((memq type '(table table-row))
            (cl-case direction
-             ('below
-              (org-table-insert-row))
-             ('above
-              (doom/org-table-prepend-row-or-shift-up))))
+             ('below (org-table-insert-row t))
+             ('above (doom/org-table-prepend-row-or-shift-up))))
           (t
            (let ((level (save-excursion
                           (org-back-to-heading)