Fix whitespace-display-mappings.

 lisp/whitespace.el (whitespace-display-mappings): Use Unicode
 codepoints, instead of emacs-mule codepoints.  See
 http://lists.gnu.org/archive/html/help-gnu-emacs/2012-07/msg00366.html
 for the details.

2 files changed, 8 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d36cc4574fa..0d206f5368f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2012-08-03  Eli Zaretskii  <eliz@gnu.org>
 
+        * whitespace.el (whitespace-display-mappings): Use Unicode
+        codepoints, instead of emacs-mule codepoints.  See
+        http://lists.gnu.org/archive/html/help-gnu-emacs/2012-07/msg00366.html
+        for the details.
+
         * files.el (file-truename): Don't skip symlink-chasing part on
         windows-nt.  Incorporate the resolution of 8+3 short aliases on
         Windows into the loop that recursively chases symlinks.  Compare
diff --git a/lisp/whitespace.el b/lisp/whitespace.el
index 9c317e32816..f52a8fb36ae 100644
--- a/lisp/whitespace.el
+++ b/lisp/whitespace.el
@@ -927,17 +927,13 @@ Used when `whitespace-style' includes `lines' or `lines-tail'."
   '(
     (space-mark   ?\     [?\u00B7]     [?.])            ; space - centered dot
     (space-mark   ?\xA0  [?\u00A4]     [?_])            ; hard space - currency
-    (space-mark   ?\x8A0 [?\x8A4]      [?_])            ; hard space - currency
-    (space-mark   ?\x920 [?\x924]      [?_])            ; hard space - currency
-    (space-mark   ?\xE20 [?\xE24]      [?_])            ; hard space - currency
-    (space-mark   ?\xF20 [?\xF24]      [?_])            ; hard space - currency
     ;; NEWLINE is displayed using the face `whitespace-newline'
     (newline-mark ?\n    [?$ ?\n])                      ; eol - dollar sign
     ;; (newline-mark ?\n    [?\u21B5 ?\n] [?$ ?\n])     ; eol - downwards arrow
     ;; (newline-mark ?\n    [?\u00B6 ?\n] [?$ ?\n])     ; eol - pilcrow
-    ;; (newline-mark ?\n    [?\x8AF ?\n]  [?$ ?\n])     ; eol - overscore
-    ;; (newline-mark ?\n    [?\x8AC ?\n]  [?$ ?\n])     ; eol - negation
-    ;; (newline-mark ?\n    [?\x8B0 ?\n]  [?$ ?\n])     ; eol - grade
+    ;; (newline-mark ?\n    [?\u00AF ?\n]  [?$ ?\n])    ; eol - overscore
+    ;; (newline-mark ?\n    [?\u00AC ?\n]  [?$ ?\n])    ; eol - negation
+    ;; (newline-mark ?\n    [?\u00B0 ?\n]  [?$ ?\n])    ; eol - degrees
     ;;
     ;; WARNING: the mapping below has a problem.
     ;; When a TAB occupies exactly one column, it will display the