mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-01-12 16:23:57 +00:00
8d64207425
* org.el (org-set-tags-to): New command. * org-latex.el (org-export-latex-set-initial-vars): Also check in the plist. * org.el (org-additional-option-like-keywords): Add LATEX_CLASS keyword. * org-exp.el (org-infile-export-plist): Add LATEX_CLASS keyword. 2009-10-01 Carsten Dominik <carsten.dominik@gmail.com> * org-inlinetask.el (org-inlinetask-export): Option removed. (org-inlinetask-export-handler): Better export. * org-xoxo.el (org-export-xoxo-final-hook): New hook. (org-export-as-xoxo): Run the new hook. * org-html.el (org-export-html-final-hook): New hook. (org-export-as-html): Run the new hook. * org-docbook.el (org-export-docbook-final-hook): New hook. (org-export-as-docbook): Run the new hook. * org-ascii.el (org-export-ascii-final-hook): New hook. (org-export-as-ascii): Run the new hook. * org-latex.el (org-export-latex-treat-sub-super-char): Allow a space character as the character before the ^/_. (org-export-latex-final-hook): New hook. (org-export-as-latex): Run `org-export-latex-final-hook'. 2009-10-01 Carsten Dominik <carsten.dominik@gmail.com> * org-macs.el (org-if-unprotected-at): Fix docstring. * org-agenda.el (org-agenda-change-all-lines): Handle invisible text in the prefix (if category is a link). * org-latex.el (org-export-latex-preprocess): Deal properly with empty lines in verse environments. * org.el (org-format-latex-header): Inline fullpage.sty. * org-footnote.el (org-footnote-create-definition): Reveal context to add a new footnote definition. * org.el (org-ctrl-c-ctrl-c): Pass prefix arg to org-table-recalculate when cursor is in TBLFM line. * org-list.el (org-renumber-ordered-list): Fix cursor position when bullet length has changed. 2009-10-01 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-format-latex): Mention `org-format-latex-options' in the docstring. 2009-10-01 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-agenda-get): New function. * org-agenda.el (org-agenda-post-command-hook): No longer move point away from end of line. (org-agenda-add-entry-text, org-agenda-collect-markers) (org-finalize-agenda, org-agenda-mark-clocking-task) (org-agenda-dim-blocked-tasks, org-agenda-entry-text-show-here) (org-agenda-entry-text-show, org-agenda-highlight-todo) (org-agenda-compare-effort, org-agenda-filter-apply) (org-agenda-later, org-agenda-change-time-span) (org-agenda-post-command-hook, org-agenda-show-priority) (org-agenda-show-tags, org-agenda-goto, org-agenda-kill) (org-agenda-archive, org-agenda-archive-to-archive-sibling) (org-remove-subtree-entries-from-agenda, org-agenda-refile) (org-agenda-open-link, org-agenda-copy-local-variable) (org-agenda-switch-to, org-agenda-check-no-diary) (org-agenda-tree-to-indirect-buffer, org-agenda-todo) (org-agenda-add-note, org-agenda-change-all-lines) (org-agenda-priority, org-agenda-set-tags) (org-agenda-set-property, org-agenda-set-effort) (org-agenda-toggle-archive-tag, org-agenda-date-later) (org-agenda-show-new-time, org-agenda-date-prompt) (org-agenda-schedule, org-agenda-deadline, org-agenda-action) (org-agenda-clock-in, org-agenda-bulk-mark) (org-agenda-bulk-unmark, org-agenda-show-the-flagging-note): Use `org-get-at-bol'. * org-colview.el (org-columns-display-here) (org-columns-edit-allowed, org-agenda-columns): Use `org-get-at-bol'. 2009-10-01 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-special-ctrl-a/e): Improve documentation and customize type. (org-end-of-line): Don't jump to after the ellipsis. (org-mode-map): Bind <home> and <end> as well. 2009-10-01 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-fontify-meta-lines-and-blocks): Treat lines with a space after #+ as comments. (org-open-at-point): Run `org-follow-link-hook' always. * org-latex.el (org-export-latex-emph-format): Use better commands to insert special characters in verbatim snippets. 2009-10-01 Carsten Dominik <carsten.dominik@gmail.com> * org-faces.el (org-copy-face): New function. Use it to create various faces formerly created by using `copy-face'. * org-agenda.el (org-prepare-agenda): Don't officially mark this window dedicated. (org-agenda-quit): Kill the frame containing the agenda window if that frame was created for the agenda. 2009-10-01 Carsten Dominik <carsten.dominik@gmail.com> * org-agenda.el (org-agenda-date-prompt): Mark the changed time stamp in the agenda. 2009-10-01 Carsten Dominik <carsten.dominik@gmail.com> * org-agenda.el (org-prepare-agenda): Reset `org-drawers-for-agenda'. (org-prepare-agenda): Uniquify list of drawers. * org.el (org-complex-heading-regexp-format): New variable. (org-set-regexps-and-options): Define `org-complex-heading-regexp-format'. (org-drawers-for-agenda): New variable. (org-map-entries): Bind `org-drawers-for-agenda'. (org-prepare-agenda-buffers): Add to `org-drawers-for-agenda'. * org-remember.el (org-go-to-remember-target) (org-remember-handler): Use `org-complex-heading-regexp-format'. 2009-10-01 Carsten Dominik <carsten.dominik@gmail.com> * org-agenda.el (org-agenda-highlight-todo): Fix text property problem. * org.el (org-on-heading-p, org-at-heading-p): Make sure these are always with `invisible-ok'. (org-store-link): No error when there is nothing to link to in the agenda. * org-list.el (org-update-checkbox-count): Insert changed cookie before the old, to avoid problems with invisibility at the end of the line. (org-update-checkbox-count): Insert changed cookie before the old, to avoid problems with invisibility at the end of the line. * org.el (org-sort-entries-or-items): Include the final newline. (org-fontify-meta-lines-and-blocks): Add indented dynamic block lines for fontification. (org-dblock-start-re, org-dblock-end-re): Allow indentation. (org-prepare-dblock): Store the current indentation of the BEGIN line. (org-update-dblock): Apply the indentation of the begin line to the rest of the block. (org-ctrl-c-ctrl-c): Also find indented dblock lines. (org-startup-folded): New allowed value `showeverything'. (org-startup-options): Add STARTUP keyword `showeverything'. (org-set-startup-visibility): Respect value `showeverything' in org-startup-folded. 2009-10-01 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-closest-date): Fix issue with past preference. * org-archive.el (org-archive-set-tag) (org-archive-subtree-default): New commands. * org-clock.el (org-clock-clocktable-default-properties): New option. (org-clock-report): Use `org-clock-clocktable-default-properties'. 2009-10-01 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-iswitchb-completing-read): Fix typo. * org-crypt.el: New file. * org.el: Add an entry for org-crypt. 2009-10-01 Carsten Dominik <carsten.dominik@gmail.com> * org-agenda.el (org-agenda-menu): Reorganize the menu for more consistency. (org-batch-store-agenda-views): New function. (org-agenda-title-append): Define variable. (org-write-agenda): New export to Org files. (org-agenda-get-some-entry-text): New arguments INDENT and KEEP. (org-agenda): Allow to keep the restricted file list if a special variable is bound to t. (org-agenda): Define a special agenda view for working on flagged entries. (org-agenda-get-restriction-and-command): List the new agenda view. (org-agenda-show-the-flagging-note): New command. (org-agenda-mode-map): New key `?' for looking at the flagging note. * org.el (org-autoload): Autoload org-mobile.el. (org-org-menu): Add menu commands for MobileOrg in the Org menu. * org-mobile.el: New file. * org-id.el (org-id-get): Fix bug with forcing ID on an item. 2009-10-01 Carsten Dominik <carsten.dominik@gmail.com> * org-table.el (orgtbl-line-start-regexp): Match also TBLNAME statements. (org-table-get-remote-range): Match indented #+TBLNAME statements. * org.el (org-convert-to-odd-levels) (org-convert-to-oddeven-levels): Work also correctly if the file is in outline-mode. 2009-10-01 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-store-link): When in agenda buffer, link to referenced entry. (org-add-planning-info): Remove spaces at eol. * org-macs.el (org-with-point-at): Add a `lisp-indent-function' property. 2009-10-01 Carsten Dominik <carsten.dominik@gmail.com> * org-latex.el (org-export-latex-first-lines): Fix problem with LaTeX export of first line and selected subtree. * org.el (org-shifttab): Interpret arg differently when using only odd levels. 2009-10-01 Bastien Guerry <bzg@altern.org> * org.el (org-check-agenda-file): Use a more explicit message 2009-10-01 Carsten Dominik <carsten.dominik@gmail.com> * org-exp.el (org-export-remove-special-table-lines): Don't remove normal lines. 2009-10-01 Bastien Guerry <bzg@altern.org> * org.el (org-offer-links-in-entry): Don't use "Select link" as a prompt in the temporary window. * org-agenda.el (org-agenda-bulk-mark): Use a slightly soberer prefix for marked entries in the agenda view. 2009-10-01 Andreas Burtzlaff <andy13@gmx.net> (tiny change) * org.el (outline-end-of-subtree): Bugfix: advise this function in a way that prevents any trailing character from being displayed. 2009-10-01 Carsten Dominik <carsten.dominik@gmail.com> * org-agenda.el (org-agenda-menu): Fix bugs in the bulk action menu. * org-exp.el (org-export-remove-special-table-lines): Remove bad slow regexp match. 2009-10-01 Carsten Dominik <carsten.dominik@gmail.com> * org-latex.el (org-export-latex-preprocess): Do not protect in the LaTeX header. * org-src.el (org-edit-src-save): Save window setup while saving. (org-edit-src-code): Use new buffer name construction scheme. 2009-10-01 Carsten Dominik <carsten.dominik@gmail.com> * org-agenda.el (org-agenda-entry-text-exclude-regexps): New variable. (org-agenda-entry-text-cleanup-hook): New hook. (org-agenda-get-some-entry-text): Remove matches of `org-agenda-entry-text-exclude-regexps' and run the hook `org-agenda-entry-text-cleanup-hook'. * org.el (org-offer-links-in-entry): New argument ZERO to implement a link with index zero. (org-cycle-show-empty-lines): Not keep empty line under header hidden. (org-iswitchb-completing-read): Bind `switchb-use-virtual-buffers' to nil for special completion. (org-store-link): Don't error before the first heading. * org-agenda.el (org-agenda-open-link): Pass the prefix to `org-offer-links-in-entry'. 2009-10-01 Carsten Dominik <carsten.dominik@gmail.com> * org-agenda.el (org-agenda-quit): Provide the window argument for `window-dedicated-p', Emacs 22 needs it. (org-format-agenda-item): If the category is a link, arrange for invisible text to replaced with spaces. (org-compile-prefix-format): Add the extra space. (org-prefix-category-length): New variable. * org-exp.el (org-export-cleanup-toc-line): Remove footnote references from TOC lines. * org.el (org-selected-window): New variable. * org-table.el (org-table-edit-formulas): Remember the selected window. (org-table-fedit-finish, org-table-fedit-abort): Select the window that was originally selected. * org-exp.el (org-export-preprocess-apply-macros): Scan the expansion of a macro for more macro definitions. * org-agenda.el (org-agenda-dim-blocked-tasks): Make sure the invisibility overlay starts on the newline.
257 lines
8.9 KiB
EmacsLisp
257 lines
8.9 KiB
EmacsLisp
;;; org-irc.el --- Store links to IRC sessions
|
|
;;
|
|
;; Copyright (C) 2008, 2009 Free Software Foundation, Inc.
|
|
;;
|
|
;; Author: Philip Jackson <emacs@shellarchive.co.uk>
|
|
;; Keywords: erc, irc, link, org
|
|
;; Version: 6.31a
|
|
;;
|
|
;; 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 of the License, 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. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
;;; 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-modules' 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 form 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 of 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
|