Merge branch 'master' into master

diff --cc autorandr.1
Simple merge

diff --cc autorandr.py
index 6ebd55261bf83d503acf5f1257ff05426b892411,7ad9736b136f516a7f0309a3b80b17f907b53809..24d8b3a9df0674291c91ac88756975fc08223315
--- 1/autorandr.py
--- 2/autorandr.py
+++ b/autorandr.py
@@@ -80,8 -85,8 +85,9 @@@ Usage: autorandr [options
  --detected              only list detected (available) configuration(s)
  --dry-run               don't change anything, only print the xrandr commands
  --fingerprint           fingerprint your current hardware setup
 +--match-edid            match diplays based on edid instead of name
  --force                 force (re)loading of a profile / overwrite exiting files
+ --list                  list configurations
  --skip-options <option> comma separated list of xrandr arguments (e.g. "gamma")
                          to skip both in detecting changes and applying a profile
  --version               show version information and exit
@@@ -1240,9 -1215,9 +1246,9 @@@ def read_config(options, directory)
  def main(argv):
      try:
          opts, args = getopt.getopt(argv[1:], "s:r:l:d:cfh",
-                                    ["batch", "dry-run", "change", "default=", "save=", "remove=", "load=",
+                                    ["batch", "dry-run", "change", "cycle", "default=", "save=", "remove=", "load=",
                                      "force", "fingerprint", "config", "debug", "skip-options=", "help",
-                                     "current", "detected", "version", "match-edid"])
 -                                    "list", "current", "detected", "version"])
++                                    "list", "current", "detected", "version", "match-edid"])
      except getopt.GetoptError as e:
          print("Failed to parse options: {0}.\n"
                "Use --help to get usage information.".format(str(e)),
@@@ -1301,13 -1282,8 +1307,17 @@@
      exec_scripts(None, "predetect")
      config, modes = parse_xrandr_output()
  
-     # Sort by descending mtime
-     profiles = OrderedDict(sorted(profiles.items(), key=lambda x: -x[1]["config-mtime"]))
 +    if "--match-edid" in options:
 +        update_profiles_edid(profiles, config)
 +
++    # Sort by mtime
++    sort_direction = -1
++    if "--cycle" in options:
++        # When cycling through profiles, put the profile least recently used to the top of the list
++        sort_direction = 1
++    profiles = OrderedDict(sorted(profiles.items(), key=lambda x: sort_direction * x[1]["config-mtime"]))
 +    profile_symlinks = {k: v for k, v in profile_symlinks.items() if v in (x[0] for x in virtual_profiles) or v in profiles}
 +
      if "--fingerprint" in options:
          output_setup(config, sys.stdout)
          sys.exit(0)

diff --cc contrib/bash_completion/autorandr
index f7bef4f2bdb479469939b3fa0d6d78d3eee608d4,904ef8035e557e34a20b381d6a3ccbe9872b1418..0af11ec70834a7b2e0bdeb3a95f1f0a75d6c8ce2
--- 1/contrib/bash_completion/autorandr
--- 2/contrib/bash_completion/autorandr
+++ b/contrib/bash_completion/autorandr
@@@ -10,7 -10,7 +10,7 @@@ _autorandr (
        prev="${COMP_WORDS[COMP_CWORD-1]}"
  
        opts="-h -c -s -r -l -d"
-       lopts="--help --change --save --remove --load --default --force --fingerprint --match-edid --config --dry-run"
 -      lopts="--help --change --cycle --save --remove --load --list --default --force --fingerprint --config --dry-run"
++      lopts="--help --change --cycle --save --remove --load --list --default --force --fingerprint  --match-edid --config --dry-run"
  
        # find system-level autorandr dirs
        OIFS="$IFS"

diff --cc contrib/zsh_completion/_autorandr
index e17fc00e275b9b51672d52cb640fc589b7975282,848f614aaaf646e594faac0ad7b9e31ee0a8d4a3..1667f0c560a75a030c9613e89a9b387468ed4991
--- 1/contrib/zsh_completion/_autorandr
--- 2/contrib/zsh_completion/_autorandr
+++ b/contrib/zsh_completion/_autorandr
@@@ -32,8 -33,8 +33,9 @@@ _autorandr () 
         --debug"[enable verbose output]" \
         --dry-run"[don't change anything]" \
         --fingerprint"[fingerprint current hardware]" \
 +       --match-edid"[match displays using edid]" \
         --force"[force loading of a profile]" \
+        --list"[list all profiles]" \
         --skip-options"[skip xrandr options]:xrandr options:_values -s , options gamma brightness panning transform primary mode pos rate" \
         --version"[show version]"
  }