diff options
| author | Glenn Morris | 2018-02-17 07:50:28 -0800 |
|---|---|---|
| committer | Glenn Morris | 2018-02-17 07:50:28 -0800 |
| commit | 4fa90ff8f5fda54fc42049c990c52d3e5236fbe6 (patch) | |
| tree | 6c0a7893b3aab0166b35938338fa289c3a01df74 /etc | |
| parent | cb3863370cbe574810f796726faa39ba0de0a429 (diff) | |
| parent | e5a29330aae4491fd384bacaff6f453c6434d322 (diff) | |
| download | emacs-4fa90ff8f5fda54fc42049c990c52d3e5236fbe6.tar.gz emacs-4fa90ff8f5fda54fc42049c990c52d3e5236fbe6.zip | |
Merge from origin/emacs-26
e5a2933 (origin/emacs-26) lisp/vc/: documentation fixes
f21f8e6 Document 'desktop-files-not-to-save'
d8917eb Improve documentation of Profiling features
b228839 Improve indexing of "performance" in ELisp manual
ab67b3e Minor change in Emacs manual's VC chapter
c352434 Avoid memory corruption with specpdl overflow + edebug (Bug#3...
593bbda Document comment-fill-column in the manual (Bug#11636)
bd4cc8d * doc/emacs/dired.texi (Marks vs Flags): Copyedits.
69107f3 ; Fix doc typos related to indefinite articles
aaad1e6 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emac...
5906418 More fixes for the Emacs manual
9ab3df1 ; Fix doc typos related to indefinite articles
66a4e65 ; Fix doc typos related to indefinite articles
35e5c57 ; Fix doc typos related to indefinite articles
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/CALC-NEWS | 2 | ||||
| -rw-r--r-- | etc/ETAGS.EBNF | 2 | ||||
| -rw-r--r-- | etc/NEWS.20 | 15 | ||||
| -rw-r--r-- | etc/NEWS.21 | 4 | ||||
| -rw-r--r-- | etc/NEWS.22 | 2 | ||||
| -rw-r--r-- | etc/ORG-NEWS | 2 |
6 files changed, 13 insertions, 14 deletions
diff --git a/etc/CALC-NEWS b/etc/CALC-NEWS index 394894ad036..04baf41148e 100644 --- a/etc/CALC-NEWS +++ b/etc/CALC-NEWS | |||
| @@ -70,7 +70,7 @@ For changes in Emacs 23.1 and later, see the main Emacs NEWS file. | |||
| 70 | 70 | ||
| 71 | * Version 2.02d: | 71 | * Version 2.02d: |
| 72 | 72 | ||
| 73 | ** Fixed a minor installation problem with a Emacs 19.29 byte-compiler bug. | 73 | ** Fixed a minor installation problem with an Emacs 19.29 byte-compiler bug. |
| 74 | 74 | ||
| 75 | ** Removed archaic "macedit" package (superseded by "edmacro"). | 75 | ** Removed archaic "macedit" package (superseded by "edmacro"). |
| 76 | 76 | ||
diff --git a/etc/ETAGS.EBNF b/etc/ETAGS.EBNF index 221078a88a0..23bb9445edd 100644 --- a/etc/ETAGS.EBNF +++ b/etc/ETAGS.EBNF | |||
| @@ -84,7 +84,7 @@ whether it is possible to deduce the tag name from the pattern, and make | |||
| 84 | an unnamed tag in those cases. The name deduced from the pattern of an | 84 | an unnamed tag in those cases. The name deduced from the pattern of an |
| 85 | unnamed tag is the implicit name of that tag. | 85 | unnamed tag is the implicit name of that tag. |
| 86 | When the user looks for a tag, and Emacs finds no explicit tag names | 86 | When the user looks for a tag, and Emacs finds no explicit tag names |
| 87 | that match it, Emacs then looks for an tag whose implicit tag name | 87 | that match it, Emacs then looks for a tag whose implicit tag name |
| 88 | matches the request. etags.c uses implicit tag names when possible, in | 88 | matches the request. etags.c uses implicit tag names when possible, in |
| 89 | order to reduce the size of the tags file. | 89 | order to reduce the size of the tags file. |
| 90 | An implicit tag name is deduced from the pattern by discarding the | 90 | An implicit tag name is deduced from the pattern by discarding the |
diff --git a/etc/NEWS.20 b/etc/NEWS.20 index 3391d3e4682..31e640fa94e 100644 --- a/etc/NEWS.20 +++ b/etc/NEWS.20 | |||
| @@ -4130,17 +4130,16 @@ is an alternative to using the keymap itself. | |||
| 4130 | ** Changes in invisibility features | 4130 | ** Changes in invisibility features |
| 4131 | 4131 | ||
| 4132 | *** Isearch can now temporarily show parts of the buffer which are | 4132 | *** Isearch can now temporarily show parts of the buffer which are |
| 4133 | hidden by an overlay with a invisible property, when the search match | 4133 | hidden by an overlay with an invisible property, when the search match |
| 4134 | is inside that portion of the buffer. To enable this the overlay | 4134 | is inside that portion of the buffer. To enable this the overlay |
| 4135 | should have a isearch-open-invisible property which is a function that | 4135 | should have an isearch-open-invisible property, which is a function that |
| 4136 | would be called having the overlay as an argument, the function should | 4136 | would be called with the overlay as an argument, and should make it visible. |
| 4137 | make the overlay visible. | ||
| 4138 | 4137 | ||
| 4139 | During incremental search the overlays are shown by modifying the | 4138 | During incremental search the overlays are shown by modifying the |
| 4140 | invisible and intangible properties, if beside this more actions are | 4139 | invisible and intangible properties. If more actions are |
| 4141 | needed the overlay should have a isearch-open-invisible-temporary | 4140 | needed, the overlay should have an isearch-open-invisible-temporary property, |
| 4142 | which is a function. The function is called with 2 arguments: one is | 4141 | which is a function. The function is called with 2 arguments: one is |
| 4143 | the overlay and the second is nil when it should show the overlay and | 4142 | the overlay, and the second is nil when it should show the overlay and |
| 4144 | t when it should hide it. | 4143 | t when it should hide it. |
| 4145 | 4144 | ||
| 4146 | *** add-to-invisibility-spec, remove-from-invisibility-spec | 4145 | *** add-to-invisibility-spec, remove-from-invisibility-spec |
diff --git a/etc/NEWS.21 b/etc/NEWS.21 index 04bde7e3aea..ea4f4212ee0 100644 --- a/etc/NEWS.21 +++ b/etc/NEWS.21 | |||
| @@ -4348,7 +4348,7 @@ integer. This is a required property. | |||
| 4348 | `:pt-height HEIGHT' | 4348 | `:pt-height HEIGHT' |
| 4349 | 4349 | ||
| 4350 | HEIGHT specifies the height of the image in pt (1/72 inch). HEIGHT | 4350 | HEIGHT specifies the height of the image in pt (1/72 inch). HEIGHT |
| 4351 | must be a integer. This is an required property. | 4351 | must be an integer. This is a required property. |
| 4352 | 4352 | ||
| 4353 | `:bounding-box BOX' | 4353 | `:bounding-box BOX' |
| 4354 | 4354 | ||
| @@ -4868,7 +4868,7 @@ temporarily to nil, for example | |||
| 4868 | (enlarge-window 10)) | 4868 | (enlarge-window 10)) |
| 4869 | 4869 | ||
| 4870 | Likewise, an attempt to split a fixed-height window vertically, | 4870 | Likewise, an attempt to split a fixed-height window vertically, |
| 4871 | or a fixed-width window horizontally results in a error. | 4871 | or a fixed-width window horizontally results in an error. |
| 4872 | 4872 | ||
| 4873 | ** The cursor-type frame parameter is now supported on MS-DOS | 4873 | ** The cursor-type frame parameter is now supported on MS-DOS |
| 4874 | terminals. When Emacs starts, it by default changes the cursor shape | 4874 | terminals. When Emacs starts, it by default changes the cursor shape |
diff --git a/etc/NEWS.22 b/etc/NEWS.22 index c1009fc0d02..26054d2c397 100644 --- a/etc/NEWS.22 +++ b/etc/NEWS.22 | |||
| @@ -4895,7 +4895,7 @@ described above and specifies the total height of the line, causing a | |||
| 4895 | varying number of pixels to be inserted after the line to make it line | 4895 | varying number of pixels to be inserted after the line to make it line |
| 4896 | exactly that many pixels high. | 4896 | exactly that many pixels high. |
| 4897 | 4897 | ||
| 4898 | If the `line-spacing' property value is an positive integer, the value | 4898 | If the `line-spacing' property value is a positive integer, the value |
| 4899 | is used as additional pixels to insert after the display line; this | 4899 | is used as additional pixels to insert after the display line; this |
| 4900 | overrides the default frame `line-spacing' and any buffer local value of | 4900 | overrides the default frame `line-spacing' and any buffer local value of |
| 4901 | the `line-spacing' variable. | 4901 | the `line-spacing' variable. |
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS index e7e60bea279..12eab44f0f7 100644 --- a/etc/ORG-NEWS +++ b/etc/ORG-NEWS | |||
| @@ -148,7 +148,7 @@ directories in published site-maps. | |||
| 148 | **** Scheme: support for tables | 148 | **** Scheme: support for tables |
| 149 | **** Scheme: new variable: ~org-babel-scheme-null-to~ | 149 | **** Scheme: new variable: ~org-babel-scheme-null-to~ |
| 150 | 150 | ||
| 151 | This new custom option allows to use a empty list or null symbol to | 151 | This new custom option allows you to use an empty list or null symbol to |
| 152 | format the table output, initially assigned to ~hlines~. | 152 | format the table output, initially assigned to ~hlines~. |
| 153 | 153 | ||
| 154 | **** Scheme: new header ~:prologue~ | 154 | **** Scheme: new header ~:prologue~ |