Document the new "XRandR 1.5" value

* src/xfns.c (Fx_display_monitor_attributes_list):
* lisp/frame.el (display-monitor-attributes-list):
* doc/lispref/frames.texi (Multiple Terminals): Document the new
"XRandR 1.5" value.

diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index e38a81d3e7eaff178657206ada53de188209e788..8db6ad0fd3224644440268d78967d146b4117335 100644 (file)
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -407,7 +407,7 @@ Name of the physical monitor as @var{string}.
 
 @item source
 Source of the multi-monitor information as @var{string};
-e.g., @samp{XRandr} or @samp{Xinerama}.
+e.g., @samp{XRandR 1.5}, @samp{XRandr} or @samp{Xinerama}.
 @end table
 
 @var{x}, @var{y}, @var{width}, and @var{height} are integers.

diff --git a/lisp/frame.el b/lisp/frame.el
index 1d7784dc7697932a5c3f6c0660063fe387b9ae3b..400f8a44eea7229dedf989dfae71b08ae671d006 100644 (file)
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -2425,9 +2425,9 @@ It may be less than the total screen size, owing to space taken up
 by window manager features (docks, taskbars, etc.).  The precise
 details depend on the platform and environment.
 
-The `source' attribute describes the source from which the information
-was obtained.  On X, this may be one of: \"Gdk\", \"XRandr\", \"Xinerama\",
-or \"fallback\".
+The `source' attribute describes the source from which the
+information was obtained.  On X, this may be one of: \"Gdk\",
+\"XRandR 1.5\", \"XRandr\", \"Xinerama\", or \"fallback\".
 
 A frame is dominated by a physical monitor when either the
 largest area of the frame resides in the monitor, or the monitor

diff --git a/src/xfns.c b/src/xfns.c
index 1d0210cb9e6c86dfe79dd79ce58a7c3426b39b57..bb75ca5ad1cd12767b0ef1d97079a0ee7d873d5d 100644 (file)
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -6244,8 +6244,8 @@ In addition to the standard attribute keys listed in
 the attributes:
 
  source -- String describing the source from which multi-monitor
-          information is obtained, one of \"Gdk\", \"XRandr\",
-          \"Xinerama\", or \"fallback\"
+          information is obtained, one of \"Gdk\", \"XRandR 1.5\",
+          \"XRandr\", \"Xinerama\", or \"fallback\"
 
 Internal use only, use `display-monitor-attributes-list' instead.  */)
   (Lisp_Object terminal)