masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-11 22:50:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'emacs-26' of git.sv.gnu.org:/srv/git/emacs into emacs-26

Browse source
This commit is contained in:
Michael Albinus 2017-11-20 14:16:28 +01:00
commit 5622b2e263
4 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lisp/emacs-lisp/byte-run.el
View file

@ -285,7 +285,7 @@ The return value is undefined.
def)))) def))))
;; Redefined in byte-optimize.el. ;; Redefined in byte-opt.el.
;; This is not documented--it's not clear that we should promote it. ;; This is not documented--it's not clear that we should promote it.
(fset 'inline 'progn) (fset 'inline 'progn)

2
lisp/mh-e/mh-mime.el
View file

@ -659,6 +659,7 @@ buttons for alternative parts that are usually suppressed."
(attachmentp (equal (car (mm-handle-disposition handle)) (attachmentp (equal (car (mm-handle-disposition handle))
"attachment")) "attachment"))
(inlinep (and (equal (car (mm-handle-disposition handle)) "inline") (inlinep (and (equal (car (mm-handle-disposition handle)) "inline")
(mm-automatic-display-p handle)
(mm-inlinable-p handle) (mm-inlinable-p handle)
(mm-inlined-p handle))) (mm-inlined-p handle)))
(displayp (or inlinep ; show if inline OR (displayp (or inlinep ; show if inline OR
@ -669,6 +670,7 @@ buttons for alternative parts that are usually suppressed."
(and (not (equal (and (not (equal
(mm-handle-media-supertype handle) (mm-handle-media-supertype handle)
"image")) "image"))
(mm-automatic-display-p handle)
(mm-inlinable-p handle) (mm-inlinable-p handle)
(mm-inlined-p handle))))))) (mm-inlined-p handle)))))))
(save-restriction (save-restriction

12
src/w32term.c
View file

@ -660,21 +660,25 @@ w32_draw_window_divider (struct window *w, int x0, int x1, int y0, int y1)
? face_last->foreground ? face_last->foreground
: FRAME_FOREGROUND_PIXEL (f)); : FRAME_FOREGROUND_PIXEL (f));
if (y1 - y0 > x1 - x0 && x1 - x0 > 2) if ((y1 - y0 > x1 - x0) && (x1 - x0 >= 3))
/* Vertical. */ /* 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_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, x0 + 1, y0, x1 - 1, y1);
w32_fill_area_abs (f, hdc, color_last, x1 - 1, y0, x1, y1); w32_fill_area_abs (f, hdc, color_last, x1 - 1, y0, x1, y1);
} }
else if (x1 - x0 > y1 - y0 && y1 - y0 > 3) else if ((x1 - x0 > y1 - y0) && (y1 - y0 >= 3))
/* Horizontal. */ /* 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_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, x0, y0 + 1, x1, y1 - 1);
w32_fill_area_abs (f, hdc, color_last, x0, y1 - 1, x1, y1); w32_fill_area_abs (f, hdc, color_last, x0, y1 - 1, x1, y1);
} }
else 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); w32_fill_area_abs (f, hdc, color, x0, y0, x1, y1);
release_frame_dc (f, hdc); release_frame_dc (f, hdc);

12
src/xterm.c
View file

@ -1104,8 +1104,9 @@ x_draw_window_divider (struct window *w, int x0, int x1, int y0, int y1)
: FRAME_FOREGROUND_PIXEL (f)); : FRAME_FOREGROUND_PIXEL (f));
Display *display = FRAME_X_DISPLAY (f); Display *display = FRAME_X_DISPLAY (f);
if (y1 - y0 > x1 - x0 && x1 - x0 > 2) if ((y1 - y0 > x1 - x0) && (x1 - x0 >= 3))
/* Vertical. */ /* A vertical divider, at least three pixels wide: Draw first and
last pixels differently. */
{ {
XSetForeground (display, f->output_data.x->normal_gc, color_first); XSetForeground (display, f->output_data.x->normal_gc, color_first);
x_fill_rectangle (f, f->output_data.x->normal_gc, 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, x_fill_rectangle (f, f->output_data.x->normal_gc,
x1 - 1, y0, 1, y1 - y0); x1 - 1, y0, 1, y1 - y0);
} }
else if (x1 - x0 > y1 - y0 && y1 - y0 > 3) else if ((x1 - x0 > y1 - y0) && (y1 - y0 >= 3))
/* Horizontal. */ /* A horizontal divider, at least three pixels high: Draw first and
last pixels differently. */
{ {
XSetForeground (display, f->output_data.x->normal_gc, color_first); XSetForeground (display, f->output_data.x->normal_gc, color_first);
x_fill_rectangle (f, f->output_data.x->normal_gc, 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 else
{ {
/* In any other case do not draw the first and last pixels
differently. */
XSetForeground (display, f->output_data.x->normal_gc, color); XSetForeground (display, f->output_data.x->normal_gc, color);
x_fill_rectangle (f, f->output_data.x->normal_gc, x_fill_rectangle (f, f->output_data.x->normal_gc,
x0, y0, x1 - x0, y1 - y0); x0, y0, x1 - x0, y1 - y0);