Finish bug 929 got rid of all references to folding, use narrowing instead.

3 files changed, 12 insertions, 12 deletions

diff --git a/lisp/ldg-fonts.el b/lisp/ldg-fonts.el
index d760140c..76bfc03d 100644
--- a/lisp/ldg-fonts.el
+++ b/lisp/ldg-fonts.el
@@ -62,7 +62,7 @@
   "Face for Ledger amounts"
   :group 'ledger-faces)
 
-(defface ledger-occur-folded-face
+(defface ledger-occur-narrowed-face
     `((t :foreground "grey70" :invisible t ))
   "Default face for Ledger occur mode hidden transactions"
   :group 'ledger-faces)
diff --git a/lisp/ldg-occur.el b/lisp/ldg-occur.el
index 35ca7f3d..28d87b78 100644
--- a/lisp/ldg-occur.el
+++ b/lisp/ldg-occur.el
@@ -20,7 +20,7 @@
 ;; MA 02111-1307, USA.
 
 ;;; Commentary:
-;; Provide code folding to ledger mode.  Adapted from original loccur
+;; Provide buffer narrowing to ledger mode.  Adapted from original loccur
 ;; mode by Alexey Veretennikov <alexey dot veretennikov at gmail dot
 ;; com>
 ;;
@@ -31,11 +31,11 @@
 
 (defconst ledger-occur-overlay-property-name 'ledger-occur-custom-buffer-grep)
 
-(defcustom ledger-occur-use-face-unfolded t
+(defcustom ledger-occur-use-face-shown t
   "If non-nil, use a custom face for xacts shown in `ledger-occur' mode using ledger-occur-xact-face."
   :type 'boolean
   :group 'ledger)
-(make-variable-buffer-local 'ledger-occur-use-face-unfolded)
+(make-variable-buffer-local 'ledger-occur-use-face-shown)
 
 
 (defvar ledger-occur-mode nil 
@@ -69,7 +69,7 @@ When REGEX is nil, unhide everything, and remove higlight"
 	  (if (or (null regex)
 		  (zerop (length regex)))
 	      nil
-	      (concat " Ledger-Folded: " regex)))
+	      (concat " Ledger-Narrowed: " regex)))
     (force-mode-line-update)
     (ledger-occur-remove-overlays)
     (if ledger-occur-mode
@@ -79,7 +79,7 @@ When REGEX is nil, unhide everything, and remove higlight"
 		(ledger-occur-create-xact-overlays ovl-bounds))
 	  (setq ledger-occur-overlay-list
 		(append ledger-occur-overlay-list
-			(ledger-occur-create-folded-overlays buffer-matches)))
+			(ledger-occur-create-narrowed-overlays buffer-matches)))
 	  (setq ledger-occur-last-match regex)
 	  (if (get-buffer-window buffer)
 	      (select-window (get-buffer-window buffer)))))
@@ -116,7 +116,7 @@ When REGEX is nil, unhide everything, and remove higlight"
 	     (current-word))))
     prompt))
 
-(defun ledger-occur-create-folded-overlays(buffer-matches)
+(defun ledger-occur-create-narrowed-overlays(buffer-matches)
   (if buffer-matches
       (let ((overlays
              (let ((prev-end (point-min))
@@ -156,7 +156,7 @@ Argument OVL-BOUNDS contains bounds for the transactions to be left visible."
                  ovl-bounds)))
     (mapcar (lambda (ovl)
 	      (overlay-put ovl ledger-occur-overlay-property-name t)
-	      (if ledger-occur-use-face-unfolded
+	      (if ledger-occur-use-face-shown
 		  (overlay-put ovl 'face 'ledger-occur-xact-face )))
             overlays)))
 
diff --git a/lisp/ldg-reconcile.el b/lisp/ldg-reconcile.el
index c33eef2e..a4960260 100644
--- a/lisp/ldg-reconcile.el
+++ b/lisp/ldg-reconcile.el
@@ -40,7 +40,7 @@
   "Name to use for reconciliation window."
   :group 'ledger-reconcile)
 
-(defcustom ledger-fold-on-reconcile t
+(defcustom ledger-narrow-on-reconcile t
   "If t, limit transactions shown in main buffer to those matching the reconcile regex."
   :type 'boolean
   :group 'ledger-reconcile)
@@ -260,7 +260,7 @@ and exit reconcile mode"
     (if (buffer-live-p buf)
 	(with-current-buffer buf
 	  (remove-hook 'after-save-hook 'ledger-reconcile-refresh-after-save t)
-	  (if ledger-fold-on-reconcile
+	  (if ledger-narrow-on-reconcile
 	      (progn
 		(ledger-occur-quit-buffer buf)
 		(ledger-highlight-xact-under-point)))))))
@@ -400,12 +400,12 @@ moved and recentered.  If they aren't strange things happen."
 	    (set (make-local-variable 'ledger-buf) buf)
 	    (set (make-local-variable 'ledger-acct) account))))
     
-    ;; Fold the ledger buffer
+    ;; Narrow the ledger buffer
 
     ;; Now, actually run the reconciliation
     (with-current-buffer rbuf
       (save-excursion
-	(if ledger-fold-on-reconcile
+	(if ledger-narrow-on-reconcile
 	    (ledger-occur-mode account ledger-buf)))
       (if (> (ledger-reconcile-refresh) 0)
 	  (ledger-reconcile-change-target))