commit cc5661860cb0d84d72f17d974965325aacc4a472
parent e2c3bc3b1798abd8d02ba3211d86c8d962a1c726
Author: Hugo Soucy <hugo.soucy@savoirfairelinux.com>
Date: Thu, 2 Jul 2015 08:57:12 -0400
Add the undo-tree package.
Diffstat:
8 files changed, 52 insertions(+), 58 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,4 @@ elpa
.DS_Store
/setup-smtp.el
/.mc-lists.el
+url+
\ No newline at end of file
diff --git a/README.md b/README.md
@@ -2,3 +2,9 @@
========
Ma configuration pour GNU Emacs. Grandement basé et inspiré par ceux de [Magnar Sveen](https://github.com/magnars/.emacs.d) et de [Steve Purcell](https://github.com/purcell/emacs.d).
+
+
+Fonctions (defuns)
+------------------
+
+* [duplicate-line.el](defuns/duplicate-line.el)
diff --git a/bookmarks b/bookmarks
@@ -2,66 +2,36 @@
;;; This format is meant to be slightly human-readable;
;;; nevertheless, you probably don't want to edit it.
;;; -*- End Of Bookmark File Format Version Stamp -*-
-(("hs0ucy.log"
- (filename . "~/Seafile/Ma Bibliothèque/notes/hs0ucy.log.org")
+(("sync"
+ (filename . "~/_Sync/")
+ (front-context-string . "bdd\n drwx------")
+ (rear-context-string . "96 jun 30 08:43 ")
+ (position . 227))
+("dauphine-theme"
+ (filename . "~/_Projets/paris-dauphine/dauphine-espace-etudiant/src/drupal/profiles/dauph_profile/themes/dauph_in_front/")
+ (front-context-string . "bower_components")
+ (rear-context-string . "96 jun 9 10:48 ")
+ (position . 331))
+("notes"
+ (filename . "~/_Sync/notes/")
(front-context-string . "klist accessibil")
(rear-context-string . "e;\n*** TODO Chec")
(position . 3457))
-("walter-src"
- (filename . "~/_Projets/walter/walter-com/src/")
- (front-context-string . "themes\n drwxr-x")
- (rear-context-string . "96 jui 2 14:50 ")
- (position . 574))
-("mail"
- (filename . "/tmp/mail.md")
- (front-context-string)
- (rear-context-string . "est en markdown.")
- (position . 175))
("hugosoucycc"
- (filename . "~/Seafile/Ma Bibliothèque/projets/hugosoucycc/")
+ (filename . "~/_Sync/projets/hscc/")
(front-context-string . "archetypes\n -rw")
(rear-context-string . "96 aoû 15 16:51 ")
(position . 259))
-("JSKrill"
- (filename . "~/Seafile/Ma Bibliothèque/projets/JSKrill/")
- (front-context-string . "jskrill.html\n -")
- (rear-context-string . "52 aoû 13 15:00 ")
- (position . 255))
("walter-theme"
(filename . "~/_Projets/walter/walter-com/src/themes/walter-theme/src/main/webapp/")
(front-context-string . "..\n -rw-r--r-- ")
(rear-context-string . "96 fév 18 14:44 ")
(position . 231))
-("ssqca-cmsentities"
- (filename . "~/_Projets/ssq/refonte-de-ssq-ca/src/cms-entities/global/journal/")
- (front-context-string . "articles\n drwxr")
- (rear-context-string . "96 Mar 3 08:12 ")
- (position . 275))
-("ssqca-layouts"
- (filename . "~/_Projets/ssq/refonte-de-ssq-ca/src/layouts/ssqca-layouts/src/main/webapp/")
- (front-context-string . "2_2_columns.png\n")
- (rear-context-string . "36 Nov 1 09:05 ")
- (position . 285))
-("ssqca-theme"
- (filename . "~/_Projets/ssq/refonte-de-ssq-ca/src/themes/ssqca-theme/src/main/webapp/")
- (front-context-string . "config.rb\n drwx")
- (rear-context-string . "72 Mar 4 09:48 ")
- (position . 289))
-("notes"
- (filename . "~/Seafile/Ma Bibliothèque/notes")
- (front-context-string . "..\n -rw-r--r-- ")
- (rear-context-string . "96 Jan 7 14:17 ")
- (position . 178))
("projets"
(filename . "~/_Projets/")
(front-context-string . "brunobouchard\n ")
(rear-context-string . "96 Oct 10 06:21 ")
(position . 203))
-("www"
- (filename . "~/public_html/")
- (front-context-string . "..\n drwxr-xr-x ")
- (rear-context-string . "96 Jan 2 11:48 ")
- (position . 171))
("emacs"
(filename . "~/.emacs.d/")
(front-context-string . "appearance.el~\n ")
diff --git a/custom.el b/custom.el
@@ -6,12 +6,16 @@
'(column-number-mode t)
'(custom-safe-themes
(quote
- ("9b94a52c25ea76b72df2050928d18e7fe9060e9c7f7d992f33bf35d4931b0444" "009d2b33a4c04e847e36b77803daed44c77646e58e218271d609c85876091180" "9dae95cdbed1505d45322ef8b5aa90ccb6cb59e0ff26fef0b8f411dfc416c552" "7fbb8d064286706fb1e319c9d3c0a8eafc2efe6b19380aae9734c228b05350ae" "3b819bba57a676edf6e4881bd38c777f96d1aa3b3b5bc21d8266fa5b0d0f1ebf" "8aebf25556399b58091e533e455dd50a6a9cba958cc4ebb0aab175863c25b9a4" "f0a99f53cbf7b004ba0c1760aa14fd70f2eabafe4e62a2b3cf5cabae8203113b" "8b231ba3e5f61c2bb1bc3a2d84cbd16ea17ca13395653566d4dfbb11feaf8567" "7a9f392481b6e2fb027ab9d8053ab36c0f23bf5cc1271206982339370d894c74" "ed81411169b1b3e3d4cfc39b09d68ea13e0ff7708dc5b9d0bedb319e071968ad" "8eef22cd6c122530722104b7c82bc8cdbb690a4ccdd95c5ceec4f3efa5d654f5" default)))
+ ("e16a771a13a202ee6e276d06098bc77f008b73bbac4d526f160faa2d76c1dd0e" "9b94a52c25ea76b72df2050928d18e7fe9060e9c7f7d992f33bf35d4931b0444" "009d2b33a4c04e847e36b77803daed44c77646e58e218271d609c85876091180" "9dae95cdbed1505d45322ef8b5aa90ccb6cb59e0ff26fef0b8f411dfc416c552" "7fbb8d064286706fb1e319c9d3c0a8eafc2efe6b19380aae9734c228b05350ae" "3b819bba57a676edf6e4881bd38c777f96d1aa3b3b5bc21d8266fa5b0d0f1ebf" "8aebf25556399b58091e533e455dd50a6a9cba958cc4ebb0aab175863c25b9a4" "f0a99f53cbf7b004ba0c1760aa14fd70f2eabafe4e62a2b3cf5cabae8203113b" "8b231ba3e5f61c2bb1bc3a2d84cbd16ea17ca13395653566d4dfbb11feaf8567" "7a9f392481b6e2fb027ab9d8053ab36c0f23bf5cc1271206982339370d894c74" "ed81411169b1b3e3d4cfc39b09d68ea13e0ff7708dc5b9d0bedb319e071968ad" "8eef22cd6c122530722104b7c82bc8cdbb690a4ccdd95c5ceec4f3efa5d654f5" default)))
'(display-battery-mode t)
'(display-time-mode t)
+ '(elfeed-feeds
+ (quote
+ ("http://www.sciencepresse.qc.ca/articles/tous/4/rss.xml" "http://english.aljazeera.net/Services/Rss/?PostingId=2007731105943979989" "http://feeds.arstechnica.com/arstechnica/index/" "http://newsrss.bbc.co.uk/rss/newsonline_world_edition/front_page/rss.xml" "http://www.newslookup.com/rss/business/bloomberg.rss" "http://www.la-grange.net/feed" "http://www.courrierinternational.com/rss/rss_a_la_une.xml" "http://www.framablog.org/index.php/feed/atom" "http://fr.globalvoicesonline.org/feed/" "https://news.ycombinator.com/rss" "http://www.internetactu.net/feed/" "http://www.lactualite.com/feed/" "http://www.cyberpresse.ca/rss/225.xml" "http://www.ledevoir.com/rss/ledevoir.xml" "http://www.lemonde.fr/rss/sequence/0,2-3208,1-0,0.xml" "http://www.monde-diplomatique.fr/recents.xml" "http://www.lesaffaires.com/rss/a_la_une" "http://www.liberation.fr/interactif/rss/actualites/index.FR.php" "http://blogue.monlimoilou.com/feed/" "http://rss.canada.com/get/?F8739" "http://voir.ca/normand-baillargeon/feed/" "http://www.numerama.com/rss/news.rss" "http://www.nytimes.com/services/xml/rss/nyt/HomePage.xml" "http://feeds.feedburner.com/Projetj" "http://feeds.feedburner.com/rabble-news" "http://rss.radio-canada.ca/fils/nouvelles/nouvelles.xml" "http://feeds.reuters.com/reuters/topNews?irpc=69" "http://www.rue89.com/homepage/feed" "http://feeds.slate.com/slate" "http://www.slate.fr/rss.xml" "http://feeds.feedburner.com/Best-Of-The-Atlantic" "https://www.eff.org/rss/pressrelease" "http://www.independent.co.uk/rss" "http://www.newyorker.com/services/rss/feeds/everything.xml" "http://www.vice.com/en_ca/rss" "http://feeds.wired.com/wired/index/" "http://www.ababord.org/spip.php?page=backend")))
'(indent-tabs-mode nil)
'(mail-use-rfc822 t)
'(safe-local-variable-values (quote ((encoding . utf-8))))
+ '(send-mail-function (quote mailclient-send-it))
'(show-paren-mode t)
'(size-indication-mode t)
'(tab-width 4)
diff --git a/init.el b/init.el
@@ -34,11 +34,11 @@
(add-to-list 'load-path project)))
;; Write backup files to own directory
-;; (setq backup-directory-alist
-;; `(("." . ,(expand-file-name
-;; (concat user-emacs-directory "backups")))))
-(setq auto-save-default nil)
-(setq make-backup-files nil)
+(setq backup-directory-alist
+ `(("." . ,(expand-file-name
+ (concat user-emacs-directory "backups")))))
+(setq auto-save-default t)
+(setq make-backup-files t)
;; Setup packages
(require 'setup-package)
@@ -71,7 +71,7 @@
(require 'setup-markdown-mode)
;; Setup HELM
-(require 'setup-helm-mode)
+;; (require 'setup-helm-mode)
;; Setup HTML/SGML
(require 'setup-html-mode)
@@ -88,6 +88,9 @@
;; Setup Emmet
(require 'setup-emmet-mode)
+;; Setup Undo-Tree
+(require 'setup-undo-tree)
+
;; Setup key bindings
(require 'key-bindings)
diff --git a/lisp/key-bindings.el b/lisp/key-bindings.el
@@ -1,11 +1,5 @@
;; CUSTOM KEY BINDINGS
-;; Naviguate trough windows
-(global-set-key (kbd "C-x <up>") 'windmove-up)
-(global-set-key (kbd "C-x <down>") 'windmove-down)
-(global-set-key (kbd "C-x <right>") 'windmove-right)
-(global-set-key (kbd "C-x <left>") 'windmove-left)
-
;; Magit shortcuts
;; Git Status
(global-set-key (kbd "M-g s") 'magit-status)
@@ -48,7 +42,15 @@
;; Remap dired-up-directory
(global-set-key (kbd "M-<up>") 'dired-up-directory)
-;; Undo
-(global-set-key (kbd "C-#") 'undo)
+;; Make CTRL-Z Undo
+(global-set-key (kbd "C-z") 'undo)
+
+;; Make CTRL-Z Redo
+(defalias 'redo 'undo-tree-redo)
+
+(global-set-key (kbd "C-S-z") 'redo)
+
+;; Alternative to set-mark-command
+(global-set-key (kbd "C-.") 'set-mark-command)
(provide 'key-bindings)
diff --git a/lisp/setup-emmet-mode.el b/lisp/setup-emmet-mode.el
@@ -1,5 +1,6 @@
(add-hook 'sgml-mode-hook 'emmet-mode) ;; Auto-start on any markup modes
(add-hook 'html-mode-hook 'emmet-mode)
+(add-hook 'web-mode-hook 'emmet-mode)
(add-hook 'css-mode-hook 'emmet-mode)
(add-hook 'scss-mode-hook 'emmet-mode)
diff --git a/lisp/setup-undo-tree.el b/lisp/setup-undo-tree.el
@@ -0,0 +1,6 @@
+;; Undo Tree Mode
+
+;; Turn on everywhere
+(global-undo-tree-mode 1)
+
+(provide 'setup-undo-tree)
