aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJason Rumney2001-11-13 19:06:58 +0000
committerJason Rumney2001-11-13 19:06:58 +0000
commitb3700ae76d50437c1b970bdcdcd2d7488bfcb1cb (patch)
tree14fc831167cf78f16c46d867270b43f01f577bf6 /src
parent37606ed87b9e0f3bce0b07e920898773e1fb61af (diff)
downloademacs-b3700ae76d50437c1b970bdcdcd2d7488bfcb1cb.tar.gz
emacs-b3700ae76d50437c1b970bdcdcd2d7488bfcb1cb.zip
Doc fixes.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/w32fns.c15
2 files changed, 12 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 531ab037726..5693f4917a5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12001-11-13 Jason Rumney <jasonr@gnu.org>
2
3 * w32fns.c: Doc fix.
4
12001-11-13 Pavel Jan,Bm(Bk <Pavel@Janik.cz> 52001-11-13 Pavel Jan,Bm(Bk <Pavel@Janik.cz>
2 6
3 * xfaces.c (Fface_attributes_as_vector): Doc fix. 7 * xfaces.c (Fface_attributes_as_vector): Doc fix.
diff --git a/src/w32fns.c b/src/w32fns.c
index cbfff0fe775..a86990cf78d 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -7181,9 +7181,10 @@ w32_find_bdf_fonts_in_dir (Lisp_Object directory)
7181 7181
7182DEFUN ("w32-find-bdf-fonts", Fw32_find_bdf_fonts, Sw32_find_bdf_fonts, 7182DEFUN ("w32-find-bdf-fonts", Fw32_find_bdf_fonts, Sw32_find_bdf_fonts,
7183 1, 1, 0, 7183 1, 1, 0,
7184 doc: /* Return a list of BDF fonts in DIR, suitable for appending to 7184 doc: /* Return a list of BDF fonts in DIR.
7185w32-bdf-filename-alist. Fonts which do not contain an xlfd description 7185The list is suitable for appending to w32-bdf-filename-alist. Fonts
7186will not be included in the list. DIR may be a list of directories. */) 7186which do not contain an xlfd description will not be included in the
7187list. DIR may be a list of directories. */)
7187 (directory) 7188 (directory)
7188 Lisp_Object directory; 7189 Lisp_Object directory;
7189{ 7190{
@@ -14235,8 +14236,8 @@ or when you set the mouse color. */);
14235 Vx_cursor_fore_pixel = Qnil; 14236 Vx_cursor_fore_pixel = Qnil;
14236 14237
14237 DEFVAR_LISP ("x-max-tooltip-size", &Vx_max_tooltip_size, 14238 DEFVAR_LISP ("x-max-tooltip-size", &Vx_max_tooltip_size,
14238 doc: /* Maximum size for tooltips. Value is a pair (COLUMNS . ROWS). 14239 doc: /* Maximum size for tooltips.
14239Text larger than this is clipped. */); 14240Value is a pair (COLUMNS . ROWS). Text larger than this is clipped. */);
14240 Vx_max_tooltip_size = Fcons (make_number (80), make_number (40)); 14241 Vx_max_tooltip_size = Fcons (make_number (80), make_number (40));
14241 14242
14242 DEFVAR_LISP ("x-no-window-manager", &Vx_no_window_manager, 14243 DEFVAR_LISP ("x-no-window-manager", &Vx_no_window_manager,
@@ -14293,8 +14294,8 @@ only be necessary if the default setting causes problems. */);
14293 14294
14294 DEFVAR_LISP ("w32-charset-info-alist", 14295 DEFVAR_LISP ("w32-charset-info-alist",
14295 &Vw32_charset_info_alist, 14296 &Vw32_charset_info_alist,
14296 doc: /* Alist linking Emacs character sets to Windows fonts 14297 doc: /* Alist linking Emacs character sets to Windows fonts and codepages.
14297and codepages. Each entry should be of the form: 14298Each entry should be of the form:
14298 14299
14299 (CHARSET_NAME . (WINDOWS_CHARSET . CODEPAGE)) 14300 (CHARSET_NAME . (WINDOWS_CHARSET . CODEPAGE))
14300 14301