bug#11002: 23.1; Some interactive prompts lack trailing spaces

[Tim Landscheidt <tim@tim-landscheidt.de>]

[-- Attachment #1: Type: text/plain, Size: 141 bytes --]

Hi,

some interactive prompts are missing trailing spaces.  This
issue is still around in HEAD.  The attached patch should
fix it.

HTH,
Tim

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Fix-interactive-prompts-with-missing-trailing-spaces.patch --]
[-- Type: text/x-patch, Size: 2707 bytes --]

From 7757d23e8bd81f4361f4c80017e74fe949c6d545 Mon Sep 17 00:00:00 2001
From: Tim Landscheidt <tim@tim-landscheidt.de>
Date: Tue, 13 Mar 2012 01:46:55 +0000
Subject: [PATCH] Fix interactive prompts with missing trailing spaces.

* lisp/calendar/icalendar.el (icalendar-export-file)
(icalendar-import-file): Here ...
* lisp/emulation/ws-mode.el (ws-query-replace): ... and here ...
* lisp/sort.el (sort-regexp-fields): ... and here.
---
 lisp/calendar/icalendar.el |    4 ++--
 lisp/emulation/ws-mode.el  |    2 +-
 lisp/sort.el               |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lisp/calendar/icalendar.el b/lisp/calendar/icalendar.el
index 83bda94..f1549ec 100644
--- a/lisp/calendar/icalendar.el
+++ b/lisp/calendar/icalendar.el
@@ -915,7 +915,7 @@ would be \"pm\"."
   "Export diary file to iCalendar format.
 All diary entries in the file DIARY-FILENAME are converted to iCalendar
 format.  The result is appended to the file ICAL-FILENAME."
-  (interactive "FExport diary data from file:
+  (interactive "FExport diary data from file: \n\
 Finto iCalendar file: ")
   (save-current-buffer
     (set-buffer (find-file diary-filename))
@@ -1794,7 +1794,7 @@ Argument ICAL-FILENAME output iCalendar file.
 Argument DIARY-FILENAME input `diary-file'.
 Optional argument NON-MARKING determines whether events are created as
 non-marking or not."
-  (interactive "fImport iCalendar data from file:
+  (interactive "fImport iCalendar data from file: \n\
 Finto diary file:
 p")
   ;; clean up the diary file
diff --git a/lisp/emulation/ws-mode.el b/lisp/emulation/ws-mode.el
index aa8d647..0c7be14 100644
--- a/lisp/emulation/ws-mode.el
+++ b/lisp/emulation/ws-mode.el
@@ -716,7 +716,7 @@ This will only work for errors raised by WordStar mode functions."
 
 (defun ws-query-replace (from to)
   "In WordStar mode: Search string, remember string for repetition."
-  (interactive "sReplace:
+  (interactive "sReplace: \n\
 sWith: " )
   (setq ws-search-string from)
   (setq ws-search-direction t)
diff --git a/lisp/sort.el b/lisp/sort.el
index d38e475..8cfe69f 100644
--- a/lisp/sort.el
+++ b/lisp/sort.el
@@ -423,7 +423,7 @@ For example: to sort lines in the region by the first word on each line
   ;; using negative prefix arg to mean "reverse" is now inconsistent with
   ;; other sort-.*fields functions but then again this was before, since it
   ;; didn't use the magnitude of the arg to specify anything.
-  (interactive "P\nsRegexp specifying records to sort:
+  (interactive "P\nsRegexp specifying records to sort: \n\
 sRegexp specifying key within record: \nr")
   (cond ((or (equal key-regexp "") (equal key-regexp "\\&"))
 	 (setq key-regexp 0))
-- 
1.6.2.5