From: Stefan Bund Date: Tue, 6 Dec 2016 08:56:43 +0000 (+0100) Subject: migrate to emacs24 X-Git-Url: http://g0dil.de/git?p=emacs-init.git;a=commitdiff_plain;h=f81363fb8f1d2956fe94b381ba66e8514f1c08cc migrate to emacs24 --- diff --git a/.gitignore b/.gitignore index fc5447c..c7feae6 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,7 @@ auto-save-list/ eshell/ *.elc server -bookmarks \ No newline at end of file +bookmarks +places +ido.last + diff --git a/.gitmodules b/.gitmodules index b41794e..da9b4f2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,9 +9,6 @@ url = git://github.com/magit/magit.git [submodule "emacsstuff"] path = emacsstuff url = git://g0dil.de/emacsstuff.git -[submodule "git-modes"] - path = git-modes - url = https://github.com/magit/git-modes.git [submodule "git-wip"] path = git-wip url = https://github.com/bartman/git-wip.git @@ -24,3 +21,6 @@ url = git://g0dil.de/emacsstuff.git [submodule "groovy-emacs-modes"] path = groovy-emacs-modes url = https://github.com/Groovy-Emacs-Modes/groovy-emacs-modes.git +[submodule "with-editor"] + path = with-editor + url = https://github.com/magit/with-editor diff --git a/README b/README new file mode 100644 index 0000000..2767b68 --- /dev/null +++ b/README @@ -0,0 +1,7 @@ +The following packages are required: + + dash-el + +Create directory + + ~/.emacs.d/autosave diff --git a/UBUNTU-PACKAGES b/UBUNTU-PACKAGES new file mode 100644 index 0000000..3f84339 --- /dev/null +++ b/UBUNTU-PACKAGES @@ -0,0 +1 @@ +dash-el diff --git a/auto-install/cl-lib.el b/auto-install/cl-lib.el deleted file mode 100644 index 52c4276..0000000 --- a/auto-install/cl-lib.el +++ /dev/null @@ -1,392 +0,0 @@ -;;; cl-lib.el --- Properly prefixed CL functions and macros -*- coding: utf-8 -*- - -;; Copyright (C) 2012, 2013, 2014 Free Software Foundation, Inc. - -;; Author: Stefan Monnier -;; vcomment: Emacs-24.3's version is 1.0 so this has to stay below. -;; Version: 0.4 - -;; This program is free software; you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation, either version 3 of the License, or -;; (at your option) any later version. - -;; This program is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. - -;; You should have received a copy of the GNU General Public License -;; along with this program. If not, see . - -;;; Commentary: - -;; This is a forward compatibility package, which provides (a subset of) the -;; features of the cl-lib package introduced in Emacs-24.3, for use on -;; previous emacsen. - -;; Make sure this is installed *late* in your `load-path`, i.e. after Emacs's -;; built-in .../lisp/emacs-lisp directory, so that if/when you upgrade to -;; Emacs-24.3, the built-in version of the file will take precedence, otherwise -;; you could get into trouble (although we try to hack our way around the -;; problem in case it happens). - -;; This code is largely copied from Emacs-24.3's cl.el, with the alias bindings -;; simply reversed. - -;;; Code: - -(when (functionp 'macroexp--compiler-macro) - ;; `macroexp--compiler-macro' was introduced as part of the big CL - ;; reorganization which moved/reimplemented some of CL into core (mostly the - ;; setf and compiler-macro support), so its presence indicates we're running - ;; in an Emacs that comes with the new cl-lib.el, where this file should - ;; never be loaded! - (message "Real cl-lib shadowed by compatibility cl-lib? (%s)" load-file-name) - (when load-file-name - ;; (message "Let's try to patch things up") - (let ((loaddir (file-name-directory load-file-name)) - load-path-dir) - ;; Find the problematic directory from load-path. - (dolist (dir load-path) - (if (equal loaddir (expand-file-name (file-name-as-directory dir))) - (setq load-path-dir dir))) - (when load-path-dir - ;; (message "Let's move the offending dir to the end") - (setq load-path (append (remove load-path-dir load-path) - (list load-path-dir))) - ;; Here we could manually load cl-lib and then return immediately. - ;; But Emacs currently doesn't provide any way for a file to "return - ;; immediately", so instead we make sure the rest of the file does not - ;; throw away any pre-existing definition. - )))) - -(require 'cl) - -;; Some of Emacs-24.3's cl.el definition are not just aliases, because either -;; the feature was dropped from cl-lib.el or because the cl-lib version is -;; not fully compatible. -;; Let's just not include them here, since it is very important that if code -;; works with this cl-lib.el it should also work with Emacs-24.3's cl-lib.el, -;; whereas the reverse is much less important. - -(dolist (var '( - ;; loop-result-var - ;; loop-result - ;; loop-initially - ;; loop-finally - ;; loop-bindings - ;; loop-args - ;; bind-inits - ;; bind-block - ;; lambda-list-keywords - float-negative-epsilon - float-epsilon - least-negative-normalized-float - least-positive-normalized-float - least-negative-float - least-positive-float - most-negative-float - most-positive-float - ;; custom-print-functions - )) - (let ((new (intern (format "cl-%s" var)))) - (unless (boundp new) (defvaralias new var)))) - -;; The following cl-lib functions were already defined in the old cl.el, -;; with a different meaning: -;; - cl-position and cl-delete-duplicates -;; the two meanings are clearly different, but we can distinguish which was -;; meant by looking at the arguments. -;; - cl-member -;; the old meaning hasn't been used for a long time and is a subset of the -;; new, so we can simply override it. -;; - cl-adjoin -;; the old meaning is actually the same as the new except for optimizations. - -(dolist (fun '( - (get* . cl-get) - (random* . cl-random) - (rem* . cl-rem) - (mod* . cl-mod) - (round* . cl-round) - (truncate* . cl-truncate) - (ceiling* . cl-ceiling) - (floor* . cl-floor) - (rassoc* . cl-rassoc) - (assoc* . cl-assoc) - ;; (member* . cl-member) ;Handle specially below. - (delete* . cl-delete) - (remove* . cl-remove) - (defsubst* . cl-defsubst) - (sort* . cl-sort) - (function* . cl-function) - (defmacro* . cl-defmacro) - (defun* . cl-defun) - (mapcar* . cl-mapcar) - - remprop - getf - tailp - list-length - nreconc - revappend - concatenate - subseq - random-state-p - make-random-state - signum - isqrt - lcm - gcd - notevery - notany - every - some - mapcon - mapcan - mapl - maplist - map - equalp - coerce - tree-equal - nsublis - sublis - nsubst-if-not - nsubst-if - nsubst - subst-if-not - subst-if - subsetp - nset-exclusive-or - set-exclusive-or - nset-difference - set-difference - nintersection - intersection - nunion - union - rassoc-if-not - rassoc-if - assoc-if-not - assoc-if - member-if-not - member-if - merge - stable-sort - search - mismatch - count-if-not - count-if - count - position-if-not - position-if - ;; position ;Handle specially via defadvice below. - find-if-not - find-if - find - nsubstitute-if-not - nsubstitute-if - nsubstitute - substitute-if-not - substitute-if - substitute - ;; delete-duplicates ;Handle specially via defadvice below. - remove-duplicates - delete-if-not - delete-if - remove-if-not - remove-if - replace - fill - reduce - compiler-macroexpand - define-compiler-macro - assert - check-type - typep - deftype - defstruct - callf2 - callf - letf* - letf - rotatef - shiftf - remf - psetf - declare - the - locally - multiple-value-setq - multiple-value-bind - symbol-macrolet - macrolet - progv - psetq - do-all-symbols - do-symbols - dotimes - dolist - do* - do - loop - return-from - return - block - etypecase - typecase - ecase - case - load-time-value - eval-when - destructuring-bind - gentemp - gensym - pairlis - acons - subst - ;; adjoin ;It's already defined. - copy-list - ldiff - list* - cddddr - cdddar - cddadr - cddaar - cdaddr - cdadar - cdaadr - cdaaar - cadddr - caddar - cadadr - cadaar - caaddr - caadar - caaadr - caaaar - cdddr - cddar - cdadr - cdaar - caddr - cadar - caadr - caaar - tenth - ninth - eighth - seventh - sixth - fifth - fourth - third - endp - rest - second - first - svref - copy-seq - evenp - oddp - minusp - plusp - floatp-safe - declaim - proclaim - nth-value - multiple-value-call - multiple-value-apply - multiple-value-list - values-list - values - pushnew - decf - incf - - dolist - dotimes - )) - (let ((new (if (consp fun) (prog1 (cdr fun) (setq fun (car fun))) - (intern (format "cl-%s" fun))))) - (if (fboundp new) - (unless (or (eq (symbol-function new) fun) - (eq new (and (symbolp fun) (fboundp fun) - (symbol-function fun)))) - (message "%S already defined, not rebinding" new)) - (defalias new fun)))) - -(autoload 'cl-position "cl-seq") -(defadvice cl-position (around cl-lib (cl-item cl-seq &rest cl-keys) activate) - (let ((argk (ad-get-args 2))) - (if (or (null argk) (keywordp (car argk))) - ;; This is a call to cl-lib's `cl-position'. - (setq ad-return-value - (apply #'position (ad-get-arg 0) (ad-get-arg 1) argk)) - ;; Must be a call to cl's old `cl-position'. - ad-do-it))) - -(autoload 'cl-delete-duplicates "cl-seq") -(defadvice cl-delete-duplicates (around cl-lib (cl-seq &rest cl-keys) activate) - (let ((argk (ad-get-args 1))) - (if (or (null argk) (keywordp (car argk))) - ;; This is a call to cl-lib's `cl-delete-duplicates'. - (setq ad-return-value - (apply #'delete-duplicates (ad-get-arg 0) argk)) - ;; Must be a call to cl's old `cl-delete-duplicates'. - ad-do-it))) - -(when (or (not (fboundp 'cl-member)) - (eq (symbol-function 'cl-member) #'memq)) - (defalias 'cl-member #'member*)) - -;; `cl-labels' is not 100% compatible with `labels' when using dynamic scoping -;; (mostly because it does not turn lambdas that refer to those functions into -;; closures). OTOH it is compatible when using lexical scoping. - -(unless (fboundp 'cl-labels) - (defmacro cl-labels (&rest args) - (unless (and (boundp 'lexical-binding) lexical-binding) - ;; We used to signal an error rather than a message, but in many uses of - ;; cl-labels, the value of lexical-binding doesn't actually matter. - ;; More importantly, the value of `lexical-binding' here is unreliable - ;; (it does not necessarily reflect faithfully whether the output of this - ;; macro will be interpreted as lexically bound code or not). - (message "This `cl-labels' requires `lexical-binding' to be non-nil")) - `(labels ,@args))) - -;;;; ChangeLog: - -;; 2014-01-25 Stefan Monnier -;; -;; * cl-lib.el: Resolve conflicts with old internal definitions -;; (bug#16353). -;; (dolist fun): Don't skip definitions silently. -;; (define-setf-expander): Remove, not in cl-lib. -;; (cl-position, cl-delete-duplicates): Add advice to distinguish the use -;; case. -;; (cl-member): Override old definition. -;; -;; 2013-05-22 Stefan Monnier -;; -;; * cl-lib.el (cl-labels): Demote error to message and improve it. -;; -;; 2012-11-30 Stefan Monnier -;; -;; * cl-lib.el: Try and patch things up in case we're hiding the real -;; cl-lib. -;; -;; 2012-11-22 Stefan Monnier -;; -;; Add cl-letf and cl-labels. -;; -;; 2012-11-16 Stefan Monnier -;; -;; * packages/cl-lib: New package. -;; - - -(provide 'cl-lib) -;;; cl-lib.el ends here diff --git a/dot-emacs-sample.el b/dot-emacs-sample.el index 6a16166..ce88e43 100644 --- a/dot-emacs-sample.el +++ b/dot-emacs-sample.el @@ -1,3 +1,3 @@ -(add-to-list 'load-path "~/.emacs.d") +(add-to-list 'load-path "~/.emacs.d/lisp") (require 'load-dir) (load-dir "~/.emacs.d/setup") diff --git a/emacs-custom.el b/emacs-custom.el index 52ba306..01a5e67 100644 --- a/emacs-custom.el +++ b/emacs-custom.el @@ -1,12 +1,14 @@ (custom-set-variables - ;; custom-set-variables was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. + ;; custom-set-variables was added by Custom. + ;; If you edit it by hand, you could mess it up, so be careful. + ;; Your init file should contain only one such instance. + ;; If there is more than one, they won't work right. '(auto-install-install-confirm nil) '(auto-install-replace-confirm nil) '(auto-install-save-confirm nil) - '(auto-save-file-name-transforms (quote (("\\`.*\\([^/]*\\)\\'" "~/.emacs.d/autosave/\\1" t)))) + '(auto-save-file-name-transforms + (quote + (("\\`.*\\([^/]*\\)\\'" "~/.emacs.d/autosave/\\1" t)))) '(backup-directory-alist (quote (("." . "~/.emacs.d/backups")))) '(c-backslash-column 99) '(c-basic-offset 4) @@ -24,17 +26,23 @@ '(dabbrev-abbrev-char-regexp "\\sw") '(debug-on-error nil) '(default-input-method "latin-1-prefix") - '(develock-max-column-plist (quote (emacs-lisp-mode 99 lisp-interaction-mode w change-log-mode t texinfo-mode t c-mode 99 c++-mode 99 java-mode 99 jde-mode 99 html-mode 99 html-helper-mode 99 cperl-mode 99 perl-mode 99 mail-mode t message-mode t cmail-mail-mode t tcl-mode 99 ruby-mode 99))) + '(develock-max-column-plist + (quote + (emacs-lisp-mode 99 lisp-interaction-mode w change-log-mode t texinfo-mode t c-mode 99 c++-mode 99 java-mode 99 jde-mode 99 html-mode 99 html-helper-mode 99 cperl-mode 99 perl-mode 99 mail-mode t message-mode t cmail-mail-mode t tcl-mode 99 ruby-mode 99))) '(diff-mode-hook (quote ((lambda nil (diff-auto-refine-mode 1))))) '(diff-switches "-u") '(edit-server-done-hook nil) '(edit-server-new-frame nil) '(fill-column 98) - '(flymake-allowed-file-name-masks (quote (("\\.java\\'" flymake-simple-make-java-init flymake-simple-java-cleanup) ("[0-9]+\\.tex\\'" flymake-master-tex-init flymake-master-cleanup) ("\\.tex\\'" flymake-simple-tex-init)))) + '(flymake-allowed-file-name-masks + (quote + (("\\.java\\'" flymake-simple-make-java-init flymake-simple-java-cleanup) + ("[0-9]+\\.tex\\'" flymake-master-tex-init flymake-master-cleanup) + ("\\.tex\\'" flymake-simple-tex-init)))) '(flyspell-delay 30) '(flyspell-delayed-commands nil) '(frame-background-mode (quote light)) - '(git-commit-fill-column 158) + '(git-commit-fill-column 99) '(global-auto-revert-mode nil) '(global-highlight-changes-mode nil) '(global-subword-mode t) @@ -44,7 +52,9 @@ '(highlight-changes-face-list nil) '(highlight-changes-global-changes-existing-buffers t) '(hippie-expand-dabbrev-as-symbol nil) - '(hippie-expand-try-functions-list (quote (try-complete-file-name-partially try-complete-file-name try-expand-dabbrev try-expand-dabbrev-all-buffers try-expand-dabbrev-from-kill try-expand-all-abbrevs try-expand-line try-expand-list))) + '(hippie-expand-try-functions-list + (quote + (try-complete-file-name-partially try-complete-file-name try-expand-dabbrev try-expand-dabbrev-all-buffers try-expand-dabbrev-from-kill try-expand-all-abbrevs try-expand-line try-expand-list))) '(hs-isearch-open nil) '(ido-mode (quote both) nil (ido)) '(indent-tabs-mode nil) @@ -54,10 +64,11 @@ '(line-move-visual nil) '(ls-lisp-dirs-first t) '(magit-default-tracking-name-function (quote magit-default-tracking-name-branch-only)) + '(magit-display-buffer-function (quote magit-display-buffer-same-window-except-diff-v1)) '(magit-process-popup-time 1) '(magit-server-window-for-rebase (quote pop-to-buffer)) '(magit-status-buffer-switch-function (quote switch-to-buffer)) - '(nxml-child-indent 4) + '(nxml-child-indent 2) '(nxml-where-global-mode nil) '(nxml-where-header nil) '(org-startup-indented t) @@ -70,6 +81,7 @@ '(server-done-hook nil) '(server-kill-new-buffers t) '(server-mode t) + '(server-switch-hook nil) '(server-temp-file-regexp "^/tmp/Re\\|/draft\\|.*/itsalltext/.*$") '(server-window nil) '(show-paren-mode t) @@ -78,17 +90,21 @@ '(tool-bar-mode nil) '(uniquify-buffer-name-style (quote forward) nil (uniquify)) '(visual-line-fringe-indicators (quote (left-curly-arrow right-curly-arrow))) - '(which-func-modes (quote (nxml-mode emacs-lisp-mode c-mode c++-mode perl-mode cperl-mode python-mode makefile-mode sh-mode fortran-mode f90-mode ada-mode diff-mode))) + '(which-func-modes + (quote + (nxml-mode emacs-lisp-mode c-mode c++-mode perl-mode cperl-mode python-mode makefile-mode sh-mode fortran-mode f90-mode ada-mode diff-mode))) '(which-function-mode nil) '(whitespace-action (quote (auto-cleanup warn-if-read-only))) '(whitespace-line-column 100) - '(whitespace-style (quote (face trailing space-before-tab newline indentation empty space-after-tab lines-tail))) + '(whitespace-style + (quote + (face trailing space-before-tab newline indentation empty space-after-tab lines-tail))) '(x-select-enable-clipboard t)) (custom-set-faces - ;; custom-set-faces was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. + ;; custom-set-faces was added by Custom. + ;; If you edit it by hand, you could mess it up, so be careful. + ;; Your init file should contain only one such instance. + ;; If there is more than one, they won't work right. '(default ((t (:inherit nil :stipple nil :background "#ffffff" :foreground "black" :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight normal :height 97 :width semi-condensed :foundry "misc" :family "6x13")))) '(ediff-even-diff-B ((t (:background "yellow")))) '(ediff-odd-diff-A ((t (:background "yellow")))) diff --git a/emacsstuff b/emacsstuff index f26a018..3ab89e0 160000 --- a/emacsstuff +++ b/emacsstuff @@ -1 +1 @@ -Subproject commit f26a01800abe969326f8b5aff4a6c99cf1d9b9dd +Subproject commit 3ab89e0eab309d73e0a5d57dd485b6ae5bd22ec1 diff --git a/git-modes b/git-modes deleted file mode 160000 index 0cd113d..0000000 --- a/git-modes +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0cd113d7c14090e660807fea4be0116003925d2b diff --git a/auto-install.el b/lisp/auto-install.el similarity index 100% rename from auto-install.el rename to lisp/auto-install.el diff --git a/load-dir.el b/lisp/load-dir.el similarity index 100% rename from load-dir.el rename to lisp/load-dir.el diff --git a/magit b/magit index 3558925..74f9ef2 160000 --- a/magit +++ b/magit @@ -1 +1 @@ -Subproject commit 3558925f6988a01962753849debfd6670d5395aa +Subproject commit 74f9ef2e7c7de93aa6784b55064fee0a58239b97 diff --git a/nxhtml/etc/schema/xhtml-loader.rnc b/nxhtml/etc/schema/xhtml-loader.rnc index f3b265d..12319fa 100644 --- a/nxhtml/etc/schema/xhtml-loader.rnc +++ b/nxhtml/etc/schema/xhtml-loader.rnc @@ -1 +1 @@ -include "../../../../../../usr/share/emacs/23.3/etc/schema/xhtml.rnc" +include "../../../../../../usr/share/emacs/24.5/etc/schema/xhtml.rnc" diff --git a/setup/magit.el b/setup/magit.el index 2ecddc5..8a3d27b 100644 --- a/setup/magit.el +++ b/setup/magit.el @@ -4,7 +4,7 @@ (or load-file-name (when (boundp 'bytecomp-filename) bytecomp-filename) buffer-file-name)))) - "magit")) + "magit/lisp")) (add-to-list 'load-path (concat (file-name-directory (directory-file-name @@ -12,7 +12,7 @@ (or load-file-name (when (boundp 'bytecomp-filename) bytecomp-filename) buffer-file-name)))) - "git-modes")) + "with-editor")) (add-to-list 'load-path (concat (file-name-directory (directory-file-name @@ -36,6 +36,9 @@ (require 'magit) +(setq magit-refs-local-branch-format "%C %-48n %U%m\n") +(setq magit-refs-remote-branch-format "%C %-48n %m\n") + (when (eq system-type 'windows-nt) (require 'advice) @@ -77,12 +80,12 @@ (kill-buffer " *my-shell-command-to-string*")))) (defun git-repo-files () - (let ((default-directory (magit-get-top-dir default-directory))) + (let ((default-directory (magit-toplevel default-directory))) (split-string (my-shell-command-to-string "git ls-files") "\n"))) (defun find-file-in-git-repo () (interactive) - (let ((repo (magit-get-top-dir default-directory)) + (let ((repo (magit-toplevel default-directory)) (files (git-repo-files))) (find-file (concat repo @@ -93,10 +96,10 @@ (defun grep-in-git-repo (regexp &optional words-only) (interactive "sGrep files in Git repo regexp: \nP") - (let ((default-directory (magit-get-top-dir default-directory))) + (let ((default-directory (magit-toplevel default-directory))) (if (not default-directory) (error "not a Git directory")) - (grep (format "git ls-files -z | xargs -r0 grep -nH -E%s -- %s | cat -" + (grep (format "git ls-files -z | xargs -r0 grep -d skip -nH -E%s -- %s" (if words-only " -w" "") (shell-quote-argument regexp))))) (setenv "GIT_PAGER" "cat") @@ -105,7 +108,7 @@ (defun find-file-maybe-git (&optional nogit) (interactive "P") - (if (and (not nogit) (magit-get-top-dir default-directory)) + (if (and (not nogit) (magit-toplevel default-directory)) (call-interactively 'find-file-in-git-repo) (call-interactively 'ido-find-file))) @@ -114,10 +117,10 @@ (defun git-files-find-symbol (symbol) (interactive (list (read-string "Symbol: " (current-word)))) - (let ((dir (magit-get-top-dir default-directory))) + (let ((dir (magit-toplevel default-directory))) (if (not dir) (error "No git repository")) (let ((default-directory dir)) - (grep (format "git ls-files -z | xargs -r0 grep -nwHF %s | cat -" symbol))))) + (grep (format "git ls-files -z | xargs -r0 grep -d skip -nwHF %s" symbol))))) (defun git-files-find-class-decl (symbol) (interactive (list (read-string "Symbol: " (current-word)))) @@ -132,7 +135,7 @@ (defun dired-git-files () (interactive) - (let ((default-directory (magit-get-top-dir default-directory))\ + (let ((default-directory (magit-toplevel default-directory))\ (ls-lisp-use-insert-directory-program t) files) (setq files (delete-if '(lambda (file) (string= file "")) @@ -143,8 +146,8 @@ (defun dired-grep-git-files (regexp &optional words-only) (interactive "sRegexp: \nP") - (let ((default-directory (magit-get-top-dir default-directory)) - (cmd (format "git ls-files -z | xargs -r0 grep -l -E%s -- %s | cat -" + (let ((default-directory (magit-toplevel default-directory)) + (cmd (format "git ls-files -z | xargs -r0 grep -d skip -l -E%s -- %s" (if words-only " -w" "") (shell-quote-argument regexp)))) (if (not default-directory) (error "not in Git repository")) diff --git a/setup/zzz_finish.el b/setup/zzz_finish.el index 23d1e39..a19eac3 100644 --- a/setup/zzz_finish.el +++ b/setup/zzz_finish.el @@ -10,3 +10,8 @@ (setq whitespace-style (nconc (delete 'lines (delete 'lines-tail whitespace-style)) '(lines-tail))) + +; For some unfathomable reason display-buffer always want's to resize my windows ... +(defadvice display-buffer-use-some-window (around no-resize activate) + (flet ((window-resize (&rest args) nil)) + ad-do-it)) diff --git a/with-editor b/with-editor new file mode 160000 index 0000000..7b6ac3a --- /dev/null +++ b/with-editor @@ -0,0 +1 @@ +Subproject commit 7b6ac3acf02fcfe118685011d46bb8f6b5cc493c