HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* lisp/bookmark.el:
[bpt/emacs.git]
/
lisp
/
obsolete
/
iso-acc.el
diff --git
a/lisp/obsolete/iso-acc.el
b/lisp/obsolete/iso-acc.el
index
80fdb72
..
14b6a20
100644
(file)
--- a/
lisp/obsolete/iso-acc.el
+++ b/
lisp/obsolete/iso-acc.el
@@
-1,7
+1,6
@@
;;; iso-acc.el --- minor mode providing electric accent keys
;;; iso-acc.el --- minor mode providing electric accent keys
-;; Copyright (C) 1993, 1994, 1996, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1994, 1996, 2001-2011 Free Software Foundation, Inc.
;; Author: Johan Vromans
;; Maintainer: FSF
;; Author: Johan Vromans
;; Maintainer: FSF
@@
-9,10
+8,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 3, 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
+19,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:
@@
-289,9
+286,9
@@
the language you choose)."
"Modify the following character by adding an accent to it."
;; Pick up the accent character.
(if (and iso-accents-mode
"Modify the following character by adding an accent to it."
;; Pick up the accent character.
(if (and iso-accents-mode
- (memq last-input-
char
iso-accents-enable))
+ (memq last-input-
event
iso-accents-enable))
(iso-accents-compose prompt)
(iso-accents-compose prompt)
- (vector last-input-
char
)))
+ (vector last-input-
event
)))
;; The iso-accents-compose function is called deep inside Emacs' read
;; The iso-accents-compose function is called deep inside Emacs' read
@@
-304,7
+301,7
@@
the language you choose)."
;; window's display matrix.
(defun iso-accents-compose (prompt)
;; window's display matrix.
(defun iso-accents-compose (prompt)
- (let* ((first-char last-input-
char
)
+ (let* ((first-char last-input-
event
)
(list (assq first-char iso-accents-list))
;; Wait for the second key and look up the combination.
(second-char (if (or prompt
(list (assq first-char iso-accents-list))
;; Wait for the second key and look up the combination.
(second-char (if (or prompt
@@
-484,11
+481,9
@@
Noninteractively, this operates on text from START to END."
;; if it was in use in the previous buffer.
(defun iso-acc-minibuf-setup ()
(setq iso-accents-mode
;; if it was in use in the previous buffer.
(defun iso-acc-minibuf-setup ()
(setq iso-accents-mode
- (save-excursion
- (set-buffer (window-buffer minibuffer-scroll-window))
+ (with-current-buffer (window-buffer minibuffer-scroll-window)
iso-accents-mode)))
(add-hook 'minibuffer-setup-hook 'iso-acc-minibuf-setup)
iso-accents-mode)))
(add-hook 'minibuffer-setup-hook 'iso-acc-minibuf-setup)
-;; arch-tag: 149ff409-7c3e-4574-9b5d-ac038939c0a6
;;; iso-acc.el ends here
;;; iso-acc.el ends here