This is the mail archive of the
gdb-patches@sources.redhat.com
mailing list for the GDB project.
[PATCH] Merge of readline 4.3 to mainline
- From: Elena Zannoni <ezannoni at redhat dot com>
- To: gdb-patches at sources dot redhat dot com
- Date: Fri, 6 Dec 2002 23:29:17 -0500
- Subject: [PATCH] Merge of readline 4.3 to mainline
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 <ezannoni@redhat.com>
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 <readline/tilde.h>
#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 <readline/tilde.h>
#include "defs.h"
#include "value.h"
#include <ctype.h>
tui/ChangeLog
2002-12-06 Elena Zannoni <ezannoni@redhat.com>
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 <string.h>
#include <ctype.h>
+#include <readline/readline.h>
#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)