some merges

1 files changed, 18 insertions, 3 deletions

diff --git a/init.el b/init.el
index de618c5..2c65a53 100755
--- a/init.el
+++ b/init.el
@@ -111,6 +111,21 @@
      ("\\.ino\\'" flymake-simple-make-init nil nil))))
  '(flymake-log-level 0)
  '(flymake-master-file-dirs (quote ("." "./src" "./lib" "./t/lib")))
+ '(flymake-proc-allowed-file-name-masks
+   (quote
+    (("\\.\\(?:c\\(?:pp\\|xx\\|\\+\\+\\)?\\|CC\\)\\'" flymake-simple-make-init nil nil)
+     ("\\.xml\\'" flymake-xml-init nil nil)
+     ("\\.html?\\'" flymake-xml-init nil nil)
+     ("\\.cs\\'" flymake-simple-make-init nil nil)
+     ("\\.p[ml]\\'" flymake-perl-init nil nil)
+     ("\\.php[345]?\\'" flymake-php-init nil nil)
+     ("\\.h\\'" flymake-master-make-header-init flymake-master-cleanup nil)
+     ("\\.java\\'" flymake-simple-make-java-init flymake-simple-java-cleanup nil)
+     ("[0-9]+\\.tex\\'" flymake-master-tex-init flymake-master-cleanup nil)
+     ("\\.tex\\'" flymake-simple-tex-init nil nil)
+     ("\\.idl\\'" flymake-simple-make-init nil nil)
+     ("\\.ino\\'" flymake-simple-make-init nil nil))))
+ '(flymake-proc-master-file-dirs (quote ("." "./src" "./lib" "./t/lib")))
  '(footnote-section-tag-regexp "Notes?\\(\\[.\\]\\)?: ")
  '(footnote-spaced-footnotes nil)
  '(global-font-lock-mode t nil (font-lock))
@@ -171,11 +186,11 @@
  '(nxml-slash-auto-complete-flag t)
  '(package-archives
    (quote
-    (("gnu" . "http://elpa.gnu.org/packages/")
-     ("melpa" . "http://melpa.milkbox.net/packages/"))))
+    (("gnu" . "https://elpa.gnu.org/packages/")
+     ("melpa" . "https://melpa.org/packages/"))))
  '(package-selected-packages
    (quote
-    (json-mode web-mode yaml-mode unicode-fonts scad-mode perl6-mode markdown-mode+ magit ledger-mode flycheck-status-emoji flycheck-perl6 ack-menu)))
+    (gnu-elpa-keyring-update wgrep web-mode unicode-fonts perl6-mode markdown-mode magit-tramp magit-find-file ledger-mode)))
  '(pov-external-viewer-command "display")
  '(pov-help-file "povuser.txt")
  '(reftex-extra-bindings nil)