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

[Richard M. Stallman]

Index: emacs/lisp/help-fns.el
diff -c emacs/lisp/help-fns.el:1.23 emacs/lisp/help-fns.el:1.24
*** emacs/lisp/help-fns.el:1.23 Mon Aug 19 17:23:08 2002
--- emacs/lisp/help-fns.el      Wed Sep  4 22:38:41 2002
***************
*** 45,59 ****
  With arg, you are asked to choose which language."
    (interactive "P")
    (let ((lang (if arg
!                 (progn
                    ;; Display a completion list right away
                    ;; to guide the user.
                    (with-output-to-temp-buffer "*Completions*"
                      (display-completion-list
                       (all-completions "" language-info-alist
                                        (lambda (elm)
!                                         (and (listp elm) (assq 'tutorial 
elm))))))
!                   (read-language-name 'tutorial "Language: " "English"))
                (if (get-language-info current-language-environment 'tutorial)
                    current-language-environment
                  "English")))
--- 45,71 ----
  With arg, you are asked to choose which language."
    (interactive "P")
    (let ((lang (if arg
!                 (let (completion-buffer)
                    ;; Display a completion list right away
                    ;; to guide the user.
                    (with-output-to-temp-buffer "*Completions*"
                      (display-completion-list
                       (all-completions "" language-info-alist
                                        (lambda (elm)
!                                         (and (listp elm) (assq 'tutorial 
elm)))))
!                     (setq completion-buffer standard-output))
!                   ;; Arrange to set completion-reference-buffer
!                   ;; in *Completions* to point to the minibuffer,
!                   ;; after entering the minibuffer.
!                   (let ((minibuffer-setup-hook minibuffer-setup-hook))
!                     (add-hook 'minibuffer-setup-hook
!                               (lambda ()
!                                 (let ((mini (current-buffer)))
!                                   (with-current-buffer completion-buffer
!                                     (make-local-variable 
'completion-reference-buffer)
!                                     (setq completion-reference-buffer 
!                                           mini)))))
!                     (read-language-name 'tutorial "Language: " "English")))
                (if (get-language-info current-language-environment 'tutorial)
                    current-language-environment
                  "English")))