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

[Juanma Barranquero]

Index: emacs/lisp/shell.el
diff -c emacs/lisp/shell.el:1.127 emacs/lisp/shell.el:1.128
*** emacs/lisp/shell.el:1.127   Mon May 16 11:33:47 2005
--- emacs/lisp/shell.el Thu Jun 16 16:10:43 2005
***************
*** 133,139 ****
  (defcustom shell-prompt-pattern "^[^#$%>\n]*[#$%>] *"
    "Regexp to match prompts in the inferior shell.
  Defaults to \"^[^#$%>\\n]*[#$%>] *\", which works pretty well.
! This variable is used to initialise `comint-prompt-regexp' in the
  shell buffer.
  
  If `comint-use-prompt-regexp' is nil, then this variable is only used
--- 133,139 ----
  (defcustom shell-prompt-pattern "^[^#$%>\n]*[#$%>] *"
    "Regexp to match prompts in the inferior shell.
  Defaults to \"^[^#$%>\\n]*[#$%>] *\", which works pretty well.
! This variable is used to initialize `comint-prompt-regexp' in the
  shell buffer.
  
  If `comint-use-prompt-regexp' is nil, then this variable is only used
***************
*** 159,165 ****
    :group 'shell)
  
  (defvar shell-delimiter-argument-list '(?\| ?& ?< ?> ?\( ?\) ?\;)
!   "List of characters to recognise as separate arguments.
  This variable is used to initialize `comint-delimiter-argument-list' in the
  shell buffer.  The value may depend on the operating system or shell.
  
--- 159,165 ----
    :group 'shell)
  
  (defvar shell-delimiter-argument-list '(?\| ?& ?< ?> ?\( ?\) ?\;)
!   "List of characters to recognize as separate arguments.
  This variable is used to initialize `comint-delimiter-argument-list' in the
  shell buffer.  The value may depend on the operating system or shell.
  
***************
*** 192,198 ****
      shell-replace-by-expanded-directory
      comint-dynamic-complete-filename)
    "List of functions called to perform completion.
! This variable is used to initialise `comint-dynamic-complete-functions' in the
  shell buffer.
  
  This is a fine thing to set in your `.emacs' file.")
--- 192,198 ----
      shell-replace-by-expanded-directory
      comint-dynamic-complete-filename)
    "List of functions called to perform completion.
! This variable is used to initialize `comint-dynamic-complete-functions' in the
  shell buffer.
  
  This is a fine thing to set in your `.emacs' file.")
***************
*** 407,413 ****
  `comint-completion-recexact' and `comint-completion-fignore' control the
  behavior of file name, command name and variable name completion.  Variable
  `shell-completion-execonly' controls the behavior of command name completion.
! Variable `shell-completion-fignore' is used to initialise the value of
  `comint-completion-fignore'.
  
  Variables `comint-input-ring-file-name' and `comint-input-autoexpand' control
--- 407,413 ----
  `comint-completion-recexact' and `comint-completion-fignore' control the
  behavior of file name, command name and variable name completion.  Variable
  `shell-completion-execonly' controls the behavior of command name completion.
! Variable `shell-completion-fignore' is used to initialize the value of
  `comint-completion-fignore'.
  
  Variables `comint-input-ring-file-name' and `comint-input-autoexpand' control
***************
*** 950,956 ****
          (and comint-completion-fignore
               (mapconcat (function (lambda (x) (concat (regexp-quote x) "$")))
                          comint-completion-fignore "\\|")))
!        (dir "") (comps-in-dir ()) 
         (file "") (abs-file-name "") (completions ()))
      ;; Go thru each dir in the search path, finding completions.
      (while path-dirs
--- 950,956 ----
          (and comint-completion-fignore
               (mapconcat (function (lambda (x) (concat (regexp-quote x) "$")))
                          comint-completion-fignore "\\|")))
!        (dir "") (comps-in-dir ())
         (file "") (abs-file-name "") (completions ()))
      ;; Go thru each dir in the search path, finding completions.
      (while path-dirs