[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r117414: * src/fns.c (Fcompare_strings): Use FETCH_S
From: |
Dmitry Antipov |
Subject: |
[Emacs-diffs] trunk r117414: * src/fns.c (Fcompare_strings): Use FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE. |
Date: |
Thu, 26 Jun 2014 07:13:29 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117414
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Thu 2014-06-26 11:13:13 +0400
message:
* 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.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/calc/calc-alg.el calcalg.el-20091113204419-o5vbwnq5f7feedwu-2270
lisp/progmodes/cc-guess.el ccguess.el-20110630204248-vsloqms1pkdtruo4-1
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/fns.c fns.c-20091113204419-o5vbwnq5f7feedwu-203
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-06-26 07:10:22 +0000
+++ b/lisp/ChangeLog 2014-06-26 07:13:13 +0000
@@ -1,3 +1,9 @@
+2014-06-26 Dmitry Antipov <address@hidden>
+
+ * calc/calc-alg.el (math-beforep):
+ * progmodes/cc-guess.el (c-guess-view-reorder-offsets-alist-in-style):
+ Simplify because string-lessp can accept symbols as args.
+
2014-06-26 Daiki Ueno <address@hidden>
* emacs-lisp/package.el (package--check-signature): If
=== modified file 'lisp/calc/calc-alg.el'
--- a/lisp/calc/calc-alg.el 2014-01-01 07:43:34 +0000
+++ b/lisp/calc/calc-alg.el 2014-06-26 07:13:13 +0000
@@ -293,7 +293,7 @@
(Math-objectp a))
((eq (car a) 'var)
(if (eq (car b) 'var)
- (string-lessp (symbol-name (nth 1 a)) (symbol-name (nth 1 b)))
+ (string-lessp (nth 1 a) (nth 1 b))
(not (Math-numberp b))))
((eq (car b) 'var) (Math-numberp a))
((eq (car a) (car b))
@@ -302,7 +302,7 @@
(and b
(or (null a)
(math-beforep (car a) (car b)))))
- (t (string-lessp (symbol-name (car a)) (symbol-name (car b))))))
+ (t (string-lessp (car a) (car b)))))
(defsubst math-simplify-extended (a)
=== modified file 'lisp/progmodes/cc-guess.el'
--- a/lisp/progmodes/cc-guess.el 2014-03-31 19:01:59 +0000
+++ b/lisp/progmodes/cc-guess.el 2014-06-26 07:13:13 +0000
@@ -504,8 +504,7 @@
(cond
((or (and a-guessed? b-guessed?)
(not (or a-guessed? b-guessed?)))
- (string-lessp (symbol-name (car a))
- (symbol-name (car b))))
+ (string-lessp (car a) (car b)))
(a-guessed? t)
(b-guessed? nil)))))))
style)
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-06-26 06:55:15 +0000
+++ b/src/ChangeLog 2014-06-26 07:13:13 +0000
@@ -1,3 +1,7 @@
+2014-06-26 Dmitry Antipov <address@hidden>
+
+ * fns.c (Fcompare_strings): Use FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE.
+
2014-06-25 Dmitry Antipov <address@hidden>
Consistently use validate_subarray to verify substring.
=== modified file 'src/fns.c'
--- a/src/fns.c 2014-06-25 12:11:08 +0000
+++ b/src/fns.c 2014-06-26 07:13:13 +0000
@@ -268,21 +268,8 @@
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;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r117414: * src/fns.c (Fcompare_strings): Use FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE.,
Dmitry Antipov <=