diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/emacs-lisp/shortdoc.el | 15 | ||||
| -rw-r--r-- | lisp/image-dired.el | 11 | ||||
| -rw-r--r-- | lisp/international/quail.el | 4 | ||||
| -rw-r--r-- | lisp/progmodes/elisp-mode.el | 2 |
4 files changed, 20 insertions, 12 deletions
diff --git a/lisp/emacs-lisp/shortdoc.el b/lisp/emacs-lisp/shortdoc.el index 25bd17bdb96..17ac3e471c0 100644 --- a/lisp/emacs-lisp/shortdoc.el +++ b/lisp/emacs-lisp/shortdoc.el @@ -647,10 +647,12 @@ There can be any number of :example/:result elements." (define-short-documentation-group vector + "Making Vectors" (make-vector :eval (make-vector 5 "foo")) (vector :eval (vector 1 "b" 3)) + "Operations on Vectors" (vectorp :eval (vectorp [1]) :eval (vectorp "1")) @@ -660,13 +662,16 @@ There can be any number of :example/:result elements." :eval (append [1 2] nil)) (length :eval (length [1 2 3])) - (mapcar - :eval (mapcar #'identity [1 2 3])) - (reduce - :eval (reduce #'+ [1 2 3])) + (seq-reduce + :eval (seq-reduce #'+ [1 2 3] 0)) (seq-subseq :eval (seq-subseq [1 2 3 4 5] 1 3) - :eval (seq-subseq [1 2 3 4 5] 1))) + :eval (seq-subseq [1 2 3 4 5] 1)) + "Mapping Over Vectors" + (mapcar + :eval (mapcar #'identity [1 2 3])) + (mapc + :eval (mapc #'insert ["1" "2" "3"]))) (define-short-documentation-group regexp "Matching Strings" diff --git a/lisp/image-dired.el b/lisp/image-dired.el index ec3f988bfbb..921215c603e 100644 --- a/lisp/image-dired.el +++ b/lisp/image-dired.el @@ -2323,18 +2323,19 @@ non-nil." (dired-buf (image-dired-associated-dired-buffer))) (when (and dired-buf file-name) (with-current-buffer dired-buf - (when (dired-goto-file file-name) - (image-dired-dired-file-marked-p)))))) + (save-excursion + (when (dired-goto-file file-name) + (image-dired-dired-file-marked-p))))))) (defun image-dired-delete-marked () "Delete current or marked thumbnails and associated images." (interactive) - (with-current-buffer (image-dired-associated-dired-buffer) - (dired-do-delete)) (image-dired--with-marked (image-dired-delete-char) (backward-char)) - (image-dired--line-up-with-method)) + (image-dired--line-up-with-method) + (with-current-buffer (image-dired-associated-dired-buffer) + (dired-do-delete))) (defun image-dired-thumb-update-marks () "Update the marks in the thumbnail buffer." diff --git a/lisp/international/quail.el b/lisp/international/quail.el index 89ab450aeee..5cdd6d6242b 100644 --- a/lisp/international/quail.el +++ b/lisp/international/quail.el @@ -1382,6 +1382,8 @@ a cons cell of the form (no-record . KEY). If KEY is a vector of events, the events in the vector are prepended to `unread-command-events', after converting each event to a cons cell of the form (no-record . EVENT). +If KEY is an event, it is prepended to `unread-command-events' as a cons +cell of the form (no-record . EVENT). If RESET is non-nil, the events in `unread-command-events' are first discarded, i.e. in this case KEY will end up being the only key in `unread-command-events'." @@ -1390,7 +1392,7 @@ in `unread-command-events'." (if (characterp key) (cons (cons 'no-record key) unread-command-events) (append (mapcan (lambda (e) (list (cons 'no-record e))) - (append key nil)) + (append (if (vectorp key) key (vector key)) nil)) unread-command-events)))) (defun quail-start-translation (key) diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el index c7474b25a78..10a37942571 100644 --- a/lisp/progmodes/elisp-mode.el +++ b/lisp/progmodes/elisp-mode.el @@ -210,7 +210,7 @@ All commands in `lisp-mode-shared-map' are inherited by this map.") (emacs-lisp--before-compile-buffer) (require 'bytecomp) (byte-recompile-file buffer-file-name nil 0) - (load buffer-file-name)) + (load (byte-compile-dest-file buffer-file-name))) (declare-function native-compile "comp") (defun emacs-lisp-native-compile-and-load () |