Mercurial > emacs
annotate README @ 108024:4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
* xsettings.c: Qmonospace_font_name, Qtool_bar_style and
current_tool_bar_style are new.
(store_config_changed_event): Rename from store_font_changed_event.
(XSETTINGS_TOOL_BAR_STYLE): New define.
(SEEN_FONT, SEEN_TB_STYLE): New enum values.
(struct xsettings): Add font and tb_style, set xft stuff inside #ifdef
HAVE_XFT.
(something_changedCB): store_font_changed_event is now
store_config_changed_event
(parse_settings): Rename from parse_xft_settings. Read
non-xft xsettings outside #ifdef HAVE_XFT.
(read_settings): Renamed from read_xft_settings.
(apply_xft_settings): Take current settings as parameter. Do not
call read_(xft)_settings.
(read_and_apply_settings): New function.
(xft_settings_event): Do non-xft stuff out of HAVE_XFT. Call
read_and_apply_settings if there are settings to be read.
(init_xsettings): Renamed from init_xfd_settings.
Call read_and_apply_settings unconditionally.
(xsettings_initialize): Call init_xsettings.
(Ftool_bar_get_system_style): New function.
(syms_of_xsettings): Define Qmonospace_font_name and
Qtool_bar_style. Initialize current_tool_bar_style to nil.
defsubr Stool_bar_get_system_style. Fprovide on
dynamic-setting.
* xsettings.h (Ftool_bar_get_system_style): Declare.
* xdisp.c: Vtool_bar_style, tool_bar_max_label_size,
Qtext, Qboth, Qboth_horiz are new.
(syms_of_xdisp): Intern Qtext, Qboth, Qboth_horiz, DEFVAR
Vtool_bar_style, tool_bar_max_label_size.
* lisp.h: Extern declare Qtext, Qboth, Qboth_horiz.
* keyboard.c: QClabel is new.
(parse_tool_bar_item): Take out QClabel from tool bar items.
Try to construct a label if ther is no QClabel.
(syms_of_keyboard): Intern :label as QClabel.
* dispextern.h (tool_bar_item_idx): TOOL_BAR_ITEM_LABEL is new.
(Vtool_bar_style, tool_bar_max_label_size, DEFAULT_TOOL_BAR_LABEL_SIZE):
New.
* Makefile.in (SOME_MACHINE_LISP): font-setting.el renamed to
dynamic-setting.el.
* gtkutil.c (xg_tool_bar_menu_proxy): Handle label in tool bar item.
(xg_make_tool_item, xg_show_toolbar_item): New function.
(update_frame_tool_bar): Take label from TOOL_BAR_ITEM_LABEL.
Call xg_make_tool_item to make a tool bar item.
Call xg_show_toolbar_item. Use wtoolbar instead of x->toolbar_widget.
* xterm.c (x_draw_image_relief): Take Vtool_bar_button_margin
into account for toolbars.
* vc-dir.el (vc-dir-tool-bar-map): Add :label on some tool bar items.
* tool-bar.el (tool-bar-setup): Add :label on some tool bar items.
* loadup.el: Load dynamic-setting.el if feature dynamic-setting
is present.
* info.el (info-tool-bar-map): Add labels.
* cus-start.el (all): Add tool-bar-style and tool-bar-max-label-size.
* cus-edit.el (custom-commands): Add labels for tool bar.
(custom-buffer-create-internal, Custom-mode): Adjust for
labels in custom-commands.
* dynamic-setting.el: Renamed from font-setting.el.
author | Jan D. <jan.h.d@swipnet.se> |
---|---|
date | Tue, 20 Apr 2010 20:52:07 +0200 |
parents | b4d27afff1bf |
children | b8fde5ef9e14 |
rev | line source |
---|---|
106802
b92c3979701c
Replace emacs-pretest-bug with bug-gnu-emacs mailing list.
Glenn Morris <rgm@gnu.org>
parents:
106687
diff
changeset
|
1 Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, |
b92c3979701c
Replace emacs-pretest-bug with bug-gnu-emacs mailing list.
Glenn Morris <rgm@gnu.org>
parents:
106687
diff
changeset
|
2 2010 Free Software Foundation, Inc. |
75769
92a0e87ff562
Switch to standard GPL text for license.
Glenn Morris <rgm@gnu.org>
parents:
75587
diff
changeset
|
3 See the end of the file for license conditions. |
75587
68cfc1db0d26
Add copyright and permissions notices.
Glenn Morris <rgm@gnu.org>
parents:
75382
diff
changeset
|
4 |
68cfc1db0d26
Add copyright and permissions notices.
Glenn Morris <rgm@gnu.org>
parents:
75382
diff
changeset
|
5 |
107367
b4d27afff1bf
Bump version to 24.0.50.
Chong Yidong <cyd@stupidchicken.com>
parents:
107243
diff
changeset
|
6 This directory tree holds version 24.0.50 of GNU Emacs, the extensible, |
25856 | 7 customizable, self-documenting real-time display editor. |
8 | |
74308
c3e14b761fe6
Clarify bug reporting. Delete VMS section.
Richard M. Stallman <rms@gnu.org>
parents:
74067
diff
changeset
|
9 The file INSTALL in this directory says how to build and install GNU |
c3e14b761fe6
Clarify bug reporting. Delete VMS section.
Richard M. Stallman <rms@gnu.org>
parents:
74067
diff
changeset
|
10 Emacs on various systems, once you have unpacked or checked out the |
c3e14b761fe6
Clarify bug reporting. Delete VMS section.
Richard M. Stallman <rms@gnu.org>
parents:
74067
diff
changeset
|
11 entire Emacs file tree. |
25856 | 12 |
36122
e6572f8d3aa8
Document that Texinfo 4.0 or later is required for producing the manual.
Eli Zaretskii <eliz@gnu.org>
parents:
36104
diff
changeset
|
13 See the file etc/NEWS for information on new features and other |
36792
f4f0878e1455
Minor changes from Kim Storm <storm@filanet.dk>.
Eli Zaretskii <eliz@gnu.org>
parents:
36541
diff
changeset
|
14 user-visible changes in recent versions of Emacs. |
25856 | 15 |
16 The file etc/PROBLEMS contains information on many common problems that | |
17 occur in building, installing and running Emacs. | |
18 | |
74308
c3e14b761fe6
Clarify bug reporting. Delete VMS section.
Richard M. Stallman <rms@gnu.org>
parents:
74067
diff
changeset
|
19 You may encounter bugs in this release. If you do, please report |
c3e14b761fe6
Clarify bug reporting. Delete VMS section.
Richard M. Stallman <rms@gnu.org>
parents:
74067
diff
changeset
|
20 them; your bug reports are valuable contributions to the FSF, since |
c3e14b761fe6
Clarify bug reporting. Delete VMS section.
Richard M. Stallman <rms@gnu.org>
parents:
74067
diff
changeset
|
21 they allow us to notice and fix problems on machines we don't have, or |
106802
b92c3979701c
Replace emacs-pretest-bug with bug-gnu-emacs mailing list.
Glenn Morris <rgm@gnu.org>
parents:
106687
diff
changeset
|
22 in code we don't use often. Please send bug reports to the mailing |
b92c3979701c
Replace emacs-pretest-bug with bug-gnu-emacs mailing list.
Glenn Morris <rgm@gnu.org>
parents:
106687
diff
changeset
|
23 list bug-gnu-emacs@gnu.org. If possible, use M-x report-emacs-bug. |
74308
c3e14b761fe6
Clarify bug reporting. Delete VMS section.
Richard M. Stallman <rms@gnu.org>
parents:
74067
diff
changeset
|
24 |
c3e14b761fe6
Clarify bug reporting. Delete VMS section.
Richard M. Stallman <rms@gnu.org>
parents:
74067
diff
changeset
|
25 See the "Bugs" section of the Emacs manual for more information on how |
c3e14b761fe6
Clarify bug reporting. Delete VMS section.
Richard M. Stallman <rms@gnu.org>
parents:
74067
diff
changeset
|
26 to report bugs. (The file `BUGS' in this directory explains how you |
c3e14b761fe6
Clarify bug reporting. Delete VMS section.
Richard M. Stallman <rms@gnu.org>
parents:
74067
diff
changeset
|
27 can find and read that section using the Info files that come with |
c3e14b761fe6
Clarify bug reporting. Delete VMS section.
Richard M. Stallman <rms@gnu.org>
parents:
74067
diff
changeset
|
28 Emacs.) See `etc/MAILINGLISTS' for more information on mailing lists |
c3e14b761fe6
Clarify bug reporting. Delete VMS section.
Richard M. Stallman <rms@gnu.org>
parents:
74067
diff
changeset
|
29 relating to GNU packages. |
25856 | 30 |
36792
f4f0878e1455
Minor changes from Kim Storm <storm@filanet.dk>.
Eli Zaretskii <eliz@gnu.org>
parents:
36541
diff
changeset
|
31 The `etc' subdirectory contains several other files, named in capital |
f4f0878e1455
Minor changes from Kim Storm <storm@filanet.dk>.
Eli Zaretskii <eliz@gnu.org>
parents:
36541
diff
changeset
|
32 letters, which you might consider looking at when installing GNU |
f4f0878e1455
Minor changes from Kim Storm <storm@filanet.dk>.
Eli Zaretskii <eliz@gnu.org>
parents:
36541
diff
changeset
|
33 Emacs. |
25856 | 34 |
35 The file `configure' is a shell script to acclimate Emacs to the | |
36 oddities of your processor and operating system. It creates the file | |
37 `Makefile' (a script for the `make' program), which automates the | |
38 process of building and installing Emacs. See INSTALL for more | |
39 detailed information. | |
40 | |
41 The file `configure.in' is the input used by the autoconf program to | |
36268 | 42 construct the `configure' script. Since Emacs has some configuration |
43 requirements that autoconf can't meet directly, and for historical | |
44 reasons, `configure.in' uses an unholy marriage of custom-baked | |
45 configuration code and autoconf macros. If you want to rebuild | |
46 `configure' from `configure.in', you will need to install a recent | |
47 version of autoconf and GNU m4. | |
36122
e6572f8d3aa8
Document that Texinfo 4.0 or later is required for producing the manual.
Eli Zaretskii <eliz@gnu.org>
parents:
36104
diff
changeset
|
48 |
25856 | 49 The file `Makefile.in' is a template used by `configure' to create |
50 `Makefile'. | |
51 | |
52 The file `make-dist' is a shell script to build a distribution tar | |
53 file from the current Emacs tree, containing only those files | |
54 appropriate for distribution. If you make extensive changes to Emacs, | |
55 this script will help you distribute your version to others. | |
56 | |
57 There are several subdirectories: | |
58 | |
42214
515351759218
Add info about the `leim' directory
Eli Zaretskii <eliz@gnu.org>
parents:
41438
diff
changeset
|
59 `src' holds the C code for Emacs (the Emacs Lisp interpreter and |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47784
diff
changeset
|
60 its primitives, the redisplay code, and some basic editing |
42214
515351759218
Add info about the `leim' directory
Eli Zaretskii <eliz@gnu.org>
parents:
41438
diff
changeset
|
61 functions). |
515351759218
Add info about the `leim' directory
Eli Zaretskii <eliz@gnu.org>
parents:
41438
diff
changeset
|
62 `lisp' holds the Emacs Lisp code for Emacs (most everything else). |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47784
diff
changeset
|
63 `leim' holds the library of Emacs input methods, Lisp code and |
42214
515351759218
Add info about the `leim' directory
Eli Zaretskii <eliz@gnu.org>
parents:
41438
diff
changeset
|
64 auxiliary data files required to type international characters |
515351759218
Add info about the `leim' directory
Eli Zaretskii <eliz@gnu.org>
parents:
41438
diff
changeset
|
65 which can't be directly produced by your keyboard. |
515351759218
Add info about the `leim' directory
Eli Zaretskii <eliz@gnu.org>
parents:
41438
diff
changeset
|
66 `lib-src' holds the source code for some utility programs for use by or |
515351759218
Add info about the `leim' directory
Eli Zaretskii <eliz@gnu.org>
parents:
41438
diff
changeset
|
67 with Emacs, like movemail and etags. |
515351759218
Add info about the `leim' directory
Eli Zaretskii <eliz@gnu.org>
parents:
41438
diff
changeset
|
68 `etc' holds miscellaneous architecture-independent data files |
515351759218
Add info about the `leim' directory
Eli Zaretskii <eliz@gnu.org>
parents:
41438
diff
changeset
|
69 Emacs uses, like the tutorial text and the Zippy the Pinhead |
515351759218
Add info about the `leim' directory
Eli Zaretskii <eliz@gnu.org>
parents:
41438
diff
changeset
|
70 quote database. The contents of the `lisp', `leim', `info', |
515351759218
Add info about the `leim' directory
Eli Zaretskii <eliz@gnu.org>
parents:
41438
diff
changeset
|
71 `man', `lispref', and `lispintro' subdirectories are |
515351759218
Add info about the `leim' directory
Eli Zaretskii <eliz@gnu.org>
parents:
41438
diff
changeset
|
72 architecture-independent too. |
515351759218
Add info about the `leim' directory
Eli Zaretskii <eliz@gnu.org>
parents:
41438
diff
changeset
|
73 `info' holds the Info documentation tree for Emacs. |
84412
acde5b207e40
Add doc/ to documentation directories.
Juri Linkov <juri@jurta.org>
parents:
83746
diff
changeset
|
74 `doc/emacs' holds the source code for the Emacs Manual. If you modify the |
42214
515351759218
Add info about the `leim' directory
Eli Zaretskii <eliz@gnu.org>
parents:
41438
diff
changeset
|
75 manual sources, you will need the `makeinfo' program to produce |
515351759218
Add info about the `leim' directory
Eli Zaretskii <eliz@gnu.org>
parents:
41438
diff
changeset
|
76 an updated manual. `makeinfo' is part of the GNU Texinfo |
78651 | 77 package; you need version 4.6 or later of Texinfo. |
84412
acde5b207e40
Add doc/ to documentation directories.
Juri Linkov <juri@jurta.org>
parents:
83746
diff
changeset
|
78 `doc/lispref' holds the source code for the Emacs Lisp reference manual. |
acde5b207e40
Add doc/ to documentation directories.
Juri Linkov <juri@jurta.org>
parents:
83746
diff
changeset
|
79 `doc/lispintro' holds the source code for the Introduction to Programming |
acde5b207e40
Add doc/ to documentation directories.
Juri Linkov <juri@jurta.org>
parents:
83746
diff
changeset
|
80 in Emacs Lisp manual. |
42214
515351759218
Add info about the `leim' directory
Eli Zaretskii <eliz@gnu.org>
parents:
41438
diff
changeset
|
81 `msdos' holds configuration files for compiling Emacs under MSDOG. |
98459 | 82 `nextstep' holds instructions and some other files for compiling the |
98512 | 83 Nextstep port of Emacs, for GNUstep and Mac OS X Cocoa. |
42214
515351759218
Add info about the `leim' directory
Eli Zaretskii <eliz@gnu.org>
parents:
41438
diff
changeset
|
84 `nt' holds various command files and documentation files that pertain |
515351759218
Add info about the `leim' directory
Eli Zaretskii <eliz@gnu.org>
parents:
41438
diff
changeset
|
85 to building and running Emacs on Windows 9X/ME/NT/2000/XP. |
92341 | 86 `test' holds tests for various aspects of Emacs's functionality. |
36122
e6572f8d3aa8
Document that Texinfo 4.0 or later is required for producing the manual.
Eli Zaretskii <eliz@gnu.org>
parents:
36104
diff
changeset
|
87 |
e6572f8d3aa8
Document that Texinfo 4.0 or later is required for producing the manual.
Eli Zaretskii <eliz@gnu.org>
parents:
36104
diff
changeset
|
88 Building Emacs on non-Posix platforms requires to install tools |
e6572f8d3aa8
Document that Texinfo 4.0 or later is required for producing the manual.
Eli Zaretskii <eliz@gnu.org>
parents:
36104
diff
changeset
|
89 that aren't part of the standard distribution of the OS. The |
e6572f8d3aa8
Document that Texinfo 4.0 or later is required for producing the manual.
Eli Zaretskii <eliz@gnu.org>
parents:
36104
diff
changeset
|
90 platform-specific README files and installation instructions should |
e6572f8d3aa8
Document that Texinfo 4.0 or later is required for producing the manual.
Eli Zaretskii <eliz@gnu.org>
parents:
36104
diff
changeset
|
91 list the required tools. |
75769
92a0e87ff562
Switch to standard GPL text for license.
Glenn Morris <rgm@gnu.org>
parents:
75587
diff
changeset
|
92 |
92a0e87ff562
Switch to standard GPL text for license.
Glenn Morris <rgm@gnu.org>
parents:
75587
diff
changeset
|
93 |
92a0e87ff562
Switch to standard GPL text for license.
Glenn Morris <rgm@gnu.org>
parents:
75587
diff
changeset
|
94 This file is part of GNU Emacs. |
92a0e87ff562
Switch to standard GPL text for license.
Glenn Morris <rgm@gnu.org>
parents:
75587
diff
changeset
|
95 |
94719
1a762a842f80
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
92795
diff
changeset
|
96 GNU Emacs is free software: you can redistribute it and/or modify |
75769
92a0e87ff562
Switch to standard GPL text for license.
Glenn Morris <rgm@gnu.org>
parents:
75587
diff
changeset
|
97 it under the terms of the GNU General Public License as published by |
94719
1a762a842f80
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
92795
diff
changeset
|
98 the Free Software Foundation, either version 3 of the License, or |
1a762a842f80
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
92795
diff
changeset
|
99 (at your option) any later version. |
75769
92a0e87ff562
Switch to standard GPL text for license.
Glenn Morris <rgm@gnu.org>
parents:
75587
diff
changeset
|
100 |
92a0e87ff562
Switch to standard GPL text for license.
Glenn Morris <rgm@gnu.org>
parents:
75587
diff
changeset
|
101 GNU Emacs is distributed in the hope that it will be useful, |
92a0e87ff562
Switch to standard GPL text for license.
Glenn Morris <rgm@gnu.org>
parents:
75587
diff
changeset
|
102 but WITHOUT ANY WARRANTY; without even the implied warranty of |
92a0e87ff562
Switch to standard GPL text for license.
Glenn Morris <rgm@gnu.org>
parents:
75587
diff
changeset
|
103 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
92a0e87ff562
Switch to standard GPL text for license.
Glenn Morris <rgm@gnu.org>
parents:
75587
diff
changeset
|
104 GNU General Public License for more details. |
92a0e87ff562
Switch to standard GPL text for license.
Glenn Morris <rgm@gnu.org>
parents:
75587
diff
changeset
|
105 |
92a0e87ff562
Switch to standard GPL text for license.
Glenn Morris <rgm@gnu.org>
parents:
75587
diff
changeset
|
106 You should have received a copy of the GNU General Public License |
94719
1a762a842f80
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
92795
diff
changeset
|
107 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |