--- nedit-5.6~cvs20100114.orig/Makefile
+++ nedit-5.6~cvs20100114/Makefile
@@ -16,7 +16,7 @@
 all:
 	@echo "Please specify target:"
 	@echo "(For example, type \"make linux\" for a Linux system.)"
-	@(cd makefiles && ls -C Makefile* | sed -e 's/Makefile.//g')
+	@(cd makefiles && ls -C Makefile* | sed -e 's/Makefile.//g CFLAGS="$(CFLAGS)"')
 
 .DEFAULT:
 	@- (cd Microline/XmL;   if [ -f ../../makefiles/Makefile.$@ -a ! -f ./Makefile.$@ ];\
@@ -49,6 +49,10 @@
 	(cd Xlt;    $(MAKE) -f Makefile.common clean)
 	(cd Microline/XmL;    $(MAKE) -f Makefile.common clean)
 	(cd source; $(MAKE) -f Makefile.common clean)
+	find util -type l | xargs rm -f
+	find source -type l | xargs rm -f
+	find Xlt -type l | xargs rm -f
+	find Microline/XmL -type l | xargs rm -f
 
 realclean: clean
 	(cd doc;    $(MAKE) clean)
--- nedit-5.6~cvs20100114.orig/makefiles/Makefile.linux
+++ nedit-5.6~cvs20100114/makefiles/Makefile.linux
@@ -17,7 +17,7 @@
 # To test if the Motif library exports the runtime version
 # add -DHAVE__XMVERSIONSTRING to CFLAGS
 #
-CFLAGS=-O -I/usr/X11R6/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD
+CFLAGS=$(CFLAGSD) -Wall -I/usr/X11R6/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD
 
 ARFLAGS=-urs
 
--- nedit-5.6~cvs20100114.orig/source/help_data.h
+++ nedit-5.6~cvs20100114/source/help_data.h
@@ -2,10 +2,10 @@
 *                                                                              *
 * help_data.h --  Nirvana Editor help module data                              *
 *                                                                              *
-                 Generated on Apr 10, 2006 (Do NOT edit!)
+                 Generated on Jan 14, 2010 (Do NOT edit!)
                  Source of content from file help.etx
 *                                                                              *
-* Copyright (c) 1999-2006 Mark Edel                                            *
+* Copyright (c) 1999-2010 Mark Edel                                            *
 *                                                                              *
 * This 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    *
@@ -63,7 +63,7 @@
     "Learn/Replay",
     "Macro Language",
     "Macro Subroutines",
-    "Range Sets",
+    "Rangesets",
     "Highlighting Information",
     "Action Routines",
     "Customizing NEdit",
@@ -286,6 +286,17 @@
 "string to search for and the string to substitute, and press the \"R. in ",
 "Selection\" button in the dialog.  Note that selecting text in the Replace... ",
 "dialog will unselect the text in the window. ",
+"\n\n",
+"\01RReplacement in Multiple Documents\01I",
+"\n\n",
+"You can do the same replacement in more than one document at the same time. ",
+"To do that, enter the search and replacement string in the replacement dialog ",
+"as usual, then press the 'Multiple Documents...' button. NEdit will open ",
+"another dialog where you can pick any document in which the replacement should ",
+"take place. Then press 'Replace' in this dialog to do the replacement. All ",
+"attributes (Regular Expression, Case, etc.) are used as selected in the main ",
+"dialog. ",
+"\n\n",
 NULL
 };
 
@@ -668,7 +679,7 @@
 "\01I\n",
 "\01A    Ctrl+PageDown Switch to the next document.\n",
 "\01I\n",
-"\01RSpecialty Keyboards  \01I",
+"\01RSpecialty Keyboards\01I",
 "\n\n",
 "On machines with different styles of keyboards, generally, text editing ",
 "actions are properly matched to the labeled keys, such as Remove, ",
@@ -698,7 +709,7 @@
 "recalculated and substituted, such that the non-whitespace characters remain ",
 "stationary with respect to the selection. ",
 "\n\n",
-"\01RFilling  \01I",
+"\01RFilling\01I",
 "\n\n",
 "Text filling using the Fill Paragraph command in the Edit menu is one of the ",
 "most important concepts in NEdit.  And it will be well worth your while to ",
@@ -793,7 +804,7 @@
 "challenge to portability, they affect NEdit only indirectly via the same font ",
 "and localization mechanisms common to all X applications.  If your system is ",
 "set up properly, you will probably never see character-set related problems ",
-"in NEdit.  NEdit can not display Unicode text files, or any multi-byte ",
+"in NEdit.  NEdit cannot display Unicode text files, nor any multi-byte ",
 "character set. ",
 "\n\n",
 "The primary difference between an MS DOS format file and a Unix format file, ",
@@ -1138,7 +1149,7 @@
 "The calltips file format is very simple.  calltips files are organized in blocks ",
 "separated by blank lines.  The first line of the block is the key, which is the ",
 "word that is matched when a calltip is requested.  The rest of the block is ",
-"displayed as the calltip.  ",
+"displayed as the calltip. ",
 "\n\n",
 "Almost any text at all can appear in a calltip key or a calltip.  There are no ",
 "special characters that need to be escaped.  The only issues to note are that ",
@@ -1216,7 +1227,7 @@
 "come in two flavors as described below: ",
 "\n\n",
 "\01A     [...]   Regular class, match only characters listed.\n",
-"     [^...]  Negated class, match only characters NOT listed.\n",
+"     [^...]  Negated class, match only characters \01Cnot\01A listed.\n",
 "\01I\n",
 "As with the dot token, by default negated character classes do not match ",
 "newline, but can be made to do so. ",
@@ -1242,11 +1253,13 @@
 "     >    Right word boundary\n",
 "     \\B   Not a word boundary\n",
 "\01I\n",
-"Note that the \\B token ensures that neither the left nor the right ",
-"character are delimiters, or that both left and right characters are ",
-"delimiters.  The left word anchor checks whether the previous character ",
-"is a delimiter and the next character is not.  The right word anchor ",
-"works in a similar way. ",
+"Note that the \\B token ensures that neither the left nor the right character ",
+"are delimiters, \01Jor\01I that both left and right characters are delimiters. ",
+"The left word anchor checks whether the previous character is a delimiter and ",
+"the next character is not. The right word anchor works in a similar way. ",
+"\n\n",
+"Note that word delimiters are user-settable, and defined by the X resource ",
+"wordDelimiters, cf. \01QX Resources\01I. ",
 "\n\n",
 "\01RQuantifiers\01I",
 "\n\n",
@@ -1326,7 +1339,7 @@
 static char * htxt_escapeSequences [] = {
 "\01REscaping Metacharacters\01I",
 "\n\n",
-"In a regular expression (regex), most ordinary characters match themselves.  ",
+"In a regular expression (regex), most ordinary characters match themselves. ",
 "For example, `ab%' would match anywhere `a' followed by `b' followed by `%' ",
 "appeared in the text.  Other characters don't match themselves, but are ",
 "metacharacters. For example, backslash is a special metacharacter which ",
@@ -1405,11 +1418,11 @@
 "\01I\n",
 "The `\\y' token matches any single character that is one of the characters ",
 "that NEdit recognizes as a word delimiter character, while the `\\Y' token ",
-"matches any character that is NOT a word delimiter character.  Word delimiter ",
-"characters are dynamic in nature, meaning that the user can change them through ",
-"preference settings.  For this reason, they must be handled differently by the ",
-"regular expression engine.  As a consequence of this, `\\y' and `\\Y' can not be ",
-"used within a character class specification. ",
+"matches any character that is \01Knot\01I a word delimiter character.  Word ",
+"delimiter characters are dynamic in nature, meaning that the user can change ",
+"them through preference settings.  For this reason, they must be handled ",
+"differently by the regular expression engine.  As a consequence of this, ",
+"`\\y' and `\\Y' cannot be used within a character class specification. ",
 NULL
 };
 
@@ -1448,7 +1461,7 @@
 "first character discrimination optimization.  You can include a positive ",
 "look-ahead that contains a character class which lists every character that ",
 "the following (potentially complex) regular expression could possibly start ",
-"with.  This will quickly filter out match attempts that can not possibly ",
+"with.  This will quickly filter out match attempts that cannot possibly ",
 "succeed. ",
 "\n\n",
 "\01RNegative Look-Ahead\01I",
@@ -1483,7 +1496,7 @@
 "\n\n",
 "Negative look-behind takes the form `(?<!<regex>)' and is exactly the same as ",
 "positive look-behind except that the enclosed regular expression must ",
-"NOT match. The same restrictions apply. ",
+"\01Knot\01I match. The same restrictions apply. ",
 "\n\n",
 "Note however, that performance is even more sensitive to the distance ",
 "between the size boundaries: a negative look-behind must not match for ",
@@ -1512,7 +1525,7 @@
 "however, that require finer control over how newlines are matched by some ",
 "regular expression tokens. ",
 "\n\n",
-"By default, NEdit regular expressions will NOT match a newline character for ",
+"By default, NEdit regular expressions will \01Knot\01I match a newline character for ",
 "the following regex tokens: dot (`.'); a negated character class (`[^...]'); ",
 "and the following shortcuts for character classes: ",
 "\n\n",
@@ -1630,10 +1643,13 @@
 "\n\n",
 "An excellent book on the care and feeding of regular expressions is ",
 "\n\n",
-"\01A          Mastering Regular Expressions, 2nd Edition\n",
+"\01A          Mastering Regular Expressions, 3rd Edition\n",
 "          Jeffrey E. F. Friedl\n",
-"          2002, O'Reilly & Associates\n",
-"          ISBN 0-596-00289-0\n",
+"          August 2006, O'Reilly & Associates\n",
+"          ISBN 0-596-52812-4\n",
+"\01I\n",
+"The first end second editions of this book are still useful for basic ",
+"introduction to regexes and contain many useful tips and tricks. ",
 NULL
 };
 
@@ -1691,7 +1707,7 @@
 "deposits the output at the current insertion point. In the Shell Command ",
 "field, the % character expands to the name (including directory path), and ",
 "the # character expands to the current line number of the file in the window. ",
-"To include a % or # character in the command, use %% or ##, respectively.  ",
+"To include a % or # character in the command, use %% or ##, respectively. ",
 "\n\n",
 "Execute Command Line uses the position of the cursor in the window to ",
 "indicate a line to execute as a shell command line.  The cursor may be ",
@@ -1702,7 +1718,7 @@
 "\n\n",
 "The X resource called nedit.shell (See \"\01QCustomizing NEdit\01I\") determines which ",
 "Unix shell is used to execute commands.  The default value for this resource ",
-"is /bin/csh. ",
+"is the user's login shell. ",
 NULL
 };
 
@@ -1882,7 +1898,7 @@
 "\01A     a = fn1(b, c) + fn2(d)\n",
 "     dialog(\"fn3 says: \" fn3())\n",
 "\01I\n",
-"Arguments are passed by value.  This means that you can not return values via ",
+"Arguments are passed by value.  This means that you cannot return values via ",
 "the argument list, only through the function value or indirectly through ",
 "agreed-upon global variables. ",
 "\n\n",
@@ -1893,8 +1909,8 @@
 "functions, and editor action routines.  Editor action routines are more ",
 "flexible, in that they may be called either from the macro language, or bound ",
 "directly to keys via translation tables.  They are also limited, however, in ",
-"that they can not return values.  Macro language routines can return values, ",
-"but can not be bound to keys in translation tables. ",
+"that they cannot return values.  Macro language routines can return values, ",
+"but cannot be bound to keys in translation tables. ",
 "\n\n",
 "Nearly all of the built-in subroutines operate on an implied window, which is ",
 "initially the window from which the macro was started.  To manipulate the ",
@@ -1919,7 +1935,7 @@
 "        < body of subroutine >\n",
 "     }\n",
 "\01I\n",
-"Subroutine definitions can not appear within other definitions, or within ",
+"Subroutine definitions cannot appear within other definitions, nor within ",
 "macro menu item definitions.  They can only appear in (macro) files, such as ",
 "the autoload macro file, cf. \01QPreferences\01I. Macro files can be loaded with ",
 "File -> Load Macro File or with the load_macro_file() action. ",
@@ -2152,16 +2168,16 @@
 "           break\n",
 "    }\n",
 "\01I\n",
-"Loops may contain break and continue statements.  A break statement causes an ",
-"exit from the innermost loop, a continue statement transfers control to the ",
-"end of the loop. ",
+"Loops may contain break and continue statements.  A \01Jbreak\01I statement ",
+"causes an exit from the innermost loop, a \01Jcontinue\01I statement transfers ",
+"control to the end of the loop. ",
 NULL
 };
 
 static char * htxt_macro_subrs [] = {
 "\01RBuilt in Variables\01I",
 "\n\n",
-"These variables are read-only and can not be changed. ",
+"These variables are read-only and cannot be changed by direct assignment. ",
 "\n\n",
 "\01A\01B$1\01A, \01B$2\01A, \01B$3\01A, \01B$4\01A, \01B$5\01A, \01B$6\01A, \01B$7\01A, \01B$8\01A, \01B$9\01A\n",
 "\01B$args\01A[\01Cexpr\01A]\n",
@@ -2194,9 +2210,9 @@
 "\n\n",
 "\01A\01B$em_tab_dist\01A\n",
 "\01IIf tab emulation is turned on in the Tabs... ",
-"dialog of the Preferences menu, value is the ",
+"dialog of the Preferences menu, the value is the ",
 "distance between emulated tab stops. If tab ",
-"emulation is turned off, value is -1. ",
+"emulation is turned off, the value is 0. ",
 "\n\n",
 "\01A\01B$empty_array\01A\n",
 "\01IAn array with no elements. This can be used to initialize ",
@@ -2263,6 +2279,9 @@
 "been modified and the modifications have not ",
 "yet been saved. ",
 "\n\n",
+"\01A\01B$VERSION\01A\n",
+"\01IReturns NEdit's version number ('5006' for NEdit 5.6). ",
+"\n\n",
 "\01A\01B$n_display_lines\01A\n",
 "\01IThe number of lines visible in the currently active pane. ",
 "\n\n",
@@ -2275,12 +2294,12 @@
 "\01A\01B$read_only\01A\n",
 "\01ITrue if the file is read only. ",
 "\n\n",
-"\01A\01B$selection_start, $selection_end\01A   \n",
+"\01A\01B$selection_start, $selection_end\01A\n",
 "\01IBeginning and ending positions of the ",
 "primary selection in the current window, or ",
 "-1 if there is no text selected in the current window. ",
 "\n\n",
-"\01A\01B$selection_left, $selection_right\01A  \n",
+"\01A\01B$selection_left, $selection_right\01A\n",
 "\01ILeft and right character offsets of the rectangular (primary) selection in ",
 "the current window, or -1 if there is no selection or it is not rectangular. ",
 "\n\n",
@@ -2309,7 +2328,7 @@
 "Tabs... dialog of the Preferences menu. ",
 "\n\n",
 "\01A\01B$text_length\01A\n",
-"\01IThe length of the text in the current window. ",
+"\01IThe length of the text in the current document. ",
 "\n\n",
 "\01A\01B$top_line\01A\n",
 "\01IThe line number of the top line of the currently active pane. ",
@@ -2359,11 +2378,11 @@
 "Returns the ID of the calltip if it was found and/or displayed correctly, ",
 "0 otherwise. ",
 "\n\n",
-"\01A\01Bclipboard_to_string()\01A  \n",
+"\01A\01Bclipboard_to_string()\01A\n",
 "\01IReturns the contents of the clipboard as a macro string. Returns empty ",
 "string on error. ",
 "\n\n",
-"\01A\01Bdialog( message, btn_1_label, btn_2_label, ... )\01A  \n",
+"\01A\01Bdialog( message, btn_1_label, btn_2_label, ... )\01A\n",
 "\01IPop up a dialog for querying and presenting information to the user. First ",
 "argument is a string to show in the message area of the dialog. ",
 "Additional optional arguments represent labels for buttons to appear along ",
@@ -2371,13 +2390,22 @@
 "first button is number 1), or 0 if the user closed the dialog via the window ",
 "close box. ",
 "\n\n",
-"\01A\01Bexist_filename_dialog( title[, default_path[, filter]] )\01A\n",
+"\01A\01Bfilename_dialog( [title[, mode[, defaultPath[, filter[, defaultName]]]]] )\01A\n",
 "\01IPresents a file selection dialog with the given title to the user that ",
-"prompts for an existing file.  A default path and a filter (e.g. \"*.c\") can be ",
-"optionally specified.  To specify a filter without a default path, specify \"\" ",
-"as the default path.  Returns \"\" if the user cancelled the dialog,  otherwise ",
-"returns the fully-qualified path, including the filename.  See also ",
-"\01Jnew_filename_dialog( ... )\01I. ",
+"prompts for a new or existing file. ",
+"\n\n",
+"Options are: \01Ktitle\01I will be the title of the dialog, defaults to \"Choose ",
+"file\". If \01Kmode\01I is set to \"exist\" (default), the \"New File Name\"TextField ",
+"of the FSB will be unmanaged. If \"new\", the TextField will be managed. ",
+"\01KdefaultPath\01I is the default path to use. Default (or \"\") will use the ",
+"active document's directory. \01Kfilter\01I is the file glob which determines ",
+"which files to display. Is set to \"*\" if filter is \"\" and by default. ",
+"\01KdefaultName\01I is the default filename that is filled in automatically. ",
+"(\01JNote\01I that the default_filename argument does not work on all Motif ",
+"implementations.) ",
+"\n\n",
+"Returns \"\" if the user cancelled the dialog, otherwise returns the ",
+"fully-qualified path, including the filename. ",
 "\n\n",
 "\01A\01Bfocus_window( window_name )\01A  \n",
 "\01ISets the window on which subsequent macro commands operate. window_name can ",
@@ -2388,15 +2416,15 @@
 "focus_window(\"last\"). Returns the name of the newly-focused window, or an ",
 "empty string if the requested window was not found. ",
 "\n\n",
-"\01A\01Bget_character( position )\01A  \n",
+"\01A\01Bget_character( position )\01A\n",
 "\01IReturns the single character at the position ",
 "indicated by the first argument to the routine from the current window. ",
 "\n\n",
-"\01A\01Bget_range( start, end )\01A  \n",
+"\01A\01Bget_range( start, end )\01A\n",
 "\01IReturns the text between a starting and ending position from the current ",
 "window. ",
 "\n\n",
-"\01A\01Bget_selection()\01A  \n",
+"\01A\01Bget_selection()\01A\n",
 "\01IReturns a string containing the text currently selected by the primary ",
 "selection either from the current window (no keyword), or from anywhere on ",
 "the screen (keyword \"any\"). ",
@@ -2412,7 +2440,7 @@
 "\01A\01Blength( string )\01A\n",
 "\01IReturns the length of a string ",
 "\n\n",
-"\01A\01Blist_dialog( message, text, btn_1_label, btn_2_label, ... )\01A  \n",
+"\01A\01Blist_dialog( message, text, btn_1_label, btn_2_label, ... )\01A\n",
 "\01IPop up a dialog for prompting the user to choose a line from the given text ",
 "string. The first argument is a message string to be used as a title for the ",
 "fixed text describing the list. The second string provides the list data: ",
@@ -2431,41 +2459,36 @@
 "\01A\01Bmin( n1, n2, ... )\01A\n",
 "\01IReturns the minimum value of all of its arguments ",
 "\n\n",
-"\01A\01Bnew_filename_dialog( title[, default_path[, default_filename]] )\01A\n",
-"\01IPresents a file selection dialog with the given title to the user that ",
-"prompts for a new or existing file.  A default path and filename can be ",
-"optionally specified.  To specify a default filename without a default path, ",
-"specify \"\" as the default path.  Returns \"\" if the user cancelled the dialog, ",
-"otherwise returns the fully-qualified path, including the filename.  Note that ",
-"the default_filename argument does not work on all Motif implementations. ",
-"See also \01Jexist_filename_dialog( ... )\01I. ",
-"\n\n",
 "\01A\01Bread_file( filename )\01A  \n",
 "\01IReads the contents of a text file into a string. On success, returns 1 in ",
 "$read_status, and the contents of the file as a string in the subroutine ",
 "return value. On failure, returns the empty string \"\" and an 0 $read_status. ",
 "\n\n",
-"\01A\01Breplace_in_string( string, search_for, replace_with [, type, \"copy\"] )\01A  \n",
+"\01A\01Breplace_in_string( string, search_for, replace_with [, type, \"copy\"] )\01A\n",
 "\01IReplaces all occurrences of a search string in a string with a replacement ",
 "string. Arguments are 1: string to search in, 2: string to search for, 3: ",
 "replacement string.  There are two optional arguments.  One is a search type, ",
-"either \"literal\", \"case\", \"word\", \"caseWord\", \"regex\", or \"regexNoCase\".  ",
+"either \"literal\", \"case\", \"word\", \"caseWord\", \"regex\", or \"regexNoCase\". ",
 "The default search type is \"literal\".  If the optional \"copy\" argument is ",
 "specified, a copy of the input string is returned when no replacements were ",
 "performed.  By default an empty string (\"\") will be returned in this case. ",
 "Returns a new string with all of the replacements done. ",
 "\n\n",
-"\01A\01Breplace_range( start, end, string )\01A  \n",
+"\01A\01Breplace_range( start, end, string )\01A\n",
 "\01IReplaces all the text between two positions in the current window. If the ",
 "cursor position is between start and end it will be set to start. ",
 "\n\n",
-"\01A\01Breplace_selection( string )\01A  \n",
+"\01A\01Breplace_selection( string )\01A\n",
 "\01IReplaces the primary-selection selected text in the current window. ",
 "\n\n",
-"\01A\01Breplace_substring( string, start, end, replace_with )\01A  \n",
+"\01A\01Breplace_substring( string, start, end, replace_with )\01A\n",
 "\01IReplacing a substring between two positions in a string within another string. ",
 "\n\n",
-"\01A\01Bsearch( search_for, start [, search_type, wrap, direction] )\01A  \n",
+"\01A\01Brevert_to_saved()\01A\n",
+"\01IReloads the file, discarding all changes done to the document by the user ",
+"since the last save. ",
+"\n\n",
+"\01A\01Bsearch( search_for, start [, search_type, wrap, direction] )\01A\n",
 "\01ISearches silently in a window without dialogs, beeps, or changes to the ",
 "selection. Arguments are: 1: string to search for, 2: starting position. ",
 "Optional arguments may include the strings: \"wrap\" to make the search wrap ",
@@ -2475,9 +2498,8 @@
 "\"literal\"). Returns the starting position of the  match, or -1 if nothing ",
 "matched. Also returns the ending position  of the match in $search_end. ",
 "\n\n",
-"\01A\01Bsearch_string( string, search_for, start [, search_type, direction] )\01A \n",
-"\01I\n",
-"Built-in macro subroutine for searching a string. Arguments are 1: string to ",
+"\01A\01Bsearch_string( string, search_for, start [, search_type, direction] )\01A\n",
+"\01IBuilt-in macro subroutine for searching a string. Arguments are 1: string to ",
 "search in, 2: string to search for, 3: starting position. Optional arguments ",
 "may include the strings: \"wrap\" to make the search wrap around the beginning ",
 "or end of the string, \"backward\" or \"forward\" to change the search direction ",
@@ -2486,11 +2508,11 @@
 "the starting position of the match, or -1 if nothing matched. Also returns ",
 "the ending position of the match in $search_end. ",
 "\n\n",
-"\01A\01Bselect( start, end )\01A  \n",
+"\01A\01Bselect( start, end )\01A\n",
 "\01ISelects (with the primary selection) text in the current buffer between a ",
 "starting and ending position. ",
 "\n\n",
-"\01A\01Bselect_rectangle( start, end, left, right )\01A  \n",
+"\01A\01Bselect_rectangle( start, end, left, right )\01A\n",
 "\01ISelects a rectangular area of text between a starting and ending position, ",
 "and confined horizontally to characters displayed between positions \"left\", ",
 "and \"right\". ",
@@ -2498,7 +2520,7 @@
 "\01A\01Bset_cursor_pos( position )\01A\n",
 "\01ISet the cursor position for the current window. ",
 "\n\n",
-"\01A\01Bshell_command( command, input_string )\01A  \n",
+"\01A\01Bshell_command( command, input_string )\01A\n",
 "\01IExecutes 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. ",
@@ -2508,7 +2530,7 @@
 "argument can specify how the separation_string is interpreted. The default ",
 "is \"literal\". The returned value is an array with keys beginning at 0. ",
 "\n\n",
-"\01A\01Bstring_dialog( message, btn_1_label, btn_2_label, ... )\01A  \n",
+"\01A\01Bstring_dialog( message, btn_1_label, btn_2_label, ... )\01A\n",
 "\01IPops up a dialog prompting the user to enter information. The first argument ",
 "is a string to show in the message area of the dialog. Additional ",
 "optional arguments represent labels for buttons to appear along the bottom of ",
@@ -2524,10 +2546,10 @@
 "optional consider-case argument is either \"case\" or \"nocase\". The default ",
 "is to do a case sensitive comparison. ",
 "\n\n",
-"\01A\01Bstring_to_clipboard( string )\01A  \n",
+"\01A\01Bstring_to_clipboard( string )\01A\n",
 "\01ICopy the contents of a macro string to the clipboard. ",
 "\n\n",
-"\01A\01Bsubstring( string, start [, end] )\01A  \n",
+"\01A\01Bsubstring( string, start [, end] )\01A\n",
 "\01IReturns the portion of a string between a start and end position (with the ",
 "position of the beginning of the string being 0).  If end is missing, the ",
 "position of the end of the string is used. If either of the positions are ",
@@ -2536,7 +2558,7 @@
 "is repositioned to the nearest valid string position.  If the start position ",
 "is beyond the end position, the empty string is returned. ",
 "\n\n",
-"\01A\01Bt_print( string1, string2, ... )\01A  \n",
+"\01A\01Bt_print( string1, string2, ... )\01A\n",
 "\01IWrites strings to the terminal (stdout) from which NEdit was started. ",
 "\n\n",
 "\01A\01Btolower( string )\01A\n",
@@ -2549,7 +2571,7 @@
 "\01IReturns 1 if the string can be converted to a number without error ",
 "following the same rules that the implicit conversion would. Otherwise 0. ",
 "\n\n",
-"\01A\01Bwrite_file( string, filename )\01A  \n",
+"\01A\01Bwrite_file( string, filename )\01A\n",
 "\01IWrites a string (parameter 1) to a file named in parameter 2. Returns 1 on ",
 "successful write, or 0 if unsuccessful. ",
 "\n\n",
@@ -2567,41 +2589,51 @@
 };
 
 static char * htxt_rangeset [] = {
-"\01IA rangeset is a set of ranges. A range is a contiguous range of characters ",
-"defined by its start and end position in the document.  The user can ",
-"create rangesets, identified by arbitrary integers (chosen by the editor when ",
-"the rangesets are created), and each range within a rangeset is identified by ",
-"a numeric index, counting from 1, in the order of appearance in the text ",
-"buffer.  The ranges are adjusted when modifications are made to the text ",
-"buffer: they shuffle around when characters are added or deleted.  However, ",
-"ranges within a set will coalesce if the characters between them are removed, ",
-"or a new range is added to the set which bridges or overlaps others. ",
-"\n\n",
-"Using rangesets allows non-contiguous bits of the text to be identified as a ",
-"group. ",
-"\n\n",
-"Rangesets can be assigned a background color: characters within a range of a ",
-"rangeset will have the background color of the rangeset. If more than one ",
-"rangeset includes a given character, its background color will be that of the ",
-"most recently created rangeset which has a color defined. ",
-"\n\n",
-"Rangesets must be created using the rangeset_create() function, which ",
-"will return an identifier for the newly-created rangeset.  This identifier ",
-"is then passed to the other rangeset functions to manipulate the rangeset. ",
+"\01IRangesets are a tool of the macro language to tag parts, or ranges, of the ",
+"text, which shall be viewed as a group. A range is merely a contiguous range ",
+"of characters between a start and an end position in the document, and a set ",
+"of ranges belonging together is called a rangeset. So, a rangeset is nothing ",
+"but an in general non-contiguous part of the text. ",
+"\n\n",
+"Rangesets can be assigned a background color to make them visible: characters ",
+"within all ranges of a rangeset will have the background color of the ",
+"rangeset. (If more than one rangeset includes a given character, its ",
+"background color will be that of the most recently created rangeset which has ",
+"a color defined.) ",
+"\n\n",
+"Applications of rangesets are for example: ",
+"\n\n",
+"    * Showing differences between two versions of a file. Then, one rangeset would be those parts of the current file that are not in the prior version.\n",
+"    * Highlighting all occurrences of a particular pattern, e.g. showing all the strings 'foobar' in the file.\n",
+"    * Highlighting spelling mistakes found by a spell-checker.\n",
+"\n",
+"Rangesets are manipulated only through macro routines. Rangesets must be ",
+"created first using the rangeset_create() function, which will return an ",
+"identifier for the newly-created (empty) rangeset. This identifier is then ",
+"passed to the other rangeset functions to manipulate the rangeset. For ",
+"example, ranges are added to a rangeset with the rangeset_add() function. ",
+"\n\n",
+"Notice that the ranges inside a rangeset do not have a particular identity. ",
+"Only, they are given a (dynamically changing) numeric index, counting from 1, ",
+"in the order of appearance in the text buffer. The ranges are adjusted when ",
+"modifications are made to the text buffer: they shift around when characters ",
+"are added or deleted staying with the original strings of characters. ",
+"However, ranges within a set will coalesce if the characters between them are ",
+"removed, or a new range is added to  the set which bridges or overlaps ",
+"others. For more on this, see \"How rangesets change with modifications\". ",
 "\n\n",
 "There is a limit to the number of rangesets which can exist at any time - ",
-"currently up to 63 in each document.  Care should be taken to destroy ",
-"any rangesets which are no longer needed, by using the rangeset_destroy() ",
+"currently up to 63 in each document. Care should be taken to destroy any ",
+"rangesets which are no longer needed, by using the rangeset_destroy() ",
 "function, if this limit is attained. ",
 "\n\n",
 "Rangesets can be named: this is useful for macros which need a fixed ",
-"identification for rangesets which are used for the same purpose in ",
-"different documents.  Although a new rangeset's number is arbitrary, its ",
-"name can be fixed.  This is done using the rangeset_set_name() function. ",
-"Note that rangeset names within a particular document may not be unique. ",
-"For this reason, the rangeset_get_by_name() function returns an array of ",
-"identifiers, which will be empty if the name has not been associated with ",
-"a rangeset. ",
+"identification for rangesets which are used for the same purpose in different ",
+"documents. Although a new rangeset's number is arbitrary, its name can be ",
+"fixed.  This is done using the rangeset_set_name() function. Note that ",
+"rangeset names within a particular document may not be unique. For this ",
+"reason, the rangeset_get_by_name() function returns an array of identifiers, ",
+"which will be empty if the name has not been associated with a rangeset. ",
 "\n\n",
 "\01SHow rangesets change with modifications\01I",
 "\n\n",
@@ -2691,13 +2723,16 @@
 "rangesets appearing in the array. If any of the rangesets do not exist, ",
 "the function continues without errors. Does not return a value. ",
 "\n\n",
-"\01A\01Brangeset_add( r, [start, end] )\01A\n",
+"\01A\01Brangeset_add( r )\01A\n",
+"\01Brangeset_add( r, start, end )\01A\n",
 "\01Brangeset_add( r, r0 )\01A\n",
 "\01IAdds to the rangeset r. The first form adds the range identified by the ",
-"current primary selection to the rangeset, unless start and end are defined, ",
-"in which case the range they define is added. Returns the index of the ",
-"newly-added range within the rangeset. The second form adds all ranges in ",
-"the rangeset r0 to the rangeset r, and returns 0. ",
+"current primary selection to the rangeset, unless the selection is ",
+"rectangular. The second form adds the range defined by the start and end ",
+"positions given. The third form adds all ranges in the rangeset r0 to the ",
+"rangeset r, and returns 0. ",
+"\n\n",
+"Returns the index of the newly-added range within the rangeset. ",
 "\n\n",
 "\01A\01Brangeset_subtract( r, [start, end] )\01A\n",
 "\01Brangeset_subtract( r, r0 )\01A\n",
@@ -2754,7 +2789,6 @@
 "buffer occur.  type can be one of the following: \"maintain\" (the default), ",
 "\"break\", \"include\", \"exclude\", \"ins_del\" or \"del_ins\". (These modes are ",
 "described above.) ",
-"\n\n",
 NULL
 };
 
@@ -2854,7 +2888,7 @@
 "    save()                    replace_dialog()\n",
 "    save_as()                 replace_all()\n",
 "    save_as_dialog()          replace_in_selection()\n",
-"    revert_to_saved()         replace_again()\n",
+"    revert_to_saved_dialog()  replace_again()\n",
 "    include_file()            goto_line_number()\n",
 "    include_file_dialog()     goto_line_number_dialog()\n",
 "    load_macro_file()         goto_selected()\n",
@@ -2866,7 +2900,7 @@
 "    load_tips_file_dialog()   select_to_matching()\n",
 "    unload_tips_file()        find_definition()\n",
 "    print()                   show_tip()\n",
-"    print_selection()         \n",
+"    print_selection()\n",
 "    exit()                    Shell Menu\n",
 "                              -------------------------\n",
 "    Edit Menu                 filter_selection_dialog()\n",
@@ -2875,13 +2909,13 @@
 "    redo()                    execute_command_dialog()\n",
 "    delete()                  execute_command_line()\n",
 "    select_all()              shell_menu_command()\n",
-"    shift_left()              \n",
+"    shift_left()\n",
 "    shift_left_by_tab()       Macro Menu\n",
 "    shift_right()             -------------------------\n",
 "    shift_right_by_tab()      macro_menu_command()\n",
 "    uppercase()               repeat_macro()\n",
 "    lowercase()               repeat_dialog()\n",
-"    fill_paragraph()          \n",
+"    fill_paragraph()\n",
 "    control_code_dialog()     Windows Menu\n",
 "                              -------------------------\n",
 "                              split_pane()\n",
@@ -2894,7 +2928,7 @@
 "are changed to lower case, and spaces are replaced with underscores.  To ",
 "present a dialog to ask the user for input, use the actions with the ",
 "`_dialog` suffix. Actions without the `_dialog` suffix take the information ",
-"from the routine's arguments (see below).  ",
+"from the routine's arguments (see below). ",
 "\n\n",
 "\01RMenu Action Routine Arguments\01I",
 "\n\n",
@@ -2909,17 +2943,17 @@
 "\01I\n",
 "\01A    \01Bfilter_selection\01A( shell-command )\n",
 "\01I\n",
-"\01A    \01Bfind\01A( search-string [, \01Csearch-direction\01A] [, \01Csearch-type\01A] \n",
+"\01A    \01Bfind\01A( search-string [, \01Csearch-direction\01A] [, \01Csearch-type\01A]\n",
 "       [, \01Csearch-wrap\01A] )\n",
 "\01I\n",
 "\01A    \01Bfind_again\01A( [\01Csearch-direction\01A] [, \01Csearch-wrap\01A] )\n",
 "\01I\n",
 "\01A    \01Bfind_definition\01A( [tag-name] )\n",
 "\01I\n",
-"\01A    \01Bfind_dialog\01A( [\01Csearch-direction\01A] [, \01Csearch-type\01A] \n",
+"\01A    \01Bfind_dialog\01A( [\01Csearch-direction\01A] [, \01Csearch-type\01A]\n",
 "       [, \01Ckeep-dialog\01A] )\n",
 "\01I\n",
-"\01A    \01Bfind_selection\01A( [\01Csearch-direction\01A] [, \01Csearch-wrap\01A] \n",
+"\01A    \01Bfind_selection\01A( [\01Csearch-direction\01A] [, \01Csearch-wrap\01A]\n",
 "       [, \01Cnon-regex-search-type\01A] )\n",
 "\01I\n",
 "\01A    \01Bgoto_line_number\01A( [\01Cline-number\01A] [, \01Ccolumn-number\01A] )\n",
@@ -2936,7 +2970,7 @@
 "\01I\n",
 "\01A    \01Bopen\01A( \01Cfilename\01A )\n",
 "\01I\n",
-"\01A    \01Breplace\01A( search-string, replace-string, \n",
+"\01A    \01Breplace\01A( search-string, replace-string,\n",
 "       [, \01Csearch-direction\01A] [, \01Csearch-type\01A] [, \01Csearch-wrap\01A] )\n",
 "\01I\n",
 "\01A    \01Breplace_again\01A( [\01Csearch-direction\01A] [, \01Csearch-wrap\01A] )\n",
@@ -2946,7 +2980,7 @@
 "\01A    \01Breplace_dialog\01A( [\01Csearch-direction\01A] [, \01Csearch-type\01A]\n",
 "       [, \01Ckeep-dialog\01A] )\n",
 "\01I\n",
-"\01A    \01Breplace_in_selection\01A( search-string, \n",
+"\01A    \01Breplace_in_selection\01A( search-string,\n",
 "       replace-string [, \01Csearch-type\01A] )\n",
 "\01I\n",
 "\01A    \01Bsave_as\01A( \01Cfilename\01A )\n",
@@ -2960,41 +2994,40 @@
 "\01A    \01CArguments to new()\01A\n",
 "                   \"tab\":      Open a new tab\n",
 "                   \"window\":   Open a new window\n",
-"                   \"prefs\":    Follow the user's tab/window \n",
+"                   \"prefs\":    Follow the user's tab/window\n",
 "                               preference\n",
-"                   \"opposite\": Opposite of user's tab/window \n",
+"                   \"opposite\": Opposite of user's tab/window\n",
 "                               preference\n",
 "                   Default behaviour is \"prefs\".\n",
 "\01I\n",
 "\01A    \01Cfilename\01A       Path names are relative to the directory from\n",
-"                   which NEdit was started. Shell interpreted \n",
+"                   which NEdit was started. Shell interpreted\n",
 "                   wildcards and `~' are not expanded.\n",
 "\01I\n",
 "\01A    \01Ckeep-dialog\01A    Either \"keep\" or \"nokeep\".\n",
 "\01I\n",
-"\01A    \01Cmark-letter\01A    The mark command limits users to single \n",
-"                   letters. Inside of macros, numeric marks are\n",
-"                   allowed, which won't interfere with marks set\n",
-"                   by the user.\n",
+"\01A    \01Cmark-letter\01A   The mark command limits users to single letters. Inside\n",
+"                    of macros, single digits are allowed as marks. These\n",
+"                    won't interfere with marks set by the user.\n",
 "\01I\n",
 "\01A    \01Cmacro-menu-item-name\01A\n",
-"                   Name of the command exactly as specified in \n",
+"                   Name of the command exactly as specified in\n",
 "                   the Macro Menu dialogs.\n",
 "\01I\n",
-"\01A    \01Cnon-regex-search-type\01A \n",
-"                   Either \"literal\", \"case\", \"word\", or \n",
+"\01A    \01Cnon-regex-search-type\01A\n",
+"                   Either \"literal\", \"case\", \"word\", or\n",
 "                   \"caseWord\".\n",
 "\01I\n",
 "\01A    \01Csearch-direction\01A\n",
 "                   Either \"forward\" or \"backward\".\n",
 "\01I\n",
-"\01A    \01Csearch-type\01A    Either \"literal\", \"case\", \"word\", \n",
+"\01A    \01Csearch-type\01A    Either \"literal\", \"case\", \"word\",\n",
 "                   \"caseWord\", \"regex\", or \"regexNoCase\".\n",
 "\01I\n",
 "\01A    \01Csearch-wrap\01A    Either \"wrap\" or \"nowrap\".\n",
 "\01I\n",
 "\01A    \01Cshell-menu-item-name\01A\n",
-"                   Name of the command exactly as specified in \n",
+"                   Name of the command exactly as specified in\n",
 "                   the Shell Menu dialogs.\n",
 "\01I\n",
 "\01RWindow Preferences Actions\01I",
@@ -3004,7 +3037,7 @@
 "\n\n",
 "\01A\01Bset_em_tab_dist( em-tab-distance )\01A\n",
 "\01ISet the emulated tab size. An em-tab-distance value of ",
-"0 or -1 translates to no emulated tabs. Em-tab-distance must ",
+"0 or less translates to no emulated tabs. Em-tab-distance must ",
 "be smaller than 1000. ",
 "\n\n",
 "\01A\01Bset_fonts( font-name, italic-font-name, bold-font-name, bold-italic-font-name )\01A\n",
@@ -3030,8 +3063,8 @@
 "\"\" or unrecognized, it will be set to Plain. ",
 "\n\n",
 "\01A\01Bset_locked( [0 | 1] )\01A\n",
-"\01IThis only affects the locked status of a file, not it's read-only ",
-"status. Permissions are NOT changed. ",
+"\01IThis only affects the locked status of a file, not its read-only ",
+"status. Permissions are \01Knot\01I changed. ",
 "A value of 0 turns it off and a value of 1 turns it on. ",
 "If no parameters are supplied the option is toggled. ",
 "\n\n",
@@ -3066,8 +3099,8 @@
 "be a value greater than 0 and no greater than 20. ",
 "\n\n",
 "\01A\01Bset_use_tabs( [0 | 1] )\01A\n",
-"\01ISet whether tabs are used for the current window. ",
-"A value of 0 turns it off and a value of 1 turns it on. ",
+"\01ISet whether tab characters are used for the current window. A value of 0 ",
+"turns it off (using space characters instead) and a value of 1 turns it on. ",
 "If no parameters are supplied the option is toggled. ",
 "\n\n",
 "\01A\01Bset_wrap_margin( wrap-width )\01A\n",
@@ -3107,7 +3140,7 @@
 "\01A\01Bbeginning_of_file( [\"scrollbar\"] )\01A\n",
 "\01IMoves the cursor to the beginning of the file. ",
 "\n\n",
-"\01A\01Bbeginning_of_line( [\"absolute\"] )\01A \n",
+"\01A\01Bbeginning_of_line( [\"absolute\"] )\01A\n",
 "\01IMoves the cursor to the beginning of the line. If ",
 "\"absolute\" is given, always moves to the absolute beginning of line, ",
 "regardless of the text wrapping mode. ",
@@ -3134,7 +3167,7 @@
 "location, or, if pending-delete is on and a primary selection exists in the ",
 "window, replaces the primary selection.  If the user is dragging a block of ",
 "text (primary selection), completes the drag operation and leaves the text at ",
-"it's current location. ",
+"its current location. ",
 "\n\n",
 "\01A\01Bcut_clipboard()\01A\n",
 "\01IDeletes the text in the primary selection and places it in ",
@@ -3181,7 +3214,7 @@
 "\01A\01Bend_of_file( [\"scrollbar\"] )\01A\n",
 "\01IMoves the cursor to the end of the file. ",
 "\n\n",
-"\01A\01Bend_of_line( [\"absolute\"] )\01A \n",
+"\01A\01Bend_of_line( [\"absolute\"] )\01A\n",
 "\01IMoves the cursor to the end of the line.  If ",
 "\"absolute\" is given, always moves to the absolute end of line, regardless ",
 "of the text wrapping mode. ",
@@ -3266,7 +3299,7 @@
 "location, or, if pending-delete is on and a primary selection exists in the ",
 "window, replaces the primary selection.  If the user is dragging a block of ",
 "text (primary selection), completes the drag operation and deletes the text ",
-"from it's current location. ",
+"from its current location. ",
 "\n\n",
 "\01A\01Bnewline()\01A\n",
 "\01IInserts a newline character.  If Auto Indent is on, lines up the ",
@@ -3548,7 +3581,7 @@
 "are displayed in a dialog.  In Smart mode, if one of the matching tags is in ",
 "the current window, that tag is chosen, without displaying the dialog. ",
 "\n\n",
-"\01A\01BSelect Shell...\01A\n",
+"\01A\01BCommand Shell...\01A\n",
 "\01ISet the shell used to run programs from the shell_command() macro function ",
 "and from the Shell menu. This defaults to the user's login shell. ",
 "\n\n",
@@ -3691,7 +3724,7 @@
 "as choosing a proportional font: column alignment will sometimes look wrong, ",
 "and rectangular operations, wrapping, and filling will behave strangely.  A ",
 "mismatch in height will cause windows to re-size themselves slightly when ",
-"syntax highlighting is turned on or off, and increase the inter- line spacing ",
+"syntax highlighting is turned on or off, and increase the inter-line spacing ",
 "of the text.  Unfortunately, on some systems it is hard to find sets of fonts ",
 "which match exactly in height. ",
 "\n\n",
@@ -3881,11 +3914,11 @@
 "options not settable via the Preferences menu (for preference resource names, ",
 "see your NEdit preference file): ",
 "\n\n",
-"\01A\01Bnedit.tagFile\01A: (not defined) \n",
+"\01A\01Bnedit.tagFile\01A: (not defined)\n",
 "\01I\n",
 "This can be the name of a file, or multiple files separated by a colon (:) ",
 "character, of the type produced by Exuberant Ctags or the Unix ctags ",
-"command, which NEdit will load at startup time (see \01Qctag support\01I ). The tag ",
+"command, which NEdit will load at startup time (see \01Qctags support\01I). The tag ",
 "file provides a database from which NEdit can automatically open files ",
 "containing the definition of a particular subroutine or data type. ",
 "\n\n",
@@ -3899,10 +3932,15 @@
 "\n\n",
 "\01A\01Bnedit.wordDelimiters\01A: .,/\\\\`'!@#%^&*()-=+{}[]\":;<>?\n",
 "\01I\n",
-"The characters, in addition to blanks and tabs, which mark the boundaries ",
-"between words for the move-by-word (Ctrl+Arrow) and select-word (double ",
-"click) commands.  Note that this default value may be overridden by the ",
-"setting in Preferences -> Default Settings -> Language Modes.... ",
+"The set of characters which mark the boundaries between words. In addition ",
+"to these, spaces, tabs, and newlines are always word boundaries. ",
+"\n\n",
+"These boundaries take effect for the move-by-word (Ctrl+Arrow) and ",
+"select-word (double click) commands, and for doing regex searches using the ",
+"\\B, < and > tokens. ",
+"\n\n",
+"Note that this default value may be overridden by the setting in ",
+"Preferences -> Default Settings -> Language Modes.... ",
 "\n\n",
 "\01A\01Bnedit.remapDeleteKey\01A: False\n",
 "\01I\n",
@@ -4179,6 +4217,38 @@
 "Therefore, NEdit's default behaviour is not to request the input focus ",
 "explicitly. ",
 "\n\n",
+"\01A\01Bnedit.forceOSConversion\01A: True\n",
+"\01I\n",
+"By default, NEdit converts texts in DOS or Mac format to an internal ",
+"format using simple newlines as line dividers. This is sometimes not ",
+"wanted by the user and can be prevented by setting this resource to ",
+"False. ",
+"\n\n",
+"Note: Setting this to False would supress newlines in Mac files entirely, ",
+"leaving the control character <cr> where every line feed would be. Mac OS ",
+"X uses Unix files and is not affected. ",
+"\n\n",
+"Note: Setting this to False while the option 'Terminate with Line Break ",
+"on Save' is active could lead to file corruption. ",
+"\n\n",
+"\01A\01Bnedit.truncSubstitution\01A: Fail\n",
+"\01I\n",
+"NEdit has a fixed limit on substitution result string length. This ",
+"resource modifies the behaviour if this limit is exceeded. Possible ",
+"values are \01KSilent\01I (will silently fail the operation), \01KFail\01I (will fail ",
+"the operation and pop up a dialog informing the user), \01KWarn\01I (pops up a ",
+"dialog warning the user, offering to cancel the operation) and \01KIgnore\01I ",
+"(will silently conclude the operation). ",
+"\n\n",
+"\01JWARNING\01I: Setting this to 'Ignore' will destroy data without warning! ",
+"\n\n",
+"\01A\01Bnedit.honorSymlinks\01A: True\n",
+"\01I\n",
+"If set to True, NEdit will open a requested file on disk even if it is a ",
+"symlink pointing to a file already opened in another window. If set to false, ",
+"NEdit will try to detect these cases and just pop up the already opened ",
+"document. ",
+"\n\n",
 "\01A\01Bnc.autoStart\01A: True \n",
 "\01I\n",
 "Whether the nc program should automatically start an NEdit server (without ",
@@ -4201,7 +4271,7 @@
 "Statistics line and incremental search bar.  To get consistent results across ",
 "the entire stats line and the incremental search bar, use '*' rather than '.' ",
 "to separate the resource name.  For example, to set the foreground color of ",
-"both components use:  ",
+"both components use: ",
 "\01A    nedit*statsAreaForm*foreground\n",
 "\01Iinstead of: ",
 "\01A    nedit*statsAreaForm.foreground\n",
@@ -4549,8 +4619,9 @@
 "sufficient. ",
 "\n\n",
 "The type-in macro takes two arguments.  $1 is the insert position, and $2 is ",
-"the character just inserted, and does not return a value.  You can do just ",
-"about anything here, but keep in mind that this macro is executed for every ",
+"the character just typed, and does not return a value.  It also is invoked ",
+"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. ",
 NULL
 };
@@ -4656,12 +4727,17 @@
 "\01IOpen all subsequent files in new tabs. Resets -group option. ",
 "\n\n",
 "\01A\01B-untabbed\01A\n",
-"\01IOpen all subsequent files in new windows. Resets -group option. ",
+"\01IOpen all subsequent files in new windows. Resets -group option. Note ",
+"that this only works on subsequent files in this command and does not put ",
+"NEdit in tab-less mode; for that you can use the command ",
+"\01A    nedit -xrm \"nedit.openInTab: False\" -xrm \"nedit.tabBarHideOne: True\"\n",
+"\01IThis will affect your default settings for the session, and will be saved ",
+"if Preferences->Save Defaults... is used, which may not be desired. ",
 "\n\n",
 "\01A\01B-group\01A\n",
 "\01IOpen all subsequent files as tabs in a new window. ",
 "\n\n",
-"\01A\01B-xrm resourcestring\01A \n",
+"\01A\01B-xrm resourcestring\01A\n",
 "\01ISet the value of an X resource to override a default ",
 "value (see \"\01QCustomizing NEdit\01I\"). ",
 "\n\n",
@@ -4706,7 +4782,7 @@
 "\01A\01B/line=n\01A\n",
 "\01IGo to line #n ",
 "\n\n",
-"\01A\01B/server\01A \n",
+"\01A\01B/server\01A\n",
 "\01IDesignate this session as an NEdit server for processing commands from the nc ",
 "program. The nc program can be used to interface NEdit to code development ",
 "environments, mailers, etc., or just as a quick way to open files from the ",
@@ -4804,7 +4880,7 @@
 "is equivalent to: ",
 "\n\n",
 "\01A    nedit /rows=20/wrap file1.c, file2.c\",\n",
-#endif /* VMS */    
+#endif /* VMS */
 NULL
 };
 
@@ -4858,9 +4934,8 @@
 "If you use this command without a filename, nc would randomly choose one ",
 "window to focus and execute the macro in. ",
 "\n\n",
-"\01A\01B-ask\01A, \01B-noask\01A\n",
-"\01IInstructs nc to automatically start a server if one is not available.  This ",
-"overrides the X resource `nc.autoStart' (see \01QX Resources\01I). ",
+"\01A\01B-lm\01A languagemode\n",
+"\01IInitial language mode used. ",
 "\n\n",
 "\01A\01B-svrname\01A name\n",
 "\01IExplicitly instructs nc which server to connect to, an instance of ",
@@ -4873,18 +4948,9 @@
 "via the X resource `nc.serverCommand' (see \01QX Resources\01I). Defaults to ",
 "\"nedit -server\". ",
 "\n\n",
-"\01A\01B-lm\01A languagemode\n",
-"\01IInitial language mode used. ",
-"\n\n",
-"\01A\01B-geometry\01A geometry, \01B-g\01A geometry\n",
-"\01IThe initial size and/or location of editor windows. See ",
-"\01QNEdit Command Line\01I for details. ",
-"\n\n",
-"\01A\01B-icon\01A, \01B-iconic\01A\n",
-"\01IInitial window state. ",
-"\n\n",
-"\01A\01B-display\01A [<host>]:<server>[.<screen>]\n",
-"\01IThe name of the X server to use. See \01QNEdit Command Line\01I for details. ",
+"\01A\01B-ask\01A, \01B-noask\01A\n",
+"\01IInstructs nc to automatically start a server if one is not available.  This ",
+"overrides the X resource `nc.autoStart' (see \01QX Resources\01I). ",
 "\n\n",
 "\01A\01B-timeout\01A seconds\n",
 "\01IBasic time-out period used in communication with an NEdit server.  The ",
@@ -4893,6 +4959,13 @@
 "Under rare conditions (such as a slow connection), it may be necessary to ",
 "increase the time-out period. In most cases, the default is fine. ",
 "\n\n",
+"\01A\01B-geometry\01A geometry, \01B-g\01A geometry\n",
+"\01IThe initial size and/or location of editor windows. See ",
+"\01QNEdit Command Line\01I for details. ",
+"\n\n",
+"\01A\01B-icon\01A, \01B-iconic\01A\n",
+"\01IInitial window state. ",
+"\n\n",
 "\01A\01B-tabbed\01A\n",
 "\01IOpen all subsequent files in new tabs. Resets -group option. ",
 "\n\n",
@@ -4915,6 +4988,16 @@
 "Note that nc will wait for all files given in the command line, even if ",
 "the files were already opened. ",
 "\n\n",
+"\01A\01B-version\01A, \01B-V\01A\n",
+"\01IPrints nc's version and build information. ",
+"\n\n",
+"\01A\01B-xrm\01A resourcestring\n",
+"\01IContains the resourcestring passed to a newly started server. This option ",
+"has no effect if the server is already started. ",
+"\n\n",
+"\01A\01B-display\01A [<host>]:<server>[.<screen>]\n",
+"\01IThe name of the X server to use. See \01QNEdit Command Line\01I for details. ",
+"\n\n",
 "\01SCommand Line Arguments\01I",
 "\n\n",
 "In typical Unix style, arguments affect the files which follow them on the ",
@@ -4986,11 +5069,12 @@
 static char * htxt_version [] = {
 "\01A%s\n",
 "\01I\n",
-"NEdit was written by Mark Edel, Joy Kyriakopulos, Christopher Conrad, ",
-"Jim Clark, Arnulfo Zepeda-Navratil, Suresh Ravoor, Tony Balinski, Max ",
-"Vohlken, Yunliang Yu, Donna Reid, Arne Førlie, Eddy De Greef, Steve ",
-"LoBasso, Alexander Mai, Scott Tringali, Thorsten Haude, Steve Haehn, ",
-"Andrew Hood, Nathaniel Gray, and TK Soh. ",
+"Active developers: Tony Balinski, Arne Førlie, Nathaniel Gray, Eddy De ",
+"Greef, Thorsten Haude, Andrew Hood, Scott Tringali, and TK Soh. ",
+"\n\n",
+"Retired developers: Mark Edel, Joy Kyriakopulos, Christopher Conrad, Jim ",
+"Clark, Arnulfo Zepeda-Navratil, Suresh Ravoor, Max Vohlken, Yunliang Yu, ",
+"Donna Reid, Steve Haehn, Steve LoBasso, and Alexander Mai. ",
 "\n\n",
 "The regular expression matching routines used in NEdit are adapted (with ",
 "permission) from original code written by Henry Spencer at the ",
@@ -5318,7 +5402,7 @@
 "\n\n",
 "\01A    develop@nedit.org\n",
 "\01I\n",
-"Communication among and with NEdit developers.  ",
+"Communication among and with NEdit developers. ",
 "Developers should also subscribe to the discuss list. ",
 "\n\n",
 "To subscribe, send mail to one of the following addresses: ",
@@ -5345,7 +5429,7 @@
 "\01JP: No files are shown in the \"Files\" list in the Open... dialog.\01I ",
 "\n\n",
 "S: When you use the \"Filter\" field, include the file specification or a ",
-"complete directory specification, including the trailing \"/\" on Unix.  ",
+"complete directory specification, including the trailing \"/\" on Unix. ",
 "(See Help in the Open... dialog). ",
 "\n\n",
 "\01JP: Find Again and Replace Again don't continue in the same direction as the original Find or Replace.\01I ",
@@ -5516,19 +5600,19 @@
 "\n\n",
 "The following sequences are interpreted in the format string: ",
 "\n\n",
-"\01A   %c    ClearCase view tag (only relevant when NEdit is \n",
+"\01A   %c    ClearCase view tag (only relevant when NEdit is\n",
 "         used together with ClearCase)\n",
-"   %[n]d directory, with one optional numeric digit n \n",
-"         specifying the maximum number of trailing directory \n",
-"         components to display. Skipped components are \n",
+"   %[n]d directory, with one optional numeric digit n\n",
+"         specifying the maximum number of trailing directory\n",
+"         components to display. Skipped components are\n",
 "         replaced by an ellipsis (...).\n",
 "   %f    file name, without the path name\n",
 "   %h    host name\n",
 "   %s    NEdit server name (server mode only)\n",
 "   %[*]S file status, either verbose (%S) or brief (%*S).\n",
-"         In verbose mode the file status is spelled out: \n",
-"         read-only, locked, and modified. In brief mode, \n",
-"         abbreviations and an asterisk are used for the \n",
+"         In verbose mode the file status is spelled out:\n",
+"         read-only, locked, and modified. In brief mode,\n",
+"         abbreviations and an asterisk are used for the\n",
 "         respective states: RO, LO, *.\n",
 "   %u    user name\n",
 "\01I\n",
@@ -5541,18 +5625,12 @@
 "The resulting title will only contain elements with ",
 "a value. Hence, the title is compressed as follows: ",
 "\n\n",
-"\01A   * Elements with no value are removed.		\n",
-"\01I\n",
-"\01A   * Empty parenthesis pairs i.e. (), [] or {}, or parenthesis\n",
-"     pairs containing only space(s), are removed.\n",
-"\01I\n",
-"\01A   * Sequences of spaces are replaced with one space.\n",
-"\01I\n",
-"\01A   * Leading spaces and dashes are removed.  	\n",
-"\01I\n",
-"\01A   * Trailing spaces and dashes are removed. 	\n",
-"\01I\n",
-"If the server name and the ClearCase view tag are identical, only ",
+"\01A   * Elements with no value are removed.\n",
+"   * Empty parenthesis pairs i.e. (), [] or {}, or parenthesis pairs containing only space(s), are removed.\n",
+"   * Sequences of spaces are replaced with one space.\n",
+"   * Leading spaces and dashes are removed.\n",
+"   * Trailing spaces and dashes are removed.\n",
+"\01IIf the server name and the ClearCase view tag are identical, only ",
 "the first one specified in the format string will be displayed. ",
 "\n\n",
 "\01JPreviewing the settings\01I ",
@@ -5563,7 +5641,6 @@
 "\n\n",
 "For instance, components that are not always active (such the ",
 "NEdit server name) can be turned on or off in the preview. ",
-"\n\n",
 NULL
 };
 
@@ -5666,9 +5743,9 @@
 
 Href H_R [] =
 {
-    {&H_R[1],    54, HELP_TAGS,        "ctag support"},
-    {&H_R[2],  5794, HELP_BASICSYNTAX, "Alternation"},
-    {NULL,    14799, HELP_PREFERENCES, "Autoload Files"}
+    {&H_R[ 1],    54, HELP_TAGS,          "ctags support"},
+    {&H_R[ 2],  5902, HELP_BASICSYNTAX,   "Alternation"},
+    {NULL,     14799, HELP_PREFERENCES,   "Autoload Files"}
 };
 
-static const char * NEditVersion = "NEdit release of Aug 20, 2004\n";
+static const char * NEditVersion = "NEdit release of Jan 14, 2010\n";
--- nedit-5.6~cvs20100114.orig/source/help_topic.h
+++ nedit-5.6~cvs20100114/source/help_topic.h
@@ -2,10 +2,10 @@
 *                                                                              *
 * help_topic.h --  Nirvana Editor help display                                 *
 *                                                                              *
-                 Generated on Apr 10, 2006 (Do NOT edit!)
+                 Generated on Jan 14, 2010 (Do NOT edit!)
                  Source of content from file help.etx
 *                                                                              *
-* Copyright (c) 1999-2006 Mark Edel                                            *
+* Copyright (c) 1999-2010 Mark Edel                                            *
 *                                                                              *
 * This 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    *
--- nedit-5.6~cvs20100114.orig/debian/changelog
+++ nedit-5.6~cvs20100114/debian/changelog
@@ -0,0 +1,328 @@
+nedit (1:5.6~cvs20100114-rknize1) karmic; urgency=low
+
+  * New upstream release
+  * Fix library dependencies
+
+ -- Russ W. Knize <russ.w.knize@gmail.com>  Thu, 14 Jan 2010 20:05:20 -0600
+
+nedit (1:5.5+cvs20080516-1) intrepid; urgency=low
+
+  * New upstream release
+  * Add wrapper scripts
+  * Add OpenDesktop menu and MIME integration
+
+ -- Russ W. Knize <rknize@yahoo.com>  Wed, 21 May 2008 14:48:38 -0500
+
+nedit (1:5.5-2ubuntu3) feisty; urgency=low
+
+  * Added build-dep libxext-dev to fix FTBFS.  Again.
+
+ -- Sarah Hobbs <hobbsee@ubuntu.com>  Mon,  2 Apr 2007 01:18:48 +1000
+
+nedit (1:5.5-2ubuntu2) feisty; urgency=low
+
+  [ ville palo ]
+  * Fixed broken build by adding build-dependency x11proto-print-dev and
+    libxp-dev, closes malone #81103
+
+  [ Sarah Hobbs ]
+  * Updated maintainer details, according to spec.
+
+ -- Sarah Hobbs <hobbsee@ubuntu.com>  Sun,  1 Apr 2007 20:16:44 +1000
+
+nedit (1:5.5-2ubuntu1) edgy; urgency=low
+
+  * Merge from debian unstable.
+  * debian/control: Replaced lesstif2 with libmotif-dev, because with ubuntus
+    new lesstif2 version nedit doesn't work
+
+ -- Stephan Hermann <sh@sourcecode.de>  Wed,  5 Jul 2006 18:02:05 +0200
+
+nedit (1:5.5-2) unstable; urgency=low
+
+  * add Nedit icon to menu entry (in debian/menu and debian/rules)
+  * acknowledge the changes from the non maintainer upload 
+    (Closes: #349124)
+  * correct FSF adress in debian/copyright file
+  * Standards-Version bumped to 3.6.2.2 -- no changes.
+  * remove libxmu-dev from build-depends (useless)
+  * remove -DBUILD_UNTESTED_NEDIT from Makefile.linux and remove test 
+    on BUILD_UNTESTED_NEDIT flag in util/misc.c 
+    Indeed, the use of a specific version has no sense for a shared
+    library. (Closes: #343703)
+  * apply patch Xorg-32.diff from Nedit upstream to util/misc.c to correct
+    an issue with Xorg (Closes: #330048, #318261)  
+
+ -- Alexandre Pineau <alexandre.pineau@free.fr>  Mon,  6 Feb 2006 23:34:45 +0100
+
+nedit (1:5.5-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Replace build-dependency on xlibs-dev with an explicit build-dependency
+    on each required package. (Closes: #346890)
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Sat, 21 Jan 2006 03:07:31 +0100
+
+nedit (1:5.5-1ubuntu1) breezy; urgency=low
+
+  * debian/control: added libxp-dev to build properly
+
+ -- Stephan Hermann <sh@sourcecode.de>  Sat,  8 Oct 2005 20:48:52 +0200
+
+nedit (1:5.5-1) unstable; urgency=low
+
+  * New upstream release (Closes: #283086)
+  * clean links from Xlt and Microline/XmL directories
+  * apply patch from yooden to correct the "cursor blinks while typing" bug
+    (Closes: #60672)
+  * use the noopt flag and O2 optimization (Closes: #240408)
+
+ -- Alexandre Pineau <alexandre.pineau@free.fr>  Thu, 31 Mar 2005 19:06:49 +0200
+
+nedit (1:5.4-1) unstable; urgency=low
+
+  * New Maintainer: Alexandre Pineau (Closes: #229919)
+  * New co-maintainer: Thosten Haude
+  * New upstream release :
+    + Replaces csh-specific scriptlet with awklet.
+    + Workaround for KDE's FONTLIST bug (and for the various BACKGROUND and 
+      FOREGROUND resource values).(Closes: #184553)
+  * sh is now the default shell for NEdit (Closes: #178686) 
+  * Use lesstif2 (Motif 2.1 compatible) for building the package and update the
+    Build-depends (Closes: #162209, #174065)
+  * remove manual confirmation to continue the building of NEdit if a an 
+    untested version of Lesstif is used.
+  * add HTML documentation to doc-base
+  * call the clean rule instead of cleaning the sources tree 'by hand'
+  * clean links from util and source directories
+  * link NEdit dynamically to lesstif (Closes: #195321)
+  * mfile menu.c, line 4343 : remove {} from badFilenameChars to correct the
+    neditdb corruption issue with Tom Lord's Arch revisions control system
+    (Closes: #213564)
+  * use quoted string in the file menu and the title of the menu entry is now
+    properly capitalized.
+  * Standards-Version bumped to 3.6.1.0 -- no changes.
+
+ -- Alexandre Pineau <alexandre.pineau@free.fr>  Sun, 22 Feb 2004 17:27:34 +0100
+
+nedit (1:5.3-2) unstable; urgency=low
+
+  * Package orphaned, maintainer now the QA-group.
+  * Approve previous NMU. Closes: #156322, #117770.
+  * Fix prerm. Closes: #213325, #214808.
+
+ -- Andreas Barth <aba@not.so.argh.org>  Wed, 28 Jan 2004 19:19:08 +0000
+
+nedit (1:5.3-1) unstable; urgency=low
+
+  * New Maintainer: Martin Loschwitz (blessed by Erik Anderson)
+    - thanks goes to Erik Anderson for his work
+  * New Upstream version (from Nedit website, version 5.3) (Closes: #159477, #157254)
+  * debian/rules: Switched from debmake to debhelper (Closes: #170355)
+  * debian/postinst: Fix manpage path (Closes: #171601)
+  
+ -- Martin Loschwitz <madkiss@madkiss.org>  Mon, 23 Dec 2002 17:00:00 +0100
+
+nedit (1:5.2-1.2) unstable; urgency=low
+
+  * NMU to fix bug 156322 as part of the 2nd Sarge BSP.
+  * debian/postinst:
+    - Changed symlink name from /usr/man/man1/editor.1.gz to
+      /usr/share/man/man1/editor.1.gz, as per patch supplied to bug 156322.
+
+
+ -- Matthew Palmer <mpalmer@debian.org>  Sat, 23 Nov 2002 14:12:41 +1100
+
+nedit (1:5.2-1.1) unstable; urgency=low
+
+  * NMU to fix build-failures
+  * debian/control:
+    - add debmake to Build-Depends
+    - also corrected existing errors in Build-Depends usage
+    - bumped Standards-Version
+
+ -- Branden Robinson <branden@debian.org>  Tue,  6 Nov 2001 13:33:53 -0500
+
+nedit (1:5.2-1) unstable; urgency=low
+
+  * New upstream version -- NEdit 5.2
+
+ -- Erik Andersen <andersee@debian.org>  Mon, 29 Oct 2001 22:12:29 -0700
+
+nedit (1:5.1.1-5) unstable; urgency=low
+
+  * Fix a missing include file (closes: #93027, #86181)
+
+ -- Erik Andersen <andersee@debian.org>  Thu,  5 Apr 2001 12:33:59 -0600
+
+nedit (1:5.1.1-4) unstable; urgency=low
+
+  * Fix a build depends problem for unstable (closes: #92672)
+
+ -- Erik Andersen <andersee@debian.org>  Tue,  3 Apr 2001 01:14:45 -0600
+
+nedit (1:5.1.1-3) stable unstable; urgency=low
+
+  * Upload for potato/stable so nedit can finally get out of
+    non-free for potato.  It is about time.
+
+ -- Erik Andersen <andersee@debian.org>  Mon, 12 Mar 2001 21:40:06 -0700
+
+nedit (1:5.1.1-2) unstable; urgency=low
+
+  * Fix the Build-depends (closes: #66280, #84571)
+  * Added Suggests: cvs (closes: #70726)
+
+ -- Erik Andersen <andersee@debian.org>  Tue, 13 Feb 2001 00:17:50 -0700
+
+nedit (1:5.1.1-1) unstable; urgency=low
+
+  * New upstream release -- Now available under the GPL!!!
+    (closes: #45335, #51980, #55889, #58763)
+  * Added Build-Depends (closes: #59498)
+  * Resubmitting nedit 5.1.1 for woody, since it seems to have
+    gotten lost last time I submitted it...
+
+ -- Erik Andersen <andersee@debian.org>  Sun, 18 Jun 2000 18:35:32 -0400
+
+nedit (5.02-6) unstable; urgency=low
+
+  * Recompile against lesstif 0.89 and compile with -DUSE_XMIM.
+    From the Lesstif 0.88.9 Release notes:
+
+      Fixed the problem with nedit and accelerators. nedit installs and
+      removes accelerators _alot_. The mask were were using to install and
+      remove event handlers did not match, therefore the handler was not
+      removed, but all the data the handler used was freed. Needless to say
+      strange things happened after this.
+
+    Looks like the nedit bugs are _finally_ fixed (thanks to Bjoern Brill
+    for letting me know).
+
+
+ -- Erik Andersen <andersee@debian.org>  Sun, 12 Sep 1999 22:33:54 -0600
+
+nedit (5.02-4) unstable frozen; urgency=low
+
+  * Make nedit comply with the keyboard policy by changing the default to
+     stop trying to remap the delete key.  Fixes Bug#29472
+
+  * I checked all the other nedit bugs in the bug tracking system, and they 
+     seem to have been lesstif bugs, or I already fixed them and forgot to 
+     close them, so this release lets me close out all the pending bugs.  
+     Fixes Bug#15616, Bug#18867, Bug#20106, Bug #20477, Bug#20709,
+     Bug#23976, Bug#24257, and Bug #14512
+
+ -- Erik Andersen <andersee@debian.org>  Tue, 17 Nov 1998 21:26:30 -0700
+
+nedit (5.02-3) unstable frozen; urgency=low
+
+  * Recomplile to get nedit to depend on lesstifg-0.83-5 (which is the
+     latest and greatest) instead of the earlier lesstifg-19980310).
+
+ -- Erik Andersen <andersee@debian.org>  Sun,  5 Apr 1998 11:32:48 -0600
+
+nedit (5.02-2) unstable frozen; urgency=low
+
+  * Fixed location of man pages
+
+ -- Erik Andersen <andersee@debian.org>  Wed,  1 Apr 1998 22:56:44 -0700
+
+nedit (5.02-1) unstable frozen; urgency=low
+
+  * Fixed minor packaging issues so lintian would shut-up.
+  * This is an upstream bug-fix release.  Bug fixes include:
+
+	 - -import did not work as advertised in 5.0.1. When used, it 
+	   re-set a number of preferences back to default values. Could 
+	   also potentially cause a crash.
+	 - Macro -> Repeat crashes on some systems.
+	 - Mouse state can get "stuck" on Alpha-based systems.
+	 - Combination of auto-wrap, auto-indent, and unbreakable lines 
+	   extending the width of the window, caused nedit to unnecessarily 
+	   insert blank lines.
+	 - Incorrect case-insensitive comparison in character sets > 128 
+	   bits.
+	 - in by-word drag-selection (double click then drag) when begun 
+	   in the middle of a whitespace selection, anchor would revert 
+	   to original cursor position rather than maintaining the entire 
+	   whitespace block.
+	 - Language mode names containing spaces could not be used in 
+	   language sensitive user-defined menu items.
+	 - New windows did not always see existing learn/replay sequence, 
+	   recorded before the window was created.
+	 - Possible crash in search_string and search_window macros, when 
+	   used with long search strings.
+	 - Possible crash in get_selection("any") macro.
+	 - Under Solaris, crashes on window opening, file dialog, and 
+	   language mode selection, when user-defined sub-menus were used.
+	 - Filenames containing spaces could cause the .neditdb file to 
+	   become unreadable.
+	 - Escape key could not be used to cancel file-selection dialogs 
+	   when the file list had keyboard focus (which it almost always does).
+   
+ -- Erik Andersen <andersee@debian.org>  Fri, 20 Mar 1998 23:42:37 -0700
+
+nedit (5.0-3) unstable; urgency=low
+
+  * Minor change to description, to explain that this is linked with
+     lesstif, and that lesstif still has a few problems that may affect
+     stability.
+
+ -- Erik Andersen <andersee@debian.org>  Fri, 17 Dec 1997 12:35:34 -0700
+
+nedit (5.0-2) unstable; urgency=low
+
+  * Fixed a stupid bug where I put things in /usr/bin/X11 instead of 
+     /usr/bin/X11R6, but debian doesn't have this symlink (just me ;-)
+     This fixes bug #15135 and #15425
+  * added in the proper update-alternatives stuff per the new editor policy
+  * renamed "nc" to "nedit-nc" to avoid naming conflict with netcat.
+
+ -- Erik Andersen <andersee@debian.org>  Fri, 28 Nov 1997 02:47:46 -0700
+
+nedit (5.0-1) unstable; urgency=low
+
+  * New upstream source.  Changes include:
+       - Syntax highlighting with patterns for C, C++, Java, Fortran, Pascal,
+         Ada, Perl, Python, Tcl, Awk, Csh, HTML, LaTeX, VHDL, Verilog, etc.
+       - Completed macro extension language (Simple C/awk-like syntax)
+       - Language-sensitive preferences
+       - Continuous wrap and automatic-newline wrapping modes
+       - Configurable right-button pop up menu
+       - Searchable on-line help
+       - Programmable Smart indent.
+       - Word boundary matching (<>) in regular expressions
+       - Bug fixes.
+  * libc6
+  * Converted to use debhelper
+  * Now uses lesstif (no more nedit-dmotif and nedit-smotif).  Lesstif 
+     now seems stable enough for Nedit to work fairly well.  The font selection
+     dialog box still doesn't work, and the right-mouse-button menu seems to
+     lock things up sometimes, but most everything else seems to work!
+
+ -- Erik Andersen <andersee@debian.org>  Sat, 22 Nov 1997 01:01:09 -0700
+
+nedit (4.0.3-1) unstable; urgency=low
+
+  * Changed to new upstream source, fixing a number of minor bugs.
+
+ -- Erik B. Andersen <andersee@debian.org>  Sun, 16 Feb 1997 23:19:04 -0600
+
+nedit (4.0.2-2) unstable; urgency=low
+
+  * Fixed a minor, and fortunatly benign type in rules
+  * Applied several patches from the upstream maintainer to fix some bugs
+        - middle mouse paste now works with no-auto-wrap mode
+        - fixed a crash in Revert to Saved on a newly emptied file
+        - fixed how Redo from newly saved Undo leaves window unmodified
+        - fixed a crash for SGIs (Not too helpful for the rest of us...)
+
+ -- Erik Andersen <andersee@et.byu.edu>  Fri, 25 Oct 1996 22:39:09 -0600
+
+nedit (4.0.2-1) unstable; urgency=low
+
+  * Initial release of NEdit as a Debian package
+
+ -- Erik Andersen <andersee@et.byu.edu>  Thu, 17 Oct 1996 05:09:24 -0600
+
--- nedit-5.6~cvs20100114.orig/debian/control
+++ nedit-5.6~cvs20100114/debian/control
@@ -0,0 +1,32 @@
+Source: nedit
+Section: editors
+Priority: optional
+XSBC-Original-Maintainer: Alexandre Pineau <alexandre.pineau@free.fr>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+Build-Depends: debhelper (>= 5),
+               dpatch,
+               libmotif-dev (>= 2.2.3-4),
+               libx11-dev,
+               libxt-dev,
+               libxp-dev,
+               x11proto-core-dev,
+               bison,
+               perl
+Uploaders: Thorsten Haude <debian@thorstenhau.de>
+Standards-Version: 3.6.2.2
+
+Package: nedit
+Architecture: any
+Depends: ${shlibs:Depends}
+Conflicts: nedit-dmotif, nedit-smotif
+Replaces: nedit-dmotif, nedit-smotif
+Suggests: csh
+Description: A powerful, customizable, Motif based text editor
+ NEdit is a multi-purpose text editor for the X Window System, which 
+ combines a standard, easy to use, graphical user interface with the 
+ thorough functionality and stability required by users who edit text 
+ eight hours a day. It provides intensive support for development in 
+ a wide variety of languages, text processors, and other tools, but 
+ at the same time can be used productively by just about anyone who 
+ needs to edit text.  Users of Macintosh and MS Windows based text 
+ editors will find NEdit a familiar and comfortable environment.
--- nedit-5.6~cvs20100114.orig/debian/copyright
+++ nedit-5.6~cvs20100114/debian/copyright
@@ -0,0 +1,38 @@
+This package was debianized by Erik Andersen andersee@debian.org on
+Thu, 17 Oct 1996 05:09:24 -0600
+
+You can fetch Nedit from Nedit website http://www.nedit.org/
+
+Note that NEdit Version 5.1 was the first release of NEdit under the GNU 
+General Public License, and the first release to be done entirely by 
+volunteer effort. 
+
+Upstream authors:
+NEdit was written by Mark Edel, Joy Kyriakopulos, Christopher Conrad,
+Jim Clark, Arnulfo Zepeda-Navratil, Suresh Ravoor, Tony Balinski, Max
+Vohlken, Yunliang Yu, Donna Reid, Arne Førlie, Eddy De Greef, Steve
+LoBasso, Alexander Mai, Scott Tringali, Thorsten Haude, and Steve Haehn.
+
+For more detailed informations about the authors of Nedit and its
+plugins, please have a look at the ReleaseNotes file, subsection AUTHORS.
+
+Copyright:
+
+    Copyright (C) 1999 Timo Sirainen
+
+    This program 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 2 of the License, or
+    (at your option) any later version.
+
+    This program 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 this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+On Debian systems, the complete text of the GNU General Public License 
+can be found in /usr/share/common-licenses/GPL
--- nedit-5.6~cvs20100114.orig/debian/docs
+++ nedit-5.6~cvs20100114/debian/docs
@@ -0,0 +1,5 @@
+README 
+ReleaseNotes 
+doc/README.FAQ 
+doc/nedit.doc 
+doc/faq.txt
--- nedit-5.6~cvs20100114.orig/debian/menu
+++ nedit-5.6~cvs20100114/debian/menu
@@ -0,0 +1,3 @@
+?package(nedit): needs="X11" section="Apps/Editors" command="nedit" \
+  title="NEdit" longtitle="Flexible editor for X11" \
+  icon="/usr/share/pixmaps/Nedit.xpm"
--- nedit-5.6~cvs20100114.orig/debian/nedit.desktop
+++ nedit-5.6~cvs20100114/debian/nedit.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=NEdit Text Editor
+Comment=Nirvana Text Editor
+Exec=/usr/bin/nedit-wrapper ne %F
+Terminal=false
+Type=Application
+StartupNotify=false
+MimeType=text/plain;
+Icon=Nedit
+Categories=Utility;TextEditor;
--- nedit-5.6~cvs20100114.orig/debian/nedit.doc-base
+++ nedit-5.6~cvs20100114/debian/nedit.doc-base
@@ -0,0 +1,9 @@
+Document: NEdit
+Title: NEdit User's Manual
+Author: The NEdit developers
+Abstract: This document describes the use of NEdit.
+Section: Apps/Editors
+
+Format: HTML
+Index: /usr/share/doc/nedit/html/nedit.html
+Files: /usr/share/doc/nedit/html/*.html
--- nedit-5.6~cvs20100114.orig/debian/nedit-wrapper
+++ nedit-5.6~cvs20100114/debian/nedit-wrapper
@@ -0,0 +1,52 @@
+#!/bin/sh
+
+if [ -z "$1" ] ; then
+  echo "usage: $0 script-context [arguments]"
+  exit 1
+fi
+
+[ "$NEDIT" ] || NEDIT="/usr/bin/nedit"
+[ "$NEDITCLIENT" ] || NEDITCLIENT="/usr/bin/nc"
+[ "$NEDITENV" ] || NEDITENV="XLIB_SKIP_ARGB_VISUALS=1 LD_PRELOAD=/lib/libBrokenLocale.so.1"
+
+SCRIPT="$1"
+shift
+
+case "$SCRIPT" in
+  ne)
+    ERRORS=`/usr/bin/env $NEDITENV $NEDIT "$@" 2>&1`
+    ;;
+
+  nec)
+    if [ -z "$1" ] ; then
+      echo "usage: $SCRIPT servername [nedit options] files..."
+      exit 1
+    fi
+
+    ERRORS=`/usr/bin/env $NEDITENV $NEDITCLIENT -svrname "$@" &>1`
+    ;;
+
+  nes)
+    if [ -z "$1" ] ; then
+      echo "usage: $SCRIPT servername [nedit options]"
+      exit 1
+    fi
+
+    ERRORS=`/usr/bin/env $NEDITENV $NEDIT -server -svrname "$@" &>1`
+    ;;
+
+  *)
+    echo "usage: {ne|nec|nes} [arguments]"
+    exit 1
+    ;;
+esac
+
+# Suppress console output unless there was an error
+if [ "$?" ] ; then
+  # Somehow echo doesn't render newlines well, so do it the hard way.
+  IFS="\
+"
+  for ERROR in $ERRORS ; do
+    echo $ERROR
+  done
+fi
--- nedit-5.6~cvs20100114.orig/debian/nedit-wrapper-bg
+++ nedit-5.6~cvs20100114/debian/nedit-wrapper-bg
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+SCRIPT=`basename "$0"`
+
+nedit-wrapper $SCRIPT "$@" &
--- nedit-5.6~cvs20100114.orig/debian/Nedit.xpm
+++ nedit-5.6~cvs20100114/debian/Nedit.xpm
@@ -0,0 +1,184 @@
+/* XPM */
+static char *Nedit[] = {
+/* columns rows colors chars-per-pixel */
+"26 32 146 2",
+"   c #6B697F",
+".  c #66618A",
+"X  c #6E688A",
+"o  c #676094",
+"O  c #6B6493",
+"+  c #69669D",
+"@  c #6E6994",
+"#  c #6D699A",
+"$  c #726F85",
+"%  c #706D8C",
+"&  c #716C94",
+"*  c #736D9C",
+"=  c #737081",
+"-  c #75728F",
+";  c #787683",
+":  c #7B7A8C",
+">  c #757294",
+",  c #74719B",
+"<  c #797495",
+"1  c #7A749C",
+"2  c #7C7A94",
+"3  c #7C799B",
+"4  c #6D67A3",
+"5  c #6E6BA4",
+"6  c #6D68A8",
+"7  c #726CA4",
+"8  c #726DAA",
+"9  c #746FB1",
+"0  c #7472A2",
+"q  c #7571AA",
+"w  c #7A74A5",
+"e  c #7871AB",
+"r  c #7C78A3",
+"t  c #7D78AB",
+"y  c #7570B1",
+"u  c #7B76B0",
+"i  c #7F7CB1",
+"p  c #817D9A",
+"a  c #827DA3",
+"s  c #807AAA",
+"d  c #827AB3",
+"f  c #878593",
+"g  c #85809E",
+"h  c #8A8896",
+"j  c #8B899C",
+"k  c #8582A4",
+"l  c #8984A5",
+"z  c #8A86A9",
+"x  c #8C88A3",
+"c  c #8584B0",
+"v  c #8882B2",
+"b  c #928DA3",
+"n  c #928DAD",
+"m  c #938EB6",
+"M  c #9793AE",
+"N  c #9997A4",
+"B  c #9592B4",
+"V  c #9995B4",
+"C  c #9B96BE",
+"Z  c #9E9BB8",
+"A  c #A09DAC",
+"S  c #A29DB3",
+"D  c #A29DBC",
+"F  c #A7A7A9",
+"G  c #A6A4B7",
+"H  c #A5A1BA",
+"J  c #AAA7BC",
+"K  c #AEADB1",
+"L  c #ADABBC",
+"P  c #B0B0B2",
+"I  c #B3B3BC",
+"U  c #B9B6BD",
+"Y  c #BBBBBD",
+"T  c #9A92C3",
+"R  c #A6A1C3",
+"E  c #A6A1C9",
+"W  c #A8A4C4",
+"Q  c #ADAAC2",
+"!  c #AFACCB",
+"~  c #A8A1D5",
+"^  c #ADABD0",
+"/  c #B2AFC4",
+"(  c #B1ACCC",
+")  c #B1ABD2",
+"_  c #B6AFD9",
+"`  c #B4B1C4",
+"'  c #B8B5C6",
+"]  c #B8B6CC",
+"[  c #BCBAC3",
+"{  c #BFBDCA",
+"}  c #B9B6D1",
+"|  c #BAB6DB",
+" . c #BFBBD2",
+".. c #BCBADB",
+"X. c #BEB9E2",
+"o. c #C2BECC",
+"O. c #C1BFD0",
+"+. c #C2BEE3",
+"@. c #C3C2C4",
+"#. c #C6C6CA",
+"$. c #C4C2D2",
+"%. c #C4C1DA",
+"&. c #CAC6D5",
+"*. c #CAC6DC",
+"=. c #CCCADB",
+"-. c #D2D2D4",
+";. c #D3D2DB",
+":. c #DBDBDD",
+">. c #C5C1E6",
+",. c #C9C5E3",
+"<. c #CDCAE2",
+"1. c #CCC9E8",
+"2. c #C7C0F6",
+"3. c #CFCBF0",
+"4. c #D1CDEB",
+"5. c #D4CDFF",
+"6. c #D3D1E4",
+"7. c #D4D2E9",
+"8. c #D8D5EA",
+"9. c #DDDBE6",
+"0. c #DEDBEE",
+"q. c #D5D1F2",
+"w. c #D8D4FC",
+"e. c #DCD9F1",
+"r. c #E1DFED",
+"t. c #E0DEF3",
+"y. c #E2DDFC",
+"u. c #E3E3E5",
+"i. c #E5E4EA",
+"p. c #EAEAED",
+"a. c #E5E3F3",
+"s. c #E4E2FD",
+"d. c #E8E6F5",
+"f. c #E9E5FD",
+"g. c #EBEAF2",
+"h. c #EEEBFD",
+"j. c #F1EEFF",
+"k. c #F6F6EC",
+"l. c #F6F8EB",
+"z. c #FAFDEA",
+"x. c #F3F4F5",
+"c. c #F4F3FC",
+"v. c #F6F8F7",
+"b. c #F8F6FE",
+"n. c #FCFDF4",
+"m. c #FDFDFD",
+/* pixels */
+"n.n.n.n.m.m.n.n.n.n.m.m.m.b.m.b.d.&.U @.n.n.z.n.n.n.",
+"m.n.v.m.m.m.m.n.n.m.m.m.m.m.b.*.t.b.o.@.n.k.n.l.m.n.",
+"m.m.m.m.b.m.m.m.m.v.i.K I 8.*.4.E ( / j.m.v.m.m.m.m.",
+"m.m.m.m.m.m.m.j.m.i.L m.j.H O.a 1 O z j.b.m.m.m.m.m.",
+"m.m.b.m.m.b.m.m.N [ g.h.8.Z X 1 * s * y.b.b.b.m.m.m.",
+"v.m.m.m.b.m.b.d.Z f ` ` B n > 3 * o p q.c.b.m.m.m.m.",
+"n.n.n.m.m.m.o.; $.c.b.m.m.h.s.| m 1 a } O.j.m.n.m.n.",
+"n.n.m.m.b.#.h = : G 7.c.1.! >.w.h.4.S t.r./ u.m.m.n.",
+"m.m.m.m.r./ a 6.O.- X a , , , , k ..s.Q 8.g.U ;.v.n.",
+"m.b.m.=.O.n a p q.s 1 a r 0 # 0 , > k 3.W f.c.$.#.x.",
+"A o.*.1.a _ 5.5.~ 7 e + 8 q 5 y # r # > ..B s.m.<.=.",
+"b b ( 3 s T +.d e 7 e 4 5 y 9 y q 0 0 q 0 , E m.b.Q ",
+"d.S p < @ 7 8 d 7 u 8 q 8 q 9 6 5 5 u 5 0 t * w.h.] ",
+"b.b.j.D a * O e e 7 + q q 5 8 5 u q 8 5 5 i 0 ^ %.a.",
+"m.m.j.J W a & 1 7 O v # 0 * 0 0 5 5 q 5 q # , 3 ! m.",
+"b.b.r.-.b.t.( a p 3 ..1 1 , , , q q 5 y q 5 3 > &.m.",
+"m.v.#.p.b.b.b.b.t.J j.- < 1 & w q y 8 q 8 e * < *.m.",
+"m.m.U m.m.x.m.m.b.6.r.x < < q.) c . q q 7 7 o p *.b.",
+"c.m.-.Y m.m.v.b.m.b.L Q p j b.b.s.R 0 0 e e t . 7.m.",
+"m.m.m.;.K x.v.m.b.b.9.8.$ p b.b.c.b.! O t 7 * r y.b.",
+"m.m.m.m.i.F p.g.m.m.j.$.G $ %.b.b.b.m.B * w # 3 j.m.",
+"b.c.m.m.m.m.P -.m.c.m.b.d.' j.m.b.a.h.B , * C R b.m.",
+"m.m.m.v.m.m.m.:.K p.c.m.b.b.m.b.6.j > > 1 r h.%.m.m.",
+"m.m.m.m.v.m.m.m.v.@.U u.m.b.m.m.Q 3 > O r > 1.$.m.m.",
+"m.m.m.m.m.m.m.m.v.m.p.[ Y p.m.m.4.< * a @ 1 V <.c.m.",
+"m.m.m.m.m.m.m.m.m.v.m.m.p.Y @.g.j.R a & w s l 1.h.b.",
+"m.m.m.m.m.m.m.m.m.m.m.v.m.m.u.[ I 6.s.T # w s ..j.b.",
+"m.m.m.m.m.m.m.m.m.m.m.m.m.v.n.m.m.b.b.,.O t v X.b.b.",
+"m.m.m.m.m.m.m.m.m.m.m.v.m.m.m.m.n.v.m.m.3 # & R b.b.",
+"m.m.m.m.m.m.m.m.m.m.m.m.m.m.n.n.n.m.m.b.Z 3 3 ..m.m.",
+"m.m.m.m.m.m.m.m.m.m.m.m.m.m.m.m.n.n.x.m.*.  2 a.m.m.",
+"m.m.m.m.m.m.m.m.m.m.m.m.m.m.m.m.n.m.m.m.d.h [ m.m.n."
+};
--- nedit-5.6~cvs20100114.orig/debian/postinst
+++ nedit-5.6~cvs20100114/debian/postinst
@@ -0,0 +1,13 @@
+#!/bin/sh -e
+
+# install alternatives link for nedit
+
+if [ "$1" = "configure" ]; then
+  update-alternatives --install /usr/bin/editor editor \
+  /usr/bin/nedit 40 --slave /usr/share/man/man1/editor.1.gz \
+  editor.1.gz /usr/share/man/man1/nedit.1.gz
+fi
+
+#DEBHELPER#
+
+exit 0
--- nedit-5.6~cvs20100114.orig/debian/prerm
+++ nedit-5.6~cvs20100114/debian/prerm
@@ -0,0 +1,12 @@
+#!/bin/sh -e
+
+# prerm script for nedit
+
+if [ "$1" = "remove" -a "purge" ]; then
+  update-alternatives --remove editor /usr/bin/nedit
+fi
+
+#DEBHELPER#
+
+exit 0
+
--- nedit-5.6~cvs20100114.orig/debian/README.debian
+++ nedit-5.6~cvs20100114/debian/README.debian
@@ -0,0 +1,12 @@
+nedit for Debian
+----------------------
+
+Note that due to a program name conflict with netcat (also named "nc"), NEdit's
+version of "nc" has been renamed to "nedit-nc".  Sorry for any confusion this
+may cause.
+
+The shell sh is used by default. You can switch to csh if necessary.
+
+Erik Andersen <andersee@debian.org>, Mon, 29 Oct 2001 22:12:29 -0700
+Martin Loschwitz <madkiss@madkiss.org>  Tue, 24 Dec 2002 14:35:00 +0100
+Alexandre Pineau <alexandre.pineau@free.fr> Tue, 2 Mar 2004
--- nedit-5.6~cvs20100114.orig/debian/rules
+++ nedit-5.6~cvs20100114/debian/rules
@@ -0,0 +1,88 @@
+#!/usr/bin/make -f
+
+# This is the debhelper compatibility version to use.
+export DH_COMPAT=4
+
+# define installation dir
+export INSTALLDIR=$(shell pwd)/debian/nedit
+
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+CFLAGS = -g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+CFLAGS += -O0
+else
+CFLAGS += -O2
+endif
+
+
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	INSTALL_PROGRAM += -s
+endif
+
+build:
+
+	dh_testdir
+	$(MAKE) CFLAGSD="$(CFLAGS)" linux
+	cd doc ; $(MAKE) all
+	touch build-stamp
+
+clean:
+	
+	dh_testdir
+	dh_testdir
+	rm -f build-stamp
+	
+	dh_clean
+	cd doc ; $(MAKE) clean
+	$(MAKE) clean
+ 
+binary-indep: build
+
+binary-arch: build
+
+	dh_testdir
+	dh_testroot
+
+	install -D source/nedit $(INSTALLDIR)/usr/bin/nedit
+	install -D source/nc $(INSTALLDIR)/usr/bin/nedit-nc
+
+	# install wrapper
+	install -D `pwd`/debian/nedit-wrapper $(INSTALLDIR)/usr/bin/nedit-wrapper
+	install -D `pwd`/debian/nedit-wrapper-bg $(INSTALLDIR)/usr/bin/nedit-wrapper-bg
+	ln -sf nedit-wrapper-bg $(INSTALLDIR)/usr/bin/ne
+	ln -sf nedit-wrapper-bg $(INSTALLDIR)/usr/bin/nec
+	ln -sf nedit-wrapper-bg $(INSTALLDIR)/usr/bin/nes
+
+	# install manpages
+	install -D `pwd`/doc/nedit.man $(INSTALLDIR)/usr/share/man/man1/nedit.1
+	install -D `pwd`/doc/nc.man $(INSTALLDIR)/usr/share/man/man1/nedit-nc.1
+	install -D `pwd`/doc/nedit.html  $(INSTALLDIR)/usr/share/doc/nedit/html/nedit.html 
+	install -D --mode=a-w  `pwd`/debian/Nedit.xpm $(INSTALLDIR)/usr/share/pixmaps/Nedit.xpm
+
+	# install desktop components
+	install -D --mode=a-w `pwd`/debian/Nedit.xpm $(INSTALLDIR)/usr/share/pixmaps/Nedit.xpm
+	install -D --mode=a-w `pwd`/debian/nedit.desktop $(INSTALLDIR)/usr/share/applications/nedit.desktop
+
+	dh_installmenu
+
+	dh_installchangelogs ChangeLog
+	dh_installdocs
+	
+	dh_strip
+	dh_compress
+
+	dh_fixperms
+	dh_installdeb
+
+	dh_shlibdeps
+	dh_gencontrol
+
+	dh_md5sums
+	dh_builddeb
+
+	dh_desktop
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary