From 73fba1d46f72695685084403214cc744bf8c8ff4 Mon Sep 17 00:00:00 2001
From: Carsten Dominik <carsten.dominik@gmail.com>
Date: Mon, 4 Feb 2008 12:08:21 +0100
Subject: [PATCH] Support for aling.el.

---
 ChangeLog | 1 +
 org.el    | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 88f5f182b..9fcb66bd3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
 	(org-schedule, org-deadline): Use
 	`org-remove-timestamp-with-keyword' to make sure all such time
 	stamps are removed.
+	(org-mode): Support for `align'.
 
 2008-02-03  Carsten Dominik  <dominik@science.uva.nl>
 
diff --git a/org.el b/org.el
index e91fd0b5b..bdf1e91d2 100644
--- a/org.el
+++ b/org.el
@@ -4905,6 +4905,13 @@ The following commands are available:
 ;  (org-set-local 'comment-start "#") ;; FIXME: this breaks wrapping
   (org-set-local 'comment-padding " ")
 
+  ;; Align options lines
+  (org-set-local
+   'align-mode-rules-list
+   '((org-in-buffer-settings
+      (regexp . "^#\\+[A-Z_]+:\\(\\s-*\\)\\S-+")
+      (modes . '(org-mode)))))
+
   ;; Imenu
   (org-set-local 'imenu-create-index-function
 		 'org-imenu-get-tree)