From: Sam Steingold <sds@gnu.org>
Date: Wed, 4 Feb 2015 21:26:43 +0000 (-0500)
Subject: Avoid the error when computing top-level indentation.
X-Git-Tag: emacs-25.0.90~2008^2~116
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4188e3cc2bc69e75d4387b369e72e89fecc46a86;p=emacs.git

Avoid the error when computing top-level indentation.

* lisp/progmodes/python.el (python-indent-calculate-indentation):
Do not apply max to an empty list
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9e473e21626..5f6a9c8bc0b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-04  Sam Steingold  <sds@gnu.org>
+
+	* progmodes/python.el (python-indent-calculate-indentation): Avoid
+	the error when computing top-level indentation.
+
 2015-02-04  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* emacs-lisp/cl-generic.el (cl--generic-member-method): Fix paren typo.
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index d340550a017..9bfafeb20cd 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1068,7 +1068,9 @@ minimum."
          (levels (python-indent--calculate-levels indentation)))
     (if previous
         (python-indent--previous-level levels (current-indentation))
-      (apply #'max levels))))
+      (if levels
+          (apply #'max levels)
+        0))))
 
 (defun python-indent-line (&optional previous)
   "Internal implementation of `python-indent-line-function'.