From 30e767be473013a262914e1fd99147df129d032c Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Thu, 6 Jan 2011 11:10:36 +0000
Subject: [PATCH] Changed dialog default -abort_on value to "NEVER"

---
 libisoburn/trunk/xorriso/parse_exec.c        |  4 +-
 libisoburn/trunk/xorriso/xorriso.1           |  8 +--
 libisoburn/trunk/xorriso/xorriso.info        | 66 ++++++++++----------
 libisoburn/trunk/xorriso/xorriso.texi        |  8 +--
 libisoburn/trunk/xorriso/xorriso_timestamp.h |  2 +-
 5 files changed, 45 insertions(+), 43 deletions(-)

diff --git a/libisoburn/trunk/xorriso/parse_exec.c b/libisoburn/trunk/xorriso/parse_exec.c
index 2d495cd0..89209923 100644
--- a/libisoburn/trunk/xorriso/parse_exec.c
+++ b/libisoburn/trunk/xorriso/parse_exec.c
@@ -1,7 +1,7 @@
 
 /* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images.
 
-   Copyright 2007-2010 Thomas Schmitt, <scdbackup@gmx.net>
+   Copyright 2007-2011 Thomas Schmitt, <scdbackup@gmx.net>
 
    Provided under GPL version 2 or later.
 
@@ -1473,6 +1473,8 @@ int Xorriso_dialog(struct XorrisO *xorriso, int flag)
 
  if(!xorriso->dialog)
    return(1);
+ if(xorriso->abort_on_is_default)
+   Xorriso_option_abort_on(xorriso, "NEVER", 0);
  xorriso->is_dialog= 1;
  for(first_round= 1;1;first_round= 0) {
    if(xorriso->pending_option[0]!=0) {
diff --git a/libisoburn/trunk/xorriso/xorriso.1 b/libisoburn/trunk/xorriso/xorriso.1
index 7b467355..80500be6 100644
--- a/libisoburn/trunk/xorriso/xorriso.1
+++ b/libisoburn/trunk/xorriso/xorriso.1
@@ -9,7 +9,7 @@
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH XORRISO 1 "Dec 28, 2010"
+.TH XORRISO 1 "Jan 06, 2011"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -2804,9 +2804,9 @@ file content stems from the loaded ISO image and is not filtered.
 Enable or disable to enter dialog mode after all arguments are processed.
 In dialog mode input lines get prompted via readline or from stdin.
 .br
-If no -abort_on severity was set when dialog starts, then "FATAL" is set
-to avoid abort in most cases of wrong input. Before dialog begins the
-default is "FAILURE" which e.g. aborts on unknown commands.
+If no -abort_on severity was set when dialog starts, then "NEVER" is set
+to avoid abort in most cases of wrong input or other problems. Before dialog
+begins, the default is "FAILURE" which e.g. aborts on unknown commands.
 .br
 Mode "on" supports input of newline characters within quotation marks and
 line continuation by trailing backslash outside quotation marks.
diff --git a/libisoburn/trunk/xorriso/xorriso.info b/libisoburn/trunk/xorriso/xorriso.info
index 5b846488..0fad10af 100644
--- a/libisoburn/trunk/xorriso/xorriso.info
+++ b/libisoburn/trunk/xorriso/xorriso.info
@@ -2484,10 +2484,10 @@ File: xorriso.info,  Node: DialogCtl,  Next: Inquiry,  Prev: Exception,  Up: Opt
      Enable or disable to enter dialog mode after all arguments are
      processed.  In dialog mode input lines get prompted via readline
      or from stdin.
-     If no -abort_on severity was set when dialog starts, then "FATAL"
-     is set to avoid abort in most cases of wrong input. Before dialog
-     begins the default is "FAILURE" which e.g. aborts on unknown
-     commands.
+     If no -abort_on severity was set when dialog starts, then "NEVER"
+     is set to avoid abort in most cases of wrong input or other
+     problems. Before dialog begins, the default is "FAILURE" which
+     e.g. aborts on unknown commands.
      Mode "on" supports input of newline characters within quotation
      marks and line continuation by trailing backslash outside
      quotation marks.  Mode "single_line" does not.
@@ -4441,34 +4441,34 @@ Node: Jigdo113261
 Node: Charset117519
 Node: Exception120270
 Node: DialogCtl124785
-Node: Inquiry127353
-Node: Navigate131686
-Node: Verify139581
-Node: Restore148170
-Node: Emulation154826
-Node: Scripting163658
-Node: Frontend169220
-Node: Examples170515
-Node: ExDevices171684
-Node: ExCreate172318
-Node: ExDialog173592
-Node: ExGrowing174854
-Node: ExModifying175656
-Node: ExBootable176157
-Node: ExCharset176704
-Node: ExPseudo177532
-Node: ExCdrecord178426
-Node: ExMkisofs178741
-Node: ExGrowisofs179744
-Node: ExException180868
-Node: ExTime181322
-Node: ExIncBackup181781
-Node: ExRestore185271
-Node: ExRecovery186240
-Node: Files186806
-Node: Seealso188034
-Node: Legal188558
-Node: CommandIdx189480
-Node: ConceptIdx203706
+Node: Inquiry127372
+Node: Navigate131705
+Node: Verify139600
+Node: Restore148189
+Node: Emulation154845
+Node: Scripting163677
+Node: Frontend169239
+Node: Examples170534
+Node: ExDevices171703
+Node: ExCreate172337
+Node: ExDialog173611
+Node: ExGrowing174873
+Node: ExModifying175675
+Node: ExBootable176176
+Node: ExCharset176723
+Node: ExPseudo177551
+Node: ExCdrecord178445
+Node: ExMkisofs178760
+Node: ExGrowisofs179763
+Node: ExException180887
+Node: ExTime181341
+Node: ExIncBackup181800
+Node: ExRestore185290
+Node: ExRecovery186259
+Node: Files186825
+Node: Seealso188053
+Node: Legal188577
+Node: CommandIdx189499
+Node: ConceptIdx203725
 
 End Tag Table
diff --git a/libisoburn/trunk/xorriso/xorriso.texi b/libisoburn/trunk/xorriso/xorriso.texi
index 10b2f253..26ad1af5 100644
--- a/libisoburn/trunk/xorriso/xorriso.texi
+++ b/libisoburn/trunk/xorriso/xorriso.texi
@@ -44,7 +44,7 @@
 @c man .\" First parameter, NAME, should be all caps
 @c man .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 @c man .\" other parameters are allowed: see man(7), man(1)
-@c man .TH XORRISO 1 "Dec 28, 2010"
+@c man .TH XORRISO 1 "Jan 06, 2011"
 @c man .\" Please adjust this date whenever revising the manpage.
 @c man .\"
 @c man .\" Some roff macros, for reference:
@@ -3316,9 +3316,9 @@ file content stems from the loaded ISO image and is not filtered.
 Enable or disable to enter dialog mode after all arguments are processed.
 In dialog mode input lines get prompted via readline or from stdin.
 @*
-If no -abort_on severity was set when dialog starts, then "FATAL" is set
-to avoid abort in most cases of wrong input. Before dialog begins the
-default is "FAILURE" which e.g. aborts on unknown commands.
+If no -abort_on severity was set when dialog starts, then "NEVER" is set
+to avoid abort in most cases of wrong input or other problems. Before dialog
+begins, the default is "FAILURE" which e.g. aborts on unknown commands.
 @*
 Mode "on" supports input of newline characters within quotation marks and
 line continuation by trailing backslash outside quotation marks.
diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h
index f81c1da3..fc0e5d8f 100644
--- a/libisoburn/trunk/xorriso/xorriso_timestamp.h
+++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2011.01.04.193042"
+#define Xorriso_timestamP "2011.01.06.111034"