From: Sebastian Rose <sebastian_rose@gmx.de>
To: Emacs-orgmode mailing list <emacs-orgmode@gnu.org>
Subject: Re: Re: org-protocol bug
Date: Wed, 11 Nov 2009 10:06:36 +0100 [thread overview]
Message-ID: <87fx8lzazn.fsf@gmx.de> (raw)
In-Reply-To: <87tyx1zp3q.fsf@gmx.de> (Sebastian Rose's message of "Wed, 11 Nov 2009 05:01:45 +0100")
[-- Attachment #1: Type: text/plain, Size: 491 bytes --]
Hi Carsten and Andreas,
thanks to Kenichi Handa, here is a proposal to fix the issus mentioned
below. I tested it in emacs 22 and 23 and it seems to work just fine.
Carsten, as always if I use some new elisp construct, please review the
patch. I used `eval-when-compile' and `defsubst' to inline the
char-to-string function, since it might be called very often, depending
on the amount of text passed to emacs through org-protocol.
Andreas, could you check if it works for you, too?
[-- Attachment #2: Decode UTF-8 char integer values in emacs 22, too --]
[-- Type: text/x-diff, Size: 1298 bytes --]
diff --git a/lisp/org-protocol.el b/lisp/org-protocol.el
index 133fae4..9b34ed9 100644
--- a/lisp/org-protocol.el
+++ b/lisp/org-protocol.el
@@ -280,6 +280,19 @@ decode each split part."
(mapcar 'org-protocol-unhex-string split-parts))
split-parts)))
+
+;; This inline function is needed in org-protocol-unhex-compound to do
+;; the right thing to decode UTF-8 char integer values.
+(eval-when-compile
+ (if (>= emacs-major-version 23)
+ (defsubst org-protocol-char-to-string(c)
+ "Defsubst to decode UTF-8 character values in emacs 23 and beyond."
+ (char-to-string sum))
+ (defun org-protocol-char-to-string (c)
+ "Defsubst to decode UTF-8 character values in emacs 22."
+ (string (decode-char 'ucs sum)))))
+
+
(defun org-protocol-unhex-string(str)
"Unhex hexified unicode strings as returned from the JavaScript function
encodeURIComponent. E.g. `%C3%B6' is the german Umlaut `ü'."
@@ -331,7 +344,7 @@ encodeURIComponent. E.g. `%C3%B6' is the german Umlaut `ü'."
(setq sum (+ (lsh sum shift) val))
(if (> eat 0) (setq eat (- eat 1)))
(when (= 0 eat)
- (setq ret (concat ret (char-to-string sum)))
+ (setq ret (concat ret (org-protocol-char-to-string sum)))
(setq sum 0))
)) ;; end (while bytes
ret ))
[-- Attachment #3: Type: text/plain, Size: 528 bytes --]
> Andreas Burtzlaff <andy13@gmx.net> writes:
>> Hello Sebastian,
>>
>> I'm not sure you noticed the org-protocol bug in this thread on the
>> org-mode list:
>> http://www.mail-archive.com/emacs-orgmode@gnu.org/msg18673.html
>>
>> To sum it up, when the title of a page contains an &ndash then the error
>> org-protocol-unhex-compound: Invalid character: 8211, #o20023, #x2013
>> occurs when invoking remember in Emacs 22, not in Emacs 23.
>>
>> Just wondering whether you have any idea how this could be fixed.
Sebastian
[-- Attachment #4: Type: text/plain, Size: 204 bytes --]
_______________________________________________
Emacs-orgmode mailing list
Remember: use `Reply All' to send replies to the list.
Emacs-orgmode@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-orgmode
next prev parent reply other threads:[~2009-11-11 9:06 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20091111004014.4199f1ca.andy13@gmx.net>
2009-11-11 4:01 ` org-protocol bug Sebastian Rose
2009-11-11 9:06 ` Sebastian Rose [this message]
2009-11-11 16:57 ` Andreas Burtzlaff
2009-11-11 18:36 ` Sebastian Rose
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87fx8lzazn.fsf@gmx.de \
--to=sebastian_rose@gmx.de \
--cc=emacs-orgmode@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).