mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-21 06:55:39 +00:00
Code Issues Releases Activity

Delete compat code in url library

Browse Source 
* lisp/url/url-cid.el (url-cid): Delete compat code for ancient Gnus.
* lisp/url/url-ldap.el (url-ldap-certificate-formatter): Delete compat
code; ssl.el has never been in Emacs.
* lisp/url/url-mailto.el (url-mail): Make into alias for 'message-mail',
since it is always fboundp.
This commit is contained in:
Stefan Kangas 2024-02-04 10:28:40 +01:00
parent 56d0fbd99a
commit 9bbf8232db
3 changed files with 10 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lisp/url/url-cid.el
View File

@ -1,6 +1,6 @@
;;; url-cid.el --- Content-ID URL loader -*- lexical-binding: t; -*-
;; Copyright (C) 1998-1999, 2004-2024 Free Software Foundation, Inc.
;; Copyright (C) 1998-2024 Free Software Foundation, Inc.
;; Keywords: comm, data, processes
@ -52,12 +52,7 @@
;;;###autoload
(defun url-cid (url)
(cond
((fboundp 'mm-get-content-id)
;; Using Pterodactyl Gnus or later
(with-current-buffer (generate-new-buffer " *url-cid*")
(url-cid-gnus (url-filename url))))
(t
(message "Unable to handle CID URL: %s" url))))
(with-current-buffer (generate-new-buffer " *url-cid*")
(url-cid-gnus (url-filename url))))
;;; url-cid.el ends here

10
lisp/url/url-ldap.el
View File

@ -1,6 +1,6 @@
;;; url-ldap.el --- LDAP Uniform Resource Locator retrieval code -*- lexical-binding: t; -*-
;; Copyright (C) 1998-1999, 2004-2024 Free Software Foundation, Inc.
;; Copyright (C) 1998-2024 Free Software Foundation, Inc.
;; Keywords: comm, data, processes
@ -92,12 +92,8 @@
"'>" dn "</a>"))
(defun url-ldap-certificate-formatter (data)
(condition-case ()
(require 'ssl)
(error nil))
(let ((vals (if (fboundp 'ssl-certificate-information)
(ssl-certificate-information data)
(tls-certificate-information data))))
;; FIXME: tls.el is obsolete.
(let ((vals (tls-certificate-information data)))
(if (not vals)
"<b>Unable to parse certificate</b>"
(concat "<table border=0>\n"

17
lisp/url/url-mailto.el
View File

@ -1,6 +1,6 @@
;;; url-mailto.el --- Mail Uniform Resource Locator retrieval code -*- lexical-binding: t; -*-
;; Copyright (C) 1996-1999, 2004-2024 Free Software Foundation, Inc.
;; Copyright (C) 1996-2024 Free Software Foundation, Inc.
;; Keywords: comm, data, processes
@ -28,12 +28,7 @@
(require 'url-util)
;;;###autoload
(defun url-mail (&rest args)
(interactive "P")
(if (fboundp 'message-mail)
(apply 'message-mail args)
(or (apply 'mail args)
(error "Mail aborted"))))
(defalias 'url-mail #'message-mail)
(defun url-mail-goto-field (field)
(if (not field)
@ -57,8 +52,6 @@
(save-excursion
(insert "\n"))))))
(declare-function mail-send-and-exit "sendmail")
;;;###autoload
(defun url-mailto (url)
"Handle the mailto: URL syntax."
@ -111,8 +104,6 @@
;; (setq func (intern-soft (concat "mail-" (caar args))))
(insert (mapconcat 'identity (cdar args) ", ")))
(setq args (cdr args)))
;; (url-mail-goto-field "User-Agent")
;; (insert url-package-name "/" url-package-version " URL/" url-version)
(if (not url-request-data)
(progn
(set-buffer-modified-p nil)
@ -128,8 +119,8 @@
(goto-char (point-max))
(insert url-request-data)
;; It seems Microsoft-ish to send without warning.
;; Fixme: presumably this should depend on a privacy setting.
(if (y-or-n-p "Send this auto-generated mail? ")
;; FIXME: presumably this should depend on a privacy setting.
(if (y-or-n-p "Send this auto-generated mail?")
(let ((buffer (current-buffer)))
(cond ((eq url-mail-command 'compose-mail)
(funcall (get mail-user-agent 'sendfunc) nil))