From 48d41e60529c243f7a7d9bb6e18e20a95f2870d6 Mon Sep 17 00:00:00 2001 From: k1-hedayati Date: Thu, 15 Jan 2015 10:13:23 +0330 Subject: [PATCH 1/7] Removed redundant guru-mode require package --- modules/prelude-programming.el | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/prelude-programming.el b/modules/prelude-programming.el index ae71161..27b45a4 100644 --- a/modules/prelude-programming.el +++ b/modules/prelude-programming.el @@ -32,8 +32,6 @@ ;;; Code: -(prelude-require-packages '(guru-mode)) - (defun prelude-local-comment-auto-fill () (set (make-local-variable 'comment-auto-fill-only-comments) t)) From 92807a507c32d789a1efc0dfc54d27e41dc639eb Mon Sep 17 00:00:00 2001 From: k1-hedayati Date: Thu, 15 Jan 2015 10:49:09 +0330 Subject: [PATCH 2/7] [Fix #703] Disable which-fun-mode in python-mode --- modules/prelude-python.el | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/prelude-python.el b/modules/prelude-python.el index 6d4784a..f1fb286 100644 --- a/modules/prelude-python.el +++ b/modules/prelude-python.el @@ -89,6 +89,7 @@ (subword-mode +1) (anaconda-mode) (eldoc-mode) + (which-function-mode -1) (setq-local electric-layout-rules '((?: . (lambda () (and (zerop (first (syntax-ppss))) From 003bbc4e0b5084a75be411d304869b1fbc87bcf1 Mon Sep 17 00:00:00 2001 From: k1-hedayati Date: Thu, 15 Jan 2015 11:22:11 +0330 Subject: [PATCH 3/7] [Fix #782] Added magit-filenotify --- core/prelude-packages.el | 3 +++ modules/prelude-programming.el | 3 +++ 2 files changed, 6 insertions(+) diff --git a/core/prelude-packages.el b/core/prelude-packages.el index e2e8078..f869863 100644 --- a/core/prelude-packages.el +++ b/core/prelude-packages.el @@ -76,6 +76,9 @@ zenburn-theme) "A list of packages to ensure are installed at launch.") +(when (version<= "24.4" emacs-version) + (add-to-list 'prelude-packages '(magit-filenotify))) + (defun prelude-packages-installed-p () "Check if all packages in `prelude-packages' are installed." (every #'package-installed-p prelude-packages)) diff --git a/modules/prelude-programming.el b/modules/prelude-programming.el index 27b45a4..8e3472b 100644 --- a/modules/prelude-programming.el +++ b/modules/prelude-programming.el @@ -82,6 +82,9 @@ This functions should be added to the hooks of major modes for programming." (add-hook 'prog-mode-hook (lambda () (run-hooks 'prelude-prog-mode-hook))) +(when (version<= "24.4" emacs-version) + (add-hook 'magit-status-mode-hook (lambda () (magit-filenotify-mode 1)))) + ;; enable on-the-fly syntax checking (if (fboundp 'global-flycheck-mode) (global-flycheck-mode +1) From 58550466adb48e2a5beb69b3926042d67c022724 Mon Sep 17 00:00:00 2001 From: k1-hedayati Date: Thu, 15 Jan 2015 11:24:33 +0330 Subject: [PATCH 4/7] [Fix #779] Moved elisp-slime-nav to elisp module --- core/prelude-packages.el | 1 - modules/prelude-emacs-lisp.el | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core/prelude-packages.el b/core/prelude-packages.el index f869863..583a321 100644 --- a/core/prelude-packages.el +++ b/core/prelude-packages.el @@ -52,7 +52,6 @@ diff-hl diminish easy-kill - elisp-slime-nav epl expand-region flycheck diff --git a/modules/prelude-emacs-lisp.el b/modules/prelude-emacs-lisp.el index fd31623..3752086 100644 --- a/modules/prelude-emacs-lisp.el +++ b/modules/prelude-emacs-lisp.el @@ -35,6 +35,8 @@ (require 'prelude-lisp) +(prelude-require-packages '(elisp-slime-nav)) + (defun prelude-recompile-elc-on-save () "Recompile your elc when saving an elisp file." (add-hook 'after-save-hook From 5476324772fca21669405ab34ad5a311056161e8 Mon Sep 17 00:00:00 2001 From: k1-hedayati Date: Thu, 15 Jan 2015 11:28:20 +0330 Subject: [PATCH 5/7] [Fix #783] Removed rainbow-mode from prelude-packages --- core/prelude-packages.el | 1 - modules/prelude-emacs-lisp.el | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/core/prelude-packages.el b/core/prelude-packages.el index 583a321..5d428d3 100644 --- a/core/prelude-packages.el +++ b/core/prelude-packages.el @@ -67,7 +67,6 @@ magit move-text operate-on-number - rainbow-mode smartparens smartrep undo-tree diff --git a/modules/prelude-emacs-lisp.el b/modules/prelude-emacs-lisp.el index 3752086..97ae541 100644 --- a/modules/prelude-emacs-lisp.el +++ b/modules/prelude-emacs-lisp.el @@ -35,7 +35,7 @@ (require 'prelude-lisp) -(prelude-require-packages '(elisp-slime-nav)) +(prelude-require-packages '(elisp-slime-nav rainbow-mode)) (defun prelude-recompile-elc-on-save () "Recompile your elc when saving an elisp file." From 37b72fb2f1b50aedc2e848203a02a1379ac57950 Mon Sep 17 00:00:00 2001 From: k1-hedayati Date: Thu, 15 Jan 2015 11:31:46 +0330 Subject: [PATCH 6/7] [Fix #764] Removed redundant command `prelude-copy-file-name-to-clipboard` is redundant due to easy-kill package --- core/prelude-core.el | 10 ---------- core/prelude-mode.el | 3 +-- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/core/prelude-core.el b/core/prelude-core.el index e0a96dd..389eb75 100644 --- a/core/prelude-core.el +++ b/core/prelude-core.el @@ -181,16 +181,6 @@ point reaches the beginning or end of the buffer, stop there." 'display '(left-fringe right-triangle)) 'modification-hooks '(prelude-todo-ov-evaporate))) -(defun prelude-copy-file-name-to-clipboard () - "Copy the current buffer file name to the clipboard." - (interactive) - (let ((filename (if (equal major-mode 'dired-mode) - default-directory - (buffer-file-name)))) - (when filename - (kill-new filename) - (message "Copied buffer file name '%s' to the clipboard." filename)))) - (defun prelude-get-positions-of-line-or-region () "Return positions (beg . end) of the current line or region." diff --git a/core/prelude-mode.el b/core/prelude-mode.el index fda439f..39bfdcc 100644 --- a/core/prelude-mode.el +++ b/core/prelude-mode.el @@ -87,8 +87,7 @@ ("Files" ["Open with..." prelude-open-with] ["Delete file and buffer" prelude-delete-file-and-buffer] - ["Rename buffer and file" prelude-rename-buffer-and-file] - ["Copy file name to clipboard" prelude-copy-file-name-to-clipboard]) + ["Rename buffer and file" prelude-rename-buffer-and-file]) ("Buffers" ["Clean up buffer or region" prelude-cleanup-buffer-or-region] From 92eed7a9fe2199b9c6d8f1c122a09443d11ba885 Mon Sep 17 00:00:00 2001 From: k1-hedayati Date: Fri, 16 Jan 2015 10:50:07 +0330 Subject: [PATCH 7/7] Added cython-mode to auto install list --- core/prelude-packages.el | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/prelude-packages.el b/core/prelude-packages.el index 5d428d3..030468e 100644 --- a/core/prelude-packages.el +++ b/core/prelude-packages.el @@ -153,6 +153,9 @@ PACKAGE is installed only if not already present. The file is opened in MODE." ("\\.pp\\'" puppet-mode puppet-mode) ("\\.php\\'" php-mode php-mode) ("\\.proto\\'" protobuf-mode protobuf-mode) + ("\\.pyd\\'" cython-mode cython-mode) + ("\\.pyi\\'" cython-mode cython-mode) + ("\\.pyx\\'" cython-mode cython-mode) ("PKGBUILD\\'" pkgbuild-mode pkgbuild-mode) ("\\.rs\\'" rust-mode rust-mode) ("\\.sass\\'" sass-mode sass-mode)