Merge branch 'next' into ledger-mode-automatic-transactions

This commit is contained in:
Craig Earls 2013-04-01 16:35:05 -07:00
commit 712665e5b4
5 changed files with 10 additions and 8 deletions

View file

@ -77,10 +77,9 @@ Return tree structure"
(split-string
(match-string-no-properties 2) ":"))
(let ((root account-tree))
(while (and account-elements
(not (char-equal (string-to-char (car account-elements)) ?\;)))
(let ((entry (assoc (car account-elements) root)))
(if entry
(while account-elements
(let ((entry (assoc (car account-elements) root)))
(if entry
(setq root (cdr entry))
(setq entry (cons (car account-elements) (list t)))
(nconc root (list entry))

View file

@ -187,7 +187,8 @@ region align the posting on the current line."
(when (setq amt-offset (ledger-next-amount (line-end-position)))
(let* ((amt-adjust (- ledger-post-amount-alignment-column
amt-offset
(current-column))))
(current-column)
2)))
(if (/= amt-adjust 0)
(if (> amt-adjust 0)
(insert (make-string amt-adjust ? ))

View file

@ -434,7 +434,7 @@ moved and recentered. If they aren't strange things happen."
(define-key map [menu-bar ldg-recon-menu qui] '("Quit" . ledger-reconcile-quit))
(define-key map [menu-bar ldg-recon-menu sep1] '("--"))
(define-key map [menu-bar ldg-recon-menu pre] '("Previous Entry" . previous-line))
(define-key map [menu-bar ldg-recon-menu vis] '("Visit Entry" . ledger-reconcile-visit))
(define-key map [menu-bar ldg-recon-menu vis] '("Visit Source" . ledger-reconcile-visit))
(define-key map [menu-bar ldg-recon-menu nex] '("Next Entry" . next-line))
(define-key map [menu-bar ldg-recon-menu sep2] '("--"))
(define-key map [menu-bar ldg-recon-menu del] '("Delete Entry" . ledger-reconcile-delete))

View file

@ -103,7 +103,7 @@ text that should replace the format specifier."
'ledger-report-kill)
(define-key map [(control ?c) (control ?l) (control ?e)]
'ledger-report-edit)
(define-key map [(control ?c) (control ?c)] 'ledger-report-visit-source)
(define-key map [return] 'ledger-report-visit-source)
(define-key map [menu-bar] (make-sparse-keymap "ldg-rep"))

View file

@ -74,6 +74,7 @@
;; automagically
(let ((new-beg beg)
(new-end end))
(setq inhibit-modification-hooks t)
(save-excursion
(save-restriction
(goto-char beg)
@ -93,7 +94,8 @@
nil
'ledger-next-record-function
'ledger-end-record-function
'ledger-sort-startkey))))))
'ledger-sort-startkey))))
(setq inhibit-modification-hooks nil)))
(defun ledger-sort-buffer ()
"Sort the entire buffer."