mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-03-19 05:13:34 -07:00
Asking people to order require's is about as effective as asking kids to keep off the grass. * lisp/erc/erc-backend.el (erc--target, erc-auto-query, erc-channel-list, erc-channel-users, erc-default-nicks, erc-default-recipients, erc-format-nick-function, erc-format-query-as-channel-p, erc-hide-prompt, erc-input-marker, erc-insert-marker, erc-invitation, erc-join-buffer, erc-kill-buffer-on-part, erc-kill-server-buffer-on-quit, erc-log-p, erc-minibuffer-ignored, erc-networks--id, erc-nick, erc-nick-change-attempt-count, erc-prompt-for-channel-key, erc-prompt-hidden, erc-reuse-buffers, erc-verbose-server-ping, erc-whowas-on-nosuchnick): Forward-declare variables. (erc--open-target, erc--target-from-string, erc-active-buffer, erc-add-default-channel, erc-banlist-update, erc-buffer-filter, erc-buffer-list-with-nick, erc-channel-begin-receiving-names, erc-channel-end-receiving-names, erc-channel-p, erc-channel-receive-names, erc-cmd-JOIN, erc-connection-established, erc-current-nick, erc-current-nick-p, erc-current-time, erc-default-target, erc-delete-default-channel, erc-display-error-notice, erc-display-server-message, erc-emacs-time-to-erc-time, erc-format-message, erc-format-privmessage, erc-get-buffer, erc-handle-login, erc-handle-user-status-change, erc-ignored-reply-p, erc-ignored-user-p, erc-is-message-ctcp-and-not-action-p, erc-is-message-ctcp-p, erc-log-irc-protocol, erc-login, erc-make-notice, erc-network, erc-networks--id-given, erc-networks--id-reload, erc-nickname-in-use, erc-parse-user, erc-process-away, erc-process-ctcp-query, erc-query-buffer-p, erc-remove-channel-member, erc-remove-channel-users, erc-remove-user, erc-sec-to-time, erc-server-buffer, erc-set-active-buffer, erc-set-current-nick, erc-set-modes, erc-time-diff, erc-trim-string, erc-update-mode-line, erc-update-mode-line-buffer, erc-wash-quit-reason, erc-display-message, erc-get-buffer-create, erc-process-ctcp-reply, erc-update-channel-topic, erc-update-modes, erc-update-user-nick, erc-open, erc-update-channel-member): Forward-declare functions. (erc-response): Move to lisp/erc/erc-common.el. (erc-compat--with-memoization): Use "erc-compat-" prefixed macro. * lisp/erc/erc-common.el: New file. Change indentation for `erc-with-all-buffers-of-server' from 1 to 2. * lisp/erc/erc-compat.el (erc-compat--with-memoization): Migrate macro from `erc-backend' and rename. * lisp/erc/erc-goodies.el: Require `erc-common' instead of `erc'. (erc-controls-highlight-regexp, erc-controls-remove-regexp, erc-input-marker, erc-insert-marker, erc-server-process, erc-modules, erc-log-p): Forward declare variables. (erc-buffer-list, erc-error, erc-extract-command-from-line): Forward-declare functions. * lisp/erc/erc-networks.el (erc--target, erc-insert-marker, erc-kill-buffer-hook, erc-kill-server-hook, erc-modules, erc-rename-buffers, erc-reuse-buffers, erc-server-announced-name, erc-server-connected, erc-server-parameters, erc-server-process, erc-session-server): Forward declare variables. (erc--default-target, erc--get-isupport-entry, erc-buffer-filter, erc-current-nick, erc-display-error-notice, erc-error, erc-get-buffer, erc-server-buffer, erc-server-process-alive): Forward-declare functions. (erc-obsolete-var): Also suppress free-variable warnings. * lisp/erc/erc.el: Require `erc-networks', `erc-goodies', and `erc-backend' at top of file. Don't require `erc-compat'. (erc--server-last-reconnect-count, erc--server-reconnecting, erc-channel-members-changed-hook, erc-network, erc-networks--id, erc-server-367-functions, erc-server-announced-name, erc-server-connect-function, erc-server-connected, erc-server-current-nick, erc-server-lag, erc-server-last-sent-time, erc-server-process, erc-server-quitting, erc-server-reconnect-count, erc-server-reconnecting, erc-session-client-certificate, erc-session-connector, erc-session-port, erc-session-server, erc-session-user-full-name) Remove superfluous forward declarations. (erc-message-parsed, tabbar--local-hlf, motif-version-string): Relocate forward declares to central location. (erc-session-password): Move to `erc-backend'. (erc-downcase, erc-with-server-buffer, erc-server-user, erc-channel-user, erc-get-channel-user, erc-get-server-user): Move to lisp/erc/erc-common.el. (erc-add-server-user, erc-remove-server-user, erc-channel-user-owner-p, erc-channel-user-admin-p, erc-channel-user-op-p, erc-channel-user-halfop-p, erc-channel-user-voice-p): Convert from inline functions to normal functions. (define-erc-module, erc--target, erc--target-channel, erc--target-channel-local, erc-log, erc-log-aux, erc-with-buffer, erc-with-all-buffers-of-server): Move to lisp/erc/erc-common.el. (erc-channel-members-changed-hook): Relocate option to avoid compiler warning. (erc-input, erc--input-split): Move to lisp/erc/erc-common.el. (erc-controls-strip): Remove forward declaration temporarily until this file stops requiring `erc-goodies'. * test/lisp/erc/erc-networks-tests.el: Require `erc' instead of `erc-networks'. * test/lisp/erc/erc.el (erc--meta--backend-dependencies): Remove obsolete test. Don't require `erc-networks'. Bug#56340.
177 lines
6.4 KiB
EmacsLisp
177 lines
6.4 KiB
EmacsLisp
;;; erc-compat.el --- ERC compatibility code for older Emacsen -*- lexical-binding: t; -*-
|
|
|
|
;; Copyright (C) 2002-2003, 2005-2022 Free Software Foundation, Inc.
|
|
|
|
;; Author: Alex Schroeder <alex@gnu.org>
|
|
;; Maintainer: Amin Bandali <bandali@gnu.org>, F. Jason Park <jp@neverwas.me>
|
|
;; URL: https://www.emacswiki.org/emacs/ERC
|
|
|
|
;; 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 mostly defines stuff that cannot be worked around easily.
|
|
|
|
;; ERC depends on the `compat' library from GNU ELPA for supporting
|
|
;; older versions of Emacs. See this discussion for additional info:
|
|
;; https://lists.gnu.org/archive/html/emacs-devel/2022-07/msg00512.html
|
|
|
|
;;; Code:
|
|
|
|
(require 'compat nil 'noerror)
|
|
|
|
;;;###autoload(autoload 'erc-define-minor-mode "erc-compat")
|
|
(define-obsolete-function-alias 'erc-define-minor-mode
|
|
#'define-minor-mode "28.1")
|
|
|
|
(defun erc-decode-coding-string (s coding-system)
|
|
"Decode S using CODING-SYSTEM."
|
|
(declare (obsolete decode-coding-string "28.1"))
|
|
(decode-coding-string s coding-system t))
|
|
|
|
(defun erc-encode-coding-string (s coding-system)
|
|
"Encode S using CODING-SYSTEM.
|
|
Return the same string, if the encoding operation is trivial.
|
|
See `erc-encoding-coding-alist'."
|
|
(declare (obsolete encode-coding-string "28.1"))
|
|
(encode-coding-string s coding-system t))
|
|
|
|
(define-obsolete-function-alias 'erc-propertize #'propertize "28.1")
|
|
(define-obsolete-function-alias 'erc-view-mode-enter #'view-mode-enter "28.1")
|
|
(autoload 'help-function-arglist "help-fns")
|
|
(define-obsolete-function-alias 'erc-function-arglist #'help-function-arglist "28.1")
|
|
(define-obsolete-function-alias 'erc-delete-dups #'delete-dups "28.1")
|
|
(define-obsolete-function-alias 'erc-replace-regexp-in-string #'replace-regexp-in-string "28.1")
|
|
|
|
(defun erc-set-write-file-functions (new-val)
|
|
(declare (obsolete nil "28.1"))
|
|
(set (make-local-variable 'write-file-functions) new-val))
|
|
|
|
(defvar erc-emacs-build-time
|
|
(if (or (stringp emacs-build-time) (not emacs-build-time))
|
|
emacs-build-time
|
|
(format-time-string "%Y-%m-%d" emacs-build-time))
|
|
"Time at which Emacs was dumped out, or nil if not available.")
|
|
(make-obsolete-variable 'erc-emacs-build-time 'emacs-build-time "28.1")
|
|
(define-obsolete-variable-alias 'erc-user-emacs-directory 'user-emacs-directory "28.1")
|
|
|
|
(defun erc-replace-match-subexpression-in-string
|
|
(newtext string _match subexp _start &optional fixedcase literal)
|
|
"Replace the subexpression SUBEXP of the last match in STRING with NEWTEXT.
|
|
MATCH is the text which matched the subexpression (see `match-string').
|
|
START is the beginning position of the last match (see `match-beginning').
|
|
See `replace-match' for explanations of FIXEDCASE and LITERAL."
|
|
(declare (obsolete replace-match "28.1"))
|
|
(replace-match newtext fixedcase literal string subexp))
|
|
|
|
(define-obsolete-function-alias 'erc-with-selected-window
|
|
#'with-selected-window "28.1")
|
|
(define-obsolete-function-alias 'erc-cancel-timer #'cancel-timer "28.1")
|
|
(define-obsolete-function-alias 'erc-make-obsolete #'make-obsolete "28.1")
|
|
(define-obsolete-function-alias 'erc-make-obsolete-variable
|
|
#'make-obsolete-variable "28.1")
|
|
|
|
;; Provide a simpler replacement for `cl-member-if'
|
|
(defun erc-member-if (predicate list)
|
|
"Find the first item satisfying PREDICATE in LIST.
|
|
Return the sublist of LIST whose car matches."
|
|
(declare (obsolete cl-member-if "28.1"))
|
|
(let ((ptr list))
|
|
(catch 'found
|
|
(while ptr
|
|
(when (funcall predicate (car ptr))
|
|
(throw 'found ptr))
|
|
(setq ptr (cdr ptr))))))
|
|
|
|
;; Provide a simpler replacement for `cl-delete-if'
|
|
(defun erc-delete-if (predicate seq)
|
|
"Remove all items satisfying PREDICATE in SEQ.
|
|
This is a destructive function: it reuses the storage of SEQ
|
|
whenever possible."
|
|
(declare (obsolete cl-delete-if "28.1"))
|
|
;; remove from car
|
|
(while (when (funcall predicate (car seq))
|
|
(setq seq (cdr seq))))
|
|
;; remove from cdr
|
|
(let ((ptr seq)
|
|
(next (cdr seq)))
|
|
(while next
|
|
(when (funcall predicate (car next))
|
|
(setcdr ptr (if (consp next)
|
|
(cdr next)
|
|
nil)))
|
|
(setq ptr (cdr ptr))
|
|
(setq next (cdr ptr))))
|
|
seq)
|
|
|
|
;; Provide a simpler replacement for `cl-remove-if-not'
|
|
(defun erc-remove-if-not (predicate seq)
|
|
"Remove all items not satisfying PREDICATE in SEQ.
|
|
This is a non-destructive function; it makes a copy of SEQ to
|
|
avoid corrupting the original SEQ."
|
|
(declare (obsolete cl-remove-if-not "28.1"))
|
|
(let (newseq)
|
|
(dolist (el seq)
|
|
(when (funcall predicate el)
|
|
(setq newseq (cons el newseq))))
|
|
(nreverse newseq)))
|
|
|
|
;; Copied from cl-extra.el
|
|
(defun erc-subseq (seq start &optional end)
|
|
"Return the subsequence of SEQ from START to END.
|
|
If END is omitted, it defaults to the length of the sequence.
|
|
If START or END is negative, it counts from the end."
|
|
(declare (obsolete cl-subseq "28.1"))
|
|
(if (stringp seq) (substring seq start end)
|
|
(let (len)
|
|
(and end (< end 0) (setq end (+ end (setq len (length seq)))))
|
|
(if (< start 0) (setq start (+ start (or len (setq len (length seq))))))
|
|
(cond ((listp seq)
|
|
(if (> start 0) (setq seq (nthcdr start seq)))
|
|
(if end
|
|
(let ((res nil))
|
|
(while (>= (setq end (1- end)) start)
|
|
(push (pop seq) res))
|
|
(nreverse res))
|
|
(copy-sequence seq)))
|
|
(t
|
|
(or end (setq end (or len (length seq))))
|
|
(let ((res (make-vector (max (- end start) 0) nil))
|
|
(i 0))
|
|
(while (< start end)
|
|
(aset res i (aref seq start))
|
|
(setq i (1+ i) start (1+ start)))
|
|
res))))))
|
|
|
|
|
|
;;;; Misc 29.1
|
|
|
|
(defmacro erc-compat--with-memoization (table &rest forms)
|
|
(declare (indent defun))
|
|
(cond
|
|
((fboundp 'with-memoization)
|
|
`(with-memoization ,table ,@forms)) ; 29.1
|
|
((fboundp 'cl--generic-with-memoization)
|
|
`(cl--generic-with-memoization ,table ,@forms))
|
|
(t `(progn ,@forms))))
|
|
|
|
(provide 'erc-compat)
|
|
|
|
;;; erc-compat.el ends here
|
|
;;
|
|
;; Local Variables:
|
|
;; generated-autoload-file: "erc-loaddefs.el"
|
|
;; End:
|