Here is a patch against hotfix to fix warnings about wrong
variables names (with Emacs 24).
Please test it heavily.
Thanks a lot to Martyn Jago for a preliminary set of patches
for this!
diff --git a/lisp/ob-maxima.el b/lisp/ob-maxima.el
index 63f1e32..8da20af 100644
--- a/lisp/ob-maxima.el
+++ b/lisp/ob-maxima.el
@@ -42,7 +42,8 @@
(defcustom org-babel-maxima-command
(if (boundp 'maxima-command) maxima-command maxima)
- Command used to call maxima on the shell.)
+ Command used to call maxima on the shell.
+ :group 'org-babel)
(defun org-babel-maxima-expand (body params)
Expand a block of Maxima code according to its header arguments.
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 81377ca..f706050 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -91,7 +91,7 @@
(defvar org-agenda-buffer-name)
(defvar org-agenda-overriding-header)
(defvar org-agenda-title-append nil)
-(defvar entry)
+(defvar org-entry)
(defvar date)
(defvar org-agenda-undo-list)
(defvar org-agenda-pending-undo-list)
@@ -4530,8 +4530,8 @@ function from a program - use `org-agenda-get-day-entries' instead.
(org-compile-prefix-format 'agenda)
(org-set-sorting-strategy 'agenda)
(setq args (or args '(:deadline :scheduled :timestamp :sexp)))
- (let* ((files (if (and entry (stringp entry) (string-match \\S- entry))
- (list entry)
+ (let* ((files (if (and org-entry (stringp org-entry) (string-match \\S- org-entry))
+ (list org-entry)
(org-agenda-files t)))
(time (org-float-time))
file rtn results)
@@ -4936,7 +4936,7 @@ holiday will also be skipped.
(not (member (car (calendar-iso-from-absolute d)) skip-weeks
(not (and (memq 'holidays skip-weeks)
(calendar-check-holidays date)))
- entry)))
+ org-entry)))
(defun org-diary-class (m1 d1 y1 m2 d2 y2 dayname rest skip-weeks)
Like `org-class', but honor `calendar-date-style'.
diff --git a/lisp/org-beamer.el b/lisp/org-beamer.el
index e6084d2..7882b27 100644
--- a/lisp/org-beamer.el
+++ b/lisp/org-beamer.el
@@ -235,7 +235,7 @@ in org-export-latex-classes.
(envs (append org-beamer-environments-extra
org-beamer-environments-default))
(props (org-get-text-property-any 0 'org-props text))
- (in ) (out ) option action defaction environment extra
+ (in ) (out ) org-beamer-option org-beamer-action org-beamer-defaction org-beamer-environment org-beamer-extra
columns-option column-option
env have-text ass tmp)
(if (= frame-level 0) (setq frame-level nil))
@@ -266,10 +266,10 @@ in org-export-latex-classes.
(setq in (org-fill-template
\\begin{frame}%a%A%o%T%S%x
- (list (cons a (or action ))
- (cons A (or defaction ))
- (cons o (or option org-beamer-frame-default-options ))
- (cons x (if extra (concat \n extra) ))
+ (list (cons a (or org-beamer-action ))
+ (cons A (or org-beamer-defaction ))
+ (cons o (or org-beamer-option org-beamer-frame-default-options ))
+ (cons x (if org-beamer-extra (concat \n org-beamer-extra) ))
(cons h %s)
(cons T (if (string-match \\S- text)
\n\\frametitle{%s} ))
@@ -294,10 +294,10 @@ in org-export-latex-classes.
(setq have-text (string-match \\S- text))
(setq in (org-fill-template
(nth 2 ass)
- (list (cons a (or action ))
- (cons A (or defaction ))
- (cons o (or option ))
- (cons x (if extra (concat \n extra) ))
+ (list (cons a (or org-beamer-action ))
+ (cons A (or org-beamer-defaction ))
+ (cons o (or org-beamer-option ))
+ (cons x (if org-beamer-extra (concat \n org-beamer-extra) ))
(cons h %s)
(cons H (if have-text (concat { text }) ))
(cons U (if have-text (concat [ text ])
@@ -321,31 +321,31 @@ in org-export-latex-classes.
(cons text (cdr (assoc level default
(t nil
-(defvar extra)
-(defvar option)
-(defvar action)
-(defvar defaction)
-(defvar environment)
+(defvar org-beamer-extra)
+(defvar org-beamer-option)
+(defvar org-beamer-action)
+(defvar org-beamer-defaction)
+(defvar org-beamer-environment)
(defun org-beamer-get-special (props)
Extract an option, action, and default action string from text.
-The variables option, action, defaction, extra are all scoped into
-this function dynamically.
+The variables org-beamer-option, org-beamer-action, org-beamer-defaction,
+org-beamer-extra are all scoped into this function dynamically.
(let (tmp)
-(setq environment (org-beamer-assoc-not-empty BEAMER_env props))
-(setq extra (org-beamer-assoc-not-empty BEAMER_extra props))
-(when extra
- (setq extra (replace-regexp-in-string n \n extra)))
+(setq org-beamer-environment (org-beamer-assoc-not-empty BEAMER_env props))
+(setq org-beamer-extra (org-beamer-assoc-not-empty BEAMER_extra props))
+(when org-beamer-extra
+ (setq org-beamer-extra (replace-regexp-in-string n \n org-beamer-extra)))
(setq tmp
