aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris2014-10-08 20:47:30 -0400
committerGlenn Morris2014-10-08 20:47:30 -0400
commit01058f734a96e6da949c200fb908f06ab8a74909 (patch)
tree86754bde01390f2e4078714e23eee32be7faec64 /lisp
parent285dc437722044fe106f48d202607e4373d795ee (diff)
downloademacs-01058f734a96e6da949c200fb908f06ab8a74909.tar.gz
emacs-01058f734a96e6da949c200fb908f06ab8a74909.zip
Doc tweaks
* doc/lispref/frames.texi (Multiple Terminals): Copyedits. * lisp/frame.el (display-monitor-attributes-list): Doc tweaks. * nt/README.W32, src/ChangeLog.10, src/w32term.c: Standardize on "taskbar" rather than "task bar", since that is what most references seem to use; e.g. http://en.wikipedia.org/wiki/Taskbar http://windows.microsoft.com/en-us/windows7/products/features/windows-taskbar
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/frame.el19
2 files changed, 18 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e8fd37925fa..6831c0efb42 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12014-10-09 Glenn Morris <rgm@gnu.org>
2
3 * frame.el (display-monitor-attributes-list): Doc tweaks.
4
12014-10-08 Eli Zaretskii <eliz@gnu.org> 52014-10-08 Eli Zaretskii <eliz@gnu.org>
2 6
3 * faces.el (display-grayscale-p): Mention in the doc string that 7 * faces.el (display-grayscale-p): Mention in the doc string that
diff --git a/lisp/frame.el b/lisp/frame.el
index 55e5899ca4c..08d4a136e1c 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1587,16 +1587,25 @@ of attribute keys and values as follows:
1587 1587
1588 geometry -- Position and size in pixels in the form of (X Y WIDTH HEIGHT) 1588 geometry -- Position and size in pixels in the form of (X Y WIDTH HEIGHT)
1589 workarea -- Position and size of the work area in pixels in the 1589 workarea -- Position and size of the work area in pixels in the
1590 form of (X Y WIDTH HEIGHT); this excludes task bar etc. 1590 form of (X Y WIDTH HEIGHT)
1591 mm-size -- Width and height in millimeters in the form of 1591 mm-size -- Width and height in millimeters in the form of
1592 (WIDTH HEIGHT) 1592 (WIDTH HEIGHT)
1593 frames -- List of frames dominated by the physical monitor 1593 frames -- List of frames dominated by the physical monitor
1594 name (*) -- Name of the physical monitor as a string 1594 name (*) -- Name of the physical monitor as a string
1595 source (*) -- Source of multi-monitor information as a string
1595 1596
1596where X, Y, WIDTH, and HEIGHT are integers, which might be negative 1597where X, Y, WIDTH, and HEIGHT are integers. X and Y are coordinates
1597for monitors other than the primary one. X and Y are coordinates 1598of the top-left corner, and might be negative for monitors other than
1598of the top-left corner of the rectangle. Keys labeled with (*) are 1599the primary one. Keys labeled with (*) are optional.
1599optional. 1600
1601The \"work area\" is a measure of the \"usable\" display space.
1602It may be less than the total screen size, owing to space taken up
1603by window manager features (docks, taskbars, etc.). The precise
1604details depend on the platform and environment.
1605
1606The `source' attribute describes the source from which the information
1607was obtained. On X, this may be one of: \"Gdk\", \"XRandr\", \"Xinerama\",
1608or \"fallback\".
1600 1609
1601A frame is dominated by a physical monitor when either the 1610A frame is dominated by a physical monitor when either the
1602largest area of the frame resides in the monitor, or the monitor 1611largest area of the frame resides in the monitor, or the monitor