Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 314-319)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 107)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-78

18 files changed, 865 insertions, 334 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9666bfa58aa..1869e0a33f7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,98 @@
+2006-06-20  Kenichi Handa  <handa@m17n.org>
+
+        * international/characters.el (word-combining-categories): Add
+        entries for 2-byte Han characters.
+
+2006-06-19  Richard Stallman  <rms@gnu.org>
+
+        * bindings.el (mode-line-format): Save some mode line space.
+
+        * files.el (find-file-noselect): Improve the question wording.
+        (basic-save-buffer-2): Mask UMASK against 666.
+
+        * mouse.el (mouse-drag-vertical-line-rightward-window): New function.
+        (mouse-drag-vertical-line): Call it.
+
+        * cus-edit.el (customize-option, customize-option-other-window): 
+        Error if SYMBOL is nil.
+
+2006-06-19  Carsten Dominik  <dominik@science.uva.nl>
+
+        * textmodes/org.el: Require noutline, also on XEmacs.
+        (org-end-of-subtree): Return point.
+        (org-dblock-start-re, org-dblock-end-re): New constants.
+        (org-create-dblock, org-prepare-dblock, org-map-dblocks)
+        (org-dblock-update, org-update-dblock, org-beginning-of-dblock)
+        (org-update-all-dblocks, org-find-dblock): New functions.
+        (org-collect-clock-time-entries): New function.
+        (org-html-handle-time-stamps): Never export CLOCK timeranges.
+        (org-fixup-indentation): Modified to deadl correctly with lines
+        starting with TAB.  Only one argument DIFF now.
+        (org-demote, org-promote): Call `org-fixup-indentation' with just
+        one argument, DIFF.
+        (org-mode): Don't mark buffer as modified when aligning tables.
+        (org-clock-sum): Don't makr buffer modified when adding time sum
+        properties.
+        (org-export-as-html): Added support for a link validation
+        function.
+        (org-archive-all-done): New function.
+        (org-archive-subtree): New prefix argument.  When set, archive all
+        done subtrees in this buffer.
+        (org-remove-clock-overlays)
+        (org-remove-occur-highlights): Use
+        `org-inhibit-highlight-removal'.
+        (org-inhibit-highlight-removal): New variable, for dynamic
+        scoping.
+        (org-put-clock-overlay): Don't swallow last headline character
+        when displaying overlay.
+        (org-store-link): Link to `image-mode' with just the file name.
+        
+
+2006-06-18  Michael Kifer  <kifer@cs.stonybrook.edu>
+        
+        * viper-cmd.el (viper-special-read-and-insert-char): use
+        read-key-sequence.
+        (viper-after-change-undo-hook): enhancements.
+        (viper-after-change-undo-hook): new hook.
+        (viper-undo): use viper-after-change-undo-hook.
+        (viper-add-newline-at-eob-if-necessary): widen before making changes.
+        (viper-next-line-at-bol): If point is on a widget or a button, simulate
+        clicking on that widget/button.
+        
+        * viper.el (viper-mode): allow for a separate cursor color in Emacs
+        state.
+        
+        * ediff-diff (ediff-test-patch-utility): catch errors.
+        (ediff-actual-diff-options, ediff-actual-diff3-options): new variables.
+        (ediff-set-actual-diff-options): new function.
+        (ediff-reset-diff-options, ediff-toggle-ignore-case):
+        use ediff-set-actual-diff-options.
+        (ediff-extract-diffs): catch errors.
+        (ediff-whitespace): add nonbreakable space.
+        (ediff-same-file-contents): catch errors.
+        
+        * ediff-mult.el (ediff-collect-custom-diffs): save
+        coding-system-for-read.
+        
+        * ediff-vers.el (ediff-keep-tmp-versions): new var.
+        (ediff-vc-internal, ediff-vc-merge-internal): use
+        ediff-delete-version-file.
+        (ediff-delete-version-file): new function.
+        
+        * ediff-wind.el (ediff-control-frame-parameters): set frame fringes.
+        
+        * ediff.el (ediff-directories, ediff-directory-revisions,
+        ediff-merge-directories, ediff-merge-directories-with-ancestor,
+        ediff-directories-internal, ediff-merge-directory-revisions,
+        ediff-merge-directory-revisions-with-ancestor,
+        ediff-directories3): use read-directory-name.
+        
+2006-06-18  Ralf Angeli  <angeli@caeruleus.net>
+
+        * textmodes/tex-mode.el (tex-font-lock-match-suscript): Remove
+        superfluous part of regexp for brace matching which is handled by
+        `scan-lists' call.
+
 2006-06-16  Richard Stallman  <rms@gnu.org>
 
         * obsolete/options.el (list-options): Put "obsolete" msg in buffer.
diff --git a/lisp/bindings.el b/lisp/bindings.el
index 4fdfb172e3e..da039716507 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -299,8 +299,7 @@ Keymap to display on minor modes.")
      'mode-line-buffer-identification
      (propertize "   " 'help-echo help-echo)
      'mode-line-position
-     '(vc-mode vc-mode)
-     (propertize "   " 'help-echo help-echo)
+     `(vc-mode ("" vc-mode ,(propertize "   " 'help-echo help-echo)))
      'mode-line-modes
      `(which-func-mode ("" which-func-format ,dashes))
      `(global-mode-string (,dashes global-mode-string))
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index e700cd47d16..53f92f2243b 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -1055,6 +1055,8 @@ then prompt for the MODE to customize."
 (defun customize-option (symbol)
   "Customize SYMBOL, which must be a user option variable."
   (interactive (custom-variable-prompt))
+  (unless symbol
+    (error "No variable specified"))
   (let ((basevar (indirect-variable symbol)))
     (custom-buffer-create (list (list basevar 'custom-variable))
                           (format "*Customize Option: %s*"
@@ -1070,6 +1072,8 @@ then prompt for the MODE to customize."
   "Customize SYMBOL, which must be a user option variable.
 Show the buffer in another window, but don't select it."
   (interactive (custom-variable-prompt))
+  (unless symbol
+    (error "No variable specified"))
   (let ((basevar (indirect-variable symbol)))
     (custom-buffer-create-other-window
      (list (list basevar 'custom-variable))
diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el
index 7746954292d..e3675064010 100644
--- a/lisp/ediff-diff.el
+++ b/lisp/ediff-diff.el
@@ -65,10 +65,11 @@ Must produce output compatible with Unix's diff3 program."
 ;; The following functions needed for setting diff/diff3 options
 ;; test if diff supports the --binary option
 (defsubst ediff-test-utility (diff-util option &optional files)
-  (condition-case ()
+  (condition-case nil
       (eq 0 (apply 'call-process
                    (append (list diff-util nil nil nil option) files)))
-    (file-error nil)))
+    (error (format "Cannot execute program %S." diff-util)))
+  )
 
 (defun ediff-diff-mandatory-option (diff-util)
   (let ((file (if (boundp 'null-device) null-device "/dev/null")))
@@ -77,13 +78,17 @@ Must produce output compatible with Unix's diff3 program."
            ((and (string= diff-util ediff-diff-program)
                  (ediff-test-utility
                   ediff-diff-program "--binary" (list file file)))
-            "--binary")
+            "--binary ")
            ((and (string= diff-util ediff-diff3-program)
                  (ediff-test-utility
                   ediff-diff3-program "--binary" (list file file file)))
-            "--binary")
+            "--binary ")
            (t ""))))
 
+
+;; must be before ediff-reset-diff-options to avoid compiler errors
+(fset 'ediff-set-actual-diff-options '(lambda () nil))
+
 ;; make sure that mandatory options are added even if the user changes
 ;; ediff-diff-options or ediff-diff3-options in the customization widget
 (defun ediff-reset-diff-options (symb val)
@@ -91,12 +96,9 @@ Must produce output compatible with Unix's diff3 program."
           (if (eq symb 'ediff-diff-options)
               ediff-diff-program
             ediff-diff3-program))
-         (mandatory-option (ediff-diff-mandatory-option diff-program))
-         (spacer (if (string-equal mandatory-option "") "" " ")))
-    (set symb
-         (if (string-match mandatory-option val)
-             val
-           (concat mandatory-option spacer val)))
+         (mandatory-option (ediff-diff-mandatory-option diff-program)))
+    (set symb (concat mandatory-option val))
+    (ediff-set-actual-diff-options)
     ))
 
 
@@ -155,7 +157,7 @@ GNU diff3 doesn't have such an option."
   :group 'ediff-diff)
 
 ;; the actual options used in comparison
-(ediff-defvar-local ediff-actual-diff-options "" "")
+(ediff-defvar-local ediff-actual-diff-options ediff-diff-options "")
 
 (defcustom ediff-custom-diff-program ediff-diff-program
   "*Program to use for generating custom diff output for saving it in a file.
@@ -178,7 +180,7 @@ This output is not used by Ediff internally."
   :group 'ediff-diff)
 
 ;; the actual options used in comparison
-(ediff-defvar-local ediff-actual-diff3-options "" "")
+(ediff-defvar-local ediff-actual-diff3-options ediff-diff3-options "")
 
 (defcustom ediff-diff3-ok-lines-regexp
   "^\\([1-3]:\\|====\\|  \\|.*Warning *:\\|.*No newline\\|.*missing newline\\|^\C-m$\\)"
@@ -1272,7 +1274,9 @@ delimiter regions"))
                 ;; Similarly for Windows-*
                 ;; In DOS, must synchronize because DOS doesn't have
                 ;; asynchronous processes.
-                (apply 'call-process program nil buffer nil args)
+                (condition-case nil
+                    (apply 'call-process program nil buffer nil args)
+                  (error (format "Cannot execute program %S." program)))
               ;; On other systems, do it asynchronously.
               (setq proc (get-buffer-process buffer))
               (if proc (kill-process proc))
@@ -1328,7 +1332,8 @@ delimiter regions"))
 Used for splitting difference regions into individual words.")
 (make-variable-buffer-local 'ediff-forward-word-function)
 
-(defvar ediff-whitespace " \n\t\f"
+;; \240 is unicode symbol for nonbreakable whitespace
+(defvar ediff-whitespace " \n\t\f\r\240"
   "*Characters constituting white space.
 These characters are ignored when differing regions are split into words.")
 (make-variable-buffer-local 'ediff-whitespace)
@@ -1442,11 +1447,13 @@ arguments to `skip-chars-forward'."
   "Return t if files F1 and F2 have identical contents."
   (if (and (not (file-directory-p f1))
            (not (file-directory-p f2)))
-      (let ((res
-             (apply 'call-process ediff-cmp-program nil nil nil
-                    (append ediff-cmp-options (list f1 f2)))))
-        (and (numberp res) (eq res 0))))
-  )
+      (condition-case nil
+          (let ((res
+                 (apply 'call-process ediff-cmp-program nil nil nil
+                        (append ediff-cmp-options (list f1 f2)))))
+            (and (numberp res) (eq res 0)))
+        (error (format "Cannot execute program %S." ediff-cmp-program)))
+    ))
 
 
 (defun ediff-same-contents (d1 d2 &optional filter-re)
@@ -1521,21 +1528,30 @@ affects only files whose names match the expression."
       (setq file-list-list (cdr file-list-list)))
     (reverse result)))
 
+
+(defun ediff-set-actual-diff-options ()
+  (if ediff-ignore-case
+      (setq ediff-actual-diff-options 
+            (concat ediff-diff-options " " ediff-ignore-case-option)
+            ediff-actual-diff3-options
+            (concat ediff-diff3-options " " ediff-ignore-case-option3))
+    (setq ediff-actual-diff-options ediff-diff-options
+          ediff-actual-diff3-options ediff-diff3-options)
+    )
+  (setq-default ediff-actual-diff-options ediff-actual-diff-options
+                ediff-actual-diff3-options ediff-actual-diff3-options)
+  )
+
+
 ;; Ignore case handling - some ideas from drew.adams@@oracle.com
 (defun ediff-toggle-ignore-case ()
   (interactive)
   (ediff-barf-if-not-control-buffer)
   (setq ediff-ignore-case (not ediff-ignore-case))
-  (cond (ediff-ignore-case
-         (setq ediff-actual-diff-options
-               (concat ediff-diff-options " " ediff-ignore-case-option)
-               ediff-actual-diff3-options
-               (concat ediff-diff3-options " " ediff-ignore-case-option3))
-         (message "Ignoring regions that differ only in case"))
-        (t
-         (setq ediff-actual-diff-options ediff-diff-options
-               ediff-actual-diff3-options ediff-diff3-options)
-         (message "Ignoring case differences turned OFF")))
+  (ediff-set-actual-diff-options)
+  (if ediff-ignore-case
+      (message "Ignoring regions that differ only in case")
+    (message "Ignoring case differences turned OFF"))
   (cond (ediff-merge-job
          (message "Ignoring letter case is too dangerous in merge jobs"))
         ((and ediff-diff3-job (string= ediff-ignore-case-option3 ""))
diff --git a/lisp/ediff-mult.el b/lisp/ediff-mult.el
index 0bbd3298c7a..71859a5d4c5 100644
--- a/lisp/ediff-mult.el
+++ b/lisp/ediff-mult.el
@@ -1656,22 +1656,26 @@ This operation is defined only for `ediff-directories' and
 multifile patches.  For `ediff-directory-revisions', we insist that
 all marked sessions must be active."
   (interactive)
-  (or (ediff-buffer-live-p ediff-meta-diff-buffer)
-      (setq ediff-meta-diff-buffer
-            (get-buffer-create
-             (ediff-unique-buffer-name "*Ediff Multifile Diffs" "*"))))
-  (ediff-with-current-buffer ediff-meta-diff-buffer
-    (setq buffer-read-only nil)
-    (erase-buffer))
-  (if (> (ediff-operate-on-marked-sessions 'ediff-append-custom-diff) 0)
-      ;; did something
-      (progn
-        (display-buffer ediff-meta-diff-buffer 'not-this-window)
-        (ediff-with-current-buffer ediff-meta-diff-buffer
-          (set-buffer-modified-p nil)
-          (setq buffer-read-only t)))
-    (beep)
-    (message "No marked sessions found")))
+  (let ((coding-system-for-read ediff-coding-system-for-read))
+    (or (ediff-buffer-live-p ediff-meta-diff-buffer)
+        (setq ediff-meta-diff-buffer
+              (get-buffer-create
+               (ediff-unique-buffer-name "*Ediff Multifile Diffs" "*"))))
+    (ediff-with-current-buffer ediff-meta-diff-buffer
+                               (setq buffer-read-only nil)
+                               (erase-buffer))
+    (if (> (ediff-operate-on-marked-sessions 'ediff-append-custom-diff) 0)
+        ;; did something
+        (progn
+          (display-buffer ediff-meta-diff-buffer 'not-this-window)
+          (ediff-with-current-buffer ediff-meta-diff-buffer
+                                     (set-buffer-modified-p nil)
+                                     (setq buffer-read-only t))
+          (if (fboundp 'diff-mode)
+              (with-current-buffer ediff-meta-diff-buffer
+                (diff-mode))))
+      (beep)
+      (message "No marked sessions found"))))
 
 (defun ediff-meta-show-patch ()
   "Show the multi-file patch associated with this group session."
diff --git a/lisp/ediff-vers.el b/lisp/ediff-vers.el
index 3e8b1c37572..4cd1492a1c7 100644
--- a/lisp/ediff-vers.el
+++ b/lisp/ediff-vers.el
@@ -52,6 +52,13 @@
          )))
 ;; end pacifier
 
+(defcustom ediff-keep-tmp-versions nil
+  "*If t, do not delete temporary previous versions for the files on which
+comparison or merge operations are being performed."
+  :type 'boolean
+  :group 'ediff-vers
+  )
+
 ;; VC.el support
 
 (defun ediff-vc-latest-version (file)
@@ -87,8 +94,8 @@
               file2 (buffer-file-name)))
       (setq startup-hooks
             (cons `(lambda ()
-                     (delete-file ,file1)
-                     (or ,(string= rev2 "") (delete-file ,file2)))
+                     (ediff-delete-version-file ,file1)
+                     (or ,(string= rev2 "") (ediff-delete-version-file ,file2)))
                   startup-hooks)))
     (ediff-buffers
      rev1buf rev2buf
@@ -199,12 +206,12 @@
       (setq startup-hooks
             (cons
              `(lambda ()
-                (delete-file ,(buffer-file-name buf1))
+                (ediff-delete-version-file ,(buffer-file-name buf1))
                 (or ,(string= rev2 "")
-                    (delete-file ,(buffer-file-name buf2)))
+                    (ediff-delete-version-file ,(buffer-file-name buf2)))
                 (or ,(string= ancestor-rev "")
                     ,(not ancestor-rev)
-                    (delete-file ,(buffer-file-name ancestor-buf)))
+                    (ediff-delete-version-file ,(buffer-file-name ancestor-buf)))
                 )
              startup-hooks)))
     (if ancestor-rev
@@ -305,8 +312,13 @@
               (find-file-noselect (cvs-fileinfo->full-name fileinfo)))
             nil ; startup-hooks
             'ediff-revisions)))
-    (if (stringp tmp-file) (delete-file tmp-file))
-    (if (stringp ancestor-file) (delete-file ancestor-file))))
+    (if (stringp tmp-file) (ediff-delete-version-file tmp-file))
+    (if (stringp ancestor-file) (ediff-delete-version-file ancestor-file))))
+
+
+;; delete version file on exit unless ediff-keep-tmp-versions is true
+(defun ediff-delete-version-file (file)
+  (or ediff-keep-tmp-versions (delete-file file)))
 
 
 (provide 'ediff-vers)
diff --git a/lisp/ediff-wind.el b/lisp/ediff-wind.el
index 28369f9f6bd..c0786b9cc43 100644
--- a/lisp/ediff-wind.el
+++ b/lisp/ediff-wind.el
@@ -158,6 +158,8 @@ In this case, Ediff will use those frames to display these buffers."
    '(scrollbar-height . 0)        ; XEmacs only
    '(menu-bar-lines . 0)          ; Emacs only
    '(tool-bar-lines . 0)          ; Emacs 21+ only
+   '(left-fringe    . 0)
+   '(right-fringe   . 0)
    ;; don't lower but auto-raise
    '(auto-lower . nil)
    '(auto-raise . t)
diff --git a/lisp/ediff.el b/lisp/ediff.el
index 14f634f0cd2..3e0be86b18b 100644
--- a/lisp/ediff.el
+++ b/lisp/ediff.el
@@ -500,12 +500,13 @@ expression; only file names that match the regexp are considered."
    (let ((dir-A (ediff-get-default-directory-name))
          (default-regexp (eval ediff-default-filtering-regexp))
          f)
-     (list (setq f (ediff-read-file-name "Directory A to compare:" dir-A nil))
-           (ediff-read-file-name "Directory B to compare:"
-                                 (if ediff-use-last-dir
-                                     ediff-last-dir-B
-                                   (ediff-strip-last-dir f))
-                                 nil)
+     (list (setq f (read-directory-name
+                    "Directory A to compare:" dir-A nil 'must-match))
+           (read-directory-name "Directory B to compare:"
+                           (if ediff-use-last-dir
+                               ediff-last-dir-B
+                             (ediff-strip-last-dir f))
+                           nil 'must-match)
            (read-string
             (if (stringp default-regexp)
                 (format "Filter through regular expression (default %s): "
@@ -532,8 +533,8 @@ names.  Only the files that are under revision control are taken into account."
    (let ((dir-A (ediff-get-default-directory-name))
          (default-regexp (eval ediff-default-filtering-regexp))
          )
-     (list (ediff-read-file-name
-            "Directory to compare with revision:" dir-A nil)
+     (list (read-directory-name
+            "Directory to compare with revision:" dir-A nil 'must-match)
            (read-string
             (if (stringp default-regexp)
                 (format "Filter through regular expression (default %s): "
@@ -561,17 +562,17 @@ regular expression; only file names that match the regexp are considered."
    (let ((dir-A (ediff-get-default-directory-name))
          (default-regexp (eval ediff-default-filtering-regexp))
          f)
-     (list (setq f (ediff-read-file-name "Directory A to compare:" dir-A nil))
-           (setq f (ediff-read-file-name "Directory B to compare:"
-                                         (if ediff-use-last-dir
-                                             ediff-last-dir-B
-                                           (ediff-strip-last-dir f))
-                                         nil))
-           (ediff-read-file-name "Directory C to compare:"
-                                 (if ediff-use-last-dir
-                                     ediff-last-dir-C
-                                   (ediff-strip-last-dir f))
-                                 nil)
+     (list (setq f (read-directory-name "Directory A to compare:" dir-A nil))
+           (setq f (read-directory-name "Directory B to compare:"
+                                   (if ediff-use-last-dir
+                                       ediff-last-dir-B
+                                     (ediff-strip-last-dir f))
+                                   nil 'must-match))
+           (read-directory-name "Directory C to compare:"
+                           (if ediff-use-last-dir
+                               ediff-last-dir-C
+                             (ediff-strip-last-dir f))
+                           nil 'must-match)
            (read-string
             (if (stringp default-regexp)
                 (format "Filter through regular expression (default %s): "
@@ -597,12 +598,13 @@ expression; only file names that match the regexp are considered."
    (let ((dir-A (ediff-get-default-directory-name))
          (default-regexp (eval ediff-default-filtering-regexp))
          f)
-     (list (setq f (ediff-read-file-name "Directory A to merge:" dir-A nil))
-           (ediff-read-file-name "Directory B to merge:"
-                                 (if ediff-use-last-dir
-                                     ediff-last-dir-B
-                                   (ediff-strip-last-dir f))
-                                 nil)
+     (list (setq f (read-directory-name "Directory A to merge:"
+                                        dir-A nil 'must-match))
+           (read-directory-name "Directory B to merge:"
+                           (if ediff-use-last-dir
+                               ediff-last-dir-B
+                             (ediff-strip-last-dir f))
+                           nil 'must-match)
            (read-string
             (if (stringp default-regexp)
                 (format "Filter through regular expression (default %s): "
@@ -633,17 +635,17 @@ only file names that match the regexp are considered."
    (let ((dir-A (ediff-get-default-directory-name))
          (default-regexp (eval ediff-default-filtering-regexp))
          f)
-     (list (setq f (ediff-read-file-name "Directory A to merge:" dir-A nil))
-           (setq f (ediff-read-file-name "Directory B to merge:"
+     (list (setq f (read-directory-name "Directory A to merge:" dir-A nil))
+           (setq f (read-directory-name "Directory B to merge:"
                                  (if ediff-use-last-dir
                                      ediff-last-dir-B
                                    (ediff-strip-last-dir f))
-                                 nil))
-           (ediff-read-file-name "Ancestor directory:"
+                                 nil 'must-match))
+           (read-directory-name "Ancestor directory:"
                                  (if ediff-use-last-dir
                                      ediff-last-dir-C
                                    (ediff-strip-last-dir f))
-                                 nil)
+                                 nil 'must-match)
            (read-string
             (if (stringp default-regexp)
                 (format "Filter through regular expression (default %s): "
@@ -669,8 +671,8 @@ names.  Only the files that are under revision control are taken into account."
    (let ((dir-A (ediff-get-default-directory-name))
          (default-regexp (eval ediff-default-filtering-regexp))
          )
-     (list (ediff-read-file-name
-            "Directory to merge with revisions:" dir-A nil)
+     (list (read-directory-name
+            "Directory to merge with revisions:" dir-A nil 'must-match)
            (read-string
             (if (stringp default-regexp)
                 (format "Filter through regular expression (default %s): "
@@ -699,8 +701,9 @@ names.  Only the files that are under revision control are taken into account."
    (let ((dir-A (ediff-get-default-directory-name))
          (default-regexp (eval ediff-default-filtering-regexp))
          )
-     (list (ediff-read-file-name
-            "Directory to merge with revisions and ancestors:" dir-A nil)
+     (list (read-directory-name
+            "Directory to merge with revisions and ancestors:"
+            dir-A nil 'must-match)
            (read-string
             (if (stringp default-regexp)
                 (format "Filter through regular expression (default %s): "
@@ -733,11 +736,6 @@ names.  Only the files that are under revision control are taken into account."
 (defun ediff-directories-internal (dir1 dir2 dir3 regexp action jobname
                                         &optional startup-hooks
                                         merge-autostore-dir)
-  ;; ediff-read-file-name is set to attach a previously entered file name if
-  ;; the currently entered file is a directory.  This code takes care of that.
-  (setq dir1 (if (file-directory-p dir1) dir1 (file-name-directory dir1))
-        dir2 (if (file-directory-p dir2) dir2 (file-name-directory dir2)))
-
   (if (stringp dir3)
       (setq dir3 (if (file-directory-p dir3) dir3 (file-name-directory dir3))))
 
@@ -763,7 +761,7 @@ names.  Only the files that are under revision control are taken into account."
              (ediff-merge-metajob jobname)
              (not merge-autostore-dir))
         (setq merge-autostore-dir
-              (read-file-name "Save merged files in directory: "
+              (read-directory-name "Save merged files in directory: "
                               (if ediff-use-last-dir
                                         ediff-last-merge-autostore-dir
                                       (ediff-strip-last-dir dir1))
@@ -823,7 +821,7 @@ names.  Only the files that are under revision control are taken into account."
              (ediff-merge-metajob jobname)
              (not merge-autostore-dir))
         (setq merge-autostore-dir
-              (read-file-name "Save merged files in directory: "
+              (read-directory-name "Save merged files in directory: "
                               (if ediff-use-last-dir
                                   ediff-last-merge-autostore-dir
                                 (ediff-strip-last-dir dir1))
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index 645f4f26eaf..0dce3b94ff0 100644
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -887,12 +887,15 @@ Vi's prefix argument will be used.  Otherwise, the prefix argument passed to
                    (setq ch (aref (read-key-sequence nil) 0)))
                (insert ch))
               (t
-               (setq ch (read-char-exclusive))
+               ;;(setq ch (read-char-exclusive))
+               (setq ch (aref (read-key-sequence nil) 0))
                ;; replace ^M with the newline
                (if (eq ch ?\C-m) (setq ch ?\n))
                ;; Make sure ^V and ^Q work as quotation chars
                (if (memq ch '(?\C-v ?\C-q))
-                   (setq ch (read-char-exclusive)))
+                   ;;(setq ch (read-char-exclusive))
+                   (setq ch (aref (read-key-sequence nil) 0))
+                 )
                (insert ch))
               )
         (setq last-command-event
@@ -1730,20 +1733,34 @@ invokes the command before that, etc."
 
 ;; undoing
 
+;; hook used inside undo
+(defvar viper-undo-functions nil)
+
+;; Runs viper-before-change-functions inside before-change-functions
+(defun viper-undo-sentinel (beg end length)
+  (run-hook-with-args 'viper-undo-functions beg end length))
+
+(add-hook 'after-change-functions 'viper-undo-sentinel)
+
+;; Hook used in viper-undo
+(defun viper-after-change-undo-hook (beg end len)
+  (setq undo-beg-posn beg
+        undo-end-posn (or end beg))
+  ;; some other hooks may be changing various text properties in
+  ;; the buffer in response to 'undo'; so remove this hook to avoid
+  ;; its repeated invocation
+  (remove-hook 'viper-undo-functions 'viper-after-change-undo-hook 'local))
+
 (defun viper-undo ()
   "Undo previous change."
   (interactive)
   (message "undo!")
   (let ((modified (buffer-modified-p))
         (before-undo-pt (point-marker))
-        (after-change-functions after-change-functions)
         undo-beg-posn undo-end-posn)
 
-    ;; no need to remove this hook, since this var has scope inside a let.
-    (add-hook 'after-change-functions
-              '(lambda (beg end len)
-                 (setq undo-beg-posn beg
-                       undo-end-posn (or end beg))))
+    ;; the viper-after-change-undo-hook removes itself after the 1st invocation
+    (add-hook 'viper-undo-functions 'viper-after-change-undo-hook nil 'local)
 
     (undo-start)
     (undo-more 2)
@@ -1765,7 +1782,8 @@ invokes the command before that, etc."
             (goto-char undo-beg-posn)))
       (push-mark before-undo-pt t))
     (if (and (eolp) (not (bolp))) (backward-char 1))
-    (if (not modified) (set-buffer-modified-p t)))
+    ;;(if (not modified) (set-buffer-modified-p t))
+    )
   (setq this-command 'viper-undo))
 
 ;; Continue undoing previous changes.
@@ -1813,7 +1831,7 @@ invokes the command before that, etc."
             (setq viper-undo-needs-adjustment t)))))
 
 
-
+;;; Viper's destructive Command ring utilities
 
 (defun viper-display-current-destructive-command ()
   (let ((text (nth 4 viper-d-com))
@@ -1927,12 +1945,15 @@ Undo previous insertion and inserts new."
       (end-of-line)
       ;; make sure all lines end with newline, unless in the minibuffer or
       ;; when requested otherwise (require-final-newline is nil)
-      (if (and (eobp)
-               (not (bolp))
-               require-final-newline
-               (not (viper-is-in-minibuffer))
-               (not buffer-read-only))
-          (insert "\n"))))
+      (save-restriction
+        (widen)
+        (if (and (eobp)
+                 (not (bolp))
+                 require-final-newline
+                 (not (viper-is-in-minibuffer))
+                 (not buffer-read-only))
+            (insert "\n")))
+      ))
 
 (defun viper-yank-defun ()
   (mark-defun)
@@ -3045,19 +3066,34 @@ On reaching beginning of line, stop and signal error."
     (setq this-command 'next-line)
     (if com (viper-execute-com 'viper-next-line val com))))
 
+
 (defun viper-next-line-at-bol (arg)
-  "Next line at beginning of line."
+  "Next line at beginning of line.
+If point is on a widget or a button, simulate clicking on that widget/button."
   (interactive "P")
-  (viper-leave-region-active)
-  (save-excursion
-    (end-of-line)
-    (if (eobp) (error "Last line in buffer")))
-  (let ((val (viper-p-val arg))
-        (com (viper-getCom arg)))
-    (if com (viper-move-marker-locally 'viper-com-point (point)))
-    (forward-line val)
-    (back-to-indentation)
-    (if com (viper-execute-com 'viper-next-line-at-bol val com))))
+  (let* ((field (get-char-property (point) 'field))
+         (button (get-char-property (point) 'button))
+         (doc (get-char-property (point) 'widget-doc))
+         (widget (or field button doc)))
+    (if (and widget
+             (if (symbolp widget)
+                 (get widget 'widget-type)
+               (and (consp widget)
+                    (get (widget-type widget) 'widget-type))))
+        (widget-button-press (point))
+      (if (button-at (point))
+          (push-button)
+        ;; not a widget or a button
+        (viper-leave-region-active)
+        (save-excursion
+          (end-of-line)
+          (if (eobp) (error "Last line in buffer")))
+        (let ((val (viper-p-val arg))
+              (com (viper-getCom arg)))
+          (if com (viper-move-marker-locally 'viper-com-point (point)))
+          (forward-line val)
+          (back-to-indentation)
+          (if com (viper-execute-com 'viper-next-line-at-bol val com)))))))
 
 
 (defun viper-previous-line (arg)
diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el
index c7fe792b5f2..252088a476d 100644
--- a/lisp/emulation/viper-util.el
+++ b/lisp/emulation/viper-util.el
@@ -139,8 +139,8 @@
 
 (defsubst viper-get-cursor-color ()
   (viper-cond-compile-for-xemacs-or-emacs
-   ;; xemacs
-   (color-instance-name (frame-property (selected-frame) 'cursor-color))
+   (color-instance-name
+    (frame-property (selected-frame) 'cursor-color)) ; xemacs
    (cdr (assoc 'cursor-color (frame-parameters))) ; emacs
    ))
 
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index fc55d291550..8f858526da3 100644
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -534,6 +534,10 @@ If Viper is enabled, turn it off.  Otherwise, turn it on."
 (defun viper-mode ()
   "Turn on Viper emulation of Vi in Emacs. See Info node `(viper)Viper'."
   (interactive)
+  (if (null viper-vi-state-cursor-color)
+      (modify-frame-parameters
+        (selected-frame)
+        (list (cons 'viper-vi-state-cursor-color (viper-get-cursor-color)))))
   (if (not noninteractive)
       (progn
         ;; if the user requested viper-mode explicitly
@@ -545,8 +549,6 @@ If Viper is enabled, turn it off.  Otherwise, turn it on."
         (if viper-first-time ; Important check.  Prevents mix-up of startup
             (progn           ; and expert-level msgs when viper-mode recurses
               (setq viper-first-time nil)
-              (setq viper-vi-state-cursor-color
-                    (viper-get-cursor-color))
               (if (not viper-inhibit-startup-message)
                   (save-window-excursion
                     (setq viper-inhibit-startup-message t)
diff --git a/lisp/files.el b/lisp/files.el
index 3313f003d89..8a5a331da71 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1514,23 +1514,53 @@ the various files."
                            ;; hexl-mode.
                            (not (eq major-mode 'hexl-mode)))
                   (if (buffer-modified-p)
-                      (if (y-or-n-p (if rawfile
-                                        "Save file and revisit literally? "
-                                      "Save file and revisit non-literally? "))
+                      (if (y-or-n-p
+                           (format 
+                            (if rawfile
+                                "The file %s is already visited normally,
+and you have edited the buffer.  Now you have asked to visit it literally,
+meaning no coding system handling, format conversion, or local variables.
+Emacs can only visit a file in one way at a time.
+
+Do you want to save the file, and visit it literally instead? "
+                                "The file %s is already visited literally,
+meaning no coding system handling, format conversion, or local variables.
+You have edited the buffer.  Now you have asked to visit the file normally,
+but Emacs can only visit a file in one way at a time.
+
+Do you want to save the file, and visit it normally instead? ")
+                            (file-name-nondirectory filename)))
                           (progn
                             (save-buffer)
                             (find-file-noselect-1 buf filename nowarn
                                                   rawfile truename number))
-                        (if (y-or-n-p (if rawfile
-                                          "Discard your edits and revisit file literally? "
-                                        "Discard your edits and revisit file non-literally? "))
+                        (if (y-or-n-p
+                             (format 
+                              (if rawfile
+                                  "\
+Do you want to discard your changes, and visit the file literally now? "
+                                "\
+Do you want to discard your changes, and visit the file normally now? ")))
                             (find-file-noselect-1 buf filename nowarn
                                                   rawfile truename number)
                           (error (if rawfile "File already visited non-literally"
                                    "File already visited literally"))))
-                    (if (y-or-n-p (if rawfile
-                                      "Revisit file literally? "
-                                    "Revisit file non-literally? "))
+                    (if (y-or-n-p 
+                         (format 
+                          (if rawfile
+                              "The file %s is already visited normally.
+You have asked to visit it literally,
+meaning no coding system decoding, format conversion, or local variables.
+But Emacs can only visit a file in one way at a time.
+
+Do you want to revisit the file literally now? "
+                            "The file %s is already visited literally,
+meaning no coding system decoding, format conversion, or local variables.
+You have asked to visit it normally,
+but Emacs can only visit a file in one way at a time.
+
+Do you want to revisit the file normally now? ")
+                          (file-name-nondirectory filename)))
                         (find-file-noselect-1 buf filename nowarn
                                               rawfile truename number)
                       (error (if rawfile "File already visited non-literally"
@@ -3631,7 +3661,8 @@ Before and after saving the buffer, this function runs
             ;; Since we have created an entirely new file,
             ;; make sure it gets the right permission bits set.
             (setq setmodes (or setmodes
-                               (cons (or (file-modes buffer-file-name) umask)
+                               (cons (or (file-modes buffer-file-name)
+                                         (logand ?\666 umask))
                                      buffer-file-name)))
             ;; We succeeded in writing the temp file,
             ;; so rename it.
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 1899fd9d845..60a7e6b1e8b 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-19  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * message.el (message-syntax-checks): Doc fix.
+
 2006-06-16  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * message.el (message-syntax-checks): Doc fix.
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 91ac018f324..4ee87933967 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -194,7 +194,7 @@ Checks include `approved', `continuation-headers', `control-chars',
 `empty', `existing-newsgroups', `from', `illegible-text',
 `invisible-text', `long-header-lines', `long-lines', `message-id',
 `multiple-headers', `new-text', `newsgroups', `quoting-style',
-`repeated-newsgroups', `reply-to', `sendsys', `shoot',
+`repeated-newsgroups', `reply-to', `sender', `sendsys', `shoot',
 `shorten-followup-to', `signature', `size', `subject', `subject-cmsg'
 and `valid-newsgroups'."
   :group 'message-news
diff --git a/lisp/international/characters.el b/lisp/international/characters.el
index 9b2b244d6ea..26d6cd93439 100644
--- a/lisp/international/characters.el
+++ b/lisp/international/characters.el
@@ -1078,7 +1078,10 @@
  char-script-table)
 
 (setq word-combining-categories
-      '((?l . ?l)))
+      '((?l . ?l)
+        (?C . ?C)
+        (?C . ?H)
+        (?C . ?K)))
 
 (setq word-separating-categories        ;  (2-byte character sets)
       '((?A . ?K)                       ; Alpha numeric - Katakana
diff --git a/lisp/mouse.el b/lisp/mouse.el
index c399515a3d2..145eb76446f 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -529,6 +529,24 @@ resized by dragging their header-line."
       (mouse-drag-mode-line-1 start-event nil))))
 
 
+(defun mouse-drag-vertical-line-rightward-window (window)
+  "Return a window that is immediately to the right of WINDOW, or nil."
+  (let ((bottom (nth 3 (window-inside-edges window)))
+        (left (nth 0 (window-inside-edges window)))
+        best best-right
+        (try (previous-window window)))
+    (while (not (eq try window))
+      (let ((try-top (nth 1 (window-inside-edges try)))
+            (try-bottom (nth 3 (window-inside-edges try)))
+            (try-right (nth 2 (window-inside-edges try))))
+        (if (and (< try-top bottom)
+                 (>= try-bottom bottom)
+                 (< try-right left)
+                 (or (null best-right) (> try-right best-right)))
+            (setq best-right try-right best try)))
+      (setq try (previous-window try)))
+    best))
+
 (defun mouse-drag-vertical-line (start-event)
   "Change the width of a window by dragging on the vertical line."
   (interactive "e")
@@ -594,7 +612,8 @@ resized by dragging their header-line."
                         ;; adjust the window on the left.
                         (if (eq which-side 'right)
                             (selected-window)
-                          (previous-window))))
+                          (mouse-drag-vertical-line-rightward-window
+                           (selected-window)))))
                    (setq x (- (car (cdr mouse))
                               (if (eq which-side 'right) 0 2))
                          edges (window-edges window)
diff --git a/lisp/textmodes/org.el b/lisp/textmodes/org.el
index dd4dfc1a857..c4e739fdf77 100644
--- a/lisp/textmodes/org.el
+++ b/lisp/textmodes/org.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <dominik at science dot uva dot nl>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://www.astro.uva.nl/~dominik/Tools/org/
-;; Version: 4.36b
+;; Version: 4.38
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -90,6 +90,14 @@
 ;;
 ;; Recent changes
 ;; --------------
+;; Version 4.38
+;;    - noutline.el is now required (important for XEmacs users only).
+;;    - Dynamic blocks.
+;;    - Archiving of all level 1 trees without open TODO items.
+;;    - Clock reports can be inserted into the file in a special section.
+;;    - FAQ removed from the manual, now only on the web.
+;;    - Bug fixes.
+;;
 ;; Version 4.37
 ;;    - Clock-feature for measuring time spent on specific items.
 ;;    - Improved emphasizing allows configuration and stacking.
@@ -170,13 +178,18 @@
 (eval-when-compile
   (require 'cl)
   (require 'calendar))
-(require 'outline)
+;; For XEmacs, noutline is not yet provided by outline.el, so arrange for
+;; the file noutline.el being loaded.
+(if (featurep 'xemacs) (condition-case nil (require 'noutline)))
+;; We require noutline, which might be provided in outline.el
+(require 'outline) (require 'noutline)
+;; Other stuff we need.
 (require 'time-date)
 (require 'easymenu)
 
 ;;; Customization variables
 
-(defvar org-version "4.36b"
+(defvar org-version "4.38"
   "The version number of the file org.el.")
 (defun org-version ()
   (interactive)
@@ -2202,7 +2215,7 @@ stacked      Non-nil means, allow stacked styles.  This works only in HTML
              `org-emphasis-alist') will be allowed as pre/post, aiding
              inside-out matching.
 Use customize to modify this, or restart emacs after changing it."
-  :group 'org-fixme
+  :group 'org-font-lock
   :set 'org-set-emph-re
   :type '(list
           (sexp    :tag "Allowed chars in pre      ")
@@ -2216,19 +2229,23 @@ Use customize to modify this, or restart emacs after changing it."
   '(("*" bold "<b>" "</b>")
     ("/" italic "<i>" "</i>")
     ("_" underline "<u>" "</u>")
-    ("=" shadow "<code>" "</code>"))
+    ("=" shadow "<code>" "</code>")
+    ("+" (:strike-through t) "<del>" "</del>")
+)
 "Special syntax for emphasised text.
 Text starting and ending with a special character will be emphasized, for
 example *bold*, _underlined_ and /italic/.  This variable sets the marker
 characters, the face to bbe used by font-lock for highlighting in Org-mode
 emacs buffers, and the HTML tags to be used for this.
 Use customize to modify this, or restart emacs after changing it."
-  :group 'org-fixme
+  :group 'org-font-lock
   :set 'org-set-emph-re
   :type '(repeat
           (list
            (string :tag "Marker character")
-           (face :tag "Font-lock-face")
+           (choice
+            (face :tag "Font-lock-face")
+            (plist :tag "Face property list"))
            (string :tag "HTML start tag")
            (string :tag "HTML end tag"))))
 
@@ -2708,6 +2725,7 @@ Also put tags into group 4 if tags are present.")
 (defvar gnus-group-name) ; from gnus
 (defvar gnus-article-current) ; from gnus
 (defvar w3m-current-url) ; from w3m
+(defvar w3m-current-title) ; from w3m
 (defvar mh-progs) ; from MH-E
 (defvar mh-current-folder) ; from MH-E
 (defvar mh-show-folder-buffer) ; from MH-E
@@ -2823,8 +2841,10 @@ The following commands are available:
       (insert "    -*- mode: org -*-\n\n"))
 
   (unless org-inhibit-startup
-    (if org-startup-align-all-tables
-        (org-table-map-tables 'org-table-align))
+    (when org-startup-align-all-tables
+      (let ((bmp (buffer-modified-p)))
+        (org-table-map-tables 'org-table-align)
+        (set-buffer-modified-p bmp)))
     (if org-startup-with-deadline-check
         (call-interactively 'org-check-deadlines)
       (cond
@@ -3722,9 +3742,7 @@ in the region."
     (replace-match up-head nil t)
     ;; Fixup tag positioning
     (and org-auto-align-tags (org-set-tags nil t))
-    (if org-adapt-indentation
-        (org-fixup-indentation (if (> diff 1) "^  " "^ ") ""
-                               (if (> diff 1) "^ ? ?\\S-" "^ ?\\S-")))))
+    (if org-adapt-indentation (org-fixup-indentation (- diff)))))
 
 (defun org-demote ()
   "Demote the current heading lower down the tree.
@@ -3737,8 +3755,7 @@ in the region."
     (replace-match down-head nil t)
     ;; Fixup tag positioning
     (and org-auto-align-tags (org-set-tags nil t))
-    (if org-adapt-indentation
-        (org-fixup-indentation "^ " (if (> diff 1) "   " "  ") "^\\S-"))))
+    (if org-adapt-indentation (org-fixup-indentation diff))))
 
 (defun org-map-tree (fun)
   "Call FUN for every heading underneath the current one."
@@ -3767,20 +3784,23 @@ in the region."
                   (not (eobp)))
         (funcall fun)))))
 
-;; FIXME: this does not work well with Tabulators.  This has to be re-written entirely.
-(defun org-fixup-indentation (from to prohibit)
-  "Change the indentation in the current entry by re-replacing FROM with TO.
-However, if the regexp PROHIBIT matches at all, don't do anything.
-This is being used to change indentation along with the length of the
-heading marker.  But if there are any lines which are not indented, nothing
-is changed at all."
+(defun org-fixup-indentation (diff)
+  "Change the indentation in the current entry by DIFF
+However, if any line in the current entry has no indentation, or if it
+would end up with no indentation after the change, nothing at all is done."
   (save-excursion
     (let ((end (save-excursion (outline-next-heading)
-                               (point-marker))))
+                               (point-marker)))
+          (prohibit (if (> diff 0)
+                        "^\\S-" 
+                      (concat "^ \\{0," (int-to-string (- diff)) "\\}\\S-")))
+          col)
       (unless (save-excursion (re-search-forward prohibit end t))
-        (while (re-search-forward from end t)
-          (replace-match to)
-          (beginning-of-line 2)))
+        (while (re-search-forward "^[ \t]+" end t)
+          (goto-char (match-end 0))
+          (setq col (current-column))
+          (if (< diff 0) (replace-match ""))
+          (indent-to (+ diff col))))
       (move-marker end nil))))
 
 ;;; Vertical tree motion, cutting and pasting of subtrees
@@ -3984,6 +4004,14 @@ If optional TXT is given, check this string instead of the current kill."
               (throw 'exit nil)))
         t))))
 
+(defun org-narrow-to-subtree ()
+  "Narrow buffer to the current subtree."
+  (interactive)
+  (save-excursion
+    (narrow-to-region
+     (progn (org-back-to-heading) (point))
+     (progn (org-end-of-subtree t) (point)))))
+
 ;;; Plain list items
 
 (defun org-at-item-p ()
@@ -4292,103 +4320,259 @@ with something like \"1.\" or \"2)\"."
 
 ;;; Archiving
 
-(defun org-archive-subtree ()
+(defun org-archive-subtree (&optional find-done)
   "Move the current subtree to the archive.
 The archive can be a certain top-level heading in the current file, or in
 a different file.  The tree will be moved to that location, the subtree
-heading be marked DONE, and the current time will be added."
-  (interactive)
-  ;; Save all relevant TODO keyword-relatex variables
-  (let ((tr-org-todo-line-regexp org-todo-line-regexp) ; keep despite compiler
-        (tr-org-todo-keywords org-todo-keywords)
-        (tr-org-todo-interpretation org-todo-interpretation)
-        (tr-org-done-string org-done-string)
-        (tr-org-todo-regexp org-todo-regexp)
-        (tr-org-todo-line-regexp org-todo-line-regexp)
-        (this-buffer (current-buffer))
-        file heading buffer level newfile-p)
-    (if (string-match "\\(.*\\)::\\(.*\\)" org-archive-location)
+heading be marked DONE, and the current time will be added.
+
+When called with prefix argument FIND-DONE, find whole trees without any
+open TODO items and archive them (after getting confirmation from the user).
+If the cursor is not at a headline when this comand is called, try all level
+1 trees.  If the cursor is on a headline, only try the direct children of
+this heading. "
+  (interactive "P")
+  (if find-done
+      (org-archive-all-done)
+    ;; Save all relevant TODO keyword-relatex variables
+    
+    (let ((tr-org-todo-line-regexp org-todo-line-regexp) ; keep despite compiler
+          (tr-org-todo-keywords org-todo-keywords)
+          (tr-org-todo-interpretation org-todo-interpretation)
+          (tr-org-done-string org-done-string)
+          (tr-org-todo-regexp org-todo-regexp)
+          (tr-org-todo-line-regexp org-todo-line-regexp)
+          (this-buffer (current-buffer))
+          file heading buffer level newfile-p)
+      (if (string-match "\\(.*\\)::\\(.*\\)" org-archive-location)
+          (progn
+            (setq file (format (match-string 1 org-archive-location)
+                               (file-name-nondirectory buffer-file-name))
+                  heading (match-string 2 org-archive-location)))
+        (error "Invalid `org-archive-location'"))
+      (if (> (length file) 0)
+          (setq newfile-p (not (file-exists-p file))
+                buffer (find-file-noselect file))
+        (setq buffer (current-buffer)))
+      (unless buffer
+        (error "Cannot access file \"%s\"" file))
+      (if (and (> (length heading) 0)
+               (string-match "^\\*+" heading))
+          (setq level (match-end 0))
+        (setq heading nil level 0))
+      (save-excursion
+        ;; We first only copy, in case something goes wrong
+        ;; we need to protect this-command, to avoid kill-region sets it,
+        ;; which would lead to duplication of subtrees
+        (let (this-command) (org-copy-subtree))
+        (set-buffer buffer)
+        ;; Enforce org-mode for the archive buffer
+        (if (not (eq major-mode 'org-mode))
+            ;; Force the mode for future visits.
+            (let ((org-insert-mode-line-in-empty-file t))
+              (call-interactively 'org-mode)))
+        (when newfile-p
+          (goto-char (point-max))
+          (insert (format "\nArchived entries from file %s\n\n"
+                          (buffer-file-name this-buffer))))
+        ;; Force the TODO keywords of the original buffer
+        (let ((org-todo-line-regexp tr-org-todo-line-regexp)
+              (org-todo-keywords tr-org-todo-keywords)
+              (org-todo-interpretation tr-org-todo-interpretation)
+              (org-done-string tr-org-done-string)
+              (org-todo-regexp tr-org-todo-regexp)
+              (org-todo-line-regexp tr-org-todo-line-regexp))
+          (goto-char (point-min))
+          (if heading
+              (progn
+                (if (re-search-forward
+                     (concat "\\(^\\|\r\\)"
+                             (regexp-quote heading) "[ \t]*\\($\\|\r\\)")
+                     nil t)
+                    (goto-char (match-end 0))
+                  ;; Heading not found, just insert it at the end
+                  (goto-char (point-max))
+                  (or (bolp) (insert "\n"))
+                  (insert "\n" heading "\n")
+                  (end-of-line 0))
+                ;; Make the subtree visible
+                (show-subtree)
+                (org-end-of-subtree t)
+                (skip-chars-backward " \t\r\n]")
+                (and (looking-at "[ \t\r\n]*")
+                     (replace-match "\n\n")))
+            ;; No specific heading, just go to end of file.
+            (goto-char (point-max)) (insert "\n"))
+          ;; Paste
+          (org-paste-subtree (1+ level))
+          ;; Mark the entry as done, i.e. set to last work in org-todo-keywords
+          (if org-archive-mark-done
+              (org-todo (length org-todo-keywords)))
+          ;; Move cursor to right after the TODO keyword
+          (when org-archive-stamp-time
+            (beginning-of-line 1)
+            (looking-at org-todo-line-regexp)
+            (goto-char (or (match-end 2) (match-beginning 3)))
+            (insert "(" (format-time-string (cdr org-time-stamp-formats)
+                                            (org-current-time))
+                    ")"))
+          ;; Save the buffer, if it is not the same buffer.
+          (if (not (eq this-buffer buffer)) (save-buffer))))
+      ;; Here we are back in the original buffer.  Everything seems to have
+      ;; worked.  So now cut the tree and finish up.
+      (let (this-command) (org-cut-subtree))
+      (if (and (not (eobp)) (looking-at "[ \t]*$")) (kill-line))
+      (message "Subtree archived %s"
+               (if (eq this-buffer buffer)
+                   (concat "under heading: " heading)
+                 (concat "in file: " (abbreviate-file-name file)))))))
+
+(defun org-archive-all-done ()
+  "Archive sublevels of the current tree without open TODO items.
+If the cursor is not on a headline, try all level 1 trees.  If
+it is on a headline, try all direct children."
+  (let ((re (concat "^\\*+ +" org-not-done-regexp)) re1
+        (begm (make-marker))
+        (endm (make-marker))
+        beg end (cntarch 0))
+    (if (org-on-heading-p)
         (progn
-          (setq file (format (match-string 1 org-archive-location)
-                             (file-name-nondirectory buffer-file-name))
-                heading (match-string 2 org-archive-location)))
-      (error "Invalid `org-archive-location'"))
-    (if (> (length file) 0)
-        (setq newfile-p (not (file-exists-p file))
-              buffer (find-file-noselect file))
-      (setq buffer (current-buffer)))
-    (unless buffer
-      (error "Cannot access file \"%s\"" file))
-    (if (and (> (length heading) 0)
-             (string-match "^\\*+" heading))
-        (setq level (match-end 0))
-      (setq heading nil level 0))
+          (setq re1 (concat "^" (regexp-quote
+                                 (make-string 
+                                  (1+ (- (match-end 0) (match-beginning 0)))
+                                  ?*))
+                            " "))
+          (move-marker begm (point))
+          (move-marker endm (org-end-of-subtree)))
+      (setq re1 "^* ")
+      (move-marker begm (point-min))
+      (move-marker endm (point-max)))
     (save-excursion
-      ;; We first only copy, in case something goes wrong
-      ;; we need to protect this-command, to avoid kill-region sets it,
-      ;; which would lead to duplication of subtrees
-      (let (this-command) (org-copy-subtree))
-      (set-buffer buffer)
-      ;; Enforce org-mode for the archive buffer
-      (if (not (eq major-mode 'org-mode))
-          ;; Force the mode for future visits.
-          (let ((org-insert-mode-line-in-empty-file t))
-            (call-interactively 'org-mode)))
-      (when newfile-p
-        (goto-char (point-max))
-        (insert (format "\nArchived entries from file %s\n\n"
-                        (buffer-file-name this-buffer))))
-      ;; Force the TODO keywords of the original buffer
-      (let ((org-todo-line-regexp tr-org-todo-line-regexp)
-            (org-todo-keywords tr-org-todo-keywords)
-            (org-todo-interpretation tr-org-todo-interpretation)
-            (org-done-string tr-org-done-string)
-            (org-todo-regexp tr-org-todo-regexp)
-            (org-todo-line-regexp tr-org-todo-line-regexp))
-        (goto-char (point-min))
-        (if heading
-            (progn
-              (if (re-search-forward
-                   (concat "\\(^\\|\r\\)"
-                           (regexp-quote heading) "[ \t]*\\($\\|\r\\)")
-                   nil t)
-                  (goto-char (match-end 0))
-                ;; Heading not found, just insert it at the end
-                (goto-char (point-max))
-                (or (bolp) (insert "\n"))
-                (insert "\n" heading "\n")
-                (end-of-line 0))
-              ;; Make the subtree visible
-              (show-subtree)
-              (org-end-of-subtree t)
-              (skip-chars-backward " \t\r\n]")
-              (and (looking-at "[ \t\r\n]*")
-                   (replace-match "\n\n")))
-          ;; No specific heading, just go to end of file.
-          (goto-char (point-max)) (insert "\n"))
-        ;; Paste
-        (org-paste-subtree (1+ level))
-        ;; Mark the entry as done, i.e. set to last work in org-todo-keywords
-        (if org-archive-mark-done
-            (org-todo (length org-todo-keywords)))
-        ;; Move cursor to right after the TODO keyword
-        (when org-archive-stamp-time
-          (beginning-of-line 1)
-          (looking-at org-todo-line-regexp)
-          (goto-char (or (match-end 2) (match-beginning 3)))
-          (insert "(" (format-time-string (cdr org-time-stamp-formats)
-                                          (org-current-time))
-                  ")"))
-        ;; Save the buffer, if it is not the same buffer.
-        (if (not (eq this-buffer buffer)) (save-buffer))))
-    ;; Here we are back in the original buffer.  Everything seems to have
-    ;; worked.  So now cut the tree and finish up.
-    (let (this-command) (org-cut-subtree))
-    (if (and (not (eobp)) (looking-at "[ \t]*$")) (kill-line))
-    (message "Subtree archived %s"
-             (if (eq this-buffer buffer)
-                 (concat "under heading: " heading)
-               (concat "in file: " (abbreviate-file-name file))))))
+      (goto-char begm)
+      (while (re-search-forward re1 endm t)
+              beg (match-beginning 0)
+              end (save-excursion (org-end-of-subtree t) (point)))
+        (goto-char beg)
+        (if (re-search-forward re end t)
+            (goto-char end)
+          (goto-char beg)
+          (if (y-or-n-p "Archive this subtree (no open TODO items)? ")
+              (progn
+                (org-archive-subtree)
+                (setq cntarch (1+ cntarch)))
+            (goto-char end))))
+    (message "%d trees archived" cntarch)))
+
+;;; Dynamic blocks
+
+(defun org-find-dblock (name)
+  "Find the first dynamic block with name NAME in the buffer.
+If not found, stay at current position and return nil."
+  (let (pos)
+    (save-excursion
+      (goto-char (point-min))
+      (setq pos (and (re-search-forward (concat "^#\\+BEGIN:[ \t]+" name "\\>")
+                                        nil t)
+                     (match-beginning 0))))
+    (if pos (goto-char pos))
+    pos))
+
+(defconst org-dblock-start-re
+  "^#\\+BEGIN:[ \t]+\\(\\S-+\\)[ \t]+\\(.*\\)"
+  "Matches the startline of a dynamic block, with parameters.")
+
+(defconst org-dblock-end-re "^#\\+END\\([: \t\r\n]\\|$\\)"
+  "Matches the end of a dyhamic block.")
+
+(defun org-create-dblock (plist)
+  "Create a dynamic block section, with parameters taken from PLIST.
+PLIST must containe a :name entry which is used as name of the block."
+  (unless (bolp) (newline))
+  (let ((name (plist-get plist :name)))
+    (insert "#+BEGIN: " name)
+    (while plist
+      (if (eq (car plist) :name)
+          (setq plist (cddr plist))
+        (insert " " (prin1-to-string (pop plist)))))
+    (insert "\n\n#+END:\n")
+    (beginning-of-line -2)))
+
+(defun org-prepare-dblock ()
+  "Prepare dynamic block for refresh.
+This empties the block, puts the cursor at the insert position and returns
+the property list including an extra property :name with the block name."
+  (unless (looking-at org-dblock-start-re)
+    (error "Not at a dynamic block"))
+  (let* ((beg (match-beginning 0))
+         (begdel (1+ (match-end 0)))
+         (name (match-string 1))
+         (params (append (list :name name)
+                         (read (concat "(" (match-string 2) ")")))))
+    (unless (re-search-forward org-dblock-end-re nil t)
+      (error "Dynamic block not terminated"))
+    (delete-region begdel (match-beginning 0))
+    (goto-char begdel)
+    (open-line 1)
+    params))
+
+(defun org-map-dblocks (&optional command)
+  "Apply COMMAND to all dynamic blocks in the current buffer.
+If COMMAND is not given, use `org-update-dblock'."
+  (let ((cmd (or command 'org-update-dblock))
+        pos)
+    (save-excursion
+      (goto-char (point-min))
+      (while (re-search-forward org-dblock-start-re nil t)
+        (goto-char (setq pos (match-beginning 0)))
+        (condition-case nil
+            (funcall cmd)
+          (error (message "Error during update of dynamic block")))
+        (goto-char pos)
+        (unless (re-search-forward org-dblock-end-re nil t)
+          (error "Dynamic block not terminated"))))))
+
+(defun org-dblock-update (&optional arg)
+  "User command for updating dynamic blocks.
+Update the dynamic block at point.  With prefix ARG, update all dynamic
+blocks in the buffer."
+  (interactive "P")
+  (if arg
+      (org-update-all-dblocks)
+    (or (looking-at org-dblock-start-re)
+        (org-beginning-of-dblock))
+    (org-update-dblock)))
+
+(defun org-update-dblock ()
+  "Update the dynamic block at point
+This means to empty the block, parse for parameters and then call
+the correct writing function."
+  (let* ((pos (point))
+         (params (org-prepare-dblock))
+         (name (plist-get params :name))
+         (cmd (intern (concat "org-dblock-write:" name))))
+    (funcall cmd params)
+    (goto-char pos)))
+
+(defun org-beginning-of-dblock ()
+  "Find the beginning of the dynamic block at point.
+Error if there is no scuh block at point."
+  (let ((pos (point))
+        beg end)
+    (end-of-line 1)
+    (if (and (re-search-backward org-dblock-start-re nil t)
+             (setq beg (match-beginning 0))
+             (re-search-forward org-dblock-end-re nil t)
+             (> (match-end 0) pos))
+        (goto-char beg)
+      (goto-char pos)
+      (error "Not in a dynamic block"))))
+
+(defun org-update-all-dblocks ()
+  "Update all dynamic blocks in the buffer.
+This function can be used in a hook."
+  (when (eq major-mode 'org-mode)
+    (org-map-dblocks 'org-update-dblock)))
+
 
 ;;; Completion
 
@@ -4783,16 +4967,18 @@ that the match should indeed be shown."
     (org-overlay-put ov 'face 'secondary-selection)
     (push ov org-occur-highlights)))
 
+(defvar org-inhibit-highlight-removal nil)
 (defun org-remove-occur-highlights (&optional beg end noremove)
   "Remove the occur highlights from the buffer.
 BEG and END are ignored.  If NOREMOVE is nil, remove this function
 from the `before-change-functions' in the current buffer."
   (interactive)
-  (mapc 'org-delete-overlay org-occur-highlights)
-  (setq org-occur-highlights nil)
-  (unless noremove
-    (remove-hook 'before-change-functions
-                 'org-remove-occur-highlights 'local)))
+  (unless org-inhibit-highlight-removal
+    (mapc 'org-delete-overlay org-occur-highlights)
+    (setq org-occur-highlights nil)
+    (unless noremove
+      (remove-hook 'before-change-functions
+                   'org-remove-occur-highlights 'local))))
 
 ;;; Priorities
 
@@ -5449,8 +5635,8 @@ If there is no running clock, throw an error, unless FAIL-QUIETLY is set."
   "Sum the times for each subtree.
 Puts the resulting times in minutes as a text property on each headline."
   (interactive)
-  (remove-text-properties (point-min) (point-max) '(:org-clock-minutes t))
-  (let* ((re (concat "^\\(\\*+\\)[ \t]\\|^[ \t]*"
+  (let* ((bmp (buffer-modified-p))
+         (re (concat "^\\(\\*+\\)[ \t]\\|^[ \t]*"
                      org-clock-string
                      ".*=>[ \t]*\\([0-9]+\\):\\([0-9]+\\)[ \t]*$"))
          (lmax 30)
@@ -5458,6 +5644,7 @@ Puts the resulting times in minutes as a text property on each headline."
          (t1 0)
          (level 0)
          (lastlevel 0) time)
+    (remove-text-properties (point-min) (point-max) '(:org-clock-minutes t))
     (save-excursion
       (goto-char (point-max))
       (while (re-search-backward re nil t)
@@ -5475,7 +5662,8 @@ Puts the resulting times in minutes as a text property on each headline."
                   (aset ltimes l 0))
             (goto-char (match-beginning 0))
             (put-text-property (point) (point-at-eol) :org-clock-minutes time))))
-      (setq org-clock-file-total-minutes (aref ltimes 0)))))
+      (setq org-clock-file-total-minutes (aref ltimes 0)))
+    (set-buffer-modified-p bmp)))
 
 (defun org-clock-display (&optional total-only)
   "Show subtree times in the entire buffer.
@@ -5510,11 +5698,11 @@ will be easy to remove."
          (off 0)
          ov tx)
     (move-to-column c)
-    (if (eolp) (setq off 1))
     (unless (eolp) (skip-chars-backward "^ \t"))
     (skip-chars-backward " \t")
-    (setq ov (org-make-overlay (- (point) off) (point-at-eol))
-          tx (concat (make-string (+ off (max 0 (- c (current-column)))) ?.)
+    (setq ov (org-make-overlay (1- (point)) (point-at-eol))
+          tx (concat (buffer-substring (1- (point)) (point))
+                     (make-string (+ off (max 0 (- c (current-column)))) ?.)
                      (org-add-props (format "%s %2d:%02d%s"
                                             (make-string l ?*) h m
                                             (make-string (- 10 l) ?\ ))
@@ -5528,11 +5716,12 @@ will be easy to remove."
 BEG and END are ignored.  If NOREMOVE is nil, remove this function
 from the `before-change-functions' in the current buffer."
   (interactive)
-  (mapc 'org-delete-overlay org-clock-overlays)
-  (setq org-clock-overlays nil)
-  (unless noremove
-    (remove-hook 'before-change-functions
-                 'org-remove-clock-overlays 'local)))
+  (unless org-inhibit-highlight-removal
+    (mapc 'org-delete-overlay org-clock-overlays)
+    (setq org-clock-overlays nil)
+    (unless noremove
+      (remove-hook 'before-change-functions
+                   'org-remove-clock-overlays 'local))))
 
 (defun org-clock-out-if-current ()
   "Clock out if the current entry contains the running clock.
@@ -5557,6 +5746,113 @@ If yes, offer to stop it and to save the buffer with the changes."
     (when (y-or-n-p "Save changed buffer?")
       (save-buffer))))
 
+(defun org-clock-report ()
+  "Create a table containing a report about clocked time.
+If the buffer contains lines
+#+BEGIN: clocktable :maxlevel 3 :emphasize nil
+
+#+END: clocktable
+then the table will be inserted between these lines, replacing whatever
+is was there before.  If these lines are not in the buffer, the table
+is inserted at point, surrounded by the special lines.
+The BEGIN line can contain parameters.  Allowed are:
+:maxlevel   The maximum level to be included in the table.  Default is 3.
+:emphasize  t/nil, if levell 1 and level 2 should be bold/italic in the table."
+  (interactive)
+  (org-remove-clock-overlays)
+  (unless (org-find-dblock "clocktable")
+    (org-create-dblock  (list :name "clocktable"
+                              :maxlevel 2 :emphasize nil)))
+  (org-update-dblock))
+
+(defun org-dblock-write:clocktable (params)
+  "Write the standard clocktable."
+  (let ((hlchars '((1 . "*") (2 . ?/)))
+        (emph nil)
+        (pos (point)) ipos
+        (ins (make-marker))
+        time h m p level hlc hdl maxlevel)
+    (setq maxlevel (or (plist-get params :maxlevel) 3)
+          emph (plist-get params :emphasize))
+    (move-marker ins (point))
+    (setq ipos (point))
+    (insert-before-markers "Clock summary at [" 
+                           (substring
+                            (format-time-string (cdr org-time-stamp-formats))
+                            1 -1)
+                           "]\n|L|Headline|Time|\n")
+    (org-clock-sum)
+    (setq h (/ org-clock-file-total-minutes 60)
+          m (- org-clock-file-total-minutes (* 60 h)))
+    (insert-before-markers "|-\n|0|" "*Total file time*| "
+                           (format "*%d:%02d*" h m)
+                           "|\n")
+    (goto-char (point-min))
+    (while (setq p (next-single-property-change (point) :org-clock-minutes))
+      (goto-char p)
+      (when (setq time (get-text-property p :org-clock-minutes))
+        (beginning-of-line 1)
+        (when (and (looking-at "\\(\\*+\\)[ \t]+\\(.*?\\)\\([ \t]+:[0-9a-zA-Z_@:]+:\\)?[ \t]*$")
+                   (setq level (- (match-end 1) (match-beginning 1)))
+                   (<= level maxlevel))
+          (setq hlc (if emph (or (cdr (assoc level hlchars)) "") "")
+                hdl (match-string 2)
+                h (/ time 60)
+                m (- time (* 60 h)))
+          (save-excursion
+            (goto-char ins)
+            (if (= level 1) (insert-before-markers "|-\n"))
+            (insert-before-markers
+             "| " (int-to-string level) "|" hlc hdl hlc " |" 
+             (make-string (1- level) ?|)
+             hlc
+             (format "%d:%02d" h m)
+             hlc
+             " |\n")))))
+    (goto-char ins)
+    (backward-delete-char 1)
+    (goto-char ipos)
+    (skip-chars-forward "^|")
+    (org-table-align)))
+
+(defun org-collect-clock-time-entries ()
+  "Return an internal list with clocking information.
+This list has one entry for each CLOCK interval.
+FIXME: describe the elements."
+  (interactive)
+  (let ((re (concat "^[ \t]*" org-clock-string
+                    " *\\[\\(.*?\\)\\]--\\[\\(.*?\\)\\]"))
+        rtn beg end next cont level title total closedp leafp
+        clockpos titlepos h m donep)
+    (save-excursion
+      (org-clock-sum)
+      (goto-char (point-min))
+      (while (re-search-forward re nil t)
+        (setq clockpos (match-beginning 0)
+              beg (match-string 1) end (match-string 2)
+              cont (match-end 0))
+        (setq beg (apply 'encode-time (org-parse-time-string beg))
+              end (apply 'encode-time (org-parse-time-string end)))
+        (org-back-to-heading t)
+        (setq donep (org-entry-is-done-p))
+        (setq titlepos (point)
+              total (or (get-text-property (1+ (point)) :org-clock-minutes) 0)
+              h (/ total 60) m (- total (* 60 h))
+              total (cons h m))
+        (looking-at "\\(\\*+\\) +\\(.*\\)")
+        (setq level (- (match-end 1) (match-beginning 1))
+              title (org-match-string-no-properties 2))
+        (save-excursion (outline-next-heading) (setq next (point)))
+        (setq closedp (re-search-forward org-closed-time-regexp next t))
+        (goto-char next)
+        (setq leafp (and (looking-at "^\\*+ ")
+                         (<= (- (match-end 0) (point)) level)))
+        (push (list beg end clockpos closedp donep
+                    total title titlepos level leafp)
+              rtn)
+        (goto-char cont)))
+    (nreverse rtn)))
+
 ;;; Agenda, and Diary Integration
 
 ;;; Define the mode
@@ -9186,8 +9482,8 @@ For file links, arg negates `org-context-in-file-links'."
       (setq cpltxt (url-view-url t)
             link (org-make-link cpltxt)))
      ((eq major-mode 'w3m-mode)
-      (setq cpltxt w3m-current-url
-            link (org-make-link cpltxt)))
+      (setq cpltxt (or w3m-current-title w3m-current-url)
+            link (org-make-link w3m-current-url)))
 
      ((setq search (run-hook-with-args-until-success
                     'org-create-file-search-functions))
@@ -9195,6 +9491,11 @@ For file links, arg negates `org-context-in-file-links'."
                          "::" search))
       (setq cpltxt (or description link)))
 
+     ((eq major-mode 'image-mode)
+      (setq cpltxt (concat "file:"
+                           (abbreviate-file-name buffer-file-name))
+            link (org-make-link cpltxt)))      
+
      ((eq major-mode 'org-mode)
       ;; Just link to current headline
       (setq cpltxt (concat "file:"
@@ -9414,7 +9715,9 @@ subdirectory.  Otherwise, the link will be the absolute path as
 completed in the minibuffer (i.e. normally ~/path/to/file).
 
 With two \\[universal-argument] prefixes, enforce an absolute path even if the file
-is in the current directory or below."
+is in the current directory or below.
+With three \\[universal-argument] prefixes, negate the meaning of
+`org-keep-stored-link-after-insertion'."
   (interactive "P")
   (let (link desc entry remove file (pos (point)))
     (cond
@@ -9430,7 +9733,7 @@ is in the current directory or below."
       (setq link (read-string "Link: "
                               (org-link-unescape
                                (org-match-string-no-properties 1)))))
-     (complete-file
+     ((equal complete-file '(4))
       ;; Completing read for file names.
       (setq file (read-file-name "File: "))
       (let ((pwd (file-name-as-directory (expand-file-name ".")))
@@ -9455,7 +9758,8 @@ is in the current directory or below."
                   org-insert-link-history
                   (or (car (car org-stored-links)))))
       (setq entry (assoc link org-stored-links))
-      (if (not org-keep-stored-link-after-insertion)
+      (if (funcall (if (equal complete-file '(64)) 'not 'identity)
+                   (not org-keep-stored-link-after-insertion))
           (setq org-stored-links (delq (assoc link org-stored-links)
                                        org-stored-links)))
       (setq link (if entry (nth 1 entry) link)
@@ -12199,7 +12503,8 @@ ones and overrule settings in the other lists."
 \[X] publish... (project will be prompted for)
 \[A] publish all projects")
         (cmds
-         '((?v . org-export-visible)
+         '((?t . org-insert-export-options-template)
+           (?v . org-export-visible)
            (?a . org-export-as-ascii)
            (?h . org-export-as-html)
            (?b . org-export-as-html-and-open)
@@ -12566,7 +12871,7 @@ translations.  There is currently no way for users to extend this.")
           (match-string 1) "[[" (match-string 2) ":" (match-string 3) "]]")
          t t))
       ;; Find multiline emphasis and put them into single line
-      (when (assq :emph-multiline parameters)
+      (when (memq :emph-multiline parameters)
         (goto-char (point-min))
         (while (re-search-forward org-emph-re nil t)
           (subst-char-in-region (match-beginning 0) (match-end 0) ?\n ?\  t)
@@ -12858,13 +13163,18 @@ command."
   (interactive
    (list (progn
            (message "Export visible: [a]SCII  [h]tml  [b]rowse HTML  [x]OXO  [ ]keep buffer")
-           (char-to-string (read-char-exclusive)))
+           (read-char-exclusive))
          current-prefix-arg))
-  (if (not (member type '("a" "\C-a" "b" "\C-b" "h" "x" " ")))
+  (if (not (member type '(?a ?\C-a ?b ?\C-b ?h ?x ?\ )))
       (error "Invalid export key"))
-  ;; FIXME: do this more explicit?
-  (let* ((binding (key-binding (concat "\C-c\C-x" type)))
-         (keepp (equal type " "))
+  (let* ((binding (cdr (assoc type
+                              '((?a . org-export-as-ascii)
+                                (?\C-a . org-export-as-ascii)
+                                (?b . org-export-as-html-and-open)
+                                (?\C-b . org-export-as-html-and-open)
+                                (?h . org-export-as-html)
+                                (?x . org-export-as-xoxo)))))
+         (keepp (equal type ?\ ))
          (file buffer-file-name)
          (buffer (get-buffer-create "*Org Export Visible*"))
          s e)
@@ -13049,6 +13359,8 @@ org-mode's default settings, but still inferior to file-local settings."
                                         (org-infile-export-plist)))
 
          (style (plist-get opt-plist :style))
+         (link-validate (plist-get opt-plist :link-validation-function))
+         valid
          (odd org-odd-levels-only)
          (region-p (org-region-active-p))
          (region
@@ -13068,6 +13380,7 @@ org-mode's default settings, but still inferior to file-local settings."
                            (file-name-sans-extension
                             (file-name-nondirectory buffer-file-name))
                            ".html"))
+         (current-dir (file-name-directory buffer-file-name))
          (buffer (find-file-noselect filename))
          (levels-open (make-vector org-level-max nil))
          (date (format-time-string "%Y/%m/%d" (current-time)))
@@ -13314,6 +13627,10 @@ lang=\"%s\" xml:lang=\"%s\">
                   (if (string-match "::\\(.*\\)" filename)
                       (setq search (match-string 1 filename)
                             filename (replace-match "" t nil filename)))
+                  (setq valid
+                        (if (functionp link-validate)
+                            (funcall link-validate filename current-dir)
+                          t))               
                   (setq file-is-image-p
                         (string-match (org-image-file-name-regexp) filename))
                   (setq thefile (if abs-p (expand-file-name filename) filename))
@@ -13339,7 +13656,8 @@ lang=\"%s\" xml:lang=\"%s\">
                                        (and org-export-html-inline-images
                                             (not descp))))
                               (concat "<img src=\"" thefile "\"/>")
-                            (concat "<a href=\"" thefile "\">" desc "</a>")))))
+                            (concat "<a href=\"" thefile "\">" desc "</a>")))
+                (if (not valid) (setq rpl desc))))
              ((member type '("bbdb" "vm" "wl" "mhe" "rmail" "gnus" "shell" "info" "elisp"))
               (setq rpl (concat "<i>&lt;" type ":"
                                 (save-match-data (org-link-unescape path))
@@ -13650,27 +13968,31 @@ But it has the disadvantage, that Org-mode's HTML conversions cannot be used."
 
 (defun org-html-handle-time-stamps (s)
   "Format time stamps in string S, or remove them."
-  (let (r b)
-    (while (string-match org-maybe-keyword-time-regexp s)
-      (or b (setq b (substring s 0 (match-beginning 0))))
-      (if (not org-export-with-timestamps)
-          (setq r (concat r (substring s 0 (match-beginning 0)))
-                s (substring s (match-end 0)))
-        (setq r (concat
-                 r (substring s 0 (match-beginning 0))
-                 (if (match-end 1)
-                     (format "@<span class=\"timestamp-kwd\">%s @</span>"
-                             (match-string 1 s)))
-                 (format " @<span class=\"timestamp\">%s@</span>"
-                         (substring (match-string 3 s) 1 -1)))
-              s (substring s (match-end 0)))))
-    ;; Line break of line started and ended with time stamp stuff
-    (if (not r)
-        s
-      (setq r (concat r s))
-      (unless (string-match "\\S-" (concat b s))
-        (setq r (concat r "@<br/>")))
-      r)))
+  (catch 'exit
+    (let (r b)
+      (while (string-match org-maybe-keyword-time-regexp s)
+        ;; FIXME: is it good to never export CLOCK, or do we need control?
+        (if (and (match-end 1) (equal (match-string 1 s) org-clock-string))
+            (throw 'exit ""))
+        (or b (setq b (substring s 0 (match-beginning 0))))
+        (if (not org-export-with-timestamps)
+            (setq r (concat r (substring s 0 (match-beginning 0)))
+                  s (substring s (match-end 0)))
+          (setq r (concat
+                   r (substring s 0 (match-beginning 0))
+                   (if (match-end 1)
+                       (format "@<span class=\"timestamp-kwd\">%s @</span>"
+                               (match-string 1 s)))
+                   (format " @<span class=\"timestamp\">%s@</span>"
+                           (substring (match-string 3 s) 1 -1)))
+                s (substring s (match-end 0)))))
+      ;; Line break if line started and ended with time stamp stuff
+      (if (not r)
+          s
+        (setq r (concat r s))
+        (unless (string-match "\\S-" (concat b s))
+          (setq r (concat r "@<br/>")))
+        r))))
 
 (defun org-html-protect (s)
   ;; convert & to &amp;, < to &lt; and > to &gt;
@@ -14212,6 +14534,7 @@ a time), or the day by one (if it does not contain a time)."
 ;; All the other keys
 
 (define-key org-mode-map "\C-c\C-a" 'show-all)  ; in case allout messed up.
+(define-key org-mode-map "\C-xns" 'org-narrow-to-subtree)
 (define-key org-mode-map "\C-c$"    'org-archive-subtree)
 (define-key org-mode-map "\C-c\C-j" 'org-goto)
 (define-key org-mode-map "\C-c\C-t" 'org-todo)
@@ -14255,24 +14578,7 @@ a time), or the day by one (if it does not contain a time)."
 (define-key org-mode-map "\C-c~"          'org-table-create-with-table.el)
 (define-key org-mode-map "\C-c\C-q"       'org-table-wrap-region)
 (define-key org-mode-map "\C-c\C-e"       'org-export)
-;(define-key org-mode-map "\C-c\C-xa"      'org-export-as-ascii)
-;(define-key org-mode-map "\C-c\C-x\C-a"   'org-export-as-ascii)
-;(define-key org-mode-map "\C-c\C-xv"      'org-export-visible)
-;(define-key org-mode-map "\C-c\C-x\C-v"   'org-export-visible)
-;; OPML support is only an option for the future
-;(define-key org-mode-map "\C-c\C-xo"      'org-export-as-opml)
-;(define-key org-mode-map "\C-c\C-x\C-o"   'org-export-as-opml)
-;(define-key org-mode-map "\C-c\C-xi"      'org-export-icalendar-this-file)
-;(define-key org-mode-map "\C-c\C-x\C-i"   'org-export-icalendar-all-agenda-files)
-;(define-key org-mode-map "\C-c\C-xc"      'org-export-icalendar-combine-agenda-files)
-;(define-key org-mode-map "\C-c\C-x\C-c"   'org-export-icalendar-combine-agenda-files)
-;(define-key org-mode-map "\C-c\C-xt"      'org-insert-export-options-template)
 (define-key org-mode-map "\C-c:"          'org-toggle-fixed-width-section)
-;(define-key org-mode-map "\C-c\C-xh"      'org-export-as-html)
-;(define-key org-mode-map "\C-c\C-xx"      'org-export-as-xoxo)
-;(define-key org-mode-map "\C-c\C-x\C-x"   'org-export-as-xoxo)
-;(define-key org-mode-map "\C-c\C-xb"      'org-export-as-html-and-open)
-;(define-key org-mode-map "\C-c\C-x\C-b"   'org-export-as-html-and-open)
 
 (define-key org-mode-map "\C-c\C-x\C-k"   'org-cut-special)
 (define-key org-mode-map "\C-c\C-x\C-w"   'org-cut-special)
@@ -14283,15 +14589,9 @@ a time), or the day by one (if it does not contain a time)."
 (define-key org-mode-map "\C-c\C-x\C-o" 'org-clock-out)
 (define-key org-mode-map "\C-c\C-x\C-x" 'org-clock-cancel)
 (define-key org-mode-map "\C-c\C-x\C-d" 'org-clock-display)
+(define-key org-mode-map "\C-c\C-x\C-r" 'org-clock-report)
 
-;(define-key org-mode-map "\C-c\C-ef"    'org-publish-current-file)
-;(define-key org-mode-map "\C-c\C-ep"    'org-publish-current-project)
-;(define-key org-mode-map "\C-c\C-ec"    'org-publish)
-;(define-key org-mode-map "\C-c\C-ea"    'org-publish-all)
-;(define-key org-mode-map "\C-c\C-e\C-f" 'org-publish-current-file)
-;(define-key org-mode-map "\C-c\C-e\C-p" 'org-publish-current-project)
-;(define-key org-mode-map "\C-c\C-e\C-c" 'org-publish)
-;(define-key org-mode-map "\C-c\C-e\C-a" 'org-publish-all)
+(define-key org-mode-map "\C-c\C-x\C-u" 'org-dblock-update)
 
 (when (featurep 'xemacs)
   (define-key org-mode-map 'button3   'popup-mode-menu))
@@ -14785,6 +15085,7 @@ See the individual commands for more information."
      ["Clock out" org-clock-out t]
      ["Clock cancel" org-clock-cancel t]
      ["Display times" org-clock-display t]
+     ["Create clock table" org-clock-report t]
      "--"
      ["Record DONE time"
       (progn (setq org-log-done (not org-log-done))
@@ -15284,7 +15585,8 @@ When ENTRY is non-nil, show the entire entry."
           (forward-char -1)
           (if (memq (preceding-char) '(?\n ?\^M))
               ;; leave blank line before heading
-              (forward-char -1))))))
+              (forward-char -1)))))
+  (point))
 
 (defun org-show-subtree ()
   "Show everything after this heading at deeper levels."
@@ -15334,8 +15636,12 @@ Show the heading too, if it is currently invisible."
                            (org-invisible-p)))
        (org-show-hierarchy-above)))
 
-;;; Finish up
 
+;;; Experimental code
+
+
+;;; Finish up
+        
 (provide 'org)
 
 (run-hooks 'org-load-hook)
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index 8ca7c3026e8..9e78f4b6015 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -597,7 +597,7 @@ An alternative value is \" . \", if you use a font with a narrow period."
 (defun tex-font-lock-match-suscript (limit)
   "Match subscript and superscript patterns up to LIMIT."
   (when (re-search-forward "[_^] *\\([^\n\\{}]\\|\
-\\\\\\([a-zA-Z@]+\\|[^ \t\n]\\)\\|{[^\\{]*}\\|\\({\\)\\)" limit t)
+\\\\\\([a-zA-Z@]+\\|[^ \t\n]\\)\\|\\({\\)\\)" limit t)
     (when (match-end 3)
       (let ((beg (match-beginning 3))
             (end (save-restriction