branch: elpa/fedi
commit 5782817b06000adec6668cfdd1a4fe38e23359ff
Author: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Commit: marty hiatt <martianhiatus [a t] riseup [d o t] net>
remove traces of mastodon.el in fedi-post.el
---
fedi-post.el | 29 +++++++++++++----------------
1 file changed, 13 insertions(+), 16 deletions(-)
diff --git a/fedi-post.el b/fedi-post.el
index 31bc3a46ee3..daed28ad762 100644
--- a/fedi-post.el
+++ b/fedi-post.el
@@ -10,18 +10,18 @@
;; This file is part of fedi.el.
-;; mastodon.el is free software: you can redistribute it and/or modify
+;; fedi.el is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.
-;; mastodon.el is distributed in the hope that it will be useful,
+;; fedi.el is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with mastodon.el. If not, see <http://www.gnu.org/licenses/>.
+;; along with fedi.el. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
@@ -49,9 +49,7 @@
(defface fedi-post-docs-face
`((t :inherit font-lock-comment-face))
- "Face used for documentation in post compose buffer.
-If `mastodon-tl--enable-proportional-fonts' is changed,
-mastodon.el needs to be re-loaded for this to be correctly set.")
+ "Face used for documentation in post compose buffer.")
(defface fedi-post-success-face
`((t :inherit success))
@@ -60,7 +58,7 @@ mastodon.el needs to be re-loaded for this to be correctly
set.")
(defgroup fedi-post nil
"Posting options for fedi.el."
:prefix "fedi-post-"
- :group 'mastodon)
+ :group 'fedi)
(defcustom fedi-post--enable-completion t
"Whether to enable completion of mentions and hashtags.
@@ -70,9 +68,8 @@ Used for completion in post compose buffer."
(defcustom fedi-post--use-company-for-completion nil
"Whether to enable company for completion.
When non-nil, `company-mode' is enabled in the post compose
-buffer, and mastodon completion backends are added to
+buffer, and fedi or your package's completion backends are added to
`company-capf'.
-
You need to install company yourself to use this."
:type 'boolean)
@@ -161,7 +158,7 @@ CANCEL means the post was not sent, so we save the post
text as a draft."
(fedi-post--restore-previous-window-config prev-window-config)))
(defun fedi-post-cancel ()
- "Kill new-post buffer/window. Does not POST content to Mastodon.
+ "Kill new-post buffer/window. Does not POST content.
If post is not empty, prompt to save text as a draft."
(interactive)
(if (fedi-post--empty-p)
@@ -421,9 +418,9 @@ descriptions."
'post-header t))))
(defun fedi-post--count-post-chars (post-string)
- "Count the characters in POST-STRING.
-URLs always = 23, and domain names of handles are not counted.
-This is how mastodon does it."
+ "Count the characters in POST-STRING."
+ ;; URLs always = 23, and domain names of handles are not counted.
+ ;; This is how mastodon does it."
(with-temp-buffer
(switch-to-buffer (current-buffer))
(insert post-string)
@@ -501,7 +498,7 @@ Added to `after-change-functions'."
'success
(cdr header-region))
(fedi-post--propertize-item fedi-post-handle-regex
- 'mastodon-display-name-face
+ 'warning
(cdr header-region))
(fedi-post--propertize-item fedi-post-url-regex
'link
@@ -607,13 +604,13 @@ font locking to not ruin our docs header."
(point-min)))))
(font-lock-fontify-region end-of-docs (point-max)))))
-;; flyspell ignore masto post regexes:
+;; flyspell ignore our post regexes:
(defvar flyspell-generic-check-word-predicate)
(defun fedi-post-mode-flyspell-verify ()
"A predicate function for `flyspell'.
Only text that is not one of these faces will be spell-checked."
- (let ((faces '(mastodon-display-name-face
+ (let ((faces '(warning
fedi-post-docs-face font-lock-comment-face
success link)))
(unless (eql (point) (point-min))
