From bd8e4e248a2d4a64f429ed5a5dbedbd75ad43c93 Mon Sep 17 00:00:00 2001 From: Carsten Dominik Date: Mon, 10 Aug 2009 14:09:04 +0200 Subject: [PATCH] Fix problem with completing #+STARTUP --- lisp/org.el | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 8bd6deff9..639da00e1 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -9056,11 +9056,14 @@ At all other locations, this simply calls the value of (setq type :opt) (require 'org-exp) (append - (mapcar - (lambda (x) - (string-match "^#\\+\\(\\([A-Z_]+:?\\).*\\)" x) - (cons (match-string 2 x) (match-string 1 x))) - (org-split-string (org-get-current-options) "\n")) + (delq nil + (mapcar + (lambda (x) + (if (string-match + "^#\\+\\(\\([A-Z_]+:?\\).*\\)" x) + (cons (match-string 2 x) + (match-string 1 x)))) + (org-split-string (org-get-current-options) "\n"))) (mapcar 'list org-additional-option-like-keywords))) (startup (setq type :startup)