emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] scratch/gnus-cloud d23e30b 36/61: Merge branch 'master' of


From: Teodor Zlatanov
Subject: [Emacs-diffs] scratch/gnus-cloud d23e30b 36/61: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Date: Fri, 1 Jul 2016 17:37:54 +0000 (UTC)

branch: scratch/gnus-cloud
commit d23e30bdb8cbc665579406421e0be4e3627c0530
Merge: 3ae2fbf 9f51da5
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 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/nsfns.m b/src/nsfns.m
index 9bc6c1d..820254f 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -726,9 +726,9 @@ x_set_internal_border_width (struct frame *f, Lisp_Object 
arg, Lisp_Object oldva
   int old_width = FRAME_INTERNAL_BORDER_WIDTH (f);
 
   CHECK_TYPE_RANGED_INTEGER (int, arg);
-  FRAME_INTERNAL_BORDER_WIDTH (f) = XINT (arg);
+  f->internal_border_width = XINT (arg);
   if (FRAME_INTERNAL_BORDER_WIDTH (f) < 0)
-    FRAME_INTERNAL_BORDER_WIDTH (f) = 0;
+    f->internal_border_width = 0;
 
   if (FRAME_INTERNAL_BORDER_WIDTH (f) == old_width)
     return;



reply via email to

[Prev in Thread] Current Thread [Next in Thread]