diff options
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 @@ +2008-01-16 Ulf Jasper <ulf.jasper@web.de> + + * calendar/icalendar.el (icalendar-export-file) + (icalendar-import-file): Restore significant trailing whitespace + in `interactive' prompts. + 2008-01-15 Dan Nicolaescu <dann@ics.uci.edu> * vc-arch.el (vc-arch-delete-rej-if-obsolete): Remove the @@ -20,8 +26,6 @@ * progmodes/cc-vars.el (c-hanging-braces-alist): Remove the obscure non-working fragment ":value c-". -2008-01-14 Alan Mackenzie <acm@muc.de> - * progmodes/cc-engine.el (c-guess-basic-syntax): prevent a macro call inside a struct being recognised as a K&R argument. 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\"." "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: Finto iCalendar file: ") (save-current-buffer (set-buffer (find-file diary-filename)) @@ -1454,8 +1454,8 @@ 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: -Finto diary file: + (interactive "fImport iCalendar data from file: +Finto diary file: p") ;; clean up the diary file (save-current-buffer |