emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/elixir-mode e0d0466d83 5/5: Merge pull request #490 from e


From: ELPA Syncer
Subject: [nongnu] elpa/elixir-mode e0d0466d83 5/5: Merge pull request #490 from elixir-editors/chore/remove_hack_from_emacs_24
Date: Mon, 14 Mar 2022 09:58:16 -0400 (EDT)

branch: elpa/elixir-mode
commit e0d0466d83ec80ddb412bb1473908a21baad1ec3
Merge: de6c68b327 042bf99b61
Author: Victor Oliveira Nascimento 
<376386+victorolinasc@users.noreply.github.com>
Commit: GitHub <noreply@github.com>

    Merge pull request #490 from elixir-editors/chore/remove_hack_from_emacs_24
    
    chore(cleanup): remove Emacs 24 hack not supported anymore
---
 elixir-smie.el | 39 ---------------------------------------
 1 file changed, 39 deletions(-)

diff --git a/elixir-smie.el b/elixir-smie.el
index 96f7a2d664..c2a88947e8 100644
--- a/elixir-smie.el
+++ b/elixir-smie.el
@@ -28,45 +28,6 @@
 (require 'smie)           ; Simple minded indentation engine
 (require 'cl-lib)         ; `cl-flet'
 
-;; HACK: Patch for Emacs 24.3 smie that fix
-;; https://github.com/elixir-editors/emacs-elixir/issues/107.
-;;
-;; defadvice is used to change the behavior only for elixir-mode.
-;; Definition of advice is a definition of corresponding function
-;; in Emacs 24.4.
-(when (and (= 24 emacs-major-version)
-           (= 3  emacs-minor-version))
-  (defadvice smie-rule-parent (around elixir-mode-patch activate)
-    (if (not (eq major-mode 'elixir-mode))
-        (progn ad-do-it)
-      (setq ad-return-value
-            (save-excursion
-              (goto-char (cadr (smie-indent--parent)))
-              (cons 'column
-                    (+ (or offset 0)
-                       (smie-indent-virtual)))))))
-
-  (defadvice smie-indent-comment (around elixir-mode-patch activate)
-    (if (not (eq major-mode 'elixir-mode))
-        (progn ad-do-it)
-      (setq ad-return-value
-            (and (smie-indent--bolp)
-                 (let ((pos (point)))
-                   (save-excursion
-                     (beginning-of-line)
-                     (and (re-search-forward comment-start-skip 
(line-end-position) t)
-                          (eq pos (or (match-end 1) (match-beginning 0))))))
-                 (save-excursion
-                   (forward-comment (point-max))
-                   (skip-chars-forward " \t\r\n")
-                   (unless
-                       (save-excursion
-                         (let ((next (funcall smie-forward-token-function)))
-                           (or (if (zerop (length next))
-                                   (or (eobp) (eq (car (syntax-after (point))) 
5)))
-                               (rassoc next smie-closer-alist))))
-                     (smie-indent-calculate))))))))
-
 ;; In Emacs 27, ppss became a structure and has proper accessors.
 
 (defalias 'elixir-ppss-depth



reply via email to

[Prev in Thread] Current Thread [Next in Thread]