瀏覽代碼

Fix whitespace issues

Carsten Dominik 16 年之前
父節點
當前提交
379b24cc63
共有 14 個文件被更改,包括 88 次插入88 次删除
  1. 3 3
      lisp/org-agenda.el
  2. 4 4
      lisp/org-ascii.el
  3. 1 1
      lisp/org-attach.el
  4. 6 6
      lisp/org-clock.el
  5. 7 7
      lisp/org-exp.el
  6. 4 4
      lisp/org-feed.el
  7. 4 4
      lisp/org-footnote.el
  8. 4 4
      lisp/org-html.el
  9. 3 3
      lisp/org-latex.el
  10. 1 1
      lisp/org-list.el
  11. 4 4
      lisp/org-mac-message.el
  12. 2 2
      lisp/org-protocol.el
  13. 2 2
      lisp/org-remember.el
  14. 43 43
      lisp/org.el

+ 3 - 3
lisp/org-agenda.el

@@ -528,7 +528,7 @@ See also the variable `org-agenda-tags-todo-honor-ignore-options'."
   "Non-nil means, honor todo-list ...ignore options also in tags-todo search.
   "Non-nil means, honor todo-list ...ignore options also in tags-todo search.
 The variables
 The variables
    `org-agenda-todo-ignore-with-date',
    `org-agenda-todo-ignore-with-date',
-   `org-agenda-todo-ignore-scheduled' 
+   `org-agenda-todo-ignore-scheduled'
    `org-agenda-todo-ignore-deadlines'
    `org-agenda-todo-ignore-deadlines'
 make the global TODO list skip entries that have time stamps of certain
 make the global TODO list skip entries that have time stamps of certain
 kinds.  If this option is set, the same options will also apply for the
 kinds.  If this option is set, the same options will also apply for the
@@ -2820,7 +2820,7 @@ given in `org-agenda-start-on-weekday'."
 				 'org-agenda-date))
 				 'org-agenda-date))
 	    (put-text-property s (1- (point)) 'org-date-line t)
 	    (put-text-property s (1- (point)) 'org-date-line t)
 	    (put-text-property s (1- (point)) 'org-day-cnt day-cnt)
 	    (put-text-property s (1- (point)) 'org-day-cnt day-cnt)
- 	    (when todayp 
+ 	    (when todayp
  	      (put-text-property s (1- (point)) 'org-today t)
  	      (put-text-property s (1- (point)) 'org-today t)
  	      (put-text-property s (1- (point)) 'face 'org-agenda-date-today))
  	      (put-text-property s (1- (point)) 'face 'org-agenda-date-today))
 	    (if rtnall (insert
 	    (if rtnall (insert
@@ -4630,7 +4630,7 @@ If ERROR is non-nil, throw an error, otherwise just return nil."
   (if org-agenda-columns-active
   (if org-agenda-columns-active
       (org-columns-quit)
       (org-columns-quit)
     (let ((buf (current-buffer)))
     (let ((buf (current-buffer)))
-      (and (not (eq org-agenda-window-setup 'current-window)) 
+      (and (not (eq org-agenda-window-setup 'current-window))
            (not (one-window-p))
            (not (one-window-p))
            (delete-window))
            (delete-window))
       (kill-buffer buf)
       (kill-buffer buf)

+ 4 - 4
lisp/org-ascii.el

@@ -278,10 +278,10 @@ publishing directory."
 	(setq date (format-time-string date)))
 	(setq date (format-time-string date)))
        (date)
        (date)
        (t (setq date (format-time-string "%Y-%m-%d %T %Z"))))
        (t (setq date (format-time-string "%Y-%m-%d %T %Z"))))
-      
+
       (if (and date org-export-time-stamp-file)
       (if (and date org-export-time-stamp-file)
 	  (insert (concat (nth 2 lang-words) ": " date"\n")))
 	  (insert (concat (nth 2 lang-words) ": " date"\n")))
-      
+
       (insert "\n\n"))
       (insert "\n\n"))
 
 
     (if (and org-export-with-toc (not body-only))
     (if (and org-export-with-toc (not body-only))
@@ -362,7 +362,7 @@ publishing directory."
 				      (substring link 8)
 				      (substring link 8)
 				      org-export-code-refs)))
 				      org-export-code-refs)))
 			t t line))
 			t t line))
-	  (setq rpl (concat "[" 
+	  (setq rpl (concat "["
 			    (or (match-string 3 line) (match-string 1 line))
 			    (or (match-string 3 line) (match-string 1 line))
 			    "]"))
 			    "]"))
 	  (when (and desc0 (not (equal desc0 link)))
 	  (when (and desc0 (not (equal desc0 link)))
@@ -498,7 +498,7 @@ publishing directory."
 		(make-string ind ?\ )
 		(make-string ind ?\ )
 		(substring line (1+ pos)))
 		(substring line (1+ pos)))
       line)))
       line)))
-			   
+
 (defun org-export-ascii-push-links (link-buffer)
 (defun org-export-ascii-push-links (link-buffer)
   "Push out links in the buffer."
   "Push out links in the buffer."
   (when link-buffer
   (when link-buffer

+ 1 - 1
lisp/org-attach.el

@@ -95,7 +95,7 @@ ln    create a hard link.  Note that this is not supported
   "Non-nil means, allow attachment directories be inherited."
   "Non-nil means, allow attachment directories be inherited."
   :group 'org-attach
   :group 'org-attach
   :type 'boolean)
   :type 'boolean)
-  
+
 
 
 (defvar org-attach-inherited nil
 (defvar org-attach-inherited nil
   "Indicates if the last access to the attachment directory was inherited.")
   "Indicates if the last access to the attachment directory was inherited.")

+ 6 - 6
lisp/org-clock.el

@@ -202,7 +202,7 @@ auto     Automtically, either `all', or `repeat' for repeating tasks"
 (defvar org-clock-heading-for-remember "")
 (defvar org-clock-heading-for-remember "")
 (defvar org-clock-start-time "")
 (defvar org-clock-start-time "")
 
 
-(defvar org-clock-effort "" 
+(defvar org-clock-effort ""
   "Effort estimate of the currently clocking task")
   "Effort estimate of the currently clocking task")
 
 
 (defvar org-clock-total-time nil
 (defvar org-clock-total-time nil
@@ -309,7 +309,7 @@ pointing to it."
 			   (looking-at "\\*+ ")
 			   (looking-at "\\*+ ")
 			   (match-string 0))
 			   (match-string 0))
 		  task (substring
 		  task (substring
-			(org-fontify-like-in-org-mode 
+			(org-fontify-like-in-org-mode
 			 (concat prefix heading)
 			 (concat prefix heading)
 			 org-odd-levels-only)
 			 org-odd-levels-only)
 			(length prefix))))))
 			(length prefix))))))
@@ -329,7 +329,7 @@ If not, show simply the clocked time like 01:50."
     (if (and org-clock-effort)
     (if (and org-clock-effort)
 	(let* ((effort-in-minutes (org-hh:mm-string-to-minutes org-clock-effort))
 	(let* ((effort-in-minutes (org-hh:mm-string-to-minutes org-clock-effort))
 	       (effort-h (floor effort-in-minutes 60))
 	       (effort-h (floor effort-in-minutes 60))
-	       (effort-m (- effort-in-minutes (* effort-h 60))) 
+	       (effort-m (- effort-in-minutes (* effort-h 60)))
 	       )
 	       )
 	  (format (concat "-[" org-time-clocksum-format "/" org-time-clocksum-format " (%s)]")
 	  (format (concat "-[" org-time-clocksum-format "/" org-time-clocksum-format " (%s)]")
 		  h m effort-h effort-m  org-clock-heading)
 		  h m effort-h effort-m  org-clock-heading)
@@ -435,13 +435,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))
@@ -590,7 +590,7 @@ line and position cursor in that line."
 			  " +\\sw+ +[012][0-9]:[0-5][0-9]\\)\\][ \t]*$")
 			  " +\\sw+ +[012][0-9]:[0-5][0-9]\\)\\][ \t]*$")
 		  end t))
 		  end t))
 	(beginning-of-line 1)
 	(beginning-of-line 1)
-	(throw 'exit t))		 
+	(throw 'exit t))
       (when (eobp) (newline) (setq end (max (point) end)))
       (when (eobp) (newline) (setq end (max (point) end)))
       (when (re-search-forward (concat "^[ \t]*:" drawer ":") end t)
       (when (re-search-forward (concat "^[ \t]*:" drawer ":") end t)
 	;; we seem to have a CLOCK drawer, so go there.
 	;; we seem to have a CLOCK drawer, so go there.

+ 7 - 7
lisp/org-exp.el

@@ -1335,7 +1335,7 @@ on this string to produce the exported version."
       ;; HTML-specific preprocessing
       ;; HTML-specific preprocessing
       (when htmlp
       (when htmlp
 	(org-export-html-preprocess parameters))
 	(org-export-html-preprocess parameters))
-      
+
       ;; DocBook-specific preprocessing
       ;; DocBook-specific preprocessing
       (when docbookp
       (when docbookp
 	(require 'org-docbook nil)
 	(require 'org-docbook nil)
@@ -2207,7 +2207,7 @@ INDENT was the original indentation of the block."
 		  (setq lang nil)
 		  (setq lang nil)
 		  (message
 		  (message
 		   "htmlize.el 1.34 or later is needed for source code formatting")))
 		   "htmlize.el 1.34 or later is needed for source code formatting")))
-	      
+
 	      (if lang
 	      (if lang
 		  (let* ((mode (and lang (intern (concat lang "-mode"))))
 		  (let* ((mode (and lang (intern (concat lang "-mode"))))
 			 (org-inhibit-startup t)
 			 (org-inhibit-startup t)
@@ -2298,7 +2298,7 @@ INDENT was the original indentation of the block."
 			   (substring label-format (match-end 0))
 			   (substring label-format (match-end 0))
 			 ""))
 			 ""))
 	   (lbl-re
 	   (lbl-re
-	    (concat 
+	    (concat
 	     ".*?\\S-.*?\\([ \t]*\\("
 	     ".*?\\S-.*?\\([ \t]*\\("
 	     (regexp-quote label-pre)
 	     (regexp-quote label-pre)
 	     "\\([-a-zA-Z0-9_]+\\)"
 	     "\\([-a-zA-Z0-9_]+\\)"
@@ -2476,17 +2476,17 @@ directory."
       (erase-buffer)
       (erase-buffer)
       (insert region)
       (insert region)
       (let ((org-inhibit-startup t)) (org-mode))
       (let ((org-inhibit-startup t)) (org-mode))
-      
+
       ;; Get rid of archived trees
       ;; Get rid of archived trees
       (org-export-remove-archived-trees (plist-get opt-plist :archived-trees))
       (org-export-remove-archived-trees (plist-get opt-plist :archived-trees))
-      
+
       ;; Remove comment environment and comment subtrees
       ;; Remove comment environment and comment subtrees
       (org-export-remove-comment-blocks-and-subtrees)
       (org-export-remove-comment-blocks-and-subtrees)
-      
+
       ;; Get rid of excluded trees
       ;; Get rid of excluded trees
       (org-export-handle-export-tags (plist-get opt-plist :select-tags)
       (org-export-handle-export-tags (plist-get opt-plist :select-tags)
 				     (plist-get opt-plist :exclude-tags))
 				     (plist-get opt-plist :exclude-tags))
-      
+
       (when (or (plist-get opt-plist :plain-source)
       (when (or (plist-get opt-plist :plain-source)
 		(not (or (plist-get opt-plist :plain-source)
 		(not (or (plist-get opt-plist :plain-source)
 			 (plist-get opt-plist :htmlized-source))))
 			 (plist-get opt-plist :htmlized-source))))

+ 4 - 4
lisp/org-feed.el

@@ -141,7 +141,7 @@ Here are the keyword-value pair allows in `org-feed-alist'.
      The default action on new items in the feed is to add them as children
      The default action on new items in the feed is to add them as children
      under the headline for the feed.  The template describes how the entry
      under the headline for the feed.  The template describes how the entry
      should be formatted.  If not given, it defaults to
      should be formatted.  If not given, it defaults to
-     `org-feed-default-template'. 
+     `org-feed-default-template'.
 
 
 :formatter formatter-function
 :formatter formatter-function
      Instead of relying on a template, you may specify a function to format
      Instead of relying on a template, you may specify a function to format
@@ -322,7 +322,7 @@ it can be a list structured like an entry in `org-feed-alist'."
 	  ;; Add the "handled" status to the appropriate entries
 	  ;; Add the "handled" status to the appropriate entries
 	  (setq entries (mapcar (lambda (e)
 	  (setq entries (mapcar (lambda (e)
 				  (setq e (plist-put e :handled
 				  (setq e (plist-put e :handled
-						     (nth 1 (assoc 
+						     (nth 1 (assoc
 							     (plist-get e :guid)
 							     (plist-get e :guid)
 							     old-status)))))
 							     old-status)))))
 				entries))
 				entries))
@@ -381,7 +381,7 @@ it can be a list structured like an entry in `org-feed-alist'."
 		    (mapcar
 		    (mapcar
 		     (lambda (e) (org-feed-format-entry e template formatter))
 		     (lambda (e) (org-feed-format-entry e template formatter))
 		     new)))
 		     new)))
-	
+
 	    ;; Insert the new items
 	    ;; Insert the new items
 	    (org-feed-add-items inbox-pos new-formatted))
 	    (org-feed-add-items inbox-pos new-formatted))
 
 
@@ -395,7 +395,7 @@ it can be a list structured like an entry in `org-feed-alist'."
 	  ;; that would would end up with a status that does not reflect
 	  ;; that would would end up with a status that does not reflect
 	  ;; which items truely have been handled
 	  ;; which items truely have been handled
 	  (org-feed-write-status inbox-pos drawer status)
 	  (org-feed-write-status inbox-pos drawer status)
-	  
+
 	  ;; Normalize the visibility of the inbox tree
 	  ;; Normalize the visibility of the inbox tree
 	  (goto-char inbox-pos)
 	  (goto-char inbox-pos)
 	  (hide-subtree)
 	  (hide-subtree)

+ 4 - 4
lisp/org-footnote.el

@@ -57,7 +57,7 @@
 	  "\\]")
 	  "\\]")
   "Regular expression for matching footnotes.")
   "Regular expression for matching footnotes.")
 
 
-(defconst org-footnote-definition-re 
+(defconst org-footnote-definition-re
   (org-re "^\\(\\[\\([0-9]+\\|fn:[-_[:word:]]+\\)\\]\\)")
   (org-re "^\\(\\[\\([0-9]+\\|fn:[-_[:word:]]+\\)\\]\\)")
   "Regular expression matching the definition of a footnote.")
   "Regular expression matching the definition of a footnote.")
 
 
@@ -363,7 +363,7 @@ referenced sequence."
 		org-footnote-fill-after-inline-note-extraction
 		org-footnote-fill-after-inline-note-extraction
 		(fill-paragraph)))
 		(fill-paragraph)))
 	 (if (not a) (push (list ref marker def (if idef t nil)) ref-table))))
 	 (if (not a) (push (list ref marker def (if idef t nil)) ref-table))))
-      
+
       ;; First find and remove the footnote section
       ;; First find and remove the footnote section
       (goto-char (point-min))
       (goto-char (point-min))
       (cond
       (cond
@@ -386,7 +386,7 @@ referenced sequence."
 	      (insert "* " org-footnote-section "\n")
 	      (insert "* " org-footnote-section "\n")
 	      (setq ins-point (point))))))
 	      (setq ins-point (point))))))
        (t
        (t
-	(if (re-search-forward 
+	(if (re-search-forward
 	     (concat "^"
 	     (concat "^"
 		     (regexp-quote org-footnote-tag-for-non-org-mode-files)
 		     (regexp-quote org-footnote-tag-for-non-org-mode-files)
 		     "[ \t]*$")
 		     "[ \t]*$")
@@ -397,7 +397,7 @@ referenced sequence."
 	(delete-region (point) (point-max))
 	(delete-region (point) (point-max))
 	(insert "\n\n" org-footnote-tag-for-non-org-mode-files "\n")
 	(insert "\n\n" org-footnote-tag-for-non-org-mode-files "\n")
 	(setq ins-point (point))))
 	(setq ins-point (point))))
-      
+
       ;; Insert the footnotes again
       ;; Insert the footnotes again
       (goto-char (or ins-point (point-max)))
       (goto-char (or ins-point (point-max)))
       (setq ref-table (reverse ref-table))
       (setq ref-table (reverse ref-table))

+ 4 - 4
lisp/org-html.el

@@ -61,7 +61,7 @@ by the footnotes themselves."
 
 
 (defcustom org-export-html-xml-declaration
 (defcustom org-export-html-xml-declaration
   '(("html" . "<?xml version=\"1.0\" encoding=\"%s\"?>")
   '(("html" . "<?xml version=\"1.0\" encoding=\"%s\"?>")
-    ("php" . "<?php echo '<?xml version=\"1.0\" encoding=\"%s\" ?>'; ?>"))    
+    ("php" . "<?php echo '<?xml version=\"1.0\" encoding=\"%s\" ?>'; ?>"))
   "The extension for exported HTML files.
   "The extension for exported HTML files.
 %s will be replaced with the charset of the exported file.
 %s will be replaced with the charset of the exported file.
 This may be a string, or an alist with export extensions
 This may be a string, or an alist with export extensions
@@ -1136,7 +1136,7 @@ lang=\"%s\" xml:lang=\"%s\">
 	    (org-html-level-start level txt umax
 	    (org-html-level-start level txt umax
 				  (and org-export-with-toc (<= level umax))
 				  (and org-export-with-toc (<= level umax))
 				  head-count)
 				  head-count)
-	    
+
 	    ;; QUOTES
 	    ;; QUOTES
 	    (when (string-match quote-re line)
 	    (when (string-match quote-re line)
 	      (org-close-par-maybe)
 	      (org-close-par-maybe)
@@ -1502,7 +1502,7 @@ lang=\"%s\" xml:lang=\"%s\">
 		    (delq nil (mapcar
 		    (delq nil (mapcar
 			       (lambda (x) (string-match "^[ \t]*|-" x))
 			       (lambda (x) (string-match "^[ \t]*|-" x))
 			       (cdr lines)))))
 			       (cdr lines)))))
-	 
+
 	 (nlines 0) fnum i
 	 (nlines 0) fnum i
 	 tbopen line fields html gr colgropen)
 	 tbopen line fields html gr colgropen)
     (if splice (setq head nil))
     (if splice (setq head nil))
@@ -1562,7 +1562,7 @@ lang=\"%s\" xml:lang=\"%s\">
 	      fnum "")
 	      fnum "")
 	     "</colgroup>")
 	     "</colgroup>")
 	    html)
 	    html)
-      
+
       ;; Since the output of HTML table formatter can also be used in
       ;; Since the output of HTML table formatter can also be used in
       ;; DocBook document, we want to always include the caption to make
       ;; DocBook document, we want to always include the caption to make
       ;; DocBook XML file valid.
       ;; DocBook XML file valid.

+ 3 - 3
lisp/org-latex.el

@@ -207,7 +207,7 @@ formats for not-done and done states, or an association list with setup
 for individual keywords.  If a keyword shows up for which there is no
 for individual keywords.  If a keyword shows up for which there is no
 markup defined, the first one in the association list will be used."
 markup defined, the first one in the association list will be used."
   :group 'org-export-latex
   :group 'org-export-latex
-  :type '(choice 
+  :type '(choice
 	  (string :tag "Default")
 	  (string :tag "Default")
 	  (cons :tag "Distinguish undone and done"
 	  (cons :tag "Distinguish undone and done"
 		(string :tag "Not-DONE states")
 		(string :tag "Not-DONE states")
@@ -216,7 +216,7 @@ markup defined, the first one in the association list will be used."
 		  (cons
 		  (cons
 		   (string :tag "Keyword")
 		   (string :tag "Keyword")
 		   (string :tag "Markup")))))
 		   (string :tag "Markup")))))
-	   
+
 (defcustom org-export-latex-timestamp-markup "\\textit{%s}"
 (defcustom org-export-latex-timestamp-markup "\\textit{%s}"
   "A printf format string to be applied to time stamps."
   "A printf format string to be applied to time stamps."
   :group 'org-export-latex
   :group 'org-export-latex
@@ -1476,7 +1476,7 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
   (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{" 
+			  (concat "^[ \t]*\\\\end{"
 				  (regexp-quote (match-string 1))
 				  (regexp-quote (match-string 1))
 				  "}") nil t)
 				  "}") nil t)
 			 (point-at-eol))
 			 (point-at-eol))

+ 1 - 1
lisp/org-list.el

@@ -1233,7 +1233,7 @@ with overruling parameters for `org-list-to-generic'."
 LIST is as returnd by `org-list-parse-list'.  PARAMS is a property list
 LIST is as returnd by `org-list-parse-list'.  PARAMS is a property list
 with overruling parameters for `org-list-to-generic'."
 with overruling parameters for `org-list-to-generic'."
   (org-list-to-generic
   (org-list-to-generic
-   list 
+   list
    (org-combine-plists
    (org-combine-plists
     '(:splicep nil :ostart "@itemize @minus" :oend "@end itemize"
     '(:splicep nil :ostart "@itemize @minus" :oend "@end itemize"
 	       :ustart "@enumerate" :uend "@end enumerate"
 	       :ustart "@enumerate" :uend "@end enumerate"

+ 4 - 4
lisp/org-mac-message.el

@@ -121,7 +121,7 @@ This will use the command `open' with the message URL."
 			  "set theSubject to subject of theMessage\n"
 			  "set theSubject to subject of theMessage\n"
 			  "set theLink to \"message://\" & theID & \"::split::\" & theSubject & \"\n\"\n"
 			  "set theLink to \"message://\" & theID & \"::split::\" & theSubject & \"\n\"\n"
 			  "copy theLink to end of theLinkList\n"
 			  "copy theLink to end of theLinkList\n"
-			  
+
 			  ;; Report progress through Growl
 			  ;; Report progress through Growl
 			  ;; This "double tell" idiom is described in detail at
 			  ;; This "double tell" idiom is described in detail at
 			  ;; http://macscripter.net/viewtopic.php?id=24570 The
 			  ;; http://macscripter.net/viewtopic.php?id=24570 The
@@ -152,7 +152,7 @@ the subject of the message in Mail.app and make a link out
 of it."
 of it."
   (interactive "sLink to (s)elected or (f)lagged messages: ")
   (interactive "sLink to (s)elected or (f)lagged messages: ")
   (message "AppleScript: searching mailboxes...")
   (message "AppleScript: searching mailboxes...")
-  (let* ((as-link-list 
+  (let* ((as-link-list
 	  (if (string= select-or-flag "s")
 	  (if (string= select-or-flag "s")
 	      (as-get-selected-mail)
 	      (as-get-selected-mail)
 	    (if (string= select-or-flag "f")
 	    (if (string= select-or-flag "f")
@@ -175,7 +175,7 @@ of it."
       (when (not (string= URL ""))
       (when (not (string= URL ""))
 	(setq orglink (org-make-link-string URL description))
 	(setq orglink (org-make-link-string URL description))
 	(push orglink orglink-list)))
 	(push orglink orglink-list)))
-    (with-temp-buffer      
+    (with-temp-buffer
       (while orglink-list
       (while orglink-list
 	(insert (concat (pop orglink-list)) "\n"))
 	(insert (concat (pop orglink-list)) "\n"))
       (kill-region (point-min) (point-max))
       (kill-region (point-min) (point-max))
@@ -209,7 +209,7 @@ list of message:// links to flagged mail after heading."
 	      (progn
 	      (progn
 		(save-excursion
 		(save-excursion
 		  (while (re-search-forward message-re (save-excursion (outline-next-heading)) t)
 		  (while (re-search-forward message-re (save-excursion (outline-next-heading)) t)
-		    
+
 		    (delete-region (match-beginning 0) (match-end 0)))
 		    (delete-region (match-beginning 0) (match-end 0)))
 		  (insert "\n")
 		  (insert "\n")
 		  (org-mac-message-get-links "f")
 		  (org-mac-message-get-links "f")

+ 2 - 2
lisp/org-protocol.el

@@ -371,7 +371,7 @@ returned list."
       (progn
       (progn
        (dolist (e l ret)
        (dolist (e l ret)
          (setq ret
          (setq ret
-               (append ret 
+               (append ret
                        (list
                        (list
                         (if (stringp e)
                         (if (stringp e)
                             (if (stringp replacement)
                             (if (stringp replacement)
@@ -465,7 +465,7 @@ Now template ?b will be used."
                               :initial region)
                               :initial region)
         (raise-frame)
         (raise-frame)
         (org-remember nil (string-to-char template)))
         (org-remember nil (string-to-char template)))
-    
+
     (message "Org-mode not loaded."))
     (message "Org-mode not loaded."))
   nil)
   nil)
 
 

+ 2 - 2
lisp/org-remember.el

@@ -1028,9 +1028,9 @@ See also the variable `org-reverse-note-order'."
 			   "^remember-.*[0-9]$"))))
 			   "^remember-.*[0-9]$"))))
 		  (when (> n 0)
 		  (when (> n 0)
 		    (message
 		    (message
-		     "%d backup files (unfinished remember calls) in %s" 
+		     "%d backup files (unfinished remember calls) in %s"
 		     n org-remember-backup-directory))))))))))
 		     n org-remember-backup-directory))))))))))
-  
+
   t)    ;; return t to indicate that we took care of this note.
   t)    ;; return t to indicate that we took care of this note.
 
 
 (defun org-do-remember (&optional initial)
 (defun org-do-remember (&optional initial)

+ 43 - 43
lisp/org.el

@@ -168,7 +168,7 @@ to add the symbol `xyz', and the package must have a call to
 	(const :tag "   id:                Global IDs for identifying entries" org-id)
 	(const :tag "   id:                Global IDs for identifying entries" org-id)
 	(const :tag "   info:              Links to Info nodes" org-info)
 	(const :tag "   info:              Links to Info nodes" org-info)
 	(const :tag "   jsinfo:            Set up Sebastian Rose's JavaScript org-info.js" org-jsinfo)
 	(const :tag "   jsinfo:            Set up Sebastian Rose's JavaScript org-info.js" org-jsinfo)
-	(const :tag "   inlinetask:        Tasks independent of outline hierarchy" org-inlinetask) 
+	(const :tag "   inlinetask:        Tasks independent of outline hierarchy" org-inlinetask)
 	(const :tag "   irc:               Links to IRC/ERC chat sessions" org-irc)
 	(const :tag "   irc:               Links to IRC/ERC chat sessions" org-irc)
 	(const :tag "   mac-message:       Links to messages in Apple Mail" org-mac-message)
 	(const :tag "   mac-message:       Links to messages in Apple Mail" org-mac-message)
 	(const :tag "   mew                Links to Mew folders/messages" org-mew)
 	(const :tag "   mew                Links to Mew folders/messages" org-mew)
@@ -1626,10 +1626,10 @@ taken from the (otherwise obsolete) variable `org-todo-interpretation'."
 		    ;;place of item arguments
 		    ;;place of item arguments
 		    :convert-widget
 		    :convert-widget
 		    (lambda (widget)
 		    (lambda (widget)
-		      (widget-put widget 
-				  :args (mapcar 
+		      (widget-put widget
+				  :args (mapcar
 					 #'(lambda (x)
 					 #'(lambda (x)
-					     (widget-convert 
+					     (widget-convert
 					      (cons 'const x)))
 					      (cons 'const x)))
 					 org-todo-interpretation-widgets))
 					 org-todo-interpretation-widgets))
 		      widget))
 		      widget))
@@ -2975,7 +2975,7 @@ If TABLE-TYPE is non-nil, also check for table.el-type tables."
 (eval-and-compile
 (eval-and-compile
   (org-autoload "org-exp"
   (org-autoload "org-exp"
 		'(org-export org-export-visible
 		'(org-export org-export-visible
-			     org-insert-export-options-template  
+			     org-insert-export-options-template
 			     org-table-clean-before-export))
 			     org-table-clean-before-export))
   (org-autoload "org-ascii"
   (org-autoload "org-ascii"
 		'(org-export-as-ascii org-export-ascii-preprocess
 		'(org-export-as-ascii org-export-ascii-preprocess
@@ -3545,7 +3545,7 @@ means to push this value onto the list in the variable.")
 	(while (setq kws (pop kwds))
 	(while (setq kws (pop kwds))
  	  (let ((kws (or
  	  (let ((kws (or
 		      (run-hook-with-args-until-success
 		      (run-hook-with-args-until-success
- 		       'org-todo-setup-filter-hook kws) 
+ 		       'org-todo-setup-filter-hook kws)
 		      kws)))
 		      kws)))
 	    (setq inter (pop kws) sep (member "|" kws)
 	    (setq inter (pop kws) sep (member "|" kws)
 		  kws0 (delete "|" (copy-sequence kws))
 		  kws0 (delete "|" (copy-sequence kws))
@@ -4245,7 +4245,7 @@ will be prompted for."
 
 
 (defun org-activate-footnote-links (limit)
 (defun org-activate-footnote-links (limit)
   "Run through the buffer and add overlays to links."
   "Run through the buffer and add overlays to links."
-  (if (re-search-forward "\\(^\\|[^][]\\)\\(\\[\\([0-9]+\\]\\|fn:[^ \t\r\n:]+?[]:]\\)\\)" 
+  (if (re-search-forward "\\(^\\|[^][]\\)\\(\\[\\([0-9]+\\]\\|fn:[^ \t\r\n:]+?[]:]\\)\\)"
 			 limit t)
 			 limit t)
       (progn
       (progn
 	(org-remove-flyspell-overlays-in (match-beginning 0) (match-end 0))
 	(org-remove-flyspell-overlays-in (match-beginning 0) (match-end 0))
@@ -4731,17 +4731,17 @@ in special contexts.
 		      (copy-sequence org-cycle-hook))
 		      (copy-sequence org-cycle-hook))
 	      org-cycle-hook))
 	      org-cycle-hook))
 	   (pos (point)))
 	   (pos (point)))
-      
+
       (if (or bob-special (equal arg '(4)))
       (if (or bob-special (equal arg '(4)))
 	  ;; special case:  use global cycling
 	  ;; special case:  use global cycling
 	  (setq arg t))
 	  (setq arg t))
-      
+
       (cond
       (cond
 
 
        ((equal arg '(16))
        ((equal arg '(16))
 	(org-set-startup-visibility)
 	(org-set-startup-visibility)
 	(message "Startup visibility, plus VISIBILITY properties"))
 	(message "Startup visibility, plus VISIBILITY properties"))
-       
+
        ((equal arg '(64))
        ((equal arg '(64))
 	(show-all)
 	(show-all)
 	(message "Entire buffer visible, including drawers"))
 	(message "Entire buffer visible, including drawers"))
@@ -4753,13 +4753,13 @@ in special contexts.
 	      (if arg (org-table-edit-field t)
 	      (if arg (org-table-edit-field t)
 		(org-table-justify-field-maybe)
 		(org-table-justify-field-maybe)
 		(call-interactively 'org-table-next-field)))))
 		(call-interactively 'org-table-next-field)))))
-       
+
        ((run-hook-with-args-until-success
        ((run-hook-with-args-until-success
 	 'org-tab-after-check-for-table-hook))
 	 'org-tab-after-check-for-table-hook))
-       
+
        ((eq arg t) ;; Global cycling
        ((eq arg t) ;; Global cycling
 	(org-cycle-internal-global))
 	(org-cycle-internal-global))
-       
+
        ((and org-drawers org-drawer-regexp
        ((and org-drawers org-drawer-regexp
 	     (save-excursion
 	     (save-excursion
 	       (beginning-of-line 1)
 	       (beginning-of-line 1)
@@ -4767,7 +4767,7 @@ in special contexts.
 	;; Toggle block visibility
 	;; Toggle block visibility
 	(org-flag-drawer
 	(org-flag-drawer
 	 (not (get-char-property (match-end 0) 'invisible))))
 	 (not (get-char-property (match-end 0) 'invisible))))
-       
+
        ((integerp arg)
        ((integerp arg)
 	;; Show-subtree, ARG levels up from here.
 	;; Show-subtree, ARG levels up from here.
 	(save-excursion
 	(save-excursion
@@ -4775,27 +4775,27 @@ in special contexts.
 	  (outline-up-heading (if (< arg 0) (- arg)
 	  (outline-up-heading (if (< arg 0) (- arg)
 				(- (funcall outline-level) arg)))
 				(- (funcall outline-level) arg)))
 	  (org-show-subtree)))
 	  (org-show-subtree)))
-       
+
        ((and (save-excursion (beginning-of-line 1) (looking-at outline-regexp))
        ((and (save-excursion (beginning-of-line 1) (looking-at outline-regexp))
 	     (or (bolp) (not (eq org-cycle-emulate-tab 'exc-hl-bol))))
 	     (or (bolp) (not (eq org-cycle-emulate-tab 'exc-hl-bol))))
-	
+
 	(org-cycle-internal-local))
 	(org-cycle-internal-local))
-       
+
        ;; TAB emulation and template completion
        ;; TAB emulation and template completion
        (buffer-read-only (org-back-to-heading))
        (buffer-read-only (org-back-to-heading))
-       
+
        ((run-hook-with-args-until-success
        ((run-hook-with-args-until-success
 	 'org-tab-after-check-for-cycling-hook))
 	 'org-tab-after-check-for-cycling-hook))
-       
+
        ((org-try-structure-completion))
        ((org-try-structure-completion))
-       
+
        ((org-try-cdlatex-tab))
        ((org-try-cdlatex-tab))
-       
+
        ((and (eq org-cycle-emulate-tab 'exc-hl-bol)
        ((and (eq org-cycle-emulate-tab 'exc-hl-bol)
 	     (or (not (bolp))
 	     (or (not (bolp))
 		 (not (looking-at outline-regexp))))
 		 (not (looking-at outline-regexp))))
 	(call-interactively (global-key-binding "\t")))
 	(call-interactively (global-key-binding "\t")))
-       
+
        ((if (and (memq org-cycle-emulate-tab '(white whitestart))
        ((if (and (memq org-cycle-emulate-tab '(white whitestart))
 		 (save-excursion (beginning-of-line 1) (looking-at "[ \t]*"))
 		 (save-excursion (beginning-of-line 1) (looking-at "[ \t]*"))
 		 (or (and (eq org-cycle-emulate-tab 'white)
 		 (or (and (eq org-cycle-emulate-tab 'white)
@@ -4805,7 +4805,7 @@ in special contexts.
 	    t
 	    t
 	  (eq org-cycle-emulate-tab t))
 	  (eq org-cycle-emulate-tab t))
 	(call-interactively (global-key-binding "\t")))
 	(call-interactively (global-key-binding "\t")))
-       
+
        (t (save-excursion
        (t (save-excursion
 	    (org-back-to-heading)
 	    (org-back-to-heading)
 	    (org-cycle)))))))
 	    (org-cycle)))))))
@@ -4823,7 +4823,7 @@ in special contexts.
     (message "CONTENTS...done")
     (message "CONTENTS...done")
     (setq org-cycle-global-status 'contents)
     (setq org-cycle-global-status 'contents)
     (run-hook-with-args 'org-cycle-hook 'contents))
     (run-hook-with-args 'org-cycle-hook 'contents))
-   
+
    ((and (eq last-command this-command)
    ((and (eq last-command this-command)
 	 (eq org-cycle-global-status 'contents))
 	 (eq org-cycle-global-status 'contents))
     ;; We just showed the table of contents - now show everything
     ;; We just showed the table of contents - now show everything
@@ -4832,7 +4832,7 @@ in special contexts.
     (message "SHOW ALL")
     (message "SHOW ALL")
     (setq org-cycle-global-status 'all)
     (setq org-cycle-global-status 'all)
     (run-hook-with-args 'org-cycle-hook 'all))
     (run-hook-with-args 'org-cycle-hook 'all))
-   
+
    (t
    (t
     ;; Default action: go to overview
     ;; Default action: go to overview
     (run-hook-with-args 'org-pre-cycle-hook 'overview)
     (run-hook-with-args 'org-pre-cycle-hook 'overview)
@@ -5472,7 +5472,7 @@ frame is not changed."
 	 (or (beginning-of-line 0) t)
 	 (or (beginning-of-line 0) t)
 	 (save-match-data
 	 (save-match-data
 	   (looking-at "[ \t]*$")))))
 	   (looking-at "[ \t]*$")))))
-    
+
 (defun org-insert-heading (&optional force-heading)
 (defun org-insert-heading (&optional force-heading)
   "Insert a new heading or item with same depth at point.
   "Insert a new heading or item with same depth at point.
 If point is in a plain list and FORCE-HEADING is nil, create a new list item.
 If point is in a plain list and FORCE-HEADING is nil, create a new list item.
@@ -6189,7 +6189,7 @@ the following will happen:
 I this way you can spell out a number of instances of a repeating task,
 I this way you can spell out a number of instances of a repeating task,
 and still retain the repeater to cover future instances of the task."
 and still retain the repeater to cover future instances of the task."
   (interactive "nNumber of clones to produce: \nsDate shift per clone (e.g. +1w, empty to copy unchanged): ")
   (interactive "nNumber of clones to produce: \nsDate shift per clone (e.g. +1w, empty to copy unchanged): ")
-  (let (beg end template task 
+  (let (beg end template task
 	    shift-n shift-what doshift nmin nmax (n-no-remove -1))
 	    shift-n shift-what doshift nmin nmax (n-no-remove -1))
     (if (not (and (integerp n) (> n 0)))
     (if (not (and (integerp n) (> n 0)))
 	(error "Invalid number of replications %s" n))
 	(error "Invalid number of replications %s" n))
@@ -7631,7 +7631,7 @@ application the system uses for this file type."
    ((org-at-timestamp-p t) (org-follow-timestamp-link))
    ((org-at-timestamp-p t) (org-follow-timestamp-link))
    ((or (org-footnote-at-reference-p) (org-footnote-at-definition-p))
    ((or (org-footnote-at-reference-p) (org-footnote-at-definition-p))
     (org-footnote-action))
     (org-footnote-action))
-   (t 
+   (t
     (let (type path link line search (pos (point)))
     (let (type path link line search (pos (point)))
       (catch 'match
       (catch 'match
 	(save-excursion
 	(save-excursion
@@ -8423,7 +8423,7 @@ See also `org-refile-use-outline-path' and `org-completion-use-ido'"
 			(< 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
@@ -8955,15 +8955,15 @@ this is nil.")
 	      (push (nth 2 e) rtn)))
 	      (push (nth 2 e) rtn)))
 	  rtn)))))
 	  rtn)))))
 
 
-(defvar org-todo-setup-filter-hook nil 
+(defvar org-todo-setup-filter-hook nil
   "Hook for functions that pre-filter todo specs.
   "Hook for functions that pre-filter todo specs.
 
 
 Each function takes a todo spec and returns either `nil' or the spec
 Each function takes a todo spec and returns either `nil' or the spec
 transformed into canonical form." )
 transformed into canonical form." )
- 
+
 (defvar org-todo-get-default-hook nil
 (defvar org-todo-get-default-hook nil
   "Hook for functions that get a default item for todo.
   "Hook for functions that get a default item for todo.
- 
+
 Each function takes arguments (NEW-MARK OLD-MARK) and returns either
 Each function takes arguments (NEW-MARK OLD-MARK) and returns either
 `nil' or a string to be used for the todo mark." )
 `nil' or a string to be used for the todo mark." )
 
 
@@ -9085,9 +9085,9 @@ For calling through lisp, arg is also interpreted in the following way:
 			    nil)))
 			    nil)))
 		       (t
 		       (t
 			(car tail))))
 			(car tail))))
-	       (state (or 
+	       (state (or
  		       (run-hook-with-args-until-success
  		       (run-hook-with-args-until-success
-			'org-todo-get-default-hook state last-state) 
+			'org-todo-get-default-hook state last-state)
  		       state))
  		       state))
 	       (next (if state (concat " " state " ") " "))
 	       (next (if state (concat " " state " ") " "))
 	       (change-plist (list :type 'todo-state-change :from this :to state
 	       (change-plist (list :type 'todo-state-change :from this :to state
@@ -9737,7 +9737,7 @@ be removed."
 	;; If necessary, get the time from the user
 	;; If necessary, get the time from the user
 	(setq time (or time (org-read-date nil 'to-time nil nil
 	(setq time (or time (org-read-date nil 'to-time nil nil
 					   default-time default-input))))
 					   default-time default-input))))
-      
+
       (when (and org-insert-labeled-timestamps-at-point
       (when (and org-insert-labeled-timestamps-at-point
 		 (member what '(scheduled deadline)))
 		 (member what '(scheduled deadline)))
 	(insert
 	(insert
@@ -10787,7 +10787,7 @@ With prefix ARG, realign all tags in headings in the current buffer."
       (if just-align
       (if just-align
 	  (setq tags current)
 	  (setq tags current)
 	;; Get a new set of tags from the user
 	;; Get a new set of tags from the user
-	(save-excursion	
+	(save-excursion
 	  (setq table (append org-tag-persistent-alist
 	  (setq table (append org-tag-persistent-alist
 			      (or org-tag-alist (org-get-buffer-tags)))
 			      (or org-tag-alist (org-get-buffer-tags)))
 		org-last-tags-completion-table table
 		org-last-tags-completion-table table
@@ -11156,7 +11156,7 @@ Returns the new tags string, or nil to not change the current settings."
 FUNC is a function or a lisp form.  The function will be called without
 FUNC is a function or a lisp form.  The function will be called without
 arguments, with the cursor positioned at the beginning of the headline.
 arguments, with the cursor positioned at the beginning of the headline.
 The return values of all calls to the function will be collected and
 The return values of all calls to the function will be collected and
-returned as a list.  
+returned as a list.
 
 
 The call to FUNC will be wrapped into a save-excursion form, so FUNC
 The call to FUNC will be wrapped into a save-excursion form, so FUNC
 does not need to preserve point.  After evaluaton, the cursor will be
 does not need to preserve point.  After evaluaton, the cursor will be
@@ -13420,7 +13420,7 @@ When a buffer is unmodified, it is just killed.  When modified, it is saved
 		  (append org-todo-keyword-alist-for-agenda org-todo-key-alist))
 		  (append org-todo-keyword-alist-for-agenda org-todo-key-alist))
 	    (setq org-tag-alist-for-agenda
 	    (setq org-tag-alist-for-agenda
 		  (append org-tag-alist-for-agenda org-tag-alist))
 		  (append org-tag-alist-for-agenda org-tag-alist))
-	    
+
 	    (save-excursion
 	    (save-excursion
 	      (remove-text-properties (point-min) (point-max) pall)
 	      (remove-text-properties (point-min) (point-max) pall)
 	      (when org-agenda-skip-archived-trees
 	      (when org-agenda-skip-archived-trees
@@ -14097,7 +14097,7 @@ field motion visibility cycling will be done.")
 (defvar org-tab-after-check-for-table-hook nil
 (defvar org-tab-after-check-for-table-hook nil
   "Hook for functions to attach themselves to TAB.
   "Hook for functions to attach themselves to TAB.
 See `org-ctrl-c-ctrl-c-hook' for more information.
 See `org-ctrl-c-ctrl-c-hook' for more information.
-This hook runs after it has been established that the cursor is not in a 
+This hook runs after it has been established that the cursor is not in a
 table, but before checking if the cursor is in a headline or if global cycling
 table, but before checking if the cursor is in a headline or if global cycling
 should be done.
 should be done.
 If any function in this hook returns t, not other actions like visibility
 If any function in this hook returns t, not other actions like visibility
@@ -14330,7 +14330,7 @@ depending on context.  See the individual commands for more information."
    ((and (not org-support-shift-select) (org-at-item-p))
    ((and (not org-support-shift-select) (org-at-item-p))
     (call-interactively 'org-next-item))
     (call-interactively 'org-next-item))
    ((org-clocktable-try-shift 'down arg))
    ((org-clocktable-try-shift 'down arg))
-   (org-support-shift-select 
+   (org-support-shift-select
     (org-call-for-shift-select 'next-line))
     (org-call-for-shift-select 'next-line))
    (t (org-shiftselect-error))))
    (t (org-shiftselect-error))))
 
 
@@ -14352,7 +14352,7 @@ Depending on context, this does one of the following:
 	 (org-on-heading-p))
 	 (org-on-heading-p))
     (let ((org-inhibit-logging
     (let ((org-inhibit-logging
 	   (not org-treat-S-cursor-todo-selection-as-state-change)))
 	   (not org-treat-S-cursor-todo-selection-as-state-change)))
-      (org-call-with-arg 'org-todo 'right)))		       
+      (org-call-with-arg 'org-todo 'right)))
    ((or (and org-support-shift-select
    ((or (and org-support-shift-select
 	     (not (eq org-support-shift-select 'always))
 	     (not (eq org-support-shift-select 'always))
 	     (org-at-item-bullet-p))
 	     (org-at-item-bullet-p))
@@ -14362,7 +14362,7 @@ Depending on context, this does one of the following:
 	 (org-at-property-p))
 	 (org-at-property-p))
     (call-interactively 'org-property-next-allowed-value))
     (call-interactively 'org-property-next-allowed-value))
    ((org-clocktable-try-shift 'right arg))
    ((org-clocktable-try-shift 'right arg))
-   (org-support-shift-select 
+   (org-support-shift-select
     (org-call-for-shift-select 'forward-char))
     (org-call-for-shift-select 'forward-char))
    (t (org-shiftselect-error))))
    (t (org-shiftselect-error))))
 
 
@@ -14394,7 +14394,7 @@ Depending on context, this does one of the following:
 	 (org-at-property-p))
 	 (org-at-property-p))
     (call-interactively 'org-property-previous-allowed-value))
     (call-interactively 'org-property-previous-allowed-value))
    ((org-clocktable-try-shift 'left arg))
    ((org-clocktable-try-shift 'left arg))
-   (org-support-shift-select 
+   (org-support-shift-select
     (org-call-for-shift-select 'backward-char))
     (org-call-for-shift-select 'backward-char))
    (t (org-shiftselect-error))))
    (t (org-shiftselect-error))))