aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2007-06-01 11:00:57 +0000
committerJuanma Barranquero2007-06-01 11:00:57 +0000
commit4797b6d98ab74536b6651aad7cbbbe8ef78be600 (patch)
tree2cb7ea2354673f97adcdccea5129335f2cc42500 /src
parent773933d371315e101ad9d9ff5388df52bc3efeb3 (diff)
downloademacs-4797b6d98ab74536b6651aad7cbbbe8ef78be600.tar.gz
emacs-4797b6d98ab74536b6651aad7cbbbe8ef78be600.zip
(Fshrink_window): Reflow docstring.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog22
-rw-r--r--src/window.c4
2 files changed, 15 insertions, 11 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index a267461ad64..aee80035f9d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12007-06-01 Juanma Barranquero <lekktu@gmail.com>
2
3 * window.c (Fshrink_window): Reflow docstring.
4
12007-06-01 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> 52007-06-01 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
2 6
3 * xfns.c (x_set_name_internal): Save encoded name before 7 * xfns.c (x_set_name_internal): Save encoded name before
@@ -30,14 +34,14 @@
302007-05-26 Dan Nicolaescu <dann@ics.uci.edu> 342007-05-26 Dan Nicolaescu <dann@ics.uci.edu>
31 35
32 * xfaces.c (syms_of_xfaces): Delete stray semicolon. 36 * xfaces.c (syms_of_xfaces): Delete stray semicolon.
33 * xdisp.c (next_element_from_buffer): 37 * xdisp.c (next_element_from_buffer):
34 * window.c (delete_window): 38 * window.c (delete_window):
35 * term.c (term_mouse_highlight): 39 * term.c (term_mouse_highlight):
36 * msdos.c (getdefdir): 40 * msdos.c (getdefdir):
37 * macterm.c (mac_create_bitmap_from_bitmap_data) 41 * macterm.c (mac_create_bitmap_from_bitmap_data)
38 (init_font_name_table): 42 (init_font_name_table):
39 * fns.c (Fsxhash): 43 * fns.c (Fsxhash):
40 * data.c (Fmake_local_variable): 44 * data.c (Fmake_local_variable):
41 * ccl.c (ccl_driver): Likewise. 45 * ccl.c (ccl_driver): Likewise.
42 46
432007-05-24 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> 472007-05-24 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
@@ -49,7 +53,7 @@
49 53
50 * image.c (uncache_image): Fix typo. 54 * image.c (uncache_image): Fix typo.
51 55
522007-05-23 Johannes Weiner <hannes@saeurebad.de> (tiny change) 562007-05-23 Johannes Weiner <hannes@saeurebad.de> (tiny change)
53 57
54 * keyboard.c (make_lispy_movement): Condition on HAVE_GPM too. 58 * keyboard.c (make_lispy_movement): Condition on HAVE_GPM too.
55 59
@@ -172,7 +176,7 @@
172 176
1732007-05-07 Andreas Schwab <schwab@suse.de> 1772007-05-07 Andreas Schwab <schwab@suse.de>
174 178
175 * keymap.c (Flookup_key): Fix typo in last change. 179 * keymap.c (Flookup_key): Fix typo in last change.
176 180
1772007-05-07 Stefan Monnier <monnier@iro.umontreal.ca> 1812007-05-07 Stefan Monnier <monnier@iro.umontreal.ca>
178 182
diff --git a/src/window.c b/src/window.c
index d6194565253..8a5137f2044 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4110,8 +4110,8 @@ too small. */)
4110DEFUN ("shrink-window", Fshrink_window, Sshrink_window, 1, 2, "p", 4110DEFUN ("shrink-window", Fshrink_window, Sshrink_window, 1, 2, "p",
4111 doc: /* Make current window ARG lines smaller. 4111 doc: /* Make current window ARG lines smaller.
4112From program, optional second arg non-nil means shrink sideways arg columns. 4112From program, optional second arg non-nil means shrink sideways arg columns.
4113Interactively, if an argument is not given, make the window one line smaller. Only 4113Interactively, if an argument is not given, make the window one line smaller.
4114siblings to the right or below are changed. */) 4114Only siblings to the right or below are changed. */)
4115 (arg, side) 4115 (arg, side)
4116 Lisp_Object arg, side; 4116 Lisp_Object arg, side;
4117{ 4117{