diff options
| author | Sean Whitton | 2025-07-15 21:57:59 +0100 |
|---|---|---|
| committer | Sean Whitton | 2025-07-15 21:57:59 +0100 |
| commit | 6ee0093b21957e05bd20efed9323e9ee268d2415 (patch) | |
| tree | cfb96259529777baff80267cb40712df9b1c9cd7 | |
| parent | c3f3fe136cefc4c3aed960b175053e7c048aa979 (diff) | |
| download | emacs-6ee0093b21957e05bd20efed9323e9ee268d2415.tar.gz emacs-6ee0093b21957e05bd20efed9323e9ee268d2415.zip | |
; Fix recently introduced "ELisp".
| -rw-r--r-- | lisp/recentf.el | 2 | ||||
| -rw-r--r-- | lisp/savehist.el | 2 | ||||
| -rw-r--r-- | src/xdisp.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lisp/recentf.el b/lisp/recentf.el index d641250f017..519a6e1dfec 100644 --- a/lisp/recentf.el +++ b/lisp/recentf.el | |||
| @@ -1355,7 +1355,7 @@ Optional argument N must be a valid digit number. It defaults to 1. | |||
| 1355 | ;; | 1355 | ;; |
| 1356 | (defconst recentf-save-file-header | 1356 | (defconst recentf-save-file-header |
| 1357 | ;; FIXME: This should arguably be a `lisp-data' file, but currently | 1357 | ;; FIXME: This should arguably be a `lisp-data' file, but currently |
| 1358 | ;; it contains and is used as an executable ELisp code. | 1358 | ;; it contains and is used as an executable Elisp code. |
| 1359 | ";;; Automatically generated by `recentf' on %s -*- mode: emacs-lisp; lexical-binding: t -*-\n" | 1359 | ";;; Automatically generated by `recentf' on %s -*- mode: emacs-lisp; lexical-binding: t -*-\n" |
| 1360 | "Header to be written into the `recentf-save-file'.") | 1360 | "Header to be written into the `recentf-save-file'.") |
| 1361 | 1361 | ||
diff --git a/lisp/savehist.el b/lisp/savehist.el index e470dfa71db..234a3218a55 100644 --- a/lisp/savehist.el +++ b/lisp/savehist.el | |||
| @@ -256,7 +256,7 @@ Be careful to do it while preserving the current history data." | |||
| 256 | ;; We don't know the relative age of the various entries in OLD and | 256 | ;; We don't know the relative age of the various entries in OLD and |
| 257 | ;; NEW; it's possible that most entries in NEW are much older than | 257 | ;; NEW; it's possible that most entries in NEW are much older than |
| 258 | ;; those in OLD or vice versa, or anything in-between. Maybe we should | 258 | ;; those in OLD or vice versa, or anything in-between. Maybe we should |
| 259 | ;; export the `lib/diffseq.h' to ELisp and use it here, but in the mean | 259 | ;; export the `lib/diffseq.h' to Elisp and use it here, but in the mean |
| 260 | ;; time we interleave the two lists, which should usually be tolerable. | 260 | ;; time we interleave the two lists, which should usually be tolerable. |
| 261 | (let ((res ())) | 261 | (let ((res ())) |
| 262 | (while (and old new) | 262 | (while (and old new) |
diff --git a/src/xdisp.c b/src/xdisp.c index 8eec2757226..909a9db1031 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -3054,7 +3054,7 @@ hscrolling_current_line_p (struct window *w) | |||
| 3054 | Lisp form evaluation | 3054 | Lisp form evaluation |
| 3055 | ***********************************************************************/ | 3055 | ***********************************************************************/ |
| 3056 | 3056 | ||
| 3057 | /* The redisplay is not re-entrant. But we can run ELisp code during | 3057 | /* The redisplay is not re-entrant. But we can run Elisp code during |
| 3058 | redisplay, which in turn can trigger redisplay. | 3058 | redisplay, which in turn can trigger redisplay. |
| 3059 | We try to make this inner redisplay work correctly, but it messes up | 3059 | We try to make this inner redisplay work correctly, but it messes up |
| 3060 | the state of the outer redisplay, so when we return to this outer | 3060 | the state of the outer redisplay, so when we return to this outer |