diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | lisp/ldg-complete.el | 53 | ||||
| -rw-r--r-- | lisp/ldg-fonts.el | 43 | ||||
| -rw-r--r-- | lisp/ldg-mode.el | 7 |
4 files changed, 47 insertions, 66 deletions
diff --git a/lisp/CMakeLists.txt b/lisp/CMakeLists.txt index 876b3548..2258fd5d 100644 --- a/lisp/CMakeLists.txt +++ b/lisp/CMakeLists.txt @@ -15,7 +15,9 @@ set(EMACS_LISP_SOURCES ldg-state.el ldg-test.el ldg-texi.el - ldg-xact.el) + ldg-xact.el + ldg-context.el + ldg-schedule.el) # find emacs and complain if not found find_program(EMACS_EXECUTABLE emacs) @@ -26,10 +28,10 @@ macro(add_emacs_lisp_target el) # add rule (i.e. command) how to generate the byte-compiled file add_custom_command( OUTPUT ${el}c - COMMAND ${EMACS_EXECUTABLE} - -L ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${EMACS_EXECUTABLE} + -L ${CMAKE_CURRENT_BINARY_DIR} -l ${CMAKE_CURRENT_BINARY_DIR}/ldg-regex.el - -batch -f batch-byte-compile + -batch -f batch-byte-compile ${CMAKE_CURRENT_BINARY_DIR}/${el} DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${el} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} diff --git a/lisp/ldg-complete.el b/lisp/ldg-complete.el index e3820924..2faef5df 100644 --- a/lisp/ldg-complete.el +++ b/lisp/ldg-complete.el @@ -69,31 +69,36 @@ ;; to the list (pcomplete-uniqify-list (nreverse payees-list)))) + (defun ledger-find-accounts-in-buffer () - "Search through buffer and build tree of accounts. -Return tree structure" - (let ((origin (point)) - (account-tree (list t)) - (account-elements nil)) - (save-excursion - (goto-char (point-min)) - (while (re-search-forward - ledger-account-or-metadata-regex nil t) - (unless (and (>= origin (match-beginning 0)) - (< origin (match-end 0))) + (interactive) + (let ((origin (point)) + accounts + (account-tree (list t)) + (account-elements nil)) + (save-excursion + (goto-char (point-min)) + + (dolist (account + (delete-dups + (progn + (while (re-search-forward ledger-account-or-metadata-regex nil t) + (unless (between origin (match-beginning 0) (match-end 0)) + (setq accounts (cons (match-string-no-properties 2) accounts)))) + accounts))) + (let ((root account-tree)) (setq account-elements - (split-string - (match-string-no-properties 2) ":")) - (let ((root account-tree)) - (while account-elements - (let ((xact (assoc (car account-elements) root))) - (if xact - (setq root (cdr xact)) - (setq xact (cons (car account-elements) (list t))) - (nconc root (list xact)) - (setq root (cdr xact)))) - (setq account-elements (cdr account-elements))))))) - account-tree)) + (split-string + account ":")) + (while account-elements + (let ((xact (assoc (car account-elements) root))) + (if xact + (setq root (cdr xact)) + (setq xact (cons (car account-elements) (list t))) + (nconc root (list xact)) + (setq root (cdr xact)))) + (setq account-elements (cdr account-elements)))))) + account-tree)) (defun ledger-find-metadata-in-buffer () "Search through buffer and build list of metadata. @@ -177,7 +182,7 @@ Does not use ledger xact" ;; Search backward for a matching payee (when (re-search-backward (concat "^[0-9/.=-]+\\(\\s-+\\*\\)?\\(\\s-+(.*?)\\)?\\s-+\\(.*" - (regexp-quote name) ".*\\)" ) nil t) + (regexp-quote name) ".*\\)" ) nil t) (setq rest-of-name (match-string 3)) ;; Start copying the postings (forward-line) diff --git a/lisp/ldg-fonts.el b/lisp/ldg-fonts.el index fc0b7813..ab0a3317 100644 --- a/lisp/ldg-fonts.el +++ b/lisp/ldg-fonts.el @@ -111,54 +111,27 @@ (defvar ledger-font-lock-keywords - `( ;; (,ledger-other-entries-regex 1 + `( ;; (,ledger-other-entries-regex 1 ;; ledger-font-other-face) (,ledger-comment-regex 0 'ledger-font-comment-face) (,ledger-multiline-comment-regex 0 'ledger-font-comment-face) - (,ledger-payee-pending-regex 2 + (,ledger-payee-pending-regex 2 'ledger-font-payee-pending-face) ; Works - (,ledger-payee-cleared-regex 2 + (,ledger-payee-cleared-regex 2 'ledger-font-payee-cleared-face) ; Works - (,ledger-payee-uncleared-regex 2 + (,ledger-payee-uncleared-regex 2 'ledger-font-payee-uncleared-face) ; Works - (,ledger-account-cleared-regex 2 + (,ledger-account-cleared-regex 2 'ledger-font-posting-account-cleared-face) ; Works - (,ledger-account-pending-regex 2 + (,ledger-account-pending-regex 2 'ledger-font-posting-account-pending-face) ; Works - (,ledger-account-any-status-regex 2 + (,ledger-account-any-status-regex 2 'ledger-font-posting-account-face) ; Works - (,ledger-other-entries-regex 1 + (,ledger-other-entries-regex 1 'ledger-font-other-face)) "Expressions to highlight in Ledger mode.") -(defun ledger-extend-region-multiline-comment () - "Adjusts the variables font-lock-beg and font-lock-end if they - fall within a multiline comment. Returns non-nil if an - adjustment is made." - (let (beg end) - ;; fix beg - (save-excursion - (goto-char font-lock-beg) - (end-of-line) - (when (re-search-backward ledger-multiline-comment-start-regex nil t) - (setq beg (point)) - (re-search-forward ledger-multiline-comment-regex nil t) - (if (and (>= (point) font-lock-beg) - (/= beg font-lock-beg)) - (setq font-lock-beg beg) - (setq beg nil)))) - ;; fix end - (save-excursion - (goto-char font-lock-end) - (end-of-line) - (when (re-search-backward ledger-multiline-comment-start-regex nil t) - (re-search-forward ledger-multiline-comment-regex nil t) - (setq end (point)) - (if (> end font-lock-end) - (setq font-lock-end end) - (setq end nil)))) - (or beg end))) (provide 'ldg-fonts) diff --git a/lisp/ldg-mode.el b/lisp/ldg-mode.el index b6e4b7f1..75b842e2 100644 --- a/lisp/ldg-mode.el +++ b/lisp/ldg-mode.el @@ -63,7 +63,9 @@ And calculate the target-delta of the account being reconciled." (buffer (current-buffer)) (balance (with-temp-buffer (ledger-exec-ledger buffer (current-buffer) "cleared" account) - (buffer-substring-no-properties (point-min) (1- (point-max)))))) + (if (> (buffer-size) 0) + (buffer-substring-no-properties (point-min) (1- (point-max))) + (concat account " is empty."))))) (when balance (message balance)))) @@ -122,8 +124,7 @@ Can indent, complete or align depending on context." (set (make-local-variable 'font-lock-defaults) '(ledger-font-lock-keywords nil t))) (setq font-lock-extend-region-functions - (list #'font-lock-extend-region-wholelines - #'ledger-extend-region-multiline-comment)) + (list #'font-lock-extend-region-wholelines)) (setq font-lock-multiline nil) (set (make-local-variable 'pcomplete-parse-arguments-function) |