From 1d135af78c3ddd502b5feb84884ea55cbc664753 Mon Sep 17 00:00:00 2001 From: Philipp Stephani Date: Tue, 13 Feb 2018 09:55:46 +0100 Subject: [PATCH] Fix NS-related compilation errors. * src/nsterm.m (ns_set_represented_filename): Remove unused variable 'view'. * src/nsfns.m (x_implicitly_set_name, syms_of_nsfns): The type of a variable defined with DEFVAR_BOOL is 'bool', not 'Lisp_Object'. --- src/nsfns.m | 4 ++-- src/nsterm.m | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/nsfns.m b/src/nsfns.m index bbb6644ce03..06827f6dd19 100644 --- a/src/nsfns.m +++ b/src/nsfns.m @@ -482,7 +482,7 @@ x_implicitly_set_name (struct frame *f, Lisp_Object arg, Lisp_Object oldval) { NSTRACE ("x_implicitly_set_name"); - if (! NILP (ns_use_proxy_icon)) + if (ns_use_proxy_icon) ns_set_represented_filename (f); ns_set_name (f, arg, 0); @@ -3234,7 +3234,7 @@ be used as the image of the icon representing the frame. */); DEFVAR_BOOL ("ns-use-proxy-icon", ns_use_proxy_icon, doc: /* When non-nil display a proxy icon in the titlebar. Default is t. */); - ns_use_proxy_icon = Qt; + ns_use_proxy_icon = true; defsubr (&Sns_read_file_name); defsubr (&Sns_get_resource); diff --git a/src/nsterm.m b/src/nsterm.m index 29aef0e9b6d..8a66643cfb7 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -471,7 +471,6 @@ static void ns_judge_scroll_bars (struct frame *f); void ns_set_represented_filename (struct frame *f) { - NSView *view; Lisp_Object filename, encoded_filename; Lisp_Object buf = XWINDOW (f->selected_window)->contents; NSAutoreleasePool *pool; -- 2.39.2