Mercurial > emacs
view lisp/format-spec.el @ 93808:2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Mon, 07 Apr 2008 01:58:55 +0000 |
parents | 107ccd98fa12 |
children | 1e3a407766b9 |
line wrap: on
line source
;;; format-spec.el --- functions for formatting arbitrary formatting strings ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008 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 3, 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: `%%%c'" 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