[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master cd5b638: Remove last XEmacs compat code from ERC
From: |
Stefan Kangas |
Subject: |
master cd5b638: Remove last XEmacs compat code from ERC |
Date: |
Mon, 11 Oct 2021 20:45:01 -0400 (EDT) |
branch: master
commit cd5b63807b6558ae0c4a05dc322601282a8312c2
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>
Remove last XEmacs compat code from ERC
* lisp/erc/erc-dcc.el (erc-dcc-member): Remove XEmacs compat code.
* lisp/erc/erc-goodies.el (erc-move-to-prompt-setup): Doc fix;
remove spurious reference to XEmacs; this is needed also for
Emacs.
---
lisp/erc/erc-dcc.el | 4 +---
lisp/erc/erc-goodies.el | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/lisp/erc/erc-dcc.el b/lisp/erc/erc-dcc.el
index db278a1..52b0b95 100644
--- a/lisp/erc/erc-dcc.el
+++ b/lisp/erc/erc-dcc.el
@@ -183,9 +183,7 @@ compared with `erc-nick-equal-p' which is IRC
case-insensitive."
(let ((prop (car prem))
(val (cadr prem)))
(setq prem (cddr prem)
- ;; plist-member is a predicate in xemacs
- test (and (plist-member elt prop)
- (plist-get elt prop)))
+ test (cadr (plist-member elt prop)))
;; if the property exists and is equal, we continue, else, try the
;; next element of the list
(or (and (eq prop :nick) (if (>= emacs-major-version 28)
diff --git a/lisp/erc/erc-goodies.el b/lisp/erc/erc-goodies.el
index fc9a8d3..683ac2d 100644
--- a/lisp/erc/erc-goodies.el
+++ b/lisp/erc/erc-goodies.el
@@ -137,7 +137,7 @@ Put this function on `erc-insert-post-hook' and/or
`erc-send-post-hook'."
(goto-char (point-max))))
(defun erc-move-to-prompt-setup ()
- "Initialize the move-to-prompt module for XEmacs."
+ "Initialize the move-to-prompt module."
(add-hook 'pre-command-hook #'erc-move-to-prompt nil t))
;;; Keep place in unvisited channels
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master cd5b638: Remove last XEmacs compat code from ERC,
Stefan Kangas <=