Browse Source

Remove unnecessary whitespace.

Carsten Dominik 17 years ago
parent
commit
db782da26b

+ 15 - 15
doc/org.texi

@@ -946,7 +946,7 @@ Yank subtree from kill ring.  This does modify the level of the subtree to
 make sure the tree fits in nicely at the yank position.  The yank level can
 make sure the tree fits in nicely at the yank position.  The yank level can
 also be specified with a numeric prefix argument, or by yanking after a
 also be specified with a numeric prefix argument, or by yanking after a
 headline marker like @samp{****}.
 headline marker like @samp{****}.
-@kindex C-y 
+@kindex C-y
 @item C-y
 @item C-y
 Depending on the variables @code{org-yank-adjusted-subtrees} and
 Depending on the variables @code{org-yank-adjusted-subtrees} and
 @code{org-yank-folded-subtrees}, Org's internal @code{yank} command will
 @code{org-yank-folded-subtrees}, Org's internal @code{yank} command will
@@ -3904,7 +3904,7 @@ and the allowed operators are @samp{<}, @samp{=}, @samp{>}, @samp{<=},
 @samp{>=}, and @samp{<>}.
 @samp{>=}, and @samp{<>}.
 @item
 @item
 If the comparison value is enclosed in double
 If the comparison value is enclosed in double
-quotes, a string comparison is done, and the same operators are allowed.  
+quotes, a string comparison is done, and the same operators are allowed.
 @item
 @item
 If the comparison value is enclosed in double quotes @emph{and} angular
 If the comparison value is enclosed in double quotes @emph{and} angular
 brackets (like @samp{DEADLINE<="<2008-12-24 18:30>"}), both values are
 brackets (like @samp{DEADLINE<="<2008-12-24 18:30>"}), both values are
@@ -3919,7 +3919,7 @@ respectively, can be used.
 If the comparison value is enclosed
 If the comparison value is enclosed
 in curly braces, a regexp match is performed, with @samp{=} meaning that the
 in curly braces, a regexp match is performed, with @samp{=} meaning that the
 regexp matches the property value, and @samp{<>} meaning that it does not
 regexp matches the property value, and @samp{<>} meaning that it does not
-match.  
+match.
 @end itemize
 @end itemize
 
 
 So the search string in the example finds entries tagged @samp{:work:} but
 So the search string in the example finds entries tagged @samp{:work:} but
@@ -4960,7 +4960,7 @@ such a relative timer and make it easy to create timed notes.
 @item C-c C-x .
 @item C-c C-x .
 Insert a relative time into the buffer.  The first time you use this, the
 Insert a relative time into the buffer.  The first time you use this, the
 timer will be started.  When called with a prefix argument, the timer is
 timer will be started.  When called with a prefix argument, the timer is
-restarted. 
+restarted.
 @kindex C-c C-x -
 @kindex C-c C-x -
 @item C-c C-x -
 @item C-c C-x -
 Insert a description list item with the current relative time.  With a prefix
 Insert a description list item with the current relative time.  With a prefix
@@ -5297,15 +5297,15 @@ keys, a list of commands is displayed and you need to press an additional key
 to select a command:
 to select a command:
 
 
 @table @kbd
 @table @kbd
-@kindex C-c C-a a 
-@item a 
+@kindex C-c C-a a
+@item a
 Select a file and move it into the task's attachment directory.  The file
 Select a file and move it into the task's attachment directory.  The file
 will be copied, moved, or linked, depending on @code{org-attach-method}.
 will be copied, moved, or linked, depending on @code{org-attach-method}.
 Note that hard links are not supported on all systems.
 Note that hard links are not supported on all systems.
 
 
 @kindex C-c C-a c
 @kindex C-c C-a c
-@kindex C-c C-a m 
-@kindex C-c C-a l 
+@kindex C-c C-a m
+@kindex C-c C-a l
 @item c/m/l
 @item c/m/l
 Attach a file using the copy/move/link method.
 Attach a file using the copy/move/link method.
 Note that hard links are not supported on all systems.
 Note that hard links are not supported on all systems.
@@ -7212,7 +7212,7 @@ can use this construct, which can also be used to format poetry.
  Great clouds overhead
  Great clouds overhead
  Tiny black birds rise and fall
  Tiny black birds rise and fall
  Snow covers Emacs
  Snow covers Emacs
- 
+
      -- AlexSchroeder
      -- AlexSchroeder
 #+END_VERSE
 #+END_VERSE
 @end example
 @end example
@@ -7993,7 +7993,7 @@ entry@footnote{See the variables @code{org-icalendar-use-deadline} and
 @code{org-icalendar-use-scheduled}.}.  As categories, it will use the tags
 @code{org-icalendar-use-scheduled}.}.  As categories, it will use the tags
 locally defined in the heading, and the file/tree category@footnote{To add
 locally defined in the heading, and the file/tree category@footnote{To add
 inherited tags or the TODO state, configure the variable
 inherited tags or the TODO state, configure the variable
-@code{org-icalendar-categories}.}. 
+@code{org-icalendar-categories}.}.
 
 
 The iCalendar standard requires each entry to have a globally unique
 The iCalendar standard requires each entry to have a globally unique
 identifier (UID).  Org creates these identifiers during export.  If you set
 identifier (UID).  Org creates these identifiers during export.  If you set
@@ -8704,7 +8704,7 @@ is not indented.  This is not really a problem when you are writing a book
 where the outline headings are really section headlines.  However, in a more
 where the outline headings are really section headlines.  However, in a more
 list-oriented outline, it is clear that an indented structure is a lot
 list-oriented outline, it is clear that an indented structure is a lot
 cleaner, as can be seen by comparing the two columns in the following
 cleaner, as can be seen by comparing the two columns in the following
-example: 
+example:
 
 
 @example
 @example
 @group
 @group
@@ -8723,7 +8723,7 @@ It is non-trivial to make such a look work in Emacs, but Org contains three
 separate features that, combined, achieve just that.
 separate features that, combined, achieve just that.
 
 
 @enumerate
 @enumerate
-@item 
+@item
 @emph{Indentation of text below headlines}@*
 @emph{Indentation of text below headlines}@*
 You may indent text below each headline to make the left boundary line up
 You may indent text below each headline to make the left boundary line up
 with the headline, like
 with the headline, like
@@ -9039,7 +9039,7 @@ go to @url{http://orgmode.org} to get access to these modules.
 @item @file{org-annotate-file.el} by @i{Philip Jackson}
 @item @file{org-annotate-file.el} by @i{Philip Jackson}
       Annotate a file with org syntax, in a separate file, with links back to
       Annotate a file with org syntax, in a separate file, with links back to
       the annotated file.
       the annotated file.
-@item @file{org-annotation-helper.el} by @i{Bastien Guerry and Daniel E. German} 
+@item @file{org-annotation-helper.el} by @i{Bastien Guerry and Daniel E. German}
       Call @i{remember} directly from Firefox/Opera, or from Adobe Reader.
       Call @i{remember} directly from Firefox/Opera, or from Adobe Reader.
       When activating a special link or bookmark, Emacs receives a trigger to
       When activating a special link or bookmark, Emacs receives a trigger to
       create a note with a link back to the website.  Requires some setup, a
       create a note with a link back to the website.  Requires some setup, a
@@ -9767,7 +9767,7 @@ Org has sophisticated mapping capabilities to find all entries satisfying
 certain criteria.  Internally, this functionality is used to produce agenda
 certain criteria.  Internally, this functionality is used to produce agenda
 views, but there is also an API that can be used to execute arbitrary
 views, but there is also an API that can be used to execute arbitrary
 functions for each or selected entries.  The main entry point for this API
 functions for each or selected entries.  The main entry point for this API
-is: 
+is:
 
 
 @defun org-map-entries func &optional match scope &rest skip
 @defun org-map-entries func &optional match scope &rest skip
 Call FUNC at each headline selected by MATCH in SCOPE.
 Call FUNC at each headline selected by MATCH in SCOPE.
@@ -9815,7 +9815,7 @@ The function given to that mapping routine can really do anything you like.
 It can uce the property API (@pxref{Using the property API}) to gather more
 It can uce the property API (@pxref{Using the property API}) to gather more
 information about the entry, or in order to change metadate in the entry.
 information about the entry, or in order to change metadate in the entry.
 Here are a couple of functions that might be handy:
 Here are a couple of functions that might be handy:
- 
+
 @defun org-todo &optional arg
 @defun org-todo &optional arg
 Change the TODO state of the entry, see the docstring of the functions for
 Change the TODO state of the entry, see the docstring of the functions for
 the many possible values for the argument ARG.
 the many possible values for the argument ARG.

+ 8 - 8
lisp/org-agenda.el

@@ -1302,7 +1302,7 @@ The following commands are available:
      ["Show Logbook entries" org-agenda-log-mode
      ["Show Logbook entries" org-agenda-log-mode
       :style toggle :selected org-agenda-show-log
       :style toggle :selected org-agenda-show-log
       :active (org-agenda-check-type nil 'agenda 'timeline)]
       :active (org-agenda-check-type nil 'agenda 'timeline)]
-     ["Include archived trees" org-agenda-archives-mode 
+     ["Include archived trees" org-agenda-archives-mode
       :style toggle :selected org-agenda-archives-mode :active t]
       :style toggle :selected org-agenda-archives-mode :active t]
      ["Include archive files" (org-agenda-archives-mode t)
      ["Include archive files" (org-agenda-archives-mode t)
       :style toggle :selected (eq org-agenda-archives-mode t) :active t
       :style toggle :selected (eq org-agenda-archives-mode t) :active t
@@ -1911,7 +1911,7 @@ higher priority settings."
 	     (cond
 	     (cond
 	      ((string-match "\\.html?\\'" file)
 	      ((string-match "\\.html?\\'" file)
 	       (set-buffer (htmlize-buffer (current-buffer)))
 	       (set-buffer (htmlize-buffer (current-buffer)))
-	       
+
 	       (when (and org-agenda-export-html-style
 	       (when (and org-agenda-export-html-style
 			  (string-match "<style>" org-agenda-export-html-style))
 			  (string-match "<style>" org-agenda-export-html-style))
 		 ;; replace <style> section with org-agenda-export-html-style
 		 ;; replace <style> section with org-agenda-export-html-style
@@ -3416,7 +3416,7 @@ the documentation of `org-diary'."
 	 (items (if (consp org-agenda-show-log)
 	 (items (if (consp org-agenda-show-log)
 		    org-agenda-show-log
 		    org-agenda-show-log
 		  org-agenda-log-mode-items))
 		  org-agenda-log-mode-items))
-	 (parts 
+	 (parts
 	  (delq nil
 	  (delq nil
 		(list
 		(list
 		 (if (memq 'closed items) (concat "\\<" org-closed-string))
 		 (if (memq 'closed items) (concat "\\<" org-closed-string))
@@ -4060,7 +4060,7 @@ HH:MM."
 	 (tb (or (get-text-property 1 'todo-state b) ""))
 	 (tb (or (get-text-property 1 'todo-state b) ""))
 	 (la (- (length (member ta org-todo-keywords-for-agenda))))
 	 (la (- (length (member ta org-todo-keywords-for-agenda))))
 	 (lb (- (length (member tb org-todo-keywords-for-agenda))))
 	 (lb (- (length (member tb org-todo-keywords-for-agenda))))
-	 (donepa (member ta org-done-keywords-for-agenda)) 
+	 (donepa (member ta org-done-keywords-for-agenda))
 	 (donepb (member tb org-done-keywords-for-agenda)))
 	 (donepb (member tb org-done-keywords-for-agenda)))
     (cond ((and donepa (not donepb)) -1)
     (cond ((and donepa (not donepb)) -1)
 	  ((and (not donepa) donepb) +1)
 	  ((and (not donepa) donepb) +1)
@@ -4264,7 +4264,7 @@ used to narrow the search - the interactive user can also press `-' or `+'
 to switch to narrowing."
 to switch to narrowing."
   (interactive "P")
   (interactive "P")
   (let* ((alist org-tag-alist-for-agenda)
   (let* ((alist org-tag-alist-for-agenda)
-	(tag-chars (mapconcat 
+	(tag-chars (mapconcat
 		    (lambda (x) (if (cdr x) (char-to-string (cdr x)) ""))
 		    (lambda (x) (if (cdr x) (char-to-string (cdr x)) ""))
 		    alist ""))
 		    alist ""))
 	(efforts (org-split-string
 	(efforts (org-split-string
@@ -4277,7 +4277,7 @@ to switch to narrowing."
 	(current org-agenda-filter)
 	(current org-agenda-filter)
 	char a n tag tags)
 	char a n tag tags)
     (unless char
     (unless char
-      (message 
+      (message
        "%s by tag [%s ], [TAB], [/]:off, [+-]:narrow, [>=<]:effort: "
        "%s by tag [%s ], [TAB], [/]:off, [+-]:narrow, [>=<]:effort: "
        (if narrow "Narrow" "Filter") tag-chars)
        (if narrow "Narrow" "Filter") tag-chars)
       (setq char (read-char)))
       (setq char (read-char)))
@@ -4285,7 +4285,7 @@ to switch to narrowing."
       ;; Narrowing down
       ;; Narrowing down
       (cond ((equal char ?-) (setq strip t narrow t))
       (cond ((equal char ?-) (setq strip t narrow t))
 	    ((equal char ?+) (setq strip nil narrow t)))
 	    ((equal char ?+) (setq strip nil narrow t)))
-      (message 
+      (message
        "Narrow by tag [%s ], [TAB], [/]:off, [>=<]:effort: " tag-chars)
        "Narrow by tag [%s ], [TAB], [/]:off, [>=<]:effort: " tag-chars)
       (setq char (read-char)))
       (setq char (read-char)))
     (when (member char '(?< ?> ?=))
     (when (member char '(?< ?> ?=))
@@ -5407,7 +5407,7 @@ The cursor may be at a date in the calendar, or in the Org agenda."
 	      (widen)
 	      (widen)
 	      (goto-char org-agenda-action-marker)
 	      (goto-char org-agenda-action-marker)
 	      (eval form))))))))
 	      (eval form))))))))
-  
+
 (defun org-agenda-clock-in (&optional arg)
 (defun org-agenda-clock-in (&optional arg)
   "Start the clock on the currently selected item."
   "Start the clock on the currently selected item."
   (interactive "P")
   (interactive "P")

+ 2 - 2
lisp/org-attach.el

@@ -181,7 +181,7 @@ This checks for the existence of a \".git\" directory in that directory."
 		 " git add .; "
 		 " git add .; "
 		 " git ls-files --deleted -z | xargs -0 git rm; "
 		 " git ls-files --deleted -z | xargs -0 git rm; "
 		 " git commit -m 'Synchronized attachments')")))))
 		 " git commit -m 'Synchronized attachments')")))))
-  
+
 (defun org-attach-tag (&optional off)
 (defun org-attach-tag (&optional off)
   "Turn the autotag on or (if OFF is set) off."
   "Turn the autotag on or (if OFF is set) off."
   (when org-attach-auto-tag
   (when org-attach-auto-tag
@@ -266,7 +266,7 @@ A safer way is to open the directory in dired and delete from there."
   (when org-attach-file-list-property
   (when org-attach-file-list-property
     (org-entry-delete (point) org-attach-file-list-property))
     (org-entry-delete (point) org-attach-file-list-property))
   (let ((attach-dir (org-attach-dir)))
   (let ((attach-dir (org-attach-dir)))
-    (when 
+    (when
 	(and attach-dir
 	(and attach-dir
 	     (or force
 	     (or force
 		 (y-or-n-p "Are you sure you want to remove all attachments of this entry? ")))
 		 (y-or-n-p "Are you sure you want to remove all attachments of this entry? ")))

+ 4 - 4
lisp/org-bbdb.el

@@ -259,8 +259,8 @@ The anniversaries are assumed to be stored `org-bbdb-anniversary-field'."
           (multiple-value-bind (m d y)
           (multiple-value-bind (m d y)
               (funcall org-bbdb-extract-date-fun (car split))
               (funcall org-bbdb-extract-date-fun (car split))
             (setq tmp (gethash (list m d) org-bbdb-anniv-hash))
             (setq tmp (gethash (list m d) org-bbdb-anniv-hash))
-            (puthash (list m d) (cons (list y 
-                                            (bbdb-record-name rec) 
+            (puthash (list m d) (cons (list y
+                                            (bbdb-record-name rec)
                                             (cadr split))
                                             (cadr split))
                                       tmp)
                                       tmp)
                      org-bbdb-anniv-hash))))))
                      org-bbdb-anniv-hash))))))
@@ -292,7 +292,7 @@ This is used by Org to re-create the anniversary hash table."
          (annivs (gethash (list m d) org-bbdb-anniv-hash))
          (annivs (gethash (list m d) org-bbdb-anniv-hash))
          (text ())
          (text ())
          split class form rec recs)
          split class form rec recs)
-    
+
     ;; we don't want to miss people born on Feb. 29th
     ;; we don't want to miss people born on Feb. 29th
     (when (and (= m 3) (= d 1)
     (when (and (= m 3) (= d 1)
                (not (null (gethash (list 2 29) org-bbdb-anniv-hash)))
                (not (null (gethash (list 2 29) org-bbdb-anniv-hash)))
@@ -303,7 +303,7 @@ This is used by Org to re-create the anniversary hash table."
 
 
     (when annivs
     (when annivs
       (while (setq rec (pop annivs))
       (while (setq rec (pop annivs))
-        (when rec 
+        (when rec
           (let* ((class (or (nth 2 rec)
           (let* ((class (or (nth 2 rec)
                             org-bbdb-default-anniversary-format))
                             org-bbdb-default-anniversary-format))
                  (form (or (cdr (assoc class
                  (form (or (cdr (assoc class

+ 6 - 6
lisp/org-clock.el

@@ -187,7 +187,7 @@ of a different task.")
   "Select a task that recently was associated with clocking."
   "Select a task that recently was associated with clocking."
   (interactive)
   (interactive)
   (let (sel-list rpl file task (i 0) s)
   (let (sel-list rpl file task (i 0) s)
-    (save-window-excursion 
+    (save-window-excursion
       (org-switch-to-buffer-other-window
       (org-switch-to-buffer-other-window
        (get-buffer-create "*Clock Task Select*"))
        (get-buffer-create "*Clock Task Select*"))
       (erase-buffer)
       (erase-buffer)
@@ -285,13 +285,13 @@ the clocking selection, associated with the letter `d'."
 		     (marker-position org-clock-marker)
 		     (marker-position org-clock-marker)
 		     (marker-buffer org-clock-marker))
 		     (marker-buffer org-clock-marker))
 	(org-clock-out t))
 	(org-clock-out t))
-      
+
       (when (equal select '(16))
       (when (equal select '(16))
 	;; Mark as default clocking task
 	;; Mark as default clocking task
 	(save-excursion
 	(save-excursion
 	  (org-back-to-heading t)
 	  (org-back-to-heading t)
 	  (move-marker org-clock-default-task (point))))
 	  (move-marker org-clock-default-task (point))))
-      
+
       (setq target-pos (point))  ;; we want to clock in at this location
       (setq target-pos (point))  ;; we want to clock in at this location
       (save-excursion
       (save-excursion
 	(when (and selected-task (marker-buffer selected-task))
 	(when (and selected-task (marker-buffer selected-task))
@@ -991,8 +991,8 @@ the currently selected interval size."
 	      (cond
 	      (cond
 	       ((eq formula '%)
 	       ((eq formula '%)
 		(setq pcol (+ (if scope-is-list 1 0) maxlevel 3))
 		(setq pcol (+ (if scope-is-list 1 0) maxlevel 3))
-		(insert 
-		 (format 
+		(insert
+		 (format
 		  "\n#+TBLFM: $%d='(org-clock-time%% @%d$%d $%d..$%d);%%.1f"
 		  "\n#+TBLFM: $%d='(org-clock-time%% @%d$%d $%d..$%d);%%.1f"
 		  pcol
 		  pcol
 		  2
 		  2
@@ -1160,7 +1160,7 @@ a stored clock"
 	(when (and resume-clock org-clock-persist
 	(when (and resume-clock org-clock-persist
 		   (file-exists-p (car resume-clock))
 		   (file-exists-p (car resume-clock))
 		   (or (not org-clock-persist-query-resume)
 		   (or (not org-clock-persist-query-resume)
-		       (y-or-n-p 
+		       (y-or-n-p
 			(concat
 			(concat
 			 "Resume clock ("
 			 "Resume clock ("
 			 (with-current-buffer (find-file (car resume-clock))
 			 (with-current-buffer (find-file (car resume-clock))

+ 1 - 1
lisp/org-colview-xemacs.el

@@ -406,7 +406,7 @@ This is the compiled version of the format.")
 
 
 (defun org-columns-add-ellipses (string width)
 (defun org-columns-add-ellipses (string width)
   "Truncate STRING with WIDTH characters, with ellipses."
   "Truncate STRING with WIDTH characters, with ellipses."
-  (cond 
+  (cond
    ((<= (length string) width) string)
    ((<= (length string) width) string)
    ((<= width (length org-columns-ellipses))
    ((<= width (length org-columns-ellipses))
     (substring org-columns-ellipses 0 width))
     (substring org-columns-ellipses 0 width))

+ 1 - 1
lisp/org-colview.el

@@ -220,7 +220,7 @@ This is the compiled version of the format.")
 
 
 (defun org-columns-add-ellipses (string width)
 (defun org-columns-add-ellipses (string width)
   "Truncate STRING with WIDTH characters, with ellipses."
   "Truncate STRING with WIDTH characters, with ellipses."
-  (cond 
+  (cond
    ((<= (length string) width) string)
    ((<= (length string) width) string)
    ((<= width (length org-columns-ellipses))
    ((<= width (length org-columns-ellipses))
     (substring org-columns-ellipses 0 width))
     (substring org-columns-ellipses 0 width))

+ 19 - 19
lisp/org-exp.el

@@ -326,7 +326,7 @@ This option can also be set with the +OPTIONS line, e.g. \"f:nil\"."
 <h2 class=\"footnotes\">%s: </h2>
 <h2 class=\"footnotes\">%s: </h2>
 <div id=\"footnotes-text\">
 <div id=\"footnotes-text\">
 %s
 %s
-</div> 
+</div>
 </div>"
 </div>"
   "Format for the footnotes section.
   "Format for the footnotes section.
 Should contain a two instances of %s.  The first will be replaced with the
 Should contain a two instances of %s.  The first will be replaced with the
@@ -996,7 +996,7 @@ modified) list.")
 				 (car (read-from-string
 				 (car (read-from-string
 				       (match-string 1 options))))))))))
 				       (match-string 1 options))))))))))
   p)
   p)
-  
+
 (defun org-export-add-subtree-options (p pos)
 (defun org-export-add-subtree-options (p pos)
   "Add options in subtree at position POS to property list P."
   "Add options in subtree at position POS to property list P."
   (save-excursion
   (save-excursion
@@ -1451,25 +1451,25 @@ on this string to produce the exported version."
       ;; The caller markes some stuff fo killing, stuff that has been
       ;; The caller markes some stuff fo killing, stuff that has been
       ;; used to create the page title, for example.
       ;; used to create the page title, for example.
       (org-export-kill-licensed-text)
       (org-export-kill-licensed-text)
-      
+
       (let ((org-inhibit-startup t)) (org-mode))
       (let ((org-inhibit-startup t)) (org-mode))
       (setq case-fold-search t)
       (setq case-fold-search t)
       (untabify (point-min) (point-max))
       (untabify (point-min) (point-max))
-      
+
       ;; Handle include files
       ;; Handle include files
       (org-export-handle-include-files)
       (org-export-handle-include-files)
-      
+
       ;; Get rid of excluded trees
       ;; Get rid of excluded trees
       (org-export-handle-export-tags (plist-get parameters :select-tags)
       (org-export-handle-export-tags (plist-get parameters :select-tags)
 				     (plist-get parameters :exclude-tags))
 				     (plist-get parameters :exclude-tags))
 
 
       ;; Handle source code snippets
       ;; Handle source code snippets
       (org-export-replace-src-segments)
       (org-export-replace-src-segments)
-      
+
       ;; Get rid of drawers
       ;; Get rid of drawers
       (org-export-remove-or-extract-drawers drawers
       (org-export-remove-or-extract-drawers drawers
 					    (plist-get parameters :drawers))
 					    (plist-get parameters :drawers))
-      
+
       ;; Get the correct stuff before the first headline
       ;; Get the correct stuff before the first headline
       (when (plist-get parameters :skip-before-1st-heading)
       (when (plist-get parameters :skip-before-1st-heading)
 	(goto-char (point-min))
 	(goto-char (point-min))
@@ -1480,10 +1480,10 @@ on this string to produce the exported version."
       (when (plist-get parameters :add-text)
       (when (plist-get parameters :add-text)
 	(goto-char (point-min))
 	(goto-char (point-min))
 	(insert (plist-get parameters :add-text) "\n"))
 	(insert (plist-get parameters :add-text) "\n"))
-      
+
       ;; Get rid of archived trees
       ;; Get rid of archived trees
       (org-export-remove-archived-trees archived-trees)
       (org-export-remove-archived-trees archived-trees)
-      
+
       ;; Remove todo-keywords before exporting, if the user has requested so
       ;; Remove todo-keywords before exporting, if the user has requested so
       (org-export-remove-headline-metadata parameters)
       (org-export-remove-headline-metadata parameters)
 
 
@@ -1930,7 +1930,7 @@ When it is nil, all comments will be removed."
 		  "]")))
 		  "]")))
 	 (put-text-property 0 (length s) 'face 'org-link s)
 	 (put-text-property 0 (length s) 'face 'org-link s)
 	 (replace-match s t t))))))
 	 (replace-match s t t))))))
-  
+
 (defun org-export-concatenate-multiline-links ()
 (defun org-export-concatenate-multiline-links ()
   "Find multi-line links and put it all into a single line.
   "Find multi-line links and put it all into a single line.
 This is to make sure that the line-processing export backends
 This is to make sure that the line-processing export backends
@@ -2096,7 +2096,7 @@ TYPE must be a string, any of:
       res)))
       res)))
 
 
 (org-number-to-roman 1961)
 (org-number-to-roman 1961)
-   
+
 
 
 ;;; Include files
 ;;; Include files
 
 
@@ -2252,7 +2252,7 @@ underlined headlines.  The default is 3."
 	      (goto-char rbeg)
 	      (goto-char rbeg)
 	      (and (org-at-heading-p)
 	      (and (org-at-heading-p)
 		   (>= (org-end-of-subtree t t) rend)))))
 		   (>= (org-end-of-subtree t t) rend)))))
-	 (opt-plist (if subtree-p 
+	 (opt-plist (if subtree-p
 			(org-export-add-subtree-options opt-plist rbeg)
 			(org-export-add-subtree-options opt-plist rbeg)
 		      opt-plist))
 		      opt-plist))
 	 (custom-times org-display-custom-times)
 	 (custom-times org-display-custom-times)
@@ -2903,7 +2903,7 @@ PUB-DIR is set, use this as the publishing directory."
 		(goto-char rbeg)
 		(goto-char rbeg)
 		(and (org-at-heading-p)
 		(and (org-at-heading-p)
 		     (>= (org-end-of-subtree t t) rend))))))
 		     (>= (org-end-of-subtree t t) rend))))))
-	 (opt-plist (if subtree-p 
+	 (opt-plist (if subtree-p
 			(org-export-add-subtree-options opt-plist rbeg)
 			(org-export-add-subtree-options opt-plist rbeg)
 		      opt-plist))
 		      opt-plist))
 	 ;; The following two are dynamically scoped into other
 	 ;; The following two are dynamically scoped into other
@@ -3294,7 +3294,7 @@ lang=\"%s\" xml:lang=\"%s\">
 		     "<a href=\"#"
 		     "<a href=\"#"
 		     (org-solidify-link-text
 		     (org-solidify-link-text
 		      (save-match-data (org-link-unescape path)) nil)
 		      (save-match-data (org-link-unescape path)) nil)
-		     "\"" attr ">" 
+		     "\"" attr ">"
 		     (org-export-html-format-desc desc)
 		     (org-export-html-format-desc desc)
 		     "</a>")))
 		     "</a>")))
 	     ((member type '("http" "https"))
 	     ((member type '("http" "https"))
@@ -3307,7 +3307,7 @@ lang=\"%s\" xml:lang=\"%s\">
 					attr (concat attr " alt=\"" path "\""))
 					attr (concat attr " alt=\"" path "\""))
 				    "/>"))
 				    "/>"))
 		(setq link (concat type ":" path))
 		(setq link (concat type ":" path))
-		(setq rpl (concat "<a href=\"" 
+		(setq rpl (concat "<a href=\""
 				  (org-export-html-format-href link)
 				  (org-export-html-format-href link)
 				  "\"" attr ">"
 				  "\"" attr ">"
 				  (org-export-html-format-desc desc)
 				  (org-export-html-format-desc desc)
@@ -3317,7 +3317,7 @@ lang=\"%s\" xml:lang=\"%s\">
 	      (setq link (concat type ":" path))
 	      (setq link (concat type ":" path))
 	      (setq rpl (concat "<a href=\""
 	      (setq rpl (concat "<a href=\""
 				(org-export-html-format-href link)
 				(org-export-html-format-href link)
-				"\"" attr ">" 
+				"\"" attr ">"
 				(org-export-html-format-desc desc)
 				(org-export-html-format-desc desc)
 				"</a>")))
 				"</a>")))
 
 
@@ -3495,7 +3495,7 @@ lang=\"%s\" xml:lang=\"%s\">
 		(insert (cond
 		(insert (cond
 			 ((equal item-type "u") "<ul>\n<li>\n")
 			 ((equal item-type "u") "<ul>\n<li>\n")
 			 ((equal item-type "o") "<ol>\n<li>\n")
 			 ((equal item-type "o") "<ol>\n<li>\n")
-			 ((equal item-type "d") 
+			 ((equal item-type "d")
 			  (format "<dl>\n<dt>%s</dt><dd>\n" item-tag))))
 			  (format "<dl>\n<dt>%s</dt><dd>\n" item-tag))))
 		(push item-type local-list-type)
 		(push item-type local-list-type)
 		(push ind local-list-indent)
 		(push ind local-list-indent)
@@ -4485,7 +4485,7 @@ END:VEVENT\n"
 	      (insert sexp "\n"))))
 	      (insert sexp "\n"))))
 	(princ (org-diary-to-ical-string sexp-buffer))
 	(princ (org-diary-to-ical-string sexp-buffer))
 	(kill-buffer sexp-buffer))
 	(kill-buffer sexp-buffer))
-      
+
       (when org-icalendar-include-todo
       (when org-icalendar-include-todo
 	(setq prefix "TODO-")
 	(setq prefix "TODO-")
 	(goto-char (point-min))
 	(goto-char (point-min))
@@ -4536,7 +4536,7 @@ END:VEVENT\n"
 		(setq pri org-default-priority))
 		(setq pri org-default-priority))
 	      (setq pri (floor (- 9 (* 8. (/ (float (- org-lowest-priority pri))
 	      (setq pri (floor (- 9 (* 8. (/ (float (- org-lowest-priority pri))
 					     (- org-lowest-priority org-highest-priority))))))
 					     (- org-lowest-priority org-highest-priority))))))
-	      
+
 	      (princ (format "BEGIN:VTODO
 	      (princ (format "BEGIN:VTODO
 UID: %s
 UID: %s
 %s
 %s

+ 2 - 2
lisp/org-export-latex.el

@@ -144,7 +144,7 @@ providing opening and closing strings for an environment that should
 represent the document section.  The opening clause should have a %s
 represent the document section.  The opening clause should have a %s
 to represent the section title."
 to represent the section title."
   :group 'org-export-latex
   :group 'org-export-latex
-  :type '(repeat 
+  :type '(repeat
 	  (list (string :tag "LaTeX class")
 	  (list (string :tag "LaTeX class")
 		(string :tag "LaTeX header")
 		(string :tag "LaTeX header")
 		(repeat :tag "Levels" :inline t
 		(repeat :tag "Levels" :inline t
@@ -1178,7 +1178,7 @@ If TIMESTAMPS, convert timestamps, otherwise delete them."
   (goto-char (point-min))
   (goto-char (point-min))
   (while (re-search-forward "^[ \t]*\\begin{\\([a-zA-Z]+\\)}" nil t)
   (while (re-search-forward "^[ \t]*\\begin{\\([a-zA-Z]+\\)}" nil t)
     (let* ((start (progn (beginning-of-line) (point)))
     (let* ((start (progn (beginning-of-line) (point)))
-	   (end (or (and (re-search-forward 
+	   (end (or (and (re-search-forward
 			  (concat "^[ \t]*\\end{" (match-string 1) "}" nil t)
 			  (concat "^[ \t]*\\end{" (match-string 1) "}" nil t)
 			  (point-at-eol)))
 			  (point-at-eol)))
 		    (point-max))))
 		    (point-max))))

+ 1 - 1
lisp/org-faces.el

@@ -163,7 +163,7 @@ This is actually only part of the face definition for the text in column view.
 The following faces apply, with this priority.
 The following faces apply, with this priority.
 
 
 1. The color of the reference face.  This is normally the level fact that
 1. The color of the reference face.  This is normally the level fact that
-   is used in the outline.  In agenda-mode, it will be the face of the 
+   is used in the outline.  In agenda-mode, it will be the face of the
    first character in the line.  The color is explicitly retained to
    first character in the line.  The color is explicitly retained to
    make sure that the column line still looks a bit like the structure
    make sure that the column line still looks a bit like the structure
    line it is masking.
    line it is masking.

+ 5 - 5
lisp/org-id.el

@@ -145,13 +145,13 @@ With optional argument FORCE, force the creation of a new ID."
   (when force
   (when force
     (org-entry-put (point) "ID" nil))
     (org-entry-put (point) "ID" nil))
   (org-id-get (point) 'create))
   (org-id-get (point) 'create))
-  
+
 ;;;###autoload
 ;;;###autoload
 (defun org-id-copy ()
 (defun org-id-copy ()
   "Copy the ID of the entry at point to the kill ring.
   "Copy the ID of the entry at point to the kill ring.
 Create an ID if necessary."
 Create an ID if necessary."
   (interactive)
   (interactive)
-  (kill-new (org-id-get nil 'create)))  
+  (kill-new (org-id-get nil 'create)))
 
 
 ;;;###autoload
 ;;;###autoload
 (defun org-id-get (&optional pom create prefix)
 (defun org-id-get (&optional pom create prefix)
@@ -180,10 +180,10 @@ headlines.  When omitted, all headlines in all agenda files are
 eligible.
 eligible.
 It returns the ID of the entry.  If necessary, the ID is created."
 It returns the ID of the entry.  If necessary, the ID is created."
   (let* ((org-refile-targets (or targets '((nil . (:maxlevel . 10)))))
   (let* ((org-refile-targets (or targets '((nil . (:maxlevel . 10)))))
-	 (org-refile-use-outline-path 
+	 (org-refile-use-outline-path
 	  (if (caar org-refile-targets) 'file t))
 	  (if (caar org-refile-targets) 'file t))
 	 (spos (org-refile-get-location "Entry: "))
 	 (spos (org-refile-get-location "Entry: "))
-	 (pom (and spos (move-marker (make-marker) (nth 3 spos) 
+	 (pom (and spos (move-marker (make-marker) (nth 3 spos)
 				     (get-file-buffer (nth 1 spos))))))
 				     (get-file-buffer (nth 1 spos))))))
     (prog1 (org-id-get pom 'create)
     (prog1 (org-id-get pom 'create)
       (move-marker pom nil))))
       (move-marker pom nil))))
@@ -209,7 +209,7 @@ Move the cursor to that entry in that buffer."
     (switch-to-buffer (marker-buffer m))
     (switch-to-buffer (marker-buffer m))
     (goto-char m)
     (goto-char m)
     (move-marker m nil)
     (move-marker m nil)
-    (org-show-context)))    
+    (org-show-context)))
 
 
 ;;;###autoload
 ;;;###autoload
 (defun org-id-find (id &optional markerp)
 (defun org-id-find (id &optional markerp)

+ 1 - 1
lisp/org-list.el

@@ -188,7 +188,7 @@ Return t when things worked, nil when we are not in an item."
 				  (save-match-data
 				  (save-match-data
 				    (and (looking-at "[ \t]*\\(.*?\\) ::")
 				    (and (looking-at "[ \t]*\\(.*?\\) ::")
 					 (match-string 1)))))
 					 (match-string 1)))))
-	   (timerp (and descp 
+	   (timerp (and descp
 			(save-match-data
 			(save-match-data
 			  (string-match "^[-+*][ \t]+[0-9]+:[0-9]+:[0-9]+$"
 			  (string-match "^[-+*][ \t]+[0-9]+:[0-9]+:[0-9]+$"
 					descp))))
 					descp))))

+ 1 - 1
lisp/org-mouse.el

@@ -177,7 +177,7 @@ Changing this variable requires a restart of Emacs to get activated."
 	      (const :tag "S-mouse-2 and drag-mouse-3 yank link" yank-link)
 	      (const :tag "S-mouse-2 and drag-mouse-3 yank link" yank-link)
 	      (const :tag "Activate headline stars" activate-stars)
 	      (const :tag "Activate headline stars" activate-stars)
 	      (const :tag "Activate item bullets" activate-bullets)
 	      (const :tag "Activate item bullets" activate-bullets)
-	      (const :tag "Activate checkboxes" activate-checkboxes)))	      
+	      (const :tag "Activate checkboxes" activate-checkboxes)))
 
 
 (defun org-mouse-re-search-line (regexp)
 (defun org-mouse-re-search-line (regexp)
   "Search the current line for a given regular expression."
   "Search the current line for a given regular expression."

+ 1 - 1
lisp/org-plot.el

@@ -119,7 +119,7 @@ will be added.  Returns the resulting property list."
   "Export TABLE to DATA-FILE in a format readable by gnuplot.
   "Export TABLE to DATA-FILE in a format readable by gnuplot.
 Pass PARAMS through to `orgtbl-to-generic' when exporting TABLE."
 Pass PARAMS through to `orgtbl-to-generic' when exporting TABLE."
   (with-temp-file
   (with-temp-file
-      data-file 
+      data-file
     (make-local-variable 'org-plot-timestamp-fmt)
     (make-local-variable 'org-plot-timestamp-fmt)
     (setq org-plot-timestamp-fmt (or
     (setq org-plot-timestamp-fmt (or
                                   (plist-get params :timefmt)
                                   (plist-get params :timefmt)

+ 4 - 4
lisp/org-publish.el

@@ -263,7 +263,7 @@ index of files or summary page for a given project.
                          generates a plain list of links to all files
                          generates a plain list of links to all files
                          in the project.
                          in the project.
   :index-style           Can be `list' (index is just an itemized list
   :index-style           Can be `list' (index is just an itemized list
-                         of the titles of the files involved) or 
+                         of the titles of the files involved) or
                          `tree' (the directory structure of the source
                          `tree' (the directory structure of the source
                          files is reflected in the index).  Defaults to
                          files is reflected in the index).  Defaults to
                          `tree'."
                          `tree'."
@@ -276,7 +276,7 @@ When nil, do no timestamp checking and always publish all files."
   :group 'org-publish
   :group 'org-publish
   :type 'boolean)
   :type 'boolean)
 
 
-(defcustom org-publish-timestamp-directory (convert-standard-filename 
+(defcustom org-publish-timestamp-directory (convert-standard-filename
 					    "~/.org-timestamps/")
 					    "~/.org-timestamps/")
   "Name of directory in which to store publishing timestamps."
   "Name of directory in which to store publishing timestamps."
   :group 'org-publish
   :group 'org-publish
@@ -422,7 +422,7 @@ This splices all the components into the list."
 		      rest))
 		      rest))
 	(push p rtn)))
 	(push p rtn)))
     (nreverse (org-publish-delete-dups (delq nil rtn)))))
     (nreverse (org-publish-delete-dups (delq nil rtn)))))
-	
+
 (defun org-publish-get-base-files-1 (base-dir &optional recurse match skip-file skip-dir)
 (defun org-publish-get-base-files-1 (base-dir &optional recurse match skip-file skip-dir)
   "Set `org-publish-temp-files' with files from BASE-DIR directory.
   "Set `org-publish-temp-files' with files from BASE-DIR directory.
 If RECURSE is non-nil, check BASE-DIR recursively.  If MATCH is
 If RECURSE is non-nil, check BASE-DIR recursively.  If MATCH is
@@ -461,7 +461,7 @@ matching filenames."
 				  ;; for skip-file and skip-dir?
 				  ;; for skip-file and skip-dir?
 				  exclude-regexp exclude-regexp)
 				  exclude-regexp exclude-regexp)
     (mapc (lambda (f)
     (mapc (lambda (f)
-	    (pushnew 
+	    (pushnew
 	     (expand-file-name (concat base-dir f))
 	     (expand-file-name (concat base-dir f))
 	     org-publish-temp-files))
 	     org-publish-temp-files))
 	  include-list)
 	  include-list)

+ 3 - 3
lisp/org-remember.el

@@ -55,7 +55,7 @@
   "Non-nil means, `C-c C-c' stores remember note without further prompts.
   "Non-nil means, `C-c C-c' stores remember note without further prompts.
 It then uses the file and headline specified by the template or (if the
 It then uses the file and headline specified by the template or (if the
 template does not specify them) by the variables `org-default-notes-file'
 template does not specify them) by the variables `org-default-notes-file'
-and `org-remember-default-headline'.  To force prompting anyway, use 
+and `org-remember-default-headline'.  To force prompting anyway, use
 `C-u C-c C-c' to file the note.
 `C-u C-c C-c' to file the note.
 
 
 When this variable is nil, `C-c C-c' gives you the prompts, and
 When this variable is nil, `C-c C-c' gives you the prompts, and
@@ -349,7 +349,7 @@ to be run from that hook to function properly."
 		ct))
 		ct))
 	     (tpl (car entry))
 	     (tpl (car entry))
 	     (plist-p (if org-store-link-plist t nil))
 	     (plist-p (if org-store-link-plist t nil))
-	     (file (if (and (nth 1 entry) 
+	     (file (if (and (nth 1 entry)
 			    (or (and (stringp (nth 1 entry))
 			    (or (and (stringp (nth 1 entry))
 				     (string-match "\\S-" (nth 1 entry)))
 				     (string-match "\\S-" (nth 1 entry)))
 				(functionp (nth 1 entry))))
 				(functionp (nth 1 entry))))
@@ -589,7 +589,7 @@ from that hook."
 		 (point)))
 		 (point)))
   (message "%s"
   (message "%s"
 	   (format
 	   (format
-	    (substitute-command-keys 
+	    (substitute-command-keys
 	     "Restore window configuration with \\[jump-to-register] %c")
 	     "Restore window configuration with \\[jump-to-register] %c")
 	    remember-register)))
 	    remember-register)))
 
 

+ 2 - 2
lisp/org-table.el

@@ -3464,7 +3464,7 @@ conflicting binding to this key outside orgtbl-mode."
     (if cmd
     (if cmd
 	(call-interactively cmd)
 	(call-interactively cmd)
       (call-interactively 'org-table-create-or-convert-from-region))))
       (call-interactively 'org-table-create-or-convert-from-region))))
- 
+
 (defun orgtbl-tab (arg)
 (defun orgtbl-tab (arg)
   "Justification and field motion for `orgtbl-mode'."
   "Justification and field motion for `orgtbl-mode'."
   (interactive "P")
   (interactive "P")
@@ -3586,7 +3586,7 @@ The table is taken from the parameter TXT, or from the buffer at point."
   (unless txt
   (unless txt
     (unless (org-at-table-p)
     (unless (org-at-table-p)
       (error "No table at point")))
       (error "No table at point")))
-  (let* ((txt (or txt 
+  (let* ((txt (or txt
 		  (buffer-substring-no-properties (org-table-begin)
 		  (buffer-substring-no-properties (org-table-begin)
 						  (org-table-end))))
 						  (org-table-end))))
 	 (lines (org-split-string txt "[ \t]*\n[ \t]*")))
 	 (lines (org-split-string txt "[ \t]*\n[ \t]*")))

+ 1 - 1
lisp/org-timer.el

@@ -66,7 +66,7 @@ the region 0:00:00."
 	  (setq def (if (org-in-regexp org-timer-re)
 	  (setq def (if (org-in-regexp org-timer-re)
 			(match-string 0)
 			(match-string 0)
 		      "0:00:00")
 		      "0:00:00")
-		s (read-string 
+		s (read-string
 		   (format "Restart timer with offset [%s]: " def)))
 		   (format "Restart timer with offset [%s]: " def)))
 	  (unless (string-match "\\S-" s) (setq s def))
 	  (unless (string-match "\\S-" s) (setq s def))
 	  (setq delta (org-timer-hms-to-secs (org-timer-fix-incomplete s)))))
 	  (setq delta (org-timer-hms-to-secs (org-timer-fix-incomplete s)))))

+ 1 - 1
lisp/org-w3m.el

@@ -122,7 +122,7 @@ so that it can be yanked into an Org-mode buffer with links working correctly."
     (while (previous-single-property-change (point) 'w3m-anchor-sequence)
     (while (previous-single-property-change (point) 'w3m-anchor-sequence)
       ;; jump to previous anchor
       ;; jump to previous anchor
       (goto-char (previous-single-property-change (point) 'w3m-anchor-sequence))
       (goto-char (previous-single-property-change (point) 'w3m-anchor-sequence))
-      (when (w3m-anchor (point)) 
+      (when (w3m-anchor (point))
 	;; return point when current is valid link
 	;; return point when current is valid link
 	(throw 'reach nil))))
 	(throw 'reach nil))))
   (point))
   (point))

+ 2 - 2
lisp/org.el

@@ -2372,7 +2372,7 @@ Use customize to modify this, or restart Emacs after changing it."
 (defcustom org-completion-use-ido nil
 (defcustom org-completion-use-ido nil
   "Non-nil means, use ido completion wherever possible."
   "Non-nil means, use ido completion wherever possible."
   :group 'org-completion
   :group 'org-completion
-  :type 'boolean)  
+  :type 'boolean)
 
 
 (defcustom org-completion-fallback-command 'hippie-expand
 (defcustom org-completion-fallback-command 'hippie-expand
   "The expansion command called by \\[org-complete] in normal context.
   "The expansion command called by \\[org-complete] in normal context.
@@ -6935,7 +6935,7 @@ application the system uses for this file type."
 			   (format "Execute \"%s\" as elisp? "
 			   (format "Execute \"%s\" as elisp? "
 				   (org-add-props cmd nil
 				   (org-add-props cmd nil
 				     'face 'org-warning))))
 				     'face 'org-warning))))
-	      (message "%s => %s" cmd 
+	      (message "%s => %s" cmd
 		       (if (equal (string-to-char cmd) ?\()
 		       (if (equal (string-to-char cmd) ?\()
 			   (eval (read cmd))
 			   (eval (read cmd))
 			 (call-interactively (read cmd))))
 			 (call-interactively (read cmd))))