Merge branch 'maint'

Conflicts:
	contrib/scripts/x11idle.c
This commit is contained in:
Bastien Guerry 2012-09-03 13:01:13 +02:00
commit 7b89f1a466
1 changed files with 1 additions and 1 deletions

View File

@ -69,7 +69,7 @@
((get a 'custom-type) (setq opts (cons a opts)))
((fboundp a) (setq funcs (cons a funcs)))
(t (setq vars (cons a vars)))))))
(find-file (or eldo-file (read-file-name "File: ")))
(find-file (or eldo-file (read-file-name "Write to file: ")))
(org-mode)
(eldo-write-hooks hks)
(eldo-write-commands cmds)