Merge from emacs-23

[bpt/emacs.git] / lisp / org / org-protocol.el

diff --git a/lisp/org/org-protocol.el b/lisp/org/org-protocol.el
index 2c6345a..c679138 100644 (file)
--- a/lisp/org/org-protocol.el
+++ b/lisp/org/org-protocol.el
@@ -1,6 +1,6 @@
 ;;; org-protocol.el --- Intercept calls from emacsclient to trigger custom actions.
 ;;
-;; Copyright (C) 2008, 2009, 2010
+;; Copyright (C) 2008, 2009, 2010, 2011
 ;;          Free Software Foundation, Inc.
 ;;
 ;; Author: Bastien Guerry <bzg AT altern DOT org>
@@ -9,7 +9,7 @@
 ;; Author: Ross Patterson <me AT rpatterson DOT net>
 ;; Maintainer: Sebastian Rose <sebastian_rose AT gmx DOT de>
 ;; Keywords: org, emacsclient, wp
-;; Version: 7.01
+;; Version: 7.4
 
 ;; This file is part of GNU Emacs.
 ;;
@@ -260,7 +260,7 @@ Here is an example:
   :group 'org-protocol
   :type '(alist))
 
-(defcustom org-protocol-default-template-key "w"
+(defcustom org-protocol-default-template-key nil
   "The default org-remember-templates key to use."
   :group 'org-protocol
   :type 'string)
@@ -313,7 +313,7 @@ encodeURIComponent. E.g. `%C3%B6' is the german Umlaut `ü'."
       (let* ((start (match-beginning 0))
             (end (match-end 0))
             (hex (match-string 0 str))
-            (replacement (org-protocol-unhex-compound hex)))
+            (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))
@@ -704,5 +704,4 @@ project-plist is the CDR of an element in `org-publish-project-alist', reuse
 
 (provide 'org-protocol)
 
-;; arch-tag: b5c5c2ac-77cf-4a94-a649-2163dff95846
 ;;; org-protocol.el ends here