From c4375970d7050497290bc070361f09235cff5e47 Mon Sep 17 00:00:00 2001
From: Carsten Dominik <carsten.dominik@gmail.com>
Date: Fri, 25 Jul 2008 20:41:02 -0700
Subject: [PATCH] Minor fixes.

---
 ORGWEBPAGE/Changes.org     | 12 +++++++++++-
 contrib/lisp/org-indent.el | 14 ++++++++++++++
 lisp/org-exp.el            |  8 +++++++-
 lisp/org.el                | 15 +--------------
 4 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/ORGWEBPAGE/Changes.org b/ORGWEBPAGE/Changes.org
index ee7ca29d5..599a8a384 100644
--- a/ORGWEBPAGE/Changes.org
+++ b/ORGWEBPAGE/Changes.org
@@ -10,11 +10,21 @@
 #+LINK_UP: index.html
 #+LINK_HOME: http://orgmode.org
 
-* Version 6.06
+* Version 6.07 (in preparation)
 :PROPERTIES:
 :VISIBILITY: content
 :END:
 
+** Details
+
+** It is now possible to define filters for column view
+   The filter can modify the value that will be displayed in a
+   column, for example it can cut out a part of a time stamp.
+   For more information, look at the variable
+   =org-columns-modify-value-for-display-function=.
+
+* Version 6.06
+
 ** Overview
 
    - New, more CSS-like setup for HTML style information
diff --git a/contrib/lisp/org-indent.el b/contrib/lisp/org-indent.el
index c738cfd52..b50b11335 100644
--- a/contrib/lisp/org-indent.el
+++ b/contrib/lisp/org-indent.el
@@ -38,6 +38,20 @@
 
 ;;; Indentation
 
+(defcustom org-startup-indented nil
+  "Non-nil means, turn on `org-indent-mode' on startup.
+This can also be configured on a per-file basis by adding one of
+the following lines anywhere in the buffer:
+
+   #+STARTUP: localindent
+   #+STARTUP: indent
+   #+STARTUP: noindent"
+  :group 'org-structure
+  :type '(choice
+	  (const :tag "Not" nil)
+	  (const :tag "Locally" local)
+	  (const :tag "Globally (slow on startup in large files)" t)))
+
 (defconst org-indent-max 80
   "Maximum indentation in characters")
 (defconst org-indent-strings nil
diff --git a/lisp/org-exp.el b/lisp/org-exp.el
index f24f4a149..e6243b225 100644
--- a/lisp/org-exp.el
+++ b/lisp/org-exp.el
@@ -526,6 +526,8 @@ you can \"misuse\" it to add arbitrary text to the header.
 See also the variable `org-export-html-style-extra'."
   :group 'org-export-html
   :type 'string)
+;;;###autoload
+(put 'org-export-html-style 'safe-local-variable 'stringp)
 
 (defcustom org-export-html-style-extra ""
   "Additional style information for HTML export.
@@ -535,6 +537,9 @@ settings of style information, and do not forget to surround the style
 settings with <style>...</style> tags."
   :group 'org-export-html
   :type 'string)
+;;;###autoload
+(put 'org-export-html-style-extra 'safe-local-variable 'stringp)
+
 
 (defcustom org-export-html-title-format "<h1 class=\"title\">%s</h1>\n"
   "Format for typesetting the document title in HTML export."
@@ -817,7 +822,7 @@ modified) list.")
       (let ((re (org-make-options-regexp
 		 (append
 		  '("TITLE" "AUTHOR" "DATE" "EMAIL" "TEXT" "OPTIONS" "LANGUAGE"
-		    "LINK_UP" "LINK_HOME" "SETUPFILE")
+		    "LINK_UP" "LINK_HOME" "SETUPFILE" "STYLE")
 		  (mapcar 'car org-export-inbuffer-options-extra))))
 	    p key val text options js-up js-main js-css js-opt a pr
 	    ext-setup-or-nil setup-contents (start 0))
@@ -837,6 +842,7 @@ modified) list.")
 	   ((string-equal key "EMAIL") (setq p (plist-put p :email val)))
 	   ((string-equal key "DATE") (setq p (plist-put p :date val)))
 	   ((string-equal key "LANGUAGE") (setq p (plist-put p :language val)))
+	   ((string-equal key "STYLE") (setq p (plist-put p :style-extra val)))
 	   ((string-equal key "TEXT")
 	    (setq text (if text (concat text "\n" val) val)))
 	   ((string-equal key "OPTIONS")
diff --git a/lisp/org.el b/lisp/org.el
index bd4009e77..aff9e07cb 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -220,20 +220,6 @@ uninteresting.  Also tables look terrible when wrapped."
   :group 'org-startup
   :type 'boolean)
 
-(defcustom org-startup-indented nil
-  "Non-nil means, turn on `org-indent-mode' on startup.
-This can also be configured on a per-file basis by adding one of
-the following lines anywhere in the buffer:
-
-   #+STARTUP: localindent
-   #+STARTUP: indent
-   #+STARTUP: noindent"
-  :group 'org-structure
-  :type '(choice
-	  (const :tag "Not" nil)
-	  (const :tag "Locally" local)
-	  (const :tag "Globally (slow on startup in large files)" t)))
-
 (defcustom org-startup-align-all-tables nil
   "Non-nil means, align all tables when visiting a file.
 This is useful when the column width in tables is forced with <N> cookies
@@ -554,6 +540,7 @@ following headline.
 Special case: when 0, never leave empty lines in collapsed view."
   :group 'org-cycle
   :type 'integer)
+(put 'org-cycle-separator-lines 'safe-local-variable 'integerp)
 
 (defcustom org-cycle-hook '(org-cycle-hide-archived-subtrees
 			    org-cycle-hide-drawers
-- 
2.11.4.GIT