diff options
| author | Bastien Guerry <bzg@altern.org> | 2013-11-15 06:24:07 +0100 |
|---|---|---|
| committer | Bastien Guerry <bzg@altern.org> | 2013-11-15 06:24:07 +0100 |
| commit | f327d427341aa5f642d60286ca3b05ca208cf96b (patch) | |
| tree | 941cb02371f04d8cc622de6843795b85fd042f57 | |
| parent | 19dd1e1cc32afe10a8142c833fc8e9f12242bf38 (diff) | |
| parent | 22a061f575f9a58c2e0f7f72de3fa52679ddd61f (diff) | |
| download | org-mode-f327d427341aa5f642d60286ca3b05ca208cf96b.tar.gz | |
Merge branch 'maint'
Conflicts:
lisp/ox.el
| -rw-r--r-- | lisp/ob-python.el | 6 | ||||
| -rw-r--r-- | lisp/org.el | 8 | ||||
| -rw-r--r-- | lisp/ox-html.el | 3 | ||||
| -rw-r--r-- | lisp/ox-odt.el | 3 |
4 files changed, 7 insertions, 13 deletions
diff --git a/lisp/ob-python.el b/lisp/ob-python.el index fc7b9e2..2f91b53 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 7f0d79a..df92e72 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -1721,17 +1721,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))) diff --git a/lisp/ox-html.el b/lisp/ox-html.el index 6d44f07..9f35a46 100644 --- a/lisp/ox-html.el +++ b/lisp/ox-html.el @@ -674,7 +674,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 @@ -695,7 +695,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 1b3bddf..e848ff6 100644 --- a/lisp/ox-odt.el +++ b/lisp/ox-odt.el @@ -705,7 +705,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 @@ -726,7 +726,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) |