[Emacs-diffs] Changes to emacs/src/eval.c

[Richard M. Stallman]

Index: emacs/src/eval.c
diff -c emacs/src/eval.c:1.183 emacs/src/eval.c:1.184
*** emacs/src/eval.c:1.183      Sun Mar 24 14:52:55 2002
--- emacs/src/eval.c    Sun Apr 28 18:06:38 2002
***************
*** 1761,1767 ****
    abort ();
  }
  
! DEFUN ("commandp", Fcommandp, Scommandp, 1, 1, 0,
         doc: /* Non-nil if FUNCTION makes provisions for interactive calling.
  This means it contains a description for how to read arguments to give it.
  The value is nil for an invalid function or a symbol with no function
--- 1761,1767 ----
    abort ();
  }
  
! DEFUN ("commandp", Fcommandp, Scommandp, 1, 2, 0,
         doc: /* Non-nil if FUNCTION makes provisions for interactive calling.
  This means it contains a description for how to read arguments to give it.
  The value is nil for an invalid function or a symbol with no function
***************
*** 1772,1780 ****
  to `interactive', autoload definitions made by `autoload' with non-nil
  fourth argument, and some of the built-in functions of Lisp.
  
! Also, a symbol satisfies `commandp' if its function definition does so.  */)
!      (function)
!      Lisp_Object function;
  {
    register Lisp_Object fun;
    register Lisp_Object funcar;
--- 1772,1783 ----
  to `interactive', autoload definitions made by `autoload' with non-nil
  fourth argument, and some of the built-in functions of Lisp.
  
! Also, a symbol satisfies `commandp' if its function definition does so.
! 
! If the optional argument FOR-CALL-INTERACTIVELY is non-nil,
! then strins and vectors are not accepted.  */)
!      (function, for_call_interactively)
!      Lisp_Object function, for_call_interactively;
  {
    register Lisp_Object fun;
    register Lisp_Object funcar;
***************
*** 1803,1809 ****
            ? Qt : Qnil);
  
    /* Strings and vectors are keyboard macros.  */
!   if (STRINGP (fun) || VECTORP (fun))
      return Qt;
  
    /* Lists may represent commands.  */
--- 1806,1812 ----
            ? Qt : Qnil);
  
    /* Strings and vectors are keyboard macros.  */
!   if (NILP (for_call_interactively) && (STRINGP (fun) || VECTORP (fun)))
      return Qt;
  
    /* Lists may represent commands.  */