Mercurial > emacs
view lisp/gnus/smiley.el @ 107473:0fe940324254
Synch with Gnus trunk
=====================
2010-03-23 Katsumi Yamaoka <yamaoka@jpl.org>
* gnus-art.el (canlock-verify): Autoload it for Emacs 21.
* message.el (ecomplete-setup): Autoload it for Emacs <23.
* mml-sec.el (mml-secure-cache-passphrase): Default to t that is
password-cache's default if it is not bound.
(mml-secure-passphrase-cache-expiry): Default to 16 that is
password-cache-expiry's default if it is not bound.
* pop3.el (pop3-list): Don't use 3rd arg of `split-string' which is not
available in Emacs 21.
2010-03-23 Teodor Zlatanov <tzz@lifelogs.com>
* auth-source.el (auth-sources): Fix up definition so extra parameters
are always inline.
2010-03-22 Martin Stjernholm <mast@lysator.liu.se>
* nnimap.el (nnimap-verify-uidvalidity): Fixed bug where uidvalidity
wasn't updated after mismatch. Clear cached mailbox info correctly
when uidvalidity changes.
(nnimap-group-prefixed-name): New function to avoid some code
duplication.
(nnimap-verify-uidvalidity, nnimap-group-overview-filename)
(nnimap-request-group): Use it.
(nnimap-retrieve-groups, nnimap-verify-uidvalidity)
(nnimap-update-unseen): Significantly improved speed of Gnus startup
with many imap folders. This is done by caching the group status from
the imap server persistently in a group parameter `imap-status'. (This
was cached before too if `nnimap-retrieve-groups-asynchronous' was set,
but not persistently, so every Gnus startup was still very slow.)
2010-03-20 Teodor Zlatanov <tzz@lifelogs.com>
* auth-source.el: Set up autoloads. Bump to 23.2 because of the
secrets.el dependency.
(auth-sources): Add optional user name. Add secrets.el configuration
choice (unused right now).
2010-03-20 Teodor Zlatanov <tzz@lifelogs.com>
* gnus-sum.el (gnus-summary-make-menu-bar): Let
`gnus-registry-install-shortcuts' fill in the functions.
* gnus-registry.el (gnus-summary-misc-menu): Declare to avoid
warnings.
(gnus-registry-misc-menus): Variable to hold registry mark menus.
(gnus-registry-install-shortcuts): Populate and use it in a
`gnus-summary-menu-hook' lambda, under "Gnus"->"Registry Marks".
2010-03-20 Martin Stjernholm <mast@lysator.liu.se>
* nnimap.el (nnimap-decode-group-name, nnimap-encode-group-name):
In-place substitutions for the group name encoding/decoding.
(nnimap-find-minmax-uid, nnimap-possibly-change-group)
(nnimap-retrieve-headers-progress, nnimap-possibly-change-group)
(nnimap-retrieve-headers-progress, nnimap-request-article-part)
(nnimap-update-unseen, nnimap-request-list)
(nnimap-retrieve-groups, nnimap-request-update-info-internal)
(nnimap-request-set-mark, nnimap-split-to-groups)
(nnimap-split-articles, nnimap-request-newgroups)
(nnimap-request-create-group, nnimap-request-accept-article)
(nnimap-request-delete-group, nnimap-request-rename-group)
(nnimap-acl-get, nnimap-acl-edit): Use them. Replace `mbx' with
`encoded-mbx' for consistency.
(nnimap-close-group): Call `imap-current-mailbox' instead of using the
variable `imap-current-mailbox'.
* gnus-agent.el (gnus-agent-fetch-articles, gnus-agent-fetch-headers)
(gnus-agent-regenerate-group): Use `gnus-agent-decoded-group-name'.
2010-03-20 Bojan Petrovic <bpetrovi@f.bg.ac.rs>
* pop3.el (pop3-display-message-size-flag): Display message size byte
counts during POP3 download.
(pop3-movemail): Use it.
(pop3-list): Implement listing of available messages.
2010-03-20 Mark Triggs <mst@dishevelled.net> (tiny change)
* nnir.el (nnir-get-article-nov-override-function): New function to
override the normal NOV retrieval.
(nnir-retrieve-headers): Use it.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Tue, 23 Mar 2010 07:37:09 +0000 |
parents | 1d1d5d9bd884 |
children | 9317d81f8c81 |
line wrap: on
line source
;;; smiley.el --- displaying smiley faces ;; Copyright (C) 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> ;; Keywords: news mail multimedia ;; 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: ;; A re-written, simplified version of Wes Hardaker's XEmacs smiley.el ;; which might be merged back to smiley.el if we get an assignment for ;; that. We don't have assignments for the images smiley.el uses, but ;; I'm not sure we need that degree of rococoness and defaults like a ;; yellow background. Also, using PBM means we can display the images ;; more generally. -- fx ;; `smiley.el' was replaced by `smiley-ems.el' on 2002-01-26 (after fx' ;; comment). ;; Test smileys: ;; smile ^:-) ^:) ;; blink ;-) ;) ;; forced :-] ;; braindamaged 8-) ;; indifferent :-| ;; wry :-/ :-\ ;; sad :-( ;; frown :-{ ;; evil >:-) ;; cry ;-( ;; dead X-) ;; grin :-D ;;; Code: (eval-when-compile (require 'cl)) (require 'nnheader) (require 'gnus-art) (defgroup smiley nil "Turn :-)'s into real images." :group 'gnus-visual) (defvar smiley-data-directory) (defcustom smiley-style (if (or (and (fboundp 'face-attribute) (>= (face-attribute 'default :height) 160)) (and (fboundp 'face-height) (>= (face-height 'default) 14))) 'medium 'low-color) "Smiley style." :type '(choice (const :tag "small, 3 colors" low-color) ;; 13x14 (const :tag "medium, ~10 colors" medium) ;; 16x16 (const :tag "dull, grayscale" grayscale));; 14x14 :set (lambda (symbol value) (set-default symbol value) (setq smiley-data-directory (smiley-directory)) (smiley-update-cache)) :initialize 'custom-initialize-default :version "23.1" ;; No Gnus :group 'smiley) ;; For compatibility, honor the variable `smiley-data-directory' if the user ;; has set it. (defun smiley-directory (&optional style) "Return a the location of the smiley faces files. STYLE specifies which style to use, see `smiley-style'. If STYLE is nil, use `smiley-style'." (unless style (setq style smiley-style)) (nnheader-find-etc-directory (concat "images/smilies" (cond ((eq smiley-style 'low-color) "") ((eq smiley-style 'medium) "/medium") ((eq smiley-style 'grayscale) "/grayscale"))))) (defcustom smiley-data-directory (smiley-directory) "*Location of the smiley faces files." :set (lambda (symbol value) (set-default symbol value) (smiley-update-cache)) :initialize 'custom-initialize-default :type 'directory :group 'smiley) ;; The XEmacs version has a baroque, if not rococo, set of these. (defcustom smiley-regexp-alist '(("\\(;-?)\\)\\W" 1 "blink") ("\\(:-]\\)\\W" 1 "forced") ("\\(8-)\\)\\W" 1 "braindamaged") ("\\(:-|\\)\\W" 1 "indifferent") ("\\(:-[/\\]\\)\\W" 1 "wry") ("\\(:-(\\)\\W" 1 "sad") ("\\(X-)\\)\\W" 1 "dead") ("\\(:-{\\)\\W" 1 "frown") ("\\(>:-)\\)\\W" 1 "evil") ("\\(;-(\\)\\W" 1 "cry") ("\\(:-D\\)\\W" 1 "grin") ;; "smile" must be come after "evil" ("\\(\\^?:-?)\\)\\W" 1 "smile")) "*A list of regexps to map smilies to images. The elements are (REGEXP MATCH IMAGE), where MATCH is the submatch in regexp to replace with IMAGE. IMAGE is the name of an image file in `smiley-data-directory'." :type '(repeat (list regexp (integer :tag "Regexp match number") (string :tag "Image name"))) :set (lambda (symbol value) (set-default symbol value) (smiley-update-cache)) :initialize 'custom-initialize-default :group 'smiley) (defcustom gnus-smiley-file-types (let ((types (list "pbm"))) (when (gnus-image-type-available-p 'xpm) (push "xpm" types)) types) "*List of suffixes on smiley file names to try." :version "22.1" :type '(repeat string) :group 'smiley) (defvar smiley-cached-regexp-alist nil) (defun smiley-update-cache () (setq smiley-cached-regexp-alist nil) (dolist (elt (if (symbolp smiley-regexp-alist) (symbol-value smiley-regexp-alist) smiley-regexp-alist)) (let ((types gnus-smiley-file-types) file type) (while (and (not file) (setq type (pop types))) (unless (file-exists-p (setq file (expand-file-name (concat (nth 2 elt) "." type) smiley-data-directory))) (setq file nil))) (when type (let ((image (gnus-create-image file (intern type) nil :ascent 'center))) (when image (push (list (car elt) (cadr elt) image) smiley-cached-regexp-alist))))))) ;; Not implemented: ;; (defvar smiley-mouse-map ;; (let ((map (make-sparse-keymap))) ;; (define-key map [down-mouse-2] 'ignore) ; override widget ;; (define-key map [mouse-2] ;; 'smiley-mouse-toggle-buffer) ;; map)) ;;;###autoload (defun smiley-region (start end) "Replace in the region `smiley-regexp-alist' matches with corresponding images. A list of images is returned." (interactive "r") (when (gnus-graphic-display-p) (unless smiley-cached-regexp-alist (smiley-update-cache)) (save-excursion (let ((beg (or start (point-min))) group image images string) (dolist (entry smiley-cached-regexp-alist) (setq group (nth 1 entry) image (nth 2 entry)) (goto-char beg) (while (re-search-forward (car entry) end t) (setq string (match-string group)) (goto-char (match-end group)) (delete-region (match-beginning group) (match-end group)) (when image (push image images) (gnus-add-wash-type 'smiley) (gnus-add-image 'smiley image) (gnus-put-image image string 'smiley)))) images)))) ;;;###autoload (defun smiley-buffer (&optional buffer) "Run `smiley-region' at the buffer, specified in the argument or interactively. If there's no argument, do it at the current buffer" (interactive "bBuffer to run smiley-region: ") (save-excursion (if buffer (set-buffer (get-buffer buffer))) (smiley-region (point-min) (point-max)))) (defun smiley-toggle-buffer (&optional arg) "Toggle displaying smiley faces in article buffer. With arg, turn displaying on if and only if arg is positive." (interactive "P") (gnus-with-article-buffer (if (if (numberp arg) (> arg 0) (not (memq 'smiley gnus-article-wash-types))) (smiley-region (point-min) (point-max)) (gnus-delete-images 'smiley)))) (defun smiley-mouse-toggle-buffer (event) "Toggle displaying smiley faces. With arg, turn displaying on if and only if arg is positive." (interactive "e") (save-excursion (save-window-excursion (mouse-set-point event) (smiley-toggle-buffer)))) (provide 'smiley) ;; arch-tag: 5beb161b-4321-40af-8ac9-876afb8ee818 ;;; smiley.el ends here