[nongnu] elpa/web-mode 61f057a 2/2: Merge branch 'master' of https://github.com/fxbois/web-mode
branch: elpa/web-mode
commit 61f057a6baeba6b3595e412ba79b3080dca17dcc
Merge: e026712 950ac58
Author: fxbois
Commit: fxbois
Merge branch 'master' of https://github.com/fxbois/web-mode
---
web-mode.el | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/web-mode.el b/web-mode.el
index 64e4636..c55ccd0 100644
--- a/web-mode.el
+++ b/web-mode.el
@@ -970,7 +970,7 @@ Must be used in conjunction with
web-mode-enable-block-face."
("ctemplate". "\\.\\(chtml\\|mustache\\)\\'")
("django" .
"\\.\\(djhtml\\|tmpl\\|dtl\\|liquid\\|j2\\|njk\\)\\'")
("dust" . "\\.dust\\'")
-("elixir" . "\\.l?eex\\'")
+("elixir" . "\\.[hl]?eex\\'")
("ejs" . "\\.ejs\\'")
("erb" . "\\.\\(erb\\|rhtml\\|erb\\.html\\)\\'")
("expressionengine" . "\\.ee\\'")
[nongnu] elpa/web-mode e026712 1/2: keyword order
branch: elpa/web-mode
commit e026712f9e79617fa01bcaa6e0cf82f309e34ec7
Author: fxbois
Commit: fxbois
keyword order
---
issues/1176.jsx | 5 +
issues/1188.eex | 13 +
web-mode.el | 2 +-
3 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/issues/1176.jsx b/issues/1176.jsx
new file mode 100644
index 000..cfede6e
--- /dev/null
+++ b/issues/1176.jsx
@@ -0,0 +1,5 @@
+import React from "react";
+
+function Component() {
+
+}
diff --git a/issues/1188.eex b/issues/1188.eex
new file mode 100644
index 000..442fc76
--- /dev/null
+++ b/issues/1188.eex
@@ -0,0 +1,13 @@
+
+ <%= form_for @changeset, "#",
+ id: "post-form",
+ phx_target: @myself,
+ phx_change: "validate",
+ phx_submit: "save" do %>
+
+<%= textarea f, :body %>
+<%= error_tag f, :body %>
+
+<%= submit "Save", phx_disable_with: "Saving..." %>
+ <% end %>
+
diff --git a/web-mode.el b/web-mode.el
index b384f97..64e4636 100644
--- a/web-mode.el
+++ b/web-mode.el
@@ -1421,7 +1421,7 @@ shouldn't be moved back.)")
(regexp-opt
(append
(cdr (assoc "elixir" web-mode-extra-keywords))
-'("do" "end" "case" "bc" "lc" "for" "if" "cond" "with" "unless" "try"
"receive" "fn" "defmodule" "defprotocol" "defimpl" "defrecord" "defrecordp"
"defstruct" "defdelegate" "defcallback" "defexception" "defoverridable"
"defguard" "defgaurdp" "exit" "after" "rescue" "catch" "else" "raise" "throw"
"quote" "unquote" "super" "when" "and" "or" "not" "in"
+'("after" "and" "bc" "case" "catch" "cond" "defcallback" "defdelegate"
"defexception" "defgaurdp" "defguard" "defimpl" "defmodule" "defoverridable"
"defprotocol" "defrecord" "defrecordp" "defstruct" "do" "else" "end" "exit"
"fn" "for" "form_for" "if" "in" "lc" "not" "or" "quote" "raise" "receive"
"rescue" "super" "throw" "try" "unless" "unquote" "when" "with"
(defvar web-mode-elixir-constants
[nongnu] elpa/evil cfa44de: Exit search prompt on mouse leave minibuffer (#1330)
branch: elpa/evil commit cfa44def53ff1580d6dfce6a0f8bd9ff5a556e5f Author: duianto Commit: GitHub Exit search prompt on mouse leave minibuffer (#1330) With the search module: evil-search Exit the `/` or `?` search prompts when mouse selecting another window. --- evil-search.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/evil-search.el b/evil-search.el index 268def2..1e9d972 100644 --- a/evil-search.el +++ b/evil-search.el @@ -892,6 +892,7 @@ message to be shown. This function does nothing if (remove-hook 'minibuffer-setup-hook #'evil-ex-search-start-session) (add-hook 'after-change-functions #'evil-ex-search-update-pattern nil t) (add-hook 'minibuffer-exit-hook #'evil-ex-search-stop-session) + (add-hook 'mouse-leave-buffer-hook #'evil-ex-search-exit) (evil-ex-search-activate-highlight nil)) (put 'evil-ex-search-start-session 'permanent-local-hook t) @@ -908,6 +909,7 @@ message to be shown. This function does nothing if (setq isearch-opened-overlays (delete-dups isearch-opened-overlays)) (isearch-clean-overlays)) (remove-hook 'minibuffer-exit-hook #'evil-ex-search-stop-session) + (remove-hook 'mouse-leave-buffer-hook #'evil-ex-search-exit) (remove-hook 'after-change-functions #'evil-ex-search-update-pattern t) (when evil-ex-search-overlay (delete-overlay evil-ex-search-overlay)
[nongnu] elpa/git-commit 07e172a: magit-imenu--index-function: Exit early if buffer not ready
branch: elpa/git-commit commit 07e172a11fccf4ed4e4fb4f0109e467ac5c0fe5b Author: Jonas Bernoulli Commit: Jonas Bernoulli magit-imenu--index-function: Exit early if buffer not ready If `which-function-mode' is active, then the create-index function is called at the time the major-mode is being enabled. Modes that derive from `magit-mode' have not populated the buffer at that time yet, so we have to abort. Before [1: 2db1172b1] failing to explicitly abort did not cause an error. Closes #4481. 1: 2021-08-21 2db1172b1c95782a9497f388638c28f2e3136872 magit-imenu--index-function: Move away from root section first --- lisp/magit-imenu.el | 9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lisp/magit-imenu.el b/lisp/magit-imenu.el index 8633121..a2a337d 100644 --- a/lisp/magit-imenu.el +++ b/lisp/magit-imenu.el @@ -52,9 +52,14 @@ elements of ENTRY-TYPES. This function is used as a helper for functions set as `imenu-create-index-function'." - (let ((entries (make-hash-table :test 'equal))) + ;; If `which-function-mode' is active, then the create-index + ;; function is called at the time the major-mode is being enabled. + ;; Modes that derive from `magit-mode' have not populated the buffer + ;; at that time yet, so we have to abort. + (when-let ((section (magit-current-section)) + (entries (make-hash-table :test 'equal))) (goto-char (point-max)) -(unless (oref (magit-current-section) parent) +(unless (oref section parent) (forward-line -1)) (while (magit-section--backward-find (lambda ()
[nongnu] elpa/evil 82e5bec: Add `evil-search-wrap-ring-bell` customization variable (#1509)
branch: elpa/evil commit 82e5becae21b7768ffbb4728bce83dab8751d610 Author: Johannes Neyer <29305982+johannesne...@users.noreply.github.com> Commit: GitHub Add `evil-search-wrap-ring-bell` customization variable (#1509) --- evil-search.el | 2 ++ evil-vars.el | 5 + 2 files changed, 7 insertions(+) diff --git a/evil-search.el b/evil-search.el index 1e9d972..efe7883 100644 --- a/evil-search.el +++ b/evil-search.el @@ -264,8 +264,10 @@ one more than the current position." ;; determine message for echo area (cond ((and forward (< (point) start)) +(when evil-search-wrap-ring-bell (ding)) (setq string "Search wrapped around BOTTOM of buffer")) ((and (not forward) (> (point) start)) +(when evil-search-wrap-ring-bell (ding)) (setq string "Search wrapped around TOP of buffer")) (t (setq string (evil-search-message string forward diff --git a/evil-vars.el b/evil-vars.el index febeb63..c8add73 100644 --- a/evil-vars.el +++ b/evil-vars.el @@ -599,6 +599,11 @@ in insert state." :type 'boolean :group 'evil) +(defcustom evil-search-wrap-ring-bell nil + "Whether to ring the bell when search wraps around the buffer." + :type 'boolean + :group 'evil) + (defvar dabbrev-search-these-buffers-only) (defvar dabbrev-case-distinction) (defcustom evil-complete-next-func
[nongnu] elpa/magit updated (8406b08 -> 07e172a)
elpasync pushed a change to branch elpa/magit. from 8406b08 Add additional default when reading branch or commit adds 07e172a magit-imenu--index-function: Exit early if buffer not ready No new revisions were added by this update. Summary of changes: lisp/magit-imenu.el | 9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-)
[nongnu] elpa/magit-section updated (8406b08 -> 07e172a)
elpasync pushed a change to branch elpa/magit-section. from 8406b08 Add additional default when reading branch or commit adds 07e172a magit-imenu--index-function: Exit early if buffer not ready No new revisions were added by this update. Summary of changes: lisp/magit-imenu.el | 9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-)
