summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2020-02-07 12:10:43 +0200
committerEli Zaretskii <eliz@gnu.org>2020-02-07 12:10:43 +0200
commitac6ba689d1cdb2611a779f9eb032d5ce97c77742 (patch)
tree1e9f646f37a1a35263c965f53cbad73b61eadf1d /src
parent63fd6c9ef050f8077823b3a45c841dc255257f3b (diff)
downloademacs-ac6ba689d1cdb2611a779f9eb032d5ce97c77742.tar.gz
Minor fixes of the last commit
* src/xdisp.c (get_window_cursor_type): Fix indentation and line-filling. * doc/lispref/frames.texi (Cursor Parameters): * doc/emacs/display.texi (Cursor Display): * etc/NEWS: Fix wording and capitalization of the last change.
Diffstat (limited to 'src')
-rw-r--r--src/xdisp.c26
1 files changed, 14 insertions, 12 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index 038b8e53669..e41ceaf0bb7 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -30884,26 +30884,28 @@ get_window_cursor_type (struct window *w, struct glyph *glyph, int *width,
if (!w->cursor_off_p)
{
if (glyph != NULL && glyph->type == XWIDGET_GLYPH)
- return NO_CURSOR;
+ return NO_CURSOR;
if (glyph != NULL && glyph->type == IMAGE_GLYPH)
{
if (cursor_type == FILLED_BOX_CURSOR)
{
- /* Using a block cursor on large images can be very annoying.
- So use a hollow cursor for "large" images.
- If image is not transparent (no mask), also use hollow cursor. */
+ /* Using a block cursor on large images can be very
+ annoying. So use a hollow cursor for "large" images.
+ If image is not transparent (no mask), also use
+ hollow cursor. */
struct image *img = IMAGE_OPT_FROM_ID (f, glyph->u.img_id);
if (img != NULL && IMAGEP (img->spec))
{
- /* Interpret "large" as >SIZExSIZE and >NxN
- where SIZE is the value from cursor-type in form (box . SIZE),
- where N = size of default frame font size.
- So, setting cursor-type to (box . 32) should cover most of
- the "tiny" icons people may use. */
+ /* Interpret "large" as >SIZExSIZE and >NxN where
+ SIZE is the value from cursor-type of the form
+ (box . SIZE), where N = size of default frame
+ font size. So, setting cursor-type to (box . 32)
+ should cover most of the "tiny" icons people may
+ use. */
if (!img->mask
- || (CONSP (BVAR (b, cursor_type))
- && img->width > max (*width, WINDOW_FRAME_COLUMN_WIDTH (w))
- && img->height > max (*width, WINDOW_FRAME_LINE_HEIGHT (w))))
+ || (CONSP (BVAR (b, cursor_type))
+ && img->width > max (*width, WINDOW_FRAME_COLUMN_WIDTH (w))
+ && img->height > max (*width, WINDOW_FRAME_LINE_HEIGHT (w))))
cursor_type = HOLLOW_BOX_CURSOR;
}
}