view lisp/format-spec.el @ 109653:9cfca8c9fb07

Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings. * configure.in: Check for util.h. * src/bidi.c (bidi_dump_cached_states): Fix fprintf warning. * src/emacs.c: Include src/nsterm.h if HAVE_NS. * src/image.c (xpm_scan, xpm_make_color_table_v) (xpm_put_color_table_v, xpm_get_color_table_v) (xpm_make_color_table_h, xpm_put_color_table_h) (xpm_get_color_table_h, xpm_str_to_color_key, xpm_load_image) (xpm_load): Convert to ANSI C prototypes. * src/lisp.h (fmod_float): Declare. * src/menu.h (x_set_menu_bar_line): Declare. (free_menubar_widget_value_tree et.al): Add HAVE_NS for these functions. * src/window.c: Include menu.h. * src/nsfns.m (have_menus_p, ns_display_info_for_name) (x_set_cursor_type, ns_appkit_version_str) (ns_appkit_version_int, ns_do_applescript) (x_set_scroll_bar_default_width, x_sync, compute_tip_xy) (syms_of_nsfns): Convert to ANSI C prototypes. * src/nsfont.m (ns_fallback_entity, syms_of_nsfont): Convert to ANSI C prototypes. * src/nsimage.m (ns_load_image): Move NSTRACE after declarations. * src/nsmenu.m (popup_activated, name_is_separator) (syms_of_nsmenu): Convert to ANSI C prototypes. (runMenuAt): Prototypes and move declarations before code. * src/nsterm.h : Include sysselect.h. (x_sync, x_get_focus_frame, x_set_mouse_position) (x_set_mouse_pixel_position, x_make_frame_visible) (x_make_frame_invisible, x_iconify_frame, x_char_width, x_char_height) (x_pixel_width, x_pixel_height, x_set_frame_alpha, x_set_tool_bar_lines) (x_activate_menubar, free_frame_menubar, ns_init_paths, ns_select) (syms_of_nsterm, syms_of_nsfns, syms_of_nsmenu, syms_of_nsselect): Declare * src/process.c: Check HAVE_UTIL_H. Include src/nsterm.h if HAVE_NS. * src/nsterm.m (ns_init_paths, ns_alloc_autorelease_pool) (ns_ring_bell, ns_defined_color, hide_hourglass) (x_display_pixel_height, x_display_pixel_width, syms_of_nsterm): Convert to ANSI C prototypes. (x_set_window_size, ns_draw_fringe_bitmap, judge): Move declarations before code. * src/sysdep.c: Check HAVE_TERM_H * src/term.c: Check HAVE_SYS_IOCTL_H. * src/unexmacosx.c (print_region_list, print_regions) (build_region_list, find_emacs_zone_regions) (unexec_regions_merge, read_load_commands, dump_it) (unexec_init_emacs_zone): Convert to ANSI C prototypes. * src/xfaces.c (x_create_gc, x_free_gc): Convert to ANSI C prototypes.

+
��;;; 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 <[e-mail]>
+
��;; 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