Mercurial > hg > octave-lyh

changeset 16534:1dce0510b1e8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
backout changeset d3b01ae21259; we'll fix readline instead
author John W. Eaton <jwe@octave.org>
date Wed, 17 Apr 2013 17:32:20 -0400
parents 52c661334154
children 6ebd1e1a6b73
files libinterp/interpfcn/input.cc liboctave/util/cmd-edit.cc liboctave/util/cmd-edit.h liboctave/util/oct-rl-edit.c liboctave/util/oct-rl-edit.h
diffstat 5 files changed, 0 insertions(+), 31 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/interpfcn/input.cc
+++ b/libinterp/interpfcn/input.cc
@@ -231,10 +231,6 @@
       octave_link::pre_input_event ();
 
       octave_link::set_workspace ();
-
-      // FIXME -- this call should happen any time the terminal window
-      // size changes, not just prior to prompting for input.
-      command_editor::reset_screen_size ();
     }
 
   bool history_skip_auto_repeated_debugging_command = false;
--- a/liboctave/util/cmd-edit.cc
+++ b/liboctave/util/cmd-edit.cc
@@ -95,8 +95,6 @@
 
   void do_resize_terminal (void);
 
-  void do_reset_screen_size (void);
-
   std::string newline_chars (void);
 
   void do_restore_terminal_state (void);
@@ -333,12 +331,6 @@
   ::octave_rl_resize_terminal ();
 }
 
-void
-gnu_readline::do_reset_screen_size (void)
-{
-  ::octave_rl_reset_screen_size ();
-}
-
 std::string
 gnu_readline::newline_chars (void)
 {
@@ -1002,13 +994,6 @@
     instance->do_resize_terminal ();
 }
 
-void
-command_editor::reset_screen_size (void)
-{
-  if (instance_ok ())
-    instance->do_reset_screen_size ();
-}
-
 std::string
 command_editor::decode_prompt_string (const std::string& s)
 {
--- a/liboctave/util/cmd-edit.h
+++ b/liboctave/util/cmd-edit.h
@@ -79,8 +79,6 @@
 
   static void resize_terminal (void);
 
-  static void reset_screen_size (void);
-
   static std::string decode_prompt_string (const std::string& s);
 
   static void restore_terminal_state (void);
@@ -223,8 +221,6 @@
 
   virtual void do_resize_terminal (void) { }
 
-  virtual void do_reset_screen_size (void) { }
-
   virtual std::string do_decode_prompt_string (const std::string&);
 
   virtual std::string newline_chars (void) { return "\n"; }
--- a/liboctave/util/oct-rl-edit.c
+++ b/liboctave/util/oct-rl-edit.c
@@ -111,12 +111,6 @@
 }
 
 void
-octave_rl_reset_screen_size (void)
-{
-  rl_reset_screen_size ();
-}
-
-void
 octave_rl_restore_terminal_state ()
 {
   if (rl_deprep_term_function)
--- a/liboctave/util/oct-rl-edit.h
+++ b/liboctave/util/oct-rl-edit.h
@@ -60,8 +60,6 @@
 
 extern void octave_rl_resize_terminal (void);
 
-extern void octave_rl_reset_screen_size (void);
-
 extern void octave_rl_restore_terminal_state (void);
 
 extern void octave_rl_insert_text (const char *);