branch: elpa/fedi
commit 4ad4eae201d8490ecd1c91031c4e2ba686b815be
Author: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Commit: marty hiatt <martianhiatus [a t] riseup [d o t] net>
compose-buffer: major/minor args
---
fedi-post.el | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/fedi-post.el b/fedi-post.el
index 6ac05dd88d6..9cc6eaba626 100644
--- a/fedi-post.el
+++ b/fedi-post.el
@@ -674,8 +674,7 @@ Added to `after-change-functions'."
;;; COMPOSE BUFFER FUNCTION
-(defun fedi-post--compose-buffer (&optional edit mode prefix
- capf-funs)
+(defun fedi-post--compose-buffer (&optional edit major minor prefix capf-funs)
"Create a new buffer to capture text for a new post.
EDIT means we are editing an existing post, not composing a new one.
MODE is the minor-mode to enable in the buffer."
@@ -689,11 +688,11 @@ MODE is the minor-mode to enable in the buffer."
(previous-window-config (list (current-window-configuration)
(point-marker))))
(switch-to-buffer-other-window buffer)
- (text-mode)
- (or (funcall mode)
+ (if major (funcall major) (text-mode))
+ (or (funcall minor)
(fedi-post-mode t))
(unless buffer-exists
- (fedi-post--display-docs-and-status-fields mode prefix))
+ (fedi-post--display-docs-and-status-fields minor prefix))
;; set up completion:
(when fedi-post--enable-completion
(set (make-local-variable 'completion-at-point-functions)
