From: Tom Willemse <tom@ryuslash.org>
Date: Sun, 19 Apr 2015 01:07:16 +0000 (-0700)
Subject: * lisp/elec-pair.el (electric-pair-post-self-insert-function): Do not use `chomp... 
X-Git-Tag: emacs-25.0.90~2372
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ef6302ff1a95fbb86a575d3124717ae2557181e5;p=emacs.git

* lisp/elec-pair.el (electric-pair-post-self-insert-function): Do not use `chomp' as a function.

Fixes: debbugs:19505
Copyright-paperwork-exempt: yes
---

diff --git a/lisp/elec-pair.el b/lisp/elec-pair.el
index 562b29467c1..db812c9e121 100644
--- a/lisp/elec-pair.el
+++ b/lisp/elec-pair.el
@@ -475,7 +475,8 @@ happened."
                      (when (and (not (and unconditional
                                           (eq syntax ?\")))
                                 (setq skip-whitespace-info
-                                      (if (functionp electric-pair-skip-whitespace)
+                                      (if (and (not (eq electric-pair-skip-whitespace 'chomp))
+                                               (functionp electric-pair-skip-whitespace))
                                           (funcall electric-pair-skip-whitespace)
                                         electric-pair-skip-whitespace)))
                        (electric-pair--skip-whitespace))