X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/c8d3a25c0981020e1b8aa3bf96a4a0059be82431..c7510f6e94a232aae19e07b7203ac068ef00773c:/lwlib/xlwmenu.c diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c index e8831c37f8..a4a18f0ba4 100644 --- a/lwlib/xlwmenu.c +++ b/lwlib/xlwmenu.c @@ -1,7 +1,7 @@ /* Implements a lightweight menubar widget. Copyright (C) 1992 Lucid, Inc. -Copyright (C) 1994-1995, 1997, 1999-2012 Free Software Foundation, Inc. +Copyright (C) 1994-1995, 1997, 1999-2014 Free Software Foundation, Inc. This file is part of the Lucid Widget Library. @@ -16,9 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with GNU Emacs; see the file COPYING. If not, write to the -Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -Boston, MA 02110-1301, USA. */ +along with GNU Emacs. If not, see . */ /* Created by devin@lucid.com */ @@ -28,7 +26,6 @@ Boston, MA 02110-1301, USA. */ #include #include -#include #include #if (defined __sun) && !(defined SUNOS41) @@ -1858,7 +1855,7 @@ openXftFont (XlwMenuWidget mw) int screen = XScreenNumberOfScreen (mw->core.screen); int len = strlen (fname), i = len-1; /* Try to convert Gtk-syntax (Sans 9) to Xft syntax Sans-9. */ - while (i > 0 && isdigit (fname[i])) + while (i > 0 && '0' <= fname[i] && fname[i] <= '9') --i; if (fname[i] == ' ') {