2 files changed, 21 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f59b457252c..7ea8d3aa116 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2010-09-01  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * simple.el (blink-paren-function): Move from C to here.
+        (blink-paren-post-self-insert-function): New function.
+        (post-self-insert-hook): Use it.
+
         * emacs-lisp/pcase.el (pcase-split-memq):
         Fix overenthusiastic optimisation.
         (pcase-u1): Handle the case of a lambda pred.
diff --git a/lisp/simple.el b/lisp/simple.el
index 6a99f785852..610698cc09b 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -5607,7 +5607,23 @@ it skips the contents of comments that end before point."
             (message "Matches %s"
                      (substring-no-properties open-paren-line-string)))))))))
 
-(setq blink-paren-function 'blink-matching-open)
+(defvar blink-paren-function 'blink-matching-open
+  "Function called, if non-nil, whenever a close parenthesis is inserted.
+More precisely, a char with closeparen syntax is self-inserted.")
+
+(defun blink-paren-post-self-insert-function ()
+  (when (and (eq (char-before) last-command-event) ; Sanity check.
+             (memq (char-syntax last-command-event) '(?\) ?\$))
+             blink-paren-function
+             (not executing-kbd-macro)
+             (not noninteractive))
+    (funcall blink-paren-function)))
+
+(add-hook 'post-self-insert-hook #'blink-paren-post-self-insert-function
+          ;; Most likely, this hook is nil, so this arg doesn't matter,
+          ;; but I use it as a reminder that this function usually
+          ;; likes to be run after others since it does `sit-for'.
+          'append)
 
 ;; This executes C-g typed while Emacs is waiting for a command.
 ;; Quitting out of a program does not go through here;