[Emacs-diffs] Changes to emacs/lisp/simple.el

[Richard M. Stallman]

Index: emacs/lisp/simple.el
diff -c emacs/lisp/simple.el:1.548 emacs/lisp/simple.el:1.549
*** emacs/lisp/simple.el:1.548  Sat Jun  1 17:56:01 2002
--- emacs/lisp/simple.el        Sat Jun  1 20:01:18 2002
***************
*** 3783,3801 ****
  CHOICE - the string to insert in the buffer,
  BUFFER - the buffer in which the choice should be inserted,
  MINI-P - non-nil iff BUFFER is a minibuffer,  and
! BASE-SIZE - the part of BUFFER which isn't part of completion.
  If a function in the list returns non-nil, that function is supposed
  to have inserted the CHOICE in the BUFFER, and possibly exited
! the minibuffer; no further functions will be called.")
  
! ;; Switch to BUFFER and insert the completion choice CHOICE.
! ;; BASE-SIZE, if non-nil, says how many characters of BUFFER's text
! ;; to keep.  If it is nil, use choose-completion-delete-max-match instead.
  
- ;; If BUFFER is the minibuffer, exit the minibuffer
- ;; unless it is reading a file name and CHOICE is a directory,
- ;; or completion-no-auto-exit is non-nil.
  (defun choose-completion-string (choice &optional buffer base-size)
    (let ((buffer (or buffer completion-reference-buffer))
        (mini-p (string-match "\\` \\*Minibuf-[0-9]+\\*\\'" (buffer-name 
buffer))))
      ;; If BUFFER is a minibuffer, barf unless it's the currently
--- 3783,3807 ----
  CHOICE - the string to insert in the buffer,
  BUFFER - the buffer in which the choice should be inserted,
  MINI-P - non-nil iff BUFFER is a minibuffer,  and
! BASE-SIZE - the number of characters in BUFFER before
! the string being completed.
! 
  If a function in the list returns non-nil, that function is supposed
  to have inserted the CHOICE in the BUFFER, and possibly exited
! the minibuffer; no further functions will be called.
  
! If all functions in the list return nil, that means to use
! the default method of inserting the completion in BUFFER.")
  
  (defun choose-completion-string (choice &optional buffer base-size)
+   "Switch to BUFFER and insert the completion choice CHOICE.
+ BASE-SIZE, if non-nil, says how many characters of BUFFER's text
+ to keep.  If it is nil, use choose-completion-delete-max-match instead."
+ 
+   ;; If BUFFER is the minibuffer, exit the minibuffer
+   ;; unless it is reading a file name and CHOICE is a directory,
+   ;; or completion-no-auto-exit is non-nil.
+ 
    (let ((buffer (or buffer completion-reference-buffer))
        (mini-p (string-match "\\` \\*Minibuf-[0-9]+\\*\\'" (buffer-name 
buffer))))
      ;; If BUFFER is a minibuffer, barf unless it's the currently