summaryrefslogtreecommitdiffstats
path: root/emacs-git/0001-Always-treat-chomp-as-a-symbol.patch
diff options
context:
space:
mode:
Diffstat (limited to 'emacs-git/0001-Always-treat-chomp-as-a-symbol.patch')
-rw-r--r--emacs-git/0001-Always-treat-chomp-as-a-symbol.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/emacs-git/0001-Always-treat-chomp-as-a-symbol.patch b/emacs-git/0001-Always-treat-chomp-as-a-symbol.patch
new file mode 100644
index 0000000..c6cea31
--- /dev/null
+++ b/emacs-git/0001-Always-treat-chomp-as-a-symbol.patch
@@ -0,0 +1,36 @@
+From d7e6e8f2ff3572afb4131ea64966b2a9253f9ac6 Mon Sep 17 00:00:00 2001
+From: Tom Willemse <tom@ryuslash.org>
+Date: Sun, 4 Jan 2015 05:37:02 +0100
+Subject: [PATCH] Always treat chomp as a symbol
+
+---
+ lisp/ChangeLog | 5 +++++
+ lisp/elec-pair.el | 3 ++-
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/lisp/ChangeLog b/lisp/ChangeLog
+index aa79a8d..b031f25 100644
+--- a/lisp/ChangeLog
++++ b/lisp/ChangeLog
+@@ -1,3 +1,5 @@
++2015-01-04 Tom Willemse <tom@ryuslash.org>
++
++ * elec-pair.el (electric-pair-post-self-insert-function): Make
++ sure chomp isn't used as a function.
++
+diff --git a/lisp/elec-pair.el b/lisp/elec-pair.el
+index 2cede62..65c3dbf 100644
+--- a/lisp/elec-pair.el
++++ b/lisp/elec-pair.el
+@@ -475,7 +475,8 @@ (defun electric-pair-post-self-insert-function
+ (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))
+--
+2.2.1