/[emacs]/emacs/lisp/textmodes/org.el
ViewVC logotype

Diff of /emacs/lisp/textmodes/org.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.20 by lute, Tue Jun 7 12:55:04 2005 UTC revision 1.21 by miles, Fri Jun 10 10:44:55 2005 UTC
# Line 1314  Otherwise, the buffer will just be saved Line 1314  Otherwise, the buffer will just be saved
1314    :tag "Org Faces"    :tag "Org Faces"
1315    :group 'org)    :group 'org)
1316    
1317  (defface org-level-1-face ;; font-lock-function-name-face  (defface org-level-1 ;; font-lock-function-name-face
1318    '((((type tty) (class color)) (:foreground "blue" :weight bold))    '((((type tty) (class color)) (:foreground "blue" :weight bold))
1319      (((class color) (background light)) (:foreground "Blue"))      (((class color) (background light)) (:foreground "Blue"))
1320      (((class color) (background dark)) (:foreground "LightSkyBlue"))      (((class color) (background dark)) (:foreground "LightSkyBlue"))
1321      (t (:inverse-video t :bold t)))      (t (:inverse-video t :bold t)))
1322    "Face used for level 1 headlines."    "Face used for level 1 headlines."
1323    :group 'org-faces)    :group 'org-faces)
1324    ;; backward-compatibility alias
1325    (put 'org-level-1-face 'face-alias 'org-level-1)
1326    
1327  (defface org-level-2-face ;; font-lock-variable-name-face  (defface org-level-2 ;; font-lock-variable-name-face
1328    '((((type tty) (class color)) (:foreground "yellow" :weight light))    '((((type tty) (class color)) (:foreground "yellow" :weight light))
1329      (((class color) (background light)) (:foreground "DarkGoldenrod"))      (((class color) (background light)) (:foreground "DarkGoldenrod"))
1330      (((class color) (background dark)) (:foreground "LightGoldenrod"))      (((class color) (background dark)) (:foreground "LightGoldenrod"))
1331      (t (:bold t :italic t)))      (t (:bold t :italic t)))
1332    "Face used for level 2 headlines."    "Face used for level 2 headlines."
1333    :group 'org-faces)    :group 'org-faces)
1334    ;; backward-compatibility alias
1335    (put 'org-level-2-face 'face-alias 'org-level-2)
1336    
1337  (defface org-level-3-face ;; font-lock-keyword-face  (defface org-level-3 ;; font-lock-keyword-face
1338    '((((type tty) (class color)) (:foreground "cyan" :weight bold))    '((((type tty) (class color)) (:foreground "cyan" :weight bold))
1339      (((class color) (background light)) (:foreground "Purple"))      (((class color) (background light)) (:foreground "Purple"))
1340      (((class color) (background dark)) (:foreground "Cyan"))      (((class color) (background dark)) (:foreground "Cyan"))
1341      (t (:bold t)))      (t (:bold t)))
1342    "Face used for level 3 headlines."    "Face used for level 3 headlines."
1343    :group 'org-faces)    :group 'org-faces)
1344    ;; backward-compatibility alias
1345    (put 'org-level-3-face 'face-alias 'org-level-3)
1346    
1347  (defface org-level-4-face   ;; font-lock-comment-face  (defface org-level-4 ;; font-lock-comment-face
1348    '((((type tty pc) (class color) (background light)) (:foreground "red"))    '((((type tty pc) (class color) (background light)) (:foreground "red"))
1349      (((type tty pc) (class color) (background dark)) (:foreground "red1"))      (((type tty pc) (class color) (background dark)) (:foreground "red1"))
1350      (((class color) (background light)) (:foreground "Firebrick"))      (((class color) (background light)) (:foreground "Firebrick"))
# Line 1346  Otherwise, the buffer will just be saved Line 1352  Otherwise, the buffer will just be saved
1352      (t (:bold t :italic t)))      (t (:bold t :italic t)))
1353    "Face used for level 4 headlines."    "Face used for level 4 headlines."
1354    :group 'org-faces)    :group 'org-faces)
1355    ;; backward-compatibility alias
1356    (put 'org-level-4-face 'face-alias 'org-level-4)
1357    
1358  (defface org-level-5-face ;; font-lock-type-face  (defface org-level-5 ;; font-lock-type-face
1359    '((((type tty) (class color)) (:foreground "green"))    '((((type tty) (class color)) (:foreground "green"))
1360      (((class color) (background light)) (:foreground "ForestGreen"))      (((class color) (background light)) (:foreground "ForestGreen"))
1361      (((class color) (background dark)) (:foreground "PaleGreen"))      (((class color) (background dark)) (:foreground "PaleGreen"))
1362      (t (:bold t :underline t)))      (t (:bold t :underline t)))
1363    "Face used for level 5 headlines."    "Face used for level 5 headlines."
1364    :group 'org-faces)    :group 'org-faces)
1365    ;; backward-compatibility alias
1366    (put 'org-level-5-face 'face-alias 'org-level-5)
1367    
1368  (defface org-level-6-face ;; font-lock-constant-face  (defface org-level-6 ;; font-lock-constant-face
1369    '((((type tty) (class color)) (:foreground "magenta"))    '((((type tty) (class color)) (:foreground "magenta"))
1370      (((class color) (background light)) (:foreground "CadetBlue"))      (((class color) (background light)) (:foreground "CadetBlue"))
1371      (((class color) (background dark)) (:foreground "Aquamarine"))      (((class color) (background dark)) (:foreground "Aquamarine"))
1372      (t (:bold t :underline t)))      (t (:bold t :underline t)))
1373    "Face used for level 6 headlines."    "Face used for level 6 headlines."
1374    :group 'org-faces)    :group 'org-faces)
1375    ;; backward-compatibility alias
1376    (put 'org-level-6-face 'face-alias 'org-level-6)
1377    
1378  (defface org-level-7-face ;; font-lock-builtin-face  (defface org-level-7 ;; font-lock-builtin-face
1379    '((((type tty) (class color)) (:foreground "blue" :weight light))    '((((type tty) (class color)) (:foreground "blue" :weight light))
1380      (((class color) (background light)) (:foreground "Orchid"))      (((class color) (background light)) (:foreground "Orchid"))
1381      (((class color) (background dark)) (:foreground "LightSteelBlue"))      (((class color) (background dark)) (:foreground "LightSteelBlue"))
1382      (t (:bold t)))      (t (:bold t)))
1383    "Face used for level 7 headlines."    "Face used for level 7 headlines."
1384    :group 'org-faces)    :group 'org-faces)
1385    ;; backward-compatibility alias
1386    (put 'org-level-7-face 'face-alias 'org-level-7)
1387    
1388  (defface org-level-8-face ;; font-lock-string-face  (defface org-level-8 ;; font-lock-string-face
1389    '((((type tty) (class color)) (:foreground "green"))    '((((type tty) (class color)) (:foreground "green"))
1390      (((class color) (background light)) (:foreground "RosyBrown"))      (((class color) (background light)) (:foreground "RosyBrown"))
1391      (((class color) (background dark)) (:foreground "LightSalmon"))      (((class color) (background dark)) (:foreground "LightSalmon"))
1392      (t (:italic t)))      (t (:italic t)))
1393    "Face used for level 8 headlines."    "Face used for level 8 headlines."
1394    :group 'org-faces)    :group 'org-faces)
1395    ;; backward-compatibility alias
1396    (put 'org-level-8-face 'face-alias 'org-level-8)
1397    
1398  (defface org-warning-face ;; font-lock-warning-face  (defface org-warning ;; font-lock-warning-face
1399    '((((type tty) (class color)) (:foreground "red"))    '((((type tty) (class color)) (:foreground "red"))
1400      (((class color) (background light)) (:foreground "Red" :bold t))      (((class color) (background light)) (:foreground "Red" :bold t))
1401      (((class color) (background dark)) (:foreground "Red1" :bold t))      (((class color) (background dark)) (:foreground "Red1" :bold t))
# Line 1387  Otherwise, the buffer will just be saved Line 1403  Otherwise, the buffer will just be saved
1403      (t (:inverse-video t :bold t)))      (t (:inverse-video t :bold t)))
1404    "Face for deadlines and TODO keywords."    "Face for deadlines and TODO keywords."
1405    :group 'org-faces)    :group 'org-faces)
1406    ;; backward-compatibility alias
1407    (put 'org-warning-face 'face-alias 'org-warning)
1408    
1409  (defcustom org-fontify-done-headline nil  (defcustom org-fontify-done-headline nil
1410    "Non-nil means, change the face of a headline if it is marked DONE.    "Non-nil means, change the face of a headline if it is marked DONE.
# Line 1396  When this is non-nil, the headline after Line 1414  When this is non-nil, the headline after
1414    :group 'org-faces    :group 'org-faces
1415    :type 'boolean)    :type 'boolean)
1416    
1417  (defface org-headline-done-face ;; font-lock-string-face  (defface org-headline-done ;; font-lock-string-face
1418    '((((type tty) (class color)) (:foreground "green"))    '((((type tty) (class color)) (:foreground "green"))
1419      (((class color) (background light)) (:foreground "RosyBrown"))      (((class color) (background light)) (:foreground "RosyBrown"))
1420      (((class color) (background dark)) (:foreground "LightSalmon"))      (((class color) (background dark)) (:foreground "LightSalmon"))
# Line 1404  When this is non-nil, the headline after Line 1422  When this is non-nil, the headline after
1422    "Face used to indicate that a headline is DONE.  See also the variable    "Face used to indicate that a headline is DONE.  See also the variable
1423  `org-fontify-done-headline'."  `org-fontify-done-headline'."
1424    :group 'org-faces)    :group 'org-faces)
1425    ;; backward-compatibility alias
1426    (put 'org-headline-done-face 'face-alias 'org-headline-done)
1427    
1428  ;; Inheritance does not yet work for xemacs. So we just copy...  ;; Inheritance does not yet work for xemacs. So we just copy...
1429    
1430  (defface org-deadline-announce-face  (defface org-deadline-announce
1431    '((((type tty) (class color)) (:foreground "blue" :weight bold))    '((((type tty) (class color)) (:foreground "blue" :weight bold))
1432      (((class color) (background light)) (:foreground "Blue"))      (((class color) (background light)) (:foreground "Blue"))
1433      (((class color) (background dark)) (:foreground "LightSkyBlue"))      (((class color) (background dark)) (:foreground "LightSkyBlue"))
1434      (t (:inverse-video t :bold t)))      (t (:inverse-video t :bold t)))
1435    "Face for upcoming deadlines."    "Face for upcoming deadlines."
1436    :group 'org-faces)    :group 'org-faces)
1437    ;; backward-compatibility alias
1438    (put 'org-deadline-announce-face 'face-alias 'org-deadline-announce)
1439    
1440  (defface org-scheduled-today-face  (defface org-scheduled-today
1441    '((((type tty) (class color)) (:foreground "green"))    '((((type tty) (class color)) (:foreground "green"))
1442      (((class color) (background light)) (:foreground "DarkGreen"))      (((class color) (background light)) (:foreground "DarkGreen"))
1443      (((class color) (background dark)) (:foreground "PaleGreen"))      (((class color) (background dark)) (:foreground "PaleGreen"))
1444      (t (:bold t :underline t)))      (t (:bold t :underline t)))
1445    "Face for items scheduled for a certain day."    "Face for items scheduled for a certain day."
1446    :group 'org-faces)    :group 'org-faces)
1447    ;; backward-compatibility alias
1448    (put 'org-scheduled-today-face 'face-alias 'org-scheduled-today)
1449    
1450  (defface org-scheduled-previously-face  (defface org-scheduled-previously
1451    '((((type tty pc) (class color) (background light)) (:foreground "red"))    '((((type tty pc) (class color) (background light)) (:foreground "red"))
1452      (((type tty pc) (class color) (background dark)) (:foreground "red1"))      (((type tty pc) (class color) (background dark)) (:foreground "red1"))
1453      (((class color) (background light)) (:foreground "Firebrick"))      (((class color) (background light)) (:foreground "Firebrick"))
# Line 1431  When this is non-nil, the headline after Line 1455  When this is non-nil, the headline after
1455      (t (:bold t :italic t)))      (t (:bold t :italic t)))
1456    "Face for items scheduled previously, and not yet done."    "Face for items scheduled previously, and not yet done."
1457    :group 'org-faces)    :group 'org-faces)
1458    ;; backward-compatibility alias
1459    (put 'org-scheduled-previously-face 'face-alias 'org-scheduled-previously)
1460    
1461  (defface org-link-face  (defface org-link
1462    '((((type tty) (class color)) (:foreground "cyan" :weight bold))    '((((type tty) (class color)) (:foreground "cyan" :weight bold))
1463      (((class color) (background light)) (:foreground "Purple"))      (((class color) (background light)) (:foreground "Purple"))
1464      (((class color) (background dark)) (:foreground "Cyan"))      (((class color) (background dark)) (:foreground "Cyan"))
1465      (t (:bold t)))      (t (:bold t)))
1466    "Face for links."    "Face for links."
1467    :group 'org-faces)    :group 'org-faces)
1468    ;; backward-compatibility alias
1469    (put 'org-link-face 'face-alias 'org-link)
1470    
1471  (defface org-done-face ;; font-lock-type-face  (defface org-done ;; font-lock-type-face
1472    '((((type tty) (class color)) (:foreground "green"))    '((((type tty) (class color)) (:foreground "green"))
1473      (((class color) (background light)) (:foreground "ForestGreen" :bold t))      (((class color) (background light)) (:foreground "ForestGreen" :bold t))
1474      (((class color) (background dark)) (:foreground "PaleGreen" :bold t))      (((class color) (background dark)) (:foreground "PaleGreen" :bold t))
1475      (t (:bold t :underline t)))      (t (:bold t :underline t)))
1476    "Face used for DONE."    "Face used for DONE."
1477    :group 'org-faces)    :group 'org-faces)
1478    ;; backward-compatibility alias
1479    (put 'org-done-face 'face-alias 'org-done)
1480    
1481  (defface org-table-face ;; font-lock-function-name-face  (defface org-table ;; font-lock-function-name-face
1482    '((((type tty) (class color)) (:foreground "blue" :weight bold))    '((((type tty) (class color)) (:foreground "blue" :weight bold))
1483      (((class color) (background light)) (:foreground "Blue"))      (((class color) (background light)) (:foreground "Blue"))
1484      (((class color) (background dark)) (:foreground "LightSkyBlue"))      (((class color) (background dark)) (:foreground "LightSkyBlue"))
1485      (t (:inverse-video t :bold t)))      (t (:inverse-video t :bold t)))
1486    "Face used for tables."    "Face used for tables."
1487    :group 'org-faces)    :group 'org-faces)
1488    ;; backward-compatibility alias
1489    (put 'org-table-face 'face-alias 'org-table)
1490    
1491  (defface org-time-grid-face ;; font-lock-variable-name-face  (defface org-time-grid ;; font-lock-variable-name-face
1492    '((((type tty) (class color)) (:foreground "yellow" :weight light))    '((((type tty) (class color)) (:foreground "yellow" :weight light))
1493      (((class color) (background light)) (:foreground "DarkGoldenrod"))      (((class color) (background light)) (:foreground "DarkGoldenrod"))
1494      (((class color) (background dark)) (:foreground "LightGoldenrod"))      (((class color) (background dark)) (:foreground "LightGoldenrod"))
1495      (t (:bold t :italic t)))      (t (:bold t :italic t)))
1496    "Face used for level 2 headlines."    "Face used for level 2 headlines."
1497    :group 'org-faces)    :group 'org-faces)
1498    ;; backward-compatibility alias
1499    (put 'org-time-grid-face 'face-alias 'org-time-grid)
1500    
1501  (defvar org-level-faces  (defvar org-level-faces
1502    '(    '(
1503      org-level-1-face      org-level-1
1504      org-level-2-face      org-level-2
1505      org-level-3-face      org-level-3
1506      org-level-4-face      org-level-4
1507      org-level-5-face      org-level-5
1508      org-level-6-face      org-level-6
1509      org-level-7-face      org-level-7
1510      org-level-8-face      org-level-8
1511      ))      ))
1512  (defvar org-n-levels (length org-level-faces))  (defvar org-n-levels (length org-level-faces))
1513    
# Line 1654  The following commands are available: Line 1688  The following commands are available:
1688  (defun org-set-font-lock-defaults ()  (defun org-set-font-lock-defaults ()
1689    (let ((org-font-lock-extra-keywords    (let ((org-font-lock-extra-keywords
1690           (list           (list
1691            '(org-activate-links (0 'org-link-face))            '(org-activate-links (0 'org-link))
1692            '(org-activate-dates (0 'org-link-face))            '(org-activate-dates (0 'org-link))
1693            (list (concat "^\\*+[ \t]*" org-not-done-regexp)            (list (concat "^\\*+[ \t]*" org-not-done-regexp)
1694                  '(1 'org-warning-face t))                  '(1 'org-warning t))
1695            (list (concat "\\[#[A-Z]\\]") '(0 'org-warning-face t))            (list (concat "\\[#[A-Z]\\]") '(0 'org-warning t))
1696            (list (concat "\\<" org-deadline-string) '(0 'org-warning-face t))            (list (concat "\\<" org-deadline-string) '(0 'org-warning t))
1697            (list (concat "\\<" org-scheduled-string) '(0 'org-warning-face t))            (list (concat "\\<" org-scheduled-string) '(0 'org-warning t))
1698            ;; '("\\(\\s-\\|^\\)\\(\\*\\([a-zA-Z]+\\)\\*\\)\\([^a-zA-Z*]\\|$\\)"            ;; '("\\(\\s-\\|^\\)\\(\\*\\([a-zA-Z]+\\)\\*\\)\\([^a-zA-Z*]\\|$\\)"
1699            ;; (3 'bold))            ;; (3 'bold))
1700            ;; '("\\(\\s-\\|^\\)\\(/\\([a-zA-Z]+\\)/\\)\\([^a-zA-Z*]\\|$\\)"            ;; '("\\(\\s-\\|^\\)\\(/\\([a-zA-Z]+\\)/\\)\\([^a-zA-Z*]\\|$\\)"
1701            ;; (3 'italic))            ;; (3 'italic))
1702            ;; '("\\(\\s-\\|^\\)\\(_\\([a-zA-Z]+\\)_\\)\\([^a-zA-Z*]\\|$\\)"            ;; '("\\(\\s-\\|^\\)\\(_\\([a-zA-Z]+\\)_\\)\\([^a-zA-Z*]\\|$\\)"
1703            ;; (3 'underline))            ;; (3 'underline))
1704            '("\\<FIXME\\>" (0 'org-warning-face t))            '("\\<FIXME\\>" (0 'org-warning t))
1705            (list (concat "^\\*+[ \t]*\\<\\(" org-comment-string "\\)\\>")            (list (concat "^\\*+[ \t]*\\<\\(" org-comment-string "\\)\\>")
1706                  '(1 'org-warning-face t))                  '(1 'org-warning t))
1707            '("^#.*" (0 'font-lock-comment-face t))            '("^#.*" (0 font-lock-comment-face t))
1708            (if org-fontify-done-headline            (if org-fontify-done-headline
1709                (list (concat "^[*]+ +\\<\\(" org-done-string "\\)\\(.*\\)\\>")                (list (concat "^[*]+ +\\<\\(" org-done-string "\\)\\(.*\\)\\>")
1710                      '(1 'org-done-face t) '(2 'org-headline-done-face t))                      '(1 'org-done t) '(2 'org-headline-done t))
1711              (list (concat "^[*]+ +\\<\\(" org-done-string "\\)\\>")              (list (concat "^[*]+ +\\<\\(" org-done-string "\\)\\>")
1712                    '(1 'org-done-face t)))                    '(1 'org-done t)))
1713            '("^[ \t]*\\(\\(|\\|\\+-[-+]\\).*\\S-\\)"            '("^[ \t]*\\(\\(|\\|\\+-[-+]\\).*\\S-\\)"
1714              (1 'org-table-face t))              (1 'org-table t))
1715            '("^[ \t]*\\(:.*\\)" (1 'org-table-face t)))))            '("^[ \t]*\\(:.*\\)" (1 'org-table t)))))
1716      (set (make-local-variable 'org-font-lock-keywords)      (set (make-local-variable 'org-font-lock-keywords)
1717           (append           (append
1718            (if org-noutline-p     ; FIXME:  I am not sure if eval will work            (if org-noutline-p     ; FIXME:  I am not sure if eval will work
# Line 3339  dates." Line 3373  dates."
3373                      (number-to-string (extract-calendar-day date)) " "                      (number-to-string (extract-calendar-day date)) " "
3374                      (calendar-month-name (extract-calendar-month date)) " "                      (calendar-month-name (extract-calendar-month date)) " "
3375                      (number-to-string (extract-calendar-year date)) "\n")                      (number-to-string (extract-calendar-year date)) "\n")
3376              (put-text-property s (1- (point)) 'face              (put-text-property s (1- (point)) 'face 'org-link)
                                'org-link-face)  
3377              (if (equal d today)              (if (equal d today)
3378                  (put-text-property s (1- (point)) 'org-today t))                  (put-text-property s (1- (point)) 'org-today t))
3379              (insert (org-finalize-agenda-entries rtn) "\n")              (insert (org-finalize-agenda-entries rtn) "\n")
# Line 3419  NDAYS defaults to `org-agenda-ndays'." Line 3452  NDAYS defaults to `org-agenda-ndays'."
3452        (when rtnall        (when rtnall
3453          (insert "ALL CURRENTLY OPEN TODO ITEMS:\n")          (insert "ALL CURRENTLY OPEN TODO ITEMS:\n")
3454          (add-text-properties (point-min) (1- (point))          (add-text-properties (point-min) (1- (point))
3455                               (list 'face 'org-link-face))                               (list 'face 'org-link))
3456          (insert (org-finalize-agenda-entries rtnall) "\n")))          (insert (org-finalize-agenda-entries rtnall) "\n")))
3457      (while (setq d (pop day-numbers))      (while (setq d (pop day-numbers))
3458        (setq date (calendar-gregorian-from-absolute d)        (setq date (calendar-gregorian-from-absolute d)
# Line 3448  NDAYS defaults to `org-agenda-ndays'." Line 3481  NDAYS defaults to `org-agenda-ndays'."
3481                              (extract-calendar-day date)                              (extract-calendar-day date)
3482                              (calendar-month-name (extract-calendar-month date))                              (calendar-month-name (extract-calendar-month date))
3483                              (extract-calendar-year date)))                              (extract-calendar-year date)))
3484              (put-text-property s (1- (point)) 'face              (put-text-property s (1- (point)) 'face 'org-link)
                                'org-link-face)  
3485              (if rtnall (insert              (if rtnall (insert
3486                          (org-finalize-agenda-entries ;; FIXME: condition needed                          (org-finalize-agenda-entries ;; FIXME: condition needed
3487                           (org-agenda-add-time-grid-maybe                           (org-agenda-add-time-grid-maybe
# Line 3936  the documentation of `org-diary'." Line 3968  the documentation of `org-diary'."
3968  (defun org-agenda-get-todos ()  (defun org-agenda-get-todos ()
3969    "Return the TODO information for agenda display."    "Return the TODO information for agenda display."
3970    (let* ((props (list 'face nil    (let* ((props (list 'face nil
3971                        'done-face 'org-done-face                        'done-face 'org-done
3972                        'mouse-face 'highlight                        'mouse-face 'highlight
3973                        'keymap org-agenda-keymap                        'keymap org-agenda-keymap
3974                        'help-echo                        'help-echo
# Line 4023  the documentation of `org-diary'." Line 4055  the documentation of `org-diary'."
4055                (if deadlinep                (if deadlinep
4056                    (add-text-properties                    (add-text-properties
4057                     0 (length txt)                     0 (length txt)
4058                     (list 'face                     (list 'face (if donep 'org-done 'org-warning)
4059                           (if donep 'org-done-face 'org-warning-face)                           'undone-face 'org-warning
4060                           'undone-face 'org-warning-face                           'done-face 'org-done
                          'done-face 'org-done-face  
4061                           'priority (+ 100 priority))                           'priority (+ 100 priority))
4062                     txt)                     txt)
4063                  (if scheduledp                  (if scheduledp
4064                      (add-text-properties                      (add-text-properties
4065                       0 (length txt)                       0 (length txt)
4066                       (list 'face 'org-scheduled-today-face                       (list 'face 'org-scheduled-today
4067                             'undone-face 'org-scheduled-today-face                             'undone-face 'org-scheduled-today
4068                             'done-face 'org-done-face                             'done-face 'org-done
4069                             priority (+ 99 priority))                             priority (+ 99 priority))
4070                       txt)                       txt)
4071                    (add-text-properties                    (add-text-properties
# Line 4088  the documentation of `org-diary'." Line 4119  the documentation of `org-diary'."
4119                  (list 'org-marker (org-agenda-new-marker pos)                  (list 'org-marker (org-agenda-new-marker pos)
4120                        'org-hd-marker (org-agenda-new-marker pos1)                        'org-hd-marker (org-agenda-new-marker pos1)
4121                        'priority (+ (- 10 diff) (org-get-priority txt))                        'priority (+ (- 10 diff) (org-get-priority txt))
4122                        'face (cond ((<= diff 0) 'org-warning-face)                        'face (cond ((<= diff 0) 'org-warning)
4123                                    ((<= diff 5) 'org-scheduled-previously-face)                                    ((<= diff 5) 'org-scheduled-previously)
4124                                    (t nil))                                    (t nil))
4125                        'undone-face (cond                        'undone-face (cond
4126                                      ((<= diff 0) 'org-warning-face)                                      ((<= diff 0) 'org-warning)
4127                                      ((<= diff 5) 'org-scheduled-previously-face)                                      ((<= diff 5) 'org-scheduled-previously)
4128                                      (t nil))                                      (t nil))
4129                        'done-face 'org-done-face)                        'done-face 'org-done)
4130                  props)                  props)
4131                 txt)                 txt)
4132                (push txt ee)))))                (push txt ee)))))
# Line 4103  the documentation of `org-diary'." Line 4134  the documentation of `org-diary'."
4134    
4135  (defun org-agenda-get-scheduled ()  (defun org-agenda-get-scheduled ()
4136    "Return the scheduled information for agenda display."    "Return the scheduled information for agenda display."
4137    (let* ((props (list 'face 'org-scheduled-previously-face    (let* ((props (list 'face 'org-scheduled-previously
4138                        'undone-face 'org-scheduled-previously-face                        'undone-face 'org-scheduled-previously
4139                        'done-face 'org-done-face                        'done-face 'org-done
4140                        'mouse-face 'highlight                        'mouse-face 'highlight
4141                        'keymap org-agenda-keymap                        'keymap org-agenda-keymap
4142                        'help-echo                        'help-echo
# Line 4319  only the correctly processes TXT should Line 4350  only the correctly processes TXT should
4350                   (concat (substring time 0 -2) ":" (substring time -2)))                   (concat (substring time 0 -2) ":" (substring time -2)))
4351                  new)                  new)
4352            (put-text-property            (put-text-property
4353             1 (length (car new)) 'face 'org-time-grid-face (car new))))             1 (length (car new)) 'face 'org-time-grid (car new))))
4354        (if (member 'time-up org-agenda-sorting-strategy)        (if (member 'time-up org-agenda-sorting-strategy)
4355            (append new list)            (append new list)
4356          (append list new)))))          (append list new)))))
# Line 8210  When LEVEL is non-nil, increase section Line 8241  When LEVEL is non-nil, increase section
8241    
8242  (defsubst org-table-p ()  (defsubst org-table-p ()
8243    (if (and (eq major-mode 'org-mode) font-lock-mode)    (if (and (eq major-mode 'org-mode) font-lock-mode)
8244        (eq (get-text-property (point) 'face) 'org-table-face)        (eq (get-text-property (point) 'face) 'org-table)
8245      (save-match-data (org-at-table-p))))      (save-match-data (org-at-table-p))))
8246    
8247  (defun org-self-insert-command (N)  (defun org-self-insert-command (N)

Legend:
Removed from v.1.20  
changed lines
  Added in v.1.21

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26