Browse Source

org-protocol: Remove dependency on url.el

Patch by Sebastian Rose
Carsten Dominik 16 years ago
parent
commit
1c9d7a6d73
2 changed files with 9 additions and 4 deletions
  1. 4 0
      lisp/ChangeLog
  2. 5 4
      lisp/org-protocol.el

+ 4 - 0
lisp/ChangeLog

@@ -1,5 +1,9 @@
 2009-04-23  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org-protocol.el: Remove dependency on url.el.
+	(org-protocol-unhex-compound, org-protocol-open-source): Remove
+	dependency on url.el.
+
 	* org-latex.el (org-export-as-pdf): Use
 	`org-latex-to-pdf-process'.
 

+ 5 - 4
lisp/org-protocol.el

@@ -124,7 +124,6 @@
 ;;; Code:
 
 (require 'org)
-(require 'url)
 (eval-when-compile
   (require 'cl))
 
@@ -307,8 +306,10 @@ encodeURIComponent. E.g. `%C3%B6' is the german Umlaut `ü'."
 	 (sum 0))
     (while bytes
       (let* ((b (pop bytes))
-	     (c1 (url-unhex (elt b 0)))
-	     (c2 (url-unhex (elt b 1)))
+	     (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 (= 0 eat) ;; new byte
@@ -483,7 +484,7 @@ The location for a browser's bookmark should look like this:
   ;; As we enter this function for a match on our protocol, the return value
   ;; defaults to nil.
   (let ((result nil)
-        (f (url-unhex-string fname)))
+        (f (org-protocol-unhex-string fname)))
     (catch 'result
       (dolist (prolist org-protocol-project-alist)
         (let* ((base-url (plist-get (cdr prolist) :base-url))