At Sat, 02 Jul 2011 16:05:23 +0200, Bastien wrote: > > Dear all, > > if there is important bugs and patches left, please resubmit > them before tomorrow, as we will release 7.6 tomorrow.
Three patches, byte compiler complains with Emacs 22, one for a accidentally scoped variable in org-latex's preprocessor. Best, -- David -- OpenPGP... 0x99ADB83B5A4478E6 Jabber.... dmj...@jabber.org Email..... dm...@ictsoc.de
From ef2ebd1e72ee3b96ffb82acf61e99255dbf712b7 Mon Sep 17 00:00:00 2001
From: David Maus <dm...@ictsoc.de>
Date: Sat, 2 Jul 2011 16:15:14 +0200
Subject: [PATCH 1/3] Call kill-buffer with argument nil
* ob-haskell.el (org-babel-haskell-export-to-lhs): Call kill-buffer
with argument indiciating to kill current buffer. Emacs 22
compatibility.
GNU Emacs 22.3.2 (i686-pc-linux-gnu) of 2011-05-28 on x60s
C-h f kill-buffer RET
kill-buffer is an interactive built-in function in `C source code'.
It is bound to C-x k.
(kill-buffer buffer)
Kill the buffer buffer.
The argument may be a buffer or the name of a buffer.
With a nil argument, kill the current buffer.
---
lisp/ob-haskell.el | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lisp/ob-haskell.el b/lisp/ob-haskell.el
index 4e3e797..822f90a 100644
--- a/lisp/ob-haskell.el
+++ b/lisp/ob-haskell.el
@@ -192,7 +192,7 @@ constructs (header arguments, no-web syntax etc...) are
ignored."
(save-excursion
;; export to latex w/org and save as .lhs
(find-file tmp-org-file) (funcall 'org-export-as-latex nil)
- (kill-buffer)
+ (kill-buffer nil)
(delete-file tmp-org-file)
(find-file tmp-tex-file)
(goto-char (point-min)) (forward-line 2)
@@ -202,7 +202,7 @@ constructs (header arguments, no-web syntax etc...) are
ignored."
(replace-match (save-match-data (org-remove-indentation (match-string
0)))
t t))
(setq contents (buffer-string))
- (save-buffer) (kill-buffer))
+ (save-buffer) (kill-buffer nil))
(delete-file tmp-tex-file)
;; save org exported latex to a .lhs file
(with-temp-file lhs-file (insert contents))
--
1.7.2.5
From 18ceb101fd2b701eefed279b6a13a04119ae016e Mon Sep 17 00:00:00 2001
From: David Maus <dm...@ictsoc.de>
Date: Sat, 2 Jul 2011 16:27:43 +0200
Subject: [PATCH 2/3] Add missing :group keyword in defcustom
* org-html.el (org-export-html-protect-char-alist): Add missing :group
keyword in defcustom.
---
lisp/org-html.el | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/lisp/org-html.el b/lisp/org-html.el
index 6e3bc19..b775834 100644
--- a/lisp/org-html.el
+++ b/lisp/org-html.el
@@ -565,6 +565,7 @@ a file."
("<" . "<")
(">" . ">"))
"Alist of characters to be converted by `org-html-protect'."
+ :group 'org-export-html
:type '(repeat (cons (string :tag "Character")
(string :tag "HTML equivalent"))))
--
1.7.2.5
From f88f16c47c3bd23ab6139992259a941b82a52451 Mon Sep 17 00:00:00 2001
From: David Maus <dm...@ictsoc.de>
Date: Sat, 2 Jul 2011 16:30:00 +0200
Subject: [PATCH 3/3] Use org-string-match-p for backward compatibility with
Emacs22
* org-freemind.el (org-freemind-convert-links-helper)
(org-freemind-convert-text-p, org-freemind-write-mm-buffer)
(org-freemind-get-node-style): Use org-string-match-p for backward
compatibility with Emacs22.
---
lisp/org-freemind.el | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lisp/org-freemind.el b/lisp/org-freemind.el
index 5ea941d..e418659 100644
--- a/lisp/org-freemind.el
+++ b/lisp/org-freemind.el
@@ -308,7 +308,7 @@ MATCHED is the link just matched."
(let* ((link (match-string 1 matched))
(text (match-string 2 matched))
(ext (file-name-extension link))
- (col-pos (string-match-p ":" link))
+ (col-pos (org-string-match-p ":" link))
(is-img (and (image-type-from-file-name link)
(let ((url-type (substring link 0 col-pos)))
(member url-type '("file" "http" "https")))))
@@ -414,7 +414,7 @@ MATCHED is the link just matched."
(defun org-freemind-convert-text-p (text)
"Convert TEXT to html with <p> paragraphs."
;; (string-match-p "[^ ]" " a")
- (setq org-freemind-bol-helper-base-indent (string-match-p "[^ ]" text))
+ (setq org-freemind-bol-helper-base-indent (org-string-match-p "[^ ]" text))
(setq text (org-freemind-escape-str-from-org text))
(setq text (replace-regexp-in-string
"\\([[:space:]]\\)\\(/\\)\\([^/]+\\)\\(/\\)\\([[:space:]]\\)"
"\\1<i>\\3</i>\\5" text))
@@ -658,7 +658,7 @@ Otherwise give an error say the file exists."
(defun org-freemind-write-mm-buffer (org-buffer mm-buffer node-at-line)
(with-current-buffer org-buffer
(dolist (node-style org-freemind-node-styles)
- (when (string-match-p (car node-style) buffer-file-name)
+ (when (org-string-match-p (car node-style) buffer-file-name)
(setq org-freemind-node-style (cadr node-style))))
;;(message "org-freemind-node-style =%s" org-freemind-node-style)
(save-match-data
@@ -835,7 +835,7 @@ Otherwise give an error say the file exists."
(dolist (style-list org-freemind-node-style)
(let ((node-regexp (car style-list)))
(message "node-regexp=%s node-name=%s" node-regexp node-name)
- (when (string-match-p node-regexp node-name)
+ (when (org-string-match-p node-regexp node-name)
;;(setq node-style (org-freemind-do-apply-node-style style-list))
(setq node-style (cadr style-list))
(when node-style
--
1.7.2.5
From 7c9ba3975c777e85ea8822043afa21ce9f18df0a Mon Sep 17 00:00:00 2001
From: David Maus <dm...@ictsoc.de>
Date: Sat, 2 Jul 2011 16:25:59 +0200
Subject: [PATCH] Use function argument instead of dynamically scoped symbol
* org-latex.el (org-export-latex-preprocess): Use function argument
instead of dynamically scoped symbol.
Export options are passed to org-export-preprocess-string which passes
them down to backend specific preprocessor. The :footnotes option is
included.
---
lisp/org-latex.el | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/lisp/org-latex.el b/lisp/org-latex.el
index 694f65b..8266e9e 100644
--- a/lisp/org-latex.el
+++ b/lisp/org-latex.el
@@ -2430,7 +2430,7 @@ The conversion is made depending of STRING-BEFORE and
STRING-AFTER."
(replace-match "")))
;; When converting to LaTeX, replace footnotes.
- (when (plist-get opt-plist :footnotes)
+ (when (plist-get parameters :footnotes)
(goto-char (point-min))
(let (ref)
(while (setq ref (org-footnote-get-next-reference))
--
1.7.2.5
pgpeHSHc8TJcS.pgp
Description: PGP signature
