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

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2017-01-22 14:29:05 +01:00
parent 9dafef9fa8 12a23d6c61
commit eda4684d35
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lisp/org.el
View File

@ -16000,13 +16000,10 @@ If yes, return this value. If not, return the current value of the variable."
"Delete PROPERTY from entry at point-or-marker POM. "Delete PROPERTY from entry at point-or-marker POM.
Accumulated properties, i.e. PROPERTY+, are also removed. Return Accumulated properties, i.e. PROPERTY+, are also removed. Return
non-nil when a property was removed." non-nil when a property was removed."
(unless (member property org-special-properties)
(org-with-point-at pom (org-with-point-at pom
(let ((range (org-get-property-block))) (pcase (org-get-property-block)
(when range (`(,begin . ,origin)
(let* ((begin (car range)) (let* ((end (copy-marker origin))
(origin (cdr range))
(end (copy-marker origin))
(re (org-re-property (re (org-re-property
(concat (regexp-quote property) "\\+?") t t))) (concat (regexp-quote property) "\\+?") t t)))
(goto-char begin) (goto-char begin)
@ -16017,7 +16014,8 @@ non-nil when a property was removed."
(delete-region (line-beginning-position 0) (delete-region (line-beginning-position 0)
(line-beginning-position 2))) (line-beginning-position 2)))
;; Return non-nil if some property was removed. ;; Return non-nil if some property was removed.
(prog1 (/= end origin) (set-marker end nil)))))))) (prog1 (/= end origin) (set-marker end nil))))
(_ nil))))
;; Multi-values properties are properties that contain multiple values ;; Multi-values properties are properties that contain multiple values
;; These values are assumed to be single words, separated by whitespace. ;; These values are assumed to be single words, separated by whitespace.

7
testing/lisp/test-org.el
View File

@ -4220,7 +4220,12 @@ Paragraph<point>"
(org-entry-delete (point) "A"))) (org-entry-delete (point) "A")))
(should-not (should-not
(org-test-with-temp-text "* H\n:PROPERTIES:\n:A: 1\n:B: 2\n:END:" (org-test-with-temp-text "* H\n:PROPERTIES:\n:A: 1\n:B: 2\n:END:"
(org-entry-delete (point) "C")))) (org-entry-delete (point) "C")))
;; Special properties cannot be located in a drawer. Allow to
;; remove them anyway, in case of user error.
(should
(org-test-with-temp-text "* H\n:PROPERTIES:\n:SCHEDULED: 1\n:END:"
(org-entry-delete (point) "SCHEDULED"))))
(ert-deftest test-org/entry-get () (ert-deftest test-org/entry-get ()
"Test `org-entry-get' specifications." "Test `org-entry-get' specifications."