[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] scratch/ns/next 1fcde76 6/8: Fix compiler warnings
From: |
Alan Third |
Subject: |
[Emacs-diffs] scratch/ns/next 1fcde76 6/8: Fix compiler warnings |
Date: |
Tue, 15 Jan 2019 12:12:29 -0500 (EST) |
branch: scratch/ns/next
commit 1fcde76fc4b41e6221d66e4d2ddb93660e250b1e
Author: Alan Third <address@hidden>
Commit: Alan Third <address@hidden>
Fix compiler warnings
* src/nsterm.m (ns_row_rect):
([EmacsView updateFrameSize:]):
([EmacsScroller calcRectWithWindow:horizontal:]): Remove unused variables.
(ns_term_init): Fix GNUstep warning.
---
src/nsterm.m | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/src/nsterm.m b/src/nsterm.m
index 4405225..67c1970 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -821,7 +821,6 @@ ns_row_rect (struct window *w, struct glyph_row *row,
enum glyph_row_area area)
/* Get the row as an NSRect. */
{
- struct frame *f = XFRAME (WINDOW_FRAME (w));
NSRect rect;
int window_x, window_y, window_width;
@@ -5194,7 +5193,7 @@ ns_term_init (Lisp_Object display_name)
}
/* FIXME: Report any errors writing the color file below. */
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101100
+#if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MAX_ALLOWED >= 101100
#if MAC_OS_X_VERSION_MIN_REQUIRED < 101100
if ([cl respondsToSelector:@selector(writeToURL:error:)])
#endif
@@ -6829,8 +6828,6 @@ not_in_argv (NSString *arg)
if (neww != oldw || newh != oldh)
{
- NSView *view = FRAME_NS_VIEW (emacsframe);
-
change_frame_size (emacsframe,
FRAME_PIXEL_TO_TEXT_WIDTH (emacsframe, neww),
FRAME_PIXEL_TO_TEXT_HEIGHT (emacsframe, newh),
@@ -8641,7 +8638,6 @@ not_in_argv (NSString *arg)
+ (NSRect)calcRectWithWindow: (struct window *)window horizontal:
(BOOL)horizontal
{
struct frame *f = XFRAME (window->frame);
- EmacsView *view = FRAME_NS_VIEW (f);
int wx, wy, wwidth, wheight;
NSRect r;
- [Emacs-diffs] branch scratch/ns/next created (now 91f1182), Alan Third, 2019/01/15
- [Emacs-diffs] scratch/ns/next 91f1182 8/8: Remove NS non-native fullscreen delay, Alan Third, 2019/01/15
- [Emacs-diffs] scratch/ns/next 7dcce0a 1/8: Prevent redrawing if frame is garbaged, Alan Third, 2019/01/15
- [Emacs-diffs] scratch/ns/next 6fd71f3 4/8: Prevent frame resizes moving the top left, Alan Third, 2019/01/15
- [Emacs-diffs] scratch/ns/next 1fcde76 6/8: Fix compiler warnings,
Alan Third <=
- [Emacs-diffs] scratch/ns/next 0a26d3e 2/8: Defer frame resizing, Alan Third, 2019/01/15
- [Emacs-diffs] scratch/ns/next e9f1394 5/8: Fix scrollbars after leaving non-native fullscreen, Alan Third, 2019/01/15
- [Emacs-diffs] scratch/ns/next a2e345f 3/8: Defer setting scrollbar size and position, Alan Third, 2019/01/15
- [Emacs-diffs] scratch/ns/next fe937bb 7/8: Merge branch 'master' into scratch/ns/next, Alan Third, 2019/01/15