From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.bugs Subject: bug#22309: 25.1.50; Bad input method description with spurious \= escapes Date: Mon, 18 Jan 2016 23:12:50 -0800 Organization: UCLA Computer Science Department Message-ID: <569DE1F2.9080607@cs.ucla.edu> References: <84vb78v23s.fsf@gmail.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------030706010104080305050603" X-Trace: ger.gmane.org 1453187607 24816 80.91.229.3 (19 Jan 2016 07:13:27 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 19 Jan 2016 07:13:27 +0000 (UTC) Cc: 22309-done@debbugs.gnu.org To: Vincent =?UTF-8?Q?Bela=C3=AFche?= Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Jan 19 08:13:16 2016 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1aLQTb-0005SS-Iu for geb-bug-gnu-emacs@m.gmane.org; Tue, 19 Jan 2016 08:13:15 +0100 Original-Received: from localhost ([::1]:35365 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aLQTX-00033E-Hw for geb-bug-gnu-emacs@m.gmane.org; Tue, 19 Jan 2016 02:13:11 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49318) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aLQTT-0002zm-8l for bug-gnu-emacs@gnu.org; Tue, 19 Jan 2016 02:13:08 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aLQTO-0005sl-60 for bug-gnu-emacs@gnu.org; Tue, 19 Jan 2016 02:13:07 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:36875) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aLQTO-0005sg-1z for bug-gnu-emacs@gnu.org; Tue, 19 Jan 2016 02:13:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84) (envelope-from ) id 1aLQTN-0000Zm-V8 for bug-gnu-emacs@gnu.org; Tue, 19 Jan 2016 02:13:01 -0500 In-Reply-To: <84vb78v23s.fsf@gmail.com> Resent-From: Paul Eggert Original-Sender: "Debbugs-submit" Resent-To: bug-gnu-emacs@gnu.org Resent-Date: Tue, 19 Jan 2016 07:13:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 22309 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Mail-Followup-To: 22309@debbugs.gnu.org, eggert@cs.ucla.edu, vincentb1@users.sourceforge.net Original-Received: via spool by 22309-done@debbugs.gnu.org id=D22309.14531875812203 (code D ref 22309); Tue, 19 Jan 2016 07:13:01 +0000 Original-Received: (at 22309-done) by debbugs.gnu.org; 19 Jan 2016 07:13:01 +0000 Original-Received: from localhost ([127.0.0.1]:53326 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aLQTM-0000ZT-QH for submit@debbugs.gnu.org; Tue, 19 Jan 2016 02:13:01 -0500 Original-Received: from zimbra.cs.ucla.edu ([131.179.128.68]:56746) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aLQTK-0000ZG-FC for 22309-done@debbugs.gnu.org; Tue, 19 Jan 2016 02:12:59 -0500 Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id AA066160E67; Mon, 18 Jan 2016 23:12:51 -0800 (PST) Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id F-05MLE3-Vox; Mon, 18 Jan 2016 23:12:50 -0800 (PST) Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id DEEBC160E6B; Mon, 18 Jan 2016 23:12:50 -0800 (PST) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id cXtZCUIJ9dDY; Mon, 18 Jan 2016 23:12:50 -0800 (PST) Original-Received: from [192.168.1.9] (pool-100-32-155-148.lsanca.fios.verizon.net [100.32.155.148]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id BD6B1160E67; Mon, 18 Jan 2016 23:12:50 -0800 (PST) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:111733 Archived-At: This is a multi-part message in MIME format. --------------030706010104080305050603 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Thanks for reporting this. I reproduce the problem, and installed the attached fix into the emacs-25 branch. --------------030706010104080305050603 Content-Type: text/x-diff; name="0001-Fix-spurious-escapes-in-describe-input-method.patch" Content-Disposition: attachment; filename="0001-Fix-spurious-escapes-in-describe-input-method.patch" Content-Transfer-Encoding: quoted-printable >From 5ead1ecb8d084b4fab258c18fcea5233b0a22949 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 18 Jan 2016 23:09:15 -0800 Subject: [PATCH] Fix spurious escapes in describe-input-method MIME-Version: 1.0 Content-Type: text/plain; charset=3DUTF-8 Content-Transfer-Encoding: 8bit Problem reported by Vincent Bela=C3=AFche (Bug#22309). * lisp/international/mule-cmds.el (describe-language-environment): * lisp/international/quail.el (quail-help): Apply substitute-command-keys to doc strings before displaying them. --- lisp/international/mule-cmds.el | 2 +- lisp/international/quail.el | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cm= ds.el index 79e9c7b..2df847a 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@ -2119,7 +2119,7 @@ describe-language-environment (with-current-buffer standard-output (insert language-name " language environment\n\n") (if (stringp doc) - (insert doc "\n\n")) + (insert (substitute-command-keys doc) "\n\n")) (condition-case nil (let ((str (eval (get-language-info language-name 'sample-text)))) (if (stringp str) diff --git a/lisp/international/quail.el b/lisp/international/quail.el index 75cb7f7..f5e3902 100644 --- a/lisp/international/quail.el +++ b/lisp/international/quail.el @@ -2516,7 +2516,7 @@ quail-help ")\n\n") (save-restriction (narrow-to-region (point) (point)) - (insert (quail-docstring)) + (insert (substitute-command-keys (quail-docstring))) (goto-char (point-min)) (with-syntax-table emacs-lisp-mode-syntax-table (while (re-search-forward "\\\\<\\sw\\(\\sw\\|\\s_\\)+>" nil t) --=20 2.5.0 --------------030706010104080305050603--