From b47a7d51257688704884245972331fe7a9727cc5 Mon Sep 17 00:00:00 2001 From: Achim Gratz Date: Sun, 7 Oct 2012 15:04:00 +0200 Subject: [PATCH 1/4] refer to libraries only by name * contrib/lisp/org-e-odt.el: Replace arc-mode.el -> arc-mode. * lisp/org-odt.el: Replace arc-mode.el -> arc-mode. * lisp/org.el: Replace org-macs.el -> org-macs. --- contrib/lisp/org-e-odt.el | 2 +- lisp/org-odt.el | 2 +- lisp/org.el | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/lisp/org-e-odt.el b/contrib/lisp/org-e-odt.el index b2f7479d6..ecd9ad89f 100644 --- a/contrib/lisp/org-e-odt.el +++ b/contrib/lisp/org-e-odt.el @@ -98,7 +98,7 @@ (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 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)) diff --git a/lisp/org-odt.el b/lisp/org-odt.el index 7e7e5e1b0..2dc3af39b 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 935b58690..bad5a9eeb 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -10976,7 +10976,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)) From d56ad98544e489e25738b3dc45b0060412002eed Mon Sep 17 00:00:00 2001 From: Achim Gratz Date: Sun, 7 Oct 2012 15:01:39 +0200 Subject: [PATCH 2/4] fix a possible (wrong-type-argument stringp nil) error * lisp/org-compat.el: Make sure that file-name-directory is getting a stringp. This avoids a possible "(wrong-type-argument stringp nil)" error when the library in question does not exist. --- lisp/org-compat.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/org-compat.el b/lisp/org-compat.el index 760428496..6e582b8c1 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?" From 4b9db1cce022cb3b6f8d9b6769fecc8929df8e4b Mon Sep 17 00:00:00 2001 From: Achim Gratz Date: Sun, 7 Oct 2012 16:39:30 +0200 Subject: [PATCH 3/4] declare function org-solidify-link-text * contrib/lisp/org-e-odt.el: Declare function org-solidify-link-text from org-exp. --- contrib/lisp/org-e-odt.el | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/lisp/org-e-odt.el b/contrib/lisp/org-e-odt.el index ecd9ad89f..80464c9d1 100644 --- a/contrib/lisp/org-e-odt.el +++ b/contrib/lisp/org-e-odt.el @@ -101,6 +101,7 @@ (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)) From 93f4b7c6d854e34d77632492588dd44526f44989 Mon Sep 17 00:00:00 2001 From: Achim Gratz Date: Sun, 7 Oct 2012 18:06:24 +0200 Subject: [PATCH 4/4] remove utf-8 codepoints in docstrings * lisp/org.el: Remove utf-8 codepoints in docstrings, bytecode doesn't work when loaded from compressed files. Probably a bug in Emacs, but since this is unlikely to be fixed in old Emacsen, simply don't do it. --- lisp/org.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index bad5a9eeb..59683bcce 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -9053,7 +9053,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)) @@ -9063,9 +9063,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 "")