From 65cb546662a3657f0bb0935e16d4b957e69b1e9f Mon Sep 17 00:00:00 2001
From: Carsten Dominik <carsten.dominik@gmail.com>
Date: Mon, 3 Aug 2009 10:11:38 +0200
Subject: [PATCH] Minor fixes to `org-indent-mode'.

---
 lisp/ChangeLog     | 5 +++++
 lisp/org-indent.el | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1b1eafebc..e81e528b8 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2009-08-03  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org-indent.el (org-hide-leading-stars-before-indent-mode): New
+	variable.
+	(org-indent-mode): Remember and restore value of
+	org-hide-leading-stars before `org-indent-mode'.
+
 	* org-table.el (org-table-export): Also work in file-less
 	buffers.
 
diff --git a/lisp/org-indent.el b/lisp/org-indent.el
index caeb65dfa..03cffe42e 100644
--- a/lisp/org-indent.el
+++ b/lisp/org-indent.el
@@ -53,6 +53,8 @@ It will be set in `org-indent-initialize'.")
 (defvar org-indent-stars nil
   "Vector with all indentation star strings.
 It will be set in `org-indent-initialize'.")
+(defvar org-hide-leading-stars-before-indent-mode nil
+  "Used locally")
 
 (defcustom org-indent-boundary-char ?\   ; comment to protect space char
   "The end of the virtual indentation strings, a single-character string.
@@ -134,6 +136,8 @@ FIXME:  How to update when broken?"
 	  (when org-indent-mode-turns-off-org-adapt-indentation
 	    (org-set-local 'org-adapt-indentation nil))
 	  (when org-indent-mode-turns-on-hiding-stars
+	    (org-set-local 'org-hide-leading-stars-before-indent-mode
+			   org-hide-leading-stars)
 	    (org-set-local 'org-hide-leading-stars t))
 	  (make-local-variable 'buffer-substring-filters)
 	  (add-to-list 'buffer-substring-filters
@@ -150,6 +154,9 @@ FIXME:  How to update when broken?"
 	(save-restriction
 	  (org-indent-remove-properties (point-min) (point-max))
 	  (kill-local-variable 'org-adapt-indentation)
+	  (when (boundp 'org-hide-leading-stars-before-indent-mode)
+	    (org-set-local 'org-hide-leading-stars
+			   org-hide-leading-stars-before-indent-mode))
 	  (setq buffer-substring-filters
 		(delq 'org-indent-remove-properties-from-string
 		      buffer-substring-filters))
-- 
2.11.4.GIT