From e2ee292aad61af03abef2c93ebdf57caa63bccad Mon Sep 17 00:00:00 2001 From: Carsten Dominik Date: Tue, 15 Sep 2009 19:15:42 +0100 Subject: [PATCH] Fix whitespace issues in org.el and org-agenda.el --- lisp/org-agenda.el | 2 +- lisp/org.el | 34 +++++++++++++++++----------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 04b551416..3fad96049 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -2514,7 +2514,7 @@ bind it in the options section.") (org-agenda-mark-clocking-task) (when org-agenda-entry-text-mode (org-agenda-entry-text-hide) - (org-agenda-entry-text-show)) + (org-agenda-entry-text-show)) (run-hooks 'org-finalize-agenda-hook) (setq org-agenda-type (get-text-property (point) 'org-agenda-type)) (when (get 'org-agenda-filter :preset-filter) diff --git a/lisp/org.el b/lisp/org.el index afce181b8..b66343648 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -7921,7 +7921,7 @@ application the system uses for this file type." (cond ((and (org-on-heading-p) (not (org-in-regexp - (concat org-plain-link-re "\\|" + (concat org-plain-link-re "\\|" org-bracket-link-regexp "\\|" org-angle-link-re "\\|" "[ \t]:[^ \t\n]+:[ \t]*$")))) @@ -7990,12 +7990,12 @@ application the system uses for this file type." ;; Check if we need to translate the link (let ((tmp (funcall org-link-translation-function type path))) (setq type (car tmp) path (cdr tmp)))) - + (cond - + ((assoc type org-link-protocols) (funcall (nth 1 (assoc type org-link-protocols)) path)) - + ((equal type "mailto") (let ((cmd (car org-link-mailto-program)) (args (cdr org-link-mailto-program)) args1 @@ -8013,14 +8013,14 @@ application the system uses for this file type." (setq a (replace-match subject t t a))) (push a args1)))) (apply cmd (nreverse args1)))) - + ((member type '("http" "https" "ftp" "news")) (browse-url (concat type ":" (org-link-escape path org-link-escape-chars-browser)))) - + ((member type '("message")) (browse-url (concat type ":" path))) - + ((string= type "tags") (org-tags-view in-emacs path)) ((string= type "thisfile") @@ -8036,10 +8036,10 @@ application the system uses for this file type." ,pos))) (condition-case nil (eval cmd) (error (progn (widen) (eval cmd)))))) - + ((string= type "tree-match") (org-occur (concat "\\[" (regexp-quote path) "\\]"))) - + ((string= type "file") (if (string-match "::\\([0-9]+\\)\\'" path) (setq line (string-to-number (match-string 1 path)) @@ -8050,11 +8050,11 @@ application the system uses for this file type." (if (string-match "[*?{]" (file-name-nondirectory path)) (dired path) (org-open-file path in-emacs line search))) - + ((string= type "news") (require 'org-gnus) (org-gnus-follow-link path)) - + ((string= type "shell") (let ((cmd path)) (if (or (not org-confirm-shell-link-function) @@ -8066,7 +8066,7 @@ application the system uses for this file type." (message "Executing %s" cmd) (shell-command cmd)) (error "Abort")))) - + ((string= type "elisp") (let ((cmd path)) (if (or (not org-confirm-elisp-link-function) @@ -8079,7 +8079,7 @@ application the system uses for this file type." (eval (read cmd)) (call-interactively (read cmd)))) (error "Abort")))) - + (t (browse-url-at-point)))))) (move-marker org-open-link-marker nil) @@ -8106,7 +8106,7 @@ there is one, offer it as link number zero." (while (re-search-forward re end t) (push (match-string 0) links)) (setq links (org-uniquify (reverse links)))) - + (cond ((null links) (error "No links")) ((equal (length links) 1) @@ -8873,7 +8873,7 @@ See also `org-refile-use-outline-path' and `org-completion-use-ido'" (setq answ (funcall cfunc prompt tbl nil (not new-nodes) nil 'org-refile-history)) (setq pa (or (assoc answ tbl) (assoc (concat answ "/") tbl))) - (if pa + (if pa (progn (when (or (not org-refile-history) (not (eq old-hist org-refile-history)) @@ -8925,7 +8925,7 @@ See also `org-refile-use-outline-path' and `org-completion-use-ido'" "Read an outline path like a file name." (let ((thetable collection) (org-completion-use-ido nil) ; does not work with ido. - (org-completion-use-iswitchb nil)) ; or iswitchb + (org-completion-use-iswitchb nil)) ; or iswitchb (apply 'org-icompleting-read prompt (lambda (string predicate &optional flag) @@ -9723,7 +9723,7 @@ This should be called with the cursor in a line with a statistics cookie." (error "No data for statistics cookie")))) (goto-char pos) (move-marker pos nil))))) - + (defvar org-entry-property-inherited-from) ;; defined below (defun org-update-parent-todo-statistics () "Update any statistics cookie in the parent of the current headline.