Merge branch '2863_mcdiff_merge_enhance'

* 2863_mcdiff_merge_enhance:
  fixed the doxygen documentation.
  Added doxygen comments
  Added diff_place_t enum.
  Added action_direction_t type
  Ticket #2863 (mcdiff bidirectional merge enhancement)

lib/keybind.c

@@ -353,6 +353,7 @@ static name_keymap_t command_names[] = {
     {"HunkPrev", CK_HunkPrev},
     {"EditOther", CK_EditOther},
     {"Merge", CK_Merge},
+    {"MergeOther", CK_MergeOther},
 #endif /* USE_DIFF_VIEW */
 
     {NULL, CK_IgnoreKey}

lib/keybind.h

@@ -328,7 +328,8 @@ enum
     CK_HunkNext,
     CK_HunkPrev,
     CK_EditOther,
-    CK_Merge
+    CK_Merge,
+    CK_MergeOther
 };
 
 /*** structures declarations (and typedefs of structures)*****************************************/

misc/mc.keymap.default

@@ -432,6 +432,7 @@ Save = f2
 Edit = f4
 EditOther = f14
 Merge = f5
+MergeOther = f15
 Search = f7
 SearchContinue = f17
 Options = f9

misc/mc.keymap.emacs

@@ -434,6 +434,7 @@ Save = f2
 Edit = f4
 EditOther = f14
 Merge = f5
+MergeOther = f15
 Search = f7
 SearchContinue = f17
 Options = f9

src/diffviewer/internal.h

@@ -23,6 +23,13 @@ typedef enum
     DATA_SRC_ORG = 2
 } DSRC;
 
+typedef enum
+{
+    DIFF_LEFT = 0,
+    DIFF_RIGHT = 1,
+    DIFF_COUNT = 2
+} diff_place_t;
+
 typedef enum
 {
     DIFF_NONE = 0,
@@ -54,7 +61,7 @@ typedef struct
 {
     int off;
     int len;
-} BRACKET[2];
+} BRACKET[DIFF_COUNT];
 
 typedef struct
 {
@@ -80,12 +87,12 @@ typedef struct WDiff
     Widget widget;
 
     const char *args;           /* Args passed to diff */
-    const char *file[2];        /* filenames */
+    const char *file[DIFF_COUNT];       /* filenames */
-    char *label[2];
+    char *label[DIFF_COUNT];
-    FBUF *f[2];
+    FBUF *f[DIFF_COUNT];
     const char *backup_sufix;
-    gboolean merged;
+    gboolean merged[DIFF_COUNT];
-    GArray *a[2];
+    GArray *a[DIFF_COUNT];
     GPtrArray *hdiff;
     int ndiff;                  /* number of hunks */
     DSRC dsrc;                  /* data source: memory or temporary file */
@@ -105,7 +112,7 @@ typedef struct WDiff
     int display_numbers;
     int show_cr;
     int tab_size;
-    int ord;
+    diff_place_t ord;
     int full;
     gboolean utf8;
     /* converter for translation of text */

src/keybind-defaults.c

@@ -525,6 +525,7 @@ static const global_keymap_ini_t default_diff_keymap[] = {
     {"Edit", "f4"},
     {"EditOther", "f14"},
     {"Merge", "f5"},
+    {"MergeOther", "f15"},
     {"Search", "f7"},
     {"SearchContinue", "f17"},
     {"Options", "f9"},