
* org/org.el (org-html-level-start): Always have id's in HTML (org-export-as-html): Use `org-link-protocols' to retrieve the export form of the link. (org-add-link-type): Final parameter renamed from PUBLISH. Better documentation of how it is to be used. Avoid double entries for the same link type. (org-add-link-props): New function. (org-modules-loaded): New variable. (org-load-modules-maybe, org-set-modules): New function. (org-modules): New option. (org-mode, org-cycle, orgstruct-mode, org-run-like-in-org-mode) (orgtbl-mode, org-store-link, org-insert-link-global) (org-open-at-point): Call `org-load-modules-maybe'. (org-search-view): Add more text properties. (org-agenda-schedule, org-agenda-deadline): Allow also in search-type agendas. (org-search-view): Order of arguments has been changed. Interpret prefix-arg as TODO-ONLY. (org-agenda, org-run-agenda-series, org-agenda-manipulate-query): Take new argument order of `org-search-view' into account. (org-todo-only): New variable. (org-search-syntax-table): New variable and function. (org-search-view): Do the search with the special syntax table. (define-obsolete-function-alias): Make work with XEmacs. (org-add-planning-info): Use old date as default when modifying an existing deadline or scheduled item. (org-agenda-compute-time-span): Make argument N optional. (org-agenda-format-date-aligned): Require `cal-iso'. (org-agenda-list): Include week into into agenda heading, don't list it at each date (only on Mondays). (org-read-date-analyze): Define local variable `iso-date'. (org-agenda-format-date-aligned): Remove dependency on `calendar-time-from-absolute'. (org-remember-apply-template, org-go-to-remember-target): Interpret filenames relative to `org-directory'. (org-complete): Silently fail when trying to complete keywords that don't have a default value. (org-get-current-options): Added a #+DATE: option. (org-additional-option-like-keywords): Removed "DATE:" from the list of additional keywords. (org-export-as-html): Removed (current-time) as unnecessary second argument of `format-time-string'. (org-clock-find-position): Handle special case at end of buffer. (org-agenda-day-view): New argument DAY-OF-YEAR, pass it on to `org-agenda-change-time-span'. (org-agenda-week-view): New argument ISO-WEEK, pass it on to `org-agenda-change-time-span'. (org-agenda-month-view): New argument MONTH, pass it on to `org-agenda-change-time-span'. (org-agenda-year-view): New argument YEAR, pass it on to `org-agenda-change-time-span'. (org-agenda-change-time-span): New optional argument N, pass it on to `org-agenda-compute-time-span'. (org-agenda-compute-time-span): New argument N, interpret it by changing the starting day. (org-small-year-to-year): New function. (org-scheduled-past-days): Respect `org-scheduled-past-days'. (org-auto-repeat-maybe): Make sure that repeating dates are pushed into the future, and that the shift is at least one interval, never 0. (org-update-checkbox-count): Fix bug with checkbox counting. (org-add-note): New command. (org-add-log-setup): Renamed from `org-add-log-maybe'. (org-log-note-headings): New entry for plain notes (i.e. notes not related to state changes or clocking). (org-get-org-file): Check for availability of `remember-data-file'. (org-cached-entry-get): Allow a regexp value for `org-use-property-inheritance'. (org-use-property-inheritance): Allow regexp value. Fix bug in customization type. (org-use-tag-inheritance): Allow a list and a regexp value for this variable. (org-scan-tags, org-get-tags-at): Implement selective tag inheritance. (org-entry-get): Respect value `selective' for the INHERIT argument. (org-tag-inherit-p, org-property-inherit-p): New functions. (org-agenda-format-date-aligned): Allow 10 characters for weekday, to acomodate German locale. (org-add-archive-files): New function. (org-agenda-files): New argument `ext', to get archive files as well. (org-tbl-menu): Protect the use of variables that are only available when org-table.el gets loaded. (org-read-agenda-file-list): Error if `org-agenda-files' is a single directory. (org-open-file): Allow a batch process to trigger waiting after executing a system command. (org-store-link): Link to headline when there is not target and no region in an org-mode buffer when creating a link. (org-link-types-re): New variable. (org-make-link-regexps): Compute `org-link-types-re'. (org-make-link-description-function): New option. (org-agenda-date, org-agenda-date-weekend): New faces. (org-archive-sibling-heading): New option. (org-archive-to-archive-sibling): New function. (org-iswitchb): New command. (org-buffer-list): New function. (org-agenda-columns): Also try the #+COLUMNS line in the buffer associated with the entry at point (or with the first entry in the agenda view). (org-modules): Add entry for org-bibtex.el. (org-completion-fallback-command): Moved into `org-completion' group. (org-clock-heading-function): Moved to `org-progress' group. (org-auto-repeat-maybe): Make sure that a note can be enforces if `org-log-repeat' is `note'. (org-modules): Allow additional symbols for external packages. (org-ctrl-c-ctrl-c): Allow for `org-clock-overlays' to be undefined. (org-clock-goto): Hide drawers after showing an entry with `org-clock-goto.' (org-shiftup, org-shiftdown, org-shiftright, org-shiftleft): Try also a clocktable block shift. (org-clocktable-try-shift): New function. (org-columns-hscoll-title): New function. (org-columns-previous-hscroll): New variable. (org-columns-full-header-line-format): New variable. (org-columns-display-here-title, org-columns-remove-overlays): Install `org-columns-hscoll-title' in post-command-hook. * org/org.el: Split into many small files. * org/org-agenda.el: New file, split off from org.el. * org/org-archive.el: New file, split off from org.el. * org/org-bbdb.el: New file. * org/org-bibtex.el: New file, split off from org.el. * org/org-clock.el: New file, split off from org.el. * org/org-colview.el: New file, split off from org.el. * org/org-compat.el: New file, split off from org.el. * org/org-exp.el: New file, split off from org.el. * org/org-faces.el: New file, split off from org.el. * org/org-gnus.el: New file, split off from org.el. * org/org-info.el: New file, split off from org.el. * org/org-infojs.el: New file. * org/org-irc.el: New file. * org/org-macs.el: New file, split off from org.el. * org/org-mew.el: New file. * org/org-mhe.el: New file, split off from org.el. * org/org-publish.el: New file, split off from org.el. * org/org-remember.el: New file, split off from org.el. * org/org-rmail.el: New file, split off from org.el. * org/org-table.el: New file, split off from org.el. * org/org-vm.el: New file, split off from org.el. * org/org-wl.el: New file, split off from org.el. 2008-04-27 Jason Riedy <jason@acm.org> * lisp/org-table.el (orgtbl-to-generic): Add a :remove-nil-lines parameter that supresses lines that evaluate to NIL. (orgtbl-get-fmt): New inline function for picking apart formats that may be lists. (orgtbl-apply-fmt): New inline function for applying formats that may be functions. (orgtbl-eval-str): New inline function for strings that may be functions. (orgtbl-format-line, orgtbl-to-generic): Use and document. (orgtbl-to-latex, orgtbl-to-texinfo): Document. (*orgtbl-llfmt*, *orgtbl-llstart*) (*orgtbl-llend*): Dynamic variables for last-line formatting. (orgtbl-format-section): Shift formatting to support detecting the last line and formatting it specially. (orgtbl-to-generic): Document :ll* formats. Set to the non-ll formats unless overridden. (orgtbl-to-latex): Suggest using :llend to suppress the final \\. (*orgtbl-table*, *orgtbl-rtn*): Dynamically bound variables to hold the input collection of lines and output formatted text. (*orgtbl-hline*, *orgtbl-sep*, *orgtbl-fmt*, *orgtbl-efmt*, (*orgtbl-lfmt*, *orgtbl-lstart*, *orgtbl-lend*): Dynamically bound format parameters. (orgtbl-format-line): New function encapsulating formatting for a single line. (orgtbl-format-section): Similar for each section. Rebinding the dynamic vars customizes the formatting for each section. (orgtbl-to-generic): Use orgtbl-format-line and orgtbl-format-section. (org-get-param): Now unused, so delete. (orgtbl-gather-send-defs): New function to gather all the SEND definitions before a table. (orgtbl-send-replace-tbl): New function to find the RECEIVE corresponding to the current name. (orgtbl-send-table): Use the previous two functions and implement multiple destinations for each table. * doc/org.texi (A LaTeX example): Note that fmt may be a one-argument function, and efmt may be a two-argument function. (Radio tables): Document multiple destinations. 2008-04-27 Carsten Dominik <dominik@science.uva.nl> * org/org-agenda.el (org-add-to-diary-list): New function. (org-prefix-has-effort): New variable. (org-sort-agenda-noeffort-is-high): New option. (org-agenda-columns-show-summaries) (org-agenda-columns-compute-summary-properties): New options. (org-format-agenda-item): Compute the duration of the item. (org-agenda-weekend-days): New variable. (org-agenda-list, org-timeline): Use the proper faces for dates in the agenda and timeline buffers. (org-agenda-archive-to-archive-sibling): New command. (org-agenda-start-with-clockreport-mode): New option. (org-agenda-clockreport-parameter-plist): New option. (org-agenda-clocktable-mode): New variable. (org-agenda-deadline-leaders): Allow a function value for the deadline leader. (org-agenda-get-deadlines): Deal with new function value. * lisp/org-clock.el (org-clock): New customization group. (org-clock-into-drawer, org-clock-out-when-done) (org-clock-in-switch-to-state, org-clock-heading-function): Moved into the new group. (org-clock-out-remove-zero-time-clocks): New option. (org-clock-out): Use `org-clock-out-remove-zero-time-clocks'. (org-dblock-write:clocktable): Allow a Lisp form for the scope parameter. (org-dblock-write:clocktable): Fixed bug with total time calculation. (org-dblock-write:clocktable): Request the unrestricted list of files. (org-get-clocktable): New function. (org-dblock-write:clocktable): Make sure :tstart and :tend can not only be strings but also integers (an absolute day number) and lists (m d y). * org/org-colview.el (org-columns-next-allowed-value) (org-columns-edit-value): Limit the effort for updatig in the agenda to recomputing a single file. (org-columns-compute): Only write property value if it has changed. This avoids raising the buffer-change-flag unnecessarily. (org-agenda-colview-summarize) (org-agenda-colview-compute): New functions. (org-agenda-columns): Call `org-agenda-colview-summarize'. * org/org-exp.el (org-export-run-in-background): New option. (org-export-icalendar): Allow a batch process to trigger waiting after executing a system command. (org-export-preprocess-string): Renamed-from `org-cleaned-string-for-export'. (org-export-html-style): Made target class look like normal text. (org-export-as-html): Make use of the better proprocessing in `org-cleaned-string-for-export'. (org-cleaned-string-for-export): Better treatment of heuristic targets, many more internal links will now work in HTML export. (org-get-current-options): Incorporate LINK_UP, LINK_HOME, and INFOJS. (org-export-inbuffer-options-extra): New variable. (org-export-options-filters): New hook. (org-infile-export-plist): Find also the settings keywords in `org-export-inbuffer-options-extra'. (org-infile-export-plist): Allow multiple #+OPTIONS lines and multiple #+INFOJS_OPT lines. (org-export-html-handle-js-options): New function. (org-export-html-infojs-setup): New option. (org-export-as-html): Call `org-export-html-handle-js-options'. Add autoload to all entry points. (org-skip-comments): Function removed. * org/org-table.el (org-table-make-reference): Extra parenthesis around single fields, to make sure that algebraic formulas get correctly interpreted by calc. (org-table-current-column): No longer interactive. * org/org-export-latex.el (org-export-latex-preprocess): Renamed from `org-export-latex-cleaned-string'. 2008-04-27 Bastien Guerry <bzg@altern.org> * org/org-publish.el (org-publish-get-base-files-1): New function. (org-publish-get-base-files): Use it. (org-publish-temp-files): New variable. Don't require 'dired-aux anymore. (org-publish-initial-buffer): New variable. (org-publish-org-to, org-publish): Use it. (org-publish-get-base-files-1): Bug fix: get the proper list of files when recursing thru a directory. (org-publish-get-base-files): Use the :exclude property to skip both files and directories.
257 lines
10 KiB
EmacsLisp
257 lines
10 KiB
EmacsLisp
;;; org-irc.el --- Store links to IRC sessions
|
|
;;
|
|
;; Copyright (C) 2008 Free Software Foundation, Inc.
|
|
;;
|
|
;; Author: Philip Jackson <emacs@shellarchive.co.uk>
|
|
;; Keywords: erc, irc, link, org
|
|
;; Version: 6.02b
|
|
;;
|
|
;; This file is part of GNU Emacs.
|
|
;;
|
|
;; GNU Emacs is free software; you can redistribute it and/or modify
|
|
;; it under the terms of the GNU General Public License as published by
|
|
;; the Free Software Foundation; either version 3, or (at your option)
|
|
;; any later version.
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;; GNU General Public License for more details.
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with GNU Emacs; see the file COPYING. If not, write to the
|
|
;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
|
;; Boston, MA 02110-1301, USA.
|
|
|
|
;;; Commentary:
|
|
|
|
;; This file implements links to an IRC session from within Org-mode.
|
|
;; Org-mode loads this module by default - if this is not what you want,
|
|
;; configure the variable `org-modules'.
|
|
;;
|
|
;; Please customize the variable `org-default-extensions' to select
|
|
;; extensions you would like to use, and to deselect those which you don't
|
|
;; want.
|
|
;;
|
|
;; Please note that at the moment only ERC is supported. Other clients
|
|
;; shouldn't be difficult to add though.
|
|
;;
|
|
;; Then set `org-irc-link-to-logs' to non-nil if you would like a
|
|
;; file:/ type link to be created to the current line in the logs or
|
|
;; to t if you would like to create an irc:/ style link.
|
|
;;
|
|
;; Links within an org buffer might look like this:
|
|
;;
|
|
;; [[irc:/irc.freenode.net/#emacs/bob][chat with bob in #emacs on freenode]]
|
|
;; [[irc:/irc.freenode.net/#emacs][#emacs on freenode]]
|
|
;; [[irc:/irc.freenode.net/]]
|
|
;;
|
|
;; If, when the resulting link is visited, there is no connection to a
|
|
;; requested server then one will be created.
|
|
|
|
;;; Code:
|
|
|
|
(require 'org)
|
|
|
|
;; Declare the function fomr ERC that we use.
|
|
(declare-function erc-current-logfile "erc-log" (&optional buffer))
|
|
(declare-function erc-prompt "erc" ())
|
|
(declare-function erc-default-target "erc" ())
|
|
(declare-function erc-channel-p "erc" (channel))
|
|
(declare-function erc-buffer-filter "erc" (predicate &optional proc))
|
|
(declare-function erc-server-buffer "erc" ())
|
|
(declare-function erc-get-server-nickname-list "erc" ())
|
|
(declare-function erc-cmd-JOIN "erc" (channel &optional key))
|
|
|
|
(defvar org-irc-client 'erc
|
|
"The IRC client to act on.")
|
|
(defvar org-irc-link-to-logs nil
|
|
"Non-nil will store a link to the logs, nil will store an irc: style link.")
|
|
|
|
(defvar erc-default-port) ; dynamically scoped from erc.el
|
|
(defvar erc-session-port) ; dynamically scoped form erc-backend.el
|
|
(defvar erc-session-server) ; dynamically scoped form erc-backend.el
|
|
|
|
;; Generic functions/config (extend these for other clients)
|
|
|
|
(add-to-list 'org-store-link-functions 'org-irc-store-link)
|
|
|
|
(org-add-link-type "irc" 'org-irc-visit nil)
|
|
|
|
(defun org-irc-visit (link)
|
|
"Parse LINK and dispatch to the correct function based on the client found."
|
|
(let ((link (org-irc-parse-link link)))
|
|
(cond
|
|
((eq org-irc-client 'erc)
|
|
(org-irc-visit-erc link))
|
|
(t
|
|
(error "erc only known client")))))
|
|
|
|
(defun org-irc-parse-link (link)
|
|
"Parse an IRC LINK and return the attributes found.
|
|
Parse a LINK that looks like server:port/chan/user (port, chan
|
|
and user being optional) and return any or the port, channel or user
|
|
attributes that are found."
|
|
(let* ((parts (split-string link "/" t))
|
|
(len (length parts)))
|
|
(when (or (< len 1) (> len 3))
|
|
(error "Failed to parse link needed 1-3 parts, got %d" len))
|
|
(setcar parts (split-string (car parts) ":" t))
|
|
parts))
|
|
|
|
;;;###autoload
|
|
(defun org-irc-store-link ()
|
|
"Dispatch to the appropriate function to store a link to an IRC session."
|
|
(cond
|
|
((eq major-mode 'erc-mode)
|
|
(org-irc-erc-store-link))))
|
|
|
|
(defun org-irc-elipsify-description (string &optional after)
|
|
"Remove unnecessary white space from STRING and add ellipses if necessary.
|
|
Strip starting and ending white space from STRING and replace any
|
|
chars that the value AFTER with '...'"
|
|
(let* ((after (number-to-string (or after 30)))
|
|
(replace-map (list (cons "^[ \t]*" "")
|
|
(cons "[ \t]*$" "")
|
|
(cons (concat "^\\(.\\{" after
|
|
"\\}\\).*") "\\1..."))))
|
|
(mapc (lambda (x)
|
|
(when (string-match (car x) string)
|
|
(setq string (replace-match (cdr x) nil nil string))))
|
|
replace-map)
|
|
string))
|
|
|
|
;; ERC specific functions
|
|
|
|
(defun org-irc-erc-get-line-from-log (erc-line)
|
|
"Find the best line to link to from the ERC logs given ERC-LINE as a start.
|
|
If the user is on the ERC-prompt then search backward for the
|
|
first non-blank line, otherwise return the current line. The
|
|
result is a cons of the filename and search string."
|
|
(erc-save-buffer-in-logs)
|
|
(require 'erc-log)
|
|
(with-current-buffer (find-file-noselect (erc-current-logfile))
|
|
(goto-char (point-max))
|
|
(list
|
|
(abbreviate-file-name buffer-file-name)
|
|
;; can we get a '::' part?
|
|
(if (string= erc-line (erc-prompt))
|
|
(progn
|
|
(goto-char (point-at-bol))
|
|
(when (search-backward-regexp "^[^ ]" nil t)
|
|
(buffer-substring-no-properties (point-at-bol)
|
|
(point-at-eol))))
|
|
(when (search-backward erc-line nil t)
|
|
(buffer-substring-no-properties (point-at-bol)
|
|
(point-at-eol)))))))
|
|
|
|
(defun org-irc-erc-store-link ()
|
|
"Store a link to the IRC log file or the session itself.
|
|
Depending on the variable `org-irc-link-to-logs' store either a
|
|
link to the log file for the current session or an irc: link to
|
|
the session itself."
|
|
(require 'erc-log)
|
|
(if org-irc-link-to-logs
|
|
(let* ((erc-line (buffer-substring-no-properties
|
|
(point-at-bol) (point-at-eol)))
|
|
(parsed-line (org-irc-erc-get-line-from-log erc-line)))
|
|
(if (erc-logging-enabled nil)
|
|
(progn
|
|
(org-store-link-props
|
|
:type "file"
|
|
:description (concat "'" (org-irc-elipsify-description
|
|
(cadr parsed-line) 20)
|
|
"' from an IRC conversation")
|
|
:link (concat "file:" (car parsed-line) "::"
|
|
(cadr parsed-line)))
|
|
t)
|
|
(error "This ERC session is not being logged")))
|
|
(let* ((link-text (org-irc-get-erc-link))
|
|
(link (org-irc-parse-link link-text)))
|
|
(if link-text
|
|
(progn
|
|
(org-store-link-props
|
|
:type "irc"
|
|
:link (org-make-link "irc:/" link-text)
|
|
:description (concat "irc session '" link-text "'")
|
|
:server (car (car link))
|
|
:port (or (string-to-number (cadr (pop link))) erc-default-port)
|
|
:nick (pop link))
|
|
t)
|
|
(error "Failed to create ('irc:/' style) ERC link")))))
|
|
|
|
(defun org-irc-get-erc-link ()
|
|
"Return an org compatible irc:/ link from an ERC buffer."
|
|
(let* ((session-port (if (numberp erc-session-port)
|
|
(number-to-string erc-session-port)
|
|
erc-session-port))
|
|
(link (concat erc-session-server ":" session-port)))
|
|
(concat link "/"
|
|
(if (and (erc-default-target)
|
|
(erc-channel-p (erc-default-target))
|
|
(car (get-text-property (point) 'erc-data)))
|
|
;; we can get a nick
|
|
(let ((nick (car (get-text-property (point) 'erc-data))))
|
|
(concat (erc-default-target) "/" nick))
|
|
(erc-default-target)))))
|
|
|
|
(defun org-irc-get-current-erc-port ()
|
|
"Return the current port as a number.
|
|
Return the current port number or, if none is set, return the ERC
|
|
default."
|
|
(cond
|
|
((stringp erc-session-port)
|
|
(string-to-number erc-session-port))
|
|
((numberp erc-session-port)
|
|
erc-session-port)
|
|
(t
|
|
erc-default-port)))
|
|
|
|
(defun org-irc-visit-erc (link)
|
|
"Visit an ERC buffer based on criteria found in LINK."
|
|
(require 'erc)
|
|
(require 'erc-log)
|
|
(let* ((server (car (car link)))
|
|
(port (or (string-to-number (cadr (pop link))) erc-default-port))
|
|
(server-buffer)
|
|
(buffer-list
|
|
(erc-buffer-filter
|
|
(lambda nil
|
|
(let ((tmp-server-buf (erc-server-buffer)))
|
|
(and tmp-server-buf
|
|
(with-current-buffer tmp-server-buf
|
|
(and
|
|
(eq (org-irc-get-current-erc-port) port)
|
|
(string= erc-session-server server)
|
|
(setq server-buffer tmp-server-buf)))))))))
|
|
(if buffer-list
|
|
(let ((chan-name (pop link)))
|
|
;; if we got a channel name then switch to it or join it
|
|
(if chan-name
|
|
(let ((chan-buf (catch 'found
|
|
(dolist (x buffer-list)
|
|
(if (string= (buffer-name x) chan-name)
|
|
(throw 'found x))))))
|
|
(if chan-buf
|
|
(progn
|
|
(switch-to-buffer chan-buf)
|
|
;; if we got a nick, and they're in the chan,
|
|
;; then start a chat with them
|
|
(let ((nick (pop link)))
|
|
(when nick
|
|
(if (member nick (erc-get-server-nickname-list))
|
|
(progn
|
|
(goto-char (point-max))
|
|
(insert (concat nick ": ")))
|
|
(error "%s not found in %s" nick chan-name)))))
|
|
(progn
|
|
(switch-to-buffer server-buffer)
|
|
(erc-cmd-JOIN chan-name))))
|
|
(switch-to-buffer server-buffer)))
|
|
;; no server match, make new connection
|
|
(erc-select :server server :port port))))
|
|
|
|
(provide 'org-irc)
|
|
|
|
;; arch-tag: 018d7dda-53b8-4a35-ba92-6670939e525a
|
|
;;; org-irc.el ends here
|