Revert "Add customizable to display raw bytes as hex"

This reverts commit 7c9ac111c5e5d92e620b666893993d5dc562e483.

diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index c4554eb318708cc718c4fd3ae749a160d6f4194a..a0d0792eacc59fff532693898e2146c3529ad22e 100644 (file)
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -1763,9 +1763,3 @@ itself, in pixels; the default is 2.
 in text that is hard to read.  Call the function
 @code{tty-suppress-bold-inverse-default-colors} with a non-@code{nil}
 argument to suppress the effect of bold-face in this case.
-
-@vindex display-raw-bytes-as-hex
-  Raw bytes are displayed in octal format by default, for example a
-byte with a decimal value of 128 is displayed as @code{\200}.  To
-change display to the hexadecimal format of @code{\x80}, set the
-variable @code{display-raw-bytes-as-hex} to @code{t}.

diff --git a/etc/NEWS b/etc/NEWS
index 055de8ca9e8d096b277aa252ae52f82160765baf..43e7897120fc8d289575efbf51bbfcecc54429be 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -364,10 +364,6 @@ large integers from being displayed as characters.
 ** Two new commands for finding the source code of Emacs Lisp
 libraries: 'find-library-other-window' and 'find-library-other-frame'.
 
-+++
-** The new variable 'display-raw-bytes-as-hex' allows to change the
-display of raw bytes from octal to hex.
-
 \f
 * Editing Changes in Emacs 26.1
 

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 744fe7f69eec66cb391d788a9bfce139b4d1fb4b..4253d40b7594ff322c45e740b7f6af5113befc52 100644 (file)
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -583,7 +583,6 @@ since it could result in memory overflow and make Emacs crash."
                       (const :tag "Fit (t)" :value t)
                       (const :tag "Grow only" :value grow-only))
              "25.1")
-            (display-raw-bytes-as-hex display boolean "26.1")
             ;; xfaces.c
             (scalable-fonts-allowed display boolean "22.1")
             ;; xfns.c

diff --git a/src/xdisp.c b/src/xdisp.c
index 53210e5be5b2b1c6a2fe705c1da163a4b8e09140..eaa701e9cf13ebb4917dd435292bb8cfec009576 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -7055,7 +7055,7 @@ get_next_display_element (struct it *it)
             translated too.
 
             Non-printable characters and raw-byte characters are also
-            translated to octal or hexadecimal form.  */
+            translated to octal form.  */
          if (((c < ' ' || c == 127) /* ASCII control chars.  */
               ? (it->area != TEXT_AREA
                  /* In mode line, treat \n, \t like other crl chars.  */
@@ -7162,12 +7162,9 @@ get_next_display_element (struct it *it)
                int len, i;
 
                if (CHAR_BYTE8_P (c))
-                 /* Display \200 or \x80 instead of \17777600.  */
+                 /* Display \200 instead of \17777600.  */
                  c = CHAR_TO_BYTE8 (c);
-               const char *format_string = display_raw_bytes_as_hex
-                                           ? "x%02x"
-                                           : "%03o";
-               len = sprintf (str, format_string, c + 0u);
+               len = sprintf (str, "%03o", c + 0u);
 
                XSETINT (it->ctl_chars[0], escape_glyph);
                for (i = 0; i < len; i++)
@@ -32234,13 +32231,6 @@ display table takes effect; in this case, Emacs does not consult
   /* Initialize to t, since we need to disable reordering until
      loadup.el successfully loads charprop.el.  */
   redisplay__inhibit_bidi = true;
-
-  DEFVAR_BOOL ("display-raw-bytes-as-hex", display_raw_bytes_as_hex,
-    doc: /* Non-nil means display raw bytes in hexadecimal format.
-The default is to use octal format (\200) whereas hexadecimal (\x80)
-may be more familar to users.  */);
-  display_raw_bytes_as_hex = false;
-
 }
 
 

diff --git a/test/manual/redisplay-testsuite.el b/test/manual/redisplay-testsuite.el
index 2175cbab1b77b9e30806e6d7f26204a033c425b6..694d55ab1dbba58b3883e70d7b17136e94b0fde6 100644 (file)
--- a/test/manual/redisplay-testsuite.el
+++ b/test/manual/redisplay-testsuite.el
@@ -34,8 +34,7 @@
     (setq overlay (make-overlay opoint (point)))
     (while props
       (overlay-put overlay (car props) (cadr props))
-      (setq props (cddr props)))
-    overlay))
+      (setq props (cddr props)))))
 
 (defun test-redisplay-1 ()
   (insert "Test 1: Displaying adjacent and overlapping overlays:\n\n")
@@ -294,29 +293,6 @@ static unsigned char x_bits[] = {0xff, 0x81, 0xbd, 0xa5, 0xa5, 0xbd, 0x81, 0xff
 
   (insert "\n"))
 
-(defvar test-redisplay-5-expected-overlay nil)
-(defvar test-redisplay-5-result-overlay nil)
-
-(defun test-redisplay-5-toggle (_event)
-  (interactive "e")
-  (setq display-raw-bytes-as-hex (not display-raw-bytes-as-hex))
-  (let ((label (if display-raw-bytes-as-hex "\\x80" "\\200")))
-    (overlay-put test-redisplay-5-expected-overlay 'display
-                 (propertize label 'face 'escape-glyph))))
-
-(defun test-redisplay-5 ()
-  (insert "Test 5: Display of raw bytes:\n\n")
-  (insert "  Expected: ")
-  (setq test-redisplay-5-expected-overlay
-        (test-insert-overlay " " 'display
-                             (propertize "\\200" 'face 'escape-glyph)))
-  (insert "\n    Result: ")
-  (setq test-redisplay-5-result-overlay
-        (test-insert-overlay " " 'display "\200"))
-  (insert "\n\n")
-  (insert-button "Toggle between octal and hex display"
-                 'action 'test-redisplay-5-toggle))
-
 
 (defun test-redisplay ()
   (interactive)
@@ -333,6 +309,5 @@ static unsigned char x_bits[] = {0xff, 0x81, 0xbd, 0xa5, 0xa5, 0xbd, 0x81, 0xff
     (test-redisplay-2)
     (test-redisplay-3)
     (test-redisplay-4)
-    (test-redisplay-5)
     (goto-char (point-min))))