From e579135a37d6f2ce6f905385d55733f4c96135e0 Mon Sep 17 00:00:00 2001
From: Bert Wesarg <Bert.Wesarg@googlemail.com>
Date: Thu, 24 Jan 2008 14:53:02 +0100
Subject: [PATCH] shell_command-make-input-parameter-optional.patch: add
 changes to help.etx

B.W.
---
 ColoredWinMenu-transient.patch                    |  2 +-
 ColoredWinMenu.diff                               |  2 +-
 UnderlineStyle-docs.patch                         |  4 ++--
 backward_word_tail.patch                          |  2 +-
 enhanced-hooks-docs.patch                         |  6 +++---
 enhanced-hooks-renaming.patch                     |  2 +-
 enhanced-hooks.2008-01-20.1.diff                  | 20 +++++++++----------
 extended-paragraph-any.patch                      |  4 ++--
 extended-paragraph-end.patch                      |  4 ++--
 handle_hardlink.patch                             |  2 +-
 leftrightmousewheel.patch                         |  4 ++--
 load_macro_file-nowarn-option.patch               |  2 +-
 macroSplit-docs.patch                             |  6 +++---
 matching_patterns.patch                           | 10 +++++-----
 pos_line_convert.patch                            |  2 +-
 remove_zero_sized_files.patch                     |  2 +-
 select_word.patch                                 |  4 ++--
 setWindowTitleFormat.diff                         |  2 +-
 shell_command-make-input-parameter-optional.patch | 24 ++++++++++++++++++++++-
 timer_macros.patch                                |  2 +-
 20 files changed, 64 insertions(+), 42 deletions(-)

diff --git a/ColoredWinMenu-transient.patch b/ColoredWinMenu-transient.patch
index ee4240d..0c43898 100644
--- a/ColoredWinMenu-transient.patch
+++ b/ColoredWinMenu-transient.patch
@@ -9,7 +9,7 @@
 diff --quilt old/doc/help.etx new/doc/help.etx
 --- old/doc/help.etx
 +++ new/doc/help.etx
-@@ -4462,14 +4462,18 @@ X Resources
+@@ -4463,14 +4463,18 @@ X Resources
  
  **nedit.readOnlyWinMenuColor**: blue
  
diff --git a/ColoredWinMenu.diff b/ColoredWinMenu.diff
index 4d63527..5093b9d 100644
--- a/ColoredWinMenu.diff
+++ b/ColoredWinMenu.diff
@@ -49,7 +49,7 @@
 diff --quilt old/doc/help.etx new/doc/help.etx
 --- old/doc/help.etx
 +++ new/doc/help.etx
-@@ -4441,10 +4441,36 @@ X Resources
+@@ -4442,10 +4442,36 @@ X Resources
    expression searches. Moreover, when set to True, by default literal searches
    are case insensitive and regular expression searches are case sensitive. When
    set to False, the "Case Sensitive" buttons are independent of the "Regular
diff --git a/UnderlineStyle-docs.patch b/UnderlineStyle-docs.patch
index 5ac7e1b..f0b0eb3 100644
--- a/UnderlineStyle-docs.patch
+++ b/UnderlineStyle-docs.patch
@@ -6,7 +6,7 @@
 diff --quilt old/doc/help.etx new/doc/help.etx
 --- old/doc/help.etx
 +++ new/doc/help.etx
-@@ -3106,10 +3106,11 @@ Highlighting Information
+@@ -3107,10 +3107,11 @@ Highlighting Information
    Returns an array containing the style attributes for style 'style_name'.
    The elements in this array are:
  
@@ -18,7 +18,7 @@ diff --quilt old/doc/help.etx new/doc/help.etx
  
    The colors use the names specified in the color definitions for the style.
    These will either be names matching those the X server recognises, or RGB
-@@ -3122,10 +3123,11 @@ Highlighting Information
+@@ -3123,10 +3124,11 @@ Highlighting Information
    position 'pos'. The elements in this array are:
  
  * **style** -- Name of the highlight style
diff --git a/backward_word_tail.patch b/backward_word_tail.patch
index bca2938..fdf8c84 100644
--- a/backward_word_tail.patch
+++ b/backward_word_tail.patch
@@ -54,7 +54,7 @@ diff --quilt old/source/text.c new/source/text.c
 diff --quilt old/doc/help.etx new/doc/help.etx
 --- old/doc/help.etx
 +++ new/doc/help.etx
-@@ -3416,15 +3416,16 @@ Action Routines
+@@ -3417,15 +3417,16 @@ Action Routines
    Moves the cursor to the beginning of the paragraph, or
    if the cursor is already at the beginning of a paragraph, moves the cursor to
    the beginning of the previous paragraph.  Paragraphs are defined as regions
diff --git a/enhanced-hooks-docs.patch b/enhanced-hooks-docs.patch
index 140d300..c4cd184 100644
--- a/enhanced-hooks-docs.patch
+++ b/enhanced-hooks-docs.patch
@@ -58,7 +58,7 @@ diff --quilt old/doc/help.etx new/doc/help.etx
    Selects (with the primary selection) text in the current buffer between a
    starting and ending position.
  
-@@ -2760,14 +2761,14 @@ Macro Subroutines
+@@ -2761,14 +2762,14 @@ Macro Subroutines
  
  **typeof( value )**
    Returns a string indicating the type of a macro value. The value can be
@@ -77,7 +77,7 @@ diff --quilt old/doc/help.etx new/doc/help.etx
    Returns 1 if the string can be converted to a number without error
    following the same rules that the implicit conversion would. Otherwise 0.
  
-@@ -3234,11 +3235,12 @@ Action Routines
+@@ -3235,11 +3236,12 @@ Action Routines
  
      ~search-direction~
                     Either "forward" or "backward".
@@ -91,7 +91,7 @@ diff --quilt old/doc/help.etx new/doc/help.etx
  
      ~shell-menu-item-name~
                     Name of the command exactly as specified in
-@@ -3656,16 +3658,31 @@ Hooks
+@@ -3657,16 +3659,31 @@ Hooks
    simply skipped.
  
  **file_open_hook()**
diff --git a/enhanced-hooks-renaming.patch b/enhanced-hooks-renaming.patch
index b9987c0..6b57913 100644
--- a/enhanced-hooks-renaming.patch
+++ b/enhanced-hooks-renaming.patch
@@ -57,7 +57,7 @@ diff --quilt old/source/selection.c new/source/selection.c
 diff --quilt old/doc/help.etx new/doc/help.etx
 --- old/doc/help.etx
 +++ new/doc/help.etx
-@@ -3655,14 +3655,14 @@ Hooks
+@@ -3656,14 +3656,14 @@ Hooks
    is called.
  
    You don't have to provide any hook. If a certain hook does not exist, it is
diff --git a/enhanced-hooks.2008-01-20.1.diff b/enhanced-hooks.2008-01-20.1.diff
index 0bde112..b80e060 100644
--- a/enhanced-hooks.2008-01-20.1.diff
+++ b/enhanced-hooks.2008-01-20.1.diff
@@ -196,7 +196,7 @@ diff --quilt old/doc/help.etx new/doc/help.etx
    running.  If there is no displayed calltip this does nothing.  If a calltip
    ID is supplied then the calltip is killed only if its ID is calltip_ID.
  
-@@ -2738,10 +2756,19 @@ Macro Subroutines
+@@ -2739,10 +2757,19 @@ Macro Subroutines
    Return an all lower-case version of string.
  
  **toupper( string )**
@@ -216,7 +216,7 @@ diff --quilt old/doc/help.etx new/doc/help.etx
    following the same rules that the implicit conversion would. Otherwise 0.
  
  **write_file( string, filename )**
-@@ -3111,11 +3138,11 @@ Action Routines
+@@ -3112,11 +3139,11 @@ Action Routines
  3>Menu Action Routine Arguments
  
    Arguments are text strings enclosed in quotes. Below are the menu action
@@ -229,7 +229,7 @@ diff --quilt old/doc/help.etx new/doc/help.etx
  
      **execute_command**( shell-command )
  
-@@ -3176,10 +3203,19 @@ Action Routines
+@@ -3177,10 +3204,19 @@ Action Routines
                                 preference
                     "opposite": Opposite of user's tab/window
                                 preference
@@ -249,7 +249,7 @@ diff --quilt old/doc/help.etx new/doc/help.etx
                     wildcards and `~' are not expanded.
  
      ~keep-dialog~    Either "keep" or "nokeep".
-@@ -3602,10 +3638,35 @@ Action Routines
+@@ -3603,10 +3639,35 @@ Action Routines
  
  **self_insert()**
    To be attached to a key-press event, inserts the character
@@ -285,7 +285,7 @@ diff --quilt old/doc/help.etx new/doc/help.etx
  Customizing
  ===========
  
-@@ -3702,10 +3763,18 @@ Preferences
+@@ -3703,10 +3764,18 @@ Preferences
  **Wrap Margin**
    Set margin for Auto Newline Wrap, Continuous Wrap, and Fill Paragraph.  Lines
    may, be wrapped at the right margin of the window, or the margin can be set
@@ -304,7 +304,7 @@ diff --quilt old/doc/help.etx new/doc/help.etx
    characters, and control tab emulation and use of tab characters in padding
    and emulated tabs.
  
-@@ -3745,10 +3814,17 @@ Preferences
+@@ -3746,10 +3815,17 @@ Preferences
  **Read Only**
    Lock the file against accidental modification.  This temporarily prevents the
    file from being modified in this NEdit session. Note that this is different
@@ -322,7 +322,7 @@ diff --quilt old/doc/help.etx new/doc/help.etx
    Options in the Preferences -> Default Settings menu have the same meaning as
    those in the top-level Preferences menu, except that they apply to future
    NEdit windows and future NEdit sessions if saved with the Save Defaults
-@@ -3846,10 +3922,16 @@ Preferences
+@@ -3847,10 +3923,16 @@ Preferences
  
  **Terminate with Line Break on Save**
    Some UNIX tools expect that files end with a line feed. If this option is
@@ -339,7 +339,7 @@ diff --quilt old/doc/help.etx new/doc/help.etx
    order of last access.
  
  **Popups Under Pointer**
-@@ -4182,10 +4264,16 @@ X Resources
+@@ -4183,10 +4265,16 @@ X Resources
  
    Number of files listed in the Open Previous sub-menu of the File menu.
    Setting this to zero disables the Open Previous menu item and maintenance of
@@ -356,7 +356,7 @@ diff --quilt old/doc/help.etx new/doc/help.etx
    Command used by the print dialog to print a file, such as, lp, lpr, etc..
    The command must be capable of accepting input via stdin (standard input).
  
-@@ -4221,10 +4309,16 @@ X Resources
+@@ -4222,10 +4310,16 @@ X Resources
  **nedit.printDefaultHost**: (system specific)
  
    The node name of the default print host.  Used only to display in the print
@@ -373,7 +373,7 @@ diff --quilt old/doc/help.etx new/doc/help.etx
    If your screen supports multiple visuals (color mapping models), this
    resource allows you to manually choose among them.  The default value of
    "Best" chooses the deepest (most colors) visual available. Since NEdit does
-@@ -5865,10 +5959,11 @@ Problems/Defects
+@@ -5866,10 +5960,11 @@ Problems/Defects
  .. Menu:   Macro Language                   # macro_lang
  .. Menu:   M_a_cro Subroutines              # macro_subrs
  .. Menu:   Rangesets                        # rangeset
diff --git a/extended-paragraph-any.patch b/extended-paragraph-any.patch
index 2bd3e11..224f654 100644
--- a/extended-paragraph-any.patch
+++ b/extended-paragraph-any.patch
@@ -138,7 +138,7 @@ diff --quilt old/source/text.c new/source/text.c
 diff --quilt old/doc/help.etx new/doc/help.etx
 --- old/doc/help.etx
 +++ new/doc/help.etx
-@@ -3412,17 +3412,20 @@ Action Routines
+@@ -3413,17 +3413,20 @@ Action Routines
    is supplied.
  
  **backward_character( ["nobell"] )**
@@ -161,7 +161,7 @@ diff --quilt old/doc/help.etx new/doc/help.etx
    Moves the cursor to the beginning of a word, or, if the
    cursor is already at the beginning of a word, moves the cursor to the
    beginning of the previous word.  Word delimiters are user-settable, and
-@@ -3539,17 +3542,19 @@ Action Routines
+@@ -3540,17 +3543,19 @@ Action Routines
    negative-index (numbers less than 0, -1 is the same as "last").
  
  **forward_character()**
diff --git a/extended-paragraph-end.patch b/extended-paragraph-end.patch
index 96a3212..b5530bf 100644
--- a/extended-paragraph-end.patch
+++ b/extended-paragraph-end.patch
@@ -84,7 +84,7 @@ diff --quilt old/source/text.c new/source/text.c
 diff --quilt old/doc/help.etx new/doc/help.etx
 --- old/doc/help.etx
 +++ new/doc/help.etx
-@@ -3412,15 +3412,17 @@ Action Routines
+@@ -3413,15 +3413,17 @@ Action Routines
    is supplied.
  
  **backward_character( ["nobell"] )**
@@ -104,7 +104,7 @@ diff --quilt old/doc/help.etx new/doc/help.etx
    Moves the cursor to the beginning of a word, or, if the
    cursor is already at the beginning of a word, moves the cursor to the
    beginning of the previous word.  Word delimiters are user-settable, and
-@@ -3537,14 +3539,17 @@ Action Routines
+@@ -3538,14 +3540,17 @@ Action Routines
    negative-index (numbers less than 0, -1 is the same as "last").
  
  **forward_character()**
diff --git a/handle_hardlink.patch b/handle_hardlink.patch
index 357ed2f..a8afddc 100644
--- a/handle_hardlink.patch
+++ b/handle_hardlink.patch
@@ -531,7 +531,7 @@ diff --quilt old/source/window.h new/source/window.h
 diff --quilt old/doc/help.etx new/doc/help.etx
 --- old/doc/help.etx
 +++ new/doc/help.etx
-@@ -3969,10 +3969,29 @@ Preferences
+@@ -3970,10 +3970,29 @@ Preferences
  
  **Terminate with Line Break on Save**
    Some UNIX tools expect that files end with a line feed. If this option is
diff --git a/leftrightmousewheel.patch b/leftrightmousewheel.patch
index 5b31340..5e7e170 100644
--- a/leftrightmousewheel.patch
+++ b/leftrightmousewheel.patch
@@ -225,7 +225,7 @@ diff --quilt old/doc/help.etx new/doc/help.etx
    The right margin in the current window for text wrapping and filling.
  
  **$wrap_text**
-@@ -3628,15 +3628,19 @@ Action Routines
+@@ -3629,15 +3629,19 @@ Action Routines
  
  **scroll_down( nUnits, ["lines" | "pages"] )**
    Scroll the display down (towards the end of the file) by a given
@@ -250,7 +250,7 @@ diff --quilt old/doc/help.etx new/doc/help.etx
    Scroll the display up (towards the beginning of the file) by a given
    number of units, units being lines or pages. Default units are lines.
  
-@@ -3822,11 +3826,11 @@ Preferences
+@@ -3823,11 +3827,11 @@ Preferences
    this feature off. "Always" will show the wrap margin irrespecitive of the
    wrapping style. "When Wrap is Enabled" will show the wrap margin only if
    continuous or auto-newline wrap styles are choosen and does not show the wrap
diff --git a/load_macro_file-nowarn-option.patch b/load_macro_file-nowarn-option.patch
index 1cd89c7..f46afe8 100644
--- a/load_macro_file-nowarn-option.patch
+++ b/load_macro_file-nowarn-option.patch
@@ -7,7 +7,7 @@
 diff --quilt old/doc/help.etx new/doc/help.etx
 --- old/doc/help.etx
 +++ new/doc/help.etx
-@@ -3238,10 +3238,12 @@ Action Routines
+@@ -3239,10 +3239,12 @@ Action Routines
  
      **goto_mark**( ~mark-letter~ )
  
diff --git a/macroSplit-docs.patch b/macroSplit-docs.patch
index d0f0020..53f71d9 100644
--- a/macroSplit-docs.patch
+++ b/macroSplit-docs.patch
@@ -6,11 +6,11 @@
 diff --quilt old/doc/help.etx new/doc/help.etx
 --- old/doc/help.etx
 +++ new/doc/help.etx
-@@ -2763,14 +2763,25 @@ Macro Subroutines
- **shell_command( command, input_string )**
+@@ -2764,14 +2764,25 @@ Macro Subroutines
    Executes a shell command, feeding it input from input_string. On completion,
    output from the command is returned as the function value, and the command's
-   exit status is returned in the global variable $shell_cmd_status.
+   exit status is returned in the global variable $shell_cmd_status. If the
+   input_string is ommited or is "" the shell command get no input.
  
 -**split(string, separation_string [, search_type])**
 +**split( string, separation_string [, search_type] [, count] [, "lastnotnull"] )**
diff --git a/matching_patterns.patch b/matching_patterns.patch
index 59b8f1a..670a1d7 100644
--- a/matching_patterns.patch
+++ b/matching_patterns.patch
@@ -149,7 +149,7 @@ diff --quilt old/doc/help.etx new/doc/help.etx
    window.
  
  **get_selection()**
-@@ -3300,13 +3320,10 @@ Action Routines
+@@ -3301,13 +3321,10 @@ Action Routines
    If no parameters are supplied the option is toggled.
  
  **set_show_matching( "off" | "delimiter" | "range" )**
@@ -163,7 +163,7 @@ diff --quilt old/doc/help.etx new/doc/help.etx
    A value of 0 turns it off and a value of 1 turns it on.
    If no parameters are supplied the option is toggled.
  
-@@ -3818,14 +3835,10 @@ Preferences
+@@ -3819,14 +3836,10 @@ Preferences
    range between them, when one of these characters is typed, or when the
    insertion cursor is positioned after it. Delimiter only highlights the
    matching delimiter, while Range highlights the whole range of text between
@@ -178,7 +178,7 @@ diff --quilt old/doc/help.etx new/doc/help.etx
    the insertion cursor, rather than being inserted before them.
  
  **Read Only**
-@@ -4928,10 +4941,189 @@ Smart Indent Macros
+@@ -4929,10 +4942,189 @@ Smart Indent Macros
    before the character is inserted into the buffer.  You can do just about
    anything here, but keep in mind that this macro is executed for every
    keystroke typed, so if you try to get too fancy, you may degrade performance.
@@ -368,7 +368,7 @@ diff --quilt old/doc/help.etx new/doc/help.etx
  
  .. ? help !!#ifndef VMS
     **nedit** [-**read**] [-**create**] [-**line** n | +n] [-**server**]
-@@ -5958,10 +6150,11 @@ Problems/Defects
+@@ -5959,10 +6151,11 @@ Problems/Defects
  .. Menu: Features for Programming           # features
  .. Menu:   Programming with NEdit           # programmer
  .. Menu:   Tabs/Emulated Tabs               # tabs
@@ -380,7 +380,7 @@ diff --quilt old/doc/help.etx new/doc/help.etx
  
  .. Menu: Regular Expressions                # regex
  .. Menu:   Basic Regular Expression Syntax  # basicSyntax
-@@ -5985,10 +6178,11 @@ Problems/Defects
+@@ -5986,10 +6179,11 @@ Problems/Defects
  .. Menu:   Preferences                      # preferences
  .. Menu:   X Resources                      # resources
  .. Menu:   Key Binding                      # binding
diff --git a/pos_line_convert.patch b/pos_line_convert.patch
index 078896c..7216201 100644
--- a/pos_line_convert.patch
+++ b/pos_line_convert.patch
@@ -9,7 +9,7 @@
 diff --quilt old/doc/help.etx new/doc/help.etx
 --- old/doc/help.etx
 +++ new/doc/help.etx
-@@ -2771,10 +2771,24 @@ Macro Subroutines
+@@ -2772,10 +2772,24 @@ Macro Subroutines
    is beyond the end position, the empty string is returned.
  
  **t_print( string1, string2, ... )**
diff --git a/remove_zero_sized_files.patch b/remove_zero_sized_files.patch
index 9a029e0..d29eb34 100644
--- a/remove_zero_sized_files.patch
+++ b/remove_zero_sized_files.patch
@@ -280,7 +280,7 @@ diff --quilt old/source/preferences.h new/source/preferences.h
 diff --quilt old/doc/help.etx new/doc/help.etx
 --- old/doc/help.etx
 +++ new/doc/help.etx
-@@ -3988,10 +3988,13 @@ Preferences
+@@ -3989,10 +3989,13 @@ Preferences
    name but a new destine file or ignore it.
  
    ~Unlink~
diff --git a/select_word.patch b/select_word.patch
index 7b4187c..6d22ed2 100644
--- a/select_word.patch
+++ b/select_word.patch
@@ -15,7 +15,7 @@
 diff --quilt old/doc/help.etx new/doc/help.etx
 --- old/doc/help.etx
 +++ new/doc/help.etx
-@@ -3146,19 +3146,19 @@ Action Routines
+@@ -3147,19 +3147,19 @@ Action Routines
      -----------------------   filter_selection()
      undo()                    execute_command()
      redo()                    execute_command_dialog()
@@ -44,7 +44,7 @@ diff --quilt old/doc/help.etx new/doc/help.etx
                                detach_document()
                                move_document_dialog()
  
-@@ -3667,10 +3667,13 @@ Action Routines
+@@ -3668,10 +3668,13 @@ Action Routines
    a secondary selection.
  
  **select_all()**
diff --git a/setWindowTitleFormat.diff b/setWindowTitleFormat.diff
index c09a6f4..442165b 100644
--- a/setWindowTitleFormat.diff
+++ b/setWindowTitleFormat.diff
@@ -24,7 +24,7 @@
 diff --quilt old/doc/help.etx new/doc/help.etx
 --- old/doc/help.etx
 +++ new/doc/help.etx
-@@ -3916,13 +3916,20 @@ Preferences
+@@ -3917,13 +3917,20 @@ Preferences
  **Customize Menus**
    Add/remove items from the Shell, Macro, and window background menus (see
    below).
diff --git a/shell_command-make-input-parameter-optional.patch b/shell_command-make-input-parameter-optional.patch
index f87edfc..bb8f0ed 100644
--- a/shell_command-make-input-parameter-optional.patch
+++ b/shell_command-make-input-parameter-optional.patch
@@ -1,7 +1,8 @@
 ---
 
+ doc/help.etx   |    5 +++--
  source/macro.c |    7 ++++---
- 1 files changed, 4 insertions(+), 3 deletions(-)
+ 2 files changed, 7 insertions(+), 5 deletions(-)
 
 diff --quilt old/source/macro.c new/source/macro.c
 --- old/source/macro.c
@@ -28,3 +29,24 @@ diff --quilt old/source/macro.c new/source/macro.c
      /* Shell command execution requires that the macro be suspended, so
         this subroutine can't be run if macro execution can't be interrupted */
      if (MacroRunWindow()->macroCmdData == NULL) {
+diff --quilt old/doc/help.etx new/doc/help.etx
+--- old/doc/help.etx
++++ new/doc/help.etx
+@@ -2691,14 +2691,15 @@ Macro Subroutines
+ ..  off.
+ 
+ **set_cursor_pos( position )**
+   Set the cursor position for the current window.
+ 
+-**shell_command( command, input_string )**
++**shell_command( command[, input_string] )**
+   Executes a shell command, feeding it input from input_string. On completion,
+   output from the command is returned as the function value, and the command's
+-  exit status is returned in the global variable $shell_cmd_status.
++  exit status is returned in the global variable $shell_cmd_status. If the
++  input_string is ommited or is "" the shell command get no input.
+ 
+ **split(string, separation_string [, search_type])**
+   Splits a string using the separator specified. Optionally the search_type
+   argument can specify how the separation_string is interpreted. The default
+   is "literal". The returned value is an array with keys beginning at 0.
diff --git a/timer_macros.patch b/timer_macros.patch
index 20da439..febea50 100644
--- a/timer_macros.patch
+++ b/timer_macros.patch
@@ -230,7 +230,7 @@ diff --quilt old/source/highlightData.c new/source/highlightData.c
 diff --quilt old/doc/help.etx new/doc/help.etx
 --- old/doc/help.etx
 +++ new/doc/help.etx
-@@ -2795,10 +2795,20 @@ Macro Subroutines
+@@ -2796,10 +2796,20 @@ Macro Subroutines
    is beyond the end position, the empty string is returned.
  
  **t_print( string1, string2, ... )**
-- 
2.11.4.GIT