Merged from

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-116
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-117
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-118
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-119
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-38
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-39
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-520

17 files changed, 388 insertions, 139 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fd03764b8d0..52c222bc36d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,61 @@
+2006-02-24  Juanma Barranquero  <lekktu@gmail.com>
+
+        * help.el (help): Revert last part of 2006-02-23 change (deletion
+        of the `provide' call).
+
+2006-02-23  Juri Linkov  <juri@jurta.org>
+
+        * compare-w.el (compare-windows-highlight): Add new value
+        `persistent' and change :type from `boolean' to `choice'.
+        (compare-windows-overlays1, compare-windows-overlays2):
+        New internal variables.
+        (compare-windows-highlight): If compare-windows-highlight is
+        `persistent', add current overlays to compare-windows-overlays[12]
+        instead of adding compare-windows-dehighlight to pre-command-hook.
+        (compare-windows-dehighlight): Delete all overlays from
+        compare-windows-overlays[12].
+
+        * info.el (Info-search): Don't bind search-spaces-regexp to
+        Info-search-whitespace-regexp in non-regexp isearch mode.
+
+2006-02-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * help.el (describe-mode): Pass `mode-name' to format-mode-line.
+
+2006-02-23  Juanma Barranquero  <lekktu@gmail.com>
+
+        * textmodes/org.el (org-xemacs-p)
+        (org-export-html-show-new-buffer, org-table-may-need-update)
+        (org-insert-item, org-mhe-get-message-real-folder)
+        (org-mhe-get-message-folder-from-index)
+        (org-mhe-get-message-folder, org-mhe-get-message-num)
+        (org-mhe-get-header, org-make-org-heading-search-string)
+        (org-make-org-heading-camel, org-table-sort-lines)
+        (org-format-org-table-html, org-format-table-table-html):
+        Fix typos in docstrings.
+
+12006-02-23  Carsten Dominik  <dominik@science.uva.nl>
+
+        * textmodes/org.el (org-cleaned-string-for-export)
+        (org-solidify-link-text): New function.
+        (org-add-hook): Use `add-local-hook' instead of `make-local-hook' for
+        XEmacs, just to silence the compiler.
+        (org-export-as-ascii, org-export-as-html-and-open):
+        Use `org-cleaned-string-for-export' and create internal links.
+        (org-follow-mhe-link): Require mh-e, use folder.
+
+2006-02-23  Nick Roberts  <nickrob@snap.net.nz>
+
+        * progmodes/gud.el (gud-speedbar-buttons): Use shadow face properly.
+
+        * progmodes/gdb-ui.el (gdb-debug-ring-max): Rename from
+        gdb-debug-log-length.
+        (gdb-debug-ring): Rename from gdb-debug-log-ring.  Don't make
+        it a real ring but...
+        (gud-gdba-marker-filter): ...make it work like mark-ring.
+        (gdb-enable-debug): Rename from gdb-enable-debug-log.
+        (gdb-mouse-jump): New function.  Add bindings.
+
 2006-02-23  Nick Roberts  <nickrob@snap.net.nz>
 
         * progmodes/gdb-ui.el (gdb-signalled): New variable and function.
@@ -11,16 +69,14 @@
 
 2006-02-22  Carsten Dominik  <dominik@science.uva.nl>
 
-        * textmodes/reftex.el (reftex-locate-file): Removed duplicate
-        function.
+        * textmodes/reftex.el (reftex-locate-file): Remove duplicate function.
 
-        * textmodes/reftex-vars.el: (reftex-try-all-extensions): New
-        option.
+        * textmodes/reftex-vars.el (reftex-try-all-extensions): New option.
 
-        * textmodes/reftex.el: (reftex-locate-file): Search all extensions
+        * textmodes/reftex.el (reftex-locate-file): Search all extensions
         if `reftex-try-all-extensions' is set.
 
-        * textmodes/org.el: (org-mark-ring-previous, org-mark-ring-set):
+        * textmodes/org.el (org-mark-ring-push, org-mark-ring-goto):
         New commands.
         (org-mark-ring): New variable.
         (org-mark-ring-length): New option.
@@ -28,12 +84,12 @@
         onto the mark ring.
         (org-add-hook): New function.
         (org-export-table-remove-special-lines): New option.
-        (org-skip-comments, org-format-org-table-html): Respect new option
-        `org-export-table-remove-special-lines'.
-        (org-open-file): Allow special command configuration for directory
-        link.
-        (org-file-apps): Fixed bugs in customize type, added setting for
-        directories.
+        (org-skip-comments, org-format-org-table-html): Respect new
+        option `org-export-table-remove-special-lines'.
+        (org-open-file): Allow special command configuration for
+        directory link.
+        (org-file-apps): Fix bugs in customize type, added setting
+        for directories.
         (org-activate-tags, org-format-agenda-item, org-complete)
         (org-get-tags-at, org-scan-tags, org-make-tags-matcher)
         (org-get-tags, org-get-buffer-tags, org-open-at-point)
@@ -42,37 +98,38 @@
         (org-radio-targets, org-file-link-context-use-camel-case)
         (org-activate-camels): New options.
         (org-update-radio-target-regexp, org-all-targets)
-        (org-make-target-link-regexp, org-activate-target-links): New
-        functions.
+        (org-make-target-link-regexp, org-activate-target-links):
+        New functions.
         (org-make-org-heading-search-string): New function.
         (org-store-link, org-insert-link): Use new option
         `org-file-link-context-use-camel-case'.
         (org-activate-camels): Use new option `org-activate-camels'.
-        (org-link-regexp): Added mhe prefix.
-        (org-open-at-point,org-store-link): Support for mhe links.
-        (org-mhe-get-message-id, org-mhe-get-message-folder)
-        (org-mhe-get-header,org-follow-mhe-link): New functions.
-        (org-remove-angle-brackets, org-add-angle-brackets): New
-        functions.
-        (org-bracked-link-regexp): New constant.
-        (org-read-date): Fixed bug that was rejecting all typed dates.
+        (org-link-regexp): Add mhe prefix.
+        (org-open-at-point, org-store-link): Support for mhe links.
+        (org-mhe-get-message-real-folder, org-mhe-get-message-folder)
+        (org-mhe-get-message-folder-from-index, org-mhe-get-message-num)
+        (org-mhe-get-header, org-follow-mhe-link): New functions.
+        (org-remove-angle-brackets, org-add-angle-brackets):
+        New functions.
+        (org-bracket-link-regexp): New constant.
+        (org-read-date): Fix bug that was rejecting all typed dates.
         (org-link-search): Make hierarchy above visible after a match.
         (org-follow-bbdb-link): Inhibit electric mode for BBDB.
-        (org-store-link): Fixed bug with link creation when cursor is in
+        (org-store-link): Fix bug with link creation when cursor is in
         an empty line.
-        (org-open-at-point): Fixed bug with matching a link.  Fixed buggy
-        argument sequence in call to `org-view-tags'.
+        (org-open-at-point): Fix bug with matching a link.
+        Fixed buggy argument sequence in call to `org-view-tags'.
         (org-compile-prefix-format): Set `org-prefix-has-tag'.
         (org-prefix-has-tag): New variable.
-        (org-format-agenda-item): Remove tags from headline if
-        appropriate.
+        (org-format-agenda-item): Remove tags from headline
+        if appropriate.
         (org-agenda-remove-tags-when-in-prefix): New option.
 
 2006-02-21  Michael Kifer  <kifer@cs.stonybrook.edu>
-        
+
         * ediff-diff.el (ediff-setup-diff-regions, ediff-setup-diff-regions3):
-        fix the regular expressions.
-        
+        Fix the regular expressions.
+
 2006-02-21  Richard M. Stallman  <rms@gnu.org>
 
         * progmodes/sh-script.el (sh-mode): Set shell type based on file name
@@ -124,8 +181,8 @@
 
 2006-02-20  Chong Yidong  <cyd@stupidchicken.com>
 
-        * custom.el (customize-mark-to-save, customize-mark-as-set): Load
-        the symbol first.
+        * custom.el (customize-mark-to-save, customize-mark-as-set):
+        Load the symbol first.
 
 2006-02-20  Juanma Barranquero  <lekktu@gmail.com>
 
@@ -238,7 +295,7 @@
         * progmodes/gdb-ui.el (gdb-var-evaluate-expression-handler)
         (gdb-var-update-handler): Detect out of scope variables with pre
         GDB 6.4 too.
-        (gdb-post-prompt): Revert changet 2006-02-17 (force update).
+        (gdb-post-prompt): Revert change from 2006-02-17 (force update).
         Reset status of variable objects to nil in update handlers.
         (gdb-var-update-handler-1): Detect when a variable object comes
         in scope.  setcar on var changes gdb-var-list directly.
diff --git a/lisp/allout.el b/lisp/allout.el
index 69d72506fce..edce1e8d61e 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -1,7 +1,7 @@
 ;;; allout.el --- extensive outline mode for use alone and with other modes
 
 ;; Copyright (C) 1992, 1993, 1994, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Ken Manheimer <ken dot manheimer at gmail dot com>
 ;; Maintainer: Ken Manheimer <ken dot manheimer at gmail dot com>
@@ -5811,14 +5811,14 @@ the point does not move.  To ignore field boundaries bind
 (provide 'allout)
 
 ;;;_* Local emacs vars.
-;;; The following `allout-layout' local variable setting:
-;;;  - closes all topics from the first topic to just before the third-to-last,
-;;;  - shows the children of the third to last (config vars)
-;;;  - and the second to last (code section),
-;;;  - and closes the last topic (this local-variables section).
-;;;Local variables:
-;;;allout-layout: (0 : -1 -1 0)
-;;;End:
-
-;;; arch-tag: cf38fbc3-c044-450f-8bff-afed8ba5681c
+;; The following `allout-layout' local variable setting:
+;;  - closes all topics from the first topic to just before the third-to-last,
+;;  - shows the children of the third to last (config vars)
+;;  - and the second to last (code section),
+;;  - and closes the last topic (this local-variables section).
+;;Local variables:
+;;allout-layout: (0 : -1 -1 0)
+;;End:
+
+;; arch-tag: cf38fbc3-c044-450f-8bff-afed8ba5681c
 ;;; allout.el ends here
diff --git a/lisp/compare-w.el b/lisp/compare-w.el
index 2d23de8c54c..e61f24a0c7c 100644
--- a/lisp/compare-w.el
+++ b/lisp/compare-w.el
@@ -117,8 +117,14 @@ and the value `((4) (4))' for horizontally split windows."
   :version "22.1")
 
 (defcustom compare-windows-highlight t
-  "*Non-nil means compare-windows highlights the differences."
-  :type 'boolean
+  "*Non-nil means compare-windows highlights the differences.
+The value t removes highlighting immediately after invoking a command
+other than `compare-windows'.
+The value `persistent' leaves all highlighted differences.  You can clear
+out all highlighting later with the command `compare-windows-dehighlight'."
+  :type '(choice (const :tag "No highlighting" nil)
+                 (const :tag "Persistent highlighting" persistent)
+                 (other :tag "Highlight until next command" t))
   :group 'compare-w
   :version "22.1")
 
@@ -130,6 +136,8 @@ and the value `((4) (4))' for horizontally split windows."
 
 (defvar compare-windows-overlay1 nil)
 (defvar compare-windows-overlay2 nil)
+(defvar compare-windows-overlays1 nil)
+(defvar compare-windows-overlays2 nil)
 (defvar compare-windows-sync-point nil)
 
 ;;;###autoload
@@ -351,13 +359,22 @@ on third call it again advances points to the next difference and so on."
       (overlay-put compare-windows-overlay2 'face 'compare-windows)
       (overlay-put compare-windows-overlay2 'priority 1000))
     (overlay-put compare-windows-overlay2 'window w2)
-    ;; Remove highlighting before next command is executed
-    (add-hook 'pre-command-hook 'compare-windows-dehighlight)))
+    (if (not (eq compare-windows-highlight 'persistent))
+        ;; Remove highlighting before next command is executed
+        (add-hook 'pre-command-hook 'compare-windows-dehighlight)
+      (when compare-windows-overlay1
+        (push (copy-overlay compare-windows-overlay1) compare-windows-overlays1)
+        (delete-overlay compare-windows-overlay1))
+      (when compare-windows-overlay2
+        (push (copy-overlay compare-windows-overlay2) compare-windows-overlays2)
+        (delete-overlay compare-windows-overlay2)))))
 
 (defun compare-windows-dehighlight ()
   "Remove highlighting created by `compare-windows-highlight'."
   (interactive)
   (remove-hook 'pre-command-hook 'compare-windows-dehighlight)
+  (mapc 'delete-overlay compare-windows-overlays1)
+  (mapc 'delete-overlay compare-windows-overlays2)
   (and compare-windows-overlay1 (delete-overlay compare-windows-overlay1))
   (and compare-windows-overlay2 (delete-overlay compare-windows-overlay2)))
 
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index c77c92d05c7..87327dde482 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,38 @@
+2006-02-23  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * flow-fill.el (fill-flowed): Bind adaptive-fill-mode to nil.
+        Remove space stuffing, and only do quotes that actually start with
+        ">" at the beginning of the lines.
+        Merge of 2005-11-17 and 2004-07-25 from the trunk.
+
+2006-02-23  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * utf7.el (utf7-utf-16-coding-system): Fix comment.  utf-16-be is
+        also available in Emacs 21.3.
+
+        * message.el (message-fix-before-sending): Change "Emacs 22" to
+        "Emacs 23 (unicode)" in comment.
+
+        * qp.el (quoted-printable-encode-region): Change "Emacs 22" to
+        "Emacs 23 (unicode)" in comment.
+
+        * mm-util.el: Change "Emacs 22" to "Emacs 23 (unicode)" in
+        comment.
+        (mm-coding-system-p): Add comment about no-MULE XEmacs.
+
+        * mm-view.el (mm-fill-flowed): Add :version.
+
+2006-02-23  Ralf Angeli  <angeli@iwi.uni-sb.de>
+
+        * mm-view.el (mm-fill-flowed): New variable.
+        (mm-inline-text): Use it.
+
+2006-02-21  Wolfram Fenske  <wolfram.fenske@student.uni-magdeburg.de>
+        (tiny change)
+
+        * nnimap.el (nnimap-request-move-article): Change folder back to
+        source group before deleting.
+
 2006-02-20  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * rfc2047.el (rfc2047-charset-to-coding-system): Don't check the
@@ -1266,7 +1301,7 @@
 
         * gnus-topic.el (gnus-topic-mode): Ditto.
 
-2005-07-08  Ralf Angeli  <angeli@iwi.uni-sb.de>  (tiny change)
+2005-07-08  Ralf Angeli  <angeli@iwi.uni-sb.de>
 
         * gnus-art.el (gnus-article-next-page, gnus-article-next-page-1)
         (gnus-article-prev-page): Take scroll-margin into consideration.
diff --git a/lisp/gnus/flow-fill.el b/lisp/gnus/flow-fill.el
index c3f7f7bb20e..480505549c9 100644
--- a/lisp/gnus/flow-fill.el
+++ b/lisp/gnus/flow-fill.el
@@ -113,10 +113,15 @@ RFC 2646 suggests 66 characters for readability."
   (save-excursion
     (set-buffer (or (current-buffer) buffer))
     (goto-char (point-min))
+    ;; Remove space stuffing.
+    (while (re-search-forward "^ " nil t)
+      (delete-char -1)
+      (forward-line 1))
+    (goto-char (point-min))
     (while (re-search-forward " $" nil t)
       (when (save-excursion
               (beginning-of-line)
-              (looking-at "^\\(>*\\)\\( ?\\)"))
+              (looking-at "^\\(>+\\)\\( ?\\)"))
         (let ((quote (match-string 1))
               sig)
           (if (string= quote "")
@@ -146,7 +151,8 @@ RFC 2646 suggests 66 characters for readability."
             (condition-case nil
                 (let ((fill-prefix (when quote (concat quote " ")))
                       (fill-column (eval fill-flowed-display-column))
-                      filladapt-mode)
+                      filladapt-mode
+                      adaptive-fill-mode)
                   (fill-region (fill-flowed-point-at-bol)
                                (min (1+ (fill-flowed-point-at-eol))
                                     (point-max))
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 28325b73e26..1bdc2f6a11f 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -3615,8 +3615,8 @@ It should typically alter the sending method in some way or other."
           (when (let ((char (char-after)))
                   (or (< (mm-char-int char) 128)
                       (and (mm-multibyte-p)
-                           ;; Fixme: Wrong for Emacs 22 and for things
-                           ;; like undecable utf-8.  Should at least
+                           ;; FIXME: Wrong for Emacs 23 (unicode) and for
+                           ;; things like undecable utf-8.  Should at least
                            ;; use find-coding-systems-region.
                            (memq (char-charset char)
                                  '(eight-bit-control eight-bit-graphic
diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el
index 9bdbc3c72b1..a7f375aeba8 100644
--- a/lisp/gnus/mm-util.el
+++ b/lisp/gnus/mm-util.el
@@ -174,7 +174,7 @@ system object in XEmacs."
     (if (fboundp 'coding-system-p)
         (when (coding-system-p cs)
           cs)
-      ;; Is this branch ever actually useful?
+      ;; no-MULE XEmacs:
       (car (memq cs (mm-get-coding-system-list))))))
 
 (defvar mm-charset-synonym-alist
@@ -331,7 +331,7 @@ with Mule charsets.  It is completely useless for Emacs."
           cs mime mule alist)
       (while css
         (setq cs (pop css)
-              mime (or (coding-system-get cs :mime-charset) ; Emacs 22
+              mime (or (coding-system-get cs :mime-charset) ; Emacs 23 (unicode)
                        (coding-system-get cs 'mime-charset)))
         (when (and mime
                    (not (eq t (setq mule
diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el
index 43d6bddf194..c2b4e19f806 100644
--- a/lisp/gnus/mm-view.el
+++ b/lisp/gnus/mm-view.el
@@ -72,6 +72,12 @@
     (html2text  html2text))
   "The attributes of washer types for text/html.")
 
+(defcustom mm-fill-flowed t
+  "If non-nil an format=flowed article will be displayed flowed."
+  :type 'boolean
+  :version "22.1"
+  :group 'mime-display)
+
 ;;; Internal variables.
 
 ;;;
@@ -407,7 +413,8 @@
           (mm-insert-part handle)
           (goto-char (point-max)))
       (insert (mm-decode-string (mm-get-part handle) charset)))
-    (when (and (equal type "plain")
+    (when (and mm-fill-flowed
+               (equal type "plain")
                (equal (cdr (assoc 'format (mm-handle-type handle)))
                       "flowed"))
       (save-restriction
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index 26c0f8901ee..3c05b3713ea 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -1492,6 +1492,7 @@ function is generally only called when Gnus is shutting down."
                (setq result (eval accept-form))
                (kill-buffer buf)
                result)
+             (nnimap-possibly-change-group group server)
              (imap-message-flags-add
               (imap-range-to-message-set (list article))
               "\\Deleted" 'silent nnimap-server-buffer))
diff --git a/lisp/gnus/qp.el b/lisp/gnus/qp.el
index cb89a3550ba..15914922d1c 100644
--- a/lisp/gnus/qp.el
+++ b/lisp/gnus/qp.el
@@ -118,7 +118,7 @@ encode lines starting with \"From\"."
                   (not (eobp)))
         (insert
          (prog1
-             ;; To unibyte in case of Emacs 22 eight-bit.
+             ;; To unibyte in case of Emacs 23 (unicode) eight-bit.
              (format "=%02X" (mm-multibyte-char-to-unibyte (char-after)))
            (delete-char 1))))
       ;; Encode white space at the end of lines.
diff --git a/lisp/gnus/utf7.el b/lisp/gnus/utf7.el
index bb47077612e..a1b7fdc6702 100644
--- a/lisp/gnus/utf7.el
+++ b/lisp/gnus/utf7.el
@@ -80,7 +80,7 @@
 (defconst utf7-utf-16-coding-system
   (cond ((mm-coding-system-p 'utf-16-be-no-signature) ; Mule-UCS
          'utf-16-be-no-signature)
-        ((and (mm-coding-system-p 'utf-16-be) ; Emacs 22.1
+        ((and (mm-coding-system-p 'utf-16-be) ; Emacs 21.3, Emacs 22
               ;; Avoid versions with BOM.
               (= 2 (length (encode-coding-string "a" 'utf-16-be))))
          'utf-16-be)
diff --git a/lisp/help.el b/lisp/help.el
index f74293b8dd6..bed25366aab 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -835,8 +835,9 @@ follows the description of the major mode.)\n\n"))
         ;; Document the major mode.
         (let ((mode mode-name))
           (with-current-buffer standard-output
-            (insert mode)
-            (add-text-properties (- (point) (length mode)) (point) '(face bold))))
+            (let ((start (point)))
+              (insert (format-mode-line mode))
+              (add-text-properties start (point) '(face bold)))))
         (princ " mode:\n")
         (princ (documentation major-mode)))
       (print-help-return-message))))
@@ -932,7 +933,7 @@ is currently activated with completion."
 ;;; Automatic resizing of temporary buffers.
 
 (defcustom temp-buffer-max-height (lambda (buffer) (/ (- (frame-height) 2) 2))
-  "*Maximum height of a window displaying a temporary buffer.
+  "Maximum height of a window displaying a temporary buffer.
 This is the maximum height (in text lines) which `resize-temp-buffer-window'
 will give to a window displaying a temporary buffer.
 It can also be a function which will be called with the object corresponding
@@ -971,8 +972,7 @@ out of view."
          (funcall temp-buffer-max-height (current-buffer))
        temp-buffer-max-height))))
 
-;; Provide this for the sake of define-minor-mode which generates
-;; defcustoms which require 'help'.
+
 (provide 'help)
 
 ;; arch-tag: cf427352-27e9-49b7-9a6f-741ebab02423
diff --git a/lisp/info.el b/lisp/info.el
index e9d7f5ca2de..43ee5cabcbc 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -1642,7 +1642,9 @@ If DIRECTION is `backward', search in the reverse direction."
                               (and (search-backward "\^_" nil t)
                                    (looking-at
                                     "\^_\n\\(Tag Table\\|Local Variables\\)"))))))
-            (let ((search-spaces-regexp Info-search-whitespace-regexp))
+            (let ((search-spaces-regexp
+                   (if (or (not isearch-mode) isearch-regexp)
+                       Info-search-whitespace-regexp)))
               (if (if backward
                       (re-search-backward regexp bound t)
                     (re-search-forward regexp bound t))
@@ -1660,7 +1662,9 @@ If DIRECTION is `backward', search in the reverse direction."
       ;; If no subfiles, give error now.
       (if give-up
           (if (null Info-current-subfile)
-              (let ((search-spaces-regexp Info-search-whitespace-regexp))
+              (let ((search-spaces-regexp
+                     (if (or (not isearch-mode) isearch-regexp)
+                         Info-search-whitespace-regexp)))
                 (if backward
                     (re-search-backward regexp)
                   (re-search-forward regexp)))
@@ -1731,7 +1735,9 @@ If DIRECTION is `backward', search in the reverse direction."
                                     (and (search-backward "\^_" nil t)
                                          (looking-at
                                           "\^_\n\\(Tag Table\\|Local Variables\\)"))))))
-                  (let ((search-spaces-regexp Info-search-whitespace-regexp))
+                  (let ((search-spaces-regexp
+                         (if (or (not isearch-mode) isearch-regexp)
+                             Info-search-whitespace-regexp)))
                     (if (if backward
                             (re-search-backward regexp nil t)
                           (re-search-forward regexp nil t))
diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el
index 7e0cda786c7..db79d43d321 100644
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@ -259,20 +259,19 @@ detailed description of this mode.
   (gdb command-line)
   (gdb-init-1))
 
-(defcustom gdb-debug-log-length 128
-  "Length of `gdb-debug-log-ring'."
+(defcustom gdb-debug-ring-max 128
+  "Maximum size of `gdb-debug-ring'."
   :group 'gud
   :type 'integer
   :version "22.1")
 
-(defvar gdb-debug-log-ring (make-ring gdb-debug-log-length)
-  "Ring of commands sent to and replies received from GDB.
-This variable is used to debug GDB-UI.  Just need most recent
-messages and a ring limits the size.")
+(defvar gdb-debug-ring nil
+  "List of commands, most recent first, sent to and replies received from GDB.
+This variable is used to debug GDB-UI.")
 
 ;;;###autoload
-(defcustom gdb-enable-debug-log nil
-  "Non-nil means record the process input and output in `gdb-debug-log-ring'."
+(defcustom gdb-enable-debug nil
+  "Non-nil means record the process input and output in `gdb-debug-ring'."
   :type 'boolean
   :group 'gud
   :version "22.1")
@@ -445,11 +444,21 @@ With arg, use separate IO iff arg is positive."
     'gdb-mouse-set-clear-breakpoint)
   (define-key gud-minor-mode-map [left-fringe mouse-2]
     'gdb-mouse-until)
+  (define-key gud-minor-mode-map [left-margin drag-mouse-1]
+    'gdb-mouse-until)
   (define-key gud-minor-mode-map [left-fringe drag-mouse-1]
     'gdb-mouse-until)
   (define-key gud-minor-mode-map [left-margin mouse-2]
     'gdb-mouse-until)
-  (define-key gud-minor-mode-map [left-margin mouse-3]
+  (define-key gud-minor-mode-map [left-margin C-drag-mouse-1]
+    'gdb-mouse-jump)
+  (define-key gud-minor-mode-map [left-fringe C-drag-mouse-1]
+    'gdb-mouse-jump)
+  (define-key gud-minor-mode-map [left-fringe C-mouse-2]
+    'gdb-mouse-jump)
+  (define-key gud-minor-mode-map [left-margin C-mouse-2]
+    'gdb-mouse-jump)
+   (define-key gud-minor-mode-map [left-margin mouse-3]
     'gdb-mouse-toggle-breakpoint-margin)
   (define-key gud-minor-mode-map [left-fringe mouse-3]
     'gdb-mouse-toggle-breakpoint-fringe)
@@ -479,7 +488,7 @@ With arg, use separate IO iff arg is positive."
         gdb-error nil
         gdb-macro-info nil
         gdb-buffer-fringe-width (car (window-fringes))
-        gdb-debug-log-ring (make-ring gdb-debug-log-length)
+        gdb-debug-ring nil
         gdb-signalled nil)
 
   (setq gdb-buffer-type 'gdba)
@@ -526,7 +535,9 @@ With arg, use separate IO iff arg is positive."
   (gdb-init-2))
 
 (defun gdb-mouse-until (event)
-  "Execute source lines by dragging the overlay arrow (fringe) with the mouse."
+  "Continue running until a source line past the current line.
+The destination source line can be selected either by clicking with mouse-2
+on the fringe/margin or dragging the arrow with mouse-1 (default bindings)."
   (interactive "e")
   (if gud-overlay-arrow-position
       (let ((start (event-start event))
@@ -552,6 +563,40 @@ With arg, use separate IO iff arg is positive."
                   (forward-char 2)
                   (gud-call (concat "until *%a")))))))))
 
+(defun gdb-mouse-jump (event)
+  "Set execution address/line.
+The destination source line can be selected either by clicking with mouse-2
+on the fringe/margin or dragging the arrow with mouse-1 (default bindings).
+Unlike gdb-mouse-until the destination address can be before the current
+line, and no execution takes place."
+  (interactive "e")
+  (if gud-overlay-arrow-position
+      (let ((start (event-start event))
+            (end  (event-end event))
+            (buffer (marker-buffer gud-overlay-arrow-position)) (line))
+        (if (not (string-match "Machine" mode-name))
+            (if (equal buffer (window-buffer (posn-window end)))
+                (with-current-buffer buffer
+                  (when (or (equal start end)
+                            (equal (posn-point start)
+                                   (marker-position
+                                    gud-overlay-arrow-position)))
+                    (setq line (line-number-at-pos (posn-point end)))
+           (progn (gud-call (concat "tbreak " (number-to-string line)))
+                  (gud-call (concat "jump " (number-to-string line)))))))
+          (if (equal (marker-buffer gdb-overlay-arrow-position)
+                     (window-buffer (posn-window end)))
+              (when (or (equal start end)
+                        (equal (posn-point start)
+                               (marker-position
+                                gdb-overlay-arrow-position)))
+                (save-excursion
+                  (goto-line (line-number-at-pos (posn-point end)))
+                  (forward-char 2)
+                  (progn
+                    (gud-call (concat "tbreak *%a"))
+                    (gud-call (concat "jump *%a"))))))))))
+
 (defcustom gdb-speedbar-auto-raise nil
   "If non-nil raise speedbar every time display of watch expressions is\
  updated."
@@ -974,7 +1019,7 @@ This filter may simply queue input for a later time."
   (let ((item (concat string "\n")))
     (if gud-running
       (progn
-        (if gdb-enable-debug-log (push (cons 'send item) gdb-debug-log-ring))
+        (if gdb-enable-debug (push (cons 'send item) gdb-debug-ring))
         (process-send-string proc item))
       (gdb-enqueue-input item))))
 
@@ -997,8 +1042,7 @@ This filter may simply queue input for a later time."
 
 (defun gdb-send-item (item)
   (setq gdb-flush-pending-output nil)
-  (if gdb-enable-debug-log
-      (ring-insert gdb-debug-log-ring (cons 'send-item item)))
+  (if gdb-enable-debug (push (cons 'send-item item) gdb-debug-ring))
   (setq gdb-current-item item)
   (let ((process (get-buffer-process gud-comint-buffer)))
     (if (eq (buffer-local-value 'gud-minor-mode gud-comint-buffer) 'gdba)
@@ -1248,8 +1292,10 @@ happens to be appropriate."
   "A gud marker filter for gdb.  Handle a burst of output from GDB."
   (if gdb-flush-pending-output
       nil
-    (if gdb-enable-debug-log
-        (ring-insert gdb-debug-log-ring (cons 'recv string)))
+    (when gdb-enable-debug
+        (push (cons 'recv string) gdb-debug-ring)
+        (if (> (length gdb-debug-ring) gdb-debug-ring-max)
+          (setcdr (nthcdr (1- gdb-debug-ring-max) gdb-debug-ring) nil)))
     ;; Recall the left over gud-marker-acc from last time.
     (setq gud-marker-acc (concat gud-marker-acc string))
     ;; Start accumulating output for the GUD buffer.
diff --git a/lisp/progmodes/glasses.el b/lisp/progmodes/glasses.el
index a8d2d8b8fe1..dadc9cffc7a 100644
--- a/lisp/progmodes/glasses.el
+++ b/lisp/progmodes/glasses.el
@@ -67,7 +67,7 @@
 
 
 (defcustom glasses-separator "_"
-  "*String to be displayed as a visual separator in identifiers.
+  "String to be displayed as a visual separator in identifiers.
 It is used both for adding missing separators and for replacing separators
 defined by `glasses-original-separator'.  If you don't want to add missing
 separators, set `glasses-separator' to an empty string.  If you don't want to
@@ -93,7 +93,7 @@ performed."
 
 
 (defcustom glasses-face nil
-  "*Face to be put on capitals of an identifier looked through glasses.
+  "Face to be put on capitals of an identifier looked through glasses.
 If it is nil, no face is placed at the capitalized letter.
 
 For example, you can set `glasses-separator' to an empty string and
@@ -106,13 +106,13 @@ but will have their capitals in bold."
 
 
 (defcustom glasses-separate-parentheses-p t
-  "*If non-nil, ensure space between an identifier and an opening parenthesis."
+  "If non-nil, ensure space between an identifier and an opening parenthesis."
   :group 'glasses
   :type 'boolean)
 
 
 (defcustom glasses-uncapitalize-p nil
-  "*If non-nil, downcase embedded capital letters in identifiers.
+  "If non-nil, downcase embedded capital letters in identifiers.
 Only identifiers starting with lower case letters are affected, letters inside
 other identifiers are unchanged."
   :group 'glasses
@@ -122,7 +122,7 @@ other identifiers are unchanged."
 
 
 (defcustom glasses-uncapitalize-regexp "[a-z]"
-  "*Regexp matching beginnings of words to be uncapitalized.
+  "Regexp matching beginnings of words to be uncapitalized.
 Only words starting with this regexp are uncapitalized.
 The regexp is case sensitive.
 It has any effect only when `glasses-uncapitalize-p' is non-nil."
@@ -133,7 +133,7 @@ It has any effect only when `glasses-uncapitalize-p' is non-nil."
 
 
 (defcustom glasses-convert-on-write-p nil
-  "*If non-nil, remove separators when writing glasses buffer to a file.
+  "If non-nil, remove separators when writing glasses buffer to a file.
 If you are confused by glasses so much, that you write the separators into code
 during coding, set this variable to t.  The separators will be removed on each
 file write then.
@@ -313,5 +313,5 @@ at places they belong to."
 (provide 'glasses)
 
 
-;;; arch-tag: a3515167-c89e-484f-90a1-d85143e52b12
+;; arch-tag: a3515167-c89e-484f-90a1-d85143e52b12
 ;;; glasses.el ends here
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index ea2586a31d6..5a09d5dd196 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -456,7 +456,8 @@ required by the caller."
             (while var-list
               (let* (char (depth 0) (start 0) (var (car var-list))
                           (expr (car var)) (varnum (nth 1 var))
-                          (type (nth 3 var)) (status (nth 5 var)))
+                          (type (nth 3 var)) (value (nth 4 var))
+                          (status (nth 5 var)))
                 (put-text-property
                  0 (length expr) 'face font-lock-variable-name-face expr)
                 (put-text-property
@@ -470,7 +471,7 @@ required by the caller."
                              (string-match "char \\*$" type)))
                     (speedbar-make-tag-line
                      'bracket ?? nil nil
-                     (concat expr "\t" (nth 4 var))
+                     (concat expr "\t" value)
                      (if (or parent (eq status 'out-of-scope))
                          nil 'gdb-edit-value)
                      nil
@@ -491,14 +492,12 @@ required by the caller."
                       (speedbar-make-tag-line
                        'bracket char
                        'gdb-speedbar-expand-node varnum
-                       (concat expr "\t"
-                               type "\t"
-                               (nth 4 var))
-                       (if (or parent status 'out-of-scope)
+                       (concat expr "\t" type "\t" value)
+                       (if (or parent status)
                          nil 'gdb-edit-value)
                        nil
-                       (if (and (or parent status) gdb-show-changed-values)
-                           'shadow t)
+                       (if (and (or parent (eq status 'out-of-scope))
+                                gdb-show-changed-values) 'shadow t)
                        depth)
                     (speedbar-make-tag-line
                      'bracket char
diff --git a/lisp/textmodes/org.el b/lisp/textmodes/org.el
index 4b62eeb87a7..cecfe7f5164 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.05
+;; Version: 4.06
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -81,6 +81,10 @@
 ;;
 ;; Changes since version 4.00:
 ;; ---------------------------
+;; Version 4.06
+;;    - HTML exporter treats targeted internal links.
+;;    - Bug fixes.
+;;
 ;; Version 4.05
 ;;    - Changes to internal link system (thanks to David Wainberg for ideas).
 ;;      - in-file links: [[Search String]] instead of <file:::Search String>
@@ -126,7 +130,7 @@
 
 ;;; Customization variables
 
-(defvar org-version "4.05"
+(defvar org-version "4.06"
   "The version number of the file org.el.")
 (defun org-version ()
   (interactive)
@@ -136,7 +140,7 @@
 ;; versions (Emacs versus XEmacs) and with different versions of outline.el.
 ;; The compatibility code in org.el is based on these two constants.
 (defconst org-xemacs-p (featurep 'xemacs)
-  "Are we running xemacs?")
+  "Are we running XEmacs?")
 (defconst org-noutline-p (featurep 'noutline)
   "Are we using the new outline mode?")
 
@@ -1647,7 +1651,7 @@ Otherwise the buffer will just be saved to a file and stay hidden."
   :type 'boolean)
 
 (defcustom org-export-html-show-new-buffer nil
-  "Non-nil means,  popup buffer containing the exported html text.
+  "Non-nil means, popup buffer containing the exported HTML text.
 Otherwise, the buffer will just be saved to a file and stay hidden."
   :group 'org-export
   :type 'boolean)
@@ -1995,8 +1999,8 @@ When this is non-nil, the headline after the keyword is set to the
 ;; an update.
 (defvar org-table-may-need-update t
   "Indicates that a table might need an update.
-This variable is set by `org-before-change-function'. `org-table-align'
-sets it back to nil.")
+This variable is set by `org-before-change-function'.
+`org-table-align'sets it back to nil.")
 (defvar org-mode-hook nil)
 (defvar org-inhibit-startup nil)        ; Dynamically-scoped param.
 (defvar org-agenda-keep-modes nil)      ; Dynamically-scoped param.
@@ -2656,7 +2660,7 @@ or nil."
 
 (defun org-insert-item ()
   "Insert a new item at the current level.
-Return t when tings worked, nil when we are not in an item."
+Return t when things worked, nil when we are not in an item."
   (when (save-excursion
           (condition-case nil
               (progn
@@ -3367,7 +3371,7 @@ At all other locations, this simply calls `ispell-complete-word'."
                     (save-excursion
                       (goto-char (point-min))
                       (while (re-search-forward org-todo-line-regexp nil t)
-                        (push (list 
+                        (push (list
                                (if org-file-link-context-use-camel-case
                                    (org-make-org-heading-camel (match-string 3) t)
                                  (org-make-org-heading-search-string
@@ -6984,7 +6988,7 @@ to read."
   (interactive)
   (setq pos (or pos (point)))
   (setq org-mark-ring (nthcdr (1- org-mark-ring-length) org-mark-ring))
-  (move-marker (car org-mark-ring) 
+  (move-marker (car org-mark-ring)
                (or pos (point))
                (or buffer (current-buffer)))
   (message
@@ -7132,14 +7136,14 @@ onto the ring."
 ;; mh-e integration based on planner-mode
 (defun org-mhe-get-message-real-folder ()
   "Return the name of the current message real folder, so if you use
-  sequences, it will now work."
+sequences, it will now work."
   (save-excursion
     (let* ((folder
             (if (equal major-mode 'mh-folder-mode)
                 mh-current-folder
               ;; Refer to the show buffer
               mh-show-folder-buffer))
-           (end-index 
+           (end-index
             (if (boundp 'mh-index-folder)
                 (min (length mh-index-folder) (length folder))))
            )
@@ -7162,8 +7166,7 @@ onto the ring."
       )))
 
 (defun org-mhe-get-message-folder-from-index ()
-  "Returns the name of the message folder in a index folder
-  buffer."
+  "Returns the name of the message folder in a index folder buffer."
   (save-excursion
     (mh-index-previous-folder)
     (if (not (re-search-forward "^\\(+.*\\)$" nil t))
@@ -7171,8 +7174,8 @@ onto the ring."
       (message (match-string 1)))))
 
 (defun org-mhe-get-message-folder ()
-  "Return the name of the current message folder. Be careful if you
-  use sequences."
+  "Return the name of the current message folder.  Be careful if you
+use sequences."
   (save-excursion
     (if (equal major-mode 'mh-folder-mode)
         mh-current-folder
@@ -7180,8 +7183,8 @@ onto the ring."
       mh-show-folder-buffer)))
 
 (defun org-mhe-get-message-num ()
-  "Return the number of the current message. Be careful if you
-  use sequences."
+  "Return the number of the current message.  Be careful if you
+use sequences."
   (save-excursion
     (if (equal major-mode 'mh-folder-mode)
         (mh-get-msg-num nil)
@@ -7189,9 +7192,9 @@ onto the ring."
       (mh-show-buffer-message-number))))
 
 (defun org-mhe-get-header (header)
-  "Return a header of the message in folder mode. This will create a
-  show buffer for the corresponding message. If you have a more clever
-  idea..."
+  "Return a header of the message in folder mode.  This will create a
+show buffer for the corresponding message.  If you have a more clever
+idea..."
   (let* ((folder (org-mhe-get-message-folder))
          (num (org-mhe-get-message-num))
          (buffer (get-buffer-create (concat "show-" folder)))
@@ -7211,13 +7214,14 @@ onto the ring."
 (defun org-follow-mhe-link (folder article)
   "Follow an MHE link to FOLDER and ARTICLE."
   (setq article (org-add-angle-brackets article))
-;;  (require 'mh-e)
-  (mh-rmail) ;; mh-e is standard with emacs 22
+  (require 'mh-e)
+  (mh-find-path)
   (let* ((show-buf (concat "show-" folder)))
+    (mh-visit-folder folder)
     (get-buffer-create show-buf)
-    (mh-display-msg
+    (mh-show-msg
      (string-to-number
-      (car (split-string 
+      (car (split-string
             (with-temp-buffer
               (call-process
                (expand-file-name "pick" mh-progs)
@@ -7226,8 +7230,7 @@ onto the ring."
                "--message-id"
                article)
               (buffer-string))
-            "\n")))
-     folder)
+            "\n"))))
     (pop-to-buffer show-buf)))
 
 (defun org-open-file (path &optional in-emacs line search)
@@ -7383,7 +7386,7 @@ For file links, arg negates `org-context-in-file-links'."
         (setq cpltxt (concat from-header " on: " subject))
         (setq link (concat cpltxt "\n  "
                            (org-make-link
-                            "mhe:" (org-mhe-get-message-real-folder) "#" 
+                            "mhe:" (org-mhe-get-message-real-folder) "#"
                             (org-remove-angle-brackets
                              (org-mhe-get-header "Message-Id:")))))))
 
@@ -7491,7 +7494,7 @@ For file links, arg negates `org-context-in-file-links'."
       (error "Cannot link to a buffer which is not visiting a file"))
 
      (t (setq link nil)))
-    
+
     (if (and (interactive-p) link)
         (progn
           (setq org-stored-links
@@ -7500,7 +7503,7 @@ For file links, arg negates `org-context-in-file-links'."
       link)))
 
 (defun org-make-org-heading-search-string (&optional string heading)
-  "Make search string for S or current headline."
+  "Make search string for STRING or current headline."
   (interactive)
   (let ((s (or string (org-get-heading))))
     (unless (and string (not heading))
@@ -7521,7 +7524,7 @@ For file links, arg negates `org-context-in-file-links'."
     (mapconcat 'identity (org-split-string s "[ \t]+") " ")))
 
 (defun org-make-org-heading-camel (&optional string heading)
-  "Make a CamelCase string for S or the current headline."
+  "Make a CamelCase string for STRING or the current headline."
   (interactive)
   (let ((s (or string (org-get-heading))))
     (unless (and string (not heading))
@@ -8638,8 +8641,8 @@ Point and mark define the first and last line to include.  Both point and
 mark should be in the column that is used for sorting.  For example, to
 sort according to column 3, put the mark in the first line to sort, in
 table column 3.  Put point into the last line to be included in the sorting,
-also in table column 3. The command will prompt for the sorting method (n for
-numerical, a for alphanumeric)."
+also in table column 3.  The command will prompt for the sorting method
+\(n for numerical, a for alphanumeric)."
   (interactive "r\nsSorting method: [n]=numeric [a]=alpha: ")
   (setq numericp (string-match "[nN]" numericp))
   (org-table-align) ;; Just to be safe
@@ -9478,8 +9481,8 @@ not overwrite the stored one."
             (if (= c ?p) (setq modes (org-set-calc-mode 'calc-internal-prec n))
               (setq modes (org-set-calc-mode
                            'calc-float-format
-                           (list (cdr (assoc c '((?n. float) (?f. fix)
-                                                 (?s. sci) (?e. eng))))
+                           (list (cdr (assoc c '((?n . float) (?f . fix)
+                                                 (?s . sci) (?e . eng))))
                                  n))))
             (setq fmt (replace-match "" t t fmt)))
           (while (string-match "[DRFS]" fmt)
@@ -10440,6 +10443,45 @@ The list contains HTML entities for Latin-1, Greek and other symbols.
 It is supplemented by a number of commonly used TeX macros with appropriate
 translations.  There is currently no way for users to extend this.")
 
+(defun org-cleaned-string-for-export (string)
+  "Cleanup a buffer substring so that links can be created safely."
+  (interactive)
+  (let* ((cb (current-buffer))
+         (re-radio (concat "\\([^<]\\)\\(" org-target-link-regexp "\\)"))
+         rtn)
+    (save-excursion
+      (set-buffer (get-buffer-create " org-mode-tmp"))
+      (erase-buffer)
+      (insert string)
+      (org-mode)
+      ;; Find targets in comments and move them out of comments
+      (goto-char (point-min))
+      (while (re-search-forward "^#.*?\\(<<<?[^>\r\n]+>>>?\\).*" nil t)
+        (replace-match "\\1"))
+      ;; Find matches for radio targets and turn them into links
+      (goto-char (point-min))
+      (while (re-search-forward re-radio nil t)
+        (replace-match "\\1[[\\2]]"))
+      ;; Find all links that contain a newline and put them into a single line
+      (goto-char (point-min))
+      (while (re-search-forward "\\(\\[\\[[^]]*?\\)[ \t]*\n[ \t]*\\([^]]*\\]\\]\\)" nil t)
+        (replace-match "\\1 \\2")
+        (goto-char (match-beginning 0)))
+      ;; Remove comments
+      (goto-char (point-min))
+      (while (re-search-forward "^#.*\n?" nil t)
+        (replace-match ""))
+      (setq rtn (buffer-string)))
+    (kill-buffer " org-mode-tmp")
+    rtn))
+
+(defun org-solidify-link-text (s)
+  "Take link text and make a safe target out of it."
+  (save-match-data
+    (mapconcat
+     'identity
+     (org-split-string s "[ \t\r\n]+") "--")))
+
 (defvar org-last-level nil) ; dynamically scoped variable
 
 (defun org-export-as-ascii (arg)
@@ -10454,7 +10496,10 @@ underlined headlines.  The default is 3."
            (if (org-region-active-p) (region-beginning) (point-min))
            (if (org-region-active-p) (region-end) (point-max))))
          (lines (org-export-find-first-heading-line
-                 (org-skip-comments (org-split-string region "[\r\n]"))))
+                 (org-skip-comments
+                  (org-split-string
+                   (org-cleaned-string-for-export region)
+                   "[\r\n]"))))
          (org-startup-with-deadline-check nil)
          (level 0) line txt
          (umax nil)
@@ -10543,6 +10588,14 @@ underlined headlines.  The default is 3."
     (while (setq line (pop lines))
       ;; Remove the quoted HTML tags.
       (setq line (org-html-expand-for-ascii line))
+      ;; Remove targets
+      (while (string-match "<<<?[^<>]*>>>?[ \t]*\n?" line)
+        (setq line (replace-match "" t t line)))
+      ;; Replace internal links
+      (while (string-match org-bracket-link-regexp line)
+        (setq line (replace-match
+                    (if (match-end 3) "[\\3]" "[\\1]")
+                    t nil line)))
       (cond
        ((string-match "^\\(\\*+\\)[ \t]*\\(.*\\)" line)
         ;; a Headline
@@ -10781,7 +10834,9 @@ headlines.  The default is 3.  Lower levels will become bulleted lists."
            (if region-p (region-beginning) (point-min))
            (if region-p (region-end) (point-max))))
          (all_lines
-          (org-skip-comments (org-split-string region "[\r\n]")))
+          (org-skip-comments (org-split-string
+                              (org-cleaned-string-for-export region)
+                              "[\r\n]")))
          (lines (org-export-find-first-heading-line all_lines))
          (level 0) (line "") (origline "") txt todo
          (umax nil)
@@ -10944,7 +10999,26 @@ headlines.  The default is 3.  Lower levels will become bulleted lists."
               (insert "</pre>\n"))
             (throw 'nextline nil))
 
-          ;; Protect the links
+
+          ;; make targets to anchors
+          (while (string-match "<<<?\\([^<>]*\\)>>>?[ \t]*\n?" line)
+            (setq line (replace-match
+                        (concat "@<a name=\""
+                                (org-solidify-link-text (match-string 1 line))
+                                "\">\\nbsp@</a>")
+                        t t line)))
+          ;; Replace internal links
+          (while (string-match org-bracket-link-regexp line)
+            (setq line (replace-match
+                        (concat
+                            "@<a href=\"#"
+                            (org-solidify-link-text (match-string 1 line))
+                            "\">"
+                            (match-string (if (match-end 3) 3 1) line)
+                            "@</a>")
+                        t t line)))
+
+          ;; Protect the external links
           (setq start 0)
           (while (string-match org-link-maybe-angles-regexp line start)
             (setq start (match-end 0))
@@ -11122,7 +11196,7 @@ headlines.  The default is 3.  Lower levels will become bulleted lists."
         (org-format-table-table-html-using-table-generate-source olines)))))
 
 (defun org-format-org-table-html (lines)
-  "Format a table into html."
+  "Format a table into HTML."
   (if (string-match "^[ \t]*|-" (car lines)) (setq lines (cdr lines)))
   (setq lines (nreverse lines))
   (if (string-match "^[ \t]*|-" (car lines)) (setq lines (cdr lines)))
@@ -11149,7 +11223,7 @@ headlines.  The default is 3.  Lower levels will become bulleted lists."
                                     (string-match "^[ \t]*|[^|]*|" x))
                                 (replace-match "|" t t x))))
                        lines))))))
-  
+
   (let ((head (and org-export-highlight-first-table-line
                    (delq nil (mapcar
                               (lambda (x) (string-match "^[ \t]*|-" x))
@@ -11188,7 +11262,7 @@ headlines.  The default is 3.  Lower levels will become bulleted lists."
     newstr))
 
 (defun org-format-table-table-html (lines)
-  "Format a table generated by table.el into html.
+  "Format a table generated by table.el into HTML.
 This conversion does *not* use `table-generate-source' from table.el.
 This has the advantage that Org-mode's HTML conversions can be used.
 But it has the disadvantage, that no cell- or row-spanning is allowed."
@@ -12363,8 +12437,9 @@ work correctly."
 
 (defun org-add-hook (hook function &optional append local)
   "Add-hook, compatible with both Emacsen."
-  (if (and local org-xemacs-p) (make-local-hook hook)) ;; Needed for XEmacs
-  (add-hook hook function append local))
+  (if (and local org-xemacs-p)
+      (add-local-hook hook function append)
+    (add-hook hook function append local)))
 
 (defun org-region-active-p ()
   "Is `transient-mark-mode' on and the region active?