mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-24 07:20:37 +00:00
8903106bb7
* lisp/subr.el (if-let*, when-let*, if-let, when-let): Mark if-let and when-let obsolete (bug#73853 and elsewhere). Move docstring text around so that if-let* and when-let* descriptions no longer refer to if-let and when-let. * etc/NEWS: Announce the change. * admin/admin.el (reminder-for-release-blocking-bugs): * doc/misc/erc.texi (display-buffer): * lisp/ansi-color.el (ansi-color-apply) (ansi-color--face-vec-face): * lisp/ansi-osc.el (ansi-osc-apply-on-region) (ansi-osc-hyperlink): * lisp/arc-mode.el (archive-goto-file) (archive-next-file-displayer): * lisp/auth-source-pass.el (auth-source-pass-search) (auth-source-pass--parse-data) (auth-source-pass--find-match-many): * lisp/autorevert.el (auto-revert-notify-rm-watch): * lisp/buff-menu.el (Buffer-menu-unmark-all-buffers) (Buffer-menu-group-by-root): * lisp/calendar/parse-time.el (parse-iso8601-time-string): * lisp/cedet/pulse.el (pulse-tick): * lisp/comint.el (comint--fontify-input-ppss-flush-indirect) (comint--intersect-regions): * lisp/completion-preview.el (completion-preview--try-table) (completion-preview--capf-wrapper, completion-preview--update): * lisp/cus-edit.el (setopt--set) (custom-dirlocals-maybe-update-cons, custom-dirlocals-validate): * lisp/custom.el (load-theme): * lisp/descr-text.el (describe-char): * lisp/desktop.el (desktop--emacs-pid-running-p): * lisp/dired-x.el (menu): * lisp/dired.el (dired-font-lock-keywords) (dired-insert-directory, dired--insert-disk-space, dired-mode): * lisp/dnd.el (dnd-handle-multiple-urls): * lisp/dom.el (dom-remove-attribute): * lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): * lisp/emacs-lisp/bytecomp.el (bytecomp--custom-declare): * lisp/emacs-lisp/comp-common.el (comp-function-type-spec): * lisp/emacs-lisp/comp-cstr.el (comp--all-classes) (comp-cstr-set-range-for-arithm, comp--cstr-union-1-no-mem) (comp-cstr-intersection-no-mem, comp-cstr-fixnum-p) (comp-cstr-type-p): * lisp/emacs-lisp/comp-run.el (comp-subr-trampoline-install) (native--compile-async): * lisp/emacs-lisp/comp.el (comp--get-function-cstr) (comp--function-pure-p, comp--intern-func-in-ctxt) (comp--addr-to-bb-name, comp--emit-assume, comp--maybe-add-vmvar) (comp--add-call-cstr, comp--compute-dominator-tree) (comp--dom-tree-walker, comp--ssa-rename) (comp--function-call-maybe-fold, comp--fwprop-call) (comp--call-optim-func): * lisp/emacs-lisp/edebug.el (edebug-global-prefix) (edebug-remove-instrumentation): * lisp/emacs-lisp/eieio.el (initialize-instance): * lisp/emacs-lisp/ert-x.el (ert-resource-directory): * lisp/emacs-lisp/ert.el (ert--expand-should-1) (ert-test-location, ert-write-junit-test-report) (ert-test--erts-test): * lisp/emacs-lisp/icons.el (icon-complete-spec, icon-string) (icons--create): * lisp/emacs-lisp/lisp-mode.el (lisp--local-defform-body-p): * lisp/emacs-lisp/loaddefs-gen.el (loaddefs-generate--make-autoload) (loaddefs-generate--parse-file): * lisp/emacs-lisp/multisession.el (multisession-edit-mode--revert, multisession-edit-value): * lisp/emacs-lisp/package-vc.el (package-vc--read-archive-data) (package-vc--version, package-vc--clone): * lisp/emacs-lisp/package.el (package--reload-previously-loaded): * lisp/emacs-lisp/pp.el (pp--insert-lisp): * lisp/emacs-lisp/subr-x.el (add-display-text-property): * lisp/emacs-lisp/tabulated-list.el (tabulated-list-print): * lisp/emacs-lisp/timer.el (run-at-time): * lisp/emacs-lisp/vtable.el (vtable-goto-table) (vtable-goto-column, vtable-update-object, vtable--insert-line) (vtable--compute-widths, vtable--make-keymap): * lisp/emacs-lisp/warnings.el (display-warning): * lisp/epa-file.el (epa-file-insert-file-contents): * lisp/epa.el (epa-show-key): * lisp/erc/erc-backend.el (erc--split-line, erc--conceal-prompt) (PRIVMSG, erc--get-isupport-entry): * lisp/erc/erc-button.el (erc-button-add-nickname-buttons) (erc--button-next): * lisp/erc/erc-common.el (erc--find-group): * lisp/erc/erc-fill.el (erc-fill, erc-fill-static) (erc-fill--wrap-escape-hidden-speaker) (erc-fill--wrap-unmerge-on-date-stamp) (erc-fill--wrap-massage-initial-message-post-clear) (erc-fill-wrap, erc-fill--wrap-rejigger-region): * lisp/erc/erc-goodies.el (erc--scrolltobottom-all) (erc--keep-place-indicator-on-window-buffer-change) (keep-place-indicator, erc--keep-place-indicator-adjust-on-clear) (erc-keep-place-move, erc--command-indicator-display): * lisp/erc/erc-ibuffer.el (erc-members): * lisp/erc/erc-join.el (erc-join--remove-requested-channel) (erc-autojoin--join): * lisp/erc/erc-networks.el (erc-networks--id-qualifying-init-parts, erc-networks--id-reload) (erc-networks--id-ensure-comparable) (erc-networks--reclaim-orphaned-target-buffers) (erc-networks--server-select): * lisp/erc/erc-nicks.el (erc-nicks-invert) (erc-nicks--redirect-face-widget-link, erc-nicks--highlight) (erc-nicks--highlight-button) (erc-nicks--list-faces-help-button-action, erc-nicks-list-faces) (erc-nicks-refresh, erc-nicks--colors-from-faces) (erc-nicks--track-prioritize) (erc-nicks--remember-face-for-track): * lisp/erc/erc-notify.el (querypoll, erc--querypoll-get-next) (erc--querypoll-on-352, erc--querypoll-send): * lisp/erc/erc-sasl.el (erc-sasl--read-password): * lisp/erc/erc-services.el (erc-services-issue-ghost-and-retry-nick): * lisp/erc/erc-speedbar.el (erc-speedbar--ensure, nickbar) (erc-speedbar-toggle-nicknames-window-lock) (erc-speedbar--compose-nicks-face): * lisp/erc/erc-stamp.el (erc-stamp--recover-on-reconnect) (erc-stamp-prefix-log-filter, erc--conceal-prompt) (erc--insert-timestamp-left, erc-insert-timestamp-right) (erc-stamp--defer-date-insertion-on-post-modify) (erc-insert-timestamp-left-and-right) (erc-stamp--redo-right-stamp-post-clear) (erc-stamp--reset-on-clear, erc-stamp--dedupe-date-stamps): * lisp/erc/erc-status-sidebar.el (bufbar) (erc-status-sidebar-prefer-target-as-name) (erc-status-sidebar-default-allsort, erc-status-sidebar-click): * lisp/erc/erc-track.el (erc-track--shortened-names-get) (erc-track--setup, erc-track--select-mode-line-face) (erc-track-modified-channels, erc-track--collect-faces-in) (erc-track--switch-buffer, erc-track--replace-killed-buffer): * lisp/erc/erc-truncate.el (erc-truncate--setup) (erc-truncate-buffer): * lisp/erc/erc.el (erc--ensure-query-member) (erc--ensure-query-members, erc--remove-channel-users-but) (erc--cusr-change-status, erc--find-mode, erc--update-modules) (erc-log-irc-protocol, erc--refresh-prompt) (erc--restore-important-text-props) (erc--order-text-properties-from-hash, erc-send-input-line) (erc-cmd-IGNORE, erc--unignore-user, erc-cmd-QUERY) (erc-cmd-BANLIST, erc--speakerize-nick) (erc--format-speaker-input-message, erc-channel-receive-names) (erc-send-current-line, erc-format-target-and/or-network) (erc-kill-buffer-function, erc-restore-text-properties) (erc--get-eq-comparable-cmd): * lisp/eshell/em-alias.el (eshell-maybe-replace-by-alias--which) (eshell-maybe-replace-by-alias): * lisp/eshell/em-glob.el (eshell-glob-convert): * lisp/eshell/em-pred.el (eshell-pred-user-or-group) (eshell-pred-file-time, eshell-pred-file-type) (eshell-pred-file-mode, eshell-pred-file-links) (eshell-pred-file-size): * lisp/eshell/em-prompt.el (eshell-forward-paragraph) (eshell-next-prompt): * lisp/eshell/esh-arg.el (eshell-resolve-current-argument): * lisp/eshell/esh-cmd.el (eshell-do-eval, eshell/which) (eshell-plain-command--which, eshell-plain-command): * lisp/eshell/esh-io.el (eshell-duplicate-handles) (eshell-protect-handles, eshell-get-target, eshell-close-target): * lisp/eshell/esh-proc.el (eshell-sentinel): * lisp/eshell/esh-var.el (eshell-parse-variable-ref) (eshell-get-variable, eshell-set-variable): * lisp/faces.el (face-at-point): * lisp/ffap.el (ffap-in-project): * lisp/filenotify.el (file-notify--rm-descriptor): * lisp/files-x.el (read-dir-locals-file) (connection-local-update-profile-variables) (connection-local-value): * lisp/files.el (file-remote-p, abbreviate-file-name) (set-auto-mode, hack-local-variables) (revert-buffer-restore-read-only): * lisp/find-dired.el (find-dired-sort-by-filename): * lisp/font-lock.el (font-lock--filter-keywords): * lisp/gnus/gnus-art.el (article-emojize-symbols): * lisp/gnus/gnus-int.el (gnus-close-server): * lisp/gnus/gnus-search.el (gnus-search-transform) (gnus-search-indexed-parse-output, gnus-search-server-to-engine): * lisp/gnus/gnus-sum.el (gnus-collect-urls, gnus-shorten-url): * lisp/gnus/gnus.el (gnus-check-backend-function): * lisp/gnus/message.el (message-send-mail): * lisp/gnus/mml.el (mml-generate-mime, mml-insert-mime-headers): * lisp/gnus/nnatom.el (nnatom--read-feed, nnatom--read-article) (nnatom--read-article-or-group-authors, nnatom--read-publish) (nnatom--read-update, nnatom--read-links): * lisp/gnus/nnfeed.el (nnfeed--read-server, nnfeed--write-server) (nnfeed--parse-feed, nnfeed--group-data, nnfeed-retrieve-article) (nnfeed-retrieve-headers, nnfeed--print-part) (nnfeed-request-article, nnfeed-request-group) (nnfeed-request-list, nnfeed--group-description) (nnfeed-request-group-description) (nnfeed-request-list-newsgroups, nnfeed-request-rename-group): * lisp/gnus/nnmh.el (nnmh-update-gnus-unreads): * lisp/help-fns.el (help-find-source) (help-fns--insert-menu-bindings, help-fns--mention-first-release) (help-fns--mention-shortdoc-groups) (help-fns--customize-variable-version) (help-fns--face-custom-version-info, describe-mode): * lisp/help-mode.el (help-make-xrefs): * lisp/help.el (help-key-description, help--describe-command): * lisp/hfy-cmap.el (htmlfontify-load-rgb-file): * lisp/ibuf-ext.el (ibuffer-jump-to-filter-group) (ibuffer-kill-filter-group, ibuffer-kill-line) (ibuffer-save-filter-groups, ibuffer-save-filters, filename) (basename, file-extension, ibuffer-diff-buffer-with-file-1) (ibuffer-mark-by-file-name-regexp) (ibuffer-mark-by-content-regexp): * lisp/ibuf-macs.el (ibuffer-aif, ibuffer-awhen): * lisp/ibuffer.el (ibuffer-mouse-toggle-mark) (ibuffer-toggle-marks, ibuffer-mark-interactive) (ibuffer-compile-format, process, ibuffer-map-lines): * lisp/image.el (image--compute-map) (image--compute-original-map): * lisp/image/exif.el (exif-parse-buffer): * lisp/image/image-converter.el (image-convert-p, image-convert) (image-converter--find-converter): * lisp/image/image-dired-util.el (image-dired-file-name-at-point): * lisp/image/image-dired.el (image-dired-track-original-file) (image-dired--on-file-in-dired-buffer) (image-dired--with-thumbnail-buffer) (image-dired-jump-original-dired-buffer) (image-dired--slideshow-step, image-dired-display-image): * lisp/image/wallpaper.el (wallpaper--init-action-kill) (wallpaper--find-setter, wallpaper--find-command) (wallpaper--find-command-args, wallpaper--x-monitor-name): * lisp/info-look.el (info-lookup-interactive-arguments) (info-complete)::(:mode): * lisp/info.el (info-pop-to-buffer, Info-read-node-name-1): * lisp/international/emoji.el (emoji--adjust-displayable-1) (emoji--add-recent): * lisp/jsonrpc.el (jsonrpc--call-deferred) (jsonrpc--process-sentinel, jsonrpc--remove): * lisp/keymap.el (keymap-local-lookup): * lisp/mail/emacsbug.el (report-emacs-bug-hook) (submit-emacs-patch): * lisp/mail/ietf-drums.el (ietf-drums-parse-addresses): * lisp/mail/mailclient.el (mailclient-send-it): * lisp/mail/rfc6068.el (rfc6068-parse-mailto-url): * lisp/mail/undigest.el (rmail-digest-parse-mixed-mime): * lisp/minibuffer.el (completion-metadata-get) (completions--after-change) (minibuffer-visible-completions--filter): * lisp/net/browse-url.el (browse-url-url-at-point) (browse-url-file-url, browse-url-emacs): * lisp/net/dbus.el (dbus-byte-array-to-string) (dbus-monitor-goto-serial): * lisp/net/dictionary.el (dictionary-search): * lisp/net/eww.el (eww--download-directory) (eww-auto-rename-buffer, eww-open-in-new-buffer, eww-submit) (eww-follow-link, eww-read-alternate-url) (eww-copy-alternate-url): * lisp/net/goto-addr.el (goto-address-at-point): * lisp/net/mailcap.el (mailcap-mime-info): * lisp/net/rcirc.el (rcirc, rcirc-connect, rcirc-send-string) (rcirc-kill-buffer-hook, rcirc-print, rcirc-when) (rcirc-color-attributes, rcirc-handler-NICK) (rcirc-handler-TAGMSG, rcirc-handler-BATCH): * lisp/net/shr.el (shr-descend, shr-adaptive-fill-function) (shr-correct-dom-case, shr-tag-a): * lisp/net/sieve.el (sieve-manage-quit): * lisp/outline.el (outline-cycle-buffer): * lisp/pcmpl-git.el (pcmpl-git--tracked-file-predicate): * lisp/proced.el (proced-auto-update-timer): * lisp/progmodes/bug-reference.el (bug-reference-try-setup-from-vc): * lisp/progmodes/c-ts-common.el (c-ts-common--fill-paragraph): * lisp/progmodes/c-ts-mode.el (c-ts-mode--preproc-offset) (c-ts-mode--anchor-prev-sibling, c-ts-mode-indent-defun): * lisp/progmodes/compile.el (compilation-error-properties) (compilation-find-file-1): * lisp/progmodes/eglot.el (eglot--check-object) (eglot--read-server, eglot-upgrade-eglot) (eglot-handle-notification, eglot--CompletionParams) (eglot-completion-at-point, eglot--sig-info) (eglot-register-capability): * lisp/progmodes/elisp-mode.el (emacs-lisp-native-compile-and-load) (elisp-eldoc-var-docstring-with-value): * lisp/progmodes/erts-mode.el (erts-mode--goto-start-of-test): * lisp/progmodes/flymake.el (flymake--update-eol-overlays) (flymake-eldoc-function): * lisp/progmodes/gdb-mi.el (gdb-breakpoints-list-handler-custom) (gdb-frame-handler): * lisp/progmodes/go-ts-mode.el (go-ts-mode-docstring) (go-ts-mode--comment-on-previous-line-p) (go-ts-mode--get-test-regexp-at-point) (go-ts-mode-test-this-file): * lisp/progmodes/grep.el (lgrep, rgrep-default-command) (grep-file-at-point): * lisp/progmodes/perl-mode.el (perl--end-of-format-p): * lisp/progmodes/php-ts-mode.el (php-ts-mode--anchor-prev-sibling, php-ts-mode--indent-defun): * lisp/progmodes/project.el (project--other-place-command) (project--find-default-from, project--transplant-file-name) (project-prefixed-buffer-name, project--remove-from-project-list) (project-prompt-project-name, project-remember-projects-under) (project--switch-project-command) (project-uniquify-dirname-transform, project-mode-line-format): * lisp/progmodes/python.el (python-font-lock-keywords-maximum-decoration) (python--treesit-fontify-union-types) (python-shell-get-process-name, python-shell-restart) (python-shell-completion-at-point, python-ffap-module-path) (python-util-comint-end-of-output-p, python--import-sources) (python-add-import, python-remove-import, python-fix-imports): * lisp/progmodes/xref.el (xref--add-log-current-defun): * lisp/repeat.el (repeat-echo-message-string): * lisp/saveplace.el (save-place-dired-hook): * lisp/server.el (server-save-buffers-kill-terminal): * lisp/shadowfile.el (shadow-make-fullname) (shadow-contract-file-name, shadow-define-literal-group): * lisp/shell.el (shell-highlight-undef-mode): * lisp/simple.el (command-completion-using-modes-p) (command-execute, file-user-uid, file-group-gid) (first-completion, last-completion, switch-to-completions): * lisp/startup.el (startup--load-user-init-file): * lisp/tab-line.el (tab-line-tabs-buffer-group-by-project): * lisp/tar-mode.el (tar-goto-file, tar-next-file-displayer): * lisp/term/android-win.el (android-encode-select-string) (gui-backend-set-selection): * lisp/term/haiku-win.el (haiku-dnd-convert-string) (haiku-select-encode-xstring, haiku-select-encode-utf-8-string): * lisp/textmodes/emacs-news-mode.el (emacs-news--buttonize): * lisp/textmodes/ispell.el (ispell-completion-at-point): * lisp/textmodes/sgml-mode.el (sgml-validate) (html-mode--complete-at-point): * lisp/textmodes/tex-mode.el (tex-recenter-output-buffer) (xref-backend-references): * lisp/thingatpt.el (thing-at-point-file-at-point) (thing-at-point-face-at-point): * lisp/thread.el (thread-list--get-status): * lisp/time.el (world-clock-copy-time-as-kill, world-clock): * lisp/touch-screen.el (touch-screen-handle-touch): * lisp/treesit.el (treesit-language-at, treesit-node-at) (treesit-node-on, treesit-buffer-root-node) (treesit-node-field-name, treesit-local-parsers-at) (treesit-local-parsers-on, treesit--cleanup-local-range-overlays) (treesit-font-lock-recompute-features) (treesit-font-lock-fontify-region, treesit-transpose-sexps) (treesit-add-log-current-defun, treesit-major-mode-setup) (treesit--explorer-refresh, treesit-install-language-grammar): * lisp/url/url.el (url-retrieve-synchronously): * lisp/vc/smerge-mode.el (smerge-diff): * lisp/vc/vc-dir.el (vc-dir): * lisp/vc/vc-dispatcher.el (vc-do-async-command): * lisp/vc/vc-git.el (vc-git-dir--branch-headers) (vc-git-dir--stash-headers, vc-git--log-edit-summary-check) (vc-git-stash-list): * lisp/vc/vc.el (vc-responsible-backend, vc-buffer-sync-fileset) (vc-clone): * lisp/visual-wrap.el (visual-wrap--apply-to-line): * lisp/wid-edit.el (widget-text) (widget-editable-list-insert-before): * lisp/window-tool-bar.el (window-tool-bar--keymap-entry-to-string): * lisp/window.el (display-buffer, display-buffer-full-frame) (window-point-context-set, window-point-context-use) (window-point-context-use-default-function): * lisp/xdg.el (xdg-current-desktop): * lisp/xwidget.el (xwidget-webkit-callback): * lisp/yank-media.el (yank-media--get-selection) (yank-media-types): * test/lisp/comint-tests.el (comint-tests/test-password-function): * test/lisp/completion-preview-tests.el (completion-preview-tests--capf): * test/lisp/cus-edit-tests.el (with-cus-edit-test): * test/lisp/erc/erc-scenarios-base-local-modules.el (-phony-sblm-): * test/lisp/erc/erc-scenarios-stamp.el (erc-scenarios-stamp--on-post-modify): * test/lisp/erc/erc-services-tests.el (erc-services-tests--asp-parse-entry): * test/lisp/erc/erc-tests.el (erc-modules--internal-property) (erc--find-mode, erc-tests--update-modules): * test/lisp/erc/resources/erc-d/erc-d-i.el (erc-d-i--parse-message): * test/lisp/erc/resources/erc-d/erc-d-t.el (erc-d-t-kill-related-buffers, erc-d-t-with-cleanup): * test/lisp/erc/resources/erc-d/erc-d-tests.el (erc-d-i--parse-message--irc-parser-tests): * test/lisp/erc/resources/erc-d/erc-d-u.el (erc-d-u--read-exchange-slowly): * test/lisp/erc/resources/erc-d/erc-d.el (erc-d--expire) (erc-d--finalize-done, erc-d--command-handle-all): * test/lisp/erc/resources/erc-scenarios-common.el (erc-scenarios-common-with-cleanup): * test/lisp/erc/resources/erc-tests-common.el (erc-tests--common-display-message) (erc-tests-common-create-subprocess): * test/lisp/ibuffer-tests.el (ibuffer-test-Bug25058): * test/lisp/international/mule-tests.el (mule-cmds-tests--ucs-names-missing-names): * test/lisp/progmodes/python-tests.el (python-tests-get-shell-interpreter) (python-tests--get-interpreter-info): * test/lisp/progmodes/ruby-ts-mode-tests.el (ruby-ts-resource-file): * test/lisp/replace-tests.el (replace-tests-with-undo): * test/src/emacs-tests.el (emacs-tests--seccomp-debug): * test/src/process-tests.el (process-tests--emacs-command) (process-tests--emacs-binary, process-tests--dump-file): * test/src/treesit-tests.el (treesit--ert-test-defun-navigation): Replace use of the now-obsolete if-let and when-let.
686 lines
27 KiB
EmacsLisp
686 lines
27 KiB
EmacsLisp
;;; erc-speedbar.el --- Speedbar support for ERC -*- lexical-binding: t; -*-
|
|
|
|
;; Copyright (C) 2001-2004, 2006-2024 Free Software Foundation, Inc.
|
|
|
|
;; Author: Mario Lang <mlang@delysid.org>
|
|
;; Contributor: Eric M. Ludlam <zappo@gnu.org>
|
|
;; Maintainer: Amin Bandali <bandali@gnu.org>, F. Jason Park <jp@neverwas.me>
|
|
;; URL: https://www.emacswiki.org/emacs/ErcSpeedbar
|
|
|
|
;; 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 module provides integration of ERC into the Speedbar.
|
|
|
|
;;; TODO / ideas:
|
|
|
|
;; * Write intelligent update function:
|
|
;; update-channel, update-nick, remove-nick-from-channel, ...
|
|
;; * Use indicator-strings for op/voice
|
|
;; * Extract/convert face notes field from bbdb if available
|
|
;; * Write tests that run in a term-mode subprocess
|
|
;;
|
|
;;; Code:
|
|
|
|
(require 'erc)
|
|
(require 'erc-goodies)
|
|
(require 'erc-button)
|
|
(require 'speedbar)
|
|
|
|
;;; Customization:
|
|
|
|
(defgroup erc-speedbar nil
|
|
"Speedbar integration for ERC.
|
|
To open an ERC-flavored speedbar in a separate frame, run the
|
|
command `erc-speedbar-browser'. To use a window-based proxy
|
|
instead, run \\[erc-nickbar-mode] in a connected ERC buffer or
|
|
put `nickbar' in `erc-modules' before connecting. See Info
|
|
node `(speedbar) Top' for more about the underlying integration."
|
|
:group 'erc)
|
|
|
|
(defcustom erc-speedbar-nicknames-window-width 18
|
|
"Default width of the nicknames sidebar (in columns)."
|
|
:package-version '(ERC . "5.6")
|
|
:type 'integer)
|
|
|
|
(defcustom erc-speedbar-sort-users-type 'activity
|
|
"How channel nicknames are sorted.
|
|
|
|
`activity' - Sort users by channel activity
|
|
`alphabetical' - Sort users alphabetically
|
|
nil - Do not sort users"
|
|
:type '(choice (const :tag "Sort users by channel activity" activity)
|
|
(const :tag "Sort users alphabetically" alphabetical)
|
|
(const :tag "Do not sort users" nil)))
|
|
|
|
(defcustom erc-speedbar-hide-mode-topic 'headerline
|
|
"Hide mode and topic lines."
|
|
:package-version '(ERC . "5.6")
|
|
:type '(choice (const :tag "Always show" nil)
|
|
(const :tag "Always hide" t)
|
|
(const :tag "Omit when headerline visible" headerline)))
|
|
|
|
(defcustom erc-speedbar-my-nick-face t
|
|
"A face to use for your nickname.
|
|
When the value is t, ERC uses `erc-current-nick-face' if
|
|
`erc-match' has been loaded and `erc-my-nick-face' otherwise.
|
|
When using the `nicks' module, you can see your nick as it
|
|
appears to others by coordinating with the option
|
|
`erc-nicks-skip-faces'."
|
|
:package-version '(ERC . "5.6")
|
|
:type '(choice face (const :tag "Current nick or own speaker face" t)))
|
|
|
|
(defvar erc-speedbar-key-map nil
|
|
"Keymap used when in erc display mode.")
|
|
|
|
(defun erc-install-speedbar-variables ()
|
|
"Install those variables used by speedbar to enhance ERC."
|
|
(if erc-speedbar-key-map
|
|
nil
|
|
(setq erc-speedbar-key-map (speedbar-make-specialized-keymap))
|
|
|
|
;; Basic tree features
|
|
(define-key erc-speedbar-key-map "e" #'speedbar-edit-line)
|
|
(define-key erc-speedbar-key-map "\C-m" #'speedbar-edit-line)
|
|
(define-key erc-speedbar-key-map "+" #'speedbar-expand-line)
|
|
(define-key erc-speedbar-key-map "=" #'speedbar-expand-line)
|
|
(define-key erc-speedbar-key-map "-" #'speedbar-contract-line))
|
|
|
|
(speedbar-add-expansion-list '("ERC" erc-speedbar-menu-items
|
|
erc-speedbar-key-map
|
|
erc-speedbar-server-buttons))
|
|
(speedbar-add-mode-functions-list
|
|
'("ERC" (speedbar-item-info . erc-speedbar-item-info))))
|
|
|
|
(defvar erc-speedbar-menu-items
|
|
'(["Goto buffer" speedbar-edit-line t]
|
|
["Expand Node" speedbar-expand-line
|
|
(save-excursion (beginning-of-line)
|
|
(looking-at "[0-9]+: *.\\+. "))]
|
|
["Contract Node" speedbar-contract-line
|
|
(save-excursion (beginning-of-line)
|
|
(looking-at "[0-9]+: *.-. "))])
|
|
"Additional menu-items to add to speedbar frame.")
|
|
|
|
;;; ERC hierarchy display method
|
|
;;;###autoload
|
|
(defun erc-speedbar-browser ()
|
|
"Initialize speedbar to display an ERC browser.
|
|
This will add a speedbar major display mode."
|
|
(interactive)
|
|
(require 'speedbar)
|
|
(erc-install-speedbar-variables)
|
|
;; Make sure that speedbar is active
|
|
(speedbar-frame-mode 1)
|
|
;; Now, throw us into Info mode on speedbar.
|
|
(speedbar-change-initial-expansion-list "ERC")
|
|
(speedbar-get-focus))
|
|
|
|
(defun erc-speedbar-buttons (buffer)
|
|
"Create buttons for speedbar in BUFFER."
|
|
(erase-buffer)
|
|
(let (serverp chanp queryp queries-current-p)
|
|
(with-current-buffer buffer
|
|
;; The function `dframe-help-echo' checks the default value of
|
|
;; `dframe-help-echo-function' when deciding whether to visit
|
|
;; the buffer and fire the callback. This works in normal
|
|
;; speedbar frames because the event handler runs in the
|
|
;; `window-buffer' of the active frame. But in our hacked
|
|
;; version, where the frame is hidden, `speedbar-item-info'
|
|
;; never runs without this workaround.
|
|
(setq-local dframe-help-echo-function #'ignore)
|
|
(setq serverp (erc--server-buffer-p))
|
|
(setq chanp (erc-channel-p (erc-default-target)))
|
|
(setq queryp (erc-query-buffer-p)
|
|
queries-current-p (erc--queries-current-p)))
|
|
(defvar erc-nickbar-mode)
|
|
(cond ((and erc-nickbar-mode (null (get-buffer-window speedbar-buffer)))
|
|
(run-at-time 0 nil #'erc-nickbar-mode -1))
|
|
(serverp
|
|
(erc-speedbar-channel-buttons nil 0 buffer))
|
|
((or chanp (and queryp queries-current-p))
|
|
(erc-speedbar-insert-target buffer 0)
|
|
(forward-line -1)
|
|
(erc-speedbar-expand-channel "+" buffer 0))
|
|
(queryp
|
|
(erc-speedbar-insert-target buffer 0))
|
|
(t (ignore)))))
|
|
|
|
(defun erc-speedbar-server-buttons (_directory depth)
|
|
"Insert the initial list of servers you are connected to."
|
|
(let ((servers (erc-buffer-list
|
|
(lambda ()
|
|
(eq (current-buffer)
|
|
(process-buffer erc-server-process))))))
|
|
(when servers
|
|
(speedbar-with-writable
|
|
(dolist (server servers)
|
|
(speedbar-make-tag-line
|
|
'bracket ?+ 'erc-speedbar-expand-server server
|
|
(buffer-name server) 'erc-speedbar-goto-buffer server nil
|
|
depth))
|
|
t))))
|
|
|
|
(defun erc-speedbar-expand-server (text server indent)
|
|
(cond ((string-search "+" text)
|
|
(speedbar-change-expand-button-char ?-)
|
|
(if (speedbar-with-writable
|
|
(save-excursion
|
|
(end-of-line) (forward-char 1)
|
|
(erc-speedbar-channel-buttons nil (1+ indent) server)))
|
|
(speedbar-change-expand-button-char ?-)
|
|
(speedbar-change-expand-button-char ??)))
|
|
(;; we have to contract this node
|
|
(string-search "-" text)
|
|
(speedbar-change-expand-button-char ?+)
|
|
(speedbar-delete-subblock indent))
|
|
(t (error "Ooops... not sure what to do")))
|
|
(speedbar-center-buffer-smartly))
|
|
|
|
(defun erc-speedbar-channel-buttons (_directory depth server-buffer)
|
|
(when (get-buffer server-buffer)
|
|
(let* ((proc (with-current-buffer server-buffer erc-server-process))
|
|
(targets (erc-buffer-list
|
|
(lambda ()
|
|
(not (eq (process-buffer erc-server-process)
|
|
(current-buffer))))
|
|
proc)))
|
|
(when targets
|
|
(speedbar-with-writable
|
|
(dolist (target targets)
|
|
(erc-speedbar-insert-target target depth))
|
|
t)))))
|
|
|
|
(defun erc-speedbar-insert-target (buffer depth)
|
|
(if (with-current-buffer buffer
|
|
(or (erc--target-channel-p erc--target) (erc--queries-current-p)))
|
|
(progn
|
|
(speedbar-make-tag-line
|
|
'bracket ?+ 'erc-speedbar-expand-channel buffer
|
|
(erc--target-string (buffer-local-value 'erc--target buffer))
|
|
'erc-speedbar-goto-buffer buffer nil
|
|
depth)
|
|
(save-excursion
|
|
(forward-line -1)
|
|
(let ((table (buffer-local-value 'erc-channel-users buffer)))
|
|
(speedbar-add-indicator (format "(%d)" (hash-table-count table)))
|
|
(rx "(" (+ (any "0-9")) ")"))))
|
|
;; Query target
|
|
(cl-assert (erc-query-buffer-p buffer))
|
|
(speedbar-make-tag-line
|
|
'bracket ?? nil nil
|
|
(buffer-name buffer) 'erc-speedbar-goto-buffer buffer nil
|
|
depth)))
|
|
|
|
(defconst erc-speedbar--fmt-sentinel (gensym "erc-speedbar-")
|
|
"Symbol for identifying a nonstandard `speedbar-token' text property.
|
|
When encountered, ERC assumes the value's tail contains
|
|
`format'-compatible args.")
|
|
|
|
(defun erc-speedbar-expand-channel (text channel indent)
|
|
"For the line matching TEXT, in CHANNEL, expand or contract a line.
|
|
INDENT is the current indentation level."
|
|
(cond
|
|
((string-search "+" text)
|
|
(speedbar-change-expand-button-char ?-)
|
|
(speedbar-with-writable
|
|
(save-excursion
|
|
(end-of-line) (forward-char 1)
|
|
(let ((modes (buffer-local-value 'erc--mode-line-mode-string channel))
|
|
(topic (erc-controls-interpret
|
|
(with-current-buffer channel erc-channel-topic))))
|
|
(when modes
|
|
(speedbar-make-tag-line
|
|
'angle ?m nil (list erc-speedbar--fmt-sentinel "Mode: %s" modes)
|
|
modes nil nil 'erc-notice-face (1+ indent)))
|
|
(unless (string= topic "")
|
|
(speedbar-make-tag-line
|
|
'angle ?t nil (list erc-speedbar--fmt-sentinel "Topic: %s" topic)
|
|
topic nil nil 'erc-notice-face
|
|
(1+ indent)))
|
|
(unless (pcase erc-speedbar-hide-mode-topic
|
|
('nil 'show)
|
|
('headerline (null erc-header-line-format)))
|
|
(save-excursion
|
|
(goto-char (point-max))
|
|
(forward-line (if (string= topic "") -1 -2))
|
|
(put-text-property (pos-bol) (point-max) 'invisible t)))
|
|
(let ((names (cond ((eq erc-speedbar-sort-users-type 'alphabetical)
|
|
(erc-sort-channel-users-alphabetically
|
|
(with-current-buffer channel
|
|
(erc-get-channel-user-list))))
|
|
((eq erc-speedbar-sort-users-type 'activity)
|
|
(erc-sort-channel-users-by-activity
|
|
(with-current-buffer channel
|
|
(erc-get-channel-user-list))))
|
|
(t (with-current-buffer channel
|
|
(erc-get-channel-user-list))))))
|
|
(when names
|
|
(speedbar-with-writable
|
|
(dolist (entry names)
|
|
(erc-speedbar-insert-user entry ?+ (1+ indent) channel)))))))))
|
|
((string-search "-" text)
|
|
(speedbar-change-expand-button-char ?+)
|
|
(speedbar-delete-subblock indent))
|
|
(t (error "Ooops... not sure what to do")))
|
|
(speedbar-center-buffer-smartly))
|
|
|
|
(defvar erc-speedbar--nick-face-function #'erc-speedbar--highlight-self-and-ops
|
|
"Function called when finding a face for fontifying nicks.
|
|
Called with the proposed nick, the `erc-server-user', and the
|
|
`erc-channel-user'. Should return any valid face, possibly
|
|
composed or anonymous, or nil.")
|
|
|
|
(defun erc-speedbar--highlight-self-and-ops (buffer user cuser)
|
|
"Highlight own nick and op'd users in the speedbar."
|
|
(with-current-buffer buffer
|
|
(if (erc-current-nick-p (erc-server-user-nickname user))
|
|
(pcase erc-speedbar-my-nick-face
|
|
('t (if (facep 'erc-current-nick-face)
|
|
'erc-current-nick-face
|
|
'erc-my-nick-face))
|
|
(v v))
|
|
(or (and cuser (not (zerop (erc-channel-user-status cuser)))
|
|
erc-button-nickname-face)
|
|
'erc-default-face))))
|
|
|
|
(defun erc-speedbar--on-click (nick sbtoken _indent)
|
|
;; 0: finger, 1: name, 2: info, 3: buffer-name
|
|
(with-current-buffer (nth 3 sbtoken)
|
|
(erc-nick-popup (string-trim-left nick "[~&@%+]+"))))
|
|
|
|
(defun erc-speedbar-insert-user (entry exp-char indent &optional buffer)
|
|
"Insert one user based on the channel member list ENTRY.
|
|
Expect EXP-CHAR to be the expansion character to use, INDENT the
|
|
current indentation level, and BUFFER the associated channel or
|
|
query buffer. Set the `speedbar-function' text property to
|
|
`erc-speedbar--on-click', which is called with the formatted
|
|
nick, a so-called \"token\", and the indent level. The token is
|
|
a list of four items: the userhost, the GECOS, the current
|
|
`erc-server-user' info slot, and the associated buffer."
|
|
(let* ((user (car entry))
|
|
(cuser (cdr entry))
|
|
(nick (erc-server-user-nickname user))
|
|
(host (erc-server-user-host user))
|
|
(info (erc-server-user-info user))
|
|
(login (erc-server-user-login user))
|
|
(name (erc-server-user-full-name user))
|
|
(nick-str (concat (with-current-buffer (or buffer (current-buffer))
|
|
(erc-get-channel-membership-prefix cuser))
|
|
nick))
|
|
(finger (concat login (when (or login host) "@") host))
|
|
(sbtoken (list finger name info (buffer-name buffer))))
|
|
(if (or login host name info) ; we want to be expandable
|
|
(speedbar-make-tag-line
|
|
'bracket ?+ 'erc-speedbar-expand-user sbtoken
|
|
nick-str #'erc-speedbar--on-click sbtoken
|
|
(funcall erc-speedbar--nick-face-function buffer user cuser)
|
|
indent)
|
|
(when (equal exp-char ?-)
|
|
(forward-line -1)
|
|
(erc-speedbar-expand-user "+" (list finger name info) indent))
|
|
(speedbar-make-tag-line
|
|
'statictag ?? nil nil
|
|
nick-str nil nil nil
|
|
indent))))
|
|
|
|
(defun erc-speedbar-update-channel (buffer)
|
|
"Update the speedbar information about a ERC buffer.
|
|
The update is only done when the channel is actually expanded already."
|
|
;; This is only a rude hack and doesn't care about multiserver usage
|
|
;; yet, consider this a brain storming, better ideas?
|
|
(with-current-buffer speedbar-buffer
|
|
(save-excursion
|
|
(goto-char (point-min))
|
|
(when (re-search-forward (concat "^1: *.+. *"
|
|
(regexp-quote (buffer-name buffer)))
|
|
nil t)
|
|
(beginning-of-line)
|
|
(speedbar-delete-subblock 1)
|
|
(erc-speedbar-expand-channel "+" buffer 1)))))
|
|
|
|
(defun erc-speedbar-expand-user (text token indent)
|
|
(cond ((string-search "+" text)
|
|
(speedbar-change-expand-button-char ?-)
|
|
(speedbar-with-writable
|
|
(save-excursion
|
|
(end-of-line) (forward-char 1)
|
|
(let ((finger (nth 0 token))
|
|
(name (nth 1 token))
|
|
(info (nth 2 token)))
|
|
(when finger
|
|
(speedbar-make-tag-line
|
|
nil nil nil nil
|
|
finger nil nil nil
|
|
(1+ indent)))
|
|
(when name
|
|
(speedbar-make-tag-line
|
|
nil nil nil nil
|
|
name nil nil nil
|
|
(1+ indent)))
|
|
(when info
|
|
(speedbar-make-tag-line
|
|
nil nil nil nil
|
|
info nil nil nil
|
|
(1+ indent)))))))
|
|
((string-search "-" text)
|
|
(speedbar-change-expand-button-char ?+)
|
|
(speedbar-delete-subblock indent))
|
|
(t (error "Ooops... not sure what to do")))
|
|
(speedbar-center-buffer-smartly))
|
|
|
|
(defun erc-speedbar-goto-buffer (_text buffer _indent)
|
|
"When user clicks on TEXT, goto an ERC buffer.
|
|
The INDENT level is ignored."
|
|
(if (featurep 'dframe)
|
|
(progn
|
|
(dframe-select-attached-frame speedbar-frame)
|
|
(let ((bwin (get-buffer-window buffer 0)))
|
|
(if bwin
|
|
(progn
|
|
(select-window bwin)
|
|
(raise-frame (window-frame bwin)))
|
|
(if dframe-power-click
|
|
(let ((pop-up-frames t))
|
|
(select-window (display-buffer buffer)))
|
|
(dframe-select-attached-frame speedbar-frame)
|
|
(switch-to-buffer buffer)))))
|
|
(let ((bwin (get-buffer-window buffer 0)))
|
|
(if bwin
|
|
(progn
|
|
(select-window bwin)
|
|
(raise-frame (window-frame bwin)))
|
|
(if speedbar-power-click
|
|
(let ((pop-up-frames t)) (select-window (display-buffer buffer)))
|
|
(dframe-select-attached-frame speedbar-frame)
|
|
(switch-to-buffer buffer))))))
|
|
|
|
(defun erc-speedbar-line-text ()
|
|
"Return the text for the item on the current line."
|
|
(beginning-of-line)
|
|
(when (re-search-forward "[]>] " nil t)
|
|
(buffer-substring-no-properties (point) (line-end-position))))
|
|
|
|
(defun erc-speedbar-item-info ()
|
|
"Display information about the current buffer on the current line."
|
|
(let ((data (speedbar-line-token))
|
|
(txt (erc-speedbar-line-text)))
|
|
(cond ((and data (listp data))
|
|
(message "%s: %s" txt (car data)))
|
|
((bufferp data)
|
|
(message "Channel: %s" txt))
|
|
;; Print help if line has a non-standard ([-+?=]) button
|
|
;; char and a `speedbar-token' property with a known CAR.
|
|
((and-let* ((p (text-property-not-all (pos-bol) (pos-eol)
|
|
'speedbar-token nil))
|
|
(v (get-text-property p 'speedbar-token))
|
|
((eq erc-speedbar--fmt-sentinel (car v))))
|
|
(apply #'message (cdr v))))
|
|
(t
|
|
(message "%s" txt)))))
|
|
|
|
|
|
;;;; Status-sidebar integration
|
|
|
|
(defvar erc-track-mode)
|
|
(defvar erc-track--switch-fallback-blockers)
|
|
(defvar erc-status-sidebar-buffer-name)
|
|
(declare-function erc-status-sidebar-set-window-preserve-size
|
|
"erc-status-sidebar" nil)
|
|
|
|
(defvar erc-speedbar--buffer-options
|
|
'((speedbar-update-flag . t)
|
|
(speedbar-use-images . nil)
|
|
(speedbar-hide-button-brackets-flag . t)))
|
|
|
|
(defvar erc-speedbar--hidden-speedbar-frame nil
|
|
"The original `speedbar-frame', which `erc-nickbar-mode' deletes.
|
|
It keeps a reference to it in order to run upstream teardown
|
|
procedures without having to create a dummy frame for that
|
|
purpose.")
|
|
|
|
(defun erc-speedbar--emulate-sidebar-set-window-preserve-size ()
|
|
(let ((erc-status-sidebar-buffer-name (buffer-name speedbar-buffer))
|
|
(display-buffer-overriding-action
|
|
`(display-buffer-in-side-window
|
|
. ((side . right)
|
|
(window-width . ,erc-speedbar-nicknames-window-width)))))
|
|
(erc-status-sidebar-set-window-preserve-size)))
|
|
|
|
(defun erc-speedbar--status-sidebar-mode--unhook ()
|
|
"Remove hooks installed by `erc-status-sidebar-mode'."
|
|
(remove-hook 'window-configuration-change-hook
|
|
#'erc-speedbar--emulate-sidebar-set-window-preserve-size))
|
|
|
|
(defun erc-speedbar--emulate-sidebar ()
|
|
"Perform local setup for `erc-nickbar-mode' in a new `speedbar-buffer'."
|
|
(require 'erc-status-sidebar)
|
|
(cl-assert speedbar-frame)
|
|
(cl-assert (eq speedbar-buffer (current-buffer)))
|
|
(cl-assert (eq speedbar-frame (selected-frame)))
|
|
(setq erc-speedbar--hidden-speedbar-frame speedbar-frame
|
|
;; In Emacs 27, this is not `local-variable-if-set-p'.
|
|
dframe-controlled #'erc-speedbar--dframe-controlled)
|
|
(add-hook 'window-configuration-change-hook
|
|
#'erc-speedbar--emulate-sidebar-set-window-preserve-size nil t)
|
|
(add-hook 'kill-buffer-hook
|
|
#'erc-speedbar--status-sidebar-mode--unhook nil t)
|
|
(with-current-buffer speedbar-buffer
|
|
(pcase-dolist (`(,var . ,val) erc-speedbar--buffer-options)
|
|
(set (make-local-variable var) val)))
|
|
(when (memq 'nicks erc-modules)
|
|
(with-current-buffer speedbar-buffer
|
|
(add-function :around (local 'erc-speedbar--nick-face-function)
|
|
#'erc-speedbar--compose-nicks-face))))
|
|
|
|
(defun erc-speedbar--handle-delete-frame (event)
|
|
"Disable the nickbar if EVENT is deleting the proxy frame."
|
|
(when (and speedbar-frame
|
|
(cdr (frame-list))
|
|
(pcase event
|
|
(`(delete-frame (,frame)) (eq frame speedbar-frame))))
|
|
(erc-nickbar-mode -1)))
|
|
|
|
(defun erc-speedbar--ensure (&optional forcep)
|
|
"Perform common setup for `erc-nickbar-mode'.
|
|
Without FORCEP, return early when the calling context isn't
|
|
associated with an ERC session."
|
|
(save-excursion
|
|
(when (or (erc-server-buffer) forcep)
|
|
(when erc-track-mode
|
|
(cl-pushnew '(derived-mode . speedbar-mode)
|
|
erc-track--switch-fallback-blockers :test #'equal))
|
|
(unless speedbar-update-flag
|
|
(erc-button--display-error-notice-with-keys
|
|
(erc-server-buffer)
|
|
"Module `nickbar' needs `speedbar-update-flag' to be non-nil"
|
|
(and (not (display-graphic-p)) " in text terminals")
|
|
". Setting to t for the current Emacs session."
|
|
" Customize it permanently to avoid this message.")
|
|
(setq speedbar-update-flag t))
|
|
(when-let* (((null speedbar-buffer))
|
|
(speedbar-frame-parameters (backquote-list*
|
|
'(visibility . nil)
|
|
'(no-other-frame . t)
|
|
speedbar-frame-parameters))
|
|
(speedbar-after-create-hook #'erc-speedbar--emulate-sidebar)
|
|
(original-frame (selected-frame)))
|
|
(erc-install-speedbar-variables)
|
|
;; Run before toggling mode to prevent timer from being
|
|
;; created twice.
|
|
(speedbar-change-initial-expansion-list "ERC")
|
|
(speedbar-frame-mode 1)
|
|
;; The setup steps below can't go in the "create hook" because
|
|
;; the frame with `window-main-window' will be raised and
|
|
;; steal focus if you switch away from Emacs in the meantime.
|
|
(let ((frame speedbar-frame))
|
|
(cl-assert (not (eq speedbar-frame original-frame)))
|
|
(select-frame (setq speedbar-frame original-frame))
|
|
(delete-frame frame))
|
|
;; Allow deleting (our) `speedbar-frame' with the mouse.
|
|
(with-current-buffer speedbar-buffer
|
|
(kill-local-variable 'dframe-delete-frame-function)
|
|
(setq dframe-delete-frame-function
|
|
#'erc-speedbar--handle-delete-frame)))
|
|
(with-selected-frame speedbar-frame
|
|
(erc-speedbar--emulate-sidebar-set-window-preserve-size)
|
|
(erc-speedbar-toggle-nicknames-window-lock -1))
|
|
(cl-assert (null (cdr (erc-speedbar--get-timers))))
|
|
(with-current-buffer speedbar-buffer
|
|
(setq speedbar-update-flag t)
|
|
(speedbar-set-mode-line-format)))))
|
|
|
|
(defvar erc-speedbar--force-update-interval-secs 5
|
|
"Speedbar update period.")
|
|
|
|
(defvar-local erc-speedbar--last-ran nil
|
|
"When non-nil, a Lisp timestamp updated when the speedbar timer runs.")
|
|
|
|
(defun erc-speedbar--prod-dframe-timer (&rest _)
|
|
"Refresh speedbar if dormant for `erc-speedbar--force-update-interval-secs'."
|
|
(when (buffer-live-p speedbar-buffer)
|
|
(with-current-buffer speedbar-buffer
|
|
(when
|
|
(and dframe-timer
|
|
(or (null erc-speedbar--last-ran)
|
|
(time-less-p erc-speedbar--last-ran
|
|
(time-subtract
|
|
(current-time)
|
|
erc-speedbar--force-update-interval-secs))))
|
|
(run-at-time 0 nil #'dframe-timer-fn))))
|
|
nil)
|
|
|
|
(defun erc-speedbar--reset-last-ran-on-timer ()
|
|
"Reset `erc-speedbar--last-ran'."
|
|
(when speedbar-buffer
|
|
(with-current-buffer speedbar-buffer
|
|
(setq erc-speedbar--last-ran (current-time)))))
|
|
|
|
;;;###autoload(autoload 'erc-nickbar-mode "erc-speedbar" nil t)
|
|
(define-erc-module nickbar nil
|
|
"Show nicknames for current target buffer in a side window.
|
|
When enabling, create a speedbar session if one doesn't exist and
|
|
show its buffer in an `erc-status-sidebar' window instead of a
|
|
separate frame. If ERC doesn't yet have any live connections,
|
|
defer activation until such time. This means the variable
|
|
`erc-nickbar-mode' may be t even though no actual speedbar yet
|
|
exists. When disabling, destroy the speedbar session.
|
|
|
|
For controlling whether the speedbar window is selectable with
|
|
`other-window', see `erc-nickbar-toggle-nicknames-window-lock'."
|
|
((add-hook 'erc--setup-buffer-hook #'erc-speedbar--ensure)
|
|
(add-hook 'speedbar-timer-hook #'erc-speedbar--reset-last-ran-on-timer)
|
|
(add-hook 'erc-insert-post-hook #'erc-speedbar--prod-dframe-timer)
|
|
(add-hook 'erc-server-PONG-functions #'erc-speedbar--prod-dframe-timer)
|
|
(erc-speedbar--ensure)
|
|
(unless (or erc--updating-modules-p
|
|
(and speedbar-buffer
|
|
(eq speedbar-frame
|
|
(window-frame (get-buffer-window speedbar-buffer t)))))
|
|
(when-let* ((buf (or (and (derived-mode-p 'erc-mode) (current-buffer))
|
|
(car (erc-buffer-filter #'erc--server-buffer-p)))))
|
|
(with-current-buffer buf
|
|
(erc-speedbar--ensure 'forcep)))))
|
|
((remove-hook 'erc--setup-buffer-hook #'erc-speedbar--ensure)
|
|
(remove-hook 'speedbar-timer-hook #'erc-speedbar--reset-last-ran-on-timer)
|
|
(remove-hook 'erc-insert-post-hook #'erc-speedbar--prod-dframe-timer)
|
|
(remove-hook 'erc-server-PONG-functions #'erc-speedbar--prod-dframe-timer)
|
|
(when erc-track-mode
|
|
(setq erc-track--switch-fallback-blockers
|
|
(remove '(derived-mode . speedbar-mode)
|
|
erc-track--switch-fallback-blockers)))
|
|
;; `speedbar-buffer' may be nil if the mode was never enabled, such
|
|
;; as when disabling the module through Customize after startup.
|
|
(when speedbar-buffer
|
|
;; Close associated windows and stop updating but leave timer.
|
|
(dolist (window (get-buffer-window-list speedbar-buffer nil t))
|
|
(unless (frame-root-window-p window)
|
|
(when erc-speedbar--hidden-speedbar-frame
|
|
(cl-assert (not (eq (window-frame window)
|
|
erc-speedbar--hidden-speedbar-frame))))
|
|
(delete-window window)))
|
|
(with-current-buffer speedbar-buffer
|
|
(setq speedbar-update-flag nil)
|
|
(speedbar-set-mode-line-format)
|
|
(unless (eq erc--module-toggle-prefix-arg most-negative-fixnum)
|
|
(dframe-close-frame))))))
|
|
|
|
(defun erc-speedbar--get-timers ()
|
|
(cl-remove #'dframe-timer-fn timer-idle-list
|
|
:key #'timer--function
|
|
:test-not #'eq))
|
|
|
|
(defun erc-speedbar--dframe-controlled (arg)
|
|
(when speedbar-buffer
|
|
(cl-assert (eq speedbar-buffer (current-buffer))))
|
|
(when (and erc-speedbar--hidden-speedbar-frame (numberp arg) (< arg 0))
|
|
(when erc-nickbar-mode
|
|
(erc-nickbar-mode most-negative-fixnum))
|
|
(setq speedbar-frame erc-speedbar--hidden-speedbar-frame
|
|
erc-speedbar--hidden-speedbar-frame nil)
|
|
(speedbar-frame-mode arg) ; -1
|
|
;; As of Emacs 29, `dframe-set-timer' can't remove `dframe-timer'.
|
|
(cl-assert (= 1 (length (erc-speedbar--get-timers))) t)
|
|
(cancel-function-timers #'dframe-timer-fn)
|
|
;; `dframe-close-frame' kills the buffer but no function in
|
|
;; erc-speedbar.el resets this to nil.
|
|
(setq erc-speedbar--hidden-speedbar-frame nil
|
|
speedbar-buffer nil
|
|
speedbar-frame nil)))
|
|
|
|
(defun erc-speedbar-toggle-nicknames-window-lock (arg)
|
|
"Toggle whether nicknames window is selectable with \\[other-window].
|
|
When ARG is a number, lock the window if non-negative. Otherwise,
|
|
unlock the window."
|
|
(interactive "P")
|
|
(unless erc-nickbar-mode
|
|
(user-error "`erc-nickbar-mode' inactive"))
|
|
(when-let* ((window (get-buffer-window speedbar-buffer)))
|
|
(let ((val (cond ((natnump arg) t)
|
|
((integerp arg) nil)
|
|
(t (not (erc-compat--window-no-other-p window))))))
|
|
(with-current-buffer speedbar-buffer
|
|
(setq cursor-type (not val)))
|
|
(set-window-parameter window 'no-other-window val)
|
|
(unless (numberp arg)
|
|
(message "nick-window: %s" (if val "protected" "selectable"))))))
|
|
|
|
(defalias 'erc-nickbar-toggle-nicknames-window-lock
|
|
#'erc-speedbar-toggle-nicknames-window-lock)
|
|
|
|
;;;; Nicks integration
|
|
|
|
(declare-function erc-nicks--highlight "erc-nicks" (nickname &optional face))
|
|
|
|
(defun erc-speedbar--compose-nicks-face (orig buffer user cuser)
|
|
(require 'erc-nicks)
|
|
(let ((rv (funcall orig buffer user cuser)))
|
|
(if-let* ((nick (erc-server-user-nickname user))
|
|
(face (with-current-buffer buffer
|
|
(erc-nicks--highlight nick rv)))
|
|
((not (eq face erc-button-nickname-face))))
|
|
(cons face (ensure-list rv))
|
|
rv)))
|
|
|
|
|
|
(provide 'erc-speedbar)
|
|
;;; erc-speedbar.el ends here
|
|
;;
|
|
;; Local Variables:
|
|
;; generated-autoload-file: "erc-loaddefs.el"
|
|
;; End:
|