aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSrivathsan Murali <sri@vathsan.com>2019-09-20 21:22:09 +0200
committerDrew DeVault <sir@cmpwn.com>2019-09-20 15:23:45 -0400
commit1bedb8fe06dd71b4ee044098b7f057b3bffd0efc (patch)
tree5587d2ffe4af714533442b52f848f60284bf9d63
parent043a02d99d93441021788891d3f86c6fdeea22f0 (diff)
downloadaerc-1bedb8fe06dd71b4ee044098b7f057b3bffd0efc.tar.gz
Config for deleting message from message viewer
As suggested in #268, this adds a behaviour setting for deleting message from message viewer.
-rw-r--r--commands/msg/delete.go2
-rw-r--r--config/aerc.conf.in5
-rw-r--r--config/config.go50
-rw-r--r--doc/aerc-config.5.scd5
4 files changed, 37 insertions, 25 deletions
diff --git a/commands/msg/delete.go b/commands/msg/delete.go
index 677ea63c..8fefbd5f 100644
--- a/commands/msg/delete.go
+++ b/commands/msg/delete.go
@@ -47,7 +47,7 @@ func (Delete) Execute(aerc *widgets.Aerc, args []string) error {
store.Next()
if isMsgView {
nextMsg := store.Selected()
- if nextMsg == msg {
+ if nextMsg == msg || !aerc.Config().Ui.NextMessageOnDelete {
aerc.RemoveTab(widget)
acct.Messages().Scroll()
} else {
diff --git a/config/aerc.conf.in b/config/aerc.conf.in
index 9ad7fcdc..ec89ff7e 100644
--- a/config/aerc.conf.in
+++ b/config/aerc.conf.in
@@ -57,6 +57,11 @@ dirlist-format=%n %>r
# Default: ""
sort=
+# Moves to next message when the current message is deleted
+#
+# Default: false
+next-message-on-delete=true
+
[viewer]
#
# Specifies the pager to use when displaying emails. Note that some filters
diff --git a/config/config.go b/config/config.go
index 5a41903f..133a7f4e 100644
--- a/config/config.go
+++ b/config/config.go
@@ -23,20 +23,21 @@ type GeneralConfig struct {
}
type UIConfig struct {
- IndexFormat string `ini:"index-format"`
- TimestampFormat string `ini:"timestamp-format"`
- ShowHeaders []string `delim:","`
- RenderAccountTabs string `ini:"render-account-tabs"`
- SidebarWidth int `ini:"sidebar-width"`
- PreviewHeight int `ini:"preview-height"`
- EmptyMessage string `ini:"empty-message"`
- EmptyDirlist string `ini:"empty-dirlist"`
- MouseEnabled bool `ini:"mouse-enabled"`
- NewMessageBell bool `ini:"new-message-bell"`
- Spinner string `ini:"spinner"`
- SpinnerDelimiter string `ini:"spinner-delimiter"`
- DirListFormat string `ini:"dirlist-format"`
- Sort []string `delim:" "`
+ IndexFormat string `ini:"index-format"`
+ TimestampFormat string `ini:"timestamp-format"`
+ ShowHeaders []string `delim:","`
+ RenderAccountTabs string `ini:"render-account-tabs"`
+ SidebarWidth int `ini:"sidebar-width"`
+ PreviewHeight int `ini:"preview-height"`
+ EmptyMessage string `ini:"empty-message"`
+ EmptyDirlist string `ini:"empty-dirlist"`
+ MouseEnabled bool `ini:"mouse-enabled"`
+ NewMessageBell bool `ini:"new-message-bell"`
+ Spinner string `ini:"spinner"`
+ SpinnerDelimiter string `ini:"spinner-delimiter"`
+ DirListFormat string `ini:"dirlist-format"`
+ Sort []string `delim:" "`
+ NextMessageOnDelete bool `ini:"next-message-on-delete"`
}
const (
@@ -346,16 +347,17 @@ func LoadConfigFromFile(root *string, sharedir string) (*AercConfig, error) {
ShowHeaders: []string{
"From", "To", "Cc", "Bcc", "Subject", "Date",
},
- RenderAccountTabs: "auto",
- SidebarWidth: 20,
- PreviewHeight: 12,
- EmptyMessage: "(no messages)",
- EmptyDirlist: "(no folders)",
- MouseEnabled: false,
- NewMessageBell: true,
- Spinner: "[..] , [..] , [..] , [..] , [..], [..] , [..] , [..] ",
- SpinnerDelimiter: ",",
- DirListFormat: "%n %>r",
+ RenderAccountTabs: "auto",
+ SidebarWidth: 20,
+ PreviewHeight: 12,
+ EmptyMessage: "(no messages)",
+ EmptyDirlist: "(no folders)",
+ MouseEnabled: false,
+ NewMessageBell: true,
+ Spinner: "[..] , [..] , [..] , [..] , [..], [..] , [..] , [..] ",
+ SpinnerDelimiter: ",",
+ DirListFormat: "%n %>r",
+ NextMessageOnDelete: true,
},
Viewer: ViewerConfig{
diff --git a/doc/aerc-config.5.scd b/doc/aerc-config.5.scd
index 67ab608d..f4f02f2c 100644
--- a/doc/aerc-config.5.scd
+++ b/doc/aerc-config.5.scd
@@ -150,6 +150,11 @@ These options are configured in the *[ui]* section of aerc.conf.
| %>X
: make format specifier 'X' be right justified
+*next-message-on-delete*
+ Moves to next message when the current message is deleted
+
+ Default: true
+
## VIEWER
These options are configured in the *[viewer]* section of aerc.conf.