summaryrefslogtreecommitdiff
path: root/lisp/comint.el
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2011-10-17 13:14:04 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2011-10-17 13:14:04 -0400
commitfa92a650fd9cbafd0e840181c5d4934eb071b231 (patch)
tree2fd042c84f759ea3cec2eed8e811cfd87d508abb /lisp/comint.el
parent2c91f553b734ed0e2c624e39710385fe5237ff96 (diff)
downloademacs-fa92a650fd9cbafd0e840181c5d4934eb071b231.tar.gz
emacs-fa92a650fd9cbafd0e840181c5d4934eb071b231.tar.bz2
emacs-fa92a650fd9cbafd0e840181c5d4934eb071b231.zip
* lisp/comint.el (comint-insert-input): Fix last change.
Diffstat (limited to 'lisp/comint.el')
-rw-r--r--lisp/comint.el7
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/comint.el b/lisp/comint.el
index 66749d0f2a8..591be5e2d9d 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -847,9 +847,10 @@ by the global keymap (usually `mouse-yank-at-click')."
;; If pos is at the very end of a field, the mouse-click was
;; probably outside (to the right) of the field.
(and (< pos (field-end pos))
- (setq field (field-at-pos pos))
- (setq input (field-string-no-properties pos))))
- (if (or (null comint-accum-marker) field)
+ (< (field-end pos) (point-max))
+ (progn (setq field (field-at-pos pos))
+ (setq input (field-string-no-properties pos)))))
+ (if (or (null input) (null comint-accum-marker) field)
;; Fall back to the global definition if (i) the selected
;; buffer is not a comint buffer (which can happen if a
;; non-comint window was selected and we clicked in a comint