Add arch tagline

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

diff --git a/lisp/electric.el b/lisp/electric.el
index 2b95a1c..3adecb8 100644 (file)
--- a/lisp/electric.el
+++ b/lisp/electric.el
@@ -1,6 +1,7 @@
-;;; electric.el --- window maker and Command loop for `electric' modes.
+;;; electric.el --- window maker and Command loop for `electric' modes
 
-;; Copyright (C) 1985, 1986, 1995 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1986, 1995, 2001, 2002, 2003, 2004,
+;;   2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
 ;; Author: K. Shane Hartman
 ;; Maintainer: FSF
@@ -8,10 +9,10 @@
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; 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 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,9 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -55,8 +54,8 @@
                              &optional prompt inhibit-quit
                                        loop-function loop-state)
 
-  (let (cmd 
-        (err nil) 
+  (let (cmd
+        (err nil)
         (prompt-string prompt))
     (while t
       (if (not (or (stringp prompt) (eq prompt nil) (eq prompt 'noprompt)))
@@ -66,11 +65,13 @@
               (setq prompt-string nil)
             (setq prompt-string "->")))
       (setq cmd (read-key-sequence prompt-string))
-      (setq last-command-char (aref cmd (1- (length cmd)))
-           this-command (key-binding cmd)
+      (setq last-command-event (aref cmd (1- (length cmd)))
+           this-command (key-binding cmd t)
            cmd this-command)
+      ;; This makes universal-argument-other-key work.
+      (setq universal-argument-num-events 0)
       (if (or (prog1 quit-flag (setq quit-flag nil))
-             (eq last-input-char ?\C-g))
+             (eq last-input-event ?\C-g))
          (progn (setq unread-command-events nil
                       prefix-arg nil)
                 ;; If it wasn't cancelling a prefix character, then quit.
@@ -86,7 +87,7 @@
              (progn (command-execute cmd)
                     (setq last-command this-command)
                     (if (or (prog1 quit-flag (setq quit-flag nil))
-                            (eq last-input-char ?\C-g))
+                            (eq last-input-event ?\C-g))
                         (progn (setq unread-command-events nil)
                                (if (not inhibit-quit)
                                    (progn (ding)
@@ -121,7 +122,7 @@
   (ding)
   (throw return-tag nil))
 
-;; This function is like pop-to-buffer, sort of. 
+;; This function is like pop-to-buffer, sort of.
 ;; The algorithm is
 ;; If there is a window displaying buffer
 ;;     Select it
@@ -142,35 +143,23 @@
         (buf (get-buffer buffer))
         (one-window (one-window-p t))
         (pop-up-windows t)
-        (target-height)
-        (lines))
+        (pop-up-frames nil))
     (if (not buf)
        (error "Buffer %s does not exist" buffer)
-      (save-excursion
-       (set-buffer buf)
-       (setq lines (count-lines (point-min) (point-max)))
-       (setq target-height
-             (min (max (if max-height (min max-height (1+ lines)) (1+ lines))
-                       window-min-height)
-                  (save-window-excursion
-                    (delete-other-windows)
-                    (1- (window-height (selected-window)))))))
       (cond ((and (eq (window-buffer win) buf))
             (select-window win))
            (one-window
-            (goto-char (window-start win))
             (pop-to-buffer buffer)
-            (setq win (selected-window))
-            (enlarge-window (- target-height (window-height win))))
+            (setq win (selected-window)))
            (t
             (switch-to-buffer buf)))
-      (if (and (not max-height)
-              (> target-height (window-height (selected-window))))
-         (progn (goto-char (window-start win))
-                (enlarge-window (- target-height (window-height win)))))
+      ;; Don't shrink the window, but expand it if necessary.
       (goto-char (point-min))
+      (unless (= (point-max) (window-end win t))
+       (fit-window-to-buffer win max-height))
       win)))
 
 (provide 'electric)
 
+;; arch-tag: dae045eb-dc2d-4fb7-9f27-9cc2ce277be8
 ;;; electric.el ends here