Mercurial > emacs
view lisp/gnus/format-spec.el @ 73269:aeb79612dc36
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 145-148)
- Merge from emacs--devo--0
- Update from CVS
2006-10-04 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-sum.el (gnus-summary-make-menu-bar): Clarify
gnus-summary-limit-to-articles.
2006-10-04 Romain Francoise <romain@orebokech.com>
* lisp/gnus/gnus-util.el (gnus-alist-to-hashtable, gnus-hashtable-to-alist):
Moved here (and renamed) from gnus-registry.el.
* lisp/gnus/gnus-registry.el: Require gnus-util.
Use `gnus-alist-to-hashtable' and `gnus-hashtable-to-alist'.
2006-10-04 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/pop3.el (pop3-authentication-scheme): Clarify doc.
(pop3-movemail): Warn about pop3-leave-mail-on-server.
2006-10-04 Dave Love <fx@gnu.org>
* lisp/gnus/pop3.el (pop3-authentication-scheme): Add custom version.
2006-10-04 Jesper Harder <harder@ifa.au.dk>
* lisp/gnus/pop3.el (pop3-leave-mail-on-server): Don't quote nil in
doc string. Improve doc string.
2006-10-03 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-util.el (gnus-with-local-quit): New macro.
* lisp/gnus/gnus-demon.el (gnus-demon): Replace with-local-quit with it.
2006-10-06 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (Image Enhancements): Update for Emacs 22.
* man/gnus-faq.texi ([1.3]): Update.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-466
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sat, 07 Oct 2006 01:51:54 +0000 |
parents | 1077b8039c32 |
children | 183eba998a4d c5406394f567 |
line wrap: on
line source
;;; format-spec.el --- functions for formatting arbitrary formatting strings ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: tools ;; 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 2, 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; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ;; Boston, MA 02110-1301, USA. ;;; Commentary: ;;; Code: (eval-when-compile (require 'cl)) (defun format-spec (format specification) "Return a string based on FORMAT and SPECIFICATION. FORMAT is a string containing `format'-like specs like \"bash %u %k\", while SPECIFICATION is an alist mapping from format spec characters to values. Any text properties on a %-spec itself are propagated to the text that it generates." (with-temp-buffer (insert format) (goto-char (point-min)) (while (search-forward "%" nil t) (cond ;; Quoted percent sign. ((eq (char-after) ?%) (delete-char 1)) ;; Valid format spec. ((looking-at "\\([-0-9.]*\\)\\([a-zA-Z]\\)") (let* ((num (match-string 1)) (spec (string-to-char (match-string 2))) (val (cdr (assq spec specification)))) (unless val (error "Invalid format character: %s" spec)) ;; Pad result to desired length. (let ((text (format (concat "%" num "s") val))) ;; Insert first, to preserve text properties. (insert-and-inherit text) ;; Delete the specifier body. (delete-region (+ (match-beginning 0) (length text)) (+ (match-end 0) (length text))) ;; Delete the percent sign. (delete-region (1- (match-beginning 0)) (match-beginning 0))))) ;; Signal an error on bogus format strings. (t (error "Invalid format string")))) (buffer-string))) (defun format-spec-make (&rest pairs) "Return an alist suitable for use in `format-spec' based on PAIRS. PAIRS is a list where every other element is a character and a value, starting with a character." (let (alist) (while pairs (unless (cdr pairs) (error "Invalid list of pairs")) (push (cons (car pairs) (cadr pairs)) alist) (setq pairs (cddr pairs))) (nreverse alist))) (provide 'format-spec) ;;; arch-tag: c22d49cf-d167-445d-b7f1-2504d4173f53 ;;; format-spec.el ends here