Update.

diff --git a/emacs.el b/emacs.el
index 5d30a6e..96874b0 100644 (file)
--- a/emacs.el
+++ b/emacs.el
@@ -36,7 +36,7 @@
 ;; Xft.antialias: true
 ;; Xft.rgba: rgb
 
-(set-frame-font "Inconsolata 14")
+;;(set-frame-font "Inconsolata 14")
 
 ;; (package-initialize)
 
@@ -63,8 +63,8 @@
 
 ;; Where I keep my own scripts
 
-(add-to-list 'load-path "~/sources/gpl/elisp")
-(add-to-list 'load-path "~/sources/elisp")
+(add-to-list 'load-path "~/src/gpl/elisp")
+(add-to-list 'load-path "~/src/elisp")
 (add-to-list 'load-path "~/local/elisp")
 
 ;; No, I do not like menus
@@ -1173,9 +1173,9 @@ of commands in `ff/default-bash-commands' is used for auto-completion"
 (when (ff/load-or-alert "alarm-vc" t)
   (setq alarm-vc-mode-exceptions "^VM"))
 
-(when (ff/load-or-alert "git")
-  (setq git-show-unknown nil)
-  )
+;; (when (ff/load-or-alert "git")
+  ;; (setq git-show-unknown nil)
+  ;; )
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Makes .sh and others files executable automagically
@@ -1619,6 +1619,7 @@ universal argument starts xfig even if the .fig does not exist"
 \\usepackage{tikz}
 \\usepackage[round]{natbib}
 \\usepackage{cmbright}
+%\\usepackage{showframe}
 
 \\setlength{\\parindent}{0cm}
 \\setlength{\\parskip}{12pt}
@@ -1931,7 +1932,7 @@ and refilling all the paragraphs."
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\\begin{frame}{")
+\\begin{frame}[fragile]{")
         (save-excursion (insert "}{}
 
 "))
@@ -1939,7 +1940,7 @@ and refilling all the paragraphs."
 
     (insert "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\\begin{frame}{")
+\\begin{frame}[fragile]{")
 
     (save-excursion (insert "}{}
 
@@ -2746,7 +2747,8 @@ with a time tag, and save this file"
          ;; (insert (format-time-string "%d.%m.%Y" (current-time))))
        )
 
-(define-key ff/map [(control g)] 'ff/git-status)
+(define-key ff/map [(control g)] 'magit)
+;;(define-key ff/map [(control g)] 'ff/git-status)
 ;; (define-key ff/map [(control w)] 'server-edit)
 (define-key ff/map [(control d)] 'ff/elisp-debug-on)
 ;; (define-key ff/map "d" 'diary)