From 993be9f1c6d28f511e52272db1484e6ca7784cbb Mon Sep 17 00:00:00 2001
From: Carsten Dominik <carsten.dominik@gmail.com>
Date: Mon, 14 Dec 2009 08:17:13 +0100
Subject: [PATCH] Restart org-indent-mode when restarting org-mode

---
 lisp/ChangeLog |  5 +++++
 lisp/org.el    | 11 ++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f1c37bbf7..d64373764 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-14  Carsten Dominik  <carsten.dominik@gmail.com>
+
+	* org.el (org-inhibit-startup-visibility-stuff): New variable.
+	(org-mode): Don't do startup visibility if inhibited.
+
 2009-12-13  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org.el (org-make-link-regexps): Capture link path into a group.
diff --git a/lisp/org.el b/lisp/org.el
index 1e82be3ac..0caec8f50 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -4177,6 +4177,7 @@ This variable is set by `org-before-change-function'.
   (setq org-table-may-need-update t))
 (defvar org-mode-map)
 (defvar org-inhibit-startup nil)        ; Dynamically-scoped param.
+(defvar org-inhibit-startup-visibility-stuff nil) ; Dynamically-scoped param.
 (defvar org-agenda-keep-modes nil)      ; Dynamically-scoped param.
 (defvar org-inhibit-logging nil)        ; Dynamically-scoped param.
 (defvar org-inhibit-blocking nil)       ; Dynamically-scoped param.
@@ -4306,7 +4307,6 @@ The following commands are available:
 	   (interactive-p)
 	   (= (point-min) (point-max)))
       (insert "#    -*- mode: org -*-\n\n"))
-
   (unless org-inhibit-startup
     (when org-startup-align-all-tables
       (let ((bmp (buffer-modified-p)))
@@ -4315,7 +4315,8 @@ The following commands are available:
     (when org-startup-indented
       (require 'org-indent)
       (org-indent-mode 1))
-    (org-set-startup-visibility)))
+    (unless org-inhibit-startup-visibility-stuff
+      (org-set-startup-visibility))))
 
 (when (fboundp 'abbrev-table-put)
   (abbrev-table-put org-mode-abbrev-table
@@ -15757,9 +15758,9 @@ This command does many different things, depending on context:
 	  (if (org-at-table-p)
 	      (org-call-with-arg 'org-table-recalculate (or arg t)))))
        (t
-;	(org-set-regexps-and-options)
-;	(org-restart-font-lock)
-	(let ((org-inhibit-startup t)) (org-mode-restart))
+	(let ((org-inhibit-startup-visibility-stuff t)
+	      (org-startup-align-all-tables nil))
+	  (org-mode-restart))
 	(message "Local setup has been refreshed"))))
      ((org-clock-update-time-maybe))
      (t (error "C-c C-c can do nothing useful at this location")))))
-- 
2.11.4.GIT