Mercurial > emacs
view lisp/gnus/nnir.el @ 107863:594e81986a75
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-insert-link): Find the link buffer on visible
frames.
(org-export-latex-default-packages-alist): hyperref must be loaded
late.
(org-open-file): More care with the new matching for file links.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-preprocess): Do not yet protect
defined entities - these will be taken care of later.
(org-export-latex-special-chars): Post-process entity replacement.
(org-export-latex-fontify-headline): Do not yet protect defined
entities - these will be taken care of later.
(org-export-latex-tables, org-export-latex-links): Format the
caption properly.
* org-entities.el (org-entities-user): Fix typo.
* org.el (org-prepare-agenda-buffers): Uniquify TODO keywords
* org-entities.el (org-entities-user): Improve docstring.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-entities.el (org-macs): Require org-macs, to be sure that we
have `declare-function' defined.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-classes): Update docstring.
* org.el (org-format-latex-header): Add cookies to the header.
(org-splice-latex-header): Implement placement according to
cookies.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-publish.el (org-publish-aux-preprocess): Control case
sensitivity.
2010-04-10 Bastien Guerry <bzg@altern.org>
* org.el (org-splice-latex-header): Fix typo.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-make-header): Use
`org-splice-latex-header' to build the header.
(org-export-latex-classes): Update docstring.
* org.el (org-splice-latex-header): New function.
(org-create-formula-image): Use `org-splice-latex-header' to build
the header.
* org-gnus.el (org-gnus-follow-link): Handle nndoc backend.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-export-latex-packages-alist)
(org-export-latex-default-packages-alist): Fix docstring to
reflect the expected structure.
* org-docbook.el (org-docbook-do-expand): Fix bug with variable names.
(org-export-docbook-finalize-table): Make use of label for tables.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-attach.el (org-attach-commit): Split on newlines.
* org.el (org-export-latex-default-packages-alist): Use list
instead of cons for the entries.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-entities.el (org-entity-get-representation): Catch the case
that there is not entry in the list.
* org-mobile.el (org-mobile-use-encryption)
(org-mobile-encryption-tempfile, org-mobile-encryption-password):
New options.
(org-mobile-check-setup): CHeck the encryption setup.
(org-mobile-copy-agenda-files, org-mobile-sumo-agenda-command)
(org-mobile-create-sumo-agenda): Use encryption code.
(org-mobile-encrypt-and-move): New function.
(org-mobile-encrypt-file, org-mobile-decrypt-file): New
functions.
(org-mobile-move-capture): Decrypt the capture file.
* org.el (org-entities): Require the new file.
(org-export-latex-default-packages-alist): New variable.
(org-complete): Use new entity code for completion.
(org-create-formula-image): Use the new packages variable.
* org-latex.el (org-export-latex-classes): Remove the standard
packages from the class headers.
(org-export-latex-make-header): Use the new package variable.
(org-export-latex-special-chars): Better regexp for entities, to
support entity name that contain numbers.
(org-export-latex-treat-backslash-char): Use the new entity code.
* org-html.el (org-html-do-expand): Use the new entity code.
* org-exp.el (org-export): Add the new export commands.
(org-html-entities): Constant removed.
(org-export-visible): Add the new export commands.
* org-entities.el: New file.
* org-docbook.el (org-docbook-do-expand): Use new entity code.
* org-ascii.el (org-export-ascii-entities): New variable.
(org-export-as-latin1, org-export-as-latin1-to-buffer)
(org-export-as-utf8, org-export-as-utf8-to-buffer): New commands.
(org-export-as-encoding): New function.
(org-export-ascii-preprocess): Call `org-ascii-replace-entities'.
(org-ascii-replace-entities): New function.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-html.el (org-html-level-start): Catch the case that target
might be nil.
2010-04-10 Dan Davison <davison@stats.ox.ac.uk>
* org.el (org-appearance): Change Customize group variable name
from org-font-lock to org-appearance, and change tag from "Org
Font Lock" to "Org Appearance"
(org-odd-levels-only): Change Customize group variable name
(org-level-color-stars-only): Change Customize group variable name
(org-hide-leading-stars): Change Customize group variable name
(org-hidden-keywords): Change Customize group variable name
(org-fontify-done-headline): Change Customize group variable name
(org-fontify-emphasized-text): Change Customize group variable name
(org-fontify-whole-heading-line): Change Customize group variable name
(org-highlight-latex-fragments-and-specials): Change Customize
group variable name
(org-hide-emphasis-markers): Change Customize group variable name
(org-emphasis-alist): Change Customize group variable name
(org-emphasis-regexp-components): Change Customize group variable
name
(org-modules): Remove mention of org-R
* org-faces.el (org-faces): Change Customize group variable name
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-diary-last-run-time): New variable.
(org-diary): prepare agenda buffers only if last call was some
time ago.
* org-html.el (org-export-html-preprocess): Replace \ref macros
with a link.
(org-format-org-table-html): Add the label as an anchor.
* org-docbook.el (org-export-docbook-format-image): Do some
formatting on captions.
* org-latex.el (org-export-latex-tables, org-export-latex-links):
Do some formatting on captions.
* org-html.el (org-export-html-format-image)
(org-format-org-table-html): Do some formatting on captions.
2010-04-10 Dan Davison <davison@stats.ox.ac.uk>
* org.el (org-hidden-keywords): New customizable variable. This is
a list of symbols specifying which of the special keywords #+DATE,
#+AUTHOR, #+EMAIL and #+TITLE should be hidden by font lock.
(org-fontify-meta-lines-and-blocks): Changes to font-lock code
implementing new faces and hiding behaviour.
* org-faces.el (org-document-title): New face for #+TITLE lines
(org-document-info): New face for #+DATE, #+AUTHOR, #+EMAIL lines
(org-document-info-keyword): New face for #+DATE, #+AUTHOR, #+EMAIL keywords
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-publish.el (org-publish-sanitize-plist): New function to
rename "index" properties to "sitemap". Do this renaming
globally.
(org-publish-with-aux-preprocess-maybe): New macro.
(org-publish-org-to-pdf, org-publish-org-to-html): Use the new
macro.
(org-publish-aux-preprocess)
(org-publish-index-generate-theindex.inc): New function.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-table.el (org-table-align): Interpret <N> at fixed width,
not as maximum width.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-author-info, org-export-email-info): Fix
docstrings.
* org-beamer.el (org-beamer-select-environment): Renamed from
`org-beamer-set-environment-tag'. Improve docstring.
* org-freemind.el (org-freemind-write-mm-buffer): Fix another
problem with odd levels.
* org-ascii.el (org-export-as-ascii): Export email only if the
author wants it.
* org-docbook.el (org-export-as-docbook): Export email only if the
author wants it.
* org-html.el (org-export-as-html): Export email only if the
author wants it.
* org-exp.el (org-export-email-info): New option.
(org-export-plist-vars): Add entry for `org-export-email'.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-table.el (org-table-goto-line): Fix typo.
2010-04-10 Mikael Fornius <mfo@abc.se>
* org.el (org-agenda-files): Typo.
(org-read-agenda-file-list): Add optional argument to help
`org-store-new-agenda-file-list' to remember un-expanded file
names. Expand file names relative to `org-directory'.
(org-store-new-agenda-file-list): Keep un-expanded file names when
saving, if available.
(org-agenda-files): Update documentation.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-ascii.el (org-export-as-ascii): Catch the case of exporting
a buffer with no file name attached.
* org.el (org-log-refile): New option.
(org-log-note-headings): Add a heading for refiling.
(org-startup-options): Add keywords for logging of the refile
action.
(org-refile): Add logging action.
(org-add-log-note): Allow for refiling action.
* org-agenda.el (org-agenda-bulk-action): Make sure
`org-log-refile' is not `note' during a bulk action.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-map-dblocks): Use save-excursion to remember the
position.
* org-attach.el (org-attach-commit): Remove dependence on xargs.
(org-attach-delete-one): Commit after deleting a file.
* org-latex.el (org-export-latex-fontify): Do not mistake table.el
borders for strike-through emphasis.
* org-freemind.el (org-freemind-write-mm-buffer): Simplify the
handling of odd levels.
* org-agenda.el (org-agenda-todo-ignore-deadlines): Document `past'
and `future' values.
(org-agenda-check-for-timestamp-as-reason-to-ignore-todo-item):
Handle `past' and `future' values.
* org.el (org-read-agenda-file-list): Interpret file names
relative to org-directory and allow environment variables and
"~".
* org-latex.el (org-export-latex-special-chars): Allow a
parenthesis before an exponent or subscript.
2010-04-10 Dan Davison <davison@stats.ox.ac.uk>
* org-src.el (org-edit-src-exit): When returning from code edit
buffer, if code block is hidden, leave point at start of
#+begin_src line
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-insert-heading): Do not remove all spaces if the
headline is empty.
* org-indent.el (org-indent): Fix group name.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-table.el (org-table-goto-column): Fix forcing a non-existing
column.
(org-table-get, org-table-put, org-table-goto-line)
(org-table-current-line): New functions.
2010-04-10 Jan Bcker <jan.boecker@jboecker.de>
* org.el (org-open-file): Allow regular expressions in
org-file-apps to capture link parameters using groups. In a
command string to be executed, the parameters can be referenced
using %1, %2, etc. Lisp forms can access them using
(match-string n link).
(org-apps-regexp-alist): Adopt the created regexp, as this is now
matched against a file: link instead of the file name.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-crypt.el (org-reveal-start-hook): Add a decryption function
to this hook.
(org-decrypt-entries, org-encrypt-entries, org-decrypt-entry): Add
docstrings.
* org.el (org-point-at-end-of-empty-headline)
(org-level-increment, org-get-previous-line-level): New function.
(org-cycle-level): Rewritten to be independent of when this
function is called.
(org-in-regexps-block-p): New function.
(org-reveal-start-hook): New hook.
(org-reveal): Run new hook.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-keywords): Start a new paragraph
after time keywords, do not add "\newline".
* org-html.el (org-export-as-html): Avoid double # in href.
* org.el (org-refile-get-location): Catch an invalid target
specification.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-add-entry-to-org-agenda-diary-file):
Make sure the behavior regarding to extracting time is
consistent.
2010-04-10 Stephen Eglen <stephen@gnu.org>
* org-agenda.el (org-agenda-insert-diary-extract-time): New
variable.
(org-agenda-add-entry-to-org-agenda-diary-file): Use this new
variable rather than `org-agenda-search-headline-for-time'.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-list.el (org-fix-bullet-type): Improve cursor positioning.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-adaptive-fill-regexp-backup): New variable.
(org-set-autofill-regexps): Store a backup of
`adaptive-fill-regexp'.
(org-adaptive-fill-function): Fix filling of comments and ordered
lists. If there is no other match, till try adaptive fill.
2010-04-10 John Wiegley <jwiegley@gmail.com>
* org-agenda.el (org-agenda-include-deadlines): Added new
customization variable to determine whether unscheduled tasks
should appear in the agenda solely because of their deadline.
Default to true, which was the previous behavior (it just wasn't
configurable).
(org-agenda-mode-map, org-agenda-view-mode-dispatch): Bind ! in
the agenda to show/hide deadline tasks.
(org-agenda-menu): Added menu option for show/hide deadlines.
(org-agenda-list): Make the agenda list sensitive to the value of
`org-agenda-include-deadlines'.
(org-agenda-toggle-deadlines): New function to toggle the value of
`org-agenda-include-deadlines' and repaint the modeline
indicators.
(org-agenda-set-mode-name): Show "Deadlines" in the agenda
modeline if deadline tasks are being displayed.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-table.el (org-table-eval-formula): Replace $# and @# by
current column and row number.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-set-property, org-delete-property): Go back to
prompting for the property.
* org-latex.el (org-export-latex-make-header): Fully process
author line.
(org-export-latex-fontify-headline): Allow several arguments, not
just one.
(org-export-latex-fix-inputenc): Catch the error when
`latexenc-coding-system-to-inputenc' is not defined.
* org-agenda.el (org-agenda-skip-if-todo): New function.
(org-agenda-skip-if): Add conditions for TODO keywords.
(org-agenda-skip-if): Document the new todo conditions.
2010-04-10 Mikael Fornius <mfo@abc.se>
* org.el (org-at-property-p): Check if we are inside a property
drawer not just any drawer.
(org-set-property, org-delete-property): When cursor is on a
property key value pair do not prompt for property name instead
use name at cursor.
(org-ctrl-c-ctrl-c): Still do org-property-action when cursor is
on the first line of a property drawer.
(org-property-end-re): Spell check.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-attach-captions-and-attributes): Add the
properties to the entire table, in case the first line is
removed.
* org-archive.el (org-archive-reversed-order): New option.
(org-archive-subtree, org-archive-to-archive-sibling): Use the new
option `org-archive-reversed-order'.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-entry-types): New variable.
(org-agenda-list): Use `org-agenda-entry-types'.
(org-agenda-custom-commands-local-options): Support for setting
`org-agenda-entry-types' as an option.
(org-diary): Shift some documentation from here to the variable
`org-agenda-entry-types'.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-make-header): Apply macros in
author field.
* org-clock.el (org-clocking-buffer, org-clocking-p): New function.
(org-clock-select-task, org-clock-notify-once-if-expired)
(org-clock-in, org-clock-out, org-clock-cancel, org-clock-goto)
(org-clock-out-if-current, org-clock-save): Use the new functions.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-docbook.el (org-export-as-docbook): Remove unnecessary
newline.
(org-export-as-docbook): Remove unnecessary newline.
(org-export-as-docbook): Fix problem with double footnote
reference in one place.
* org-exp.el (org-export-format-source-code-or-example): Remove
unnecessary newline.
* org.el (org-deadline, org-schedule): Allow rescheduling entries
with repeaters.
* org-table.el (org-table-convert-refs-to-rc): Better way to catch
function calls that look like references.
* org.el (org-open-at-point): Get link abbreviations from
reference buffer.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-table.el (org-table-convert-refs-to-rc): Do not read arctan2
as a reference.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-link-unescape): Solve issue with lower-case escapes.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-classes): Add
\usepackage{latexsym} to all classes.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-html.el (org-export-as-html): Do not allow protected lines
into the table of contents.
* org-latex.el (org-export-latex-special-chars): Find subsequent
occurrences of special characters.
(org-export-latex-tables): Do not convert table-like stuff that is
protected.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-list.el (org-toggle-checkbox): No errors when updating
checkbox count fails because there is no heading.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-clock.el (org-clock-report-include-clocking-task): New
option.
(org-clock-sum): Add the current clocking task.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-cycle): Print a message when in a table.el table.
(org-edit-special): Recognize the table.el context.
(org-ctrl-c-ctrl-c): Print a message when in a table.el table.
* org-src.el (org-at-table.el-p): Declare.
(org-edit-src-code): Handle a special case for table.el editing.
(org-edit-src-find-region-and-lang): Recognize the table.el
context.
* org-latex.el (org-export-latex-tables): Convert table.el
tables.
(org-export-latex-convert-table.el-table): New function.
* org-html.el (org-html-expand): Fix table.el export.
* org-latex.el (org-export-latex-preprocess): Protect footnotes in
headings.
* org-id.el (org-id-find-id-file): Fix bug when there is no hash
table for the id locations.
* org.el (org-read-date-analyze): Match American-style dates, like
5/30 or 5/13/7. Make sure cal-iso.el is loaded. Don't force he
current year when reading ISO and American dates.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-face-from-face-or-color): New function.
(org-get-todo-face, org-font-lock-add-priority-faces)
(org-get-tag-face): Use `org-face-from-face-or-color'.
* org-faces.el (org-todo-keyword-faces, org-priority-faces): Allow
simple colors as values.
(org-faces-easy-properties): New option.
* org-agenda.el (org-agenda-set-mode-name): Show if the agenda is
restricted, as an agenda mode.
(org-agenda-fontify-priorities): Allow simple colors as values.
2010-04-10 Bastien Guerry <bzg@altern.org>
* org-timer.el (org-timer-current-timer): Renamed from
`org-timer-last-timer'.
(org-timer-timer1, org-timer-timer2, org-timer-timer3): Removed.
(org-timer-cancel-timer, org-timer-show-remaining-time)
(org-timer-set-timer): Update to use only one timer.
* org.el (org-set-property): Remove useless space in the prompt.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-html.el (org-export-html-style-default): Add a default style
for textareas.
* org-exp.el (org-export-format-source-code-or-example): Fix
textarea tag.
2010-04-10 Bastien Guerry <bzg@altern.org>
* org-clock.el (org-clock-current-task): New variable to store
last clocked in task.
(org-clock-set-current, org-clock-delete-current): New functions.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-remember.el (org-remember-apply-template): Extend comment.
(org-remember-handler): Implement clock sibling filing.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-publish.el (org-publish-all, org-publish-current-file)
(org-publish-current-project): When called with prefix argument
FORCE, also rebuild the validation file list.
* org-latex.el (org-export-latex-preprocess): Protect footnotes in
section headings.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-html.el (org-export-as-html-and-open): Kill product buffer
if the user wants that.
* org-latex.el (org-export-as-pdf-and-open): Kill product buffer
if the user wants that.
* org-exp.el (org-export-kill-product-buffer-when-displayed): New
option.
* org-agenda.el (org-batch-agenda-csv): Use the time property
instead of the `time-of-day' property.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-timer.el (org-timer-start-hook, org-timer-stop-hook)
(org-timer-pause-hook, org-timer-set-hook)
(org-timer-cancel-hook): New hooks.
(org-timer-start): Run `org-timer-start-hook'.
(org-timer-pause-or-continue): Run `org-timer-pause-hook'.
(org-timer-stop): Run `org-timer-stop-hook'.
(org-timer-cancel-timers): Run `org-timer-cancel-hook'.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-reveal): Double prefix arg shows the subtree of the
parent.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-search-view): Fix bug with searching full
words in headlines in search view.
(org-agenda-skip-deadline-prewarning-if-scheduled): New option.
(org-agenda-get-deadlines): Suppress pre-warning if the entry is
scheduled (if the user configures it so.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-hide-archived-subtrees): Don't jump to end of
subtree if the match was not in a headline.
(org-inside-latex-macro-p): Allow more complex arguments.
(org-emphasize): Protect against use at end of buffer.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-align-tags): Avoid side effects on
text properties.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-todo-ignore-scheduled): More allowed
values.
(org-agenda-todo-ignore-scheduled)
(org-agenda-todo-ignore-deadlines): More control with different
allowed values.
(org-agenda-check-for-timestamp-as-reason-to-ignore-todo-item):
Honor the new option settings.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-get-location): Make sure the selection buffer is
shown in the current frame.
* org-ascii.el (org-export-ascii-table-widen-columns): New
option.
(org-export-ascii-preprocess): Realign tables to remove narrowing
if `org-export-ascii-table-widen-columns' is set.
* org-table.el (org-table-do-narrow): New variable.
(org-table-align): Narrow only if `org-table-do-narrow' is t.
* org.el (org-deadline, org-schedule): Allow updating if the
relevant time stamp does not have a repeater, i.e. do not require
that no time stamp has a repeater.
* org-agenda.el (org-agenda-align-tags): Don't add a face to the
new white space before the tags.
* org-latex.el (org-export-as-latex): Do nit require the buffer to
be visiting a file when only exporting to a buffer or string.
(org-export-latex-fix-inputenc): Only save the buffer is there is
a file name attached to it.
2010-04-10 Dan Davison <davison@stats.ox.ac.uk>
* org-src.el (org-edit-src-exit): Widen before exiting edit buffers
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-fontify-meta-lines-and-blocks): Honor
`org-fontify-quote-and-verse-blocks'.
* org-faces.el (org-fontify-quote-and-verse-blocks): New option.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-open-at-point): Also check for text property
org-linked-text before offering collected links.
2010-04-10 Stephen Eglen <stephen@gnu.org>
* org-agenda.el (org-agenda-add-entry-to-org-agenda-diary-file):
Optionally extract time specification from text and add to the
timestamp.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-html-entities): Fix typo.
* org-latex.el (org-export-latex-make-header): Use \providecommand
to make sure the \alert macro is defined.
* org.el (org-format-latex-signal-error)
(org-create-formula-image): Use `org-format-latex-signal-error'.
2010-04-10 Stephen Eglen <stephen@gnu.org>
* org.el (org-store-link): For dired buffers, use
default-directory as link name if dired-get-filename returns
nil.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-concatenate-multiline-links): The for
protectedness at beginning of match.
* org-latex.el (org-export-latex-fix-inputenc): Never leave the
AUTO as a coding system, instead default to utf8.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-block-todo-from-children-or-siblings-or-parent)
(org-block-todo-from-checkboxes): Respect the local variable
value when deciding if blocking should be active.
* org-latex.el (org-export-latex-make-header): Define the align
macro if it is not yet defined.
* org-agenda.el (org-agenda-insert-diary-make-new-entry): Call
`org-insert-heading' with the INVISIBLE-OK argument.
* org-mac-message.el (org-mac-message-insert-flagged): Call
`org-insert-heading' with the INVISIBLE-OK argument.
* org.el (org-insert-heading): New argument INVISIBLE-OK.
* org-agenda.el (org-agenda-view-mode-dispatch): Improve the
prompt message.
* org-html.el (org-html-level-start): Use the
`html-container-class' text property to set an additional class
for an outline container.
* org-exp.el (org-export-remember-html-container-classes): New
function.
(org-export-preprocess-string): Call
`org-export-remember-html-container-classes'.
* org.el (org-cycle): Mention level cycling in the docstring.
(org-default-properties): Add new property HTML_CONTAINER_CLASS.
* org-remember.el (org-remember-apply-template): Do file insertion
first.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-habit.el (org-habit-insert-consistency-graphs): Fix a
problem with mis-aligned graphs when showing habits.
2010-04-10 Mikael Fornius <mfo@abc.se>
* org.el (org-assign-fast-keys): Prefer keys used in keyword name
when assigning. Begin using numerical characters when all in name
is used up. This is to spare alphanumeric characters for better
match with other keywords.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-preprocess-hook): Improve documentation.
* org-latex.el (org-export-latex-preprocess): More consistent
conversion and protection of the words LaTeX and TeX.
(org-export-latex-fontify-headline, org-export-latex-preprocess):
Allow angle brackets in commands, for beamer.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-clock.el (org-clock-in): Improve the look of the clock line
by formatting links.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-classes): Use AUTO as the place
holder string for the coding system. And improve the
documentation.
(org-export-latex-fix-inputenc): Only modify the coding system if
it is given by the placeholder AUTO.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-clock.el (org-task-overrun-text): New option.
(org-task-overrun, org-clock-update-period): New variables.
(org-clock-get-clock-string, org-clock-update-mode-line): Mark
overrun clock.
(org-clock-notify-once-if-expired): Check if clock is overrun.
* org-faces.el: New face `org-mode-line-clock-overrun'.
2010-04-10 Jan Bcker <jan.boecker@jboecker.de>
* org.el (org-narrow-to-subtree): Position the end of the narrowed
region before the line with the next heading, to prevent the user
from prepending text to the next headline.
2010-04-10 Stephen Eglen <stephen@gnu.org>
* org-agenda.el (org-get-time-of-day): Use
org-agenda-time-leading-zero to allow leading zero (rather than
space) for times.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-diary-entry-in-org-file): Make sure
org-datetree.el is loaded.
* org-datetree.el: autoload `org-datetree-find-day-create'
* org-latex.el (org-export-latex-hyperref-format): New option.
(org-export-latex-links): Use `org-export-latex-hyperref-format'.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-ctags.el (org-ctags-enable): Change order of functions.
(org-ctags-create-tags): Add wildcard to file name expansion.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-entry-properties): Fix some important bugs.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-link-unescape, org-link-escape): Only use hexlify if
the table is not explicitly given.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-clock.el (org-clock-out-when-done): Allow a list of keywords
as value.
(org-clock-out-if-current): Work with the new list value of
`org-clock-out-when-done'.
(org-clock-out, org-clock-out-if-current): Avoid circular logic
between clocking out and state changes.
* org-ctags.el (org-ctags-path-to-ctags): Better system-type test.
* org-latex.el (org-export-latex-treat-backslash-char): Do not by
accident protect a character that is before a backslash.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-diary-class): Use
`org-order-calendar-date-args'.
* org.el (org-order-calendar-date-args): New function.
* org-exp.el (org-export-target-internal-links): Check for
protectedness after the first bracket.
* org.el (org-entry-properties): Don't match wrong-case TODO
keywords.
* org-agenda.el (org-agenda-schedule, org-agenda-deadline):
Document that ARG is passed through to remove the date.
(org-agenda-bulk-action): Accept prefix arg and pass it on. Do
not read a date when the user has given a `C-u' prefix.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-fix-displayed-tags): Fix bug when all
tags are hidden.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-fix-inputenc): New function.
(org-export-latex-inputenc-alist): New option.
* org-exp.el (org-export): New key SPC to publish enclosing
subtree.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-indent.el (org-indent-add-properties): Catch case when there
is no headline in the buffer.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-html-entities): Add checkmark symbol.
* org-ascii.el (org-export-ascii-preprocess): Protect targets in
verbatim code for ASCII export.
* org.el (org-update-statistics-cookies): Also see checkboxes in
ordered lists.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-view-mode-dispatch): Define the `L'
key.
* org-beamer.el (org-beamer-amend-header): Change the location
where `org-beamer-header-extra' is inserted.
* org.el (org-compute-latex-and-specials-regexp): Don't do BIND
just for computing this regexp.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-beamer.el (org-beamer-frame-default-options): New option.
(org-beamer-sectioning): Use default options if the user does not
have defined any.
(org-beamer-fix-toc): Put a frame around the table of contents.
* org-exp.el (org-export-remove-comment-blocks-and-subtrees): Make
sure case-folding works well when processing comment stuff.
* org-latex.el (org-export-latex-after-save-hook): New hook.
(org-export-as-latex): Run the new hook.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-beamer.el (org-beamer-environments-default): Add the note
environments.
(org-beamer-after-initial-vars): Allow several BEAMER_HEADER_EXTRA
lines and collect and combine the content.
(org-beamer-after-initial-vars): Check for note tags and make sure
they will be seen like a property.
* org.el (org-offer-links-in-entry): Fix bug when there is a
single link.
* org-exp.el (org-export): Make sure the mark is activated, also
when `transient-mark-mode' is off.
* org-agenda.el (org-agenda-search-view-always-boolean): New option.
(org-agenda-search-view-search-words-only): Obsolete variable, is
now an alias for `org-agenda-search-view-always-boolean'.
(org-agenda-search-view-force-full-words): New option.
(org-search-view): Improve docstring, and implement a better logic
for Boolean and phrase searches.
(org-agenda-last-search-view-search-was-boolean): New variable.
(org-agenda-manipulate-query): Consider the type of the last
search when modifying the search string.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-as-latex): Do the first letbind in the
right moment.
* org-agenda.el (org-get-entries-from-diary): Add the new face to
these entries.
* org-faces.el (org-agenda-diary): New face.
* org.el (org-make-link-regexps): Allow regexp-special characters
in link types.
(org-open-file): When in-emacs is `system', also force system
opening, like when the value was `(16)'.
(org-update-statistics-cookies): Handle entries without children.
* org-exp.el
(org-export-preprocess-before-normalizing-links-hook): New hook.
(org-export-preprocess-string): Run the new hook.
* org.el (org-offer-links-in-entry): Make RET open all links.
* org-html.el (org-export-as-html): Remove any leftover display
properties in the html file.
* org-wl.el (org-wl-store-link): Work-around for format bug with
text properties.
* org-habit.el (org-habit-insert-consistency-graphs): Turn off
invisibility while adding the graphs.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-remember.el (org-select-remember-template): Use C letter to
customize remember templates.
* org-agenda.el (org-agenda-bulk-mark, org-agenda-bulk-unmark):
Move cursor to next visible line.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-beamer.el (org-beamer-sectioning): Leave columns environment
by specifying 0 or 1 for column width.
(org-beamer-column-widths): Make 0 stand for 0.0.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-mark-radio-links): Don't match inside
<<target>>.
* org.el (org-format-latex-header-extra): New variable.
(org-format-latex): Set org-format-latex-header-extra from
in-buffer stuff.
(org-format-latex): Add org-format-latex-header-extra to the
variables on which image creation depends.
(org-create-formula-image): Add the header stuff from in-buffer
settings.
(org-read-date-analyze): Base the analysis for future preference
on NOW, not on the default date.
* org-inlinetask.el (org-inlinetask-export-handler): Add CSS class
for TODO keyword in inline tasks.
* org.el (org-log-note-headings): New headings for removing
deadline or scheduling date.
(org-deadline, org-schedule): Arrange for logging when removing a
date.
(org-add-log-note): Handle deadline and scheduling removal.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-visible): Add LaTeX/pdf export.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-diary-class): New function.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-preprocess): Do process the text
of a radio target.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-entry-properties): Add TIMESTAMP properties back
in.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-all-time-keywords): New variable.
(org-set-regexps-and-options): Set `org-all-time-keywords'.
(org-entry-blocked-p): New function.
(org-special-properties): Add BLOCKED as a new special property.
(org-entry-properties): New optional argument SPECIFIC, only parse
for this property when it is specified.
(org-entry-get): Pass a SPECIFIC argument to
`org-entry-properties'.
* org-latex.el (org-export-as-latex): Preprocess TEXT as well.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-tables): No forced line end if
there is no caption.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-html-entities): Add Euro symbols from Marvosym
package.
* org-latex.el (org-export-latex-tables): Only add a caption when
macro in in longtable environments if one has been defined.
* org-html.el (org-export-as-html): Only take title from buffer if
not exporting body-only.
* org-latex.el (org-export-latex-preprocess): Better version of
the regular expression for protecting LaTeX macros.
(org-export-latex-preprocess): Start searching for macros to
protect from beginning of buffer.
* org-exp.el (org-export-target-internal-links): Check for
protectedness earlier in the string.
* org-agenda.el (org-agenda-highlight-todo): Match TODO keywords
case sensitively.
* org-id.el (org-id-store-link): Match TODO keywords case
sensitively.
* org.el (org-heading-components, org-get-outline-path)
(org-display-outline-path): Match TODO keywords case sensitively.
* org-latex.el (org-export-as-latex): Ignore read-only
properties.
* org-exp.el (org-export-preprocess-string): Remove any
`read-only' properties.
* org-agenda.el (org-agenda-inactive-leader): New option.
(org-agenda-get-timestamps): Use `org-agenda-inactive-leader'.
(org-tags-view): Prompt for matcher if MATCH is an empty string.
(org-todo-list): Prompt for matcher if ARG is an empty string.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-open-link-functions): New hook.
(org-open-at-point): Run `org-open-link-functions'.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-date-prompt): Allow inactive time
stamps as well.
* org.el (org-inhibit-startup-visibility-stuff): New variable.
(org-mode): Don't do startup visibility if inhibited.
(org-outline-overlay-data, org-set-outline-overlay-data): New
functions.
(org-save-outline-visibility): New macro.
(org-log-note-headings): Document that one should not change the
`state' note format.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-make-link-regexps): Capture link path into a group.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-beamer.el (org-beamer-after-initial-vars): Do not overwrite
the options plist.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-startup-with-beamer-mode): New option.
(org-property-changed-functions)
(org-property-allowed-value-functions): New hooks.
(org-entry-put, org-property-get-allowed-values): Run the new
hooks.
(org-property-next-allowed-value): Run the new hooks.
* org-exp.el (org-export-select-backend-specific-text): Add the
special beamer tags.
* org-beamer.el
(org-export-preprocess-before-selecting-backend-code-hook): New
file.
* org-latex.el (org-export-latex-after-initial-vars-hook): New hook.
(org-export-as-latex): Run
`org-export-latex-after-initial-vars-hook'.
(org-export-latex-format-toc-function)
(org-export-latex-make-header): Call
`org-export-latex-format-toc-function'.
* org.el (org-fill-template): Make template searches case sensitive.
* org-exp.el (org-export): Use "1" as a sign to export only the
subtree.
* org-colview-xemacs.el (org-columns-edit-value): Use
org-unrestricted property.
* org-colview.el (org-columns-edit-value): Use
org-unrestricted property.
* org.el (org-compute-property-at-point): Set org-unrestricted
text property if the list contains ":ETC".
(org-insert-property-drawer): Use
org-unrestricted property.
* org-exp.el
(org-export-preprocess-before-selecting-backend-code-hook): New hook.
(org-export-preprocess-string): Run
`org-export-preprocess-before-selecting-backend-code-hook'.
* org-xoxo.el (org-export-as-xoxo): Run `org-export-first-hook'.
* org-latex.el (org-export-region-as-latex): Run
`org-export-first-hook'.
* org-html.el (org-export-as-html): Run `org-export-first-hook'.
* org-docbook.el (org-export-as-docbook): Run
`org-export-first-hook'.
* org-ascii.el (org-export-as-ascii): Run `org-export-first-hook'.
* org-exp.el (org-export-first-hook): New hook.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-list.el (org-previous-item): Exit at the beginning of the
buffer.
* org-id.el (org-id-locations-save): Only write the id locations
if any are defined.
* org-archive.el (org-archive-all-done): Make this work in a file
with org-odd-levels-only set.
* org.el (org-get-refile-targets): Catch the case when a buffer
has no file.
* org-latex.el (org-export-as-latex): Cleanup forced line ends
where they are not needed.
(org-export-latex-subcontent): Remove unnecessary newlines.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-make-header): Remove \obeylines.
(org-export-latex-fontify): Fix regexp bug that takes special
care of protecting the right boundary characters in emphasis
matches.
(org-export-latex-preprocess): Allow multiple arguments to latex
macros.
* org.el (org-make-link-regexps): Use John Gruber's regexp for
urls.
* org-macs.el (org-re): Interpret :punct: in regexps.
* org-exp.el (org-export-replace-src-segments-and-examples): Also
take the final newline after the END line.
* org.el (org-clean-visibility-after-subtree-move): Only fix
entries that are not entirely invisible already.
(org-insert-link): Respect org-link-file-path-type for
"docview:" links in addition to "file:" links.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-format-source-code-or-example): Avoid
additional extra white lines in LaTeX.
* org-list.el (org-list-parse-list): Leave empty lines after the
list, don't consider them as part of the list.
* org-mobile.el (org-mobile-sumo-agenda-command): Allow tagstodo
searches.
* org-clock.el (org-clock-select-task): Convert integer to
character for XEmacs.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-clock.el (org-clock-resolve): Make reading a char XEmacs
compatible.
2010-04-10 Tassilo Horn <tassilo@member.fsf.org>
* org.el (org-complete-tags-always-offer-all-agenda-tags): New
variable.
(org-set-tags): Use it.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-list.el (org-empty-line-terminates-plain-lists): Update
docstring.
* org.el (org-format-latex): Fix link creation for processed latex
snippets.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-footnote.el (org-footnote-normalize): Protect replacement
text.
* org.el (org-inside-latex-macro-p): Save match data.
2010-04-10 Jan Bcker <jan.boecker@jboecker.de>
* org-docview.el: New file.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-class-options): New variable.
(org-export-latex-set-initial-vars): Use the class options.
* org.el (org-forward-same-level): Stop at headings that start
with an invisible character.
(org-additional-option-like-keywords): Add LaTeX_CLASS_OPTIONS.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-footnote.el (org-footnote-normalize): Don't take optional
arguments in LaTeX macros as footnotes.
* org.el (org-inside-latex-macro-p): New function.
* org-latex.el (org-latex-to-pdf-process): Change customization
group to `org-export-pdf'.
* org-agenda.el (org-agenda-get-blocks): Look at time string also
on days after the first one.
* org.el (org-insert-heading): Also check for item before assuming
before-first-heading condition.
* org-latex.el (org-latex-to-pdf-process): Fix typo in group tag.
(org-export-pdf-logfiles): New option.
(org-export-as-pdf): Use `org-export-pdf-logfiles'.
(org-export-pdf-logfiles): Fix customization type.
* org.el (org-insert-link): Improve error message when there is no
default link to select with RET.
* org-agenda.el (org-agenda-filter-by-tag): Use char argument from
parameter list.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-parse-global)
(org-export-latex-parse-content)
(org-export-latex-parse-subcontent): Use
`org-re-search-forward-unprotected'.
(org-export-as-pdf): Remove log files produced by XeTeX.
* org-macs.el (org-re-search-forward-unprotected): New function.
2010-04-10 James TD Smith <ahktenzero@mohorovi.cc>
* org-colview.el (org-agenda-colview-summarize): Sort out some
confusion between properties and titles, which resulted in
agenda summaries not working if a title was set for a column.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-mobile.el (org-mobile-agendas): New option.
(org-mobile-sumo-agenda-command): Select the right agendas.
* org-latex.el (org-export-latex-format-image): Preserve the
original-indentation property.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-clock.el (org-clock-insert-selection-line): Catch error when
an old tasks no longer exists.
* org-latex.el (org-export-as-pdf): Remove also the .idx file.
(org-export-as-pdf): Don't remove the old PDF file before making
the new one.
* org-mouse.el (org-mouse-end-headline, org-mouse-insert-item)
(org-mouse-context-menu): Use `org-looking-back'.
* org.el (org-cycle-level): Use `org-looking-back'.
* org-list.el (org-cycle-item-indentation): Use
`org-looking-back'.
* org-compat.el (org-looking-back): New function.
* org.el (org-insert-heading): Catch before-first-headline when
inserting a headline.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-format-image): Indent figure
environment, so that it does not interrupt plain list.
* org.el (org-open-at-point): Allow long link descriptions.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-html.el (org-export-as-html): Remove empty lines at the
beginning of the exported text.
2010-04-15 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (LaTeX and PDF export): Add a footnote about xetex.
(LaTeX/PDF export commands): Section renamed and
moved.
(Sectioning structure): Update.
(References): New use case for field coordinates.
(The export dispatcher): Renamed from ASCII export.
(Setting up the staging area): Document the availability of
encryption for MobileOrg.
(Images and tables): Document how to reference labels.
(Index entries): New section.
(Generating an index): New section.
(Column width and alignment): Document that <N> now
means a fixed width, not a maximum width.
(Publishing options): Document the :email option.
(Beamer class export): Fix bug in the BEAMER example.
(Refiling notes): Document refile logging.
(In-buffer settings): Document refile logging keywords.
(Drawers): Document `C-c C-z' command.
(Agenda commands): Mention the alternative key `C-c C-z'.
(Special properties): Document the BLOCKED property.
(The spreadsheet): Mention the formula editor.
(References): Document field coordinates.
(Publishing action): Correct the documentation for the
publishing function.
(The date/time prompt): Document that we accept dates
like month/day/year.
(Cooperation): Document the changes in table.el support.
(Faces for TODO keywords, Faces for TODO keywords)
(Priorities): Document the easy colors.
(Visibility cycling): Document the new double prefix
arg for `org-reveal'.
(Cooperation): Remember.el is part of Emacs.
(Clean view): Mention that `wrap-prefix' is also set by
org-indent-mode.
(Agenda commands): Add information about prefix args to
scheduling and deadline commands.
(Search view): Point to the docstring of
`org-search-view' for more details.
(Agenda commands): Document that `>' prompts for a
date.
(Setting tags): Document variable
org-complete-tags-always-offer-all-agenda-tags.
(Column attributes): Cross-reference special
properties.
author | Carsten Dominik <carsten.dominik@gmail.com> |
---|---|
date | Thu, 15 Apr 2010 12:11:52 +0200 |
parents | 0fe940324254 |
children | c168d4537385 |
line wrap: on
line source
;;; nnir.el --- search mail with various search engines -*- coding: iso-8859-1 -*- ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, ;; 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Kai Grojohann <grossjohann@ls6.cs.uni-dortmund.de> ;; Swish-e and Swish++ backends by: ;; Christoph Conrad <christoph.conrad@gmx.de>. ;; IMAP backend by: Simon Josefsson <jas@pdc.kth.se>. ;; IMAP search by: Torsten Hilbrich <torsten.hilbrich <at> gmx.net> ;; IMAP search improved by Daniel Pittman <daniel@rimspace.net>. ;; nnmaildir support for Swish++ and Namazu backends by: ;; Justus Piater <Justus <at> Piater.name> ;; Keywords: news mail searching ir ;; 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: ;; TODO: Documentation in the Gnus manual ;; From: Reiner Steib ;; Subject: Re: Including nnir.el ;; Newsgroups: gmane.emacs.gnus.general ;; Message-ID: <v9d5dnp6aq.fsf@marauder.physik.uni-ulm.de> ;; Date: 2006-06-05 22:49:01 GMT ;; ;; On Sun, Jun 04 2006, Sascha Wilde wrote: ;; ;; > The one thing most hackers like to forget: Documentation. By now the ;; > documentation is only in the comments at the head of the source, I ;; > would use it as basis to cook up some minimal texinfo docs. ;; > ;; > Where in the existing gnus manual would this fit best? ;; Maybe (info "(gnus)Combined Groups") for a general description. ;; `gnus-group-make-nnir-group' might be described in (info ;; "(gnus)Foreign Groups") as well. ;; The most recent version of this can always be fetched from the Gnus ;; CVS repository. See http://www.gnus.org/ for more information. ;; This code is still in the development stage but I'd like other ;; people to have a look at it. Please do not hesitate to contact me ;; with your ideas. ;; What does it do? Well, it allows you to index your mail using some ;; search engine (freeWAIS-sf, swish-e and others -- see later), ;; then type `G G' in the Group buffer and issue a query to the search ;; engine. You will then get a buffer which shows all articles ;; matching the query, sorted by Retrieval Status Value (score). ;; When looking at the retrieval result (in the Summary buffer) you ;; can type `G T' (aka M-x gnus-summary-nnir-goto-thread RET) on an ;; article. You will be teleported into the group this article came ;; from, showing the thread this article is part of. (See below for ;; restrictions.) ;; The Lisp installation is simple: just put this file on your ;; load-path, byte-compile it, and load it from ~/.gnus or something. ;; This will install a new command `G G' in your Group buffer for ;; searching your mail. Note that you also need to configure a number ;; of variables, as described below. ;; Restrictions: ;; ;; * If you don't use HyREX as your search engine, this expects that ;; you use nnml or another one-file-per-message backend, because the ;; others doesn't support nnfolder. ;; * It can only search the mail backend's which are supported by one ;; search engine, because of different query languages. ;; * There are restrictions to the Wais setup. ;; * There are restrictions to the imap setup. ;; * gnus-summary-nnir-goto-thread: Fetches whole group first, before ;; limiting to the right articles. This is much too slow, of ;; course. May issue a query for number of articles to fetch; you ;; must accept the default of all articles at this point or things ;; may break. ;; The Lisp setup involves setting a few variables and setting up the ;; search engine. You can define the variables in the server definition ;; like this : ;; (setq gnus-secondary-select-methods '( ;; (nnimap "" (nnimap-address "localhost") ;; (nnir-search-engine hyrex) ;; (nnir-hyrex-additional-switches ("-d" "ddl-nnimap.xml")) ;; ))) ;; Or you can define the global ones. The variables set in the mailer- ;; definition will be used first. ;; The variable to set is `nnir-search-engine'. Choose one of the engines ;; listed in `nnir-engines'. (Actually `nnir-engines' is an alist, ;; type `C-h v nnir-engines RET' for more information; this includes ;; examples for setting `nnir-search-engine', too.) ;; ;; The variable nnir-mail-backend isn't used anymore. ;; ;; You must also set up a search engine. I'll tell you about the two ;; search engines currently supported: ;; 1. freeWAIS-sf ;; ;; As always with freeWAIS-sf, you need a so-called `format file'. I ;; use the following file: ;; ;; ,----- ;; | # Kai's format file for freeWAIS-sf for indexing mails. ;; | # Each mail is in a file, much like the MH format. ;; | ;; | # Document separator should never match -- each file is a document. ;; | record-sep: /^@this regex should never match@$/ ;; | ;; | # Searchable fields specification. ;; | ;; | region: /^[sS]ubject:/ /^[sS]ubject: */ ;; | subject "Subject header" stemming TEXT BOTH ;; | end: /^[^ \t]/ ;; | ;; | region: /^([tT][oO]|[cC][cC]):/ /^([tT][oO]|[cC][cC]): */ ;; | to "To and Cc headers" SOUNDEX BOTH ;; | end: /^[^ \t]/ ;; | ;; | region: /^[fF][rR][oO][mM]:/ /^[fF][rR][oO][mM]: */ ;; | from "From header" SOUNDEX BOTH ;; | end: /^[^ \t]/ ;; | ;; | region: /^$/ ;; | stemming TEXT GLOBAL ;; | end: /^@this regex should never match@$/ ;; `----- ;; ;; 1998-07-22: waisindex would dump core on me for large articles with ;; the above settings. I used /^$/ as the end regex for the global ;; field. That seemed to work okay. ;; There is a Perl module called `WAIS.pm' which is available from ;; CPAN as well as ls6-ftp.cs.uni-dortmund.de:/pub/wais/Perl. This ;; module comes with a nifty tool called `makedb', which I use for ;; indexing. Here's my `makedb.conf': ;; ;; ,----- ;; | # Config file for makedb ;; | ;; | # Global options ;; | waisindex = /usr/local/bin/waisindex ;; | wais_opt = -stem -t fields ;; | # `-stem' option necessary when `stemming' is specified for the ;; | # global field in the *.fmt file ;; | ;; | # Own variables ;; | homedir = /home/kai ;; | ;; | # The mail database. ;; | database = mail ;; | files = `find $homedir/Mail -name \*[0-9] -print` ;; | dbdir = $homedir/.wais ;; | limit = 100 ;; `----- ;; ;; The Lisp setup involves the `nnir-wais-*' variables. The most ;; difficult to understand variable is probably ;; `nnir-wais-remove-prefix'. Here's what it does: the output of ;; `waissearch' basically contains the file name and the (full) ;; directory name. As Gnus works with group names rather than ;; directory names, the directory name is transformed into a group ;; name as follows: first, a prefix is removed from the (full) ;; directory name, then all `/' are replaced with `.'. The variable ;; `nnir-wais-remove-prefix' should contain a regex matching exactly ;; this prefix. It defaults to `$HOME/Mail/' (note the trailing ;; slash). ;; 2. Namazu ;; ;; The Namazu backend requires you to have one directory containing all ;; index files, this is controlled by the `nnir-namazu-index-directory' ;; variable. To function the `nnir-namazu-remove-prefix' variable must ;; also be correct, see the documentation for `nnir-wais-remove-prefix' ;; above. ;; ;; It is particularly important not to pass any any switches to namazu ;; that will change the output format. Good switches to use include ;; `--sort', `--ascending', `--early' and `--late'. Refer to the Namazu ;; documentation for further information on valid switches. ;; ;; To index my mail with the `mknmz' program I use the following ;; configuration file: ;; ;; ,---- ;; | package conf; # Don't remove this line! ;; | ;; | # Paths which will not be indexed. Don't use `^' or `$' anchors. ;; | $EXCLUDE_PATH = "spam|sent"; ;; | ;; | # Header fields which should be searchable. case-insensitive ;; | $REMAIN_HEADER = "from|date|message-id|subject"; ;; | ;; | # Searchable fields. case-insensitive ;; | $SEARCH_FIELD = "from|date|message-id|subject"; ;; | ;; | # The max length of a word. ;; | $WORD_LENG_MAX = 128; ;; | ;; | # The max length of a field. ;; | $MAX_FIELD_LENGTH = 256; ;; `---- ;; ;; My mail is stored in the directories ~/Mail/mail/, ~/Mail/lists/ and ;; ~/Mail/archive/, so to index them I go to the directory set in ;; `nnir-namazu-index-directory' and issue the following command. ;; ;; mknmz --mailnews ~/Mail/archive/ ~/Mail/mail/ ~/Mail/lists/ ;; ;; For maximum searching efficiency I have a cron job set to run this ;; command every four hours. ;; 3. HyREX ;; ;; The HyREX backend requires you to have one directory from where all ;; your relative paths are to, if you use them. This directory must be ;; set in the `nnir-hyrex-index-directory' variable, which defaults to ;; your home directory. You must also pass the base, class and ;; directory options or simply your dll to the `nnir-hyrex-programm' by ;; setting the `nnir-hyrex-additional-switches' variable accordently. ;; To function the `nnir-hyrex-remove-prefix' variable must also be ;; correct, see the documentation for `nnir-wais-remove-prefix' above. ;; 4. find-grep ;; ;; The find-grep engine simply runs find(1) to locate eligible ;; articles and searches them with grep(1). This, of course, is much ;; slower than using a proper search engine but OTOH doesn't require ;; maintenance of an index and is still faster than using any built-in ;; means for searching. The method specification of the server to ;; search must include a directory for this engine to work (E.g., ;; `nnml-directory'). The tools must be POSIX compliant. GNU Find ;; prior to version 4.2.12 (4.2.26 on Linux due to incorrect ARG_MAX ;; handling) does not work. ;; ,---- ;; | ;; find-grep configuration for searching the Gnus Cache ;; | ;; | (nnml "cache" ;; | (nnml-get-new-mail nil) ;; | (nnir-search-engine find-grep) ;; | (nnml-directory "~/News/cache/") ;; | (nnml-active-file "~/News/cache/active")) ;; `---- ;; Developer information: ;; I have tried to make the code expandable. Basically, it is divided ;; into two layers. The upper layer is somewhat like the `nnvirtual' ;; or `nnkiboze' backends: given a specification of what articles to ;; show from another backend, it creates a group containing exactly ;; those articles. The lower layer issues a query to a search engine ;; and produces such a specification of what articles to show from the ;; other backend. ;; The interface between the two layers consists of the single ;; function `nnir-run-query', which just selects the appropriate ;; function for the search engine one is using. The input to ;; `nnir-run-query' is a string, representing the query as input by ;; the user. The output of `nnir-run-query' is supposed to be a ;; vector, each element of which should in turn be a three-element ;; vector. The first element should be full group name of the article, ;; the second element should be the article number, and the third ;; element should be the Retrieval Status Value (RSV) as returned from ;; the search engine. An RSV is the score assigned to the document by ;; the search engine. For Boolean search engines, the ;; RSV is always 1000 (or 1 or 100, or whatever you like). ;; The sorting order of the articles in the summary buffer created by ;; nnir is based on the order of the articles in the above mentioned ;; vector, so that's where you can do the sorting you'd like. Maybe ;; it would be nice to have a way of displaying the search result ;; sorted differently? ;; So what do you need to do when you want to add another search ;; engine? You write a function that executes the query. Temporary ;; data from the search engine can be put in `nnir-tmp-buffer'. This ;; function should return the list of articles as a vector, as ;; described above. Then, you need to register this backend in ;; `nnir-engines'. Then, users can choose the backend by setting ;; `nnir-search-engine'. ;; Todo, or future ideas: ;; * It should be possible to restrict search to certain groups. ;; ;; * There is currently no error checking. ;; ;; * The summary buffer display is currently really ugly, with all the ;; added information in the subjects. How could I make this ;; prettier? ;; ;; * A function which can be called from an nnir summary buffer which ;; teleports you into the group the current article came from and ;; shows you the whole thread this article is part of. ;; Implementation suggestions? ;; (1998-07-24: There is now a preliminary implementation, but ;; it is much too slow and quite fragile.) ;; ;; * Support other mail backends. In particular, probably quite a few ;; people use nnfolder. How would one go about searching nnfolders ;; and producing the right data needed? The group name and the RSV ;; are simple, but what about the article number? ;; - The article number is encoded in the `X-Gnus-Article-Number' ;; header of each mail. ;; - The HyREX engine supports nnfolder. ;; ;; * Support compressed mail files. Probably, just stripping off the ;; `.gz' or `.Z' file name extension is sufficient. ;; ;; * At least for imap, the query is performed twice. ;; ;; Have you got other ideas? ;;; Setup Code: (require 'nnoo) (require 'gnus-group) (require 'gnus-sum) (require 'message) (require 'gnus-util) (eval-when-compile (require 'cl)) (nnoo-declare nnir) (nnoo-define-basics nnir) (gnus-declare-backend "nnir" 'mail) (defvar nnir-imap-search-field "TEXT" "The IMAP search item when doing an nnir search") (defvar nnir-imap-search-arguments '(("Whole message" . "TEXT") ("Subject" . "SUBJECT") ("To" . "TO") ("From" . "FROM") (nil . "HEADER \"%s\"")) "Mapping from user readable strings to IMAP search items for use in nnir") (defvar nnir-imap-search-argument-history () "The history for querying search options in nnir") (defvar nnir-get-article-nov-override-function nil "If non-nil, a function that will be passed each search result. This should return a message's headers in NOV format. If this variable is nil, or if the provided function returns nil for a search result, `gnus-retrieve-headers' will be called instead.") ;;; Developer Extension Variable: (defvar nnir-engines `((wais nnir-run-waissearch ()) (imap nnir-run-imap ((criteria "Search in: " ; Prompt ,nnir-imap-search-arguments ; alist for completing nil ; no filtering nil ; allow any user input nil ; initial value nnir-imap-search-argument-history ; the history to use ,nnir-imap-search-field ; default ))) (swish++ nnir-run-swish++ ((group . "Group spec: "))) (swish-e nnir-run-swish-e ((group . "Group spec: "))) (namazu nnir-run-namazu ()) (hyrex nnir-run-hyrex ((group . "Group spec: "))) (find-grep nnir-run-find-grep ((grep-options . "Grep options: ")))) "Alist of supported search engines. Each element in the alist is a three-element list (ENGINE FUNCTION ARGS). ENGINE is a symbol designating the searching engine. FUNCTION is also a symbol, giving the function that does the search. The third element ARGS is a list of cons pairs (PARAM . PROMPT). When issuing a query, the FUNCTION will issue a query for each of the PARAMs, using PROMPT. The value of `nnir-search-engine' must be one of the ENGINE symbols. For example, use the following line for searching using freeWAIS-sf: (setq nnir-search-engine 'wais) Use the following line if you read your mail via IMAP and your IMAP server supports searching: (setq nnir-search-engine 'imap) Note that you have to set additional variables for most backends. For example, the `wais' backend needs the variables `nnir-wais-program', `nnir-wais-database' and `nnir-wais-remove-prefix'. Add an entry here when adding a new search engine.") ;;; User Customizable Variables: (defgroup nnir nil "Search nnmh and nnml groups in Gnus with swish-e, freeWAIS-sf, or EWS." :group 'gnus) ;; Mail backend. ;; TODO: ;; If `nil', use server parameters to find out which server to search. CCC ;; (defcustom nnir-mail-backend '(nnml "") "*Specifies which backend should be searched. More precisely, this is used to determine from which backend to fetch the messages found. This must be equal to an existing server, so maybe it is best to use something like the following: (setq nnir-mail-backend (nth 0 gnus-secondary-select-methods)) The above line works fine if the mail backend you want to search is the first element of gnus-secondary-select-methods (`nth' starts counting at zero)." :type '(sexp) :group 'nnir) ;; Search engine to use. (defcustom nnir-search-engine 'wais "*The search engine to use. Must be a symbol. See `nnir-engines' for a list of supported engines, and for example settings of `nnir-search-engine'." :type '(sexp) :group 'nnir) ;; freeWAIS-sf. (defcustom nnir-wais-program "waissearch" "*Name of waissearch executable." :type '(string) :group 'nnir) (defcustom nnir-wais-database (expand-file-name "~/.wais/mail") "*Name of Wais database containing the mail. Note that this should be a file name without extension. For example, if you have a file /home/john/.wais/mail.fmt, use this: (setq nnir-wais-database \"/home/john/.wais/mail\") The string given here is passed to `waissearch -d' as-is." :type '(file) :group 'nnir) (defcustom nnir-wais-remove-prefix (concat (getenv "HOME") "/Mail/") "*The prefix to remove from each directory name returned by waissearch in order to get a group name (albeit with / instead of .). This is a regular expression. For example, suppose that Wais returns file names such as \"/home/john/Mail/mail/misc/42\". For this example, use the following setting: (setq nnir-wais-remove-prefix \"/home/john/Mail/\") Note the trailing slash. Removing this prefix gives \"mail/misc/42\". `nnir' knows to remove the \"/42\" and to replace \"/\" with \".\" to arrive at the correct group name, \"mail.misc\"." :type '(regexp) :group 'nnir) (defcustom nnir-swish++-configuration-file (expand-file-name "~/Mail/swish++.conf") "*Configuration file for swish++." :type '(file) :group 'nnir) (defcustom nnir-swish++-program "search" "*Name of swish++ search executable." :type '(string) :group 'nnir) (defcustom nnir-swish++-additional-switches '() "*A list of strings, to be given as additional arguments to swish++. Note that this should be a list. Ie, do NOT use the following: (setq nnir-swish++-additional-switches \"-i -w\") ; wrong Instead, use this: (setq nnir-swish++-additional-switches '(\"-i\" \"-w\"))" :type '(repeat (string)) :group 'nnir) (defcustom nnir-swish++-remove-prefix (concat (getenv "HOME") "/Mail/") "*The prefix to remove from each file name returned by swish++ in order to get a group name (albeit with / instead of .). This is a regular expression. This variable is very similar to `nnir-wais-remove-prefix', except that it is for swish++, not Wais." :type '(regexp) :group 'nnir) ;; Swish-E. ;; URL: http://sunsite.berkeley.edu/SWISH-E/ ;; New version: http://www.boe.es/swish-e ;; Variables `nnir-swish-e-index-file', `nnir-swish-e-program' and ;; `nnir-swish-e-additional-switches' (make-obsolete-variable 'nnir-swish-e-index-file 'nnir-swish-e-index-files "Emacs 23.1") (defcustom nnir-swish-e-index-file (expand-file-name "~/Mail/index.swish-e") "*Index file for swish-e. This could be a server parameter. It is never consulted once `nnir-swish-e-index-files', which should be used instead, has been customized." :type '(file) :group 'nnir) (defcustom nnir-swish-e-index-files (list nnir-swish-e-index-file) "*List of index files for swish-e. This could be a server parameter." :type '(repeat (file)) :group 'nnir) (defcustom nnir-swish-e-program "swish-e" "*Name of swish-e search executable. This cannot be a server parameter." :type '(string) :group 'nnir) (defcustom nnir-swish-e-additional-switches '() "*A list of strings, to be given as additional arguments to swish-e. Note that this should be a list. Ie, do NOT use the following: (setq nnir-swish-e-additional-switches \"-i -w\") ; wrong Instead, use this: (setq nnir-swish-e-additional-switches '(\"-i\" \"-w\")) This could be a server parameter." :type '(repeat (string)) :group 'nnir) (defcustom nnir-swish-e-remove-prefix (concat (getenv "HOME") "/Mail/") "*The prefix to remove from each file name returned by swish-e in order to get a group name (albeit with / instead of .). This is a regular expression. This variable is very similar to `nnir-wais-remove-prefix', except that it is for swish-e, not Wais. This could be a server parameter." :type '(regexp) :group 'nnir) ;; HyREX engine, see <URL:http://ls6-www.cs.uni-dortmund.de/> (defcustom nnir-hyrex-program "nnir-search" "*Name of the nnir-search executable." :type '(string) :group 'nnir) (defcustom nnir-hyrex-additional-switches '() "*A list of strings, to be given as additional arguments for nnir-search. Note that this should be a list. Ie, do NOT use the following: (setq nnir-hyrex-additional-switches \"-ddl ddl.xml -c nnir\") ; wrong ! Instead, use this: (setq nnir-hyrex-additional-switches '(\"-ddl\" \"ddl.xml\" \"-c\" \"nnir\"))" :type '(repeat (string)) :group 'nnir) (defcustom nnir-hyrex-index-directory (getenv "HOME") "*Index directory for HyREX." :type '(directory) :group 'nnir) (defcustom nnir-hyrex-remove-prefix (concat (getenv "HOME") "/Mail/") "*The prefix to remove from each file name returned by HyREX in order to get a group name (albeit with / instead of .). For example, suppose that HyREX returns file names such as \"/home/john/Mail/mail/misc/42\". For this example, use the following setting: (setq nnir-hyrex-remove-prefix \"/home/john/Mail/\") Note the trailing slash. Removing this prefix gives \"mail/misc/42\". `nnir' knows to remove the \"/42\" and to replace \"/\" with \".\" to arrive at the correct group name, \"mail.misc\"." :type '(directory) :group 'nnir) ;; Namazu engine, see <URL:http://ww.namazu.org/> (defcustom nnir-namazu-program "namazu" "*Name of Namazu search executable." :type '(string) :group 'nnir) (defcustom nnir-namazu-index-directory (expand-file-name "~/Mail/namazu/") "*Index directory for Namazu." :type '(directory) :group 'nnir) (defcustom nnir-namazu-additional-switches '() "*A list of strings, to be given as additional arguments to namazu. The switches `-q', `-a', and `-s' are always used, very few other switches make any sense in this context. Note that this should be a list. Ie, do NOT use the following: (setq nnir-namazu-additional-switches \"-i -w\") ; wrong Instead, use this: (setq nnir-namazu-additional-switches '(\"-i\" \"-w\"))" :type '(repeat (string)) :group 'nnir) (defcustom nnir-namazu-remove-prefix (concat (getenv "HOME") "/Mail/") "*The prefix to remove from each file name returned by Namazu in order to get a group name (albeit with / instead of .). This variable is very similar to `nnir-wais-remove-prefix', except that it is for Namazu, not Wais." :type '(directory) :group 'nnir) ;;; Internal Variables: (defvar nnir-current-query nil "Internal: stores current query (= group name).") (defvar nnir-current-server nil "Internal: stores current server (does it ever change?).") (defvar nnir-current-group-marked nil "Internal: stores current list of process-marked groups.") (defvar nnir-artlist nil "Internal: stores search result.") (defvar nnir-tmp-buffer " *nnir*" "Internal: temporary buffer.") ;;; Code: ;; Gnus glue. (defun gnus-group-make-nnir-group (extra-parms query) "Create an nnir group. Asks for query." (interactive "P\nsQuery: ") (setq nnir-current-query nil nnir-current-server nil nnir-current-group-marked nil nnir-artlist nil) (let ((parms nil)) (if extra-parms (setq parms (nnir-read-parms query)) (setq parms (list (cons 'query query)))) (add-to-list 'parms (cons 'unique-id (message-unique-id)) t) (gnus-group-read-ephemeral-group (concat "nnir:" (prin1-to-string parms)) '(nnir "") t (cons (current-buffer) gnus-current-window-configuration) nil))) (eval-when-compile (when (featurep 'xemacs) ;; The `kbd' macro requires that the `read-kbd-macro' macro is available. (require 'edmacro))) (defun nnir-group-mode-hook () (define-key gnus-group-mode-map (kbd "G G") 'gnus-group-make-nnir-group)) (add-hook 'gnus-group-mode-hook 'nnir-group-mode-hook) ;; Why is this needed? Is this for compatibility with old/new gnusae? Using ;; gnus-group-server instead works for me. -- Justus Piater (defmacro nnir-group-server (group) "Return the server for a newsgroup GROUP. The returned format is as `gnus-server-to-method' needs it. See `gnus-group-real-prefix' and `gnus-group-real-name'." `(let ((gname ,group)) (if (string-match "^\\([^:]+\\):" gname) (progn (setq gname (match-string 1 gname)) (if (string-match "^\\([^+]+\\)\\+\\(.+\\)$" gname) (format "%s:%s" (match-string 1 gname) (match-string 2 gname)) (concat gname ":"))) (format "%s:%s" (car gnus-select-method) (cadr gnus-select-method))))) ;; Summary mode commands. (defun gnus-summary-nnir-goto-thread () "Only applies to nnir groups. Go to group this article came from and show thread that contains this article." (interactive) (unless (eq 'nnir (car (gnus-find-method-for-group gnus-newsgroup-name))) (error "Can't execute this command unless in nnir group")) (let* ((cur (gnus-summary-article-number)) (group (nnir-artlist-artitem-group nnir-artlist cur)) (backend-number (nnir-artlist-artitem-number nnir-artlist cur)) server backend-group) (setq server (nnir-group-server group)) (setq backend-group (gnus-group-real-name group)) (gnus-group-read-ephemeral-group backend-group (gnus-server-to-method server) t ; activate (cons (current-buffer) 'summary) ; window config nil (list backend-number)) (gnus-summary-limit (list backend-number)) (gnus-summary-refer-thread))) (if (fboundp 'eval-after-load) (eval-after-load "gnus-sum" '(define-key gnus-summary-goto-map "T" 'gnus-summary-nnir-goto-thread)) (add-hook 'gnus-summary-mode-hook (function (lambda () (define-key gnus-summary-goto-map "T" 'gnus-summary-nnir-goto-thread))))) ;; Gnus backend interface functions. (deffoo nnir-open-server (server &optional definitions) ;; Just set the server variables appropriately. (nnoo-change-server 'nnir server definitions)) (deffoo nnir-request-group (group &optional server fast) "GROUP is the query string." (nnir-possibly-change-server server) ;; Check for cache and return that if appropriate. (if (and (equal group nnir-current-query) (equal gnus-group-marked nnir-current-group-marked) (or (null server) (equal server nnir-current-server))) nnir-artlist ;; Cache miss. (setq nnir-artlist (nnir-run-query group))) (save-excursion (set-buffer nntp-server-buffer) (if (zerop (length nnir-artlist)) (progn (setq nnir-current-query nil nnir-current-server nil nnir-current-group-marked nil nnir-artlist nil) (nnheader-report 'nnir "Search produced empty results.")) ;; Remember data for cache. (setq nnir-current-query group) (when server (setq nnir-current-server server)) (setq nnir-current-group-marked gnus-group-marked) (nnheader-insert "211 %d %d %d %s\n" (nnir-artlist-length nnir-artlist) ; total # 1 ; first # (nnir-artlist-length nnir-artlist) ; last # group)))) ; group name (deffoo nnir-retrieve-headers (articles &optional group server fetch-old) (save-excursion (let ((artlist (copy-sequence articles)) art artitem artgroup artno artrsv artfullgroup novitem novdata foo server) (while (not (null artlist)) (setq art (car artlist)) (or (numberp art) (nnheader-report 'nnir "nnir-retrieve-headers doesn't grok message ids: %s" art)) (setq artitem (nnir-artlist-article nnir-artlist art)) (setq artrsv (nnir-artitem-rsv artitem)) (setq artfullgroup (nnir-artitem-group artitem)) (setq artno (nnir-artitem-number artitem)) (setq artgroup (gnus-group-real-name artfullgroup)) (setq server (nnir-group-server artfullgroup)) ;; retrieve NOV or HEAD data for this article, transform into ;; NOV data and prepend to `novdata' (set-buffer nntp-server-buffer) (nnir-possibly-change-server server) (let ((gnus-override-method (gnus-server-to-method server))) ;; if nnir-get-article-nov-override-function is set, use it (if nnir-get-article-nov-override-function (setq novitem (funcall nnir-get-article-nov-override-function artitem)) ;; else, set novitem through nnheader-parse-nov/nnheader-parse-head (case (setq foo (gnus-retrieve-headers (list artno) artfullgroup nil)) (nov (goto-char (point-min)) (setq novitem (nnheader-parse-nov)) (unless novitem (pop-to-buffer nntp-server-buffer) (error "nnheader-parse-nov returned nil for article %s in group %s" artno artfullgroup))) (headers (goto-char (point-min)) (setq novitem (nnheader-parse-head)) (unless novitem (pop-to-buffer nntp-server-buffer) (error "nnheader-parse-head returned nil for article %s in group %s" artno artfullgroup))) (t (error "Unknown header type %s while requesting article %s of group %s" foo artno artfullgroup))))) ;; replace article number in original group with article number ;; in nnir group (mail-header-set-number novitem art) (mail-header-set-from novitem (mail-header-from novitem)) (mail-header-set-subject novitem (format "[%d: %s/%d] %s" artrsv artgroup artno (mail-header-subject novitem))) ;;-(mail-header-set-extra novitem nil) (push novitem novdata) (setq artlist (cdr artlist))) (setq novdata (nreverse novdata)) (set-buffer nntp-server-buffer) (erase-buffer) (mapc 'nnheader-insert-nov novdata) 'nov))) (deffoo nnir-request-article (article &optional group server to-buffer) (if (stringp article) (nnheader-report 'nnir "nnir-retrieve-headers doesn't grok message ids: %s" article) (save-excursion (let* ((artitem (nnir-artlist-article nnir-artlist article)) (artfullgroup (nnir-artitem-group artitem)) (artno (nnir-artitem-number artitem)) ;; Bug? ;; Why must we bind nntp-server-buffer here? It won't ;; work if `buf' is used, say. (Of course, the set-buffer ;; line below must then be updated, too.) (nntp-server-buffer (or to-buffer nntp-server-buffer))) (set-buffer nntp-server-buffer) (erase-buffer) (message "Requesting article %d from group %s" artno artfullgroup) (gnus-request-article artno artfullgroup nntp-server-buffer) (cons artfullgroup artno))))) (nnoo-define-skeleton nnir) (defmacro nnir-add-result (dirnam artno score prefix server artlist) "Ask `nnir-compose-result' to construct a result vector, and if it is non-nil, add it to artlist." `(let ((result (nnir-compose-result ,dirnam ,artno ,score ,prefix ,server))) (when (not (null result)) (push result ,artlist)))) (autoload 'nnmaildir-base-name-to-article-number "nnmaildir") ;; Helper function currently used by the Swish++ and Namazu backends; ;; perhaps useful for other backends as well (defun nnir-compose-result (dirnam article score prefix server) "Extract the group from dirnam, and create a result vector ready to be added to the list of search results." ;; remove nnir-*-remove-prefix from beginning of dirnam filename (when (string-match (concat "^" prefix) dirnam) (setq dirnam (replace-match "" t t dirnam))) (when (file-readable-p (concat prefix dirnam article)) ;; remove trailing slash and, for nnmaildir, cur/new/tmp (setq dirnam (substring dirnam 0 (if (string= server "nnmaildir:") -5 -1))) ;; Set group to dirnam without any leading dots or slashes, ;; and with all subsequent slashes replaced by dots (let ((group (gnus-replace-in-string (gnus-replace-in-string dirnam "^[./\\]" "" t) "[/\\]" "." t))) (vector (nnir-group-full-name group server) (if (string= server "nnmaildir:") (nnmaildir-base-name-to-article-number (substring article 0 (string-match ":" article)) group nil) (string-to-number article)) (string-to-number score))))) ;;; Search Engine Interfaces: ;; freeWAIS-sf interface. (defun nnir-run-waissearch (query server &optional group) "Run given query agains waissearch. Returns vector of (group name, file name) pairs (also vectors, actually)." (when group (error "The freeWAIS-sf backend cannot search specific groups")) (save-excursion (let ((qstring (cdr (assq 'query query))) (prefix (nnir-read-server-parm 'nnir-wais-remove-prefix server)) artlist score artno dirnam) (set-buffer (get-buffer-create nnir-tmp-buffer)) (erase-buffer) (message "Doing WAIS query %s..." query) (call-process nnir-wais-program nil ; input from /dev/null t ; output to current buffer nil ; don't redisplay "-d" (nnir-read-server-parm 'nnir-wais-database server) ; database to search qstring) (message "Massaging waissearch output...") ;; remove superfluous lines (keep-lines "Score:") ;; extract data from result lines (goto-char (point-min)) (while (re-search-forward "Score: +\\([0-9]+\\).*'\\([0-9]+\\) +\\([^']+\\)/'" nil t) (setq score (match-string 1) artno (match-string 2) dirnam (match-string 3)) (unless (string-match prefix dirnam) (nnheader-report 'nnir "Dir name %s doesn't contain prefix %s" dirnam prefix)) (setq group (gnus-replace-in-string (replace-match "" t t dirnam) "/" ".")) (push (vector (nnir-group-full-name group server) (string-to-number artno) (string-to-number score)) artlist)) (message "Massaging waissearch output...done") (apply 'vector (sort artlist (function (lambda (x y) (> (nnir-artitem-rsv x) (nnir-artitem-rsv y))))))))) ;; IMAP interface. ;; todo: ;; nnir invokes this two (2) times???! ;; we should not use nnimap at all but open our own server connection ;; we should not LIST * but use nnimap-list-pattern from defs ;; send queries as literals ;; handle errors (autoload 'nnimap-open-server "nnimap") (defvar nnimap-server-buffer) ;; nnimap.el (autoload 'imap-mailbox-select "imap") (autoload 'imap-search "imap") (autoload 'imap-quote-specials "imap") (defun nnir-run-imap (query srv &optional group-option) "Run a search against an IMAP back-end server. This uses a custom query language parser; see `nnir-imap-make-query' for details on the language and supported extensions" (save-excursion (let ((qstring (cdr (assq 'query query))) (server (cadr (gnus-server-to-method srv))) (group (or group-option (gnus-group-group-name))) (defs (caddr (gnus-server-to-method srv))) (criteria (or (cdr (assq 'criteria query)) nnir-imap-search-field)) artlist buf) (message "Opening server %s" server) (condition-case () (when (nnimap-open-server server defs) ;; xxx (setq buf nnimap-server-buffer) ;; xxx (message "Searching %s..." group) (let ((arts 0) (mbx (gnus-group-real-name group))) (when (imap-mailbox-select mbx nil buf) (mapc (lambda (artnum) (push (vector group artnum 1) artlist) (setq arts (1+ arts))) (imap-search (nnir-imap-make-query criteria qstring) buf)) (message "Searching %s... %d matches" mbx arts))) (message "Searching %s...done" group)) (quit nil)) (reverse artlist)))) (defun nnir-imap-make-query (criteria qstring) "Parse the query string and criteria into an appropriate IMAP search expression, returning the string query to make. This implements a little language designed to return the expected results to an arbitrary query string to the end user. The search is always case-insensitive, as defined by RFC2060, and supports the following features (inspired by the Google search input language): Automatic \"and\" queries If you specify multiple words then they will be treated as an \"and\" expression intended to match all components. Phrase searches If you wrap your query in double-quotes then it will be treated as a literal string. Negative terms If you precede a term with \"-\" then it will negate that. \"OR\" queries If you include an upper-case \"OR\" in your search it will cause the term before it and the term after it to be treated as alternatives. In future the following will be added to the language: * support for date matches * support for location of text matching within the query * from/to/etc headers * additional search terms * flag based searching * anything else that the RFC supports, basically." ;; Walk through the query and turn it into an IMAP query string. (nnir-imap-query-to-imap criteria (nnir-imap-parse-query qstring))) (defun nnir-imap-query-to-imap (criteria query) "Turn a s-expression format query into IMAP." (mapconcat ;; Turn the expressions into IMAP text (lambda (item) (nnir-imap-expr-to-imap criteria item)) ;; The query, already in s-expr format. query ;; Append a space between each expression " ")) (defun nnir-imap-expr-to-imap (criteria expr) "Convert EXPR into an IMAP search expression on CRITERIA" ;; What sort of expression is this, eh? (cond ;; Simple string term ((stringp expr) (format "%s \"%s\"" criteria (imap-quote-specials expr))) ;; Trivial term: and ((eq expr 'and) nil) ;; Composite term: or expression ((eq (car-safe expr) 'or) (format "OR %s %s" (nnir-imap-expr-to-imap criteria (second expr)) (nnir-imap-expr-to-imap criteria (third expr)))) ;; Composite term: just the fax, mam ((eq (car-safe expr) 'not) (format "NOT (%s)" (nnir-imap-query-to-imap criteria (rest expr)))) ;; Composite term: just expand it all. ((and (not (null expr)) (listp expr)) (format "(%s)" (nnir-imap-query-to-imap criteria expr))) ;; Complex value, give up for now. (t (error "Unhandled input: %S" expr)))) (defun nnir-imap-parse-query (string) "Turn STRING into an s-expression based query based on the IMAP query language as defined in `nnir-imap-make-query'. This involves turning individual tokens into higher level terms that the search language can then understand and use." (with-temp-buffer ;; Set up the parsing environment. (insert string) (goto-char (point-min)) ;; Now, collect the output terms and return them. (let (out) (while (not (nnir-imap-end-of-input)) (push (nnir-imap-next-expr) out)) (reverse out)))) (defun nnir-imap-next-expr (&optional count) "Return the next expression from the current buffer." (let ((term (nnir-imap-next-term count)) (next (nnir-imap-peek-symbol))) ;; Are we looking at an 'or' expression? (cond ;; Handle 'expr or expr' ((eq next 'or) (list 'or term (nnir-imap-next-expr 2))) ;; Anything else (t term)))) (defun nnir-imap-next-term (&optional count) "Return the next TERM from the current buffer." (let ((term (nnir-imap-next-symbol count))) ;; What sort of term is this? (cond ;; and -- just ignore it ((eq term 'and) 'and) ;; negated term ((eq term 'not) (list 'not (nnir-imap-next-expr))) ;; generic term (t term)))) (defun nnir-imap-peek-symbol () "Return the next symbol from the current buffer, but don't consume it." (save-excursion (nnir-imap-next-symbol))) (defun nnir-imap-next-symbol (&optional count) "Return the next symbol from the current buffer, or nil if we are at the end of the buffer. If supplied COUNT skips some symbols before returning the one at the supplied position." (when (and (numberp count) (> count 1)) (nnir-imap-next-symbol (1- count))) (let ((case-fold-search t)) ;; end of input stream? (unless (nnir-imap-end-of-input) ;; No, return the next symbol from the stream. (cond ;; negated expression -- return it and advance one char. ((looking-at "-") (forward-char 1) 'not) ;; quoted string ((looking-at "\"") (nnir-imap-delimited-string "\"")) ;; list expression -- we parse the content and return this as a list. ((looking-at "(") (nnir-imap-parse-query (nnir-imap-delimited-string ")"))) ;; keyword input -- return a symbol version ((looking-at "\\band\\b") (forward-char 3) 'and) ((looking-at "\\bor\\b") (forward-char 2) 'or) ((looking-at "\\bnot\\b") (forward-char 3) 'not) ;; Simple, boring keyword (t (let ((start (point)) (end (if (search-forward-regexp "[[:blank:]]" nil t) (prog1 (match-beginning 0) ;; unskip if we hit a non-blank terminal character. (when (string-match "[^[:blank:]]" (match-string 0)) (backward-char 1))) (goto-char (point-max))))) (buffer-substring start end))))))) (defun nnir-imap-delimited-string (delimiter) "Return a delimited string from the current buffer." (let ((start (point)) end) (forward-char 1) ; skip the first delimiter. (while (not end) (unless (search-forward delimiter nil t) (error "Unmatched delimited input with %s in query" delimiter)) (let ((here (point))) (unless (equal (buffer-substring (- here 2) (- here 1)) "\\") (setq end (point))))) (buffer-substring (1+ start) (1- end)))) (defun nnir-imap-end-of-input () "Are we at the end of input?" (skip-chars-forward "[[:blank:]]") (looking-at "$")) ;; Swish++ interface. ;; -cc- Todo ;; Search by ;; - group ;; Sort by ;; - rank (default) ;; - article number ;; - file size ;; - group (defun nnir-run-swish++ (query server &optional group) "Run QUERY against swish++. Returns a vector of (group name, file name) pairs (also vectors, actually). Tested with swish++ 4.7 on GNU/Linux and with swish++ 5.0b2 on Windows NT 4.0." (when group (error "The swish++ backend cannot search specific groups")) (save-excursion (let ( (qstring (cdr (assq 'query query))) (groupspec (cdr (assq 'group query))) (prefix (nnir-read-server-parm 'nnir-swish++-remove-prefix server)) artlist ;; nnml-use-compressed-files might be any string, but probably this ;; is sufficient. Note that we can't only use the value of ;; nnml-use-compressed-files because old articles might have been ;; saved with a different value. (article-pattern (if (string= server "nnmaildir:") ":[0-9]+" "^[0-9]+\\(\\.[a-z0-9]+\\)?$")) score artno dirnam filenam) (when (equal "" qstring) (error "swish++: You didn't enter anything")) (set-buffer (get-buffer-create nnir-tmp-buffer)) (erase-buffer) (if groupspec (message "Doing swish++ query %s on %s..." qstring groupspec) (message "Doing swish++ query %s..." qstring)) (let* ((cp-list `( ,nnir-swish++-program nil ; input from /dev/null t ; output nil ; don't redisplay "--config-file" ,(nnir-read-server-parm 'nnir-swish++-configuration-file server) ,@(nnir-read-server-parm 'nnir-swish++-additional-switches server) ,qstring ; the query, in swish++ format )) (exitstatus (progn (message "%s args: %s" nnir-swish++-program (mapconcat 'identity (cddddr cp-list) " ")) ;; ??? (apply 'call-process cp-list)))) (unless (or (null exitstatus) (zerop exitstatus)) (nnheader-report 'nnir "Couldn't run swish++: %s" exitstatus) ;; swish++ failure reason is in this buffer, show it if ;; the user wants it. (when (> gnus-verbose 6) (display-buffer nnir-tmp-buffer)))) ;; The results are output in the format of: ;; V 4.7 Linux ;; rank relative-path-name file-size file-title ;; V 5.0b2: ;; rank relative-path-name file-size topic?? ;; where rank is an integer from 1 to 100. (goto-char (point-min)) (while (re-search-forward "\\(^[0-9]+\\) \\([^ ]+\\) [0-9]+ \\(.*\\)$" nil t) (setq score (match-string 1) filenam (match-string 2) artno (file-name-nondirectory filenam) dirnam (file-name-directory filenam)) ;; don't match directories (when (string-match article-pattern artno) (when (not (null dirnam)) ;; maybe limit results to matching groups. (when (or (not groupspec) (string-match groupspec dirnam)) (nnir-add-result dirnam artno score prefix server artlist))))) (message "Massaging swish++ output...done") ;; Sort by score (apply 'vector (sort artlist (function (lambda (x y) (> (nnir-artitem-rsv x) (nnir-artitem-rsv y))))))))) ;; Swish-E interface. (defun nnir-run-swish-e (query server &optional group) "Run given query against swish-e. Returns a vector of (group name, file name) pairs (also vectors, actually). Tested with swish-e-2.0.1 on Windows NT 4.0." ;; swish-e crashes with empty parameter to "-w" on commandline... (when group (error "The swish-e backend cannot search specific groups")) (save-excursion (let ((qstring (cdr (assq 'query query))) (prefix (or (nnir-read-server-parm 'nnir-swish-e-remove-prefix server) (error "Missing parameter `nnir-swish-e-remove-prefix'"))) artlist score artno dirnam group ) (when (equal "" qstring) (error "swish-e: You didn't enter anything")) (set-buffer (get-buffer-create nnir-tmp-buffer)) (erase-buffer) (message "Doing swish-e query %s..." query) (let* ((index-files (or (nnir-read-server-parm 'nnir-swish-e-index-files server) (error "Missing parameter `nnir-swish-e-index-files'"))) (additional-switches (nnir-read-server-parm 'nnir-swish-e-additional-switches server)) (cp-list `(,nnir-swish-e-program nil ; input from /dev/null t ; output nil ; don't redisplay "-f" ,@index-files ,@additional-switches "-w" ,qstring ; the query, in swish-e format )) (exitstatus (progn (message "%s args: %s" nnir-swish-e-program (mapconcat 'identity (cddddr cp-list) " ")) (apply 'call-process cp-list)))) (unless (or (null exitstatus) (zerop exitstatus)) (nnheader-report 'nnir "Couldn't run swish-e: %s" exitstatus) ;; swish-e failure reason is in this buffer, show it if ;; the user wants it. (when (> gnus-verbose 6) (display-buffer nnir-tmp-buffer)))) ;; The results are output in the format of: ;; rank path-name file-title file-size (goto-char (point-min)) (while (re-search-forward "\\(^[0-9]+\\) \\([^ ]+\\) \"\\([^\"]+\\)\" [0-9]+$" nil t) (setq score (match-string 1) artno (match-string 3) dirnam (file-name-directory (match-string 2))) ;; don't match directories (when (string-match "^[0-9]+$" artno) (when (not (null dirnam)) ;; remove nnir-swish-e-remove-prefix from beginning of dirname (when (string-match (concat "^" prefix) dirnam) (setq dirnam (replace-match "" t t dirnam))) (setq dirnam (substring dirnam 0 -1)) ;; eliminate all ".", "/", "\" from beginning. Always matches. (string-match "^[./\\]*\\(.*\\)$" dirnam) ;; "/" -> "." (setq group (gnus-replace-in-string (match-string 1 dirnam) "/" ".")) ;; Windows "\\" -> "." (setq group (gnus-replace-in-string group "\\\\" ".")) (push (vector (nnir-group-full-name group server) (string-to-number artno) (string-to-number score)) artlist)))) (message "Massaging swish-e output...done") ;; Sort by score (apply 'vector (sort artlist (function (lambda (x y) (> (nnir-artitem-rsv x) (nnir-artitem-rsv y))))))))) ;; HyREX interface (defun nnir-run-hyrex (query server &optional group) (save-excursion (let ((artlist nil) (groupspec (cdr (assq 'group query))) (qstring (cdr (assq 'query query))) (prefix (nnir-read-server-parm 'nnir-hyrex-remove-prefix server)) score artno dirnam) (when (and group groupspec) (error (concat "It does not make sense to use a group spec" " with process-marked groups."))) (when group (setq groupspec (gnus-group-real-name group))) (when (and group (not (equal group (nnir-group-full-name groupspec server)))) (message "%s vs. %s" group (nnir-group-full-name groupspec server)) (error "Server with groupspec doesn't match group !")) (set-buffer (get-buffer-create nnir-tmp-buffer)) (erase-buffer) (if groupspec (message "Doing hyrex-search query %s on %s..." query groupspec) (message "Doing hyrex-search query %s..." query)) (let* ((cp-list `( ,nnir-hyrex-program nil ; input from /dev/null t ; output nil ; don't redisplay "-i",(nnir-read-server-parm 'nnir-hyrex-index-directory server) ; index directory ,@(nnir-read-server-parm 'nnir-hyrex-additional-switches server) ,qstring ; the query, in hyrex-search format )) (exitstatus (progn (message "%s args: %s" nnir-hyrex-program (mapconcat 'identity (cddddr cp-list) " ")) (apply 'call-process cp-list)))) (unless (or (null exitstatus) (zerop exitstatus)) (nnheader-report 'nnir "Couldn't run hyrex-search: %s" exitstatus) ;; nnir-search failure reason is in this buffer, show it if ;; the user wants it. (when (> gnus-verbose 6) (display-buffer nnir-tmp-buffer)))) ;; FIXME: Dont clear buffer ! (if groupspec (message "Doing hyrex-search query \"%s\" on %s...done" qstring groupspec) (message "Doing hyrex-search query \"%s\"...done" qstring)) (sit-for 0) ;; nnir-search returns: ;; for nnml/nnfolder: "filename mailid weigth" ;; for nnimap: "group mailid weigth" (goto-char (point-min)) (delete-non-matching-lines "^\\S + [0-9]+ [0-9]+$") ;; HyREX couldn't search directly in groups -- so filter out here. (when groupspec (keep-lines groupspec)) ;; extract data from result lines (goto-char (point-min)) (while (re-search-forward "\\(\\S +\\) \\([0-9]+\\) \\([0-9]+\\)" nil t) (setq dirnam (match-string 1) artno (match-string 2) score (match-string 3)) (when (string-match prefix dirnam) (setq dirnam (replace-match "" t t dirnam))) (push (vector (nnir-group-full-name (gnus-replace-in-string dirnam "/" ".") server) (string-to-number artno) (string-to-number score)) artlist)) (message "Massaging hyrex-search output...done.") (apply 'vector (sort artlist (function (lambda (x y) (if (string-lessp (nnir-artitem-group x) (nnir-artitem-group y)) t (< (nnir-artitem-number x) (nnir-artitem-number y))))))) ))) ;; Namazu interface (defun nnir-run-namazu (query server &optional group) "Run given query against Namazu. Returns a vector of (group name, file name) pairs (also vectors, actually). Tested with Namazu 2.0.6 on a GNU/Linux system." (when group (error "The Namazu backend cannot search specific groups")) (save-excursion (let ((article-pattern (if (string= server "nnmaildir:") ":[0-9]+" "^[0-9]+$")) artlist (qstring (cdr (assq 'query query))) (prefix (nnir-read-server-parm 'nnir-namazu-remove-prefix server)) score group article (process-environment (copy-sequence process-environment))) (setenv "LC_MESSAGES" "C") (set-buffer (get-buffer-create nnir-tmp-buffer)) (erase-buffer) (let* ((cp-list `( ,nnir-namazu-program nil ; input from /dev/null t ; output nil ; don't redisplay "-q" ; don't be verbose "-a" ; show all matches "-s" ; use short format ,@(nnir-read-server-parm 'nnir-namazu-additional-switches server) ,qstring ; the query, in namazu format ,(nnir-read-server-parm 'nnir-namazu-index-directory server) ; index directory )) (exitstatus (progn (message "%s args: %s" nnir-namazu-program (mapconcat 'identity (cddddr cp-list) " ")) (apply 'call-process cp-list)))) (unless (or (null exitstatus) (zerop exitstatus)) (nnheader-report 'nnir "Couldn't run namazu: %s" exitstatus) ;; Namazu failure reason is in this buffer, show it if ;; the user wants it. (when (> gnus-verbose 6) (display-buffer nnir-tmp-buffer)))) ;; Namazu output looks something like this: ;; 2. Re: Gnus agent expire broken (score: 55) ;; /home/henrik/Mail/mail/sent/1310 (4,138 bytes) (goto-char (point-min)) (while (re-search-forward "^\\([0-9]+\\.\\).*\\((score: \\([0-9]+\\)\\))\n\\([^ ]+\\)" nil t) (setq score (match-string 3) group (file-name-directory (match-string 4)) article (file-name-nondirectory (match-string 4))) ;; make sure article and group is sane (when (and (string-match article-pattern article) (not (null group))) (nnir-add-result group article score prefix server artlist))) ;; sort artlist by score (apply 'vector (sort artlist (function (lambda (x y) (> (nnir-artitem-rsv x) (nnir-artitem-rsv y))))))))) (defun nnir-run-find-grep (query server &optional group) "Run find and grep to obtain matching articles." (let* ((method (gnus-server-to-method server)) (sym (intern (concat (symbol-name (car method)) "-directory"))) (directory (cadr (assoc sym (cddr method)))) (regexp (cdr (assoc 'query query))) (grep-options (cdr (assoc 'grep-options query))) artlist) (unless directory (error "No directory found in method specification of server %s" server)) (message "Searching %s using find-grep..." (or group server)) (save-window-excursion (set-buffer (get-buffer-create nnir-tmp-buffer)) (erase-buffer) (if (> gnus-verbose 6) (pop-to-buffer (current-buffer))) (cd directory) ; Using relative paths simplifies postprocessing. (let ((group (if (not group) "." ;; Try accessing the group literally as well as ;; interpreting dots as directory separators so the ;; engine works with plain nnml as well as the Gnus Cache. (let ((group (gnus-group-real-name group))) ;; Replace cl-func find-if. (if (file-directory-p group) group (if (file-directory-p (setq group (gnus-replace-in-string group "\\." "/" t))) group)))))) (unless group (error "Cannot locate directory for group")) (save-excursion (apply 'call-process "find" nil t "find" group "-type" "f" "-name" "[0-9]*" "-exec" "grep" `("-l" ,@(and grep-options ;; Note: the 3rd arg of `split-string' is not ;; available in Emacs 21. (delete "" (split-string grep-options "\\s-"))) "-e" ,regexp "{}" "+")))) ;; Translate relative paths to group names. (while (not (eobp)) (let* ((path (delete "" (split-string (buffer-substring (point) (line-end-position)) "/"))) (art (string-to-number (car (last path))))) (while (string= "." (car path)) (setq path (cdr path))) (let ((group (mapconcat 'identity ;; Replace cl-func: (subseq path 0 -1) (let ((end (1- (length path))) res) (while (>= (setq end (1- end)) 0) (push (pop path) res)) (nreverse res)) "."))) (push (vector (nnir-group-full-name group server) art 0) artlist)) (forward-line 1))) (message "Searching %s using find-grep...done" (or group server)) artlist))) ;;; Util Code: (defun nnir-read-parms (query) "Reads additional search parameters according to `nnir-engines'." (let ((parmspec (caddr (assoc nnir-search-engine nnir-engines)))) (cons (cons 'query query) (mapcar 'nnir-read-parm parmspec)))) (defun nnir-read-parm (parmspec) "Reads a single search parameter. `parmspec' is a cons cell, the car is a symbol, the cdr is a prompt." (let ((sym (car parmspec)) (prompt (cdr parmspec))) (if (listp prompt) (let* ((result (apply 'completing-read prompt)) (mapping (or (assoc result nnir-imap-search-arguments) (assoc nil nnir-imap-search-arguments)))) (cons sym (format (cdr mapping) result))) (cons sym (read-string prompt))))) (defun nnir-run-query (query) "Invoke appropriate search engine function (see `nnir-engines'). If some groups were process-marked, run the query for each of the groups and concat the results." (let ((q (car (read-from-string query)))) (if gnus-group-marked (apply 'vconcat (mapcar (lambda (x) (let ((server (nnir-group-server x)) search-func) (setq search-func (cadr (assoc (nnir-read-server-parm 'nnir-search-engine server) nnir-engines))) (if search-func (funcall search-func q server x) nil))) gnus-group-marked) ) (apply 'vconcat (mapcar (lambda (x) (if (and (equal (cadr x) 'ok) (not (equal (cadar x) "-ephemeral"))) (let ((server (format "%s:%s" (caar x) (cadar x))) search-func) (setq search-func (cadr (assoc (nnir-read-server-parm 'nnir-search-engine server) nnir-engines))) (if search-func (funcall search-func q server nil) nil)) nil)) gnus-opened-servers) )) )) (defun nnir-read-server-parm (key server) "Returns the parameter value of for the given server, where server is of form 'backend:name'." (let ((method (gnus-server-to-method server))) (cond ((and method (assq key (cddr method))) (nth 1 (assq key (cddr method)))) ((and nnir-mail-backend (gnus-server-equal method nnir-mail-backend)) (symbol-value key)) (t nil)))) ;; (if method ;; (if (assq key (cddr method)) ;; (nth 1 (assq key (cddr method))) ;; (symbol-value key)) ;; (symbol-value key)) ;; )) (defun nnir-group-full-name (shortname server) "For the given group name, return a full Gnus group name. The Gnus backend/server information is added." (gnus-group-prefixed-name shortname (gnus-server-to-method server))) (defun nnir-possibly-change-server (server) (unless (and server (nnir-server-opened server)) (nnir-open-server server))) ;; Data type article list. (defun nnir-artlist-length (artlist) "Returns number of articles in artlist." (length artlist)) (defun nnir-artlist-article (artlist n) "Returns from ARTLIST the Nth artitem (counting starting at 1)." (elt artlist (1- n))) (defun nnir-artitem-group (artitem) "Returns the group from the ARTITEM." (elt artitem 0)) (defun nnir-artlist-artitem-group (artlist n) "Returns from ARTLIST the group of the Nth artitem (counting from 1)." (nnir-artitem-group (nnir-artlist-article artlist n))) (defun nnir-artitem-number (artitem) "Returns the number from the ARTITEM." (elt artitem 1)) (defun nnir-artlist-artitem-number (artlist n) "Returns from ARTLIST the number of the Nth artitem (counting from 1)." (nnir-artitem-number (nnir-artlist-article artlist n))) (defun nnir-artitem-rsv (artitem) "Returns the Retrieval Status Value (RSV, score) from the ARTITEM." (elt artitem 2)) (defun nnir-artlist-artitem-rsv (artlist n) "Returns from ARTLIST the Retrieval Status Value of the Nth artitem \(counting from 1)." (nnir-artitem-rsv (nnir-artlist-article artlist n))) ;; unused? (defun nnir-artlist-groups (artlist) "Returns a list of all groups in the given ARTLIST." (let ((res nil) (with-dups nil)) ;; from each artitem, extract group component (setq with-dups (mapcar 'nnir-artitem-group artlist)) ;; remove duplicates from above (mapc (function (lambda (x) (add-to-list 'res x))) with-dups) res)) ;; The end. (provide 'nnir) ;; arch-tag: 9b3fecf8-4397-4bbb-bf3c-6ac3cbbc6664 ;;; nnir.el ends here