(completion-separator-self-insert-command)

(completion-separator-self-insert-autofilling):
If `self-insert-command' has been remapped, use the substitute.

1 files changed, 10 insertions, 6 deletions

diff --git a/lisp/completion.el b/lisp/completion.el
index b8bf5bd93b8..c2e9ac9493f 100644
--- a/lisp/completion.el
+++ b/lisp/completion.el
@@ -2231,15 +2231,19 @@ Patched to remove the most recent completion."
 
 (defun completion-separator-self-insert-command (arg)
   (interactive "p")
-  (use-completion-before-separator)
-  (self-insert-command arg))
+  (if (command-remapping 'self-insert-command)
+      (funcall (command-remapping 'self-insert-command) arg)
+    (use-completion-before-separator)
+    (self-insert-command arg)))
 
 (defun completion-separator-self-insert-autofilling (arg)
   (interactive "p")
-  (use-completion-before-separator)
-  (self-insert-command arg)
-  (and auto-fill-function
-       (funcall auto-fill-function)))
+  (if (command-remapping 'self-insert-command)
+      (funcall (command-remapping 'self-insert-command) arg)
+    (use-completion-before-separator)
+    (self-insert-command arg)
+    (and auto-fill-function
+         (funcall auto-fill-function))))
 
 ;;-----------------------------------------------
 ;; Wrapping Macro