From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kaushal Modi Subject: Re: [PATCH] Fix the single quote printed in the message printed by org-table-edit-formulas Date: Thu, 10 Mar 2016 13:24:15 -0500 Message-ID: References: <87oaamuw2q.fsf@kyleam.com> Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=089e013a04a86404a8052db5ee96 Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:39157) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ae5Gb-0002BM-Tv for emacs-orgmode@gnu.org; Thu, 10 Mar 2016 13:24:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ae5Ga-00025k-9Z for emacs-orgmode@gnu.org; Thu, 10 Mar 2016 13:24:57 -0500 Received: from mail-ob0-x22b.google.com ([2607:f8b0:4003:c01::22b]:33886) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ae5Ga-00025e-0d for emacs-orgmode@gnu.org; Thu, 10 Mar 2016 13:24:56 -0500 Received: by mail-ob0-x22b.google.com with SMTP id ts10so89499227obc.1 for ; Thu, 10 Mar 2016 10:24:55 -0800 (PST) In-Reply-To: List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Kyle Meyer , Paul Eggert Cc: emacs-org list --089e013a04a86404a8052db5ee96 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Here's the updated patch (MINUS the help-echo fix): >From 238ccdfc8bbdeb53196392a4dff96478a19cb5a5 Mon Sep 17 00:00:00 2001 From: Kaushal Modi Date: Wed, 9 Mar 2016 01:18:58 -0500 Subject: [PATCH] Fix the single quote printed in the message MIME-Version: 1.0 Content-Type: text/plain; charset=3DUTF-8 Content-Transfer-Encoding: 8bit Display quotes in key-bindings as straight quotes * lisp/org-agenda.el (org-agenda-show-the-flagging-note): * lisp/org-footnote.el (org-footnote-goto-definition): * lisp/org-table.el (org-table-edit-formulas): Straight quote fix * lisp/org-protocol.el (org-protocol-create-for-org): * lisp/org-table.el (org-table-sum): Minor reformatting Fix the quote style displayed when key-bindings are shown in the echo via (message .. (substitute-command-keys ..)). Starting from emacs 25.1, a straight quote is rendered as a right-curly quote by default. So below will render that single quote as curly. (message "C-c '") The fix is to print that quote verbatim using the "%s" modifier: (message "%s" "C-c '") Below is how this commit changes the message echoed in the org-table-edit-formulas function. Earlier: Edit formulas, finish with =E2=80=98C-c C-c=E2=80=99 or =E2=80=98C-c =E2= =80=99=E2=80=99. See menu for more commands. After fix: Edit formulas, finish with =E2=80=98C-c C-c=E2=80=99 or =E2=80=98C-c '=E2= =80=99. See menu for more commands. Note the difference in the single quote style in "C-c '". --- lisp/org-agenda.el | 5 +++-- lisp/org-footnote.el | 7 +++---- lisp/org-protocol.el | 2 +- lisp/org-table.el | 11 +++++------ 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 876ea44..cd69c74 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -10107,8 +10107,9 @@ tag and (if present) the flagging note." (replace-match "\n" t t)) (goto-char (point-min)) (select-window win) - (message (substitute-command-keys "Flagging note pushed to kill ring. \ -Press \\[org-agenda-show-the-flagging-note] again to remove tag and note"))))) + (message "%s" (substitute-command-keys "Flagging note pushed to \ +kill ring. Press \\[org-agenda-show-the-flagging-note] again to remove \ +tag and note"))))) (defun org-agenda-remove-flag (marker) "Remove the FLAGGED tag and any flagging note in the entry." diff --git a/lisp/org-footnote.el b/lisp/org-footnote.el index e80685a..a847326 100644 --- a/lisp/org-footnote.el +++ b/lisp/org-footnote.el @@ -531,10 +531,9 @@ value if point was successfully moved." (goto-char (match-end 0)) (org-show-context 'link-search) (when (derived-mode-p 'org-mode) - (message - (substitute-command-keys - "Edit definition and go back with `\\[org-mark-ring-goto]' or, if \ -unique, with `\\[org-ctrl-c-ctrl-c]'."))) + (message "%s" (substitute-command-keys + "Edit definition and go back with \ +`\\[org-mark-ring-goto]' or, if unique, with `\\[org-ctrl-c-ctrl-c]'."))) t)) (defun org-footnote-goto-previous-reference (label) diff --git a/lisp/org-protocol.el b/lisp/org-protocol.el index a249c9e..6510733 100644 --- a/lisp/org-protocol.el +++ b/lisp/org-protocol.el @@ -669,7 +669,7 @@ delegates most of the work to `org-protocol-create'." (require 'org-publish) (let ((all (or (org-publish-get-project-from-filename buffer-file-name)))) (if all (org-protocol-create (cdr all)) - (message "Not in an org-project. Did mean %s?" + (message "Not in an org-project. Did you mean `%s'?" (substitute-command-keys"\\[org-protocol-create]"))))) (defun org-protocol-create (&optional project-plist) diff --git a/lisp/org-table.el b/lisp/org-table.el index 488c912..0b7d413 100644 --- a/lisp/org-table.el +++ b/lisp/org-table.el @@ -2136,11 +2136,10 @@ If NLAST is a number, only the NLAST fields will actually be summed." s diff) (format "%.0f:%02.0f:%02.0f" h m s)))) (kill-new sres) - (if (org-called-interactively-p 'interactive) - (message "%s" - (substitute-command-keys - (format "Sum of %d items: %-20s (\\[yank] will insert result into buffer)" - (length numbers) sres)))) + (when (org-called-interactively-p 'interactive) + (message "%s" (substitute-command-keys + (format "Sum of %d items: %-20s \ +(\\[yank] will insert result into buffer)" (length numbers) sres)))) sres)))) (defun org-table-get-number-for-summing (s) @@ -3591,7 +3590,7 @@ Parameters get priority." (when (eq org-table-use-standard-references t) (org-table-fedit-toggle-ref-type)) (org-goto-line startline) - (message + (message "%s" (substitute-command-keys "\\\ Edit formulas, finish with `\\[org-ctrl-c-ctrl-c]' or `\\[org-edit-special]'. \ See menu for more commands."))))) --=20 2.6.0.rc0.24.gec371ff --089e013a04a86404a8052db5ee96 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Here's the updated patch (M= INUS the help-echo fix):

From 238ccdfc8bbdeb53196392a4= dff96478a19cb5a5 Mon Sep 17 00:00:00 2001
F= rom: Kaushal Modi <kaushal.mod= i@gmail.com>
Date: Wed, 9 Mar 2016 0= 1:18:58 -0500
Subject: [PATCH] Fix the sing= le quote printed in the message
MIME-Versio= n: 1.0
Content-Type: text/plain; charset=3D= UTF-8
Content-Transfer-Encoding: 8bit
=

Display quo= tes in key-bindings as straight quotes

=
* lisp/org-agenda.el (org-agenda-show-the-= flagging-note):
* lisp/org-footnote.el (org= -footnote-goto-definition):
* lisp/org-tabl= e.el (org-table-edit-formulas): Straight quote fix

* lisp/org-protocol.el (org-pr= otocol-create-for-org):
* lisp/org-table.el= (org-table-sum): Minor reformatting

Fix the quote style displayed when key-bindi= ngs are shown in
the echo via (message .. (= substitute-command-keys ..)).

Starting from emacs 25.1, a straight quote is rende= red as a right-curly
quote by default.

So below w= ill render that single quote as curly.

=
(message "C-c '")

The fix is to pr= int that quote verbatim using the "%s" modifier:

(message "%s&quo= t; "C-c '")

Below is how this commit changes the message echoed in = the
org-table-edit-formulas function.
=

Earlier:

=C2=A0 E= dit formulas, finish with =E2=80=98C-c C-c=E2=80=99 or =E2=80=98C-c =E2=80= =99=E2=80=99.=C2=A0 See menu for more commands.

After fix:

=C2=A0 Edit formulas, finish= with =E2=80=98C-c C-c=E2=80=99 or =E2=80=98C-c '=E2=80=99.=C2=A0 See m= enu for more commands.

Note the difference in the single quote style in "C-c= '".
---
=C2=A0lisp/org-agenda.el =C2=A0 | =C2=A05 +++--
=C2=A0lisp/org-footnote.el | =C2=A07 +++----
=C2=A0lisp/org-protocol.el | =C2=A02 +-
=C2=A0lisp/org-table.el =C2=A0 =C2=A0| 11 +++++------
=C2=A04 files changed, 12 insertions(+), 13 deletions= (-)

di= ff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 876ea44..cd69c74 100644
--- a= /lisp/org-agenda.el
+++ b/lisp/org-agenda.e= l
@@ -10107,8 +10107,9 @@ tag and (if prese= nt) the flagging note."
=C2=A0 (replace-match "\n" t = t))
=C2=A0 =C2=A0 =C2=A0 =C2=A0(goto-char (= point-min))
=C2=A0 =C2=A0 =C2=A0 =C2=A0(sel= ect-window win)
- =C2=A0 =C2=A0 =C2=A0(mess= age (substitute-command-keys "Flagging note pushed to kill ring. =C2= =A0\
-Press \\[org-agenda-show-the-flagging= -note] again to remove tag and note")))))
+ =C2=A0 =C2=A0 =C2=A0(message "%s" (substitute-command-keys = "Flagging note pushed to \
+kill ring.= =C2=A0 Press \\[org-agenda-show-the-flagging-note] again to remove \
<= div class=3D"gmail_extra">+tag and note")))))
=C2=A0
=C2=A0(defun org-agenda-remo= ve-flag (marker)
=C2=A0 =C2=A0"Remove = the FLAGGED tag and any flagging note in the entry."
diff --git a/lisp/org-footnote.el b/lisp/org-footnote.el
index e80685a..a847326 100644
--- a/lisp/org-footnote.el
+++ b/lisp/org-footnote.el
@@ -531,10 +53= 1,9 @@ value if point was successfully moved."
=C2=A0 =C2=A0 =C2=A0(goto-char (match-end 0))
=C2=A0 =C2=A0 =C2=A0(org-show-context 'link-search)
=C2=A0 =C2=A0 =C2=A0(when (derived-mode-p 'org= -mode)
- =C2=A0 =C2=A0 =C2=A0(message
=
- =C2=A0 =C2=A0 =C2=A0 (substitute-command-keys<= /div>
- "Edit definition and go back with `\\[org-mark-ring-goto]'= ; or, if \
-unique, with `\\[org-ctrl-c-ctr= l-c]'.")))
+ =C2=A0 =C2=A0 =C2=A0(= message "%s" (substitute-command-keys
+ =C2=A0 =C2=A0 &q= uot;Edit definition and go back with \
+`\\= [org-mark-ring-goto]' or, if unique, with `\\[org-ctrl-c-ctrl-c]'.&= quot;)))
=C2=A0 =C2=A0 =C2=A0t))
=C2=A0
=C2=A0(defun o= rg-footnote-goto-previous-reference (label)
diff --git a/lisp/org-protocol.el b/lisp/org-protocol.el
index a249c9e..6510733 100644
--- a/lisp/org-protocol.el
+++ b/lisp/o= rg-protocol.el
@@ -669,7 +669,7 @@ delegate= s most of the work to `org-protocol-create'."
=C2=A0 =C2=A0(require 'org-publish)
=C2=A0 =C2=A0(let ((all (or (org-publish-get-project-from-filename= buffer-file-name))))
=C2=A0 =C2=A0 =C2=A0(= if all (org-protocol-create (cdr all))
- = =C2=A0 =C2=A0 =C2=A0(message "Not in an org-project.=C2=A0 Did mean %s= ?"
+ =C2=A0 =C2=A0 =C2=A0(message &quo= t;Not in an org-project.=C2=A0 Did you mean `%s'?"
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (s= ubstitute-command-keys"\\[org-protocol-create]")))))
=C2=A0
=C2=A0(defun org= -protocol-create (&optional project-plist)
diff --git a/lisp/org-table.el b/lisp/org-table.el
index 488c912..0b7d413 100644
-= -- a/lisp/org-table.el
+++ b/lisp/org-table= .el
@@ -2136,11 +2136,10 @@ If NLAST is a n= umber, only the NLAST fields will actually be summed."
=C2=A0 =C2=A0 s diff)
=C2=A0 =C2=A0 =C2=A0 (format "%.0f:%02.0f:%0= 2.0f" h m s))))
=C2=A0 (kill-new sres)
- (if (org-called= -interactively-p 'interactive)
- =C2=A0 =C2=A0(message "%s= "
- =C2=A0 =C2=A0 (substitute-command-keys
- =C2=A0 = =C2=A0 =C2=A0(format "Sum of %d items: %-20s =C2=A0 =C2=A0 (\\[yank] w= ill insert result into buffer)"
- =C2=A0 =C2=A0 =C2=A0(lengt= h numbers) sres))))
+ (when (org-called-interactively-p 'interac= tive)
+ =C2=A0 =C2=A0(message "%s" (substitute-command-ke= ys
+ =C2=A0 (format "Sum of %d items: %-20s =C2=A0 =C2=A0 \<= /div>
+(\\[yank] will insert result into buffer)&= quot; (length numbers) sres))))
=C2=A0 sres))))
=C2=A0
=C2=A0(defun org-table-g= et-number-for-summing (s)
@@ -3591,7 +3590,= 7 @@ Parameters get priority."
=C2=A0 = =C2=A0 =C2=A0 =C2=A0(when (eq org-table-use-standard-references t)
=C2=A0 <= /span>(org-table-fedit-toggle-ref-type))
= =C2=A0 =C2=A0 =C2=A0 =C2=A0(org-goto-line startline)
- =C2=A0 =C2=A0 =C2=A0(message
+ = =C2=A0 =C2=A0 =C2=A0(message "%s"
=C2=A0 =C2=A0 =C2=A0 = =C2=A0 (substitute-command-keys "\\<org-mode-map>\
=C2=A0Edit formulas, finish with `\\[org-ctrl-c-ctrl-c]&= #39; or `\\[org-edit-special]'. =C2=A0\
=C2=A0See menu for more commands.")))))
--=C2=A0
2.6.0.rc0.24.gec371ff

--089e013a04a86404a8052db5ee96--