aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/textmodes/org.el20
1 files changed, 13 insertions, 7 deletions
diff --git a/lisp/textmodes/org.el b/lisp/textmodes/org.el
index 3c77560a9cc..db6c5611c2d 100644
--- a/lisp/textmodes/org.el
+++ b/lisp/textmodes/org.el
@@ -5,7 +5,7 @@
5;; Author: Carsten Dominik <dominik at science dot uva dot nl> 5;; Author: Carsten Dominik <dominik at science dot uva dot nl>
6;; Keywords: outlines, hypermedia, calendar, wp 6;; Keywords: outlines, hypermedia, calendar, wp
7;; Homepage: http://www.astro.uva.nl/~dominik/Tools/org/ 7;; Homepage: http://www.astro.uva.nl/~dominik/Tools/org/
8;; Version: 4.09 8;; Version: 4.10
9;; 9;;
10;; This file is part of GNU Emacs. 10;; This file is part of GNU Emacs.
11;; 11;;
@@ -81,6 +81,9 @@
81;; 81;;
82;; Changes since version 4.00: 82;; Changes since version 4.00:
83;; --------------------------- 83;; ---------------------------
84;; Version 4.10
85;; - Bug fixes.
86;;
84;; Version 4.09 87;; Version 4.09
85;; - Bug fixes. 88;; - Bug fixes.
86;; - Small improvements to font-lock support. 89;; - Small improvements to font-lock support.
@@ -145,7 +148,7 @@
145 148
146;;; Customization variables 149;;; Customization variables
147 150
148(defvar org-version "4.09" 151(defvar org-version "4.10"
149 "The version number of the file org.el.") 152 "The version number of the file org.el.")
150(defun org-version () 153(defun org-version ()
151 (interactive) 154 (interactive)
@@ -1739,10 +1742,11 @@ Changing this variable requires a restart of Emacs to take effect."
1739 :type 'boolean) 1742 :type 'boolean)
1740 1743
1741(defface org-hide 1744(defface org-hide
1742 '((((type tty) (class color)) (:foreground "blue" :weight bold)) 1745 '(
1746 (((type tty) (class color)) (:foreground "white"))
1743 (((class color) (background light)) (:foreground "white")) 1747 (((class color) (background light)) (:foreground "white"))
1744 (((class color) (background dark)) (:foreground "black")) 1748 (((class color) (background dark)) (:foreground "black"))
1745; (((class color) (background light)) (:foreground "grey90")) 1749; (((class color) (backgro6und light)) (:foreground "grey90"))
1746; (((class color) (background dark)) (:foreground "grey10")) 1750; (((class color) (background dark)) (:foreground "grey10"))
1747 (t (:inverse-video nil))) 1751 (t (:inverse-video nil)))
1748 "Face used for level 1 headlines." 1752 "Face used for level 1 headlines."
@@ -2589,6 +2593,7 @@ Optional argument N means, put the headline into the Nth line of the window."
2589(define-key org-goto-map [(?q)] 'org-goto-quit) 2593(define-key org-goto-map [(?q)] 'org-goto-quit)
2590(define-key org-goto-map [(control ?g)] 'org-goto-quit) 2594(define-key org-goto-map [(control ?g)] 'org-goto-quit)
2591(define-key org-goto-map "\C-i" 'org-cycle) 2595(define-key org-goto-map "\C-i" 'org-cycle)
2596(define-key org-goto-map [(tab)] 'org-cycle)
2592(define-key org-goto-map [(down)] 'outline-next-visible-heading) 2597(define-key org-goto-map [(down)] 'outline-next-visible-heading)
2593(define-key org-goto-map [(up)] 'outline-previous-visible-heading) 2598(define-key org-goto-map [(up)] 'outline-previous-visible-heading)
2594(define-key org-goto-map "n" 'outline-next-visible-heading) 2599(define-key org-goto-map "n" 'outline-next-visible-heading)
@@ -4377,6 +4382,7 @@ The following commands are available:
4377 (list 'org-agenda-mode-hook))) 4382 (list 'org-agenda-mode-hook)))
4378 4383
4379(define-key org-agenda-mode-map "\C-i" 'org-agenda-goto) 4384(define-key org-agenda-mode-map "\C-i" 'org-agenda-goto)
4385(define-key org-agenda-mode-map [(tab)] 'org-agenda-goto)
4380(define-key org-agenda-mode-map "\C-m" 'org-agenda-switch-to) 4386(define-key org-agenda-mode-map "\C-m" 'org-agenda-switch-to)
4381(define-key org-agenda-mode-map " " 'org-agenda-show) 4387(define-key org-agenda-mode-map " " 'org-agenda-show)
4382(define-key org-agenda-mode-map "\C-c\C-t" 'org-agenda-todo) 4388(define-key org-agenda-mode-map "\C-c\C-t" 'org-agenda-todo)
@@ -10801,11 +10807,11 @@ underlined headlines. The default is 3."
10801 10807
10802(defun org-insert-centered (s &optional underline) 10808(defun org-insert-centered (s &optional underline)
10803 "Insert the string S centered and underline it with character UNDERLINE." 10809 "Insert the string S centered and underline it with character UNDERLINE."
10804 (let ((ind (max (/ (- 80 (length s)) 2) 0))) 10810 (let ((ind (max (/ (- 80 (string-width s)) 2) 0)))
10805 (insert (make-string ind ?\ ) s "\n") 10811 (insert (make-string ind ?\ ) s "\n")
10806 (if underline 10812 (if underline
10807 (insert (make-string ind ?\ ) 10813 (insert (make-string ind ?\ )
10808 (make-string (length s) underline) 10814 (make-string (string-width s) underline)
10809 "\n")))) 10815 "\n"))))
10810 10816
10811(defun org-ascii-level-start (level title umax) 10817(defun org-ascii-level-start (level title umax)
@@ -11915,6 +11921,7 @@ a time), or the day by one (if it does not contain a time)."
11915 11921
11916;; TAB key with modifiers 11922;; TAB key with modifiers
11917(define-key org-mode-map "\C-i" 'org-cycle) 11923(define-key org-mode-map "\C-i" 'org-cycle)
11924(define-key org-mode-map [(tab)] 'org-cycle)
11918(define-key org-mode-map [(meta tab)] 'org-complete) 11925(define-key org-mode-map [(meta tab)] 'org-complete)
11919(define-key org-mode-map "\M-\C-i" 'org-complete) ; for tty emacs 11926(define-key org-mode-map "\M-\C-i" 'org-complete) ; for tty emacs
11920;; The following line is necessary under Suse GNU/Linux 11927;; The following line is necessary under Suse GNU/Linux
@@ -12925,4 +12932,3 @@ Show the heading too, if it is currently invisible."
12925 12932
12926;; arch-tag: e77da1a7-acc7-4336-b19e-efa25af3f9fd 12933;; arch-tag: e77da1a7-acc7-4336-b19e-efa25af3f9fd
12927;;; org.el ends here 12934;;; org.el ends here
12928