Merge pull request #389 from thdox/untabify-emacs-lisp2
[emacs] Untabify emacs lisp
This commit is contained in:
Craig Earls
commit
6b668974a4
19 changed files with 609 additions and 603 deletions
|
|
@ -1,30 +1,36 @@
|
||||||
((nil . ((tab-width . 2)
|
;;; Directory Local Variables
|
||||||
(sentence-end-double-space . t)
|
;;; For more information see (info "(emacs) Directory Variables")
|
||||||
(bug-reference-url-format
|
|
||||||
. "http://bugs.ledger-cli.org/show_bug.cgi?id=%s")))
|
((nil
|
||||||
(c-mode . ((c-file-style . "ledger")
|
(tab-width . 2)
|
||||||
(c-style-alist
|
(sentence-end-double-space . t)
|
||||||
("ledger"
|
(bug-reference-url-format . "http://bugs.ledger-cli.org/show_bug.cgi?id=%s"))
|
||||||
(indent-tabs-mode)
|
(c-mode
|
||||||
(c-basic-offset . 2)
|
(c-file-style . "ledger")
|
||||||
(c-comment-only-line-offset 0 . 0)
|
(c-style-alist
|
||||||
(c-hanging-braces-alist
|
("ledger"
|
||||||
(substatement-open before after)
|
(indent-tabs-mode)
|
||||||
(arglist-cont-nonempty))
|
(c-basic-offset . 2)
|
||||||
(c-offsets-alist
|
(c-comment-only-line-offset 0 . 0)
|
||||||
(statement-block-intro . +)
|
(c-hanging-braces-alist
|
||||||
(knr-argdecl-intro . 5)
|
(substatement-open before after)
|
||||||
(substatement-open . 0)
|
(arglist-cont-nonempty))
|
||||||
(substatement-label . 0)
|
(c-offsets-alist
|
||||||
(label . 0)
|
(statement-block-intro . +)
|
||||||
(case-label . 0)
|
(knr-argdecl-intro . 5)
|
||||||
(statement-case-open . 0)
|
(substatement-open . 0)
|
||||||
(statement-cont . +)
|
(substatement-label . 0)
|
||||||
(arglist-intro . +)
|
(label . 0)
|
||||||
(arglist-close . +)
|
(case-label . 0)
|
||||||
(inline-open . 0)
|
(statement-case-open . 0)
|
||||||
(brace-list-open . 0)
|
(statement-cont . +)
|
||||||
(topmost-intro-cont first c-lineup-topmost-intro-cont
|
(arglist-intro . +)
|
||||||
c-lineup-gnu-DEFUN-intro-cont))
|
(arglist-close . +)
|
||||||
(c-special-indent-hook . c-gnu-impose-minimum)
|
(inline-open . 0)
|
||||||
(c-block-comment-prefix . ""))))))
|
(brace-list-open . 0)
|
||||||
|
(topmost-intro-cont first c-lineup-topmost-intro-cont c-lineup-gnu-DEFUN-intro-cont))
|
||||||
|
(c-special-indent-hook . c-gnu-impose-minimum)
|
||||||
|
(c-block-comment-prefix . ""))))
|
||||||
|
(emacs-lisp-mode
|
||||||
|
(indent-tabs-mode)))
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
; Ledger
|
;; Ledger
|
||||||
|
|
||||||
;; Maybe later add this to the expense repo once it settles
|
;; Maybe later add this to the expense repo once it settles
|
||||||
(add-to-list 'load-path "/home/adamsrl/.emacs.d/addons/ledger")
|
(add-to-list 'load-path "/home/adamsrl/.emacs.d/addons/ledger")
|
||||||
|
|
@ -104,19 +104,19 @@
|
||||||
|
|
||||||
(defun ledger-expense-shortcut ()
|
(defun ledger-expense-shortcut ()
|
||||||
"Updates the ER and Project metadata with the current values of the shortcut variables."
|
"Updates the ER and Project metadata with the current values of the shortcut variables."
|
||||||
(interactive)
|
(interactive)
|
||||||
(when (eq major-mode 'ledger-mode)
|
(when (eq major-mode 'ledger-mode)
|
||||||
(if (or (eql *ledger-expense-shortcut-ER* "")
|
(if (or (eql *ledger-expense-shortcut-ER* "")
|
||||||
(eql *ledger-expense-shortcut-Proj* ""))
|
(eql *ledger-expense-shortcut-Proj* ""))
|
||||||
(message "Run ledger-expense-shortcut-setup first.")
|
(message "Run ledger-expense-shortcut-setup first.")
|
||||||
(save-excursion
|
(save-excursion
|
||||||
(search-forward "; ER:")
|
(search-forward "; ER:")
|
||||||
(kill-line nil)
|
(kill-line nil)
|
||||||
(insert " " *ledger-expense-shortcut-ER*))
|
(insert " " *ledger-expense-shortcut-ER*))
|
||||||
(save-excursion
|
(save-excursion
|
||||||
(search-forward "; PROJECT:")
|
(search-forward "; PROJECT:")
|
||||||
(kill-line nil)
|
(kill-line nil)
|
||||||
(insert " " *ledger-expense-shortcut-Proj*)))))
|
(insert " " *ledger-expense-shortcut-Proj*)))))
|
||||||
|
|
||||||
(defun ledger-expense-split ()
|
(defun ledger-expense-split ()
|
||||||
"Splits the current transaction between internal and projects."
|
"Splits the current transaction between internal and projects."
|
||||||
|
|
@ -158,33 +158,33 @@
|
||||||
|
|
||||||
(defun ledger-expense-personal ()
|
(defun ledger-expense-personal ()
|
||||||
"Makes the expense an personal one, eliminating metadata and receipts."
|
"Makes the expense an personal one, eliminating metadata and receipts."
|
||||||
(interactive)
|
(interactive)
|
||||||
(when (eq major-mode 'ledger-mode) ; I made this local now, should only trigger in ldg-mode
|
(when (eq major-mode 'ledger-mode) ; I made this local now, should only trigger in ldg-mode
|
||||||
(save-excursion
|
(save-excursion
|
||||||
(end-of-line)
|
(end-of-line)
|
||||||
(re-search-backward "^[0-9]\\{4\\}/")
|
(re-search-backward "^[0-9]\\{4\\}/")
|
||||||
(let ((begin (point))
|
(let ((begin (point))
|
||||||
(end (save-excursion (re-search-forward "^$"))))
|
(end (save-excursion (re-search-forward "^$"))))
|
||||||
(when (re-search-forward "^ Dest:Projects" end t)
|
(when (re-search-forward "^ Dest:Projects" end t)
|
||||||
(replace-match " Other:Personal"))
|
(replace-match " Other:Personal"))
|
||||||
(goto-char begin)
|
(goto-char begin)
|
||||||
(save-excursion
|
(save-excursion
|
||||||
(when (re-search-forward "^ +; ER:" end t)
|
(when (re-search-forward "^ +; ER:" end t)
|
||||||
(beginning-of-line)
|
(beginning-of-line)
|
||||||
(kill-line 1)))
|
(kill-line 1)))
|
||||||
(save-excursion
|
(save-excursion
|
||||||
(when (re-search-forward "^ +; PROJECT:" end t)
|
(when (re-search-forward "^ +; PROJECT:" end t)
|
||||||
(beginning-of-line)
|
(beginning-of-line)
|
||||||
(kill-line 1)))
|
(kill-line 1)))
|
||||||
(save-excursion
|
(save-excursion
|
||||||
(when (re-search-forward "^ +; CATEGORY:" end t)
|
(when (re-search-forward "^ +; CATEGORY:" end t)
|
||||||
(beginning-of-line)
|
(beginning-of-line)
|
||||||
(kill-line 1)))
|
(kill-line 1)))
|
||||||
(save-excursion
|
(save-excursion
|
||||||
(when (re-search-forward "^ +; RECEIPT:" end t)
|
(when (re-search-forward "^ +; RECEIPT:" end t)
|
||||||
(beginning-of-line)
|
(beginning-of-line)
|
||||||
(kill-line 1)))
|
(kill-line 1)))
|
||||||
(ledger-toggle-current-entry)))))
|
(ledger-toggle-current-entry)))))
|
||||||
|
|
||||||
(defun ledger-expense-show-receipt ()
|
(defun ledger-expense-show-receipt ()
|
||||||
"Uses the Receipt buffer to show the receipt of the txn we're on."
|
"Uses the Receipt buffer to show the receipt of the txn we're on."
|
||||||
|
|
|
||||||
|
|
@ -202,13 +202,13 @@
|
||||||
(defun ledger-receipt-skip ()
|
(defun ledger-receipt-skip ()
|
||||||
"Move the current image to the Skip directory because its not relevant."
|
"Move the current image to the Skip directory because its not relevant."
|
||||||
|
|
||||||
(rename-file (concat ledger-matching-sourcedir "/"
|
(rename-file (concat ledger-matching-sourcedir "/"
|
||||||
ledger-matching-image-name)
|
ledger-matching-image-name)
|
||||||
(concat ledger-matching-sourcedir "/Skip/"
|
(concat ledger-matching-sourcedir "/Skip/"
|
||||||
ledger-matching-image-name))
|
ledger-matching-image-name))
|
||||||
|
|
||||||
;; Update the receipt screen at the same offset
|
;; Update the receipt screen at the same offset
|
||||||
(ledger-matching-update-current-image))
|
(ledger-matching-update-current-image))
|
||||||
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
;; Items below are speed entry macros, and should eventually migrate to their own file.
|
;; Items below are speed entry macros, and should eventually migrate to their own file.
|
||||||
|
|
@ -242,19 +242,19 @@
|
||||||
|
|
||||||
(defun ledger-expense-shortcut ()
|
(defun ledger-expense-shortcut ()
|
||||||
"Updates the ER and Project metadata with the current values of the shortcut variables."
|
"Updates the ER and Project metadata with the current values of the shortcut variables."
|
||||||
(interactive)
|
(interactive)
|
||||||
(when (eq major-mode 'ledger-mode)
|
(when (eq major-mode 'ledger-mode)
|
||||||
(if (or (eql *ledger-expense-shortcut-ER* "")
|
(if (or (eql *ledger-expense-shortcut-ER* "")
|
||||||
(eql *ledger-expense-shortcut-Proj* ""))
|
(eql *ledger-expense-shortcut-Proj* ""))
|
||||||
(message "Run ledger-expense-shortcut-setup first.")
|
(message "Run ledger-expense-shortcut-setup first.")
|
||||||
(save-excursion
|
(save-excursion
|
||||||
(search-forward "; ER:")
|
(search-forward "; ER:")
|
||||||
(kill-line nil)
|
(kill-line nil)
|
||||||
(insert " " *ledger-expense-shortcut-ER*))
|
(insert " " *ledger-expense-shortcut-ER*))
|
||||||
(save-excursion
|
(save-excursion
|
||||||
(search-forward "; PROJECT:")
|
(search-forward "; PROJECT:")
|
||||||
(kill-line nil)
|
(kill-line nil)
|
||||||
(insert " " *ledger-expense-shortcut-Proj*)))))
|
(insert " " *ledger-expense-shortcut-Proj*)))))
|
||||||
|
|
||||||
(defun ledger-expense-split ()
|
(defun ledger-expense-split ()
|
||||||
"Splits the current transaction between internal and projects."
|
"Splits the current transaction between internal and projects."
|
||||||
|
|
@ -296,33 +296,33 @@
|
||||||
|
|
||||||
(defun ledger-expense-personal ()
|
(defun ledger-expense-personal ()
|
||||||
"Makes the expense an personal one, eliminating metadata and receipts."
|
"Makes the expense an personal one, eliminating metadata and receipts."
|
||||||
(interactive)
|
(interactive)
|
||||||
(when (eq major-mode 'ledger-mode) ; I made this local now, should only trigger in ldg-mode
|
(when (eq major-mode 'ledger-mode) ; I made this local now, should only trigger in ldg-mode
|
||||||
(save-excursion
|
(save-excursion
|
||||||
(end-of-line)
|
(end-of-line)
|
||||||
(re-search-backward "^[0-9]\\{4\\}/")
|
(re-search-backward "^[0-9]\\{4\\}/")
|
||||||
(let ((begin (point))
|
(let ((begin (point))
|
||||||
(end (save-excursion (re-search-forward "^$"))))
|
(end (save-excursion (re-search-forward "^$"))))
|
||||||
(when (re-search-forward "^ Dest:Projects" end t)
|
(when (re-search-forward "^ Dest:Projects" end t)
|
||||||
(replace-match " Other:Personal"))
|
(replace-match " Other:Personal"))
|
||||||
(goto-char begin)
|
(goto-char begin)
|
||||||
(save-excursion
|
(save-excursion
|
||||||
(when (re-search-forward "^ +; ER:" end t)
|
(when (re-search-forward "^ +; ER:" end t)
|
||||||
(beginning-of-line)
|
(beginning-of-line)
|
||||||
(kill-line 1)))
|
(kill-line 1)))
|
||||||
(save-excursion
|
(save-excursion
|
||||||
(when (re-search-forward "^ +; PROJECT:" end t)
|
(when (re-search-forward "^ +; PROJECT:" end t)
|
||||||
(beginning-of-line)
|
(beginning-of-line)
|
||||||
(kill-line 1)))
|
(kill-line 1)))
|
||||||
(save-excursion
|
(save-excursion
|
||||||
(when (re-search-forward "^ +; CATEGORY:" end t)
|
(when (re-search-forward "^ +; CATEGORY:" end t)
|
||||||
(beginning-of-line)
|
(beginning-of-line)
|
||||||
(kill-line 1)))
|
(kill-line 1)))
|
||||||
(save-excursion
|
(save-excursion
|
||||||
(when (re-search-forward "^ +; RECEIPT:" end t)
|
(when (re-search-forward "^ +; RECEIPT:" end t)
|
||||||
(beginning-of-line)
|
(beginning-of-line)
|
||||||
(kill-line 1)))
|
(kill-line 1)))
|
||||||
(ledger-toggle-current-entry)))))
|
(ledger-toggle-current-entry)))))
|
||||||
|
|
||||||
(defun ledger-expense-show-receipt ()
|
(defun ledger-expense-show-receipt ()
|
||||||
"Uses the Receipt buffer to show the receipt of the txn we're on."
|
"Uses the Receipt buffer to show the receipt of the txn we're on."
|
||||||
|
|
|
||||||
|
|
@ -91,8 +91,8 @@ Returns a list with (value commodity)."
|
||||||
(error "Can't add different commodities, %S to %S" c1 c2)))
|
(error "Can't add different commodities, %S to %S" c1 c2)))
|
||||||
|
|
||||||
(defun ledger-strip (str char)
|
(defun ledger-strip (str char)
|
||||||
"Return STR with CHAR removed."
|
"Return STR with CHAR removed."
|
||||||
(replace-regexp-in-string char "" str))
|
(replace-regexp-in-string char "" str))
|
||||||
|
|
||||||
(defun ledger-string-to-number (str &optional decimal-comma)
|
(defun ledger-string-to-number (str &optional decimal-comma)
|
||||||
"improve builtin string-to-number by handling internationalization, and return nil if number can't be parsed"
|
"improve builtin string-to-number by handling internationalization, and return nil if number can't be parsed"
|
||||||
|
|
@ -105,7 +105,7 @@ Returns a list with (value commodity)."
|
||||||
(string-to-number nstr)))
|
(string-to-number nstr)))
|
||||||
|
|
||||||
(defun ledger-number-to-string (n &optional decimal-comma)
|
(defun ledger-number-to-string (n &optional decimal-comma)
|
||||||
"number-to-string that handles comma as decimal."
|
"number-to-string that handles comma as decimal."
|
||||||
(let ((str (number-to-string n)))
|
(let ((str (number-to-string n)))
|
||||||
(when (or decimal-comma
|
(when (or decimal-comma
|
||||||
(assoc "decimal-comma" ledger-environment-alist))
|
(assoc "decimal-comma" ledger-environment-alist))
|
||||||
|
|
@ -124,7 +124,7 @@ longer ones are after the value."
|
||||||
(concat commodity " " str))))
|
(concat commodity " " str))))
|
||||||
|
|
||||||
(defun ledger-read-commodity-string (prompt)
|
(defun ledger-read-commodity-string (prompt)
|
||||||
"Read an amount from mini-buffer using PROMPT."
|
"Read an amount from mini-buffer using PROMPT."
|
||||||
(let ((str (read-from-minibuffer
|
(let ((str (read-from-minibuffer
|
||||||
(concat prompt " (" ledger-reconcile-default-commodity "): ")))
|
(concat prompt " (" ledger-reconcile-default-commodity "): ")))
|
||||||
comm)
|
comm)
|
||||||
|
|
|
||||||
|
|
@ -157,7 +157,7 @@
|
||||||
(ledger-accounts)))))
|
(ledger-accounts)))))
|
||||||
|
|
||||||
(defun ledger-trim-trailing-whitespace (str)
|
(defun ledger-trim-trailing-whitespace (str)
|
||||||
(replace-regexp-in-string "[ \t]*$" "" str))
|
(replace-regexp-in-string "[ \t]*$" "" str))
|
||||||
|
|
||||||
(defun ledger-fully-complete-xact ()
|
(defun ledger-fully-complete-xact ()
|
||||||
"Completes a transaction if there is another matching payee in the buffer.
|
"Completes a transaction if there is another matching payee in the buffer.
|
||||||
|
|
@ -235,7 +235,7 @@ ledger-magic-tab would cycle properly"
|
||||||
pcomplete-seen pcomplete-norm-func
|
pcomplete-seen pcomplete-norm-func
|
||||||
pcomplete-args pcomplete-last pcomplete-index
|
pcomplete-args pcomplete-last pcomplete-index
|
||||||
pcomplete-autolist
|
pcomplete-autolist
|
||||||
(completions (pcomplete-completions))
|
(completions (pcomplete-completions))
|
||||||
(result (pcomplete-do-complete pcomplete-stub completions))
|
(result (pcomplete-do-complete pcomplete-stub completions))
|
||||||
(pcomplete-termination-string ""))
|
(pcomplete-termination-string ""))
|
||||||
(and result
|
(and result
|
||||||
|
|
|
||||||
|
|
@ -53,7 +53,7 @@
|
||||||
(setq buffer-read-only t)))
|
(setq buffer-read-only t)))
|
||||||
|
|
||||||
(defun ledger-exec-success-p (ledger-output-buffer)
|
(defun ledger-exec-success-p (ledger-output-buffer)
|
||||||
"Return t if the ledger output in LEDGER-OUTPUT-BUFFER is successful."
|
"Return t if the ledger output in LEDGER-OUTPUT-BUFFER is successful."
|
||||||
(with-current-buffer ledger-output-buffer
|
(with-current-buffer ledger-output-buffer
|
||||||
(goto-char (point-min))
|
(goto-char (point-min))
|
||||||
(if (and (> (buffer-size) 1) (looking-at (regexp-quote "While")))
|
(if (and (> (buffer-size) 1) (looking-at (regexp-quote "While")))
|
||||||
|
|
|
||||||
|
|
@ -38,45 +38,45 @@
|
||||||
:group 'ledger)
|
:group 'ledger)
|
||||||
|
|
||||||
(defun ledger-fontify-buffer-part (&optional beg end len)
|
(defun ledger-fontify-buffer-part (&optional beg end len)
|
||||||
"Fontify buffer from BEG to END, length LEN."
|
"Fontify buffer from BEG to END, length LEN."
|
||||||
(save-excursion
|
(save-excursion
|
||||||
(unless beg (setq beg (point-min)))
|
(unless beg (setq beg (point-min)))
|
||||||
(unless end (setq end (point-max)))
|
(unless end (setq end (point-max)))
|
||||||
(goto-char beg)
|
(goto-char beg)
|
||||||
(beginning-of-line)
|
(beginning-of-line)
|
||||||
(while (< (point) end)
|
(while (< (point) end)
|
||||||
(cond ((or (looking-at ledger-xact-start-regex)
|
(cond ((or (looking-at ledger-xact-start-regex)
|
||||||
(looking-at ledger-posting-regex))
|
(looking-at ledger-posting-regex))
|
||||||
(ledger-fontify-xact-at (point)))
|
(ledger-fontify-xact-at (point)))
|
||||||
((looking-at ledger-directive-start-regex)
|
((looking-at ledger-directive-start-regex)
|
||||||
(ledger-fontify-directive-at (point))))
|
(ledger-fontify-directive-at (point))))
|
||||||
(ledger-navigate-next-xact-or-directive))))
|
(ledger-navigate-next-xact-or-directive))))
|
||||||
|
|
||||||
(defun ledger-fontify-xact-at (position)
|
(defun ledger-fontify-xact-at (position)
|
||||||
"Fontify the xact at POSITION."
|
"Fontify the xact at POSITION."
|
||||||
(interactive "d")
|
(interactive "d")
|
||||||
(save-excursion
|
(save-excursion
|
||||||
(goto-char position)
|
(goto-char position)
|
||||||
(let ((extents (ledger-navigate-find-element-extents position))
|
(let ((extents (ledger-navigate-find-element-extents position))
|
||||||
(state (ledger-transaction-state)))
|
(state (ledger-transaction-state)))
|
||||||
(if (and ledger-fontify-xact-state-overrides state)
|
(if (and ledger-fontify-xact-state-overrides state)
|
||||||
(cond ((eq state 'cleared)
|
(cond ((eq state 'cleared)
|
||||||
(ledger-fontify-set-face extents 'ledger-font-xact-cleared-face))
|
(ledger-fontify-set-face extents 'ledger-font-xact-cleared-face))
|
||||||
((eq state 'pending)
|
((eq state 'pending)
|
||||||
(ledger-fontify-set-face extents 'ledger-font-xact-pending-face)))
|
(ledger-fontify-set-face extents 'ledger-font-xact-pending-face)))
|
||||||
(ledger-fontify-xact-by-line extents)))))
|
(ledger-fontify-xact-by-line extents)))))
|
||||||
|
|
||||||
(defun ledger-fontify-xact-by-line (extents)
|
(defun ledger-fontify-xact-by-line (extents)
|
||||||
"Do line-by-line detailed fontification of xact in EXTENTS."
|
"Do line-by-line detailed fontification of xact in EXTENTS."
|
||||||
(save-excursion
|
(save-excursion
|
||||||
(ledger-fontify-xact-start (car extents))
|
(ledger-fontify-xact-start (car extents))
|
||||||
(while (< (point) (cadr extents))
|
(while (< (point) (cadr extents))
|
||||||
(if (looking-at "[ \t]+;")
|
(if (looking-at "[ \t]+;")
|
||||||
(ledger-fontify-set-face (list (point) (progn
|
(ledger-fontify-set-face (list (point) (progn
|
||||||
(end-of-line)
|
(end-of-line)
|
||||||
(point))) 'ledger-font-comment-face)
|
(point))) 'ledger-font-comment-face)
|
||||||
(ledger-fontify-posting (point)))
|
(ledger-fontify-posting (point)))
|
||||||
(forward-line))))
|
(forward-line))))
|
||||||
|
|
||||||
(defun ledger-fontify-xact-start (pos)
|
(defun ledger-fontify-xact-start (pos)
|
||||||
"POS should be at the beginning of a line starting an xact.
|
"POS should be at the beginning of a line starting an xact.
|
||||||
|
|
@ -102,97 +102,97 @@ Fontify the first line of an xact"
|
||||||
(forward-line)))
|
(forward-line)))
|
||||||
|
|
||||||
(defun ledger-fontify-posting (pos)
|
(defun ledger-fontify-posting (pos)
|
||||||
"Fontify the posting at POS."
|
"Fontify the posting at POS."
|
||||||
(let* ((state nil)
|
(let* ((state nil)
|
||||||
(end-of-line-comment nil)
|
(end-of-line-comment nil)
|
||||||
(end (progn (end-of-line)
|
(end (progn (end-of-line)
|
||||||
(point)))
|
(point)))
|
||||||
(start (progn (beginning-of-line)
|
(start (progn (beginning-of-line)
|
||||||
(point))))
|
(point))))
|
||||||
|
|
||||||
;; Look for a posting status flag
|
;; Look for a posting status flag
|
||||||
(set-match-data nil 'reseat)
|
(set-match-data nil 'reseat)
|
||||||
(re-search-forward " \\([*!]\\) " end t)
|
(re-search-forward " \\([*!]\\) " end t)
|
||||||
(if (match-string 1)
|
(if (match-string 1)
|
||||||
(setq state (ledger-state-from-string (match-string 1))))
|
(setq state (ledger-state-from-string (match-string 1))))
|
||||||
(beginning-of-line)
|
(beginning-of-line)
|
||||||
(re-search-forward "[[:graph:]]\\([ \t][ \t]\\)" end 'end) ;; find the end of the account, or end of line
|
(re-search-forward "[[:graph:]]\\([ \t][ \t]\\)" end 'end) ;; find the end of the account, or end of line
|
||||||
|
|
||||||
(when (<= (point) end) ;; we are still on the line
|
(when (<= (point) end) ;; we are still on the line
|
||||||
(ledger-fontify-set-face (list start (point))
|
(ledger-fontify-set-face (list start (point))
|
||||||
(cond ((eq state 'cleared)
|
(cond ((eq state 'cleared)
|
||||||
'ledger-font-posting-account-cleared-face)
|
'ledger-font-posting-account-cleared-face)
|
||||||
((eq state 'pending)
|
((eq state 'pending)
|
||||||
'ledger-font-posting-account-pending-face)
|
'ledger-font-posting-account-pending-face)
|
||||||
(t
|
(t
|
||||||
'ledger-font-posting-account-face)))
|
'ledger-font-posting-account-face)))
|
||||||
|
|
||||||
|
|
||||||
(when (< (point) end) ;; there is still more to fontify
|
(when (< (point) end) ;; there is still more to fontify
|
||||||
(setq start (point)) ;; update start of next font region
|
(setq start (point)) ;; update start of next font region
|
||||||
(setq end-of-line-comment (re-search-forward ";" end 'end)) ;; find the end of the line, or start of a comment
|
(setq end-of-line-comment (re-search-forward ";" end 'end)) ;; find the end of the line, or start of a comment
|
||||||
(ledger-fontify-set-face (list start (point) )
|
(ledger-fontify-set-face (list start (point) )
|
||||||
(cond ((eq state 'cleared)
|
(cond ((eq state 'cleared)
|
||||||
'ledger-font-posting-amount-cleared-face)
|
'ledger-font-posting-amount-cleared-face)
|
||||||
((eq state 'pending)
|
((eq state 'pending)
|
||||||
'ledger-font-posting-amount-pending-face)
|
'ledger-font-posting-amount-pending-face)
|
||||||
(t
|
(t
|
||||||
'ledger-font-posting-amount-face)))
|
'ledger-font-posting-amount-face)))
|
||||||
(when end-of-line-comment
|
(when end-of-line-comment
|
||||||
(setq start (point))
|
(setq start (point))
|
||||||
(end-of-line)
|
(end-of-line)
|
||||||
(ledger-fontify-set-face (list (- start 1) (point)) ;; subtract 1 from start because we passed the semi-colon
|
(ledger-fontify-set-face (list (- start 1) (point)) ;; subtract 1 from start because we passed the semi-colon
|
||||||
'ledger-font-comment-face))))))
|
'ledger-font-comment-face))))))
|
||||||
|
|
||||||
(defun ledger-fontify-directive-at (pos)
|
(defun ledger-fontify-directive-at (pos)
|
||||||
"Fontify the directive at POS."
|
"Fontify the directive at POS."
|
||||||
(let ((extents (ledger-navigate-find-element-extents pos))
|
(let ((extents (ledger-navigate-find-element-extents pos))
|
||||||
(face 'ledger-font-default-face))
|
(face 'ledger-font-default-face))
|
||||||
(cond ((looking-at "=")
|
(cond ((looking-at "=")
|
||||||
(setq face 'ledger-font-auto-xact-face))
|
(setq face 'ledger-font-auto-xact-face))
|
||||||
((looking-at "~")
|
((looking-at "~")
|
||||||
(setq face 'ledger-font-periodic-xact-face))
|
(setq face 'ledger-font-periodic-xact-face))
|
||||||
((looking-at "[;#%|\\*]")
|
((looking-at "[;#%|\\*]")
|
||||||
(setq face 'ledger-font-comment-face))
|
(setq face 'ledger-font-comment-face))
|
||||||
((looking-at "\\(year\\)\\|Y")
|
((looking-at "\\(year\\)\\|Y")
|
||||||
(setq face 'ledger-font-year-directive-face))
|
(setq face 'ledger-font-year-directive-face))
|
||||||
((looking-at "account")
|
((looking-at "account")
|
||||||
(setq face 'ledger-font-account-directive-face))
|
(setq face 'ledger-font-account-directive-face))
|
||||||
((looking-at "apply")
|
((looking-at "apply")
|
||||||
(setq face 'ledger-font-apply-directive-face))
|
(setq face 'ledger-font-apply-directive-face))
|
||||||
((looking-at "alias")
|
((looking-at "alias")
|
||||||
(setq face 'ledger-font-alias-directive-face))
|
(setq face 'ledger-font-alias-directive-face))
|
||||||
((looking-at "assert")
|
((looking-at "assert")
|
||||||
(setq face 'ledger-font-assert-directive-face))
|
(setq face 'ledger-font-assert-directive-face))
|
||||||
((looking-at "\\(bucket\\)\\|A")
|
((looking-at "\\(bucket\\)\\|A")
|
||||||
(setq face 'ledger-font-bucket-directive-face))
|
(setq face 'ledger-font-bucket-directive-face))
|
||||||
((looking-at "capture")
|
((looking-at "capture")
|
||||||
(setq face 'ledger-font-capture-directive-face))
|
(setq face 'ledger-font-capture-directive-face))
|
||||||
((looking-at "check")
|
((looking-at "check")
|
||||||
(setq face 'ledger-font-check-directive-face))
|
(setq face 'ledger-font-check-directive-face))
|
||||||
((looking-at "commodity")
|
((looking-at "commodity")
|
||||||
(setq face 'ledger-font-commodity-directive-face))
|
(setq face 'ledger-font-commodity-directive-face))
|
||||||
((looking-at "define")
|
((looking-at "define")
|
||||||
(setq face 'ledger-font-define-directive-face))
|
(setq face 'ledger-font-define-directive-face))
|
||||||
((looking-at "end")
|
((looking-at "end")
|
||||||
(setq face 'ledger-font-end-directive-face))
|
(setq face 'ledger-font-end-directive-face))
|
||||||
((looking-at "expr")
|
((looking-at "expr")
|
||||||
(setq face 'ledger-font-expr-directive-face))
|
(setq face 'ledger-font-expr-directive-face))
|
||||||
((looking-at "fixed")
|
((looking-at "fixed")
|
||||||
(setq face 'ledger-font-fixed-directive-face))
|
(setq face 'ledger-font-fixed-directive-face))
|
||||||
((looking-at "include")
|
((looking-at "include")
|
||||||
(setq face 'ledger-font-include-directive-face))
|
(setq face 'ledger-font-include-directive-face))
|
||||||
((looking-at "payee")
|
((looking-at "payee")
|
||||||
(setq face 'ledger-font-payee-directive-face))
|
(setq face 'ledger-font-payee-directive-face))
|
||||||
((looking-at "P")
|
((looking-at "P")
|
||||||
(setq face 'ledger-font-price-directive-face))
|
(setq face 'ledger-font-price-directive-face))
|
||||||
((looking-at "tag")
|
((looking-at "tag")
|
||||||
(setq face 'ledger-font-tag-directive-face)))
|
(setq face 'ledger-font-tag-directive-face)))
|
||||||
(ledger-fontify-set-face extents face)))
|
(ledger-fontify-set-face extents face)))
|
||||||
|
|
||||||
(defun ledger-fontify-set-face (extents face)
|
(defun ledger-fontify-set-face (extents face)
|
||||||
"Set the text in EXTENTS to FACE."
|
"Set the text in EXTENTS to FACE."
|
||||||
(put-text-property (car extents) (cadr extents) 'face face))
|
(put-text-property (car extents) (cadr extents) 'face face))
|
||||||
|
|
||||||
|
|
||||||
(provide 'ledger-fontify)
|
(provide 'ledger-fontify)
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,7 @@
|
||||||
(defvar ledger-default-date-format "%Y/%m/%d")
|
(defvar ledger-default-date-format "%Y/%m/%d")
|
||||||
|
|
||||||
(defun ledger-init-parse-initialization (buffer)
|
(defun ledger-init-parse-initialization (buffer)
|
||||||
"Parse the .ledgerrc file in BUFFER."
|
"Parse the .ledgerrc file in BUFFER."
|
||||||
(with-current-buffer buffer
|
(with-current-buffer buffer
|
||||||
(let (environment-alist)
|
(let (environment-alist)
|
||||||
(goto-char (point-min))
|
(goto-char (point-min))
|
||||||
|
|
@ -56,7 +56,7 @@
|
||||||
environment-alist)))
|
environment-alist)))
|
||||||
|
|
||||||
(defun ledger-init-load-init-file ()
|
(defun ledger-init-load-init-file ()
|
||||||
"Load and parse the .ledgerrc file."
|
"Load and parse the .ledgerrc file."
|
||||||
(interactive)
|
(interactive)
|
||||||
(let ((init-base-name (file-name-nondirectory ledger-init-file-name)))
|
(let ((init-base-name (file-name-nondirectory ledger-init-file-name)))
|
||||||
(if (get-buffer init-base-name) ;; init file already loaded, parse it and leave it
|
(if (get-buffer init-base-name) ;; init file already loaded, parse it and leave it
|
||||||
|
|
|
||||||
|
|
@ -63,7 +63,7 @@
|
||||||
|
|
||||||
(defun ledger-mode-dump-variable (var)
|
(defun ledger-mode-dump-variable (var)
|
||||||
"Format VAR for dump to buffer."
|
"Format VAR for dump to buffer."
|
||||||
(if var
|
(if var
|
||||||
(insert (format " %s: %S\n" (symbol-name var) (eval var)))))
|
(insert (format " %s: %S\n" (symbol-name var) (eval var)))))
|
||||||
|
|
||||||
(defun ledger-mode-dump-group (group)
|
(defun ledger-mode-dump-group (group)
|
||||||
|
|
@ -78,7 +78,7 @@
|
||||||
|
|
||||||
(defun ledger-mode-dump-configuration ()
|
(defun ledger-mode-dump-configuration ()
|
||||||
"Dump all customizations."
|
"Dump all customizations."
|
||||||
(interactive)
|
(interactive)
|
||||||
(find-file "ledger-mode-dump")
|
(find-file "ledger-mode-dump")
|
||||||
(ledger-mode-dump-group 'ledger))
|
(ledger-mode-dump-group 'ledger))
|
||||||
|
|
||||||
|
|
@ -99,11 +99,11 @@
|
||||||
|
|
||||||
(defun ledger-read-account-with-prompt (prompt)
|
(defun ledger-read-account-with-prompt (prompt)
|
||||||
"Read an account from the minibuffer with PROMPT."
|
"Read an account from the minibuffer with PROMPT."
|
||||||
(let ((context (ledger-context-at-point)))
|
(let ((context (ledger-context-at-point)))
|
||||||
(ledger-read-string-with-default prompt
|
(ledger-read-string-with-default prompt
|
||||||
(if (eq (ledger-context-current-field context) 'account)
|
(if (eq (ledger-context-current-field context) 'account)
|
||||||
(regexp-quote (ledger-context-field-value context 'account))
|
(regexp-quote (ledger-context-field-value context 'account))
|
||||||
nil))))
|
nil))))
|
||||||
|
|
||||||
(defun ledger-read-date (prompt)
|
(defun ledger-read-date (prompt)
|
||||||
"Return user-supplied date after `PROMPT', defaults to today."
|
"Return user-supplied date after `PROMPT', defaults to today."
|
||||||
|
|
@ -222,7 +222,7 @@ With a prefix argument, remove the effective date."
|
||||||
|
|
||||||
(defun ledger-mode-remove-extra-lines ()
|
(defun ledger-mode-remove-extra-lines ()
|
||||||
"Get rid of multiple empty lines."
|
"Get rid of multiple empty lines."
|
||||||
(goto-char (point-min))
|
(goto-char (point-min))
|
||||||
(while (re-search-forward "\n\n\\(\n\\)+" nil t)
|
(while (re-search-forward "\n\n\\(\n\\)+" nil t)
|
||||||
(replace-match "\n\n")))
|
(replace-match "\n\n")))
|
||||||
|
|
||||||
|
|
@ -338,10 +338,10 @@ With a prefix argument, remove the effective date."
|
||||||
'(ledger-font-lock-keywords t t nil nil
|
'(ledger-font-lock-keywords t t nil nil
|
||||||
(font-lock-fontify-region-function . ledger-fontify-buffer-part))))
|
(font-lock-fontify-region-function . ledger-fontify-buffer-part))))
|
||||||
|
|
||||||
(set (make-local-variable 'pcomplete-parse-arguments-function) 'ledger-parse-arguments)
|
(set (make-local-variable 'pcomplete-parse-arguments-function) 'ledger-parse-arguments)
|
||||||
(set (make-local-variable 'pcomplete-command-completion-function) 'ledger-complete-at-point)
|
(set (make-local-variable 'pcomplete-command-completion-function) 'ledger-complete-at-point)
|
||||||
(add-hook 'completion-at-point-functions 'pcomplete-completions-at-point nil t)
|
(add-hook 'completion-at-point-functions 'pcomplete-completions-at-point nil t)
|
||||||
(add-hook 'after-save-hook 'ledger-report-redo)
|
(add-hook 'after-save-hook 'ledger-report-redo)
|
||||||
|
|
||||||
(add-hook 'post-command-hook 'ledger-highlight-xact-under-point nil t)
|
(add-hook 'post-command-hook 'ledger-highlight-xact-under-point nil t)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -39,49 +39,49 @@
|
||||||
(goto-char (point-max))))
|
(goto-char (point-max))))
|
||||||
|
|
||||||
(defun ledger-navigate-start-xact-or-directive-p ()
|
(defun ledger-navigate-start-xact-or-directive-p ()
|
||||||
"Return t if at the beginning of an empty or all-whitespace line."
|
"Return t if at the beginning of an empty or all-whitespace line."
|
||||||
(not (looking-at "[ \t]\\|\\(^$\\)")))
|
(not (looking-at "[ \t]\\|\\(^$\\)")))
|
||||||
|
|
||||||
(defun ledger-navigate-next-xact-or-directive ()
|
(defun ledger-navigate-next-xact-or-directive ()
|
||||||
"Move to the beginning of the next xact or directive."
|
"Move to the beginning of the next xact or directive."
|
||||||
(interactive)
|
(interactive)
|
||||||
(beginning-of-line)
|
(beginning-of-line)
|
||||||
(if (ledger-navigate-start-xact-or-directive-p) ; if we are the start of an xact, move forward to the next xact
|
(if (ledger-navigate-start-xact-or-directive-p) ; if we are the start of an xact, move forward to the next xact
|
||||||
(progn
|
(progn
|
||||||
(forward-line)
|
(forward-line)
|
||||||
(if (not (ledger-navigate-start-xact-or-directive-p)) ; we have moved forward and are not at another xact, recurse forward
|
(if (not (ledger-navigate-start-xact-or-directive-p)) ; we have moved forward and are not at another xact, recurse forward
|
||||||
(ledger-navigate-next-xact-or-directive)))
|
(ledger-navigate-next-xact-or-directive)))
|
||||||
(while (not (or (eobp) ; we didn't start off at the beginning of an xact
|
(while (not (or (eobp) ; we didn't start off at the beginning of an xact
|
||||||
(ledger-navigate-start-xact-or-directive-p)))
|
(ledger-navigate-start-xact-or-directive-p)))
|
||||||
(forward-line))))
|
(forward-line))))
|
||||||
|
|
||||||
(defun ledger-navigate-prev-xact-or-directive ()
|
(defun ledger-navigate-prev-xact-or-directive ()
|
||||||
"Move point to beginning of previous xact."
|
"Move point to beginning of previous xact."
|
||||||
(interactive)
|
(interactive)
|
||||||
(let ((context (car (ledger-context-at-point))))
|
(let ((context (car (ledger-context-at-point))))
|
||||||
(when (equal context 'acct-transaction)
|
(when (equal context 'acct-transaction)
|
||||||
(ledger-navigate-beginning-of-xact))
|
(ledger-navigate-beginning-of-xact))
|
||||||
(beginning-of-line)
|
(beginning-of-line)
|
||||||
(re-search-backward "^[[:graph:]]" nil t)))
|
(re-search-backward "^[[:graph:]]" nil t)))
|
||||||
|
|
||||||
(defun ledger-navigate-beginning-of-xact ()
|
(defun ledger-navigate-beginning-of-xact ()
|
||||||
"Move point to the beginning of the current xact."
|
"Move point to the beginning of the current xact."
|
||||||
(interactive)
|
(interactive)
|
||||||
;; need to start at the beginning of a line incase we are in the first line of an xact already.
|
;; need to start at the beginning of a line incase we are in the first line of an xact already.
|
||||||
(beginning-of-line)
|
(beginning-of-line)
|
||||||
(let ((sreg (concat "^\\(=\\|~\\|" ledger-iso-date-regexp "\\)")))
|
(let ((sreg (concat "^\\(=\\|~\\|" ledger-iso-date-regexp "\\)")))
|
||||||
(unless (looking-at sreg)
|
(unless (looking-at sreg)
|
||||||
(re-search-backward sreg nil t)
|
(re-search-backward sreg nil t)
|
||||||
(beginning-of-line)))
|
(beginning-of-line)))
|
||||||
(point))
|
(point))
|
||||||
|
|
||||||
(defun ledger-navigate-end-of-xact ()
|
(defun ledger-navigate-end-of-xact ()
|
||||||
"Move point to end of xact."
|
"Move point to end of xact."
|
||||||
(interactive)
|
(interactive)
|
||||||
(ledger-navigate-next-xact-or-directive)
|
(ledger-navigate-next-xact-or-directive)
|
||||||
(re-search-backward ".$")
|
(re-search-backward ".$")
|
||||||
(end-of-line)
|
(end-of-line)
|
||||||
(point))
|
(point))
|
||||||
|
|
||||||
(defun ledger-navigate-to-line (line-number)
|
(defun ledger-navigate-to-line (line-number)
|
||||||
"Rapidly move point to line LINE-NUMBER."
|
"Rapidly move point to line LINE-NUMBER."
|
||||||
|
|
@ -95,61 +95,61 @@ Requires empty line separating xacts."
|
||||||
(save-excursion
|
(save-excursion
|
||||||
(goto-char pos)
|
(goto-char pos)
|
||||||
(list (ledger-navigate-beginning-of-xact)
|
(list (ledger-navigate-beginning-of-xact)
|
||||||
(ledger-navigate-end-of-xact))))
|
(ledger-navigate-end-of-xact))))
|
||||||
|
|
||||||
(defun ledger-navigate-find-directive-extents (pos)
|
(defun ledger-navigate-find-directive-extents (pos)
|
||||||
"Return the extents of the directive at POS."
|
"Return the extents of the directive at POS."
|
||||||
(goto-char pos)
|
(goto-char pos)
|
||||||
(let ((begin (progn (beginning-of-line)
|
(let ((begin (progn (beginning-of-line)
|
||||||
(point)))
|
(point)))
|
||||||
(end (progn (end-of-line)
|
(end (progn (end-of-line)
|
||||||
(+ 1 (point)))))
|
(+ 1 (point)))))
|
||||||
;; handle block comments here
|
;; handle block comments here
|
||||||
(beginning-of-line)
|
(beginning-of-line)
|
||||||
(if (looking-at " *;")
|
(if (looking-at " *;")
|
||||||
(progn
|
(progn
|
||||||
(while (and (looking-at " *;")
|
(while (and (looking-at " *;")
|
||||||
(> (point) (point-min)))
|
(> (point) (point-min)))
|
||||||
(forward-line -1))
|
(forward-line -1))
|
||||||
;; We are either at the beginning of the buffer, or we found
|
;; We are either at the beginning of the buffer, or we found
|
||||||
;; a line outside the comment. If we are not at the
|
;; a line outside the comment. If we are not at the
|
||||||
;; beginning of the buffer then we need to move forward a
|
;; beginning of the buffer then we need to move forward a
|
||||||
;; line.
|
;; line.
|
||||||
(if (> (point) (point-min))
|
(if (> (point) (point-min))
|
||||||
(progn (forward-line 1)
|
(progn (forward-line 1)
|
||||||
(beginning-of-line)))
|
(beginning-of-line)))
|
||||||
(setq begin (point))
|
(setq begin (point))
|
||||||
(goto-char pos)
|
(goto-char pos)
|
||||||
(beginning-of-line)
|
(beginning-of-line)
|
||||||
(while (and (looking-at " *;")
|
(while (and (looking-at " *;")
|
||||||
(< (point) (point-max)))
|
(< (point) (point-max)))
|
||||||
(forward-line 1))
|
(forward-line 1))
|
||||||
(setq end (point))))
|
(setq end (point))))
|
||||||
(list begin end)))
|
(list begin end)))
|
||||||
|
|
||||||
(defun ledger-navigate-block-comment (pos)
|
(defun ledger-navigate-block-comment (pos)
|
||||||
"Move past the block comment at POS, and return its extents."
|
"Move past the block comment at POS, and return its extents."
|
||||||
(interactive "d")
|
(interactive "d")
|
||||||
(goto-char pos)
|
(goto-char pos)
|
||||||
(let ((begin (progn (beginning-of-line)
|
(let ((begin (progn (beginning-of-line)
|
||||||
(point)))
|
(point)))
|
||||||
(end (progn (end-of-line)
|
(end (progn (end-of-line)
|
||||||
(point))))
|
(point))))
|
||||||
;; handle block comments here
|
;; handle block comments here
|
||||||
(beginning-of-line)
|
(beginning-of-line)
|
||||||
(if (looking-at " *;")
|
(if (looking-at " *;")
|
||||||
(progn
|
(progn
|
||||||
(while (and (looking-at " *;")
|
(while (and (looking-at " *;")
|
||||||
(> (point) (point-min)))
|
(> (point) (point-min)))
|
||||||
(forward-line -1))
|
(forward-line -1))
|
||||||
(setq begin (point))
|
(setq begin (point))
|
||||||
(goto-char pos)
|
(goto-char pos)
|
||||||
(beginning-of-line)
|
(beginning-of-line)
|
||||||
(while (and (looking-at " *;")
|
(while (and (looking-at " *;")
|
||||||
(< (point) (point-max)))
|
(< (point) (point-max)))
|
||||||
(forward-line 1))
|
(forward-line 1))
|
||||||
(setq end (point))))
|
(setq end (point))))
|
||||||
(list begin end)))
|
(list begin end)))
|
||||||
|
|
||||||
|
|
||||||
(defun ledger-navigate-find-element-extents (pos)
|
(defun ledger-navigate-find-element-extents (pos)
|
||||||
|
|
|
||||||
|
|
@ -118,7 +118,7 @@ currently active."
|
||||||
Argument OVL-BOUNDS contains bounds for the transactions to be left visible."
|
Argument OVL-BOUNDS contains bounds for the transactions to be left visible."
|
||||||
(let* ((beg (caar ovl-bounds))
|
(let* ((beg (caar ovl-bounds))
|
||||||
(end (cadar ovl-bounds)))
|
(end (cadar ovl-bounds)))
|
||||||
(ledger-occur-remove-overlays)
|
(ledger-occur-remove-overlays)
|
||||||
(ledger-occur-make-invisible-overlay (point-min) (1- beg))
|
(ledger-occur-make-invisible-overlay (point-min) (1- beg))
|
||||||
(dolist (visible (cdr ovl-bounds))
|
(dolist (visible (cdr ovl-bounds))
|
||||||
(ledger-occur-make-visible-overlay beg end)
|
(ledger-occur-make-visible-overlay beg end)
|
||||||
|
|
@ -143,25 +143,25 @@ Argument OVL-BOUNDS contains bounds for the transactions to be left visible."
|
||||||
(while (not (eobp))
|
(while (not (eobp))
|
||||||
;; if something found
|
;; if something found
|
||||||
(when (setq endpoint (re-search-forward regex nil 'end))
|
(when (setq endpoint (re-search-forward regex nil 'end))
|
||||||
(setq bounds (ledger-navigate-find-element-extents endpoint))
|
(setq bounds (ledger-navigate-find-element-extents endpoint))
|
||||||
(push bounds lines)
|
(push bounds lines)
|
||||||
;; move to the end of the xact, no need to search inside it more
|
;; move to the end of the xact, no need to search inside it more
|
||||||
(goto-char (cadr bounds))))
|
(goto-char (cadr bounds))))
|
||||||
(nreverse lines))))
|
(nreverse lines))))
|
||||||
|
|
||||||
(defun ledger-occur-compress-matches (buffer-matches)
|
(defun ledger-occur-compress-matches (buffer-matches)
|
||||||
"identify sequential xacts to reduce number of overlays required"
|
"identify sequential xacts to reduce number of overlays required"
|
||||||
(if buffer-matches
|
(if buffer-matches
|
||||||
(let ((points (list))
|
(let ((points (list))
|
||||||
(current-beginning (caar buffer-matches))
|
(current-beginning (caar buffer-matches))
|
||||||
(current-end (cadar buffer-matches)))
|
(current-end (cadar buffer-matches)))
|
||||||
(dolist (match (cdr buffer-matches))
|
(dolist (match (cdr buffer-matches))
|
||||||
(if (< (- (car match) current-end) 2)
|
(if (< (- (car match) current-end) 2)
|
||||||
(setq current-end (cadr match))
|
(setq current-end (cadr match))
|
||||||
(push (list current-beginning current-end) points)
|
(push (list current-beginning current-end) points)
|
||||||
(setq current-beginning (car match))
|
(setq current-beginning (car match))
|
||||||
(setq current-end (cadr match))))
|
(setq current-end (cadr match))))
|
||||||
(nreverse (push (list current-beginning current-end) points)))))
|
(nreverse (push (list current-beginning current-end) points)))))
|
||||||
|
|
||||||
(provide 'ledger-occur)
|
(provide 'ledger-occur)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -95,8 +95,8 @@ at beginning of account"
|
||||||
(current-column))))
|
(current-column))))
|
||||||
|
|
||||||
(defun ledger-post-align-xact (pos)
|
(defun ledger-post-align-xact (pos)
|
||||||
"Align all the posting in the xact at POS."
|
"Align all the posting in the xact at POS."
|
||||||
(interactive "d")
|
(interactive "d")
|
||||||
(let ((bounds (ledger-navigate-find-xact-extents pos)))
|
(let ((bounds (ledger-navigate-find-xact-extents pos)))
|
||||||
(ledger-post-align-postings (car bounds) (cadr bounds))))
|
(ledger-post-align-postings (car bounds) (cadr bounds))))
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -77,7 +77,7 @@ Default is ledger-default-date-format."
|
||||||
:group 'ledger-reconcile)
|
:group 'ledger-reconcile)
|
||||||
|
|
||||||
(defcustom ledger-reconcile-buffer-header "Reconciling account %s\n\n"
|
(defcustom ledger-reconcile-buffer-header "Reconciling account %s\n\n"
|
||||||
"Default header string for the reconcile buffer.
|
"Default header string for the reconcile buffer.
|
||||||
|
|
||||||
If non-nil, the name of the account being reconciled will be substituted
|
If non-nil, the name of the account being reconciled will be substituted
|
||||||
into the '%s'. If nil, no header will be displayed."
|
into the '%s'. If nil, no header will be displayed."
|
||||||
|
|
@ -85,7 +85,7 @@ If non-nil, the name of the account being reconciled will be substituted
|
||||||
:group 'ledger-reconcile)
|
:group 'ledger-reconcile)
|
||||||
|
|
||||||
(defcustom ledger-reconcile-buffer-line-format "%(date)s %-4(code)s %-50(payee)s %-30(account)s %15(amount)s\n"
|
(defcustom ledger-reconcile-buffer-line-format "%(date)s %-4(code)s %-50(payee)s %-30(account)s %15(amount)s\n"
|
||||||
"Format string for the ledger reconcile posting format.
|
"Format string for the ledger reconcile posting format.
|
||||||
Available fields are date, status, code, payee, account,
|
Available fields are date, status, code, payee, account,
|
||||||
amount. The format for each field is %WIDTH(FIELD), WIDTH can be
|
amount. The format for each field is %WIDTH(FIELD), WIDTH can be
|
||||||
preced by a minus sign which mean to left justify and pad the
|
preced by a minus sign which mean to left justify and pad the
|
||||||
|
|
@ -124,12 +124,12 @@ Possible values are '(date)', '(amount)', '(payee)' or '(0)' for no sorting, i.e
|
||||||
"If S is shorter than LEN, pad it with PADDING on the left."
|
"If S is shorter than LEN, pad it with PADDING on the left."
|
||||||
(let ((extra (max 0 (- len (length s)))))
|
(let ((extra (max 0 (- len (length s)))))
|
||||||
(concat (make-string extra (string-to-char padding))
|
(concat (make-string extra (string-to-char padding))
|
||||||
s)))
|
s)))
|
||||||
(defun ledger-reconcile-s-pad-right (len padding s)
|
(defun ledger-reconcile-s-pad-right (len padding s)
|
||||||
"If S is shorter than LEN, pad it with PADDING on the right."
|
"If S is shorter than LEN, pad it with PADDING on the right."
|
||||||
(let ((extra (max 0 (- len (length s)))))
|
(let ((extra (max 0 (- len (length s)))))
|
||||||
(concat s
|
(concat s
|
||||||
(make-string extra (string-to-char padding)))))
|
(make-string extra (string-to-char padding)))))
|
||||||
(defun ledger-reconcile-s-left (len s)
|
(defun ledger-reconcile-s-left (len s)
|
||||||
"Return up to the LEN first chars of S."
|
"Return up to the LEN first chars of S."
|
||||||
(if (> (length s) len)
|
(if (> (length s) len)
|
||||||
|
|
@ -139,7 +139,7 @@ Possible values are '(date)', '(amount)', '(payee)' or '(0)' for no sorting, i.e
|
||||||
"Return up to the LEN last chars of S."
|
"Return up to the LEN last chars of S."
|
||||||
(let ((l (length s)))
|
(let ((l (length s)))
|
||||||
(if (> l len)
|
(if (> l len)
|
||||||
(substring s (- l len) l)
|
(substring s (- l len) l)
|
||||||
s)))
|
s)))
|
||||||
|
|
||||||
(defun ledger-reconcile-truncate-right (str len)
|
(defun ledger-reconcile-truncate-right (str len)
|
||||||
|
|
@ -253,9 +253,9 @@ Return the number of uncleared xacts found."
|
||||||
(with-current-buffer recon-buf
|
(with-current-buffer recon-buf
|
||||||
(ledger-reconcile-refresh)
|
(ledger-reconcile-refresh)
|
||||||
(set-buffer-modified-p nil))
|
(set-buffer-modified-p nil))
|
||||||
(when curbufwin
|
(when curbufwin
|
||||||
(select-window curbufwin)
|
(select-window curbufwin)
|
||||||
(goto-char curpoint)))))
|
(goto-char curpoint)))))
|
||||||
|
|
||||||
(defun ledger-reconcile-add ()
|
(defun ledger-reconcile-add ()
|
||||||
"Use ledger xact to add a new transaction."
|
"Use ledger xact to add a new transaction."
|
||||||
|
|
@ -281,34 +281,34 @@ Return the number of uncleared xacts found."
|
||||||
(defun ledger-reconcile-visit (&optional come-back)
|
(defun ledger-reconcile-visit (&optional come-back)
|
||||||
"Recenter ledger buffer on transaction and COME-BACK if non-nil."
|
"Recenter ledger buffer on transaction and COME-BACK if non-nil."
|
||||||
(interactive)
|
(interactive)
|
||||||
(beginning-of-line)
|
(beginning-of-line)
|
||||||
(let* ((where (get-text-property (1+ (point)) 'where))
|
(let* ((where (get-text-property (1+ (point)) 'where))
|
||||||
(target-buffer (if where
|
(target-buffer (if where
|
||||||
(ledger-reconcile-get-buffer where)
|
(ledger-reconcile-get-buffer where)
|
||||||
nil))
|
nil))
|
||||||
(cur-win (get-buffer-window (get-buffer ledger-recon-buffer-name))))
|
(cur-win (get-buffer-window (get-buffer ledger-recon-buffer-name))))
|
||||||
(when target-buffer
|
(when target-buffer
|
||||||
(switch-to-buffer-other-window target-buffer)
|
(switch-to-buffer-other-window target-buffer)
|
||||||
(ledger-navigate-to-line (cdr where))
|
(ledger-navigate-to-line (cdr where))
|
||||||
(forward-char)
|
(forward-char)
|
||||||
(recenter)
|
(recenter)
|
||||||
(ledger-highlight-xact-under-point)
|
(ledger-highlight-xact-under-point)
|
||||||
(forward-char -1)
|
(forward-char -1)
|
||||||
(when (and come-back cur-win)
|
(when (and come-back cur-win)
|
||||||
(select-window cur-win)
|
(select-window cur-win)
|
||||||
(get-buffer ledger-recon-buffer-name)))))
|
(get-buffer ledger-recon-buffer-name)))))
|
||||||
|
|
||||||
|
|
||||||
(defun ledger-reconcile-save ()
|
(defun ledger-reconcile-save ()
|
||||||
"Save the ledger buffer."
|
"Save the ledger buffer."
|
||||||
(interactive)
|
(interactive)
|
||||||
(let ((cur-buf (current-buffer))
|
(let ((cur-buf (current-buffer))
|
||||||
(cur-point (point)))
|
(cur-point (point)))
|
||||||
(dolist (buf (cons ledger-buf ledger-bufs))
|
(dolist (buf (cons ledger-buf ledger-bufs))
|
||||||
(with-current-buffer buf
|
(with-current-buffer buf
|
||||||
(basic-save-buffer)))
|
(basic-save-buffer)))
|
||||||
(switch-to-buffer-other-window cur-buf)
|
(switch-to-buffer-other-window cur-buf)
|
||||||
(goto-char cur-point)))
|
(goto-char cur-point)))
|
||||||
|
|
||||||
|
|
||||||
(defun ledger-reconcile-finish ()
|
(defun ledger-reconcile-finish ()
|
||||||
|
|
@ -369,55 +369,55 @@ POSTING is used in `ledger-clear-whole-transactions' is nil."
|
||||||
(nth 0 posting))))) ;; return line-no of posting
|
(nth 0 posting))))) ;; return line-no of posting
|
||||||
|
|
||||||
(defun ledger-reconcile-compile-format-string (fstr)
|
(defun ledger-reconcile-compile-format-string (fstr)
|
||||||
"Return a function that implements the format string in FSTR."
|
"Return a function that implements the format string in FSTR."
|
||||||
(let (fields
|
(let (fields
|
||||||
(start 0))
|
(start 0))
|
||||||
(while (string-match "(\\(.*?\\))" fstr start)
|
(while (string-match "(\\(.*?\\))" fstr start)
|
||||||
(setq fields (cons (intern (match-string 1 fstr)) fields))
|
(setq fields (cons (intern (match-string 1 fstr)) fields))
|
||||||
(setq start (match-end 0)))
|
(setq start (match-end 0)))
|
||||||
(setq fields (list* 'format (replace-regexp-in-string "(.*?)" "" fstr) (nreverse fields)))
|
(setq fields (list* 'format (replace-regexp-in-string "(.*?)" "" fstr) (nreverse fields)))
|
||||||
`(lambda (date code status payee account amount)
|
`(lambda (date code status payee account amount)
|
||||||
,fields)))
|
,fields)))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
(defun ledger-reconcile-format-posting (beg where fmt date code status payee account amount)
|
(defun ledger-reconcile-format-posting (beg where fmt date code status payee account amount)
|
||||||
"Format posting for the reconcile buffer."
|
"Format posting for the reconcile buffer."
|
||||||
(insert (funcall fmt date code status payee account amount))
|
(insert (funcall fmt date code status payee account amount))
|
||||||
|
|
||||||
; Set face depending on cleared status
|
; Set face depending on cleared status
|
||||||
(if status
|
(if status
|
||||||
(if (eq status 'pending)
|
(if (eq status 'pending)
|
||||||
(set-text-properties beg (1- (point))
|
(set-text-properties beg (1- (point))
|
||||||
(list 'face 'ledger-font-reconciler-pending-face
|
(list 'face 'ledger-font-reconciler-pending-face
|
||||||
'where where))
|
'where where))
|
||||||
(set-text-properties beg (1- (point))
|
(set-text-properties beg (1- (point))
|
||||||
(list 'face 'ledger-font-reconciler-cleared-face
|
(list 'face 'ledger-font-reconciler-cleared-face
|
||||||
'where where)))
|
'where where)))
|
||||||
(set-text-properties beg (1- (point))
|
(set-text-properties beg (1- (point))
|
||||||
(list 'face 'ledger-font-reconciler-uncleared-face
|
(list 'face 'ledger-font-reconciler-uncleared-face
|
||||||
'where where))))
|
'where where))))
|
||||||
|
|
||||||
(defun ledger-reconcile-format-xact (xact fmt)
|
(defun ledger-reconcile-format-xact (xact fmt)
|
||||||
"Format XACT using FMT."
|
"Format XACT using FMT."
|
||||||
(let ((date-format (or (cdr (assoc "date-format" ledger-environment-alist))
|
(let ((date-format (or (cdr (assoc "date-format" ledger-environment-alist))
|
||||||
ledger-default-date-format)))
|
ledger-default-date-format)))
|
||||||
(dolist (posting (nthcdr 5 xact))
|
(dolist (posting (nthcdr 5 xact))
|
||||||
(let ((beg (point))
|
(let ((beg (point))
|
||||||
(where (ledger-marker-where-xact-is xact posting)))
|
(where (ledger-marker-where-xact-is xact posting)))
|
||||||
(ledger-reconcile-format-posting beg
|
(ledger-reconcile-format-posting beg
|
||||||
where
|
where
|
||||||
fmt
|
fmt
|
||||||
(format-time-string date-format (nth 2 xact)) ; date
|
(format-time-string date-format (nth 2 xact)) ; date
|
||||||
(if (nth 3 xact) (nth 3 xact) "") ; code
|
(if (nth 3 xact) (nth 3 xact) "") ; code
|
||||||
(nth 3 posting) ; status
|
(nth 3 posting) ; status
|
||||||
(ledger-reconcile-truncate-right
|
(ledger-reconcile-truncate-right
|
||||||
(nth 4 xact) ; payee
|
(nth 4 xact) ; payee
|
||||||
ledger-reconcile-buffer-payee-max-chars)
|
ledger-reconcile-buffer-payee-max-chars)
|
||||||
(ledger-reconcile-truncate-left
|
(ledger-reconcile-truncate-left
|
||||||
(nth 1 posting) ; account
|
(nth 1 posting) ; account
|
||||||
ledger-reconcile-buffer-account-max-chars)
|
ledger-reconcile-buffer-account-max-chars)
|
||||||
(nth 2 posting)))))) ; amount
|
(nth 2 posting)))))) ; amount
|
||||||
|
|
||||||
(defun ledger-do-reconcile (&optional sort)
|
(defun ledger-do-reconcile (&optional sort)
|
||||||
"SORT the uncleared transactions in the account and display them in the *Reconcile* buffer.
|
"SORT the uncleared transactions in the account and display them in the *Reconcile* buffer.
|
||||||
|
|
@ -437,10 +437,10 @@ Return a count of the uncleared transactions."
|
||||||
(unless (eobp)
|
(unless (eobp)
|
||||||
(if (looking-at "(")
|
(if (looking-at "(")
|
||||||
(read (current-buffer))))))) ;current-buffer is the *temp* created above
|
(read (current-buffer))))))) ;current-buffer is the *temp* created above
|
||||||
(fmt (ledger-reconcile-compile-format-string ledger-reconcile-buffer-line-format)))
|
(fmt (ledger-reconcile-compile-format-string ledger-reconcile-buffer-line-format)))
|
||||||
(if (and ledger-success (> (length xacts) 0))
|
(if (and ledger-success (> (length xacts) 0))
|
||||||
(progn
|
(progn
|
||||||
(insert (format ledger-reconcile-buffer-header account))
|
(insert (format ledger-reconcile-buffer-header account))
|
||||||
(dolist (xact xacts)
|
(dolist (xact xacts)
|
||||||
(ledger-reconcile-format-xact xact fmt))
|
(ledger-reconcile-format-xact xact fmt))
|
||||||
(goto-char (point-max))
|
(goto-char (point-max))
|
||||||
|
|
@ -493,11 +493,11 @@ moved and recentered. If they aren't strange things happen."
|
||||||
(pop-to-buffer rbuf)))
|
(pop-to-buffer rbuf)))
|
||||||
|
|
||||||
(defun ledger-reconcile-check-valid-account (account)
|
(defun ledger-reconcile-check-valid-account (account)
|
||||||
"Check to see if ACCOUNT exists in the ledger file"
|
"Check to see if ACCOUNT exists in the ledger file"
|
||||||
(if (> (length account) 0)
|
(if (> (length account) 0)
|
||||||
(save-excursion
|
(save-excursion
|
||||||
(goto-char (point-min))
|
(goto-char (point-min))
|
||||||
(search-forward account nil t))))
|
(search-forward account nil t))))
|
||||||
|
|
||||||
(defun ledger-reconcile ()
|
(defun ledger-reconcile ()
|
||||||
"Start reconciling, prompt for account."
|
"Start reconciling, prompt for account."
|
||||||
|
|
@ -506,38 +506,38 @@ moved and recentered. If they aren't strange things happen."
|
||||||
(buf (current-buffer))
|
(buf (current-buffer))
|
||||||
(rbuf (get-buffer ledger-recon-buffer-name)))
|
(rbuf (get-buffer ledger-recon-buffer-name)))
|
||||||
|
|
||||||
(when (ledger-reconcile-check-valid-account account)
|
(when (ledger-reconcile-check-valid-account account)
|
||||||
(add-hook 'after-save-hook 'ledger-reconcile-refresh-after-save nil t)
|
(add-hook 'after-save-hook 'ledger-reconcile-refresh-after-save nil t)
|
||||||
|
|
||||||
(if rbuf ;; *Reconcile* already exists
|
(if rbuf ;; *Reconcile* already exists
|
||||||
(with-current-buffer rbuf
|
(with-current-buffer rbuf
|
||||||
(set 'ledger-acct account) ;; already buffer local
|
(set 'ledger-acct account) ;; already buffer local
|
||||||
(when (not (eq buf rbuf))
|
(when (not (eq buf rbuf))
|
||||||
;; called from some other ledger-mode buffer
|
;; called from some other ledger-mode buffer
|
||||||
(ledger-reconcile-quit-cleanup)
|
(ledger-reconcile-quit-cleanup)
|
||||||
(setq ledger-buf buf)) ;; should already be buffer-local
|
(setq ledger-buf buf)) ;; should already be buffer-local
|
||||||
|
|
||||||
(unless (get-buffer-window rbuf)
|
(unless (get-buffer-window rbuf)
|
||||||
(ledger-reconcile-open-windows buf rbuf)))
|
(ledger-reconcile-open-windows buf rbuf)))
|
||||||
|
|
||||||
;; no recon-buffer, starting from scratch.
|
;; no recon-buffer, starting from scratch.
|
||||||
|
|
||||||
(with-current-buffer (setq rbuf
|
(with-current-buffer (setq rbuf
|
||||||
(get-buffer-create ledger-recon-buffer-name))
|
(get-buffer-create ledger-recon-buffer-name))
|
||||||
(ledger-reconcile-open-windows buf rbuf)
|
(ledger-reconcile-open-windows buf rbuf)
|
||||||
(ledger-reconcile-mode)
|
(ledger-reconcile-mode)
|
||||||
(make-local-variable 'ledger-target)
|
(make-local-variable 'ledger-target)
|
||||||
(set (make-local-variable 'ledger-buf) buf)
|
(set (make-local-variable 'ledger-buf) buf)
|
||||||
(set (make-local-variable 'ledger-acct) account)))
|
(set (make-local-variable 'ledger-acct) account)))
|
||||||
|
|
||||||
;; Narrow the ledger buffer
|
;; Narrow the ledger buffer
|
||||||
(with-current-buffer rbuf
|
(with-current-buffer rbuf
|
||||||
(save-excursion
|
(save-excursion
|
||||||
(if ledger-narrow-on-reconcile
|
(if ledger-narrow-on-reconcile
|
||||||
(ledger-occur account)))
|
(ledger-occur account)))
|
||||||
(if (> (ledger-reconcile-refresh) 0)
|
(if (> (ledger-reconcile-refresh) 0)
|
||||||
(ledger-reconcile-change-target))
|
(ledger-reconcile-change-target))
|
||||||
(ledger-display-balance)))))
|
(ledger-display-balance)))))
|
||||||
|
|
||||||
(defvar ledger-reconcile-mode-abbrev-table)
|
(defvar ledger-reconcile-mode-abbrev-table)
|
||||||
|
|
||||||
|
|
@ -548,7 +548,7 @@ moved and recentered. If they aren't strange things happen."
|
||||||
|
|
||||||
(defmacro ledger-reconcile-change-sort-key-and-refresh (sort-by)
|
(defmacro ledger-reconcile-change-sort-key-and-refresh (sort-by)
|
||||||
"Set the sort-key to SORT-BY."
|
"Set the sort-key to SORT-BY."
|
||||||
`(lambda ()
|
`(lambda ()
|
||||||
(interactive)
|
(interactive)
|
||||||
|
|
||||||
(setq ledger-reconcile-sort-key ,sort-by)
|
(setq ledger-reconcile-sort-key ,sort-by)
|
||||||
|
|
|
||||||
|
|
@ -108,8 +108,8 @@
|
||||||
defs
|
defs
|
||||||
(list
|
(list
|
||||||
`(defmacro
|
`(defmacro
|
||||||
,(intern (concat "ledger-regex-" (symbol-name name)))
|
,(intern (concat "ledger-regex-" (symbol-name name)))
|
||||||
(&optional string)
|
(&optional string)
|
||||||
,(format "Return the match string for the %s" name)
|
,(format "Return the match string for the %s" name)
|
||||||
(match-string
|
(match-string
|
||||||
,(intern (concat "ledger-regex-" (symbol-name name)
|
,(intern (concat "ledger-regex-" (symbol-name name)
|
||||||
|
|
@ -153,9 +153,9 @@
|
||||||
defs
|
defs
|
||||||
(list
|
(list
|
||||||
`(defmacro
|
`(defmacro
|
||||||
,(intern (concat "ledger-regex-" (symbol-name name)
|
,(intern (concat "ledger-regex-" (symbol-name name)
|
||||||
"-" (symbol-name var)))
|
"-" (symbol-name var)))
|
||||||
(&optional string)
|
(&optional string)
|
||||||
,(format "Return the sub-group match for the %s %s."
|
,(format "Return the sub-group match for the %s %s."
|
||||||
name var)
|
name var)
|
||||||
(match-string
|
(match-string
|
||||||
|
|
@ -333,8 +333,8 @@
|
||||||
"\\)"))
|
"\\)"))
|
||||||
|
|
||||||
(defconst ledger-xact-start-regex
|
(defconst ledger-xact-start-regex
|
||||||
(concat "^" ledger-iso-date-regexp ;; subexp 1
|
(concat "^" ledger-iso-date-regexp ;; subexp 1
|
||||||
"\\(=" ledger-iso-date-regexp "\\)?"
|
"\\(=" ledger-iso-date-regexp "\\)?"
|
||||||
))
|
))
|
||||||
|
|
||||||
(defconst ledger-xact-after-date-regex
|
(defconst ledger-xact-after-date-regex
|
||||||
|
|
@ -345,17 +345,17 @@
|
||||||
))
|
))
|
||||||
|
|
||||||
(defconst ledger-posting-regex
|
(defconst ledger-posting-regex
|
||||||
(concat "^[ \t]+ ?" ;; initial white space
|
(concat "^[ \t]+ ?" ;; initial white space
|
||||||
"\\([*!]\\)? ?" ;; state, subexpr 1
|
"\\([*!]\\)? ?" ;; state, subexpr 1
|
||||||
"\\([[:print:]]+\\([ \t][ \t]\\)\\)" ;; account, subexpr 2
|
"\\([[:print:]]+\\([ \t][ \t]\\)\\)" ;; account, subexpr 2
|
||||||
"\\([^;\n]*\\)" ;; amount, subexpr 4
|
"\\([^;\n]*\\)" ;; amount, subexpr 4
|
||||||
"\\(.*\\)" ;; comment, subexpr 5
|
"\\(.*\\)" ;; comment, subexpr 5
|
||||||
))
|
))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
(defconst ledger-directive-start-regex
|
(defconst ledger-directive-start-regex
|
||||||
"[=~;#%|\\*[A-Za-z]")
|
"[=~;#%|\\*[A-Za-z]")
|
||||||
|
|
||||||
|
|
||||||
(provide 'ledger-regex)
|
(provide 'ledger-regex)
|
||||||
|
|
|
||||||
|
|
@ -57,7 +57,7 @@ specifier."
|
||||||
'(("ledger-file" . ledger-report-ledger-file-format-specifier)
|
'(("ledger-file" . ledger-report-ledger-file-format-specifier)
|
||||||
("payee" . ledger-report-payee-format-specifier)
|
("payee" . ledger-report-payee-format-specifier)
|
||||||
("account" . ledger-report-account-format-specifier)
|
("account" . ledger-report-account-format-specifier)
|
||||||
("tagname" . ledger-report-tagname-format-specifier)
|
("tagname" . ledger-report-tagname-format-specifier)
|
||||||
("tagvalue" . ledger-report-tagvalue-format-specifier))
|
("tagvalue" . ledger-report-tagvalue-format-specifier))
|
||||||
"An alist mapping ledger report format specifiers to implementing functions.
|
"An alist mapping ledger report format specifiers to implementing functions.
|
||||||
|
|
||||||
|
|
@ -67,14 +67,14 @@ text that should replace the format specifier."
|
||||||
:group 'ledger-report)
|
:group 'ledger-report)
|
||||||
|
|
||||||
(defcustom ledger-report-auto-refresh t
|
(defcustom ledger-report-auto-refresh t
|
||||||
"If t then automatically rerun the report when the ledger buffer is saved."
|
"If t then automatically rerun the report when the ledger buffer is saved."
|
||||||
:type 'boolean
|
:type 'boolean
|
||||||
:group 'ledger-report)
|
:group 'ledger-report)
|
||||||
|
|
||||||
(defcustom ledger-report-auto-refresh-sticky-cursor nil
|
(defcustom ledger-report-auto-refresh-sticky-cursor nil
|
||||||
"If t then try to place cursor at same relative position as it was before auto-refresh."
|
"If t then try to place cursor at same relative position as it was before auto-refresh."
|
||||||
:type 'boolean
|
:type 'boolean
|
||||||
:group 'ledger-report)
|
:group 'ledger-report)
|
||||||
|
|
||||||
(defvar ledger-report-buffer-name "*Ledger Report*")
|
(defvar ledger-report-buffer-name "*Ledger Report*")
|
||||||
|
|
||||||
|
|
@ -91,10 +91,10 @@ text that should replace the format specifier."
|
||||||
(defvar ledger-report-cursor-line-number nil)
|
(defvar ledger-report-cursor-line-number nil)
|
||||||
|
|
||||||
(defun ledger-report-reverse-report ()
|
(defun ledger-report-reverse-report ()
|
||||||
"Reverse the order of the report."
|
"Reverse the order of the report."
|
||||||
(interactive)
|
(interactive)
|
||||||
(ledger-report-reverse-lines)
|
(ledger-report-reverse-lines)
|
||||||
(setq ledger-report-is-reversed (not ledger-report-is-reversed)))
|
(setq ledger-report-is-reversed (not ledger-report-is-reversed)))
|
||||||
|
|
||||||
(defun ledger-report-reverse-lines ()
|
(defun ledger-report-reverse-lines ()
|
||||||
(goto-char (point-min))
|
(goto-char (point-min))
|
||||||
|
|
@ -203,7 +203,7 @@ used to generate the buffer, navigating the buffer, etc."
|
||||||
(set (make-local-variable 'ledger-buf) buf)
|
(set (make-local-variable 'ledger-buf) buf)
|
||||||
(set (make-local-variable 'ledger-report-name) report-name)
|
(set (make-local-variable 'ledger-report-name) report-name)
|
||||||
(set (make-local-variable 'ledger-original-window-cfg) wcfg)
|
(set (make-local-variable 'ledger-original-window-cfg) wcfg)
|
||||||
(set (make-local-variable 'ledger-report-is-reversed) nil)
|
(set (make-local-variable 'ledger-report-is-reversed) nil)
|
||||||
(ledger-do-report (ledger-report-cmd report-name edit))
|
(ledger-do-report (ledger-report-cmd report-name edit))
|
||||||
(shrink-window-if-larger-than-buffer)
|
(shrink-window-if-larger-than-buffer)
|
||||||
(set-buffer-modified-p nil)
|
(set-buffer-modified-p nil)
|
||||||
|
|
@ -387,30 +387,30 @@ Optional EDIT the command."
|
||||||
(defun ledger-report-redo ()
|
(defun ledger-report-redo ()
|
||||||
"Redo the report in the current ledger report buffer."
|
"Redo the report in the current ledger report buffer."
|
||||||
(interactive)
|
(interactive)
|
||||||
(let ((cur-buf (current-buffer)))
|
(let ((cur-buf (current-buffer)))
|
||||||
(if (and ledger-report-auto-refresh
|
(if (and ledger-report-auto-refresh
|
||||||
(or (string= (format-mode-line 'mode-name) "Ledger")
|
(or (string= (format-mode-line 'mode-name) "Ledger")
|
||||||
(string= (format-mode-line 'mode-name) "Ledger-Report"))
|
(string= (format-mode-line 'mode-name) "Ledger-Report"))
|
||||||
(get-buffer ledger-report-buffer-name))
|
(get-buffer ledger-report-buffer-name))
|
||||||
(progn
|
(progn
|
||||||
|
|
||||||
(pop-to-buffer (get-buffer ledger-report-buffer-name))
|
(pop-to-buffer (get-buffer ledger-report-buffer-name))
|
||||||
(shrink-window-if-larger-than-buffer)
|
(shrink-window-if-larger-than-buffer)
|
||||||
(setq buffer-read-only nil)
|
(setq buffer-read-only nil)
|
||||||
(setq ledger-report-cursor-line-number (line-number-at-pos))
|
(setq ledger-report-cursor-line-number (line-number-at-pos))
|
||||||
(erase-buffer)
|
(erase-buffer)
|
||||||
(ledger-do-report ledger-report-cmd)
|
(ledger-do-report ledger-report-cmd)
|
||||||
(setq buffer-read-only nil)
|
(setq buffer-read-only nil)
|
||||||
(if ledger-report-is-reversed (ledger-report-reverse-lines))
|
(if ledger-report-is-reversed (ledger-report-reverse-lines))
|
||||||
(if ledger-report-auto-refresh-sticky-cursor (forward-line (- ledger-report-cursor-line-number 5)))
|
(if ledger-report-auto-refresh-sticky-cursor (forward-line (- ledger-report-cursor-line-number 5)))
|
||||||
(pop-to-buffer cur-buf)))))
|
(pop-to-buffer cur-buf)))))
|
||||||
|
|
||||||
(defun ledger-report-quit ()
|
(defun ledger-report-quit ()
|
||||||
"Quit the ledger report buffer."
|
"Quit the ledger report buffer."
|
||||||
(interactive)
|
(interactive)
|
||||||
(ledger-report-goto)
|
(ledger-report-goto)
|
||||||
(set-window-configuration ledger-original-window-cfg)
|
(set-window-configuration ledger-original-window-cfg)
|
||||||
(kill-buffer (get-buffer ledger-report-buffer-name)))
|
(kill-buffer (get-buffer ledger-report-buffer-name)))
|
||||||
|
|
||||||
(defun ledger-report-edit-reports ()
|
(defun ledger-report-edit-reports ()
|
||||||
"Edit the defined ledger reports."
|
"Edit the defined ledger reports."
|
||||||
|
|
@ -418,10 +418,10 @@ Optional EDIT the command."
|
||||||
(customize-variable 'ledger-reports))
|
(customize-variable 'ledger-reports))
|
||||||
|
|
||||||
(defun ledger-report-edit-report ()
|
(defun ledger-report-edit-report ()
|
||||||
(interactive)
|
(interactive)
|
||||||
"Edit the current report command in the mini buffer and re-run the report"
|
"Edit the current report command in the mini buffer and re-run the report"
|
||||||
(setq ledger-report-cmd (ledger-report-read-command ledger-report-cmd))
|
(setq ledger-report-cmd (ledger-report-read-command ledger-report-cmd))
|
||||||
(ledger-report-redo))
|
(ledger-report-redo))
|
||||||
|
|
||||||
(defun ledger-report-read-new-name ()
|
(defun ledger-report-read-new-name ()
|
||||||
"Read the name for a new report from the minibuffer."
|
"Read the name for a new report from the minibuffer."
|
||||||
|
|
|
||||||
|
|
@ -60,21 +60,21 @@
|
||||||
:group 'ledger-schedule)
|
:group 'ledger-schedule)
|
||||||
|
|
||||||
(defcustom ledger-schedule-week-days '(("Mo" 1)
|
(defcustom ledger-schedule-week-days '(("Mo" 1)
|
||||||
("Tu" 2)
|
("Tu" 2)
|
||||||
("We" 3)
|
("We" 3)
|
||||||
("Th" 4)
|
("Th" 4)
|
||||||
("Fr" 5)
|
("Fr" 5)
|
||||||
("Sa" 6)
|
("Sa" 6)
|
||||||
("Su" 7))
|
("Su" 7))
|
||||||
"List of weekday abbreviations. There must be exactly seven
|
"List of weekday abbreviations. There must be exactly seven
|
||||||
entries each with a two character abbreviation for a day and the
|
entries each with a two character abbreviation for a day and the
|
||||||
number of that day in the week. "
|
number of that day in the week. "
|
||||||
:type '(alist :value-type (group integer))
|
:type '(alist :value-type (group integer))
|
||||||
:group 'ledger-schedule)
|
:group 'ledger-schedule)
|
||||||
|
|
||||||
(defsubst between (val low high)
|
(defsubst between (val low high)
|
||||||
"Return TRUE if VAL > LOW and < HIGH."
|
"Return TRUE if VAL > LOW and < HIGH."
|
||||||
(and (>= val low) (<= val high)))
|
(and (>= val low) (<= val high)))
|
||||||
|
|
||||||
(defun ledger-schedule-days-in-month (month year)
|
(defun ledger-schedule-days-in-month (month year)
|
||||||
"Return number of days in the MONTH, MONTH is from 1 to 12.
|
"Return number of days in the MONTH, MONTH is from 1 to 12.
|
||||||
|
|
@ -86,8 +86,8 @@ If YEAR is nil, assume it is not a leap year"
|
||||||
(error "Month out of range, MONTH=%S" month)))
|
(error "Month out of range, MONTH=%S" month)))
|
||||||
|
|
||||||
(defun ledger-schedule-encode-day-of-week (day-string)
|
(defun ledger-schedule-encode-day-of-week (day-string)
|
||||||
"Return the numerical day of week corresponding to DAY-STRING."
|
"Return the numerical day of week corresponding to DAY-STRING."
|
||||||
(cadr (assoc day-string ledger-schedule-week-days)))
|
(cadr (assoc day-string ledger-schedule-week-days)))
|
||||||
|
|
||||||
;; Macros to handle date expressions
|
;; Macros to handle date expressions
|
||||||
|
|
||||||
|
|
@ -173,10 +173,10 @@ the transaction should be logged for that day."
|
||||||
xact-list)))
|
xact-list)))
|
||||||
|
|
||||||
(defun ledger-schedule-read-descriptor-tree (descriptor-string)
|
(defun ledger-schedule-read-descriptor-tree (descriptor-string)
|
||||||
"Read DESCRIPTOR-STRING and return a form that evaluates dates."
|
"Read DESCRIPTOR-STRING and return a form that evaluates dates."
|
||||||
(ledger-schedule-transform-auto-tree
|
(ledger-schedule-transform-auto-tree
|
||||||
(split-string
|
(split-string
|
||||||
(substring descriptor-string 1 (string-match "]" descriptor-string)) " ")))
|
(substring descriptor-string 1 (string-match "]" descriptor-string)) " ")))
|
||||||
|
|
||||||
(defun ledger-schedule-transform-auto-tree (descriptor-string-list)
|
(defun ledger-schedule-transform-auto-tree (descriptor-string-list)
|
||||||
"Take DESCRIPTOR-STRING-LIST, and return a string with a lambda function of date."
|
"Take DESCRIPTOR-STRING-LIST, and return a string with a lambda function of date."
|
||||||
|
|
@ -202,84 +202,84 @@ the transaction should be logged for that day."
|
||||||
(defun ledger-schedule-compile-constraints (descriptor-string)
|
(defun ledger-schedule-compile-constraints (descriptor-string)
|
||||||
"Return a list with the year, month and day fields split."
|
"Return a list with the year, month and day fields split."
|
||||||
(let ((fields (split-string descriptor-string "[/\\-]" t)))
|
(let ((fields (split-string descriptor-string "[/\\-]" t)))
|
||||||
(if (string-match "[A-Za-z]" descriptor-string)
|
(if (string-match "[A-Za-z]" descriptor-string)
|
||||||
(ledger-schedule-constrain-day (nth 0 fields) (nth 1 fields) (nth 2 fields))
|
(ledger-schedule-constrain-day (nth 0 fields) (nth 1 fields) (nth 2 fields))
|
||||||
(list 'and
|
(list 'and
|
||||||
(ledger-schedule-constrain-day (nth 0 fields) (nth 1 fields) (nth 2 fields))
|
(ledger-schedule-constrain-day (nth 0 fields) (nth 1 fields) (nth 2 fields))
|
||||||
(ledger-schedule-constrain-year (nth 0 fields) (nth 1 fields) (nth 2 fields))
|
(ledger-schedule-constrain-year (nth 0 fields) (nth 1 fields) (nth 2 fields))
|
||||||
(ledger-schedule-constrain-month (nth 0 fields) (nth 1 fields) (nth 2 fields))))))
|
(ledger-schedule-constrain-month (nth 0 fields) (nth 1 fields) (nth 2 fields))))))
|
||||||
|
|
||||||
(defun ledger-schedule-constrain-year (year-desc month-desc day-desc)
|
(defun ledger-schedule-constrain-year (year-desc month-desc day-desc)
|
||||||
"Return a form that constrains the year.
|
"Return a form that constrains the year.
|
||||||
|
|
||||||
YEAR-DESC, MONT-DESC, and DAY-DESC are the string portions of the
|
YEAR-DESC, MONT-DESC, and DAY-DESC are the string portions of the
|
||||||
date descriptor."
|
date descriptor."
|
||||||
(cond ((string= year-desc "*") t)
|
(cond ((string= year-desc "*") t)
|
||||||
((/= 0 (string-to-number year-desc))
|
((/= 0 (string-to-number year-desc))
|
||||||
`(memq (nth 5 (decode-time date)) ',(mapcar 'string-to-number (split-string year-desc ","))))
|
`(memq (nth 5 (decode-time date)) ',(mapcar 'string-to-number (split-string year-desc ","))))
|
||||||
(t
|
(t
|
||||||
(error "Improperly specified year constraint: %s %s %s" year-desc month-desc day-desc))))
|
(error "Improperly specified year constraint: %s %s %s" year-desc month-desc day-desc))))
|
||||||
|
|
||||||
(defun ledger-schedule-constrain-month (year-desc month-desc day-desc)
|
(defun ledger-schedule-constrain-month (year-desc month-desc day-desc)
|
||||||
"Return a form that constrains the month.
|
"Return a form that constrains the month.
|
||||||
|
|
||||||
YEAR-DESC, MONT-DESC, and DAY-DESC are the string portions of the
|
YEAR-DESC, MONT-DESC, and DAY-DESC are the string portions of the
|
||||||
date descriptor."
|
date descriptor."
|
||||||
(cond ((string= month-desc "*")
|
(cond ((string= month-desc "*")
|
||||||
t) ;; always match
|
t) ;; always match
|
||||||
((string= month-desc "E") ;; Even
|
((string= month-desc "E") ;; Even
|
||||||
`(evenp (nth 4 (decode-time date))))
|
`(evenp (nth 4 (decode-time date))))
|
||||||
((string= month-desc "O") ;; Odd
|
((string= month-desc "O") ;; Odd
|
||||||
`(oddp (nth 4 (decode-time date))))
|
`(oddp (nth 4 (decode-time date))))
|
||||||
((/= 0 (string-to-number month-desc)) ;; Starts with number
|
((/= 0 (string-to-number month-desc)) ;; Starts with number
|
||||||
`(memq (nth 4 (decode-time date)) ',(mapcar 'string-to-number (split-string month-desc ","))))
|
`(memq (nth 4 (decode-time date)) ',(mapcar 'string-to-number (split-string month-desc ","))))
|
||||||
(t
|
(t
|
||||||
(error "Improperly specified month constraint: %s %s %s" year-desc month-desc day-desc))))
|
(error "Improperly specified month constraint: %s %s %s" year-desc month-desc day-desc))))
|
||||||
|
|
||||||
(defun ledger-schedule-constrain-day (year-desc month-desc day-desc)
|
(defun ledger-schedule-constrain-day (year-desc month-desc day-desc)
|
||||||
"Return a form that constrains the day.
|
"Return a form that constrains the day.
|
||||||
|
|
||||||
YEAR-DESC, MONT-DESC, and DAY-DESC are the string portions of the
|
YEAR-DESC, MONT-DESC, and DAY-DESC are the string portions of the
|
||||||
date descriptor."
|
date descriptor."
|
||||||
(cond ((string= day-desc "*")
|
(cond ((string= day-desc "*")
|
||||||
t)
|
t)
|
||||||
((string-match "[A-Za-z]" day-desc) ;; There is something other than digits and commas
|
((string-match "[A-Za-z]" day-desc) ;; There is something other than digits and commas
|
||||||
(ledger-schedule-parse-complex-date year-desc month-desc day-desc))
|
(ledger-schedule-parse-complex-date year-desc month-desc day-desc))
|
||||||
((/= 0 (string-to-number day-desc))
|
((/= 0 (string-to-number day-desc))
|
||||||
`(memq (nth 3 (decode-time date)) ',(mapcar 'string-to-number (split-string day-desc ","))))
|
`(memq (nth 3 (decode-time date)) ',(mapcar 'string-to-number (split-string day-desc ","))))
|
||||||
(t
|
(t
|
||||||
(error "Improperly specified day constraint: %s %s %s" year-desc month-desc day-desc))))
|
(error "Improperly specified day constraint: %s %s %s" year-desc month-desc day-desc))))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
(defun ledger-schedule-parse-complex-date (year-desc month-desc day-desc)
|
(defun ledger-schedule-parse-complex-date (year-desc month-desc day-desc)
|
||||||
"Parse day descriptors that have repeats."
|
"Parse day descriptors that have repeats."
|
||||||
(let ((years (mapcar 'string-to-number (split-string year-desc ",")))
|
(let ((years (mapcar 'string-to-number (split-string year-desc ",")))
|
||||||
(months (mapcar 'string-to-number (split-string month-desc ",")))
|
(months (mapcar 'string-to-number (split-string month-desc ",")))
|
||||||
(day-parts (split-string day-desc "+"))
|
(day-parts (split-string day-desc "+"))
|
||||||
(every-nth (string-match "+" day-desc)))
|
(every-nth (string-match "+" day-desc)))
|
||||||
(if every-nth
|
(if every-nth
|
||||||
(let ((base-day (string-to-number (car day-parts)))
|
(let ((base-day (string-to-number (car day-parts)))
|
||||||
(increment (string-to-number (substring (cadr day-parts) 0
|
(increment (string-to-number (substring (cadr day-parts) 0
|
||||||
(string-match "[A-Za-z]" (cadr day-parts)))))
|
(string-match "[A-Za-z]" (cadr day-parts)))))
|
||||||
(day-of-week (ledger-schedule-encode-day-of-week
|
(day-of-week (ledger-schedule-encode-day-of-week
|
||||||
(substring (cadr day-parts) (string-match "[A-Za-z]" (cadr day-parts))))))
|
(substring (cadr day-parts) (string-match "[A-Za-z]" (cadr day-parts))))))
|
||||||
(ledger-schedule-constrain-every-count-day day-of-week increment (encode-time 0 0 0 base-day (car months) (car years))))
|
(ledger-schedule-constrain-every-count-day day-of-week increment (encode-time 0 0 0 base-day (car months) (car years))))
|
||||||
(let ((count (string-to-number (substring (car day-parts) 0 1)))
|
(let ((count (string-to-number (substring (car day-parts) 0 1)))
|
||||||
(day-of-week (ledger-schedule-encode-day-of-week
|
(day-of-week (ledger-schedule-encode-day-of-week
|
||||||
(substring (car day-parts) (string-match "[A-Za-z]" (car day-parts))))))
|
(substring (car day-parts) (string-match "[A-Za-z]" (car day-parts))))))
|
||||||
(ledger-schedule-constrain-day-in-month count day-of-week)))))
|
(ledger-schedule-constrain-day-in-month count day-of-week)))))
|
||||||
|
|
||||||
(defun ledger-schedule-list-upcoming-xacts (candidate-items early horizon)
|
(defun ledger-schedule-list-upcoming-xacts (candidate-items early horizon)
|
||||||
"Search CANDIDATE-ITEMS for xacts that occur within the period today - EARLY to today + HORIZON."
|
"Search CANDIDATE-ITEMS for xacts that occur within the period today - EARLY to today + HORIZON."
|
||||||
(let ((start-date (time-subtract (current-time) (days-to-time early)))
|
(let ((start-date (time-subtract (current-time) (days-to-time early)))
|
||||||
test-date items)
|
test-date items)
|
||||||
(loop for day from 0 to (+ early horizon) by 1 do
|
(loop for day from 0 to (+ early horizon) by 1 do
|
||||||
(setq test-date (time-add start-date (days-to-time day)))
|
(setq test-date (time-add start-date (days-to-time day)))
|
||||||
(dolist (candidate candidate-items items)
|
(dolist (candidate candidate-items items)
|
||||||
(if (funcall (car candidate) test-date)
|
(if (funcall (car candidate) test-date)
|
||||||
(setq items (append items (list (list test-date (cadr candidate))))))))
|
(setq items (append items (list (list test-date (cadr candidate))))))))
|
||||||
items))
|
items))
|
||||||
|
|
||||||
(defun ledger-schedule-create-auto-buffer (candidate-items early horizon ledger-buf)
|
(defun ledger-schedule-create-auto-buffer (candidate-items early horizon ledger-buf)
|
||||||
"Format CANDIDATE-ITEMS for display."
|
"Format CANDIDATE-ITEMS for display."
|
||||||
|
|
@ -290,7 +290,7 @@ date descriptor."
|
||||||
(with-current-buffer schedule-buf
|
(with-current-buffer schedule-buf
|
||||||
(erase-buffer)
|
(erase-buffer)
|
||||||
(dolist (candidate candidates)
|
(dolist (candidate candidates)
|
||||||
(insert (format-time-string date-format (car candidate) ) " " (cadr candidate) "\n"))
|
(insert (format-time-string date-format (car candidate) ) " " (cadr candidate) "\n"))
|
||||||
(ledger-mode))
|
(ledger-mode))
|
||||||
(length candidates)))
|
(length candidates)))
|
||||||
|
|
||||||
|
|
@ -311,15 +311,15 @@ Use a prefix arg to change the default value"
|
||||||
(read-number "Look forward: " ledger-schedule-look-forward))
|
(read-number "Look forward: " ledger-schedule-look-forward))
|
||||||
(list ledger-schedule-file ledger-schedule-look-backward ledger-schedule-look-forward)))
|
(list ledger-schedule-file ledger-schedule-look-backward ledger-schedule-look-forward)))
|
||||||
(if (and file
|
(if (and file
|
||||||
(file-exists-p file))
|
(file-exists-p file))
|
||||||
(progn
|
(progn
|
||||||
(ledger-schedule-create-auto-buffer
|
(ledger-schedule-create-auto-buffer
|
||||||
(ledger-schedule-scan-transactions file)
|
(ledger-schedule-scan-transactions file)
|
||||||
look-backward
|
look-backward
|
||||||
look-forward
|
look-forward
|
||||||
(current-buffer))
|
(current-buffer))
|
||||||
(pop-to-buffer ledger-schedule-buffer-name))
|
(pop-to-buffer ledger-schedule-buffer-name))
|
||||||
(error "Could not find ledger schedule file at %s" file)))
|
(error "Could not find ledger schedule file at %s" file)))
|
||||||
|
|
||||||
|
|
||||||
(provide 'ledger-schedule)
|
(provide 'ledger-schedule)
|
||||||
|
|
|
||||||
|
|
@ -28,17 +28,17 @@
|
||||||
|
|
||||||
|
|
||||||
(defun ledger-sort-find-start ()
|
(defun ledger-sort-find-start ()
|
||||||
"Find the beginning of a sort region"
|
"Find the beginning of a sort region"
|
||||||
(if (re-search-forward ";.*Ledger-mode:.*Start sort" nil t)
|
(if (re-search-forward ";.*Ledger-mode:.*Start sort" nil t)
|
||||||
(match-end 0)))
|
(match-end 0)))
|
||||||
|
|
||||||
(defun ledger-sort-find-end ()
|
(defun ledger-sort-find-end ()
|
||||||
"Find the end of a sort region"
|
"Find the end of a sort region"
|
||||||
(if (re-search-forward ";.*Ledger-mode:.*End sort" nil t)
|
(if (re-search-forward ";.*Ledger-mode:.*End sort" nil t)
|
||||||
(match-end 0)))
|
(match-end 0)))
|
||||||
|
|
||||||
(defun ledger-sort-insert-start-mark ()
|
(defun ledger-sort-insert-start-mark ()
|
||||||
"Insert a marker to start a sort region"
|
"Insert a marker to start a sort region"
|
||||||
(interactive)
|
(interactive)
|
||||||
(save-excursion
|
(save-excursion
|
||||||
(goto-char (point-min))
|
(goto-char (point-min))
|
||||||
|
|
@ -48,7 +48,7 @@
|
||||||
(insert "\n; Ledger-mode: Start sort\n\n"))
|
(insert "\n; Ledger-mode: Start sort\n\n"))
|
||||||
|
|
||||||
(defun ledger-sort-insert-end-mark ()
|
(defun ledger-sort-insert-end-mark ()
|
||||||
"Insert a marker to end a sort region"
|
"Insert a marker to end a sort region"
|
||||||
(interactive)
|
(interactive)
|
||||||
(save-excursion
|
(save-excursion
|
||||||
(goto-char (point-min))
|
(goto-char (point-min))
|
||||||
|
|
@ -64,7 +64,7 @@
|
||||||
(defun ledger-sort-region (beg end)
|
(defun ledger-sort-region (beg end)
|
||||||
"Sort the region from BEG to END in chronological order."
|
"Sort the region from BEG to END in chronological order."
|
||||||
(interactive "r") ;; load beg and end from point and mark
|
(interactive "r") ;; load beg and end from point and mark
|
||||||
;; automagically
|
;; automagically
|
||||||
(let ((new-beg beg)
|
(let ((new-beg beg)
|
||||||
(new-end end)
|
(new-end end)
|
||||||
point-delta
|
point-delta
|
||||||
|
|
@ -77,14 +77,14 @@
|
||||||
(save-excursion
|
(save-excursion
|
||||||
(save-restriction
|
(save-restriction
|
||||||
(goto-char beg)
|
(goto-char beg)
|
||||||
;; make sure point is at the beginning of a xact
|
;; make sure point is at the beginning of a xact
|
||||||
(ledger-navigate-next-xact)
|
(ledger-navigate-next-xact)
|
||||||
(unless (looking-at ledger-payee-any-status-regex)
|
(unless (looking-at ledger-payee-any-status-regex)
|
||||||
(ledger-navigate-next-xact))
|
(ledger-navigate-next-xact))
|
||||||
(setq new-beg (point))
|
(setq new-beg (point))
|
||||||
(goto-char end)
|
(goto-char end)
|
||||||
(ledger-navigate-next-xact)
|
(ledger-navigate-next-xact)
|
||||||
;; make sure end of region is at the beginning of next record
|
;; make sure end of region is at the beginning of next record
|
||||||
;; after the region
|
;; after the region
|
||||||
(setq new-end (point))
|
(setq new-end (point))
|
||||||
(narrow-to-region new-beg new-end)
|
(narrow-to-region new-beg new-end)
|
||||||
|
|
|
||||||
|
|
@ -114,8 +114,8 @@ dropped."
|
||||||
(when (not (eq (ledger-state-from-char (char-after)) 'comment))
|
(when (not (eq (ledger-state-from-char (char-after)) 'comment))
|
||||||
(insert (ledger-char-from-state cur-status) " ")
|
(insert (ledger-char-from-state cur-status) " ")
|
||||||
(if (and (search-forward " " (line-end-position) t)
|
(if (and (search-forward " " (line-end-position) t)
|
||||||
(looking-at " "))
|
(looking-at " "))
|
||||||
(delete-char 2)))
|
(delete-char 2)))
|
||||||
(forward-line))
|
(forward-line))
|
||||||
(setq new-status nil)))
|
(setq new-status nil)))
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -185,8 +185,8 @@ correct chronological place in the buffer."
|
||||||
(goto-char (point-min))
|
(goto-char (point-min))
|
||||||
(if (looking-at "Error: ")
|
(if (looking-at "Error: ")
|
||||||
(error (concat "Error in ledger-add-transaction: " (buffer-string)))
|
(error (concat "Error in ledger-add-transaction: " (buffer-string)))
|
||||||
(ledger-post-align-postings (point-min) (point-max))
|
(ledger-post-align-postings (point-min) (point-max))
|
||||||
(buffer-string)))
|
(buffer-string)))
|
||||||
"\n"))
|
"\n"))
|
||||||
(progn
|
(progn
|
||||||
(insert (car args) " \n\n")
|
(insert (car args) " \n\n")
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue