summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2015-08-10 01:18:52 -0400
committerKyle Meyer <kyle@kyleam.com>2015-10-04 02:31:29 -0400
commit00dacdcc50d80ed3b43101e75411882442913153 (patch)
tree54041141be3e8b9e2ea1e48155c4cf6c4712cd87
parente802936f4b39f8b1e56cc015f34aa655565afe7f (diff)
downloadorg-mode-00dacdcc50d80ed3b43101e75411882442913153.tar.gz
Clean up spacing to pass Emacs's pre-commit check
This is in preparation for syncing with the Emacs repo.
-rw-r--r--doc/org.texi32
-rw-r--r--lisp/ob-clojure.el2
-rw-r--r--lisp/ob-exp.el2
-rw-r--r--lisp/ob-ocaml.el6
-rwxr-xr-xlisp/org.el4
-rw-r--r--lisp/ox-html.el20
6 files changed, 33 insertions, 33 deletions
diff --git a/doc/org.texi b/doc/org.texi
index def98e4..0d23c26 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -8638,7 +8638,7 @@ be accumulated. You can add a filter preset through the option
@orgcmd{_,org-agenda-filter-by-effort}
@vindex org-agenda-effort-filter-preset
@vindex org-sort-agenda-noeffort-is-high
-Filter the agenda view with respect to effort estimates.
+Filter the agenda view with respect to effort estimates.
You first need to set up allowed efforts globally, for example
@lisp
(setq org-global-properties
@@ -14372,7 +14372,7 @@ however, override everything.
@subsubheading @LaTeX{} specific properties
-@multitable {@code{:latex-link-with-unknown-path-format}} {@code{org-latex-link-with-unknown-path-format}}
+@multitable {@code{:latex-link-with-unknown-path-format}} {@code{org-latex-link-with-unknown-path-format}}
@item @code{:latex-active-timestamp-format} @tab @code{org-latex-active-timestamp-format}
@item @code{:latex-caption-above} @tab @code{org-latex-caption-above}
@item @code{:latex-classes} @tab @code{org-latex-classes}
@@ -15063,22 +15063,22 @@ Code blocks in the following languages are supported.
@multitable @columnfractions 0.25 0.25 0.25 0.25
@headitem @b{Language} @tab @b{Identifier} @tab @b{Language} @tab @b{Identifier}
@item Asymptote @tab asymptote @tab Awk @tab awk
-@item C @tab C @tab C++ @tab C++
-@item Clojure @tab clojure @tab CSS @tab css
-@item D @tab d @tab ditaa @tab ditaa
+@item C @tab C @tab C++ @tab C++
+@item Clojure @tab clojure @tab CSS @tab css
+@item D @tab d @tab ditaa @tab ditaa
@item Graphviz @tab dot @tab Emacs Calc @tab calc
@item Emacs Lisp @tab emacs-lisp @tab Fortran @tab fortran
-@item gnuplot @tab gnuplot @tab Haskell @tab haskell
-@item Java @tab java @tab Javascript @tab js
-@item LaTeX @tab latex @tab Ledger @tab ledger
-@item Lisp @tab lisp @tab Lilypond @tab lilypond
-@item MATLAB @tab matlab @tab Mscgen @tab mscgen
-@item Objective Caml @tab ocaml @tab Octave @tab octave
-@item Org mode @tab org @tab Oz @tab oz
-@item Perl @tab perl @tab Plantuml @tab plantuml
-@item Processing.js @tab processing @tab Python @tab python
-@item R @tab R @tab Ruby @tab ruby
-@item Sass @tab sass @tab Scheme @tab scheme
+@item gnuplot @tab gnuplot @tab Haskell @tab haskell
+@item Java @tab java @tab Javascript @tab js
+@item LaTeX @tab latex @tab Ledger @tab ledger
+@item Lisp @tab lisp @tab Lilypond @tab lilypond
+@item MATLAB @tab matlab @tab Mscgen @tab mscgen
+@item Objective Caml @tab ocaml @tab Octave @tab octave
+@item Org mode @tab org @tab Oz @tab oz
+@item Perl @tab perl @tab Plantuml @tab plantuml
+@item Processing.js @tab processing @tab Python @tab python
+@item R @tab R @tab Ruby @tab ruby
+@item Sass @tab sass @tab Scheme @tab scheme
@item GNU Screen @tab screen @tab Sed @tab sed
@item shell @tab sh @tab SQL @tab sql
@item SQLite @tab sqlite @tab @tab
diff --git a/lisp/ob-clojure.el b/lisp/ob-clojure.el
index 68f748c..af94beb 100644
--- a/lisp/ob-clojure.el
+++ b/lisp/ob-clojure.el
@@ -99,7 +99,7 @@
(slime
(require 'slime)
(with-temp-buffer
- (insert expanded)
+ (insert expanded)
(setq result
(slime-eval
`(swank:eval-and-grab-output
diff --git a/lisp/ob-exp.el b/lisp/ob-exp.el
index 38086df..fdfbf5f 100644
--- a/lisp/ob-exp.el
+++ b/lisp/ob-exp.el
@@ -384,7 +384,7 @@ replaced with its value."
(nth 1 info))))
(org-fill-template
(if (eq type 'inline)
- org-babel-exp-inline-code-template
+ org-babel-exp-inline-code-template
org-babel-exp-code-template)
`(("lang" . ,(nth 0 info))
("body" . ,(org-escape-code-in-string (nth 1 info)))
diff --git a/lisp/ob-ocaml.el b/lisp/ob-ocaml.el
index 9cd72b3..2831fcc 100644
--- a/lisp/ob-ocaml.el
+++ b/lisp/ob-ocaml.el
@@ -83,9 +83,9 @@
(mapcar #'org-babel-trim (reverse raw)))))))
(raw (org-babel-trim clean))
(result-params (cdr (assoc :result-params params)))
- (parsed
- (string-match
- "\\(\\(.*\n\\)*\\)[^:\n]+ : \\([^=\n]+\\) =\\(\n\\| \\)\\(.+\\)$"
+ (parsed
+ (string-match
+ "\\(\\(.*\n\\)*\\)[^:\n]+ : \\([^=\n]+\\) =\\(\n\\| \\)\\(.+\\)$"
raw))
(output (match-string 1 raw))
(type (match-string 3 raw))
diff --git a/lisp/org.el b/lisp/org.el
index fc8f54f..88fee97 100755
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -12970,7 +12970,7 @@ statistics everywhere."
(and (listp org-provide-todo-statistics)
(stringp (car org-provide-todo-statistics))
(or (member kwd org-provide-todo-statistics)
- (member kwd org-done-keywords)))
+ (member kwd org-done-keywords)))
(and (listp org-provide-todo-statistics)
(listp (car org-provide-todo-statistics))
(or (member kwd (car org-provide-todo-statistics))
@@ -12979,7 +12979,7 @@ statistics everywhere."
(setq cnt-all (1+ cnt-all))
(if (eq org-provide-todo-statistics t)
(and kwd (setq cnt-all (1+ cnt-all)))))
- (when (or (and (member org-provide-todo-statistics '(t all-headlines))
+ (when (or (and (member org-provide-todo-statistics '(t all-headlines))
(member kwd org-done-keywords))
(and (listp org-provide-todo-statistics)
(listp (car org-provide-todo-statistics))
diff --git a/lisp/ox-html.el b/lisp/ox-html.el
index 960bee8..a2db938 100644
--- a/lisp/ox-html.el
+++ b/lisp/ox-html.el
@@ -1088,10 +1088,10 @@ linebreaks Let MathJax perform automatic linebreaks. Valid values
indent If align is not center, how far from the left/right side?
Valid values are \"left\" and \"right\"
multlinewidth The width of the multline environment.
-autonumber How to number equations. Valid values are \"None\",
+autonumber How to number equations. Valid values are \"None\",
\"all\" and \"AMS Math\".
tagindent The amount tags are indented.
-tagside Which side to show tags/labels on. Valid values are
+tagside Which side to show tags/labels on. Valid values are
\"left\" and \"right\"
You can also customize this for each buffer, using something like
@@ -1116,14 +1116,14 @@ MathJax CDN Terms of Service.
(list :tag "align (alignment of displayed equations)"
(const :format " " align) (string))
(list :tag "font (used to display math)"
- (const :format " " font)
- (choice (const "TeX")
- (const "STIX-Web")
- (const "Asana-Math")
- (const "Neo-Euler")
- (const "Gyre-Pagella")
- (const "Gyre-Termes")
- (const "Latin-Modern")))
+ (const :format " " font)
+ (choice (const "TeX")
+ (const "STIX-Web")
+ (const "Asana-Math")
+ (const "Neo-Euler")
+ (const "Gyre-Pagella")
+ (const "Gyre-Termes")
+ (const "Latin-Modern")))
(list :tag "linebreaks (automatic line-breaking)"
(const :format " " linebreaks)
(choice (const "true")