Fix white-space errors

This commit is contained in:
Carsten Dominik 2009-08-03 17:30:30 +02:00
parent c65fb88796
commit 2eecb4c43c
15 changed files with 41 additions and 40 deletions

View File

@ -6339,10 +6339,10 @@ This will remove the markers, and the overlays."
(cond
((equal action ?$)
(setq cmd '(org-agenda-archive)))
((equal action ?A)
(setq cmd '(org-agenda-archive-to-archive-sibling)))
((member action '(?r ?w))
(setq rfloc (org-refile-get-location
"Refile to: "
@ -6353,9 +6353,9 @@ This will remove the markers, and the overlays."
(or (get-file-buffer (nth 1 rfloc))
(find-buffer-visiting (nth 1 rfloc))
(error "This should not happen"))))
(setq cmd (list 'org-agenda-refile nil (list 'quote rfloc))))
((equal action ?t)
(setq state (org-ido-completing-read
"Todo state: "
@ -6364,7 +6364,7 @@ This will remove the markers, and the overlays."
(setq cmd `(let ((org-inhibit-blocking t)
(org-inhibit-logging 'note))
(org-agenda-todo ,state))))
((memq action '(?- ?+))
(setq tag (org-ido-completing-read
(format "Tag to %s: " (if (eq action ?+) "add" "remove"))
@ -6390,7 +6390,7 @@ This will remove the markers, and the overlays."
(fset 'read-string old)
(fmakunbound 'read-string)))))))
(t (error "Invalid bulk action")))
;; Now loop over all markers and apply cmd
(while (setq e (pop entries))
(goto-char

View File

@ -376,7 +376,7 @@ END:VEVENT\n"
(org-split-string (nth 1 rec) "[^a-zA-Z0-90]+")
"-")
(nth 0 rec) (nth 0 key) (nth 1 key)
(nth 1 rec)
(nth 1 rec)
(concat (capitalize categ) " " (nth 1 rec))
categ)))))

View File

@ -445,16 +445,16 @@ Notification is shown only once."
(setq org-clock-notification-was-shown nil)))))
(defun org-show-notification (notification)
"Show notification.
"Show notification.
Use `org-show-notification-handler' if defined,
use libnotify if available, or fall back on a message."
(cond ((functionp org-show-notification-handler)
(funcall org-show-notification-handler notification))
((stringp org-show-notification-handler)
(start-process "emacs-timer-notification" nil
(start-process "emacs-timer-notification" nil
org-show-notification-handler notification))
((org-program-exists "notify-send")
(start-process "emacs-timer-notification" nil
(start-process "emacs-timer-notification" nil
"notify-send" notification))
;; Maybe the handler will send a message, so only use message as
;; a fall back option
@ -1306,8 +1306,8 @@ the currently selected interval size."
(cdr (assoc "TIMESTAMP_IA" props)))))
(if (and (not multifile) (= level 1)) (push "|-" tbl))
(push (concat
"| " (int-to-string level) "|"
(if timestamp (concat tsp "|") "")
"| " (int-to-string level) "|"
(if timestamp (concat tsp "|") "")
hlc hdl hlc " |"
(make-string (1- level) ?|)
hlc (org-minutes-to-hh:mm-string time) hlc

View File

@ -1291,7 +1291,7 @@ of fields."
(throw 'next t))
(setq row nil)
(loop for i from 0 to (1- n) do
(push
(push
(org-quote-vert
(or (get-char-property (point)
'org-columns-value-modified)

View File

@ -729,10 +729,11 @@ interactive function org-columns-new.")
(if (string-match "\\S-" width)
(setq width (string-to-number width))
(setq width nil))
(setq fmt (org-ido-completing-read "Summary [none]: "
(mapcar (lambda (x) (list (symbol-name (cadr x))))
org-columns-compile-map)
nil t))
(setq fmt (org-ido-completing-read
"Summary [none]: "
(mapcar (lambda (x) (list (symbol-name (cadr x))))
org-columns-compile-map)
nil t))
(setq fmt (intern fmt)
fun (cadr (assoc fmt (mapcar 'cdr org-columns-compile-map))))
(if (eq fmt 'none) (setq fmt nil))

View File

@ -2343,7 +2343,7 @@ INDENT was the original indentation of the block."
(if number
(insert (format fm (incf n)))
(forward-char 1))
(when (looking-at lbl-re)
(when (looking-at lbl-re)
(setq ref (match-string 3))
(cond ((numberp replace-labels)
;; remove labels; use numbers for references when lines
@ -2356,9 +2356,9 @@ INDENT was the original indentation of the block."
(goto-char (match-beginning 2))
(delete-region (match-beginning 2) (match-end 2))
(insert "(" ref ")")
(push (cons ref (if (> n 0) n (concat "(" ref ")")))
(push (cons ref (if (> n 0) n (concat "(" ref ")")))
org-export-code-refs))
(t
(t
;; don't remove labels and don't use numbers for
;; references
(goto-char (match-beginning 2))

View File

@ -562,7 +562,7 @@ and all references of a footnote label."
(goto-char (point-min))
(and (re-search-forward (concat "^\\[" (regexp-quote label) "\\]")
nil t)
(progn (insert " ")
(progn (insert " ")
(just-one-space)))))))
(provide 'org-footnote)

View File

@ -87,7 +87,7 @@
(defcustom org-id-method
(condition-case nil
(if (string-match "\\`[-0-9a-fA-F]\\{36\\}\\'"
(org-trim (shell-command-to-string
(org-trim (shell-command-to-string
org-id-uuid-program)))
'uuidgen
'org)

View File

@ -657,7 +657,7 @@ when PUB-DIR is set, use this as the publishing directory."
(while cmds
(setq cmd (pop cmds))
(while (string-match "%b" cmd)
(setq cmd (replace-match
(setq cmd (replace-match
(save-match-data
(shell-quote-argument base))
t t cmd)))

View File

@ -1112,13 +1112,13 @@ cdr is the indentation string."
(progn
(re-search-forward org-list-beginning-re nil t)
(goto-char (match-beginning 0))))
(defun org-list-make-subtree ()
"Convert the plain list at point into a subtree."
(interactive)
(org-list-goto-true-beginning)
(let ((list (org-list-parse-list t)) nstars)
(save-excursion
(save-excursion
(if (condition-case nil
(org-back-to-heading)
(error nil))
@ -1133,8 +1133,8 @@ cdr is the indentation string."
(org-list-make-subtrees (cdr list) level)
(mapcar (lambda (item)
(if (stringp item)
(insert (make-string
(if org-odd-levels-only
(insert (make-string
(if org-odd-levels-only
(1- (* 2 level)) level) ?*) " " item "\n")
(org-list-make-subtrees item (1+ level))))
list)))

View File

@ -275,7 +275,7 @@ The number of levels is controlled by "
(let* ((limit-level (1- org-inlinetask-min-level))
(nstars (if org-odd-levels-only (1- (* limit-level 2)) limit-level)))
(format "\\*\\{1,%d\\} " nstars))))
(provide 'org-macs)
;; arch-tag: 7e6a73ce-aac9-4fc0-9b30-ce6f89dc6668

View File

@ -454,7 +454,7 @@ Now template ?b will be used."
(if (and (boundp 'org-stored-links)
(fboundp 'org-remember))
(let* ((parts (org-protocol-split-data info t))
(template (or (and (= 1 (length (car parts))) (pop parts))
(template (or (and (= 1 (length (car parts))) (pop parts))
org-protocol-default-template-key))
(url (org-protocol-sanitize-uri (car parts)))
(type (if (string-match "^\\([a-z]+\\):" url)

View File

@ -216,7 +216,7 @@ the edited version."
(defun org-edit-src-find-buffer (beg end)
"Find a source editing buffer that is already editing the region BEG to END."
(catch 'exit
(mapc
(mapc
(lambda (b)
(with-current-buffer b
(if (and (string-match "\\`*Org Edit " (buffer-name))

View File

@ -264,7 +264,7 @@ VALUE can be `on', `off', or `pause'."
(defun org-timer-reset-timers ()
"Reset all timers."
(interactive)
(mapc (lambda(timer)
(mapc (lambda(timer)
(when (eval timer)
(cancel-timer timer)
(setq timer nil)))
@ -286,7 +286,7 @@ VALUE can be `on', `off', or `pause'."
(current-time))))
(rsecs (nth 0 rtime))
(rmins (nth 1 rtime)))
(message "%d minutes %d secondes left before next time out"
(message "%d minutes %d secondes left before next time out"
rmins rsecs))))
;;;###autoload
@ -297,7 +297,7 @@ VALUE can be `on', `off', or `pause'."
(org-timer-show-remaining-time)
(let* ((mins (string-to-number (match-string 0 minutes)))
(secs (* mins 60))
(hl (cond
(hl (cond
((string-match "Org Agenda" (buffer-name))
(let* ((marker (or (get-text-property (point) 'org-marker)
(org-agenda-error)))
@ -313,7 +313,7 @@ VALUE can be `on', `off', or `pause'."
(org-get-heading))
(t (error "Not in an Org buffer"))))
timer-set)
(mapcar (lambda(timer)
(mapcar (lambda(timer)
(if (not (or (eval timer) timer-set))
(setq timer-set t
timer
@ -323,7 +323,7 @@ VALUE can be `on', `off', or `pause'."
'(org-timer-timer1
org-timer-timer2
org-timer-timer3)))))
(provide 'org-timer)
;; arch-tag: 97538f8c-3871-4509-8f23-1e7b3ff3d107

View File

@ -5156,7 +5156,7 @@ This function is the default value of the hook `org-cycle-hook'."
(and (outline-get-last-sibling)
(outline-get-last-sibling))
(point)))
(end (save-excursion
(end (save-excursion
(and (outline-get-next-sibling)
(outline-get-next-sibling)
(outline-get-next-sibling))
@ -14925,12 +14925,12 @@ in the region.
If the first line is a plain list item, turn all plain list items
into headings.
If the first line is a normal line, turn each and every line in the
If the first line is a normal line, turn each and every line in the
region into a heading.
When converting a line into a heading, the number of stars is chosen
such that the lines become children of the current entry. However,
when a prefix argument is given, its value determines the number of
When converting a line into a heading, the number of stars is chosen
such that the lines become children of the current entry. However,
when a prefix argument is given, its value determines the number of
stars to add."
(interactive "P")
(let (l2 l itemp beg end)