[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-28 a2c17e1 2/2: Merge branch 'emacs-28' of git.savannah.gnu.org:/s
From: |
Eli Zaretskii |
Subject: |
emacs-28 a2c17e1 2/2: Merge branch 'emacs-28' of git.savannah.gnu.org:/srv/git/emacs into emacs-28 |
Date: |
Mon, 25 Oct 2021 12:20:11 -0400 (EDT) |
branch: emacs-28
commit a2c17e115eea1ac026e80bce023c1f8587228c90
Merge: fde56ee 4779d3b
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>
Merge branch 'emacs-28' of git.savannah.gnu.org:/srv/git/emacs into emacs-28
---
doc/lispref/functions.texi | 20 ++++++++++----------
lisp/eshell/esh-mode.el | 7 +++----
2 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi
index 91118b7..cb14d02 100644
--- a/doc/lispref/functions.texi
+++ b/doc/lispref/functions.texi
@@ -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"
diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el
index 98e8903..8e6506c3 100644
--- a/lisp/eshell/esh-mode.el
+++ b/lisp/eshell/esh-mode.el
@@ -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))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- emacs-28 a2c17e1 2/2: Merge branch 'emacs-28' of git.savannah.gnu.org:/srv/git/emacs into emacs-28,
Eli Zaretskii <=