auto upstream

2 files changed, 10 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c291bba0f19..db5ae7e35d6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-15  Juri Linkov  <juri@jurta.org>
+
+        * isearch.el (isearch-delete-char, isearch-del-char): Doc fix.
+        (Bug#13175)
+
 2012-12-15  Christopher Schmidt  <christopher@ch.ristopher.com>
 
         * dired-x.el (dired-guess-shell-command): Put colon at the end of
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 54ec3f2b052..6f98e2d3b12 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1707,6 +1707,9 @@ and reads its face argument using `hi-lock-read-face-name'."
 
 (defun isearch-delete-char ()
   "Discard last input item and move point back.
+Last input means the last character or the last isearch command
+that added or deleted characters from the search string,
+moved point, toggled regexp mode or case-sensitivity, etc.
 If no previous match was done, just beep."
   (interactive)
   (if (null (cdr isearch-cmds))
@@ -1716,6 +1719,8 @@ If no previous match was done, just beep."
 
 (defun isearch-del-char (&optional arg)
   "Delete character from end of search string and search again.
+Unlike `isearch-delete-char', it only deletes the last character,
+but doesn't cancel the effect of other isearch command.
 If search string is empty, just beep."
   (interactive "p")
   (if (= 0 (length isearch-string))