bug#12283: 24.1; M-x undo-only says "Redo!" instead of "Undo!"

bug#12283: 24.1; M-x undo-only says "Redo!" instead of "Undo!"

[Clark Grubb]

This bug report will be sent to the Bug-GNU-Emacs mailing list
and the GNU bug tracker at debbugs.gnu.org.  Please check that
the From: line contains a valid email address.  After a delay of up
to one day, you should receive an acknowledgement at that address.

Please write in English if possible, as the Emacs maintainers
usually do not have translators for other languages.

Please describe exactly what actions triggered the bug, and
the precise symptoms of the bug.  If you can, give a recipe
starting from `emacs -Q':

$ emacs -Q
foo
C-x u
C-p
C-x u
M-x undo-only

If Emacs crashed, and you have the Emacs process in the gdb debugger,
please include the output from the following gdb commands:
    `bt full' and `xbacktrace'.
For information about debugging Emacs, please read the file
/Applications/Emacs.app/Contents/Resources/etc/DEBUG.


In GNU Emacs 24.1.1 (x86_64-apple-darwin, NS apple-appkit-1038.36)
 of 2012-06-10 on bob.porkrind.org
Windowing system distributor `Apple', version 10.3.1187
Configured using:
 `configure '--host=x86_64-apple-darwin' '--build=i686-apple-darwin'
 '--with-ns' 'build_alias=i686-apple-darwin'
 'host_alias=x86_64-apple-darwin' 'CC=gcc -mmacosx-version-min=10.5''

Important settings:
  value of $LC_ALL: nil
  value of $LC_COLLATE: nil
  value of $LC_CTYPE: nil
  value of $LC_MESSAGES: nil
  value of $LC_MONETARY: nil
  value of $LC_NUMERIC: nil
  value of $LC_TIME: nil
  value of $LANG: nil
  value of $XMODIFIERS: nil
  locale-coding-system: nil
  default enable-multibyte-characters: t

Major mode: Emacs-Lisp

Minor modes in effect:
  shell-dirtrack-mode: t
  whitespace-mode: t
  global-edit-server-edit-mode: t
  tooltip-mode: t
  mouse-wheel-mode: t
  file-name-shadow-mode: t
  global-font-lock-mode: t
  font-lock-mode: t
  blink-cursor-mode: t
  auto-composition-mode: t
  auto-encryption-mode: t
  auto-compression-mode: t
  column-number-mode: t
  line-number-mode: t
  transient-mark-mode: t

Recent input:
<down> <down> <down> <down> <down> <down> <down> <down>
<down> <down> <down> <down> <down> <down> <down> <down>
<down> <down> <down> <down> <down> <down> <down> <down>
<down> <down> <down> <down> <down> <down> <down> <down>
<down> <down> <down> <down> <down> <down> <down> <down>
<down> <down> <down> <down> <down> <down> <down> <down>
<down> <down> <down> <down> <down> <down> <down> <down>
<down> <down> <down> <down> <down> <down> <down> <down>
<down> <down> <down> <down> <down> <down> <down> <down>
<down> <down> <down> <down> <down> <down> <down> <down>
<down> <down> <down> <down> <down> <down> <down> <down>
<down> <down> <down> <down> <down> <up> M-w C-x C-w
<backspace> <backspace> / t <backspace> t m p / n e
w - u n d o . e l <return> <return> C-x C-f <backspace>
t / <backspace> m p / o l d - u n d o . e l C-j s-v
C-x C-s M-< C-x C-f n e w <return> M-< C-k C-k C-k
C-k C-k C-k C-k C-k C-k C-k C-k C-k C-k C-k C-k C-k
C-k C-k C-k C-k C-k C-k C-k C-x C-s <down> <down> <down>
<down> C-x o C-x b <right> <return> <up> <up> <up>
<up> <up> M-< <down> C-s d e f u n SPC u n d o C-a
C-SPC C-v M-r M-r M-r <up> <up> <up> <up> <up> <up>
<up> <up> <up> <up> M-w C-x o C-x b <right> <return>
<return> <return> <up> <up> C-y C-SPC M-> M-w <up>
C-x C-s M-< C-v <down> <down> <down> <down> <down>
<down> <down> <down> <down> <down> <down> <down> <down>
<down> <down> <down> <down> <down> <down> <down> <down>
<down> <down> <down> <down> <down> C-SPC M-> C-w M-<
C-c C-v C-x C-s s-x M-x f i l <tab> <backspace> <backspace>
<backspace> e m <tab> <backspace> <backspace> b u <tab>
C-g M-x r e p o r <tab> <return>

Recent messages:
Saved text from "

(defun undo (&optional arg)
  "Undo so"
Saving file /tmp/old-undo.el...
Wrote /tmp/old-undo.el
Mark set [3 times]
Saving file /tmp/old-undo.el...
Wrote /tmp/old-undo.el
Making completion list... [3 times]
Quit

Load-path shadows:
None found.

Features:
(shadow sort mail-extr emacsbug message rfc822 mml mml-sec mm-decode
mm-bodies mm-encode mail-parse rfc2231 mailabbrev gmm-utils mailheader
sendmail rfc2047 rfc2045 ietf-drums mail-utils tramp-cache tramp
tramp-compat auth-source eieio byte-opt bytecomp byte-compile cconv
macroexp assoc gnus-util mm-util mail-prsvr password-cache shell
pcomplete comint ansi-color ring format-spec tramp-loaddefs regexp-opt
thingatpt multi-isearch jka-compr find-func help-mode easymenu view
ido-imenu imenu whitespace edit-server easy-mmode edmacro kmacro ido
uniquify advice help-fns advice-preload saveplace cl time-date tooltip
ediff-hook vc-hooks lisp-float-type mwheel ns-win tool-bar dnd fontset
image fringe lisp-mode register page menu-bar rfn-eshadow timer select
scroll-bar mouse jit-lock font-lock syntax facemenu font-core frame cham
georgian utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao
korean japanese hebrew greek romanian slovak czech european ethiopic
indian cyrillic chinese case-table epa-hook jka-cmpr-hook help simple
abbrev minibuffer loaddefs button faces cus-face files text-properties
overlay sha1 md5 base64 format env code-pages mule custom widget
hashtable-print-readable backquote make-network-process ns multi-tty
emacs)

bug#12283: 24.1; M-x undo-only says "Redo!" instead of "Undo!"

[Glenn Morris]

If you just want it so say "Undo" instead, that seems easily fixed.
Or was there something else?


*** lisp/simple.el	2012-08-18 05:11:38 +0000
--- lisp/simple.el	2012-08-28 07:28:40 +0000
***************
*** 1887,1895 ****
      ;; 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!"))))
        (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.
--- 1887,1896 ----
      ;; 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 (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.

bug#12283: 24.1; M-x undo-only says "Redo!" instead of "Undo!"

[Glenn Morris]

Version: 24.3

Glenn Morris wrote:

> If you just want it so say "Undo" instead, that seems easily fixed.
> Or was there something else?

In absence of further comments, installed to trunk.