From: Gregory Heytings <gregory@heytings.org>
To: Lars Ingebrigtsen <larsi@gnus.org>
Cc: 51523@debbugs.gnu.org, Stefan Monnier <monnier@iro.umontreal.ca>
Subject: bug#51523: 29.0.50; gnus-mime-view-part-externally very slow
Date: Mon, 01 Nov 2021 12:26:03 +0000 [thread overview]
Message-ID: <6abcac838b7f89ee4e21@heytings.org> (raw)
In-Reply-To: <6abcac838bad7cded4c5@heytings.org>
[-- Attachment #1: Type: text/plain, Size: 193 bytes --]
[Stefan just told me that this email got corrupted when I sent it, here it
is again.]
I attach a better patch, it uses a file-has-change-p function instead of a
when-file-has-changed macro.
[-- Attachment #2: Type: text/x-diff, Size: 3336 bytes --]
From 4106b342fe40d4b585f43c19ba45ccc6f3f6c1e1 Mon Sep 17 00:00:00 2001
From: Gregory Heytings <gregory@heytings.org>
Date: Mon, 1 Nov 2021 09:25:23 +0000
Subject: [PATCH] Read mailcaps again only when necessary.
* lisp/net/mailcap.el (mailcap-parse-mailcaps): Read mailcaps again
only when at least one of the mailcap files has changed. Fixes
bug#51523.
* lisp/files.el (file-has-changed-p): New function.
(file-has-changed-p--hash-table): Internal variable used by the
new function.
---
lisp/files.el | 16 ++++++++++++++++
lisp/net/mailcap.el | 25 +++++++++++++------------
2 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/lisp/files.el b/lisp/files.el
index 1e65d0ce83..5e7be3844e 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -6181,6 +6181,22 @@ file-in-directory-p
(unless mismatch
(file-equal-p root dir)))))))
+(defvar file-has-changed-p--hash-table (make-hash-table)
+ "Internal variable used by `file-has-changed-p'.")
+
+(defun file-has-changed-p (file)
+ "Return non-nil if FILE has changed.
+The modification time of FILE is compared to the modification
+time of FILE during a previous invocation of `file-has-changed-p'.
+Therefore the first invocation of `file-has-changed-p' always
+returns non-nil."
+ (let* ((attr (file-attributes file 'integer))
+ (mtime (file-attribute-modification-time attr))
+ (saved-mtime (gethash (intern file)
+ file-has-changed-p--hash-table)))
+ (when (not (equal mtime saved-mtime))
+ (puthash (intern file) mtime file-has-changed-p--hash-table))))
+
(defun copy-directory (directory newname &optional keep-time parents copy-contents)
"Copy DIRECTORY to NEWNAME. Both args must be strings.
This function always sets the file modes of the output files to match
diff --git a/lisp/net/mailcap.el b/lisp/net/mailcap.el
index 83d0eeef9f..4dedd38c22 100644
--- a/lisp/net/mailcap.el
+++ b/lisp/net/mailcap.el
@@ -447,18 +447,19 @@ mailcap-parse-mailcaps
("/etc/mailcap" system)
("/usr/etc/mailcap" system)
("/usr/local/etc/mailcap" system)))))
- ;; The ~/.mailcap entries will end up first in the resulting data.
- (dolist (spec (reverse
- (if (stringp path)
- (split-string path path-separator t)
- path)))
- (let ((source (and (consp spec) (cadr spec)))
- (file-name (if (stringp spec)
- spec
- (car spec))))
- (when (and (file-readable-p file-name)
- (file-regular-p file-name))
- (mailcap-parse-mailcap file-name source))))
+ (when (seq-some (lambda (f) (file-has-changed-p (car f))) path)
+ ;; The ~/.mailcap entries will end up first in the resulting data.
+ (dolist (spec (reverse
+ (if (stringp path)
+ (split-string path path-separator t)
+ path)))
+ (let ((source (and (consp spec) (cadr spec)))
+ (file-name (if (stringp spec)
+ spec
+ (car spec))))
+ (when (and (file-readable-p file-name)
+ (file-regular-p file-name))
+ (mailcap-parse-mailcap file-name source)))))
(setq mailcap-parsed-p t)))
(defun mailcap-parse-mailcap (fname &optional source)
--
2.33.0
next prev parent reply other threads:[~2021-11-01 12:26 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-31 4:11 bug#51523: 29.0.50; gnus-mime-view-part-externally very slow Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-10-31 15:27 ` Lars Ingebrigtsen
2021-10-31 21:47 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-10-31 23:41 ` Gregory Heytings
2021-11-01 0:01 ` Lars Ingebrigtsen
2021-11-01 0:11 ` Gregory Heytings
2021-11-01 0:15 ` Lars Ingebrigtsen
2021-11-01 2:26 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-11-01 13:38 ` Lars Ingebrigtsen
2021-11-01 0:17 ` Gregory Heytings
2021-11-01 0:21 ` Lars Ingebrigtsen
2021-11-01 0:55 ` Gregory Heytings
2021-11-01 1:24 ` Gregory Heytings
2021-11-01 1:26 ` Gregory Heytings
[not found] ` <6abcac838bb94542451d@heytings.org>
2021-11-01 9:28 ` Gregory Heytings
[not found] ` <6abcac838bb83b0904d7@heytings.org>
[not found] ` <6abcac838bad7cded4c5@heytings.org>
2021-11-01 12:26 ` Gregory Heytings [this message]
2021-11-01 13:52 ` Lars Ingebrigtsen
2021-11-01 15:00 ` Eli Zaretskii
2021-11-01 15:20 ` Gregory Heytings
2021-11-01 15:23 ` Lars Ingebrigtsen
2021-11-01 16:46 ` Eli Zaretskii
2021-11-01 16:59 ` Lars Ingebrigtsen
2021-11-01 17:03 ` Eli Zaretskii
2021-11-01 17:15 ` Eli Zaretskii
2021-11-01 17:19 ` Lars Ingebrigtsen
2021-11-01 17:21 ` Eli Zaretskii
2021-11-01 17:23 ` Lars Ingebrigtsen
2021-11-01 17:28 ` Eli Zaretskii
2021-11-01 17:34 ` Lars Ingebrigtsen
2021-11-01 18:17 ` Eli Zaretskii
2021-11-01 21:14 ` Gregory Heytings
2021-11-02 14:50 ` Lars Ingebrigtsen
2021-11-02 15:12 ` Eli Zaretskii
2021-11-03 10:45 ` Gregory Heytings
2021-11-03 12:02 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-11-03 12:57 ` Gregory Heytings
2021-11-03 13:17 ` Eli Zaretskii
2021-11-03 13:27 ` Gregory Heytings
2021-11-03 13:53 ` Eli Zaretskii
2021-11-03 14:25 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-11-03 14:26 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-11-03 15:20 ` Gregory Heytings
2021-11-03 18:56 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-11-03 13:06 ` Eli Zaretskii
2021-11-01 0:04 ` Lars Ingebrigtsen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6abcac838b7f89ee4e21@heytings.org \
--to=gregory@heytings.org \
--cc=51523@debbugs.gnu.org \
--cc=larsi@gnus.org \
--cc=monnier@iro.umontreal.ca \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).