From 6fda6a0c40b45d210f94d3593a66d16003238835 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 14 Jun 2010 23:16:19 -0700 Subject: [PATCH 1/1] Backport from trunk: * src/editfns.c (Fbyte_to_string): Pacify compiler. --- src/ChangeLog | 4 ++++ src/editfns.c | 10 ++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 35d68ae259..26c95ae77e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2010-06-15 Glenn Morris + + * editfns.c (Fbyte_to_string): Pacify compiler. + 2010-06-09 Stefan Monnier * dbusbind.c (xd_append_arg): Don't "make-unibyte" the string. diff --git a/src/editfns.c b/src/editfns.c index caac2c5c19..ea279a462f 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -1,7 +1,8 @@ /* Lisp functions pertaining to editing. - Copyright (C) 1985, 1986, 1987, 1989, 1993, 1994, 1995, 1996, - 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. + +Copyright (C) 1985, 1986, 1987, 1989, 1993, 1994, 1995, 1996, 1997, + 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, + 2009, 2010 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -225,8 +226,9 @@ DEFUN ("byte-to-string", Fbyte_to_string, Sbyte_to_string, 1, 1, 0, (byte) Lisp_Object byte; { + unsigned char b; CHECK_NUMBER (byte); - unsigned char b = XINT (byte); + b = XINT (byte); return make_string_from_bytes (&b, 1, 1); } -- 2.20.1