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

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

[nongnu] elpa/drupal-mode d73965852e 085/308: Fixed flaw in `drupal-majo


From: ELPA Syncer
Subject: [nongnu] elpa/drupal-mode d73965852e 085/308: Fixed flaw in `drupal-major-version'.
Date: Tue, 25 Jan 2022 10:59:32 -0500 (EST)

branch: elpa/drupal-mode
commit d73965852e839b543596965964999bba386d0427
Author: Arne Jørgensen <arne@arnested.dk>
Commit: Arne Jørgensen <arne@arnested.dk>

    Fixed flaw in `drupal-major-version'.
    
    `drupal-major-version' will now return nil if the Drupal version is
    unknown. Previously it would fail.
---
 drupal-mode.el | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drupal-mode.el b/drupal-mode.el
index 5993035105..a8e9a480d3 100644
--- a/drupal-mode.el
+++ b/drupal-mode.el
@@ -585,10 +585,11 @@ Used in `drupal-insert-hook' and 
`drupal-insert-function'."
 If major version number is 4 - return both major and minor."
   (unless version
     (setq version (drupal-detect-drupal-version)))
-  (let ((version-list (split-string version "\\.")))
-    (if (= (string-to-number (car version-list)) 4)
-        (format "%s.%s" (car version-list) (cadr version-list))
-      (car version-list))))
+  (when version
+    (let ((version-list (split-string version "\\.")))
+      (if (= (string-to-number (car version-list)) 4)
+          (format "%s.%s" (car version-list) (car (cdr version-list)))
+        (car version-list)))))
 
 ;;;###autoload
 (defun drupal-mode-bootstrap ()



reply via email to

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