commit 8d4789c07273f5fdc9d3c1f06e357746a012b8dd (HEAD, refs/remotes/origin/master) Author: Po Lu Date: Sun Aug 21 14:06:22 2022 +0800 Minor optimization to x_query_pointer_1 * src/xterm.c (x_query_pointer_1): Clear client pointer if it disappeared. diff --git a/src/xterm.c b/src/xterm.c index 39e5a8e186..4f9b0b83b5 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -13442,10 +13442,20 @@ x_query_pointer_1 (struct x_display_info *dpyinfo, x_uncatch_errors_after_check (); if (had_errors) - rc = XQueryPointer (dpyinfo->display, w, root_return, - child_return, root_x_return, - root_y_return, win_x_return, - win_y_return, mask_return); + { + /* If the specified client pointer is the display's client + pointer, clear it now. A new client pointer might not be + found before the next call to x_query_pointer_1 and + waiting for the error leads to excessive syncing. */ + + if (client_pointer_device == dpyinfo->client_pointer_device) + dpyinfo->client_pointer_device = -1; + + rc = XQueryPointer (dpyinfo->display, w, root_return, + child_return, root_x_return, + root_y_return, win_x_return, + win_y_return, mask_return); + } else { state = 0; commit 07c04da01016cd81e064a06b2449892eff7c8da0 Author: Lars Ingebrigtsen Date: Sat Aug 20 12:42:02 2022 +0200 Don't use the system-file-manager icon in the toolbar * lisp/term/x-win.el (x-gtk-stock-map): * lisp/term/pgtk-win.el (x-gtk-stock-map): Don't use n:system-file-manager, because it's larger than the other Gtk icons in some themes (bug#56627). diff --git a/lisp/term/pgtk-win.el b/lisp/term/pgtk-win.el index ee1aad3d0e..b93e259d82 100644 --- a/lisp/term/pgtk-win.el +++ b/lisp/term/pgtk-win.el @@ -229,7 +229,7 @@ EVENT is a `preedit-text-event'." '( ("etc/images/new" . ("document-new" "gtk-new")) ("etc/images/open" . ("document-open" "gtk-open")) - ("etc/images/diropen" . "n:system-file-manager") + ("etc/images/diropen" . "gtk-directory") ("etc/images/close" . ("window-close" "gtk-close")) ("etc/images/save" . ("document-save" "gtk-save")) ("etc/images/saveas" . ("document-save-as" "gtk-save-as")) diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el index 55fe11a097..38266baa96 100644 --- a/lisp/term/x-win.el +++ b/lisp/term/x-win.el @@ -1380,7 +1380,7 @@ This returns an error if any Emacs frames are X frames." '( ("etc/images/new" . ("document-new" "gtk-new")) ("etc/images/open" . ("document-open" "gtk-open")) - ("etc/images/diropen" . "n:system-file-manager") + ("etc/images/diropen" . "gtk-directory") ("etc/images/close" . ("window-close" "gtk-close")) ("etc/images/save" . ("document-save" "gtk-save")) ("etc/images/saveas" . ("document-save-as" "gtk-save-as")) commit 3312710fd672021b17983ef2287dbd57a9a110a1 Author: Lars Ingebrigtsen Date: Sat Aug 20 11:54:33 2022 +0200 Make conf-javaprop-mode only claim that # lines are comments * lisp/textmodes/conf-mode.el (conf-javaprop-mode-syntax-table): Make obsolete and remove syntax entries for // and /* (bug#49077), because only # are comments in javaprop files. (conf-javaprop-mode): Adjust doc string to just mention # comments. diff --git a/lisp/textmodes/conf-mode.el b/lisp/textmodes/conf-mode.el index f940de3ff4..c3c9af5a83 100644 --- a/lisp/textmodes/conf-mode.el +++ b/lisp/textmodes/conf-mode.el @@ -139,11 +139,9 @@ not align (only setting space according to `conf-assignment-space')." "Syntax table in use in Unix style `conf-mode' buffers.") (defvar conf-javaprop-mode-syntax-table - (let ((table (make-syntax-table conf-unix-mode-syntax-table))) - (modify-syntax-entry ?/ ". 124" table) - (modify-syntax-entry ?* ". 23b" table) - table) + (make-syntax-table conf-unix-mode-syntax-table) "Syntax table in use in Java properties buffers.") +(make-obsolete-variable 'conf-javaprop-mode-syntax-table nil "29.1") (defvar conf-ppd-mode-syntax-table (let ((table (make-syntax-table conf-mode-syntax-table))) @@ -470,13 +468,9 @@ PersistMoniker=file://Folder.htt" ;;;###autoload (define-derived-mode conf-javaprop-mode conf-mode "Conf[JavaProp]" "Conf Mode starter for Java properties files. -Comments start with `#' but are also recognized with `//' or -between `/*' and `*/'. -For details see `conf-mode'. Example: +Comments start with `#'. Example: # Conf mode font-locks this right with \\[conf-javaprop-mode] (Java properties) -// another kind of comment -/* yet another */ name:value name=value @@ -487,7 +481,6 @@ x.2.y.1.z.2.zz =" (conf-mode-initialize "#" 'conf-javaprop-font-lock-keywords) (setq-local conf-assignment-column conf-javaprop-assignment-column) (setq-local conf-assignment-regexp ".+?\\([ \t]*[=: \t][ \t]*\\|$\\)") - (setq-local comment-start-skip "\\(?:#+\\|/[/*]+\\)\\s *") (setq-local imenu-generic-expression '(("Parameters" "^[ \t]*\\(.+?\\)[=: \t]" 1)))) diff --git a/test/lisp/textmodes/conf-mode-tests.el b/test/lisp/textmodes/conf-mode-tests.el index 2b4fde40c3..097b25f114 100644 --- a/test/lisp/textmodes/conf-mode-tests.el +++ b/test/lisp/textmodes/conf-mode-tests.el @@ -74,8 +74,7 @@ PersistMoniker=file://Folder.htt") (ert-deftest conf-test-javaprop-mode () (with-temp-buffer ;; From `conf-javaprop-mode' docstring - (insert "// another kind of comment -/* yet another */ + (insert "# comment name:value name=value @@ -90,8 +89,6 @@ x.2.y.1.z.2.zz =") (should (equal (face-at-point) 'font-lock-comment-delimiter-face)) (forward-char 3) (should (equal (face-at-point) 'font-lock-comment-face)) - (search-forward "*") - (should (equal (face-at-point) 'font-lock-comment-delimiter-face)) (while (search-forward "nam" nil t) (should (equal (face-at-point) 'font-lock-variable-name-face)) (search-forward "val") commit 84082a0e8401ca5ed415d7e11eb8b899b649a866 Author: Lars Ingebrigtsen Date: Sat Aug 20 11:12:16 2022 +0200 Tweak admin/emacs output diff --git a/admin/emake b/admin/emake index 548611c6af..dfe3664e12 100755 --- a/admin/emake +++ b/admin/emake @@ -29,7 +29,7 @@ s#^Running # Running # s#^Configured for # Configured for # s#^./temacs.*# \\& # s#^make.*Error# \\& # -s#^Dumping under the name# \\& # +s#^Dumping under the name.*# \\& # ' | \ grep -E --line-buffered -v "^make|\ ^Loading|\