mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-22 13:40:44 -08:00
* lisp/gnus/gnus-group.el (features): Use `dlet`. (gnus-tmp-level, gnus-tmp-marked, gnus-tmp-group): Declare vars. (gnus-group-insert-group-line): Bind dynbound vars via `let` rather than as formal args. Bind `number` as dynbound. (gnus-visual, gnus-score-find-score-files-function) (gnus-home-score-file, gnus-apply-kill-hook) (gnus-summary-expunge-below): Declare vars. (gnus-group-restart, gnus-group-list-plus): Fix `interactive` spec since the arg is unused. * lisp/gnus/mail-source.el (mail-source-bind, mail-source-bind-common): Use `dlet` and suppress the warnings about the non-prefixed dynbound vars. (mail-source-set-1): Remove unused var `auth-info`. (mail-source-call-script): Remove unused var `background`. (mail-source-fetch-pop, mail-source-check-pop): Bind pop3 vars with `dlet`. * lisp/gnus/gnus-int.el (mail-source-plugged, gnus-inhibit-demon): Declare vars. (gnus-server-opened, gnus-status-message) (gnus-open-server, gnus-close-server, gnus-request-list) (gnus-finish-retrieve-group-infos, gnus-retrieve-group-data-early) (gnus-request-list-newsgroups, gnus-request-newgroups) (gnus-request-regenerate, gnus-request-compact, gnus-request-group) (gnus-retrieve-groups, gnus-request-post, gnus-request-expunge-group) (gnus-request-scan, gnus-request-update-info, gnus-request-marks) (gnus-request-accept-article, gnus-request-create-group) (gnus-asynchronous-p, gnus-remove-denial): Bind `gnus-command-method` via `let` rather than as formal args. * lisp/gnus/gnus-topic.el (gnus-topic-insert-topic-line): Pass documented vars to eval for `gnus-topic-line-format-spec`. * lisp/gnus/message.el (message-yank-original): Use `cl-progv` rather than `eval` to bind the vars from `message-cite-style`. * lisp/gnus/mml.el (mml-parse-1): Use `apply` instead of `eval`. (gnus-newsgroup-name, gnus-displaying-mime, gnus-newsgroup-name) (gnus-article-prepare-hook, gnus-newsgroup-charset) (gnus-original-article-buffer, gnus-message-buffer) (message-this-is-news, message-this-is-mail): Declare vars. * lisp/gnus/deuglify.el (gnus-outlook-rearrange-article): Remove unused var `cite-marks`. * lisp/gnus/gnus-art.el (ansi-color-context-region): Declare var. (gnus-mime-display-attachment-buttons-in-header): Move declaration before first use. (gnus-mime-display-alternative): Remove unused var `from`. * lisp/gnus/gnus-bookmark.el (gnus-bookmark-bmenu-list): Remove unused var `start` `end`. * lisp/gnus/gnus-cache.el (gnus-article-decode-hook) (nnml-generate-active-function): Declare var. * lisp/gnus/gnus-cite.el (gnus-message-citation-mode): Remove unused var `keywords`. * lisp/gnus/gnus-cloud.el (gnus-cloud-encode-data): Remove unused var `cipher`. (gnus-cloud-ensure-cloud-group): Remove unused var `method`. * lisp/gnus/gnus-delay.el (gnus-delay-article): Remove unused var `days`. * lisp/gnus/gnus-html.el (gnus-html-wash-images): Remove unused vars `tag`, `string`, and `images`. (gnus-html-wash-tags): Remove unused vars `string` and `images`. * lisp/gnus/gnus-msg.el (gnus-msg-mail): Remove unused var `group-name`. (gnus-group-mail, gnus-group-news, gnus-summary-mail-other-window) (gnus-summary-news-other-window): Remove unused vars `group` and `buffer`. (gnus-configure-posting-styles): Remove unused vars `style` and `attribute`. * lisp/gnus/gnus-picon.el (gnus-picon-find-face): Remove unused vars `database`, `directory`, and `instance`. (gnus-picon-transform-newsgroups): Remove unused var `point`. * lisp/gnus/gnus-range.el (gnus-range-difference): Remove unused var `safe`. * lisp/gnus/gnus-score.el (gnus-score-load-file): Remove unused var `score-fn`. * lisp/gnus/gnus-sum.el (message-options-set-recipient): Declare var. * lisp/gnus/gnus-undo.el (gnus-undo): Fix docstring lie. * lisp/gnus/gnus-util.el (print-string-length) (iswitchb-make-buflist-hook): Declare vars. (gnus-emacs-version): Remove unused var `codename`. (gnus-rename-file): Remove unused vars `old-name` and `new-name`. * lisp/gnus/gnus-uu.el (gnus-uu-yenc-article): Remove unused var `start-char`. (gnus-asynchronous): Declare var. * lisp/gnus/mm-partial.el (gnus-displaying-mime): Declare var. (mm-inline-partial): Remove unused var `buffer`. * lisp/gnus/mm-view.el (w3m-force-redisplay, w3m-safe-url-regexp) (gnus-displaying-mime, gnus-original-article-buffer) (gnus-article-prepare-hook): Declare vars. * lisp/gnus/mml-smime.el (mml-smime-epg-encrypt): Remove unused var `boundary`. (mml-smime-epg-verify): Remove unused vars `plain` and `signature-file`. * lisp/gnus/mml1991.el (pgg-text-mode): Declare var. * lisp/gnus/mml2015.el (pgg-text-mode): Declare var. (mml2015-pgg-decrypt): Remove unused var `result`. (mml2015-epg-key-image-to-string): Remove unused var `error`. (mml2015-epg-decrypt): Remove unused var `result`. (mml2015-epg-verify): Remove unused vars `plain` and `signature-file`. * lisp/gnus/nnbabyl.el (nnml-current-directory): Declare var. * lisp/gnus/nndiary.el (nndiary-files): Move declaration before first use. * lisp/gnus/nnfolder.el (nnfolder-request-accept-article): Remove unused var `buf`. * lisp/gnus/nnmail.el (nnmail-parse-active): Remove unused var `err`. * lisp/gnus/nnmairix.el (nnmairix-request-group): Remove unused var `args`. (nnmairix-request-create-group): Remove unused var `info`. (nnmairix-request-list): Remove unused var `folder`. (nnmairix-request-set-mark): Remove unused var `propto`. (nnmairix-request-set-mark): Remove unused vars `number` and `method`. (nnmairix-close-group): Remove unused var `method`. (nnmairix-create-search-group-from-message): Remove unused var `cq`. (nnmairix-create-server-and-default-group): Remove unused var `create`. (nnmairix-purge-old-groups): Remove unused var `folder`. (nnmairix-remove-tick-mark-original-article, nnmairix-get-valid-servers): Remove unused var `cur`. (nnmairix-replace-group-and-numbers): Remove unused var `header`. (nnmairix-goto-original-article): Remove unused var `rval`. (nnmairix-widget-create-query): Remove unused var `allwidgets`. * lisp/gnus/nnmbox.el (nnml-current-directory): Declare var. * lisp/gnus/nnmh.el (nnmh-toplev): Move declaration before first use. (nnmh-request-list-1): Remove unused var `rdir`. * lisp/gnus/nnml.el (nnml-generate-nov-file): Remove unused var `file`. * lisp/gnus/nnrss.el (nnrss-request-article): Remove unused var `post`. (nnrss-request-article): Remove unused var `fn`. (nnrss-check-group): Remove unused var `rdf-ns`. * lisp/gnus/nnweb.el (nnweb-request-article): Remove unused var `active`. (nnweb-google-parse-1): Remove unused var `Score`. * lisp/gnus/spam-stat.el (spam-stat-error-holder): Remove var. (spam-stat-buffer-words-with-scores): Remove unused var `word`. (spam-stat-score-buffer): Remove unused var `spam-stat-error-holder`. (spam-stat-split-fancy): Use `err` instead of `spam-stat-error-holder`. * lisp/gnus/spam-wash.el (spam-wash): Remove unused var `handle`. * lisp/gnus/spam.el (spam-copy-or-move-routine): Remove unused vars `article` and `mark`. (spam-register-routine): Remove unused var `article`. (spam-log-undo-registration): Remove unused var `found`. (spam-ifile-register-with-ifile): Remove unused var `parameters`. (spam-check-stat): Remove unused vars `category` and `return`. (spam-parse-list): Remove unused var `found`. (spam-filelist-register-routine): Remove unused var `from`.
264 lines
8.5 KiB
EmacsLisp
264 lines
8.5 KiB
EmacsLisp
;;; smiley.el --- displaying smiley faces -*- lexical-binding: t; -*-
|
|
|
|
;; Copyright (C) 2000-2021 Free Software Foundation, Inc.
|
|
|
|
;; Author: Dave Love <fx@gnu.org>
|
|
;; Keywords: news mail multimedia
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
;; GNU Emacs 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.
|
|
|
|
;; GNU Emacs 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 GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
;;; Commentary:
|
|
|
|
;; A re-written, simplified version of Wes Hardaker's XEmacs smiley.el
|
|
;; which might be merged back to smiley.el if we get an assignment for
|
|
;; that. We don't have assignments for the images smiley.el uses, but
|
|
;; I'm not sure we need that degree of rococoness and defaults like a
|
|
;; yellow background. Also, using PBM means we can display the images
|
|
;; more generally. -- fx
|
|
;; `smiley.el' was replaced by `smiley-ems.el' on 2002-01-26 (after fx'
|
|
;; comment).
|
|
|
|
;; Test smileys:
|
|
;; smile ^:-) ^:)
|
|
;; blink ;-) ;)
|
|
;; forced :-]
|
|
;; braindamaged 8-)
|
|
;; indifferent :-|
|
|
;; wry :-/ :-\
|
|
;; sad :-(
|
|
;; frown :-{
|
|
;; evil >:-)
|
|
;; cry ;-(
|
|
;; dead X-)
|
|
;; grin :-D
|
|
;; halo O:-)
|
|
|
|
;;; Code:
|
|
|
|
(require 'nnheader)
|
|
(require 'gnus-art)
|
|
|
|
(defgroup smiley nil
|
|
"Turn :-)'s into real images."
|
|
:group 'gnus-visual)
|
|
|
|
(defvar smiley-data-directory)
|
|
|
|
;; In batch mode, attributes can be unspecified.
|
|
(defcustom smiley-style (if (ignore-errors
|
|
(>= (face-attribute 'default :height) 160))
|
|
'medium
|
|
'low-color)
|
|
"Smiley style."
|
|
:type '(choice (const :tag "small, 3 colors" low-color) ;; 13x14
|
|
(const :tag "medium, ~10 colors" medium) ;; 16x16
|
|
(const :tag "dull, grayscale" grayscale) ;; 14x14
|
|
(const :tag "emoji, full color" emoji))
|
|
:set (lambda (symbol value)
|
|
(set-default symbol value)
|
|
(setq smiley-data-directory (smiley-directory))
|
|
(smiley-update-cache))
|
|
:initialize #'custom-initialize-default
|
|
:version "23.1") ;; No Gnus
|
|
|
|
;; For compatibility, honor the variable `smiley-data-directory' if the user
|
|
;; has set it.
|
|
|
|
(defun smiley-directory (&optional style)
|
|
"Return a the location of the smiley faces files.
|
|
STYLE specifies which style to use, see `smiley-style'. If STYLE
|
|
is nil, use `smiley-style'."
|
|
(unless style (setq style smiley-style))
|
|
(nnheader-find-etc-directory
|
|
(concat "images/smilies"
|
|
(cond ((eq smiley-style 'low-color) "")
|
|
((eq smiley-style 'medium) "/medium")
|
|
((eq smiley-style 'grayscale) "/grayscale")))))
|
|
|
|
(defcustom smiley-data-directory (smiley-directory)
|
|
"Location of the smiley faces files."
|
|
:set (lambda (symbol value)
|
|
(set-default symbol value)
|
|
(smiley-update-cache))
|
|
:initialize #'custom-initialize-default
|
|
:type 'directory)
|
|
|
|
(defcustom smiley-emoji-regexp-alist
|
|
'(("\\(;-)\\)\\W" 1 "😉")
|
|
("[^;]\\(;)\\)\\W" 1 "😉")
|
|
("\\(:-]\\)\\W" 1 "😬")
|
|
("\\(8-)\\)\\W" 1 "🥴")
|
|
("\\(:-|\\)\\W" 1 "😐")
|
|
("\\(:-[/\\]\\)\\W" 1 "😕")
|
|
("\\(:-(\\)\\W" 1 "😠")
|
|
("\\(X-)\\)\\W" 1 "😵") ; 💀
|
|
("\\(:-{\\)\\W" 1 "😦")
|
|
("\\(>:-)\\)\\W" 1 "😈")
|
|
("\\(;-(\\)\\W" 1 "😢")
|
|
("\\(:-D\\)\\W" 1 "😀")
|
|
("\\(O:-)\\)\\W" 1 "😇")
|
|
;; "smile" must be come after "evil"
|
|
("\\(\\^?:-?)\\)\\W" 1 "🙂"))
|
|
"A list of regexps to map smilies to emoji.
|
|
The elements are (REGEXP MATCH EMOJI), where MATCH is the submatch in
|
|
regexp to replace with EMOJI."
|
|
:version "28.1"
|
|
:type '(repeat (list regexp
|
|
(integer :tag "Regexp match number")
|
|
(string :tag "Emoji")))
|
|
:set (lambda (symbol value)
|
|
(set-default symbol value)
|
|
(smiley-update-cache))
|
|
:initialize #'custom-initialize-default)
|
|
|
|
;; The XEmacs version has a baroque, if not rococo, set of these.
|
|
(defcustom smiley-regexp-alist
|
|
'(("\\(;-)\\)\\W" 1 "blink")
|
|
("[^;]\\(;)\\)\\W" 1 "blink")
|
|
("\\(:-]\\)\\W" 1 "forced")
|
|
("\\(8-)\\)\\W" 1 "braindamaged")
|
|
("\\(:-|\\)\\W" 1 "indifferent")
|
|
("\\(:-[/\\]\\)\\W" 1 "wry")
|
|
("\\(:-(\\)\\W" 1 "sad")
|
|
("\\(X-)\\)\\W" 1 "dead")
|
|
("\\(:-{\\)\\W" 1 "frown")
|
|
("\\(>:-)\\)\\W" 1 "evil")
|
|
("\\(;-(\\)\\W" 1 "cry")
|
|
("\\(:-D\\)\\W" 1 "grin")
|
|
;; "smile" must be come after "evil"
|
|
("\\(\\^?:-?)\\)\\W" 1 "smile"))
|
|
"A list of regexps to map smilies to images.
|
|
The elements are (REGEXP MATCH IMAGE), where MATCH is the submatch in
|
|
regexp to replace with IMAGE. IMAGE is the name of an image file in
|
|
`smiley-data-directory'."
|
|
:version "24.1"
|
|
:type '(repeat (list regexp
|
|
(integer :tag "Regexp match number")
|
|
(string :tag "Image name")))
|
|
:set (lambda (symbol value)
|
|
(set-default symbol value)
|
|
(smiley-update-cache))
|
|
:initialize #'custom-initialize-default)
|
|
|
|
(defcustom gnus-smiley-file-types
|
|
(let ((types (list "pbm")))
|
|
(when (gnus-image-type-available-p 'xpm)
|
|
(push "xpm" types))
|
|
(when (gnus-image-type-available-p 'gif)
|
|
(push "gif" types))
|
|
types)
|
|
"List of suffixes on smiley file names to try."
|
|
:version "24.1"
|
|
:type '(repeat string))
|
|
|
|
(defvar smiley-cached-regexp-alist nil)
|
|
|
|
(defun smiley-update-cache ()
|
|
(setq smiley-cached-regexp-alist nil)
|
|
(if (eq smiley-style 'emoji)
|
|
(setq smiley-cached-regexp-alist smiley-emoji-regexp-alist)
|
|
(dolist (elt (if (symbolp smiley-regexp-alist)
|
|
(symbol-value smiley-regexp-alist)
|
|
smiley-regexp-alist))
|
|
(let ((types gnus-smiley-file-types)
|
|
file type)
|
|
(while (and (not file)
|
|
(setq type (pop types)))
|
|
(unless (file-exists-p
|
|
(setq file (expand-file-name (concat (nth 2 elt) "." type)
|
|
smiley-data-directory)))
|
|
(setq file nil)))
|
|
(when type
|
|
(let ((image (gnus-create-image file (intern type) nil
|
|
:ascent 'center)))
|
|
(when image
|
|
(push (list (car elt) (cadr elt) image)
|
|
smiley-cached-regexp-alist))))))))
|
|
|
|
;; Not implemented:
|
|
;; (defvar smiley-mouse-map
|
|
;; (let ((map (make-sparse-keymap)))
|
|
;; (define-key map [down-mouse-2] 'ignore) ; override widget
|
|
;; (define-key map [mouse-2]
|
|
;; 'smiley-mouse-toggle-buffer)
|
|
;; map))
|
|
|
|
;;;###autoload
|
|
(defun smiley-region (start end)
|
|
"Replace in the region `smiley-regexp-alist' matches with corresponding images.
|
|
A list of images is returned."
|
|
(interactive "r")
|
|
(when (display-graphic-p)
|
|
(unless smiley-cached-regexp-alist
|
|
(smiley-update-cache))
|
|
(save-excursion
|
|
(let ((beg (or start (point-min)))
|
|
group image images string)
|
|
(dolist (entry smiley-cached-regexp-alist)
|
|
(setq group (nth 1 entry)
|
|
image (nth 2 entry))
|
|
(goto-char beg)
|
|
(while (re-search-forward (car entry) end t)
|
|
(setq string (match-string group))
|
|
(goto-char (match-end group))
|
|
(delete-region (match-beginning group) (match-end group))
|
|
(when image
|
|
(push image images)
|
|
(gnus-add-wash-type 'smiley)
|
|
(if (symbolp image)
|
|
(progn
|
|
(gnus-add-image 'smiley image)
|
|
(gnus-put-image image string 'smiley))
|
|
;; This is a string, but mark the property for
|
|
;; deletion if the washing method is switched off.
|
|
(insert (propertize string
|
|
'display image
|
|
'gnus-image-category 'smiley))))))
|
|
images))))
|
|
|
|
;;;###autoload
|
|
(defun smiley-buffer (&optional buffer)
|
|
"Run `smiley-region' at the BUFFER, specified in the argument or
|
|
interactively. If there's no argument, do it at the current buffer."
|
|
(interactive "bBuffer to run smiley-region: ")
|
|
(save-excursion
|
|
(if buffer
|
|
(set-buffer (get-buffer buffer)))
|
|
(smiley-region (point-min) (point-max))))
|
|
|
|
(defun smiley-toggle-buffer (&optional arg)
|
|
"Toggle displaying smiley faces in article buffer.
|
|
With arg, turn displaying on if and only if arg is positive."
|
|
(interactive "P")
|
|
(gnus-with-article-buffer
|
|
(if (if (numberp arg)
|
|
(> arg 0)
|
|
(not (memq 'smiley gnus-article-wash-types)))
|
|
(smiley-region (point-min) (point-max))
|
|
(gnus-delete-images 'smiley))))
|
|
|
|
(defun smiley-mouse-toggle-buffer (event)
|
|
"Toggle displaying smiley faces.
|
|
With arg, turn displaying on if and only if arg is positive."
|
|
(interactive "e")
|
|
(save-excursion
|
|
(save-window-excursion
|
|
(mouse-set-point event)
|
|
(smiley-toggle-buffer))))
|
|
|
|
(provide 'smiley)
|
|
|
|
;;; smiley.el ends here
|