summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <n.goaziou@gmail.com>2014-03-12 19:54:05 +0100
committerNicolas Goaziou <n.goaziou@gmail.com>2014-03-12 21:30:13 +0100
commit07158efa53d9e5113cc433b583f41ccd06eb70d7 (patch)
tree68a624f668328958de292b9c8d4c5ca092e2224d
parentc62b19eb2a7119d4effeeaec1c9d405b52f58c1b (diff)
downloadorg-mode-07158efa53d9e5113cc433b583f41ccd06eb70d7.tar.gz
Ignore indentation for all keywords
* lisp/org-archive.el (org-get-local-archive-location): Ignore identation for ARCHIVE keywords. * lisp/org-colview.el (org-columns-store-format): Ignore indentation for COLUMNS keywords. * lisp/org.el (org-mode): Keywords can start at any column. (org-reftex-citation): Ignore indentation for BIBLIOGRAPHY keywords. (org-make-options-regexp): Ignore indentation for all keywords.
-rw-r--r--lisp/org-archive.el2
-rw-r--r--lisp/org-colview.el2
-rw-r--r--lisp/org.el6
3 files changed, 5 insertions, 5 deletions
diff --git a/lisp/org-archive.el b/lisp/org-archive.el
index 6deac47..2473d7d 100644
--- a/lisp/org-archive.el
+++ b/lisp/org-archive.el
@@ -121,7 +121,7 @@ information."
(defun org-get-local-archive-location ()
"Get the archive location applicable at point."
- (let ((re "^#\\+ARCHIVE:[ \t]+\\(\\S-.*\\S-\\)[ \t]*$")
+ (let ((re "^[ \t]*#\\+ARCHIVE:[ \t]+\\(\\S-.*\\S-\\)[ \t]*$")
prop)
(save-excursion
(save-restriction
diff --git a/lisp/org-colview.el b/lisp/org-colview.el
index 705a29c..07d140f 100644
--- a/lisp/org-colview.el
+++ b/lisp/org-colview.el
@@ -900,7 +900,7 @@ display, or in the #+COLUMNS line of the current buffer."
(org-entry-put nil "COLUMNS" fmt)
(goto-char (point-min))
;; Overwrite all #+COLUMNS lines....
- (while (re-search-forward "^#\\+COLUMNS:.*" nil t)
+ (while (re-search-forward "^[ \t]*#\\+COLUMNS:.*" nil t)
(setq cnt (1+ cnt))
(replace-match (concat "#+COLUMNS: " fmt) t t))
(unless (> cnt 0)
diff --git a/lisp/org.el b/lisp/org.el
index 8d1140b..1ad5e69 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -5464,7 +5464,7 @@ The following commands are available:
(org-set-local
'align-mode-rules-list
'((org-in-buffer-settings
- (regexp . "^#\\+[A-Z_]+:\\(\\s-*\\)\\S-+")
+ (regexp . "^[ \t]*#\\+[A-Z_]+:\\(\\s-*\\)\\S-+")
(modes . '(org-mode)))))
;; Imenu
@@ -22980,7 +22980,7 @@ package ox-bibtex by Taru Karttunen."
(save-restriction
(widen)
(let ((case-fold-search t)
- (re "^#\\+bibliography:[ \t]+\\([^ \t\n]+\\)"))
+ (re "^[ \t]*#\\+BIBLIOGRAPHY:[ \t]+\\([^ \t\n]+\\)"))
(if (not (save-excursion
(or (re-search-forward re nil t)
(re-search-backward re nil t))))
@@ -23981,7 +23981,7 @@ Show the heading too, if it is currently invisible."
(defun org-make-options-regexp (kwds &optional extra)
"Make a regular expression for keyword lines."
(concat
- "^#\\+\\("
+ "^[ \t]*#\\+\\("
(mapconcat 'regexp-quote kwds "\\|")
(if extra (concat "\\|" extra))
"\\):[ \t]*\\(.*\\)"))