From: David Maus <dmaus@ictsoc.de>
To: emacs-orgmode@gnu.org
Subject: [PATCH] Decode single byte sequence if decoding unicode failed.
Date: Mon, 27 Sep 2010 07:36:01 +0200 [thread overview]
Message-ID: <1285565761-7558-2-git-send-email-dmaus@ictsoc.de> (raw)
In-Reply-To: <8739swi0f0.fsf@gmx.de>
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 2527 bytes --]
From: Sebastian Rose <sebastian_rose@gmx.de>
* org-protocol.el (org-protocol-unhex-single-byte-sequence): New
function. Decode hex-encoded singly byte sequences.
(org-protocol-unhex-compound): Use new function if decoding sequence
as unicode character failed.
---
lisp/org-protocol.el | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/lisp/org-protocol.el b/lisp/org-protocol.el
index 21f28e7..3cd2167 100644
--- a/lisp/org-protocol.el
+++ b/lisp/org-protocol.el
@@ -305,7 +305,7 @@ part."
(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 `ü'."
+encodeURIComponent. E.g. `%C3%B6' is the german Umlaut `ö'."
(setq str (or str ""))
(let ((tmp "")
(case-fold-search t))
@@ -321,7 +321,9 @@ encodeURIComponent. E.g. `%C3%B6' is the german Umlaut `ü'."
(defun org-protocol-unhex-compound (hex)
- "Unhexify unicode hex-chars. E.g. `%C3%B6' is the German Umlaut `ü'."
+ "Unhexify unicode hex-chars. E.g. `%C3%B6' is the German Umlaut `ö'.
+Note: this function also decodes single byte encodings like
+`%E1' (\"á\") if not followed by another `%[A-F0-9]{2}' group."
(let* ((bytes (remove "" (split-string hex "%")))
(ret "")
(eat 0)
@@ -353,12 +355,30 @@ encodeURIComponent. E.g. `%C3%B6' is the german Umlaut `ü'."
(setq val (logxor val xor))
(setq sum (+ (lsh sum shift) val))
(if (> eat 0) (setq eat (- eat 1)))
- (when (= 0 eat)
+ (cond
+ ((= 0 eat) ;multi byte
(setq ret (concat ret (org-protocol-char-to-string sum)))
(setq sum 0))
+ ((not bytes) ; single byte(s)
+ (setq ret (org-protocol-unhex-single-byte-sequence hex))))
)) ;; end (while bytes
ret ))
+(defun org-protocol-unhex-single-byte-sequence(hex)
+ "Unhexify hex-encoded single byte character sequences."
+ (let ((bytes (remove "" (split-string hex "%")))
+ (ret ""))
+ (while bytes
+ (let* ((b (pop bytes))
+ (a (elt b 0))
+ (b (elt b 1))
+ (c1 (if (> a ?9) (+ 10 (- a ?A)) (- a ?0)))
+ (c2 (if (> b ?9) (+ 10 (- b ?A)) (- b ?0))))
+ (setq ret
+ (concat ret (char-to-string
+ (+ (lsh c1 4) c2))))))
+ ret))
+
(defun org-protocol-flatten-greedy (param-list &optional strip-path replacement)
"Greedy handlers might receive a list like this from emacsclient:
'( (\"/dir/org-protocol:/greedy:/~/path1\" (23 . 12)) (\"/dir/param\")
--
1.7.1
next prev parent reply other threads:[~2010-09-27 5:36 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-20 12:42 [bug] org-link-escape and (wrong-type-argument stringp nil) Sébastien Vauban
2010-09-20 18:57 ` David Maus
2010-09-20 19:31 ` Sebastian Rose
2010-09-22 7:19 ` David Maus
2010-09-22 14:25 ` Sebastian Rose
2010-09-23 18:40 ` David Maus
2010-09-23 19:57 ` Sebastian Rose
2010-09-26 18:22 ` David Maus
2010-09-26 21:23 ` Sebastian Rose
2010-09-26 22:43 ` Sebastian Rose
2010-09-26 22:47 ` Sebastian Rose
2010-09-26 22:51 ` Sebastian Rose
2010-09-27 5:36 ` [PATCH] " David Maus
2010-09-27 12:43 ` Sebastian Rose
2010-09-29 15:48 ` Carsten Dominik
2010-09-27 5:36 ` David Maus [this message]
2010-11-04 20:35 ` David Maus
2010-09-20 19:49 ` Sébastien Vauban
2010-09-22 7:20 ` David Maus
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=1285565761-7558-2-git-send-email-dmaus@ictsoc.de \
--to=dmaus@ictsoc.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).