diff options
| author | Tim Landscheidt | 2012-03-12 23:54:37 -0700 |
|---|---|---|
| committer | Glenn Morris | 2012-03-12 23:54:37 -0700 |
| commit | 4aaa93566b7bbc3cb57e6c15b4c5bc5a140b3355 (patch) | |
| tree | 8de3fbef510fbfab52face14f3ddbf958164e804 | |
| parent | f003f29445ab02e07b6d53b322841362394b9de9 (diff) | |
| download | emacs-4aaa93566b7bbc3cb57e6c15b4c5bc5a140b3355.tar.gz emacs-4aaa93566b7bbc3cb57e6c15b4c5bc5a140b3355.zip | |
Fix some missing trailing whitespace (tiny change)
* lisp/calendar/icalendar.el (icalendar-export-file, icalendar-import-file):
* lisp/emulation/ws-mode.el (ws-query-replace):
* lisp/sort.el (sort-regexp-fields):
Fix missing trailing whitespace in interactive prompts.
Fixes: debbugs:11002
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/calendar/icalendar.el | 4 | ||||
| -rw-r--r-- | lisp/emulation/ws-mode.el | 2 | ||||
| -rw-r--r-- | lisp/sort.el | 2 |
4 files changed, 11 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0032e07074c..0528edaf206 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2012-03-13 Tim Landscheidt <tim@tim-landscheidt.de> (tiny change) | ||
| 2 | |||
| 3 | * calendar/icalendar.el (icalendar-export-file, icalendar-import-file): | ||
| 4 | * emulation/ws-mode.el (ws-query-replace): | ||
| 5 | * sort.el (sort-regexp-fields): | ||
| 6 | Fix missing trailing whitespace in interactive prompts. (Bug#11002) | ||
| 7 | |||
| 1 | 2012-03-12 Stefan Monnier <monnier@iro.umontreal.ca> | 8 | 2012-03-12 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 9 | ||
| 3 | * dabbrev.el: Fix cycle completion order (bug#10963). | 10 | * dabbrev.el: Fix cycle completion order (bug#10963). |
diff --git a/lisp/calendar/icalendar.el b/lisp/calendar/icalendar.el index 83bda94fefe..f1549ec20b1 100644 --- a/lisp/calendar/icalendar.el +++ b/lisp/calendar/icalendar.el | |||
| @@ -915,7 +915,7 @@ would be \"pm\"." | |||
| 915 | "Export diary file to iCalendar format. | 915 | "Export diary file to iCalendar format. |
| 916 | All diary entries in the file DIARY-FILENAME are converted to iCalendar | 916 | All diary entries in the file DIARY-FILENAME are converted to iCalendar |
| 917 | format. The result is appended to the file ICAL-FILENAME." | 917 | format. The result is appended to the file ICAL-FILENAME." |
| 918 | (interactive "FExport diary data from file: | 918 | (interactive "FExport diary data from file: \n\ |
| 919 | Finto iCalendar file: ") | 919 | Finto iCalendar file: ") |
| 920 | (save-current-buffer | 920 | (save-current-buffer |
| 921 | (set-buffer (find-file diary-filename)) | 921 | (set-buffer (find-file diary-filename)) |
| @@ -1794,7 +1794,7 @@ Argument ICAL-FILENAME output iCalendar file. | |||
| 1794 | Argument DIARY-FILENAME input `diary-file'. | 1794 | Argument DIARY-FILENAME input `diary-file'. |
| 1795 | Optional argument NON-MARKING determines whether events are created as | 1795 | Optional argument NON-MARKING determines whether events are created as |
| 1796 | non-marking or not." | 1796 | non-marking or not." |
| 1797 | (interactive "fImport iCalendar data from file: | 1797 | (interactive "fImport iCalendar data from file: \n\ |
| 1798 | Finto diary file: | 1798 | Finto diary file: |
| 1799 | p") | 1799 | p") |
| 1800 | ;; clean up the diary file | 1800 | ;; clean up the diary file |
diff --git a/lisp/emulation/ws-mode.el b/lisp/emulation/ws-mode.el index aa8d647ec11..0c7be145751 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." | |||
| 716 | 716 | ||
| 717 | (defun ws-query-replace (from to) | 717 | (defun ws-query-replace (from to) |
| 718 | "In WordStar mode: Search string, remember string for repetition." | 718 | "In WordStar mode: Search string, remember string for repetition." |
| 719 | (interactive "sReplace: | 719 | (interactive "sReplace: \n\ |
| 720 | sWith: " ) | 720 | sWith: " ) |
| 721 | (setq ws-search-string from) | 721 | (setq ws-search-string from) |
| 722 | (setq ws-search-direction t) | 722 | (setq ws-search-direction t) |
diff --git a/lisp/sort.el b/lisp/sort.el index d38e475fd39..8cfe69f9458 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 | |||
| 423 | ;; using negative prefix arg to mean "reverse" is now inconsistent with | 423 | ;; using negative prefix arg to mean "reverse" is now inconsistent with |
| 424 | ;; other sort-.*fields functions but then again this was before, since it | 424 | ;; other sort-.*fields functions but then again this was before, since it |
| 425 | ;; didn't use the magnitude of the arg to specify anything. | 425 | ;; didn't use the magnitude of the arg to specify anything. |
| 426 | (interactive "P\nsRegexp specifying records to sort: | 426 | (interactive "P\nsRegexp specifying records to sort: \n\ |
| 427 | sRegexp specifying key within record: \nr") | 427 | sRegexp specifying key within record: \nr") |
| 428 | (cond ((or (equal key-regexp "") (equal key-regexp "\\&")) | 428 | (cond ((or (equal key-regexp "") (equal key-regexp "\\&")) |
| 429 | (setq key-regexp 0)) | 429 | (setq key-regexp 0)) |