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 /admin | |
| 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 'admin')
| -rw-r--r-- | admin/grammars/c.by | 4 | ||||
| -rw-r--r-- | admin/notes/unicode | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/admin/grammars/c.by b/admin/grammars/c.by index 4a52bec07f0..3755c323220 100644 --- a/admin/grammars/c.by +++ b/admin/grammars/c.by | |||
| @@ -917,8 +917,8 @@ variablearg-opt-name | |||
| 917 | ( ,$1 ) | 917 | ( ,$1 ) |
| 918 | | semantic-list arg-list | 918 | | semantic-list arg-list |
| 919 | ( (car ( EXPAND $1 function-pointer )) $2) | 919 | ( (car ( EXPAND $1 function-pointer )) $2) |
| 920 | ;; Klaus Berndl: This allows variableargs without a arg-name being | 920 | ;; Klaus Berndl: This allows variableargs without an arg-name being |
| 921 | ;; parsed correct even if there several pointers (*) | 921 | ;; parsed correctly even if there several pointers (*) |
| 922 | | opt-stars | 922 | | opt-stars |
| 923 | ( "" ,$1 nil nil nil ) | 923 | ( "" ,$1 nil nil nil ) |
| 924 | ; | 924 | ; |
diff --git a/admin/notes/unicode b/admin/notes/unicode index 85ba67bc503..ff0de8aeff9 100644 --- a/admin/notes/unicode +++ b/admin/notes/unicode | |||
| @@ -85,7 +85,7 @@ regard to completeness. | |||
| 85 | code (keymap.c and print.c). | 85 | code (keymap.c and print.c). |
| 86 | 86 | ||
| 87 | * Rationalize character syntax and its relationship to the Unicode | 87 | * Rationalize character syntax and its relationship to the Unicode |
| 88 | database. (Applies mainly to symbol an punctuation syntax.) | 88 | database. (Applies mainly to symbol and punctuation syntax.) |
| 89 | 89 | ||
| 90 | * Fontset handling and customization needs work. We want to relate | 90 | * Fontset handling and customization needs work. We want to relate |
| 91 | fonts to scripts, probably based on the Unicode blocks. The | 91 | fonts to scripts, probably based on the Unicode blocks. The |