mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 04:10:54 -08:00
Code Issues Projects Releases Wiki Activity

Fix reading of tab settings in whitespace-mode

Browse source 
lisp/whitespace.el (whitespace-indent-tabs-mode)
whitespace-tab-width): Remove these variables. The underlying
variables `indent-tabs-mode' and `tab-width' are already buffer-local
when needed, and whitespace-mode never changes them.
(whitespace-ensure-local-variables): Remove this function, which only
existed to set the above variables.
(whitespace-cleanup-region, whitespace-regexp)
(whitespace-indentation-regexp, whitespace-report-region)
(whitespace-turn-on, whitespace-color-on): Adjust these functions to
use `indent-tabs-mode' and `tab-width' directly, and not call
`whitespace-ensure-local-variables'.
This commit is contained in:
Reuben Thomas 2017-03-02 12:50:06 +00:00 • committed by Noam Postavsky
parent d490770dd0
commit a6b375ba4b
1 changed files with 18 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

52
lisp/whitespace.el
View file

@ -1134,12 +1134,6 @@ SYMBOL is a valid symbol associated with CHAR.
(defvar whitespace-active-style nil
"Used to save locally `whitespace-style' value.")
(defvar whitespace-indent-tabs-mode indent-tabs-mode
"Used to save locally `indent-tabs-mode' value.")
(defvar whitespace-tab-width tab-width
"Used to save locally `tab-width' value.")
(defvar whitespace-point (point)
"Used to save locally current point value.
Used by function `whitespace-trailing-regexp' (which see).")
@ -1415,12 +1409,6 @@ documentation."
;; PROBLEM 6: `tab-width' or more SPACEs after TAB
(whitespace-cleanup-region (point-min) (point-max)))))
(defun whitespace-ensure-local-variables ()
"Set `whitespace-indent-tabs-mode' and `whitespace-tab-width' locally."
(set (make-local-variable 'whitespace-indent-tabs-mode)
indent-tabs-mode)
(set (make-local-variable 'whitespace-tab-width)
tab-width))
;;;###autoload
(defun whitespace-cleanup-region (start end)
@ -1467,11 +1455,8 @@ documentation."
;; read-only buffer
(whitespace-warn-read-only "cleanup region")
;; non-read-only buffer
(whitespace-ensure-local-variables)
(let ((rstart (min start end))
(rend (copy-marker (max start end)))
(indent-tabs-mode whitespace-indent-tabs-mode)
(tab-width whitespace-tab-width)
overwrite-mode ; enforce no overwrite
tmp)
(save-excursion
@ -1512,7 +1497,7 @@ documentation."
;; by SPACEs.
((memq 'space-after-tab whitespace-style)
(whitespace-replace-action
(if whitespace-indent-tabs-mode 'tabify 'untabify)
(if indent-tabs-mode 'tabify 'untabify)
rstart rend (whitespace-space-after-tab-regexp) 1))
;; ACTION: replace `tab-width' or more SPACEs by TABs.
((memq 'space-after-tab::tab whitespace-style)
@ -1531,9 +1516,9 @@ documentation."
;; by SPACEs.
((memq 'space-before-tab whitespace-style)
(whitespace-replace-action
(if whitespace-indent-tabs-mode 'tabify 'untabify)
(if indent-tabs-mode 'tabify 'untabify)
rstart rend whitespace-space-before-tab-regexp
(if whitespace-indent-tabs-mode 0 2)))
(if indent-tabs-mode 0 2)))
;; ACTION: replace SPACEs before TAB by TABs.
((memq 'space-before-tab::tab whitespace-style)
(whitespace-replace-action
@ -1564,25 +1549,25 @@ See also `tab-width'."
(defun whitespace-regexp (regexp &optional kind)
"Return REGEXP depending on `whitespace-indent-tabs-mode'."
"Return REGEXP depending on `indent-tabs-mode'."
(format
(cond
((or (eq kind 'tab)
whitespace-indent-tabs-mode)
indent-tabs-mode)
(car regexp))
((or (eq kind 'space)
(not whitespace-indent-tabs-mode))
(not indent-tabs-mode))
(cdr regexp)))
whitespace-tab-width))
tab-width))
(defun whitespace-indentation-regexp (&optional kind)
"Return the indentation regexp depending on `whitespace-indent-tabs-mode'."
"Return the indentation regexp depending on `indent-tabs-mode'."
(whitespace-regexp whitespace-indentation-regexp kind))
(defun whitespace-space-after-tab-regexp (&optional kind)
"Return the space-after-tab regexp depending on `whitespace-indent-tabs-mode'."
"Return the space-after-tab regexp depending on `indent-tabs-mode'."
(whitespace-regexp whitespace-space-after-tab-regexp kind))
@ -1744,10 +1729,10 @@ cleaning up these problems."
whitespace-report-list)))
(when (pcase report-if-bogus (`nil t) (`never nil) (_ has-bogus))
(whitespace-kill-buffer whitespace-report-buffer-name)
;; `whitespace-indent-tabs-mode' is local to current buffer
;; `whitespace-tab-width' is local to current buffer
(let ((ws-indent-tabs-mode whitespace-indent-tabs-mode)
(ws-tab-width whitespace-tab-width))
;; `indent-tabs-mode' may be local to current buffer
;; `tab-width' may be local to current buffer
(let ((ws-indent-tabs-mode indent-tabs-mode)
(ws-tab-width tab-width))
(with-current-buffer (get-buffer-create
whitespace-report-buffer-name)
(erase-buffer)
@ -2027,7 +2012,6 @@ resultant list will be returned."
(if (listp whitespace-style)
whitespace-style
(list whitespace-style)))
(whitespace-ensure-local-variables)
;; turn on whitespace
(when whitespace-active-style
(whitespace-color-on)
@ -2105,10 +2089,10 @@ resultant list will be returned."
`((,(let ((line-column (or whitespace-line-column fill-column)))
(format
"^\\([^\t\n]\\{%s\\}\\|[^\t\n]\\{0,%s\\}\t\\)\\{%d\\}%s\\(.+\\)$"
whitespace-tab-width
(1- whitespace-tab-width)
(/ line-column whitespace-tab-width)
(let ((rem (% line-column whitespace-tab-width)))
tab-width
(1- tab-width)
(/ line-column tab-width)
(let ((rem (% line-column tab-width)))
(if (zerop rem)
""
(format ".\\{%d\\}" rem)))))
@ -2123,7 +2107,7 @@ resultant list will be returned."
,(cond
((memq 'space-before-tab whitespace-active-style)
;; Show SPACEs before TAB (indent-tabs-mode).
(if whitespace-indent-tabs-mode 1 2))
(if indent-tabs-mode 1 2))
((memq 'space-before-tab::tab whitespace-active-style)
1)
((memq 'space-before-tab::space whitespace-active-style)