aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorGlenn Morris2017-12-16 12:18:45 -0800
committerGlenn Morris2017-12-16 12:18:45 -0800
commit8e46d93dcdabfa9fb099345fa12378479b4dbe63 (patch)
tree3586203b53367f0bc71460e31caee41a79b84d8f /doc
parentda2c441079c74b18399176df3f92613436ef53dc (diff)
parent28e0261890e6335cb49cc03c47c206ce9c022448 (diff)
downloademacs-8e46d93dcdabfa9fb099345fa12378479b4dbe63.tar.gz
emacs-8e46d93dcdabfa9fb099345fa12378479b4dbe63.zip
Merge from origin/emacs-26
28e0261890 * lisp/progmodes/cc-defs.el (c-version): Update to 5.33.1. ac53084f9b Improve fix for Bug#29712 ffd4771560 * doc/lispref/sequences.texi (Sequence Functions): Improve... f274cbd185 Avoid reordering of output in 'shr-insert-document' 7890864413 Improve documentation of 'invisible-p' a1327bbc64 Remove one more check that Vframe_list is non-nil 63b6281fdd Fix off-by-one error in 'css--hex-color' 804b37ca63 Save and restore text-pixel height and width of frames (Bu... 777fe94661 Partially revert "Mention new strictness for &optional, &r... ad17db7964 * lisp/vc/smerge-mode.el (smerge-refine): Respect font-loc... 5a7d0095a4 * lisp/vc/smerge-mode.el (smerge-refine): Replace obsolete... e019c35df6 FOR_EACH_FRAME no longer assumes frame-list d64b88da2f * src/font.c (Ffont_info): Doc fix. (Bug#29682) 92b2604a7f Modernise message.el face spec syntax b1efbe6564 Update message.el obsolete face aliases 2494c14e76 ; * lisp/comint.el (comint-terminfo-terminal): Add a :vers... 12ad276d15 Improve documentation of TERM environment variable 8ed529f0f3 Add option to configure comint TERM 889f07c352 Better support utf-8-with-signature and utf-8-hfs in XML/HTML a2697fac0e * lisp/menu-bar.el (menu-bar-mode): Doc fix. ffb50eace6 ; * etc/NEWS: Fix last change. 95606af8b0 Fix Bug#29712 in tramp-tests.el 9bf66c6bee Don't run FOR_EACH_FRAME when there's no frame left (Bug#2... c2a88ec8e8 * lisp/textmodes/tex-mode.el: Ensure uncompiled file is lo... b178870528 Remember password change for IMAP in Gnus (Bug#29692) a21dac18bb Add %DUMBFW to the default GnuTLS priority strings 780407cff1 Small fixes prompted by make check-declare 541a60108d Fix some custom groups e220d6e112 Fix fontification of first declaration within a C++ lambda... aa66da220c * src/data.c (Fadd_variable_watcher): Doc fix. f838210b01 Fix misfontification of C++ member initialization list aft... 232c6465ce Fix doc-string of Fbuffer_list 3f9aac68d7 Don't raise an extraneous frame (bug#29696) e7b1111155 Mention new strictness for &optional, &rest in arglists (B... 4cb8696e47 Don't misfontify "foo ()" inside C++ initialization parent... ce31e726ad Fixes for defcustoms, prompted by cus-test-opts aacd1e14fc * lisp/net/newst-backend.el (newsticker--raw-url-list-defa... 7e2f4d3d41 * lisp/htmlfontify.el (hfy-which-etags): Fix it. 52d2a690f6 Add missing :version tags revealed by cusver-check f5d0360234 Escape column-zero doc parens # Conflicts: # etc/NEWS
Diffstat (limited to 'doc')
-rw-r--r--doc/emacs/building.texi5
-rw-r--r--doc/emacs/misc.texi10
-rw-r--r--doc/emacs/trouble.texi2
-rw-r--r--doc/lispref/display.texi7
-rw-r--r--doc/lispref/sequences.texi13
-rw-r--r--doc/misc/emacs-gnutls.texi6
6 files changed, 39 insertions, 4 deletions
diff --git a/doc/emacs/building.texi b/doc/emacs/building.texi
index 87ac61bac3b..e108a4e7c10 100644
--- a/doc/emacs/building.texi
+++ b/doc/emacs/building.texi
@@ -303,6 +303,11 @@ And here's how to do it in csh:
303if ($?prompt) set prompt = @dots{} 303if ($?prompt) set prompt = @dots{}
304@end example 304@end example
305 305
306@vindex TERM, environment variable, in compilation mode
307 If you want to customize the value of the @env{TERM} environment
308variable passed to the compilation subshell, customize the variable
309@code{comint-terminfo-terminal} (@pxref{Shell Options}).
310
306 Emacs does not expect a compiler process to launch asynchronous 311 Emacs does not expect a compiler process to launch asynchronous
307subprocesses; if it does, and they keep running after the main 312subprocesses; if it does, and they keep running after the main
308compiler process has terminated, Emacs may kill them or their output 313compiler process has terminated, Emacs may kill them or their output
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index 6ad5fbafdd6..e4be004ae52 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -1396,6 +1396,16 @@ directory stack if they are not already on it
1396(@code{shell-pushd-dunique}). The values you choose should match the 1396(@code{shell-pushd-dunique}). The values you choose should match the
1397underlying shell, of course. 1397underlying shell, of course.
1398 1398
1399@vindex comint-terminfo-terminal
1400@vindex TERM, environment variable, in sub-shell
1401Comint mode sets the @env{TERM} environment variable to a safe default
1402value, but this value disables some useful features. For example,
1403color is disabled in applications that use @env{TERM} to determine if
1404color is supported. Therefore, Emacs provides an option
1405@code{comint-terminfo-terminal}, which you can set to a terminal that
1406is present in your system's terminfo database, in order to take
1407advantage of advanced features of that terminal.
1408
1399@node Terminal emulator 1409@node Terminal emulator
1400@subsection Emacs Terminal Emulator 1410@subsection Emacs Terminal Emulator
1401@findex term 1411@findex term
diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi
index 4a836c3224b..e98322d74e2 100644
--- a/doc/emacs/trouble.texi
+++ b/doc/emacs/trouble.texi
@@ -780,7 +780,7 @@ the dribble file.
780@item 780@item
781@findex open-termscript 781@findex open-termscript
782@cindex termscript file 782@cindex termscript file
783@cindex @env{TERM} environment variable 783@vindex TERM, environment variable, and display bugs
784For possible display bugs, the terminal type (the value of environment 784For possible display bugs, the terminal type (the value of environment
785variable @env{TERM}), the complete termcap entry for the terminal from 785variable @env{TERM}), the complete termcap entry for the terminal from
786@file{/etc/termcap} (since that file is not identical on all machines), 786@file{/etc/termcap} (since that file is not identical on all machines),
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 7af8d9efb7c..50069e3d1da 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -929,13 +929,18 @@ major mode should use the mode's own name as an element of
929 929
930@defun invisible-p pos-or-prop 930@defun invisible-p pos-or-prop
931If @var{pos-or-prop} is a marker or number, this function returns a 931If @var{pos-or-prop} is a marker or number, this function returns a
932non-@code{nil} value if the text at that position is invisible. 932non-@code{nil} value if the text at that position is currently
933invisible.
933 934
934If @var{pos-or-prop} is any other kind of Lisp object, that is taken 935If @var{pos-or-prop} is any other kind of Lisp object, that is taken
935to mean a possible value of the @code{invisible} text or overlay 936to mean a possible value of the @code{invisible} text or overlay
936property. In that case, this function returns a non-@code{nil} value 937property. In that case, this function returns a non-@code{nil} value
937if that value would cause text to become invisible, based on the 938if that value would cause text to become invisible, based on the
938current value of @code{buffer-invisibility-spec}. 939current value of @code{buffer-invisibility-spec}.
940
941The return value of this function is @code{t} if the text would be
942completely hidden on display, or a non-@code{nil}, non-@code{t} value
943if the text would be replaced by an ellipsis.
939@end defun 944@end defun
940 945
941@vindex line-move-ignore-invisible 946@vindex line-move-ignore-invisible
diff --git a/doc/lispref/sequences.texi b/doc/lispref/sequences.texi
index 4fba880803e..8d56e022d8f 100644
--- a/doc/lispref/sequences.texi
+++ b/doc/lispref/sequences.texi
@@ -425,6 +425,7 @@ useful example of @code{sort}.
425 425
426@cindex sequence functions in seq 426@cindex sequence functions in seq
427@cindex seq library 427@cindex seq library
428@cindex sequences, generalized
428 The @file{seq.el} library provides the following additional sequence 429 The @file{seq.el} library provides the following additional sequence
429manipulation macros and functions, prefixed with @code{seq-}. To use 430manipulation macros and functions, prefixed with @code{seq-}. To use
430them, you must first load the @file{seq} library. 431them, you must first load the @file{seq} library.
@@ -859,6 +860,7 @@ it is a function of two arguments to use instead of the default @code{equal}.
859@end defun 860@end defun
860 861
861@defun seq-subseq sequence start &optional end 862@defun seq-subseq sequence start &optional end
863@cindex sub-sequence
862 This function returns a subset of @var{sequence} from @var{start} 864 This function returns a subset of @var{sequence} from @var{start}
863to @var{end}, both integers (@var{end} defaults to the last element). 865to @var{end}, both integers (@var{end} defaults to the last element).
864If @var{start} or @var{end} is negative, it counts from the end of 866If @var{start} or @var{end} is negative, it counts from the end of
@@ -926,6 +928,8 @@ contain less elements than @var{n}. @var{n} must be an integer. If
926@end defun 928@end defun
927 929
928@defun seq-intersection sequence1 sequence2 &optional function 930@defun seq-intersection sequence1 sequence2 &optional function
931@cindex sequences, intersection of
932@cindex intersection of sequences
929 This function returns a list of the elements that appear both in 933 This function returns a list of the elements that appear both in
930@var{sequence1} and @var{sequence2}. If the optional argument 934@var{sequence1} and @var{sequence2}. If the optional argument
931@var{function} is non-@code{nil}, it is a function of two arguments to 935@var{function} is non-@code{nil}, it is a function of two arguments to
@@ -972,6 +976,10 @@ of @var{sequence}. Keys are compared using @code{equal}.
972@end defun 976@end defun
973 977
974@defun seq-into sequence type 978@defun seq-into sequence type
979@cindex convert sequence to another type
980@cindex list to vector
981@cindex vector to list
982@cindex string to vector
975 This function converts the sequence @var{sequence} into a sequence 983 This function converts the sequence @var{sequence} into a sequence
976of type @var{type}. @var{type} can be one of the following symbols: 984of type @var{type}. @var{type} can be one of the following symbols:
977@code{vector}, @code{string} or @code{list}. 985@code{vector}, @code{string} or @code{list}.
@@ -993,6 +1001,8 @@ of type @var{type}. @var{type} can be one of the following symbols:
993@end defun 1001@end defun
994 1002
995@defun seq-min sequence 1003@defun seq-min sequence
1004@cindex minimum value of sequence
1005@cindex sequence minimum
996 This function returns the smallest element of @var{sequence}. The 1006 This function returns the smallest element of @var{sequence}. The
997elements of @var{sequence} must be numbers or markers 1007elements of @var{sequence} must be numbers or markers
998(@pxref{Markers}). 1008(@pxref{Markers}).
@@ -1010,6 +1020,8 @@ elements of @var{sequence} must be numbers or markers
1010@end defun 1020@end defun
1011 1021
1012@defun seq-max sequence 1022@defun seq-max sequence
1023@cindex maximum value of sequence
1024@cindex sequence maximum
1013 This function returns the largest element of @var{sequence}. The 1025 This function returns the largest element of @var{sequence}. The
1014elements of @var{sequence} must be numbers or markers. 1026elements of @var{sequence} must be numbers or markers.
1015 1027
@@ -1027,6 +1039,7 @@ elements of @var{sequence} must be numbers or markers.
1027 1039
1028@defmac seq-doseq (var sequence) body@dots{} 1040@defmac seq-doseq (var sequence) body@dots{}
1029@cindex sequence iteration 1041@cindex sequence iteration
1042@cindex iteration over vector or string
1030 This macro is like @code{dolist} (@pxref{Iteration, dolist}), except 1043 This macro is like @code{dolist} (@pxref{Iteration, dolist}), except
1031that @var{sequence} can be a list, vector or string. This is 1044that @var{sequence} can be a list, vector or string. This is
1032primarily useful for side-effects. 1045primarily useful for side-effects.
diff --git a/doc/misc/emacs-gnutls.texi b/doc/misc/emacs-gnutls.texi
index 92846a924c5..1715c83a0d2 100644
--- a/doc/misc/emacs-gnutls.texi
+++ b/doc/misc/emacs-gnutls.texi
@@ -116,9 +116,11 @@ information.
116The @code{gnutls-algorithm-priority} variable sets the GnuTLS priority 116The @code{gnutls-algorithm-priority} variable sets the GnuTLS priority
117string. This is global, not per host name (although 117string. This is global, not per host name (although
118@code{gnutls-negotiate} supports a priority string per connection so 118@code{gnutls-negotiate} supports a priority string per connection so
119it could be done if needed). The priority string syntax is in the 119it could be done if needed). For details see the
120@uref{https://www.gnu.org/software/gnutls/documentation.html, GnuTLS 120@uref{https://www.gnu.org/software/gnutls/documentation.html, GnuTLS
121documentation}. 121documentation} and the
122@uref{https://gnutls.org/manual/html_node/Priority-Strings.html,
123GnuTLS priority string syntax and description}.
122@end defvar 124@end defvar
123 125
124@defvar gnutls-trustfiles 126@defvar gnutls-trustfiles