[Emacs-diffs] /srv/bzr/emacs/trunk r103149: Merge: * minibuf.c: conform to C89 pointer rules

[Paul Eggert]

------------------------------------------------------------
revno: 103149 [merge]
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2011-02-06 12:13:17 -0800
message:
  Merge: * minibuf.c: conform to C89 pointer rules
modified:
  src/ChangeLog
  src/minibuf.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-02-06 19:56:30 +0000
+++ b/src/ChangeLog     2011-02-06 20:12:53 +0000
@@ -18,6 +18,7 @@
        * keyboard.c (echo_char, MULTI_LETTER_MOD, tty_read_avail_input):
        Likewise.
        * keymap.c (Ftext_char_description): Likewise.
+       * minibuf.c (Fread_buffer): Likewise.
        * insdel.c (insert, insert_and_inherit, insert_before_markers):
        (insert_before_markers_and_inherit, insert_1, insert_1_both):
        Likewise.  This changes these functions' signatures, which is

=== modified file 'src/minibuf.c'
--- a/src/minibuf.c     2011-01-30 22:17:44 +0000
+++ b/src/minibuf.c     2011-02-06 20:12:53 +0000
@@ -1091,7 +1091,7 @@
   (Lisp_Object prompt, Lisp_Object def, Lisp_Object require_match)
 {
   Lisp_Object args[4], result;
-  unsigned char *s;
+  char *s;
   int len;
   int count = SPECPDL_INDEX ();
 
@@ -1113,7 +1113,7 @@
 
          if (STRINGP (prompt))
            {
-             s = SDATA (prompt);
+             s = SSDATA (prompt);
              len = strlen (s);
              if (len >= 2 && s[len - 2] == ':' && s[len - 1] == ' ')
                len = len - 2;