import -ko -b 1.1.3 XEmacs XEmacs-21_2 r21-2-35

[chise/xemacs-chise.git.1] / src / eval.c

diff --git a/src/eval.c b/src/eval.c
index da95e4e..ec6a270 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -1057,7 +1057,7 @@ If SYMBOL is buffer-local, its default value is what is set;
  buffer-local values are not affected.
 INITVALUE and DOCSTRING are optional.
 If DOCSTRING starts with *, this variable is identified as a user option.
  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.
 If INITVALUE is missing, SYMBOL's value is not set.
 
 In lisp-interaction-mode defvar is treated as defconst.

@@ -1107,7 +1107,7 @@ If SYMBOL is buffer-local, its default value is what is set;
  buffer-local values are not affected.
 DOCSTRING is optional.
 If DOCSTRING starts with *, this variable is identified as a user option.
  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
 
 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 @@ function_argcount (Lisp_Object function, int function_min_args_p)
 
   if (SUBRP (function))
     {
 
   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))
     {
    }
   else if (COMPILED_FUNCTIONP (function))
     {