Merge remote-tracking branch 'origin/master' into sogliolasogliola

1 files changed, 20 insertions, 8 deletions

diff --git a/init.el b/init.el
index 6d9996f..1b189df 100755
--- a/init.el
+++ b/init.el
@@ -12,7 +12,7 @@
  ;; If there is more than one, they won't work right.
  '(auto-coding-alist (quote (("\\.\\(arc\\|zip\\|lzh\\|zoo\\|jar\\|tar\\|tgz\\)\\'" . no-conversion) ("\\.\\(gz\\|Z\\|bz\\|bz2\\|gpg\\)\\'" . no-conversion) ("^/home/dakkar/.claws-mail/tmp" . utf-8))))
  '(browse-url-browser-function (quote browse-url-generic))
- '(browse-url-generic-program "/usr/bin/firefox" t)
+ '(browse-url-generic-program "/usr/bin/firefox")
  '(browse-url-lynx-input-attempts 10 t)
  '(browse-url-netscape-program "/usr/bin/firefox")
  '(c-cleanup-list (quote (brace-else-brace brace-elseif-brace brace-catch-brace empty-defun-braces scope-operator)))
@@ -21,6 +21,8 @@
  '(calendar-week-start-day 1)
  '(case-fold-search t)
  '(column-number-mode t)
+ '(confluence-default-space-alist (quote (("https://confluence.nap/rpc/xmlrpc" . "TA") ("https://confluence.nap/rpc/xmlrpc" . "BAK"))))
+ '(confluence-url "https://confluence.nap/rpc/xmlrpc")
  '(cperl-close-paren-offset -4)
  '(cperl-continued-statement-offset 4)
  '(cperl-font-lock t)
@@ -61,6 +63,7 @@
  '(indent-tabs-mode nil)
  '(lpr-command "gtklp")
  '(lpr-switches nil)
+ '(magit-default-tracking-name-function (quote magit-default-tracking-name-branch-only))
  '(menu-bar-mode nil)
  '(message-signature-file "~/.signature/news.sig")
  '(message-signature-separator "^-- [ 	]*$")
@@ -97,7 +100,7 @@
  '(sgml-markup-faces (quote ((start-tag . font-lock-builtin-face) (end-tag . font-lock-builtin-face) (comment . font-lock-comment-face) (pi . bold) (sgml . bold) (doctype . bold) (entity . italic) (shortref . bold))) t)
  '(sgml-name-8bit-mode nil)
  '(sgml-set-face t t)
- '(sgml-slash-distance nil t)
+ '(sgml-slash-distance nil)
  '(smiley-regexp-alist nil)
  '(speedbar-show-unknown-files nil)
  '(speedbar-supported-extension-expressions (quote (".[ch]\\(\\+\\+\\|pp\\|c\\|h\\|xx\\)?" ".tex\\(i\\(nfo\\)?\\)?" ".el" ".emacs" ".l" ".lsp" ".p" ".java" ".f\\(90\\|77\\|or\\)?" ".ada" ".pl" ".tcl" ".m" ".scm" ".pm" ".py" ".s?html" "Makefile\\(\\.in\\)?" ".x[ms]l")))
@@ -131,12 +134,12 @@
  '(cperl-hash-face ((((class color) (background dark)) (:bold t :italic t :foreground "green"))))
  '(font-lock-builtin-face ((((class color) (background dark)) (:foreground "LightGreen"))))
  '(font-lock-comment-face ((((class color) (background dark)) (:italic t :foreground "Gray"))))
- '(message-cited-text-face ((((class color) (background dark)) (:box (:line-width 1 :color "grey75" :style pressed-button) :slant italic))))
- '(message-header-cc-face ((t (:foreground "green3" :weight bold))))
- '(message-header-name-face ((((class color) (background dark)) (:foreground "#00f0ff" :weight bold))))
- '(message-header-newsgroups-face ((t (:foreground "yellow3" :slant italic :weight bold))))
- '(message-header-other-face ((((class color) (background dark)) (:foreground "#b0b000"))))
- '(message-mml-face ((((class color) (background dark)) (:foreground "#00f00f"))))
+ '(message-cited-text-face ((((class color) (background dark)) (:box (:line-width 1 :color "grey75" :style pressed-button) :slant italic))) t)
+ '(message-header-cc-face ((t (:foreground "green3" :weight bold))) t)
+ '(message-header-name-face ((((class color) (background dark)) (:foreground "#00f0ff" :weight bold))) t)
+ '(message-header-newsgroups-face ((t (:foreground "yellow3" :slant italic :weight bold))) t)
+ '(message-header-other-face ((((class color) (background dark)) (:foreground "#b0b000"))) t)
+ '(message-mml-face ((((class color) (background dark)) (:foreground "#00f00f"))) t)
  '(nxml-attribute-colon-face ((t (:inherit nxml-element-colon-face))))
  '(nxml-attribute-prefix-face ((t (:inherit nxml-element-prefix-face))))
  '(nxml-comment-content-face ((t (:foreground "darkgray" :slant italic))))
@@ -204,6 +207,13 @@
 (add-to-list 'auto-mode-alist '("\\.pde\\'" . arduino-mode))
 (add-to-list 'auto-mode-alist '("\\.ino\\'" . arduino-mode))
 
+(add-to-list 'auto-mode-alist '("\\.md$" . markdown-mode))
+(add-hook 'markdown-mode-hook (lambda ()
+                           (progn
+                             (auto-fill-mode 1)
+                             (flyspell-mode)
+                             )))
+
 ; I use references in my LaTeX files
 (add-hook 'latex-mode-hook 'turn-on-reftex)
 ; sometimes I edit POVRay files (mode from http://www.xahlee.org/3d/povray_emacs.html )
@@ -234,3 +244,5 @@
 (global-set-key [f11] (lambda () (interactive) (ispell-change-dictionary "italiano")))
 (global-set-key [f12] (lambda () (interactive) (ispell-change-dictionary "en_GB")))
 (global-set-key (kbd "M-§") 'magit-status)
+
+(global-set-key [(meta control return)] 'browse-url-at-point)