ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint' 

Conflicts:
	lisp/ox.el
This commit is contained in:
Bastien Guerry 2013-11-15 06:24:07 +01:00
parent 19dd1e1cc3 22a061f575
commit f327d42734
4 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/ob-python.el
View File

@ -47,15 +47,13 @@
:group 'org-babel :group 'org-babel
:type 'string) :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. "Preferred python mode for use in running python interactively.
This will typically be either 'python or 'python-mode." This will typically be either 'python or 'python-mode."
:group 'org-babel :group 'org-babel
:version "24.4" :version "24.4"
:package-version '(Org . "8.0") :package-version '(Org . "8.0")
:set (lambda (var val)
(set-default var (if (or (featurep 'xemacs) (featurep 'python-mode))
'python-mode 'python)))
:type 'symbol) :type 'symbol)
(defvar org-src-preserve-indentation) (defvar org-src-preserve-indentation)

8
lisp/org.el
View File

@ -1721,17 +1721,15 @@ In tables, the special behavior of RET has precedence."
:group 'org-link-follow :group 'org-link-follow
:type 'boolean) :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. "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. A longer mouse click will still set point. Does not work on XEmacs.
Needs to be set before org.el is loaded." Needs to be set before org.el is loaded."
:group 'org-link-follow :group 'org-link-follow
:version "24.4" :version "24.4"
:package-version '(Org . "8.3") :package-version '(Org . "8.3")
:set (lambda (var val) :type '(choice
(set-default var (if (boundp 'mouse-1-click-follows-link)
mouse-1-click-follows-link t)))
:type '(choice
(const :tag "A double click follows the link" 'double) (const :tag "A double click follows the link" 'double)
(const :tag "Unconditionally follow the link with mouse-1" t) (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))) (integer :tag "mouse-1 click does not follow the link if longer than N ms" 450)))

3
lisp/ox-html.el
View File

@ -674,7 +674,7 @@ The function should return the string to be exported."
;;;; LaTeX ;;;; LaTeX
(defcustom org-html-with-latex t (defcustom org-html-with-latex org-export-with-latex
"Non-nil means process LaTeX math snippets. "Non-nil means process LaTeX math snippets.
When set, the exporter will process LaTeX environments and When set, the exporter will process LaTeX environments and
@ -695,7 +695,6 @@ t Synonym for `mathjax'."
:group 'org-export-html :group 'org-export-html
:version "24.4" :version "24.4"
:package-version '(Org . "8.0") :package-version '(Org . "8.0")
:set (lambda (var val) (set-default var org-export-with-latex))
:type '(choice :type '(choice
(const :tag "Do not process math in any way" nil) (const :tag "Do not process math in any way" nil)
(const :tag "Use dvipng to make images" dvipng) (const :tag "Use dvipng to make images" dvipng)

3
lisp/ox-odt.el
View File

@ -705,7 +705,7 @@ The function should return the string to be exported."
;;;; LaTeX ;;;; LaTeX
(defcustom org-odt-with-latex t (defcustom org-odt-with-latex org-export-with-latex
"Non-nil means process LaTeX math snippets. "Non-nil means process LaTeX math snippets.
When set, the exporter will process LaTeX environments and When set, the exporter will process LaTeX environments and
@ -726,7 +726,6 @@ t Synonym for `mathjax'."
:group 'org-export-odt :group 'org-export-odt
:version "24.4" :version "24.4"
:package-version '(Org . "8.0") :package-version '(Org . "8.0")
:set (lambda (var val) (set-default var org-export-with-latex))
:type '(choice :type '(choice
(const :tag "Do not process math in any way" nil) (const :tag "Do not process math in any way" nil)
(const :tag "Use dvipng to make images" dvipng) (const :tag "Use dvipng to make images" dvipng)