*** empty log message ***

8 files changed, 20 insertions, 14 deletions

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 75ea4f2134c..ad80ec2372b 100644
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -5,8 +5,6 @@
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
 ;; Keywords: news
 
-;; $Header: gnus.el,v 3.13 90/03/23 13:24:27 umerin Locked $
-
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 0e93b054ef0..0a0fc946be1 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -61,8 +61,6 @@
 
 ;;;====================================================================
 
-;;; $Header: /import/kaplan/kaplan/liberte/Isearch/RCS/isearch-mode.el,v 1.2 92/05/27 11:33:57 liberte Exp Locker: liberte $
-;;; $Log:       isearch-mode.el,v $
 ;;; Revision 1.2  92/05/27  11:33:57  liberte
 ;;; Several new commands and features have been added.  Emacs version
 ;;; 19 has a search ring, which is supported here.  Other fixes found
diff --git a/lisp/mhspool.el b/lisp/mhspool.el
index fba1b5ae839..81704e54be6 100644
--- a/lisp/mhspool.el
+++ b/lisp/mhspool.el
@@ -7,8 +7,6 @@
 ;; Maintainer: FSF
 ;; Keywords: mail, news
 
-;; $Header: mhspool.el,v 1.5 90/03/23 13:25:23 umerin Locked $
-
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/nnspool.el b/lisp/nnspool.el
index 5a5c3322976..b497a5c713a 100644
--- a/lisp/nnspool.el
+++ b/lisp/nnspool.el
@@ -6,8 +6,6 @@
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
 ;; Keywords: news
 
-;; $Header: nnspool.el,v 1.10 90/03/23 13:25:25 umerin Locked $
-
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/nntp.el b/lisp/nntp.el
index cac01653160..17565095c6a 100644
--- a/lisp/nntp.el
+++ b/lisp/nntp.el
@@ -6,8 +6,6 @@
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
 ;; Keywords: news
 
-;; $Header: nntp.el,v 3.10 90/03/23 13:25:27 umerin Locked $
-
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/progmodes/hideif.el b/lisp/progmodes/hideif.el
index 2bedcef8cca..36587129891 100644
--- a/lisp/progmodes/hideif.el
+++ b/lisp/progmodes/hideif.el
@@ -5,8 +5,6 @@
 ;; Author: Dan LaLiberte <liberte@a.cs.uiuc.edu>
 ;; Keywords: c
 
-;;; $Header: hide-ifdef-mode.el,v 1.7 88/02/16 03:12:58 liberte Exp $
-
 ;;; Commentary:
 
 ;;; Written by Brian Marick, at Gould, Computer Systems Division, Urbana IL.
@@ -94,7 +92,6 @@
 
 ;;; Change Log:
 ;;;
-;;; $Log:       hide-ifdef-mode.el,v $
 ;;; Revision 1.7  88/02/16  03:12:58  liberte
 ;;; Fixed comments and doc strings.
 ;;; Added optional prefix arg for ifdef motion commands.
diff --git a/src/fileio.c b/src/fileio.c
index 59a7c9eeec0..144ebe00ef2 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1364,6 +1364,13 @@ duplicates what `expand-file-name' does.")
 #endif /* not VMS */
 }
 
+/* A slightly faster and more convenient way to get
+   (directory-file-name (expand-file-name FOO)).  The return value may
+   have had its last character zapped with a '\0' character, meaning
+   that it is acceptable to system calls, but not to other lisp
+   functions.  Callers should make sure that the return value doesn't
+   escape.  */
+
 Lisp_Object
 expand_and_dir_to_file (filename, defdir)
      Lisp_Object filename, defdir;
diff --git a/src/keyboard.c b/src/keyboard.c
index 442a4f318ea..ceab36647fd 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -2697,8 +2697,20 @@ read_key_sequence (keybuf, bufsize, prompt)
           /* Scan from fkey_end until we find a bound suffix.  */
           while (fkey_end < t)
             {
+              /* Look up meta-characters by prefixing them
+                 with meta_prefix_char.  I hate this.  */
+              if (keybuf[fkey_end++] & 0x80)
+                fkey_next =
+                  get_keymap_1 (get_keyelt
+                                (access_keymap (fkey_map, meta_prefix_char)),
+                                0);
+              else
+                fkey_next = fkey_map;
+
               fkey_next =
-                get_keyelt (access_keymap (fkey_map, keybuf[fkey_end++]));
+                get_keyelt (access_keymap
+                            (fkey_next, keybuf[(fkey_end++) & 0x7f]));
+
               /* If keybuf[fkey_start..fkey_next] is bound in the
                  function key map and it's a suffix of the current
                  sequence (i.e. fkey_next == t), replace it with