procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'emacs-28' of git.savannah.gnu.org:/srv/git/emacs into emacs-28

Browse source
This commit is contained in:
Eli Zaretskii 2021-10-25 19:19:55 +03:00
commit a2c17e115e
2 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
doc/lispref/functions.texi
View file

@ -910,11 +910,11 @@ length of @var{sequence}. For example:
@example
@group
(mapcar 'car '((a b) (c d) (e f)))
(mapcar #'car '((a b) (c d) (e f)))
@result{} (a c e)
(mapcar '1+ [1 2 3])
(mapcar #'1+ [1 2 3])
@result{} (2 3 4)
(mapcar 'string "abc")
(mapcar #'string "abc")
@result{} ("a" "b" "c")
@end group
@ -930,14 +930,14 @@ Return the list of results."
;; @r{If no list is exhausted,}
(if (not (memq nil args))
;; @r{apply function to @sc{car}s.}
(cons (apply function (mapcar 'car args))
(apply 'mapcar* function
(cons (apply function (mapcar #'car args))
(apply #'mapcar* function
;; @r{Recurse for rest of elements.}
(mapcar 'cdr args)))))
(mapcar #'cdr args)))))
@end group
@group
(mapcar* 'cons '(a b c) '(1 2 3 4))
(mapcar* #'cons '(a b c) '(1 2 3 4))
@result{} ((a . 1) (b . 2) (c . 3))
@end group
@end example
@ -954,10 +954,10 @@ the results (which must be lists), by altering the results (using
@example
@group
;; @r{Contrast this:}
(mapcar 'list '(a b c d))
(mapcar #'list '(a b c d))
@result{} ((a) (b) (c) (d))
;; @r{with this:}
(mapcan 'list '(a b c d))
(mapcan #'list '(a b c d))
@result{} (a b c d)
@end group
@end example
@ -986,7 +986,7 @@ string.
@example
@group
(mapconcat 'symbol-name
(mapconcat #'symbol-name
'(The cat in the hat)
" ")
@result{} "The cat in the hat"

7
lisp/eshell/esh-mode.el
View file

@ -315,6 +315,8 @@ and the hook `eshell-exit-hook'."
(setq-local bookmark-make-record-function #'eshell-bookmark-make-record)
(setq local-abbrev-table eshell-mode-abbrev-table)
(setq-local window-point-insertion-type t)
(setq-local list-buffers-directory (expand-file-name default-directory))
;; always set the tab width to 8 in Eshell buffers, since external
@ -696,13 +698,10 @@ This is done after all necessary filtering has been done."
(setq oend (+ oend nchars)))
;; Let the ansi-color overlay hooks run.
(let ((inhibit-modification-hooks nil))
(insert-before-markers string))
(insert string))
(if (= (window-start) (point))
(set-window-start (selected-window)
(- (point) nchars)))
(if (= (point) eshell-last-input-end)
(set-marker eshell-last-input-end
(- eshell-last-input-end nchars)))
(set-marker eshell-last-output-start ostart)
(set-marker eshell-last-output-end (point))
(force-mode-line-update))