branch: elpa/beancount commit 36e82fc5a930a1e7cb2c866b5f27fd2efc26646e Author: Martin Blais <bl...@furius.ca> Commit: Martin Blais <bl...@furius.ca>
Made beancount.el very decent, decent enough to start working with it for real. --- etc/emacsrc | 68 ++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 38 insertions(+), 30 deletions(-) diff --git a/etc/emacsrc b/etc/emacsrc index 6544ace3c6..0662bba2b0 100644 --- a/etc/emacsrc +++ b/etc/emacsrc @@ -6,54 +6,62 @@ ;; Add the emacs path. (add-to-list 'load-path (concat project-current "/lib/elisp")) -(require 'ledger) -(require 'ledger-plus) +(if t + (progn ;; New Beancount-only configuration. + (require 'beancount) -(defun ledger-insert-food () - (insert-yesterday) (insert " * |\n") - (insert " Expenses:Food:Restaurant USD \n") - (insert " Assets:Current:Cash\n") - (forward-line -3) (forward-word 3) (forward-char 3)) + ) + (progn ;; Old Ledger configuration. + (require 'ledger) + (require 'ledger-plus) -;;;----------------------------------------------------------------------------- -(define-abbrev ledger-mode-abbrev-table "food" "" 'ledger-insert-food) + (defun ledger-insert-food () + (insert-yesterday) (insert " * |\n") + (insert " Expenses:Food:Restaurant USD \n") + (insert " Assets:Current:Cash\n") + (forward-line -3) (forward-word 3) (forward-char 3)) -(defun user-ledger-mode-hook () - (set-fill-column 200) +;;;----------------------------------------------------------------------------- -;; (outline-minor-mode 1) - (setq outline-regexp "^;;;;; ") + (define-abbrev ledger-mode-abbrev-table "food" "" 'ledger-insert-food) - (define-key ledger-mode-map [(control ?c) (control ?n)] - 'outline-next-visible-heading) - (define-key ledger-mode-map [(control ?c) (control ?p)] - 'outline-previous-visible-heading) - ;; FIXME: we should make this work for the current entry when a region is not - ;; selected. - (define-key ledger-mode-map [(control ?c) (control ?q)] - (lambda () (interactive) (ledger-align-amounts 80))) + (defun user-ledger-mode-hook () + (set-fill-column 200) - ;; Remove tab bindings that are injected illegally in ledger.el. - (define-key ledger-mode-map [tab] nil) - (define-key ledger-mode-map [(control ?i)] nil) + ;; (outline-minor-mode 1) + (setq outline-regexp "^;;;;; ") - ;; Bring back comment-region. - (define-key ledger-mode-map [(control ?c) (control ?c)] 'comment-region) + (define-key ledger-mode-map [(control ?c) (control ?n)] + 'outline-next-visible-heading) + (define-key ledger-mode-map [(control ?c) (control ?p)] + 'outline-previous-visible-heading) - (setq comment-start "; ") + ;; FIXME: we should make this work for the current entry when a region is not + ;; selected. + (define-key ledger-mode-map [(control ?c) (control ?q)] + (lambda () (interactive) (ledger-align-amounts 80))) - ) + ;; Remove tab bindings that are injected illegally in ledger.el. + (define-key ledger-mode-map [tab] nil) + (define-key ledger-mode-map [(control ?i)] nil) + + ;; Bring back comment-region. + (define-key ledger-mode-map [(control ?c) (control ?c)] 'comment-region) + + (setq comment-start "; ") -(add-hook 'ledger-mode-hook 'user-ledger-mode-hook) + ) -(add-to-list 'auto-mode-alist '("\\.ledger$" . ledger-mode)) + (add-hook 'ledger-mode-hook 'user-ledger-mode-hook) + (add-to-list 'auto-mode-alist '("\\.ledger$" . ledger-mode)) + ))