From a5b3d1b8ab042780ba4f60c1ff63b384b896ee61 Mon Sep 17 00:00:00 2001 From: Luc Teirlinck Date: Sat, 2 Oct 2004 00:18:38 +0000 Subject: [PATCH] (set-left-margin, set-right-margin): Rename `lm' arg to `width' for consistency with docstring. Doc fix. --- lisp/ChangeLog | 5 +++++ lisp/indent.el | 26 ++++++++++++++++---------- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 35fc88ca1da..be707b5a099 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2004-10-01 Luc Teirlinck + + * indent.el (set-left-margin, set-right-margin): Rename `lm' arg + to `width' for consistency with docstring. Doc fix. + 2004-10-01 Martin Stjernholm * progmodes/cc-langs.el: Load cl here since cc-defs doesn't do it. diff --git a/lisp/indent.el b/lisp/indent.el index 3f423adbace..e1a9cae4819 100644 --- a/lisp/indent.el +++ b/lisp/indent.el @@ -1,6 +1,6 @@ ;;; indent.el --- indentation commands for Emacs -;; Copyright (C) 1985, 1995, 2001 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1995, 2001, 2004 Free Software Foundation, Inc. ;; Maintainer: FSF @@ -198,11 +198,14 @@ Args FROM and TO are optional; default is the whole buffer." (forward-line 1)) (move-marker to nil))) -(defun set-left-margin (from to lm) +(defun set-left-margin (from to width) "Set the left margin of the region to WIDTH. -If `auto-fill-mode' is active, re-fill the region to fit the new margin." +If `auto-fill-mode' is active, re-fill the region to fit the new margin. + +Interactively, WIDTH is the prefix argument, if specified. +Without prefix argument, the command prompts for WIDTH." (interactive "r\nNSet left margin to column: ") - (if (interactive-p) (setq lm (prefix-numeric-value lm))) + (if (interactive-p) (setq width (prefix-numeric-value width))) (save-excursion ;; If inside indentation, start from BOL. (goto-char from) @@ -214,21 +217,24 @@ If `auto-fill-mode' is active, re-fill the region to fit the new margin." (setq to (point-marker))) ;; Delete margin indentation first, but keep paragraph indentation. (delete-to-left-margin from to) - (put-text-property from to 'left-margin lm) - (indent-rigidly from to lm) + (put-text-property from to 'left-margin width) + (indent-rigidly from to width) (if auto-fill-function (save-excursion (fill-region from to nil t t))) (move-marker to nil)) -(defun set-right-margin (from to lm) +(defun set-right-margin (from to width) "Set the right margin of the region to WIDTH. -If `auto-fill-mode' is active, re-fill the region to fit the new margin." +If `auto-fill-mode' is active, re-fill the region to fit the new margin. + +Interactively, WIDTH is the prefix argument, if specified. +Without prefix argument, the command prompts for WIDTH." (interactive "r\nNSet right margin to width: ") - (if (interactive-p) (setq lm (prefix-numeric-value lm))) + (if (interactive-p) (setq width (prefix-numeric-value width))) (save-excursion (goto-char from) (skip-chars-backward " \t") (if (bolp) (setq from (point)))) - (put-text-property from to 'right-margin lm) + (put-text-property from to 'right-margin width) (if auto-fill-function (save-excursion (fill-region from to nil t t)))) (defun alter-text-property (from to prop func &optional object) -- 2.39.2