summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChrisK2 <spam@kalania.de>2014-11-15 23:10:28 +0100
committerChrisK2 <spam@kalania.de>2014-11-15 23:10:28 +0100
commitc372856c115fc46f3d9772283beaea316cb66f8e (patch)
tree75be40a8b7d1e1d9dc72cf29210ee5f856a08c9f
parentb4a147bbe2c00cef522b1311c96974ebbfc3f912 (diff)
downloadmpv-c372856c115fc46f3d9772283beaea316cb66f8e.tar.bz2
mpv-c372856c115fc46f3d9772283beaea316cb66f8e.tar.xz
input.conf: Don't make ENTER exit the player
Apparently this is confusing.
-rw-r--r--DOCS/man/mpv.rst2
-rw-r--r--etc/input.conf2
2 files changed, 2 insertions, 2 deletions
diff --git a/DOCS/man/mpv.rst b/DOCS/man/mpv.rst
index e6aefb2859..f0a8d655b3 100644
--- a/DOCS/man/mpv.rst
+++ b/DOCS/man/mpv.rst
@@ -59,7 +59,7 @@ BACKSPACE
Go backward/forward in the playlist.
ENTER
- Go forward in the playlist, even over the end.
+ Go forward in the playlist.
p / SPACE
Pause (pressing again unpauses).
diff --git a/etc/input.conf b/etc/input.conf
index bdedcaeb3f..d2b796d58e 100644
--- a/etc/input.conf
+++ b/etc/input.conf
@@ -74,7 +74,7 @@
#, frame_back_step # go back by one frame and pause
#SPACE cycle pause
#> playlist_next # skip to next file
-#ENTER playlist_next force # skip to next file or quit
+#ENTER playlist_next # skip to next file
#< playlist_prev # skip to previous file
#O osd # cycle through OSD mode
#o show_progress