changeset 16880:1aebb613a5ac

Rename re_read_readline_init_file to readline_re_read_init_file. * libinterp/interpfcn/input.cc(Fre_read_readline_init_file): Rename function. * NEWS: Announce renaming. * doc/interpreter/basics.txi: Rename function in manual. * libgui/src/resource-manager.cc: Rename function in list of functions. * scripts/deprecated/re_read_readline_init_file.m: Deprecated m-file to call readline_re_read_init_file. * scripts/deprecated/module.mk: Add re_read_readline_init_file.m to build system
author Rik <rik@octave.org>
date Sun, 30 Jun 2013 18:08:29 -0700
parents cc3743a91652
children 944ade6e7f66
files NEWS doc/interpreter/basics.txi libgui/src/resource-manager.cc libinterp/interpfcn/input.cc scripts/deprecated/module.mk scripts/deprecated/re_read_readline_init_file.m
diffstat 6 files changed, 58 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/NEWS	Sun Jun 30 17:30:06 2013 -0700
+++ b/NEWS	Sun Jun 30 18:08:29 2013 -0700
@@ -178,16 +178,16 @@
 
       base64_decode               ellipke         lines      
       base64_encode               erfcinv         polyeig                   
-      betaincinv                  erfi            rgbplot             
-      built_in_docstrings_file    expint          save_default_options  
-      cmpermute                   findfigs        shrinkfaces           
-      cmunique                    fminsearch      splinefit             
-      colorcube                   gallery         strjoin               
-      copyobj                     gco             struct2hdl            
-      dawson                      hdl2struct      tetramesh             
-      dblist                      history_save    waterfall           
-      doc_cache_create            importdata
-      ellipj                      iscolormap
+      betaincinv                  erfi            readline_re_read_init_file
+      built_in_docstrings_file    expint          readline_read_init_file 
+      cmpermute                   findfigs        rgbplot               
+      cmunique                    fminsearch      save_default_options  
+      colorcube                   gallery         shrinkfaces           
+      copyobj                     gco             splinefit             
+      dawson                      hdl2struct      strjoin               
+      dblist                      history_save    struct2hdl          
+      doc_cache_create            importdata      tetramesh           
+      ellipj                      iscolormap      waterfall           
 
  ** Deprecated functions.
 
@@ -215,6 +215,8 @@
       java_unsigned_conversion
       javafields
       javamethods
+      re_read_readline_init_file
+      read_readline_init_file
       saving_history
 
     The following keywords have been deprecated in Octave 3.8 and will
--- a/doc/interpreter/basics.txi	Sun Jun 30 17:30:06 2013 -0700
+++ b/doc/interpreter/basics.txi	Sun Jun 30 18:08:29 2013 -0700
@@ -751,7 +751,7 @@
 
 @DOCSTRING(readline_read_init_file)
 
-@DOCSTRING(re_read_readline_init_file)
+@DOCSTRING(readline_re_read_init_file)
 
 @node Customizing the Prompt
 @subsection Customizing the Prompt
--- a/libgui/src/resource-manager.cc	Sun Jun 30 17:30:06 2013 -0700
+++ b/libgui/src/resource-manager.cc	Sun Jun 30 18:08:29 2013 -0700
@@ -1390,6 +1390,7 @@
       "rdivide "
       "re_read_readline_init_file "
       "readdir "
+      "readline_re_read_init_file "
       "readline_read_init_file "
       "readlink "
       "real "
--- a/libinterp/interpfcn/input.cc	Sun Jun 30 17:30:06 2013 -0700
+++ b/libinterp/interpfcn/input.cc	Sun Jun 30 18:08:29 2013 -0700
@@ -1074,6 +1074,7 @@
 \n\
 @xref{Readline Init File, , , readline, GNU Readline Library},\n\
 for details.\n\
+@seealso{readline_re_read_init_file}\n\
 @end deftypefn")
 {
   octave_value_list retval;
@@ -1095,9 +1096,9 @@
   return retval;
 }
 
-DEFUN (re_read_readline_init_file, args, ,
+DEFUN (readline_re_read_init_file, args, ,
   "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} re_read_readline_init_file ()\n\
+@deftypefn {Built-in Function} {} readline_re_read_init_file ()\n\
 Re-read the last readline library initialization file that was read.\n\
 @xref{Readline Init File, , , readline, GNU Readline Library},\n\
 for details.\n\
--- a/scripts/deprecated/module.mk	Sun Jun 30 17:30:06 2013 -0700
+++ b/scripts/deprecated/module.mk	Sun Jun 30 18:08:29 2013 -0700
@@ -19,6 +19,7 @@
   deprecated/javafields.m \
   deprecated/javamethods.m \
   deprecated/polyderiv.m \
+  deprecated/re_read_readline_init_file.m \
   deprecated/read_readline_init_file.m \
   deprecated/saving_history.m \
   deprecated/shell_cmd.m \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/deprecated/re_read_readline_init_file.m	Sun Jun 30 18:08:29 2013 -0700
@@ -0,0 +1,40 @@
+## Copyright (C) 2013 Rik Wehbring
+##
+## This file is part of Octave.
+##
+## Octave 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 3 of the License, or (at
+## your option) any later version.
+##
+## Octave is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with Octave; see the file COPYING.  If not, see
+## <http://www.gnu.org/licenses/>.
+
+## -*- texinfo -*-
+## @deftypefn {Built-in Function} {} re_read_readline_init_file (@var{file})
+## This function has been deprecated.  Use
+## @code{@file{readline_re_read_init_file}} instead.
+## @seealso{readline_read_init_file}
+## @end deftypefn
+
+## Deprecated in 3.8
+
+function re_read_readline_init_file (varargin)
+
+  persistent warned = false;
+  if (! warned)
+    warned = true;
+    warning ("Octave:deprecated-function",
+             "re_read_readline_init_file is obsolete and will be removed from a future version of Octave, please use readline_re_read_init_file instead");
+  endif
+
+  readline_re_read_init_file (varargin{:});
+
+endfunction
+