diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/comint.el | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4fa5907ac0f..d6e24578db8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2002-06-12 Miles Bader <miles@gnu.org> + + * comint.el (comint-send-input): Properly handle empty and + no-newline input regions. + 2002-06-12 Colin Walters <walters@gnu.org> * calc/calc.el: Use `when', `unless'. diff --git a/lisp/comint.el b/lisp/comint.el index d6247dd14a6..9d31e975789 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -1446,7 +1446,7 @@ Similarly for Soar, Scheme, etc." (let ((beg (marker-position pmark)) (end (if no-newline (point) (1- (point))))) - (when (not (> beg end)) ; handle a special case + (when (> end beg) ;; Set text-properties for the input field (add-text-properties beg end @@ -1461,7 +1461,7 @@ Similarly for Soar, Scheme, etc." ;; `boundary' field to make cursor movement between input ;; and output fields smoother. (put-text-property beg end 'field 'input))) - (unless comint-use-prompt-regexp-instead-of-fields + (unless (or no-newline comint-use-prompt-regexp-instead-of-fields) ;; Cover the terminating newline (add-text-properties end (1+ end) '(rear-nonsticky t |