From 42d9a7763fb4f061e8c963b8d699fc9c744f1396 Mon Sep 17 00:00:00 2001
From: larstvei <larstvei@student.matnat.uio.no>
Date: Tue, 24 Dec 2013 02:09:02 +0100
Subject: [PATCH 1/2] Fixed package and implemented automatic updates.

---
 init.el  |  24 ++++++++++++++++++++++--
 init.elc | Bin 8676 -> 9459 bytes
 init.org |  45 +++++++++++++++++++++++++++++++++++++++------
 3 files changed, 61 insertions(+), 8 deletions(-)

diff --git a/init.el b/init.el
index d3defe9..6d0656a 100644
--- a/init.el
+++ b/init.el
@@ -3,17 +3,36 @@
   "If the current buffer is 'init.org' the code-blocks are
 tangled, and the tangled file is compiled."
   (when (equal (buffer-file-name)
-               (concat user-emacs-directory "init.org"))
+               (expand-file-name (concat user-emacs-directory "init.org")))
     (org-babel-tangle)
     (byte-compile-file (concat user-emacs-directory "init.el"))))
 
 (add-hook 'after-save-hook 'init-hook)
 
+(require 'package)
 (package-initialize)
 
 (add-to-list 'package-archives
              '("MELPA" . "http://melpa.milkbox.net/packages/") t)
 
+(defun newest-package-installed-p (package)
+  "Return true if the newest available PACKAGE is installed."
+  (when (package-installed-p package)
+    (let* ((local-pkg-desc (or (assq package package-alist)
+                               (assq package package--builtins)))
+           (newest-pkg-desc (assq package package-archive-contents)))
+      (version-list-= (package-desc-vers (cdr local-pkg-desc))
+                      (package-desc-vers (cdr newest-pkg-desc))))))
+
+(defun upgrade-or-install-package (package)
+  "Unless the newest available version of PACKAGE is installed
+PACKAGE is installed and the current version is deleted."
+  (unless (newest-package-installed-p package)
+    (let ((pkg-desc (assq package package-alist)))
+      (when pkg-desc
+        (package-delete package (package-desc-vers (cdr pkg-desc))))
+      (package-install package))))
+
 (let ((packages
        '(ac-geiser         ; Auto-complete backend for geiser
          ac-slime          ; An auto-complete source using slime completions
@@ -40,8 +59,9 @@ tangled, and the tangled file is compiled."
          )))
   ;; 'remove-if' is a part of the cl-library, so we require this feature.
   (require 'cl)
+  (package-refresh-contents)
   ;; Filter out installed packages and install the remaining.
-  (mapc 'package-install (remove-if 'package-installed-p packages)))
+  (mapc 'upgrade-or-install-package packages))
 
 (dolist (feature
          '(auto-compile             ; auto-compile .el files
diff --git a/init.elc b/init.elc
index 942c1f0bc920503dec65bec93377dd900c4f641a..82a5de90ac8fcf2b1ec1066ac9dcfd0ae0a69db0 100644
GIT binary patch
delta 1314
zcmaJ=OHb5L6dtfZXT%WR%F8n|3R99oZyz%QL>&Yb<BJ$cOel-exdRQQ9or7-YW{*r
zgTKIqiMlYe@Nf7d^amK1ZajC|0)xawZ+lPAIrn^z`(y3*!*|n9D~}D&_r)iMdDnFh
z#7)m#uwB!z!FAw8gTgvBK~_PMm!;COq<}0DC9|@!0yWP)gqmejSlsfd=P%mW=&Li;
zJ*O*@%;TbLW_4MSby?DeQ@B?_mx+WQ8v9!eKX)(o(l>R(sfORX*ZWl{<Zr+NXhao4
zX<C@Y>L@*_D`HtmS6GmcJoYW+U^_hK@&g`y)v!DYb;CR`_GtKxGn+f03YmOGTY~2_
zXm}0;9^$cT5bRTM=xgc+U>q5iZR{e5&DFI>s}Jsh<%8w;fnnRUx^O*HsM4BYTZRvF
zQHdBIA)aK3b;xfQ;;;ZYhK<kaO@uv{;?qb$5l1Z!q<Gz7n@L`;vG+7Xb9og(l9@C^
zwIN*T*y*|X7-QT#fhXcbID9gRxZAMo0Ox_Wa$@~pPps0WZ=Pfrp1E%wQPFgrfI5L6
z!;dr1B%TFzgrZumBeJu^TOdJ|`sNO3u}nnLO2Q6fn2<7TIX3nEv(z?Exs5x4Tf30v
z%thP-+M?agY<M2d3`r9ds7h@boR_Cj-}8(r6<sfqrfJ)WR{!Xu^4UAgmNO^%5Hf)Q
zWrFz>?di0Im}F9J2zo9yVu{ZR|5v2VJo1TDHO&*2BU5%bCebc}g5)NFSb;M<t3+Zv
z7k1wUOu;IREOwRIhuJ2+CWOS-gvc0G_+~V=fEyJb?HV&$8|2ND?o<X@c{-|%&<-Iq
zbv!lCl813Aj^I)nWnW{+ge;9s;Y#qq17sy(r5$OX&=Jw{m{jZt;k1gBL=<eKgtMF*
zPWJpNC+Iy|^QganYScrcZo+wKPn8XC_rB~3!sFggU23@6_mh*0YPmJf_w=PzykdA8
zH*+Ce8gD%t_}I;9q^yO12H$g<va}Q)4}IY@O;cL;ho`zYt)xh;+Q@PjSCmM(^<lKq
F{}(k{g9ZQq

delta 517
zcmY*U$w~u35X~}@MK6gaE~s=C#Rw+dUEMP#r?^}Mg<QnTcu3+zhQyf=6Va347bp#W
zfnEd!8T<o3MXw(82dptFdU#E}SMOC-e{8*MT+S`_Pb|A?x9sA;c8iWnT!-u+HmxS%
zKqyqWsL=A&HW}UQx!s0)T0-+<dp4Afnm~EY<iJf%Wg>tSh{+knLikOo9zrGc7Al_u
zS<2-}kw|6~_6zZ)##!H5X}Sj%$)Zn37$#saJB%~-J%@3W0U;1F_ubW}kYRw+%uwMB
z30gT?Ij+tQ2NjS>gnmAaJ~o4A0t8H_n(*_nVc1#odr9nxg}}1!9`|=mU}dEIDxEU{
zXgZHCuEEa&z|Wyy3f{)`e+n*zzsdvvo-2O;CvcEZUc^-w;hcI3H&iD2K7Um2Hc7YM
zY}XI1727%P*E=23vyR*oq%Bn)NvZAFp1O_Q1$9-6ziMn%mtJ{vB%*<k;H@X0Lz)nj
nt9a^K6FSq?P3m3~hC#jE^lVTQWnp-O$x2X@9Hi$>RmVO7gVcwm

diff --git a/init.org b/init.org
index 7e971f5..b02d32f 100644
--- a/init.org
+++ b/init.org
@@ -26,7 +26,7 @@
        "If the current buffer is 'init.org' the code-blocks are
      tangled, and the tangled file is compiled."
        (when (equal (buffer-file-name)
-                    (concat user-emacs-directory "init.org"))
+                    (expand-file-name (concat user-emacs-directory "init.org")))
          (org-babel-tangle)
          (byte-compile-file (concat user-emacs-directory "init.el"))))
      
@@ -35,11 +35,12 @@
 
 ** Package
 
-   Managing extensions for Emacs is simplified using =package= which is
-   built in to Emacs 24 and newer. To load downloaded packages we need to
-   initialize =package=.
+   Managing extensions for Emacs is simplified using =package= which
+   is built in to Emacs 24 and newer. To load downloaded packages we
+   need to initialize =package=.
 
    #+BEGIN_SRC emacs-lisp :tangle yes
+     (require 'package)
      (package-initialize)
    #+END_SRC
 
@@ -51,7 +52,38 @@
                   '("MELPA" . "http://melpa.milkbox.net/packages/") t)
    #+END_SRC
 
-   Some packages I find useful are installed if missing.
+   We can define a predicate that tells us wither or not the newest version
+   of a package is installed.
+
+   #+BEGIN_SRC emacs-lisp :tangle yes
+     (defun newest-package-installed-p (package)
+       "Return true if the newest available PACKAGE is installed."
+       (when (package-installed-p package)
+         (let* ((local-pkg-desc (or (assq package package-alist)
+                                    (assq package package--builtins)))
+                (newest-pkg-desc (assq package package-archive-contents)))
+           (version-list-= (package-desc-vers (cdr local-pkg-desc))
+                           (package-desc-vers (cdr newest-pkg-desc))))))
+   #+END_SRC
+
+   Let's write a function to install the package if it is not installed or
+   upgrades it if a new version has been released. Here our predicate comes
+   in handy.
+
+   #+BEGIN_SRC emacs-lisp :tangle yes     
+     (defun upgrade-or-install-package (package)
+       "Unless the newest available version of PACKAGE is installed
+     PACKAGE is installed and the current version is deleted."
+       (unless (newest-package-installed-p package)
+         (let ((pkg-desc (assq package package-alist)))
+           (when pkg-desc
+             (package-delete package (package-desc-vers (cdr pkg-desc))))
+           (package-install package))))
+   #+END_SRC
+   
+   Now we can use the function above to make sure packages are installed and
+   up to date. Here are some packages I find useful (some of these
+   configurations are also dependent on them).
 
    #+BEGIN_SRC emacs-lisp :tangle yes
      (let ((packages
@@ -80,8 +112,9 @@
               )))
        ;; 'remove-if' is a part of the cl-library, so we require this feature.
        (require 'cl)
+       (package-refresh-contents)
        ;; Filter out installed packages and install the remaining.
-       (mapc 'package-install (remove-if 'package-installed-p packages)))
+       (mapc 'upgrade-or-install-package packages))
    #+END_SRC
 
 ** Require

From aa803a9bc6d9bac0b611019e4fd059432bb6a9b0 Mon Sep 17 00:00:00 2001
From: larstvei <larstvei@student.matnat.uio.no>
Date: Tue, 24 Dec 2013 02:18:45 +0100
Subject: [PATCH 2/2] Fix merge conflict

---
 init.elc | Bin 9459 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 init.elc

diff --git a/init.elc b/init.elc
deleted file mode 100644
index 82a5de90ac8fcf2b1ec1066ac9dcfd0ae0a69db0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9459
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
TG|}8?lSR`>X>RCRgCq5Sinf}Z