Fix another null buffer problem when closing ledger buffers

2 files changed, 15 insertions, 12 deletions

diff --git a/lisp/ldg-new.el b/lisp/ldg-new.el
index ab267747..1e70c432 100644
--- a/lisp/ldg-new.el
+++ b/lisp/ldg-new.el
@@ -47,6 +47,7 @@
 (require 'ldg-fonts)
 (require 'ldg-occur)
 (require 'ldg-commodities)
+(require 'esh-arg)
 
 
 ;;; Code:
diff --git a/lisp/ldg-reconcile.el b/lisp/ldg-reconcile.el
index ebaf7949..6d7226de 100644
--- a/lisp/ldg-reconcile.el
+++ b/lisp/ldg-reconcile.el
@@ -232,23 +232,25 @@ and exit reconcile mode"
   (interactive)
   (let ((recon-buf (get-buffer ledger-recon-buffer-name))
 	buf)
-    (with-current-buffer recon-buf
-      (ledger-reconcile-quit-cleanup)
-      (set 'buf ledger-buf)
-      ;; Make sure you delete the window before you delete the buffer,
-      ;; otherwise, madness ensues
-      (delete-window (get-buffer-window recon-buf))
-      (kill-buffer recon-buf)
-      (set-window-buffer (selected-window) buf))))
+    (if recon-buf
+	(with-current-buffer recon-buf
+	  (ledger-reconcile-quit-cleanup)
+	  (set 'buf ledger-buf)
+	  ;; Make sure you delete the window before you delete the buffer,
+	  ;; otherwise, madness ensues
+	  (delete-window (get-buffer-window recon-buf))
+	  (kill-buffer recon-buf)
+	  (set-window-buffer (selected-window) buf)))))
 
 (defun ledger-reconcile-quit-cleanup ()
   "Cleanup all hooks established by reconcile mode."
   (interactive)
   (let ((buf ledger-buf))
-    (with-current-buffer buf
-      (remove-hook 'after-save-hook 'ledger-reconcile-refresh-after-save t)
-      (if ledger-fold-on-reconcile
-	  (ledger-occur-quit-buffer buf)))))
+    (if buf
+	(with-current-buffer buf
+	  (remove-hook 'after-save-hook 'ledger-reconcile-refresh-after-save t)
+	  (if ledger-fold-on-reconcile
+	      (ledger-occur-quit-buffer buf))))))
 
 (defun ledger-marker-where-xact-is (emacs-xact posting)
   "Find the position of the EMACS-XACT in the `ledger-buf'.