aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPhilipp Stephani2018-02-13 09:55:46 +0100
committerPhilipp Stephani2018-02-13 09:55:46 +0100
commit1d135af78c3ddd502b5feb84884ea55cbc664753 (patch)
tree3b941bb1e7a97b6cc49e0baae8f10509d2ce7e68 /src
parent4b70de228d663cdbbae9668e6e990b0064e72fda (diff)
downloademacs-1d135af78c3ddd502b5feb84884ea55cbc664753.tar.gz
emacs-1d135af78c3ddd502b5feb84884ea55cbc664753.zip
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'.
Diffstat (limited to 'src')
-rw-r--r--src/nsfns.m4
-rw-r--r--src/nsterm.m1
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)
482{ 482{
483 NSTRACE ("x_implicitly_set_name"); 483 NSTRACE ("x_implicitly_set_name");
484 484
485 if (! NILP (ns_use_proxy_icon)) 485 if (ns_use_proxy_icon)
486 ns_set_represented_filename (f); 486 ns_set_represented_filename (f);
487 487
488 ns_set_name (f, arg, 0); 488 ns_set_name (f, arg, 0);
@@ -3234,7 +3234,7 @@ be used as the image of the icon representing the frame. */);
3234 DEFVAR_BOOL ("ns-use-proxy-icon", ns_use_proxy_icon, 3234 DEFVAR_BOOL ("ns-use-proxy-icon", ns_use_proxy_icon,
3235 doc: /* When non-nil display a proxy icon in the titlebar. 3235 doc: /* When non-nil display a proxy icon in the titlebar.
3236Default is t. */); 3236Default is t. */);
3237 ns_use_proxy_icon = Qt; 3237 ns_use_proxy_icon = true;
3238 3238
3239 defsubr (&Sns_read_file_name); 3239 defsubr (&Sns_read_file_name);
3240 defsubr (&Sns_get_resource); 3240 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);
471void 471void
472ns_set_represented_filename (struct frame *f) 472ns_set_represented_filename (struct frame *f)
473{ 473{
474 NSView *view;
475 Lisp_Object filename, encoded_filename; 474 Lisp_Object filename, encoded_filename;
476 Lisp_Object buf = XWINDOW (f->selected_window)->contents; 475 Lisp_Object buf = XWINDOW (f->selected_window)->contents;
477 NSAutoreleasePool *pool; 476 NSAutoreleasePool *pool;