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

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 204-225)

   - Update from CVS
   - Sync from erc--emacs--0
   - Merge from gnus--rel--5.10
   - Improve tq.el.
   - Update from CVS: src/puresize.h (PURESIZE_RATIO): Reduce to 10/6.

 * gnus--rel--5.10  (patch 81-85)

   - Update from CVS
   - Merge from emacs--devo--0

5 files changed, 80 insertions, 45 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 95b24e50e2d..8673937f15b 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,21 @@
+2006-04-12  Kenichi Handa  <handa@m17n.org>
+
+        * PROBLEMS (C-SPC fails ...): Explicitly say fcitx in the header.
+
+2006-04-11  Carsten Dominik  <dominik@science.uva.nl>
+
+        * orgcard.tex: (section{Tables}): Document column narrowing.
+        (section{Links}): Document bracket links.
+
+2006-04-11  Kenichi Handa  <handa@m17n.org>
+
+        * PROBLEMS (C-SPC fails ...): Add description for fcitx.
+
+2006-04-10  Bill Wohler  <wohler@newt.com>
+
+        * NEWS: Add package-version keyword to `defcustom' and mention
+        associated variable `customize-package-emacs-version-alist'.
+
 2006-04-07  Reiner Steib  <Reiner.Steib@gmx.de>
 
         * NEWS: Add string-or-null-p.
diff --git a/etc/NEWS b/etc/NEWS
index 351dfa47729..3ec9c17f692 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -3767,6 +3767,12 @@ variables, including buffer-local and frame-local variables.
 ** defcustom changes:
 
 +++
+*** The package-version keyword has been added to provide
+`customize-changed-options' functionality to packages in the future.
+Developers who make use of this keyword must also update the new
+variable `customize-package-emacs-version-alist'.
+
++++
 *** The new customization type `float' requires a floating point number.
 
 ** String changes:
@@ -4036,6 +4042,12 @@ A file local variables list cannot specify a string with text
 properties--any specified text properties are discarded.
 
 +++
+*** The variable `enable-local-variables' controls how local variable
+lists are handled.  t, the default, specifies the standard querying
+behavior.  :safe means use only safe values, and ignore the rest.
+nil means ignore them all.  Anything else means always query.
+
++++
 *** The variable `safe-local-eval-forms' specifies a list of forms that
 are ok to evaluate when they appear in an `eval' local variables
 specification.  Normally Emacs asks for confirmation before evaluating
@@ -10859,9 +10871,6 @@ SNMPv2 MIBs.  It has entries on `auto-mode-alist'.
 editing SQL files, and M-x sql-interactive-mode for interacting with
 SQL interpreters.  It has an entry on `auto-mode-alist'.
 
-*** M-x highlight-changes-mode provides a minor mode displaying buffer
-changes with a special face.
-
 *** ispell4.el has been deleted.  It got in the way of ispell.el and
 this was hard to fix reliably.  It has long been obsolete -- use
 Ispell 3.1 and ispell.el.
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index afe0493d760..6435bd2e673 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -995,7 +995,7 @@ xmodmap command to the xdm setup script for that display.
 
 Use the shell command `xset bc' to make the old X Menu package work.
 
-*** C-SPC fails to work on Fedora GNU/Linux.
+*** C-SPC fails to work on Fedora GNU/Linux (or with fcitx input method).
 
 Fedora Core 4 steals the C-SPC key by default for the `iiimx' program
 which is the input method for some languages.  It blocks Emacs users
@@ -1009,6 +1009,12 @@ Another is to specify `Emacs*useXIM: false' in your X resources.
 
 Another is to build Emacs with the `--without-xim' configure option.
 
+The same problem happens on any other system if you are using fcitx
+(Chinese input method) which by default use C-SPC for toggling.  If
+you want to use fcitx with Emacs, you have two choices.  Toggle fcitx
+by another key (e.g. C-\) by modifying ~/.fcitx/config, or be
+accustomed to use C-@ for `set-mark-command'.
+
 *** M-SPC seems to be ignored as input.
 
 See if your X server is set up to use this as a command
diff --git a/etc/TODO b/etc/TODO
index 3d8d0103471..137536f4ee0 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -9,10 +9,13 @@ to the FSF.
 
 * Small but important fixes needed in existing features:
 
+** Distribute a bar cursor of width > 1 evenly between the two glyphs
+   on each side of the bar (what to do at the edges?).
+
 ** Make vc-checkin avoid reverting the buffer if has not changed after
    the checkin. Comparing (md5 BUFFER) to (md5 FILE) should be enough.
 
-** Make vc-annotate show place the cursor in the annotate buffer at the 
+** Make vc-annotate show place the cursor in the annotate buffer at the
    same line as the current buffer.
 
 ** buffer-offer-save should be a permanent local.
@@ -69,7 +72,7 @@ to the FSF.
 ** Redesign the load-history data structure so it can cope better
   with evaluating definitions of the same function from different files,
   recording which file the latest definition came from.
-  
+
 * Important features:
 
 ** Provide user-friendly ways to list all available font families,
@@ -158,7 +161,7 @@ typically due to pilot errors and should thus be in debug-ignored-errors.
 ** Emacs Lisp mode could put an overlay on the defun for every
   function that has advice.  The overlay could have `after-text' like "
   [Function has advice]".  It might look like
-     (defun foo [Function has advice] (x y) 
+     (defun foo [Function has advice] (x y)
   The overlay could also be a button that you could use to view the advice.
 
 ** ange-ftp
@@ -261,7 +264,7 @@ typically due to pilot errors and should thus be in debug-ignored-errors.
 ** Highlight rectangles (`mouse-track-rectangle-p' in XEmacs).  Already in CUA,
   but it's a valuable feature worth making more general.
 
-** Support simultaneous tty and X frames.  [See the multi-tty branch of Emacs 
+** Support simultaneous tty and X frames.  [See the multi-tty branch of Emacs
   at http://lorentey.hu/project/emacs.]
 
 ** Provide MIME support for Rmail using the Gnus MIME library.  [Maybe
diff --git a/etc/orgcard.tex b/etc/orgcard.tex
index cca7e525d91..245354e85d3 100644
--- a/etc/orgcard.tex
+++ b/etc/orgcard.tex
@@ -1,4 +1,6 @@
-% Reference Card for Org Mode 4.10
+% Reference Card for Org Mode
+\def\orgversionnumber{4.23}
+\def\year{2006}
 %
 %**start of header
 \newcount\columnsperpage
@@ -58,9 +60,6 @@
 % Thanks to Paul Rubin, Bob Chassell, Len Tower, and Richard Mlynarik
 % for their many good ideas.
 
-\def\orgversionnumber{4.10}
-\def\year{2006}
-
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
   \centerline{\small \copyright\ 2004, 2005, 2006\ Free Software Foundation, Inc.
   Permissions on back.  v\orgversionnumber}}
@@ -367,10 +366,8 @@ To set archive location for current file, add a line like$^3$:
 \key{insert SCHEDULED timestamp}{C-c C-s}
 \key{create sparse tree with all deadlines due}{C-c C-w}
 \key{the time between 2 dates in a time range}{C-c C-y}
-\key{change timestamp at cursor by $-1$ day}{S-LEFT$^4$}
-\key{change timestamp at cursor by $+1$ day}{S-RIGHT$^4$}
-\key{change year/month/day at cursor by $-1$}{S-DOWN$^4$}
-\key{change year/month/day at cursor by $+1$}{S-UP$^4$}
+\key{change timestamp at cursor by $\pm 1$ day}{S-RIGHT/LEFT$^4$}
+\key{change year/month/day at cursor by $\pm 1$}{S-UP/DOWN$^4$}
 \key{access the calendar for the current date}{C-c >}
 \key{insert timestamp matching date in calendar}{C-c <}
 \key{access agenda for current date}{C-c C-o}
@@ -386,6 +383,7 @@ To set archive location for current file, add a line like$^3$:
 \key{globally store link to the current location}{C-c l$^2$}
 \key{insert a link (TAB completes stored links)}{C-c C-l}
 \key{insert file link with file name completion}{C-u C-c C-l}
+\key{edit (also hidden part of) link at point}{C-c C-l}
 
 \key{open file links in emacs (\kbd{C-u} : in emacs)}{C-c C-o}
 \key{open link at point (3: in emacs)}{mouse-2/3}
@@ -399,24 +397,26 @@ To set archive location for current file, add a line like$^3$:
 \key{\kbd{<<<My Target>>>}}{\rm radio target$^3$}
 \key{\kbd{[[*this text]]}}{\rm find headline}
 \metax{\kbd{[[this text]]}}{\rm find target or text in buffer}
+\metax{\kbd{[[this text][description]]}}{\rm optional link text}
 
 {\bf External Links}
 
-\key{\kbd{<file:/home/dominik/img/mars.jpg>}}{\rm file, absolute}
-\key{\kbd{<file:papers/last.pdf>}}{\rm file, relative}
-\key{\kbd{<file:projects.org::*that text>}}{\rm find headline}
-\key{\kbd{<file:projects.org::find me>}}{\rm find tgt/string}
-\key{\kbd{<file:projects.org::/regexp/>}}{\rm regexp search}
-\key{\kbd{<http://www.astro.uva.nl/~dominik>}}{\rm on the web}
-\key{\kbd{<mailto:adent@galaxy.net>}}{\rm EMail address}
-\key{\kbd{<news:comp.emacs>}}{\rm Usenet group}
-\key{\kbd{<bbdb:Richard Stallman>}}{\rm BBDB person}
-\key{\kbd{<shell:ls *.org>}}{\rm shell command}
-\key{\kbd{<gnus:group>}}{\rm GNUS group}
-\key{\kbd{<gnus:group\#id>}}{\rm GNUS message}
-\key{\kbd{<vm|wl|mhe|rmail:folder>}}{\rm Mail folder}
-\key{\kbd{<vm|wl|mhe|rmail:folder\#id>}}{\rm Mail message}
-%\key{\kbd{<vm://myself@some.where.org/folder\#id>}}{\rm VM remote}
+\key{\kbd{file:/home/dominik/img/mars.jpg}}{\rm file, absolute}
+\key{\kbd{file:papers/last.pdf}}{\rm file, relative}
+\key{\kbd{file:projects.org::*that text}}{\rm find headline}
+\key{\kbd{file:projects.org::find me}}{\rm find tgt/string}
+\key{\kbd{file:projects.org::/regexp/}}{\rm regexp search}
+\key{\kbd{http://www.astro.uva.nl/~dominik}}{\rm on the web}
+\key{\kbd{mailto:adent@galaxy.net}}{\rm EMail address}
+\key{\kbd{news:comp.emacs}}{\rm Usenet group}
+\key{\kbd{bbdb:Richard Stallman}}{\rm BBDB person}
+\key{\kbd{shell:ls *.org}}{\rm shell command}
+\key{\kbd{gnus:group}}{\rm GNUS group}
+\key{\kbd{gnus:group\#id}}{\rm GNUS message}
+\key{\kbd{vm|wl|mhe|rmail:folder}}{\rm Mail folder}
+\key{\kbd{vm|wl|mhe|rmail:folder\#id}}{\rm Mail message}
+\metax{\kbd{[[external link][description]]}}{\rm optional link text}
+%\key{\kbd{vm://myself@some.where.org/folder\#id}}{\rm VM remote}
 
 \section{Tables}
 
@@ -425,11 +425,10 @@ To set archive location for current file, add a line like$^3$:
 
 {\bf Creating a table}
 
-\metax{insert a new Org-mode table}{M-x org-table-create}
-\metax{... or just start typing, e.g.}{|Name|Phone|Age RET |- TAB}
-\key{convert region to table}{C-c C-c}
-\key{... separator at least 3 spaces}{C-3 C-c C-c}
-%\key{... prompt for separator regexp}{C-u C-c C-c}
+%\metax{insert a new Org-mode table}{M-x org-table-create}
+\metax{just start typing, e.g.}{|Name|Phone|Age RET |- TAB}
+\key{convert region to table}{C-c |}
+\key{... separator at least 3 spaces}{C-3 C-c |}
 
 {\bf Commands available inside tables}
 
@@ -465,9 +464,7 @@ Outside of tables, the same keys may have other functionality.
 \key{paste rectangular region}{C-c C-x C-y}
 \key{fill paragraph across selected cells}{C-c C-q}
 
-{\bf Calculations}
-
-These need the Emacs calc package installed.
+{\bf Calculations} (in combination with Emacs \kbd{calc} package)
 
 \key{set and eval column formula}{C-c =}
 \key{set and eval named-field formula}{C-u C-c =}
@@ -475,8 +472,8 @@ These need the Emacs calc package installed.
 \key{re-apply all stored equations to current line}{C-c *}
 \key{re-apply all stored equations to entire table}{C-u C-c *}
 
-\kbd{TAB}, \kbd{RET} and \kbd{C-c C-c} trigger automatic recalculation
-in lines starting with: {\tt | \# |}.
+%\kbd{TAB}, \kbd{RET} and \kbd{C-c C-c} trigger automatic recalculation
+%in lines starting with: {\tt | \# |}.
 
 \key{rotate calculation mark through \# * ! \^ \_ \$}{C-\#}
 
@@ -484,9 +481,9 @@ in lines starting with: {\tt | \# |}.
 \key{sum numbers in current column/rectangle}{C-c +}
 \key{copy down with increment}{S-RET$^4$}
 
-A formula can also be typed directly into into a field and will
-executed by \kbd{TAB}, \kbd{RET} and \kbd{C-c C-c}.  A leading \kbd{=}
-introduces a column formula, \kbd{:=} a named-field formula.
+Formulas typed in field are executed by \kbd{TAB},
+\kbd{RET} and \kbd{C-c C-c}.  \kbd{=} introduces a column
+formula, \kbd{:=} a named-field formula.
 
 \key{Example: Add Col1 and Col2}{=\$1+\$2}
 \key{... with printf format specification}{=\$1+\$2;\%.2f}
@@ -496,7 +493,9 @@ introduces a column formula, \kbd{:=} a named-field formula.
 
 {\bf Miscellaneous}
 
-\key{toggle visibility of vertical lines}{C-c |}
+\key{to limit column width to \kbd{N} characters, use}{...| <N> |...}
+\key{edit the current field in a separate window}{C-c `}
+\key{make current field fully visible}{C-u TAB}
 \metax{export as tab-separated file}{M-x org-table-export}
 \metax{import tab-separated file}{M-x org-table-import}