Mercurial > emacs
changeset 99386:e9a50f67e0c7
* org.el (org-columns-modify-value-for-display-function):
* org-table.el (org-table-convert-region): Fix typos in docstrings.
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Tue, 04 Nov 2008 17:33:50 +0000 |
| parents | 7b5dc2894014 |
| children | 6d44458b18f2 |
| files | lisp/org/ChangeLog lisp/org/org-table.el lisp/org/org.el |
| diffstat | 3 files changed, 28 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/org/ChangeLog Tue Nov 04 17:11:58 2008 +0000 +++ b/lisp/org/ChangeLog Tue Nov 04 17:33:50 2008 +0000 @@ -1,3 +1,8 @@ +2008-11-04 Juanma Barranquero <lekktu@gmail.com> + + * org.el (org-columns-modify-value-for-display-function): + * org-table.el (org-table-convert-region): Fix typos in docstrings. + 2008-10-28 Glenn Morris <rgm@gnu.org> * org-agenda.el (org-agenda-align-tags): Replace use of cl `adjoin'.
--- a/lisp/org/org-table.el Tue Nov 04 17:11:58 2008 +0000 +++ b/lisp/org/org-table.el Tue Nov 04 17:33:50 2008 +0000 @@ -379,7 +379,7 @@ separator in the following way: - when each line contains a TAB, assume TAB-separated material - when each line contains a comme, assume CSV material - - else, assume one or more SPACE charcters as separator." + - else, assume one or more SPACE characters as separator." (interactive "rP") (let* ((beg (min beg0 end0)) (end (max beg0 end0)) @@ -3490,7 +3490,7 @@ (self-insert-command N)) (setq org-table-may-need-update t) (let (orgtbl-mode a) - (call-interactively + (call-interactively (key-binding (or (and (listp function-key-map) (setq a (assoc last-input-event function-key-map)) @@ -3569,7 +3569,7 @@ (unless txt (unless (org-at-table-p) (error "No table at point"))) - (let* ((txt (or txt + (let* ((txt (or txt (buffer-substring-no-properties (org-table-begin) (org-table-end)))) (lines (org-split-string txt "[ \t]*\n[ \t]*")))
--- a/lisp/org/org.el Tue Nov 04 17:11:58 2008 +0000 +++ b/lisp/org/org.el Tue Nov 04 17:33:50 2008 +0000 @@ -1666,7 +1666,7 @@ org-mode generates a time duration." :group 'org-time :type 'string) - + (defcustom org-deadline-warning-days 14 "No. of days before expiration during which a deadline becomes active. This variable governs the display in sparse trees and in the agenda. @@ -1938,7 +1938,7 @@ (defcustom org-columns-modify-value-for-display-function nil "Function that modifies values for display in column view. For example, it can be used to cut out a certain part from a time stamp. -The function must take 2 argments: +The function must take 2 arguments: column-title The tite of the column (*not* the property name) value The value that should be modified. @@ -2532,7 +2532,7 @@ (<= org-clock-marker (point-at-eol))) ;; The clock is running here (setq org-clock-start-time - (apply 'encode-time + (apply 'encode-time (org-parse-time-string (match-string 1)))) (org-update-mode-line))) (t @@ -2705,8 +2705,8 @@ ;; Autoload ID code (org-autoload "org-id" - '(org-id-get-create org-id-new org-id-copy org-id-get - org-id-get-with-outline-path-completion + '(org-id-get-create org-id-new org-id-copy org-id-get + org-id-get-with-outline-path-completion org-id-get-with-outline-drilling org-id-goto org-id-find)) @@ -5624,7 +5624,7 @@ (string-match "\\<style=\"\\([^ \t\n\"]+\\)\"" m)) (match-string 1 m)) (t "fundamental")))) - + (defun org-edit-src-exit () "Exit special edit and protect problematic lines." (interactive) @@ -7229,7 +7229,7 @@ (while (string-match "/" s) (setq s (replace-match "\\" t t s))) s) - + (defun org-get-outline-path () "Return the outline path to the current entry, as a list." (let (rtn) @@ -7333,7 +7333,7 @@ (defun org-olpath-completing-read (prompt collection &rest args) "Read an outline path like a file name." (let ((thetable collection)) - (apply + (apply 'completing-read prompt (lambda (string predicate &optional flag) (let (rtn r s f (l (length string))) @@ -7490,7 +7490,7 @@ (defcustom org-structure-template-alist '( - ("s" "#+begin_src ?\n\n#+end_src" + ("s" "#+begin_src ?\n\n#+end_src" "<src lang=\"?\">\n\n</src>") ("e" "#+begin_example\n?\n#+end_example" "<example>\n?\n</example>") @@ -7553,7 +7553,7 @@ (t (newline)))) (setq start (point)) (if (string-match "%file" rpl) - (setq rpl (replace-match + (setq rpl (replace-match (concat "\"" (save-match-data @@ -7562,7 +7562,7 @@ t t rpl))) (insert rpl) (if (re-search-backward "\\?" start t) (delete-char 1)))) - + (defun org-complete (&optional arg) "Perform completion on word at point. @@ -7962,7 +7962,7 @@ (condition-case nil (org-forward-same-level 1) (error (end-of-line 1))))) - (replace-match + (replace-match (if is-percent (format "[%d%%]" (/ (* 100 cnt-done) (max 1 cnt-all))) (format "[%d/%d]" cnt-done cnt-all))) @@ -7999,7 +7999,7 @@ (setq changes (append changes (cdr (assoc 'done l))))) (dolist (c changes) (org-toggle-tag (car c) (if (cdr c) 'on 'off))))) - + (defun org-local-logging (value) "Get logging settings from a property VALUE." (let* (words w a) @@ -8401,7 +8401,7 @@ (save-excursion (when findpos (org-back-to-heading t) - (narrow-to-region (point) (save-excursion + (narrow-to-region (point) (save-excursion (outline-next-heading) (point))) (looking-at (concat outline-regexp "\\( *\\)[^\r\n]*" "\\(\n[^\r\n]*?" org-keyword-time-not-clock-regexp @@ -9628,12 +9628,12 @@ ((eq match t) (setq matcher t)) ((eq match nil) (setq matcher t)) (t (setq matcher (if match (org-make-tags-matcher match) t)))) - + (when (eq scope 'tree) (org-back-to-heading t) (org-narrow-to-subtree) (setq scope nil)) - + (if (not scope) (progn (org-prepare-agenda-buffers @@ -9968,7 +9968,7 @@ (move-marker org-entry-property-inherited-from (point)) (throw 'ex tmp)) (or (org-up-heading-safe) (throw 'ex nil))))) - (or tmp + (or tmp (cdr (assoc property org-file-properties)) (cdr (assoc property org-global-properties)) (cdr (assoc property org-global-properties-fixed)))))) @@ -11488,11 +11488,11 @@ (lambda (b) (string-match "\*Org .*Export" (buffer-name b)))) ((eq predicate 'agenda) (lambda (b) - (with-current-buffer b + (with-current-buffer b (and (eq major-mode 'org-mode) (setq bfn (buffer-file-name b)) (member (file-truename bfn) agenda-files))))) - (t (lambda (b) (with-current-buffer b + (t (lambda (b) (with-current-buffer b (or (eq major-mode 'org-mode) (string-match "\*Org .*Export" (buffer-name b))))))))) @@ -11710,7 +11710,7 @@ (append org-done-keywords-for-agenda org-done-keywords)) (setq org-todo-keyword-alist-for-agenda (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)) (save-excursion