--- a/src/eval.c	Mon Aug 13 11:18:12 2007 +0200
+++ b/src/eval.c	Mon Aug 13 11:19:21 2007 +0200
@@ -1057,7 +1057,7 @@
  buffer-local values are not affected.
 INITVALUE and DOCSTRING are optional.
 If DOCSTRING starts with *, this variable is identified as a user option.
- This means that M-x set-variable and M-x edit-options recognize it.
+ This means that M-x set-variable recognizes it.
 If INITVALUE is missing, SYMBOL's value is not set.
 
 In lisp-interaction-mode defvar is treated as defconst.
@@ -1107,7 +1107,7 @@
  buffer-local values are not affected.
 DOCSTRING is optional.
 If DOCSTRING starts with *, this variable is identified as a user option.
- This means that M-x set-variable and M-x edit-options recognize it.
+ This means that M-x set-variable recognizes it.
 
 Note: do not use `defconst' for user options in libraries that are not
  normally loaded, since it is useful for users to be able to specify
@@ -3315,9 +3315,11 @@
 
   if (SUBRP (function))
     {
-      return function_min_args_p ?
-	Fsubr_min_args (function):
-	Fsubr_max_args (function);
+      /* Using return with the ?: operator tickles a DEC CC compiler bug. */
+      if (function_min_args_p)
+	return Fsubr_min_args (function);
+      else
+	return Fsubr_max_args (function);
    }
   else if (COMPILED_FUNCTIONP (function))
     {