JimB's changes since January 18th

Makefile.in

@@ -231,7 +231,6 @@ lib-src/Makefile: ${srcdir}/lib-src/Makefile.in Makefile
 	 -e 's|^LOADLIBES *=.*$$|LOADLIBES='"${libsrc_libs}"'|'		\
 	 -e '/^# DIST: /d') > lib-src/Makefile.tmp
 	${srcdir}/move-if-change lib-src/Makefile.tmp lib-src/Makefile
-	# Remind people not to edit this.
 	chmod -w lib-src/Makefile
 
 src/Makefile: ${srcdir}/src/Makefile.in Makefile
@@ -248,7 +247,6 @@ src/Makefile: ${srcdir}/src/Makefile.in Makefile
 	 -e 's|^CONFIG_CFLAGS *=.*$$|CONFIG_CFLAGS='"${CONFIG_CFLAGS}"'|' \
 	 -e '/^# DIST: /d') > src/Makefile.tmp
 	${srcdir}/move-if-change src/Makefile.tmp src/Makefile
-	# Remind people not to edit this.
 	chmod -w src/Makefile
 
 oldXMenu/Makefile: ${srcdir}/oldXMenu/Makefile Makefile
@@ -262,10 +260,10 @@ Makefile:
 
 # ==================== Installation ====================
 
+## If we let lib-src do its own installation, that means we
+## don't have to duplicate the list of utilities to install in
+## this Makefile as well.
 install: all mkdir
-	## If we let lib-src do its own installation, that means we
-	## don't have to duplicate the list of utilities to install in
-	## this Makefile as well.
 	(cd lib-src; $(MAKE) install ${MFLAGS} bindir=${bindir} libdir=${libdir})
 	-set ${COPYDESTS} ; \
 	 for dir in ${COPYDIR} ; do \
@@ -297,10 +295,10 @@ install: all mkdir
 	-rm -f ${bindir}/emacs
 	ln ${bindir}/emacs-${version} ${bindir}/emacs
 
+## If we let lib-src do its own installation, that means we
+## don't have to duplicate the list of utilities to install in
+## this Makefile as well.
 install.sysv: all mkdir
-	## If we let lib-src do its own installation, that means we
-	## don't have to duplicate the list of utilities to install in
-	## this Makefile as well.
 	(cd lib-src; $(MAKE) install ${MFLAGS} bindir=${bindir} libdir=${libdir})
 	-set ${COPYDESTS} ; \
 	 for dir in ${COPYDIR} ; do \
@@ -330,10 +328,10 @@ install.sysv: all mkdir
 	-cpset src/emacs ${bindir}/emacs-${version} 1755 bin bin
 	-ln ${bindir}/emacs-${version} ${bindir}/emacs
   
+## If we let lib-src do its own installation, that means we
+## don't have to duplicate the list of utilities to install in
+## this Makefile as well.
 install.xenix: all mkdir
-	## If we let lib-src do its own installation, that means we
-	## don't have to duplicate the list of utilities to install in
-	## this Makefile as well.
 	(cd lib-src; $(MAKE) install ${MFLAGS} bindir=${bindir} libdir=${libdir})
 	-set ${COPYDESTS} ; \
 	 for dir in ${COPYDIR} ; do \
@@ -368,10 +366,10 @@ install.xenix: all mkdir
 	chmod 1755 ${bindir}/emacs
 	-rm -f ${bindir}/emacs.old
 
+## If we let lib-src do its own installation, that means we
+## don't have to duplicate the list of utilities to install in
+## this Makefile as well.
 install.aix: all mkdir
-	## If we let lib-src do its own installation, that means we
-	## don't have to duplicate the list of utilities to install in
-	## this Makefile as well.
 	(cd lib-src; $(MAKE) install ${MFLAGS} bindir=${bindir} libdir=${libdir})
 	-set ${COPYDESTS} ; \
 	 for dir in ${COPYDIR} ; do \

lisp/comint.el

@@ -1091,7 +1091,7 @@ it just adds completion characters to the end of the filename."
 	     (let ((ch (read-char)))
 	       (if (= ch ?\ )
 		   (set-window-configuration conf)
-		   (setq unread-command-event ch))))))))
+		   (setq unread-command-events (list ch)))))))))
 
 ;;; Converting process modes to use comint mode
 ;;; ===========================================================================

lisp/ebuff-menu.el

@@ -63,8 +63,8 @@ Calls value of `electric-buffer-menu-mode-hook' on entry if non-nil.
 	    (setq select
 		  (catch 'electric-buffer-menu-select
 		    (message "<<< Press Space to bury the buffer list >>>")
-		    (if (= (setq unread-command-event (read-char)) ?\ )
-			(progn (setq unread-command-event nil)
+		    (if (= (setq unread-command-events (list (read-char))) ?\ )
+			(progn (setq unread-command-events nil)
 			       (throw 'electric-buffer-menu-select nil)))
 		    (let ((first (progn (goto-char (point-min))
 					(forward-line 2)
@@ -196,7 +196,7 @@ electric-buffer-menu-mode-hook if it is non-nil."
  
 (defun Electric-buffer-menu-exit ()
   (interactive)
-  (setq unread-command-event last-input-char)
+  (setq unread-command-events (list last-input-char))
   ;; for robustness
   (condition-case ()
       (throw 'electric-buffer-menu-select nil)

lisp/ehelp.el

@@ -119,8 +119,8 @@ BUFFER is put into `default-major-mode' (or `fundamental-mode') when we exit"
   (catch 'exit
     (if (pos-visible-in-window-p (point-max))
 	(progn (message "<<< Press Space to bury the help buffer >>>")
-	       (if (= (setq unread-command-event (read-char)) ?\  )
-		   (progn (setq unread-command-event nil)
+	       (if (= (setq unread-command-events (list (read-char))) ?\  )
+		   (progn (setq unread-command-events nil)
 			  (throw 'exit t)))))
     (let (up down both neither
 	  (standard (and (eq (key-binding " ")

lisp/electric.el

@@ -85,7 +85,7 @@
 	    cmd this-command)
       (if (or (prog1 quit-flag (setq quit-flag nil))
 	      (= last-input-char ?\C-g))
-	  (progn (setq unread-command-event nil
+	  (progn (setq unread-command-events nil
 		       prefix-arg nil)
 		 ;; If it wasn't cancelling a prefix character, then quit.
 		 (if (or (= (length (this-command-keys)) 1)
@@ -101,7 +101,7 @@
 		     (setq last-command this-command)
 		     (if (or (prog1 quit-flag (setq quit-flag nil))
 			     (= last-input-char ?\C-g))
-			 (progn (setq unread-command-event nil)
+			 (progn (setq unread-command-events nil)
 				(if (not inhibit-quit)
 				    (progn (ding)
 					   (message "Quit")

lisp/emacs-lisp/disass.el

@@ -41,6 +41,7 @@
 
 (defvar disassemble-recursive-indent 3 "*")
 
+;;;###autoload
 (defun disassemble (object &optional buffer indent interactive-p)
   "Print disassembled code for OBJECT in (optional) BUFFER.
 OBJECT can be a symbol defined as a function, or a function itself
@@ -136,7 +137,7 @@ redefine OBJECT if it is a symbol."
 	    (insert "\n"))))
     (cond ((and (consp obj) (assq 'byte-code obj))
 	   (disassemble-1 (assq 'byte-code obj) indent))
-	  ((compiled-function-p obj)
+	  ((byte-code-function-p obj)
 	   (disassemble-1 obj indent))
 	  (t
 	   (insert "Uncompiled body:  ")
@@ -195,14 +196,14 @@ OBJ should be a call to BYTE-CODE generated by the byte compiler."
 		 (setq arg (car arg))
 		 ;; but if the value of the constant is compiled code, then
 		 ;; recursively disassemble it.
-		 (cond ((or (compiled-function-p arg)
+		 (cond ((or (byte-code-function-p arg)
 			    (and (eq (car-safe arg) 'lambda)
 				 (assq 'byte-code arg))
 			    (and (eq (car-safe arg) 'macro)
-				 (or (compiled-function-p (cdr arg))
+				 (or (byte-code-function-p (cdr arg))
 				     (and (eq (car-safe (cdr arg)) 'lambda)
 					  (assq 'byte-code (cdr arg))))))
-			(cond ((compiled-function-p arg)
+			(cond ((byte-code-function-p arg)
 			       (insert "<compiled-function>\n"))
 			      ((eq (car-safe arg) 'lambda)
 			       (insert "<compiled lambda>"))

lisp/emacs-lisp/edebug.el

@@ -1480,7 +1480,7 @@ Should be 0 at the top level.")
 	(last-command last-command) 
 	(this-command this-command)
 	(last-input-char last-input-char)
-	;; Assume no edebug command sets unread-command-char.
+	;; Assume no edebug command sets unread-command-events.
 ;;	(unread-command-char -1)
 
 	(debug-on-error debug-on-error)

lisp/emerge.el

@@ -2910,7 +2910,7 @@ SPC, it is ignored; if it is anything else, it is processed as a command."
 	      (enlarge-window 1))
 	    (let ((c (read-char)))
 	      (if (/= c 32)
-		  (setq unread-command-event c))))))))
+		  (setq unread-command-events (list c)))))))))
 
 ;; Improved auto-save file names.
 ;; This function fixes many problems with the standard auto-save file names:

lisp/emulation/vip.el

@@ -333,9 +333,9 @@ vi mode.  ARG is used as the prefix value for the executed command.  If
 CHAR is given it becomes the first character of the command."
   (interactive "P")
   (let (com (buff (current-buffer)) (first t))
-    (if char (setq unread-command-event char))
+    (if char (setq unread-command-events (list char)))
     (setq prefix-arg arg)
-    (while (or first unread-command-event)
+    (while (or first unread-command-events)
       ;; this while loop is executed until unread command char will be
       ;; exhausted.
       (setq first nil)
@@ -393,7 +393,7 @@ obtained so far, and COM is the command part obtained so far."
   (while (= char ?U)
     (vip-describe-arg prefix-arg)
     (setq char (read-char)))
-  (setq unread-command-event char))
+  (setq unread-command-events (list char)))
 
 (defun vip-prefix-arg-com (char value com)
   "Vi operator as prefix argument."
@@ -447,7 +447,7 @@ obtained so far, and COM is the command part obtained so far."
 	(while (= char ?U)
 	  (vip-describe-arg prefix-arg)
 	  (setq char (read-char)))
-	(setq unread-command-event char))
+	(setq unread-command-events (list char)))
     ;; as com is non-nil, this means that we have a command to execute
     (if (or (= (car com) ?r) (= (car com) ?R))
 	;; execute apropriate region command.

lisp/frame.el

@@ -113,7 +113,7 @@ These supercede the values given in default-frame-alist.")
 ;;; need to see if it should go away or change.  Create a text frame
 ;;; here.
 (defun frame-notice-user-settings ()
-  (if (live-frame-p frame-initial-frame)
+  (if (frame-live-p frame-initial-frame)
       (progn
 	;; If the user wants a minibuffer-only frame, we'll have to
 	;; make a new one; you can't remove or add a root window to/from

lisp/gnus.el

@@ -2287,7 +2287,7 @@ If argument UNREAD is non-nil, only unread article is selected."
 		    (let ((char (read-char)))
 		      (if (= char cmd)
 			  (gnus-Subject-next-group nil)
-			(setq unread-command-event char))))
+			(setq unread-command-events (list char)))))
 		   )
 	     ))
 	  )))

lisp/help.el

@@ -293,7 +293,7 @@ C-w print information on absence of warranty for GNU Emacs."
       (princ (cond ((stringp def) "a keyboard macro.")
 		   ((subrp def)
 		    (concat beg "built-in function."))
-		   ((compiled-function-p def)
+		   ((byte-code-function-p def)
 		    (concat beg "compiled Lisp function."))
 		   ((symbolp def)
 		    (format "alias for `%s'." def))

lisp/info.el

@@ -768,7 +768,7 @@ N is the digit argument used to invoke this command."
 		    (message (if flag "Type Space to see more"
 			       "Type Space to return to Info"))
 		    (if (/= ?\  (setq ch (read-char)))
-			(progn (setq unread-command-event ch) nil)
+			(progn (setq unread-command-events (list ch)) nil)
 		      flag))
 	(scroll-up)))))
 

lisp/isearch.el

@@ -4,7 +4,7 @@
 ;; LCD Archive Entry:
 ;; isearch-mode|Daniel LaLiberte|liberte@cs.uiuc.edu
 ;; |A minor mode replacement for isearch.el.
-;; |$Date: 1992/11/07 06:17:04 $|$Revision: 1.15 $|~/modes/isearch-mode.el
+;; |$Date: 1992/11/16 01:37:06 $|$Revision: 1.16 $|~/modes/isearch-mode.el
 
 ;; This file is not yet part of GNU Emacs, but it is based almost
 ;; entirely on isearch.el which is part of GNU Emacs.
@@ -88,8 +88,15 @@
 ;;;====================================================================
 ;;; Change History
 
-;;; $Header: /home/gd/gnu/emacs/19.0/lisp/RCS/isearch-mode.el,v 1.15 1992/11/07 06:17:04 jimb Exp jimb $
+;;; $Header: /home/gd/gnu/emacs/19.0/lisp/RCS/isearch-mode.el,v 1.16 1992/11/16 01:37:06 jimb Exp jimb $
 ;;; $Log: isearch-mode.el,v $
+; Revision 1.16  1992/11/16  01:37:06  jimb
+; 	* bytecomp.el: Declare unread-command-char an obsolete variable.
+; 	* vip.el (vip-escape-to-emacs, vip-prefix-arg-value,
+; 	vip-prefix-arg-com): Use unread-command-event instead of
+; 	unread-command-char; respect its new semantics.
+; 	* isearch-mode.el (isearch-update, isearch-unread): Same.
+;
 ; Revision 1.15  1992/11/07  06:17:04  jimb
 ;         * isearch.el (isearch-frames-exist): This isn't what we want -
 ; 	replaced by...
@@ -557,7 +564,7 @@ is treated as a regexp.  See \\[isearch-forward] for more info."
   (if (if isearch-event-data-type
 	  (null unread-command-event)
 	(if isearch-gnu-emacs-events
-	    (null unread-command-event)
+	    (null unread-command-events)
 	  (< unread-command-char 0)))
       (progn
 	(if (not (input-pending-p))
@@ -1413,6 +1420,7 @@ have special meaning in a regexp."
 
 ;; To quiet the byte-compiler.
 (defvar unread-command-event)
+(defvar unread-command-events)
 (defvar last-command-event)
 
 (defun isearch-char-to-string (c)
@@ -1429,7 +1437,7 @@ have special meaning in a regexp."
    (isearch-event-data-type
     (setq unread-command-event char-or-event))
    (isearch-gnu-emacs-events
-    (setq unread-command-event char-or-event))
+    (setq unread-command-events (list char-or-event)))
    (t
     (setq unread-command-char char-or-event))))
 

lisp/map-ynp.el

@@ -100,7 +100,7 @@ the current %s and exit."
 	 prompt char elt tail
 	 (next (if (or (symbolp list)
 		       (subrp list)
-		       (compiled-function-p list)
+		       (byte-code-function-p list)
 		       (and (consp list)
 			    (eq (car list) 'lambda)))
 		   (function (lambda ()
@@ -157,7 +157,7 @@ the current %s and exit."
 			   (funcall actor elt)
 			   (setq actions (1+ actions))))))
 		  ((= ?? char)
-		   (setq unread-command-event help-char)
+		   (setq unread-command-events (list help-char))
 		   (setq next (` (lambda ()
 				   (setq next '(, next))
 				   '(, elt)))))

lisp/progmodes/c-mode.el

@@ -322,11 +322,13 @@ preserving the comment indentation or line-starting decorations."
 	      (paragraph-start
 	       ;; Lines containing just a comment start or just an end
 	       ;; should not be filled into paragraphs they are next to.
-	       (concat paragraph-start
-		       "\\|^[ \t]*/\\*[ \t]*$\\|^[ \t]*\\*/[ \t]*$\\|^[^ \t/*]"))
+	       (concat 
+		paragraph-start
+		"\\|^[ \t]*/\\*[ \t]*$\\|^[ \t]*\\*/[ \t]*$\\|^[ \t/*]*$"))
 	      (paragraph-separate
-	       (concat paragraph-separate
-		       "\\|^[ \t]*/\\*[ \t]*$\\|^[ \t]*\\*/[ \t]*$\\|^[^ \t/*]"))
+	       (concat
+		paragraph-separate
+		"\\|^[ \t]*/\\*[ \t]*$\\|^[ \t]*\\*/[ \t]*$\\|^[ \t/*]*$"))
 	      (chars-to-delete 0))
 	  (save-restriction
 	    ;; Don't fill the comment together with the code following it.

lisp/progmodes/fortran.el

@@ -39,7 +39,7 @@
 ;;; This file may be used with GNU Emacs version 18.xx if the following
 ;;; variable and function substutions are made.
 ;;;    Replace:
-;;;             unread-command-event with unread-command-char
+;;;             unread-command-events with unread-command-char
 ;;;             frame-width          with screen-width
 ;;;             auto-fill-function   with auto-fill-hook
 
@@ -469,7 +469,7 @@ Any other key combination is executed normally."
     (if (or (= (setq c (read-char)) ??)	;insert char if not equal to `?'
 	    (= c help-char))
 	(fortran-abbrev-help)
-      (setq unread-command-event c))))
+      (setq unread-command-events (list c)))))
 
 (defun fortran-abbrev-help ()
   "List the currently defined abbrevs in Fortran mode."
@@ -535,7 +535,7 @@ See also `fortran-window-create'."
 	    (progn (message "Type SPC to continue editing.")
 		   (let ((char (read-char)))
 		     (or (equal char (string-to-char " "))
-			 (setq unread-command-event char))))))
+			 (setq unread-command-events (list char)))))))
     (fortran-window-create)))
 
 (defun fortran-split-line ()

lisp/progmodes/simula.el

@@ -401,7 +401,7 @@ The relative indentation among the lines of the statement are preserved."
 	(case-fold-search t)
 	;; don't mix a label with an assignment operator := :-
 	;; therefore look at next typed character...
-	(next-char (setq unread-command-event (read-char)))
+	(next-char (setq unread-command-events (list (read-char))))
 	(com-char last-command-char))
     (unwind-protect
 	;; Problem: find out if character just read is a command char

lisp/scroll-bar.el

@@ -21,6 +21,8 @@
 ;;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+(require 'mouse)
+
 
 ;;;; Utilities.
 
@@ -43,7 +45,7 @@ that scrollbar position."
   "Set the window start according to where the scrollbar is dragged.
 EVENT should be a scrollbar click or drag event."
   (interactive "e")
-  (let* ((end-position (nth (1- (length event)) event))
+  (let* ((end-position (event-end event))
 	 (window (nth 0 end-position))
 	 (portion-whole (nth 2 end-position)))
     (save-excursion
@@ -60,7 +62,7 @@ EVENT should be a scrollbar click."
   (let ((old-selected-window (selected-window)))
     (unwind-protect
 	(progn
-	  (let* ((end-position (nth (1- (length event)) event))
+	  (let* ((end-position (event-end event))
 		 (window (nth 0 end-position))
 		 (portion-whole (nth 2 end-position)))
 	    (select-window window)
@@ -75,7 +77,7 @@ EVENT should be a scrollbar click."
   (let ((old-selected-window (selected-window)))
     (unwind-protect
 	(progn
-	  (let* ((end-position (nth (1- (length event)) event))
+	  (let* ((end-position (event-end event))
 		 (window (nth 0 end-position))
 		 (portion-whole (nth 2 end-position)))
 	    (select-window window)

lisp/simple.el

@@ -59,7 +59,10 @@ With arg N, insert N newlines."
 (defun quoted-insert (arg)
   "Read next input character and insert it.
 This is useful for inserting control characters.
-You may also type up to 3 octal digits, to insert a character with that code"
+You may also type up to 3 octal digits, to insert a character with that code.
+`quoted-insert' inserts the character even in overstrike mode; if you
+use overstrike as your normal editing mode, you can use this function
+to insert characters when necessary."
   (interactive "*p")
   (let ((char (read-quoted-char)))
     (while (> arg 0)
@@ -789,13 +792,7 @@ Repeating \\[universal-argument] without digits or minus sign
 	(progn
 	  (describe-arg value sign)
 	  (setq key (read-key-sequence nil t))))
-    (if (= (length key) 1)
-	;; Make sure self-insert-command finds the proper character;
-	;; unread the character and let the command loop process it.
-	(setq unread-command-event (aref key 0))
-      ;; We can't push back a longer string, so we'll emulate the
-      ;; command loop ourselves.
-      (command-execute (key-binding key)))))
+    (setq unread-command-events (append key '()))))
 
 (defun describe-arg (value sign)
   (cond ((numberp value)

lisp/subr.el

@@ -65,7 +65,7 @@ Optional argument PROMPT specifies a string to use to prompt the user."
 	     (and prompt (message (setq prompt
 					(format "%s %c" prompt char)))))
 	    ((> count 0)
-	     (setq unread-command-event char count 259))
+	     (setq unread-command-events (list char) count 259))
 	    (t (setq code char count 259))))
     (logand 255 code)))
 
@@ -222,6 +222,7 @@ Accept any number of arguments, but ignore them."
 (fset 'show-buffer 'set-window-buffer)
 (fset 'buffer-flush-undo 'buffer-disable-undo)
 (fset 'eval-current-buffer 'eval-buffer)
+(fset 'compiled-function-p 'byte-code-function-p)
 
 ; alternate names
 (fset 'string= 'string-equal)
@@ -229,7 +230,6 @@ Accept any number of arguments, but ignore them."
 (fset 'move-marker 'set-marker)
 (fset 'eql 'eq)
 (fset 'not 'null)
-(fset 'numberp 'integerp)