[Emacs-diffs] Changes to emacs/lisp/indent.el [emacs-unicode-2]

[Miles Bader]

Index: emacs/lisp/indent.el
diff -c emacs/lisp/indent.el:1.54.4.3 emacs/lisp/indent.el:1.54.4.4
*** emacs/lisp/indent.el:1.54.4.3       Tue Sep 21 09:34:09 2004
--- emacs/lisp/indent.el        Mon Oct  4 01:04:17 2004
***************
*** 1,6 ****
  ;;; indent.el --- indentation commands for Emacs
  
! ;; Copyright (C) 1985, 1995, 2001 Free Software Foundation, Inc.
  
  ;; Maintainer: FSF
  
--- 1,6 ----
  ;;; indent.el --- indentation commands for Emacs
  
! ;; Copyright (C) 1985, 1995, 2001, 2004 Free Software Foundation, Inc.
  
  ;; Maintainer: FSF
  
***************
*** 198,208 ****
        (forward-line 1))
      (move-marker to nil)))
  
! (defun set-left-margin (from to lm)
    "Set the left margin of the region to WIDTH.
! If `auto-fill-mode' is active, re-fill the region to fit the new margin."
    (interactive "r\nNSet left margin to column: ")
!   (if (interactive-p) (setq lm (prefix-numeric-value lm)))
    (save-excursion
      ;; If inside indentation, start from BOL.
      (goto-char from)
--- 198,211 ----
        (forward-line 1))
      (move-marker to nil)))
  
! (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.
! 
! 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)
***************
*** 214,234 ****
      (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)
    (if auto-fill-function (save-excursion (fill-region from to nil t t)))
    (move-marker to nil))
  
! (defun set-right-margin (from to lm)
    "Set the right margin of the region to WIDTH.
! If `auto-fill-mode' is active, re-fill the region to fit the new margin."
    (interactive "r\nNSet right margin to width: ")
!   (if (interactive-p) (setq lm (prefix-numeric-value lm)))
    (save-excursion
      (goto-char from)
      (skip-chars-backward " \t")
      (if (bolp) (setq from (point))))
!   (put-text-property from to 'right-margin lm)
    (if auto-fill-function (save-excursion (fill-region from to nil t t))))
  
  (defun alter-text-property (from to prop func &optional object)
--- 217,240 ----
      (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 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 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.
! 
! 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")
      (if (bolp) (setq from (point))))
!   (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)