changeset 503:98fb34b6fbe9

[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 bcda0b3445a6
files etc/NEWS etc/check_cygwin_setup.sh lisp/ChangeLog lisp/printer.el lisp/simple.el
diffstat 5 files changed, 44 insertions(+), 56 deletions(-) [+]
line wrap: on
line diff
--- a/etc/NEWS	Fri May 04 22:42:35 2001 +0000
+++ b/etc/NEWS	Fri May 04 23:31:34 2001 +0000
@@ -86,7 +86,6 @@
   -- New locations for early package hierarchies.
   -- The `auto-save' library has been greatly improved.
   -- New variable `mswindows-alt-by-itself-activates-menu'.
-  -- The variable `kill-whole-line' now only takes effect interactively.
   -- Other init-file-related changes.
     - Init file in your home directory may be called `.emacs.el'.
     - New command-line switches -user-init-file and -user-init-directory.
@@ -522,14 +521,6 @@
 which enables the use of Alt+<Letter> accelerators to invoke the
 menus.
 
-** The variable `kill-whole-line' now only takes effect interactively.
-
-(This variable controls the behavior of `kill-line'.) Although this
-is a departure from a previous behavior in the case of setting this
-variable `kill-whole-line' to t, it is almost certainly what has
-always been intended, and most likely the old way of doing things
-introduced bugs.
-
 ** Other init-file-related changes.
 
 *** Init file in your home directory may be called `.emacs.el'.
--- a/etc/check_cygwin_setup.sh	Fri May 04 22:42:35 2001 +0000
+++ b/etc/check_cygwin_setup.sh	Fri May 04 23:31:34 2001 +0000
@@ -35,8 +35,9 @@
 	mkdir /bin
 	mount -b $distdir /bin
     fi
-elif [ "$distdir" != "/bin" ]; then
-    echo "Warning: you have /bin but it's not the cygwin installation."
+#this appears bogus. --ben
+#elif [ "$distdir" != "/bin" ]; then
+#    echo "Warning: you have /bin but it's not the cygwin installation."
 fi
 
 if [ ! -d "/tmp" ]; then
@@ -129,19 +130,20 @@
 	echo "you have /etc/group"
     fi
 
-    if [ ! -f "/etc/hosts" ]; then
-	echo -n "You don't have /etc/hosts - create it?"
-	if yorn; then
-	    mname=`uname -n`
-	    echo "Machine name is $mname"
-	    echo -n "Please enter your ip address "
-	    read mipaddr junk
-	    echo "$mname $mipaddr" > /etc/hosts
-	    echo "localhost 127.0.0.1" >> /etc/hosts
-	fi
-    else
-	echo "you have /etc/hosts"
-    fi
+# this is bogus.  i have no hosts file and no problems. --ben
+#    if [ ! -f "/etc/hosts" ]; then
+#	echo -n "You don't have /etc/hosts - create it?"
+#	if yorn; then
+#	    mname=`uname -n`
+#	    echo "Machine name is $mname"
+#	    echo -n "Please enter your ip address "
+#	    read mipaddr junk
+#	    echo "$mname $mipaddr" > /etc/hosts
+#	    echo "localhost 127.0.0.1" >> /etc/hosts
+#	fi
+#    else
+#	echo "you have /etc/hosts"
+#    fi
 else
     echo "Can't create /etc files because /etc does not exist"
 fi
@@ -181,8 +183,11 @@
     echo "TERM is $TERM"
 fi
 
-if echo $CYGWIN32 | grep -w tty; then
-    echo "CYGWIN32 is $CYGWIN32"
+if echo $CYGWIN | grep -w tty > /dev/null; then
+    echo "CYGWIN is $CYGWIN"
 else 
-    echo "CYGWIN32 does not contain \"tty\" terminal may be deficient"
+    echo "CYGWIN does not contain \"tty\"; you may experience problems with
+subprocess or terminal handling.  To rectify this add CYGWIN=tty to
+your environment. (Note this cannot be done in bash as it needs to be
+read when cygwin1.dll initializes.)"
 fi
--- a/lisp/ChangeLog	Fri May 04 22:42:35 2001 +0000
+++ b/lisp/ChangeLog	Fri May 04 23:31:34 2001 +0000
@@ -1,3 +1,16 @@
+2001-05-04  Ben Wing  <ben@xemacs.org>
+
+	* printer.el (generic-print-buffer):
+	* printer.el (generic-print-region):
+	Enable dialog boxes.  Apply workaround recommended by Kirill.
+	
+	* simple.el (kill-whole-line):
+	* simple.el (kill-line-1):
+	* simple.el (kill-entire-line):
+	* simple.el (kill-line):
+	* simple.el (backward-kill-line):
+	Take out interactive dependence of kill-whole-line.
+
 2001-04-22  Ben Wing  <ben@xemacs.org>
 
 	----------------------- byte-comp warning fixes -----------------
--- a/lisp/printer.el	Fri May 04 22:42:35 2001 +0000
+++ b/lisp/printer.el	Fri May 04 23:31:34 2001 +0000
@@ -227,10 +227,7 @@
 display of the print dialog box.
 
 If BUFFER is nil or omitted, the current buffer is used."
-  ;; #### for some reason, displaying a dialog box makes the printing
-  ;; fail unless y-or-n-p is called (see below).  when this is fixed,
-  ;; remove one of the calls to `not' in the following line.
-  (interactive (list nil (not (not current-prefix-arg))))
+  (interactive (list nil (not current-prefix-arg)))
   (if (or (not (valid-specifier-tag-p 'msprinter))
 	  (not display-print-dialog))
       (generic-print-region (point-min buffer) (point-max buffer) buffer)
@@ -342,22 +339,6 @@
 			 ;; only actually print the page if it's in the
 			 ;; range.
 			 (when (>= pageno from-page)
-			   ;; none of these work.
-; 			   (mapcar #'(lambda (foo)
-; 				       (redisplay-device foo t))
-; 				   (delete-if #'(lambda (foo)
-; 						  (eq (device-type foo)
-; 						      'msprinter))
-; 					      (device-list)))
-; 			   (mapcar #'(lambda (foo)
-; 				       (redraw-device foo t))
-; 				   (delete-if #'(lambda (foo)
-; 						  (eq (device-type foo)
-; 						      'msprinter))
-; 					      (device-list)))
-; 			   (sit-for 0.01)
-			   ;; but this one sure as hell does.
-; 			   (y-or-n-p "continue")
 			   (when printer-page-header
 			     (with-current-buffer header-buffer
 			       (erase-buffer)
@@ -375,7 +356,7 @@
 			       (goto-char (point-min))
 			       (set-window-start footer-window (point-min))))
 
-			   (redisplay-frame f)
+			   (redisplay-frame f t)
 			   (print-job-eject-page f)
 			   )
 			 ;; but use the GUARANTEE argument to `window-end'
@@ -413,6 +394,6 @@
 	     (and footer-buffer (kill-buffer footer-buffer))
 	     )))
 	((and (not (eq system-type 'windows-nt))
-	      (fboundp 'lpr-buffer))
+	      (fboundp 'lpr-region))
 	 (lpr-region buffer))
 	(t (error "No print support available"))))
--- 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