branch: elpa/jabber
commit 55ff3945b9b94dc5a26d6bc9005e39c2e9741b5f
Author: Thanos Apollo <[email protected]>
Commit: Thanos Apollo <[email protected]>
Apply cleanups from Stefan Monnier via emacs-devel.
---
.elpaignore | 2 +-
lisp/jabber-activity.el | 21 ++++++-----------
lisp/jabber-avatar.el | 5 ++---
lisp/jabber-chat.el | 39 +++++++++++---------------------
lisp/jabber-core.el | 3 +--
lisp/jabber-csi.el | 3 +--
lisp/jabber-db.el | 8 +------
lisp/jabber-disco.el | 12 +++++-----
lisp/jabber-httpupload.el | 1 -
lisp/jabber-image.el | 6 ++---
lisp/jabber-iq.el | 3 +--
lisp/jabber-menu.el | 8 +++----
lisp/jabber-modeline.el | 5 ++---
lisp/jabber-muc.el | 5 ++++-
lisp/jabber-receipts.el | 9 +++-----
lisp/jabber-roster.el | 57 ++++++++++++++++-------------------------------
lisp/jabber-sm.el | 12 ++++------
lisp/jabber-styling.el | 26 +++++++++------------
tests/jabber-mam-tests.el | 2 +-
tests/jabber-muc-tests.el | 2 +-
20 files changed, 82 insertions(+), 147 deletions(-)
diff --git a/.elpaignore b/.elpaignore
index 3d0dbe4467..2b29f27645 100644
--- a/.elpaignore
+++ b/.elpaignore
@@ -1 +1 @@
-tests/
\ No newline at end of file
+tests
diff --git a/lisp/jabber-activity.el b/lisp/jabber-activity.el
index d57bc0c583..3f7e3947d6 100644
--- a/lisp/jabber-activity.el
+++ b/lisp/jabber-activity.el
@@ -57,29 +57,25 @@ The default function returns the nick of the user."
"Length of the strings returned by `jabber-activity-make-strings-shorten'.
All strings returned by `jabber-activity-make-strings-shorten' will be
at least this long, when possible."
- :type 'number
- :group 'jabber-activity)
+ :type 'number)
(defcustom jabber-activity-shorten-cutoff 2
"Maximum number of JIDs to display in the mode line.
When non-nil and more JIDs are active than this number, only the
first CUTOFF entries are shown followed by \", +N\"."
:type '(choice (const :tag "No limit" nil)
- (integer :tag "Maximum entries"))
- :group 'jabber-activity)
+ (integer :tag "Maximum entries")))
(defcustom jabber-activity-shorten-aggressively nil
"If non-nil, shorten names more aggressively.
When set, names may use prefixes shorter than
`jabber-activity-shorten-minimum' as long as they remain unique."
- :type 'boolean
- :group 'jabber-activity)
+ :type 'boolean)
(defcustom jabber-activity-muc-prefix "#"
"String prepended to MUC names in the mode line.
Set to an empty string to disable the prefix."
- :type 'string
- :group 'jabber-activity)
+ :type 'string)
(defcustom jabber-activity-make-strings #'jabber-activity-make-strings-shorten
"Function which should return an alist of JID -> string when given a list of
@@ -123,18 +119,15 @@ there are unread messages which otherwise would be lost."
(defface jabber-activity-chat-face
'((t :inherit font-lock-warning-face))
- "Face for 1:1 chat activity in the mode line."
- :group 'jabber-activity)
+ "Face for 1:1 chat activity in the mode line.")
(defface jabber-activity-mention-face
'((t :inherit font-lock-warning-face))
- "Face for personal mentions (MUC highlight) in the mode line."
- :group 'jabber-activity)
+ "Face for personal mentions (MUC highlight) in the mode line.")
(defface jabber-activity-muc-face
'((t :inherit font-lock-keyword-face))
- "Face for MUC (groupchat) activity in the mode line."
- :group 'jabber-activity)
+ "Face for MUC (groupchat) activity in the mode line.")
(define-obsolete-face-alias 'jabber-activity-face
'jabber-activity-chat-face "30.1")
diff --git a/lisp/jabber-avatar.el b/lisp/jabber-avatar.el
index fbd6aac8c3..1eb4cb78d7 100644
--- a/lisp/jabber-avatar.el
+++ b/lisp/jabber-avatar.el
@@ -56,8 +56,7 @@
(defcustom jabber-avatar-cache-directory
(expand-file-name "jabber/avatars" user-emacs-directory)
"Directory to use for cached avatars."
- :type 'directory
- :group 'jabber-avatar)
+ :type 'directory)
(defcustom jabber-avatar-verbose nil
"Display messages about irregularities with other people's avatars."
@@ -209,4 +208,4 @@ AVATAR may be one of:
(provide 'jabber-avatar)
-;;; jabber-avatar.el ends here
\ No newline at end of file
+;;; jabber-avatar.el ends here
diff --git a/lisp/jabber-chat.el b/lisp/jabber-chat.el
index 2d4e07ba0d..8f57a4da30 100644
--- a/lisp/jabber-chat.el
+++ b/lisp/jabber-chat.el
@@ -111,56 +111,45 @@ rare time printed."
(defcustom jabber-chat-display-images t
"When non-nil, fetch and display image URLs inline in chat buffers."
- :type 'boolean
- :group 'jabber-chat)
+ :type 'boolean)
(defface jabber-rare-time-face
'((t :inherit font-lock-comment-face :underline t))
- "Face for displaying rare time information."
- :group 'jabber-chat)
+ "Face for displaying rare time information.")
(defcustom jabber-chat-encrypted-indicator (propertize "[E]" 'face 'shadow)
"String prepended to the timestamp of encrypted messages."
- :type 'string
- :group 'jabber-chat)
+ :type 'string)
(defface jabber-chat-nick-encrypted
'((t :inherit font-lock-constant-face))
- "Face for own nick on encrypted messages."
- :group 'jabber-chat)
+ "Face for own nick on encrypted messages.")
(defface jabber-chat-nick-foreign-encrypted
'((t :inherit font-lock-keyword-face :weight bold))
- "Face for foreign nick on encrypted messages."
- :group 'jabber-chat)
+ "Face for foreign nick on encrypted messages.")
(defface jabber-chat-nick-plaintext
'((t :inherit font-lock-warning-face :slant italic))
- "Face for own nick on plaintext messages."
- :group 'jabber-chat)
+ "Face for own nick on plaintext messages.")
(defface jabber-chat-nick-foreign-plaintext
'((t :inherit font-lock-keyword-face :slant italic))
- "Face for foreign nick on plaintext messages."
- :group 'jabber-chat)
+ "Face for foreign nick on plaintext messages.")
(defface jabber-chat-nick-system
'((t :inherit font-lock-constant-face :weight bold))
- "Face for system and special messages."
- :group 'jabber-chat)
+ "Face for system and special messages.")
(defface jabber-chat-text-local '((t ()))
- "Face used for text you write."
- :group 'jabber-chat)
+ "Face used for text you write.")
(defface jabber-chat-text-foreign '((t ()))
- "Face used for text others write."
- :group 'jabber-chat)
+ "Face used for text others write.")
(defface jabber-chat-error
'((t :inherit error))
- "Face used for error messages."
- :group 'jabber-chat)
+ "Face used for error messages.")
;;;###autoload
(defvar jabber-chatting-with nil
@@ -276,8 +265,7 @@ nil if no backlog has been inserted.")
(defface jabber-muc-presence-dim
'((t :inherit shadow :slant italic))
- "Face for diminished presence notifications."
- :group 'jabber-chat)
+ "Face for diminished presence notifications.")
(defcustom jabber-muc-decorate-presence-patterns-alist
'(("Show enter/leave diminished"
@@ -1359,8 +1347,7 @@ with the created image (or nil) followed by CBARGS."
When nil, use the last download directory from this session or
`default-directory'."
:type '(choice (const :tag "Last used or default-directory" nil)
- (directory :tag "Fixed directory"))
- :group 'jabber-chat)
+ (directory :tag "Fixed directory")))
(defvar jabber-chat-last-download-directory nil
"Last directory used for file downloads this session.")
diff --git a/lisp/jabber-core.el b/lisp/jabber-core.el
index d91f13f950..3be00428a7 100644
--- a/lisp/jabber-core.el
+++ b/lisp/jabber-core.el
@@ -124,8 +124,7 @@ The functions should accept one argument, the connection
object."
:options '(jabber-muc-self-ping-rooms
jabber-mam-maybe-catchup
jabber-muc-self-ping-start
- jabber-whitespace-ping-start)
- :group 'jabber-core)
+ jabber-whitespace-ping-start))
(defcustom jabber-pre-disconnect-hook nil
"*Hooks run just before voluntary disconnection.
diff --git a/lisp/jabber-csi.el b/lisp/jabber-csi.el
index 895fb90f65..d1fd791eb6 100644
--- a/lisp/jabber-csi.el
+++ b/lisp/jabber-csi.el
@@ -41,8 +41,7 @@
(defcustom jabber-csi-enable t
"Send CSI active/inactive notifications to the server."
- :type 'boolean
- :group 'jabber-csi)
+ :type 'boolean)
(defvar jabber-csi--last-state nil
"Last CSI state sent: `active', `inactive', or nil.")
diff --git a/lisp/jabber-db.el b/lisp/jabber-db.el
index ae304b679f..ccf1100e67 100644
--- a/lisp/jabber-db.el
+++ b/lisp/jabber-db.el
@@ -65,18 +65,15 @@
"Path to the SQLite database file for message storage.
Set to nil to disable message storage entirely."
:type '(choice (file :tag "Database file")
- (const :tag "Disabled" nil))
- :group 'jabber-db)
+ (const :tag "Disabled" nil)))
(defcustom jabber-backlog-days nil
"Age limit on messages in chat buffer backlog, in days."
- :group 'jabber-db
:type '(choice (number :tag "Number of days")
(const :tag "No limit" nil)))
(defcustom jabber-backlog-number 30
"Maximum number of messages in chat buffer backlog."
- :group 'jabber-db
:type 'integer)
(defvar jabber-history-inhibit-received-message-functions nil
@@ -927,7 +924,6 @@ TYPE is the message type."
(locate-user-emacs-file "jabber-history" ".emacs-jabber")
"Base directory where per-contact history files are stored.
Used only when `jabber-use-global-history' is nil."
- :group 'jabber-db
:type 'directory)
(defcustom jabber-global-history-filename
@@ -935,7 +931,6 @@ Used only when `jabber-use-global-history' is nil."
".jabber_global_message_log")
"Global file where all messages are logged.
Used when `jabber-use-global-history' is non-nil."
- :group 'jabber-db
:type 'file)
(defcustom jabber-use-global-history
@@ -944,7 +939,6 @@ Used when `jabber-use-global-history' is non-nil."
If non-nil, `jabber-global-history-filename' is used, otherwise,
messages are stored in per-user files under the
`jabber-history-dir' directory."
- :group 'jabber-db
:type 'boolean)
(defun jabber-db-import-history ()
diff --git a/lisp/jabber-disco.el b/lisp/jabber-disco.el
index f760f928e4..eb8db324fc 100644
--- a/lisp/jabber-disco.el
+++ b/lisp/jabber-disco.el
@@ -326,16 +326,14 @@ Return the concatenated sorted identity entries."
(lambda (identity)
(jabber-xml-let-attributes (category type xml:lang name) identity
(concat category "/" type "/" xml:lang "/" name "<")))
- (sort identities #'jabber-caps-identity-<)
- ""))
+ (sort identities #'jabber-caps-identity-<)))
(defun jabber-caps--feature-string (features)
"Build the feature portion of a caps verification string.
FEATURES is a list of feature var strings.
Return the concatenated sorted feature entries."
(mapconcat (lambda (f) (concat f "<"))
- (sort features #'string<)
- ""))
+ (sort features #'string<)))
(defun jabber-caps--form-string (forms)
"Build the XEP-0128 data form portion of a caps verification string.
@@ -362,9 +360,9 @@ Return the concatenated sorted form entries."
#'string<)))
(concat (jabber-xml-get-attribute field 'var) "<"
(mapconcat (lambda (v) (concat (or v "") "<"))
- values "")))))
- fields ""))))
- sorted "")))
+ values)))))
+ fields))))
+ sorted)))
(defun jabber-caps-ver-string (query hash)
"Create an XEP-0115 version string for a QUERY node with a specified HASH."
diff --git a/lisp/jabber-httpupload.el b/lisp/jabber-httpupload.el
index 056fcf03dc..453cdbc62b 100644
--- a/lisp/jabber-httpupload.el
+++ b/lisp/jabber-httpupload.el
@@ -61,7 +61,6 @@
Must accept (FILEPATH HEADERS PUT-URL CALLBACK CALLBACK-ARG
&optional IGNORE-CERT-PROBLEMS) and call (funcall CALLBACK
CALLBACK-ARG) on success. Return non-nil if the upload started."
- :group 'jabber-httpupload
:type 'function)
(defvar jabber-httpupload-pre-upload-transform nil
diff --git a/lisp/jabber-image.el b/lisp/jabber-image.el
index c22f98efb0..562bb6ba1b 100644
--- a/lisp/jabber-image.el
+++ b/lisp/jabber-image.el
@@ -39,13 +39,11 @@
(defcustom jabber-image-max-width 300
"Maximum width in pixels for inline images."
- :type 'integer
- :group 'jabber-image)
+ :type 'integer)
(defcustom jabber-image-max-height 300
"Maximum height in pixels for inline images."
- :type 'integer
- :group 'jabber-image)
+ :type 'integer)
(defun jabber-image--mime-to-type (mime-type)
"Return an image type symbol for MIME-TYPE string, or nil."
diff --git a/lisp/jabber-iq.el b/lisp/jabber-iq.el
index a3de88302d..5b3abe96a1 100644
--- a/lisp/jabber-iq.el
+++ b/lisp/jabber-iq.el
@@ -55,8 +55,7 @@
These fields are available at this moment:
%n JID to browse"
- :type 'string
- :group 'jabber-browse)
+ :type 'string)
;; Global reference declarations
diff --git a/lisp/jabber-menu.el b/lisp/jabber-menu.el
index 06825df600..28ffe58c69 100644
--- a/lisp/jabber-menu.el
+++ b/lisp/jabber-menu.el
@@ -46,9 +46,9 @@
(define-key map
[jabber-menu-status jabber-menu-status-chat]
- '(menu-item
+ `(menu-item
"Chatty"
- (lambda ()
+ ,(lambda ()
(interactive)
(jabber-send-presence "chat"
(jabber-read-with-input-method "status message:
" *jabber-current-status* '*jabber-status-history*)
@@ -57,9 +57,9 @@
(equal *jabber-current-show* "chat")))))
(define-key map
[jabber-menu-status jabber-menu-status-dnd]
- '(menu-item
+ `(menu-item
"Do not Disturb"
- (lambda ()
+ ,(lambda ()
(interactive)
(jabber-send-presence "dnd"
(jabber-read-with-input-method "status message:
" *jabber-current-status* '*jabber-status-history*)
diff --git a/lisp/jabber-modeline.el b/lisp/jabber-modeline.el
index 762a3cc6a7..b737284714 100644
--- a/lisp/jabber-modeline.el
+++ b/lisp/jabber-modeline.el
@@ -38,8 +38,7 @@
(defcustom jabber-modeline-sections '(activity)
"Which sections to show in the mode line.
Available sections: `presence', `contacts', `activity'."
- :type '(set (const presence) (const contacts) (const activity))
- :group 'jabber-mode-line)
+ :type '(set (const presence) (const contacts) (const activity)))
(defvar jabber-mode-line-presence "")
(defvar jabber-mode-line-contacts "")
@@ -208,4 +207,4 @@ With a zero or negative ARG, remove activity."
(provide 'jabber-modeline)
-;;; jabber-modeline.el ends here
\ No newline at end of file
+;;; jabber-modeline.el ends here
diff --git a/lisp/jabber-muc.el b/lisp/jabber-muc.el
index bd6ccf0670..c33bf71240 100644
--- a/lisp/jabber-muc.el
+++ b/lisp/jabber-muc.el
@@ -1317,7 +1317,10 @@ JC is the Jabber connection."
,@(unless (zerop (length reason))
`((reason . ,reason))))))))
-(add-to-list 'jabber-body-printers 'jabber-muc-print-invite)
+;; FIXME: If this file is loaded before `jabber-chat', it will prevent
+;; `jabber-body-printers' to have its default set of functions, because
+;; the var will have been set here already.
+(add-hook 'jabber-body-printers #'jabber-muc-print-invite)
(defun jabber-muc--parse-mediated-invite (xml-data)
"Parse XEP-0045 mediated invite from XML-DATA.
diff --git a/lisp/jabber-receipts.el b/lisp/jabber-receipts.el
index 43d8d243d7..ff8c455a01 100644
--- a/lisp/jabber-receipts.el
+++ b/lisp/jabber-receipts.el
@@ -59,18 +59,15 @@
When non-nil, send <received/> on message delivery and
<displayed/> when a chat buffer becomes visible.
Incoming receipts are always processed regardless of this setting."
- :type 'boolean
- :group 'jabber-receipts)
+ :type 'boolean)
(defface jabber-chat-delivered
'((t :inherit shadow :slant italic))
- "Face for delivery receipt status in header-line."
- :group 'jabber-receipts)
+ "Face for delivery receipt status in header-line.")
(defface jabber-chat-seen
'((t :inherit success :slant italic))
- "Face for seen/displayed status in header-line."
- :group 'jabber-receipts)
+ "Face for seen/displayed status in header-line.")
(defvar-local jabber-chat-receipt-message ""
"Header-line string showing receipt status for current chat.")
diff --git a/lisp/jabber-roster.el b/lisp/jabber-roster.el
index 52f27b5620..1e4885b000 100644
--- a/lisp/jabber-roster.el
+++ b/lisp/jabber-roster.el
@@ -52,8 +52,7 @@ These fields are available:
%r Name of this resource
%s Availability of resource as string (\"Online\", \"Away\" etc)
%S Status string specified by resource."
- :type 'string
- :group 'jabber-roster)
+ :type 'string)
(defcustom jabber-roster-sort-functions
'(jabber-roster-sort-by-status jabber-roster-sort-by-displayname)
@@ -66,14 +65,12 @@ These functions should take two roster items A and B, and
return:
:type 'hook
:options '(jabber-roster-sort-by-status
jabber-roster-sort-by-displayname
- jabber-roster-sort-by-group)
- :group 'jabber-roster)
+ jabber-roster-sort-by-group))
(defcustom jabber-sort-order '("chat" "" "away" "dnd" "xa")
"Sort by status in this order. Anything not in list goes last.
Offline is represented as nil."
- :type '(repeat (restricted-sexp :match-alternatives (stringp nil)))
- :group 'jabber-roster)
+ :type '(repeat (restricted-sexp :match-alternatives (stringp nil))))
(defcustom jabber-show-resources 'sometimes
"Show contacts' resources in roster?
@@ -84,13 +81,11 @@ sometimes Show resources when there are more than one
always Always show resources."
:type '(radio (const :tag "Never" nil)
(const :tag "When more than one connected resource" sometimes)
- (const :tag "Always" always))
- :group 'jabber-roster)
+ (const :tag "Always" always)))
(defcustom jabber-show-offline-contacts t
"Show offline contacts in roster when non-nil."
- :type 'boolean
- :group 'jabber-roster)
+ :type 'boolean)
(defcustom jabber-remove-newlines t
"Remove newlines in status messages?
@@ -99,15 +94,13 @@ they are essential to status message poets. Therefore, you
get to
choose the behaviour.
Trailing newlines are always removed, regardless of this variable."
- :type 'boolean
- :group 'jabber-roster)
+ :type 'boolean)
(defcustom jabber-roster-mode-hook nil
"Hook run when entering Roster mode."
- :type 'hook
- :group 'jabber-roster)
+ :type 'hook)
(defcustom jabber-roster-default-group-name "Ungrouped"
"Default group name for buddies without groups."
@@ -120,63 +113,51 @@ Trailing newlines are always removed, regardless of this
variable."
:set (lambda (var val)
(when (stringp val)
(set-text-properties 0 (length val) nil val))
- (custom-set-default var val))
- :group 'jabber-roster)
+ (custom-set-default var val)))
(defcustom jabber-roster-show-empty-group nil
"Show empty groups in roster?"
- :type 'boolean
- :group 'jabber-roster)
+ :type 'boolean)
(defface jabber-roster-user-online
'((t :inherit success :weight bold))
- "Face for displaying online users."
- :group 'jabber-roster)
+ "Face for displaying online users.")
(defface jabber-roster-user-xa
'((t :inherit shadow :slant italic))
- "Face for displaying extended away users."
- :group 'jabber-roster)
+ "Face for displaying extended away users.")
(defface jabber-roster-user-dnd
'((t :inherit error :weight bold))
- "Face for displaying do not disturb users."
- :group 'jabber-roster)
+ "Face for displaying do not disturb users.")
(defface jabber-roster-user-away
'((t :inherit warning :slant italic))
- "Face for displaying away users."
- :group 'jabber-roster)
+ "Face for displaying away users.")
(defface jabber-roster-user-chatty
'((t :inherit success :weight bold :slant italic))
- "Face for displaying chatty users."
- :group 'jabber-roster)
+ "Face for displaying chatty users.")
(defface jabber-roster-user-error
'((t :inherit error :slant italic))
- "Face for displaying users sending presence errors."
- :group 'jabber-roster)
+ "Face for displaying users sending presence errors.")
(defface jabber-roster-user-offline
'((t :inherit shadow :slant italic))
- "Face for displaying offline users."
- :group 'jabber-roster)
+ "Face for displaying offline users.")
(defface jabber-roster-groupchat
'((t :inherit font-lock-type-face))
- "Face for groupchat room names in the roster buffer."
- :group 'jabber-roster)
+ "Face for groupchat room names in the roster buffer.")
(defface jabber-roster-groupchat-nick
'((t :inherit shadow))
- "Face for the user's nickname in groupchat roster entries."
- :group 'jabber-roster)
+ "Face for the user's nickname in groupchat roster entries.")
(defface jabber-roster-unread
'((t :inherit font-lock-warning-face :weight bold))
- "Face for roster entries with unread messages."
- :group 'jabber-roster)
+ "Face for roster entries with unread messages.")
(defun jabber-roster-separator ()
"Return a propertized separator string for the roster buffer."
diff --git a/lisp/jabber-sm.el b/lisp/jabber-sm.el
index e6a9d8c86f..f4508b3486 100644
--- a/lisp/jabber-sm.el
+++ b/lisp/jabber-sm.el
@@ -58,20 +58,17 @@
(defcustom jabber-sm-enable t
"If non-nil, negotiate Stream Management when the server supports it."
- :type 'boolean
- :group 'jabber-sm)
+ :type 'boolean)
(defcustom jabber-sm-request-interval 30
"Seconds between periodic ack requests."
- :type 'integer
- :group 'jabber-sm)
+ :type 'integer)
(defcustom jabber-sm-ack-interval 50
"Send a proactive ack every this many inbound stanzas.
When nil, only send acks in response to server <r/> requests."
:type '(choice (integer :tag "Stanzas between acks")
- (const :tag "Only on request" nil))
- :group 'jabber-sm)
+ (const :tag "Only on request" nil)))
(defcustom jabber-sm-max-in-flight 40
"Maximum number of unacknowledged outbound stanzas before queuing.
@@ -79,8 +76,7 @@ When the in-flight count reaches this limit, further stanzas
are
queued and drained as the server acknowledges previous ones.
Set to nil to disable back-pressure (send everything immediately)."
:type '(choice (integer :tag "Max unacked stanzas")
- (const :tag "No limit" nil))
- :group 'jabber-sm)
+ (const :tag "No limit" nil)))
;;; Counter arithmetic (handles 2^32 wraparound per XEP-0198 section 5)
diff --git a/lisp/jabber-styling.el b/lisp/jabber-styling.el
index 92d57b9530..5d1364dd81 100644
--- a/lisp/jabber-styling.el
+++ b/lisp/jabber-styling.el
@@ -48,8 +48,7 @@
(defcustom jabber-styling-enable t
"Whether to render XEP-0393 Message Styling in chat buffers."
- :type 'boolean
- :group 'jabber-styling)
+ :type 'boolean)
(defconst jabber-styling-xmlns "urn:xmpp:styling:0"
"XEP-0393 Message Styling namespace.")
@@ -57,28 +56,22 @@
;;; Faces
(defface jabber-styling-bold '((t :inherit bold))
- "Face for *bold* spans."
- :group 'jabber-styling)
+ "Face for *bold* spans.")
(defface jabber-styling-italic '((t :inherit italic))
- "Face for _italic_ spans."
- :group 'jabber-styling)
+ "Face for _italic_ spans.")
(defface jabber-styling-strike '((t :strike-through t))
- "Face for ~strikethrough~ spans."
- :group 'jabber-styling)
+ "Face for ~strikethrough~ spans.")
(defface jabber-styling-pre '((t :inherit font-lock-constant-face))
- "Face for `preformatted` inline spans."
- :group 'jabber-styling)
+ "Face for `preformatted` inline spans.")
(defface jabber-styling-pre-block '((t :inherit font-lock-constant-face))
- "Face for ```preformatted code blocks```."
- :group 'jabber-styling)
+ "Face for ```preformatted code blocks```.")
(defface jabber-styling-quote '((t :inherit shadow))
- "Face for > block quotes."
- :group 'jabber-styling)
+ "Face for > block quotes.")
;;; Pure parsing functions
@@ -314,10 +307,11 @@ applies styling to the inserted region."
(with-eval-after-load "jabber-chat"
(defvar jabber-body-printers)
;; Replace jabber-chat-normal-body with our styling-aware version
+ ;; FIXME: Yuck!
(setq jabber-body-printers
(mapcar (lambda (fn)
- (if (eq fn 'jabber-chat-normal-body)
- 'jabber-styling--body-printer
+ (if (eq fn #'jabber-chat-normal-body)
+ #'jabber-styling--body-printer
fn))
jabber-body-printers)))
diff --git a/tests/jabber-mam-tests.el b/tests/jabber-mam-tests.el
index e4ec8f995e..461abcd91f 100644
--- a/tests/jabber-mam-tests.el
+++ b/tests/jabber-mam-tests.el
@@ -629,7 +629,7 @@ VALUES ('a','b','in','chat','test',1)")
(jabber-mam--syncing '((jc1 . "q1")))
(jabber-mam--completion-callbacks nil)
(jabber-mam--dirty-peers '(("[email protected]" . "chat")))
- (redrawn nil))
+ ) ;; (redrawn nil)
(cl-letf (((symbol-function 'jabber-chat-find-buffer)
(lambda (_peer) nil)))
(jabber-mam--cleanup-all)
diff --git a/tests/jabber-muc-tests.el b/tests/jabber-muc-tests.el
index c64f76d421..72d8546617 100644
--- a/tests/jabber-muc-tests.el
+++ b/tests/jabber-muc-tests.el
@@ -871,7 +871,7 @@ entry with JC=nil."
(jabber-jid-obarray (make-vector 127 0))
(timer-scheduled nil))
(cl-letf (((symbol-function 'run-with-timer)
- (lambda (_secs _repeat fn &rest args)
+ (lambda (_secs _repeat fn &rest _args)
(when (eq fn #'jabber-muc--autojoin-next)
(setq timer-scheduled t))
'fake-timer))
