commit 3b48fdc912ab6af65abd071bed120a2a697928d1 (HEAD, refs/remotes/origin/master) Author: Juri Linkov Date: Tue Apr 4 09:42:10 2023 +0300 ruby-ts-mode: Recognize more nodes as sexps * lisp/progmodes/ruby-ts-mode.el (ruby-ts-mode): Add "unless" to 'treesit-sexp-type-regexp'. diff --git a/lisp/progmodes/ruby-ts-mode.el b/lisp/progmodes/ruby-ts-mode.el index 262d989cd44..6a7326af61d 100644 --- a/lisp/progmodes/ruby-ts-mode.el +++ b/lisp/progmodes/ruby-ts-mode.el @@ -1122,6 +1122,7 @@ ruby-ts-mode "hash" "parenthesized_statements" "if" + "unless" "case" "when" "block" commit bd5c1d1cbbd12aeca5556f1fa8c6d3b6513dc39e Author: Dmitry Gutov Date: Mon Apr 3 23:39:41 2023 +0300 ruby-ts-mode: Recognize more nodes as sexps * lisp/progmodes/ruby-ts-mode.el (ruby-ts-mode): Argument treesit-sexp-type-regexp with interpolation, instance_variable, global_variable (bug#62086, bug#62416). diff --git a/lisp/progmodes/ruby-ts-mode.el b/lisp/progmodes/ruby-ts-mode.el index 1a085b669ee..262d989cd44 100644 --- a/lisp/progmodes/ruby-ts-mode.el +++ b/lisp/progmodes/ruby-ts-mode.el @@ -1138,6 +1138,9 @@ ruby-ts-mode "heredoc_body" "regex" "argument_list" + "interpolation" + "instance_variable" + "global_variable" ) eol)) commit 0275c54ca80124f8a6e3a9823844b9ee131443cc Author: Michael Albinus Date: Mon Apr 3 16:00:11 2023 +0200 ; Fix last change diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index 9910aca6a70..3a9f5e03000 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el @@ -6416,8 +6416,8 @@ tramp-test38-find-backup-file-name (format "%s~" (file-name-nondirectory tmp-name1)) ert-remote-temporary-file-directory)))))) - ;; Cleanup. - (ignore-errors)) + ;; Cleanup. Nothing to do yet. + nil) (unwind-protect ;; Map `backup-directory-alist'. commit 676087e701070e3bb75b2295d54536772afcdf8e Author: Andrew G Cohen Date: Mon Apr 3 21:49:55 2023 +0800 ; * lisp/gnus/gnus-sum.el (gnus-summary-move-article): Just setq diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el index 9a632922deb..16a85cefcc7 100644 --- a/lisp/gnus/gnus-sum.el +++ b/lisp/gnus/gnus-sum.el @@ -10265,7 +10265,7 @@ gnus-summary-move-article article gnus-newsgroup-name (current-buffer) t))) ;; run the move/copy/crosspost/respool hook - (set (intern "gnus-current-move-article") (cdr art-group)) + (setq gnus-current-move-article (cdr art-group)) (run-hook-with-args 'gnus-summary-article-move-hook action (gnus-data-header (gnus-data-find article)) commit 4a1df6194618b7a08bbf1dfe99c17788d0e12d62 Author: Michael Albinus Date: Mon Apr 3 13:18:55 2023 +0200 Fix some `unwind-protect' forms * lisp/net/tramp-smb.el (tramp-smb-handle-file-acl) (tramp-smb-handle-set-file-acl): Remove superfluous `unwind-protect'. * test/lisp/auth-source-tests.el (auth-source-test-secrets-create-secret): Fix `unwind-protect' handler. * test/lisp/net/tramp-tests.el (tramp-test38-find-backup-file-name): Add dummy cleanup form. diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el index add230e2720..13d5e17a9ff 100644 --- a/lisp/net/tramp-smb.el +++ b/lisp/net/tramp-smb.el @@ -800,32 +800,31 @@ tramp-smb-handle-file-acl (append args (list (tramp-unquote-shell-quote-argument localname) (concat "2>" (tramp-get-remote-null-device v))))) - (unwind-protect - (with-tramp-saved-connection-properties - v '("process-name" "process-buffer") - (with-temp-buffer - ;; Set the transfer process properties. - (tramp-set-connection-property - v "process-name" (buffer-name (current-buffer))) - (tramp-set-connection-property - v "process-buffer" (current-buffer)) - - ;; Use an asynchronous process. By this, password - ;; can be handled. - (let ((p (apply - #'start-process - (tramp-get-connection-name v) - (tramp-get-connection-buffer v) - tramp-smb-acl-program args))) - - (tramp-message - v 6 "%s" (string-join (process-command p) " ")) - (process-put p 'tramp-vector v) - (process-put p 'adjust-window-size-function #'ignore) - (set-process-query-on-exit-flag p nil) - (tramp-process-actions p v nil tramp-smb-actions-get-acl) - (when (> (point-max) (point-min)) - (substring-no-properties (buffer-string))))))))))))) + (with-tramp-saved-connection-properties + v '("process-name" "process-buffer") + (with-temp-buffer + ;; Set the transfer process properties. + (tramp-set-connection-property + v "process-name" (buffer-name (current-buffer))) + (tramp-set-connection-property + v "process-buffer" (current-buffer)) + + ;; Use an asynchronous process. By this, password + ;; can be handled. + (let ((p (apply + #'start-process + (tramp-get-connection-name v) + (tramp-get-connection-buffer v) + tramp-smb-acl-program args))) + + (tramp-message + v 6 "%s" (string-join (process-command p) " ")) + (process-put p 'tramp-vector v) + (process-put p 'adjust-window-size-function #'ignore) + (set-process-query-on-exit-flag p nil) + (tramp-process-actions p v nil tramp-smb-actions-get-acl) + (when (> (point-max) (point-min)) + (substring-no-properties (buffer-string)))))))))))) (defun tramp-smb-handle-file-attributes (filename &optional id-format) "Like `file-attributes' for Tramp files." @@ -1401,44 +1400,43 @@ tramp-smb-handle-set-file-acl "&&" "echo" "tramp_exit_status" "0" "||" "echo" "tramp_exit_status" "1"))) - (unwind-protect - (with-tramp-saved-connection-properties - v '("process-name" "process-buffer") - (with-temp-buffer - ;; Set the transfer process properties. - (tramp-set-connection-property - v "process-name" (buffer-name (current-buffer))) - (tramp-set-connection-property - v "process-buffer" (current-buffer)) - - ;; Use an asynchronous process. By this, password - ;; can be handled. - (let ((p (apply - #'start-process - (tramp-get-connection-name v) - (tramp-get-connection-buffer v) - tramp-smb-acl-program args))) - - (tramp-message - v 6 "%s" (string-join (process-command p) " ")) - (process-put p 'tramp-vector v) - (process-put p 'adjust-window-size-function #'ignore) - (set-process-query-on-exit-flag p nil) - (tramp-process-actions p v nil tramp-smb-actions-set-acl) - ;; This is meant for traces, and returning from - ;; the function. No error is propagated outside, - ;; due to the `ignore-errors' closure. - (unless - (tramp-search-regexp (rx "tramp_exit_status " (+ digit))) - (tramp-error - v 'file-error - "Couldn't find exit status of `%s'" - tramp-smb-acl-program)) - (skip-chars-forward "^ ") - (when (zerop (read (current-buffer))) - ;; Success. - (tramp-set-file-property v localname "file-acl" acl-string) - t)))))))))) + (with-tramp-saved-connection-properties + v '("process-name" "process-buffer") + (with-temp-buffer + ;; Set the transfer process properties. + (tramp-set-connection-property + v "process-name" (buffer-name (current-buffer))) + (tramp-set-connection-property + v "process-buffer" (current-buffer)) + + ;; Use an asynchronous process. By this, password + ;; can be handled. + (let ((p (apply + #'start-process + (tramp-get-connection-name v) + (tramp-get-connection-buffer v) + tramp-smb-acl-program args))) + + (tramp-message + v 6 "%s" (string-join (process-command p) " ")) + (process-put p 'tramp-vector v) + (process-put p 'adjust-window-size-function #'ignore) + (set-process-query-on-exit-flag p nil) + (tramp-process-actions p v nil tramp-smb-actions-set-acl) + ;; This is meant for traces, and returning from + ;; the function. No error is propagated outside, + ;; due to the `ignore-errors' closure. + (unless + (tramp-search-regexp (rx "tramp_exit_status " (+ digit))) + (tramp-error + v 'file-error + "Couldn't find exit status of `%s'" + tramp-smb-acl-program)) + (skip-chars-forward "^ ") + (when (zerop (read (current-buffer))) + ;; Success. + (tramp-set-file-property v localname "file-acl" acl-string) + t))))))))) (defun tramp-smb-handle-set-file-modes (filename mode &optional flag) "Like `set-file-modes' for Tramp files." diff --git a/test/lisp/auth-source-tests.el b/test/lisp/auth-source-tests.el index 6f832725754..ef915e5fc5b 100644 --- a/test/lisp/auth-source-tests.el +++ b/test/lisp/auth-source-tests.el @@ -341,13 +341,14 @@ auth-source-test-secrets-create-secret (should (string-equal (plist-get auth-info :user) (user-login-name))) (should (string-equal (plist-get auth-info :host) host)) - (should (string-equal auth-passwd passwd))))) - - ;; Cleanup. - ;; Should use `auth-source-delete' when implemented for :secrets backend. - (secrets-delete-item - "session" - (format "%s@%s" (plist-get auth-info :user) (plist-get auth-info :host)))))) + (should (string-equal auth-passwd passwd)))) + + ;; Cleanup. + ;; Should use `auth-source-delete' when implemented for :secrets backend. + (secrets-delete-item + "session" + (format + "%s@%s" (plist-get auth-info :user) (plist-get auth-info :host))))))) (ert-deftest auth-source-test-netrc-create-secret () (ert-with-temp-file netrc-file diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index 835763e0237..9910aca6a70 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el @@ -6414,7 +6414,10 @@ tramp-test38-find-backup-file-name (if quoted #'file-name-quote #'identity) (expand-file-name (format "%s~" (file-name-nondirectory tmp-name1)) - ert-remote-temporary-file-directory))))))) + ert-remote-temporary-file-directory)))))) + + ;; Cleanup. + (ignore-errors)) (unwind-protect ;; Map `backup-directory-alist'. commit 9a8d96da5c56c80611e4a1f6ffbd89efe0b5f51d Author: Po Lu Date: Mon Apr 3 16:15:54 2023 +0800 Improve portability of newly added icons * etc/images/symbols/README: Document what to do with changed icons. * etc/images/symbols: Add portable variants of SVG icons. diff --git a/etc/images/symbols/README b/etc/images/symbols/README index b2c7b8c3179..f69a4ba8760 100644 --- a/etc/images/symbols/README +++ b/etc/images/symbols/README @@ -34,4 +34,10 @@ the order should be 3. fill 4. size -E.g., arrow_right_circle_fill_16. \ No newline at end of file +E.g., arrow_right_circle_fill_16. + + + +Every time you modify the SVG icons, please use the ImageMagick +`convert' utility to convert them to PBM icons, for the sake of +Emacsen that cannot display SVG images. diff --git a/etc/images/symbols/check-mark_16.pbm b/etc/images/symbols/check-mark_16.pbm new file mode 100644 index 00000000000..5588c0c4c01 Binary files /dev/null and b/etc/images/symbols/check-mark_16.pbm differ diff --git a/etc/images/symbols/chevron_down_16.pbm b/etc/images/symbols/chevron_down_16.pbm new file mode 100644 index 00000000000..3d9b75d1bcc Binary files /dev/null and b/etc/images/symbols/chevron_down_16.pbm differ diff --git a/etc/images/symbols/chevron_left_16.pbm b/etc/images/symbols/chevron_left_16.pbm new file mode 100644 index 00000000000..d965458790d Binary files /dev/null and b/etc/images/symbols/chevron_left_16.pbm differ diff --git a/etc/images/symbols/chevron_right_16.pbm b/etc/images/symbols/chevron_right_16.pbm new file mode 100644 index 00000000000..938785dce28 Binary files /dev/null and b/etc/images/symbols/chevron_right_16.pbm differ diff --git a/etc/images/symbols/chevron_up_16.pbm b/etc/images/symbols/chevron_up_16.pbm new file mode 100644 index 00000000000..ae6b215b7bd Binary files /dev/null and b/etc/images/symbols/chevron_up_16.pbm differ diff --git a/etc/images/symbols/cross_16.pbm b/etc/images/symbols/cross_16.pbm new file mode 100644 index 00000000000..52996cdd589 Binary files /dev/null and b/etc/images/symbols/cross_16.pbm differ diff --git a/etc/images/symbols/cross_circle_16.pbm b/etc/images/symbols/cross_circle_16.pbm new file mode 100644 index 00000000000..57c537b0850 Binary files /dev/null and b/etc/images/symbols/cross_circle_16.pbm differ diff --git a/etc/images/symbols/cross_circle_fill_16.pbm b/etc/images/symbols/cross_circle_fill_16.pbm new file mode 100644 index 00000000000..81c3d377b35 Binary files /dev/null and b/etc/images/symbols/cross_circle_fill_16.pbm differ diff --git a/etc/images/symbols/heart_16.pbm b/etc/images/symbols/heart_16.pbm new file mode 100644 index 00000000000..b3a8904b6e7 Binary files /dev/null and b/etc/images/symbols/heart_16.pbm differ diff --git a/etc/images/symbols/heart_fill_16.pbm b/etc/images/symbols/heart_fill_16.pbm new file mode 100644 index 00000000000..88722ed6228 Binary files /dev/null and b/etc/images/symbols/heart_fill_16.pbm differ diff --git a/etc/images/symbols/heart_half_16.pbm b/etc/images/symbols/heart_half_16.pbm new file mode 100644 index 00000000000..6d5724b1aea Binary files /dev/null and b/etc/images/symbols/heart_half_16.pbm differ diff --git a/etc/images/symbols/menu_16.pbm b/etc/images/symbols/menu_16.pbm new file mode 100644 index 00000000000..72baff379e5 Binary files /dev/null and b/etc/images/symbols/menu_16.pbm differ diff --git a/etc/images/symbols/minus_16.pbm b/etc/images/symbols/minus_16.pbm new file mode 100644 index 00000000000..4f73340f179 Binary files /dev/null and b/etc/images/symbols/minus_16.pbm differ diff --git a/etc/images/symbols/minus_circle_16.pbm b/etc/images/symbols/minus_circle_16.pbm new file mode 100644 index 00000000000..049bb004b0f Binary files /dev/null and b/etc/images/symbols/minus_circle_16.pbm differ diff --git a/etc/images/symbols/minus_circle_fill_16.pbm b/etc/images/symbols/minus_circle_fill_16.pbm new file mode 100644 index 00000000000..830d2d3e5c6 Binary files /dev/null and b/etc/images/symbols/minus_circle_fill_16.pbm differ diff --git a/etc/images/symbols/plus_16.pbm b/etc/images/symbols/plus_16.pbm new file mode 100644 index 00000000000..c369231b636 Binary files /dev/null and b/etc/images/symbols/plus_16.pbm differ diff --git a/etc/images/symbols/plus_circle_16.pbm b/etc/images/symbols/plus_circle_16.pbm new file mode 100644 index 00000000000..ae616fb4682 Binary files /dev/null and b/etc/images/symbols/plus_circle_16.pbm differ diff --git a/etc/images/symbols/plus_circle_fill_16.pbm b/etc/images/symbols/plus_circle_fill_16.pbm new file mode 100644 index 00000000000..b0e52cdaa08 Binary files /dev/null and b/etc/images/symbols/plus_circle_fill_16.pbm differ diff --git a/etc/images/symbols/star_16.pbm b/etc/images/symbols/star_16.pbm new file mode 100644 index 00000000000..4a63706a4f7 Binary files /dev/null and b/etc/images/symbols/star_16.pbm differ diff --git a/etc/images/symbols/star_fill_16.pbm b/etc/images/symbols/star_fill_16.pbm new file mode 100644 index 00000000000..9bb2a2fb15b Binary files /dev/null and b/etc/images/symbols/star_fill_16.pbm differ diff --git a/etc/images/symbols/star_half_16.pbm b/etc/images/symbols/star_half_16.pbm new file mode 100644 index 00000000000..a57fd8687e4 Binary files /dev/null and b/etc/images/symbols/star_half_16.pbm differ commit 6984601e0deeab02a4397b9cd69300a5d08d6aa6 Author: Yuan Fu Date: Sat Apr 1 16:22:50 2023 -0700 Modify chevron icons and add some more * etc/images/symbols/chevron_left_16.svg: * etc/images/symbols/chevron_right_16.svg: Make them shorter so that they appear roughly the same size as up and down chevrons. * etc/images/symbols/cross_circle_fill_16.svg: * etc/images/symbols/heart_16.svg: * etc/images/symbols/heart_fill_16.svg: * etc/images/symbols/heart_half_16.svg: * etc/images/symbols/minus_circle_fill_16.svg: * etc/images/symbols/plus_circle_fill_16.svg: New icons. diff --git a/etc/images/symbols/chevron_left_16.svg b/etc/images/symbols/chevron_left_16.svg index 84ca3e28d8f..3f1d044c8ce 100644 --- a/etc/images/symbols/chevron_left_16.svg +++ b/etc/images/symbols/chevron_left_16.svg @@ -1,3 +1,3 @@ - + diff --git a/etc/images/symbols/chevron_right_16.svg b/etc/images/symbols/chevron_right_16.svg index 9ad6e1bf328..e2806c2a648 100644 --- a/etc/images/symbols/chevron_right_16.svg +++ b/etc/images/symbols/chevron_right_16.svg @@ -1,3 +1,3 @@ - + diff --git a/etc/images/symbols/cross_circle_fill_16.svg b/etc/images/symbols/cross_circle_fill_16.svg new file mode 100644 index 00000000000..62da8aa5fda --- /dev/null +++ b/etc/images/symbols/cross_circle_fill_16.svg @@ -0,0 +1,3 @@ + + + diff --git a/etc/images/symbols/heart_16.svg b/etc/images/symbols/heart_16.svg new file mode 100644 index 00000000000..68bd767bd32 --- /dev/null +++ b/etc/images/symbols/heart_16.svg @@ -0,0 +1,3 @@ + + + diff --git a/etc/images/symbols/heart_fill_16.svg b/etc/images/symbols/heart_fill_16.svg new file mode 100644 index 00000000000..e1a90a55742 --- /dev/null +++ b/etc/images/symbols/heart_fill_16.svg @@ -0,0 +1,3 @@ + + + diff --git a/etc/images/symbols/heart_half_16.svg b/etc/images/symbols/heart_half_16.svg new file mode 100644 index 00000000000..0ccdf620d33 --- /dev/null +++ b/etc/images/symbols/heart_half_16.svg @@ -0,0 +1,3 @@ + + + diff --git a/etc/images/symbols/minus_circle_fill_16.svg b/etc/images/symbols/minus_circle_fill_16.svg new file mode 100644 index 00000000000..e298ccaa8b2 --- /dev/null +++ b/etc/images/symbols/minus_circle_fill_16.svg @@ -0,0 +1,3 @@ + + + diff --git a/etc/images/symbols/plus_circle_fill_16.svg b/etc/images/symbols/plus_circle_fill_16.svg new file mode 100644 index 00000000000..7f5de4ae3a8 --- /dev/null +++ b/etc/images/symbols/plus_circle_fill_16.svg @@ -0,0 +1,3 @@ + + +