[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/excorporate b37aecf 51/93: excorporate-diary: Fix perce
From: |
Stefan Monnier |
Subject: |
[elpa] externals/excorporate b37aecf 51/93: excorporate-diary: Fix percent signs in appt |
Date: |
Sun, 29 Nov 2020 15:43:07 -0500 (EST) |
branch: externals/excorporate
commit b37aecf550723a827cf3b8ecbb0ddc2056580134
Author: Thomas Fitzsimmons <fitzsim@fitzsim.org>
Commit: Thomas Fitzsimmons <fitzsim@fitzsim.org>
excorporate-diary: Fix percent signs in appt
* packages/excorporate/excorporate-diary.el
(exco-diary-appt-disp-window): New function.
(excorporate-diary-enable): Set appt-disp-window-function to
exco-diary-appt-disp-window. Warn if appt-disp-window-function is
not appt-disp-window.
(excorporate-diary-disable): Restore appt-disp-window-function
when necessary.
---
excorporate-diary.el | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/excorporate-diary.el b/excorporate-diary.el
index fc9b29c..833df30 100644
--- a/excorporate-diary.el
+++ b/excorporate-diary.el
@@ -123,6 +123,15 @@ initialize for today's date, nil otherwise."
(while (re-search-forward "<EXCO_PERCENT_SIGN>" nil t)
(replace-match "%"))))
+(defun exco-diary-appt-disp-window (min-to-app new-time appt-msg)
+ "Replace Excorporate diary percent signs.
+For MIN-TO-APP, NEW-TIME and APPT-MSG documentation, see
+`appt-disp-window'."
+ (appt-disp-window min-to-app new-time appt-msg)
+ (with-current-buffer (get-buffer-create appt-buffer-name)
+ (let ((inhibit-read-only t))
+ (exco-diary--fix-percent-signs))))
+
(defun exco-diary-insert-meeting (finalize
subject start _end _location
_main-invitees _optional-invitees
@@ -272,6 +281,14 @@ ARGUMENTS are the arguments to `diary-view-entries'."
(add-hook 'diary-list-entries-hook #'diary-sort-entries)
(add-hook 'diary-list-entries-hook #'diary-include-other-diary-files)
(add-hook 'diary-fancy-display-mode-hook #'exco-diary--fix-percent-signs)
+ (unless (eq appt-disp-window-function 'exco-diary-appt-disp-window)
+ (if (eq appt-disp-window-function 'appt-disp-window)
+ ;; exco-diary-appt-disp-window is compatible with
+ ;; appt-disp-window, so override it.
+ (setq appt-disp-window-function 'exco-diary-appt-disp-window)
+ (warn (format (concat "Excorporate diary support needs appt-disp-window"
+ " but appt-disp-window-function is currently %S")
+ appt-disp-window-function))))
(unless (eq diary-display-function 'diary-fancy-display)
(warn (format
(concat "Excorporate diary support needs diary-fancy-display"
@@ -286,6 +303,8 @@ ARGUMENTS are the arguments to `diary-view-entries'."
(advice-remove #'diary #'exco-diary-diary-around)
(advice-remove #'diary-view-entries #'exco-diary-diary-view-entries-override)
(remove-hook 'diary-fancy-display-mode-hook #'exco-diary--fix-percent-signs)
+ (when (eq appt-disp-window-function 'exco-diary-appt-disp-window)
+ (setq appt-disp-window-function 'appt-disp-window))
(with-current-buffer (find-file-noselect diary-file)
(dolist (file (list excorporate-diary-transient-file
excorporate-diary-today-file))
- [elpa] externals/excorporate 52d6067 21/93: excorporate.el: Bump version to 0.7.6, (continued)
- [elpa] externals/excorporate 52d6067 21/93: excorporate.el: Bump version to 0.7.6, Stefan Monnier, 2020/11/29
- [elpa] externals/excorporate 7e855f7 23/93: excorporate.el: Bump soap-client requirement to 3.1.4, Stefan Monnier, 2020/11/29
- [elpa] externals/excorporate a588ff6 27/93: packages/excorporate: Bump version to 0.7.7, Stefan Monnier, 2020/11/29
- [elpa] externals/excorporate 23e514f 33/93: packages/excorporate: Mention appt features in documentation, Stefan Monnier, 2020/11/29
- [elpa] externals/excorporate e788f73 38/93: Advise icalendar--add-diary-entry conditionally, Stefan Monnier, 2020/11/29
- [elpa] externals/excorporate eb2430f 34/93: packages/excorporate: Bump version to 0.8.0, Stefan Monnier, 2020/11/29
- [elpa] externals/excorporate a8ba2d4 30/93: packages/excorporate: Add diary and appt integration, Stefan Monnier, 2020/11/29
- [elpa] externals/excorporate 2e13256 49/93: excorporate-diary: Don't force diary-fancy-display, Stefan Monnier, 2020/11/29
- [elpa] externals/excorporate 556433b 54/93: excorporate: Bump required package versions, Stefan Monnier, 2020/11/29
- [elpa] externals/excorporate ba927b9 52/93: packages/excorporate: Update HTTP debugging steps, Stefan Monnier, 2020/11/29
- [elpa] externals/excorporate b37aecf 51/93: excorporate-diary: Fix percent signs in appt,
Stefan Monnier <=
- [elpa] externals/excorporate 00ef8e7 55/93: excorporate: Update HTTPS proxy and GSSAPI status in manual, Stefan Monnier, 2020/11/29
- [elpa] externals/excorporate fac0fee 56/93: packages/excorporate/excorporate.el: Add an acknowledgment, Stefan Monnier, 2020/11/29
- [elpa] externals/excorporate 0080f33 62/93: Excorporate: Add item identifiers to Org buffer, Stefan Monnier, 2020/11/29
- [elpa] externals/excorporate b228664 69/93: Excorporate: Support replying to meeting requests, Stefan Monnier, 2020/11/29
- [elpa] externals/excorporate cee32a6 65/93: Excorporate: Add support for synchronous operations, Stefan Monnier, 2020/11/29
- [elpa] externals/excorporate 166b417 72/93: Excorporate: Add an organizer resolver function, Stefan Monnier, 2020/11/29
- [elpa] externals/excorporate 936eb4a 61/93: Excorporate: Change identifier format in Org buffer, Stefan Monnier, 2020/11/29
- [elpa] externals/excorporate d43e575 58/93: Excorporate: Add an item iteration macro, Stefan Monnier, 2020/11/29
- [elpa] externals/excorporate 212c8bd 80/93: Excorporate: Rewrite exco-org functions for Org 9.1, Stefan Monnier, 2020/11/29
- [elpa] externals/excorporate 24a625f 86/93: Excorporate: Add an operation arity function, Stefan Monnier, 2020/11/29