New Upstream Release - wl-beta
Ready changes
Summary
Merged new upstream version: 2.15.9+0.20230521 (was: 2.15.9+0.20230120).
Resulting package
Built on 2023-06-03T10:37 (took 4m37s)
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t fresh-releases wl-beta
Lintian Result
Diff
diff --git a/WL-MK b/WL-MK
index df26ee4..cfff0a9 100644
--- a/WL-MK
+++ b/WL-MK
@@ -53,9 +53,8 @@
(defvar config-wl-package-done nil)
-(defun config-wl-package-subr ()
+(defun config-wl-package-subr-1 ()
(unless config-wl-package-done
- (setq config-wl-package-done t)
(setq load-path (cons (expand-file-name ".") load-path))
(setq load-path (cons (expand-file-name WLDIR)
(cons (expand-file-name ELMODIR) load-path)))
@@ -63,8 +62,12 @@
(load "./WL-CFG" t nil nil)
;; load-path
(if wl-install-utils
- (setq load-path (cons (expand-file-name UTILSDIR) load-path)))
- (require 'install)
+ (setq load-path (cons (expand-file-name UTILSDIR) load-path)))))
+
+(defun config-wl-package-subr-2 ()
+ (unless config-wl-package-done
+ (setq config-wl-package-done t)
+ (require 'path-util)
(load "./WL-ELS" nil nil t)
;; product.el version check
(require 'product)
@@ -78,6 +81,10 @@
(require 'mime-setup)
(error (error "Cannot load `mime-setup'. Please install SEMI")))))
+(defun config-wl-package-subr ()
+ (config-wl-package-subr-1)
+ (config-wl-package-subr-2))
+
(defun config-wl-pixmap-dir (&optional packagedir)
"Examine pixmap directory where icon files should go."
(let ((pixmap-dir (car command-line-args-left)))
@@ -92,26 +99,28 @@
(setq command-line-args-left (cdr command-line-args-left)))
(defun config-wl-package ()
- (config-wl-package-subr)
+ (config-wl-package-subr-1)
;; LISPDIR check.
(let ((elispdir (car command-line-args-left)))
+ (setq command-line-args-left (cdr command-line-args-left))
+ (when (setq package-lisp-dir (car command-line-args-left))
+ (or (string-equal "NONE" package-lisp-dir)
+ (progn
+ (defvar PACKAGE_LISPDIR
+ (if (boundp (intern package-lisp-dir))
+ (symbol-value (intern package-lisp-dir))
+ package-lisp-dir))
+ (princ (format "PACKAGE_LISPDIR=%s\n"
+ PACKAGE_LISPDIR))
+ (let ((default-directory PACKAGE_LISPDIR))
+ (normal-top-level-add-subdirs-to-load-path)))))
+ (require 'install)
(if (string= elispdir "NONE")
(defvar LISPDIR (install-detect-elisp-directory))
(defvar LISPDIR elispdir)))
(princ (format "LISPDIR is %s\n" LISPDIR))
(setq command-line-args-left (cdr command-line-args-left))
- (and (setq package-lisp-dir (car command-line-args-left))
- (or (string-equal "NONE" package-lisp-dir)
- (progn
- (defvar PACKAGE_LISPDIR
- (if (boundp (intern package-lisp-dir))
- (symbol-value (intern package-lisp-dir))
- package-lisp-dir))
- (princ (format "PACKAGE_LISPDIR=%s\n"
- PACKAGE_LISPDIR))
- (let ((default-directory PACKAGE_LISPDIR))
- (normal-top-level-add-subdirs-to-load-path)))))
- (setq command-line-args-left (cdr command-line-args-left))
+ (config-wl-package-subr-2)
;; PIXMAPDIR check.
(config-wl-pixmap-dir)
(princ "\n"))
diff --git a/debian/changelog b/debian/changelog
index a73d70f..df2b533 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+wl-beta (2.15.9+0.20230521-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Debian Janitor <janitor@jelmer.uk> Sat, 03 Jun 2023 10:34:09 -0000
+
wl-beta (2.15.9+0.20230120-1) unstable; urgency=medium
* New upstream version 2.15.9+0.20230120
diff --git a/wl/wl-draft.el b/wl/wl-draft.el
index 0c9052c..d965d15 100644
--- a/wl/wl-draft.el
+++ b/wl/wl-draft.el
@@ -50,7 +50,7 @@
(provide 'wl-draft)
(defvar x-face-add-x-face-version-header)
-(defvar mail-reply-buffer)
+(defvar wl-mail-reply-buffer nil)
(defvar mail-from-style)
(eval-and-compile
@@ -590,7 +590,7 @@ or `wl-draft-reply-with-argument-list' if WITH-ARG argument is non-nil."
(wl-draft-add-in-reply-to "References"))
(defun wl-draft-add-in-reply-to (&optional alt-field)
- (let* ((mes-id (with-current-buffer mail-reply-buffer
+ (let* ((mes-id (with-current-buffer wl-mail-reply-buffer
(elmo-get-message-id-from-buffer)))
(field (or alt-field "In-Reply-To"))
(ref (std11-field-body field))
@@ -620,7 +620,7 @@ or `wl-draft-reply-with-argument-list' if WITH-ARG argument is non-nil."
(narrow-to-region (point)(point))
(insert
(string-as-multibyte
- (with-current-buffer mail-reply-buffer
+ (with-current-buffer wl-mail-reply-buffer
(when decode-it
(decode-mime-charset-region (point-min) (point-max)
wl-mime-charset))
@@ -732,7 +732,7 @@ or `wl-draft-reply-with-argument-list' if WITH-ARG argument is non-nil."
(defun wl-draft-insert-current-message (_dummy)
(interactive)
(let (original-buffer
- mail-reply-buffer
+ wl-mail-reply-buffer
mail-citation-hook
wl-draft-add-references wl-draft-add-in-reply-to
wl-draft-cite-function)
@@ -744,7 +744,7 @@ or `wl-draft-reply-with-argument-list' if WITH-ARG argument is non-nil."
(not (zerop (with-current-buffer original-buffer
(buffer-size))))))))
(progn
- (setq mail-reply-buffer original-buffer)
+ (setq wl-mail-reply-buffer original-buffer)
(wl-draft-yank-from-mail-reply-buffer
nil
wl-ignored-forwarded-headers))
@@ -764,18 +764,18 @@ or `wl-draft-reply-with-argument-list' if WITH-ARG argument is non-nil."
(lambda (num)
(interactive "nNumber: ")
num)))
- (mail-reply-buffer (get-buffer-create "*wl-draft-insert-get-message*"))
+ (wl-mail-reply-buffer (get-buffer-create "*wl-draft-insert-get-message*"))
mail-citation-hook wl-draft-cite-function)
(unwind-protect
(progn
- (with-current-buffer mail-reply-buffer
+ (with-current-buffer wl-mail-reply-buffer
(erase-buffer)
(elmo-message-fetch (wl-folder-get-elmo-folder fld)
number
;; No cache.
(elmo-make-fetch-strategy 'entire)))
(wl-draft-yank-from-mail-reply-buffer nil))
- (kill-buffer mail-reply-buffer))))
+ (kill-buffer wl-mail-reply-buffer))))
;;
;; default body citation func
@@ -816,7 +816,7 @@ or `wl-draft-reply-with-argument-list' if WITH-ARG argument is non-nil."
(defun wl-draft-yank-to-draft-buffer (buffer)
"Yank BUFFER content to `wl-draft-buffer'."
(set-buffer wl-draft-buffer)
- (let ((mail-reply-buffer buffer))
+ (let ((wl-mail-reply-buffer buffer))
(wl-draft-yank-from-mail-reply-buffer nil)
(kill-buffer buffer)))
@@ -825,11 +825,11 @@ or `wl-draft-reply-with-argument-list' if WITH-ARG argument is non-nil."
(interactive "P")
(if arg
(let ((draft-buffer (current-buffer))
- mail-reply-buffer)
+ wl-mail-reply-buffer)
(with-temp-buffer
(insert "\n")
(yank)
- (setq mail-reply-buffer (current-buffer))
+ (setq wl-mail-reply-buffer (current-buffer))
(with-current-buffer draft-buffer
(wl-draft-yank-from-mail-reply-buffer nil))))
(wl-draft-yank-current-message-entity)))
@@ -1966,8 +1966,7 @@ If KILL-WHEN-DONE is non-nil, current draft buffer is killed"
"\\1"))
auto-save-file-name-transforms))
(when wl-draft-write-file-function
- (make-local-variable 'write-file-functions)
- (add-hook 'write-file-functions wl-draft-write-file-function))
+ (add-hook 'write-file-functions wl-draft-write-file-function nil t))
(wl-draft-overload-functions)
(unless (eq wl-draft-real-time-highlight 'jit)
(wl-highlight-headers 'for-draft))
@@ -2170,8 +2169,7 @@ If KILL-WHEN-DONE is non-nil, current draft buffer is killed"
(unless wl-draft-parent-folder
(setq wl-draft-parent-folder ""))
(when wl-draft-write-file-function
- (make-local-variable 'write-file-functions)
- (add-hook 'write-file-functions wl-draft-write-file-function))
+ (add-hook 'write-file-functions wl-draft-write-file-function nil t))
(unless (eq wl-draft-real-time-highlight 'jit)
(wl-highlight-headers 'for-draft))
(goto-char body-top)
diff --git a/wl/wl-message.el b/wl/wl-message.el
index b7f3f63..41d4372 100644
--- a/wl/wl-message.el
+++ b/wl/wl-message.el
@@ -321,11 +321,12 @@ Returns non-nil if bottom of message."
(require 'wl-draft)
-(defun wl-message-follow-current-entity (_buffer)
+(defun wl-message-follow-current-entity (buffer)
"Follow to current message."
(wl-draft-reply (wl-message-get-original-buffer)
nil wl-message-buffer-cur-summary-buffer) ; reply to all
- (wl-draft-yank-from-mail-reply-buffer nil))
+ (let ((wl-mail-reply-buffer buffer))
+ (wl-draft-yank-from-mail-reply-buffer nil)))
;;
diff --git a/wl/wl-mime.el b/wl/wl-mime.el
index 4f72714..321044d 100644
--- a/wl/wl-mime.el
+++ b/wl/wl-mime.el
@@ -46,7 +46,6 @@
(require 'elmo-mime)
(require 'wl-vars)
(require 'wl-util)
-(require 'cl-lib)
;;; Draft
@@ -625,7 +624,7 @@ It calls following-method selected from variable
(declare-function epg-context-result-for "epg" (context name))
(declare-function epg-verify-result-to-string "epg" (verify-result))
-(defun wl-mime-pgp-decrypt-region-with-epg (beg end &optional no-decode)
+(defun wl-mime-pgp-decrypt-region (beg end &optional no-decode)
(require 'epg)
(let ((context (epg-make-context)))
(elmo-with-progress-display (epg-decript nil reporter)
@@ -645,7 +644,7 @@ It calls following-method selected from variable
(eval-when-compile (require 'epa))
(declare-function epa-display-info "epa" (info))
-(defun wl-mime-pgp-verify-region-with-epg (beg end &optional coding-system)
+(defun wl-mime-pgp-verify-region (beg end &optional coding-system)
(require 'epa)
(let ((context (epg-make-context))
window)
@@ -668,20 +667,6 @@ It calls following-method selected from variable
(setq window (get-buffer-window epa-info-buffer)))
(select-window window)))))
-(defsubst wl-mime-pgp-decrypt-region (beg end &optional no-decode)
- (cl-case wl-use-pgp-module
- (epg
- (wl-mime-pgp-decrypt-region-with-epg beg end no-decode))
- (t
- (error "No support for PGP decryption"))))
-
-(defsubst wl-mime-pgp-verify-region (beg end &optional coding-system)
- (cl-case wl-use-pgp-module
- (epg
- (wl-mime-pgp-verify-region-with-epg beg end coding-system))
- (t
- (error "No support for PGP verification"))))
-
(defun wl-message-decrypt-pgp-nonmime ()
"Decrypt PGP encrypted region"
(interactive)
@@ -729,60 +714,6 @@ With ARG, ask coding system and encode the region with it before verifying."
coding-system)))
(wl-mime-pgp-verify-region (car region) (cdr region) coding-system))))
-(defvar wl-mime-pgp-decrypted-buffers nil)
-
-(defun wl-mime-pgp-kill-decrypted-buffers ()
- (dolist (buffer wl-mime-pgp-decrypted-buffers)
- (when (bufferp buffer)
- (kill-buffer buffer))))
-
-(defun wl-mime-preview-application/pgp (parent-entity entity _situation)
- (goto-char (point-max))
- (let ((p (point))
- representation-type child-entity buffer failed)
- (goto-char p)
- (save-restriction
- (narrow-to-region p p)
- (setq buffer (generate-new-buffer
- (concat wl-original-message-buffer-name "PGP*")))
- (with-current-buffer buffer
- (mime-insert-entity entity)
- (when (progn
- (goto-char (point-min))
- (re-search-forward "^-+BEGIN PGP MESSAGE-+$" nil t))
- (condition-case error
- (wl-mime-pgp-decrypt-region (point-min) (point-max) 'no-decode)
- (error (setq failed error)))
- (setq representation-type 'elmo-buffer))
- (unless failed
- (setq child-entity (mime-parse-message
- (mm-expand-class-name representation-type)
- nil
- parent-entity
- (mime-entity-node-id-internal parent-entity))
- buffer-read-only t)))
- (if failed
- (progn
- (insert (format "%s" (cdr failed)))
- (kill-buffer buffer))
- (add-hook 'kill-buffer-hook 'wl-mime-pgp-kill-decrypted-buffers nil t)
- (make-local-variable 'wl-mime-pgp-decrypted-buffers)
- (add-to-list 'wl-mime-pgp-decrypted-buffers buffer)
- (mime-display-entity
- child-entity nil `((header . visible)
- (body . visible)
- (entity-button . invisible)))))))
-
-(defun wl-mime-preview-application/pgp-encrypted (entity situation)
- (let* ((entity-node-id (mime-entity-node-id entity))
- (mother (mime-entity-parent entity))
- (knum (car entity-node-id))
- (onum (if (> knum 0)
- (1- knum)
- (1+ knum)))
- (orig-entity (nth onum (mime-entity-children mother))))
- (wl-mime-preview-application/pgp entity orig-entity situation)))
-
;;; Summary
(defun wl-summary-burst-subr (message-entity target number)
;; returns new number.
@@ -970,15 +901,6 @@ With ARG, ask destination folder."
(wl-highlight-headers)))
-(autoload 'mime-decrypt-application/pgp-encrypted "mime-pgp")
-(defun wl-mime-decrypt-application/pgp-encrypted (entity situation)
- (let ((summary-buffer wl-message-buffer-cur-summary-buffer)
- (original-buffer wl-message-buffer-original-buffer))
- (mime-decrypt-application/pgp-encrypted entity situation)
- (setq wl-message-buffer-cur-summary-buffer summary-buffer)
- (setq wl-message-buffer-original-buffer original-buffer)))
-
-
;;; Setup methods.
(defun wl-mime-setup ()
(set-alist 'mime-preview-quitting-method-alist
@@ -1002,14 +924,6 @@ With ARG, ask destination folder."
(body-presentation-method . wl-mime-display-text/plain)
(major-mode . wl-original-message-mode)))
- (ctree-set-calist-strictly
- 'mime-preview-condition
- '((type . application)(subtype . pgp-encrypted)
- (encoding . t)
- (body . invisible)
- (body-presentation-method . wl-mime-preview-application/pgp-encrypted)
- (major-mode . wl-original-message-mode)))
-
(ctree-set-calist-strictly
'mime-acting-condition
'((type . message) (subtype . partial)
@@ -1017,12 +931,6 @@ With ARG, ask destination folder."
(request-partial-message-method . wl-message-request-partial)
(major-mode . wl-original-message-mode)))
- (ctree-set-calist-strictly
- 'mime-acting-condition
- '((type . application) (subtype . pgp-encrypted)
- (method . wl-mime-decrypt-application/pgp-encrypted)
- (major-mode . wl-original-message-mode)))
-
(ctree-set-calist-strictly
'mime-acting-condition
'((mode . "extract")
diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index 5d6ea37..b06f3be 100644
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -88,7 +88,6 @@
(defvar dragdrop-drop-functions)
(defvar scrollbar-height)
-(defvar mail-reply-buffer)
(defvar elmo-global-flags)
(defvar wl-summary-buffer-name "Summary")
diff --git a/wl/wl-util.el b/wl/wl-util.el
index f703d02..f146fb1 100644
--- a/wl/wl-util.el
+++ b/wl/wl-util.el
@@ -444,7 +444,7 @@ The objects mapped (cdrs of elements of the ALIST) are shared."
;; Don't use microseconds from (current-time), they may be unsupported.
;; Instead we use this randomly inited counter.
(setq wl-unique-id-char
- (% (1+ (or wl-unique-id-char (logand (random t) (1- (lsh 1 20)))))
+ (% (1+ (or wl-unique-id-char (logand (random t) (1- (ash 1 20)))))
;; (current-time) returns 16-bit ints,
;; and 2^16*25 just fits into 4 digits i base 36.
(* 25 25)))
@@ -457,9 +457,9 @@ The objects mapped (cdrs of elements of the ALIST) are shared."
user)
(wl-number-base36 (user-uid) -1))
(wl-number-base36 (+ (/ integer 65536)
- (lsh (% wl-unique-id-char 25) 16)) 4)
+ (ash (% wl-unique-id-char 25) 16)) 4)
(wl-number-base36 (+ (% integer 65536)
- (lsh (/ wl-unique-id-char 25) 16)) 4)
+ (ash (/ wl-unique-id-char 25) 16)) 4)
;; Append the name of the message interface, because while the
;; generated ID is unique to this newsreader, other newsreaders
;; might otherwise generate the same ID via another algorithm.
diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index 3c08de2..996daff 100644
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -3053,12 +3053,6 @@ a symbol `xbm' or `xpm' in order to force the image format."
:type 'string
:group 'wl-pref)
-(defcustom wl-use-pgp-module 'epg
- "*Whether use EasyPG."
- :type '(choice (const :tag "EasyPG Library" epg)
- (const :tag "Don't use PGP" nil))
- :group 'wl-pref)
-
(defcustom wl-display-progress-threshold
'((wl-folder-insert-entity . 100)
(elmo-retrieve-message . 3000)
Debdiff
File lists identical (after any substitutions)
No differences were encountered in the control files