Merge branch 'master' of ssh://repo.or.cz/srv/git/org-mode

This commit is contained in:
Bastien Guerry 2010-02-25 16:06:04 +01:00
commit 355eb8f705
3 changed files with 7 additions and 1 deletions

View File

@ -1,3 +1,8 @@
2010-02-25 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-set-mode-name): Show if the agenda is
restricted, as an agenda mode.
2010-02-25 Bastien Guerry <bzg@altern.org>
* org-timer.el (org-timer-current-timer): Renamed from

View File

@ -5865,6 +5865,7 @@ When called with a prefix argument, include all archive files as well."
"Set the mode name to indicate all the small mode settings."
(setq mode-name
(concat "Org-Agenda"
(if (get 'org-agenda-files 'org-restrict) " []" "")
(if (equal org-agenda-ndays 1) " Day" "")
(if (equal org-agenda-ndays 7) " Week" "")
(if org-agenda-follow-mode " Follow" "")

View File

@ -137,7 +137,7 @@ not be modified."
dt { font-weight: bold; }
div.figure { padding: 0.5em; }
div.figure p { text-align: center; }
textarea { overflow-x: scroll; }
textarea { overflow-x: auto; }
.linenr { font-size:smaller }
.code-highlighted {background-color:#ffff00;}
.org-info-js_info-navigation { border-style:none; }