projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
23a761d
)
.
author
Joerg Jaspert
<joerg@debian.org>
Tue, 10 Jun 2014 20:57:15 +0000
(22:57 +0200)
committer
Joerg Jaspert
<joerg@debian.org>
Tue, 10 Jun 2014 20:57:15 +0000
(22:57 +0200)
.emacs.d/config/emacs.org
patch
|
blob
|
history
diff --git
a/.emacs.d/config/emacs.org
b/.emacs.d/config/emacs.org
index
499de7f
..
2c903b6
100644
(file)
--- a/
.emacs.d/config/emacs.org
+++ b/
.emacs.d/config/emacs.org
@@
-1455,7
+1455,7
@@
Bookmark: [[http://www.emacswiki.org/emacs/EasyPG][EmacsWiki: Easy PG]]
** ediff
[2013-04-21 So 20:36]
ediff - don't start another frame
-#+BEGIN_SRC e
lisp
+#+BEGIN_SRC e
macs-lisp :tangle yes
(use-package ediff
:pre-init
(progn