diff options
| author | Bastien Guerry <bzg@altern.org> | 2012-04-10 23:39:16 +0200 |
|---|---|---|
| committer | Bastien Guerry <bzg@altern.org> | 2012-04-10 23:39:16 +0200 |
| commit | f42e40d978997368ea1107419ce938096c9a0ca1 (patch) | |
| tree | 5004d07fcb6ac1095cb2887ce00cc56005257a1e | |
| parent | 990558eb211980a9da5eafe045a444d906b23f3c (diff) | |
| parent | 9586c880b7dcb5b042d63e61f6460fb5b5bbb78b (diff) | |
| download | org-mode-f42e40d978997368ea1107419ce938096c9a0ca1.tar.gz | |
Merge branch 'hotfix'
| -rw-r--r-- | lisp/org-pcomplete.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/org-pcomplete.el b/lisp/org-pcomplete.el index 7a4dc0d..3e029ff 100644 --- a/lisp/org-pcomplete.el +++ b/lisp/org-pcomplete.el @@ -72,7 +72,7 @@ The return value is a string naming the thing at point." (re-search-backward "^[ \t]*#\\+\\([A-Z_]+\\):.*" (line-beginning-position) t)) (cons "file-option" (match-string-no-properties 1))) - ((string-match "\\`[ \t]*#\\+[a-zA-Z]*\\'" line-to-here) + ((string-match "\\`[ \t]*#\\+[a-zA-Z_]*\\'" line-to-here) (cons "file-option" nil)) ((equal (char-before beg) ?\[) (cons "link" nil)) @@ -155,7 +155,7 @@ When completing for #+STARTUP, for example, this function returns (if (string-match "^#\\+\\([A-Z_]+:?\\)" x) (match-string 1 x))) (org-split-string (org-get-current-options) "\n")) - org-additional-option-like-keywords))))) + (copy-sequence org-additional-option-like-keywords)))))) (substring pcomplete-stub 2))) (defvar org-startup-options) |