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 2002-03-01T01:16:34Z!handa@m17n.org and 2008-02-01T16:01:31Z!miles@gnu.org.
* 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 2002-03-01T01:17:24Z!handa@m17n.org and 2008-02-01T16:01:31Z!miles@gnu.org.
  All callers changed.

diff --git a/src/ChangeLog b/src/ChangeLog
index be55ef369b3dd945a926440e627104a7a969ff0a..1e77a6439e11cae15a847d1e1c8abe51d6e31ee6 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,19 @@
+2011-03-28  Juanma Barranquero  <lekktu@gmail.com>
+
+       * coding.c (encode_designation_at_bol): Remove parameter `charbuf_end',
+       unused since 2002-03-01T01:17:24Z!handa@m17n.org and 2008-02-01T16:01:31Z!miles@gnu.org.
+       All callers changed.
+
+       * lisp.h (multibyte_char_to_unibyte):
+       * character.c (multibyte_char_to_unibyte): Remove parameter `rev_tbl',
+       unused since 2002-03-01T01:16:34Z!handa@m17n.org and 2008-02-01T16:01:31Z!miles@gnu.org.
+       * 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  <monnier@iro.umontreal.ca>
 
        * 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 <andlind@gmail.com>
+2011-03-27  Anders Lindgren  <andlind@gmail.com>
 
        * nsterm.m (ns_menu_bar_is_hidden): New variable.
        (ns_constrain_all_frames, ns_menu_bar_should_be_hidden)

diff --git a/src/character.c b/src/character.c
index fdaf22f04f877ddee19f6906160923a17be47242..41c692e74836f9c186bca4a29c3c5e5cd7967b18 100644 (file)
--- a/src/character.c
+++ b/src/character.c
@@ -232,13 +232,10 @@ translate_char (Lisp_Object table, int c)
 }
 
 /* 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;

diff --git a/src/character.h b/src/character.h
index 91020cadedcfac4c6b1be9b09a822cd56114c993..7a75ac186fa1a327148f3d973792daab48e2661a 100644 (file)
--- a/src/character.h
+++ b/src/character.h
@@ -69,7 +69,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #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.  */

diff --git a/src/cmds.c b/src/cmds.c
index ebbb223c2dbe5859e654f93819c6610882ee52ee..1cf7ff24fecae6c9977ed0c12f2e6f12e4ffea7c 100644 (file)
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -352,7 +352,7 @@ internal_self_insert (int c, EMACS_INT n)
     {
       str[0] = (SINGLE_BYTE_CHAR_P (c)
                ? c
-               : multibyte_char_to_unibyte (c, Qnil));
+               : multibyte_char_to_unibyte (c));
       len = 1;
     }
   if (!NILP (overwrite)

diff --git a/src/coding.c b/src/coding.c
index 0596d16bf463177235d1a3096787bb9ee32758bc..fd812148a268a0eb0319a307f7994926a9ba2934 100644 (file)
--- a/src/coding.c
+++ b/src/coding.c
@@ -853,8 +853,7 @@ static unsigned char *alloc_destination (struct coding_system *,
                                          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 @@ encode_invocation_designation (struct charset *charset,
 
 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 @@ encode_coding_iso_2022 (struct coding_system *coding)
          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;

diff --git a/src/editfns.c b/src/editfns.c
index 009e1d34bde9e637516514c951e15c26796ea666..b04414e1ae65e354ba9cc17efa0334e76ea0e44f 100644 (file)
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -2226,7 +2226,7 @@ general_insert_function (void (*insert_func)
            {
              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);

diff --git a/src/keymap.c b/src/keymap.c
index 440df06ba4ee178beb369762513bdc78fed90989..10000b935aae582c3383272e98b88d21e293aac3 100644 (file)
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -2387,7 +2387,7 @@ push_key_description (register unsigned int c, register char *p, int force_multi
       /* 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);
     }

diff --git a/src/lisp.h b/src/lisp.h
index 1e255df1eccbd24a189b2619a1e48776d36a369c..a3c4d48b49c4e67aea31083ed1d72541704d37c7 100644 (file)
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2403,7 +2403,7 @@ EXFUN (Fchar_width, 1);
 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);

diff --git a/src/search.c b/src/search.c
index 59a530eff61e48f654262e90a6859920e5563b9f..682fa185bbbd95ababf5658521df24b39bff3daa 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -2634,11 +2634,8 @@ since only regular expressions have distinguished subexpressions.  */)
       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 @@ since only regular expressions have distinguished subexpressions.  */)
            {
              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 @@ since only regular expressions have distinguished subexpressions.  */)
                  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
                {

diff --git a/src/xdisp.c b/src/xdisp.c
index 148c7bc5ec66d132f1967437c0213254468f4509..308588101e2db378bfbcb92085576d08bad41155 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -7962,7 +7962,7 @@ message_dolog (const char *m, EMACS_INT nbytes, int nlflag, int multibyte)
              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 @@ set_message_1 (EMACS_INT a1, Lisp_Object a2, EMACS_INT nbytes, EMACS_INT multiby
              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);
            }
        }