diff options
| author | Craig Earls <enderw88@gmail.com> | 2013-04-01 16:35:05 -0700 |
|---|---|---|
| committer | Craig Earls <enderw88@gmail.com> | 2013-04-01 16:35:05 -0700 |
| commit | 712665e5b4b748c554174a13d5a66f5cab1c97fd (patch) | |
| tree | f0692319544837479bd578e2c9248dd53bf1d0fb /lisp | |
| parent | b15d4bc09e40c71bd9a59f33457839daaec659a8 (diff) | |
| parent | 78bedf7c8ea15e369f56fbd317d03deb35343258 (diff) | |
| download | fork-ledger-712665e5b4b748c554174a13d5a66f5cab1c97fd.tar.gz fork-ledger-712665e5b4b748c554174a13d5a66f5cab1c97fd.tar.bz2 fork-ledger-712665e5b4b748c554174a13d5a66f5cab1c97fd.zip | |
Merge branch 'next' into ledger-mode-automatic-transactions
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ldg-complete.el | 7 | ||||
| -rw-r--r-- | lisp/ldg-post.el | 3 | ||||
| -rw-r--r-- | lisp/ldg-reconcile.el | 2 | ||||
| -rw-r--r-- | lisp/ldg-report.el | 2 | ||||
| -rw-r--r-- | lisp/ldg-sort.el | 4 |
5 files changed, 10 insertions, 8 deletions
diff --git a/lisp/ldg-complete.el b/lisp/ldg-complete.el index 65206026..fe27e91d 100644 --- a/lisp/ldg-complete.el +++ b/lisp/ldg-complete.el @@ -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)) diff --git a/lisp/ldg-post.el b/lisp/ldg-post.el index 91ee623d..554b8578 100644 --- a/lisp/ldg-post.el +++ b/lisp/ldg-post.el @@ -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 ? )) diff --git a/lisp/ldg-reconcile.el b/lisp/ldg-reconcile.el index 5a6a117a..bec6d175 100644 --- a/lisp/ldg-reconcile.el +++ b/lisp/ldg-reconcile.el @@ -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)) diff --git a/lisp/ldg-report.el b/lisp/ldg-report.el index 04c182dd..3225d803 100644 --- a/lisp/ldg-report.el +++ b/lisp/ldg-report.el @@ -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")) diff --git a/lisp/ldg-sort.el b/lisp/ldg-sort.el index 45b55c47..5119db5d 100644 --- a/lisp/ldg-sort.el +++ b/lisp/ldg-sort.el @@ -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." |