Relay-Version: version B 2.10 5/3/83; site utzoo.UUCP
Posting-Version: version B 2.10.1 6/24/83; site mit-eddie.UUCP
Path: utzoo!watmath!clyde!burl!ulysses!allegra!mit-eddie!rms@mit-prep
From: rms@mit-prep
Newsgroups: net.emacs
Subject: Bug fix for 16.60
Message-ID: <5451@mit-eddie.UUCP>
Date: Sat, 5-Oct-85 18:45:01 EDT
Article-I.D.: mit-eddi.5451
Posted: Sat Oct  5 18:45:01 1985
Date-Received: Mon, 7-Oct-85 02:48:53 EDT
Sender: daemon@mit-eddi.UUCP
Organization: MIT, Cambridge, MA
Lines: 82

From: Richard M. Stallman <rms@mit-prep>
*** indent.el.~1~	Tue Aug  6 04:21:11 1985
--- indent.el	Fri Oct  4 19:37:08 1985
***************
*** 107,113
       (forward-line 1))
     (move-marker end nil))))
  
! (defun indent-relative ()
    "Space out to under next indent point in previous nonblank line.
  An indent point is a non-whitespace character following whitespace.
  If the previous nonblank line has no indent points beyond

--- 107,118 -----
       (forward-line 1))
     (move-marker end nil))))
  
! (defun indent-relative-maybe ()
!   "Indent a new line like previous nonblank line."
!   (interactive)
!   (indent-relative t))
! 
! (defun indent-relative (&optional unindented-ok)
    "Space out to under next indent point in previous nonblank line.
  An indent point is a non-whitespace character following whitespace.
  If the previous nonblank line has no indent points beyond
***************
*** 112,118
  An indent point is a non-whitespace character following whitespace.
  If the previous nonblank line has no indent points beyond
  the column dot starts at,  tab-to-tab-stop  is done instead."
!   (interactive)
    (if abbrev-mode (expand-abbrev))
    (let ((start-column (current-column))
  	indent)

--- 117,123 -----
  An indent point is a non-whitespace character following whitespace.
  If the previous nonblank line has no indent points beyond
  the column dot starts at,  tab-to-tab-stop  is done instead."
!   (interactive "P")
    (if abbrev-mode (expand-abbrev))
    (let ((start-column (current-column))
  	indent)
***************
*** 122,127
  	  (let ((end (scan-buffer (dot) 1 ?\n)))
  	    (move-to-column start-column)
  	    (or (looking-at "[ \t]")
  		(skip-chars-forward "^ \t" end))
  	    (skip-chars-forward " \t" end)
  	    (or (= (dot) end) (setq indent (current-column))))))

--- 127,133 -----
  	  (let ((end (scan-buffer (dot) 1 ?\n)))
  	    (move-to-column start-column)
  	    (or (looking-at "[ \t]")
+ 		unindented-ok
  		(skip-chars-forward "^ \t" end))
  	    (skip-chars-forward " \t" end)
  	    (or (= (dot) end) (setq indent (current-column))))))

*** text-mode.el.~1~	Sat Sep 28 14:13:19 1985
--- text-mode.el	Fri Oct  4 19:37:10 1985
***************
*** 78,84
    (setq local-abbrev-table text-mode-abbrev-table)
    (set-syntax-table text-mode-syntax-table)
    (make-local-variable 'indent-line-function)
!   (setq indent-line-function 'indent-relative)
    (use-local-map indented-text-mode-map)
    (setq mode-name "Indented Text")
    (setq major-mode 'indented-text-mode)

--- 78,84 -----
    (setq local-abbrev-table text-mode-abbrev-table)
    (set-syntax-table text-mode-syntax-table)
    (make-local-variable 'indent-line-function)
!   (setq indent-line-function 'indent-relative-maybe)
    (use-local-map indented-text-mode-map)
    (setq mode-name "Indented Text")
    (setq major-mode 'indented-text-mode)