Mercurial > emacs

--- a/etc/ChangeLog	Thu Feb 23 16:05:25 2006 +0000
+++ b/etc/ChangeLog	Fri Feb 24 13:44:56 2006 +0000
@@ -1,3 +1,7 @@
+2006-02-23  Herbert Euler  <herberteuler@hotmail.com>  (tiny change)
+
+	* TUTORIAL.cn: Fix omission bug: Add dot (ASCII 0x2E) on first line.
+
 2006-02-22  Carsten Dominik  <dominik@science.uva.nl>

 	* orgcard.tex: (section{Links}): Rewritten to cover the modified
--- a/etc/TUTORIAL.cn	Thu Feb 23 16:05:25 2006 +0000
+++ b/etc/TUTORIAL.cn	Fri Feb 24 13:44:56 2006 +0000
@@ -1,4 +1,4 @@
-Emacs 快速指南（查看版权声明请至本文末尾）
+Emacs 快速指南.（查看版权声明请至本文末尾）

 【注意：位于【】之间的内容是译注，比如本行，下同。】
--- a/etc/orgcard.tex	Thu Feb 23 16:05:25 2006 +0000
+++ b/etc/orgcard.tex	Fri Feb 24 13:44:56 2006 +0000
@@ -1,4 +1,4 @@
-% Reference Card for Org Mode 4.05
+% Reference Card for Org Mode 4.06
 %
 %**start of header
 \newcount\columnsperpage
@@ -58,7 +58,7 @@
 % Thanks to Paul Rubin, Bob Chassell, Len Tower, and Richard Mlynarik
 % for their many good ideas.

-\def\orgversionnumber{4.05}
+\def\orgversionnumber{4.06}
 \def\year{2006}

 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
--- a/lisp/ChangeLog	Thu Feb 23 16:05:25 2006 +0000
+++ b/lisp/ChangeLog	Fri Feb 24 13:44:56 2006 +0000
@@ -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-vars.el: (reftex-try-all-extensions): New
-	option.
-
-	* textmodes/reftex.el: (reftex-locate-file): Search all extensions
+	* textmodes/reftex.el (reftex-locate-file): Remove duplicate function.
+
+	* textmodes/reftex-vars.el (reftex-try-all-extensions): New option.
+
+	* 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.
--- a/lisp/allout.el	Thu Feb 23 16:05:25 2006 +0000
+++ b/lisp/allout.el	Fri Feb 24 13:44:56 2006 +0000
@@ -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 @@
 (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
--- a/lisp/compare-w.el	Thu Feb 23 16:05:25 2006 +0000
+++ b/lisp/compare-w.el	Fri Feb 24 13:44:56 2006 +0000
@@ -117,8 +117,14 @@
   :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 @@

 (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 @@
       (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)))
--- a/lisp/gnus/ChangeLog	Thu Feb 23 16:05:25 2006 +0000
+++ b/lisp/gnus/ChangeLog	Fri Feb 24 13:44:56 2006 +0000
@@ -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.
--- a/lisp/gnus/flow-fill.el	Thu Feb 23 16:05:25 2006 +0000
+++ b/lisp/gnus/flow-fill.el	Fri Feb 24 13:44:56 2006 +0000
@@ -113,10 +113,15 @@
   (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 @@
 	    (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))
--- a/lisp/gnus/message.el	Thu Feb 23 16:05:25 2006 +0000
+++ b/lisp/gnus/message.el	Fri Feb 24 13:44:56 2006 +0000
@@ -3615,8 +3615,8 @@
 	  (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
--- a/lisp/gnus/mm-util.el	Thu Feb 23 16:05:25 2006 +0000
+++ b/lisp/gnus/mm-util.el	Fri Feb 24 13:44:56 2006 +0000
@@ -174,7 +174,7 @@
     (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 @@
 	  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
--- a/lisp/gnus/mm-view.el	Thu Feb 23 16:05:25 2006 +0000
+++ b/lisp/gnus/mm-view.el	Fri Feb 24 13:44:56 2006 +0000
@@ -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
--- a/lisp/gnus/nnimap.el	Thu Feb 23 16:05:25 2006 +0000
+++ b/lisp/gnus/nnimap.el	Fri Feb 24 13:44:56 2006 +0000
@@ -1492,6 +1492,7 @@
 	       (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))
--- a/lisp/gnus/qp.el	Thu Feb 23 16:05:25 2006 +0000
+++ b/lisp/gnus/qp.el	Fri Feb 24 13:44:56 2006 +0000
@@ -118,7 +118,7 @@
 		  (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.
--- a/lisp/gnus/utf7.el	Thu Feb 23 16:05:25 2006 +0000
+++ b/lisp/gnus/utf7.el	Fri Feb 24 13:44:56 2006 +0000
@@ -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)
--- a/lisp/help.el	Thu Feb 23 16:05:25 2006 +0000
+++ b/lisp/help.el	Fri Feb 24 13:44:56 2006 +0000
@@ -835,8 +835,9 @@
 	;; 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 @@
 ;;; 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 @@
 	 (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
--- a/lisp/info.el	Thu Feb 23 16:05:25 2006 +0000
+++ b/lisp/info.el	Fri Feb 24 13:44:56 2006 +0000
@@ -1642,7 +1642,9 @@
 			      (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 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 @@
 				    (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))
--- a/lisp/progmodes/gdb-ui.el	Thu Feb 23 16:05:25 2006 +0000
+++ b/lisp/progmodes/gdb-ui.el	Fri Feb 24 13:44:56 2006 +0000
@@ -259,20 +259,19 @@
   (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 @@
     '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 @@
 	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 @@
   (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 @@
 		  (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 @@
   (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 @@

 (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 @@
   "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.
--- a/lisp/progmodes/glasses.el	Thu Feb 23 16:05:25 2006 +0000
+++ b/lisp/progmodes/glasses.el	Fri Feb 24 13:44:56 2006 +0000
@@ -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 @@


 (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 @@


 (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 @@


 (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 @@


 (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 @@
 (provide 'glasses)


-;;; arch-tag: a3515167-c89e-484f-90a1-d85143e52b12
+;; arch-tag: a3515167-c89e-484f-90a1-d85143e52b12
 ;;; glasses.el ends here
--- a/lisp/progmodes/gud.el	Thu Feb 23 16:05:25 2006 +0000
+++ b/lisp/progmodes/gud.el	Fri Feb 24 13:44:56 2006 +0000
@@ -456,7 +456,8 @@
 	    (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 @@
 			     (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 @@
 		      (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
--- a/lisp/textmodes/org.el	Thu Feb 23 16:05:25 2006 +0000
+++ b/lisp/textmodes/org.el	Fri Feb 24 13:44:56 2006 +0000
@@ -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 @@
   :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 @@
 ;; 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 @@

 (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 @@
 		    (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 @@
   (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 @@
 ;; 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 @@
       )))

 (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 @@
       (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 @@
       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 @@
       (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 @@
 (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 @@
 	       "--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 @@
 	(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 @@
       (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 @@
       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 @@
     (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 @@
 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 @@
 	    (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 @@
 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 @@
 	   (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 @@
     (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 @@
            (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 @@
 	      (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 @@
 	(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 @@
 				    (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 @@
     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 @@

 (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?
--- a/man/ChangeLog	Thu Feb 23 16:05:25 2006 +0000
+++ b/man/ChangeLog	Fri Feb 24 13:44:56 2006 +0000
@@ -1,3 +1,30 @@
+2006-02-23  Juri Linkov  <juri@jurta.org>
+
+	* faq.texi (Common requests): Move `Turning on auto-fill by
+	default' after `Wrapping words automatically'.  Move `Working with
+	unprintable characters' before `Searching for/replacing newlines'.
+	Move `Replacing highlighted text' after `Highlighting a region'.
+	Merge `Repeating commands' and `Repeating a command as many times
+	as possible' into the former.
+	(Packages that do not come with Emacs): Add refs to Gmane and
+	etc/MORE.STUFF.
+
+2006-02-23  Juri Linkov  <juri@jurta.org>
+
+	* faq.texi (Newsgroup archives): Update URLs of GNU mail archives.
+	(Reporting bugs): Suggest using `M-x report-emacs-bug'.
+	Add xref to `(emacs)Reporting Bugs'.
+	(Getting a printed manual): Add URL to other formats of the manual.
+	(Common requests): Fix menu.
+	(Highlighting a region): Remove ref to `Turning on syntax highlighting'.
+	(Horizontal scrolling): Mention `truncate-partial-width-windows'.
+	(Inserting text at the beginning of each line): Add pxref to
+	`Changing the included text prefix'.
+	(Forcing the cursor to remain in the same column): Mention `track-eol'
+	and `set-goal-column'.  Add pxref to `(emacs)Moving Point'.
+	(Replacing text across multiple files): Add keybinding `Q' for
+	`dired-do-query-replace'.
+
 2006-02-22  Carsten Dominik  <dominik@science.uva.nl>

 	* reftex.texi: Version number and date change only.
--- a/man/faq.texi	Thu Feb 23 16:05:25 2006 +0000
+++ b/man/faq.texi	Fri Feb 24 13:44:56 2006 +0000
@@ -423,14 +423,17 @@
 archive is not particularly well organized or easy to retrieve
 individual postings from, but pretty much everything is there.

-The archive is at @uref{ftp://ftp-mailing-list-archives.gnu.org}.
+The archive is at @uref{ftp://lists.gnu.org/}.

 The archive can be browsed over the web at
-@uref{http://mail.gnu.org/archive/html/, the GNU mail archive}.
+@uref{http://lists.gnu.org/archive/html/, the GNU mail archive}.

 Web-based Usenet search services, such as
-@uref{http://groups.google.com, Google}, also archive the
-@code{gnu.*} groups.
+@uref{http://groups.google.com/groups/dir?sel=33592484, Google}, also
+archive the @code{gnu.*} groups.
+
+You can read the archives of the @code{gnu.*} groups and post new
+messages at @uref{http://gmane.org/, Gmane}.

 @node Reporting bugs, Unsubscribing from Emacs lists, Newsgroup archives, General questions
 @section Where should I report bugs and other problems with Emacs?
@@ -439,16 +442,19 @@
 @cindex How to submit a bug report
 @cindex Reporting bugs

-The correct way to report Emacs bugs is by e-mail to
-@email{bug-gnu-emacs@@gnu.org}.  Anything sent here also appears in the
+The correct way to report Emacs bugs is to use the command
+@kbd{M-x report-emacs-bug}.  It sets up a mail buffer with the
+essential information and the correct e-mail address which is
+@email{bug-gnu-emacs@@gnu.org} for the released versions of Emacs.
+Anything sent to @email{bug-gnu-emacs@@gnu.org} also appears in the
 newsgroup @uref{news:gnu.emacs.bug}, but please use e-mail instead of
 news to submit the bug report.  This ensures a reliable return address
 so you can be contacted for further details.

 Be sure to read the ``Bugs'' section of the Emacs manual before reporting
-a bug to bug-gnu-emacs!  The manual describes in detail how to submit a
-useful bug report.  (@xref{On-line manual}, if you don't know how to read the
-manual.)
+a bug!  The manual describes in detail how to submit a useful bug
+report (@pxref{Bugs, , Reporting Bugs, emacs, The GNU Emacs Manual}).
+(@xref{On-line manual}, if you don't know how to read the manual.)

 RMS says:

@@ -674,6 +680,10 @@

 @uref{http://www.gnu.org/software/emacs/manual/emacs.html}

+The manual is available in other formats at
+
+@uref{http://www.gnu.org/software/emacs/manual/}
+
 @xref{Learning how to do something}, for how to view the manual on-line.

 @node Emacs Lisp documentation, Installing Texinfo documentation, Getting a printed manual, Getting help
@@ -763,12 +773,19 @@

 @itemize @bullet
 @item
-Info files don't actually need to be installed before being used.  You
-can feed a file name to the @code{Info-goto-node} command (invoked by
-pressing @key{g} in Info mode) by typing the name of the file in
-parentheses.  This goes to the node named ``Top'' in that file.  For
-example, to view a Info file named @file{@var{info-file}} in your home
-directory, you can type this:
+Info files don't actually need to be installed before being used.
+You can use a prefix argument for the @code{info} command and specify
+the name of the Info file in the minibuffer.  This goes to the node
+named @samp{Top} in that file.  For example, to view a Info file named
+@file{@var{info-file}} in your home directory, you can type this:
+
+@example
+@kbd{C-u C-h i ~/@var{info-file} @key{RET}}
+@end example
+
+Alternatively, you can feed a file name to the @code{Info-goto-node}
+command (invoked by pressing @key{g} in Info mode) by typing the name
+of the file in parentheses, like this:

 @example
 @kbd{C-h i g (~/@var{info-file}) @key{RET}}
@@ -1074,7 +1091,7 @@

 Emacs @value{VER} is the current version as of this writing.

-@node New in Emacs 20,  New in Emacs 21, Latest version of Emacs, Status of Emacs
+@node New in Emacs 20, New in Emacs 21, Latest version of Emacs, Status of Emacs
 @section What is different about Emacs 20?
 @cindex Differences between Emacs 19 and Emacs 20
 @cindex Emacs 20, new features in
@@ -1122,7 +1139,7 @@
 that you can now have colors when you run Emacs on a GNU/Linux console
 and on @code{xterm} with @kbd{emacs -nw}.

-@node New in Emacs 22, , New in Emacs 21, Status of Emacs
+@node New in Emacs 22,  , New in Emacs 21, Status of Emacs
 @section What is different about Emacs 22?
 @cindex Differences between Emacs 21 and Emacs 22
 @cindex Emacs 22, new features in
@@ -1163,19 +1180,20 @@
 @menu
 * Setting up a customization file::
 * Using Customize::
+* Colors on a TTY::
 * Debugging a customization file::
-* Colors on a TTY::
 * Displaying the current line or column::
 * Displaying the current file name in the titlebar::
 * Turning on abbrevs by default::
-* Turning on auto-fill by default::
 * Associating modes with files::
+* Highlighting a region::
+* Replacing highlighted text::
+* Controlling case sensitivity::
 * Working with unprintable characters::
-* Highlighting a region::
-* Controlling case sensitivity::
-* Wrapping words automatically::
 * Searching for/replacing newlines::
 * Yanking text in isearch::
+* Wrapping words automatically::
+* Turning on auto-fill by default::
 * Spell-checkers::
 * Checking TeX and *roff documents::
 * Changing load-path::
@@ -1196,7 +1214,6 @@
 * Changing the length of a Tab::
 * Inserting text at the beginning of each line::
 * Underlining paragraphs::
-* Repeating a command as many times as possible::
 * Forcing the cursor to remain in the same column::
 * Forcing Emacs to iconify itself::
 * Using regular expressions::
@@ -1209,7 +1226,6 @@
 * Deleting menus and menu options::
 * Turning on syntax highlighting::
 * Scrolling only one line::
-* Replacing highlighted text::
 * Editing MS-DOS files::
 * Filling paragraphs with a single space::
 * Escape sequences in shell output::
@@ -1387,7 +1403,7 @@
 (setq frame-title-format "%b")
 @end lisp

-@node Turning on abbrevs by default, Turning on auto-fill by default, Displaying the current file name in the titlebar, Common requests
+@node Turning on abbrevs by default, Associating modes with files, Displaying the current file name in the titlebar, Common requests
 @section How do I turn on abbrevs by default just in mode @var{mymode}?
 @cindex Abbrevs, turning on by default

@@ -1406,30 +1422,7 @@
 Starting with Emacs 22, the standard abbrevs file is read automatically
 at startup, so the first of these two forms becomes unnecessary.

-@node Turning on auto-fill by default, Associating modes with files, Turning on abbrevs by default, Common requests
-@section How do I turn on @code{auto-fill-mode} by default?
-@cindex @code{auto-fill-mode}, activating automatically
-@cindex Filling automatically
-@cindex Automatic entry to @code{auto-fill-mode}
-
-To turn on @code{auto-fill-mode} just once for one buffer, use @kbd{M-x
-auto-fill-mode}.
-
-To turn it on for every buffer in a certain mode, you must use the hook
-for that mode.  For example, to turn on @code{auto-fill} mode for all
-text buffers, including the following in your @file{.emacs} file:
-
-@lisp
-(add-hook 'text-mode-hook 'turn-on-auto-fill)
-@end lisp
-
-If you want @code{auto-fill} mode on in all major modes, do this:
-
-@lisp
-(setq-default auto-fill-function 'do-auto-fill)
-@end lisp
-
-@node Associating modes with files, Working with unprintable characters, Turning on auto-fill by default, Common requests
+@node Associating modes with files, Highlighting a region, Turning on abbrevs by default, Common requests
 @section How do I make Emacs use a certain major mode for certain files?
 @cindex Associating modes with files
 @cindex File extensions and modes
@@ -1459,7 +1452,81 @@
 indicate which mode to use.  Use @kbd{C-h v} (or @kbd{M-x
 describe-variable}) on @code{interpreter-mode-alist} to learn more.

-@node Working with unprintable characters, Highlighting a region, Associating modes with files, Common requests
+@node Highlighting a region, Replacing highlighted text, Associating modes with files, Common requests
+@section How can I highlight a region of text in Emacs?
+@cindex Highlighting text
+@cindex Text, highlighting
+@cindex @code{transient-mark-mode}
+@cindex Region, highlighting a
+
+You can cause the region to be highlighted when the mark is active by
+including
+
+@lisp
+(transient-mark-mode t)
+@end lisp
+
+@noindent
+in your @file{.emacs} file.
+
+@node Replacing highlighted text, Controlling case sensitivity, Highlighting a region, Common requests
+@section How can I replace highlighted text with what I type?
+@cindex @code{delete-selection-mode}
+@cindex Replacing highlighted text
+@cindex Highlighting and replacing text
+
+Use @code{delete-selection-mode}, which you can start automatically by
+placing the following Lisp form in your @file{.emacs} file:
+
+@lisp
+(delete-selection-mode 1)
+@end lisp
+
+According to the documentation string for @code{delete-selection-mode}
+(which you can read using @kbd{M-x describe-function @key{RET}
+delete-selection-mode @key{RET}}):
+
+@quotation
+When ON, typed text replaces the selection if the selection is active.
+When OFF, typed text is just inserted at point.
+@end quotation
+
+This mode also allows you to delete (not kill) the highlighted region by
+pressing @key{DEL}.
+
+@node Controlling case sensitivity, Working with unprintable characters, Replacing highlighted text, Common requests
+@section How do I control Emacs's case-sensitivity when searching/replacing?
+@cindex @code{case-fold-search}
+@cindex Case sensitivity of searches
+@cindex Searching without case sensitivity
+@cindex Ignoring case in searches
+
+For searching, the value of the variable @code{case-fold-search}
+determines whether they are case sensitive:
+
+@lisp
+(setq case-fold-search nil) ; make searches case sensitive
+(setq case-fold-search t)   ; make searches case insensitive
+@end lisp
+
+@cindex Case sensitivity in replacements
+@cindex Replacing, and case sensitivity
+@cindex @code{case-replace}
+Similarly, for replacing, the variable @code{case-replace} determines
+whether replacements preserve case.
+
+You can also toggle case sensitivity at will in isearch with @kbd{M-c}.
+
+To change the case sensitivity just for one major mode, use the major
+mode's hook.  For example:
+
+@lisp
+(add-hook '@var{foo}-mode-hook
+          (lambda ()
+           (setq case-fold-search nil)))
+@end lisp
+
+@node Working with unprintable characters, Searching for/replacing newlines, Controlling case sensitivity, Common requests
 @section How do I search for, delete, or replace unprintable (eight-bit or control) characters?
 @cindex Unprintable characters, working with
 @cindex Working with unprintable characters
@@ -1507,65 +1574,7 @@

 M-x replace-regexp @key{RET} [^ @key{TAB} C-q @key{LFD} C-q @key{RET} C-q C-l @key{SPC} -~] @key{RET} : @key{RET}

-@itemize @bullet
-
-@item
-You don't need to quote @key{TAB} with either isearch or typing
-something in the minibuffer.
-
-@end itemize
-
-@node Highlighting a region, Controlling case sensitivity, Working with unprintable characters, Common requests
-@section How can I highlight a region of text in Emacs?
-@cindex Highlighting text
-@cindex Text, highlighting
-@cindex @code{transient-mark-mode}
-@cindex Region, highlighting a
-
-You can cause the region to be highlighted when the mark is active by
-including
-
-@lisp
-(transient-mark-mode t)
-@end lisp
-
-@noindent
-in your @file{.emacs} file.  (Also see @ref{Turning on syntax
-highlighting}.)
-
-@node Controlling case sensitivity, Searching for/replacing newlines, Highlighting a region, Common requests
-@section How do I control Emacs's case-sensitivity when searching/replacing?
-@cindex @code{case-fold-search}
-@cindex Case sensitivity of searches
-@cindex Searching without case sensitivity
-@cindex Ignoring case in searches
-
-For searching, the value of the variable @code{case-fold-search}
-determines whether they are case sensitive:
-
-@lisp
-(setq case-fold-search nil) ; make searches case sensitive
-(setq case-fold-search t)   ; make searches case insensitive
-@end lisp
-
-@cindex Case sensitivity in replacements
-@cindex Replacing, and case sensitivity
-@cindex @code{case-replace}
-Similarly, for replacing, the variable @code{case-replace} determines
-whether replacements preserve case.
-
-You can also toggle case sensitivity at will in isearch with @kbd{M-c}.
-
-To change the case sensitivity just for one major mode, use the major
-mode's hook.  For example:
-
-@lisp
-(add-hook '@var{foo}-mode-hook
-          (lambda ()
-           (setq case-fold-search nil)))
-@end lisp
-
-@node Searching for/replacing newlines, Yanking text in isearch, Controlling case sensitivity, Common requests
+@node Searching for/replacing newlines, Yanking text in isearch, Working with unprintable characters, Common requests
 @section How do I input a newline character in isearch or query-replace?
 @cindex Searching for newlines
 @cindex Replacing newlines
@@ -1581,7 +1590,7 @@

 Use @kbd{M-y}.  @inforef{Isearch Yank, Isearch Yanking, emacs}.

-@node Wrapping words automatically, Spell-checkers, Yanking text in isearch, Common requests
+@node Wrapping words automatically, Turning on auto-fill by default, Yanking text in isearch, Common requests
 @section How do I make Emacs wrap words for me?
 @cindex Wrapping word automatically
 @cindex Wrapping lines
@@ -1595,7 +1604,30 @@
 @code{fill-column}.  To learn how to turn this on automatically, see
 @ref{Turning on auto-fill by default}.

-@node Spell-checkers, Checking TeX and *roff documents, Wrapping words automatically, Common requests
+@node Turning on auto-fill by default, Spell-checkers, Wrapping words automatically, Common requests
+@section How do I turn on @code{auto-fill-mode} by default?
+@cindex @code{auto-fill-mode}, activating automatically
+@cindex Filling automatically
+@cindex Automatic entry to @code{auto-fill-mode}
+
+To turn on @code{auto-fill-mode} just once for one buffer, use @kbd{M-x
+auto-fill-mode}.
+
+To turn it on for every buffer in a certain mode, you must use the hook
+for that mode.  For example, to turn on @code{auto-fill} mode for all
+text buffers, including the following in your @file{.emacs} file:
+
+@lisp
+(add-hook 'text-mode-hook 'turn-on-auto-fill)
+@end lisp
+
+If you want @code{auto-fill} mode on in all major modes, do this:
+
+@lisp
+(setq-default auto-fill-function 'do-auto-fill)
+@end lisp
+
+@node Spell-checkers, Checking TeX and *roff documents, Turning on auto-fill by default, Common requests
 @section Where can I get a better spelling checker for Emacs?
 @cindex Checking spelling
 @cindex Spelling, checking text documents
@@ -1845,6 +1877,10 @@
 automatically scrolls the display horizontally when point moves off the
 left or right edge of the window.

+Note that this is overridden by the variable
+@code{truncate-partial-width-windows} if that variable is non-nil
+and the current buffer is not full-frame width.
+
 In Emacs 20, use the @code{hscroll-mode}.  Here is some information from
 the documentation, available by typing @kbd{C-h f hscroll-mode @key{RET}}:

@@ -2035,14 +2071,11 @@
 to investigate @file{cpp.el}, which is distributed with Emacs.

 @node Repeating commands, Valid X resources, Hiding #ifdef lines, Common requests
-@section Is there an equivalent to the @code{.} (dot) command of vi?
-@cindex Repeating commands as with @code{vi}
-@cindex Command, repeat last
+@section How do I repeat a command as many times as possible?
+@cindex Repeating commands many times
+@cindex Commands, repeating many times
 @cindex @code{.}, equivalent to @code{vi} command

-(@code{.} is the redo command in @code{vi}.  It redoes the last
-insertion/deletion.)
-
 As of Emacs 20.3, there is indeed a @code{repeat} command (@kbd{C-x z})
 that repeats the last command.  If you preface it with a prefix
 argument, the prefix arg is applied to the command.
@@ -2054,12 +2087,14 @@
 keyboard has these keys) to scan through all the different complex
 commands you've typed.

-To repeat a set of commands, use keyboard macros.  (@inforef{Keyboard
-Macros, Keyboard Macros, emacs}.)
-
-If you're really desperate for the @code{.} command, use VIPER, a
-@code{vi} emulation mode which comes with Emacs, and which appears to
-support it.  (@xref{VIPER}.)
+To repeat a set of commands, use keyboard macros.  Use @kbd{C-x (} and
+@kbd{C-x )} to make a keyboard macro that invokes the command and then
+type @kbd{C-x e}.  (@inforef{Keyboard Macros, Keyboard Macros, emacs}.)
+
+If you're really desperate for the @code{.} command in @code{vi} that
+redoes the last insertion/deletion, use VIPER, a @code{vi} emulation
+mode which comes with Emacs, and which appears to support it.
+(@xref{VIPER}.)

 @node Valid X resources, Evaluating Emacs Lisp code, Repeating commands, Common requests
 @section What are the valid X resource settings (i.e., stuff in .Xdefaults)?
@@ -2158,35 +2193,26 @@
 might want to set the variable @code{mail-yank-prefix}.  In Message
 buffers, you can even use @kbd{M-;} to cite yanked messages (@kbd{M-;}
 runs the function @code{comment-region}, it is a general-purpose
-mechanism to comment regions).
-
-@node Underlining paragraphs, Repeating a command as many times as possible, Inserting text at the beginning of each line, Common requests
+mechanism to comment regions) (@pxref{Changing the included text prefix}).
+
+@node Underlining paragraphs, Forcing the cursor to remain in the same column, Inserting text at the beginning of each line, Common requests
 @section How do I insert @samp{_^H} before each character in a region to get an underlined paragraph?
 @cindex Underlining a region of text
 @cindex @code{underline-region}

 Mark the region and then type @kbd{M-x underline-region @key{RET}}.

-@node Repeating a command as many times as possible, Forcing the cursor to remain in the same column, Underlining paragraphs, Common requests
-@section How do I repeat a command as many times as possible?
-@cindex Repeating commands many times
-@cindex Commands, repeating many times
-
-Use @kbd{C-x (} and @kbd{C-x )} to make a keyboard macro that invokes
-the command and then type @kbd{M-0 C-x e}.
-
-Any messages your command prints in the echo area will be suppressed.
-
-If you need to repeat a command a small number of times, you can use
-@kbd{C-x z} (@pxref{Repeating commands}) or @kbd{C-x e}.
-
-@node Forcing the cursor to remain in the same column, Forcing Emacs to iconify itself, Repeating a command as many times as possible, Common requests
+@node Forcing the cursor to remain in the same column, Forcing Emacs to iconify itself, Underlining paragraphs, Common requests
 @section How do I make Emacs behave like this: when I go up or down, the cursor should stay in the same column even if the line is too short?
 @cindex @code{picture-mode}
 @cindex Remaining in the same column, regardless of contents
 @cindex Vertical movement in empty documents

-@kbd{M-x picture-mode}.
+Use @kbd{M-x picture-mode}.
+
+See also the variable @code{track-eol} and the command
+@code{set-goal-column} bound to @kbd{C-x C-n}
+(@pxref{Moving Point, , , emacs, The GNU Emacs Manual}).

 @node Forcing Emacs to iconify itself, Using regular expressions, Forcing the cursor to remain in the same column, Common requests
 @section How do I tell Emacs to iconify itself?
@@ -2240,8 +2266,8 @@
 files mentioned in the @file{TAGS} file.  @inforef{Tags Search, Tags Search,
 emacs}.

-As of Emacs 19.29, Dired mode (@kbd{M-x dired @key{RET}}, or @kbd{C-x
-d}) supports the command @code{dired-do-query-replace}, which allows
+As of Emacs 19.29, Dired mode (@kbd{M-x dired @key{RET}}, or @kbd{C-x d})
+supports the command @code{dired-do-query-replace} (@kbd{Q}), which allows
 users to replace regular expressions in multiple files.

 @node Documentation for etags, Disabling backups, Replacing text across multiple files, Common requests
@@ -2537,7 +2563,7 @@
 consult the documentation of the variables @code{ps-printer-name},
 @code{ps-lpr-command}, and @code{ps-lpr-switches} for more details.

-@node Scrolling only one line, Replacing highlighted text, Turning on syntax highlighting, Common requests
+@node Scrolling only one line, Editing MS-DOS files, Turning on syntax highlighting, Common requests
 @section How can I force Emacs to scroll only one line when I move past the bottom of the screen?
 @cindex Scrolling only one line
 @cindex Reducing the increment when scrolling
@@ -2553,32 +2579,7 @@
 (setq scroll-conservatively most-positive-fixnum)
 @end lisp

-@node Replacing highlighted text, Editing MS-DOS files, Scrolling only one line, Common requests
-@section How can I replace highlighted text with what I type?
-@cindex @code{delete-selection-mode}
-@cindex Replacing highlighted text
-@cindex Highlighting and replacing text
-
-Use @code{delete-selection-mode}, which you can start automatically by
-placing the following Lisp form in your @file{.emacs} file:
-
-@lisp
-(delete-selection-mode 1)
-@end lisp
-
-According to the documentation string for @code{delete-selection-mode}
-(which you can read using @kbd{M-x describe-function @key{RET}
-delete-selection-mode @key{RET}}):
-
-@quotation
-When ON, typed text replaces the selection if the selection is active.
-When OFF, typed text is just inserted at point.
-@end quotation
-
-This mode also allows you to delete (not kill) the highlighted region by
-pressing @key{DEL}.
-
-@node Editing MS-DOS files, Filling paragraphs with a single space, Replacing highlighted text, Common requests
+@node Editing MS-DOS files, Filling paragraphs with a single space, Scrolling only one line, Common requests
 @section How can I edit MS-DOS files using Emacs?
 @cindex Editing MS-DOS files
 @cindex MS-DOS files, editing
@@ -2601,7 +2602,7 @@
 and saved, allowing you to ignore the different conventions that Unix
 and MS-DOS have for delineating the end of a line.

-@node Filling paragraphs with a single space,  Escape sequences in shell output, Editing MS-DOS files, Common requests
+@node Filling paragraphs with a single space, Escape sequences in shell output, Editing MS-DOS files, Common requests
 @section How can I tell Emacs to fill paragraphs with a single space after each period?
 @cindex One space following periods
 @cindex Single space following periods
@@ -2613,7 +2614,7 @@
 (setq sentence-end-double-space nil)
 @end lisp

-@node Escape sequences in shell output, , Filling paragraphs with a single space, Common requests
+@node Escape sequences in shell output,  , Filling paragraphs with a single space, Common requests
 @section Why these strange escape sequences from @code{ls} from the Shell mode?
 @cindex Escape sequences in @code{ls} output
 @cindex @code{ls} in Shell mode
@@ -3478,7 +3479,8 @@

 Many authors post their packages to the @uref{news:gnu.emacs.sources,
 Emacs sources newsgroup}.  You can search the archives of this
-group with @uref{http://groups.google.com, Google}, for example.
+group with @uref{http://groups.google.com/group/gnu.emacs.sources, Google},
+or @uref{http://dir.gmane.org/gmane.emacs.sources, Gmane}, for example.

 Several packages are stored in
 @uref{http://emacswiki.org/elisp/, the Lisp area of the Emacs Wiki}.
@@ -3489,6 +3491,9 @@

 @uref{ftp://ftp.cis.ohio-state.edu/pub/emacs-lisp/WWW/index.html}

+Read the file @file{etc/MORE.STUFF} for more information about
+external packages.
+
 @node Current GNU distributions, Difference between Emacs and XEmacs, Packages that do not come with Emacs, Finding Emacs and related packages
 @section Where can I get other up-to-date GNU stuff?
 @cindex Current GNU distributions
@@ -3715,7 +3720,7 @@
 Up-to-date information about GNU software (including Emacs) for VMS is
 available at @uref{http://vms.gnu.org/}.

-@node Modes for various languages, , Emacs for VMS and DECwindows, Finding Emacs and related packages
+@node Modes for various languages,  , Emacs for VMS and DECwindows, Finding Emacs and related packages
 @section Where can I get modes for Lex, Yacc/Bison, Bourne shell, csh, C@t{++}, Objective-C, Pascal, Java, and Awk?
 @cindex Awk, mode for
 @cindex @code{awk-mode}
@@ -4782,7 +4787,7 @@
 This will disable the use of the extra keysyms systemwide, which may be
 undesirable if you actually intend to use them.

-@node SPC no longer completes file names, , ExtendChar key does not work as Meta, Key bindings
+@node SPC no longer completes file names,  , ExtendChar key does not work as Meta, Key bindings
 @section Why doesn't SPC complete file names anymore?
 @cindex @kbd{SPC} file name completion
--- a/man/org.texi	Thu Feb 23 16:05:25 2006 +0000
+++ b/man/org.texi	Fri Feb 24 13:44:56 2006 +0000
@@ -4,7 +4,7 @@
 @setfilename ../info/org
 @settitle Org Mode Manual

-@set VERSION 4.05
+@set VERSION 4.06
 @set DATE February 2006

 @dircategory Emacs
--- a/src/ChangeLog	Thu Feb 23 16:05:25 2006 +0000
+++ b/src/ChangeLog	Fri Feb 24 13:44:56 2006 +0000
@@ -1,3 +1,20 @@
+2006-02-24  Kenichi Handa  <handa@m17n.org>
+
+	* fileio.c (Finsert_file_contents): When a text is replaced
+	partially, be sure to set point before the inserted characters.
+
+2006-02-23  Zhang Wei  <id.brep@gmail.com>  (tiny change)
+
+	* xfns.c (Fx_file_dialog): Return a decoded file name.
+
+2006-02-23  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* dispnew.c (update_text_area): Avoid needless redraw of rightmost
+	glyph whose face is extended to the text area end.
+
+	* macterm.c (x_set_toolkit_scroll_bar_thumb): Don't set control
+	values if control is not visible or values are not changed.
+
 2006-02-22  Stefan Monnier  <monnier@iro.umontreal.ca>

 	* window.c (Fwindow_list): Check `window' before doing XWINDOW.
--- a/src/dispnew.c	Thu Feb 23 16:05:25 2006 +0000
+++ b/src/dispnew.c	Fri Feb 24 13:44:56 2006 +0000
@@ -4361,10 +4361,14 @@
       int overlapping_glyphs_p = current_row->contains_overlapping_glyphs_p;
       int desired_stop_pos = desired_row->used[TEXT_AREA];

-      /* If the desired row extends its face to the text area end,
+      /* If the desired row extends its face to the text area end, and
+	 unless the current row also does so at the same position,
 	 make sure we write at least one glyph, so that the face
 	 extension actually takes place.  */
-      if (MATRIX_ROW_EXTENDS_FACE_P (desired_row))
+      if (MATRIX_ROW_EXTENDS_FACE_P (desired_row)
+	  && (desired_stop_pos < current_row->used[TEXT_AREA]
+	      || (desired_stop_pos == current_row->used[TEXT_AREA]
+		  && !MATRIX_ROW_EXTENDS_FACE_P (current_row))))
 	--desired_stop_pos;

       stop = min (current_row->used[TEXT_AREA], desired_stop_pos);
@@ -4483,7 +4487,10 @@
 	     has to be cleared, if and only if we did a write_glyphs
 	     above.  This is made sure by setting desired_stop_pos
 	     appropriately above.  */
-	  xassert (i < desired_row->used[TEXT_AREA]);
+	  xassert (i < desired_row->used[TEXT_AREA]
+		   || ((desired_row->used[TEXT_AREA]
+			== current_row->used[TEXT_AREA])
+		       && MATRIX_ROW_EXTENDS_FACE_P (current_row)));
 	}
       else if (MATRIX_ROW_EXTENDS_FACE_P (current_row))
 	{
--- a/src/fileio.c	Thu Feb 23 16:05:25 2006 +0000
+++ b/src/fileio.c	Fri Feb 24 13:44:56 2006 +0000
@@ -4416,6 +4416,8 @@

       /* Set `inserted' to the number of inserted characters.  */
       inserted = PT - temp;
+      /* Set point before the inserted characters.  */
+      SET_PT_BOTH (temp, same_at_start);

       xfree (conversion_buffer);
       emacs_close (fd);
--- a/src/macterm.c	Thu Feb 23 16:05:25 2006 +0000
+++ b/src/macterm.c	Fri Feb 24 13:44:56 2006 +0000
@@ -4529,7 +4529,7 @@
      int portion, position, whole;
 {
   ControlHandle ch = SCROLL_BAR_CONTROL_HANDLE (bar);
-  int value, viewsize, maximum, visible_p;
+  int value, viewsize, maximum;

   if (whole == 0 || XINT (bar->track_height) == 0)
     value = 0, viewsize = 1, maximum = 0;
@@ -4542,16 +4542,20 @@

   BLOCK_INPUT;

-  /* Temporarily hide the scroll bar to avoid multiple redraws.  */
-  visible_p = IsControlVisible (ch);
-  SetControlVisibility (ch, false, false);
-
-  SetControl32BitMinimum (ch, 0);
-  SetControl32BitMaximum (ch, maximum);
-  SetControl32BitValue (ch, value);
-  SetControlViewSize (ch, viewsize);
-
-  SetControlVisibility (ch, visible_p, true);
+  if (IsControlVisible (ch)
+      && (GetControlViewSize (ch) != viewsize
+	  || GetControl32BitValue (ch) != value
+	  || GetControl32BitMaximum (ch) != maximum))
+    {
+      /* Temporarily hide the scroll bar to avoid multiple redraws.  */
+      SetControlVisibility (ch, false, false);
+
+      SetControl32BitMaximum (ch, maximum);
+      SetControl32BitValue (ch, value);
+      SetControlViewSize (ch, viewsize);
+
+      SetControlVisibility (ch, true, true);
+    }

   UNBLOCK_INPUT;
 }