[nongnu] elpa/golden-ratio ac9bcedc63 81/95: Reenable improvements removed by error when reverting last PR.

[ELPA Syncer]

branch: elpa/golden-ratio
commit ac9bcedc63d44433315f2726d6f1b66125d5a3e2
Author: Thierry Volpiatto <thierry.volpiatto@gmail.com>
Commit: Thierry Volpiatto <thierry.volpiatto@gmail.com>

    Reenable improvements removed by error when reverting last PR.
    
    * golden-ratio.el: Reenable improvements to golden-ratio-exclude-modes.
---
 golden-ratio.el | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/golden-ratio.el b/golden-ratio.el
index d5a6b58d9c..d32d73de92 100644
--- a/golden-ratio.el
+++ b/golden-ratio.el
@@ -26,12 +26,12 @@
 
 ;; Major modes that are exempt from being resized. An example of this
 ;; for users of Org-mode might be:
-;;  ("calendar-mode")
+;;  ("calendar-mode") or (calendar-mode)
 (defcustom golden-ratio-exclude-modes nil
-  "An array of strings naming major modes.
+  "A list of symbols or strings naming major modes.
 Switching to a buffer whose major mode is a member of this list
 will not cause the window to be resized to the golden ratio."
-  :type '(repeat string)
+  :type '(repeat (choice symbol string))
   :group 'golden-ratio)
 
 ;; Buffer names that are exempt from being resized. An example of this
@@ -120,6 +120,12 @@ will not cause the window to be resized to the golden 
ratio."
       (when (window-resizable-p (selected-window) ncol t)
         (enlarge-window ncol t)))))
 
+(defun golden-ratio-exclude-major-mode-p ()
+  "Returns non-nil if `major-mode' should not use golden-ratio."
+  (or (memq major-mode golden-ratio-exclude-modes)
+      (member (symbol-name major-mode)
+              golden-ratio-exclude-modes)))
+
 ;;;###autoload
 (defun golden-ratio ()
   "Resizes current window to the golden-ratio's size specs."
@@ -127,8 +133,7 @@ will not cause the window to be resized to the golden 
ratio."
   (unless (or (not golden-ratio-mode)
               (window-minibuffer-p)
               (one-window-p)
-              (member (symbol-name major-mode)
-                      golden-ratio-exclude-modes)
+              (golden-ratio-exclude-major-mode-p)
               (member (buffer-name)
                       golden-ratio-exclude-buffer-names)
               (and golden-ratio-inhibit-functions