From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: master 8fd97b1 1/2: Fix warning generated by indian.el + quail.el Date: Wed, 24 Feb 2021 15:57:18 -0500 Message-ID: References: <20210224193216.21758.72611@vcs0.savannah.gnu.org> <20210224193217.F016720B28@vcs0.savannah.gnu.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="11364"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: emacs-devel@gnu.org To: Lars Ingebrigtsen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Wed Feb 24 21:58:11 2021 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lF1EY-0002sN-Uc for ged-emacs-devel@m.gmane-mx.org; Wed, 24 Feb 2021 21:58:10 +0100 Original-Received: from localhost ([::1]:35884 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lF1EX-0005PU-WF for ged-emacs-devel@m.gmane-mx.org; Wed, 24 Feb 2021 15:58:10 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:45778) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lF1Dp-0004rG-6x for emacs-devel@gnu.org; Wed, 24 Feb 2021 15:57:25 -0500 Original-Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:23783) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lF1Dn-00068W-M7 for emacs-devel@gnu.org; Wed, 24 Feb 2021 15:57:24 -0500 Original-Received: from pmg3.iro.umontreal.ca (localhost [127.0.0.1]) by pmg3.iro.umontreal.ca (Proxmox) with ESMTP id E3685441700; Wed, 24 Feb 2021 15:57:20 -0500 (EST) Original-Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg3.iro.umontreal.ca (Proxmox) with ESMTP id ABFE14416E8; Wed, 24 Feb 2021 15:57:19 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1614200239; bh=Su5Wa/qe2HsoKeibnTViLXcvBJaOYVH5HOCsdZWqPLE=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=c67Cl44ahUIIEQym/ul6Zmrv6X3jhqqC8vVt1NJM/SjhJczdP+q6ZzdqbCOfs0jZ/ kmCsw5sq7LJXxXI+aGy6RjiIGyQByD58LD8M7YdTXAWqSq2B/UenJQQ5sZeUCVekz/ +hzq1HsBCxF4BKAHwOwzCFu+MlP1Zs9uSZ/fsVCP9Io13MXOM/1SqkW54rsuN2QMCm eqKlfUu6xEH2bpY5h2Xxuv4Wm8aNeODh/l3rPo3Ci9R85gPqL5bCYYHJ3uHDP/j8i6 J6nVxQJW3fm4oaO8oWri8C630WM6BHhd1Jkttn6NOgmWhpziGVwsXCig46Y/TI+Lr2 op49FRPFt4Ulw== Original-Received: from alfajor (unknown [216.154.41.47]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id C682C1203FD; Wed, 24 Feb 2021 15:57:19 -0500 (EST) In-Reply-To: <20210224193217.F016720B28@vcs0.savannah.gnu.org> (Lars Ingebrigtsen's message of "Wed, 24 Feb 2021 14:32:17 -0500 (EST)") Received-SPF: pass client-ip=132.204.25.50; envelope-from=monnier@iro.umontreal.ca; helo=mailscanner.iro.umontreal.ca X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:265592 Archived-At: > + ;; This is a funcall to avoid `quail-update-leim-list-file' > + ;; determining that this is a quail definition (it searches for > + ;; "(quail-define-package"). > + (funcall #'quail-define-package pkgname lang title nil docstring Would the patch below fix this problem more directly? Stefan diff --git a/lisp/international/quail.el b/lisp/international/quail.el index 5cfa79203d..576189a7de 100644 --- a/lisp/international/quail.el +++ b/lisp/international/quail.el @@ -3081,7 +3081,7 @@ quail-update-leim-list-file (insert-file-contents (car pkg-list)) (goto-char (point-min)) ;; Don't get fooled by commented-out code. - (while (re-search-forward "^[ \t]*(quail-define-package" nil t) + (while (re-search-forward "^[ \t]*(quail-define-package[ \t\n]*\"" nil t) (goto-char (match-beginning 0)) (condition-case nil (let ((form (read (current-buffer))))