merge whitespace.el change from trunk

1 files changed, 17 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2318ce84600..3905bf6db80 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,19 @@
+2010-08-21  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
+
+        * whitespace.el: Fix slow cursor movement (Bug#6172).  Reported by
+        Christoph Groth <cwg@falma.de> and Liu Xin <x_liu@neusoft.com>.
+        New version 13.0.
+        (whitespace-empty-at-bob-regexp, whitespace-empty-at-eob-regexp):
+        Adjust initialization.
+        (whitespace-bob-marker, whitespace-eob-marker)
+        (whitespace-buffer-changed): New vars.
+        (whitespace-cleanup, whitespace-color-on, whitespace-color-off)
+        (whitespace-empty-at-bob-regexp, whitespace-empty-at-eob-regexp)
+        (whitespace-post-command-hook, whitespace-display-char-on):
+        Adjust code.
+        (whitespace-looking-back, whitespace-buffer-changed): New funs.
+        (whitespace-space-regexp, whitespace-tab-regexp): Eliminate funs.
+
 2010-08-21  Leo  <sdl.web@gmail.com>
 
         Fix buffer-list rename&refresh after after killing a buffer in ido.
@@ -2295,7 +2311,7 @@
 
         * ps-print.el (ps-face-attributes): It was not returning the
         attribute face for faces specified as string.  Reported by harven
-        <harven@free.fr>.
+        <harven@free.fr>.  (Bug#5254)
         (ps-print-version): New version 7.3.5.
 
 2009-12-18  Ulf Jasper  <ulf.jasper@web.de>