[Emacs-diffs] trunk r113634: Refactor out setting `whitespace-indent-tabs-mode' and

[Tassilo Horn]

------------------------------------------------------------
revno: 113634
revision-id: address@hidden
parent: address@hidden
committer: Tassilo Horn <address@hidden>
branch nick: trunk
timestamp: Thu 2013-08-01 14:58:28 +0200
message:
  Refactor out setting `whitespace-indent-tabs-mode' and
  `whitespace-tab-width' buffer-locally to own function, so that
  `whitespace-cleanup' and friends work appropriately without
  needing to enable `whitespace-mode'.
  
  * whitespace.el (whitespace-ensure-local-variables): New function.
  (whitespace-cleanup-region): Call it.
  (whitespace-turn-on): Call it.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/whitespace.el             
whitespace.el-20091113204419-o5vbwnq5f7feedwu-8268

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-08-01 11:10:31 +0000
+++ b/lisp/ChangeLog    2013-08-01 12:58:28 +0000
@@ -1,3 +1,9 @@
+2013-08-01  Tassilo Horn  <address@hidden>
+
+       * whitespace.el (whitespace-ensure-local-variables): New function.
+       (whitespace-cleanup-region): Call it.
+       (whitespace-turn-on): Call it.
+
 2013-08-01  Michael Albinus  <address@hidden>
 
        Complete file name handlers.

=== modified file 'lisp/whitespace.el'
--- a/lisp/whitespace.el        2013-05-09 01:40:20 +0000
+++ b/lisp/whitespace.el        2013-08-01 12:58:28 +0000
@@ -1471,6 +1471,12 @@
     ;; PROBLEM 6: 8 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)
@@ -1517,6 +1523,7 @@
       ;; 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)
@@ -2095,7 +2102,6 @@
 (defvar whitespace-display-table-was-local nil
   "Used to remember whether a buffer initially had a local display table.")
 
-
 (defun whitespace-turn-on ()
   "Turn on whitespace visualization."
   ;; prepare local hooks
@@ -2108,10 +2114,7 @@
        (if (listp whitespace-style)
           whitespace-style
         (list whitespace-style)))
-  (set (make-local-variable 'whitespace-indent-tabs-mode)
-       indent-tabs-mode)
-  (set (make-local-variable 'whitespace-tab-width)
-       tab-width)
+  (whitespace-ensure-local-variables)
   ;; turn on whitespace
   (when whitespace-active-style
     (whitespace-color-on)