From 069f9784841c7aa11d86dbaecf0f5cde64aa4663 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 19 Nov 2017 17:51:08 +0200 Subject: [PATCH 1/3] ; * lisp/emacs-lisp/byte-run.el: Fix a typo in a comment. --- lisp/emacs-lisp/byte-run.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el index c6ad209cd8e..abfcdb347a3 100644 --- a/lisp/emacs-lisp/byte-run.el +++ b/lisp/emacs-lisp/byte-run.el @@ -285,7 +285,7 @@ The return value is undefined. def)))) -;; Redefined in byte-optimize.el. +;; Redefined in byte-opt.el. ;; This is not documented--it's not clear that we should promote it. (fset 'inline 'progn) From 1b082c886c9e2213a85b820c7f07cd5a30b8b99b Mon Sep 17 00:00:00 2001 From: Mike Kupfer Date: Sat, 18 Nov 2017 16:49:10 -0800 Subject: [PATCH 2/3] MH-E: don't automatically download external-body parts * lisp/mh-e/mh-mime.el (mh-mime-display-single): Use mm-automatic-display-p to verify that a part should be displayed before doing the inline checks (SF#475). --- lisp/mh-e/mh-mime.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el index 9d1edf0fc47..69c57e0afdc 100644 --- a/lisp/mh-e/mh-mime.el +++ b/lisp/mh-e/mh-mime.el @@ -659,6 +659,7 @@ buttons for alternative parts that are usually suppressed." (attachmentp (equal (car (mm-handle-disposition handle)) "attachment")) (inlinep (and (equal (car (mm-handle-disposition handle)) "inline") + (mm-automatic-display-p handle) (mm-inlinable-p handle) (mm-inlined-p handle))) (displayp (or inlinep ; show if inline OR @@ -669,6 +670,7 @@ buttons for alternative parts that are usually suppressed." (and (not (equal (mm-handle-media-supertype handle) "image")) + (mm-automatic-display-p handle) (mm-inlinable-p handle) (mm-inlined-p handle))))))) (save-restriction From 4da87999c234155300b30b01c5a7e221d65e4cc8 Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Mon, 20 Nov 2017 09:18:59 +0100 Subject: [PATCH 3/3] Fix misbehavior when drawing three-pixel high horizontal dividers (Bug#29353) * src/xterm.c (x_draw_window_divider): * src/w32term.c (w32_draw_window_divider): Fix misbehavior when drawing three-pixel high horizontal dividers (Bug#29353). The misbehavior was noted by Keith David Bershatsky and analyzed by Alan Third. --- src/w32term.c | 12 ++++++++---- src/xterm.c | 12 ++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/w32term.c b/src/w32term.c index e62d49dd947..7a3b2cc631f 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -660,21 +660,25 @@ w32_draw_window_divider (struct window *w, int x0, int x1, int y0, int y1) ? face_last->foreground : FRAME_FOREGROUND_PIXEL (f)); - if (y1 - y0 > x1 - x0 && x1 - x0 > 2) - /* Vertical. */ + if ((y1 - y0 > x1 - x0) && (x1 - x0 >= 3)) + /* A vertical divider, at least three pixels wide: Draw first and + last pixels differently. */ { w32_fill_area_abs (f, hdc, color_first, x0, y0, x0 + 1, y1); w32_fill_area_abs (f, hdc, color, x0 + 1, y0, x1 - 1, y1); w32_fill_area_abs (f, hdc, color_last, x1 - 1, y0, x1, y1); } - else if (x1 - x0 > y1 - y0 && y1 - y0 > 3) - /* Horizontal. */ + else if ((x1 - x0 > y1 - y0) && (y1 - y0 >= 3)) + /* A horizontal divider, at least three pixels high: Draw first and + last pixels differently. */ { w32_fill_area_abs (f, hdc, color_first, x0, y0, x1, y0 + 1); w32_fill_area_abs (f, hdc, color, x0, y0 + 1, x1, y1 - 1); w32_fill_area_abs (f, hdc, color_last, x0, y1 - 1, x1, y1); } else + /* In any other case do not draw the first and last pixels + differently. */ w32_fill_area_abs (f, hdc, color, x0, y0, x1, y1); release_frame_dc (f, hdc); diff --git a/src/xterm.c b/src/xterm.c index 28abfaecde9..1deb7b46013 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -1104,8 +1104,9 @@ x_draw_window_divider (struct window *w, int x0, int x1, int y0, int y1) : FRAME_FOREGROUND_PIXEL (f)); Display *display = FRAME_X_DISPLAY (f); - if (y1 - y0 > x1 - x0 && x1 - x0 > 2) - /* Vertical. */ + if ((y1 - y0 > x1 - x0) && (x1 - x0 >= 3)) + /* A vertical divider, at least three pixels wide: Draw first and + last pixels differently. */ { XSetForeground (display, f->output_data.x->normal_gc, color_first); x_fill_rectangle (f, f->output_data.x->normal_gc, @@ -1117,8 +1118,9 @@ x_draw_window_divider (struct window *w, int x0, int x1, int y0, int y1) x_fill_rectangle (f, f->output_data.x->normal_gc, x1 - 1, y0, 1, y1 - y0); } - else if (x1 - x0 > y1 - y0 && y1 - y0 > 3) - /* Horizontal. */ + else if ((x1 - x0 > y1 - y0) && (y1 - y0 >= 3)) + /* A horizontal divider, at least three pixels high: Draw first and + last pixels differently. */ { XSetForeground (display, f->output_data.x->normal_gc, color_first); x_fill_rectangle (f, f->output_data.x->normal_gc, @@ -1132,6 +1134,8 @@ x_draw_window_divider (struct window *w, int x0, int x1, int y0, int y1) } else { + /* In any other case do not draw the first and last pixels + differently. */ XSetForeground (display, f->output_data.x->normal_gc, color); x_fill_rectangle (f, f->output_data.x->normal_gc, x0, y0, x1 - x0, y1 - y0);