summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2020-04-26 19:30:37 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2020-04-26 19:31:54 -0700
commit08408b13faa911b586ac0c181159ada452a942cc (patch)
tree1743fb97325f7c03b23ccfe6ab8a90d23e3d11c1
parented2def7d5e423388ca75c6e10fd7b42e0c4789c7 (diff)
downloademacs-08408b13faa911b586ac0c181159ada452a942cc.tar.gz
Simplify string-to-char
* src/editfns.c (Fstring_to_char): Simplify. * src/editfns.c (Fstring_to_char): Simplify. This tweak improved the CPU time performance of ‘make compile-always’ by about 1.8% on my platform.
-rw-r--r--src/editfns.c18
1 files changed, 6 insertions, 12 deletions
diff --git a/src/editfns.c b/src/editfns.c
index 1a199bad6de..c32488e271f 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -162,20 +162,14 @@ DEFUN ("byte-to-string", Fbyte_to_string, Sbyte_to_string, 1, 1, 0,
DEFUN ("string-to-char", Fstring_to_char, Sstring_to_char, 1, 1, 0,
doc: /* Return the first character in STRING. */)
- (register Lisp_Object string)
+ (Lisp_Object string)
{
- register Lisp_Object val;
CHECK_STRING (string);
- if (SCHARS (string))
- {
- if (STRING_MULTIBYTE (string))
- XSETFASTINT (val, STRING_CHAR (SDATA (string)));
- else
- XSETFASTINT (val, SREF (string, 0));
- }
- else
- XSETFASTINT (val, 0);
- return val;
+
+ /* This returns zero if STRING is empty. */
+ return make_fixnum (STRING_MULTIBYTE (string)
+ ? STRING_CHAR (SDATA (string))
+ : SREF (string, 0));
}
DEFUN ("point", Fpoint, Spoint, 0, 0, 0,