[Emacs-diffs] Changes to emacs/lispref/commands.texi [lexbind]

[Miles Bader]

Index: emacs/lispref/commands.texi
diff -c emacs/lispref/commands.texi:1.36.2.1 
emacs/lispref/commands.texi:1.36.2.2
*** emacs/lispref/commands.texi:1.36.2.1        Fri Apr  4 01:20:41 2003
--- emacs/lispref/commands.texi Tue Oct 14 19:10:11 2003
***************
*** 90,95 ****
--- 90,99 ----
  these hooks, it terminates execution of the hook, and clears the hook
  variable to @code{nil} so as to prevent an infinite loop of errors.
  
+   A request coming into the Emacs server (@pxref{Emacs Server,,,
+ emacs, The GNU Emacs Manual}) runs these two hooks just as a keyboard
+ command does.
+ 
  @node Defining Commands
  @section Defining Commands
  @cindex defining commands
***************
*** 499,505 ****
  @code{call-interactively}, which reads the arguments and calls the
  command.  You can also call these functions yourself.
  
! @defun commandp object
  Returns @code{t} if @var{object} is suitable for calling interactively;
  that is, if @var{object} is a command.  Otherwise, returns @code{nil}.
  
--- 503,509 ----
  @code{call-interactively}, which reads the arguments and calls the
  command.  You can also call these functions yourself.
  
! @defun commandp object &optional for-call-interactively
  Returns @code{t} if @var{object} is suitable for calling interactively;
  that is, if @var{object} is a command.  Otherwise, returns @code{nil}.
  
***************
*** 510,520 ****
  (address@hidden fourth argument to @code{autoload}), and some of the
  primitive functions.
  
! A symbol satisfies @code{commandp} if its function definition satisfies
! @code{commandp}.
! 
! Keys and keymaps are not commands.  Rather, they are used to look up
! commands (@pxref{Keymaps}).
  
  See @code{documentation} in @ref{Accessing Documentation}, for a
  realistic example of using @code{commandp}.
--- 514,526 ----
  (address@hidden fourth argument to @code{autoload}), and some of the
  primitive functions.
  
! A symbol satisfies @code{commandp} if its function definition
! satisfies @code{commandp}.  Keys and keymaps are not commands.
! Rather, they are used to look up commands (@pxref{Keymaps}).
! 
! If @var{for-call-interactively} is address@hidden, then
! @code{commandp} returns @code{t} only for objects that
! @code{call-interactively} could call---thus, not for keyboard macros.
  
  See @code{documentation} in @ref{Accessing Documentation}, for a
  realistic example of using @code{commandp}.
***************
*** 657,662 ****
--- 663,672 ----
      (message "foo")))
  @end example
  
+ @noindent
+ Defined in this way, the function does display the message when
+ called from a keyboard macro.
+ 
    The numeric prefix argument, provided by @samp{p}, is never @code{nil}.
  
  @node Command Loop Info
***************
*** 723,728 ****
--- 733,746 ----
  restore the old value in case of error---a feature of @code{let} which
  in this case does precisely what we want to avoid.
  
+ @defvar this-original-command
+ This has the same value as @code{this-command} except when command
+ remapping occurs (@pxref{Remapping Commands}).  In that case,
+ @code{this-command} gives the command actually run (the result of
+ remapping), and @code{this-original-command} gives the command that
+ was specified to run but remapped into another command.
+ @end defvar
+ 
  @defun this-command-keys
  This function returns a string or vector containing the key sequence
  that invoked the present command, plus any previous commands that
***************
*** 2037,2043 ****
  If this is address@hidden, its value specifies the current input method
  function.
  
! @strong{Note:} Don't bind this variable with @code{let}.  It is often
  buffer-local, and if you bind it around reading input (which is exactly
  when you @emph{would} bind it), switching buffers asynchronously while
  Emacs is waiting will cause the value to be restored in the wrong
--- 2055,2061 ----
  If this is address@hidden, its value specifies the current input method
  function.
  
! @strong{Warning:} don't bind this variable with @code{let}.  It is often
  buffer-local, and if you bind it around reading input (which is exactly
  when you @emph{would} bind it), switching buffers asynchronously while
  Emacs is waiting will cause the value to be restored in the wrong
***************
*** 2247,2253 ****
  input comes in, while @code{sleep-for} pauses without updating the
  screen.
  
! @defun sit-for seconds &optional millisec nodisp
  This function performs redisplay (provided there is no pending input
  from the user), then waits @var{seconds} seconds, or until input is
  available.  The value is @code{t} if @code{sit-for} waited the full
--- 2265,2271 ----
  input comes in, while @code{sleep-for} pauses without updating the
  screen.
  
! @defun sit-for seconds &optional nodisp
  This function performs redisplay (provided there is no pending input
  from the user), then waits @var{seconds} seconds, or until input is
  available.  The value is @code{t} if @code{sit-for} waited the full
***************
*** 2259,2269 ****
  Some systems support only a whole number of seconds; on these systems,
  @var{seconds} is rounded down.
  
- The optional argument @var{millisec} specifies an additional waiting
- period measured in milliseconds.  This adds to the period specified by
- @var{seconds}.  If the system doesn't support waiting fractions of a
- second, you get an error if you specify nonzero @var{millisec}.
- 
  The expression @code{(sit-for 0)} is a convenient way to request a
  redisplay, without any delay.  @xref{Forcing Redisplay}.
  
--- 2277,2282 ----
***************
*** 2276,2281 ****
--- 2289,2298 ----
  
  The usual purpose of @code{sit-for} is to give the user time to read
  text that you display.
+ 
+ It is also possible to call @code{sit-for} with three arguments,
+ as @code{(sit-for @var{seconds} @var{millisec} @var{nodisp})},
+ but that is considered obsolete.
  @end defun
  
  @defun sleep-for seconds &optional millisec
***************
*** 2816,2818 ****
--- 2833,2839 ----
  macro terminates, regardless of what caused it to terminate (reaching
  the macro end or an error which ended the macro prematurely).
  @end defvar
+ 
+ @ignore
+    arch-tag: e34944ad-7d5c-4980-be00-36a5fe54d4b1
+ @end ignore