summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Dominik <carsten.dominik@gmail.com>2010-06-07 08:35:10 +0200
committerCarsten Dominik <carsten.dominik@gmail.com>2010-06-07 08:35:10 +0200
commitb27c1c511310f0cfb54d2f01183e6dd060cbf34d (patch)
tree151f02021fbab7176cd0bae2978ff639fecfd074
parent0d0dc0acb4c0f66753c56332cc3671c35d63a207 (diff)
downloadorg-mode-b27c1c511310f0cfb54d2f01183e6dd060cbf34d.tar.gz
Fix whitespace problems
-rw-r--r--lisp/org-clock.el2
-rw-r--r--lisp/org-html.el70
-rw-r--r--lisp/org-latex.el6
-rw-r--r--lisp/org-timer.el4
-rw-r--r--lisp/org.el6
5 files changed, 44 insertions, 44 deletions
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index 8f63957..8477b2c 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -1354,7 +1354,7 @@ With prefix arg SELECT, offer recently clocked tasks for selection."
"Sum the times for each subtree.
Puts the resulting times in minutes as a text property on each headline.
TSTART and TEND can mark a time range to be considered. HEADLINE-FILTER is a
-zero-arg function that, if specified, is called for each headline in the time
+zero-arg function that, if specified, is called for each headline in the time
range with point at the headline. Headlines for which HEADLINE-FILTER returns
nil are excluded from the clock summation."
(interactive)
diff --git a/lisp/org-html.el b/lisp/org-html.el
index d18350d..d5809ab 100644
--- a/lisp/org-html.el
+++ b/lisp/org-html.el
@@ -535,7 +535,7 @@ in a window. A non-interactive call will only return the buffer."
(defvar org-par-open nil)
;;; org-html-cvt-link-fn
-(defconst org-html-cvt-link-fn
+(defconst org-html-cvt-link-fn
nil
"Function to convert link URLs to exportable URLs.
Takes two arguments, TYPE and PATH.
@@ -549,16 +549,16 @@ If TYPE is not file, just return `nil'.
See variable `org-export-html-link-org-files-as-html'"
(save-match-data
- (and
+ (and
org-export-html-link-org-files-as-html
(string= type "file")
(string-match "\\.org$" path)
(progn
(list
"http"
- (concat
+ (concat
(substring path 0 (match-beginning 0))
- "."
+ "."
(plist-get opt-plist :html-extension)))))))
@@ -569,12 +569,12 @@ current settings.
DESCP is the boolean of whether there was a link description.
See variables `org-export-html-inline-images' and
`org-export-html-inline-image-extensions'."
- (declare (special
- org-export-html-inline-images
+ (declare (special
+ org-export-html-inline-images
org-export-html-inline-image-extensions))
- (or
+ (or
(eq t org-export-html-inline-images)
- (and
+ (and
org-export-html-inline-images
(not descp)))
(org-file-image-p
@@ -582,7 +582,7 @@ See variables `org-export-html-inline-images' and
;;; org-html-make-link
(defun org-html-make-link (opt-plist type path fragment desc attr
- may-inline-p)
+ may-inline-p)
"Make an HTML link.
OPT-PLIST is an options list.
TYPE is the device-type of the link (THIS://foo.html)
@@ -603,8 +603,8 @@ MAY-INLINE-P allows inlining it as an image."
type
;;Substitute just if original path was absolute.
;;(Otherwise path must remain relative)
- (if (file-name-absolute-p path)
- (expand-file-name path)
+ (if (file-name-absolute-p path)
+ (expand-file-name path)
path)))
((string= type "")
(list nil path))
@@ -615,9 +615,9 @@ MAY-INLINE-P allows inlining it as an image."
(components-2
(or
(and org-html-cvt-link-fn
- (apply org-html-cvt-link-fn
+ (apply org-html-cvt-link-fn
opt-plist components-1))
- (apply #'org-html-cvt-org-as-html
+ (apply #'org-html-cvt-org-as-html
opt-plist components-1)
components-1))
(type (first components-2))
@@ -633,11 +633,11 @@ MAY-INLINE-P allows inlining it as an image."
(string= type "https"))
(if fragment
(setq thefile (concat thefile "#" fragment))))
-
+
(t))
-
+
;;Final URL-build, for all types.
- (setq thefile
+ (setq thefile
(let
((str (org-export-html-format-href thefile)))
(if (and type (not (string= "file" type))
@@ -645,14 +645,14 @@ MAY-INLINE-P allows inlining it as an image."
(concat type ":" str)
str)))
- (if (and
+ (if (and
may-inline-p
;;Can't inline a URL with a fragment.
(not fragment))
(progn
(message "image %s %s" thefile org-par-open)
(org-export-html-format-image thefile org-par-open))
- (concat
+ (concat
"<a href=\"" thefile "\"" attr ">"
(org-export-html-format-desc desc)
"</a>")))))
@@ -1182,12 +1182,12 @@ lang=\"%s\" xml:lang=\"%s\">
'(org-protected t))))
(cond
((equal type "internal")
- (let
+ (let
((frag-0
- (if (= (string-to-char path) ?#)
- (substring path 1)
+ (if (= (string-to-char path) ?#)
+ (substring path 1)
path)))
- (setq rpl
+ (setq rpl
(org-html-make-link
opt-plist
""
@@ -1202,11 +1202,11 @@ lang=\"%s\" xml:lang=\"%s\">
;; it would have become an internal link...)
(save-match-data
(setq id-file (file-relative-name
- id-file
+ id-file
(file-name-directory org-current-export-file)))
- (setq rpl
+ (setq rpl
(org-html-make-link opt-plist
- "file" id-file
+ "file" id-file
(concat (if (org-uuidgen-p path) "ID-") path)
desc
attr
@@ -1237,14 +1237,14 @@ lang=\"%s\" xml:lang=\"%s\">
(setq rpl
(org-html-make-link opt-plist
type "" coderef-str
- (format
- (org-export-get-coderef-format
- path
+ (format
+ (org-export-get-coderef-format
+ path
(and descp desc))
(cdr (assoc path org-export-code-refs)))
attr-1
nil))))
-
+
((functionp (setq fnc (nth 2 (assoc type org-link-protocols))))
;; The link protocol has a function for format the link
(setq rpl
@@ -1258,15 +1258,15 @@ lang=\"%s\" xml:lang=\"%s\">
((components
(if
(string-match "::\\(.*\\)" path)
- (list
+ (list
(replace-match "" t nil path)
(match-string 1 path))
(list path nil)))
-
+
;;The proper path, without a fragment
(path-1
(first components))
-
+
;;The raw fragment
(fragment-0
(second components))
@@ -1291,7 +1291,7 @@ lang=\"%s\" xml:lang=\"%s\">
(replace-match "" t t desc-1)
desc-1))
desc)))
-
+
(setq rpl
(if
(and
@@ -1299,9 +1299,9 @@ lang=\"%s\" xml:lang=\"%s\">
(not (funcall link-validate path-1 current-dir)))
desc
(org-html-make-link opt-plist
- "file" path-1 fragment-1 desc-2 attr
+ "file" path-1 fragment-1 desc-2 attr
(org-html-should-inline-p path-1 descp)))))))
-
+
(t
;; just publish the path, as default
(setq rpl (concat "<i>&lt;" type ":"
diff --git a/lisp/org-latex.el b/lisp/org-latex.el
index dc97cdf..50f5299 100644
--- a/lisp/org-latex.el
+++ b/lisp/org-latex.el
@@ -144,7 +144,7 @@ class, you can use the following macro-like placeholders.
[DEFAULT-PACKAGES] \\usepackage statements for default packages
[NO-DEFAULT-PACKAGES] do not include any of the default packages
- [PACKAGES] \\usepackage statements for packages
+ [PACKAGES] \\usepackage statements for packages
[NO-PACKAGES] do not include the packages
[EXTRA] the stuff from #+LaTeX_HEADER
[NO-EXTRA] do not include #+LaTeX_HEADER stuff
@@ -1901,7 +1901,7 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
(setq wrapp nil floatp t attr (replace-match "" t t attr)))
(if (string-match "[ \t]*\\<multicolumn\\>" attr)
(setq multicolumnp t attr (replace-match "" t t attr))))
-
+
(setq placement
(cond
(wrapp "{l}{0.5\\textwidth}")
@@ -2074,7 +2074,7 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
"\\(?:<[^<>\n]*>\\)*"
"\\(" (org-create-multibrace-regexp "{" "}" 3) "\\)\\{1,3\\}")))
(while (re-search-forward re nil t)
- (unless (or
+ (unless (or
;; check for comment line
(save-excursion (goto-char (match-beginning 0))
(org-in-indented-comment-line))
diff --git a/lisp/org-timer.el b/lisp/org-timer.el
index 87801dc..88ae69a 100644
--- a/lisp/org-timer.el
+++ b/lisp/org-timer.el
@@ -320,7 +320,7 @@ prompt the use if she wants to replace it.
Called with a numeric prefix argument, use this numeric value as
the duration of the timer.
-Called with a `C-u' prefix argument, use `org-timer-default-timer'
+Called with a `C-u' prefix argument, use `org-timer-default-timer'
without prompting the user for a duration.
With two `C-u' prefix argument, use `org-timer-default-timer'
@@ -330,7 +330,7 @@ replace any running timer."
(let ((minutes (or (and (numberp opt) (number-to-string opt))
(and (listp opt) (not (null opt))
(number-to-string org-timer-default-timer))
- (read-from-minibuffer
+ (read-from-minibuffer
"How many minutes left? "
(if (not (eq org-timer-default-timer 0))
(number-to-string org-timer-default-timer))))))
diff --git a/lisp/org.el b/lisp/org.el
index f35a91a..ba4ea63 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -1530,9 +1530,9 @@ you can use this variable to set the application for a given file
extension. The entries in this list are cons cells where the car identifies
files and the cdr the corresponding command. Possible values for the
file identifier are
- \"string\" A string as a file identifier can be interpreted in different
+ \"string\" A string as a file identifier can be interpreted in different
ways, depending on its contents:
-
+
- Alphanumeric characters only:
Match links with this file extension.
Example: (\"pdf\" . \"evince %s\")
@@ -9994,7 +9994,7 @@ This can be done with a 0 prefix: `C-0 C-c C-w'"
(< pos (save-excursion
(org-end-of-subtree t t))))))
(error "Cannot refile to position inside the tree or region"))
-
+
(setq nbuf (or (find-buffer-visiting file)
(find-file-noselect file)))
(if goto