diff options
| author | Andrea Corallo <akrl@sdf.org> | 2021-02-10 21:56:55 +0100 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2021-02-10 21:56:55 +0100 |
| commit | 2fcb85c3e780f1f2871ce0f300cfaffce9836eb0 (patch) | |
| tree | a8857ccad8bff12080062a3edaad1a55a3eb8171 /lisp/gnus/smiley.el | |
| parent | 1f626e9662d8120acd5a937f847123cc2b8c6e31 (diff) | |
| parent | 6bfdfeed36fab4680c8db90c22da8f6611694186 (diff) | |
| download | emacs-2fcb85c3e780f1f2871ce0f300cfaffce9836eb0.tar.gz emacs-2fcb85c3e780f1f2871ce0f300cfaffce9836eb0.tar.bz2 emacs-2fcb85c3e780f1f2871ce0f300cfaffce9836eb0.zip | |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/gnus/smiley.el')
| -rw-r--r-- | lisp/gnus/smiley.el | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/lisp/gnus/smiley.el b/lisp/gnus/smiley.el index d9e04f3b40c..3ee59479cf5 100644 --- a/lisp/gnus/smiley.el +++ b/lisp/gnus/smiley.el @@ -1,4 +1,4 @@ -;;; smiley.el --- displaying smiley faces +;;; smiley.el --- displaying smiley faces -*- lexical-binding: t; -*- ;; Copyright (C) 2000-2021 Free Software Foundation, Inc. @@ -71,9 +71,8 @@ (set-default symbol value) (setq smiley-data-directory (smiley-directory)) (smiley-update-cache)) - :initialize 'custom-initialize-default - :version "23.1" ;; No Gnus - :group 'smiley) + :initialize #'custom-initialize-default + :version "23.1") ;; No Gnus ;; For compatibility, honor the variable `smiley-data-directory' if the user ;; has set it. @@ -94,9 +93,8 @@ is nil, use `smiley-style'." :set (lambda (symbol value) (set-default symbol value) (smiley-update-cache)) - :initialize 'custom-initialize-default - :type 'directory - :group 'smiley) + :initialize #'custom-initialize-default + :type 'directory) (defcustom smiley-emoji-regexp-alist '(("\\(;-)\\)\\W" 1 "😉") @@ -124,8 +122,7 @@ regexp to replace with EMOJI." :set (lambda (symbol value) (set-default symbol value) (smiley-update-cache)) - :initialize 'custom-initialize-default - :group 'smiley) + :initialize #'custom-initialize-default) ;; The XEmacs version has a baroque, if not rococo, set of these. (defcustom smiley-regexp-alist @@ -154,8 +151,7 @@ regexp to replace with IMAGE. IMAGE is the name of an image file in :set (lambda (symbol value) (set-default symbol value) (smiley-update-cache)) - :initialize 'custom-initialize-default - :group 'smiley) + :initialize #'custom-initialize-default) (defcustom gnus-smiley-file-types (let ((types (list "pbm"))) @@ -166,8 +162,7 @@ regexp to replace with IMAGE. IMAGE is the name of an image file in types) "List of suffixes on smiley file names to try." :version "24.1" - :type '(repeat string) - :group 'smiley) + :type '(repeat string)) (defvar smiley-cached-regexp-alist nil) |