summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorChong Yidong <cyd@gnu.org>2012-02-06 21:56:40 +0800
committerChong Yidong <cyd@gnu.org>2012-02-06 21:56:40 +0800
commit171e9b6ee99daea6cc7845bf66f694a529e44631 (patch)
tree12706f21932d302e61f14d6420e8ebcc995bcd02 /lisp
parent1449fa1d08009f384f1867aecf1aa8a46220dcc4 (diff)
downloademacs-171e9b6ee99daea6cc7845bf66f694a529e44631.tar.gz
Minor fix for next-single-char-property-change usage.
* lisp/comint.el (comint-next-prompt): next-single-char-property-change and prev-single-char-property-change never return nil. Fixes: debbugs:8657
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/comint.el2
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f0f438e540e..27c914b0424 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
2012-02-06 Chong Yidong <cyd@gnu.org>
+ * comint.el (comint-next-prompt): next-single-char-property-change
+ and prev-single-char-property-change never return nil (Bug#8657).
+
* custom.el (defcustom): Doc fix (Bug#9711).
2012-02-05 Chong Yidong <cyd@gnu.org>
diff --git a/lisp/comint.el b/lisp/comint.el
index 2d0ae6920f9..975291471df 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -2513,7 +2513,7 @@ text matching `comint-prompt-regexp'."
(if (> n 0)
(next-single-char-property-change pos 'field)
(previous-single-char-property-change pos 'field)))
- (cond ((or (null pos) (= pos prev-pos))
+ (cond ((= pos prev-pos)
;; Ran off the end of the buffer.
(when (> n 0)
;; There's always an input field at the end of the