summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-12-07 08:17:46 +0100
committerBastien Guerry <bzg@altern.org>2013-12-07 08:17:46 +0100
commit0eb020a3779f042bf87bed8e9261f27e6c79d9b7 (patch)
tree59c55ce66cc968ee95a2c1262624ce3d2b77338f
parentea9d55d8d7376752975996a6aad7970485139976 (diff)
parent7fe99af695e78f66a732127fa9e2d88351df0f4d (diff)
downloadorg-mode-0eb020a3779f042bf87bed8e9261f27e6c79d9b7.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org.el10
1 files changed, 8 insertions, 2 deletions
diff --git a/lisp/org.el b/lisp/org.el
index 9b406b6..eeb0c33 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -19600,8 +19600,14 @@ because, in this case the deletion might narrow the column."
(org-fix-tags-on-the-fly))))
;; Make `delete-selection-mode' work with org-mode and orgtbl-mode
-(put 'org-self-insert-command 'delete-selection t)
-(put 'orgtbl-self-insert-command 'delete-selection t)
+(put 'org-self-insert-command 'delete-selection
+ (lambda ()
+ (not (run-hook-with-args-until-success
+ 'self-insert-uses-region-functions))))
+(put 'orgtbl-self-insert-command 'delete-selection
+ (lambda ()
+ (not (run-hook-with-args-until-success
+ 'self-insert-uses-region-functions))))
(put 'org-delete-char 'delete-selection 'supersede)
(put 'org-delete-backward-char 'delete-selection 'supersede)
(put 'org-yank 'delete-selection 'yank)