ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint' 

Conflicts:
	lisp/org.el
This commit is contained in:
Bastien Guerry 2014-06-02 15:57:41 +02:00
parent 024a05b451 89cb26ed17
commit 3518403790
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lisp/org.el
View File

@ -6276,7 +6276,7 @@ Use `org-reduced-level' to remove the effect of `org-odd-levels'."
".*?\\)\\(?5:[ \t]*\\)$")) ".*?\\)\\(?5:[ \t]*\\)$"))
(defconst org-property-re (defconst org-property-re
(org-re-property ".*?" 'literal) (org-re-property ".*?" 'literal t)
"Regular expression matching a property line. "Regular expression matching a property line.
There are four matching groups: There are four matching groups:
1: :PROPKEY: including the leading and trailing colon, 1: :PROPKEY: including the leading and trailing colon,
@ -15621,7 +15621,7 @@ If yes, return this value. If not, return the current value of the variable."
(if (and range (if (and range
(goto-char (car range)) (goto-char (car range))
(re-search-forward (re-search-forward
(org-re-property property) (org-re-property property nil t)
(cdr range) t)) (cdr range) t))
(progn (progn
(delete-region (match-beginning 0) (1+ (point-at-eol))) (delete-region (match-beginning 0) (1+ (point-at-eol)))
@ -15991,9 +15991,7 @@ This is computed according to `org-property-set-functions-alist'."
(funcall set-function prompt (funcall set-function prompt
(mapcar 'list (org-property-values property)) (mapcar 'list (org-property-values property))
nil nil "" nil cur))))) nil nil "" nil cur)))))
(if (equal val "") (org-trim val)))
cur
val)))
(defvar org-last-set-property nil) (defvar org-last-set-property nil)
(defvar org-last-set-property-value nil) (defvar org-last-set-property-value nil)
@ -16069,8 +16067,10 @@ in the current file."
(org-icompleting-read "Property: " props nil t) (org-icompleting-read "Property: " props nil t)
(caar props)))) (caar props))))
(list prop))) (list prop)))
(if (org-entry-delete nil property) (if (not property)
(message "Property %s deleted" property))) (message "No property to delete in this entry")
(org-entry-delete nil property delete-empty-drawer)
(message "Property \"%s\" deleted" property)))
(defun org-delete-property-globally (property) (defun org-delete-property-globally (property)
"Remove PROPERTY globally, from all entries." "Remove PROPERTY globally, from all entries."