mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-15 09:47:20 +00:00
daa4e0120d
* 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`.
263 lines
8.5 KiB
EmacsLisp
263 lines
8.5 KiB
EmacsLisp
;;; gmm-utils.el --- Utility functions for Gnus, Message and MML -*- lexical-binding: t; -*-
|
|
|
|
;; Copyright (C) 2006-2021 Free Software Foundation, Inc.
|
|
|
|
;; Author: Reiner Steib <reiner.steib@gmx.de>
|
|
;; Keywords: news
|
|
|
|
;; 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:
|
|
|
|
;; This library provides self-contained utility functions. The functions are
|
|
;; used in Gnus, Message and MML, but within this library there are no
|
|
;; dependencies on Gnus, Message, or MML.
|
|
|
|
;;; Code:
|
|
|
|
(defgroup gmm nil
|
|
"Utility functions for Gnus, Message and MML."
|
|
:prefix "gmm-"
|
|
:version "22.1" ;; Gnus 5.10.9
|
|
:group 'lisp)
|
|
|
|
;; Helper functions from `gnus-utils.el': gmm-verbose, gmm-message, gmm-error
|
|
|
|
(defcustom gmm-verbose 7
|
|
"Integer that says how verbose gmm should be.
|
|
The higher the number, the more messages will flash to say what
|
|
it did. At zero, it will be totally mute; at five, it will
|
|
display most important messages; and at ten, it will keep on
|
|
jabbering all the time."
|
|
:type 'integer)
|
|
|
|
;;;###autoload
|
|
(defun gmm-regexp-concat (regexp)
|
|
"Potentially concat a list of regexps into a single one.
|
|
The concatenation is done with logical ORs."
|
|
(cond ((null regexp)
|
|
nil)
|
|
((stringp regexp)
|
|
regexp)
|
|
((listp regexp)
|
|
(mapconcat (lambda (elt) (concat "\\(" elt "\\)"))
|
|
regexp
|
|
"\\|"))))
|
|
|
|
;;;###autoload
|
|
(defun gmm-message (level &rest args)
|
|
"If LEVEL is lower than `gmm-verbose' print ARGS using `message'.
|
|
|
|
Guideline for numbers:
|
|
1 - error messages
|
|
3 - non-serious error messages
|
|
5 - messages for things that take a long time
|
|
7 - not very important messages on stuff
|
|
9 - messages inside loops."
|
|
(if (<= level gmm-verbose)
|
|
(apply #'message args)
|
|
;; We have to do this format thingy here even if the result isn't
|
|
;; shown - the return value has to be the same as the return value
|
|
;; from `message'.
|
|
(apply #'format args)))
|
|
|
|
;;;###autoload
|
|
(defun gmm-error (level &rest args)
|
|
"Beep an error if LEVEL is equal to or less than `gmm-verbose'.
|
|
ARGS are passed to `message'."
|
|
(when (<= (floor level) gmm-verbose)
|
|
(apply #'message args)
|
|
(ding)
|
|
(let (duration)
|
|
(when (and (floatp level)
|
|
(not (zerop (setq duration (* 10 (- level (floor level)))))))
|
|
(sit-for duration))))
|
|
nil)
|
|
|
|
;;;###autoload
|
|
(defun gmm-widget-p (symbol)
|
|
"Non-nil if SYMBOL is a widget."
|
|
(get symbol 'widget-type))
|
|
|
|
(autoload 'widget-create-child-value "wid-edit")
|
|
(autoload 'widget-convert "wid-edit")
|
|
(autoload 'widget-default-get "wid-edit")
|
|
|
|
;; Note: The format of `gmm-tool-bar-item' may change if some future Emacs
|
|
;; version will provide customizable tool bar buttons using a different
|
|
;; interface.
|
|
|
|
;; TODO: Extend API so that the "Command" entry can be a function or a plist.
|
|
;; In case of a list it should have the format...
|
|
;;
|
|
;; (:none command-without-modifier
|
|
;; :shift command-with-shift-pressed
|
|
;; :control command-with-ctrl-pressed
|
|
;; :control-shift command-with-control-and-shift-pressed
|
|
;; ;; mouse-2 and mouse-3 can't be used in Emacs yet.
|
|
;; :mouse-2 command-on-mouse-2-press
|
|
;; :mouse-3 command-on-mouse-3-press) ;; typically a menu of related commands
|
|
;;
|
|
;; Combinations of mouse-[23] plus shift and/or control might be overkill.
|
|
;;
|
|
;; Then use (plist-get rs-command :none), (plist-get rs-command :shift)
|
|
|
|
(define-widget 'gmm-tool-bar-item 'lazy
|
|
"Tool bar list item."
|
|
:tag "Tool bar item"
|
|
:type '(choice
|
|
(list :tag "Command and Icon"
|
|
(function :tag "Command")
|
|
(string :tag "Icon file")
|
|
(choice
|
|
(const :tag "Default map" nil)
|
|
;; Note: Usually we need non-nil attributes if map is t.
|
|
(const :tag "No menu" t)
|
|
(sexp :tag "Other map"))
|
|
(plist :inline t :tag "Properties"))
|
|
(list :tag "Separator"
|
|
(const :tag "No command" gmm-ignore)
|
|
(string :tag "Icon file")
|
|
(const :tag "No map")
|
|
(plist :inline t :tag "Properties"))))
|
|
|
|
(define-widget 'gmm-tool-bar-zap-list 'lazy
|
|
"Tool bar zap list."
|
|
:tag "Tool bar zap list"
|
|
:type '(choice (const :tag "Zap all" t)
|
|
(const :tag "Keep all" nil)
|
|
(list
|
|
;; :value
|
|
;; Work around (bug in customize?), see
|
|
;; <news:v9is48jrj1.fsf@marauder.physik.uni-ulm.de>
|
|
;; (new-file open-file dired kill-buffer write-file
|
|
;; print-buffer customize help)
|
|
(set :inline t
|
|
(const new-file)
|
|
(const open-file)
|
|
(const dired)
|
|
(const kill-buffer)
|
|
(const save-buffer)
|
|
(const write-file)
|
|
(const undo)
|
|
(const cut)
|
|
(const copy)
|
|
(const paste)
|
|
(const search-forward)
|
|
(const print-buffer)
|
|
(const customize)
|
|
(const help))
|
|
(repeat :inline t
|
|
:tag "Other"
|
|
(symbol :tag "Icon item")))))
|
|
|
|
(defcustom gmm-tool-bar-style
|
|
(if (and (boundp 'tool-bar-mode)
|
|
tool-bar-mode
|
|
(not (memq (display-visual-class)
|
|
(list 'static-gray 'gray-scale
|
|
'static-color 'pseudo-color))))
|
|
'gnome
|
|
'retro)
|
|
"Preferred tool bar style."
|
|
:type '(choice (const :tag "GNOME style" gnome)
|
|
(const :tag "Retro look" retro)))
|
|
|
|
(defvar tool-bar-map)
|
|
|
|
;;;###autoload
|
|
(defun gmm-tool-bar-from-list (icon-list zap-list default-map)
|
|
"Make a tool bar from ICON-LIST.
|
|
|
|
Within each entry of ICON-LIST, the first element is a menu
|
|
command, the second element is an icon file name and the third
|
|
element is a test function. You can use \\[describe-key]
|
|
<menu-entry> to find out the name of a menu command. The fourth
|
|
and all following elements are passed as the PROPS argument to the
|
|
function `tool-bar-local-item'.
|
|
|
|
If ZAP-LIST is a list, remove those item from the default
|
|
`tool-bar-map'. If it is t, start with a new sparse map. You
|
|
can use \\[describe-key] <icon> to find out the name of an icon
|
|
item. When \\[describe-key] <icon> shows \"<tool-bar> <new-file>
|
|
runs the command find-file\", then use `new-file' in ZAP-LIST.
|
|
|
|
DEFAULT-MAP specifies the default key map for ICON-LIST."
|
|
(let ((map (if (eq zap-list t)
|
|
(make-sparse-keymap)
|
|
(copy-keymap tool-bar-map))))
|
|
(when (listp zap-list)
|
|
;; Zap some items which aren't relevant for this mode and take up space.
|
|
(dolist (key zap-list)
|
|
(define-key map (vector key) nil)))
|
|
(mapc (lambda (el)
|
|
(let ((command (car el))
|
|
(icon (nth 1 el))
|
|
(fmap (or (nth 2 el) default-map))
|
|
(props (cdr (cdr (cdr el)))) )
|
|
;; command may stem from different from-maps:
|
|
(cond ((eq command 'gmm-ignore)
|
|
;; The dummy `gmm-ignore', see `gmm-tool-bar-item'
|
|
;; widget. Suppress tooltip by adding `:enable nil'.
|
|
(if (fboundp 'tool-bar-local-item)
|
|
(apply #'tool-bar-local-item icon nil nil
|
|
map :enable nil props)
|
|
;; (tool-bar-local-item ICON DEF KEY MAP &rest PROPS)
|
|
;; (tool-bar-add-item ICON DEF KEY &rest PROPS)
|
|
(apply #'tool-bar-add-item icon nil nil :enable nil props)))
|
|
((equal fmap t) ;; Not a menu command
|
|
(apply #'tool-bar-local-item
|
|
icon command
|
|
(intern icon) ;; reuse icon or fmap here?
|
|
map props))
|
|
(t ;; A menu command
|
|
(apply #'tool-bar-local-item-from-menu
|
|
;; (apply 'tool-bar-local-item icon def key
|
|
;; tool-bar-map props)
|
|
command icon map (symbol-value fmap)
|
|
props)))
|
|
t))
|
|
(if (symbolp icon-list)
|
|
(symbol-value icon-list)
|
|
icon-list))
|
|
map))
|
|
|
|
(defmacro defun-gmm (name function arg-list &rest body)
|
|
"Create function NAME.
|
|
If FUNCTION exists, then NAME becomes an alias for FUNCTION.
|
|
Otherwise, create function NAME with ARG-LIST and BODY."
|
|
(let ((defined-p (fboundp function)))
|
|
(if defined-p
|
|
`(defalias ',name ',function)
|
|
`(defun ,name ,arg-list ,@body))))
|
|
|
|
(defun gmm-customize-mode (&optional mode)
|
|
"Customize customization group for MODE.
|
|
If mode is nil, use `major-mode' of the current buffer."
|
|
(interactive)
|
|
(customize-group
|
|
(or mode
|
|
(intern (let ((mode (symbol-name major-mode)))
|
|
(string-match "^\\(.+\\)-mode$" mode)
|
|
(match-string 1 mode))))))
|
|
|
|
(define-obsolete-function-alias 'gmm-format-time-string 'format-time-string
|
|
"26.1")
|
|
|
|
(provide 'gmm-utils)
|
|
|
|
;;; gmm-utils.el ends here
|