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

[Luc Teirlinck]

Index: emacs/lisp/shell.el
diff -c emacs/lisp/shell.el:1.125 emacs/lisp/shell.el:1.126
*** emacs/lisp/shell.el:1.125   Mon Dec 29 19:13:28 2003
--- emacs/lisp/shell.el Tue Apr 26 23:16:20 2005
***************
*** 136,143 ****
  This variable is used to initialise `comint-prompt-regexp' in the
  shell buffer.
  
! This variable is only used if the variable
! `comint-use-prompt-regexp-instead-of-fields' is non-nil.
  
  The pattern should probably not match more than one line.  If it does,
  Shell mode may become confused trying to distinguish prompt from input
--- 136,144 ----
  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
! to determine paragraph boundaries.  See Info node `Shell Prompts' for
! how Shell mode treats paragraphs.
  
  The pattern should probably not match more than one line.  If it does,
  Shell mode may become confused trying to distinguish prompt from input
***************
*** 422,427 ****
--- 423,429 ----
    (setq comint-file-name-chars shell-file-name-chars)
    (setq comint-file-name-quote-list shell-file-name-quote-list)
    (setq comint-dynamic-complete-functions shell-dynamic-complete-functions)
+   (set (make-local-variable 'paragraph-separate) "\\'")
    (make-local-variable 'paragraph-start)
    (setq paragraph-start comint-prompt-regexp)
    (make-local-variable 'font-lock-defaults)