diff options
| author | Thien-Thi Nguyen | 2007-10-18 16:05:45 +0000 |
|---|---|---|
| committer | Thien-Thi Nguyen | 2007-10-18 16:05:45 +0000 |
| commit | dc11adf6bfec36ac0cc84cd52965745fd511edfb (patch) | |
| tree | 507a29f8b6f78ba20013fc8ed689c6c3ada8768d | |
| parent | 8cd670fbef6c7d8c6dbb592a6c4c21cad3e8adcc (diff) | |
| download | emacs-dc11adf6bfec36ac0cc84cd52965745fd511edfb.tar.gz emacs-dc11adf6bfec36ac0cc84cd52965745fd511edfb.zip | |
Delete eol whitespace; nfc.
| -rw-r--r-- | lisp/textmodes/org.el | 104 |
1 files changed, 52 insertions, 52 deletions
diff --git a/lisp/textmodes/org.el b/lisp/textmodes/org.el index 6c48c47d3ad..626d8c63395 100644 --- a/lisp/textmodes/org.el +++ b/lisp/textmodes/org.el | |||
| @@ -129,7 +129,7 @@ | |||
| 129 | (progn | 129 | (progn |
| 130 | (if pc-mode (partial-completion-mode -1)) | 130 | (if pc-mode (partial-completion-mode -1)) |
| 131 | ,@body) | 131 | ,@body) |
| 132 | (if pc-mode (partial-completion-mode 1))))) | 132 | (if pc-mode (partial-completion-mode 1))))) |
| 133 | 133 | ||
| 134 | ;;; The custom variables | 134 | ;;; The custom variables |
| 135 | 135 | ||
| @@ -1399,7 +1399,7 @@ When this variable is nil, `C-c C-c' give you the prompts, and | |||
| 1399 | `C-u C-c C-c' trigger the fasttrack." | 1399 | `C-u C-c C-c' trigger the fasttrack." |
| 1400 | :group 'org-remember | 1400 | :group 'org-remember |
| 1401 | :type 'boolean) | 1401 | :type 'boolean) |
| 1402 | 1402 | ||
| 1403 | (defcustom org-remember-default-headline "" | 1403 | (defcustom org-remember-default-headline "" |
| 1404 | "The headline that should be the default location in the notes file. | 1404 | "The headline that should be the default location in the notes file. |
| 1405 | When filing remember notes, the cursor will start at that position. | 1405 | When filing remember notes, the cursor will start at that position. |
| @@ -2702,7 +2702,7 @@ directory where the exported Org-mode files lives." | |||
| 2702 | (repeat | 2702 | (repeat |
| 2703 | (cons | 2703 | (cons |
| 2704 | (choice :tag "Type" | 2704 | (choice :tag "Type" |
| 2705 | (const :html) (const :LaTeX) | 2705 | (const :html) (const :LaTeX) |
| 2706 | (const :ascii) (const :ical) (const :xoxo)) | 2706 | (const :ascii) (const :ical) (const :xoxo)) |
| 2707 | (directory))))) | 2707 | (directory))))) |
| 2708 | 2708 | ||
| @@ -3516,7 +3516,7 @@ color of the frame." | |||
| 3516 | ;; Make sure that a fixed-width face is used when we have a column table. | 3516 | ;; Make sure that a fixed-width face is used when we have a column table. |
| 3517 | (set-face-attribute 'org-column nil | 3517 | (set-face-attribute 'org-column nil |
| 3518 | :height (face-attribute 'default :height) | 3518 | :height (face-attribute 'default :height) |
| 3519 | :family (face-attribute 'default :family))) | 3519 | :family (face-attribute 'default :family))) |
| 3520 | 3520 | ||
| 3521 | (defface org-warning | 3521 | (defface org-warning |
| 3522 | (org-compatible-face | 3522 | (org-compatible-face |
| @@ -5544,7 +5544,7 @@ Works for outline headings and for plain lists alike." | |||
| 5544 | (cond | 5544 | (cond |
| 5545 | ((org-on-heading-p) (org-do-demote)) | 5545 | ((org-on-heading-p) (org-do-demote)) |
| 5546 | ((org-at-item-p) (org-indent-item 1)))) | 5546 | ((org-at-item-p) (org-indent-item 1)))) |
| 5547 | 5547 | ||
| 5548 | ;;; Promotion and Demotion | 5548 | ;;; Promotion and Demotion |
| 5549 | 5549 | ||
| 5550 | (defun org-promote-subtree () | 5550 | (defun org-promote-subtree () |
| @@ -6064,7 +6064,7 @@ If WITH-CASE is non-nil, the sorting will be case-sensitive." | |||
| 6064 | (if (string-match org-priority-regexp x) | 6064 | (if (string-match org-priority-regexp x) |
| 6065 | (string-to-char (match-string 2 x)) | 6065 | (string-to-char (match-string 2 x)) |
| 6066 | org-default-priority)) | 6066 | org-default-priority)) |
| 6067 | comparefun (if (= dcst sorting-type) '< '>))) | 6067 | comparefun (if (= dcst sorting-type) '< '>))) |
| 6068 | (t (error "Invalid sorting type `%c'" sorting-type))) | 6068 | (t (error "Invalid sorting type `%c'" sorting-type))) |
| 6069 | 6069 | ||
| 6070 | (sort (mapcar (lambda (x) (cons (funcall extractfun (car x)) (cdr x))) | 6070 | (sort (mapcar (lambda (x) (cons (funcall extractfun (car x)) (cdr x))) |
| @@ -6778,7 +6778,7 @@ off orgstruct-mode will *not* remove these additonal settings." | |||
| 6778 | (orgstruct-make-binding 'org-cycle 102 [(tab)] "\C-i")) | 6778 | (orgstruct-make-binding 'org-cycle 102 [(tab)] "\C-i")) |
| 6779 | (org-defkey orgstruct-mode-map "\C-i" | 6779 | (org-defkey orgstruct-mode-map "\C-i" |
| 6780 | (orgstruct-make-binding 'org-cycle 103 "\C-i" [(tab)])) | 6780 | (orgstruct-make-binding 'org-cycle 103 "\C-i" [(tab)])) |
| 6781 | 6781 | ||
| 6782 | (org-defkey orgstruct-mode-map "\M-\C-m" | 6782 | (org-defkey orgstruct-mode-map "\M-\C-m" |
| 6783 | (orgstruct-make-binding 'org-insert-heading 105 | 6783 | (orgstruct-make-binding 'org-insert-heading 105 |
| 6784 | "\M-\C-m" [(meta return)])) | 6784 | "\M-\C-m" [(meta return)])) |
| @@ -6789,10 +6789,10 @@ off orgstruct-mode will *not* remove these additonal settings." | |||
| 6789 | (org-defkey orgstruct-mode-map [(shift meta return)] | 6789 | (org-defkey orgstruct-mode-map [(shift meta return)] |
| 6790 | (orgstruct-make-binding 'org-insert-todo-heading 107 | 6790 | (orgstruct-make-binding 'org-insert-todo-heading 107 |
| 6791 | [(meta return)] "\M-\C-m")) | 6791 | [(meta return)] "\M-\C-m")) |
| 6792 | 6792 | ||
| 6793 | (unless org-local-vars | 6793 | (unless org-local-vars |
| 6794 | (setq org-local-vars (org-get-local-variables))) | 6794 | (setq org-local-vars (org-get-local-variables))) |
| 6795 | 6795 | ||
| 6796 | t)) | 6796 | t)) |
| 6797 | 6797 | ||
| 6798 | (defun orgstruct-make-binding (fun n &rest keys) | 6798 | (defun orgstruct-make-binding (fun n &rest keys) |
| @@ -6843,7 +6843,7 @@ Possible values in the list of contexts are `table', `headline', and `item'." | |||
| 6843 | (kill-buffer "*Org tmp*") | 6843 | (kill-buffer "*Org tmp*") |
| 6844 | (delq nil | 6844 | (delq nil |
| 6845 | (mapcar | 6845 | (mapcar |
| 6846 | (lambda (x) | 6846 | (lambda (x) |
| 6847 | (setq x | 6847 | (setq x |
| 6848 | (if (symbolp x) | 6848 | (if (symbolp x) |
| 6849 | (list x) | 6849 | (list x) |
| @@ -11258,12 +11258,12 @@ according to FMT (default from `org-email-link-description-format')." | |||
| 11258 | (if description (concat "[" description "]") "") | 11258 | (if description (concat "[" description "]") "") |
| 11259 | "]")) | 11259 | "]")) |
| 11260 | 11260 | ||
| 11261 | (defconst org-link-escape-chars | 11261 | (defconst org-link-escape-chars |
| 11262 | '((" " . "%20") | 11262 | '((" " . "%20") |
| 11263 | ("[" . "%5B") | 11263 | ("[" . "%5B") |
| 11264 | ("]" . "%5d") | 11264 | ("]" . "%5d") |
| 11265 | ("\340" . "%E0") ; `a | 11265 | ("\340" . "%E0") ; `a |
| 11266 | ("\342" . "%E2") ; ^a | 11266 | ("\342" . "%E2") ; ^a |
| 11267 | ("\347" . "%E7") ; ,c | 11267 | ("\347" . "%E7") ; ,c |
| 11268 | ("\350" . "%E8") ; `e | 11268 | ("\350" . "%E8") ; `e |
| 11269 | ("\351" . "%E9") ; 'e | 11269 | ("\351" . "%E9") ; 'e |
| @@ -11280,7 +11280,7 @@ according to FMT (default from `org-email-link-description-format')." | |||
| 11280 | "Association list of escapes for some characters problematic in links. | 11280 | "Association list of escapes for some characters problematic in links. |
| 11281 | This is the list that is used for internal purposes.") | 11281 | This is the list that is used for internal purposes.") |
| 11282 | 11282 | ||
| 11283 | (defconst org-link-escape-chars-browser | 11283 | (defconst org-link-escape-chars-browser |
| 11284 | '((" " . "%20")) | 11284 | '((" " . "%20")) |
| 11285 | "Association list of escapes for some characters problematic in links. | 11285 | "Association list of escapes for some characters problematic in links. |
| 11286 | This is the list that is used before handing over to the browser.") | 11286 | This is the list that is used before handing over to the browser.") |
| @@ -11459,7 +11459,7 @@ With three \\[universal-argument] prefixes, negate the meaning of | |||
| 11459 | (setq org-stored-links (delq (assoc link org-stored-links) | 11459 | (setq org-stored-links (delq (assoc link org-stored-links) |
| 11460 | org-stored-links))) | 11460 | org-stored-links))) |
| 11461 | (setq desc (or desc (nth 1 entry))))) | 11461 | (setq desc (or desc (nth 1 entry))))) |
| 11462 | 11462 | ||
| 11463 | (if (string-match org-plain-link-re link) | 11463 | (if (string-match org-plain-link-re link) |
| 11464 | ;; URL-like link, normalize the use of angular brackets. | 11464 | ;; URL-like link, normalize the use of angular brackets. |
| 11465 | (setq link (org-make-link (org-remove-angle-brackets link)))) | 11465 | (setq link (org-make-link (org-remove-angle-brackets link)))) |
| @@ -12537,7 +12537,7 @@ to be run from that hook to fucntion properly." | |||
| 12537 | (when (string-match "\\S-" ins) | 12537 | (when (string-match "\\S-" ins) |
| 12538 | (or (equal (char-before) ?:) (insert ":")) | 12538 | (or (equal (char-before) ?:) (insert ":")) |
| 12539 | (insert ins) | 12539 | (insert ins) |
| 12540 | (or (equal (char-after) ?:) (insert ":"))))) | 12540 | (or (equal (char-after) ?:) (insert ":"))))) |
| 12541 | (char | 12541 | (char |
| 12542 | (setq org-time-was-given (equal (upcase char) char)) | 12542 | (setq org-time-was-given (equal (upcase char) char)) |
| 12543 | (setq time (org-read-date (equal (upcase char) "U") t nil | 12543 | (setq time (org-read-date (equal (upcase char) "U") t nil |
| @@ -12710,7 +12710,7 @@ See also the variable `org-reverse-note-order'." | |||
| 12710 | (org-end-of-subtree t) | 12710 | (org-end-of-subtree t) |
| 12711 | (org-paste-subtree level txt)) | 12711 | (org-paste-subtree level txt)) |
| 12712 | (t (error "This should not happen")))) | 12712 | (t (error "This should not happen")))) |
| 12713 | 12713 | ||
| 12714 | ((and (bobp) (not reversed)) | 12714 | ((and (bobp) (not reversed)) |
| 12715 | ;; Put it at the end, one level below level 1 | 12715 | ;; Put it at the end, one level below level 1 |
| 12716 | (save-restriction | 12716 | (save-restriction |
| @@ -12718,7 +12718,7 @@ See also the variable `org-reverse-note-order'." | |||
| 12718 | (goto-char (point-max)) | 12718 | (goto-char (point-max)) |
| 12719 | (if (not (bolp)) (newline)) | 12719 | (if (not (bolp)) (newline)) |
| 12720 | (org-paste-subtree (org-get-legal-level 1 1) txt))) | 12720 | (org-paste-subtree (org-get-legal-level 1 1) txt))) |
| 12721 | 12721 | ||
| 12722 | ((and (bobp) reversed) | 12722 | ((and (bobp) reversed) |
| 12723 | ;; Put it at the start, as level 1 | 12723 | ;; Put it at the start, as level 1 |
| 12724 | (save-restriction | 12724 | (save-restriction |
| @@ -13834,7 +13834,7 @@ also TODO lines." | |||
| 13834 | (setq match (completing-read | 13834 | (setq match (completing-read |
| 13835 | "Match: " 'org-tags-completion-function nil nil nil | 13835 | "Match: " 'org-tags-completion-function nil nil nil |
| 13836 | 'org-tags-history)))) | 13836 | 'org-tags-history)))) |
| 13837 | 13837 | ||
| 13838 | ;; Parse the string and create a lisp form | 13838 | ;; Parse the string and create a lisp form |
| 13839 | (let ((match0 match) | 13839 | (let ((match0 match) |
| 13840 | (re (org-re "^&?\\([-+:]\\)?\\({[^}]+}\\|LEVEL=\\([0-9]+\\)\\|\\([[:alnum:]]+\\)=\\({[^}]+}\\|\"[^\"]+\"\\)\\|[[:alnum:]_@]+\\)")) | 13840 | (re (org-re "^&?\\([-+:]\\)?\\({[^}]+}\\|LEVEL=\\([0-9]+\\)\\|\\([[:alnum:]]+\\)=\\({[^}]+}\\|\"[^\"]+\"\\)\\|[[:alnum:]_@]+\\)")) |
| @@ -13997,12 +13997,12 @@ With prefix ARG, realign all tags in headings in the current buffer." | |||
| 13997 | (while (string-match "[-+&]+" tags) | 13997 | (while (string-match "[-+&]+" tags) |
| 13998 | ;; No boolean logic, just a list | 13998 | ;; No boolean logic, just a list |
| 13999 | (setq tags (replace-match ":" t t tags)))) | 13999 | (setq tags (replace-match ":" t t tags)))) |
| 14000 | 14000 | ||
| 14001 | (if (string-match "\\`[\t ]*\\'" tags) | 14001 | (if (string-match "\\`[\t ]*\\'" tags) |
| 14002 | (setq tags "") | 14002 | (setq tags "") |
| 14003 | (unless (string-match ":$" tags) (setq tags (concat tags ":"))) | 14003 | (unless (string-match ":$" tags) (setq tags (concat tags ":"))) |
| 14004 | (unless (string-match "^:" tags) (setq tags (concat ":" tags)))) | 14004 | (unless (string-match "^:" tags) (setq tags (concat ":" tags)))) |
| 14005 | 14005 | ||
| 14006 | ;; Insert new tags at the correct column | 14006 | ;; Insert new tags at the correct column |
| 14007 | (beginning-of-line 1) | 14007 | (beginning-of-line 1) |
| 14008 | (cond | 14008 | (cond |
| @@ -14321,7 +14321,7 @@ Returns the new tags string, or nil to not change the current settings." | |||
| 14321 | (let (tags) | 14321 | (let (tags) |
| 14322 | (save-excursion | 14322 | (save-excursion |
| 14323 | (goto-char (point-min)) | 14323 | (goto-char (point-min)) |
| 14324 | (while (re-search-forward | 14324 | (while (re-search-forward |
| 14325 | (org-re "[ \t]:\\([[:alnum:]_@:]+\\):[ \t\r\n]") nil t) | 14325 | (org-re "[ \t]:\\([[:alnum:]_@:]+\\):[ \t\r\n]") nil t) |
| 14326 | (when (equal (char-after (point-at-bol 0)) ?*) | 14326 | (when (equal (char-after (point-at-bol 0)) ?*) |
| 14327 | (mapc (lambda (x) (add-to-list 'tags x)) | 14327 | (mapc (lambda (x) (add-to-list 'tags x)) |
| @@ -14469,7 +14469,7 @@ If WHICH is nil or `all', get all properties. If WHICH is | |||
| 14469 | (unless (member key excluded) | 14469 | (unless (member key excluded) |
| 14470 | (push (cons key (or value "")) props))))) | 14470 | (push (cons key (or value "")) props))))) |
| 14471 | (append sum-props (nreverse props))))))) | 14471 | (append sum-props (nreverse props))))))) |
| 14472 | 14472 | ||
| 14473 | (defun org-entry-get (pom property &optional inherit) | 14473 | (defun org-entry-get (pom property &optional inherit) |
| 14474 | "Get value of PROPERTY for entry at point-or-marker POM. | 14474 | "Get value of PROPERTY for entry at point-or-marker POM. |
| 14475 | If INHERIT is non-nil and the entry does not have the property, | 14475 | If INHERIT is non-nil and the entry does not have the property, |
| @@ -14636,7 +14636,7 @@ internally: ARCHIVE, CATEGORY, SUMMARY, DESCRIPTION, LOCATION, and LOGGING." | |||
| 14636 | (defun org-set-property (property value) | 14636 | (defun org-set-property (property value) |
| 14637 | "In the current entry, set PROPERTY to VALUE." | 14637 | "In the current entry, set PROPERTY to VALUE." |
| 14638 | (interactive | 14638 | (interactive |
| 14639 | (let* ((prop (completing-read "Property: " | 14639 | (let* ((prop (completing-read "Property: " |
| 14640 | (mapcar 'list (org-buffer-property-keys)))) | 14640 | (mapcar 'list (org-buffer-property-keys)))) |
| 14641 | (cur (org-entry-get nil prop)) | 14641 | (cur (org-entry-get nil prop)) |
| 14642 | (allowed (org-property-get-allowed-values nil prop 'table)) | 14642 | (allowed (org-property-get-allowed-values nil prop 'table)) |
| @@ -14657,7 +14657,7 @@ internally: ARCHIVE, CATEGORY, SUMMARY, DESCRIPTION, LOCATION, and LOGGING." | |||
| 14657 | (let* ((prop (completing-read | 14657 | (let* ((prop (completing-read |
| 14658 | "Property: " (org-entry-properties nil 'standard)))) | 14658 | "Property: " (org-entry-properties nil 'standard)))) |
| 14659 | (list prop))) | 14659 | (list prop))) |
| 14660 | (message (concat "Property " property | 14660 | (message (concat "Property " property |
| 14661 | (if (org-entry-delete nil property) | 14661 | (if (org-entry-delete nil property) |
| 14662 | " deleted" | 14662 | " deleted" |
| 14663 | " was not present in the entry")))) | 14663 | " was not present in the entry")))) |
| @@ -14666,7 +14666,7 @@ internally: ARCHIVE, CATEGORY, SUMMARY, DESCRIPTION, LOCATION, and LOGGING." | |||
| 14666 | "Remove PROPERTY globally, from all entries." | 14666 | "Remove PROPERTY globally, from all entries." |
| 14667 | (interactive | 14667 | (interactive |
| 14668 | (let* ((prop (completing-read | 14668 | (let* ((prop (completing-read |
| 14669 | "Globally remove property: " | 14669 | "Globally remove property: " |
| 14670 | (mapcar 'list (org-buffer-property-keys))))) | 14670 | (mapcar 'list (org-buffer-property-keys))))) |
| 14671 | (list prop))) | 14671 | (list prop))) |
| 14672 | (save-excursion | 14672 | (save-excursion |
| @@ -14703,7 +14703,7 @@ completion." | |||
| 14703 | (let (vals) | 14703 | (let (vals) |
| 14704 | (cond | 14704 | (cond |
| 14705 | ((equal property "TODO") | 14705 | ((equal property "TODO") |
| 14706 | (setq vals (org-with-point-at pom | 14706 | (setq vals (org-with-point-at pom |
| 14707 | (append org-todo-keywords-1 '(""))))) | 14707 | (append org-todo-keywords-1 '(""))))) |
| 14708 | ((equal property "PRIORITY") | 14708 | ((equal property "PRIORITY") |
| 14709 | (let ((n org-lowest-priority)) | 14709 | (let ((n org-lowest-priority)) |
| @@ -14713,7 +14713,7 @@ completion." | |||
| 14713 | ((member property org-special-properties)) | 14713 | ((member property org-special-properties)) |
| 14714 | (t | 14714 | (t |
| 14715 | (setq vals (org-entry-get pom (concat property "_ALL") 'inherit)) | 14715 | (setq vals (org-entry-get pom (concat property "_ALL") 'inherit)) |
| 14716 | 14716 | ||
| 14717 | (when (and vals (string-match "\\S-" vals)) | 14717 | (when (and vals (string-match "\\S-" vals)) |
| 14718 | (setq vals (car (read-from-string (concat "(" vals ")")))) | 14718 | (setq vals (car (read-from-string (concat "(" vals ")")))) |
| 14719 | (setq vals (mapcar (lambda (x) | 14719 | (setq vals (mapcar (lambda (x) |
| @@ -14843,7 +14843,7 @@ This is the compiled version of the format.") | |||
| 14843 | (beginning-of-line 1) | 14843 | (beginning-of-line 1) |
| 14844 | (and (looking-at "\\(\\**\\)\\(\\* \\)") | 14844 | (and (looking-at "\\(\\**\\)\\(\\* \\)") |
| 14845 | (org-get-level-face 2)))) | 14845 | (org-get-level-face 2)))) |
| 14846 | (color (list :foreground | 14846 | (color (list :foreground |
| 14847 | (face-attribute (or level-face 'default) :foreground))) | 14847 | (face-attribute (or level-face 'default) :foreground))) |
| 14848 | props pom property ass width f string ov column) | 14848 | props pom property ass width f string ov column) |
| 14849 | ;; Check if the entry is in another buffer. | 14849 | ;; Check if the entry is in another buffer. |
| @@ -14988,7 +14988,7 @@ Where possible, use the standard interface for changing this line." | |||
| 14988 | nval eval allowed) | 14988 | nval eval allowed) |
| 14989 | (when (equal key "ITEM") | 14989 | (when (equal key "ITEM") |
| 14990 | (error "Cannot edit item headline from here")) | 14990 | (error "Cannot edit item headline from here")) |
| 14991 | 14991 | ||
| 14992 | (cond | 14992 | (cond |
| 14993 | ((equal key "TODO") | 14993 | ((equal key "TODO") |
| 14994 | (setq eval '(org-with-point-at pom | 14994 | (setq eval '(org-with-point-at pom |
| @@ -15021,7 +15021,7 @@ Where possible, use the standard interface for changing this line." | |||
| 15021 | (remove-text-properties (1- bol) eol '(read-only t)) | 15021 | (remove-text-properties (1- bol) eol '(read-only t)) |
| 15022 | (unwind-protect | 15022 | (unwind-protect |
| 15023 | (progn | 15023 | (progn |
| 15024 | (setq org-columns-overlays | 15024 | (setq org-columns-overlays |
| 15025 | (org-delete-all line-overlays org-columns-overlays)) | 15025 | (org-delete-all line-overlays org-columns-overlays)) |
| 15026 | (mapc 'org-delete-overlay line-overlays) | 15026 | (mapc 'org-delete-overlay line-overlays) |
| 15027 | (org-columns-eval eval)) | 15027 | (org-columns-eval eval)) |
| @@ -15040,7 +15040,7 @@ Where possible, use the standard interface for changing this line." | |||
| 15040 | (allowed (org-entry-get (point) key1 t)) | 15040 | (allowed (org-entry-get (point) key1 t)) |
| 15041 | nval) | 15041 | nval) |
| 15042 | (setq nval (read-string "Allowed: " allowed)) | 15042 | (setq nval (read-string "Allowed: " allowed)) |
| 15043 | (org-entry-put | 15043 | (org-entry-put |
| 15044 | (cond ((marker-position org-entry-property-inherited-from) | 15044 | (cond ((marker-position org-entry-property-inherited-from) |
| 15045 | org-entry-property-inherited-from) | 15045 | org-entry-property-inherited-from) |
| 15046 | ((marker-position org-columns-top-level-marker) | 15046 | ((marker-position org-columns-top-level-marker) |
| @@ -15099,7 +15099,7 @@ Where possible, use the standard interface for changing this line." | |||
| 15099 | (remove-text-properties (1- bol) eol '(read-only t)) | 15099 | (remove-text-properties (1- bol) eol '(read-only t)) |
| 15100 | (unwind-protect | 15100 | (unwind-protect |
| 15101 | (progn | 15101 | (progn |
| 15102 | (setq org-columns-overlays | 15102 | (setq org-columns-overlays |
| 15103 | (org-delete-all line-overlays org-columns-overlays)) | 15103 | (org-delete-all line-overlays org-columns-overlays)) |
| 15104 | (mapc 'org-delete-overlay line-overlays) | 15104 | (mapc 'org-delete-overlay line-overlays) |
| 15105 | (org-columns-eval '(org-entry-put pom key nval))) | 15105 | (org-columns-eval '(org-entry-put pom key nval))) |
| @@ -15250,7 +15250,7 @@ Where possible, use the standard interface for changing this line." | |||
| 15250 | (error "Cannot shift this column further to the left")) | 15250 | (error "Cannot shift this column further to the left")) |
| 15251 | (backward-char 1) | 15251 | (backward-char 1) |
| 15252 | (org-columns-move-right) | 15252 | (org-columns-move-right) |
| 15253 | (backward-char 1))) | 15253 | (backward-char 1))) |
| 15254 | 15254 | ||
| 15255 | (defun org-columns-store-format () | 15255 | (defun org-columns-store-format () |
| 15256 | "Store the text version of the current columns format in appropriate place. | 15256 | "Store the text version of the current columns format in appropriate place. |
| @@ -15348,7 +15348,7 @@ display, or in the #+COLUMNS line of the current buffer." | |||
| 15348 | (setq pos (org-overlay-start ov)) | 15348 | (setq pos (org-overlay-start ov)) |
| 15349 | (goto-char pos) | 15349 | (goto-char pos) |
| 15350 | (when (setq val (cdr (assoc property | 15350 | (when (setq val (cdr (assoc property |
| 15351 | (get-text-property | 15351 | (get-text-property |
| 15352 | (point-at-bol) 'org-summaries)))) | 15352 | (point-at-bol) 'org-summaries)))) |
| 15353 | (setq fmt (org-overlay-get ov 'org-columns-format)) | 15353 | (setq fmt (org-overlay-get ov 'org-columns-format)) |
| 15354 | (org-overlay-put ov 'org-columns-value val) | 15354 | (org-overlay-put ov 'org-columns-value val) |
| @@ -15404,7 +15404,7 @@ display, or in the #+COLUMNS line of the current buffer." | |||
| 15404 | (if flag str val) format)))) | 15404 | (if flag str val) format)))) |
| 15405 | (aset lflag level t)) | 15405 | (aset lflag level t)) |
| 15406 | ;; clear accumulators for deeper levels | 15406 | ;; clear accumulators for deeper levels |
| 15407 | (loop for l from (1+ level) to (1- lmax) do | 15407 | (loop for l from (1+ level) to (1- lmax) do |
| 15408 | (aset lsum l 0) | 15408 | (aset lsum l 0) |
| 15409 | (aset lflag l nil))) | 15409 | (aset lflag l nil))) |
| 15410 | ((>= level last-level) | 15410 | ((>= level last-level) |
| @@ -15720,7 +15720,7 @@ user." | |||
| 15720 | minute (if (match-end 3) | 15720 | minute (if (match-end 3) |
| 15721 | (string-to-number (match-string 3 ans)) | 15721 | (string-to-number (match-string 3 ans)) |
| 15722 | 0) | 15722 | 0) |
| 15723 | pm (equal ?p | 15723 | pm (equal ?p |
| 15724 | (string-to-char (downcase (match-string 4 ans))))) | 15724 | (string-to-char (downcase (match-string 4 ans))))) |
| 15725 | (if (and (= hour 12) (not pm)) | 15725 | (if (and (= hour 12) (not pm)) |
| 15726 | (setq hour 0) | 15726 | (setq hour 0) |
| @@ -16354,7 +16354,7 @@ in the timestamp determines what will be changed." | |||
| 16354 | (setq ng 6 new (car (rassoc (+ n (cdr (assoc (match-string 6 s) idx))) idx)))) | 16354 | (setq ng 6 new (car (rassoc (+ n (cdr (assoc (match-string 6 s) idx))) idx)))) |
| 16355 | ((org-pos-in-match-range pos 5) | 16355 | ((org-pos-in-match-range pos 5) |
| 16356 | (setq ng 5 new (format "%d" (max 1 (+ n (string-to-number (match-string 5 s)))))))) | 16356 | (setq ng 5 new (format "%d" (max 1 (+ n (string-to-number (match-string 5 s)))))))) |
| 16357 | 16357 | ||
| 16358 | (when ng | 16358 | (when ng |
| 16359 | (setq s (concat | 16359 | (setq s (concat |
| 16360 | (substring s 0 (match-beginning ng)) | 16360 | (substring s 0 (match-beginning ng)) |
| @@ -16421,28 +16421,28 @@ belonging to the category \"Work\"." | |||
| 16421 | (require 'org) | 16421 | (require 'org) |
| 16422 | (if (equal filter '(4)) | 16422 | (if (equal filter '(4)) |
| 16423 | (setq filter (read-from-minibuffer "Regexp filter: "))) | 16423 | (setq filter (read-from-minibuffer "Regexp filter: "))) |
| 16424 | (let* ((today (org-date-to-gregorian | 16424 | (let* ((today (org-date-to-gregorian |
| 16425 | (time-to-days (current-time)))) | 16425 | (time-to-days (current-time)))) |
| 16426 | (files org-agenda-files) entries file) | 16426 | (files org-agenda-files) entries file) |
| 16427 | (while (setq file (pop files)) | 16427 | (while (setq file (pop files)) |
| 16428 | (setq entries (append entries (org-agenda-get-day-entries | 16428 | (setq entries (append entries (org-agenda-get-day-entries |
| 16429 | file today :timestamp)))) | 16429 | file today :timestamp)))) |
| 16430 | (setq entries (delq nil entries)) | 16430 | (setq entries (delq nil entries)) |
| 16431 | (mapc | 16431 | (mapc |
| 16432 | (lambda(x) | 16432 | (lambda(x) |
| 16433 | (let* ((evt (org-trim (get-text-property 1 'txt x))) | 16433 | (let* ((evt (org-trim (get-text-property 1 'txt x))) |
| 16434 | (cat (get-text-property 1 'org-category x)) | 16434 | (cat (get-text-property 1 'org-category x)) |
| 16435 | (tod (get-text-property 1 'time-of-day x)) | 16435 | (tod (get-text-property 1 'time-of-day x)) |
| 16436 | (ok (or (and (stringp filter) (string-match filter evt)) | 16436 | (ok (or (and (stringp filter) (string-match filter evt)) |
| 16437 | (and (not (null filter)) (listp filter) | 16437 | (and (not (null filter)) (listp filter) |
| 16438 | (or (string-match | 16438 | (or (string-match |
| 16439 | (cadr (assoc 'category filter)) cat) | 16439 | (cadr (assoc 'category filter)) cat) |
| 16440 | (string-match | 16440 | (string-match |
| 16441 | (cadr (assoc 'headline filter)) evt)))))) | 16441 | (cadr (assoc 'headline filter)) evt)))))) |
| 16442 | ;; (setq evt (set-text-properties 0 (length event) nil evt)) | 16442 | ;; (setq evt (set-text-properties 0 (length event) nil evt)) |
| 16443 | (when (and ok tod) | 16443 | (when (and ok tod) |
| 16444 | (setq tod (number-to-string tod) | 16444 | (setq tod (number-to-string tod) |
| 16445 | tod (when (string-match | 16445 | tod (when (string-match |
| 16446 | "\\([0-9]\\{1,2\\}\\)\\([0-9]\\{2\\}\\)" tod) | 16446 | "\\([0-9]\\{1,2\\}\\)\\([0-9]\\{2\\}\\)" tod) |
| 16447 | (concat (match-string 1 tod) ":" | 16447 | (concat (match-string 1 tod) ":" |
| 16448 | (match-string 2 tod)))) | 16448 | (match-string 2 tod)))) |
| @@ -16923,7 +16923,7 @@ the returned times will be formatted strings." | |||
| 16923 | (setq total-time (+ (or total-time 0) | 16923 | (setq total-time (+ (or total-time 0) |
| 16924 | org-clock-file-total-minutes))))))) | 16924 | org-clock-file-total-minutes))))))) |
| 16925 | (goto-char pos) | 16925 | (goto-char pos) |
| 16926 | 16926 | ||
| 16927 | (unless (eq scope 'agenda) | 16927 | (unless (eq scope 'agenda) |
| 16928 | (org-clock-sum ts te) | 16928 | (org-clock-sum ts te) |
| 16929 | (goto-char (point-min)) | 16929 | (goto-char (point-min)) |
| @@ -16968,7 +16968,7 @@ the returned times will be formatted strings." | |||
| 16968 | (insert-before-markers | 16968 | (insert-before-markers |
| 16969 | "|-\n|" | 16969 | "|-\n|" |
| 16970 | (if (eq scope 'agenda) "|" "") | 16970 | (if (eq scope 'agenda) "|" "") |
| 16971 | "|" | 16971 | "|" |
| 16972 | "*Total time*| " | 16972 | "*Total time*| " |
| 16973 | (format "*%d:%02d*" h m) | 16973 | (format "*%d:%02d*" h m) |
| 16974 | "|\n|-\n") | 16974 | "|\n|-\n") |
| @@ -19766,7 +19766,7 @@ With prefix ARG, go forward that many times the current span." | |||
| 19766 | (list (car org-agenda-last-arguments) sd nd t))) | 19766 | (list (car org-agenda-last-arguments) sd nd t))) |
| 19767 | (org-agenda-redo) | 19767 | (org-agenda-redo) |
| 19768 | (org-agenda-find-today-or-agenda)))) | 19768 | (org-agenda-find-today-or-agenda)))) |
| 19769 | 19769 | ||
| 19770 | (defun org-agenda-earlier (arg) | 19770 | (defun org-agenda-earlier (arg) |
| 19771 | "Go backward in time by the current span. | 19771 | "Go backward in time by the current span. |
| 19772 | With prefix ARG, go backward that many times the current span." | 19772 | With prefix ARG, go backward that many times the current span." |
| @@ -20480,7 +20480,7 @@ be used to request time specification in the time stamp." | |||
| 20480 | (save-excursion | 20480 | (save-excursion |
| 20481 | (org-back-to-heading t) | 20481 | (org-back-to-heading t) |
| 20482 | (if (looking-at | 20482 | (if (looking-at |
| 20483 | (if no-tags | 20483 | (if no-tags |
| 20484 | (org-re "\\*+[ \t]+\\([^\n\r]*?\\)\\([ \t]+:[[:alnum:]:_@]+:[ \t]*\\)?$") | 20484 | (org-re "\\*+[ \t]+\\([^\n\r]*?\\)\\([ \t]+:[[:alnum:]:_@]+:[ \t]*\\)?$") |
| 20485 | "\\*+[ \t]+\\([^\r\n]*\\)")) | 20485 | "\\*+[ \t]+\\([^\r\n]*\\)")) |
| 20486 | (match-string 1) ""))) | 20486 | (match-string 1) ""))) |
| @@ -21530,7 +21530,7 @@ translations. There is currently no way for users to extend this.") | |||
| 21530 | (setq fmt (pop formatters)) | 21530 | (setq fmt (pop formatters)) |
| 21531 | (when (car fmt) | 21531 | (when (car fmt) |
| 21532 | (goto-char (point-min)) | 21532 | (goto-char (point-min)) |
| 21533 | (while (re-search-forward (concat "^#\\+" (cadr fmt) | 21533 | (while (re-search-forward (concat "^#\\+" (cadr fmt) |
| 21534 | ":[ \t]*\\(.*\\)") nil t) | 21534 | ":[ \t]*\\(.*\\)") nil t) |
| 21535 | (replace-match "\\1" t) | 21535 | (replace-match "\\1" t) |
| 21536 | (add-text-properties | 21536 | (add-text-properties |
| @@ -21538,7 +21538,7 @@ translations. There is currently no way for users to extend this.") | |||
| 21538 | '(org-protected t)))) | 21538 | '(org-protected t)))) |
| 21539 | (goto-char (point-min)) | 21539 | (goto-char (point-min)) |
| 21540 | (while (re-search-forward | 21540 | (while (re-search-forward |
| 21541 | (concat "^#\\+" | 21541 | (concat "^#\\+" |
| 21542 | (caddr fmt) "\\>.*\\(\\(\n.*\\)*?\n\\)#\\+" | 21542 | (caddr fmt) "\\>.*\\(\\(\n.*\\)*?\n\\)#\\+" |
| 21543 | (cadddr fmt) "\\>.*\n?") nil t) | 21543 | (cadddr fmt) "\\>.*\n?") nil t) |
| 21544 | (if (car fmt) | 21544 | (if (car fmt) |
| @@ -21689,7 +21689,7 @@ translations. There is currently no way for users to extend this.") | |||
| 21689 | (add-text-properties (point) (1+ (point-at-eol)) | 21689 | (add-text-properties (point) (1+ (point-at-eol)) |
| 21690 | (list :org-license-to-kill t))))) | 21690 | (list :org-license-to-kill t))))) |
| 21691 | title)) | 21691 | title)) |
| 21692 | 21692 | ||
| 21693 | (defun org-solidify-link-text (s &optional alist) | 21693 | (defun org-solidify-link-text (s &optional alist) |
| 21694 | "Take link text and make a safe target out of it." | 21694 | "Take link text and make a safe target out of it." |
| 21695 | (save-match-data | 21695 | (save-match-data |
| @@ -22778,7 +22778,7 @@ lang=\"%s\" xml:lang=\"%s\"> | |||
| 22778 | (if (and (string-match org-todo-line-regexp line) | 22778 | (if (and (string-match org-todo-line-regexp line) |
| 22779 | (match-beginning 2)) | 22779 | (match-beginning 2)) |
| 22780 | 22780 | ||
| 22781 | (setq line | 22781 | (setq line |
| 22782 | (concat (substring line 0 (match-beginning 2)) | 22782 | (concat (substring line 0 (match-beginning 2)) |
| 22783 | "<span class=\"" | 22783 | "<span class=\"" |
| 22784 | (if (member (match-string 2 line) | 22784 | (if (member (match-string 2 line) |
| @@ -23112,14 +23112,14 @@ lang=\"%s\" xml:lang=\"%s\"> | |||
| 23112 | (lambda (x) | 23112 | (lambda (x) |
| 23113 | (setq gr (pop org-table-colgroup-info)) | 23113 | (setq gr (pop org-table-colgroup-info)) |
| 23114 | (format "%s<COL align=\"%s\"></COL>%s" | 23114 | (format "%s<COL align=\"%s\"></COL>%s" |
| 23115 | (if (memq gr '(:start :startend)) | 23115 | (if (memq gr '(:start :startend)) |
| 23116 | (prog1 | 23116 | (prog1 |
| 23117 | (if colgropen "</colgroup>\n<colgroup>" "<colgroup>") | 23117 | (if colgropen "</colgroup>\n<colgroup>" "<colgroup>") |
| 23118 | (setq colgropen t)) | 23118 | (setq colgropen t)) |
| 23119 | "") | 23119 | "") |
| 23120 | (if (> (/ (float x) nlines) org-table-number-fraction) | 23120 | (if (> (/ (float x) nlines) org-table-number-fraction) |
| 23121 | "right" "left") | 23121 | "right" "left") |
| 23122 | (if (memq gr '(:end :startend)) | 23122 | (if (memq gr '(:end :startend)) |
| 23123 | (progn (setq colgropen nil) "</colgroup>") | 23123 | (progn (setq colgropen nil) "</colgroup>") |
| 23124 | ""))) | 23124 | ""))) |
| 23125 | fnum "") | 23125 | fnum "") |