diff options
| author | Paul Eggert | 2017-10-01 21:58:52 -0700 |
|---|---|---|
| committer | Paul Eggert | 2017-10-01 21:58:52 -0700 |
| commit | 4829a3b033b119b088947d14b73efc197b2547fa (patch) | |
| tree | ef9a96d2fa02c559ce69ff3ac9a272af84e5f6e9 /doc | |
| parent | ee3024c70d2974b59ecdd04b75d18d7258262e70 (diff) | |
| parent | 5172fa02cccaab2500ecf85aaf65b8deed54d42e (diff) | |
| download | emacs-4829a3b033b119b088947d14b73efc197b2547fa.tar.gz emacs-4829a3b033b119b088947d14b73efc197b2547fa.zip | |
Merge from origin/emacs-26
5172fa02cc Prefer HTTPS to HTTP for gnu.org
8cdd8b920a Merge from Gnulib
60b7668b89 Keep eww buffer current when looking up CSS on MDN
bd49b6f1b3 Workaround for faulty localtime() under macOS 10.6
913808e224 Doc amendment for syntax-ppss.
98dc91fda8 Remove incorrect NEWS entry about 'find-library'
539d8626cd Remove inadvertent changes to syntax.texi in last commit.
8c18dcbc78 Amend documentation for text-quoting-style becoming a user...
5f76ac150a Make the value nil in text-quoting-style mean what it does...
d5e4e004fa Make text-quoting-style customizable. Introduce t and new...
1ba3471b9b eshell.texi improvements
7abb5c3960 Fix ns-win.el on GNUstep
07ea5ef99a Fix reference style in org.texi
b03b4f6d79 Improve handling of iconification of child frames (Bug#28611)
ba9139c501 Revert "Don't lose arguments to eshell aliases (Bug#27954)"
43fac3beae Make "unsafe directory" error message more informative (Bu...
c59ddb2120 Fix slot typecheck in eieio-persistent
8b2ab5014b Fix semantic-ia-fast-jump
5b45e7e1c3 Bind vc-region-history
f172894595 Exit macro definition on undefined keys
289fe6c0d1 Reset bidi-paragraph-direction on article rendering
a4f7518817 Fix url-http use of url-current-object
4a755ed421 Avoid assertions in vc-hg.el on MS-Windows
cb93a6ce72 Improve documentation of 'copy-sequence'
200ef6f721 Minor update of ack.texi
cb407d3e87 * doc/emacs/emacs.texi (Acknowledgments): Add more contrib...
82b6c765ff Improve indexing of multi-file/buffer Isearch commands
645ff6c702 Add CAM02 JCh and CAM02-UCS J'a'b' conversions
157007b58e Fix uses of @kindex in the Emacs manual
63a45e8837 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/e...
3ab2f9bbb9 Merge from gnulib
cbc8324488 Prefer HTTPS to HTTP for gnu.org
bbda601d1d ; Spelling fixes
695cf5300b Wait for frame visibility with timeout in w32term too
e1f6e3127a Bring back the busy wait after x_make_frame_visible (Bug#2...
bccf635217 ; * src/gtkutil.c (xg_check_special_colors): Add another G...
f428757cdb Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/e...
26d58f0c58 ; Standardize license notices
73dba0f466 Fix last doc string change in simple.el
Diffstat (limited to 'doc')
36 files changed, 233 insertions, 142 deletions
diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in index 5d2503ff493..f7cc2e112c3 100644 --- a/doc/emacs/Makefile.in +++ b/doc/emacs/Makefile.in | |||
| @@ -58,7 +58,7 @@ HTML_OPTS = --no-split --html | |||
| 58 | # Options used only when making info output. | 58 | # Options used only when making info output. |
| 59 | # --no-split is only needed because of MS-DOS. | 59 | # --no-split is only needed because of MS-DOS. |
| 60 | # For a possible alternative, see | 60 | # For a possible alternative, see |
| 61 | # http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg01182.html | 61 | # https://lists.gnu.org/archive/html/emacs-devel/2011-01/msg01182.html |
| 62 | INFO_OPTS= --no-split | 62 | INFO_OPTS= --no-split |
| 63 | 63 | ||
| 64 | INSTALL = @INSTALL@ | 64 | INSTALL = @INSTALL@ |
diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi index 733106b740c..7d8549c918f 100644 --- a/doc/emacs/ack.texi +++ b/doc/emacs/ack.texi | |||
| @@ -1418,8 +1418,8 @@ zone out in front of Emacs. | |||
| 1418 | Eli Zaretskii made many standard Emacs features work on MS-DOS and | 1418 | Eli Zaretskii made many standard Emacs features work on MS-DOS and |
| 1419 | Microsoft Windows. He also wrote @file{tty-colors.el}, which | 1419 | Microsoft Windows. He also wrote @file{tty-colors.el}, which |
| 1420 | implements transparent mapping of X colors to tty colors; and | 1420 | implements transparent mapping of X colors to tty colors; and |
| 1421 | @file{rxvt.el}. He implemented support for bidirectional text, | 1421 | @file{rxvt.el}. He implemented support for bidirectional text, menus |
| 1422 | and also menus on text-mode terminals. | 1422 | on text-mode terminals, and built-in display of line numbers. |
| 1423 | 1423 | ||
| 1424 | @item | 1424 | @item |
| 1425 | Jamie Zawinski wrote much of the support for faces and X selections. | 1425 | Jamie Zawinski wrote much of the support for faces and X selections. |
diff --git a/doc/emacs/buffers.texi b/doc/emacs/buffers.texi index f3a3c8ef251..a8b810ef91f 100644 --- a/doc/emacs/buffers.texi +++ b/doc/emacs/buffers.texi | |||
| @@ -110,8 +110,8 @@ it, Emacs asks for the file name to use, and the buffer's major mode | |||
| 110 | is re-established taking that file name into account (@pxref{Choosing | 110 | is re-established taking that file name into account (@pxref{Choosing |
| 111 | Modes}). | 111 | Modes}). |
| 112 | 112 | ||
| 113 | @kindex C-x @key{LEFT} | 113 | @kindex C-x LEFT |
| 114 | @kindex C-x @key{RIGHT} | 114 | @kindex C-x RIGHT |
| 115 | @findex next-buffer | 115 | @findex next-buffer |
| 116 | @findex previous-buffer | 116 | @findex previous-buffer |
| 117 | For conveniently switching between a few buffers, use the commands | 117 | For conveniently switching between a few buffers, use the commands |
diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi index 6afd8366b25..5860bacb9d8 100644 --- a/doc/emacs/display.texi +++ b/doc/emacs/display.texi | |||
| @@ -1548,11 +1548,20 @@ for details. | |||
| 1548 | @cindex curly quotes | 1548 | @cindex curly quotes |
| 1549 | @cindex curved quotes | 1549 | @cindex curved quotes |
| 1550 | @cindex homoglyph face | 1550 | @cindex homoglyph face |
| 1551 | |||
| 1552 | Emacs tries to determine if the curved quotes @samp{‘} and @samp{’} | ||
| 1553 | can be displayed on the current display. By default, if this seems to | ||
| 1554 | be so, then Emacs will translate the @acronym{ASCII} quotes (@samp{`} | ||
| 1555 | and @samp{'}), when they appear in messages and help texts, to these | ||
| 1556 | curved quotes. You can influence or inhibit this translation by | ||
| 1557 | customizing the user option @code{text-quoting-style} (@pxref{Keys in | ||
| 1558 | Documentation,,, elisp, The Emacs Lisp Reference Manual}). | ||
| 1559 | |||
| 1551 | If the curved quotes @samp{‘}, @samp{’}, @samp{“}, and @samp{”} are | 1560 | If the curved quotes @samp{‘}, @samp{’}, @samp{“}, and @samp{”} are |
| 1552 | known to look just like @acronym{ASCII} characters, they are shown | 1561 | known to look just like @acronym{ASCII} characters, they are shown |
| 1553 | with the @code{homoglyph} face. Curved quotes that cannot be | 1562 | with the @code{homoglyph} face. Curved quotes that are known not to |
| 1554 | displayed are shown as their @acronym{ASCII} approximations @samp{`}, | 1563 | be displayable are shown as their @acronym{ASCII} approximations |
| 1555 | @samp{'}, and @samp{"} with the @code{homoglyph} face. | 1564 | @samp{`}, @samp{'}, and @samp{"} with the @code{homoglyph} face. |
| 1556 | 1565 | ||
| 1557 | @node Cursor Display | 1566 | @node Cursor Display |
| 1558 | @section Displaying the Cursor | 1567 | @section Displaying the Cursor |
diff --git a/doc/emacs/doclicense.texi b/doc/emacs/doclicense.texi index 9c3bbe56e91..eaf3da0e92d 100644 --- a/doc/emacs/doclicense.texi +++ b/doc/emacs/doclicense.texi | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | 6 | ||
| 7 | @display | 7 | @display |
| 8 | Copyright @copyright{} 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc. | 8 | Copyright @copyright{} 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc. |
| 9 | @uref{http://fsf.org/} | 9 | @uref{https://fsf.org/} |
| 10 | 10 | ||
| 11 | Everyone is permitted to copy and distribute verbatim copies | 11 | Everyone is permitted to copy and distribute verbatim copies |
| 12 | of this license document, but changing it is not allowed. | 12 | of this license document, but changing it is not allowed. |
| @@ -414,7 +414,7 @@ The Free Software Foundation may publish new, revised versions | |||
| 414 | of the GNU Free Documentation License from time to time. Such new | 414 | of the GNU Free Documentation License from time to time. Such new |
| 415 | versions will be similar in spirit to the present version, but may | 415 | versions will be similar in spirit to the present version, but may |
| 416 | differ in detail to address new problems or concerns. See | 416 | differ in detail to address new problems or concerns. See |
| 417 | @uref{http://www.gnu.org/copyleft/}. | 417 | @uref{https://www.gnu.org/licenses/}. |
| 418 | 418 | ||
| 419 | Each version of the License is given a distinguishing version number. | 419 | Each version of the License is given a distinguishing version number. |
| 420 | If the Document specifies that a particular numbered version of this | 420 | If the Document specifies that a particular numbered version of this |
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi index 1b9a8b39a4a..2559b0646c0 100644 --- a/doc/emacs/emacs.texi +++ b/doc/emacs/emacs.texi | |||
| @@ -1401,8 +1401,8 @@ Thomas Bellman, Scott Bender, Boaz Ben-Zvi, Sergey Berezin, Stephen Berman, Karl | |||
| 1401 | Berry, Anna M. Bigatti, Ray Blaak, Martin Blais, Jim Blandy, Johan | 1401 | Berry, Anna M. Bigatti, Ray Blaak, Martin Blais, Jim Blandy, Johan |
| 1402 | Bockgård, Jan Böcker, Joel Boehland, Lennart Borgman, Per Bothner, | 1402 | Bockgård, Jan Böcker, Joel Boehland, Lennart Borgman, Per Bothner, |
| 1403 | Terrence Brannon, Frank Bresz, Peter Breton, Emmanuel Briot, Kevin | 1403 | Terrence Brannon, Frank Bresz, Peter Breton, Emmanuel Briot, Kevin |
| 1404 | Broadey, Vincent Broman, Michael Brouwer, David M. Brown, Stefan Bruda, | 1404 | Broadey, Vincent Broman, Michael Brouwer, David M. Brown, Ken Brown, Stefan Bruda, |
| 1405 | Georges Brun-Cottan, Joe Buehler, Scott Byer, Włodek Bzyl, | 1405 | Georges Brun-Cottan, Joe Buehler, Scott Byer, Włodek Bzyl, Tino Calancha, |
| 1406 | Bill Carpenter, Per Cederqvist, Hans Chalupsky, Chris Chase, Bob | 1406 | Bill Carpenter, Per Cederqvist, Hans Chalupsky, Chris Chase, Bob |
| 1407 | Chassell, Andrew Choi, Chong Yidong, Sacha Chua, Stewart Clamen, James | 1407 | Chassell, Andrew Choi, Chong Yidong, Sacha Chua, Stewart Clamen, James |
| 1408 | Clark, Mike Clarkson, Glynn Clements, Andrew Cohen, Daniel Colascione, | 1408 | Clark, Mike Clarkson, Glynn Clements, Andrew Cohen, Daniel Colascione, |
| @@ -1444,7 +1444,7 @@ Limpach, Lars Lindberg, Chris Lindblad, Anders Lindgren, Thomas Link, | |||
| 1444 | Juri Linkov, Francis Litterio, Sergey Litvinov, Leo Liu, Emilio C. Lopes, | 1444 | Juri Linkov, Francis Litterio, Sergey Litvinov, Leo Liu, Emilio C. Lopes, |
| 1445 | Martin Lorentzon, Dave Love, Eric Ludlam, Károly Lőrentey, Sascha | 1445 | Martin Lorentzon, Dave Love, Eric Ludlam, Károly Lőrentey, Sascha |
| 1446 | Lüdecke, Greg McGary, Roland McGrath, Michael McNamara, Alan Mackenzie, | 1446 | Lüdecke, Greg McGary, Roland McGrath, Michael McNamara, Alan Mackenzie, |
| 1447 | Christopher J. Madsen, Neil M. Mager, Ken Manheimer, Bill Mann, | 1447 | Christopher J. Madsen, Neil M. Mager, Artur Malabarba, Ken Manheimer, Bill Mann, |
| 1448 | Brian Marick, Simon Marshall, Bengt Martensson, Charlie Martin, | 1448 | Brian Marick, Simon Marshall, Bengt Martensson, Charlie Martin, |
| 1449 | Yukihiro Matsumoto, Tomohiro Matsuyama, David Maus, Thomas May, Will Mengarini, David | 1449 | Yukihiro Matsumoto, Tomohiro Matsuyama, David Maus, Thomas May, Will Mengarini, David |
| 1450 | Megginson, Stefan Merten, Ben A. Mesander, Wayne Mesard, Brad | 1450 | Megginson, Stefan Merten, Ben A. Mesander, Wayne Mesard, Brad |
| @@ -1455,11 +1455,11 @@ Gergely Nagy, Nobuyoshi Nakada, Thomas Neumann, Mike Newton, Thien-Thi Nguyen, | |||
| 1455 | Jurgen Nickelsen, Dan Nicolaescu, Hrvoje Nikšić, Jeff Norden, | 1455 | Jurgen Nickelsen, Dan Nicolaescu, Hrvoje Nikšić, Jeff Norden, |
| 1456 | Andrew Norman, Theresa O'Connor, Kentaro Ohkouchi, Christian Ohler, | 1456 | Andrew Norman, Theresa O'Connor, Kentaro Ohkouchi, Christian Ohler, |
| 1457 | Kenichi Okada, Alexandre Oliva, Bob Olson, Michael Olson, Takaaki Ota, | 1457 | Kenichi Okada, Alexandre Oliva, Bob Olson, Michael Olson, Takaaki Ota, |
| 1458 | Pieter E. J. Pareit, Ross Patterson, David Pearson, Juan Pechiar, | 1458 | Mark Oteiza, Pieter E. J. Pareit, Ross Patterson, David Pearson, Juan Pechiar, |
| 1459 | Jeff Peck, Damon Anton Permezel, Tom Perrine, William M. Perry, Per | 1459 | Jeff Peck, Damon Anton Permezel, Tom Perrine, William M. Perry, Per |
| 1460 | Persson, Jens Petersen, Daniel Pfeiffer, Justus Piater, Richard L. | 1460 | Persson, Jens Petersen, Nicolas Petton, Daniel Pfeiffer, Justus Piater, Richard L. |
| 1461 | Pieri, Fred Pierresteguy, François Pinard, Daniel Pittman, Christian | 1461 | Pieri, Fred Pierresteguy, François Pinard, Daniel Pittman, Christian |
| 1462 | Plaunt, Alexander Pohoyda, David Ponce, Francesco A. Potortì, | 1462 | Plaunt, Alexander Pohoyda, David Ponce, Noam Postavsky, Francesco A. Potortì, |
| 1463 | Michael D. Prange, Mukesh Prasad, Ken Raeburn, Marko Rahamaa, Ashwin | 1463 | Michael D. Prange, Mukesh Prasad, Ken Raeburn, Marko Rahamaa, Ashwin |
| 1464 | Ram, Eric S. Raymond, Paul Reilly, Edward M. Reingold, David | 1464 | Ram, Eric S. Raymond, Paul Reilly, Edward M. Reingold, David |
| 1465 | Reitter, Alex Rezinsky, Rob Riepel, Lara Rios, Adrian Robert, Nick | 1465 | Reitter, Alex Rezinsky, Rob Riepel, Lara Rios, Adrian Robert, Nick |
| @@ -1476,7 +1476,7 @@ Stanislav Shalunov, Marc Shapiro, Richard Sharman, Olin Shivers, Tibor | |||
| 1476 | Šimko, Espen Skoglund, Rick Sladkey, Lynn Slater, Chris Smith, | 1476 | Šimko, Espen Skoglund, Rick Sladkey, Lynn Slater, Chris Smith, |
| 1477 | David Smith, Paul D. Smith, Wilson Snyder, William Sommerfeld, Simon | 1477 | David Smith, Paul D. Smith, Wilson Snyder, William Sommerfeld, Simon |
| 1478 | South, Andre Spiegel, Michael Staats, Thomas Steffen, Ulf Stegemann, | 1478 | South, Andre Spiegel, Michael Staats, Thomas Steffen, Ulf Stegemann, |
| 1479 | Reiner Steib, Sam Steingold, Ake Stenhoff, Peter Stephenson, Ken | 1479 | Reiner Steib, Sam Steingold, Ake Stenhoff, Philipp Stephani, Peter Stephenson, Ken |
| 1480 | Stevens, Andy Stewart, Jonathan Stigelman, Martin Stjernholm, Kim F. | 1480 | Stevens, Andy Stewart, Jonathan Stigelman, Martin Stjernholm, Kim F. |
| 1481 | Storm, Steve Strassmann, Christopher Suckling, Olaf Sylvester, Naoto | 1481 | Storm, Steve Strassmann, Christopher Suckling, Olaf Sylvester, Naoto |
| 1482 | Takahashi, Steven Tamm, Jan Tatarik, Luc Teirlinck, Jean-Philippe Theberge, Jens | 1482 | Takahashi, Steven Tamm, Jan Tatarik, Luc Teirlinck, Jean-Philippe Theberge, Jens |
| @@ -1503,7 +1503,7 @@ Neal Ziring, Teodor Zlatanov, and Detlev Zundel. | |||
| 1503 | advanced, self-documenting, customizable, extensible editor Emacs. | 1503 | advanced, self-documenting, customizable, extensible editor Emacs. |
| 1504 | (The @samp{G} in | 1504 | (The @samp{G} in |
| 1505 | @c Workaround makeinfo 4 bug. | 1505 | @c Workaround makeinfo 4 bug. |
| 1506 | @c http://lists.gnu.org/archive/html/bug-texinfo/2004-08/msg00009.html | 1506 | @c https://lists.gnu.org/archive/html/bug-texinfo/2004-08/msg00009.html |
| 1507 | @iftex | 1507 | @iftex |
| 1508 | @acronym{GNU, @acronym{GNU}'s Not Unix} | 1508 | @acronym{GNU, @acronym{GNU}'s Not Unix} |
| 1509 | @end iftex | 1509 | @end iftex |
diff --git a/doc/emacs/gpl.texi b/doc/emacs/gpl.texi index 0e2e212acb1..c007dc06966 100644 --- a/doc/emacs/gpl.texi +++ b/doc/emacs/gpl.texi | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | @c hence no sectioning command or @node. | 5 | @c hence no sectioning command or @node. |
| 6 | 6 | ||
| 7 | @display | 7 | @display |
| 8 | Copyright @copyright{} 2007 Free Software Foundation, Inc. @url{http://fsf.org/} | 8 | Copyright @copyright{} 2007 Free Software Foundation, Inc. @url{https://fsf.org/} |
| 9 | 9 | ||
| 10 | Everyone is permitted to copy and distribute verbatim copies of this | 10 | Everyone is permitted to copy and distribute verbatim copies of this |
| 11 | license document, but changing it is not allowed. | 11 | license document, but changing it is not allowed. |
| @@ -684,7 +684,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE@. See the GNU | |||
| 684 | General Public License for more details. | 684 | General Public License for more details. |
| 685 | 685 | ||
| 686 | You should have received a copy of the GNU General Public License | 686 | You should have received a copy of the GNU General Public License |
| 687 | along with this program. If not, see @url{http://www.gnu.org/licenses/}. | 687 | along with this program. If not, see @url{https://www.gnu.org/licenses/}. |
| 688 | @end smallexample | 688 | @end smallexample |
| 689 | 689 | ||
| 690 | Also add information on how to contact you by electronic and paper mail. | 690 | Also add information on how to contact you by electronic and paper mail. |
| @@ -707,11 +707,11 @@ use an ``about box''. | |||
| 707 | You should also get your employer (if you work as a programmer) or school, | 707 | You should also get your employer (if you work as a programmer) or school, |
| 708 | if any, to sign a ``copyright disclaimer'' for the program, if necessary. | 708 | if any, to sign a ``copyright disclaimer'' for the program, if necessary. |
| 709 | For more information on this, and how to apply and follow the GNU GPL, see | 709 | For more information on this, and how to apply and follow the GNU GPL, see |
| 710 | @url{http://www.gnu.org/licenses/}. | 710 | @url{https://www.gnu.org/licenses/}. |
| 711 | 711 | ||
| 712 | The GNU General Public License does not permit incorporating your | 712 | The GNU General Public License does not permit incorporating your |
| 713 | program into proprietary programs. If your program is a subroutine | 713 | program into proprietary programs. If your program is a subroutine |
| 714 | library, you may consider it more useful to permit linking proprietary | 714 | library, you may consider it more useful to permit linking proprietary |
| 715 | applications with the library. If this is what you want to do, use | 715 | applications with the library. If this is what you want to do, use |
| 716 | the GNU Lesser General Public License instead of this License. But | 716 | the GNU Lesser General Public License instead of this License. But |
| 717 | first, please read @url{http://www.gnu.org/philosophy/why-not-lgpl.html}. | 717 | first, please read @url{https://www.gnu.org/licenses/why-not-lgpl.html}. |
diff --git a/doc/emacs/macos.texi b/doc/emacs/macos.texi index 134646ccaa7..1577f3d1235 100644 --- a/doc/emacs/macos.texi +++ b/doc/emacs/macos.texi | |||
| @@ -213,6 +213,6 @@ issues to be addressed. Interested developers should contact | |||
| 213 | @email{emacs-devel@@gnu.org}. | 213 | @email{emacs-devel@@gnu.org}. |
| 214 | @end ifnothtml | 214 | @end ifnothtml |
| 215 | @ifhtml | 215 | @ifhtml |
| 216 | @url{http://lists.gnu.org/mailman/listinfo/emacs-devel, the | 216 | @url{https://lists.gnu.org/mailman/listinfo/emacs-devel, the |
| 217 | emacs-devel mailing list}. | 217 | emacs-devel mailing list}. |
| 218 | @end ifhtml | 218 | @end ifhtml |
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi index 39b71445941..dc0a71511ff 100644 --- a/doc/emacs/maintaining.texi +++ b/doc/emacs/maintaining.texi | |||
| @@ -1050,13 +1050,14 @@ increase the number of revisions shown in an existing | |||
| 1050 | entries} or @samp{Show unlimited entries} buttons at the end of the | 1050 | entries} or @samp{Show unlimited entries} buttons at the end of the |
| 1051 | buffer. However, RCS, SCCS, and CVS do not support this feature. | 1051 | buffer. However, RCS, SCCS, and CVS do not support this feature. |
| 1052 | 1052 | ||
| 1053 | @kindex C-x v h | ||
| 1053 | @findex vc-region-history | 1054 | @findex vc-region-history |
| 1054 | A useful variant of examining changes is provided by the command | 1055 | A useful variant of examining changes is provided by the command |
| 1055 | @kbd{vc-region-history}, which shows a @file{*VC-history*} buffer with | 1056 | @kbd{vc-region-history} (by default bound to @kbd{C-x v h}), which shows |
| 1056 | the history of changes to the region of the current file between point | 1057 | a @file{*VC-history*} buffer with the history of changes to the region |
| 1057 | and the mark (@pxref{Mark}). The history of changes includes the | 1058 | of the current file between point and the mark (@pxref{Mark}). The |
| 1058 | commit log messages and also the changes themselves in the Diff | 1059 | history of changes includes the commit log messages and also the |
| 1059 | format. | 1060 | changes themselves in the Diff format. |
| 1060 | 1061 | ||
| 1061 | Invoke this command after marking the region of the current file in | 1062 | Invoke this command after marking the region of the current file in |
| 1062 | whose changes you are interested. In the @file{*VC-history*} buffer | 1063 | whose changes you are interested. In the @file{*VC-history*} buffer |
| @@ -1918,8 +1919,8 @@ without displaying the references. | |||
| 1918 | 1919 | ||
| 1919 | @node Identifier Search | 1920 | @node Identifier Search |
| 1920 | @subsubsection Searching and Replacing with Identifiers | 1921 | @subsubsection Searching and Replacing with Identifiers |
| 1921 | @cindex search and replace in multiple files | 1922 | @cindex search and replace in multiple source files |
| 1922 | @cindex multiple-file search and replace | 1923 | @cindex multiple source file search and replace |
| 1923 | 1924 | ||
| 1924 | The commands in this section perform various search and replace | 1925 | The commands in this section perform various search and replace |
| 1925 | operations either on identifiers themselves or on files that reference | 1926 | operations either on identifiers themselves or on files that reference |
diff --git a/doc/emacs/mark.texi b/doc/emacs/mark.texi index 1e160508e53..eb935706001 100644 --- a/doc/emacs/mark.texi +++ b/doc/emacs/mark.texi | |||
| @@ -367,7 +367,7 @@ of buffers that you have been in, and, for each buffer, a place where | |||
| 367 | you set the mark. The length of the global mark ring is controlled by | 367 | you set the mark. The length of the global mark ring is controlled by |
| 368 | @code{global-mark-ring-max}, and is 16 by default. | 368 | @code{global-mark-ring-max}, and is 16 by default. |
| 369 | 369 | ||
| 370 | @kindex C-x C-@key{SPC} | 370 | @kindex C-x C-SPC |
| 371 | @findex pop-global-mark | 371 | @findex pop-global-mark |
| 372 | The command @kbd{C-x C-@key{SPC}} (@code{pop-global-mark}) jumps to | 372 | The command @kbd{C-x C-@key{SPC}} (@code{pop-global-mark}) jumps to |
| 373 | the buffer and position of the latest entry in the global ring. It also | 373 | the buffer and position of the latest entry in the global ring. It also |
| @@ -449,7 +449,7 @@ using @kbd{C-@key{SPC} C-@key{SPC}} or @kbd{C-u C-x C-x}. | |||
| 449 | 449 | ||
| 450 | @table @kbd | 450 | @table @kbd |
| 451 | @item C-@key{SPC} C-@key{SPC} | 451 | @item C-@key{SPC} C-@key{SPC} |
| 452 | @kindex C-@key{SPC} C-@key{SPC} | 452 | @kindex C-SPC C-SPC |
| 453 | Set the mark at point (like plain @kbd{C-@key{SPC}}) and enable | 453 | Set the mark at point (like plain @kbd{C-@key{SPC}}) and enable |
| 454 | Transient Mark mode just once, until the mark is deactivated. (This | 454 | Transient Mark mode just once, until the mark is deactivated. (This |
| 455 | is not really a separate command; you are using the @kbd{C-@key{SPC}} | 455 | is not really a separate command; you are using the @kbd{C-@key{SPC}} |
diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi index 2f27b9aa0eb..8a4d91f80bf 100644 --- a/doc/emacs/mule.texi +++ b/doc/emacs/mule.texi | |||
| @@ -1198,7 +1198,7 @@ names (@code{set-file-name-coding-system}). | |||
| 1198 | @end table | 1198 | @end table |
| 1199 | 1199 | ||
| 1200 | @findex set-file-name-coding-system | 1200 | @findex set-file-name-coding-system |
| 1201 | @kindex C-x @key{RET} F | 1201 | @kindex C-x RET F |
| 1202 | @cindex file names with non-@acronym{ASCII} characters | 1202 | @cindex file names with non-@acronym{ASCII} characters |
| 1203 | The command @kbd{C-x @key{RET} F} (@code{set-file-name-coding-system}) | 1203 | The command @kbd{C-x @key{RET} F} (@code{set-file-name-coding-system}) |
| 1204 | specifies a coding system to use for encoding file @emph{names}. It | 1204 | specifies a coding system to use for encoding file @emph{names}. It |
| @@ -1356,7 +1356,7 @@ fontset}, the @dfn{startup fontset} and the @dfn{default fontset}. | |||
| 1356 | @c FIXME? The doc of *standard*-fontset-spec says: | 1356 | @c FIXME? The doc of *standard*-fontset-spec says: |
| 1357 | @c "You have the biggest chance to display international characters | 1357 | @c "You have the biggest chance to display international characters |
| 1358 | @c with correct glyphs by using the *standard* fontset." (my emphasis) | 1358 | @c with correct glyphs by using the *standard* fontset." (my emphasis) |
| 1359 | @c See http://lists.gnu.org/archive/html/emacs-devel/2012-04/msg00430.html | 1359 | @c See https://lists.gnu.org/archive/html/emacs-devel/2012-04/msg00430.html |
| 1360 | The default fontset is most likely to have fonts for a wide variety of | 1360 | The default fontset is most likely to have fonts for a wide variety of |
| 1361 | non-@acronym{ASCII} characters, and is the default fallback for the | 1361 | non-@acronym{ASCII} characters, and is the default fallback for the |
| 1362 | other two fontsets, and if you set a default font rather than fontset. | 1362 | other two fontsets, and if you set a default font rather than fontset. |
diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi index 27ac0eb6400..2b0649cd924 100644 --- a/doc/emacs/programs.texi +++ b/doc/emacs/programs.texi | |||
| @@ -712,7 +712,7 @@ before it. An argument of zero, rather than doing nothing, transposes | |||
| 712 | the balanced expressions ending at or after point and the mark. | 712 | the balanced expressions ending at or after point and the mark. |
| 713 | 713 | ||
| 714 | @kindex C-M-@@ | 714 | @kindex C-M-@@ |
| 715 | @kindex C-M-@key{SPC} | 715 | @kindex C-M-SPC |
| 716 | @findex mark-sexp | 716 | @findex mark-sexp |
| 717 | To operate on balanced expressions with a command which acts on the | 717 | To operate on balanced expressions with a command which acts on the |
| 718 | region, type @kbd{C-M-@key{SPC}} (@code{mark-sexp}). This sets the | 718 | region, type @kbd{C-M-@key{SPC}} (@code{mark-sexp}). This sets the |
| @@ -1467,7 +1467,7 @@ Prompt for the name of a function defined in any file Emacs has | |||
| 1467 | parsed, and move point there (@code{semantic-complete-jump}). | 1467 | parsed, and move point there (@code{semantic-complete-jump}). |
| 1468 | 1468 | ||
| 1469 | @item C-c , @key{SPC} | 1469 | @item C-c , @key{SPC} |
| 1470 | @kindex C-c , @key{SPC} | 1470 | @kindex C-c , SPC |
| 1471 | Display a list of possible completions for the symbol at point | 1471 | Display a list of possible completions for the symbol at point |
| 1472 | (@code{semantic-complete-analyze-inline}). This also activates a set | 1472 | (@code{semantic-complete-analyze-inline}). This also activates a set |
| 1473 | of special key bindings for choosing a completion: @key{RET} accepts | 1473 | of special key bindings for choosing a completion: @key{RET} accepts |
| @@ -1716,8 +1716,8 @@ preprocessor commands. | |||
| 1716 | @item C-c C-@key{DEL} | 1716 | @item C-c C-@key{DEL} |
| 1717 | @itemx C-c @key{DEL} | 1717 | @itemx C-c @key{DEL} |
| 1718 | @findex c-hungry-delete-backwards | 1718 | @findex c-hungry-delete-backwards |
| 1719 | @kindex C-c C-@key{DEL} (C Mode) | 1719 | @kindex C-c C-DEL (C Mode) |
| 1720 | @kindex C-c @key{DEL} (C Mode) | 1720 | @kindex C-c DEL (C Mode) |
| 1721 | Delete the entire block of whitespace preceding point (@code{c-hungry-delete-backwards}). | 1721 | Delete the entire block of whitespace preceding point (@code{c-hungry-delete-backwards}). |
| 1722 | 1722 | ||
| 1723 | @item C-c C-d | 1723 | @item C-c C-d |
| @@ -1725,8 +1725,8 @@ Delete the entire block of whitespace preceding point (@code{c-hungry-delete-bac | |||
| 1725 | @itemx C-c @key{Delete} | 1725 | @itemx C-c @key{Delete} |
| 1726 | @findex c-hungry-delete-forward | 1726 | @findex c-hungry-delete-forward |
| 1727 | @kindex C-c C-d (C Mode) | 1727 | @kindex C-c C-d (C Mode) |
| 1728 | @kindex C-c C-@key{Delete} (C Mode) | 1728 | @kindex C-c C-Delete (C Mode) |
| 1729 | @kindex C-c @key{Delete} (C Mode) | 1729 | @kindex C-c Delete (C Mode) |
| 1730 | Delete the entire block of whitespace after point (@code{c-hungry-delete-forward}). | 1730 | Delete the entire block of whitespace after point (@code{c-hungry-delete-forward}). |
| 1731 | @end table | 1731 | @end table |
| 1732 | 1732 | ||
diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi index 9f7e9a12cd7..63cc1c24374 100644 --- a/doc/emacs/search.texi +++ b/doc/emacs/search.texi | |||
| @@ -1685,15 +1685,10 @@ Aside from @code{multi-occur} and @code{multi-occur-in-matching-buffers}, | |||
| 1685 | which always search the whole buffer, all operate on the text from point | 1685 | which always search the whole buffer, all operate on the text from point |
| 1686 | to the end of the buffer, or on the region if it is active. | 1686 | to the end of the buffer, or on the region if it is active. |
| 1687 | 1687 | ||
| 1688 | @findex list-matching-lines | ||
| 1689 | @findex occur | ||
| 1690 | @findex multi-occur | ||
| 1691 | @findex multi-occur-in-matching-buffers | ||
| 1692 | @findex how-many | ||
| 1693 | @findex flush-lines | ||
| 1694 | @findex keep-lines | ||
| 1695 | |||
| 1696 | @table @kbd | 1688 | @table @kbd |
| 1689 | @findex multi-isearch-buffers | ||
| 1690 | @cindex isearch multiple buffers | ||
| 1691 | @cindex multiple-buffer isearch | ||
| 1697 | @item M-x multi-isearch-buffers | 1692 | @item M-x multi-isearch-buffers |
| 1698 | Prompt for one or more buffer names, ending with @key{RET}; then, | 1693 | Prompt for one or more buffer names, ending with @key{RET}; then, |
| 1699 | begin a multi-buffer incremental search in those buffers. (If the | 1694 | begin a multi-buffer incremental search in those buffers. (If the |
| @@ -1702,10 +1697,14 @@ next specified buffer, and so forth.) With a prefix argument, prompt | |||
| 1702 | for a regexp and begin a multi-buffer incremental search in buffers | 1697 | for a regexp and begin a multi-buffer incremental search in buffers |
| 1703 | matching that regexp. | 1698 | matching that regexp. |
| 1704 | 1699 | ||
| 1700 | @findex multi-isearch-buffers-regexp | ||
| 1705 | @item M-x multi-isearch-buffers-regexp | 1701 | @item M-x multi-isearch-buffers-regexp |
| 1706 | This command is just like @code{multi-isearch-buffers}, except it | 1702 | This command is just like @code{multi-isearch-buffers}, except it |
| 1707 | performs an incremental regexp search. | 1703 | performs an incremental regexp search. |
| 1708 | 1704 | ||
| 1705 | @findex multi-isearch-files | ||
| 1706 | @cindex isearch multiple files | ||
| 1707 | @cindex multiple-file isearch | ||
| 1709 | @item M-x multi-isearch-files | 1708 | @item M-x multi-isearch-files |
| 1710 | Prompt for one or more file names, ending with @key{RET}; then, | 1709 | Prompt for one or more file names, ending with @key{RET}; then, |
| 1711 | begin a multi-file incremental search in those files. (If the | 1710 | begin a multi-file incremental search in those files. (If the |
| @@ -1714,6 +1713,7 @@ next specified file, and so forth.) With a prefix argument, prompt | |||
| 1714 | for a regexp and begin a multi-file incremental search in files | 1713 | for a regexp and begin a multi-file incremental search in files |
| 1715 | matching that regexp. | 1714 | matching that regexp. |
| 1716 | 1715 | ||
| 1716 | @findex multi-isearch-files-regexp | ||
| 1717 | @item M-x multi-isearch-files-regexp | 1717 | @item M-x multi-isearch-files-regexp |
| 1718 | This command is just like @code{multi-isearch-files}, except it | 1718 | This command is just like @code{multi-isearch-files}, except it |
| 1719 | performs an incremental regexp search. | 1719 | performs an incremental regexp search. |
| @@ -1729,6 +1729,7 @@ a multi-file incremental search is activated automatically. | |||
| 1729 | @vindex list-matching-lines-jump-to-current-line | 1729 | @vindex list-matching-lines-jump-to-current-line |
| 1730 | @cindex list-matching-lines-current-line-face (face name) | 1730 | @cindex list-matching-lines-current-line-face (face name) |
| 1731 | @kindex M-s o | 1731 | @kindex M-s o |
| 1732 | @findex occur | ||
| 1732 | @item M-x occur | 1733 | @item M-x occur |
| 1733 | @itemx M-s o | 1734 | @itemx M-s o |
| 1734 | Prompt for a regexp, and display a list showing each line in the | 1735 | Prompt for a regexp, and display a list showing each line in the |
| @@ -1768,25 +1769,30 @@ mode, in which edits made to the entries are also applied to the text | |||
| 1768 | in the originating buffer. Type @kbd{C-c C-c} to return to Occur | 1769 | in the originating buffer. Type @kbd{C-c C-c} to return to Occur |
| 1769 | mode. | 1770 | mode. |
| 1770 | 1771 | ||
| 1772 | @findex list-matching-lines | ||
| 1771 | The command @kbd{M-x list-matching-lines} is a synonym for @kbd{M-x | 1773 | The command @kbd{M-x list-matching-lines} is a synonym for @kbd{M-x |
| 1772 | occur}. | 1774 | occur}. |
| 1773 | 1775 | ||
| 1776 | @findex multi-occur | ||
| 1774 | @item M-x multi-occur | 1777 | @item M-x multi-occur |
| 1775 | This command is just like @code{occur}, except it is able to search | 1778 | This command is just like @code{occur}, except it is able to search |
| 1776 | through multiple buffers. It asks you to specify the buffer names one | 1779 | through multiple buffers. It asks you to specify the buffer names one |
| 1777 | by one. | 1780 | by one. |
| 1778 | 1781 | ||
| 1782 | @findex multi-occur-in-matching-buffers | ||
| 1779 | @item M-x multi-occur-in-matching-buffers | 1783 | @item M-x multi-occur-in-matching-buffers |
| 1780 | This command is similar to @code{multi-occur}, except the buffers to | 1784 | This command is similar to @code{multi-occur}, except the buffers to |
| 1781 | search are specified by a regular expression that matches visited file | 1785 | search are specified by a regular expression that matches visited file |
| 1782 | names. With a prefix argument, it uses the regular expression to | 1786 | names. With a prefix argument, it uses the regular expression to |
| 1783 | match buffer names instead. | 1787 | match buffer names instead. |
| 1784 | 1788 | ||
| 1789 | @findex how-many | ||
| 1785 | @item M-x how-many | 1790 | @item M-x how-many |
| 1786 | Prompt for a regexp, and print the number of matches for it in the | 1791 | Prompt for a regexp, and print the number of matches for it in the |
| 1787 | buffer after point. If the region is active, this operates on the | 1792 | buffer after point. If the region is active, this operates on the |
| 1788 | region instead. | 1793 | region instead. |
| 1789 | 1794 | ||
| 1795 | @findex flush-lines | ||
| 1790 | @item M-x flush-lines | 1796 | @item M-x flush-lines |
| 1791 | Prompt for a regexp, and delete each line that contains a match for | 1797 | Prompt for a regexp, and delete each line that contains a match for |
| 1792 | it, operating on the text after point. This command deletes the | 1798 | it, operating on the text after point. This command deletes the |
| @@ -1800,6 +1806,7 @@ lines. It deletes the lines before starting to look for the next | |||
| 1800 | match; hence, it ignores a match starting on the same line at which | 1806 | match; hence, it ignores a match starting on the same line at which |
| 1801 | another match ended. | 1807 | another match ended. |
| 1802 | 1808 | ||
| 1809 | @findex keep-lines | ||
| 1803 | @item M-x keep-lines | 1810 | @item M-x keep-lines |
| 1804 | Prompt for a regexp, and delete each line that @emph{does not} contain | 1811 | Prompt for a regexp, and delete each line that @emph{does not} contain |
| 1805 | a match for it, operating on the text after point. If point is not at | 1812 | a match for it, operating on the text after point. If point is not at |
diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi index a029aaa2d4a..d0b3419a991 100644 --- a/doc/emacs/trouble.texi +++ b/doc/emacs/trouble.texi | |||
| @@ -509,7 +509,7 @@ by the Emacs maintainers, are shown by @kbd{M-x debbugs-gnu-usertags}. | |||
| 509 | @item | 509 | @item |
| 510 | The @samp{bug-gnu-emacs} mailing list (also available as the newsgroup | 510 | The @samp{bug-gnu-emacs} mailing list (also available as the newsgroup |
| 511 | @samp{gnu.emacs.bug}). You can read the list archives at | 511 | @samp{gnu.emacs.bug}). You can read the list archives at |
| 512 | @url{http://lists.gnu.org/mailman/listinfo/bug-gnu-emacs}. This list | 512 | @url{https://lists.gnu.org/mailman/listinfo/bug-gnu-emacs}. This list |
| 513 | works as a mirror of the Emacs bug reports and follow-up messages | 513 | works as a mirror of the Emacs bug reports and follow-up messages |
| 514 | which are sent to the bug tracker. It also contains old bug reports | 514 | which are sent to the bug tracker. It also contains old bug reports |
| 515 | from before the bug tracker was introduced (in early 2008). | 515 | from before the bug tracker was introduced (in early 2008). |
| @@ -524,7 +524,7 @@ The @samp{emacs-pretest-bug} mailing list. This list is no longer | |||
| 524 | used, and is mainly of historical interest. At one time, it was used | 524 | used, and is mainly of historical interest. At one time, it was used |
| 525 | for bug reports in development (i.e., not yet released) versions of | 525 | for bug reports in development (i.e., not yet released) versions of |
| 526 | Emacs. You can read the archives for 2003 to mid 2007 at | 526 | Emacs. You can read the archives for 2003 to mid 2007 at |
| 527 | @url{http://lists.gnu.org/archive/html/emacs-pretest-bug/}. Nowadays, | 527 | @url{https://lists.gnu.org/archive/html/emacs-pretest-bug/}. Nowadays, |
| 528 | it is an alias for @samp{bug-gnu-emacs}. | 528 | it is an alias for @samp{bug-gnu-emacs}. |
| 529 | 529 | ||
| 530 | @item | 530 | @item |
| @@ -680,7 +680,7 @@ will be sent to the Emacs maintainers at | |||
| 680 | @email{bug-gnu-emacs@@gnu.org}. | 680 | @email{bug-gnu-emacs@@gnu.org}. |
| 681 | @end ifnothtml | 681 | @end ifnothtml |
| 682 | @ifhtml | 682 | @ifhtml |
| 683 | @url{http://lists.gnu.org/mailman/listinfo/bug-gnu-emacs, bug-gnu-emacs}. | 683 | @url{https://lists.gnu.org/mailman/listinfo/bug-gnu-emacs, bug-gnu-emacs}. |
| 684 | @end ifhtml | 684 | @end ifhtml |
| 685 | (If you want to suggest an improvement or new feature, use the same | 685 | (If you want to suggest an improvement or new feature, use the same |
| 686 | address.) If you cannot send mail from inside Emacs, you can copy the | 686 | address.) If you cannot send mail from inside Emacs, you can copy the |
| @@ -1251,7 +1251,7 @@ If you would like to work on improving Emacs, please contact the maintainers at | |||
| 1251 | @email{emacs-devel@@gnu.org}. | 1251 | @email{emacs-devel@@gnu.org}. |
| 1252 | @end ifnothtml | 1252 | @end ifnothtml |
| 1253 | @ifhtml | 1253 | @ifhtml |
| 1254 | @url{http://lists.gnu.org/mailman/listinfo/emacs-devel, the | 1254 | @url{https://lists.gnu.org/mailman/listinfo/emacs-devel, the |
| 1255 | emacs-devel mailing list}. | 1255 | emacs-devel mailing list}. |
| 1256 | @end ifhtml | 1256 | @end ifhtml |
| 1257 | You can ask for suggested projects or suggest your own ideas. | 1257 | You can ask for suggested projects or suggest your own ideas. |
| @@ -1262,7 +1262,7 @@ you have not yet started work, it is useful to contact | |||
| 1262 | @email{emacs-devel@@gnu.org} | 1262 | @email{emacs-devel@@gnu.org} |
| 1263 | @end ifnothtml | 1263 | @end ifnothtml |
| 1264 | @ifhtml | 1264 | @ifhtml |
| 1265 | @url{http://lists.gnu.org/mailman/listinfo/emacs-devel, emacs-devel} | 1265 | @url{https://lists.gnu.org/mailman/listinfo/emacs-devel, emacs-devel} |
| 1266 | @end ifhtml | 1266 | @end ifhtml |
| 1267 | before you start; it might be possible to suggest ways to make your | 1267 | before you start; it might be possible to suggest ways to make your |
| 1268 | extension fit in better with the rest of Emacs. | 1268 | extension fit in better with the rest of Emacs. |
| @@ -1426,7 +1426,7 @@ Send a message to | |||
| 1426 | the mailing list @email{help-gnu-emacs@@gnu.org}, | 1426 | the mailing list @email{help-gnu-emacs@@gnu.org}, |
| 1427 | @end ifnothtml | 1427 | @end ifnothtml |
| 1428 | @ifhtml | 1428 | @ifhtml |
| 1429 | @url{http://lists.gnu.org/mailman/listinfo/help-gnu-emacs, the | 1429 | @url{https://lists.gnu.org/mailman/listinfo/help-gnu-emacs, the |
| 1430 | help-gnu-emacs mailing list}, | 1430 | help-gnu-emacs mailing list}, |
| 1431 | @end ifhtml | 1431 | @end ifhtml |
| 1432 | or post your request on newsgroup @code{gnu.emacs.help}. (This | 1432 | or post your request on newsgroup @code{gnu.emacs.help}. (This |
diff --git a/doc/emacs/vc1-xtra.texi b/doc/emacs/vc1-xtra.texi index 58e4de027cb..00498399c79 100644 --- a/doc/emacs/vc1-xtra.texi +++ b/doc/emacs/vc1-xtra.texi | |||
| @@ -238,20 +238,19 @@ is one, to determine the file version, since it is often more reliable | |||
| 238 | than the RCS master file. To inhibit using the version header this | 238 | than the RCS master file. To inhibit using the version header this |
| 239 | way, change the variable @code{vc-consult-headers} to @code{nil}. | 239 | way, change the variable @code{vc-consult-headers} to @code{nil}. |
| 240 | 240 | ||
| 241 | @kindex C-x v h | ||
| 242 | @findex vc-insert-headers | 241 | @findex vc-insert-headers |
| 243 | @vindex vc-@var{backend}-header | 242 | @vindex vc-@var{backend}-header |
| 244 | To insert a suitable header string into the current buffer, type | 243 | To insert a suitable header string into the current buffer, use the |
| 245 | @kbd{C-x v h} (@code{vc-insert-headers}). This command works only on | 244 | command @kbd{M-x vc-insert-headers}. This command works only on |
| 246 | Subversion, CVS, RCS, and SCCS@. The variable | 245 | Subversion, CVS, RCS, and SCCS@. The variable |
| 247 | @code{vc-@var{backend}-header} contains the list of keywords to insert | 246 | @code{vc-@var{backend}-header} contains the list of keywords to insert |
| 248 | into the version header; for instance, CVS uses @code{vc-cvs-header}, | 247 | into the version header; for instance, CVS uses @code{vc-cvs-header}, |
| 249 | whose default value is @code{'("\$Id\$")}. (The extra backslashes | 248 | whose default value is @code{'("\$Id\$")}. (The extra backslashes |
| 250 | prevent the string constant from being interpreted as a header, if the | 249 | prevent the string constant from being interpreted as a header, if the |
| 251 | Emacs Lisp file defining it is maintained with version control.) The | 250 | Emacs Lisp file defining it is maintained with version control.) The |
| 252 | @kbd{C-x v h} command inserts each keyword in the list on a new line | 251 | @code{vc-insert-headers} command inserts each keyword in the list on a |
| 253 | at point, surrounded by tabs, and inside comment delimiters if | 252 | new line at point, surrounded by tabs, and inside comment delimiters |
| 254 | necessary. | 253 | if necessary. |
| 255 | 254 | ||
| 256 | @vindex vc-static-header-alist | 255 | @vindex vc-static-header-alist |
| 257 | The variable @code{vc-static-header-alist} specifies further strings | 256 | The variable @code{vc-static-header-alist} specifies further strings |
diff --git a/doc/lispintro/doclicense.texi b/doc/lispintro/doclicense.texi index 9c3bbe56e91..eaf3da0e92d 100644 --- a/doc/lispintro/doclicense.texi +++ b/doc/lispintro/doclicense.texi | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | 6 | ||
| 7 | @display | 7 | @display |
| 8 | Copyright @copyright{} 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc. | 8 | Copyright @copyright{} 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc. |
| 9 | @uref{http://fsf.org/} | 9 | @uref{https://fsf.org/} |
| 10 | 10 | ||
| 11 | Everyone is permitted to copy and distribute verbatim copies | 11 | Everyone is permitted to copy and distribute verbatim copies |
| 12 | of this license document, but changing it is not allowed. | 12 | of this license document, but changing it is not allowed. |
| @@ -414,7 +414,7 @@ The Free Software Foundation may publish new, revised versions | |||
| 414 | of the GNU Free Documentation License from time to time. Such new | 414 | of the GNU Free Documentation License from time to time. Such new |
| 415 | versions will be similar in spirit to the present version, but may | 415 | versions will be similar in spirit to the present version, but may |
| 416 | differ in detail to address new problems or concerns. See | 416 | differ in detail to address new problems or concerns. See |
| 417 | @uref{http://www.gnu.org/copyleft/}. | 417 | @uref{https://www.gnu.org/licenses/}. |
| 418 | 418 | ||
| 419 | Each version of the License is given a distinguishing version number. | 419 | Each version of the License is given a distinguishing version number. |
| 420 | If the Document specifies that a particular numbered version of this | 420 | If the Document specifies that a particular numbered version of this |
diff --git a/doc/lispref/ChangeLog.1 b/doc/lispref/ChangeLog.1 index 490f216b4cf..3fab757c963 100644 --- a/doc/lispref/ChangeLog.1 +++ b/doc/lispref/ChangeLog.1 | |||
| @@ -497,7 +497,7 @@ | |||
| 497 | Improve doc for use of 'int', and discuss 'ssize_t'. | 497 | Improve doc for use of 'int', and discuss 'ssize_t'. |
| 498 | * internals.texi (C Integer Types): Mention 'int' for other | 498 | * internals.texi (C Integer Types): Mention 'int' for other |
| 499 | randomish values that lie in 'int' range. Mention 'ssize_t'. See: | 499 | randomish values that lie in 'int' range. Mention 'ssize_t'. See: |
| 500 | http://lists.gnu.org/archive/html/emacs-devel/2014-10/msg00019.html | 500 | https://lists.gnu.org/archive/html/emacs-devel/2014-10/msg00019.html |
| 501 | 501 | ||
| 502 | Use AUTO_CONS instead of SCOPED_CONS, etc. | 502 | Use AUTO_CONS instead of SCOPED_CONS, etc. |
| 503 | * internals.texi (Stack-allocated Objects): | 503 | * internals.texi (Stack-allocated Objects): |
| @@ -971,7 +971,7 @@ | |||
| 971 | 971 | ||
| 972 | * markers.texi (Moving Marker Positions): Clarify guidance about | 972 | * markers.texi (Moving Marker Positions): Clarify guidance about |
| 973 | when to move markers and when to create a new one, as discussed at | 973 | when to move markers and when to create a new one, as discussed at |
| 974 | http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16818#17 | 974 | https://debbugs.gnu.org/cgi/bugreport.cgi?bug=16818#17 |
| 975 | 975 | ||
| 976 | 2014-03-02 Glenn Morris <rgm@gnu.org> | 976 | 2014-03-02 Glenn Morris <rgm@gnu.org> |
| 977 | 977 | ||
| @@ -2154,7 +2154,7 @@ | |||
| 2154 | 2154 | ||
| 2155 | * internals.texi (C Integer Types): New section. | 2155 | * internals.texi (C Integer Types): New section. |
| 2156 | This follows up and records an email in | 2156 | This follows up and records an email in |
| 2157 | <http://lists.gnu.org/archive/html/emacs-devel/2012-07/msg00496.html>. | 2157 | <https://lists.gnu.org/archive/html/emacs-devel/2012-07/msg00496.html>. |
| 2158 | 2158 | ||
| 2159 | 2012-12-10 Stefan Monnier <monnier@iro.umontreal.ca> | 2159 | 2012-12-10 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2160 | 2160 | ||
| @@ -2475,7 +2475,7 @@ | |||
| 2475 | * os.texi (Time of Day): | 2475 | * os.texi (Time of Day): |
| 2476 | Update for new time stamp format (HIGH LOW MICROSEC PICOSEC). | 2476 | Update for new time stamp format (HIGH LOW MICROSEC PICOSEC). |
| 2477 | These instances were missed the first time around. | 2477 | These instances were missed the first time around. |
| 2478 | Problem reported by Glenn Morris in <http://bugs.gnu.org/12706#25>. | 2478 | Problem reported by Glenn Morris in <https://bugs.gnu.org/12706#25>. |
| 2479 | 2479 | ||
| 2480 | 2012-10-24 Chong Yidong <cyd@gnu.org> | 2480 | 2012-10-24 Chong Yidong <cyd@gnu.org> |
| 2481 | 2481 | ||
| @@ -6288,7 +6288,7 @@ | |||
| 6288 | 2009-04-11 Eli Zaretskii <eliz@gnu.org> | 6288 | 2009-04-11 Eli Zaretskii <eliz@gnu.org> |
| 6289 | 6289 | ||
| 6290 | * display.texi (Overlays): Overlays don't scale well. See | 6290 | * display.texi (Overlays): Overlays don't scale well. See |
| 6291 | http://lists.gnu.org/archive/html/emacs-devel/2009-04/msg00243.html. | 6291 | https://lists.gnu.org/archive/html/emacs-devel/2009-04/msg00243.html. |
| 6292 | 6292 | ||
| 6293 | 2009-04-10 Chong Yidong <cyd@stupidchicken.com> | 6293 | 2009-04-10 Chong Yidong <cyd@stupidchicken.com> |
| 6294 | 6294 | ||
diff --git a/doc/lispref/control.texi b/doc/lispref/control.texi index 401a999cf23..4eddbe9c122 100644 --- a/doc/lispref/control.texi +++ b/doc/lispref/control.texi | |||
| @@ -1101,13 +1101,10 @@ These examples show typical uses of @code{error}: | |||
| 1101 | error symbol @code{error}, and a list containing the string returned by | 1101 | error symbol @code{error}, and a list containing the string returned by |
| 1102 | @code{format-message}. | 1102 | @code{format-message}. |
| 1103 | 1103 | ||
| 1104 | The @code{text-quoting-style} variable controls what quotes are | 1104 | Typically grave accent and apostrophe in the format translate to |
| 1105 | generated; @xref{Keys in Documentation}. A call using a format like | 1105 | matching curved quotes, e.g., @t{"Missing `%s'"} might result in |
| 1106 | @t{"Missing `%s'"} with grave accents and apostrophes typically | 1106 | @t{"Missing ‘foo’"}. @xref{Text Quoting Style}, for how to influence |
| 1107 | generates a message like @t{"Missing ‘foo’"} with matching curved | 1107 | or inhibit this translation. |
| 1108 | quotes. In contrast, a call using a format like @t{"Missing '%s'"} | ||
| 1109 | with only apostrophes typically generates a message like @t{"Missing | ||
| 1110 | ’foo’"} with only closing curved quotes, an unusual style in English. | ||
| 1111 | 1108 | ||
| 1112 | @strong{Warning:} If you want to use your own string as an error message | 1109 | @strong{Warning:} If you want to use your own string as an error message |
| 1113 | verbatim, don't just write @code{(error @var{string})}. If @var{string} | 1110 | verbatim, don't just write @code{(error @var{string})}. If @var{string} |
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index 3dae984f339..afd09cfb330 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi | |||
| @@ -265,13 +265,10 @@ properties, it is displayed with the specified faces (@pxref{Faces}). | |||
| 265 | The string is also added to the @file{*Messages*} buffer, but without | 265 | The string is also added to the @file{*Messages*} buffer, but without |
| 266 | text properties (@pxref{Logging Messages}). | 266 | text properties (@pxref{Logging Messages}). |
| 267 | 267 | ||
| 268 | The @code{text-quoting-style} variable controls what quotes are | 268 | Typically grave accent and apostrophe in the format translate to |
| 269 | generated; @xref{Keys in Documentation}. A call using a format like | 269 | matching curved quotes, e.g., @t{"Missing `%s'"} might result in |
| 270 | @t{"Missing `%s'"} with grave accents and apostrophes typically | 270 | @t{"Missing ‘foo’"}. @xref{Text Quoting Style}, for how to influence |
| 271 | generates a message like @t{"Missing ‘foo’"} with matching curved | 271 | or inhibit this translation. |
| 272 | quotes. In contrast, a call using a format like @t{"Missing '%s'"} | ||
| 273 | with only apostrophes typically generates a message like @t{"Missing | ||
| 274 | ’foo’"} with only closing curved quotes, an unusual style in English. | ||
| 275 | 272 | ||
| 276 | In batch mode, the message is printed to the standard error stream, | 273 | In batch mode, the message is printed to the standard error stream, |
| 277 | followed by a newline. | 274 | followed by a newline. |
| @@ -7035,7 +7032,7 @@ window display table nor a buffer display table defined, or when Emacs | |||
| 7035 | is outputting text to the standard output or error streams. Although its | 7032 | is outputting text to the standard output or error streams. Although its |
| 7036 | default is typically @code{nil}, in an interactive session if the | 7033 | default is typically @code{nil}, in an interactive session if the |
| 7037 | terminal cannot display curved quotes, its default maps curved quotes | 7034 | terminal cannot display curved quotes, its default maps curved quotes |
| 7038 | to ASCII approximations. @xref{Keys in Documentation}. | 7035 | to ASCII approximations. @xref{Text Quoting Style}. |
| 7039 | @end defvar | 7036 | @end defvar |
| 7040 | 7037 | ||
| 7041 | The @file{disp-table} library defines several functions for changing | 7038 | The @file{disp-table} library defines several functions for changing |
diff --git a/doc/lispref/doclicense.texi b/doc/lispref/doclicense.texi index 542edaad258..eaf3da0e92d 100644 --- a/doc/lispref/doclicense.texi +++ b/doc/lispref/doclicense.texi | |||
| @@ -414,7 +414,7 @@ The Free Software Foundation may publish new, revised versions | |||
| 414 | of the GNU Free Documentation License from time to time. Such new | 414 | of the GNU Free Documentation License from time to time. Such new |
| 415 | versions will be similar in spirit to the present version, but may | 415 | versions will be similar in spirit to the present version, but may |
| 416 | differ in detail to address new problems or concerns. See | 416 | differ in detail to address new problems or concerns. See |
| 417 | @uref{https://www.gnu.org/copyleft/}. | 417 | @uref{https://www.gnu.org/licenses/}. |
| 418 | 418 | ||
| 419 | Each version of the License is given a distinguishing version number. | 419 | Each version of the License is given a distinguishing version number. |
| 420 | If the Document specifies that a particular numbered version of this | 420 | If the Document specifies that a particular numbered version of this |
diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi index 4cbcdf855d1..c7525945845 100644 --- a/doc/lispref/elisp.texi +++ b/doc/lispref/elisp.texi | |||
| @@ -940,6 +940,7 @@ Documentation | |||
| 940 | * Documentation Basics:: Where doc strings are defined and stored. | 940 | * Documentation Basics:: Where doc strings are defined and stored. |
| 941 | * Accessing Documentation:: How Lisp programs can access doc strings. | 941 | * Accessing Documentation:: How Lisp programs can access doc strings. |
| 942 | * Keys in Documentation:: Substituting current key bindings. | 942 | * Keys in Documentation:: Substituting current key bindings. |
| 943 | * Text Quoting Style:: Quotation marks in doc strings and messages. | ||
| 943 | * Describing Characters:: Making printable descriptions of | 944 | * Describing Characters:: Making printable descriptions of |
| 944 | non-printing characters and key sequences. | 945 | non-printing characters and key sequences. |
| 945 | * Help Functions:: Subroutines used by Emacs help facilities. | 946 | * Help Functions:: Subroutines used by Emacs help facilities. |
diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi index f66ecee8e8e..07a8b825026 100644 --- a/doc/lispref/frames.texi +++ b/doc/lispref/frames.texi | |||
| @@ -3076,15 +3076,14 @@ as long as the parameter is not changed or reset. Technically, this | |||
| 3076 | makes the child frame's window-system window a child window of the | 3076 | makes the child frame's window-system window a child window of the |
| 3077 | parent frame's window-system window. | 3077 | parent frame's window-system window. |
| 3078 | 3078 | ||
| 3079 | @cindex top-level frame | ||
| 3080 | @cindex reparent frame | 3079 | @cindex reparent frame |
| 3081 | @cindex nest frame | 3080 | @cindex nest frame |
| 3082 | The @code{parent-frame} parameter can be changed at any time. Setting | 3081 | The @code{parent-frame} parameter can be changed at any time. Setting |
| 3083 | it to another frame @dfn{reparents} the child frame. Setting it to | 3082 | it to another frame @dfn{reparents} the child frame. Setting it to |
| 3084 | another child frame makes the frame a @dfn{nested} child frame. Setting | 3083 | another child frame makes the frame a @dfn{nested} child frame. Setting |
| 3085 | it to @code{nil} restores the frame's status as a @dfn{top-level | 3084 | it to @code{nil} restores the frame's status as a top-level frame---a |
| 3086 | frame}---a frame whose window-system window is a child of its display's | 3085 | frame whose window-system window is a child of its display's root |
| 3087 | root window. | 3086 | window. |
| 3088 | 3087 | ||
| 3089 | Since child frames can be arbitrarily nested, a frame can be both a | 3088 | Since child frames can be arbitrarily nested, a frame can be both a |
| 3090 | child and a parent frame. Also, the relative roles of child and parent | 3089 | child and a parent frame. Also, the relative roles of child and parent |
| @@ -3203,7 +3202,11 @@ a number of other ways as well. Here we sketch a few of them: | |||
| 3203 | @item | 3202 | @item |
| 3204 | The semantics of maximizing and iconifying child frames is highly | 3203 | The semantics of maximizing and iconifying child frames is highly |
| 3205 | window-system dependent. As a rule, applications should never invoke | 3204 | window-system dependent. As a rule, applications should never invoke |
| 3206 | these operations for child frames. | 3205 | these operations for on frames. By default, invoking |
| 3206 | @code{iconify-frame} on a child frame will try to iconify the top-level | ||
| 3207 | frame corresponding to that child frame instead. To obtain a different | ||
| 3208 | behavior, users may customize the option @code{iconify-child-frame} | ||
| 3209 | described below. | ||
| 3207 | 3210 | ||
| 3208 | @item | 3211 | @item |
| 3209 | Raising, lowering and restacking child frames (@pxref{Raising and | 3212 | Raising, lowering and restacking child frames (@pxref{Raising and |
| @@ -3259,6 +3262,23 @@ frame in the largest empty area of an existing window. This can be | |||
| 3259 | useful to avoid that a child frame obscures any text shown in that | 3262 | useful to avoid that a child frame obscures any text shown in that |
| 3260 | window. | 3263 | window. |
| 3261 | 3264 | ||
| 3265 | Customizing the following option can be useful to tweak the behavior of | ||
| 3266 | @code{iconify-frame} for child frames. | ||
| 3267 | |||
| 3268 | @defvar iconify-child-frame | ||
| 3269 | This option tells Emacs how to proceed when it is asked to iconify a | ||
| 3270 | child frame. If it is @code{nil}, @code{iconify-frame} will do nothing | ||
| 3271 | when invoked on a child frame. If it is @code{iconify-top-level}, Emacs | ||
| 3272 | will try to iconify the top-level frame that is the ancestor of this | ||
| 3273 | child frame instead. If it is @code{make-invisible}, Emacs will try to | ||
| 3274 | make this child frame invisible instead of iconifying it. | ||
| 3275 | |||
| 3276 | Any other value means to try iconifying the child frame. Since such an | ||
| 3277 | attempt may not be honored by all window managers and can even lead to | ||
| 3278 | making the child frame unresponsive to user actions, the default is to | ||
| 3279 | iconify the top level frame instead. | ||
| 3280 | @end defvar | ||
| 3281 | |||
| 3262 | 3282 | ||
| 3263 | @node Mouse Tracking | 3283 | @node Mouse Tracking |
| 3264 | @section Mouse Tracking | 3284 | @section Mouse Tracking |
diff --git a/doc/lispref/gpl.texi b/doc/lispref/gpl.texi index 0e2e212acb1..c007dc06966 100644 --- a/doc/lispref/gpl.texi +++ b/doc/lispref/gpl.texi | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | @c hence no sectioning command or @node. | 5 | @c hence no sectioning command or @node. |
| 6 | 6 | ||
| 7 | @display | 7 | @display |
| 8 | Copyright @copyright{} 2007 Free Software Foundation, Inc. @url{http://fsf.org/} | 8 | Copyright @copyright{} 2007 Free Software Foundation, Inc. @url{https://fsf.org/} |
| 9 | 9 | ||
| 10 | Everyone is permitted to copy and distribute verbatim copies of this | 10 | Everyone is permitted to copy and distribute verbatim copies of this |
| 11 | license document, but changing it is not allowed. | 11 | license document, but changing it is not allowed. |
| @@ -684,7 +684,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE@. See the GNU | |||
| 684 | General Public License for more details. | 684 | General Public License for more details. |
| 685 | 685 | ||
| 686 | You should have received a copy of the GNU General Public License | 686 | You should have received a copy of the GNU General Public License |
| 687 | along with this program. If not, see @url{http://www.gnu.org/licenses/}. | 687 | along with this program. If not, see @url{https://www.gnu.org/licenses/}. |
| 688 | @end smallexample | 688 | @end smallexample |
| 689 | 689 | ||
| 690 | Also add information on how to contact you by electronic and paper mail. | 690 | Also add information on how to contact you by electronic and paper mail. |
| @@ -707,11 +707,11 @@ use an ``about box''. | |||
| 707 | You should also get your employer (if you work as a programmer) or school, | 707 | You should also get your employer (if you work as a programmer) or school, |
| 708 | if any, to sign a ``copyright disclaimer'' for the program, if necessary. | 708 | if any, to sign a ``copyright disclaimer'' for the program, if necessary. |
| 709 | For more information on this, and how to apply and follow the GNU GPL, see | 709 | For more information on this, and how to apply and follow the GNU GPL, see |
| 710 | @url{http://www.gnu.org/licenses/}. | 710 | @url{https://www.gnu.org/licenses/}. |
| 711 | 711 | ||
| 712 | The GNU General Public License does not permit incorporating your | 712 | The GNU General Public License does not permit incorporating your |
| 713 | program into proprietary programs. If your program is a subroutine | 713 | program into proprietary programs. If your program is a subroutine |
| 714 | library, you may consider it more useful to permit linking proprietary | 714 | library, you may consider it more useful to permit linking proprietary |
| 715 | applications with the library. If this is what you want to do, use | 715 | applications with the library. If this is what you want to do, use |
| 716 | the GNU Lesser General Public License instead of this License. But | 716 | the GNU Lesser General Public License instead of this License. But |
| 717 | first, please read @url{http://www.gnu.org/philosophy/why-not-lgpl.html}. | 717 | first, please read @url{https://www.gnu.org/licenses/why-not-lgpl.html}. |
diff --git a/doc/lispref/help.texi b/doc/lispref/help.texi index cb214113523..4aa9b95180e 100644 --- a/doc/lispref/help.texi +++ b/doc/lispref/help.texi | |||
| @@ -33,6 +33,7 @@ Help, emacs, The GNU Emacs Manual}. | |||
| 33 | * Documentation Basics:: Where doc strings are defined and stored. | 33 | * Documentation Basics:: Where doc strings are defined and stored. |
| 34 | * Accessing Documentation:: How Lisp programs can access doc strings. | 34 | * Accessing Documentation:: How Lisp programs can access doc strings. |
| 35 | * Keys in Documentation:: Substituting current key bindings. | 35 | * Keys in Documentation:: Substituting current key bindings. |
| 36 | * Text Quoting Style:: Quotation marks in doc strings and messages. | ||
| 36 | * Describing Characters:: Making printable descriptions of | 37 | * Describing Characters:: Making printable descriptions of |
| 37 | non-printing characters and key sequences. | 38 | non-printing characters and key sequences. |
| 38 | * Help Functions:: Subroutines used by Emacs help facilities. | 39 | * Help Functions:: Subroutines used by Emacs help facilities. |
| @@ -336,6 +337,7 @@ specifies @var{mapvar}'s value as the keymap for any following | |||
| 336 | (grave accent) stands for a left quote. | 337 | (grave accent) stands for a left quote. |
| 337 | This generates a left single quotation mark, an apostrophe, or a grave | 338 | This generates a left single quotation mark, an apostrophe, or a grave |
| 338 | accent depending on the value of @code{text-quoting-style}. | 339 | accent depending on the value of @code{text-quoting-style}. |
| 340 | @xref{Text Quoting Style}. | ||
| 339 | 341 | ||
| 340 | @item ' | 342 | @item ' |
| 341 | (apostrophe) stands for a right quote. | 343 | (apostrophe) stands for a right quote. |
| @@ -351,25 +353,24 @@ and @samp{\=\=} puts @samp{\=} into the output. | |||
| 351 | @strong{Please note:} Each @samp{\} must be doubled when written in a | 353 | @strong{Please note:} Each @samp{\} must be doubled when written in a |
| 352 | string in Emacs Lisp. | 354 | string in Emacs Lisp. |
| 353 | 355 | ||
| 354 | @defvar text-quoting-style | 356 | @defopt text-quoting-style |
| 355 | @cindex curved quotes | 357 | @cindex curved quotes |
| 356 | @cindex curly quotes | 358 | @cindex curly quotes |
| 357 | The value of this variable is a symbol that specifies the style Emacs | 359 | The value of this variable is a symbol that specifies the style Emacs |
| 358 | should use for single quotes in the wording of help and messages. | 360 | should use for single quotes in the wording of help and messages. If |
| 359 | If the variable's value is @code{curve}, the style is | 361 | the variable's value is @code{curve}, the style is @t{‘like this’} |
| 360 | @t{‘like this’} with curved single quotes. If the value is | 362 | with curved single quotes. If the value is @code{straight}, the style |
| 361 | @code{straight}, the style is @t{'like this'} with straight | 363 | is @t{'like this'} with straight apostrophes. If the value is |
| 362 | apostrophes. If the value is @code{grave}, | 364 | @code{grave}, quotes are not translated and the style is @t{`like |
| 363 | quotes are not translated and the style is @t{`like | 365 | this'} with grave accent and apostrophe, the standard style before |
| 364 | this'} with grave accent and apostrophe, the standard style | 366 | Emacs version 25. The default value @code{nil} acts like @code{curve} |
| 365 | before Emacs version 25. The default value @code{nil} | 367 | if curved single quotes seem to be displayable, and like @code{grave} |
| 366 | acts like @code{curve} if curved single quotes are displayable, and | 368 | otherwise. |
| 367 | like @code{grave} otherwise. | 369 | |
| 368 | 370 | This option is useful on platforms that have problems with curved | |
| 369 | This variable can be used by experts on platforms that have problems | 371 | quotes. You can customize it freely according to your personal |
| 370 | with curved quotes. As it is not intended for casual use, it is not a | 372 | preference. |
| 371 | user option. | 373 | @end defopt |
| 372 | @end defvar | ||
| 373 | 374 | ||
| 374 | @defun substitute-command-keys string | 375 | @defun substitute-command-keys string |
| 375 | This function scans @var{string} for the above special sequences and | 376 | This function scans @var{string} for the above special sequences and |
| @@ -429,6 +430,53 @@ C-g abort-recursive-edit | |||
| 429 | strings---for instance, you can refer to functions, variables, and | 430 | strings---for instance, you can refer to functions, variables, and |
| 430 | sections of this manual. @xref{Documentation Tips}, for details. | 431 | sections of this manual. @xref{Documentation Tips}, for details. |
| 431 | 432 | ||
| 433 | @node Text Quoting Style | ||
| 434 | @section Text Quoting Style | ||
| 435 | |||
| 436 | Typically, grave accents and apostrophes are treated specially in | ||
| 437 | documentation strings and diagnostic messages, and translate to matching | ||
| 438 | single quotation marks (also called ``curved quotes''). For example, | ||
| 439 | the documentation string @t{"Alias for `foo'."} and the function call | ||
| 440 | @code{(message "Alias for `foo'.")} both translate to @t{"Alias for | ||
| 441 | ‘foo’."}. Less commonly, Emacs displays grave accents and apostrophes | ||
| 442 | as themselves, or as apostrophes only (e.g., @t{"Alias for 'foo'."}). | ||
| 443 | Documentation strings and message formats should be written so that | ||
| 444 | they display well with any of these styles. For example, the | ||
| 445 | documentation string @t{"Alias for 'foo'."} is probably not what you | ||
| 446 | want, as it can display as @t{"Alias for ’foo’."}, an unusual style in | ||
| 447 | English. | ||
| 448 | |||
| 449 | Sometimes you may need to display a grave accent or apostrophe | ||
| 450 | without translation, regardless of text quoting style. In a | ||
| 451 | documentation string, you can do this with escapes. For example, in | ||
| 452 | the documentation string @t{"\\=`(a ,(sin 0)) ==> (a 0.0)"} the grave | ||
| 453 | accent is intended to denote Lisp code, so it is escaped and displays | ||
| 454 | as itself regardless of quoting style. In a call to @code{message} or | ||
| 455 | @code{error}, you can avoid translation by using a format @t{"%s"} | ||
| 456 | with an argument that is a call to @code{format}. For example, | ||
| 457 | @code{(message "%s" (format "`(a ,(sin %S)) ==> (a %S)" x (sin x)))} | ||
| 458 | displays a message that starts with grave accent regardless of text | ||
| 459 | quoting style. | ||
| 460 | |||
| 461 | @defopt text-quoting-style | ||
| 462 | @cindex curved quotes | ||
| 463 | @cindex curly quotes | ||
| 464 | The value of this user option is a symbol that specifies the style | ||
| 465 | Emacs should use for single quotes in the wording of help and | ||
| 466 | messages. If the option's value is @code{curve}, the style is | ||
| 467 | @t{‘like this’} with curved single quotes. If the value is | ||
| 468 | @code{straight}, the style is @t{'like this'} with straight | ||
| 469 | apostrophes. If the value is @code{grave}, quotes are not translated | ||
| 470 | and the style is @t{`like this'} with grave accent and apostrophe, the | ||
| 471 | standard style before Emacs version 25. The default value @code{nil} | ||
| 472 | acts like @code{curve} if curved single quotes seem to be displayable, | ||
| 473 | and like @code{grave} otherwise. | ||
| 474 | |||
| 475 | This option is useful on platforms that have problems with curved | ||
| 476 | quotes. You can customize it freely according to your personal | ||
| 477 | preference. | ||
| 478 | @end defopt | ||
| 479 | |||
| 432 | @node Describing Characters | 480 | @node Describing Characters |
| 433 | @section Describing Characters for Help Messages | 481 | @section Describing Characters for Help Messages |
| 434 | @cindex describe characters and events | 482 | @cindex describe characters and events |
diff --git a/doc/lispref/sequences.texi b/doc/lispref/sequences.texi index c7cf9f5e1af..5ae1567c128 100644 --- a/doc/lispref/sequences.texi +++ b/doc/lispref/sequences.texi | |||
| @@ -155,7 +155,10 @@ This function generalizes @code{aref} (@pxref{Array Functions}) and | |||
| 155 | @cindex copying sequences | 155 | @cindex copying sequences |
| 156 | This function returns a copy of @var{seqr}, which should be either a | 156 | This function returns a copy of @var{seqr}, which should be either a |
| 157 | sequence or a record. The copy is the same type of object as the | 157 | sequence or a record. The copy is the same type of object as the |
| 158 | original, and it has the same elements in the same order. | 158 | original, and it has the same elements in the same order. However, if |
| 159 | @var{seqr} is empty, like a string or a vector of zero length, the | ||
| 160 | value returned by this function might not be a copy, but an empty | ||
| 161 | object of the same type and identical to @var{seqr}. | ||
| 159 | 162 | ||
| 160 | Storing a new element into the copy does not affect the original | 163 | Storing a new element into the copy does not affect the original |
| 161 | @var{seqr}, and vice versa. However, the elements of the copy | 164 | @var{seqr}, and vice versa. However, the elements of the copy |
diff --git a/doc/lispref/strings.texi b/doc/lispref/strings.texi index 219225d412b..dd004927caf 100644 --- a/doc/lispref/strings.texi +++ b/doc/lispref/strings.texi | |||
| @@ -826,17 +826,14 @@ to the produced string representations of the argument @var{objects}. | |||
| 826 | @defun format-message string &rest objects | 826 | @defun format-message string &rest objects |
| 827 | @cindex curved quotes, in formatted messages | 827 | @cindex curved quotes, in formatted messages |
| 828 | @cindex curly quotes, in formatted messages | 828 | @cindex curly quotes, in formatted messages |
| 829 | @cindex @code{text-quoting-style}, and formatting messages | ||
| 830 | This function acts like @code{format}, except it also converts any | 829 | This function acts like @code{format}, except it also converts any |
| 831 | grave accents (@t{`}) and apostrophes (@t{'}) in @var{string} as per the | 830 | grave accents (@t{`}) and apostrophes (@t{'}) in @var{string} as per the |
| 832 | value of @code{text-quoting-style}. | 831 | value of @code{text-quoting-style}. |
| 833 | 832 | ||
| 834 | A format that quotes with grave accents and apostrophes @t{`like | 833 | Typically grave accent and apostrophe in the format translate to |
| 835 | this'} typically generates curved quotes @t{‘like this’}. In | 834 | matching curved quotes, e.g., @t{"Missing `%s'"} might result in |
| 836 | contrast, a format that quotes with only apostrophes @t{'like this'} | 835 | @t{"Missing ‘foo’"}. @xref{Text Quoting Style}, for how to influence |
| 837 | typically generates two closing curved quotes @t{’like this’}, an | 836 | or inhibit this translation. |
| 838 | unusual style in English. @xref{Keys in Documentation}, for how the | ||
| 839 | @code{text-quoting-style} variable affects generated quotes. | ||
| 840 | @end defun | 837 | @end defun |
| 841 | 838 | ||
| 842 | @cindex @samp{%} in format | 839 | @cindex @samp{%} in format |
diff --git a/doc/lispref/syntax.texi b/doc/lispref/syntax.texi index e3ae53536f9..b37f2b22b82 100644 --- a/doc/lispref/syntax.texi +++ b/doc/lispref/syntax.texi | |||
| @@ -751,7 +751,8 @@ position. This function does that conveniently. | |||
| 751 | 751 | ||
| 752 | @defun syntax-ppss &optional pos | 752 | @defun syntax-ppss &optional pos |
| 753 | This function returns the parser state that the parser would reach at | 753 | This function returns the parser state that the parser would reach at |
| 754 | position @var{pos} starting from the beginning of the buffer. | 754 | position @var{pos} starting from the beginning of the visible portion |
| 755 | of the buffer. | ||
| 755 | @iftex | 756 | @iftex |
| 756 | See the next section for | 757 | See the next section for |
| 757 | @end iftex | 758 | @end iftex |
| @@ -762,11 +763,11 @@ for a description of the parser state. | |||
| 762 | 763 | ||
| 763 | The return value is the same as if you call the low-level parsing | 764 | The return value is the same as if you call the low-level parsing |
| 764 | function @code{parse-partial-sexp} to parse from the beginning of the | 765 | function @code{parse-partial-sexp} to parse from the beginning of the |
| 765 | buffer to @var{pos} (@pxref{Low-Level Parsing}). However, | 766 | visible portion of the buffer to @var{pos} (@pxref{Low-Level |
| 766 | @code{syntax-ppss} uses a cache to speed up the computation. Due to | 767 | Parsing}). However, @code{syntax-ppss} uses caches to speed up the |
| 767 | this optimization, the second value (previous complete subexpression) | 768 | computation. Due to this optimization, the second value (previous |
| 768 | and sixth value (minimum parenthesis depth) in the returned parser | 769 | complete subexpression) and sixth value (minimum parenthesis depth) in |
| 769 | state are not meaningful. | 770 | the returned parser state are not meaningful. |
| 770 | 771 | ||
| 771 | This function has a side effect: it adds a buffer-local entry to | 772 | This function has a side effect: it adds a buffer-local entry to |
| 772 | @code{before-change-functions} (@pxref{Change Hooks}) for | 773 | @code{before-change-functions} (@pxref{Change Hooks}) for |
diff --git a/doc/misc/cl.texi b/doc/misc/cl.texi index b7ae7fec2d4..b48278e8b8c 100644 --- a/doc/misc/cl.texi +++ b/doc/misc/cl.texi | |||
| @@ -317,7 +317,7 @@ This is analogous to the @code{defsubst} form; | |||
| 317 | @code{cl-defsubst} uses a different method (compiler macros) which | 317 | @code{cl-defsubst} uses a different method (compiler macros) which |
| 318 | works in all versions of Emacs, and also generates somewhat more | 318 | works in all versions of Emacs, and also generates somewhat more |
| 319 | @c For some examples, | 319 | @c For some examples, |
| 320 | @c see http://lists.gnu.org/archive/html/emacs-devel/2012-11/msg00009.html | 320 | @c see https://lists.gnu.org/archive/html/emacs-devel/2012-11/msg00009.html |
| 321 | efficient inline expansions. In particular, @code{cl-defsubst} | 321 | efficient inline expansions. In particular, @code{cl-defsubst} |
| 322 | arranges for the processing of keyword arguments, default values, | 322 | arranges for the processing of keyword arguments, default values, |
| 323 | etc., to be done at compile-time whenever possible. | 323 | etc., to be done at compile-time whenever possible. |
diff --git a/doc/misc/doclicense.texi b/doc/misc/doclicense.texi index 9c3bbe56e91..eaf3da0e92d 100644 --- a/doc/misc/doclicense.texi +++ b/doc/misc/doclicense.texi | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | 6 | ||
| 7 | @display | 7 | @display |
| 8 | Copyright @copyright{} 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc. | 8 | Copyright @copyright{} 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc. |
| 9 | @uref{http://fsf.org/} | 9 | @uref{https://fsf.org/} |
| 10 | 10 | ||
| 11 | Everyone is permitted to copy and distribute verbatim copies | 11 | Everyone is permitted to copy and distribute verbatim copies |
| 12 | of this license document, but changing it is not allowed. | 12 | of this license document, but changing it is not allowed. |
| @@ -414,7 +414,7 @@ The Free Software Foundation may publish new, revised versions | |||
| 414 | of the GNU Free Documentation License from time to time. Such new | 414 | of the GNU Free Documentation License from time to time. Such new |
| 415 | versions will be similar in spirit to the present version, but may | 415 | versions will be similar in spirit to the present version, but may |
| 416 | differ in detail to address new problems or concerns. See | 416 | differ in detail to address new problems or concerns. See |
| 417 | @uref{http://www.gnu.org/copyleft/}. | 417 | @uref{https://www.gnu.org/licenses/}. |
| 418 | 418 | ||
| 419 | Each version of the License is given a distinguishing version number. | 419 | Each version of the License is given a distinguishing version number. |
| 420 | If the Document specifies that a particular numbered version of this | 420 | If the Document specifies that a particular numbered version of this |
diff --git a/doc/misc/efaq-w32.texi b/doc/misc/efaq-w32.texi index 4ebcbea6a0b..eb05e8be438 100644 --- a/doc/misc/efaq-w32.texi +++ b/doc/misc/efaq-w32.texi | |||
| @@ -61,7 +61,7 @@ Emacs @value{EMACSVER}. | |||
| 61 | 61 | ||
| 62 | This FAQ is maintained by the developers and users of Emacs on MS Windows. | 62 | This FAQ is maintained by the developers and users of Emacs on MS Windows. |
| 63 | If you find any errors, or have any suggestions, please send them to | 63 | If you find any errors, or have any suggestions, please send them to |
| 64 | the @url{http://lists.gnu.org/mailman/listinfo/help-emacs-windows, | 64 | the @url{https://lists.gnu.org/mailman/listinfo/help-emacs-windows, |
| 65 | help-emacs-windows} mailing list. | 65 | help-emacs-windows} mailing list. |
| 66 | 66 | ||
| 67 | At time of writing, the latest version of GNU Emacs is version @value{EMACSVER}. | 67 | At time of writing, the latest version of GNU Emacs is version @value{EMACSVER}. |
| @@ -2283,10 +2283,10 @@ and you can view the FAQ by typing @kbd{C-h C-f}. Other resources include: | |||
| 2283 | @cindex help, mailing lists | 2283 | @cindex help, mailing lists |
| 2284 | 2284 | ||
| 2285 | The official mailing list for Windows specific help and discussion is | 2285 | The official mailing list for Windows specific help and discussion is |
| 2286 | @url{http://lists.gnu.org/mailman/listinfo/help-emacs-windows, | 2286 | @url{https://lists.gnu.org/mailman/listinfo/help-emacs-windows, |
| 2287 | help-emacs-windows}. See that link for information on how to subscribe | 2287 | help-emacs-windows}. See that link for information on how to subscribe |
| 2288 | or unsubscribe. The | 2288 | or unsubscribe. The |
| 2289 | @uref{http://lists.gnu.org/archive/html/help-emacs-windows/, list archives} | 2289 | @uref{https://lists.gnu.org/archive/html/help-emacs-windows/, list archives} |
| 2290 | are available online. | 2290 | are available online. |
| 2291 | 2291 | ||
| 2292 | @c ------------------------------------------------------------ | 2292 | @c ------------------------------------------------------------ |
diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi index 7809cfe98ae..167aa45c281 100644 --- a/doc/misc/efaq.texi +++ b/doc/misc/efaq.texi | |||
| @@ -421,7 +421,7 @@ posting bug reports to this newsgroup directly (@pxref{Reporting bugs}). | |||
| 421 | The FSF has maintained archives of all of the GNU mailing lists for many | 421 | The FSF has maintained archives of all of the GNU mailing lists for many |
| 422 | years, although there may be some unintentional gaps in coverage. The | 422 | years, although there may be some unintentional gaps in coverage. The |
| 423 | archive can be browsed over the web at | 423 | archive can be browsed over the web at |
| 424 | @uref{http://lists.gnu.org/archive/html/, the GNU mail archive}. | 424 | @uref{https://lists.gnu.org/archive/html/, the GNU mail archive}. |
| 425 | 425 | ||
| 426 | Web-based Usenet search services, such as | 426 | Web-based Usenet search services, such as |
| 427 | @uref{http://groups.google.com/groups/dir?q=gnu&, Google}, also | 427 | @uref{http://groups.google.com/groups/dir?q=gnu&, Google}, also |
| @@ -457,13 +457,13 @@ RMS says: | |||
| 457 | 457 | ||
| 458 | @quotation | 458 | @quotation |
| 459 | Sending bug reports to | 459 | Sending bug reports to |
| 460 | @url{http://lists.gnu.org/mailman/listinfo/help-gnu-emacs, | 460 | @url{https://lists.gnu.org/mailman/listinfo/help-gnu-emacs, |
| 461 | the help-gnu-emacs mailing list} | 461 | the help-gnu-emacs mailing list} |
| 462 | (which has the effect of posting on @uref{news:gnu.emacs.help}) is | 462 | (which has the effect of posting on @uref{news:gnu.emacs.help}) is |
| 463 | undesirable because it takes the time of an unnecessarily large group | 463 | undesirable because it takes the time of an unnecessarily large group |
| 464 | of people, most of whom are just users and have no idea how to fix | 464 | of people, most of whom are just users and have no idea how to fix |
| 465 | these problem. | 465 | these problem. |
| 466 | @url{http://lists.gnu.org/mailman/listinfo/bug-gnu-emacs, The | 466 | @url{https://lists.gnu.org/mailman/listinfo/bug-gnu-emacs, The |
| 467 | bug-gnu-emacs list} reaches a much smaller group of people who are | 467 | bug-gnu-emacs list} reaches a much smaller group of people who are |
| 468 | more likely to know what to do and have expressed a wish to receive | 468 | more likely to know what to do and have expressed a wish to receive |
| 469 | more messages about Emacs than the others. | 469 | more messages about Emacs than the others. |
| @@ -1432,7 +1432,7 @@ of files from Macintosh, Microsoft, and Unix platforms. | |||
| 1432 | In general, new Emacs users should not be provided with @file{.emacs} | 1432 | In general, new Emacs users should not be provided with @file{.emacs} |
| 1433 | files, because this can cause confusing non-standard behavior. Then | 1433 | files, because this can cause confusing non-standard behavior. Then |
| 1434 | they send questions to | 1434 | they send questions to |
| 1435 | @url{http://lists.gnu.org/mailman/listinfo/help-gnu-emacs, | 1435 | @url{https://lists.gnu.org/mailman/listinfo/help-gnu-emacs, |
| 1436 | the help-gnu-emacs mailing list} asking why Emacs | 1436 | the help-gnu-emacs mailing list} asking why Emacs |
| 1437 | isn't behaving as documented. | 1437 | isn't behaving as documented. |
| 1438 | 1438 | ||
diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi index b391a88c32c..49005537f85 100644 --- a/doc/misc/erc.texi +++ b/doc/misc/erc.texi | |||
| @@ -804,7 +804,7 @@ emacswiki.org page for ERC@. Anyone may add tips, hints, etc.@: to it. | |||
| 804 | 804 | ||
| 805 | @item | 805 | @item |
| 806 | You can ask questions about using ERC on the Emacs mailing list, | 806 | You can ask questions about using ERC on the Emacs mailing list, |
| 807 | @uref{http://lists.gnu.org/mailman/listinfo/help-gnu-emacs}. | 807 | @uref{https://lists.gnu.org/mailman/listinfo/help-gnu-emacs}. |
| 808 | 808 | ||
| 809 | @item | 809 | @item |
| 810 | You can visit the IRC Freenode channel @samp{#emacs}. Many of the | 810 | You can visit the IRC Freenode channel @samp{#emacs}. Many of the |
diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi index 8963826c4cc..73f9a9562b1 100644 --- a/doc/misc/eshell.texi +++ b/doc/misc/eshell.texi | |||
| @@ -239,7 +239,6 @@ especially for file names with special characters like pipe | |||
| 239 | (@code{|}), which could be part of remote file names. | 239 | (@code{|}), which could be part of remote file names. |
| 240 | 240 | ||
| 241 | @node Built-ins | 241 | @node Built-ins |
| 242 | |||
| 243 | @section Built-in commands | 242 | @section Built-in commands |
| 244 | Several commands are built-in in Eshell. In order to call the | 243 | Several commands are built-in in Eshell. In order to call the |
| 245 | external variant of a built-in command @code{foo}, you could call | 244 | external variant of a built-in command @code{foo}, you could call |
| @@ -258,7 +257,7 @@ alias, @ref{Aliases}. Example: | |||
| 258 | 257 | ||
| 259 | @example | 258 | @example |
| 260 | ~ $ which sudo | 259 | ~ $ which sudo |
| 261 | eshell/sudo is a compiled Lisp function in `em-unix.el' | 260 | eshell/sudo is a compiled Lisp function in `em-tramp.el'. |
| 262 | ~ $ alias sudo '*sudo $*' | 261 | ~ $ alias sudo '*sudo $*' |
| 263 | ~ $ which sudo | 262 | ~ $ which sudo |
| 264 | sudo is an alias, defined as "*sudo $*" | 263 | sudo is an alias, defined as "*sudo $*" |
| @@ -419,6 +418,9 @@ Lisp functions, based on successful completion). | |||
| 419 | 418 | ||
| 420 | @end table | 419 | @end table |
| 421 | 420 | ||
| 421 | @ref{Aliases} for the built-in variables @samp{$*}, @samp{$1}, | ||
| 422 | @samp{$2}, @dots{}, in alias definitions. | ||
| 423 | |||
| 422 | @node Variables | 424 | @node Variables |
| 423 | @section Variables | 425 | @section Variables |
| 424 | Since Eshell is just an Emacs REPL@footnote{Read-Eval-Print Loop}, it | 426 | Since Eshell is just an Emacs REPL@footnote{Read-Eval-Print Loop}, it |
| @@ -429,15 +431,24 @@ would in an Elisp program. Eshell provides a command version of | |||
| 429 | @node Aliases | 431 | @node Aliases |
| 430 | @section Aliases | 432 | @section Aliases |
| 431 | 433 | ||
| 434 | @vindex $* | ||
| 432 | Aliases are commands that expand to a longer input line. For example, | 435 | Aliases are commands that expand to a longer input line. For example, |
| 433 | @command{ll} is a common alias for @code{ls -l}, and would be defined | 436 | @command{ll} is a common alias for @code{ls -l}, and would be defined |
| 434 | with the command invocation @samp{alias ll ls -l}; with this defined, | 437 | with the command invocation @kbd{alias ll 'ls -l $*'}; with this defined, |
| 435 | running @samp{ll foo} in Eshell will actually run @samp{ls -l foo}. | 438 | running @samp{ll foo} in Eshell will actually run @samp{ls -l foo}. |
| 436 | Aliases defined (or deleted) by the @command{alias} command are | 439 | Aliases defined (or deleted) by the @command{alias} command are |
| 437 | automatically written to the file named by @code{eshell-aliases-file}, | 440 | automatically written to the file named by @code{eshell-aliases-file}, |
| 438 | which you can also edit directly (although you will have to manually | 441 | which you can also edit directly (although you will have to manually |
| 439 | reload it). | 442 | reload it). |
| 440 | 443 | ||
| 444 | @vindex $1, $2, @dots{} | ||
| 445 | Note that unlike aliases in Bash, arguments must be handled | ||
| 446 | explicitly. Typically the alias definition would end in @samp{$*} to | ||
| 447 | pass all arguments along. More selective use of arguments via | ||
| 448 | @samp{$1}, @samp{$2}, etc., is also possible. For example, | ||
| 449 | @kbd{alias mcd 'mkdir $1 && cd $1'} would cause @kbd{mcd foo} to | ||
| 450 | create and switch to a directory called @samp{foo}. | ||
| 451 | |||
| 441 | @node History | 452 | @node History |
| 442 | @section History | 453 | @section History |
| 443 | @cmindex history | 454 | @cmindex history |
diff --git a/doc/misc/gpl.texi b/doc/misc/gpl.texi index 0e2e212acb1..c007dc06966 100644 --- a/doc/misc/gpl.texi +++ b/doc/misc/gpl.texi | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | @c hence no sectioning command or @node. | 5 | @c hence no sectioning command or @node. |
| 6 | 6 | ||
| 7 | @display | 7 | @display |
| 8 | Copyright @copyright{} 2007 Free Software Foundation, Inc. @url{http://fsf.org/} | 8 | Copyright @copyright{} 2007 Free Software Foundation, Inc. @url{https://fsf.org/} |
| 9 | 9 | ||
| 10 | Everyone is permitted to copy and distribute verbatim copies of this | 10 | Everyone is permitted to copy and distribute verbatim copies of this |
| 11 | license document, but changing it is not allowed. | 11 | license document, but changing it is not allowed. |
| @@ -684,7 +684,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE@. See the GNU | |||
| 684 | General Public License for more details. | 684 | General Public License for more details. |
| 685 | 685 | ||
| 686 | You should have received a copy of the GNU General Public License | 686 | You should have received a copy of the GNU General Public License |
| 687 | along with this program. If not, see @url{http://www.gnu.org/licenses/}. | 687 | along with this program. If not, see @url{https://www.gnu.org/licenses/}. |
| 688 | @end smallexample | 688 | @end smallexample |
| 689 | 689 | ||
| 690 | Also add information on how to contact you by electronic and paper mail. | 690 | Also add information on how to contact you by electronic and paper mail. |
| @@ -707,11 +707,11 @@ use an ``about box''. | |||
| 707 | You should also get your employer (if you work as a programmer) or school, | 707 | You should also get your employer (if you work as a programmer) or school, |
| 708 | if any, to sign a ``copyright disclaimer'' for the program, if necessary. | 708 | if any, to sign a ``copyright disclaimer'' for the program, if necessary. |
| 709 | For more information on this, and how to apply and follow the GNU GPL, see | 709 | For more information on this, and how to apply and follow the GNU GPL, see |
| 710 | @url{http://www.gnu.org/licenses/}. | 710 | @url{https://www.gnu.org/licenses/}. |
| 711 | 711 | ||
| 712 | The GNU General Public License does not permit incorporating your | 712 | The GNU General Public License does not permit incorporating your |
| 713 | program into proprietary programs. If your program is a subroutine | 713 | program into proprietary programs. If your program is a subroutine |
| 714 | library, you may consider it more useful to permit linking proprietary | 714 | library, you may consider it more useful to permit linking proprietary |
| 715 | applications with the library. If this is what you want to do, use | 715 | applications with the library. If this is what you want to do, use |
| 716 | the GNU Lesser General Public License instead of this License. But | 716 | the GNU Lesser General Public License instead of this License. But |
| 717 | first, please read @url{http://www.gnu.org/philosophy/why-not-lgpl.html}. | 717 | first, please read @url{https://www.gnu.org/licenses/why-not-lgpl.html}. |
diff --git a/doc/misc/org.texi b/doc/misc/org.texi index 37f2ba551ae..b6a4fa23557 100644 --- a/doc/misc/org.texi +++ b/doc/misc/org.texi | |||
| @@ -14034,7 +14034,7 @@ A somewhat obsessive function. | |||
| 14034 | @node A Texinfo example | 14034 | @node A Texinfo example |
| 14035 | @subsection A Texinfo example | 14035 | @subsection A Texinfo example |
| 14036 | 14036 | ||
| 14037 | Here is a more detailed example Org file. @xref{GNU Sample | 14037 | Here is a more detailed example Org file. See @ref{GNU Sample |
| 14038 | Texts,,,texinfo,GNU Texinfo Manual} for an equivalent example using Texinfo | 14038 | Texts,,,texinfo,GNU Texinfo Manual} for an equivalent example using Texinfo |
| 14039 | code. | 14039 | code. |
| 14040 | 14040 | ||
diff --git a/doc/misc/pcl-cvs.texi b/doc/misc/pcl-cvs.texi index 4cf38bd1f0e..1e3aeb45fd3 100644 --- a/doc/misc/pcl-cvs.texi +++ b/doc/misc/pcl-cvs.texi | |||
| @@ -1389,7 +1389,7 @@ the @url{http://lists.xemacs.org/mailman/listinfo/xemacs-beta, | |||
| 1389 | XEmacs mailing list}. | 1389 | XEmacs mailing list}. |
| 1390 | 1390 | ||
| 1391 | If you have problems using PCL-CVS or other questions, send them to | 1391 | If you have problems using PCL-CVS or other questions, send them to |
| 1392 | the @url{http://lists.gnu.org/mailman/listinfo/help-gnu-emacs, | 1392 | the @url{https://lists.gnu.org/mailman/listinfo/help-gnu-emacs, |
| 1393 | help-gnu-emacs mailing list}. This is a good place to get help, as is | 1393 | help-gnu-emacs mailing list}. This is a good place to get help, as is |
| 1394 | the @url{http://lists.nongnu.org/mailman/listinfo/info-cvs, info-cvs list}. | 1394 | the @url{http://lists.nongnu.org/mailman/listinfo/info-cvs, info-cvs list}. |
| 1395 | 1395 | ||