* src/fns.c (Fcompare_strings): Use FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE.

* lisp/calc/calc-alg.el (math-beforep):
* lisp/progmodes/cc-guess.el (c-guess-view-reorder-offsets-alist-in-style):
Simplify because string-lessp can accept symbols as args.

2 files changed, 6 insertions, 15 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 8b0149bc5f4..da46ead2b93 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-26  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * fns.c (Fcompare_strings): Use FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE.
+
 2014-06-25  Dmitry Antipov  <dmantipov@yandex.ru>
 
         Consistently use validate_subarray to verify substring.
diff --git a/src/fns.c b/src/fns.c
index 9bc854a9c79..887a856f224 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -268,21 +268,8 @@ If string STR1 is greater, the value is a positive number N;
          characters, not just the bytes.  */
       int c1, c2;
 
-      if (STRING_MULTIBYTE (str1))
-        FETCH_STRING_CHAR_ADVANCE_NO_CHECK (c1, str1, i1, i1_byte);
-      else
-        {
-          c1 = SREF (str1, i1++);
-          MAKE_CHAR_MULTIBYTE (c1);
-        }
-
-      if (STRING_MULTIBYTE (str2))
-        FETCH_STRING_CHAR_ADVANCE_NO_CHECK (c2, str2, i2, i2_byte);
-      else
-        {
-          c2 = SREF (str2, i2++);
-          MAKE_CHAR_MULTIBYTE (c2);
-        }
+      FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE (c1, str1, i1, i1_byte);
+      FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE (c2, str2, i2, i2_byte);
 
       if (c1 == c2)
         continue;