From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 29946 invoked by alias); 7 Dec 2002 04:33:42 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 29929 invoked from network); 7 Dec 2002 04:33:40 -0000 Received: from unknown (HELO mx1.redhat.com) (66.187.233.31) by sources.redhat.com with SMTP; 7 Dec 2002 04:33:40 -0000 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.11.6/8.11.6) with ESMTP id gB748NP15331 for ; Fri, 6 Dec 2002 23:08:23 -0500 Received: from pobox.corp.redhat.com (pobox.corp.redhat.com [172.16.52.156]) by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id gB74XdD02567 for ; Fri, 6 Dec 2002 23:33:40 -0500 Received: from localhost.redhat.com (romulus-int.sfbay.redhat.com [172.16.27.46]) by pobox.corp.redhat.com (8.11.6/8.11.6) with ESMTP id gB74Xdu26634 for ; Fri, 6 Dec 2002 23:33:39 -0500 Received: by localhost.redhat.com (Postfix, from userid 469) id 2185CFF79; Fri, 6 Dec 2002 23:29:18 -0500 (EST) From: Elena Zannoni MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <15857.31005.868923.476055@localhost.redhat.com> Date: Sat, 07 Dec 2002 03:57:00 -0000 To: gdb-patches@sources.redhat.com Subject: [PATCH] Merge of readline 4.3 to mainline X-SW-Source: 2002-12/txt/msg00243.txt.bz2 Importing readline 4.3. This was already on the readline_4_3-import-branch. The changes to the readline directory are too big, so I am not including them here. Will commit in a day or so. Elena gdb/ChangeLog 2002-12-06 Elena Zannoni Import of readline 4.3: * cli/cli-cmds.c: Include readline/tilde.h. * cli/cli-setshow.c: Ditto. * defs.h: Don't declare tilde_expand anymore, since readline exports it. Index: defs.h =================================================================== RCS file: /cvs/src/src/gdb/defs.h,v retrieving revision 1.102 diff -u -r1.102 defs.h --- defs.h 15 Oct 2002 02:16:51 -0000 1.102 +++ defs.h 7 Dec 2002 03:54:14 -0000 @@ -614,10 +614,6 @@ struct frame_info; -/* From readline (but not in any readline .h files). */ - -extern char *tilde_expand (char *); - /* Control types for commands */ enum misc_command_type Index: cli/cli-cmds.c =================================================================== RCS file: /cvs/src/src/gdb/cli/cli-cmds.c,v retrieving revision 1.24 diff -u -r1.24 cli-cmds.c --- cli/cli-cmds.c 29 Nov 2002 19:15:15 -0000 1.24 +++ cli/cli-cmds.c 7 Dec 2002 03:54:15 -0000 @@ -19,6 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include #include "defs.h" #include "completer.h" #include "target.h" /* For baud_rate, remote_debug and remote_timeout */ Index: cli/cli-setshow.c =================================================================== RCS file: /cvs/src/src/gdb/cli/cli-setshow.c,v retrieving revision 1.9 diff -u -r1.9 cli-setshow.c --- cli/cli-setshow.c 30 Jul 2002 13:45:14 -0000 1.9 +++ cli/cli-setshow.c 7 Dec 2002 03:54:15 -0000 @@ -17,6 +17,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include #include "defs.h" #include "value.h" #include tui/ChangeLog 2002-12-06 Elena Zannoni Import of readline 4.3. Fix PR gdb/675 * tuiWin.c: Include readline/readline.h. (tui_update_gdb_sizes): Use accessor function rl_get_screen_size. (tuiResizeAll): Ditto. Index: tuiWin.c =================================================================== RCS file: /cvs/src/src/gdb/tui/tuiWin.c,v retrieving revision 1.26 diff -u -r1.26 tuiWin.c --- tuiWin.c 29 Nov 2002 19:15:16 -0000 1.26 +++ tuiWin.c 7 Dec 2002 03:43:57 -0000 @@ -46,6 +46,7 @@ #include #include +#include #include "defs.h" #include "command.h" #include "symtab.h" @@ -417,8 +418,9 @@ tui_update_gdb_sizes () { char cmd[50]; - extern int screenheight, screenwidth; /* in readline */ + int screenheight, screenwidth; + rl_get_screen_size (&screenheight, &screenwidth); /* Set to TUI command window dimension or use readline values. */ sprintf (cmd, "set width %d", tui_active ? cmdWin->generic.width : screenwidth); @@ -634,8 +636,9 @@ tuiResizeAll (void) { int heightDiff, widthDiff; - extern int screenheight, screenwidth; /* in readline */ + int screenheight, screenwidth; + rl_get_screen_size (&screenheight, &screenwidth); widthDiff = screenwidth - termWidth (); heightDiff = screenheight - termHeight (); if (heightDiff || widthDiff)