[Emacs-diffs] scratch/gnus-cloud 378a387 48/61: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

[Teodor Zlatanov]

branch: scratch/gnus-cloud
commit 378a387c7429ba36a0c7f75e0b69c2eb9f320ebc
Merge: 5945c52 cfb3c61
Author: Ted Zlatanov <address@hidden>
Commit: Ted Zlatanov <address@hidden>

    Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
---
 src/nsfns.m  |    4 ++--
 src/nsterm.m |   10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/nsfns.m b/src/nsfns.m
index 820254f..051e509 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -983,8 +983,8 @@ frame_parm_handler ns_frame_parm_handlers[] =
   x_set_icon_name,
   x_set_icon_type,
   x_set_internal_border_width, /* generic OK */
-  0, /* x_set_right_divider_width */
-  0, /* x_set_bottom_divider_width */
+  x_set_right_divider_width,
+  x_set_bottom_divider_width,
   x_set_menu_bar_lines,
   x_set_mouse_color,
   x_explicitly_set_name,
diff --git a/src/nsterm.m b/src/nsterm.m
index eba75f1..4b887ec 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -2955,10 +2955,11 @@ ns_draw_vertical_window_border (struct window *w, int 
x, int y0, int y1)
   NSTRACE ("ns_draw_vertical_window_border");
 
   face = FACE_OPT_FROM_ID (f, VERTICAL_BORDER_FACE_ID);
-  if (face)
-      [ns_lookup_indexed_color(face->foreground, f) set];
 
   ns_focus (f, &r, 1);
+  if (face)
+    [ns_lookup_indexed_color(face->foreground, f) set];
+
   NSRectFill(r);
   ns_unfocus (f);
 }
@@ -2977,10 +2978,11 @@ ns_draw_window_divider (struct window *w, int x0, int 
x1, int y0, int y1)
   NSTRACE ("ns_draw_window_divider");
 
   face = FACE_OPT_FROM_ID (f, WINDOW_DIVIDER_FACE_ID);
-  if (face)
-      [ns_lookup_indexed_color(face->foreground, f) set];
 
   ns_focus (f, &r, 1);
+  if (face)
+    [ns_lookup_indexed_color(face->foreground, f) set];
+
   NSRectFill(r);
   ns_unfocus (f);
 }