procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
98349 commits 1 branch 0 tags 934 MiB
Commit graph

302 commits

Author SHA1 Message Date
Miles Bader
41882805d6 Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-97 
Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 616-696)

   - Add lisp/mh-e/.arch-inventory
   - Update from CVS
   - Merge from gnus--rel--5.10
   - Update from CVS: lisp/smerge-mode.el: Add 'tools' to file keywords.
   - lisp/gnus/ChangeLog: Remove duplicate entry

 * gnus--rel--5.10  (patch 147-181)

   - Update from CVS
   - Merge from emacs--cvs-trunk--0
   - Update from CVS: lisp/mml.el (mml-preview): Doc fix.
   - Update from CVS: texi/message.texi: Fix default values.
   - Update from CVS: texi/gnus.texi (RSS): Addition.
 2006-01-16 08:37:27 +00:00
Miles Bader
6a2bd1a501 Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-95 
Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 598-615)

   - Update from CVS
   - Remove lisp/toolbar directory
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 142-146)

   - Update from CVS
 2006-01-16 06:59:21 +00:00
Chong Yidong
917e8d0ba2 * progmodes/sh-script.el (sh-mode): Add keymap to docstring. 2005-12-18 01:18:45 +00:00
Stefan Monnier
ec121b9632 (sh-font-lock-syntactic-keywords): \ doesn't escape single quotes. 2005-11-27 20:44:44 +00:00
Stefan Monnier
bd24684be0 (sh-font-lock-paren): Handle continued lines in patterns. 2005-11-21 22:24:13 +00:00
Juri Linkov
8ec3bce045 Add :link (custom-group-link font-lock-faces) to defgroup. 2005-11-17 07:40:11 +00:00
Stefan Monnier
1712cca561 (sh-font-lock-syntactic-keywords): Make $@ and $? into sexps. 2005-10-21 06:32:05 +00:00
Stefan Monnier
9d37a5c0f5 (sh-escaped-line-re): New var. 
(sh-here-doc-open-re, sh-font-lock-close-heredoc): Use it.
(sh-font-lock-open-heredoc): Try to properly handle heredoc starters
whose line is either continued or ends with a comment.
 2005-10-20 19:43:44 +00:00
Miles Bader
9fe76e1b25 Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-91 
Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 581-597)

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

 * gnus--rel--5.10  (patch 133-141)

   - Update from CVS
   - Merge from emacs--cvs-trunk--0
   - Update from CVS: texi/gnus.texi (RSS): Fix key description.
   - Update from CVS: texi/gnus.texi (Document Server Internals): Addition.
 2005-10-15 00:26:05 +00:00
Richard M. Stallman
decb2a9e5b (sh-tmp-file): Use mktemp -t. Finish support for es and rc shells. 2005-10-11 22:06:53 +00:00
Richard M. Stallman
17a3b6da97 (sh-tmp-file): Use mktemp. 2005-10-10 21:24:29 +00:00
Miles Bader
ad404f1a4f Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-83 
Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 554-555)

   - Update from CVS
   - Remove CVS keywords from newsticker files
 2005-09-19 11:00:10 +00:00
Miles Bader
6f512f0b53 Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-82 
Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 542-553)

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

 * gnus--rel--5.10  (patch 116-121)

   - Merge from emacs--cvs-trunk--0
   - Update from CVS
 2005-09-19 10:20:33 +00:00
Juanma Barranquero
7fa1a8f9db (sh-blink): Fix spurious reference to variable `message'. 2005-09-19 09:17:14 +00:00
Deepak Goel
29a4e67d88 Message format fixes, commit no. 3 2005-09-18 12:31:28 +00:00
Miles Bader
ff8d296438 Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-81 
Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 532-541)

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

 * gnus--rel--5.10  (patch 112-115)

   - Update from CVS
 2005-09-11 22:21:01 +00:00
Richard M. Stallman
0404a075c0 (sh-skeleton-pair-default-alist): New var. 
(sh-mode): Locally set skeleton-pair-default-alist.
 2005-09-09 01:26:00 +00:00
Miles Bader
621806aab2 Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-79 
Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 519-530)

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

 * gnus--rel--5.10  (patch 106-111)

   - Merge from emacs--cvs-trunk--0
   - Update from CVS
 2005-09-06 00:25:20 +00:00
Juanma Barranquero
482db54b59 (font-lock-comment-face, font-lock-set-defaults, font-lock-string-face): 
Add defvars.
 2005-08-30 11:14:04 +00:00
Miles Bader
d4cccb1406 Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-78 
Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 514-518)

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

 * gnus--rel--5.10  (patch 104-105)

   - Update from CVS
 2005-08-26 09:51:52 +00:00
Richard M. Stallman
5789bd837d (sh-font-lock-keywords-var): Variable renamed from sh-font-lock-keywords. 
In the `shell' entry, don't try to refer to executable-font-lock-keywords.
(sh-font-lock-keywords-var-1): Renamed from sh-font-lock-keywords-1.
(sh-font-lock-keywords-var-2): Renamed from sh-font-lock-keywords-2.
(sh-font-lock-keywords): Append executable-font-lock-keywords here.
(sh-mode): Set comment-start-skip, local-abbrev-table, imenu-case-fold-search.
(sh-set-shell): Don't set them here.
(sh-feature): Simplify.  Get rid of the eval-a-variable feature.
Don't cache the results in the original alist; don't ever modify that alist.
 2005-08-15 02:01:38 +00:00
Miles Bader
bacb9790f5 Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-69 
Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 474-484)

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

 * gnus--rel--5.10  (patch 88-91)

   - Merge from emacs--cvs-trunk--0
   - Update FSF's address in GPL notices
   - Update from CVS
 2005-07-14 08:02:00 +00:00
Stefan Monnier
090475f391 (sh-get-indent-info): Only indent a continuation line if SPC or TAB precedes \. 
(sh-get-indent-info): Simplify.
(sh-mark-init, sh-learn-buffer-indent, sh-add-completer): with-current-buffer.
 2005-07-13 04:55:42 +00:00
Miles Bader
d3e4babdd1 Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-68 
Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 459-473)

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

 * gnus--rel--5.10  (patch 86-87)

   - Update from CVS
 2005-07-07 12:43:14 +00:00
Lute Kamstra
3a35cf56e7 Update FSF's address. 2005-07-04 17:55:18 +00:00
Juanma Barranquero
1689f30906 (sh, sh-script): Finish `defgroup' description with period. 
(sh-maybe-here-document): "?\ " -> "?\s".
 2005-07-04 03:24:03 +00:00
Glenn Morris
f42e164952 (sh-get-kw): `&' also separates words. 2005-06-30 16:45:04 +00:00
Miles Bader
2092fd2b33 Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-63 
Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 358-423)

   - Update from CVS
   - Remove "-face" suffix from widget faces
   - Remove "-face" suffix from custom faces
   - Remove "-face" suffix from change-log faces
   - Remove "-face" suffix from compilation faces
   - Remove "-face" suffix from diff-mode faces
   - lisp/longlines.el (longlines-visible-face): Face removed
   - Remove "-face" suffix from woman faces
   - Remove "-face" suffix from whitespace-highlight face
   - Remove "-face" suffix from ruler-mode faces
   - Remove "-face" suffix from show-paren faces
   - Remove "-face" suffix from log-view faces
   - Remove "-face" suffix from smerge faces
   - Remove "-face" suffix from show-tabs faces
   - Remove "-face" suffix from highlight-changes faces
   - Remove "-face" suffix from and downcase info faces
   - Remove "-face" suffix from pcvs faces
   - Update uses of renamed pcvs faces
   - Tweak ChangeLog
   - Remove "-face" suffix from strokes-char face
   - Remove "-face" suffix from compare-windows face
   - Remove "-face" suffix from calendar faces
   - Remove "-face" suffix from diary-button face
   - Remove "-face" suffix from testcover faces
   - Remove "-face" suffix from viper faces
   - Remove "-face" suffix from org faces
   - Remove "-face" suffix from sgml-namespace face
   - Remove "-face" suffix from table-cell face
   - Remove "-face" suffix from tex-mode faces
   - Remove "-face" suffix from texinfo-heading face
   - Remove "-face" suffix from flyspell faces
   - Remove "-face" suffix from gomoku faces
   - Remove "-face" suffix from mpuz faces
   - Merge from gnus--rel--5.10
   - Remove "-face" suffix from Buffer-menu-buffer face
   - Remove "-face" suffix from antlr-mode faces
   - Remove "-face" suffix from ebrowse faces
   - Remove "-face" suffix from flymake faces
   - Remove "-face" suffix from idlwave faces
   - Remove "-face" suffix from sh-script faces
   - Remove "-face" suffix from vhdl-mode faces
   - Remove "-face" suffix from which-func face
   - Remove "-face" suffix from cperl-mode faces
   - Remove "-face" suffix from ld-script faces
   - Fix cperl-mode font-lock problem
   - Tweak which-func face

 * gnus--rel--5.10  (patch 80-82)

   - Merge from emacs--cvs-trunk--0
   - Update from CVS
 2005-06-15 23:32:15 +00:00
Miles Bader
33595ec6be Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-414 
Remove "-face" suffix from sh-script faces

2005-06-14  Miles Bader  <miles@gnu.org>

   * lisp/progmodes/sh-script.el (sh-heredoc): Remove "-face" suffix from
   face name.
   (sh-heredoc-face): New backward-compatibility alias for renamed face.
   (sh-heredoc-face): Use renamed sh-heredoc face.
 2005-06-14 23:56:03 +00:00
Miles Bader
fdffd34626 Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-57 
Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 324-352)

   - Merge from gnus--rel--5.10
   - Update from CVS
   - etc/emacs-buffer.gdb: Remove RCS keywords

 * gnus--rel--5.10  (patch 70-79)

   - Update from CVS
   - Merge from emacs--cvs-trunk--0
 2005-06-06 02:39:45 +00:00
Lute Kamstra
9a9691963d * progmodes/ada-mode.el (ada-mode): 
* progmodes/antlr-mode.el (antlr-mode):
* progmodes/autoconf.el (autoconf-mode):
* progmodes/dcl-mode.el (dcl-mode):
* progmodes/delphi.el (delphi-mode):
* progmodes/ebrowse.el (ebrowse-tree-mode)
(ebrowse-electric-list-mode, ebrowse-member-mode)
(ebrowse-electric-position-mode):
* progmodes/f90.el (f90-mode):
* progmodes/fortran.el (fortran-mode):
* progmodes/icon.el (icon-mode):
* progmodes/idlw-help.el (idlwave-help-mode):
* progmodes/idlw-shell.el (idlwave-shell-mode):
* progmodes/idlwave.el (idlwave-mode):
* progmodes/inf-lisp.el (inferior-lisp-mode):
* progmodes/m4-mode.el (m4-mode):
* progmodes/meta-mode.el (metafont-mode, metapost-mode):
* progmodes/modula2.el (modula-2-mode):
* progmodes/octave-inf.el (inferior-octave-mode):
* progmodes/octave-mod.el (octave-mode):
* progmodes/pascal.el (pascal-mode):
* progmodes/sh-script.el (sh-mode):
* progmodes/sql.el (sql-mode, sql-interactive-mode):
* progmodes/vhdl-mode.el (vhdl-mode):
* progmodes/xscheme.el (scheme-interaction-mode):  Use run-mode-hooks.
 2005-05-26 16:43:37 +00:00
Miles Bader
d2eeec7fb9 Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-55 
Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 320-323)

   - Update from CVS
 2005-05-26 05:42:19 +00:00
Stefan Monnier
fe67016b3a (sh-mode, sh-get-word): Minor regexp fixes. 2005-05-20 13:28:38 +00:00
Miles Bader
64e9342958 Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-53 
Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 302-319)

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

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

   - Update from CVS
 2005-05-20 04:22:05 +00:00
Richard M. Stallman
32518913cd More doc usage fixes. 2005-05-14 11:21:12 +00:00
Richard M. Stallman
dd77d6f4d3 Many doc usage fixes. 
(sh-indent-after-do): Change default to match common styles.
 2005-05-14 11:20:19 +00:00
Miles Bader
6919bf38d2 Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-51 
Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 289-301)

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

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

   - Update from CVS
 2005-05-12 03:41:19 +00:00
Dan Nicolaescu
8cec35c42e (sh-mode-default-syntax-table): Set the 
syntax of $ to "'" (quote).
 2005-05-11 22:57:25 +00:00
Richard M. Stallman
3f0f48c040 (sh-indent-for-do): Default to 0. 2005-05-10 09:13:04 +00:00
Daniel Pfeiffer
d5f2a89966 (sh-font-lock-keywords): Use font-lock-negation-char-face. 2005-05-05 19:03:32 +00:00
Miles Bader
4a4ae7ad21 Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-37 
Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 241-257)

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

 * gnus--rel--5.10  (patch 59-65)

   - Update from CVS
   - Merge from emacs--cvs-trunk--0
   - (mm-string-to-multibyte): Use Gnus trunk definition.
 2005-04-14 05:03:52 +00:00
Glenn Morris
546e2f6ff2 (sh-here-document-word): Make it a defcustom. Doc fix. 
(sh-add): Bash uses $(( )) for arithmetic.
(sh-while-getopts) <sh>: Set OPTIND back to 1 at end.
(sh-maybe-here-document): Remove quotes and leading whitespace
from heredoc word when closing.  Indent heredoc with tabs if word
starts with "-".
 2005-04-13 18:49:57 +00:00
Miles Bader
768d4533ce Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-35 
Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 228-240)

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

 * gnus--rel--5.10  (patch 53-58)

   - Merge from emacs--cvs-trunk--0
   - Update from CVS
   - Collapse feature addition/removal within single ChangeLog entry
 2005-04-09 02:16:29 +00:00
Dan Nicolaescu
ea81d57ec5 * mh-customize.el (mh-speedbar-selected-folder-face): Special case 
high number of colors displays.

* textmodes/table.el (table-cell-face): Add special case for
displays supporting a high number of colors.
* progmodes/vhdl-mode.el (vhdl-font-lock-prompt-face)
(vhdl-font-lock-reserved-words-face)
(vhdl-speedbar-architecture-face)
(vhdl-speedbar-instantiation-face)
(vhdl-speedbar-architecture-selected-face)
(vhdl-speedbar-instantiation-selected-face): Likewise.
* progmodes/sh-script.el (sh-heredoc-face): Likewise.
* progmodes/idlw-help.el (idlwave-help-link-face): Likewise.
* progmodes/ebrowse.el (ebrowse-tree-mark-face)
(ebrowse-root-class-face, ebrowse-member-attribute-face)
(ebrowse-progress-face): Likewise.
* progmodes/compile.el (compilation-info-face): Likewise.
* progmodes/cc-fonts.el (c-invalid-face): Likewise.
* emacs-lisp/re-builder.el (reb-match-3): Likewise.
* calendar/calendar.el (diary-face): Likewise.
* woman.el (woman-italic-face, woman-bold-face)
(woman-unknown-face): Likewise.
* wid-edit.el (widget-button-pressed-face): Likewise.
* whitespace.el (whitespace-highlight-face): Likewise.
* smerge-mode.el (smerge-mine-face, smerge-base-face): Likewise.
* pcvs-info.el (cvs-marked-face): Likewise.
* info.el (info-xref): Likewise.
* ido.el (ido-subdir-face, ido-indicator-face): Likewise.
* hilit-chg.el (highlight-changes-face)
(highlight-changes-delete-face): Likewise.
* hi-lock.el (hi-yellow, hi-green, hi-blue-b, hi-green-b)
(hi-red-b): Likewise.
* generic-x.el (show-tabs-tab-face, show-tabs-space-face): Likewise.
* font-lock.el (font-lock-keyword-face)
(font-lock-function-name-face, font-lock-warning-face): Likewise.
* cus-edit.el (custom-invalid-face, custom-modified-face)
(custom-set-face, custom-changed-face, custom-variable-tag-face)
(custom-group-tag-face-1, custom-group-tag-face): Likewise.
* comint.el (comint-highlight-prompt): Likewise.
 2005-04-08 14:26:13 +00:00
Glenn Morris
450a39ffe2 (sh-builtins) <bash>: Add `caller'. 
(sh-escaped-newline): New face.
(sh-font-lock-keywords) <shell>: Improve regexp for escaped
newline, and use sh-escaped-newline face.
 2005-04-05 13:07:42 +00:00
Miles Bader
773415d934 Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-31 
Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 206-222)

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

 * gnus--rel--5.10  (patch 45-52)

   - Update from CVS
   - Update from CVS: texi Makefile.in CVS keyw cruft
   - Update from CVS: ChangeLog tweaks
 2005-03-31 09:58:14 +00:00
Werner LEMBERG
eac9c0efd6 * progmodes/ebnf-abn.el, progmodes/ebnf-bnf.el, 
progmodes/ebnf-ebx.el, progmodes/ebnf-dtd.el, progmodes/ebnf-iso.el,
progmodes/ebnf-yac.el, progmodes/ebnf2ps.el, progmodes/idlwave.el,
progmodes/sh-script.el, progmodes/xscheme.el: Replace `illegal' with
`invalid'.
 2005-03-25 08:47:00 +00:00
Miles Bader
18643d1d41 Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-4 
Merge from emacs--cvs-trunk--0

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-41
 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-46
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-47
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-4
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-5
   Update from CVS: exi/gnus-faq.texi ([4.1]): Typo.

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-6
   Update from CVS
 2005-01-22 21:39:38 +00:00
Stefan Monnier
67b9b71fc8 (sh-here-doc-open-re): Don't allow `|' or other 
funny chars in the end-of-here-doc marker.
 2005-01-18 18:21:58 +00:00
Miles Bader
54c4c5465f Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-2 
Merge from emacs--cvs-trunk--0

Patches applied:

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-83
 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-84
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-3
 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-4
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-5
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-6
 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-11
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-12
   Remove "-face" suffix from lazy-highlight face name

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-13
 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-16
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-17
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-18
 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-21
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-22
   <no summary provided>

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-23
 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-39
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-40
   Fix regressions from latest reftex update

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--base-0
   tag of miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-82

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-1
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-2
   Merge from miles@gnu.org--gnu-2004

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-3
   Merge from emacs--cvs-trunk--0
 2005-01-16 03:40:12 +00:00