Mercurial > emacs
view lisp/format-spec.el @ 109770:30994c3466ad
Fix compilation of xmenu.c and unexcoff.c, clean up MSDOS source files.
unexcoff.c: Remove the parts used when "emacs" is not defined.
(report_error, report_error_1): Ditto.
(write_segment): Remove "#if 0" unused code.
(make_hdr): Remove code that was "#ifndef NO_REMAP" before
NO_REMAP was removed (in revno 100928).
(start_of_text): Remove unused function (was used only if NO_REMAP
was NOT defined).
msdos.c (IT_set_face): Fix format string to match argument
types.
(IT_write_glyphs, IT_note_mode_line_highlight)
(IT_set_frame_parameters): Remove unused variables.
(x_set_menu_bar_lines): Declare set_menu_bar_lines.
(IT_set_terminal_modes): Disambiguate expression in if clause.
(Fmsdos_remember_default_colors): Return Qnil.
(IT_set_frame_parameters): Add parens to disambiguate boolean
expression for logging the cursor type to termscript.
(keyboard_layout_list, keypad_translate_map)
(grey_key_translate_map): Add braces in inner initializers.
(dos_rawgetc): Add parens in condition for mouse-3 button-press.
(dos_rawgetc): Remove unused label.
(XMenuActivate): Add braces to remove ambiguous `else'.
(dos_ttraw): Always return a value.
(spawnve): Declare.
(run_msdos_command): Cast 3rd arg of spawnve to "char **".
dosfns.h (x_set_title): Declare.
w16select.c (Fw16_set_clipboard_data, Fw16_get_clipboard_data):
Remove unused variables.
dosfns.c (Fint86, Fdos_memget, Fdos_memput): Remove unused
variables.
(init_dosfns): Declare get_lim_data.
(system_process_attributes): Declare Fget_internal_run_time.
xmenu.c (xmenu_show) [!USE_X_TOOLKIT && !USE_GTK]: Fix argument
list to be consistent with menu.h.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Fri, 13 Aug 2010 14:09:51 +0300 |
parents | 1d1d5d9bd884 |
children | 8d09094063d0 376148b31b5e |
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, 2009, 2010 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 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: (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