From 22a061f575f9a58c2e0f7f72de3fa52679ddd61f Mon Sep 17 00:00:00 2001
From: Bastien Guerry <bzg@altern.org>
Date: Fri, 15 Nov 2013 06:22:36 +0100
Subject: [PATCH] Partially revert commit adcebf

* ox.el (org-export-async-init-file):
* ox-odt.el (org-odt-with-latex):
* ox-html.el (org-html-with-latex):
* org.el (org-return-follows-link):
* ob-python.el (org-babel-python-command): Don't use :set.

Thanks to Glenn Morris for pointing at this.
---
 lisp/ob-python.el |  6 ++----
 lisp/org.el       | 10 ++++------
 lisp/ox-html.el   |  3 +--
 lisp/ox-odt.el    |  3 +--
 lisp/ox.el        |  3 +--
 5 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/lisp/ob-python.el b/lisp/ob-python.el
index fc7b9e2d1..2f91b535f 100644
--- a/lisp/ob-python.el
+++ b/lisp/ob-python.el
@@ -47,15 +47,13 @@
   :group 'org-babel
   :type 'string)
 
-(defcustom org-babel-python-mode 'python
+(defcustom org-babel-python-mode
+  (if (or (featurep 'xemacs) (featurep 'python-mode)) 'python-mode 'python)
   "Preferred python mode for use in running python interactively.
 This will typically be either 'python or 'python-mode."
   :group 'org-babel
   :version "24.4"
   :package-version '(Org . "8.0")
-  :set (lambda (var val)
-	 (set-default var (if (or (featurep 'xemacs) (featurep 'python-mode))
-			      'python-mode 'python)))
   :type 'symbol)
 
 (defvar org-src-preserve-indentation)
diff --git a/lisp/org.el b/lisp/org.el
index 3f6af07e8..e7fdd19fa 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -1725,17 +1725,15 @@ In tables, the special behavior of RET has precedence."
   :group 'org-link-follow
   :type 'boolean)
 
-(defcustom org-mouse-1-follows-link 450
+(defcustom org-mouse-1-follows-link
+  (if (boundp 'mouse-1-click-follows-link) mouse-1-click-follows-link t)
   "Non-nil means mouse-1 on a link will follow the link.
 A longer mouse click will still set point.  Does not work on XEmacs.
 Needs to be set before org.el is loaded."
   :group 'org-link-follow
   :version "24.4"
   :package-version '(Org . "8.3")
-  :set (lambda (var val)
-	 (set-default var (if (boundp 'mouse-1-click-follows-link)
-			      mouse-1-click-follows-link t)))
-  :type '(choice 
+  :type '(choice
 	  (const :tag "A double click follows the link" 'double)
 	  (const :tag "Unconditionally follow the link with mouse-1" t)
 	  (integer :tag "mouse-1 click does not follow the link if longer than N ms" 450)))
@@ -20407,7 +20405,7 @@ If `org-special-ctrl-o' is nil, just call `open-line' everywhere."
     (open-line n))
    ((org-at-table-p)
     (org-table-insert-row))
-   (t    
+   (t
     (open-line n))))
 
 (defun org-return (&optional indent)
diff --git a/lisp/ox-html.el b/lisp/ox-html.el
index 524568083..5f3879150 100644
--- a/lisp/ox-html.el
+++ b/lisp/ox-html.el
@@ -673,7 +673,7 @@ The function should return the string to be exported."
 
 ;;;; LaTeX
 
-(defcustom org-html-with-latex t
+(defcustom org-html-with-latex org-export-with-latex
   "Non-nil means process LaTeX math snippets.
 
 When set, the exporter will process LaTeX environments and
@@ -694,7 +694,6 @@ t              Synonym for `mathjax'."
   :group 'org-export-html
   :version "24.4"
   :package-version '(Org . "8.0")
-  :set (lambda (var val) (set-default var org-export-with-latex))
   :type '(choice
 	  (const :tag "Do not process math in any way" nil)
 	  (const :tag "Use dvipng to make images" dvipng)
diff --git a/lisp/ox-odt.el b/lisp/ox-odt.el
index 453ef5f0e..99c1353ce 100644
--- a/lisp/ox-odt.el
+++ b/lisp/ox-odt.el
@@ -704,7 +704,7 @@ The function should return the string to be exported."
 
 ;;;; LaTeX
 
-(defcustom org-odt-with-latex t
+(defcustom org-odt-with-latex org-export-with-latex
   "Non-nil means process LaTeX math snippets.
 
 When set, the exporter will process LaTeX environments and
@@ -725,7 +725,6 @@ t              Synonym for `mathjax'."
   :group 'org-export-odt
   :version "24.4"
   :package-version '(Org . "8.0")
-  :set (lambda (var val) (set-default var org-export-with-latex))
   :type '(choice
 	  (const :tag "Do not process math in any way" nil)
 	  (const :tag "Use dvipng to make images" dvipng)
diff --git a/lisp/ox.el b/lisp/ox.el
index d291b4f45..69dca6854 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -822,7 +822,7 @@ automatically.  But you can retrieve them with \\[org-export-stack]."
   :package-version '(Org . "8.0")
   :type 'boolean)
 
-(defcustom org-export-async-init-file "~/.emacs.el"
+(defcustom org-export-async-init-file user-init-file
   "File used to initialize external export process.
 Value must be an absolute file name.  It defaults to user's
 initialization file.  Though, a specific configuration makes the
@@ -830,7 +830,6 @@ process faster and the export more portable."
   :group 'org-export-general
   :version "24.4"
   :package-version '(Org . "8.0")
-  :set (lambda (var val) (set-default var user-init-file))
   :type '(file :must-match t))
 
 (defcustom org-export-dispatch-use-expert-ui nil
-- 
2.11.4.GIT