summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReuben Thomas <rrt@sc3d.org>2016-10-21 15:23:08 +0100
committerReuben Thomas <rrt@sc3d.org>2016-11-03 12:16:56 +0000
commita55c582fdb98d87268fd11e5568d73010cfe0a45 (patch)
treef13860c88d35a185854120de9948f94fcac4e8d6
parent96f3ae900f0e12b423725d06ed0d456bba21501e (diff)
downloademacs-a55c582fdb98d87268fd11e5568d73010cfe0a45.tar.gz
Fix whitespace-space-after-tab-regexp
* lisp/whitespace.el (whitespace-space-after-tab-regexp) (whitespace-regexp): Match all the spaces after tabs for highlighting, not just the first tab-width. Fix whitespace-space-after-tab::space version so that it requires at least tab-width spaces, not just 1. (Bug#24745)
-rw-r--r--lisp/whitespace.el20
1 files changed, 11 insertions, 9 deletions
diff --git a/lisp/whitespace.el b/lisp/whitespace.el
index 1986b525d42..2cf014cc53e 100644
--- a/lisp/whitespace.el
+++ b/lisp/whitespace.el
@@ -737,8 +737,8 @@ Used when `whitespace-style' includes `empty'."
(defcustom whitespace-space-after-tab-regexp
- '("\t+\\(\\( \\{%d\\}\\)+\\)"
- . "\\(\t+\\) +")
+ '("\t+\\(\\( \\{%d,\\}\\)+\\)"
+ . "\\(\t+\\) \\{%d,\\}")
"Specify regexp for 8 or more SPACEs after TAB.
It is a cons where the cons car is used for SPACEs visualization
@@ -1566,13 +1566,15 @@ See also `tab-width'."
(defun whitespace-regexp (regexp &optional kind)
"Return REGEXP depending on `whitespace-indent-tabs-mode'."
- (cond
- ((or (eq kind 'tab)
- whitespace-indent-tabs-mode)
- (format (car regexp) whitespace-tab-width))
- ((or (eq kind 'space)
- (not whitespace-indent-tabs-mode))
- (cdr regexp))))
+ (format
+ (cond
+ ((or (eq kind 'tab)
+ whitespace-indent-tabs-mode)
+ (car regexp))
+ ((or (eq kind 'space)
+ (not whitespace-indent-tabs-mode))
+ (cdr regexp)))
+ whitespace-tab-width))
(defun whitespace-indentation-regexp (&optional kind)