(set-left-margin, set-right-margin): Delete redundant code.

(increase-right-margin): Remove erroneous call to `interactive-p'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f613fda30355779e76211a852f97f3644f120965..e99856fe5f3ef769e63d76826198853537e5f436 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-24  Luc Teirlinck  <teirllm@auburn.edu>
+
+       * indent.el (set-left-margin, set-right-margin): Delete redundant
+       code.
+       (increase-right-margin): Remove erroneous call to `interactive-p'.
+
 2004-10-24  Kim F. Storm  <storm@cua.dk>
 
        * help.el (describe-mode): Fix 2004-10-13 change.

diff --git a/lisp/indent.el b/lisp/indent.el
index e1a9cae4819c2de06da37b96dc2086dcb8f1e4d7..9713268f03bded0cf505aeaae129ef787ca19e3a 100644 (file)
--- a/lisp/indent.el
+++ b/lisp/indent.el
@@ -205,7 +205,6 @@ 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 width (prefix-numeric-value width)))
   (save-excursion
     ;; If inside indentation, start from BOL.
     (goto-char from)
@@ -229,7 +228,6 @@ 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 width (prefix-numeric-value width)))
   (save-excursion
     (goto-char from)
     (skip-chars-backward " \t")
@@ -289,12 +287,10 @@ to change the margin by, in characters.  A negative argument decreases
 the right margin width.
 If `auto-fill-mode' is active, re-fill the region to fit the new margin."
   (interactive "r\nP")
-  (if (interactive-p)
-      (setq inc (if inc (prefix-numeric-value current-prefix-arg)
-                 standard-indent)))
+  (setq inc (if inc (prefix-numeric-value inc) standard-indent))
   (save-excursion
     (alter-text-property from to 'right-margin
-       (lambda (v) (+ inc (or v 0))))
+                        (lambda (v) (+ inc (or v 0))))
     (if auto-fill-function
        (fill-region from to nil t t))))