master d0be0965ca3: Fix etags tagging by multiline regexps

emacs-diffs
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master d0be0965ca3: Fix etags tagging by multiline regexps

From:	Eli Zaretskii
Subject:	master d0be0965ca3: Fix etags tagging by multiline regexps
Date:	Sat, 19 Oct 2024 04:19:31 -0400 (EDT)
branch: master
commit d0be0965ca344caab7879b2ac2373a68025c9ba2
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Fix etags tagging by multiline regexps
    
    * lib-src/etags.c (regex_tag_multiline): Fix off-by-one error in
    determining the end of the tag matched by a multiline regexp.
    (Bug#73771)
    
    * test/manual/etags/ETAGS.good_4:
    * test/manual/etags/ETAGS.good_5:
    * test/manual/etags/ETAGS.good_6: Adjust test results to the above
    change.
---
 lib-src/etags.c                |   2 +-
 test/manual/etags/ETAGS.good_4 | 166 ++++++++++++++++++++---------------------
 test/manual/etags/ETAGS.good_5 | 166 ++++++++++++++++++++---------------------
 test/manual/etags/ETAGS.good_6 | 166 ++++++++++++++++++++---------------------
 4 files changed, 250 insertions(+), 250 deletions(-)

diff --git a/lib-src/etags.c b/lib-src/etags.c
index a822a823a90..848d8ea73e3 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -7420,7 +7420,7 @@ regex_tag_multiline (void)
 
              /* Force explicit tag name, if a name is there. */
              pfnote (name, true, buffer + linecharno,
-                     charno - linecharno + 1, lineno, linecharno);
+                     charno - linecharno, lineno, linecharno);
 
              if (debug)
                fprintf (stderr, "%s on %s:%"PRIdMAX": %s\n",
diff --git a/test/manual/etags/ETAGS.good_4 b/test/manual/etags/ETAGS.good_4
index afde92702bb..0cb17fbbdb2 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/b138,2153
   protected body Bidule Bidule/b139,2181
   protected body Machin_T Machin_T/b146,2281
 
-c-src/abbrev.c,3055
+c-src/abbrev.c,3044
 Lisp_Object Vabbrev_table_name_list;43,1429
 Lisp_Object Vglobal_abbrev_table;48,1574
 Lisp_Object Vfundamental_mode_abbrev_table;52,1685
@@ -222,17 +222,17 @@ syms_of_abbrev 534,15885
   DEFVAR_PER_BUFFER ("local-abbrev-table"580,17852
   DEFVAR_BOOL ("abbrevs-changed"583,17995
   DEFVAR_BOOL ("abbrev-all-caps"588,18198
-  DEFVAR_LISP ("abbrev-table-name-list",\1536,15905
-  DEFVAR_LISP ("global-abbrev-table",\1542,16167
-  DEFVAR_LISP ("fundamental-mode-abbrev-table",\1549,16489
-  DEFVAR_LISP ("last-abbrev",\1555,16831
-  DEFVAR_LISP ("last-abbrev-text",\1558,16954
-  DEFVAR_INT ("last-abbrev-location",\1562,17112
-  DEFVAR_LISP ("abbrev-start-location",\1569,17311
-  DEFVAR_LISP ("abbrev-start-location-buffer",\1575,17588
-  DEFVAR_PER_BUFFER ("local-abbrev-table",\1580,17852
-  DEFVAR_BOOL ("abbrevs-changed",\1583,17995
-  DEFVAR_BOOL ("abbrev-all-caps",\1588,18198
+  DEFVAR_LISP ("abbrev-table-name-list"\1536,15905
+  DEFVAR_LISP ("global-abbrev-table"\1542,16167
+  DEFVAR_LISP ("fundamental-mode-abbrev-table"\1549,16489
+  DEFVAR_LISP ("last-abbrev"\1555,16831
+  DEFVAR_LISP ("last-abbrev-text"\1558,16954
+  DEFVAR_INT ("last-abbrev-location"\1562,17112
+  DEFVAR_LISP ("abbrev-start-location"\1569,17311
+  DEFVAR_LISP ("abbrev-start-location-buffer"\1575,17588
+  DEFVAR_PER_BUFFER ("local-abbrev-table"\1580,17852
+  DEFVAR_BOOL ("abbrevs-changed"\1583,17995
+  DEFVAR_BOOL ("abbrev-all-caps"\1588,18198
 
 c-src/torture.c,197
 (*tag1 tag118,452
@@ -859,7 +859,7 @@ typedef enum { RECC_ERROR 609,22954
 } re_wctype_t;618,23261
 typedef int re_wchar_t;623,23388
 
-c-src/emacs/src/keyboard.c,22931
+c-src/emacs/src/keyboard.c,22861
 volatile int interrupt_input_blocked;76,1809
 volatile bool pending_signals;80,1945
 #define KBD_BUFFER_SIZE 82,1977
@@ -1278,76 +1278,76 @@ syms_of_keyboard 11045,333580
   DEFVAR_LISP ("debug-on-event"11825,366557
 keys_of_keyboard 11841,367118
 mark_kboards 11916,370437
-  DEFVAR_LISP ("internal--top-level-message",\111058,333975
-  DEFVAR_LISP ("last-command-event",\111312,342176
-  DEFVAR_LISP ("last-nonmenu-event",\111315,342300
-  DEFVAR_LISP ("last-input-event",\111321,342639
-  DEFVAR_LISP ("unread-command-events",\111324,342733
-  DEFVAR_LISP ("unread-post-input-method-events",\111332,343193
-  DEFVAR_LISP ("unread-input-method-events",\111338,343532
-  DEFVAR_LISP ("meta-prefix-char",\111346,343901
-  DEFVAR_KBOARD ("last-command",\111351,344109
-  DEFVAR_KBOARD ("real-last-command",\111368,344790
-  DEFVAR_KBOARD ("last-repeatable-command",\111372,344976
-  DEFVAR_LISP ("this-command",\111378,345264
-  DEFVAR_LISP ("real-this-command",\111384,345501
-  DEFVAR_LISP ("this-command-keys-shift-translated",\111388,345683
-  DEFVAR_LISP ("this-original-command",\111396,346126
-  DEFVAR_INT ("auto-save-interval",\111403,346523
-  DEFVAR_LISP ("auto-save-timeout",\111408,346737
-  DEFVAR_LISP ("echo-keystrokes",\111415,347082
-  DEFVAR_INT ("polling-period",\111421,347353
-  DEFVAR_LISP ("double-click-time",\111428,347696
-  DEFVAR_INT ("double-click-fuzz",\111435,348032
-  DEFVAR_INT ("num-input-keys",\111446,348522
-  DEFVAR_INT ("num-nonmacro-input-events",\111452,348797
-  DEFVAR_LISP ("last-event-frame",\111457,349035
-  DEFVAR_LISP ("tty-erase-char",\111463,349314
-  DEFVAR_LISP ("help-char",\111466,349437
-  DEFVAR_LISP ("help-event-list",\111472,349720
-  DEFVAR_LISP ("help-form",\111477,349931
-  DEFVAR_LISP ("prefix-help-command",\111483,350179
-  DEFVAR_LISP ("top-level",\111489,350457
-  DEFVAR_KBOARD ("keyboard-translate-table",\111495,350678
-  DEFVAR_BOOL ("cannot-suspend",\111511,351491
-  DEFVAR_BOOL ("menu-prompting",\111516,351718
-  DEFVAR_LISP ("menu-prompt-more-char",\111526,352148
-  DEFVAR_INT ("extra-keyboard-modifiers",\111531,352394
-  DEFVAR_LISP ("deactivate-mark",\111545,353120
-  DEFVAR_LISP ("pre-command-hook",\111553,353489
-  DEFVAR_LISP ("post-command-hook",\111560,353844
-  DEFVAR_LISP ("echo-area-clear-hook",\111568,354207
-  DEFVAR_LISP ("lucid-menu-bar-dirty-flag",\111574,354422
-  DEFVAR_LISP ("menu-bar-final-items",\111578,354625
-  DEFVAR_LISP ("tool-bar-separator-image-expression",\111583,354875
-  DEFVAR_KBOARD ("overriding-terminal-local-map",\111589,355233
-  DEFVAR_LISP ("overriding-local-map",\111598,355655
-  DEFVAR_LISP ("overriding-local-map-menu-flag",\111607,356106
-  DEFVAR_LISP ("special-event-map",\111613,356445
-  DEFVAR_LISP ("track-mouse",\111617,356633
-  DEFVAR_KBOARD ("system-key-alist",\111620,356760
-  DEFVAR_KBOARD ("local-function-key-map",\111629,357141
-  DEFVAR_KBOARD ("input-decode-map",\111658,358600
-  DEFVAR_LISP ("function-key-map",\111675,359388
-  DEFVAR_LISP ("key-translation-map",\111683,359804
-  DEFVAR_LISP ("deferred-action-list",\111689,360148
-  DEFVAR_LISP ("deferred-action-function",\111694,360396
-  DEFVAR_LISP ("delayed-warnings-list",\111700,360695
-  DEFVAR_LISP ("timer-list",\111708,361103
-  DEFVAR_LISP ("timer-idle-list",\111712,361255
-  DEFVAR_LISP ("input-method-function",\111716,361418
-  DEFVAR_LISP ("input-method-previous-message",\111737,362387
-  DEFVAR_LISP ("show-help-function",\111744,362748
-  DEFVAR_LISP ("disable-point-adjustment",\111749,362980
-  DEFVAR_LISP ("global-disable-point-adjustment",\111761,363530
-  DEFVAR_LISP ("minibuffer-message-timeout",\111770,363896
-  DEFVAR_LISP ("throw-on-input",\111775,364174
-  DEFVAR_LISP ("command-error-function",\111781,364425
-  DEFVAR_LISP ("enable-disabled-menus-and-buttons",\111790,364912
-  DEFVAR_LISP ("select-active-regions",\111798,365239
-  DEFVAR_LISP ("saved-region-selection",\111807,365631
-  DEFVAR_LISP ("selection-inhibit-update-commands",\111815,366016
-  DEFVAR_LISP ("debug-on-event",\111825,366557
+  DEFVAR_LISP ("internal--top-level-message"\111058,333975
+  DEFVAR_LISP ("last-command-event"\111312,342176
+  DEFVAR_LISP ("last-nonmenu-event"\111315,342300
+  DEFVAR_LISP ("last-input-event"\111321,342639
+  DEFVAR_LISP ("unread-command-events"\111324,342733
+  DEFVAR_LISP ("unread-post-input-method-events"\111332,343193
+  DEFVAR_LISP ("unread-input-method-events"\111338,343532
+  DEFVAR_LISP ("meta-prefix-char"\111346,343901
+  DEFVAR_KBOARD ("last-command"\111351,344109
+  DEFVAR_KBOARD ("real-last-command"\111368,344790
+  DEFVAR_KBOARD ("last-repeatable-command"\111372,344976
+  DEFVAR_LISP ("this-command"\111378,345264
+  DEFVAR_LISP ("real-this-command"\111384,345501
+  DEFVAR_LISP ("this-command-keys-shift-translated"\111388,345683
+  DEFVAR_LISP ("this-original-command"\111396,346126
+  DEFVAR_INT ("auto-save-interval"\111403,346523
+  DEFVAR_LISP ("auto-save-timeout"\111408,346737
+  DEFVAR_LISP ("echo-keystrokes"\111415,347082
+  DEFVAR_INT ("polling-period"\111421,347353
+  DEFVAR_LISP ("double-click-time"\111428,347696
+  DEFVAR_INT ("double-click-fuzz"\111435,348032
+  DEFVAR_INT ("num-input-keys"\111446,348522
+  DEFVAR_INT ("num-nonmacro-input-events"\111452,348797
+  DEFVAR_LISP ("last-event-frame"\111457,349035
+  DEFVAR_LISP ("tty-erase-char"\111463,349314
+  DEFVAR_LISP ("help-char"\111466,349437
+  DEFVAR_LISP ("help-event-list"\111472,349720
+  DEFVAR_LISP ("help-form"\111477,349931
+  DEFVAR_LISP ("prefix-help-command"\111483,350179
+  DEFVAR_LISP ("top-level"\111489,350457
+  DEFVAR_KBOARD ("keyboard-translate-table"\111495,350678
+  DEFVAR_BOOL ("cannot-suspend"\111511,351491
+  DEFVAR_BOOL ("menu-prompting"\111516,351718
+  DEFVAR_LISP ("menu-prompt-more-char"\111526,352148
+  DEFVAR_INT ("extra-keyboard-modifiers"\111531,352394
+  DEFVAR_LISP ("deactivate-mark"\111545,353120
+  DEFVAR_LISP ("pre-command-hook"\111553,353489
+  DEFVAR_LISP ("post-command-hook"\111560,353844
+  DEFVAR_LISP ("echo-area-clear-hook"\111568,354207
+  DEFVAR_LISP ("lucid-menu-bar-dirty-flag"\111574,354422
+  DEFVAR_LISP ("menu-bar-final-items"\111578,354625
+  DEFVAR_LISP ("tool-bar-separator-image-expression"\111583,354875
+  DEFVAR_KBOARD ("overriding-terminal-local-map"\111589,355233
+  DEFVAR_LISP ("overriding-local-map"\111598,355655
+  DEFVAR_LISP ("overriding-local-map-menu-flag"\111607,356106
+  DEFVAR_LISP ("special-event-map"\111613,356445
+  DEFVAR_LISP ("track-mouse"\111617,356633
+  DEFVAR_KBOARD ("system-key-alist"\111620,356760
+  DEFVAR_KBOARD ("local-function-key-map"\111629,357141
+  DEFVAR_KBOARD ("input-decode-map"\111658,358600
+  DEFVAR_LISP ("function-key-map"\111675,359388
+  DEFVAR_LISP ("key-translation-map"\111683,359804
+  DEFVAR_LISP ("deferred-action-list"\111689,360148
+  DEFVAR_LISP ("deferred-action-function"\111694,360396
+  DEFVAR_LISP ("delayed-warnings-list"\111700,360695
+  DEFVAR_LISP ("timer-list"\111708,361103
+  DEFVAR_LISP ("timer-idle-list"\111712,361255
+  DEFVAR_LISP ("input-method-function"\111716,361418
+  DEFVAR_LISP ("input-method-previous-message"\111737,362387
+  DEFVAR_LISP ("show-help-function"\111744,362748
+  DEFVAR_LISP ("disable-point-adjustment"\111749,362980
+  DEFVAR_LISP ("global-disable-point-adjustment"\111761,363530
+  DEFVAR_LISP ("minibuffer-message-timeout"\111770,363896
+  DEFVAR_LISP ("throw-on-input"\111775,364174
+  DEFVAR_LISP ("command-error-function"\111781,364425
+  DEFVAR_LISP ("enable-disabled-menus-and-buttons"\111790,364912
+  DEFVAR_LISP ("select-active-regions"\111798,365239
+  DEFVAR_LISP ("saved-region-selection"\111807,365631
+  DEFVAR_LISP ("selection-inhibit-update-commands"\111815,366016
+  DEFVAR_LISP ("debug-on-event"\111825,366557
 
 c-src/emacs/src/lisp.h,20276
 #define EMACS_LISP_H22,801
diff --git a/test/manual/etags/ETAGS.good_5 b/test/manual/etags/ETAGS.good_5
index 26385943f2d..42f30f2fe19 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/b138,2153
   protected body Bidule Bidule/b139,2181
   protected body Machin_T Machin_T/b146,2281
 
-c-src/abbrev.c,3055
+c-src/abbrev.c,3044
 Lisp_Object Vabbrev_table_name_list;43,1429
 Lisp_Object Vglobal_abbrev_table;48,1574
 Lisp_Object Vfundamental_mode_abbrev_table;52,1685
@@ -222,17 +222,17 @@ syms_of_abbrev 534,15885
   DEFVAR_PER_BUFFER ("local-abbrev-table"580,17852
   DEFVAR_BOOL ("abbrevs-changed"583,17995
   DEFVAR_BOOL ("abbrev-all-caps"588,18198
-  DEFVAR_LISP ("abbrev-table-name-list",\1536,15905
-  DEFVAR_LISP ("global-abbrev-table",\1542,16167
-  DEFVAR_LISP ("fundamental-mode-abbrev-table",\1549,16489
-  DEFVAR_LISP ("last-abbrev",\1555,16831
-  DEFVAR_LISP ("last-abbrev-text",\1558,16954
-  DEFVAR_INT ("last-abbrev-location",\1562,17112
-  DEFVAR_LISP ("abbrev-start-location",\1569,17311
-  DEFVAR_LISP ("abbrev-start-location-buffer",\1575,17588
-  DEFVAR_PER_BUFFER ("local-abbrev-table",\1580,17852
-  DEFVAR_BOOL ("abbrevs-changed",\1583,17995
-  DEFVAR_BOOL ("abbrev-all-caps",\1588,18198
+  DEFVAR_LISP ("abbrev-table-name-list"\1536,15905
+  DEFVAR_LISP ("global-abbrev-table"\1542,16167
+  DEFVAR_LISP ("fundamental-mode-abbrev-table"\1549,16489
+  DEFVAR_LISP ("last-abbrev"\1555,16831
+  DEFVAR_LISP ("last-abbrev-text"\1558,16954
+  DEFVAR_INT ("last-abbrev-location"\1562,17112
+  DEFVAR_LISP ("abbrev-start-location"\1569,17311
+  DEFVAR_LISP ("abbrev-start-location-buffer"\1575,17588
+  DEFVAR_PER_BUFFER ("local-abbrev-table"\1580,17852
+  DEFVAR_BOOL ("abbrevs-changed"\1583,17995
+  DEFVAR_BOOL ("abbrev-all-caps"\1588,18198
 
 c-src/torture.c,197
 (*tag1 tag118,452
@@ -1125,7 +1125,7 @@ extern re_wctype_t re_wctype 621,23330
 typedef int re_wchar_t;623,23388
 extern void re_set_whitespace_regexp 625,23413
 
-c-src/emacs/src/keyboard.c,25243
+c-src/emacs/src/keyboard.c,25173
 volatile int interrupt_input_blocked;76,1809
 volatile bool pending_signals;80,1945
 #define KBD_BUFFER_SIZE 82,1977
@@ -1598,76 +1598,76 @@ syms_of_keyboard 11045,333580
   DEFVAR_LISP ("debug-on-event"11825,366557
 keys_of_keyboard 11841,367118
 mark_kboards 11916,370437
-  DEFVAR_LISP ("internal--top-level-message",\111058,333975
-  DEFVAR_LISP ("last-command-event",\111312,342176
-  DEFVAR_LISP ("last-nonmenu-event",\111315,342300
-  DEFVAR_LISP ("last-input-event",\111321,342639
-  DEFVAR_LISP ("unread-command-events",\111324,342733
-  DEFVAR_LISP ("unread-post-input-method-events",\111332,343193
-  DEFVAR_LISP ("unread-input-method-events",\111338,343532
-  DEFVAR_LISP ("meta-prefix-char",\111346,343901
-  DEFVAR_KBOARD ("last-command",\111351,344109
-  DEFVAR_KBOARD ("real-last-command",\111368,344790
-  DEFVAR_KBOARD ("last-repeatable-command",\111372,344976
-  DEFVAR_LISP ("this-command",\111378,345264
-  DEFVAR_LISP ("real-this-command",\111384,345501
-  DEFVAR_LISP ("this-command-keys-shift-translated",\111388,345683
-  DEFVAR_LISP ("this-original-command",\111396,346126
-  DEFVAR_INT ("auto-save-interval",\111403,346523
-  DEFVAR_LISP ("auto-save-timeout",\111408,346737
-  DEFVAR_LISP ("echo-keystrokes",\111415,347082
-  DEFVAR_INT ("polling-period",\111421,347353
-  DEFVAR_LISP ("double-click-time",\111428,347696
-  DEFVAR_INT ("double-click-fuzz",\111435,348032
-  DEFVAR_INT ("num-input-keys",\111446,348522
-  DEFVAR_INT ("num-nonmacro-input-events",\111452,348797
-  DEFVAR_LISP ("last-event-frame",\111457,349035
-  DEFVAR_LISP ("tty-erase-char",\111463,349314
-  DEFVAR_LISP ("help-char",\111466,349437
-  DEFVAR_LISP ("help-event-list",\111472,349720
-  DEFVAR_LISP ("help-form",\111477,349931
-  DEFVAR_LISP ("prefix-help-command",\111483,350179
-  DEFVAR_LISP ("top-level",\111489,350457
-  DEFVAR_KBOARD ("keyboard-translate-table",\111495,350678
-  DEFVAR_BOOL ("cannot-suspend",\111511,351491
-  DEFVAR_BOOL ("menu-prompting",\111516,351718
-  DEFVAR_LISP ("menu-prompt-more-char",\111526,352148
-  DEFVAR_INT ("extra-keyboard-modifiers",\111531,352394
-  DEFVAR_LISP ("deactivate-mark",\111545,353120
-  DEFVAR_LISP ("pre-command-hook",\111553,353489
-  DEFVAR_LISP ("post-command-hook",\111560,353844
-  DEFVAR_LISP ("echo-area-clear-hook",\111568,354207
-  DEFVAR_LISP ("lucid-menu-bar-dirty-flag",\111574,354422
-  DEFVAR_LISP ("menu-bar-final-items",\111578,354625
-  DEFVAR_LISP ("tool-bar-separator-image-expression",\111583,354875
-  DEFVAR_KBOARD ("overriding-terminal-local-map",\111589,355233
-  DEFVAR_LISP ("overriding-local-map",\111598,355655
-  DEFVAR_LISP ("overriding-local-map-menu-flag",\111607,356106
-  DEFVAR_LISP ("special-event-map",\111613,356445
-  DEFVAR_LISP ("track-mouse",\111617,356633
-  DEFVAR_KBOARD ("system-key-alist",\111620,356760
-  DEFVAR_KBOARD ("local-function-key-map",\111629,357141
-  DEFVAR_KBOARD ("input-decode-map",\111658,358600
-  DEFVAR_LISP ("function-key-map",\111675,359388
-  DEFVAR_LISP ("key-translation-map",\111683,359804
-  DEFVAR_LISP ("deferred-action-list",\111689,360148
-  DEFVAR_LISP ("deferred-action-function",\111694,360396
-  DEFVAR_LISP ("delayed-warnings-list",\111700,360695
-  DEFVAR_LISP ("timer-list",\111708,361103
-  DEFVAR_LISP ("timer-idle-list",\111712,361255
-  DEFVAR_LISP ("input-method-function",\111716,361418
-  DEFVAR_LISP ("input-method-previous-message",\111737,362387
-  DEFVAR_LISP ("show-help-function",\111744,362748
-  DEFVAR_LISP ("disable-point-adjustment",\111749,362980
-  DEFVAR_LISP ("global-disable-point-adjustment",\111761,363530
-  DEFVAR_LISP ("minibuffer-message-timeout",\111770,363896
-  DEFVAR_LISP ("throw-on-input",\111775,364174
-  DEFVAR_LISP ("command-error-function",\111781,364425
-  DEFVAR_LISP ("enable-disabled-menus-and-buttons",\111790,364912
-  DEFVAR_LISP ("select-active-regions",\111798,365239
-  DEFVAR_LISP ("saved-region-selection",\111807,365631
-  DEFVAR_LISP ("selection-inhibit-update-commands",\111815,366016
-  DEFVAR_LISP ("debug-on-event",\111825,366557
+  DEFVAR_LISP ("internal--top-level-message"\111058,333975
+  DEFVAR_LISP ("last-command-event"\111312,342176
+  DEFVAR_LISP ("last-nonmenu-event"\111315,342300
+  DEFVAR_LISP ("last-input-event"\111321,342639
+  DEFVAR_LISP ("unread-command-events"\111324,342733
+  DEFVAR_LISP ("unread-post-input-method-events"\111332,343193
+  DEFVAR_LISP ("unread-input-method-events"\111338,343532
+  DEFVAR_LISP ("meta-prefix-char"\111346,343901
+  DEFVAR_KBOARD ("last-command"\111351,344109
+  DEFVAR_KBOARD ("real-last-command"\111368,344790
+  DEFVAR_KBOARD ("last-repeatable-command"\111372,344976
+  DEFVAR_LISP ("this-command"\111378,345264
+  DEFVAR_LISP ("real-this-command"\111384,345501
+  DEFVAR_LISP ("this-command-keys-shift-translated"\111388,345683
+  DEFVAR_LISP ("this-original-command"\111396,346126
+  DEFVAR_INT ("auto-save-interval"\111403,346523
+  DEFVAR_LISP ("auto-save-timeout"\111408,346737
+  DEFVAR_LISP ("echo-keystrokes"\111415,347082
+  DEFVAR_INT ("polling-period"\111421,347353
+  DEFVAR_LISP ("double-click-time"\111428,347696
+  DEFVAR_INT ("double-click-fuzz"\111435,348032
+  DEFVAR_INT ("num-input-keys"\111446,348522
+  DEFVAR_INT ("num-nonmacro-input-events"\111452,348797
+  DEFVAR_LISP ("last-event-frame"\111457,349035
+  DEFVAR_LISP ("tty-erase-char"\111463,349314
+  DEFVAR_LISP ("help-char"\111466,349437
+  DEFVAR_LISP ("help-event-list"\111472,349720
+  DEFVAR_LISP ("help-form"\111477,349931
+  DEFVAR_LISP ("prefix-help-command"\111483,350179
+  DEFVAR_LISP ("top-level"\111489,350457
+  DEFVAR_KBOARD ("keyboard-translate-table"\111495,350678
+  DEFVAR_BOOL ("cannot-suspend"\111511,351491
+  DEFVAR_BOOL ("menu-prompting"\111516,351718
+  DEFVAR_LISP ("menu-prompt-more-char"\111526,352148
+  DEFVAR_INT ("extra-keyboard-modifiers"\111531,352394
+  DEFVAR_LISP ("deactivate-mark"\111545,353120
+  DEFVAR_LISP ("pre-command-hook"\111553,353489
+  DEFVAR_LISP ("post-command-hook"\111560,353844
+  DEFVAR_LISP ("echo-area-clear-hook"\111568,354207
+  DEFVAR_LISP ("lucid-menu-bar-dirty-flag"\111574,354422
+  DEFVAR_LISP ("menu-bar-final-items"\111578,354625
+  DEFVAR_LISP ("tool-bar-separator-image-expression"\111583,354875
+  DEFVAR_KBOARD ("overriding-terminal-local-map"\111589,355233
+  DEFVAR_LISP ("overriding-local-map"\111598,355655
+  DEFVAR_LISP ("overriding-local-map-menu-flag"\111607,356106
+  DEFVAR_LISP ("special-event-map"\111613,356445
+  DEFVAR_LISP ("track-mouse"\111617,356633
+  DEFVAR_KBOARD ("system-key-alist"\111620,356760
+  DEFVAR_KBOARD ("local-function-key-map"\111629,357141
+  DEFVAR_KBOARD ("input-decode-map"\111658,358600
+  DEFVAR_LISP ("function-key-map"\111675,359388
+  DEFVAR_LISP ("key-translation-map"\111683,359804
+  DEFVAR_LISP ("deferred-action-list"\111689,360148
+  DEFVAR_LISP ("deferred-action-function"\111694,360396
+  DEFVAR_LISP ("delayed-warnings-list"\111700,360695
+  DEFVAR_LISP ("timer-list"\111708,361103
+  DEFVAR_LISP ("timer-idle-list"\111712,361255
+  DEFVAR_LISP ("input-method-function"\111716,361418
+  DEFVAR_LISP ("input-method-previous-message"\111737,362387
+  DEFVAR_LISP ("show-help-function"\111744,362748
+  DEFVAR_LISP ("disable-point-adjustment"\111749,362980
+  DEFVAR_LISP ("global-disable-point-adjustment"\111761,363530
+  DEFVAR_LISP ("minibuffer-message-timeout"\111770,363896
+  DEFVAR_LISP ("throw-on-input"\111775,364174
+  DEFVAR_LISP ("command-error-function"\111781,364425
+  DEFVAR_LISP ("enable-disabled-menus-and-buttons"\111790,364912
+  DEFVAR_LISP ("select-active-regions"\111798,365239
+  DEFVAR_LISP ("saved-region-selection"\111807,365631
+  DEFVAR_LISP ("selection-inhibit-update-commands"\111815,366016
+  DEFVAR_LISP ("debug-on-event"\111825,366557
 
 c-src/emacs/src/lisp.h,41391
 #define EMACS_LISP_H22,801
diff --git a/test/manual/etags/ETAGS.good_6 b/test/manual/etags/ETAGS.good_6
index 35265f606c2..e6c83fc9140 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/b138,2153
   protected body Bidule Bidule/b139,2181
   protected body Machin_T Machin_T/b146,2281
 
-c-src/abbrev.c,3055
+c-src/abbrev.c,3044
 Lisp_Object Vabbrev_table_name_list;43,1429
 Lisp_Object Vglobal_abbrev_table;48,1574
 Lisp_Object Vfundamental_mode_abbrev_table;52,1685
@@ -222,17 +222,17 @@ syms_of_abbrev 534,15885
   DEFVAR_PER_BUFFER ("local-abbrev-table"580,17852
   DEFVAR_BOOL ("abbrevs-changed"583,17995
   DEFVAR_BOOL ("abbrev-all-caps"588,18198
-  DEFVAR_LISP ("abbrev-table-name-list",\1536,15905
-  DEFVAR_LISP ("global-abbrev-table",\1542,16167
-  DEFVAR_LISP ("fundamental-mode-abbrev-table",\1549,16489
-  DEFVAR_LISP ("last-abbrev",\1555,16831
-  DEFVAR_LISP ("last-abbrev-text",\1558,16954
-  DEFVAR_INT ("last-abbrev-location",\1562,17112
-  DEFVAR_LISP ("abbrev-start-location",\1569,17311
-  DEFVAR_LISP ("abbrev-start-location-buffer",\1575,17588
-  DEFVAR_PER_BUFFER ("local-abbrev-table",\1580,17852
-  DEFVAR_BOOL ("abbrevs-changed",\1583,17995
-  DEFVAR_BOOL ("abbrev-all-caps",\1588,18198
+  DEFVAR_LISP ("abbrev-table-name-list"\1536,15905
+  DEFVAR_LISP ("global-abbrev-table"\1542,16167
+  DEFVAR_LISP ("fundamental-mode-abbrev-table"\1549,16489
+  DEFVAR_LISP ("last-abbrev"\1555,16831
+  DEFVAR_LISP ("last-abbrev-text"\1558,16954
+  DEFVAR_INT ("last-abbrev-location"\1562,17112
+  DEFVAR_LISP ("abbrev-start-location"\1569,17311
+  DEFVAR_LISP ("abbrev-start-location-buffer"\1575,17588
+  DEFVAR_PER_BUFFER ("local-abbrev-table"\1580,17852
+  DEFVAR_BOOL ("abbrevs-changed"\1583,17995
+  DEFVAR_BOOL ("abbrev-all-caps"\1588,18198
 
 c-src/torture.c,197
 (*tag1 tag118,452
@@ -1125,7 +1125,7 @@ extern re_wctype_t re_wctype 621,23330
 typedef int re_wchar_t;623,23388
 extern void re_set_whitespace_regexp 625,23413
 
-c-src/emacs/src/keyboard.c,25243
+c-src/emacs/src/keyboard.c,25173
 volatile int interrupt_input_blocked;76,1809
 volatile bool pending_signals;80,1945
 #define KBD_BUFFER_SIZE 82,1977
@@ -1598,76 +1598,76 @@ syms_of_keyboard 11045,333580
   DEFVAR_LISP ("debug-on-event"11825,366557
 keys_of_keyboard 11841,367118
 mark_kboards 11916,370437
-  DEFVAR_LISP ("internal--top-level-message",\111058,333975
-  DEFVAR_LISP ("last-command-event",\111312,342176
-  DEFVAR_LISP ("last-nonmenu-event",\111315,342300
-  DEFVAR_LISP ("last-input-event",\111321,342639
-  DEFVAR_LISP ("unread-command-events",\111324,342733
-  DEFVAR_LISP ("unread-post-input-method-events",\111332,343193
-  DEFVAR_LISP ("unread-input-method-events",\111338,343532
-  DEFVAR_LISP ("meta-prefix-char",\111346,343901
-  DEFVAR_KBOARD ("last-command",\111351,344109
-  DEFVAR_KBOARD ("real-last-command",\111368,344790
-  DEFVAR_KBOARD ("last-repeatable-command",\111372,344976
-  DEFVAR_LISP ("this-command",\111378,345264
-  DEFVAR_LISP ("real-this-command",\111384,345501
-  DEFVAR_LISP ("this-command-keys-shift-translated",\111388,345683
-  DEFVAR_LISP ("this-original-command",\111396,346126
-  DEFVAR_INT ("auto-save-interval",\111403,346523
-  DEFVAR_LISP ("auto-save-timeout",\111408,346737
-  DEFVAR_LISP ("echo-keystrokes",\111415,347082
-  DEFVAR_INT ("polling-period",\111421,347353
-  DEFVAR_LISP ("double-click-time",\111428,347696
-  DEFVAR_INT ("double-click-fuzz",\111435,348032
-  DEFVAR_INT ("num-input-keys",\111446,348522
-  DEFVAR_INT ("num-nonmacro-input-events",\111452,348797
-  DEFVAR_LISP ("last-event-frame",\111457,349035
-  DEFVAR_LISP ("tty-erase-char",\111463,349314
-  DEFVAR_LISP ("help-char",\111466,349437
-  DEFVAR_LISP ("help-event-list",\111472,349720
-  DEFVAR_LISP ("help-form",\111477,349931
-  DEFVAR_LISP ("prefix-help-command",\111483,350179
-  DEFVAR_LISP ("top-level",\111489,350457
-  DEFVAR_KBOARD ("keyboard-translate-table",\111495,350678
-  DEFVAR_BOOL ("cannot-suspend",\111511,351491
-  DEFVAR_BOOL ("menu-prompting",\111516,351718
-  DEFVAR_LISP ("menu-prompt-more-char",\111526,352148
-  DEFVAR_INT ("extra-keyboard-modifiers",\111531,352394
-  DEFVAR_LISP ("deactivate-mark",\111545,353120
-  DEFVAR_LISP ("pre-command-hook",\111553,353489
-  DEFVAR_LISP ("post-command-hook",\111560,353844
-  DEFVAR_LISP ("echo-area-clear-hook",\111568,354207
-  DEFVAR_LISP ("lucid-menu-bar-dirty-flag",\111574,354422
-  DEFVAR_LISP ("menu-bar-final-items",\111578,354625
-  DEFVAR_LISP ("tool-bar-separator-image-expression",\111583,354875
-  DEFVAR_KBOARD ("overriding-terminal-local-map",\111589,355233
-  DEFVAR_LISP ("overriding-local-map",\111598,355655
-  DEFVAR_LISP ("overriding-local-map-menu-flag",\111607,356106
-  DEFVAR_LISP ("special-event-map",\111613,356445
-  DEFVAR_LISP ("track-mouse",\111617,356633
-  DEFVAR_KBOARD ("system-key-alist",\111620,356760
-  DEFVAR_KBOARD ("local-function-key-map",\111629,357141
-  DEFVAR_KBOARD ("input-decode-map",\111658,358600
-  DEFVAR_LISP ("function-key-map",\111675,359388
-  DEFVAR_LISP ("key-translation-map",\111683,359804
-  DEFVAR_LISP ("deferred-action-list",\111689,360148
-  DEFVAR_LISP ("deferred-action-function",\111694,360396
-  DEFVAR_LISP ("delayed-warnings-list",\111700,360695
-  DEFVAR_LISP ("timer-list",\111708,361103
-  DEFVAR_LISP ("timer-idle-list",\111712,361255
-  DEFVAR_LISP ("input-method-function",\111716,361418
-  DEFVAR_LISP ("input-method-previous-message",\111737,362387
-  DEFVAR_LISP ("show-help-function",\111744,362748
-  DEFVAR_LISP ("disable-point-adjustment",\111749,362980
-  DEFVAR_LISP ("global-disable-point-adjustment",\111761,363530
-  DEFVAR_LISP ("minibuffer-message-timeout",\111770,363896
-  DEFVAR_LISP ("throw-on-input",\111775,364174
-  DEFVAR_LISP ("command-error-function",\111781,364425
-  DEFVAR_LISP ("enable-disabled-menus-and-buttons",\111790,364912
-  DEFVAR_LISP ("select-active-regions",\111798,365239
-  DEFVAR_LISP ("saved-region-selection",\111807,365631
-  DEFVAR_LISP ("selection-inhibit-update-commands",\111815,366016
-  DEFVAR_LISP ("debug-on-event",\111825,366557
+  DEFVAR_LISP ("internal--top-level-message"\111058,333975
+  DEFVAR_LISP ("last-command-event"\111312,342176
+  DEFVAR_LISP ("last-nonmenu-event"\111315,342300
+  DEFVAR_LISP ("last-input-event"\111321,342639
+  DEFVAR_LISP ("unread-command-events"\111324,342733
+  DEFVAR_LISP ("unread-post-input-method-events"\111332,343193
+  DEFVAR_LISP ("unread-input-method-events"\111338,343532
+  DEFVAR_LISP ("meta-prefix-char"\111346,343901
+  DEFVAR_KBOARD ("last-command"\111351,344109
+  DEFVAR_KBOARD ("real-last-command"\111368,344790
+  DEFVAR_KBOARD ("last-repeatable-command"\111372,344976
+  DEFVAR_LISP ("this-command"\111378,345264
+  DEFVAR_LISP ("real-this-command"\111384,345501
+  DEFVAR_LISP ("this-command-keys-shift-translated"\111388,345683
+  DEFVAR_LISP ("this-original-command"\111396,346126
+  DEFVAR_INT ("auto-save-interval"\111403,346523
+  DEFVAR_LISP ("auto-save-timeout"\111408,346737
+  DEFVAR_LISP ("echo-keystrokes"\111415,347082
+  DEFVAR_INT ("polling-period"\111421,347353
+  DEFVAR_LISP ("double-click-time"\111428,347696
+  DEFVAR_INT ("double-click-fuzz"\111435,348032
+  DEFVAR_INT ("num-input-keys"\111446,348522
+  DEFVAR_INT ("num-nonmacro-input-events"\111452,348797
+  DEFVAR_LISP ("last-event-frame"\111457,349035
+  DEFVAR_LISP ("tty-erase-char"\111463,349314
+  DEFVAR_LISP ("help-char"\111466,349437
+  DEFVAR_LISP ("help-event-list"\111472,349720
+  DEFVAR_LISP ("help-form"\111477,349931
+  DEFVAR_LISP ("prefix-help-command"\111483,350179
+  DEFVAR_LISP ("top-level"\111489,350457
+  DEFVAR_KBOARD ("keyboard-translate-table"\111495,350678
+  DEFVAR_BOOL ("cannot-suspend"\111511,351491
+  DEFVAR_BOOL ("menu-prompting"\111516,351718
+  DEFVAR_LISP ("menu-prompt-more-char"\111526,352148
+  DEFVAR_INT ("extra-keyboard-modifiers"\111531,352394
+  DEFVAR_LISP ("deactivate-mark"\111545,353120
+  DEFVAR_LISP ("pre-command-hook"\111553,353489
+  DEFVAR_LISP ("post-command-hook"\111560,353844
+  DEFVAR_LISP ("echo-area-clear-hook"\111568,354207
+  DEFVAR_LISP ("lucid-menu-bar-dirty-flag"\111574,354422
+  DEFVAR_LISP ("menu-bar-final-items"\111578,354625
+  DEFVAR_LISP ("tool-bar-separator-image-expression"\111583,354875
+  DEFVAR_KBOARD ("overriding-terminal-local-map"\111589,355233
+  DEFVAR_LISP ("overriding-local-map"\111598,355655
+  DEFVAR_LISP ("overriding-local-map-menu-flag"\111607,356106
+  DEFVAR_LISP ("special-event-map"\111613,356445
+  DEFVAR_LISP ("track-mouse"\111617,356633
+  DEFVAR_KBOARD ("system-key-alist"\111620,356760
+  DEFVAR_KBOARD ("local-function-key-map"\111629,357141
+  DEFVAR_KBOARD ("input-decode-map"\111658,358600
+  DEFVAR_LISP ("function-key-map"\111675,359388
+  DEFVAR_LISP ("key-translation-map"\111683,359804
+  DEFVAR_LISP ("deferred-action-list"\111689,360148
+  DEFVAR_LISP ("deferred-action-function"\111694,360396
+  DEFVAR_LISP ("delayed-warnings-list"\111700,360695
+  DEFVAR_LISP ("timer-list"\111708,361103
+  DEFVAR_LISP ("timer-idle-list"\111712,361255
+  DEFVAR_LISP ("input-method-function"\111716,361418
+  DEFVAR_LISP ("input-method-previous-message"\111737,362387
+  DEFVAR_LISP ("show-help-function"\111744,362748
+  DEFVAR_LISP ("disable-point-adjustment"\111749,362980
+  DEFVAR_LISP ("global-disable-point-adjustment"\111761,363530
+  DEFVAR_LISP ("minibuffer-message-timeout"\111770,363896
+  DEFVAR_LISP ("throw-on-input"\111775,364174
+  DEFVAR_LISP ("command-error-function"\111781,364425
+  DEFVAR_LISP ("enable-disabled-menus-and-buttons"\111790,364912
+  DEFVAR_LISP ("select-active-regions"\111798,365239
+  DEFVAR_LISP ("saved-region-selection"\111807,365631
+  DEFVAR_LISP ("selection-inhibit-update-commands"\111815,366016
+  DEFVAR_LISP ("debug-on-event"\111825,366557
 
 c-src/emacs/src/lisp.h,41391
 #define EMACS_LISP_H22,801
[Prev in Thread]
Current Thread
[Next in Thread]
master d0be0965ca3: Fix etags tagging by multiline regexps, Eli Zaretskii <=
Prev by Date: master 7cbca905694: Hide default-directory absolute file name in dired-hide-details-mode
Next by Date: master c1791a27494: Fix tmm menu layout (Bug#73734)
Previous by thread: master 7cbca905694: Hide default-directory absolute file name in dired-hide-details-mode
Next by thread: master c1791a27494: Fix tmm menu layout (Bug#73734)
Index(es):
- Date
- Thread