[Emacs-diffs] Changes to emacs/lisp/textmodes/fill.el

[Miles Bader]

Index: emacs/lisp/textmodes/fill.el
diff -c emacs/lisp/textmodes/fill.el:1.157 emacs/lisp/textmodes/fill.el:1.158
*** emacs/lisp/textmodes/fill.el:1.157  Wed Apr  2 18:40:36 2003
--- emacs/lisp/textmodes/fill.el        Wed Apr  2 19:53:49 2003
***************
*** 523,529 ****
        ;; We need one space at end of line so that
        ;; further filling won't delete it.  NOTE: We
        ;; intentionally leave this one space to
!       ;; distingush the case that user wants to put
        ;; space between \c| characters.
        (forward-char 1))
    (insert ?\n)
--- 523,529 ----
        ;; We need one space at end of line so that
        ;; further filling won't delete it.  NOTE: We
        ;; intentionally leave this one space to
!       ;; distinguish the case that user wants to put
        ;; space between \c| characters.
        (forward-char 1))
    (insert ?\n)
***************
*** 540,548 ****
        (fill-indent-to-left-margin)
      (indent-according-to-mode))
    ;; Insert the fill prefix after indentation.
-   ;; Set prefixcol so whitespace in the prefix won't get lost.
    (and fill-prefix (not (equal fill-prefix ""))
!        (insert-and-inherit fill-prefix)))
  
  (defun fill-indent-to-left-margin ()
    "Indent current line to the column given by `current-left-margin'."
--- 540,549 ----
        (fill-indent-to-left-margin)
      (indent-according-to-mode))
    ;; Insert the fill prefix after indentation.
    (and fill-prefix (not (equal fill-prefix ""))
!        ;; Markers that were after the whitespace are now at point: insert
!        ;; before them so they don't get stuck before the prefix.
!        (insert-before-markers-and-inherit fill-prefix)))
  
  (defun fill-indent-to-left-margin ()
    "Indent current line to the column given by `current-left-margin'."