diff options
Diffstat (limited to 'internal/appconfig/config_merge.go')
| -rw-r--r-- | internal/appconfig/config_merge.go | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/internal/appconfig/config_merge.go b/internal/appconfig/config_merge.go index e31e0dc..7a99c94 100644 --- a/internal/appconfig/config_merge.go +++ b/internal/appconfig/config_merge.go @@ -11,6 +11,7 @@ func (a *App) mergeWith(other *App) { a.mergeSurfaceModels(other) a.mergePrompts(other) a.mergeTmuxEdit(other) + a.mergeTmuxAction(other) } // mergeBasics merges general (non-provider) fields. @@ -227,6 +228,13 @@ func mergeStringField(dst *string, src string) { } } +// mergeTmuxAction replaces the action menu when the incoming config defines one. +func (a *App) mergeTmuxAction(other *App) { + if len(other.TmuxActionMenu) > 0 { + a.TmuxActionMenu = append([]TmuxActionMenuEntry{}, other.TmuxActionMenu...) + } +} + // mergeTmuxEdit copies non-empty tmux edit settings from other. func (a *App) mergeTmuxEdit(other *App) { if s := strings.TrimSpace(other.TmuxEditPopupWidth); s != "" { |