Merge from emacs-23; up to 2010-06-12T08:59:37Z!albinus@detlef.

[bpt/emacs.git] / lisp / obsolete / iso-acc.el

diff --git a/lisp/obsolete/iso-acc.el b/lisp/obsolete/iso-acc.el
index 9a6c0d2..cb06091 100644 (file)
--- a/lisp/obsolete/iso-acc.el
+++ b/lisp/obsolete/iso-acc.el
@@ -1,11 +1,11 @@
 ;;; 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
 ;; Keywords: i18n
+;; Obsolete-since: 22.1
 
 ;; This file is part of GNU Emacs.
 
@@ -24,8 +24,6 @@
 
 ;;; Commentary:
 
-;; This file has been obsolete since Emacs 22.1.
-
 ;; Function `iso-accents-mode' activates a minor mode in which
 ;; typewriter "dead keys" are emulated.  The purpose of this emulation
 ;; is to provide a simple means for inserting accented characters
@@ -287,9 +285,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
-          (memq last-input-char iso-accents-enable))
+          (memq last-input-event iso-accents-enable))
       (iso-accents-compose prompt)
-    (vector last-input-char)))
+    (vector last-input-event)))
 
 
 ;; The iso-accents-compose function is called deep inside Emacs' read
@@ -302,7 +300,7 @@ the language you choose)."
 ;; 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
@@ -482,11 +480,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
-       (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)
 
-;; arch-tag: 149ff409-7c3e-4574-9b5d-ac038939c0a6
 ;;; iso-acc.el ends here