From 54d629be4a0dce166762691eba8fd50930225c4f Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 25 Sep 2012 09:01:52 +0200 Subject: [PATCH] Don't call MAYBE_UNIFY_CHAR while processing buffers and strings. src/character.c (char_string, string_char): Remove calls to MAYBE_UNIFY_CHAR. See the discussion starting at http://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00433.html for the details. --- src/ChangeLog | 7 +++++++ src/character.c | 4 ---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 0f59d6088a5..ca9ca808c77 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2012-09-25 Eli Zaretskii + + * character.c (char_string, string_char): Remove calls to + MAYBE_UNIFY_CHAR. See the discussion starting at + http://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00433.html + for the details. + 2012-09-25 Chong Yidong * xdisp.c (mode_line_inverse_video): Delete obsolete variable. diff --git a/src/character.c b/src/character.c index def1ad090fd..5808d48a235 100644 --- a/src/character.c +++ b/src/character.c @@ -126,8 +126,6 @@ char_string (unsigned int c, unsigned char *p) c &= ~CHAR_MODIFIER_MASK; } - MAYBE_UNIFY_CHAR (c); - if (c <= MAX_3_BYTE_CHAR) { bytes = CHAR_STRING (c, p); @@ -195,8 +193,6 @@ string_char (const unsigned char *p, const unsigned char **advanced, int *len) p += 5; } - MAYBE_UNIFY_CHAR (c); - if (len) *len = p - saved_p; if (advanced) -- 2.39.2