Mercurial > hg > xemacs-beta

diff src/specifier.c @ 2:ac2d302a0011 r19-15b2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r19-15b2
author cvs
date Mon, 13 Aug 2007 08:46:35 +0200
parents 376386a54a3c
children 0293115a14e9
line wrap: on
line diff
--- a/src/specifier.c	Mon Aug 13 08:45:53 2007 +0200
+++ b/src/specifier.c	Mon Aug 13 08:46:35 2007 +0200
@@ -504,7 +504,7 @@
 {
   /* This cannot GC. */
   if ((DEVICEP (locale) && DEVICE_LIVE_P (XDEVICE (locale))) ||
-      (FRAMEP (locale) && FRAME_LIVE_P (XFRAME (locale))) ||
+      (FRAMEP  (locale) && FRAME_LIVE_P  (XFRAME  (locale))) ||
       (BUFFERP (locale) && BUFFER_LIVE_P (XBUFFER (locale))) ||
       /* dead windows are allowed because they may become live
 	 windows again when a window configuration is restored */
@@ -528,7 +528,7 @@
 {
   /* This cannot GC. */
   if ((DEVICEP (domain) && DEVICE_LIVE_P (XDEVICE (domain))) ||
-      (FRAMEP (domain) && FRAME_LIVE_P (XFRAME (domain))) ||
+      (FRAMEP  (domain) && FRAME_LIVE_P  (XFRAME  (domain))) ||
       (WINDOWP (domain) && WINDOW_LIVE_P (XWINDOW (domain))))
     return Qt;
   else
@@ -549,7 +549,7 @@
   /* This cannot GC. */
   if (EQ (locale_type, Qglobal) ||
       EQ (locale_type, Qdevice) ||
-      EQ (locale_type, Qframe) ||
+      EQ (locale_type, Qframe)  ||
       EQ (locale_type, Qwindow) ||
       EQ (locale_type, Qbuffer))
     return Qt;
@@ -609,18 +609,14 @@
 decode_locale_type (Lisp_Object locale_type)
 {
   /* This cannot GC. */
-  if (EQ (locale_type, Qglobal))
-    return LOCALE_GLOBAL;
-  if (EQ (locale_type, Qdevice))
-    return LOCALE_DEVICE;
-  if (EQ (locale_type, Qframe))
-    return LOCALE_FRAME;
-  if (EQ (locale_type, Qwindow))
-    return LOCALE_WINDOW;
-  if (EQ (locale_type, Qbuffer))
-    return LOCALE_BUFFER;
+  if (EQ (locale_type, Qglobal)) return LOCALE_GLOBAL;
+  if (EQ (locale_type, Qdevice)) return LOCALE_DEVICE;
+  if (EQ (locale_type, Qframe))  return LOCALE_FRAME;
+  if (EQ (locale_type, Qwindow)) return LOCALE_WINDOW;
+  if (EQ (locale_type, Qbuffer)) return LOCALE_BUFFER;
+  
   signal_simple_error ("Invalid specifier locale type", locale_type);
-  return 0;
+  return LOCALE_GLOBAL; /* not reached */
 }
 
 Lisp_Object