HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(url-generic-parse-url): Bind deactivate-mark.
[bpt/emacs.git]
/
lisp
/
electric.el
diff --git
a/lisp/electric.el
b/lisp/electric.el
index
f9699b2
..
3adecb8
100644
(file)
--- a/
lisp/electric.el
+++ b/
lisp/electric.el
@@
-1,7
+1,7
@@
;;; electric.el --- window maker and Command loop for `electric' modes
;; Copyright (C) 1985, 1986, 1995, 2001, 2002, 2003, 2004,
;;; electric.el --- window maker and Command loop for `electric' modes
;; Copyright (C) 1985, 1986, 1995, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007 Free Software Foundation, Inc.
+;; 2005, 2006, 2007
, 2008, 2009
Free Software Foundation, Inc.
;; Author: K. Shane Hartman
;; Maintainer: FSF
;; Author: K. Shane Hartman
;; Maintainer: FSF
@@
-9,10
+9,10
@@
;; This file is part of GNU Emacs.
;; 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
;; 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
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-20,9
+20,7
@@
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; 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., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;;; Commentary:
@@
-67,13
+65,13
@@
(setq prompt-string nil)
(setq prompt-string "->")))
(setq cmd (read-key-sequence prompt-string))
(setq prompt-string nil)
(setq prompt-string "->")))
(setq cmd (read-key-sequence prompt-string))
- (setq last-command-
char
(aref cmd (1- (length 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))
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.
(progn (setq unread-command-events nil
prefix-arg nil)
;; If it wasn't cancelling a prefix character, then quit.
@@
-89,7
+87,7
@@
(progn (command-execute cmd)
(setq last-command this-command)
(if (or (prog1 quit-flag (setq quit-flag nil))
(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)
(progn (setq unread-command-events nil)
(if (not inhibit-quit)
(progn (ding)
@@
-155,11
+153,13
@@
(setq win (selected-window)))
(t
(switch-to-buffer buf)))
(setq win (selected-window)))
(t
(switch-to-buffer buf)))
- (fit-window-to-buffer win max-height)
+ ;; Don't shrink the window, but expand it if necessary.
(goto-char (point-min))
(goto-char (point-min))
+ (unless (= (point-max) (window-end win t))
+ (fit-window-to-buffer win max-height))
win)))
(provide 'electric)
win)))
(provide 'electric)
-;;
;
arch-tag: dae045eb-dc2d-4fb7-9f27-9cc2ce277be8
+;; arch-tag: dae045eb-dc2d-4fb7-9f27-9cc2ce277be8
;;; electric.el ends here
;;; electric.el ends here