瀏覽代碼

Allow installation prefix to be set on the command line.

Patch from Peter Jones.
Carsten Dominik 17 年之前
父節點
當前提交
2ea87b7883
共有 4 個文件被更改,包括 12 次插入3 次删除
  1. 3 0
      ChangeLog
  2. 1 1
      Makefile
  3. 4 0
      lisp/ChangeLog
  4. 4 2
      lisp/org-agenda.el

+ 3 - 0
ChangeLog

@@ -1,3 +1,6 @@
+2008-06-09  Carsten Dominik  <dominik@science.uva.nl>
+
+	* Makefile: Allow prefix to be set on the command line.
 
 2008-04-25  Carsten Dominik  <dominik@science.uva.nl>
 

+ 1 - 1
Makefile

@@ -14,7 +14,7 @@
 EMACS=emacs
 
 # Where local software is found
-prefix=/usr/local
+prefix?=/usr/local
 
 # Where local lisp files go.
 lispdir = $(prefix)/share/emacs/site-lisp

+ 4 - 0
lisp/ChangeLog

@@ -1,3 +1,7 @@
+2008-06-08  Carsten Dominik  <dominik@science.uva.nl>
+
+	* org-agenda.el (org-agenda-scheduled-leaders): Fix docstring.
+
 2008-05-30  Carsten Dominik  <dominik@science.uva.nl>
 
 	* org.el (org-columns-ellipses): New option.

+ 4 - 2
lisp/org-agenda.el

@@ -848,8 +848,10 @@ to occupy a fixed space in the agenda display."
   "Text preceeding scheduled items in the agenda view.
 This is a list with two strings.  The first applies when the item is
 scheduled on the current day.  The second applies when it has been scheduled
-previously, it may contain a %d to capture how many days ago the item was
-scheduled."
+previously, it may contain a %d indicating that this is the nth time that
+this item is scheduled, due to automatic rescheduling of unfinished items
+for the following day.  So this number is one larger than the number of days
+that passed since this item was scheduled first."
   :group 'org-agenda-line-format
   :type '(list
 	  (string :tag "Scheduled today     ")