Browse Source

Fix whitespace problems

Carsten Dominik 15 years ago
parent
commit
b27c1c5113
5 changed files with 44 additions and 44 deletions
  1. 1 1
      lisp/org-clock.el
  2. 35 35
      lisp/org-html.el
  3. 3 3
      lisp/org-latex.el
  4. 2 2
      lisp/org-timer.el
  5. 3 3
      lisp/org.el

+ 1 - 1
lisp/org-clock.el

@@ -1354,7 +1354,7 @@ With prefix arg SELECT, offer recently clocked tasks for selection."
   "Sum the times for each subtree.
   "Sum the times for each subtree.
 Puts the resulting times in minutes as a text property on each headline.
 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
 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
 range with point at the headline.  Headlines for which HEADLINE-FILTER returns
 nil are excluded from the clock summation."
 nil are excluded from the clock summation."
   (interactive)
   (interactive)

+ 35 - 35
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)
 (defvar org-par-open nil)
 
 
 ;;; org-html-cvt-link-fn
 ;;; org-html-cvt-link-fn
-(defconst org-html-cvt-link-fn 
+(defconst org-html-cvt-link-fn
    nil
    nil
    "Function to convert link URLs to exportable URLs.
    "Function to convert link URLs to exportable URLs.
 Takes two arguments, TYPE and PATH.
 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'"
 See variable `org-export-html-link-org-files-as-html'"
 
 
    (save-match-data
    (save-match-data
-      (and 
+      (and
 	 org-export-html-link-org-files-as-html
 	 org-export-html-link-org-files-as-html
 	 (string= type "file")
 	 (string= type "file")
 	 (string-match "\\.org$" path)
 	 (string-match "\\.org$" path)
 	 (progn
 	 (progn
 	    (list
 	    (list
 	       "http"
 	       "http"
-	       (concat 
+	       (concat
 		  (substring path 0 (match-beginning 0))
 		  (substring path 0 (match-beginning 0))
-		  "." 
+		  "."
 		  (plist-get opt-plist :html-extension)))))))
 		  (plist-get opt-plist :html-extension)))))))
 
 
 
 
@@ -569,12 +569,12 @@ current settings.
 DESCP is the boolean of whether there was a link description.
 DESCP is the boolean of whether there was a link description.
 See variables `org-export-html-inline-images' and
 See variables `org-export-html-inline-images' and
 `org-export-html-inline-image-extensions'."
 `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))
 	     org-export-html-inline-image-extensions))
-   (or 
+   (or
       (eq t org-export-html-inline-images)
       (eq t org-export-html-inline-images)
-      (and 
+      (and
 	 org-export-html-inline-images
 	 org-export-html-inline-images
 	 (not descp)))
 	 (not descp)))
    (org-file-image-p
    (org-file-image-p
@@ -582,7 +582,7 @@ See variables `org-export-html-inline-images' and
 
 
 ;;; org-html-make-link
 ;;; org-html-make-link
 (defun org-html-make-link (opt-plist type path fragment desc attr
 (defun org-html-make-link (opt-plist type path fragment desc attr
-			     may-inline-p) 
+			     may-inline-p)
    "Make an HTML link.
    "Make an HTML link.
 OPT-PLIST is an options list.
 OPT-PLIST is an options list.
 TYPE is the device-type of the link (THIS://foo.html)
 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
 			   type
 			   ;;Substitute just if original path was absolute.
 			   ;;Substitute just if original path was absolute.
 			   ;;(Otherwise path must remain relative)
 			   ;;(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)))
 			      path)))
 		     ((string= type "")
 		     ((string= type "")
 			(list nil path))
 			(list nil path))
@@ -615,9 +615,9 @@ MAY-INLINE-P allows inlining it as an image."
 	       (components-2
 	       (components-2
 		  (or
 		  (or
 		     (and org-html-cvt-link-fn
 		     (and org-html-cvt-link-fn
-			(apply org-html-cvt-link-fn 
+			(apply org-html-cvt-link-fn
 			   opt-plist components-1))
 			   opt-plist components-1))
-		     (apply #'org-html-cvt-org-as-html 
+		     (apply #'org-html-cvt-org-as-html
 			opt-plist components-1)
 			opt-plist components-1)
 		     components-1))
 		     components-1))
 	       (type    (first  components-2))
 	       (type    (first  components-2))
@@ -633,11 +633,11 @@ MAY-INLINE-P allows inlining it as an image."
 		(string= type "https"))
 		(string= type "https"))
 	       (if fragment
 	       (if fragment
 		  (setq thefile (concat thefile "#" fragment))))
 		  (setq thefile (concat thefile "#" fragment))))
-	       
+
 	    (t))
 	    (t))
-	    
+
 	 ;;Final URL-build, for all types.
 	 ;;Final URL-build, for all types.
-	 (setq thefile 
+	 (setq thefile
 	    (let
 	    (let
 	       ((str (org-export-html-format-href thefile)))
 	       ((str (org-export-html-format-href thefile)))
 	      (if (and type (not (string= "file" type))
 	      (if (and type (not (string= "file" type))
@@ -645,14 +645,14 @@ MAY-INLINE-P allows inlining it as an image."
 		  (concat type ":" str)
 		  (concat type ":" str)
 		  str)))
 		  str)))
 
 
-	 (if (and 
+	 (if (and
 		may-inline-p
 		may-inline-p
 		;;Can't inline a URL with a fragment.
 		;;Can't inline a URL with a fragment.
 		(not fragment))
 		(not fragment))
 	    (progn
 	    (progn
 	       (message "image %s %s" thefile org-par-open)
 	       (message "image %s %s" thefile org-par-open)
 	       (org-export-html-format-image thefile org-par-open))
 	       (org-export-html-format-image thefile org-par-open))
-	    (concat 
+	    (concat
 	       "<a href=\"" thefile "\"" attr ">"
 	       "<a href=\"" thefile "\"" attr ">"
 	       (org-export-html-format-desc desc)
 	       (org-export-html-format-desc desc)
 	       "</a>")))))
 	       "</a>")))))
@@ -1182,12 +1182,12 @@ lang=\"%s\" xml:lang=\"%s\">
 			     '(org-protected t))))
 			     '(org-protected t))))
 	    (cond
 	    (cond
 	     ((equal type "internal")
 	     ((equal type "internal")
-		(let 
+		(let
 		   ((frag-0
 		   ((frag-0
-		       (if (= (string-to-char path) ?#) 
-			  (substring path 1) 
+		       (if (= (string-to-char path) ?#)
+			  (substring path 1)
 			  path)))
 			  path)))
-		   (setq rpl 
+		   (setq rpl
 		      (org-html-make-link
 		      (org-html-make-link
 			 opt-plist
 			 opt-plist
 			 ""
 			 ""
@@ -1202,11 +1202,11 @@ lang=\"%s\" xml:lang=\"%s\">
 	      ;; it would have become an internal link...)
 	      ;; it would have become an internal link...)
 	      (save-match-data
 	      (save-match-data
 		(setq id-file (file-relative-name
 		(setq id-file (file-relative-name
-				 id-file 
+				 id-file
 				 (file-name-directory org-current-export-file)))
 				 (file-name-directory org-current-export-file)))
-		(setq rpl 
+		(setq rpl
 		   (org-html-make-link opt-plist
 		   (org-html-make-link opt-plist
-		      "file" id-file 
+		      "file" id-file
 		      (concat (if (org-uuidgen-p path) "ID-") path)
 		      (concat (if (org-uuidgen-p path) "ID-") path)
 		       desc
 		       desc
 		      attr
 		      attr
@@ -1237,14 +1237,14 @@ lang=\"%s\" xml:lang=\"%s\">
 		   (setq rpl
 		   (setq rpl
 		      (org-html-make-link opt-plist
 		      (org-html-make-link opt-plist
 			 type "" coderef-str
 			 type "" coderef-str
-			 (format 
-			    (org-export-get-coderef-format 
-			       path 
+			 (format
+			    (org-export-get-coderef-format
+			       path
 			       (and descp desc))
 			       (and descp desc))
 			    (cdr (assoc path org-export-code-refs)))
 			    (cdr (assoc path org-export-code-refs)))
 			 attr-1
 			 attr-1
 			 nil))))
 			 nil))))
-	       
+
 	     ((functionp (setq fnc (nth 2 (assoc type org-link-protocols))))
 	     ((functionp (setq fnc (nth 2 (assoc type org-link-protocols))))
 	      ;; The link protocol has a function for format the link
 	      ;; The link protocol has a function for format the link
 	      (setq rpl
 	      (setq rpl
@@ -1258,15 +1258,15 @@ lang=\"%s\" xml:lang=\"%s\">
 		      ((components
 		      ((components
 			  (if
 			  (if
 			     (string-match "::\\(.*\\)" path)
 			     (string-match "::\\(.*\\)" path)
-			     (list 
+			     (list
 				(replace-match "" t nil path)
 				(replace-match "" t nil path)
 				(match-string 1 path))
 				(match-string 1 path))
 			     (list path nil)))
 			     (list path nil)))
-			 
+
 			 ;;The proper path, without a fragment
 			 ;;The proper path, without a fragment
 			 (path-1
 			 (path-1
 			    (first components))
 			    (first components))
-			 
+
 			 ;;The raw fragment
 			 ;;The raw fragment
 			 (fragment-0
 			 (fragment-0
 			    (second components))
 			    (second components))
@@ -1291,7 +1291,7 @@ lang=\"%s\" xml:lang=\"%s\">
 				     (replace-match "" t t desc-1)
 				     (replace-match "" t t desc-1)
 				     desc-1))
 				     desc-1))
 			       desc)))
 			       desc)))
-		      
+
 		      (setq rpl
 		      (setq rpl
 			 (if
 			 (if
 			    (and
 			    (and
@@ -1299,9 +1299,9 @@ lang=\"%s\" xml:lang=\"%s\">
 			       (not (funcall link-validate path-1 current-dir)))
 			       (not (funcall link-validate path-1 current-dir)))
 			    desc
 			    desc
 			    (org-html-make-link opt-plist
 			    (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)))))))
 			       (org-html-should-inline-p path-1 descp)))))))
-	       
+
 	     (t
 	     (t
 	      ;; just publish the path, as default
 	      ;; just publish the path, as default
 	      (setq rpl (concat "<i>&lt;" type ":"
 	      (setq rpl (concat "<i>&lt;" type ":"

+ 3 - 3
lisp/org-latex.el

@@ -144,7 +144,7 @@ class, you can use the following macro-like placeholders.
 
 
  [DEFAULT-PACKAGES]      \\usepackage statements for default packages
  [DEFAULT-PACKAGES]      \\usepackage statements for default packages
  [NO-DEFAULT-PACKAGES]   do not include any of the 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
  [NO-PACKAGES]           do not include the packages
  [EXTRA]                 the stuff from #+LaTeX_HEADER
  [EXTRA]                 the stuff from #+LaTeX_HEADER
  [NO-EXTRA]              do not include #+LaTeX_HEADER stuff
  [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)))
 	  (setq wrapp nil floatp t attr (replace-match "" t t attr)))
       (if (string-match "[ \t]*\\<multicolumn\\>" attr)
       (if (string-match "[ \t]*\\<multicolumn\\>" attr)
 	  (setq multicolumnp t attr (replace-match "" t t attr))))
 	  (setq multicolumnp t attr (replace-match "" t t attr))))
-    
+
     (setq placement
     (setq placement
 	  (cond
 	  (cond
 	   (wrapp "{l}{0.5\\textwidth}")
 	   (wrapp "{l}{0.5\\textwidth}")
@@ -2074,7 +2074,7 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
 	     "\\(?:<[^<>\n]*>\\)*"
 	     "\\(?:<[^<>\n]*>\\)*"
 	     "\\(" (org-create-multibrace-regexp "{" "}" 3) "\\)\\{1,3\\}")))
 	     "\\(" (org-create-multibrace-regexp "{" "}" 3) "\\)\\{1,3\\}")))
     (while (re-search-forward re nil t)
     (while (re-search-forward re nil t)
-      (unless (or 
+      (unless (or
 	       ;; check for comment line
 	       ;; check for comment line
 	       (save-excursion (goto-char (match-beginning 0))
 	       (save-excursion (goto-char (match-beginning 0))
 			       (org-in-indented-comment-line))
 			       (org-in-indented-comment-line))

+ 2 - 2
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
 Called with a numeric prefix argument, use this numeric value as
 the duration of the timer.
 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.
 without prompting the user for a duration.
 
 
 With two `C-u' prefix argument, use `org-timer-default-timer'
 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))
   (let ((minutes (or (and (numberp opt) (number-to-string opt))
 		     (and (listp opt) (not (null opt))
 		     (and (listp opt) (not (null opt))
 			  (number-to-string org-timer-default-timer))
 			  (number-to-string org-timer-default-timer))
-		     (read-from-minibuffer 
+		     (read-from-minibuffer
 		      "How many minutes left? "
 		      "How many minutes left? "
 		      (if (not (eq org-timer-default-timer 0))
 		      (if (not (eq org-timer-default-timer 0))
 			  (number-to-string org-timer-default-timer))))))
 			  (number-to-string org-timer-default-timer))))))

+ 3 - 3
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
 extension.  The entries in this list are cons cells where the car identifies
 files and the cdr the corresponding command.  Possible values for the
 files and the cdr the corresponding command.  Possible values for the
 file identifier are
 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:
                ways, depending on its contents:
-               
+
                - Alphanumeric characters only:
                - Alphanumeric characters only:
                  Match links with this file extension.
                  Match links with this file extension.
                  Example: (\"pdf\" . \"evince %s\")
                  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
 			  (< pos (save-excursion
 				   (org-end-of-subtree t t))))))
 				   (org-end-of-subtree t t))))))
 	      (error "Cannot refile to position inside the tree or region"))
 	      (error "Cannot refile to position inside the tree or region"))
-	  
+
 	  (setq nbuf (or (find-buffer-visiting file)
 	  (setq nbuf (or (find-buffer-visiting file)
 			 (find-file-noselect file)))
 			 (find-file-noselect file)))
 	  (if goto
 	  (if goto