diff options
| author | Glenn Morris | 2020-04-20 07:50:19 -0700 |
|---|---|---|
| committer | Glenn Morris | 2020-04-20 07:50:19 -0700 |
| commit | 477b9eaf45da1ebc4f2117d69df3571f0bf61e47 (patch) | |
| tree | 4600314923713c339c41cd450f50e64c3f16a8aa /lisp/obsolete | |
| parent | 80f04b5d7c817977a365a999693443c4e04e5223 (diff) | |
| parent | 05089a4d65831c5e873956f5f2d92a3d5672d405 (diff) | |
| download | emacs-477b9eaf45da1ebc4f2117d69df3571f0bf61e47.tar.gz emacs-477b9eaf45da1ebc4f2117d69df3571f0bf61e47.zip | |
Merge from origin/emacs-27
05089a4d65 (origin/emacs-27) Tweak wording re constant variables
a1040861f1 Tweak setcar-related wording
751510f865 * lisp/image-mode.el: Add prefix key 's' and reduce depend...
9261a219ec * doc/emacs/windows.texi (Window Convenience): Decribe mor...
e1d42da0d6 Fix mutability glitches reported by Drew Adams
5805df74f5 Improve mutability doc
dca35b31d0 Improve mutability documentation
81e7d7f111 Document that quoting yields constants
5734339f40 * doc/lispref/keymaps.texi (Extended Menu Items, Easy Menu...
14a570afae Remove #' and function quoting from lambda forms in manual
d5ec18c66b * src/regex-emacs.c (re_match_2_internal): Rework comment ...
4df8a61117 Add new node "Image Mode" to Emacs Manual.
d7d5ee6c57 ; Fix a typo in cmdargs.texi (bug#40701)
5e9db48fbe * doc/lispref/display.texi (Customizing Bitmaps): Fix typo.
eebfb72c90 Document constant vs mutable objects better
6c187ed6b0 Improve documentation of 'sort-lines'
52288f4b66 Mention 'spam-stat-process-directory-age' in the documenta...
067b070598 ; Fix some typos and doc issues (bug#40695)
# Conflicts:
# etc/NEWS
Diffstat (limited to 'lisp/obsolete')
| -rw-r--r-- | lisp/obsolete/cl.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/obsolete/cl.el b/lisp/obsolete/cl.el index 1da4289b695..20bffffd781 100644 --- a/lisp/obsolete/cl.el +++ b/lisp/obsolete/cl.el | |||
| @@ -509,7 +509,7 @@ This method shows how to handle `setf's to places of the form | |||
| 509 | ARGLIST, as if NAME were going to be expanded as a macro, then | 509 | ARGLIST, as if NAME were going to be expanded as a macro, then |
| 510 | the BODY forms are executed and must return a list of five elements: | 510 | the BODY forms are executed and must return a list of five elements: |
| 511 | a temporary-variables list, a value-forms list, a store-variables list | 511 | a temporary-variables list, a value-forms list, a store-variables list |
| 512 | \(of length one), a store-form, and an access- form. | 512 | \(of length one), a store-form, and an access-form. |
| 513 | 513 | ||
| 514 | See `gv-define-expander', and `gv-define-setter' for better and | 514 | See `gv-define-expander', and `gv-define-setter' for better and |
| 515 | simpler ways to define setf-methods." | 515 | simpler ways to define setf-methods." |