aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorElena Zannoni <ezannoni@kwikemart.cygnus.com>2002-12-08 22:31:39 +0000
committerElena Zannoni <ezannoni@kwikemart.cygnus.com>2002-12-08 22:31:39 +0000
commit9255ee3150832d7e235fc0711f0efa70700559e7 (patch)
tree97d578647cc7f257e42ce12fa74e570b783ee0b9 /gdb
parentffbceea9fb49e8dd28c88a4b59cf8616b2dcc210 (diff)
downloadgdb-9255ee3150832d7e235fc0711f0efa70700559e7.zip
gdb-9255ee3150832d7e235fc0711f0efa70700559e7.tar.gz
gdb-9255ee3150832d7e235fc0711f0efa70700559e7.tar.bz2
Import of readline 4.3.
Non-readline modified files: src/gdb/ChangeLog src/gdb/defs.h src/gdb/cli/cli-cmds.c src/gdb/cli/cli-setshow.c src/gdb/tui/ChangeLog src/gdb/tui/tuiWin.c In readline directory: * compat.c, mbutil.c, misc.c, rlmbutil.h, rltypedefs.h, text.c, doc/history.0, doc/history.3, support/wcwidth.c, examples/readlinebuf.h, examples/rlcat.c: New files. * CHANGELOG, CHANGES, INSTALL, MANIFEST, Makefile.in, README, aclocal.m4, ansi_stdlib.h, bind.c, callback.c, chardefs.h, complete.c, config.h.in, configure, configure.in, display.c, emacs_keymap.c, funmap.c, histexpand.c, histfile.c, histlib.h, history.c, history.h, histsearch.c, input.c, isearch.c, keymaps.c, keymaps.h, kill.c, macro.c, nls.c, parens.c, posixdir.h, readline.c, readline.h, rlconf.h, rldefs.h, rlprivate.h, rlshell.h, rlstdc.h, rltty.c, savestring.c, search.c, shell.c, signals.c, terminal.c, tilde.c, tilde.h, undo.c, util.c, vi_keymap.c, vi_mode.c, xmalloc.c, xmalloc.h, doc/Makefile.in, doc/hist.texinfo, doc/hstech.texinfo, doc/hsuser.texinfo, doc/manvers.texinfo, doc/readline.3, doc/rlman.texinfo, doc/rltech.texinfo, doc/rluser.texinfo doc/rluserman.texinfo, doc/texi2dvi, doc/texi2html, shlib/Makefile.in, support/install.sh, support/mkdirs, support/mkdist, support/shlib-install, support/shobj-conf, examples/Inputrc, examples/Makefile.in, examples/fileman.c, examples/histexamp.c, examples/manexamp.c, examples/rl.c, examples/rlfe.c, examples/rltest.c, examples/rlversion.c: Modified files.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/ChangeLog8
-rw-r--r--gdb/cli/cli-cmds.c1
-rw-r--r--gdb/cli/cli-setshow.c1
-rw-r--r--gdb/defs.h4
-rw-r--r--gdb/tui/ChangeLog8
-rw-r--r--gdb/tui/tuiWin.c7
6 files changed, 23 insertions, 6 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 95b6642..d9ea839 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,13 @@
2002-12-08 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.
+
+2002-12-08 Elena Zannoni <ezannoni@redhat.com>
+
* Makefile.in (thread-db.o): Add explicit rule to ignore the use of
-Werror on this file.
diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
index 97c666f..fd00818 100644
--- a/gdb/cli/cli-cmds.c
+++ b/gdb/cli/cli-cmds.c
@@ -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 */
diff --git a/gdb/cli/cli-setshow.c b/gdb/cli/cli-setshow.c
index 44b0b4e..efd334f 100644
--- a/gdb/cli/cli-setshow.c
+++ b/gdb/cli/cli-setshow.c
@@ -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>
diff --git a/gdb/defs.h b/gdb/defs.h
index 48eb509..3ac3d9a 100644
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -614,10 +614,6 @@ enum lval_type
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
diff --git a/gdb/tui/ChangeLog b/gdb/tui/ChangeLog
index 95ab72e..88ad5e7 100644
--- a/gdb/tui/ChangeLog
+++ b/gdb/tui/ChangeLog
@@ -1,3 +1,11 @@
+2002-12-08 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.
+
2002-12-06 Elena Zannoni <ezannoni@redhat.com>
* tuiStack.c (tuiShowFrameInfo): Fix typo.
diff --git a/gdb/tui/tuiWin.c b/gdb/tui/tuiWin.c
index b82ce2f..9ad82f5 100644
--- a/gdb/tui/tuiWin.c
+++ b/gdb/tui/tuiWin.c
@@ -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 @@ void
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 @@ void
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)