summaryrefslogtreecommitdiff
path: root/Build/source/utils/texinfo/info/m-x.c
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-04-20 15:41:14 +0000
committerKarl Berry <karl@freefriends.org>2008-04-20 15:41:14 +0000
commitf90831f6e47e7321ba5f1d9f75f847ba33764c81 (patch)
treeb42b3d59ddbfaffc25e5f2324d4e4351201c0d89 /Build/source/utils/texinfo/info/m-x.c
parent57e45350ccbae224c5cf45171e024ab43e56cf8f (diff)
texinfo 4.12
git-svn-id: svn://tug.org/texlive/trunk@7545 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils/texinfo/info/m-x.c')
-rw-r--r--Build/source/utils/texinfo/info/m-x.c23
1 files changed, 11 insertions, 12 deletions
diff --git a/Build/source/utils/texinfo/info/m-x.c b/Build/source/utils/texinfo/info/m-x.c
index 52365d1843e..6499256472c 100644
--- a/Build/source/utils/texinfo/info/m-x.c
+++ b/Build/source/utils/texinfo/info/m-x.c
@@ -1,13 +1,13 @@
/* m-x.c -- Meta-x minibuffer reader.
- $Id: m-x.c,v 1.3 2004/04/11 17:56:46 karl Exp $
+ $Id: m-x.c,v 1.7 2008/02/26 16:51:05 karl Exp $
- Copyright (C) 1993, 1997, 1998, 2001, 2002, 2004 Free Software
- Foundation, Inc.
+ Copyright (C) 1993, 1997, 1998, 2001, 2002, 2004, 2007
+ Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
Originally written by Brian Fox (bfox@ai.mit.edu). */
@@ -33,7 +32,7 @@
name. A return value of NULL indicates that no function name could
be read. */
char *
-read_function_name (char *prompt, WINDOW *window)
+read_function_name (const char *prompt, WINDOW *window)
{
register int i;
char *line;
@@ -70,7 +69,7 @@ DECLARE_INFO_COMMAND (describe_command,
{
char *line;
- line = read_function_name ((char *) _("Describe command: "), window);
+ line = read_function_name (_("Describe command: "), window);
if (!line)
{
@@ -137,7 +136,7 @@ DECLARE_INFO_COMMAND (info_execute_command,
(strncmp (line, "echo-area-", 10) == 0))
{
free (line);
- info_error ((char *) _("Cannot execute an `echo-area' command here."),
+ info_error (_("Cannot execute an `echo-area' command here."),
NULL, NULL);
return;
}
@@ -151,7 +150,7 @@ DECLARE_INFO_COMMAND (info_execute_command,
if (InfoFunction(command))
(*InfoFunction(command)) (active_window, count, 0);
else
- info_error ((char *) _("Undefined command: %s"), line, NULL);
+ info_error (_("Undefined command: %s"), line, NULL);
}
}