From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Maus Subject: [PATCH 08/16] Declare obsolete & alias to respective org-link-unescape-* functions Date: Sun, 13 Feb 2011 13:01:10 +0100 Message-ID: <1297598478-9925-9-git-send-email-dmaus@ictsoc.de> References: <87d3mwvqwq.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from [140.186.70.92] (port=44160 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PoaeS-0003sA-Bc for emacs-orgmode@gnu.org; Sun, 13 Feb 2011 07:02:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PoaeQ-00076R-Tw for emacs-orgmode@gnu.org; Sun, 13 Feb 2011 07:02:04 -0500 Received: from mail.app1.xlhost.de ([213.202.242.114]:48920 helo=mysql1.xlhost.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PoaeQ-00075v-Jg for emacs-orgmode@gnu.org; Sun, 13 Feb 2011 07:02:02 -0500 In-Reply-To: <87d3mwvqwq.fsf@gnu.org> List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org, bastien.guerry@wikimedia.fr Cc: David Maus * org-protocol.el (org-protocol-unhex-string) (org-protocol-unhex-compound) (org-protocol-unhex-single-byte-sequence): Declare obsolete and alias to respective org-link-unescape-* functions. --- lisp/org-protocol.el | 88 +++++++-------------------------------------= ------ 1 files changed, 12 insertions(+), 76 deletions(-) diff --git a/lisp/org-protocol.el b/lisp/org-protocol.el index eb77f02..078905a 100644 --- a/lisp/org-protocol.el +++ b/lisp/org-protocol.el @@ -130,6 +130,18 @@ (filename &optional up)) (declare-function server-edit "server" (&optional arg)) =20 +(define-obsolete-function-alias + 'org-protocol-unhex-compound 'org-link-unescape-compound + "2010-11-21") + +(define-obsolete-function-alias + 'org-protocol-unhex-string 'org-link-unescape + "2010-11-21") + +(define-obsolete-function-alias + 'org-protocol-unhex-single-byte-sequence + 'org-link-unescape-single-byte-sequence + "2011-11-21") =20 (defgroup org-protocol nil "Intercept calls from emacsclient to trigger custom actions. @@ -292,82 +304,6 @@ part." (mapcar 'org-protocol-unhex-string split-parts)) split-parts))) =20 -(defun org-protocol-unhex-string(str) - "Unhex hexified unicode strings as returned from the JavaScript functi= on -encodeURIComponent. E.g. `%C3%B6' is the german Umlaut `=C3=B6'." - (setq str (or str "")) - (let ((tmp "") - (case-fold-search t)) - (while (string-match "\\(%[0-9a-f][0-9a-f]\\)+" str) - (let* ((start (match-beginning 0)) - (end (match-end 0)) - (hex (match-string 0 str)) - (replacement (org-protocol-unhex-compound (upcase hex)))) - (setq tmp (concat tmp (substring str 0 start) replacement)) - (setq str (substring str end)))) - (setq tmp (concat tmp str)) - tmp)) - - -(defun org-protocol-unhex-compound (hex) - "Unhexify unicode hex-chars. E.g. `%C3%B6' is the German Umlaut `=C3=B6= '. -Note: this function also decodes single byte encodings like -`%E1' (\"=C3=A1\") if not followed by another `%[A-F0-9]{2}' group." - (let* ((bytes (remove "" (split-string hex "%"))) - (ret "") - (eat 0) - (sum 0)) - (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))) - (val (+ (lsh c1 4) c2)) - (shift - (if (=3D 0 eat) ;; new byte - (if (>=3D val 252) 6 - (if (>=3D val 248) 5 - (if (>=3D val 240) 4 - (if (>=3D val 224) 3 - (if (>=3D val 192) 2 0))))) - 6)) - (xor - (if (=3D 0 eat) ;; new byte - (if (>=3D val 252) 252 - (if (>=3D val 248) 248 - (if (>=3D val 240) 240 - (if (>=3D val 224) 224 - (if (>=3D val 192) 192 0))))) - 128))) - (if (>=3D val 192) (setq eat shift)) - (setq val (logxor val xor)) - (setq sum (+ (lsh sum shift) val)) - (if (> eat 0) (setq eat (- eat 1))) - (cond - ((=3D 0 eat) ;multi byte - (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)))) - )) ;; 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 repl= acement) "Greedy handlers might receive a list like this from emacsclient: '( (\"/dir/org-protocol:/greedy:/~/path1\" (23 . 12)) (\"/dir/param\") --=20 1.7.2.3