From 890a0826f3f68f4476f6ec0b56fe96c6bc047142 Mon Sep 17 00:00:00 2001 From: Thomas Fitzsimmons Date: Fri, 7 Jun 2019 20:43:38 -0400 Subject: Make icalendar-import-buffer not show diary file buffer * lisp/calendar/diary-lib.el (diary-make-entry): Add omit-trailing-space parameter. Add do-not-show parameter to allow not showing diary file buffer. * lisp/calendar/icalendar.el (icalendar--add-diary-entry): Remove workaround to omit trailing space in diary entry. Have diary-make-entry not display the diary file buffer. (Bug#35645) --- lisp/calendar/icalendar.el | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'lisp/calendar/icalendar.el') diff --git a/lisp/calendar/icalendar.el b/lisp/calendar/icalendar.el index a8fd765129e..17316ddbbd0 100644 --- a/lisp/calendar/icalendar.el +++ b/lisp/calendar/icalendar.el @@ -2502,20 +2502,10 @@ the entry." (when summary (setq non-marking (y-or-n-p (format "Make appointment non-marking? ")))) - (save-window-excursion - (unless diary-filename - (setq diary-filename - (read-file-name "Add appointment to this diary file: "))) - ;; Note: diary-make-entry will add a trailing blank char.... :( - (funcall (if (fboundp 'diary-make-entry) - 'diary-make-entry - 'make-diary-entry) - string non-marking diary-filename))) - ;; Würgaround to remove the trailing blank char - (with-current-buffer (find-file diary-filename) - (goto-char (point-max)) - (if (= (char-before) ? ) - (delete-char -1))) + (unless diary-filename + (setq diary-filename + (read-file-name "Add appointment to this diary file: "))) + (diary-make-entry string non-marking diary-filename t t)) ;; return diary-filename in case it has been changed interactively diary-filename) -- cgit v1.2.1