[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111152: Merge Org up to commit 4cac75153. Some ChangeLog formatting fixes.

[Bastien Guerry]

------------------------------------------------------------
revno: 111152
committer: Bastien Guerry <address@hidden>
branch nick: emacs-24
timestamp: Tue 2013-01-08 19:49:37 +0100
message:
  Merge Org up to commit 4cac75153.  Some ChangeLog formatting fixes.
modified:
  lisp/org/ChangeLog
  lisp/org/org-agenda.el
  lisp/org/org-src.el
  lisp/org/org-version.el

=== modified file 'lisp/org/ChangeLog'
--- a/lisp/org/ChangeLog        2013-01-08 15:31:30 +0000
+++ b/lisp/org/ChangeLog        2013-01-08 18:49:37 +0000
@@ -44,22 +44,8 @@
        * org-src.el (org-edit-src-code): Fix bug when trying to edit a
        table.el table.
 
-       * org-agenda.el (org-agenda-finalize): Don't remove tag alignment
-       depending on `org-prefix-has-tag', this should depend on
-       `org-agenda-remove-tags'.
-
-       * org-agenda.el (org-agenda-finalize): Don't remove tag alignment
-       depending on `org-prefix-has-tag', this should depend on
-       `org-agenda-remove-tags'.
-
-       * org-agenda.el (org-agenda-finalize): Downcase tags when readding
-       them after agenda generation.
-
-       * org.el (org-setup-filling): Set `auto-fill-inhibit-regexp' from
-       `org-outline-regexp'.
-
-       * org-agenda.el (org-agenda-use-tag-inheritance): Fix custom
-       definition.
+       * org-agenda.el (org-agenda-finalize): Inhibit readonly for the
+       whole function.
 
        * org.el (org-entry-get): Speed up by let-binding some variables
        only if needed.  Also fix a bug: consider an empty drawer as no
@@ -98,14 +84,12 @@
        (org-agenda-get-sexps, org-agenda-get-deadlines)
        (org-agenda-get-scheduled): Ditto.
 
-       * org.el (org-adaptive-fill-function): Fix checking of
-       post-affiliated.
-       (org-id-link-to-org-use-id): Fix compiler warning.
+       * org.el (org-id-link-to-org-use-id): Fix compiler warning.
 
        * org-agenda.el (org-agenda-format-item): Do not use
-       org-get-effort to get the effort text property.
-       (org-agenda-get-sexps): Use `org-back-to-heading' when setting
-       the tags.
+       `org-get-effort' to get the effort text property.
+       (org-agenda-get-sexps): Use `org-back-to-heading' when setting the
+       tags.
 
        * org-clock.el (org-clock-in): Refresh effort properties.
 
@@ -136,11 +120,11 @@
        * org.el (org-get-priority): Save match data even when using
        `org-get-priority-function'.
 
-       * org-mobile.el (org-mobile-create-index-file): Possibly
-       normalize `org-todo-keywords'.
+       * org-mobile.el (org-mobile-create-index-file): Possibly normalize
+       `org-todo-keywords'.
 
-       * org-mobile.el (org-mobile-push): Use the correct agenda
-       buffer names.
+       * org-mobile.el (org-mobile-push): Use the correct agenda buffer
+       names.
 
        * org.el (org-store-link): Use `org-id-link-to-org-use-id' instead
        of the obsolete variable name.
@@ -186,9 +170,8 @@
 
        * org-agenda.el (org-agenda-open-link): Fix bug when no link is
        matched.  Return a message instead of an error.
-
-       * org-agenda.el (org-agenda-priority): Remove useless parameter
-       and fix showing priority in agenda buffers.
+       (org-agenda-priority): Remove useless parameter and fix showing
+       priority in agenda buffers.
 
        * org-macs.el (org-with-buffer-modified-unmodified): New macro.
 
@@ -231,16 +214,14 @@
        compatibility function.
 
        * org.el (org-table-map-tables): Fix allowed blocks.
-       (org-edit-special): Fix regression: allow editing HTML and
-       LaTeX source blocks again.
+       (org-edit-special): Fix regression: allow editing HTML and LaTeX
+       source blocks again.
 
        * org-src.el (org-edit-src-code): Ditto.
 
        * org.el (org-nonsticky-props): Add `htmlize-link'.
-
-       * org.el (org-nonsticky-props): Add `htmlize-link'.
-
-       * org.el (org-edit-special): Don't edit in verbatim blocks.
+       (org-nonsticky-props): Add `htmlize-link'.
+       (org-edit-special): Don't edit in verbatim blocks.
 
        * org-src.el (org-edit-src-code): Ditto.
 
@@ -275,8 +256,7 @@
 
        * org.el (org-todo): Ignore the comment string when changing the
        TODO state of a headline.
-
-       * org.el (org-edit-special): Fix docstring.
+       (org-edit-special): Fix docstring.
        (org-in-src-block-p): Small enhancement.
 
        * org-publish.el (org-publish-org-to): Call `org-export-as-*'
@@ -392,9 +372,9 @@
 
 2013-01-08  Nicolas Goaziou  <address@hidden>
 
-       * org.el (org-setup-filling): Ignore `auto-fill-inhibit-regexp'.
-       The idea behind this is that `org-adaptive-fill-function' already
-       determines which lines should be filled.
+       * org.el (org-setup-filling): Set `auto-fill-inhibit-regexp' to
+       nil because `org-adaptive-fill-function' already determines which
+       lines should be filled.
 
        * org.el (org-fill-paragraph): Small refactoring.
 

=== modified file 'lisp/org/org-agenda.el'
--- a/lisp/org/org-agenda.el    2013-01-08 14:27:18 +0000
+++ b/lisp/org/org-agenda.el    2013-01-08 18:49:37 +0000
@@ -3544,50 +3544,49 @@
        (unless (eq org-agenda-remove-tags t)
          (org-agenda-align-tags))
        (unless org-agenda-with-colors
-         (remove-text-properties (point-min) (point-max) '(face nil))))
-      (if (and (boundp 'org-agenda-overriding-columns-format)
-              org-agenda-overriding-columns-format)
-         (org-set-local 'org-agenda-overriding-columns-format
-                        org-agenda-overriding-columns-format))
-      (if (and (boundp 'org-agenda-view-columns-initially)
-              org-agenda-view-columns-initially)
-         (org-agenda-columns))
-      (when org-agenda-fontify-priorities
-       (org-agenda-fontify-priorities))
-      (when (and org-agenda-dim-blocked-tasks org-blocker-hook)
-       (org-agenda-dim-blocked-tasks))
-      ;; We need to widen when `org-agenda-finalize' is called from
-      ;; `org-agenda-change-all-lines' (e.g. in `org-agenda-clock-in')
-      (when org-clock-current-task
-       (save-restriction
-         (widen)
-         (org-agenda-mark-clocking-task)))
-      (when org-agenda-entry-text-mode
-       (org-agenda-entry-text-hide)
-       (org-agenda-entry-text-show))
-      (if (and (functionp 'org-habit-insert-consistency-graphs)
-              (save-excursion (next-single-property-change (point-min) 
'org-habit-p)))
-         (org-habit-insert-consistency-graphs))
-      (setq org-agenda-type (org-get-at-bol 'org-agenda-type))
-      (when (delq nil (mapcar (lambda (tp) (org-agenda-check-type nil tp))
-                             org-agenda-use-tag-inheritance))
-       (let (mrk)
-         (save-excursion
-           (goto-char (point-min))
-           (while (equal (forward-line) 0)
-             (when (setq mrk (or (get-text-property (point) 'org-hd-marker)
-                                 (get-text-property (point) 'org-hd-marker)))
-               (put-text-property (point-at-bol) (point-at-eol)
-                                  'tags (org-with-point-at mrk
-                                          (delete-dups
-                                           (mapcar 'downcase 
(org-get-tags-at))))))))))
-      (let ((inhibit-read-only t))
-       (run-hooks 'org-agenda-finalize-hook))
-      (when (or org-agenda-tag-filter (get 'org-agenda-tag-filter 
:preset-filter))
-       (org-agenda-filter-apply org-agenda-tag-filter 'tag))
-      (when (or org-agenda-category-filter (get 'org-agenda-category-filter 
:preset-filter))
-       (org-agenda-filter-apply org-agenda-category-filter 'category))
-      (org-add-hook 'kill-buffer-hook 'org-agenda-reset-markers 'append 
'local))))
+         (remove-text-properties (point-min) (point-max) '(face nil)))
+       (if (and (boundp 'org-agenda-overriding-columns-format)
+                org-agenda-overriding-columns-format)
+           (org-set-local 'org-agenda-overriding-columns-format
+                          org-agenda-overriding-columns-format))
+       (if (and (boundp 'org-agenda-view-columns-initially)
+                org-agenda-view-columns-initially)
+           (org-agenda-columns))
+       (when org-agenda-fontify-priorities
+         (org-agenda-fontify-priorities))
+       (when (and org-agenda-dim-blocked-tasks org-blocker-hook)
+         (org-agenda-dim-blocked-tasks))
+       ;; We need to widen when `org-agenda-finalize' is called from
+       ;; `org-agenda-change-all-lines' (e.g. in `org-agenda-clock-in')
+       (when org-clock-current-task
+         (save-restriction
+           (widen)
+           (org-agenda-mark-clocking-task)))
+       (when org-agenda-entry-text-mode
+         (org-agenda-entry-text-hide)
+         (org-agenda-entry-text-show))
+       (if (and (functionp 'org-habit-insert-consistency-graphs)
+                (save-excursion (next-single-property-change (point-min) 
'org-habit-p)))
+           (org-habit-insert-consistency-graphs))
+       (setq org-agenda-type (org-get-at-bol 'org-agenda-type))
+       (when (delq nil (mapcar (lambda (tp) (org-agenda-check-type nil tp))
+                               org-agenda-use-tag-inheritance))
+         (let (mrk)
+           (save-excursion
+             (goto-char (point-min))
+             (while (equal (forward-line) 0)
+               (when (setq mrk (or (get-text-property (point) 'org-hd-marker)
+                                   (get-text-property (point) 'org-hd-marker)))
+                 (put-text-property (point-at-bol) (point-at-eol)
+                                    'tags (org-with-point-at mrk
+                                            (delete-dups
+                                             (mapcar 'downcase 
(org-get-tags-at))))))))))
+       (run-hooks 'org-agenda-finalize-hook)
+       (when (or org-agenda-tag-filter (get 'org-agenda-tag-filter 
:preset-filter))
+         (org-agenda-filter-apply org-agenda-tag-filter 'tag))
+       (when (or org-agenda-category-filter (get 'org-agenda-category-filter 
:preset-filter))
+         (org-agenda-filter-apply org-agenda-category-filter 'category))
+       (org-add-hook 'kill-buffer-hook 'org-agenda-reset-markers 'append 
'local)))))
 
 (defun org-agenda-mark-clocking-task ()
   "Mark the current clock entry in the agenda if it is present."

=== modified file 'lisp/org/org-src.el'
--- a/lisp/org/org-src.el       2013-01-08 15:31:30 +0000
+++ b/lisp/org/org-src.el       2013-01-08 18:49:37 +0000
@@ -528,6 +528,14 @@
        (pos (point))
        re1 re2 single beg end lang lfmt match-re1 ind entry)
     (catch 'exit
+      (when (org-at-table.el-p)
+       (re-search-backward "^[\t]*[^ \t|\\+]" nil t)
+       (setq beg (1+ (point-at-eol)))
+       (goto-char beg)
+       (or (re-search-forward "^[\t]*[^ \t|\\+]" nil t)
+           (progn (goto-char (point-max)) (newline)))
+       (setq end (1- (point-at-bol)))
+       (throw 'exit (list beg end 'table.el nil nil 0)))
       (while (setq entry (pop re-list))
        (setq re1 (car entry) re2 (nth 1 entry) lang (nth 2 entry)
              single (nth 3 entry))
@@ -558,16 +566,7 @@
                        (throw 'exit
                               (list (match-end 0) end
                                     (org-edit-src-get-lang lang)
-                                    single lfmt ind)))))))))
-      (when (org-at-table.el-p)
-       (re-search-backward "^[\t]*[^ \t|\\+]" nil t)
-       (setq beg (1+ (point-at-eol)))
-       (goto-char beg)
-       (or (re-search-forward "^[\t]*[^ \t|\\+]" nil t)
-           (progn (goto-char (point-max)) (newline)))
-       (setq end (point-at-bol))
-       (setq ind (org-edit-src-get-indentation beg))
-       (throw 'exit (list beg end 'table.el nil nil ind))))))
+                                    single lfmt ind))))))))))))
 
 (defun org-edit-src-get-lang (lang)
   "Extract the src language."

=== modified file 'lisp/org/org-version.el'
--- a/lisp/org/org-version.el   2013-01-08 15:31:30 +0000
+++ b/lisp/org/org-version.el   2013-01-08 18:49:37 +0000
@@ -11,7 +11,7 @@
 (defun org-git-version ()
   "The Git version of org-mode.
   Inserted by installing org-mode or when a release is made."
-   (let ((org-git-version "7.9.3+-GNU-Emacs-24-3 (commit c8c217aa)"))
+   (let ((org-git-version "7.9.3+-GNU-Emacs-24-3 (commit 4cac75153)"))
      org-git-version))
 ;;;###autoload
 (defvar org-odt-data-dir "/usr/share/emacs/etc/org"