From 64f937fe289e7aca41471ec731aec1590bebe947 Mon Sep 17 00:00:00 2001
From: Florian Beck <fb@miszellen.de>
Date: Tue, 9 Sep 2014 12:35:09 +0200
Subject: [PATCH 3/4] org-table: Handle optional arguments and cleanup

* lisp/org-table.el (org-table-beginning-of-field): Fix
docstring. Call `org-table-end-of-field'.
(org-table-end-of-field): Fix docstring.  Handle missing and
negative args.
---
 lisp/org-table.el | 60 +++++++++++++++++++++++++++++++------------------------
 1 file changed, 34 insertions(+), 26 deletions(-)

diff --git a/lisp/org-table.el b/lisp/org-table.el
index 547f933..290cdce 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -1062,36 +1062,44 @@ Before doing so, re-align the table if necessary."
       (goto-char (match-end 0))))
 
 (defun org-table-beginning-of-field (&optional n)
-  "Move to the end of the current table field.
-If already at or after the end, move to the end of the next table field.
-With numeric argument N, move N-1 fields forward first."
+  "Move to the beginning of the current table field.
+If already at or before the beginning, move to the 
+beginning of the previous table field.  With numeric 
+argument N, move N-1 fields backward first."
   (interactive "p")
-  (let ((pos (point)))
-    (while (> n 1)
-      (setq n (1- n))
-      (org-table-previous-field))
-    (if (not (re-search-backward "|" (point-at-bol 0) t))
-	(user-error "No more table fields before the current")
-      (goto-char (match-end 0))
-      (and (looking-at " ") (forward-char 1)))
-    (if (>= (point) pos) (org-table-beginning-of-field 2))))
+  (org-table-end-of-field (- (or n 1))))
 
 (defun org-table-end-of-field (&optional n)
-  "Move to the beginning of the current table field.
-If already at or before the beginning, move to the beginning of the
-previous field.
-With numeric argument N, move N-1 fields backward first."
+  "Move to the end of the current table field.
+If already at or after the end, move to the end of the
+next table field.  With numeric argument N, move N-1 fields 
+forward first.  If the numeric argument is negative, move backwards."
   (interactive "p")
-  (let ((pos (point)))
-    (while (> n 1)
-      (setq n (1- n))
-      (org-table-next-field))
-    (when (re-search-forward "|" (point-at-eol 1) t)
-      (backward-char 1)
-      (skip-chars-backward " ")
-      (if (and (equal (char-before (point)) ?|) (looking-at " "))
-	  (forward-char 1)))
-    (if (<= (point) pos) (org-table-end-of-field 2))))
+  (let* ((pos (point))
+	 (n (or n 1)))
+    (dotimes (_ (1- (abs n)))
+      (funcall (if (> n 0)
+		   #'org-table-next-field
+		 #'org-table-previous-field)))
+    (let ((cell (or (org-element-get 'table-cell)
+		    ;; Fuzzy matching when on a table border:
+		    (org-element-get 'table-cell (1+ (point)))
+		    (org-element-get 'table-cell (1- (point))))))
+      (unless cell
+	(user-error "Not in a table cell"))
+      (goto-char (org-element-property
+		  (if (< n 0)
+		      :contents-begin
+		    :contents-end)
+		  cell))
+      ;; Point already is at the end/beginning of the field,
+      ;; so we move to the next/previous field.
+      (cond
+       ((and (> n 0) (>= pos (point)))
+	(org-table-end-of-field 2))
+       ((and (< n 0) (<= pos (point)))
+	(org-table-end-of-field -2))))))
+
 
 ;;;###autoload
 (defun org-table-next-row ()
-- 
1.9.1