From a9a8cbe39b09ea9fa4051629a8a21fb3c1167ca1 Mon Sep 17 00:00:00 2001 From: Carsten Dominik Date: Fri, 12 Mar 2010 18:02:51 +0100 Subject: [PATCH] Revert part of Mikael Fornius' patch --- lisp/ChangeLog | 3 +++ lisp/org.el | 7 ++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 28febc170..14bd639cc 100755 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2010-03-12 Carsten Dominik + * org.el (org-set-property, org-delete-property): Go back to + prompting for the property. + * org-latex.el (org-export-latex-make-header): Fully process author line. (org-export-latex-fontify-headline): Allow several arguments, not diff --git a/lisp/org.el b/lisp/org.el index a4932a2bc..72dfa9d05 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -12986,8 +12986,7 @@ in the current file." (interactive (let* ((completion-ignore-case t) (keys (org-buffer-property-keys nil t t)) - (prop0 (or (when (org-at-property-p) (org-match-string-no-properties 2)) - (org-icompleting-read "Property: " (mapcar 'list keys)))) + (prop0 (org-icompleting-read "Property: " (mapcar 'list keys))) (prop (if (member prop0 keys) prop0 (or (cdr (assoc (downcase prop0) @@ -13014,9 +13013,7 @@ in the current file." "In the current entry, delete PROPERTY." (interactive (let* ((completion-ignore-case t) - (prop (or (when (org-at-property-p) (org-match-string-no-properties 2)) - (org-icompleting-read - "Property: " (org-entry-properties nil 'standard))))) + (prop (org-icompleting-read "Property: " (org-entry-properties nil 'standard)))) (list prop))) (message "Property %s %s" property (if (org-entry-delete nil property)