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

[Juanma Barranquero]

Index: emacs/src/keyboard.c
diff -c emacs/src/keyboard.c:1.689 emacs/src/keyboard.c:1.690
*** emacs/src/keyboard.c:1.689  Wed Jul 10 04:44:44 2002
--- emacs/src/keyboard.c        Thu Jul 11 10:12:22 2002
***************
*** 934,940 ****
  Lisp_Object
  recursive_edit_1 ()
  {
!   int count = specpdl_ptr - specpdl;
    Lisp_Object val;
  
    if (command_loop_level > 0)
--- 934,940 ----
  Lisp_Object
  recursive_edit_1 ()
  {
!   int count = SPECPDL_INDEX ();
    Lisp_Object val;
  
    if (command_loop_level > 0)
***************
*** 1000,1006 ****
  This function is called by the editor initialization to begin editing.  */)
       ()
  {
!   int count = specpdl_ptr - specpdl;
    Lisp_Object buffer;
  
    command_loop_level++;
--- 1000,1006 ----
  This function is called by the editor initialization to begin editing.  */)
       ()
  {
!   int count = SPECPDL_INDEX ();
    Lisp_Object buffer;
  
    command_loop_level++;
***************
*** 1407,1413 ****
        {
          /* Bind inhibit-quit to t so that C-g gets read in
             rather than quitting back to the minibuffer.  */
!         int count = specpdl_ptr - specpdl;
          specbind (Qinhibit_quit, Qt);
  
          Fsit_for (Vminibuffer_message_timeout, Qnil, Qnil);
--- 1407,1413 ----
        {
          /* Bind inhibit-quit to t so that C-g gets read in
             rather than quitting back to the minibuffer.  */
!         int count = SPECPDL_INDEX ();
          specbind (Qinhibit_quit, Qt);
  
          Fsit_for (Vminibuffer_message_timeout, Qnil, Qnil);
***************
*** 1838,1844 ****
  safe_run_hooks (hook)
       Lisp_Object hook;
  {
!   int count = specpdl_ptr - specpdl;
    specbind (Qinhibit_quit, hook);
  
    internal_condition_case (safe_run_hooks_1, Qt, safe_run_hooks_error);
--- 1838,1844 ----
  safe_run_hooks (hook)
       Lisp_Object hook;
  {
!   int count = SPECPDL_INDEX ();
    specbind (Qinhibit_quit, hook);
  
    internal_condition_case (safe_run_hooks_1, Qt, safe_run_hooks_error);
***************
*** 2813,2819 ****
        Lisp_Object keys; 
        int key_count;
        struct gcpro gcpro1;
!       int count = specpdl_ptr - specpdl;
  
        /* Save the echo status.  */
        int saved_immediate_echo = current_kboard->immediate_echo;
--- 2813,2819 ----
        Lisp_Object keys; 
        int key_count;
        struct gcpro gcpro1;
!       int count = SPECPDL_INDEX ();
  
        /* Save the echo status.  */
        int saved_immediate_echo = current_kboard->immediate_echo;
***************
*** 2943,2949 ****
    if (!NILP (Vhelp_form) && help_char_p (c))
      {
        Lisp_Object tem0;
!       count = specpdl_ptr - specpdl;
  
        record_unwind_protect (Fset_window_configuration,
                             Fcurrent_window_configuration (Qnil));
--- 2943,2949 ----
    if (!NILP (Vhelp_form) && help_char_p (c))
      {
        Lisp_Object tem0;
!       count = SPECPDL_INDEX ();
  
        record_unwind_protect (Fset_window_configuration,
                             Fcurrent_window_configuration (Qnil));
***************
*** 3223,3229 ****
       (args)
       Lisp_Object args;
  {
!   int count = specpdl_ptr - specpdl;
    Lisp_Object val;
  
    record_unwind_protect (tracking_off, do_mouse_tracking);
--- 3223,3229 ----
       (args)
       Lisp_Object args;
  {
!   int count = SPECPDL_INDEX ();
    Lisp_Object val;
  
    record_unwind_protect (tracking_off, do_mouse_tracking);
***************
*** 6789,6795 ****
  menu_item_eval_property (sexpr)
       Lisp_Object sexpr;
  {
!   int count = specpdl_ptr - specpdl;
    Lisp_Object val;
    specbind (Qinhibit_redisplay, Qt);
    val = internal_condition_case_1 (Feval, sexpr, Qerror,
--- 6789,6795 ----
  menu_item_eval_property (sexpr)
       Lisp_Object sexpr;
  {
!   int count = SPECPDL_INDEX ();
    Lisp_Object val;
    specbind (Qinhibit_redisplay, Qt);
    val = internal_condition_case_1 (Feval, sexpr, Qerror,
***************
*** 8005,8011 ****
       int fix_current_buffer;
  {
    volatile Lisp_Object from_string;
!   volatile int count = specpdl_ptr - specpdl;
  
    /* How many keys there are in the current key sequence.  */
    volatile int t;
--- 8005,8011 ----
       int fix_current_buffer;
  {
    volatile Lisp_Object from_string;
!   volatile int count = SPECPDL_INDEX ();
  
    /* How many keys there are in the current key sequence.  */
    volatile int t;
***************
*** 9187,9193 ****
    Lisp_Object keybuf[30];
    register int i;
    struct gcpro gcpro1;
!   int count = specpdl_ptr - specpdl;
  
    if (!NILP (prompt))
      CHECK_STRING (prompt);
--- 9187,9193 ----
    Lisp_Object keybuf[30];
    register int i;
    struct gcpro gcpro1;
!   int count = SPECPDL_INDEX ();
  
    if (!NILP (prompt))
      CHECK_STRING (prompt);
***************
*** 9246,9252 ****
    Lisp_Object keybuf[30];
    register int i;
    struct gcpro gcpro1;
!   int count = specpdl_ptr - specpdl;
  
    if (!NILP (prompt))
      CHECK_STRING (prompt);
--- 9246,9252 ----
    Lisp_Object keybuf[30];
    register int i;
    struct gcpro gcpro1;
!   int count = SPECPDL_INDEX ();
  
    if (!NILP (prompt))
      CHECK_STRING (prompt);
***************
*** 9797,9803 ****
       (stuffstring)
       Lisp_Object stuffstring;
  {
!   int count = specpdl_ptr - specpdl;
    int old_height, old_width;
    int width, height;
    struct gcpro gcpro1;
--- 9797,9803 ----
       (stuffstring)
       Lisp_Object stuffstring;
  {
!   int count = SPECPDL_INDEX ();
    int old_height, old_width;
    int width, height;
    struct gcpro gcpro1;