load_macro_file-nowarn-option.patch

   1 Subject: load_macro_file(): "nowarn" option
   2
   3 The internal ReadMacroFile() function has a warnNotExist option, the
   4 load_macro_file() macro calls this always with True. This patch gives this
   5 option also to the macro function.
   6
   7 ---
   8
   9  doc/help.etx  |    2 ++
  10  source/menu.c |   13 ++++++++++++-
  11  2 files changed, 14 insertions(+), 1 deletion(-)
  12
  13 diff --quilt old/doc/help.etx new/doc/help.etx
  14 --- old/doc/help.etx
  15 +++ new/doc/help.etx
  16 @@ -3141,6 +3141,8 @@ Action Routines
  17
  18      **include_file**( ~filename~ )
  19
  20 +    **load_macro_file**( ~filename~ [, "nowarn"])
  21 +
  22      **load_tags_file**( ~filename~ )
  23
  24      **macro_menu_command**( ~macro-menu-item-name~ )
  25 diff --quilt old/source/menu.c new/source/menu.c
  26 --- old/source/menu.c
  27 +++ new/source/menu.c
  28 @@ -2938,11 +2938,22 @@ static void loadMacroDialogAP(Widget w,
  29
  30  static void loadMacroAP(Widget w, XEvent *event, String *args, Cardinal *nArgs)
  31  {
  32 +    Boolean warnNotExist = True;
  33 +
  34      if (*nArgs == 0) {
  35         fprintf(stderr,"nedit: load_macro_file action requires file argument\n");
  36         return;
  37      }
  38 -    ReadMacroFile(WidgetToWindow(w), args[0], True);
  39 +
  40 +    if (*nArgs >= 2) {
  41 +        if (0 != strCaseCmp(args[1], "nowarn")) {
  42 +            fprintf(stderr,"nedit: load_macro_file unknown argument: \"%s\"\n", args[1]);
  43 +            return;
  44 +        }
  45 +        warnNotExist = False;
  46 +    }
  47 +
  48 +    ReadMacroFile(WidgetToWindow(w), args[0], warnNotExist);
  49  }
  50
  51  static void loadTagsDialogAP(Widget w, XEvent *event, String *args,