merge trunk

3 files changed, 19 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 67911d5def3..959c3fbcb54 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -23,13 +23,16 @@
 
 2010-05-24  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * editfns.c (Fbyte_to_string): New function.
+
+2010-05-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
         * process.c (Fmake_network_process): Set :host to nil if it's not used.
         Suggested by Masatake YAMATO <yamato@redhat.com>.
 
 2010-05-23  Eli Zaretskii  <eliz@gnu.org>
 
-        * dispextern.h (init_iterator): Sync prototype with changed
-        definition.
+        * dispextern.h (init_iterator): Sync prototype with changed definition.
 
 2010-05-19  Eli Zaretskii  <eliz@gnu.org>
 
diff --git a/src/cmds.c b/src/cmds.c
index b8a65324e9f..1fdd3729d68 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -278,7 +278,9 @@ DEFUN ("delete-backward-char", Fdelete_backward_char, Sdelete_backward_char,
        doc: /* Delete the previous N characters (following if N is negative).
 Optional second arg KILLFLAG non-nil means kill instead (save in kill ring).
 Interactively, N is the prefix arg, and KILLFLAG is set if
-N was explicitly specified.  */)
+N was explicitly specified.
+This is meant for interactive use only; from Lisp, better use `delete-char'
+with a negated argument.  */)
      (n, killflag)
      Lisp_Object n, killflag;
 {
diff --git a/src/editfns.c b/src/editfns.c
index 9f30ea06411..caac2c5c199 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -220,6 +220,16 @@ usage: (char-to-string CHAR)  */)
   return make_string_from_bytes (str, 1, len);
 }
 
+DEFUN ("byte-to-string", Fbyte_to_string, Sbyte_to_string, 1, 1, 0,
+       doc: /* Convert arg BYTE to a string containing that byte.  */)
+     (byte)
+     Lisp_Object byte;
+{
+  CHECK_NUMBER (byte);
+  unsigned char b = XINT (byte);
+  return make_string_from_bytes (&b, 1, 1);
+}
+
 DEFUN ("string-to-char", Fstring_to_char, Sstring_to_char, 1, 1, 0,
        doc: /* Convert arg STRING to a character, the first character of that string.
 A multibyte character is handled correctly.  */)
@@ -4686,6 +4696,7 @@ functions if all the text being accessed has this property.  */);
   defsubr (&Sgoto_char);
   defsubr (&Sstring_to_char);
   defsubr (&Schar_to_string);
+  defsubr (&Sbyte_to_string);
   defsubr (&Sbuffer_substring);
   defsubr (&Sbuffer_substring_no_properties);
   defsubr (&Sbuffer_string);