[SCM] archer-jankratochvil-autoload: Merge branch 'initclean-initx-gdbinitb-move-misc2-warn-safepath-debug' into initclean-initx-gdbinitb-move-misc2-warn-safepath-debug-warnlocal

[jkratoch@sourceware.org]

The branch, archer-jankratochvil-autoload has been updated
       via  49f4c137f5c2b2d6f8662a3220f8aa199ab00654 (commit)
       via  92530ee5fc527917a11f1a87a19bc2e80d5b268d (commit)
       via  5f9608b08066ed13757351959618da024ccd3d73 (commit)
       via  dcb2b7dff3fb89b6f89801c3c4f3843a35151c55 (commit)
       via  850be04d32727ec82fc3f255cfbfdc46caf1c57c (commit)
       via  606ad596c60f804b5f6a899360d34d5395e79df1 (commit)
       via  925a2efb563cf62a40cf7fa1a230c3ed87262521 (commit)
       via  9705cd401d7f25d1500e2e6ba2fb807653dff663 (commit)
       via  ec436dd08287a9d0ebb77976404ab080d99d9612 (commit)
       via  bc7627ec2d217cbe2affce8d2965f13d09aa1be0 (commit)
       via  cd192954f4d4a42c87e59f371128f801b9b622db (commit)
      from  6ed98b808146713f89ade08cde5b51e3f1ae9e81 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit 49f4c137f5c2b2d6f8662a3220f8aa199ab00654
Merge: 6ed98b8 92530ee
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Mon Mar 19 18:31:55 2012 +0100

    Merge branch 'initclean-initx-gdbinitb-move-misc2-warn-safepath-debug' into initclean-initx-gdbinitb-move-misc2-warn-safepath-debug-warnlocal

commit 92530ee5fc527917a11f1a87a19bc2e80d5b268d
Merge: 9268077 5f9608b
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Mon Mar 19 18:31:55 2012 +0100

    Merge branch 'initclean-initx-gdbinitb-move-misc2-warn-safepath' into initclean-initx-gdbinitb-move-misc2-warn-safepath-debug

commit 5f9608b08066ed13757351959618da024ccd3d73
Merge: cd19295 dcb2b7d
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Mon Mar 19 18:31:55 2012 +0100

    Merge branch 'initclean-initx-gdbinitb-move-misc2-warn' into initclean-initx-gdbinitb-move-misc2-warn-safepath

commit dcb2b7dff3fb89b6f89801c3c4f3843a35151c55
Merge: 0670825 850be04
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Mon Mar 19 18:31:54 2012 +0100

    Merge branch 'initclean-initx-gdbinitb-move-misc2' into initclean-initx-gdbinitb-move-misc2-warn

commit 850be04d32727ec82fc3f255cfbfdc46caf1c57c
Merge: ec436dd 606ad59
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Mon Mar 19 18:31:54 2012 +0100

    Merge branch 'initclean-initx-gdbinitb-move' into initclean-initx-gdbinitb-move-misc2

commit 606ad596c60f804b5f6a899360d34d5395e79df1
Merge: d3eeaed 925a2ef
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Mon Mar 19 18:31:54 2012 +0100

    Merge branch 'initclean-initx-gdbinitb' into initclean-initx-gdbinitb-move

commit 925a2efb563cf62a40cf7fa1a230c3ed87262521
Merge: 57bb2f9 9705cd4
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Mon Mar 19 18:31:54 2012 +0100

    Merge branch 'initclean-initx' into initclean-initx-gdbinitb

commit 9705cd401d7f25d1500e2e6ba2fb807653dff663
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Mon Mar 19 18:31:49 2012 +0100

    .

commit ec436dd08287a9d0ebb77976404ab080d99d9612
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Mon Mar 19 18:30:53 2012 +0100

    .

commit bc7627ec2d217cbe2affce8d2965f13d09aa1be0
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Mon Mar 19 18:29:37 2012 +0100

    .

commit cd192954f4d4a42c87e59f371128f801b9b622db
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Mon Mar 19 18:22:11 2012 +0100

    .

-----------------------------------------------------------------------

Summary of changes:
 gdb/auto-load.c           |   12 ++++++------
 gdb/doc/gdb.texinfo       |    2 +-
 gdb/python/py-auto-load.c |    3 +++
 3 files changed, 10 insertions(+), 7 deletions(-)

First 500 lines of diff:
diff --git a/gdb/auto-load.c b/gdb/auto-load.c
index b046349..f10d901 100644
--- a/gdb/auto-load.c
+++ b/gdb/auto-load.c
@@ -650,7 +650,6 @@ print_script (struct loaded_script *script)
   struct ui_out *uiout = current_uiout;
   struct cleanup *chain;
 
-  ui_out_text (uiout, "\n");
   chain = make_cleanup_ui_out_tuple_begin_end (uiout, NULL);
 
   ui_out_field_string (uiout, "loaded", script->loaded ? "Yes" : "No");
@@ -897,8 +896,8 @@ This options has security implications for untrusted inferiors."),
 
   auto_load_safe_path = xstrdup (DEFAULT_AUTO_LOAD_SAFE_PATH);
   auto_load_safe_path_vec_update ();
-  add_setshow_filename_cmd ("safe-path", class_support,
-			    &auto_load_safe_path, _("\
+  add_setshow_optional_filename_cmd ("safe-path", class_support,
+				     &auto_load_safe_path, _("\
 Set the directories safe to hold auto-loaded files."), _("\
 Show the directories safe to hold auto-loaded files."), _("\
 Various files loaded automatically for the 'set auto-load ...' options must\n\
@@ -907,9 +906,10 @@ printed and file will not be used otherwise.  Use empty string to allow any\n\
 file for the 'set auto-load ...' options.  This option is ignored for the\n\
 kinds of files having 'set auto-load ... off'.\n\
 This options has security implications for untrusted inferiors."),
-			    set_auto_load_safe_path, show_auto_load_safe_path,
-			    auto_load_set_cmdlist_get (),
-			    auto_load_show_cmdlist_get ());
+				     set_auto_load_safe_path,
+				     show_auto_load_safe_path,
+				     auto_load_set_cmdlist_get (),
+				     auto_load_show_cmdlist_get ());
 
   add_setshow_boolean_cmd ("auto-load", class_maintenance,
 			   &debug_auto_load, _("\
diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
index 9115d8b..b37215b 100644
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -1300,7 +1300,7 @@ $ gdb -iex "set auto-load python-scripts" myprogram
 @end smallexample
 
 Option @samp{-ex} does not work because the auto-loading is then turned
-off too late:
+off too late.
 
 @item
 Executes commands and command files specified by the @samp{-ex} and
diff --git a/gdb/python/py-auto-load.c b/gdb/python/py-auto-load.c
index 6ae2381..eaa2212 100644
--- a/gdb/python/py-auto-load.c
+++ b/gdb/python/py-auto-load.c
@@ -265,6 +265,9 @@ Deprecated alias for 'show auto-load python-scripts'."),
 	   _("Print the list of automatically loaded Python scripts.\n\
 Usage: info auto-load python-scripts [REGEXP]"),
 	   auto_load_info_cmdlist_get ());
+
+  add_info ("auto-load-scripts", info_auto_load_python_scripts,
+	    _("Deprecated alias for 'info auto-load python-scripts'."));
 }
 
 #else /* ! HAVE_PYTHON */


hooks/post-receive
--
Repository for Project Archer.