diff options
| author | Glenn Morris | 2008-01-16 04:14:45 +0000 |
|---|---|---|
| committer | Glenn Morris | 2008-01-16 04:14:45 +0000 |
| commit | 6b2872c2167f9f47a7f1ef865adcce0c8121ff9d (patch) | |
| tree | 9cf70b90052a73dc792847df2cf0683e2b3e7c28 /lisp | |
| parent | 54648b5c23a37346e89c99e622bc81e7a5f30d3f (diff) | |
| download | emacs-6b2872c2167f9f47a7f1ef865adcce0c8121ff9d.tar.gz emacs-6b2872c2167f9f47a7f1ef865adcce0c8121ff9d.zip | |
Ulf Jasper <ulf.jasper at web.de>
(icalendar-export-file, icalendar-import-file): Restore
significant trailing whitespace in `interactive' prompts.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/calendar/icalendar.el | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0ec33846981..a9e8fa4fbfb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2008-01-16 Ulf Jasper <ulf.jasper@web.de> | ||
| 2 | |||
| 3 | * calendar/icalendar.el (icalendar-export-file) | ||
| 4 | (icalendar-import-file): Restore significant trailing whitespace | ||
| 5 | in `interactive' prompts. | ||
| 6 | |||
| 1 | 2008-01-15 Dan Nicolaescu <dann@ics.uci.edu> | 7 | 2008-01-15 Dan Nicolaescu <dann@ics.uci.edu> |
| 2 | 8 | ||
| 3 | * vc-arch.el (vc-arch-delete-rej-if-obsolete): Remove the | 9 | * vc-arch.el (vc-arch-delete-rej-if-obsolete): Remove the |
| @@ -20,8 +26,6 @@ | |||
| 20 | * progmodes/cc-vars.el (c-hanging-braces-alist): Remove the | 26 | * progmodes/cc-vars.el (c-hanging-braces-alist): Remove the |
| 21 | obscure non-working fragment ":value c-". | 27 | obscure non-working fragment ":value c-". |
| 22 | 28 | ||
| 23 | 2008-01-14 Alan Mackenzie <acm@muc.de> | ||
| 24 | |||
| 25 | * progmodes/cc-engine.el (c-guess-basic-syntax): prevent a macro | 29 | * progmodes/cc-engine.el (c-guess-basic-syntax): prevent a macro |
| 26 | call inside a struct being recognised as a K&R argument. | 30 | call inside a struct being recognised as a K&R argument. |
| 27 | 31 | ||
diff --git a/lisp/calendar/icalendar.el b/lisp/calendar/icalendar.el index a3dc34a2e9b..982934d94f4 100644 --- a/lisp/calendar/icalendar.el +++ b/lisp/calendar/icalendar.el | |||
| @@ -710,7 +710,7 @@ would be \"pm\"." | |||
| 710 | "Export diary file to iCalendar format. | 710 | "Export diary file to iCalendar format. |
| 711 | All diary entries in the file DIARY-FILENAME are converted to iCalendar | 711 | All diary entries in the file DIARY-FILENAME are converted to iCalendar |
| 712 | format. The result is appended to the file ICAL-FILENAME." | 712 | format. The result is appended to the file ICAL-FILENAME." |
| 713 | (interactive "FExport diary data from file: | 713 | (interactive "FExport diary data from file: |
| 714 | Finto iCalendar file: ") | 714 | Finto iCalendar file: ") |
| 715 | (save-current-buffer | 715 | (save-current-buffer |
| 716 | (set-buffer (find-file diary-filename)) | 716 | (set-buffer (find-file diary-filename)) |
| @@ -1454,8 +1454,8 @@ Argument ICAL-FILENAME output iCalendar file. | |||
| 1454 | Argument DIARY-FILENAME input `diary-file'. | 1454 | Argument DIARY-FILENAME input `diary-file'. |
| 1455 | Optional argument NON-MARKING determines whether events are created as | 1455 | Optional argument NON-MARKING determines whether events are created as |
| 1456 | non-marking or not." | 1456 | non-marking or not." |
| 1457 | (interactive "fImport iCalendar data from file: | 1457 | (interactive "fImport iCalendar data from file: |
| 1458 | Finto diary file: | 1458 | Finto diary file: |
| 1459 | p") | 1459 | p") |
| 1460 | ;; clean up the diary file | 1460 | ;; clean up the diary file |
| 1461 | (save-current-buffer | 1461 | (save-current-buffer |