Merge from origin/emacs-25

e80f6a210b0 Describe problems with Microsoft Intellipoint
a73ec1edb07 More accurate documentation of the ':box' face attribute

2 files changed, 6 insertions, 2 deletions

diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 4a895f74a5d..4de55fd3fb2 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -2282,8 +2282,8 @@ Draw a box with lines of width 1, in color @var{color}.
 This way you can explicitly specify all aspects of the box.  The value
 @var{width} specifies the width of the lines to draw; it defaults to
 1.  A negative width @var{-n} means to draw a line of width @var{n}
-that occupies the space of the underlying text, thus avoiding any
-increase in the character height or width.
+whose top and bottom parts occupy the space of the underlying text,
+thus avoiding any increase in the character height.
 
 The value @var{color} specifies the color to draw with.  The default is
 the foreground color of the face for simple boxes, and the background
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index c650f1a7f9c..713e44fcef9 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -2467,6 +2467,10 @@ middle button press.  In such cases, setting the wheel press to
 "scroll" sometimes works if you press the button twice.  Trying a
 generic mouse driver might help.
 
+One particular situation where this happens is when you have
+"Microsoft Intellipoint" installed, which runs the program
+ipoint.exe.  The fix is reportedly to uninstall this software.
+
 ** Scrolling the mouse wheel on MS-Windows always scrolls the top window.
 
 This is another common problem with mouse drivers.  Instead of