fixed error when loading extensions, disabled pymacs/rope (replaced by jedi)

This commit is contained in:
syl20bnr 2012-12-28 22:01:13 -05:00
parent c1907f69d7
commit d95d16fe73
5 changed files with 18 additions and 20 deletions

View File

@ -1,15 +1,13 @@
(defvar syl:extensions
'(
"emacs-eclim"
"flymake"
"linum-relativenumber"
"pymacs"
emacs-eclim
flymake
linum-relativenumber
))
;; load extensions
(dolist (ext syl:extensions)
(add-to-list 'load-path
(expand-file-name (concat user-extensions-directory ext "/"))))
(add-to-list 'load-path (format "%s%s/" user-extensions-directory ext)))
;; initialize extensions
(setq syl:extension-init-dir (concat user-emacs-directory "init-extension/"))

View File

@ -121,8 +121,8 @@ Zero-length substrings at the beginning and end of the list are omitted."
;;; Personalized functions to be used in general
(defun string-match-multi (reglist str)
"Matches STR with each of the regex in REGLIST, return the results of string-match"
(mapcar
(lambda (reg) (string-match reg str))
(mapcar
(lambda (reg) (string-match reg str))
reglist)
)
@ -656,7 +656,7 @@ It's flymake process filter."
(setq err-count (flymake-get-err-count flymake-err-info "e"))
(setq warn-count (flymake-get-err-count flymake-err-info "w"))
(setq info-count (flymake-get-err-count flymake-err-info "i"))
(flymake-log 2 "%s: %d error(s), %d warning(s), %d info in %.2f second(s)"
(buffer-name) err-count warn-count info-count
(- (flymake-float-time) flymake-check-start-time))
@ -996,7 +996,7 @@ Return its components if so, nil otherwise."
;; Matching for info messages
(when (and err-text (one-true (string-match-multi flymake-info-line-regex err-text)))
(setq err-type "i"))
(flymake-log 3 "parse line: type=%s file-idx=%s line-idx=%s file=%s line=%s text=%s" err-type file-idx line-idx
raw-file-name line-no err-text)
(setq matched t)))

View File

@ -22,8 +22,7 @@ The CMDLINE should be something like:
(list (first cmdline-subst) (rest cmdline-subst))
))
(when (load-file (concat user-extensions-directory "flymake-patch.el"))
(when (load-file (concat user-extensions-directory "flymake/flymake-patch.el"))
(setq flymake-info-line-regex
(append flymake-info-line-regex '("unused$" "^redefinition" "used$")))
(load-library "flymake-cursor"))
@ -33,3 +32,10 @@ The CMDLINE should be something like:
(list "\\.py\\'" (apply-partially 'flymake-command-parse cmdline)))
)
(epy-setup-checker "pyflakes %f")
(eval-after-load 'python
'(progn
(add-hook 'python-mode-hook (lambda () (if (buffer-file-name)
(flymake-mode))))
)
)

View File

@ -1,5 +1,5 @@
(setq ropemacs-global-prefix "C-x /") ;; avoid conflict with p4 global prefix
(require 'pymacs (concat user-extensions-directory "pymacs.el"))
(require 'pymacs)
(defun setup-ropemacs ()
(pymacs-load "ropemacs" "rope-")
;; Stops from erroring if there's a syntax err
@ -23,9 +23,4 @@
'(progn
;; Ropemacs Configuration
(setup-ropemacs)
;; Not on all modes, please
;; Be careful of mumamo, buffer file name nil
(add-hook 'python-mode-hook (lambda () (if (buffer-file-name)
(flymake-mode))))
)
)

View File

@ -12,6 +12,7 @@
auto-complete
autopair
deferred
diminish
epc
erlang
evil
@ -34,8 +35,6 @@
solarized-theme
surround
yasnippet
diminish
))
;;; install missing packages