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

[Kim F. Storm]

Index: emacs/lisp/simple.el
diff -c emacs/lisp/simple.el:1.581 emacs/lisp/simple.el:1.582
*** emacs/lisp/simple.el:1.581  Sat Dec 28 16:23:23 2002
--- emacs/lisp/simple.el        Fri Jan  3 17:46:06 2003
***************
*** 1,6 ****
  ;;; simple.el --- basic editing commands for Emacs
  
! ;; Copyright (C) 1985, 86, 87, 93, 94, 95, 96, 97, 98, 99, 2000, 2001, 2002
  ;;        Free Software Foundation, Inc.
  
  ;; Maintainer: FSF
--- 1,7 ----
  ;;; simple.el --- basic editing commands for Emacs
  
! ;; Copyright (C) 1985, 86, 87, 93, 94, 95, 96, 97, 98, 99,
! ;;               2000, 2001, 2002, 2003
  ;;        Free Software Foundation, Inc.
  
  ;; Maintainer: FSF
***************
*** 180,192 ****
      (goto-char loc)
      (end-of-line)))
  
! (defun split-line ()
!   "Split current line, moving portion beyond point vertically down."
!   (interactive "*")
    (skip-chars-forward " \t")
    (let ((col (current-column))
!       (pos (point)))
      (newline 1)
      (indent-to col 0)
      (goto-char pos)))
  
--- 181,206 ----
      (goto-char loc)
      (end-of-line)))
  
! 
! (defun split-line (&optional arg)
!   "Split current line, moving portion beyond point vertically down.
! If the current line starts with `fill-prefix', insert it on the new
! line as well.  With prefix arg, don't insert fill-prefix on new line.
! 
! When called from Lisp code, the arg may be a prefix string to copy."
!   (interactive "*P")
    (skip-chars-forward " \t")
    (let ((col (current-column))
!       (pos (point))
!       (beg (line-beginning-position))
!       (prefix (cond ((stringp arg) arg)
!                     (arg nil)
!                     (t fill-prefix))))
      (newline 1)
+     (if (and (stringp prefix)
+            (string-equal prefix
+                          (buffer-substring beg (+ beg (length prefix)))))
+       (insert-and-inherit prefix))
      (indent-to col 0)
      (goto-char pos)))