[Emacs-diffs] /srv/bzr/emacs/trunk r103770: src/*.c: Remove some additional unused parameters.

[Juanma Barranquero]

------------------------------------------------------------
revno: 103770
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Tue 2011-03-29 00:41:01 +0200
message:
  src/*.c: Remove some additional unused parameters.
  
  * lisp.h (multibyte_char_to_unibyte):
  * character.c (multibyte_char_to_unibyte): Remove parameter `rev_tbl',
    unused since revno:43563.1.16 (2002-03-01) and revno:84043 (2008-02-1).
  * character.h (CHAR_TO_BYTE8):
  * cmds.c (internal_self_insert):
  * editfns.c (general_insert_function):
  * keymap.c (push_key_description):
  * search.c (Freplace_match):
  * xdisp.c (message_dolog, set_message_1): All callers changed.
  
  * coding.c (encode_designation_at_bol): Remove parameter `charbuf_end',
    unused since revno:43563.1.17 (2002-03-01) and revno:84043 (2008-02-1).
    All callers changed.
modified:
  src/ChangeLog
  src/character.c
  src/character.h
  src/cmds.c
  src/coding.c
  src/editfns.c
  src/keymap.c
  src/lisp.h
  src/search.c
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-03-28 20:26:35 +0000
+++ b/src/ChangeLog     2011-03-28 22:41:01 +0000
@@ -1,3 +1,19 @@
+2011-03-28  Juanma Barranquero  <address@hidden>
+
+       * coding.c (encode_designation_at_bol): Remove parameter `charbuf_end',
+       unused since revno:43563.1.17 (2002-03-01) and revno:84043 (2008-02-1).
+       All callers changed.
+
+       * lisp.h (multibyte_char_to_unibyte):
+       * character.c (multibyte_char_to_unibyte): Remove parameter `rev_tbl',
+       unused since revno:43563.1.16 (2002-03-01) and revno:84043 (2008-02-1).
+       * character.h (CHAR_TO_BYTE8):
+       * cmds.c (internal_self_insert):
+       * editfns.c (general_insert_function):
+       * keymap.c (push_key_description):
+       * search.c (Freplace_match):
+       * xdisp.c (message_dolog, set_message_1): All callers changed.
+
 2011-03-28  Stefan Monnier  <address@hidden>
 
        * keyboard.c (safe_run_hook_funcall): New function.
@@ -43,7 +59,7 @@
 
        * nsterm.m (syms_of_nsterm): Use doc: for ns-auto-hide-menu-bar.
 
-2011-03-27  Anders Lindgren <address@hidden>
+2011-03-27  Anders Lindgren  <address@hidden>
 
        * nsterm.m (ns_menu_bar_is_hidden): New variable.
        (ns_constrain_all_frames, ns_menu_bar_should_be_hidden)

=== modified file 'src/character.c'
--- a/src/character.c   2011-03-08 07:49:41 +0000
+++ b/src/character.c   2011-03-28 22:41:01 +0000
@@ -232,13 +232,10 @@
 }
 
 /* Convert ASCII or 8-bit character C to unibyte.  If C is none of
-   them, return (C & 0xFF).
-
-   The argument REV_TBL is now ignored.  It will be removed in the
-   future.  */
+   them, return (C & 0xFF).  */
 
 int
-multibyte_char_to_unibyte (int c, Lisp_Object rev_tbl)
+multibyte_char_to_unibyte (int c)
 {
   if (c < 0x80)
     return c;

=== modified file 'src/character.h'
--- a/src/character.h   2011-03-19 00:12:53 +0000
+++ b/src/character.h   2011-03-28 22:41:01 +0000
@@ -69,7 +69,7 @@
 #define CHAR_TO_BYTE8(c)       \
   (CHAR_BYTE8_P (c)            \
    ? (c) - 0x3FFF00            \
-   : multibyte_char_to_unibyte (c, Qnil))
+   : multibyte_char_to_unibyte (c))
 
 /* Return the raw 8-bit byte for character C,
    or -1 if C doesn't correspond to a byte.  */

=== modified file 'src/cmds.c'
--- a/src/cmds.c        2011-03-23 10:06:57 +0000
+++ b/src/cmds.c        2011-03-28 22:41:01 +0000
@@ -352,7 +352,7 @@
     {
       str[0] = (SINGLE_BYTE_CHAR_P (c)
                ? c
-               : multibyte_char_to_unibyte (c, Qnil));
+               : multibyte_char_to_unibyte (c));
       len = 1;
     }
   if (!NILP (overwrite)

=== modified file 'src/coding.c'
--- a/src/coding.c      2011-03-22 16:20:45 +0000
+++ b/src/coding.c      2011-03-28 22:41:01 +0000
@@ -853,8 +853,7 @@
                                          EMACS_INT, unsigned char *);
 static void setup_iso_safe_charsets (Lisp_Object);
 static unsigned char *encode_designation_at_bol (struct coding_system *,
-                                                 int *, int *,
-                                                 unsigned char *);
+                                                 int *, unsigned char *);
 static int detect_eol (const unsigned char *,
                        EMACS_INT, enum coding_category);
 static Lisp_Object adjust_coding_eol_type (struct coding_system *, int);
@@ -4299,7 +4298,7 @@
 
 static unsigned char *
 encode_designation_at_bol (struct coding_system *coding, int *charbuf,
-                          int *charbuf_end, unsigned char *dst)
+                          unsigned char *dst)
 {
   struct charset *charset;
   /* Table of charsets to be designated to each graphic register.  */
@@ -4390,7 +4389,7 @@
          unsigned char *dst_prev = dst;
 
          /* We have to produce designation sequences if any now.  */
-         dst = encode_designation_at_bol (coding, charbuf, charbuf_end, dst);
+         dst = encode_designation_at_bol (coding, charbuf, dst);
          bol_designation = 0;
          /* We are sure that designation sequences are all ASCII bytes.  */
          produced_chars += dst - dst_prev;

=== modified file 'src/editfns.c'
--- a/src/editfns.c     2011-03-23 10:06:57 +0000
+++ b/src/editfns.c     2011-03-28 22:41:01 +0000
@@ -2226,7 +2226,7 @@
            {
              str[0] = (ASCII_CHAR_P (XINT (val))
                        ? XINT (val)
-                       : multibyte_char_to_unibyte (XINT (val), Qnil));
+                       : multibyte_char_to_unibyte (XINT (val)));
              len = 1;
            }
          (*insert_func) ((char *) str, len);

=== modified file 'src/keymap.c'
--- a/src/keymap.c      2011-03-26 02:48:03 +0000
+++ b/src/keymap.c      2011-03-28 22:41:01 +0000
@@ -2387,7 +2387,7 @@
       /* Now we are sure that C is a valid character code.  */
       if (NILP (BVAR (current_buffer, enable_multibyte_characters))
          && ! force_multibyte)
-       *p++ = multibyte_char_to_unibyte (c, Qnil);
+       *p++ = multibyte_char_to_unibyte (c);
       else
        p += CHAR_STRING (c, (unsigned char *) p);
     }

=== modified file 'src/lisp.h'
--- a/src/lisp.h        2011-03-28 20:26:35 +0000
+++ b/src/lisp.h        2011-03-28 22:41:01 +0000
@@ -2403,7 +2403,7 @@
 EXFUN (Fstring, MANY);
 extern EMACS_INT chars_in_text (const unsigned char *, EMACS_INT);
 extern EMACS_INT multibyte_chars_in_text (const unsigned char *, EMACS_INT);
-extern int multibyte_char_to_unibyte (int, Lisp_Object);
+extern int multibyte_char_to_unibyte (int);
 extern int multibyte_char_to_unibyte_safe (int);
 extern void init_character_once (void);
 extern void syms_of_character (void);

=== modified file 'src/search.c'
--- a/src/search.c      2011-03-28 03:29:18 +0000
+++ b/src/search.c      2011-03-28 22:41:01 +0000
@@ -2634,11 +2634,8 @@
       EMACS_INT substed_alloc_size, substed_len;
       int buf_multibyte = !NILP (BVAR (current_buffer, 
enable_multibyte_characters));
       int str_multibyte = STRING_MULTIBYTE (newtext);
-      Lisp_Object rev_tbl;
       int really_changed = 0;
 
-      rev_tbl = Qnil;
-
       substed_alloc_size = length * 2 + 100;
       substed = (unsigned char *) xmalloc (substed_alloc_size + 1);
       substed_len = 0;
@@ -2658,7 +2655,7 @@
            {
              FETCH_STRING_CHAR_ADVANCE_NO_CHECK (c, newtext, pos, pos_byte);
              if (!buf_multibyte)
-               c = multibyte_char_to_unibyte (c, rev_tbl);
+               c = multibyte_char_to_unibyte (c);
            }
          else
            {
@@ -2681,7 +2678,7 @@
                  FETCH_STRING_CHAR_ADVANCE_NO_CHECK (c, newtext,
                                                      pos, pos_byte);
                  if (!buf_multibyte && !ASCII_CHAR_P (c))
-                   c = multibyte_char_to_unibyte (c, rev_tbl);
+                   c = multibyte_char_to_unibyte (c);
                }
              else
                {

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2011-03-28 03:29:18 +0000
+++ b/src/xdisp.c       2011-03-28 22:41:01 +0000
@@ -7962,7 +7962,7 @@
              c = string_char_and_length (msg + i, &char_bytes);
              work[0] = (ASCII_CHAR_P (c)
                         ? c
-                        : multibyte_char_to_unibyte (c, Qnil));
+                        : multibyte_char_to_unibyte (c));
              insert_1_both (work, 1, 1, 1, 0, 0);
            }
        }
@@ -9223,7 +9223,7 @@
              c = string_char_and_length (msg + i, &n);
              work[0] = (ASCII_CHAR_P (c)
                         ? c
-                        : multibyte_char_to_unibyte (c, Qnil));
+                        : multibyte_char_to_unibyte (c));
              insert_1_both (work, 1, 1, 1, 0, 0);
            }
        }