Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode

This commit is contained in:
Carsten Dominik 2010-02-25 15:40:01 +01:00
commit 094593e0db
2 changed files with 6 additions and 2 deletions

View File

@ -1,3 +1,7 @@
2010-02-25 Bastien Guerry <bzg@altern.org>
* org.el (org-set-property): Remove useless space in the prompt.
2010-02-25 Carsten Dominik <carsten.dominik@gmail.com>
* org-html.el (org-export-html-style-default): Add a default style

View File

@ -12952,8 +12952,8 @@ in the current file."
(caar allowed))))
(let (org-completion-use-ido org-completion-use-iswitchb)
(org-completing-read
(concat "Value " (if (and cur (string-match "\\S-" cur))
(concat "[" cur "]") "")
(concat "Value" (if (and cur (string-match "\\S-" cur))
(concat " [" cur "]") "")
": ")
existing nil nil "" nil cur)))))
(list prop (if (equal val "") cur val))))