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

[Stefan Monnier]

Index: emacs/src/minibuf.c
diff -c emacs/src/minibuf.c:1.279 emacs/src/minibuf.c:1.280
*** emacs/src/minibuf.c:1.279   Tue Feb 22 20:39:23 2005
--- emacs/src/minibuf.c Fri Mar 25 14:57:46 2005
***************
*** 1,5 ****
  /* Minibuffer input and completion.
!    Copyright (C) 1985,86,93,94,95,96,97,98,99,2000,01,03,04
               Free Software Foundation, Inc.
  
  This file is part of GNU Emacs.
--- 1,5 ----
  /* Minibuffer input and completion.
!    Copyright (C) 1985,86,93,94,95,96,97,98,99,2000,01,03,04,05
               Free Software Foundation, Inc.
  
  This file is part of GNU Emacs.
***************
*** 2080,2085 ****
--- 2080,2087 ----
    return make_number (1);
  }
  
+ EXFUN (Fexit_minibuffer, 0) NO_RETURN;
+ 
  DEFUN ("minibuffer-complete-and-exit", Fminibuffer_complete_and_exit,
         Sminibuffer_complete_and_exit, 0, 0, "",
         doc: /* If the minibuffer contents is a valid completion then exit.
***************
*** 2142,2148 ****
        return Qnil;
      }
   exit:
!   return Fthrow (Qexit, Qnil);
    /* NOTREACHED */
  }
  
--- 2144,2150 ----
        return Qnil;
      }
   exit:
!   return Fexit_minibuffer ();
    /* NOTREACHED */
  }
  
***************
*** 2549,2562 ****
    else
      bitch_at_user ();
  
!   return Fthrow (Qexit, Qnil);
  }
  
  DEFUN ("exit-minibuffer", Fexit_minibuffer, Sexit_minibuffer, 0, 0, "",
         doc: /* Terminate this minibuffer argument.  */)
       ()
  {
!   return Fthrow (Qexit, Qnil);
  }
  
  DEFUN ("minibuffer-depth", Fminibuffer_depth, Sminibuffer_depth, 0, 0, 0,
--- 2551,2571 ----
    else
      bitch_at_user ();
  
!   return Fexit_minibuffer ();
  }
  
  DEFUN ("exit-minibuffer", Fexit_minibuffer, Sexit_minibuffer, 0, 0, "",
         doc: /* Terminate this minibuffer argument.  */)
       ()
  {
!   /* If the command that uses this has made modifications in the minibuffer,
!      we don't want them to cause deactivation of the mark in the original
!      buffer.
!      A better solution would be to make deactivate-mark buffer-local
!      (or to turn it into a list of buffers, ...), but in the mean time,
!      this should do the trick in most cases.  */
!   Vdeactivate_mark = Qnil;
!   Fthrow (Qexit, Qnil);
  }
  
  DEFUN ("minibuffer-depth", Fminibuffer_depth, Sminibuffer_depth, 0, 0, 0,