diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 42dda8f9e49..e849b7c02a8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-09-02  Glenn Morris  <rgm@gnu.org>
+
+	* simple.el (undo): Tweak message in undo-only case.  (Bug#12283)
+
 2012-09-01  Glenn Morris  <rgm@gnu.org>
 
 	* term.el: Tidy up menu definitions.
diff --git a/lisp/simple.el b/lisp/simple.el
index 51eb572dc5c..b7a24f4f970 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1886,9 +1886,10 @@ as an argument limits undo to changes within the current region."
     ;; so, ask the user whether she wants to skip the redo/undo pair.
     (let ((equiv (gethash pending-undo-list undo-equiv-table)))
       (or (eq (selected-window) (minibuffer-window))
-	  (setq message (if undo-in-region
-			    (if equiv "Redo in region!" "Undo in region!")
-			  (if equiv "Redo!" "Undo!"))))
+	  (setq message (format "%s%s!"
+                                (if (or undo-no-redo (not equiv))
+                                    "Undo" "Redo")
+                                (if undo-in-region " in region" ""))))
       (when (and (consp equiv) undo-no-redo)
 	;; The equiv entry might point to another redo record if we have done
 	;; undo-redo-undo-redo-... so skip to the very last equiv.