aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2016-05-09 10:59:29 -0700
committerPaul Eggert2016-05-09 10:59:29 -0700
commitc8b7a6abd90aab76185202def7049a0ea981d335 (patch)
treeabd2edd93ad2fdd4e31e25a0e0ce1c24adde62ff
parent9418ab39bf970dd82b5d6f2e7b40a5d8cd134a43 (diff)
parent3b478989df59cc33886d260137c433da5cfe4863 (diff)
downloademacs-c8b7a6abd90aab76185202def7049a0ea981d335.tar.gz
emacs-c8b7a6abd90aab76185202def7049a0ea981d335.zip
Merge from origin/emacs-25
3b47898 Fix doc string in `insert' b479dea * doc/misc/emacs-mime.texi (time-date): Document now-builtins... cd27f73 Say 'All results processed' at the end 4ffec91 Document automatic adjustment of process' logical window dime... dc66271 ; Fix typos and stylistic glitches in NEWS
-rw-r--r--doc/lispref/processes.texi52
-rw-r--r--doc/misc/emacs-mime.texi8
-rw-r--r--etc/NEWS226
-rw-r--r--lisp/progmodes/xref.el4
-rw-r--r--src/editfns.c4
-rw-r--r--src/process.c4
6 files changed, 184 insertions, 114 deletions
diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi
index e8a9ad05c22..e3346aa3a5b 100644
--- a/doc/lispref/processes.texi
+++ b/doc/lispref/processes.texi
@@ -1381,6 +1381,58 @@ Killing the process's buffer deletes the process, which kills the
1381subprocess with a @code{SIGHUP} signal (@pxref{Signals to Processes}). 1381subprocess with a @code{SIGHUP} signal (@pxref{Signals to Processes}).
1382@end defun 1382@end defun
1383 1383
1384If the process's buffer is displayed in a window, your Lisp program
1385may wish telling the process the dimensions of that window, so that
1386the process could adapt its output to those dimensions, much as it
1387adapts to the screen dimensions. The following functions allow to
1388communicate this kind of information to processes; however, not all
1389systems support the underlying functionality, so it is best to provide
1390fallbacks, e.g., via command-line arguments or environment variables.
1391
1392@defun set-process-window-size process height width
1393Tell @var{process} that its logical window size has dimensions
1394@var{width} by @var{height}, in character units. If this function
1395succeeds in communicating this information to the process, it returns
1396@code{t}; otherwise it returns @code{nil}.
1397@end defun
1398
1399When windows that display buffers associated with process change their
1400dimensions, the affected processes should be told about these changes.
1401By default, when the window configuration changes, Emacs will
1402automatically call @code{set-process-window-size} on behalf of every
1403process whose buffer is displayed in a window, passing it the smallest
1404dimensions of all the windows displaying the process's buffer. This
1405works via @code{window-configuration-change-hook} (@pxref{Window
1406Hooks}), which is told to invoke the function that is the value of
1407the variable @code{window-adjust-process-window-size-function} for
1408each process whose buffer is displayed in at least one window. You
1409can customize this behavior by setting the value of that variable.
1410
1411@defopt window-adjust-process-window-size-function
1412The value of this variable should be a function of two arguments: a
1413process and the list of windows displaying the process's buffer. When
1414the function is called, the process's buffer is the current buffer.
1415The function should return a cons cell @w{@code{(@var{width}
1416. @var{height})}} that describes the dimensions of the logical process
1417window to be passed via a call to @code{set-process-window-size}. The
1418function can also return @code{nil}, in which case Emacs will not call
1419@code{set-process-window-size} for this process.
1420
1421Emacs supplies two predefined values for this variable:
1422@code{window-adjust-process-window-size-smallest}, which returns the
1423smallest of all the dimensions of the windows that display a process's
1424buffer; and @code{window-adjust-process-window-size-largest}, which
1425returns the largest dimensions. For more complex strategies, write
1426your own function.
1427
1428This variable can be buffer-local.
1429@end defopt
1430
1431If the process has the @code{adjust-window-size-function} property
1432(@pxref{Process Information}), its value overrides the global and
1433buffer-local values of
1434@code{window-adjust-process-window-size-function}.
1435
1384@node Filter Functions 1436@node Filter Functions
1385@subsection Process Filter Functions 1437@subsection Process Filter Functions
1386@cindex filter function 1438@cindex filter function
diff --git a/doc/misc/emacs-mime.texi b/doc/misc/emacs-mime.texi
index 2b3bba39ad9..2b935870dae 100644
--- a/doc/misc/emacs-mime.texi
+++ b/doc/misc/emacs-mime.texi
@@ -1554,7 +1554,7 @@ Here's a bunch of time/date/second/day examples:
1554(time-less-p '(13818 19266) '(13818 19145)) 1554(time-less-p '(13818 19266) '(13818 19145))
1555@result{} nil 1555@result{} nil
1556 1556
1557(subtract-time '(13818 19266) '(13818 19145)) 1557(time-subtract '(13818 19266) '(13818 19145))
1558@result{} (0 121) 1558@result{} (0 121)
1559 1559
1560(days-between "Sat Sep 12 12:21:54 1998 +0200" 1560(days-between "Sat Sep 12 12:21:54 1998 +0200"
@@ -1632,14 +1632,14 @@ return a ``zero'' time.
1632 1632
1633@item time-less-p 1633@item time-less-p
1634Take two times and say whether the first time is less (i.e., earlier) 1634Take two times and say whether the first time is less (i.e., earlier)
1635than the second time. 1635than the second time. (This is a built-in function.)
1636 1636
1637@item time-since 1637@item time-since
1638Take a time and return a time saying how long it was since that time. 1638Take a time and return a time saying how long it was since that time.
1639 1639
1640@item subtract-time 1640@item time-subtract
1641Take two times and subtract the second from the first. I.e., return 1641Take two times and subtract the second from the first. I.e., return
1642the time between the two times. 1642the time between the two times. (This is a built-in function.)
1643 1643
1644@item days-between 1644@item days-between
1645Take two days and return the number of days between those two days. 1645Take two days and return the number of days between those two days.
diff --git a/etc/NEWS b/etc/NEWS
index 22eb2eabc37..b4407a661ad 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -547,7 +547,7 @@ build with 'make V=1'.
547--- 547---
548** The configure option '--with-gameuser' now allows you to specify a 548** The configure option '--with-gameuser' now allows you to specify a
549group instead of a user if its argument is prefixed by ':' (a colon). 549group instead of a user if its argument is prefixed by ':' (a colon).
550This will cause the game score files in ${localstatedir}/games/emacs 550This will cause the game score files in "${localstatedir}/games/emacs"
551to be owned by that group, and the helper program for updating them to 551to be owned by that group, and the helper program for updating them to
552be installed setgid. The option now defaults to the 'games' group. 552be installed setgid. The option now defaults to the 'games' group.
553 553
@@ -574,7 +574,7 @@ tests which take more time to perform.
574'initial-buffer-choice' is non-nil, display both the file and 574'initial-buffer-choice' is non-nil, display both the file and
575'initial-buffer-choice'. When Emacs is given more than one file and 575'initial-buffer-choice'. When Emacs is given more than one file and
576'initial-buffer-choice' is non-nil, show 'initial-buffer-choice' 576'initial-buffer-choice' is non-nil, show 'initial-buffer-choice'
577and *Buffer List*. This makes Emacs convenient to use from the 577and '*Buffer List*'. This makes Emacs convenient to use from the
578command line when 'initial-buffer-choice' is non-nil. 578command line when 'initial-buffer-choice' is non-nil.
579 579
580+++ 580+++
@@ -650,14 +650,14 @@ added via the new Network Security Manager (NSM) and controlled via
650the 'network-security-level' variable. 650the 'network-security-level' variable.
651 651
652+++ 652+++
653** C-h l now also lists the commands that were run. 653** 'C-h l' now also lists the commands that were run.
654 654
655+++ 655+++
656** x-select-enable-clipboard is renamed select-enable-clipboard 656** 'x-select-enable-clipboard' is renamed 'select-enable-clipboard'
657and x-select-enable-primary is renamed select-enable-primary. 657and 'x-select-enable-primary' is renamed 'select-enable-primary'.
658Additionally they both now apply to all systems (OSX, GNUstep, Windows, you 658Additionally they both now apply to all systems (OSX, GNUstep, Windows, you
659name it), with the proviso that on some systems (e.g. Windows) 659name it), with the proviso that on some systems (e.g. Windows)
660select-enable-primary is ineffective since the system doesn't 660'select-enable-primary' is ineffective since the system doesn't
661have the equivalent of a primary selection. 661have the equivalent of a primary selection.
662 662
663+++ 663+++
@@ -670,7 +670,7 @@ selected window is strongly dedicated to its buffer.
670'even-window-sizes' and now handles window widths as well. 670'even-window-sizes' and now handles window widths as well.
671 671
672+++ 672+++
673** terpri gets an optional arg ENSURE to conditionally output a newline. 673** 'terpri' gets an optional arg ENSURE to conditionally output a newline.
674 674
675+++ 675+++
676** 'insert-register' now leaves point after the inserted text 676** 'insert-register' now leaves point after the inserted text
@@ -693,9 +693,9 @@ variable 'read-hide-char'.
693 693
694+++ 694+++
695** The Emacs pseudo-random number generator can be securely seeded. 695** The Emacs pseudo-random number generator can be securely seeded.
696On system where Emacs can access the system entropy or some other 696On systems where Emacs can access the system entropy or some other
697cryptographically secure random stream, it now uses that when 'random' 697cryptographically secure random stream, it now uses that when 'random'
698is called with its argument 't'. This allows cryptographically strong 698is called with its argument t. This allows cryptographically strong
699random values; in particular, the Emacs server now uses this facility 699random values; in particular, the Emacs server now uses this facility
700to produce its authentication key. 700to produce its authentication key.
701 701
@@ -706,7 +706,7 @@ to produce its authentication key.
706* Editing Changes in Emacs 25.1 706* Editing Changes in Emacs 25.1
707 707
708+++ 708+++
709** M-x suggests shorthands and ignores obsolete commands for completion. 709** 'M-x' suggests shorthands and ignores obsolete commands for completion.
710 710
711** Changes in undo 711** Changes in undo
712 712
@@ -728,19 +728,20 @@ affected by the command.
728** New and improved facilities for inserting Unicode characters 728** New and improved facilities for inserting Unicode characters
729 729
730--- 730---
731*** Unicode names entered via C-x 8 RET now use substring completion by default. 731*** Unicode names entered via 'C-x 8 RET' now use substring completion
732by default.
732 733
733+++ 734+++
734*** C-x 8 now has shorthands for several chars, such as U+2010 735*** 'C-x 8' now has shorthands for several chars, such as U+2010
735(HYPHEN), U+2011 (NON-BREAKING HYPHEN), and U+2012 (FIGURE DASH). As 736(HYPHEN), U+2011 (NON-BREAKING HYPHEN), and U+2012 (FIGURE DASH). As
736before, you can type C-x 8 C-h to list shorthands. 737before, you can type 'C-x 8 C-h' to list shorthands.
737 738
738+++ 739+++
739*** New minor mode electric-quote-mode for using curved quotes as you 740*** New minor mode 'electric-quote-mode' for using curved quotes as you
740type. See also the new variable 'text-quoting-style'. 741type. See also the new variable 'text-quoting-style'.
741 742
742--- 743---
743** New minor mode global-eldoc-mode is enabled by default. 744** New minor mode 'global-eldoc-mode' is enabled by default.
744 745
745--- 746---
746** Emacs now uses "bracketed paste mode" on text terminals that support it. 747** Emacs now uses "bracketed paste mode" on text terminals that support it.
@@ -765,7 +766,7 @@ Bidirectional Parentheses Algorithm (BPA) specified by these Unicode
765standards. 766standards.
766 767
767+++ 768+++
768** You can access 'mouse-buffer-menu' (C-down-mouse-1) using C-f10. 769** You can access 'mouse-buffer-menu' ('C-down-mouse-1') using 'C-f10'.
769 770
770+++ 771+++
771** New buffer-local 'electric-pair-local-mode'. 772** New buffer-local 'electric-pair-local-mode'.
@@ -773,7 +774,7 @@ standards.
773+++ 774+++
774** New variable 'fast-but-imprecise-scrolling' inhibits 775** New variable 'fast-but-imprecise-scrolling' inhibits
775fontification during full screen scrolling operations, giving less 776fontification during full screen scrolling operations, giving less
776hesitant operation during auto-repeat of C-v, M-v at the cost of 777hesitant operation during auto-repeat of 'C-v', 'M-v' at the cost of
777possible inaccuracies in the end position. 778possible inaccuracies in the end position.
778 779
779+++ 780+++
@@ -787,8 +788,8 @@ unsaved customizations and prompts user to customize (if found). It
787is intended for adding to 'kill-emacs-query-functions'. 788is intended for adding to 'kill-emacs-query-functions'.
788 789
789+++ 790+++
790** The old 'C-x w' bindings in hi-lock-mode are officially deprecated 791** The old 'C-x w' bindings in 'hi-lock-mode' are officially deprecated
791in favor of the global 'M-s h' bindings introduced in Emacs-23.1. 792in favor of the global 'M-s h' bindings introduced in Emacs 23.1.
792They'll disappear soon. 793They'll disappear soon.
793 794
794 795
@@ -813,13 +814,13 @@ emacs -batch --eval "(checkdoc-file \"subr.el\")"
813*** The desktop format version has been upgraded from 206 to 208. 814*** The desktop format version has been upgraded from 206 to 208.
814Although Emacs 25.1 can read a version 206 desktop, earlier Emacsen 815Although Emacs 25.1 can read a version 206 desktop, earlier Emacsen
815cannot read a version 208 desktop. To upgrade your desktop file, you 816cannot read a version 208 desktop. To upgrade your desktop file, you
816must explicitly request the upgrade, by C-u M-x desktop-save. You are 817must explicitly request the upgrade, by 'C-u M-x desktop-save'. You are
817recommended to do this as soon as you have firmly upgraded to Emacs 818recommended to do this as soon as you have firmly upgraded to Emacs
81825.1 (or later). Should you ever need to downgrade your desktop file 81925.1 (or later). Should you ever need to downgrade your desktop file
819to version 206, you can do this with C-u C-u M-x desktop-save. 820to version 206, you can do this with 'C-u C-u M-x desktop-save'.
820 821
821+++ 822+++
822** New function 'bookmark-set-no-overwrite' bound to C-x r M. 823** New function 'bookmark-set-no-overwrite' bound to 'C-x r M'.
823It raises an error if a bookmark of that name already exists, 824It raises an error if a bookmark of that name already exists,
824unlike 'bookmark-set' which silently updates an existing bookmark. 825unlike 'bookmark-set' which silently updates an existing bookmark.
825 826
@@ -926,10 +927,10 @@ being made case-sensitive in Emacs 24.2.
926**** New play/pause command 'mpc-toggle-play' bound to 's' 927**** New play/pause command 'mpc-toggle-play' bound to 's'
927 928
928**** 'g' bound to new command 'mpc-seek-current' will navigate current 929**** 'g' bound to new command 'mpc-seek-current' will navigate current
929 track. 930track.
930 931
931**** New commands 'mpc-toggle-{consume,repeat,single,shuffle}' for 932**** New commands 'mpc-toggle-{consume,repeat,single,shuffle}' for
932 toggling playback modes. 933toggling playback modes.
933 934
934--- 935---
935*** Now supports connecting to a UNIX domain socket. 936*** Now supports connecting to a UNIX domain socket.
@@ -1022,10 +1023,10 @@ installed strictly as dependencies but are no longer needed.
1022+++ 1023+++
1023** Shell 1024** Shell
1024 1025
1025When you invoke 'shell' interactively, the *shell* buffer will now 1026When you invoke 'shell' interactively, the '*shell*' buffer will now
1026display in a new window. However, you can customize this behavior via 1027display in a new window. However, you can customize this behavior via
1027the 'display-buffer-alist' variable. For example, to get 1028the 'display-buffer-alist' variable. For example, to get
1028the old behavior -- *shell* buffer displays in current window -- use 1029the old behavior -- '*shell*' buffer displays in current window -- use
1029(add-to-list 'display-buffer-alist 1030(add-to-list 'display-buffer-alist
1030 '("^\\*shell\\*$" . (display-buffer-same-window))). 1031 '("^\\*shell\\*$" . (display-buffer-same-window))).
1031 1032
@@ -1046,13 +1047,14 @@ If you need your objects to be named, do it by inheriting from 'eieio-named'.
1046Use the equivalent facilities from cl-generic.el instead. 1047Use the equivalent facilities from cl-generic.el instead.
1047+++ 1048+++
1048*** 'constructor' is now an obsolete alias for 'make-instance'. 1049*** 'constructor' is now an obsolete alias for 'make-instance'.
1049--- 'pcase' accepts a new UPattern 'eieio'. 1050---
1051*** 'pcase' accepts a new UPattern 'eieio'.
1050 1052
1051** ido 1053** ido
1052 1054
1053+++ 1055+++
1054*** New command 'ido-bury-buffer-at-head' bound to C-S-b 1056*** New command 'ido-bury-buffer-at-head' bound to 'C-S-b'.
1055Bury the buffer at the head of 'ido-matches', analogous to how C-k 1057Bury the buffer at the head of 'ido-matches', analogous to how 'C-k'
1056kills the buffer at head. 1058kills the buffer at head.
1057 1059
1058--- 1060---
@@ -1108,13 +1110,13 @@ by searching commands to produce a regexp matching anything that
1108character-folds into STRING. 1110character-folds into STRING.
1109 1111
1110+++ 1112+++
1111*** The new M-s M-w key binding uses eww to search the web for the 1113*** The new 'M-s M-w' key binding uses eww to search the web for the
1112text in the region. The search engine to use for this is specified by 1114text in the region. The search engine to use for this is specified by
1113the customizable variable 'eww-search-prefix'. 1115the customizable variable 'eww-search-prefix'.
1114 1116
1115+++ 1117+++
1116*** Query-replace history is enhanced. 1118*** 'query-replace' history is enhanced.
1117When query-replace reads the FROM string from the minibuffer, typing 1119When 'query-replace' reads the FROM string from the minibuffer, typing
1118'M-p' will now show previous replacements as "FROM SEP TO", where FROM 1120'M-p' will now show previous replacements as "FROM SEP TO", where FROM
1119and TO are the original text and its replacement, and SEP is an arrow 1121and TO are the original text and its replacement, and SEP is an arrow
1120string defined by the new variable 'query-replace-from-to-separator'. 1122string defined by the new variable 'query-replace-from-to-separator'.
@@ -1128,19 +1130,19 @@ typing RET.
1128result of the calculation into the current buffer. 1130result of the calculation into the current buffer.
1129 1131
1130+++ 1132+++
1131** In Edebug, you can now set the initial mode with C-x C-a C-m. With 1133** In Edebug, you can now set the initial mode with 'C-x C-a C-m'.
1132this you can tell Edebug not to stop at the start of the first 1134With this you can tell Edebug not to stop at the start of the first
1133instrumented function. 1135instrumented function.
1134 1136
1135** ElDoc 1137** ElDoc
1136 1138
1137+++ 1139+++
1138*** New minor mode 'global-eldoc-mode' 1140*** New minor mode 'global-eldoc-mode'.
1139It is turned on by default, and affects '*scratch*' and other buffers 1141It is turned on by default, and affects '*scratch*' and other buffers
1140whose major mode supports Emacs Lisp. 1142whose major mode supports Emacs Lisp.
1141 1143
1142--- 1144---
1143*** 'eldoc-documentation-function' now defaults to 'ignore' 1145*** 'eldoc-documentation-function' now defaults to 'ignore'.
1144 1146
1145--- 1147---
1146*** 'describe-char-eldoc' displays information about character at point, 1148*** 'describe-char-eldoc' displays information about character at point,
@@ -1232,7 +1234,7 @@ CLOS class and slot documentation.
1232*** Rectangle Mark mode can have corners past EOL or in the middle of a TAB. 1234*** Rectangle Mark mode can have corners past EOL or in the middle of a TAB.
1233 1235
1234+++ 1236+++
1235*** C-x C-x in rectangle-mark-mode now cycles through the four corners. 1237*** 'C-x C-x' in 'rectangle-mark-mode' now cycles through the four corners.
1236*** 'string-rectangle' provides on-the-fly preview of the result. 1238*** 'string-rectangle' provides on-the-fly preview of the result.
1237 1239
1238+++ 1240+++
@@ -1258,7 +1260,7 @@ prepending it.
1258** Calendar and diary 1260** Calendar and diary
1259 1261
1260+++ 1262+++
1261*** The default 'diary-file' is now located in .emacs.d. 1263*** The default 'diary-file' is now located in "~/.emacs.d".
1262 1264
1263+++ 1265+++
1264*** New commands to insert diary entries with Chinese dates: 1266*** New commands to insert diary entries with Chinese dates:
@@ -1335,7 +1337,7 @@ to delete or undelete multiple messages.
1335libxml2 or if you have the Lynx browser installed. By default, Rmail 1337libxml2 or if you have the Lynx browser installed. By default, Rmail
1336will display the HTML version of a mail message that has both HTML and 1338will display the HTML version of a mail message that has both HTML and
1337plain text parts, if display of HTML email is possible; customize the 1339plain text parts, if display of HTML email is possible; customize the
1338'rmail-mime-prefer-html' option to 'nil' if you don't want that. 1340'rmail-mime-prefer-html' option to nil if you don't want that.
1339 1341
1340+++ 1342+++
1341*** In the commands that make summaries by subject, recipients, or senders, 1343*** In the commands that make summaries by subject, recipients, or senders,
@@ -1388,7 +1390,7 @@ variable, meaning you can bind it around an 'url-retrieve' call.
1388 1390
1389--- 1391---
1390*** If URL is used with a https connection, the first callback argument 1392*** If URL is used with a https connection, the first callback argument
1391plist will contain a :peer element that has the output of 1393PLIST will contain a :peer element that has the output of
1392'gnutls-peer-status' (if Emacs is built with GnuTLS support). 1394'gnutls-peer-status' (if Emacs is built with GnuTLS support).
1393 1395
1394** Tramp 1396** Tramp
@@ -1429,10 +1431,10 @@ comments.
1429+++ 1431+++
1430*** Basic push support, via 'vc-push', bound to 'C-x v P'. 1432*** Basic push support, via 'vc-push', bound to 'C-x v P'.
1431Implemented for Bzr, Git, Hg. As part of this change, the pre-existing 1433Implemented for Bzr, Git, Hg. As part of this change, the pre-existing
1432(undocumented) command vc-hg-push now behaves slightly differently. 1434(undocumented) command 'vc-hg-push' now behaves slightly differently.
1433 1435
1434+++ 1436+++
1435*** The new command vc-region-history shows the log+diff of the active region. 1437*** The new command 'vc-region-history' shows the log+diff of the active region.
1436 1438
1437+++ 1439+++
1438*** You can refresh the VC state of a file buffer with 'M-x vc-refresh-state'. 1440*** You can refresh the VC state of a file buffer with 'M-x vc-refresh-state'.
@@ -1517,7 +1519,7 @@ file name patterns. Defaults to files whose extension is one of '.h',
1517*** New custom variable 'hide-ifdef-expand-reinclusion-protection' to prevent 1519*** New custom variable 'hide-ifdef-expand-reinclusion-protection' to prevent
1518reinclusion protected (a.k.a. "idempotent") header files from being hidden. 1520reinclusion protected (a.k.a. "idempotent") header files from being hidden.
1519(This could happen when an idempotent header file is visited again, 1521(This could happen when an idempotent header file is visited again,
1520when its guard symbol is already defined.) Defaults to 't'. 1522when its guard symbol is already defined.) Defaults to t.
1521 1523
1522--- 1524---
1523*** New custom variable 'hide-ifdef-exclude-define-regexp' to define symbol 1525*** New custom variable 'hide-ifdef-exclude-define-regexp' to define symbol
@@ -1550,7 +1552,7 @@ New options 'tildify-space-string', 'tildify-pattern', and
1550helper functions) obsolete. 1552helper functions) obsolete.
1551 1553
1552+++ 1554+++
1553** New package Xref replaces Etags's front-end and UI 1555** New package Xref replaces Etags's front-end and UI.
1554 1556
1555The new package Xref provides a generic framework and new commands to 1557The new package Xref provides a generic framework and new commands to
1556find and move to definitions of functions, macros, data structures 1558find and move to definitions of functions, macros, data structures
@@ -1662,7 +1664,8 @@ EUDC's PH backend (eudcb-ph.el) is obsolete.
1662 1664
1663+++ 1665+++
1664*** The new built-in command 'clear' can scroll window contents out of sight. 1666*** The new built-in command 'clear' can scroll window contents out of sight.
1665If provided with an optional non-nil argument, the scrollback contents will be cleared. 1667If provided with an optional non-nil argument, the scrollback contents
1668will be cleared.
1666 1669
1667+++ 1670+++
1668*** New buffer syntax '#<buffer-name>', which is equivalent to 1671*** New buffer syntax '#<buffer-name>', which is equivalent to
@@ -1692,7 +1695,7 @@ make the new option 'eshell-destroy-buffer-when-process-dies' non-nil.
1692*** Support for several ancient browsers is now officially obsolete. 1695*** Support for several ancient browsers is now officially obsolete.
1693 1696
1694+++ 1697+++
1695** tar-mode: new 'tar-new-entry' command, allowing for new members to 1698** 'tar-mode': new 'tar-new-entry' command, allowing for new members to
1696be added to the archive. 1699be added to the archive.
1697 1700
1698** Autorevert 1701** Autorevert
@@ -1721,11 +1724,11 @@ notification descriptor still corresponds to an activate watch.
1721** Dired 1724** Dired
1722 1725
1723+++ 1726+++
1724*** The command 'dired-do-compress' bound to 'Z' now can compress 1727*** The command 'dired-do-compress', bound to 'Z', now can compress
1725directories and decompress zip files. 1728directories and decompress zip files.
1726 1729
1727+++ 1730+++
1728*** New command 'dired-do-compress-to' bound to 'c' can be used to 1731*** New command 'dired-do-compress-to', bound to 'c', can be used to
1729compress many marked files into a single named archive. The 1732compress many marked files into a single named archive. The
1730compression command is determined from the new 1733compression command is determined from the new
1731'dired-compress-files-alist' variable. 1734'dired-compress-files-alist' variable.
@@ -1750,7 +1753,7 @@ call 'tabulated-list-init-header', in which case it will have no
1750header. 1753header.
1751 1754
1752+++ 1755+++
1753*** 'tabulated-list-print' takes a second optional argument, update, 1756*** 'tabulated-list-print' takes a second optional argument, UPDATE,
1754which specifies an alternative printing method which is faster when 1757which specifies an alternative printing method which is faster when
1755few or no entries have changed. 1758few or no entries have changed.
1756 1759
@@ -1780,11 +1783,11 @@ The main entry points are 'cl-defgeneric' and 'cl-defmethod'. See the
1780node "Generic Functions" in the Emacs Lisp manual for more details. 1783node "Generic Functions" in the Emacs Lisp manual for more details.
1781 1784
1782--- 1785---
1783** scss-mode (a minor variant of css-mode) is a major mode for editing 1786** 'scss-mode' (a minor variant of 'css-mode') is a major mode for editing
1784SCSS (Sassy CSS) files. 1787SCSS (Sassy CSS) files.
1785 1788
1786--- 1789---
1787** let-alist is a new macro (and a package) that allows one to easily 1790** 'let-alist' is a new macro (and a package) that allows one to easily
1788let-bind the values stored in an alist. 1791let-bind the values stored in an alist.
1789 1792
1790--- 1793---
@@ -1810,7 +1813,7 @@ alists, hash-table and arrays. All functions are prefixed with
1810evaluation of forms. 1813evaluation of forms.
1811 1814
1812--- 1815---
1813** js-jsx-mode (a minor variant of js-mode) provides indentation 1816** 'js-jsx-mode' (a minor variant of 'js-mode') provides indentation
1814support for JSX, an XML-like syntax extension to ECMAScript. 1817support for JSX, an XML-like syntax extension to ECMAScript.
1815 1818
1816 1819
@@ -1824,8 +1827,8 @@ eliminated.
1824 1827
1825+++ 1828+++
1826** 'syntax-begin-function' is declared obsolete. 1829** 'syntax-begin-function' is declared obsolete.
1827Removed font-lock-beginning-of-syntax-function and the SYNTAX-BEGIN 1830Removed 'font-lock-beginning-of-syntax-function' and the SYNTAX-BEGIN
1828slot in font-lock-defaults. 1831slot in 'font-lock-defaults'.
1829 1832
1830+++ 1833+++
1831** The new implementation of Subword mode affects word movement everywhere. 1834** The new implementation of Subword mode affects word movement everywhere.
@@ -1857,24 +1860,24 @@ pointer shape during dragging, should bind the variable 'track-mouse'
1857to the special value 'dragging' in the body of the form. 1860to the special value 'dragging' in the body of the form.
1858 1861
1859--- 1862---
1860** The optional 'predicate' argument of 'lisp-complete-symbol' no longer 1863** The optional PREDICATE argument of 'lisp-complete-symbol' no longer
1861has any effect. (This change was made in Emacs 24.4 but was not 1864has any effect. (This change was made in Emacs 24.4 but was not
1862advertised at the time.) 1865advertised at the time.)
1863 1866
1864+++ 1867+++
1865** 'indirect-function' does not signal 'void-function' any more. 1868** 'indirect-function' does not signal 'void-function' any more.
1866This is mostly a bug-fix, since this change was missed back in 24.4 when 1869This is mostly a bug-fix, since this change was missed back in 24.4 when
1867symbol-function was changed not to signal 'void-function' any more. 1870'symbol-function' was changed not to signal 'void-function' any more.
1868 1871
1869+++ 1872+++
1870*** As a consequence, the second arg of 'indirect-function' is now obsolete. 1873*** As a consequence, the second arg of 'indirect-function' is now obsolete.
1871 1874
1872+++ 1875+++
1873** M-x shell and M-x compile no longer set the EMACS environment variable. 1876** 'M-x shell' and 'M-x compile' no longer set the EMACS environment variable.
1874This avoids clashing when other programs use the variable for other purposes. 1877This avoids clashing when other programs use the variable for other purposes.
1875Although M-x term still sets EMACS for compatibility with Bash 4.3 and earlier, 1878Although 'M-x term' still sets EMACS for compatibility with Bash 4.3
1876this is deprecated and will be phased out when Bash 4.4 or later takes over. 1879and earlier, this is deprecated and will be phased out when Bash 4.4
1877Use the INSIDE_EMACS environment variable instead. 1880or later takes over. Use the INSIDE_EMACS environment variable instead.
1878 1881
1879+++ 1882+++
1880** 'save-excursion' does not save&restore the mark any more. 1883** 'save-excursion' does not save&restore the mark any more.
@@ -1882,31 +1885,31 @@ Use 'save-mark-and-excursion' if you want the old behavior.
1882 1885
1883+++ 1886+++
1884** 'read-buffer' and 'read-buffer-function' can now be called with a 4th 1887** 'read-buffer' and 'read-buffer-function' can now be called with a 4th
1885argument ('predicate'). 1888argument (PREDICATE).
1886 1889
1887+++ 1890+++
1888** 'completion-table-dynamic' by default stays in the minibuffer. 1891** 'completion-table-dynamic' by default stays in the minibuffer.
1889The minibuffer will be the current buffer when the function is called. 1892The minibuffer will be the current buffer when the function is called.
1890If you want the old behavior of calling the function in the buffer 1893If you want the old behavior of calling the function in the buffer
1891from which the minibuffer was entered, use the new argument 1894from which the minibuffer was entered, use the new argument
1892'switch-buffer' to 'completion-table-dynamic'. 1895SWITCH-BUFFER to 'completion-table-dynamic'.
1893 1896
1894--- 1897---
1895** window-configurations no longer record the buffers' marks. 1898** window-configurations no longer record the buffers' marks.
1896 1899
1897--- 1900---
1898** inhibit-modification-hooks now also inhibits lock-file checks, as well as 1901** 'inhibit-modification-hooks' now also inhibits lock-file checks, as
1899active region handling. 1902well as active region handling.
1900 1903
1901+++ 1904+++
1902** deactivate-mark is now buffer-local. 1905** 'deactivate-mark' is now buffer-local.
1903 1906
1904+++ 1907+++
1905** 'cl-the' now asserts that its argument is of the given type. 1908** 'cl-the' now asserts that its argument is of the given type.
1906 1909
1907+++ 1910+++
1908** 'process-running-child-p' may now return a numeric process 1911** 'process-running-child-p' may now return a numeric process
1909group ID instead of 't'. 1912group ID instead of t.
1910 1913
1911+++ 1914+++
1912** Mouse click events on mode line or header line no longer include 1915** Mouse click events on mode line or header line no longer include
@@ -1916,7 +1919,7 @@ position list returned for such events is now nil.
1916--- 1919---
1917** Menu items in keymaps do not support the "key shortcut cache" any more. 1920** Menu items in keymaps do not support the "key shortcut cache" any more.
1918These slots used to hold key-shortcut data, but have been obsolete since 1921These slots used to hold key-shortcut data, but have been obsolete since
1919Emacs-21. 1922Emacs 21.
1920 1923
1921--- 1924---
1922** Emacs no longer downcases the first letter of a system diagnostic 1925** Emacs no longer downcases the first letter of a system diagnostic
@@ -1942,7 +1945,7 @@ not affected by 'text-quoting-style', e.g., (message "%s" (format
1942"...." foo bar)). 1945"...." foo bar)).
1943 1946
1944+++ 1947+++
1945** substitute-command-keys now replaces quotes. 1948** 'substitute-command-keys' now replaces quotes.
1946That is, it converts documentation strings' quoting style as per the 1949That is, it converts documentation strings' quoting style as per the
1947value of 'text-quoting-style'. Doc strings in source code can use 1950value of 'text-quoting-style'. Doc strings in source code can use
1948either curved single quotes or grave accents and apostrophes. As 1951either curved single quotes or grave accents and apostrophes. As
@@ -1986,7 +1989,7 @@ that happen, 'unhandled-file-name-directory' now defaults to calling
1986 1989
1987* Lisp Changes in Emacs 25.1 1990* Lisp Changes in Emacs 25.1
1988 1991
1989** pcase 1992** 'pcase'
1990+++ 1993+++
1991*** New UPatterns 'quote', 'app'. 1994*** New UPatterns 'quote', 'app'.
1992+++ 1995+++
@@ -1995,7 +1998,7 @@ that happen, 'unhandled-file-name-directory' now defaults to calling
1995*** New vector QPattern. 1998*** New vector QPattern.
1996 1999
1997--- 2000---
1998** syntax-propertize is now automatically called on-demand during forward 2001** 'syntax-propertize' is now automatically called on-demand during forward
1999parsing functions like 'forward-sexp'. 2002parsing functions like 'forward-sexp'.
2000 2003
2001+++ 2004+++
@@ -2010,7 +2013,7 @@ file byte offsets, given the file's encoding.
2010 2013
2011+++ 2014+++
2012** The default value of 'load-read-function' is now 'read'. 2015** The default value of 'load-read-function' is now 'read'.
2013Previously, the default value of 'nil' implied using 'read'. 2016Previously, the default value of nil implied using 'read'.
2014 2017
2015+++ 2018+++
2016** New hook 'pre-redisplay-functions'. 2019** New hook 'pre-redisplay-functions'.
@@ -2027,13 +2030,13 @@ implemented by the new 'cursor-intangible-mode' and
2027'cursor-sensor-mode' minor modes. 2030'cursor-sensor-mode' minor modes.
2028 2031
2029+++ 2032+++
2030** 'inhibit-point-motion-hooks' now defaults to 't' and is obsolete. 2033** 'inhibit-point-motion-hooks' now defaults to t and is obsolete.
2031Use the new minor modes 'cursor-intangible-mode' and 2034Use the new minor modes 'cursor-intangible-mode' and
2032'cursor-sensor-mode' instead. 2035'cursor-sensor-mode' instead.
2033 2036
2034+++ 2037+++
2035** New process type 'pipe', which can be used in combination with the 2038** New process type 'pipe', which can be used in combination with the
2036':stderr' keyword of make-process to handle standard error output 2039':stderr' keyword of 'make-process' to handle standard error output
2037of subprocess. 2040of subprocess.
2038 2041
2039+++ 2042+++
@@ -2043,13 +2046,21 @@ process filter, sentinel, etc., through keyword arguments (similar to
2043'make-network-process'). 2046'make-network-process').
2044 2047
2045+++ 2048+++
2049** Subprocesses are automatically told about changes in window dimensions
2050The new option 'window-adjust-process-window-size-function' controls
2051how subprocesses are told to adapt their logical window sizes to
2052changes in the Emacs window configuration. Its default value calls
2053'set-process-window-size' with the smallest dimensions of all the
2054windows that display the subprocess's buffer.
2055
2056+++
2046** A new function 'directory-files-recursively' returns all matching 2057** A new function 'directory-files-recursively' returns all matching
2047files (recursively) under a directory. 2058files (recursively) under a directory.
2048 2059
2049+++ 2060+++
2050** New variable 'inhibit-message', when bound to non-nil, inhibits 2061** New variable 'inhibit-message', when bound to non-nil, inhibits
2051'message' and related functions from displaying messages in the echo 2062'message' and related functions from displaying messages in the echo
2052area. The output is still logged to the *Messages* buffer. 2063area. The output is still logged to the '*Messages*' buffer.
2053 2064
2054+++ 2065+++
2055** A new text property 'inhibit-read-only' can be used in read-only 2066** A new text property 'inhibit-read-only' can be used in read-only
@@ -2057,8 +2068,8 @@ buffers to allow certain parts of the text to be writable.
2057 2068
2058+++ 2069+++
2059** A new variable 'comment-end-can-be-escaped' is useful in languages 2070** A new variable 'comment-end-can-be-escaped' is useful in languages
2060 such as C and C++ where line comments with escaped newlines are 2071such as C and C++ where line comments with escaped newlines are
2061 continued to the next line. 2072continued to the next line.
2062 2073
2063+++ 2074+++
2064** New macro 'define-advice'. 2075** New macro 'define-advice'.
@@ -2073,24 +2084,24 @@ See the "Finalizer Type" subsection in the ELisp manual for the
2073details. 2084details.
2074 2085
2075--- 2086---
2076** lexical closures can use (:documentation FORM) to build their docstring. 2087** Lexical closures can use '(:documentation FORM)' to build their docstring.
2077It should be placed right where the docstring would be, and FORM is then 2088It should be placed right where the docstring would be, and FORM is then
2078evaluated (and should return a string) when the closure is built. 2089evaluated (and should return a string) when the closure is built.
2079 2090
2080+++ 2091+++
2081** define-inline provides a new way to define inlinable functions. 2092** 'define-inline' provides a new way to define inlinable functions.
2082 2093
2083+++ 2094+++
2084** New function 'macroexpand-1' to perform a single step of macro expansion. 2095** New function 'macroexpand-1' to perform a single step of macro expansion.
2085 2096
2086+++ 2097+++
2087** Some "x-*" functions were obsoleted and/or renamed: 2098** Some "x-*" functions were obsoleted and/or renamed:
2088*** x-select-text is renamed gui-select-text. 2099*** 'x-select-text' is renamed 'gui-select-text'.
2089*** x-selection-value is renamed gui-selection-value. 2100*** 'x-selection-value' is renamed 'gui-selection-value'.
2090*** x-get-selection is renamed gui-get-selection. 2101*** 'x-get-selection' is renamed 'gui-get-selection'.
2091*** x-get-clipboard and x-clipboard-yank are marked obsolete. 2102*** 'x-get-clipboard' and 'x-clipboard-yank' are marked obsolete.
2092*** x-get-selection-value is renamed to gui-get-primary-selection. 2103*** 'x-get-selection-value' is renamed to 'gui-get-primary-selection'.
2093*** x-set-selection is renamed to gui-set-selection 2104*** 'x-set-selection' is renamed to 'gui-set-selection'.
2094 2105
2095+++ 2106+++
2096** New function 'string-greaterp', which return the opposite result of 2107** New function 'string-greaterp', which return the opposite result of
@@ -2149,9 +2160,9 @@ text and directional control characters.
2149 2160
2150+++ 2161+++
2151** New properties that can be specified with 'declare': 2162** New properties that can be specified with 'declare':
2152*** (interactive-only INSTEAD), says to use INSTEAD for non-interactive use. 2163*** '(interactive-only INSTEAD)', says to use INSTEAD for non-interactive use.
2153*** (pure VAL), if VAL is non-nil, indicates the function is pure. 2164*** '(pure VAL)', if VAL is non-nil, indicates the function is pure.
2154*** (side-effect-free VAL), if VAL is non-nil, indicates the function does not 2165*** '(side-effect-free VAL)', if VAL is non-nil, indicates the function does not
2155have side effects. 2166have side effects.
2156 2167
2157+++ 2168+++
@@ -2210,10 +2221,12 @@ font, and (iii) the specified window.
2210 2221
2211--- 2222---
2212** New utilities in subr-x.el: 2223** New utilities in subr-x.el:
2224
2213*** New macros 'if-let' and 'when-let' allow defining bindings and to 2225*** New macros 'if-let' and 'when-let' allow defining bindings and to
2214 execute code depending whether all values are true. 2226execute code depending whether all values are true.
2227
2215*** New macros 'thread-first' and 'thread-last' allow threading a form 2228*** New macros 'thread-first' and 'thread-last' allow threading a form
2216 as the first or last argument of subsequent forms. 2229as the first or last argument of subsequent forms.
2217 2230
2218+++ 2231+++
2219** Documentation strings now support quoting with curved single quotes 2232** Documentation strings now support quoting with curved single quotes
@@ -2232,7 +2245,7 @@ curved single quotes, grave accents and apostrophes as per
2232'text-quoting-style'. 2245'text-quoting-style'.
2233 2246
2234+++ 2247+++
2235** show-help-function's arg is converted via substitute-command-keys 2248** 'show-help-function's arg is converted via 'substitute-command-keys'
2236before being passed to the function. Help strings, help-echo 2249before being passed to the function. Help strings, help-echo
2237properties, etc. can therefore contain command key escapes and 2250properties, etc. can therefore contain command key escapes and
2238quotation marks. 2251quotation marks.
@@ -2282,12 +2295,12 @@ the name is a directory separator character (forward slash on GNU and
2282Unix systems, forward- or backslash on MS-Windows and MS-DOS). 2295Unix systems, forward- or backslash on MS-Windows and MS-DOS).
2283 2296
2284--- 2297---
2285** ASCII approximations to curved quotes are put in standard-display-table 2298** ASCII approximations to curved quotes are put in 'standard-display-table'
2286if the terminal cannot display curved quotes. 2299if the terminal cannot display curved quotes.
2287 2300
2288+++ 2301+++
2289** Standard output and error streams now transliterate characters via 2302** Standard output and error streams now transliterate characters via
2290standard-display-table, and encode output using locale-coding-system. 2303'standard-display-table', and encode output using 'locale-coding-system'.
2291To force a specific encoding, bind 'coding-system-for-write' to the 2304To force a specific encoding, bind 'coding-system-for-write' to the
2292coding-system of your choice when invoking functions like 'prin1' and 2305coding-system of your choice when invoking functions like 'prin1' and
2293'message'. 2306'message'.
@@ -2314,30 +2327,30 @@ provide toolkit scroll bars, namely Gtk+, Lucid, Motif and Windows.
2314Horizontal scroll bars are turned off by default. 2327Horizontal scroll bars are turned off by default.
2315 2328
2316**** New function 'horizontal-scroll-bars-available-p' telling whether 2329**** New function 'horizontal-scroll-bars-available-p' telling whether
2317 horizontal scroll bars are available on the underlying system. 2330horizontal scroll bars are available on the underlying system.
2318 2331
2319**** New mode 'horizontal-scroll-bar-mode' to toggle horizontal scroll 2332**** New mode 'horizontal-scroll-bar-mode' to toggle horizontal scroll
2320 bars on all existing and future frames. 2333bars on all existing and future frames.
2321 2334
2322**** New function 'toggle-horizontal-scroll-bar' to toggle horizontal 2335**** New function 'toggle-horizontal-scroll-bar' to toggle horizontal
2323 scroll bars on the selected frame. 2336scroll bars on the selected frame.
2324 2337
2325**** New frame parameters 'horizontal-scroll-bars' and 2338**** New frame parameters 'horizontal-scroll-bars' and
2326 'scroll-bar-height' to set horizontal scroll bars and their height 2339'scroll-bar-height' to set horizontal scroll bars and their height
2327 for individual frames and in 'default-frame-alist'. 2340for individual frames and in 'default-frame-alist'.
2328 2341
2329**** New functions 'frame-scroll-bar-height' and 2342**** New functions 'frame-scroll-bar-height' and
2330 'window-scroll-bar-height' return the height of horizontal scroll 2343'window-scroll-bar-height' return the height of horizontal scroll
2331 bars on a specific frame or window. 2344bars on a specific frame or window.
2332 2345
2333**** 'set-window-scroll-bars' now accepts five parameters where the last 2346**** 'set-window-scroll-bars' now accepts five parameters where the last
2334 two specify height and type of the window's horizontal scroll bar. 2347two specify height and type of the window's horizontal scroll bar.
2335 2348
2336**** 'window-scroll-bars' now returns type and sizes of horizontal scroll 2349**** 'window-scroll-bars' now returns type and sizes of horizontal scroll
2337 bars too. 2350bars too.
2338 2351
2339**** New buffer-local variables 'horizontal-scroll-bar' and 2352**** New buffer-local variables 'horizontal-scroll-bar' and
2340 'scroll-bar-height'. 2353'scroll-bar-height'.
2341 2354
2342+++ 2355+++
2343*** New functions 'frame-geometry' and 'frame-edges' give access to a 2356*** New functions 'frame-geometry' and 'frame-edges' give access to a
@@ -2376,10 +2389,11 @@ they display when setting default font, menu bar, fringe width, or
2376scroll bars. In particular, maximized and fullscreen frames are 2389scroll bars. In particular, maximized and fullscreen frames are
2377conceptually never resized if such settings change. For fullheight and 2390conceptually never resized if such settings change. For fullheight and
2378fullwidth frames, the behavior may depend on the toolkit used. 2391fullwidth frames, the behavior may depend on the toolkit used.
2392
2379**** New option 'frame-inhibit-implied-resize' if non-nil, means that 2393**** New option 'frame-inhibit-implied-resize' if non-nil, means that
2380 setting default font, menu bar, fringe width, or scroll bars of a 2394setting default font, menu bar, fringe width, or scroll bars of a
2381 specific frame does not resize that frame in order to preserve the 2395specific frame does not resize that frame in order to preserve the
2382 number of columns or lines it displays. 2396number of columns or lines it displays.
2383 2397
2384+++ 2398+++
2385*** New function 'window-preserve-size' allows you to preserve the size of 2399*** New function 'window-preserve-size' allows you to preserve the size of
@@ -2449,7 +2463,7 @@ whitespace at line beginning.
2449* Changes in Emacs 25.1 on Non-Free Operating Systems 2463* Changes in Emacs 25.1 on Non-Free Operating Systems
2450 2464
2451--- 2465---
2452** MS-Windows specific Emacs build scripts are no longer in the distribution 2466** MS-Windows specific Emacs build scripts are no longer in the distribution.
2453This includes the makefile.w32-in files in various subdirectories, and 2467This includes the makefile.w32-in files in various subdirectories, and
2454the support files. The file nt/configure.bat now just tells the user 2468the support files. The file nt/configure.bat now just tells the user
2455to use the procedure described in nt/INSTALL, by running the Posix 2469to use the procedure described in nt/INSTALL, by running the Posix
diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index f651dc9cd18..05cd97932a3 100644
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -624,7 +624,9 @@ references displayed in the current *xref* buffer."
624 (setq pairs (cdr buf-pairs)) 624 (setq pairs (cdr buf-pairs))
625 (setq continue 625 (setq continue
626 (perform-replace from to t t nil nil multi-query-replace-map))) 626 (perform-replace from to t t nil nil multi-query-replace-map)))
627 (unless did-it-once (user-error "No suitable matches here")))) 627 (unless did-it-once (user-error "No suitable matches here"))
628 (when (and continue (not buf-pairs))
629 (message "All results processed"))))
628 630
629(defvar xref--xref-buffer-mode-map 631(defvar xref--xref-buffer-mode-map
630 (let ((map (make-sparse-keymap))) 632 (let ((map (make-sparse-keymap)))
diff --git a/src/editfns.c b/src/editfns.c
index 0e1a6e3415f..afcf1cab72b 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -2535,7 +2535,7 @@ insert1 (Lisp_Object arg)
2535 2535
2536DEFUN ("insert", Finsert, Sinsert, 0, MANY, 0, 2536DEFUN ("insert", Finsert, Sinsert, 0, MANY, 0,
2537 doc: /* Insert the arguments, either strings or characters, at point. 2537 doc: /* Insert the arguments, either strings or characters, at point.
2538Point and before-insertion markers move forward to end up 2538Point and after-insertion markers move forward to end up
2539 after the inserted text. 2539 after the inserted text.
2540Any other markers at the point of insertion remain before the text. 2540Any other markers at the point of insertion remain before the text.
2541 2541
@@ -2559,7 +2559,7 @@ usage: (insert &rest ARGS) */)
2559DEFUN ("insert-and-inherit", Finsert_and_inherit, Sinsert_and_inherit, 2559DEFUN ("insert-and-inherit", Finsert_and_inherit, Sinsert_and_inherit,
2560 0, MANY, 0, 2560 0, MANY, 0,
2561 doc: /* Insert the arguments at point, inheriting properties from adjoining text. 2561 doc: /* Insert the arguments at point, inheriting properties from adjoining text.
2562Point and before-insertion markers move forward to end up 2562Point and after-insertion markers move forward to end up
2563 after the inserted text. 2563 after the inserted text.
2564Any other markers at the point of insertion remain before the text. 2564Any other markers at the point of insertion remain before the text.
2565 2565
diff --git a/src/process.c b/src/process.c
index 2d0fb567943..3e66949b690 100644
--- a/src/process.c
+++ b/src/process.c
@@ -1134,7 +1134,9 @@ See `set-process-sentinel' for more info on sentinels. */)
1134 1134
1135DEFUN ("set-process-window-size", Fset_process_window_size, 1135DEFUN ("set-process-window-size", Fset_process_window_size,
1136 Sset_process_window_size, 3, 3, 0, 1136 Sset_process_window_size, 3, 3, 0,
1137 doc: /* Tell PROCESS that it has logical window size HEIGHT and WIDTH. */) 1137 doc: /* Tell PROCESS that it has logical window size WIDTH by HEIGHT.
1138Value is t if PROCESS was successfully told about the window size,
1139nil otherwise. */)
1138 (Lisp_Object process, Lisp_Object height, Lisp_Object width) 1140 (Lisp_Object process, Lisp_Object height, Lisp_Object width)
1139{ 1141{
1140 CHECK_PROCESS (process); 1142 CHECK_PROCESS (process);