Mercurial > hg > xemacs-beta

diff lisp/simple.el @ 503:98fb34b6fbe9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2001-05-04 23:31:31 by ben] * printer.el (generic-print-buffer): * printer.el (generic-print-region): Enable dialog boxes. Apply workaround recommended by Kirill. fix (fboundp 'lpr-buffer) -> (fboundp 'lpr-region). Take out interactive dependence of kill-whole-line. * etc\check_cygwin_setup.sh (distdir): Update for current Cygwin reality. * etc\NEWS: Remove kill-whole-line changes.
author ben
date Fri, 04 May 2001 23:31:34 +0000
parents 7039e6323819
children 023b83f4e54b
line wrap: on
line diff
--- a/lisp/simple.el	Fri May 04 22:42:35 2001 +0000
+++ b/lisp/simple.el	Fri May 04 23:31:34 2001 +0000
@@ -1116,8 +1116,7 @@
 (defcustom kill-whole-line nil
   "*If non-nil, kill the whole line if point is at the beginning.
 Otherwise, `kill-line' kills only up to the end of the line, but not
-the terminating newline.  Note: This only applies when `kill-line' is
-called interactively.
+the terminating newline.
 
 WARNING: This is a misnamed variable!  It should be called something
 like `kill-whole-line-when-at-beginning'.  If you simply want
@@ -1126,7 +1125,7 @@
   :type 'boolean
   :group 'killing)
 
-(defun kill-line-1 (arg entire-line interactive-p)
+(defun kill-line-1 (arg entire-line)
   (kill-region (if entire-line
 		   (save-excursion
 		     (beginning-of-line)
@@ -1148,8 +1147,7 @@
 		       (signal 'end-of-buffer nil))
 		   (if (or (looking-at "[ \t]*$")
 			   (or entire-line
-			       (and interactive-p
-				    (and kill-whole-line (bolp)))))
+			       (and kill-whole-line (bolp))))
 		       (forward-line 1)
 		     (end-of-line)))
 		 (point))))
@@ -1162,7 +1160,7 @@
 When calling from a program, nil means \"no arg\",
 a number counts as a prefix arg."
   (interactive "*P")
-  (kill-line-1 arg t (interactive-p)))
+  (kill-line-1 arg t))
 
 (defun kill-line (&optional arg)
   "Kill the rest of the current line, or the entire line.
@@ -1178,7 +1176,7 @@
 When calling from a program, nil means \"no arg\",
 a number counts as a prefix arg."
   (interactive "*P")
-  (kill-line-1 arg nil (interactive-p)))
+  (kill-line-1 arg nil))
 
 ;; XEmacs
 (defun backward-kill-line nil