[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
feature/android 4a7facac1bb 2/2: Merge remote-tracking branch 'origin/ma
|
From: |
Po Lu |
|
Subject: |
feature/android 4a7facac1bb 2/2: Merge remote-tracking branch 'origin/master' into feature/android |
|
Date: |
Mon, 3 Apr 2023 06:39:39 -0400 (EDT) |
branch: feature/android
commit 4a7facac1bb67837866da3ca3c4573d176e29585
Merge: add40ccfb99 9a8d96da5c5
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>
Merge remote-tracking branch 'origin/master' into feature/android
---
etc/EGLOT-NEWS | 2 +-
etc/images/symbols/README | 8 +++++++-
etc/images/symbols/check-mark_16.pbm | Bin 0 -> 41 bytes
etc/images/symbols/chevron_down_16.pbm | Bin 0 -> 41 bytes
etc/images/symbols/chevron_left_16.pbm | Bin 0 -> 41 bytes
etc/images/symbols/chevron_left_16.svg | 2 +-
etc/images/symbols/chevron_right_16.pbm | Bin 0 -> 41 bytes
etc/images/symbols/chevron_right_16.svg | 2 +-
etc/images/symbols/chevron_up_16.pbm | Bin 0 -> 41 bytes
etc/images/symbols/cross_16.pbm | Bin 0 -> 41 bytes
etc/images/symbols/cross_circle_16.pbm | Bin 0 -> 41 bytes
etc/images/symbols/cross_circle_fill_16.pbm | Bin 0 -> 41 bytes
etc/images/symbols/cross_circle_fill_16.svg | 3 +++
etc/images/symbols/heart_16.pbm | Bin 0 -> 41 bytes
etc/images/symbols/heart_16.svg | 3 +++
etc/images/symbols/heart_fill_16.pbm | Bin 0 -> 41 bytes
etc/images/symbols/heart_fill_16.svg | 3 +++
etc/images/symbols/heart_half_16.pbm | Bin 0 -> 41 bytes
etc/images/symbols/heart_half_16.svg | 3 +++
etc/images/symbols/menu_16.pbm | Bin 0 -> 41 bytes
etc/images/symbols/minus_16.pbm | Bin 0 -> 41 bytes
etc/images/symbols/minus_circle_16.pbm | Bin 0 -> 41 bytes
etc/images/symbols/minus_circle_fill_16.pbm | Bin 0 -> 41 bytes
etc/images/symbols/minus_circle_fill_16.svg | 3 +++
etc/images/symbols/plus_16.pbm | Bin 0 -> 41 bytes
etc/images/symbols/plus_circle_16.pbm | Bin 0 -> 41 bytes
etc/images/symbols/plus_circle_fill_16.pbm | Bin 0 -> 41 bytes
etc/images/symbols/plus_circle_fill_16.svg | 3 +++
etc/images/symbols/star_16.pbm | Bin 0 -> 41 bytes
etc/images/symbols/star_fill_16.pbm | Bin 0 -> 41 bytes
etc/images/symbols/star_half_16.pbm | Bin 0 -> 72 bytes
lisp/progmodes/eglot.el | 4 ++--
32 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/etc/EGLOT-NEWS b/etc/EGLOT-NEWS
index 2872cdd05cf..7369b3bf545 100644
--- a/etc/EGLOT-NEWS
+++ b/etc/EGLOT-NEWS
@@ -18,7 +18,7 @@ to look up issue github#1234, go to
https://github.com/joaotavora/eglot/issues/1234.
-* Changes in upcoming Eglot 1.14
+* Changes in Eglot 1.14 (3/4/2023)
** Faster, more responsive completion
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_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 @@
<svg width="16" height="16" viewBox="0 0 16 16"
xmlns="http://www.w3.org/2000/svg";>
-<path d="M11.5 2H9L4 8L9 14H11.5L6.5 8L11.5 2Z" />
+<path d="M11 3.05H8.5L4 8.00001L8.5 13H11L6.5 8.00001L11 3.05Z" />
</svg>
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_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 @@
<svg width="16" height="16" viewBox="0 0 16 16"
xmlns="http://www.w3.org/2000/svg";>
-<path d="M4.5 2H7L12 8L7 14H4.5L9.5 8L4.5 2Z" />
+<path d="M4.95455 3H7.45455L12 8L7.45455 13H4.95455L9.5 8L4.95455 3Z" />
</svg>
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/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 @@
+<svg width="16" height="16" viewBox="0 0 16 16"
xmlns="http://www.w3.org/2000/svg";>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8 15C11.866 15 15 11.866 15
8C15 4.13401 11.866 1 8 1C4.13401 1 1 4.13401 1 8C1 11.866 4.13401 15 8
15ZM10.1213 4.46447L11.5355 5.87868L9.41421 8L11.5355 10.1213L10.1213 11.5355L8
9.41421L5.87868 11.5355L4.46447 10.1213L6.58579 8L4.46447 5.87868L5.87868
4.46447L8 6.58579L10.1213 4.46447Z" />
+</svg>
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_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 @@
+<svg width="16" height="16" viewBox="0 0 16 16"
xmlns="http://www.w3.org/2000/svg";>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8 5.5C8 5.5 9.5 3.5 11
3.5C12.5 3.5 14 4.5 14 6.5C14 10.1005 8 13.5 8 13.5C8 13.5 2 10.1005 2 6.5C2
4.5 3.34315 3.5 5 3.5C6.5 3.5 8 5.5 8 5.5ZM8 7.5C9 6.5 10 5.5 11 5.5C11.4898
5.5 11.738 5.65071 12 6C12.3515 6.46863 12.2982 7.40369 12 8C11 10 8 11.5 8
11.5C8 11.5 5 10 4 8C3.70858 7.41714 3.64853 6.46863 4 6C4.26197 5.65071
4.55933 5.5 5 5.5C6 5.5 7 6.5 8 7.5Z" />
+</svg>
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_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 @@
+<svg width="16" height="16" viewBox="0 0 16 16"
xmlns="http://www.w3.org/2000/svg";>
+<path d="M11 3.5C9.5 3.5 8 5.5 8 5.5C8 5.5 6.5 3.5 5 3.5C3.34315 3.5 2 4.5 2
6.5C2 10.1005 8 13.5 8 13.5C8 13.5 14 10.1005 14 6.5C14 4.5 12.5 3.5 11 3.5Z" />
+</svg>
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/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 @@
+<svg width="16" height="16" viewBox="0 0 16 16"
xmlns="http://www.w3.org/2000/svg";>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8 5.5C8 5.5 9.5 3.5 11
3.5C12.5 3.5 14 4.5 14 6.5C14 10.1005 8 13.5 8 13.5C8 13.5 2 10.1005 2 6.5C2
4.5 3.34315 3.5 5 3.5C6.5 3.5 8 5.5 8 5.5ZM12 8C11 10 8 11.5 8 11.5V7.5C9 6.5
10 5.5 11 5.5C11.4898 5.5 11.738 5.65071 12 6C12.3515 6.46863 12.2982 7.40369
12 8Z" />
+</svg>
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/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 @@
+<svg width="16" height="16" viewBox="0 0 16 16"
xmlns="http://www.w3.org/2000/svg";>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8 15C11.866 15 15 11.866 15
8C15 4.13401 11.866 1 8 1C4.13401 1 1 4.13401 1 8C1 11.866 4.13401 15 8 15ZM12
7V9H4V7H12Z" />
+</svg>
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/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 @@
+<svg width="16" height="16" viewBox="0 0 16 16"
xmlns="http://www.w3.org/2000/svg";>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8 15C11.866 15 15 11.866 15
8C15 4.13401 11.866 1 8 1C4.13401 1 1 4.13401 1 8C1 11.866 4.13401 15 8 15ZM7
7V4H9V7H12V9H9V12H7V9H4V7H7Z" />
+</svg>
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
diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index 93af5f2123b..10b6c0cc2ca 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -2,12 +2,12 @@
;; Copyright (C) 2018-2023 Free Software Foundation, Inc.
-;; Version: 1.13
+;; Version: 1.14
;; Author: João Távora <joaotavora@gmail.com>
;; Maintainer: João Távora <joaotavora@gmail.com>
;; URL: https://github.com/joaotavora/eglot
;; Keywords: convenience, languages
-;; Package-Requires: ((emacs "26.3") (jsonrpc "1.0.16") (flymake "1.2.1")
(project "0.9.8") (xref "1.6.2") (eldoc "1.11.0") (seq "2.23")
(external-completion "0.1"))
+;; Package-Requires: ((emacs "26.3") (jsonrpc "1.0.16") (flymake "1.2.1")
(project "0.9.8") (xref "1.6.2") (eldoc "1.14.0") (seq "2.23")
(external-completion "0.1"))
;; This is a GNU ELPA :core package. Avoid adding functionality
;; that is not available in the version of Emacs recorded above or any