backported Yaroslav Halchenko patches

2 files changed, 24 insertions, 2 deletions

diff --git a/elisp/pylint.el b/elisp/pylint.el
index 14960e9..5862a2e 100644
--- a/elisp/pylint.el
+++ b/elisp/pylint.el
@@ -1,5 +1,27 @@
 (require 'compile)
 
+;;
+;; Modifications done by Yarosav O. Halchenko (2008):
+;;  - enable user-visible variables
+;; distributed under the same copyright/license terms as
+;; pylint itself
+;;
+(require 'compile)
+
+;; user definable variables
+;; vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+
+(defgroup pylint nil
+  "Emacs support for the Pylint Python checker"
+  :group 'languages
+  :prefix "pylint-")
+
+(defcustom pylint-options "--output-format=parseable"
+  "*Command line options to be used with pylint call"
+  :type 'string
+  :group 'pylint)
+
+
 ;; adapted from pychecker for pylint
 (defun pylint-python-hook ()
   (defun pylint ()
@@ -8,7 +30,7 @@
     
     (interactive)
     (let* ((file (buffer-file-name (current-buffer)))
-	   (command (concat "pylint --output-format=parseable \"" file "\"")))
+	   (command (concat "pylint " pylint-options " \"" file "\"")))
       (save-some-buffers (not compilation-ask-about-save) nil) ; save  files.
       (compile-internal command "No more errors or warnings" "pylint")))
 ;;  (local-set-key [f1] 'pylint)
diff --git a/elisp/startup b/elisp/startup
index ad9d071..fd40b42 100644
--- a/elisp/startup
+++ b/elisp/startup
@@ -12,6 +12,6 @@
 ;; installed in a subdirectory of the respective site-lisp directory.
 ;; We have to add this to the load-path:
 (setq load-path (cons (concat "/usr/share/"
-                              (symbol-name flavor)
+                              (symbol-name debian-emacs-flavor)
                               "/site-lisp/%PACKAGE%") load-path))
 (load-library "pylint")