1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
| | ;;; 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.
;;; Code:
;;;###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))))))
;;;; Auth Source
;; We want a unified interface to auth-source, but that depends on
;; upstream providing a consistent experience. As of at least
;;
;; lisp/auth-source-pass.el: Support multiple hosts in search
;; b09ee1406205e8b6298411b9a18c1cd26e201689 Fri Jul 2 2021
;;
;; auth-source-pass only returns singletons on success. But we want
;; all possible matches. This provides some hacks to do that, but it
;; depends on internal functions. We also need to pass lists of
;; candidates for host, user, and port selectors, which aren't yet
;; fully supported.
;;
(require 'auth-source)
(declare-function auth-source-pass--get-attr
"auth-source-pass" (key entry-data))
(declare-function auth-source-pass--disambiguate
"auth-source-pass" (host &optional user port))
(declare-function auth-source-pass--find-match-unambiguous
"auth-source-pass" (hostname user port))
(declare-function auth-source-backend-parse-parameters
"auth-source-pass" (entry backend))
(defun erc-compat--auth-source-pass--couch (s)
(lambda () (auth-source-pass--get-attr 'secret s)))
(defun erc-compat--auth-source-pass--find-match (hosts ports users)
"Return a plist of HOSTS, PORTS, USERS, and secret.
This is not a drop-in for `auth-source-pass--find-match', which
returns an alist."
(unless (listp hosts) (setq hosts (list hosts)))
(unless (listp users) (setq users (list users)))
(unless (listp ports) (setq ports (list ports)))
;; Try combinations of Hosts x Users x Ports, filter out nonexistent
(cl-loop for host in hosts
for (h u p) = (auth-source-pass--disambiguate host)
append
(cl-loop for user in (or users (list u))
append
(cl-loop for port in (or ports (list p))
for s = (auth-source-pass--find-match-unambiguous
h user port)
when s collect
;; Keep original host
`(:host
,host
,@(and user (list :user user))
,@(and port (list :port port))
:secret
,(erc-compat--auth-source-pass--couch s))))))
(defun erc-compat--auth-source-pass--build-result (hosts ports users
&optional max)
"Act like a multi-valued `auth-source-pass--build-result'."
(unless max (setq max 1))
(let ((entries (erc-compat--auth-source-pass--find-match hosts ports users))
(count -1)
entry
out)
(while (and (setq entry (pop entries)) (< (cl-incf count) max))
(push entry out))
out))
(cl-defun erc-compat--auth-source-pass-search
(&rest spec &key backend type host user port max &allow-other-keys)
(cl-assert (or (null type) (eq type (oref backend type)))
t "Invalid password-store search: %s %s")
(cl-assert (and host (not (eq host t)))
t "Invalid password-store search: %s %s")
(erc-compat--auth-source-pass--build-result host port user max))
;; Temporary until we decide whether to load compat by default
;;;###autoload
(defun erc-compat--auth-source-pass-backend-parse (entry)
(when (eq entry 'password-store)
(auth-source-backend-parse-parameters
entry (auth-source-backend
:source "."
:type 'password-store
:search-function #'erc-compat--auth-source-pass-search))))
(provide 'erc-compat)
;;; erc-compat.el ends here
;;
;; Local Variables:
;; generated-autoload-file: "erc-loaddefs.el"
;; End:
|