Mercurial > emacs
annotate lisp/gnus/format-spec.el @ 83619:5da6a46ddbd6
* s/darwin.h (SYSTEM_PURESIZE_EXTRA): Define here.
* termhooks.h (union display_info): Add mac_display_info.
* term.c (init_tty): Only use terminal->kboard when MULTI_KBOARD
is defined.
* macterm.h (struct mac_display_info): Add terminal.
* w32term.c (w32_initialize): Make static.
* macterm.c (XTset_terminal_modes): Add a terminal parameter.
(XTreset_terminal_modes): Likewise.
(x_clear_frame): Add a frame parameter.
(note_mouse_movement): Get rif from the frame.
(mac_term_init): Initialize the terminal.
(mac_initialize): Make static and move terminal initialization ...
(mac_create_terminal): ... in this new function.
* macmenu.c: Reorder includes.
(Fx_popup_menu): Use terminal specific mouse_position_hook.
* macfns.c (x_set_mouse_color): Get rif from the frame.
(x_set_tool_bar_lines): Don't use updating_frame.
(mac_window): Add 2 new parameters for consistency with other
systems.
(Fx_create_frame): Fix doc string. Rename the parameter.
(Fx_create_frame): Set the frame parameters following what is done
in X11 and w32.
(Fx_open_connection): Remove window-system check.
(start_hourglass): Likewise.
(x_create_tip_frame): Get the keyboard from the terminal.
* w32fns.c (Fx_create_frame): Use kboard from the terminal.
* term/mac-win.el: Provide mac-win.
(mac-initialized): New variable.
(mac-initialize-window-system): New function. Move global setup
here.
(handle-args-function-alist, frame-creation-function-alist):
(window-system-initialization-alist): Add mac entries.
* loadup.el: Load mac-win on a Mac.
author | Dan Nicolaescu <dann@ics.uci.edu> |
---|---|
date | Sat, 19 May 2007 19:08:02 +0000 |
parents | e3694f1cb928 |
children | 24202b793a08 95d0cdf160ea |
rev | line source |
---|---|
31717 | 1 ;;; format-spec.el --- functions for formatting arbitrary formatting strings |
64754
fafd692d1e40
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64085
diff
changeset
|
2 |
74547 | 3 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, |
75347 | 4 ;; 2005, 2006, 2007 Free Software Foundation, Inc. |
31717 | 5 |
6 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> | |
7 ;; Keywords: tools | |
8 | |
9 ;; This file is part of GNU Emacs. | |
10 | |
11 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
12 ;; it under the terms of the GNU General Public License as published by | |
13 ;; the Free Software Foundation; either version 2, or (at your option) | |
14 ;; any later version. | |
15 | |
16 ;; GNU Emacs is distributed in the hope that it will be useful, | |
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
19 ;; GNU General Public License for more details. | |
20 | |
21 ;; You should have received a copy of the GNU General Public License | |
22 ;; along with GNU Emacs; see the file COPYING. If not, write to the | |
64085 | 23 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
24 ;; Boston, MA 02110-1301, USA. | |
31717 | 25 |
26 ;;; Commentary: | |
27 | |
28 ;;; Code: | |
29 | |
30 (eval-when-compile (require 'cl)) | |
31 | |
32 (defun format-spec (format specification) | |
33 "Return a string based on FORMAT and SPECIFICATION. | |
34 FORMAT is a string containing `format'-like specs like \"bash %u %k\", | |
35 while SPECIFICATION is an alist mapping from format spec characters | |
65944
b993ed7387e0
(format-spec): Propagate text properties of % spec.
Richard M. Stallman <rms@gnu.org>
parents:
64754
diff
changeset
|
36 to values. Any text properties on a %-spec itself are propagated to |
b993ed7387e0
(format-spec): Propagate text properties of % spec.
Richard M. Stallman <rms@gnu.org>
parents:
64754
diff
changeset
|
37 the text that it generates." |
31717 | 38 (with-temp-buffer |
39 (insert format) | |
40 (goto-char (point-min)) | |
41 (while (search-forward "%" nil t) | |
42 (cond | |
43 ;; Quoted percent sign. | |
44 ((eq (char-after) ?%) | |
45 (delete-char 1)) | |
46 ;; Valid format spec. | |
47 ((looking-at "\\([-0-9.]*\\)\\([a-zA-Z]\\)") | |
48 (let* ((num (match-string 1)) | |
49 (spec (string-to-char (match-string 2))) | |
50 (val (cdr (assq spec specification)))) | |
51 (unless val | |
52 (error "Invalid format character: %s" spec)) | |
65944
b993ed7387e0
(format-spec): Propagate text properties of % spec.
Richard M. Stallman <rms@gnu.org>
parents:
64754
diff
changeset
|
53 ;; Pad result to desired length. |
b993ed7387e0
(format-spec): Propagate text properties of % spec.
Richard M. Stallman <rms@gnu.org>
parents:
64754
diff
changeset
|
54 (let ((text (format (concat "%" num "s") val))) |
b993ed7387e0
(format-spec): Propagate text properties of % spec.
Richard M. Stallman <rms@gnu.org>
parents:
64754
diff
changeset
|
55 ;; Insert first, to preserve text properties. |
b993ed7387e0
(format-spec): Propagate text properties of % spec.
Richard M. Stallman <rms@gnu.org>
parents:
64754
diff
changeset
|
56 (insert-and-inherit text) |
b993ed7387e0
(format-spec): Propagate text properties of % spec.
Richard M. Stallman <rms@gnu.org>
parents:
64754
diff
changeset
|
57 ;; Delete the specifier body. |
b993ed7387e0
(format-spec): Propagate text properties of % spec.
Richard M. Stallman <rms@gnu.org>
parents:
64754
diff
changeset
|
58 (delete-region (+ (match-beginning 0) (length text)) |
b993ed7387e0
(format-spec): Propagate text properties of % spec.
Richard M. Stallman <rms@gnu.org>
parents:
64754
diff
changeset
|
59 (+ (match-end 0) (length text))) |
b993ed7387e0
(format-spec): Propagate text properties of % spec.
Richard M. Stallman <rms@gnu.org>
parents:
64754
diff
changeset
|
60 ;; Delete the percent sign. |
b993ed7387e0
(format-spec): Propagate text properties of % spec.
Richard M. Stallman <rms@gnu.org>
parents:
64754
diff
changeset
|
61 (delete-region (1- (match-beginning 0)) (match-beginning 0))))) |
31717 | 62 ;; Signal an error on bogus format strings. |
63 (t | |
64 (error "Invalid format string")))) | |
65 (buffer-string))) | |
66 | |
67 (defun format-spec-make (&rest pairs) | |
68 "Return an alist suitable for use in `format-spec' based on PAIRS. | |
69 PAIRS is a list where every other element is a character and a value, | |
70 starting with a character." | |
71 (let (alist) | |
72 (while pairs | |
73 (unless (cdr pairs) | |
74 (error "Invalid list of pairs")) | |
75 (push (cons (car pairs) (cadr pairs)) alist) | |
76 (setq pairs (cddr pairs))) | |
77 (nreverse alist))) | |
78 | |
79 (provide 'format-spec) | |
80 | |
52401 | 81 ;;; arch-tag: c22d49cf-d167-445d-b7f1-2504d4173f53 |
31717 | 82 ;;; format-spec.el ends here |