ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Conflicts:
	lisp/ChangeLog
	lisp/org-exp.el
	lisp/org.el
This commit is contained in:
Carsten Dominik 2009-08-02 23:50:13 +02:00
parent eac9708097 47994f66d2
commit 7cb52cfb7e
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lisp/ChangeLog
View File

@ -105,6 +105,13 @@
* org-macs.el (org-unmodified): Turn of modification hooks while * org-macs.el (org-unmodified): Turn of modification hooks while
running this macro. running this macro.
2009-08-02 Bastien Guerry <bzg@altern.org>
* org.el (org-adapt-indentation): Slightly improve the docstring.
(org-occur): Sends an error when the user inputs an empty string.
(org-priority): Bugfix: the tag alignement should happen within
save-excursion.
2009-07-31 Bastien Guerry <bzg@altern.org> 2009-07-31 Bastien Guerry <bzg@altern.org>
* org.el (org-make-link-regexps): Don't exclude parentheses from * org.el (org-make-link-regexps): Don't exclude parentheses from

3
lisp/org-exp.el
View File

@ -2504,8 +2504,7 @@ directory."
(or pub-dir (or pub-dir
(org-export-directory :org opt-plist))) (org-export-directory :org opt-plist)))
(file-name-sans-extension (file-name-sans-extension
(file-name-nondirectory bfname)) (file-name-nondirectory bfname))))
".org"))
(filename (and filename (filename (and filename
(if (equal (file-truename filename) (if (equal (file-truename filename)
(file-truename bfname)) (file-truename bfname))

9
lisp/org.el
View File

@ -693,7 +693,7 @@ The following issues are influenced by this variable:
- When this is set and the *entire* text in an entry is indented, the - When this is set and the *entire* text in an entry is indented, the
indentation is increased by one space in a demotion command, and indentation is increased by one space in a demotion command, and
decreased by one in a promotion command. If any line in the entry decreased by one in a promotion command. If any line in the entry
body starts at column 0, indentation is not changed at all. body starts with text at column 0, indentation is not changed at all.
- Property drawers and planning information is inserted indented when - Property drawers and planning information is inserted indented when
this variable s set. When nil, they will not be indented. this variable s set. When nil, they will not be indented.
@ -10207,6 +10207,8 @@ command.
If CALLBACK is non-nil, it is a function which is called to confirm If CALLBACK is non-nil, it is a function which is called to confirm
that the match should indeed be shown." that the match should indeed be shown."
(interactive "sRegexp: \nP") (interactive "sRegexp: \nP")
(when (equal regexp "")
(error "Regexp cannot be empty"))
(unless keep-previous (unless keep-previous
(org-remove-occur-highlights nil nil t)) (org-remove-occur-highlights nil nil t))
(push (cons regexp callback) org-occur-parameters) (push (cons regexp callback) org-occur-parameters)
@ -10374,13 +10376,12 @@ ACTION can be `set', `up', `down', or a character."
(goto-char (match-end 2)) (goto-char (match-end 2))
(insert " [#" news "]")) (insert " [#" news "]"))
(goto-char (match-beginning 3)) (goto-char (match-beginning 3))
(insert "[#" news "] "))))) (insert "[#" news "] "))))
(org-preserve-lc (org-set-tags nil 'align)) (org-preserve-lc (org-set-tags nil 'align)))
(if remove (if remove
(message "Priority removed") (message "Priority removed")
(message "Priority of current item set to %s" news)))) (message "Priority of current item set to %s" news))))
(defun org-get-priority (s) (defun org-get-priority (s)
"Find priority cookie and return priority." "Find priority cookie and return priority."
(save-match-data (save-match-data