diff options
| author | Glenn Morris | 2018-06-23 07:50:59 -0700 |
|---|---|---|
| committer | Glenn Morris | 2018-06-23 07:50:59 -0700 |
| commit | b81e193ac0c4644d041a4eb4fa4cb62cf9446bd6 (patch) | |
| tree | 837db70e4aff8fce66886b0cfbe82dbccdea4b06 /doc/lispintro | |
| parent | 4df361557c3f1b4039fa59d23cd1ed66c2ca5b1c (diff) | |
| parent | 5cb3991a4f78b39a2c95b22a5159ae3ba779397e (diff) | |
| download | emacs-b81e193ac0c4644d041a4eb4fa4cb62cf9446bd6.tar.gz emacs-b81e193ac0c4644d041a4eb4fa4cb62cf9446bd6.zip | |
Merge from origin/emacs-26
5cb3991 Fix a typo in emacs-lisp-intro.texi
d6aa55e Avoid segfaults in replace-buffer-contents with large buffers
d22b8d1 Adjust for scaling for mode-line popup menus (Bug#31880)
3d2e3dc Change name of `seqp' argument (Bug#26411)
40e1db8 Change index of ";" to better reflect it's usage (Bug#31623)
d289e7e Fix bug of 'mouse-drag-and-drop-region' to detect edges of re...
e292c09 Fix #'fun handling inside `labels' (Bug#31792)
Diffstat (limited to 'doc/lispintro')
| -rw-r--r-- | doc/lispintro/emacs-lisp-intro.texi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi index d48f51204cb..a8e9fb13ce7 100644 --- a/doc/lispintro/emacs-lisp-intro.texi +++ b/doc/lispintro/emacs-lisp-intro.texi | |||
| @@ -10049,7 +10049,7 @@ kill-ring kill-ring-yank-pointer | |||
| 10049 | | | | | 10049 | | | | |
| 10050 | | | --> "yet more text" | 10050 | | | --> "yet more text" |
| 10051 | | | | 10051 | | | |
| 10052 | | --> "a different piece of text | 10052 | | --> "a different piece of text" |
| 10053 | | | 10053 | | |
| 10054 | --> "some text" | 10054 | --> "some text" |
| 10055 | @end group | 10055 | @end group |