From 2af1360042b12ebbc61bc05bc045e418a690f99e Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 12 Apr 2010 03:49:44 -0400
Subject: Rewrote ldg-regex with a macro (for simplicity)

---
 lisp/ldg-regex.el | 404 ++++++++++++++++++++++++++++++++----------------------
 1 file changed, 243 insertions(+), 161 deletions(-)

(limited to 'lisp/ldg-regex.el')

diff --git a/lisp/ldg-regex.el b/lisp/ldg-regex.el
index 14c41f63..0db19197 100644
--- a/lisp/ldg-regex.el
+++ b/lisp/ldg-regex.el
@@ -1,167 +1,249 @@
 (require 'rx)
 
-(defconst ledger-regex-date
-  (let ((sep '(or ?- (any ?. ?/))))	; can't do (any ?- ?. ?/) due to bug
-    (rx (group
-	 (and (? (= 4 num)
-		 (eval sep))
-	      (and num (? num))
-	      (eval sep)
-	      (and num (? num))))))
+(eval-when-compile
+  (require 'cl))
+
+(defmacro ledger-define-regexp (name regex docs &rest args)
+  "Simplify the creation of a Ledger regex and helper functions."
+  (let ((defs
+	  (list
+	   `(defconst
+	      ,(intern (concat "ledger-" (symbol-name name) "-regexp"))
+	      ,(eval regex))))
+	(addend 0) last-group)
+    (if (null args)
+	(progn
+	  (nconc
+	   defs
+	   (list
+	    `(defconst
+	       ,(intern
+		 (concat "ledger-regex-" (symbol-name name) "-group"))
+	       1)))
+	  (nconc
+	   defs
+	   (list
+	    `(defconst
+	       ,(intern (concat "ledger-regex-" (symbol-name name)
+				"-group--count"))
+	       1)))
+	  (nconc
+	   defs
+	   (list
+	    `(defmacro
+	       ,(intern (concat "ledger-regex-" (symbol-name name)))
+	       (&optional string)
+	       ,(format "Return the match string for the %s" name)
+	       (match-string
+		,(intern (concat "ledger-regex-" (symbol-name name)
+				 "-group"))
+		string)))))
+      
+      (dolist (arg args)
+	(let (var grouping target)
+	  (if (symbolp arg)
+	      (setq var arg target arg)
+	    (assert (listp arg))
+	    (if (= 2 (length arg))
+		(setq var (car arg)
+		      target (cadr arg))
+	      (setq var (car arg)
+		    grouping (cadr arg)
+		    target (caddr arg))))
+
+	  (if (and last-group
+		   (not (eq last-group (or grouping target))))
+	      (incf addend
+		    (symbol-value
+		     (intern-soft (concat "ledger-regex-"
+					  (symbol-name last-group)
+					  "-group--count")))))
+	  (nconc
+	   defs
+	   (list
+	    `(defconst
+	       ,(intern (concat "ledger-regex-" (symbol-name name)
+				"-group-" (symbol-name var)))
+	       ,(+ addend
+		   (symbol-value
+		    (intern-soft
+		     (if grouping
+			 (concat "ledger-regex-" (symbol-name grouping)
+				 "-group-" (symbol-name target))
+		       (concat "ledger-regex-" (symbol-name target)
+			       "-group"))))))))
+	  (nconc
+	   defs
+	   (list
+	    `(defmacro
+	       ,(intern (concat "ledger-regex-" (symbol-name name)
+				"-" (symbol-name var)))
+	       (&optional string)
+	       ,(format "Return the sub-group match for the %s %s."
+			name var)
+	       (match-string
+		,(intern (concat "ledger-regex-" (symbol-name name)
+				 "-group-" (symbol-name var)))
+		string))))
+
+	  (setq last-group (or grouping target))))
+
+      (nconc defs
+	     (list
+	      `(defconst ,(intern (concat "ledger-regex-" (symbol-name name)
+					  "-group--count"))
+		 ,(length args)))))
+
+    (cons 'progn defs)))
+
+(put 'ledger-define-regexp 'lisp-indent-function 2)
+
+(ledger-define-regexp date
+    (let ((sep '(or ?- (any ?. ?/))))	; can't do (any ?- ?. ?/) due to bug
+      (rx (group
+	   (and (? (= 4 num)
+		   (eval sep))
+		(and num (? num))
+		(eval sep)
+		(and num (? num))))))
   "Match a single date, in its 'written' form.")
 
-(defconst ledger-regex-date-group 1)
-(defconst ledger-regex-date-group--count 1)
-
-(defconst ledger-regex-full-date
-  (macroexpand
-   `(rx (and (regexp ,ledger-regex-date)
-	     (? (and ?= (regexp ,ledger-regex-date))))))
-  "Match a compound date, of the form ACTUAL=EFFECTIVE")
-
-(defconst ledger-regex-full-date-group-actual
-  ledger-regex-date-group)
-(defconst ledger-regex-full-date-group-effective
-  (+ ledger-regex-date-group--count
-     ledger-regex-date-group))
-(defconst ledger-regex-full-date-group--count
-  (* 2 ledger-regex-date-group--count))
-
-(defconst ledger-regex-state
-  (rx (group (any ?! ?*))))
-
-(defconst ledger-regex-state-group 1)
-(defconst ledger-regex-state-group--count 1)
-
-(defconst ledger-regex-code
-  (rx (and ?\( (group (+? (not (any ?\))))) ?\))))
-
-(defconst ledger-regex-code-group 1)
-(defconst ledger-regex-code-group--count 1)
-
-(defconst ledger-regex-long-space
-  (rx (and (*? space)
-	   (or (and ?  (or ?  ?\t)) ?\t))))
-
-(defconst ledger-regex-note
-  (rx (group (+ nonl))))
-
-(defconst ledger-regex-note-group 1)
-(defconst ledger-regex-note-group--count 1)
-
-(defconst ledger-regex-end-note
-  (macroexpand `(rx (and (regexp ,ledger-regex-long-space) ?\;
-			 (regexp ,ledger-regex-note)))))
-
-(defconst ledger-regex-end-note-group
-  ledger-regex-note-group)
-(defconst ledger-regex-end-note-group--count
-  ledger-regex-note-group--count)
-
-(defconst ledger-regex-full-note
-  (macroexpand `(rx (and line-start (+ space)
-			 ?\; (regexp ,ledger-regex-note)))))
-
-(defconst ledger-regex-full-note-group
-  ledger-regex-note-group)
-(defconst ledger-regex-full-note-group--count
-  ledger-regex-note-group--count)
-
-(defconst ledger-regex-xact-line
-  (macroexpand
-   `(rx (and line-start
-	     (regexp ,ledger-regex-full-date)
-	     (? (and (+ space) (regexp ,ledger-regex-state)))
-	     (? (and (+ space) (regexp ,ledger-regex-code)))
-	     (+ space) (+? nonl)
-	     (? (regexp ,ledger-regex-end-note))
-	     line-end))))
-
-(defconst ledger-regex-xact-line-group-actual-date
-  ledger-regex-full-date-group-actual)
-(defconst ledger-regex-xact-line-group-effective-date
-  ledger-regex-full-date-group-effective)
-(defconst ledger-regex-xact-line-group-state
-  (+ ledger-regex-full-date-group--count
-     ledger-regex-state-group))
-(defconst ledger-regex-xact-line-group-code
-  (+ ledger-regex-full-date-group--count
-     ledger-regex-state-group--count
-     ledger-regex-code-group))
-(defconst ledger-regex-xact-line-group-note
-  (+ ledger-regex-full-date-group--count
-     ledger-regex-state-group--count
-     ledger-regex-code-group--count
-     ledger-regex-note-group))
-(defconst ledger-regex-full-note-group--count
-  (+ ledger-regex-full-date-group--count
-     ledger-regex-state-group--count
-     ledger-regex-code-group--count
-     ledger-regex-note-group--count))
-
-(defun ledger-regex-xact-line-actual-date
-  (&optional string)
-  (match-string ledger-regex-xact-line-group-actual-date string))
-
-(defconst ledger-regex-account
-  (rx (group (and (not (any ?:)) (*? nonl)))))
-
-(defconst ledger-regex-full-account
-  (macroexpand
-   `(rx (and (group (? (any ?\[ ?\))))
-	     (regexp ,ledger-regex-account)
-	     (? (any ?\] ?\)))))))
-
-(defconst ledger-regex-commodity
-  (rx (or (and ?\" (+ (not (any ?\"))) ?\")
-	  (not (any space ?\n
-		    digit
-		    ?- ?\[ ?\]
-		    ?. ?, ?\; ?+ ?* ?/ ?^ ?? ?: ?& ?| ?! ?=
-		    ?\< ?\> ?\{ ?\} ?\( ?\) ?@)))))
-
-(defconst ledger-regex-amount
-  (rx (and (? ?-)
-	   (and (+ digit)
-		(*? (and (any ?. ?,) (+ digit))))
-	   (? (and (any ?. ?,) (+ digit))))))
-
-(defconst ledger-regex-commoditized-amount
-  (macroexpand
-   `(rx (or (and (regexp ,ledger-regex-commodity)
-		 (*? space)
-		 (regexp ,ledger-regex-amount))
-	    (and (regexp ,ledger-regex-amount)
-		 (*? space)
-		 (regexp ,ledger-regex-commodity))))))
-
-(defconst ledger-regex-commodity-annotations
-  (macroexpand
-   `(rx (* (+ space)
-	   (or (and ?\{ (regexp ,ledger-regex-commoditized-amount) ?\})
-	       (and ?\[ (regexp ,ledger-regex-date) ?\])
-	       (and ?\( (not (any ?\))) ?\)))))))
-
-(defconst ledger-regex-cost
-  (macroexpand
-   `(rx (and (or "@" "@@") (+ space)
-	     (regexp ,ledger-regex-commoditized-amount)))))
-
-(defconst ledger-regex-balance-assertion
-  (macroexpand
-   `(rx (and ?= (+ space)
-	     (regexp ,ledger-regex-commoditized-amount)))))
-
-(defconst ledger-regex-full-amount
-  (macroexpand `(rx (group (+? (not (any ?\;)))))))
-
-(defconst ledger-regex-post-line
-  (macroexpand
-   `(rx (and line-start
-	     (? (and (+ space) (regexp ,ledger-regex-state)))
-	     (+ space) (regexp ,ledger-regex-full-account)
-	     (+ space) (regexp ,ledger-regex-full-amount)
-	     (? (regexp ,ledger-regex-end-note))
-	     line-end))))
+(ledger-define-regexp full-date
+    (macroexpand
+     `(rx (and (regexp ,ledger-date-regexp)
+	       (? (and ?= (regexp ,ledger-date-regexp))))))
+  "Match a compound date, of the form ACTUAL=EFFECTIVE"
+  (actual date)
+  (effective date))
+
+(ledger-define-regexp state
+    (rx (group (any ?! ?*)))
+  "Match a transaction or posting's \"state\" character.")
+
+(ledger-define-regexp code
+    (rx (and ?\( (group (+? (not (any ?\))))) ?\)))
+  "Match the transaction code.")
+
+(ledger-define-regexp long-space
+    (rx (and (*? space)
+	     (or (and ?  (or ?  ?\t)) ?\t)))
+  "Match a \"long space\".")
+
+(ledger-define-regexp note
+    (rx (group (+ nonl)))
+  "")
+
+(ledger-define-regexp end-note
+    (macroexpand
+     `(rx (and (regexp ,ledger-long-space-regexp) ?\;
+	       (regexp ,ledger-note-regexp))))
+  "")
+
+(ledger-define-regexp full-note
+    (macroexpand
+     `(rx (and line-start (+ space)
+	       ?\; (regexp ,ledger-note-regexp))))
+  "")
+
+(ledger-define-regexp xact-line
+    (macroexpand
+     `(rx (and line-start
+	       (regexp ,ledger-full-date-regexp)
+	       (? (and (+ space) (regexp ,ledger-state-regexp)))
+	       (? (and (+ space) (regexp ,ledger-code-regexp)))
+	       (+ space) (+? nonl)
+	       (? (regexp ,ledger-end-note-regexp))
+	       line-end)))
+  "Match a transaction's first line (and optional notes)."
+  (actual-date full-date actual)
+  (effective-date full-date effective)
+  state
+  code
+  (note end-note))
+
+(ledger-define-regexp account
+    (rx (group (and (not (any ?:)) (*? nonl))))
+  "")
+
+(ledger-define-regexp account-kind
+    (rx (group (? (any ?\[ ?\)))))
+  "")
+
+(ledger-define-regexp full-account
+    (macroexpand
+     `(rx (and (regexp ,ledger-account-kind-regexp)
+	       (regexp ,ledger-account-regexp)
+	       (? (any ?\] ?\))))))
+  ""
+  (kind account-kind)
+  (name account))
+
+(ledger-define-regexp commodity
+    (rx (group
+	 (or (and ?\" (+ (not (any ?\"))) ?\")
+	     (not (any space ?\n
+		       digit
+		       ?- ?\[ ?\]
+		       ?. ?, ?\; ?+ ?* ?/ ?^ ?? ?: ?& ?| ?! ?=
+		       ?\< ?\> ?\{ ?\} ?\( ?\) ?@)))))
+  "")
+
+(ledger-define-regexp amount
+    (rx (group
+	 (and (? ?-)
+	      (and (+ digit)
+		   (*? (and (any ?. ?,) (+ digit))))
+	      (? (and (any ?. ?,) (+ digit))))))
+  "")
+
+(ledger-define-regexp commoditized-amount
+    (macroexpand
+     `(rx (group
+	   (or (and (regexp ,ledger-commodity-regexp)
+		    (*? space)
+		    (regexp ,ledger-amount-regexp))
+	       (and (regexp ,ledger-amount-regexp)
+		    (*? space)
+		    (regexp ,ledger-commodity-regexp))))))
+  "")
+
+(ledger-define-regexp commodity-annotations
+    (macroexpand
+     `(rx (* (+ space)
+	     (or (and ?\{ (regexp ,ledger-commoditized-amount-regexp) ?\})
+		 (and ?\[ (regexp ,ledger-date-regexp) ?\])
+		 (and ?\( (not (any ?\))) ?\))))))
+  "")
+
+(ledger-define-regexp cost
+    (macroexpand
+     `(rx (and (or "@" "@@") (+ space)
+	       (regexp ,ledger-commoditized-amount-regexp))))
+  "")
+
+(ledger-define-regexp balance-assertion
+    (macroexpand
+     `(rx (and ?= (+ space)
+	       (regexp ,ledger-commoditized-amount-regexp))))
+  "")
+
+(ledger-define-regexp full-amount
+    (macroexpand `(rx (group (+? (not (any ?\;))))))
+  "")
+
+(ledger-define-regexp post-line
+    (macroexpand
+     `(rx (and line-start
+	       (? (and (+ space) (regexp ,ledger-state-regexp)))
+	       (+ space) (regexp ,ledger-full-account-regexp)
+	       (+ space) (regexp ,ledger-full-amount-regexp)
+	       (? (regexp ,ledger-end-note-regexp))
+	       line-end)))
+  ""
+  state
+  (account-kind full-account kind)
+  (account-name full-account name)
+  (amount full-amount)
+  (note end-note))
 
 (provide 'ldg-regex)
-- 
cgit v1.2.3


From 2f2340d0ac1df4d911c58b68d48e88938bd7e862 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 12 Apr 2010 22:30:42 -0400
Subject: Fixes to ledger-mode regexps

---
 lisp/ldg-regex.el | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

(limited to 'lisp/ldg-regex.el')

diff --git a/lisp/ldg-regex.el b/lisp/ldg-regex.el
index 0db19197..15226ef1 100644
--- a/lisp/ldg-regex.el
+++ b/lisp/ldg-regex.el
@@ -125,7 +125,7 @@
   "Match the transaction code.")
 
 (ledger-define-regexp long-space
-    (rx (and (*? space)
+    (rx (and (*? blank)
 	     (or (and ?  (or ?  ?\t)) ?\t)))
   "Match a \"long space\".")
 
@@ -141,7 +141,7 @@
 
 (ledger-define-regexp full-note
     (macroexpand
-     `(rx (and line-start (+ space)
+     `(rx (and line-start (+ blank)
 	       ?\; (regexp ,ledger-note-regexp))))
   "")
 
@@ -149,9 +149,9 @@
     (macroexpand
      `(rx (and line-start
 	       (regexp ,ledger-full-date-regexp)
-	       (? (and (+ space) (regexp ,ledger-state-regexp)))
-	       (? (and (+ space) (regexp ,ledger-code-regexp)))
-	       (+ space) (+? nonl)
+	       (? (and (+ blank) (regexp ,ledger-state-regexp)))
+	       (? (and (+ blank) (regexp ,ledger-code-regexp)))
+	       (+ blank) (+? nonl)
 	       (? (regexp ,ledger-end-note-regexp))
 	       line-end)))
   "Match a transaction's first line (and optional notes)."
@@ -162,11 +162,11 @@
   (note end-note))
 
 (ledger-define-regexp account
-    (rx (group (and (not (any ?:)) (*? nonl))))
+    (rx (group (and (not (any blank ?\[ ?\( ?: ?\;)) (*? nonl))))
   "")
 
 (ledger-define-regexp account-kind
-    (rx (group (? (any ?\[ ?\)))))
+    (rx (group (? (any ?\[ ?\())))
   "")
 
 (ledger-define-regexp full-account
@@ -181,7 +181,7 @@
 (ledger-define-regexp commodity
     (rx (group
 	 (or (and ?\" (+ (not (any ?\"))) ?\")
-	     (not (any space ?\n
+	     (not (any blank ?\n
 		       digit
 		       ?- ?\[ ?\]
 		       ?. ?, ?\; ?+ ?* ?/ ?^ ?? ?: ?& ?| ?! ?=
@@ -200,16 +200,16 @@
     (macroexpand
      `(rx (group
 	   (or (and (regexp ,ledger-commodity-regexp)
-		    (*? space)
+		    (*? blank)
 		    (regexp ,ledger-amount-regexp))
 	       (and (regexp ,ledger-amount-regexp)
-		    (*? space)
+		    (*? blank)
 		    (regexp ,ledger-commodity-regexp))))))
   "")
 
 (ledger-define-regexp commodity-annotations
     (macroexpand
-     `(rx (* (+ space)
+     `(rx (* (+ blank)
 	     (or (and ?\{ (regexp ,ledger-commoditized-amount-regexp) ?\})
 		 (and ?\[ (regexp ,ledger-date-regexp) ?\])
 		 (and ?\( (not (any ?\))) ?\))))))
@@ -217,13 +217,13 @@
 
 (ledger-define-regexp cost
     (macroexpand
-     `(rx (and (or "@" "@@") (+ space)
+     `(rx (and (or "@" "@@") (+ blank)
 	       (regexp ,ledger-commoditized-amount-regexp))))
   "")
 
 (ledger-define-regexp balance-assertion
     (macroexpand
-     `(rx (and ?= (+ space)
+     `(rx (and ?= (+ blank)
 	       (regexp ,ledger-commoditized-amount-regexp))))
   "")
 
@@ -233,16 +233,17 @@
 
 (ledger-define-regexp post-line
     (macroexpand
-     `(rx (and line-start
-	       (? (and (+ space) (regexp ,ledger-state-regexp)))
-	       (+ space) (regexp ,ledger-full-account-regexp)
-	       (+ space) (regexp ,ledger-full-amount-regexp)
+     `(rx (and line-start (+ blank)
+	       (? (and (regexp ,ledger-state-regexp) (* blank)))
+	       (regexp ,ledger-full-account-regexp)
+	       (? (and (regexp ,ledger-long-space-regexp)
+		       (regexp ,ledger-full-amount-regexp)))
 	       (? (regexp ,ledger-end-note-regexp))
 	       line-end)))
   ""
   state
   (account-kind full-account kind)
-  (account-name full-account name)
+  (account full-account name)
   (amount full-amount)
   (note end-note))
 
-- 
cgit v1.2.3


From 7f5c1c81a1918dd3f7293a66b988599a0125b1f9 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Sun, 2 May 2010 23:50:17 -0400
Subject: Added some missing autoloads for the new ledger-mode

---
 lisp/ldg-mode.el     |   2 +
 lisp/ldg-new.el      |   4 ++
 lisp/ldg-post.el     |   9 ++-
 lisp/ldg-regex.el    | 152 +++++++++++++++++++++++++--------------------------
 lisp/ldg-register.el |   3 +-
 5 files changed, 90 insertions(+), 80 deletions(-)

(limited to 'lisp/ldg-regex.el')

diff --git a/lisp/ldg-mode.el b/lisp/ldg-mode.el
index 625d9f49..c6f15eed 100644
--- a/lisp/ldg-mode.el
+++ b/lisp/ldg-mode.el
@@ -22,6 +22,8 @@
 ;;;###autoload
 (define-derived-mode ledger-mode text-mode "Ledger"
   "A mode for editing ledger data files."
+  (ledger-post-setup)
+
   (set (make-local-variable 'comment-start) " ; ")
   (set (make-local-variable 'comment-end) "")
   (set (make-local-variable 'indent-tabs-mode) nil)
diff --git a/lisp/ldg-new.el b/lisp/ldg-new.el
index fce25984..a515d94f 100644
--- a/lisp/ldg-new.el
+++ b/lisp/ldg-new.el
@@ -34,6 +34,10 @@
 
 (require 'ldg-post)
 
+(autoload #'ledger-mode "ldg-mode" nil t)
+
+(autoload #'ledger-fully-complete-entry "ldg-complete" nil t)
+
 (autoload #'ledger-texi-update-test "ldg-texi" nil t)
 (autoload #'ledger-texi-update-examples "ldg-texi" nil t)
 
diff --git a/lisp/ldg-post.el b/lisp/ldg-post.el
index 2d7a0e05..492f9467 100644
--- a/lisp/ldg-post.el
+++ b/lisp/ldg-post.el
@@ -83,6 +83,13 @@ to choose from."
 		(delete-char 1)))))))
     (goto-char pos)))
 
+(defun ledger-next-amount (&optional end)
+  (when (re-search-forward "\\(  \\|\t\\| \t\\)[ \t]*-?\\([A-Z$]+ *\\)?\\(-?[0-9,]+?\\)\\(.[0-9]+\\)?\\( *[A-Z$]+\\)?\\([ \t]*@@?[^\n;]+?\\)?\\([ \t]+;.+?\\)?$" (marker-position end) t)
+    (goto-char (match-beginning 0))
+    (skip-syntax-forward " ")
+    (- (or (match-end 4)
+	   (match-end 3)) (point))))
+
 (defun ledger-align-amounts (&optional column)
   "Align amounts in the current region.
 This is done so that the last digit falls in COLUMN, which defaults to 52."
@@ -164,6 +171,4 @@ This is done so that the last digit falls in COLUMN, which defaults to 52."
       (add-hook 'after-change-functions 'ledger-post-maybe-align t t))
   (add-hook 'after-save-hook #'(lambda () (setq ledger-post-current-list nil))))
 
-(add-hook 'ledger-mode-hook 'ledger-post-setup)
-
 (provide 'ldg-post)
diff --git a/lisp/ldg-regex.el b/lisp/ldg-regex.el
index 15226ef1..93ef6b09 100644
--- a/lisp/ldg-regex.el
+++ b/lisp/ldg-regex.el
@@ -96,64 +96,64 @@
 
     (cons 'progn defs)))
 
-(put 'ledger-define-regexp 'lisp-indent-function 2)
+(put 'ledger-define-regexp 'lisp-indent-function 1)
 
 (ledger-define-regexp date
-    (let ((sep '(or ?- (any ?. ?/))))	; can't do (any ?- ?. ?/) due to bug
-      (rx (group
-	   (and (? (= 4 num)
-		   (eval sep))
-		(and num (? num))
-		(eval sep)
-		(and num (? num))))))
+  (let ((sep '(or ?- (any ?. ?/))))	; can't do (any ?- ?. ?/) due to bug
+    (rx (group
+	 (and (? (= 4 num)
+		 (eval sep))
+	      (and num (? num))
+	      (eval sep)
+	      (and num (? num))))))
   "Match a single date, in its 'written' form.")
 
 (ledger-define-regexp full-date
-    (macroexpand
-     `(rx (and (regexp ,ledger-date-regexp)
-	       (? (and ?= (regexp ,ledger-date-regexp))))))
+  (macroexpand
+   `(rx (and (regexp ,ledger-date-regexp)
+	     (? (and ?= (regexp ,ledger-date-regexp))))))
   "Match a compound date, of the form ACTUAL=EFFECTIVE"
   (actual date)
   (effective date))
 
 (ledger-define-regexp state
-    (rx (group (any ?! ?*)))
+  (rx (group (any ?! ?*)))
   "Match a transaction or posting's \"state\" character.")
 
 (ledger-define-regexp code
-    (rx (and ?\( (group (+? (not (any ?\))))) ?\)))
+  (rx (and ?\( (group (+? (not (any ?\))))) ?\)))
   "Match the transaction code.")
 
 (ledger-define-regexp long-space
-    (rx (and (*? blank)
-	     (or (and ?  (or ?  ?\t)) ?\t)))
+  (rx (and (*? blank)
+	   (or (and ?  (or ?  ?\t)) ?\t)))
   "Match a \"long space\".")
 
 (ledger-define-regexp note
-    (rx (group (+ nonl)))
+  (rx (group (+ nonl)))
   "")
 
 (ledger-define-regexp end-note
-    (macroexpand
-     `(rx (and (regexp ,ledger-long-space-regexp) ?\;
-	       (regexp ,ledger-note-regexp))))
+  (macroexpand
+   `(rx (and (regexp ,ledger-long-space-regexp) ?\;
+	     (regexp ,ledger-note-regexp))))
   "")
 
 (ledger-define-regexp full-note
-    (macroexpand
-     `(rx (and line-start (+ blank)
-	       ?\; (regexp ,ledger-note-regexp))))
+  (macroexpand
+   `(rx (and line-start (+ blank)
+	     ?\; (regexp ,ledger-note-regexp))))
   "")
 
 (ledger-define-regexp xact-line
-    (macroexpand
-     `(rx (and line-start
-	       (regexp ,ledger-full-date-regexp)
-	       (? (and (+ blank) (regexp ,ledger-state-regexp)))
-	       (? (and (+ blank) (regexp ,ledger-code-regexp)))
-	       (+ blank) (+? nonl)
-	       (? (regexp ,ledger-end-note-regexp))
-	       line-end)))
+  (macroexpand
+   `(rx (and line-start
+	     (regexp ,ledger-full-date-regexp)
+	     (? (and (+ blank) (regexp ,ledger-state-regexp)))
+	     (? (and (+ blank) (regexp ,ledger-code-regexp)))
+	     (+ blank) (+? nonl)
+	     (? (regexp ,ledger-end-note-regexp))
+	     line-end)))
   "Match a transaction's first line (and optional notes)."
   (actual-date full-date actual)
   (effective-date full-date effective)
@@ -162,84 +162,84 @@
   (note end-note))
 
 (ledger-define-regexp account
-    (rx (group (and (not (any blank ?\[ ?\( ?: ?\;)) (*? nonl))))
+  (rx (group (and (not (any blank ?\[ ?\( ?: ?\;)) (*? nonl))))
   "")
 
 (ledger-define-regexp account-kind
-    (rx (group (? (any ?\[ ?\())))
+  (rx (group (? (any ?\[ ?\())))
   "")
 
 (ledger-define-regexp full-account
-    (macroexpand
-     `(rx (and (regexp ,ledger-account-kind-regexp)
-	       (regexp ,ledger-account-regexp)
-	       (? (any ?\] ?\))))))
+  (macroexpand
+   `(rx (and (regexp ,ledger-account-kind-regexp)
+	     (regexp ,ledger-account-regexp)
+	     (? (any ?\] ?\))))))
   ""
   (kind account-kind)
   (name account))
 
 (ledger-define-regexp commodity
-    (rx (group
-	 (or (and ?\" (+ (not (any ?\"))) ?\")
-	     (not (any blank ?\n
-		       digit
-		       ?- ?\[ ?\]
-		       ?. ?, ?\; ?+ ?* ?/ ?^ ?? ?: ?& ?| ?! ?=
-		       ?\< ?\> ?\{ ?\} ?\( ?\) ?@)))))
+  (rx (group
+       (or (and ?\" (+ (not (any ?\"))) ?\")
+	   (not (any blank ?\n
+		     digit
+		     ?- ?\[ ?\]
+		     ?. ?, ?\; ?+ ?* ?/ ?^ ?? ?: ?& ?| ?! ?=
+		     ?\< ?\> ?\{ ?\} ?\( ?\) ?@)))))
   "")
 
 (ledger-define-regexp amount
-    (rx (group
-	 (and (? ?-)
-	      (and (+ digit)
-		   (*? (and (any ?. ?,) (+ digit))))
-	      (? (and (any ?. ?,) (+ digit))))))
+  (rx (group
+       (and (? ?-)
+	    (and (+ digit)
+		 (*? (and (any ?. ?,) (+ digit))))
+	    (? (and (any ?. ?,) (+ digit))))))
   "")
 
 (ledger-define-regexp commoditized-amount
-    (macroexpand
-     `(rx (group
-	   (or (and (regexp ,ledger-commodity-regexp)
-		    (*? blank)
-		    (regexp ,ledger-amount-regexp))
-	       (and (regexp ,ledger-amount-regexp)
-		    (*? blank)
-		    (regexp ,ledger-commodity-regexp))))))
+  (macroexpand
+   `(rx (group
+	 (or (and (regexp ,ledger-commodity-regexp)
+		  (*? blank)
+		  (regexp ,ledger-amount-regexp))
+	     (and (regexp ,ledger-amount-regexp)
+		  (*? blank)
+		  (regexp ,ledger-commodity-regexp))))))
   "")
 
 (ledger-define-regexp commodity-annotations
-    (macroexpand
-     `(rx (* (+ blank)
-	     (or (and ?\{ (regexp ,ledger-commoditized-amount-regexp) ?\})
-		 (and ?\[ (regexp ,ledger-date-regexp) ?\])
-		 (and ?\( (not (any ?\))) ?\))))))
+  (macroexpand
+   `(rx (* (+ blank)
+	   (or (and ?\{ (regexp ,ledger-commoditized-amount-regexp) ?\})
+	       (and ?\[ (regexp ,ledger-date-regexp) ?\])
+	       (and ?\( (not (any ?\))) ?\))))))
   "")
 
 (ledger-define-regexp cost
-    (macroexpand
-     `(rx (and (or "@" "@@") (+ blank)
-	       (regexp ,ledger-commoditized-amount-regexp))))
+  (macroexpand
+   `(rx (and (or "@" "@@") (+ blank)
+	     (regexp ,ledger-commoditized-amount-regexp))))
   "")
 
 (ledger-define-regexp balance-assertion
-    (macroexpand
-     `(rx (and ?= (+ blank)
-	       (regexp ,ledger-commoditized-amount-regexp))))
+  (macroexpand
+   `(rx (and ?= (+ blank)
+	     (regexp ,ledger-commoditized-amount-regexp))))
   "")
 
 (ledger-define-regexp full-amount
-    (macroexpand `(rx (group (+? (not (any ?\;))))))
+  (macroexpand `(rx (group (+? (not (any ?\;))))))
   "")
 
 (ledger-define-regexp post-line
-    (macroexpand
-     `(rx (and line-start (+ blank)
-	       (? (and (regexp ,ledger-state-regexp) (* blank)))
-	       (regexp ,ledger-full-account-regexp)
-	       (? (and (regexp ,ledger-long-space-regexp)
-		       (regexp ,ledger-full-amount-regexp)))
-	       (? (regexp ,ledger-end-note-regexp))
-	       line-end)))
+  (macroexpand
+   `(rx (and line-start (+ blank)
+	     (? (and (regexp ,ledger-state-regexp) (* blank)))
+	     (regexp ,ledger-full-account-regexp)
+	     (? (and (regexp ,ledger-long-space-regexp)
+		     (regexp ,ledger-full-amount-regexp)))
+	     (? (regexp ,ledger-end-note-regexp))
+	     line-end)))
   ""
   state
   (account-kind full-account kind)
diff --git a/lisp/ldg-register.el b/lisp/ldg-register.el
index 93611345..02e50de9 100644
--- a/lisp/ldg-register.el
+++ b/lisp/ldg-register.el
@@ -57,8 +57,7 @@
       (let ((pos (point))
 	    (inhibit-read-only t))
 	(erase-buffer)
-	(ledger-register-render
-	 buf (apply #'ledger-exec-read buf args))
+	(ledger-register-render buf (apply #'ledger-exec-read buf args))
 	(goto-char pos))
       (set-buffer-modified-p nil)
       (toggle-read-only t)
-- 
cgit v1.2.3