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

1 files changed, 48 insertions, 3 deletions

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,