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

[David Kastrup]

Index: emacs/lisp/longlines.el
diff -c emacs/lisp/longlines.el:1.20 emacs/lisp/longlines.el:1.21
*** emacs/lisp/longlines.el:1.20        Sun Nov 20 05:17:27 2005
--- emacs/lisp/longlines.el     Fri Nov 25 11:06:30 2005
***************
*** 246,262 ****
               nil)
      (if (longlines-merge-lines-p)
          (progn (end-of-line)
-                (delete-char 1)
       ;; After certain commands (e.g. kill-line), there may be two
       ;; successive soft newlines in the buffer.  In this case, we
       ;; replace these two newlines by a single space.  Unfortunately,
       ;; this breaks the conservation of (spaces + newlines), so we
       ;; have to fiddle with longlines-wrap-point.
!                (if (or (bolp) (eolp))
!                    (if (> longlines-wrap-point (point))
!                        (setq longlines-wrap-point
!                              (1- longlines-wrap-point)))
!                  (insert-char ?  1))
                 nil)
        (forward-line 1)
        t)))
--- 246,266 ----
               nil)
      (if (longlines-merge-lines-p)
          (progn (end-of-line)
       ;; After certain commands (e.g. kill-line), there may be two
       ;; successive soft newlines in the buffer.  In this case, we
       ;; replace these two newlines by a single space.  Unfortunately,
       ;; this breaks the conservation of (spaces + newlines), so we
       ;; have to fiddle with longlines-wrap-point.
!              (if (or (prog1 (bolp) (forward-char 1)) (eolp))
!                  (progn
!                    (delete-char -1)
!                    (if (> longlines-wrap-point (point))
!                        (setq longlines-wrap-point
!                              (1- longlines-wrap-point))))
!                (insert-before-markers-and-inherit ?\ )
!                (backward-char 1)
!                (delete-char -1)
!                (forward-char 1))
                 nil)
        (forward-line 1)
        t)))