Initial revision

[bpt/emacs.git] / lisp / electric.el

diff --git a/lisp/electric.el b/lisp/electric.el
index eab8cd1..acc002a 100644 (file)
--- a/lisp/electric.el
+++ b/lisp/electric.el
@@ -1,12 +1,16 @@
-;; electric -- Window maker and Command loop for `electric' modes.
+;;; electric.el --- window maker and Command loop for `electric' modes.
+
 ;; Copyright (C) 1985, 1986 Free Software Foundation, Inc.
-;; Principal author K. Shane Hartman
+
+;; Author: K. Shane Hartman
+;; Maintainer: FSF
+;; Keywords: extensions
 
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -81,7 +85,7 @@
            cmd this-command)
       (if (or (prog1 quit-flag (setq quit-flag nil))
              (= last-input-char ?\C-g))
-         (progn (setq unread-command-char -1
+         (progn (setq unread-command-event nil
                       prefix-arg nil)
                 ;; If it wasn't cancelling a prefix character, then quit.
                 (if (or (= (length (this-command-keys)) 1)
@@ -94,9 +98,10 @@
       (if cmd
          (condition-case conditions
              (progn (command-execute cmd)
+                    (setq last-command this-command)
                     (if (or (prog1 quit-flag (setq quit-flag nil))
                             (= last-input-char ?\C-g))
-                        (progn (setq unread-command-char -1)
+                        (progn (setq unread-command-event nil)
                                (if (not inhibit-quit)
                                    (progn (ding)
                                           (message "Quit")
@@ -142,7 +147,7 @@
 ;;     Switch to buffer in the current window.
 ;;
 ;; Then if max-height is nil, and not all of the lines in the buffer
-;; are displayed, grab the whole screen.
+;; are displayed, grab the whole frame.
 ;;
 ;; Returns selected window on buffer positioned at point-min.
 
@@ -180,4 +185,6 @@
       (goto-char (point-min))
       win)))
 
-(provide 'electric)                           
\ No newline at end of file
+(provide 'electric)
+
+; electric.el ends here