[Emacs-diffs] emacs/lisp ChangeLog simple.el

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/07/15 02:05:35

Modified files:
        lisp           : ChangeLog simple.el 

Log message:
        * simple.el (kill-visual-line): Obey kill-whole-line (Bug#3695).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15808&r2=1.15809
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/simple.el?cvsroot=emacs&r1=1.992&r2=1.993

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15808
retrieving revision 1.15809
diff -u -b -r1.15808 -r1.15809
--- ChangeLog   15 Jul 2009 01:25:32 -0000      1.15808
+++ ChangeLog   15 Jul 2009 02:05:32 -0000      1.15809
@@ -1,5 +1,9 @@
 2009-07-15  Chong Yidong  <address@hidden>
 
+       * simple.el (kill-visual-line): Obey kill-whole-line (Bug#3695).
+
+2009-07-15  Chong Yidong  <address@hidden>
+
        * simple.el (deactivate-mark): Optional argument FORCE.
        (set-mark): Use deactivate-mark.
 

Index: simple.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/simple.el,v
retrieving revision 1.992
retrieving revision 1.993
diff -u -b -r1.992 -r1.993
--- simple.el   15 Jul 2009 01:25:37 -0000      1.992
+++ simple.el   15 Jul 2009 02:05:35 -0000      1.993
@@ -4533,7 +4533,8 @@
   (interactive "P")
   ;; Like in `kill-line', it's better to move point to the other end
   ;; of the kill before killing.
-  (let ((opoint (point)))
+  (let ((opoint (point))
+       (kill-whole-line (and kill-whole-line (bolp))))
     (if arg
        (vertical-motion (prefix-numeric-value arg))
       (end-of-visual-line 1)
@@ -4545,7 +4546,9 @@
        ;; whether the trailing whitespace is highlighted.  But, it's
        ;; OK to just do this unconditionally.
        (skip-chars-forward " \t")))
-    (kill-region opoint (point))))
+    (kill-region opoint (if (and kill-whole-line (looking-at "\n"))
+                           (1+ (point))
+                         (point)))))
 
 (defun next-logical-line (&optional arg try-vscroll)
   "Move cursor vertically down ARG lines.