Commit graph

272 commits

Author SHA1 Message Date
Miles Bader
de20e0ccdb Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 382-398)

   - Update from CVS
   - Update from erc--emacs--22
   - Fix ERC bug introduced in last patch
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 123-125)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-101
2006-08-16 14:08:49 +00:00
Stefan Monnier
4c7c5c7e48 (sh-quoted-subshell): Make sure we don't mistake a closing " for an opening one. 2006-08-08 15:09:26 +00:00
Miles Bader
e2b9706014 Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 357-381)

   - Merge from gnus--rel--5.10
   - Update from CVS
   - Merge from erc--emacs--21

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

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

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-98
2006-08-03 11:45:23 +00:00
Stefan Monnier
3a723c3afa (sh-quoted-subshell): Further fix last change. 2006-07-20 21:23:48 +00:00
Stefan Monnier
a97a33cb2a (sh-quoted-subshell): Fix last change. 2006-07-19 04:31:41 +00:00
Miles Bader
63db3c1b3f Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 343-356)

   - Update from CVS
   - Update for ERC 5.1.3.
   - Merge from gnus--rel--5.10

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

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

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-90
2006-07-19 00:42:56 +00:00
Stefan Monnier
c6b7104550 (sh-font-lock-keywords-1): Revert inadvertently installed patch hunk. 2006-07-18 21:03:59 +00:00
Stefan Monnier
69c6ad8391 (sh-quoted-subshell): Don't match escaped . Use cond', push', and `dolist'. 2006-07-17 21:07:23 +00:00
Miles Bader
b883cdb2fe Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 285-296)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Update from CVS: admin/FOR-RELEASE: Update refcard section.

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

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-64
2006-06-07 18:05:10 +00:00
Eli Zaretskii
6d39902f35 (sh-quoted-exec): New face for quoted exec constructs like foo bar.
(sh-quoted-subshell): New helper function to search for a possibly nested
subshell (like `` or $()) within a "" quoted string.
(sh-font-lock-keywords-var): Add sh-quoted-exec for Bash.
(sh-apply-quoted-subshell): Flag quote characters inside a subshell, which is
itself already in a quoted region, as punctuation, since this is the closest
to what they actually are.
(sh-font-lock-syntactic-keywords): Add sh-quoted-subshell and
sh-apply-quoted-subshell.
(sh-font-lock-syntactic-face-function): Apply the new face for text inside ``
instead of the old font-lock-string-face.
2006-06-03 08:38:43 +00:00
Roland Winkler
21225d8f7e (sh-mode): Use skeleton-pair-filter-function. 2006-05-21 23:18:19 +00:00
Roland Winkler
62fda6d68a (sh-mode): Use skeleton-filter-function. 2006-05-21 23:10:13 +00:00
Miles Bader
7e635d0ed3 Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-57
Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 226-238)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Update from CVS: lisp/progmodes/python.el (python-mode): Fix typo.

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

   - Update from CVS
   - Merge from emacs--devo--0
2006-04-21 05:39:14 +00:00
Dan Nicolaescu
7fe9a6e3c1 (sh-shell): Mark as safe. 2006-04-20 23:35:08 +00:00
Miles Bader
a6c05016ac Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-26
Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 119-122)

   - Update from CVS
2006-02-26 07:09:24 +00:00
Thien-Thi Nguyen
19cd88cc93 (sh-mode): Fix bug: Arrange to use
the default shell if filename is not available.
2006-02-25 11:25:25 +00:00
Miles Bader
b434f199db Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-21
Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 97-112)

   - Update from CVS
   - Merge from erc--emacs--0
   - Update from CVS: src/regex.c (extend_range_table_work_area): Fix typo.
   - Merge from gnus--rel--5.10

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

   - Update from CVS
2006-02-22 06:54:10 +00:00
Richard M. Stallman
f623a9d2e6 (sh-mode): Set shell type based on file name if no other specific basis. 2006-02-21 19:55:46 +00:00
Miles Bader
0b12547529 Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-14
Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 58-65)

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

 * gnus--rel--5.10  (patch 22-28)

   - Update from CVS
   - Merge from emacs--devo--0
   - Update from CVS: lisp/gnus.el: Remove bogus comment.
2006-02-11 00:11:19 +00:00
Nick Roberts
d91362c9e0 Update copyright for 2006. 2006-02-10 09:00:31 +00:00
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