Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

guile: Fix the mu:body message method #2801

Merged
merged 3 commits into from
Jan 8, 2025
+46 −21
Merged

guile: Fix the mu:body message method #2801

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a703f00
guile: tests: Fix encoding of "atomic" message
bauermann Jan 3, 2025
606f4be
guile: Fix the mu:body message method
bauermann Jan 2, 2025
5113799
mu4e: Update references to :body-txt and :body-html
bauermann Jan 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
guile: tests: Fix encoding of "atomic" message 
It's stated to be US-ASCII with 7-bit encoding, but it contains the
UTF-8 character '—'.

Fixing the encoding very slightly changes the average size of messages
reported by mu:average, so adjust the new expected value.
  • Loading branch information
@bauermann
bauermann committed Jan 3, 2025
commit a703f002143b7167beb4fb10c71a497c8ed5b2f9
4 changes: 2 additions & 2 deletions guile/tests/test-mu-guile.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ exec guile -e main -s $0 $@
(str-equal-or-exit (mu:subject msg) "atoms")
(str-equal-or-exit (mu:to msg) "Democritus <[email protected]>")
(str-equal-or-exit (mu:from msg) "Richard P. Feynman <[email protected]>")
;;(str-equal-or-exit (mu:header msg "Content-transfer-encoding") "7BIT")
;;(str-equal-or-exit (mu:header msg "Content-Transfer-Encoding") "8bit")

(if (not (equal? (mu:priority msg) mu:prio:high))
(error-exit "Expected ~a, got ~a" (mu:priority msg) mu:prio:high))))
Expand All @@ -97,7 +97,7 @@ exec guile -e main -s $0 $@
(define (test-stats)
"Test statistical functions."
;; average
(num-equal-or-exit (mu:average mu:size) 82601/14)
(num-equal-or-exit (mu:average mu:size) 41299/7)
(num-equal-or-exit (floor (mu:stddev mu:size)) 12637.0)
(num-equal-or-exit (mu:max mu:size) 46308)
(num-equal-or-exit (mu:min mu:size) 111))
Expand Down
4 changes: 2 additions & 2 deletions testdata/testdir2/wom_bat/cur/atomic
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ Subject: atoms
To: "Democritus" <[email protected]>
Message-id: <[email protected]>
MIME-version: 1.0
Content-type: text/plain; charset=us-ascii
Content-transfer-encoding: 7BIT
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: high

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this change needed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, otherwise the msg:body test fails, because with the wrong charset the em dash is skipped.
There are two alternatives:

  1. Substitute the em dash with a regular hyphen.
  2. Change the test to expect the wrong text, with the em dash omitted.

Is the charset wrong on purpose?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't change this part in the new version.

If, in some cataclysm, all scientific knowledge were to be destroyed,
Expand Down