mirror of
https://github.com/masscollaborationlabs/emacs.git
synced 2025-07-09 21:50:50 +00:00

`string-search` is easier to understand, less error-prone, much faster, does not pollute the regexp cache, and does not mutate global state. Use it where applicable and obviously safe (erring on the conservative side). * admin/authors.el (authors-canonical-file-name) (authors-scan-change-log): * lisp/apropos.el (apropos-command) (apropos-documentation-property, apropos-symbols-internal): * lisp/arc-mode.el (archive-arc-summarize) (archive-zoo-summarize): * lisp/calc/calc-aent.el (math-read-factor): * lisp/calc/calc-ext.el (math-read-big-expr) (math-format-nice-expr, math-format-number-fancy): * lisp/calc/calc-forms.el (math-read-angle-brackets): * lisp/calc/calc-graph.el (calc-graph-set-range): * lisp/calc/calc-keypd.el (calc-keypad-press): * lisp/calc/calc-lang.el (tex, latex, math-read-big-rec): * lisp/calc/calc-prog.el (calc-fix-token-name) (calc-user-define-permanent, math-define-exp): * lisp/calc/calc.el (calc-record, calcDigit-key) (calc-count-lines): * lisp/calc/calcalg2.el (calc-solve-for, calc-poly-roots) (math-do-integral): * lisp/calc/calcalg3.el (calc-find-root, calc-find-minimum) (calc-get-fit-variables): * lisp/cedet/ede/speedbar.el (ede-tag-expand): * lisp/cedet/semantic/java.el (semantic-java-expand-tag): * lisp/cedet/semantic/sb.el (semantic-sb-show-extra) (semantic-sb-expand-group): * lisp/cedet/semantic/wisent/python.el (semantic-python-instance-variable-p): * lisp/cus-edit.el (get): * lisp/descr-text.el (describe-text-sexp): * lisp/dired-aux.el (dired-compress-file): * lisp/dired-x.el (dired-make-relative-symlink): * lisp/dired.el (dired-glob-regexp): * lisp/dos-fns.el (dos-convert-standard-filename, dos-8+3-filename): * lisp/edmacro.el (edmacro-format-keys): * lisp/emacs-lisp/eieio-opt.el (eieio-sb-expand): * lisp/emacs-lisp/eieio-speedbar.el (eieio-speedbar-object-expand): * lisp/emacs-lisp/lisp-mnt.el (lm-keywords-list): * lisp/emacs-lisp/warnings.el (display-warning): * lisp/emulation/viper-ex.el (viper-ex-read-file-name) (ex-print-display-lines): * lisp/env.el (read-envvar-name, setenv): * lisp/epa-mail.el (epa-mail-encrypt): * lisp/epg.el (epg--start): * lisp/erc/erc-backend.el (erc-parse-server-response): * lisp/erc/erc-dcc.el (erc-dcc-member): * lisp/erc/erc-speedbar.el (erc-speedbar-expand-server) (erc-speedbar-expand-channel, erc-speedbar-expand-user): * lisp/erc/erc.el (erc-send-input): * lisp/eshell/em-glob.el (eshell-glob-entries): * lisp/eshell/esh-proc.el (eshell-needs-pipe-p): * lisp/eshell/esh-util.el (eshell-convert): * lisp/eshell/esh-var.el (eshell-envvar-names): * lisp/faces.el (x-resolve-font-name): * lisp/ffap.el (ffap-file-at-point): * lisp/files.el (wildcard-to-regexp, shell-quote-wildcard-pattern): * lisp/forms.el (forms--update): * lisp/frameset.el (frameset-filter-unshelve-param): * lisp/gnus/gnus-art.el (article-decode-charset): * lisp/gnus/gnus-kill.el (gnus-kill-parse-rn-kill-file): * lisp/gnus/gnus-mlspl.el (gnus-group-split-fancy): * lisp/gnus/gnus-msg.el (gnus-summary-resend-message-insert-gcc) (gnus-inews-insert-gcc): * lisp/gnus/gnus-rfc1843.el (rfc1843-decode-article-body): * lisp/gnus/gnus-search.el (gnus-search-indexed-parse-output) (gnus-search--complete-key-data): * lisp/gnus/gnus-spec.el (gnus-parse-simple-format): * lisp/gnus/gnus-sum.el (gnus-summary-refer-article): * lisp/gnus/gnus-util.el (gnus-extract-address-components) (gnus-newsgroup-directory-form): * lisp/gnus/gnus-uu.el (gnus-uu-grab-view): * lisp/gnus/gnus.el (gnus-group-native-p, gnus-short-group-name): * lisp/gnus/message.el (message-check-news-header-syntax) (message-make-message-id, message-user-mail-address) (message-make-fqdn, message-get-reply-headers, message-followup): * lisp/gnus/mm-decode.el (mm-dissect-buffer): * lisp/gnus/nnheader.el (nnheader-insert): * lisp/gnus/nnimap.el (nnimap-process-quirk) (nnimap-imap-ranges-to-gnus-ranges): * lisp/gnus/nnmaildir.el (nnmaildir--ensure-suffix): * lisp/gnus/nnmairix.el (nnmairix-determine-original-group-from-path): * lisp/gnus/nnrss.el (nnrss-match-macro): * lisp/gnus/nntp.el (nntp-find-group-and-number): * lisp/help-fns.el (help--symbol-completion-table-affixation): * lisp/help.el (help-function-arglist): * lisp/hippie-exp.el (he-concat-directory-file-name): * lisp/htmlfontify.el (hfy-relstub): * lisp/ido.el (ido-make-prompt, ido-complete, ido-copy-current-word) (ido-exhibit): * lisp/image/image-converter.el (image-convert-p): * lisp/info-xref.el (info-xref-docstrings): * lisp/info.el (Info-toc-build, Info-follow-reference) (Info-backward-node, Info-finder-find-node) (Info-speedbar-expand-node): * lisp/international/mule-diag.el (print-fontset-element): * lisp/language/korea-util.el (default-korean-keyboard): * lisp/linum.el (linum-after-change): * lisp/mail/ietf-drums.el (ietf-drums-parse-address): * lisp/mail/mail-utils.el (mail-dont-reply-to): * lisp/mail/rfc2047.el (rfc2047-encode-1, rfc2047-decode-string): * lisp/mail/rfc2231.el (rfc2231-parse-string): * lisp/mail/rmailkwd.el (rmail-set-label): * lisp/mail/rmailsum.el (rmail-header-summary): * lisp/mail/smtpmail.el (smtpmail-maybe-append-domain) (smtpmail-user-mail-address): * lisp/mail/uce.el (uce-reply-to-uce): * lisp/man.el (Man-default-man-entry): * lisp/mh-e/mh-alias.el (mh-alias-gecos-name) (mh-alias-minibuffer-confirm-address): * lisp/mh-e/mh-comp.el (mh-forwarded-letter-subject): * lisp/mh-e/mh-speed.el (mh-speed-parse-flists-output): * lisp/mh-e/mh-utils.el (mh-collect-folder-names-filter) (mh-folder-completion-function): * lisp/minibuffer.el (completion--make-envvar-table) (completion-file-name-table, completion-flex-try-completion) (completion-flex-all-completions): * lisp/mpc.el (mpc--proc-quote-string, mpc-cmd-special-tag-p) (mpc-constraints-tag-lookup): * lisp/net/ange-ftp.el (ange-ftp-send-cmd) (ange-ftp-allow-child-lookup): * lisp/net/mailcap.el (mailcap-mime-types): * lisp/net/mairix.el (mairix-search-thread-this-article): * lisp/net/pop3.el (pop3-open-server): * lisp/net/soap-client.el (soap-decode-xs-complex-type): * lisp/net/socks.el (socks-filter): * lisp/nxml/nxml-outln.el (nxml-highlighted-qname): * lisp/nxml/rng-cmpct.el (rng-c-expand-name, rng-c-expand-datatype): * lisp/nxml/rng-uri.el (rng-uri-file-name-1): * lisp/obsolete/complete.el (partial-completion-mode) (PC-do-completion): * lisp/obsolete/longlines.el (longlines-encode-string): * lisp/obsolete/nnir.el (nnir-compose-result): * lisp/obsolete/terminal.el (te-quote-arg-for-sh): * lisp/obsolete/tpu-edt.el (tpu-check-search-case): * lisp/obsolete/url-ns.el (isPlainHostName): * lisp/pcmpl-unix.el (pcomplete/scp): * lisp/play/dunnet.el (dun-listify-string2, dun-get-path) (dun-unix-parse, dun-doassign, dun-cat, dun-batch-unix-interface): * lisp/progmodes/ebnf2ps.el: (ebnf-eps-header-footer-comment): * lisp/progmodes/gdb-mi.el (gdb-var-delete) (gdb-speedbar-expand-node, gdbmi-bnf-incomplete-record-result): * lisp/progmodes/gud.el (gud-find-expr): * lisp/progmodes/idlw-help.el (idlwave-do-context-help1): * lisp/progmodes/idlw-shell.el (idlwave-shell-mode) (idlwave-shell-filter-hidden-output, idlwave-shell-filter): * lisp/progmodes/idlwave.el (idlwave-skip-label-or-case) (idlwave-routine-info): * lisp/progmodes/octave.el (inferior-octave-completion-at-point): * lisp/progmodes/sh-script.el (sh-add-completer): * lisp/progmodes/sql.el (defun): * lisp/progmodes/xscheme.el (xscheme-process-filter): * lisp/replace.el (query-replace-compile-replacement) (map-query-replace-regexp): * lisp/shell.el (shell--command-completion-data) (shell-environment-variable-completion): * lisp/simple.el (display-message-or-buffer): * lisp/speedbar.el (speedbar-dired, speedbar-tag-file) (speedbar-tag-expand): * lisp/subr.el (split-string-and-unquote): * lisp/tar-mode.el (tar-extract): * lisp/term.el (term-command-hook, serial-read-name): * lisp/textmodes/bibtex.el (bibtex-print-help-message): * lisp/textmodes/ispell.el (ispell-lookup-words, ispell-filter) (ispell-parse-output, ispell-buffer-local-parsing): * lisp/textmodes/reftex-cite.el (reftex-do-citation): * lisp/textmodes/reftex-parse.el (reftex-notice-new): * lisp/textmodes/reftex-ref.el (reftex-show-entry): * lisp/textmodes/reftex.el (reftex-compile-variables): * lisp/textmodes/tex-mode.el (tex-send-command) (tex-start-tex, tex-append): * lisp/thingatpt.el (thing-at-point-url-at-point): * lisp/tmm.el (tmm-add-one-shortcut): * lisp/transient.el (transient-format-key): * lisp/url/url-auth.el (url-basic-auth) (url-digest-auth-directory-id-assoc): * lisp/url/url-news.el (url-news): * lisp/url/url-util.el (url-parse-query-string): * lisp/vc/vc-cvs.el (vc-cvs-parse-entry): * lisp/wid-browse.el (widget-browse-sexp): * lisp/woman.el (woman-parse-colon-path, woman-mini-help) (WoMan-getpage-in-background, woman-negative-vertical-space): * lisp/xml.el: * test/lisp/emacs-lisp/check-declare-tests.el (check-declare-tests-warn): * test/lisp/files-tests.el (files-tests-file-name-non-special-dired-compress-handler): * test/lisp/net/network-stream-tests.el (server-process-filter): * test/src/coding-tests.el (ert-test-unibyte-buffer-dos-eol-decode): Use `string-search` instead of `string-match` and `string-match-p`.
364 lines
12 KiB
EmacsLisp
364 lines
12 KiB
EmacsLisp
;;; erc-speedbar.el --- Speedbar support for ERC -*- lexical-binding: t; -*-
|
|
|
|
;; Copyright (C) 2001-2004, 2006-2021 Free Software Foundation, Inc.
|
|
|
|
;; Author: Mario Lang <mlang@delysid.org>
|
|
;; Contributor: Eric M. Ludlam <zappo@gnu.org>
|
|
;; Maintainer: Amin Bandali <bandali@gnu.org>
|
|
;; 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 and show
|
|
;; it using sb-image.el
|
|
;;
|
|
;;; Code:
|
|
|
|
(require 'erc)
|
|
(require 'speedbar)
|
|
(condition-case nil (require 'dframe) (error nil))
|
|
|
|
;;; Customization:
|
|
|
|
(defgroup erc-speedbar nil
|
|
"Integration of ERC in the Speedbar."
|
|
:group 'erc)
|
|
|
|
(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)))
|
|
|
|
(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.")
|
|
|
|
;; Make sure our special speedbar major mode is loaded
|
|
(with-eval-after-load 'speedbar
|
|
(erc-install-speedbar-variables))
|
|
|
|
;;; 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)
|
|
;; 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)
|
|
(with-current-buffer buffer
|
|
(setq serverp (erc-server-buffer-p))
|
|
(setq chanp (erc-channel-p (erc-default-target)))
|
|
(setq queryp (erc-query-buffer-p)))
|
|
(cond (serverp
|
|
(erc-speedbar-channel-buttons nil 0 buffer))
|
|
(chanp
|
|
(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 ??)))
|
|
((string-search "-" text) ;we have to contract this node
|
|
(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
|
|
(erc-channel-p (erc-default-target)))
|
|
(speedbar-make-tag-line
|
|
'bracket ?+ 'erc-speedbar-expand-channel buffer
|
|
(buffer-name buffer) 'erc-speedbar-goto-buffer buffer nil
|
|
depth)
|
|
;; Query target
|
|
(speedbar-make-tag-line
|
|
nil nil nil nil
|
|
(buffer-name buffer) 'erc-speedbar-goto-buffer buffer nil
|
|
depth)))
|
|
|
|
(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 (with-current-buffer channel
|
|
(concat (apply #'concat
|
|
erc-channel-modes)
|
|
(cond
|
|
((and erc-channel-user-limit
|
|
erc-channel-key)
|
|
(if erc-show-channel-key-p
|
|
(format "lk %.0f %s"
|
|
erc-channel-user-limit
|
|
erc-channel-key)
|
|
(format "kl %.0f" erc-channel-user-limit)))
|
|
(erc-channel-user-limit
|
|
;; Emacs has no bignums
|
|
(format "l %.0f" erc-channel-user-limit))
|
|
(erc-channel-key
|
|
(if erc-show-channel-key-p
|
|
(format "k %s" erc-channel-key)
|
|
"k"))
|
|
(t "")))))
|
|
(topic (erc-controls-interpret
|
|
(with-current-buffer channel erc-channel-topic))))
|
|
(speedbar-make-tag-line
|
|
'angle ?i nil nil
|
|
(concat "Modes: +" modes) nil nil nil
|
|
(1+ indent))
|
|
(unless (string= topic "")
|
|
(speedbar-make-tag-line
|
|
'angle ?i nil nil
|
|
(concat "Topic: " topic) nil nil nil
|
|
(1+ indent)))
|
|
(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))))))))))
|
|
((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-insert-user (entry exp-char indent)
|
|
"Insert one user based on the channel member list ENTRY.
|
|
EXP-CHAR is the expansion character to use.
|
|
INDENT is the current indentation level."
|
|
(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))
|
|
(voice (and cuser (erc-channel-user-voice cuser)))
|
|
(op (and cuser (erc-channel-user-op cuser)))
|
|
(nick-str (concat (if op "@" "") (if voice "+" "") nick))
|
|
(finger (concat login (when (or login host) "@") host))
|
|
(sbtoken (list finger name info)))
|
|
(if (or login host name info) ; we want to be expandable
|
|
(speedbar-make-tag-line
|
|
'bracket ?+ 'erc-speedbar-expand-user sbtoken
|
|
nick-str nil sbtoken nil
|
|
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) (point-at-eol))))
|
|
|
|
(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))
|
|
(t
|
|
(message "%s" txt)))))
|
|
|
|
(provide 'erc-speedbar)
|
|
;;; erc-speedbar.el ends here
|
|
;;
|
|
;; Local Variables:
|
|
;; generated-autoload-file: "erc-loaddefs.el"
|
|
;; End:
|