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

[Kim F. Storm]

Index: emacs/lisp/shell.el
diff -c emacs/lisp/shell.el:1.107 emacs/lisp/shell.el:1.108
*** emacs/lisp/shell.el:1.107   Mon Feb 25 05:49:20 2002
--- emacs/lisp/shell.el Mon Feb 25 16:04:00 2002
***************
*** 858,870 ****
        (progn (goto-char (match-beginning 1))
               (skip-chars-forward ";&|")))))
  
  (defun shell-pcomplete ()
    "Cycle forwards through completions at point, using `pcomplete'.
  This function merely invokes `pcomplete', after ensuring this buffer
  is set up for it."
    (interactive)
!   (unless (prog1 shell-pcomplete-setup-p
!            (setq shell-pcomplete-setup-p t))
      (pcomplete-comint-setup 'shell-dynamic-complete-functions))
    ;; Convince pcomplete we are calling it directly
    (setq this-command 'pcomplete)
--- 858,872 ----
        (progn (goto-char (match-beginning 1))
               (skip-chars-forward ";&|")))))
  
+ (defvar shell-pcomplete-setup-done nil)
+ 
  (defun shell-pcomplete ()
    "Cycle forwards through completions at point, using `pcomplete'.
  This function merely invokes `pcomplete', after ensuring this buffer
  is set up for it."
    (interactive)
!   (unless shell-pcomplete-setup-done
!     (setq shell-pcomplete-setup-done t)
      (pcomplete-comint-setup 'shell-dynamic-complete-functions))
    ;; Convince pcomplete we are calling it directly
    (setq this-command 'pcomplete)
***************
*** 875,882 ****
  This function merely invokes `pcomplete-reverse', after ensuring this
  buffer is set up for it."
    (interactive)
!   (unless (prog1 shell-pcomplete-setup-p
!           (setq shell-pcomplete-setup-p t))
      (pcomplete-comint-setup 'shell-dynamic-complete-functions))
    ;; Convince pcomplete we are calling it directly
    (setq this-command 'pcomplete-reverse)
--- 877,884 ----
  This function merely invokes `pcomplete-reverse', after ensuring this
  buffer is set up for it."
    (interactive)
!   (unless shell-pcomplete-setup-done
!     (setq shell-pcomplete-setup-done t)
      (pcomplete-comint-setup 'shell-dynamic-complete-functions))
    ;; Convince pcomplete we are calling it directly
    (setq this-command 'pcomplete-reverse)