From unknown Fri Sep 05 20:54:54 2025 X-Loop: help-debbugs@gnu.org Subject: bug#67133: [PATCH] Fix CBZ file detection in doc-view-mode Resent-From: Morgan Smith Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 12 Nov 2023 17:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 67133 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: 67133@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169981119817510 (code B ref -1); Sun, 12 Nov 2023 17:47:02 +0000 Received: (at submit) by debbugs.gnu.org; 12 Nov 2023 17:46:38 +0000 Received: from localhost ([127.0.0.1]:56955 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r2EXd-0004YK-NZ for submit@debbugs.gnu.org; Sun, 12 Nov 2023 12:46:38 -0500 Received: from lists.gnu.org ([2001:470:142::17]:57348) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r2EXa-0004Y0-Cx for submit@debbugs.gnu.org; Sun, 12 Nov 2023 12:46:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r2EWp-00040E-TB for bug-gnu-emacs@gnu.org; Sun, 12 Nov 2023 12:45:48 -0500 Received: from mail-dm6nam12olkn20813.outbound.protection.outlook.com ([2a01:111:f400:fe59::813] helo=NAM12-DM6-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r2EWn-0005QK-RQ for bug-gnu-emacs@gnu.org; Sun, 12 Nov 2023 12:45:47 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=O7HspYeaLTHzRccMkNfxLmxK3RDOMRD/CgGBXyjkJemD6PEfOUOfEQEEjg3IDeoXMJeDC3YtWGNm8v8NkQS+o4vds+NM84msgbki6A1xxvK0af2ocO4OmMD6itjNkEVoDbMZZka9ityiTPV4x/iyC11g825Eocyr1iL6LsZ0d6ayJ9sbRvT9RAyascdfi3TZWYMNpkekZHjuMkXOYNa4weLysTiNy9af//+g0Y1Kw/jYOUvR+rAsGiXrSg8pIJuGsVR3ZMfVXj3m2qkoWIWN427/sV4bB3/HcjlChgWSQR6OBoUoxWzrMQu0ebc36pIJIIwsV4pif+/gSz3nbEOX9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=qlPGjOHMPVF9wFSmO/h1LAeuDq7NgNY11aAGdhbkQnk=; b=Ah0Fd7HvAhA3S3NxCCmYPiHAfs7Ba4k07eshlcgsP6WemwOP7kp+zxLQpZU0fhH2ykbzwcIVYbpMedS/B7rHSQI6mS38lD9h4oju/6dbf+bN1ONGMI1WrdFNI2yVjU+SuFZS57QHa3BAfYgnGgrYJ+sgbEnX6eBBX1sdgBUF9bVMA82Gh1kqgKvRg9MQqDsEPKW/w+rYifQHCp9I9XK5PqYOGdAWctgmbX5JU5t4kpyL8Qo5KH+H9YJDppSZKeMk/hWg5MwqF93xg/Nd4yR2h90bmHABg742CMhQBa9xUk381FcWHxdhQHltJpELBfUC55Bo+Rd0NCXvNROXq+85ZQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qlPGjOHMPVF9wFSmO/h1LAeuDq7NgNY11aAGdhbkQnk=; b=cXoXyc1f/ptn1N0bEZo5lgp+5+5z9IJNQf/66g0uDsqvLRt/fPpVrmat/3EdskAgmBd3zSOSjFLopCygax5PSKQaQxdGf5bMVd9yxdSEUpKNeFn+NsFK4gWmgQ0HScQcvvUhHge3ms6z7RTuAtKtgDnLmlMaG12I7SpJMbWDhJB2Two300WuF/uQJSuKz9sRc1rj/ekzA5pk4S6A8pR7sDfhoQ0NLR4ql56oxJDGrC598UbWQVu+Z5BkCtSFVRiHA4Li4pdIYY7FHPi/YP+qE/hjh5k/cADsPX90X0g0n/YP/UA4yVOZ1vfBhLC8x2id61QcEeaAAAZwbF6+jpcRWQ== Received: from DM5PR03MB3163.namprd03.prod.outlook.com (2603:10b6:4:40::24) by PH0PR03MB5784.namprd03.prod.outlook.com (2603:10b6:510:31::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.18; Sun, 12 Nov 2023 17:40:37 +0000 Received: from DM5PR03MB3163.namprd03.prod.outlook.com ([fe80::ecdf:2a7b:bf4e:cec2]) by DM5PR03MB3163.namprd03.prod.outlook.com ([fe80::ecdf:2a7b:bf4e:cec2%4]) with mapi id 15.20.7002.010; Sun, 12 Nov 2023 17:40:37 +0000 From: Morgan Smith X-Hashcash: 1:20:231112:bug-gnu-emacs@gnu.org::JZrD62uKFUlUUCAE:NjE9 Date: Sun, 12 Nov 2023 12:40:35 -0500 Message-ID: Content-Type: multipart/mixed; boundary="=-=-=" X-TMN: [ntQJQyeH0nKUieWDFDzVF4GR5HnQ3li6cjQPMpai2caD0dFzgtwCKg==] X-ClientProxiedBy: YQZPR01CA0180.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:8b::14) To DM5PR03MB3163.namprd03.prod.outlook.com (2603:10b6:4:40::24) X-Microsoft-Original-Message-ID: <87bkbyna3w.fsf@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR03MB3163:EE_|PH0PR03MB5784:EE_ X-MS-Office365-Filtering-Correlation-Id: 77ccdd4b-dcf6-480b-047d-08dbe3a67b17 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2RhfW4u4SwFduoUapx+3adBPfH7KgzTsUd0sP8YXEjeahXEbtEtb5IuJqwBDsS3PIUNZr7AQ7zAZ49y+8Wh9Z/GdaaKqrDX2PMDIzBI0R5TN9QlTpjFF3dUaQiAlTEKRD36itf+DFbWsiuMw2kRQ2V/NEQQlR8OHvu3jLxUqmtv86ZJrjbD+inoJcb+hzmPp4zwuuFki6um5ALMWBkOK2BvujyC3rsoBKfCz4tPuXnIDWw+LnRKzkWiyYwDDm4pGJrdAkR4iDRJBQZzr1X57yiAc3uQTzR2ZYVoZYYNR3i1YQCvpLcerMgKawuijK2M6tBwvghf3zm6DPUtmvrgLJws4RdBMu5Mfdl6DmCgFVqlWNhX9wdvMy3FZvk7kBKEATh2BruWrNss2h33QWh7NjGEbcqPYN0rnE0lKIb8RUJR4unCvC6G3e8Ei2i6VUCT1hqzGEbpCjRpAGkP7GSWRtArtiCFLanmCJzTXWZ8HXJ283EIp7iQWEa5DRY//MBlItUxoDYIDmQ5DMctMIeCYzQuUOjfp5Y7scJJbWQjd4T19Bu+Y9LEEiBB3ytOIEHva X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rxczI3YNiNX+dZLVZZb50gYvmLL2InIu1PA15pkzPAxi9PJxxnlbA5qtm/PWmEtc17YXpSC+AXDIquvSTSSLQ37/hpXVUSB6QueGgG4mHftUWtsYfnI72hvlQNgYtkkJfpFRubfRpdgbiFBk2B2I4uEK5B61Pf0ru0QuvVnROifK9yWHrIbaxmmh6TIc4cOZ33QwLpWiype3ZdLVA4J9ys8CGAHhaf5ouoBdfUf+vEr7CqFW3XQ6vknwJK7KrzBvfMkHvEUKURAsRGNoK8YsoQixdKo80muRxyzZ3RFJIDjkxVOBmSs/TZHvpGvBp9cmAwZqfMKj0aR8owJgxazwGSXH1i8FxwgBs06ACGZuLeXl+ea5piF2NsrYTgocYDyxwtMKLBzJhYWShItY5wQrxHfzpJdNUoTKG7qUtNNiusq3cHpeg9IdxwyyPAlsLDDgMGm3VU6ZUvwhm1S5Y+Rp/GEv1bvZz1fp84CwLche+gcfAzJMcjkoufFe6xwWqycc9bzyXmDCFmTZ/4WUErx/wTDvgkLEkodRBZPMvnT+ecJ86Ls0vWMbWLq06CZYAsLKj89OUhvd/xJPzkk/60vmE/9jown8+jGKMG0YZdcjxxR53Kcrxxp773UhQ58z4z9r36mOxw1QGa3ilKOlgGjpL5iXiNQs2l2QHTywCYqMjXylRPpBOB6W1X2jOMdGZJN+l0ncxEXoAJroYyjaHtf4ooLbgsy4tGBtPYaW+DZwhOtvz2/ku1ULNHptwEWU1bndobaKCMdDfxZyNfPnJ9pLn5+TzJSrJAusoPtBxeY6GjKjtkDVczwG1U+vHD7jF/ijX3D8wyck+KEL3v2YC8aE6I6gIowtp4TR59iL4LEon0DOAGnh9E1s1cRMkHjoFwUwlbNqBONGS39ooqWxTXGeDuw9EDrJuDZkCsbZ0lXhpUOGDr7b2oVb8EHnOVgGs/TAbVxQ0jA0K3O7/MiWOYWMvytfAQIR4TFFNKE+ZAbqFMklfoIrhhT6cPcR4LyAJS8wAuB0sdTYikH/hvYWnRQlqdGbD4cnLy+pxUsE24uRC3SbrAgMn+j53/ybasMtJjj8hjUHjZyEwTNeIRNO8TZZr0xE9vdQ9KZGr7RsHc/KCePC6VYnf1YKXqWl8iExIjahgb9YDG1vUPYBtpd1dN8AzILVO3PAnWXRJ2UcC5DhdMHXWo12vMl91JoAkpjxvq1qYyECLcV+WEx1nNL3w7dmp3D+28+OwqcDTgMQHkqBaNlVGpJnadYWjEPw0jxfheBuoFJVG21OIJGY9zDOY78Wdg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 77ccdd4b-dcf6-480b-047d-08dbe3a67b17 X-MS-Exchange-CrossTenant-AuthSource: DM5PR03MB3163.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Nov 2023 17:40:37.6964 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR03MB5784 Received-SPF: pass client-ip=2a01:111:f400:fe59::813; envelope-from=Morgan.J.Smith@outlook.com; helo=NAM12-DM6-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 3.0 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Tags: patch When opening a CBZ file I get the message "doc-view-set-doc-type: Conflicting types: name says (cbz) but content says (epub odf)". Looking at the end of `doc-view-set-doc-type` (lisp/doc-view.el:2141) it's pretty obvious why and it has an easy fix. In fact we already did this fix once before for ODF files as you can see at bug#54 [...] Content analysis details: (3.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (morgan.j.smith[at]outlook.com) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 2.0 SPOOFED_FREEMAIL No description available. X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) --=-=-= Content-Type: text/plain Tags: patch When opening a CBZ file I get the message "doc-view-set-doc-type: Conflicting types: name says (cbz) but content says (epub odf)". Looking at the end of `doc-view-set-doc-type` (lisp/doc-view.el:2141) it's pretty obvious why and it has an easy fix. In fact we already did this fix once before for ODF files as you can see at bug#54947 which resulted in commit b3ff4905388834994ff26d9d033d6bc62b094c1c In GNU Emacs 30.0.50 (build 1, x86_64-pc-linux-gnu, GTK+ Version 3.24.37, cairo version 1.16.0) System Description: Guix System Configured using: 'configure CONFIG_SHELL=/gnu/store/v9p25q9l5nnaixkhpap5rnymmwbhf9rp-bash-minimal-5.1.16/bin/bash SHELL=/gnu/store/v9p25q9l5nnaixkhpap5rnymmwbhf9rp-bash-minimal-5.1.16/bin/bash --prefix=/gnu/store/zfggiiqcxwzb5v48fb6cjkznvcwa12v8-emacs-next-pgtk-git.2117490 --enable-fast-install --with-pgtk --with-cairo --with-modules --with-native-compilation=aot --disable-build-details' --=-=-= Content-Type: text/patch Content-Disposition: attachment; filename=0001-Fix-CBZ-file-detection-in-doc-view-mode.patch >From 1bf925a0ceb43f5472d63e1a8de456d19bb39b73 Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Sun, 12 Nov 2023 12:31:39 -0500 Subject: [PATCH] Fix CBZ file detection in doc-view-mode * lisp/doc-view.el (doc-view-set-doc-type): Fix CBZ file detection This fix is almost identical to the previous fix for ODF file detection in bug#54947 which resulted in commit b3ff4905388834994ff26d9d033d6bc62b094c1c --- lisp/doc-view.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/doc-view.el b/lisp/doc-view.el index fb51661caac..2fdb49f3e42 100644 --- a/lisp/doc-view.el +++ b/lisp/doc-view.el @@ -2133,7 +2133,7 @@ doc-view-set-doc-type ;; zip-archives, so that this same association is used for ;; cbz files. This is fine, as cbz files should be handled ;; like epub anyway. - ((looking-at "PK") '(epub odf)))))) + ((looking-at "PK") '(epub odf cbz)))))) (setq-local doc-view-doc-type (car (or (nreverse (seq-intersection name-types content-types #'eq)) -- 2.41.0 --=-=-=-- From unknown Fri Sep 05 20:54:54 2025 X-Loop: help-debbugs@gnu.org Subject: bug#67133: [PATCH] Fix CBZ file detection in doc-view-mode Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 15 Nov 2023 16:29:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67133 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Morgan Smith , Tassilo Horn Cc: 67133@debbugs.gnu.org Received: via spool by 67133-submit@debbugs.gnu.org id=B67133.17000656938254 (code B ref 67133); Wed, 15 Nov 2023 16:29:04 +0000 Received: (at 67133) by debbugs.gnu.org; 15 Nov 2023 16:28:13 +0000 Received: from localhost ([127.0.0.1]:53136 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3IkO-00028y-HA for submit@debbugs.gnu.org; Wed, 15 Nov 2023 11:28:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58120) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3IQd-0001QS-EQ for 67133@debbugs.gnu.org; Wed, 15 Nov 2023 11:07:47 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r3Fhc-00071V-6g; Wed, 15 Nov 2023 08:13:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=9xhdacHRWO517S1jqmXIKte/tdOVnm8nULIjUOH++Wg=; b=aF65mXmJeRHV EvzgzxEa8w+RAspVU5E8IauArr41T+ACCJl5yY4rSnpDgeKRbpdRE+GW8WerbL8237uIyWjCJnGaI zfYHZAEzjYQH3AWpSPkbldlF2zP42Re5WI5NbZqpI4jMhQEumkf2ZHL0DmQITFZ7Uq2eIVIt4qkKt bW2gLPbtlLHDORKboiMyL/6XIFs2MMBE55f4yX8mavt8rZt/7APrhVze6qzYxLyUUlIBztt2vJFJK 6GzmUWyYJ/Y66WrH76m2ZnN8Q8dqAgMqnb9Fq3dGZTUUQTtKPaDfaPZJ6cLWPqwACNruZtmrAl31Q 0YvSynn+RVMwa/ecnwyh2w==; Date: Wed, 15 Nov 2023 15:12:57 +0200 Message-Id: <831qcrrwh2.fsf@gnu.org> From: Eli Zaretskii In-Reply-To: (message from Morgan Smith on Sun, 12 Nov 2023 12:40:35 -0500) References: X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > From: Morgan Smith > Date: Sun, 12 Nov 2023 12:40:35 -0500 > > When opening a CBZ file I get the message "doc-view-set-doc-type: > Conflicting types: name says (cbz) but content says (epub odf)". > > Looking at the end of `doc-view-set-doc-type` (lisp/doc-view.el:2141) > it's pretty obvious why and it has an easy fix. In fact we already did > this fix once before for ODF files as you can see at bug#54947 which > resulted in commit b3ff4905388834994ff26d9d033d6bc62b094c1c Tassilo, any comments on this? Thanks. From unknown Fri Sep 05 20:54:54 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Morgan Smith Subject: bug#67133: closed (Re: bug#67133: [PATCH] Fix CBZ file detection in doc-view-mode) Message-ID: References: <83edgrq6xg.fsf@gnu.org> X-Gnu-PR-Message: they-closed 67133 X-Gnu-PR-Package: emacs X-Gnu-PR-Keywords: patch Reply-To: 67133@debbugs.gnu.org Date: Wed, 15 Nov 2023 17:11:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1700068262-24232-1" This is a multi-part message in MIME format... ------------=_1700068262-24232-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #67133: [PATCH] Fix CBZ file detection in doc-view-mode which was filed against the emacs package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 67133@debbugs.gnu.org. --=20 67133: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D67133 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1700068262-24232-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 67133-done) by debbugs.gnu.org; 15 Nov 2023 17:10:33 +0000 Received: from localhost ([127.0.0.1]:53465 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3JPN-0006I9-5S for submit@debbugs.gnu.org; Wed, 15 Nov 2023 12:10:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52790) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3JPL-0006Hv-8V for 67133-done@debbugs.gnu.org; Wed, 15 Nov 2023 12:10:32 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r3JPG-00068Q-A9; Wed, 15 Nov 2023 12:10:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=4eNxa3R+LoZ1R5i4UakSvhsxee6+CcWXLHuio7XMI9M=; b=BwseaBKduf3r kD+Gde4LxXD/UrgpbHgvJVlQO15EKc5JpC1mPYX2PQY6MnfDFgfNzfhm8MxWqfygGF10ZtjMxJNRW Vdp4sGzZ4k6zeUjbXB/LAt/0v6wwgdhMq8w5qps7QXU4jidd/THwgW08uONseaRIpaMJwor+mlIiU oEwTqW0mzH50d2bWsOAmXCo+roMwltcX7RRAcy4rlRPXEz6ez8UIrqrGquWIkmGDLtps9OHKcizDy RCEifBw4YzaGDdqxYuWs+N7kTsKGmdqzYmZHWlbQum+E7jQUOXmxzRHbQjyWPWMYgVrkCY+7IBlnS 11rIiF5f6O/Orh2hJgS0cg==; Date: Wed, 15 Nov 2023 19:10:03 +0200 Message-Id: <83edgrq6xg.fsf@gnu.org> From: Eli Zaretskii To: Tassilo Horn In-Reply-To: <874jhn58ee.fsf@gnu.org> (message from Tassilo Horn on Wed, 15 Nov 2023 16:43:53 +0100) Subject: Re: bug#67133: [PATCH] Fix CBZ file detection in doc-view-mode References: <874jhn58ee.fsf@gnu.org> X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 67133-done Cc: Morgan.J.Smith@outlook.com, 67133-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > From: Tassilo Horn > Cc: Eli Zaretskii > Date: Wed, 15 Nov 2023 16:43:53 +0100 > > Morgan Smith writes: > > Hi Morgan & Eli, > > > Tags: patch > > > > When opening a CBZ file I get the message "doc-view-set-doc-type: > > Conflicting types: name says (cbz) but content says (epub odf)". > > I approve this patch. Feel free to commit it where you see fit. Thanks, installed on the emacs-29 branch, and closing the bug. ------------=_1700068262-24232-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 12 Nov 2023 17:46:38 +0000 Received: from localhost ([127.0.0.1]:56955 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r2EXd-0004YK-NZ for submit@debbugs.gnu.org; Sun, 12 Nov 2023 12:46:38 -0500 Received: from lists.gnu.org ([2001:470:142::17]:57348) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r2EXa-0004Y0-Cx for submit@debbugs.gnu.org; Sun, 12 Nov 2023 12:46:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r2EWp-00040E-TB for bug-gnu-emacs@gnu.org; Sun, 12 Nov 2023 12:45:48 -0500 Received: from mail-dm6nam12olkn20813.outbound.protection.outlook.com ([2a01:111:f400:fe59::813] helo=NAM12-DM6-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r2EWn-0005QK-RQ for bug-gnu-emacs@gnu.org; Sun, 12 Nov 2023 12:45:47 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=O7HspYeaLTHzRccMkNfxLmxK3RDOMRD/CgGBXyjkJemD6PEfOUOfEQEEjg3IDeoXMJeDC3YtWGNm8v8NkQS+o4vds+NM84msgbki6A1xxvK0af2ocO4OmMD6itjNkEVoDbMZZka9ityiTPV4x/iyC11g825Eocyr1iL6LsZ0d6ayJ9sbRvT9RAyascdfi3TZWYMNpkekZHjuMkXOYNa4weLysTiNy9af//+g0Y1Kw/jYOUvR+rAsGiXrSg8pIJuGsVR3ZMfVXj3m2qkoWIWN427/sV4bB3/HcjlChgWSQR6OBoUoxWzrMQu0ebc36pIJIIwsV4pif+/gSz3nbEOX9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=qlPGjOHMPVF9wFSmO/h1LAeuDq7NgNY11aAGdhbkQnk=; b=Ah0Fd7HvAhA3S3NxCCmYPiHAfs7Ba4k07eshlcgsP6WemwOP7kp+zxLQpZU0fhH2ykbzwcIVYbpMedS/B7rHSQI6mS38lD9h4oju/6dbf+bN1ONGMI1WrdFNI2yVjU+SuFZS57QHa3BAfYgnGgrYJ+sgbEnX6eBBX1sdgBUF9bVMA82Gh1kqgKvRg9MQqDsEPKW/w+rYifQHCp9I9XK5PqYOGdAWctgmbX5JU5t4kpyL8Qo5KH+H9YJDppSZKeMk/hWg5MwqF93xg/Nd4yR2h90bmHABg742CMhQBa9xUk381FcWHxdhQHltJpELBfUC55Bo+Rd0NCXvNROXq+85ZQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qlPGjOHMPVF9wFSmO/h1LAeuDq7NgNY11aAGdhbkQnk=; b=cXoXyc1f/ptn1N0bEZo5lgp+5+5z9IJNQf/66g0uDsqvLRt/fPpVrmat/3EdskAgmBd3zSOSjFLopCygax5PSKQaQxdGf5bMVd9yxdSEUpKNeFn+NsFK4gWmgQ0HScQcvvUhHge3ms6z7RTuAtKtgDnLmlMaG12I7SpJMbWDhJB2Two300WuF/uQJSuKz9sRc1rj/ekzA5pk4S6A8pR7sDfhoQ0NLR4ql56oxJDGrC598UbWQVu+Z5BkCtSFVRiHA4Li4pdIYY7FHPi/YP+qE/hjh5k/cADsPX90X0g0n/YP/UA4yVOZ1vfBhLC8x2id61QcEeaAAAZwbF6+jpcRWQ== Received: from DM5PR03MB3163.namprd03.prod.outlook.com (2603:10b6:4:40::24) by PH0PR03MB5784.namprd03.prod.outlook.com (2603:10b6:510:31::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.18; Sun, 12 Nov 2023 17:40:37 +0000 Received: from DM5PR03MB3163.namprd03.prod.outlook.com ([fe80::ecdf:2a7b:bf4e:cec2]) by DM5PR03MB3163.namprd03.prod.outlook.com ([fe80::ecdf:2a7b:bf4e:cec2%4]) with mapi id 15.20.7002.010; Sun, 12 Nov 2023 17:40:37 +0000 From: Morgan Smith To: bug-gnu-emacs@gnu.org Subject: [PATCH] Fix CBZ file detection in doc-view-mode X-Hashcash: 1:20:231112:bug-gnu-emacs@gnu.org::JZrD62uKFUlUUCAE:NjE9 Date: Sun, 12 Nov 2023 12:40:35 -0500 Message-ID: Content-Type: multipart/mixed; boundary="=-=-=" X-TMN: [ntQJQyeH0nKUieWDFDzVF4GR5HnQ3li6cjQPMpai2caD0dFzgtwCKg==] X-ClientProxiedBy: YQZPR01CA0180.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:8b::14) To DM5PR03MB3163.namprd03.prod.outlook.com (2603:10b6:4:40::24) X-Microsoft-Original-Message-ID: <87bkbyna3w.fsf@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR03MB3163:EE_|PH0PR03MB5784:EE_ X-MS-Office365-Filtering-Correlation-Id: 77ccdd4b-dcf6-480b-047d-08dbe3a67b17 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2RhfW4u4SwFduoUapx+3adBPfH7KgzTsUd0sP8YXEjeahXEbtEtb5IuJqwBDsS3PIUNZr7AQ7zAZ49y+8Wh9Z/GdaaKqrDX2PMDIzBI0R5TN9QlTpjFF3dUaQiAlTEKRD36itf+DFbWsiuMw2kRQ2V/NEQQlR8OHvu3jLxUqmtv86ZJrjbD+inoJcb+hzmPp4zwuuFki6um5ALMWBkOK2BvujyC3rsoBKfCz4tPuXnIDWw+LnRKzkWiyYwDDm4pGJrdAkR4iDRJBQZzr1X57yiAc3uQTzR2ZYVoZYYNR3i1YQCvpLcerMgKawuijK2M6tBwvghf3zm6DPUtmvrgLJws4RdBMu5Mfdl6DmCgFVqlWNhX9wdvMy3FZvk7kBKEATh2BruWrNss2h33QWh7NjGEbcqPYN0rnE0lKIb8RUJR4unCvC6G3e8Ei2i6VUCT1hqzGEbpCjRpAGkP7GSWRtArtiCFLanmCJzTXWZ8HXJ283EIp7iQWEa5DRY//MBlItUxoDYIDmQ5DMctMIeCYzQuUOjfp5Y7scJJbWQjd4T19Bu+Y9LEEiBB3ytOIEHva X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?rxczI3YNiNX+dZLVZZb50gYvmLL2InIu1PA15pkzPAxi9PJxxnlbA5qtm/PW?= =?us-ascii?Q?mEtc17YXpSC+AXDIquvSTSSLQ37/hpXVUSB6QueGgG4mHftUWtsYfnI72hvl?= =?us-ascii?Q?QNgYtkkJfpFRubfRpdgbiFBk2B2I4uEK5B61Pf0ru0QuvVnROifK9yWHrIba?= =?us-ascii?Q?xmmh6TIc4cOZ33QwLpWiype3ZdLVA4J9ys8CGAHhaf5ouoBdfUf+vEr7CqFW?= =?us-ascii?Q?3XQ6vknwJK7KrzBvfMkHvEUKURAsRGNoK8YsoQixdKo80muRxyzZ3RFJIDjk?= =?us-ascii?Q?xVOBmSs/TZHvpGvBp9cmAwZqfMKj0aR8owJgxazwGSXH1i8FxwgBs06ACGZu?= =?us-ascii?Q?LeXl+ea5piF2NsrYTgocYDyxwtMKLBzJhYWShItY5wQrxHfzpJdNUoTKG7qU?= =?us-ascii?Q?tNNiusq3cHpeg9IdxwyyPAlsLDDgMGm3VU6ZUvwhm1S5Y+Rp/GEv1bvZz1fp?= =?us-ascii?Q?84CwLche+gcfAzJMcjkoufFe6xwWqycc9bzyXmDCFmTZ/4WUErx/wTDvgkLE?= =?us-ascii?Q?kodRBZPMvnT+ecJ86Ls0vWMbWLq06CZYAsLKj89OUhvd/xJPzkk/60vmE/9j?= =?us-ascii?Q?own8+jGKMG0YZdcjxxR53Kcrxxp773UhQ58z4z9r36mOxw1QGa3ilKOlgGjp?= =?us-ascii?Q?L5iXiNQs2l2QHTywCYqMjXylRPpBOB6W1X2jOMdGZJN+l0ncxEXoAJroYyja?= =?us-ascii?Q?Htf4ooLbgsy4tGBtPYaW+DZwhOtvz2/ku1ULNHptwEWU1bndobaKCMdDfxZy?= =?us-ascii?Q?NfPnJ9pLn5+TzJSrJAusoPtBxeY6GjKjtkDVczwG1U+vHD7jF/ijX3D8wyck?= =?us-ascii?Q?+KEL3v2YC8aE6I6gIowtp4TR59iL4LEon0DOAGnh9E1s1cRMkHjoFwUwlbNq?= =?us-ascii?Q?BONGS39ooqWxTXGeDuw9EDrJuDZkCsbZ0lXhpUOGDr7b2oVb8EHnOVgGs/TA?= =?us-ascii?Q?bVxQ0jA0K3O7/MiWOYWMvytfAQIR4TFFNKE+ZAbqFMklfoIrhhT6cPcR4LyA?= =?us-ascii?Q?JS8wAuB0sdTYikH/hvYWnRQlqdGbD4cnLy+pxUsE24uRC3SbrAgMn+j53/yb?= =?us-ascii?Q?asMtJjj8hjUHjZyEwTNeIRNO8TZZr0xE9vdQ9KZGr7RsHc/KCePC6VYnf1YK?= =?us-ascii?Q?XqWl8iExIjahgb9YDG1vUPYBtpd1dN8AzILVO3PAnWXRJ2UcC5DhdMHXWo12?= =?us-ascii?Q?vMl91JoAkpjxvq1qYyECLcV+WEx1nNL3w7dmp3D+28+OwqcDTgMQHkqBaNlV?= =?us-ascii?Q?GpJnadYWjEPw0jxfheBuoFJVG21OIJGY9zDOY78Wdg=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 77ccdd4b-dcf6-480b-047d-08dbe3a67b17 X-MS-Exchange-CrossTenant-AuthSource: DM5PR03MB3163.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Nov 2023 17:40:37.6964 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR03MB5784 Received-SPF: pass client-ip=2a01:111:f400:fe59::813; envelope-from=Morgan.J.Smith@outlook.com; helo=NAM12-DM6-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 3.0 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Tags: patch When opening a CBZ file I get the message "doc-view-set-doc-type: Conflicting types: name says (cbz) but content says (epub odf)". Looking at the end of `doc-view-set-doc-type` (lisp/doc-view.el:2141) it's pretty obvious why and it has an easy fix. In fact we already did this fix once before for ODF files as you can see at bug#54 [...] Content analysis details: (3.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (morgan.j.smith[at]outlook.com) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 2.0 SPOOFED_FREEMAIL No description available. X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) --=-=-= Content-Type: text/plain Tags: patch When opening a CBZ file I get the message "doc-view-set-doc-type: Conflicting types: name says (cbz) but content says (epub odf)". Looking at the end of `doc-view-set-doc-type` (lisp/doc-view.el:2141) it's pretty obvious why and it has an easy fix. In fact we already did this fix once before for ODF files as you can see at bug#54947 which resulted in commit b3ff4905388834994ff26d9d033d6bc62b094c1c In GNU Emacs 30.0.50 (build 1, x86_64-pc-linux-gnu, GTK+ Version 3.24.37, cairo version 1.16.0) System Description: Guix System Configured using: 'configure CONFIG_SHELL=/gnu/store/v9p25q9l5nnaixkhpap5rnymmwbhf9rp-bash-minimal-5.1.16/bin/bash SHELL=/gnu/store/v9p25q9l5nnaixkhpap5rnymmwbhf9rp-bash-minimal-5.1.16/bin/bash --prefix=/gnu/store/zfggiiqcxwzb5v48fb6cjkznvcwa12v8-emacs-next-pgtk-git.2117490 --enable-fast-install --with-pgtk --with-cairo --with-modules --with-native-compilation=aot --disable-build-details' --=-=-= Content-Type: text/patch Content-Disposition: attachment; filename=0001-Fix-CBZ-file-detection-in-doc-view-mode.patch >From 1bf925a0ceb43f5472d63e1a8de456d19bb39b73 Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Sun, 12 Nov 2023 12:31:39 -0500 Subject: [PATCH] Fix CBZ file detection in doc-view-mode * lisp/doc-view.el (doc-view-set-doc-type): Fix CBZ file detection This fix is almost identical to the previous fix for ODF file detection in bug#54947 which resulted in commit b3ff4905388834994ff26d9d033d6bc62b094c1c --- lisp/doc-view.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/doc-view.el b/lisp/doc-view.el index fb51661caac..2fdb49f3e42 100644 --- a/lisp/doc-view.el +++ b/lisp/doc-view.el @@ -2133,7 +2133,7 @@ doc-view-set-doc-type ;; zip-archives, so that this same association is used for ;; cbz files. This is fine, as cbz files should be handled ;; like epub anyway. - ((looking-at "PK") '(epub odf)))))) + ((looking-at "PK") '(epub odf cbz)))))) (setq-local doc-view-doc-type (car (or (nreverse (seq-intersection name-types content-types #'eq)) -- 2.41.0 --=-=-=-- ------------=_1700068262-24232-1--