Merge from origin/emacs-27

186152ba40 Pacify gcc -Wunused-function on Ubuntu 18.04.3
4cd143aded Fix copyright years by hand
365e01cc9f Update copyright year to 2020
cd2c156163 ; * etc/NEWS: Make the description of XDG fallback more ac...

# Conflicts:
#	etc/NEWS
#	etc/refcards/ru-refcard.tex

1 files changed, 3 insertions, 3 deletions

diff --git a/src/xfns.c b/src/xfns.c
index 0ce1e73397f..b94666d5548 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1,6 +1,6 @@
 /* Functions for the X Window System.
 
-Copyright (C) 1989, 1992-2019 Free Software Foundation, Inc.
+Copyright (C) 1989, 1992-2020 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -4572,6 +4572,8 @@ On MS Windows, this just returns nil.  */)
     return Qnil;
 }
 
+#ifndef USE_GTK
+
 /* Store the geometry of the workarea on display DPYINFO into *RECT.
    Return false if and only if the workarea information cannot be
    obtained via the _NET_WORKAREA root window property.  */
@@ -4634,8 +4636,6 @@ x_get_net_workarea (struct x_display_info *dpyinfo, XRectangle *rect)
   return result;
 }
 
-#ifndef USE_GTK
-
 /* Return monitor number where F is "most" or closest to.  */
 static int
 x_get_monitor_for_frame (struct frame *f,