comparison lisp/org/org-list.el @ 100267:c851df8e004e

2008-12-07 Carsten Dominik <carsten.dominik@gmail.com> * org-id.el (org-id-locations-file): Wrap file name with `convert-standard-filename'. (org-id-files): New variable. (org-id-use-hash): New option. (org-id-update-id-locations): Also search in all files current listed in `org-id-files'. Convert the resulting alist to a hash if the user customation says so. (org-id-locations-save): Handle he case if `org-id-locations' is a hash. (org-id-locations-load): Convert the alist to a hash. (org-id-add-location): Handle the hast case. (kill-emacs-hook): Make sure id locations are saved when Emacs is exited. (org-id-hash-to-alist, org-id-alist-to-hash) (org-id-paste-tracker): New functions. 2008-12-07 Carsten Dominik <carsten.dominik@gmail.com> * org-agenda.el (org-agenda-goto-calendar): Remove duplicate let bindings of calendar variables. * org-table.el (org-table-find-row-type): Renamed from `org-find-row-type'. (org-table-rewrite-old-row-references): Renamed from `org-rewrite-old-row-references'. (org-table-shift-refpart): Renamed from `org-shift-refpart'. (org-table-cleanup-narrow-column-properties): Renamed from `org-cleanup-narrow-column-properties'. 2008-12-07 Carsten Dominik <carsten.dominik@gmail.com> * org-table.el (org-find-row-type): New arguments DESC and CLINE, for better error messages. (org-table-get-descriptor-line): Supply the new arguments to `org-find-row-type'. (org-table-error-on-row-ref-crossing-hline): New option. * org.el (org-target-link-regexp): Make buffer-local. (org-move-subtree-down): Fix bug with trees at beginning of buffer. 2008-12-07 Carsten Dominik <carsten.dominik@gmail.com> * org-faces.el (org-set-tag-faces): New function. (org-tags-special-faces-re): New variable. * org.el (org-font-lock-add-tag-faces, org-get-tag-face): New functions. * org-faces.el (org-tag-faces): New option. (org-tag): Mention `org-tag-faces' in the docstring. 2008-12-07 Carsten Dominik <carsten.dominik@gmail.com> * org-exp.el (org-export-html-style-default): Implement new quoting. * org-jsinfo.el (org-infojs-template): Implement new quoting. * org-w3m.el (w3m-minor-mode-hook): Also add the special copy command to the `w3m-minor-mode-map'. * org-archive.el (org-archive-to-archive-sibling): Protect `this-command' to avoid appending kills during archiving. * org-exp.el (org-export-with-priority): New variable. (org-export-add-options-to-plist): Use `org-export-plist-vars' instead of internal list of strings and properties. (org-print-icalendar-entries): Retrieve the location property with inheritance. 2008-12-07 Carsten Dominik <carsten.dominik@gmail.com> * org-exp.el (org-export-with-todo-keywords): New option. (org-export-plist-vars): Include also the keys for the #+OPTIONS line. (org-default-export-plist, org-export-add-options-to-plist) (org-export-as-ascii, org-export-as-html): Use the new structure of `org-export-plist-vars'. * org.el (org-map-entries): Return all values. 2008-12-07 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-matcher-time): Recognize more special values. * org-gnus.el (fboundp): Fix defvaralias for XEmacs. 2008-12-07 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-tags-exclude-from-inheritance): New option. (org-tag-inherit-p, org-remove-uniherited-tags): Respect `org-tags-exclude-from-inheritance'. * org-agenda.el (org-agenda-show-inherited-tags): New option. (org-format-agenda-item): Add inherited tags to the agenda line string, and make sure that properties are kept when downcasing the tags list. (org-agenda-add-inherited-tags): New function. (org-downcase-keep-props): New function. * org.el (org-scan-tags): Mark inherited tags with a text property. (org-get-tags-at): Mark inherited tags with a text property. (org-add-prop-inherited): New function. * org-agenda.el (org-agenda-add-inherited-tags): New function. (org-agenda-show-inherited-tags): New option. 2008-12-07 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-modules): Add org-w3m to the default modules. * org-table.el (orgtbl-self-insert-command): Make S-SPC work in orgtbl-mode. (orgtabl-create-or-convert-from-region): New command. * org-exp.el (org-export-as-ascii): Remove the handling of targets. (org-export-ascii-preprocess): Handle targets already in this function. 2008-12-07 Carsten Dominik <carsten.dominik@gmail.com> * org-timer.el (org-timer-start-time): Define this variable. (org-timer-item): Make argument optional. * org-list.el (org-insert-item): Automatically insert a timer item if the current list is a timer list. * org-timer.el: New file. * org-publish.el (org-publish-org-index): Only exclude the index file in the main directory from being added to the site-map. (org-publish-get-project-from-filename): If the current project is a component, start publishing from the parent project. 2008-12-07 Carsten Dominik <carsten.dominik@gmail.com> * org-table.el (orgtbl-ret): Fix RET at beginning-of-buffer. * org-publish.el (org-publish-org-index): Improve removal of temporary buffers.
author Carsten Dominik <dominik@science.uva.nl>
date Sun, 07 Dec 2008 18:36:02 +0000
parents 57447f70a253
children cea079b68b76
comparison
equal deleted inserted replaced
100266:d74ef243141c 100267:c851df8e004e
4 ;; 4 ;;
5 ;; Author: Carsten Dominik <carsten at orgmode dot org> 5 ;; Author: Carsten Dominik <carsten at orgmode dot org>
6 ;; Bastien Guerry <bzg AT altern DOT org> 6 ;; Bastien Guerry <bzg AT altern DOT org>
7 ;; Keywords: outlines, hypermedia, calendar, wp 7 ;; Keywords: outlines, hypermedia, calendar, wp
8 ;; Homepage: http://orgmode.org 8 ;; Homepage: http://orgmode.org
9 ;; Version: 6.13a 9 ;; Version: 6.14
10 ;; 10 ;;
11 ;; This file is part of GNU Emacs. 11 ;; This file is part of GNU Emacs.
12 ;; 12 ;;
13 ;; GNU Emacs is free software: you can redistribute it and/or modify 13 ;; GNU Emacs is free software: you can redistribute it and/or modify
14 ;; it under the terms of the GNU General Public License as published by 14 ;; it under the terms of the GNU General Public License as published by
43 (declare-function org-back-to-heading "org" (&optional invisible-ok)) 43 (declare-function org-back-to-heading "org" (&optional invisible-ok))
44 (declare-function org-back-over-empty-lines "org" ()) 44 (declare-function org-back-over-empty-lines "org" ())
45 (declare-function org-skip-whitespace "org" ()) 45 (declare-function org-skip-whitespace "org" ())
46 (declare-function org-trim "org" (s)) 46 (declare-function org-trim "org" (s))
47 (declare-function org-get-indentation "org" (&optional line)) 47 (declare-function org-get-indentation "org" (&optional line))
48 (declare-function org-timer-item "org-timer" (&optional arg))
48 49
49 (defgroup org-plain-lists nil 50 (defgroup org-plain-lists nil
50 "Options concerning plain lists in Org-mode." 51 "Options concerning plain lists in Org-mode."
51 :tag "Org Plain lists" 52 :tag "Org Plain lists"
52 :group 'org-structure) 53 :group 'org-structure)
183 (error nil))) 184 (error nil)))
184 (let* ((bul (match-string 0)) 185 (let* ((bul (match-string 0))
185 (descp (save-excursion (goto-char (match-beginning 0)) 186 (descp (save-excursion (goto-char (match-beginning 0))
186 (beginning-of-line 1) 187 (beginning-of-line 1)
187 (save-match-data 188 (save-match-data
188 (looking-at "[ \t]*.*? ::")))) 189 (and (looking-at "[ \t]*\\(.*?\\) ::")
190 (match-string 1)))))
191 (timerp (and descp
192 (save-match-data
193 (string-match "^[-+*][ \t]+[0-9]+:[0-9]+:[0-9]+$"
194 descp))))
189 (eow (save-excursion (beginning-of-line 1) (looking-at "[ \t]*") 195 (eow (save-excursion (beginning-of-line 1) (looking-at "[ \t]*")
190 (match-end 0))) 196 (match-end 0)))
191 (blank (cdr (assq 'plain-list-item org-blank-before-new-entry))) 197 (blank (cdr (assq 'plain-list-item org-blank-before-new-entry)))
192 pos) 198 pos)
193 (if descp (setq checkbox nil)) 199 (if descp (setq checkbox nil))
194 (cond 200 (if timerp
195 ((and (org-at-item-p) (<= (point) eow)) 201 (progn (org-timer-item) t)
196 ;; before the bullet 202 (cond
197 (beginning-of-line 1) 203 ((and (org-at-item-p) (<= (point) eow))
198 (open-line (if blank 2 1))) 204 ;; before the bullet
199 ((<= (point) eow) 205 (beginning-of-line 1)
200 (beginning-of-line 1)) 206 (open-line (if blank 2 1)))
201 (t 207 ((<= (point) eow)
202 (unless (org-get-alist-option org-M-RET-may-split-line 'item) 208 (beginning-of-line 1))
203 (end-of-line 1) 209 (t
204 (delete-horizontal-space)) 210 (unless (org-get-alist-option org-M-RET-may-split-line 'item)
205 (newline (if blank 2 1)))) 211 (end-of-line 1)
206 (insert bul 212 (delete-horizontal-space))
207 (if checkbox "[ ]" "") 213 (newline (if blank 2 1))))
208 (if descp (concat (if checkbox " " "") 214 (insert bul
209 (read-string "Term: ") " :: ") "")) 215 (if checkbox "[ ]" "")
210 (just-one-space) 216 (if descp (concat (if checkbox " " "")
211 (setq pos (point)) 217 (read-string "Term: ") " :: ") ""))
212 (end-of-line 1) 218 (just-one-space)
213 (unless (= (point) pos) (just-one-space) (backward-delete-char 1))) 219 (setq pos (point))
214 (org-maybe-renumber-ordered-list) 220 (end-of-line 1)
215 (and checkbox (org-update-checkbox-count-maybe)) 221 (unless (= (point) pos) (just-one-space) (backward-delete-char 1)))
216 t)) 222 (org-maybe-renumber-ordered-list)
223 (and checkbox (org-update-checkbox-count-maybe))
224 t)))
217 225
218 ;;; Checkboxes 226 ;;; Checkboxes
219 227
220 (defun org-at-item-checkbox-p () 228 (defun org-at-item-checkbox-p ()
221 "Is point at a line starting a plain-list item with a checklet?" 229 "Is point at a line starting a plain-list item with a checklet?"