Mercurial > emacs
annotate lisp/textmodes/org.el @ 62244:1053cf8f89ea
(Top): Update to the current structure of the manual.
author | Lute Kamstra <lute@gnu.org> |
---|---|
date | Wed, 11 May 2005 23:25:27 +0000 |
parents | fab4f3bb60e0 |
children | 153ddc124932 62afea0771d8 |
rev | line source |
---|---|
58792 | 1 ;; org.el --- Outline-based notes management and organizer |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
2 ;; Carstens outline-mode for keeping track of everything. |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3 ;; Copyright (c) 2004, 2005 Free Software Foundation |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4 ;; |
58792 | 5 ;; Author: Carsten Dominik <dominik at science dot uva dot nl> |
6 ;; Keywords: outlines, hypermedia, calendar | |
7 ;; Homepage: http://www.astro.uva.nl/~dominik/Tools/org/ | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8 ;; Version: 3.08 |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
9 ;; |
58794 | 10 ;; This file is part of GNU Emacs. |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
11 ;; |
58794 | 12 ;; GNU Emacs is free software; you can redistribute it and/or modify |
13 ;; it under the terms of the GNU General Public License as published by | |
14 ;; the Free Software Foundation; either version 2, or (at your option) | |
58792 | 15 ;; any later version. |
16 | |
58794 | 17 ;; GNU Emacs is distributed in the hope that it will be useful, |
18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
20 ;; GNU General Public License for more details. | |
58792 | 21 |
22 ;; You should have received a copy of the GNU General Public License | |
23 ;; along with GNU Emacs; see the file COPYING. If not, write to the | |
24 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
25 ;; Boston, MA 02111-1307, USA. | |
26 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
27 ;; | |
28 ;;; Commentary: | |
29 ;; | |
30 ;; Org-mode is a mode for keeping notes, maintaining ToDo lists, and doing | |
31 ;; project planning with a fast and effective plain-text system. | |
32 ;; | |
33 ;; Org-mode develops organizational tasks around a NOTES file that contains | |
34 ;; information about projects as plain text. Org-mode is implemented on | |
35 ;; top of outline-mode - ideal to keep the content of large files well | |
36 ;; structured. It supports ToDo items, deadlines and time stamps, which | |
37 ;; magically appear in the diary listing of the Emacs calendar. Tables are | |
38 ;; easily created with a built-in table editor. Plain text URL-like links | |
39 ;; connect to websites, emails (VM,RMAIL,WANDERLUST), Usenet messages (Gnus), | |
40 ;; BBDB entries, and any files related to the projects. For printing and | |
41 ;; sharing of notes, an Org-mode file (or a part of it) can be exported as | |
42 ;; a structured ASCII file, or as HTML. | |
43 ;; | |
44 ;; Installation | |
45 ;; ------------ | |
46 ;; The instruction below assume that you have downloaded Org-mode from the | |
47 ;; web. If Org-mode is part of the Emacs distribution or an XEmacs package, | |
48 ;; you only need to add to .emacs the last three lines of Lisp code listed | |
49 ;; below, i.e. the `auto-mode-alist' modification and the global key bindings. | |
50 ;; | |
51 ;; Byte-compile org.el and put it on your load path. Then copy the | |
52 ;; following lines into .emacs. The last two lines define *global* | |
53 ;; keys for the commands `org-store-link' and `org-agenda' - please | |
54 ;; choose suitable keys yourself. | |
55 ;; | |
56 ;; (autoload 'org-mode "org" "Org mode" t) | |
57 ;; (autoload 'org-diary "org" "Diary entries from Org mode") | |
58 ;; (autoload 'org-agenda "org" "Multi-file agenda from Org mode" t) | |
59 ;; (autoload 'org-store-link "org" "Store a link to the current location" t) | |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
60 ;; (autoload 'orgtbl-mode "org" "Org tables as a minor mode" t) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
61 ;; (autoload 'turn-on-orgtbl "org" "Org tables as a minor mode") |
58792 | 62 ;; (add-to-list 'auto-mode-alist '("\\.org$" . org-mode)) |
63 ;; (define-key global-map "\C-cl" 'org-store-link) | |
64 ;; (define-key global-map "\C-ca" 'org-agenda) | |
65 ;; | |
66 ;; This will put all files with extension ".org" into Org-mode. As an | |
67 ;; alternative, make the first line of a file look like this: | |
68 ;; | |
69 ;; MY PROJECTS -*- mode: org; -*- | |
70 ;; | |
71 ;; which will select Org-mode for this buffer no matter what the file's | |
72 ;; name is. | |
73 ;; | |
74 ;; Documentation | |
75 ;; ------------- | |
76 ;; The documentation of Org-mode can be found in the TeXInfo file. | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
77 ;; The distribution also contains a PDF version of it. At the homepage |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
78 ;; of Org-mode, you can read the same text online as HTML. |
58792 | 79 ;; |
80 ;; Changes: | |
81 ;; ------- | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
82 ;; Version 3.08 |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
83 ;; - "|" no longer allowed as part of a link, to allow links in tables. |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
84 ;; - The prefix of items in the agenda buffer can be configured. |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
85 ;; - Cleanup. |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
86 ;; |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
87 ;; Version 3.07 |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
88 ;; - Some folding incinsistencies removed. |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
89 ;; - BBDB links to company-only entries. |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
90 ;; - Bug fixes and global cleanup. |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
91 ;; |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
92 ;; Version 3.06 |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
93 ;; - M-S-RET inserts a new TODO heading. |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
94 ;; - New startup option `content'. |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
95 ;; - Better visual response when TODO items in agenda change status. |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
96 ;; - Window positioning after visibility state changes optimized and made |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
97 ;; configurable. See `org-cycle-hook' and `org-occur-hook'. |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
98 ;; |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
99 ;; Version 3.05 |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
100 ;; - Agenda entries from the diary are linked to the diary file, so |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
101 ;; adding and editing diary entries can be done directly from the agenda. |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
102 ;; - Many calendar/diary commands available directly from agenda. |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
103 ;; - Field copying in tables with S-RET does increment. |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
104 ;; - C-c C-x C-v extracts the visible part of the buffer for printing. |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
105 ;; - Moving subtrees up and down preserves the whitespace at the tree end. |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
106 ;; |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
107 ;; Version 3.04 |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
108 ;; - Table editor optimized to need fewer realignments, and to keep |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
109 ;; table shape when typing in fields. |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
110 ;; - A new minor mode, orgtbl-mode, introduces the Org-mode table editor |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
111 ;; into arbitrary major modes. |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
112 ;; - Fixed bug with realignment in XEmacs. |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
113 ;; - Startup options can be set with special #+STARTUP line. |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
114 ;; - Heading following a match in org-occur can be suppressed. |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
115 ;; |
58792 | 116 ;; Version 3.03 |
117 ;; - Copyright transfer to the FSF. | |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
118 ;; - Effect of C-u and C-u C-u in org-timeline swapped. |
58792 | 119 ;; - Timeline now always contains today, and `.' jumps to it. |
120 ;; - Table editor: | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
121 ;; - cut and paste of rectangular regions in tables |
58792 | 122 ;; - command to convert org-mode table to table.el table and back |
123 ;; - command to treat several cells like a paragraph and fill it | |
124 ;; - command to convert a buffer region to a table | |
125 ;; - import/export tables as tab-separated files (exchange with Excel) | |
126 ;; - Agenda: | |
127 ;; - Sorting mechanism for agenda items rewritten from scratch. | |
128 ;; - Sorting fully configurable. | |
129 ;; - Entries specifying a time are sorted together. | |
130 ;; - Completion also covers option keywords after `#-'. | |
131 ;; - Bug fixes. | |
132 ;; | |
133 ;; Version 3.01 | |
134 ;; - New reference card, thanks to Philip Rooke for creating it. | |
135 ;; - Single file agenda renamed to "Timeline". It no longer shows | |
136 ;; warnings about upcoming deadlines/overdue scheduled items. | |
137 ;; That functionality is now limited to the (multifile) agenda. | |
138 ;; - When reading a date, the calendar can be manipulated with keys. | |
139 ;; - Link support for RMAIL and Wanderlust (from planner.el, untested) | |
140 ;; - Minor bug fixes and documentation improvements. | |
141 | |
142 ;;; Code: | |
143 | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
144 (eval-when-compile (require 'cl) (require 'calendar)) |
58792 | 145 (require 'outline) |
146 (require 'time-date) | |
147 (require 'easymenu) | |
148 | |
149 ;;; Customization variables | |
150 | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
151 (defvar org-version "3.08" |
58792 | 152 "The version number of the file org.el.") |
59596
8e7a2f6f9fa7
(org-version): Unnecessary prefix arg removed.
Carsten Dominik <dominik@science.uva.nl>
parents:
59547
diff
changeset
|
153 (defun org-version () |
8e7a2f6f9fa7
(org-version): Unnecessary prefix arg removed.
Carsten Dominik <dominik@science.uva.nl>
parents:
59547
diff
changeset
|
154 (interactive) |
58792 | 155 (message "Org-mode version %s" org-version)) |
156 | |
157 ;; The following two constants are for compatibility with different | |
158 ;; Emacs versions (Emacs versus XEmacs) and with different versions of | |
159 ;; outline.el. All the compatibility code in org.el is based on these two | |
160 ;; constants. | |
161 (defconst org-xemacs-p (featurep 'xemacs) | |
162 "Are we running xemacs?") | |
163 (defconst org-noutline-p (featurep 'noutline) | |
164 "Are we using the new outline mode?") | |
165 | |
166 (defgroup org nil | |
167 "Outline-based notes management and organizer " | |
168 :tag "Org" | |
169 :group 'outlines | |
170 :group 'hypermedia | |
171 :group 'calendar) | |
172 | |
173 (defgroup org-startup nil | |
174 "Options concerning startup of Org-mode." | |
175 :tag "Org Startup" | |
176 :group 'org) | |
177 | |
178 (defcustom org-startup-folded t | |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
179 "Non-nil means, entering Org-mode will switch to OVERVIEW. |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
180 This can also be configured on a per-file basis by adding one of |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
181 the following lines anywhere in the buffer: |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
182 |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
183 #+STARTUP: fold |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
184 #+STARTUP: nofold |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
185 #+STARTUP: content" |
58792 | 186 :group 'org-startup |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
187 :type '(choice |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
188 (const :tag "nofold: show all" nil) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
189 (const :tag "fold: overview" t) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
190 (const :tag "content: all headlines" content))) |
58792 | 191 |
192 (defcustom org-startup-truncated t | |
193 "Non-nil means, entering Org-mode will set `truncate-lines'. | |
194 This is useful since some lines containing links can be very long and | |
195 uninteresting. Also tables look terrible when wrapped." | |
196 :group 'org-startup | |
197 :type 'boolean) | |
198 | |
199 (defcustom org-startup-with-deadline-check nil | |
200 "Non-nil means, entering Org-mode will run the deadline check. | |
201 This means, if you start editing an org file, you will get an | |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
202 immediate reminder of any due deadlines. |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
203 This can also be configured on a per-file basis by adding one of |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
204 the following lines anywhere in the buffer: |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
205 |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
206 #+STARTUP: dlcheck |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
207 #+STARTUP: nodlcheck" |
58792 | 208 :group 'org-startup |
209 :type 'boolean) | |
210 | |
61312
6939a6683ac3
(org-diary-default-entry): Fixed call to
Carsten Dominik <dominik@science.uva.nl>
parents:
61134
diff
changeset
|
211 (defcustom org-insert-mode-line-in-empty-file nil |
58792 | 212 "Non-nil means insert the first line setting Org-mode in empty files. |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
213 When the function `org-mode' is called interactively in an empty file, this |
58792 | 214 normally means that the file name does not automatically trigger Org-mode. |
215 To ensure that the file will always be in Org-mode in the future, a | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
216 line enforcing Org-mode will be inserted into the buffer, if this option |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
217 has been set." |
58792 | 218 :group 'org-startup |
219 :type 'boolean) | |
220 | |
221 (defgroup org-keywords nil | |
222 "Options concerning TODO items in Org-mode." | |
223 :tag "Org Keywords" | |
224 :group 'org) | |
225 | |
226 (defcustom org-todo-keywords '("TODO" "DONE") | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
227 "List of TODO entry keywords. |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
228 \\<org-mode-map>By default, this is '(\"TODO\" \"DONE\"). The last entry in the list is |
58792 | 229 considered to mean that the entry is \"done\". All the other mean that |
230 action is required, and will make the entry show up in todo lists, diaries | |
231 etc. | |
232 The command \\[org-todo] cycles an entry through these states, and an | |
233 additional state where no keyword is present. For details about this | |
234 cycling, see also the variable `org-todo-interpretation' | |
235 Changes become only effective after restarting Emacs." | |
236 :group 'org-keywords | |
237 :type '(repeat (string :tag "Keyword"))) | |
238 | |
239 (defcustom org-todo-interpretation 'sequence | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
240 "Controls how TODO keywords are interpreted. |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
241 \\<org-mode-map>Possible values are `sequence' and `type'. |
58792 | 242 This variable is only relevant if `org-todo-keywords' contains more than two |
243 states. There are two ways how these keywords can be used: | |
244 | |
245 - As a sequence in the process of working on a TODO item, for example | |
246 (setq org-todo-keywords '(\"TODO\" \"STARTED\" \"VERIFY\" \"DONE\") | |
247 org-todo-interpretation 'sequence) | |
248 | |
249 - As different types of TODO items, for example | |
250 (setq org-todo-keywords '(\"URGENT\" \"RELAXED\" \"REMIND\" \"FOR_TOM\" \"DONE\") | |
251 org-todo-interpretation 'type) | |
252 | |
253 When the states are interpreted as a sequence, \\[org-todo] always cycles | |
254 to the next state, in order to walk through all different states. So with | |
255 \\[org-todo], you turn an empty entry into the state TODO. When you started | |
256 working on the item, you use \\[org-todo] again to switch it to \"STARTED\", | |
257 later to VERIFY and finally to DONE. | |
258 | |
259 When the states are interpreted as types, \\[org-todo] still cycles through | |
260 when it is called several times in direct succession, in order to initially | |
261 select the type. However, if not called immediately after a previous | |
262 \\[org-todo], it switches from each type directly to DONE. So with the | |
263 above example, you could use `\\[org-todo] \\[org-todo]' to label an entry | |
264 RELAXED. If you later return to this entry and press \\[org-todo] again, | |
265 RELAXED will not be changed REMIND, but directly to DONE. | |
266 | |
267 You can create a large number of types. To initially select a | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
268 type, it is then best to use \\[universal-argument] \\[org-todo] in order to specify the |
58792 | 269 type with completion. Of course, you can also type the keyword |
270 directly into the buffer. M-TAB completes TODO keywords at the | |
271 beginning of a headline." | |
272 :group 'org-keywords | |
273 :type '(choice (const sequence) | |
274 (const type))) | |
275 | |
276 (defcustom org-default-priority ?B | |
277 "The default priority of TODO items. | |
278 This is the priority an item get if no explicit priority is given." | |
279 :group 'org-keywords | |
280 :type 'character) | |
281 | |
282 (defcustom org-lowest-priority ?C | |
283 "The lowest priority of TODO items. A character like ?A, ?B etc." | |
284 :group 'org-keywords | |
285 :type 'character) | |
286 | |
287 (defcustom org-deadline-string "DEADLINE:" | |
288 "String to mark deadline entries. | |
289 A deadline is this string, followed by a time stamp. Should be a word, | |
290 terminated by a colon. You can insert a schedule keyword and | |
291 a timestamp with \\[org-deadline]. | |
292 Changes become only effective after restarting Emacs." | |
293 :group 'org-keywords | |
294 :type 'string) | |
295 | |
296 (defcustom org-scheduled-string "SCHEDULED:" | |
297 "String to mark scheduled TODO entries. | |
298 A schedule is this string, followed by a time stamp. Should be a word, | |
299 terminated by a colon. You can insert a schedule keyword and | |
300 a timestamp with \\[org-schedule]. | |
301 Changes become only effective after restarting Emacs." | |
302 :group 'org-keywords | |
303 :type 'string) | |
304 | |
305 (defcustom org-comment-string "COMMENT" | |
306 "Entries starting with this keyword will never be exported. | |
307 An entry can be toggled between COMMENT and normal with | |
308 \\[org-toggle-comment]. | |
309 Changes become only effective after restarting Emacs." | |
310 :group 'org-keywords | |
311 :type 'string) | |
312 | |
313 (defcustom org-after-todo-state-change-hook nil | |
314 "Hook which is run after the state of a TODO item was changed. | |
315 The new state (a string with a todo keyword, or nil) is available in the | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
316 Lisp variable `state'." |
58792 | 317 :group 'org-keywords |
318 :type 'hook) | |
319 | |
320 ;; Variables for pre-computed regular expressions, all buffer local | |
321 (defvar org-todo-kwd-priority-p nil | |
322 "Do TODO items have priorities?") | |
323 (make-variable-buffer-local 'org-todo-kwd-priority-p) | |
324 (defvar org-todo-kwd-max-priority nil | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
325 "Maximum priority of TODO items.") |
58792 | 326 (make-variable-buffer-local 'org-todo-kwd-max-priority) |
327 (defvar org-ds-keyword-length 12 | |
328 "Maximum length of the Deadline and SCHEDULED keywords.") | |
329 (make-variable-buffer-local 'org-ds-keyword-length) | |
330 (defvar org-done-string nil | |
331 "The last string in `org-todo-keywords', indicating an item is DONE.") | |
332 (make-variable-buffer-local 'org-done-string) | |
333 (defvar org-todo-regexp nil | |
334 "Matches any of the TODO state keywords.") | |
335 (make-variable-buffer-local 'org-todo-regexp) | |
336 (defvar org-not-done-regexp nil | |
337 "Matches any of the TODO state keywords except the last one.") | |
338 (make-variable-buffer-local 'org-not-done-regexp) | |
339 (defvar org-todo-line-regexp nil | |
340 "Matches a headline and puts TODO state into group 2 if present.") | |
341 (make-variable-buffer-local 'org-todo-line-regexp) | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
342 (defvar org-nl-done-regexp nil |
58792 | 343 "Matches newline followed by a headline with the DONE keyword.") |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
344 (make-variable-buffer-local 'org-nl-done-regexp) |
58792 | 345 (defvar org-looking-at-done-regexp nil |
346 "Matches the DONE keyword a point.") | |
347 (make-variable-buffer-local 'org-looking-at-done-regexp) | |
348 (defvar org-deadline-regexp nil | |
349 "Matches the DEADLINE keyword.") | |
350 (make-variable-buffer-local 'org-deadline-regexp) | |
351 (defvar org-deadline-time-regexp nil | |
352 "Matches the DEADLINE keyword together with a time stamp.") | |
353 (make-variable-buffer-local 'org-deadline-time-regexp) | |
354 (defvar org-deadline-line-regexp nil | |
355 "Matches the DEADLINE keyword and the rest of the line.") | |
356 (make-variable-buffer-local 'org-deadline-line-regexp) | |
357 (defvar org-scheduled-regexp nil | |
358 "Matches the SCHEDULED keyword.") | |
359 (make-variable-buffer-local 'org-scheduled-regexp) | |
360 (defvar org-scheduled-time-regexp nil | |
361 "Matches the SCHEDULED keyword together with a time stamp.") | |
362 (make-variable-buffer-local 'org-scheduled-time-regexp) | |
363 | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
364 (defvar org-category nil |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
365 "Variable used by org files to set a category for agenda display. |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
366 Such files should use a file variable to set it, for example |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
367 |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
368 -*- mode: org; org-category: \"ELisp\" |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
369 |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
370 If the file does not specify a category, the file's base name |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
371 is used instead.") |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
372 |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
373 (defun org-set-regexps-and-options () |
58792 | 374 "Precompute regular expressions for current buffer." |
375 (when (eq major-mode 'org-mode) | |
376 (let ((re (org-make-options-regexp | |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
377 '("CATEGORY" "SEQ_TODO" "PRI_TODO" "TYP_TODO" "STARTUP"))) |
58792 | 378 (splitre "[ \t]+") |
379 kwds int key value cat) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
380 (save-excursion |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
381 (save-restriction |
58792 | 382 (widen) |
383 (goto-char (point-min)) | |
384 (while (re-search-forward re nil t) | |
385 (setq key (match-string 1) value (match-string 2)) | |
386 (cond | |
387 ((equal key "CATEGORY") | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
388 (if (string-match "[ \t]+$" value) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
389 (setq value (replace-match "" t t value))) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
390 (setq cat (intern value))) |
58792 | 391 ((equal key "SEQ_TODO") |
392 (setq int 'sequence | |
393 kwds (append kwds (org-split-string value splitre)))) | |
394 ((equal key "PRI_TODO") | |
395 (setq int 'priority | |
396 kwds (append kwds (org-split-string value splitre)))) | |
397 ((equal key "TYP_TODO") | |
398 (setq int 'type | |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
399 kwds (append kwds (org-split-string value splitre)))) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
400 ((equal key "STARTUP") |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
401 (let ((opts (org-split-string value splitre)) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
402 (set '(("fold" org-startup-folded t) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
403 ("nofold" org-startup-folded nil) |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
404 ("content" org-startup-folded content) |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
405 ("dlcheck" org-startup-with-deadline-check t) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
406 ("nodlcheck" org-startup-with-deadline-check nil))) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
407 l var val) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
408 (while (setq l (assoc (pop opts) set)) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
409 (setq var (nth 1 l) val (nth 2 l)) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
410 (set (make-local-variable var) val))))) |
58792 | 411 ))) |
412 (and cat (set (make-local-variable 'org-category) cat)) | |
413 (and kwds (set (make-local-variable 'org-todo-keywords) kwds)) | |
414 (and int (set (make-local-variable 'org-todo-interpretation) int))) | |
415 ;; Compute the regular expressions and other local variables | |
416 (setq org-todo-kwd-priority-p (equal org-todo-interpretation 'priority) | |
417 org-todo-kwd-max-priority (1- (length org-todo-keywords)) | |
418 org-ds-keyword-length (+ 2 (max (length org-deadline-string) | |
419 (length org-scheduled-string))) | |
420 org-done-string | |
421 (nth (1- (length org-todo-keywords)) org-todo-keywords) | |
422 org-todo-regexp | |
423 (concat "\\<\\(" (mapconcat 'regexp-quote org-todo-keywords | |
424 "\\|") "\\)\\>") | |
425 org-not-done-regexp | |
426 (concat "\\<\\(" | |
427 (mapconcat 'regexp-quote | |
428 (nreverse (cdr (reverse org-todo-keywords))) | |
429 "\\|") | |
430 "\\)\\>") | |
431 org-todo-line-regexp | |
432 (concat "^\\(\\*+\\)[ \t]*\\(" | |
433 (mapconcat 'regexp-quote org-todo-keywords "\\|") | |
434 "\\)? *\\(.*\\)") | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
435 org-nl-done-regexp |
58792 | 436 (concat "[\r\n]\\*+[ \t]+" org-done-string "\\>") |
437 org-looking-at-done-regexp (concat "^" org-done-string "\\>") | |
438 org-deadline-regexp (concat "\\<" org-deadline-string) | |
439 org-deadline-time-regexp | |
440 (concat "\\<" org-deadline-string " *<\\([^>]+\\)>") | |
441 org-deadline-line-regexp | |
442 (concat "\\<\\(" org-deadline-string "\\).*") | |
443 org-scheduled-regexp | |
444 (concat "\\<" org-scheduled-string) | |
445 org-scheduled-time-regexp | |
446 (concat "\\<" org-scheduled-string " *<\\([^>]+\\)>")) | |
447 (org-set-font-lock-defaults))) | |
448 | |
449 (defgroup org-time nil | |
450 "Options concerning time stamps and deadlines in Org-mode." | |
451 :tag "Org Time" | |
452 :group 'org) | |
453 | |
454 (defcustom org-deadline-warning-days 30 | |
455 "No. of days before expiration during which a deadline becomes active. | |
456 This variable governs the display in the org file." | |
457 :group 'org-time | |
458 :type 'number) | |
459 | |
460 (defcustom org-popup-calendar-for-date-prompt t | |
461 "Non-nil means, pop up a calendar when prompting for a date. | |
462 In the calendar, the date can be selected with mouse-1. However, the | |
463 minibuffer will also be active, and you can simply enter the date as well. | |
464 When nil, only the minibuffer will be available." | |
465 :group 'org-time | |
466 :type 'number) | |
467 | |
468 (defcustom org-calendar-follow-timestamp-change t | |
469 "Non-nil means, make the calendar window follow timestamp changes. | |
470 When a timestamp is modified and the calendar window is visible, it will be | |
471 moved to the new date." | |
472 :group 'org-time | |
473 :type 'boolean) | |
474 | |
475 (defgroup org-agenda nil | |
476 "Options concerning agenda display Org-mode." | |
477 :tag "Org Agenda" | |
478 :group 'org) | |
479 | |
480 (defcustom org-agenda-files nil | |
481 "A list of org files for agenda/diary display. | |
482 Entries are added to this list with \\[org-add-file] and removed with | |
483 \\[org-remove-file]. You can also use customize to edit the list." | |
484 :group 'org-agenda | |
485 :type '(repeat file)) | |
486 | |
487 (defcustom org-select-timeline-window t | |
488 "Non-nil means, after creating a timeline, move cursor into Timeline window. | |
489 When nil, cursor will remain in the current window." | |
490 :group 'org-agenda | |
491 :type 'boolean) | |
492 | |
493 (defcustom org-select-agenda-window t | |
494 "Non-nil means, after creating an agenda, move cursor into Agenda window. | |
495 When nil, cursor will remain in the current window." | |
496 :group 'org-agenda | |
497 :type 'boolean) | |
498 | |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
499 (defcustom org-fit-agenda-window t |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
500 "Non-nil means, change window size of agenda to fit content." |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
501 :group 'org-agenda |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
502 :type 'boolean) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
503 |
58792 | 504 (defcustom org-agenda-show-all-dates t |
505 "Non-nil means, `org-agenda' shows every day in the selected range. | |
506 When nil, only the days which actually have entries are shown." | |
507 :group 'org-agenda | |
508 :type 'boolean) | |
509 | |
510 ;; FIXME: First day of month works only for current month because it would | |
511 ;; require a variable ndays treatment. | |
512 (defcustom org-agenda-start-on-weekday 1 | |
513 "Non-nil means, start the overview always on the specified weekday. | |
514 0 Denotes Sunday, 1 denotes Monday etc. | |
515 When nil, always start on the current day." | |
516 :group 'org-agenda | |
517 :type '(choice (const :tag "Today" nil) | |
518 (const :tag "First day of month" t) | |
519 (number :tag "Weekday No."))) | |
520 | |
521 (defcustom org-agenda-ndays 7 | |
522 "Number of days to include in overview display." | |
523 :group 'org-agenda | |
524 :type 'number) | |
525 | |
526 (defcustom org-agenda-include-all-todo t | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
527 "Non-nil means, the agenda will always contain all TODO entries. |
58792 | 528 When nil, date-less entries will only be shown if `org-agenda' is called |
529 with a prefix argument. | |
530 When non-nil, the TODO entries will be listed at the top of the agenda, before | |
531 the entries for specific days." | |
532 :group 'org-agenda | |
533 :type 'boolean) | |
534 | |
535 (defcustom org-agenda-include-diary nil | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
536 "If non-nil, include in the agenda entries from the Emacs Calendar's diary." |
58792 | 537 :group 'org-agenda |
538 :type 'boolean) | |
539 | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
540 (defcustom org-calendar-to-agenda-key [?c] |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
541 "The key to be installed in `calendar-mode-map' for switching to the agenda. |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
542 The command `org-calendar-goto-agenda' will be bound to this key. The |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
543 default is the character `c' because then`c' can be used to switch back and |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
544 force between agenda and calendar." |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
545 :group 'org-agenda |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
546 :type 'sexp) |
58792 | 547 |
548 (defcustom org-agenda-sorting-strategy '(time-up category-keep priority-down) | |
549 "Sorting structure for the agenda items of a single day. | |
550 This is a list of symbols which will be used in sequence to determine | |
551 if an entry should be listed before another entry. The following | |
552 symbols are recognized. | |
553 | |
554 time-up Put entries with time-of-day indications first, early first | |
555 time-down Put entries with time-of-day indications first, late first | |
556 category-keep Keep the default order of categories, corresponding to the | |
557 sequence in `org-agenda-files'. | |
558 category-up Sort alphabetically by category, A-Z. | |
559 category-down Sort alphabetically by category, Z-A. | |
560 priority-up Sort numerically by priority, high priority last. | |
561 priority-down Sort numerically by priority, high priority first. | |
562 | |
563 The different possibilities will be tried in sequence, and testing stops | |
564 if one comparison returns a \"not-equal\". For example, the default | |
565 '(time-up category-keep priority-down) | |
566 means: Pull out all entries having a specified time of day and sort them, | |
567 in order to make a time schedule for the current day the first thing in the | |
568 agenda listing for the day. Of the entries without a time indication, keep | |
569 the grouped in categories, don't sort the categories, but keep them in | |
570 the sequence given in `org-agenda-files'. Within each category sort by | |
571 priority. | |
572 | |
573 Leaving out the `category-keep' would mean that items will be sorted across | |
574 categories by priority." | |
575 :group 'org-agenda | |
576 :type '(repeat | |
577 (choice | |
578 (const time-up) | |
579 (const time-down) | |
580 (const category-keep) | |
581 (const category-up) | |
582 (const category-down) | |
583 (const priority-up) | |
584 (const priority-down)))) | |
585 | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
586 (defcustom org-agenda-prefix-format " %-12:c% s" |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
587 "Format specification for the prefix of items in the agenda buffer. |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
588 This format works similar to a printf format, with the following meaning: |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
589 |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
590 %c the category of the item, \"Diary\" for entries from the diary, or |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
591 as given by the CATEGORY keyword or derived from the file name. |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
592 %t the time-of-day specification if one applies to the entry, in the |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
593 format HH:MM |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
594 %s Scheduling/Deadline information, a short string |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
595 |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
596 In addition to the normal printf field modifiers like field width and |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
597 padding instructions, in this format you can also add an additional |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
598 punctuation or whitespace character just before the final format letter. |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
599 This character will be appended to the field value if the value is not |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
600 empty. For example, the format \"%-12:c\" leads to \"Diary: \" if |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
601 the category is \"Diary\". If the category were be empty, no additional |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
602 colon would be interted. |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
603 |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
604 Including `%t' in the format string leads to a double time specification |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
605 because the headline/diary item will contain the time specification as |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
606 well. However, using `%t' in the format will result in a canonical 24 |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
607 hour time specification at a consistent position in the prefix, while the |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
608 time specification in the headline/diary item may be at any position and in |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
609 various formats. |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
610 Example: |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
611 (setq org-agenda-prefix-format \" %-12:c% t% s\")" |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
612 :type 'string |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
613 :group 'org-agenda) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
614 |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
615 (defcustom org-timeline-prefix-format " % s" |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
616 "Like `org-agenda-prefix-format', but for the timeline of a single file." |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
617 :type 'string |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
618 :group 'org-agenda) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
619 |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
620 (defvar org-prefix-format-compiled nil |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
621 "The compiled version of `org-???-prefix-format'.") |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
622 |
58792 | 623 (defcustom org-sort-agenda-notime-is-late t |
624 "Non-nil means, items without time are considered late. | |
625 This is only relevant for sorting. When t, items which have no explicit | |
626 time like 15:30 will be considered as 24:01, i.e. later than any items which | |
627 do have a time. When nil, the default time is before 0:00." | |
628 :group 'org-agenda | |
629 :type 'boolean) | |
630 | |
631 (defgroup org-structure nil | |
632 "Options concerning structure editing in Org-mode." | |
633 :tag "Org Structure" | |
634 :group 'org) | |
635 | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
636 (defcustom org-cycle-hook '(org-optimize-window-after-visibility-change) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
637 "Hook that is run after `org-cycle' has changed the buffer visibility. |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
638 The function(s) in this hook must accept a single argument which indicates |
62076
4f2150e05f24
(org-get-entries-from-diary): Remove unused vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61924
diff
changeset
|
639 the new state that was set by the most recent `org-cycle' command. The |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
640 argument is a symbol. After a global state change, it can have the values |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
641 `overview', `content', or `all'. After a local state change, it can have |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
642 the values `folded', `children', or `subtree'." |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
643 :group 'org-structure |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
644 :type 'hook) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
645 |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
646 (defcustom org-occur-hook '(org-first-headline-recenter) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
647 "Hook that is run after `org-occur' has constructed a sparse tree. |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
648 This can be used to recenter the window to show as much of the structure |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
649 as possible." |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
650 :group 'org-structure |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
651 :type 'hook) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
652 |
58792 | 653 (defcustom org-adapt-indentation t |
654 "Non-nil means, adapt indentation when promoting and demoting. | |
655 When this is set and the *entire* text in an entry is indented, the | |
656 indentation is increased by one space in a demotion command, and | |
657 decreased by one in a promotion command. If any line in the entry | |
658 body starts at column 0, indentation is not changed at all." | |
659 :group 'org-structure | |
660 :type 'boolean) | |
661 | |
662 (defcustom org-cycle-emulate-tab t | |
663 "Where should `org-cycle' emulate TAB. | |
664 nil Never | |
665 white Only in completely white lines | |
666 t Everywhere except in headlines" | |
667 :group 'org-structure | |
668 :type '(choice (const :tag "Never" nil) | |
669 (const :tag "Only in completely white lines" white) | |
670 (const :tag "Everywhere except in headlines" t) | |
671 )) | |
672 | |
673 (defconst org-time-stamp-formats '("<%Y-%m-%d %a>" . "<%Y-%m-%d %a %H:%M>") | |
674 "Formats for `format-time-string' which are used for time stamps. | |
675 It is not recommended to change this constant.") | |
676 | |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
677 (defcustom org-show-following-heading t |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
678 "Non-nil means, show heading following match in `org-occur'. |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
679 When doing an `org-occur' it is useful to show the headline which |
62076
4f2150e05f24
(org-get-entries-from-diary): Remove unused vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61924
diff
changeset
|
680 follows the match, even if they do not match the regexp. This makes it |
4f2150e05f24
(org-get-entries-from-diary): Remove unused vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61924
diff
changeset
|
681 easier to edit directly inside the sparse tree. However, if you use |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
682 org-occur mainly as an overview, the following headlines are |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
683 unnecessary clutter." |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
684 :group 'org-structure |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
685 :type 'boolean) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
686 |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
687 |
58792 | 688 (defgroup org-link nil |
689 "Options concerning links in Org-mode." | |
690 :tag "Org Link" | |
691 :group 'org) | |
692 | |
693 (defcustom org-allow-space-in-links t | |
694 "Non-nil means, file names in links may contain space characters. | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
695 When nil, it becomes possible to put several links into a line. |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
696 Note that in tables, a link never extends accross fields, so in a table |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
697 it is always possible to put several links into a line. |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
698 Changing this varable requires a re-launch of Emacs of become effective." |
58792 | 699 :group 'org-link |
700 :type 'boolean) | |
701 | |
702 (defcustom org-line-numbers-in-file-links t | |
703 "Non-nil means, file links from `org-store-link' contain line numbers. | |
704 The line number will be added to the file name with :NNN and interpreted | |
705 by the command `org-open-at-point'. | |
706 Using a prefix arg to the command \\[org-store-link] (`org-store-link') | |
707 negates this setting for the duration of the command." | |
708 :group 'org-link | |
709 :type 'boolean) | |
710 | |
711 (defcustom org-keep-stored-link-after-insertion nil | |
712 "Non-nil means, keep link in list for entire session. | |
713 | |
714 The command `org-store-link' adds a link pointing to the current | |
62076
4f2150e05f24
(org-get-entries-from-diary): Remove unused vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61924
diff
changeset
|
715 location to an internal list. These links accumulate during a session. |
58792 | 716 The command `org-insert-link' can be used to insert links into any |
717 Org-mode file (offering completion for all stored links). When this | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
718 option is nil, every link which has been inserted once using \\[org-insert-link] |
58792 | 719 will be removed from the list, to make completing the unused links |
720 more efficient." | |
721 :group 'org-link | |
722 :type 'boolean) | |
723 | |
724 (defcustom org-link-frame-setup | |
725 '((vm . vm-visit-folder-other-frame) | |
726 (gnus . gnus-other-frame) | |
727 (file . find-file-other-window)) | |
728 "Setup the frame configuration for following links. | |
729 When following a link with Emacs, it may often be useful to display | |
730 this link in another window or frame. This variable can be used to | |
731 set this up for the different types of links. | |
732 For VM, use any of | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
733 `vm-visit-folder' |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
734 `vm-visit-folder-other-frame' |
58792 | 735 For Gnus, use any of |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
736 `gnus' |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
737 `gnus-other-frame' |
58792 | 738 For FILE, use any of |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
739 `find-file' |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
740 `find-file-other-window' |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
741 `find-file-other-frame' |
58792 | 742 For the calendar, use the variable `calendar-setup'. |
743 For BBDB, it is currently only possible to display the matches in | |
744 another window." | |
745 :group 'org-link | |
746 :type '(list | |
747 (cons (const vm) | |
748 (choice | |
749 (const vm-visit-folder) | |
750 (const vm-visit-folder-other-window) | |
751 (const vm-visit-folder-other-frame))) | |
752 (cons (const gnus) | |
753 (choice | |
754 (const gnus) | |
755 (const gnus-other-frame))) | |
756 (cons (const file) | |
757 (choice | |
758 (const find-file) | |
759 (const find-file-other-window) | |
760 (const find-file-other-frame))))) | |
761 | |
762 (defcustom org-usenet-links-prefer-google nil | |
763 "Non-nil means, `org-store-link' will create web links to google groups. | |
764 When nil, Gnus will be used for such links. | |
765 Using a prefix arg to the command \\[org-store-link] (`org-store-link') | |
766 negates this setting for the duration of the command." | |
767 :group 'org-link | |
768 :type 'boolean) | |
769 | |
770 (defcustom org-open-non-existing-files nil | |
771 "Non-nil means, `org-open-file' will open non-existing file. | |
772 When nil, an error will be generated." | |
773 :group 'org-link | |
774 :type 'boolean) | |
775 | |
776 (defcustom org-confirm-shell-links t | |
777 "Non-nil means, ask for confirmation before executing shell links. | |
778 The default is true, to keep new users from shooting into their own foot." | |
779 :group 'org-link | |
780 :type 'boolean) | |
781 | |
782 (defconst org-file-apps-defaults-linux | |
783 '((t . emacs) | |
784 ("jpg" . "xv %s") | |
785 ("gif" . "xv %s") | |
786 ("ppm" . "xv %s") | |
787 ("pgm" . "xv %s") | |
788 ("pbm" . "xv %s") | |
789 ("tif" . "xv %s") | |
790 ("png" . "xv %s") | |
791 ("ps" . "gv %s") | |
792 ("ps.gz" . "gv %s") | |
793 ("eps" . "gv %s") | |
794 ("eps.gz" . "gv %s") | |
795 ("dvi" . "xdvi %s") | |
796 ("mpeg" . "plaympeg %s") | |
797 ("mp3" . "plaympeg %s") | |
798 ("fig" . "xfig %s") | |
799 ("pdf" . "acroread %s") | |
800 ("doc" . "soffice %s") | |
801 ("ppt" . "soffice %s") | |
802 ("pps" . "soffice %s") | |
803 ("html" . "netscape -remote openURL(%s,new-window)") | |
804 ("htm" . "netscape -remote openURL(%s,new-window)") | |
805 ("xs" . "soffice %s")) | |
806 "Default file applications on a UNIX/LINUX system. | |
807 See `org-file-apps'.") | |
808 | |
809 (defconst org-file-apps-defaults-macosx | |
810 '((t . "open %s") | |
811 ("ps" . "gv %s") | |
812 ("ps.gz" . "gv %s") | |
813 ("eps" . "gv %s") | |
814 ("eps.gz" . "gv %s") | |
815 ("dvi" . "xdvi %s") | |
816 ("fig" . "xfig %s")) | |
817 "Default file applications on a MacOS X system. | |
818 The system \"open\" is known as a default, but we use X11 applications | |
819 for some files for which the OS does not have a good default. | |
820 See `org-file-apps'.") | |
821 | |
822 (defconst org-file-apps-defaults-windowsnt | |
823 '((t . (w32-shell-execute "open" file))) | |
824 "Default file applications on a Windows NT system. | |
825 The system \"open\" is used for most files. | |
826 See `org-file-apps'.") | |
827 | |
828 (defcustom org-file-apps | |
829 '( | |
830 ("txt" . emacs) | |
831 ("tex" . emacs) | |
832 ("ltx" . emacs) | |
833 ("org" . emacs) | |
834 ("el" . emacs) | |
835 ) | |
836 "External applications for opening `file:path' items in a document. | |
837 Org-mode uses system defaults for different file types, but | |
838 you can use this variable to set the application for a given file | |
839 extension. The entries in this list are cons cells with a file extension | |
840 and the corresponding command. Possible values for the command are: | |
841 `emacs' The file will be visited by the current Emacs process. | |
842 `default' Use the default application for this file type. | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
843 string A command to be executed by a shell; %s will be replaced |
58792 | 844 by the path to the file. |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
845 sexp A Lisp form which will be evaluated. The file path will |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
846 be available in the Lisp variable `file'. |
58792 | 847 For more examples, see the system specific constants |
848 `org-file-apps-defaults-macosx' | |
849 `org-file-apps-defaults-windowsnt' | |
850 `org-file-apps-defaults-linux'." | |
851 :group 'org-link | |
852 :type '(repeat | |
853 (cons (string :tag "Extension") | |
854 (choice :value "" | |
855 (const :tag "Visit with Emacs" 'emacs) | |
856 (const :tag "Use system default" 'default) | |
857 (string :tag "Command") | |
858 (sexp :tag "Lisp form"))))) | |
859 | |
860 | |
861 (defgroup org-remember nil | |
862 "Options concerning interaction with remember.el." | |
863 :tag "Org Remember" | |
864 :group 'org) | |
865 | |
866 (defcustom org-directory "~/org" | |
867 "Directory with org files. | |
868 This directory will be used as default to prompt for org files. | |
869 Used by the hooks for remember.el." | |
870 :group 'org-remember | |
871 :type 'directory) | |
872 | |
873 (defcustom org-default-notes-file "~/.notes" | |
874 "Default target for storing notes. | |
875 Used by the hooks for remember.el. This can be a string, or nil to mean | |
876 the value of `remember-data-file'." | |
877 :group 'org-remember | |
878 :type '(choice | |
879 (const :tag "Default from remember-data-file" nil) | |
880 file)) | |
881 | |
882 (defcustom org-reverse-note-order nil | |
883 "Non-nil means, store new notes at the beginning of a file or entry. | |
884 When nil, new notes will be filed to the end of a file or entry." | |
885 :group 'org-remember | |
886 :type '(choice | |
887 (const :tag "Reverse always" t) | |
888 (const :tag "Reverse never" nil) | |
889 (repeat :tag "By file name regexp" | |
890 (cons regexp boolean)))) | |
891 | |
892 (defgroup org-table nil | |
893 "Options concerning tables in Org-mode." | |
894 :tag "Org Table" | |
895 :group 'org) | |
896 | |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
897 (defcustom org-enable-table-editor 'optimized |
58792 | 898 "Non-nil means, lines starting with \"|\" are handled by the table editor. |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
899 When nil, such lines will be treated like ordinary lines. |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
900 |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
901 When equal to the symbol `optimized', the table editor will be optimized to |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
902 do the following |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
903 - Use automatic overwrite mode in front of whitespace in table fields. |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
904 This make the structure of the table stay in tact as long as the edited |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
905 field does not exceed the column width. |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
906 - Minimize the number of realigns. Normally, the table is aligned each time |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
907 TAB or RET are pressed to move to another field. With optimization this |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
908 happens only if changes to a field might have changed the column width. |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
909 Optimization requires replacing the functions `self-insert-command', |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
910 `delete-char', and `backward-delete-char' in Org-mode buffers, with a |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
911 slight (in fact: unnoticeable) speed impact for normal typing. Org-mode is |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
912 very good at guessing when a re-align will be necessary, but you can always |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
913 force one with `C-c C-c'. |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
914 |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
915 If you would like to use the optimized version in Org-mode, but the |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
916 un-optimized version in OrgTbl-mode, see the variable `orgtbl-optimized'. |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
917 |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
918 This variable can be used to turn on and off the table editor during a session, |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
919 but in order to toggle optimization, a restart is required." |
58792 | 920 :group 'org-table |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
921 :type '(choice |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
922 (const :tag "off" nil) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
923 (const :tag "on" t) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
924 (const :tag "on, optimized" optimized))) |
58792 | 925 |
926 (defcustom org-table-default-size "5x2" | |
927 "The default size for newly created tables, Columns x Rows." | |
928 :group 'org-table | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
929 :type 'string) |
58792 | 930 |
931 (defcustom org-table-automatic-realign t | |
932 "Non-nil means, automatically re-align table when pressing TAB or RETURN. | |
933 When nil, aligning is only done with \\[org-table-align], or after column | |
934 removal/insertion." | |
935 :group 'org-table | |
936 :type 'boolean) | |
937 | |
938 (defcustom org-table-spaces-around-separators '(1 . 1) | |
939 "The number of spaces to be placed before and after separators." | |
940 :group 'org-table | |
941 :type '(cons (number :tag "Before \"|\"") (number :tag " After \"|\""))) | |
942 | |
943 (defcustom org-table-spaces-around-invisible-separators '(1 . 2) | |
944 "The number of spaces to be placed before and after separators. | |
945 This option applies when the column separators have been made invisible." | |
946 :group 'org-table | |
947 :type '(cons (number :tag "Before \"|\"") (number :tag " After \"|\""))) | |
948 | |
949 (defcustom org-table-number-regexp "^[<>]?[-+^.0-9]*[0-9][-+^.0-9eEdDx()%]*$" | |
950 "Regular expression for recognizing numbers in table columns. | |
951 If a table column contains mostly numbers, it will be aligned to the | |
952 right. If not, it will be aligned to the left. | |
953 | |
954 The default value of this option is a regular expression which allows | |
955 anything which looks remotely like a number as used in scientific | |
956 context. For example, all of the following will be considered a | |
957 number: | |
958 12 12.2 2.4e-08 2x10^12 4.034+-0.02 2.7(10) >3.5 | |
959 | |
960 Other options offered by the customize interface are more restrictive." | |
961 :group 'org-table | |
962 :type '(choice | |
963 (const :tag "Positive Integers" | |
964 "^[0-9]+$") | |
965 (const :tag "Integers" | |
966 "^[-+]?[0-9]+$") | |
967 (const :tag "Floating Point Numbers" | |
968 "^[-+]?\\([0-9]*\\.[0-9]+\\|[0-9]+\\.[0-9]*\\)$") | |
969 (const :tag "Floating Point Number or Integer" | |
970 "^[-+]?\\([0-9]*\\.[0-9]+\\|[0-9]+\\.?[0-9]*\\)$") | |
971 (const :tag "Exponential, Floating point, Integer" | |
972 "^[-+]?[0-9.]+\\([eEdD][-+0-9]+\\)?$") | |
973 (const :tag "Very General Number-Like" | |
974 "^[<>]?[-+^.0-9]*[0-9][-+^.0-9eEdDx()%]*$") | |
975 (string :tag "Regexp:"))) | |
976 | |
977 (defcustom org-table-number-fraction 0.5 | |
978 "Fraction of numbers in a column required to make the column align right. | |
979 In a column all non-white fields are considered. If at least this | |
980 fraction of fields is matched by `org-table-number-fraction', | |
981 alignment to the right border applies." | |
982 :group 'org-table | |
983 :type 'number) | |
984 | |
985 (defcustom org-export-highlight-first-table-line t | |
986 "Non-nil means, highlight the first table line. | |
987 In HTML export, this means use <th> instead of <td>. | |
988 In tables created with table.el, this applies to the first table line. | |
989 In Org-mode tables, all lines before the first horizontal separator | |
990 line will be formatted with <th> tags." | |
991 :group 'org-table | |
992 :type 'boolean) | |
993 | |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
994 (defcustom org-table-copy-increment t |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
995 "Non-nil means, increment when copying current field with \\[org-table-copy-down]." |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
996 :group 'org-table |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
997 :type 'boolean) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
998 |
58792 | 999 (defcustom org-table-tab-recognizes-table.el t |
1000 "Non-nil means, TAB will automatically notice a table.el table. | |
1001 When it sees such a table, it moves point into it and - if necessary - | |
1002 calls `table-recognize-table'." | |
1003 :group 'org-table | |
1004 :type 'boolean) | |
1005 | |
1006 (defcustom org-export-prefer-native-exporter-for-tables nil | |
1007 "Non-nil means, always export tables created with table.el natively. | |
1008 Natively means, use the HTML code generator in table.el. | |
1009 When nil, Org-mode's own HTML generator is used when possible (i.e. if | |
1010 the table does not use row- or column-spanning). This has the | |
1011 advantage, that the automatic HTML conversions for math symbols and | |
1012 sub/superscripts can be applied. Org-mode's HTML generator is also | |
1013 much faster." | |
1014 :group 'org-table | |
1015 :type 'boolean) | |
1016 | |
1017 (defcustom org-enable-fixed-width-editor t | |
1018 "Non-nil means, lines starting with \":\" are treated as fixed-width. | |
1019 This currently only means, they are never auto-wrapped. | |
1020 When nil, such lines will be treated like ordinary lines." | |
1021 :group 'org-table | |
1022 :type 'boolean) | |
1023 | |
1024 (defgroup org-export nil | |
1025 "Options for exporting org-listings." | |
1026 :tag "Org Export" | |
1027 :group 'org) | |
1028 | |
1029 (defcustom org-export-language-setup | |
1030 '(("en" "Author" "Date" "Table of Contents") | |
1031 ("da" "Ophavsmand" "Dato" "Indhold") | |
1032 ("de" "Autor" "Datum" "Inhaltsverzeichnis") | |
1033 ("es" "Autor" "Fecha" "\xccndice") | |
1034 ("fr" "Auteur" "Date" "Table des Mati\xe8res") | |
1035 ("it" "Autore" "Data" "Indice") | |
1036 ("nl" "Auteur" "Datum" "Inhoudsopgave") | |
1037 ("nn" "Forfattar" "Dato" "Innhold") ;; nn = Norsk (nynorsk) | |
1038 ("sv" "F\xf6rfattarens" "Datum" "Inneh\xe5ll")) | |
1039 "Terms used in export text, translated to different languages. | |
1040 Use the variable `org-export-default-language' to set the language, | |
1041 or use the +OPTION lines for a per-file setting." | |
1042 :group 'org-export | |
1043 :type '(repeat | |
1044 (list | |
1045 (string :tag "HTML language tag") | |
1046 (string :tag "Author") | |
1047 (string :tag "Date") | |
1048 (string :tag "Table of Contents")))) | |
1049 | |
1050 (defcustom org-export-default-language "en" | |
1051 "The default language of HTML export, as a string. | |
1052 This should have an association in `org-export-language-setup'" | |
1053 :group 'org-export | |
1054 :type 'string) | |
1055 | |
1056 (defcustom org-export-headline-levels 3 | |
1057 "The last level which is still exported as a headline. | |
1058 Inferior levels will produce itemize lists when exported. | |
1059 Note that a numeric prefix argument to an exporter function overrides | |
1060 this setting. | |
1061 | |
1062 This option can also be set with the +OPTIONS line, e.g. \"H:2\"." | |
1063 :group 'org-export | |
1064 :type 'number) | |
1065 | |
1066 (defcustom org-export-with-section-numbers t | |
1067 "Non-nil means, add section numbers to headlines when exporting. | |
1068 | |
1069 This option can also be set with the +OPTIONS line, e.g. \"num:t\"." | |
1070 :group 'org-export | |
1071 :type 'boolean) | |
1072 | |
1073 (defcustom org-export-with-toc t | |
1074 "Non-nil means, create a table of contents in exported files. | |
1075 The TOC contains headlines with levels up to`org-export-headline-levels'. | |
1076 | |
1077 Headlines which contain any TODO items will be marked with \"(*)\" in | |
1078 ASCII export, and with red color in HTML output. | |
1079 | |
1080 In HTML output, the TOC will be clickable. | |
1081 | |
1082 This option can also be set with the +OPTIONS line, e.g. \"toc:nil\"." | |
1083 :group 'org-export | |
1084 :type 'boolean) | |
1085 | |
1086 (defcustom org-export-preserve-breaks nil | |
1087 "Non-nil means, preserve all line breaks when exporting. | |
1088 Normally, in HTML output paragraphs will be reformatted. In ASCII | |
1089 export, line breaks will always be preserved, regardless of this variable. | |
1090 | |
1091 This option can also be set with the +OPTIONS line, e.g. \"\\n:t\"." | |
1092 :group 'org-export | |
1093 :type 'boolean) | |
1094 | |
1095 (defcustom org-export-html-inline-images t | |
1096 "Non-nil means, inline images into exported HTML pages. | |
1097 The link will still be to the original location of the image file. | |
1098 So if you are moving the page, lets say to your public HTML site, | |
1099 you will have to move the image and maybe change the link." | |
1100 :group 'org-export | |
1101 :type 'boolean) | |
1102 | |
1103 (defcustom org-export-html-expand t | |
1104 "Non-nil means, for HTML export, treat @<...> as HTML tag. | |
1105 When nil, these tags will be exported as plain text and therefore | |
1106 not be interpreted by a browser. | |
1107 | |
1108 This option can also be set with the +OPTIONS line, e.g. \"@:nil\"." | |
1109 :group 'org-export | |
1110 :type 'boolean) | |
1111 | |
1112 (defcustom org-export-with-fixed-width t | |
1113 "Non-nil means, lines starting with \":\" will be in fixed width font. | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1114 This can be used to have pre-formatted text, fragments of code etc. For |
58792 | 1115 example |
1116 : ;; Some Lisp examples | |
1117 : (while (defc cnt) | |
1118 : (ding)) | |
1119 will be looking just like this in also HTML. In ASCII export, this option | |
1120 has no effect. | |
1121 | |
1122 This option can also be set with the +OPTIONS line, e.g. \"::nil\"." | |
1123 :group 'org-export | |
1124 :type 'boolean) | |
1125 | |
1126 (defcustom org-export-with-tables t | |
62076
4f2150e05f24
(org-get-entries-from-diary): Remove unused vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61924
diff
changeset
|
1127 "If non-nil, lines starting with \"|\" define a table. |
58792 | 1128 For example: |
1129 | |
1130 | Name | Address | Birthday | | |
1131 |-------------+----------+-----------| | |
1132 | Arthur Dent | England | 29.2.2100 | | |
1133 | |
1134 In ASCII export, this option has no effect. | |
1135 | |
1136 This option can also be set with the +OPTIONS line, e.g. \"|:nil\"." | |
1137 :group 'org-export | |
1138 :type 'boolean) | |
1139 | |
1140 (defcustom org-export-html-table-tag | |
1141 "<table border=1 cellspacing=0 cellpadding=6>" | |
1142 "The HTML tag used to start a table. | |
1143 This must be a <table> tag, but you may change the options like | |
1144 borders and spacing." | |
1145 :group 'org-export | |
1146 :type 'string) | |
1147 | |
1148 (defcustom org-export-with-emphasize t | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1149 "Non-nil means, interpret *word*, /word/, and _word_ as emphasized text. |
58792 | 1150 If the export target supports emphasizing text, the word will be |
1151 typeset in bold, italic, or underlined, respectively. Works only for | |
1152 single words, but you can say: I *really* *mean* *this*. | |
1153 In ASCII export, this option has no effect. | |
1154 | |
1155 This option can also be set with the +OPTIONS line, e.g. \"*:nil\"." | |
1156 :group 'org-export | |
1157 :type 'boolean) | |
1158 | |
1159 (defcustom org-match-sexp-depth 3 | |
1160 "Number of stacked braces for sub/superscript matching. | |
1161 This has to be set before loading org.el to be effective." | |
1162 :group 'org-export | |
1163 :type 'integer) | |
1164 | |
1165 ;; FIXME: Should () parens be removed as well in sub/superscripts? | |
1166 (defcustom org-export-with-sub-superscripts t | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1167 "Non-nil means, interpret \"_\" and \"^\" for export. |
58792 | 1168 When this option is turned on, you can use TeX-like syntax for sub- and |
1169 superscripts. Several characters after \"_\" or \"^\" will be | |
1170 considered as a single item - so grouping with {} is normally not | |
1171 needed. For example, the following things will be parsed as single | |
1172 sub- or superscripts. | |
1173 | |
1174 10^24 or 10^tau several digits will be considered 1 item | |
1175 10^-12 or 10^-tau a leading sign with digits or a word | |
1176 x^2-y^3 will be read as x^2 - y^3, because items are | |
1177 terminated by almost any nonword/nondigit char. | |
1178 x_{i^2} or x^(2-i) braces or parenthesis do grouping. | |
1179 | |
1180 Still, ambiguity is possible - so when in doubt use {} to enclose the | |
1181 sub/superscript. | |
1182 In ASCII export, this option has no effect. | |
1183 | |
1184 This option can also be set with the +OPTIONS line, e.g. \"^:nil\"." | |
1185 :group 'org-export | |
1186 :type 'boolean) | |
1187 | |
1188 (defcustom org-export-with-TeX-macros t | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1189 "Non-nil means, interpret simple TeX-like macros when exporting. |
58792 | 1190 For example, HTML export converts \\alpha to α and \\AA to Å. |
1191 No only real TeX macros will work here, but the standard HTML entities | |
1192 for math can be used as macro names as well. For a list of supported | |
1193 names in HTML export, see the constant `org-html-entities'. | |
1194 In ASCII export, this option has no effect. | |
1195 | |
1196 This option can also be set with the +OPTIONS line, e.g. \"TeX:nil\"." | |
1197 :group 'org-export | |
1198 :type 'boolean) | |
1199 | |
1200 (defcustom org-export-html-with-timestamp nil | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1201 "If non-nil, write `org-export-html-html-helper-timestamp' |
58792 | 1202 into the exported html text. Otherwise, the buffer will just be saved |
1203 to a file." | |
1204 :group 'org-export | |
1205 :type 'boolean) | |
1206 | |
1207 (defcustom org-export-html-html-helper-timestamp | |
1208 "<br><br><hr><p><!-- hhmts start --> <!-- hhmts end -->\n" | |
1209 "The HTML tag used as timestamp delimiter for HTML-helper-mode." | |
1210 :group 'org-export | |
1211 :type 'string) | |
1212 | |
1213 (defcustom org-export-ascii-show-new-buffer t | |
1214 "Non-nil means, popup buffer containing the exported ASCII text. | |
1215 Otherwise the buffer will just be saved to a file and stay hidden." | |
1216 :group 'org-export | |
1217 :type 'boolean) | |
1218 | |
1219 (defcustom org-export-html-show-new-buffer nil | |
1220 "Non-nil means, popup buffer containing the exported html text. | |
1221 Otherwise, the buffer will just be saved to a file and stay hidden." | |
1222 :group 'org-export | |
1223 :type 'boolean) | |
1224 | |
1225 | |
1226 (defgroup org-faces nil | |
1227 "Faces for highlighting in Org-mode." | |
1228 :tag "Org Faces" | |
1229 :group 'org) | |
1230 | |
1231 (defface org-level-1-face ;; font-lock-function-name-face | |
1232 '((((type tty) (class color)) (:foreground "blue" :weight bold)) | |
1233 (((class color) (background light)) (:foreground "Blue")) | |
1234 (((class color) (background dark)) (:foreground "LightSkyBlue")) | |
1235 (t (:inverse-video t :bold t))) | |
1236 "Face used for level 1 headlines." | |
1237 :group 'org-faces) | |
1238 | |
1239 (defface org-level-2-face ;; font-lock-variable-name-face | |
1240 '((((type tty) (class color)) (:foreground "yellow" :weight light)) | |
1241 (((class color) (background light)) (:foreground "DarkGoldenrod")) | |
1242 (((class color) (background dark)) (:foreground "LightGoldenrod")) | |
1243 (t (:bold t :italic t))) | |
1244 "Face used for level 2 headlines." | |
1245 :group 'org-faces) | |
1246 | |
1247 (defface org-level-3-face ;; font-lock-keyword-face | |
1248 '((((type tty) (class color)) (:foreground "cyan" :weight bold)) | |
1249 (((class color) (background light)) (:foreground "Purple")) | |
1250 (((class color) (background dark)) (:foreground "Cyan")) | |
1251 (t (:bold t))) | |
1252 "Face used for level 3 headlines." | |
1253 :group 'org-faces) | |
1254 | |
1255 (defface org-level-4-face ;; font-lock-comment-face | |
1256 '((((type tty pc) (class color) (background light)) (:foreground "red")) | |
1257 (((type tty pc) (class color) (background dark)) (:foreground "red1")) | |
1258 (((class color) (background light)) (:foreground "Firebrick")) | |
1259 (((class color) (background dark)) (:foreground "chocolate1")) | |
1260 (t (:bold t :italic t))) | |
1261 "Face used for level 4 headlines." | |
1262 :group 'org-faces) | |
1263 | |
1264 (defface org-level-5-face ;; font-lock-type-face | |
1265 '((((type tty) (class color)) (:foreground "green")) | |
1266 (((class color) (background light)) (:foreground "ForestGreen")) | |
1267 (((class color) (background dark)) (:foreground "PaleGreen")) | |
1268 (t (:bold t :underline t))) | |
1269 "Face used for level 5 headlines." | |
1270 :group 'org-faces) | |
1271 | |
1272 (defface org-level-6-face ;; font-lock-constant-face | |
1273 '((((type tty) (class color)) (:foreground "magenta")) | |
1274 (((class color) (background light)) (:foreground "CadetBlue")) | |
1275 (((class color) (background dark)) (:foreground "Aquamarine")) | |
1276 (t (:bold t :underline t))) | |
1277 "Face used for level 6 headlines." | |
1278 :group 'org-faces) | |
1279 | |
1280 (defface org-level-7-face ;; font-lock-builtin-face | |
1281 '((((type tty) (class color)) (:foreground "blue" :weight light)) | |
1282 (((class color) (background light)) (:foreground "Orchid")) | |
1283 (((class color) (background dark)) (:foreground "LightSteelBlue")) | |
1284 (t (:bold t))) | |
1285 "Face used for level 7 headlines." | |
1286 :group 'org-faces) | |
1287 | |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
1288 (defface org-level-8-face ;; font-lock-string-face |
58792 | 1289 '((((type tty) (class color)) (:foreground "green")) |
1290 (((class color) (background light)) (:foreground "RosyBrown")) | |
1291 (((class color) (background dark)) (:foreground "LightSalmon")) | |
1292 (t (:italic t))) | |
1293 "Face used for level 8 headlines." | |
1294 :group 'org-faces) | |
1295 | |
1296 (defface org-warning-face ;; font-lock-warning-face | |
1297 '((((type tty) (class color)) (:foreground "red")) | |
1298 (((class color) (background light)) (:foreground "Red" :bold t)) | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1299 (((class color) (background dark)) (:foreground "Red1" :bold t)) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1300 ; (((class color) (background dark)) (:foreground "Pink" :bold t)) |
58792 | 1301 (t (:inverse-video t :bold t))) |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1302 "Face for deadlines and TODO keywords." |
58792 | 1303 :group 'org-faces) |
1304 | |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
1305 (defcustom org-fontify-done-headline nil |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
1306 "Non-nil means, change the face of a headline if it is marked DONE. |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
1307 Normally, only the TODO/DONE keyword indicates the state of a headline. |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
1308 When this is non-nil, the headline after the keyword is set to the |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
1309 `org-headline-done-face' as an additional indication." |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
1310 :group 'org-faces |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
1311 :type 'boolean) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
1312 |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
1313 (defface org-headline-done-face ;; font-lock-string-face |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
1314 '((((type tty) (class color)) (:foreground "green")) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
1315 (((class color) (background light)) (:foreground "RosyBrown")) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
1316 (((class color) (background dark)) (:foreground "LightSalmon")) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
1317 (t (:italic t))) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
1318 "Face used to indicate that a headline is DONE. See also the variable |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
1319 `org-fontify-done-headline'." |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
1320 :group 'org-faces) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
1321 |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
1322 ;; Inheritance does not yet work for xemacs. So we just copy... |
58792 | 1323 |
1324 (defface org-deadline-announce-face | |
1325 '((((type tty) (class color)) (:foreground "blue" :weight bold)) | |
1326 (((class color) (background light)) (:foreground "Blue")) | |
1327 (((class color) (background dark)) (:foreground "LightSkyBlue")) | |
1328 (t (:inverse-video t :bold t))) | |
1329 "Face for upcoming deadlines." | |
1330 :group 'org-faces) | |
1331 | |
1332 (defface org-scheduled-today-face | |
1333 '((((type tty) (class color)) (:foreground "green")) | |
1334 (((class color) (background light)) (:foreground "DarkGreen")) | |
1335 (((class color) (background dark)) (:foreground "PaleGreen")) | |
1336 (t (:bold t :underline t))) | |
1337 "Face for items scheduled for a certain day." | |
1338 :group 'org-faces) | |
1339 | |
1340 (defface org-scheduled-previously-face | |
1341 '((((type tty pc) (class color) (background light)) (:foreground "red")) | |
1342 (((type tty pc) (class color) (background dark)) (:foreground "red1")) | |
1343 (((class color) (background light)) (:foreground "Firebrick")) | |
1344 (((class color) (background dark)) (:foreground "chocolate1")) | |
1345 (t (:bold t :italic t))) | |
1346 "Face for items scheduled previously, and not yet done." | |
1347 :group 'org-faces) | |
1348 | |
1349 (defface org-link-face | |
1350 '((((type tty) (class color)) (:foreground "cyan" :weight bold)) | |
1351 (((class color) (background light)) (:foreground "Purple")) | |
1352 (((class color) (background dark)) (:foreground "Cyan")) | |
1353 (t (:bold t))) | |
1354 "Face for links." | |
1355 :group 'org-faces) | |
1356 | |
1357 (defface org-done-face ;; font-lock-type-face | |
1358 '((((type tty) (class color)) (:foreground "green")) | |
1359 (((class color) (background light)) (:foreground "ForestGreen" :bold t)) | |
1360 (((class color) (background dark)) (:foreground "PaleGreen" :bold t)) | |
1361 (t (:bold t :underline t))) | |
1362 "Face used for DONE." | |
1363 :group 'org-faces) | |
1364 | |
1365 (defface org-table-face ;; font-lock-function-name-face | |
1366 '((((type tty) (class color)) (:foreground "blue" :weight bold)) | |
1367 (((class color) (background light)) (:foreground "Blue")) | |
1368 (((class color) (background dark)) (:foreground "LightSkyBlue")) | |
1369 (t (:inverse-video t :bold t))) | |
1370 "Face used for tables." | |
1371 :group 'org-faces) | |
1372 | |
1373 (defvar org-level-faces | |
1374 '( | |
1375 org-level-1-face | |
1376 org-level-2-face | |
1377 org-level-3-face | |
1378 org-level-4-face | |
1379 org-level-5-face | |
1380 org-level-6-face | |
1381 org-level-7-face | |
1382 org-level-8-face | |
1383 )) | |
1384 (defvar org-n-levels (length org-level-faces)) | |
1385 | |
1386 ;; Tell the compiler about dynamically scoped variables, | |
1387 ;; and variables from other packages | |
1388 (eval-when-compile | |
1389 (defvar zmacs-regions) | |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
1390 (defvar original-date) |
58792 | 1391 (defvar org-transient-mark-mode) |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
1392 (defvar org-old-auto-fill-inhibit-regexp) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
1393 (defvar orgtbl-mode-menu) |
58792 | 1394 (defvar org-html-entities) |
1395 (defvar org-goto-start-pos) | |
1396 (defvar org-cursor-color) | |
1397 (defvar org-time-was-given) | |
1398 (defvar org-ts-what) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1399 (defvar mark-active) |
58792 | 1400 (defvar timecnt) |
1401 (defvar levels-open) | |
1402 (defvar title) | |
1403 (defvar author) | |
1404 (defvar email) | |
1405 (defvar text) | |
1406 (defvar entry) | |
1407 (defvar date) | |
1408 (defvar language) | |
1409 (defvar options) | |
1410 (defvar ans1) | |
1411 (defvar ans2) | |
1412 (defvar starting-day) | |
1413 (defvar include-all-loc) | |
1414 (defvar vm-message-pointer) | |
1415 (defvar vm-folder-directory) | |
1416 (defvar wl-summary-buffer-elmo-folder) | |
1417 (defvar wl-summary-buffer-folder-name) | |
1418 (defvar gnus-group-name) | |
1419 (defvar gnus-article-current) | |
1420 (defvar w3m-current-url) | |
1421 (defvar org-selected-point) | |
1422 (defvar calendar-mode-map) | |
1423 (defvar remember-save-after-remembering) | |
1424 (defvar remember-data-file)) | |
1425 | |
1426 | |
1427 ;;; Define the mode | |
1428 | |
1429 (defvar org-mode-map (copy-keymap outline-mode-map) | |
1430 "Keymap for Org-mode.") | |
1431 | |
1432 (defvar org-struct-menu) | |
1433 (defvar org-org-menu) | |
1434 | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1435 ;; We use a before-change function to check if a table might need |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1436 ;; an update. |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1437 (defvar org-table-may-need-update t |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1438 "Indicates of a table might need an update. |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1439 This variable is set by `org-before-change-function'. `org-table-align' |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1440 sets it back to nil.") |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1441 |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1442 (defvar org-mode-hook nil) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1443 (defvar org-inhibit-startup nil) ; Dynamically-scoped param. |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1444 |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1445 |
58792 | 1446 ;;;###autoload |
1447 (defun org-mode (&optional arg) | |
1448 "Outline-based notes management and organizer, alias | |
1449 \"Carstens outline-mode for keeping track of everything.\" | |
1450 | |
1451 Org-mode develops organizational tasks around a NOTES file which | |
1452 contains information about projects as plain text. Org-mode is | |
1453 implemented on top of outline-mode, which is ideal to keep the content | |
1454 of large files well structured. It supports ToDo items, deadlines and | |
1455 time stamps, which magically appear in the diary listing of the Emacs | |
1456 calendar. Tables are easily created with a built-in table editor. | |
1457 Plain text URL-like links connect to websites, emails (VM), Usenet | |
1458 messages (Gnus), BBDB entries, and any files related to the project. | |
1459 For printing and sharing of notes, an Org-mode file (or a part of it) | |
1460 can be exported as a well-structured ASCII or HTML file. | |
1461 | |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
1462 The following commands are available: |
58792 | 1463 |
1464 \\{org-mode-map}" | |
1465 (interactive "P") | |
1466 (outline-mode) | |
1467 (setq major-mode 'org-mode) | |
1468 (setq mode-name "Org") | |
1469 (use-local-map org-mode-map) | |
1470 (easy-menu-add org-org-menu) | |
1471 (org-install-agenda-files-menu) | |
1472 (setq outline-regexp "\\*+") | |
1473 (if org-startup-truncated (setq truncate-lines t)) | |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
1474 (org-set-regexps-and-options) |
58792 | 1475 (set (make-local-variable 'font-lock-unfontify-region-function) |
1476 'org-unfontify-region) | |
1477 ;; Activate before-change-function | |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
1478 (set (make-local-variable 'org-table-may-need-update) t) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
1479 (make-local-hook 'before-change-functions) ;; needed for XEmacs |
58792 | 1480 (add-hook 'before-change-functions 'org-before-change-function nil |
1481 'local) | |
1482 ;; Inhibit auto-fill for headers, tables and fixed-width lines. | |
1483 (set (make-local-variable 'auto-fill-inhibit-regexp) | |
1484 (concat "\\*" | |
1485 (if (or org-enable-table-editor org-enable-fixed-width-editor) | |
1486 (concat | |
1487 "\\|[ \t]*[" | |
1488 (if org-enable-table-editor "|" "") | |
1489 (if org-enable-fixed-width-editor ":" "") | |
1490 "]")))) | |
1491 ;; Hook, and startup actions | |
1492 (if (or arg | |
1493 (and org-insert-mode-line-in-empty-file | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1494 (interactive-p) |
58792 | 1495 (= (point-min) (point-max)))) |
1496 (save-excursion | |
1497 (goto-char (point-min)) | |
1498 (insert " -*- mode: org -*-\n\n"))) | |
62076
4f2150e05f24
(org-get-entries-from-diary): Remove unused vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61924
diff
changeset
|
1499 (run-hooks 'org-mode-hook) ;FIXME: Should be run-mode-hooks. |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1500 (unless org-inhibit-startup |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1501 (if org-startup-with-deadline-check |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1502 (call-interactively 'org-check-deadlines) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1503 (cond |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1504 ((eq org-startup-folded t) |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1505 (org-cycle '(4))) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1506 ((eq org-startup-folded 'content) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1507 (let ((this-command 'org-cycle) (last-command 'org-cycle)) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1508 (org-cycle '(4)) (org-cycle '(4)))))))) |
58792 | 1509 |
1510 ;;; Font-Lock stuff | |
1511 | |
1512 (defvar org-mouse-map (make-sparse-keymap)) | |
1513 (define-key org-mouse-map | |
1514 (if org-xemacs-p [button2] [mouse-2]) 'org-open-at-mouse) | |
1515 (define-key org-mouse-map | |
1516 (if org-xemacs-p [button3] [mouse-3]) 'org-find-file-at-mouse) | |
1517 | |
1518 (require 'font-lock) | |
1519 | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1520 (defconst org-non-link-chars "\t\n\r|") |
58792 | 1521 (defconst org-link-regexp |
1522 (if org-allow-space-in-links | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1523 (concat |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1524 "\\(https?\\|ftp\\|mailto|\\|file\\|news\\|bbdb\\|vm\\|wl\\|rmail\\|gnus\\|shell\\):\\([^" org-non-link-chars "]+[^ " org-non-link-chars "]\\)") |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1525 (concat |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1526 "\\(https?\\|ftp\\|mailto\\|file\\|news\\|bbdb\\|vm\\|wl\\|rmail\\|gnus\\|shell\\):\\([^ " org-non-link-chars "]+\\)") |
58792 | 1527 ) |
1528 "Regular expression for matching links.") | |
1529 (defconst org-ts-lengths | |
1530 (cons (length (format-time-string (car org-time-stamp-formats))) | |
1531 (length (format-time-string (cdr org-time-stamp-formats)))) | |
1532 "This holds the lengths of the two different time formats.") | |
1533 (defconst org-ts-regexp "<\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}[^\r\n>]*\\)>" | |
1534 "Regular expression for fast time stamp matching.") | |
1535 (defconst org-ts-regexp1 "\\(\\([0-9]\\{4\\}\\)-\\([0-9]\\{2\\}\\)-\\([0-9]\\{2\\}\\)\\([^0-9>\r\n]*\\)\\(\\([0-9]\\{2\\}\\):\\([0-9]\\{2\\}\\)\\)?\\)" | |
1536 "Regular expression matching time strings for analysis.") | |
1537 (defconst org-ts-regexp2 (concat "<" org-ts-regexp1 ">") | |
1538 "Regular expression matching time stamps, with groups.") | |
1539 (defconst org-tr-regexp (concat org-ts-regexp "--?-?" org-ts-regexp) | |
1540 "Regular expression matching a time stamp range.") | |
1541 (defconst org-tsr-regexp (concat org-ts-regexp "\\(--?-?" | |
1542 org-ts-regexp "\\)?") | |
1543 "Regular expression matching a time stamp or time stamp range.") | |
1544 | |
1545 (defun org-activate-links (limit) | |
1546 "Run through the buffer and add overlays to links." | |
1547 (if (re-search-forward org-link-regexp limit t) | |
1548 (progn | |
1549 (add-text-properties (match-beginning 0) (match-end 0) | |
1550 (list 'mouse-face 'highlight | |
1551 'keymap org-mouse-map)) | |
1552 t))) | |
1553 | |
1554 (defun org-activate-dates (limit) | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1555 "Run through the buffer and add overlays to dates." |
58792 | 1556 (if (re-search-forward org-tsr-regexp limit t) |
1557 (progn | |
1558 (add-text-properties (match-beginning 0) (match-end 0) | |
1559 (list 'mouse-face 'highlight | |
1560 'keymap org-mouse-map)) | |
1561 t))) | |
1562 | |
1563 | |
1564 (defun org-font-lock-level () | |
1565 (save-excursion | |
1566 (org-back-to-heading t) | |
1567 (- (match-end 0) (match-beginning 0)))) | |
62076
4f2150e05f24
(org-get-entries-from-diary): Remove unused vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61924
diff
changeset
|
1568 |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1569 (defvar org-font-lock-keywords nil) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1570 |
58792 | 1571 (defun org-set-font-lock-defaults () |
1572 (let ((org-font-lock-extra-keywords | |
1573 (list | |
1574 '(org-activate-links (0 'org-link-face)) | |
1575 '(org-activate-dates (0 'org-link-face)) | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1576 (list (concat "^\\*+[ \t]*" org-not-done-regexp) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1577 '(1 'org-warning-face t)) |
58792 | 1578 (list (concat "\\[#[A-Z]\\]") '(0 'org-warning-face t)) |
1579 (list (concat "\\<" org-deadline-string) '(0 'org-warning-face t)) | |
1580 (list (concat "\\<" org-scheduled-string) '(0 'org-warning-face t)) | |
1581 ;; '("\\(\\s-\\|^\\)\\(\\*\\([a-zA-Z]+\\)\\*\\)\\([^a-zA-Z*]\\|$\\)" | |
1582 ;; (3 'bold)) | |
1583 ;; '("\\(\\s-\\|^\\)\\(/\\([a-zA-Z]+\\)/\\)\\([^a-zA-Z*]\\|$\\)" | |
1584 ;; (3 'italic)) | |
1585 ;; '("\\(\\s-\\|^\\)\\(_\\([a-zA-Z]+\\)_\\)\\([^a-zA-Z*]\\|$\\)" | |
1586 ;; (3 'underline)) | |
1587 '("\\<FIXME\\>" (0 'org-warning-face t)) | |
1588 (list (concat "^\\*+[ \t]*\\<\\(" org-comment-string "\\)\\>") | |
1589 '(1 'org-warning-face t)) | |
1590 '("^#.*" (0 'font-lock-comment-face t)) | |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
1591 (if org-fontify-done-headline |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
1592 (list (concat "^[*]+ +\\<\\(" org-done-string "\\)\\(.*\\)\\>") |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
1593 '(1 'org-done-face t) '(2 'org-headline-done-face t)) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
1594 (list (concat "^[*]+ +\\<\\(" org-done-string "\\)\\>") |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
1595 '(1 'org-done-face t))) |
58792 | 1596 '("^[ \t]*\\(\\(|\\|\\+-[-+]\\).*\\S-\\)" |
1597 (1 'org-table-face t)) | |
1598 '("^[ \t]*\\(:.*\\)" (1 'org-table-face t))))) | |
1599 (set (make-local-variable 'org-font-lock-keywords) | |
1600 (append | |
1601 (if org-noutline-p ; FIXME: I am not sure if eval will work | |
1602 ; on XEmacs if noutline is ever ported | |
1603 '((eval . (list "^\\(\\*+\\).*" | |
1604 0 '(nth | |
1605 (% (- (match-end 1) (match-beginning 1) 1) | |
1606 org-n-levels) | |
1607 org-level-faces) | |
1608 nil t))) | |
1609 '(("^\\(\\(\\*+\\)[^\r\n]*\\)[\n\r]" | |
1610 (1 (nth (% (- (match-end 2) (match-beginning 2) 1) | |
1611 org-n-levels) | |
1612 org-level-faces) | |
1613 nil t)))) | |
1614 org-font-lock-extra-keywords)) | |
1615 (set (make-local-variable 'font-lock-defaults) | |
1616 '(org-font-lock-keywords t nil nil backward-paragraph)) | |
1617 (kill-local-variable 'font-lock-keywords) nil)) | |
1618 | |
1619 (defun org-unfontify-region (beg end &optional maybe_loudly) | |
1620 "Remove fontification and activation overlays from links." | |
1621 (font-lock-default-unfontify-region beg end) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1622 (let* ((buffer-undo-list t) |
58792 | 1623 (inhibit-read-only t) (inhibit-point-motion-hooks t) |
1624 (inhibit-modification-hooks t) | |
1625 deactivate-mark buffer-file-name buffer-file-truename) | |
1626 (remove-text-properties beg end '(mouse-face nil keymap nil)))) | |
1627 | |
1628 ;;; Visibility cycling | |
1629 | |
1630 (defvar org-cycle-global-status nil) | |
1631 (defvar org-cycle-subtree-status nil) | |
1632 (defun org-cycle (&optional arg) | |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
1633 "Visibility cycling for Org-mode. |
58792 | 1634 |
1635 - When this function is called with a prefix argument, rotate the entire | |
1636 buffer through 3 states (global cycling) | |
1637 1. OVERVIEW: Show only top-level headlines. | |
1638 2. CONTENTS: Show all headlines of all levels, but no body text. | |
1639 3. SHOW ALL: Show everything. | |
1640 | |
1641 - When point is at the beginning of a headline, rotate the subtree started | |
1642 by this line through 3 different states (local cycling) | |
1643 1. FOLDED: Only the main headline is shown. | |
1644 2. CHILDREN: The main headline and the direct children are shown. From | |
1645 this state, you can move to one of the children and | |
1646 zoom in further. | |
1647 3. SUBTREE: Show the entire subtree, including body text. | |
1648 | |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
1649 - When there is a numeric prefix, go ARG levels up and do a `show-subtree', |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
1650 keeping cursor position. |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
1651 |
58792 | 1652 - When point is not at the beginning of a headline, execute |
1653 `indent-relative', like TAB normally does. See the option | |
1654 `org-cycle-emulate-tab' for details. | |
1655 | |
1656 - Special case: if point is the the beginning of the buffer and there is | |
1657 no headline in line 1, this function will act as if called with prefix arg." | |
1658 (interactive "P") | |
1659 | |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
1660 (if (or (and (bobp) (not (looking-at outline-regexp))) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
1661 (equal arg '(4))) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
1662 ;; special case: use global cycling |
58792 | 1663 (setq arg t)) |
1664 | |
1665 (cond | |
1666 | |
1667 ((org-at-table-p 'any) | |
1668 ;; Enter the table or move to the next field in the table | |
1669 (or (org-table-recognize-table.el) | |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
1670 (progn |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
1671 (org-table-justify-field-maybe) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
1672 (org-table-next-field)))) |
58792 | 1673 |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
1674 ((eq arg t) ;; Global cycling |
58792 | 1675 |
1676 (cond | |
1677 ((and (eq last-command this-command) | |
1678 (eq org-cycle-global-status 'overview)) | |
1679 ;; We just created the overview - now do table of contents | |
1680 ;; This can be slow in very large buffers, so indicate action | |
1681 (message "CONTENTS...") | |
1682 (save-excursion | |
1683 ;; Visit all headings and show their offspring | |
1684 (goto-char (point-max)) | |
1685 (catch 'exit | |
1686 (while (and (progn (condition-case nil | |
1687 (outline-previous-visible-heading 1) | |
1688 (error (goto-char (point-min)))) | |
1689 t) | |
1690 (looking-at outline-regexp)) | |
1691 (show-branches) | |
1692 (if (bobp) (throw 'exit nil)))) | |
1693 (message "CONTENTS...done")) | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1694 (setq org-cycle-global-status 'contents) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1695 (run-hook-with-args 'org-cycle-hook 'contents)) |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
1696 |
58792 | 1697 ((and (eq last-command this-command) |
1698 (eq org-cycle-global-status 'contents)) | |
1699 ;; We just showed the table of contents - now show everything | |
1700 (show-all) | |
1701 (message "SHOW ALL") | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1702 (setq org-cycle-global-status 'all) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1703 (run-hook-with-args 'org-cycle-hook 'all)) |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
1704 |
58792 | 1705 (t |
1706 ;; Default action: go to overview | |
1707 (hide-sublevels 1) | |
1708 (message "OVERVIEW") | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1709 (setq org-cycle-global-status 'overview) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1710 (run-hook-with-args 'org-cycle-hook 'overview)))) |
58792 | 1711 |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
1712 ((integerp arg) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
1713 ;; Show-subtree, ARG levels up from here. |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
1714 (save-excursion |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
1715 (org-back-to-heading) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
1716 (outline-up-heading arg) |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1717 (org-show-subtree))) |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
1718 |
58792 | 1719 ((save-excursion (beginning-of-line 1) (looking-at outline-regexp)) |
1720 ;; At a heading: rotate between three different views | |
1721 (org-back-to-heading) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1722 (let ((goal-column 0) eoh eol eos) |
58792 | 1723 ;; First, some boundaries |
1724 (save-excursion | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1725 (org-back-to-heading) |
58792 | 1726 (save-excursion |
1727 (beginning-of-line 2) | |
1728 (while (and (not (eobp)) ;; this is like `next-line' | |
1729 (get-char-property (1- (point)) 'invisible)) | |
1730 (beginning-of-line 2)) (setq eol (point))) | |
1731 (outline-end-of-heading) (setq eoh (point)) | |
1732 (outline-end-of-subtree) (setq eos (point)) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1733 (outline-next-heading)) |
58792 | 1734 ;; Find out what to do next and set `this-command' |
1735 (cond | |
1736 ((= eos eoh) | |
1737 ;; Nothing is hidden behind this heading | |
1738 (message "EMPTY ENTRY") | |
1739 (setq org-cycle-subtree-status nil)) | |
1740 ((>= eol eos) | |
1741 ;; Entire subtree is hidden in one line: open it | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1742 (org-show-entry) |
58792 | 1743 (show-children) |
1744 (message "CHILDREN") | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1745 (setq org-cycle-subtree-status 'children) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1746 (run-hook-with-args 'org-cycle-hook 'children)) |
58792 | 1747 ((and (eq last-command this-command) |
1748 (eq org-cycle-subtree-status 'children)) | |
1749 ;; We just showed the children, now show everything. | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1750 (org-show-subtree) |
58792 | 1751 (message "SUBTREE") |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1752 (setq org-cycle-subtree-status 'subtree) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1753 (run-hook-with-args 'org-cycle-hook 'subtree)) |
58792 | 1754 (t |
1755 ;; Default action: hide the subtree. | |
1756 (hide-subtree) | |
1757 (message "FOLDED") | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1758 (setq org-cycle-subtree-status 'folded) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1759 (run-hook-with-args 'org-cycle-hook 'folded))))) |
58792 | 1760 |
1761 ;; TAB emulation | |
1762 (buffer-read-only (org-back-to-heading)) | |
1763 ((if (and (eq org-cycle-emulate-tab 'white) | |
1764 (save-excursion (beginning-of-line 1) (looking-at "[ \t]+$"))) | |
1765 t | |
1766 (eq org-cycle-emulate-tab t)) | |
1767 (if (and (looking-at "[ \n\r\t]") | |
1768 (string-match "^[ \t]*$" (buffer-substring | |
1769 (point-at-bol) (point)))) | |
1770 (progn | |
1771 (beginning-of-line 1) | |
1772 (and (looking-at "[ \t]+") (replace-match "")))) | |
1773 (indent-relative)) | |
1774 | |
1775 (t (save-excursion | |
1776 (org-back-to-heading) | |
1777 (org-cycle))))) | |
1778 | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1779 (defun org-optimize-window-after-visibility-change (state) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1780 "Adjust the window after a change in outline visibility. |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1781 This function is the default value of the hook `org-cycle-hook'." |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1782 (cond |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1783 ((eq state 'overview) (org-first-headline-recenter 1)) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1784 ((eq state 'content) nil) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1785 ((eq state 'all) nil) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1786 ((eq state 'folded) nil) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1787 ((eq state 'children) (or (org-subtree-end-visible-p) (recenter 1))) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1788 ((eq state 'subtree) (or (org-subtree-end-visible-p) (recenter 1))))) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1789 |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1790 (defun org-subtree-end-visible-p () |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1791 "Is the end of the current subtree visible?" |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1792 (pos-visible-in-window-p |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1793 (save-excursion (outline-end-of-subtree) (point)))) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1794 |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1795 (defun org-first-headline-recenter (&optional N) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1796 "Move cursor to the first headline and recenter the headline. |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1797 Optional argument N means, put the headline into the Nth line of the window." |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1798 (goto-char (point-min)) |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1799 (when (re-search-forward (concat "^" outline-regexp) nil t) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1800 (beginning-of-line) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1801 (recenter (prefix-numeric-value N)))) |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1802 |
58792 | 1803 (defvar org-goto-window-configuration nil) |
1804 (defvar org-goto-marker nil) | |
1805 (defvar org-goto-map (make-sparse-keymap)) | |
1806 (let ((cmds '(isearch-forward isearch-backward)) cmd) | |
1807 (while (setq cmd (pop cmds)) | |
1808 (substitute-key-definition cmd cmd org-goto-map global-map))) | |
1809 (define-key org-goto-map [(return)] 'org-goto-ret) | |
1810 (define-key org-goto-map [(left)] 'org-goto-left) | |
1811 (define-key org-goto-map [(right)] 'org-goto-right) | |
1812 (define-key org-goto-map [(?q)] 'org-goto-quit) | |
1813 (define-key org-goto-map [(control ?g)] 'org-goto-quit) | |
1814 (define-key org-goto-map [(tab)] 'org-cycle) | |
1815 (define-key org-goto-map [(down)] 'outline-next-visible-heading) | |
1816 (define-key org-goto-map [(up)] 'outline-previous-visible-heading) | |
1817 (define-key org-goto-map "n" 'outline-next-visible-heading) | |
1818 (define-key org-goto-map "p" 'outline-previous-visible-heading) | |
1819 (define-key org-goto-map "f" 'outline-forward-same-level) | |
1820 (define-key org-goto-map "b" 'outline-backward-same-level) | |
1821 (define-key org-goto-map "u" 'outline-up-heading) | |
1822 (define-key org-goto-map "\C-c\C-n" 'outline-next-visible-heading) | |
1823 (define-key org-goto-map "\C-c\C-p" 'outline-previous-visible-heading) | |
1824 (define-key org-goto-map "\C-c\C-f" 'outline-forward-same-level) | |
1825 (define-key org-goto-map "\C-c\C-b" 'outline-backward-same-level) | |
1826 (define-key org-goto-map "\C-c\C-u" 'outline-up-heading) | |
1827 (let ((l '(1 2 3 4 5 6 7 8 9 0))) | |
1828 (while l (define-key org-goto-map (int-to-string (pop l)) 'digit-argument))) | |
1829 | |
1830 (defconst org-goto-help | |
1831 "Select a location to jump to, press RET | |
1832 \[Up]/[Down]=next/prev headline TAB=cycle visibility RET=select [Q]uit") | |
1833 | |
1834 (defun org-goto () | |
1835 "Go to a different location of the document, keeping current visibility. | |
1836 | |
1837 When you want to go to a different location in a document, the fastest way | |
1838 is often to fold the entire buffer and then dive into the tree. This | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1839 method has the disadvantage, that the previous location will be folded, |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1840 which may not be what you want. |
58792 | 1841 |
1842 This command works around this by showing a copy of the current buffer in | |
1843 overview mode. You can dive into the tree in that copy, to find the | |
1844 location you want to reach. When pressing RET, the command returns to the | |
1845 original buffer in which the visibility is still unchanged. It then jumps | |
1846 to the new location, making it and the headline hierarchy above it visible." | |
1847 (interactive) | |
1848 (let* ((org-goto-start-pos (point)) | |
1849 (selected-point | |
1850 (org-get-location (current-buffer) org-goto-help))) | |
1851 (if selected-point | |
1852 (progn | |
1853 (goto-char selected-point) | |
1854 (if (org-invisible-p) (org-show-hierarchy-above))) | |
1855 (error "Quit")))) | |
1856 | |
1857 (defun org-get-location (buf help) | |
1858 "Let the user select a location in the Org-mode buffer BUF. | |
1859 This function uses a recursive edit. It returns the selected position | |
1860 or nil." | |
1861 (let (org-selected-point) | |
1862 (save-excursion | |
1863 (save-window-excursion | |
1864 (delete-other-windows) | |
1865 (switch-to-buffer (get-buffer-create "*org-goto*")) | |
1866 (with-output-to-temp-buffer "*Help*" | |
1867 (princ help)) | |
1868 (shrink-window-if-larger-than-buffer (get-buffer-window "*Help*")) | |
1869 (setq buffer-read-only nil) | |
1870 (erase-buffer) | |
1871 (insert-buffer buf) | |
1872 (let ((org-startup-truncated t) | |
1873 (org-startup-folded t) | |
1874 (org-startup-with-deadline-check nil)) | |
1875 (org-mode)) | |
1876 (setq buffer-read-only t) | |
1877 (if (boundp 'org-goto-start-pos) | |
1878 (goto-char org-goto-start-pos) | |
1879 (goto-char (point-min))) | |
1880 (org-beginning-of-line) | |
1881 (message "Select location and press RET") | |
1882 ;; now we make sure that during selection, ony very few keys work | |
1883 ;; and that it is impossible to switch to another window. | |
1884 (let ((gm (current-global-map)) | |
1885 (overriding-local-map org-goto-map)) | |
1886 (unwind-protect | |
1887 (progn | |
1888 (use-global-map org-goto-map) | |
1889 (recursive-edit)) | |
1890 (use-global-map gm))))) | |
1891 (kill-buffer "*org-goto*") | |
1892 org-selected-point)) | |
1893 | |
1894 ;; FIXME: It may not be a good idea to temper with the prefix argument... | |
1895 (defun org-goto-ret (&optional arg) | |
1896 "Finish org-goto by going to the new location." | |
1897 (interactive "P") | |
1898 (setq org-selected-point (point) | |
1899 current-prefix-arg arg) | |
1900 (throw 'exit nil)) | |
1901 | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1902 (defun org-goto-left () |
58792 | 1903 "Finish org-goto by going to the new location." |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1904 (interactive) |
58792 | 1905 (if (org-on-heading-p) |
1906 (progn | |
1907 (beginning-of-line 1) | |
1908 (setq org-selected-point (point) | |
1909 current-prefix-arg (- (match-end 0) (match-beginning 0))) | |
1910 (throw 'exit nil)) | |
1911 (error "Not on a heading"))) | |
1912 | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1913 (defun org-goto-right () |
58792 | 1914 "Finish org-goto by going to the new location." |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1915 (interactive) |
58792 | 1916 (if (org-on-heading-p) |
1917 (progn | |
1918 (outline-end-of-subtree) | |
1919 (or (eobp) (forward-char 1)) | |
1920 (setq org-selected-point (point) | |
1921 current-prefix-arg (- (match-end 0) (match-beginning 0))) | |
1922 (throw 'exit nil)) | |
1923 (error "Not on a heading"))) | |
1924 | |
1925 (defun org-goto-quit () | |
1926 "Finish org-goto without cursor motion." | |
1927 (interactive) | |
1928 (setq org-selected-point nil) | |
1929 (throw 'exit nil)) | |
1930 | |
1931 ;;; Promotion, Demotion, Inserting new headlines | |
1932 | |
1933 (defvar org-ignore-region nil | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1934 "To temporarily disable the active region.") |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1935 |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1936 (defun org-insert-heading () |
58792 | 1937 "Insert a new heading with same depth at point." |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1938 (interactive) |
58792 | 1939 (let* ((head (save-excursion |
1940 (condition-case nil | |
1941 (org-back-to-heading) | |
1942 (error (outline-next-heading))) | |
1943 (prog1 (match-string 0) | |
1944 (funcall outline-level))))) | |
1945 (unless (bolp) (newline)) | |
1946 (insert head) | |
1947 (unless (eolp) | |
1948 (save-excursion (newline-and-indent))) | |
1949 (unless (equal (char-before) ?\ ) | |
1950 (insert " ")) | |
1951 (run-hooks 'org-insert-heading-hook))) | |
1952 | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1953 (defun org-insert-todo-heading (arg) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1954 "Insert a new heading with the same level and TODO state as current heading. |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1955 If the heading has no TODO state, or if the state is DONE, use the first |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1956 state (TODO by default). Also with prefix arg, force first state." |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1957 (interactive "P") |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1958 (org-insert-heading) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1959 (save-excursion |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1960 (org-back-to-heading) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1961 (outline-previous-heading) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1962 (looking-at org-todo-line-regexp)) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1963 (if (or arg |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1964 (not (match-beginning 2)) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1965 (equal (match-string 2) org-done-string)) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1966 (insert (car org-todo-keywords) " ") |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1967 (insert (match-string 2) " "))) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
1968 |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1969 (defun org-promote-subtree () |
58792 | 1970 "Promote the entire subtree. |
1971 See also `org-promote'." | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1972 (interactive) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1973 (save-excursion |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1974 (org-map-tree 'org-promote))) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1975 |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1976 (defun org-demote-subtree () |
58792 | 1977 "Demote the entire subtree. See `org-demote'. |
1978 See also `org-promote'." | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1979 (interactive) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1980 (save-excursion |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1981 (org-map-tree 'org-demote))) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1982 |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1983 (defun org-do-promote () |
58792 | 1984 "Promote the current heading higher up the tree. |
62076
4f2150e05f24
(org-get-entries-from-diary): Remove unused vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61924
diff
changeset
|
1985 If the region is active in `transient-mark-mode', promote all headings |
58792 | 1986 in the region." |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1987 (interactive) |
58792 | 1988 (save-excursion |
1989 (if (org-region-active-p) | |
1990 (org-map-region 'org-promote (region-beginning) (region-end)) | |
1991 (org-promote))) | |
1992 (org-fix-position-after-promote)) | |
1993 | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1994 (defun org-do-demote () |
58792 | 1995 "Demote the current heading lower down the tree. |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1996 If the region is active in `transient-mark-mode', demote all headings |
58792 | 1997 in the region." |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
1998 (interactive) |
58792 | 1999 (save-excursion |
2000 (if (org-region-active-p) | |
2001 (org-map-region 'org-demote (region-beginning) (region-end)) | |
2002 (org-demote))) | |
2003 (org-fix-position-after-promote)) | |
2004 | |
2005 (defun org-fix-position-after-promote () | |
2006 "Make sure that after pro/demotion cursor position is right." | |
2007 (and (equal (char-after) ?\ ) | |
2008 (equal (char-before) ?*) | |
2009 (forward-char 1))) | |
2010 | |
2011 (defun org-promote () | |
2012 "Promote the current heading higher up the tree. | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
2013 If the region is active in `transient-mark-mode', promote all headings |
58792 | 2014 in the region." |
2015 (org-back-to-heading t) | |
2016 (let* ((level (save-match-data (funcall outline-level))) | |
2017 (up-head (make-string (1- level) ?*))) | |
2018 (if (= level 1) (error "Cannot promote to level 0. UNDO to recover.")) | |
2019 (replace-match up-head nil t) | |
2020 (if org-adapt-indentation | |
2021 (org-fixup-indentation "^ " "" "^ ?\\S-")))) | |
2022 | |
2023 (defun org-demote () | |
2024 "Demote the current heading lower down the tree. | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
2025 If the region is active in `transient-mark-mode', demote all headings |
58792 | 2026 in the region." |
2027 (org-back-to-heading t) | |
2028 (let* ((level (save-match-data (funcall outline-level))) | |
2029 (down-head (make-string (1+ level) ?*))) | |
2030 (replace-match down-head nil t) | |
2031 (if org-adapt-indentation | |
2032 (org-fixup-indentation "^ " " " "^\\S-")))) | |
2033 | |
2034 (defun org-map-tree (fun) | |
2035 "Call FUN for every heading underneath the current one." | |
2036 (org-back-to-heading) | |
2037 (let ((level (outline-level))) | |
2038 (save-excursion | |
2039 (funcall fun) | |
2040 (while (and (progn | |
2041 (outline-next-heading) | |
2042 (> (funcall outline-level) level)) | |
2043 (not (eobp))) | |
2044 (funcall fun))))) | |
2045 | |
2046 (defun org-map-region (fun beg end) | |
2047 "Call FUN for every heading between BEG and END." | |
2048 (let ((org-ignore-region t)) | |
2049 (save-excursion | |
2050 (setq end (copy-marker end)) | |
2051 (goto-char beg) | |
2052 ;; (if (fboundp 'deactivate-mark) (deactivate-mark)) | |
2053 ;; (if (fboundp 'zmacs-deactivate-region) (zmacs-deactivate-region)) | |
2054 (if (and (re-search-forward (concat "^" outline-regexp) nil t) | |
2055 (< (point) end)) | |
2056 (funcall fun)) | |
2057 (while (and (progn | |
2058 (outline-next-heading) | |
2059 (< (point) end)) | |
2060 (not (eobp))) | |
2061 (funcall fun))))) | |
2062 | |
2063 (defun org-fixup-indentation (from to prohibit) | |
2064 "Change the indentation in the current entry by re-replacing FROM with TO. | |
2065 However, if the regexp PROHIBIT matches at all, don't do anything. | |
2066 This is being used to change indentation along with the length of the | |
2067 heading marker. But if there are any lines which are not indented, nothing | |
2068 is changed at all." | |
2069 (save-excursion | |
2070 (let ((end (save-excursion (outline-next-heading) | |
2071 (point-marker)))) | |
2072 (unless (save-excursion (re-search-forward prohibit end t)) | |
2073 (while (re-search-forward from end t) | |
2074 (replace-match to) | |
2075 (beginning-of-line 2))) | |
2076 (move-marker end nil)))) | |
2077 | |
2078 ;;; Vertical tree motion, cutting and pasting of subtrees | |
2079 | |
2080 (defun org-move-subtree-up (&optional arg) | |
2081 "Move the current subtree up past ARG headlines of the same level." | |
2082 (interactive "p") | |
2083 (org-move-subtree-down (- (prefix-numeric-value arg)))) | |
2084 | |
2085 (defun org-move-subtree-down (&optional arg) | |
2086 "Move the current subtree down past ARG headlines of the same level." | |
2087 (interactive "p") | |
2088 (setq arg (prefix-numeric-value arg)) | |
2089 (let ((movfunc (if (> arg 0) 'outline-get-next-sibling | |
2090 'outline-get-last-sibling)) | |
2091 (ins-point (make-marker)) | |
2092 (cnt (abs arg)) | |
2093 beg end txt folded) | |
2094 ;; Select the tree | |
2095 (org-back-to-heading) | |
2096 (setq beg (point)) | |
2097 (save-match-data | |
2098 (save-excursion (outline-end-of-heading) | |
2099 (setq folded (org-invisible-p))) | |
2100 (outline-end-of-subtree)) | |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
2101 (outline-next-heading) |
58792 | 2102 (setq end (point)) |
2103 ;; Find insertion point, with error handling | |
2104 (goto-char beg) | |
2105 (while (> cnt 0) | |
2106 (or (and (funcall movfunc) (looking-at outline-regexp)) | |
2107 (progn (goto-char beg) | |
2108 (error "Cannot move past superior level or buffer limit"))) | |
2109 (setq cnt (1- cnt))) | |
2110 (if (> arg 0) | |
2111 ;; Moving forward - still need to move over subtree | |
2112 (progn (outline-end-of-subtree) | |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
2113 (outline-next-heading) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
2114 (if (not (or (looking-at (concat "^" outline-regexp)) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
2115 (bolp))) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
2116 (newline)))) |
58792 | 2117 (move-marker ins-point (point)) |
2118 (setq txt (buffer-substring beg end)) | |
2119 (delete-region beg end) | |
2120 (insert txt) | |
2121 (goto-char ins-point) | |
2122 (if folded (hide-subtree)) | |
2123 (move-marker ins-point nil))) | |
2124 | |
2125 (defvar org-subtree-clip "" | |
2126 "Clipboard for cut and paste of subtrees. | |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
2127 This is actually only a copy of the kill, because we use the normal kill |
58792 | 2128 ring. We need it to check if the kill was created by `org-copy-subtree'.") |
2129 | |
2130 (defvar org-subtree-clip-folded nil | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
2131 "Was the last copied subtree folded? |
58792 | 2132 This is used to fold the tree back after pasting.") |
2133 | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
2134 (defun org-cut-subtree () |
58792 | 2135 "Cut the current subtree into the clipboard. |
2136 This is a short-hand for marking the subtree and then cutting it." | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
2137 (interactive) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
2138 (org-copy-subtree 'cut)) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
2139 |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
2140 (defun org-copy-subtree (&optional cut) |
58792 | 2141 "Cut the current subtree into the clipboard. |
2142 This is a short-hand for marking the subtree and then copying it. | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
2143 If CUT is non nil, actually cut the subtree." |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
2144 (interactive) |
58792 | 2145 (let (beg end folded) |
2146 (org-back-to-heading) | |
2147 (setq beg (point)) | |
2148 (save-match-data | |
2149 (save-excursion (outline-end-of-heading) | |
2150 (setq folded (org-invisible-p))) | |
2151 (outline-end-of-subtree)) | |
2152 (if (equal (char-after) ?\n) (forward-char 1)) | |
2153 (setq end (point)) | |
2154 (goto-char beg) | |
2155 (when (> end beg) | |
2156 (setq org-subtree-clip-folded folded) | |
2157 (if cut (kill-region beg end) (copy-region-as-kill beg end)) | |
2158 (setq org-subtree-clip (current-kill 0)) | |
2159 (message "%s: Subtree with %d characters" | |
2160 (if cut "Cut" "Copied") | |
2161 (length org-subtree-clip))))) | |
2162 | |
2163 (defun org-paste-subtree (&optional level tree) | |
2164 "Paste the clipboard as a subtree, with modification of headline level. | |
2165 The entire subtree is promoted or demoted in order to match a new headline | |
2166 level. By default, the new level is derived from the visible headings | |
2167 before and after the insertion point, and taken to be the inferior headline | |
2168 level of the two. So if the previous visible heading is level 3 and the | |
2169 next is level 4 (or vice versa), level 4 will be used for insertion. | |
2170 This makes sure that the subtree remains an independent subtree and does | |
2171 not swallow low level entries. | |
2172 | |
2173 You can also force a different level, either by using a numeric prefix | |
2174 argument, or by inserting the heading marker by hand. For example, if the | |
2175 cursor is after \"*****\", then the tree will be shifted to level 5. | |
2176 | |
2177 If you want to insert the tree as is, just use \\[yank]. | |
2178 | |
2179 If optional TREE is given, use this text instead of the kill ring." | |
2180 (interactive "P") | |
2181 (unless (org-kill-is-subtree-p tree) | |
2182 (error | |
2183 (substitute-command-keys | |
2184 "The kill is not a (set of) tree(s) - please use \\[yank] to yank anyway"))) | |
2185 (let* ((txt (or tree (current-kill 0))) | |
2186 (^re (concat "^\\(" outline-regexp "\\)")) | |
2187 (re (concat "\\(" outline-regexp "\\)")) | |
2188 (^re_ (concat "\\(" outline-regexp "\\)[ \t]*")) | |
2189 | |
2190 (old-level (if (string-match ^re txt) | |
2191 (- (match-end 0) (match-beginning 0)) | |
2192 -1)) | |
2193 (force-level (cond (level (prefix-numeric-value level)) | |
2194 ((string-match | |
2195 ^re_ (buffer-substring (point-at-bol) (point))) | |
2196 (- (match-end 0) (match-beginning 0))) | |
2197 (t nil))) | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
2198 (previous-level (save-excursion |
58792 | 2199 (outline-previous-visible-heading 1) |
2200 (if (looking-at re) | |
2201 (- (match-end 0) (match-beginning 0)) | |
2202 1))) | |
2203 (next-level (save-excursion | |
2204 (outline-next-visible-heading 1) | |
2205 (if (looking-at re) | |
2206 (- (match-end 0) (match-beginning 0)) | |
2207 1))) | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
2208 (new-level (or force-level (max previous-level next-level))) |
58792 | 2209 (shift (if (or (= old-level -1) |
2210 (= new-level -1) | |
2211 (= old-level new-level)) | |
2212 0 | |
2213 (- new-level old-level))) | |
2214 (shift1 shift) | |
2215 (delta (if (> shift 0) -1 1)) | |
2216 (func (if (> shift 0) 'org-demote 'org-promote)) | |
2217 beg end) | |
2218 ;; Remove the forces level indicator | |
2219 (if force-level | |
2220 (delete-region (point-at-bol) (point))) | |
2221 ;; Make sure we start at the beginning of an empty line | |
2222 (if (not (bolp)) (insert "\n")) | |
2223 (if (not (looking-at "[ \t]*$")) | |
2224 (progn (insert "\n") (backward-char 1))) | |
2225 ;; Paste | |
2226 (setq beg (point)) | |
2227 (insert txt) | |
2228 (setq end (point)) | |
2229 (goto-char beg) | |
2230 ;; Shift if necessary | |
2231 (if (= shift 0) | |
2232 (message "Pasted at level %d, without shift" new-level) | |
2233 (save-restriction | |
2234 (narrow-to-region beg end) | |
2235 (while (not (= shift 0)) | |
2236 (org-map-region func (point-min) (point-max)) | |
2237 (setq shift (+ delta shift))) | |
2238 (goto-char (point-min)) | |
2239 (message "Pasted at level %d, with shift by %d levels" | |
2240 new-level shift1))) | |
2241 (if (and (eq org-subtree-clip (current-kill 0)) | |
2242 org-subtree-clip-folded) | |
2243 ;; The tree was folded before it was killed/copied | |
2244 (hide-subtree)))) | |
2245 | |
2246 (defun org-kill-is-subtree-p (&optional txt) | |
2247 "Check if the current kill is an outline subtree, or a set of trees. | |
2248 Returns nil if kill does not start with a headline, or if the first | |
2249 headline level is not the largest headline level in the tree. | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
2250 So this will actually accept several entries of equal levels as well, |
58792 | 2251 which is OK for `org-paste-subtree'. |
2252 If optional TXT is given, check this string instead of the current kill." | |
2253 (let* ((kill (or txt (current-kill 0) "")) | |
2254 (start-level (and (string-match (concat "\\`" outline-regexp) kill) | |
2255 (- (match-end 0) (match-beginning 0)))) | |
2256 (re (concat "^" outline-regexp)) | |
2257 (start 1)) | |
2258 (if (not start-level) | |
2259 nil ;; does not even start with a heading | |
2260 (catch 'exit | |
2261 (while (setq start (string-match re kill (1+ start))) | |
2262 (if (< (- (match-end 0) (match-beginning 0)) start-level) | |
2263 (throw 'exit nil))) | |
2264 t)))) | |
2265 | |
2266 ;;; Completion | |
2267 | |
2268 (defun org-complete (&optional arg) | |
2269 "Perform completion on word at point. | |
2270 At the beginning of a headline, this completes TODO keywords as given in | |
2271 `org-todo-keywords'. | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
2272 If the current word is preceded by a backslash, completes the TeX symbols |
58792 | 2273 that are supported for HTML support. |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
2274 If the current word is preceded by \"#+\", completes special words for |
58792 | 2275 setting file options. |
2276 At all other locations, this simply calls `ispell-complete-word'." | |
2277 (interactive "P") | |
2278 (catch 'exit | |
2279 (let* ((end (point)) | |
2280 (beg (save-excursion | |
2281 (if (equal (char-before (point)) ?\ ) (backward-char 1)) | |
2282 (skip-chars-backward "a-zA-Z0-9_:") | |
2283 (point))) | |
2284 (texp (equal (char-before beg) ?\\)) | |
2285 (opt (equal (buffer-substring (max (point-at-bol) (- beg 2)) | |
2286 beg) | |
2287 "#+")) | |
2288 (pattern (buffer-substring-no-properties beg end)) | |
2289 (completion-ignore-case opt) | |
2290 (type nil) | |
2291 (table (cond | |
2292 (opt | |
2293 (setq type :opt) | |
2294 (mapcar (lambda (x) | |
2295 (string-match "^#\\+\\(\\([A-Z_]+:?\\).*\\)" x) | |
2296 (cons (match-string 2 x) (match-string 1 x))) | |
2297 (org-split-string (org-get-current-options) "\n"))) | |
2298 (texp | |
2299 (setq type :tex) | |
2300 org-html-entities) | |
2301 ((string-match "\\`\\*+[ \t]*\\'" | |
2302 (buffer-substring (point-at-bol) beg)) | |
2303 (setq type :todo) | |
2304 (mapcar 'list org-todo-keywords)) | |
2305 (t (progn (ispell-complete-word arg) (throw 'exit nil))))) | |
2306 (completion (try-completion pattern table))) | |
2307 (cond ((eq completion t) | |
2308 (if (equal type :opt) | |
2309 (insert (substring (cdr (assoc (upcase pattern) table)) | |
2310 (length pattern))))) | |
2311 ((null completion) | |
2312 (message "Can't find completion for \"%s\"" pattern) | |
2313 (ding)) | |
2314 ((not (string= pattern completion)) | |
2315 (delete-region beg end) | |
2316 (if (string-match " +$" completion) | |
2317 (setq completion (replace-match "" t t completion))) | |
2318 (insert completion) | |
2319 (if (get-buffer-window "*Completions*") | |
2320 (delete-window (get-buffer-window "*Completions*"))) | |
2321 (if (and (eq type :todo) | |
2322 (assoc completion table)) | |
2323 (insert " ")) | |
2324 (if (and (equal type :opt) (assoc completion table)) | |
2325 (message (substitute-command-keys | |
2326 "Press \\[org-complete] again to insert example settings")))) | |
2327 (t | |
2328 (message "Making completion list...") | |
2329 (let ((list (sort (all-completions pattern table) 'string<))) | |
2330 (with-output-to-temp-buffer "*Completions*" | |
2331 (display-completion-list list))) | |
2332 (message "Making completion list...%s" "done")))))) | |
2333 | |
2334 ;;; Comments, TODO and DEADLINE | |
2335 | |
2336 (defun org-toggle-comment () | |
2337 "Change the COMMENT state of an entry." | |
2338 (interactive) | |
2339 (save-excursion | |
2340 (org-back-to-heading) | |
2341 (if (looking-at (concat outline-regexp | |
2342 "\\( +\\<" org-comment-string "\\>\\)")) | |
2343 (replace-match "" t t nil 1) | |
2344 (if (looking-at outline-regexp) | |
2345 (progn | |
2346 (goto-char (match-end 0)) | |
2347 (insert " " org-comment-string)))))) | |
2348 | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
2349 (defvar org-last-todo-state-is-todo nil |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
2350 "This is non-nil when the last TODO state change led to a TODO state. |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
2351 If the last change removed the TODO tag or switched to DONE, then |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
2352 this is nil.") |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
2353 |
58792 | 2354 (defun org-todo (&optional arg) |
2355 "Change the TODO state of an item. | |
2356 The state of an item is given by a keyword at the start of the heading, | |
2357 like | |
2358 *** TODO Write paper | |
2359 *** DONE Call mom | |
2360 | |
2361 The different keywords are specified in the variable `org-todo-keywords'. By | |
2362 default the available states are \"TODO\" and \"DONE\". | |
2363 So for this example: when the item starts with TODO, it is changed to DONE. | |
2364 When it starts with DONE, the DONE is removed. And when neither TODO nor | |
2365 DONE are present, add TODO at the beginning of the heading. | |
2366 | |
2367 With prefix arg, use completion to determined the new state. With numeric | |
2368 prefix arg, switch to that state." | |
2369 (interactive "P") | |
2370 (save-excursion | |
2371 (org-back-to-heading) | |
2372 (if (looking-at outline-regexp) (goto-char (match-end 0))) | |
2373 (or (looking-at (concat " +" org-todo-regexp " *")) | |
2374 (looking-at " *")) | |
2375 (let* ((this (match-string 1)) | |
2376 (completion-ignore-case t) | |
2377 (member (member this org-todo-keywords)) | |
2378 (tail (cdr member)) | |
2379 (state (cond | |
2380 ((equal arg '(4)) | |
2381 ;; Read a state with completion | |
2382 (completing-read "State: " (mapcar (lambda(x) (list x)) | |
2383 org-todo-keywords) | |
2384 nil t)) | |
2385 (arg | |
2386 ;; user requests a specific state | |
2387 (nth (1- (prefix-numeric-value arg)) | |
2388 org-todo-keywords)) | |
2389 ((null member) (car org-todo-keywords)) | |
2390 ((null tail) nil) ;; -> first entry | |
2391 ((eq org-todo-interpretation 'sequence) | |
2392 (car tail)) | |
2393 ((memq org-todo-interpretation '(type priority)) | |
2394 (if (eq this-command last-command) | |
2395 (car tail) | |
2396 (if (> (length tail) 0) org-done-string nil))) | |
2397 (t nil))) | |
2398 (next (if state (concat " " state " ") " "))) | |
2399 (replace-match next t t) | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
2400 (setq org-last-todo-state-is-todo |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
2401 (not (equal state org-done-string))) |
58792 | 2402 (run-hooks 'org-after-todo-state-change-hook))) |
2403 ;; Fixup cursor location if close to the keyword | |
2404 (if (and (outline-on-heading-p) | |
2405 (not (bolp)) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
2406 (save-excursion (beginning-of-line 1) |
58792 | 2407 (looking-at org-todo-line-regexp)) |
2408 (< (point) (+ 2 (or (match-end 2) (match-end 1))))) | |
2409 (progn | |
2410 (goto-char (or (match-end 2) (match-end 1))) | |
2411 (just-one-space)))) | |
2412 | |
2413 (defun org-show-todo-tree (arg) | |
2414 "Make a compact tree which shows all headlines marked with TODO. | |
2415 The tree will show the lines where the regexp matches, and all higher | |
2416 headlines above the match." | |
2417 (interactive "P") | |
2418 (let ((case-fold-search nil) | |
2419 (kwd-re (if arg org-todo-regexp org-not-done-regexp))) | |
2420 (message "%d TODO entries found" | |
2421 (org-occur (concat "^" outline-regexp " +" kwd-re ))))) | |
2422 | |
2423 (defun org-deadline () | |
2424 "Insert the DEADLINE: string to make a deadline. | |
2425 A timestamp is also inserted - use \\[org-timestamp-up] and \\[org-timestamp-down] | |
2426 to modify it to the correct date." | |
2427 (interactive) | |
2428 (insert | |
2429 org-deadline-string " " | |
2430 (format-time-string (car org-time-stamp-formats) | |
2431 (org-read-date nil 'to-time))) | |
2432 (message (substitute-command-keys | |
2433 "Use \\[org-timestamp-up-day] and \\[org-timestamp-down-day] to change the date."))) | |
2434 | |
2435 (defun org-schedule () | |
2436 "Insert the SCHEDULED: string to schedule a TODO item. | |
2437 A timestamp is also inserted - use \\[org-timestamp-up] and \\[org-timestamp-down] | |
2438 to modify it to the correct date." | |
2439 (interactive) | |
2440 (insert | |
2441 org-scheduled-string " " | |
2442 (format-time-string (car org-time-stamp-formats) | |
2443 (org-read-date nil 'to-time))) | |
2444 (message (substitute-command-keys | |
2445 "Use \\[org-timestamp-up-day] and \\[org-timestamp-down-day] to change the date."))) | |
2446 | |
2447 | |
2448 (defun org-occur (regexp &optional callback) | |
2449 "Make a compact tree which shows all matches of REGEXP. | |
2450 The tree will show the lines where the regexp matches, and all higher | |
2451 headlines above the match. It will also show the heading after the match, | |
2452 to make sure editing the matching entry is easy. | |
2453 if CALLBACK is non-nil, it is a function which is called to confirm | |
2454 that the match should indeed be shown." | |
2455 (interactive "sRegexp: ") | |
2456 (setq regexp (org-check-occur-regexp regexp)) | |
2457 (let ((cnt 0)) | |
2458 (save-excursion | |
2459 (goto-char (point-min)) | |
2460 (hide-sublevels 1) | |
2461 (while (re-search-forward regexp nil t) | |
2462 (when (or (not callback) | |
2463 (funcall callback)) | |
2464 (setq cnt (1+ cnt)) | |
2465 (org-show-hierarchy-above)))) | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
2466 (run-hooks 'org-occur-hook) |
58792 | 2467 (if (interactive-p) |
2468 (message "%d match(es) for regexp %s" cnt regexp)) | |
2469 cnt)) | |
2470 | |
2471 (defun org-show-hierarchy-above () | |
2472 "Make sure point and the headings hierarchy above is visible." | |
2473 (if (org-on-heading-p t) | |
2474 (org-flag-heading nil) ; only show the heading | |
2475 (org-show-hidden-entry)) ; show entire entry | |
2476 (save-excursion | |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
2477 (and org-show-following-heading |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
2478 (outline-next-heading) |
58792 | 2479 (org-flag-heading nil))) ; show the next heading |
2480 (save-excursion ; show all higher headings | |
2481 (while (condition-case nil | |
2482 (progn (org-up-heading-all 1) t) | |
2483 (error nil)) | |
2484 (org-flag-heading nil)))) | |
2485 | |
2486 ;;; Priorities | |
2487 | |
2488 (defvar org-priority-regexp ".*?\\(\\[#\\([A-Z]\\)\\] ?\\)" | |
2489 "Regular expression matching the priority indicator.") | |
2490 | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
2491 (defvar org-remove-priority-next-time nil) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
2492 |
58792 | 2493 (defun org-priority-up () |
2494 "Increase the priority of the current item." | |
2495 (interactive) | |
2496 (org-priority 'up)) | |
2497 | |
2498 (defun org-priority-down () | |
2499 "Decrease the priority of the current item." | |
2500 (interactive) | |
2501 (org-priority 'down)) | |
2502 | |
2503 (defun org-priority (&optional action) | |
2504 "Change the priority of an item by ARG. | |
2505 ACTION can be set, up, or down." | |
2506 (interactive) | |
2507 (setq action (or action 'set)) | |
2508 (let (current new news have remove) | |
2509 (save-excursion | |
2510 (org-back-to-heading) | |
2511 (if (looking-at org-priority-regexp) | |
2512 (setq current (string-to-char (match-string 2)) | |
2513 have t) | |
2514 (setq current org-default-priority)) | |
2515 (cond | |
2516 ((eq action 'set) | |
2517 (message (format "Priority A-%c, SPC to remove: " org-lowest-priority)) | |
2518 (setq new (read-char-exclusive)) | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
2519 (cond ((equal new ?\ ) (setq remove t)) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
2520 ((or (< (upcase new) ?A) (> (upcase new) org-lowest-priority)) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
2521 (error "Priority must be between `%c' and `%c'" |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
2522 ?A org-lowest-priority)))) |
58792 | 2523 ((eq action 'up) |
2524 (setq new (1- current))) | |
2525 ((eq action 'down) | |
2526 (setq new (1+ current))) | |
60918
58a53f588384
* textmodes/refbib.el, textmodes/refer.el, textmodes/reftex-cite.el,
Werner LEMBERG <wl@gnu.org>
parents:
59596
diff
changeset
|
2527 (t (error "Invalid action"))) |
58792 | 2528 (setq new (min (max ?A (upcase new)) org-lowest-priority)) |
2529 (setq news (format "%c" new)) | |
2530 (if have | |
2531 (if remove | |
2532 (replace-match "" t t nil 1) | |
2533 (replace-match news t t nil 2)) | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
2534 (if remove |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
2535 (error "No priority cookie found in line") |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
2536 (looking-at org-todo-line-regexp) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
2537 (if (match-end 2) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
2538 (progn |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
2539 (goto-char (match-end 2)) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
2540 (insert " [#" news "]")) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
2541 (goto-char (match-beginning 3)) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
2542 (insert "[#" news "] "))))) |
58792 | 2543 (if remove |
2544 (message "Priority removed") | |
2545 (message "Priority of current item set to %s" news)))) | |
2546 | |
2547 | |
2548 (defun org-get-priority (s) | |
2549 "Find priority cookie and return priority." | |
2550 (save-match-data | |
2551 (if (not (string-match org-priority-regexp s)) | |
2552 (* 1000 (- org-lowest-priority org-default-priority)) | |
2553 (* 1000 (- org-lowest-priority | |
2554 (string-to-char (match-string 2 s))))))) | |
2555 | |
2556 ;;; Timestamps | |
2557 | |
2558 (defvar org-last-changed-timestamp nil) | |
2559 | |
2560 (defun org-time-stamp (arg) | |
2561 "Prompt for a date/time and insert a time stamp. | |
2562 If the user specifies a time like HH:MM, or if this command is called | |
2563 with a prefix argument, the time stamp will contain date and time. | |
2564 Otherwise, only the date will be included. All parts of a date not | |
2565 specified by the user will be filled in from the current date/time. | |
2566 So if you press just return without typing anything, the time stamp | |
2567 will represent the current date/time. If there is already a timestamp | |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
2568 at the cursor, it will be modified." |
58792 | 2569 (interactive "P") |
2570 (let ((fmt (if arg (cdr org-time-stamp-formats) | |
2571 (car org-time-stamp-formats))) | |
2572 (org-time-was-given nil) | |
2573 time) | |
2574 (cond | |
2575 ((and (org-at-timestamp-p) | |
2576 (eq last-command 'org-time-stamp) | |
2577 (eq this-command 'org-time-stamp)) | |
2578 (insert "--") | |
2579 (setq time (let ((this-command this-command)) | |
2580 (org-read-date arg 'totime))) | |
2581 (if org-time-was-given (setq fmt (cdr org-time-stamp-formats))) | |
2582 (insert (format-time-string fmt time))) | |
2583 ((org-at-timestamp-p) | |
2584 (setq time (let ((this-command this-command)) | |
2585 (org-read-date arg 'totime))) | |
2586 (and (org-at-timestamp-p) (replace-match | |
2587 (setq org-last-changed-timestamp | |
2588 (format-time-string fmt time)) | |
2589 t t)) | |
2590 (message "Timestamp updated")) | |
2591 (t | |
2592 (setq time (let ((this-command this-command)) | |
2593 (org-read-date arg 'totime))) | |
2594 (if org-time-was-given (setq fmt (cdr org-time-stamp-formats))) | |
2595 (insert (format-time-string fmt time)))))) | |
2596 | |
2597 ;;; FIXME: Make the function take "Fri" as "next friday" | |
2598 (defun org-read-date (&optional with-time to-time) | |
2599 "Read a date and make things smooth for the user. | |
2600 The prompt will suggest to enter an ISO date, but you can also enter anything | |
2601 which will at least partially be understood by `parse-time-string'. | |
2602 Unrecognized parts of the date will default to the current day, month ,year, | |
2603 hour and minute. For example, | |
2604 3-2-5 --> 2003-02-05 | |
2605 feb 15 --> currentyear-02-15 | |
2606 sep 12 9 --> 2009-09-12 | |
2607 12:45 --> today 12:45 | |
2608 22 sept 0:34 --> currentyear-09-22 0:34 | |
2609 12 --> currentyear-currentmonth-12 | |
2610 etc. | |
2611 The function understands only English month and weekday abbreviations, | |
2612 but this can be configured with the variables `parse-time-months' and | |
2613 `parse-time-weekdays'. | |
2614 | |
2615 While prompting, a calendar is popped up - you can also select the | |
2616 date with the mouse (button 1). The calendar shows a period of three | |
62076
4f2150e05f24
(org-get-entries-from-diary): Remove unused vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61924
diff
changeset
|
2617 month. To scroll it to other months, use the keys `>' and `<'. |
58792 | 2618 If you don't like the calendar, turn it off with |
2619 \(setq org-popup-calendar-for-date-prompt nil). | |
2620 | |
2621 With optional argument TO-TIME, the date will immediately be converted | |
2622 to an internal time. | |
2623 With an optional argument WITH-TIME, the prompt will suggest to also | |
2624 insert a time. Note that when WITH-TIME is not set, you can still | |
2625 enter a time, and this function will inform the calling routine about | |
2626 this change. The calling routine may then choose to change the format | |
2627 used to insert the time stamp into the buffer to include the time." | |
2628 (let* ((default-time | |
2629 ;; Default time is either today, or, when entering a range, | |
2630 ;; the range start. | |
2631 (if (save-excursion | |
2632 (re-search-backward | |
2633 (concat org-ts-regexp "--\\=") | |
2634 (- (point) 20) t)) | |
2635 (apply | |
2636 'encode-time | |
2637 (mapcar (lambda(x) (or x 0)) ;; FIXME: Problem with timezone? | |
2638 (parse-time-string (match-string 1)))) | |
2639 (current-time))) | |
2640 (timestr (format-time-string | |
2641 (if with-time "%Y-%m-%d %H:%M" "%Y-%m-%d") default-time)) | |
2642 (prompt (format "YYYY-MM-DD [%s]: " timestr)) | |
2643 ans ans1 ans2 | |
2644 second minute hour day month year tl) | |
2645 | |
2646 (if org-popup-calendar-for-date-prompt | |
2647 ;; Also show a calendar for date selection | |
2648 ;; Copied (with modifications) from planner.el by John Wiegley | |
2649 (save-excursion | |
2650 (save-window-excursion | |
2651 (calendar) | |
2652 (calendar-forward-day (- (time-to-days default-time) | |
2653 (calendar-absolute-from-gregorian | |
2654 (calendar-current-date)))) | |
2655 (let* ((old-map (current-local-map)) | |
2656 (map (copy-keymap calendar-mode-map)) | |
2657 (minibuffer-local-map (copy-keymap minibuffer-local-map))) | |
2658 (define-key map (kbd "RET") 'org-calendar-select) | |
2659 (define-key map (if org-xemacs-p [button1] [mouse-1]) | |
2660 'org-calendar-select) | |
2661 (define-key minibuffer-local-map [(meta shift left)] | |
2662 (lambda () (interactive) | |
2663 (org-eval-in-calendar '(calendar-backward-month 1)))) | |
2664 (define-key minibuffer-local-map [(meta shift right)] | |
2665 (lambda () (interactive) | |
2666 (org-eval-in-calendar '(calendar-forward-month 1)))) | |
2667 (define-key minibuffer-local-map [(shift up)] | |
2668 (lambda () (interactive) | |
2669 (org-eval-in-calendar '(calendar-backward-week 1)))) | |
2670 (define-key minibuffer-local-map [(shift down)] | |
2671 (lambda () (interactive) | |
2672 (org-eval-in-calendar '(calendar-forward-week 1)))) | |
2673 (define-key minibuffer-local-map [(shift left)] | |
2674 (lambda () (interactive) | |
2675 (org-eval-in-calendar '(calendar-backward-day 1)))) | |
2676 (define-key minibuffer-local-map [(shift right)] | |
2677 (lambda () (interactive) | |
2678 (org-eval-in-calendar '(calendar-forward-day 1)))) | |
2679 (define-key minibuffer-local-map ">" | |
2680 (lambda () (interactive) | |
2681 (org-eval-in-calendar '(scroll-calendar-left 1)))) | |
2682 (define-key minibuffer-local-map "<" | |
2683 (lambda () (interactive) | |
2684 (org-eval-in-calendar '(scroll-calendar-right 1)))) | |
2685 (unwind-protect | |
2686 (progn | |
2687 (use-local-map map) | |
2688 (setq ans (read-string prompt "" nil nil)) | |
2689 (setq ans (or ans1 ans2 ans))) | |
2690 (use-local-map old-map))))) | |
2691 ;; Naked prompt only | |
2692 (setq ans (read-string prompt "" nil timestr))) | |
2693 | |
2694 (if (string-match | |
2695 "^ *\\(\\([0-9]+\\)-\\)?\\([0-1]?[0-9]\\)-\\([0-3]?[0-9]\\)\\([^-0-9]\\|$\\)" ans) | |
2696 (progn | |
2697 (setq year (if (match-end 2) | |
2698 (string-to-number (match-string 2 ans)) | |
2699 (string-to-number (format-time-string "%Y"))) | |
2700 month (string-to-number (match-string 3 ans)) | |
2701 day (string-to-number (match-string 4 ans))) | |
2702 (if (< year 100) (setq year (+ 2000 year))) | |
2703 (setq ans (replace-match (format "%04d-%02d-%02d" year month day) | |
2704 t t ans)))) | |
2705 (setq tl (parse-time-string ans) | |
2706 year (or (nth 5 tl) (string-to-number (format-time-string "%Y"))) | |
2707 month (or (nth 4 tl) (string-to-number (format-time-string "%m"))) | |
2708 day (or (nth 3 tl) (string-to-number (format-time-string "%d"))) | |
2709 hour (or (nth 2 tl) (string-to-number (format-time-string "%H"))) | |
2710 minute (or (nth 1 tl) (string-to-number (format-time-string "%M"))) | |
2711 second (or (nth 0 tl) 0)) | |
2712 (if (and (boundp 'org-time-was-given) | |
2713 (nth 2 tl)) | |
2714 (setq org-time-was-given t)) | |
2715 (if (< year 100) (setq year (+ 2000 year))) | |
2716 (if to-time | |
2717 (encode-time second minute hour day month year) | |
2718 (if (or (nth 1 tl) (nth 2 tl)) | |
2719 (format "%04d-%02d-%02d %02d:%02d" year month day hour minute) | |
2720 (format "%04d-%02d-%02d" year month day))))) | |
2721 | |
2722 (defun org-eval-in-calendar (form) | |
2723 "Eval FORM in the calendar window and return to current window. | |
2724 Also, store the cursor date in variable ans2." | |
2725 (let ((sw (selected-window))) | |
2726 (select-window (get-buffer-window "*Calendar*")) | |
2727 (eval form) | |
2728 (when (calendar-cursor-to-date) | |
2729 (let* ((date (calendar-cursor-to-date)) | |
2730 (time (encode-time 0 0 0 (nth 1 date) (nth 0 date) (nth 2 date)))) | |
2731 (setq ans2 (format-time-string "%Y-%m-%d" time)))) | |
2732 (select-window sw))) | |
2733 | |
2734 (defun org-calendar-select () | |
2735 "Return to `org-read-date' with the date currently selected. | |
2736 This is used by `org-read-date' in a temporary keymap for the calendar buffer." | |
2737 (interactive) | |
2738 (when (calendar-cursor-to-date) | |
2739 (let* ((date (calendar-cursor-to-date)) | |
2740 (time (encode-time 0 0 0 (nth 1 date) (nth 0 date) (nth 2 date)))) | |
2741 (setq ans1 (format-time-string "%Y-%m-%d" time))) | |
2742 (if (active-minibuffer-window) (exit-minibuffer)))) | |
2743 | |
2744 (defun org-check-deadlines (ndays) | |
2745 "Check if there are any deadlines due or past due. | |
2746 A deadline is considered due if it happens within `org-deadline-warning-days' | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
2747 days from today's date. If the deadline appears in an entry marked DONE, |
58792 | 2748 it is not shown. The prefix arg NDAYS can be used to test that many |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
2749 days. If the prefix is a raw \\[universal-argument] prefix, all deadlines are shown." |
58792 | 2750 (interactive "P") |
2751 (let* ((org-warn-days | |
2752 (cond | |
2753 ((equal ndays '(4)) 100000) | |
2754 (ndays (prefix-numeric-value ndays)) | |
2755 (t org-deadline-warning-days))) | |
2756 (case-fold-search nil) | |
2757 (regexp (concat "\\<" org-deadline-string " *<\\([^>]+\\)>")) | |
2758 (callback | |
2759 (lambda () | |
2760 (and (let ((d1 (time-to-days (current-time))) | |
2761 (d2 (time-to-days | |
2762 (org-time-string-to-time (match-string 1))))) | |
2763 (< (- d2 d1) org-warn-days)) | |
2764 (not (org-entry-is-done-p)))))) | |
2765 (message "%d deadlines past-due or due within %d days" | |
2766 (org-occur regexp callback) | |
2767 org-warn-days))) | |
2768 | |
2769 (defun org-evaluate-time-range (&optional to-buffer) | |
2770 "Evaluate a time range by computing the difference between start and end. | |
2771 Normally the result is just printed in the echo area, but with prefix arg | |
2772 TO-BUFFER, the result is inserted just after the date stamp into the buffer. | |
2773 If the time range is actually in a table, the result is inserted into the | |
2774 next column. | |
2775 For time difference computation, a year is assumed to be exactly 365 | |
2776 days in order to avoid rounding problems." | |
2777 (interactive "P") | |
2778 (save-excursion | |
2779 (unless (org-at-date-range-p) | |
2780 (goto-char (point-at-bol)) | |
2781 (re-search-forward org-tr-regexp (point-at-eol) t)) | |
2782 (if (not (org-at-date-range-p)) | |
2783 (error "Not at a time-stamp range, and none found in current line."))) | |
2784 (let* ((ts1 (match-string 1)) | |
2785 (ts2 (match-string 2)) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
2786 (havetime (or (> (length ts1) 15) (> (length ts2) 15))) |
58792 | 2787 (match-end (match-end 0)) |
2788 (time1 (org-time-string-to-time ts1)) | |
2789 (time2 (org-time-string-to-time ts2)) | |
2790 (t1 (time-to-seconds time1)) | |
2791 (t2 (time-to-seconds time2)) | |
2792 (diff (abs (- t2 t1))) | |
2793 (negative (< (- t2 t1) 0)) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
2794 ;; (ys (floor (* 365 24 60 60))) |
58792 | 2795 (ds (* 24 60 60)) |
2796 (hs (* 60 60)) | |
2797 (fy "%dy %dd %02d:%02d") | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
2798 (fy1 "%dy %dd") |
58792 | 2799 (fd "%dd %02d:%02d") |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
2800 (fd1 "%dd") |
58792 | 2801 (fh "%02d:%02d") |
2802 y d h m align) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
2803 ;; FIXME: Should I re-introduce years, make year refer to same date? |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
2804 ;; This would be the only useful way to have years, actually. |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
2805 (if havetime |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
2806 (setq ; y (floor (/ diff ys)) diff (mod diff ys) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
2807 y 0 |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
2808 d (floor (/ diff ds)) diff (mod diff ds) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
2809 h (floor (/ diff hs)) diff (mod diff hs) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
2810 m (floor (/ diff 60))) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
2811 (setq ; y (floor (/ diff ys)) diff (mod diff ys) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
2812 y 0 |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
2813 d (floor (+ (/ diff ds) 0.5)) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
2814 h 0 m 0)) |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
2815 (if (not to-buffer) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
2816 (message (org-make-tdiff-string y d h m)) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
2817 (when (org-at-table-p) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
2818 (goto-char match-end) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
2819 (setq align t) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
2820 (and (looking-at " *|") (goto-char (match-end 0)))) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
2821 (if (looking-at |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
2822 "\\( *-? *[0-9]+y\\)?\\( *[0-9]+d\\)? *[0-9][0-9]:[0-9][0-9]") |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
2823 (replace-match "")) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
2824 (if negative (insert " -")) |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
2825 (if (> y 0) (insert " " (format (if havetime fy fy1) y d h m)) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
2826 (if (> d 0) (insert " " (format (if havetime fd fd1) d h m)) |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
2827 (insert " " (format fh h m)))) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
2828 (if align (org-table-align)) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
2829 (message "Time difference inserted")))) |
58792 | 2830 |
2831 (defun org-make-tdiff-string (y d h m) | |
2832 (let ((fmt "") | |
2833 (l nil)) | |
2834 (if (> y 0) (setq fmt (concat fmt "%d year" (if (> y 1) "s" "") " ") | |
2835 l (push y l))) | |
2836 (if (> d 0) (setq fmt (concat fmt "%d day" (if (> d 1) "s" "") " ") | |
2837 l (push d l))) | |
2838 (if (> h 0) (setq fmt (concat fmt "%d hour" (if (> h 1) "s" "") " ") | |
2839 l (push h l))) | |
2840 (if (> m 0) (setq fmt (concat fmt "%d minute" (if (> m 1) "s" "") " ") | |
2841 l (push m l))) | |
2842 (apply 'format fmt (nreverse l)))) | |
2843 | |
2844 (defun org-time-string-to-time (s) | |
2845 (apply 'encode-time (org-parse-time-string s))) | |
2846 | |
2847 (defun org-parse-time-string (s) | |
2848 "Parse the standard Org-mode time string. | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
2849 This should be a lot faster than the normal `parse-time-string'." |
58792 | 2850 (if (string-match org-ts-regexp1 s) |
2851 (list 0 | |
2852 (string-to-number (or (match-string 8 s) "0")) | |
2853 (string-to-number (or (match-string 7 s) "0")) | |
2854 (string-to-number (match-string 4 s)) | |
2855 (string-to-number (match-string 3 s)) | |
2856 (string-to-number (match-string 2 s)) | |
2857 nil nil nil) | |
2858 (make-list 9 0))) | |
2859 | |
2860 (defun org-timestamp-up (&optional arg) | |
2861 "Increase the date item at the cursor by one. | |
2862 If the cursor is on the year, change the year. If it is on the month or | |
2863 the day, change that. | |
2864 With prefix ARG, change by that many units." | |
2865 (interactive "p") | |
2866 (org-timestamp-change (prefix-numeric-value arg))) | |
2867 | |
2868 (defun org-timestamp-down (&optional arg) | |
2869 "Decrease the date item at the cursor by one. | |
2870 If the cursor is on the year, change the year. If it is on the month or | |
2871 the day, change that. | |
2872 With prefix ARG, change by that many units." | |
2873 (interactive "p") | |
2874 (org-timestamp-change (- (prefix-numeric-value arg)))) | |
2875 | |
2876 (defun org-timestamp-up-day (&optional arg) | |
2877 "Increase the date in the time stamp by one day. | |
2878 With prefix ARG, change that many days." | |
2879 (interactive "p") | |
2880 (org-timestamp-change (prefix-numeric-value arg) 'day)) | |
2881 | |
2882 (defun org-timestamp-down-day (&optional arg) | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
2883 "Decrease the date in the time stamp by one day. |
58792 | 2884 With prefix ARG, change that many days." |
2885 (interactive "p") | |
2886 (org-timestamp-change (- (prefix-numeric-value arg)) 'day)) | |
2887 | |
2888 (defsubst org-pos-in-match-range (pos n) | |
2889 (and (match-beginning n) | |
2890 (<= (match-beginning n) pos) | |
2891 (>= (match-end n) pos))) | |
2892 | |
2893 (defun org-at-timestamp-p () | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
2894 "Determine if the cursor is or at a timestamp." |
58792 | 2895 (interactive) |
2896 (let* ((tsr org-ts-regexp2) | |
2897 (pos (point)) | |
2898 (ans (or (looking-at tsr) | |
2899 (save-excursion | |
2900 (skip-chars-backward "^<\n\r\t") | |
2901 (if (> (point) 1) (backward-char 1)) | |
2902 (and (looking-at tsr) | |
2903 (> (- (match-end 0) pos) -1)))))) | |
2904 (and (boundp 'org-ts-what) | |
2905 (setq org-ts-what | |
2906 (cond | |
2907 ((org-pos-in-match-range pos 2) 'year) | |
2908 ((org-pos-in-match-range pos 3) 'month) | |
2909 ((org-pos-in-match-range pos 7) 'hour) | |
2910 ((org-pos-in-match-range pos 8) 'minute) | |
2911 ((or (org-pos-in-match-range pos 4) | |
2912 (org-pos-in-match-range pos 5)) 'day) | |
2913 (t 'day)))) | |
2914 ans)) | |
2915 | |
2916 (defun org-timestamp-change (n &optional what) | |
2917 "Change the date in the time stamp at point. | |
2918 The date will be changed by N times WHAT. WHAT can be `day', `month', | |
2919 `year', `minute', `second'. If WHAT is not given, the cursor position | |
2920 in the timestamp determines what will be changed." | |
2921 (let ((fmt (car org-time-stamp-formats)) | |
2922 org-ts-what | |
2923 (pos (point)) | |
2924 ts time time0) | |
2925 (if (not (org-at-timestamp-p)) | |
2926 (error "Not at a timestamp")) | |
2927 (setq org-ts-what (or what org-ts-what)) | |
2928 (setq fmt (if (<= (abs (- (cdr org-ts-lengths) | |
2929 (- (match-end 0) (match-beginning 0)))) | |
2930 1) | |
2931 (cdr org-time-stamp-formats) | |
2932 (car org-time-stamp-formats))) | |
2933 (setq ts (match-string 0)) | |
2934 (replace-match "") | |
2935 (setq time0 (org-parse-time-string ts)) | |
2936 (setq time | |
2937 (apply 'encode-time | |
2938 (append | |
2939 (list (or (car time0) 0)) | |
2940 (list (+ (if (eq org-ts-what 'minute) n 0) (nth 1 time0))) | |
2941 (list (+ (if (eq org-ts-what 'hour) n 0) (nth 2 time0))) | |
2942 (list (+ (if (eq org-ts-what 'day) n 0) (nth 3 time0))) | |
2943 (list (+ (if (eq org-ts-what 'month) n 0) (nth 4 time0))) | |
2944 (list (+ (if (eq org-ts-what 'year) n 0) (nth 5 time0))) | |
2945 (nthcdr 6 time0)))) | |
2946 (if (eq what 'calendar) | |
2947 (let ((cal-date | |
2948 (save-excursion | |
2949 (save-match-data | |
2950 (set-buffer "*Calendar*") | |
2951 (calendar-cursor-to-date))))) | |
2952 (setcar (nthcdr 4 time0) (nth 0 cal-date)) ; month | |
2953 (setcar (nthcdr 3 time0) (nth 1 cal-date)) ; day | |
2954 (setcar (nthcdr 5 time0) (nth 2 cal-date)) ; year | |
2955 (setcar time0 (or (car time0) 0)) | |
2956 (setcar (nthcdr 1 time0) (or (nth 1 time0) 0)) | |
2957 (setcar (nthcdr 2 time0) (or (nth 1 time0) 0)) | |
2958 (setq time (apply 'encode-time time0)))) | |
2959 (insert (setq org-last-changed-timestamp (format-time-string fmt time))) | |
2960 (goto-char pos) | |
2961 ;; Try to recenter the calendar window, if any | |
2962 (if (and org-calendar-follow-timestamp-change | |
2963 (get-buffer-window "*Calendar*" t) | |
2964 (memq org-ts-what '(day month year))) | |
2965 (org-recenter-calendar (time-to-days time))))) | |
2966 | |
2967 (defun org-recenter-calendar (date) | |
2968 "If the calendar is visible, recenter it to DATE." | |
2969 (let* ((win (selected-window)) | |
2970 (cwin (get-buffer-window "*Calendar*" t))) | |
2971 (when cwin | |
2972 (select-window cwin) | |
2973 (calendar-goto-date (if (listp date) date | |
2974 (calendar-gregorian-from-absolute date))) | |
2975 (select-window win)))) | |
2976 | |
2977 (defun org-goto-calendar (&optional arg) | |
2978 "Go to the Emacs calendar at the current date. | |
2979 If there is a time stamp in the current line, go to that date. | |
2980 A prefix ARG can be used force the current date." | |
2981 (interactive "P") | |
2982 (let ((tsr org-ts-regexp) diff) | |
2983 (if (or (org-at-timestamp-p) | |
2984 (save-excursion | |
2985 (beginning-of-line 1) | |
2986 (looking-at (concat ".*" tsr)))) | |
2987 (let ((d1 (time-to-days (current-time))) | |
2988 (d2 (time-to-days | |
2989 (org-time-string-to-time (match-string 1))))) | |
2990 (setq diff (- d2 d1)))) | |
2991 (calendar) | |
2992 (calendar-goto-today) | |
2993 (if (and diff (not arg)) (calendar-forward-day diff)))) | |
2994 | |
2995 (defun org-date-from-calendar () | |
2996 "Insert time stamp corresponding to cursor date in *Calendar* buffer. | |
2997 If there is already a time stamp at the cursor position, update it." | |
2998 (interactive) | |
2999 (org-timestamp-change 0 'calendar)) | |
3000 | |
3001 ;;; Agenda, and Diary Integration | |
3002 | |
3003 ;;; Define the mode | |
3004 | |
3005 (defvar org-agenda-mode-map (make-sparse-keymap) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3006 "Keymap for `org-agenda-mode'.") |
58792 | 3007 |
3008 (defvar org-agenda-menu) | |
3009 (defvar org-agenda-follow-mode nil) | |
3010 (defvar org-agenda-buffer-name "*Org Agenda*") | |
3011 (defvar org-agenda-redo-command nil) | |
3012 | |
3013 ;;;###autoload | |
3014 (defun org-agenda-mode () | |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
3015 "Mode for time-sorted view on action items in Org-mode files. |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
3016 |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
3017 The following commands are available: |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
3018 |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
3019 \\{org-agenda-mode-map}" |
58792 | 3020 (interactive) |
3021 (kill-all-local-variables) | |
3022 (setq major-mode 'org-agenda-mode) | |
3023 (setq mode-name "Org-Agenda") | |
3024 (use-local-map org-agenda-mode-map) | |
3025 (easy-menu-add org-agenda-menu) | |
3026 (if org-startup-truncated (setq truncate-lines t)) | |
3027 (add-hook 'post-command-hook 'org-agenda-post-command-hook nil 'local) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3028 (add-hook 'pre-command-hook 'org-unhighlight nil 'local) |
58792 | 3029 (setq org-agenda-follow-mode nil) |
3030 (easy-menu-change | |
3031 '("Agenda") "Agenda Files" | |
3032 (append | |
3033 (list | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3034 ["Edit File List" (customize-variable 'org-agenda-files) t] |
58792 | 3035 "--") |
3036 (mapcar 'org-file-menu-entry org-agenda-files))) | |
3037 (org-agenda-set-mode-name) | |
3038 (run-hooks 'org-agenda-mode-hook)) | |
3039 | |
3040 (define-key org-agenda-mode-map [(tab)] 'org-agenda-goto) | |
3041 (define-key org-agenda-mode-map [(return)] 'org-agenda-switch-to) | |
3042 (define-key org-agenda-mode-map " " 'org-agenda-show) | |
3043 (define-key org-agenda-mode-map "\C-c\C-t" 'org-agenda-todo) | |
3044 (define-key org-agenda-mode-map "o" 'delete-other-windows) | |
3045 (define-key org-agenda-mode-map "l" 'org-agenda-recenter) | |
3046 (define-key org-agenda-mode-map "t" 'org-agenda-todo) | |
3047 (define-key org-agenda-mode-map "." 'org-agenda-goto-today) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3048 (define-key org-agenda-mode-map "w" 'org-agenda-toggle-week-view) |
58792 | 3049 (define-key org-agenda-mode-map [(shift right)] 'org-agenda-date-later) |
3050 (define-key org-agenda-mode-map [(shift left)] 'org-agenda-date-earlier) | |
3051 | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3052 (define-key org-agenda-mode-map ">" 'org-agenda-date-prompt) |
58792 | 3053 (let ((l '(1 2 3 4 5 6 7 8 9 0))) |
3054 (while l (define-key org-agenda-mode-map | |
3055 (int-to-string (pop l)) 'digit-argument))) | |
3056 | |
3057 (define-key org-agenda-mode-map "f" 'org-agenda-follow-mode) | |
3058 (define-key org-agenda-mode-map "d" 'org-agenda-toggle-diary) | |
3059 (define-key org-agenda-mode-map "r" 'org-agenda-redo) | |
3060 (define-key org-agenda-mode-map "q" 'org-agenda-quit) | |
3061 (define-key org-agenda-mode-map "x" 'org-agenda-exit) | |
3062 (define-key org-agenda-mode-map "P" 'org-agenda-show-priority) | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3063 (define-key org-agenda-mode-map "n" 'next-line) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3064 (define-key org-agenda-mode-map "p" 'previous-line) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3065 (define-key org-agenda-mode-map "\C-n" 'org-agenda-next-date-line) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3066 (define-key org-agenda-mode-map "\C-p" 'org-agenda-previous-date-line) |
58792 | 3067 (define-key org-agenda-mode-map "," 'org-agenda-priority) |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3068 (define-key org-agenda-mode-map "\C-c," 'org-agenda-priority) |
58792 | 3069 (define-key org-agenda-mode-map "i" 'org-agenda-diary-entry) |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3070 (define-key org-agenda-mode-map "c" 'org-agenda-goto-calendar) |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3071 (eval-after-load "calendar" |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3072 '(define-key calendar-mode-map org-calendar-to-agenda-key |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3073 'org-calendar-goto-agenda)) |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3074 (define-key org-agenda-mode-map "C" 'org-agenda-convert-date) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3075 (define-key org-agenda-mode-map "m" 'org-agenda-phases-of-moon) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3076 (define-key org-agenda-mode-map "M" 'org-agenda-phases-of-moon) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3077 (define-key org-agenda-mode-map "s" 'org-agenda-sunrise-sunset) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3078 (define-key org-agenda-mode-map "S" 'org-agenda-sunrise-sunset) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3079 (define-key org-agenda-mode-map "h" 'org-agenda-holidays) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3080 (define-key org-agenda-mode-map "H" 'org-agenda-holidays) |
58792 | 3081 (define-key org-agenda-mode-map "+" 'org-agenda-priority-up) |
3082 (define-key org-agenda-mode-map "-" 'org-agenda-priority-down) | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3083 (define-key org-agenda-mode-map [(shift up)] 'org-agenda-priority-up) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3084 (define-key org-agenda-mode-map [(shift down)] 'org-agenda-priority-down) |
58792 | 3085 (define-key org-agenda-mode-map [(right)] 'org-agenda-later) |
3086 (define-key org-agenda-mode-map [(left)] 'org-agenda-earlier) | |
3087 | |
3088 (defvar org-agenda-keymap (copy-keymap org-agenda-mode-map) | |
3089 "Local keymap for agenda entries from Org-mode.") | |
3090 | |
3091 (define-key org-agenda-keymap | |
3092 (if org-xemacs-p [(button2)] [(mouse-2)]) 'org-agenda-goto-mouse) | |
3093 (define-key org-agenda-keymap | |
3094 (if org-xemacs-p [(button3)] [(mouse-3)]) 'org-agenda-show-mouse) | |
3095 | |
3096 (easy-menu-define org-agenda-menu org-agenda-mode-map "Agenda menu" | |
3097 '("Agenda" | |
3098 ("Agenda Files") | |
3099 "--" | |
3100 ["Show" org-agenda-show t] | |
3101 ["Go To (other window)" org-agenda-goto t] | |
3102 ["Go To (one window)" org-agenda-switch-to t] | |
3103 ["Follow Mode" org-agenda-follow-mode | |
3104 :style toggle :selected org-agenda-follow-mode :active t] | |
3105 "--" | |
3106 ["Cycle TODO" org-agenda-todo t] | |
3107 ("Reschedule" | |
3108 ["Reschedule +1 day" org-agenda-date-later t] | |
3109 ["Reschedule -1 day" org-agenda-date-earlier t] | |
3110 "--" | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3111 ["Reschedule to ..." org-agenda-date-prompt t]) |
58792 | 3112 ("Priority" |
3113 ["Set Priority" org-agenda-priority t] | |
3114 ["Increase Priority" org-agenda-priority-up t] | |
3115 ["Decrease Priority" org-agenda-priority-down t] | |
3116 ["Show Priority" org-agenda-show-priority t]) | |
3117 "--" | |
3118 ["Rebuild" org-agenda-redo t] | |
3119 ["Goto Today" org-agenda-goto-today t] | |
3120 ["Next Dates" org-agenda-later (local-variable-p 'starting-day)] | |
3121 ["Previous Dates" org-agenda-earlier (local-variable-p 'starting-day)] | |
3122 "--" | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3123 ["Week/Day View" org-agenda-toggle-week-view |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3124 (local-variable-p 'starting-day)] |
58792 | 3125 ["Include Diary" org-agenda-toggle-diary |
3126 :style toggle :selected org-agenda-include-diary :active t] | |
3127 "--" | |
3128 ["New Diary Entry" org-agenda-diary-entry t] | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3129 ("Calendar Commands" |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3130 ["Goto Calendar" org-agenda-goto-calendar t] |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3131 ["Phases of the Moon" org-agenda-phases-of-moon t] |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3132 ["Sunrise/Sunset" org-agenda-sunrise-sunset t] |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3133 ["Holidays" org-agenda-holidays t] |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3134 ["Convert" org-agenda-convert-date t]) |
58792 | 3135 "--" |
3136 ["Quit" org-agenda-quit t] | |
3137 ["Exit and Release Buffers" org-agenda-exit t] | |
3138 )) | |
3139 | |
3140 (defvar org-agenda-markers nil | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3141 "List of all currently active markers created by `org-agenda'.") |
58792 | 3142 (defvar org-agenda-last-marker-time (time-to-seconds (current-time)) |
3143 "Creation time of the last agenda marker.") | |
3144 | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3145 (defun org-agenda-new-marker (&optional pos) |
58792 | 3146 "Return a new agenda marker. |
3147 Org-mode keeps a list of these markers and resets them when they are | |
3148 no longer in use." | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3149 (let ((m (copy-marker (or pos (point))))) |
58792 | 3150 (setq org-agenda-last-marker-time (time-to-seconds (current-time))) |
3151 (push m org-agenda-markers) | |
3152 m)) | |
3153 | |
3154 (defun org-agenda-maybe-reset-markers (&optional force) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3155 "Reset markers created by `org-agenda'. But only if they are old enough." |
58792 | 3156 (if (or force |
3157 (> (- (time-to-seconds (current-time)) | |
3158 org-agenda-last-marker-time) | |
3159 5)) | |
3160 (while org-agenda-markers | |
3161 (move-marker (pop org-agenda-markers) nil)))) | |
3162 | |
3163 (defvar org-agenda-new-buffers nil | |
3164 "Buffers created to visit agenda files.") | |
3165 | |
3166 (defun org-get-agenda-file-buffer (file) | |
3167 "Get a buffer visiting FILE. If the buffer needs to be created, add | |
3168 it to the list of buffers which might be released later." | |
3169 (let ((buf (find-buffer-visiting file))) | |
3170 (if buf | |
3171 buf ; just return it | |
3172 ;; Make a new buffer and remember it | |
3173 (setq buf (find-file-noselect file)) | |
3174 (if buf (push buf org-agenda-new-buffers)) | |
3175 buf))) | |
3176 | |
3177 (defun org-release-buffers (blist) | |
3178 "Release all buffers in list, asking the user for confirmation when needed. | |
3179 When a buffer is unmodified, it is just killed. When modified, it is saved | |
3180 \(if the user agrees) and then killed." | |
3181 (let (buf file) | |
3182 (while (setq buf (pop blist)) | |
3183 (setq file (buffer-file-name buf)) | |
3184 (when (and (buffer-modified-p buf) | |
3185 file | |
3186 (y-or-n-p (format "Save file %s? " file))) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3187 (with-current-buffer buf (save-buffer))) |
58792 | 3188 (kill-buffer buf)))) |
3189 | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3190 (defvar org-respect-restriction nil) ; Dynamically-scoped param. |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3191 |
58792 | 3192 (defun org-timeline (&optional include-all) |
3193 "Show a time-sorted view of the entries in the current org file. | |
3194 Only entries with a time stamp of today or later will be listed. With | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3195 one \\[universal-argument] prefix argument, past entries will also be listed. |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3196 With two \\[universal-argument] prefixes, all unfinished TODO items will also be shown, |
58792 | 3197 under the current date. |
3198 If the buffer contains an active region, only check the region for | |
3199 dates." | |
3200 (interactive "P") | |
3201 (require 'calendar) | |
3202 (org-agenda-maybe-reset-markers 'force) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3203 (org-compile-prefix-format org-timeline-prefix-format) |
58792 | 3204 (let* ((dopast include-all) |
3205 (dotodo (equal include-all '(16))) | |
3206 (entry (buffer-file-name)) | |
3207 (org-agenda-files (list (buffer-file-name))) | |
3208 (date (calendar-current-date)) | |
3209 (win (selected-window)) | |
3210 (pos1 (point)) | |
3211 (beg (if (org-region-active-p) (region-beginning) (point-min))) | |
3212 (end (if (org-region-active-p) (region-end) (point-max))) | |
3213 (day-numbers (org-get-all-dates beg end 'no-ranges | |
3214 t)) ; always include today | |
3215 (today (time-to-days (current-time))) | |
3216 (org-respect-restriction t) | |
3217 (past t) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3218 s e rtn d) |
58792 | 3219 (setq org-agenda-redo-command |
3220 (list 'progn | |
3221 (list 'switch-to-buffer-other-window (current-buffer)) | |
3222 (list 'org-timeline include-all))) | |
3223 (if (not dopast) | |
3224 ;; Remove past dates from the list of dates. | |
3225 (setq day-numbers (delq nil (mapcar (lambda(x) | |
3226 (if (>= x today) x nil)) | |
3227 day-numbers)))) | |
3228 (switch-to-buffer-other-window | |
3229 (get-buffer-create org-agenda-buffer-name)) | |
3230 (setq buffer-read-only nil) | |
3231 (erase-buffer) | |
3232 (org-agenda-mode) (setq buffer-read-only nil) | |
3233 (while (setq d (pop day-numbers)) | |
3234 (if (and (>= d today) | |
3235 dopast | |
3236 past) | |
3237 (progn | |
3238 (setq past nil) | |
3239 (insert (make-string 79 ?-) "\n"))) | |
3240 (setq date (calendar-gregorian-from-absolute d)) | |
3241 (setq s (point)) | |
3242 (if dotodo | |
3243 (setq rtn (org-agenda-get-day-entries | |
3244 entry date :todo :timestamp)) | |
3245 (setq rtn (org-agenda-get-day-entries entry date :timestamp))) | |
3246 (if (or rtn (equal d today)) | |
3247 (progn | |
3248 (insert (calendar-day-name date) " " | |
3249 (number-to-string (extract-calendar-day date)) " " | |
3250 (calendar-month-name (extract-calendar-month date)) " " | |
3251 (number-to-string (extract-calendar-year date)) "\n") | |
3252 (put-text-property s (1- (point)) 'face | |
3253 'org-link-face) | |
3254 (if (equal d today) | |
3255 (put-text-property s (1- (point)) 'org-today t)) | |
3256 (insert (org-finalize-agenda-entries rtn) "\n") | |
3257 (put-text-property s (1- (point)) 'day d)))) | |
3258 (goto-char (point-min)) | |
3259 (setq buffer-read-only t) | |
3260 (goto-char (or (text-property-any (point-min) (point-max) 'org-today t) | |
3261 (point-min))) | |
3262 (when (not org-select-timeline-window) | |
3263 (select-window win) | |
3264 (goto-char pos1)))) | |
3265 | |
3266 ;;;###autoload | |
3267 (defun org-agenda (&optional include-all start-day ndays) | |
3268 "Produce a weekly view from all files in variable `org-agenda-files'. | |
3269 The view will be for the current week, but from the overview buffer you | |
3270 will be able to go to other weeks. | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3271 With one \\[universal-argument] prefix argument INCLUDE-ALL, all unfinished TODO items will |
58792 | 3272 also be shown, under the current date. |
3273 START-DAY defaults to TODAY, or to the most recent match for the weekday | |
3274 given in `org-agenda-start-on-weekday'. | |
3275 NDAYS defaults to `org-agenda-ndays'." | |
3276 (interactive "P") | |
3277 (org-agenda-maybe-reset-markers 'force) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3278 (org-compile-prefix-format org-agenda-prefix-format) |
58792 | 3279 (require 'calendar) |
3280 (let* ((org-agenda-start-on-weekday | |
3281 (if (or (equal ndays 1) | |
3282 (and (null ndays) (equal 1 org-agenda-ndays))) | |
3283 nil org-agenda-start-on-weekday)) | |
3284 (files (copy-sequence org-agenda-files)) | |
3285 (win (selected-window)) | |
3286 (today (time-to-days (current-time))) | |
3287 (sd (or start-day today)) | |
3288 (start (if (or (null org-agenda-start-on-weekday) | |
3289 (< org-agenda-ndays 7)) | |
3290 sd | |
3291 (let* ((nt (calendar-day-of-week | |
3292 (calendar-gregorian-from-absolute sd))) | |
3293 (n1 org-agenda-start-on-weekday) | |
3294 (d (- nt n1))) | |
3295 (- sd (+ (if (< d 0) 7 0) d))))) | |
3296 (day-numbers (list start)) | |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3297 s e rtn rtnall file date d start-pos end-pos) |
58792 | 3298 (setq org-agenda-redo-command |
3299 (list 'org-agenda include-all start-day ndays)) | |
3300 ;; Make the list of days | |
3301 (setq ndays (or ndays org-agenda-ndays)) | |
3302 (while (> ndays 1) | |
3303 (push (1+ (car day-numbers)) day-numbers) | |
3304 (setq ndays (1- ndays))) | |
3305 (setq day-numbers (nreverse day-numbers)) | |
3306 (if (not (equal (current-buffer) (get-buffer org-agenda-buffer-name))) | |
3307 (progn | |
3308 (delete-other-windows) | |
3309 (switch-to-buffer-other-window | |
3310 (get-buffer-create org-agenda-buffer-name)))) | |
3311 (setq buffer-read-only nil) | |
3312 (erase-buffer) | |
3313 (org-agenda-mode) (setq buffer-read-only nil) | |
3314 (set (make-local-variable 'starting-day) (car day-numbers)) | |
3315 (set (make-local-variable 'include-all-loc) include-all) | |
3316 (when (and (or include-all org-agenda-include-all-todo) | |
3317 (member today day-numbers)) | |
3318 (setq files org-agenda-files | |
3319 rtnall nil) | |
3320 (while (setq file (pop files)) | |
3321 (catch 'nextfile | |
3322 (org-check-agenda-file file) | |
3323 (setq date (calendar-gregorian-from-absolute today) | |
3324 rtn (org-agenda-get-day-entries | |
3325 file date :todo)) | |
3326 (setq rtnall (append rtnall rtn)))) | |
3327 (if rtnall (insert (org-finalize-agenda-entries rtnall) "\n"))) | |
3328 (while (setq d (pop day-numbers)) | |
3329 (setq date (calendar-gregorian-from-absolute d) | |
3330 s (point)) | |
3331 (if (or (= d today) | |
3332 (and (not start-pos) (= d sd))) | |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3333 (setq start-pos (point)) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3334 (if (and start-pos (not end-pos)) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3335 (setq end-pos (point)))) |
58792 | 3336 (setq files org-agenda-files |
3337 rtnall nil) | |
3338 (while (setq file (pop files)) | |
3339 (catch 'nextfile | |
3340 (org-check-agenda-file file) | |
3341 (setq rtn (org-agenda-get-day-entries file date)) | |
3342 (setq rtnall (append rtnall rtn)))) | |
3343 (if org-agenda-include-diary | |
3344 (progn | |
3345 (require 'diary-lib) | |
3346 (setq rtn (org-get-entries-from-diary date)) | |
3347 (setq rtnall (append rtnall rtn)))) | |
3348 (if (or rtnall org-agenda-show-all-dates) | |
3349 (progn | |
3350 (insert (format "%-9s %2d %-9s %4d\n" | |
3351 (calendar-day-name date) | |
3352 (extract-calendar-day date) | |
3353 (calendar-month-name (extract-calendar-month date)) | |
3354 (extract-calendar-year date))) | |
3355 (put-text-property s (1- (point)) 'face | |
3356 'org-link-face) | |
3357 (if rtnall (insert (org-finalize-agenda-entries rtnall) "\n")) | |
3358 (put-text-property s (1- (point)) 'day d)))) | |
3359 (goto-char (point-min)) | |
3360 (setq buffer-read-only t) | |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3361 (if org-fit-agenda-window |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3362 (fit-window-to-buffer nil (/ (* (frame-height) 3) 4) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3363 (/ (frame-height) 2))) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3364 (unless (and (pos-visible-in-window-p (point-min)) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3365 (pos-visible-in-window-p (point-max))) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3366 (goto-char (1- (point-max))) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3367 (recenter -1) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3368 (if (not (pos-visible-in-window-p (or start-pos 1))) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3369 (progn |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3370 (goto-char (or start-pos 1)) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3371 (recenter 1)))) |
58792 | 3372 (goto-char (or start-pos 1)) |
3373 (if (not org-select-agenda-window) (select-window win)) | |
3374 (message ""))) | |
3375 | |
3376 (defun org-check-agenda-file (file) | |
3377 "Make sure FILE exists. If not, ask user what to do." | |
3378 ;; FIXME: this does not correctly change the menus | |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
3379 ;; Could probably be fixed by explicitly going to the buffer. |
58792 | 3380 (when (not (file-exists-p file)) |
3381 (message "non-existent file %s. [R]emove from agenda-files or [A]bort?" | |
3382 file) | |
3383 (let ((r (downcase (read-char-exclusive)))) | |
3384 (cond | |
3385 ((equal r ?r) | |
3386 (org-remove-file file) | |
3387 (throw 'nextfile t)) | |
3388 (t (error "Abort")))))) | |
3389 | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3390 (defun org-agenda-quit () |
58792 | 3391 "Exit agenda by removing the window or the buffer." |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3392 (interactive) |
58792 | 3393 (let ((buf (current-buffer))) |
3394 (if (not (one-window-p)) (delete-window)) | |
3395 (kill-buffer buf) | |
3396 (org-agenda-maybe-reset-markers 'force))) | |
3397 | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3398 (defun org-agenda-exit () |
58792 | 3399 "Exit agenda by removing the window or the buffer. |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3400 Also kill all Org-mode buffers which have been loaded by `org-agenda'. |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3401 Org-mode buffers visited directly by the user will not be touched." |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3402 (interactive) |
58792 | 3403 (org-release-buffers org-agenda-new-buffers) |
3404 (setq org-agenda-new-buffers nil) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3405 (org-agenda-quit)) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3406 |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3407 (defun org-agenda-redo () |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3408 "Rebuild Agenda." |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3409 (interactive) |
58792 | 3410 (eval org-agenda-redo-command)) |
3411 | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3412 (defun org-agenda-goto-today () |
58792 | 3413 "Go to today." |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3414 (interactive) |
58792 | 3415 (if (boundp 'starting-day) |
3416 (let ((cmd (car org-agenda-redo-command)) | |
3417 (iall (nth 1 org-agenda-redo-command)) | |
3418 (nday (nth 3 org-agenda-redo-command))) | |
3419 (eval (list cmd iall nil nday))) | |
3420 (goto-char (or (text-property-any (point-min) (point-max) 'org-today t) | |
3421 (point-min))))) | |
3422 | |
3423 (defun org-agenda-later (arg) | |
3424 "Go forward in time by `org-agenda-ndays' days. | |
3425 With prefix ARG, go forward that many times `org-agenda-ndays'." | |
3426 (interactive "p") | |
3427 (unless (boundp 'starting-day) | |
3428 (error "Not allowed")) | |
3429 (org-agenda (if (boundp 'include-all-loc) include-all-loc nil) | |
3430 (+ starting-day (* arg org-agenda-ndays)))) | |
3431 | |
3432 (defun org-agenda-earlier (arg) | |
3433 "Go back in time by `org-agenda-ndays' days. | |
3434 With prefix ARG, go back that many times `org-agenda-ndays'." | |
3435 (interactive "p") | |
3436 (unless (boundp 'starting-day) | |
3437 (error "Not allowed")) | |
3438 (org-agenda (if (boundp 'include-all-loc) include-all-loc nil) | |
3439 (- starting-day (* arg org-agenda-ndays)))) | |
3440 | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3441 (defun org-agenda-toggle-week-view () |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3442 "Toggle weekly/daily view for aagenda." |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3443 (interactive) |
58792 | 3444 (unless (boundp 'starting-day) |
3445 (error "Not allowed")) | |
3446 (setq org-agenda-ndays | |
3447 (if (equal org-agenda-ndays 1) 7 1)) | |
3448 (org-agenda include-all-loc | |
3449 (or (get-text-property (point) 'day) | |
3450 starting-day)) | |
3451 (org-agenda-set-mode-name) | |
3452 (message "Switched to %s view" | |
3453 (if (equal org-agenda-ndays 1) "day" "week"))) | |
3454 | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3455 (defun org-agenda-next-date-line (&optional arg) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3456 "Jump to the next line indicating a date in agenda buffer." |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3457 (interactive "p") |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3458 (beginning-of-line 1) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3459 (if (looking-at "^\\S-") (forward-char 1)) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3460 (if (not (re-search-forward "^\\S-" nil t arg)) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3461 (progn |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3462 (backward-char 1) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3463 (error "No next date after this line in this buffer."))) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3464 (goto-char (match-beginning 0))) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3465 |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3466 (defun org-agenda-previous-date-line (&optional arg) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3467 "Jump to the next line indicating a date in agenda buffer." |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3468 (interactive "p") |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3469 (beginning-of-line 1) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3470 (if (not (re-search-backward "^\\S-" nil t arg)) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3471 (error "No previous date before this line in this buffer."))) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3472 |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3473 ;; Initialize the highlight |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3474 (defvar org-hl (funcall (if org-xemacs-p 'make-extent 'make-overlay) 1 1)) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3475 (funcall (if org-xemacs-p 'set-extent-property 'overlay-put) org-hl |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3476 'face 'highlight) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3477 |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3478 (defun org-highlight (begin end &optional buffer) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3479 "Highlight a region with overlay." |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3480 (funcall (if org-xemacs-p 'set-extent-endpoints 'move-overlay) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3481 org-hl begin end (or buffer (current-buffer)))) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3482 |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3483 (defun org-unhighlight () |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3484 "Detach overlay INDEX." |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3485 (funcall (if org-xemacs-p 'detach-extent 'delete-overlay) org-hl)) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3486 |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3487 |
58792 | 3488 (defun org-agenda-follow-mode () |
3489 "Toggle follow mode in an agenda buffer." | |
3490 (interactive) | |
3491 (setq org-agenda-follow-mode (not org-agenda-follow-mode)) | |
3492 (org-agenda-set-mode-name) | |
3493 (message "Follow mode is %s" | |
3494 (if org-agenda-follow-mode "on" "off"))) | |
3495 | |
3496 (defun org-agenda-toggle-diary () | |
3497 "Toggle follow mode in an agenda buffer." | |
3498 (interactive) | |
3499 (setq org-agenda-include-diary (not org-agenda-include-diary)) | |
3500 (org-agenda-redo) | |
3501 (org-agenda-set-mode-name) | |
3502 (message "Diary inclusion turned %s" | |
3503 (if org-agenda-include-diary "on" "off"))) | |
3504 | |
3505 (defun org-agenda-set-mode-name () | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3506 "Set the mode name to indicate all the small mode settings." |
58792 | 3507 (setq mode-name |
3508 (concat "Org-Agenda" | |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3509 (if (equal org-agenda-ndays 1) " Day" "") |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3510 (if (equal org-agenda-ndays 7) " Week" "") |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3511 (if org-agenda-follow-mode " Follow" "") |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3512 (if org-agenda-include-diary " Diary" ""))) |
58792 | 3513 (force-mode-line-update)) |
3514 | |
3515 (defun org-agenda-post-command-hook () | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3516 (and (eolp) (not (bolp)) (backward-char 1)) |
58792 | 3517 (if (and org-agenda-follow-mode |
3518 (get-text-property (point) 'org-marker)) | |
3519 (org-agenda-show))) | |
3520 | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3521 (defvar org-disable-diary nil) ;Dynamically-scoped param. |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3522 |
58792 | 3523 (defun org-get-entries-from-diary (date) |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3524 "Get the (Emacs Calendar) diary entries for DATE." |
58792 | 3525 (let* ((fancy-diary-buffer "*temporary-fancy-diary-buffer*") |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3526 (diary-display-hook '(fancy-diary-display)) |
62076
4f2150e05f24
(org-get-entries-from-diary): Remove unused vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61924
diff
changeset
|
3527 (list-diary-entries-hook |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3528 (cons 'org-diary-default-entry list-diary-entries-hook)) |
62076
4f2150e05f24
(org-get-entries-from-diary): Remove unused vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61924
diff
changeset
|
3529 entries |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3530 (org-disable-diary t)) |
58792 | 3531 (save-excursion |
3532 (save-window-excursion | |
3533 (list-diary-entries date 1))) | |
3534 (if (not (get-buffer fancy-diary-buffer)) | |
3535 (setq entries nil) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3536 (with-current-buffer fancy-diary-buffer |
58792 | 3537 (setq buffer-read-only nil) |
3538 (if (= (point-max) 1) | |
3539 ;; No entries | |
3540 (setq entries nil) | |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3541 ;; Omit the date and other unnecessary stuff |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3542 (org-agenda-cleanup-fancy-diary) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3543 ;; Add prefix to each line and extend the text properties |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3544 (if (= (point-max) 1) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3545 (setq entries nil) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3546 (setq entries (buffer-substring (point-min) (- (point-max) 1))))) |
58792 | 3547 (set-buffer-modified-p nil) |
3548 (kill-buffer fancy-diary-buffer))) | |
3549 (when entries | |
3550 (setq entries (org-split-string entries "\n")) | |
3551 (setq entries | |
3552 (mapcar | |
3553 (lambda (x) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3554 (setq x (org-format-agenda-item "" x "Diary")) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3555 ;; Extend the text properties to the beginning of the line |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3556 (add-text-properties |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3557 0 (length x) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3558 (text-properties-at (1- (length x)) x) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3559 x) |
58792 | 3560 x) |
3561 entries))))) | |
3562 | |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3563 (defun org-agenda-cleanup-fancy-diary () |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3564 "Remove unwanted stuff in buffer created by fancy-diary-display. |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3565 This gets rid of the date, the underline under the date, and |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3566 the dummy entry installed by `org-mode' to ensure non-empty diary for each |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3567 date. Itt also removes lines that contain only whitespace." |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3568 (goto-char (point-min)) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3569 (if (looking-at ".*?:[ \t]*") |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3570 (progn |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3571 (replace-match "") |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3572 (re-search-forward "\n=+$" nil t) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3573 (replace-match "") |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3574 (while (re-search-backward "^ +\n?" nil t) (replace-match ""))) |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3575 (re-search-forward "\n=+$" nil t) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3576 (delete-region (point-min) (min (point-max) (1+ (match-end 0))))) |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3577 (goto-char (point-min)) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3578 (while (re-search-forward "^ +\n" nil t) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3579 (replace-match "")) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3580 (goto-char (point-min)) |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3581 (if (re-search-forward "^Org-mode dummy\n?" nil t) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3582 (replace-match ""))) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3583 |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3584 ;; Advise the add-to-diary-list function to allow org to jump to |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3585 ;; diary entries. Wrapped into eval-after-load to avoid loading |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3586 ;; advice unnecessarily |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3587 (eval-after-load "diary-lib" |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3588 '(defadvice add-to-diary-list (before org-mark-diary-entry activate) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3589 "Make the position visible." |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3590 (if (and org-disable-diary ;; called from org-agenda |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3591 (stringp string) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3592 (buffer-file-name)) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3593 (add-text-properties |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3594 0 (length string) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3595 (list 'mouse-face 'highlight |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3596 'keymap org-agenda-keymap |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3597 'help-echo |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3598 (format |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3599 "mouse-2 or RET jump to diary file %s" |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3600 (abbreviate-file-name (buffer-file-name))) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3601 'org-agenda-diary-link t |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3602 'org-marker (org-agenda-new-marker (point-at-bol))) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3603 string)))) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3604 |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3605 (defun org-diary-default-entry () |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3606 "Add a dummy entry to the diary. |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3607 Needed to avoid empty dates which mess up holiday display." |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3608 ;; Catch the error if dealing with the new add-to-diary-alist |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3609 (condition-case nil |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3610 (add-to-diary-list original-date "Org-mode dummy" "") |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3611 (error |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3612 (add-to-diary-list original-date "Org-mode dummy" "" nil)))) |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
3613 |
58792 | 3614 (defun org-add-file (&optional file) |
3615 "Add current file to the list of files in variable `org-agenda-files'. | |
3616 These are the files which are being checked for agenda entries. | |
3617 Optional argument FILE means, use this file instead of the current. | |
3618 It is possible (but not recommended) to add this function to the | |
3619 `org-mode-hook'." | |
3620 (interactive) | |
3621 (catch 'exit | |
3622 (let* ((file (or file (buffer-file-name) | |
3623 (if (interactive-p) | |
3624 (error "Buffer is not visiting a file") | |
3625 (throw 'exit nil)))) | |
3626 (true-file (file-truename file)) | |
3627 (afile (abbreviate-file-name file)) | |
3628 (present (delq nil (mapcar | |
3629 (lambda (x) | |
3630 (equal true-file (file-truename x))) | |
3631 org-agenda-files)))) | |
3632 (if (not present) | |
3633 (progn | |
3634 (setq org-agenda-files | |
3635 (cons afile org-agenda-files)) | |
3636 ;; Make sure custom.el does not end up with Org-mode | |
3637 (let ((org-mode-hook nil) (default-major-mode 'fundamental-mode)) | |
3638 (customize-save-variable 'org-agenda-files org-agenda-files)) | |
3639 (org-install-agenda-files-menu) | |
3640 (message "Added file: %s" afile)) | |
3641 (message "File was already in list: %s" afile))))) | |
3642 | |
3643 (defun org-remove-file (&optional file) | |
3644 "Remove current file from the list of files in variable `org-agenda-files'. | |
3645 These are the files which are being checked for agenda entries. | |
3646 Optional argument FILE means, use this file instead of the current." | |
3647 (interactive) | |
3648 (let* ((file (or file (buffer-file-name))) | |
3649 (true-file (file-truename file)) | |
3650 (afile (abbreviate-file-name file)) | |
3651 (files (delq nil (mapcar | |
3652 (lambda (x) | |
3653 (if (equal true-file | |
3654 (file-truename x)) | |
3655 nil x)) | |
3656 org-agenda-files)))) | |
3657 (if (not (= (length files) (length org-agenda-files))) | |
3658 (progn | |
3659 (setq org-agenda-files files) | |
3660 (customize-save-variable 'org-agenda-files org-agenda-files) | |
3661 (org-install-agenda-files-menu) | |
3662 (message "Removed file: %s" afile)) | |
3663 (message "File was not in list: %s" afile)))) | |
3664 | |
3665 (defun org-file-menu-entry (file) | |
3666 (vector file (list 'find-file file) t)) | |
3667 | |
3668 (defun org-get-all-dates (beg end &optional no-ranges force-today) | |
3669 "Return a list of all relevant day numbers from BEG to END buffer positions. | |
3670 If NO-RANGES is non-nil, include only the start and end dates of a range, | |
3671 not every single day in the range. If FORCE-TODAY is non-nil, make | |
3672 sure that TODAY is included in the list." | |
3673 (let (dates date day day1 day2 ts1 ts2) | |
3674 (if force-today | |
3675 (setq dates (list (time-to-days (current-time))))) | |
3676 (save-excursion | |
3677 (goto-char beg) | |
3678 (while (re-search-forward org-ts-regexp end t) | |
3679 (setq day (time-to-days (org-time-string-to-time | |
3680 (substring (match-string 1) 0 10)))) | |
3681 (or (memq day dates) (push day dates))) | |
3682 (unless no-ranges | |
3683 (goto-char beg) | |
3684 (while (re-search-forward org-tr-regexp end t) | |
3685 (setq ts1 (substring (match-string 1) 0 10) | |
3686 ts2 (substring (match-string 2) 0 10) | |
3687 day1 (time-to-days (org-time-string-to-time ts1)) | |
3688 day2 (time-to-days (org-time-string-to-time ts2))) | |
3689 (while (< (setq day1 (1+ day1)) day2) | |
3690 (or (memq day1 dates) (push day1 dates))))) | |
3691 (sort dates '<)))) | |
3692 | |
3693 ;;;###autoload | |
3694 (defun org-diary (&rest args) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3695 "Return diary information from org-files. |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3696 This function can be used in a \"sexp\" diary entry in the Emacs calendar. |
58792 | 3697 It accesses org files and extracts information from those files to be |
3698 listed in the diary. The function accepts arguments specifying what | |
3699 items should be listed. The following arguments are allowed: | |
3700 | |
3701 :timestamp List the headlines of items containing a date stamp or | |
3702 date range matching the selected date. Deadlines will | |
3703 also be listed, on the expiration day. | |
3704 | |
3705 :deadline List any deadlines past due, or due within | |
3706 `org-deadline-warning-days'. The listing occurs only | |
3707 in the diary for *today*, not at any other date. If | |
3708 an entry is marked DONE, it is no longer listed. | |
3709 | |
3710 :scheduled List all items which are scheduled for the given date. | |
3711 The diary for *today* also contains items which were | |
3712 scheduled earlier and are not yet marked DONE. | |
3713 | |
3714 :todo List all TODO items from the org-file. This may be a | |
3715 long list - so this is not turned on by default. | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3716 Like deadlines, these entries only show up in the |
58792 | 3717 diary for *today*, not at any other date. |
3718 | |
3719 The call in the diary file should look like this: | |
3720 | |
3721 &%%(org-diary) ~/path/to/some/orgfile.org | |
3722 | |
3723 Use a separate line for each org file to check. Or, if you omit the file name, | |
3724 all files listed in `org-agenda-files' will be checked automatically: | |
3725 | |
3726 &%%(org-diary) | |
3727 | |
3728 If you don't give any arguments (as in the example above), the default | |
3729 arguments (:deadline :scheduled :timestamp) are used. So the example above may | |
3730 also be written as | |
3731 | |
3732 &%%(org-diary :deadline :timestamp :scheduled) | |
3733 | |
3734 The function expects the lisp variables `entry' and `date' to be provided | |
3735 by the caller, because this is how the calendar works. Don't use this | |
3736 function from a program - use `org-agenda-get-day-entries' instead." | |
3737 (org-agenda-maybe-reset-markers) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3738 (org-compile-agenda-prefix-format org-agenda-prefix-format) |
58792 | 3739 (setq args (or args '(:deadline :scheduled :timestamp))) |
3740 (let* ((files (if (and entry (stringp entry) (string-match "\\S-" entry)) | |
3741 (list entry) | |
3742 org-agenda-files)) | |
3743 file rtn results) | |
3744 ;; If this is called during org-agenda, don't return any entries to | |
3745 ;; the calendar. Org Agenda will list these entries itself. | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3746 (if org-disable-diary (setq files nil)) |
58792 | 3747 (while (setq file (pop files)) |
3748 (setq rtn (apply 'org-agenda-get-day-entries file date args)) | |
3749 (setq results (append results rtn))) | |
3750 (concat (org-finalize-agenda-entries results) "\n"))) | |
3751 | |
3752 (defun org-agenda-get-day-entries (file date &rest args) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3753 "Does the work for `org-diary' and `org-agenda'. |
58792 | 3754 FILE is the path to a file to be checked for entries. DATE is date like |
3755 the one returned by `calendar-current-date'. ARGS are symbols indicating | |
3756 which kind of entries should be extracted. For details about these, see | |
3757 the documentation of `org-diary'." | |
3758 (setq args (or args '(:deadline :scheduled :timestamp))) | |
3759 (let* ((org-startup-with-deadline-check nil) | |
3760 (org-startup-folded nil) | |
3761 (buffer (if (file-exists-p file) | |
3762 (org-get-agenda-file-buffer file) | |
3763 (error "No such file %s" file))) | |
3764 arg results rtn) | |
3765 (if (not buffer) | |
3766 ;; If file does not exist, make sure an error message ends up in diary | |
3767 (format "ORG-AGENDA-ERROR: No such org-file %s" file) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3768 (with-current-buffer buffer |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3769 (unless (eq major-mode 'org-mode) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3770 (error "Agenda file %s is not in `org-mode'" file)) |
58792 | 3771 (let ((case-fold-search nil)) |
3772 (save-excursion | |
3773 (save-restriction | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3774 (if org-respect-restriction |
58792 | 3775 (if (org-region-active-p) |
3776 ;; Respect a region to restrict search | |
3777 (narrow-to-region (region-beginning) (region-end))) | |
3778 ;; If we work for the calendar or many files, | |
3779 ;; get rid of any restriction | |
3780 (widen)) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3781 ;; The way we repeatedly append to `results' makes it O(n^2) :-( |
58792 | 3782 (while (setq arg (pop args)) |
3783 (cond | |
3784 ((and (eq arg :todo) | |
3785 (equal date (calendar-current-date))) | |
3786 (setq rtn (org-agenda-get-todos)) | |
3787 (setq results (append results rtn))) | |
3788 ((eq arg :timestamp) | |
3789 (setq rtn (org-agenda-get-blocks)) | |
3790 (setq results (append results rtn)) | |
3791 (setq rtn (org-agenda-get-timestamps)) | |
3792 (setq results (append results rtn))) | |
3793 ((eq arg :scheduled) | |
3794 (setq rtn (org-agenda-get-scheduled)) | |
3795 (setq results (append results rtn))) | |
3796 ((and (eq arg :deadline) | |
3797 (equal date (calendar-current-date))) | |
3798 (setq rtn (org-agenda-get-deadlines)) | |
3799 (setq results (append results rtn)))))))))) | |
3800 results)) | |
3801 | |
3802 (defun org-entry-is-done-p () | |
3803 "Is the current entry marked DONE?" | |
3804 (save-excursion | |
3805 (and (re-search-backward "[\r\n]\\*" nil t) | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3806 (looking-at org-nl-done-regexp)))) |
58792 | 3807 |
3808 (defun org-at-date-range-p () | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3809 "Is the cursor inside a date range?" |
58792 | 3810 (interactive) |
3811 (save-excursion | |
3812 (catch 'exit | |
3813 (let ((pos (point))) | |
3814 (skip-chars-backward "^<\r\n") | |
3815 (skip-chars-backward "<") | |
3816 (and (looking-at org-tr-regexp) | |
3817 (>= (match-end 0) pos) | |
3818 (throw 'exit t)) | |
3819 (skip-chars-backward "^<\r\n") | |
3820 (skip-chars-backward "<") | |
3821 (and (looking-at org-tr-regexp) | |
3822 (>= (match-end 0) pos) | |
3823 (throw 'exit t))) | |
3824 nil))) | |
3825 | |
3826 (defun org-agenda-get-todos () | |
3827 "Return the TODO information for agenda display." | |
3828 (let* ((props (list 'face nil | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3829 'done-face 'org-done-face |
58792 | 3830 'mouse-face 'highlight |
3831 'keymap org-agenda-keymap | |
3832 'help-echo | |
3833 (format "mouse-2 or RET jump to org file %s" | |
3834 (abbreviate-file-name (buffer-file-name))))) | |
3835 (regexp (concat "[\n\r]\\*+ *\\(" org-not-done-regexp | |
3836 "[^\n\r]*\\)")) | |
3837 marker priority | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3838 ee txt) |
58792 | 3839 (goto-char (point-min)) |
3840 (while (re-search-forward regexp nil t) | |
3841 (goto-char (match-beginning 1)) | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3842 (setq marker (org-agenda-new-marker (point-at-bol)) |
58792 | 3843 txt (org-format-agenda-item "" (match-string 1)) |
3844 priority | |
3845 (+ (org-get-priority txt) | |
3846 (if org-todo-kwd-priority-p | |
3847 (- org-todo-kwd-max-priority -2 | |
3848 (length | |
3849 (member (match-string 2) org-todo-keywords))) | |
3850 1))) | |
3851 (add-text-properties | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3852 0 (length txt) (append (list 'org-marker marker 'org-hd-marker marker |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3853 'priority priority) |
58792 | 3854 props) |
3855 txt) | |
3856 (push txt ee) | |
3857 (goto-char (match-end 1))) | |
3858 (nreverse ee))) | |
3859 | |
3860 (defconst org-agenda-no-heading-message | |
3861 "No heading for this item in buffer or region") | |
3862 | |
3863 (defun org-agenda-get-timestamps () | |
3864 "Return the date stamp information for agenda display." | |
3865 (let* ((props (list 'face nil | |
3866 'mouse-face 'highlight | |
3867 'keymap org-agenda-keymap | |
3868 'help-echo | |
3869 (format "mouse-2 or RET jump to org file %s" | |
3870 (abbreviate-file-name (buffer-file-name))))) | |
3871 (regexp (regexp-quote | |
3872 (substring | |
3873 (format-time-string | |
3874 (car org-time-stamp-formats) | |
3875 (apply 'encode-time ; DATE bound by calendar | |
3876 (list 0 0 0 (nth 1 date) (car date) (nth 2 date)))) | |
3877 0 11))) | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3878 marker hdmarker deadlinep scheduledp donep tmp priority |
58792 | 3879 ee txt) |
3880 (goto-char (point-min)) | |
3881 (while (re-search-forward regexp nil t) | |
3882 (if (not (save-match-data (org-at-date-range-p))) | |
3883 (progn | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3884 (setq marker (org-agenda-new-marker (match-beginning 0)) |
58792 | 3885 tmp (buffer-substring (max (point-min) |
3886 (- (match-beginning 0) | |
3887 org-ds-keyword-length)) | |
3888 (match-beginning 0)) | |
3889 deadlinep (string-match org-deadline-regexp tmp) | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3890 scheduledp (string-match org-scheduled-regexp tmp) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3891 donep (org-entry-is-done-p)) |
58792 | 3892 (save-excursion |
3893 (if (re-search-backward "\\(^\\|\r\\)\\*+" nil t) | |
3894 (progn | |
3895 (goto-char (match-end 1)) | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3896 (setq hdmarker (org-agenda-new-marker)) |
58792 | 3897 (looking-at "\\*+[ \t]*\\([^\r\n]+\\)") |
3898 (setq txt (org-format-agenda-item | |
3899 (format "%s%s" | |
3900 (if deadlinep "Deadline: " "") | |
3901 (if scheduledp "Scheduled: " "")) | |
3902 (match-string 1)))) | |
3903 (setq txt org-agenda-no-heading-message)) | |
3904 (setq priority (org-get-priority txt)) | |
3905 (add-text-properties | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3906 0 (length txt) (append (list 'org-marker marker |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3907 'org-hd-marker hdmarker) props) |
58792 | 3908 txt) |
3909 (if deadlinep | |
3910 (add-text-properties | |
3911 0 (length txt) | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3912 (list 'face |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3913 (if donep 'org-done-face 'org-warning-face) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3914 'undone-face 'org-warning-face |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3915 'done-face 'org-done-face |
58792 | 3916 'priority (+ 100 priority)) |
3917 txt) | |
3918 (if scheduledp | |
3919 (add-text-properties | |
3920 0 (length txt) | |
3921 (list 'face 'org-scheduled-today-face | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3922 'undone-face 'org-scheduled-today-face |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3923 'done-face 'org-done-face |
58792 | 3924 priority (+ 99 priority)) |
3925 txt) | |
3926 (add-text-properties | |
3927 0 (length txt) | |
3928 (list 'priority priority) txt))) | |
3929 (push txt ee)) | |
3930 (outline-next-heading)))) | |
3931 (nreverse ee))) | |
3932 | |
3933 (defun org-agenda-get-deadlines () | |
3934 "Return the deadline information for agenda display." | |
3935 (let* ((wdays org-deadline-warning-days) | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3936 (props (list 'mouse-face 'highlight |
58792 | 3937 'keymap org-agenda-keymap |
3938 'help-echo | |
3939 (format "mouse-2 or RET jump to org file %s" | |
3940 (abbreviate-file-name (buffer-file-name))))) | |
3941 (regexp org-deadline-time-regexp) | |
3942 (todayp (equal date (calendar-current-date))) ; DATE bound by calendar | |
3943 (d1 (calendar-absolute-from-gregorian date)) ; DATE bound by calendar | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3944 d2 diff pos pos1 |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
3945 ee txt head) |
58792 | 3946 (goto-char (point-min)) |
3947 (while (re-search-forward regexp nil t) | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3948 (setq pos (1- (match-beginning 1)) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3949 d2 (time-to-days |
58792 | 3950 (org-time-string-to-time (match-string 1))) |
3951 diff (- d2 d1)) | |
3952 ;; When to show a deadline in the calendar: | |
3953 ;; If the expiration is within wdays warning time. | |
3954 ;; Past-due deadlines are only shown on the current date | |
3955 (if (and (< diff wdays) todayp (not (= diff 0))) | |
3956 (save-excursion | |
3957 (if (re-search-backward "\\(^\\|\r\\)\\*+[ \t]*" nil t) | |
3958 (progn | |
3959 (goto-char (match-end 0)) | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3960 (setq pos1 (match-end 1)) |
58792 | 3961 (setq head (buffer-substring-no-properties |
3962 (point) | |
3963 (progn (skip-chars-forward "^\r\n") | |
3964 (point)))) | |
3965 (if (string-match org-looking-at-done-regexp head) | |
3966 (setq txt nil) | |
3967 (setq txt (org-format-agenda-item | |
3968 (format "In %3d d.: " diff) head)))) | |
3969 (setq txt org-agenda-no-heading-message)) | |
3970 (when txt | |
3971 (add-text-properties | |
3972 0 (length txt) | |
3973 (append | |
3974 (list 'org-marker (org-agenda-new-marker pos) | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3975 'org-hd-marker (org-agenda-new-marker pos1) |
58792 | 3976 'priority (+ (- 10 diff) (org-get-priority txt)) |
3977 'face (cond ((<= diff 0) 'org-warning-face) | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3978 ((<= diff 5) 'org-scheduled-previously-face) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3979 (t nil)) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3980 'undone-face (cond |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3981 ((<= diff 0) 'org-warning-face) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3982 ((<= diff 5) 'org-scheduled-previously-face) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3983 (t nil)) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3984 'done-face 'org-done-face) |
58792 | 3985 props) |
3986 txt) | |
3987 (push txt ee))))) | |
3988 ee)) | |
3989 | |
3990 (defun org-agenda-get-scheduled () | |
3991 "Return the scheduled information for agenda display." | |
3992 (let* ((props (list 'face 'org-scheduled-previously-face | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3993 'undone-face 'org-scheduled-previously-face |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
3994 'done-face 'org-done-face |
58792 | 3995 'mouse-face 'highlight |
3996 'keymap org-agenda-keymap | |
3997 'help-echo | |
3998 (format "mouse-2 or RET jump to org file %s" | |
3999 (abbreviate-file-name (buffer-file-name))))) | |
4000 (regexp org-scheduled-time-regexp) | |
4001 (todayp (equal date (calendar-current-date))) ; DATE bound by calendar | |
4002 (d1 (calendar-absolute-from-gregorian date)) ; DATE bound by calendar | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4003 d2 diff pos pos1 |
58792 | 4004 ee txt head) |
4005 (goto-char (point-min)) | |
4006 (while (re-search-forward regexp nil t) | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4007 (setq pos (1- (match-beginning 1)) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4008 d2 (time-to-days |
58792 | 4009 (org-time-string-to-time (match-string 1))) |
4010 diff (- d2 d1)) | |
4011 ;; When to show a scheduled item in the calendar: | |
4012 ;; If it is on or past the date. | |
4013 (if (and (< diff 0) todayp) | |
4014 (save-excursion | |
4015 (if (re-search-backward "\\(^\\|\r\\)\\*+[ \t]*" nil t) | |
4016 (progn | |
4017 (goto-char (match-end 0)) | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4018 (setq pos1 (match-end 1)) |
58792 | 4019 (setq head (buffer-substring-no-properties |
4020 (point) | |
4021 (progn (skip-chars-forward "^\r\n") (point)))) | |
4022 (if (string-match org-looking-at-done-regexp head) | |
4023 (setq txt nil) | |
4024 (setq txt (org-format-agenda-item | |
4025 (format "Sched.%2dx: " (- 1 diff)) head)))) | |
4026 (setq txt org-agenda-no-heading-message)) | |
4027 (when txt | |
4028 (add-text-properties | |
4029 0 (length txt) | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4030 (append (list 'org-marker (org-agenda-new-marker pos) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4031 'org-hd-marker (org-agenda-new-marker pos1) |
58792 | 4032 'priority (+ (- 5 diff) (org-get-priority txt))) |
4033 props) txt) | |
4034 (push txt ee))))) | |
4035 ee)) | |
4036 | |
4037 (defun org-agenda-get-blocks () | |
4038 "Return the date-range information for agenda display." | |
4039 (let* ((props (list 'face nil | |
4040 'mouse-face 'highlight | |
4041 'keymap org-agenda-keymap | |
4042 'help-echo | |
4043 (format "mouse-2 or RET jump to org file %s" | |
4044 (abbreviate-file-name (buffer-file-name))))) | |
4045 (regexp org-tr-regexp) | |
4046 (d0 (calendar-absolute-from-gregorian date)) | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4047 marker hdmarker ee txt d1 d2 s1 s2) |
58792 | 4048 (goto-char (point-min)) |
4049 (while (re-search-forward regexp nil t) | |
4050 (setq s1 (match-string 1) | |
4051 s2 (match-string 2) | |
4052 d1 (time-to-days (org-time-string-to-time s1)) | |
4053 d2 (time-to-days (org-time-string-to-time s2))) | |
4054 (if (and (> (- d0 d1) -1) (> (- d2 d0) -1)) | |
4055 ;; Only allow days between the limits, because the normal | |
4056 ;; date stamps will catch the limits. | |
4057 (save-excursion | |
4058 (setq marker (org-agenda-new-marker (point))) | |
4059 (if (re-search-backward "\\(^\\|\r\\)\\*+" nil t) | |
4060 (progn | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4061 (setq hdmarker (org-agenda-new-marker (match-end 1))) |
58792 | 4062 (goto-char (match-end 1)) |
4063 (looking-at "\\*+[ \t]*\\([^\r\n]+\\)") | |
4064 (setq txt (org-format-agenda-item | |
4065 (format "(%d/%d): " | |
4066 (1+ (- d0 d1)) (1+ (- d2 d1))) | |
4067 (match-string 1)))) | |
4068 (setq txt org-agenda-no-heading-message)) | |
4069 (add-text-properties | |
4070 0 (length txt) (append (list 'org-marker marker | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4071 'org-hd-marker hdmarker |
58792 | 4072 'priority (org-get-priority txt)) |
4073 props) | |
4074 txt) | |
4075 (push txt ee))) | |
4076 (outline-next-heading)) | |
4077 ;; Sort the entries by expiration date. | |
4078 (nreverse ee))) | |
4079 | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4080 (defun org-format-agenda-item (prefix txt &optional category) |
58792 | 4081 "Format TXT to be inserted into the agenda buffer. |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4082 In particular, this indents the line and adds a category." |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4083 (let* ((category (or category |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4084 org-category |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4085 (file-name-sans-extension |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4086 (file-name-nondirectory (buffer-file-name))))) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4087 (extra prefix) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4088 (time-of-day (org-get-time-of-day txt)) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4089 (t1 (if time-of-day (concat "0" (int-to-string time-of-day)) "0000")) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4090 (time (if time-of-day |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4091 (concat (substring t1 -4 -2) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4092 ":" (substring t1 -2)) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4093 "")) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4094 rtn) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4095 (if (symbolp category) (setq category (symbol-name category))) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4096 (setq rtn (concat (eval org-prefix-format-compiled) txt)) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4097 (add-text-properties |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4098 0 (length rtn) (list 'category (downcase category) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4099 'prefix-length (- (length rtn) (length txt)) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4100 'time-of-day time-of-day) |
58792 | 4101 rtn) |
4102 rtn)) | |
4103 | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4104 (defun org-compile-prefix-format (format) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4105 "Compile the prefix format into a Lisp form that can be evaluated. |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4106 The resulting form is returned and stored in the variable |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4107 `org-prefix-format-compiled'." |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4108 (let ((start 0) varform vars (s format) c) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4109 (while (string-match "%\\([-+]?[0-9.]*\\)\\([ .;,:!?=|/<>]?\\)\\([cts]\\)" |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4110 s start) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4111 (setq var (cdr (assoc (match-string 3 s) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4112 '(("c" . category) ("t" . time) ("s" . extra)))) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4113 c (match-string 2 s) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4114 start (1+ (match-beginning 0))) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4115 (if (= (length c) 1) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4116 (setq varform `(if (equal "" ,var) "" (concat ,var ,c))) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4117 (setq varform var)) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4118 (setq s (replace-match "%\\1s" t nil s)) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4119 (push varform vars)) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4120 (setq vars (nreverse vars)) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4121 (setq org-prefix-format-compiled `(format ,s ,@vars)))) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4122 |
58792 | 4123 (defun org-get-time-of-day (s) |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4124 "Check string S for a time of day. |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4125 If found, return it as a military time number between 0 and 2400. |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4126 If not found, return nil." |
58792 | 4127 (save-match-data |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4128 (when (or |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4129 (string-match |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4130 "\\<\\([012]?[0-9]\\)\\(:\\([0-5][0-9]\\)\\)\\([AaPp][Mm]\\)?\\>" s) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4131 (string-match |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4132 "\\<\\([012]?[0-9]\\)\\(:\\([0-5][0-9]\\)\\)?\\([AaPp][Mm]\\)\\>" s)) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4133 (+ (* 100 (+ (string-to-number (match-string 1 s)) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4134 (if (and (match-beginning 4) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4135 (equal (downcase (match-string 4 s)) "pm")) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4136 12 0))) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4137 (if (match-beginning 3) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4138 (string-to-number (match-string 3 s)) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4139 0))))) |
58792 | 4140 |
4141 (defun org-finalize-agenda-entries (list) | |
4142 "Sort and concatenate the agenda items." | |
4143 (mapconcat 'identity (sort list 'org-entries-lessp) "\n")) | |
4144 | |
4145 (defsubst org-cmp-priority (a b) | |
4146 "Compare the priorities of string a and b." | |
4147 (let ((pa (or (get-text-property 1 'priority a) 0)) | |
4148 (pb (or (get-text-property 1 'priority b) 0))) | |
4149 (cond ((> pa pb) +1) | |
4150 ((< pa pb) -1) | |
4151 (t nil)))) | |
4152 | |
4153 (defsubst org-cmp-category (a b) | |
4154 "Compare the string values of categories of strings a and b." | |
4155 (let ((ca (or (get-text-property 1 'category a) "")) | |
4156 (cb (or (get-text-property 1 'category b) ""))) | |
4157 (cond ((string-lessp ca cb) -1) | |
4158 ((string-lessp cb ca) +1) | |
4159 (t nil)))) | |
4160 | |
4161 (defsubst org-cmp-time (a b) | |
4162 "Compare the time-of-day values of strings a and b." | |
4163 (let* ((def (if org-sort-agenda-notime-is-late 2401 -1)) | |
4164 (ta (or (get-text-property 1 'time-of-day a) def)) | |
4165 (tb (or (get-text-property 1 'time-of-day b) def))) | |
4166 (cond ((< ta tb) -1) | |
4167 ((< tb ta) +1) | |
4168 (t nil)))) | |
4169 | |
4170 (defun org-entries-lessp (a b) | |
4171 "Predicate for sorting agenda entries." | |
4172 (let* ((time-up (org-cmp-time a b)) | |
4173 (time-down (if time-up (- time-up) nil)) | |
4174 (priority-up (org-cmp-priority a b)) | |
4175 (priority-down (if priority-up (- priority-up) nil)) | |
4176 (category-up (org-cmp-category a b)) | |
4177 (category-down (if category-up (- category-up) nil)) | |
4178 (category-keep (if category-up +1 nil))) ; FIXME +1 or -1? | |
4179 (cdr (assoc | |
4180 (eval (cons 'or org-agenda-sorting-strategy)) | |
4181 '((-1 . t) (1 . nil) (nil . nil)))))) | |
4182 | |
4183 (defun org-agenda-show-priority () | |
4184 "Show the priority of the current item. | |
4185 This priority is composed of the main priority given with the [#A] cookies, | |
4186 and by additional input from the age of a schedules or deadline entry." | |
4187 (interactive) | |
4188 (let* ((pri (get-text-property (point-at-bol) 'priority))) | |
4189 (message "Priority is %d" (if pri pri -1000)))) | |
4190 | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4191 (defun org-agenda-goto (&optional highlight) |
58792 | 4192 "Go to the Org-mode file which contains the item at point." |
4193 (interactive) | |
4194 (let* ((marker (or (get-text-property (point) 'org-marker) | |
4195 (org-agenda-error))) | |
4196 (buffer (marker-buffer marker)) | |
4197 (pos (marker-position marker))) | |
4198 (switch-to-buffer-other-window buffer) | |
4199 (widen) | |
4200 (goto-char pos) | |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4201 (when (eq major-mode 'org-mode) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4202 (org-show-hidden-entry) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4203 (save-excursion |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4204 (and (outline-next-heading) |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4205 (org-flag-heading nil)))) ; show the next heading |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4206 (and highlight (org-highlight (point-at-bol) (point-at-eol))))) |
58792 | 4207 |
4208 (defun org-agenda-switch-to () | |
4209 "Go to the Org-mode file which contains the item at point." | |
4210 (interactive) | |
4211 (let* ((marker (or (get-text-property (point) 'org-marker) | |
4212 (org-agenda-error))) | |
4213 (buffer (marker-buffer marker)) | |
4214 (pos (marker-position marker))) | |
4215 (switch-to-buffer buffer) | |
4216 (delete-other-windows) | |
4217 (widen) | |
4218 (goto-char pos) | |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4219 (when (eq major-mode 'org-mode) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4220 (org-show-hidden-entry) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4221 (save-excursion |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4222 (and (outline-next-heading) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4223 (org-flag-heading nil)))))) ; show the next heading |
58792 | 4224 |
4225 (defun org-agenda-goto-mouse (ev) | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4226 "Go to the Org-mode file which contains the item at the mouse click." |
58792 | 4227 (interactive "e") |
4228 (mouse-set-point ev) | |
4229 (org-agenda-goto)) | |
4230 | |
4231 (defun org-agenda-show () | |
4232 "Display the Org-mode file which contains the item at point." | |
4233 (interactive) | |
4234 (let ((win (selected-window))) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4235 (org-agenda-goto t) |
58792 | 4236 (select-window win))) |
4237 | |
4238 (defun org-agenda-recenter (arg) | |
4239 "Display the Org-mode file which contains the item at point and recenter." | |
4240 (interactive "P") | |
4241 (let ((win (selected-window))) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4242 (org-agenda-goto t) |
58792 | 4243 (recenter arg) |
4244 (select-window win))) | |
4245 | |
4246 (defun org-agenda-show-mouse (ev) | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4247 "Display the Org-mode file which contains the item at the mouse click." |
58792 | 4248 (interactive "e") |
4249 (mouse-set-point ev) | |
4250 (org-agenda-show)) | |
4251 | |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4252 (defun org-agenda-check-no-diary () |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4253 "Check if the entry is a diary link and abort if yes." |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4254 (if (get-text-property (point) 'org-agenda-diary-link) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4255 (org-agenda-error))) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4256 |
58792 | 4257 (defun org-agenda-error () |
4258 (error "Command not allowed in this line.")) | |
4259 | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4260 (defvar org-last-heading-marker (make-marker) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4261 "Marker pointing to the headline that last changed its TODO state |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4262 by a remote command from the agenda.") |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4263 |
58792 | 4264 (defun org-agenda-todo () |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4265 "Cycle TODO state of line at point, also in Org-mode file. |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4266 This changes the line at point, all other lines in the agenda referring to |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4267 the same tree node, and the headline of the tree node in the Org-mode file." |
58792 | 4268 (interactive) |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4269 (org-agenda-check-no-diary) |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4270 (let* ((col (current-column)) |
58792 | 4271 (marker (or (get-text-property (point) 'org-marker) |
4272 (org-agenda-error))) | |
4273 (buffer (marker-buffer marker)) | |
4274 (pos (marker-position marker)) | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4275 (hdmarker (get-text-property (point) 'org-hd-marker)) |
58792 | 4276 (buffer-read-only nil) |
4277 newhead) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4278 (with-current-buffer buffer |
58792 | 4279 (widen) |
4280 (goto-char pos) | |
4281 (org-show-hidden-entry) | |
4282 (save-excursion | |
4283 (and (outline-next-heading) | |
4284 (org-flag-heading nil))) ; show the next heading | |
4285 (org-todo) | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4286 (forward-char 1) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4287 (setq newhead (org-get-heading)) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4288 (save-excursion |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4289 (org-back-to-heading) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4290 (move-marker org-last-heading-marker (point)))) |
58792 | 4291 (beginning-of-line 1) |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4292 (save-excursion |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4293 (org-agenda-change-all-lines newhead hdmarker 'fixface)) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4294 (move-to-column col))) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4295 |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4296 (defun org-agenda-change-all-lines (newhead hdmarker &optional fixface) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4297 "Change all lines in the agenda buffer which match hdmarker. |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4298 The new content of the line will be NEWHEAD. HDMARKER is checked with |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4299 `equal' against all `org-hd-marker' text properties in the file." |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4300 (let* (props m pl undone-face done-face) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4301 (save-excursion |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4302 (goto-char (point-max)) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4303 (beginning-of-line 1) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4304 (while (not (bobp)) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4305 (when (and (setq m (get-text-property (point) 'org-hd-marker)) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4306 (equal m hdmarker)) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4307 (setq props (text-properties-at (point)) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4308 pl (get-text-property (point) 'prefix-length) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4309 undone-face (get-text-property (point) 'undone-face) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4310 done-face (get-text-property (point) 'done-face)) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4311 (move-to-column pl) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4312 (if (looking-at ".*") |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4313 (progn |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4314 (replace-match newhead t t) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4315 (beginning-of-line 1) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4316 (add-text-properties (point-at-bol) (point-at-eol) props) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4317 (if fixface |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4318 (add-text-properties |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4319 (point-at-bol) (point-at-eol) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4320 (list 'face |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4321 (if org-last-todo-state-is-todo |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4322 undone-face done-face)))) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4323 (beginning-of-line 1)) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4324 (error "Line update did not work"))) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4325 (beginning-of-line 0))))) |
58792 | 4326 |
4327 (defun org-agenda-priority-up () | |
4328 "Increase the priority of line at point, also in Org-mode file." | |
4329 (interactive) | |
4330 (org-agenda-priority 'up)) | |
4331 | |
4332 (defun org-agenda-priority-down () | |
4333 "Decrease the priority of line at point, also in Org-mode file." | |
4334 (interactive) | |
4335 (org-agenda-priority 'down)) | |
4336 | |
4337 (defun org-agenda-priority (&optional force-direction) | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4338 "Set the priority of line at point, also in Org-mode file. |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4339 This changes the line at point, all other lines in the agenda referring to |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4340 the same tree node, and the headline of the tree node in the Org-mode file." |
58792 | 4341 (interactive) |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4342 (org-agenda-check-no-diary) |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4343 (let* ((marker (or (get-text-property (point) 'org-marker) |
58792 | 4344 (org-agenda-error))) |
4345 (buffer (marker-buffer marker)) | |
4346 (pos (marker-position marker)) | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4347 (hdmarker (get-text-property (point) 'org-hd-marker)) |
58792 | 4348 (buffer-read-only nil) |
4349 newhead) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4350 (with-current-buffer buffer |
58792 | 4351 (widen) |
4352 (goto-char pos) | |
4353 (org-show-hidden-entry) | |
4354 (save-excursion | |
4355 (and (outline-next-heading) | |
4356 (org-flag-heading nil))) ; show the next heading | |
4357 (funcall 'org-priority force-direction) | |
4358 (setq newhead (org-get-heading))) | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4359 (org-agenda-change-all-lines newhead hdmarker) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4360 (beginning-of-line 1))) |
58792 | 4361 |
4362 (defun org-agenda-date-later (arg &optional what) | |
4363 "Change the date of this item to one day later." | |
4364 (interactive "p") | |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4365 (org-agenda-check-no-diary) |
58792 | 4366 (let* ((marker (or (get-text-property (point) 'org-marker) |
4367 (org-agenda-error))) | |
4368 (buffer (marker-buffer marker)) | |
4369 (pos (marker-position marker))) | |
62076
4f2150e05f24
(org-get-entries-from-diary): Remove unused vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61924
diff
changeset
|
4370 (with-current-buffer buffer |
58792 | 4371 (widen) |
4372 (goto-char pos) | |
4373 (if (not (org-at-timestamp-p)) | |
4374 (error "Cannot find time stamp")) | |
4375 (org-timestamp-change arg (or what 'day)) | |
4376 (message "Time stamp changed to %s" org-last-changed-timestamp)))) | |
4377 | |
4378 (defun org-agenda-date-earlier (arg &optional what) | |
4379 "Change the date of this item to one day earlier." | |
4380 (interactive "p") | |
4381 (org-agenda-date-later (- arg) what)) | |
4382 | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4383 (defun org-agenda-date-prompt (arg) |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4384 "Change the date of this item. Date is prompted for, with default today. |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4385 The prefix ARG is passed to the `org-time-stamp' command and can therefore |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4386 be used to request time specification in the time stamp." |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4387 (interactive "P") |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4388 (org-agenda-check-no-diary) |
58792 | 4389 (let* ((marker (or (get-text-property (point) 'org-marker) |
4390 (org-agenda-error))) | |
4391 (buffer (marker-buffer marker)) | |
4392 (pos (marker-position marker))) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4393 (with-current-buffer buffer |
58792 | 4394 (widen) |
4395 (goto-char pos) | |
4396 (if (not (org-at-timestamp-p)) | |
4397 (error "Cannot find time stamp")) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4398 (org-time-stamp arg) |
58792 | 4399 (message "Time stamp changed to %s" org-last-changed-timestamp)))) |
4400 | |
4401 (defun org-get-heading () | |
4402 "Return the heading of the current entry, without the stars." | |
4403 (save-excursion | |
4404 (if (and (re-search-backward "[\r\n]\\*" nil t) | |
4405 (looking-at "[\r\n]\\*+[ \t]+\\(.*\\)")) | |
4406 (match-string 1) | |
4407 ""))) | |
4408 | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4409 (defun org-agenda-diary-entry () |
58792 | 4410 "Make a diary entry, like the `i' command from the calendar. |
4411 All the standard commands work: block, weekly etc" | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4412 (interactive) |
58792 | 4413 (require 'diary-lib) |
4414 (let* ((char (progn | |
4415 (message "Diary entry: [d]ay [w]eekly [m]onthly [y]early [a]nniversary [b]lock [c]yclic") | |
4416 (read-char-exclusive))) | |
4417 (cmd (cdr (assoc char | |
4418 '((?d . insert-diary-entry) | |
4419 (?w . insert-weekly-diary-entry) | |
4420 (?m . insert-monthly-diary-entry) | |
4421 (?y . insert-yearly-diary-entry) | |
4422 (?a . insert-anniversary-diary-entry) | |
4423 (?b . insert-block-diary-entry) | |
4424 (?c . insert-cyclic-diary-entry))))) | |
4425 (oldf (symbol-function 'calendar-cursor-to-date)) | |
4426 (point (point)) | |
4427 (mark (or (mark t) (point)))) | |
4428 (unless cmd | |
4429 (error "No command associated with <%c>" char)) | |
4430 (unless (and (get-text-property point 'day) | |
4431 (or (not (equal ?b char)) | |
4432 (get-text-property mark 'day))) | |
4433 (error "Don't know which date to use for diary entry")) | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4434 ;; We implement this by hacking the `calendar-cursor-to-date' function |
58792 | 4435 ;; and the `calendar-mark-ring' variable. Saves a lot of code. |
4436 (let ((calendar-mark-ring | |
4437 (list (calendar-gregorian-from-absolute | |
4438 (or (get-text-property mark 'day) | |
4439 (get-text-property point 'day)))))) | |
4440 (unwind-protect | |
4441 (progn | |
4442 (fset 'calendar-cursor-to-date | |
4443 (lambda (&optional error) | |
4444 (calendar-gregorian-from-absolute | |
4445 (get-text-property point 'day)))) | |
4446 (call-interactively cmd)) | |
4447 (fset 'calendar-cursor-to-date oldf))))) | |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4448 |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4449 |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4450 (defun org-agenda-execute-calendar-command (cmd) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4451 "Execute a calendar command from the agenda, with the date associated to |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4452 the cursor position." |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4453 (require 'diary-lib) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4454 (unless (get-text-property (point) 'day) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4455 (error "Don't know which date to use for calendar command")) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4456 (let* ((oldf (symbol-function 'calendar-cursor-to-date)) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4457 (point (point)) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4458 (date (calendar-gregorian-from-absolute |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4459 (get-text-property point 'day))) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4460 (displayed-day (extract-calendar-day date)) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4461 (displayed-month (extract-calendar-month date)) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4462 (displayed-year (extract-calendar-year date))) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4463 (unwind-protect |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4464 (progn |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4465 (fset 'calendar-cursor-to-date |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4466 (lambda (&optional error) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4467 (calendar-gregorian-from-absolute |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4468 (get-text-property point 'day)))) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4469 (call-interactively cmd)) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4470 (fset 'calendar-cursor-to-date oldf)))) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4471 |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4472 (defun org-agenda-phases-of-moon () |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4473 "Display the phases of the moon for the 3 months around the cursor date." |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4474 (interactive) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4475 (org-agenda-execute-calendar-command 'calendar-phases-of-moon)) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4476 |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4477 (defun org-agenda-holidays () |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4478 "Display the holidays for the 3 months around the cursor date." |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4479 (interactive) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4480 (org-agenda-execute-calendar-command 'list-calendar-holidays)) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4481 |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4482 (defun org-agenda-sunrise-sunset (arg) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4483 "Display sunrise and sunset for the cursor date. |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4484 Latitude and longitude can be specified with the variables |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4485 `calendar-latitude' and `calendar-longitude'. When called with prefix |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4486 argument, latitude and longitude will be prompted for." |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4487 (interactive "P") |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4488 (let ((calendar-longitude (if arg nil calendar-longitude)) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4489 (calendar-latitude (if arg nil calendar-latitude)) |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4490 (calendar-location-name |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4491 (if arg "the given coordinates" calendar-location-name))) |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4492 (org-agenda-execute-calendar-command 'calendar-sunrise-sunset))) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4493 |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4494 (defun org-agenda-goto-calendar () |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4495 "Open the Emacs calendar with the date at the cursor." |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4496 (interactive) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4497 (let* ((day (or (get-text-property (point) 'day) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4498 (error "Don't know which date to open in calendar"))) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4499 (date (calendar-gregorian-from-absolute day))) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4500 (calendar) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4501 (calendar-goto-date date))) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4502 |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4503 (defun org-calendar-goto-agenda () |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4504 "Compute the Org-mode agenda for the calendar date displayed at the cursor. |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4505 This is a command that has to be installed in `calendar-mode-map'." |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4506 (interactive) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4507 (org-agenda nil (calendar-absolute-from-gregorian |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4508 (calendar-cursor-to-date)))) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4509 |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4510 (defun org-agenda-convert-date () |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4511 (interactive) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4512 (let ((day (get-text-property (point) 'day)) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4513 date s) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4514 (unless day |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4515 (error "Don't know which date to convert")) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4516 (setq date (calendar-gregorian-from-absolute day)) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4517 (setq s (concat |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4518 "Gregorian: " (calendar-date-string date) "\n" |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4519 "ISO: " (calendar-iso-date-string date) "\n" |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4520 "Day of Yr: " (calendar-day-of-year-string date) "\n" |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4521 "Julian: " (calendar-julian-date-string date) "\n" |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4522 "Astronomic: " (calendar-astro-date-string date) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4523 " (Julian date number at noon UTC)\n" |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4524 "Hebrew: " (calendar-hebrew-date-string date) " (until sunset)\n" |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4525 "Islamic: " (calendar-islamic-date-string date) " (until sunset)\n" |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4526 "French: " (calendar-french-date-string date) "\n" |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4527 "Mayan: " (calendar-mayan-date-string date) "\n" |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4528 "Coptic: " (calendar-coptic-date-string date) "\n" |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4529 "Ethiopic: " (calendar-ethiopic-date-string date) "\n" |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4530 "Persian: " (calendar-persian-date-string date) "\n" |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
4531 "Chinese: " (calendar-chinese-date-string date) "\n")) |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4532 (with-output-to-temp-buffer "*Dates*" |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4533 (princ s)) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4534 (fit-window-to-buffer (get-buffer-window "*Dates*")))) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
4535 |
58792 | 4536 ;;; Link Stuff |
4537 | |
4538 (defun org-find-file-at-mouse (ev) | |
4539 "Open file link or URL at mouse." | |
4540 (interactive "e") | |
4541 (mouse-set-point ev) | |
4542 (org-open-at-point 'in-emacs)) | |
4543 | |
4544 (defun org-open-at-mouse (ev) | |
4545 "Open file link or URL at mouse." | |
4546 (interactive "e") | |
4547 (mouse-set-point ev) | |
4548 (org-open-at-point)) | |
4549 | |
4550 (defun org-open-at-point (&optional in-emacs) | |
4551 "Open link at or after point. | |
4552 If there is no link at point, this function will search forward up to | |
4553 the end of the current subtree. | |
4554 Normally, files will be opened by an appropriate application. If the | |
4555 optional argument IN-EMACS is non-nil, Emacs will visit the file." | |
4556 (interactive "P") | |
4557 (if (org-at-timestamp-p) | |
4558 (org-agenda nil (time-to-days (org-time-string-to-time | |
4559 (substring (match-string 1) 0 10))) | |
4560 1) | |
4561 (let (type path line (pos (point))) | |
4562 (save-excursion | |
4563 (skip-chars-backward | |
4564 (if org-allow-space-in-links "^\t\n\r" "^ \t\n\r")) | |
4565 (if (re-search-forward | |
4566 org-link-regexp | |
4567 (save-excursion | |
4568 (condition-case nil | |
4569 (progn (outline-end-of-subtree) (max pos (point))) | |
4570 (error (end-of-line 1) (point)))) | |
4571 t) | |
4572 (setq type (match-string 1) | |
4573 path (match-string 2))) | |
4574 (unless path | |
4575 (error "No link found.")) | |
4576 ;; Remove any trailing spaces in path | |
4577 (if (string-match " +\\'" path) | |
4578 (setq path (replace-match "" t t path))) | |
4579 | |
4580 (cond | |
4581 | |
4582 ((string= type "file") | |
4583 (if (string-match ":\\([0-9]+\\)\\'" path) | |
4584 (setq line (string-to-number (match-string 1 path)) | |
4585 path (substring path 0 (match-beginning 0)))) | |
4586 (org-open-file path in-emacs line)) | |
4587 | |
4588 ((string= type "news") | |
4589 (org-follow-gnus-link path)) | |
4590 | |
4591 ((string= type "bbdb") | |
4592 (org-follow-bbdb-link path)) | |
4593 | |
4594 ((string= type "gnus") | |
4595 (let (group article) | |
4596 (if (not (string-match "\\`\\([^#]+\\)\\(#\\(.*\\)\\)?" path)) | |
4597 (error "Error in Gnus link")) | |
4598 (setq group (match-string 1 path) | |
4599 article (match-string 3 path)) | |
4600 (org-follow-gnus-link group article))) | |
4601 | |
4602 ((string= type "vm") | |
4603 (let (folder article) | |
4604 (if (not (string-match "\\`\\([^#]+\\)\\(#\\(.*\\)\\)?" path)) | |
4605 (error "Error in VM link")) | |
4606 (setq folder (match-string 1 path) | |
4607 article (match-string 3 path)) | |
4608 ;; in-emacs is the prefix arg, will be interpreted as read-only | |
4609 (org-follow-vm-link folder article in-emacs))) | |
4610 | |
4611 ((string= type "wl") | |
4612 (let (folder article) | |
4613 (if (not (string-match "\\`\\([^#]+\\)\\(#\\(.*\\)\\)?" path)) | |
4614 (error "Error in Wanderlust link")) | |
4615 (setq folder (match-string 1 path) | |
4616 article (match-string 3 path)) | |
4617 (org-follow-wl-link folder article))) | |
4618 | |
4619 ((string= type "rmail") | |
4620 (let (folder article) | |
4621 (if (not (string-match "\\`\\([^#]+\\)\\(#\\(.*\\)\\)?" path)) | |
4622 (error "Error in RMAIL link")) | |
4623 (setq folder (match-string 1 path) | |
4624 article (match-string 3 path)) | |
4625 (org-follow-rmail-link folder article))) | |
4626 | |
4627 ((string= type "shell") | |
4628 (let ((cmd path)) | |
4629 (if (or (not org-confirm-shell-links) | |
4630 (yes-or-no-p (format "Execute \"%s\" in the shell? " cmd))) | |
4631 (shell-command cmd) | |
4632 (error "Abort")))) | |
4633 | |
4634 (t | |
4635 (browse-url-at-point))))))) | |
4636 | |
4637 (defun org-follow-bbdb-link (name) | |
4638 "Follow a BBDB link to NAME." | |
4639 (require 'bbdb) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4640 (let ((inhibit-redisplay t)) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4641 (catch 'exit |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4642 ;; Exact match on name |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4643 (bbdb-name (concat "\\`" name "\\'") nil) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4644 (if (< 0 (buffer-size (get-buffer "*BBDB*"))) (throw 'exit nil)) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4645 ;; Exact match on name |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4646 (bbdb-company (concat "\\`" name "\\'") nil) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4647 (if (< 0 (buffer-size (get-buffer "*BBDB*"))) (throw 'exit nil)) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4648 ;; Partial match on name |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4649 (bbdb-name name nil) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4650 (if (< 0 (buffer-size (get-buffer "*BBDB*"))) (throw 'exit nil)) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4651 ;; Partial match on company |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4652 (bbdb-company name nil) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4653 (if (< 0 (buffer-size (get-buffer "*BBDB*"))) (throw 'exit nil)) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4654 ;; General match including network address and notes |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4655 (bbdb name nil) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4656 (when (= 0 (buffer-size (get-buffer "*BBDB*"))) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4657 (delete-window (get-buffer-window "*BBDB*")) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4658 (error "No matching BBDB record"))))) |
58792 | 4659 |
4660 (defun org-follow-gnus-link (&optional group article) | |
4661 "Follow a Gnus link to GROUP and ARTICLE." | |
4662 (require 'gnus) | |
4663 (funcall (cdr (assq 'gnus org-link-frame-setup))) | |
4664 (if group (gnus-fetch-group group)) | |
4665 (if article | |
4666 (or (gnus-summary-goto-article article nil 'force) | |
4667 (if (fboundp 'gnus-summary-insert-cached-articles) | |
4668 (progn | |
4669 (gnus-summary-insert-cached-articles) | |
4670 (gnus-summary-goto-article article nil 'force)) | |
4671 (message "Message could not be found."))))) | |
4672 | |
4673 (defun org-follow-vm-link (&optional folder article readonly) | |
4674 "Follow a VM link to FOLDER and ARTICLE." | |
4675 (require 'vm) | |
4676 (if (string-match "^//\\([a-zA-Z]+@\\)?\\([^:]+\\):\\(.*\\)" folder) | |
4677 ;; ange-ftp or efs or tramp access | |
4678 (let ((user (or (match-string 1 folder) (user-login-name))) | |
4679 (host (match-string 2 folder)) | |
4680 (file (match-string 3 folder))) | |
4681 (cond | |
4682 ((featurep 'tramp) | |
4683 ;; use tramp to access the file | |
4684 (if org-xemacs-p | |
4685 (setq folder (format "[%s@%s]%s" user host file)) | |
4686 (setq folder (format "/%s@%s:%s" user host file)))) | |
4687 (t | |
4688 ;; use ange-ftp or efs | |
4689 (require (if org-xemacs-p 'efs 'ange-ftp)) | |
4690 (setq folder (format "/%s@%s:%s" user host file)))))) | |
4691 (when folder | |
4692 (funcall (cdr (assq 'vm org-link-frame-setup)) folder readonly) | |
4693 (sit-for 0.1) | |
4694 (when article | |
4695 (vm-select-folder-buffer) | |
4696 (widen) | |
4697 (let ((case-fold-search t)) | |
4698 (goto-char (point-min)) | |
4699 (if (not (re-search-forward | |
4700 (concat "^" "message-id: *" (regexp-quote article)))) | |
4701 (error "Could not find the specified message in this folder")) | |
4702 (vm-isearch-update) | |
4703 (vm-isearch-narrow) | |
4704 (vm-beginning-of-message) | |
4705 (vm-summarize))))) | |
4706 | |
4707 (defun org-follow-wl-link (folder article) | |
4708 "Follow a Wanderlust link to FOLDER and ARTICLE." | |
4709 (wl-summary-goto-folder-subr folder 'no-sync t nil t) | |
4710 (if article (wl-summary-jump-to-msg-by-message-id article)) | |
4711 (wl-summary-redisplay)) | |
4712 | |
4713 (defun org-follow-rmail-link (folder article) | |
4714 "Follow an RMAIL link to FOLDER and ARTICLE." | |
4715 (let (message-number) | |
4716 (save-excursion | |
4717 (save-window-excursion | |
4718 (rmail (if (string= folder "RMAIL") rmail-file-name folder)) | |
4719 (setq message-number | |
4720 (save-restriction | |
4721 (widen) | |
4722 (goto-char (point-max)) | |
4723 (if (re-search-backward | |
4724 (concat "^Message-ID:\\s-+" (regexp-quote | |
4725 (or article ""))) | |
4726 nil t) | |
4727 (rmail-what-message)))))) | |
4728 (if message-number | |
4729 (progn | |
4730 (rmail (if (string= folder "RMAIL") rmail-file-name folder)) | |
4731 (rmail-show-message message-number) | |
4732 message-number) | |
4733 (error "Message not found")))) | |
4734 | |
4735 (defun org-open-file (path &optional in-emacs line) | |
4736 "Open the file at PATH. | |
4737 First, this expands any special file name abbreviations. Then the | |
4738 configuration variable `org-file-apps' is checked if it contains an | |
4739 entry for this file type, and if yes, the corresponding command is launched. | |
4740 If no application is found, Emacs simply visits the file. | |
4741 With optional argument IN-EMACS, Emacs will visit the file. | |
4742 If the file does not exist, an error is thrown." | |
4743 (let* ((file (convert-standard-filename (org-expand-file-name path))) | |
4744 (dfile (downcase file)) | |
4745 ext cmd apps) | |
4746 (if (and (not (file-exists-p file)) | |
4747 (not org-open-non-existing-files)) | |
4748 (error "No such file: %s" file)) | |
4749 (if (string-match "^.*\\.\\([a-zA-Z0-9]+\\.gz\\)$" dfile) | |
4750 (setq ext (match-string 1 dfile)) | |
4751 (if (string-match "^.*\\.\\([a-zA-Z0-9]+\\)$" dfile) | |
4752 (setq ext (match-string 1 dfile)))) | |
4753 (setq apps (append org-file-apps (org-default-apps))) | |
4754 (if in-emacs | |
4755 (setq cmd 'emacs) | |
4756 (setq cmd (or (cdr (assoc ext apps)) | |
4757 (cdr (assoc t apps))))) | |
4758 (cond | |
4759 ((and (stringp cmd) (not (string-match "^\\s-*$" cmd))) | |
4760 (setq cmd (format cmd file)) | |
4761 (save-window-excursion | |
4762 (shell-command (concat cmd " & &")))) | |
4763 ((or (stringp cmd) | |
4764 (eq cmd 'emacs)) | |
4765 (funcall (cdr (assq 'file org-link-frame-setup)) file) | |
4766 (if line (goto-line line))) | |
4767 ((consp cmd) | |
4768 (eval cmd)) | |
4769 (t (funcall (cdr (assq 'file org-link-frame-setup)) file))))) | |
4770 | |
4771 (defun org-default-apps () | |
4772 "Return the default applications for this operating system." | |
4773 (cond | |
4774 ((eq system-type 'darwin) | |
4775 org-file-apps-defaults-macosx) | |
4776 ((eq system-type 'windows-nt) | |
4777 org-file-apps-defaults-windowsnt) | |
4778 ((eq system-type 'linux) | |
4779 org-file-apps-defaults-linux) | |
4780 (t org-file-apps-defaults-linux))) | |
4781 | |
4782 (defun org-expand-file-name (path) | |
4783 "Replace special path abbreviations and expand the file name." | |
4784 (expand-file-name path)) | |
4785 | |
4786 | |
4787 (defvar org-insert-link-history nil | |
4788 "Minibuffer history for links inserted with `org-insert-link'.") | |
4789 | |
4790 (defvar org-stored-links nil | |
4791 "Contains the links stored with `org-store-link'.") | |
4792 | |
4793 ;;;###autoload | |
4794 (defun org-store-link (arg) | |
4795 "\\<org-mode-map>Store an org-link to the current location. | |
4796 This link can later be inserted into an org-buffer with | |
4797 \\[org-insert-link]. | |
4798 For some link types, a prefix arg is interpreted: | |
4799 For links to usenet articles, arg negates `org-usenet-links-prefer-google'. | |
4800 For file links, arg negates `org-line-numbers-in-file-links'." | |
4801 (interactive "P") | |
4802 (let (link cpltxt) | |
4803 (cond | |
4804 | |
4805 ((eq major-mode 'bbdb-mode) | |
4806 (setq link (concat "bbdb:" | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4807 (or (bbdb-record-name (bbdb-current-record)) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4808 (bbdb-record-company (bbdb-current-record)))))) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4809 |
58792 | 4810 ((eq major-mode 'calendar-mode) |
4811 (let ((cd (calendar-cursor-to-date))) | |
4812 (setq link | |
4813 (format-time-string | |
4814 (car org-time-stamp-formats) | |
4815 (apply 'encode-time | |
4816 (list 0 0 0 (nth 1 cd) (nth 0 cd) (nth 2 cd) | |
4817 nil nil nil)))))) | |
4818 | |
4819 ((or (eq major-mode 'vm-summary-mode) | |
4820 (eq major-mode 'vm-presentation-mode)) | |
4821 (and (eq major-mode 'vm-presentation-mode) (vm-summarize)) | |
4822 (vm-follow-summary-cursor) | |
4823 (save-excursion | |
4824 (vm-select-folder-buffer) | |
4825 (let* ((message (car vm-message-pointer)) | |
4826 (folder (buffer-file-name)) | |
4827 (subject (vm-su-subject message)) | |
4828 (author (vm-su-full-name message)) | |
4829 (message-id (vm-su-message-id message))) | |
4830 (setq folder (abbreviate-file-name folder)) | |
4831 (if (string-match (concat "^" (regexp-quote vm-folder-directory)) | |
4832 folder) | |
4833 (setq folder (replace-match "" t t folder))) | |
4834 (setq cpltxt (concat author " on: " subject)) | |
4835 (setq link (concat cpltxt "\n " "vm:" folder | |
4836 "#" message-id))))) | |
4837 | |
4838 ((eq major-mode 'wl-summary-mode) | |
4839 (let* ((msgnum (wl-summary-message-number)) | |
4840 (message-id (elmo-message-field wl-summary-buffer-elmo-folder | |
4841 msgnum 'message-id)) | |
4842 (wl-message-entity (elmo-msgdb-overview-get-entity | |
4843 msgnum (wl-summary-buffer-msgdb))) | |
4844 (author (wl-summary-line-from)) ; FIXME: how to get author name? | |
4845 (subject "???")) ; FIXME: How to get subject of email? | |
4846 (setq cpltxt (concat author " on: " subject)) | |
4847 (setq link (concat cpltxt "\n " "wl:" wl-summary-buffer-folder-name | |
4848 "#" message-id)))) | |
4849 | |
4850 ((eq major-mode 'rmail-mode) | |
4851 (save-excursion | |
4852 (save-restriction | |
4853 (rmail-narrow-to-non-pruned-header) | |
4854 (let ((folder (buffer-file-name)) | |
4855 (message-id (mail-fetch-field "message-id")) | |
4856 (author (mail-fetch-field "from")) | |
4857 (subject (mail-fetch-field "subject"))) | |
4858 (setq cpltxt (concat author " on: " subject)) | |
4859 (setq link (concat cpltxt "\n " "rmail:" folder | |
4860 "#" message-id)))))) | |
4861 | |
4862 ((eq major-mode 'gnus-group-mode) | |
4863 (let ((group (cond ((fboundp 'gnus-group-group-name) ; depending on Gnus | |
4864 (gnus-group-group-name)) ; version | |
4865 ((fboundp 'gnus-group-name) | |
4866 (gnus-group-name)) | |
4867 (t "???")))) | |
62076
4f2150e05f24
(org-get-entries-from-diary): Remove unused vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61924
diff
changeset
|
4868 (setq link (concat (if (org-xor arg org-usenet-links-prefer-google) |
4f2150e05f24
(org-get-entries-from-diary): Remove unused vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61924
diff
changeset
|
4869 "http://groups.google.com/groups?group=" |
4f2150e05f24
(org-get-entries-from-diary): Remove unused vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61924
diff
changeset
|
4870 "gnus:") |
62087
fab4f3bb60e0
(org-store-link): Fix paren typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
62076
diff
changeset
|
4871 group)))) |
58792 | 4872 |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4873 ((memq major-mode '(gnus-summary-mode gnus-article-mode)) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4874 (and (eq major-mode 'gnus-article-mode) (gnus-article-show-summary)) |
58792 | 4875 (gnus-summary-beginning-of-article) |
4876 (let* ((group (car gnus-article-current)) | |
4877 (article (cdr gnus-article-current)) | |
4878 (header (gnus-summary-article-header article)) | |
4879 (author (mail-header-from header)) | |
4880 (message-id (mail-header-id header)) | |
4881 (date (mail-header-date header)) | |
4882 (subject (gnus-summary-subject-string))) | |
4883 (setq cpltxt (concat author " on: " subject)) | |
4884 (if (org-xor arg org-usenet-links-prefer-google) | |
4885 (setq link | |
4886 (concat | |
4887 cpltxt "\n " | |
4888 (format "http://groups.google.com/groups?as_umsgid=%s" | |
4889 (org-fixup-message-id-for-http message-id)))) | |
4890 (setq link (concat cpltxt "\n" "gnus:" group | |
4891 "#" (number-to-string article)))))) | |
4892 | |
4893 ((eq major-mode 'w3-mode) | |
4894 (setq link (url-view-url t))) | |
4895 ((eq major-mode 'w3m-mode) | |
4896 (setq link w3m-current-url)) | |
4897 | |
4898 ((buffer-file-name) | |
4899 ;; Just link to this file here. | |
4900 (setq link (concat "file:" | |
4901 (abbreviate-file-name (buffer-file-name)))) | |
4902 ;; Add the line number? | |
4903 (if (org-xor org-line-numbers-in-file-links arg) | |
4904 (setq link | |
4905 (concat link | |
4906 ":" (int-to-string | |
4907 (+ (if (bolp) 1 0) (count-lines | |
4908 (point-min) (point)))))))) | |
4909 ((interactive-p) | |
4910 (error "Cannot link to a buffer which is not visiting a file")) | |
4911 (t (setq link nil))) | |
4912 | |
4913 (if (and (interactive-p) link) | |
4914 (progn | |
4915 (setq org-stored-links | |
4916 (cons (cons (or cpltxt link) link) org-stored-links)) | |
4917 (message "Stored: %s" (or cpltxt link))) | |
4918 link))) | |
4919 | |
4920 (defun org-xor (a b) | |
4921 "Exclusive or." | |
62076
4f2150e05f24
(org-get-entries-from-diary): Remove unused vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61924
diff
changeset
|
4922 ;; (if a (not b) b) |
58792 | 4923 (or (and a (not b)) |
4924 (and b (not a)))) | |
4925 | |
4926 (defun org-get-header (header) | |
4927 "Find a header field in the current buffer." | |
4928 (save-excursion | |
4929 (goto-char (point-min)) | |
4930 (let ((case-fold-search t) s) | |
4931 (cond | |
4932 ((eq header 'from) | |
4933 (if (re-search-forward "^From:\\s-+\\(.*\\)" nil t) | |
4934 (setq s (match-string 1))) | |
4935 (while (string-match "\"" s) | |
4936 (setq s (replace-match "" t t s))) | |
4937 (if (string-match "[<(].*" s) | |
4938 (setq s (replace-match "" t t s)))) | |
4939 ((eq header 'message-id) | |
4940 (if (re-search-forward "^message-id:\\s-+\\(.*\\)" nil t) | |
4941 (setq s (match-string 1)))) | |
4942 ((eq header 'subject) | |
4943 (if (re-search-forward "^subject:\\s-+\\(.*\\)" nil t) | |
4944 (setq s (match-string 1))))) | |
4945 (if (string-match "\\`[ \t\]+" s) (setq s (replace-match "" t t s))) | |
4946 (if (string-match "[ \t\]+\\'" s) (setq s (replace-match "" t t s))) | |
4947 s))) | |
4948 | |
4949 | |
4950 (defun org-fixup-message-id-for-http (s) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4951 "Replace special characters in a message id, so it can be used in an http query." |
58792 | 4952 (while (string-match "<" s) |
4953 (setq s (replace-match "%3C" t t s))) | |
4954 (while (string-match ">" s) | |
4955 (setq s (replace-match "%3E" t t s))) | |
4956 (while (string-match "@" s) | |
4957 (setq s (replace-match "%40" t t s))) | |
4958 s) | |
4959 | |
4960 (defun org-insert-link (&optional complete-file) | |
62076
4f2150e05f24
(org-get-entries-from-diary): Remove unused vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61924
diff
changeset
|
4961 "Insert a link. At the prompt, enter the link. |
58792 | 4962 |
4963 Completion can be used to select a link previously stored with | |
4964 `org-store-link'. When the empty string is entered (i.e. if you just | |
4965 press RET at the prompt), the link defaults to the most recently | |
4966 stored link. | |
4967 | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4968 With a \\[universal-argument] prefix, prompts for a file to link to. The file name can be |
58792 | 4969 selected using completion. The path to the file will be relative to |
4970 the current directory if the file is in the current directory or a | |
4971 subdirectory. Otherwise, the link will be the absolute path as | |
4972 completed in the minibuffer (i.e. normally ~/path/to/file). | |
4973 | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
4974 With two \\[universal-argument] prefixes, enforce an absolute path even if the file |
58792 | 4975 is in the current directory or below." |
4976 (interactive "P") | |
4977 (let ((link (if complete-file | |
4978 (read-file-name "File: ") | |
4979 (completing-read | |
4980 "Link: " org-stored-links nil nil nil | |
4981 org-insert-link-history | |
4982 (or (car (car org-stored-links)))))) | |
4983 linktxt matched) | |
4984 (if (or (not link) (equal link "")) | |
4985 (error "No links available")) | |
4986 (if complete-file | |
4987 (let ((pwd (file-name-as-directory (expand-file-name ".")))) | |
4988 (cond | |
4989 ((equal complete-file '(16)) | |
4990 (insert "file:" (abbreviate-file-name (expand-file-name link)))) | |
4991 ((string-match (concat "^" (regexp-quote pwd) "\\(.+\\)") | |
4992 (expand-file-name link)) | |
4993 (insert "file:" (match-string 1 (expand-file-name link)))) | |
4994 (t (insert "file:" link)))) | |
4995 (setq linktxt (cdr (assoc link org-stored-links))) | |
4996 (if (not org-keep-stored-link-after-insertion) | |
4997 (setq org-stored-links (delq (assoc link org-stored-links) | |
4998 org-stored-links))) | |
4999 (let ((lines (org-split-string (or linktxt link) "\n"))) | |
5000 (insert (car lines)) | |
5001 (setq matched (string-match org-link-regexp (car lines))) | |
5002 (setq lines (cdr lines)) | |
5003 (while lines | |
5004 (insert "\n") | |
5005 (if (save-excursion | |
5006 (beginning-of-line 0) | |
5007 (looking-at "[ \t]+\\S-")) | |
5008 (indent-relative)) | |
5009 (setq matched (or matched | |
5010 (string-match org-link-regexp (car lines)))) | |
5011 (insert (car lines)) | |
5012 (setq lines (cdr lines)))) | |
5013 (unless matched | |
5014 (error "Add link type: http(s),ftp,mailto,file,news,bbdb,vm,wl,rmail,gnus, or shell"))))) | |
5015 | |
5016 ;;; Hooks for remember.el | |
5017 ;;;###autoload | |
5018 (defun org-remember-annotation () | |
5019 "Return a link to the current location as an annotation for remember.el. | |
5020 If you are using Org-mode files as target for data storage with | |
5021 remember.el, then the annotations should include a link compatible with the | |
5022 conventions in Org-mode. This function returns such a link." | |
5023 (org-store-link nil)) | |
5024 | |
5025 (defconst org-remember-help | |
5026 "Select a destination location for the note. | |
5027 UP/DOWN=headline TAB=cycle visibility [Q]uit RET/<left>/<right>=Store | |
5028 RET at beg-of-buf -> Append to file as level 2 headline | |
5029 RET on headline -> Store as sublevel entry to current headline | |
5030 <left>/<right> -> before/after current headline, same headings level") | |
5031 | |
5032 ;;;###autoload | |
5033 (defun org-remember-handler () | |
5034 "Store stuff from remember.el into an org file. | |
5035 First prompts for an org file. If the user just presses return, the value | |
5036 of `org-default-notes-file' is used. | |
5037 Then the command offers the headings tree of the selected file in order to | |
5038 file the text at a specific location. | |
5039 You can either immediately press RET to get the note appended to the | |
5040 file. Or you can use vertical cursor motion and visibility cycling (TAB) to | |
5041 find a better place. Then press RET or <left> or <right> in insert the note. | |
5042 | |
5043 Key Cursor position Note gets inserted | |
5044 ----------------------------------------------------------------------------- | |
5045 RET buffer-start as level 2 heading at end of file | |
5046 RET on headline as sublevel of the heading at cursor | |
5047 RET no heading at cursor position, level taken from context. | |
5048 Or use prefix arg to specify level manually. | |
5049 <left> on headline as same level, before current heading | |
5050 <right> on headline as same level, after current heading | |
5051 | |
5052 So the fastest way to store the note is to press RET RET to append it to | |
5053 the default file. This way your current train of thought is not | |
5054 interrupted, in accordance with the principles of remember.el. But with | |
5055 little extra effort, you can push it directly to the correct location. | |
5056 | |
5057 Before being stored away, the function ensures that the text has a | |
5058 headline, i.e. a first line that starts with a \"*\". If not, a headline | |
5059 is constructed from the current date and some additional data. | |
5060 | |
5061 If the variable `org-adapt-indentation' is non-nil, the entire text is | |
5062 also indented so that it starts in the same column as the headline | |
5063 \(i.e. after the stars). | |
5064 | |
5065 See also the variable `org-reverse-note-order'." | |
5066 (catch 'quit | |
5067 (let* ((txt (buffer-substring (point-min) (point-max))) | |
5068 (fastp current-prefix-arg) | |
5069 (file (if fastp org-default-notes-file (org-get-org-file))) | |
5070 (visiting (find-buffer-visiting file)) | |
5071 (org-startup-with-deadline-check nil) | |
5072 (org-startup-folded nil) | |
5073 spos level indent reversed) | |
5074 ;; Modify text so that it becomes a nice subtree which can be inserted | |
5075 ;; into an org tree. | |
5076 (let* ((lines (split-string txt "\n")) | |
5077 (first (car lines)) | |
5078 (lines (cdr lines))) | |
5079 (if (string-match "^\\*+" first) | |
5080 ;; Is already a headline | |
5081 (setq indent (make-string (- (match-end 0) (match-beginning 0) | |
5082 -1) ?\ )) | |
5083 ;; We need to add a headline: Use time and first buffer line | |
5084 (setq lines (cons first lines) | |
5085 first (concat "* " (current-time-string) | |
5086 " (" (remember-buffer-desc) ")") | |
5087 indent " ")) | |
5088 (if org-adapt-indentation | |
5089 (setq lines (mapcar (lambda (x) (concat indent x)) lines))) | |
5090 (setq txt (concat first "\n" | |
5091 (mapconcat 'identity lines "\n")))) | |
5092 ;; Find the file | |
5093 (if (not visiting) | |
5094 (find-file-noselect file)) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
5095 (with-current-buffer (get-file-buffer file) |
58792 | 5096 (setq reversed (org-notes-order-reversed-p)) |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
5097 (save-excursion |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
5098 (save-restriction |
58792 | 5099 (widen) |
5100 ;; Ask the User for a location | |
5101 (setq spos (if fastp 1 (org-get-location | |
5102 (current-buffer) | |
5103 org-remember-help))) | |
5104 (if (not spos) (throw 'quit nil)) ; return nil to show we did | |
5105 ; not handle this note | |
5106 (goto-char spos) | |
5107 (cond ((bobp) | |
5108 ;; Put it at the start or end, as level 2 | |
5109 (save-restriction | |
5110 (widen) | |
5111 (goto-char (if reversed (point-min) (point-max))) | |
5112 (if (not (bolp)) (newline)) | |
5113 (org-paste-subtree (or current-prefix-arg 2) txt))) | |
5114 ((and (org-on-heading-p nil) (not current-prefix-arg)) | |
5115 ;; Put it below this entry, at the beg/end of the subtree | |
5116 (org-back-to-heading) | |
5117 (setq level (outline-level)) | |
5118 (if reversed | |
5119 (outline-end-of-heading) | |
5120 (outline-end-of-subtree)) | |
5121 (if (not (bolp)) (newline)) | |
5122 (beginning-of-line 1) | |
5123 (org-paste-subtree (1+ level) txt)) | |
5124 (t | |
5125 ;; Put it right there, with automatic level determined by | |
5126 ;; org-paste-subtree or from prefix arg | |
5127 (org-paste-subtree current-prefix-arg txt))) | |
5128 (when remember-save-after-remembering | |
5129 (save-buffer) | |
5130 (if (not visiting) (kill-buffer (current-buffer))))))))) | |
5131 t) ;; return t to indicate that we took care of this note. | |
5132 | |
5133 (defun org-get-org-file () | |
5134 "Read a filename, with default directory `org-directory'." | |
5135 (let ((default (or org-default-notes-file remember-data-file))) | |
5136 (read-file-name (format "File name [%s]: " default) | |
5137 (file-name-as-directory org-directory) | |
5138 default))) | |
5139 | |
5140 (defun org-notes-order-reversed-p () | |
5141 "Check if the current file should receive notes in reversed order." | |
5142 (cond | |
5143 ((not org-reverse-note-order) nil) | |
5144 ((eq t org-reverse-note-order) t) | |
5145 ((not (listp org-reverse-note-order)) nil) | |
5146 (t (catch 'exit | |
5147 (let ((all org-reverse-note-order) | |
5148 entry) | |
5149 (while (setq entry (pop all)) | |
5150 (if (string-match (car entry) (buffer-file-name)) | |
5151 (throw 'exit (cdr entry)))) | |
5152 nil))))) | |
5153 | |
5154 ;;; Tables | |
5155 | |
5156 ;; Watch out: Here we are talking about two different kind of tables. | |
5157 ;; Most of the code is for the tables created with the Org-mode table editor. | |
5158 ;; Sometimes, we talk about tables created and edited with the table.el | |
5159 ;; Emacs package. We call the former org-type tables, and the latter | |
5160 ;; table.el-type tables. | |
5161 | |
5162 | |
5163 (defun org-before-change-function (beg end) | |
5164 "Every change indicates that a table might need an update." | |
5165 (setq org-table-may-need-update t)) | |
5166 | |
5167 (defconst org-table-line-regexp "^[ \t]*|" | |
5168 "Detects an org-type table line.") | |
5169 (defconst org-table-dataline-regexp "^[ \t]*|[^-]" | |
5170 "Detects an org-type table line.") | |
5171 (defconst org-table-hline-regexp "^[ \t]*|-" | |
5172 "Detects an org-type table hline.") | |
5173 (defconst org-table1-hline-regexp "^[ \t]*\\+-[-+]" | |
5174 "Detects a table-type table hline.") | |
5175 (defconst org-table-any-line-regexp "^[ \t]*\\(|\\|\\+-[-+]\\)" | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
5176 "Detects an org-type or table-type table.") |
58792 | 5177 (defconst org-table-border-regexp "^[ \t]*[^| \t]" |
5178 "Searching from within a table (any type) this finds the first line | |
5179 outside the table.") | |
5180 (defconst org-table-any-border-regexp "^[ \t]*[^|+ \t]" | |
5181 "Searching from within a table (any type) this finds the first line | |
5182 outside the table.") | |
5183 | |
5184 (defun org-table-create-with-table.el () | |
5185 "Use the table.el package to insert a new table. | |
5186 If there is already a table at point, convert between Org-mode tables | |
5187 and table.el tables." | |
5188 (interactive) | |
5189 (require 'table) | |
5190 (cond | |
5191 ((org-at-table.el-p) | |
5192 (if (y-or-n-p "Convert table to Org-mode table? ") | |
5193 (org-table-convert))) | |
5194 ((org-at-table-p) | |
5195 (if (y-or-n-p "Convert table to table.el table? ") | |
5196 (org-table-convert))) | |
5197 (t (call-interactively 'table-insert)))) | |
5198 | |
5199 (defun org-table-create (&optional size) | |
5200 "Query for a size and insert a table skeleton. | |
5201 SIZE is a string Columns x Rows like for example \"3x2\"." | |
5202 (interactive "P") | |
5203 (unless size | |
5204 (setq size (read-string | |
5205 (concat "Table size Columns x Rows [e.g. " | |
5206 org-table-default-size "]: ") | |
5207 "" nil org-table-default-size))) | |
5208 | |
5209 (let* ((pos (point)) | |
5210 (indent (make-string (current-column) ?\ )) | |
5211 (split (org-split-string size " *x *")) | |
5212 (rows (string-to-number (nth 1 split))) | |
5213 (columns (string-to-number (car split))) | |
5214 (line (concat (apply 'concat indent "|" (make-list columns " |")) | |
5215 "\n"))) | |
5216 (if (string-match "^[ \t]*$" (buffer-substring-no-properties | |
5217 (point-at-bol) (point))) | |
5218 (beginning-of-line 1) | |
5219 (newline)) | |
5220 (mapcar (lambda (x) (insert line)) (make-list rows t)) | |
5221 (goto-char pos) | |
5222 (if (> rows 1) | |
5223 ;; Insert a hline after the first row. | |
5224 (progn | |
5225 (end-of-line 1) | |
5226 (insert "\n|-") | |
5227 (goto-char pos))) | |
5228 (org-table-align))) | |
5229 | |
5230 (defun org-table-convert-region (beg0 end0 nspace) | |
5231 "Convert region to a table. | |
5232 The region goes from BEG0 to END0, but these borders will be moved | |
5233 slightly, to make sure a beginning of line in the first line is included. | |
5234 When NSPACE is non-nil, it indicates the minimum number of spaces that | |
5235 separate columns (default: just one space)" | |
5236 (let* ((beg (min beg0 end0)) | |
5237 (end (max beg0 end0)) | |
5238 (tabsep t) | |
5239 re) | |
5240 (goto-char beg) | |
5241 (beginning-of-line 1) | |
5242 (setq beg (move-marker (make-marker) (point))) | |
5243 (goto-char end) | |
5244 (if (bolp) (backward-char 1) (end-of-line 1)) | |
5245 (setq end (move-marker (make-marker) (point))) | |
5246 ;; Lets see if this is tab-separated material. If every nonempty line | |
5247 ;; contains a tab, we will assume that it is tab-separated material | |
5248 (if nspace | |
5249 (setq tabsep nil) | |
5250 (goto-char beg) | |
5251 (and (re-search-forward "^[^\n\t]+$" end t) (setq tabsep nil))) | |
5252 (if nspace (setq tabsep nil)) | |
5253 (if tabsep | |
5254 (setq re "^\\|\t") | |
5255 (setq re (format "^ *\\| *\t *\\| \\{%d,\\}" | |
5256 (max 1 (prefix-numeric-value nspace))))) | |
5257 (goto-char beg) | |
5258 (while (re-search-forward re end t) | |
5259 (replace-match "|" t t)) | |
5260 (goto-char beg) | |
5261 (insert " ") | |
5262 (org-table-align))) | |
5263 | |
5264 (defun org-table-import (file arg) | |
5265 "Import FILE as a table. | |
5266 The file is assumed to be tab-separated. Such files can be produced by most | |
5267 spreadsheet and database applications. If no tabs (at least one per line) | |
5268 are found, lines will be split on whitespace into fields." | |
5269 (interactive "f\nP") | |
5270 (or (bolp) (newline)) | |
5271 (let ((beg (point)) | |
5272 (pm (point-max))) | |
5273 (insert-file-contents file) | |
5274 (org-table-convert-region beg (+ (point) (- (point-max) pm)) arg))) | |
5275 | |
5276 (defun org-table-export () | |
5277 "Export table as a tab-separated file. | |
5278 Such a file can be imported into a spreadsheet program like Excel." | |
5279 (interactive) | |
5280 (let* ((beg (org-table-begin)) | |
5281 (end (org-table-end)) | |
5282 (table (buffer-substring beg end)) | |
5283 (file (read-file-name "Export table to: ")) | |
5284 buf) | |
5285 (unless (or (not (file-exists-p file)) | |
5286 (y-or-n-p (format "Overwrite file %s? " file))) | |
5287 (error "Abort")) | |
5288 (save-excursion | |
5289 (find-file file) | |
5290 (setq buf (current-buffer)) | |
5291 (erase-buffer) | |
5292 (fundamental-mode) | |
5293 (insert table) | |
5294 (goto-char (point-min)) | |
5295 (while (re-search-forward "^[ \t]*|[ \t]*" nil t) | |
5296 (replace-match "" t t) | |
5297 (end-of-line 1)) | |
5298 (goto-char (point-min)) | |
5299 (while (re-search-forward "[ \t]*|[ \t]*$" nil t) | |
5300 (replace-match "" t t) | |
5301 (goto-char (min (1+ (point)) (point-max)))) | |
5302 (goto-char (point-min)) | |
5303 (while (re-search-forward "^-[-+]*$" nil t) | |
5304 (replace-match "") | |
5305 (if (looking-at "\n") | |
5306 (delete-char 1))) | |
5307 (goto-char (point-min)) | |
5308 (while (re-search-forward "[ \t]*|[ \t]*" nil t) | |
5309 (replace-match "\t" t t)) | |
5310 (save-buffer)) | |
5311 (kill-buffer buf))) | |
5312 | |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5313 (defvar org-table-aligned-begin-marker (make-marker) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5314 "Marker at the beginning of the table last aligned. |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5315 Used to check if cursor still is in that table, to minimize realignment.") |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5316 (defvar org-table-aligned-end-marker (make-marker) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5317 "Marker at the end of the table last aligned. |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5318 Used to check if cursor still is in that table, to minimize realignment.") |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5319 (defvar org-table-last-alignment nil |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
5320 "List of flags for flushright alignment, from the last re-alignment. |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5321 This is being used to correctly align a single field after TAB or RET.") |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5322 ;; FIXME: The following is currently not used. |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5323 (defvar org-table-last-column-widths nil |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
5324 "List of max width of fields in each column. |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5325 This is being used to correctly align a single field after TAB or RET.") |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5326 |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5327 |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
5328 (defun org-table-align () |
58792 | 5329 "Align the table at point by aligning all vertical bars." |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
5330 (interactive) |
58792 | 5331 (let* ( |
5332 ;; Limits of table | |
5333 (beg (org-table-begin)) | |
5334 (end (org-table-end)) | |
5335 ;; Current cursor position | |
5336 (linepos (+ (if (bolp) 1 0) (count-lines (point-min) (point)))) | |
5337 (colpos (org-table-current-column)) | |
5338 (winstart (window-start)) | |
5339 text lines (new "") lengths l typenums ty fields maxfields i | |
5340 column | |
5341 (indent "") cnt frac | |
5342 rfmt hfmt | |
5343 (spaces (if (org-in-invisibility-spec-p '(org-table)) | |
5344 org-table-spaces-around-invisible-separators | |
5345 org-table-spaces-around-separators)) | |
5346 (sp1 (car spaces)) | |
5347 (sp2 (cdr spaces)) | |
5348 (rfmt1 (concat | |
5349 (make-string sp2 ?\ ) "%%%s%ds" (make-string sp1 ?\ ) "|")) | |
5350 (hfmt1 (concat | |
5351 (make-string sp2 ?-) "%s" (make-string sp1 ?-) "+")) | |
5352 emptystrings) | |
5353 (untabify beg end) | |
5354 ;; (message "Aligning table...") | |
5355 ;; Get the rows | |
5356 (setq lines (org-split-string | |
5357 (buffer-substring-no-properties beg end) "\n")) | |
5358 ;; Store the indentation of the first line | |
5359 (if (string-match "^ *" (car lines)) | |
5360 (setq indent (make-string (- (match-end 0) (match-beginning 0)) ?\ ))) | |
5361 ;; Mark the hlines | |
5362 (setq lines (mapcar (lambda (l) (if (string-match "^ *|-" l) nil l)) | |
5363 lines)) | |
5364 ;; Get the data fields | |
5365 (setq fields (mapcar | |
5366 (lambda (l) | |
5367 (org-split-string l " *| *")) | |
5368 (delq nil (copy-sequence lines)))) | |
5369 ;; How many fields in the longest line? | |
5370 (condition-case nil | |
5371 (setq maxfields (apply 'max (mapcar 'length fields))) | |
5372 (error | |
5373 (kill-region beg end) | |
5374 (org-table-create org-table-default-size) | |
5375 (error "Empty table - created default table"))) | |
5376 ;; A list of empty string to fill any short rows on output | |
5377 (setq emptystrings (make-list maxfields "")) | |
5378 ;; Get the maximum length of a field and the most common datatype | |
5379 ;; for each column | |
5380 (setq i -1) | |
5381 (while (< (setq i (1+ i)) maxfields) ;; Loop over all columns | |
5382 (setq column (mapcar (lambda (x) (or (nth i x) "")) fields)) | |
5383 ;; maximum length | |
5384 (push (apply 'max 1 (mapcar 'length column)) lengths) | |
5385 ;; compute the fraction stepwise, ignoring empty fields | |
5386 (setq cnt 0 frac 0.0) | |
5387 (mapcar | |
5388 (lambda (x) | |
5389 (if (equal x "") | |
5390 nil | |
5391 (setq frac ( / (+ (* frac cnt) | |
5392 (if (string-match org-table-number-regexp x) 1 0)) | |
5393 (setq cnt (1+ cnt)))))) | |
5394 column) | |
5395 (push (>= frac org-table-number-fraction) typenums)) | |
5396 (setq lengths (nreverse lengths) | |
5397 typenums (nreverse typenums)) | |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5398 (setq org-table-last-alignment typenums |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5399 org-table-last-column-widths lengths) |
58792 | 5400 ;; Compute the formats needed for output of the table |
5401 (setq rfmt (concat indent "|") hfmt (concat indent "|")) | |
5402 (while (setq l (pop lengths)) | |
5403 (setq ty (if (pop typenums) "" "-")) ; number types flushright | |
5404 (setq rfmt (concat rfmt (format rfmt1 ty l)) | |
5405 hfmt (concat hfmt (format hfmt1 (make-string l ?-))))) | |
5406 (setq rfmt (concat rfmt "\n") | |
5407 hfmt (concat (substring hfmt 0 -1) "|\n")) | |
5408 ;; Produce the new table | |
5409 (while lines | |
5410 (setq l (pop lines)) | |
5411 (if l | |
5412 (setq new (concat new (apply 'format rfmt | |
5413 (append (pop fields) emptystrings)))) | |
5414 (setq new (concat new hfmt)))) | |
5415 ;; Replace the old one | |
5416 (delete-region beg end) | |
5417 (move-marker end nil) | |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5418 (move-marker org-table-aligned-begin-marker (point)) |
58792 | 5419 (insert new) |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5420 (move-marker org-table-aligned-end-marker (point)) |
58792 | 5421 ;; Try to move to the old location (approximately) |
5422 (goto-line linepos) | |
5423 (set-window-start (selected-window) winstart 'noforce) | |
5424 (org-table-goto-column colpos) | |
5425 (setq org-table-may-need-update nil) | |
5426 (if (org-in-invisibility-spec-p '(org-table)) | |
5427 (org-table-add-invisible-to-vertical-lines)) | |
5428 )) | |
5429 | |
5430 (defun org-table-begin (&optional table-type) | |
5431 "Find the beginning of the table and return its position. | |
5432 With argument TABLE-TYPE, go to the beginning of a table.el-type table." | |
5433 (save-excursion | |
5434 (if (not (re-search-backward | |
5435 (if table-type org-table-any-border-regexp | |
5436 org-table-border-regexp) | |
5437 nil t)) | |
5438 (error "Can't find beginning of table") | |
5439 (goto-char (match-beginning 0)) | |
5440 (beginning-of-line 2) | |
5441 (point)))) | |
5442 | |
5443 (defun org-table-end (&optional table-type) | |
5444 "Find the end of the table and return its position. | |
5445 With argument TABLE-TYPE, go to the end of a table.el-type table." | |
5446 (save-excursion | |
5447 (if (not (re-search-forward | |
5448 (if table-type org-table-any-border-regexp | |
5449 org-table-border-regexp) | |
5450 nil t)) | |
5451 (goto-char (point-max)) | |
5452 (goto-char (match-beginning 0))) | |
5453 (point-marker))) | |
5454 | |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5455 (defun org-table-justify-field-maybe () |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5456 "Justify the current field, text to left, number to right." |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5457 (cond |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5458 (org-table-may-need-update) ; Realignment will happen anyway, don't bother |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5459 ((org-at-table-hline-p) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5460 ;; This is pretty stupid, but I don't know how to deal with hlines |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5461 (setq org-table-may-need-update t)) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5462 ((or (not (equal (marker-buffer org-table-aligned-begin-marker) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5463 (current-buffer))) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5464 (< (point) org-table-aligned-begin-marker) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5465 (>= (point) org-table-aligned-end-marker)) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5466 ;; This is not the same table, force a full re-align |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5467 (setq org-table-may-need-update t)) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5468 (t ;; realign the current field, based on previous full realign |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5469 (let* ((pos (point)) s org-table-may-need-update |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5470 (col (org-table-current-column)) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5471 (num (nth (1- col) org-table-last-alignment)) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5472 l f) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5473 (when (> col 0) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5474 (skip-chars-backward "^|\n") |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5475 (if (looking-at " *\\([^|\n]*?\\) *|") |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5476 (progn |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5477 (setq s (match-string 1) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5478 l (max 1 (- (match-end 0) (match-beginning 0) 3))) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5479 (setq f (format (if num " %%%ds |" " %%-%ds |") l)) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5480 (replace-match (format f s t t))) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5481 (setq org-table-may-need-update t)) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5482 (goto-char pos)))))) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5483 |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
5484 (defun org-table-next-field () |
58792 | 5485 "Go to the next field in the current table. |
5486 Before doing so, re-align the table if necessary." | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
5487 (interactive) |
58792 | 5488 (if (and org-table-automatic-realign |
5489 org-table-may-need-update) | |
5490 (org-table-align)) | |
5491 (if (org-at-table-hline-p) | |
5492 (end-of-line 1)) | |
5493 (condition-case nil | |
5494 (progn | |
5495 (re-search-forward "|" (org-table-end)) | |
5496 (if (looking-at "[ \t]*$") | |
5497 (re-search-forward "|" (org-table-end))) | |
5498 (if (looking-at "-") | |
5499 (progn | |
5500 (beginning-of-line 0) | |
5501 (org-table-insert-row 'below)) | |
5502 (if (looking-at " ") (forward-char 1)))) | |
5503 (error | |
5504 (org-table-insert-row 'below)))) | |
5505 | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
5506 (defun org-table-previous-field () |
58792 | 5507 "Go to the previous field in the table. |
5508 Before doing so, re-align the table if necessary." | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
5509 (interactive) |
58792 | 5510 (if (and org-table-automatic-realign |
5511 org-table-may-need-update) | |
5512 (org-table-align)) | |
5513 (if (org-at-table-hline-p) | |
5514 (end-of-line 1)) | |
5515 (re-search-backward "|" (org-table-begin)) | |
5516 (re-search-backward "|" (org-table-begin)) | |
5517 (while (looking-at "|\\(-\\|[ \t]*$\\)") | |
5518 (re-search-backward "|" (org-table-begin))) | |
5519 (if (looking-at "| ?") | |
5520 (goto-char (match-end 0)))) | |
5521 | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
5522 (defun org-table-next-row () |
58792 | 5523 "Go to the next row (same column) in the current table. |
5524 Before doing so, re-align the table if necessary." | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
5525 (interactive) |
58792 | 5526 (if (or (looking-at "[ \t]*$") |
5527 (save-excursion (skip-chars-backward " \t") (bolp))) | |
5528 (newline) | |
5529 (if (and org-table-automatic-realign | |
5530 org-table-may-need-update) | |
5531 (org-table-align)) | |
5532 (let ((col (org-table-current-column))) | |
5533 (beginning-of-line 2) | |
5534 (if (or (not (org-at-table-p)) | |
5535 (org-at-table-hline-p)) | |
5536 (progn | |
5537 (beginning-of-line 0) | |
5538 (org-table-insert-row 'below))) | |
5539 (org-table-goto-column col) | |
5540 (skip-chars-backward "^|\n\r") | |
5541 (if (looking-at " ") (forward-char 1))))) | |
5542 | |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
5543 (defun org-table-copy-down (n) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
5544 "Copy a field down in the current column. |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
5545 If the field at the cursor is empty, copy into it the content of the nearest |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
5546 non-empty field above. With argument N, use the Nth non-empty field. |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
5547 If the current field is not empty, it is copied down to the next row, and |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
5548 the cursor is moved with it. Therefore, repeating this command causes the |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
5549 column to be filled row-by-row. |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
5550 If the variable `org-table-copy-increment' is non-nil and the field is an |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
5551 integer, it will be incremented while copying." |
58792 | 5552 (interactive "p") |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
5553 (let* ((colpos (org-table-current-column)) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
5554 (field (org-table-get-field)) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
5555 (non-empty (string-match "[^ \t]" field)) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
5556 (beg (org-table-begin)) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
5557 txt) |
58792 | 5558 (org-table-check-inside-data-field) |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
5559 (if non-empty (progn (org-table-next-row) (org-table-blank-field))) |
58792 | 5560 (if (save-excursion |
5561 (setq txt | |
5562 (catch 'exit | |
5563 (while (progn (beginning-of-line 1) | |
5564 (re-search-backward org-table-dataline-regexp | |
5565 beg t)) | |
5566 (org-table-goto-column colpos t) | |
5567 (if (and (looking-at | |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
5568 "|[ \t]*\\([^| \t][^|]*?\\)[ \t]*|") |
58792 | 5569 (= (setq n (1- n)) 0)) |
5570 (throw 'exit (match-string 1))))))) | |
5571 (progn | |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
5572 (if (and org-table-copy-increment |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
5573 (string-match "^[0-9]+$" txt)) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
5574 (setq txt (format "%d" (+ (string-to-int txt) 1)))) |
58792 | 5575 (insert txt) |
5576 (org-table-align)) | |
5577 (error "No non-empty field found")))) | |
5578 | |
5579 (defun org-table-check-inside-data-field () | |
5580 "Is point inside a table data field? | |
5581 I.e. not on a hline or before the first or after the last column?" | |
5582 (if (or (not (org-at-table-p)) | |
5583 (= (org-table-current-column) 0) | |
5584 (org-at-table-hline-p) | |
5585 (looking-at "[ \t]*$")) | |
5586 (error "Not in table data field"))) | |
5587 | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
5588 (defvar org-table-clip nil |
62076
4f2150e05f24
(org-get-entries-from-diary): Remove unused vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61924
diff
changeset
|
5589 "Clipboard for table regions.") |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
5590 |
58792 | 5591 (defun org-table-blank-field () |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5592 "Blank the current table field or active region." |
58792 | 5593 (interactive) |
5594 (org-table-check-inside-data-field) | |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5595 (if (and (interactive-p) (org-region-active-p)) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5596 (let (org-table-clip) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5597 (org-table-cut-region)) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5598 (skip-chars-backward "^|") |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5599 (backward-char 1) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5600 (if (looking-at "|[^|]+") |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5601 (let* ((pos (match-beginning 0)) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5602 (match (match-string 0)) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5603 (len (length match))) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5604 (replace-match (concat "|" (make-string (1- len) ?\ ))) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5605 (goto-char (+ 2 pos)) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5606 (substring match 1))))) |
58792 | 5607 |
5608 (defun org-table-get-field (&optional n replace) | |
5609 "Return the value of the field in column N of current row. | |
5610 N defaults to current field. | |
5611 If REPLACE is a string, replace field with this value. The return value | |
5612 is always the old value." | |
5613 (and n (org-table-goto-column n)) | |
5614 (skip-chars-backward "^|") | |
5615 (backward-char 1) | |
5616 (if (looking-at "|[^|\r\n]*") | |
5617 (let* ((pos (match-beginning 0)) | |
5618 (val (buffer-substring (1+ pos) (match-end 0)))) | |
5619 (if replace | |
5620 (replace-match (concat "|" replace))) | |
5621 (goto-char (+ 2 pos)) | |
5622 val))) | |
5623 | |
5624 (defun org-table-current-column () | |
5625 "Find out which column we are in. | |
5626 When called interactively, column is also displayed in echo area." | |
5627 (interactive) | |
5628 (if (interactive-p) (org-table-check-inside-data-field)) | |
5629 (save-excursion | |
5630 (let ((cnt 0) (pos (point))) | |
5631 (beginning-of-line 1) | |
5632 (while (search-forward "|" pos t) | |
5633 (setq cnt (1+ cnt))) | |
5634 (if (interactive-p) (message "This is table column %d" cnt)) | |
5635 cnt))) | |
5636 | |
5637 (defun org-table-goto-column (n &optional on-delim force) | |
5638 "Move the cursor to the Nth column in the current table line. | |
5639 With optional argument ON-DELIM, stop with point before the left delimiter | |
5640 of the field. | |
5641 If there are less than N fields, just go to after the last delimiter. | |
5642 However, when FORCE is non-nil, create new columns if necessary." | |
5643 (let ((pos (point-at-eol))) | |
5644 (beginning-of-line 1) | |
5645 (when (> n 0) | |
5646 (while (and (> (setq n (1- n)) -1) | |
5647 (or (search-forward "|" pos t) | |
5648 (and force | |
5649 (progn (end-of-line 1) | |
5650 (skip-chars-backward "^|") | |
5651 (insert " |") | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
5652 (backward-char 2) t))))) |
58792 | 5653 (when (and force (not (looking-at ".*|"))) |
5654 (save-excursion (end-of-line 1) (insert "|"))) | |
5655 (if on-delim | |
5656 (backward-char 1) | |
5657 (if (looking-at " ") (forward-char 1)))))) | |
5658 | |
5659 (defun org-at-table-p (&optional table-type) | |
5660 "Return t if the cursor is inside an org-type table." | |
5661 (if org-enable-table-editor | |
5662 (save-excursion | |
5663 (beginning-of-line 1) | |
5664 (looking-at (if table-type org-table-any-line-regexp | |
5665 org-table-line-regexp))) | |
5666 nil)) | |
5667 | |
5668 (defun org-table-recognize-table.el () | |
5669 "If there is a table.el table nearby, recognize it and move into it." | |
5670 (if org-table-tab-recognizes-table.el | |
5671 (if (org-at-table.el-p) | |
5672 (progn | |
5673 (beginning-of-line 1) | |
5674 (if (looking-at org-table-dataline-regexp) | |
5675 nil | |
5676 (if (looking-at org-table1-hline-regexp) | |
5677 (progn | |
5678 (beginning-of-line 2) | |
5679 (if (looking-at org-table-any-border-regexp) | |
5680 (beginning-of-line -1))))) | |
5681 (if (re-search-forward "|" (org-table-end t) t) | |
5682 (progn | |
5683 (require 'table) | |
5684 (if (table--at-cell-p (point)) | |
5685 t | |
5686 (message "recognizing table.el table...") | |
5687 (table-recognize-table) | |
5688 (message "recognizing table.el table...done"))) | |
5689 (error "This should not happen...")) | |
5690 t) | |
5691 nil) | |
5692 nil)) | |
5693 | |
5694 (defun org-at-table.el-p () | |
5695 "Return t if the cursor is inside a table.el-type table." | |
5696 (save-excursion | |
5697 (if (org-at-table-p 'any) | |
5698 (progn | |
5699 (goto-char (org-table-begin 'any)) | |
5700 (looking-at org-table1-hline-regexp)) | |
5701 nil))) | |
5702 | |
5703 (defun org-at-table-hline-p () | |
5704 "Return t if the cursor is inside a hline in a table." | |
5705 (if org-enable-table-editor | |
5706 (save-excursion | |
5707 (beginning-of-line 1) | |
5708 (looking-at org-table-hline-regexp)) | |
5709 nil)) | |
5710 | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
5711 (defun org-table-insert-column () |
58792 | 5712 "Insert a new column into the table." |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
5713 (interactive) |
58792 | 5714 (if (not (org-at-table-p)) |
5715 (error "Not at a table")) | |
5716 (org-table-find-dataline) | |
5717 (let* ((col (max 1 (org-table-current-column))) | |
5718 (beg (org-table-begin)) | |
5719 (end (org-table-end)) | |
5720 ;; Current cursor position | |
5721 (linepos (+ (if (bolp) 1 0) (count-lines (point-min) (point)))) | |
5722 (colpos col)) | |
5723 (goto-char beg) | |
5724 (while (< (point) end) | |
5725 (if (org-at-table-hline-p) | |
5726 nil | |
5727 (org-table-goto-column col t) | |
5728 (insert "| ")) | |
5729 (beginning-of-line 2)) | |
5730 (move-marker end nil) | |
5731 (goto-line linepos) | |
5732 (org-table-goto-column colpos)) | |
5733 (org-table-align)) | |
5734 | |
5735 (defun org-table-find-dataline () | |
5736 "Find a dataline in the current table, which is needed for column commands." | |
5737 (if (and (org-at-table-p) | |
5738 (not (org-at-table-hline-p))) | |
5739 t | |
5740 (let ((col (current-column)) | |
5741 (end (org-table-end))) | |
5742 (move-to-column col) | |
5743 (while (and (< (point) end) | |
5744 (or (not (= (current-column) col)) | |
5745 (org-at-table-hline-p))) | |
5746 (beginning-of-line 2) | |
5747 (move-to-column col)) | |
5748 (if (and (org-at-table-p) | |
5749 (not (org-at-table-hline-p))) | |
5750 t | |
5751 (error | |
5752 "Please position cursor in a data line for column operations"))))) | |
5753 | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
5754 (defun org-table-delete-column () |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
5755 "Delete a column into the table." |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
5756 (interactive) |
58792 | 5757 (if (not (org-at-table-p)) |
5758 (error "Not at a table")) | |
5759 (org-table-find-dataline) | |
5760 (org-table-check-inside-data-field) | |
5761 (let* ((col (org-table-current-column)) | |
5762 (beg (org-table-begin)) | |
5763 (end (org-table-end)) | |
5764 ;; Current cursor position | |
5765 (linepos (+ (if (bolp) 1 0) (count-lines (point-min) (point)))) | |
5766 (colpos col)) | |
5767 (goto-char beg) | |
5768 (while (< (point) end) | |
5769 (if (org-at-table-hline-p) | |
5770 nil | |
5771 (org-table-goto-column col t) | |
5772 (and (looking-at "|[^|\n]+|") | |
5773 (replace-match "|"))) | |
5774 (beginning-of-line 2)) | |
5775 (move-marker end nil) | |
5776 (goto-line linepos) | |
5777 (org-table-goto-column colpos)) | |
5778 (org-table-align)) | |
5779 | |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5780 (defun org-table-move-column-right () |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5781 "Move column to the right." |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5782 (interactive) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5783 (org-table-move-column nil)) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5784 (defun org-table-move-column-left () |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5785 "Move column to the left." |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5786 (interactive) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5787 (org-table-move-column 'left)) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5788 |
58792 | 5789 (defun org-table-move-column (&optional left) |
5790 "Move the current column to the right. With arg LEFT, move to the left." | |
5791 (interactive "P") | |
5792 (if (not (org-at-table-p)) | |
5793 (error "Not at a table")) | |
5794 (org-table-find-dataline) | |
5795 (org-table-check-inside-data-field) | |
5796 (let* ((col (org-table-current-column)) | |
5797 (col1 (if left (1- col) col)) | |
5798 (beg (org-table-begin)) | |
5799 (end (org-table-end)) | |
5800 ;; Current cursor position | |
5801 (linepos (+ (if (bolp) 1 0) (count-lines (point-min) (point)))) | |
5802 (colpos (if left (1- col) (1+ col)))) | |
5803 (if (and left (= col 1)) | |
5804 (error "Cannot move column further left")) | |
5805 (if (and (not left) (looking-at "[^|\n]*|[^|\n]*$")) | |
5806 (error "Cannot move column further right")) | |
5807 (goto-char beg) | |
5808 (while (< (point) end) | |
5809 (if (org-at-table-hline-p) | |
5810 nil | |
5811 (org-table-goto-column col1 t) | |
5812 (and (looking-at "|\\([^|\n]+\\)|\\([^|\n]+\\)|") | |
5813 (replace-match "|\\2|\\1|"))) | |
5814 (beginning-of-line 2)) | |
5815 (move-marker end nil) | |
5816 (goto-line linepos) | |
5817 (org-table-goto-column colpos)) | |
5818 (org-table-align)) | |
5819 | |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5820 (defun org-table-move-row-down () |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5821 "Move table row down." |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5822 (interactive) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5823 (org-table-move-row nil)) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5824 (defun org-table-move-row-up () |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
5825 "Move table row up." |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5826 (interactive) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5827 (org-table-move-row 'up)) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5828 |
58792 | 5829 (defun org-table-move-row (&optional up) |
62076
4f2150e05f24
(org-get-entries-from-diary): Remove unused vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61924
diff
changeset
|
5830 "Move the current table line down. With arg UP, move it up." |
58792 | 5831 (interactive "P") |
5832 (let ((col (current-column)) | |
5833 (pos (point)) | |
5834 (tonew (if up 0 2)) | |
5835 txt) | |
5836 (beginning-of-line tonew) | |
5837 (if (not (org-at-table-p)) | |
5838 (progn | |
5839 (goto-char pos) | |
5840 (error "Cannot move row further."))) | |
5841 (goto-char pos) | |
5842 (beginning-of-line 1) | |
5843 (setq pos (point)) | |
5844 (setq txt (buffer-substring (point) (1+ (point-at-eol)))) | |
5845 (delete-region (point) (1+ (point-at-eol))) | |
5846 (beginning-of-line tonew) | |
5847 (insert txt) | |
5848 (beginning-of-line 0) | |
5849 (move-to-column col))) | |
5850 | |
5851 (defun org-table-insert-row (&optional arg) | |
5852 "Insert a new row above the current line into the table. | |
5853 With prefix ARG, insert below the current line." | |
5854 (interactive "P") | |
5855 (if (not (org-at-table-p)) | |
5856 (error "Not at a table")) | |
5857 (let ((line (buffer-substring-no-properties (point-at-bol) (point-at-eol)))) | |
5858 (if (string-match "^[ \t]*|-" line) | |
5859 (setq line (mapcar (lambda (x) (if (member x '(?| ?+)) ?| ?\ )) line)) | |
5860 (setq line (mapcar (lambda (x) (if (equal x ?|) ?| ?\ )) line))) | |
5861 (beginning-of-line (if arg 2 1)) | |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5862 (let (org-table-may-need-update) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5863 (apply 'insert-before-markers line) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5864 (insert-before-markers "\n")) |
58792 | 5865 (beginning-of-line 0) |
5866 (re-search-forward "| ?" (point-at-eol) t) | |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
5867 (and org-table-may-need-update (org-table-align)))) |
58792 | 5868 |
5869 (defun org-table-insert-hline (&optional arg) | |
5870 "Insert a horizontal-line below the current line into the table. | |
5871 With prefix ARG, insert above the current line." | |
5872 (interactive "P") | |
5873 (if (not (org-at-table-p)) | |
5874 (error "Not at a table")) | |
5875 (let ((line (buffer-substring-no-properties (point-at-bol) (point-at-eol))) | |
5876 (col (current-column)) | |
5877 start) | |
5878 (if (string-match "^[ \t]*|-" line) | |
5879 (setq line | |
5880 (mapcar (lambda (x) (if (member x '(?| ?+)) | |
5881 (prog1 (if start ?+ ?|) (setq start t)) | |
5882 (if start ?- ?\ ))) | |
5883 line)) | |
5884 (setq line | |
5885 (mapcar (lambda (x) (if (equal x ?|) | |
5886 (prog1 (if start ?+ ?|) (setq start t)) | |
5887 (if start ?- ?\ ))) | |
5888 line))) | |
5889 (beginning-of-line (if arg 1 2)) | |
5890 (apply 'insert line) | |
5891 (if (equal (char-before (point)) ?+) | |
5892 (progn (backward-delete-char 1) (insert "|"))) | |
5893 (insert "\n") | |
5894 (beginning-of-line 0) | |
5895 (move-to-column col))) | |
5896 | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
5897 (defun org-table-kill-row () |
58792 | 5898 "Delete the current row or horizontal line from the table." |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
5899 (interactive) |
58792 | 5900 (if (not (org-at-table-p)) |
5901 (error "Not at a table")) | |
5902 (let ((col (current-column))) | |
5903 (kill-region (point-at-bol) (min (1+ (point-at-eol)) (point-max))) | |
5904 (if (not (org-at-table-p)) (beginning-of-line 0)) | |
5905 (move-to-column col))) | |
5906 | |
5907 | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
5908 (defun org-table-cut-region () |
58792 | 5909 "Copy region in table to the clipboard and blank all relevant fields." |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
5910 (interactive) |
58792 | 5911 (org-table-copy-region 'cut)) |
5912 | |
5913 (defun org-table-copy-region (&optional cut) | |
5914 "Copy rectangular region in table to clipboard. | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
5915 A special clipboard is used which can only be accessed |
58792 | 5916 with `org-table-paste-rectangle'" |
5917 (interactive "P") | |
5918 (unless (org-region-active-p) (error "No active region")) | |
5919 (let* ((beg (region-beginning)) | |
5920 (end (region-end)) | |
5921 l01 c01 l02 c02 l1 c1 l2 c2 ic1 ic2 | |
5922 region cols | |
5923 (rpl (if cut " " nil))) | |
5924 (goto-char beg) | |
5925 (org-table-check-inside-data-field) | |
5926 (setq l01 (count-lines (point-min) (point)) | |
5927 c01 (org-table-current-column)) | |
5928 (goto-char end) | |
5929 (org-table-check-inside-data-field) | |
5930 (setq l02 (count-lines (point-min) (point)) | |
5931 c02 (org-table-current-column)) | |
5932 (setq l1 (min l01 l02) l2 (max l01 l02) | |
5933 c1 (min c01 c02) c2 (max c01 c02)) | |
5934 (catch 'exit | |
5935 (while t | |
5936 (catch 'nextline | |
5937 (if (> l1 l2) (throw 'exit t)) | |
5938 (goto-line l1) | |
5939 (if (org-at-table-hline-p) (throw 'nextline (setq l1 (1+ l1)))) | |
5940 (setq cols nil ic1 c1 ic2 c2) | |
5941 (while (< ic1 (1+ ic2)) | |
5942 (push (org-table-get-field ic1 rpl) cols) | |
5943 (setq ic1 (1+ ic1))) | |
5944 (push (nreverse cols) region) | |
5945 (setq l1 (1+ l1))))) | |
5946 (setq org-table-clip (nreverse region)) | |
5947 (if cut (org-table-align)))) | |
5948 | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
5949 (defun org-table-paste-rectangle () |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
5950 "Paste a rectangular region into a table. |
58792 | 5951 The upper right corner ends up in the current field. All involved fields |
5952 will be overwritten. If the rectangle does not fit into the present table, | |
5953 the table is enlarged as needed. The process ignores horizontal separator | |
5954 lines." | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
5955 (interactive) |
58792 | 5956 (unless (and org-table-clip (listp org-table-clip)) |
5957 (error "First cut/copy a region to paste!")) | |
5958 (org-table-check-inside-data-field) | |
5959 (let* ((clip org-table-clip) | |
5960 (line (count-lines (point-min) (point))) | |
5961 (col (org-table-current-column)) | |
5962 (org-enable-table-editor t) | |
5963 (org-table-automatic-realign nil) | |
5964 c cols field) | |
5965 (while (setq cols (pop clip)) | |
5966 (while (org-at-table-hline-p) (beginning-of-line 2)) | |
5967 (if (not (org-at-table-p)) | |
5968 (progn (end-of-line 0) (org-table-next-field))) | |
5969 (setq c col) | |
5970 (while (setq field (pop cols)) | |
5971 (org-table-goto-column c nil 'force) | |
5972 (org-table-get-field nil field) | |
5973 (setq c (1+ c))) | |
5974 (beginning-of-line 2)) | |
5975 (goto-line line) | |
5976 (org-table-goto-column col) | |
5977 (org-table-align))) | |
5978 | |
5979 (defun org-table-convert () | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
5980 "Convert from `org-mode' table to table.el and back. |
58792 | 5981 Obviously, this only works within limits. When an Org-mode table is |
5982 converted to table.el, all horizontal separator lines get lost, because | |
5983 table.el uses these as cell boundaries and has no notion of horizontal lines. | |
5984 A table.el table can be converted to an Org-mode table only if it does not | |
5985 do row or column spanning. Multiline cells will become multiple cells. | |
5986 Beware, Org-mode does not test if the table can be successfully converted - it | |
5987 blindly applies a recipe that works for simple tables." | |
5988 (interactive) | |
5989 (require 'table) | |
5990 (if (org-at-table.el-p) | |
5991 ;; convert to Org-mode table | |
5992 (let ((beg (move-marker (make-marker) (org-table-begin t))) | |
5993 (end (move-marker (make-marker) (org-table-end t)))) | |
5994 (table-unrecognize-region beg end) | |
5995 (goto-char beg) | |
5996 (while (re-search-forward "^\\([ \t]*\\)\\+-.*\n" end t) | |
5997 (replace-match "")) | |
5998 (goto-char beg)) | |
5999 (if (org-at-table-p) | |
6000 ;; convert to table.el table | |
6001 (let ((beg (move-marker (make-marker) (org-table-begin))) | |
6002 (end (move-marker (make-marker) (org-table-end)))) | |
6003 ;; first, get rid of all horizontal lines | |
6004 (goto-char beg) | |
6005 (while (re-search-forward "^\\([ \t]*\\)|-.*\n" end t) | |
6006 (replace-match "")) | |
6007 ;; insert a hline before first | |
6008 (goto-char beg) | |
6009 (org-table-insert-hline 'above) | |
6010 ;; insert a hline after each line | |
6011 (while (progn (beginning-of-line 2) (< (point) end)) | |
6012 (org-table-insert-hline)) | |
6013 (goto-char beg) | |
6014 (setq end (move-marker end (org-table-end))) | |
6015 ;; replace "+" at beginning and ending of hlines | |
6016 (while (re-search-forward "^\\([ \t]*\\)|-" end t) | |
6017 (replace-match "\\1+-")) | |
6018 (goto-char beg) | |
6019 (while (re-search-forward "-|[ \t]*$" end t) | |
6020 (replace-match "-+")) | |
6021 (goto-char beg))))) | |
6022 | |
6023 (defun org-table-wrap-region (arg) | |
6024 "Wrap several fields in a column like a paragraph. | |
6025 This is useful if you'd like to spread the contents of a field over several | |
6026 lines, in order to keep the table compact. | |
6027 | |
6028 If there is an active region, and both point and mark are in the same column, | |
6029 the text in the column is wrapped to minimum width for the given number of | |
6030 lines. Generally, this makes the table more compact. A prefix ARG may be | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
6031 used to change the number of desired lines. For example, `C-2 \\[org-table-wrap]' |
58792 | 6032 formats the selected text to two lines. If the region was longer than 2 |
6033 lines, the remaining lines remain empty. A negative prefix argument reduces | |
6034 the current number of lines by that amount. The wrapped text is pasted back | |
6035 into the table. If you formatted it to more lines than it was before, fields | |
6036 further down in the table get overwritten - so you might need to make space in | |
6037 the table first. | |
6038 | |
6039 If there is no region, the current field is split at the cursor position and | |
6040 the text fragment to the right of the cursor is prepended to the field one | |
6041 line down. | |
6042 | |
6043 If there is no region, but you specify a prefix ARG, the current field gets | |
6044 blank, and the content is appended to the field above." | |
6045 (interactive "P") | |
6046 (org-table-check-inside-data-field) | |
6047 (if (org-region-active-p) | |
6048 ;; There is a region: fill as a paragraph | |
6049 (let ((beg (region-beginning)) | |
6050 nlines) | |
6051 (org-table-cut-region) | |
6052 (if (> (length (car org-table-clip)) 1) | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
6053 (error "Region must be limited to single column")) |
58792 | 6054 (setq nlines (if arg |
6055 (if (< arg 1) | |
6056 (+ (length org-table-clip) arg) | |
6057 arg) | |
6058 (length org-table-clip))) | |
6059 (setq org-table-clip | |
6060 (mapcar 'list (org-wrap (mapconcat 'car org-table-clip " ") | |
6061 nil nlines))) | |
6062 (goto-char beg) | |
6063 (org-table-paste-rectangle)) | |
6064 ;; No region, split the current field at point | |
6065 (if arg | |
6066 ;; combine with field above | |
6067 (let ((s (org-table-blank-field)) | |
6068 (col (org-table-current-column))) | |
6069 (beginning-of-line 0) | |
6070 (while (org-at-table-hline-p) (beginning-of-line 0)) | |
6071 (org-table-goto-column col) | |
6072 (skip-chars-forward "^|") | |
6073 (skip-chars-backward " ") | |
6074 (insert " " (org-trim s)) | |
6075 (org-table-align)) | |
6076 ;; split field | |
6077 (when (looking-at "\\([^|]+\\)+|") | |
6078 (let ((s (match-string 1))) | |
6079 (replace-match " |") | |
6080 (goto-char (match-beginning 0)) | |
6081 (org-table-next-row) | |
6082 (insert (org-trim s) " ") | |
6083 (org-table-align)))))) | |
6084 | |
6085 (defun org-trim (s) | |
6086 "Remove whitespace at beginning and end of string." | |
6087 (if (string-match "^[ \t]+" s) (setq s (replace-match "" t t s))) | |
6088 (if (string-match "[ \t]+$" s) (setq s (replace-match "" t t s)))) | |
6089 | |
6090 (defun org-wrap (string &optional width lines) | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
6091 "Wrap string to either a number of lines, or a width in characters. |
58792 | 6092 If WIDTH is non-nil, the string is wrapped to that width, however many lines |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
6093 that costs. If there is a word longer than WIDTH, the text is actually |
58792 | 6094 wrapped to the length of that word. |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
6095 IF WIDTH is nil and LINES is non-nil, the string is forced into at most that |
58792 | 6096 many lines, whatever width that takes. |
6097 The return value is a list of lines, without newlines at the end." | |
6098 (let* ((words (org-split-string string "[ \t\n]+")) | |
6099 (maxword (apply 'max (mapcar 'length words))) | |
6100 w ll) | |
6101 (cond (width | |
6102 (org-do-wrap words (max maxword width))) | |
6103 (lines | |
6104 (setq w maxword) | |
6105 (setq ll (org-do-wrap words maxword)) | |
6106 (if (<= (length ll) lines) | |
6107 ll | |
6108 (setq ll words) | |
6109 (while (> (length ll) lines) | |
6110 (setq w (1+ w)) | |
6111 (setq ll (org-do-wrap words w))) | |
6112 ll)) | |
6113 (t (error "Cannot wrap this"))))) | |
6114 | |
6115 | |
6116 (defun org-do-wrap (words width) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
6117 "Create lines of maximum width WIDTH (in characters) from word list WORDS." |
58792 | 6118 (let (lines line) |
6119 (while words | |
6120 (setq line (pop words)) | |
6121 (while (and words (< (+ (length line) (length (car words))) width)) | |
6122 (setq line (concat line " " (pop words)))) | |
6123 (setq lines (push line lines))) | |
6124 (nreverse lines))) | |
6125 | |
6126 ;; FIXME: I think I can make this more efficient | |
6127 (defun org-split-string (string &optional separators) | |
6128 "Splits STRING into substrings at SEPARATORS. | |
6129 No empty strings are returned if there are matches at the beginning | |
6130 and end of string." | |
6131 (let ((rexp (or separators "[ \f\t\n\r\v]+")) | |
6132 (start 0) | |
6133 notfirst | |
6134 (list nil)) | |
6135 (while (and (string-match rexp string | |
6136 (if (and notfirst | |
6137 (= start (match-beginning 0)) | |
6138 (< start (length string))) | |
6139 (1+ start) start)) | |
6140 (< (match-beginning 0) (length string))) | |
6141 (setq notfirst t) | |
6142 (or (eq (match-beginning 0) 0) | |
6143 (and (eq (match-beginning 0) (match-end 0)) | |
6144 (eq (match-beginning 0) start)) | |
6145 (setq list | |
6146 (cons (substring string start (match-beginning 0)) | |
6147 list))) | |
6148 (setq start (match-end 0))) | |
6149 (or (eq start (length string)) | |
6150 (setq list | |
6151 (cons (substring string start) | |
6152 list))) | |
6153 (nreverse list))) | |
6154 | |
6155 (defun org-table-add-invisible-to-vertical-lines () | |
6156 "Add an `invisible' property to vertical lines of current table." | |
6157 (interactive) | |
6158 (let* ((beg (org-table-begin)) | |
6159 (end (org-table-end)) | |
6160 (end1)) | |
6161 (save-excursion | |
6162 (goto-char beg) | |
6163 (while (< (point) end) | |
6164 (setq end1 (point-at-eol)) | |
6165 (if (looking-at org-table-dataline-regexp) | |
6166 (while (re-search-forward "|" end1 t) | |
6167 (add-text-properties (1- (point)) (point) | |
6168 '(invisible org-table))) | |
6169 (while (re-search-forward "[+|]" end1 t) | |
6170 (add-text-properties (1- (point)) (point) | |
6171 '(invisible org-table)))) | |
6172 (beginning-of-line 2))))) | |
6173 | |
6174 (defun org-table-toggle-vline-visibility (&optional arg) | |
6175 "Toggle the visibility of table vertical lines. | |
6176 The effect is immediate and on all tables in the file. | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
6177 With prefix ARG, make lines invisible when ARG is positive, make lines |
58792 | 6178 visible when ARG is not positive" |
6179 (interactive "P") | |
6180 (let ((action (cond | |
6181 ((and arg (> (prefix-numeric-value arg) 0)) 'on) | |
6182 ((and arg (< (prefix-numeric-value arg) 1)) 'off) | |
6183 (t (if (org-in-invisibility-spec-p '(org-table)) | |
6184 'off | |
6185 'on))))) | |
6186 (if (eq action 'off) | |
6187 (progn | |
6188 (org-remove-from-invisibility-spec '(org-table)) | |
6189 (org-table-map-tables 'org-table-align) | |
6190 (message "Vertical table lines visible") | |
6191 (if (org-at-table-p) | |
6192 (org-table-align))) | |
6193 (org-add-to-invisibility-spec '(org-table)) | |
6194 (org-table-map-tables 'org-table-align) | |
6195 (message "Vertical table lines invisible")) | |
6196 (redraw-frame (selected-frame)))) | |
6197 | |
6198 (defun org-table-map-tables (function) | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
6199 "Apply FUNCTION to the start of all tables in the buffer." |
58792 | 6200 (save-excursion |
6201 (save-restriction | |
6202 (widen) | |
6203 (goto-char (point-min)) | |
6204 (while (re-search-forward org-table-any-line-regexp nil t) | |
6205 (message "Mapping tables: %d%%" (/ (* 100.0 (point)) (buffer-size))) | |
6206 (beginning-of-line 1) | |
6207 (if (looking-at org-table-line-regexp) | |
6208 (save-excursion (funcall function))) | |
6209 (re-search-forward org-table-any-border-regexp nil 1))))) | |
6210 | |
6211 (defun org-table-sum () | |
6212 "Sum numbers in region of current table column. | |
6213 The result will be displayed in the echo area, and will be available | |
6214 as kill to be inserted with \\[yank]. | |
6215 | |
6216 If there is an active region, it is interpreted as a rectangle and all | |
6217 numbers in that rectangle will be summed. If there is no active | |
6218 region and point is located in a table column, sum all numbers in that | |
6219 column. | |
6220 | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
6221 If at least one number looks like a time HH:MM or HH:MM:SS, all other |
58792 | 6222 numbers are assumed to be times as well (in decimal hours) and the |
6223 numbers are added as such." | |
6224 (interactive) | |
6225 (save-excursion | |
6226 (let (beg end col (timecnt 0) diff h m s) | |
6227 (if (org-region-active-p) | |
6228 (setq beg (region-beginning) end (region-end)) | |
6229 (setq col (org-table-current-column)) | |
6230 (goto-char (org-table-begin)) | |
6231 (unless (re-search-forward "^[ \t]*|[^-]" nil t) | |
6232 (error "No table data")) | |
6233 (org-table-goto-column col) | |
6234 (skip-chars-backward "^|") | |
6235 (setq beg (point)) | |
6236 (goto-char (org-table-end)) | |
6237 (unless (re-search-backward "^[ \t]*|[^-]" nil t) | |
6238 (error "No table data")) | |
6239 (org-table-goto-column col) | |
6240 (skip-chars-forward "^|") | |
6241 (setq end (point))) | |
6242 (let* ((l1 (progn (goto-char beg) | |
6243 (+ (if (bolp) 1 0) (count-lines (point-min) (point))))) | |
6244 (l2 (progn (goto-char end) | |
6245 (+ (if (bolp) 1 0) (count-lines (point-min) (point))))) | |
6246 (items (if (= l1 l2) | |
6247 (split-string (buffer-substring beg end)) | |
6248 (split-string | |
6249 (mapconcat 'identity (extract-rectangle beg end) " ")))) | |
6250 (numbers (delq nil (mapcar 'org-table-get-number-for-summing | |
6251 items))) | |
6252 (res (apply '+ numbers)) | |
6253 (sres (if (= timecnt 0) | |
6254 (format "%g" res) | |
6255 (setq diff (* 3600 res) | |
6256 h (floor (/ diff 3600)) diff (mod diff 3600) | |
6257 m (floor (/ diff 60)) diff (mod diff 60) | |
6258 s diff) | |
6259 (format "%d:%02d:%02d" h m s)))) | |
6260 (kill-new sres) | |
6261 (message (substitute-command-keys | |
6262 (format "Sum of %d items: %-20s (\\[yank] will insert result into buffer)" | |
6263 (length numbers) sres))))))) | |
6264 | |
6265 (defun org-table-get-number-for-summing (s) | |
6266 (let (n) | |
6267 (if (string-match "^ *|? *" s) | |
6268 (setq s (replace-match "" nil nil s))) | |
6269 (if (string-match " *|? *$" s) | |
6270 (setq s (replace-match "" nil nil s))) | |
6271 (setq n (string-to-number s)) | |
6272 (cond | |
6273 ((and (string-match "0" s) | |
6274 (string-match "\\`[-+ \t0.edED]+\\'" s)) 0) | |
6275 ((string-match "\\`[ \t]+\\'" s) nil) | |
6276 ((string-match "\\`\\([0-9]+\\):\\([0-9]+\\)\\(:\\([0-9]+\\)\\)?\\'" s) | |
6277 (let ((h (string-to-number (or (match-string 1 s) "0"))) | |
6278 (m (string-to-number (or (match-string 2 s) "0"))) | |
6279 (s (string-to-number (or (match-string 4 s) "0")))) | |
6280 (if (boundp 'timecnt) (setq timecnt (1+ timecnt))) | |
6281 (* 1.0 (+ h (/ m 60.0) (/ s 3600.0))))) | |
6282 ((equal n 0) nil) | |
6283 (t n)))) | |
6284 | |
6285 (defvar org-table-current-formula nil) | |
6286 (defvar org-table-formula-history nil) | |
6287 (defun org-table-get-formula (current) | |
6288 (if (and current (not (equal "" org-table-current-formula))) | |
6289 org-table-current-formula | |
6290 (setq org-table-current-formula | |
6291 (read-string | |
6292 "Formula [last]: " "" 'org-table-formula-history | |
6293 org-table-current-formula)))) | |
6294 | |
6295 (defun org-this-word () | |
6296 ;; Get the current word | |
6297 (save-excursion | |
6298 (let ((beg (progn (skip-chars-backward "^ \t\n") (point))) | |
6299 (end (progn (skip-chars-forward "^ \t\n") (point)))) | |
6300 (buffer-substring-no-properties beg end)))) | |
6301 | |
6302 (defun org-table-eval-formula (&optional ndown) | |
6303 "Replace the table field value at the cursor by the result of a calculation. | |
6304 | |
6305 This function makes use of Dave Gillespie's calc package, arguably the most | |
6306 exciting program ever written for GNU Emacs. So you need to have calc | |
6307 installed in order to use this function. | |
6308 | |
6309 In a table, this command replaces the value in the current field with the | |
6310 result of a formula. While nowhere near the computation options of a | |
6311 spreadsheet program, this is still very useful. Note that there is no | |
6312 automatic updating of a calculated field, nor will the field remember the | |
6313 formula. The command needs to be applied again after changing input | |
6314 fields. | |
6315 | |
6316 When called, the command first prompts for a formula, which is read in the | |
6317 minibuffer. Previously entered formulae are available through the history | |
6318 list, and the last used formula is the default, reachable by simply | |
6319 pressing RET. | |
6320 | |
6321 The formula can be any algebraic expression understood by the calc package. | |
6322 Before evaluation, variable substitution takes place: \"$\" is replaced by | |
6323 the field the cursor is currently in, and $1..$n reference the fields in | |
6324 the current row. Values from a *different* row can *not* be referenced | |
6325 here, so the command supports only horizontal computing. The formula can | |
6326 contain an optional printf format specifier after a semicolon, to reformat | |
6327 the result. | |
6328 | |
6329 A few examples for formulae: | |
6330 $1+$2 Sum of first and second field | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
6331 $1+$2;%.2f Same, and format result to two digits after dec.point |
58792 | 6332 exp($2)+exp($1) Math functions can be used |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
6333 $;%.1f Reformat current cell to 1 digit after dec.point |
58792 | 6334 ($3-32)*5/9 degrees F -> C conversion |
6335 | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
6336 When called with a raw \\[universal-argument] prefix, the formula is applied to the current |
58792 | 6337 field, and to the same same column in all following rows, until reaching a |
6338 horizontal line or the end of the table. When the command is called with a | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
6339 numeric prefix argument (like M-3 or C-7 or \\[universal-argument] 24), the formula is applied |
58792 | 6340 to the current row, and to the following n-1 rows (but not beyond a |
6341 separator line)." | |
6342 (interactive "P") | |
6343 (setq ndown (if (equal ndown '(4)) 10000 (prefix-numeric-value ndown))) | |
6344 (require 'calc) | |
6345 (org-table-check-inside-data-field) | |
6346 (let* (fields | |
6347 (org-table-automatic-realign nil) | |
6348 (down (> ndown 1)) | |
6349 (formula (org-table-get-formula nil)) | |
6350 (n0 (org-table-current-column)) | |
6351 n form fmt x ev) | |
6352 (if (string-match ";" formula) | |
6353 (let ((tmp (org-split-string formula ";"))) | |
6354 (setq formula (car tmp) fmt (nth 1 tmp)))) | |
6355 (while (> ndown 0) | |
6356 (setq fields (org-split-string | |
6357 (concat " " (buffer-substring | |
6358 (point-at-bol) (point-at-eol))) "|")) | |
6359 (setq ndown (1- ndown)) | |
6360 (setq form (copy-sequence formula)) | |
6361 (while (string-match "\\$\\([0-9]+\\)?" form) | |
6362 (setq n (if (match-beginning 1) | |
6363 (string-to-int (match-string 1 form)) | |
6364 n0) | |
6365 x (nth n fields)) | |
60918
58a53f588384
* textmodes/refbib.el, textmodes/refer.el, textmodes/reftex-cite.el,
Werner LEMBERG <wl@gnu.org>
parents:
59596
diff
changeset
|
6366 (unless x (error "Invalid field specifier \"%s\"" |
58792 | 6367 (match-string 0 form))) |
6368 (if (equal (string-to-number x) 0) (setq x "0")) | |
6369 (setq form (replace-match x t t form))) | |
6370 (setq ev (calc-eval (list form) 'num)) | |
6371 (if (listp ev) | |
60918
58a53f588384
* textmodes/refbib.el, textmodes/refer.el, textmodes/reftex-cite.el,
Werner LEMBERG <wl@gnu.org>
parents:
59596
diff
changeset
|
6372 (error "Invalid expression: %s (%s at %d)" form (nth 1 ev) (car ev))) |
58792 | 6373 (org-table-blank-field) |
6374 (if fmt | |
6375 (insert (format fmt (string-to-number ev))) | |
6376 (insert ev)) | |
6377 (if (and down (> ndown 0) (looking-at ".*\n[ \t]*|[^-]")) | |
6378 (call-interactively 'org-return) | |
6379 (setq ndown 0))) | |
6380 (org-table-align))) | |
6381 | |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6382 ;;; The orgtbl minor mode |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6383 |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6384 ;; Define a minor mode which can be used in other modes in order to |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6385 ;; integrate the org-mode table editor. |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6386 |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6387 ;; This is really a hack, because the org-mode table editor uses several |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6388 ;; keys which normally belong to the major mode, for example the TAB and |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6389 ;; RET keys. Here is how it works: The minor mode defines all the keys |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6390 ;; necessary to operate the table editor, but wraps the commands into a |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6391 ;; function which tests if the cursor is currently inside a table. If that |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6392 ;; is the case, the table editor command is executed. However, when any of |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6393 ;; those keys is used outside a table, the function uses `key-binding' to |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6394 ;; look up if the key has an associated command in another currently active |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6395 ;; keymap (minor modes, major mode, global), and executes that command. |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6396 ;; There might be problems if any of the keys used by the table editor is |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6397 ;; otherwise used as a prefix key. |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6398 |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6399 ;; Another challenge is that the key binding for TAB can be tab or \C-i, |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6400 ;; likewise the binding for RET can be return or \C-m. Orgtbl-mode |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6401 ;; addresses this by checking explicitly for both bindings. |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6402 |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6403 ;; The optimized version (see variable `orgtbl-optimized') takes over |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6404 ;; all keys which are bound to `self-insert-command' in the *global map*. |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6405 ;; Some modes bind other commands to simple characters, for example |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6406 ;; AUCTeX binds the double quote to `Tex-insert-quote'. With orgtbl-mode |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6407 ;; active, this binding is ignored inside tables and replaced with a |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6408 ;; modified self-insert. |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6409 |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6410 (defcustom orgtbl-optimized (eq org-enable-table-editor 'optimized) |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
6411 "Non-nil means, use the optimized table editor version for `orgtbl-mode'. |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6412 In the optimized version, the table editor takes over all simple keys that |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6413 normally just insert a character. In tables, the characters are inserted |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6414 in a way to minimize disturbing the table structure (i.e. in overwrite mode |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6415 for empty fields). Outside tables, the correct binding of the keys is |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6416 restored. |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6417 |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6418 The default for this option is t if the optimized version is also used in |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6419 Org-mode. See the variable `org-enable-table-editor' for details. Changing |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6420 this variable requires a restart of Emacs to become effective." |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6421 :group 'org-table |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6422 :type 'boolean) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6423 |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6424 (defvar orgtbl-mode nil |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
6425 "Variable controlling `orgtbl-mode', a minor mode enabling the `org-mode' |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
6426 table editor in arbitrary modes.") |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6427 (make-variable-buffer-local 'orgtbl-mode) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6428 |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6429 (defvar orgtbl-mode-map (make-sparse-keymap) |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
6430 "Keymap for `orgtbl-mode'.") |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6431 |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6432 ;;;###autoload |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6433 (defun turn-on-orgtbl () |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
6434 "Unconditionally turn on `orgtbl-mode'." |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6435 (orgtbl-mode 1)) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6436 |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6437 ;;;###autoload |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6438 (defun orgtbl-mode (&optional arg) |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
6439 "The `org-mode' table editor as a minor mode for use in other modes." |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6440 (interactive) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6441 (setq orgtbl-mode |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6442 (if arg (> (prefix-numeric-value arg) 0) (not orgtbl-mode))) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6443 (if orgtbl-mode |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6444 (progn |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6445 (set (make-local-variable (quote org-table-may-need-update)) t) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6446 (make-local-hook (quote before-change-functions)) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6447 (add-hook 'before-change-functions 'org-before-change-function |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6448 nil 'local) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6449 (set (make-local-variable 'org-old-auto-fill-inhibit-regexp) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6450 auto-fill-inhibit-regexp) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6451 (set (make-local-variable 'auto-fill-inhibit-regexp) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6452 (if auto-fill-inhibit-regexp |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6453 (concat "\\([ \t]*|\\|" auto-fill-inhibit-regexp) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6454 "[ \t]*|")) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6455 (easy-menu-add orgtbl-mode-menu) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6456 (run-hooks (quote orgtbl-mode-hook))) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6457 (setq auto-fill-inhibit-regexp org-old-auto-fill-inhibit-regexp) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6458 (remove-hook 'before-change-functions 'org-before-change-function t) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6459 (easy-menu-remove orgtbl-mode-menu) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6460 (force-mode-line-update 'all))) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6461 |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6462 ;; Install it as a minor mode. |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6463 (put 'orgtbl-mode :included t) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6464 (put 'orgtbl-mode :menu-tag "Org Table Mode") |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6465 (add-minor-mode 'orgtbl-mode " OrgTbl" orgtbl-mode-map) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6466 |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6467 (defun orgtbl-make-binding (fun &rest keys) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6468 "Create a function for binding in the table minor mode." |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6469 (list 'lambda '(arg) '(interactive "p") |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6470 (list 'if |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6471 '(org-at-table-p) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6472 (list 'call-interactively (list 'quote fun)) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6473 (list 'let '(orgtbl-mode) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6474 (list 'call-interactively |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6475 (append '(or) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6476 (mapcar (lambda (k) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6477 (list 'key-binding k)) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6478 keys) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6479 '('orgtbl-error))))))) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6480 |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6481 (defun orgtbl-error () |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6482 "Error when there is no default binding for a table key." |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6483 (interactive) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6484 (error "This key is has no function outside tables")) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6485 |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6486 ;; Keybindings for the minor mode |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6487 (let ((bindings |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6488 '(([(meta shift left)] org-table-delete-column) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6489 ([(meta left)] org-table-move-column-left) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6490 ([(meta right)] org-table-move-column-right) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6491 ([(meta shift right)] org-table-insert-column) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6492 ([(meta shift up)] org-table-kill-row) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6493 ([(meta shift down)] org-table-insert-row) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6494 ([(meta up)] org-table-move-row-up) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6495 ([(meta down)] org-table-move-row-down) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6496 ("\C-c\C-w" org-table-cut-region) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6497 ("\C-c\M-w" org-table-copy-region) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6498 ("\C-c\C-y" org-table-paste-rectangle) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6499 ("\C-c-" org-table-insert-hline) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6500 ([(shift tab)] org-table-previous-field) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6501 ("\C-c\C-c" org-table-align) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6502 ([(return)] org-table-next-row) |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
6503 ([(shift return)] org-table-copy-down) |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6504 ([(meta return)] org-table-wrap-region) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6505 ("\C-c\C-q" org-table-wrap-region) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6506 ("\C-c?" org-table-current-column) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6507 ("\C-c " org-table-blank-field) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6508 ("\C-c+" org-table-sum) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6509 ("\C-c|" org-table-toggle-vline-visibility) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6510 ("\C-c=" org-table-eval-formula))) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6511 elt key fun cmd) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6512 (while (setq elt (pop bindings)) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6513 (setq key (car elt) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6514 fun (nth 1 elt) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6515 cmd (orgtbl-make-binding fun key)) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6516 (define-key orgtbl-mode-map key cmd))) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6517 |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6518 ;; Special treatment needed for TAB and RET |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6519 ;(define-key orgtbl-mode-map [(return)] |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6520 ; (orgtbl-make-binding 'org-table-next-row [(return)] "\C-m")) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6521 ;(define-key orgtbl-mode-map "\C-m" |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6522 ; (orgtbl-make-binding 'org-table-next-row "\C-m" [(return)])) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6523 ;(define-key orgtbl-mode-map [(tab)] |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6524 ; (orgtbl-make-binding 'org-table-next-field [(tab)] "\C-i")) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6525 ;(define-key orgtbl-mode-map "\C-i" |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6526 ; (orgtbl-make-binding 'org-table-next-field "\C-i" [(tab)])) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6527 |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6528 (define-key orgtbl-mode-map [(return)] |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6529 (orgtbl-make-binding 'orgtbl-ret [(return)] "\C-m")) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6530 (define-key orgtbl-mode-map "\C-m" |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6531 (orgtbl-make-binding 'orgtbl-ret "\C-m" [(return)])) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6532 (define-key orgtbl-mode-map [(tab)] |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6533 (orgtbl-make-binding 'orgtbl-tab [(tab)] "\C-i")) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6534 (define-key orgtbl-mode-map "\C-i" |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6535 (orgtbl-make-binding 'orgtbl-tab "\C-i" [(tab)])) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6536 |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6537 (when orgtbl-optimized |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6538 ;; If the user wants maximum table support, we need to hijack |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6539 ;; some standard editing functions |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6540 (substitute-key-definition 'self-insert-command 'orgtbl-self-insert-command |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6541 orgtbl-mode-map global-map) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6542 (substitute-key-definition 'delete-char 'orgtbl-delete-char |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6543 orgtbl-mode-map global-map) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6544 (substitute-key-definition 'delete-backward-char 'orgtbl-delete-backward-char |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6545 orgtbl-mode-map global-map) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6546 (define-key org-mode-map "|" 'self-insert-command)) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6547 |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6548 (defun orgtbl-tab () |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
6549 "Justification and field motion for `orgtbl-mode'." |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6550 (interactive) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6551 (org-table-justify-field-maybe) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6552 (org-table-next-field)) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6553 |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6554 (defun orgtbl-ret () |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
6555 "Justification and field motion for `orgtbl-mode'." |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6556 (interactive) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6557 (org-table-justify-field-maybe) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6558 (org-table-next-row)) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6559 |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6560 (defun orgtbl-self-insert-command (N) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6561 "Like `self-insert-command', use overwrite-mode for whitespace in tables. |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6562 If the cursor is in a table looking at whitespace, the whitespace is |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6563 overwritten, and the table is not marked as requiring realignment." |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6564 (interactive "p") |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6565 (if (and (org-at-table-p) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6566 (eq N 1) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6567 (looking-at "[^|\n]* +|")) |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
6568 (let (org-table-may-need-update) |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6569 (goto-char (1- (match-end 0))) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6570 (delete-backward-char 1) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6571 (goto-char (match-beginning 0)) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6572 (self-insert-command N)) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6573 (setq org-table-may-need-update t) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6574 (let (orgtbl-mode) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6575 (call-interactively (key-binding (vector last-input-event)))))) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6576 |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6577 (defun orgtbl-delete-backward-char (N) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6578 "Like `delete-backward-char', insert whitespace at field end in tables. |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6579 When deleting backwards, in tables this function will insert whitespace in |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6580 front of the next \"|\" separator, to keep the table aligned. The table will |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6581 still be marked for re-alignment, because a narrow field may lead to a |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6582 reduced column width." |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6583 (interactive "p") |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6584 (if (and (org-at-table-p) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6585 (eq N 1) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6586 (looking-at ".*?|")) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6587 (let ((pos (point))) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6588 (backward-delete-char N) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6589 (skip-chars-forward "^|") |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6590 (insert " ") |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6591 (goto-char (1- pos))) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6592 (message "%s" last-input-event) (sit-for 1) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6593 (delete-backward-char N))) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6594 |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6595 (defun orgtbl-delete-char (N) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6596 "Like `delete-char', but insert whitespace at field end in tables. |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6597 When deleting characters, in tables this function will insert whitespace in |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6598 front of the next \"|\" separator, to keep the table aligned. The table |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6599 will still be marked for re-alignment, because a narrow field may lead to |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6600 a reduced column width." |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6601 (interactive "p") |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6602 (if (and (org-at-table-p) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6603 (eq N 1)) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6604 (if (looking-at ".*?|") |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6605 (let ((pos (point))) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6606 (replace-match (concat |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6607 (substring (match-string 0) 1 -1) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6608 " |")) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6609 (goto-char pos))) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6610 (delete-char N))) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6611 |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6612 (easy-menu-define orgtbl-mode-menu orgtbl-mode-map "OrgTbl menu" |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6613 '("Tbl" |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6614 ["Align" org-ctrl-c-ctrl-c :active (org-at-table-p) :keys "C-c C-c"] |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
6615 ["Next Field" org-cycle :active (org-at-table-p) :keys "TAB"] |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6616 ["Previous Field" org-shifttab :active (org-at-table-p) :keys "S-TAB"] |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
6617 ["Next Row" org-return :active (org-at-table-p) :keys "RET"] |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6618 "--" |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
6619 ["Blank Field" org-table-blank-field :active (org-at-table-p) :keys "C-c SPC"] |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
6620 ["Copy Field from Above" |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
6621 org-table-copy-down :active (org-at-table-p) :keys "S-RET"] |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6622 "--" |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6623 ("Column" |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
6624 ["Move Column Left" org-metaleft :active (org-at-table-p) :keys "M-<left>"] |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
6625 ["Move Column Right" org-metaright :active (org-at-table-p) :keys "M-<right>"] |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
6626 ["Delete Column" org-shiftmetaleft :active (org-at-table-p) :keys "M-S-<left>"] |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
6627 ["Insert Column" org-shiftmetaright :active (org-at-table-p) :keys "M-S-<right>"]) |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6628 ("Row" |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
6629 ["Move Row Up" org-metaup :active (org-at-table-p) :keys "M-<up>"] |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
6630 ["Move Row Down" org-metadown :active (org-at-table-p) :keys "M-<down>"] |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
6631 ["Delete Row" org-shiftmetaup :active (org-at-table-p) :keys "M-S-<up>"] |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
6632 ["Insert Row" org-shiftmetadown :active (org-at-table-p) :keys "M-S-<down>"] |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6633 "--" |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
6634 ["Insert Hline" org-table-insert-hline :active (org-at-table-p) :keys "C-c -"]) |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6635 ("Rectangle" |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
6636 ["Copy Rectangle" org-copy-special :active (org-at-table-p) :keys "C-c M-w"] |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
6637 ["Cut Rectangle" org-cut-special :active (org-at-table-p) :keys "C-c C-w"] |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
6638 ["Paste Rectangle" org-paste-special :active (org-at-table-p) :keys "C-c C-y"] |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
6639 ["Fill Rectangle" org-table-wrap-region :active (org-at-table-p) :keys "C-c C-q"]) |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6640 "--" |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
6641 ["Which Column?" org-table-current-column :active (org-at-table-p) :keys "C-c ?"] |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
6642 ["Sum Column/Rectangle" org-table-sum |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6643 :active (or (org-at-table-p) (org-region-active-p)) :keys "C-c +"] |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
6644 ["Eval Formula" org-table-eval-formula :active (org-at-table-p) :keys "C-c ="] |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6645 )) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
6646 |
58792 | 6647 ;;; Exporting |
6648 | |
6649 (defconst org-level-max 20) | |
6650 | |
6651 (defun org-export-find-first-heading-line (list) | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
6652 "Remove all lines from LIST which are before the first headline." |
58792 | 6653 (let ((orig-list list) |
6654 (re (concat "^" outline-regexp))) | |
6655 (while (and list | |
6656 (not (string-match re (car list)))) | |
6657 (pop list)) | |
6658 (or list orig-list))) | |
6659 | |
6660 (defun org-skip-comments (lines) | |
6661 "Skip lines starting with \"#\" and subtrees starting with COMMENT." | |
6662 (let ((re1 (concat "^\\(\\*+\\)[ \t]+" org-comment-string)) | |
6663 (re2 "^\\(\\*+\\)[ \t\n\r]") | |
6664 rtn line level) | |
6665 (while (setq line (pop lines)) | |
6666 (cond | |
6667 ((and (string-match re1 line) | |
6668 (setq level (- (match-end 1) (match-beginning 1)))) | |
6669 ;; Beginning of a COMMENT subtree. Skip it. | |
6670 (while (and (setq line (pop lines)) | |
6671 (or (not (string-match re2 line)) | |
6672 (> (- (match-end 1) (match-beginning 1)) level)))) | |
6673 (setq lines (cons line lines))) | |
6674 ((string-match "^#" line) | |
6675 ;; an ordinary comment line | |
6676 ) | |
6677 (t (setq rtn (cons line rtn))))) | |
6678 (nreverse rtn))) | |
6679 | |
6680 ;; ASCII | |
6681 | |
6682 (defconst org-ascii-underline '(?\$ ?\# ?^ ?\~ ?\= ?\-) | |
6683 "Characters for underlining headings in ASCII export.") | |
6684 | |
6685 (defconst org-html-entities | |
6686 '(("nbsp") | |
6687 ("iexcl") | |
6688 ("cent") | |
6689 ("pound") | |
6690 ("curren") | |
6691 ("yen") | |
6692 ("brvbar") | |
6693 ("sect") | |
6694 ("uml") | |
6695 ("copy") | |
6696 ("ordf") | |
6697 ("laquo") | |
6698 ("not") | |
6699 ("shy") | |
6700 ("reg") | |
6701 ("macr") | |
6702 ("deg") | |
6703 ("plusmn") | |
6704 ("sup2") | |
6705 ("sup3") | |
6706 ("acute") | |
6707 ("micro") | |
6708 ("para") | |
6709 ("middot") | |
6710 ("odot"."o") | |
6711 ("star"."*") | |
6712 ("cedil") | |
6713 ("sup1") | |
6714 ("ordm") | |
6715 ("raquo") | |
6716 ("frac14") | |
6717 ("frac12") | |
6718 ("frac34") | |
6719 ("iquest") | |
6720 ("Agrave") | |
6721 ("Aacute") | |
6722 ("Acirc") | |
6723 ("Atilde") | |
6724 ("Auml") | |
6725 ("Aring") ("AA"."Å") | |
6726 ("AElig") | |
6727 ("Ccedil") | |
6728 ("Egrave") | |
6729 ("Eacute") | |
6730 ("Ecirc") | |
6731 ("Euml") | |
6732 ("Igrave") | |
6733 ("Iacute") | |
6734 ("Icirc") | |
6735 ("Iuml") | |
6736 ("ETH") | |
6737 ("Ntilde") | |
6738 ("Ograve") | |
6739 ("Oacute") | |
6740 ("Ocirc") | |
6741 ("Otilde") | |
6742 ("Ouml") | |
6743 ("times") | |
6744 ("Oslash") | |
6745 ("Ugrave") | |
6746 ("Uacute") | |
6747 ("Ucirc") | |
6748 ("Uuml") | |
6749 ("Yacute") | |
6750 ("THORN") | |
6751 ("szlig") | |
6752 ("agrave") | |
6753 ("aacute") | |
6754 ("acirc") | |
6755 ("atilde") | |
6756 ("auml") | |
6757 ("aring") | |
6758 ("aelig") | |
6759 ("ccedil") | |
6760 ("egrave") | |
6761 ("eacute") | |
6762 ("ecirc") | |
6763 ("euml") | |
6764 ("igrave") | |
6765 ("iacute") | |
6766 ("icirc") | |
6767 ("iuml") | |
6768 ("eth") | |
6769 ("ntilde") | |
6770 ("ograve") | |
6771 ("oacute") | |
6772 ("ocirc") | |
6773 ("otilde") | |
6774 ("ouml") | |
6775 ("divide") | |
6776 ("oslash") | |
6777 ("ugrave") | |
6778 ("uacute") | |
6779 ("ucirc") | |
6780 ("uuml") | |
6781 ("yacute") | |
6782 ("thorn") | |
6783 ("yuml") | |
6784 ("fnof") | |
6785 ("Alpha") | |
6786 ("Beta") | |
6787 ("Gamma") | |
6788 ("Delta") | |
6789 ("Epsilon") | |
6790 ("Zeta") | |
6791 ("Eta") | |
6792 ("Theta") | |
6793 ("Iota") | |
6794 ("Kappa") | |
6795 ("Lambda") | |
6796 ("Mu") | |
6797 ("Nu") | |
6798 ("Xi") | |
6799 ("Omicron") | |
6800 ("Pi") | |
6801 ("Rho") | |
6802 ("Sigma") | |
6803 ("Tau") | |
6804 ("Upsilon") | |
6805 ("Phi") | |
6806 ("Chi") | |
6807 ("Psi") | |
6808 ("Omega") | |
6809 ("alpha") | |
6810 ("beta") | |
6811 ("gamma") | |
6812 ("delta") | |
6813 ("epsilon") | |
6814 ("varepsilon"."ε") | |
6815 ("zeta") | |
6816 ("eta") | |
6817 ("theta") | |
6818 ("iota") | |
6819 ("kappa") | |
6820 ("lambda") | |
6821 ("mu") | |
6822 ("nu") | |
6823 ("xi") | |
6824 ("omicron") | |
6825 ("pi") | |
6826 ("rho") | |
6827 ("sigmaf") ("varsigma"."ς") | |
6828 ("sigma") | |
6829 ("tau") | |
6830 ("upsilon") | |
6831 ("phi") | |
6832 ("chi") | |
6833 ("psi") | |
6834 ("omega") | |
6835 ("thetasym") ("vartheta"."ϑ") | |
6836 ("upsih") | |
6837 ("piv") | |
6838 ("bull") ("bullet"."•") | |
6839 ("hellip") ("dots"."…") | |
6840 ("prime") | |
6841 ("Prime") | |
6842 ("oline") | |
6843 ("frasl") | |
6844 ("weierp") | |
6845 ("image") | |
6846 ("real") | |
6847 ("trade") | |
6848 ("alefsym") | |
6849 ("larr") ("leftarrow"."←") ("gets"."←") | |
6850 ("uarr") ("uparrow"."↑") | |
6851 ("rarr") ("to"."→") ("rightarrow"."→") | |
6852 ("darr")("downarrow"."↓") | |
6853 ("harr") ("leftrightarrow"."↔") | |
6854 ("crarr") ("hookleftarrow"."↵") ; has round hook, not quite CR | |
6855 ("lArr") ("Leftarrow"."⇐") | |
6856 ("uArr") ("Uparrow"."⇑") | |
6857 ("rArr") ("Rightarrow"."⇒") | |
6858 ("dArr") ("Downarrow"."⇓") | |
6859 ("hArr") ("Leftrightarrow"."⇔") | |
6860 ("forall") | |
6861 ("part") ("partial"."∂") | |
6862 ("exist") ("exists"."∃") | |
6863 ("empty") ("emptyset"."∅") | |
6864 ("nabla") | |
6865 ("isin") ("in"."∈") | |
6866 ("notin") | |
6867 ("ni") | |
6868 ("prod") | |
6869 ("sum") | |
6870 ("minus") | |
6871 ("lowast") ("ast"."∗") | |
6872 ("radic") | |
6873 ("prop") ("proptp"."∝") | |
6874 ("infin") ("infty"."∞") | |
6875 ("ang") ("angle"."∠") | |
6876 ("and") ("vee"."∧") | |
6877 ("or") ("wedge"."∨") | |
6878 ("cap") | |
6879 ("cup") | |
6880 ("int") | |
6881 ("there4") | |
6882 ("sim") | |
6883 ("cong") ("simeq"."≅") | |
6884 ("asymp")("approx"."≈") | |
6885 ("ne") ("neq"."≠") | |
6886 ("equiv") | |
6887 ("le") | |
6888 ("ge") | |
6889 ("sub") ("subset"."⊂") | |
6890 ("sup") ("supset"."⊃") | |
6891 ("nsub") | |
6892 ("sube") | |
6893 ("supe") | |
6894 ("oplus") | |
6895 ("otimes") | |
6896 ("perp") | |
6897 ("sdot") ("cdot"."⋅") | |
6898 ("lceil") | |
6899 ("rceil") | |
6900 ("lfloor") | |
6901 ("rfloor") | |
6902 ("lang") | |
6903 ("rang") | |
6904 ("loz") ("Diamond"."◊") | |
6905 ("spades") ("spadesuit"."♠") | |
6906 ("clubs") ("clubsuit"."♣") | |
6907 ("hearts") ("diamondsuit"."♥") | |
6908 ("diams") ("diamondsuit"."♦") | |
6909 ("quot") | |
6910 ("amp") | |
6911 ("lt") | |
6912 ("gt") | |
6913 ("OElig") | |
6914 ("oelig") | |
6915 ("Scaron") | |
6916 ("scaron") | |
6917 ("Yuml") | |
6918 ("circ") | |
6919 ("tilde") | |
6920 ("ensp") | |
6921 ("emsp") | |
6922 ("thinsp") | |
6923 ("zwnj") | |
6924 ("zwj") | |
6925 ("lrm") | |
6926 ("rlm") | |
6927 ("ndash") | |
6928 ("mdash") | |
6929 ("lsquo") | |
6930 ("rsquo") | |
6931 ("sbquo") | |
6932 ("ldquo") | |
6933 ("rdquo") | |
6934 ("bdquo") | |
6935 ("dagger") | |
6936 ("Dagger") | |
6937 ("permil") | |
6938 ("lsaquo") | |
6939 ("rsaquo") | |
6940 ("euro") | |
6941 | |
6942 ("arccos"."arccos") | |
6943 ("arcsin"."arcsin") | |
6944 ("arctan"."arctan") | |
6945 ("arg"."arg") | |
6946 ("cos"."cos") | |
6947 ("cosh"."cosh") | |
6948 ("cot"."cot") | |
6949 ("coth"."coth") | |
6950 ("csc"."csc") | |
6951 ("deg"."deg") | |
6952 ("det"."det") | |
6953 ("dim"."dim") | |
6954 ("exp"."exp") | |
6955 ("gcd"."gcd") | |
6956 ("hom"."hom") | |
6957 ("inf"."inf") | |
6958 ("ker"."ker") | |
6959 ("lg"."lg") | |
6960 ("lim"."lim") | |
6961 ("liminf"."liminf") | |
6962 ("limsup"."limsup") | |
6963 ("ln"."ln") | |
6964 ("log"."log") | |
6965 ("max"."max") | |
6966 ("min"."min") | |
6967 ("Pr"."Pr") | |
6968 ("sec"."sec") | |
6969 ("sin"."sin") | |
6970 ("sinh"."sinh") | |
6971 ("sup"."sup") | |
6972 ("tan"."tan") | |
6973 ("tanh"."tanh") | |
6974 ) | |
6975 "Entities for TeX->HTML translation. | |
6976 Entries can be like (\"ent\"), in which case \"\\ent\" will be translated to | |
6977 \"&ent;\". An entry can also be a dotted pair like (\"ent\".\"&other;\"). | |
6978 In that case, \"\\ent\" will be translated to \"&other;\". | |
6979 The list contains HTML entities for Latin-1, Greek and other symbols. | |
6980 It is supplemented by a number of commonly used TeX macros with appropriate | |
6981 translations.") | |
6982 | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
6983 (defvar org-last-level nil) ; dynamically scoped variable |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
6984 |
58792 | 6985 (defun org-export-as-ascii (arg) |
6986 "Export the outline as a pretty ASCII file. | |
6987 If there is an active region, export only the region. | |
6988 The prefix ARG specifies how many levels of the outline should become | |
6989 underlined headlines. The default is 3." | |
6990 (interactive "P") | |
6991 (setq-default org-todo-line-regexp org-todo-line-regexp) | |
6992 (let* ((region | |
6993 (buffer-substring | |
6994 (if (org-region-active-p) (region-beginning) (point-min)) | |
6995 (if (org-region-active-p) (region-end) (point-max)))) | |
6996 (lines (org-export-find-first-heading-line | |
6997 (org-skip-comments (org-split-string region "[\r\n]")))) | |
6998 (org-startup-with-deadline-check nil) | |
6999 (level 0) line txt | |
7000 (umax nil) | |
7001 (case-fold-search nil) | |
7002 (filename (concat (file-name-sans-extension (buffer-file-name)) | |
7003 ".txt")) | |
7004 (buffer (find-file-noselect filename)) | |
7005 (levels-open (make-vector org-level-max nil)) | |
7006 (date (format-time-string "%Y/%m/%d" (current-time))) | |
7007 (time (format-time-string "%X" (current-time))) | |
7008 (author user-full-name) | |
7009 (title (buffer-name)) | |
7010 (options nil) | |
7011 (email user-mail-address) | |
7012 (language org-export-default-language) | |
7013 (text nil) | |
7014 (todo nil) | |
7015 (lang-words nil)) | |
7016 | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
7017 (setq org-last-level 1) |
58792 | 7018 (org-init-section-numbers) |
7019 | |
7020 (find-file-noselect filename) | |
7021 | |
7022 ;; Search for the export key lines | |
7023 (org-parse-key-lines) | |
7024 | |
7025 (setq lang-words (or (assoc language org-export-language-setup) | |
7026 (assoc "en" org-export-language-setup))) | |
7027 (if org-export-ascii-show-new-buffer | |
7028 (switch-to-buffer-other-window buffer) | |
7029 (set-buffer buffer)) | |
7030 (erase-buffer) | |
7031 (fundamental-mode) | |
7032 (if options (org-parse-export-options options)) | |
7033 (setq umax (if arg (prefix-numeric-value arg) | |
7034 org-export-headline-levels)) | |
7035 | |
7036 ;; File header | |
7037 (if title (org-insert-centered title ?=)) | |
7038 (insert "\n") | |
7039 (if (or author email) | |
7040 (insert (concat (nth 1 lang-words) ": " (or author "") | |
7041 (if email (concat " <" email ">") "") | |
7042 "\n"))) | |
7043 (if (and date time) | |
7044 (insert (concat (nth 2 lang-words) ": " date " " time "\n"))) | |
7045 (if text (insert (concat (org-html-expand-for-ascii text) "\n\n"))) | |
7046 | |
7047 (insert "\n\n") | |
7048 | |
7049 (if org-export-with-toc | |
7050 (progn | |
7051 (insert (nth 3 lang-words) "\n" | |
7052 (make-string (length (nth 3 lang-words)) ?=) "\n") | |
7053 (mapcar '(lambda (line) | |
7054 (if (string-match org-todo-line-regexp | |
7055 line) | |
7056 ;; This is a headline | |
7057 (progn | |
7058 (setq level (- (match-end 1) (match-beginning 1)) | |
7059 txt (match-string 3 line) | |
7060 todo | |
7061 (or (and (match-beginning 2) | |
7062 (not (equal (match-string 2 line) | |
7063 org-done-string))) | |
7064 ; TODO, not DONE | |
7065 (and (= level umax) | |
7066 (org-search-todo-below | |
7067 line lines level)))) | |
7068 (setq txt (org-html-expand-for-ascii txt)) | |
7069 | |
7070 (if org-export-with-section-numbers | |
7071 (setq txt (concat (org-section-number level) | |
7072 " " txt))) | |
7073 (if (<= level umax) | |
7074 (progn | |
7075 (insert | |
7076 (make-string (* (1- level) 4) ?\ ) | |
7077 (format (if todo "%s (*)\n" "%s\n") txt)) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
7078 (setq org-last-level level)) |
58792 | 7079 )))) |
7080 lines))) | |
7081 | |
7082 (org-init-section-numbers) | |
7083 (while (setq line (pop lines)) | |
7084 ;; Remove the quoted HTML tags. | |
7085 (setq line (org-html-expand-for-ascii line)) | |
7086 (cond | |
7087 ((string-match "^\\(\\*+\\)[ \t]*\\(.*\\)" line) | |
7088 ;; a Headline | |
7089 (setq level (- (match-end 1) (match-beginning 1)) | |
7090 txt (match-string 2 line)) | |
7091 (org-ascii-level-start level txt umax)) | |
7092 (t (insert line "\n")))) | |
7093 (normal-mode) | |
7094 (save-buffer) | |
7095 (goto-char (point-min)))) | |
7096 | |
7097 (defun org-search-todo-below (line lines level) | |
7098 "Search the subtree below LINE for any TODO entries." | |
7099 (let ((rest (cdr (memq line lines))) | |
7100 (re org-todo-line-regexp) | |
7101 line lv todo) | |
7102 (catch 'exit | |
7103 (while (setq line (pop rest)) | |
7104 (if (string-match re line) | |
7105 (progn | |
7106 (setq lv (- (match-end 1) (match-beginning 1)) | |
7107 todo (and (match-beginning 2) | |
7108 (not (equal (match-string 2 line) | |
7109 org-done-string)))) | |
7110 ; TODO, not DONE | |
7111 (if (<= lv level) (throw 'exit nil)) | |
7112 (if todo (throw 'exit t)))))))) | |
7113 | |
7114 ;; FIXME: Try to handle <b> and <i> as faces via text properties. | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
7115 ;; FIXME: Can I implement *bold*,/italic/ and _underline_ for ASCII export? |
58792 | 7116 (defun org-html-expand-for-ascii (line) |
7117 "Handle quoted HTML for ASCII export." | |
7118 (if org-export-html-expand | |
7119 (while (string-match "@<[^<>\n]*>" line) | |
7120 ;; We just remove the tags for now. | |
7121 (setq line (replace-match "" nil nil line)))) | |
7122 line) | |
7123 | |
7124 (defun org-insert-centered (s &optional underline) | |
7125 "Insert the string S centered and underline it with character UNDERLINE." | |
7126 (let ((ind (max (/ (- 80 (length s)) 2) 0))) | |
7127 (insert (make-string ind ?\ ) s "\n") | |
7128 (if underline | |
7129 (insert (make-string ind ?\ ) | |
7130 (make-string (length s) underline) | |
7131 "\n")))) | |
7132 | |
7133 (defun org-ascii-level-start (level title umax) | |
7134 "Insert a new level in ASCII export." | |
7135 (let (char) | |
7136 (if (> level umax) | |
7137 (insert (make-string (* 2 (- level umax 1)) ?\ ) "* " title "\n") | |
7138 (if (or (not (equal (char-before) ?\n)) | |
7139 (not (equal (char-before (1- (point))) ?\n))) | |
7140 (insert "\n")) | |
7141 (setq char (nth (- umax level) (reverse org-ascii-underline))) | |
7142 (if org-export-with-section-numbers | |
7143 (setq title (concat (org-section-number level) " " title))) | |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7144 (insert title "\n" (make-string (string-width title) char) "\n")))) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7145 |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
7146 (defun org-export-copy-visible () |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7147 "Copy the visible part of the buffer to another buffer, for printing. |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
7148 Also removes the first line of the buffer if it specifies a mode, |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7149 and all options lines." |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
7150 (interactive) |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7151 (let* ((filename (concat (file-name-sans-extension (buffer-file-name)) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7152 ".txt")) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7153 (buffer (find-file-noselect filename)) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7154 (ore (concat |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7155 (org-make-options-regexp |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7156 '("CATEGORY" "SEQ_TODO" "PRI_TODO" "TYP_TODO" "STARTUP" |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7157 "TITLE" "AUTHOR" "EMAIL" "TEXT" "OPTIONS" "LANGUAGE")) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7158 (if org-noutline-p "\\(\n\\|$\\)" ""))) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7159 s e) |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
7160 (with-current-buffer buffer |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7161 (erase-buffer) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7162 (text-mode)) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7163 (save-excursion |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7164 (setq s (goto-char (point-min))) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7165 (while (not (= (point) (point-max))) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7166 (goto-char (org-find-invisible)) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7167 (append-to-buffer buffer s (point)) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7168 (setq s (goto-char (org-find-visible))))) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7169 (switch-to-buffer-other-window buffer) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7170 (newline) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7171 (goto-char (point-min)) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7172 (if (looking-at ".*-\\*- mode:.*\n") |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7173 (replace-match "")) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7174 (while (re-search-forward ore nil t) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7175 (replace-match "")) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7176 (goto-char (point-min)))) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7177 |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7178 (defun org-find-visible () |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7179 (if (featurep 'noutline) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7180 (let ((s (point))) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7181 (while (and (not (= (point-max) (setq s (next-overlay-change s)))) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7182 (get-char-property s 'invisible))) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7183 s) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7184 (skip-chars-forward "^\n") |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7185 (point))) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7186 (defun org-find-invisible () |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7187 (if (featurep 'noutline) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7188 (let ((s (point))) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7189 (while (and (not (= (point-max) (setq s (next-overlay-change s)))) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7190 (not (get-char-property s 'invisible)))) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7191 s) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7192 (skip-chars-forward "^\r") |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7193 (point))) |
58792 | 7194 |
7195 ;; HTML | |
7196 | |
7197 (defun org-get-current-options () | |
7198 "Return a string with current options as keyword options. | |
7199 Does include HTML export options as well as TODO and CATEGORY stuff." | |
7200 (format | |
7201 "#+TITLE: %s | |
7202 #+AUTHOR: %s | |
7203 #+EMAIL: %s | |
7204 #+LANGUAGE: %s | |
7205 #+TEXT: Some descriptive text to be emitted. Several lines OK. | |
7206 #+OPTIONS: H:%d num:%s toc:%s \\n:%s @:%s ::%s |:%s ^:%s *:%s TeX:%s | |
7207 #+CATEGORY: %s | |
7208 #+SEQ_TODO: %s | |
7209 #+TYP_TODO: %s | |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
7210 #+STARTUP: %s %s |
58792 | 7211 " |
7212 (buffer-name) (user-full-name) user-mail-address org-export-default-language | |
7213 org-export-headline-levels | |
7214 org-export-with-section-numbers | |
7215 org-export-with-toc | |
7216 org-export-preserve-breaks | |
7217 org-export-html-expand | |
7218 org-export-with-fixed-width | |
7219 org-export-with-tables | |
7220 org-export-with-sub-superscripts | |
7221 org-export-with-emphasize | |
7222 org-export-with-TeX-macros | |
7223 (file-name-nondirectory (buffer-file-name)) | |
7224 (if (equal org-todo-interpretation 'sequence) | |
7225 (mapconcat 'identity org-todo-keywords " ") | |
7226 "TODO FEEDBACK VERIFY DONE") | |
7227 (if (equal org-todo-interpretation 'type) | |
7228 (mapconcat 'identity org-todo-keywords " ") | |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
7229 "Me Jason Marie DONE") |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
7230 (cdr (assoc org-startup-folded |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
7231 '((nil . "nofold")(t . "fold")(content . "content")))) |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
7232 (if org-startup-with-deadline-check "dlcheck" "nodlcheck") |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
7233 )) |
58792 | 7234 |
7235 (defun org-insert-export-options-template () | |
7236 "Insert into the buffer a template with information for exporting." | |
7237 (interactive) | |
7238 (if (not (bolp)) (newline)) | |
7239 (let ((s (org-get-current-options))) | |
7240 (and (string-match "#\\+CATEGORY" s) | |
7241 (setq s (substring s 0 (match-beginning 0)))) | |
7242 (insert s))) | |
7243 | |
7244 (defun org-toggle-fixed-width-section (arg) | |
7245 "Toggle the fixed-width indicator at the beginning of lines in the region. | |
7246 If there is no active region, only acts on the current line. | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
7247 If the first non-white character in the first line of the region is a |
58792 | 7248 vertical bar \"|\", then the command removes the bar from all lines in |
7249 the region. If the first character is not a bar, the command adds a | |
7250 bar to all lines, in the column given by the beginning of the region. | |
7251 | |
7252 If there is a numerical prefix ARG, create ARG new lines starting with \"|\"." | |
7253 (interactive "P") | |
7254 (let* ((cc 0) | |
7255 (regionp (org-region-active-p)) | |
7256 (beg (if regionp (region-beginning) (point))) | |
7257 (end (if regionp (region-end))) | |
7258 (nlines (or arg (if (and beg end) (count-lines beg end) 1))) | |
7259 (re "[ \t]*\\(:\\)") | |
7260 off) | |
7261 (save-excursion | |
7262 (goto-char beg) | |
7263 (setq cc (current-column)) | |
7264 (beginning-of-line 1) | |
7265 (setq off (looking-at re)) | |
7266 (while (> nlines 0) | |
7267 (setq nlines (1- nlines)) | |
7268 (beginning-of-line 1) | |
7269 (cond | |
7270 (arg | |
7271 (move-to-column cc t) | |
7272 (insert ":\n") | |
7273 (forward-line -1)) | |
7274 ((and off (looking-at re)) | |
7275 (replace-match "" t t nil 1)) | |
7276 ((not off) (move-to-column cc t) (insert ":"))) | |
7277 (forward-line 1))))) | |
7278 | |
7279 (defun org-export-as-html-and-open (arg) | |
7280 "Export the outline as HTML and immediately open it with a browser. | |
7281 If there is an active region, export only the region. | |
7282 The prefix ARG specifies how many levels of the outline should become | |
7283 headlines. The default is 3. Lower levels will become bulleted lists." | |
7284 (interactive "P") | |
7285 (org-export-as-html arg 'hidden) | |
7286 (org-open-file (buffer-file-name))) | |
7287 | |
7288 (defun org-export-as-html-batch () | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
7289 "Call `org-export-as-html', may be used in batch processing as |
58792 | 7290 emacs --batch |
7291 --load=$HOME/lib/emacs/org.el | |
7292 --eval \"(setq org-export-headline-levels 2)\" | |
7293 --visit=MyFile --funcall org-export-as-html-batch" | |
7294 (org-export-as-html org-export-headline-levels 'hidden)) | |
7295 | |
7296 (defun org-export-as-html (arg &optional hidden) | |
7297 "Export the outline as a pretty HTML file. | |
7298 If there is an active region, export only the region. | |
7299 The prefix ARG specifies how many levels of the outline should become | |
7300 headlines. The default is 3. Lower levels will become bulleted lists." | |
7301 (interactive "P") | |
7302 (setq-default org-todo-line-regexp org-todo-line-regexp) | |
7303 (setq-default org-deadline-line-regexp org-deadline-line-regexp) | |
7304 (setq-default org-done-string org-done-string) | |
7305 (let* ((region-p (org-region-active-p)) | |
7306 (region | |
7307 (buffer-substring | |
7308 (if region-p (region-beginning) (point-min)) | |
7309 (if region-p (region-end) (point-max)))) | |
7310 (all_lines | |
7311 (org-skip-comments (org-split-string region "[\r\n]"))) | |
7312 (lines (org-export-find-first-heading-line all_lines)) | |
7313 (level 0) (line "") (origline "") txt todo | |
7314 (umax nil) | |
7315 (filename (concat (file-name-sans-extension (buffer-file-name)) | |
7316 ".html")) | |
7317 (buffer (find-file-noselect filename)) | |
7318 (levels-open (make-vector org-level-max nil)) | |
7319 (date (format-time-string "%Y/%m/%d" (current-time))) | |
7320 (time (format-time-string "%X" (current-time))) | |
7321 (author user-full-name) | |
7322 (title (buffer-name)) | |
7323 (options nil) | |
7324 (email user-mail-address) | |
7325 (language org-export-default-language) | |
7326 (text nil) | |
7327 (lang-words nil) | |
7328 (head-count 0) cnt | |
7329 table-open type | |
7330 table-buffer table-orig-buffer | |
7331 ) | |
7332 (message "Exporting...") | |
7333 | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
7334 (setq org-last-level 1) |
58792 | 7335 (org-init-section-numbers) |
7336 | |
7337 ;; Search for the export key lines | |
7338 (org-parse-key-lines) | |
7339 (setq lang-words (or (assoc language org-export-language-setup) | |
7340 (assoc "en" org-export-language-setup))) | |
7341 | |
7342 ;; Switch to the output buffer | |
7343 (if (or hidden (not org-export-html-show-new-buffer)) | |
7344 (set-buffer buffer) | |
7345 (switch-to-buffer-other-window buffer)) | |
7346 (erase-buffer) | |
7347 (fundamental-mode) | |
7348 (let ((case-fold-search nil)) | |
7349 (if options (org-parse-export-options options)) | |
7350 (setq umax (if arg (prefix-numeric-value arg) | |
7351 org-export-headline-levels)) | |
7352 | |
7353 ;; File header | |
7354 (insert (format | |
7355 "<html lang=\"%s\"><head> | |
7356 <title>%s</title> | |
7357 <meta http-equiv=\"Content-Type\" content=\"text/html\"> | |
7358 <meta name=generator content=\"Org-mode\"> | |
7359 <meta name=generated content=\"%s %s\"> | |
7360 <meta name=author content=\"%s\"> | |
7361 </head><body> | |
7362 " | |
7363 language (org-html-expand title) date time author)) | |
7364 (if title (insert (concat "<H1 align=\"center\">" | |
7365 (org-html-expand title) "</H1>\n"))) | |
7366 (if author (insert (concat (nth 1 lang-words) ": " author "\n"))) | |
7367 (if email (insert (concat "<a href=\"mailto:" email "\"><" | |
7368 email "></a>\n"))) | |
7369 (if (or author email) (insert "<br>\n")) | |
7370 (if (and date time) (insert (concat (nth 2 lang-words) ": " | |
7371 date " " time "<br>\n"))) | |
7372 (if text (insert (concat "<p>\n" (org-html-expand text)))) | |
7373 (if org-export-with-toc | |
7374 (progn | |
7375 (insert (format "<H2>%s</H2>\n" (nth 3 lang-words))) | |
7376 (insert "<ul>\n") | |
7377 (mapcar '(lambda (line) | |
7378 (if (string-match org-todo-line-regexp line) | |
7379 ;; This is a headline | |
7380 (progn | |
7381 (setq level (- (match-end 1) (match-beginning 1)) | |
7382 txt (save-match-data | |
7383 (org-html-expand | |
7384 (match-string 3 line))) | |
7385 todo | |
7386 (or (and (match-beginning 2) | |
7387 (not (equal (match-string 2 line) | |
7388 org-done-string))) | |
7389 ; TODO, not DONE | |
7390 (and (= level umax) | |
7391 (org-search-todo-below | |
7392 line lines level)))) | |
7393 (if org-export-with-section-numbers | |
7394 (setq txt (concat (org-section-number level) | |
7395 " " txt))) | |
7396 (if (<= level umax) | |
7397 (progn | |
7398 (setq head-count (+ head-count 1)) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
7399 (if (> level org-last-level) |
58792 | 7400 (progn |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
7401 (setq cnt (- level org-last-level)) |
58792 | 7402 (while (>= (setq cnt (1- cnt)) 0) |
7403 (insert "<ul>")) | |
7404 (insert "\n"))) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
7405 (if (< level org-last-level) |
58792 | 7406 (progn |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
7407 (setq cnt (- org-last-level level)) |
58792 | 7408 (while (>= (setq cnt (1- cnt)) 0) |
7409 (insert "</ul>")) | |
7410 (insert "\n"))) | |
7411 (insert | |
7412 (format | |
7413 (if todo | |
7414 "<li><a href=\"#sec-%d\"><span style='color:red'>%s</span></a></li>\n" | |
7415 "<li><a href=\"#sec-%d\">%s</a></li>\n") | |
7416 head-count txt)) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
7417 (setq org-last-level level)) |
58792 | 7418 )))) |
7419 lines) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
7420 (while (> org-last-level 0) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
7421 (setq org-last-level (1- org-last-level)) |
58792 | 7422 (insert "</ul>\n")) |
7423 )) | |
7424 (setq head-count 0) | |
7425 (org-init-section-numbers) | |
7426 | |
7427 (while (setq line (pop lines) origline line) | |
7428 ;; replace "<" and ">" by "<" and ">" | |
7429 ;; handle @<..> HTML tags (replace "@>..<" by "<..>") | |
7430 (setq line (org-html-expand line)) | |
7431 | |
7432 ;; Verbatim lines | |
7433 (if (and org-export-with-fixed-width | |
7434 (string-match "^[ \t]*:\\(.*\\)" line)) | |
7435 (progn | |
7436 (let ((l (match-string 1 line))) | |
7437 (while (string-match " " l) | |
7438 (setq l (replace-match " " t t l))) | |
7439 (insert "\n<span style='font-family:Courier'>" | |
7440 l "</span>" | |
7441 (if (and lines | |
7442 (not (string-match "^[ \t]+\\(:.*\\)" | |
7443 (car lines)))) | |
7444 "<br>\n" "\n")))) | |
7445 | |
7446 (when (string-match org-link-regexp line) | |
7447 (setq type (match-string 1 line)) | |
7448 (cond | |
7449 ((member type '("http" "https" "ftp" "mailto" "news")) | |
7450 ;; standard URL | |
7451 (setq line (replace-match | |
7452 "<a href=\"\\1:\\2\"><\\1:\\2></a>" | |
7453 nil nil line))) | |
7454 ((string= type "file") | |
7455 ;; FILE link | |
7456 | |
7457 (let* ((filename (match-string 2 line)) | |
7458 (file-is-image-p | |
7459 (save-match-data | |
7460 (string-match (org-image-file-name-regexp) filename)))) | |
7461 (setq line (replace-match | |
7462 (if (and org-export-html-inline-images | |
7463 file-is-image-p) | |
7464 "<img src=\"\\2\"/>" | |
7465 "<a href=\"\\2\">\\1:\\2</a>") | |
7466 nil nil line)))) | |
7467 | |
7468 ((member type '("bbdb" "vm" "wl" "rmail" "gnus" "shell")) | |
7469 (setq line (replace-match | |
7470 "<i><\\1:\\2></i>" nil nil line))))) | |
7471 | |
7472 ;; TODO items | |
7473 (if (and (string-match org-todo-line-regexp line) | |
7474 (match-beginning 2)) | |
7475 (if (equal (match-string 2 line) org-done-string) | |
7476 (setq line (replace-match | |
7477 "<span style='color:green'>\\2</span>" | |
7478 nil nil line 2)) | |
7479 (setq line (replace-match "<span style='color:red'>\\2</span>" | |
7480 nil nil line 2)))) | |
7481 | |
7482 ;; DEADLINES | |
7483 (if (string-match org-deadline-line-regexp line) | |
7484 (progn | |
7485 (if (save-match-data | |
7486 (string-match "<a href" | |
7487 (substring line 0 (match-beginning 0)))) | |
7488 nil ; Don't do the replacement - it is inside a link | |
7489 (setq line (replace-match "<span style='color:red'>\\&</span>" | |
7490 nil nil line 1))))) | |
7491 | |
7492 (cond | |
7493 ((string-match "^\\(\\*+\\)[ \t]*\\(.*\\)" line) | |
7494 ;; This is a headline | |
7495 (setq level (- (match-end 1) (match-beginning 1)) | |
7496 txt (match-string 2 line)) | |
7497 (if (<= level umax) (setq head-count (+ head-count 1))) | |
7498 (org-html-level-start level txt umax | |
7499 (and org-export-with-toc (<= level umax)) | |
7500 head-count)) | |
7501 | |
7502 ((and org-export-with-tables | |
7503 (string-match "^\\([ \t]*\\)\\(|\\|\\+-+\\+\\)" line)) | |
7504 (if (not table-open) | |
7505 ;; New table starts | |
7506 (setq table-open t table-buffer nil table-orig-buffer nil)) | |
7507 ;; Accumulate lines | |
7508 (setq table-buffer (cons line table-buffer) | |
7509 table-orig-buffer (cons origline table-orig-buffer)) | |
7510 (when (or (not lines) | |
7511 (not (string-match "^\\([ \t]*\\)\\(|\\|\\+-+\\+\\)" | |
7512 (car lines)))) | |
7513 (setq table-open nil | |
7514 table-buffer (nreverse table-buffer) | |
7515 table-orig-buffer (nreverse table-orig-buffer)) | |
7516 (insert (org-format-table-html table-buffer table-orig-buffer)))) | |
7517 (t | |
7518 ;; Normal lines | |
7519 ;; Lines starting with "-", and empty lines make new paragraph. | |
7520 (if (string-match "^ *-\\|^[ \t]*$" line) (insert "<p>")) | |
7521 (insert line (if org-export-preserve-breaks "<br>\n" "\n")))) | |
7522 )) | |
7523 (if org-export-html-with-timestamp | |
7524 (insert org-export-html-html-helper-timestamp)) | |
7525 (insert "</body>\n</html>\n") | |
7526 (normal-mode) | |
7527 (save-buffer) | |
7528 (goto-char (point-min))))) | |
7529 | |
7530 (defun org-format-table-html (lines olines) | |
7531 "Find out which HTML converter to use and return the HTML code." | |
7532 (if (string-match "^[ \t]*|" (car lines)) | |
7533 ;; A normal org table | |
7534 (org-format-org-table-html lines) | |
7535 ;; Table made by table.el - test for spanning | |
7536 (let* ((hlines (delq nil (mapcar | |
7537 (lambda (x) | |
7538 (if (string-match "^[ \t]*\\+-" x) x | |
7539 nil)) | |
7540 lines))) | |
7541 (first (car hlines)) | |
7542 (ll (and (string-match "\\S-+" first) | |
7543 (match-string 0 first))) | |
7544 (re (concat "^[ \t]*" (regexp-quote ll))) | |
7545 (spanning (delq nil (mapcar (lambda (x) (not (string-match re x))) | |
7546 hlines)))) | |
7547 (if (and (not spanning) | |
7548 (not org-export-prefer-native-exporter-for-tables)) | |
7549 ;; We can use my own converter with HTML conversions | |
7550 (org-format-table-table-html lines) | |
7551 ;; Need to use the code generator in table.el, with the original text. | |
7552 (org-format-table-table-html-using-table-generate-source olines))))) | |
7553 | |
7554 (defun org-format-org-table-html (lines) | |
7555 "Format a table into html." | |
7556 (if (string-match "^[ \t]*|-" (car lines)) (setq lines (cdr lines))) | |
7557 (setq lines (nreverse lines)) | |
7558 (if (string-match "^[ \t]*|-" (car lines)) (setq lines (cdr lines))) | |
7559 (setq lines (nreverse lines)) | |
7560 (let ((head (and org-export-highlight-first-table-line | |
7561 (delq nil (mapcar | |
7562 (lambda (x) (string-match "^[ \t]*|-" x)) | |
7563 lines)))) | |
7564 lastline line fields html empty) | |
7565 (setq html (concat org-export-html-table-tag "\n")) | |
7566 (while (setq lastline line | |
7567 line (pop lines)) | |
7568 (setq empty " ") | |
7569 (catch 'next-line | |
7570 (if (string-match "^[ \t]*|-" line) | |
7571 (if lastline | |
7572 ;; A hline: simulate an empty table row instead. | |
7573 (setq line (org-fake-empty-table-line lastline) | |
7574 head nil | |
7575 empty "") | |
7576 ;; Ignore this line | |
7577 (throw 'next-line t))) | |
7578 ;; Break the line into fields | |
7579 (setq fields (org-split-string line "[ \t]*|[ \t]*")) | |
7580 (setq html (concat | |
7581 html | |
7582 "<tr>" | |
7583 (mapconcat (lambda (x) | |
7584 (if (equal x "") (setq x empty)) | |
7585 (if head | |
7586 (concat "<th>" x "</th>") | |
7587 (concat "<td valign=\"top\">" x "</td>"))) | |
7588 fields "") | |
7589 "</tr>\n")))) | |
7590 (setq html (concat html "</table>\n")) | |
7591 html)) | |
7592 | |
7593 (defun org-fake-empty-table-line (line) | |
7594 "Replace everything except \"|\" with spaces." | |
7595 (let ((i (length line)) | |
7596 (newstr (copy-sequence line))) | |
7597 (while (> i 0) | |
7598 (setq i (1- i)) | |
7599 (if (not (eq (aref newstr i) ?|)) | |
7600 (aset newstr i ?\ ))) | |
7601 newstr)) | |
7602 | |
7603 (defun org-format-table-table-html (lines) | |
7604 "Format a table generated by table.el into html. | |
7605 This conversion does *not* use `table-generate-source' from table.el. | |
7606 This has the advantage that Org-mode's HTML conversions can be used. | |
7607 But it has the disadvantage, that no cell- or row-spanning is allowed." | |
7608 (let (line field-buffer | |
7609 (head org-export-highlight-first-table-line) | |
7610 fields html empty) | |
7611 (setq html (concat org-export-html-table-tag "\n")) | |
7612 (while (setq line (pop lines)) | |
7613 (setq empty " ") | |
7614 (catch 'next-line | |
7615 (if (string-match "^[ \t]*\\+-" line) | |
7616 (progn | |
7617 (if field-buffer | |
7618 (progn | |
7619 (setq html (concat | |
7620 html | |
7621 "<tr>" | |
7622 (mapconcat | |
7623 (lambda (x) | |
7624 (if (equal x "") (setq x empty)) | |
7625 (if head | |
7626 (concat "<th valign=\"top\">" x | |
7627 "</th>\n") | |
7628 (concat "<td valign=\"top\">" x | |
7629 "</td>\n"))) | |
7630 field-buffer "\n") | |
7631 "</tr>\n")) | |
7632 (setq head nil) | |
7633 (setq field-buffer nil))) | |
7634 ;; Ignore this line | |
7635 (throw 'next-line t))) | |
7636 ;; Break the line into fields and store the fields | |
7637 (setq fields (org-split-string line "[ \t]*|[ \t]*")) | |
7638 (if field-buffer | |
7639 (setq field-buffer (mapcar | |
7640 (lambda (x) | |
7641 (concat x "<br>" (pop fields))) | |
7642 field-buffer)) | |
7643 (setq field-buffer fields)))) | |
7644 (setq html (concat html "</table>\n")) | |
7645 html)) | |
7646 | |
7647 (defun org-format-table-table-html-using-table-generate-source (lines) | |
7648 "Format a table into html, using `table-generate-source' from table.el. | |
7649 This has the advantage that cell- or row-spanning is allowed. | |
7650 But it has the disadvantage, that Org-mode's HTML conversions cannot be used." | |
7651 (require 'table) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
7652 (with-current-buffer (get-buffer-create " org-tmp1 ") |
58792 | 7653 (erase-buffer) |
7654 (insert (mapconcat 'identity lines "\n")) | |
7655 (goto-char (point-min)) | |
7656 (if (not (re-search-forward "|[^+]" nil t)) | |
7657 (error "Error processing table.")) | |
7658 (table-recognize-table) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
7659 (with-current-buffer (get-buffer-create " org-tmp2 ") (erase-buffer)) |
58792 | 7660 (table-generate-source 'html " org-tmp2 ") |
7661 (set-buffer " org-tmp2 ") | |
7662 (buffer-substring (point-min) (point-max)))) | |
7663 | |
7664 (defun org-html-expand (string) | |
62076
4f2150e05f24
(org-get-entries-from-diary): Remove unused vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61924
diff
changeset
|
7665 "Prepare STRING for HTML export. Applies all active conversions." |
58792 | 7666 ;; First check if there is a link in the line - if yes, apply conversions |
7667 ;; only before the start of the link. | |
7668 (let* ((m (string-match org-link-regexp string)) | |
7669 (s (if m (substring string 0 m) string)) | |
7670 (r (if m (substring string m) ""))) | |
7671 ;; convert < to < and > to > | |
7672 (while (string-match "<" s) | |
7673 (setq s (replace-match "<" nil nil s))) | |
7674 (while (string-match ">" s) | |
7675 (setq s (replace-match ">" nil nil s))) | |
7676 (if org-export-html-expand | |
7677 (while (string-match "@<\\([^&]*\\)>" s) | |
7678 (setq s (replace-match "<\\1>" nil nil s)))) | |
7679 (if org-export-with-emphasize | |
7680 (setq s (org-export-html-convert-emphasize s))) | |
7681 (if org-export-with-sub-superscripts | |
7682 (setq s (org-export-html-convert-sub-super s))) | |
7683 (if org-export-with-TeX-macros | |
7684 (let ((start 0) wd ass) | |
7685 (while (setq start (string-match "\\\\\\([a-zA-Z]+\\)" s start)) | |
7686 (setq wd (match-string 1 s)) | |
7687 (if (setq ass (assoc wd org-html-entities)) | |
7688 (setq s (replace-match (or (cdr ass) | |
7689 (concat "&" (car ass) ";")) | |
7690 t t s)) | |
7691 (setq start (+ start (length wd))))))) | |
7692 (concat s r))) | |
7693 | |
7694 (defun org-create-multibrace-regexp (left right n) | |
7695 "Create a regular expression which will match a balanced sexp. | |
7696 Opening delimiter is LEFT, and closing delimiter is RIGHT, both given | |
7697 as single character strings. | |
7698 The regexp returned will match the entire expression including the | |
7699 delimiters. It will also define a single group which contains the | |
62076
4f2150e05f24
(org-get-entries-from-diary): Remove unused vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61924
diff
changeset
|
7700 match except for the outermost delimiters. The maximum depth of |
4f2150e05f24
(org-get-entries-from-diary): Remove unused vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61924
diff
changeset
|
7701 stacked delimiters is N. Escaping delimiters is not possible." |
58792 | 7702 (let* ((nothing (concat "[^" "\\" left "\\" right "]*?")) |
7703 (or "\\|") | |
7704 (re nothing) | |
7705 (next (concat "\\(?:" nothing left nothing right "\\)+" nothing))) | |
7706 (while (> n 1) | |
7707 (setq n (1- n) | |
7708 re (concat re or next) | |
7709 next (concat "\\(?:" nothing left next right "\\)+" nothing))) | |
7710 (concat left "\\(" re "\\)" right))) | |
7711 | |
7712 (defvar org-match-substring-regexp | |
7713 (concat | |
7714 "\\([^\\]\\)\\([_^]\\)\\(" | |
7715 "\\(" (org-create-multibrace-regexp "{" "}" org-match-sexp-depth) "\\)" | |
7716 "\\|" | |
7717 "\\(" (org-create-multibrace-regexp "(" ")" org-match-sexp-depth) "\\)" | |
7718 "\\|" | |
7719 "\\(\\(?:\\*\\|[-+]?[^-+*!@#$%^_ \t\r\n,:\"?<>~;./{}=()]+\\)\\)\\)") | |
7720 "The regular expression matching a sub- or superscript.") | |
7721 | |
7722 (defun org-export-html-convert-sub-super (string) | |
7723 "Convert sub- and superscripts in STRING to HTML." | |
7724 (let (key c) | |
7725 (while (string-match org-match-substring-regexp string) | |
7726 (setq key (if (string= (match-string 2 string) "_") "sub" "sup")) | |
7727 (setq c (or (match-string 8 string) | |
7728 (match-string 6 string) | |
7729 (match-string 5 string))) | |
7730 (setq string (replace-match | |
7731 (concat (match-string 1 string) | |
7732 "<" key ">" c "</" key ">") | |
7733 t t string))) | |
7734 (while (string-match "\\\\\\([_^]\\)" string) | |
7735 (setq string (replace-match (match-string 1 string) t t string)))) | |
7736 string) | |
7737 | |
7738 (defun org-export-html-convert-emphasize (string) | |
7739 (while (string-match | |
7740 "\\(\\s-\\|^\\)\\(\\*\\([a-zA-Z]+\\)\\*\\)\\([^a-zA-Z*]\\|$\\)" | |
7741 string) | |
7742 (setq string (replace-match | |
7743 (concat "<b>" (match-string 3 string) "</b>") | |
7744 t t string 2))) | |
7745 (while (string-match | |
7746 "\\(\\s-\\|^\\)\\(/\\([a-zA-Z]+\\)/\\)\\([^a-zA-Z*]\\|$\\)" | |
7747 string) | |
7748 (setq string (replace-match | |
7749 (concat "<i>" (match-string 3 string) "</i>") | |
7750 t t string 2))) | |
7751 (while (string-match | |
7752 "\\(\\s-\\|^\\)\\(_\\([a-zA-Z]+\\)_\\)\\([^a-zA-Z*]\\|$\\)" | |
7753 string) | |
7754 (setq string (replace-match | |
7755 (concat "<u>" (match-string 3 string) "</u>") | |
7756 t t string 2))) | |
7757 string) | |
7758 | |
7759 (defun org-parse-key-lines () | |
7760 "Find the special key lines with the information for exporters." | |
7761 (save-excursion | |
7762 (goto-char 0) | |
7763 (let ((re (org-make-options-regexp | |
7764 '("TITLE" "AUTHOR" "EMAIL" "TEXT" "OPTIONS" "LANGUAGE"))) | |
7765 key) | |
7766 (while (re-search-forward re nil t) | |
7767 (setq key (match-string 1)) | |
7768 (cond ((string-equal key "TITLE") | |
7769 (setq title (match-string 2))) | |
7770 ((string-equal key "AUTHOR") | |
7771 (setq author (match-string 2))) | |
7772 ((string-equal key "EMAIL") | |
7773 (setq email (match-string 2))) | |
7774 ((string-equal key "LANGUAGE") | |
7775 (setq language (match-string 2))) | |
7776 ((string-equal key "TEXT") | |
7777 (setq text (concat text "\n" (match-string 2)))) | |
7778 ((string-equal key "OPTIONS") | |
7779 (setq options (match-string 2)))))))) | |
7780 | |
7781 (defun org-parse-export-options (s) | |
7782 "Parse the export options line." | |
7783 (let ((op '(("H" . org-export-headline-levels) | |
7784 ("num" . org-export-with-section-numbers) | |
7785 ("toc" . org-export-with-toc) | |
7786 ("\\n" . org-export-preserve-breaks) | |
7787 ("@" . org-export-html-expand) | |
7788 (":" . org-export-with-fixed-width) | |
7789 ("|" . org-export-with-tables) | |
7790 ("^" . org-export-with-sub-superscripts) | |
7791 ("*" . org-export-with-emphasize) | |
7792 ("TeX" . org-export-with-TeX-macros))) | |
7793 o) | |
7794 (while (setq o (pop op)) | |
7795 (if (string-match (concat (regexp-quote (car o)) ":\\([^ \t\n\r;,.]*\\)") | |
7796 s) | |
7797 (set (make-local-variable (cdr o)) | |
7798 (car (read-from-string (match-string 1 s)))))))) | |
7799 | |
7800 (defun org-html-level-start (level title umax with-toc head-count) | |
7801 "Insert a new level in HTML export." | |
7802 (let ((l (1+ (max level umax)))) | |
7803 (while (<= l org-level-max) | |
7804 (if (aref levels-open (1- l)) | |
7805 (progn | |
7806 (org-html-level-close l) | |
7807 (aset levels-open (1- l) nil))) | |
7808 (setq l (1+ l))) | |
7809 (if (> level umax) | |
7810 (progn | |
7811 (if (aref levels-open (1- level)) | |
7812 (insert "<li>" title "<p>\n") | |
7813 (aset levels-open (1- level) t) | |
7814 (insert "<ul><li>" title "<p>\n"))) | |
7815 (if org-export-with-section-numbers | |
7816 (setq title (concat (org-section-number level) " " title))) | |
7817 (setq level (+ level 1)) | |
7818 (if with-toc | |
7819 (insert (format "\n<H%d><a name=\"sec-%d\">%s</a></H%d>\n" | |
7820 level head-count title level)) | |
7821 (insert (format "\n<H%d>%s</H%d>\n" level title level)))))) | |
7822 | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
7823 (defun org-html-level-close (&rest args) |
58792 | 7824 "Terminate one level in HTML export." |
7825 (insert "</ul>")) | |
7826 | |
7827 | |
7828 ;; Variable holding the vector with section numbers | |
7829 (defvar org-section-numbers (make-vector org-level-max 0)) | |
7830 | |
7831 (defun org-init-section-numbers () | |
7832 "Initialize the vector for the section numbers." | |
7833 (let* ((level -1) | |
7834 (numbers (nreverse (org-split-string "" "\\."))) | |
7835 (depth (1- (length org-section-numbers))) | |
7836 (i depth) number-string) | |
7837 (while (>= i 0) | |
7838 (if (> i level) | |
7839 (aset org-section-numbers i 0) | |
7840 (setq number-string (or (car numbers) "0")) | |
7841 (if (string-match "\\`[A-Z]\\'" number-string) | |
7842 (aset org-section-numbers i | |
7843 (- (string-to-char number-string) ?A -1)) | |
7844 (aset org-section-numbers i (string-to-int number-string))) | |
7845 (pop numbers)) | |
7846 (setq i (1- i))))) | |
7847 | |
7848 (defun org-section-number (&optional level) | |
7849 "Return a string with the current section number. | |
7850 When LEVEL is non-nil, increase section numbers on that level." | |
7851 (let* ((depth (1- (length org-section-numbers))) idx n (string "")) | |
7852 (when level | |
7853 (when (> level -1) | |
7854 (aset org-section-numbers | |
7855 level (1+ (aref org-section-numbers level)))) | |
7856 (setq idx (1+ level)) | |
7857 (while (<= idx depth) | |
7858 (if (not (= idx 1)) | |
7859 (aset org-section-numbers idx 0)) | |
7860 (setq idx (1+ idx)))) | |
7861 (setq idx 0) | |
7862 (while (<= idx depth) | |
7863 (setq n (aref org-section-numbers idx)) | |
7864 (setq string (concat string (if (not (string= string "")) "." "") | |
7865 (int-to-string n))) | |
7866 (setq idx (1+ idx))) | |
7867 (save-match-data | |
7868 (if (string-match "\\`\\([@0]\\.\\)+" string) | |
7869 (setq string (replace-match "" nil nil string))) | |
7870 (if (string-match "\\(\\.0\\)+\\'" string) | |
7871 (setq string (replace-match "" nil nil string)))) | |
7872 string)) | |
7873 | |
7874 | |
7875 ;;; Key bindings | |
7876 | |
7877 ;; - Bindings in Org-mode map are currently | |
7878 ;; 0123456789abcdefghijklmnopqrstuvwxyz!?@#$%^&-+*/=()_{}[]:;"|,.<>~`'\t the alphabet | |
7879 ;; abcd fgh j lmnopqrstuvwxyz ? # -+ /= [] ; |,.<> \t necessary bindings | |
7880 ;; e (?) useful from outline-mode | |
7881 ;; i k @ expendable from outline-mode | |
7882 ;; 0123456789 ! $%^& * ()_{} " ~`' free | |
7883 | |
7884 (define-key org-mode-map [(tab)] 'org-cycle) | |
7885 (define-key org-mode-map "\C-i" 'org-cycle) | |
7886 (define-key org-mode-map [(meta tab)] 'org-complete) | |
7887 (define-key org-mode-map "\M-\C-i" 'org-complete) | |
7888 (define-key org-mode-map [(meta shift left)] 'org-shiftmetaleft) | |
7889 (define-key org-mode-map [(meta left)] 'org-metaleft) | |
7890 (define-key org-mode-map [(meta shift right)] 'org-shiftmetaright) | |
7891 (define-key org-mode-map [(meta shift up)] 'org-shiftmetaup) | |
7892 (define-key org-mode-map [(meta shift down)] 'org-shiftmetadown) | |
7893 (define-key org-mode-map [(meta right)] 'org-metaright) | |
7894 (define-key org-mode-map [(meta up)] 'org-metaup) | |
7895 (define-key org-mode-map [(meta down)] 'org-metadown) | |
7896 ;(define-key org-mode-map "\C-c\C-h\C-w" 'org-cut-subtree) | |
7897 ;(define-key org-mode-map "\C-c\C-h\M-w" 'org-copy-subtree) | |
7898 ;(define-key org-mode-map "\C-c\C-h\C-y" 'org-paste-subtree) | |
7899 (define-key org-mode-map "\C-c\C-h\C-w" 'org-cut-special) | |
7900 (define-key org-mode-map "\C-c\C-h\M-w" 'org-copy-special) | |
7901 (define-key org-mode-map "\C-c\C-h\C-y" 'org-paste-special) | |
7902 (define-key org-mode-map "\C-c\C-j" 'org-goto) | |
7903 (define-key org-mode-map "\C-c\C-t" 'org-todo) | |
7904 (define-key org-mode-map "\C-c\C-s" 'org-schedule) | |
7905 (define-key org-mode-map "\C-c\C-d" 'org-deadline) | |
7906 (define-key org-mode-map "\C-c;" 'org-toggle-comment) | |
7907 (define-key org-mode-map "\C-c\C-v" 'org-show-todo-tree) | |
7908 (define-key org-mode-map "\C-c\C-w" 'org-check-deadlines) | |
7909 (define-key org-mode-map "\C-c/" 'org-occur) ; Minor-mode reserved | |
7910 (define-key org-mode-map "\C-c\C-m" 'org-insert-heading) | |
7911 (define-key org-mode-map "\M-\C-m" 'org-insert-heading) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
7912 (define-key org-mode-map [(meta shift return)] 'org-insert-todo-heading) |
58792 | 7913 (define-key org-mode-map "\C-c\C-l" 'org-insert-link) |
7914 (define-key org-mode-map "\C-c\C-o" 'org-open-at-point) | |
7915 (define-key org-mode-map "\C-c\C-z" 'org-time-stamp) ; Alternative binding | |
7916 (define-key org-mode-map "\C-c." 'org-time-stamp) ; Minor-mode reserved | |
7917 (define-key org-mode-map "\C-c," 'org-priority) ; Minor-mode reserved | |
7918 (define-key org-mode-map "\C-c\C-y" 'org-evaluate-time-range) | |
7919 (define-key org-mode-map "\C-c>" 'org-goto-calendar) | |
7920 (define-key org-mode-map "\C-c<" 'org-date-from-calendar) | |
7921 (define-key org-mode-map "\C-c[" 'org-add-file) | |
7922 (define-key org-mode-map "\C-c]" 'org-remove-file) | |
7923 (define-key org-mode-map "\C-c\C-r" 'org-timeline) | |
7924 (define-key org-mode-map [(shift up)] 'org-shiftup) | |
7925 (define-key org-mode-map [(shift down)] 'org-shiftdown) | |
7926 (define-key org-mode-map [(shift left)] 'org-timestamp-down-day) | |
7927 (define-key org-mode-map [(shift right)] 'org-timestamp-up-day) | |
7928 (define-key org-mode-map "\C-c-" 'org-table-insert-hline) | |
7929 ;; The following line is e.g. necessary for German keyboards under Suse Linux | |
7930 (unless org-xemacs-p | |
7931 (define-key org-mode-map [S-iso-lefttab] 'org-shifttab)) | |
7932 (define-key org-mode-map [(shift tab)] 'org-shifttab) | |
7933 (define-key org-mode-map "\C-c\C-c" 'org-ctrl-c-ctrl-c) | |
7934 (define-key org-mode-map [(return)] 'org-return) | |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7935 (define-key org-mode-map [(shift return)] 'org-table-copy-down) |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
7936 (define-key org-mode-map [(meta return)] 'org-meta-return) |
58792 | 7937 (define-key org-mode-map [(control up)] 'org-move-line-up) |
7938 (define-key org-mode-map [(control down)] 'org-move-line-down) | |
7939 (define-key org-mode-map "\C-c?" 'org-table-current-column) | |
7940 (define-key org-mode-map "\C-c " 'org-table-blank-field) | |
7941 (define-key org-mode-map "\C-c+" 'org-table-sum) | |
7942 (define-key org-mode-map "\C-c|" 'org-table-toggle-vline-visibility) | |
7943 (define-key org-mode-map "\C-c=" 'org-table-eval-formula) | |
7944 (define-key org-mode-map "\C-c#" 'org-table-create-with-table.el) | |
7945 (define-key org-mode-map "\C-c\C-q" 'org-table-wrap-region) | |
7946 (define-key org-mode-map "\C-c\C-xa" 'org-export-as-ascii) | |
7947 (define-key org-mode-map "\C-c\C-x\C-a" 'org-export-as-ascii) | |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7948 (define-key org-mode-map "\C-c\C-xv" 'org-export-copy-visible) |
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7949 (define-key org-mode-map "\C-c\C-x\C-v" 'org-export-copy-visible) |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
7950 ;(define-key org-mode-map "\C-c\C-xo" 'org-export-as-opml) |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
7951 ;(define-key org-mode-map "\C-c\C-x\C-o" 'org-export-as-opml) |
58792 | 7952 (define-key org-mode-map "\C-c\C-xt" 'org-insert-export-options-template) |
7953 (define-key org-mode-map "\C-c:" 'org-toggle-fixed-width-section) | |
7954 (define-key org-mode-map "\C-c\C-xh" 'org-export-as-html) | |
7955 (define-key org-mode-map "\C-c\C-x\C-h" 'org-export-as-html-and-open) | |
7956 | |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
7957 |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
7958 ;; FIXME: Do we really need to save match data in these commands? |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
7959 ;; I would like to remove it in order to minimize impact. |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7960 ;; Self-insert already does not preserve it. How much resources used by this??? |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
7961 |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
7962 (defsubst org-table-p () |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
7963 (if (and (eq major-mode 'org-mode) font-lock-mode) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
7964 (eq (get-text-property (point) 'face) 'org-table-face) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
7965 (save-match-data (org-at-table-p)))) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
7966 |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
7967 (defun org-self-insert-command (N) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
7968 "Like `self-insert-command', use overwrite-mode for whitespace in tables. |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
7969 If the cursor is in a table looking at whitespace, the whitespace is |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
7970 overwritten, and the table is not marked as requiring realignment." |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
7971 (interactive "p") |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
7972 (if (and (org-table-p) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
7973 (eq N 1) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
7974 (looking-at "[^|\n]* +|")) |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
7975 (let (org-table-may-need-update) |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
7976 (goto-char (1- (match-end 0))) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
7977 (delete-backward-char 1) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
7978 (goto-char (match-beginning 0)) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
7979 (self-insert-command N)) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
7980 (setq org-table-may-need-update t) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
7981 (self-insert-command N))) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
7982 |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
7983 ;; FIXME: |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
7984 ;; The following two functions might still be optimized to trigger |
61134
ac45ed541a16
* org.el (org-agenda-phases-of-moon, org-agenda-sunrise-sunset)
Carsten Dominik <dominik@science.uva.nl>
parents:
60918
diff
changeset
|
7985 ;; re-alignment less frequently. |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
7986 |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
7987 (defun org-delete-backward-char (N) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
7988 "Like `delete-backward-char', insert whitespace at field end in tables. |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
7989 When deleting backwards, in tables this function will insert whitespace in |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
7990 front of the next \"|\" separator, to keep the table aligned. The table will |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
7991 still be marked for re-alignment, because a narrow field may lead to a |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
7992 reduced column width." |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
7993 (interactive "p") |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
7994 (if (and (org-table-p) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
7995 (eq N 1) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
7996 (looking-at ".*?|")) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
7997 (let ((pos (point))) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
7998 (backward-delete-char N) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
7999 (skip-chars-forward "^|") |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
8000 (insert " ") |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
8001 (goto-char (1- pos))) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
8002 (backward-delete-char N))) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
8003 |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
8004 (defun org-delete-char (N) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
8005 "Like `delete-char', but insert whitespace at field end in tables. |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
8006 When deleting characters, in tables this function will insert whitespace in |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
8007 front of the next \"|\" separator, to keep the table aligned. The table |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
8008 will still be marked for re-alignment, because a narrow field may lead to |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
8009 a reduced column width." |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
8010 (interactive "p") |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
8011 (if (and (org-table-p) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
8012 (eq N 1)) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
8013 (if (looking-at ".*?|") |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
8014 (let ((pos (point))) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
8015 (replace-match (concat |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
8016 (substring (match-string 0) 1 -1) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
8017 " |")) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
8018 (goto-char pos))) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
8019 (delete-char N))) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
8020 |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
8021 ;; How to do this: Measure non-white length of current string |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
8022 ;; If equal to column width, we should realign. |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
8023 |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
8024 (when (eq org-enable-table-editor 'optimized) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
8025 ;; If the user wants maximum table support, we need to hijack |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
8026 ;; some standard editing functions |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
8027 (substitute-key-definition 'self-insert-command 'org-self-insert-command |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
8028 org-mode-map global-map) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
8029 (substitute-key-definition 'delete-char 'org-delete-char |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
8030 org-mode-map global-map) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
8031 (substitute-key-definition 'delete-backward-char 'org-delete-backward-char |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
8032 org-mode-map global-map) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
8033 (define-key org-mode-map "|" 'self-insert-command)) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
8034 |
58792 | 8035 (defun org-shiftcursor-error () |
8036 "Throw an error because Shift-Cursor command was applied in wrong context." | |
8037 (error "This command is only active in tables and on headlines.")) | |
8038 | |
8039 (defun org-shifttab () | |
8040 "Call `(org-cycle t)' or `org-table-previous-field'." | |
8041 (interactive) | |
8042 (cond | |
8043 ((org-at-table-p) (org-table-previous-field)) | |
8044 (t (org-cycle '(4))))) | |
8045 | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8046 (defun org-shiftmetaleft () |
58792 | 8047 "Call `org-promote-subtree' or `org-table-delete-column'." |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8048 (interactive) |
58792 | 8049 (cond |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8050 ((org-at-table-p) (org-table-delete-column)) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8051 ((org-on-heading-p) (org-promote-subtree)) |
58792 | 8052 (t (org-shiftcursor-error)))) |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8053 |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8054 (defun org-shiftmetaright () |
58792 | 8055 "Call `org-demote-subtree' or `org-table-insert-column'." |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8056 (interactive) |
58792 | 8057 (cond |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8058 ((org-at-table-p) (org-table-insert-column)) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8059 ((org-on-heading-p) (org-demote-subtree)) |
58792 | 8060 (t (org-shiftcursor-error)))) |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8061 |
58792 | 8062 (defun org-shiftmetaup (&optional arg) |
8063 "Call `org-move-subtree-up' or `org-table-kill-row'." | |
8064 (interactive "P") | |
8065 (cond | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8066 ((org-at-table-p) (org-table-kill-row)) |
58792 | 8067 ((org-on-heading-p) (org-move-subtree-up arg)) |
8068 (t (org-shiftcursor-error)))) | |
8069 (defun org-shiftmetadown (&optional arg) | |
8070 "Call `org-move-subtree-down' or `org-table-insert-row'." | |
8071 (interactive "P") | |
8072 (cond | |
8073 ((org-at-table-p) (org-table-insert-row arg)) | |
8074 ((org-on-heading-p) (org-move-subtree-down arg)) | |
8075 (t (org-shiftcursor-error)))) | |
8076 | |
8077 (defun org-metaleft (&optional arg) | |
8078 "Call `org-do-promote' or `org-table-move-column' to left." | |
8079 (interactive "P") | |
8080 (cond | |
8081 ((org-at-table-p) (org-table-move-column 'left)) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8082 ((or (org-on-heading-p) (org-region-active-p)) (org-do-promote)) |
58792 | 8083 (t (backward-word (prefix-numeric-value arg))))) |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8084 |
58792 | 8085 (defun org-metaright (&optional arg) |
8086 "Call `org-do-demote' or `org-table-move-column' to right." | |
8087 (interactive "P") | |
8088 (cond | |
8089 ((org-at-table-p) (org-table-move-column nil)) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8090 ((or (org-on-heading-p) (org-region-active-p)) (org-do-demote)) |
58792 | 8091 (t (forward-word (prefix-numeric-value arg))))) |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8092 |
58792 | 8093 (defun org-metaup (&optional arg) |
8094 "Call `org-move-subtree-up' or `org-table-move-row' up." | |
8095 (interactive "P") | |
8096 (cond | |
8097 ((org-at-table-p) (org-table-move-row 'up)) | |
8098 ((org-on-heading-p) (org-move-subtree-up arg)) | |
8099 (t (org-shiftcursor-error)))) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8100 |
58792 | 8101 (defun org-metadown (&optional arg) |
8102 "Call `org-move-subtree-down' or `org-table-move-row' down." | |
8103 (interactive "P") | |
8104 (cond | |
8105 ((org-at-table-p) (org-table-move-row nil)) | |
8106 ((org-on-heading-p) (org-move-subtree-down arg)) | |
8107 (t (org-shiftcursor-error)))) | |
8108 | |
8109 (defun org-shiftup (&optional arg) | |
8110 "Call `org-timestamp-up' or `org-priority-up'." | |
8111 (interactive "P") | |
8112 (cond | |
8113 ((org-at-timestamp-p) (org-timestamp-up arg)) | |
8114 (t (org-priority-up)))) | |
8115 | |
8116 (defun org-shiftdown (&optional arg) | |
8117 "Call `org-timestamp-down' or `org-priority-down'." | |
8118 (interactive "P") | |
8119 (cond | |
8120 ((org-at-timestamp-p) (org-timestamp-down arg)) | |
8121 (t (org-priority-down)))) | |
8122 | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8123 (defun org-copy-special () |
58792 | 8124 "Call either `org-table-copy' or `org-copy-subtree'." |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8125 (interactive) |
58792 | 8126 (if (org-at-table-p) |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8127 (org-table-copy-region) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8128 (org-copy-subtree))) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8129 |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8130 (defun org-cut-special () |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8131 "Call either `org-table-copy' or `org-cut-subtree'." |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8132 (interactive) |
58792 | 8133 (if (org-at-table-p) |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8134 (org-table-cut-region) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8135 (org-cut-subtree))) |
58792 | 8136 |
8137 (defun org-paste-special (arg) | |
8138 "Call either `org-table-paste-rectangle' or `org-paste-subtree'." | |
8139 (interactive "P") | |
8140 (if (org-at-table-p) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8141 (org-table-paste-rectangle) |
58792 | 8142 (org-paste-subtree arg))) |
8143 | |
8144 (defun org-ctrl-c-ctrl-c (&optional arg) | |
8145 "Call realign table, or recognize a table.el table. | |
8146 When the cursor is inside a table created by the table.el package, | |
8147 activate that table. Otherwise, if the cursor is at a normal table | |
8148 created with org.el, re-align that table. This command works even if | |
8149 the automatic table editor has been turned off." | |
8150 (interactive "P") | |
8151 (let ((org-enable-table-editor t)) | |
8152 (cond | |
8153 ((org-at-table.el-p) | |
8154 (require 'table) | |
8155 (beginning-of-line 1) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8156 (re-search-forward "|" (save-excursion (end-of-line 2) (point))) ;FIXME: line-end-position? |
58792 | 8157 (table-recognize-table)) |
8158 ((org-at-table-p) | |
8159 (org-table-align)) | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
8160 ((save-excursion (beginning-of-line 1) (looking-at "#\\+[A-Z]+")) |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8161 (let ((org-inhibit-startup t)) (org-mode))) |
58792 | 8162 ((org-region-active-p) |
8163 (org-table-convert-region (region-beginning) (region-end) arg)) | |
8164 ((and (region-beginning) (region-end)) | |
8165 (if (y-or-n-p "Convert inactive region to table? ") | |
8166 (org-table-convert-region (region-beginning) (region-end) arg) | |
8167 (error "Abort"))) | |
8168 (t (error "No table at point, and no region to make one."))))) | |
8169 | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8170 (defun org-return () |
58792 | 8171 "Call `org-table-next-row' or `newline'." |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8172 (interactive) |
58792 | 8173 (cond |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
8174 ((org-at-table-p) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
8175 (org-table-justify-field-maybe) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
8176 (org-table-next-row)) |
58792 | 8177 (t (newline)))) |
8178 | |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
8179 (defun org-meta-return (&optional arg) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
8180 "Call `org-insert-heading' or `org-table-wrap-region'." |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
8181 (interactive "P") |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
8182 (cond |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
8183 ((org-at-table-p) |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
8184 (org-table-wrap-region arg)) |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8185 (t (org-insert-heading)))) |
58792 | 8186 |
8187 ;;; Menu entries | |
8188 | |
8189 ;; First, remove the outline menus. | |
8190 (if org-xemacs-p | |
8191 (add-hook 'org-mode-hook | |
8192 (lambda () | |
8193 (delete-menu-item '("Headings")) | |
8194 (delete-menu-item '("Show")) | |
8195 (delete-menu-item '("Hide")) | |
8196 (set-menubar-dirty-flag))) | |
8197 (setq org-mode-map (delq (assoc 'menu-bar (cdr org-mode-map)) | |
8198 org-mode-map))) | |
8199 | |
8200 ;; Define the Org-mode menus | |
8201 (easy-menu-define org-org-menu org-mode-map "Org menu" | |
8202 '("Org" | |
8203 ["Cycle Visibility" org-cycle (or (bobp) (outline-on-heading-p))] | |
8204 ["Sparse Tree" org-occur t] | |
8205 ["Show All" show-all t] | |
8206 "--" | |
8207 ["New Heading" org-insert-heading t] | |
8208 ("Navigate Headings" | |
8209 ["Up" outline-up-heading t] | |
8210 ["Next" outline-next-visible-heading t] | |
8211 ["Previous" outline-previous-visible-heading t] | |
8212 ["Next Same Level" outline-forward-same-level t] | |
8213 ["Previous Same Level" outline-backward-same-level t] | |
8214 "--" | |
8215 ["Jump" org-goto t]) | |
8216 ("Edit Structure" | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
8217 ["Move Subtree Up" org-shiftmetaup (not (org-at-table-p))] |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
8218 ["Move Subtree Down" org-shiftmetadown (not (org-at-table-p))] |
58792 | 8219 "--" |
8220 ["Copy Subtree" org-copy-special (not (org-at-table-p))] | |
8221 ["Cut Subtree" org-cut-special (not (org-at-table-p))] | |
8222 ["Paste Subtree" org-paste-special (not (org-at-table-p))] | |
8223 "--" | |
8224 ["Promote Heading" org-metaleft (not (org-at-table-p))] | |
8225 ["Promote Subtree" org-shiftmetaleft (not (org-at-table-p))] | |
8226 ["Demote Heading" org-metaright (not (org-at-table-p))] | |
8227 ["Demote Subtree" org-shiftmetaright (not (org-at-table-p))]) | |
8228 "--" | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
8229 ("TODO Lists" |
58792 | 8230 ["TODO/DONE/-" org-todo t] |
8231 ["Show TODO Tree" org-show-todo-tree t] | |
8232 "--" | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
8233 ["Set Priority" org-priority t] |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
8234 ["Priority Up" org-shiftup t] |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
8235 ["Priority Down" org-shiftdown t]) |
58792 | 8236 ("Dates and Scheduling" |
8237 ["Timestamp" org-time-stamp t] | |
8238 ("Change Date" | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
8239 ["1 Day Later" org-timestamp-up-day t] |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
8240 ["1 Day Earlier" org-timestamp-down-day t] |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
8241 ["1 ... Later" org-shiftup t] |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
8242 ["1 ... Earlier" org-shiftdown t]) |
58792 | 8243 ["Compute Time Range" org-evaluate-time-range t] |
8244 ["Schedule Item" org-schedule t] | |
8245 ["Deadline" org-deadline t] | |
8246 "--" | |
8247 ["Goto Calendar" org-goto-calendar t] | |
8248 ["Date from Calendar" org-date-from-calendar t]) | |
8249 "--" | |
8250 ("Timeline/Agenda" | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
8251 ["Show TODO Tree this File" org-show-todo-tree t] |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
8252 ["Check Deadlines this File" org-check-deadlines t] |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
8253 ["Timeline Current File" org-timeline t] |
58792 | 8254 "--" |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
8255 ["Agenda" org-agenda t]) |
58792 | 8256 ("File List for Agenda") |
8257 "--" | |
8258 ("Hyperlinks" | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
8259 ["Store Link (Global)" org-store-link t] |
58792 | 8260 ["Insert Link" org-insert-link t] |
8261 ["Follow Link" org-open-at-point t]) | |
8262 "--" | |
8263 ("Table" | |
8264 ["Align" org-ctrl-c-ctrl-c (org-at-table-p)] | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
8265 ["Next Field" org-cycle (org-at-table-p)] |
58792 | 8266 ["Previous Field" org-shifttab (org-at-table-p)] |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
8267 ["Next Row" org-return (org-at-table-p)] |
58792 | 8268 "--" |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
8269 ["Blank Field" org-table-blank-field (org-at-table-p)] |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
8270 ["Copy Field from Above" org-table-copy-down (org-at-table-p)] |
58792 | 8271 "--" |
8272 ("Column" | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
8273 ["Move Column Left" org-metaleft (org-at-table-p)] |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
8274 ["Move Column Right" org-metaright (org-at-table-p)] |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
8275 ["Delete Column" org-shiftmetaleft (org-at-table-p)] |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
8276 ["Insert Column" org-shiftmetaright (org-at-table-p)]) |
58792 | 8277 ("Row" |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
8278 ["Move Row Up" org-metaup (org-at-table-p)] |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
8279 ["Move Row Down" org-metadown (org-at-table-p)] |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
8280 ["Delete Row" org-shiftmetaup (org-at-table-p)] |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
8281 ["Insert Row" org-shiftmetadown (org-at-table-p)] |
58792 | 8282 "--" |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
8283 ["Insert Hline" org-table-insert-hline (org-at-table-p)]) |
58792 | 8284 ("Rectangle" |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
8285 ["Copy Rectangle" org-copy-special (org-at-table-p)] |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
8286 ["Cut Rectangle" org-cut-special (org-at-table-p)] |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
8287 ["Paste Rectangle" org-paste-special (org-at-table-p)] |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
8288 ["Fill Rectangle" org-table-wrap-region (org-at-table-p)]) |
58792 | 8289 "--" |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
8290 ["Which Column?" org-table-current-column (org-at-table-p)] |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
8291 ["Sum Column/Rectangle" org-table-sum |
58792 | 8292 (or (org-at-table-p) (org-region-active-p))] |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
8293 ["Eval Formula" org-table-eval-formula (org-at-table-p)] |
58792 | 8294 "--" |
8295 ["Invisible Vlines" org-table-toggle-vline-visibility | |
8296 :style toggle :selected (org-in-invisibility-spec-p '(org-table))] | |
8297 "--" | |
8298 ["Create" org-table-create (and (not (org-at-table-p)) | |
8299 org-enable-table-editor)] | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
8300 ["Convert Region" org-ctrl-c-ctrl-c (not (org-at-table-p 'any))] |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
8301 ["Import from File" org-table-import (not (org-at-table-p))] |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
8302 ["Export to File" org-table-export (org-at-table-p)] |
58792 | 8303 "--" |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
8304 ["Create/Convert from/to table.el" org-table-create-with-table.el t]) |
58792 | 8305 "--" |
8306 ("Export" | |
8307 ["ASCII" org-export-as-ascii t] | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
8308 ["Extract Visible Text" org-export-copy-visible t] |
58792 | 8309 ["HTML" org-export-as-html t] |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
8310 ["HTML and Open" org-export-as-html-and-open t] |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
8311 ; ["OPML" org-export-as-opml nil] |
58792 | 8312 "--" |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
8313 ["Option Template" org-insert-export-options-template t] |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
8314 ["Toggle Fixed Width" org-toggle-fixed-width-section t]) |
58792 | 8315 "--" |
8316 ("Documentation" | |
8317 ["Show Version" org-version t] | |
8318 ["Info Documentation" org-info t]) | |
8319 ("Customize" | |
8320 ["Browse Org Group" org-customize t] | |
8321 "--" | |
8322 ["Build Full Customize Menu" org-create-customize-menu | |
8323 (fboundp 'customize-menu-create)]) | |
8324 )) | |
8325 | |
8326 (defun org-info (&optional node) | |
8327 "Read documentation for Org-mode in the info system. | |
8328 With optional NODE, go directly to that node." | |
8329 (interactive) | |
8330 (require 'info) | |
8331 (Info-goto-node (format "(org)%s" (or node "")))) | |
8332 | |
8333 (defun org-install-agenda-files-menu () | |
8334 (easy-menu-change | |
8335 '("Org") "File List for Agenda" | |
8336 (append | |
8337 (list | |
61560
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
8338 ["Edit File List" (customize-variable 'org-agenda-files) t] |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
8339 ["Add Current File to List" org-add-file t] |
a54fc673c31c
(org-agenda-date-prompt): Renamed from
Carsten Dominik <dominik@science.uva.nl>
parents:
61312
diff
changeset
|
8340 ["Remove Current File from List" org-remove-file t] |
58792 | 8341 "--") |
8342 (mapcar 'org-file-menu-entry org-agenda-files)))) | |
8343 | |
8344 ;;; Documentation | |
8345 | |
8346 (defun org-customize () | |
8347 "Call the customize function with org as argument." | |
8348 (interactive) | |
8349 (customize-browse 'org)) | |
8350 | |
8351 (defun org-create-customize-menu () | |
8352 "Create a full customization menu for Org-mode, insert it into the menu." | |
8353 (interactive) | |
8354 (if (fboundp 'customize-menu-create) | |
8355 (progn | |
8356 (easy-menu-change | |
8357 '("Org") "Customize" | |
8358 `(["Browse Org group" org-customize t] | |
8359 "--" | |
8360 ,(customize-menu-create 'org) | |
8361 ["Set" Custom-set t] | |
8362 ["Save" Custom-save t] | |
8363 ["Reset to Current" Custom-reset-current t] | |
8364 ["Reset to Saved" Custom-reset-saved t] | |
8365 ["Reset to Standard Settings" Custom-reset-standard t])) | |
8366 (message "\"Org\"-menu now contains full customization menu")) | |
8367 (error "Cannot expand menu (outdated version of cus-edit.el)"))) | |
8368 | |
8369 ;;; Miscellaneous stuff | |
8370 | |
8371 (defun org-move-line-down (arg) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8372 "Move the current line down. With prefix argument, move it past ARG lines." |
58792 | 8373 (interactive "p") |
8374 (let ((col (current-column)) | |
8375 beg end pos) | |
8376 (beginning-of-line 1) (setq beg (point)) | |
8377 (beginning-of-line 2) (setq end (point)) | |
8378 (beginning-of-line (+ 1 arg)) | |
8379 (setq pos (move-marker (make-marker) (point))) | |
8380 (insert (delete-and-extract-region beg end)) | |
8381 (goto-char pos) | |
8382 (move-to-column col))) | |
8383 | |
8384 (defun org-move-line-up (arg) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8385 "Move the current line up. With prefix argument, move it past ARG lines." |
58792 | 8386 (interactive "p") |
8387 (let ((col (current-column)) | |
8388 beg end pos) | |
8389 (beginning-of-line 1) (setq beg (point)) | |
8390 (beginning-of-line 2) (setq end (point)) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8391 (beginning-of-line (- arg)) |
58792 | 8392 (setq pos (move-marker (make-marker) (point))) |
8393 (insert (delete-and-extract-region beg end)) | |
8394 (goto-char pos) | |
8395 (move-to-column col))) | |
8396 | |
8397 ;; Functions needed for Emacs/XEmacs region compatibility | |
8398 | |
8399 (defun org-region-active-p () | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8400 "Is `transient-mark-mode' on and the region active? |
58792 | 8401 Works on both Emacs and XEmacs." |
8402 (if org-ignore-region | |
8403 nil | |
8404 (if org-xemacs-p | |
8405 (and zmacs-regions (region-active-p)) | |
8406 (and transient-mark-mode mark-active)))) | |
8407 | |
8408 (defun org-add-to-invisibility-spec (arg) | |
8409 "Add elements to `buffer-invisibility-spec'. | |
8410 See documentation for `buffer-invisibility-spec' for the kind of elements | |
8411 that can be added." | |
8412 (cond | |
8413 ((fboundp 'add-to-invisibility-spec) | |
8414 (add-to-invisibility-spec arg)) | |
8415 ((or (null buffer-invisibility-spec) (eq buffer-invisibility-spec t)) | |
8416 (setq buffer-invisibility-spec (list arg))) | |
8417 (t | |
8418 (setq buffer-invisibility-spec | |
8419 (cons arg buffer-invisibility-spec))))) | |
8420 | |
8421 (defun org-remove-from-invisibility-spec (arg) | |
8422 "Remove elements from `buffer-invisibility-spec'." | |
8423 (if (fboundp 'remove-from-invisibility-spec) | |
8424 (remove-from-invisibility-spec arg) | |
8425 (if (consp buffer-invisibility-spec) | |
8426 (setq buffer-invisibility-spec | |
8427 (delete arg buffer-invisibility-spec))))) | |
8428 | |
8429 (defun org-in-invisibility-spec-p (arg) | |
8430 "Is ARG a member of `buffer-invisibility-spec'?." | |
8431 (if (consp buffer-invisibility-spec) | |
8432 (member arg buffer-invisibility-spec) | |
8433 nil)) | |
8434 | |
8435 (defun org-image-file-name-regexp () | |
8436 "Return regexp matching the file names of images." | |
8437 (if (fboundp 'image-file-name-regexp) | |
8438 (image-file-name-regexp) | |
8439 (let ((image-file-name-extensions | |
8440 '("png" "jpeg" "jpg" "gif" "tiff" "tif" | |
8441 "xbm" "xpm" "pbm" "pgm" "ppm"))) | |
8442 (concat "\\." | |
8443 (regexp-opt (nconc (mapcar 'upcase | |
8444 image-file-name-extensions) | |
8445 image-file-name-extensions) | |
8446 t) | |
8447 "\\'")))) | |
8448 | |
8449 ;; Functions needed for compatibility with old outline.el | |
8450 | |
8451 ;; The following functions capture almost the entire compatibility code | |
8452 ;; between the different versions of outline-mode. The only other place | |
8453 ;; where this is important are the font-lock-keywords. Search for | |
8454 ;; `org-noutline-p' to find it. | |
8455 | |
8456 ;; C-a should go to the beginning of a *visible* line, also in the | |
8457 ;; new outline.el. I guess this should be patched into Emacs? | |
8458 (defun org-beginning-of-line () | |
8459 "Go to the beginning of the current line. If that is invisible, continue | |
8460 to a visible line beginning. This makes the function of C-a more intuitive." | |
8461 (interactive) | |
8462 (beginning-of-line 1) | |
8463 (if (bobp) | |
8464 nil | |
8465 (backward-char 1) | |
8466 (if (org-invisible-p) | |
8467 (while (and (not (bobp)) (org-invisible-p)) | |
8468 (backward-char 1) | |
8469 (beginning-of-line 1)) | |
8470 (forward-char 1)))) | |
8471 (when org-noutline-p | |
8472 (define-key org-mode-map "\C-a" 'org-beginning-of-line)) | |
8473 | |
8474 (defun org-invisible-p () | |
8475 "Check if point is at a character currently not visible." | |
8476 (if org-noutline-p | |
8477 ;; Early versions of noutline don't have `outline-invisible-p'. | |
8478 (if (fboundp 'outline-invisible-p) | |
8479 (outline-invisible-p) | |
8480 (get-char-property (point) 'invisible)) | |
8481 (save-excursion | |
8482 (skip-chars-backward "^\r\n") | |
8483 (if (bobp) | |
8484 nil | |
8485 (equal (char-before) ?\r))))) | |
8486 | |
8487 (defun org-back-to-heading (&optional invisible-ok) | |
8488 "Move to previous heading line, or beg of this line if it's a heading. | |
8489 Only visible heading lines are considered, unless INVISIBLE-OK is non-nil." | |
8490 (if org-noutline-p | |
8491 (outline-back-to-heading invisible-ok) | |
8492 (if (looking-at outline-regexp) | |
8493 t | |
8494 (if (re-search-backward (concat (if invisible-ok "[\r\n]" "^") | |
8495 outline-regexp) | |
8496 nil t) | |
8497 (if invisible-ok | |
8498 (progn (forward-char 1) | |
8499 (looking-at outline-regexp))) | |
8500 (error "Before first heading"))))) | |
8501 | |
8502 (defun org-on-heading-p (&optional invisible-ok) | |
8503 "Return t if point is on a (visible) heading line. | |
8504 If INVISIBLE-OK is non-nil, an invisible heading line is ok too." | |
8505 (if org-noutline-p | |
8506 (outline-on-heading-p 'invisible-ok) | |
8507 (save-excursion | |
8508 (skip-chars-backward "^\n\r") | |
8509 (and (looking-at outline-regexp) | |
8510 (or invisible-ok | |
8511 (bobp) | |
8512 (equal (char-before) ?\n)))))) | |
8513 | |
8514 (defun org-up-heading-all (arg) | |
8515 "Move to the heading line of which the present line is a subheading. | |
8516 This function considers both visible and invisible heading lines. | |
8517 With argument, move up ARG levels." | |
8518 (if org-noutline-p | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8519 (if (fboundp 'outline-up-heading-all) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8520 (outline-up-heading-all arg) ; emacs 21 version of outline.el |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8521 (outline-up-heading arg t)) ; emacs 22 version of outline.el |
58792 | 8522 (org-back-to-heading t) |
8523 (looking-at outline-regexp) | |
8524 (if (<= (- (match-end 0) (match-beginning 0)) arg) | |
8525 (error "Cannot move up %d levels" arg) | |
8526 (re-search-backward | |
8527 (concat "[\n\r]" (regexp-quote | |
8528 (make-string (- (match-end 0) (match-beginning 0) arg) | |
8529 ?*)) | |
8530 "[^*]")) | |
8531 (forward-char 1)))) | |
8532 | |
8533 (defun org-show-hidden-entry () | |
8534 "Show an entry where even the heading is hidden." | |
8535 (save-excursion | |
8536 (if (not org-noutline-p) | |
8537 (progn | |
8538 (org-back-to-heading t) | |
8539 (org-flag-heading nil))) | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8540 (org-show-entry))) |
58792 | 8541 |
8542 (defun org-check-occur-regexp (regexp) | |
8543 "If REGEXP starts with \"^\", modify it to check for \\r as well. | |
8544 Of course, only for the old outline mode." | |
8545 (if org-noutline-p | |
8546 regexp | |
8547 (if (string-match "^\\^" regexp) | |
8548 (concat "[\n\r]" (substring regexp 1)) | |
8549 regexp))) | |
8550 | |
8551 (defun org-flag-heading (flag &optional entry) | |
62076
4f2150e05f24
(org-get-entries-from-diary): Remove unused vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61924
diff
changeset
|
8552 "Flag the current heading. FLAG non-nil means make invisible. |
58792 | 8553 When ENTRY is non-nil, show the entire entry." |
8554 (save-excursion | |
8555 (org-back-to-heading t) | |
8556 (if (not org-noutline-p) | |
8557 ;; Make the current headline visible | |
8558 (outline-flag-region (max 1 (1- (point))) (point) (if flag ?\r ?\n))) | |
8559 ;; Check if we should show the entire entry | |
8560 (if entry | |
8561 (progn | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8562 (org-show-entry) |
58792 | 8563 (save-excursion ;; FIXME: Is this the fix for points in the -| |
8564 ;; middle of text? | | |
8565 (and (outline-next-heading) ;; | | |
8566 (org-flag-heading nil)))) ; show the next heading _| | |
8567 (outline-flag-region (max 1 (1- (point))) | |
8568 (save-excursion (outline-end-of-heading) (point)) | |
8569 (if org-noutline-p | |
8570 flag | |
8571 (if flag ?\r ?\n)))))) | |
8572 | |
61924
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8573 (defun org-show-subtree () |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8574 "Show everything after this heading at deeper levels." |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8575 (outline-flag-region |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8576 (point) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8577 (save-excursion |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8578 (outline-end-of-subtree) (outline-next-heading) (point)) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8579 (if org-noutline-p nil ?\n))) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8580 |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8581 (defun org-show-entry () |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8582 "Show the body directly following this heading. |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8583 Show the heading too, if it is currently invisible." |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8584 (interactive) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8585 (save-excursion |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8586 (org-back-to-heading t) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8587 (outline-flag-region |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8588 (1- (point)) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8589 (save-excursion |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8590 (re-search-forward (concat "[\r\n]\\(" outline-regexp "\\)") nil 'move) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8591 (or (match-beginning 1) (point-max))) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8592 (if org-noutline-p nil ?\n)))) |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8593 |
d29accb0274a
Many small changes to keep the byte compiler happy. Furthermore:
Carsten Dominik <dominik@science.uva.nl>
parents:
61582
diff
changeset
|
8594 |
58792 | 8595 (defun org-make-options-regexp (kwds) |
8596 "Make a regular expression for keyword lines." | |
8597 (concat | |
8598 (if org-noutline-p "^" "[\n\r]") | |
8599 "#?[ \t]*\\+\\(" | |
8600 (mapconcat 'regexp-quote kwds "\\|") | |
8601 "\\):[ \t]*" | |
8602 (if org-noutline-p "\\(.+\\)" "\\([^\n\r]+\\)"))) | |
8603 | |
8604 ;; Advise the bookmark-jump function to make jump position visible | |
8605 ;; Wrapped into eval-after-load to avoid loading advice unnecessarily | |
8606 (eval-after-load "bookmark" | |
8607 '(defadvice bookmark-jump (after org-make-visible activate) | |
8608 "Make the position visible." | |
8609 (and (eq major-mode 'org-mode) | |
8610 (org-invisible-p) | |
8611 (org-show-hierarchy-above)))) | |
8612 | |
8613 ;;; Finish up | |
8614 | |
8615 (provide 'org) | |
8616 | |
8617 (run-hooks 'org-load-hook) | |
8618 | |
59539
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
8619 ;; arch-tag: e77da1a7-acc7-4336-b19e-efa25af3f9fd |
998101ef8562
2005-01-14 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
58841
diff
changeset
|
8620 |
58792 | 8621 ;;; org.el ends here |
8622 |