[elpa] externals/org 1a6d5f11d0 3/3: Merge branch 'bugfix'

[ELPA Syncer]

branch: externals/org
commit 1a6d5f11d05e87802aa4ce6349a0576be0401ac9
Merge: f53205a443 638e0ecc0b
Author: Ihor Radchenko <yantar92@posteo.net>
Commit: Ihor Radchenko <yantar92@posteo.net>

    Merge branch 'bugfix'
---
 lisp/org.el | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/lisp/org.el b/lisp/org.el
index 694e40e231..10ade32dda 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -10226,7 +10226,7 @@ nil."
        (replace-match "")
         (if (and (string-match "\\S-" (buffer-substring 
(line-beginning-position) (point)))
                 (equal (char-before) ?\ ))
-           (backward-delete-char 1)
+           (delete-char -1)
          (when (string-match "^[ \t]*$" (buffer-substring
                                           (line-beginning-position) 
(line-end-position)))
             (delete-region (line-beginning-position)
@@ -12017,18 +12017,17 @@ Returns the new tags string, or nil to not change the 
current settings."
                    (setq current nil)
                    (when exit-after-next (setq exit-after-next 'now)))
                   ((= c ?\t)
-                    (condition-case nil
-                        (unless tab-tags
-                          (setq tab-tags
-                                (delq nil
-                                      (mapcar (lambda (x)
-                                                (let ((item (car-safe x)))
-                                                  (and (stringp item)
-                                                       (list item))))
-                                              (org--tag-add-to-alist
-                                               (with-current-buffer buf
-                                                 (org-get-buffer-tags))
-                                               table))))))
+                    (unless tab-tags
+                      (setq tab-tags
+                            (delq nil
+                                  (mapcar (lambda (x)
+                                            (let ((item (car-safe x)))
+                                              (and (stringp item)
+                                                   (list item))))
+                                          (org--tag-add-to-alist
+                                           (with-current-buffer buf
+                                             (org-get-buffer-tags))
+                                           table)))))
                     (setq tg (completing-read "Tag: " tab-tags))
                    (when (string-match "\\S-" tg)
                      (cl-pushnew (list tg) tab-tags :test #'equal)
@@ -16530,7 +16529,7 @@ because, in this case the deletion might narrow the 
column."
             (looking-at-p ".*?|")
             (org-at-table-p))
        (progn (forward-char -1) (org-delete-char 1))
-      (backward-delete-char N)
+      (funcall-interactively #'backward-delete-char N)
       (org-fix-tags-on-the-fly))))
 
 (defun org-delete-char (N)