Mercurial > hg > xemacs-beta
diff src/emacs.c @ 4522:fc7067b7f407
Backout last patch; forgot to specify file.
author | Stephen J. Turnbull <stephen@xemacs.org> |
---|---|
date | Wed, 29 Oct 2008 03:37:16 +0900 |
parents | 383ab474a241 |
children | 726060ee587c |
line wrap: on
line diff
--- a/src/emacs.c Tue Oct 28 10:38:26 2008 +0900 +++ b/src/emacs.c Wed Oct 29 03:37:16 2008 +0900 @@ -806,7 +806,7 @@ enough information to do it right. */ static int -argmatch (Wexttext **argv, int argc, const Ascbyte *sstr, const Ascbyte *lstr, +argmatch (Wexttext **argv, int argc, Ascbyte *sstr, Ascbyte *lstr, int minlen, Wexttext **valptr, int *skipptr) { Wexttext *p = NULL; @@ -862,7 +862,7 @@ } static void -check_compatible_window_system (const Ascbyte *must) +check_compatible_window_system (Ascbyte *must) { if (display_use && strcmp (display_use, must)) fatal ("Incompatible window system type `%s': `%s' already specified",