summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchim Gratz <Stromeko@Stromeko.DE>2012-10-07 16:13:06 (GMT)
committer Achim Gratz <Stromeko@Stromeko.DE>2012-10-07 16:13:06 (GMT)
commit12e59b66d13b488b3ba9a71d72c1468c3f20762b (patch)
treef887d891f19bf66a600bf2243f9293935f6d5230
parent956858a39562c2272807704ef128258804ce45a0 (diff)
parent93f4b7c6d854e34d77632492588dd44526f44989 (diff)
downloadorg-mode-12e59b66d13b488b3ba9a71d72c1468c3f20762b.zip
org-mode-12e59b66d13b488b3ba9a71d72c1468c3f20762b.tar.gz
Merge branch 'maint'
-rw-r--r--contrib/lisp/org-e-odt.el6
-rw-r--r--lisp/org-compat.el2
-rw-r--r--lisp/org-odt.el2
-rw-r--r--lisp/org.el8
4 files changed, 9 insertions, 9 deletions
diff --git a/contrib/lisp/org-e-odt.el b/contrib/lisp/org-e-odt.el
index 0ce2e69..a0353ff 100644
--- a/contrib/lisp/org-e-odt.el
+++ b/contrib/lisp/org-e-odt.el
@@ -107,10 +107,10 @@
(declare-function org-id-find-id-file "org-id" (id))
(declare-function hfy-face-to-style "htmlfontify" (fn))
(declare-function hfy-face-or-def-to-name "htmlfontify" (fn))
-(declare-function archive-zip-extract "arc-mode.el" (archive name))
-(declare-function org-create-math-formula "org" (latex-frag &optional
- mathml-file))
+(declare-function archive-zip-extract "arc-mode" (archive name))
+(declare-function org-create-math-formula "org" (latex-frag &optional mathml-file))
(declare-function browse-url-file-url "browse-url" (file))
+(declare-function org-solidify-link-text "org-exp" (s &optional alist))
diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index 7604284..6e582b8 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -327,7 +327,7 @@ Works on both Emacs and XEmacs."
(apply 'propertize string properties)))
(defmacro org-find-library-dir (library)
- `(file-name-directory (locate-library ,library)))
+ `(file-name-directory (or (locate-library ,library) "")))
(defun org-count-lines (s)
"How many lines in string S?"
diff --git a/lisp/org-odt.el b/lisp/org-odt.el
index 7e7e5e1..2dc3af3 100644
--- a/lisp/org-odt.el
+++ b/lisp/org-odt.el
@@ -2718,7 +2718,7 @@ Do this when translation to MathML fails."
(defun org-export-odt-preprocess (parameters)
(org-export-odt-preprocess-label-references))
-(declare-function archive-zip-extract "arc-mode.el" (archive name))
+(declare-function archive-zip-extract "arc-mode" (archive name))
(defun org-odt-zip-extract-one (archive member &optional target)
(require 'arc-mode)
(let* ((target (or target default-directory))
diff --git a/lisp/org.el b/lisp/org.el
index efbdea2..f49bbe1 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -9081,7 +9081,7 @@ If optional argument MERGE is set, merge TABLE into
(defun org-link-unescape (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 o-Umlaut."
(unless (and (null str) (string= "" str))
(let ((pos 0) (case-fold-search t) unhexed)
(while (setq pos (string-match "\\(%[0-9a-f][0-9a-f]\\)+" str pos))
@@ -9091,9 +9091,9 @@ encodeURIComponent. E.g. `%C3%B6' is the german Umlaut `ö'."
str)
(defun org-link-unescape-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 o-Umlaut.
Note: this function also decodes single byte encodings like
-`%E1' (\"á\") if not followed by another `%[A-F0-9]{2}' group."
+`%E1' (a-acute) if not followed by another `%[A-F0-9]{2}' group."
(save-match-data
(let* ((bytes (cdr (split-string hex "%")))
(ret "")
@@ -11038,7 +11038,7 @@ this is used for the GOTO interface."
(org-refile-new-child parent-target child)))
(error "Invalid target location")))))
-(declare-function org-string-nw-p "org-macs.el" (s))
+(declare-function org-string-nw-p "org-macs" (s))
(defun org-refile-check-position (refile-pointer)
"Check if the refile pointer matches the readline to which it points."
(let* ((file (nth 1 refile-pointer))