tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

Fix trailing whitespaces for *.el files in contrib/.

This commit is contained in:
Bastien Guerry 2012-01-04 16:21:56 +01:00
parent f6d7b32bf2
commit 346ee30e42
27 changed files with 151 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/lisp/htmlize.el
View File

@ -633,7 +633,7 @@ without modifying their meaning."
(goto-char (point-min)) (goto-char (point-min))
(while (search-forward "Local Variables:" nil t) (while (search-forward "Local Variables:" nil t)
(replace-match "Local Variables:" nil t))) (replace-match "Local Variables:" nil t)))
;;; Color handling. ;;; Color handling.
@ -796,7 +796,7 @@ If no rgb.txt file is found, return nil."
(t (t
;; We're getting the RGB components from Emacs. ;; We're getting the RGB components from Emacs.
(let ((rgb (let ((rgb
;; Here I cannot conditionalize on (fboundp ...) ;; Here I cannot conditionalize on (fboundp ...)
;; because ps-print under some versions of GNU Emacs ;; because ps-print under some versions of GNU Emacs
;; defines its own dummy version of ;; defines its own dummy version of
;; `color-instance-rgb-components'. ;; `color-instance-rgb-components'.
@ -1211,7 +1211,7 @@ property and by buffer overlays that specify `face'."
;; used methods are `doctype', `insert-head', `body-tag', and ;; used methods are `doctype', `insert-head', `body-tag', and
;; `insert-text'. Not all output types define all methods. ;; `insert-text'. Not all output types define all methods.
;; ;;
;; Methods are called either with (htmlize-method METHOD ARGS...) ;; Methods are called either with (htmlize-method METHOD ARGS...)
;; special form, or by accessing the function with ;; special form, or by accessing the function with
;; (htmlize-method-function 'METHOD) and calling (funcall FUNCTION). ;; (htmlize-method-function 'METHOD) and calling (funcall FUNCTION).
;; The latter form is useful in tight loops because `htmlize-method' ;; The latter form is useful in tight loops because `htmlize-method'
@ -1389,7 +1389,7 @@ it's called with the same value of KEY. All other times, the cached
(format "<body text=\"%s\" bgcolor=\"%s\">" (format "<body text=\"%s\" bgcolor=\"%s\">"
(htmlize-fstruct-foreground fstruct) (htmlize-fstruct-foreground fstruct)
(htmlize-fstruct-background fstruct)))) (htmlize-fstruct-background fstruct))))
(defun htmlize-font-insert-text (text fstruct-list buffer) (defun htmlize-font-insert-text (text fstruct-list buffer)
;; In `font' mode, we use the traditional HTML means of altering ;; In `font' mode, we use the traditional HTML means of altering
;; presentation: <font> tag for colors, <b> for bold, <u> for ;; presentation: <font> tag for colors, <b> for bold, <u> for

4
contrib/lisp/org-bookmark.el
View File

@ -67,7 +67,7 @@ Otherwise prompt the user for the right bookmark to use."
(if (not file) (if (not file)
(when (eq major-mode 'bookmark-bmenu-mode) (when (eq major-mode 'bookmark-bmenu-mode)
(setq bookmark (bookmark-bmenu-bookmark))) (setq bookmark (bookmark-bmenu-bookmark)))
(when (and (setq bmks (when (and (setq bmks
(mapcar (lambda (name) (mapcar (lambda (name)
(if (equal file (if (equal file
(abbreviate-file-name (abbreviate-file-name
@ -75,7 +75,7 @@ Otherwise prompt the user for the right bookmark to use."
name)) name))
(bookmark-all-names))) (bookmark-all-names)))
(setq bmks (delete nil bmks))) (setq bmks (delete nil bmks)))
(setq bookmark (setq bookmark
(if (or (eq 1 (length bmks)) org-bookmark-use-first-bookmark) (if (or (eq 1 (length bmks)) org-bookmark-use-first-bookmark)
(car bmks) (car bmks)
(completing-read "Bookmark: " bmks nil t nil nil (car bmks)))))) (completing-read "Bookmark: " bmks nil t nil nil (car bmks))))))

3
contrib/lisp/org-checklist.el
View File

@ -138,6 +138,3 @@ of checkbox items"
(provide 'org-checklist) (provide 'org-checklist)
;;; org-checklist.el ends here ;;; org-checklist.el ends here

76
contrib/lisp/org-choose.el
View File

@ -46,13 +46,13 @@
;; * Use C-S-right to change the keyword set. Use this to change to ;; * Use C-S-right to change the keyword set. Use this to change to
;; the "choose" keyword set that you just defined. ;; the "choose" keyword set that you just defined.
;; * Use S-right to advance the TODO mark to the next setting. ;; * Use S-right to advance the TODO mark to the next setting.
;; For "choose", that means you like this alternative more than ;; For "choose", that means you like this alternative more than
;; before. Other alternatives will be automatically demoted to ;; before. Other alternatives will be automatically demoted to
;; keep your settings consistent. ;; keep your settings consistent.
;; * Use S-left to demote TODO to the previous setting. ;; * Use S-left to demote TODO to the previous setting.
;; For "choose", that means you don't like this alternative as much ;; For "choose", that means you don't like this alternative as much
;; as before. Other alternatives will be automatically promoted, ;; as before. Other alternatives will be automatically promoted,
@ -83,7 +83,7 @@ Indexes are 0-based or `nil'.
static-default static-default
all-keywords) all-keywords)
(defvar org-choose-mark-data (defvar org-choose-mark-data
() ()
"Alist of information for choose marks. "Alist of information for choose marks.
@ -101,7 +101,7 @@ Each entry is an `org-choose-mark-data.'" )
(not (not
(string-match "(.*)" i)) (string-match "(.*)" i))
(list i i) (list i i)
(let* (let*
( (
(end-text (match-beginning 0)) (end-text (match-beginning 0))
(vanilla-text (substring i 0 end-text)) (vanilla-text (substring i 0 end-text))
@ -116,7 +116,7 @@ Each entry is an `org-choose-mark-data.'" )
;;When string starts with "," `split-string' doesn't ;;When string starts with "," `split-string' doesn't
;;make a first arg, so in that case make one ;;make a first arg, so in that case make one
;;manually. ;;manually.
(if (if
(string-match "^," args) (string-match "^," args)
(cons nil arglist-x) (cons nil arglist-x)
arglist-x))) arglist-x)))
@ -157,11 +157,11 @@ Each entry is an `org-choose-mark-data.'" )
;;item. ;;item.
(top-upper-range (top-upper-range
(or top-upper-range (1- num-items))) (or top-upper-range (1- num-items)))
(lower-range-length (lower-range-length
(1+ (- static-default bot-lower-range))) (1+ (- static-default bot-lower-range)))
(upper-range-length (upper-range-length
(- top-upper-range static-default)) (- top-upper-range static-default))
(range-length (range-length
(min upper-range-length lower-range-length))) (min upper-range-length lower-range-length)))
@ -194,7 +194,7 @@ Each entry is an `org-choose-mark-data.'" )
;;;_ . org-choose-filter-tail ;;;_ . org-choose-filter-tail
(defun org-choose-filter-tail (raw) (defun org-choose-filter-tail (raw)
"Return a translation of RAW to vanilla and set appropriate "Return a translation of RAW to vanilla and set appropriate
buffer-local variables. buffer-local variables.
RAW is a list of strings representing the input text of a choose RAW is a list of strings representing the input text of a choose
interpretation." interpretation."
@ -219,7 +219,7 @@ interpretation."
(push vanilla-mark vanilla-list))) (push vanilla-mark vanilla-list)))
(org-choose-setup-vars bot-lower-range top-upper-range (org-choose-setup-vars bot-lower-range top-upper-range
static-default index (reverse all-mark-texts)) static-default index (reverse all-mark-texts))
(nreverse vanilla-list))) (nreverse vanilla-list)))
;;;_ . org-choose-setup-filter ;;;_ . org-choose-setup-filter
@ -234,35 +234,35 @@ interpretation."
;;;_ . org-choose-conform-after-promotion ;;;_ . org-choose-conform-after-promotion
(defun org-choose-conform-after-promotion (entry-pos keywords highest-ok-ix) (defun org-choose-conform-after-promotion (entry-pos keywords highest-ok-ix)
"Conform the current item after another item was promoted" "Conform the current item after another item was promoted"
(unless (unless
;;Skip the entry that triggered this by skipping any entry with ;;Skip the entry that triggered this by skipping any entry with
;;the same starting position. plist uses the start of the ;;the same starting position. plist uses the start of the
;;header line as the position, but map no longer does, so we ;;header line as the position, but map no longer does, so we
;;have to go back to the heading. ;;have to go back to the heading.
(= (=
(save-excursion (save-excursion
(org-back-to-heading) (org-back-to-heading)
(point)) (point))
entry-pos) entry-pos)
(let (let
((ix ((ix
(org-choose-get-entry-index keywords))) (org-choose-get-entry-index keywords)))
;;If the index of the entry exceeds the highest allowable ;;If the index of the entry exceeds the highest allowable
;;index, change it to that. ;;index, change it to that.
(when (and ix (when (and ix
(> ix highest-ok-ix)) (> ix highest-ok-ix))
(org-todo (org-todo
(nth highest-ok-ix keywords)))))) (nth highest-ok-ix keywords))))))
;;;_ . org-choose-conform-after-demotion ;;;_ . org-choose-conform-after-demotion
(defun org-choose-conform-after-demotion (entry-pos keywords (defun org-choose-conform-after-demotion (entry-pos keywords
raise-to-ix raise-to-ix
old-highest-ok-ix) old-highest-ok-ix)
"Conform the current item after another item was demoted." "Conform the current item after another item was demoted."
(unless (unless
;;Skip the entry that triggered this. ;;Skip the entry that triggered this.
(= (=
(save-excursion (save-excursion
(org-back-to-heading) (org-back-to-heading)
(point)) (point))
@ -273,11 +273,11 @@ interpretation."
;;If the index of the entry was at or above the old allowable ;;If the index of the entry was at or above the old allowable
;;position, change it to the new mirror position if there is ;;position, change it to the new mirror position if there is
;;one. ;;one.
(when (and (when (and
ix ix
raise-to-ix raise-to-ix
(>= ix old-highest-ok-ix)) (>= ix old-highest-ok-ix))
(org-todo (org-todo
(nth raise-to-ix keywords)))))) (nth raise-to-ix keywords))))))
;;;_ , org-choose-keep-sensible (the org-trigger-hook function) ;;;_ , org-choose-keep-sensible (the org-trigger-hook function)
@ -287,7 +287,7 @@ setting was changed."
(let* (let*
( (from (plist-get change-plist :from)) ( (from (plist-get change-plist :from))
(to (plist-get change-plist :to)) (to (plist-get change-plist :to))
(entry-pos (entry-pos
(set-marker (set-marker
(make-marker) (make-marker)
(plist-get change-plist :position))) (plist-get change-plist :position)))
@ -303,11 +303,11 @@ setting was changed."
(org-choose-mark-data.-all-keywords data)) (org-choose-mark-data.-all-keywords data))
(old-index (old-index
(org-choose-get-index-in-keywords (org-choose-get-index-in-keywords
from from
keywords)) keywords))
(new-index (new-index
(org-choose-get-index-in-keywords (org-choose-get-index-in-keywords
to to
keywords)) keywords))
(highest-ok-ix (highest-ok-ix
(org-choose-highest-other-ok (org-choose-highest-other-ok
@ -324,7 +324,7 @@ setting was changed."
(> new-index old-index)) (> new-index old-index))
(list (list
#'org-choose-conform-after-promotion #'org-choose-conform-after-promotion
entry-pos keywords entry-pos keywords
highest-ok-ix)) highest-ok-ix))
(t ;;Otherwise the entry was demoted. (t ;;Otherwise the entry was demoted.
(let (let
@ -338,14 +338,14 @@ setting was changed."
(org-choose-highest-other-ok (org-choose-highest-other-ok
old-index old-index
data))) data)))
(list (list
#'org-choose-conform-after-demotion #'org-choose-conform-after-demotion
entry-pos entry-pos
keywords keywords
raise-to-ix raise-to-ix
old-highest-ok-ix)))))) old-highest-ok-ix))))))
(if funcdata (if funcdata
;;The funny-looking names are to make variable capture ;;The funny-looking names are to make variable capture
;;unlikely. (Poor-man's lexical bindings). ;;unlikely. (Poor-man's lexical bindings).
@ -356,8 +356,8 @@ setting was changed."
;;We may call `org-todo', so let various hooks ;;We may call `org-todo', so let various hooks
;;`nil' so we don't cause loops. ;;`nil' so we don't cause loops.
org-after-todo-state-change-hook org-after-todo-state-change-hook
org-trigger-hook org-trigger-hook
org-blocker-hook org-blocker-hook
org-todo-get-default-hook org-todo-get-default-hook
;;Also let this alist `nil' so we don't log ;;Also let this alist `nil' so we don't log
;;secondary transitions. ;;secondary transitions.
@ -366,7 +366,7 @@ setting was changed."
(funcall map-over-entries (funcall map-over-entries
#'(lambda () #'(lambda ()
(apply func-d473 args-46k)))))))) (apply func-d473 args-46k))))))))
;;Remove the marker ;;Remove the marker
(set-marker entry-pos nil))) (set-marker entry-pos nil)))
@ -393,7 +393,7 @@ setting was changed."
(defun org-choose-get-fn-map-group () (defun org-choose-get-fn-map-group ()
"Return a function to map over the group" "Return a function to map over the group"
#'(lambda (fn) #'(lambda (fn)
(require 'org-agenda) ;; `org-map-entries' seems to need it. (require 'org-agenda) ;; `org-map-entries' seems to need it.
(save-excursion (save-excursion
@ -402,7 +402,7 @@ setting was changed."
(let (let
((level (org-reduced-level (org-outline-level)))) ((level (org-reduced-level (org-outline-level))))
(save-restriction (save-restriction
(org-map-entries (org-map-entries
fn fn
(format "LEVEL=%d" level) (format "LEVEL=%d" level)
'tree)))))) 'tree))))))
@ -418,10 +418,10 @@ If there is none, return 0"
;;Func maps over applicable entries. ;;Func maps over applicable entries.
(map-over-entries (map-over-entries
(org-choose-get-fn-map-group)) (org-choose-get-fn-map-group))
(indexes-list (indexes-list
(remove nil (remove nil
(funcall map-over-entries (funcall map-over-entries
#'(lambda () #'(lambda ()
(org-choose-get-entry-index keywords)))))) (org-choose-get-entry-index keywords))))))
(if (if
@ -438,7 +438,7 @@ given that another mark has index IX.
DATA must be a `org-choose-mark-data.'." DATA must be a `org-choose-mark-data.'."
(let (let
( (
(bot-lower-range (bot-lower-range
(org-choose-mark-data.-bot-lower-range data)) (org-choose-mark-data.-bot-lower-range data))
(top-upper-range (top-upper-range
@ -455,7 +455,7 @@ DATA must be a `org-choose-mark-data.'."
;;;_ . org-choose-get-default-mark-index ;;;_ . org-choose-get-default-mark-index
(defun org-choose-get-default-mark-index (data) (defun org-choose-get-default-mark-index (data)
"Return the index of the default mark in a choose interpretation. "Return the index of the default mark in a choose interpretation.
DATA must be a `org-choose-mark-data.'." DATA must be a `org-choose-mark-data.'."
@ -475,7 +475,7 @@ DATA must be a `org-choose-mark-data.'."
;;;_ . org-choose-get-mark-N ;;;_ . org-choose-get-mark-N
(defun org-choose-get-mark-N (n data) (defun org-choose-get-mark-N (n data)
"Get the text of the nth mark in a choose interpretation." "Get the text of the nth mark in a choose interpretation."
(let* (let*
((l (org-choose-mark-data.-all-keywords data))) ((l (org-choose-mark-data.-all-keywords data)))
(nth n l))) (nth n l)))

4
contrib/lisp/org-collector.el
View File

@ -87,7 +87,7 @@
;; | run (50) | 0.116446 | ;; | run (50) | 0.116446 |
;; | run (100) | 0.118863 | ;; | run (100) | 0.118863 |
;; #+END: ;; #+END:
;; ;;
;;; Code: ;;; Code:
(require 'org) (require 'org)
@ -134,7 +134,7 @@ preceeding the dblock, then update the contents of the dblock."
(org-narrow-to-subtree) (org-narrow-to-subtree)
(setq stringformat (if noquote "%s" "%S")) (setq stringformat (if noquote "%s" "%S"))
(setq table (org-propview-to-table (setq table (org-propview-to-table
(org-propview-collect cols stringformat conds match scope inherit (org-propview-collect cols stringformat conds match scope inherit
(if colnames colnames cols)) stringformat)) (if colnames colnames cols)) stringformat))
(widen)) (widen))
(setq pos (point)) (setq pos (point))

1
contrib/lisp/org-drill.el
View File

@ -2915,4 +2915,3 @@ returns its return value."
(provide 'org-drill) (provide 'org-drill)

4
contrib/lisp/org-eval-light.el
View File

@ -67,7 +67,7 @@ large example block")
(defcustom org-eval-light-interpreters '("lisp" "emacs-lisp" "ruby" "shell") (defcustom org-eval-light-interpreters '("lisp" "emacs-lisp" "ruby" "shell")
"Interpreters allows for evaluation tags. "Interpreters allows for evaluation tags.
This is a list of program names (as strings) that can evaluate code and This is a list of program names (as strings) that can evaluate code and
insert the output into an Org-mode buffer. Valid choices are insert the output into an Org-mode buffer. Valid choices are
lisp Interpret Emacs Lisp code and display the result lisp Interpret Emacs Lisp code and display the result
shell Pass command to the shell and display the result shell Pass command to the shell and display the result
@ -189,7 +189,7 @@ commented by `org-eval-light-make-region-example'."
(with-temp-buffer (with-temp-buffer
(insert code) (insert code)
(shell-command-on-region (point-min) (point-max) cmd nil 'replace) (shell-command-on-region (point-min) (point-max) cmd nil 'replace)
(buffer-string))) (buffer-string)))
(defadvice org-ctrl-c-ctrl-c (around org-cc-eval-source activate) (defadvice org-ctrl-c-ctrl-c (around org-cc-eval-source activate)
(if (org-eval-light-inside-snippet) (if (org-eval-light-inside-snippet)

7
contrib/lisp/org-eval.el
View File

@ -105,7 +105,7 @@
(defcustom org-eval-interpreters '("lisp") (defcustom org-eval-interpreters '("lisp")
"Interpreters allows for evaluation tags. "Interpreters allows for evaluation tags.
This is a list of program names (as strings) that can evaluate code and This is a list of program names (as strings) that can evaluate code and
insert the output into an Org-mode buffer. Valid choices are insert the output into an Org-mode buffer. Valid choices are
lisp Interpret Emacs Lisp code and display the result lisp Interpret Emacs Lisp code and display the result
shell Pass command to the shell and display the result shell Pass command to the shell and display the result
@ -120,7 +120,7 @@ ruby The ruby interpreter"
(const "python") (const "python")
(const "ruby") (const "ruby")
(const "shell"))) (const "shell")))
(defun org-eval-handle-snippets (limit &optional replace) (defun org-eval-handle-snippets (limit &optional replace)
"Evaluate code snippets and display the results as display property. "Evaluate code snippets and display the results as display property.
When REPLACE is non-nil, replace the code region with the result (used When REPLACE is non-nil, replace the code region with the result (used
@ -212,9 +212,8 @@ This should go into the `org-export-preprocess-hook'."
(with-temp-buffer (with-temp-buffer
(insert code) (insert code)
(shell-command-on-region (point-min) (point-max) cmd nil 'replace) (shell-command-on-region (point-min) (point-max) cmd nil 'replace)
(buffer-string))) (buffer-string)))
(provide 'org-eval) (provide 'org-eval)
;;; org-eval.el ends here ;;; org-eval.el ends here

26
contrib/lisp/org-expiry.el
View File

@ -25,7 +25,7 @@
;;; Commentary: ;;; Commentary:
;; ;;
;; This gives you a chance to get rid of old entries in your Org files ;; This gives you a chance to get rid of old entries in your Org files
;; by expiring them. ;; by expiring them.
;; ;;
;; By default, entries that have no EXPIRY property are considered to be ;; By default, entries that have no EXPIRY property are considered to be
;; new (i.e. 0 day old) and only entries older than one year go to the ;; new (i.e. 0 day old) and only entries older than one year go to the
@ -33,7 +33,7 @@
;; your tasks will be deleted with the default settings. ;; your tasks will be deleted with the default settings.
;; ;;
;; When does an entry expires? ;; When does an entry expires?
;; ;;
;; Consider this entry: ;; Consider this entry:
;; ;;
;; * Stop watching TV ;; * Stop watching TV
@ -41,8 +41,8 @@
;; :CREATED: <2008-01-07 lun 08:01> ;; :CREATED: <2008-01-07 lun 08:01>
;; :EXPIRY: <2008-01-09 08:01> ;; :EXPIRY: <2008-01-09 08:01>
;; :END: ;; :END:
;; ;;
;; This entry will expire on the 9th, january 2008. ;; This entry will expire on the 9th, january 2008.
;; * Stop watching TV ;; * Stop watching TV
;; :PROPERTIES: ;; :PROPERTIES:
@ -56,19 +56,19 @@
;; What happen when an entry is expired? Nothing until you explicitely ;; What happen when an entry is expired? Nothing until you explicitely
;; M-x org-expiry-process-entries When doing this, org-expiry will check ;; M-x org-expiry-process-entries When doing this, org-expiry will check
;; for expired entries and request permission to process them. ;; for expired entries and request permission to process them.
;; ;;
;; Processing an expired entries means calling the function associated ;; Processing an expired entries means calling the function associated
;; with `org-expiry-handler-function'; the default is to add the tag ;; with `org-expiry-handler-function'; the default is to add the tag
;; :ARCHIVE:, but you can also add a EXPIRED keyword or even archive ;; :ARCHIVE:, but you can also add a EXPIRED keyword or even archive
;; the subtree. ;; the subtree.
;; ;;
;; Is this useful? Well, when you're in a brainstorming session, it ;; Is this useful? Well, when you're in a brainstorming session, it
;; might be useful to know about the creation date of an entry, and be ;; might be useful to know about the creation date of an entry, and be
;; able to archive those entries that are more than xxx days/weeks old. ;; able to archive those entries that are more than xxx days/weeks old.
;; ;;
;; When you're in such a session, you can insinuate org-expiry like ;; When you're in such a session, you can insinuate org-expiry like
;; this: M-x org-expiry-insinuate ;; this: M-x org-expiry-insinuate
;; ;;
;; Then, each time you're pressing M-RET to insert an item, the CREATION ;; Then, each time you're pressing M-RET to insert an item, the CREATION
;; property will be automatically added. Same when you're scheduling or ;; property will be automatically added. Same when you're scheduling or
;; deadlining items. You can deinsinuate: M-x org-expiry-deinsinuate ;; deadlining items. You can deinsinuate: M-x org-expiry-deinsinuate
@ -218,7 +218,7 @@ and restart `org-mode' if necessary."
Return nil if the entry is not expired. Otherwise return the Return nil if the entry is not expired. Otherwise return the
amount of time between today and the expiry date. amount of time between today and the expiry date.
If there is no creation date, use `org-expiry-created-date'. If there is no creation date, use `org-expiry-created-date'.
If there is no expiry date, use `org-expiry-expiry-date'." If there is no expiry date, use `org-expiry-expiry-date'."
(let* ((ex-prop org-expiry-expiry-property-name) (let* ((ex-prop org-expiry-expiry-property-name)
(cr-prop org-expiry-created-property-name) (cr-prop org-expiry-created-property-name)
@ -292,7 +292,7 @@ update the date."
d-time d-hour timestr) d-time d-hour timestr)
(when (or (null d) arg) (when (or (null d) arg)
;; update if no date or non-nil prefix argument ;; update if no date or non-nil prefix argument
;; FIXME Use `org-time-string-to-time' ;; FIXME Use `org-time-string-to-time'
(setq d-time (if d (org-time-string-to-time d) (setq d-time (if d (org-time-string-to-time d)
(current-time))) (current-time)))
(setq d-hour (format-time-string "%H:%M" d-time)) (setq d-hour (format-time-string "%H:%M" d-time))
@ -326,7 +326,7 @@ and insert today's date."
;; maybe transform to inactive timestamp ;; maybe transform to inactive timestamp
(if org-expiry-inactive-timestamps (if org-expiry-inactive-timestamps
(setq timestr (concat "[" (substring timestr 1 -1) "]"))) (setq timestr (concat "[" (substring timestr 1 -1) "]")))
(save-excursion (save-excursion
(org-entry-put (org-entry-put
(point) org-expiry-expiry-property-name timestr)))) (point) org-expiry-expiry-property-name timestr))))

60
contrib/lisp/org-export-generic.el
View File

@ -35,7 +35,7 @@
;; org-set-generic-type function: ;; org-set-generic-type function:
;; ;;
;; (org-set-generic-type ;; (org-set-generic-type
;; "really-basic-text" ;; "really-basic-text"
;; '(:file-suffix ".txt" ;; '(:file-suffix ".txt"
;; :key-binding ?R ;; :key-binding ?R
;; ;;
@ -155,10 +155,10 @@ in this way, it will be wrapped."
:toc-section-numbers t :toc-section-numbers t
:toc-section-number-format "\#(%s) " :toc-section-number-format "\#(%s) "
:toc-format "--%s--" :toc-format "--%s--"
:toc-format-with-todo "!!%s!!\n" :toc-format-with-todo "!!%s!!\n"
:toc-indent-char ?\ :toc-indent-char ?\
:toc-indent-depth 4 :toc-indent-depth 4
:toc-tags-export t :toc-tags-export t
:toc-tags-prefix " <tags>" :toc-tags-prefix " <tags>"
@ -217,7 +217,7 @@ in this way, it will be wrapped."
:body-list-checkbox-half-end "</checkbox (half)>" :body-list-checkbox-half-end "</checkbox (half)>"
; other body lines ; other body lines
:body-line-format "%s" :body-line-format "%s"
@ -257,10 +257,10 @@ in this way, it will be wrapped."
:toc-export t :toc-export t
:toc-section-numbers t :toc-section-numbers t
:toc-section-number-format "%s " :toc-section-number-format "%s "
:toc-format "%s\n" :toc-format "%s\n"
:toc-format-with-todo "%s (*)\n" :toc-format-with-todo "%s (*)\n"
:toc-indent-char ?\ :toc-indent-char ?\
:toc-indent-depth 4 :toc-indent-depth 4
:body-header-section-numbers 3 :body-header-section-numbers 3
:body-section-prefix "\n" :body-section-prefix "\n"
@ -310,7 +310,7 @@ in this way, it will be wrapped."
:body-section-header-prefix ("= " "== " "=== " :body-section-header-prefix ("= " "== " "=== "
"==== " "===== " "====== ") "==== " "===== " "====== ")
:body-section-header-suffix (" =\n\n" " ==\n\n" " ===\n\n" :body-section-header-suffix (" =\n\n" " ==\n\n" " ===\n\n"
" ====\n\n" " =====\n\n" " ======\n\n") " ====\n\n" " =====\n\n" " ======\n\n")
:body-line-export-preformated t ;; yes/no/maybe??? :body-line-export-preformated t ;; yes/no/maybe???
@ -390,7 +390,7 @@ in this way, it will be wrapped."
:body-list-format "<t>%s</t>\n" :body-list-format "<t>%s</t>\n"
) )
("trac-wiki" ("trac-wiki"
:file-suffix ".txt" :file-suffix ".txt"
:key-binding ?T :key-binding ?T
@ -409,7 +409,7 @@ in this way, it will be wrapped."
:body-section-header-prefix (" == " " === " " ==== " :body-section-header-prefix (" == " " === " " ==== "
" ===== " ) " ===== " )
:body-section-header-suffix (" ==\n\n" " ===\n\n" " ====\n\n" :body-section-header-suffix (" ==\n\n" " ===\n\n" " ====\n\n"
" =====\n\n" " ======\n\n" " =======\n\n") " =====\n\n" " ======\n\n" " =======\n\n")
:body-line-export-preformated t ;; yes/no/maybe??? :body-line-export-preformated t ;; yes/no/maybe???
@ -426,7 +426,7 @@ in this way, it will be wrapped."
;; this is ignored! [2010/02/02:rpg] ;; this is ignored! [2010/02/02:rpg]
:body-bullet-list-prefix ("* " "** " "*** " "**** " "***** ") :body-bullet-list-prefix ("* " "** " "*** " "**** " "***** ")
) )
("tikiwiki" ("tikiwiki"
:file-suffix ".txt" :file-suffix ".txt"
:key-binding ?U :key-binding ?U
@ -445,7 +445,7 @@ in this way, it will be wrapped."
:body-section-header-prefix ("! " "!! " "!!! " "!!!! " :body-section-header-prefix ("! " "!! " "!!! " "!!!! "
"!!!!! " "!!!!!! " "!!!!!!! ") "!!!!! " "!!!!!! " "!!!!!!! ")
:body-section-header-suffix (" \n" " \n" " \n" :body-section-header-suffix (" \n" " \n" " \n"
" \n" " \n" " \n") " \n" " \n" " \n")
@ -498,12 +498,12 @@ the body of an org-set-generic-type definition."
)) ))
(def-org-export-generic-keyword :body-newline-paragraph (def-org-export-generic-keyword :body-newline-paragraph
:documentation "Bound either to NIL or to a pattern to be :documentation "Bound either to NIL or to a pattern to be
inserted in the output for every blank line in the input. inserted in the output for every blank line in the input.
The intention is to handle formats where text is flowed, and The intention is to handle formats where text is flowed, and
newlines are interpreted as significant \(e.g., as indicating newlines are interpreted as significant \(e.g., as indicating
preformatted text\). A common non-nil value for this keyword preformatted text\). A common non-nil value for this keyword
is \"\\n\". Should typically be combined with a value for is \"\\n\". Should typically be combined with a value for
:body-line-format that does NOT end with a newline." :body-line-format that does NOT end with a newline."
:type string) :type string)
@ -515,8 +515,8 @@ is \"\\n\". Should typically be combined with a value for
(def-org-export-generic-keyword :code-format) (def-org-export-generic-keyword :code-format)
(def-org-export-generic-keyword :verbatim-format) (def-org-export-generic-keyword :verbatim-format)
(defun org-export-generic-remember-section (type suffix &optional prefix) (defun org-export-generic-remember-section (type suffix &optional prefix)
(setq org-export-generic-section-type type) (setq org-export-generic-section-type type)
@ -569,7 +569,7 @@ underlined headlines. The default is 3."
(org-export-add-subtree-options opt-plist rbeg) (org-export-add-subtree-options opt-plist rbeg)
opt-plist))) opt-plist)))
helpstart helpstart
(bogus (mapc (lambda (x) (bogus (mapc (lambda (x)
(setq helpstart (setq helpstart
(concat helpstart "\[" (concat helpstart "\["
@ -611,7 +611,7 @@ underlined headlines. The default is 3."
(unless (setq ass (cadr (assq r2 cmds))) (unless (setq ass (cadr (assq r2 cmds)))
(error "No command associated with key %c" r1)) (error "No command associated with key %c" r1))
(cdr (assoc (cdr (assoc
(if (equal ass "default") org-generic-export-type ass) (if (equal ass "default") org-generic-export-type ass)
org-generic-alist)))) org-generic-alist))))
@ -732,11 +732,11 @@ underlined headlines. The default is 3."
(format-code (plist-get export-plist :code-format)) (format-code (plist-get export-plist :code-format))
(format-verbatim (plist-get export-plist :verbatim-format)) (format-verbatim (plist-get export-plist :verbatim-format))
thetoc toctags have-headings first-heading-pos thetoc toctags have-headings first-heading-pos
table-open table-buffer link-buffer link desc desc0 rpl wrap) table-open table-buffer link-buffer link desc desc0 rpl wrap)
(let ((inhibit-read-only t)) (let ((inhibit-read-only t))
(org-unmodified (org-unmodified
(remove-text-properties (point-min) (point-max) (remove-text-properties (point-min) (point-max)
@ -841,7 +841,7 @@ underlined headlines. The default is 3."
(org-re "[ \t]+:\\([[:alnum:]_@:]+\\):[ \t]*$") (org-re "[ \t]+:\\([[:alnum:]_@:]+\\):[ \t]*$")
txt) txt)
(progn (progn
(setq (setq
toctags toctags
(org-export-generic-header (org-export-generic-header
(match-string 1 txt) (match-string 1 txt)
@ -852,7 +852,7 @@ underlined headlines. The default is 3."
txt) txt)
(setq txt (replace-match "" t t txt))) (setq txt (replace-match "" t t txt)))
(setq toctags tocnotagsstr))) (setq toctags tocnotagsstr)))
(if (string-match quote-re0 txt) (if (string-match quote-re0 txt)
(setq txt (replace-match "" t t txt))) (setq txt (replace-match "" t t txt)))
@ -871,7 +871,7 @@ underlined headlines. The default is 3."
"") "")
(format (format
(if todo tocformtodo tocformat) (if todo tocformtodo tocformat)
txt) txt)
toctags) toctags)
@ -908,7 +908,7 @@ underlined headlines. The default is 3."
(substring link 8) (substring link 8)
org-export-code-refs))) org-export-code-refs)))
t t line)) t t line))
(setq rpl (concat "[" (setq rpl (concat "["
(or (match-string 3 line) (match-string 1 line)) (or (match-string 3 line) (match-string 1 line))
"]")) "]"))
(when (and desc0 (not (equal desc0 link))) (when (and desc0 (not (equal desc0 link)))
@ -1043,7 +1043,7 @@ underlined headlines. The default is 3."
;; ;;
(org-export-generic-check-section "body" bodytextpre bodytextsuf) (org-export-generic-check-section "body" bodytextpre bodytextsuf)
(setq line (setq line
(org-export-generic-fontify line)) (org-export-generic-fontify line))
;; XXX: properties? list? ;; XXX: properties? list?
@ -1208,7 +1208,7 @@ REVERSE means to reverse the list if the plist match is a list
(setq result (concat result line)) (setq result (concat result line))
(setq len 0))) (setq len 0)))
(concat result indstr line))) (concat result indstr line)))
(defun org-export-generic-push-links (link-buffer) (defun org-export-generic-push-links (link-buffer)
"Push out links in the buffer." "Push out links in the buffer."
(when link-buffer (when link-buffer
@ -1258,13 +1258,13 @@ REVERSE means to reverse the list if the plist match is a list
)) ))
;; same level ;; same level
((= level old-level) ((= level old-level)
(insert (insert
(org-export-generic-format export-plist :body-section-suffix 0 level)) (org-export-generic-format export-plist :body-section-suffix 0 level))
) )
) )
(insert (insert
(org-export-generic-format export-plist :body-section-prefix 0 level)) (org-export-generic-format export-plist :body-section-prefix 0 level))
(if (and org-export-with-section-numbers (if (and org-export-with-section-numbers
secnums secnums
(or (not (numberp secnums)) (or (not (numberp secnums))
@ -1365,7 +1365,7 @@ REVERSE means to reverse the list if the plist match is a list
Each element of the list is a list of three elements. Each element of the list is a list of three elements.
The first element is the character used as a marker for fontification. The first element is the character used as a marker for fontification.
The second element is a variable name, set in org-export-generic. That The second element is a variable name, set in org-export-generic. That
variable will be dereferenced to obtain a formatting string to wrap variable will be dereferenced to obtain a formatting string to wrap
fontified text with. fontified text with.
The third element decides whether to protect converted text from other The third element decides whether to protect converted text from other
conversions.") conversions.")

8
contrib/lisp/org-interactive-query.el
View File

@ -6,7 +6,7 @@
;; Version: 1.0 ;; Version: 1.0
;; Keywords: org, wp ;; Keywords: org, wp
;; ;;
;; This file is not part of GNU Emacs. ;; This file is not part of GNU Emacs.
;; ;;
;; This program is free software; you can redistribute it and/or modify ;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by ;; it under the terms of the GNU General Public License as published by
@ -31,7 +31,7 @@
;; / add a keyword as a positive selection criterion ;; / add a keyword as a positive selection criterion
;; \ add a keyword as a newgative selection criterion ;; \ add a keyword as a newgative selection criterion
;; = clear a keyword from the selection string ;; = clear a keyword from the selection string
;; ; ;; ;
(require 'org) (require 'org)
@ -39,7 +39,7 @@
(org-defkey org-agenda-mode-map "/" 'org-agenda-query-and-cmd) (org-defkey org-agenda-mode-map "/" 'org-agenda-query-and-cmd)
(org-defkey org-agenda-mode-map ";" 'org-agenda-query-or-cmd) (org-defkey org-agenda-mode-map ";" 'org-agenda-query-or-cmd)
(org-defkey org-agenda-mode-map "\\" 'org-agenda-query-not-cmd) (org-defkey org-agenda-mode-map "\\" 'org-agenda-query-not-cmd)
;;; Agenda interactive query manipulation ;;; Agenda interactive query manipulation
(defcustom org-agenda-query-selection-single-key t (defcustom org-agenda-query-selection-single-key t
@ -283,7 +283,7 @@ keyword string."
(defun org-agenda-query-generic-cmd (op) (defun org-agenda-query-generic-cmd (op)
"Activate query manipulation with OP as initial operator." "Activate query manipulation with OP as initial operator."
(let ((q (org-agenda-query-selection org-agenda-query-string op (let ((q (org-agenda-query-selection org-agenda-query-string op
org-tag-alist org-tag-alist
(org-agenda-query-global-todo-keys)))) (org-agenda-query-global-todo-keys))))
(when q (when q
(setq org-agenda-query-string q) (setq org-agenda-query-string q)

18
contrib/lisp/org-invoice.el
View File

@ -181,7 +181,7 @@ looks like tree2, where the level is 2."
(when (or (not min) (< level min)) (setq min level)) (when (or (not min) (< level min)) (setq min level))
(when (> level max) (setq max level)))) (when (> level max) (setq max level))))
(cons (or min 0) max))) (cons (or min 0) max)))
(defun org-invoice-collapse-list (ls) (defun org-invoice-collapse-list (ls)
"Reorganize the given list by dates." "Reorganize the given list by dates."
(let ((min-max (org-invoice-level-min-max ls)) new) (let ((min-max (org-invoice-level-min-max ls)) new)
@ -214,7 +214,7 @@ looks like tree2, where the level is 2."
(+ price (cdr (assoc 'price (car bucket))))) (+ price (cdr (assoc 'price (car bucket)))))
(nconc bucket (list info)))))) (nconc bucket (list info))))))
(nreverse new))) (nreverse new)))
(defun org-invoice-info-to-table (info) (defun org-invoice-info-to-table (info)
"Create a single org table row from the given info alist." "Create a single org table row from the given info alist."
(let ((title (cdr (assoc 'title info))) (let ((title (cdr (assoc 'title info)))
@ -223,19 +223,19 @@ looks like tree2, where the level is 2."
(price (cdr (assoc 'price info))) (price (cdr (assoc 'price info)))
(with-price (plist-get org-invoice-table-params :price))) (with-price (plist-get org-invoice-table-params :price)))
(unless total (unless total
(setq (setq
org-invoice-total-time (+ org-invoice-total-time work) org-invoice-total-time (+ org-invoice-total-time work)
org-invoice-total-price (+ org-invoice-total-price price))) org-invoice-total-price (+ org-invoice-total-price price)))
(setq total (and total (org-minutes-to-hh:mm-string total))) (setq total (and total (org-minutes-to-hh:mm-string total)))
(setq work (and work (org-minutes-to-hh:mm-string work))) (setq work (and work (org-minutes-to-hh:mm-string work)))
(insert-before-markers (insert-before-markers
(concat "|" title (concat "|" title
(cond (cond
(total (concat "|" total)) (total (concat "|" total))
(work (concat "|" work))) (work (concat "|" work)))
(and with-price price (concat "|" (format "%.2f" price))) (and with-price price (concat "|" (format "%.2f" price)))
"|" "\n")))) "|" "\n"))))
(defun org-invoice-list-to-table (ls) (defun org-invoice-list-to-table (ls)
"Convert a list of heading info to an org table" "Convert a list of heading info to an org table"
(let ((with-price (plist-get org-invoice-table-params :price)) (let ((with-price (plist-get org-invoice-table-params :price))
@ -243,7 +243,7 @@ looks like tree2, where the level is 2."
(with-header (plist-get org-invoice-table-params :headers)) (with-header (plist-get org-invoice-table-params :headers))
(org-invoice-total-time 0) (org-invoice-total-time 0)
(org-invoice-total-price 0)) (org-invoice-total-price 0))
(insert-before-markers (insert-before-markers
(concat "| Task / Date | Time" (and with-price "| Price") "|\n")) (concat "| Task / Date | Time" (and with-price "| Price") "|\n"))
(dolist (info ls) (dolist (info ls)
(insert-before-markers "|-\n") (insert-before-markers "|-\n")
@ -268,9 +268,9 @@ heading that begins the invoice data, usually using the
(org-clock-sum) (org-clock-sum)
(run-hook-with-args 'org-invoice-start-hook) (run-hook-with-args 'org-invoice-start-hook)
(cons org-invoice-current-invoice (cons org-invoice-current-invoice
(org-invoice-collapse-list (org-invoice-collapse-list
(org-map-entries 'org-invoice-heading-info t 'tree 'archive)))))) (org-map-entries 'org-invoice-heading-info t 'tree 'archive))))))
(defun org-dblock-write:invoice (params) (defun org-dblock-write:invoice (params)
"Function called by OrgMode to write the invoice dblock. To "Function called by OrgMode to write the invoice dblock. To
create an invoice dblock you can use the `org-invoice-report' create an invoice dblock you can use the `org-invoice-report'
@ -397,5 +397,5 @@ I place mine under a third-level heading like so:
(if report (goto-char report) (if report (goto-char report)
(org-create-dblock (list :name "invoice"))) (org-create-dblock (list :name "invoice")))
(org-update-dblock))) (org-update-dblock)))
(provide 'org-invoice) (provide 'org-invoice)

6
contrib/lisp/org-mac-iCal.el
View File

@ -101,7 +101,7 @@ the the Emacs diary"
(shell-command "sw_vers" (current-buffer)) (shell-command "sw_vers" (current-buffer))
(when (re-search-backward "10\\.[567]" nil t) (when (re-search-backward "10\\.[567]" nil t)
(omi-concat-leopard-ics all-calendars))) (omi-concat-leopard-ics all-calendars)))
;; move all caldav ics files to the same place as local ics files ;; move all caldav ics files to the same place as local ics files
(mapc (mapc
(lambda (x) (lambda (x)
@ -111,7 +111,7 @@ the the Emacs diary"
(concat "~/Library/Calendars/" y))) (concat "~/Library/Calendars/" y)))
(directory-files x nil ".*ics$"))) (directory-files x nil ".*ics$")))
caldav-folders) caldav-folders)
;; check calendar has contents and import ;; check calendar has contents and import
(setq import-calendars (directory-files "~/Library/Calendars" 1 ".*ics$")) (setq import-calendars (directory-files "~/Library/Calendars" 1 ".*ics$"))
(mapc (mapc
@ -181,7 +181,7 @@ date range so that Emacs calendar view doesn't grind to a halt"
(* (/ org-mac-iCal-range 2) 30)) (* (/ org-mac-iCal-range 2) 30))
(delete-region startEntry endEntry))) (delete-region startEntry endEntry)))
(goto-char (point-max)))) (goto-char (point-max))))
(while (while
(re-search-forward "^END:VEVENT$" nil t) (re-search-forward "^END:VEVENT$" nil t)
(delete-blank-lines)) (delete-blank-lines))
(goto-line 1) (goto-line 1)

10
contrib/lisp/org-mac-link-grabber.el
View File

@ -2,7 +2,7 @@
;;; application and insert them as links into org-mode documents ;;; application and insert them as links into org-mode documents
;; ;;
;; Copyright (c) 2010-2012 Free Software Foundation, Inc. ;; Copyright (c) 2010-2012 Free Software Foundation, Inc.
;; ;;
;; Author: Anthony Lander <anthony.lander@gmail.com> ;; Author: Anthony Lander <anthony.lander@gmail.com>
;; Version: 1.0.1 ;; Version: 1.0.1
;; Keywords: org, mac, hyperlink ;; Keywords: org, mac, hyperlink
@ -52,7 +52,7 @@
;; add (require 'org-mac-link-grabber) to your .emacs, and optionally ;; add (require 'org-mac-link-grabber) to your .emacs, and optionally
;; bind a key to activate the link grabber menu, like this: ;; bind a key to activate the link grabber menu, like this:
;; ;;
;; (add-hook 'org-mode-hook (lambda () ;; (add-hook 'org-mode-hook (lambda ()
;; (define-key org-mode-map (kbd "C-c g") 'omlg-grab-link))) ;; (define-key org-mode-map (kbd "C-c g") 'omlg-grab-link)))
;; ;;
;; ;;
@ -161,7 +161,7 @@ applications and inserting them in org documents"
(when (and active (eq input key)) (when (and active (eq input key))
(call-interactively grab-function)))) (call-interactively grab-function))))
descriptors))) descriptors)))
(defalias 'omgl-grab-link 'omlg-grab-link (defalias 'omgl-grab-link 'omlg-grab-link
"Renamed, and this alias will be obsolete next revision.") "Renamed, and this alias will be obsolete next revision.")
@ -344,7 +344,7 @@ applications and inserting them in org documents"
" return theUrl & \"::split::\" & theName & \"\n\"\n" " return theUrl & \"::split::\" & theName & \"\n\"\n"
"end tell\n")))) "end tell\n"))))
(car (split-string result "[\r\n]+" t)))) (car (split-string result "[\r\n]+" t))))
(defun org-mac-safari-get-frontmost-url () (defun org-mac-safari-get-frontmost-url ()
(interactive) (interactive)
(message "Applescript: Getting Safari url...") (message "Applescript: Getting Safari url...")
@ -361,7 +361,7 @@ applications and inserting them in org documents"
(defun org-mac-safari-insert-frontmost-url () (defun org-mac-safari-insert-frontmost-url ()
(interactive) (interactive)
(insert (org-mac-safari-get-frontmost-url))) (insert (org-mac-safari-get-frontmost-url)))
;; ;;
;; ;;

6
contrib/lisp/org-mairix.el
View File

@ -207,7 +207,7 @@ applications in order to mimic `org-store-link'. Used by
:group 'org-mairix) :group 'org-mairix)
(defcustom org-mairix-mutt-display-command (defcustom org-mairix-mutt-display-command
"xterm -title 'mairix search: %search%' -e 'unset COLUMNS; mutt -f "xterm -title 'mairix search: %search%' -e 'unset COLUMNS; mutt -f
~/mail/mairix -e \"push <display-message>\"' &" ~/mail/mairix -e \"push <display-message>\"' &"
"Command to execute to display mairix search results via mutt within "Command to execute to display mairix search results via mutt within
an xterm. an xterm.
@ -244,7 +244,7 @@ along with general mairix configuration."
:group 'org-mairix-gnus :group 'org-mairix-gnus
:type 'string) :type 'string)
(defcustom org-mairix-gnus-select-display-group-function (defcustom org-mairix-gnus-select-display-group-function
'org-mairix-gnus-select-display-group-function-gg 'org-mairix-gnus-select-display-group-function-gg
"Hook to call to select the group that contains the matching articles. "Hook to call to select the group that contains the matching articles.
We should not need this, it is owed to a problem of gnus that people were We should not need this, it is owed to a problem of gnus that people were
@ -285,7 +285,7 @@ to do that -- so you're likely to see zombies floating around.
If you can improve this, please do!" If you can improve this, please do!"
(if (not (equal (substring search 0 2) "m:" )) (if (not (equal (substring search 0 2) "m:" ))
(error "org-mairix-gnus-display-results: display of search other than (error "org-mairix-gnus-display-results: display of search other than
message-id not implemented yet")) message-id not implemented yet"))
(setq message-id (substring search 2 nil)) (setq message-id (substring search 2 nil))
(require 'gnus) (require 'gnus)

4
contrib/lisp/org-mime.el
View File

@ -43,13 +43,13 @@
;; ;;
;; you might want to bind this to a key with something like the ;; you might want to bind this to a key with something like the
;; following message-mode binding ;; following message-mode binding
;; ;;
;; (add-hook 'message-mode-hook ;; (add-hook 'message-mode-hook
;; (lambda () ;; (lambda ()
;; (local-set-key "\C-c\M-o" 'org-mime-htmlize))) ;; (local-set-key "\C-c\M-o" 'org-mime-htmlize)))
;; ;;
;; and the following org-mode binding ;; and the following org-mode binding
;; ;;
;; (add-hook 'org-mode-hook ;; (add-hook 'org-mode-hook
;; (lambda () ;; (lambda ()
;; (local-set-key "\C-c\M-o" 'org-mime-org-buffer-htmlize))) ;; (local-set-key "\C-c\M-o" 'org-mime-org-buffer-htmlize)))

1
contrib/lisp/org-mtags.el
View File

@ -255,4 +255,3 @@ with string values. In addition, it reutnrs the following properties:
(provide 'org-mtags) (provide 'org-mtags)
;;; org-mtags.el ends here ;;; org-mtags.el ends here

10
contrib/lisp/org-notmuch.el
View File

@ -32,7 +32,7 @@
;; Links have one the following form ;; Links have one the following form
;; notmuch:<search terms> ;; notmuch:<search terms>
;; notmuch-search:<search terms>. ;; notmuch-search:<search terms>.
;; The first form open the queries in notmuch-show mode, whereas the ;; The first form open the queries in notmuch-show mode, whereas the
;; second link open it in notmuch-search mode. Note that queries are ;; second link open it in notmuch-search mode. Note that queries are
@ -61,13 +61,13 @@
(setq link (org-make-link "notmuch:" "id:" message-id)) (setq link (org-make-link "notmuch:" "id:" message-id))
(org-add-link-props :link link :description desc) (org-add-link-props :link link :description desc)
link))) link)))
(defun org-notmuch-open (path) (defun org-notmuch-open (path)
"Follow a notmuch message link specified by PATH." "Follow a notmuch message link specified by PATH."
(org-notmuch-follow-link path)) (org-notmuch-follow-link path))
(defun org-notmuch-follow-link (search) (defun org-notmuch-follow-link (search)
"Follow a notmuch link to SEARCH. "Follow a notmuch link to SEARCH.
Can link to more than one message, if so all matching messages are shown." Can link to more than one message, if so all matching messages are shown."
(require 'notmuch) (require 'notmuch)
@ -82,10 +82,10 @@ Can link to more than one message, if so all matching messages are shown."
(defun org-notmuch-search-store-link () (defun org-notmuch-search-store-link ()
"Store a link to a notmuch search or message." "Store a link to a notmuch search or message."
(when (eq major-mode 'notmuch-search-mode) (when (eq major-mode 'notmuch-search-mode)
(let ((link (org-make-link "notmuch-search:" (let ((link (org-make-link "notmuch-search:"
(org-link-escape notmuch-search-query-string))) (org-link-escape notmuch-search-query-string)))
(desc (concat "Notmuch search: " notmuch-search-query-string))) (desc (concat "Notmuch search: " notmuch-search-query-string)))
(org-store-link-props :type "notmuch-search" (org-store-link-props :type "notmuch-search"
:link link :link link
:description desc) :description desc)
link))) link)))

2
contrib/lisp/org-panel.el
View File

@ -639,5 +639,3 @@ button changes the binding of the arrow keys."
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; org-panel.el ends here ;;; org-panel.el ends here

8
contrib/lisp/org-registry.el
View File

@ -145,15 +145,15 @@ buffer."
(defun org-registry-assoc-all (link &optional registry) (defun org-registry-assoc-all (link &optional registry)
"Return all associated entries of LINK in the registry." "Return all associated entries of LINK in the registry."
(org-registry-find-all (org-registry-find-all
(lambda (entry) (string= link (car entry))) (lambda (entry) (string= link (car entry)))
registry)) registry))
(defun org-registry-find-all (test &optional registry) (defun org-registry-find-all (test &optional registry)
"Return all entries satisfying `test' in the registry." "Return all entries satisfying `test' in the registry."
(delq nil (delq nil
(mapcar (mapcar
(lambda (x) (and (funcall test x) x)) (lambda (x) (and (funcall test x) x))
(or registry org-registry-alist)))) (or registry org-registry-alist))))
;;;###autoload ;;;###autoload

8
contrib/lisp/org-screen.el
View File

@ -40,7 +40,7 @@
;; associated with that task, go to the end of your item and type: ;; associated with that task, go to the end of your item and type:
;; ;;
;; M-x org-screen ;; M-x org-screen
;; ;;
;; This will prompt you for a name of a screen session. Type in a ;; This will prompt you for a name of a screen session. Type in a
;; name and it will insert a link into your org file at your current ;; name and it will insert a link into your org file at your current
;; location. ;; location.
@ -79,10 +79,10 @@ is copied from ansi-term method."
;; Pick the name of the new buffer. ;; Pick the name of the new buffer.
(let ((term-ansi-buffer-name (let ((term-ansi-buffer-name
(generate-new-buffer-name (generate-new-buffer-name
(org-screen-buffer-name name)))) (org-screen-buffer-name name))))
(setq term-ansi-buffer-name (setq term-ansi-buffer-name
(term-ansi-make-term (term-ansi-make-term
term-ansi-buffer-name org-screen-program-name nil arg name)) term-ansi-buffer-name org-screen-program-name nil arg name))
(set-buffer term-ansi-buffer-name) (set-buffer term-ansi-buffer-name)
(term-mode) (term-mode)
@ -104,5 +104,5 @@ is copied from ansi-term method."
'("screen" . "elisp:(org-screen-goto \"%s\")")) '("screen" . "elisp:(org-screen-goto \"%s\")"))
(setq org-link-abbrev-alist (setq org-link-abbrev-alist
'(("screen" . "elisp:(org-screen-goto \"%s\")")))) '(("screen" . "elisp:(org-screen-goto \"%s\")"))))
(provide 'org-screen) (provide 'org-screen)

12
contrib/lisp/org-static-mathjax.el
View File

@ -86,7 +86,7 @@ org-static-mathjax-options: The string given with #+STATICMATHJAX: in the f
(set 'org-static-mathjax-mathjax-path (set 'org-static-mathjax-mathjax-path
(car (read-from-string (car (read-from-string
(substring mathjax-options (match-end 0)))))))) (substring mathjax-options (match-end 0))))))))
(add-hook 'after-save-hook (add-hook 'after-save-hook
'org-static-mathjax-process 'org-static-mathjax-process
nil t))))) nil t)))))
@ -117,20 +117,20 @@ org-static-mathjax-options: The string given with #+STATICMATHJAX: in the f
(set symbol (eval (car (read-from-string (set symbol (eval (car (read-from-string
(substring options (match-end 0)))))))) (substring options (match-end 0))))))))
'(embed-fonts output-file-name)) '(embed-fonts output-file-name))
; debug ; debug
(when org-static-mathjax-debug (when org-static-mathjax-debug
(message "output file name, embed-fonts") (message "output file name, embed-fonts")
(print output-file-name) (print output-file-name)
(print embed-fonts)) (print embed-fonts))
; open (temporary) input file, copy contents there, replace MathJax path with local installation ; open (temporary) input file, copy contents there, replace MathJax path with local installation
(with-temp-buffer (with-temp-buffer
(insert html-code) (insert html-code)
(goto-char 1) (goto-char 1)
(replace-regexp mathjax-oldpath mathjax-newpath) (replace-regexp mathjax-oldpath mathjax-newpath)
(write-file input-file-name)) (write-file input-file-name))
; prepare argument list for call-process ; prepare argument list for call-process
(let ((call-process-args (list org-static-mathjax-xulrunner-path (let ((call-process-args (list org-static-mathjax-xulrunner-path
nil nil nil nil nil nil
@ -146,10 +146,10 @@ org-static-mathjax-options: The string given with #+STATICMATHJAX: in the f
(if (not embed-fonts) (if (not embed-fonts)
(progn (progn
(add-to-list 'call-process-args "--final-mathjax-url" t) (add-to-list 'call-process-args "--final-mathjax-url" t)
(add-to-list 'call-process-args (add-to-list 'call-process-args
(file-name-directory org-static-mathjax-mathjax-path) (file-name-directory org-static-mathjax-mathjax-path)
t))) t)))
; debug ; debug
(when org-static-mathjax-debug (when org-static-mathjax-debug
(print call-process-args)) (print call-process-args))

4
contrib/lisp/org-sudoku.el
View File

@ -127,7 +127,7 @@ This works by solving the whole game, then inserting only the single field."
(setq game (org-sudoku-solve-game game)) (setq game (org-sudoku-solve-game game))
(if game (if game
(progn (progn
(org-table-put i j (number-to-string (org-table-put i j (number-to-string
(nth 1 (assoc (cons i j) game))) (nth 1 (assoc (cons i j) game)))
'align) 'align)
(org-table-goto-line i) (org-table-goto-line i)
@ -140,7 +140,7 @@ This works by solving the whole game, then inserting only the single field."
"Interpret table at point as sudoku game and read it. "Interpret table at point as sudoku game and read it.
A game structure is returned." A game structure is returned."
(let (b e g i j game) (let (b e g i j game)
(org-table-goto-line 1) (org-table-goto-line 1)
(org-table-goto-column 1) (org-table-goto-column 1)
(setq b (point)) (setq b (point))

8
contrib/lisp/org-toc.el
View File

@ -278,7 +278,7 @@ specified, then make `org-toc-recenter' use this value."
;;; Navigation functions: ;;; Navigation functions:
(defun org-toc-goto (&optional jump cycle) (defun org-toc-goto (&optional jump cycle)
"From Org TOC buffer, follow the targeted subtree in the Org window. "From Org TOC buffer, follow the targeted subtree in the Org window.
If JUMP is non-nil, go to the base buffer. If JUMP is non-nil, go to the base buffer.
If JUMP is 'delete, go to the base buffer and delete other windows. If JUMP is 'delete, go to the base buffer and delete other windows.
If CYCLE is non-nil, cycle the targeted subtree in the Org window." If CYCLE is non-nil, cycle the targeted subtree in the Org window."
(interactive) (interactive)
@ -459,15 +459,15 @@ status."
(defun org-toc-help () (defun org-toc-help ()
"Display a quick help message in the echo-area for `org-toc-mode'." "Display a quick help message in the echo-area for `org-toc-mode'."
(interactive) (interactive)
(let ((st-start 0) (let ((st-start 0)
(help-message (help-message
"\[space\] show heading \[1-4\] hide headlines below this level "\[space\] show heading \[1-4\] hide headlines below this level
\[TAB\] jump to heading \[f\] toggle follow mode (currently %s) \[TAB\] jump to heading \[f\] toggle follow mode (currently %s)
\[return\] jump and delete others windows \[i\] toggle info mode (currently %s) \[return\] jump and delete others windows \[i\] toggle info mode (currently %s)
\[S-TAB\] cycle subtree (in Org) \[S\] toggle show subtree mode (currently %s) \[S-TAB\] cycle subtree (in Org) \[S\] toggle show subtree mode (currently %s)
\[C-S-TAB\] global cycle (in Org) \[r\] toggle recenter mode (currently %s) \[C-S-TAB\] global cycle (in Org) \[r\] toggle recenter mode (currently %s)
\[:\] cycle subtree (in TOC) \[c\] toggle column view (currently %s) \[:\] cycle subtree (in TOC) \[c\] toggle column view (currently %s)
\[n/p\] next/previous heading \[s\] save TOC configuration \[n/p\] next/previous heading \[s\] save TOC configuration
\[q\] quit the TOC \[g\] restore last TOC configuration")) \[q\] quit the TOC \[g\] restore last TOC configuration"))
(while (string-match "\\[[^]]+\\]" help-message st-start) (while (string-match "\\[[^]]+\\]" help-message st-start)
(add-text-properties (match-beginning 0) (add-text-properties (match-beginning 0)

6
contrib/lisp/org-wikinodes.el
View File

@ -174,7 +174,7 @@ setting of `org-wikinodes-create-targets'."
(message "New Wiki target `%s' created in current buffer" (message "New Wiki target `%s' created in current buffer"
target)))))) target))))))
;;; The target cache ;;; The target cache
(defvar org-wikinodes-directory-targets-cache nil) (defvar org-wikinodes-directory-targets-cache nil)
@ -206,7 +206,7 @@ setting of `org-wikinodes-create-targets'."
(while (re-search-forward re nil t) (while (re-search-forward re nil t)
(push (org-match-string-no-properties 4) targets)))) (push (org-match-string-no-properties 4) targets))))
(nreverse targets))) (nreverse targets)))
(defun org-wikinodes-get-links-for-directory (dir) (defun org-wikinodes-get-links-for-directory (dir)
"Return an alist that connects wiki links to files in directory DIR." "Return an alist that connects wiki links to files in directory DIR."
(let ((files (directory-files dir nil "\\`[^.#].*\\.org\\'")) (let ((files (directory-files dir nil "\\`[^.#].*\\.org\\'"))
@ -328,7 +328,7 @@ with working links."
(setcdr m (cons '(org-wikinodes-activate-links) (cdr m))) (setcdr m (cons '(org-wikinodes-activate-links) (cdr m)))
(message (message
"Failed to add wikinodes to `org-font-lock-extra-keywords'.")))) "Failed to add wikinodes to `org-font-lock-extra-keywords'."))))
(add-hook 'org-font-lock-set-keywords-hook (add-hook 'org-font-lock-set-keywords-hook
'org-wikinodes-add-to-font-lock-keywords) 'org-wikinodes-add-to-font-lock-keywords)

6
contrib/lisp/org2rem.el
View File

@ -402,7 +402,7 @@ REM %s %s MSG EVENT:%s%s %s%s%%
(insert sexp "\n")))) (insert sexp "\n"))))
;; (princ (org-diary-to-rem-string sexp-buffer)) ;; (princ (org-diary-to-rem-string sexp-buffer))
(kill-buffer sexp-buffer)) (kill-buffer sexp-buffer))
(when org-remind-include-todo (when org-remind-include-todo
(setq prefix "TODO-") (setq prefix "TODO-")
(goto-char (point-min)) (goto-char (point-min))
@ -450,7 +450,7 @@ REM %s %s MSG EVENT:%s%s %s%s%%
(if dos diff-days 0) (if dos diff-days 0)
(if dos 0 diff-days)) (if dos 0 diff-days))
1000))) 1000)))
(if (and (numberp org-rem-aw) (> org-rem-aw 0)) (if (and (numberp org-rem-aw) (> org-rem-aw 0))
(setq remind-aw (+ (or remind-aw 0) org-rem-aw))) (setq remind-aw (+ (or remind-aw 0) org-rem-aw)))
@ -470,7 +470,7 @@ REM %s %s MSG EVENT:%s%s %s%s%%
(and due (setq due (org-rem-ts-to-remind-date-type due))) (and due (setq due (org-rem-ts-to-remind-date-type due)))
(and start (setq start (org-rem-ts-to-remind-date-type start))) (and start (setq start (org-rem-ts-to-remind-date-type start)))
(and remind-ew (setq remind-ew (org-rem-ts-to-remind-date-type remind-ew))) (and remind-ew (setq remind-ew (org-rem-ts-to-remind-date-type remind-ew)))
(if (string-match org-bracket-link-regexp hd) (if (string-match org-bracket-link-regexp hd)
(setq hd (replace-match (if (match-end 3) (match-string 3 hd) (setq hd (replace-match (if (match-end 3) (match-string 3 hd)
(match-string 1 hd)) (match-string 1 hd))

1
contrib/lisp/test-org-export-preproc.el
View File

@ -36,4 +36,3 @@
(org-pop-to-buffer-same-window "*preproc-temp*") (org-pop-to-buffer-same-window "*preproc-temp*")
(point-max) (point-max)
(insert string)))) (insert string))))