annotate lisp/format-spec.el @ 110422:93e093c035a0

Merge changes made in Gnus trunk. nnimap.el (nnimap-request-group): Use the stored info for the dont-check case. nnimap.el: Use deffoo instead of defun for interface functions. gnus-int.el (gnus-request-group): Take an optional `info' parameter. nnimap.el: Allow nnimap-request-group to do a complete marks sync on `M-g'. nnimap.el: Get credentials for numerical equivalents of the port numbers. gnus-html.el (gnus-html-wash-tags): Add support for i, b and u HTML tags. nnimap.el (nnimap-update-info): Extend the info so that we can set the marks. nnimap.el (nnimap-open-connection): Fix typo -- should be 'shell, not 'stream. nnimap.el: Allow PREAUTH nnimap connections to log in without credentials. nnimap.el (nnimap-update-info): Fix off-by-one error when concatenating ranges when doing a partial update. gnus-html.el (gnus-html-schedule-image-fetching): Use `url' rather than curl to retrieve images. nnimap.el (nnimap-update-info): When doing partial marks update, get the range update right. nnimap.el (nnimap-wait-for-response): Be a bit more lax in finding the end of the command we're looking for. nnimap.el: Allow sending \n instead of \r\n on 'shell streams. gnus-html.el (gnus-html-schedule-image-fetching): Fetch all images in parallel.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Sat, 18 Sep 2010 23:36:29 +0000
parents 8d09094063d0
children 417b1e4d63cd
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
86923
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
1 ;;; format-spec.el --- functions for formatting arbitrary formatting strings
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
2
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
3 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
106815
1d1d5d9bd884 Add 2010 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 100908
diff changeset
4 ;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
86923
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
5
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
6 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
7 ;; Keywords: tools
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
8
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
9 ;; This file is part of GNU Emacs.
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
10
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
11 ;; GNU Emacs is free software: you can redistribute it and/or modify
86923
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
12 ;; it under the terms of the GNU General Public License as published by
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
13 ;; the Free Software Foundation, either version 3 of the License, or
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
14 ;; (at your option) any later version.
86923
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
15
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
16 ;; GNU Emacs is distributed in the hope that it will be useful,
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
19 ;; GNU General Public License for more details.
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
20
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
21 ;; You should have received a copy of the GNU General Public License
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
22 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
86923
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
23
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
24 ;;; Commentary:
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
25
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
26 ;;; Code:
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
27
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
28 (eval-when-compile (require 'cl))
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
29
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
30 (defun format-spec (format specification)
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
31 "Return a string based on FORMAT and SPECIFICATION.
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
32 FORMAT is a string containing `format'-like specs like \"bash %u %k\",
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
33 while SPECIFICATION is an alist mapping from format spec characters
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
34 to values. Any text properties on a %-spec itself are propagated to
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
35 the text that it generates."
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
36 (with-temp-buffer
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
37 (insert format)
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
38 (goto-char (point-min))
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
39 (while (search-forward "%" nil t)
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
40 (cond
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
41 ;; Quoted percent sign.
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
42 ((eq (char-after) ?%)
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
43 (delete-char 1))
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
44 ;; Valid format spec.
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
45 ((looking-at "\\([-0-9.]*\\)\\([a-zA-Z]\\)")
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
46 (let* ((num (match-string 1))
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
47 (spec (string-to-char (match-string 2)))
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
48 (val (cdr (assq spec specification))))
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
49 (unless val
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
50 (error "Invalid format character: `%%%c'" spec))
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
51 ;; Pad result to desired length.
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
52 (let ((text (format (concat "%" num "s") val)))
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
53 ;; Insert first, to preserve text properties.
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
54 (insert-and-inherit text)
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
55 ;; Delete the specifier body.
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
56 (delete-region (+ (match-beginning 0) (length text))
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
57 (+ (match-end 0) (length text)))
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
58 ;; Delete the percent sign.
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
59 (delete-region (1- (match-beginning 0)) (match-beginning 0)))))
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
60 ;; Signal an error on bogus format strings.
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
61 (t
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
62 (error "Invalid format string"))))
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
63 (buffer-string)))
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
64
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
65 (defun format-spec-make (&rest pairs)
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
66 "Return an alist suitable for use in `format-spec' based on PAIRS.
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
67 PAIRS is a list where every other element is a character and a value,
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
68 starting with a character."
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
69 (let (alist)
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
70 (while pairs
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
71 (unless (cdr pairs)
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
72 (error "Invalid list of pairs"))
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
73 (push (cons (car pairs) (cadr pairs)) alist)
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
74 (setq pairs (cddr pairs)))
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
75 (nreverse alist)))
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
76
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
77 (provide 'format-spec)
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
78
e69671140040 Move here from gnus/.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
79 ;;; format-spec.el ends here