mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-24 07:20:37 +00:00
89b163db28
::::::::::::::::: ::: doc/misc/ ::: ::::::::::::::::: 2012-06-11 Lars Magne Ingebrigtsen <larsi@gnus.org> * gnus.texi (POP before SMTP): POP-before-SMTP works with all sending methods, so don't mention smtpmail here. 2012-05-04 Wolfgang Jenkner <wjenkner@inode.at> * gnus.texi (Picons): Document gnus-picon-properties. 2012-06-10 Lars Magne Ingebrigtsen <larsi@gnus.org> * gnus.texi: Remove mention of compilation, as that's no longer supported. 2012-03-14 Christopher Schmidt <christopher@ch.ristopher.com> * gnus.texi (Archived Messages): Mention gnus-gcc-pre-body-encode-hook and gnus-gcc-post-body-encode-hook. 2012-02-16 Lars Ingebrigtsen <larsi@gnus.org> * gnus.texi (Various Summary Stuff): Remove mention of `gnus-propagate-marks'. 2012-02-15 Lars Ingebrigtsen <larsi@gnus.org> * gnus.texi: Remove mentions of nnml/nnfolder/nntp backend marks, which no longer exist. 2012-02-08 Katsumi Yamaoka <yamaoka@jpl.org> * gnus.texi (Archived Messages): Document gnus-gcc-self-resent-messages. 2012-02-06 Lars Ingebrigtsen <larsi@gnus.org> * message.texi (Mail Variables): Mention the optional user parameter for X-Message-SMTP-Method. 2012-02-02 Lars Ingebrigtsen <larsi@gnus.org> * gnus.texi (Posting Styles): Mention X-Message-SMTP-Method. * message.texi (Mail Variables): Document X-Message-SMTP-Method. 2012-01-31 Lars Ingebrigtsen <larsi@gnus.org> * gnus.texi (Key Index): Change encoding to utf-8. :::::::::::::::::: ::: lisp/gnus/ ::: :::::::::::::::::: 2012-06-26 Katsumi Yamaoka <yamaoka@jpl.org> * mm-decode.el: Add coding cookie for a soft hyphen that mm-shr uses. 2012-06-11 Lars Magne Ingebrigtsen <larsi@gnus.org> * gnus-art.el (gnus-article-read-summary-keys): Protect against the key being bound to a lambda form. 2012-05-04 Wolfgang Jenkner <wjenkner@inode.at> * gnus-picon.el (gnus-picon-properties): New defcustom. (gnus-picon-create-glyph): Use it. 2012-06-10 Lars Magne Ingebrigtsen <larsi@gnus.org> * shr.el: Add a iso-8859-1 cookie to make stuff work under other locales. * mm-decode.el (mm-display-part): Dissect archives when hitting `RET' on a handle. * gnus-sum.el (gnus-summary-limit-to-author): Use the current From address as the default. * nnfolder.el (nnfolder-save-buffer): Delete old versions silently. It makes no sense to query the user about internal files. * gnus-spec.el: Remove all the byte-compilation stuff, since benchmarking shows that it doesn't help when entering large summary buffers. * gnus-util.el (gnus-byte-code): Remove. * gnus-spec.el (gnus-update-format-specifications): Remove outdated grouplens stuff. 2012-06-07 Stephen Eglen <S.J.Eglen@damtp.cam.ac.uk> * message.el (message-buffers): Return all buffers derived from Message to make `gnus-dired-attach' work with mu4e. 2012-05-28 Daiki Ueno <ueno@unixuser.org> * mm-decode.el (mm-inhibit-auto-detect-attachment): New variable. (mm-dissect-singlepart): Don't guess the MIME type of application/octet-stream parts if mm-inhibit-auto-detect-attachment is set. (mm-dissect-multipart): Bind mm-inhibit-auto-detect-attachment if the toplevel MIME type is multipart/encrypted. 2011-12-02 Wolfgang Jenkner <wjenkner@inode.at> * gnus-agent.el (gnus-agent-save-active): Deal with the "groups" format. In particular, add an optional argument and a docstring. * gnus-start.el (gnus-groups-to-gnus-format): Use it. * nntp.el (nntp-finish-retrieve-group-infos): Make `nntp-server-buffer' current before calling `gnus-groups-to-gnus-format'. Note that this was already the case for `gnus-active-to-gnus-format'. 2012-04-25 Katsumi Yamaoka <yamaoka@jpl.org> * pop3.el (pop3-wait-for-messages): Fix retrieved data size calculation. 2012-04-12 Lars Magne Ingebrigtsen <larsi@gnus.org> * mm-decode.el (mm-dissect-buffer): Doc fix. * gnus-sum.el (gnus-handle-ephemeral-exit): Avoid creating the group buffer if it doesn't exist. * gnus-group.el (gnus-group-read-ephemeral-group): If no quit-config is given, mark the group as ephemeral with the current window conf. * gnus-sum.el (gnus-set-global-variables): Don't assume that the group buffer exists, which it doesn't if we haven't started Gnus. (gnus-summary-exit): Allow quitting when we don't have a group buffer. 2012-04-10 Lars Magne Ingebrigtsen <larsi@gnus.org> * mml.el (mml-generate-mime): Allow specifying what the top-level part type is. * gnus-sum.el (gnus-auto-center-summary): `scroll-margin' isn't defined on XEmacs. 2012-04-10 Philipp Haselwarter <philipp.haselwarter@gmx.de> (tiny change) * gnus-sum.el (gnus-auto-center-summary): Set default to respect `scroll-margin'. 2012-04-10 Elias Oltmanns <eo@nebensachen.de> (tiny change) * gnus-cite.el (gnus-dissect-cited-text): A single line without citation prefix within a block of cited text should be considered part of that block *only* if it is a blank line. 2012-04-02 Katsumi Yamaoka <yamaoka@jpl.org> * shr.el (shr-find-fill-point): Remove unused code; don't break a line before kinsoku-bol characters nor within kinsoku-eol characters. 2012-03-27 Katsumi Yamaoka <yamaoka@jpl.org> * gnus-sync.el (gnus-topic-alist, gnus-group-topic) (gnus-topic-create-topic, gnus-topic-enter-dribble): Silence compiler. (gnus-sync-read): Use mapc instead of mapcar. * mm-archive.el: Require mm-decode for some macros. (gnus-recursive-directory-files, mailcap-extension-to-mime): Silence the byte compiler. (mm-archive-decoders): New function that returns the value of the mm-archive-decoders variable. * mm-decode.el: Don't require mm-archive; autoload mm-archive functions instead. (mm-dissect-singlepart): Use the function mm-archive-decoders. * nnmail.el (mail-send-and-exit): Silence the byte compiler. 2012-03-12 Peter Munster <pmrb@free.fr> * gnus-demon.el (gnus-demon-timers): Now a plist (function -> timer). (gnus-demon-cancel): Ditto. (gnus-demon-run-callback): When function cannot be called due to low idleness, call it when idleness reaches the expected value, instead of waiting another timer period. (gnus-demon-init): Add `time' to arguments of call-back. 2012-03-22 Lars Magne Ingebrigtsen <larsi@gnus.org> * gnus.el: Register gnus-registry functions. * gnus-registry.el (gnus-try-warping-via-registry): Moved here and indent. * gnus-int.el (gnus-warp-to-article): Check whether the registry is enabled before warping. 2012-03-22 Dave Abrahams <dave@boostpro.com> * gnus-sum.el (gnus-summary-insert-subject): Record information in the registry about each article retrieved. * gnus-int.el (gnus-select-group-with-message-id): New function. (gnus-try-warping-via-registry): Ditto. (gnus-warp-to-article): Fall back on the registry. 2012-03-22 Lars Magne Ingebrigtsen <larsi@gnus.org> * nnimap.el (nnimap-fetch-partial-articles): Minor doc string fixup. 2012-03-22 Katsumi Yamaoka <yamaoka@jpl.org> * gnus-msg.el (gnus-summary-resend-message-insert-gcc): Assume that gnus-gcc-self-resent-messages may be a group parameter. (gnus-summary-resend-message): Don't encode encoded words in header when Gcc'ing resent message. 2012-03-19 Lars Magne Ingebrigtsen <larsi@gnus.org> * shr.el (shr-insert): Treat non-breaking space just like normal space. This seems to produce more pleasing results. (shr-insert): Only insert a blank line if we're starting from an image. (shr-tag-br): Allow <br> to end lines or to make a single blank line. (shr-ensure-paragraph): Consider lines with white space to be blank. 2012-03-14 Christopher Schmidt <christopher@ch.ristopher.com> * gnus-msg.el (gnus-inews-do-gcc): Add gnus-gcc-pre-body-encode-hook and gnus-gcc-post-body-encode-hook. 2012-02-16 Lars Ingebrigtsen <larsi@gnus.org> * mm-decode.el (mm-dissect-singlepart): Guess what the type of application/octet-stream parts really is. * gnus-sum.el (gnus-propagate-marks): Remove. 2012-02-15 Lars Ingebrigtsen <larsi@gnus.org> * nntp.el (nntp-coding-system-for-read): Remove. (nntp-coding-system-for-write): Ditto. (nntp-open-connection): Just use `binary' directly. 2012-02-14 Teodor Zlatanov <tzz@lifelogs.com> * registry.el (registry-usage-test, registry-persistence-test): Move to tests/gnustest-registry.el. (registry-make-testable-db, registry-match-test) (registry-instantiation-test): Move to tests/gnustest-registry.el. * gnus-registry.el (gnus-registry-misc-test) (gnus-registry-usage-test): Move to tests/gnustest-registry.el. * tests/gnustest-registry.el: New file with the registry and gnus-registry ERT tests. 2012-02-13 Katsumi Yamaoka <yamaoka@jpl.org> * gnus-msg.el (gnus-summary-resend-message): Make gnus-summary-resend-message-insert-gcc be last item in message-header-setup-hook. 2012-02-13 Lars Ingebrigtsen <larsi@gnus.org> * nnfolder.el (nnfolder-marks-directory, nnfolder-marks-is-evil) (nnfolder-marks, nnfolder-marks-file-suffix) (nnfolder-marks-modtime): Remove. (nnfolder-open-server): Don't use marks. (nnfolder-request-delete-group): Ditto. (nnfolder-request-rename-group): Ditto. (nnfolder-request-set-mark, nnfolder-request-marks) (nnfolder-group-marks-pathname, nnfolder-marks-changed-p) (nnfolder-save-marks, nnfolder-open-marks): Remove. * nnml.el (nnml-marks-is-evil, nnml-marks-file-name, nnml-marks) (nnml-marks-modtime): Remove. (nnml-request-delete-group): Don't use marks. (nnml-request-rename-group): Ditto. (nnml-request-set-mark, nnml-request-marks, nnml-marks-changed-p) (nnml-save-marks, nnml-open-marks): Remove. * nntp.el (nntp-marks-is-evil, nntp-marks-file-name, nntp-marks) (nntp-marks-modtime, nntp-marks-directory, nntp-request-set-mark) (nntp-request-marks, nntp-marks-directory, nntp-marks-changed-p) (nntp-save-marks, nntp-open-marks, nntp-possibly-create-directory) (nntp-server-to-method-cache): Remove. * shr.el (shr-rescale-image): Fix wrong merge. 2012-02-15 Lars Ingebrigtsen <larsi@gnus.org> * shr.el (shr-remove-trailing-whitespace): Really delete the padding on too-wide lines. 2012-02-09 Lars Ingebrigtsen <larsi@gnus.org> * mm-archive.el (mm-archive-dissect-and-inline): New function. (mm-archive-dissect-and-inline): Fix up the undisplayer. * mm-decode.el (mm-display-external): Output the text from the command in the buffer after the command finished. This makes text-based commands behave better. 2012-02-07 Lars Ingebrigtsen <larsi@gnus.org> * message.el (smtpmail-smtp-user): Silence compiler warning. 2012-02-06 Lars Ingebrigtsen <larsi@gnus.org> * message.el (message-multi-smtp-send-mail): Also allow specifying the SMTP user name. 2012-02-06 Katsumi Yamaoka <yamaoka@jpl.org> * gnus-sum.el (gnus-summary-article-map): Fix typo. 2012-02-02 Lars Ingebrigtsen <larsi@gnus.org> * message.el (message-multi-smtp-send-mail): New function. (message-multi-smtp-send-mail): Respect the X-Message-SMTP-Method header to implement multi-SMTP functionality. * gnus-agent.el (gnus-agent-send-mail-function): Removed. (gnus-agentize): Don't set it. (gnus-agent-send-mail): Don't use it. * gnus-sum.el (gnus-summary-widget-backward): New function and keystroke. * shr.el (shr-put-image): Remove underlines from sliced images. (shr-zoom-image): Compute the region to be replaced more correctly. 2012-02-02 Katsumi Yamaoka <yamaoka@jpl.org> * gnus-msg.el (gnus-gcc-self-resent-messages): New user option. (gnus-summary-resend-message-insert-gcc): New function. (gnus-summary-resend-message): Modify message-header-setup-hook and message-sent-hook to make it work for Gcc. (gnus-inews-do-gcc): Update the number of unread articles of groups that messages are Gcc'd to. * message.el (message-resend): Run message-sent-hook to do Gcc. 2012-02-01 Lars Ingebrigtsen <larsi@gnus.org> * gnus-registry.el (gnus-registry-fixup-registry): Move the message to a higher level to silence compilation. * gnus-art.el (gnus-shr-put-image): Take and pass on a `flags' parameter to allow controlling the scaling. * shr.el (shr-zoom-image): New command and keystroke. (shr-put-image): Take a `size' flag to say how to scale the image. * mm-archive.el (mm-dissect-archive): Use it to get all file names. Use recursive deletion. (mm-dissect-archive): Add support for zip files. * gnus-util.el (gnus-recursive-directory-files): New function. * mm-archive.el (mm-archive-list-files): Inline text and image parts. (mm-archive-decoders): Add tgz support. * mm-decode.el (mm-shr): Make sure that the HTML ends with a newline. Otherwise inserting text into the Gnus buffer can look odd. * gnus-art.el (gnus-mime-inline-part): Slight clean-up. * mm-archive.el (mm-archive-decoders): Add support for tar. * gnus.el (gnus-logo-color-alist): Change the colours for Ma Gnus. * nnmail.el (nnmail-extra-headers): Add Cc to the default. 2012-01-31 Lars Ingebrigtsen <larsi@gnus.org> * mm-decode.el (mm-dissect-singlepart): Check that the decoder exists. * mm-archive.el: New file. * mm-decode.el (mm-dissect-singlepart): Use it to decode ms-tnef files. * mm-util.el (mm-find-buffer-file-coding-system): Comment fix. * message.el (message-goto-*): Make all the `message-goto-*' commands push the mark before moving point. This makes it easier to go back to where you came from after editing whatever you jumped to. 2012-01-07 Teodor Zlatanov <tzz@lifelogs.com> * gnus-sync.el (gnus-sync-newsrc-groups): Quote normally. (gnus-sync-lesync-pre-save-group-entry): Remove invalid invlists. (gnus-sync-lesync-normalize-group-entry): Ignore a few more keys. 2011-11-09 Teodor Zlatanov <tzz@lifelogs.com> * spam.el: Move BBDB autoloads. (spam-exists-in-BBDB-p): New function to do the BBDB search directly in BBDB 2 and 3. (spam-check-BBDB): Use it. (spam-enter-ham-BBDB): Use it. 2011-10-31 Peter Munster <pmrb@free.fr> (tiny change) * gnus-group.el (gnus-group-get-new-news): New parameter `one-level' for scanning exactly one level. * gnus-start.el (gnus-get-unread-articles): Ditto. 2011-11-03 Teodor Zlatanov <tzz@lifelogs.com> * gnus-sync.el: More commentary about setup. 2011-11-02 Teodor Zlatanov <tzz@lifelogs.com> * gnus-sync.el: More commentary about `gnus-sync-read' issues. 2011-10-31 Teodor Zlatanov <tzz@lifelogs.com> * gnus-sync.el: Improve docs about CouchDB admins. 2011-10-29 Teodor Zlatanov <tzz@lifelogs.com> * gnus-sync.el (gnus-sync-lesync-setup): Fix salt when user setup is not needed. Provide xmlplistread list function to produce XML plist output for non-Gnus LeSync clients. 2011-10-27 Teodor Zlatanov <tzz@lifelogs.com> * gnus-sync.el: Add LeSync synchronization backend and logic to read and save against it. Group subscriptions, read marks, other marks, subscription levels, topic names, and topic offsets (the group's position within the topic) are saved. This is an experimental backend and may change significantly. Load json.el from the gnus-fallback-lib if it's not available otherwise. (gnus-sync-save): Don't use `apply-partially' because of XEmacs. 2011-04-20 David Engster <dengste@eml.cc> * tests/gnustest-nntp.el: New file for simple NNTP testing.
733 lines
23 KiB
EmacsLisp
733 lines
23 KiB
EmacsLisp
;;; gnus-spec.el --- format spec functions for Gnus
|
||
|
||
;; Copyright (C) 1996-2012 Free Software Foundation, Inc.
|
||
|
||
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
|
||
;; Keywords: news
|
||
|
||
;; 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:
|
||
|
||
;;; Code:
|
||
|
||
;; For Emacs <22.2 and XEmacs.
|
||
(eval-and-compile
|
||
(unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
|
||
(eval-when-compile (require 'cl))
|
||
(defvar gnus-newsrc-file-version)
|
||
|
||
(require 'gnus)
|
||
|
||
(defcustom gnus-use-correct-string-widths (featurep 'xemacs)
|
||
"*If non-nil, use correct functions for dealing with wide characters."
|
||
:version "22.1"
|
||
:group 'gnus-format
|
||
:type 'boolean)
|
||
|
||
(defcustom gnus-make-format-preserve-properties (featurep 'xemacs)
|
||
"*If non-nil, use a replacement `format' function which preserves
|
||
text properties. This is only needed on XEmacs, as Emacs does this anyway."
|
||
:version "22.1"
|
||
:group 'gnus-format
|
||
:type 'boolean)
|
||
|
||
;;; Internal variables.
|
||
|
||
(defvar gnus-summary-mark-positions nil)
|
||
(defvar gnus-group-mark-positions nil)
|
||
(defvar gnus-group-indentation "")
|
||
|
||
;; Format specs. The chunks below are the machine-generated forms
|
||
;; that are to be evalled as the result of the default format strings.
|
||
;; We write them in here to get them byte-compiled. That way the
|
||
;; default actions will be quite fast, while still retaining the full
|
||
;; flexibility of the user-defined format specs.
|
||
|
||
;; First we have lots of dummy defvars to let the compiler know these
|
||
;; are really dynamic variables.
|
||
|
||
(defvar gnus-tmp-unread)
|
||
(defvar gnus-tmp-replied)
|
||
(defvar gnus-tmp-score-char)
|
||
(defvar gnus-tmp-indentation)
|
||
(defvar gnus-tmp-opening-bracket)
|
||
(defvar gnus-tmp-lines)
|
||
(defvar gnus-tmp-name)
|
||
(defvar gnus-tmp-closing-bracket)
|
||
(defvar gnus-tmp-subject-or-nil)
|
||
(defvar gnus-tmp-subject)
|
||
(defvar gnus-tmp-marked)
|
||
(defvar gnus-tmp-marked-mark)
|
||
(defvar gnus-tmp-subscribed)
|
||
(defvar gnus-tmp-process-marked)
|
||
(defvar gnus-tmp-number-of-unread)
|
||
(defvar gnus-tmp-group-name)
|
||
(defvar gnus-tmp-group)
|
||
(defvar gnus-tmp-article-number)
|
||
(defvar gnus-tmp-unread-and-unselected)
|
||
(defvar gnus-tmp-news-method)
|
||
(defvar gnus-tmp-news-server)
|
||
(defvar gnus-tmp-article-number)
|
||
(defvar gnus-mouse-face)
|
||
(defvar gnus-mouse-face-prop)
|
||
(defvar gnus-tmp-header)
|
||
(defvar gnus-tmp-from)
|
||
|
||
(declare-function gnus-summary-from-or-to-or-newsgroups "gnus-sum"
|
||
(header gnus-tmp-from))
|
||
|
||
(defmacro gnus-lrm-string-p (string)
|
||
(if (fboundp 'bidi-string-mark-left-to-right)
|
||
;; LRM, RLM, PDF characters as integers to avoid breaking Emacs
|
||
;; 23.
|
||
`(memq (aref ,string (1- (length ,string))) '(8206 8207 8236))
|
||
nil))
|
||
|
||
(defvar gnus-lrm-string (if (ignore-errors (string 8206))
|
||
(propertize (string 8206) 'invisible t)
|
||
""))
|
||
|
||
(defvar gnus-summary-line-format-spec nil)
|
||
(defvar gnus-summary-dummy-line-format-spec nil)
|
||
(defvar gnus-group-line-format-spec nil)
|
||
|
||
(defvar gnus-format-specs
|
||
`((version . ,emacs-version)
|
||
(gnus-version . ,(gnus-continuum-version)))
|
||
"Alist of format specs.")
|
||
|
||
(defvar gnus-default-format-specs gnus-format-specs)
|
||
|
||
(defvar gnus-article-mode-line-format-spec nil)
|
||
(defvar gnus-summary-mode-line-format-spec nil)
|
||
(defvar gnus-group-mode-line-format-spec nil)
|
||
|
||
;;; Phew. All that gruft is over with, fortunately.
|
||
|
||
;;;###autoload
|
||
(defun gnus-update-format (var)
|
||
"Update the format specification near point."
|
||
(interactive
|
||
(list
|
||
(save-excursion
|
||
(eval-defun nil)
|
||
;; Find the end of the current word.
|
||
(re-search-forward "[ \t\n]" nil t)
|
||
;; Search backward.
|
||
(when (re-search-backward "\\(gnus-[-a-z]+-line-format\\)" nil t)
|
||
(match-string 1)))))
|
||
(let* ((type (intern (progn (string-match "gnus-\\([-a-z]+\\)-line" var)
|
||
(match-string 1 var))))
|
||
(entry (assq type gnus-format-specs))
|
||
value spec)
|
||
(when entry
|
||
(setq gnus-format-specs (delq entry gnus-format-specs)))
|
||
(set
|
||
(intern (format "%s-spec" var))
|
||
(gnus-parse-format (setq value (symbol-value (intern var)))
|
||
(symbol-value (intern (format "%s-alist" var)))
|
||
(not (string-match "mode" var))))
|
||
(setq spec (symbol-value (intern (format "%s-spec" var))))
|
||
(push (list type value spec) gnus-format-specs)
|
||
|
||
(pop-to-buffer "*Gnus Format*")
|
||
(erase-buffer)
|
||
(lisp-interaction-mode)
|
||
(insert (gnus-pp-to-string spec))))
|
||
|
||
(defun gnus-update-format-specifications (&optional force &rest types)
|
||
"Update all (necessary) format specifications.
|
||
Return a list of updated types."
|
||
;; Make the indentation array.
|
||
;; See whether all the stored info needs to be flushed.
|
||
(when (or force
|
||
(not gnus-newsrc-file-version)
|
||
(not (equal (gnus-continuum-version)
|
||
(gnus-continuum-version gnus-newsrc-file-version)))
|
||
(not (equal emacs-version
|
||
(cdr (assq 'version gnus-format-specs)))))
|
||
(setq gnus-format-specs nil))
|
||
;; Go through all the formats and see whether they need updating.
|
||
(let (new-format entry type val updated)
|
||
(while (setq type (pop types))
|
||
;; Jump to the proper buffer to find out the value of the
|
||
;; variable, if possible. (It may be buffer-local.)
|
||
(save-excursion
|
||
(let ((buffer (intern (format "gnus-%s-buffer" type))))
|
||
(when (and (boundp buffer)
|
||
(setq val (symbol-value buffer))
|
||
(gnus-buffer-exists-p val))
|
||
(set-buffer val))
|
||
(setq new-format (symbol-value
|
||
(intern (format "gnus-%s-line-format" type)))))
|
||
(setq entry (cdr (assq type gnus-format-specs)))
|
||
(if (and (car entry)
|
||
(equal (car entry) new-format))
|
||
;; Use the old format.
|
||
(set (intern (format "gnus-%s-line-format-spec" type))
|
||
(cadr entry))
|
||
;; This is a new format.
|
||
(setq val
|
||
(if (not (stringp new-format))
|
||
;; This is a function call or something.
|
||
new-format
|
||
;; This is a "real" format.
|
||
(gnus-parse-format
|
||
new-format
|
||
(symbol-value
|
||
(intern (format "gnus-%s-line-format-alist" type)))
|
||
(not (string-match "mode$" (symbol-name type))))))
|
||
;; Enter the new format spec into the list.
|
||
(if entry
|
||
(progn
|
||
(setcar (cdr entry) val)
|
||
(setcar entry new-format))
|
||
(push (list type new-format val) gnus-format-specs))
|
||
(set (intern (format "gnus-%s-line-format-spec" type)) val)
|
||
(push type updated))))
|
||
|
||
(unless (assq 'version gnus-format-specs)
|
||
(push (cons 'version emacs-version) gnus-format-specs))
|
||
updated))
|
||
|
||
(defcustom gnus-mouse-face-0 'highlight
|
||
"The \"%(hello%)\" face."
|
||
:group 'gnus-format
|
||
:type 'face)
|
||
|
||
(defcustom gnus-mouse-face-1 'highlight
|
||
"The \"%1(hello%)\" face."
|
||
:group 'gnus-format
|
||
:type 'face)
|
||
|
||
(defcustom gnus-mouse-face-2 'highlight
|
||
"The \"%2(hello%)\" face."
|
||
:group 'gnus-format
|
||
:type 'face)
|
||
|
||
(defcustom gnus-mouse-face-3 'highlight
|
||
"The \"%3(hello%)\" face."
|
||
:group 'gnus-format
|
||
:type 'face)
|
||
|
||
(defcustom gnus-mouse-face-4 'highlight
|
||
"The \"%4(hello%)\" face."
|
||
:group 'gnus-format
|
||
:type 'face)
|
||
|
||
(defun gnus-mouse-face-function (form type)
|
||
`(gnus-put-text-property
|
||
(point) (progn ,@form (point))
|
||
gnus-mouse-face-prop
|
||
,(if (equal type 0)
|
||
'gnus-mouse-face
|
||
`(quote ,(symbol-value (intern (format "gnus-mouse-face-%d" type)))))))
|
||
|
||
(defcustom gnus-face-0 'bold
|
||
"The \"%{hello%}\" face."
|
||
:group 'gnus-format
|
||
:type 'face)
|
||
|
||
(defcustom gnus-face-1 'italic
|
||
"The \"%1{hello%}\" face."
|
||
:group 'gnus-format
|
||
:type 'face)
|
||
|
||
(defcustom gnus-face-2 'bold-italic
|
||
"The \"%2{hello%}\" face."
|
||
:group 'gnus-format
|
||
:type 'face)
|
||
|
||
(defcustom gnus-face-3 'bold
|
||
"The \"%3{hello%}\" face."
|
||
:group 'gnus-format
|
||
:type 'face)
|
||
|
||
(defcustom gnus-face-4 'bold
|
||
"The \"%4{hello%}\" face."
|
||
:group 'gnus-format
|
||
:type 'face)
|
||
|
||
(defun gnus-face-face-function (form type)
|
||
`(gnus-add-text-properties
|
||
(point) (progn ,@form (point))
|
||
'(gnus-face t face ,(symbol-value (intern (format "gnus-face-%d" type))))))
|
||
|
||
(defun gnus-balloon-face-function (form type)
|
||
`(gnus-put-text-property
|
||
(point) (progn ,@form (point))
|
||
,(if (fboundp 'balloon-help-mode)
|
||
''balloon-help
|
||
''help-echo)
|
||
,(intern (format "gnus-balloon-face-%d" type))))
|
||
|
||
(defun gnus-spec-tab (column)
|
||
(if (> column 0)
|
||
`(insert-char ? (max (- ,column (current-column)) 0))
|
||
(let ((column (abs column)))
|
||
`(if (> (current-column) ,column)
|
||
(let ((end (point)))
|
||
(if (= (move-to-column ,column) ,column)
|
||
(delete-region (point) end)
|
||
(delete-region (1- (point)) end)
|
||
(insert " ")))
|
||
(insert-char ? (max (- ,column (current-column)) 0))))))
|
||
|
||
(defun gnus-correct-length (string)
|
||
"Return the correct width of STRING."
|
||
(apply #'+ (mapcar #'char-width string)))
|
||
|
||
(defun gnus-correct-substring (string start &optional end)
|
||
(let ((wstart 0)
|
||
(wend 0)
|
||
(wseek 0)
|
||
(seek 0)
|
||
(length (length string))
|
||
(string (concat string "\0")))
|
||
;; Find the start position.
|
||
(while (and (< seek length)
|
||
(< wseek start))
|
||
(incf wseek (char-width (aref string seek)))
|
||
(incf seek))
|
||
(setq wstart seek)
|
||
;; Find the end position.
|
||
(while (and (<= seek length)
|
||
(or (not end)
|
||
(<= wseek end)))
|
||
(incf wseek (char-width (aref string seek)))
|
||
(incf seek))
|
||
(setq wend seek)
|
||
(substring string wstart (1- wend))))
|
||
|
||
(defun gnus-string-width-function ()
|
||
(cond
|
||
(gnus-use-correct-string-widths
|
||
'gnus-correct-length)
|
||
((fboundp 'string-width)
|
||
'string-width)
|
||
(t
|
||
'length)))
|
||
|
||
(defun gnus-substring-function ()
|
||
(cond
|
||
(gnus-use-correct-string-widths
|
||
'gnus-correct-substring)
|
||
((fboundp 'string-width)
|
||
'gnus-correct-substring)
|
||
(t
|
||
'substring)))
|
||
|
||
(defun gnus-tilde-max-form (el max-width)
|
||
"Return a form that limits EL to MAX-WIDTH."
|
||
(let ((max (abs max-width))
|
||
(length-fun (gnus-string-width-function))
|
||
(substring-fun (gnus-substring-function)))
|
||
(if (symbolp el)
|
||
`(if (> (,length-fun ,el) ,max)
|
||
,(if (< max-width 0)
|
||
`(,substring-fun ,el (- (,length-fun ,el) ,max))
|
||
`(if (gnus-lrm-string-p ,el)
|
||
(concat (,substring-fun ,el 0 ,max) ,gnus-lrm-string)
|
||
(,substring-fun ,el 0 ,max)))
|
||
,el)
|
||
`(let ((val (eval ,el)))
|
||
(if (> (,length-fun val) ,max)
|
||
,(if (< max-width 0)
|
||
`(,substring-fun val (- (,length-fun val) ,max))
|
||
`(if (gnus-lrm-string-p val)
|
||
(concat (,substring-fun val 0 ,max) ,gnus-lrm-string)
|
||
(,substring-fun val 0 ,max)))
|
||
val)))))
|
||
|
||
(defun gnus-tilde-cut-form (el cut-width)
|
||
"Return a form that cuts CUT-WIDTH off of EL."
|
||
(let ((cut (abs cut-width))
|
||
(length-fun (gnus-string-width-function))
|
||
(substring-fun (gnus-substring-function)))
|
||
(if (symbolp el)
|
||
`(if (> (,length-fun ,el) ,cut)
|
||
,(if (< cut-width 0)
|
||
`(,substring-fun ,el 0 (- (,length-fun ,el) ,cut))
|
||
`(,substring-fun ,el ,cut))
|
||
,el)
|
||
`(let ((val (eval ,el)))
|
||
(if (> (,length-fun val) ,cut)
|
||
,(if (< cut-width 0)
|
||
`(,substring-fun val 0 (- (,length-fun val) ,cut))
|
||
`(,substring-fun val ,cut))
|
||
val)))))
|
||
|
||
(defun gnus-tilde-ignore-form (el ignore-value)
|
||
"Return a form that is blank when EL is IGNORE-VALUE."
|
||
(if (symbolp el)
|
||
`(if (equal ,el ,ignore-value)
|
||
"" ,el)
|
||
`(let ((val (eval ,el)))
|
||
(if (equal val ,ignore-value)
|
||
"" val))))
|
||
|
||
(defun gnus-pad-form (el pad-width)
|
||
"Return a form that pads EL to PAD-WIDTH accounting for multi-column
|
||
characters correctly. This is because `format' may pad to columns or to
|
||
characters when given a pad value."
|
||
(let ((pad (abs pad-width))
|
||
(side (< 0 pad-width))
|
||
(length-fun (gnus-string-width-function)))
|
||
(if (symbolp el)
|
||
`(let ((need (- ,pad (,length-fun ,el))))
|
||
(if (> need 0)
|
||
(concat ,(when side '(make-string need ?\ ))
|
||
,el
|
||
,(when (not side) '(make-string need ?\ )))
|
||
,el))
|
||
`(let* ((val (eval ,el))
|
||
(need (- ,pad (,length-fun val))))
|
||
(if (> need 0)
|
||
(concat ,(when side '(make-string need ?\ ))
|
||
val
|
||
,(when (not side) '(make-string need ?\ )))
|
||
val)))))
|
||
|
||
(defun gnus-parse-format (format spec-alist &optional insert)
|
||
;; This function parses the FORMAT string with the help of the
|
||
;; SPEC-ALIST and returns a list that can be eval'ed to return the
|
||
;; string. If the FORMAT string contains the specifiers %( and %)
|
||
;; the text between them will have the mouse-face text property.
|
||
;; If the FORMAT string contains the specifiers %[ and %], the text between
|
||
;; them will have the balloon-help text property.
|
||
(let ((case-fold-search nil))
|
||
(if (string-match
|
||
"\\`\\(.*\\)%[0-9]?[{(<28>]\\(.*\\)%[0-9]?[<5B>})]\\(.*\n?\\)\\'\\|%[-0-9]*=\\|%[-0-9]*\\*"
|
||
format)
|
||
(gnus-parse-complex-format format spec-alist)
|
||
;; This is a simple format.
|
||
(gnus-parse-simple-format format spec-alist insert))))
|
||
|
||
(defun gnus-parse-complex-format (format spec-alist)
|
||
(let ((cursor-spec nil))
|
||
(save-excursion
|
||
(gnus-set-work-buffer)
|
||
(insert format)
|
||
(goto-char (point-min))
|
||
(while (re-search-forward "\"" nil t)
|
||
(replace-match "\\\"" nil t))
|
||
(goto-char (point-min))
|
||
(insert "(\"")
|
||
;; Convert all font specs into font spec lists.
|
||
(while (re-search-forward "%\\([0-9]+\\)?\\([<5B><>{}()]\\)" nil t)
|
||
(let ((number (if (match-beginning 1)
|
||
(match-string 1) "0"))
|
||
(delim (aref (match-string 2) 0)))
|
||
(if (or (= delim ?\()
|
||
(= delim ?\{)
|
||
(= delim ?\<5C>))
|
||
(replace-match (concat "\"("
|
||
(cond ((= delim ?\() "mouse")
|
||
((= delim ?\{) "face")
|
||
(t "balloon"))
|
||
" " number " \"")
|
||
t t)
|
||
(replace-match "\")\""))))
|
||
(goto-char (point-max))
|
||
(insert "\")")
|
||
;; Convert point position commands.
|
||
(goto-char (point-min))
|
||
(let ((case-fold-search nil))
|
||
(while (re-search-forward "%\\([-0-9]+\\)?\\*" nil t)
|
||
(replace-match "\"(point)\"" t t)
|
||
(setq cursor-spec t)))
|
||
;; Convert TAB commands.
|
||
(goto-char (point-min))
|
||
(while (re-search-forward "%\\([-0-9]+\\)=" nil t)
|
||
(replace-match (format "\"(tab %s)\"" (match-string 1)) t t))
|
||
;; Convert the buffer into the spec.
|
||
(goto-char (point-min))
|
||
(let ((form (read (current-buffer))))
|
||
(if cursor-spec
|
||
`(let (gnus-position)
|
||
,@(gnus-complex-form-to-spec form spec-alist)
|
||
(if gnus-position
|
||
(gnus-put-text-property gnus-position (1+ gnus-position)
|
||
'gnus-position t)))
|
||
`(progn
|
||
,@(gnus-complex-form-to-spec form spec-alist)))))))
|
||
|
||
(defun gnus-complex-form-to-spec (form spec-alist)
|
||
(delq nil
|
||
(mapcar
|
||
(lambda (sform)
|
||
(cond
|
||
((stringp sform)
|
||
(gnus-parse-simple-format sform spec-alist t))
|
||
((eq (car sform) 'point)
|
||
'(setq gnus-position (point)))
|
||
((eq (car sform) 'tab)
|
||
(gnus-spec-tab (cadr sform)))
|
||
(t
|
||
(funcall (intern (format "gnus-%s-face-function" (car sform)))
|
||
(gnus-complex-form-to-spec (cddr sform) spec-alist)
|
||
(nth 1 sform)))))
|
||
form)))
|
||
|
||
|
||
(defun gnus-xmas-format (fstring &rest args)
|
||
"A version of `format' which preserves text properties.
|
||
|
||
Required for XEmacs, where the built in `format' function strips all text
|
||
properties from both the format string and any inserted strings.
|
||
|
||
Only supports the format sequence %s, and %% for inserting
|
||
literal % characters. A pad width and an optional - (to right pad)
|
||
are supported for %s."
|
||
(let ((re "%%\\|%\\(-\\)?\\([1-9][0-9]*\\)?s")
|
||
(n (length args)))
|
||
(with-temp-buffer
|
||
(insert fstring)
|
||
(goto-char (point-min))
|
||
(while (re-search-forward re nil t)
|
||
(goto-char (match-end 0))
|
||
(cond
|
||
((string= (match-string 0) "%%")
|
||
(delete-char -1))
|
||
(t
|
||
(if (null args)
|
||
(error 'wrong-number-of-arguments #'my-format n fstring))
|
||
(let* ((minlen (string-to-number (or (match-string 2) "")))
|
||
(arg (car args))
|
||
(str (if (stringp arg) arg (format "%s" arg)))
|
||
(lpad (null (match-string 1)))
|
||
(padlen (max 0 (- minlen (length str)))))
|
||
(replace-match "")
|
||
(if lpad (insert-char ?\ padlen))
|
||
(insert str)
|
||
(unless lpad (insert-char ?\ padlen))
|
||
(setq args (cdr args))))))
|
||
(buffer-string))))
|
||
|
||
(defun gnus-parse-simple-format (format spec-alist &optional insert)
|
||
;; This function parses the FORMAT string with the help of the
|
||
;; SPEC-ALIST and returns a list that can be eval'ed to return a
|
||
;; string.
|
||
(let ((max-width 0)
|
||
spec flist fstring elem result dontinsert user-defined
|
||
type value pad-width spec-beg cut-width ignore-value
|
||
tilde-form tilde elem-type extended-spec)
|
||
(save-excursion
|
||
(gnus-set-work-buffer)
|
||
(insert format)
|
||
(goto-char (point-min))
|
||
(while (re-search-forward "%" nil t)
|
||
(setq user-defined nil
|
||
spec-beg nil
|
||
pad-width nil
|
||
max-width nil
|
||
cut-width nil
|
||
ignore-value nil
|
||
tilde-form nil
|
||
extended-spec nil)
|
||
(setq spec-beg (1- (point)))
|
||
|
||
;; Parse this spec fully.
|
||
(while
|
||
(cond
|
||
((looking-at "\\([-.0-9]+\\)\\(,[-0-9]+\\)?")
|
||
(setq pad-width (string-to-number (match-string 1)))
|
||
(when (match-beginning 2)
|
||
(setq max-width (string-to-number (buffer-substring
|
||
(1+ (match-beginning 2))
|
||
(match-end 2)))))
|
||
(goto-char (match-end 0)))
|
||
((looking-at "~")
|
||
(forward-char 1)
|
||
(setq tilde (read (current-buffer))
|
||
type (car tilde)
|
||
value (cadr tilde))
|
||
(cond
|
||
((memq type '(pad pad-left))
|
||
(setq pad-width value))
|
||
((eq type 'pad-right)
|
||
(setq pad-width (- value)))
|
||
((memq type '(max-right max))
|
||
(setq max-width value))
|
||
((eq type 'max-left)
|
||
(setq max-width (- value)))
|
||
((memq type '(cut cut-left))
|
||
(setq cut-width value))
|
||
((eq type 'cut-right)
|
||
(setq cut-width (- value)))
|
||
((eq type 'ignore)
|
||
(setq ignore-value
|
||
(if (stringp value) value (format "%s" value))))
|
||
((eq type 'form)
|
||
(setq tilde-form value))
|
||
(t
|
||
(error "Unknown tilde type: %s" tilde)))
|
||
t)
|
||
(t
|
||
nil)))
|
||
(cond
|
||
;; User-defined spec -- find the spec name.
|
||
((eq (setq spec (char-after)) ?u)
|
||
(forward-char 1)
|
||
(when (and (eq (setq user-defined (char-after)) ?&)
|
||
(looking-at "&\\([^;]+\\);"))
|
||
(setq user-defined (match-string 1))
|
||
(goto-char (match-end 1))))
|
||
;; extended spec
|
||
((and (eq spec ?&) (looking-at "&\\([^;]+\\);"))
|
||
(setq extended-spec (intern (match-string 1)))
|
||
(goto-char (match-end 1))))
|
||
(forward-char 1)
|
||
(delete-region spec-beg (point))
|
||
|
||
;; Now we have all the relevant data on this spec, so
|
||
;; we start doing stuff.
|
||
(insert "%")
|
||
(if (eq spec ?%)
|
||
;; "%%" just results in a "%".
|
||
(insert "%")
|
||
(cond
|
||
;; Do tilde forms.
|
||
((eq spec ?@)
|
||
(setq elem (list tilde-form ?s)))
|
||
;; Treat user defined format specifiers specially.
|
||
(user-defined
|
||
(setq elem
|
||
(list
|
||
(list (intern (format
|
||
(if (stringp user-defined)
|
||
"gnus-user-format-function-%s"
|
||
"gnus-user-format-function-%c")
|
||
user-defined))
|
||
'gnus-tmp-header)
|
||
?s)))
|
||
;; Find the specification from `spec-alist'.
|
||
((setq elem (cdr (assq (or extended-spec spec) spec-alist))))
|
||
;; We used to use "%l" for displaying the grouplens score.
|
||
((eq spec ?l)
|
||
(setq elem '("" ?s)))
|
||
(t
|
||
(setq elem '("*" ?s))))
|
||
(setq elem-type (cadr elem))
|
||
;; Insert the new format elements.
|
||
(when (and pad-width
|
||
(not (and (featurep 'xemacs)
|
||
gnus-use-correct-string-widths)))
|
||
(insert (number-to-string pad-width)))
|
||
;; Create the form to be evalled.
|
||
(if (or max-width cut-width ignore-value
|
||
(and (featurep 'xemacs)
|
||
gnus-use-correct-string-widths))
|
||
(progn
|
||
(insert ?s)
|
||
(let ((el (car elem)))
|
||
(cond ((= (cadr elem) ?c)
|
||
(setq el (list 'char-to-string el)))
|
||
((= (cadr elem) ?d)
|
||
(setq el (list 'int-to-string el))))
|
||
(when ignore-value
|
||
(setq el (gnus-tilde-ignore-form el ignore-value)))
|
||
(when cut-width
|
||
(setq el (gnus-tilde-cut-form el cut-width)))
|
||
(when max-width
|
||
(setq el (gnus-tilde-max-form el max-width)))
|
||
(when pad-width
|
||
(setq el (gnus-pad-form el pad-width)))
|
||
(push el flist)))
|
||
(insert elem-type)
|
||
(push (car elem) flist))))
|
||
(setq fstring (buffer-substring-no-properties (point-min) (point-max))))
|
||
|
||
;; Do some postprocessing to increase efficiency.
|
||
(setq
|
||
result
|
||
(cond
|
||
;; Emptiness.
|
||
((string= fstring "")
|
||
nil)
|
||
;; Not a format string.
|
||
((not (string-match "%" fstring))
|
||
(list fstring))
|
||
;; A format string with just a single string spec.
|
||
((string= fstring "%s")
|
||
(list (car flist)))
|
||
;; A single character.
|
||
((string= fstring "%c")
|
||
(list (car flist)))
|
||
;; A single number.
|
||
((string= fstring "%d")
|
||
(setq dontinsert t)
|
||
(if insert
|
||
`(insert (int-to-string ,(car flist)))
|
||
(list `(int-to-string ,(car flist)))))
|
||
;; Just lots of chars and strings.
|
||
((string-match "\\`\\(%[cs]\\)+\\'" fstring)
|
||
(nreverse flist))
|
||
;; A single string spec at the beginning of the spec.
|
||
((string-match "\\`%[sc][^%]+\\'" fstring)
|
||
(list (car flist) (substring fstring 2)))
|
||
;; A single string spec in the middle of the spec.
|
||
((string-match "\\`\\([^%]+\\)%[sc]\\([^%]+\\)\\'" fstring)
|
||
(list (match-string 1 fstring) (car flist) (match-string 2 fstring)))
|
||
;; A single string spec in the end of the spec.
|
||
((string-match "\\`\\([^%]+\\)%[sc]\\'" fstring)
|
||
(list (match-string 1 fstring) (car flist)))
|
||
;; Only string (and %) specs (XEmacs only!)
|
||
((and (featurep 'xemacs)
|
||
gnus-make-format-preserve-properties
|
||
(string-match
|
||
"\\`\\([^%]*\\(%%\\|%-?\\([1-9][0-9]*\\)?s\\)\\)*[^%]*\\'"
|
||
fstring))
|
||
(list (cons 'gnus-xmas-format (cons fstring (nreverse flist)))))
|
||
;; A more complex spec.
|
||
(t
|
||
(list (cons 'format (cons fstring (nreverse flist)))))))
|
||
|
||
(if insert
|
||
(when result
|
||
(if dontinsert
|
||
result
|
||
(cons 'insert result)))
|
||
(cond ((stringp result)
|
||
result)
|
||
((consp result)
|
||
(cons 'concat result))
|
||
(t "")))))
|
||
|
||
(defun gnus-eval-format (format &optional alist props)
|
||
"Eval the format variable FORMAT, using ALIST.
|
||
If PROPS, insert the result."
|
||
(let ((form (gnus-parse-format format alist props)))
|
||
(if props
|
||
(gnus-add-text-properties (point) (progn (eval form) (point)) props)
|
||
(eval form))))
|
||
|
||
(defun gnus-set-format (type &optional insertable)
|
||
(set (intern (format "gnus-%s-line-format-spec" type))
|
||
(gnus-parse-format
|
||
(symbol-value (intern (format "gnus-%s-line-format" type)))
|
||
(symbol-value (intern (format "gnus-%s-line-format-alist" type)))
|
||
insertable)))
|
||
|
||
(provide 'gnus-spec)
|
||
|
||
;; Local Variables:
|
||
;; coding: iso-8859-1
|
||
;; End:
|
||
|
||
;;; gnus-spec.el ends here
|