From: David Maus <dmaus@ictsoc.de>
To: emacs-orgmode@gnu.org, bastien.guerry@wikimedia.fr
Cc: David Maus <dmaus@ictsoc.de>
Subject: [PATCH 06/16] Inline function to properly decode utf8 characters in Emacs 22
Date: Sun, 13 Feb 2011 13:01:08 +0100 [thread overview]
Message-ID: <1297598478-9925-7-git-send-email-dmaus@ictsoc.de> (raw)
In-Reply-To: <87d3mwvqwq.fsf@gnu.org>
* org-macs.el (org-char-to-string): Inline function to properly decode
utf8 characters in Emacs 22. Moved and renamed from org-protocol.el.
* org-protocol.el (org-protocol-unhex-compound): Use renamed inline
function.
---
lisp/org-macs.el | 9 ++++++++-
lisp/org-protocol.el | 13 +------------
2 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/lisp/org-macs.el b/lisp/org-macs.el
index 5a56123..4451a54 100644
--- a/lisp/org-macs.el
+++ b/lisp/org-macs.el
@@ -35,7 +35,14 @@
(eval-and-compile
(unless (fboundp 'declare-function)
- (defmacro declare-function (fn file &optional arglist fileonly))))
+ (defmacro declare-function (fn file &optional arglist fileonly)))
+ (if (>= emacs-major-version 23)
+ (defsubst org-char-to-string(c)
+ "Defsubst to decode UTF-8 character values in emacs 23 and beyond."
+ (char-to-string c))
+ (defsubst org-char-to-string (c)
+ "Defsubst to decode UTF-8 character values in emacs 22."
+ (string (decode-char 'ucs c)))))
(declare-function org-add-props "org-compat" (string plist &rest props))
(declare-function org-string-match-p "org-compat" (&rest args))
diff --git a/lisp/org-protocol.el b/lisp/org-protocol.el
index 33878a8..eb77f02 100644
--- a/lisp/org-protocol.el
+++ b/lisp/org-protocol.el
@@ -292,17 +292,6 @@ 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 c))
- (defsubst org-protocol-char-to-string (c)
- "Defsubst to decode UTF-8 character values in emacs 22."
- (string (decode-char 'ucs c)))))
-
(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 `ö'."
@@ -357,7 +346,7 @@ Note: this function also decodes single byte encodings like
(if (> eat 0) (setq eat (- eat 1)))
(cond
((= 0 eat) ;multi byte
- (setq ret (concat ret (org-protocol-char-to-string sum)))
+ (setq ret (concat ret (org-char-to-string sum)))
(setq sum 0))
((not bytes) ; single byte(s)
(setq ret (org-protocol-unhex-single-byte-sequence hex))))
--
1.7.2.3
next prev parent reply other threads:[~2011-02-13 12:01 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-02 19:37 Improve percent escaping links in Org mode (pull request / OK to push) David Maus
2011-02-12 22:17 ` Bastien
2011-02-13 12:01 ` David Maus
2011-02-13 13:41 ` Bastien
2011-02-14 6:38 ` David Maus
2011-02-14 10:09 ` Bastien
2011-02-13 12:01 ` [PATCH 01/16] Decode single byte sequence if decoding unicode failed David Maus
2011-02-13 12:01 ` [PATCH 02/16] New unicode aware percent encoding algorithm David Maus
2011-02-13 12:01 ` [PATCH 03/16] New format of percent escape table David Maus
2011-02-13 12:01 ` [PATCH 04/16] Fixup doc string David Maus
2011-02-13 12:01 ` [PATCH 05/16] New optional argument: Merge user table with default table David Maus
2011-02-13 12:01 ` David Maus [this message]
2011-02-13 12:01 ` [PATCH 07/16] Unescape functions moved and renamed from org-protocol.el David Maus
2011-02-13 12:01 ` [PATCH 08/16] Declare obsolete & alias to respective org-link-unescape-* functions David Maus
2011-02-13 12:01 ` [PATCH 09/16] Remove obsolete argument in call to org-link-unescape David Maus
2011-02-13 12:01 ` [PATCH 10/16] Use new percent escape character table format David Maus
2011-02-13 12:01 ` [PATCH 11/16] Add percent sign to list of escape chars David Maus
2011-02-13 12:01 ` [PATCH 12/16] Rename lambda argument David Maus
2011-02-13 12:01 ` [PATCH 13/16] Refactor unescaping functions David Maus
2011-02-13 12:01 ` [PATCH 14/16] Always percent escape the percent sign David Maus
2011-02-13 12:01 ` [PATCH 15/16] Use `org-link-unescape' instead of obsolete unhex string function David Maus
2011-02-13 12:01 ` [PATCH 16/16] Throw error if encoding character in utf8 fails 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=1297598478-9925-7-git-send-email-dmaus@ictsoc.de \
--to=dmaus@ictsoc.de \
--cc=bastien.guerry@wikimedia.fr \
--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).