aboutsummaryrefslogtreecommitdiffstats
path: root/doc/misc
diff options
context:
space:
mode:
authorPaul Eggert2017-10-01 21:58:52 -0700
committerPaul Eggert2017-10-01 21:58:52 -0700
commit4829a3b033b119b088947d14b73efc197b2547fa (patch)
treeef9a96d2fa02c559ce69ff3ac9a272af84e5f6e9 /doc/misc
parentee3024c70d2974b59ecdd04b75d18d7258262e70 (diff)
parent5172fa02cccaab2500ecf85aaf65b8deed54d42e (diff)
downloademacs-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/misc')
-rw-r--r--doc/misc/cl.texi2
-rw-r--r--doc/misc/doclicense.texi4
-rw-r--r--doc/misc/efaq-w32.texi6
-rw-r--r--doc/misc/efaq.texi8
-rw-r--r--doc/misc/erc.texi2
-rw-r--r--doc/misc/eshell.texi17
-rw-r--r--doc/misc/gpl.texi8
-rw-r--r--doc/misc/org.texi2
-rw-r--r--doc/misc/pcl-cvs.texi2
9 files changed, 31 insertions, 20 deletions
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
318works in all versions of Emacs, and also generates somewhat more 318works 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
321efficient inline expansions. In particular, @code{cl-defsubst} 321efficient inline expansions. In particular, @code{cl-defsubst}
322arranges for the processing of keyword arguments, default values, 322arranges for the processing of keyword arguments, default values,
323etc., to be done at compile-time whenever possible. 323etc., 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
8Copyright @copyright{} 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc. 8Copyright @copyright{} 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc.
9@uref{http://fsf.org/} 9@uref{https://fsf.org/}
10 10
11Everyone is permitted to copy and distribute verbatim copies 11Everyone is permitted to copy and distribute verbatim copies
12of this license document, but changing it is not allowed. 12of this license document, but changing it is not allowed.
@@ -414,7 +414,7 @@ The Free Software Foundation may publish new, revised versions
414of the GNU Free Documentation License from time to time. Such new 414of the GNU Free Documentation License from time to time. Such new
415versions will be similar in spirit to the present version, but may 415versions will be similar in spirit to the present version, but may
416differ in detail to address new problems or concerns. See 416differ 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
419Each version of the License is given a distinguishing version number. 419Each version of the License is given a distinguishing version number.
420If the Document specifies that a particular numbered version of this 420If 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
62This FAQ is maintained by the developers and users of Emacs on MS Windows. 62This FAQ is maintained by the developers and users of Emacs on MS Windows.
63If you find any errors, or have any suggestions, please send them to 63If you find any errors, or have any suggestions, please send them to
64the @url{http://lists.gnu.org/mailman/listinfo/help-emacs-windows, 64the @url{https://lists.gnu.org/mailman/listinfo/help-emacs-windows,
65help-emacs-windows} mailing list. 65help-emacs-windows} mailing list.
66 66
67At time of writing, the latest version of GNU Emacs is version @value{EMACSVER}. 67At 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
2285The official mailing list for Windows specific help and discussion is 2285The 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,
2287help-emacs-windows}. See that link for information on how to subscribe 2287help-emacs-windows}. See that link for information on how to subscribe
2288or unsubscribe. The 2288or 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}
2290are available online. 2290are 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}).
421The FSF has maintained archives of all of the GNU mailing lists for many 421The FSF has maintained archives of all of the GNU mailing lists for many
422years, although there may be some unintentional gaps in coverage. The 422years, although there may be some unintentional gaps in coverage. The
423archive can be browsed over the web at 423archive 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
426Web-based Usenet search services, such as 426Web-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
459Sending bug reports to 459Sending 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,
461the help-gnu-emacs mailing list} 461the 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
463undesirable because it takes the time of an unnecessarily large group 463undesirable because it takes the time of an unnecessarily large group
464of people, most of whom are just users and have no idea how to fix 464of people, most of whom are just users and have no idea how to fix
465these problem. 465these 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
467bug-gnu-emacs list} reaches a much smaller group of people who are 467bug-gnu-emacs list} reaches a much smaller group of people who are
468more likely to know what to do and have expressed a wish to receive 468more likely to know what to do and have expressed a wish to receive
469more messages about Emacs than the others. 469more messages about Emacs than the others.
@@ -1432,7 +1432,7 @@ of files from Macintosh, Microsoft, and Unix platforms.
1432In general, new Emacs users should not be provided with @file{.emacs} 1432In general, new Emacs users should not be provided with @file{.emacs}
1433files, because this can cause confusing non-standard behavior. Then 1433files, because this can cause confusing non-standard behavior. Then
1434they send questions to 1434they 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,
1436the help-gnu-emacs mailing list} asking why Emacs 1436the help-gnu-emacs mailing list} asking why Emacs
1437isn't behaving as documented. 1437isn'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
806You can ask questions about using ERC on the Emacs mailing list, 806You 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
810You can visit the IRC Freenode channel @samp{#emacs}. Many of the 810You 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
244Several commands are built-in in Eshell. In order to call the 243Several commands are built-in in Eshell. In order to call the
245external variant of a built-in command @code{foo}, you could call 244external 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
261eshell/sudo is a compiled Lisp function in `em-unix.el' 260eshell/sudo is a compiled Lisp function in `em-tramp.el'.
262~ $ alias sudo '*sudo $*' 261~ $ alias sudo '*sudo $*'
263~ $ which sudo 262~ $ which sudo
264sudo is an alias, defined as "*sudo $*" 263sudo 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
424Since Eshell is just an Emacs REPL@footnote{Read-Eval-Print Loop}, it 426Since 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 $*
432Aliases are commands that expand to a longer input line. For example, 435Aliases 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
434with the command invocation @samp{alias ll ls -l}; with this defined, 437with the command invocation @kbd{alias ll 'ls -l $*'}; with this defined,
435running @samp{ll foo} in Eshell will actually run @samp{ls -l foo}. 438running @samp{ll foo} in Eshell will actually run @samp{ls -l foo}.
436Aliases defined (or deleted) by the @command{alias} command are 439Aliases defined (or deleted) by the @command{alias} command are
437automatically written to the file named by @code{eshell-aliases-file}, 440automatically written to the file named by @code{eshell-aliases-file},
438which you can also edit directly (although you will have to manually 441which you can also edit directly (although you will have to manually
439reload it). 442reload it).
440 443
444@vindex $1, $2, @dots{}
445Note that unlike aliases in Bash, arguments must be handled
446explicitly. Typically the alias definition would end in @samp{$*} to
447pass 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
450create 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
8Copyright @copyright{} 2007 Free Software Foundation, Inc. @url{http://fsf.org/} 8Copyright @copyright{} 2007 Free Software Foundation, Inc. @url{https://fsf.org/}
9 9
10Everyone is permitted to copy and distribute verbatim copies of this 10Everyone is permitted to copy and distribute verbatim copies of this
11license document, but changing it is not allowed. 11license document, but changing it is not allowed.
@@ -684,7 +684,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE@. See the GNU
684General Public License for more details. 684General Public License for more details.
685 685
686You should have received a copy of the GNU General Public License 686You should have received a copy of the GNU General Public License
687along with this program. If not, see @url{http://www.gnu.org/licenses/}. 687along with this program. If not, see @url{https://www.gnu.org/licenses/}.
688@end smallexample 688@end smallexample
689 689
690Also add information on how to contact you by electronic and paper mail. 690Also add information on how to contact you by electronic and paper mail.
@@ -707,11 +707,11 @@ use an ``about box''.
707You should also get your employer (if you work as a programmer) or school, 707You should also get your employer (if you work as a programmer) or school,
708if any, to sign a ``copyright disclaimer'' for the program, if necessary. 708if any, to sign a ``copyright disclaimer'' for the program, if necessary.
709For more information on this, and how to apply and follow the GNU GPL, see 709For 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
712The GNU General Public License does not permit incorporating your 712The GNU General Public License does not permit incorporating your
713program into proprietary programs. If your program is a subroutine 713program into proprietary programs. If your program is a subroutine
714library, you may consider it more useful to permit linking proprietary 714library, you may consider it more useful to permit linking proprietary
715applications with the library. If this is what you want to do, use 715applications with the library. If this is what you want to do, use
716the GNU Lesser General Public License instead of this License. But 716the GNU Lesser General Public License instead of this License. But
717first, please read @url{http://www.gnu.org/philosophy/why-not-lgpl.html}. 717first, 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
14037Here is a more detailed example Org file. @xref{GNU Sample 14037Here is a more detailed example Org file. See @ref{GNU Sample
14038Texts,,,texinfo,GNU Texinfo Manual} for an equivalent example using Texinfo 14038Texts,,,texinfo,GNU Texinfo Manual} for an equivalent example using Texinfo
14039code. 14039code.
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,
1389XEmacs mailing list}. 1389XEmacs mailing list}.
1390 1390
1391If you have problems using PCL-CVS or other questions, send them to 1391If you have problems using PCL-CVS or other questions, send them to
1392the @url{http://lists.gnu.org/mailman/listinfo/help-gnu-emacs, 1392the @url{https://lists.gnu.org/mailman/listinfo/help-gnu-emacs,
1393help-gnu-emacs mailing list}. This is a good place to get help, as is 1393help-gnu-emacs mailing list}. This is a good place to get help, as is
1394the @url{http://lists.nongnu.org/mailman/listinfo/info-cvs, info-cvs list}. 1394the @url{http://lists.nongnu.org/mailman/listinfo/info-cvs, info-cvs list}.
1395 1395