core-typeof-syntax: push up

[nedit-bw.git] / enhanced-hooks.2008-01-20.1.diff

 ReleaseNotes                 |   34 +
 doc/help.etx                 |  109 +++++
 source/Makefile.common       |    1 
 source/Makefile.dependencies |    3 
 source/calltips.c            |  334 ++++++++++++----
 source/calltips.h            |   13 
 source/file.c                |  337 ++++++-----------
 source/file.h                |    7 
 source/help.c                |   63 ++-
 source/highlightData.c       |    4 
 source/interpret.c           |   27 +
 source/macro.c               |  271 +++++++++++--
 source/macro.h               |    3 
 source/menu.c                |  254 +++++++++++-
 source/nedit.c               |   16 
 source/nedit.h               |   14 
 source/preferences.c         |  279 ++++++++++++--
 source/preferences.h         |    8 
 source/search.c              |  159 +++++---
 source/search.h              |   10 
 source/selection.c           |   49 +-
 source/server.c              |    9 
 source/shell.c               |    5 
 source/text.c                |   72 ++-
 source/text.h                |   14 
 source/textDisp.c            |  461 ++++++++++++++++++++---
 source/textDisp.h            |   53 +-
 source/textP.h               |    5 
 source/window.c              |  179 +++++++--
 source/window.h              |    6 
 util/fileUtils.c             |    2 
 util/getfiles.c              |  847 ++++++++++++++++++++++++++++++++++++-------
 util/getfiles.h              |   47 ++
 util/prefFile.c              |   31 -
 util/printUtils.c            |    4 
 35 files changed, 2951 insertions(+), 779 deletions(-)

diff --quilt old/ReleaseNotes new/ReleaseNotes
--- old/ReleaseNotes
+++ new/ReleaseNotes
@@ -13,11 +13,43 @@ If you are upgrading NEdit from a versio
 the README file which came with the (source or executable) distribution kit,
 about updating macros and font settings in your .nedit file.
 
 New Features in $NEXT_VERSION
 
-  - The macro variable $VERSION returns NEdit's version number.
+  - Hidden files (dotfiles) can now be excluded from the file and directory
+    lists in the file selection box (SF patch #502840).
+
+  - A 'Smart Case' toggles the regex search caseness depending on the occur-
+    rence of upper case letters in the search expression (SF patch #685618).
+
+  - The help window got some small changes to increase usability.
+
+  - The number of selected characters is displayed in the status bar.
+
+  - The resource nedit.prevOpenFilesMask can be set to a regex to exclude
+    certain files from the Open Previous menu.
+
+  - Changes to the macro language:
+    - The macro variable $NEDIT_HOME returns the name of the directory where
+      NEdit's run control files reside.
+    - The macro variable $VERSION returns NEdit's version number.
+    - The function highlight_calltip_line() can highlight single lines in
+      a macro-created calltip.
+    - The semicolon is now a valid command seperator.
+    - The macro subroutine typeof() returns a string indicating the type of
+      a macro value.
+
+  - If the macro routine file_open_hook() exists, it is called when an existing
+    file is opened.
+
+  - A hairline can be displayed at the wrap column (SF patch #701337).
+
+  - The current line is now optionally displayed with a colored background
+    (SF patch #683567).
+
+  - Documents can now be flagged 'transient'. This disables the warning
+    NEdit usually gives when you try to close a document which is not saved.
 
   - The new macro function filename_dialog() can be used to query a file
     name from the user by using the usual file selection dialog.
 
 
diff --quilt old/doc/help.etx new/doc/help.etx
--- old/doc/help.etx
+++ new/doc/help.etx
@@ -127,10 +127,13 @@ Getting Started
   If you already have an empty (Untitled) window displayed, just begin typing
   in the window.  To create a new Untitled window, choose New Window or New Tab
   from the File menu.   To give the file a name and save its contents to the
   disk, choose Save or Save As... from the File menu.
 
+  In both Open and Save File Dialogs you can choose whether hidden files and
+  directories are shown in the lists. Just check/uncheck the toggle button.
+
 3>Backup Files
 
   NEdit maintains periodic backups of the file you are editing so that you can
   recover the file in the event of a problem such as a system crash, network
   failure, or X server crash.  These files are saved under the name `~filename`
@@ -260,10 +263,15 @@ Finding and Replacing Text
   button with an icon resembling "|<". Clicking on it empties the search text widget
   without disturbing selections.  A middle click on the clear button copies the
   content of any existing selection into the search text widget and triggers a new
   search.
 
+  All searches will default to the search mode selected in the preference menu.
+  (Default Setting -> Searching -> Default Search Style). You can choose a smart
+  case sensitivity here; this let all searches start insensitive, but changes to
+  case sensitive as soon as you enter an upper-case letter.
+
 3>Searching Backwards
 
   Holding down the shift key while choosing any of the search or replace
   commands from the menu (or using the keyboard shortcut), will search in the
   reverse direction.  Users who have set the search direction using the buttons
@@ -1939,13 +1947,13 @@ Macro Language
 
 
 3>Syntax
 
   An NEdit macro language program consists of a list of statements, each
-  terminated by a newline.  Groups of statements which are executed together
-  conditionally, such as the body of a loop, are surrounded by curly braces
-  "{}".
+  terminated by a newline or a semicolon (;).  Groups of statements which
+  are executed together conditionally, such as the body of a loop, are
+  surrounded by curly braces "{}".
 
   Blank lines and comments are also allowed.  Comments begin with a "#" and end
   with a newline, and can appear either on a line by themselves, or at the end
   of a statement line.
 
@@ -2536,10 +2544,16 @@ Macro Subroutines
   yet been saved.
 
 **$VERSION**
   Returns NEdit's version number ('5006' for NEdit 5.6).
 
+**$NEDIT_HOME**
+  Returns the name of the directory where NEdit's run control files reside.
+  This is either the value of the environmental variable $NEDIT_HOME, the
+  default of ~/.nedit or $HOME. (See Preferences_ for details
+  about the algorithm.)
+
 **$n_display_lines**
   The number of lines visible in the currently active pane.
 
 **$n_panes**
   The number of panes in the current window.
@@ -2660,11 +2674,11 @@ Macro Subroutines
 **filename_dialog( [title[, mode[, defaultPath[, filter[, defaultName]]]]] )**
   Presents a file selection dialog with the given title to the user that 
   prompts for a new or existing file.
 
   Options are: ~title~ will be the title of the dialog, defaults to "Choose
-  file". If ~mode~ is set to "exist" (default), the "New File Name"TextField
+  file". If ~mode~ is set to "exist" (default), the "New File Name" TextField
   of the FSB will be unmanaged. If "new", the TextField will be managed.
   ~defaultPath~ is the default path to use. Default (or "") will use the
   active document's directory. ~filter~ is the file glob which determines
   which files to display. Is set to "*" if filter is "" and by default.
   ~defaultName~ is the default filename that is filled in automatically.
@@ -2682,12 +2696,12 @@ Macro Subroutines
   focused window (the first window being the one returned from calling
   focus_window("last"). Returns the name of the newly-focused window, or an
   empty string if the requested window was not found.
 
 **get_character( position )**
-  Returns the single character at the position
-  indicated by the first argument to the routine from the current window.
+  Returns the single character at the position indicated by the first argument
+  to the routine from the current window.
 
 **get_range( start, end )**
   Returns the text between a starting and ending position from the current
   window.
 
@@ -2697,10 +2711,14 @@ Macro Subroutines
   the screen (keyword "any").
 
 **getenv( name )**
   Gets the value of an environment variable.
 
+**highlight_calltip_line(calltip_ID, line)**
+  Highlights a single line in the given calltip. Set line to 0 to remove
+  any existing highlighting.
+
 **kill_calltip( [calltip_ID] )**
   Kills any calltip that is being displayed in the window in which the macro is
   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.
 
@@ -2853,10 +2871,19 @@ Macro Subroutines
   Return an all lower-case version of string.
 
 **toupper( string )**
   Return an all upper-case version of string.
 
+**typeof( value )**
+  Returns a string indicating the type of a macro value. The value can be
+  any NEdit macro language value except for the return value of functions
+  without a return value. Examples:
+  typeof(2)                        # -> "INTEGER"
+  typeof($empty_array)             # -> "ARRAY"
+  typeof(get_range(10, 20))        # -> "STRING"
+  typeof(myArray["doesnotexist"])  # -> "UNDEFINED"
+
 **valid_number( string )**
   Returns 1 if the string can be converted to a number without error
   following the same rules that the implicit conversion would. Otherwise 0.
 
 **write_file( string, filename )**
@@ -3226,11 +3253,11 @@ Action Routines
 3>Menu Action Routine Arguments
 
   Arguments are text strings enclosed in quotes. Below are the menu action
   routines which take arguments.  Optional arguments are enclosed in [].
 
-    **new**( ["tab" | "window" | "prefs" | "opposite"] )
+    **new**( ["tab" | "window" | "prefs" | "opposite"] [, "transient"] )
 
     **close**( ["prompt" | "save" | "nosave"] )
 
     **execute_command**( shell-command )
 
@@ -3293,10 +3320,19 @@ Action Routines
                                preference
                    "opposite": Opposite of user's tab/window
                                preference
                    Default behaviour is "prefs".
 
+                   "transient" [EXPERIMENTAL]: Open the new
+                   document in transient mode. This disables the
+                   warning NEdit usually gives when you try to
+                   close a file which is not saved.
+
+                   WARNING: This is an experimental feature.
+                   Make sure to use this setting only for
+                   documents which can easily be recreated.
+
     ~filename~       Path names are relative to the directory from
                    which NEdit was started. Shell interpreted
                    wildcards and `~' are not expanded.
 
     ~keep-dialog~    Either "keep" or "nokeep".
@@ -3730,10 +3766,35 @@ Action Routines
 
 **self_insert()**
   To be attached to a key-press event, inserts the character
   equivalent of the key pressed.
 
+
+Hooks
+-----
+
+  Hooks are macro routines which are called at specific points in NEdit's
+  execution. You can use hooks to tie in user-defined functionality at these
+  points.
+
+  No hooks are provided. To use a hook, simply define a macro function with
+  the name of the hook. The next time the hook will catch, the macro function
+  is called.
+
+  You don't have to provide any hook. If a certain hook does not exist, it is
+  simply skipped.
+
+**file_open_hook()**
+  Called when an existing file is opened.
+
+..**file_name_hook(filename)**
+..  Called before NEdit opens a file using a certain name. The parameter is
+..  the filename NEdit intends to open.
+..
+..  Return a string to use instead of the original filename. Return 0 to tell
+..  NEdit to use the original filename.
+
    ----------------------------------------------------------------------
 
 Customizing
 ===========
 
@@ -3830,10 +3891,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
   at a specific column.
 
+**Show Wrap Margin**
+  Visually indicate which column is set as the wrap margin by drawing a vertical
+  line. Choose between never, always and when wrap is enabled. "Never" turns
+  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
+  margin if wrapping is turned off.
+
 **Tab Stops**
   Set the tab distance (number of characters between tab stops) for tab
   characters, and control tab emulation and use of tab characters in padding
   and emulated tabs.
 
@@ -3873,10 +3942,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
   from setting the file protection.
 
+**Transient [EXPERIMENTAL]**
+  Flags the document as transient. This disables the warning NEdit usually
+  gives when you try to close a file which is not saved.
+
+  WARNING: This is an experimental feature. Make sure to use this setting
+  only for documents which can easily be recreated.
+
 3>Preferences -> Default Settings Menu
 
   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
@@ -3974,10 +4050,16 @@ Preferences
 
 **Terminate with Line Break on Save**
   Some UNIX tools expect that files end with a line feed. If this option is
   activated, NEdit will append one if required.
 
+**Show Hidden Files**
+  Show hidden files by default in file selection boxes.
+
+**Show Cursorline**
+  Background the current line with a colored bar.
+
 **Sort Open Prev. Menu**
   Option to order the File -> Open Previous menu alphabetically, versus in
   order of last access.
 
 **Popups Under Pointer**
@@ -4310,10 +4392,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
   the NEdit file history file.
 
+**nedit.prevOpenFilesMask**: (not defined)
+
+  Files not to be listed in the Open Previous sub-menu of the File menu.
+  Setting this to a regular expression causes files matching the expression to
+  be omitted from the Open Previous menu item and the .neditdb file.
+
 **nedit.printCommand**: (system specific)
 
   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).
 
@@ -4349,10 +4437,16 @@ X Resources
 **nedit.printDefaultHost**: (system specific)
 
   The node name of the default print host.  Used only to display in the print
   dialog, and has no effect on printing.
 
+**nedit.showScrolltip**: True
+
+  If this resource is set to True, NEdit will show a tooltip displaying the
+  line number if the user grabs and moves the scroll handle. Set to False to
+  switch it off.
+
 **nedit.visualID**: Best
 
   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
@@ -5993,10 +6087,11 @@ Problems/Defects
 .. Menu:   Macro Language                   # macro_lang
 .. Menu:   M_a_cro Subroutines              # macro_subrs
 .. Menu:   Rangesets                        # rangeset
 .. Menu:   Highlighting Information         # hiliteInfo
 .. Menu:   Action Routines                  # actions
+.. Menu:   H_o_oks                          # hooks
 
 .. Menu: Customizing                        # customizing
 .. Menu:   Customizing NEdit                # customize
 .. Menu:   Preferences                      # preferences
 .. Menu:   X Resources                      # resources
diff --quilt old/source/Makefile.common new/source/Makefile.common
--- old/source/Makefile.common
+++ new/source/Makefile.common
@@ -6,10 +6,11 @@
 OBJS = nedit.o file.o menu.o window.o selection.o search.o undo.o shift.o \
        help.o preferences.o tags.o userCmds.o shell.o regularExp.o macro.o \
        text.o textSel.o textDisp.o textBuf.o textDrag.o server.o highlight.o \
        highlightData.o interpret.o parse.o smartIndent.o regexConvert.o \
        rbTree.o windowTitle.o calltips.o server_common.o rangeset.o
+OBJS +=        backup.o
 
 XLTLIB = ../Xlt/libXlt.a
 XMLLIB = ../Microline/XmL/libXmL.a
 
 .c.o:
diff --quilt old/source/Makefile.dependencies new/source/Makefile.dependencies
--- old/source/Makefile.dependencies
+++ new/source/Makefile.dependencies
@@ -1,12 +1,13 @@
 # $Id: Makefile.dependencies,v 1.21 2003/05/02 18:18:41 edg Exp $
+backup.o: backup.c backup.h
 calltips.o: calltips.c text.h textBuf.h textP.h textDisp.h calltips.h \
   nedit.h ../util/misc.h
 file.o: file.c file.h nedit.h textBuf.h text.h window.h preferences.h \
   undo.h menu.h tags.h server.h ../util/misc.h ../util/DialogF.h \
   ../util/fileUtils.h ../util/getfiles.h ../util/printUtils.h \
-  ../util/utils.h
+  ../util/utils.h macro.h
 help.o: help.c help.h help_topic.h textBuf.h text.h textP.h textDisp.h \
   textSel.h nedit.h search.h window.h preferences.h help_data.h file.h \
   highlight.h ../util/misc.h ../util/DialogF.h ../util/system.h
 highlight.o: highlight.c highlight.h nedit.h textBuf.h textDisp.h text.h \
   textP.h regularExp.h highlightData.h preferences.h window.h \
diff --quilt old/source/calltips.c new/source/calltips.c
--- old/source/calltips.c
+++ new/source/calltips.c
@@ -1,15 +1,15 @@
 /*******************************************************************************
 *                                                                             *
 * calltips.c -- Calltip UI functions  (calltip *file* functions are in tags.c) *
 *                                                                             *
-* Copyright (C) 2002 Nathaniel Gray                                           *
+* Copyright (C) 2002, 2004, 2005 The NEdit Developers                          *
 *                                                                             *
 * 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    *
 * Foundation; either version 2 of the License, or (at your option) any later   *
-* version. In addition, you may distribute version of this program linked to   *
+* version. In addition, you may distribute versions of this program linked to  *
 * Motif or Open Motif. See README for details.                                 *
 *                                                                             *
 * This software 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        *
@@ -28,29 +28,35 @@
 
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
 #endif
 
+#include "calltips.h"
+
+#include "regularExp.h"
 #include "text.h"
 #include "textP.h"
-#include "calltips.h"
 #include "../util/misc.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <limits.h>
 
 #include <Xm/Xm.h>
-#include <Xm/Label.h>
 #include <X11/Shell.h>
+#include <Xm/Text.h>
 
 #ifdef HAVE_DEBUG_H
 #include "../debug.h"
 #endif
 
-static char *expandAllTabs( char *text, int tab_width );
+static char* expandAllTabs(const char *text, const int tab_width);
+Boolean getRangeOfLine(const char* textString, const unsigned line,
+        unsigned* begin, unsigned* end);
+Widget createTip(const Widget parent, const Pixel foreground,
+        const Pixel background, const unsigned char alignment);
 
 /*
 ** Pop-down a calltip if one exists, else do nothing
 */
 void KillCalltip(WindowInfo *window, int calltipID) {
@@ -60,31 +66,23 @@ void KillCalltip(WindowInfo *window, int
     
 void TextDKillCalltip(textDisp *textD, int calltipID) {
     if( textD->calltip.ID == 0 ) 
         return;
     if( calltipID == 0 || calltipID == textD->calltip.ID ) {
-        XtPopdown( textD->calltipShell );
+        XtPopdown(XtParent(textD->calltip.widget));
         textD->calltip.ID = 0;
     }
 }
 
 /*
-** Is a calltip displayed?  Returns the calltip ID of the currently displayed 
-** calltip, or 0 if there is no calltip displayed.  If called with 
-** calltipID != 0, returns 0 unless there is a calltip being 
-** displayed with that calltipID.
+**  Returns the calltip ID of the currently displayed calltip, or 0 if
+**  there is no calltip displayed.
 */
-int GetCalltipID(WindowInfo *window, int calltipID) {
+int GetCalltipID(const WindowInfo *window) {
     textDisp *textD = ((TextWidget)window->lastFocus)->text.textD;
-    if( calltipID == 0 )
-        return textD->calltip.ID;
-    else {
-        if( calltipID == textD->calltip.ID)
-            return calltipID;
-        else
-            return 0;
-    }
+
+    return textD->calltip.ID;
 } 
 
 #define CALLTIP_EDGE_GUARD 5
 static Boolean offscreenV(XWindowAttributes *screenAttr, int top, int height) {
     return (top < CALLTIP_EDGE_GUARD || 
@@ -129,12 +127,15 @@ void TextDRedrawCalltip(textDisp *textD,
             return;
         }
         rel_x = textD->calltip.pos;
     }
 
-    XtVaGetValues(textD->calltipShell, XmNwidth, &tipWidth, XmNheight, 
-            &tipHeight, XmNborderWidth, &borderWidth, NULL);
+    XtVaGetValues(XtParent(textD->calltip.widget),
+            XmNwidth, &tipWidth,
+            XmNheight, &tipHeight,
+            XmNborderWidth, &borderWidth,
+            NULL);
     rel_x += borderWidth;
     rel_y += lineHeight/2 + borderWidth;
     
     /* Adjust rel_x for horizontal alignment modes */
     if (textD->calltip.hAlign == TIP_CENTER)
@@ -175,119 +176,110 @@ void TextDRedrawCalltip(textDisp *textD,
                 abs_y = screenAttr.height - tipHeight - CALLTIP_EDGE_GUARD;
             /* If no case applied, just go with the default placement. */
         }
     }
     
-    XtVaSetValues( textD->calltipShell, XmNx, abs_x, XmNy, abs_y, NULL );
+    XtVaSetValues(XtParent(textD->calltip.widget), XmNx, abs_x, XmNy, abs_y, NULL);
 }
 
 /* 
 ** Returns a new string with each \t replaced with tab_width spaces or
 ** a pointer to text if there were no tabs.  Returns NULL on malloc failure.
 ** Note that this is dumb replacement, not smart tab-like behavior!  The goal
 ** is to prevent tabs from turning into squares in calltips, not to get the
 ** formatting just right.
 */
-static char *expandAllTabs( char *text, int tab_width ) {
-    int i, nTabs=0;
+static char* expandAllTabs(const char* text, const int tab_width)
+{
+    int i, nTabs = 0;
     size_t len;
-    char *c, *cCpy, *textCpy;
+    const char* c;
+    char *cCpy, *textCpy;
     
     /* First count 'em */
-    for( c = text; *c; ++c )
-        if( *c == '\t' )
+    for (c = (char*) text; *c; ++c) {
+        if ('\t' == *c)
             ++nTabs;
-    if( nTabs == 0 )
-        return text;
+    }
+    if (0 == nTabs) {
+        return strdup(text);
+    }
 
     /* Allocate the new string */
-    len = strlen( text ) + ( tab_width - 1 )*nTabs;
-    textCpy = (char*)malloc( len + 1 );
-    if( !textCpy ) {
-        fprintf(stderr, 
-                "nedit: Out of heap memory in expandAllTabs!\n");
+    len = strlen(text) + (tab_width - 1) * nTabs;
+    textCpy = (char*) malloc(len + 1);
+    if (!textCpy) {
+        fprintf(stderr, "nedit: Out of heap memory in expandAllTabs!\n");
         return NULL;
     }
     
     /* Now replace 'em */
-    for( c = text, cCpy = textCpy;  *c;  ++c, ++cCpy) {
-        if( *c == '\t' ) {
-            for( i = 0; i < tab_width; ++i, ++cCpy )
+    for (c = text, cCpy = textCpy; *c; ++c, ++cCpy) {
+        if (*c == '\t') {
+            for (i = 0; i < tab_width; ++i, ++cCpy) {
                 *cCpy = ' ';
+            }
             --cCpy;  /* Will be incremented in outer for loop */
-        } else
+        } else {
             *cCpy = *c;
+        }
     }
     *cCpy = '\0';
     return textCpy;
 }
 
 /*
-** Pop-up a calltip.  
-** If a calltip is already being displayed it is destroyed and replaced with
-** the new calltip.  Returns the ID of the calltip or 0 on failure.
+**  Pop-up a calltip.
+**
+**  If a calltip is already being displayed it is destroyed and replaced
+**  with the new calltip.
+**
+**  Returns the ID of the calltip or 0 on failure.
 */
-int ShowCalltip(WindowInfo *window, char *text, Boolean anchored, 
-        int pos, int hAlign, int vAlign, int alignMode) {
-    static int StaticCalltipID = 1;
+int ShowCalltip(const WindowInfo *window, const char *text,
+        const Boolean anchored, const int pos, const int hAlign,
+        const int vAlign, const int alignMode)
+{
+    static unsigned StaticCalltipID = 1;
     textDisp *textD = ((TextWidget)window->lastFocus)->text.textD;
     int rel_x, rel_y;
-    Position txtX, txtY;
-    char *textCpy;
-    XmString str;
+    char* tablessText;
     
     /* Destroy any previous calltip */
-    TextDKillCalltip( textD, 0 );
+    TextDKillCalltip(textD, 0);
 
     /* Make sure the text isn't NULL */
     if (text == NULL) return 0;
     
-    /* Expand any tabs in the calltip and make it an XmString */
-    textCpy = expandAllTabs( text, BufGetTabDistance(textD->buffer) );
-    if( textCpy == NULL )
+    /* Expand any tabs in the calltip */
+    tablessText = expandAllTabs(text, BufGetTabDistance(textD->buffer));
+    if (NULL == tablessText) {
         return 0;       /* Out of memory */
-    str = XmStringCreateLtoR(textCpy, XmFONTLIST_DEFAULT_TAG);
-    if( textCpy != text )
-        free( textCpy );
-    
-    /* Get the location/dimensions of the text area */
-    XtVaGetValues(textD->w,
-        XmNx, &txtX,
-        XmNy, &txtY,
-        NULL);
-    
+    }
+
     /* Create the calltip widget on first request */
-    if (textD->calltipW == NULL) {
-        Arg args[10];
-        int argcnt = 0;
-        XtSetArg(args[argcnt], XmNsaveUnder, True); argcnt++;
-        XtSetArg(args[argcnt], XmNallowShellResize, True); argcnt++;
-        
-        textD->calltipShell = CreatePopupShellWithBestVis("calltipshell", 
-             overrideShellWidgetClass, textD->w, args, argcnt);
-                
-        /* Might want to make this a read-only XmText eventually so that 
-            users can copy from it */
-        textD->calltipW = XtVaCreateManagedWidget( 
-                "calltip", xmLabelWidgetClass, textD->calltipShell,
-                XmNborderWidth, 1,              /* Thin borders */
-                XmNhighlightThickness, 0,
-                XmNalignment, XmALIGNMENT_BEGINNING,
-                XmNforeground, textD->calltipFGPixel,
-                XmNbackground, textD->calltipBGPixel,
-                NULL );
-    }
-    
-    /* Set the text on the label */
-    XtVaSetValues( textD->calltipW, XmNlabelString, str, NULL );
-    XmStringFree( str );
+    if (NULL == textD->calltip.widget) {
+        textD->calltip.widget = createTip(textD->w, textD->calltipFGPixel,
+                textD->calltipBGPixel, XmALIGNMENT_BEGINNING);
+    }
     
+    /*  The text widget will keep the size of the largest text it contained
+        over its lifetime unless we do something about it. So we set it to
+        minimum size and let the resize functionality do its work to get it
+        back up again matching the current text.  */
+    XtVaSetValues(textD->calltip.widget,
+            XmNheight, 10,
+            XmNwidth, 10,
+            NULL);
+    XmTextSetString(textD->calltip.widget, tablessText);
+    free(tablessText);
+
     /* Figure out where to put the tip */
     if (anchored) {
         /* Put it at the specified position */
         /* If position is not displayed, return 0 */
-        if (pos < textD->firstChar || pos > textD->lastChar ) {
+        if (pos < textD->firstChar || pos > textD->lastChar) {
             XBell(TheDisplay, 0);
             return 0;
         }
         textD->calltip.pos = pos;
     } else {
@@ -311,15 +303,179 @@ int ShowCalltip(WindowInfo *window, char
     textD->calltip.vAlign = vAlign;
     textD->calltip.alignMode = alignMode;
     
     /* Increment the static calltip ID.  Macro variables can only be int, 
         not unsigned, so have to work to keep it > 0 on overflow */
-    if(++StaticCalltipID <= 0)
+    /*  Macro variables can only be int, that's why you have to keep the ID
+        in the unsigned range?  */
+    if (++StaticCalltipID <= 0) {
         StaticCalltipID = 1;
+    }
     
     /* Realize the calltip's shell so that its width & height are known */
-    XtRealizeWidget( textD->calltipShell );
+    XtRealizeWidget(XtParent(textD->calltip.widget));
+
     /* Move the calltip and pop it up */
     TextDRedrawCalltip(textD, 0);
-    XtPopup( textD->calltipShell, XtGrabNone );
+    XtPopup(XtParent(textD->calltip.widget), XtGrabNone);
+
     return textD->calltip.ID;
 }
+
+/*
+**  Highlight a single line in a given calltip, erasing all other highlights.
+**
+**  Return values for this one need to be a bit more expressive. Some errors
+**  might just be the result of sloppy parameters, and the caller should
+**  decide whether to fail hard or not. The following results are possible:
+**
+**  - The calltip ID given is invalid (CT_INVALID_ID).
+**  - The user requested to remove all highlightings (CT_OK).
+**  - The requested line is highlighted (CT_OK).
+**  - The requested line is not in the provided text (CT_NOLINE).
+*/
+int HighlightCalltipLine(const WindowInfo* window, const int calltipID,
+        const unsigned line)
+{
+    textDisp* textD = ((TextWidget) window->lastFocus)->text.textD;
+    Boolean result = False;
+
+    if (calltipID == textD->calltip.ID) {
+        Widget textWidget = textD->calltip.widget;
+        char* textString = XmTextGetString(textWidget);
+        XmTextPosition textLength = XmTextGetLastPosition(textWidget);
+        unsigned begin = 0, end = 0;
+        Boolean lineIsValid = False;
+
+        /*  First remove all existing highlights.  */
+        XmTextSetHighlight(textWidget, 0, textLength + 1, XmHIGHLIGHT_NORMAL);
+
+        if (0 == line) {
+            /*  Just return without highlighting anything.  */
+            result = CT_OK;
+        } else {
+            lineIsValid = getRangeOfLine(textString, line, &begin, &end);
+            if (lineIsValid) {
+                XmTextSetHighlight(textWidget, (XmTextPosition) begin,
+                        (XmTextPosition) end, XmHIGHLIGHT_SELECTED);
+
+                result = CT_OK;
+            } else {
+                /*  The requested line is not in the provided text.  */
+                result = CT_NOLINE;
+            }
+        }
+
+        XtFree(textString);
+    } else {
+        result = CT_INVALID_ID;
+    }
+
+    return result;
+}
+
+/*
+**  Sets the parameters to beginning and end of the line. Returns False if
+**  the line is not in the text, True otherwise.
+*/
+Boolean getRangeOfLine(const char* textString, const unsigned line,
+        unsigned* begin, unsigned* end)
+{
+    int i;
+    size_t position = 0;
+
+    for (i = 0; i < line; i++)
+    {
+        *end = strcspn(textString + position, "\n") + position;
+        *begin = position;
+        position = *end + 1;
+
+        if (*begin == *end)
+        {
+            /*  Break if last line is found.  */
+            break;
+        }
+    }
+
+    return (*begin != *end);
+}
+
+/*
+**  Pop up a scroll calltip.
+*/
+Boolean ShowScrolltip(textDisp* textD, const char* text, const int x,
+        const int y)
+{
+    if (NULL == textD->scrolltip) {
+        textD->scrolltip = createTip(textD->w, textD->calltipFGPixel,
+                textD->calltipBGPixel, XmALIGNMENT_CENTER);
+    }
+
+    /*  Set the text on the tip's label.  */
+    XmTextSetString(textD->scrolltip, (char*) text);
+
+    /*  Realize the calltip's shell so that its width and height are known  */
+    XtRealizeWidget(XtParent(textD->scrolltip));
+
+    /*  Move the tip where it belongs and pop it up.  */
+    XtVaSetValues(XtParent(textD->scrolltip), XmNx, x, XmNy, y, NULL);
+    XtPopup(XtParent(textD->scrolltip), XtGrabNone);
+
+    return True;
+}
+
+/*
+**  Pop down scrolltip if it exists
+*/
+void KillScrolltip(textDisp* textD)
+{
+    if (NULL != textD->scrolltip && NULL != XtParent(textD->scrolltip)) {
+        XtPopdown(XtParent(textD->scrolltip));
+    }
+}
+
+/*
+**  This creates a calltip of class XmText and its parent, a shell of class
+**  OverrideShell (which in turn will be the child of the grandfather
+**  parameter). The tip will have minimum size but will resize to match
+**  the text entered (see XmNallowShellResize).
+**
+**  Color is picked by the two parameters foreground and background.
+**
+**  The alignment is on of XmALIGNMENT_BEGINNING, XmALIGNMENT_CENTER or
+**  XmALIGNMENT_END, taken from the XmLabel class.
+**
+**  TODO: Some helper functions are still desirable to make this function
+**  available from other parts of the code. At the moment the caller must
+**  use calls to Motif/Intrinsics functions to handle it.
+**
+*/
+Widget createTip(const Widget grandfather, const Pixel foreground,
+        const Pixel background, const unsigned char alignment)
+{
+    Widget tip = NULL;
+    Widget shell = NULL;
+    Arg args[10];
+    int argc = 0;
+
+    XtSetArg(args[argc], XmNsaveUnder, True); argc++;
+    XtSetArg(args[argc], XmNallowShellResize, True); argc++;
+
+    shell = CreatePopupShellWithBestVis("tipshell", overrideShellWidgetClass,
+            grandfather, args, argc);
+
+    tip = XtVaCreateManagedWidget("tip",
+            xmTextWidgetClass, shell,
+            XmNhighlightThickness, 0,
+            XmNalignment, alignment,
+            XmNeditable, False,
+            XmNeditMode, XmMULTI_LINE_EDIT,
+            XmNcursorPositionVisible, False,
+            XmNresizeHeight, True,
+            XmNresizeWidth, True,
+            XmNforeground, foreground,
+            XmNbackground, background,
+            XmNheight, 10,       /*  will be resized automatically  */
+            XmNwidth, 10,        /*  will be resized automatically  */
+            NULL);
+    return tip;
+}
diff --quilt old/source/calltips.h new/source/calltips.h
--- old/source/calltips.h
+++ new/source/calltips.h
@@ -36,14 +36,21 @@
 
 
 enum TipHAlignMode {TIP_LEFT, TIP_CENTER, TIP_RIGHT};
 enum TipVAlignMode {TIP_ABOVE, TIP_BELOW};
 enum TipAlignStrict {TIP_SLOPPY, TIP_STRICT};
+enum TipHighlightError {CT_OK, CT_INVALID_ID, CT_NOLINE};
 
-int  ShowCalltip(WindowInfo *window, char *text, Boolean anchored, 
-        int pos, int hAlign, int vAlign, int alignMode);
+int ShowCalltip(const WindowInfo *window, const char *text,
+        const Boolean anchored, const int pos, const int hAlign,
+        const int vAlign, const int alignMode);
 void KillCalltip(WindowInfo *window, int calltipID);
+Boolean ShowScrolltip(textDisp* textD, const char* text, const int x,
+        const int y);
+void KillScrolltip(textDisp* textD);
 void TextDKillCalltip(textDisp *textD, int calltipID);
-int  GetCalltipID(WindowInfo *window, int calltipID);
+int  GetCalltipID(const WindowInfo *window);
 void TextDRedrawCalltip(textDisp *textD, int calltipID);
+int HighlightCalltipLine(const WindowInfo* window, const int calltipID,
+        const unsigned line);
 
 #endif /* ifndef NEDIT_CALLTIPS_H_INCLUDED */
diff --quilt old/source/file.c new/source/file.c
--- old/source/file.c
+++ new/source/file.c
@@ -30,19 +30,22 @@ static const char CVSID[] = "$Id: file.c
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
 #endif
 
 #include "file.h"
+
+#include "backup.h"
 #include "textBuf.h"
 #include "text.h"
 #include "window.h"
 #include "preferences.h"
 #include "undo.h"
 #include "menu.h"
 #include "tags.h"
 #include "server.h"
 #include "interpret.h"
+#include "macro.h"
 #include "../util/misc.h"
 #include "../util/DialogF.h"
 #include "../util/fileUtils.h"
 #include "../util/getfiles.h"
 #include "../util/printUtils.h"
@@ -73,10 +76,15 @@ static const char CVSID[] = "$Id: file.c
 #include <Xm/ToggleB.h>
 #include <Xm/FileSB.h>
 #include <Xm/RowColumn.h>
 #include <Xm/Form.h>
 #include <Xm/Label.h>
+#include <Xm/PushB.h>
+
+/* What kinds of backup files to make -- see
+   table `version_control_values' in backup.c. */
+static enum backup_mode version_control;
 
 #ifdef HAVE_DEBUG_H
 #include "../debug.h"
 #endif
 
@@ -84,22 +92,22 @@ static const char CVSID[] = "$Id: file.c
    The periodic check is only performed on buffer modification, and the check
    interval is only to prevent checking on every keystroke in case of a file
    system which is slow to process stat requests (which I'm not sure exists) */
 #define MOD_CHECK_INTERVAL 3000
 
+#define MAX_X_ARGS 20         /* Maximum number of X arguments */
+
 static int doSave(WindowInfo *window);
 static void safeClose(WindowInfo *window);
 static int doOpen(WindowInfo *window, const char *name, const char *path,
      int flags);
 static void backupFileName(WindowInfo *window, char *name, size_t len);
 static int writeBckVersion(WindowInfo *window);
 static int bckError(WindowInfo *window, const char *errString, const char *file);
 static int fileWasModifiedExternally(WindowInfo *window);
 static const char *errorString(void);
 static void addWrapNewlines(WindowInfo *window);
-static void setFormatCB(Widget w, XtPointer clientData, XtPointer callData);
-static void addWrapCB(Widget w, XtPointer clientData, XtPointer callData);
 static int cmpWinAgainstFile(WindowInfo *window, const char *fileName);
 static int min(int i1, int i2);
 static void modifiedWindowDestroyedCB(Widget w, XtPointer clientData,
     XtPointer callData);
 static void forceShowLineNumbers(WindowInfo *window);
@@ -107,11 +115,11 @@ static void forceShowLineNumbers(WindowI
 #ifdef VMS
 void removeVersionNumber(char *fileName);
 #endif /*VMS*/
 
 WindowInfo *EditNewFile(WindowInfo *inWindow, char *geometry, int iconic,
-        const char *languageMode, const char *defaultPath)
+        const char* languageMode, const char* defaultPath, Boolean transient)
 {
     char name[MAXPATHLEN];
     WindowInfo *window;
     
     /*... test for creatability? */
@@ -143,11 +151,19 @@ WindowInfo *EditNewFile(WindowInfo *inWi
 
     if (iconic && IsIconic(window))
         RaiseDocument(window);
     else
         RaiseDocumentWindow(window);
-       
+
+    if (transient) {
+        /*  Set the window to transient mode.  */
+        String apParams[1];
+
+        apParams[0] = "1";
+        XtCallActionProc(window->lastFocus, "set_transient", NULL, apParams, 1);
+    }
+
     SortTabBar(window);
     return window;
 }
 
 /*
@@ -173,11 +189,11 @@ WindowInfo *EditExistingFile(WindowInfo 
         const char *path, int flags, char *geometry, int iconic,
        const char *languageMode, int tabbed, int bgOpen)
 {
     WindowInfo *window;
     char fullname[MAXPATHLEN];
-    
+
     /* first look to see if file is already displayed in a window */
     window = FindWindowWithFile(name, path);
     if (window != NULL) {
        if (!bgOpen) {
            if (iconic)
@@ -248,10 +264,13 @@ WindowInfo *EditExistingFile(WindowInfo 
     strcat(fullname, name);
     if(GetPrefAlwaysCheckRelTagsSpecs())
        AddRelTagsFile(GetPrefTagFile(), path, TAG);
     AddToPrevOpenMenu(fullname);
 
+    /*  file_open_hook()  */
+    MacroApplyHook(window, "file_open_hook", 0, NULL, NULL);
+
     return window;
 }
 
 void RevertToSaved(WindowInfo *window)
 {
@@ -337,11 +356,11 @@ static int doOpen(WindowInfo *window, co
     int fileLen, readLen;
     char *fileString, *c;
     FILE *fp = NULL;
     int fd;
     int resp;
-    
+
     /* initialize lock reasons */
     CLEAR_ALL_LOCKS(window->lockReasons);
     
     /* Update the window data structure */
     strcpy(window->filename, name);
@@ -536,10 +555,14 @@ static int doOpen(WindowInfo *window, co
             }
 
             SET_TMBD_LOCKED(window->lockReasons, TRUE);
             for (c = fileString; c < &fileString[readLen]; c++) {
                 if (*c == '\0') {
+                    /*  Looks like every NUL character is replaced with:
+                        ISO 8859-1: LATIN SMALL LETTER THORN
+                        ISO 8859-7: GREEK SMALL LETTER OMEGA WITH TONOS
+                        UTF-8: <unused>  */
                     *c = (char) 0xfe;
                 }
             }
             window->buffer->nullSubsChar = (char) 0xfe;
         }
@@ -705,20 +728,21 @@ int CloseFileAndWindow(WindowInfo *windo
     
     /* Make sure that the window is not in iconified state */
     if (window->fileChanged)
        RaiseDocumentWindow(window);
 
-    /* If the window is a normal & unmodified file or an empty new file, 
-       or if the user wants to ignore external modifications then
-       just close it.  Otherwise ask for confirmation first. */
-    if (!window->fileChanged && 
-            /* Normal File */
-            ((!window->fileMissing && window->lastModTime > 0) || 
-            /* New File*/
-             (window->fileMissing && window->lastModTime == 0) ||
-            /* File deleted/modified externally, ignored by user. */
-            !GetPrefWarnFileMods()))
+    /*  If the document is transient, belongs to a normal & unmodified file
+        or is empty and unchanged, or if the user wants to ignore external
+        modifications then just close it. Otherwise ask for confirmation first. */
+    if (window->transient
+            || (!window->fileChanged
+            /*  Normal document, already saved  */
+            && ((!window->fileMissing && window->lastModTime > 0)
+            /*  New document, unchanged yet  */
+            || (window->fileMissing && window->lastModTime == 0)
+            /*  File deleted/modified externally, ignored by user.  */
+            || !GetPrefWarnFileMods())))
     {
         CloseWindow(window);
         /* up-to-date windows don't have outstanding backup files to close */
     } else
     {
@@ -908,10 +932,11 @@ static int doSave(WindowInfo *window)
     char *fileString = NULL;
     char fullname[MAXPATHLEN];
     struct stat statbuf;
     FILE *fp;
     int fileLen, result;
+    DataValue* fileNameArg = (DataValue*) XtMalloc(sizeof(DataValue));
 
     /* Get the full name of the file */
     strcpy(fullname, window->path);
     strcat(fullname, window->filename);
 
@@ -1045,10 +1070,14 @@ static int doSave(WindowInfo *window)
         window->fileMissing = TRUE;
         window->device = 0;
         window->inode = 0;
     }
 
+    fileNameArg->tag = STRING_TAG;
+    AllocNStringNCpy(&fileNameArg->val.str, fullname, MAXPATHLEN);
+    MacroApplyHook(window, "post_save_hook", 1, fileNameArg, NULL);
+
     return TRUE;
 }
 
 /*
 ** Create a backup file for the current window.  The name for the backup file
@@ -1182,38 +1211,52 @@ static void backupFileName(WindowInfo *w
 */
 static int writeBckVersion(WindowInfo *window)
 {
 #ifndef VMS
     char fullname[MAXPATHLEN], bckname[MAXPATHLEN];
+    char* backname;
     struct stat statbuf;
     int in_fd, out_fd;
     char *io_buffer;
+    off_t fileLen;
 #define IO_BUFFER_SIZE ((size_t)(1024*1024))
 
     /* Do only if version backups are turned on */
     if (!window->saveOldVersion) {
        return False;
     }
     
+    /*  First fime numbered backup files are used.  */
+    if (unset == version_control) {
+        initialize_backups();
+    }
+
     /* Get the full name of the file */
     strcpy(fullname, window->path);
     strcat(fullname, window->filename);
     
+    backname = generate_backup_filename(version_control, fullname);
+    if ((fileLen = strlen(backname)) < MAXPATHLEN) {
+        strncpy(bckname, backname, sizeof(bckname));
+    }
+    free(backname);
+
     /* Generate name for old version */
-    if ((strlen(fullname) + 5) > (size_t) MAXPATHLEN) {
+    if (fileLen >= (size_t) MAXPATHLEN) {
         return bckError(window, "file name too long", window->filename);
     }
-    sprintf(bckname, "%s.bck", fullname);
 
     /* Delete the old backup file */
     /* Errors are ignored; we'll notice them later. */
     remove(bckname);
 
     /* open the file being edited.  If there are problems with the
        old file, don't bother the user, just skip the backup */
     in_fd = open(fullname, O_RDONLY);
     if (in_fd<0) {
+        /*  This is rather surprising behavior. Let's see more about the error.  */
+        perror("nedit: Error reading edited file");
        return FALSE;
     }
 
     /* Get permissions of the file.
        We preserve the normal permissions but not ownership, extended
@@ -1415,162 +1458,98 @@ void PrintString(const char *string, int
 #endif /*VMS*/
     return;
 }
 
 /*
-** Wrapper for GetExistingFilename which uses the current window's path
-** (if set) as the default directory.
+**  Wrapper for GetFilenameByDialog()
+**
+**  TODO: I stopped the refactoring here for now, but these two could
+**  be combined into some sort of PromptFor.*File().
 */
 int PromptForExistingFile(WindowInfo *window, char *prompt, char *fullname)
 {
-    char *savedDefaultDir;
-    int retVal;
-    
-    /* Temporarily set default directory to window->path, prompt for file,
-       then, if the call was unsuccessful, restore the original default
-       directory */
-    savedDefaultDir = GetFileDialogDefaultDirectory();
-    if (*window->path != '\0')
-       SetFileDialogDefaultDirectory(window->path);
-    retVal = GetExistingFilename(window->shell, prompt, fullname);
-    if (retVal != GFN_OK)
-       SetFileDialogDefaultDirectory(savedDefaultDir);
-
-    XtFree(savedDefaultDir);
+    gfbdParams params;
+    gfbdValue* gfbdrc;
+    int rc = GFN_ERROR;
+
+    params.dialogTitle = prompt;
+    params.parentShell = window->shell;
+    params.fileExists = True;
+    params.textfieldLabel = (GetPrefStdOpenDialog() ? "File Name" : NULL);
+    params.defaultName = NULL;
+    params.haveFormatButtons = False;
+    /*  ...so no file format for wrap info necessary.  */
+    params.showHidden = GetPrefShowHiddenFiles();
+
+    gfbdrc = GetFilenameByDialog(params);
+
+    switch(gfbdrc->status) {
+        case GFDB_OK:
+            strncpy(fullname, gfbdrc->payload, MAXPATHLEN);
+            rc = GFN_OK;
+            break;
+        case GFDB_CANCEL:
+            rc = GFN_CANCEL;
+            break;
+        case GFDB_ERROR:
+            fprintf(stderr, "nedit: Error while calling GetFilenameByDialog(): %s\n", gfbdrc->payload);
+            rc = GFN_ERROR;
+            break;
+        default:
+            /*  fallback  */
+            fprintf(stderr, "nedit: Unexpected error in GetFilenameByDialog().\n");
+            rc = GFN_ERROR;
+            break;
+    }
 
-    return retVal;
+    return rc;
 }
 
 /*
-** Wrapper for HandleCustomNewFileSB which uses the current window's path
-** (if set) as the default directory, and asks about embedding newlines
-** to make wrapping permanent.
+**  Wrapper for GetFilenameByDialog()
 */
 int PromptForNewFile(WindowInfo *window, char *prompt, char *fullname,
        int *fileFormat, int *addWrap)
 {
-    int n, retVal;
-    Arg args[20];
-    XmString s1, s2;
-    Widget fileSB, wrapToggle;
-    Widget formatForm, formatBtns, unixFormat, dosFormat, macFormat;
-    char *savedDefaultDir;
-    
-    *fileFormat = window->fileFormat;
-    
-    /* Temporarily set default directory to window->path, prompt for file,
-       then, if the call was unsuccessful, restore the original default
-       directory */
-    savedDefaultDir = GetFileDialogDefaultDirectory();
-    if (*window->path != '\0')
-       SetFileDialogDefaultDirectory(window->path);
-    
-    /* Present a file selection dialog with an added field for requesting
-       long line wrapping to become permanent via inserted newlines */
-    n = 0;
-    XtSetArg(args[n],
-            XmNselectionLabelString,
-            s1 = XmStringCreateLocalized("New File Name:")); n++;
-    XtSetArg(args[n], XmNdialogStyle, XmDIALOG_FULL_APPLICATION_MODAL); n++;
-    XtSetArg(args[n],
-            XmNdialogTitle,
-            s2 = XmStringCreateSimple(prompt)); n++;
-    fileSB = CreateFileSelectionDialog(window->shell,"FileSelect",args,n);
-    XmStringFree(s1);
-    XmStringFree(s2);
-    formatForm = XtVaCreateManagedWidget("formatForm", xmFormWidgetClass,
-           fileSB, NULL);
-    formatBtns = XtVaCreateManagedWidget("formatBtns",
-            xmRowColumnWidgetClass, formatForm,
-            XmNradioBehavior, XmONE_OF_MANY,
-            XmNorientation, XmHORIZONTAL,
-            XmNpacking, XmPACK_TIGHT,
-            XmNtopAttachment, XmATTACH_FORM,
-            XmNleftAttachment, XmATTACH_FORM,
-            NULL);
-    XtVaCreateManagedWidget("formatBtns", xmLabelWidgetClass, formatBtns,
-           XmNlabelString, s1=XmStringCreateSimple("Format:"), NULL);
-    XmStringFree(s1);
-    unixFormat = XtVaCreateManagedWidget("unixFormat",
-            xmToggleButtonWidgetClass, formatBtns,
-            XmNlabelString, s1 = XmStringCreateSimple("Unix"),
-            XmNset, *fileFormat == UNIX_FILE_FORMAT,
-            XmNuserData, (XtPointer)UNIX_FILE_FORMAT,
-            XmNmarginHeight, 0,
-            XmNalignment, XmALIGNMENT_BEGINNING,
-            XmNmnemonic, 'U',
-            NULL);
-    XmStringFree(s1);
-    XtAddCallback(unixFormat, XmNvalueChangedCallback, setFormatCB,
-           fileFormat);
-    dosFormat = XtVaCreateManagedWidget("dosFormat",
-            xmToggleButtonWidgetClass, formatBtns,
-            XmNlabelString, s1 = XmStringCreateSimple("DOS"),
-            XmNset, *fileFormat == DOS_FILE_FORMAT,
-            XmNuserData, (XtPointer)DOS_FILE_FORMAT,
-            XmNmarginHeight, 0,
-            XmNalignment, XmALIGNMENT_BEGINNING,
-            XmNmnemonic, 'O',
-            NULL);
-    XmStringFree(s1);
-    XtAddCallback(dosFormat, XmNvalueChangedCallback, setFormatCB,
-           fileFormat);
-    macFormat = XtVaCreateManagedWidget("macFormat",
-            xmToggleButtonWidgetClass, formatBtns,
-            XmNlabelString, s1 = XmStringCreateSimple("Macintosh"),
-            XmNset, *fileFormat == MAC_FILE_FORMAT,
-            XmNuserData, (XtPointer)MAC_FILE_FORMAT,
-            XmNmarginHeight, 0,
-            XmNalignment, XmALIGNMENT_BEGINNING,
-            XmNmnemonic, 'M',
-            NULL);
-    XmStringFree(s1);
-    XtAddCallback(macFormat, XmNvalueChangedCallback, setFormatCB,
-           fileFormat);
-    if (window->wrapMode == CONTINUOUS_WRAP) {
-       wrapToggle = XtVaCreateManagedWidget("addWrap",
-                xmToggleButtonWidgetClass, formatForm,
-                XmNlabelString, s1 = XmStringCreateSimple("Add line breaks where wrapped"),
-                XmNalignment, XmALIGNMENT_BEGINNING,
-                XmNmnemonic, 'A',
-                XmNtopAttachment, XmATTACH_WIDGET,
-                XmNtopWidget, formatBtns,
-                XmNleftAttachment, XmATTACH_FORM,
-                NULL);
-       XtAddCallback(wrapToggle, XmNvalueChangedCallback, addWrapCB,
-               addWrap);
-       XmStringFree(s1);
-    }
-    *addWrap = False;
-    XtVaSetValues(XmFileSelectionBoxGetChild(fileSB, XmDIALOG_FILTER_LABEL),
-            XmNmnemonic, 'l',
-            XmNuserData, XmFileSelectionBoxGetChild(fileSB, XmDIALOG_FILTER_TEXT),
-            NULL);
-    XtVaSetValues(XmFileSelectionBoxGetChild(fileSB, XmDIALOG_DIR_LIST_LABEL),
-            XmNmnemonic, 'D',
-            XmNuserData, XmFileSelectionBoxGetChild(fileSB, XmDIALOG_DIR_LIST),
-            NULL);
-    XtVaSetValues(XmFileSelectionBoxGetChild(fileSB, XmDIALOG_LIST_LABEL),
-            XmNmnemonic, 'F',
-            XmNuserData, XmFileSelectionBoxGetChild(fileSB, XmDIALOG_LIST),
-            NULL);
-    XtVaSetValues(XmFileSelectionBoxGetChild(fileSB, XmDIALOG_SELECTION_LABEL),
-            XmNmnemonic, prompt[strspn(prompt, "lFD")],
-            XmNuserData, XmFileSelectionBoxGetChild(fileSB, XmDIALOG_TEXT),
-            NULL);
-    AddDialogMnemonicHandler(fileSB, FALSE);
-    RemapDeleteKey(XmFileSelectionBoxGetChild(fileSB, XmDIALOG_FILTER_TEXT));
-    RemapDeleteKey(XmFileSelectionBoxGetChild(fileSB, XmDIALOG_TEXT));
-    retVal = HandleCustomNewFileSB(fileSB, fullname,
-           window->filenameSet ? window->filename : NULL);
+    gfbdParams params;
+    gfbdValue* gfbdrc;
+    int rc = GFN_ERROR;
+
+    params.dialogTitle = prompt;
+    params.parentShell = window->shell;
+    params.fileExists = False;
+    params.textfieldLabel = "New File Name";
+    params.defaultName = window->filenameSet ? window->filename : NULL;
+    params.haveFormatButtons = True;
+    params.fileFormat = window->fileFormat;
+    params.isContWrapped = (CONTINUOUS_WRAP == window->wrapMode);
+    params.showHidden = GetPrefShowHiddenFiles();
 
-    if (retVal != GFN_OK)
-       SetFileDialogDefaultDirectory(savedDefaultDir);
+    gfbdrc = GetFilenameByDialog(params);
+    *addWrap = False;
 
-    XtFree(savedDefaultDir);
+    switch(gfbdrc->status) {
+        case GFDB_OK:
+            strncpy(fullname, gfbdrc->payload, MAXPATHLEN);
+            *addWrap = gfbdrc->addWrap;
+            rc = GFN_OK;
+            break;
+        case GFDB_CANCEL:
+            rc = GFN_CANCEL;
+            break;
+        case GFDB_ERROR:
+            fprintf(stderr, "nedit: Error while calling GetFilenameByDialog(): %s\n", gfbdrc->payload);
+            rc = GFN_ERROR;
+            break;
+        default:
+            /*  fallback  */
+            fprintf(stderr, "nedit: Unexpected error in GetFilenameByDialog().\n");
+            rc = GFN_ERROR;
+            break;
+    }
 
-    return retVal;
+    return rc;
 }
 
 /*
 ** Find a name for an untitled file, unique in the name space of in the opened
 ** files in this session, i.e. Untitled or Untitled_nn, and write it into
@@ -1882,56 +1861,10 @@ void removeVersionNumber(char *fileName)
        *versionStart = '\0';
 }
 #endif /*VMS*/
 
 /*
-** Callback procedure for File Format toggle buttons.  Format is stored
-** in userData field of widget button
-*/
-static void setFormatCB(Widget w, XtPointer clientData, XtPointer callData)
-{
-    if (XmToggleButtonGetState(w)) {
-        XtPointer userData;
-        XtVaGetValues(w, XmNuserData, &userData, NULL);
-        *(int*) clientData = (int) userData;
-    }
-}
-
-/*
-** Callback procedure for toggle button requesting newlines to be inserted
-** to emulate continuous wrapping.
-*/
-static void addWrapCB(Widget w, XtPointer clientData, XtPointer callData)
-{
-    int resp;
-    int *addWrap = (int *)clientData;
-    
-    if (XmToggleButtonGetState(w))
-    {
-        resp = DialogF(DF_WARN, w, 2, "Add Wrap",
-                "This operation adds permanent line breaks to\n"
-                "match the automatic wrapping done by the\n"
-                "Continuous Wrap mode Preferences Option.\n\n"
-                "*** This Option is Irreversable ***\n\n"
-                "Once newlines are inserted, continuous wrapping\n"
-                "will no longer work automatically on these lines", "OK",
-                "Cancel");
-        if (resp == 2)
-        {
-            XmToggleButtonSetState(w, False, False);
-            *addWrap = False;
-        } else
-        {
-            *addWrap = True;
-        }
-    } else
-    {
-        *addWrap = False;
-    }
-}
-
-/*
 ** Change a window created in NEdit's continuous wrap mode to the more
 ** conventional Unix format of embedded newlines.  Indicate to the user
 ** by turning off Continuous Wrap mode.
 */
 static void addWrapNewlines(WindowInfo *window)
diff --quilt old/source/file.h new/source/file.h
--- old/source/file.h
+++ new/source/file.h
@@ -35,16 +35,21 @@
 /* flags for EditExistingFile */
 #define CREATE 1
 #define SUPPRESS_CREATE_WARN 2
 #define PREF_READ_ONLY 4
 
+/*  These were once set in util/getfiles.h and used throughout NEdit; they
+    were moved here to lower coupling between util/getfiles.c and the rest
+    of NEdit.  */
+enum gfnResult {GFN_OK, GFN_CANCEL, GFN_ERROR};
+
 #define PROMPT_SBC_DIALOG_RESPONSE 0
 #define YES_SBC_DIALOG_RESPONSE 1
 #define NO_SBC_DIALOG_RESPONSE 2
 
 WindowInfo *EditNewFile(WindowInfo *inWindow, char *geometry, int iconic,
-        const char *languageMode, const char *defaultPath);
+        const char *languageMode, const char *defaultPath, Boolean transient);
 WindowInfo *EditExistingFile(WindowInfo *inWindow, const char *name,
         const char *path, int flags, char *geometry, int iconic,
        const char *languageMode, int tabbed, int bgOpen);
 void RevertToSaved(WindowInfo *window);
 int SaveWindow(WindowInfo *window);
diff --quilt old/source/help.c new/source/help.c
--- old/source/help.c
+++ new/source/help.c
@@ -6,11 +6,11 @@ static const char CVSID[] = "$Id: help.c
 * Copyright (C) 1999 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    *
 * Foundation; either version 2 of the License, or (at your option) any later   *
-* version. In addition, you may distribute version of this program linked to   *
+* version. In addition, you may distribute versions of this program linked to  *
 * Motif or Open Motif. See README for details.                                 *
 *                                                                              *
 * This software 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        *
@@ -598,42 +598,48 @@ static Widget createHelpPanel(enum HelpT
     form = XtVaCreateManagedWidget("helpForm", xmFormWidgetClass, appShell,
             NULL);
     XtVaSetValues(form, XmNshadowThickness, 0, NULL);
     
     /* Create the bottom row of buttons */
-    btn = XtVaCreateManagedWidget("find", xmPushButtonWidgetClass, form,
+    btn = XtVaCreateManagedWidget("find",
+            xmPushButtonWidgetClass, form,
             XmNlabelString, st1=XmStringCreateSimple("Find..."),
             XmNmnemonic, 'F',
             XmNbottomAttachment, XmATTACH_FORM,
             XmNleftAttachment, XmATTACH_POSITION,
             XmNleftPosition, 3,
             XmNrightAttachment, XmATTACH_POSITION,
             XmNrightPosition, 25,
+            XmNtraversalOn, False,
             NULL);
     XtAddCallback(btn, XmNactivateCallback, searchHelpCB, appShell);
     XmStringFree(st1);
 
-    btn = XtVaCreateManagedWidget("findAgain", xmPushButtonWidgetClass, form,
+    btn = XtVaCreateManagedWidget("findAgain",
+            xmPushButtonWidgetClass, form,
             XmNlabelString, st1=XmStringCreateSimple("Find Again"),
             XmNmnemonic, 'A',
             XmNbottomAttachment, XmATTACH_FORM,
             XmNleftAttachment, XmATTACH_POSITION,
             XmNleftPosition, 27,
             XmNrightAttachment, XmATTACH_POSITION,
             XmNrightPosition, 49,
+            XmNtraversalOn, False,
             NULL);
     XtAddCallback(btn, XmNactivateCallback, searchHelpAgainCB, appShell);
     XmStringFree(st1);
 
-    btn = XtVaCreateManagedWidget("print", xmPushButtonWidgetClass, form,
+    btn = XtVaCreateManagedWidget("print",
+            xmPushButtonWidgetClass, form,
             XmNlabelString, st1=XmStringCreateSimple("Print..."),
             XmNmnemonic, 'P',
             XmNbottomAttachment, XmATTACH_FORM,
             XmNleftAttachment, XmATTACH_POSITION,
             XmNleftPosition, 51,
             XmNrightAttachment, XmATTACH_POSITION,
             XmNrightPosition, 73,
+            XmNtraversalOn, False,
             NULL);
     XtAddCallback(btn, XmNactivateCallback, printCB, appShell);
     XmStringFree(st1);
 
     closeBtn = XtVaCreateManagedWidget("close",
@@ -642,79 +648,89 @@ static Widget createHelpPanel(enum HelpT
             XmNbottomAttachment, XmATTACH_FORM,
             XmNleftAttachment, XmATTACH_POSITION,
             XmNleftPosition, 75,
             XmNrightAttachment, XmATTACH_POSITION,
             XmNrightPosition, 97,
+            XmNtraversalOn, False,
             NULL);
     XtAddCallback(closeBtn, XmNactivateCallback, closeCB, appShell);
     XmStringFree(st1);
             
     /* Create the next row of buttons (for navigation) */
-    btn = XtVaCreateManagedWidget("prevTopic", xmPushButtonWidgetClass, form,
+    btn = XtVaCreateManagedWidget("prevTopic",
+            xmPushButtonWidgetClass, form,
             XmNlabelString, st1=XmStringCreateSimple("<< Browse"),
             XmNmnemonic, 'o', 
             XmNbottomAttachment, XmATTACH_WIDGET,
             XmNbottomWidget, closeBtn,
             XmNleftAttachment, XmATTACH_POSITION,
             XmNleftPosition, 51,
             XmNrightAttachment, XmATTACH_POSITION,
             XmNrightPosition, 73,
+            XmNtraversalOn, False,
             NULL);
     XtAddCallback(btn, XmNactivateCallback, prevTopicCB, appShell);
     XmStringFree(st1);
 
-    btn = XtVaCreateManagedWidget("nextTopic", xmPushButtonWidgetClass, form,
+    btn = XtVaCreateManagedWidget("nextTopic",
+            xmPushButtonWidgetClass, form,
             XmNlabelString, st1=XmStringCreateSimple("Browse >>"),
             XmNmnemonic, 'e', 
             XmNbottomAttachment, XmATTACH_WIDGET,
             XmNbottomWidget, closeBtn,
             XmNleftAttachment, XmATTACH_POSITION,
             XmNleftPosition, 75, 
             XmNrightAttachment, XmATTACH_POSITION,
             XmNrightPosition, 97,
+            XmNtraversalOn, False,
             NULL);
     XtAddCallback(btn, XmNactivateCallback, nextTopicCB, appShell);
     XmStringFree(st1);
 
-    btn = XtVaCreateManagedWidget("histBack", xmPushButtonWidgetClass, form,
+    btn = XtVaCreateManagedWidget("histBack",
+            xmPushButtonWidgetClass, form,
             XmNlabelString, st1=XmStringCreateSimple("Back"),
             XmNmnemonic, 'B', 
             XmNbottomAttachment, XmATTACH_WIDGET,
             XmNbottomWidget, closeBtn,
             XmNleftAttachment, XmATTACH_POSITION,
             XmNleftPosition, 3,
             XmNrightAttachment, XmATTACH_POSITION,
             XmNrightPosition, 25,
+            XmNtraversalOn, False,
             NULL);
     XtAddCallback(btn, XmNactivateCallback, bwHistoryCB, appShell);
     XmStringFree(st1);
 
-    btnFW = XtVaCreateManagedWidget("histForw", xmPushButtonWidgetClass, form,
+    btnFW = XtVaCreateManagedWidget("histForw",
+            xmPushButtonWidgetClass, form,
             XmNlabelString, st1=XmStringCreateSimple("Forward"),
             XmNmnemonic, 'w', 
             XmNbottomAttachment, XmATTACH_WIDGET,
             XmNbottomWidget, closeBtn,
             XmNleftAttachment, XmATTACH_POSITION,
             XmNleftPosition, 27,
             XmNrightAttachment, XmATTACH_POSITION,
             XmNrightPosition, 49,
+            XmNtraversalOn, False,
             NULL);
     XtAddCallback(btnFW, XmNactivateCallback, fwHistoryCB, appShell);
     XmStringFree(st1);
     
     /* Create a text widget inside of a scrolled window widget */
-    sw = XtVaCreateManagedWidget("sw", xmScrolledWindowWidgetClass, form,
+    sw = XtVaCreateManagedWidget("sw",
+            xmScrolledWindowWidgetClass, form,
             XmNshadowThickness, 2,
             XmNtopAttachment, XmATTACH_FORM,
             XmNleftAttachment, XmATTACH_FORM,
             XmNrightAttachment, XmATTACH_FORM,
             XmNbottomAttachment, XmATTACH_WIDGET,
             XmNbottomWidget, btnFW,
             NULL);
     hScrollBar = XtVaCreateManagedWidget("hScrollBar",
             xmScrollBarWidgetClass, sw,
-            XmNorientation, XmHORIZONTAL, 
+            XmNorientation, XmHORIZONTAL,
             XmNrepeatDelay, 10,
             NULL);
     vScrollBar = XtVaCreateManagedWidget("vScrollBar",
             xmScrollBarWidgetClass, sw,
             XmNorientation, XmVERTICAL,
@@ -733,15 +749,16 @@ static Widget createHelpPanel(enum HelpT
             textNvScrollBar, vScrollBar,
             textNreadOnly, True,
             textNcontinuousWrap, True,
             textNautoShowInsertPos, True,
             NULL);
-    XtVaSetValues(sw, XmNworkWindow, HelpTextPanes[topic],
+    XtVaSetValues(sw,
+            XmNworkWindow, HelpTextPanes[topic],
             XmNhorizontalScrollBar, hScrollBar,
             XmNverticalScrollBar, vScrollBar,
             NULL);
-    
+
     /* Initialize help style information, if it hasn't already been init'd */
     initHelpStyles (HelpTextPanes[topic]);
     
     /* Put together the text to display and separate it into parallel text
        and style data for display by the widget */
@@ -802,11 +819,10 @@ static void changeTopicOrRaise(int exist
     {
         RaiseShellWindow(HelpWindows[newTopic], True);
         adaptNavigationButtons(existingTopic);
         adaptNavigationButtons(newTopic);
     }
-
 }
 
 /*
 ** Callbacks for window controls
 */
@@ -900,12 +916,22 @@ static void searchHelpCB(Widget w, XtPoi
 static void searchHelpAgainCB(Widget w, XtPointer clientData,
         XtPointer callData)
 {
     int topic;
     
-    if ((topic = findTopicFromShellWidget((Widget)clientData)) == -1)
-        return; /* shouldn't happen */
+    if ((topic = findTopicFromShellWidget((Widget)clientData)) == -1) {
+        /* shouldn't happen */
+        fprintf(stderr, "nedit: Unexpected location found in help.c\n");
+        return;
+    }
+
+    if (0 == strcmp(LastSearchString, "")) {
+        /*  no previous search  */
+        XBell(TheDisplay, 0);
+        return;
+    }
+
     searchHelpText(HelpWindows[topic], topic, LastSearchString,
             LastSearchWasAllTopics, LastSearchPos, LastSearchTopic);
 }
 
 static void printCB(Widget w, XtPointer clientData, XtPointer callData)
@@ -1005,16 +1031,10 @@ static void followHyperlink(int topic, i
         adaptNavigationButtons(topic);
     }
     XtFree (link_text);
 }
 
-static void helpFocusButtonsAP(Widget w, XEvent *event, String *args,
-        Cardinal *nArgs)
-{   
-    XmProcessTraversal(w, XmTRAVERSE_NEXT_TAB_GROUP);
-}
-
 /* 
  * handler for help-button-action(<button-name>)
  * Calls the activate callback for the named button widget of the help text win.
  */
 static void helpButtonActionAP(Widget w, XEvent *event, String *args,
@@ -1148,11 +1168,10 @@ static void helpHyperlinkAP(Widget w, XE
 void InstallHelpLinkActions(XtAppContext context)
 {   
     static XtActionsRec Actions[] =
     {
         {"help-hyperlink", helpHyperlinkAP},
-        {"help-focus-buttons", helpFocusButtonsAP},
         {"help-button-action", helpButtonActionAP}
     };
 
     XtAppAddActions(context, Actions, XtNumber(Actions));
 }
diff --quilt old/source/highlightData.c new/source/highlightData.c
--- old/source/highlightData.c
+++ new/source/highlightData.c
@@ -546,14 +546,14 @@ static char *DefaultPatternSets[] = {
        Wrong logical ops:\"&&|\\|\\|\":::Plain::\n\
        Logical operators:\"~|&|\\|\":::Text Arg2::}",
     "NEdit Macro:2:0{\n\
         README:\"NEdit Macro syntax highlighting patterns, version 2.6, maintainer Thorsten Haude, nedit at thorstenhau.de\":::Flag::D\n\
         Comment:\"#\":\"$\"::Comment::\n\
-        Built-in Misc Vars:\"(?<!\\Y)\\$(?:active_pane|args|calltip_ID|column|cursor|display_width|empty_array|file_name|file_path|language_mode|line|locked|max_font_width|min_font_width|modified|n_display_lines|n_panes|rangeset_list|read_only|selection_(?:start|end|left|right)|server_name|text_length|top_line|VERSION)>\":::Identifier::\n\
+        Built-in Misc Vars:\"(?<!\\Y)\\$(?:active_pane|args|calltip_ID|column|cursor|display_width|empty_array|file_name|file_path|language_mode|line|locked|max_font_width|min_font_width|modified|n_display_lines|n_panes|rangeset_list|read_only|selection_(?:start|end|left|right)|server_name|text_length|top_line|VERSION|NEDIT_HOME)>\":::Identifier::\n\
         Built-in Pref Vars:\"(?<!\\Y)\\$(?:auto_indent|em_tab_dist|file_format|font_name|font_name_bold|font_name_bold_italic|font_name_italic|highlight_syntax|incremental_backup|incremental_search_line|make_backup_copy|match_syntax_based|overtype_mode|show_line_numbers|show_matching|statistics_line|tab_dist|use_tabs|wrap_margin|wrap_text)>\":::Identifier2::\n\
         Built-in Special Vars:\"(?<!\\Y)\\$(?:[1-9]|list_dialog_button|n_args|read_status|search_end|shell_cmd_status|string_dialog_button|sub_sep)>\":::String1::\n\
-        Built-in Subrs:\"<(?:append_file|beep|call|calltip|clipboard_to_string|dialog|filename_dialog|focus_window|get_character|get_pattern_(by_name|at_pos)|get_range|get_selection|get_style_(by_name|at_pos)|getenv|kill_calltip|length|list_dialog|max|min|rangeset_(?:add|create|destroy|get_by_name|includes|info|invert|range|set_color|set_mode|set_name|subtract)|read_file|replace_in_string|replace_range|replace_selection|replace_substring|search|search_string|select|select_rectangle|set_cursor_pos|shell_command|split|string_compare|string_dialog|string_to_clipboard|substring|t_print|tolower|toupper|valid_number|write_file)(?=\\s*\\()\":::Subroutine::\n\
+        Built-in Subrs:\"<(?:append_file|beep|call|calltip|clipboard_to_string|dialog|filename_dialog|focus_window|get_character|get_pattern_(by_name|at_pos)|get_range|get_selection|get_style_(by_name|at_pos)|getenv|highlight_calltip_line|kill_calltip|length|list_dialog|max|min|rangeset_(?:add|create|destroy|get_by_name|includes|info|invert|range|set_color|set_mode|set_name|subtract)|read_file|replace_in_string|replace_range|replace_selection|replace_substring|search|search_string|select|select_rectangle|set_cursor_pos|set_transient|shell_command|split|string_compare|string_dialog|string_to_clipboard|substring|t_print|tolower|toupper|typeof|valid_number|write_file)(?=\\s*\\()\":::Subroutine::\n\
         Menu Actions:\"<(?:new(?:_tab|_opposite)?|open|open-dialog|open_dialog|open-selected|open_selected|close|save|save-as|save_as|save-as-dialog|save_as_dialog|revert-to-saved|revert_to_saved|revert_to_saved_dialog|include-file|include_file|include-file-dialog|include_file_dialog|load-macro-file|load_macro_file|load-macro-file-dialog|load_macro_file_dialog|load-tags-file|load_tags_file|load-tags-file-dialog|load_tags_file_dialog|unload_tags_file|load_tips_file|load_tips_file_dialog|unload_tips_file|print|print-selection|print_selection|exit|undo|redo|delete|select-all|select_all|shift-left|shift_left|shift-left-by-tab|shift_left_by_tab|shift-right|shift_right|shift-right-by-tab|shift_right_by_tab|find|find-dialog|find_dialog|find-again|find_again|find-selection|find_selection|find_incremental|start_incremental_find|replace|replace-dialog|replace_dialog|replace-all|replace_all|replace-in-selection|replace_in_selection|replace-again|replace_again|replace_find|replace_find_same|replace_find_again|goto-line-number|goto_line_number|goto-line-number-dialog|goto_line_number_dialog|goto-selected|goto_selected|mark|mark-dialog|mark_dialog|goto-mark|goto_mark|goto-mark-dialog|goto_mark_dialog|match|select_to_matching|goto_matching|find-definition|find_definition|show_tip|split-pane|split_pane|close-pane|close_pane|detach_document(?:_dialog)?|move_document_dialog|(?:next|previous|last)_document|uppercase|lowercase|fill-paragraph|fill_paragraph|control-code-dialog|control_code_dialog|filter-selection-dialog|filter_selection_dialog|filter-selection|filter_selection|execute-command|execute_command|execute-command-dialog|execute_command_dialog|execute-command-line|execute_command_line|shell-menu-command|shell_menu_command|macro-menu-command|macro_menu_command|bg_menu_command|post_window_bg_menu|post_tab_context_menu|beginning-of-selection|beginning_of_selection|end-of-selection|end_of_selection|repeat_macro|repeat_dialog|raise_window|focus_pane|set_statistics_line|set_incremental_search_line|set_show_line_numbers|set_auto_indent|set_wrap_text|set_wrap_margin|set_highlight_syntax|set_make_backup_copy|set_incremental_backup|set_show_matching|set_match_syntax_based|set_overtype_mode|set_locked|set_tab_dist|set_em_tab_dist|set_use_tabs|set_fonts|set_language_mode)(?=\\s*\\()\":::Subroutine::\n\
         Text Actions:\"<(?:self-insert|self_insert|grab-focus|grab_focus|extend-adjust|extend_adjust|extend-start|extend_start|extend-end|extend_end|secondary-adjust|secondary_adjust|secondary-or-drag-adjust|secondary_or_drag_adjust|secondary-start|secondary_start|secondary-or-drag-start|secondary_or_drag_start|process-bdrag|process_bdrag|move-destination|move_destination|move-to|move_to|move-to-or-end-drag|move_to_or_end_drag|end_drag|copy-to|copy_to|copy-to-or-end-drag|copy_to_or_end_drag|exchange|process-cancel|process_cancel|paste-clipboard|paste_clipboard|copy-clipboard|copy_clipboard|cut-clipboard|cut_clipboard|copy-primary|copy_primary|cut-primary|cut_primary|newline|newline-and-indent|newline_and_indent|newline-no-indent|newline_no_indent|delete-selection|delete_selection|delete-previous-character|delete_previous_character|delete-next-character|delete_next_character|delete-previous-word|delete_previous_word|delete-next-word|delete_next_word|delete-to-start-of-line|delete_to_start_of_line|delete-to-end-of-line|delete_to_end_of_line|forward-character|forward_character|backward-character|backward_character|key-select|key_select|process-up|process_up|process-down|process_down|process-shift-up|process_shift_up|process-shift-down|process_shift_down|process-home|process_home|forward-word|forward_word|backward-word|backward_word|forward-paragraph|forward_paragraph|backward-paragraph|backward_paragraph|beginning-of-line|beginning_of_line|end-of-line|end_of_line|beginning-of-file|beginning_of_file|end-of-file|end_of_file|next-page|next_page|previous-page|previous_page|page-left|page_left|page-right|page_right|toggle-overstrike|toggle_overstrike|scroll-up|scroll_up|scroll-down|scroll_down|scroll_left|scroll_right|scroll-to-line|scroll_to_line|select-all|select_all|deselect-all|deselect_all|focusIn|focusOut|process-return|process_return|process-tab|process_tab|insert-string|insert_string|mouse_pan)(?=\\s*\\()\":::Subroutine::\n\
         Keyword:\"<(?:break|continue|define|delete|else|for|if|in|return|while)>\":::Keyword::\n\
         Braces:\"[{}\\[\\]]\":::Keyword::\n\
         Global Variable:\"\\$[A-Za-z0-9_]+\":::Identifier1::\n\
diff --quilt old/source/interpret.c new/source/interpret.c
--- old/source/interpret.c
+++ new/source/interpret.c
@@ -199,11 +199,11 @@ static SparseArrayEntryWrapper *Allocate
 
 /* Message strings used in macros (so they don't get repeated every time
    the macros are used */
 static const char *StackOverflowMsg = "macro stack overflow";
 static const char *StackUnderflowMsg = "macro stack underflow";
-static const char *StringToNumberMsg = "string could not be converted to number";
+static const char* StringToNumberMsg = "string '%s' could not be converted to number";
 
 /* Temporary global data for use while accumulating programs */
 static Symbol *LocalSymList = NULL;     /* symbols local to the program */
 static Inst Prog[PROGRAM_SIZE];         /* the program */
 static Inst *ProgP;                     /* next free spot for code gen. */
@@ -597,10 +597,13 @@ int ContinueMacro(RestartData *continuat
     ErrMsg = NULL;
     for (;;) {
        
        /* Execute an instruction */
        inst = PC++;
+//        fprintf(stderr, "inst->sym->name: %s\n", inst->sym->name);
+//         fprintf(stderr, "inst->sym->type: %d\n", inst->sym->type);
+//         fprintf(stderr, "inst->sym->value.tag: %d\n", inst->sym->value.tag);
        status = (inst->func)();
        
        /* If error return was not STAT_OK, return to caller */
        if (status != STAT_OK) {
            if (status == STAT_PREEMPT) {
@@ -1198,12 +1201,13 @@ static void freeSymbolTable(Symbol *symT
 #define POP_INT(number) \
     if (StackP == TheStack) \
        return execError(StackUnderflowMsg, ""); \
     --StackP; \
     if (StackP->tag == STRING_TAG) { \
-       if (!StringToNum(StackP->val.str.rep, &number)) \
-           return execError(StringToNumberMsg, ""); \
+        if (!StringToNum(StackP->val.str.rep, &number)) {\
+            return execError(StringToNumberMsg, StackP->val.str.rep); \
+        } \
     } else if (StackP->tag == INT_TAG) \
         number = StackP->val.n; \
     else \
         return(execError("can't convert array to integer", NULL));
 
@@ -1316,13 +1320,17 @@ static int pushSymVal(void)
            return execError(errMsg, s->name);
         }
        *StackP = result;
     } else
        return execError("reading non-variable: %s", s->name);
+
+/*  typeof()
     if (StackP->tag == NO_TAG) {
-       return execError("variable not set: %s", s->name);
+        return execError("variable not set: %s", s->name);
     }
+*/
+
     StackP++;
     if (StackP >= &TheStack[STACK_SIZE]) {
        return execError(StackOverflowMsg, "");
     }
     return STAT_OK;
@@ -1423,13 +1431,15 @@ static int pushArraySymVal(void)
     if (initEmpty && dataPtr->tag == NO_TAG) {
         dataPtr->tag = ARRAY_TAG;
         dataPtr->val.arrayPtr = ArrayNew();
     }
 
+/*  typeof()
     if (dataPtr->tag == NO_TAG) {
         return execError("variable not set: %s", sym->name);
     }
+*/
 
     *StackP = *dataPtr;
     StackP++;
 
     if (StackP >= &TheStack[STACK_SIZE]) {
@@ -3081,17 +3091,21 @@ static int arrayRef(void)
         }
 
         POP(srcArray)
         if (srcArray.tag == ARRAY_TAG) {
             if (!ArrayGet(&srcArray, keyString, &valueItem)) {
-                return(execError("referenced array value not in array: %s", keyString));
+/*typeof()                return(execError("referenced array value not in array: %s", keyString));*/
+                valueItem.tag = NO_TAG;
             }
             PUSH(valueItem)
             return(STAT_OK);
         }
         else {
-            return(execError("operator [] on non-array", NULL));
+/*typeof()            return(execError("operator [] on non-array", NULL));*/
+            valueItem.tag = NO_TAG;
+            PUSH(valueItem)
+            return(STAT_OK);
         }
     }
     else {
         POP(srcArray)
         if (srcArray.tag == ARRAY_TAG) {
@@ -3494,10 +3508,11 @@ static int execError(const char *s1, con
     static char msg[MAX_ERR_MSG_LEN];
     static char *err = NULL;
     static int errlen = 0;
     
     sprintf(msg, s1, s2);
+    msg[MAX_ERR_MSG_LEN - 1] = '\0';
     ErrMsg = stackDumpStr(FrameP, msg, &err, &errlen);
     return STAT_ERROR;
 }
 
 int StringToNum(const char *string, int *number)
diff --quilt old/source/macro.c new/source/macro.c
--- old/source/macro.c
+++ new/source/macro.c
@@ -30,35 +30,35 @@ static const char CVSID[] = "$Id: macro.
 
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
 #endif
 
+#include "calltips.h"
+#include "highlightData.h"
+#include "highlight.h"
+#include "interpret.h"
 #include "macro.h"
-#include "textBuf.h"
-#include "text.h"
 #include "nedit.h"
-#include "window.h"
-#include "preferences.h"
-#include "interpret.h"
 #include "parse.h"
+#include "preferences.h"
+#include "rangeset.h"
+#include "rbTree.h"
 #include "search.h"
+#include "selection.h"
 #include "server.h"
 #include "shell.h"
 #include "smartIndent.h"
-#include "userCmds.h"
-#include "selection.h"
-#include "rbTree.h"
 #include "tags.h"
-#include "calltips.h"
+#include "textBuf.h"
+#include "text.h"
+#include "userCmds.h"
+#include "window.h"
 #include "../util/DialogF.h"
-#include "../util/misc.h"
 #include "../util/fileUtils.h"
-#include "../util/utils.h"
 #include "../util/getfiles.h"
-#include "highlight.h"
-#include "highlightData.h"
-#include "rangeset.h"
+#include "../util/misc.h"
+#include "../util/utils.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
@@ -75,26 +75,27 @@ static const char CVSID[] = "$Id: macro.
 #ifndef __MVS__
 #include <sys/param.h>
 #endif
 #include <fcntl.h>
 #endif /*VMS*/
+#include <stdarg.h>
 
 #include <X11/Intrinsic.h>
 #include <X11/keysym.h>
 #include <Xm/Xm.h>
 #include <Xm/CutPaste.h>
+#include <Xm/DialogS.h>
 #include <Xm/Form.h>
-#include <Xm/RowColumn.h>
 #include <Xm/LabelG.h>
 #include <Xm/List.h>
-#include <Xm/ToggleB.h>
-#include <Xm/DialogS.h>
 #include <Xm/MessageB.h>
-#include <Xm/SelectioB.h>
 #include <Xm/PushB.h>
-#include <Xm/Text.h>
+#include <Xm/RowColumn.h>
+#include <Xm/SelectioB.h>
 #include <Xm/Separator.h>
+#include <Xm/Text.h>
+#include <Xm/ToggleB.h>
 
 #ifdef HAVE_DEBUG_H
 #include "../debug.h"
 #endif
 
@@ -233,10 +234,12 @@ static void stringDialogCloseCB(Widget w
 static void stringDialogEscCB(Widget w, XtPointer clientData, XEvent *event,
        Boolean *cont);
 #endif /* LESSTIF_VERSION */
 static int calltipMS(WindowInfo *window, DataValue *argList, int nArgs,
        DataValue *result, char **errMsg);
+static int highlightCTLineMS(WindowInfo* window, DataValue* argList, int nArgs,
+        DataValue* result, char** errMsg);
 static int killCalltipMS(WindowInfo *window, DataValue *argList, int nArgs,
        DataValue *result, char **errMsg);
 /* T Balinski */
 static int listDialogMS(WindowInfo *window, DataValue *argList, int nArgs,
        DataValue *result, char **errMsg);
@@ -350,19 +353,21 @@ static int calltipIDMV(WindowInfo *windo
 static int readSearchArgs(DataValue *argList, int nArgs, int*searchDirection,
        int *searchType, int *wrap, char **errMsg);
 static int wrongNArgsErr(char **errMsg);
 static int tooFewArgsErr(char **errMsg);
 static int strCaseCmp(char *str1, char *str2);
-static int readIntArg(DataValue dv, int *result, char **errMsg);
+static Boolean readIntArg(DataValue dv, int *result, char **errMsg);
 static int readStringArg(DataValue dv, char **result, char *stringStorage,
        char **errMsg);
 /* DISABLED FOR 5.4
 static int backlightStringMV(WindowInfo *window, DataValue *argList,
        int nArgs, DataValue *result, char **errMsg);
 */
 static int rangesetListMV(WindowInfo *window, DataValue *argList,
        int nArgs, DataValue *result, char **errMsg);
+static int neditHomeMV(WindowInfo* window, DataValue* argList, int nArgs,
+        DataValue* result, char** errMsg);
 static int versionMV(WindowInfo* window, DataValue* argList, int nArgs,
         DataValue* result, char** errMsg);
 static int rangesetCreateMS(WindowInfo *window, DataValue *argList, int nArgs,
       DataValue *result, char **errMsg);
 static int rangesetDestroyMS(WindowInfo *window, DataValue *argList, int nArgs,
@@ -405,10 +410,12 @@ static int getStyleAtPosMS(WindowInfo *w
         DataValue *result, char **errMsg);
 static int filenameDialogMS(WindowInfo* window, DataValue* argList, int nArgs,
         DataValue* result, char** errMsg);
 static int callMS(WindowInfo *window, DataValue *argList,
         int nArgs, DataValue *result, char **errMsg);
+static int typeofMS(WindowInfo* window, DataValue* argList, int nArgs,
+        DataValue* result, char** errMsg);
 
 /* Built-in subroutines and variables for the macro language */
 static const BuiltInSubrName MacroSubrs[] = {
     { "length", lengthMS },
     { "get_range", getRangeMS },
@@ -444,10 +451,11 @@ static const BuiltInSubrName MacroSubrs[
     { "getenv", getenvMS },
     { "string_compare", stringCompareMS },
     { "split", splitMS },
     { "calltip", calltipMS },
     { "kill_calltip", killCalltipMS },
+    { "highlight_calltip_line", highlightCTLineMS },
 /* DISABLED for 5.4
     { "set_backlight_string", setBacklightStringMS },
 */
     { "rangeset_create", rangesetCreateMS },
     { "rangeset_destroy", rangesetDestroyMS },
@@ -465,10 +473,11 @@ static const BuiltInSubrName MacroSubrs[
     { "get_pattern_at_pos", getPatternAtPosMS },
     { "get_style_by_name", getStyleByNameMS },
     { "get_style_at_pos", getStyleAtPosMS },
     { "filename_dialog", filenameDialogMS },
     { "call", callMS },
+    { "typeof", typeofMS },
     { NULL, NULL } /* sentinel */
 };
 
 static const BuiltInSubrName SpecialVars[] = {
     { "$cursor", cursorMV },
@@ -519,10 +528,11 @@ static const BuiltInSubrName SpecialVars
 /* DISABLED for 5.4
     { "$backlight_string", backlightStringMV },
 */
     { "$rangeset_list", rangesetListMV },
     { "$VERSION", versionMV },
+    { "$NEDIT_HOME", neditHomeMV },
     { NULL, NULL } /* sentinel */
 };
 
 /* Global symbols for "returning" secondary values from built-in functions */
 static int STRING_DIALOG_BUTTON, SEARCH_END, READ_STATUS,
@@ -3420,10 +3430,61 @@ bad_arg:
     *errMsg = "unrecognized argument to %s";
     return False;
 }
 
 /*
+**  highlight_calltip_line(ctID, line)
+*/
+static int highlightCTLineMS(WindowInfo* window, DataValue* argList, int nArgs,
+        DataValue* result, char** errMsg)
+{
+    int calltipID = 0;
+    int line;
+    int highlightResult;
+
+    if (2 != nArgs) {
+        *errMsg = "%s() called with wrong number of arguments";
+        return False;
+    }
+
+    if (!readIntArg(argList[0], &calltipID, errMsg)) {
+        *errMsg = "%s(): Could not read calltip ID from argument 1";
+        return False;
+    }
+
+    /*  The macro function calltip() uses 0 to report an error. Catch sloppy
+        programmers who just feed this value into this function.  */
+    if (0 == calltipID) {
+        *errMsg = "%s(): Invalid calltip ID 0";
+        return False;
+    }
+
+    if (!readIntArg(argList[1], &line, errMsg) || line < 0) {
+        *errMsg = "%s(): Could not read line number from argument 2";
+        return False;
+    }
+
+    result->tag = NO_TAG;
+
+    highlightResult = HighlightCalltipLine(window, calltipID, (unsigned) line);
+
+    if (CT_INVALID_ID == highlightResult) {
+        /*  Fail only if the calltip ID given is invalid.  */
+        *errMsg = "%s(): Invalid calltip ID";
+        return False;
+    }
+
+    /*  In case NEdit ever gets a warning (!= error) mechanism:
+    if (CT_NOLINE == highlightResult) {
+        *warnMsg = "%s(): Calltip line out of range";
+    }
+    */
+
+    return True;
+}
+
+/*
 ** A subroutine to kill the current calltip
 */
 static int killCalltipMS(WindowInfo *window, DataValue *argList, int nArgs,
       DataValue *result, char **errMsg)
 {
@@ -3449,11 +3510,11 @@ static int killCalltipMS(WindowInfo *win
  */
 static int calltipIDMV(WindowInfo *window, DataValue *argList, 
         int nArgs, DataValue *result, char **errMsg)
 {
     result->tag = INT_TAG;
-    result->val.n = GetCalltipID(window, 0);
+    result->val.n = GetCalltipID(window);
     return True;
 }
 
 /*
 **  filename_dialog([title[, mode[, defaultPath[, filter[, defaultName]]]]])
@@ -3478,19 +3539,20 @@ static int calltipIDMV(WindowInfo *windo
 */
 static int filenameDialogMS(WindowInfo* window, DataValue* argList, int nArgs,
         DataValue* result, char** errMsg)
 {
     char stringStorage[5][TYPE_INT_STR_SIZE(int)];
-    char filename[MAXPATHLEN + 1];
     char* title = "Choose Filename";
     char* mode = "exist";
     char* defaultPath = "";
     char* filter = "";
     char* defaultName = "";
     char* orgDefaultPath;
     char* orgFilter;
-    int gfnResult;
+    gfbdParams params;
+    gfbdValue* gfbdrc;
+    int rc = False;
 
     /* Ignore the focused window passed as the function argument and put
        the dialog up over the window which is executing the macro */
     window = MacroRunWindow();
 
@@ -3545,37 +3607,56 @@ static int filenameDialogMS(WindowInfo* 
     orgFilter = GetFileDialogDefaultPattern();
     if ('\0' != filter[0]) {
         SetFileDialogDefaultPattern(filter);
     }
 
-    /*  Fork to one of the worker methods from util/getfiles.c.
-        (This should obviously be refactored.)  */
-    if (0 == strcmp(mode, "exist")) {
-        gfnResult = GetExistingFilename(window->shell, title, filename);
-    } else {
-        gfnResult = GetNewFilename(window->shell, title, filename, defaultName);
-    }   /*  Invalid values are weeded out above.  */ 
+    params.dialogTitle = title;
+    params.parentShell = window->shell;
+    params.fileExists = (0 == strcmp(mode, "exist")) ? True : False;
+    params.textfieldLabel = "New File Name";
+    params.defaultName = (0 == strcmp("", defaultName)) ? NULL : defaultName;
+    params.haveFormatButtons = False;
+    /*  ...so no file format for wrap info necessary.  */
+    params.showHidden = GetPrefShowHiddenFiles();
+
+    gfbdrc = GetFilenameByDialog(params);
 
     /*  Reset original values and free temps  */
     SetFileDialogDefaultDirectory(orgDefaultPath);
     SetFileDialogDefaultPattern(orgFilter);
     XtFree(orgDefaultPath);
     XtFree(orgFilter);
 
     result->tag = STRING_TAG;
-    if (GFN_OK == gfnResult) {
-        /*  Got a string, copy it to the result  */
-        if (!AllocNStringNCpy(&result->val.str, filename, MAXPATHLEN)) {
-            M_FAILURE("failed to allocate return value: %s");
-        }
-    } else {
-        /* User cancelled.  Return "" */
-        result->val.str.rep = PERM_ALLOC_STR("");
-        result->val.str.len = 0;
+    switch(gfbdrc->status) {
+        case GFDB_OK:
+            /*  Got a filename, copy it to the result  */
+            if (!AllocNStringNCpy(&result->val.str, gfbdrc->payload, MAXPATHLEN)) {
+                M_FAILURE("failed to allocate return value: %s");
+            }
+            rc = True;
+            break;
+        case GFDB_CANCEL:
+            /* User cancelled.  Return "" */
+            result->val.str.rep = PERM_ALLOC_STR("");
+            result->val.str.len = 0;
+            rc = True;
+            break;
+        case GFDB_ERROR:
+            fprintf(stderr, "nedit: Error while calling GetFilenameByDialog(): %s\n", gfbdrc->payload);
+            *errMsg = "Error while calling GetFilenameByDialog() in %s";
+            rc = False;
+            break;
+        default:
+            /*  fallback  */
+            fprintf(stderr, "nedit: Unexpected error in GetFilenameByDialog().\n");
+            *errMsg = "Unexpected error in GetFilenameByDialog() in %s";
+            rc = False;
+            break;
     }
 
-    return True;
+    return rc;
 }
 
 /*
  * call(fnname, arg, ...)
  */
@@ -4764,10 +4845,31 @@ static int versionMV(WindowInfo* window,
     result->val.n = version;
     return True;
 }
 
 /*
+**  Returns the name of the directory where NEdit's run control files reside.
+**  This is either the value of the environmental variable $NEDIT_HOME, the
+**  default of ~/.nedit or $HOME. (See the online documentation for details
+**  about the algorithm.)
+*/
+static int neditHomeMV(WindowInfo* window, DataValue* argList, int nArgs,
+        DataValue* result, char** errMsg)
+{
+    const char* neditRCName = GetRCFileName(NEDIT_RC);
+    char nedit_home[MAXPATHLEN];
+
+    if (0 != ParseFilename(neditRCName, NULL, nedit_home)) {
+        M_FAILURE("Unable to parse nedit rc file name in %s");
+    }
+
+    result->tag = STRING_TAG;
+    AllocNStringCpy(&result->val.str, nedit_home);
+    return True;
+}
+
+/*
 ** Built-in macro subroutine to create a new rangeset or rangesets.  
 ** If called with one argument: $1 is the number of rangesets required and 
 ** return value is an array indexed 0 to n, with the rangeset labels as values;
 ** (or an empty array if the requested number of rangesets are not available).
 ** If called with no arguments, returns a single rangeset label (not an array),
@@ -5854,10 +5956,56 @@ static int getPatternAtPosMS(WindowInfo 
     return fillPatternResult(result, errMsg, window,
         HighlightNameOfCode(window, patCode), False, True,
         HighlightStyleOfCode(window, patCode), bufferPos);
 }
 
+/*
+** Returns a string containing a flag indicating the arguments type:
+**  ARRAY       - Argument is an array
+**  INTEGER     - Argument is an integer or a string that can be cleanly
+**                transformed into an integer.
+**  STRING      - Argument is a string that cannot be cleanly transformed
+**                into an integer.
+**  UNDEFINED   - Argument is undefined. No support for void functions though.
+*/
+static int typeofMS(WindowInfo* window, DataValue* argList, int nArgs,
+        DataValue* result, char** errMsg)
+{
+    int buffer;
+
+    /*  Validate number of arguments.  */
+    if (1 != nArgs) {
+        return wrongNArgsErr(errMsg);
+    }
+
+    /*  Prepare result.  */
+    result->tag = STRING_TAG;
+
+    switch (argList[0].tag) {
+        case STRING_TAG:
+            if (readIntArg(argList[0], &buffer, errMsg)) {
+                AllocNStringCpy(&result->val.str, "INTEGER");
+            } else {
+                AllocNStringCpy(&result->val.str, "STRING");
+            }
+        break;
+        case INT_TAG:
+            AllocNStringCpy(&result->val.str, "INTEGER");
+        break;
+        case ARRAY_TAG:
+            AllocNStringCpy(&result->val.str, "ARRAY");
+        break;
+        case NO_TAG:
+            AllocNStringCpy(&result->val.str, "UNDEFINED");
+        break;
+        default:
+            fprintf(stderr, "nedit: Internal error: Invalid type in typeofMS().\n");
+    }
+
+    return True;
+}
+
 static int wrongNArgsErr(char **errMsg)
 {
     *errMsg = "Wrong number of arguments to function %s";
     return False;
 }
@@ -5901,11 +6049,11 @@ static int strCaseCmp(char *str1, char *
 /*
 ** Get an integer value from a tagged DataValue structure.  Return True
 ** if conversion succeeded, and store result in *result, otherwise
 ** return False with an error message in *errMsg.
 */
-static int readIntArg(DataValue dv, int *result, char **errMsg)
+static Boolean readIntArg(DataValue dv, int *result, char **errMsg)
 {
     char *c;
     
     if (dv.tag == INT_TAG) {
        *result = dv.val.n;
@@ -5944,5 +6092,46 @@ static int readStringArg(DataValue dv, c
        return True;
     }
     *errMsg = "%s called with unknown object";
     return False;
 }
+
+/*  rough hack  */
+void MacroApplyHook(const WindowInfo* document, const char* hook, int argc,
+        DataValue* argv, DataValue* resultDV)
+{
+    Symbol* hookSymbol;
+
+    hookSymbol = LookupSymbol(hook);
+    if (NULL != hookSymbol && MACRO_FUNCTION_SYM == hookSymbol->type) {
+        Program* hookProg = hookSymbol->value.val.prog;
+        RestartData* restartData;
+        DataValue dummyResultDV;    /* Passed to ExecuteMacro() if no result requested */
+        int status;
+        char* errMsg;
+//         char statusT[1024];
+
+        /*  Let 'er rip  */
+        status = ExecuteMacro((WindowInfo*) document, hookProg, argc, argv,
+                (NULL == resultDV) ? &dummyResultDV : resultDV, &restartData,
+                &errMsg);
+//         switch (status)
+//         {
+//             case 0: strncpy(statusT, "MACRO_TIME_LIMIT", 1024); break;
+//             case 1: strncpy(statusT, "MACRO_PREEMPT", 1024); break;
+//             case 2: strncpy(statusT, "MACRO_DONE", 1024); break;
+//             case 3: strncpy(statusT, "MACRO_ERROR", 1024); break;
+//             default: strncpy(statusT, "UNKNOWN_ERROR", 1024);
+//         }
+//         fprintf(stderr, "\tstatus: %s\n", statusT);
+        while (MACRO_TIME_LIMIT == status) {
+            status = ContinueMacro(restartData,
+                    (NULL == resultDV) ? &dummyResultDV : resultDV, &errMsg);
+        }
+
+        if (MACRO_PREEMPT == status || MACRO_ERROR == status) {
+            fprintf(stderr, "nedit: \"%s\" error: %s\n", hook, (MACRO_ERROR == status) ? errMsg : "No dialogs");
+        } else {
+            /*  Macro is done here  */
+        }
+    }
+}
diff --quilt old/source/macro.h new/source/macro.h
--- old/source/macro.h
+++ new/source/macro.h
@@ -71,7 +71,10 @@ int ReadMacroString(WindowInfo *window, 
 int CheckMacroString(Widget dialogParent, char *string, const char *errIn,
        char **errPos);
 char *GetReplayMacro(void);
 void ReadMacroInitFile(WindowInfo *window);
 void ReturnShellCommandOutput(WindowInfo *window, const char *outText, int status);
+struct DataValueTag;
+void MacroApplyHook(const WindowInfo* document, const char *hook, int argc,
+        struct DataValueTag* argv, struct DataValueTag* resultDV);
 
 #endif /* NEDIT_MACRO_H_INCLUDED */
diff --quilt old/source/menu.c new/source/menu.c
--- old/source/menu.c
+++ new/source/menu.c
@@ -50,10 +50,11 @@ static const char CVSID[] = "$Id: menu.c
 #include "highlight.h"
 #include "highlightData.h"
 #include "interpret.h"
 #include "smartIndent.h"
 #include "windowTitle.h"
+#include "regularExp.h"
 #include "../util/getfiles.h"
 #include "../util/DialogF.h"
 #include "../util/misc.h"
 #include "../util/fileUtils.h"
 #include "../util/utils.h"
@@ -177,10 +178,13 @@ static void bgMenuDefCB(Widget w, Window
 static void searchDlogsDefCB(Widget w, WindowInfo *window, caddr_t callData);
 static void beepOnSearchWrapDefCB(Widget w, WindowInfo *window, caddr_t callData);
 static void keepSearchDlogsDefCB(Widget w, WindowInfo *window,
        caddr_t callData);
 static void searchWrapsDefCB(Widget w, WindowInfo *window, caddr_t callData);
+static void showHiddenFilesCB(Widget w, WindowInfo* window, caddr_t callData);
+static void showCursorlineCB(Widget widget, WindowInfo* window,
+        caddr_t callData);
 static void appendLFCB(Widget w, WindowInfo* window, caddr_t callData);
 static void sortOpenPrevDefCB(Widget w, WindowInfo *window, caddr_t callData);
 static void reposDlogsDefCB(Widget w, WindowInfo *window, caddr_t callData);
 static void autoScrollDefCB(Widget w, WindowInfo *window, caddr_t callData);
 static void modWarnDefCB(Widget w, WindowInfo *window, caddr_t callData);
@@ -189,10 +193,12 @@ static void exitWarnDefCB(Widget w, Wind
 static void searchLiteralCB(Widget w, WindowInfo *window, caddr_t callData);
 static void searchCaseSenseCB(Widget w, WindowInfo *window, caddr_t callData);
 static void searchLiteralWordCB(Widget w, WindowInfo *window, caddr_t callData);
 static void searchCaseSenseWordCB(Widget w, WindowInfo *window, caddr_t callData);
 static void searchRegexNoCaseCB(Widget w, WindowInfo *window, caddr_t callData);
+static void searchRegexSmartCaseCB(Widget toggleButton, WindowInfo* windowInfo,
+        caddr_t callData);
 static void searchRegexCB(Widget w, WindowInfo *window, caddr_t callData);
 #ifdef REPLACE_SCOPE
 static void replaceScopeWindowCB(Widget w, WindowInfo *window, caddr_t callData);
 static void replaceScopeSelectionCB(Widget w, WindowInfo *window, caddr_t callData);
 static void replaceScopeSmartCB(Widget w, WindowInfo *window, caddr_t callData);
@@ -392,10 +398,12 @@ static void setAutoIndentAP(Widget w, XE
     Cardinal *nArgs);
 static void setWrapTextAP(Widget w, XEvent *event, String *args,
     Cardinal *nArgs);
 static void setWrapMarginAP(Widget w, XEvent *event, String *args,
     Cardinal *nArgs);
+static void setShowWrapMarginAP(Widget w, XEvent *event, String *args,
+    Cardinal *nArgs);
 static void setHighlightSyntaxAP(Widget w, XEvent *event, String *args,
     Cardinal *nArgs);
 static void setMakeBackupCopyAP(Widget w, XEvent *event, String *args,
     Cardinal *nArgs);
 static void setIncrementalBackupAP(Widget w, XEvent *event, String *args,
@@ -406,10 +414,12 @@ static void setMatchSyntaxBasedAP(Widget
     Cardinal *nArgs);
 static void setOvertypeModeAP(Widget w, XEvent *event, String *args,
     Cardinal *nArgs);
 static void setLockedAP(Widget w, XEvent *event, String *args,
     Cardinal *nArgs);
+static void setTransientAP(Widget text, XEvent* event, String* args,
+        Cardinal* nArgs);
 static void setUseTabsAP(Widget w, XEvent *event, String *args,
     Cardinal *nArgs);
 static void setEmTabDistAP(Widget w, XEvent *event, String *args,
     Cardinal *nArgs);
 static void setTabDistAP(Widget w, XEvent *event, String *args,
@@ -566,19 +576,21 @@ static XtActionsRec Actions[] = {
     {"set_incremental_search_line", setIncrementalSearchLineAP},
     {"set_show_line_numbers", setShowLineNumbersAP},
     {"set_auto_indent", setAutoIndentAP},
     {"set_wrap_text", setWrapTextAP},
     {"set_wrap_margin", setWrapMarginAP},
+    {"set_show_wrap_margin", setShowWrapMarginAP},
     {"set_highlight_syntax", setHighlightSyntaxAP},
 #ifndef VMS
     {"set_make_backup_copy", setMakeBackupCopyAP},
 #endif
     {"set_incremental_backup", setIncrementalBackupAP},
     {"set_show_matching", setShowMatchingAP},
     {"set_match_syntax_based", setMatchSyntaxBasedAP},
     {"set_overtype_mode", setOvertypeModeAP},
     {"set_locked", setLockedAP},
+    {"set_transient", setTransientAP},
     {"set_tab_dist", setTabDistAP},
     {"set_em_tab_dist", setEmTabDistAP},
     {"set_use_tabs", setUseTabsAP},
     {"set_fonts", setFontsAP},
     {"set_language_mode", setLanguageModeAP}
@@ -813,10 +825,13 @@ Widget CreateMenuBar(Widget parent, Wind
     XtSetSensitive(window->showTipItem, (TagsFileList != NULL || 
                                          TipsFileList != NULL) );
     
     /*
     ** Preferences menu, Default Settings sub menu
+    **
+    ** Mnemonics:   L, A, W, C, T, F, u, d, g, H, S, i, N, e, B, M, o, P, r, z
+    **              A, B, C, d, e, F, g, H, i, L, M, N, o, P, r, S, T, u, W, z
     */
     menuPane = createMenu(menuBar, "preferencesMenu", "Preferences", 0, NULL,
            SHORT);
     subPane = createMenu(menuPane, "defaultSettings", "Default Settings", 'D',
            NULL, FULL);
@@ -926,12 +941,17 @@ Widget CreateMenuBar(Widget parent, Wind
            GetPrefSearch() == SEARCH_CASE_SENSE_WORD, FULL);
     window->searchRegexDefItem = createMenuToggle(subSubSubPane,
            "regularExpression", "Regular Expression", 'R', searchRegexCB,
            window, GetPrefSearch() == SEARCH_REGEX, FULL);
     window->searchRegexNoCaseDefItem = createMenuToggle(subSubSubPane,
-           "regularExpressionNoCase", "Regular Expression, Case Insensitive", 'I', searchRegexNoCaseCB, window,
-           GetPrefSearch() == SEARCH_REGEX_NOCASE, FULL);
+            "regularExpressionNoCase", "Regular Expression, Case Insensitive",
+            'I', searchRegexNoCaseCB, window,
+            GetPrefSearch() == SEARCH_REGEX_NOCASE, FULL);
+    window->searchRegexSmartCaseDefItem = createMenuToggle(subSubSubPane,
+            "regularExpressionSmartCase", "Regular Expression, Smart Case",
+            'S', searchRegexSmartCaseCB, window,
+            GetPrefSearch() == SEARCH_REGEX_SMARTCASE, FULL);
 #ifdef REPLACE_SCOPE
     subSubSubPane = createMenu(subSubPane, "defaultReplaceScope",
            "Default Replace Scope", 'R', NULL, FULL);
     XtVaSetValues(subSubSubPane, XmNradioBehavior, True, NULL); 
     window->replScopeWinDefItem = createMenuToggle(subSubSubPane, "window",
@@ -1015,10 +1035,20 @@ Widget CreateMenuBar(Widget parent, Wind
     createMenuSeparator(subSubPane, "sep", SHORT);
     window->matchSyntaxBasedDefItem = createMenuToggle(subSubPane, 
           "matchSyntax", "Syntax Based", 'S', matchSyntaxBasedDefCB, window,
            GetPrefMatchSyntaxBased(), SHORT);
 
+    /* Show Hidden Files */
+    window->showHiddenFilesItem = createMenuToggle(subPane,
+            "showHiddenFilesItem", "Show hidden Files", 'y', showHiddenFilesCB,
+            NULL, GetPrefShowHiddenFiles(), FULL);
+
+    /*  Show Cursorline  */
+    window->showCursorlineItem = createMenuToggle(subPane,
+            "showCursorlineItem", "Show Cursorline", 'x', showCursorlineCB,
+            NULL, GetPrefShowCursorline(), FULL);
+
     /* Append LF at end of files on save */
     window->appendLFItem = createMenuToggle(subPane, "appendLFItem",
             "Terminate with Line Break on Save", 'v', appendLFCB, NULL,
             GetPrefAppendLF(), FULL);
 
@@ -1141,10 +1171,12 @@ Widget CreateMenuBar(Widget parent, Wind
     createMenuSeparator(menuPane, "sep2", SHORT);
     window->overtypeModeItem = createMenuToggle(menuPane, "overtype", "Overtype", 'O',
            doActionCB, "set_overtype_mode", False, SHORT);
     window->readOnlyItem = createMenuToggle(menuPane, "readOnly", "Read Only",
            'y', doActionCB, "set_locked", IS_USER_LOCKED(window->lockReasons), FULL);
+    window->transientItem = createMenuToggle(menuPane, "transient", "Transient",
+            'r', doActionCB, "set_transient", window->transient, FULL);
 #endif
 
 #ifndef VMS
     /*
     ** Create the Shell menu
@@ -1999,16 +2031,17 @@ static void showMatchingRangeDefCB(Widge
 {
     WindowInfo *win;
 
     /* Set the preference and make the other windows' menus agree */
     SetPrefShowMatching(FLASH_RANGE);
-    for (win=WindowList; win!=NULL; win=win->next) {
-       if (!IsTopDocument(win))
-           continue;
-       XmToggleButtonSetState(win->showMatchingOffDefItem, False, False);
-       XmToggleButtonSetState(win->showMatchingDelimitDefItem, False, False);
-       XmToggleButtonSetState(win->showMatchingRangeDefItem, True, False);
+    for (win = WindowList; win != NULL; win = win->next) {
+        if (!IsTopDocument(win)) {
+            continue;
+        }
+        XmToggleButtonSetState(win->showMatchingOffDefItem, False, False);
+        XmToggleButtonSetState(win->showMatchingDelimitDefItem, False, False);
+        XmToggleButtonSetState(win->showMatchingRangeDefItem, True, False);
     }
 }
 
 static void matchSyntaxBasedDefCB(Widget w, WindowInfo *window, caddr_t callData)
 {
@@ -2175,10 +2208,41 @@ static void searchWrapsDefCB(Widget w, W
        if (IsTopDocument(win))
            XmToggleButtonSetState(win->searchWrapsDefItem, state, False);
     }
 }
 
+static void showHiddenFilesCB(Widget widget, WindowInfo* unused,
+        caddr_t callData)
+{
+    WindowInfo *window;
+    Boolean state = XmToggleButtonGetState(widget);
+
+    SetPrefShowHiddenFiles(state);
+    for (window = WindowList; window != NULL; window = window->next) {
+        XmToggleButtonSetState(window->showHiddenFilesItem, state, False);
+    }
+}
+
+static void showCursorlineCB(Widget widget, WindowInfo* unused,
+        caddr_t callData)
+{
+    WindowInfo* window;
+    Boolean state = XmToggleButtonGetState(widget);
+
+    SetPrefShowCursorline(state);
+    for (window = WindowList; window != NULL; window = window->next) {
+        XmToggleButtonSetState(window->showCursorlineItem, state, False);
+
+        if (IsTopDocument(window)) {
+            Widget pane = (NULL == window->lastFocus
+                    ? window->textArea
+                    : window->lastFocus);
+            XtVaSetValues(pane, textNshowCursorline, state, NULL);
+        }
+    }
+}
+
 static void appendLFCB(Widget w, WindowInfo* window, caddr_t callData)
 {
     WindowInfo *win;
     int state = XmToggleButtonGetState(w);
 
@@ -2537,10 +2601,39 @@ static void searchRegexNoCaseCB(Widget w
            XmToggleButtonSetState(win->searchRegexNoCaseDefItem, True, False);
        }
     }
 }
 
+static void searchRegexSmartCaseCB(Widget toggleButton, WindowInfo* window,
+        caddr_t callData)
+{
+    WindowInfo* windowInfo;
+
+    /* Set the preference and make the other windows' menus agree */
+    if (XmToggleButtonGetState(toggleButton)) {
+        SetPrefSearch(SEARCH_REGEX_SMARTCASE);
+        for (windowInfo = WindowList;
+                windowInfo != NULL;
+                windowInfo = windowInfo->next) {
+            XmToggleButtonSetState(windowInfo->searchLiteralDefItem,
+                    False, False);
+            XmToggleButtonSetState(windowInfo->searchCaseSenseDefItem,
+                    False, False);
+            XmToggleButtonSetState(windowInfo->searchLiteralWordDefItem,
+                    False, False);
+            XmToggleButtonSetState(windowInfo->searchCaseSenseWordDefItem,
+                    False, False);
+            XmToggleButtonSetState(windowInfo->searchRegexDefItem,
+                    False, False);
+            XmToggleButtonSetState(windowInfo->searchRegexNoCaseDefItem,
+                    False, False);
+            XmToggleButtonSetState(windowInfo->searchRegexSmartCaseDefItem,
+                    True, False);
+        }
+    }
+}
+
 #ifdef REPLACE_SCOPE
 static void replaceScopeWindowCB(Widget w, WindowInfo *window, caddr_t callData)
 {
    WindowInfo *win;
 
@@ -2714,51 +2807,59 @@ static void unloadTipsFileMenuCB(Widget 
 */
 static void newAP(Widget w, XEvent *event, String *args, Cardinal *nArgs) 
 {
     WindowInfo *window = WidgetToWindow(w);
     int openInTab = GetPrefOpenInTab();
+    Boolean transient = False;
 
+    /*  Look for arguments managing the type of window requested and whether
+        or not the user wants to have a transient window. */
     if (*nArgs > 0) {
-        if (strcmp(args[0], "prefs") == 0) {
+        if (0 == strcmp(args[0], "prefs")) {
             /* accept default */;
-        }
-        else if (strcmp(args[0], "tab") == 0) {
+        } else if (0 == strcmp(args[0], "tab")) {
             openInTab = 1;
-        }
-        else if (strcmp(args[0], "window") == 0) {
+        } else if (0 == strcmp(args[0], "window")) {
             openInTab = 0;
-        }
-        else if (strcmp(args[0], "opposite") == 0) {
+        } else if (0 == strcmp(args[0], "opposite")) {
             openInTab = !openInTab;
-        }
-        else {
+        } else if (0 == strcmp(args[0], "transient")) {
+            transient = True;
+        } else {
             fprintf(stderr, "nedit: Unknown argument to action procedure \"new\": %s\n", args[0]);
         }
     }
-    
-    EditNewFile(openInTab? window : NULL, NULL, False, NULL, window->path);
+
+    /*  Catch transient if it comes after a window type argument  */
+    if (2 == *nArgs && (0 == strcmp(args[1], "transient"))) {
+        transient = True;
+    }
+
+    EditNewFile(openInTab? window : NULL, NULL, False, NULL, window->path,
+            transient);
     CheckCloseDim();
 }
 
 /*
-** These are just here because our techniques make it hard to bind a menu item
-** to an action procedure that takes arguments.  The user doesn't need to know
-** about them -- they can use new( "opposite" ) or new( "tab" ).
+**  newOppositeAP() and newTabAP() are just here because our techniques make
+**  it hard to bind a menu item to an action procedure that takes arguments.
+**  The user doesn't need to know about them -- they can use new("opposite")
+**  or new("tab").
 */
 static void newOppositeAP(Widget w, XEvent *event, String *args, Cardinal *nArgs) 
 {
     WindowInfo *window = WidgetToWindow(w);
 
     EditNewFile(GetPrefOpenInTab()? NULL : window, NULL, False, NULL,
-            window->path);
+            window->path, False);
     CheckCloseDim();
 }
 static void newTabAP(Widget w, XEvent *event, String *args, Cardinal *nArgs) 
 {
     WindowInfo *window = WidgetToWindow(w);
 
-    EditNewFile(window, NULL, False, NULL, window->path);
+    EditNewFile(window, NULL, False, NULL, window->path, False);
     CheckCloseDim();
 }
 
 static void openDialogAP(Widget w, XEvent *event, String *args, Cardinal *nArgs) 
 {
@@ -2781,21 +2882,31 @@ static void openDialogAP(Widget w, XEven
 
 static void openAP(Widget w, XEvent *event, String *args, Cardinal *nArgs) 
 {
     WindowInfo *window = WidgetToWindow(w);
     char filename[MAXPATHLEN], pathname[MAXPATHLEN];
+    DataValue* fileNameArg = (DataValue*) XtMalloc(sizeof(DataValue));
+    DataValue* resultDV = (DataValue*) XtMalloc(sizeof(DataValue));
     
     if (*nArgs == 0) {
        fprintf(stderr, "nedit: open action requires file argument\n");
        return;
     }
-    if (0 != ParseFilename(args[0], filename, pathname)
+
+    fileNameArg->tag = STRING_TAG;
+    AllocNStringNCpy(&fileNameArg->val.str, args[0], MAXPATHLEN);
+    MacroApplyHook(window, "file_name_hook", 1, fileNameArg, resultDV);
+    XtFree((char*) fileNameArg);
+
+    if (0 != ParseFilename(resultDV->val.str.rep, filename, pathname)
             || strlen(filename) + strlen(pathname) > MAXPATHLEN - 1) {
         fprintf(stderr, "nedit: invalid file name for open action: %s\n",
                 args[0]);
         return;
     }
+    XtFree((char*) resultDV);
+
     EditExistingFile(window, filename, pathname, 0, NULL, False, 
             NULL, GetPrefOpenInTab(), False);
     CheckCloseDim();
 }
 
@@ -3942,11 +4053,11 @@ static void focusPaneAP(Widget w, XEvent
         }
         if (paneIndex >= 0 && paneIndex <= window->nPanes) {
             newFocusPane = GetPaneByIndex(window, paneIndex);
         }
         if (newFocusPane != NULL) {
-            window->lastFocus = newFocusPane;
+            ChangeLastFocus(window, newFocusPane);
             XmProcessTraversal(window->lastFocus, XmTRAVERSE_CURRENT);
         }
         else {
             XBell(TheDisplay, 0);
         }
@@ -4085,10 +4196,23 @@ static void setWrapMarginAP(Widget w, XE
     else {
         fprintf(stderr, "nedit: set_wrap_margin requires argument\n");
     }
 }
 
+static void setShowWrapMarginAP(Widget w, XEvent *event, String *args,
+    Cardinal *nArgs)
+{
+    WindowInfo *window = WidgetToWindow(w);
+    int showWrapMargin = 0;
+
+    if (*nArgs > 0) {
+        if (sscanf(args[0], "%d", &showWrapMargin) == 1) {
+            SetShowWrapMargin(window, showWrapMargin);
+        }
+    }
+}
+
 static void setHighlightSyntaxAP(Widget w, XEvent *event, String *args,
     Cardinal *nArgs)
 {
     WindowInfo *window = WidgetToWindow(w);
     Boolean newState;
@@ -4209,10 +4333,28 @@ static void setLockedAP(Widget w, XEvent
        XmToggleButtonSetState(window->readOnlyItem, IS_ANY_LOCKED(window->lockReasons), False);
     UpdateWindowTitle(window);
     UpdateWindowReadOnly(window);
 }
 
+/*
+**  Action procedure for setting or toggling the transient flag.
+*/
+static void setTransientAP(Widget text, XEvent* event, String* args,
+        Cardinal* nArgs)
+{
+    WindowInfo* window = WidgetToWindow(text);
+    Boolean newState;
+
+    ACTION_BOOL_PARAM_OR_TOGGLE(newState, *nArgs, args,
+            window->transient, "set_transient");
+
+    window->transient = newState;
+    if (IsTopDocument(window)) {
+        XmToggleButtonSetState(window->transientItem, window->transient, False);
+    }
+}
+
 static void setTabDistAP(Widget w, XEvent *event, String *args,
     Cardinal *nArgs)
 {
     WindowInfo *window = WidgetToWindow(w);
     
@@ -4511,17 +4653,40 @@ static void invalidatePrevOpenMenus(void
 */
 void AddToPrevOpenMenu(const char *filename)
 {
     int i;
     char *nameCopy;
+    char *fileMask, *compileMsg;
+    regexp *compiledRE;
     WindowInfo *w;
 
     /* If the Open Previous command is disabled, just return */
     if (GetPrefMaxPrevOpenFiles() < 1) {
        return;
     }
 
+    /* If the name is to be omitted, return */
+    if ((fileMask = GetPrevOpenFilesMask()) && *fileMask)
+    {
+        compiledRE = CompileRE(fileMask, &compileMsg, REDFLT_STANDARD);
+        if (compiledRE == NULL)
+        {
+            fprintf(stderr, "nedit: %s\n", compileMsg);
+        } else
+        {
+            if (ExecRE(compiledRE, filename, NULL, FALSE, '\0', '\0', NULL,
+                    NULL, NULL))
+            {
+                free((char *)compiledRE);
+                return;
+            } else
+            {
+                free((char *)compiledRE);
+            }
+        }
+    }
+
     /*  Refresh list of previously opened files to avoid Big Race Condition,
         where two sessions overwrite each other's changes in NEdit's
         history file.
         Of course there is still Little Race Condition, which occurs if a
         Session A reads the list, then Session B reads the list and writes
@@ -4864,10 +5029,12 @@ static int cmpStrPtr(const void *strA, c
 void WriteNEditDB(void)
 {
     const char* fullName = GetRCFileName(NEDIT_HISTORY);
     FILE *fp;
     int i;
+    char *fileMask, *compileMsg;
+    regexp *compiledRE=NULL;
     static char fileHeader[] =
             "# File name database for NEdit Open Previous command\n";
 
     if (fullName == NULL) {
         /*  GetRCFileName() might return NULL if an error occurs during
@@ -4900,23 +5067,48 @@ void WriteNEditDB(void)
 #else
         return;
 #endif        
     }
 
+    /* set up removal of any files matching prevOpenFilesMask */
+    if ((fileMask = GetPrevOpenFilesMask()) && *fileMask)
+    {
+        compiledRE = CompileRE(fileMask, &compileMsg, REDFLT_STANDARD);
+        if (compiledRE == NULL)
+        {
+            fprintf(stderr, "%s\n", compileMsg);
+        }
+    }
+
     /* write the file header text to the file */
     fprintf(fp, "%s", fileHeader);
 
     /* Write the list of file names */
-    for (i = 0; i < NPrevOpen; ++i) {
-        size_t lineLen = strlen(PrevOpen[i]);
+    for (i = 0; i < NPrevOpen; i++)
+    {
+        /* omitting any files matching prevOpenFilesMask */
+        if (NULL == compiledRE
+                || 0 == ExecRE(compiledRE, PrevOpen[i], NULL, FALSE, '\0', '\0',
+                    NULL, NULL, NULL))
+        {
+            size_t lineLen = strlen(PrevOpen[i]);
 
-        if (lineLen > 0 && PrevOpen[i][0] != '#' &&
-            strcspn(PrevOpen[i], neditDBBadFilenameChars) == lineLen) {
-            fprintf(fp, "%s\n", PrevOpen[i]);
+            /*  omitting any files with invalid filenames  */
+            if (lineLen > 0 && '#' != PrevOpen[i][0]
+                    && strcspn(PrevOpen[i], neditDBBadFilenameChars) == lineLen)
+            {
+                fprintf(fp, "%s\n", PrevOpen[i]);
+            }
         }
     }
 
+
+    if (compiledRE != NULL) {
+        free((char *)compiledRE);
+    }
+
+    /* Close the file */
     fclose(fp);
 }
 
 /*
 **  Read database of file names for 'Open Previous' submenu.
diff --quilt old/source/nedit.c new/source/nedit.c
--- old/source/nedit.c
+++ new/source/nedit.c
@@ -352,15 +352,21 @@ static char *fallbackResources[] = {
     "*windowsMenu.splitPane.acceleratorText: Ctrl+2",
     "*windowsMenu.closePane.accelerator: Ctrl<Key>1",
     "*windowsMenu.closePane.acceleratorText: Ctrl+1",
     "*helpMenu.mnemonic: H",
     "nedit.help.helpForm.sw.helpText*baseTranslations: #override\
-<Key>Tab:help-focus-buttons()\\n\
+<Key>space: scroll_down(1, \"pages\")\\n\
+~Alt~Shift~Ctrl~Meta<KeyPress>osfUp: scroll_up(1)\\n\
+~Alt~Shift~Ctrl~Meta<KeyPress>osfDown: scroll_down(1)\\n\
+~Alt ~Shift ~Ctrl ~Meta<KeyPress>osfPageUp: scroll_up(1, \"pages\")\\n\
+~Alt ~Shift ~Ctrl ~Meta<KeyPress>osfPageDown: scroll_down(1, \"pages\")\\n\
+~Alt~Shift~Ctrl~Meta<KeyPress>osfLeft: help-button-action(\"prevTopic\")\\n\
+~Alt~Shift~Ctrl~Meta<KeyPress>osfRight: help-button-action(\"nextTopic\")\\n\
 <Key>Return:help-button-action(\"close\")\\n\
-Ctrl<Key>F:help-button-action(\"find\")\\n\
-Ctrl<Key>G:help-button-action(\"findAgain\")\\n\
 <KeyPress>osfCancel:help-button-action(\"close\")\\n\
+Ctrl<Key>f:help-button-action(\"find\")\\n\
+Ctrl<Key>g:help-button-action(\"findAgain\")\\n\
 ~Meta~Ctrl~Shift<Btn1Down>:\
     grab-focus() help-hyperlink()\\n\
 ~Meta~Ctrl~Shift<Btn1Up>:\
     help-hyperlink(\"current\", \"process-cancel\", \"extend-end\")\\n\
 ~Meta~Ctrl~Shift<Btn2Down>:\
@@ -489,11 +495,11 @@ int main(int argc, char **argv)
     
     /* Initialize global symbols and subroutines used in the macro language */
     InitMacroGlobals();
     RegisterMacroSubroutines();
 
-    /* Store preferences from the command line and .nedit file, 
+    /* Store preferences from the command line and the nedit.rc file,
        and set the appropriate preferences */
     RestoreNEditPrefs(prefDB, XtDatabase(TheDisplay));
 
     /* Intercept syntactically invalid virtual key bindings BEFORE we 
        create any shells. */
@@ -775,11 +781,11 @@ int main(int argc, char **argv)
     }
     CheckCloseDim();
 
     /* If no file to edit was specified, open a window to edit "Untitled" */
     if (!fileSpecified) {
-       EditNewFile(NULL, geometry, iconic, langMode, NULL);
+        EditNewFile(NULL, geometry, iconic, langMode, NULL, False);
        ReadMacroInitFile(WindowList);
        CheckCloseDim();
        if (toDoCommand != NULL)
            DoMacro(WindowList, toDoCommand, "-do macro");
     }
diff --quilt old/source/nedit.h new/source/nedit.h
--- old/source/nedit.h
+++ new/source/nedit.h
@@ -52,13 +52,14 @@
 #define NEDIT_DEFAULT_SEL_BG    "rgb:cc/cc/cc"
 #define NEDIT_DEFAULT_HI_FG     "white" /* These are colors for flashing */
 #define NEDIT_DEFAULT_HI_BG     "red"   /*   matching parens. */
 #define NEDIT_DEFAULT_LINENO_FG "black"
 #define NEDIT_DEFAULT_CURSOR_FG "black"
+#define NEDIT_DEFAULT_WRAPMARGIN_FG "black"
 #define NEDIT_DEFAULT_HELP_FG   "black"
 #define NEDIT_DEFAULT_HELP_BG   "rgb:cc/cc/cc"
-
+#define NEDIT_DEFAULT_CURSORLINE_BG "LightSteelBlue2"
 
 /* Tuning parameters */
 #define SEARCHMAX 5119          /* Maximum length of search/replace strings */
 #define MAX_SEARCH_HISTORY 100 /* Maximum length of search string history */
 #define MAX_PANES 6            /* Max # of ADDITIONAL text editing panes
@@ -103,10 +104,12 @@
 enum indentStyle {NO_AUTO_INDENT, AUTO_INDENT, SMART_INDENT};
 enum wrapStyle {NO_WRAP, NEWLINE_WRAP, CONTINUOUS_WRAP};
 enum showMatchingStyle {NO_FLASH, FLASH_DELIMIT, FLASH_RANGE};
 enum virtKeyOverride { VIRT_KEY_OVERRIDE_NEVER, VIRT_KEY_OVERRIDE_AUTO,
                        VIRT_KEY_OVERRIDE_ALWAYS };
+enum showWrapMarginEnums {SHOW_WRAP_MARGIN_NEVER, SHOW_WRAP_MARGIN_ALWAYS,
+                          SHOW_WRAP_MARGIN_ON_WRAP};
 
 /*  This enum must be kept in parallel to the array TruncSubstitutionModes[]
     in preferences.c  */
 enum truncSubstitution {TRUNCSUBST_SILENT, TRUNCSUBST_FAIL, TRUNCSUBST_WARN, TRUNCSUBST_IGNORE};
 
@@ -191,10 +194,12 @@ enum colorTypes {
     SELECT_BG_COLOR,
     HILITE_FG_COLOR,
     HILITE_BG_COLOR,
     LINENO_FG_COLOR,
     CURSOR_FG_COLOR,
+    WRAPMARGIN_FG_COLOR,
+    CURSORLINE_BG_COLOR,
     NUM_COLORS
 };
 
 /* cache user menus: manage mode of user menu list element */
 typedef enum {
@@ -325,10 +330,11 @@ typedef struct _WindowInfo {
     Widget     replaceMultiFileList;
     Widget     replaceMultiFilePathBtn;
     Widget     fontDialog;             /* NULL, unless font dialog is up */
     Widget     colorDialog;            /* NULL, unless color dialog is up */
     Widget     readOnlyItem;           /* menu bar settable widgets... */
+    Widget      transientItem;
     Widget     autoSaveItem;
     Widget     saveLastItem;
     Widget      openSelItem;
     Widget      newOppositeItem;
     Widget     closeItem;
@@ -393,10 +399,12 @@ typedef struct _WindowInfo {
     Widget     backlightCharsDefItem;
     Widget     searchDlogsDefItem;
     Widget      beepOnSearchWrapDefItem;
     Widget     keepSearchDlogsDefItem;
     Widget     searchWrapsDefItem;
+    Widget      showHiddenFilesItem;
+    Widget      showCursorlineItem;
     Widget      appendLFItem;
     Widget     sortOpenPrevDefItem;
     Widget     allTagsDefItem;
     Widget     smartTagsDefItem;
     Widget     reposDlogsDefItem;
@@ -417,10 +425,11 @@ typedef struct _WindowInfo {
     Widget     searchLiteralDefItem;
     Widget     searchCaseSenseDefItem;
     Widget     searchLiteralWordDefItem;
     Widget     searchCaseSenseWordDefItem;
     Widget     searchRegexNoCaseDefItem;
+    Widget      searchRegexSmartCaseDefItem;
     Widget     searchRegexDefItem;
 #ifdef REPLACE_SCOPE
     Widget     replScopeWinDefItem;
     Widget     replScopeSelDefItem;
     Widget     replScopeSmartDefItem;
@@ -495,10 +504,12 @@ typedef struct _WindowInfo {
     Boolean    autoSave;               /* is autosave turned on? */
     Boolean    saveOldVersion;         /* keep old version in filename.bck */
     char       indentStyle;            /* whether/how to auto indent */
     char       wrapMode;               /* line wrap style: NO_WRAP,
                                           NEWLINE_WRAP or CONTINUOUS_WRAP */
+    int         showWrapMargin;         /* show wrap margin style: NEVER,
+                                           ALWAYS, ON-WRAP as enums */
     Boolean    overstrike;             /* is overstrike mode turned on ? */
     char       showMatchingStyle;      /* How to show matching parens:
                                           NO_FLASH, FLASH_DELIMIT, or
                                           FLASH_RANGE */
     char       matchSyntaxBased;       /* Use syntax info to show matching */
@@ -555,10 +566,11 @@ typedef struct _WindowInfo {
 #endif
     UserMenuCache   *userMenuCache;     /* cache user menus: */
     UserBGMenuCache  userBGMenuCache;   /* shell & macro menu are shared over all
                                            "tabbed" documents, while each document
                                            has its own background menu. */
+    Boolean     transient;
 } WindowInfo;
 
 extern WindowInfo *WindowList;
 extern Display *TheDisplay;
 extern Widget TheAppShell;
diff --quilt old/source/preferences.c new/source/preferences.c
--- old/source/preferences.c
+++ new/source/preferences.c
@@ -115,13 +115,13 @@ enum fontStatus {GOOD_FONT, BAD_PRIMARY,
 ** The order of the elements in this array must be exactly the same
 ** as the order of the corresponding integers of the enum SearchType
 ** defined in search.h (!!)
 */
 static char *SearchMethodStrings[] = {
-       "Literal", "CaseSense", "RegExp", 
-       "LiteralWord", "CaseSenseWord", "RegExpNoCase", 
-       NULL
+    "Literal", "CaseSense", "RegExp",
+    "LiteralWord", "CaseSenseWord", "RegExpNoCase", "RegExSmartCase",
+    NULL
 };
 
 #ifdef REPLACE_SCOPE
 /* enumerated default scope for replace dialog if a selection exists when
 ** the dialog is popped up.
@@ -138,10 +138,13 @@ static char *AutoWrapTypes[N_WRAP_STYLES
 static char *AutoIndentTypes[N_INDENT_STYLES+3] = {"None", "Auto",
        "Smart", "True", "False", NULL};
 #define N_VIRTKEY_OVERRIDE_MODES 3
 static char *VirtKeyOverrideModes[N_VIRTKEY_OVERRIDE_MODES+1] = { "Never",
        "Auto", "Always", NULL};
+#define N_SHOW_WRAP_MARGIN_STYLES 3
+static char *ShowWrapMarginStrings[N_SHOW_WRAP_MARGIN_STYLES+1] = { "Never",
+        "Always", "When Wrap is Enabled", NULL};
 
 #define N_SHOW_MATCHING_STYLES 3
 /* For backward compatibility, "False" and "True" are still accepted.
    They are internally converted to "Off" and "Delimiter" respectively. 
    NOTE: N_SHOW_MATCHING_STYLES must correspond to the number of 
@@ -233,18 +236,23 @@ typedef struct {
     Widget hiliteBgErrW;
     Widget lineNoFgW;
     Widget lineNoFgErrW;
     Widget cursorFgW;
     Widget cursorFgErrW;
+    Widget wrapMarginFgW;
+    Widget wrapMarginFgErrW;
+    Widget cursorlineBgW;
+    Widget cursorlineBgErrW;
     WindowInfo *window;
 } colorDialog;
 
 /* Repository for simple preferences settings */
 static struct prefData {
     int openInTab;             /* open files in new tabs  */
     int wrapStyle;             /* what kind of wrapping to do */
     int wrapMargin;            /* 0=wrap at window width, other=wrap margin */
+    int showWrapMargin;         /* whether to draw line at wrap margin */
     int autoIndent;            /* style for auto-indent */
     int autoSave;              /* whether automatic backup feature is on */
     int saveOldVersion;                /* whether to preserve a copy of last version */
     int searchDlogs;           /* whether to show explanatory search dialogs */
     int searchWrapBeep;        /* 1=beep when search restarts at begin/end */
@@ -293,14 +301,17 @@ static struct prefData {
     int sortTabs;              /* sort tabs alphabetically */
     int repositionDialogs;     /* w. to reposition dialogs under the pointer */
     int autoScroll;             /* w. to autoscroll near top/bottom of screen */
     int autoScrollVPadding;     /* how close to get before autoscrolling */
     int sortOpenPrevMenu;      /* whether to sort the "Open Previous" menu */
+    int showHiddenFiles;         /* whether to show hidden files in the FSBs */
+    int showCursorline;         /*  show cursorline  */
     int appendLF;       /* Whether to append LF at the end of each file */
     int mapDelete;             /* whether to map delete to backspace */
     int stdOpenDialog;         /* w. to retain redundant text field in Open */
     char tagFile[MAXPATHLEN];  /* name of tags file to look for at startup */
+    char prevOpenFilesMask[MAXPATHLEN];   /* regex to omit from Open Previous menu */
     int maxPrevOpenFiles;      /* limit to size of Open Previous menu */
     int typingHidesPointer;     /* hide mouse pointer when typing */
     char delimiters[MAX_WORD_DELIMITERS]; /* punctuation characters */
     char shell[MAXPATHLEN + 1]; /* shell to use for executing commands */
     char geometry[MAX_GEOM_STRING_LEN];        /* per-application geometry string,
@@ -319,10 +330,11 @@ static struct prefData {
     char helpLinkColor[MAX_COLOR_LEN];         /* Color for hyperlinks in the help system */
     char colorNames[NUM_COLORS][MAX_COLOR_LEN];
     char tooltipBgColor[MAX_COLOR_LEN];
     int  undoModifiesSelection;
     int  focusOnRaise;
+    Boolean showScrolltip;
     Boolean honorSymlinks;
     int truncSubstitution;
     Boolean forceOSConversion;
 } PrefData;
 
@@ -845,10 +857,12 @@ static PrefDescripRec PrefDescrip[] = {
         "Default", &TempStringPrefs.smartIndentCommon, NULL, True},
     {"autoWrap", "AutoWrap", PREF_ENUM, "Continuous",
        &PrefData.wrapStyle, AutoWrapTypes, True},
     {"wrapMargin", "WrapMargin", PREF_INT, "0",
        &PrefData.wrapMargin, NULL, True},
+    {"showWrapMargin", "ShowWrapMargin", PREF_ENUM, "Never",
+        &PrefData.showWrapMargin, ShowWrapMarginStrings, True},
     {"autoIndent", "AutoIndent", PREF_ENUM, "Auto",
        &PrefData.autoIndent, AutoIndentTypes, True},
     {"autoSave", "AutoSave", PREF_BOOLEAN, "True",
        &PrefData.autoSave, NULL, True},
     {"openInTab", "OpenInTab", PREF_BOOLEAN, "True",
@@ -882,10 +896,12 @@ static PrefDescripRec PrefDescrip[] = {
        &PrefData.repositionDialogs, NULL, True},
 #else
     {"repositionDialogs", "RepositionDialogs", PREF_BOOLEAN, "True",
        &PrefData.repositionDialogs, NULL, True},
 #endif
+    {"showHiddenFiles", "ShowHiddenFiles", PREF_BOOLEAN, "True",
+        &PrefData.showHiddenFiles, NULL, True},
     {"autoScroll", "AutoScroll", PREF_BOOLEAN, "False",
        &PrefData.autoScroll, NULL, True},
     {"autoScrollVPadding", "AutoScrollVPadding", PREF_INT, "4",
        &PrefData.autoScrollVPadding, NULL, False},
     {"appendLF", "AppendLF", PREF_BOOLEAN, "True",
@@ -1020,13 +1036,20 @@ static PrefDescripRec PrefDescrip[] = {
         PrefData.colorNames[LINENO_FG_COLOR],
         (void *)sizeof(PrefData.colorNames[LINENO_FG_COLOR]), True},
     {"cursorFgColor", "CursorFgColor", PREF_STRING, NEDIT_DEFAULT_CURSOR_FG,
         PrefData.colorNames[CURSOR_FG_COLOR],
         (void *)sizeof(PrefData.colorNames[CURSOR_FG_COLOR]), True},
+    {"cursorlineBGColor", "CursorlineBGColor", PREF_STRING,
+            NEDIT_DEFAULT_CURSORLINE_BG,
+            PrefData.colorNames[CURSORLINE_BG_COLOR],
+            (void *)sizeof(PrefData.colorNames[CURSORLINE_BG_COLOR]), True},
     {"tooltipBgColor", "TooltipBgColor", PREF_STRING, "LemonChiffon1",
         PrefData.tooltipBgColor,
         (void *)sizeof(PrefData.tooltipBgColor), False},
+    {"wrapMarginForeground", "wrapMarginForeground", PREF_STRING,
+            NEDIT_DEFAULT_LINENO_FG, PrefData.colorNames[WRAPMARGIN_FG_COLOR],
+            (void *)sizeof(PrefData.colorNames[WRAPMARGIN_FG_COLOR]), True},
     {"shell", "Shell", PREF_STRING, "DEFAULT", PrefData.shell,
         (void*) sizeof(PrefData.shell), True},
     {"geometry", "Geometry", PREF_STRING, "",
        PrefData.geometry, (void *)sizeof(PrefData.geometry), False},
     {"remapDeleteKey", "RemapDeleteKey", PREF_BOOLEAN, "False",
@@ -1038,10 +1061,13 @@ static PrefDescripRec PrefDescrip[] = {
     {"wordDelimiters", "WordDelimiters", PREF_STRING,
        ".,/\\`'!|@#%^&*()-=+{}[]\":;<>?",
        PrefData.delimiters, (void *)sizeof(PrefData.delimiters), False},
     {"serverName", "ServerName", PREF_STRING, "", PrefData.serverName,
       (void *)sizeof(PrefData.serverName), False},
+    {"prevOpenFilesMask", "PrevOpenFilesMask", PREF_STRING, "",
+            PrefData.prevOpenFilesMask,
+            (void*) sizeof(PrefData.prevOpenFilesMask), False},
     {"maxPrevOpenFiles", "MaxPrevOpenFiles", PREF_INT, "30",
        &PrefData.maxPrevOpenFiles, NULL, False},
     {"bgMenuButton", "BGMenuButton" , PREF_STRING,
        "~Shift~Ctrl~Meta~Alt<Btn3Down>", PrefData.bgMenuBtn,
       (void *)sizeof(PrefData.bgMenuBtn), False},
@@ -1069,10 +1095,14 @@ static PrefDescripRec PrefDescrip[] = {
             "False", &PrefData.focusOnRaise, NULL, False},
     {"forceOSConversion", "ForceOSConversion", PREF_BOOLEAN, "True",
             &PrefData.forceOSConversion, NULL, False},
     {"truncSubstitution", "TruncSubstitution", PREF_ENUM, "Fail",
             &PrefData.truncSubstitution, TruncSubstitutionModes, False},
+    {"showCursorline", "ShowCursorline", PREF_BOOLEAN, "True",
+        &PrefData.showCursorline, NULL, True},
+    {"showScrolltip", "ShowScrolltip", PREF_BOOLEAN, "True",
+        &PrefData.showScrolltip, NULL, False},
     {"honorSymlinks", "HonorSymlinks", PREF_BOOLEAN, "True",
             &PrefData.honorSymlinks, NULL, False}
 };
 
 static XrmOptionDescRec OpTable[] = {
@@ -1124,11 +1154,13 @@ static WindowInfo *TabsDialogForWindow;
 static Widget TabDistText, EmTabText, EmTabToggle, UseTabsToggle, EmTabLabel;
 
 /* Module-global variables for Wrap Margin dialog */
 static int DoneWithWrapDialog;
 static WindowInfo *WrapDialogForWindow;
-static Widget WrapText, WrapTextLabel, WrapWindowToggle;
+static Widget WrapText, WrapTextLabel, WrapWindowToggle, ShowWrapMarginPulldown,
+        ShowWrapMarginPulldownItems[N_SHOW_WRAP_MARGIN_STYLES],
+        ShowWrapMarginOptMenu, ShowWrapMarginLabel;
 
 /*  Module-global variables for shell selection dialog  */
 static int DoneWithShellSelDialog = False;
 
 static void translatePrefFormats(int convertOld, int fileVer);
@@ -1234,22 +1266,22 @@ static void updatePatternsTo5dot6(void);
 static void updateMacroCmdsTo5dot6(void);
 static void migrateColorResources(XrmDatabase prefDB, XrmDatabase appDB);
 static void spliceString(char **intoString, const char *insertString, const char *atExpr);
 static int regexFind(const char *inString, const char *expr);
 static int regexReplace(char **inString, const char *expr,
-                        const char *replaceWith);
+       const char *replaceWith);
+static void initPrefDefaultsFromResources(XrmDatabase prefDB, XrmDatabase appDB);
 static int caseFind(const char *inString, const char *expr);
 static int caseReplace(char **inString, const char *expr,
                        const char *replaceWith, int replaceLen);
 static int stringReplace(char **inString, const char *expr, 
                          const char *replaceWith, int searchType,
                          int replaceLen);
 static int replaceMacroIfUnchanged(const char* oldText, const char* newStart, 
                                     const char* newEnd);
 static const char* getDefaultShell(void);
 
-
 #ifdef SGI_CUSTOM
 static int shortPrefToDefault(Widget parent, const char *settingName, int *setDefault);
 #endif
 
 XrmDatabase CreateNEditPrefDB(int *argcInOut, char **argvInOut)
@@ -1264,10 +1296,14 @@ void RestoreNEditPrefs(XrmDatabase prefD
     int major;              /* The integral part of version number */
     int minor;              /* fractional part of version number */
     int fileVer = 0;        /* Both combined into an integer */
     int nparsed;
     
+    /*  Default values of certain preferences are derived from Motif resources,
+        if these resources are set. */
+    initPrefDefaultsFromResources(prefDB, appDB);
+
     /* Load preferences */
     RestorePreferences(prefDB, appDB, APP_NAME,
            APP_CLASS, PrefDescrip, XtNumber(PrefDescrip));
 
     /* If the preferences file was written by an older version of NEdit,
@@ -1559,10 +1595,20 @@ void SetPrefWrapMargin(int margin)
 int GetPrefWrapMargin(void)
 {
     return PrefData.wrapMargin;
 }
 
+void SetPrefShowWrapMargin(int state)
+{
+    setIntPref(&PrefData.showWrapMargin, state);
+}
+
+int GetPrefShowWrapMargin(void)
+{
+    return PrefData.showWrapMargin;
+}
+
 void SetPrefSearch(int searchType)
 {
     setIntPref(&PrefData.searchMethod, searchType);
 }
 
@@ -1930,10 +1976,20 @@ void SetPrefRepositionDialogs(int state)
 int GetPrefRepositionDialogs(void)
 {
     return PrefData.repositionDialogs;
 }
 
+void SetPrefShowHiddenFiles(int state)
+{
+    setIntPref(&PrefData.showHiddenFiles, state);
+}
+
+int GetPrefShowHiddenFiles(void)
+{
+    return PrefData.showHiddenFiles;
+}
+
 void SetPrefAutoScroll(int state)
 {
     WindowInfo *w = WindowList;
     int margin = state ? PrefData.autoScrollVPadding : 0;
     
@@ -2118,10 +2174,15 @@ char *GetPrefServerName(void)
 char *GetPrefBGMenuBtn(void)
 {
     return PrefData.bgMenuBtn;
 }
 
+char *GetPrevOpenFilesMask(void)
+{
+    return PrefData.prevOpenFilesMask;
+}
+
 int GetPrefMaxPrevOpenFiles(void)
 {
     return PrefData.maxPrevOpenFiles;
 }
 
@@ -2186,10 +2247,25 @@ int GetPrefOverrideVirtKeyBindings(void)
 int GetPrefTruncSubstitution(void)
 {
     return PrefData.truncSubstitution;
 }
 
+void SetPrefShowCursorline(Boolean value)
+{
+    setIntPref(&PrefData.showCursorline, (int) value);
+}
+
+Boolean GetPrefShowCursorline(void)
+{
+    return (Boolean) PrefData.showCursorline;
+}
+
+Boolean GetPrefShowScrolltip(void)
+{
+    return (Boolean) PrefData.showScrolltip;
+}
+
 /*
 ** If preferences don't get saved, ask the user on exit whether to save
 */
 void MarkPrefsChanged(void)
 {
@@ -2678,10 +2754,13 @@ void WrapMarginDialog(Widget parent, Win
 {
     Widget form, selBox;
     Arg selBoxArgs[2];
     XmString s1;
     int margin;
+    int showWrapMargin;
+    int i, n;
+    Arg args[20];
 
     XtSetArg(selBoxArgs[0], XmNdialogStyle, XmDIALOG_FULL_APPLICATION_MODAL);
     XtSetArg(selBoxArgs[1], XmNautoUnmanage, False);
     selBox = CreatePromptDialog(parent, "wrapMargin", selBoxArgs, 2);
     XtAddCallback(selBox, XmNokCallback, (XtCallbackProc)wrapOKCB, NULL);
@@ -2720,20 +2799,74 @@ void WrapMarginDialog(Widget parent, Win
            XmNrightWidget, WrapText,
            XmNbottomAttachment, XmATTACH_OPPOSITE_WIDGET,
            XmNbottomWidget, WrapText, NULL);
     XmStringFree(s1);
 
+    ShowWrapMarginPulldown = CreatePulldownMenu(form, "ShowWrapMarginPulldown",
+            NULL, 0);
+    for(i=0; i<N_SHOW_WRAP_MARGIN_STYLES; i++) {
+        s1 = XmStringCreateSimple(ShowWrapMarginStrings[i]);
+        ShowWrapMarginPulldownItems[i] = XtVaCreateManagedWidget(
+                "ShowWrapMarginPulldown",
+                xmPushButtonWidgetClass, ShowWrapMarginPulldown,
+                XmNlabelString, s1,
+                XmNmarginHeight, 0,
+                XmNuserData, i,
+                NULL);
+        XmStringFree(s1);
+    }
+    n = 0;
+    XtSetArg(args[n], XmNspacing, 0); n++;
+    XtSetArg(args[n], XmNmarginWidth, 0); n++;
+    XtSetArg(args[n], XmNtopAttachment, XmATTACH_WIDGET); n++;
+    XtSetArg(args[n], XmNtopWidget, WrapText); n++;
+    XtSetArg(args[n], XmNrightAttachment, XmATTACH_FORM); n++;
+    XtSetArg(args[n], XmNsubMenuId, ShowWrapMarginPulldown); n++;
+    ShowWrapMarginOptMenu = XmCreateOptionMenu(form,
+            "ShowWrapMarginOptMenu", args, n);
+    XtManageChild(ShowWrapMarginOptMenu);
+
+    ShowWrapMarginLabel = XtVaCreateManagedWidget("ShowWrapMarginLabel",
+            xmLabelGadgetClass, form,
+            XmNlabelString, s1=XmStringCreateSimple("Show Wrap Margin"),
+            XmNmnemonic, 'S',
+            XmNuserData, XtParent(ShowWrapMarginOptMenu),
+            XmNalignment, XmALIGNMENT_END,
+            XmNtopAttachment, XmATTACH_WIDGET,
+            XmNtopWidget, WrapText,
+            XmNleftAttachment, XmATTACH_FORM,
+            XmNrightAttachment, XmATTACH_WIDGET,
+            XmNrightWidget, ShowWrapMarginOptMenu,
+            XmNbottomAttachment, XmATTACH_OPPOSITE_WIDGET,
+            XmNbottomWidget, ShowWrapMarginOptMenu,
+            NULL);
+    XmStringFree(s1);
+
     /* Set default value */
-    if (forWindow == NULL)
+    if (forWindow == NULL) {
        margin = GetPrefWrapMargin();
-    else
+        showWrapMargin = GetPrefShowWrapMargin();
+    } else {
        XtVaGetValues(forWindow->textArea, textNwrapMargin, &margin, NULL);
+        showWrapMargin = forWindow->showWrapMargin;
+    }
+
+    if (showWrapMargin > N_SHOW_WRAP_MARGIN_STYLES || showWrapMargin < 0)
+    {
+        fprintf(stderr, "nedit: internal error: illegal value for showWrapMargin: %d\n", showWrapMargin);
+        showWrapMargin = SHOW_WRAP_MARGIN_NEVER;
+    }
+
     XmToggleButtonSetState(WrapWindowToggle, margin==0, True);
+    XtVaSetValues(ShowWrapMarginOptMenu, XmNmenuHistory,
+            ShowWrapMarginPulldownItems[showWrapMargin], NULL);
     if (margin != 0)
        SetIntText(WrapText, margin);
     XtSetSensitive(WrapText, margin!=0);
     XtSetSensitive(WrapTextLabel, margin!=0);
+    XtSetSensitive(ShowWrapMarginOptMenu, margin!=0);
+    XtSetSensitive(ShowWrapMarginLabel, margin!=0);
     
     /* Handle mnemonic selection of buttons and focus to dialog */
     AddDialogMnemonicHandler(form, FALSE);
 
     /* put up dialog and wait for user to press ok or cancel */
@@ -2752,10 +2885,12 @@ void WrapMarginDialog(Widget parent, Win
 
 static void wrapOKCB(Widget w, XtPointer clientData, XtPointer callData)
 {
     int wrapAtWindow, margin, stat;
     WindowInfo *window = WrapDialogForWindow;
+    int showWrapMargin;
+    Widget showWrapMarginSelectedItem;
     
     /* get the values that the user entered and make sure they're ok */
     wrapAtWindow = XmToggleButtonGetState(WrapWindowToggle);
     if (wrapAtWindow)
        margin = 0;
@@ -2771,10 +2906,17 @@ static void wrapOKCB(Widget w, XtPointer
            return;
        }
 
     }
 
+    XtVaGetValues(ShowWrapMarginOptMenu, XmNmenuHistory,
+            &showWrapMarginSelectedItem, NULL);
+    XtVaGetValues(showWrapMarginSelectedItem, XmNuserData, &showWrapMargin, NULL);
+    if (showWrapMargin > N_SHOW_WRAP_MARGIN_STYLES || showWrapMargin < 0) {
+        showWrapMargin = SHOW_WRAP_MARGIN_NEVER;
+    }
+
 #ifdef SGI_CUSTOM
     /* Ask the user about saving as a default preference */
     if (WrapDialogForWindow != NULL) {
        int setDefault;
        if (!shortPrefToDefault(window->shell, "Wrap Margin Settings",
@@ -2782,24 +2924,29 @@ static void wrapOKCB(Widget w, XtPointer
            DoneWithWrapDialog = True;
            return;
        }
        if (setDefault) {
            SetPrefWrapMargin(margin);
+            SetPrefShowWrapMargin(showWrapMargin);
            SaveNEditPrefs(window->shell, GetPrefShortMenus());
        }
     }
 #endif
 
     /* Set the value in either the requested window or default preferences */
-    if (WrapDialogForWindow == NULL)
+    if (WrapDialogForWindow == NULL) {
        SetPrefWrapMargin(margin);
-    else {
+        SetPrefShowWrapMargin(showWrapMargin);
+    } else {
         char *params[1];
         char marginStr[25];
         sprintf(marginStr, "%d", margin);
         params[0] = marginStr;
         XtCallActionProc(window->textArea, "set_wrap_margin", NULL, params, 1);
+        sprintf(marginStr, "%d", showWrapMargin);
+        params[0] = marginStr;
+        XtCallActionProc(window->textArea, "set_show_wrap_margin", NULL, params, 1);
     }
     DoneWithWrapDialog = True;
 }
 
 static void wrapCancelCB(Widget w, XtPointer clientData, XtPointer callData)
@@ -2811,10 +2958,12 @@ static void wrapWindowCB(Widget w, XtPoi
 {
     int wrapAtWindow = XmToggleButtonGetState(w);
     
     XtSetSensitive(WrapTextLabel, !wrapAtWindow);
     XtSetSensitive(WrapText, !wrapAtWindow);
+    XtSetSensitive(ShowWrapMarginOptMenu, !wrapAtWindow);
+    XtSetSensitive(ShowWrapMarginLabel, !wrapAtWindow);
 }
 
 /*
 **  Create and show a dialog for selecting the shell
 */
@@ -6072,10 +6221,11 @@ selectFg              SELECT_FG_COLOR
 selectBg              SELECT_BG_COLOR
 hiliteFg              HILITE_FG_COLOR
 hiliteBg              HILITE_BG_COLOR
 lineNoFg              LINENO_FG_COLOR
 cursorFg              CURSOR_FG_COLOR
+cursorlineBg          CURSORLINE_BG_COLOR
 */
 
 #define MARGIN_SPACING 10
 
 /* 
@@ -6135,10 +6285,24 @@ static void cursorFgModifiedCB(Widget w,
 {
     colorDialog *cd = (colorDialog *)clientData;
     showColorStatus(cd, cd->cursorFgW, cd->cursorFgErrW);
 }
 
+static void wrapMarginFgModifiedCB(Widget w, XtPointer clientData,
+        XtPointer callData)
+{
+    colorDialog *cd = (colorDialog *)clientData;
+    showColorStatus(cd, cd->wrapMarginFgW, cd->wrapMarginFgErrW);
+}
+
+static void cursorlineBgModifiedCB(Widget w, XtPointer clientData,
+        XtPointer callData)
+{
+    colorDialog *cd = (colorDialog *)clientData;
+    showColorStatus(cd, cd->cursorlineBgW, cd->cursorlineBgErrW);
+}
+
 
 /* 
  * Helper functions for validating colors
  */
 static int verifyAllColors(colorDialog *cd)
@@ -6149,11 +6313,12 @@ static int verifyAllColors(colorDialog *
             checkColorStatus(cd, cd->selectFgW) &&
             checkColorStatus(cd, cd->selectBgW) &&
             checkColorStatus(cd, cd->hiliteFgW) &&
             checkColorStatus(cd, cd->hiliteBgW) &&
             checkColorStatus(cd, cd->lineNoFgW) &&
-            checkColorStatus(cd, cd->cursorFgW) );
+            checkColorStatus(cd, cd->cursorFgW) &&
+            checkColorStatus(cd, cd->cursorlineBgW));
 }
 
 /* Returns True if the color is valid, False if it's not */
 static Boolean checkColorStatus(colorDialog *cd, Widget colorFieldW)
 {
@@ -6188,35 +6353,41 @@ static void updateColors(colorDialog *cd
             *selectFg = XmTextGetString(cd->selectFgW),
             *selectBg = XmTextGetString(cd->selectBgW),
             *hiliteFg = XmTextGetString(cd->hiliteFgW),
             *hiliteBg = XmTextGetString(cd->hiliteBgW),
             *lineNoFg = XmTextGetString(cd->lineNoFgW),
-            *cursorFg = XmTextGetString(cd->cursorFgW);
+            *cursorFg = XmTextGetString(cd->cursorFgW),
+            *wrapMarginFg = XmTextGetString(cd->wrapMarginFgW),
+            *cursorlineBg = XmTextGetString(cd->cursorlineBgW);
 
     for (window = WindowList; window != NULL; window = window->next)
     {
         SetColors(window, textFg, textBg, selectFg, selectBg, hiliteFg, 
-                hiliteBg, lineNoFg, cursorFg);
+                hiliteBg, lineNoFg, cursorFg, wrapMarginFg, cursorlineBg);
     }
 
     SetPrefColorName(TEXT_FG_COLOR  , textFg  );
     SetPrefColorName(TEXT_BG_COLOR  , textBg  );
     SetPrefColorName(SELECT_FG_COLOR, selectFg);
     SetPrefColorName(SELECT_BG_COLOR, selectBg);
     SetPrefColorName(HILITE_FG_COLOR, hiliteFg);
     SetPrefColorName(HILITE_BG_COLOR, hiliteBg);
     SetPrefColorName(LINENO_FG_COLOR, lineNoFg);
     SetPrefColorName(CURSOR_FG_COLOR, cursorFg);
+    SetPrefColorName(WRAPMARGIN_FG_COLOR, wrapMarginFg);
+    SetPrefColorName(CURSORLINE_BG_COLOR, cursorlineBg);
 
     XtFree(textFg);
     XtFree(textBg);
     XtFree(selectFg);
     XtFree(selectBg);
     XtFree(hiliteFg);
     XtFree(hiliteBg);
     XtFree(lineNoFg);
     XtFree(cursorFg);
+    XtFree(wrapMarginFg);
+    XtFree(cursorlineBg);
 }
 
 
 /* 
  * Dialog button callbacks
@@ -6382,10 +6553,27 @@ void ChooseColors(WindowInfo *window)
             NULL);
     XmStringFree(s1);
     
     topW = infoLbl;
     
+    /* The right column (backgrounds) */
+    tmpW = addColorGroup( form, "textBg", 'T', "Text Area Background",
+            &(cd->textBgW), &(cd->textBgErrW), topW, 51, 99,
+            textBgModifiedCB, cd );
+    tmpW = addColorGroup( form, "selectBg", 'B', "Selection Background",
+            &(cd->selectBgW), &(cd->selectBgErrW), tmpW, 51, 99,
+            selectBgModifiedCB, cd );
+    tmpW = addColorGroup( form, "hiliteBg", 'h', "Matching (..) Background",
+            &(cd->hiliteBgW), &(cd->hiliteBgErrW), tmpW, 51, 99,
+            hiliteBgModifiedCB, cd );
+    tmpW = addColorGroup( form, "wrapMarginFg", 'w', "Wrap Margin Color",
+            &(cd->wrapMarginFgW), &(cd->wrapMarginFgErrW), tmpW, 51, 99,
+            wrapMarginFgModifiedCB, cd );
+    tmpW = addColorGroup( form, "cursorlineBg", 'r', "Cursorline Highlighting",
+            &(cd->cursorlineBgW), &(cd->cursorlineBgErrW), tmpW, 51, 99,
+            cursorlineBgModifiedCB, cd );
+
     /* The left column (foregrounds) of color entry groups */
     tmpW = addColorGroup( form, "textFg", 'P', "Plain Text Foreground", 
             &(cd->textFgW), &(cd->textFgErrW), topW, 1, 49, 
             textFgModifiedCB, cd );
     tmpW = addColorGroup( form, "selectFg", 'S', "Selection Foreground",
@@ -6395,23 +6583,12 @@ void ChooseColors(WindowInfo *window)
             &(cd->hiliteFgW), &(cd->hiliteFgErrW), tmpW, 1, 49, 
             hiliteFgModifiedCB, cd );
     tmpW = addColorGroup( form, "lineNoFg", 'L', "Line Numbers",
             &(cd->lineNoFgW), &(cd->lineNoFgErrW), tmpW, 1, 49, 
             lineNoFgModifiedCB, cd );
-
-    /* The right column (backgrounds) */
-    tmpW = addColorGroup( form, "textBg", 'T', "Text Area Background",
-            &(cd->textBgW), &(cd->textBgErrW), topW, 51, 99, 
-            textBgModifiedCB, cd );
-    tmpW = addColorGroup( form, "selectBg", 'B', "Selection Background",
-            &(cd->selectBgW), &(cd->selectBgErrW), tmpW, 51, 99, 
-            selectBgModifiedCB, cd );
-    tmpW = addColorGroup( form, "hiliteBg", 'h', "Matching (..) Background",
-            &(cd->hiliteBgW), &(cd->hiliteBgErrW), tmpW, 51, 99, 
-            hiliteBgModifiedCB, cd );
     tmpW = addColorGroup( form, "cursorFg", 'C', "Cursor Color",
-            &(cd->cursorFgW), &(cd->cursorFgErrW), tmpW, 51, 99, 
+            &(cd->cursorFgW), &(cd->cursorFgErrW), tmpW, 1, 49,
             cursorFgModifiedCB, cd );
 
     tmpW = XtVaCreateManagedWidget("infoLbl",
             xmLabelGadgetClass, form,
             XmNtopAttachment, XmATTACH_WIDGET,
@@ -6490,18 +6667,70 @@ void ChooseColors(WindowInfo *window)
     XmTextSetString(cd->selectBgW, GetPrefColorName(SELECT_BG_COLOR));
     XmTextSetString(cd->hiliteFgW, GetPrefColorName(HILITE_FG_COLOR));
     XmTextSetString(cd->hiliteBgW, GetPrefColorName(HILITE_BG_COLOR));
     XmTextSetString(cd->lineNoFgW, GetPrefColorName(LINENO_FG_COLOR));
     XmTextSetString(cd->cursorFgW, GetPrefColorName(CURSOR_FG_COLOR));
+    XmTextSetString(cd->wrapMarginFgW, GetPrefColorName(WRAPMARGIN_FG_COLOR));
+    XmTextSetString(cd->cursorlineBgW, GetPrefColorName(CURSORLINE_BG_COLOR));
     
     /* Handle mnemonic selection of buttons and focus to dialog */
     AddDialogMnemonicHandler(form, FALSE);
     
     /* put up dialog */
     ManageDialogCenteredOnPointer(form);
 }
 
+/* Overrides the defaults for certain preferences with values obtained from
+   obsoleted resources. */
+static void initPrefDefaultsFromResources(XrmDatabase prefDB, XrmDatabase appDB)
+{
+    char *type, *valueString;
+    XrmValue rsrcValue;
+
+    /* XmFileSelectionBox.fileFilterStyle is now obsolete since it is
+       overridden by nedit.showHiddenFiles, but this code tries to make
+       the transition painless by translating the resource value, if set,
+       to a matching default for the preferences */
+    const char* showHiddenResName =
+            APP_NAME "*XmFileSelectionBox.fileFilterStyle";
+    const char* showHiddenClassName =
+            APP_CLASS "*XmFileSelectionBox.FileFilterStyle";
+
+    /* Retrieve the value of the resource from the DB */
+    if (XrmGetResource(prefDB, showHiddenResName, showHiddenClassName, &type,
+            &rsrcValue)) {
+        if (strcmp(type, XmRString)) {
+            fprintf(stderr, "nedit: Internal Error: Unexpected resource type, %s\n",
+                    type);
+            return;
+        }
+        valueString = rsrcValue.addr;
+    } else if (XrmGetResource(appDB, showHiddenResName, showHiddenClassName,
+            &type, &rsrcValue)) {
+        if (strcmp(type, XmRString)) {
+            fprintf(stderr, "nedit: Internal Error: Unexpected resource type, %s\n",
+                    type);
+            return;
+        }
+        valueString = rsrcValue.addr;
+    } else {
+        /* No resources set */
+        return;
+    }
+
+    /* An X resource is set. If it's non-default, update the prefs default. */
+    if (0 == strcmp(valueString, "XmFILTER_HIDDEN_FILES")) {
+        unsigned int i;
+        for (i = 0; i < XtNumber(PrefDescrip); ++i) {
+            if (0 == strcmp(PrefDescrip[i].name, "showHiddenFiles")) {
+                PrefDescrip[i].defaultString = "False";
+                break;
+            }
+        }
+    }
+}
+
 /*
 **  This function passes up a pointer to the static name of the default
 **  shell, currently defined as the user's login shell.
 **  In case of errors, the fallback of "sh" will be returned.
 */
diff --quilt old/source/preferences.h new/source/preferences.h
--- old/source/preferences.h
+++ new/source/preferences.h
@@ -57,10 +57,12 @@ void MarkPrefsChanged(void);
 int CheckPrefsChangesSaved(Widget dialogParent);
 void SetPrefWrap(int state);
 int GetPrefWrap(int langMode);
 void SetPrefWrapMargin(int margin);
 int GetPrefWrapMargin(void);
+void SetPrefShowWrapMargin(int state);
+int GetPrefShowWrapMargin(void);
 void SetPrefSearchDlogs(int state);
 int GetPrefSearchDlogs(void);
 void SetPrefKeepSearchDlogs(int state);
 int GetPrefKeepSearchDlogs(void);
 void SetPrefSearchWraps(int state);
@@ -117,10 +119,12 @@ void SetPrefBacklightChars(int state);
 int GetPrefBacklightChars(void);
 void SetPrefBacklightCharTypes(char *types);
 char *GetPrefBacklightCharTypes(void);
 void SetPrefRepositionDialogs(int state);
 int GetPrefRepositionDialogs(void);
+void SetPrefShowHiddenFiles(int state);
+int GetPrefShowHiddenFiles(void);
 void SetPrefAutoScroll(int state);
 int GetPrefAutoScroll(void);
 int GetVerticalAutoScroll(void);
 void SetPrefAppendLF(int state);
 int GetPrefAppendLF(void);
@@ -156,10 +160,11 @@ void RowColumnPrefDialog(Widget parent);
 void TabsPrefDialog(Widget parent, WindowInfo *forWindow);
 void WrapMarginDialog(Widget parent, WindowInfo *forWindow);
 int GetPrefMapDelete(void);
 int GetPrefStdOpenDialog(void);
 char *GetPrefDelimiters(void);
+char *GetPrevOpenFilesMask(void);
 int GetPrefMaxPrevOpenFiles(void);
 int GetPrefTypingHidesPointer(void);
 #ifdef SGI_CUSTOM
 void SetPrefShortMenus(int state);
 int GetPrefShortMenus(void);
@@ -209,7 +214,10 @@ void SetPrefOpenInTab(int state);
 Boolean GetPrefUndoModifiesSelection(void);
 Boolean GetPrefFocusOnRaise(void);
 Boolean GetPrefHonorSymlinks(void);
 Boolean GetPrefForceOSConversion(void);
 void SetPrefFocusOnRaise(Boolean);
+void SetPrefShowCursorline(Boolean value);
+Boolean GetPrefShowCursorline(void);
+Boolean GetPrefShowScrolltip(void);
 
 #endif /* NEDIT_PREFERENCES_H_INCLUDED */
diff --quilt old/source/search.c new/source/search.c
--- old/source/search.c
+++ new/source/search.c
@@ -241,10 +241,11 @@ static void iSearchCaseToggleCB(Widget w
        XtPointer callData);
 static void iSearchTryBeepOnWrap(WindowInfo *window, int direction, 
        int beginPos, int startPos); 
 static void iSearchRecordLastBeginPos(WindowInfo *window, int direction, 
        int initPos); 
+static void smartCaseToggle(const char* searchString, Widget toggleButton);
 static Boolean prefOrUserCancelsSubst(const Widget parent,
         const Display* display);
 
 typedef struct _charMatchTable {
     char c;
@@ -279,10 +280,11 @@ static char *searchTypeStrings[] = {
     "case",             /* SEARCH_CASE_SENSE      */
     "regex",            /* SEARCH_REGEX           */
     "word",             /* SEARCH_LITERAL_WORD    */
     "caseWord",         /* SEARCH_CASE_SENSE_WORD */
     "regexNoCase",      /* SEARCH_REGEX_NOCASE    */
+    "regexSmartCase",   /* SEARCH_REGEX_SMARTCASE */
     NULL
 };
     
 /*
 ** Window for which a search dialog callback is currently active. That window
@@ -317,70 +319,77 @@ static void initToggleButtons(int search
                               Bool* lastRegexCase)
 {
     /* Set the initial search type and remember the corresponding case
        sensitivity states in case sticky case sensitivity is required. */
     switch (searchType) {
-      case SEARCH_LITERAL:
+        case SEARCH_LITERAL:
               *lastLiteralCase = False;
               *lastRegexCase   = True;
              XmToggleButtonSetState(regexToggle, False, False);
              XmToggleButtonSetState(caseToggle,  False, False);
              if (wordToggle) {
                  XmToggleButtonSetState(*wordToggle, False, False);
                   XtSetSensitive(*wordToggle, True);
               }
-      break;
-      case SEARCH_CASE_SENSE:
+            break;
+
+        case SEARCH_CASE_SENSE:
               *lastLiteralCase = True;
               *lastRegexCase   = True;
              XmToggleButtonSetState(regexToggle, False, False);
              XmToggleButtonSetState(caseToggle,  True,  False);
              if (wordToggle) {
                   XmToggleButtonSetState(*wordToggle, False, False);
                   XtSetSensitive(*wordToggle, True);
               }
-      break;
-      case SEARCH_LITERAL_WORD:
+            break;
+
+        case SEARCH_LITERAL_WORD:
               *lastLiteralCase = False;
               *lastRegexCase   = True;
              XmToggleButtonSetState(regexToggle, False, False);
              XmToggleButtonSetState(caseToggle, False, False);
              if (wordToggle) {
                   XmToggleButtonSetState(*wordToggle,  True,  False);
                   XtSetSensitive(*wordToggle, True);
               }
-      break;
-      case SEARCH_CASE_SENSE_WORD:
+            break;
+
+        case SEARCH_CASE_SENSE_WORD:
               *lastLiteralCase = True;
               *lastRegexCase   = True;
              XmToggleButtonSetState(regexToggle, False, False);
              XmToggleButtonSetState(caseToggle,  True,  False);
              if (wordToggle) {
                   XmToggleButtonSetState(*wordToggle,  True,  False);
                   XtSetSensitive(*wordToggle, True);
               }
-      break;
-      case SEARCH_REGEX:
+            break;
+
+        case SEARCH_REGEX:
               *lastLiteralCase = False;
               *lastRegexCase   = True;
              XmToggleButtonSetState(regexToggle, True,  False);
              XmToggleButtonSetState(caseToggle,  True,  False);
              if (wordToggle) {
                   XmToggleButtonSetState(*wordToggle,  False, False);
                   XtSetSensitive(*wordToggle, False);
               }
-      break;
-      case SEARCH_REGEX_NOCASE:
-              *lastLiteralCase = False;
-              *lastRegexCase   = False;
-             XmToggleButtonSetState(regexToggle, True,  False);
-             XmToggleButtonSetState(caseToggle,  False, False);
-             if (wordToggle) {
-                  XmToggleButtonSetState(*wordToggle,  False, False);
-                  XtSetSensitive(*wordToggle, False);
-              }
-      break;
+            break;
+
+        case SEARCH_REGEX_NOCASE:
+        case SEARCH_REGEX_SMARTCASE:
+            /* Smart case is no case for default setting */
+            *lastLiteralCase = False;
+            *lastRegexCase   = False;
+            XmToggleButtonSetState(regexToggle, True,  False);
+            XmToggleButtonSetState(caseToggle,  False, False);
+            if (wordToggle) {
+                XmToggleButtonSetState(*wordToggle,  False, False);
+                XtSetSensitive(*wordToggle, False);
+            }
+            break;
     }
 }
 
 #ifdef REPLACE_SCOPE
 /*
@@ -2404,14 +2413,23 @@ static int textFieldNonEmpty(Widget w)
     int nonEmpty = (str[0] != '\0');
     XtFree(str);
     return(nonEmpty);
 }
 
-static void rFindTextValueChangedCB(Widget w, WindowInfo *window, XKeyEvent *event)
+static void rFindTextValueChangedCB(Widget textWidget, WindowInfo* window,
+        XKeyEvent* event)
 {
-    window = WidgetToWindow(w);
+    char* searchString = XmTextGetString(textWidget);
+
+    window = WidgetToWindow(textWidget);
     UpdateReplaceActionButtons(window);
+
+    /*  Switch to case-sensitive as soon as the user enters an upper-case
+        letter. We have check the whole string each time to catch clipboard
+        or selection inserts. */
+    smartCaseToggle(searchString, window->replaceCaseToggle);
+    XtFree(searchString);
 }
 
 static void rFindArrowKeyCB(Widget w, WindowInfo *window, XKeyEvent *event)
 {
     KeySym keysym = XLookupKeysym(event, 0);
@@ -2499,14 +2517,23 @@ static void fUpdateActionButtons(WindowI
 {
     int buttonState = textFieldNonEmpty(window->findText);
     XtSetSensitive(window->findBtn, buttonState);
 }
 
-static void findTextValueChangedCB(Widget w, WindowInfo *window, XKeyEvent *event)
+static void findTextValueChangedCB(Widget textWidget, WindowInfo* window,
+        XKeyEvent* event)
 {
-    window = WidgetToWindow(w);
+    char* searchString = XmTextGetString(textWidget);
+
+    window = WidgetToWindow(textWidget);
     fUpdateActionButtons(window);
+
+    /*  Switch to case-sensitive as soon as the user enters an upper-case
+        letter. We have check the whole string each time to catch clipboard
+        or selection inserts. */
+    smartCaseToggle(searchString, window->findCaseToggle);
+    XtFree(searchString);
 }
 
 static void findArrowKeyCB(Widget w, WindowInfo *window, XKeyEvent *event)
 {
     KeySym keysym = XLookupKeysym(event, 0);
@@ -2527,11 +2554,10 @@ static void findArrowKeyCB(Widget w, Win
     /* if the index is out of range, beep and return */
     if (index != 0 && historyIndex(index) == -1) {
        XBell(TheDisplay, 0);
        return;
     }
-    
 
     /* determine the strings and button settings to use */
     if (index == 0) {
        searchStr = "";
        searchType = GetPrefSearch();
@@ -2874,36 +2900,45 @@ static void selectedSearchCB(Widget w, X
     XtFree(value);
     
     /* Use the passed method for searching, unless it is regex, since this
        kind of search is by definition a literal search */
     searchType = callDataItems->searchType;
-    if (searchType == SEARCH_REGEX )
-      searchType = SEARCH_CASE_SENSE;
-    else if (searchType == SEARCH_REGEX_NOCASE)
-             searchType = SEARCH_LITERAL;
+    if (searchType == SEARCH_REGEX || searchType == SEARCH_REGEX_SMARTCASE) {
+        /*  Here smart case must be sensitive, because the user
+            cannot modify the string to search for. */
+        searchType = SEARCH_CASE_SENSE;
+    } else if (searchType == SEARCH_REGEX_NOCASE) {
+        searchType = SEARCH_LITERAL;
+    }
 
     /* search for it in the window */
     SearchAndSelect(window, callDataItems->direction, searchString,
         searchType, callDataItems->searchWrap);
     XtFree(callData);
 }
 
 /*
 ** Pop up and clear the incremental search line and prepare to search.
 */
-void BeginISearch(WindowInfo *window, int direction)
+void BeginISearch(WindowInfo* window, int direction)
 {
     window->iSearchStartPos = -1;
     XmTextSetString(window->iSearchText, "");
     XmToggleButtonSetState(window->iSearchRevToggle,
-           direction == SEARCH_BACKWARD, FALSE);
+            direction == SEARCH_BACKWARD, FALSE);
+
     /* Note: in contrast to the replace and find dialogs, the regex and
        case toggles are not reset to their default state when the incremental
        search bar is redisplayed. I'm not sure whether this is the best
        choice. If not, an initToggleButtons() call should be inserted
        here. But in that case, it might be appropriate to have different
        default search modes for i-search and replace/find. */
+
+    /* The 'Case' toggle button must be deactivated for smart cases. */
+    if (GetPrefSearch() == SEARCH_REGEX_SMARTCASE) {
+        XmToggleButtonSetState(window->iSearchCaseToggle, False, False);
+    }
     TempShowISearch(window, TRUE);
     XmProcessTraversal(window->iSearchText, XmTRAVERSE_CURRENT);
 }
 
 /*
@@ -3181,32 +3216,40 @@ static void iSearchTextActivateCB(Widget
 
 /*
 ** Called when user types in the incremental search line.  Redoes the
 ** search for the new search string.
 */
-static void iSearchTextValueChangedCB(Widget w, WindowInfo *window,
-       XmAnyCallbackStruct *callData) 
+static void iSearchTextValueChangedCB(Widget widget, WindowInfo *window,
+        XmAnyCallbackStruct *callData)
 {
     char *params[5];
     char *searchString;
     int searchType, direction, nParams;
-   
-    window = WidgetToWindow(w);
-    
+
+    window = WidgetToWindow(widget);
+
     /* Fetch the string, search type and direction from the incremental
        search bar widgets at the top of the window */
     searchString = XmTextGetString(window->iSearchText);
+
+    /*  Switch to case-sensitive as soon as the user enters an upper-case
+        letter. We have check the whole string each time to catch clipboard
+        or selection inserts. */
+    smartCaseToggle(searchString, window->iSearchCaseToggle);
+
     if(XmToggleButtonGetState(window->iSearchCaseToggle)) {
-      if(XmToggleButtonGetState(window->iSearchRegexToggle)) 
-       searchType = SEARCH_REGEX;
-      else 
-       searchType = SEARCH_CASE_SENSE;
+        if(XmToggleButtonGetState(window->iSearchRegexToggle)) {
+            searchType = SEARCH_REGEX;
+        } else {
+            searchType = SEARCH_CASE_SENSE;
+        }
     } else {
-      if(XmToggleButtonGetState(window->iSearchRegexToggle)) 
-       searchType = SEARCH_REGEX_NOCASE;
-      else 
-       searchType = SEARCH_LITERAL;
+        if(XmToggleButtonGetState(window->iSearchRegexToggle)) {
+            searchType = SEARCH_REGEX_NOCASE;
+        } else {
+            searchType = SEARCH_LITERAL;
+        }
     }
     direction = XmToggleButtonGetState(window->iSearchRevToggle) ?
            SEARCH_BACKWARD : SEARCH_FORWARD;
 
     /* If the search type is a regular expression, test compile it.  If it
@@ -4872,11 +4915,13 @@ static char *directionArg(int direction)
 /*
 ** Checks whether a search mode in one of the regular expression modes.
 */
 static int isRegexType(int searchType)
 {
-    return searchType == SEARCH_REGEX || searchType == SEARCH_REGEX_NOCASE;
+    return searchType == SEARCH_REGEX
+            || searchType == SEARCH_REGEX_NOCASE
+            || searchType == SEARCH_REGEX_SMARTCASE;
 }
 
 /*
 ** Returns the default flags for regular expression matching, given a 
 ** regular expression search mode.
@@ -5003,17 +5048,35 @@ static void replaceCaseToggleCB(Widget w
        window->replaceLastRegexCase = searchCaseSense;
     else
        window->replaceLastLiteralCase = searchCaseSense;
 }
 
-static void iSearchCaseToggleCB(Widget w, XtPointer clientData, XtPointer callData)
+static void iSearchCaseToggleCB(Widget toggleButton, XtPointer clientData,
+        XtPointer callData)
 {
-    WindowInfo * window = WidgetToWindow(w);
-    int searchCaseSense = XmToggleButtonGetState(w);
+    WindowInfo * window = WidgetToWindow(toggleButton);
+    int searchCaseSense = XmToggleButtonGetState(toggleButton);
     
     /* Save the state of the Case Sensitive button 
        depending on the state of the Regex button*/
     if(XmToggleButtonGetState(window->iSearchRegexToggle))
        window->iSearchLastRegexCase = searchCaseSense;
     else
        window->iSearchLastLiteralCase = searchCaseSense;
 }
+
+/*
+**  Will search a string for uppercase characters. If there is one,
+**  The toggleButton will be set to True.
+*/
+static void smartCaseToggle(const char* searchString, Widget toggleButton)
+{
+    if (GetPrefSearch() == SEARCH_REGEX_SMARTCASE) {
+        int i;
+        for (i = 0; i < strlen(searchString); i++) {
+            if (isupper(*(searchString + i))) {
+                XmToggleButtonSetState(toggleButton, True, False);
+                break;
+            }
+        }
+    }
+}
diff --quilt old/source/search.h new/source/search.h
--- old/source/search.h
+++ new/source/search.h
@@ -85,14 +85,16 @@ Boolean WindowCanBeClosed(WindowInfo *wi
 ** The order of the integers in this enumeration must be exactly
 ** the same as the order of the coressponding strings of the
 ** array  SearchMethodStrings defined in preferences.c (!!)
 **
 */
-enum SearchType {
-       SEARCH_LITERAL, SEARCH_CASE_SENSE, SEARCH_REGEX, 
-       SEARCH_LITERAL_WORD, SEARCH_CASE_SENSE_WORD, SEARCH_REGEX_NOCASE,
-        N_SEARCH_TYPES /* must be last in enum SearchType */ };
+enum SearchType
+{
+    SEARCH_LITERAL, SEARCH_CASE_SENSE, SEARCH_REGEX, SEARCH_LITERAL_WORD,
+    SEARCH_CASE_SENSE_WORD, SEARCH_REGEX_NOCASE, SEARCH_REGEX_SMARTCASE,
+    N_SEARCH_TYPES /* must be last in enum SearchType */
+};
 
 #ifdef REPLACE_SCOPE
 /* Scope on which the replace operations apply */
 enum ReplaceScope { REPL_SCOPE_WIN, REPL_SCOPE_SEL, REPL_SCOPE_MULTI };
 
diff --quilt old/source/selection.c new/source/selection.c
--- old/source/selection.c
+++ new/source/selection.c
@@ -27,21 +27,23 @@ static const char CVSID[] = "$Id: select
 
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
 #endif
 
-#include "selection.h"
-#include "textBuf.h"
-#include "text.h"
-#include "nedit.h"
 #include "file.h"
-#include "window.h"
+#include "interpret.h"
+#include "macro.h"
 #include "menu.h"
+#include "nedit.h"
 #include "preferences.h"
+#include "selection.h"
 #include "server.h"
+#include "textBuf.h"
+#include "text.h"
 #include "../util/DialogF.h"
 #include "../util/fileUtils.h"
+#include "window.h"
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
@@ -349,23 +351,34 @@ static void fileCB(Widget widget, Window
           XtFree(nameList[i]);
        }
       XtFree((char *)nameList);
     }
 #else
-    { glob_t globbuf;
-      int i;
-
-      glob(nameText, GLOB_NOCHECK, NULL, &globbuf);
-      for (i=0; i<(int)globbuf.gl_pathc; i++) {
-         if (ParseFilename(globbuf.gl_pathv[i], filename, pathname) != 0)
-             XBell(TheDisplay, 0);
-         else
-             EditExistingFile(GetPrefOpenInTab()? window : NULL, 
-                     filename, pathname, 0, NULL, False, NULL, 
-                     GetPrefOpenInTab(), False);
-      }
-      globfree(&globbuf);
+    {
+        glob_t globbuf;
+        int i;
+
+        glob(nameText, GLOB_NOCHECK, NULL, &globbuf);
+        for (i = 0; i < (int) globbuf.gl_pathc; i++) {
+            DataValue* fileNameArg = (DataValue*) XtMalloc(sizeof(DataValue));
+            DataValue* resultDV = (DataValue*) XtMalloc(sizeof(DataValue));
+
+            fileNameArg->tag = STRING_TAG;
+            AllocNStringNCpy(&fileNameArg->val.str, globbuf.gl_pathv[i], MAXPATHLEN);
+            MacroApplyHook(window, "file_name_hook", 1, fileNameArg, resultDV);
+            XtFree((char*) fileNameArg);
+
+            if (ParseFilename(resultDV->val.str.rep, filename, pathname) != 0) {
+                XBell(TheDisplay, 0);
+            } else {
+                EditExistingFile(GetPrefOpenInTab() ? window : NULL, filename,
+                        pathname, 0, NULL, False, NULL, GetPrefOpenInTab(),
+                        False);
+            }
+            XtFree((char*) resultDV);
+        }
+        globfree(&globbuf);
     }
 #endif
     CheckCloseDim();
 }
 
diff --quilt old/source/server.c new/source/server.c
--- old/source/server.c
+++ new/source/server.c
@@ -242,12 +242,10 @@ static void deleteFileOpenProperty2(cons
 {
     Atom atom = findFileOpenProperty(filename, pathname);
     deleteProperty(&atom);
 }
 
-
-
 /* Try to find existing 'FileClosed' property atom for path. */
 static Atom findFileClosedProperty(const char* filename,
                                    const char* pathname)
 {
     char path[MAXPATHLEN];
@@ -354,11 +352,11 @@ static void processServerCommandString(c
            if (!window->filenameSet && !window->fileChanged &&
                 isLocatedOnDesktop(window, currentDesktop))
                break;
        if (window == NULL) {
             EditNewFile(findWindowOnDesktop(tabbed, currentDesktop), NULL, 
-                        False, NULL, NULL);
+                        False, NULL, NULL, False);
            CheckCloseDim();
        } 
        else {
            RaiseDocument(window);
            XMapRaised(TheDisplay, XtWindow(window->shell));
@@ -417,12 +415,13 @@ static void processServerCommandString(c
                     isLocatedOnDesktop(window, currentDesktop))
                    break;
 
            if (*doCommand == '\0') {
                 if (window == NULL) {
-                   EditNewFile(findWindowOnDesktop(tabbed, currentDesktop), 
-                                NULL, iconicFlag, lmLen==0?NULL:langMode, NULL);
+                    EditNewFile(findWindowOnDesktop(tabbed, currentDesktop),
+                            NULL, iconicFlag, lmLen==0?NULL:langMode, NULL,
+                            False);
                } else {
                    if (iconicFlag)
                        RaiseDocument(window);
                    else
                        RaiseDocumentWindow(window);
diff --quilt old/source/shell.c new/source/shell.c
--- old/source/shell.c
+++ new/source/shell.c
@@ -387,11 +387,12 @@ void DoShellMenuCmd(WindowInfo *window, 
     if (output == TO_DIALOG) {
        outWidget = NULL;
        flags |= OUTPUT_TO_DIALOG;
        left = right = 0;
     } else if (output == TO_NEW_WINDOW) {
-       EditNewFile(GetPrefOpenInTab()?inWindow:NULL, NULL, False, NULL, window->path);
+        EditNewFile(GetPrefOpenInTab()?inWindow:NULL, NULL, False, NULL,
+                window->path, False);
        outWidget = WindowList->textArea;
        inWindow = WindowList;
        left = right = 0;
        CheckCloseDim();
     } else { /* TO_SAME_WINDOW */
@@ -478,11 +479,11 @@ void AbortShellCommand(WindowInfo *windo
 */
 static void issueCommand(WindowInfo *window, const char *command, char *input,
        int inputLen, int flags, Widget textW, int replaceLeft,
        int replaceRight, int fromMacro)
 {
-    int stdinFD, stdoutFD, stderrFD = 0;
+    int stdinFD = 0, stdoutFD = 0, stderrFD = 0;
     XtAppContext context = XtWidgetToApplicationContext(window->shell);
     shellCmdInfo *cmdData;
     pid_t childPid;
     
     /* verify consistency of input parameters */
diff --quilt old/source/text.c new/source/text.c
--- old/source/text.c
+++ new/source/text.c
@@ -629,10 +629,17 @@ static XtResource resources[] = {
       XtOffset(TextWidget, text.highlightFGPixel), XmRString, 
       NEDIT_DEFAULT_HI_FG},
     {textNhighlightBackground, textCHighlightBackground, XmRPixel,sizeof(Pixel),
       XtOffset(TextWidget, text.highlightBGPixel), XmRString, 
       NEDIT_DEFAULT_HI_BG},
+    {textNcursorlineBackground, textCCursorlineBackground, XmRPixel,sizeof(Pixel),
+      XtOffset(TextWidget, text.cursorlineBGPixel), XmRString,
+      NEDIT_DEFAULT_CURSORLINE_BG},
+    {textNshowCursorline, textCshowCursorline, XmRBoolean, sizeof(Boolean),
+      XtOffset(TextWidget, text.showCursorline), XmRString, "False"},
+    {textNshowScrolltip, textCshowScrolltip, XmRBoolean, sizeof(Boolean),
+      XtOffset(TextWidget, text.showScrolltip), XmRString, "False"},
     {textNlineNumForeground, textCLineNumForeground, XmRPixel,sizeof(Pixel),
       XtOffset(TextWidget, text.lineNumFGPixel), XmRString, 
       NEDIT_DEFAULT_LINENO_FG},
     {textNcursorForeground, textCCursorForeground, XmRPixel,sizeof(Pixel),
       XtOffset(TextWidget, text.cursorFGPixel), XmRString, 
@@ -641,10 +648,13 @@ static XtResource resources[] = {
       XtOffset(TextWidget, text.calltipFGPixel), XmRString, 
       NEDIT_DEFAULT_CALLTIP_FG},
     {textNcalltipBackground, textCcalltipBackground, XmRPixel,sizeof(Pixel),
       XtOffset(TextWidget, text.calltipBGPixel), XmRString, 
       NEDIT_DEFAULT_CALLTIP_BG},
+    {textNwrapMarginForeground, textCWrapMarginForeground, XmRPixel,sizeof(Pixel),
+      XtOffset(TextWidget, text.wrapMarginFGPixel), XmRString,
+      NEDIT_DEFAULT_WRAPMARGIN_FG},
     {textNbacklightCharTypes,textCBacklightCharTypes,XmRString,sizeof(XmString),
       XtOffset(TextWidget, text.backlightCharTypes), XmRString, NULL},
     {textNrows, textCRows, XmRInt,sizeof(int),
       XtOffset(TextWidget, text.rows), XmRString, "24"},
     {textNcolumns, textCColumns, XmRInt, sizeof(int),
@@ -671,10 +681,12 @@ static XtResource resources[] = {
       XtOffset(TextWidget, text.readOnly), XmRString, "False"},
     {textNhidePointer, textCHidePointer, XmRBoolean, sizeof(Boolean),
       XtOffset(TextWidget, text.hidePointer), XmRString, "False"},
     {textNwrapMargin, textCWrapMargin, XmRInt, sizeof(int),
       XtOffset(TextWidget, text.wrapMargin), XmRString, "0"},
+    {textNshowWrapMargin, textCShowWrapMargin, XmRBoolean, sizeof(Boolean),
+      XtOffset(TextWidget, text.showWrapMargin), XmRString, "True"},
     {textNhScrollBar, textCHScrollBar, XmRWidget, sizeof(Widget),
       XtOffset(TextWidget, text.hScrollBar), XmRString, ""},
     {textNvScrollBar, textCVScrollBar, XmRWidget, sizeof(Widget),
       XtOffset(TextWidget, text.vScrollBar), XmRString, ""},
     {textNlineNumCols, textCLineNumCols, XmRInt, sizeof(int),
@@ -810,24 +822,34 @@ static void initialize(TextWidget reques
     buf = BufCreate();
     
     /* Create and initialize the text-display part of the widget */
     textLeft = new->text.marginWidth +
            (lineNumCols == 0 ? 0 : marginWidth + charWidth * lineNumCols);
-    new->text.textD = TextDCreate((Widget)new, new->text.hScrollBar,
-           new->text.vScrollBar, textLeft, new->text.marginHeight,
-           new->core.width - marginWidth - textLeft,
-           new->core.height - new->text.marginHeight * 2,
-           lineNumCols == 0 ? 0 : marginWidth,
-           lineNumCols == 0 ? 0 : lineNumCols * charWidth,
-           buf, new->text.fontStruct, new->core.background_pixel,
-           new->primitive.foreground, new->text.selectFGPixel,
-           new->text.selectBGPixel, new->text.highlightFGPixel,
-           new->text.highlightBGPixel, new->text.cursorFGPixel,
-           new->text.lineNumFGPixel,
-          new->text.continuousWrap, new->text.wrapMargin,
-          new->text.backlightCharTypes, new->text.calltipFGPixel,
-          new->text.calltipBGPixel);
+    new->text.textD = TextDCreate(
+            /*  Widgets  */
+            (Widget)new, new->text.hScrollBar, new->text.vScrollBar,
+            /*  Positions  */
+            textLeft, new->text.marginHeight,
+            new->core.width - marginWidth - textLeft,
+            new->core.height - new->text.marginHeight * 2,
+            lineNumCols == 0 ? 0 : marginWidth,
+            lineNumCols == 0 ? 0 : lineNumCols * charWidth,
+            /*  buffer  */
+            buf,
+            /*  font  */
+            new->text.fontStruct,
+            /*  Pixels  */
+            new->core.background_pixel, new->primitive.foreground,
+            new->text.selectFGPixel, new->text.selectBGPixel,
+            new->text.highlightFGPixel, new->text.highlightBGPixel,
+            new->text.cursorFGPixel, new->text.lineNumFGPixel,
+            new->text.wrapMarginFGPixel, new->text.calltipFGPixel,
+            new->text.calltipBGPixel, new->text.cursorlineBGPixel,
+            /*  misc  */
+            new->text.continuousWrap, new->text.wrapMargin,
+            new->text.showWrapMargin, new->text.backlightCharTypes,
+            new->text.showCursorline, new->text.showScrolltip);
 
     /* Add mandatory delimiters blank, tab, and newline to the list of
        delimiters.  The memory use scheme here is that new values are
        always copied, and can therefore be safely freed on subsequent
        set-values calls or destroy */
@@ -1121,10 +1143,25 @@ static Boolean setValues(TextWidget curr
     if (new->text.wrapMargin != current->text.wrapMargin ||
            new->text.continuousWrap != current->text.continuousWrap)
        TextDSetWrapMode(current->text.textD, new->text.continuousWrap,
                new->text.wrapMargin);
     
+    if (new->text.showWrapMargin != current->text.showWrapMargin)
+        TextDSetShowWrapMargin(current->text.textD, new->text.showWrapMargin);
+
+    if (new->text.showCursorline != current->text.showCursorline) {
+        current->text.showCursorline = new->text.showCursorline;
+        if (current->text.textD)
+        {
+            current->text.textD->showCursorline = new->text.showCursorline;
+        }
+
+        /*  jegub
+        redraw = True; */
+        TextDSetShowCursorline(current->text.textD, new->text.showCursorline);
+    }
+
     /* When delimiters are changed, copy the memory, so that the caller
        doesn't have to manage it, and add mandatory delimiters blank,
        tab, and newline to the list */
     if (new->text.delimiters != current->text.delimiters) {
        char *delimiters = XtMalloc(strlen(new->text.delimiters) + 4);
@@ -3750,12 +3787,15 @@ static void selectWord(Widget w, int poi
     TextWidget tw = (TextWidget)w;
     textBuffer *buf = tw->text.textD->buffer;
     int x, y, insertPos = TextDGetInsertPosition(tw->text.textD);
     
     TextPosToXY(w, insertPos, &x, &y);
-    if (pointerX < x && insertPos > 0 && BufGetCharacter(buf, insertPos-1) != '\n')
-       insertPos--;
+    if (pointerX < x && insertPos > 0
+            && BufGetCharacter(buf, insertPos-1) != '\n')
+    {
+        insertPos--;
+    }
     BufSelect(buf, startOfWord(tw, insertPos), endOfWord(tw, insertPos));
 }
 
 static int startOfWord(TextWidget w, int pos)
 {
diff --quilt old/source/text.h new/source/text.h
--- old/source/text.h
+++ new/source/text.h
@@ -51,18 +51,30 @@
 #define textCSelectBackground "SelectBackground"
 #define textNhighlightForeground "highlightForeground"
 #define textCHighlightForeground "HighlightForeground"
 #define textNhighlightBackground "highlightBackground"
 #define textCHighlightBackground "HighlightBackground"
+
+#define textNcursorlineBackground "cursorlineBackground"
+#define textCCursorlineBackground "CursorlineBackground"
+
+#define textNshowCursorline "showCursorline"
+#define textCshowCursorline "ShowCursorline"
+
+#define textNshowScrolltip "showScrolltip"
+#define textCshowScrolltip "ShowScrolltip"
+
 #define textNcursorForeground "cursorForeground"
 #define textCCursorForeground "CursorForeground"
 #define textNlineNumForeground "lineNumForeground"
 #define textCLineNumForeground "LineNumForeground"
 #define textNcalltipForeground "calltipForeground"
 #define textCcalltipForeground "CalltipForeground"
 #define textNcalltipBackground "calltipBackground"
 #define textCcalltipBackground "CalltipBackground"
+#define textNwrapMarginForeground "wrapMarginForeground"
+#define textCWrapMarginForeground "WrapMarginForeground"
 #define textNpendingDelete "pendingDelete"
 #define textCPendingDelete "PendingDelete"
 #define textNhScrollBar "hScrollBar"
 #define textCHScrollBar "HScrollBar"
 #define textNvScrollBar "vScrollBar"
@@ -93,10 +105,12 @@
 #define textCAutoWrap "AutoWrap"
 #define textNcontinuousWrap "continuousWrap"
 #define textCContinuousWrap "ContinuousWrap"
 #define textNwrapMargin "wrapMargin"
 #define textCWrapMargin "WrapMargin"
+#define textNshowWrapMargin "showWrapMargin"
+#define textCShowWrapMargin "ShowWrapMargin"
 #define textNautoIndent "autoIndent"
 #define textCAutoIndent "AutoIndent"
 #define textNsmartIndent "smartIndent"
 #define textCSmartIndent "SmartIndent"
 #define textNoverstrike "overstrike"
diff --quilt old/source/textDisp.c new/source/textDisp.c
--- old/source/textDisp.c
+++ new/source/textDisp.c
@@ -62,41 +62,44 @@ static const char CVSID[] = "$Id: textDi
 #include "../debug.h"
 #endif
 
 /* Masks for text drawing methods.  These are or'd together to form an
    integer which describes what drawing calls to use to draw a string */
+#define STYLE_LOOKUP_SHIFT 0
 #define FILL_SHIFT 8
 #define SECONDARY_SHIFT 9
 #define PRIMARY_SHIFT 10
 #define HIGHLIGHT_SHIFT 11
-#define STYLE_LOOKUP_SHIFT 0
 #define BACKLIGHT_SHIFT 12
+#define RANGESET_SHIFT 20
+#define CURSORLINE_SHIFT 26
 
 #define FILL_MASK (1 << FILL_SHIFT)
 #define SECONDARY_MASK (1 << SECONDARY_SHIFT)
 #define PRIMARY_MASK (1 << PRIMARY_SHIFT)
 #define HIGHLIGHT_MASK (1 << HIGHLIGHT_SHIFT)
 #define STYLE_LOOKUP_MASK (0xff << STYLE_LOOKUP_SHIFT)
 #define BACKLIGHT_MASK  (0xff << BACKLIGHT_SHIFT)
-
-#define RANGESET_SHIFT (20)
 #define RANGESET_MASK (0x3F << RANGESET_SHIFT)
+#define CURSORLINE_MASK (1 << CURSORLINE_SHIFT)
 
 /* If you use both 32-Bit Style mask layout:
    Bits +----------------+----------------+----------------+----------------+
     hex |1F1E1D1C1B1A1918|1716151413121110| F E D C B A 9 8| 7 6 5 4 3 2 1 0|
     dec |3130292827262524|2322212019181716|151413121110 9 8| 7 6 5 4 3 2 1 0|
         +----------------+----------------+----------------+----------------+
-   Type |             r r| r r r r b b b b| b b b b H 1 2 F| s s s s s s s s|
+   Type |           c r r| r r r r b b b b| b b b b H 1 2 F| s s s s s s s s|
         +----------------+----------------+----------------+----------------+
-   where: s - style lookup value (8 bits)
+   where:
+        s - style lookup value (8 bits)
         F - fill (1 bit)
         2 - secondary selection  (1 bit)
         1 - primary selection (1 bit)
         H - highlight (1 bit)
         b - backlighting index (8 bits)
         r - rangeset index (6 bits)
+        c - cursorline coloring (1 bit)
    This leaves 6 "unused" bits */
 
 /* Maximum displayable line length (how many characters will fit across the
    widest window).  This amount of memory is temporarily allocated from the
    stack in the redisplayLine routine for drawing strings */
@@ -113,10 +116,12 @@ static void offsetLineStarts(textDisp *t
 static void calcLineStarts(textDisp *textD, int startLine, int endLine);
 static void calcLastChar(textDisp *textD);
 static int posToVisibleLineNum(textDisp *textD, int pos, int *lineNum);
 static void redisplayLine(textDisp *textD, int visLineNum, int leftClip,
         int rightClip, int leftCharIndex, int rightCharIndex);
+static void redisplayLineCur(textDisp *textD, int visLineNum, int leftClip,
+        int rightClip, int leftCharIndex, int rightCharIndex, Boolean curLine);
 static void drawString(textDisp *textD, int style, int x, int y, int toX,
         char *string, int nChars);
 static void clearRect(textDisp *textD, GC gc, int x, int y, 
         int width, int height);
 static void drawCursor(textDisp *textD, int x, int y);
@@ -147,11 +152,12 @@ static int countLines(const char *string
 static int measureVisLine(textDisp *textD, int visLineNum);
 static int emptyLinesVisible(textDisp *textD);
 static void blankCursorProtrusions(textDisp *textD);
 static void allocateFixedFontGCs(textDisp *textD, XFontStruct *fontStruct,
         Pixel bgPixel, Pixel fgPixel, Pixel selectFGPixel, Pixel selectBGPixel,
-        Pixel highlightFGPixel, Pixel highlightBGPixel, Pixel lineNumFGPixel);
+        Pixel highlightFGPixel, Pixel highlightBGPixel, Pixel lineNumFGPixel,
+        Pixel wrapMarginFGPixel, Pixel cursorlineBGPixel);
 static GC allocateGC(Widget w, unsigned long valueMask,
         unsigned long foreground, unsigned long background, Font font,
         unsigned long dynamicMask, unsigned long dontCareMask);
 static void releaseGC(Widget w, GC gc);
 static void resetClipRectangles(textDisp *textD);
@@ -177,19 +183,24 @@ static void resetAbsLineNum(textDisp *te
 static int measurePropChar(const textDisp* textD, const char c,
         const int colNum, const int pos);
 static Pixel allocBGColor(Widget w, char *colorName, int *ok);
 static Pixel getRangesetColor(textDisp *textD, int ind, Pixel bground);
 static void textDRedisplayRange(textDisp *textD, int start, int end);
+static void drawWrapMargin(textDisp* textD);
+static void redisplayCursor(textDisp* textD);
 
 textDisp *TextDCreate(Widget widget, Widget hScrollBar, Widget vScrollBar,
         Position left, Position top, Position width, Position height,
-        Position lineNumLeft, Position lineNumWidth, textBuffer *buffer,
-        XFontStruct *fontStruct, Pixel bgPixel, Pixel fgPixel,
-        Pixel selectFGPixel, Pixel selectBGPixel, Pixel highlightFGPixel,
-        Pixel highlightBGPixel, Pixel cursorFGPixel, Pixel lineNumFGPixel,
-        int continuousWrap, int wrapMargin, XmString bgClassString,
-        Pixel calltipFGPixel, Pixel calltipBGPixel)
+        Position lineNumLeft, Position lineNumWidth,
+        textBuffer *buffer,
+        XFontStruct *fontStruct,
+        Pixel bgPixel, Pixel fgPixel, Pixel selectFGPixel, Pixel selectBGPixel,
+        Pixel highlightFGPixel, Pixel highlightBGPixel, Pixel cursorFGPixel,
+        Pixel lineNumFGPixel, Pixel wrapMarginFGPixel, Pixel calltipFGPixel,
+        Pixel calltipBGPixel, Pixel cursorlineBGPixel,
+        int continuousWrap, int wrapMargin, Boolean showWrapMargin,
+        XmString bgClassString, Boolean showCursorline, Boolean showScrolltip)
 {
     textDisp *textD;
     XGCValues gcValues;
     int i;
     
@@ -230,29 +241,34 @@ textDisp *TextDCreate(Widget widget, Wid
     textD->selectFGPixel = selectFGPixel;
     textD->highlightFGPixel = highlightFGPixel;
     textD->selectBGPixel = selectBGPixel;
     textD->highlightBGPixel = highlightBGPixel;
     textD->lineNumFGPixel = lineNumFGPixel;
+    textD->wrapMarginFGPixel = wrapMarginFGPixel;
     textD->cursorFGPixel = cursorFGPixel;
     textD->wrapMargin = wrapMargin;
     textD->continuousWrap = continuousWrap;
+    textD->showWrapMargin = showWrapMargin;
+    textD->cursorlineBGPixel = cursorlineBGPixel;
     allocateFixedFontGCs(textD, fontStruct, bgPixel, fgPixel, selectFGPixel,
-            selectBGPixel, highlightFGPixel, highlightBGPixel, lineNumFGPixel);
+            selectBGPixel, highlightFGPixel, highlightBGPixel, lineNumFGPixel,
+            wrapMarginFGPixel, cursorlineBGPixel);
     textD->styleGC = allocateGC(textD->w, 0, 0, 0, fontStruct->fid,
             GCClipMask|GCForeground|GCBackground, GCArcMode);
     textD->lineNumLeft = lineNumLeft;
     textD->lineNumWidth = lineNumWidth;
     textD->nVisibleLines = (height - 1) / (textD->ascent + textD->descent) + 1;
     gcValues.foreground = cursorFGPixel;
     textD->cursorFGGC = XtGetGC(widget, GCForeground, &gcValues);
     textD->lineStarts = (int *)XtMalloc(sizeof(int) * textD->nVisibleLines);
     textD->lineStarts[0] = 0;
-    textD->calltipW = NULL;
-    textD->calltipShell = NULL;
+    textD->calltip.widget = NULL;
     textD->calltip.ID = 0;
     textD->calltipFGPixel = calltipFGPixel;
     textD->calltipBGPixel = calltipBGPixel;
+    textD->showScrolltip = showScrolltip;
+    textD->scrolltip = NULL;
     for (i=1; i<textD->nVisibleLines; i++)
        textD->lineStarts[i] = -1;
     textD->bgClassPixel = NULL;
     textD->bgClass = NULL;
     TextDSetupBGClasses(widget, bgClassString, &textD->bgClassPixel,
@@ -260,10 +276,13 @@ textDisp *TextDCreate(Widget widget, Wid
     textD->suppressResync = 0;
     textD->nLinesDeleted = 0;
     textD->modifyingTabDist = 0;
     textD->pointerHidden = False;
     textD->graphicsExposeQueue = NULL;
+    textD->showCursorline = showCursorline;
+    textD->oldCursorPos = 0;
+    textD->oldLineStart = 0;
 
     /* Attach an event handler to the widget so we can know the visibility
        (used for choosing the fastest drawing method) */
     XtAddEventHandler(widget, VisibilityChangeMask, False,
         visibilityEH, textD);    
@@ -316,13 +335,18 @@ void TextDFree(textDisp *textD)
     releaseGC(textD->w, textD->highlightGC);
     releaseGC(textD->w, textD->selectBGGC);
     releaseGC(textD->w, textD->highlightBGGC);
     releaseGC(textD->w, textD->styleGC);
     releaseGC(textD->w, textD->lineNumGC);
+    releaseGC(textD->w, textD->wrapMarginGC);
+    releaseGC(textD->w, textD->cursorlineGC);
+    releaseGC(textD->w, textD->cursorlineBGGC);
+
     XtFree((char *)textD->lineStarts);
     while (TextDPopGraphicExposeQueueEntry(textD)) {
     }
+
     XtFree((char *)textD->bgClassPixel);
     XtFree((char *)textD->bgClass);
     XtFree((char *)textD);
 }
 
@@ -380,11 +404,12 @@ void TextDAttachHighlightData(textDisp *
 
 
 /* Change the (non syntax-highlit) colors */ 
 void TextDSetColors(textDisp *textD, Pixel textFgP, Pixel textBgP, 
         Pixel selectFgP, Pixel selectBgP, Pixel hiliteFgP, Pixel hiliteBgP, 
-        Pixel lineNoFgP, Pixel cursorFgP)
+        Pixel lineNoFgP, Pixel cursorFgP, Pixel wrapMarginFgP,
+        Pixel cursorlineBgP)
 {
     XGCValues values;
     Display *d = XtDisplay(textD->w);
     
     /* Update the stored pixels */
@@ -394,19 +419,24 @@ void TextDSetColors(textDisp *textD, Pix
     textD->selectBGPixel = selectBgP;
     textD->highlightFGPixel = hiliteFgP;
     textD->highlightBGPixel = hiliteBgP;
     textD->lineNumFGPixel = lineNoFgP;
     textD->cursorFGPixel = cursorFgP;
+    textD->wrapMarginFGPixel = wrapMarginFgP;
+    textD->cursorlineBGPixel = cursorlineBgP;
 
     releaseGC(textD->w, textD->gc);
     releaseGC(textD->w, textD->selectGC);
     releaseGC(textD->w, textD->selectBGGC);
     releaseGC(textD->w, textD->highlightGC);
     releaseGC(textD->w, textD->highlightBGGC);
     releaseGC(textD->w, textD->lineNumGC);
+    releaseGC(textD->w, textD->wrapMarginGC);
+    releaseGC(textD->w, textD->cursorlineBGGC);
     allocateFixedFontGCs(textD, textD->fontStruct, textBgP, textFgP, selectFgP,
-            selectBgP, hiliteFgP, hiliteBgP, lineNoFgP);
+            selectBgP, hiliteFgP, hiliteBgP, lineNoFgP, wrapMarginFgP,
+            cursorlineBgP);
     
     /* Change the cursor GC (the cursor GC is not shared). */
     values.foreground = cursorFgP;
     XChangeGC( d, textD->cursorFGGC, GCForeground, &values );
     
@@ -414,20 +444,32 @@ void TextDSetColors(textDisp *textD, Pix
     TextDRedisplayRect(textD, textD->left, textD->top, textD->width,
                        textD->height);
     redrawLineNumbers(textD, True);
 }
 
+void TextDSetShowCursorline(textDisp* textD, const Boolean showCursorline)
+{
+    textD->showCursorline = showCursorline;
+
+    /* Redisplay */
+    TextDRedisplayRect(textD, textD->left, textD->top, textD->width,
+            textD->height);
+    redrawLineNumbers(textD, True);
+}
+
 /*
 ** Change the (non highlight) font
 */
 void TextDSetFont(textDisp *textD, XFontStruct *fontStruct)
 {
     Display *display = XtDisplay(textD->w);
     int i, maxAscent = fontStruct->ascent, maxDescent = fontStruct->descent;
     int width, height, fontWidth;
     Pixel bgPixel, fgPixel, selectFGPixel, selectBGPixel;
     Pixel highlightFGPixel, highlightBGPixel, lineNumFGPixel;
+    Pixel wrapMarginFGPixel;
+    Pixel cursorlineBGPixel;
     XGCValues values;
     XFontStruct *styleFont;
     
     /* If font size changes, cursor will be redrawn in a new position */
     blankCursorProtrusions(textD);
@@ -475,20 +517,30 @@ void TextDSetFont(textDisp *textD, XFont
     selectFGPixel = values.foreground;
     selectBGPixel = values.background;
     XGetGCValues(display, textD->highlightGC,GCForeground|GCBackground,&values);
     highlightFGPixel = values.foreground;
     highlightBGPixel = values.background;
+    XGetGCValues(display, textD->cursorlineGC,
+            GCForeground|GCBackground, &values);
+    cursorlineBGPixel = values.background;
     XGetGCValues(display, textD->lineNumGC, GCForeground, &values);
     lineNumFGPixel = values.foreground;
+    XGetGCValues(display, textD->wrapMarginGC, GCForeground, &values);
+    wrapMarginFGPixel = values.foreground;
+
     releaseGC(textD->w, textD->gc);
     releaseGC(textD->w, textD->selectGC);
     releaseGC(textD->w, textD->highlightGC);
     releaseGC(textD->w, textD->selectBGGC);
     releaseGC(textD->w, textD->highlightBGGC);
     releaseGC(textD->w, textD->lineNumGC);
+    releaseGC(textD->w, textD->wrapMarginGC);
+    releaseGC(textD->w, textD->cursorlineGC);
+    releaseGC(textD->w, textD->cursorlineBGGC);
     allocateFixedFontGCs(textD, fontStruct, bgPixel, fgPixel, selectFGPixel,
-            selectBGPixel, highlightFGPixel, highlightBGPixel, lineNumFGPixel);
+            selectBGPixel, highlightFGPixel, highlightBGPixel, lineNumFGPixel,
+            wrapMarginFGPixel, cursorlineBGPixel);
     XSetFont(display, textD->styleGC, fontStruct->fid);
     
     /* Do a full resize to force recalculation of font related parameters */
     width = textD->width;
     height = textD->height;
@@ -642,10 +694,13 @@ void TextDRedisplayRect(textDisp *textD,
        redisplayLine(textD, line, left, left+width, 0, INT_MAX);
     
     /* draw the line numbers if exposed area includes them */
     if (textD->lineNumWidth != 0 && left <= textD->lineNumLeft + textD->lineNumWidth)
        redrawLineNumbers(textD, False);
+
+    /* draw wrap margin incase it got erased */
+    drawWrapMargin(textD);
 }
 
 /*
 ** Refresh all of the text between buffer positions "start" and "end"
 ** not including the character at the position "end".
@@ -654,11 +709,11 @@ void TextDRedisplayRect(textDisp *textD,
 ** any range of characters.
 */
 static void textDRedisplayRange(textDisp *textD, int start, int end)
 {
     int i, startLine, lastLine, startIndex, endIndex;
-    
+
     /* If the range is outside of the displayed text, just return */
     if (end < textD->firstChar || (start > textD->lastChar &&
            !emptyLinesVisible(textD)))
         return;
        
@@ -711,23 +766,103 @@ static void textDRedisplayRange(textDisp
     resetClipRectangles(textD);
     
     /* If the starting and ending lines are the same, redisplay the single
        line between "start" and "end" */
     if (startLine == lastLine) {
+        /*  Add one to endIndex to catch the caret at the end of a range.  */
         redisplayLine(textD, startLine, 0, INT_MAX, startIndex, endIndex);
-       return;
+
+        if (-1 != textD->lineStarts[startLine] ||
+            (BufCountDispChars(textD->buffer, textD->lineStarts[startLine],
+                               start) <= textD->wrapMargin &&
+             BufCountDispChars(textD->buffer, textD->lineStarts[startLine],
+                               end) >= textD->wrapMargin))
+        {
+            /* redraw wrap margin if it got erased */
+            drawWrapMargin(textD);
+        }
+    } else {
+        /* Redisplay the first line from "start" */
+        redisplayLine(textD, startLine, 0, INT_MAX, startIndex, INT_MAX);
+
+        /* Redisplay the lines in between at their full width */
+        for (i = startLine+1; i < lastLine; i++) {
+            redisplayLine(textD, i, 0, INT_MAX, 0, INT_MAX);
+        }
+
+        /*  Redisplay the last line to "end". Add one to the endIndex to catch
+            the caret at the end of a range.  */
+        redisplayLine(textD, lastLine, 0, INT_MAX, 0, endIndex);
+
+        /*  redraw wrap margin  */
+        drawWrapMargin(textD);
     }
-    
-    /* Redisplay the first line from "start" */
-    redisplayLine(textD, startLine, 0, INT_MAX, startIndex, INT_MAX);
-    
-    /* Redisplay the lines in between at their full width */
-    for (i=startLine+1; i<lastLine; i++)
-       redisplayLine(textD, i, 0, INT_MAX, 0, INT_MAX);
+}
 
-    /* Redisplay the last line to "end" */
-    redisplayLine(textD, lastLine, 0, INT_MAX, 0, endIndex);
+/*
+** Custom version of TextDRedisplayRange that only updates the area around
+** the cursor.
+*/
+static void redisplayCursor(textDisp* textD)
+{
+    int cursorLine, lineStart, start, end, startIndex, endIndex;
+    int pos = textD->cursorPos;
+    Boolean cursorLineChanged;
+
+    /* If the cursor is outside of the displayed text, just return */
+    if (pos + 1 < textD->firstChar || pos - 1 > textD->lastChar) {
+        return;
+    }
+
+    if (!posToVisibleLineNum(textD, pos, &cursorLine)) {
+        /*  At first sight, this can only be reached when redisplayCursor()
+            is miscalled or when the catch above didn't work. There is at
+            least one situation though which makes the catch helpless: If
+            your caret is in the last line, column 1 and you move it down,
+            textD->cursorPos will be changed *before* this function is
+            called, the automatic scroll will be done after.  */
+        return;
+    }
+
+    /*  Find the position right before and after the cursor,
+        but make sure that we stay on the same line. */
+    lineStart = TextDStartOfLine(textD, pos);
+    start = max(lineStart, pos - 1);
+    end = min(pos + 1, TextDEndOfLine(textD, lineStart, True) + 1);
+
+    /* Get the starting and ending positions within the line. */
+    startIndex = start - lineStart;
+    endIndex = end - lineStart;
+
+    /* Reset the clipping rectangles for the drawing GCs which are shared
+       using XtAllocateGC, and may have changed since the last use */
+    resetClipRectangles(textD);
+
+    /*  jegub  */
+    cursorLineChanged = (textD->oldCursorPos != textD->cursorPos
+            || textD->oldLineStart != lineStart);
+
+    redisplayLine(textD, cursorLine, 0, INT_MAX, startIndex, endIndex);
+
+    /*  jegub  */
+    if (cursorLineChanged) {
+        /*  Hairline destroyed in old cursor line! Redraw neccessary.  */
+        drawWrapMargin(textD);
+        return;
+    }
+
+    if (BufCountDispChars(textD->buffer, lineStart, end) < textD->wrapMargin) {
+        /*  hairline is off-screen, most common case  */
+        return;
+    }
+
+    if (BufCountDispChars(textD->buffer, lineStart, start)
+            > textD->wrapMargin) {
+        return;
+    }
+
+    drawWrapMargin(textD);
 }
 
 /*
 ** Set the scroll position of the text display vertically by line number and
 ** horizontally by pixel offset from the left margin
@@ -769,12 +904,14 @@ void TextDGetScroll(textDisp *textD, int
 ** Set the position of the text insertion cursor for text display "textD"
 */
 void TextDSetInsertPosition(textDisp *textD, int newPos)
 {
     /* make sure new position is ok, do nothing if it hasn't changed */
-    if (newPos == textD->cursorPos)
-       return;
+    if (newPos == textD->cursorPos) {
+        return;
+    }
+
     if (newPos < 0) newPos = 0;
     if (newPos > textD->buffer->length) newPos = textD->buffer->length;
  
     /* cursor movement cancels vertical cursor motion column */
     textD->cursorPreferredCol = -1;
@@ -783,37 +920,45 @@ void TextDSetInsertPosition(textDisp *te
     TextDBlankCursor(textD);
     
     /* draw it at its new position */
     textD->cursorPos = newPos;
     textD->cursorOn = True;
-    textDRedisplayRange(textD, textD->cursorPos-1, textD->cursorPos + 1);
+
+    redisplayCursor(textD);
+
+    /*  We have to force redraw of the hairline here: The hairline will be
+        erased if the cursorline changes, but will not be redrawn by
+        redisplayCursor() (only works on the area immedietely surrounding
+        the cursor).  */
+    drawWrapMargin(textD);
 }
 
 void TextDBlankCursor(textDisp *textD)
 {
     if (!textD->cursorOn)
        return;
     
     blankCursorProtrusions(textD);
     textD->cursorOn = False;
-    textDRedisplayRange(textD, textD->cursorPos-1, textD->cursorPos+1);
+    redisplayCursor(textD);
 }
 
 void TextDUnblankCursor(textDisp *textD)
 {
     if (!textD->cursorOn) {
        textD->cursorOn = True;
-        textDRedisplayRange(textD, textD->cursorPos-1, textD->cursorPos+1);
+        redisplayCursor(textD);
     }
 }
 
 void TextDSetCursorStyle(textDisp *textD, int style)
 {
     textD->cursorStyle = style;
     blankCursorProtrusions(textD);
-    if (textD->cursorOn) {
-        textDRedisplayRange(textD, textD->cursorPos-1, textD->cursorPos + 1);
+    if (textD->cursorOn)
+    {
+        redisplayCursor(textD);
     }
 }
 
 void TextDSetWrapMode(textDisp *textD, int wrap, int wrapMargin)
 {
@@ -845,10 +990,19 @@ void TextDSetWrapMode(textDisp *textD, i
     /* Do a full redraw */
     TextDRedisplayRect(textD, 0, textD->top, textD->width + textD->left,
            textD->height);
 }
 
+void TextDSetShowWrapMargin(textDisp* textD, int state)
+{
+    textD->showWrapMargin = state;
+
+    /* Do a full redraw */
+    TextDRedisplayRect(textD, 0, textD->top, textD->width + textD->left,
+            textD->height);
+}
+
 int TextDGetInsertPosition(textDisp *textD)
 {
     return textD->cursorPos;
 }
 
@@ -1341,15 +1495,15 @@ int TextDMoveDown(textDisp *textD, int a
     }
 
     column = textD->cursorPreferredCol >= 0
             ? textD->cursorPreferredCol
             : BufCountDispChars(textD->buffer, lineStartPos, textD->cursorPos);
-
-    if (absolute)
+    if (absolute) {
         nextLineStartPos = BufCountForwardNLines(textD->buffer, lineStartPos, 1);
-    else
+    } else {
         nextLineStartPos = TextDCountForwardNLines(textD, lineStartPos, 1, True);
+    }
 
     newPos = BufCountForwardDispChars(textD->buffer, nextLineStartPos, column);
 
     if (textD->continuousWrap && !absolute) {
         newPos = min(newPos, TextDEndOfLine(textD, nextLineStartPos, True));
@@ -1520,11 +1674,11 @@ static void bufModifiedCB(int pos, int n
     textDisp *textD = (textDisp *)cbArg;
     textBuffer *buf = textD->buffer;
     int oldFirstChar = textD->firstChar;
     int scrolled, origCursorPos = textD->cursorPos;
     int wrapModStart, wrapModEnd;
- 
+
     /* buffer modification cancels vertical cursor motion column */
     if (nInserted != 0 || nDeleted != 0)
        textD->cursorPreferredCol = -1;
     
     /* Count the number of lines inserted and deleted, and in the case
@@ -1745,14 +1899,29 @@ static int posToVisibleLineNum(textDisp 
 ** "leftClip" and "rightClip" window coordinates and "leftCharIndex" and
 ** "rightCharIndex" character positions (not including the character at
 ** position "rightCharIndex").
 **
 ** The cursor is also drawn if it appears on the line.
+**
+** The function actually forwards to redisplayLineCur(), passing the
+** showCursorline setting as appropriate.
 */
 static void redisplayLine(textDisp *textD, int visLineNum, int leftClip,
        int rightClip, int leftCharIndex, int rightCharIndex)
 {
+    redisplayLineCur(textD, visLineNum, leftClip, rightClip, leftCharIndex,
+                     rightCharIndex, textD->showCursorline);
+}
+
+/*
+** The meat of redisplayLine() is handled here. The extra curLine parameter
+** tells redisplayLineCur() whether it should attempt to reset the previous
+** "current line" to a non-current line state.
+*/
+static void redisplayLineCur(textDisp* textD, int visLineNum, int leftClip,
+        int rightClip, int leftCharIndex, int rightCharIndex, Boolean curLine)
+{
     textBuffer *buf = textD->buffer;
     int i, x, y, startX, charIndex, lineStartPos, lineLen, fontHeight;
     int stdCharWidth, charWidth, startIndex, charStyle, style;
     int charLen, outStartIndex, outIndex, cursorX = 0, hasCursor = False;
     int dispIndexOffset, cursorPos = textD->cursorPos, y_orig;
@@ -1784,10 +1953,104 @@ static void redisplayLine(textDisp *text
     } else {
        lineLen = visLineLength(textD, visLineNum);
        lineStr = BufGetRange(buf, lineStartPos, lineStartPos + lineLen);
     }
     
+    /* handle case of leftCharIndex == rightCharIndex */
+    if (leftCharIndex == rightCharIndex) {
+        if (lineStartPos + leftCharIndex == cursorPos)
+        {
+            /* we're at the cursor position */
+            if (leftCharIndex > 0)
+                --leftCharIndex;
+            if (rightCharIndex < lineLen)
+                ++rightCharIndex;
+            if (rightCharIndex >= lineLen)
+                rightCharIndex = INT_MAX;
+        } else {
+            /* hmm: not sure what gets us here, but it happens - redraw line */
+            leftCharIndex = 0;
+            rightCharIndex = INT_MAX;
+            return;
+        }
+    }
+
+    /* for cursorline tracking, if this is the current line, check it against
+       the last cursorline - if different, we need to display the whole line
+       plus anything to the extreme right */
+    if (curLine
+            && (textD->oldCursorPos != cursorPos
+                || textD->oldLineStart != lineStartPos)) {
+        int oldCursor = textD->oldCursorPos;
+        int lineEndPos = lineStartPos + lineLen;
+        int oldLineStart = textD->oldLineStart;
+        int gotLineCurdiff = -1;
+        /* store new values if we need to call redisplayLine() again */
+        textD->oldCursorPos = cursorPos;
+
+        if (lineStartPos <= cursorPos
+                && cursorPos <= lineEndPos
+                && !(lineStartPos <= oldCursor
+                    && oldCursor <= lineEndPos)) {
+            /* find visible line number for oldCursor */
+            int lineNum, startPos = -1, oldLen, endPos;
+            int gotLine = -1;
+
+            for (lineNum = 0; lineNum < textD->nVisibleLines; lineNum++) {
+                startPos = textD->lineStarts[lineNum];
+                if (startPos >= 0) {
+                    oldLen = visLineLength(textD, lineNum);
+                    endPos = startPos + oldLen;
+                    if (startPos >= 0
+                            && startPos <= oldCursor && oldCursor <= endPos) {
+                        gotLine = lineNum;
+                        break;
+                    }
+                }
+            }
+
+            if (gotLine >= 0 && gotLine != visLineNum) {
+                redisplayLineCur(textD, gotLine, 0, INT_MAX, 0, INT_MAX, False);
+                gotLineCurdiff = gotLine;
+            }
+
+            /* right: that was the old line done - now the current line */
+            leftCharIndex = 0;
+            rightCharIndex = INT_MAX;
+
+            /* only update oldLineStart if cursor has moved */
+            textD->oldLineStart = lineStartPos;
+        }
+
+        if (lineStartPos != oldLineStart) {
+            /* find visible line number for oldLineStart */
+            int lineNum;
+            int gotLine = -1;
+
+            for (lineNum = 0; lineNum < textD->nVisibleLines; lineNum++) {
+                if (textD->lineStarts[lineNum] == oldLineStart) {
+                    gotLine = lineNum;
+                    break;
+                }
+            }
+
+            if (gotLine >= 0
+                    && gotLine != visLineNum
+                    && gotLineCurdiff != gotLine) {
+                redisplayLineCur(textD, gotLine, 0, INT_MAX, 0, INT_MAX, False);
+            }
+
+            /* right: that was the old line done - now the current line */
+            leftCharIndex = 0;
+            rightCharIndex = INT_MAX;
+
+            /*  jegub  */
+            /* only update oldLineStart if cursor has moved */
+            textD->oldLineStart = lineStartPos;
+        }
+    }
+
     /* Space beyond the end of the line is still counted in units of characters
        of a standardized character width (this is done mostly because style
        changes based on character position can still occur in this region due
        to rectangular selections).  stdCharWidth must be non-zero to prevent a
        potential infinite loop if x does not advance */
@@ -1949,11 +2212,12 @@ static void drawString(textDisp *textD, 
     XGCValues gcValues;
     XFontStruct *fs = textD->fontStruct;
     Pixel bground = textD->bgPixel;
     Pixel fground = textD->fgPixel;
     int underlineStyle = FALSE;
-    
+    int cursorline_mask = textD->showCursorline ? CURSORLINE_MASK : 0;
+
     /* Don't draw if widget isn't realized */
     if (XtWindow(textD->w) == 0)
        return;
     
     /* select a GC */
@@ -1966,16 +2230,20 @@ static void drawString(textDisp *textD, 
     }
     else if (style & PRIMARY_MASK) {
         gc = textD->selectGC;
         bgGC = textD->selectBGGC;
     }
+    else if (style & cursorline_mask) {
+        gc = textD->cursorlineGC;
+        bgGC = textD->cursorlineBGGC;
+    }
     else {
         gc = bgGC = textD->gc;
     }
 
+    /*  Syntax highlighting, backlighting and rangesets need a bit more work.*/
     if (gc == textD->styleGC) {
-        /* we have work to do */
         styleTableEntry *styleRec;
         /* Set font, color, and gc depending on style.  For normal text, GCs
            for normal drawing, or drawing within a selection or highlight are
            pre-allocated and pre-configured.  For syntax highlighting, GCs are
            configured here, on the fly. */
@@ -1990,24 +2258,27 @@ static void drawString(textDisp *textD, 
         else {
             styleRec = NULL;
             gcValues.font = fs->fid;
             fground = textD->fgPixel;
         }
-        /* Background color priority order is:
-           1 Primary(Selection), 2 Highlight(Parens),
-           3 Rangeset, 4 SyntaxHighlightStyle,
-           5 Backlight (if NOT fill), 6 DefaultBackground */
+        /*  Background color priority order is:
+            1. PRIMARY (selection)
+            2. Highlight (flash matching parens)
+            3. Rangeset
+            4. SyntaxHighlightStyle
+            5. Cursorline
+            6. Backlight (if NOT fill)
+            7. DefaultBackground */
         bground =
             style & PRIMARY_MASK   ? textD->selectBGPixel :
             style & HIGHLIGHT_MASK ? textD->highlightBGPixel :
-            style & RANGESET_MASK  ?
-                      getRangesetColor(textD,
-                          (style&RANGESET_MASK)>>RANGESET_SHIFT,
-                            bground) :
+            style & RANGESET_MASK  ? getRangesetColor(textD,
+                    (style&RANGESET_MASK)>>RANGESET_SHIFT, bground) :
             styleRec && styleRec->bgColorName ? styleRec->bgColor :
+            style & cursorline_mask ? textD->cursorlineBGPixel :
             (style & BACKLIGHT_MASK) && !(style & FILL_MASK) ?
-                      textD->bgClassPixel[(style>>BACKLIGHT_SHIFT) & 0xff] :
+                    textD->bgClassPixel[(style>>BACKLIGHT_SHIFT) & 0xff] :
             textD->bgPixel;
         if (fground == bground) /* B&W kludge */
             fground = textD->bgPixel;
         /* set up gc for clearing using the foreground color entry */
         gcValues.foreground = gcValues.background = bground;
@@ -2159,10 +2430,11 @@ static void drawCursor(textDisp *textD, 
 static int styleOfPos(textDisp *textD, int lineStartPos,
        int lineLen, int lineIndex, int dispIndex, int thisChar)
 {
     textBuffer *buf = textD->buffer;
     textBuffer *styleBuf = textD->styleBuffer;
+    int cursorPos = textD->cursorPos;
     int pos, style = 0;
     
     if (lineStartPos == -1 || buf == NULL)
        return FILL_MASK;
     
@@ -2180,10 +2452,12 @@ static int styleOfPos(textDisp *textD, i
     }
     if (inSelection(&buf->primary, pos, lineStartPos, dispIndex))
        style |= PRIMARY_MASK;
     if (inSelection(&buf->highlight, pos, lineStartPos, dispIndex))
        style |= HIGHLIGHT_MASK;
+    if (lineStartPos <= cursorPos && cursorPos <= lineStartPos + lineLen)
+        style |= CURSORLINE_MASK;
     if (inSelection(&buf->secondary, pos, lineStartPos, dispIndex))
        style |= SECONDARY_MASK;
     /* store in the RANGESET_MASK portion of style the rangeset index for pos */
     if (buf->rangesetTable) {
         int rangesetIndex = RangesetIndex1ofPos(buf->rangesetTable, pos, True);
@@ -2720,12 +2994,13 @@ static void setScroll(textDisp *textD, i
         }
         else if (xOffset < 0) {
             TextDRedisplayRect(textD, textD->left + textD->width + xOffset,
                     textD->top, -xOffset, textD->height);
         }
+
         /* Restore protruding parts of the cursor */
-        textDRedisplayRange(textD, textD->cursorPos-1, textD->cursorPos+1);
+        redisplayCursor(textD);
     }
     
     /* Refresh line number/calltip display if its up and we've scrolled 
         vertically */
     if (lineDelta != 0) {
@@ -2886,14 +3161,34 @@ static void redrawLineNumbers(textDisp *
 */
 static void vScrollCB(Widget w, XtPointer clientData, XtPointer callData)
 {
     textDisp *textD = (textDisp *)clientData;
     int newValue = ((XmScrollBarCallbackStruct *)callData)->value;
+    int reason = ((XmScrollBarCallbackStruct*) callData)->reason;
     int lineDelta = newValue - textD->topLineNum;
-    
-    if (lineDelta == 0)
+
+    if (0 == lineDelta) {
+        KillScrolltip(textD);
         return;
+    }
+
+    /*  lineDelta is always != 0 for XmCR_DRAG  */
+    /*  Scrolltip does not work for continuous wrap. The only way to get the
+        line number is through textDisp->absTopLineNum, but this value is very
+        inaccurate for large files. So no tip.  */
+    if (XmCR_DRAG == reason && !textD->continuousWrap && textD->showScrolltip) {
+        /*  Display a scrolltip showing the line number about one third down
+            from the top, the position a search jumps to. */
+        XEvent* event = ((XmScrollBarCallbackStruct*) callData)->event;
+        XMotionEvent* motionEvent = (XMotionEvent*) event;
+        char valueBuffer[TYPE_INT_STR_SIZE(int)];
+
+        sprintf(valueBuffer, "%i", newValue + (textD->nVisibleLines / 3));
+        ShowScrolltip(textD, valueBuffer, motionEvent->x_root - 50,
+                motionEvent->y_root);
+    }
+
     setScroll(textD, newValue, textD->horizOffset, False, True);
 }
 static void hScrollCB(Widget w, XtPointer clientData, XtPointer callData)
 {
     textDisp *textD = (textDisp *)clientData;
@@ -3008,11 +3303,12 @@ static void blankCursorProtrusions(textD
 ** Allocate shared graphics contexts used by the widget, which must be
 ** re-allocated on a font change.
 */
 static void allocateFixedFontGCs(textDisp *textD, XFontStruct *fontStruct,
         Pixel bgPixel, Pixel fgPixel, Pixel selectFGPixel, Pixel selectBGPixel,
-        Pixel highlightFGPixel, Pixel highlightBGPixel, Pixel lineNumFGPixel)
+        Pixel highlightFGPixel, Pixel highlightBGPixel, Pixel lineNumFGPixel,
+        Pixel wrapMarginFGPixel, Pixel cursorlineBGPixel)
 {
     textD->gc = allocateGC(textD->w, GCFont | GCForeground | GCBackground,
             fgPixel, bgPixel, fontStruct->fid, GCClipMask, GCArcMode); 
     textD->selectGC = allocateGC(textD->w, GCFont | GCForeground | GCBackground,
             selectFGPixel, selectBGPixel, fontStruct->fid, GCClipMask,
@@ -3022,13 +3318,20 @@ static void allocateFixedFontGCs(textDis
     textD->highlightGC = allocateGC(textD->w, GCFont|GCForeground|GCBackground,
             highlightFGPixel, highlightBGPixel, fontStruct->fid, GCClipMask,
             GCArcMode);
     textD->highlightBGGC = allocateGC(textD->w, GCForeground, highlightBGPixel,
             0, fontStruct->fid, GCClipMask, GCArcMode);
+    textD->cursorlineGC = allocateGC(textD->w, GCFont|GCForeground|GCBackground,
+            fgPixel, cursorlineBGPixel, fontStruct->fid, GCClipMask,
+            GCArcMode);
+    textD->cursorlineBGGC = allocateGC(textD->w, GCForeground,
+            cursorlineBGPixel, 0, fontStruct->fid, GCClipMask, GCArcMode);
     textD->lineNumGC = allocateGC(textD->w, GCFont | GCForeground | 
             GCBackground, lineNumFGPixel, bgPixel, fontStruct->fid, 
             GCClipMask, GCArcMode);
+    textD->wrapMarginGC = allocateGC(textD->w, GCForeground | GCBackground,
+            wrapMarginFGPixel, bgPixel, fontStruct->fid, GCClipMask, GCArcMode);
 }
 
 /*
 ** X11R4 does not have the XtAllocateGC function for sharing graphics contexts
 ** with changeable fields.  Unfortunately the R4 call for creating shared
@@ -3097,10 +3400,16 @@ static void resetClipRectangles(textDisp
             &clipRect, 1, Unsorted);
     XSetClipRectangles(display, textD->highlightBGGC, 0, 0,
             &clipRect, 1, Unsorted);
     XSetClipRectangles(display, textD->styleGC, 0, 0,
             &clipRect, 1, Unsorted);
+    XSetClipRectangles(display, textD->cursorlineGC, 0, 0,
+            &clipRect, 1, Unsorted);
+    XSetClipRectangles(display, textD->cursorlineBGGC, 0, 0,
+            &clipRect, 1, Unsorted);
+    XSetClipRectangles(display, textD->wrapMarginGC, 0, 0,
+            &clipRect, 1, Unsorted);
 } 
 
 /*
 ** Return the length of a line (number of displayable characters) by examining
 ** entries in the line starts array rather than by scanning for newlines
@@ -3800,5 +4109,47 @@ void TextDSetupBGClasses(Widget w, XmStr
         return;
     }
     memcpy(*pp_bgClass, bgClass, 256);
     memcpy(*pp_bgClassPixel, bgClassPixel, class_no * sizeof (Pixel));
 }
+
+/*
+**  Draw wrap margin if requested
+*/
+static void drawWrapMargin(textDisp *textD)
+{
+    int fromX, fromY;
+    int fontHeight, lineHeight;
+
+
+    /*  attempt to draw the wrap margin # only if
+        - widget has been realized
+        - font width is not -1, ie. not using different/proportional width fonts
+        - show wrap margins is enabled  */
+    if (XtWindow(textD->w) != 0
+            && textD->fixedFontWidth != -1
+            && textD->showWrapMargin)
+    {
+        fromX = textD->left + (textD->fixedFontWidth * textD->wrapMargin)
+                - textD->horizOffset - 1;
+
+        /* compute rest of coordinates if line is to right of left margin */
+        if (fromX > textD->left)
+        {
+            fromY = textD->top;
+            fontHeight = textD->ascent + textD->descent;
+            lineHeight = textD->nVisibleLines * fontHeight - 1;
+            XDrawLine(XtDisplay(textD->w), XtWindow(textD->w),
+                    textD->wrapMarginGC, fromX, fromY, fromX,
+                    fromY + lineHeight);
+/*
+    Handle to move wrap margin around with the mouse.
+            XDrawLine(XtDisplay(textD->w), XtWindow(textD->w),
+                    textD->wrapMarginGC, fromX - 1, fromY, fromX - 1,
+                    fromY + 3);
+            XDrawLine(XtDisplay(textD->w), XtWindow(textD->w),
+                    textD->wrapMarginGC, fromX + 1, fromY, fromX + 1,
+                    fromY + 3);
+*/
+        }
+    }
+}
diff --quilt old/source/textDisp.h new/source/textDisp.h
--- old/source/textDisp.h
+++ new/source/textDisp.h
@@ -72,10 +72,11 @@ typedef struct _calltipStruct {
     Boolean anchored;       /* Is it anchored to a position */
     int pos;                /* Position tip is anchored to */
     int hAlign;             /* horizontal alignment */
     int vAlign;             /* vertical alignment */
     int alignMode;          /* Strict or sloppy alignment */
+    Widget widget;           /*  calltip's widget  */
 } calltipStruct;
 
 typedef struct _textDisp {
     Widget w;
     int top, left, width, height, lineNumLeft, lineNumWidth;
@@ -101,17 +102,21 @@ typedef struct _textDisp {
                                           either to a newline or one character
                                           beyond the end of the buffer) */
     int continuousWrap;                /* Wrap long lines when displaying */
     int wrapMargin;                    /* Margin in # of char positions for
                                           wrapping in continuousWrap mode */
+    int showWrapMargin;                 /* draw line at wrap margin */
     int *lineStarts;
-    int topLineNum;                    /* Line number of top displayed line
-                                          of file (first line of file is 1) */
-    int absTopLineNum;                 /* In continuous wrap mode, the line
-                                          number of the top line if the text
-                                          were not wrapped (note that this is
-                                          only maintained as needed). */
+    int topLineNum;             /*  Almost the line number of top displayed line
+                                    of file (first line of file is 1). Actually
+                                    it's off by one screenful or so most of the
+                                    times.  */
+    int absTopLineNum;          /* In continuous wrap mode, almost the line
+                                    number of the top line if the text were not
+                                    wrapped. Actually it's off by one screenful
+                                    most of the times. (Note that this is only
+                                    maintained as needed). */
     int needAbsTopLineNum;             /* Externally settable flag to continue
                                           maintaining absTopLineNum even if
                                           it isn't needed for line # display */
     int horizOffset;                   /* Horizontal scroll pos. in pixels */
     int visibility;        /* Window visibility (see XVisibility event) */
@@ -127,12 +132,15 @@ typedef struct _textDisp {
     int ascent, descent;               /* Composite ascent and descent for
                                           primary font + all-highlight fonts */
     int fixedFontWidth;                        /* Font width if all current fonts are
                                           fixed and match in width, else -1 */
     Widget hScrollBar, vScrollBar;
-    GC gc, selectGC, highlightGC;      /* GCs for drawing text */
-    GC selectBGGC, highlightBGGC;      /* GCs for erasing text */
+    int oldCursorPos;
+    int oldLineStart;
+    Pixel cursorlineBGPixel;
+    GC gc, selectGC, highlightGC, cursorlineGC;     /* GCs for drawing text */
+    GC selectBGGC, highlightBGGC, cursorlineBGGC;   /* GCs for erasing text */
     GC cursorFGGC;                     /* GC for drawing the cursor */
     GC lineNumGC;                      /* GC for drawing line numbers */
     GC styleGC;                        /* GC with color and font unspecified
                                           for drawing colored/styled text */
     Pixel fgPixel, bgPixel;            /* Foreground/Background colors */
@@ -143,15 +151,15 @@ typedef struct _textDisp {
     Pixel lineNumFGPixel;              /* Color for drawing line numbers */
     Pixel cursorFGPixel;
     Pixel *bgClassPixel;               /* table of colors for each BG class */
     unsigned char *bgClass;            /* obtains index into bgClassPixel[] */
     
-    Widget calltipW;                    /* The Label widget for the calltip */
-    Widget calltipShell;                /* The Shell that holds the calltip */
     calltipStruct calltip;              /* The info for the calltip itself */
     Pixel calltipFGPixel;
     Pixel calltipBGPixel;
+    Pixel wrapMarginFGPixel;            /* color for drawing wrap margin */
+    GC wrapMarginGC;                    /* GC for drawing wrap margin */
     int suppressResync;                        /* Suppress resynchronization of line
                                            starts during buffer updates */
     int nLinesDeleted;                 /* Number of lines deleted during
                                           buffer modification (only used
                                           when resynchronization is 
@@ -159,28 +167,36 @@ typedef struct _textDisp {
     int modifyingTabDist;              /* Whether tab distance is being
                                           modified */
     Boolean pointerHidden;              /* true if the mouse pointer is 
                                            hidden */
     graphicExposeTranslationEntry *graphicsExposeQueue;
+    Boolean showCursorline;
+    Boolean     showScrolltip;
+    Widget      scrolltip;
 } textDisp;
 
 textDisp *TextDCreate(Widget widget, Widget hScrollBar, Widget vScrollBar,
-       Position left, Position top, Position width, Position height,
-       Position lineNumLeft, Position lineNumWidth, textBuffer *buffer,
-       XFontStruct *fontStruct, Pixel bgPixel, Pixel fgPixel,
-       Pixel selectFGPixel, Pixel selectBGPixel, Pixel highlightFGPixel,
-       Pixel highlightBGPixel, Pixel cursorFGPixel, Pixel lineNumFGPixel,
-        int continuousWrap, int wrapMargin, XmString bgClassString, 
-        Pixel calltipFGPixel, Pixel calltipBGPixel);
+        Position left, Position top, Position width, Position height,
+        Position lineNumLeft, Position lineNumWidth,
+        textBuffer *buffer,
+        XFontStruct *fontStruct,
+        Pixel bgPixel, Pixel fgPixel, Pixel selectFGPixel, Pixel selectBGPixel,
+        Pixel highlightFGPixel, Pixel highlightBGPixel, Pixel cursorFGPixel,
+        Pixel lineNumFGPixel, Pixel wrapMarginFGPixel, Pixel calltipFGPixel,
+        Pixel calltipBGPixel, Pixel cursorlineBGPixel,
+        int continuousWrap, int wrapMargin, Boolean showWrapMargin,
+        XmString bgClassString, Boolean showCursorline, Boolean showScrolltip);
 void TextDFree(textDisp *textD);
 void TextDSetBuffer(textDisp *textD, textBuffer *buffer);
 void TextDAttachHighlightData(textDisp *textD, textBuffer *styleBuffer,
        styleTableEntry *styleTable, int nStyles, char unfinishedStyle,
        unfinishedStyleCBProc unfinishedHighlightCB, void *cbArg);
 void TextDSetColors(textDisp *textD, Pixel textFgP, Pixel textBgP,
         Pixel selectFgP, Pixel selectBgP, Pixel hiliteFgP, Pixel hiliteBgP, 
-        Pixel lineNoFgP, Pixel cursorFgP);
+        Pixel lineNoFgP, Pixel cursorFgP, Pixel wrapMarginFgP,
+        Pixel cursorlineBgP);
+void TextDSetShowCursorline(textDisp* textD, const Boolean showCursorline);
 void TextDSetFont(textDisp *textD, XFontStruct *fontStruct);
 int TextDMinFontWidth(textDisp *textD, Boolean considerStyles);
 int TextDMaxFontWidth(textDisp *textD, Boolean considerStyles);
 void TextDResize(textDisp *textD, int width, int height);
 void TextDRedisplayRect(textDisp *textD, int left, int top, int width,
@@ -208,10 +224,11 @@ int TextDMoveUp(textDisp *textD, int abs
 int TextDMoveDown(textDisp *textD, int absolute);
 void TextDBlankCursor(textDisp *textD);
 void TextDUnblankCursor(textDisp *textD);
 void TextDSetCursorStyle(textDisp *textD, int style);
 void TextDSetWrapMode(textDisp *textD, int wrap, int wrapMargin);
+void TextDSetShowWrapMargin(textDisp *textD, int state);
 int TextDEndOfLine(const textDisp* textD, const int pos,
     const Boolean startPosIsLineStart);
 int TextDStartOfLine(const textDisp* textD, const int pos);
 int TextDCountForwardNLines(const textDisp* textD, const int startPos,
         const unsigned nLines, const Boolean startPosIsLineStart);
diff --quilt old/source/textP.h new/source/textP.h
--- old/source/textP.h
+++ new/source/textP.h
@@ -57,10 +57,12 @@ extern TextClassRec nTextClassRec;
 
 typedef struct _TextPart {
     /* resources */
     Pixel selectFGPixel, selectBGPixel, highlightFGPixel, highlightBGPixel;
     Pixel cursorFGPixel, lineNumFGPixel, calltipFGPixel, calltipBGPixel;
+    Pixel wrapMarginFGPixel;
+    Pixel cursorlineBGPixel;
     XFontStruct *fontStruct;
     Boolean pendingDelete;
     Boolean autoShowInsertPos;
     Boolean autoWrap;
     Boolean autoWrapPastedText;
@@ -69,14 +71,17 @@ typedef struct _TextPart {
     Boolean smartIndent;
     Boolean overstrike;
     Boolean heavyCursor;
     Boolean readOnly;
     Boolean hidePointer;
+    Boolean showCursorline;
+    Boolean showScrolltip;
     int rows, columns;
     int marginWidth, marginHeight;
     int cursorBlinkRate;
     int wrapMargin;
+    Boolean showWrapMargin;
     int emulateTabs;
     int lineNumCols;
     char *delimiters;
     Cardinal cursorVPadding;
     Widget hScrollBar, vScrollBar;
diff --quilt old/source/window.c new/source/window.c
--- old/source/window.c
+++ new/source/window.c
@@ -6,11 +6,11 @@ static const char CVSID[] = "$Id: window
 * Copyright (C) 1999 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    *
 * Foundation; either version 2 of the License, or (at your option) any later   *
-* version. In addition, you may distribute version of this program linked to   *
+* version. In addition, you may distribute versions of this program linked to  *
 * Motif or Open Motif. See README for details.                                 *
 *                                                                              *
 * This software 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        *
@@ -167,10 +167,11 @@ static void showStats(WindowInfo *window
 static void showISearch(WindowInfo *window, int state);
 static void showStatsForm(WindowInfo *window);
 static void addToWindowList(WindowInfo *window);
 static void removeFromWindowList(WindowInfo *window);
 static void focusCB(Widget w, WindowInfo *window, XtPointer callData);
+static void loosingFocusCB(Widget w, WindowInfo *window, XtPointer callData);
 static void modifiedCB(int pos, int nInserted, int nDeleted, int nRestyled,
         const char *deletedText, void *cbArg);
 static void movedCB(Widget w, WindowInfo *window, XtPointer callData);
 static void dragStartCB(Widget w, WindowInfo *window, XtPointer callData);
 static void dragEndCB(Widget w, WindowInfo *window, dragEndCBStruct *callData);
@@ -257,19 +258,22 @@ WindowInfo *CreateWindow(const char *nam
     window->fileMissing = True;
     strcpy(window->filename, name);
     window->undo = NULL;
     window->redo = NULL;
     window->nPanes = 0;
+    window->lastFocus = NULL;
     window->autoSaveCharCount = 0;
     window->autoSaveOpCount = 0;
     window->undoOpCount = 0;
     window->undoMemUsed = 0;
     CLEAR_ALL_LOCKS(window->lockReasons);
+    window->transient = False;
     window->indentStyle = GetPrefAutoIndent(PLAIN_LANGUAGE_MODE);
     window->autoSave = GetPrefAutoSave();
     window->saveOldVersion = GetPrefSaveOldVersion();
     window->wrapMode = GetPrefWrap(PLAIN_LANGUAGE_MODE);
+    window->showWrapMargin = GetPrefShowWrapMargin();
     window->overstrike = False;
     window->showMatchingStyle = GetPrefShowMatching();
     window->matchSyntaxBased = GetPrefMatchSyntaxBased();
     window->showStats = GetPrefStatsLine();
     window->showISearchLine = GetPrefISearchLine();
@@ -465,11 +469,12 @@ WindowInfo *CreateWindow(const char *nam
     
     window->iSearchRegexToggle = XtVaCreateManagedWidget("iSearchREToggle",
             xmToggleButtonWidgetClass, window->iSearchForm,
             XmNlabelString, s1=XmStringCreateSimple("RegExp"),
             XmNset, GetPrefSearch() == SEARCH_REGEX_NOCASE 
-            || GetPrefSearch() == SEARCH_REGEX,
+            || GetPrefSearch() == SEARCH_REGEX
+            || GetPrefSearch() == SEARCH_REGEX_SMARTCASE,
             XmNtopAttachment, XmATTACH_FORM,
             XmNbottomAttachment, XmATTACH_FORM,
             XmNtopOffset, 1, /* see openmotif note above */
             XmNrightAttachment, XmATTACH_WIDGET,
             XmNrightWidget, window->iSearchCaseToggle,
@@ -695,23 +700,25 @@ WindowInfo *CreateWindow(const char *nam
     text = createTextArea(pane, window, rows,cols,
             GetPrefEmTabDist(PLAIN_LANGUAGE_MODE), GetPrefDelimiters(),
             GetPrefWrapMargin(), window->showLineNumbers?MIN_LINE_NUM_COLS:0);
     XtManageChild(text);
     window->textArea = text;
-    window->lastFocus = text;
+    ChangeLastFocus(window, text);
 
     /* Set the initial colors from the globals. */
     SetColors(window,
               GetPrefColorName(TEXT_FG_COLOR  ),
               GetPrefColorName(TEXT_BG_COLOR  ),
               GetPrefColorName(SELECT_FG_COLOR),
               GetPrefColorName(SELECT_BG_COLOR),
               GetPrefColorName(HILITE_FG_COLOR),
               GetPrefColorName(HILITE_BG_COLOR),
               GetPrefColorName(LINENO_FG_COLOR),
-              GetPrefColorName(CURSOR_FG_COLOR));
-    
+              GetPrefColorName(CURSOR_FG_COLOR),
+              GetPrefColorName(WRAPMARGIN_FG_COLOR),
+              GetPrefColorName(CURSORLINE_BG_COLOR));
+
     /* Create the right button popup menu (note: order is important here,
        since the translation for popping up this menu was probably already
        added in createTextArea, but CreateBGMenu requires window->textArea
        to be set so it can attach the menu to it (because menu shells are
        finicky about the kinds of widgets they are attached to)) */
@@ -1214,14 +1221,15 @@ void SplitPane(WindowInfo *window)
     newTextD = ((TextWidget)text)->text.textD;
     XtVaSetValues(text,
                 XmNforeground, textD->fgPixel,
                 XmNbackground, textD->bgPixel,
                 NULL);
-    TextDSetColors( newTextD, textD->fgPixel, textD->bgPixel, 
-            textD->selectFGPixel, textD->selectBGPixel, textD->highlightFGPixel,
-            textD->highlightBGPixel, textD->lineNumFGPixel, 
-            textD->cursorFGPixel );
+    TextDSetColors(newTextD, textD->fgPixel, textD->bgPixel,
+            textD->selectFGPixel, textD->selectBGPixel,
+            textD->highlightFGPixel, textD->highlightBGPixel,
+            textD->lineNumFGPixel, textD->cursorFGPixel,
+            textD->wrapMarginFGPixel, textD->cursorlineBGPixel);
     
     /* Set the minimum pane height in the new pane */
     UpdateMinPaneHeights(window);
 
     /* adjust the heights, scroll positions, etc., to split the focus pane */
@@ -1292,11 +1300,11 @@ void ClosePane(WindowInfo *window)
 {
     short paneHeights[MAX_PANES+1];
     int insertPositions[MAX_PANES+1], topLines[MAX_PANES+1];
     int horizOffsets[MAX_PANES+1];
     int i, focusPane;
-    Widget text;
+    Widget text = NULL;
     
     /* Don't delete the last pane */
     if (window->nPanes <= 0)
         return;
     
@@ -1322,14 +1330,19 @@ void ClosePane(WindowInfo *window)
        the remaining panes, simply detroying it didn't seem enough */
     window->nPanes--;
     XtUnmanageChild(containingPane(window->textPanes[window->nPanes]));
     XtDestroyWidget(containingPane(window->textPanes[window->nPanes]));
 
-    if (window->nPanes == 0)
-        window->lastFocus = window->textArea;
-    else if (focusPane > window->nPanes)
-        window->lastFocus = window->textPanes[window->nPanes-1];
+    if (window->nPanes == 0) {
+        text = window->textArea;
+    } else if (focusPane > window->nPanes) {
+        text = window->textPanes[window->nPanes - 1];
+    } else {
+        text = window->textPanes[focusPane - 1];
+    }
+
+    ChangeLastFocus(window, text);
     
     /* adjust the heights, scroll positions, etc., to make it look
        like the pane with the input focus was closed */
     for (i=focusPane; i<=window->nPanes; i++) {
         insertPositions[i] = insertPositions[i+1];
@@ -1853,11 +1866,12 @@ void SetFonts(WindowInfo *window, const 
     UpdateMinPaneHeights(window);
 }
 
 void SetColors(WindowInfo *window, const char *textFg, const char *textBg,
         const char *selectFg, const char *selectBg, const char *hiliteFg, 
-        const char *hiliteBg, const char *lineNoFg, const char *cursorFg)
+        const char *hiliteBg, const char *lineNoFg, const char *cursorFg,
+        const char* wrapMarginFg, const char* cursorlineBg)
 {
     int i, dummy;
     Pixel   textFgPix   = AllocColor( window->textArea, textFg, 
                     &dummy, &dummy, &dummy),
             textBgPix   = AllocColor( window->textArea, textBg, 
@@ -1871,30 +1885,36 @@ void SetColors(WindowInfo *window, const
             hiliteBgPix = AllocColor( window->textArea, hiliteBg, 
                     &dummy, &dummy, &dummy),
             lineNoFgPix = AllocColor( window->textArea, lineNoFg, 
                     &dummy, &dummy, &dummy),
             cursorFgPix = AllocColor( window->textArea, cursorFg, 
+                    &dummy, &dummy, &dummy),
+            wrapMarginFgPix = AllocColor( window->textArea, wrapMarginFg,
+                    &dummy, &dummy, &dummy),
+            cursorlineBgPix = AllocColor( window->textArea, cursorlineBg,
                     &dummy, &dummy, &dummy);
     textDisp *textD;
 
     /* Update the main pane */
     XtVaSetValues(window->textArea,
             XmNforeground, textFgPix,
             XmNbackground, textBgPix,
             NULL);
     textD = ((TextWidget)window->textArea)->text.textD;
     TextDSetColors( textD, textFgPix, textBgPix, selectFgPix, selectBgPix, 
-            hiliteFgPix, hiliteBgPix, lineNoFgPix, cursorFgPix );
+            hiliteFgPix, hiliteBgPix, lineNoFgPix, cursorFgPix,
+            wrapMarginFgPix, cursorlineBgPix);
     /* Update any additional panes */
     for (i=0; i<window->nPanes; i++) {
         XtVaSetValues(window->textPanes[i],
                 XmNforeground, textFgPix,
                 XmNbackground, textBgPix,
                 NULL);
         textD = ((TextWidget)window->textPanes[i])->text.textD;
         TextDSetColors( textD, textFgPix, textBgPix, selectFgPix, selectBgPix, 
-                hiliteFgPix, hiliteBgPix, lineNoFgPix, cursorFgPix );
+                hiliteFgPix, hiliteBgPix, lineNoFgPix, cursorFgPix,
+                wrapMarginFgPix, cursorlineBgPix);
     }
     
     /* Redo any syntax highlighting */
     if (window->highlightData != NULL)
         UpdateHighlightStyles(window);
@@ -1926,15 +1946,18 @@ void SetAutoWrap(WindowInfo *window, int
     for (i=0; i<window->nPanes; i++)
         XtVaSetValues(window->textPanes[i], textNautoWrap, autoWrap,
                 textNcontinuousWrap, contWrap, NULL);
     window->wrapMode = state;
     
-    if (IsTopDocument(window)) {
-       XmToggleButtonSetState(window->newlineWrapItem, autoWrap, False);
-       XmToggleButtonSetState(window->continuousWrapItem, contWrap, False);
-       XmToggleButtonSetState(window->noWrapItem, state == NO_WRAP, False);
+    if (IsTopDocument(window))
+    {
+        XmToggleButtonSetState(window->newlineWrapItem, autoWrap, False);
+        XmToggleButtonSetState(window->continuousWrapItem, contWrap, False);
+        XmToggleButtonSetState(window->noWrapItem, state == NO_WRAP, False);
     }
+
+    SetShowWrapMargin(window, window->showWrapMargin);
 }
 
 /* 
 ** Set the auto-scroll margin
 */
@@ -1946,10 +1969,37 @@ void SetAutoScroll(WindowInfo *window, i
     for (i=0; i<window->nPanes; i++)
         XtVaSetValues(window->textPanes[i], textNcursorVPadding, margin, NULL);
 }
     
 /*
+** Set show-wrap-margin style, one of NEVER, ALWAYS, ON-WRAP
+*/
+void SetShowWrapMargin(WindowInfo* window, int state)
+{
+    int i;
+    int alwaysShowWrapMargin = (SHOW_WRAP_MARGIN_ALWAYS == state);
+    int onWrapShowWrapMargin = (SHOW_WRAP_MARGIN_ON_WRAP == state);
+    int autoWrap = (NEWLINE_WRAP == window->wrapMode);
+    int contWrap = (CONTINUOUS_WRAP == window->wrapMode);
+    /* true or false only. not never/always/on-wrap. text widget does need to know
+       exact details. it just needs to know that wrap margin should be shown */
+    int showWrapMargin = (alwaysShowWrapMargin
+            || (onWrapShowWrapMargin && autoWrap)
+            || (onWrapShowWrapMargin && contWrap));
+
+    XtVaSetValues(window->textArea, textNshowWrapMargin, showWrapMargin, NULL);
+    for (i = 0; i < window->nPanes; i++) {
+        XtVaSetValues(window->textPanes[i],
+                textNshowWrapMargin, showWrapMargin,
+                NULL);
+    }
+    /* never/always/on-wrap needs to be stored in window settings, for generating
+       menu, etc */
+    window->showWrapMargin = state;
+}
+
+/*
 ** Recover the window pointer from any widget in the window, by searching
 ** up the widget hierarcy for the top level container widget where the
 ** window pointer is stored in the userData field. In a tabbed window,
 ** this is the window pointer of the top (active) document, which is 
 ** returned if w is 'shell-level' widget - menus, find/replace dialogs, etc.
@@ -2203,10 +2253,19 @@ void MakeSelectionVisible(WindowInfo *wi
 static Widget createTextArea(Widget parent, WindowInfo *window, int rows,
         int cols, int emTabDist, char *delimiters, int wrapMargin,
         int lineNumCols)
 {
     Widget text, sw, hScrollBar, vScrollBar, frame;
+    int alwaysShowWrapMargin = (window->showWrapMargin == SHOW_WRAP_MARGIN_ALWAYS);
+    int onWrapShowWrapMargin = (window->showWrapMargin == SHOW_WRAP_MARGIN_ON_WRAP);
+    int autoWrap = (window->wrapMode == NEWLINE_WRAP);
+    int contWrap = (window->wrapMode == CONTINUOUS_WRAP);
+    /* true or false only. not never/always/on-wrap. text widget does need to know
+       exact details. it just needs to know that wrap margin should be shown */
+    int showWrapMargin = (alwaysShowWrapMargin ||
+            (onWrapShowWrapMargin && autoWrap) ||
+            (onWrapShowWrapMargin && contWrap) );
         
     /* Create a text widget inside of a scrolled window widget */
     sw = XtVaCreateManagedWidget("scrolledW", xmScrolledWindowWidgetClass,
             parent, XmNpaneMaximum, SHRT_MAX,
             XmNpaneMinimum, PANE_MIN_HEIGHT, XmNhighlightThickness, 0, NULL); 
@@ -2226,24 +2285,29 @@ static Widget createTextArea(Widget pare
             textNfont, GetDefaultFontStruct(window->fontList),
             textNhScrollBar, hScrollBar, textNvScrollBar, vScrollBar,
             textNreadOnly, IS_ANY_LOCKED(window->lockReasons),
             textNwordDelimiters, delimiters,
             textNwrapMargin, wrapMargin,
+            textNshowWrapMargin, showWrapMargin,
             textNautoIndent, window->indentStyle == AUTO_INDENT,
             textNsmartIndent, window->indentStyle == SMART_INDENT,
             textNautoWrap, window->wrapMode == NEWLINE_WRAP,
             textNcontinuousWrap, window->wrapMode == CONTINUOUS_WRAP,
             textNoverstrike, window->overstrike,
+            textNshowCursorline, False,
             textNhidePointer, (Boolean) GetPrefTypingHidesPointer(),
             textNcursorVPadding, GetVerticalAutoScroll(),
+            textNshowScrolltip, GetPrefShowScrolltip(),
             NULL);
 
     XtVaSetValues(sw, XmNworkWindow, frame, XmNhorizontalScrollBar, 
                     hScrollBar, XmNverticalScrollBar, vScrollBar, NULL);
 
     /* add focus, drag, cursor tracking, and smart indent callbacks */
     XtAddCallback(text, textNfocusCallback, (XtCallbackProc)focusCB, window);
+    XtAddCallback(text, textNlosingFocusCallback,
+            (XtCallbackProc) loosingFocusCB, window);
     XtAddCallback(text, textNcursorMovementCallback, (XtCallbackProc)movedCB,
             window);
     XtAddCallback(text, textNdragStartCallback, (XtCallbackProc)dragStartCB,
             window);
     XtAddCallback(text, textNdragEndCallback, (XtCallbackProc)dragEndCB,
@@ -2292,18 +2356,20 @@ static void movedCB(Widget w, WindowInfo
     if (0 != textWidget->text.cursorBlinkProcID)
     {
         /*  Start blinking the caret again.  */
         ResetCursorBlink(textWidget, False);
     }
+
+    MacroApplyHook(window, "cursor_moved_hook", 0, NULL, NULL);
 }
 
 static void modifiedCB(int pos, int nInserted, int nDeleted, int nRestyled,
         const char *deletedText, void *cbArg) 
 {
     WindowInfo *window = (WindowInfo *)cbArg;
     int selected = window->buffer->primary.selected;
-    
+
     /* update the table of bookmarks */
     if (!window->ignoreModify) {
         UpdateMarkTable(window, pos, nInserted, nDeleted);
     }
     
@@ -2363,25 +2429,34 @@ static void modifiedCB(int pos, int nIns
     /* Update # of bytes, and line and col statistics */
     UpdateStatsLine(window);
     
     /* Check if external changes have been made to file and warn user */
     CheckForChangesToFile(window);
+
+    MacroApplyHook(window, "modified_hook", 0, NULL, NULL);
 }
 
 static void focusCB(Widget w, WindowInfo *window, XtPointer callData) 
 {
     /* record which window pane last had the keyboard focus */
-    window->lastFocus = w;
+    ChangeLastFocus(window, w);
     
     /* update line number statistic to reflect current focus pane */
     UpdateStatsLine(window);
     
     /* finish off the current incremental search */
     EndISearch(window);
     
     /* Check for changes to read-only status and/or file modifications */
     CheckForChangesToFile(window);
+
+    MacroApplyHook(window, "focus_hook", 0, NULL, NULL);
+}
+
+static void loosingFocusCB(Widget w, WindowInfo *window, XtPointer callData)
+{
+    MacroApplyHook(window, "loosing_focus_hook", 0, NULL, NULL);
 }
 
 static void dragStartCB(Widget w, WindowInfo *window, XtPointer callData) 
 {
     /* don't record all of the intermediate drag steps for undo */
@@ -2519,20 +2594,25 @@ void AttachSessionMgrHandler(Widget appS
 ** on the shell window.  I think this is the most reliable way to tell,
 ** but if someone has a better idea please send me a note).
 */
 int IsIconic(WindowInfo *window)
 {
-    unsigned long *property = NULL;
+    /*  We expect back a CARD32 (see ICCCM 4.1.3.1) so we use type long to
+        get enough room for it, even if it's casted down later on.  */
+    unsigned long* property = NULL;
     unsigned long nItems;
     unsigned long leftover;
     static Atom wmStateAtom = 0;
     Atom actualType;
     int actualFormat;
     int result;
   
-    if (wmStateAtom == 0)
-        wmStateAtom = XInternAtom(XtDisplay(window->shell), "WM_STATE", False); 
+    if (0 == wmStateAtom) {
+        /*  Get Atom for WM_STATE, create if it does not exist.  */
+        wmStateAtom = XInternAtom(XtDisplay(window->shell), "WM_STATE", False);
+    }
+
     if (XGetWindowProperty(XtDisplay(window->shell), XtWindow(window->shell),
             wmStateAtom, 0L, 1L, False, wmStateAtom, &actualType, &actualFormat,
             &nItems, &leftover, (unsigned char **)&property) != Success ||
             nItems != 1 || property == NULL)
         return FALSE;
@@ -2699,11 +2779,19 @@ void UpdateStatsLine(WindowInfo *window)
     if (!TextPosToLineAndCol(window->lastFocus, pos, &line, &colNum)) {
         sprintf(string, "%s%s%s %d bytes", window->path, window->filename,
                 format, window->buffer->length);
         sprintf(slinecol, "L: ---  C: ---");
     } else {
-        sprintf(slinecol, "L: %d  C: %d", line, colNum);
+        int start, end, isRect, rectStart, rectEnd, bytesSelected = 0;
+        if (BufGetSelectionPos(window->buffer, &start, &end, &isRect, &rectStart, &rectEnd)) {
+            bytesSelected = isRect ? 0 : end - start;
+        }
+        if (bytesSelected > 0) {
+            sprintf(slinecol, "[%d]  L: %d  C: %2d", bytesSelected, line, colNum);
+        } else {
+            sprintf(slinecol, "L: %d  C: %2d", line, colNum);
+        }
         if (window->showLineNumbers)
             sprintf(string, "%s%s%s byte %d of %d", window->path,
                     window->filename, format, pos, 
                     window->buffer->length);
         else
@@ -3276,19 +3364,22 @@ WindowInfo* CreateDocument(WindowInfo* s
     window->lastModTime = 0;
     strcpy(window->filename, name);
     window->undo = NULL;
     window->redo = NULL;
     window->nPanes = 0;
+    window->lastFocus = NULL;
     window->autoSaveCharCount = 0;
     window->autoSaveOpCount = 0;
     window->undoOpCount = 0;
     window->undoMemUsed = 0;
     CLEAR_ALL_LOCKS(window->lockReasons);
+    window->transient = False;
     window->indentStyle = GetPrefAutoIndent(PLAIN_LANGUAGE_MODE);
     window->autoSave = GetPrefAutoSave();
     window->saveOldVersion = GetPrefSaveOldVersion();
     window->wrapMode = GetPrefWrap(PLAIN_LANGUAGE_MODE);
+    window->showWrapMargin = GetPrefShowWrapMargin();
     window->overstrike = False;
     window->showMatchingStyle = GetPrefShowMatching();
     window->matchSyntaxBased = GetPrefMatchSyntaxBased();
     window->highlightSyntax = GetPrefHighlightSyntax();
     window->backlightCharTypes = NULL;
@@ -3378,23 +3469,25 @@ WindowInfo* CreateDocument(WindowInfo* s
     text = createTextArea(pane, window, nRows, nCols,
            GetPrefEmTabDist(PLAIN_LANGUAGE_MODE), GetPrefDelimiters(),
            GetPrefWrapMargin(), window->showLineNumbers?MIN_LINE_NUM_COLS:0);
     XtManageChild(text);
     window->textArea = text;
-    window->lastFocus = text;
+    ChangeLastFocus(window, text);
     
     /* Set the initial colors from the globals. */
     SetColors(window,
               GetPrefColorName(TEXT_FG_COLOR  ),
               GetPrefColorName(TEXT_BG_COLOR  ),
               GetPrefColorName(SELECT_FG_COLOR),
               GetPrefColorName(SELECT_BG_COLOR),
               GetPrefColorName(HILITE_FG_COLOR),
               GetPrefColorName(HILITE_BG_COLOR),
               GetPrefColorName(LINENO_FG_COLOR),
-              GetPrefColorName(CURSOR_FG_COLOR));
-    
+              GetPrefColorName(CURSOR_FG_COLOR),
+              GetPrefColorName(WRAPMARGIN_FG_COLOR),
+              GetPrefColorName(CURSORLINE_BG_COLOR));
+
     /* Create the right button popup menu (note: order is important here,
        since the translation for popping up this menu was probably already
        added in createTextArea, but CreateBGMenu requires window->textArea
        to be set so it can attach the menu to it (because menu shells are
        finicky about the kinds of widgets they are attached to)) */
@@ -3717,10 +3810,11 @@ void RefreshMenuToggleStates(WindowInfo 
 #endif
     XmToggleButtonSetState(window->autoSaveItem, window->autoSave, False);
     XmToggleButtonSetState(window->overtypeModeItem, window->overstrike, False);
     XmToggleButtonSetState(window->matchSyntaxBasedItem, window->matchSyntaxBased, False);
     XmToggleButtonSetState(window->readOnlyItem, IS_USER_LOCKED(window->lockReasons), False);
+    XmToggleButtonSetState(window->transientItem, window->transient, False);
 
     XtSetSensitive(window->smartIndentItem, 
             SmartIndentMacrosAvailable(LanguageModeName(window->languageMode)));
 
     SetAutoIndent(window, window->indentStyle);
@@ -4178,11 +4272,12 @@ static void cloneTextPanes(WindowInfo *w
             XtVaSetValues(text, XmNforeground, textD->fgPixel,
                     XmNbackground, textD->bgPixel, NULL);
             TextDSetColors(newTextD, textD->fgPixel, textD->bgPixel, 
                     textD->selectFGPixel, textD->selectBGPixel,
                     textD->highlightFGPixel,textD->highlightBGPixel,
-                    textD->lineNumFGPixel, textD->cursorFGPixel);
+                    textD->lineNumFGPixel, textD->cursorFGPixel,
+                    textD->wrapMarginFGPixel, textD->cursorlineBGPixel);
        }
         
        /* Set the minimum pane height in the new pane */
        UpdateMinPaneHeights(window);
 
@@ -4211,11 +4306,11 @@ static void cloneTextPanes(WindowInfo *w
         
     /* set the focus pane */
     for (i=0; i<=window->nPanes; i++) {
        text = i==0 ? window->textArea : window->textPanes[i-1];
        if(i == focusPane) {
-           window->lastFocus = text;
+            ChangeLastFocus(window, text);
            XmProcessTraversal(text, XmTRAVERSE_CURRENT);
            break;
        }
     }
     
@@ -4330,10 +4425,11 @@ static void cloneDocument(WindowInfo *wi
     window->findLastLiteralCase = orgWin->findLastLiteralCase;
     window->device = orgWin->device;
     window->inode = orgWin->inode;
     window->fileClosedAtom = orgWin->fileClosedAtom;
     orgWin->fileClosedAtom = None;
+    window->transient = orgWin->transient;
     
     /* copy the text/split panes settings, cursor pos & selection */
     cloneTextPanes(window, orgWin);
     
     /* copy undo & redo list */
@@ -4742,5 +4838,24 @@ void CleanUpTabBarExposeQueue(WindowInfo
        ev.count = 0;
        XSendEvent(TheDisplay, XtWindow(window->tabBar), False,
                ExposureMask, (XEvent *)&ev);
     }
 }    
+
+/*
+** Track which text pane in this widget is/was last active (with focus).
+** Also perform any tasks relating to changing pane focus.
+*/
+void ChangeLastFocus(WindowInfo *window, Widget text)
+{
+    Boolean showCursorline = GetPrefShowCursorline();
+
+    if (NULL != window->lastFocus) {
+        /*  Remove cursorline from last focussed pane.  */
+        XtVaSetValues(window->lastFocus,
+                textNshowCursorline, False,
+                NULL);
+    }
+    XtVaSetValues(text, textNshowCursorline, showCursorline, NULL);
+
+    window->lastFocus = text;
+}
diff --quilt old/source/window.h new/source/window.h
--- old/source/window.h
+++ new/source/window.h
@@ -51,13 +51,16 @@ void SetAutoIndent(WindowInfo *window, i
 void SetShowMatching(WindowInfo *window, int state);
 void SetFonts(WindowInfo *window, const char *fontName, const char *italicName,
        const char *boldName, const char *boldItalicName);
 void SetColors(WindowInfo *window, const char *textFg, const char *textBg,  
         const char *selectFg, const char *selectBg, const char *hiliteFg, 
-        const char *hiliteBg, const char *lineNoFg, const char *cursorFg);
+        const char *hiliteBg, const char *lineNoFg, const char *cursorFg,
+        const char* wrapMarginFg, const char* cursorlineBg);
 void SetOverstrike(WindowInfo *window, int overstrike);
 void SetAutoWrap(WindowInfo *window, int state);
+void SetWrapMargin(WindowInfo *window, int margin);
+void SetShowWrapMargin(WindowInfo *window, int state);
 void SetAutoScroll(WindowInfo *window, int margin);
 void SplitPane(WindowInfo *window);
 Widget GetPaneByIndex(WindowInfo *window, int paneIndex);
 int WidgetToPaneIndex(WindowInfo *window, Widget w);
 void ClosePane(WindowInfo *window);
@@ -102,6 +105,7 @@ void SortTabBar(WindowInfo *window);
 void SetBacklightChars(WindowInfo *window, char *applyBacklightTypes);
 void SetToggleButtonState(WindowInfo *window, Widget w, Boolean state, 
         Boolean notify);
 void SetSensitive(WindowInfo *window, Widget w, Boolean sensitive);
 void CleanUpTabBarExposeQueue(WindowInfo *window);
+void ChangeLastFocus(WindowInfo *window, Widget text);
 #endif /* NEDIT_WINDOW_H_INCLUDED */
diff --quilt old/util/fileUtils.c new/util/fileUtils.c
--- old/util/fileUtils.c
+++ new/util/fileUtils.c
@@ -83,11 +83,11 @@ static void copyThruSlash(char **toStrin
 
 /*
 ** Decompose a Unix file name into a file name and a path.
 ** Return non-zero value if it fails, zero else.
 ** For now we assume that filename and pathname are at
-** least MAXPATHLEN chars long.
+** most MAXPATHLEN chars long.
 ** To skip setting filename or pathname pass NULL for that argument.
 */
 int
 ParseFilename(const char *fullname, char *filename, char *pathname)
 {
diff --quilt old/util/getfiles.c new/util/getfiles.c
--- old/util/getfiles.c
+++ new/util/getfiles.c
@@ -6,11 +6,11 @@ static const char CVSID[] = "$Id: getfil
 * Copyright (C) 1999 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    *
 * Foundation; either version 2 of the License, or (at your option) any later   *
-* version. In addition, you may distribute version of this program linked to   *
+* version. In addition, you may distribute versions of this program linked to  *
 * Motif or Open Motif. See README for details.                                 *
 *                                                                              *
 * This software 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        *
@@ -35,23 +35,19 @@ static const char CVSID[] = "$Id: getfil
 *                          a directory when no filename was specified          *
 *          6/24/92 by MWE: Made filename list and directory list typeable,     *
 *                          set initial focus to filename list                  *
 *          6/25/93 by JMK: Fix memory leaks found by Purify.                   *
 *                                                                              *
-* Included are two routines written using Motif for accessing files:           *
-*                                                                              *
-* GetExistingFilename  presents a FileSelectionBox dialog where users can      *
-*                      choose an existing file to open.                        *
-*                                                                              *
 *******************************************************************************/
 
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
 #endif
 
-#include "getfiles.h"
+#include "DialogF.h"
 #include "fileUtils.h"
+#include "getfiles.h"
 #include "misc.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -73,15 +69,19 @@ static const char CVSID[] = "$Id: getfil
 
 #include <X11/keysym.h>
 #include <Xm/Xm.h>
 #include <Xm/FileSB.h>
 #include <Xm/Form.h>
+#include <Xm/Label.h>
 #include <Xm/List.h>
 #include <Xm/MessageB.h>
+#include <Xm/PushB.h>
 #include <Xm/PushBG.h>
-#include <Xm/Text.h>
+#include <Xm/RowColumn.h>
 #include <Xm/TextF.h>
+#include <Xm/Text.h>
+#include <Xm/ToggleB.h>
 
 #ifdef HAVE_DEBUG_H
 #include "../debug.h"
 #endif
 
@@ -93,26 +93,29 @@ static const char CVSID[] = "$Id: getfil
 #define MAX_LIST_KESTROKE_WAIT 2000    /* Allowable delay in milliseconds
                                           between characters typed to a list
                                           before starting over (throwing
                                           out the accumulated characters */
 
+#define HFSB_OK      1               /* Get Filename OK constant     */
+#define HFSB_CANCEL  2               /* Get Filename Cancel constant */
+
 #define SET_ONE_RSRC(widget, name, newValue) \
 { \
     static Arg tmpargs[1] = {{name, (XtArgVal)0}}; \
     tmpargs[0].value = (XtArgVal)newValue; \
     XtSetValues(widget, tmpargs, 1); \
-}      
+}
 
 enum yesNoValues {ynNone, ynYes, ynNo};
 
 /* Saved default directory and pattern from last successful call */
 static XmString DefaultDirectory = NULL;
 static XmString DefaultPattern = NULL;
 
-/* User settable option for leaving the file name text field in
-   GetExistingFilename dialogs.  Off by default so new users will get
-   used to typing in the list rather than in the text field */
+/* User settable option for leaving the file name text field in file
+   dialogs.  Off by default so new users will get used to typing in the
+   list rather than in the text field */
 static int RemoveRedundantTextField = True;
 
 /* Text for help button help display */
 /* ... needs variant for VMS */
 #ifndef SGI_CUSTOM
@@ -131,11 +134,14 @@ If you use the filter field, remember to
 either a file name, \"*\" is acceptable, or a trailing \"/\".  If \
 you don't, the name after the last \"/\" is interpreted as the file name to \
 match.  When you leave off the file name or trailing \"/\", you won't see \
 any files to open in the list \
 because the filter specification matched the directory file itself, rather \
-than the files in the directory.";
+than the files in the directory.\n"
+"\n"
+"Hidden files and directories (those whose names begin with a dot) will only "
+"be shown if the 'Show hidden Files' button is activated.";
 
 static const char *HelpNew = 
 "This dialog allows you to create a new file, or to save the current file \
 under a new name.  To specify a file \
 name in the current directory, complete the name displayed in the \"Save File \
@@ -151,11 +157,14 @@ to move around in the file system hierar
 directory names in the list, or selecting them and pressing the \
 \"Filter\" button will select that directory.  To move upwards \
 in the directory tree, double \
 click on the directory entry ending in \"..\".  You can also move directly \
 to a directory by typing the file specification of the path in the \"Filter\" \
-field and pressing the \"Filter\" button.";
+field and pressing the \"Filter\" button."
+"\n"
+"Hidden files and directories (those whose names begins with a dot) will only "
+"be shown if the 'Show hidden Files' button is activated.";
 
 #else /* SGI_CUSTOM */
 static const char *HelpExist =
 "The \"File to Edit:\" field shows a list of directories and files in the \
 current directory.\n\
@@ -175,11 +184,14 @@ will accept icons dragged from the deskt
 arrows, to the right, of the field recalls previously selected \
 directories.\n\
 \n\
 The \"Filter\" button allows you to narrow down the list of files and \
 directories shown in the \"File to Edit:\" field.  The default filter of \
-\"*\" allows all files to be listed.";
+\"*\" allows all files to be listed."
+"\n"
+"Hidden files and directories (those whose names begins with a dot) will only "
+"be shown if the 'Show hidden Files' button is activated.";
 
 static const char *HelpNew = 
 "This dialog allows you to create a new file or to save the current file \
 under a new name.\n\
 \n\
@@ -206,15 +218,20 @@ will accept icons dragged from the deskt
 arrows, to the right, of the field recalls previously selected \
 directories.\n\
 \n\
 The \"Filter\" button allows you to narrow down the list of files and \
 directories shown in the \"Files\" field.  The default filter of \
-\"*\" allows all files to be listed.";
-#endif /* SGI_CUSTOM */
+\"*\" allows all files to be listed."
+"\n"
+"Hidden files and directories (those whose names begins with a dot) will only "
+"be shown if the 'Show hidden Files' button is activated.";
 
-/*                    Local Callback Routines and variables                */
+#endif /* SGI_CUSTOM */
 
+/*
+**  Local Callback Routines and variables
+*/
 static void newFileOKCB(Widget w, Boolean *client_data,
               XmFileSelectionBoxCallbackStruct *call_data);
 static void newFileCancelCB(Widget w, Boolean *client_data, caddr_t 
                call_data);
 static void newHelpCB(Widget w, Widget helpPanel, caddr_t call_data);
@@ -236,104 +253,441 @@ static void listCharEH(Widget w, XtPoint
        Boolean *continueDispatch);
 static void replacementDirSearchProc(Widget w, XtPointer searchData);
 static void replacementFileSearchProc(Widget w, XtPointer searchData);
 static void sortWidgetList(Widget listWidget);
 static int compareXmStrings(const void *string1, const void *string2);
+static unsigned removeHiddenFiles(Widget listWidget);
+static Boolean removeDotEntry(Widget listWidget);
+static int isHiddenFile(const char* filename);
+static int handleCustomExistFileSB(Widget existFileSB, char *filename);
+static int handleCustomNewFileSB(Widget newFileSB, char *filename, char *defaultName);
 
-static int  SelectResult = GFN_CANCEL;  /*  Initialize results as cancel   */
+static int  SelectResult = HFSB_CANCEL;  /*  Initialize results as cancel   */
 static Widget YesNoDialog;             /* "Overwrite?" dialog widget      */
 static int YesNoResult;                        /* Result of overwrite dialog      */
 static Widget ErrorDialog;             /* Dialog widget for error msgs    */
 static int ErrorDone;                  /* Flag to mark dialog completed   */
 static void (*OrigDirSearchProc)();    /* Built in Motif directory search */
 static void (*OrigFileSearchProc)();   /* Built in Motif file search proc */
+static void freeFileList(char** list);
 
-/* 
- * Do the hard work of setting up a file selection dialog
- */
-Widget getFilenameHelper(Widget parent, char *promptString, char *filename, 
-        int existing) 
-{
-    int       n;                      /* number of arguments               */
-    Arg              args[MAX_ARGS];         /* arg list                          */
-    Widget    fileSB;                /* widget file select box            */
-    XmString  titleString;           /* compound string for dialog title  */
+static Widget addUtilForm(const Widget fsd, const Boolean showHidden,
+        const Boolean haveFormatButtons, const Boolean isContWrapped,
+        Boolean* addWrap, int* fileFormat);
+static void hiddenFilesCB(Widget widget, XtPointer client_data,
+        XtPointer call_data);
+static void showOptionsCB(Widget pushButton, XtPointer client_data,
+        XtPointer call_data);
+static void setFormatCB(Widget widget, XtPointer clientData, XtPointer callData);
+static void addWrapCB(Widget w, XtPointer clientData, XtPointer callData);
+
+/*
+**  GetFilenameByDialog()
+**
+**  Façade for file dialogs.
+**
+**  TODO: Refactor the whole module
+**  TODO: The original saved/restored a default directory, but I don't see any
+**        adverse effects on OM 2.2.3 or Lesstif 0.95 by just skipping that
+**        part. Does this depend on the toolkit and/or version used?
+*/
+gfbdValue* GetFilenameByDialog(const gfbdParams params)
+{
+    /*  Values  */
+    gfbdValue* retValue;
+
+    /*  widgets and other GUI stuff  */
+    Widget fsd;
+    XmString titleString;
+
+    /*  helpers  */
+    unsigned    n;              /*  arg list  */
+    Arg         args[MAX_ARGS]; /*  arg list  */
+    int         rc;             /*  return code of handleCustomExistFileSB()  */
+
+    /*  Can probably be refactored away.  */
+    fsbUserDataStruct userData;
+
+    /*  some initialization  */
+    retValue = (gfbdValue*) XtMalloc(sizeof(gfbdValue));
+    retValue->status = GFDB_ERROR;
 
     n = 0;
-    titleString = XmStringCreateSimple(promptString);
+    titleString = XmStringCreateLocalized(params.dialogTitle);
     XtSetArg(args[n], XmNdialogStyle, XmDIALOG_FULL_APPLICATION_MODAL); n++;
     XtSetArg(args[n], XmNdialogTitle, titleString); n++;
-    fileSB = CreateFileSelectionDialog(parent,"FileSelect",args,n);
+    XtSetArg(args[n], XmNresizePolicy, XmRESIZE_GROW); n++;
+    fsd = CreateFileSelectionDialog(params.parentShell, "fsd", args, n);
     XmStringFree(titleString);
-#ifndef SGI_CUSTOM
-    if (existing && RemoveRedundantTextField)
-        XtUnmanageChild(XmFileSelectionBoxGetChild(fileSB, XmDIALOG_TEXT)); 
-    XtUnmanageChild(XmFileSelectionBoxGetChild(fileSB, XmDIALOG_SELECTION_LABEL));
 
-    XtVaSetValues(XmFileSelectionBoxGetChild(fileSB, XmDIALOG_FILTER_LABEL),
+    /*  Put mnemonic on labels; this will put the focus in the labeled widget
+        if activated. See misc.c:findAndActivateMnemonic() for details.  */
+    XtVaSetValues(XmFileSelectionBoxGetChild(fsd, XmDIALOG_FILTER_LABEL),
             XmNmnemonic, 'l',
-            XmNuserData, XmFileSelectionBoxGetChild(fileSB, XmDIALOG_FILTER_TEXT),
+            XmNuserData, XmFileSelectionBoxGetChild(fsd, XmDIALOG_FILTER_TEXT),
             NULL);
-    XtVaSetValues(XmFileSelectionBoxGetChild(fileSB, XmDIALOG_DIR_LIST_LABEL),
+    XtVaSetValues(XmFileSelectionBoxGetChild(fsd, XmDIALOG_DIR_LIST_LABEL),
             XmNmnemonic, 'D',
-            XmNuserData, XmFileSelectionBoxGetChild(fileSB, XmDIALOG_DIR_LIST),
+            XmNuserData, XmFileSelectionBoxGetChild(fsd, XmDIALOG_DIR_LIST),
+            NULL);
+    XtVaSetValues(XmFileSelectionBoxGetChild(fsd, XmDIALOG_LIST_LABEL),
+            XmNmnemonic, 'F',
+            XmNuserData, XmFileSelectionBoxGetChild(fsd, XmDIALOG_LIST),
+            NULL);
+    /*  The last mnemonic originally used strspn() to find the last mnemonic,
+        but used the dialog's title instead of the list's label. Since it broke
+        user's GUI expectations I replaced it with a plain letter.  */
+
+    /*  Unmanage text field and label unless a label is given.  */
+    if (NULL == params.textfieldLabel) {
+        XtUnmanageChild(XmFileSelectionBoxGetChild(fsd, XmDIALOG_TEXT));
+        XtUnmanageChild(XmFileSelectionBoxGetChild(fsd, XmDIALOG_SELECTION_LABEL));
+    } else {
+        XmString labelString = XmStringCreateLocalized(params.textfieldLabel);
+
+        XtVaSetValues(XmFileSelectionBoxGetChild(fsd, XmDIALOG_SELECTION_LABEL),
+            XmNlabelString, labelString,
+                NULL);
+        XtVaSetValues(XmFileSelectionBoxGetChild(fsd, XmDIALOG_SELECTION_LABEL),
+            XmNmnemonic, params.textfieldLabel[strspn(params.textfieldLabel, "lDF")],
+            XmNuserData, XmFileSelectionBoxGetChild(fsd, XmDIALOG_TEXT),
+            NULL);
+        XmStringFree(labelString);
+    }
+
+    retValue->fileFormat = params.fileFormat;
+    addUtilForm(fsd, params.showHidden, params.haveFormatButtons,
+            params.isContWrapped, &(retValue->addWrap), &(retValue->fileFormat));
+
+    /*  Do the mnemonic magic. Wait until all mnemonics are prepared.  */
+    AddDialogMnemonicHandler(fsd, FALSE);
+
+    /*  Fix some ancient hardware/toolkit quirks.  */
+    RemapDeleteKey(XmFileSelectionBoxGetChild(fsd, XmDIALOG_FILTER_TEXT));
+    RemapDeleteKey(XmFileSelectionBoxGetChild(fsd, XmDIALOG_TEXT));
+
+    userData.showHidden = params.showHidden;
+    XtVaSetValues(fsd, XmNuserData, &userData, NULL);
+
+    /*  Refactor this.  */
+    if (params.fileExists) {
+        rc = handleCustomExistFileSB(fsd, retValue->payload);
+    } else {
+        rc = handleCustomNewFileSB(fsd, retValue->payload, params.defaultName);
+    }
+
+    switch(rc) {
+        case HFSB_OK:
+            retValue->status = GFDB_OK;
+            break;
+        case HFSB_CANCEL:
+            retValue->status = GFDB_CANCEL;
+            break;
+        default:
+            /*  fallback  */
+            strncpy(retValue->payload, "Something murphied in GetFilenameByDialog, sorry.", MAXPATHLEN);
+            retValue->status = GFDB_ERROR;
+            break;
+    }
+
+    return retValue;
+}
+
+/*
+**  Helper for GetFilenameByDialog()
+**
+**  Note: Since mnemonics are set here, wait with your call to activate them
+**  via AddDialogMnemonicHandler() until this is done.
+**
+**  TODO: The reliance on AddDialogMnemonicHandler() (called in the caller
+**        after addUtilForm()) breaks low coupling.
+*/
+static Widget addUtilForm(const Widget fsd, const Boolean showHidden,
+        const Boolean haveFormatButtons, const Boolean isContWrapped,
+        Boolean* addWrap, int* fileFormat)
+{
+    Widget      utilForm;               /*  form containing utility widgets  */
+    Widget      optionsForm;            /*  container for option widgets     */
+
+    Widget      showOptionsCheckBox;    /*  (un)display additional options   */
+    Widget      showOptionsPushButton;  /*  (un)display additional options   */
+    XmString    showOptionsLabel;       /*  PushButton label                 */
+
+    Widget      hiddenFilesCheckBox;    /*  (un)displaying hidden files      */
+    Widget      hiddenFilesToggleButton;    /*  (un)displaying hidden files  */
+    XmString    hiddenFilesLabel;       /*  ToggleButton label               */
+
+    Widget      formatBtnsRow;
+    Widget      unixFormatButton, dosFormatButton, macFormatButton;
+    Widget      wrapToggle;
+    Widget      topWidget = NULL;
+
+    XmString    s1 = NULL;
+
+    /*  Creates a Form containing additional widgets */
+    utilForm = XtVaCreateManagedWidget("utilForm", xmFormWidgetClass, fsd, NULL);
+
+    /*  Creates a RowColumn containing a PushButton to (un)display the
+        other options.  */
+    showOptionsCheckBox = XtVaCreateManagedWidget("showOptionsCheckBox",
+            xmRowColumnWidgetClass, utilForm,
+            NULL);
+    showOptionsLabel = XmStringCreateLocalized("Less...");
+    showOptionsPushButton = XtVaCreateManagedWidget("showOptionsPushButton",
+            xmPushButtonWidgetClass, showOptionsCheckBox,
+            XmNmnemonic, 'M',
+            XmNlabelString, showOptionsLabel,
+            XmNuserData, 1,
+            NULL);
+    XmStringFree(showOptionsLabel);
+    XtAddCallback(showOptionsPushButton,
+            XmNactivateCallback, showOptionsCB,
+            (XtPointer) &fsd);
+
+    /*  Creates a Form containing all options.  */
+    optionsForm = XtVaCreateManagedWidget("optionsForm",
+            xmFormWidgetClass, utilForm,
+            XmNtopAttachment, XmATTACH_WIDGET,
+            XmNtopWidget, showOptionsCheckBox,
+            XmNbottomAttachment, XmATTACH_FORM,
+            XmNleftAttachment, XmATTACH_FORM,
+            XmNrightAttachment, XmATTACH_FORM,
+            NULL);
+
+    /*  Adds format buttons.  */
+    if (haveFormatButtons) {
+        /*  Create RowColumn containing a number of push buttons for file format.  */
+        formatBtnsRow = XtVaCreateManagedWidget("formatBtnsRow",
+                xmRowColumnWidgetClass, optionsForm,
+                XmNradioBehavior, XmONE_OF_MANY,
+                XmNorientation, XmHORIZONTAL,
+                XmNpacking, XmPACK_TIGHT,
+                XmNtopAttachment, XmATTACH_FORM,
+                XmNleftAttachment, XmATTACH_FORM,
+                NULL);
+
+        XtVaCreateManagedWidget("formatBtns",
+                xmLabelWidgetClass, formatBtnsRow,
+                XmNlabelString, s1 = XmStringCreateSimple("Format:"),
+                NULL);
+        XmStringFree(s1);
+
+        unixFormatButton = XtVaCreateManagedWidget("unixFormat",
+                xmToggleButtonWidgetClass, formatBtnsRow,
+                XmNlabelString, s1 = XmStringCreateSimple("Unix"),
+                XmNset, UNIX_FILE_FORMAT == *fileFormat,
+                XmNuserData, (XtPointer) UNIX_FILE_FORMAT,
+                XmNmarginHeight, 0,
+                XmNalignment, XmALIGNMENT_BEGINNING,
+                XmNmnemonic, 'U',
+                NULL);
+        XmStringFree(s1);
+        XtAddCallback(unixFormatButton, XmNvalueChangedCallback, setFormatCB,
+                fileFormat);
+
+        dosFormatButton = XtVaCreateManagedWidget("dosFormat",
+                xmToggleButtonWidgetClass, formatBtnsRow,
+                XmNlabelString, s1 = XmStringCreateSimple("DOS"),
+                XmNset, DOS_FILE_FORMAT == *fileFormat,
+                XmNuserData, (XtPointer) DOS_FILE_FORMAT,
+                XmNmarginHeight, 0,
+                XmNalignment, XmALIGNMENT_BEGINNING,
+                XmNmnemonic, 'O',
+                NULL);
+        XmStringFree(s1);
+        XtAddCallback(dosFormatButton, XmNvalueChangedCallback, setFormatCB,
+                fileFormat);
+
+        macFormatButton = XtVaCreateManagedWidget("macFormat",
+                xmToggleButtonWidgetClass, formatBtnsRow,
+                XmNlabelString, s1 = XmStringCreateSimple("Macintosh"),
+                XmNset, MAC_FILE_FORMAT == *fileFormat,
+                XmNuserData, (XtPointer) MAC_FILE_FORMAT,
+                XmNmarginHeight, 0,
+                XmNalignment, XmALIGNMENT_BEGINNING,
+                XmNmnemonic, 'M',
+                NULL);
+        XmStringFree(s1);
+        XtAddCallback(macFormatButton, XmNvalueChangedCallback, setFormatCB,
+                fileFormat);
+
+        if (isContWrapped) {
+            wrapToggle = XtVaCreateManagedWidget("addWrap",
+                    xmToggleButtonWidgetClass, optionsForm,
+                    XmNlabelString,
+                            s1 = XmStringCreateSimple("Add line breaks where wrapped"),
+                    XmNalignment, XmALIGNMENT_BEGINNING,
+                    XmNmnemonic, 'A',
+                    XmNtopAttachment, XmATTACH_WIDGET,
+                    XmNtopWidget, formatBtnsRow,
+                    XmNleftAttachment, XmATTACH_FORM, NULL);
+            XtAddCallback(wrapToggle, XmNvalueChangedCallback, addWrapCB, addWrap);
+            XmStringFree(s1);
+
+            topWidget = wrapToggle;
+        } else {
+            topWidget = formatBtnsRow;
+        }
+    }
+
+    /*  Creates a RowColumn containing a ToggleButton to show/hide
+        hidden files in the file lists.  */
+    hiddenFilesCheckBox = XtVaCreateManagedWidget("hiddenFilesCheckBox",
+            xmRowColumnWidgetClass,
+            optionsForm,
+            XmNtopAttachment, XmATTACH_WIDGET,
+            XmNtopWidget, topWidget,
+            XmNbottomAttachment, XmATTACH_FORM,
+            XmNleftAttachment, XmATTACH_FORM,
+            XmNrightAttachment, XmATTACH_FORM,
             NULL);
-    XtVaSetValues(XmFileSelectionBoxGetChild(fileSB, XmDIALOG_LIST_LABEL),
-            XmNmnemonic, promptString[strspn(promptString, "lD")],
-            XmNuserData, XmFileSelectionBoxGetChild(fileSB, XmDIALOG_LIST),
+    hiddenFilesLabel = XmStringCreateLocalized("Show hidden Files");
+    hiddenFilesToggleButton = XtVaCreateManagedWidget("hiddenFilesToggleButton",
+            xmToggleButtonWidgetClass,
+            hiddenFilesCheckBox,
+            XmNmnemonic, 'h',
+            XmNlabelString, hiddenFilesLabel,
+            XmNset, showHidden,
             NULL);
-    AddDialogMnemonicHandler(fileSB, FALSE);
-    RemapDeleteKey(XmFileSelectionBoxGetChild(fileSB, XmDIALOG_FILTER_TEXT));
-    RemapDeleteKey(XmFileSelectionBoxGetChild(fileSB, XmDIALOG_TEXT));
+    XmStringFree(hiddenFilesLabel);
+    XtAddCallback(hiddenFilesToggleButton,
+            XmNvalueChangedCallback, hiddenFilesCB,
+            (XtPointer) &fsd);
+
+    return optionsForm;
+}
+
+/*
+**  Callback for hiddenFilesToggleButton
+**  The ToggleButton's state is saved in the FileSelectionBox' XmNuserData
+**  field, so that it can be used in the XmN*searchProcs.
+*/
+static void hiddenFilesCB(Widget widget,
+        XtPointer client_data,
+        XtPointer call_data)
+{
+    XmToggleButtonCallbackStruct* state =
+            (XmToggleButtonCallbackStruct *) call_data;
+    Widget* fsbParent = (Widget*) client_data;
+    fsbUserDataStruct* userData;
+
+    /* Remember the button's setting for the sort routines */
+    XtVaGetValues(*fsbParent, XmNuserData, &userData, NULL);
+    userData->showHidden = state->set;
+
+#if XmVERSION >= 2
+    /*  This will take care of the the Motif FSB resource fileFilterStyle. It
+        is still honored by NEdit by using it to override the compiled-in
+        default (see source/preferences.c, initPrefDefaultsFromResources()),
+        but the internal resource will override it.  */
+    {
+        int fileFilterStyle =
+                (state->set ? XmFILTER_NONE : XmFILTER_HIDDEN_FILES);
+        XtVaSetValues(*fsbParent, XmNfileFilterStyle, fileFilterStyle, NULL);
+    }
 #endif
-    return fileSB;
+
+    /* Reinitialize lists */
+    XmFileSelectionDoSearch(*fsbParent, NULL);
+}
+
+/*
+**  Callback for showOptionsPushButton
+**
+**  client_data ist supposed to carry a pointer to the FSB
+*/
+static void showOptionsCB(Widget pushButton,
+        XtPointer client_data,
+        XtPointer call_data)
+{
+    Boolean isShown;
+    XmString buttonLabel;
+    Widget* fsb = (Widget*) client_data;
+    Dimension optionFormHeight;
+    Widget optionsForm = XtNameToWidget(*fsb, "*optionsForm");
+    Dimension fsbHeight;
+
+    XtVaGetValues(pushButton, XmNuserData, &isShown, NULL);
+
+    /*  Get initial size of FSB  */
+    XtVaGetValues(*fsb, XmNheight, &fsbHeight, NULL);
+
+    if (isShown) {
+        isShown = False;
+
+        /*  We change the size here because the Less/More button should
+            stay under the mouse pointer.  */
+        XtVaGetValues(optionsForm, XmNheight, &optionFormHeight, NULL);
+        XtUnmanageChild(optionsForm);
+        XtVaSetValues(*fsb, XmNheight, fsbHeight - optionFormHeight, NULL);
+
+        /*  FIXME: Is this a leak? Do we have to delete the old string?  */
+        buttonLabel = XmStringCreateLocalized("More...");
+        XtVaSetValues(pushButton, XmNlabelString, buttonLabel, NULL);
+        XmStringFree(buttonLabel);
+    } else {
+        isShown = True;
+
+        /*  We change the size here because the Less/More button should
+            stay under the mouse pointer.  */
+        XtManageChild(optionsForm);
+        XtVaGetValues(optionsForm, XmNheight, &optionFormHeight, NULL);
+        XtVaSetValues(*fsb, XmNheight, fsbHeight + optionFormHeight, NULL);
+
+        /*  FIXME: Is this a leak? Do we have to delete the old string?  */
+        buttonLabel = XmStringCreateLocalized("Less...");
+        XtVaSetValues(pushButton, XmNlabelString, buttonLabel, NULL);
+        XmStringFree(buttonLabel);
+    }
+
+    XtVaSetValues(pushButton, XmNuserData, isShown, NULL);
 }
 
-/*  GetExistingFilename                                                           */
-/*                                                                        */
-/*  This routine will popup a file selection box so that the user can      */
-/*  select an existing file from the scrollable list.  The user is         */
-/*  prevented from entering a new filename because the edittable text      */
-/*  area of the file selection box widget is unmanaged.  After the user    */
-/*  selects a file, GetExistingFilename returns the selected filename and  */
-/*  GFN_OK, indicating that the OK button was pressed.  If the user        */
-/*  pressed the cancel button, the return value is GFN_CANCEL, and the     */
-/*  filename character string supplied in the call is not altered.        */
-/*                                                                        */
-/*  Arguments:                                                            */
-/*                                                                        */
-/*     Widget  parent        - parent widget id                           */
-/*     char *  promptString  - prompt string                              */
-/*     char *  filename      - a string to receive the selected filename  */
-/*                             (this string will not be altered if the    */
-/*                             user pressed the cancel button)            */
-/*                                                                        */
-/*  Returns:   GFN_OK        - file was selected and OK button pressed    */
-/*             GFN_CANCEL    - Cancel button pressed and no returned file */
-/*                                                                        */
-int GetExistingFilename(Widget parent, char *promptString, char *filename) 
-{
-    Widget existFileSB = getFilenameHelper(parent, promptString, filename, 
-            True);
-    return HandleCustomExistFileSB(existFileSB, filename);
-}
-
-/* GetNewFilename
- *
- * Same as GetExistingFilename but pick a new file instead of an existing one.
- * In this case the text area of the FSB is *not* unmanaged, so the user can
- * enter a new filename.
- */
-int GetNewFilename(Widget parent, char *promptString, char *filename,
-        char *defaultName)
+/*
+** Callback procedure for toggle button requesting newlines to be inserted
+** to emulate continuous wrapping.
+*/
+static void addWrapCB(Widget w, XtPointer clientData, XtPointer callData)
 {
-    Widget fileSB = getFilenameHelper(parent, promptString, filename, False);
-    return HandleCustomNewFileSB(fileSB, filename, defaultName);
+    int resp;
+    int *addWrap = (int *)clientData;
+
+    if (XmToggleButtonGetState(w)) {
+        resp = DialogF(DF_WARN, w, 2, "Add Wrap",
+                "This operation adds permanent line breaks to\n"
+                "match the automatic wrapping done by the\n"
+                "Continuous Wrap mode Preferences Option.\n\n"
+                "*** This Option is Irreversable ***\n\n"
+                "Once newlines are inserted, continuous wrapping\n"
+                "will no longer work automatically on these lines", "OK",
+                "Cancel");
+        if (1 == resp) {
+            *addWrap = True;
+        } else {
+            XmToggleButtonSetState(w, False, False);
+            *addWrap = False;
+        }
+    } else {
+        *addWrap = False;
+    }
 }
 
 /*
-** HandleCustomExistFileSB
+** Callback procedure for File Format toggle buttons.  Format is stored
+** in userData field of widget button
+*/
+static void setFormatCB(Widget widget, XtPointer clientData, XtPointer callData)
+{
+    if (XmToggleButtonGetState(widget)) {
+        XtPointer userData;
+        XtVaGetValues(widget, XmNuserData, &userData, NULL);
+        *((int*) clientData) = (int) userData;
+    }
+}
+
+/*
+** handleCustomExistFileSB
 **
 ** Manage a customized file selection box for opening existing files.
 ** Use this if you want to change the standard file selection dialog
 ** from the defaults provided in GetExistingFilename, but still
 ** want take advantage of the button processing, help messages, and
@@ -344,23 +698,24 @@ int GetNewFilename(Widget parent, char *
 **     Widget  existFileSB   - your custom file selection box widget id
 **     char *  filename      - a string to receive the selected filename
 **                             (this string will not be altered if the
 **                             user pressed the cancel button) 
 **
-**  Returns:   GFN_OK        - file was selected and OK button pressed 
-**             GFN_CANCEL    - Cancel button pressed and no returned file
+**  Returns:   HFSB_OK       - file was selected and OK button pressed
+**             HFSB_CANCEL    - Cancel button pressed and no returned file
 **
 */
-int HandleCustomExistFileSB(Widget existFileSB, char *filename)
+int handleCustomExistFileSB(Widget existFileSB, char *filename)
 {
     Boolean   done_with_dialog=False; /* ok to destroy dialog flag        */
     char      *fileString;            /* C string for file selected        */
     char      *dirString;             /* C string for dir of file selected */
     XmString  cFileString;            /* compound string for file selected */
     XmString  cDir;                  /* compound directory selected       */
     XmString  cPattern;               /* compound filter pattern          */
     Widget    help;                  /* help window form dialog           */
+    fsbUserDataStruct* userData;
 #if XmVersion < 1002
     int       i;
 #endif
 
     XtAddCallback(existFileSB, XmNokCallback, (XtCallbackProc)existOkCB,
@@ -382,10 +737,17 @@ int HandleCustomExistFileSB(Widget exist
 #if XmVersion >= 1002
     XtVaSetValues(existFileSB, XmNinitialFocus, XtParent(
            XmFileSelectionBoxGetChild(existFileSB, XmDIALOG_LIST)), NULL);
 #endif
 #endif
+
+    XtVaGetValues(existFileSB, XmNuserData, &userData, NULL);
+    /*  FIXME: The nice hidden file patch is broken by Nate's non-factoring.  */
+    userData->cachedDirList = NULL;
+    userData->cachedFileList = NULL;
+    XtVaSetValues(existFileSB, XmNuserData, userData, NULL);
+
     ManageDialogCenteredOnPointer(existFileSB);
 
 #ifndef SGI_CUSTOM
     /* Typing in the directory list is dependent on the list being in the
        same form of alphabetical order expected by the character processing
@@ -413,11 +775,11 @@ int HandleCustomExistFileSB(Widget exist
 #endif /* SGI_CUSTOM */
 
     while (!done_with_dialog)
         XtAppProcessEvent(XtWidgetToApplicationContext(existFileSB), XtIMAll);
     
-    if (SelectResult == GFN_OK) {
+    if (SelectResult == HFSB_OK) {
        XtVaGetValues(existFileSB, XmNdirSpec, &cFileString, XmNdirectory,
                &cDir, XmNpattern, &cPattern, NULL);
        /* Undocumented: file selection box widget allocates copies of these
           strings on getValues calls.  I have risked freeing them to avoid
           memory leaks, since I assume other developers have made this same
@@ -457,16 +819,20 @@ int HandleCustomExistFileSB(Widget exist
        be necessary as the shell is destroyed automatically when the dialog
        is. However, due to a bug in various Lesstif versions, the latter 
        messes up the grab cascades and leaves new windows without grabs, such
        that they appear to be frozen. */
     XtDestroyWidget(XtParent(existFileSB));
+
+    freeFileList(userData->cachedDirList);
+    freeFileList(userData->cachedFileList);
+
     return SelectResult;
 }
 
 
 /*
-** HandleCustomNewFileSB
+** handleCustomNewFileSB
 **
 ** Manage a customized file selection box for opening new files.
 **
 **  Arguments:
 **
@@ -475,23 +841,24 @@ int HandleCustomExistFileSB(Widget exist
 **                             (this string will not be altered if the
 **                             user pressed the cancel button) 
 **     char*   defaultName   - default name to be pre-entered in filename
 **                             text field.
 **
-**  Returns:   GFN_OK        - file was selected and OK button pressed 
-**             GFN_CANCEL    - Cancel button pressed and no returned file
+**  Returns:   HFSB_OK       - file was selected and OK button pressed
+**             HFSB_CANCEL    - Cancel button pressed and no returned file
 **
 */
-int HandleCustomNewFileSB(Widget newFileSB, char *filename, char *defaultName)
+int handleCustomNewFileSB(Widget newFileSB, char *filename, char *defaultName)
 {
     Boolean   done_with_dialog=False; /* ok to destroy dialog flag        */
     Widget    help;                  /* help window form dialog           */
     XmString  cFileString;            /* compound string for file selected */
     XmString  cDir;                  /* compound directory selected       */
     XmString  cPattern;               /* compound filter pattern          */
     char      *fileString;            /* C string for file selected        */
     char      *dirString;             /* C string for dir of file selected */
+    fsbUserDataStruct* userData;
 #if XmVersion < 1002
     int       i;
 #endif
 
     XtAddCallback(newFileSB, XmNokCallback, (XtCallbackProc)newFileOKCB,
@@ -520,10 +887,16 @@ int HandleCustomNewFileSB(Widget newFile
       if ( finder != NULL )
          XtVaSetValues(newFileSB, XmNinitialFocus, finder, NULL);
     }
 #endif
 #endif
+
+    XtVaGetValues(newFileSB, XmNuserData, &userData, NULL);
+    userData->cachedDirList = NULL;
+    userData->cachedFileList = NULL;
+    XtVaSetValues(newFileSB, XmNuserData, userData, NULL);
+
     ManageDialogCenteredOnPointer(newFileSB);
 
 #ifndef SGI_CUSTOM
 #if XmVersion < 1002
     /* To give filename text initial focus, revoke default button status for
@@ -571,11 +944,11 @@ int HandleCustomNewFileSB(Widget newFile
     }
 
     while (!done_with_dialog)
         XtAppProcessEvent (XtWidgetToApplicationContext(newFileSB), XtIMAll);
 
-    if (SelectResult == GFN_OK) {
+    if (SelectResult == HFSB_OK) {
        /* See note in existing file routines about freeing the values
           obtained in the following call */
        XtVaGetValues(newFileSB, XmNdirSpec, &cFileString, XmNdirectory,
                &cDir, XmNpattern, &cPattern, NULL);
        if (DefaultDirectory != NULL) XmStringFree(DefaultDirectory);
@@ -603,10 +976,14 @@ int HandleCustomNewFileSB(Widget newFile
        }
        XmStringFree(cFileString);
        XtFree(fileString);
     }
     XtDestroyWidget(newFileSB);
+
+    freeFileList(userData->cachedDirList);
+    freeFileList(userData->cachedFileList);
+
     return SelectResult;
 }
 
 /*
 ** Return current default directory used by GetExistingFilename.
@@ -663,11 +1040,11 @@ void SetFileDialogDefaultPattern(char *p
        XmStringFree(DefaultPattern);
     DefaultPattern = pattern==NULL ? NULL : XmStringCreateSimple(pattern);
 }
 
 /*
-** Turn on or off the text fiend in the GetExistingFilename file selection
+** Turn on or off the text field in the GetExistingFilename file selection
 ** box, where users can enter the filename by typing.  This is redundant
 ** with typing in the list, and leads users who are new to nedit to miss
 ** the more powerful feature in favor of changing the focus and typing
 ** in the text field.
 */
@@ -791,11 +1168,11 @@ static void newFileOKCB(Widget   w, Boolea
     int  length;                     /* length of file name             */
     int  response;                   /* response to dialog              */
     struct stat buf;                 /* status from fstat               */
     
     XmStringGetLtoR(call_data->value, XmSTRING_DEFAULT_CHARSET, &filename);
-    SelectResult = GFN_OK;
+    SelectResult = HFSB_OK;
     length = strlen(filename);
     if (length == 0 || filename[length-1] == '/') {
        doErrorDialog("Please supply a name for the file", NULL);
        XtFree(filename);
        return;
@@ -842,11 +1219,11 @@ static void newFileOKCB(Widget   w, Boolea
 }
 
 
 static void newFileCancelCB(Widget w, Boolean *client_data, caddr_t call_data)
 {
-    SelectResult = GFN_CANCEL;
+    SelectResult = HFSB_CANCEL;
     *client_data = True;
 }
 
 static void newHelpCB(Widget w, Widget helpPanel, caddr_t call_data)
 {
@@ -859,11 +1236,11 @@ static void existOkCB(Widget w, Boolean 
     char *filename;                   /* name of chosen file             */
     int  fd;                          /* file descriptor                 */
     int  length;                     /* length of file name             */
     
     XmStringGetLtoR(call_data->value, XmSTRING_DEFAULT_CHARSET, &filename);
-    SelectResult = GFN_OK;
+    SelectResult = HFSB_OK;
     length = strlen(filename);
     if (length == 0 || filename[length-1] == '/') {
        doErrorDialog("Please select a file to open", NULL);
        XtFree(filename);
        return;
@@ -879,11 +1256,11 @@ static void existOkCB(Widget w, Boolean 
 }
 
 
 static void existCancelCB(Widget w, Boolean * client_data, caddr_t call_data)
 {
-    SelectResult = GFN_CANCEL;
+    SelectResult = HFSB_CANCEL;
     *client_data = True;               /* done with dialog             */
 }
 
 static void yesNoOKCB(Widget w, caddr_t client_data, caddr_t call_data)
 {
@@ -1066,40 +1443,115 @@ static void listCharEH(Widget w, XtPoint
 ** and should be removed.  These routines also leak memory like a seive,
 ** because Motif's inconsistent treatment of memory in list widgets does
 ** not allow us to free lists that we pass in, and most Motif versions
 ** don't clean it up properly.
 */
-static void replacementDirSearchProc(Widget w, XtPointer searchData)
+
+static int restorePreviousList(Widget list, char** prevList)
 {
-    Boolean updated;
-    
+    int count = 0, i;
+
+    while (prevList[count]) {
+        ++count;
+    }
+    XmListDeleteAllItems(list);
+
+    for (i = 0; i < count; ++i) {
+        XmString s;
+        XmListAddItem(list, s = XmStringCreateSimple(prevList[i]), i + 1);
+        XtFree(prevList[i]);
+        XmStringFree(s);
+    }
+    XtFree((char*) prevList);
+    return count;
+}
+
+static int saveCurrentList(Widget list, char*** saveList)
+{
+    XmString *items;
+    int nItems, i;
+
+    XtVaGetValues(list, XmNitems, &items, XmNitemCount, &nItems, NULL);
+    *saveList = (char**) XtMalloc(sizeof(char*) * (nItems + 1));
+
+    for (i = 0; i < nItems; ++i) {
+        char* s;
+        XmStringGetLtoR(items[i], XmSTRING_DEFAULT_CHARSET, &s);
+        (*saveList)[i] = s;
+    }
+
+    (*saveList)[nItems] = 0;
+    return nItems;
+}
+
+static void replacementDirSearchProc(Widget fileSB, XtPointer searchData)
+{
+    int fileCount, newFileCount;
+    fsbUserDataStruct* userData;
+
+    XtVaGetValues(fileSB, XmNuserData, &userData, NULL);
+
+    if (userData->cachedDirList) {
+       restorePreviousList(XmFileSelectionBoxGetChild(fileSB, XmDIALOG_DIR_LIST),
+                           userData->cachedDirList);
+       userData->cachedDirList = NULL;
+    }
+
     /* Call the original search procedure to do the actual search */
-    (*OrigDirSearchProc)(w, searchData);
-    /* Refreshing a list clears the keystroke history, even if no update. */
+    (*OrigDirSearchProc)(fileSB, searchData);
     nKeystrokes = 0;
-    XtVaGetValues(w, XmNlistUpdated, &updated, NULL);
-    if (!updated)
-       return;
-       
+
+    fileCount = saveCurrentList(XmFileSelectionBoxGetChild(fileSB, XmDIALOG_DIR_LIST),
+                                &userData->cachedDirList);
+
+    if (userData->showHidden)
+    {
+        /* Remove '.' entry */
+        if (removeDotEntry(XmFileSelectionBoxGetChild(fileSB, XmDIALOG_DIR_LIST))) {
+           newFileCount = fileCount -1;
+        } else {
+           newFileCount = fileCount;
+        }
+
+    } else {
+        /* Remove hidden files from list */
+        removeHiddenFiles(XmFileSelectionBoxGetChild(fileSB, XmDIALOG_DIR_LIST));
+    }
+    XtVaSetValues(fileSB, XmNlistUpdated, True, NULL);
+
     /* Sort the items in the list */
-    sortWidgetList(XmFileSelectionBoxGetChild(w, XmDIALOG_DIR_LIST));
+    sortWidgetList(XmFileSelectionBoxGetChild(fileSB, XmDIALOG_DIR_LIST));
 }
 
-static void replacementFileSearchProc(Widget w, XtPointer searchData)
+static void replacementFileSearchProc(Widget fileSB, XtPointer searchData)
 {
-    Boolean updated;
-    
+    int fileCount;
+    fsbUserDataStruct* userData;
+
+    XtVaGetValues(fileSB, XmNuserData, &userData, NULL);
+
+    if (userData->cachedFileList) {
+        restorePreviousList(XmFileSelectionBoxGetChild(fileSB, XmDIALOG_LIST),
+                userData->cachedFileList);
+        userData->cachedFileList = NULL;
+    }
+
     /* Call the original search procedure to do the actual search */
-    (*OrigFileSearchProc)(w, searchData);
-    /* Refreshing a list clears the keystroke history, even if no update. */
+    (*OrigFileSearchProc)(fileSB, searchData);
     nKeystrokes = 0;
-    XtVaGetValues(w, XmNlistUpdated, &updated, NULL);
-    if (!updated)
-       return;
-       
+
+    fileCount = saveCurrentList(XmFileSelectionBoxGetChild(fileSB, XmDIALOG_LIST),
+                                &userData->cachedFileList);
+
+    if (!userData->showHidden) {
+        /* Remove hidden files from list */
+        removeHiddenFiles(XmFileSelectionBoxGetChild(fileSB, XmDIALOG_LIST));
+    }
+    XtVaSetValues(fileSB, XmNlistUpdated, True, NULL);
+
     /* Sort the items in the list */
-    sortWidgetList(XmFileSelectionBoxGetChild(w, XmDIALOG_LIST));
+    sortWidgetList(XmFileSelectionBoxGetChild(fileSB, XmDIALOG_LIST));
 }
 
 /*
 ** Sort the items in a list widget "listWidget"
 */
@@ -1132,5 +1584,160 @@ static int compareXmStrings(const void *
     result = strcmp(s1, s2);
     XtFree(s1);
     XtFree(s2);
     return result;
 }
+
+/*
+**  Removes the '.' entry from a listWidget
+**
+**  Preconditions:
+**      listWidget is an XmList containing filenames
+**
+**  Postcondition:
+**      first dotEntry in listWidget is removed
+*/
+static Boolean removeDotEntry(Widget listWidget)
+{
+    /*  Items currently in the listWidget */
+    XmString* items;
+    int nItems;
+
+    int i;
+
+    /*  read values in List into array. */
+    XtVaGetValues(listWidget,
+            XmNitems, &items,
+            XmNitemCount, &nItems,
+            NULL);
+
+    /*  Traverse over items; for every item, check whether it's the dotfile;
+        if yes, delete it and return True. */
+    for (i = 0; i < nItems; i++) {
+        /* C string of current list item */
+        char* filename;
+
+        /* basename of current list item */
+        char basename[MAXPATHLEN + 1];
+
+        /* Convert Motif compound string to C string */
+        XmStringGetLtoR(items[i], XmSTRING_DEFAULT_CHARSET, &filename);
+
+        /* Get basename from list item */
+        ParseFilename(filename, basename, NULL);
+
+        /* Free C string, allocated by XmStringGetLtoR(). */
+        XtFree(filename);
+
+        /* if this is the dotEntry... */
+        if (0 == strcmp(basename, ".")) {
+            /* ...delete it and break. */
+            XmListDeletePos(listWidget, i + 1);
+            return True;
+        }
+    }
+
+    return False;
+}
+
+/*
+**  Removes hidden files from an XmList. Hidden files are all list entries
+**  which are recognized as such by isHiddenFile().
+**
+**  Preconditions:
+**      listWidget is an XmList containing filenames
+**      'int isHiddenFile(const char* fullname)' exists and works.
+**
+**  Postcondition:
+**      Hidden files in listWidget are removed
+**
+**  Returns
+**      number of hidden files removed
+*/
+static unsigned removeHiddenFiles(Widget listWidget)
+{
+    /*  Items currently in the listWidget */
+    XmString* items;
+    int nItems;
+
+    /*  Array holding list positions of hidden files. It is allocated based
+        on the current number of items in the List. */
+    int* hiddenFilePositions;
+
+    /*  Number of hidden files found */
+    unsigned hiddenFileCount = 0;
+
+    int i;
+
+    /*  read values in List into array. */
+    XtVaGetValues(listWidget, XmNitems, &items, XmNitemCount, &nItems, NULL);
+
+    /*  Allocate array based on number of items in List. */
+    hiddenFilePositions = (int*) XtMalloc(sizeof(int*) * nItems);
+
+    /*  Traverse over items; for every item, check whether it's a hidden file;
+        if yes, put it in hiddenFilePositions[]. */
+    for (i = 0; i < nItems; i++) {
+        char* filename;
+        XmStringGetLtoR(items[i], XmSTRING_DEFAULT_CHARSET, &filename);
+        if (isHiddenFile(filename)) {
+            /*  Add one because XmListDeletePositions expects values > 0. */
+            hiddenFilePositions[hiddenFileCount++] = i + 1;
+        }
+        XtFree(filename);
+    }
+
+    /* Do the removal. */
+    XmListDeletePositions(listWidget, hiddenFilePositions, hiddenFileCount);
+
+    /* Free array of positions. */
+    XtFree((char*) hiddenFilePositions);
+
+    return hiddenFileCount;
+}
+
+/*
+**  Checks whether fullname is a dotfile, ie. starts with a '.'
+**
+**  Preconditions:
+**      fullname < MAXPATHLEN
+**      'void ParseFilename(fullname, filename, NULL)' exists and works
+**
+**  Postcondition:
+**      Returns False for '..' and non-dotfiles, True for other dotfiles.
+*/
+static int isHiddenFile(const char* fullname)
+{
+    /* array to hold basename */
+    char basename[MAXPATHLEN + 1];
+
+    /* Extract basename from full filename */
+    ParseFilename(fullname, basename, NULL);
+
+    if (0 == strcmp(basename, "..")) {
+        /* Return False for parent directory */
+        return False;
+    } else {
+        /* Return True for dotfiles, False for other files */
+        return (basename[0] == '.');
+    }
+}
+
+static void freeFileList(char** list)
+{
+    int count = 0;
+    int i;
+
+    if (!list) {
+        return;
+    }
+
+    while (list[count]) {
+        ++count;
+    }
+
+    for (i = 0; i < count; i++) {
+        XtFree(list[i]);
+    }
+
+    XtFree((char*) list);
+}
diff --quilt old/util/getfiles.h new/util/getfiles.h
--- old/util/getfiles.h
+++ new/util/getfiles.h
@@ -26,22 +26,55 @@
 *******************************************************************************/
 
 #ifndef NEDIT_GETFILES_H_INCLUDED
 #define NEDIT_GETFILES_H_INCLUDED
 
+#include <sys/param.h>
+
 #include <X11/Intrinsic.h>
 
-#define GFN_OK         1               /* Get Filename OK constant     */
-#define GFN_CANCEL     2               /* Get Filename Cancel constant */
+/*
+**  The interface got smaller on functions and bigger on parameters. It's still
+**  a big too large for my tastes, but that's what you get.
+*/
+typedef struct {
+    /*  GUI customization  */
+    String dialogTitle;
+    Boolean showHidden;
+
+    Boolean fileExists;
+    /*  Usually only used for potentially unexisting files.  */
+    String textfieldLabel;      /*  only set on new file || GetPrefStdOpenDialog() */
+    Boolean haveFormatButtons;  /*  only makes sense for new files  */
+    String defaultName;
+
+    /*  document details  */
+    int fileFormat;
+    Boolean isContWrapped;
+
+    /*  GUI handling  */
+    Widget parentShell;
+} gfbdParams;
+
+enum gfdbResult {GFDB_OK, GFDB_CANCEL, GFDB_ERROR};
+typedef struct {
+    int status;
+    char payload[MAXPATHLEN + 1];   /*  Usually carries the filename  */
+    Boolean addWrap;
+    int fileFormat;
+} gfbdValue;
 
-int GetExistingFilename(Widget parent, char *promptString, char *filename);
-int GetNewFilename(Widget parent, char *promptString, char *filename, 
-        char *defaultName);
-int HandleCustomExistFileSB(Widget existFileSB, char *filename);
-int HandleCustomNewFileSB(Widget newFileSB, char *filename, char *defaultName);
 char *GetFileDialogDefaultDirectory(void);
 char *GetFileDialogDefaultPattern(void);
 void SetFileDialogDefaultDirectory(char *dir);
 void SetFileDialogDefaultPattern(char *pattern);
 void SetGetEFTextFieldRemoval(int state);
+gfbdValue* GetFilenameByDialog(const gfbdParams params);
+
+typedef struct
+{
+   Bool showHidden;
+   char** cachedDirList;
+   char** cachedFileList;
+} fsbUserDataStruct;
 
 #endif /* NEDIT_GETFILES_H_INCLUDED */
diff --quilt old/util/prefFile.c new/util/prefFile.c
--- old/util/prefFile.c
+++ new/util/prefFile.c
@@ -6,11 +6,11 @@ static const char CVSID[] = "$Id: prefFi
 * Copyright (C) 1999 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    *
 * Foundation; either version 2 of the License, or (at your option) any later   *
-* version. In addition, you may distribute version of this program linked to   *
+* version. In addition, you may distribute versions of this program linked to  *
 * Motif or Open Motif. See README for details.                                 *
 *                                                                              *
 * This software 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        *
@@ -302,11 +302,11 @@ int SavePreferences(Display *display, co
 }
 
 static int stringToPref(const char *string, PrefDescripRec *rsrcDescrip)
 {
     int i;
-    char *cleanStr, *endPtr, **enumStrings;
+    char *cleanStr, *endPtr, **enumStrings, *cleanEnumStr;
     
     switch (rsrcDescrip->dataType) {
       case PREF_INT:
        cleanStr = removeWhiteSpace(string);
        *(int *)rsrcDescrip->valueAddr =
@@ -338,22 +338,25 @@ static int stringToPref(const char *stri
        }
        XtFree(cleanStr);
        *(int *)rsrcDescrip->valueAddr = False;
        return False;
       case PREF_ENUM:
-       cleanStr = removeWhiteSpace(string);
-       enumStrings = (char **)rsrcDescrip->arg;
-       for (i=0; enumStrings[i]!=NULL; i++) {
-           if (!strcmp(enumStrings[i], cleanStr)) {
-               *(int *)rsrcDescrip->valueAddr = i;
-               XtFree(cleanStr);
-               return True;
-           }
-       }
-       XtFree(cleanStr);
-       *(int *)rsrcDescrip->valueAddr = 0;
-       return False;
+        cleanStr = removeWhiteSpace(string);
+        enumStrings = (char **)rsrcDescrip->arg;
+        for (i=0; enumStrings[i]!=NULL; i++) {
+            cleanEnumStr = removeWhiteSpace(enumStrings[i]);
+            if (!strcmp(cleanEnumStr, cleanStr)) {
+                *(int *)rsrcDescrip->valueAddr = i;
+                XtFree(cleanStr);
+                XtFree(cleanEnumStr);
+                return True;
+            }
+            XtFree(cleanEnumStr);
+        }
+        XtFree(cleanStr);
+        *(int *)rsrcDescrip->valueAddr = 0;
+        return False;
       case PREF_STRING:
        if ((int)strlen(string) >= (int)rsrcDescrip->arg)
            return False;
        strncpy(rsrcDescrip->valueAddr, string, (int)rsrcDescrip->arg);
        return True;
diff --quilt old/util/printUtils.c new/util/printUtils.c
--- old/util/printUtils.c
+++ new/util/printUtils.c
@@ -6,11 +6,11 @@ static const char CVSID[] = "$Id: printU
 * Copyright (C) 1999 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    *
 * Foundation; either version 2 of the License, or (at your option) any later   *
-* version. In addition, you may distribute version of this program linked to   *
+* version. In addition, you may distribute versions of this program linked to  *
 * Motif or Open Motif. See README for details.                                 *
 *                                                                              *
 * This software 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        *
@@ -324,10 +324,12 @@ static Widget createForm(Widget parent)
     argcnt++;
     XtSetArg(args[argcnt], XmNdialogTitle, (st0=XmStringCreateLtoR(
                "Print", XmSTRING_DEFAULT_CHARSET))); argcnt++;
     XtSetArg(args[argcnt], XmNautoUnmanage, False); argcnt++;
     form = CreateFormDialog(parent, "printForm", args, argcnt);
+
+    /*  Why is this not part of the arg vector?  */
     XtVaSetValues(form, XmNshadowThickness, 0, NULL);
     
     XmStringFree( st0 );
 
     /*********************** LABEL 1 and TEXT BOX 1 *********************/