aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2005-07-21 16:34:51 +0000
committerJuanma Barranquero2005-07-21 16:34:51 +0000
commitc10ce82e3cc0da4abd299107515b9aa56a82dd80 (patch)
tree31e4f270e4f8dce971af805efc25f8029b29924b /src
parenta41292c2359d1c9529562fe2abb977075efecfa7 (diff)
downloademacs-c10ce82e3cc0da4abd299107515b9aa56a82dd80.tar.gz
emacs-c10ce82e3cc0da4abd299107515b9aa56a82dd80.zip
(Fset_window_margins, Fset_window_fringes):
Improve argument/docstring consistency.
Diffstat (limited to 'src')
-rw-r--r--src/window.c48
1 files changed, 24 insertions, 24 deletions
diff --git a/src/window.c b/src/window.c
index ed4fc9c8ae8..7d5d8d835ba 100644
--- a/src/window.c
+++ b/src/window.c
@@ -6246,33 +6246,33 @@ Second arg LEFT-WIDTH specifies the number of character cells to
6246reserve for the left marginal area. Optional third arg RIGHT-WIDTH 6246reserve for the left marginal area. Optional third arg RIGHT-WIDTH
6247does the same for the right marginal area. A nil width parameter 6247does the same for the right marginal area. A nil width parameter
6248means no margin. */) 6248means no margin. */)
6249 (window, left, right) 6249 (window, left_width, right_width)
6250 Lisp_Object window, left, right; 6250 Lisp_Object window, left_width, right_width;
6251{ 6251{
6252 struct window *w = decode_window (window); 6252 struct window *w = decode_window (window);
6253 6253
6254 /* Translate negative or zero widths to nil. 6254 /* Translate negative or zero widths to nil.
6255 Margins that are too wide have to be checked elsewhere. */ 6255 Margins that are too wide have to be checked elsewhere. */
6256 6256
6257 if (!NILP (left)) 6257 if (!NILP (left_width))
6258 { 6258 {
6259 CHECK_NUMBER (left); 6259 CHECK_NUMBER (left_width);
6260 if (XINT (left) <= 0) 6260 if (XINT (left_width) <= 0)
6261 left = Qnil; 6261 left_width = Qnil;
6262 } 6262 }
6263 6263
6264 if (!NILP (right)) 6264 if (!NILP (right_width))
6265 { 6265 {
6266 CHECK_NUMBER (right); 6266 CHECK_NUMBER (right_width);
6267 if (XINT (right) <= 0) 6267 if (XINT (right_width) <= 0)
6268 right = Qnil; 6268 right_width = Qnil;
6269 } 6269 }
6270 6270
6271 if (!EQ (w->left_margin_cols, left) 6271 if (!EQ (w->left_margin_cols, left_width)
6272 || !EQ (w->right_margin_cols, right)) 6272 || !EQ (w->right_margin_cols, right_width))
6273 { 6273 {
6274 w->left_margin_cols = left; 6274 w->left_margin_cols = left_width;
6275 w->right_margin_cols = right; 6275 w->right_margin_cols = right_width;
6276 6276
6277 adjust_window_margins (w); 6277 adjust_window_margins (w);
6278 6278
@@ -6317,22 +6317,22 @@ the command `set-fringe-style'.
6317If optional fourth arg OUTSIDE-MARGINS is non-nil, draw the fringes 6317If optional fourth arg OUTSIDE-MARGINS is non-nil, draw the fringes
6318outside of the display margins. By default, fringes are drawn between 6318outside of the display margins. By default, fringes are drawn between
6319display marginal areas and the text area. */) 6319display marginal areas and the text area. */)
6320 (window, left, right, outside_margins) 6320 (window, left_width, right_width, outside_margins)
6321 Lisp_Object window, left, right, outside_margins; 6321 Lisp_Object window, left_width, right_width, outside_margins;
6322{ 6322{
6323 struct window *w = decode_window (window); 6323 struct window *w = decode_window (window);
6324 6324
6325 if (!NILP (left)) 6325 if (!NILP (left_width))
6326 CHECK_NATNUM (left); 6326 CHECK_NATNUM (left_width);
6327 if (!NILP (right)) 6327 if (!NILP (right_width))
6328 CHECK_NATNUM (right); 6328 CHECK_NATNUM (right_width);
6329 6329
6330 if (!EQ (w->left_fringe_width, left) 6330 if (!EQ (w->left_fringe_width, left_width)
6331 || !EQ (w->right_fringe_width, right) 6331 || !EQ (w->right_fringe_width, right_width)
6332 || !EQ (w->fringes_outside_margins, outside_margins)) 6332 || !EQ (w->fringes_outside_margins, outside_margins))
6333 { 6333 {
6334 w->left_fringe_width = left; 6334 w->left_fringe_width = left_width;
6335 w->right_fringe_width = right; 6335 w->right_fringe_width = right_width;
6336 w->fringes_outside_margins = outside_margins; 6336 w->fringes_outside_margins = outside_margins;
6337 6337
6338 adjust_window_margins (w); 6338 adjust_window_margins (w);