diff options
| author | Glenn Morris | 2010-06-14 23:16:19 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-06-14 23:16:19 -0700 |
| commit | 6fda6a0c40b45d210f94d3593a66d16003238835 (patch) | |
| tree | dfd0829daaa0033e9c799abb2f44966dd706a47c /src | |
| parent | 12755d08466fd26fcba7d9b9c7ed4f466f4ad2ca (diff) | |
| download | emacs-6fda6a0c40b45d210f94d3593a66d16003238835.tar.gz emacs-6fda6a0c40b45d210f94d3593a66d16003238835.zip | |
Backport from trunk: * src/editfns.c (Fbyte_to_string): Pacify compiler.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/editfns.c | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 35d68ae2599..26c95ae77ed 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2010-06-15 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * editfns.c (Fbyte_to_string): Pacify compiler. | ||
| 4 | |||
| 1 | 2010-06-09 Stefan Monnier <monnier@iro.umontreal.ca> | 5 | 2010-06-09 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 6 | ||
| 3 | * dbusbind.c (xd_append_arg): Don't "make-unibyte" the string. | 7 | * dbusbind.c (xd_append_arg): Don't "make-unibyte" the string. |
diff --git a/src/editfns.c b/src/editfns.c index caac2c5c199..ea279a462f2 100644 --- a/src/editfns.c +++ b/src/editfns.c | |||
| @@ -1,7 +1,8 @@ | |||
| 1 | /* Lisp functions pertaining to editing. | 1 | /* Lisp functions pertaining to editing. |
| 2 | Copyright (C) 1985, 1986, 1987, 1989, 1993, 1994, 1995, 1996, | 2 | |
| 3 | 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, | 3 | Copyright (C) 1985, 1986, 1987, 1989, 1993, 1994, 1995, 1996, 1997, |
| 4 | 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | 4 | 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, |
| 5 | 2009, 2010 Free Software Foundation, Inc. | ||
| 5 | 6 | ||
| 6 | This file is part of GNU Emacs. | 7 | This file is part of GNU Emacs. |
| 7 | 8 | ||
| @@ -225,8 +226,9 @@ DEFUN ("byte-to-string", Fbyte_to_string, Sbyte_to_string, 1, 1, 0, | |||
| 225 | (byte) | 226 | (byte) |
| 226 | Lisp_Object byte; | 227 | Lisp_Object byte; |
| 227 | { | 228 | { |
| 229 | unsigned char b; | ||
| 228 | CHECK_NUMBER (byte); | 230 | CHECK_NUMBER (byte); |
| 229 | unsigned char b = XINT (byte); | 231 | b = XINT (byte); |
| 230 | return make_string_from_bytes (&b, 1, 1); | 232 | return make_string_from_bytes (&b, 1, 1); |
| 231 | } | 233 | } |
| 232 | 234 | ||