Merge from origin/emacs-25

cf9e174 Document the optional zlib library in MS-Windows builds
84eb144 ; * admin/notes/unicode: Mention BidiCharacterTest.txt.
73c67dd Fix tagging of DEFUN by etags
ea1960b Avoid resetting track-mouse by mouse clicks
505fef3 Improve nt/README.W32 instructions
1229cc4 Document that desktop file overrides frame parameters
f0eb70d ; Update ChangeLog.2 and ldef-boot.el for Emacs 25.1 release

# Conflicts:
#	ChangeLog.2
#	admin/notes/unicode
#	lisp/ldefs-boot.el

17 files changed, 581 insertions, 40 deletions

diff --git a/ChangeLog.2 b/ChangeLog.2
index 4e792955e7b..3f3d558b561 100644
--- a/ChangeLog.2
+++ b/ChangeLog.2
@@ -1,3 +1,110 @@
+2016-09-26  Nicolas Petton  <nicolas@petton.fr>
+
+        * Version 25.1 released.
+
+2016-09-26  Nicolas Petton  <nicolas@petton.fr>
+
+        * etc/AUTHORS: Regenerate the AUTHORS file
+
+2016-09-26  Eli Zaretskii  <eliz@gnu.org>
+
+        Update admin/authors.el
+
+        * admin/authors.el (authors-fixed-entries): Add an entry for Bob
+        Weiner.
+
+2016-09-26  Eli Zaretskii  <eliz@gnu.org>
+
+        Update Antinews in ELisp manual
+
+        * doc/lispref/anti.texi (Antinews): Update for Emacs 25.1.
+        * doc/lispref/elisp.texi (Top): Update the main menu entry for
+        Antinews.
+
+2016-09-26  Noam Postavsky  <npostavs@gmail.com>
+
+        Fix comments on window height macros
+
+        * src/window.h (WINDOW_MODE_LINE_HEIGHT, WINDOW_HEADER_LINE_HEIGHT): Fix
+        confusing claim that "height is in pixels and in lines"; in fact it's in
+        pixels.
+
+2016-09-26  Toke Høiland-Jørgensen  <toke@toke.dk>  (tiny change)
+
+        Fix 'url-http-create-request' when cookies are used
+
+        * lisp/url/url-http.el (url-http-create-request): Make sure the
+        cookie headers are a unibyte string.  For the details, see
+        http://lists.gnu.org/archive/html/emacs-devel/2016-09/msg00202.html.
+
+2016-09-26  Martin Rudalics  <rudalics@gmx.at>
+
+        Fix cross reference in frames.texi
+
+        * doc/lispref/frames.texi (Minibuffers and Frames): Fix cross
+        reference.
+
+2016-09-26  immerrr  <immerrr@gmail.com>
+
+        Fix regexp-opt documentation (bug #17862)
+
+        * lisp/emacs-lisp/regexp-opt.el (regexp-opt):
+        * doc/lispref/searching.texi (Regexp Functions): Update PAREN doc.
+
+2016-09-26  Nicolas Richard  <youngfrog@members.fsf.org>
+
+        * lisp/emacs-lisp/gv.el (gv-ref): Fix example of PLACE in docstring.
+
+2016-09-26  Noam Postavsky  <npostavs@gmail.com>
+
+        Fix tags-query-replace docstring
+
+        * lisp/progmodes/etags.el (tags-query-replace): Remove incorrect info
+        regarding non-existent parameters.
+
+2016-09-26  Eli Zaretskii  <eliz@gnu.org>
+
+        Clarify documentation of precision in format specs
+
+        * doc/lispref/strings.texi (Formatting Strings): Be less
+        definitive wrt what precision means in format specs other than
+        floating-point, %s and %S.  (Bug#24314)
+
+2016-09-26  Eli Zaretskii  <eliz@gnu.org>
+
+        Improve and clarify documentation of subprocesses
+
+        * doc/lispref/processes.texi (Subprocess Creation, Shell Arguments):
+        Mention 'make-process' rather than 'start-process'.  Update wrt
+        standard destinations of standard output/error streams and due to
+        different formats of arguments accepted by 'make-process'.
+        (Processes): Mention process objects that represent connections.
+        (Synchronous Processes): Minor clarifications.
+        (Asynchronous Processes): Describe 'make-process' and
+        'make-pipe-process' before 'start-process'.  Update and expand the
+        documentation.
+        (Deleting Processes, Process Information, Input to Processes)
+        (Signals to Processes, Query Before Exit, Network): Update and
+        expand the documentation, especially wrt process objects that
+        represent connections.
+        (Output from Processes): Mention the possibility of separating
+        stderr via 'make-process'.
+        (Filter Functions): Mention that stderr by default arrives at the
+        filter function together with stdout.  (Bug#24287)
+
+        * src/process.c (Fprocess_id, Fprocess_command)
+        (Fprocess_contact, Fprocess_type, Fstop_process): Doc fixes for
+        process objects that represent connections.
+
+2016-09-26  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * etc/PROBLEMS: Mention gnutls-cli 3.5.3 (Bug#24247).
+
+2016-09-26  Nicolas Petton  <nicolas@petton.fr>
+
+        * etc/AUTHORS: Update the AUTHORS file
+
+2016-09-26  Philipp Stephani  <phst@google.com>
 2016-08-22  Philipp Stephani  <phst@google.com>
 
         Some assorted documentation clarifications
@@ -37627,6 +37734,7 @@
 
 This file records repository revisions from
 commit 9d56a21e6a696ad19ac65c4b405aeca44785884a (exclusive) to
+2016-09-26c9cef49b0fceb3c5e904837ea5675fe4306ac (inclusive).
 2016-08-22bb813cfea53e4162409f2adc0a793ab301894 (inclusive).
 2016-08-05faead6df626b3737c10f98e9c4964232aa6b9 (inclusive).
 2016-06-19d77d8dbd5b051bb681bacaee4a6faffbbdde9 (inclusive).
diff --git a/admin/notes/unicode b/admin/notes/unicode
index 65df2166f28..c8a956d620a 100644
--- a/admin/notes/unicode
+++ b/admin/notes/unicode
@@ -15,11 +15,12 @@ Emacs uses the following files from the Unicode Character Database
   . BidiBrackets.txt
   . IVD_Sequences.txt
   . NormalizationTest.txt
+  . BidiCharacterTest.txt
 
-First, these files need to be copied into admin/unidata/, and then
-Emacs should be rebuilt for them to take effect.  Rebuilding Emacs
-updates several derived files elsewhere in the Emacs source tree,
-mainly in lisp/international/.
+First, the first 6 files need to be copied into admin/unidata/, and
+then Emacs should be rebuilt for them to take effect.  Rebuilding
+Emacs updates several derived files elsewhere in the Emacs source
+tree, mainly in lisp/international/.
 
 When Emacs is rebuilt for the first time after importing the new
 files, pay attention to any warning or error messages.  In particular,
@@ -49,7 +50,7 @@ might need to be updated because it knows about used and unused ranges
 of Unicode codepoints, which a new release of the Unicode Standard
 could change.
 
-Finally, test normalization functions against NormalizationTests.txt,
+Next, test normalization functions against NormalizationTests.txt,
 in the test/ directory run:
 
   make lisp/international/ucs-normalize-tests
@@ -57,6 +58,10 @@ in the test/ directory run:
 See commentary in test/lisp/international/ucs-normalize-tests.el
 regarding failing lines.
 
+The file BidiCharacterTest.txt should be copied to the test suite, and
+if its format has changed, the file biditest.el there should be
+modified to follow suit.
+
 Problems, fixmes and other unicode-related issues
 -------------------------------------------------------------
 
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index 03172b62cf5..082de3796c1 100644
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -925,6 +925,14 @@ the initial frame, by customizing the variable
 specify colors and fonts don't affect menus and the menu bar, since
 those are drawn by the toolkit and not directly by Emacs.
 
+  Note that if you are using the desktop library to save and restore
+your sessions, the frames to be restored are recorded in the desktop
+file, together with their parameters.  When these frames are restored,
+the recorded parameters take precedence over the frame parameters
+specified by @code{default-frame-alist} and @code{initial-frame-alist}
+in your init file.  @xref{Saving Emacs Sessions}, for how to avoid
+that.
+
 @node Scroll Bars
 @section Scroll Bars
 @cindex Scroll Bar mode
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index 502ccad1382..f38a797b36c 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -2371,6 +2371,17 @@ To disable this, set @code{desktop-restore-frames} to @code{nil}.
 (See that variable's documentation for some related options
 that you can customize to fine-tune this behavior.)
 
+@vindex frameset-filter-alist
+   When the desktop restores the frame and window configuration, it
+uses the recorded values of frame parameters, disregarding any
+settings for those parameters you have in your init file (@pxref{Init
+File}).  This means that frame parameters such as fonts and faces for
+the restored frames will come from the desktop file, where they were
+saved when you exited your previous Emacs session; any settings for
+those parameters in your init file will be ignored.  To disable this,
+customize the value of @code{frameset-filter-alist} to filter out the
+frame parameters you don't want to be restored.
+
 @findex desktop-save
 @vindex desktop-save-mode
   You can save the desktop manually with the command @kbd{M-x
diff --git a/etc/HISTORY b/etc/HISTORY
index 810702622fa..43790bb92bc 100644
--- a/etc/HISTORY
+++ b/etc/HISTORY
@@ -207,6 +207,8 @@ GNU Emacs 24.4 (2014-10-20) emacs-24.4
 
 GNU Emacs 24.5 (2015-04-10) emacs-24.5
 
+GNU Emacs 25.1 (2016-09-16) emacs-25.1
+
 
 ----------------------------------------------------------------------
 This file is part of GNU Emacs.
diff --git a/lib-src/etags.c b/lib-src/etags.c
index 3620b0fd321..a81b46d2e07 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -3595,13 +3595,27 @@ C_entries (int c_ext, FILE *inf)
                               int off = tokoff;
                               int len = toklen;
 
-                              /* Rewrite the tag so that emacs lisp DEFUNs
-                                 can be found by their elisp name */
                               if (defun)
                                 {
                                   off += 1;
                                   len -= 1;
+
+                                  /* First, tag it as its C name */
+                                  linebuffer_setlen (&token_name, toklen);
+                                  memcpy (token_name.buffer,
+                                          newlb.buffer + tokoff, toklen);
+                                  token_name.buffer[toklen] = '\0';
+                                  token.named = true;
+                                  token.lineno = lineno;
+                                  token.offset = tokoff;
+                                  token.length = toklen;
+                                  token.line = newlb.buffer;
+                                  token.linepos = newlinepos;
+                                  token.valid = true;
+                                  make_C_tag (funorvar);
                                 }
+                              /* Rewrite the tag so that emacs lisp DEFUNs
+                                 can be found also by their elisp name */
                               linebuffer_setlen (&token_name, len);
                               memcpy (token_name.buffer,
                                       newlb.buffer + off, len);
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 2a9a62feae8..8c83f5e8f97 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -493,7 +493,8 @@ must be one of the symbols `header', `mode', or `vertical'."
                                                 (window-pixel-height window)))))
                   (setq dragged t)
                   (adjust-window-trailing-edge window growth nil t))
-                (setq last-position position))))))
+                (setq last-position position)))))
+           (old-track-mouse track-mouse))
       ;; Start tracking.  The special value 'dragging' signals the
       ;; display engine to freeze the mouse pointer shape for as long
       ;; as we drag.
@@ -526,7 +527,7 @@ must be one of the symbols `header', `mode', or `vertical'."
                (define-key map [right-divider] map)
                (define-key map [bottom-divider] map)
                map)
-             t (lambda () (setq track-mouse nil)))))))
+             t (lambda () (setq track-mouse old-track-mouse)))))))
 
 (defun mouse-drag-mode-line (start-event)
   "Change the height of a window by dragging on the mode line."
@@ -853,7 +854,8 @@ The region will be defined with mark and point."
          (click-count (1- (event-click-count start-event)))
          ;; Suppress automatic hscrolling, because that is a nuisance
          ;; when setting point near the right fringe (but see below).
-         (auto-hscroll-mode-saved auto-hscroll-mode))
+         (auto-hscroll-mode-saved auto-hscroll-mode)
+         (old-track-mouse track-mouse))
 
     (setq mouse-selection-click-count click-count)
     ;; In case the down click is in the middle of some intangible text,
@@ -905,7 +907,7 @@ The region will be defined with mark and point."
                                       nil start-point))))))))
        map)
      t (lambda ()
-         (setq track-mouse nil)
+         (setq track-mouse old-track-mouse)
          (setq auto-hscroll-mode auto-hscroll-mode-saved)
           (deactivate-mark)
          (pop-mark)))))
diff --git a/nt/INSTALL b/nt/INSTALL
index 99a2f3988f9..fff0eb6f8d9 100644
--- a/nt/INSTALL
+++ b/nt/INSTALL
@@ -784,6 +784,15 @@ build will run on Windows 9X and newer systems).
   You need the libiconv-X.Y.Z-N-mingw32-dev.tar.lzma tarball from that
   site.
 
+* Optional support for decompressing text
+
+  Emacs can decompress text if compiled with the zlib library.
+  Prebuilt binaries of zlib DLL (for 32-bit builds of Emacs) are
+  available from the ezwinports site; see above for the URL.
+
+  (This library is also a prerequisite for several image libraries, so
+  you may already have it; look for zlib1.dll or libz-1.dll.)
+
 
 This file is part of GNU Emacs.
 
diff --git a/nt/INSTALL.W64 b/nt/INSTALL.W64
index e109c6f0f23..40670a6a878 100644
--- a/nt/INSTALL.W64
+++ b/nt/INSTALL.W64
@@ -64,13 +64,15 @@ packages (you can copy and paste it into the shell with Shift + Insert):
   mingw-w64-x86_64-libjpeg-turbo \
   mingw-w64-x86_64-librsvg \
   mingw-w64-x86_64-libxml2 \
-  mingw-w64-x86_64-gnutls
+  mingw-w64-x86_64-gnutls \
+  mingw-w64-x86_64-zlib
 
 The packages include the base developer tools (autoconf, automake, grep, make,
 etc.), the compiler toolchain (gcc, gdb, etc.), several image libraries, an
-XML library, and the GnuTLS (transport layer security) library.  Only the
-first three packages are required (base-devel, toolchain, xpm-nox); the rest
-are optional.
+XML library, the GnuTLS (transport layer security) library, and zlib for
+decompressing text.  Only the first three packages are required (base-devel,
+toolchain, xpm-nox); the rest are optional.  You can select only part of the
+libraries if you don't need them all.
 
 You now have a complete build environment for Emacs.
 
diff --git a/nt/README.W32 b/nt/README.W32
index 71a0738969a..a061596da55 100644
--- a/nt/README.W32
+++ b/nt/README.W32
@@ -139,19 +139,21 @@ See the end of the file for license conditions.
   libraries.  These libraries are all available on the following sites:
 
   1. http://sourceforge.net/projects/ezwinports/files/
-     -- leaner, more up-to-date builds, only for 32-bit Emacs
-  2. http://www.gtk.org/download/win32.php
-     http://www.gtk.org/download/win64.php
-     -- the GTK project site; offers much fatter builds, but includes
-        64-bit DLLs (from the 2nd URL)
-  3. GnuWin32 project -- very old builds, not recommended
+     -- up-to-date builds, self-contained archives, only for 32-bit Emacs
+  2. The MSYS2 project -- for 64-bit Emacs:
+     http://msys2.github.io/
+     https://sourceforge.net/projects/msys2/files/REPOS/MINGW/x86_64/
+  3. GnuWin32 project -- very old 32-bit builds, not recommended
 
   The libraries to download are mentioned below.  Some libraries
   depend on others that need to be downloaded separately from the same
   site; please consult the download instructions on each site for the
   details.  In general, the ezwinports site mentioned above has all
   the dependencies bundled in the same zip archive, so installing from
-  there is the easiest.
+  there is the easiest.  For MSYS2 builds, we recommend that you
+  install and use the 'pacman' utility (available from the MSYS2
+  site), see the instructions below -- it will automatically install
+  all the dependencies.
 
   Emacs will find these libraries if the directory they are installed
   in is on the PATH or in the same directory where you have emacs.exe.
@@ -210,6 +212,69 @@ See the end of the file for license conditions.
   You can get pre-built binaries (including any required DLL and the
   header files) at http://sourceforge.net/projects/ezwinports/files/.
 
+
+* zlib support
+
+  zlib provides support for decompressing text, which is necessary for
+  the zlib-decompress-region primitive.
+
+  Prebuilt binaries of zlib DLL (for 32-bit builds of Emacs) are
+  available from the ezwinports site; see above for the URL.  For the
+  64-bit DLL, see the instructions below for installing from MSYS2
+  site.
+
+  (This library is also a prerequisite for several image libraries, so
+  you may already have it; look for zlib1.dll or libz-1.dll.)
+
+* Installing 64-bit optional libraries from the MSYS2 site
+
+  We recommend that you use the 'pacman' utility to download the
+  libraries you need and all of their dependencies.  If you don't have
+  'pacman' installed, proceed as follows:
+
+  . Install the MSYS2 64-bit (x86_64) installer, named
+    msys2-x86_64-YYYYMMDD.exe (where "YYYYMMDD" is the release date,
+    like 20160205) from http://msys2.github.io/.
+
+  . Run the installer, select the installation directory, make sure
+    "Run MSYS2 now" checkbox is checked, and click "Finish".  A Bash
+    window will open.
+
+  . Type into the Bash window the following command:
+
+    pacman -Sy pacman
+
+    When asked whether to proceed with installation, type Y.
+
+  To install the optional libraries, start the MSYS2 Bash window and
+  type the following command:
+
+    pacman -S PACKAGES
+
+  where PACKAGES is the list of packages you want to install.  The
+  full list is as follows:
+
+   mingw-w64-x86_64-xpm-nox mingw-w64-x86_64-libtiff mingw-w64-x86_64-giflib
+   mingw-w64-x86_64-libpng mingw-w64-x86_64-libjpeg-turbo
+   mingw-w64-x86_64-librsvg mingw-w64-x86_64-libxml2 mingw-w64-x86_64-gnutls
+   mingw-w64-x86_64-zlib
+
+  You can type any subset of this list.  Once again, when asked
+  whether to proceed with installation, answer Y.
+
+  Alternatively, you could install the packages manually from this
+  page:
+
+   https://sourceforge.net/projects/msys2/files/REPOS/MINGW/x86_64/
+
+  However, the packages there are not self-contained, so you will need
+  to download all their dependencies as well.
+
+  After the installation, if you will be installing Emacs in a
+  directory different from where the DLLs were installed, we recommend
+  to add the directory with DLLs to your PATH, so that Emacs will be
+  able to find those DLLs.
+
 * Uninstalling Emacs
 
   If you should need to uninstall Emacs, simply delete all the files
diff --git a/test/manual/etags/CTAGS.good b/test/manual/etags/CTAGS.good
index 6ee8bec9c51..e6529890b8d 100644
--- a/test/manual/etags/CTAGS.good
+++ b/test/manual/etags/CTAGS.good
@@ -591,22 +591,67 @@ FUNCTION_KEY_OFFSET	c-src/emacs/src/keyboard.c	4766
 FUNCTION_KEY_OFFSET     c-src/emacs/src/keyboard.c      5061
 F_getit c-src/etags.c   /^F_getit (FILE *inf)$/
 F_takeprec      c-src/etags.c   /^F_takeprec (void)$/
+Fabbrev_expansion       c-src/abbrev.c  /^DEFUN ("abbrev-expansion", Fabbrev_expansion, Sabb/
+Fabbrev_symbol  c-src/abbrev.c  /^DEFUN ("abbrev-symbol", Fabbrev_symbol, Sabbrev_sy/
+Fabort_recursive_edit   c-src/emacs/src/keyboard.c      /^DEFUN ("abort-recursive-edit", Fabort_recursive_ed/
 Fails_t c-src/h.h       5
+Fclear_abbrev_table     c-src/abbrev.c  /^DEFUN ("clear-abbrev-table", Fclear_abbrev_table, /
+Fclear_this_command_keys        c-src/emacs/src/keyboard.c      /^DEFUN ("clear-this-command-keys", Fclear_this_comm/
+Fcommand_error_default_function c-src/emacs/src/keyboard.c      /^DEFUN ("command-error-default-function", Fcommand_/
+Fcurrent_idle_time      c-src/emacs/src/keyboard.c      /^DEFUN ("current-idle-time", Fcurrent_idle_time, Sc/
+Fcurrent_input_mode     c-src/emacs/src/keyboard.c      /^DEFUN ("current-input-mode", Fcurrent_input_mode, /
+Fdefine_abbrev  c-src/abbrev.c  /^DEFUN ("define-abbrev", Fdefine_abbrev, Sdefine_ab/
+Fdefine_abbrev_table    c-src/abbrev.c  /^DEFUN ("define-abbrev-table", Fdefine_abbrev_table/
+Fdefine_global_abbrev   c-src/abbrev.c  /^DEFUN ("define-global-abbrev", Fdefine_global_abbr/
+Fdefine_mode_abbrev     c-src/abbrev.c  /^DEFUN ("define-mode-abbrev", Fdefine_mode_abbrev, /
+Fdiscard_input  c-src/emacs/src/keyboard.c      /^DEFUN ("discard-input", Fdiscard_input, Sdiscard_i/
+Fevent_convert_list     c-src/emacs/src/keyboard.c      /^DEFUN ("event-convert-list", Fevent_convert_list, /
+Fevent_symbol_parse_modifiers   c-src/emacs/src/keyboard.c      /^DEFUN ("internal-event-symbol-parse-modifiers", Fe/
+Fexit_recursive_edit    c-src/emacs/src/keyboard.c      /^DEFUN ("exit-recursive-edit", Fexit_recursive_edit/
+Fexpand_abbrev  c-src/abbrev.c  /^DEFUN ("expand-abbrev", Fexpand_abbrev, Sexpand_ab/
 Finalize_Cond/p ada-src/2ataspri.adb    /^   procedure Finalize_Cond (Cond : in out Conditio/
 Finalize_Cond/p ada-src/2ataspri.ads    /^   procedure Finalize_Cond (Cond : in out Conditio/
 Finalize_Lock/p ada-src/2ataspri.adb    /^   procedure Finalize_Lock (L : in out Lock) is$/
 Finalize_Lock/p ada-src/2ataspri.ads    /^   procedure Finalize_Lock (L : in out Lock);$/
 Finalize_TAS_Cell/p     ada-src/2ataspri.adb    /^   procedure Finalize_TAS_Cell (Cell : in out TAS_/
 Finalize_TAS_Cell/p     ada-src/2ataspri.ads    /^   procedure Finalize_TAS_Cell   (Cell : in out TA/
+Finput_pending_p        c-src/emacs/src/keyboard.c      /^DEFUN ("input-pending-p", Finput_pending_p, Sinput/
+Finsert_abbrev_table_description        c-src/abbrev.c  /^DEFUN ("insert-abbrev-table-description", Finsert_/
 First100Chars   pas-src/common.pas      /^procedure First100Chars; (*($/
+Fmake_abbrev_table      c-src/abbrev.c  /^DEFUN ("make-abbrev-table", Fmake_abbrev_table, Sm/
 Foo     perl-src/kai-test.pl    /^package Foo;$/
 Foo::Bar        perl-src/kai-test.pl    /^package Foo::Bar;$/
+Fopen_dribble_file      c-src/emacs/src/keyboard.c      /^DEFUN ("open-dribble-file", Fopen_dribble_file, So/
 Forth_help      c-src/etags.c   573
 Forth_suffixes  c-src/etags.c   571
 Forth_words     c-src/etags.c   /^Forth_words (FILE *inf)$/
 Fortran_functions       c-src/etags.c   /^Fortran_functions (FILE *inf)$/
 Fortran_help    c-src/etags.c   579
 Fortran_suffixes        c-src/etags.c   577
+Fposn_at_point  c-src/emacs/src/keyboard.c      /^DEFUN ("posn-at-point", Fposn_at_point, Sposn_at_p/
+Fposn_at_x_y    c-src/emacs/src/keyboard.c      /^DEFUN ("posn-at-x-y", Fposn_at_x_y, Sposn_at_x_y, /
+Fread_key_sequence      c-src/emacs/src/keyboard.c      /^DEFUN ("read-key-sequence", Fread_key_sequence, Sr/
+Fread_key_sequence_vector       c-src/emacs/src/keyboard.c      /^DEFUN ("read-key-sequence-vector", Fread_key_seque/
+Frecent_keys    c-src/emacs/src/keyboard.c      /^DEFUN ("recent-keys", Frecent_keys, Srecent_keys, /
+Frecursion_depth        c-src/emacs/src/keyboard.c      /^DEFUN ("recursion-depth", Frecursion_depth, Srecur/
+Frecursive_edit c-src/emacs/src/keyboard.c      /^DEFUN ("recursive-edit", Frecursive_edit, Srecursi/
+Freset_this_command_lengths     c-src/emacs/src/keyboard.c      /^DEFUN ("reset-this-command-lengths", Freset_this_c/
+Fset_input_interrupt_mode       c-src/emacs/src/keyboard.c      /^DEFUN ("set-input-interrupt-mode", Fset_input_inte/
+Fset_input_meta_mode    c-src/emacs/src/keyboard.c      /^DEFUN ("set-input-meta-mode", Fset_input_meta_mode/
+Fset_input_mode c-src/emacs/src/keyboard.c      /^DEFUN ("set-input-mode", Fset_input_mode, Sset_inp/
+Fset_output_flow_control        c-src/emacs/src/keyboard.c      /^DEFUN ("set-output-flow-control", Fset_output_flow/
+Fset_quit_char  c-src/emacs/src/keyboard.c      /^DEFUN ("set-quit-char", Fset_quit_char, Sset_quit_/
+Fsuspend_emacs  c-src/emacs/src/keyboard.c      /^DEFUN ("suspend-emacs", Fsuspend_emacs, Ssuspend_e/
+Fthis_command_keys      c-src/emacs/src/keyboard.c      /^DEFUN ("this-command-keys", Fthis_command_keys, St/
+Fthis_command_keys_vector       c-src/emacs/src/keyboard.c      /^DEFUN ("this-command-keys-vector", Fthis_command_k/
+Fthis_single_command_keys       c-src/emacs/src/keyboard.c      /^DEFUN ("this-single-command-keys", Fthis_single_co/
+Fthis_single_command_raw_keys   c-src/emacs/src/keyboard.c      /^DEFUN ("this-single-command-raw-keys", Fthis_singl/
+Ftop_level      c-src/emacs/src/keyboard.c      /^DEFUN ("top-level", Ftop_level, Stop_level, 0, 0, /
+Ftrack_mouse    c-src/emacs/src/keyboard.c      /^DEFUN ("internal--track-mouse", Ftrack_mouse, Stra/
+Funexpand_abbrev        c-src/abbrev.c  /^DEFUN ("unexpand-abbrev", Funexpand_abbrev, Sunexp/
+Fx_get_selection_internal       c.c     /^DEFUN ("x-get-selection-internal", Fx_get_selectio/
+Fx_get_selection_internal       c.c     /^       Fx_get_selection_internal, Sx_get_selection/
+Fy_get_selection_internal       c.c     /^      Fy_get_selection_internal, Sy_get_selection_/
 GCALIGNED       c-src/emacs/src/lisp.h  288
 GCALIGNED       c-src/emacs/src/lisp.h  290
 GCALIGNMENT     c-src/emacs/src/lisp.h  243
diff --git a/test/manual/etags/ETAGS.good_1 b/test/manual/etags/ETAGS.good_1
index 2f1a9db81f7..374692c5816 100644
--- a/test/manual/etags/ETAGS.good_1
+++ b/test/manual/etags/ETAGS.good_1
@@ -175,7 +175,7 @@ package body Truc.Bidule Truc.Bidule/b
138,2153
   protected body Bidule Bidule/b
139,2181
   protected body Machin_T Machin_T/b
146,2281
 
-c-src/abbrev.c,1432
+c-src/abbrev.c,2072
 Lisp_Object Vabbrev_table_name_list;43,1424
 Lisp_Object Vglobal_abbrev_table;48,1569
 Lisp_Object Vfundamental_mode_abbrev_table;52,1680
@@ -188,18 +188,29 @@ Lisp_Object Vlast_abbrev_text;75,2319
 int last_abbrev_point;79,2409
 Lisp_Object Vpre_abbrev_expand_hook,83,2482
 Lisp_Object Vpre_abbrev_expand_hook, Qpre_abbrev_expand_hook;83,2482
+DEFUN ("make-abbrev-table", Fmake_abbrev_table,85,2546
 DEFUN ("make-abbrev-table", Fmake_abbrev_table,make-abbrev-table
85,2546
+DEFUN ("clear-abbrev-table", Fclear_abbrev_table,92,2738
 DEFUN ("clear-abbrev-table", Fclear_abbrev_table,clear-abbrev-table
92,2738
+DEFUN ("define-abbrev", Fdefine_abbrev,107,3119
 DEFUN ("define-abbrev", Fdefine_abbrev,define-abbrev
107,3119
+DEFUN ("define-global-abbrev", Fdefine_global_abbrev,149,4438
 DEFUN ("define-global-abbrev", Fdefine_global_abbrev,define-global-abbrev
149,4438
+DEFUN ("define-mode-abbrev", Fdefine_mode_abbrev,160,4809
 DEFUN ("define-mode-abbrev", Fdefine_mode_abbrev,define-mode-abbrev
160,4809
+DEFUN ("abbrev-symbol", Fabbrev_symbol,174,5277
 DEFUN ("abbrev-symbol", Fabbrev_symbol,abbrev-symbol
174,5277
+DEFUN ("abbrev-expansion", Fabbrev_expansion,202,6241
 DEFUN ("abbrev-expansion", Fabbrev_expansion,abbrev-expansion
202,6241
+DEFUN ("expand-abbrev", Fexpand_abbrev,218,6756
 DEFUN ("expand-abbrev", Fexpand_abbrev,expand-abbrev
218,6756
+DEFUN ("unexpand-abbrev", Funexpand_abbrev,389,11677
 DEFUN ("unexpand-abbrev", Funexpand_abbrev,unexpand-abbrev
389,11677
 write_abbrev 426,12884
 describe_abbrev 445,13319
+DEFUN ("insert-abbrev-table-description", Finsert_abbrev_table_description,466,13834
 DEFUN ("insert-abbrev-table-description", Finsert_abbrev_table_description,insert-abbrev-table-description
466,13834
+DEFUN ("define-abbrev-table", Fdefine_abbrev_table,506,14990
 DEFUN ("define-abbrev-table", Fdefine_abbrev_table,define-abbrev-table
506,14990
 syms_of_abbrev 540,16067
 
@@ -828,7 +839,7 @@ typedef enum { RECC_ERROR 609,22953
 } re_wctype_t;618,23260
 typedef int re_wchar_t;623,23387
 
-c-src/emacs/src/keyboard.c,13565
+c-src/emacs/src/keyboard.c,15539
 volatile int interrupt_input_blocked;76,1808
 volatile bool pending_signals;80,1944
 #define KBD_BUFFER_SIZE 82,1976
@@ -904,6 +915,7 @@ add_command_key 672,21582
 recursive_edit_1 697,22406
 record_auto_save 742,23848
 force_auto_save_soon 751,24016
+DEFUN ("recursive-edit", Frecursive_edit,759,24137
 DEFUN ("recursive-edit", Frecursive_edit,recursive-edit
759,24137
 recursive_edit_unwind 804,25747
 any_kboard_state 817,26013
@@ -918,16 +930,21 @@ record_single_kboard_state 943,29437
 restore_kboard_configuration 952,29621
 cmd_error 970,30077
 cmd_error_internal 1024,31510
+DEFUN ("command-error-default-function", Fcommand_error_default_function,1043,32030
 DEFUN ("command-error-default-function", Fcommand_error_default_function,command-error-default-function
1043,32030
 command_loop 1094,33916
 command_loop_2 1134,35135
 top_level_2 1146,35339
 top_level_1 1152,35417
+DEFUN ("top-level", Ftop_level,1164,35787
 DEFUN ("top-level", Ftop_level,top-level
1164,35787
 user_error 1183,36288
+DEFUN ("exit-recursive-edit", Fexit_recursive_edit,1189,36429
 DEFUN ("exit-recursive-edit", Fexit_recursive_edit,exit-recursive-edit
1189,36429
+DEFUN ("abort-recursive-edit", Fabort_recursive_edit,1201,36819
 DEFUN ("abort-recursive-edit", Fabort_recursive_edit,abort-recursive-edit
1201,36819
 tracking_off 1216,37281
+DEFUN ("internal--track-mouse", Ftrack_mouse,1234,37816
 DEFUN ("internal--track-mouse", Ftrack_mouse,track-mouse
1234,37816
 bool ignore_mouse_drag_p;1256,38392
 some_mouse_moved 1259,38441
@@ -991,6 +1008,7 @@ Lisp_Object pending_funcalls;4377,131172
 decode_timer 4381,131293
 timer_check_2 4414,132246
 timer_check 4572,136817
+DEFUN ("current-idle-time", Fcurrent_idle_time,4607,137662
 DEFUN ("current-idle-time", Fcurrent_idle_time,current-idle-time
4607,137662
 static Lisp_Object accent_key_syms;4625,138239
 static Lisp_Object func_key_syms;4626,138275
@@ -1037,10 +1055,12 @@ static Lisp_Object modifier_symbols;6327,189449
 lispy_modifier_list 6331,189586
 #define KEY_TO_CHAR(6353,190252
 parse_modifiers 6356,190328
+DEFUN ("internal-event-symbol-parse-modifiers", Fevent_symbol_parse_modifiers,6399,191517
 DEFUN ("internal-event-symbol-parse-modifiers", Fevent_symbol_parse_modifiers,event-symbol-parse-modifiers
6399,191517
 apply_modifiers 6422,192391
 reorder_modifiers 6491,194720
 modify_event_symbol 6536,196528
+DEFUN ("event-convert-list", Fevent_convert_list,6628,199244
 DEFUN ("event-convert-list", Fevent_convert_list,event-convert-list
6628,199244
 parse_solitary_modifier 6695,201135
 #define SINGLE_LETTER_MOD(6701,201258
@@ -1101,24 +1121,38 @@ keyremap_step 8811,261450
 test_undefined 8867,262934
 read_key_sequence 8916,264861
 read_key_sequence_vs 9826,295821
+DEFUN ("read-key-sequence", Fread_key_sequence,9885,297294
 DEFUN ("read-key-sequence", Fread_key_sequence,read-key-sequence
9885,297294
+DEFUN ("read-key-sequence-vector", Fread_key_sequence_vector,9938,299982
 DEFUN ("read-key-sequence-vector", Fread_key_sequence_vector,read-key-sequence-vector
9938,299982
 detect_input_pending 9950,300488
 detect_input_pending_ignore_squeezables 9959,300654
 detect_input_pending_run_timers 9967,300870
 clear_input_pending 9985,301362
 requeued_events_pending_p 9997,301732
+DEFUN ("input-pending-p", Finput_pending_p,10002,301813
 DEFUN ("input-pending-p", Finput_pending_p,input-pending-p
10002,301813
+DEFUN ("recent-keys", Frecent_keys,10024,302596
 DEFUN ("recent-keys", Frecent_keys,recent-keys
10024,302596
+DEFUN ("this-command-keys", Fthis_command_keys,10055,303517
 DEFUN ("this-command-keys", Fthis_command_keys,this-command-keys
10055,303517
+DEFUN ("this-command-keys-vector", Fthis_command_keys_vector,10068,303958
 DEFUN ("this-command-keys-vector", Fthis_command_keys_vector,this-command-keys-vector
10068,303958
+DEFUN ("this-single-command-keys", Fthis_single_command_keys,10080,304380
 DEFUN ("this-single-command-keys", Fthis_single_command_keys,this-single-command-keys
10080,304380
+DEFUN ("this-single-command-raw-keys", Fthis_single_command_raw_keys,10096,304955
 DEFUN ("this-single-command-raw-keys", Fthis_single_command_raw_keys,this-single-command-raw-keys
10096,304955
+DEFUN ("reset-this-command-lengths", Freset_this_command_lengths,10109,305495
 DEFUN ("reset-this-command-lengths", Freset_this_command_lengths,reset-this-command-lengths
10109,305495
+DEFUN ("clear-this-command-keys", Fclear_this_command_keys,10136,306510
 DEFUN ("clear-this-command-keys", Fclear_this_command_keys,clear-this-command-keys
10136,306510
+DEFUN ("recursion-depth", Frecursion_depth,10158,307069
 DEFUN ("recursion-depth", Frecursion_depth,recursion-depth
10158,307069
+DEFUN ("open-dribble-file", Fopen_dribble_file,10169,307406
 DEFUN ("open-dribble-file", Fopen_dribble_file,open-dribble-file
10169,307406
+DEFUN ("discard-input", Fdiscard_input,10203,308447
 DEFUN ("discard-input", Fdiscard_input,discard-input
10203,308447
+DEFUN ("suspend-emacs", Fsuspend_emacs,10225,308949
 DEFUN ("suspend-emacs", Fsuspend_emacs,suspend-emacs
10225,308949
 stuff_buffered_input 10285,311045
 set_waiting_for_input 10323,312016
@@ -1128,13 +1162,21 @@ deliver_interrupt_signal 10378,313642
 static int volatile force_quit_count;10387,313932
 handle_interrupt 10401,314414
 quit_throw_to_read_char 10541,318711
+DEFUN ("set-input-interrupt-mode", Fset_input_interrupt_mode,10562,319288
 DEFUN ("set-input-interrupt-mode", Fset_input_interrupt_mode,set-input-interrupt-mode
10562,319288
+DEFUN ("set-output-flow-control", Fset_output_flow_control,10609,320516
 DEFUN ("set-output-flow-control", Fset_output_flow_control,set-output-flow-control
10609,320516
+DEFUN ("set-input-meta-mode", Fset_input_meta_mode,10643,321432
 DEFUN ("set-input-meta-mode", Fset_input_meta_mode,set-input-meta-mode
10643,321432
+DEFUN ("set-quit-char", Fset_quit_char,10694,322706
 DEFUN ("set-quit-char", Fset_quit_char,set-quit-char
10694,322706
+DEFUN ("set-input-mode", Fset_input_mode,10729,323570
 DEFUN ("set-input-mode", Fset_input_mode,set-input-mode
10729,323570
+DEFUN ("current-input-mode", Fcurrent_input_mode,10750,324459
 DEFUN ("current-input-mode", Fcurrent_input_mode,current-input-mode
10750,324459
+DEFUN ("posn-at-x-y", Fposn_at_x_y,10787,325837
 DEFUN ("posn-at-x-y", Fposn_at_x_y,posn-at-x-y
10787,325837
+DEFUN ("posn-at-point", Fposn_at_point,10824,327060
 DEFUN ("posn-at-point", Fposn_at_point,posn-at-point
10824,327060
 init_kboard 10861,328214
 allocate_kboard 10893,329284
@@ -3832,7 +3874,7 @@ void bar(5,69
 int foobar(6,94
 interface_locate(9,131
 
-c.c,1663
+c.c,1807
 my_printf 135,
 void fatala 138,
 max 141,
@@ -3862,8 +3904,11 @@ short array[array
190,
 int f193,
 DEAFUN 196,
 XDEFUN 203,
+DEFUN ("x-get-selection-internal", Fx_get_selection_internal,206,
 DEFUN ("x-get-selection-internal", Fx_get_selection_internal,x-get-selection-internal
206,
+       Fx_get_selection_internal,212,
        Fx_get_selection_internal,x-get-selection-internal
212,
+      Fy_get_selection_internal,216,
       Fy_get_selection_internal,y-get-selection-internal
216,
 defun_func1(218,
 DEFUN_func2(220,
diff --git a/test/manual/etags/ETAGS.good_2 b/test/manual/etags/ETAGS.good_2
index ffa483b7a8e..a21717af75f 100644
--- a/test/manual/etags/ETAGS.good_2
+++ b/test/manual/etags/ETAGS.good_2
@@ -175,7 +175,7 @@ package body Truc.Bidule Truc.Bidule/b
138,2153
   protected body Bidule Bidule/b
139,2181
   protected body Machin_T Machin_T/b
146,2281
 
-c-src/abbrev.c,1432
+c-src/abbrev.c,2072
 Lisp_Object Vabbrev_table_name_list;43,1424
 Lisp_Object Vglobal_abbrev_table;48,1569
 Lisp_Object Vfundamental_mode_abbrev_table;52,1680
@@ -188,18 +188,29 @@ Lisp_Object Vlast_abbrev_text;75,2319
 int last_abbrev_point;79,2409
 Lisp_Object Vpre_abbrev_expand_hook,83,2482
 Lisp_Object Vpre_abbrev_expand_hook, Qpre_abbrev_expand_hook;83,2482
+DEFUN ("make-abbrev-table", Fmake_abbrev_table,85,2546
 DEFUN ("make-abbrev-table", Fmake_abbrev_table,make-abbrev-table
85,2546
+DEFUN ("clear-abbrev-table", Fclear_abbrev_table,92,2738
 DEFUN ("clear-abbrev-table", Fclear_abbrev_table,clear-abbrev-table
92,2738
+DEFUN ("define-abbrev", Fdefine_abbrev,107,3119
 DEFUN ("define-abbrev", Fdefine_abbrev,define-abbrev
107,3119
+DEFUN ("define-global-abbrev", Fdefine_global_abbrev,149,4438
 DEFUN ("define-global-abbrev", Fdefine_global_abbrev,define-global-abbrev
149,4438
+DEFUN ("define-mode-abbrev", Fdefine_mode_abbrev,160,4809
 DEFUN ("define-mode-abbrev", Fdefine_mode_abbrev,define-mode-abbrev
160,4809
+DEFUN ("abbrev-symbol", Fabbrev_symbol,174,5277
 DEFUN ("abbrev-symbol", Fabbrev_symbol,abbrev-symbol
174,5277
+DEFUN ("abbrev-expansion", Fabbrev_expansion,202,6241
 DEFUN ("abbrev-expansion", Fabbrev_expansion,abbrev-expansion
202,6241
+DEFUN ("expand-abbrev", Fexpand_abbrev,218,6756
 DEFUN ("expand-abbrev", Fexpand_abbrev,expand-abbrev
218,6756
+DEFUN ("unexpand-abbrev", Funexpand_abbrev,389,11677
 DEFUN ("unexpand-abbrev", Funexpand_abbrev,unexpand-abbrev
389,11677
 write_abbrev 426,12884
 describe_abbrev 445,13319
+DEFUN ("insert-abbrev-table-description", Finsert_abbrev_table_description,466,13834
 DEFUN ("insert-abbrev-table-description", Finsert_abbrev_table_description,insert-abbrev-table-description
466,13834
+DEFUN ("define-abbrev-table", Fdefine_abbrev_table,506,14990
 DEFUN ("define-abbrev-table", Fdefine_abbrev_table,define-abbrev-table
506,14990
 syms_of_abbrev 540,16067
 
@@ -980,7 +991,7 @@ extern re_wctype_t re_wctype 621,23329
 typedef int re_wchar_t;623,23387
 extern void re_set_whitespace_regexp 625,23412
 
-c-src/emacs/src/keyboard.c,15493
+c-src/emacs/src/keyboard.c,17467
 volatile int interrupt_input_blocked;76,1808
 volatile bool pending_signals;80,1944
 #define KBD_BUFFER_SIZE 82,1976
@@ -1087,6 +1098,7 @@ add_command_key 672,21582
 recursive_edit_1 697,22406
 record_auto_save 742,23848
 force_auto_save_soon 751,24016
+DEFUN ("recursive-edit", Frecursive_edit,759,24137
 DEFUN ("recursive-edit", Frecursive_edit,recursive-edit
759,24137
 recursive_edit_unwind 804,25747
 any_kboard_state 817,26013
@@ -1101,6 +1113,7 @@ record_single_kboard_state 943,29437
 restore_kboard_configuration 952,29621
 cmd_error 970,30077
 cmd_error_internal 1024,31510
+DEFUN ("command-error-default-function", Fcommand_error_default_function,1043,32030
 DEFUN ("command-error-default-function", Fcommand_error_default_function,command-error-default-function
1043,32030
 static Lisp_Object command_loop_2 1086,33637
 static Lisp_Object top_level_1 1087,33686
@@ -1108,11 +1121,15 @@ command_loop 1094,33916
 command_loop_2 1134,35135
 top_level_2 1146,35339
 top_level_1 1152,35417
+DEFUN ("top-level", Ftop_level,1164,35787
 DEFUN ("top-level", Ftop_level,top-level
1164,35787
 user_error 1183,36288
+DEFUN ("exit-recursive-edit", Fexit_recursive_edit,1189,36429
 DEFUN ("exit-recursive-edit", Fexit_recursive_edit,exit-recursive-edit
1189,36429
+DEFUN ("abort-recursive-edit", Fabort_recursive_edit,1201,36819
 DEFUN ("abort-recursive-edit", Fabort_recursive_edit,abort-recursive-edit
1201,36819
 tracking_off 1216,37281
+DEFUN ("internal--track-mouse", Ftrack_mouse,1234,37816
 DEFUN ("internal--track-mouse", Ftrack_mouse,track-mouse
1234,37816
 bool ignore_mouse_drag_p;1256,38392
 some_mouse_moved 1259,38441
@@ -1180,6 +1197,7 @@ Lisp_Object pending_funcalls;4377,131172
 decode_timer 4381,131293
 timer_check_2 4414,132246
 timer_check 4572,136817
+DEFUN ("current-idle-time", Fcurrent_idle_time,4607,137662
 DEFUN ("current-idle-time", Fcurrent_idle_time,current-idle-time
4607,137662
 static Lisp_Object accent_key_syms;4625,138239
 static Lisp_Object func_key_syms;4626,138275
@@ -1226,10 +1244,12 @@ static Lisp_Object modifier_symbols;6327,189449
 lispy_modifier_list 6331,189586
 #define KEY_TO_CHAR(6353,190252
 parse_modifiers 6356,190328
+DEFUN ("internal-event-symbol-parse-modifiers", Fevent_symbol_parse_modifiers,6399,191517
 DEFUN ("internal-event-symbol-parse-modifiers", Fevent_symbol_parse_modifiers,event-symbol-parse-modifiers
6399,191517
 apply_modifiers 6422,192391
 reorder_modifiers 6491,194720
 modify_event_symbol 6536,196528
+DEFUN ("event-convert-list", Fevent_convert_list,6628,199244
 DEFUN ("event-convert-list", Fevent_convert_list,event-convert-list
6628,199244
 parse_solitary_modifier 6695,201135
 #define SINGLE_LETTER_MOD(6701,201258
@@ -1295,24 +1315,38 @@ keyremap_step 8811,261450
 test_undefined 8867,262934
 read_key_sequence 8916,264861
 read_key_sequence_vs 9826,295821
+DEFUN ("read-key-sequence", Fread_key_sequence,9885,297294
 DEFUN ("read-key-sequence", Fread_key_sequence,read-key-sequence
9885,297294
+DEFUN ("read-key-sequence-vector", Fread_key_sequence_vector,9938,299982
 DEFUN ("read-key-sequence-vector", Fread_key_sequence_vector,read-key-sequence-vector
9938,299982
 detect_input_pending 9950,300488
 detect_input_pending_ignore_squeezables 9959,300654
 detect_input_pending_run_timers 9967,300870
 clear_input_pending 9985,301362
 requeued_events_pending_p 9997,301732
+DEFUN ("input-pending-p", Finput_pending_p,10002,301813
 DEFUN ("input-pending-p", Finput_pending_p,input-pending-p
10002,301813
+DEFUN ("recent-keys", Frecent_keys,10024,302596
 DEFUN ("recent-keys", Frecent_keys,recent-keys
10024,302596
+DEFUN ("this-command-keys", Fthis_command_keys,10055,303517
 DEFUN ("this-command-keys", Fthis_command_keys,this-command-keys
10055,303517
+DEFUN ("this-command-keys-vector", Fthis_command_keys_vector,10068,303958
 DEFUN ("this-command-keys-vector", Fthis_command_keys_vector,this-command-keys-vector
10068,303958
+DEFUN ("this-single-command-keys", Fthis_single_command_keys,10080,304380
 DEFUN ("this-single-command-keys", Fthis_single_command_keys,this-single-command-keys
10080,304380
+DEFUN ("this-single-command-raw-keys", Fthis_single_command_raw_keys,10096,304955
 DEFUN ("this-single-command-raw-keys", Fthis_single_command_raw_keys,this-single-command-raw-keys
10096,304955
+DEFUN ("reset-this-command-lengths", Freset_this_command_lengths,10109,305495
 DEFUN ("reset-this-command-lengths", Freset_this_command_lengths,reset-this-command-lengths
10109,305495
+DEFUN ("clear-this-command-keys", Fclear_this_command_keys,10136,306510
 DEFUN ("clear-this-command-keys", Fclear_this_command_keys,clear-this-command-keys
10136,306510
+DEFUN ("recursion-depth", Frecursion_depth,10158,307069
 DEFUN ("recursion-depth", Frecursion_depth,recursion-depth
10158,307069
+DEFUN ("open-dribble-file", Fopen_dribble_file,10169,307406
 DEFUN ("open-dribble-file", Fopen_dribble_file,open-dribble-file
10169,307406
+DEFUN ("discard-input", Fdiscard_input,10203,308447
 DEFUN ("discard-input", Fdiscard_input,discard-input
10203,308447
+DEFUN ("suspend-emacs", Fsuspend_emacs,10225,308949
 DEFUN ("suspend-emacs", Fsuspend_emacs,suspend-emacs
10225,308949
 stuff_buffered_input 10285,311045
 set_waiting_for_input 10323,312016
@@ -1322,13 +1356,21 @@ deliver_interrupt_signal 10378,313642
 static int volatile force_quit_count;10387,313932
 handle_interrupt 10401,314414
 quit_throw_to_read_char 10541,318711
+DEFUN ("set-input-interrupt-mode", Fset_input_interrupt_mode,10562,319288
 DEFUN ("set-input-interrupt-mode", Fset_input_interrupt_mode,set-input-interrupt-mode
10562,319288
+DEFUN ("set-output-flow-control", Fset_output_flow_control,10609,320516
 DEFUN ("set-output-flow-control", Fset_output_flow_control,set-output-flow-control
10609,320516
+DEFUN ("set-input-meta-mode", Fset_input_meta_mode,10643,321432
 DEFUN ("set-input-meta-mode", Fset_input_meta_mode,set-input-meta-mode
10643,321432
+DEFUN ("set-quit-char", Fset_quit_char,10694,322706
 DEFUN ("set-quit-char", Fset_quit_char,set-quit-char
10694,322706
+DEFUN ("set-input-mode", Fset_input_mode,10729,323570
 DEFUN ("set-input-mode", Fset_input_mode,set-input-mode
10729,323570
+DEFUN ("current-input-mode", Fcurrent_input_mode,10750,324459
 DEFUN ("current-input-mode", Fcurrent_input_mode,current-input-mode
10750,324459
+DEFUN ("posn-at-x-y", Fposn_at_x_y,10787,325837
 DEFUN ("posn-at-x-y", Fposn_at_x_y,posn-at-x-y
10787,325837
+DEFUN ("posn-at-point", Fposn_at_point,10824,327060
 DEFUN ("posn-at-point", Fposn_at_point,posn-at-point
10824,327060
 init_kboard 10861,328214
 allocate_kboard 10893,329284
@@ -4402,7 +4444,7 @@ void bar(5,69
 int foobar(6,94
 interface_locate(9,131
 
-c.c,1836
+c.c,1980
 void (*fa)fa
131,
 void 132,
 my_printf 135,
@@ -4439,8 +4481,11 @@ short array[array
190,
 int f193,
 DEAFUN 196,
 XDEFUN 203,
+DEFUN ("x-get-selection-internal", Fx_get_selection_internal,206,
 DEFUN ("x-get-selection-internal", Fx_get_selection_internal,x-get-selection-internal
206,
+       Fx_get_selection_internal,212,
        Fx_get_selection_internal,x-get-selection-internal
212,
+      Fy_get_selection_internal,216,
       Fy_get_selection_internal,y-get-selection-internal
216,
 defun_func1(218,
 DEFUN_func2(220,
diff --git a/test/manual/etags/ETAGS.good_3 b/test/manual/etags/ETAGS.good_3
index ac1f97e9ec3..33bf110687b 100644
--- a/test/manual/etags/ETAGS.good_3
+++ b/test/manual/etags/ETAGS.good_3
@@ -175,7 +175,7 @@ package body Truc.Bidule Truc.Bidule/b
138,2153
   protected body Bidule Bidule/b
139,2181
   protected body Machin_T Machin_T/b
146,2281
 
-c-src/abbrev.c,1432
+c-src/abbrev.c,2072
 Lisp_Object Vabbrev_table_name_list;43,1424
 Lisp_Object Vglobal_abbrev_table;48,1569
 Lisp_Object Vfundamental_mode_abbrev_table;52,1680
@@ -188,18 +188,29 @@ Lisp_Object Vlast_abbrev_text;75,2319
 int last_abbrev_point;79,2409
 Lisp_Object Vpre_abbrev_expand_hook,83,2482
 Lisp_Object Vpre_abbrev_expand_hook, Qpre_abbrev_expand_hook;83,2482
+DEFUN ("make-abbrev-table", Fmake_abbrev_table,85,2546
 DEFUN ("make-abbrev-table", Fmake_abbrev_table,make-abbrev-table
85,2546
+DEFUN ("clear-abbrev-table", Fclear_abbrev_table,92,2738
 DEFUN ("clear-abbrev-table", Fclear_abbrev_table,clear-abbrev-table
92,2738
+DEFUN ("define-abbrev", Fdefine_abbrev,107,3119
 DEFUN ("define-abbrev", Fdefine_abbrev,define-abbrev
107,3119
+DEFUN ("define-global-abbrev", Fdefine_global_abbrev,149,4438
 DEFUN ("define-global-abbrev", Fdefine_global_abbrev,define-global-abbrev
149,4438
+DEFUN ("define-mode-abbrev", Fdefine_mode_abbrev,160,4809
 DEFUN ("define-mode-abbrev", Fdefine_mode_abbrev,define-mode-abbrev
160,4809
+DEFUN ("abbrev-symbol", Fabbrev_symbol,174,5277
 DEFUN ("abbrev-symbol", Fabbrev_symbol,abbrev-symbol
174,5277
+DEFUN ("abbrev-expansion", Fabbrev_expansion,202,6241
 DEFUN ("abbrev-expansion", Fabbrev_expansion,abbrev-expansion
202,6241
+DEFUN ("expand-abbrev", Fexpand_abbrev,218,6756
 DEFUN ("expand-abbrev", Fexpand_abbrev,expand-abbrev
218,6756
+DEFUN ("unexpand-abbrev", Funexpand_abbrev,389,11677
 DEFUN ("unexpand-abbrev", Funexpand_abbrev,unexpand-abbrev
389,11677
 write_abbrev 426,12884
 describe_abbrev 445,13319
+DEFUN ("insert-abbrev-table-description", Finsert_abbrev_table_description,466,13834
 DEFUN ("insert-abbrev-table-description", Finsert_abbrev_table_description,insert-abbrev-table-description
466,13834
+DEFUN ("define-abbrev-table", Fdefine_abbrev_table,506,14990
 DEFUN ("define-abbrev-table", Fdefine_abbrev_table,define-abbrev-table
506,14990
 syms_of_abbrev 540,16067
 
@@ -942,7 +953,7 @@ typedef enum { RECC_ERROR 609,22953
 } re_wctype_t;618,23260
 typedef int re_wchar_t;623,23387
 
-c-src/emacs/src/keyboard.c,13949
+c-src/emacs/src/keyboard.c,15923
 volatile int interrupt_input_blocked;76,1808
 volatile bool pending_signals;80,1944
 #define KBD_BUFFER_SIZE 82,1976
@@ -1018,6 +1029,7 @@ add_command_key 672,21582
 recursive_edit_1 697,22406
 record_auto_save 742,23848
 force_auto_save_soon 751,24016
+DEFUN ("recursive-edit", Frecursive_edit,759,24137
 DEFUN ("recursive-edit", Frecursive_edit,recursive-edit
759,24137
 recursive_edit_unwind 804,25747
 any_kboard_state 817,26013
@@ -1034,16 +1046,21 @@ record_single_kboard_state 943,29437
 restore_kboard_configuration 952,29621
 cmd_error 970,30077
 cmd_error_internal 1024,31510
+DEFUN ("command-error-default-function", Fcommand_error_default_function,1043,32030
 DEFUN ("command-error-default-function", Fcommand_error_default_function,command-error-default-function
1043,32030
 command_loop 1094,33916
 command_loop_2 1134,35135
 top_level_2 1146,35339
 top_level_1 1152,35417
+DEFUN ("top-level", Ftop_level,1164,35787
 DEFUN ("top-level", Ftop_level,top-level
1164,35787
 user_error 1183,36288
+DEFUN ("exit-recursive-edit", Fexit_recursive_edit,1189,36429
 DEFUN ("exit-recursive-edit", Fexit_recursive_edit,exit-recursive-edit
1189,36429
+DEFUN ("abort-recursive-edit", Fabort_recursive_edit,1201,36819
 DEFUN ("abort-recursive-edit", Fabort_recursive_edit,abort-recursive-edit
1201,36819
 tracking_off 1216,37281
+DEFUN ("internal--track-mouse", Ftrack_mouse,1234,37816
 DEFUN ("internal--track-mouse", Ftrack_mouse,track-mouse
1234,37816
 bool ignore_mouse_drag_p;1256,38392
 some_mouse_moved 1259,38441
@@ -1107,6 +1124,7 @@ Lisp_Object pending_funcalls;4377,131172
 decode_timer 4381,131293
 timer_check_2 4414,132246
 timer_check 4572,136817
+DEFUN ("current-idle-time", Fcurrent_idle_time,4607,137662
 DEFUN ("current-idle-time", Fcurrent_idle_time,current-idle-time
4607,137662
 static Lisp_Object accent_key_syms;4625,138239
 static Lisp_Object func_key_syms;4626,138275
@@ -1153,10 +1171,12 @@ static Lisp_Object modifier_symbols;6327,189449
 lispy_modifier_list 6331,189586
 #define KEY_TO_CHAR(6353,190252
 parse_modifiers 6356,190328
+DEFUN ("internal-event-symbol-parse-modifiers", Fevent_symbol_parse_modifiers,6399,191517
 DEFUN ("internal-event-symbol-parse-modifiers", Fevent_symbol_parse_modifiers,event-symbol-parse-modifiers
6399,191517
 apply_modifiers 6422,192391
 reorder_modifiers 6491,194720
 modify_event_symbol 6536,196528
+DEFUN ("event-convert-list", Fevent_convert_list,6628,199244
 DEFUN ("event-convert-list", Fevent_convert_list,event-convert-list
6628,199244
 parse_solitary_modifier 6695,201135
 #define SINGLE_LETTER_MOD(6701,201258
@@ -1225,24 +1245,38 @@ keyremap_step 8811,261450
 test_undefined 8867,262934
 read_key_sequence 8916,264861
 read_key_sequence_vs 9826,295821
+DEFUN ("read-key-sequence", Fread_key_sequence,9885,297294
 DEFUN ("read-key-sequence", Fread_key_sequence,read-key-sequence
9885,297294
+DEFUN ("read-key-sequence-vector", Fread_key_sequence_vector,9938,299982
 DEFUN ("read-key-sequence-vector", Fread_key_sequence_vector,read-key-sequence-vector
9938,299982
 detect_input_pending 9950,300488
 detect_input_pending_ignore_squeezables 9959,300654
 detect_input_pending_run_timers 9967,300870
 clear_input_pending 9985,301362
 requeued_events_pending_p 9997,301732
+DEFUN ("input-pending-p", Finput_pending_p,10002,301813
 DEFUN ("input-pending-p", Finput_pending_p,input-pending-p
10002,301813
+DEFUN ("recent-keys", Frecent_keys,10024,302596
 DEFUN ("recent-keys", Frecent_keys,recent-keys
10024,302596
+DEFUN ("this-command-keys", Fthis_command_keys,10055,303517
 DEFUN ("this-command-keys", Fthis_command_keys,this-command-keys
10055,303517
+DEFUN ("this-command-keys-vector", Fthis_command_keys_vector,10068,303958
 DEFUN ("this-command-keys-vector", Fthis_command_keys_vector,this-command-keys-vector
10068,303958
+DEFUN ("this-single-command-keys", Fthis_single_command_keys,10080,304380
 DEFUN ("this-single-command-keys", Fthis_single_command_keys,this-single-command-keys
10080,304380
+DEFUN ("this-single-command-raw-keys", Fthis_single_command_raw_keys,10096,304955
 DEFUN ("this-single-command-raw-keys", Fthis_single_command_raw_keys,this-single-command-raw-keys
10096,304955
+DEFUN ("reset-this-command-lengths", Freset_this_command_lengths,10109,305495
 DEFUN ("reset-this-command-lengths", Freset_this_command_lengths,reset-this-command-lengths
10109,305495
+DEFUN ("clear-this-command-keys", Fclear_this_command_keys,10136,306510
 DEFUN ("clear-this-command-keys", Fclear_this_command_keys,clear-this-command-keys
10136,306510
+DEFUN ("recursion-depth", Frecursion_depth,10158,307069
 DEFUN ("recursion-depth", Frecursion_depth,recursion-depth
10158,307069
+DEFUN ("open-dribble-file", Fopen_dribble_file,10169,307406
 DEFUN ("open-dribble-file", Fopen_dribble_file,open-dribble-file
10169,307406
+DEFUN ("discard-input", Fdiscard_input,10203,308447
 DEFUN ("discard-input", Fdiscard_input,discard-input
10203,308447
+DEFUN ("suspend-emacs", Fsuspend_emacs,10225,308949
 DEFUN ("suspend-emacs", Fsuspend_emacs,suspend-emacs
10225,308949
 stuff_buffered_input 10285,311045
 set_waiting_for_input 10323,312016
@@ -1252,13 +1286,21 @@ deliver_interrupt_signal 10378,313642
 static int volatile force_quit_count;10387,313932
 handle_interrupt 10401,314414
 quit_throw_to_read_char 10541,318711
+DEFUN ("set-input-interrupt-mode", Fset_input_interrupt_mode,10562,319288
 DEFUN ("set-input-interrupt-mode", Fset_input_interrupt_mode,set-input-interrupt-mode
10562,319288
+DEFUN ("set-output-flow-control", Fset_output_flow_control,10609,320516
 DEFUN ("set-output-flow-control", Fset_output_flow_control,set-output-flow-control
10609,320516
+DEFUN ("set-input-meta-mode", Fset_input_meta_mode,10643,321432
 DEFUN ("set-input-meta-mode", Fset_input_meta_mode,set-input-meta-mode
10643,321432
+DEFUN ("set-quit-char", Fset_quit_char,10694,322706
 DEFUN ("set-quit-char", Fset_quit_char,set-quit-char
10694,322706
+DEFUN ("set-input-mode", Fset_input_mode,10729,323570
 DEFUN ("set-input-mode", Fset_input_mode,set-input-mode
10729,323570
+DEFUN ("current-input-mode", Fcurrent_input_mode,10750,324459
 DEFUN ("current-input-mode", Fcurrent_input_mode,current-input-mode
10750,324459
+DEFUN ("posn-at-x-y", Fposn_at_x_y,10787,325837
 DEFUN ("posn-at-x-y", Fposn_at_x_y,posn-at-x-y
10787,325837
+DEFUN ("posn-at-point", Fposn_at_point,10824,327060
 DEFUN ("posn-at-point", Fposn_at_point,posn-at-point
10824,327060
 init_kboard 10861,328214
 allocate_kboard 10893,329284
@@ -4179,7 +4221,7 @@ void bar(5,69
 int foobar(6,94
 interface_locate(9,131
 
-c.c,1963
+c.c,2107
 my_printf 135,
 void fatala 138,
 max 141,
@@ -4224,8 +4266,11 @@ short array[array
190,
 int f193,
 DEAFUN 196,
 XDEFUN 203,
+DEFUN ("x-get-selection-internal", Fx_get_selection_internal,206,
 DEFUN ("x-get-selection-internal", Fx_get_selection_internal,x-get-selection-internal
206,
+       Fx_get_selection_internal,212,
        Fx_get_selection_internal,x-get-selection-internal
212,
+      Fy_get_selection_internal,216,
       Fy_get_selection_internal,y-get-selection-internal
216,
 defun_func1(218,
 DEFUN_func2(220,
diff --git a/test/manual/etags/ETAGS.good_4 b/test/manual/etags/ETAGS.good_4
index 8184e3a0f6d..3d9d6266421 100644
--- a/test/manual/etags/ETAGS.good_4
+++ b/test/manual/etags/ETAGS.good_4
@@ -175,7 +175,7 @@ package body Truc.Bidule Truc.Bidule/b
138,2153
   protected body Bidule Bidule/b
139,2181
   protected body Machin_T Machin_T/b
146,2281
 
-c-src/abbrev.c,2634
+c-src/abbrev.c,3274
 Lisp_Object Vabbrev_table_name_list;43,1424
 Lisp_Object Vglobal_abbrev_table;48,1569
 Lisp_Object Vfundamental_mode_abbrev_table;52,1680
@@ -188,18 +188,29 @@ Lisp_Object Vlast_abbrev_text;75,2319
 int last_abbrev_point;79,2409
 Lisp_Object Vpre_abbrev_expand_hook,83,2482
 Lisp_Object Vpre_abbrev_expand_hook, Qpre_abbrev_expand_hook;83,2482
+DEFUN ("make-abbrev-table", Fmake_abbrev_table,85,2546
 DEFUN ("make-abbrev-table", Fmake_abbrev_table,make-abbrev-table
85,2546
+DEFUN ("clear-abbrev-table", Fclear_abbrev_table,92,2738
 DEFUN ("clear-abbrev-table", Fclear_abbrev_table,clear-abbrev-table
92,2738
+DEFUN ("define-abbrev", Fdefine_abbrev,107,3119
 DEFUN ("define-abbrev", Fdefine_abbrev,define-abbrev
107,3119
+DEFUN ("define-global-abbrev", Fdefine_global_abbrev,149,4438
 DEFUN ("define-global-abbrev", Fdefine_global_abbrev,define-global-abbrev
149,4438
+DEFUN ("define-mode-abbrev", Fdefine_mode_abbrev,160,4809
 DEFUN ("define-mode-abbrev", Fdefine_mode_abbrev,define-mode-abbrev
160,4809
+DEFUN ("abbrev-symbol", Fabbrev_symbol,174,5277
 DEFUN ("abbrev-symbol", Fabbrev_symbol,abbrev-symbol
174,5277
+DEFUN ("abbrev-expansion", Fabbrev_expansion,202,6241
 DEFUN ("abbrev-expansion", Fabbrev_expansion,abbrev-expansion
202,6241
+DEFUN ("expand-abbrev", Fexpand_abbrev,218,6756
 DEFUN ("expand-abbrev", Fexpand_abbrev,expand-abbrev
218,6756
+DEFUN ("unexpand-abbrev", Funexpand_abbrev,389,11677
 DEFUN ("unexpand-abbrev", Funexpand_abbrev,unexpand-abbrev
389,11677
 write_abbrev 426,12884
 describe_abbrev 445,13319
+DEFUN ("insert-abbrev-table-description", Finsert_abbrev_table_description,466,13834
 DEFUN ("insert-abbrev-table-description", Finsert_abbrev_table_description,insert-abbrev-table-description
466,13834
+DEFUN ("define-abbrev-table", Fdefine_abbrev_table,506,14990
 DEFUN ("define-abbrev-table", Fdefine_abbrev_table,define-abbrev-table
506,14990
 syms_of_abbrev 540,16067
   DEFVAR_LISP ("abbrev-table-name-list"542,16087
@@ -852,7 +863,7 @@ typedef enum { RECC_ERROR 609,22953
 } re_wctype_t;618,23260
 typedef int re_wchar_t;623,23387
 
-c-src/emacs/src/keyboard.c,20957
+c-src/emacs/src/keyboard.c,22931
 volatile int interrupt_input_blocked;76,1808
 volatile bool pending_signals;80,1944
 #define KBD_BUFFER_SIZE 82,1976
@@ -928,6 +939,7 @@ add_command_key 672,21582
 recursive_edit_1 697,22406
 record_auto_save 742,23848
 force_auto_save_soon 751,24016
+DEFUN ("recursive-edit", Frecursive_edit,759,24137
 DEFUN ("recursive-edit", Frecursive_edit,recursive-edit
759,24137
 recursive_edit_unwind 804,25747
 any_kboard_state 817,26013
@@ -942,16 +954,21 @@ record_single_kboard_state 943,29437
 restore_kboard_configuration 952,29621
 cmd_error 970,30077
 cmd_error_internal 1024,31510
+DEFUN ("command-error-default-function", Fcommand_error_default_function,1043,32030
 DEFUN ("command-error-default-function", Fcommand_error_default_function,command-error-default-function
1043,32030
 command_loop 1094,33916
 command_loop_2 1134,35135
 top_level_2 1146,35339
 top_level_1 1152,35417
+DEFUN ("top-level", Ftop_level,1164,35787
 DEFUN ("top-level", Ftop_level,top-level
1164,35787
 user_error 1183,36288
+DEFUN ("exit-recursive-edit", Fexit_recursive_edit,1189,36429
 DEFUN ("exit-recursive-edit", Fexit_recursive_edit,exit-recursive-edit
1189,36429
+DEFUN ("abort-recursive-edit", Fabort_recursive_edit,1201,36819
 DEFUN ("abort-recursive-edit", Fabort_recursive_edit,abort-recursive-edit
1201,36819
 tracking_off 1216,37281
+DEFUN ("internal--track-mouse", Ftrack_mouse,1234,37816
 DEFUN ("internal--track-mouse", Ftrack_mouse,track-mouse
1234,37816
 bool ignore_mouse_drag_p;1256,38392
 some_mouse_moved 1259,38441
@@ -1015,6 +1032,7 @@ Lisp_Object pending_funcalls;4377,131172
 decode_timer 4381,131293
 timer_check_2 4414,132246
 timer_check 4572,136817
+DEFUN ("current-idle-time", Fcurrent_idle_time,4607,137662
 DEFUN ("current-idle-time", Fcurrent_idle_time,current-idle-time
4607,137662
 static Lisp_Object accent_key_syms;4625,138239
 static Lisp_Object func_key_syms;4626,138275
@@ -1061,10 +1079,12 @@ static Lisp_Object modifier_symbols;6327,189449
 lispy_modifier_list 6331,189586
 #define KEY_TO_CHAR(6353,190252
 parse_modifiers 6356,190328
+DEFUN ("internal-event-symbol-parse-modifiers", Fevent_symbol_parse_modifiers,6399,191517
 DEFUN ("internal-event-symbol-parse-modifiers", Fevent_symbol_parse_modifiers,event-symbol-parse-modifiers
6399,191517
 apply_modifiers 6422,192391
 reorder_modifiers 6491,194720
 modify_event_symbol 6536,196528
+DEFUN ("event-convert-list", Fevent_convert_list,6628,199244
 DEFUN ("event-convert-list", Fevent_convert_list,event-convert-list
6628,199244
 parse_solitary_modifier 6695,201135
 #define SINGLE_LETTER_MOD(6701,201258
@@ -1125,24 +1145,38 @@ keyremap_step 8811,261450
 test_undefined 8867,262934
 read_key_sequence 8916,264861
 read_key_sequence_vs 9826,295821
+DEFUN ("read-key-sequence", Fread_key_sequence,9885,297294
 DEFUN ("read-key-sequence", Fread_key_sequence,read-key-sequence
9885,297294
+DEFUN ("read-key-sequence-vector", Fread_key_sequence_vector,9938,299982
 DEFUN ("read-key-sequence-vector", Fread_key_sequence_vector,read-key-sequence-vector
9938,299982
 detect_input_pending 9950,300488
 detect_input_pending_ignore_squeezables 9959,300654
 detect_input_pending_run_timers 9967,300870
 clear_input_pending 9985,301362
 requeued_events_pending_p 9997,301732
+DEFUN ("input-pending-p", Finput_pending_p,10002,301813
 DEFUN ("input-pending-p", Finput_pending_p,input-pending-p
10002,301813
+DEFUN ("recent-keys", Frecent_keys,10024,302596
 DEFUN ("recent-keys", Frecent_keys,recent-keys
10024,302596
+DEFUN ("this-command-keys", Fthis_command_keys,10055,303517
 DEFUN ("this-command-keys", Fthis_command_keys,this-command-keys
10055,303517
+DEFUN ("this-command-keys-vector", Fthis_command_keys_vector,10068,303958
 DEFUN ("this-command-keys-vector", Fthis_command_keys_vector,this-command-keys-vector
10068,303958
+DEFUN ("this-single-command-keys", Fthis_single_command_keys,10080,304380
 DEFUN ("this-single-command-keys", Fthis_single_command_keys,this-single-command-keys
10080,304380
+DEFUN ("this-single-command-raw-keys", Fthis_single_command_raw_keys,10096,304955
 DEFUN ("this-single-command-raw-keys", Fthis_single_command_raw_keys,this-single-command-raw-keys
10096,304955
+DEFUN ("reset-this-command-lengths", Freset_this_command_lengths,10109,305495
 DEFUN ("reset-this-command-lengths", Freset_this_command_lengths,reset-this-command-lengths
10109,305495
+DEFUN ("clear-this-command-keys", Fclear_this_command_keys,10136,306510
 DEFUN ("clear-this-command-keys", Fclear_this_command_keys,clear-this-command-keys
10136,306510
+DEFUN ("recursion-depth", Frecursion_depth,10158,307069
 DEFUN ("recursion-depth", Frecursion_depth,recursion-depth
10158,307069
+DEFUN ("open-dribble-file", Fopen_dribble_file,10169,307406
 DEFUN ("open-dribble-file", Fopen_dribble_file,open-dribble-file
10169,307406
+DEFUN ("discard-input", Fdiscard_input,10203,308447
 DEFUN ("discard-input", Fdiscard_input,discard-input
10203,308447
+DEFUN ("suspend-emacs", Fsuspend_emacs,10225,308949
 DEFUN ("suspend-emacs", Fsuspend_emacs,suspend-emacs
10225,308949
 stuff_buffered_input 10285,311045
 set_waiting_for_input 10323,312016
@@ -1152,13 +1186,21 @@ deliver_interrupt_signal 10378,313642
 static int volatile force_quit_count;10387,313932
 handle_interrupt 10401,314414
 quit_throw_to_read_char 10541,318711
+DEFUN ("set-input-interrupt-mode", Fset_input_interrupt_mode,10562,319288
 DEFUN ("set-input-interrupt-mode", Fset_input_interrupt_mode,set-input-interrupt-mode
10562,319288
+DEFUN ("set-output-flow-control", Fset_output_flow_control,10609,320516
 DEFUN ("set-output-flow-control", Fset_output_flow_control,set-output-flow-control
10609,320516
+DEFUN ("set-input-meta-mode", Fset_input_meta_mode,10643,321432
 DEFUN ("set-input-meta-mode", Fset_input_meta_mode,set-input-meta-mode
10643,321432
+DEFUN ("set-quit-char", Fset_quit_char,10694,322706
 DEFUN ("set-quit-char", Fset_quit_char,set-quit-char
10694,322706
+DEFUN ("set-input-mode", Fset_input_mode,10729,323570
 DEFUN ("set-input-mode", Fset_input_mode,set-input-mode
10729,323570
+DEFUN ("current-input-mode", Fcurrent_input_mode,10750,324459
 DEFUN ("current-input-mode", Fcurrent_input_mode,current-input-mode
10750,324459
+DEFUN ("posn-at-x-y", Fposn_at_x_y,10787,325837
 DEFUN ("posn-at-x-y", Fposn_at_x_y,posn-at-x-y
10787,325837
+DEFUN ("posn-at-point", Fposn_at_point,10824,327060
 DEFUN ("posn-at-point", Fposn_at_point,posn-at-point
10824,327060
 init_kboard 10861,328214
 allocate_kboard 10893,329284
@@ -3996,7 +4038,7 @@ void bar(5,69
 int foobar(6,94
 interface_locate(9,131
 
-c.c,1663
+c.c,1807
 my_printf 135,
 void fatala 138,
 max 141,
@@ -4026,8 +4068,11 @@ short array[array
190,
 int f193,
 DEAFUN 196,
 XDEFUN 203,
+DEFUN ("x-get-selection-internal", Fx_get_selection_internal,206,
 DEFUN ("x-get-selection-internal", Fx_get_selection_internal,x-get-selection-internal
206,
+       Fx_get_selection_internal,212,
        Fx_get_selection_internal,x-get-selection-internal
212,
+      Fy_get_selection_internal,216,
       Fy_get_selection_internal,y-get-selection-internal
216,
 defun_func1(218,
 DEFUN_func2(220,
diff --git a/test/manual/etags/ETAGS.good_5 b/test/manual/etags/ETAGS.good_5
index 708ba17beb0..1dff7685212 100644
--- a/test/manual/etags/ETAGS.good_5
+++ b/test/manual/etags/ETAGS.good_5
@@ -175,7 +175,7 @@ package body Truc.Bidule Truc.Bidule/b
138,2153
   protected body Bidule Bidule/b
139,2181
   protected body Machin_T Machin_T/b
146,2281
 
-c-src/abbrev.c,2634
+c-src/abbrev.c,3274
 Lisp_Object Vabbrev_table_name_list;43,1424
 Lisp_Object Vglobal_abbrev_table;48,1569
 Lisp_Object Vfundamental_mode_abbrev_table;52,1680
@@ -188,18 +188,29 @@ Lisp_Object Vlast_abbrev_text;75,2319
 int last_abbrev_point;79,2409
 Lisp_Object Vpre_abbrev_expand_hook,83,2482
 Lisp_Object Vpre_abbrev_expand_hook, Qpre_abbrev_expand_hook;83,2482
+DEFUN ("make-abbrev-table", Fmake_abbrev_table,85,2546
 DEFUN ("make-abbrev-table", Fmake_abbrev_table,make-abbrev-table
85,2546
+DEFUN ("clear-abbrev-table", Fclear_abbrev_table,92,2738
 DEFUN ("clear-abbrev-table", Fclear_abbrev_table,clear-abbrev-table
92,2738
+DEFUN ("define-abbrev", Fdefine_abbrev,107,3119
 DEFUN ("define-abbrev", Fdefine_abbrev,define-abbrev
107,3119
+DEFUN ("define-global-abbrev", Fdefine_global_abbrev,149,4438
 DEFUN ("define-global-abbrev", Fdefine_global_abbrev,define-global-abbrev
149,4438
+DEFUN ("define-mode-abbrev", Fdefine_mode_abbrev,160,4809
 DEFUN ("define-mode-abbrev", Fdefine_mode_abbrev,define-mode-abbrev
160,4809
+DEFUN ("abbrev-symbol", Fabbrev_symbol,174,5277
 DEFUN ("abbrev-symbol", Fabbrev_symbol,abbrev-symbol
174,5277
+DEFUN ("abbrev-expansion", Fabbrev_expansion,202,6241
 DEFUN ("abbrev-expansion", Fabbrev_expansion,abbrev-expansion
202,6241
+DEFUN ("expand-abbrev", Fexpand_abbrev,218,6756
 DEFUN ("expand-abbrev", Fexpand_abbrev,expand-abbrev
218,6756
+DEFUN ("unexpand-abbrev", Funexpand_abbrev,389,11677
 DEFUN ("unexpand-abbrev", Funexpand_abbrev,unexpand-abbrev
389,11677
 write_abbrev 426,12884
 describe_abbrev 445,13319
+DEFUN ("insert-abbrev-table-description", Finsert_abbrev_table_description,466,13834
 DEFUN ("insert-abbrev-table-description", Finsert_abbrev_table_description,insert-abbrev-table-description
466,13834
+DEFUN ("define-abbrev-table", Fdefine_abbrev_table,506,14990
 DEFUN ("define-abbrev-table", Fdefine_abbrev_table,define-abbrev-table
506,14990
 syms_of_abbrev 540,16067
   DEFVAR_LISP ("abbrev-table-name-list"542,16087
@@ -1118,7 +1129,7 @@ extern re_wctype_t re_wctype 621,23329
 typedef int re_wchar_t;623,23387
 extern void re_set_whitespace_regexp 625,23412
 
-c-src/emacs/src/keyboard.c,23269
+c-src/emacs/src/keyboard.c,25243
 volatile int interrupt_input_blocked;76,1808
 volatile bool pending_signals;80,1944
 #define KBD_BUFFER_SIZE 82,1976
@@ -1225,6 +1236,7 @@ add_command_key 672,21582
 recursive_edit_1 697,22406
 record_auto_save 742,23848
 force_auto_save_soon 751,24016
+DEFUN ("recursive-edit", Frecursive_edit,759,24137
 DEFUN ("recursive-edit", Frecursive_edit,recursive-edit
759,24137
 recursive_edit_unwind 804,25747
 any_kboard_state 817,26013
@@ -1241,6 +1253,7 @@ record_single_kboard_state 943,29437
 restore_kboard_configuration 952,29621
 cmd_error 970,30077
 cmd_error_internal 1024,31510
+DEFUN ("command-error-default-function", Fcommand_error_default_function,1043,32030
 DEFUN ("command-error-default-function", Fcommand_error_default_function,command-error-default-function
1043,32030
 static Lisp_Object command_loop_2 1086,33637
 static Lisp_Object top_level_1 1087,33686
@@ -1248,11 +1261,15 @@ command_loop 1094,33916
 command_loop_2 1134,35135
 top_level_2 1146,35339
 top_level_1 1152,35417
+DEFUN ("top-level", Ftop_level,1164,35787
 DEFUN ("top-level", Ftop_level,top-level
1164,35787
 user_error 1183,36288
+DEFUN ("exit-recursive-edit", Fexit_recursive_edit,1189,36429
 DEFUN ("exit-recursive-edit", Fexit_recursive_edit,exit-recursive-edit
1189,36429
+DEFUN ("abort-recursive-edit", Fabort_recursive_edit,1201,36819
 DEFUN ("abort-recursive-edit", Fabort_recursive_edit,abort-recursive-edit
1201,36819
 tracking_off 1216,37281
+DEFUN ("internal--track-mouse", Ftrack_mouse,1234,37816
 DEFUN ("internal--track-mouse", Ftrack_mouse,track-mouse
1234,37816
 bool ignore_mouse_drag_p;1256,38392
 some_mouse_moved 1259,38441
@@ -1320,6 +1337,7 @@ Lisp_Object pending_funcalls;4377,131172
 decode_timer 4381,131293
 timer_check_2 4414,132246
 timer_check 4572,136817
+DEFUN ("current-idle-time", Fcurrent_idle_time,4607,137662
 DEFUN ("current-idle-time", Fcurrent_idle_time,current-idle-time
4607,137662
 static Lisp_Object accent_key_syms;4625,138239
 static Lisp_Object func_key_syms;4626,138275
@@ -1366,10 +1384,12 @@ static Lisp_Object modifier_symbols;6327,189449
 lispy_modifier_list 6331,189586
 #define KEY_TO_CHAR(6353,190252
 parse_modifiers 6356,190328
+DEFUN ("internal-event-symbol-parse-modifiers", Fevent_symbol_parse_modifiers,6399,191517
 DEFUN ("internal-event-symbol-parse-modifiers", Fevent_symbol_parse_modifiers,event-symbol-parse-modifiers
6399,191517
 apply_modifiers 6422,192391
 reorder_modifiers 6491,194720
 modify_event_symbol 6536,196528
+DEFUN ("event-convert-list", Fevent_convert_list,6628,199244
 DEFUN ("event-convert-list", Fevent_convert_list,event-convert-list
6628,199244
 parse_solitary_modifier 6695,201135
 #define SINGLE_LETTER_MOD(6701,201258
@@ -1443,24 +1463,38 @@ keyremap_step 8811,261450
 test_undefined 8867,262934
 read_key_sequence 8916,264861
 read_key_sequence_vs 9826,295821
+DEFUN ("read-key-sequence", Fread_key_sequence,9885,297294
 DEFUN ("read-key-sequence", Fread_key_sequence,read-key-sequence
9885,297294
+DEFUN ("read-key-sequence-vector", Fread_key_sequence_vector,9938,299982
 DEFUN ("read-key-sequence-vector", Fread_key_sequence_vector,read-key-sequence-vector
9938,299982
 detect_input_pending 9950,300488
 detect_input_pending_ignore_squeezables 9959,300654
 detect_input_pending_run_timers 9967,300870
 clear_input_pending 9985,301362
 requeued_events_pending_p 9997,301732
+DEFUN ("input-pending-p", Finput_pending_p,10002,301813
 DEFUN ("input-pending-p", Finput_pending_p,input-pending-p
10002,301813
+DEFUN ("recent-keys", Frecent_keys,10024,302596
 DEFUN ("recent-keys", Frecent_keys,recent-keys
10024,302596
+DEFUN ("this-command-keys", Fthis_command_keys,10055,303517
 DEFUN ("this-command-keys", Fthis_command_keys,this-command-keys
10055,303517
+DEFUN ("this-command-keys-vector", Fthis_command_keys_vector,10068,303958
 DEFUN ("this-command-keys-vector", Fthis_command_keys_vector,this-command-keys-vector
10068,303958
+DEFUN ("this-single-command-keys", Fthis_single_command_keys,10080,304380
 DEFUN ("this-single-command-keys", Fthis_single_command_keys,this-single-command-keys
10080,304380
+DEFUN ("this-single-command-raw-keys", Fthis_single_command_raw_keys,10096,304955
 DEFUN ("this-single-command-raw-keys", Fthis_single_command_raw_keys,this-single-command-raw-keys
10096,304955
+DEFUN ("reset-this-command-lengths", Freset_this_command_lengths,10109,305495
 DEFUN ("reset-this-command-lengths", Freset_this_command_lengths,reset-this-command-lengths
10109,305495
+DEFUN ("clear-this-command-keys", Fclear_this_command_keys,10136,306510
 DEFUN ("clear-this-command-keys", Fclear_this_command_keys,clear-this-command-keys
10136,306510
+DEFUN ("recursion-depth", Frecursion_depth,10158,307069
 DEFUN ("recursion-depth", Frecursion_depth,recursion-depth
10158,307069
+DEFUN ("open-dribble-file", Fopen_dribble_file,10169,307406
 DEFUN ("open-dribble-file", Fopen_dribble_file,open-dribble-file
10169,307406
+DEFUN ("discard-input", Fdiscard_input,10203,308447
 DEFUN ("discard-input", Fdiscard_input,discard-input
10203,308447
+DEFUN ("suspend-emacs", Fsuspend_emacs,10225,308949
 DEFUN ("suspend-emacs", Fsuspend_emacs,suspend-emacs
10225,308949
 stuff_buffered_input 10285,311045
 set_waiting_for_input 10323,312016
@@ -1470,13 +1504,21 @@ deliver_interrupt_signal 10378,313642
 static int volatile force_quit_count;10387,313932
 handle_interrupt 10401,314414
 quit_throw_to_read_char 10541,318711
+DEFUN ("set-input-interrupt-mode", Fset_input_interrupt_mode,10562,319288
 DEFUN ("set-input-interrupt-mode", Fset_input_interrupt_mode,set-input-interrupt-mode
10562,319288
+DEFUN ("set-output-flow-control", Fset_output_flow_control,10609,320516
 DEFUN ("set-output-flow-control", Fset_output_flow_control,set-output-flow-control
10609,320516
+DEFUN ("set-input-meta-mode", Fset_input_meta_mode,10643,321432
 DEFUN ("set-input-meta-mode", Fset_input_meta_mode,set-input-meta-mode
10643,321432
+DEFUN ("set-quit-char", Fset_quit_char,10694,322706
 DEFUN ("set-quit-char", Fset_quit_char,set-quit-char
10694,322706
+DEFUN ("set-input-mode", Fset_input_mode,10729,323570
 DEFUN ("set-input-mode", Fset_input_mode,set-input-mode
10729,323570
+DEFUN ("current-input-mode", Fcurrent_input_mode,10750,324459
 DEFUN ("current-input-mode", Fcurrent_input_mode,current-input-mode
10750,324459
+DEFUN ("posn-at-x-y", Fposn_at_x_y,10787,325837
 DEFUN ("posn-at-x-y", Fposn_at_x_y,posn-at-x-y
10787,325837
+DEFUN ("posn-at-point", Fposn_at_point,10824,327060
 DEFUN ("posn-at-point", Fposn_at_point,posn-at-point
10824,327060
 init_kboard 10861,328214
 allocate_kboard 10893,329284
@@ -4913,7 +4955,7 @@ void bar(5,69
 int foobar(6,94
 interface_locate(9,131
 
-c.c,2136
+c.c,2280
 void (*fa)fa
131,
 void 132,
 my_printf 135,
@@ -4965,8 +5007,11 @@ short array[array
190,
 int f193,
 DEAFUN 196,
 XDEFUN 203,
+DEFUN ("x-get-selection-internal", Fx_get_selection_internal,206,
 DEFUN ("x-get-selection-internal", Fx_get_selection_internal,x-get-selection-internal
206,
+       Fx_get_selection_internal,212,
        Fx_get_selection_internal,x-get-selection-internal
212,
+      Fy_get_selection_internal,216,
       Fy_get_selection_internal,y-get-selection-internal
216,
 defun_func1(218,
 DEFUN_func2(220,
diff --git a/test/manual/etags/ETAGS.good_6 b/test/manual/etags/ETAGS.good_6
index 35bb97986c0..fdcbd57e7ef 100644
--- a/test/manual/etags/ETAGS.good_6
+++ b/test/manual/etags/ETAGS.good_6
@@ -175,7 +175,7 @@ package body Truc.Bidule Truc.Bidule/b
138,2153
   protected body Bidule Bidule/b
139,2181
   protected body Machin_T Machin_T/b
146,2281
 
-c-src/abbrev.c,2634
+c-src/abbrev.c,3274
 Lisp_Object Vabbrev_table_name_list;43,1424
 Lisp_Object Vglobal_abbrev_table;48,1569
 Lisp_Object Vfundamental_mode_abbrev_table;52,1680
@@ -188,18 +188,29 @@ Lisp_Object Vlast_abbrev_text;75,2319
 int last_abbrev_point;79,2409
 Lisp_Object Vpre_abbrev_expand_hook,83,2482
 Lisp_Object Vpre_abbrev_expand_hook, Qpre_abbrev_expand_hook;83,2482
+DEFUN ("make-abbrev-table", Fmake_abbrev_table,85,2546
 DEFUN ("make-abbrev-table", Fmake_abbrev_table,make-abbrev-table
85,2546
+DEFUN ("clear-abbrev-table", Fclear_abbrev_table,92,2738
 DEFUN ("clear-abbrev-table", Fclear_abbrev_table,clear-abbrev-table
92,2738
+DEFUN ("define-abbrev", Fdefine_abbrev,107,3119
 DEFUN ("define-abbrev", Fdefine_abbrev,define-abbrev
107,3119
+DEFUN ("define-global-abbrev", Fdefine_global_abbrev,149,4438
 DEFUN ("define-global-abbrev", Fdefine_global_abbrev,define-global-abbrev
149,4438
+DEFUN ("define-mode-abbrev", Fdefine_mode_abbrev,160,4809
 DEFUN ("define-mode-abbrev", Fdefine_mode_abbrev,define-mode-abbrev
160,4809
+DEFUN ("abbrev-symbol", Fabbrev_symbol,174,5277
 DEFUN ("abbrev-symbol", Fabbrev_symbol,abbrev-symbol
174,5277
+DEFUN ("abbrev-expansion", Fabbrev_expansion,202,6241
 DEFUN ("abbrev-expansion", Fabbrev_expansion,abbrev-expansion
202,6241
+DEFUN ("expand-abbrev", Fexpand_abbrev,218,6756
 DEFUN ("expand-abbrev", Fexpand_abbrev,expand-abbrev
218,6756
+DEFUN ("unexpand-abbrev", Funexpand_abbrev,389,11677
 DEFUN ("unexpand-abbrev", Funexpand_abbrev,unexpand-abbrev
389,11677
 write_abbrev 426,12884
 describe_abbrev 445,13319
+DEFUN ("insert-abbrev-table-description", Finsert_abbrev_table_description,466,13834
 DEFUN ("insert-abbrev-table-description", Finsert_abbrev_table_description,insert-abbrev-table-description
466,13834
+DEFUN ("define-abbrev-table", Fdefine_abbrev_table,506,14990
 DEFUN ("define-abbrev-table", Fdefine_abbrev_table,define-abbrev-table
506,14990
 syms_of_abbrev 540,16067
   DEFVAR_LISP ("abbrev-table-name-list"542,16087
@@ -1118,7 +1129,7 @@ extern re_wctype_t re_wctype 621,23329
 typedef int re_wchar_t;623,23387
 extern void re_set_whitespace_regexp 625,23412
 
-c-src/emacs/src/keyboard.c,23269
+c-src/emacs/src/keyboard.c,25243
 volatile int interrupt_input_blocked;76,1808
 volatile bool pending_signals;80,1944
 #define KBD_BUFFER_SIZE 82,1976
@@ -1225,6 +1236,7 @@ add_command_key 672,21582
 recursive_edit_1 697,22406
 record_auto_save 742,23848
 force_auto_save_soon 751,24016
+DEFUN ("recursive-edit", Frecursive_edit,759,24137
 DEFUN ("recursive-edit", Frecursive_edit,recursive-edit
759,24137
 recursive_edit_unwind 804,25747
 any_kboard_state 817,26013
@@ -1241,6 +1253,7 @@ record_single_kboard_state 943,29437
 restore_kboard_configuration 952,29621
 cmd_error 970,30077
 cmd_error_internal 1024,31510
+DEFUN ("command-error-default-function", Fcommand_error_default_function,1043,32030
 DEFUN ("command-error-default-function", Fcommand_error_default_function,command-error-default-function
1043,32030
 static Lisp_Object command_loop_2 1086,33637
 static Lisp_Object top_level_1 1087,33686
@@ -1248,11 +1261,15 @@ command_loop 1094,33916
 command_loop_2 1134,35135
 top_level_2 1146,35339
 top_level_1 1152,35417
+DEFUN ("top-level", Ftop_level,1164,35787
 DEFUN ("top-level", Ftop_level,top-level
1164,35787
 user_error 1183,36288
+DEFUN ("exit-recursive-edit", Fexit_recursive_edit,1189,36429
 DEFUN ("exit-recursive-edit", Fexit_recursive_edit,exit-recursive-edit
1189,36429
+DEFUN ("abort-recursive-edit", Fabort_recursive_edit,1201,36819
 DEFUN ("abort-recursive-edit", Fabort_recursive_edit,abort-recursive-edit
1201,36819
 tracking_off 1216,37281
+DEFUN ("internal--track-mouse", Ftrack_mouse,1234,37816
 DEFUN ("internal--track-mouse", Ftrack_mouse,track-mouse
1234,37816
 bool ignore_mouse_drag_p;1256,38392
 some_mouse_moved 1259,38441
@@ -1320,6 +1337,7 @@ Lisp_Object pending_funcalls;4377,131172
 decode_timer 4381,131293
 timer_check_2 4414,132246
 timer_check 4572,136817
+DEFUN ("current-idle-time", Fcurrent_idle_time,4607,137662
 DEFUN ("current-idle-time", Fcurrent_idle_time,current-idle-time
4607,137662
 static Lisp_Object accent_key_syms;4625,138239
 static Lisp_Object func_key_syms;4626,138275
@@ -1366,10 +1384,12 @@ static Lisp_Object modifier_symbols;6327,189449
 lispy_modifier_list 6331,189586
 #define KEY_TO_CHAR(6353,190252
 parse_modifiers 6356,190328
+DEFUN ("internal-event-symbol-parse-modifiers", Fevent_symbol_parse_modifiers,6399,191517
 DEFUN ("internal-event-symbol-parse-modifiers", Fevent_symbol_parse_modifiers,event-symbol-parse-modifiers
6399,191517
 apply_modifiers 6422,192391
 reorder_modifiers 6491,194720
 modify_event_symbol 6536,196528
+DEFUN ("event-convert-list", Fevent_convert_list,6628,199244
 DEFUN ("event-convert-list", Fevent_convert_list,event-convert-list
6628,199244
 parse_solitary_modifier 6695,201135
 #define SINGLE_LETTER_MOD(6701,201258
@@ -1443,24 +1463,38 @@ keyremap_step 8811,261450
 test_undefined 8867,262934
 read_key_sequence 8916,264861
 read_key_sequence_vs 9826,295821
+DEFUN ("read-key-sequence", Fread_key_sequence,9885,297294
 DEFUN ("read-key-sequence", Fread_key_sequence,read-key-sequence
9885,297294
+DEFUN ("read-key-sequence-vector", Fread_key_sequence_vector,9938,299982
 DEFUN ("read-key-sequence-vector", Fread_key_sequence_vector,read-key-sequence-vector
9938,299982
 detect_input_pending 9950,300488
 detect_input_pending_ignore_squeezables 9959,300654
 detect_input_pending_run_timers 9967,300870
 clear_input_pending 9985,301362
 requeued_events_pending_p 9997,301732
+DEFUN ("input-pending-p", Finput_pending_p,10002,301813
 DEFUN ("input-pending-p", Finput_pending_p,input-pending-p
10002,301813
+DEFUN ("recent-keys", Frecent_keys,10024,302596
 DEFUN ("recent-keys", Frecent_keys,recent-keys
10024,302596
+DEFUN ("this-command-keys", Fthis_command_keys,10055,303517
 DEFUN ("this-command-keys", Fthis_command_keys,this-command-keys
10055,303517
+DEFUN ("this-command-keys-vector", Fthis_command_keys_vector,10068,303958
 DEFUN ("this-command-keys-vector", Fthis_command_keys_vector,this-command-keys-vector
10068,303958
+DEFUN ("this-single-command-keys", Fthis_single_command_keys,10080,304380
 DEFUN ("this-single-command-keys", Fthis_single_command_keys,this-single-command-keys
10080,304380
+DEFUN ("this-single-command-raw-keys", Fthis_single_command_raw_keys,10096,304955
 DEFUN ("this-single-command-raw-keys", Fthis_single_command_raw_keys,this-single-command-raw-keys
10096,304955
+DEFUN ("reset-this-command-lengths", Freset_this_command_lengths,10109,305495
 DEFUN ("reset-this-command-lengths", Freset_this_command_lengths,reset-this-command-lengths
10109,305495
+DEFUN ("clear-this-command-keys", Fclear_this_command_keys,10136,306510
 DEFUN ("clear-this-command-keys", Fclear_this_command_keys,clear-this-command-keys
10136,306510
+DEFUN ("recursion-depth", Frecursion_depth,10158,307069
 DEFUN ("recursion-depth", Frecursion_depth,recursion-depth
10158,307069
+DEFUN ("open-dribble-file", Fopen_dribble_file,10169,307406
 DEFUN ("open-dribble-file", Fopen_dribble_file,open-dribble-file
10169,307406
+DEFUN ("discard-input", Fdiscard_input,10203,308447
 DEFUN ("discard-input", Fdiscard_input,discard-input
10203,308447
+DEFUN ("suspend-emacs", Fsuspend_emacs,10225,308949
 DEFUN ("suspend-emacs", Fsuspend_emacs,suspend-emacs
10225,308949
 stuff_buffered_input 10285,311045
 set_waiting_for_input 10323,312016
@@ -1470,13 +1504,21 @@ deliver_interrupt_signal 10378,313642
 static int volatile force_quit_count;10387,313932
 handle_interrupt 10401,314414
 quit_throw_to_read_char 10541,318711
+DEFUN ("set-input-interrupt-mode", Fset_input_interrupt_mode,10562,319288
 DEFUN ("set-input-interrupt-mode", Fset_input_interrupt_mode,set-input-interrupt-mode
10562,319288
+DEFUN ("set-output-flow-control", Fset_output_flow_control,10609,320516
 DEFUN ("set-output-flow-control", Fset_output_flow_control,set-output-flow-control
10609,320516
+DEFUN ("set-input-meta-mode", Fset_input_meta_mode,10643,321432
 DEFUN ("set-input-meta-mode", Fset_input_meta_mode,set-input-meta-mode
10643,321432
+DEFUN ("set-quit-char", Fset_quit_char,10694,322706
 DEFUN ("set-quit-char", Fset_quit_char,set-quit-char
10694,322706
+DEFUN ("set-input-mode", Fset_input_mode,10729,323570
 DEFUN ("set-input-mode", Fset_input_mode,set-input-mode
10729,323570
+DEFUN ("current-input-mode", Fcurrent_input_mode,10750,324459
 DEFUN ("current-input-mode", Fcurrent_input_mode,current-input-mode
10750,324459
+DEFUN ("posn-at-x-y", Fposn_at_x_y,10787,325837
 DEFUN ("posn-at-x-y", Fposn_at_x_y,posn-at-x-y
10787,325837
+DEFUN ("posn-at-point", Fposn_at_point,10824,327060
 DEFUN ("posn-at-point", Fposn_at_point,posn-at-point
10824,327060
 init_kboard 10861,328214
 allocate_kboard 10893,329284
@@ -4913,7 +4955,7 @@ void bar(5,69
 int foobar(6,94
 interface_locate(9,131
 
-c.c,2136
+c.c,2280
 void (*fa)fa
131,
 void 132,
 my_printf 135,
@@ -4965,8 +5007,11 @@ short array[array
190,
 int f193,
 DEAFUN 196,
 XDEFUN 203,
+DEFUN ("x-get-selection-internal", Fx_get_selection_internal,206,
 DEFUN ("x-get-selection-internal", Fx_get_selection_internal,x-get-selection-internal
206,
+       Fx_get_selection_internal,212,
        Fx_get_selection_internal,x-get-selection-internal
212,
+      Fy_get_selection_internal,216,
       Fy_get_selection_internal,y-get-selection-internal
216,
 defun_func1(218,
 DEFUN_func2(220,