procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lisp/subr.el (y-or-n-p): Fix double space issue in message.

Browse source
This commit is contained in:
Juanma Barranquero 2014-02-27 15:21:28 +01:00
parent eed1c39901
commit 298520dfb7
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

@ -1,3 +1,7 @@
2014-02-27 Juanma Barranquero <lekktu@gmail.com>
* subr.el (y-or-n-p): Fix double space issue in message.
2014-02-27 Michael Albinus <michael.albinus@gmx.de>
* net/tramp.el (tramp-call-process): Improve trace message.

28
lisp/subr.el
View file

@ -2206,14 +2206,16 @@ is nil and `use-dialog-box' is non-nil."
;; ¡Beware! when I tried to edebug this code, Emacs got into a weird state
;; where all the keys were unbound (i.e. it somehow got triggered
;; within read-key, apparently). I had to kill it.
(let ((answer 'recenter))
(let ((answer 'recenter)
(padded (lambda (prompt &optional dialog)
(let ((l (length prompt)))
(concat prompt
(if (or (zerop l) (eq ?\s (aref prompt (1- l))))
"" " ")
(if dialog "" "(y or n) "))))))
(cond
(noninteractive
(setq prompt (concat prompt
(if (or (zerop (length prompt))
(eq ?\s (aref prompt (1- (length prompt)))))
"" " ")
"(y or n) "))
(setq prompt (funcall padded prompt))
(let ((temp-prompt prompt))
(while (not (memq answer '(act skip)))
(let ((str (read-string temp-prompt)))
@ -2224,14 +2226,10 @@ is nil and `use-dialog-box' is non-nil."
((and (display-popup-menus-p)
(listp last-nonmenu-event)
use-dialog-box)
(setq answer
(x-popup-dialog t `(,prompt ("Yes" . act) ("No" . skip)))))
(setq prompt (funcall padded prompt t)
answer (x-popup-dialog t `(,prompt ("Yes" . act) ("No" . skip)))))
(t
(setq prompt (concat prompt
(if (or (zerop (length prompt))
(eq ?\s (aref prompt (1- (length prompt)))))
"" " ")
"(y or n) "))
(setq prompt (funcall padded prompt))
(while
(let* ((scroll-actions '(recenter scroll-up scroll-down
scroll-other-window scroll-other-window-down))
@ -2264,9 +2262,7 @@ is nil and `use-dialog-box' is non-nil."
(discard-input))))
(let ((ret (eq answer 'act)))
(unless noninteractive
;; FIXME this prints one too many spaces, since prompt
;; already ends in a space. Eg "... (y or n) y".
(message "%s %s" prompt (if ret "y" "n")))
(message "%s%c" prompt (if ret ?y ?n)))
ret)))