Fix various prototype issues.

30 files changed, 798 insertions, 67 deletions

diff --git a/editors/mule/distinfo b/editors/mule/distinfo
index 71c318cedbd..74a26654c73 100644
--- a/editors/mule/distinfo
+++ b/editors/mule/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2011/12/24 17:07:07 dholland Exp $
+$NetBSD: distinfo,v 1.13 2013/04/21 15:39:59 joerg Exp $
 
 SHA1 (mule-2.3.tar.gz) = 52737767955caf2fde34b994f367a89c5d8a045f
 RMD160 (mule-2.3.tar.gz) = 52b93e746a7a796549a44104ab1898954df044bf
@@ -8,12 +8,12 @@ SHA1 (patch-ab) = 7c2cf683e87320190af0306cf7d04b3638600944
 SHA1 (patch-ac) = 170fa4f6c17c805dd32a90e8bfb3e38c48a9fc20
 SHA1 (patch-ad) = 7a52802cd614441320221f450cf97d4e30f40f2b
 SHA1 (patch-ae) = 1f020aaeb75cd7dd2b827ab34382e472add09719
-SHA1 (patch-af) = 2672b9c724cfed135218a76e857fd26ebe3676ac
+SHA1 (patch-af) = f1b169cd2d834e5e9e22bc2d39aff31742b07f09
 SHA1 (patch-ag) = 6f86f0f97b24d85964b250ac22124369a5b0ab74
-SHA1 (patch-ah) = 8a8b0da32740626d001371b14ec68087523c7753
+SHA1 (patch-ah) = 4aa61507d90ead8326962180cf75ff88d8fac868
 SHA1 (patch-ai) = b3504a83bc51b3712e016f5b3efe9155fcaffa4b
 SHA1 (patch-aj) = c240cbff3da3ca33663fc2e1d04a3c60c84b4d70
-SHA1 (patch-ak) = bc484a2177c7fd5431fafe4269ee156ef764cbba
+SHA1 (patch-ak) = 6e020d64fb7d8e76d7bb0772c97f59f179ae31e3
 SHA1 (patch-al) = c5e2542651c795a57864811c7019a65f4d991247
 SHA1 (patch-am) = 336e2dfa617866265948f6d749ee5325b26714ee
 SHA1 (patch-an) = 9221c9747c7cf600e9915f8428178d33a55d180b
@@ -34,7 +34,7 @@ SHA1 (patch-bb) = 09c53a3ab6169ee33c4afdbd3e108874627117e2
 SHA1 (patch-bc) = 50439819ced9e116e558ac61451442911dff9fd3
 SHA1 (patch-bd) = a375a90b1dbd7fbaa1cd09ff55bafa83747c8a90
 SHA1 (patch-be) = 85658caaf28202b2dc07172c671d18441ce1e494
-SHA1 (patch-bf) = 70ef9e03b13d23da7b6e9ad8b9b5ba1c08285ee8
+SHA1 (patch-bf) = 5a72f2f96dbf3496be1c791b110983ceee8a1e02
 SHA1 (patch-bg) = 4fb1d27e69961bbe5a90efe8e73bf0de6f5c491d
 SHA1 (patch-bh) = 31963f9b430e56e7b0ee30f3d5479c22df4cf18c
 SHA1 (patch-bi) = 899f8d66add66c54ebc59f3127524d7fae0c7724
@@ -52,19 +52,19 @@ SHA1 (patch-bt) = b0f3c38e61ae211f35695d2522f1f7440a944302
 SHA1 (patch-bu) = a8ccd87510615e5353bb9525cd0fcfafdf56ea07
 SHA1 (patch-bv) = b92611d27a1fc4fc0d4bbe171683e057e6dcaf60
 SHA1 (patch-bw) = 460728484379cc4325f7b1836cec9a4b3b25e46a
-SHA1 (patch-bx) = c8409b75cbf3fda30e3ffaf69d13a2c1b551505a
+SHA1 (patch-bx) = 29a53c87e4038ec02ae1710314d36cf58f58855f
 SHA1 (patch-by) = 2b1c42e36d5217208fcc83bb0464c09bc38db933
 SHA1 (patch-bz) = e48f13d6194976f8f4174257a06c300a959c9ac7
 SHA1 (patch-ca) = a98c0d794427e858c6232283f50598d0c55c3f16
-SHA1 (patch-cb) = 183faec2b32b1914d896c371013d5c059e3ca636
+SHA1 (patch-cb) = 4b60c6a54e3e3e20891ef65e3f2d353e64773373
 SHA1 (patch-cc) = b85f9888f51d3cdab13a80b20e083e2cfaac85d2
-SHA1 (patch-cd) = fa7862b6fb879876d5806935ac8b8fb1104333b2
-SHA1 (patch-ce) = 404785b9bf25b43112c92e03efb904e817f13152
-SHA1 (patch-cf) = 3ae3136fbe2caceed2693efb8eb67886ce4e2ebc
+SHA1 (patch-cd) = b34643821a844ef828dbf4e6d9af53c501ac08d3
+SHA1 (patch-ce) = d7a0a72c37c2f0e0b34d900da084a776e522754c
+SHA1 (patch-cf) = 6c3a7d123406f53be551e49305daa5e4830a11b4
 SHA1 (patch-cg) = 5a4180cc9cf4fa62ed1eb357ff8cf0a3209ce491
-SHA1 (patch-ch) = 6b79e0f1df6a92fda1f5f7f490c91ce75fa3dd28
+SHA1 (patch-ch) = 99e6a5a9783f50be245b13780490615f9cf98d38
 SHA1 (patch-ci) = da85f217fe40ed4f0b4a16c21dd6fd3863b8d965
-SHA1 (patch-cj) = 19b158106f4fbe382084dc8e6ddd6545e506e30d
+SHA1 (patch-cj) = d813489d56b6be78ba403699939d7126fac1757f
 SHA1 (patch-lib-src_bdf_c) = d739f51baf40ba9bc34e87bdd7ecab643bef7b0f
 SHA1 (patch-lib-src_coco_c) = 886628867fd689df92bbf654260c3043a72ce0cc
 SHA1 (patch-lib-src_etags_c) = 2c5c5907e7b652cd295252ddd86df107359b3fab
@@ -73,27 +73,40 @@ SHA1 (patch-lib-src_make-docfile_c) = a5542c5c17ecb1512d1919fd304b611fc21cd835
 SHA1 (patch-lib-src_profile_c) = b4e74a5fc7ab5444dd48dcc6dc231d0382fb7621
 SHA1 (patch-lib-src_sorted-doc_c) = 9965f6a6722c2735dfc609a7a15c669f3df8fae4
 SHA1 (patch-lib-src_yow_c) = 38fb3e70395525ce8bb4816acd1b9e64c20f3735
-SHA1 (patch-src_abbrev_c) = f0d1c74b8c4b0fc95b2322e07e15b81102d2b74e
+SHA1 (patch-src_abbrev_c) = c8dc21ca974625b8fe20e96bea37c61f709fbc1a
 SHA1 (patch-src_alloc_c) = a5db486e10072ec3738df001aa555e35ae5a5a07
-SHA1 (patch-src_buffer_h) = 6b7ce37d58aa3c7dbed43733200bc0b196705c3c
+SHA1 (patch-src_buffer_h) = 3d2d0dba98a37265cc4df54bd14b6b51941d9c42
 SHA1 (patch-src_bytecode_c) = 93508ddb17e3ba2c7bb921caf85ce1e4e15791f3
 SHA1 (patch-src_callint_c) = 0b44807e049c12d2625c950efb14fd5409aba058
+SHA1 (patch-src_canna.c) = 77ae8d4f000d6d46f04ff03ef4c06e12635dd566
+SHA1 (patch-src_casefiddle.c) = e81ca135224a962ce369c0cdb2e3e4476d5b1d4d
 SHA1 (patch-src_charset_c) = 0ccabcbc2f752ec40c05c3f2dd7da342d2c1173e
-SHA1 (patch-src_dired_c) = 411cc423161b74f277f3c44a9e4ba17b2ccbfc43
+SHA1 (patch-src_cm.c) = 4c0789eefb23909cec1c6d710a24814f9db5be5d
+SHA1 (patch-src_cm.h) = ab0e053d24fc23b0a589954dfe89dd70aab4cb41
+SHA1 (patch-src_data.c) = 86909ed980ff73841a0500dba5080e10d63a3c93
+SHA1 (patch-src_dired_c) = 9183d55ea506533f196d5a2f9a454267356d73be
 SHA1 (patch-src_doc_c) = f8beb91ee577aa4dde3712b49718e24ce8786c85
 SHA1 (patch-src_doprnt_c) = 5532a42eed6e67f35d3fce018b8350a5791f0f58
 SHA1 (patch-src_editfns_c) = 9df4c96763bffecbf4d475f39d60a7c364fc6a80
 SHA1 (patch-src_eval_c) = c20f3fe33002aa2e3cb1b0579cc906412b4bcd35
+SHA1 (patch-src_frame.h) = 3a36099f161543af0a05f125699f36bd17c49b39
+SHA1 (patch-src_insdel.c) = 75aca770fd35ac99d258ee1c4392a0f7119150c9
+SHA1 (patch-src_keyboard.h) = 4729c97d1d80b93f387ad3187d7d8260d504ab24
 SHA1 (patch-src_keymap_c) = dd0201aca4c50c249d2412998f9fd5249c34d58c
 SHA1 (patch-src_m_amd64.h) = eadba5e4bc5f4e8351208f52d5130e6919cb480b
 SHA1 (patch-src_macros_c) = c26d867719a2c87aa0e1a9586a6043751d6d0e7d
+SHA1 (patch-src_marker.c) = 7c013ec210071d6c84d6c6d955186aa882aeaaf3
 SHA1 (patch-src_mcpath_c) = 6f2fb95a1b77d2bacd50e3361d31d2b8c45df002
 SHA1 (patch-src_ralloc_c) = d97472669d0d89cd87dea6dba431b64eeec939b3
+SHA1 (patch-src_regex19.h) = ddd444078d8fddbdea20bed6add2c888fbc76208
 SHA1 (patch-src_scroll_c) = 572727c5e9831145876a311321f5bfe0f4d1494c
-SHA1 (patch-src_search_c) = 3bb65a3730cadee6f905589a02e256096b8c462e
-SHA1 (patch-src_term_c) = d84743118cf44a82edb20dd5a0f7519b4cd67171
+SHA1 (patch-src_search.c) = 5c22528aef657d66b748479cfb6332893e973820
+SHA1 (patch-src_search_c) = 8fd573013e45d52f2c0524165e3e6833dfa3c4e2
+SHA1 (patch-src_term_c) = 3240fcbf390cd43d4308669393633506e8a83135
 SHA1 (patch-src_textprop_c) = 5eb63b06d2bfc972ca1f017cb079c4b11839aedc
 SHA1 (patch-src_tparam_c) = 382ea3588361af358f9259f6348af8c4c0185515
+SHA1 (patch-src_undo.c) = 588c7fd508ee0961cec2a32e5559a36ecd134591
+SHA1 (patch-src_window.c) = 4b148c3cff6d5cda57b8cb87559bc46b2fba70bf
 SHA1 (patch-src_xdisp_c) = 32171440531db8ab9fa2af36648f5123149e1f3f
 SHA1 (patch-src_xfaces_c) = c07e1068b4eebc9185d8246756179899148a8f97
 SHA1 (patch-src_xmenu_c) = ebd9a100bc1403e0df0bd760a93805dc10cc5e3c
diff --git a/editors/mule/patches/patch-af b/editors/mule/patches/patch-af
index 88dc93e9981..d6e5b3d1a11 100644
--- a/editors/mule/patches/patch-af
+++ b/editors/mule/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.2 2005/12/01 18:13:24 wiz Exp $
+$NetBSD: patch-af,v 1.3 2013/04/21 15:39:59 joerg Exp $
 
---- src/lisp.h.orig	1994-10-21 05:20:28.000000000 +0100
+--- src/lisp.h.orig	1994-10-21 04:20:28.000000000 +0000
 +++ src/lisp.h
 @@ -30,6 +30,10 @@ the Free Software Foundation, 675 Mass A
  /* 93.1.15  modified for Mule Ver.0.9.7.1 by Y.Akiba <akiba@cbs.canon.co.jp>
@@ -13,3 +13,8 @@ $NetBSD: patch-af,v 1.2 2005/12/01 18:13:24 wiz Exp $
  /* Define the fundamental Lisp data structures */
  
  /* Define an integer type with the same size as Lisp_Object.
+@@ -1550,3 +1554,4 @@ extern char *egetenv ();
+  
+ /* Set up the name of the machine we're running on.  */
+ extern void init_system_name ();
++void init_data (void);
diff --git a/editors/mule/patches/patch-ah b/editors/mule/patches/patch-ah
index c6d7e534bc3..c4664d0f7fe 100644
--- a/editors/mule/patches/patch-ah
+++ b/editors/mule/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.4 2011/12/24 17:07:07 dholland Exp $
+$NetBSD: patch-ah,v 1.5 2013/04/21 15:39:59 joerg Exp $
 
 - use standard headers
 - don't declare own errno
@@ -6,19 +6,31 @@ $NetBSD: patch-ah,v 1.4 2011/12/24 17:07:07 dholland Exp $
 
 --- src/fileio.c.orig	1995-06-23 10:25:18.000000000 +0000
 +++ src/fileio.c
-@@ -117,10 +117,7 @@ the Free Software Foundation, 675 Mass A
+@@ -116,10 +116,7 @@ the Free Software Foundation, 675 Mass A
+ #endif
  
  #include <errno.h>
-+#include <stdlib.h>
- 
+-
 -#ifndef vax11c
 -extern int errno;
 -#endif
--
++#include <stdlib.h>
+ 
  extern char *strerror ();
  
- #ifdef APOLLO
-@@ -2604,8 +2601,6 @@ The value is an integer.")
+@@ -1788,10 +1785,7 @@ expand_and_dir_to_file (filename, defdir
+   return abspath;
+ }
+ 
+-barf_or_query_if_file_exists (absname, querystring, interactive)
+-     Lisp_Object absname;
+-     unsigned char *querystring;
+-     int interactive;
++static void barf_or_query_if_file_exists (Lisp_Object absname, unsigned char *querystring, int interactive)
+ {
+   register Lisp_Object tem;
+   struct stat statbuf;
+@@ -2604,8 +2598,6 @@ The value is an integer.")
    return value;
  }
  
@@ -27,7 +39,7 @@ $NetBSD: patch-ah,v 1.4 2011/12/24 17:07:07 dholland Exp $
  DEFUN ("unix-sync", Funix_sync, Sunix_sync, 0, 0, "",
    "Tell Unix to finish all pending disk updates.")
    ()
-@@ -2614,8 +2609,6 @@ DEFUN ("unix-sync", Funix_sync, Sunix_sy
+@@ -2614,8 +2606,6 @@ DEFUN ("unix-sync", Funix_sync, Sunix_sy
    return Qnil;
  }
  
@@ -36,7 +48,7 @@ $NetBSD: patch-ah,v 1.4 2011/12/24 17:07:07 dholland Exp $
  DEFUN ("file-newer-than-file-p", Ffile_newer_than_file_p, Sfile_newer_than_file_p, 2, 2, 0,
    "Return t if file FILE1 is newer than file FILE2.\n\
  If FILE1 does not exist, the answer is nil;\n\
-@@ -4507,7 +4500,5 @@ This applies only to the operation `inhi
+@@ -4507,7 +4497,5 @@ This applies only to the operation `inhi
    defsubr (&Sread_file_name_internal);
    defsubr (&Sread_file_name);
  
diff --git a/editors/mule/patches/patch-ak b/editors/mule/patches/patch-ak
index d7ebd0581a7..f700368f525 100644
--- a/editors/mule/patches/patch-ak
+++ b/editors/mule/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.4 2011/12/24 17:07:07 dholland Exp $
+$NetBSD: patch-ak,v 1.5 2013/04/21 15:39:59 joerg Exp $
 
 - use standard headers
 - don't declare own errno
@@ -32,3 +32,39 @@ $NetBSD: patch-ak,v 1.4 2011/12/24 17:07:07 dholland Exp $
  
  Lisp_Object Qself_insert_command;
  Lisp_Object Qforward_char;
+@@ -582,8 +581,7 @@ echo_prompt (str)
+    C can be a character, which is printed prettily ("M-C-x" and all that
+    jazz), or a symbol, whose name is printed.  */
+ 
+-echo_char (c)
+-     Lisp_Object c;
++static void echo_char(Lisp_Object c)
+ {
+   extern char *push_key_description ();
+ 
+@@ -629,7 +627,7 @@ echo_char (c)
+ /* Temporarily add a dash to the end of the echo string if it's not
+    empty, so that it serves as a mini-prompt for the very next character.  */
+ 
+-echo_dash ()
++static void echo_dash (void)
+ {
+   if (!immediate_echo && echoptr == echobuf)
+     return;
+@@ -3570,7 +3568,7 @@ gobble_input (expected)
+ /* Put a buffer_switch_event in the buffer
+    so that read_key_sequence will notice the new current buffer.  */
+ 
+-record_asynch_buffer_change ()
++void record_asynch_buffer_change(void)
+ {
+   struct input_event event;
+   Lisp_Object tem;
+@@ -5633,7 +5631,6 @@ On such systems, Emacs starts a subshell
+   int old_height, old_width;
+   int width, height;
+   struct gcpro gcpro1, gcpro2;
+-  extern init_sys_modes ();
+ 
+   if (!NILP (stuffstring))
+     CHECK_STRING (stuffstring, 0);
diff --git a/editors/mule/patches/patch-bf b/editors/mule/patches/patch-bf
index 1c0e86dccd3..a5edf3347ae 100644
--- a/editors/mule/patches/patch-bf
+++ b/editors/mule/patches/patch-bf
@@ -1,8 +1,17 @@
-$NetBSD: patch-bf,v 1.3 2006/01/04 20:35:08 joerg Exp $
+$NetBSD: patch-bf,v 1.4 2013/04/21 15:39:59 joerg Exp $
 
 --- src/emacs.c.orig	1995-06-08 05:58:13.000000000 +0000
 +++ src/emacs.c
-@@ -410,6 +410,8 @@ __main ()
+@@ -108,6 +108,8 @@ the Free Software Foundation, 675 Mass A
+ #define O_RDWR 2
+ #endif
+ 
++void init_display (void);
++
+ extern void malloc_warning ();
+ extern char *index ();
+ extern char *strerror ();
+@@ -410,6 +412,8 @@ __main ()
  NXZone *emacszone;
  #endif
  
@@ -11,7 +20,7 @@ $NetBSD: patch-bf,v 1.3 2006/01/04 20:35:08 joerg Exp $
  /* ARGSUSED */
  main (argc, argv, envp)
       int argc;
-@@ -418,8 +420,9 @@ main (argc, argv, envp)
+@@ -418,8 +422,9 @@ main (argc, argv, envp)
  {
    char stack_bottom_variable;
    int skip_args = 0;
diff --git a/editors/mule/patches/patch-bx b/editors/mule/patches/patch-bx
index 32dba218c29..9c7e04e6af7 100644
--- a/editors/mule/patches/patch-bx
+++ b/editors/mule/patches/patch-bx
@@ -1,15 +1,15 @@
-$NetBSD: patch-bx,v 1.2 2011/12/24 17:07:07 dholland Exp $
+$NetBSD: patch-bx,v 1.3 2013/04/21 15:39:59 joerg Exp $
 
---- lib-src/emacsserver.c.orig	2006-01-04 17:43:55.000000000 +0000
+--- lib-src/emacsserver.c.orig	1994-08-06 22:27:17.000000000 +0000
 +++ lib-src/emacsserver.c
-@@ -56,8 +56,8 @@ main ()
+@@ -55,8 +55,8 @@ main ()
+ #include <sys/un.h>
  #include <stdio.h>
  #include <errno.h>
+-
+-extern int errno;
 +#include <stdlib.h>
 +#include <string.h>
  
--extern int errno;
--
  main ()
  {
-   char system_name[32];
diff --git a/editors/mule/patches/patch-cb b/editors/mule/patches/patch-cb
index f2f1ff5af08..ceaeff9fa22 100644
--- a/editors/mule/patches/patch-cb
+++ b/editors/mule/patches/patch-cb
@@ -1,19 +1,20 @@
-$NetBSD: patch-cb,v 1.2 2011/12/24 17:07:07 dholland Exp $
+$NetBSD: patch-cb,v 1.3 2013/04/21 15:39:59 joerg Exp $
 
 - use standard headers
 - don't declare own errno
 
 --- src/dispnew.c.orig	1995-02-03 01:21:28.000000000 +0000
 +++ src/dispnew.c
-@@ -59,6 +59,7 @@ the Free Software Foundation, 675 Mass A
+@@ -59,6 +59,8 @@ the Free Software Foundation, 675 Mass A
  
  #include <stdio.h>
  #include <ctype.h>
 +#include <stdlib.h>
++#include <unistd.h>
  
  #include "lisp.h"
  #include "termchar.h"
-@@ -2047,7 +2048,6 @@ SIGTYPE
+@@ -2047,7 +2049,6 @@ SIGTYPE
  window_change_signal ()
  {
    int width, height;
@@ -21,3 +22,23 @@ $NetBSD: patch-cb,v 1.2 2011/12/24 17:07:07 dholland Exp $
    int old_errno = errno;
  
    get_frame_size (&width, &height);
+@@ -2111,9 +2112,7 @@ do_pending_window_change ()
+    redisplay.  Since this tries to resize windows, we can't call it
+    from a signal handler.  */
+ 
+-change_frame_size (frame, newheight, newwidth, pretend, delay)
+-     register FRAME_PTR frame;
+-     int newheight, newwidth, pretend;
++void change_frame_size (FRAME_PTR frame, int newheight, int newwidth, int pretend, int delay)
+ {
+   /* If we can't deal with the change now, queue it for later.  */
+   if (delay)
+@@ -2451,7 +2450,7 @@ char *terminal_type;
+ /* Then invoke its decoding routine to set up variables
+   in the terminal package */
+ 
+-init_display ()
++void init_display (void)
+ {
+ #ifdef HAVE_X_WINDOWS
+   extern int display_arg;
diff --git a/editors/mule/patches/patch-cd b/editors/mule/patches/patch-cd
index 0aced7cd13f..4b57ded55a8 100644
--- a/editors/mule/patches/patch-cd
+++ b/editors/mule/patches/patch-cd
@@ -1,4 +1,4 @@
-$NetBSD: patch-cd,v 1.2 2011/12/24 17:07:07 dholland Exp $
+$NetBSD: patch-cd,v 1.3 2013/04/21 15:39:59 joerg Exp $
 
 - use standard headers
 - don't declare own errno
@@ -22,3 +22,43 @@ $NetBSD: patch-cd,v 1.2 2011/12/24 17:07:07 dholland Exp $
  /* A mask of extra modifier bits to put into every keyboard char.  */
  extern int extra_keyboard_modifiers;
  
+@@ -385,7 +384,7 @@ static void dumpqueue ();
+ 
+ void dumpborder ();
+ static int XTcursor_to ();
+-static int XTclear_end_of_line ();
++static void XTclear_end_of_line (int);
+ 
+ #ifdef MULE			/* 94.7.1 by K.Handa */
+ /* Defined in ccl.c */
+@@ -1055,9 +1054,8 @@ XTwrite_glyphs (start, len)
+    to column FIRST_UNUSED (exclusive).  The idea is that everything
+    from FIRST_UNUSED onward is already erased.  */
+   
+-static int
+-XTclear_end_of_line (first_unused)
+-     register int first_unused;
++static void
++XTclear_end_of_line(int first_unused)
+ {
+   struct frame *f = updating_frame;
+   int mask;
+@@ -1419,7 +1417,7 @@ XTflash (f)
+ #define XRINGBELL XFeep (0);
+ #endif /* ! defined (HAVE_X11) */
+ 
+-XTring_bell ()
++static void XTring_bell (void)
+ {
+   if (x_current_display == 0)
+     return;
+@@ -6204,8 +6202,7 @@ x_make_frame_invisible (f)
+ 
+ /* Change window state from mapped to iconified. */
+ 
+-x_iconify_frame (f)
+-     struct frame *f;
++void x_iconify_frame(struct frame *f)
+ {
+   int mask;
+   int result;
diff --git a/editors/mule/patches/patch-ce b/editors/mule/patches/patch-ce
index a57744c3581..fd36a59ce0e 100644
--- a/editors/mule/patches/patch-ce
+++ b/editors/mule/patches/patch-ce
@@ -1,4 +1,4 @@
-$NetBSD: patch-ce,v 1.2 2011/12/24 17:07:07 dholland Exp $
+$NetBSD: patch-ce,v 1.3 2013/04/21 15:39:59 joerg Exp $
 
 - use standard headers
 - don't declare own errno
@@ -24,3 +24,30 @@ $NetBSD: patch-ce,v 1.2 2011/12/24 17:07:07 dholland Exp $
  #ifdef VMS
  #include <rms.h>
  #include <ttdef.h>
+@@ -204,7 +205,7 @@ change_input_fd (fd)
+ 
+ /* Discard pending input on descriptor input_fd.  */
+ 
+-discard_tty_input ()
++void discard_tty_input (void)
+ {
+   struct emacs_tty buf;
+ 
+@@ -1096,7 +1097,7 @@ static struct ltchars new_ltchars = {-1,
+   static struct tchars new_tchars = {-1,-1,-1,-1,-1,-1};
+ #endif 
+ 
+-init_sys_modes ()
++void init_sys_modes(void)
+ {
+   struct emacs_tty tty;
+ 
+@@ -1515,7 +1516,7 @@ set_window_size (fd, height, width)
+ 
+ /* Prepare the terminal for exiting Emacs; move the cursor to the
+    bottom of the frame, turn off interrupt-driven I/O, etc.  */
+-reset_sys_modes ()
++void reset_sys_modes(void)
+ {
+   if (noninteractive)
+     {
diff --git a/editors/mule/patches/patch-cf b/editors/mule/patches/patch-cf
index 6cb90cee3aa..5adea626ab1 100644
--- a/editors/mule/patches/patch-cf
+++ b/editors/mule/patches/patch-cf
@@ -1,4 +1,4 @@
-$NetBSD: patch-cf,v 1.2 2011/12/24 17:07:07 dholland Exp $
+$NetBSD: patch-cf,v 1.3 2013/04/21 15:39:59 joerg Exp $
 
 - use standard headers
 - don't declare own errno
@@ -13,7 +13,7 @@ $NetBSD: patch-cf,v 1.2 2011/12/24 17:07:07 dholland Exp $
  #include <config.h>
  
  #ifdef VMS
-@@ -56,8 +57,6 @@ extern DIR *opendir ();
+@@ -56,11 +57,11 @@ extern DIR *opendir ();
  #endif /* not SYSV_SYSTEM_DIR */
  #endif /* not MCPATH */
  
@@ -22,3 +22,18 @@ $NetBSD: patch-cf,v 1.2 2011/12/24 17:07:07 dholland Exp $
  extern char *egetenv ();
  extern char *strcpy ();
  
++static void lock_superlock(char *lfname);
++
+ #ifdef DECLARE_GETPWUID_WITH_UID_T
+ extern struct passwd *getpwuid (uid_t);
+ #else
+@@ -341,8 +342,7 @@ unlock_file (fn)
+   unlink (superlock_path);
+ }
+ 
+-lock_superlock (lfname)
+-     char *lfname;
++static void lock_superlock(char *lfname)
+ {
+   register int i, fd;
+   DIR *lockdir;
diff --git a/editors/mule/patches/patch-ch b/editors/mule/patches/patch-ch
index f093eb46a15..3fbde24e57f 100644
--- a/editors/mule/patches/patch-ch
+++ b/editors/mule/patches/patch-ch
@@ -1,17 +1,20 @@
-$NetBSD: patch-ch,v 1.2 2011/12/24 17:07:07 dholland Exp $
+$NetBSD: patch-ch,v 1.3 2013/04/21 15:39:59 joerg Exp $
 
 - use standard headers
 - don't declare own errno
 
---- src/callproc.c.orig	2006-01-04 18:33:30.000000000 +0000
+--- src/callproc.c.orig	1995-07-17 04:54:29.000000000 +0000
 +++ src/callproc.c
-@@ -57,7 +57,7 @@ the Free Software Foundation, 675 Mass A
+@@ -56,9 +56,10 @@ the Free Software Foundation, 675 Mass A
+ 
  #include <config.h>
  #include <stdio.h>
 +#include <stdlib.h>
 +#include <string.h>
++#include <unistd.h>
  
 -extern int errno;
 -extern char *strerror ();
  
  /* Define SIGCHLD as an alias for SIGCLD.  */
+ 
diff --git a/editors/mule/patches/patch-cj b/editors/mule/patches/patch-cj
index 3db5017338d..bac7fb4c9f5 100644
--- a/editors/mule/patches/patch-cj
+++ b/editors/mule/patches/patch-cj
@@ -1,18 +1,19 @@
-$NetBSD: patch-cj,v 1.1 2010/07/11 03:00:33 obache Exp $
+$NetBSD: patch-cj,v 1.2 2013/04/21 15:39:59 joerg Exp $
 
 --- src/wnnfns.c.orig	1995-05-30 06:49:10.000000000 +0000
 +++ src/wnnfns.c
-@@ -322,6 +322,9 @@ static struct wnn_env *wnnfns_env_rev[NS
+@@ -322,6 +322,10 @@ static struct wnn_env *wnnfns_env_rev[NS
  static int wnnfns_norm;
  static unsigned char lc_wnn_server_type[NSERVER] = {LCJP, LCCN, LCINV, LCKR};
  
 +static int yes_or_no();
 +static void puts2();
++static void w2y(w_char *w);
 +
  /* Lisp Variables and Constants Definition */
  Lisp_Object	Qjserver;
  Lisp_Object	Qcserver;
-@@ -430,8 +433,6 @@ Specify password files of dictionary and
+@@ -430,8 +434,6 @@ Specify password files of dictionary and
       int			nargs;
       register Lisp_Object	*args;
  {
@@ -21,7 +22,22 @@ $NetBSD: patch-cj,v 1.1 2010/07/11 03:00:33 obache Exp $
    struct gcpro gcpro1;
    int	snum;
    CHECK_STRING (args[0], 0);
-@@ -1242,8 +1243,6 @@ Specify password files of dictionary and
+@@ -539,12 +541,12 @@ DEFUN ("wnn-server-set-rev", Fwnn_set_re
+   int	snum;
+   if ((snum = check_wnn_server_type()) == -1) return Qnil;
+   if(rev == Qnil){
+-    if((!wnnfns_buf[snum]) || (!wnnfns_env_norm[snum])) return;
++    if((!wnnfns_buf[snum]) || (!wnnfns_env_norm[snum])) return Qnil;
+     jl_env_set(wnnfns_buf[snum], wnnfns_env_norm[snum]);
+     wnnfns_norm = 1;
+   }
+   else{
+-    if((!wnnfns_buf[snum]) || (!wnnfns_env_rev[snum])) return;
++    if((!wnnfns_buf[snum]) || (!wnnfns_env_rev[snum])) return Qnil;
+     jl_env_set(wnnfns_buf[snum], wnnfns_env_rev[snum]);
+     wnnfns_norm = 0;
+   }
+@@ -1242,8 +1244,6 @@ Specify password files of dictionary and
       int                        nargs;
       register Lisp_Object       *args;
  {
@@ -30,7 +46,7 @@ $NetBSD: patch-cj,v 1.1 2010/07/11 03:00:33 obache Exp $
    struct gcpro gcpro1;
    int   snum;
    CHECK_STRING (args[0], 0);
-@@ -1278,8 +1277,6 @@ Specify password files of dictionary and
+@@ -1278,8 +1278,6 @@ Specify password files of dictionary and
       int                        nargs;
       register Lisp_Object       *args;
  {
@@ -39,7 +55,7 @@ $NetBSD: patch-cj,v 1.1 2010/07/11 03:00:33 obache Exp $
    struct gcpro gcpro1;
    int   snum;
    CHECK_STRING (args[0], 0);
-@@ -1314,8 +1311,6 @@ Specify password files of dictionary and
+@@ -1314,8 +1312,6 @@ Specify password files of dictionary and
       int                        nargs;
       register Lisp_Object       *args;
  {
@@ -48,7 +64,7 @@ $NetBSD: patch-cj,v 1.1 2010/07/11 03:00:33 obache Exp $
    struct gcpro gcpro1;
    int   snum;
    int	dic_no;
-@@ -1376,8 +1371,6 @@ Specify password files of dictionary and
+@@ -1376,8 +1372,6 @@ Specify password files of dictionary and
       int                        nargs;
       register Lisp_Object       *args;
  {
@@ -57,3 +73,13 @@ $NetBSD: patch-cj,v 1.1 2010/07/11 03:00:33 obache Exp $
    struct gcpro gcpro1;
    int   snum;
    int   dic_no;
+@@ -1918,8 +1912,7 @@ int x;
+ }
+ 
+ /* static void */
+-w2y(w)
+-w_char *w;
++static void w2y(w_char *w)
+ {
+   unsigned long		pbuf[5000], ybuf[5000];
+   unsigned long		*pin;
diff --git a/editors/mule/patches/patch-src_abbrev_c b/editors/mule/patches/patch-src_abbrev_c
index 51634c1b33b..e63bc3e6c62 100644
--- a/editors/mule/patches/patch-src_abbrev_c
+++ b/editors/mule/patches/patch-src_abbrev_c
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_abbrev_c,v 1.1 2011/12/24 17:07:07 dholland Exp $
+$NetBSD: patch-src_abbrev_c,v 1.2 2013/04/21 15:39:59 joerg Exp $
 
 - use standard headers
 
---- src/abbrev.c~	1993-09-13 11:20:03.000000000 +0000
+--- src/abbrev.c.orig	1993-09-13 11:20:03.000000000 +0000
 +++ src/abbrev.c
 @@ -20,6 +20,7 @@ the Free Software Foundation, 675 Mass A
  
@@ -12,3 +12,27 @@ $NetBSD: patch-src_abbrev_c,v 1.1 2011/12/24 17:07:07 dholland Exp $
  #include "lisp.h"
  #include "commands.h"
  #include "buffer.h"
+@@ -369,9 +370,8 @@ is not undone.")
+   return Qnil;
+ }
+ 
+-static
+-write_abbrev (sym, stream)
+-     Lisp_Object sym, stream;
++static void
++write_abbrev (Lisp_Object sym, Lisp_Object stream)
+ {
+   Lisp_Object name;
+   if (NILP (XSYMBOL (sym)->value))
+@@ -388,9 +388,8 @@ write_abbrev (sym, stream)
+   insert (")\n", 2);
+ }
+ 
+-static
+-describe_abbrev (sym, stream)
+-     Lisp_Object sym, stream;
++static void
++describe_abbrev (Lisp_Object sym, Lisp_Object stream)
+ {
+   Lisp_Object one;
+ 
diff --git a/editors/mule/patches/patch-src_buffer_h b/editors/mule/patches/patch-src_buffer_h
index 94e039983dd..fe923545a32 100644
--- a/editors/mule/patches/patch-src_buffer_h
+++ b/editors/mule/patches/patch-src_buffer_h
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_buffer_h,v 1.1 2011/12/24 17:07:07 dholland Exp $
+$NetBSD: patch-src_buffer_h,v 1.2 2013/04/21 15:39:59 joerg Exp $
 
 - use standard headers
 
---- src/buffer.h~	1995-06-09 08:31:18.000000000 +0000
+--- src/buffer.h.orig	1995-06-09 08:31:18.000000000 +0000
 +++ src/buffer.h
 @@ -40,6 +40,8 @@ the Free Software Foundation, 675 Mass A
  /* 93.7.7   modified for Mule Ver.0.9.8 by K.Handa <handa@etl.go.jp>
@@ -13,3 +13,13 @@ $NetBSD: patch-src_buffer_h,v 1.1 2011/12/24 17:07:07 dholland Exp $
  #ifdef USE_TEXT_PROPERTIES
  #define SET_PT(position) (set_point ((position), current_buffer))
  #define TEMP_SET_PT(position) (temp_set_point ((position), current_buffer))
+@@ -471,3 +473,9 @@ extern char *r_re_alloc();
+ #define BUFFER_FREE(data) (free ((data)))
+ #define R_ALLOC_DECLARE(var,data)
+ #endif
++
++void unchain_marker (Lisp_Object marker);
++void record_insert (Lisp_Object beg, Lisp_Object length);
++void record_delete (int beg, int length);
++void record_first_change (void);
++void record_property_change (int beg, int length, Lisp_Object prop, Lisp_Object value, Lisp_Object buffer);
diff --git a/editors/mule/patches/patch-src_canna.c b/editors/mule/patches/patch-src_canna.c
new file mode 100644
index 00000000000..23ec9b9ea52
--- /dev/null
+++ b/editors/mule/patches/patch-src_canna.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_canna.c,v 1.1 2013/04/21 15:39:59 joerg Exp $
+
+--- src/canna.c.orig	1995-02-17 07:47:37.000000000 +0000
++++ src/canna.c
+@@ -1318,7 +1318,7 @@ int len,pos,rev,*clen,*cpos,*crev;
+   unsigned char *q = p;
+   
+   *clen = *cpos = *crev = 0;
+-  if (len == 0) return;
++  if (len == 0) return 0;
+   while (q < p + pos) {
+     (*clen)++;
+     (*cpos)++;
diff --git a/editors/mule/patches/patch-src_casefiddle.c b/editors/mule/patches/patch-src_casefiddle.c
new file mode 100644
index 00000000000..85cd046411e
--- /dev/null
+++ b/editors/mule/patches/patch-src_casefiddle.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_casefiddle.c,v 1.1 2013/04/21 15:39:59 joerg Exp $
+
+--- src/casefiddle.c.orig	1994-05-04 02:30:58.000000000 +0000
++++ src/casefiddle.c
+@@ -104,9 +104,7 @@ The argument object is not altered.")
+ /* flag is CASE_UP, CASE_DOWN or CASE_CAPITALIZE or CASE_CAPITALIZE_UP.
+    b and e specify range of buffer to operate on. */
+ 
+-casify_region (flag, b, e)
+-     enum case_action flag;
+-     Lisp_Object b, e;
++static void casify_region (enum case_action flag, Lisp_Object b, Lisp_Object e)
+ {
+   register int i;
+   register int c;
diff --git a/editors/mule/patches/patch-src_cm.c b/editors/mule/patches/patch-src_cm.c
new file mode 100644
index 00000000000..3478cb4ac3a
--- /dev/null
+++ b/editors/mule/patches/patch-src_cm.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_cm.c,v 1.1 2013/04/21 15:39:59 joerg Exp $
+
+--- src/cm.c.orig	1994-10-21 04:19:53.000000000 +0000
++++ src/cm.c
+@@ -282,7 +282,7 @@ losecursor ()
+ #define	USELL	2
+ #define	USECR	3
+ 
+-cmgoto (row, col)
++void cmgoto (int row, int col)
+ {
+     int     homecost,
+             crcost,
diff --git a/editors/mule/patches/patch-src_cm.h b/editors/mule/patches/patch-src_cm.h
new file mode 100644
index 00000000000..2c2938db7d6
--- /dev/null
+++ b/editors/mule/patches/patch-src_cm.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_cm.h,v 1.1 2013/04/21 15:39:59 joerg Exp $
+
+--- src/cm.h.orig	1993-09-12 01:20:36.000000000 +0000
++++ src/cm.h
+@@ -164,6 +164,6 @@ extern int evalcost ();
+ 
+ extern void cmputc ();
+ extern int cmcostinit ();
+-extern int cmgoto ();
++extern void cmgoto (int, int);
+ extern int Wcm_clear ();
+ extern int Wcm_init ();
diff --git a/editors/mule/patches/patch-src_data.c b/editors/mule/patches/patch-src_data.c
new file mode 100644
index 00000000000..30261782ea4
--- /dev/null
+++ b/editors/mule/patches/patch-src_data.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_data.c,v 1.1 2013/04/21 15:39:59 joerg Exp $
+
+--- src/data.c.orig	2013-03-01 17:41:37.000000000 +0000
++++ src/data.c
+@@ -2369,7 +2369,7 @@ arith_error (signo)
+   Fsignal (Qarith_error, Qnil);
+ }
+ 
+-init_data ()
++void init_data (void)
+ {
+   /* Don't do this if just dumping out.
+      We don't want to call `signal' in this case
diff --git a/editors/mule/patches/patch-src_dired_c b/editors/mule/patches/patch-src_dired_c
index e29abeb6168..1585cf96629 100644
--- a/editors/mule/patches/patch-src_dired_c
+++ b/editors/mule/patches/patch-src_dired_c
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_dired_c,v 1.1 2011/12/24 17:07:07 dholland Exp $
+$NetBSD: patch-src_dired_c,v 1.2 2013/04/21 15:39:59 joerg Exp $
 
 - use standard headers
 
---- src/dired.c~	1994-11-11 00:35:50.000000000 +0000
+--- src/dired.c.orig	1994-11-11 00:35:50.000000000 +0000
 +++ src/dired.c
 @@ -21,6 +21,7 @@ the Free Software Foundation, 675 Mass A
  #include <config.h>
@@ -12,3 +12,12 @@ $NetBSD: patch-src_dired_c,v 1.1 2011/12/24 17:07:07 dholland Exp $
  #include <sys/types.h>
  #include <sys/stat.h>
  
+@@ -159,7 +160,7 @@ If NOSORT is non-nil, the list is not so
+       compile_pattern (match, &searchbuf, 0,
+ 		       buffer_defaults.downcase_table->contents);
+ #else
+-      compile_pattern (match, &searchbuf, 0, 0);
++      compile_pattern (match, &searchbuf, 0, 0, 0);
+ #endif
+     }
+ 
diff --git a/editors/mule/patches/patch-src_frame.h b/editors/mule/patches/patch-src_frame.h
new file mode 100644
index 00000000000..2a44ccced1a
--- /dev/null
+++ b/editors/mule/patches/patch-src_frame.h
@@ -0,0 +1,43 @@
+$NetBSD: patch-src_frame.h,v 1.1 2013/04/21 15:39:59 joerg Exp $
+
+--- src/frame.h.orig	1994-10-21 04:20:17.000000000 +0000
++++ src/frame.h
+@@ -286,6 +286,8 @@ struct frame
+ 
+ typedef struct frame *FRAME_PTR;
+ 
++void change_frame_size (FRAME_PTR frame, int newheight, int newwidth, int pretend, int delay);
++
+ #define XFRAME(p) ((struct frame *) XPNTR (p))
+ #define XSETFRAME(p, v) ((struct frame *) XSETPNTR (p, v))
+ 
+@@ -427,6 +429,29 @@ extern Lisp_Object Vframe_list;
+ extern Lisp_Object Vdefault_frame_alist;
+ 
+ extern Lisp_Object Vterminal_frame;
++
++void set_window_width (Lisp_Object window, int width, int nodelete);
++void set_window_height (Lisp_Object window, int height, int nodelete);
++void write_glyphs (GLYPH *string, int len);
++void insert_glyphs (GLYPH *start, int len);
++void clear_frame(void);
++void delete_glyphs(int n);
++void ins_del_lines (int vpos, int n);
++void calculate_costs(FRAME_PTR frame);
++void cursor_to (int row, int col);
++void change_line_highlight (int new_highlight, int vpos, int first_unused_hpos);
++void update_end (FRAME_PTR f);
++void set_terminal_window (int size);
++void reassert_line_highlight(int highlight, int vpos);
++void ring_bell(void);
++void set_terminal_modes(void);
++void reset_terminal_modes(void);
++void x_iconify_frame(struct frame *f);
++void discard_tty_input (void);
++void init_sys_modes(void);
++void reset_sys_modes(void);
++void del_range_1 (int from, int to, int prepare);
++void del_range (int from, int to);
+ 
+ #else /* not MULTI_FRAME */
+ 
diff --git a/editors/mule/patches/patch-src_insdel.c b/editors/mule/patches/patch-src_insdel.c
new file mode 100644
index 00000000000..67c96bf6c7a
--- /dev/null
+++ b/editors/mule/patches/patch-src_insdel.c
@@ -0,0 +1,26 @@
+$NetBSD: patch-src_insdel.c,v 1.1 2013/04/21 15:39:59 joerg Exp $
+
+--- src/insdel.c.orig	1994-10-24 03:58:26.000000000 +0000
++++ src/insdel.c
+@@ -589,17 +589,16 @@ insert_from_string_after_markers (string
+ 
+ /* Delete characters in current buffer
+    from FROM up to (but not including) TO.  */
++void del_range_1 (int from, int to, int prepare);
+ 
+-del_range (from, to)
+-     register int from, to;
++void del_range (int from, int to)
+ {
+-  return del_range_1 (from, to, 1);
++  del_range_1 (from, to, 1);
+ }
+ 
+ /* Like del_range; PREPARE says whether to call prepare_to_modify_buffer.  */
+ 
+-del_range_1 (from, to, prepare)
+-     register int from, to, prepare;
++void del_range_1 (int from, int to, int prepare)
+ {
+   register int numdel;
+ 
diff --git a/editors/mule/patches/patch-src_keyboard.h b/editors/mule/patches/patch-src_keyboard.h
new file mode 100644
index 00000000000..85e7fe56444
--- /dev/null
+++ b/editors/mule/patches/patch-src_keyboard.h
@@ -0,0 +1,9 @@
+$NetBSD: patch-src_keyboard.h,v 1.1 2013/04/21 15:39:59 joerg Exp $
+
+--- src/keyboard.h.orig	1994-08-28 19:59:19.000000000 +0000
++++ src/keyboard.h
+@@ -105,3 +105,4 @@ extern Lisp_Object read_char ();
+ extern Lisp_Object Vkeyboard_translate_table;
+ 
+ extern Lisp_Object map_prompt ();
++void record_asynch_buffer_change(void);
diff --git a/editors/mule/patches/patch-src_marker.c b/editors/mule/patches/patch-src_marker.c
new file mode 100644
index 00000000000..3bfdfd647ed
--- /dev/null
+++ b/editors/mule/patches/patch-src_marker.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_marker.c,v 1.1 2013/04/21 15:40:00 joerg Exp $
+
+--- src/marker.c.orig	1994-10-21 04:20:33.000000000 +0000
++++ src/marker.c
+@@ -221,8 +221,7 @@ DEFUN ("marker-point-type", Fmarker_poin
+    so we must be careful to ignore and preserve mark bits,
+    including those in chain fields of markers.  */
+ 
+-unchain_marker (marker)
+-     register Lisp_Object marker;
++void unchain_marker (Lisp_Object marker)
+ {
+   register Lisp_Object tail, prev, next;
+   register Lisp_Object_Int omark;
diff --git a/editors/mule/patches/patch-src_regex19.h b/editors/mule/patches/patch-src_regex19.h
new file mode 100644
index 00000000000..aaa246fd425
--- /dev/null
+++ b/editors/mule/patches/patch-src_regex19.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_regex19.h,v 1.1 2013/04/21 15:40:00 joerg Exp $
+
+--- src/regex19.h.orig	1994-10-24 07:50:11.000000000 +0000
++++ src/regex19.h
+@@ -542,6 +542,8 @@ extern size_t regerror
+              size_t errbuf_size));
+ extern void regfree _RE_ARGS ((regex_t *preg));
+ 
++void compile_pattern (Lisp_Object pattern, struct re_pattern_buffer *bufp, struct re_registers *regp, char *translate, int backward);
++
+ #endif /* not __REGEXP_LIBRARY_H__ */
+ 
+ /*
diff --git a/editors/mule/patches/patch-src_search.c b/editors/mule/patches/patch-src_search.c
new file mode 100644
index 00000000000..55c14264d86
--- /dev/null
+++ b/editors/mule/patches/patch-src_search.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_search.c,v 1.1 2013/04/21 15:40:00 joerg Exp $
+
+--- src/search.c.orig	1995-07-21 06:12:16.000000000 +0000
++++ src/search.c
+@@ -115,12 +115,7 @@ matcher_overflow ()
+ 
+ /* Compile a regexp and signal a Lisp error if anything goes wrong.  */
+ 
+-compile_pattern (pattern, bufp, regp, translate, backward)
+-     Lisp_Object pattern;
+-     struct re_pattern_buffer *bufp;
+-     struct re_registers *regp;
+-     char *translate;
+-     int backward;
++void compile_pattern (Lisp_Object pattern, struct re_pattern_buffer *bufp, struct re_registers *regp, char *translate, int backward)
+ {
+   CONST char *val;
+   Lisp_Object dummy;
diff --git a/editors/mule/patches/patch-src_search_c b/editors/mule/patches/patch-src_search_c
index 4a12e12ce15..c06a5c12693 100644
--- a/editors/mule/patches/patch-src_search_c
+++ b/editors/mule/patches/patch-src_search_c
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_search_c,v 1.1 2011/12/24 17:07:07 dholland Exp $
+$NetBSD: patch-src_search_c,v 1.2 2013/04/21 15:40:00 joerg Exp $
 
 - use standard headers
 
---- src/regex19.c.~3~	1996-07-16 01:44:24.000000000 +0000
+--- src/regex19.c.orig	1996-07-16 01:44:24.000000000 +0000
 +++ src/regex19.c
 @@ -25,6 +25,8 @@
    #pragma alloca
@@ -13,3 +13,12 @@ $NetBSD: patch-src_search_c,v 1.1 2011/12/24 17:07:07 dholland Exp $
  #define _GNU_SOURCE
  
  #ifdef HAVE_CONFIG_H
+@@ -3455,7 +3457,7 @@ re_compile_fastmap (bufp)
+ 	case categoryspec:
+ 	case notcategoryspec:
+ 	  bufp->can_be_null = 1;
+-	  return;
++	  return 0;
+ #endif /* MULE */
+ 
+       /* All cases after this match the empty string.  These end with
diff --git a/editors/mule/patches/patch-src_term_c b/editors/mule/patches/patch-src_term_c
index 184a11cf390..749601d37fe 100644
--- a/editors/mule/patches/patch-src_term_c
+++ b/editors/mule/patches/patch-src_term_c
@@ -1,11 +1,10 @@
-$NetBSD: patch-src_term_c,v 1.1 2011/12/24 17:07:07 dholland Exp $
+$NetBSD: patch-src_term_c,v 1.2 2013/04/21 15:40:00 joerg Exp $
 
 - use standard headers
 
---- src/term.c~	1995-01-06 05:57:00.000000000 +0000
+--- src/term.c.orig	1995-01-06 05:57:00.000000000 +0000
 +++ src/term.c
-@@ -52,7 +52,8 @@ the Free Software Foundation, 675 Mass A
- 	Macro definition of ITNCODE and AUTOCONV switched. */
+@@ -53,6 +53,7 @@ the Free Software Foundation, 675 Mass A
  
  #include <config.h>
  #include <stdio.h>
@@ -13,3 +12,195 @@ $NetBSD: patch-src_term_c,v 1.1 2011/12/24 17:07:07 dholland Exp $
  #include <ctype.h>
  #include "termchar.h"
  #include "termopts.h"
+@@ -342,8 +343,11 @@ static int system_uses_terminfo;
+ char *tparam ();
+ 
+ extern char *tgetstr ();
++
++static void clear_end_of_line_raw (int first_unused_hpos);
++static void background_highlight (void);
+ 
+-ring_bell ()
++void ring_bell(void)
+ {
+   if (! FRAME_TERMCAP_P (selected_frame))
+     {
+@@ -353,7 +357,7 @@ ring_bell ()
+   OUTPUT (TS_visible_bell && visible_bell ? TS_visible_bell : TS_bell);
+ }
+ 
+-set_terminal_modes ()
++void set_terminal_modes(void)
+ {
+   if (! FRAME_TERMCAP_P (selected_frame))
+     {
+@@ -366,7 +370,7 @@ set_terminal_modes ()
+   losecursor ();
+ }
+ 
+-reset_terminal_modes ()
++void reset_terminal_modes(void)
+ {
+   if (! FRAME_TERMCAP_P (selected_frame))
+     {
+@@ -395,8 +399,7 @@ update_begin (f)
+     (*update_begin_hook) (f);
+ }
+ 
+-update_end (f)
+-     FRAME_PTR f;
++void update_end (FRAME_PTR f)
+ {
+   if (! FRAME_TERMCAP_P (updating_frame))
+     {
+@@ -410,8 +413,7 @@ update_end (f)
+   updating_frame = 0;
+ }
+ 
+-set_terminal_window (size)
+-     int size;
++void set_terminal_window (int size)
+ {
+   if (! FRAME_TERMCAP_P (updating_frame))
+     {
+@@ -493,7 +495,7 @@ turn_on_highlight ()
+    empty space inside windows.  What this is,
+    depends on the user option inverse-video.  */
+ 
+-background_highlight ()
++static void background_highlight (void)
+ {
+   if (TN_standout_width >= 0)
+     return;
+@@ -505,8 +507,8 @@ background_highlight ()
+ 
+ /* Set standout mode to the mode specified for the text to be output.  */
+ 
+-static
+-highlight_if_desired ()
++static void
++highlight_if_desired (void)
+ {
+   if (TN_standout_width >= 0)
+     return;
+@@ -544,9 +546,7 @@ write_standout_marker (flag, vpos)
+    Call this when about to modify line at position VPOS
+    and not change whether it is highlighted.  */
+ 
+-reassert_line_highlight (highlight, vpos)
+-     int highlight;
+-     int vpos;
++void reassert_line_highlight(int highlight, int vpos)
+ {
+   if (! FRAME_TERMCAP_P ((updating_frame ? updating_frame : selected_frame)))
+     {
+@@ -565,8 +565,7 @@ reassert_line_highlight (highlight, vpos
+ /* Call this when about to modify line at position VPOS
+    and change whether it is highlighted.  */
+ 
+-change_line_highlight (new_highlight, vpos, first_unused_hpos)
+-     int new_highlight, vpos, first_unused_hpos;
++void change_line_highlight (int new_highlight, int vpos, int first_unused_hpos)
+ {
+   standout_requested = new_highlight;
+   if (! FRAME_TERMCAP_P (updating_frame))
+@@ -601,8 +600,7 @@ change_line_highlight (new_highlight, vp
+ 
+ /* Move to absolute position, specified origin 0 */
+ 
+-cursor_to (row, col)
+-     int row, col;
++void cursor_to (int row, int col)
+ {
+   if (! FRAME_TERMCAP_P ((updating_frame
+ 			    ? updating_frame
+@@ -625,8 +623,7 @@ cursor_to (row, col)
+ 
+ /* Similar but don't take any account of the wasted characters.  */
+ 
+-raw_cursor_to (row, col)
+-     int row, col;
++static void raw_cursor_to (int row, int col)
+ {
+   if (! FRAME_TERMCAP_P ((updating_frame ? updating_frame : selected_frame)))
+     {
+@@ -645,7 +642,7 @@ raw_cursor_to (row, col)
+ /* Erase operations */
+ 
+ /* clear from cursor to end of frame */
+-clear_to_end ()
++static void clear_to_end (void)
+ {
+   register int i;
+ 
+@@ -672,7 +669,7 @@ clear_to_end ()
+ 
+ /* Clear entire frame */
+ 
+-clear_frame ()
++void clear_frame(void)
+ {
+   if (clear_frame_hook
+       && ! FRAME_TERMCAP_P ((updating_frame ? updating_frame : selected_frame)))
+@@ -717,8 +714,7 @@ clear_end_of_line (first_unused_hpos)
+ 
+    Note that the cursor may be moved, on terminals lacking a `ce' string.  */
+ 
+-clear_end_of_line_raw (first_unused_hpos)
+-     int first_unused_hpos;
++static void clear_end_of_line_raw (int first_unused_hpos)
+ {
+   register int i;
+ 
+@@ -954,9 +950,7 @@ linecode_conversion (len, src, dst)
+ /* len = actual_column_length, len2 = converted_string_length
+    string2 = converted_string */
+ /* I gave up using TS_repeat...K.Handa */
+-write_glyphs (string, len)
+-     register GLYPH *string;
+-     register int len;
++void write_glyphs (GLYPH *string, int len)
+ {
+   register GLYPH g;
+   register int tlen = GLYPH_TABLE_LENGTH;
+@@ -1038,9 +1032,7 @@ write_glyphs (string, len)
+ 
+ /* If start is zero, insert blanks instead of a string at start */
+  
+-insert_glyphs (start, len)
+-     register GLYPH *start;
+-     register int len;
++void insert_glyphs (GLYPH *start, int len)
+ {
+   char *buf;
+   register GLYPH g;
+@@ -1112,8 +1104,7 @@ insert_glyphs (start, len)
+       }
+ }
+ 
+-delete_glyphs (n)
+-     register int n;
++void delete_glyphs(int n)
+ {
+   char *buf;
+   register int i;
+@@ -1149,8 +1140,7 @@ delete_glyphs (n)
+ 
+ /* Insert N lines at vpos VPOS.  If N is negative, delete -N lines.  */
+ 
+-ins_del_lines (vpos, n)
+-     int vpos, n;
++void ins_del_lines (int vpos, int n)
+ {
+   char *multi = n > 0 ? TS_ins_multi_lines : TS_del_multi_lines;
+   char *single = n > 0 ? TS_ins_line : TS_del_line;
+@@ -1354,8 +1344,7 @@ extern int x_screen_planes;
+ 
+ extern do_line_insertion_deletion_costs ();
+ 
+-calculate_costs (frame)
+-     FRAME_PTR frame;
++void calculate_costs(FRAME_PTR frame)
+ {
+   register char *f = TS_set_scroll_region ?
+                        TS_set_scroll_region
diff --git a/editors/mule/patches/patch-src_undo.c b/editors/mule/patches/patch-src_undo.c
new file mode 100644
index 00000000000..8f0ab22c815
--- /dev/null
+++ b/editors/mule/patches/patch-src_undo.c
@@ -0,0 +1,44 @@
+$NetBSD: patch-src_undo.c,v 1.1 2013/04/21 15:40:00 joerg Exp $
+
+--- src/undo.c.orig	2013-03-01 17:40:31.000000000 +0000
++++ src/undo.c
+@@ -41,8 +41,7 @@ Lisp_Object pending_boundary;
+    (It is possible to record an insertion before or after the fact
+    because we don't need to record the contents.)  */
+ 
+-record_insert (beg, length)
+-     Lisp_Object beg, length;
++void record_insert(Lisp_Object beg, Lisp_Object length)
+ {
+   Lisp_Object lbeg, lend;
+ 
+@@ -85,8 +84,7 @@ record_insert (beg, length)
+ /* Record that a deletion is about to take place,
+    for LENGTH characters at location BEG.  */
+ 
+-record_delete (beg, length)
+-     int beg, length;
++void record_delete (int beg, int length)
+ {
+   Lisp_Object lbeg, lend, sbeg;
+   int at_boundary;
+@@ -143,7 +141,7 @@ record_change (beg, length)
+    Record the file modification date so that when undoing this entry
+    we can tell whether it is obsolete because the file was saved again.  */
+ 
+-record_first_change ()
++void record_first_change (void)
+ {
+   Lisp_Object high, low;
+ 
+@@ -162,9 +160,7 @@ record_first_change ()
+ /* Record a change in property PROP (whose old value was VAL)
+    for LENGTH characters starting at position BEG in BUFFER.  */
+ 
+-record_property_change (beg, length, prop, value, buffer)
+-     int beg, length;
+-     Lisp_Object prop, value, buffer;
++void record_property_change (int beg, int length, Lisp_Object prop, Lisp_Object value, Lisp_Object buffer)
+ {
+   Lisp_Object lbeg, lend, entry;
+   struct buffer *obuf = current_buffer;
diff --git a/editors/mule/patches/patch-src_window.c b/editors/mule/patches/patch-src_window.c
new file mode 100644
index 00000000000..75b0d170393
--- /dev/null
+++ b/editors/mule/patches/patch-src_window.c
@@ -0,0 +1,48 @@
+$NetBSD: patch-src_window.c,v 1.1 2013/04/21 15:40:00 joerg Exp $
+
+--- src/window.c.orig	1994-10-21 04:21:03.000000000 +0000
++++ src/window.c
+@@ -34,6 +34,8 @@ the Free Software Foundation, 675 Mass A
+ #include "disptab.h"
+ #include "keyboard.h"
+ 
++static void change_window_height (int delta, int widthflag);
++
+ Lisp_Object Qwindowp, Qwindow_live_p;
+ 
+ Lisp_Object Fnext_window (), Fdelete_window (), Fselect_window ();
+@@ -1583,10 +1585,7 @@ check_frame_size (frame, rows, cols)
+    nodelete nonzero means do not do this.
+    (The caller should check later and do so if appropriate)  */
+ 
+-set_window_height (window, height, nodelete)
+-     Lisp_Object window;
+-     int height;
+-     int nodelete;
++void set_window_height (Lisp_Object window, int height, int nodelete)
+ {
+   register struct window *w = XWINDOW (window);
+   register struct window *c;
+@@ -1648,10 +1647,7 @@ set_window_height (window, height, nodel
+ 
+ /* Recursively set width of WINDOW and its inferiors. */
+ 
+-set_window_width (window, width, nodelete)
+-     Lisp_Object window;
+-     int width;
+-     int nodelete;
++void set_window_width (Lisp_Object window, int width, int nodelete)
+ {
+   register struct window *w = XWINDOW (window);
+   register struct window *c;
+@@ -2198,9 +2194,7 @@ window_width (window)
+    also changes the heights of the siblings so as to
+    keep everything consistent. */
+ 
+-change_window_height (delta, widthflag)
+-     register int delta;
+-     int widthflag;
++static void change_window_height (int delta, int widthflag)
+ {
+   register Lisp_Object parent;
+   Lisp_Object window;