[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-24 r111368: * lisp/subr.el (y-or-n-p): Handle empty
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] emacs-24 r111368: * lisp/subr.el (y-or-n-p): Handle empty prompts. |
Date: |
Wed, 03 Jul 2013 03:13:16 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 111368
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/14770
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Tue 2013-07-02 20:13:07 -0700
message:
* lisp/subr.el (y-or-n-p): Handle empty prompts.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/subr.el subr.el-20091113204419-o5vbwnq5f7feedwu-151
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-05-26 08:55:02 +0000
+++ b/lisp/ChangeLog 2013-07-03 03:13:07 +0000
@@ -1,3 +1,7 @@
+2013-07-03 Glenn Morris <address@hidden>
+
+ * subr.el (y-or-n-p): Handle empty prompts. (Bug#14770)
+
2013-05-26 Fabián Ezequiel Gallina <address@hidden>
* progmodes/python.el (python-indent-block-enders): Add break,
=== modified file 'lisp/subr.el'
--- a/lisp/subr.el 2013-04-24 17:31:43 +0000
+++ b/lisp/subr.el 2013-07-03 03:13:07 +0000
@@ -2352,7 +2352,8 @@
(cond
(noninteractive
(setq prompt (concat prompt
- (if (eq ?\s (aref prompt (1- (length prompt))))
+ (if (or (zerop (length prompt))
+ (eq ?\s (aref prompt (1- (length prompt)))))
"" " ")
"(y or n) "))
(let ((temp-prompt prompt))
@@ -2369,7 +2370,8 @@
(x-popup-dialog t `(,prompt ("Yes" . act) ("No" . skip)))))
(t
(setq prompt (concat prompt
- (if (eq ?\s (aref prompt (1- (length prompt))))
+ (if (or (zerop (length prompt))
+ (eq ?\s (aref prompt (1- (length prompt)))))
"" " ")
"(y or n) "))
(while
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-24 r111368: * lisp/subr.el (y-or-n-p): Handle empty prompts.,
Glenn Morris <=