Merge branch 'maint'

lisp/org-ascii.el

@@ -567,7 +567,7 @@ publishing directory."
   (while (re-search-forward org-verbatim-re nil t)
     (org-if-unprotected-at (match-beginning 4)
       (goto-char (match-end 2))
-      (delete-backward-char 1) (insert "'")
+      (backward-delete-char 1) (insert "'")
       (goto-char (match-beginning 2))
       (delete-char 1) (insert "`")
       (goto-char (match-end 2))))

lisp/org-clock.el

@@ -2442,7 +2442,7 @@ from the dynamic block definition."
 	     )))))
     ;; When exporting subtrees or regions the region might be
     ;; activated, so let's disable ̀delete-active-region'
-    (let ((delete-active-region nil)) (delete-backward-char 1))
+    (let ((delete-active-region nil)) (backward-delete-char 1))
     (if (setq formula (plist-get params :formula))
 	(cond
 	 ((eq formula '%)

lisp/org-latex.el

@@ -1353,7 +1353,7 @@ numbered sections and lower levels as unnumbered sections."
 	(insert (org-export-latex-content content))
 	(cond ((stringp subcontent) (insert subcontent))
 	      ((listp subcontent)
-	       (while (org-looking-back "\n\n") (delete-backward-char 1))
+	       (while (org-looking-back "\n\n") (backward-delete-char 1))
 	       (org-export-latex-sub subcontent)))
 	(when (and end (string-match "[^ \t]" end))
 	  (let ((hook (org-get-text-property-any 0 'org-insert-hook end)))

lisp/org-table.el

@@ -3590,7 +3590,7 @@ With prefix ARG, apply the new formulas to the table."
 	    (beginning-of-line 1)
 	    (insert ind))
 	  (goto-char (point-max))
-	  (delete-backward-char 1)))
+	  (org-delete-backward-char 1)))
       (goto-char beg))
      (t nil))))
 
@@ -4245,7 +4245,7 @@ overwritten, and the table is not marked as requiring realignment."
 	   (looking-at "[^|\n]*  +|"))
       (let (org-table-may-need-update)
 	(goto-char (1- (match-end 0)))
-	(delete-backward-char 1)
+	(org-delete-backward-char 1)
 	(goto-char (match-beginning 0))
 	(self-insert-command N))
     (setq org-table-may-need-update t)

lisp/org.el

@@ -1303,7 +1303,7 @@ do the following:
   TAB or RET are pressed to move to another field.  With optimization this
   happens only if changes to a field might have changed the column width.
 Optimization requires replacing the functions `self-insert-command',
-`delete-char', and `delete-backward-char' in Org-mode buffers, with a
+`delete-char', and `backward-delete-char' in Org-mode buffers, with a
 slight (in fact: unnoticeable) speed impact for normal typing.  Org-mode is
 very good at guessing when a re-align will be necessary, but you can always
 force one with \\[org-ctrl-c-ctrl-c].
@@ -7307,7 +7307,7 @@ This is important for non-interactive uses of the command."
 	(insert head) (just-one-space)
 	(setq pos (point))
 	(end-of-line 1)
-	(unless (= (point) pos) (just-one-space) (delete-backward-char 1))
+	(unless (= (point) pos) (just-one-space) (backward-delete-char 1))
         (when (and org-insert-heading-respect-content hide-previous)
 	  (save-excursion
 	    (goto-char previous-pos)
@@ -12529,7 +12529,7 @@ nil."
 	(replace-match "")
 	(if (and (string-match "\\S-" (buffer-substring (point-at-bol) (point)))
 		 (equal (char-before) ?\ ))
-	    (delete-backward-char 1)
+	    (backward-delete-char 1)
 	  (if (string-match "^[ \t]*$" (buffer-substring
 					(point-at-bol) (point-at-eol)))
 	      (delete-region (point-at-bol)
@@ -18597,7 +18597,7 @@ overwritten, and the table is not marked as requiring realignment."
      (looking-at "[^|\n]*  |"))
     (let (org-table-may-need-update)
       (goto-char (1- (match-end 0)))
-      (delete-backward-char 1)
+      (backward-delete-char 1)
       (goto-char (match-beginning 0))
       (self-insert-command N)))
    (t
@@ -18671,7 +18671,7 @@ The detailed reaction depends on the user option `org-catch-invisible-edits'."
     (org-align-tags-here org-tags-column)))
 
 (defun org-delete-backward-char (N)
-  "Like `delete-backward-char', but insert whitespace at field end in tables.
+  "Like `delete-backward-char', insert whitespace at field end in tables.
 When deleting backwards, in tables this function will insert whitespace in
 front of the next \"|\" separator, to keep the table aligned.  The table will
 still be marked for re-alignment if the field did fill the entire column,
@@ -18686,7 +18686,7 @@ because, in this case the deletion might narrow the column."
 	(let ((pos (point))
 	      (noalign (looking-at "[^|\n\r]*  |"))
 	      (c org-table-may-need-update))
-	  (delete-backward-char N)
+	  (backward-delete-char N)
 	  (if (not overwrite-mode)
 	      (progn
 		(skip-chars-forward "^|")
@@ -18695,7 +18695,7 @@ because, in this case the deletion might narrow the column."
 	  ;; noalign: if there were two spaces at the end, this field
 	  ;; does not determine the width of the column.
 	  (if noalign (setq org-table-may-need-update c)))
-      (delete-backward-char N)
+      (backward-delete-char N)
       (org-fix-tags-on-the-fly))))
 
 (defun org-delete-char (N)
@@ -18705,8 +18705,8 @@ front of the next \"|\" separator, to keep the table aligned.  The table will
 still be marked for re-alignment if the field did fill the entire column,
 because, in this case the deletion might narrow the column."
   (interactive "p")
-  (org-check-before-invisible-edit 'delete)
   (save-match-data
+    (org-check-before-invisible-edit 'delete)
     (if (and (org-table-p)
 	     (not (bolp))
 	     (not (= (char-after) ?|))