Fix ledger-find-slot so that it doesn't require transaction codes

2 files changed, 60 insertions, 60 deletions

diff --git a/lisp/ldg-regex.el b/lisp/ldg-regex.el
index d1c5a52c..487a2449 100644
--- a/lisp/ldg-regex.el
+++ b/lisp/ldg-regex.el
@@ -325,7 +325,7 @@
   (concat "\\(Y\\s-+\\([0-9]+\\)\\|"  ;; Catches a Y directive
 	  ledger-iso-date-regexp
 	  "\\([ *!]+\\)"  ;; mark
-	  "\\((.*)\\)"  ;; code
+	  "\\((.*)\\)?"  ;; code
 	  "\\(.*\\)"   ;; desc
 	  "\\)"))
 
diff --git a/lisp/ldg-xact.el b/lisp/ldg-xact.el
index bf50dbe2..98a9d731 100644
--- a/lisp/ldg-xact.el
+++ b/lisp/ldg-xact.el
@@ -40,28 +40,28 @@ within the transaction."
   (save-excursion
     (goto-char pos)
     (list (progn
-	    (backward-paragraph)
-	    (if (/= (point) (point-min))
-		(forward-line))
-	    (line-beginning-position))
-	  (progn
-	    (forward-paragraph)
-	    (line-beginning-position)))))
+						(backward-paragraph)
+						(if (/= (point) (point-min))
+								(forward-line))
+						(line-beginning-position))
+					(progn
+						(forward-paragraph)
+						(line-beginning-position)))))
 
 (defun ledger-highlight-xact-under-point ()
   "Move the highlight overlay to the current transaction."
   (if ledger-highlight-xact-under-point
       (let ((exts (ledger-find-xact-extents (point)))
-	    (ovl highlight-overlay))
-	(if (not highlight-overlay)
-	    (setq ovl
-		  (setq highlight-overlay
-			(make-overlay (car exts)
-				      (cadr exts)
-				      (current-buffer) t nil)))
-	    (move-overlay ovl (car exts) (cadr exts)))
-	(overlay-put ovl 'face 'ledger-font-xact-highlight-face)
-	(overlay-put ovl 'priority 100))))
+						(ovl highlight-overlay))
+				(if (not highlight-overlay)
+						(setq ovl
+									(setq highlight-overlay
+												(make-overlay (car exts)
+																			(cadr exts)
+																			(current-buffer) t nil)))
+						(move-overlay ovl (car exts) (cadr exts)))
+				(overlay-put ovl 'face 'ledger-font-xact-highlight-face)
+				(overlay-put ovl 'priority 100))))
 
 (defun ledger-xact-payee ()
   "Return the payee of the transaction containing point or nil."
@@ -71,7 +71,7 @@ within the transaction."
     (let ((context-info (ledger-context-other-line i)))
       (if (eq (ledger-context-line-type context-info) 'xact)
           (ledger-context-field-value context-info 'payee)
-	  nil))))
+					nil))))
 
 (defun ledger-time-less-p (t1 t2)
   "Say whether time value T1 is less than time value T2."
@@ -87,7 +87,7 @@ MOMENT is an encoded date"
      (function
       (lambda (start date mark desc)
        (if (ledger-time-less-p moment date)
-	   (throw 'found t)))))))
+					 (throw 'found t)))))))
 
 (defun ledger-xact-iterate-transactions (callback)
   "Iterate through each transaction call CALLBACK for each."
@@ -96,44 +96,44 @@ MOMENT is an encoded date"
          (current-year (nth 5 (decode-time now))))
     (while (not (eobp))
       (when (looking-at ledger-iterate-regex)
-        (let ((found-y-p (match-string 2)))  
-          (if found-y-p  
+        (let ((found-y-p (match-string 2)))
+          (if found-y-p
               (setq current-year (string-to-number found-y-p)) ;; a Y directive was found
-	      (let ((start (match-beginning 0))
-		    (year (match-string 4))
-		    (month (string-to-number (match-string 5)))
-		    (day (string-to-number (match-string 6)))
-		    (mark (match-string 7))
-		    (code (match-string 8))
-		    (desc (match-string 9)))
-		(if (and year (> (length year) 0))
-		    (setq year (string-to-number year)))
-		(funcall callback start
-			 (encode-time 0 0 0 day month
-				      (or year current-year))
-			 mark desc)))))
+							(let ((start (match-beginning 0))
+										(year (match-string 4))
+										(month (string-to-number (match-string 5)))
+										(day (string-to-number (match-string 6)))
+										(mark (match-string 7))
+										(code (match-string 8))
+										(desc (match-string 9)))
+								(if (and year (> (length year) 0))
+										(setq year (string-to-number year)))
+								(funcall callback start
+												 (encode-time 0 0 0 day month
+																			(or year current-year))
+												 mark desc)))))
       (forward-line))))
 
 (defsubst ledger-goto-line (line-number)
   "Rapidly move point to line LINE-NUMBER."
-  (goto-char (point-min)) 
+  (goto-char (point-min))
   (forward-line (1- line-number)))
 
 
 (defun ledger-copy-transaction-at-point (date)
   "Ask for a new DATE and copy the transaction under point to that date.  Leave point on the first amount."
   (interactive  (list
-		 (read-string "Copy to date: " 
-			      (concat ledger-year "/" ledger-month "/") 'ledger-minibuffer-history)))
+								 (read-string "Copy to date: "
+															(concat ledger-year "/" ledger-month "/") 'ledger-minibuffer-history)))
   (let* ((here (point))
-	 (extents (ledger-find-xact-extents (point)))
-	 (transaction (buffer-substring-no-properties (car extents) (cadr extents)))
-	 encoded-date)
+				 (extents (ledger-find-xact-extents (point)))
+				 (transaction (buffer-substring-no-properties (car extents) (cadr extents)))
+				 encoded-date)
     (if (string-match ledger-iso-date-regexp date)
-	(setq encoded-date
-	      (encode-time 0 0 0 (string-to-number (match-string 4 date))
-			   (string-to-number (match-string 3 date))
-			   (string-to-number (match-string 2 date)))))
+				(setq encoded-date
+							(encode-time 0 0 0 (string-to-number (match-string 4 date))
+													 (string-to-number (match-string 3 date))
+													 (string-to-number (match-string 2 date)))))
     (ledger-xact-find-slot encoded-date)
     (insert transaction "\n")
     (backward-paragraph 2)
@@ -153,7 +153,7 @@ If INSERT-AT-POINT is non-nil insert the transaction
 there, otherwise call `ledger-xact-find-slot' to insert it at the
 correct chronological place in the buffer."
   (interactive (list
-		(read-string "Transaction: " (concat ledger-year "/" ledger-month "/"))))
+								(read-string "Transaction: " (concat ledger-year "/" ledger-month "/"))))
   (let* ((args (with-temp-buffer
                  (insert transaction-text)
                  (eshell-parse-arguments (point-min) (point-max))))
@@ -168,20 +168,20 @@ correct chronological place in the buffer."
                                (string-to-number (match-string 2 date)))))
         (ledger-xact-find-slot date)))
     (if (> (length args) 1)
-	(save-excursion
-	  (insert
-	   (with-temp-buffer
-	     (setq exit-code
-		   (apply #'ledger-exec-ledger ledger-buf (current-buffer) "xact"
-			  (mapcar 'eval args)))
-	     (goto-char (point-min))
-	     (if (looking-at "Error: ")
-		 (error (concat "Error in ledger-add-transaction: " (buffer-string)))
-		 (buffer-string)))
-	   "\n"))
-	(progn
-	  (insert (car args) " \n\n")
-	  (end-of-line -1)))))
+				(save-excursion
+					(insert
+					 (with-temp-buffer
+						 (setq exit-code
+									 (apply #'ledger-exec-ledger ledger-buf (current-buffer) "xact"
+													(mapcar 'eval args)))
+						 (goto-char (point-min))
+						 (if (looking-at "Error: ")
+								 (error (concat "Error in ledger-add-transaction: " (buffer-string)))
+								 (buffer-string)))
+					 "\n"))
+				(progn
+					(insert (car args) " \n\n")
+					(end-of-line -1)))))
 
 
 (provide 'ldg-xact)