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

This commit is contained in:
Craig Earls 2013-03-18 11:46:45 -07:00
commit 5324afbd9b
4 changed files with 13 additions and 13 deletions

View file

@ -92,7 +92,8 @@
(forward-line 1))))))
(defun ledger-dump-variable (var)
(insert (format "%s: %S\n" (symbol-name var) (eval var))))
(if var
(insert (format "%s: %S\n" (symbol-name var) (eval var)))))
(defun ledger-mode-dump-variables ()
(interactive)
@ -103,7 +104,6 @@
(insert "Emacs: " (version) "\n")
(insert "System Configuration: "system-configuration "\n")
(insert "ldg-commodities:\n")
(ledger-dump-variable 'ledger-use-decimal-comma)
(ledger-dump-variable 'ledger-reconcile-default-commodity)
(insert "ldg-exec:\n")
(ledger-dump-variable 'ledger-works)
@ -114,10 +114,10 @@
(ledger-dump-variable 'ledger-occur-history)
(ledger-dump-variable 'ledger-occur-last-match)
(insert "ldg-post:\n")
(ledger-dump-variable 'ledger-post-auto-adjust-amounts)
(ledger-dump-variable 'ledger-post-auto-adjust-postings)
(ledger-dump-variable 'ledger-post-account-alignment-column)
(ledger-dump-variable 'ledger-post-amount-alignment-column)
(ledger-dump-variable 'ledger-post-use-iswitchb)
(ledger-dump-variable 'ledger-post-use-ido)
(ledger-dump-variable 'ledger-post-use-completion-engine)
(insert "ldg-reconcile:\n")
(ledger-dump-variable 'ledger-recon-buffer-name)
(ledger-dump-variable 'ledger-fold-on-reconcile)

View file

@ -49,7 +49,7 @@
(defvar ledger-occur-history nil
"History of previously searched expressions for the prompt.")
(make-variable-buffer-local 'ledger-occur-history)
;;(make-variable-buffer-local 'ledger-occur-history)
(defvar ledger-occur-last-match nil
"Last match found.")
@ -95,8 +95,7 @@ When REGEX is nil, unhide everything, and remove higlight"
(if ledger-occur-mode
(list nil)
(list (read-string (concat "Regexp<" (ledger-occur-prompt)
">: ") "" 'ledger-occur-history ))))
(if (string-equal "" regex) (setq regex (ledger-occur-prompt)))
">: ") nil 'ledger-occur-history (ledger-occur-prompt)))))
(ledger-occur-mode regex (current-buffer)))
(defun ledger-occur-prompt ()

View file

@ -73,7 +73,7 @@ text that should replace the format specifier."
(defvar ledger-report-cmd-prompt-history nil)
(defvar ledger-original-window-cfg nil)
(defvar ledger-report-saved nil)
(defvar ledger-minibuffer-history nil)
(defvar ledger-report-mode-abbrev-table)
(defun ledger-report-reverse-lines ()
@ -236,7 +236,7 @@ used to generate the buffer, navigating the buffer, etc."
(if default
(concat " (" default "): ")
": "))))
(read-string default-prompt nil nil default)))
(read-string default-prompt nil 'ledger-minibuffer-history default)))
(defun ledger-report-payee-format-specifier ()
"Substitute a payee name.

View file

@ -99,9 +99,10 @@ within the transaction."
(ignore (goto-char here))))))
(defun ledger-copy-transaction-at-point (date)
"Ask for a new DATE and copy the transaction under point to that date. Leave point on the first amount."(interactive (list
(read-string "Copy to date: "
(concat ledger-year "/" ledger-month "/"))))
"Ask for a new DATE and copy the transaction under point to that date. Leave point on the first amount."
(interactive (list
(read-string "Copy to date: "
(concat ledger-year "/" ledger-month "/") 'ledger-minibuffer-history)))
(let* ((here (point))
(extents (ledger-find-xact-extents (point)))
(transaction (buffer-substring (car extents) (cadr extents)))