From 4cb569a7665bebd3ea3860a190538c7c61d3b4ed Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Mon, 6 Nov 2017 00:09:15 +0100
Subject: [PATCH] org/org: replace C-S-{j,k} w/ org-meta{up,down}

---
 modules/org/org/autoload/org.el    |  2 +-
 modules/org/org/autoload/tables.el | 13 -------------
 modules/org/org/config.el          |  4 ++--
 3 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/modules/org/org/autoload/org.el b/modules/org/org/autoload/org.el
index fcd7de4ff..cba341926 100644
--- a/modules/org/org/autoload/org.el
+++ b/modules/org/org/autoload/org.el
@@ -199,7 +199,7 @@ wrong places)."
           ((memq type '(table table-row))
            (pcase direction
              ('below (org-table-insert-row t))
-             ('above (+org/table-prepend-row-or-shift-up))))
+             ('above (org-shiftmetadown))))
 
           ((memq type '(headline inlinetask))
            (let ((level (if (eq (org-element-type context) 'headline)
diff --git a/modules/org/org/autoload/tables.el b/modules/org/org/autoload/tables.el
index 6f9e42748..7248f4625 100644
--- a/modules/org/org/autoload/tables.el
+++ b/modules/org/org/autoload/tables.el
@@ -51,16 +51,3 @@ re-align the table if necessary. (Necessary because org-mode has a
   (interactive)
   (if (org-at-table-p) (org-shiftmetaright) (org-shiftmetaleft)))
 
-;;;###autoload
-(defun +org/table-append-row-or-shift-down ()
-  (interactive)
-  (org-shiftmetadown)
-  (when (org-at-table-p) (org-metadown)))
-
-;;;###autoload
-(defun +org/table-prepend-row-or-shift-up ()
-  (interactive)
-  (if (org-at-table-p)
-      (org-shiftmetadown)
-    (org-shiftmetaup)))
-
diff --git a/modules/org/org/config.el b/modules/org/org/config.el
index 065585075..94be0e199 100644
--- a/modules/org/org/config.el
+++ b/modules/org/org/config.el
@@ -168,8 +168,8 @@ between the two."
           ;; Expand tables (or shiftmeta move)
           :ni "C-S-l" #'+org/table-append-field-or-shift-right
           :ni "C-S-h" #'+org/table-prepend-field-or-shift-left
-          :ni "C-S-k" #'+org/table-prepend-row-or-shift-up
-          :ni "C-S-j" #'+org/table-append-row-or-shift-down
+          :ni "C-S-k" #'org-metaup
+          :ni "C-S-j" #'org-metadown
 
           :n  [tab]     #'+org/toggle-fold
           :i  [tab]     #'+org/indent-or-next-field-or-yas-expand