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
This commit is contained in:
Miles Bader
commit
768d4533ce
125 changed files with 2151 additions and 1031 deletions
|
|
@ -182,7 +182,7 @@ man/regs.texi "Luc Teirlinck" Chong Yidong
|
||||||
man/rmail.texi Chong Yidong
|
man/rmail.texi Chong Yidong
|
||||||
man/screen.texi "Luc Teirlinck" Chong Yidong
|
man/screen.texi "Luc Teirlinck" Chong Yidong
|
||||||
man/search.texi "Luc Teirlinck" Chong Yidong
|
man/search.texi "Luc Teirlinck" Chong Yidong
|
||||||
man/sending.texi Chong Yidong
|
man/sending.texi Chong Yidong "Luc Teirlinck"
|
||||||
man/text.texi "Luc Teirlinck" Chong Yidong
|
man/text.texi "Luc Teirlinck" Chong Yidong
|
||||||
man/trouble.texi Chong Yidong
|
man/trouble.texi Chong Yidong
|
||||||
man/windows.texi "Luc Teirlinck" Chong Yidong
|
man/windows.texi "Luc Teirlinck" Chong Yidong
|
||||||
|
|
@ -263,12 +263,12 @@ SECTION READERS
|
||||||
etc/TUTORIAL rms
|
etc/TUTORIAL rms
|
||||||
etc/TUTORIAL.bg Ognyan Kulev <ogi@fmi.uni-sofia.bg>
|
etc/TUTORIAL.bg Ognyan Kulev <ogi@fmi.uni-sofia.bg>
|
||||||
etc/TUTORIAL.cn
|
etc/TUTORIAL.cn
|
||||||
etc/TUTORIAL.cs
|
etc/TUTORIAL.cs Pavel Janík <Pavel@Janik.cz>
|
||||||
etc/TUTORIAL.de
|
etc/TUTORIAL.de Werner LEMBERG <wl@gnu.org>
|
||||||
etc/TUTORIAL.es Marcelo Toledo
|
etc/TUTORIAL.es Marcelo Toledo
|
||||||
etc/TUTORIAL.fr
|
etc/TUTORIAL.fr Thien-Thi Nguyen
|
||||||
etc/TUTORIAL.it
|
etc/TUTORIAL.it Thien-Thi Nguyen
|
||||||
etc/TUTORIAL.ja
|
etc/TUTORIAL.ja Kenichi Handa <handa@m17n.org>
|
||||||
etc/TUTORIAL.ko
|
etc/TUTORIAL.ko
|
||||||
etc/TUTORIAL.nl Lute Kamstra
|
etc/TUTORIAL.nl Lute Kamstra
|
||||||
etc/TUTORIAL.pl
|
etc/TUTORIAL.pl
|
||||||
|
|
@ -276,7 +276,7 @@ etc/TUTORIAL.pt_BR Marcelo Toledo
|
||||||
etc/TUTORIAL.ro
|
etc/TUTORIAL.ro
|
||||||
etc/TUTORIAL.ru
|
etc/TUTORIAL.ru
|
||||||
etc/TUTORIAL.sk
|
etc/TUTORIAL.sk
|
||||||
etc/TUTORIAL.sl
|
etc/TUTORIAL.sl Primoz PETERLIN <primoz.peterlin@biofiz.mf.uni-lj.si>
|
||||||
etc/TUTORIAL.sv Mats Lidell <matsl@contactor.se>
|
etc/TUTORIAL.sv Mats Lidell <matsl@contactor.se>
|
||||||
etc/TUTORIAL.th
|
etc/TUTORIAL.th
|
||||||
etc/TUTORIAL.zh
|
etc/TUTORIAL.zh
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,29 @@
|
||||||
|
2005-04-08 Kenichi Handa <handa@m17n.org>
|
||||||
|
|
||||||
|
* TUTORIAL.ja: Updated header, contents synchronized with
|
||||||
|
TUTORIAL at 2005-04-01T00:31:25Z!rms@gnu.org.
|
||||||
|
|
||||||
|
2005-04-06 Pavel Jan,Am(Bk <Pavel@Janik.cz>
|
||||||
|
|
||||||
|
* TUTORIAL.cs: Updated header.
|
||||||
|
|
||||||
|
2005-04-05 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
|
* TUTORIAL.de: Updated header.
|
||||||
|
|
||||||
|
2005-04-05 Marcelo Toledo <marcelo@marcelotoledo.org>
|
||||||
|
|
||||||
|
* TUTORIAL.translators: Added the field Maintainer.
|
||||||
|
|
||||||
|
2005-04-04 Thien-Thi Nguyen <ttn@gnu.org>
|
||||||
|
|
||||||
|
* TUTORIAL.it: Move "copying conditions at end" sentence after title.
|
||||||
|
|
||||||
|
2005-04-04 Thien-Thi Nguyen <ttn@gnu.org>
|
||||||
|
|
||||||
|
* TUTORIAL.ja: Update text before first period.
|
||||||
|
Reported by Kenichi Handa.
|
||||||
|
|
||||||
2005-04-02 Richard M. Stallman <rms@gnu.org>
|
2005-04-02 Richard M. Stallman <rms@gnu.org>
|
||||||
|
|
||||||
* TUTORIAL.ja, TUTORIAL.cn, TUTORIAL.ru, TUTORIAL.zh: Remove the
|
* TUTORIAL.ja, TUTORIAL.cn, TUTORIAL.ru, TUTORIAL.zh: Remove the
|
||||||
|
|
@ -9,18 +35,17 @@
|
||||||
2005-04-01 Marcelo Toledo <marcelo@marcelotoledo.org>
|
2005-04-01 Marcelo Toledo <marcelo@marcelotoledo.org>
|
||||||
|
|
||||||
* TUTORIAL.pt_BR, TUTORIAL.cn, TUTORIAL.cs, TUTORIAL.de,
|
* TUTORIAL.pt_BR, TUTORIAL.cn, TUTORIAL.cs, TUTORIAL.de,
|
||||||
TUTORIAL.es, TUTORIAL.fr, TUTORIAL.it, TUTORIAL.ja, TUTORIAL.ko,
|
* TUTORIAL.es, TUTORIAL.fr, TUTORIAL.it, TUTORIAL.ja, TUTORIAL.ko,
|
||||||
TUTORIAL.pl, TUTORIAL.pt_BR, TUTORIAL.ro, TUTORIAL.ru,
|
* TUTORIAL.pl, TUTORIAL.pt_BR, TUTORIAL.ro, TUTORIAL.ru,
|
||||||
TUTORIAL.sk, TUTORIAL.sl, TUTORIAL.th, TUTORIAL.zh: Fix title
|
* TUTORIAL.sk, TUTORIAL.sl, TUTORIAL.th, TUTORIAL.zh: Fix title
|
||||||
line.
|
line.
|
||||||
|
|
||||||
* TUTORIAL.bg: Fix title line; Applied TUTORIAL changes in
|
* TUTORIAL.bg: Fix title line; Applied TUTORIAL changes in
|
||||||
2005-02-08T14:20:54Z!lute@gnu.org, "Emacs" is not transliterated to cyrillic anymore;
|
2005-02-08T14:20:54Z!lute@gnu.org, "Emacs" is not transliterated to cyrillic anymore;
|
||||||
Minor fixes; by Ognyan Kulev <ogi@fmi.uni-sofia.bg>.
|
Minor fixes; patch by Ognyan Kulev <ogi@fmi.uni-sofia.bg>.
|
||||||
|
|
||||||
* TUTORIAL.sv: Sync some other changes with the TUTORIAL version
|
* TUTORIAL.sv: Sync some other changes with the TUTORIAL version
|
||||||
2005-04-01T00:31:25Z!rms@gnu.org by Mats Lidell <matsl@contactor.se>.
|
2005-04-01T00:31:25Z!rms@gnu.org patch by Mats Lidell <matsl@contactor.se>.
|
||||||
|
|
||||||
|
|
||||||
2005-04-01 Lute Kamstra <lute@gnu.org>
|
2005-04-01 Lute Kamstra <lute@gnu.org>
|
||||||
|
|
||||||
|
|
|
||||||
4
etc/NEWS
4
etc/NEWS
|
|
@ -193,6 +193,8 @@ versions which recognize Thai words. Affected commands are
|
||||||
M-t (transpose-words)
|
M-t (transpose-words)
|
||||||
M-q (fill-paragraph)
|
M-q (fill-paragraph)
|
||||||
|
|
||||||
|
** fast-lock.el and lazy-lock.el are obsolete. Use jit-lock.el instead.
|
||||||
|
|
||||||
** iso-acc.el is now obsolete. Use one of the latin input methods instead.
|
** iso-acc.el is now obsolete. Use one of the latin input methods instead.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
@ -425,7 +427,7 @@ the next/previous matching line found by M-x occur.
|
||||||
** Telnet now prompts you for a port number with C-u M-x telnet.
|
** Telnet now prompts you for a port number with C-u M-x telnet.
|
||||||
|
|
||||||
+++
|
+++
|
||||||
** New command line option -Q.
|
** New command line option -Q or --bare-bones.
|
||||||
|
|
||||||
This is like using -q --no-site-file, but in addition it also disables
|
This is like using -q --no-site-file, but in addition it also disables
|
||||||
the menu-bar, the tool-bar, the scroll-bars, tool tips, the blinking
|
the menu-bar, the tool-bar, the scroll-bars, tool tips, the blinking
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
tutoriál k Emacsu.
|
Tutoriál k Emacsu. Podmínky viz na konci.
|
||||||
Copyright (c) 1985 Free Software Foundation, Inc; podmínky viz na konci.
|
Copyright (c) 1985, 1996, 1998, 2001, 2002, 2005 Free Software Foundation.
|
||||||
Do češtiny přeložil Milan Zamazal <pdm@zamazal.org>.
|
Do češtiny přeložil Milan Zamazal <pdm@zamazal.org>.
|
||||||
|
|
||||||
Máte před sebou tutoriál k Emacsu.
|
Máte před sebou tutoriál k Emacsu.
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
Einführung in Emacs. (c) 2002, 2003 Free Software Foundation, Inc.
|
Einführung in Emacs. Siehe Dateiende für Vervielfältigungsbedingungen.
|
||||||
|
(c) 2002, 2003, 2005 Free Software Foundation, Inc.
|
||||||
|
|
||||||
Emacs-Befehle beinhalten im allgemeinen die CONTROL-Taste (manchmal
|
Emacs-Befehle beinhalten im allgemeinen die CONTROL-Taste (manchmal
|
||||||
auch als CTRL, CTL oder STRG beschriftet) sowie die META-Taste (auch
|
auch als CTRL, CTL oder STRG beschriftet) sowie die META-Taste (auch
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
Esercitazione di Emacs. Copyright (c) 2003 Free Software Foundation, Inc.
|
Esercitazione di Emacs. Condizioni d'uso alla fine del file.
|
||||||
Condizioni d'uso alla fine del file.
|
Copyright (c) 2003 Free Software Foundation, Inc.
|
||||||
|
|
||||||
I comandi di Emacs comportano generalmente l'uso del tasto CONTROL (a
|
I comandi di Emacs comportano generalmente l'uso del tasto CONTROL (a
|
||||||
volte indicato con CTRL o CTL) o del tasto META (a volte indicato con EDIT
|
volte indicato con CTRL o CTL) o del tasto META (a volte indicato con EDIT
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
Emacs $BF~Lg%,%$%I$G$9(B.
|
Emacs $BF~Lg%,%$%I(B. $BK\%U%!%$%k$NCx:n8"$K$D$$$F$O:G8e$r8fMw2<$5$$!#(B
|
||||||
Copyright (c) 1985, 1996, 1998, 2001, 2002 Free Software Foundation.
|
Copyright (c) 1985, 1996, 1998, 2001, 2002, 2005 Free Software Foundation.
|
||||||
|
|
||||||
Emacs $B$N%3%^%s%I$rF~NO$9$k$K$O!"0lHL$K%3%s%H%m!<%k%-!<!J%-!<%H%C%W$K(B
|
Emacs $B$N%3%^%s%I$rF~NO$9$k$K$O!"0lHL$K%3%s%H%m!<%k%-!<!J%-!<%H%C%W$K(B
|
||||||
CONTROL $B$H$+(B CTRL $B$H$+(B CTL $B$H=q$$$F$"$k!K$d%a%?%-!<!J%-!<%H%C%W$K(B META
|
CONTROL $B$H$+(B CTRL $B$H$+(B CTL $B$H=q$$$F$"$k!K$d%a%?%-!<!J%-!<%H%C%W$K(B META
|
||||||
|
|
@ -372,7 +372,7 @@ C-k $B$O#2$D$N9T$H$=$l$>$l$KB3$/2~9TJ8;z$r>C$7$^$9$,!"(BC-k $B$r#2EY%?%$%W$7
|
||||||
|
|
||||||
$B>C5n$7$?J8>O$rI|3h$5$;$kA`:n$r:FF~!J(Byanking$B!K$H8F$S$^$9!#>C$7$?J8>O$O!"(B
|
$B>C5n$7$?J8>O$rI|3h$5$;$kA`:n$r:FF~!J(Byanking$B!K$H8F$S$^$9!#>C$7$?J8>O$O!"(B
|
||||||
$B85$HF1$8>l=j$K$G$b85$H$O0c$&>l=j$K$G$b!"$5$i$K$OJL$N%U%!%$%k$K$b:FF~$G(B
|
$B85$HF1$8>l=j$K$G$b85$H$O0c$&>l=j$K$G$b!"$5$i$K$OJL$N%U%!%$%k$K$b:FF~$G(B
|
||||||
$B$-$^$9!#$^$?!"2?EY$b:FF~$7$FJ8>O$N%3%T!<$rJ#?t:n$k$3$H$b$G$-$^$9!#(B
|
$B$-$^$9!#$^$?!"2?EY$b:FF~$9$k$3$H$GJ8>O$N%3%T!<$rJ#?t:n$k$3$H$b$G$-$^$9!#(B
|
||||||
|
|
||||||
$B:FF~$N$?$a$N%3%^%s%I$O(B C-y $B$G$9!#$3$l$O!":G8e$K>C5n$7$?J8>O$r8=:_%+!<(B
|
$B:FF~$N$?$a$N%3%^%s%I$O(B C-y $B$G$9!#$3$l$O!":G8e$K>C5n$7$?J8>O$r8=:_%+!<(B
|
||||||
$B%=%k$,$"$k0LCV$K:FF~$7$^$9!#(B
|
$B%=%k$,$"$k0LCV$K:FF~$7$^$9!#(B
|
||||||
|
|
@ -592,7 +592,7 @@ Emacs $B$K$O!"%3%s%H%m!<%kJ8;z$d%a%?J8;z$K3dEv$F$i$l$k$h$j$b$:$C$H$:$C$H(B
|
||||||
$B;H$$$^$9!#$=$l$K$O!"0J2<$N#2$D$N<oN`$,$"$j$^$9!#(B
|
$B;H$$$^$9!#$=$l$K$O!"0J2<$N#2$D$N<oN`$,$"$j$^$9!#(B
|
||||||
|
|
||||||
C-x $BJ8;z$K$h$k3HD%!#B3$1$F0lJ8;z$rF~NO$7$^$9!#(B
|
C-x $BJ8;z$K$h$k3HD%!#B3$1$F0lJ8;z$rF~NO$7$^$9!#(B
|
||||||
ESC x $BL>A0$K$h$k3HD%!#B3$1$F%3%^%s%I$NL>A0$rF~NO$7$^$9!#(B
|
M-x $BL>A0$K$h$k3HD%!#B3$1$F%3%^%s%I$NL>A0$rF~NO$7$^$9!#(B
|
||||||
|
|
||||||
$B$3$l$i$O!"0lHLE*$K$OJXMx$@$1$l$I$b!"$3$l$^$G8+$F$-$?$b$N$[$I$OIQHK$KMQ(B
|
$B$3$l$i$O!"0lHLE*$K$OJXMx$@$1$l$I$b!"$3$l$^$G8+$F$-$?$b$N$[$I$OIQHK$KMQ(B
|
||||||
$B$$$i$l$J$$%3%^%s%I$G$9!#(BC-x C-f $B!J%U%!%$%k$r3+$/!K$d(B C-x C-s$B!J%U%!%$%k(B
|
$B$$$i$l$J$$%3%^%s%I$G$9!#(BC-x C-f $B!J%U%!%$%k$r3+$/!K$d(B C-x C-s$B!J%U%!%$%k(B
|
||||||
|
|
@ -1027,7 +1027,7 @@ F10 h r$B!K$G$"$m$&$H!"$=$l$rFI$a$P(B Emacs $B$K$D$$$F$b$C$HB?$/$r3X$Y$^$9!#
|
||||||
$B!v$3$NK]LuHG$K$D$$$F$N<U<-(B
|
$B!v$3$NK]LuHG$K$D$$$F$N<U<-(B
|
||||||
==========================
|
==========================
|
||||||
|
|
||||||
$B$3$NJ8=q$O(B Emacs Ver.21 $BIUB0$N1Q8lHG$NF~Lg%,%$%I$rF|K\8l$KK]Lu$7$?$b$N(B
|
$B$3$NJ8=q$O(B Emacs Ver.22 $BIUB0$N1Q8lHG$NF~Lg%,%$%I$rF|K\8l$KK]Lu$7$?$b$N(B
|
||||||
$B$G$9!#$=$N:]!"(BEmacs Ver. 20 $BImB0$NF|K\8lHGF~Lg%,%$%I$r%Y!<%9$K$7$^$7$?!#(B
|
$B$G$9!#$=$N:]!"(BEmacs Ver. 20 $BImB0$NF|K\8lHGF~Lg%,%$%I$r%Y!<%9$K$7$^$7$?!#(B
|
||||||
Emacs Ver. 20 $BImB0$NF|K\8lHGF~Lg%,%$%I$O!"(BMule $BIUB0$NF|K\8l%,%$%I$r;2(B
|
Emacs Ver. 20 $BImB0$NF|K\8lHGF~Lg%,%$%I$O!"(BMule $BIUB0$NF|K\8l%,%$%I$r;2(B
|
||||||
$B9M$K$7$?$b$N$G!"$=$N85$O(B SANETO Takanori $B;a$,F|K\8l(B MicroEmacs(kemacs)
|
$B9M$K$7$?$b$N$G!"$=$N85$O(B SANETO Takanori $B;a$,F|K\8l(B MicroEmacs(kemacs)
|
||||||
|
|
@ -1048,7 +1048,7 @@ starting with the one written by Stuart Cracraft for the original Emacs.
|
||||||
This version of the tutorial, like GNU Emacs, is copyrighted, and
|
This version of the tutorial, like GNU Emacs, is copyrighted, and
|
||||||
comes with permission to distribute copies on certain conditions:
|
comes with permission to distribute copies on certain conditions:
|
||||||
|
|
||||||
Copyright (c) 1985, 1996, 1998, 2001, 2002 Free Software Foundation
|
Copyright (c) 1985, 1996, 1998, 2001, 2002, 2005 Free Software Foundation
|
||||||
|
|
||||||
Permission is granted to anyone to make or distribute verbatim copies
|
Permission is granted to anyone to make or distribute verbatim copies
|
||||||
of this document as received, in any medium, provided that the
|
of this document as received, in any medium, provided that the
|
||||||
|
|
|
||||||
208
etc/TUTORIAL.sv
208
etc/TUTORIAL.sv
|
|
@ -1,5 +1,6 @@
|
||||||
användarhandledningen till Emacs. I slutet finns kopieringsvillkoren.
|
Emacs användarhandledning. I slutet finns kopieringsvillkoren.
|
||||||
Copyright (c) 1985, 1996, 1998, 2001, 2002 Free Software Foundation, Inc.
|
Copyright (c) 1985, 1996, 1998, 2001, 2002, 2005 Free Software
|
||||||
|
Foundation, Inc.
|
||||||
|
|
||||||
Emacs-kommandon innebär ofta användning av kontrolltangenten (vanligen
|
Emacs-kommandon innebär ofta användning av kontrolltangenten (vanligen
|
||||||
märkt CTRL eller CTL) eller META-tangenten (på vissa tangentbord märkt
|
märkt CTRL eller CTL) eller META-tangenten (på vissa tangentbord märkt
|
||||||
|
|
@ -48,6 +49,10 @@ F
|
||||||
Hitta markören igen och notera att det är samma text som står kring
|
Hitta markören igen och notera att det är samma text som står kring
|
||||||
markören nu.
|
markören nu.
|
||||||
|
|
||||||
|
Du kan också använda PageUp och PageDn tangenterna, om din terminal
|
||||||
|
har dem, för att flytta en hel skärmbild åt gången, men du redigerar
|
||||||
|
effektivare om du använder C-v och M-v.
|
||||||
|
|
||||||
|
|
||||||
* GRUNDLÄGGANDE MARKÖRRÖRELSER
|
* GRUNDLÄGGANDE MARKÖRRÖRELSER
|
||||||
------------------------------
|
------------------------------
|
||||||
|
|
@ -55,12 +60,10 @@ F
|
||||||
Att flytta sig från skärmbild till skärmbild kan vara bra, men hur
|
Att flytta sig från skärmbild till skärmbild kan vara bra, men hur
|
||||||
förflyttar man sig till en speciell plats på skärmen?
|
förflyttar man sig till en speciell plats på skärmen?
|
||||||
|
|
||||||
Det finns flera sätt att göra detta på. Det vanligaste är att använda
|
Det finns flera sätt att göra detta. Du kan använda piltangenterna,
|
||||||
kommandona C-p, C-b, C-f och C-n. Vart och ett av dessa kommandon
|
men det är mer effektivt att ha händerna i standardläget och använda
|
||||||
flyttar markören en rad eller en kolumn i en bestämd riktning på
|
kommandona C-p, C-b, C-f och C-n. Dessa tecken är likvärdiga med de
|
||||||
skärmen. Här visas dessa fyra kommandon och i vilken riktning de
|
fyra piltangenterna. Så här:
|
||||||
flyttar markören:
|
|
||||||
|
|
||||||
|
|
||||||
Föregående rad, C-p
|
Föregående rad, C-p
|
||||||
:
|
:
|
||||||
|
|
@ -74,11 +77,10 @@ flyttar mark
|
||||||
och C-p. Använd sedan C-l för att centrera diagrammet på
|
och C-p. Använd sedan C-l för att centrera diagrammet på
|
||||||
skärmbilden.
|
skärmbilden.
|
||||||
|
|
||||||
Detta är säkert lite enklare att förstå om du tänker på dessa
|
Detta är enklare att komma ihåg om du tänker på dessa förkortningar: P
|
||||||
förkortningar: P för föregående (previous), N för nästa (next), B för
|
för föregående (previous), N för nästa (next), B för bakåt (backward)
|
||||||
bakåt (backward) och F för framåt (forward). Detta är de grundläggande
|
och F för framåt (forward). Dessa är de grundläggande kommandona för
|
||||||
kommandona för att flytta markören och du kommer säkert att använda
|
att flytta markören och du kommer att använda dem hela tiden.
|
||||||
dem hela tiden, så det är en stor fördel om du lär dig dem nu.
|
|
||||||
|
|
||||||
>> Gör några C-n så att du kommer ned till den här raden.
|
>> Gör några C-n så att du kommer ned till den här raden.
|
||||||
|
|
||||||
|
|
@ -308,17 +310,23 @@ texten. Tecken som du kan se, s
|
||||||
sätts in direkt. Skriv <Return> (retur-tangenten) för att sätta in en
|
sätts in direkt. Skriv <Return> (retur-tangenten) för att sätta in en
|
||||||
radbrytning.
|
radbrytning.
|
||||||
|
|
||||||
Du kan radera det sista tecknet du skrev genom att trycka <Delete>.
|
Du kan radera det sista tecknet du skrev genom att trycka <Delback>.
|
||||||
<Delete> är en tangent på tangentbordet, som kan vara märkt "Del". I
|
<Delback> är en tangent på tangentbordet -- samma som du normalt
|
||||||
några fall fungerar också "backsteg" som <Delete> men inte alltid!
|
använder utanför Emacs för att ta bort det senaste tecknet du skrivit.
|
||||||
|
Det är vanligen en stor tangent några rader ovanför retur-tangenten,
|
||||||
|
och den är vanligtvis märkt "Delete, "Del" eller "Backspace".
|
||||||
|
|
||||||
Generellt raderar <Delete> tecknet precis före den aktuella
|
Om den stora tangenten är märkt med "Backspace" så är det den du
|
||||||
|
använder för <Delback>. Det kan finnas en annan tangent som är märkt
|
||||||
|
med "Delete" men det är inte <Delback>.
|
||||||
|
|
||||||
|
Generellt raderar <Delback> tecknet precis före den aktuella
|
||||||
markörspositionen.
|
markörspositionen.
|
||||||
|
|
||||||
>> Gör detta nu: Skriv in några tecken och ta bort dem genom att
|
>> Gör detta nu: Skriv in några tecken och ta bort dem genom att
|
||||||
använda <Delete>. Var inte rädd för att skriva i den här filen, du
|
använda <Delback>. Var inte rädd för att skriva i den här filen,
|
||||||
kommer inte att kunna förändra originalet till vägledningen. Detta
|
du kommer inte att kunna förändra originalet till vägledningen.
|
||||||
är bara en lokal kopia.
|
Detta är bara en lokal kopia.
|
||||||
|
|
||||||
När en rad blir för lång för att rymmas på en skärmbredd så fortsätter
|
När en rad blir för lång för att rymmas på en skärmbredd så fortsätter
|
||||||
den på raden under. Ett bakstreck ("\") (eller om du kör under ett
|
den på raden under. Ett bakstreck ("\") (eller om du kör under ett
|
||||||
|
|
@ -329,7 +337,7 @@ indikerar att raden forts
|
||||||
fortsätt att skriva lite till. Du kommer då att se hur
|
fortsätt att skriva lite till. Du kommer då att se hur
|
||||||
fortsättningstecknet ser ut.
|
fortsättningstecknet ser ut.
|
||||||
|
|
||||||
>> Använd <Delete> för att radera texten tills raden ryms på en
|
>> Använd <Delback> för att radera texten tills raden ryms på en
|
||||||
skärmbredd igen. Fortsättningstecknet kommer då att försvinna.
|
skärmbredd igen. Fortsättningstecknet kommer då att försvinna.
|
||||||
|
|
||||||
Du kan radera radbrytning precis som andra tecken. Genom att radera
|
Du kan radera radbrytning precis som andra tecken. Genom att radera
|
||||||
|
|
@ -337,7 +345,7 @@ radbrytningen mellan tv
|
||||||
resultatet av denna sammanslagning blir för stor för att passa inom en
|
resultatet av denna sammanslagning blir för stor för att passa inom en
|
||||||
skärmbredd, så kommer den att visas med ett fortsättningstecken.
|
skärmbredd, så kommer den att visas med ett fortsättningstecken.
|
||||||
|
|
||||||
>> Flytta markören till början av en rad och tryck <Delete>.
|
>> Flytta markören till början av en rad och tryck <Delback>.
|
||||||
Detta kommer att klistra ihop raden med raden över.
|
Detta kommer att klistra ihop raden med raden över.
|
||||||
|
|
||||||
>> Tryck <Return> för att sätta in radbrytningen du tog bort.
|
>> Tryck <Return> för att sätta in radbrytningen du tog bort.
|
||||||
|
|
@ -352,21 +360,21 @@ Du har nu l
|
||||||
Emacs och att rätta fel. Du kan radera ord och rader också. Här är en
|
Emacs och att rätta fel. Du kan radera ord och rader också. Här är en
|
||||||
översikt över kommandon för radering:
|
översikt över kommandon för radering:
|
||||||
|
|
||||||
<Delete> raderar tecknet som står precis före markören
|
<Delback> Raderar tecknet som står precis före markören
|
||||||
C-d raderar tecknet som står precis under markören
|
C-d Raderar tecknet som står precis under markören
|
||||||
|
|
||||||
M-<Delete> raderar ordet precis före markören
|
M-<Delback> Raderar ordet precis före markören
|
||||||
M-d raderar ordet precis efter markören
|
M-d Raderar ordet precis efter markören
|
||||||
|
|
||||||
C-k raderar från markören till slutet av raden
|
C-k Raderar från markören till slutet av raden
|
||||||
M-k raderar till slutet av stycket
|
M-k Raderar till slutet av stycket
|
||||||
|
|
||||||
Lägg märke till att <Delete> och C-d kontra M-<Delete> och M-d följer
|
Lägg märke till att <Delback> och C-d kontra M-<Delback> och M-d
|
||||||
mönstret som började med C-f och M-f. (<Delete> är inte precis
|
följer mönstret som började med C-f och M-f. (<Delback> är inte precis
|
||||||
ett kontrolltecken men låt oss inte bry oss om det.) C-k och M-k
|
ett kontrolltecken men låt oss inte bry oss om det.) C-k och M-k
|
||||||
fungerar på samma sätt som C-e och M-e (nästan).
|
fungerar på samma sätt som C-e och M-e (nästan).
|
||||||
|
|
||||||
Du kan också ta bort vilken del som helst av bufferten med hjälp av
|
Du kan också ta bort vilken del som helst av texten med hjälp av
|
||||||
följande allmänna metod. Flytta till ena änden av det område du vill
|
följande allmänna metod. Flytta till ena änden av det område du vill
|
||||||
ta bort och tryck C-@ eller C-mellanslag. Flytta till andra änden av
|
ta bort och tryck C-@ eller C-mellanslag. Flytta till andra änden av
|
||||||
området och tryck C-w. Detta tar bort all text mellan de två
|
området och tryck C-w. Detta tar bort all text mellan de två
|
||||||
|
|
@ -404,9 +412,9 @@ Att s
|
||||||
(Tänk på det som att du rycker, eller drar, tillbaka någon text som
|
(Tänk på det som att du rycker, eller drar, tillbaka någon text som
|
||||||
tagits bort.) Du kan antingen hämta tillbaka borttagen text till samma
|
tagits bort.) Du kan antingen hämta tillbaka borttagen text till samma
|
||||||
plats som där den blev borttagen, eller så kan du sätta in den på en
|
plats som där den blev borttagen, eller så kan du sätta in den på en
|
||||||
annan plats i bufferten eller till och med i en helt annan fil. Du kan
|
annan plats i texten du redigerar eller till och med i en helt annan
|
||||||
också hämta tillbaka den flera gånger så att du får flera lika
|
fil. Du kan också hämta tillbaka samma text flera gånger så att du får
|
||||||
förekomster av den.
|
flera lika förekomster av den.
|
||||||
|
|
||||||
Kommandot för att hämta tillbaka text är C-y. Kommandot hämtar
|
Kommandot för att hämta tillbaka text är C-y. Kommandot hämtar
|
||||||
tillbaka den sist borttagna texten och placerar den där markören är.
|
tillbaka den sist borttagna texten och placerar den där markören är.
|
||||||
|
|
@ -495,8 +503,8 @@ nytt namn, som backup, ifall du senare
|
||||||
|
|
||||||
Om du tittar nästan längst ner på skärmbilden så kommer du se en rad
|
Om du tittar nästan längst ner på skärmbilden så kommer du se en rad
|
||||||
som börjar och slutar med minustecken, och som innehåller texten
|
som börjar och slutar med minustecken, och som innehåller texten
|
||||||
"--:-- TUTORIAL.se". Denna del av skärmbilden visar alltid namnet på
|
"--:-- TUTORIAL.sv". Denna del av skärmbilden visar alltid namnet på
|
||||||
filen du besöker. Just nu är du inne i en fil som heter "TUTORIAL.se"
|
filen du besöker. Just nu är du inne i en fil som heter "TUTORIAL.sv"
|
||||||
och som är en personlig kopia av vägledningen till Emacs. Vilken fil
|
och som är en personlig kopia av vägledningen till Emacs. Vilken fil
|
||||||
du än är inne i så kommer filnamnet stå där.
|
du än är inne i så kommer filnamnet stå där.
|
||||||
|
|
||||||
|
|
@ -539,7 +547,7 @@ blev sparad. Du b
|
||||||
systemet kraschar.
|
systemet kraschar.
|
||||||
|
|
||||||
>> Skriv C-x C-s för att spara en kopia av denna vägledning.
|
>> Skriv C-x C-s för att spara en kopia av denna vägledning.
|
||||||
Detta skall leda till att "Wrote ...TUTORIAL.se" skrivs ut nederst
|
Detta skall leda till att "Wrote ...TUTORIAL.sv" skrivs ut nederst
|
||||||
på skärmbilden.
|
på skärmbilden.
|
||||||
|
|
||||||
Observera: På vissa system leder C-x C-s till att skärmen låser
|
Observera: På vissa system leder C-x C-s till att skärmen låser
|
||||||
|
|
@ -568,7 +576,7 @@ den p
|
||||||
|
|
||||||
>> Skapa en fil med namnet "foo" genom att trycka C-x C-f foo <Return>.
|
>> Skapa en fil med namnet "foo" genom att trycka C-x C-f foo <Return>.
|
||||||
Skriv in lite text, redigera den och spara "foo" genom att använda
|
Skriv in lite text, redigera den och spara "foo" genom att använda
|
||||||
C-x C-s. Skriv till slut C-x C-f TUTORIAL.se<Return> för att komma
|
C-x C-s. Skriv till slut C-x C-f TUTORIAL.sv <Return> för att komma
|
||||||
tillbaka till den här vägledningen.
|
tillbaka till den här vägledningen.
|
||||||
|
|
||||||
Emacs sparar texten för varje fil i ett objekt kallat "buffert". När
|
Emacs sparar texten för varje fil i ett objekt kallat "buffert". När
|
||||||
|
|
@ -580,13 +588,37 @@ du finner en ny fil skapas en ny buffert i Emacs. F
|
||||||
>> Prova C-x C-b nu.
|
>> Prova C-x C-b nu.
|
||||||
|
|
||||||
Se hur varje buffert har ett namn och att de också kan ha namnet på
|
Se hur varje buffert har ett namn och att de också kan ha namnet på
|
||||||
den fil som innehållet kommer från. En del buffertar är inte knutna
|
den fil som innehållet kommer från. Vilken text du än ser i ett
|
||||||
till någon fil, till exempel bufferten "*Buffer List*". Det är den
|
Emacs-fönster så tillhör den alltid en buffert.
|
||||||
buffert som innehåller buffertlistan som skapades med C-x C-b. Vilken
|
|
||||||
text du än ser i ett Emacs-fönster så tillhör den alltid en buffert.
|
|
||||||
|
|
||||||
>> Skriv C-x 1 för att bli kvitt buffertlistan.
|
>> Skriv C-x 1 för att bli kvitt buffertlistan.
|
||||||
|
|
||||||
|
När du har flera buffertar så är bara en av dem "gällande" åt gången.
|
||||||
|
Det är den buffert du redigerar. Om du vill redigera en annan buffert
|
||||||
|
så måste du byta till den. Om du vill byta till en buffert som
|
||||||
|
motsvarar en fil kan du göra det genom att besöka den igen med C-x
|
||||||
|
C-f. Det finns dock ett enklare sätt: använd C-x b kommandot. I det
|
||||||
|
kommandot anger du buffertens namn.
|
||||||
|
|
||||||
|
>> Skriv C-x b foo <Return> för att gå tillbaka till bufferten "foo"
|
||||||
|
som innehåller texten i filen "foo". Skriv sedan C-x b TUTORIAL.sv
|
||||||
|
<Return> för att komma tillbaka till den här handledningen.
|
||||||
|
|
||||||
|
Mestadels är buffertens namn densamma som filens namn (utan
|
||||||
|
katalogdel.) Det är dock inte alltid så. Bufferlistan du skapar med
|
||||||
|
C-x C-b visar alltid namnen på varje buffert.
|
||||||
|
|
||||||
|
All text du ser i ett Emacsfönster är alltid del av någon buffert. En
|
||||||
|
del buffertar är inte knutna till någon fil, till exempel bufferten
|
||||||
|
"*Buffer List*". Det är den buffert som innehåller buffertlistan som
|
||||||
|
skapades med C-x C-b. Bufferten "*Messages*" motsvarar inte heller
|
||||||
|
någon fil. Den innehåller de meddelanden som visas på den nedersta
|
||||||
|
raden i Emacs sessionen.
|
||||||
|
|
||||||
|
>> Skriv C-x b *Messages* <Return> för att se meddelandebufferten.
|
||||||
|
Skriv sedan C-x b TUTORIAL.sv <Return> för att återgå till den här
|
||||||
|
handledningen.
|
||||||
|
|
||||||
Om du ändrar texten till en fil och sedan öppnar en ny fil, så kommer
|
Om du ändrar texten till en fil och sedan öppnar en ny fil, så kommer
|
||||||
inte den första filen sparas. Förändringen ligger kvar i
|
inte den första filen sparas. Förändringen ligger kvar i
|
||||||
bufferten. Skapande och redigering av den nya filen påverkar inte den
|
bufferten. Skapande och redigering av den nya filen påverkar inte den
|
||||||
|
|
@ -602,7 +634,7 @@ vill spara eller ej.
|
||||||
|
|
||||||
>> Sätt in en rad med text och spara med C-x s
|
>> Sätt in en rad med text och spara med C-x s
|
||||||
Du skall nu få frågan om du önskar spara bufferten
|
Du skall nu få frågan om du önskar spara bufferten
|
||||||
TUTORIAL.se. Svara ja på frågan genom att trycka "y" (yes).
|
TUTORIAL.sv. Svara ja på frågan genom att trycka "y" (yes).
|
||||||
|
|
||||||
|
|
||||||
* UTVIDGNING AV KOMMANDOMÄNGDEN
|
* UTVIDGNING AV KOMMANDOMÄNGDEN
|
||||||
|
|
@ -617,9 +649,9 @@ META-tangenter. F
|
||||||
kommandonamn.
|
kommandonamn.
|
||||||
|
|
||||||
Detta är kommandon som är bra att ha men används mer sällan än de
|
Detta är kommandon som är bra att ha men används mer sällan än de
|
||||||
kommandon du redan har lärt dig. Du har redan sett två av dem, C-x C-f
|
kommandon du redan har lärt dig. Du har redan sett några av dem, C-x
|
||||||
för finn, och C-x C-s för spara. Ett annat exempel är kommandot för
|
C-f för finn, och C-x C-s för spara. Ett annat exempel är kommandot
|
||||||
att avsluta Emacs som är C-x C-c. Var inte rädd för att förlora
|
för att avsluta Emacs som är C-x C-c. Var inte rädd för att förlora
|
||||||
förändringar du har gjort. C-x C-c erbjuder dig att spara förändringar
|
förändringar du har gjort. C-x C-c erbjuder dig att spara förändringar
|
||||||
innan Emacs avslutas.
|
innan Emacs avslutas.
|
||||||
|
|
||||||
|
|
@ -645,12 +677,14 @@ ist
|
||||||
Det finns många C-x kommandon. Här är en lista över de du har lärt dig
|
Det finns många C-x kommandon. Här är en lista över de du har lärt dig
|
||||||
hittills:
|
hittills:
|
||||||
|
|
||||||
C-x C-f Finn fil.
|
C-x C-f Finn fil
|
||||||
C-x C-s Spara fil.
|
C-x C-s Spara fil
|
||||||
C-x C-b Lista buffertar.
|
C-x s Spara några buffertar
|
||||||
C-x C-c Avsluta Emacs.
|
C-x C-b Lista buffertar
|
||||||
C-x 1 Ta bort alla utom ett fönster.
|
C-x b Byt buffert
|
||||||
C-x u Ångra.
|
C-x C-c Avsluta Emacs
|
||||||
|
C-x 1 Ta bort alla utom ett fönster
|
||||||
|
C-x u Ångra
|
||||||
|
|
||||||
Namngivna utvidgade kommandon är kommandon som används mycket sällan
|
Namngivna utvidgade kommandon är kommandon som används mycket sällan
|
||||||
eller bara i vissa lägen. Ett exempel på ett sådant kommando är
|
eller bara i vissa lägen. Ett exempel på ett sådant kommando är
|
||||||
|
|
@ -707,16 +741,16 @@ sk
|
||||||
Raden precis över ekoområdet kallas "lägesrad" (mode line). Den ser
|
Raden precis över ekoområdet kallas "lägesrad" (mode line). Den ser
|
||||||
ungefär ut så här:
|
ungefär ut så här:
|
||||||
|
|
||||||
--:** TUTORIAL (Fundamental)--L670--58%----------------
|
--:** TUTORIAL 63% L749 (Fundamental)-----------------------
|
||||||
|
|
||||||
Raden innehåller information om Emacs och texten du redigerar.
|
Raden innehåller information om Emacs och texten du redigerar.
|
||||||
|
|
||||||
Du vet redan vad filnamnet betyder, det är den fil du har funnit.
|
Du vet redan vad filnamnet betyder, det är den fil du har funnit. NN%
|
||||||
-NN%-- visar den aktuella positionen i texten, dvs. NN procent av
|
visar den aktuella positionen i texten, dvs. NN procent av texten
|
||||||
texten befinner sig över toppen av skärmbilden. Om toppen av filen är
|
befinner sig över toppen av skärmbilden. Om toppen av filen är i
|
||||||
i skärmbilden kommer det stå --Top-- istället för --00%-- och om
|
skärmbilden kommer det stå "Top" istället för " 0%" och om slutet av
|
||||||
slutet av filen är i skärmbilden kommer det stå --Bot--. Om du ser på
|
filen är i skärmbilden kommer det stå "Bot". Om du ser på en fil där
|
||||||
en fil där hela texten passar in på en sida kommer det stå --All--.
|
hela texten passar in på en sida kommer det stå "All".
|
||||||
|
|
||||||
Bokstaven L följd av siffror anger positionen på ett annat
|
Bokstaven L följd av siffror anger positionen på ett annat
|
||||||
sätt. Siffrorna visar vilken rad som markören befinner sig på.
|
sätt. Siffrorna visar vilken rad som markören befinner sig på.
|
||||||
|
|
@ -830,7 +864,7 @@ efter. <Return> avslutar s
|
||||||
har du sökt efter ordet "markör" en gång.
|
har du sökt efter ordet "markör" en gång.
|
||||||
>> Skriv C-s en gång till för att söka efter nästa förekomst av ordet
|
>> Skriv C-s en gång till för att söka efter nästa förekomst av ordet
|
||||||
"markör".
|
"markör".
|
||||||
>> Tryck nu på <Delete> fyra gånger och se hur markören flyttar sig
|
>> Tryck nu på <Delback> fyra gånger och se hur markören flyttar sig
|
||||||
>> Tryck <Return> för att avsluta sökandet.
|
>> Tryck <Return> för att avsluta sökandet.
|
||||||
|
|
||||||
Såg du vad som hände? Under inkrementell sökning försöker Emacs att gå
|
Såg du vad som hände? Under inkrementell sökning försöker Emacs att gå
|
||||||
|
|
@ -846,12 +880,12 @@ den vidare till Emacs. F
|
||||||
fall avsnittet "Spontaneous Entry to Incremental Search" i
|
fall avsnittet "Spontaneous Entry to Incremental Search" i
|
||||||
Emacs-manualen för råd om hur detta kan undvikas.
|
Emacs-manualen för råd om hur detta kan undvikas.
|
||||||
|
|
||||||
Om du är inne i en inkrementell sökning och trycker <Delete> kommer du
|
Om du är inne i en inkrementell sökning och trycker <Delback> kommer
|
||||||
lägga märke till att den sista bokstaven i söksträngen blir raderad
|
du lägga märke till att den sista bokstaven i söksträngen blir raderad
|
||||||
och sökandet hoppar tillbaka till en tidigare förekomst. Om du till
|
och sökandet hoppar tillbaka till en tidigare förekomst. Om du till
|
||||||
exempel skriver "m" för att söka efter den första förekomsten av "m",
|
exempel skriver "m" för att söka efter den första förekomsten av "m",
|
||||||
och sedan trycker "a" så kommer markören flytta sig till första
|
och sedan trycker "a" så kommer markören flytta sig till första
|
||||||
förekomsten av "ma". Tryck nu <Delete>. Detta avlägsnar "a" från
|
förekomsten av "ma". Tryck nu <Delback>. Detta avlägsnar "a" från
|
||||||
söksträngen, och markören flyttar sig tillbaka till den första
|
söksträngen, och markören flyttar sig tillbaka till den första
|
||||||
förekomsten av "m".
|
förekomsten av "m".
|
||||||
|
|
||||||
|
|
@ -879,7 +913,7 @@ sk
|
||||||
det övre fönstret.
|
det övre fönstret.
|
||||||
|
|
||||||
>> Skriv C-M-v för att rulla det nedre fönstret.
|
>> Skriv C-M-v för att rulla det nedre fönstret.
|
||||||
(Om du inte har META-tangenten trycker du ESC C-v.)
|
(Om du inte har META-tangenten trycker du <ESC> C-v.)
|
||||||
|
|
||||||
>> Skriv C-x o (o för other) för att flytta markören till det
|
>> Skriv C-x o (o för other) för att flytta markören till det
|
||||||
nedre fönstret.
|
nedre fönstret.
|
||||||
|
|
@ -909,10 +943,10 @@ som du trycker v. Det har ingen betydelse vilken av tangenterna
|
||||||
KONTROLL och META som trycks först, för bägge fungerar så att de
|
KONTROLL och META som trycks först, för bägge fungerar så att de
|
||||||
"modifierar" de andra tangenterna du trycker.
|
"modifierar" de andra tangenterna du trycker.
|
||||||
|
|
||||||
Om du inte har META-tangenten och använder ESC istället är
|
Om du inte har META-tangenten och använder <ESC> istället är
|
||||||
ordningsföljden viktig. Du måste trycka ESC följt av KONTROLL-v,
|
ordningsföljden viktig. Du måste trycka <ESC> följt av KONTROLL-v,
|
||||||
KONTROLL-ESC v fungerar inte. Det är för att ESC är ett tecken i sig
|
KONTROLL-<ESC> v fungerar inte. Det är för att <ESC> är ett tecken i
|
||||||
och inte en äkta "modifierare".
|
sig och inte en äkta "modifierare".
|
||||||
|
|
||||||
>> Skriv C-x 1 i det övre fönstret för att bli kvitt det nedre
|
>> Skriv C-x 1 i det övre fönstret för att bli kvitt det nedre
|
||||||
fönstret.
|
fönstret.
|
||||||
|
|
@ -945,12 +979,12 @@ Ibland kan du hamna i n
|
||||||
huvudläget i lägesraden. Till exempel kan det stå [(Fundamental)]
|
huvudläget i lägesraden. Till exempel kan det stå [(Fundamental)]
|
||||||
istället för (Fundamental).
|
istället för (Fundamental).
|
||||||
|
|
||||||
För att komma ur rekursiv redigering trycker du ESC ESC ESC. Detta är
|
För att komma ur rekursiv redigering trycker du <ESC> <ESC> <ESC>.
|
||||||
ett generellt brytkommando. Du kan också använda det för att bli kvitt
|
Detta är ett generellt brytkommando. Du kan också använda det för att
|
||||||
extra fönster och för att komma ut ur minibufferten.
|
bli kvitt extra fönster och för att komma ut ur minibufferten.
|
||||||
|
|
||||||
>> Skriv M-x för att komma in i minibufferten. Skriv så ESC ESC ESC
|
>> Skriv M-x för att komma in i minibufferten. Skriv så <ESC> <ESC>
|
||||||
för att komma ut.
|
<ESC> för att komma ut.
|
||||||
|
|
||||||
Du kan inte använda C-g för att komma ut ur rekursiv redigering.
|
Du kan inte använda C-g för att komma ut ur rekursiv redigering.
|
||||||
Detta är för att C-g används för att avbryta kommandon och argument
|
Detta är för att C-g används för att avbryta kommandon och argument
|
||||||
|
|
@ -984,7 +1018,8 @@ Den mest grundl
|
||||||
och en knappsekvens. Emacs ger då en beskrivning av kommandot.
|
och en knappsekvens. Emacs ger då en beskrivning av kommandot.
|
||||||
|
|
||||||
>> Skriv C-h c C-p.
|
>> Skriv C-h c C-p.
|
||||||
Meddelandet skall då bli något i stil med
|
|
||||||
|
Meddelandet skall då bli något i stil med:
|
||||||
|
|
||||||
C-p runs the command previous-line
|
C-p runs the command previous-line
|
||||||
|
|
||||||
|
|
@ -1060,6 +1095,29 @@ oklart duger det inte att sitta och tycka synd om sig sj
|
||||||
ett mail och klaga!
|
ett mail och klaga!
|
||||||
|
|
||||||
|
|
||||||
|
* MER FUNKTIONER
|
||||||
|
----------------
|
||||||
|
|
||||||
|
Du kan lära dig mer om Emacs genom att läsa dess manual, antingen i
|
||||||
|
bokform eller on-line i Info (använd Hjälp-menyn eller skriv F10 h r).
|
||||||
|
Två finesser som du kan komma att gilla speciellt är komplettering
|
||||||
|
(completion), som spar tangenttryckningar, och dired, som förenklar
|
||||||
|
filhantering.
|
||||||
|
|
||||||
|
Komplettering är ett sätt att undvika onödiga tangenttryckningar. Till
|
||||||
|
exempel, om du vill byta till *Messages* bufferten, kan du du skriva
|
||||||
|
C-x b *M<Tab> och Emacs kommer fylla i resten av buffertnamnet så
|
||||||
|
långt den kan räkna ut det från det du redan skrivit. Komplettering
|
||||||
|
finns beskrivet i Emacs-manualen i noden "Completion".
|
||||||
|
|
||||||
|
Dired gör det möjligt att lista filer i en katalog (och även dess
|
||||||
|
subkataloger), flytta runt i listan, besöka, byta namn, ta bort och
|
||||||
|
operera på olika sätt på filerna. Dired finns beskrivet i Info i
|
||||||
|
Emacs-manualen i noden "Dired".
|
||||||
|
|
||||||
|
Manualen beskriver även många andra Emacs funktioner.
|
||||||
|
|
||||||
|
|
||||||
* KOPIERING
|
* KOPIERING
|
||||||
-----------
|
-----------
|
||||||
|
|
||||||
|
|
@ -1070,7 +1128,7 @@ Lidell
|
||||||
This version of the tutorial, like GNU Emacs, is copyrighted, and
|
This version of the tutorial, like GNU Emacs, is copyrighted, and
|
||||||
comes with permission to distribute copies on certain conditions:
|
comes with permission to distribute copies on certain conditions:
|
||||||
|
|
||||||
Copyright (c) 1985, 1996 Free Software Foundation
|
Copyright (c) 1985, 1996, 1998, 2001, 2002, 2005 Free Software Foundation
|
||||||
|
|
||||||
Permission is granted to anyone to make or distribute verbatim copies
|
Permission is granted to anyone to make or distribute verbatim copies
|
||||||
of this document as received, in any medium, provided that the
|
of this document as received, in any medium, provided that the
|
||||||
|
|
|
||||||
|
|
@ -1,28 +1,89 @@
|
||||||
This file contains the list of translators of the tutorial.
|
This file contains the list of translators and maintainers of the
|
||||||
|
tutorial.
|
||||||
|
|
||||||
|
* TUTORIAL.bg:
|
||||||
|
Author: Ognyan Kulev <ogi@fmi.uni-sofia.bg>
|
||||||
|
Maintainer: Ognyan Kulev <ogi@fmi.uni-sofia.bg>
|
||||||
|
|
||||||
|
* TUTORIAL.cn:
|
||||||
|
Author: Chao-Hong Liu <chliu@gnu.org>
|
||||||
|
Maintainer: Chao-Hong Liu <chliu@gnu.org>
|
||||||
|
|
||||||
|
* TUTORIAL.cs:
|
||||||
|
Author: Milan Zamazal <pdm@zamazal.org>
|
||||||
|
Pavel Janík <Pavel@Janik.cz>
|
||||||
|
Maintainer: Milan Zamazal <pdm@zamazal.org>
|
||||||
|
Pavel Janík <Pavel@Janik.cz>
|
||||||
|
|
||||||
|
* TUTORIAL.de:
|
||||||
|
Author: Werner Lemberg <wl@gnu.org>
|
||||||
|
Maintainer: Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
|
* TUTORIAL.es:
|
||||||
|
Author: Rafael Sepúlveda <drs@gnulinux.org.mx>
|
||||||
|
Maintainer: Rafael Sepúlveda <drs@gnulinux.org.mx>
|
||||||
|
|
||||||
|
* TUTORIAL.fr:
|
||||||
|
Author: Éric Jacoboni <jaco@teaser.fr>
|
||||||
|
Maintainer: Éric Jacoboni <jaco@teaser.fr>
|
||||||
|
|
||||||
|
* TUTORIAL.it:
|
||||||
|
Author: Alfredo Finelli <alfredofnl@tiscali.it>
|
||||||
|
Italian GNU Translation Group <tp@lists.linux.it>
|
||||||
|
Maintainer: Alfredo Finelli <alfredofnl@tiscali.it>
|
||||||
|
Italian GNU Translation Group <tp@lists.linux.it>
|
||||||
|
|
||||||
|
* TUTORIAL.ja:
|
||||||
|
Author: Kenichi Handa <handa@m17n.org>
|
||||||
|
Maintainer: Kenichi Handa <handa@m17n.org>
|
||||||
|
|
||||||
|
* TUTORIAL.ko:
|
||||||
|
Author: Koaunghi Un <koaunghi@ling.cnu.ac.kr>
|
||||||
|
Maintainer: Maintainer needed.
|
||||||
|
|
||||||
|
* TUTORIAL.nl:
|
||||||
|
Author: Pieter Schoenmakers <tiggr@tiggr.net>
|
||||||
|
Maintainer: Pieter Schoenmakers <tiggr@tiggr.net>
|
||||||
|
|
||||||
|
* TUTORIAL.pl:
|
||||||
|
Author: Beatę Wierzchołowską <beataw@orient.uw.edu.pl>
|
||||||
|
Janusz S. Bien <jsbien@mail.uw.edu.pl>
|
||||||
|
Maintainer: Beatę Wierzchołowską <beataw@orient.uw.edu.pl>
|
||||||
|
Janusz S. Bien <jsbien@mail.uw.edu.pl>
|
||||||
|
|
||||||
|
* TUTORIAL.pt_BR:
|
||||||
|
Author: Marcelo Toledo <marcelo@marcelotoledo.org>
|
||||||
|
Maintainer: Marcelo Toledo <marcelo@marcelotoledo.org>
|
||||||
|
|
||||||
|
* TUTORIAL.ro:
|
||||||
|
Author: Tudor Hulubei <tudor@gnu.org>
|
||||||
|
Maintainer: Maintainer needed.
|
||||||
|
|
||||||
|
* TUTORIAL.ru:
|
||||||
|
Author: Alex Ott <ottalex@narod.ru>
|
||||||
|
Maintainer: Alex Ott <ottalex@narod.ru>
|
||||||
|
|
||||||
|
* TUTORIAL.sk:
|
||||||
|
Author: Miroslav Vaško <vasko@debian.cz>
|
||||||
|
Pavel Janík <Pavel@Janik.cz>
|
||||||
|
Maintainer: Pavel Janík <Pavel@Janik.cz>
|
||||||
|
|
||||||
|
* TUTORIAL.sl:
|
||||||
|
Author: Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>
|
||||||
|
Maintainer: Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>
|
||||||
|
|
||||||
|
* TUTORIAL.sv:
|
||||||
|
Author: Mats Lidell <matsl@contactor.se>
|
||||||
|
Maintainer: Mats Lidell <matsl@contactor.se>
|
||||||
|
|
||||||
|
* TUTORIAL.th:
|
||||||
|
Author: Virach Sornlertlamvanich <virach@nectec.or.th>
|
||||||
|
Maintainer: Virach Sornlertlamvanich <virach@nectec.or.th>
|
||||||
|
|
||||||
|
* TUTORIAL.zh:
|
||||||
|
Author: Chao-Hong Liu <chliu@gnu.org>
|
||||||
|
Maintainer: Chao-Hong Liu <chliu@gnu.org>
|
||||||
|
|
||||||
TUTORIAL.bg: Ognyan Kulev <ogi@fmi.uni-sofia.bg>
|
|
||||||
TUTORIAL.cn: Chao-Hong Liu <chliu@gnu.org>
|
|
||||||
TUTORIAL.cs: Milan Zamazal <pdm@zamazal.org>
|
|
||||||
Pavel Janík <Pavel@Janik.cz>
|
|
||||||
TUTORIAL.de: Werner Lemberg <wl@gnu.org>
|
|
||||||
TUTORIAL.es: Rafael Sepúlveda <drs@gnulinux.org.mx>
|
|
||||||
TUTORIAL.fr: Éric Jacoboni <jaco@teaser.fr>
|
|
||||||
TUTORIAL.it: Alfredo Finelli <alfredofnl@tiscali.it>
|
|
||||||
Italian GNU Translation Group <tp@lists.linux.it>
|
|
||||||
TUTORIAL.ja: Kenichi Handa <handa@m17n.org>
|
|
||||||
TUTORIAL.ko: Koaunghi Un <koaunghi@ling.cnu.ac.kr>
|
|
||||||
TUTORIAL.nl: Pieter Schoenmakers <tiggr@tiggr.net>
|
|
||||||
TUTORIAL.pl: Beatę Wierzchołowską <beataw@orient.uw.edu.pl>
|
|
||||||
Janusz S. Bien <jsbien@mail.uw.edu.pl>
|
|
||||||
TUTORIAL.pt_BR: Marcelo Toledo <marcelo@marcelotoledo.org>
|
|
||||||
TUTORIAL.ro: Tudor Hulubei <tudor@gnu.org>
|
|
||||||
TUTORIAL.ru: Alex Ott <ottalex@narod.ru>
|
|
||||||
TUTORIAL.sk: Miroslav Vaško <vasko@debian.cz>
|
|
||||||
Pavel Janík <Pavel@Janik.cz>
|
|
||||||
TUTORIAL.sl: Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>
|
|
||||||
TUTORIAL.sv: Mats Lidell <matsl@contactor.se>
|
|
||||||
TUTORIAL.th: Virach Sornlertlamvanich <virach@nectec.or.th>
|
|
||||||
TUTORIAL.zh: Chao-Hong Liu <chliu@gnu.org>
|
|
||||||
|
|
||||||
;;; Local Variables:
|
;;; Local Variables:
|
||||||
;;; coding: utf-8
|
;;; coding: utf-8
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,8 @@
|
||||||
|
2005-04-06 Kenichi Handa <handa@m17n.org>
|
||||||
|
|
||||||
|
* quail/sgml-input.el ("sgml"): Enable quail-completion by typing
|
||||||
|
TAB.
|
||||||
|
|
||||||
2005-03-26 Kenichi Handa <handa@m17n.org>
|
2005-03-26 Kenichi Handa <handa@m17n.org>
|
||||||
|
|
||||||
* quail/latin-ltx.el ("TeX"): Enable quail-completion by typing
|
* quail/latin-ltx.el ("TeX"): Enable quail-completion by typing
|
||||||
|
|
|
||||||
|
|
@ -40,7 +40,8 @@ ISOgrk2, ISOgrk3, ISOgrk4, ISOlat1, ISOlat2, ISOnum, ISOpub, ISOtech,
|
||||||
HTMLspecial and HTMLsymbol.
|
HTMLspecial and HTMLsymbol.
|
||||||
|
|
||||||
E.g.: á -> á"
|
E.g.: á -> á"
|
||||||
nil t nil nil nil nil nil nil nil nil t)
|
'(("\t" . quail-completion))
|
||||||
|
t nil nil nil nil nil nil nil nil t)
|
||||||
|
|
||||||
(quail-define-rules
|
(quail-define-rules
|
||||||
("&Aacgr;" ?\Ά) ;; GREEK CAPITAL LETTER ALPHA WITH TONOS
|
("&Aacgr;" ?\Ά) ;; GREEK CAPITAL LETTER ALPHA WITH TONOS
|
||||||
|
|
|
||||||
331
lisp/ChangeLog
331
lisp/ChangeLog
|
|
@ -1,3 +1,323 @@
|
||||||
|
2005-04-09 Kenichi Handa <handa@m17n.org>
|
||||||
|
|
||||||
|
* international/code-pages.el (iso-latin-7): Fix the map.
|
||||||
|
|
||||||
|
2005-04-08 Luc Teirlinck <teirllm@auburn.edu>
|
||||||
|
|
||||||
|
* emacs-lisp/lisp.el (defun-prompt-regexp)
|
||||||
|
(parens-require-spaces, buffer-end, end-of-defun)
|
||||||
|
(insert-parentheses): Doc fixes.
|
||||||
|
|
||||||
|
2005-04-08 Kim F. Storm <storm@cua.dk>
|
||||||
|
|
||||||
|
* comint.el (comint-highlight-prompt): Fix face spec.
|
||||||
|
* hi-lock.el (hi-green): Likewise.
|
||||||
|
|
||||||
|
2005-04-08 Dan Nicolaescu <dann@ics.uci.edu>
|
||||||
|
|
||||||
|
* cus-edit.el (custom-modified-face):
|
||||||
|
* comint.el (comint-highlight-input): Fix previous changes.
|
||||||
|
* term.el (term-handle-ansi-escape): Add a comment.
|
||||||
|
|
||||||
|
2005-04-08 Stefan Monnier <monnier@iro.umontreal.ca>
|
||||||
|
|
||||||
|
* whitespace.el (whitespace-highlight-the-space): Put the same overlay
|
||||||
|
in the buffer and in whitespace-highlighted-space.
|
||||||
|
(whitespace-unhighlight-the-space): Simplify.
|
||||||
|
(whitespace-buffer): Simplify.
|
||||||
|
|
||||||
|
2005-04-08 Dan Nicolaescu <dann@ics.uci.edu>
|
||||||
|
|
||||||
|
* 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 Lute Kamstra <lute@gnu.org>
|
||||||
|
|
||||||
|
* font-lock.el (font-lock-keywords): Docstring fixes.
|
||||||
|
|
||||||
|
2005-04-08 Kenichi Handa <handa@m17n.org>
|
||||||
|
|
||||||
|
* ps-mule.el (ps-mule-show-warning): If the number of unprintable
|
||||||
|
chars are more than a limit, print " and more..." at the tail.
|
||||||
|
|
||||||
|
2005-04-08 Kim F. Storm <storm@cua.dk>
|
||||||
|
|
||||||
|
* emacs-lisp/authors.el (authors-aliases): Update list.
|
||||||
|
(authors-ignored-files): New list.
|
||||||
|
(authors-fixed-entries): Fix typo.
|
||||||
|
(authors-renamed-files-alist): Update list.
|
||||||
|
(authors-add): Check authors-ignored-files.
|
||||||
|
|
||||||
|
2005-04-08 Carsten Dominik <dominik@science.uva.nl>
|
||||||
|
|
||||||
|
* calendar/diary-lib.el (add-to-diary-list): MARKER argument made
|
||||||
|
optional, to ensure backward compatibility.
|
||||||
|
|
||||||
|
2005-04-08 Stephen Eglen <stephen@gnu.org>
|
||||||
|
|
||||||
|
* textmodes/flyspell.el (flyspell-large-region): Doc fix.
|
||||||
|
|
||||||
|
2005-04-08 Kim F. Storm <storm@cua.dk>
|
||||||
|
|
||||||
|
* buff-menu.el (Buffer-menu-mode-map): Map follow-link to
|
||||||
|
mouse-face.
|
||||||
|
|
||||||
|
* mouse.el (mouse-on-link-p): Doc fix.
|
||||||
|
|
||||||
|
2005-04-07 Luc Teirlinck <teirllm@auburn.edu>
|
||||||
|
|
||||||
|
* ielm.el (ielm-prompt-read-only): Doc fix.
|
||||||
|
|
||||||
|
* comint.el (comint-prompt-read-only): Doc fix.
|
||||||
|
|
||||||
|
2005-04-07 Benjamin Rutt <brutt@bloomington.in.us>
|
||||||
|
|
||||||
|
* ffap.el (ffap-pass-wildcards-to-dired): New user option to
|
||||||
|
ensure dired always handles wildcards passed to ffap.
|
||||||
|
(find-file-at-point): Use it.
|
||||||
|
(ffap-dired-wildcards): Doc fix.
|
||||||
|
|
||||||
|
2005-04-07 Juri Linkov <juri@jurta.org>
|
||||||
|
|
||||||
|
* simple.el (next-error-overlay-arrow-position): New defvar.
|
||||||
|
Put "=>" on its property `overlay-arrow-string'. Add it to
|
||||||
|
`overlay-arrow-variable-list'.
|
||||||
|
|
||||||
|
* progmodes/compile.el (compilation-setup):
|
||||||
|
Set `next-error-overlay-arrow-position' to nil. Also set it to
|
||||||
|
nil in the local hook `kill-buffer-hook'. Make local variable
|
||||||
|
`overlay-arrow-string' and set it to "=>".
|
||||||
|
(compilation-goto-locus): Set BOL position to
|
||||||
|
`next-error-overlay-arrow-position' instead of
|
||||||
|
`overlay-arrow-position'.
|
||||||
|
|
||||||
|
* info.el (Info-mode): Add `Info-kill-buffer' to `kill-buffer-hook'
|
||||||
|
locally instead of adding it to the global hook.
|
||||||
|
(Info-kill-buffer): Move up.
|
||||||
|
|
||||||
|
2005-04-06 Dan Nicolaescu <dann@ics.uci.edu>
|
||||||
|
|
||||||
|
* term/xterm.el (xterm-standard-colors): Update color values from
|
||||||
|
xterm-200.
|
||||||
|
|
||||||
|
2005-04-06 Stefan Monnier <monnier@iro.umontreal.ca>
|
||||||
|
|
||||||
|
* textmodes/tex-mode.el (tex-font-lock-keywords-2): Add \bfseries.
|
||||||
|
|
||||||
|
* fast-lock.el:
|
||||||
|
* lazy-lock.el: Move them to the obsolete subdir.
|
||||||
|
|
||||||
|
2005-04-06 JUAN-LEON Lahoz Garcia <juanleon1@gmail.com>
|
||||||
|
|
||||||
|
* wdired.el (wdired-advise-functions, wdired-add-skip-in-replace)
|
||||||
|
(wdired-add-replace-advice): Remove.
|
||||||
|
(wdired-change-to-wdired-mode): Use query-replace-skip-read-only.
|
||||||
|
|
||||||
|
2005-04-06 Kim F. Storm <storm@cua.dk>
|
||||||
|
|
||||||
|
* startup.el (command-line): Add --bare-bones alias for -Q.
|
||||||
|
|
||||||
|
2005-04-06 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
|
||||||
|
|
||||||
|
* term/mac-win.el: Use create-fontset-from-mac-roman-font to
|
||||||
|
create the startup fontset if a font specification ends with
|
||||||
|
`mac-roman'.
|
||||||
|
|
||||||
|
2005-04-06 Lute Kamstra <lute@gnu.org>
|
||||||
|
|
||||||
|
* add-log.el (change-log-font-lock-keywords): Complete 2005-04-03
|
||||||
|
change.
|
||||||
|
|
||||||
|
* emacs-lisp/copyright.el (copyright-update-year): Replace the
|
||||||
|
right subexpression. Suggested by Jay Bingham <jay.bingham@hp.com>.
|
||||||
|
|
||||||
|
2005-04-05 Lute Kamstra <lute@gnu.org>
|
||||||
|
|
||||||
|
* generic.el (generic-mode-internal): Fix 2005-03-31 change.
|
||||||
|
(define-generic-mode): Ditto. Fix debug declaration.
|
||||||
|
|
||||||
|
* generic-x.el (show-tabs-tab-face, show-tabs-space-face):
|
||||||
|
Put them in the generic-x group.
|
||||||
|
|
||||||
|
* calendar/timeclock.el (timeclock): Doc fix.
|
||||||
|
|
||||||
|
* generic.el (define-generic-mode): Don't use custom-current-group.
|
||||||
|
Document default :group value.
|
||||||
|
* emacs-lisp/easy-mmode.el (define-minor-mode): Ditto.
|
||||||
|
(define-global-minor-mode): Don't use custom-current-group.
|
||||||
|
|
||||||
|
2005-04-05 Glenn Morris <gmorris@ast.cam.ac.uk>
|
||||||
|
|
||||||
|
* startup.el (command-line-1): Display startup-echo-area-message
|
||||||
|
when fancy splash screen is in use.
|
||||||
|
|
||||||
|
* progmodes/sh-script.el (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.
|
||||||
|
|
||||||
|
* progmodes/tcl.el (tcl-escaped-newline): New face.
|
||||||
|
(tcl-builtin-list): New variable.
|
||||||
|
(tcl-set-font-lock-keywords): Add builtins, variables, and escaped
|
||||||
|
newlines. Fix keywords subexpression number.
|
||||||
|
|
||||||
|
2005-04-05 Carsten Dominik <dominik@science.uva.nl>
|
||||||
|
|
||||||
|
* textmodes/org.el (org-diary-default-entry): Fix call to
|
||||||
|
`add-to-diary-entry'.
|
||||||
|
|
||||||
|
2005-04-05 Kim F. Storm <storm@cua.dk>
|
||||||
|
|
||||||
|
* ediff-init.el: Use (featurep 'xemacs).
|
||||||
|
|
||||||
|
2005-04-05 David Ponce <david@dponce.com>
|
||||||
|
|
||||||
|
* cus-edit.el (face): Derive from symbol widget. Display sample
|
||||||
|
of the current face on the fly.
|
||||||
|
(widget-face-sample-face-get, widget-face-notify): New functions.
|
||||||
|
(widget-face-value-create): Remove.
|
||||||
|
|
||||||
|
* wid-edit.el (widget-field-end): Temporarily remove field
|
||||||
|
narrowing before to call `get-char-property'.
|
||||||
|
|
||||||
|
2005-04-04 Jay Belanger <belanger@truman.edu>
|
||||||
|
|
||||||
|
* calc/calc-aent.el (math-read-replacement-list): Add subscripts.
|
||||||
|
(math-read-subscripts): New variable.
|
||||||
|
(math-read-preprocess-string): Process subscripts.
|
||||||
|
|
||||||
|
2005-04-04 Luc Teirlinck <teirllm@auburn.edu>
|
||||||
|
|
||||||
|
* comint.el (comint-prompt-read-only): Doc fix.
|
||||||
|
|
||||||
|
* dired.el (dired-copy-filename-as-kill): Make `-' arg behave like
|
||||||
|
`-1'. Doc fix.
|
||||||
|
|
||||||
|
2005-04-04 Carsten Dominik <dominik@science.uva.nl>
|
||||||
|
|
||||||
|
* textmodes/org.el (org-insert-mode-line-in-empty-file):
|
||||||
|
Change default value to nil.
|
||||||
|
|
||||||
|
2005-04-04 Lute Kamstra <lute@gnu.org>
|
||||||
|
|
||||||
|
* autorevert.el (auto-revert-mode): Specify :group.
|
||||||
|
* battery.el (display-battery-mode): Specify :group.
|
||||||
|
* diff-mode.el (diff-minor-mode): Specify :group.
|
||||||
|
* font-core.el (font-lock-mode): Specify :group.
|
||||||
|
* hl-line.el (hl-line-mode): Specify :group.
|
||||||
|
* iimage.el (iimage): New customization group.
|
||||||
|
(iimage-mode): Specify :group.
|
||||||
|
* longlines.el (longlines-mode): Specify :group.
|
||||||
|
* master.el: Don't require easy-mmode.
|
||||||
|
(master): New customization group.
|
||||||
|
(master-mode): Specify :group.
|
||||||
|
* msb.el (msb-mode): Specify :group.
|
||||||
|
* reveal.el (reveal-mode): Specify :group.
|
||||||
|
* simple.el (next-error-follow-minor-mode): Specify :group.
|
||||||
|
* smerge-mode.el (smerge-mode): Specify :group.
|
||||||
|
* emacs-lisp/eldoc.el (eldoc-mode): Specify :group.
|
||||||
|
* emulation/cua-base.el (cua-mode): Specify :group.
|
||||||
|
* international/encoded-kb.el (encoded-kbd-mode): Specify :group.
|
||||||
|
* language/thai-util.el (thai-auto-composition-mode)
|
||||||
|
(thai-word-mode): Specify :group.
|
||||||
|
* mail/supercite.el (sc-minor-mode): Specify :group.
|
||||||
|
* progmodes/cwarn.el (cwarn-mode): Specify :group.
|
||||||
|
* progmodes/flymake.el (flymake-mode): Specify :group.
|
||||||
|
* progmodes/glasses.el (glasses-mode): Specify :group.
|
||||||
|
* progmodes/hideif.el (hide-ifdef-mode): Specify :group.
|
||||||
|
* textmodes/enriched.el (enriched-mode): Specify :group.
|
||||||
|
* textmodes/refill.el (refill-mode): Specify :group.
|
||||||
|
|
||||||
|
* add-log.el (change-log-font-lock-keywords): Names in
|
||||||
|
parenthesized lists can contain spaces.
|
||||||
|
|
||||||
|
2005-04-04 Thien-Thi Nguyen <ttn@gnu.org>
|
||||||
|
|
||||||
|
* startup.el (fancy-splash-text): Shorten default text of
|
||||||
|
"Emacs Tutorial" line. Also, if the current language env
|
||||||
|
indicates an available tutorial file other than TUTORIAL,
|
||||||
|
extract its title and append it to the line in parentheses.
|
||||||
|
(fancy-splash-insert): If arg is a thunk, funcall it.
|
||||||
|
|
||||||
|
2005-04-04 Jay Belanger <belanger@truman.edu>
|
||||||
|
|
||||||
|
* calc.el (calc-language-alist): Add tags to customization type.
|
||||||
|
|
||||||
|
2005-04-03 Luc Teirlinck <teirllm@auburn.edu>
|
||||||
|
|
||||||
|
* xt-mouse.el (xterm-mouse-mode): Add explicit Custom group, mouse.
|
||||||
|
Doc fix.
|
||||||
|
|
||||||
|
2005-04-03 Marcelo Toledo <marcelo@marcelotoledo.org>
|
||||||
|
|
||||||
|
* add-log.el (change-log-font-lock-keywords): The manual
|
||||||
|
describing a Change Log entry, says: (...) "Aside from these
|
||||||
|
header lines, every line in the change log starts with a space or
|
||||||
|
a tab.". The font-lock was not highlighting lines started with
|
||||||
|
spaces, added support for it.
|
||||||
|
|
||||||
|
2005-04-03 Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
|
||||||
|
|
||||||
|
* textmodes/bibtex.el (bibtex-url): Use format to generate the url.
|
||||||
|
(bibtex-generate-url-list): Update docstring accordingly. Put the
|
||||||
|
complex example in the docstring.
|
||||||
|
(bibtex-font-lock-url): Use pop.
|
||||||
|
|
||||||
|
2005-04-03 Stefan Monnier <monnier@iro.umontreal.ca>
|
||||||
|
|
||||||
|
* progmodes/tcl.el (tcl-set-font-lock-keywords): Use new \_< ops.
|
||||||
|
|
||||||
|
* pcvs.el (cvs-checkout): Prompt for cvsroot as well.
|
||||||
|
|
||||||
|
2005-04-03 Glenn Morris <gmorris@ast.cam.ac.uk>
|
||||||
|
|
||||||
|
* filesets.el (filesets-set-default): Doc fix.
|
||||||
|
|
||||||
|
2005-04-03 Lute Kamstra <lute@gnu.org>
|
||||||
|
|
||||||
|
* generic.el (define-generic-mode): Add argument to specify
|
||||||
|
keywords for defcustom.
|
||||||
|
(default-generic-mode): Specify :group.
|
||||||
|
|
||||||
|
* generic-x.el: Specify :group for all generic modes.
|
||||||
|
|
||||||
|
* desktop.el (desktop-no-desktop-file-hook)
|
||||||
|
(desktop-after-read-hook): Doc fix.
|
||||||
|
|
||||||
2005-04-02 Luc Teirlinck <teirllm@auburn.edu>
|
2005-04-02 Luc Teirlinck <teirllm@auburn.edu>
|
||||||
|
|
||||||
* simple.el (visible-mode): Use explicit :group keyword.
|
* simple.el (visible-mode): Use explicit :group keyword.
|
||||||
|
|
@ -110,12 +430,12 @@
|
||||||
|
|
||||||
2005-03-31 Karl Berry <karl@freefriends.org>
|
2005-03-31 Karl Berry <karl@freefriends.org>
|
||||||
|
|
||||||
* textmodes/tex-mode.el (tex-compile): shell-quote-argument,
|
* textmodes/tex-mode.el (tex-compile): Use shell-quote-argument,
|
||||||
not comint-quote-filename.
|
not comint-quote-filename.
|
||||||
|
|
||||||
2005-03-31 Olive Lin <olive.lin@versateladsl.be> (tiny change)
|
2005-03-31 Olive Lin <olive.lin@versateladsl.be> (tiny change)
|
||||||
|
|
||||||
* textmodes/tex-mode.el (tex-start-tex) shell-quote-argument,
|
* textmodes/tex-mode.el (tex-start-tex) Use shell-quote-argument,
|
||||||
not comint-quote-filename.
|
not comint-quote-filename.
|
||||||
|
|
||||||
2005-03-31 Thien-Thi Nguyen <ttn@gnu.org>
|
2005-03-31 Thien-Thi Nguyen <ttn@gnu.org>
|
||||||
|
|
@ -1526,7 +1846,7 @@
|
||||||
(debug-entry-code): New const.
|
(debug-entry-code): New const.
|
||||||
(debug-on-entry-1): Use it.
|
(debug-on-entry-1): Use it.
|
||||||
|
|
||||||
2005-02-28 Chong Yidong" <cyd@stupidchicken.com> (tiny change)
|
2005-02-28 Chong Yidong <cyd@stupidchicken.com>
|
||||||
|
|
||||||
* international/utf-16.el (ccl-encode-mule-utf-16le):
|
* international/utf-16.el (ccl-encode-mule-utf-16le):
|
||||||
Fix BUFFER_MAGNIFICATION to 2.
|
Fix BUFFER_MAGNIFICATION to 2.
|
||||||
|
|
@ -2688,7 +3008,7 @@
|
||||||
* simple.el (eval-expression-print-format): Avoid warning
|
* simple.el (eval-expression-print-format): Avoid warning
|
||||||
about edebug-active.
|
about edebug-active.
|
||||||
|
|
||||||
2005-01-15 "James R. Van Zandt" <jrvz@comcast.net> (Tiny change)
|
2005-01-15 James R. Van Zandt <jrvz@comcast.net> (Tiny change)
|
||||||
|
|
||||||
* progmodes/sh-script.el: Code copied from make-mode.el
|
* progmodes/sh-script.el: Code copied from make-mode.el
|
||||||
with small changes,
|
with small changes,
|
||||||
|
|
@ -7405,8 +7725,7 @@
|
||||||
|
|
||||||
2004-09-21 Kenichi Handa <handa@m17n.org>
|
2004-09-21 Kenichi Handa <handa@m17n.org>
|
||||||
|
|
||||||
* descr-text.el (describe-char): Checking of quail activation
|
* descr-text.el (describe-char): Checking of quail activation fixed.
|
||||||
fixed.
|
|
||||||
|
|
||||||
2004-09-21 Jay Belanger <belanger@truman.edu>
|
2004-09-21 Jay Belanger <belanger@truman.edu>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1063,7 +1063,7 @@
|
||||||
* vc-hooks.el (vc-status): If vc-locking-user returns a number,
|
* vc-hooks.el (vc-status): If vc-locking-user returns a number,
|
||||||
compare it to (user-uid).
|
compare it to (user-uid).
|
||||||
|
|
||||||
1995-05-11 James Thompson <thompson@wg2.waii.com>
|
1995-05-11 Jim Thompson <thompson@wg2.waii.com>
|
||||||
|
|
||||||
* ps-print.el: Miscellaneous fixes for better compatibility with
|
* ps-print.el: Miscellaneous fixes for better compatibility with
|
||||||
XEmacs 19.12.
|
XEmacs 19.12.
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
;;; add-log.el --- change log maintenance commands for Emacs
|
;;; add-log.el --- change log maintenance commands for Emacs
|
||||||
|
|
||||||
;; Copyright (C) 1985, 86, 88, 93, 94, 97, 98, 2000, 03, 2004
|
;; Copyright (C) 1985, 1986, 1988, 1993, 1994, 1997, 1998, 2000, 2003,
|
||||||
;; Free Software Foundation, Inc.
|
;; 2004, 2005 Free Software Foundation, Inc.
|
||||||
|
|
||||||
;; Maintainer: FSF
|
;; Maintainer: FSF
|
||||||
;; Keywords: tools
|
;; Keywords: tools
|
||||||
|
|
@ -225,20 +225,20 @@ Note: The search is conducted only within 10%, at the beginning of the file."
|
||||||
(2 'change-log-email-face)))
|
(2 'change-log-email-face)))
|
||||||
;;
|
;;
|
||||||
;; File names.
|
;; File names.
|
||||||
("^\t\\* \\([^ ,:([\n]+\\)"
|
("^\\( +\\|\t\\)\\* \\([^ ,:([\n]+\\)"
|
||||||
(1 'change-log-file-face)
|
(2 'change-log-file-face)
|
||||||
;; Possibly further names in a list:
|
;; Possibly further names in a list:
|
||||||
("\\=, \\([^ ,:([\n]+\\)" nil nil (1 'change-log-file-face))
|
("\\=, \\([^ ,:([\n]+\\)" nil nil (1 'change-log-file-face))
|
||||||
;; Possibly a parenthesized list of names:
|
;; Possibly a parenthesized list of names:
|
||||||
("\\= (\\([^() ,\n]+\\|(\\(setf\\|SETF\\) [^() ,\n]+)\\)"
|
("\\= (\\([^(),\n]+\\|(\\(setf\\|SETF\\) [^() ,\n]+)\\)"
|
||||||
nil nil (1 'change-log-list-face))
|
nil nil (1 'change-log-list-face))
|
||||||
("\\=, *\\([^() ,\n]+\\|(\\(setf\\|SETF\\) [^() ,\n]+)\\)"
|
("\\=, *\\([^(),\n]+\\|(\\(setf\\|SETF\\) [^() ,\n]+)\\)"
|
||||||
nil nil (1 'change-log-list-face)))
|
nil nil (1 'change-log-list-face)))
|
||||||
;;
|
;;
|
||||||
;; Function or variable names.
|
;; Function or variable names.
|
||||||
("^\t(\\([^() ,\n]+\\|(\\(setf\\|SETF\\) [^() ,\n]+)\\)"
|
("^\\( +\\|\t\\)(\\([^(),\n]+\\|(\\(setf\\|SETF\\) [^() ,\n]+)\\)"
|
||||||
(1 'change-log-list-face)
|
(2 'change-log-list-face)
|
||||||
("\\=, *\\([^() ,\n]+\\|(\\(setf\\|SETF\\) [^() ,\n]+)\\)" nil nil
|
("\\=, *\\([^(),\n]+\\|(\\(setf\\|SETF\\) [^() ,\n]+)\\)" nil nil
|
||||||
(1 'change-log-list-face)))
|
(1 'change-log-list-face)))
|
||||||
;;
|
;;
|
||||||
;; Conditionals.
|
;; Conditionals.
|
||||||
|
|
@ -250,8 +250,8 @@ Note: The search is conducted only within 10%, at the beginning of the file."
|
||||||
;; Acknowledgements.
|
;; Acknowledgements.
|
||||||
;; Don't include plain "From" because that is vague;
|
;; Don't include plain "From" because that is vague;
|
||||||
;; we want to encourage people to say something more specific.
|
;; we want to encourage people to say something more specific.
|
||||||
("\\(^\t\\| \\)\\(Patch\\(es\\)? by\\|Report\\(ed by\\| from\\)\\|Suggest\\(ed by\\|ion from\\)\\)"
|
("\\(^\\( +\\|\t\\)\\| \\)\\(Patch\\(es\\)? by\\|Report\\(ed by\\| from\\)\\|Suggest\\(ed by\\|ion from\\)\\)"
|
||||||
2 'change-log-acknowledgement-face))
|
3 'change-log-acknowledgement-face))
|
||||||
"Additional expressions to highlight in Change Log mode.")
|
"Additional expressions to highlight in Change Log mode.")
|
||||||
|
|
||||||
(defvar change-log-mode-map
|
(defvar change-log-mode-map
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
;;; autorevert.el --- revert buffers when files on disk change
|
;;; autorevert.el --- revert buffers when files on disk change
|
||||||
|
|
||||||
;; Copyright (C) 1997, 1998, 1999, 2001, 2004 Free Software Foundation, Inc.
|
;; Copyright (C) 1997, 1998, 1999, 2001, 2004, 2005 Free Software Foundation, Inc.
|
||||||
|
|
||||||
;; Author: Anders Lindgren <andersl@andersl.com>
|
;; Author: Anders Lindgren <andersl@andersl.com>
|
||||||
;; Keywords: convenience
|
;; Keywords: convenience
|
||||||
|
|
@ -290,7 +290,7 @@ This is a minor mode that affects only the current buffer.
|
||||||
Use `global-auto-revert-mode' to automatically revert all buffers.
|
Use `global-auto-revert-mode' to automatically revert all buffers.
|
||||||
Use `auto-revert-tail-mode' if you know that the file will only grow
|
Use `auto-revert-tail-mode' if you know that the file will only grow
|
||||||
without being changed in the part that is already in the buffer."
|
without being changed in the part that is already in the buffer."
|
||||||
nil auto-revert-mode-text nil
|
:group 'auto-revert :lighter auto-revert-mode-text
|
||||||
(if auto-revert-mode
|
(if auto-revert-mode
|
||||||
(if (not (memq (current-buffer) auto-revert-buffer-list))
|
(if (not (memq (current-buffer) auto-revert-buffer-list))
|
||||||
(push (current-buffer) auto-revert-buffer-list))
|
(push (current-buffer) auto-revert-buffer-list))
|
||||||
|
|
|
||||||
|
|
@ -114,7 +114,7 @@ The text being displayed in the mode line is controlled by the variables
|
||||||
`battery-mode-line-format' and `battery-status-function'.
|
`battery-mode-line-format' and `battery-status-function'.
|
||||||
The mode line will be updated automatically every `battery-update-interval'
|
The mode line will be updated automatically every `battery-update-interval'
|
||||||
seconds."
|
seconds."
|
||||||
:global t
|
:global t :group 'battery
|
||||||
(setq battery-mode-line-string "")
|
(setq battery-mode-line-string "")
|
||||||
(or global-mode-string (setq global-mode-string '("")))
|
(or global-mode-string (setq global-mode-string '("")))
|
||||||
(and battery-update-timer (cancel-timer battery-update-timer))
|
(and battery-update-timer (cancel-timer battery-update-timer))
|
||||||
|
|
|
||||||
|
|
@ -141,6 +141,7 @@ Auto Revert Mode.")
|
||||||
(define-key Buffer-menu-mode-map "V" 'Buffer-menu-view)
|
(define-key Buffer-menu-mode-map "V" 'Buffer-menu-view)
|
||||||
(define-key Buffer-menu-mode-map "T" 'Buffer-menu-toggle-files-only)
|
(define-key Buffer-menu-mode-map "T" 'Buffer-menu-toggle-files-only)
|
||||||
(define-key Buffer-menu-mode-map [mouse-2] 'Buffer-menu-mouse-select)
|
(define-key Buffer-menu-mode-map [mouse-2] 'Buffer-menu-mouse-select)
|
||||||
|
(define-key Buffer-menu-mode-map [follow-link] 'mouse-face)
|
||||||
)
|
)
|
||||||
|
|
||||||
;; Buffer Menu mode is suitable only for specially formatted data.
|
;; Buffer Menu mode is suitable only for specially formatted data.
|
||||||
|
|
|
||||||
|
|
@ -519,7 +519,22 @@ T means abort and give an error message.")
|
||||||
("⁽" "(") ; (
|
("⁽" "(") ; (
|
||||||
("⁾" ")") ; )
|
("⁾" ")") ; )
|
||||||
("ⁿ" "n") ; n
|
("ⁿ" "n") ; n
|
||||||
("ⁱ" "i")) ; i
|
("ⁱ" "i") ; i
|
||||||
|
;; subscripts
|
||||||
|
("₀" "0") ; 0
|
||||||
|
("₁" "1") ; 1
|
||||||
|
("₂" "2") ; 2
|
||||||
|
("₃" "3") ; 3
|
||||||
|
("₄" "4") ; 4
|
||||||
|
("₅" "5") ; 5
|
||||||
|
("₆" "6") ; 6
|
||||||
|
("₇" "7") ; 7
|
||||||
|
("₈" "8") ; 8
|
||||||
|
("₉" "9") ; 9
|
||||||
|
("₊" "+") ; +
|
||||||
|
("₋" "-") ; -
|
||||||
|
("₍" "(") ; (
|
||||||
|
("₎" ")")) ; )
|
||||||
"A list whose elements (old new) indicate replacements to make
|
"A list whose elements (old new) indicate replacements to make
|
||||||
in Calc algebraic input.")
|
in Calc algebraic input.")
|
||||||
|
|
||||||
|
|
@ -527,11 +542,18 @@ in Calc algebraic input.")
|
||||||
"⁰¹²³⁴⁵⁶⁷⁸⁹⁺⁻⁽⁾ⁿⁱ" ; 0123456789+-()ni
|
"⁰¹²³⁴⁵⁶⁷⁸⁹⁺⁻⁽⁾ⁿⁱ" ; 0123456789+-()ni
|
||||||
"A string consisting of the superscripts allowed by Calc.")
|
"A string consisting of the superscripts allowed by Calc.")
|
||||||
|
|
||||||
|
(defvar math-read-subscripts
|
||||||
|
"₀₁₂₃₄₅₆₇₈₉₊₋₍₎" ; 0123456789+-()
|
||||||
|
"A string consisting of the subscripts allowed by Calc.")
|
||||||
|
|
||||||
(defun math-read-preprocess-string (str)
|
(defun math-read-preprocess-string (str)
|
||||||
"Replace some substrings of STR by Calc equivalents."
|
"Replace some substrings of STR by Calc equivalents."
|
||||||
(setq str
|
(setq str
|
||||||
(replace-regexp-in-string (concat "[" math-read-superscripts "]+")
|
(replace-regexp-in-string (concat "[" math-read-superscripts "]+")
|
||||||
"^(\\&)" str))
|
"^(\\&)" str))
|
||||||
|
(setq str
|
||||||
|
(replace-regexp-in-string (concat "[" math-read-subscripts "]+")
|
||||||
|
"_(\\&)" str))
|
||||||
(let ((rep-list math-read-replacement-list))
|
(let ((rep-list math-read-replacement-list))
|
||||||
(while rep-list
|
(while rep-list
|
||||||
(setq str
|
(setq str
|
||||||
|
|
|
||||||
|
|
@ -231,7 +231,8 @@
|
||||||
(f90-mode . fortran))
|
(f90-mode . fortran))
|
||||||
"*Alist of major modes with appropriate Calc languages."
|
"*Alist of major modes with appropriate Calc languages."
|
||||||
:group 'calc
|
:group 'calc
|
||||||
:type '(alist :key-type symbol :value-type symbol))
|
:type '(alist :key-type (symbol :tag "Major mode")
|
||||||
|
:value-type (symbol :tag "Calc language")))
|
||||||
|
|
||||||
(defcustom calc-embedded-announce-formula
|
(defcustom calc-embedded-announce-formula
|
||||||
"%Embed\n\\(% .*\n\\)*"
|
"%Embed\n\\(% .*\n\\)*"
|
||||||
|
|
|
||||||
|
|
@ -209,8 +209,12 @@ If nil, make an icon of the frame. If non-nil, delete the frame."
|
||||||
(defvar diary-face 'diary-face
|
(defvar diary-face 'diary-face
|
||||||
"Face name to use for diary entries.")
|
"Face name to use for diary entries.")
|
||||||
(defface diary-face
|
(defface diary-face
|
||||||
'((((class color) (background light))
|
'((((min-colors 88) (class color) (background light))
|
||||||
|
:foreground "red1")
|
||||||
|
(((class color) (background light))
|
||||||
:foreground "red")
|
:foreground "red")
|
||||||
|
(((min-colors 88) (class color) (background dark))
|
||||||
|
:foreground "yellow1")
|
||||||
(((class color) (background dark))
|
(((class color) (background dark))
|
||||||
:foreground "yellow")
|
:foreground "yellow")
|
||||||
(t
|
(t
|
||||||
|
|
|
||||||
|
|
@ -1647,7 +1647,7 @@ marked on the calendar."
|
||||||
(or (diary-remind sexp (car days) marking)
|
(or (diary-remind sexp (car days) marking)
|
||||||
(diary-remind sexp (cdr days) marking))))))
|
(diary-remind sexp (cdr days) marking))))))
|
||||||
|
|
||||||
(defun add-to-diary-list (date string specifier marker &optional globcolor)
|
(defun add-to-diary-list (date string specifier &optional marker globcolor)
|
||||||
"Add the entry (DATE STRING SPECIFIER MARKER GLOBCOLOR) to `diary-entries-list'.
|
"Add the entry (DATE STRING SPECIFIER MARKER GLOBCOLOR) to `diary-entries-list'.
|
||||||
Do nothing if DATE or STRING is nil."
|
Do nothing if DATE or STRING is nil."
|
||||||
(when (and date string)
|
(when (and date string)
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
;;; time-date.el --- date and time handling functions
|
;;; time-date.el --- Date and time handling functions
|
||||||
;; Copyright (C) 1998, 1999, 2000, 2004, 2005 Free Software Foundation, Inc.
|
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005 Free Software Foundation, Inc.
|
||||||
|
|
||||||
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
|
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
|
||||||
;; Masanobu Umeda <umerin@mse.kyutech.ac.jp>
|
;; Masanobu Umeda <umerin@mse.kyutech.ac.jp>
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
;;; timeclock.el --- mode for keeping track of how much you work
|
;;; timeclock.el --- mode for keeping track of how much you work
|
||||||
|
|
||||||
;; Copyright (C) 1999, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
|
;; Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
|
||||||
|
|
||||||
;; Author: John Wiegley <johnw@gnu.org>
|
;; Author: John Wiegley <johnw@gnu.org>
|
||||||
;; Created: 25 Mar 1999
|
;; Created: 25 Mar 1999
|
||||||
|
|
@ -78,7 +78,7 @@
|
||||||
;;; Code:
|
;;; Code:
|
||||||
|
|
||||||
(defgroup timeclock nil
|
(defgroup timeclock nil
|
||||||
"Keeping track time of the time that gets spent."
|
"Keeping track of the time that gets spent."
|
||||||
:group 'data)
|
:group 'data)
|
||||||
|
|
||||||
;;; User Variables:
|
;;; User Variables:
|
||||||
|
|
|
||||||
|
|
@ -186,11 +186,11 @@ wish to put something like the following in your `.emacs' file:
|
||||||
|
|
||||||
\(add-hook 'comint-mode-hook
|
\(add-hook 'comint-mode-hook
|
||||||
(lambda ()
|
(lambda ()
|
||||||
(define-key comint-mode-map \"\C-w\" 'comint-kill-region)
|
(define-key comint-mode-map \"\\C-w\" 'comint-kill-region)
|
||||||
(define-key comint-mode-map [C-S-backspace]
|
(define-key comint-mode-map [C-S-backspace]
|
||||||
'comint-kill-whole-line)))
|
'comint-kill-whole-line)))
|
||||||
|
|
||||||
If you sometimes use comint-mode on text-only terminals or with `emacs-nw',
|
If you sometimes use comint-mode on text-only terminals or with `emacs -nw',
|
||||||
you might wish to use another binding for `comint-kill-whole-line'."
|
you might wish to use another binding for `comint-kill-whole-line'."
|
||||||
:type 'boolean
|
:type 'boolean
|
||||||
:group 'comint
|
:group 'comint
|
||||||
|
|
@ -228,7 +228,8 @@ This variable is buffer-local."
|
||||||
:group 'comint)
|
:group 'comint)
|
||||||
|
|
||||||
(defface comint-highlight-prompt
|
(defface comint-highlight-prompt
|
||||||
'((((background dark)) (:foreground "cyan"))
|
'((((min-colors 88) (background dark)) (:foreground "cyan1"))
|
||||||
|
(((background dark)) (:foreground "cyan"))
|
||||||
(t (:foreground "dark blue")))
|
(t (:foreground "dark blue")))
|
||||||
"Face to use to highlight prompts."
|
"Face to use to highlight prompts."
|
||||||
:group 'comint)
|
:group 'comint)
|
||||||
|
|
|
||||||
|
|
@ -1633,7 +1633,7 @@ item in another window.\n\n"))
|
||||||
:group 'custom-buffer)
|
:group 'custom-buffer)
|
||||||
|
|
||||||
(defface custom-invalid-face '((((class color))
|
(defface custom-invalid-face '((((class color))
|
||||||
(:foreground "yellow" :background "red"))
|
(:foreground "yellow1" :background "red1"))
|
||||||
(t
|
(t
|
||||||
(:weight bold :slant italic :underline t)))
|
(:weight bold :slant italic :underline t)))
|
||||||
"Face used when the customize item is invalid."
|
"Face used when the customize item is invalid."
|
||||||
|
|
@ -1646,21 +1646,27 @@ item in another window.\n\n"))
|
||||||
"Face used when the customize item is not defined for customization."
|
"Face used when the customize item is not defined for customization."
|
||||||
:group 'custom-magic-faces)
|
:group 'custom-magic-faces)
|
||||||
|
|
||||||
(defface custom-modified-face '((((class color))
|
(defface custom-modified-face '((((min-colors 88) (class color))
|
||||||
|
(:foreground "white" :background "blue1"))
|
||||||
|
(((class color))
|
||||||
(:foreground "white" :background "blue"))
|
(:foreground "white" :background "blue"))
|
||||||
(t
|
(t
|
||||||
(:slant italic :bold)))
|
(:slant italic :bold)))
|
||||||
"Face used when the customize item has been modified."
|
"Face used when the customize item has been modified."
|
||||||
:group 'custom-magic-faces)
|
:group 'custom-magic-faces)
|
||||||
|
|
||||||
(defface custom-set-face '((((class color))
|
(defface custom-set-face '((((min-colors 88) (class color))
|
||||||
|
(:foreground "blue1" :background "white"))
|
||||||
|
(((class color))
|
||||||
(:foreground "blue" :background "white"))
|
(:foreground "blue" :background "white"))
|
||||||
(t
|
(t
|
||||||
(:slant italic)))
|
(:slant italic)))
|
||||||
"Face used when the customize item has been set."
|
"Face used when the customize item has been set."
|
||||||
:group 'custom-magic-faces)
|
:group 'custom-magic-faces)
|
||||||
|
|
||||||
(defface custom-changed-face '((((class color))
|
(defface custom-changed-face '((((min-colors 88) (class color))
|
||||||
|
(:foreground "white" :background "blue1"))
|
||||||
|
(((class color))
|
||||||
(:foreground "white" :background "blue"))
|
(:foreground "white" :background "blue"))
|
||||||
(t
|
(t
|
||||||
(:slant italic)))
|
(:slant italic)))
|
||||||
|
|
@ -2148,6 +2154,9 @@ If INITIAL-STRING is non-nil, use that rather than \"Parent groups:\"."
|
||||||
`((((class color)
|
`((((class color)
|
||||||
(background dark))
|
(background dark))
|
||||||
(:foreground "light blue" :weight bold :height 1.2 :inherit variable-pitch))
|
(:foreground "light blue" :weight bold :height 1.2 :inherit variable-pitch))
|
||||||
|
(((min-colors 88) (class color)
|
||||||
|
(background light))
|
||||||
|
(:foreground "blue1" :weight bold :height 1.2 :inherit variable-pitch))
|
||||||
(((class color)
|
(((class color)
|
||||||
(background light))
|
(background light))
|
||||||
(:foreground "blue" :weight bold :height 1.2 :inherit variable-pitch))
|
(:foreground "blue" :weight bold :height 1.2 :inherit variable-pitch))
|
||||||
|
|
@ -3296,65 +3305,37 @@ restoring it to the state of a face that has never been customized."
|
||||||
(defvar widget-face-prompt-value-history nil
|
(defvar widget-face-prompt-value-history nil
|
||||||
"History of input to `widget-face-prompt-value'.")
|
"History of input to `widget-face-prompt-value'.")
|
||||||
|
|
||||||
(define-widget 'face 'restricted-sexp
|
(define-widget 'face 'symbol
|
||||||
"A Lisp face name."
|
"A Lisp face name (with sample)."
|
||||||
|
:format "%t: (%{sample%}) %v"
|
||||||
|
:tag "Face"
|
||||||
|
:value 'default
|
||||||
|
:sample-face-get 'widget-face-sample-face-get
|
||||||
|
:notify 'widget-face-notify
|
||||||
|
:match (lambda (widget value) (facep value))
|
||||||
:complete-function (lambda ()
|
:complete-function (lambda ()
|
||||||
(interactive)
|
(interactive)
|
||||||
(lisp-complete-symbol 'facep))
|
(lisp-complete-symbol 'facep))
|
||||||
:prompt-value 'widget-field-prompt-value
|
|
||||||
:prompt-internal 'widget-symbol-prompt-internal
|
|
||||||
:prompt-match 'facep
|
:prompt-match 'facep
|
||||||
:prompt-history 'widget-face-prompt-value-history
|
:prompt-history 'widget-face-prompt-value-history
|
||||||
:value-create 'widget-face-value-create
|
|
||||||
:action 'widget-field-action
|
|
||||||
:match-alternatives '(facep)
|
|
||||||
:validate (lambda (widget)
|
:validate (lambda (widget)
|
||||||
(unless (facep (widget-value widget))
|
(unless (facep (widget-value widget))
|
||||||
(widget-put widget :error (format "Invalid face: %S"
|
(widget-put widget
|
||||||
(widget-value widget)))
|
:error (format "Invalid face: %S"
|
||||||
widget))
|
(widget-value widget)))
|
||||||
:value 'ignore
|
widget)))
|
||||||
:tag "Function")
|
|
||||||
|
|
||||||
|
(defun widget-face-sample-face-get (widget)
|
||||||
|
(let ((value (widget-value widget)))
|
||||||
|
(if (facep value)
|
||||||
|
value
|
||||||
|
'default)))
|
||||||
|
|
||||||
;;; There is a bug here: the sample doesn't get redisplayed
|
(defun widget-face-notify (widget child &optional event)
|
||||||
;;; in the new font when you specify one. Does anyone know how to
|
"Update the sample, and notify the parent."
|
||||||
;;; make that work? -- rms.
|
(overlay-put (widget-get widget :sample-overlay)
|
||||||
|
'face (widget-apply widget :sample-face-get))
|
||||||
(defun widget-face-value-create (widget)
|
(widget-default-notify widget child event))
|
||||||
"Create an editable face name field."
|
|
||||||
(let ((buttons (widget-get widget :buttons))
|
|
||||||
(symbol (widget-get widget :value)))
|
|
||||||
;; Sample.
|
|
||||||
(push (widget-create-child-and-convert widget 'item
|
|
||||||
:format "(%{%t%})"
|
|
||||||
:sample-face symbol
|
|
||||||
:tag "sample")
|
|
||||||
buttons)
|
|
||||||
(insert " ")
|
|
||||||
;; Update buttons.
|
|
||||||
(widget-put widget :buttons buttons))
|
|
||||||
|
|
||||||
(let ((size (widget-get widget :size))
|
|
||||||
(value (widget-get widget :value))
|
|
||||||
(from (point))
|
|
||||||
;; This is changed to a real overlay in `widget-setup'. We
|
|
||||||
;; need the end points to behave differently until
|
|
||||||
;; `widget-setup' is called.
|
|
||||||
(overlay (cons (make-marker) (make-marker))))
|
|
||||||
(widget-put widget :field-overlay overlay)
|
|
||||||
(insert value)
|
|
||||||
(and size
|
|
||||||
(< (length value) size)
|
|
||||||
(insert-char ?\ (- size (length value))))
|
|
||||||
(unless (memq widget widget-field-list)
|
|
||||||
(setq widget-field-new (cons widget widget-field-new)))
|
|
||||||
(move-marker (cdr overlay) (point))
|
|
||||||
(set-marker-insertion-type (cdr overlay) nil)
|
|
||||||
(when (null size)
|
|
||||||
(insert ?\n))
|
|
||||||
(move-marker (car overlay) from)
|
|
||||||
(set-marker-insertion-type (car overlay) t)))
|
|
||||||
|
|
||||||
|
|
||||||
;;; The `hook' Widget.
|
;;; The `hook' Widget.
|
||||||
|
|
@ -3420,6 +3401,9 @@ and so forth. The remaining group tags are shown with
|
||||||
`((((class color)
|
`((((class color)
|
||||||
(background dark))
|
(background dark))
|
||||||
(:foreground "pink" :weight bold :height 1.2 :inherit variable-pitch))
|
(:foreground "pink" :weight bold :height 1.2 :inherit variable-pitch))
|
||||||
|
(((min-colors 88) (class color)
|
||||||
|
(background light))
|
||||||
|
(:foreground "red1" :weight bold :height 1.2 :inherit variable-pitch))
|
||||||
(((class color)
|
(((class color)
|
||||||
(background light))
|
(background light))
|
||||||
(:foreground "red" :weight bold :height 1.2 :inherit variable-pitch))
|
(:foreground "red" :weight bold :height 1.2 :inherit variable-pitch))
|
||||||
|
|
@ -3431,6 +3415,9 @@ and so forth. The remaining group tags are shown with
|
||||||
`((((class color)
|
`((((class color)
|
||||||
(background dark))
|
(background dark))
|
||||||
(:foreground "light blue" :weight bold :height 1.2))
|
(:foreground "light blue" :weight bold :height 1.2))
|
||||||
|
(((min-colors 88) (class color)
|
||||||
|
(background light))
|
||||||
|
(:foreground "blue1" :weight bold :height 1.2))
|
||||||
(((class color)
|
(((class color)
|
||||||
(background light))
|
(background light))
|
||||||
(:foreground "blue" :weight bold :height 1.2))
|
(:foreground "blue" :weight bold :height 1.2))
|
||||||
|
|
|
||||||
|
|
@ -158,14 +158,14 @@ If nil, just print error messages in the message buffer."
|
||||||
|
|
||||||
(defcustom desktop-no-desktop-file-hook nil
|
(defcustom desktop-no-desktop-file-hook nil
|
||||||
"Normal hook run when `desktop-read' can't find a desktop file.
|
"Normal hook run when `desktop-read' can't find a desktop file.
|
||||||
May e.g. be used to show a dired buffer."
|
May be used to show a dired buffer."
|
||||||
:type 'hook
|
:type 'hook
|
||||||
:group 'desktop
|
:group 'desktop
|
||||||
:version "22.1")
|
:version "22.1")
|
||||||
|
|
||||||
(defcustom desktop-after-read-hook nil
|
(defcustom desktop-after-read-hook nil
|
||||||
"Normal hook run after a successful `desktop-read'.
|
"Normal hook run after a successful `desktop-read'.
|
||||||
May e.g. be used to show a buffer list."
|
May be used to show a buffer list."
|
||||||
:type 'hook
|
:type 'hook
|
||||||
:group 'desktop
|
:group 'desktop
|
||||||
:version "22.1")
|
:version "22.1")
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
;;; diff-mode.el --- a mode for viewing/editing context diffs
|
;;; diff-mode.el --- a mode for viewing/editing context diffs
|
||||||
|
|
||||||
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004
|
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
|
||||||
;; Free Software Foundation, Inc.
|
;; Free Software Foundation, Inc.
|
||||||
|
|
||||||
;; Author: Stefan Monnier <monnier@cs.yale.edu>
|
;; Author: Stefan Monnier <monnier@cs.yale.edu>
|
||||||
;; Keywords: convenience patch diff
|
;; Keywords: convenience patch diff
|
||||||
|
|
@ -952,7 +952,7 @@ a diff with \\[diff-reverse-direction]."
|
||||||
(define-minor-mode diff-minor-mode
|
(define-minor-mode diff-minor-mode
|
||||||
"Minor mode for viewing/editing context diffs.
|
"Minor mode for viewing/editing context diffs.
|
||||||
\\{diff-minor-mode-map}"
|
\\{diff-minor-mode-map}"
|
||||||
nil " Diff" nil
|
:group 'diff-mode :lighter " Diff"
|
||||||
;; FIXME: setup font-lock
|
;; FIXME: setup font-lock
|
||||||
;; setup change hooks
|
;; setup change hooks
|
||||||
(if (not diff-update-on-the-fly)
|
(if (not diff-update-on-the-fly)
|
||||||
|
|
|
||||||
|
|
@ -1937,10 +1937,11 @@ Return the position of the beginning of the filename, or nil if none found."
|
||||||
"Copy names of marked (or next ARG) files into the kill ring.
|
"Copy names of marked (or next ARG) files into the kill ring.
|
||||||
The names are separated by a space.
|
The names are separated by a space.
|
||||||
With a zero prefix arg, use the absolute file name of each marked file.
|
With a zero prefix arg, use the absolute file name of each marked file.
|
||||||
With \\[universal-argument], use the file name sans directory of each marked file.
|
With \\[universal-argument], use the file name relative to the Dired buffer's
|
||||||
|
`default-directory'. (This still may contain slashes if in a subdirectory.)
|
||||||
|
|
||||||
If on a subdir headerline, use subdirname instead; prefix arg is ignored
|
If on a subdir headerline, use absolute subdirname instead;
|
||||||
in this case.
|
prefix arg and marked files are ignored in this case.
|
||||||
|
|
||||||
You can then feed the file name(s) to other commands with \\[yank]."
|
You can then feed the file name(s) to other commands with \\[yank]."
|
||||||
(interactive "P")
|
(interactive "P")
|
||||||
|
|
@ -1950,10 +1951,11 @@ You can then feed the file name(s) to other commands with \\[yank]."
|
||||||
(if arg
|
(if arg
|
||||||
(cond ((zerop (prefix-numeric-value arg))
|
(cond ((zerop (prefix-numeric-value arg))
|
||||||
(dired-get-marked-files))
|
(dired-get-marked-files))
|
||||||
((integerp arg)
|
((consp arg)
|
||||||
(dired-get-marked-files 'no-dir arg))
|
(dired-get-marked-files t))
|
||||||
(t ; else a raw arg
|
(t
|
||||||
(dired-get-marked-files t)))
|
(dired-get-marked-files
|
||||||
|
'no-dir (prefix-numeric-value arg))))
|
||||||
(dired-get-marked-files 'no-dir))
|
(dired-get-marked-files 'no-dir))
|
||||||
" "))))
|
" "))))
|
||||||
(if (eq last-command 'kill-region)
|
(if (eq last-command 'kill-region)
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
;;; ediff-init.el --- Macros, variables, and defsubsts used by Ediff
|
;;; ediff-init.el --- Macros, variables, and defsubsts used by Ediff
|
||||||
|
|
||||||
;; Copyright (C) 1994, 95, 96, 97, 98, 99, 2000, 01, 02, 04 Free Software Foundation, Inc.
|
;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
||||||
|
;; 2004, 2005 Free Software Foundation, Inc.
|
||||||
|
|
||||||
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
|
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
|
||||||
|
|
||||||
|
|
@ -43,7 +44,7 @@
|
||||||
;; end pacifier
|
;; end pacifier
|
||||||
|
|
||||||
;; Is it XEmacs?
|
;; Is it XEmacs?
|
||||||
(defconst ediff-xemacs-p (string-match "XEmacs" emacs-version))
|
(defconst ediff-xemacs-p (featurep 'xemacs))
|
||||||
;; Is it Emacs?
|
;; Is it Emacs?
|
||||||
(defconst ediff-emacs-p (not ediff-xemacs-p))
|
(defconst ediff-emacs-p (not ediff-xemacs-p))
|
||||||
|
|
||||||
|
|
@ -53,7 +54,7 @@
|
||||||
;; compiler at hand.
|
;; compiler at hand.
|
||||||
;; Suggested by rms.
|
;; Suggested by rms.
|
||||||
(defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form)
|
(defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form)
|
||||||
(if (string-match "XEmacs" emacs-version)
|
(if (featurep 'xemacs)
|
||||||
xemacs-form emacs-form))
|
xemacs-form emacs-form))
|
||||||
|
|
||||||
(defvar ediff-force-faces nil
|
(defvar ediff-force-faces nil
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,6 @@ files.")
|
||||||
|
|
||||||
(defconst authors-aliases
|
(defconst authors-aliases
|
||||||
'(
|
'(
|
||||||
("Andrew Innes" "Andrw Innes")
|
|
||||||
("Barry A. Warsaw" "Barry A. Warsaw, Century Computing, Inc."
|
("Barry A. Warsaw" "Barry A. Warsaw, Century Computing, Inc."
|
||||||
"Barry A. Warsaw, ITB" "Barry Warsaw")
|
"Barry A. Warsaw, ITB" "Barry Warsaw")
|
||||||
("Bj,Av(Brn Torkelsson" "Bjorn Torkelsson")
|
("Bj,Av(Brn Torkelsson" "Bjorn Torkelsson")
|
||||||
|
|
@ -57,7 +56,7 @@ files.")
|
||||||
("Edward M. Reingold" "Ed Reingold" "Edward M Reingold"
|
("Edward M. Reingold" "Ed Reingold" "Edward M Reingold"
|
||||||
"Reingold Edward M")
|
"Reingold Edward M")
|
||||||
("Eli Zaretskii" "eliz")
|
("Eli Zaretskii" "eliz")
|
||||||
; ("Emilio C. Lopes" "Emilio Lopes")
|
("Emilio C. Lopes" "Emilio Lopes")
|
||||||
("Era Eriksson" "Era@Iki.Fi")
|
("Era Eriksson" "Era@Iki.Fi")
|
||||||
("Eric M. Ludlam" "Eric Ludlam")
|
("Eric M. Ludlam" "Eric Ludlam")
|
||||||
("Eric S. Raymond" "Eric Raymond")
|
("Eric S. Raymond" "Eric Raymond")
|
||||||
|
|
@ -79,8 +78,10 @@ files.")
|
||||||
("Jay K. Adams" "jka@ece.cmu.edu" "Jay Adams")
|
("Jay K. Adams" "jka@ece.cmu.edu" "Jay Adams")
|
||||||
("J,Ai(Br,At(Bme Marant" "J,bi(Br,bt(Bme Marant" "Jerome Marant")
|
("J,Ai(Br,At(Bme Marant" "J,bi(Br,bt(Bme Marant" "Jerome Marant")
|
||||||
("Jens-Ulrik Holger Petersen" "Jens-Ulrik Petersen")
|
("Jens-Ulrik Holger Petersen" "Jens-Ulrik Petersen")
|
||||||
|
("John W. Eaton" "John Eaton")
|
||||||
("Jonathan I. Kamens" "Jonathan Kamens")
|
("Jonathan I. Kamens" "Jonathan Kamens")
|
||||||
("Joseph Arceneaux" "Joe Arceneaux")
|
("Joseph Arceneaux" "Joe Arceneaux")
|
||||||
|
("Juan Le,As(Bn Lahoz Garc,Am(Ba" "Juan-Leon Lahoz Garcia")
|
||||||
("K. Shane Hartman" "Shane Hartman")
|
("K. Shane Hartman" "Shane Hartman")
|
||||||
("Kai Gro,A_(Bjohann" "Kai Grossjohann" "Kai Gro,b_(Bjohann"
|
("Kai Gro,A_(Bjohann" "Kai Grossjohann" "Kai Gro,b_(Bjohann"
|
||||||
"Kai.Grossjohann@Cs.Uni-Dortmund.De"
|
"Kai.Grossjohann@Cs.Uni-Dortmund.De"
|
||||||
|
|
@ -89,14 +90,17 @@ files.")
|
||||||
("Kazushi Marukawa" "Kazushi")
|
("Kazushi Marukawa" "Kazushi")
|
||||||
("Ken Manheimer" "Kenneth Manheimer")
|
("Ken Manheimer" "Kenneth Manheimer")
|
||||||
("Kenichi Handa" "Ken'ichi Handa" "Kenichi HANDA")
|
("Kenichi Handa" "Ken'ichi Handa" "Kenichi HANDA")
|
||||||
|
("Kevin Greiner" "Kevin J. Greiner")
|
||||||
("Kim F. Storm" "Kim Storm")
|
("Kim F. Storm" "Kim Storm")
|
||||||
("Kyle Jones" "Kyle E. Jones")
|
("Kyle Jones" "Kyle E. Jones")
|
||||||
("Marcus G. Daniels" "Marcus Daniels")
|
("Marcus G. Daniels" "Marcus Daniels")
|
||||||
("Mark D. Baushke" "Mark D Baushke")
|
("Mark D. Baushke" "Mark D Baushke")
|
||||||
("Martin Lorentzon" "Martin Lorentzson")
|
("Martin Lorentzon" "Martin Lorentzson")
|
||||||
("Matt Swift" "Matthew Swift")
|
("Matt Swift" "Matthew Swift")
|
||||||
|
("Michael R. Mauger" "Michael Mauger")
|
||||||
("Michael D. Ernst" "Michael Ernst")
|
("Michael D. Ernst" "Michael Ernst")
|
||||||
("Michael I. Bushnell" "Michael I Bushnell" "Michael I. Bushnell, P/Bsg")
|
("Michael I. Bushnell" "Michael I Bushnell" "Michael I. Bushnell, P/Bsg")
|
||||||
|
("Mikio Nakajima" "Nakajima Mikio")
|
||||||
("Paul Eggert" "eggert")
|
("Paul Eggert" "eggert")
|
||||||
("Paul Reilly" "(pmr@legacy.pajato.com)")
|
("Paul Reilly" "(pmr@legacy.pajato.com)")
|
||||||
("Pavel Jan,Bm(Bk" "Pavel Jan,Am(Bk Ml." "Pavel Jan,Am(Bk" "Pavel@Janik.Cz")
|
("Pavel Jan,Bm(Bk" "Pavel Jan,Am(Bk Ml." "Pavel Jan,Am(Bk" "Pavel@Janik.Cz")
|
||||||
|
|
@ -114,6 +118,7 @@ files.")
|
||||||
("Stephen A. Wood" "(saw@cebaf.gov)")
|
("Stephen A. Wood" "(saw@cebaf.gov)")
|
||||||
("Steven L. Baur" "SL Baur" "Steven L Baur")
|
("Steven L. Baur" "SL Baur" "Steven L Baur")
|
||||||
("Takaaki Ota" "Tak Ota")
|
("Takaaki Ota" "Tak Ota")
|
||||||
|
("Takahashi Naoto" "Naoto Takahashi")
|
||||||
("Teodor Zlatanov" "Ted Zlatanov")
|
("Teodor Zlatanov" "Ted Zlatanov")
|
||||||
("Torbj,Av(Brn Axelsson" "Torbjvrn Axelsson")
|
("Torbj,Av(Brn Axelsson" "Torbjvrn Axelsson")
|
||||||
("Torbj,Av(Brn Einarsson" "Torbj.*rn Einarsson")
|
("Torbj,Av(Brn Einarsson" "Torbj.*rn Einarsson")
|
||||||
|
|
@ -152,6 +157,13 @@ If REALNAME is nil, ignore that author.")
|
||||||
Changes to files matching one of the regexps in this list are not
|
Changes to files matching one of the regexps in this list are not
|
||||||
listed.")
|
listed.")
|
||||||
|
|
||||||
|
(defconst authors-ignored-files
|
||||||
|
'("external-lisp"
|
||||||
|
"lock" "share-lib" "local-lisp"
|
||||||
|
"noleim-Makefile.in"
|
||||||
|
"NEWS" "PROBLEMS" "FAQ")
|
||||||
|
"List of files and directories to ignore.
|
||||||
|
Changes to files in this list are not listed.")
|
||||||
|
|
||||||
(defconst authors-fixed-entries
|
(defconst authors-fixed-entries
|
||||||
'(("Richard M. Stallman" :wrote "[The original GNU emacs and numerous files]")
|
'(("Richard M. Stallman" :wrote "[The original GNU emacs and numerous files]")
|
||||||
|
|
@ -184,7 +196,7 @@ listed.")
|
||||||
"mem-limits.h" "process.c" "template.h" "sysdep.c" "syssignal.h" "systty.h" "unexec.c"
|
"mem-limits.h" "process.c" "template.h" "sysdep.c" "syssignal.h" "systty.h" "unexec.c"
|
||||||
"ymakefile" "linux.h")
|
"ymakefile" "linux.h")
|
||||||
("Kyle E. Jones" :wrote "mldrag.el")
|
("Kyle E. Jones" :wrote "mldrag.el")
|
||||||
("Kenry Kautz" :wrote "bib-mode.el")
|
("Henry Kautz" :wrote "bib-mode.el")
|
||||||
("Joseph M. Kelsey" :changed "fileio.c" "vms-pwd.h" "vmsfns.c" "dir.h"
|
("Joseph M. Kelsey" :changed "fileio.c" "vms-pwd.h" "vmsfns.c" "dir.h"
|
||||||
"uaf.h")
|
"uaf.h")
|
||||||
("Sam Kendall" :changed "etags.c" "etags.el")
|
("Sam Kendall" :changed "etags.c" "etags.el")
|
||||||
|
|
@ -260,7 +272,8 @@ listed.")
|
||||||
|
|
||||||
(defconst authors-valid-file-names
|
(defconst authors-valid-file-names
|
||||||
'("aclocal.m4"
|
'("aclocal.m4"
|
||||||
"makedist.bat")
|
"makedist.bat"
|
||||||
|
"make-delta")
|
||||||
"File names which are valid, but no longer exists (or cannot be
|
"File names which are valid, but no longer exists (or cannot be
|
||||||
found) in the repository.")
|
found) in the repository.")
|
||||||
|
|
||||||
|
|
@ -274,6 +287,9 @@ found) in the repository.")
|
||||||
("s/windowsnt.h" . "s/ms-w32.h")
|
("s/windowsnt.h" . "s/ms-w32.h")
|
||||||
("config.emacs" . "configure")
|
("config.emacs" . "configure")
|
||||||
("GETTING.GNU.SOFTWARE" . "FTP")
|
("GETTING.GNU.SOFTWARE" . "FTP")
|
||||||
|
("leim-Makefile" . "leim/Makefile")
|
||||||
|
("leim-Makefile.in" . "leim/Makefile.in")
|
||||||
|
("INSTALL-CVS" . "INSTALL.CVS")
|
||||||
)
|
)
|
||||||
"Alist of files which have been renamed during their lifetime.
|
"Alist of files which have been renamed during their lifetime.
|
||||||
Elements are (OLDNAME . NEWNAME).")
|
Elements are (OLDNAME . NEWNAME).")
|
||||||
|
|
@ -372,7 +388,8 @@ from `authors-obsolete-files-regexps'."
|
||||||
ACTION is a keyword symbol describing what he did. Record file,
|
ACTION is a keyword symbol describing what he did. Record file,
|
||||||
author and what he did in hash table TABLE. See the description of
|
author and what he did in hash table TABLE. See the description of
|
||||||
`authors-scan-change-log' for the structure of the hash table."
|
`authors-scan-change-log' for the structure of the hash table."
|
||||||
(unless (or (authors-obsolete-file-p file)
|
(unless (or (member file authors-ignored-files)
|
||||||
|
(authors-obsolete-file-p file)
|
||||||
(equal author ""))
|
(equal author ""))
|
||||||
(let* ((value (gethash author table))
|
(let* ((value (gethash author table))
|
||||||
(entry (assoc file value))
|
(entry (assoc file value))
|
||||||
|
|
|
||||||
|
|
@ -110,7 +110,7 @@ When this is `function', only ask when called non-interactively."
|
||||||
(concat "Add " copyright-current-year
|
(concat "Add " copyright-current-year
|
||||||
" to copyright? "))))
|
" to copyright? "))))
|
||||||
(if replace
|
(if replace
|
||||||
(replace-match copyright-current-year t t nil 1)
|
(replace-match copyright-current-year t t nil 2)
|
||||||
(let ((size (save-excursion (skip-chars-backward "0-9"))))
|
(let ((size (save-excursion (skip-chars-backward "0-9"))))
|
||||||
(if (and (eq (% (- (string-to-number copyright-current-year)
|
(if (and (eq (% (- (string-to-number copyright-current-year)
|
||||||
(string-to-number (buffer-substring
|
(string-to-number (buffer-substring
|
||||||
|
|
|
||||||
|
|
@ -94,8 +94,11 @@ BODY contains code that will be executed each time the mode is (dis)activated.
|
||||||
These following keyword arguments are supported (other keywords
|
These following keyword arguments are supported (other keywords
|
||||||
will be passed to `defcustom' if the minor mode is global):
|
will be passed to `defcustom' if the minor mode is global):
|
||||||
:group GROUP Custom group name to use in all generated `defcustom' forms.
|
:group GROUP Custom group name to use in all generated `defcustom' forms.
|
||||||
|
Defaults to MODE without the possible trailing \"-mode\".
|
||||||
|
(This default may not be a valid customization group defined
|
||||||
|
with `defgroup'. Make sure it is.)
|
||||||
:global GLOBAL If non-nil specifies that the minor mode is not meant to be
|
:global GLOBAL If non-nil specifies that the minor mode is not meant to be
|
||||||
buffer-local, so don't make the variable MODE buffer-local.
|
buffer-local, so don't make the variable MODE buffer-local.
|
||||||
By default, the mode is buffer-local.
|
By default, the mode is buffer-local.
|
||||||
:init-value VAL Same as the INIT-VALUE argument.
|
:init-value VAL Same as the INIT-VALUE argument.
|
||||||
:lighter SPEC Same as the LIGHTER argument.
|
:lighter SPEC Same as the LIGHTER argument.
|
||||||
|
|
@ -153,9 +156,8 @@ For example, you could write
|
||||||
(unless group
|
(unless group
|
||||||
;; We might as well provide a best-guess default group.
|
;; We might as well provide a best-guess default group.
|
||||||
(setq group
|
(setq group
|
||||||
`(:group (or (custom-current-group)
|
`(:group ',(intern (replace-regexp-in-string
|
||||||
',(intern (replace-regexp-in-string
|
"-mode\\'" "" mode-name)))))
|
||||||
"-mode\\'" "" mode-name))))))
|
|
||||||
|
|
||||||
`(progn
|
`(progn
|
||||||
;; Define the variable to enable or disable the mode.
|
;; Define the variable to enable or disable the mode.
|
||||||
|
|
@ -220,8 +222,8 @@ With zero or negative ARG turn mode off.
|
||||||
;; Return the new setting.
|
;; Return the new setting.
|
||||||
,mode)
|
,mode)
|
||||||
|
|
||||||
;; Autoloading an easy-mmode-define-minor-mode autoloads
|
;; Autoloading a define-minor-mode autoloads everything
|
||||||
;; everything up-to-here.
|
;; up-to-here.
|
||||||
:autoload-end
|
:autoload-end
|
||||||
|
|
||||||
;; The toggle's hook.
|
;; The toggle's hook.
|
||||||
|
|
@ -280,9 +282,8 @@ KEYS is a list of CL-style keyword arguments:
|
||||||
(unless group
|
(unless group
|
||||||
;; We might as well provide a best-guess default group.
|
;; We might as well provide a best-guess default group.
|
||||||
(setq group
|
(setq group
|
||||||
`(:group (or (custom-current-group)
|
`(:group ',(intern (replace-regexp-in-string
|
||||||
',(intern (replace-regexp-in-string
|
"-mode\\'" "" (symbol-name mode))))))
|
||||||
"-mode\\'" "" (symbol-name mode)))))))
|
|
||||||
|
|
||||||
`(progn
|
`(progn
|
||||||
;; The actual global minor-mode
|
;; The actual global minor-mode
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
;;; eldoc.el --- show function arglist or variable docstring in echo area
|
;;; eldoc.el --- show function arglist or variable docstring in echo area
|
||||||
|
|
||||||
;; Copyright (C) 1996, 97, 98, 99, 2000, 2003 Free Software Foundation, Inc.
|
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2003, 2005
|
||||||
|
;; Free Software Foundation, Inc.
|
||||||
|
|
||||||
;; Author: Noah Friedman <friedman@splode.com>
|
;; Author: Noah Friedman <friedman@splode.com>
|
||||||
;; Maintainer: friedman@splode.com
|
;; Maintainer: friedman@splode.com
|
||||||
|
|
@ -150,7 +151,7 @@ If point is over a documented variable, print that variable's docstring
|
||||||
instead.
|
instead.
|
||||||
|
|
||||||
With prefix ARG, turn ElDoc mode on if and only if ARG is positive."
|
With prefix ARG, turn ElDoc mode on if and only if ARG is positive."
|
||||||
nil eldoc-minor-mode-string nil
|
:group 'eldoc :lighter eldoc-minor-mode-string
|
||||||
(setq eldoc-last-message nil)
|
(setq eldoc-last-message nil)
|
||||||
(if eldoc-mode
|
(if eldoc-mode
|
||||||
(progn
|
(progn
|
||||||
|
|
|
||||||
|
|
@ -31,18 +31,16 @@
|
||||||
|
|
||||||
;; Note that this variable is used by non-lisp modes too.
|
;; Note that this variable is used by non-lisp modes too.
|
||||||
(defcustom defun-prompt-regexp nil
|
(defcustom defun-prompt-regexp nil
|
||||||
"*If non-nil, a regexp to ignore before the character that starts a defun.
|
"*If non-nil, a regexp to ignore before a defun.
|
||||||
This is only necessary if the opening paren or brace is not in column 0.
|
This is only necessary if the opening paren or brace is not in column 0.
|
||||||
See function `beginning-of-defun'.
|
See function `beginning-of-defun'."
|
||||||
|
|
||||||
Setting this variable automatically makes it local to the current buffer."
|
|
||||||
:type '(choice (const nil)
|
:type '(choice (const nil)
|
||||||
regexp)
|
regexp)
|
||||||
:group 'lisp)
|
:group 'lisp)
|
||||||
(make-variable-buffer-local 'defun-prompt-regexp)
|
(make-variable-buffer-local 'defun-prompt-regexp)
|
||||||
|
|
||||||
(defcustom parens-require-spaces t
|
(defcustom parens-require-spaces t
|
||||||
"Non-nil means `insert-parentheses' should insert whitespace as needed."
|
"If non-nil, `insert-parentheses' inserts whitespace as needed."
|
||||||
:type 'boolean
|
:type 'boolean
|
||||||
:group 'lisp)
|
:group 'lisp)
|
||||||
|
|
||||||
|
|
@ -233,13 +231,14 @@ recipe (see `end-of-defun'). Major modes can define this if the
|
||||||
normal method is not appropriate.")
|
normal method is not appropriate.")
|
||||||
|
|
||||||
(defun buffer-end (arg)
|
(defun buffer-end (arg)
|
||||||
"Return the \"far end\" position of the buffer, moving in direction ARG.
|
"Return the \"far end\" position of the buffer, in direction ARG.
|
||||||
If ARG is positive, that's the end of the buffer.
|
If ARG is positive, that's the end of the buffer.
|
||||||
Otherwise, that's the beginning of the buffer."
|
Otherwise, that's the beginning of the buffer."
|
||||||
(if (> arg 0) (point-max) (point-min)))
|
(if (> arg 0) (point-max) (point-min)))
|
||||||
|
|
||||||
(defun end-of-defun (&optional arg)
|
(defun end-of-defun (&optional arg)
|
||||||
"Move forward to next end of defun. With argument, do it that many times.
|
"Move forward to next end of defun.
|
||||||
|
With argument, do it that many times.
|
||||||
Negative argument -N means move back to Nth preceding end of defun.
|
Negative argument -N means move back to Nth preceding end of defun.
|
||||||
|
|
||||||
An end of a defun occurs right after the close-parenthesis that
|
An end of a defun occurs right after the close-parenthesis that
|
||||||
|
|
@ -424,7 +423,8 @@ character is inserted ARG times."
|
||||||
(prefix-numeric-value arg))))
|
(prefix-numeric-value arg))))
|
||||||
|
|
||||||
(defun insert-parentheses (&optional arg)
|
(defun insert-parentheses (&optional arg)
|
||||||
"Enclose following ARG sexps in parentheses. Leave point after open-paren.
|
"Enclose following ARG sexps in parentheses.
|
||||||
|
Leave point after open-paren.
|
||||||
A negative ARG encloses the preceding ARG sexps instead.
|
A negative ARG encloses the preceding ARG sexps instead.
|
||||||
No argument is equivalent to zero: just insert `()' and leave point between.
|
No argument is equivalent to zero: just insert `()' and leave point between.
|
||||||
If `parens-require-spaces' is non-nil, this command also inserts a space
|
If `parens-require-spaces' is non-nil, this command also inserts a space
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
;;; re-builder.el --- building Regexps with visual feedback
|
;;; re-builder.el --- building Regexps with visual feedback
|
||||||
|
|
||||||
;; Copyright (C) 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
|
;; Copyright (C) 1999, 2000, 2001, 2002, 2004, 2005 Free Software Foundation, Inc.
|
||||||
|
|
||||||
;; Author: Detlev Zundel <dzu@gnu.org>
|
;; Author: Detlev Zundel <dzu@gnu.org>
|
||||||
;; Keywords: matching, lisp, tools
|
;; Keywords: matching, lisp, tools
|
||||||
|
|
@ -177,7 +177,9 @@ Set it to nil if you don't want limits here."
|
||||||
:group 're-builder)
|
:group 're-builder)
|
||||||
|
|
||||||
(defface reb-match-3
|
(defface reb-match-3
|
||||||
'((((class color) (background light))
|
'((((min-colors 88) (class color) (background light))
|
||||||
|
:background "yellow1")
|
||||||
|
(((class color) (background light))
|
||||||
:background "yellow")
|
:background "yellow")
|
||||||
(((class color) (background dark))
|
(((class color) (background dark))
|
||||||
:background "sienna4")
|
:background "sienna4")
|
||||||
|
|
|
||||||
|
|
@ -1307,6 +1307,7 @@ highlight the region using `transient-mark-mode'), and typed text replaces
|
||||||
the active selection. C-z, C-x, C-c, and C-v will undo, cut, copy, and
|
the active selection. C-z, C-x, C-c, and C-v will undo, cut, copy, and
|
||||||
paste (in addition to the normal emacs bindings)."
|
paste (in addition to the normal emacs bindings)."
|
||||||
:global t
|
:global t
|
||||||
|
:group 'cua
|
||||||
:set-after '(cua-enable-modeline-indications cua-use-hyper-key)
|
:set-after '(cua-enable-modeline-indications cua-use-hyper-key)
|
||||||
:require 'cua-base
|
:require 'cua-base
|
||||||
:link '(emacs-commentary-link "cua-base.el")
|
:link '(emacs-commentary-link "cua-base.el")
|
||||||
|
|
|
||||||
20
lisp/ffap.el
20
lisp/ffap.el
|
|
@ -217,10 +217,13 @@ Sensible values are nil, \"news\", or \"mailto\"."
|
||||||
"*A regexp matching filename wildcard characters, or nil.
|
"*A regexp matching filename wildcard characters, or nil.
|
||||||
|
|
||||||
If `find-file-at-point' gets a filename matching this pattern,
|
If `find-file-at-point' gets a filename matching this pattern,
|
||||||
it passes it on to `find-file' with non-nil WILDCARDS argument,
|
and `ffap-pass-wildcards-to-dired' is nil, it passes it on to
|
||||||
which expands wildcards and visits multiple files. To visit
|
`find-file' with non-nil WILDCARDS argument, which expands
|
||||||
a file whose name contains wildcard characters you can suppress
|
wildcards and visits multiple files. To visit a file whose name
|
||||||
wildcard expansion by setting `find-file-wildcards'.
|
contains wildcard characters you can suppress wildcard expansion
|
||||||
|
by setting `find-file-wildcards'. If `find-file-at-point' gets a
|
||||||
|
filename matching this pattern and `ffap-pass-wildcards-to-dired'
|
||||||
|
is non-nil, it passes it on to `dired'.
|
||||||
|
|
||||||
If `dired-at-point' gets a filename matching this pattern,
|
If `dired-at-point' gets a filename matching this pattern,
|
||||||
it passes it on to `dired'."
|
it passes it on to `dired'."
|
||||||
|
|
@ -230,6 +233,11 @@ it passes it on to `dired'."
|
||||||
)
|
)
|
||||||
:group 'ffap)
|
:group 'ffap)
|
||||||
|
|
||||||
|
(defcustom ffap-pass-wildcards-to-dired nil
|
||||||
|
"*If non-nil, pass filenames matching `ffap-dired-wildcards' to dired."
|
||||||
|
:type 'boolean
|
||||||
|
:group 'ffap)
|
||||||
|
|
||||||
(defcustom ffap-newfile-prompt nil
|
(defcustom ffap-newfile-prompt nil
|
||||||
;; Suggestion from RHOGEE, 11 Jul 1994. Disabled, I think this is
|
;; Suggestion from RHOGEE, 11 Jul 1994. Disabled, I think this is
|
||||||
;; better handled by `find-file-not-found-hooks'.
|
;; better handled by `find-file-not-found-hooks'.
|
||||||
|
|
@ -1386,6 +1394,10 @@ See <ftp://ftp.mathcs.emory.edu/pub/mic/emacs/> for latest version."
|
||||||
((ffap-url-p filename)
|
((ffap-url-p filename)
|
||||||
(let (current-prefix-arg) ; w3 2.3.25 bug, reported by KPC
|
(let (current-prefix-arg) ; w3 2.3.25 bug, reported by KPC
|
||||||
(funcall ffap-url-fetcher filename)))
|
(funcall ffap-url-fetcher filename)))
|
||||||
|
((and ffap-pass-wildcards-to-dired
|
||||||
|
ffap-dired-wildcards
|
||||||
|
(string-match ffap-dired-wildcards filename))
|
||||||
|
(funcall ffap-directory-finder filename))
|
||||||
((and ffap-dired-wildcards
|
((and ffap-dired-wildcards
|
||||||
(string-match ffap-dired-wildcards filename)
|
(string-match ffap-dired-wildcards filename)
|
||||||
find-file-wildcards
|
find-file-wildcards
|
||||||
|
|
|
||||||
|
|
@ -250,8 +250,15 @@ key is supported."
|
||||||
; (customize-set-variable var val))
|
; (customize-set-variable var val))
|
||||||
; (filesets-build-menu))
|
; (filesets-build-menu))
|
||||||
|
|
||||||
|
;; It seems this is a workaround for the XEmacs issue described in the
|
||||||
|
;; doc-string of filesets-menu-ensure-use-cached. Under Emacs this is
|
||||||
|
;; essentially just `set-default'.
|
||||||
(defun filesets-set-default (sym val &optional init-flag)
|
(defun filesets-set-default (sym val &optional init-flag)
|
||||||
"Set-default wrapper function used in conjunction with `defcustom'."
|
"Set-default wrapper function used in conjunction with `defcustom'.
|
||||||
|
If SYM is in the list `filesets-ignore-next-set-default', delete
|
||||||
|
it from that list, and return nil. Otherwise, set the value of
|
||||||
|
SYM to VAL and return t. If INIT-FLAG is non-nil, set with
|
||||||
|
`custom-initialize-set', otherwise with `set-default'."
|
||||||
(let ((ignore-flag (member sym filesets-ignore-next-set-default)))
|
(let ((ignore-flag (member sym filesets-ignore-next-set-default)))
|
||||||
(if ignore-flag
|
(if ignore-flag
|
||||||
(setq filesets-ignore-next-set-default
|
(setq filesets-ignore-next-set-default
|
||||||
|
|
|
||||||
|
|
@ -148,7 +148,7 @@ buffer local value for `font-lock-defaults', via its mode hook.
|
||||||
The above is the default behavior of `font-lock-mode'; you may specify
|
The above is the default behavior of `font-lock-mode'; you may specify
|
||||||
your own function which is called when `font-lock-mode' is toggled via
|
your own function which is called when `font-lock-mode' is toggled via
|
||||||
`font-lock-function'. "
|
`font-lock-function'. "
|
||||||
nil nil nil
|
:group 'font-lock
|
||||||
;; Don't turn on Font Lock mode if we don't have a display (we're running a
|
;; Don't turn on Font Lock mode if we don't have a display (we're running a
|
||||||
;; batch job) or if the buffer is invisible (the name starts with a space).
|
;; batch job) or if the buffer is invisible (the name starts with a space).
|
||||||
(when (or noninteractive (eq (aref (buffer-name) 0) ?\ ))
|
(when (or noninteractive (eq (aref (buffer-name) 0) ?\ ))
|
||||||
|
|
|
||||||
|
|
@ -383,14 +383,14 @@ word \"bar\" following the word \"anchor\" then MATCH-ANCHORED may be required.
|
||||||
|
|
||||||
MATCH-HIGHLIGHT should be of the form:
|
MATCH-HIGHLIGHT should be of the form:
|
||||||
|
|
||||||
(MATCH FACENAME OVERRIDE LAXMATCH)
|
(MATCH FACENAME [[OVERRIDE [LAXMATCH]])
|
||||||
|
|
||||||
MATCH is the subexpression of MATCHER to be highlighted. FACENAME is an
|
MATCH is the subexpression of MATCHER to be highlighted. FACENAME is an
|
||||||
expression whose value is the face name to use. Face default attributes
|
expression whose value is the face name to use. Face default attributes
|
||||||
can be modified via \\[customize]. Instead of a face, FACENAME can
|
can be modified via \\[customize]. Instead of a face, FACENAME can
|
||||||
evaluate to a property list of the form (face VAL1 PROP2 VAL2 PROP3 VAL3 ...)
|
evaluate to a property list of the form (face FACE PROP1 VAL1 PROP2 VAL2 ...)
|
||||||
in which case all the listed text-properties will be set rather than
|
in which case all the listed text-properties will be set rather than
|
||||||
just `face'. In such a case, you will most likely want to put those
|
just FACE. In such a case, you will most likely want to put those
|
||||||
properties in `font-lock-extra-managed-props' or to override
|
properties in `font-lock-extra-managed-props' or to override
|
||||||
`font-lock-unfontify-region-function'.
|
`font-lock-unfontify-region-function'.
|
||||||
|
|
||||||
|
|
@ -426,7 +426,7 @@ the last, instance MATCH-ANCHORED's MATCHER is used. Therefore they can be
|
||||||
used to initialise before, and cleanup after, MATCHER is used. Typically,
|
used to initialise before, and cleanup after, MATCHER is used. Typically,
|
||||||
PRE-MATCH-FORM is used to move to some position relative to the original
|
PRE-MATCH-FORM is used to move to some position relative to the original
|
||||||
MATCHER, before starting with MATCH-ANCHORED's MATCHER. POST-MATCH-FORM might
|
MATCHER, before starting with MATCH-ANCHORED's MATCHER. POST-MATCH-FORM might
|
||||||
be used to move, before resuming with MATCH-ANCHORED's parent's MATCHER.
|
be used to move back, before resuming with MATCH-ANCHORED's parent's MATCHER.
|
||||||
|
|
||||||
For example, an element of the form highlights (if not already highlighted):
|
For example, an element of the form highlights (if not already highlighted):
|
||||||
|
|
||||||
|
|
@ -436,7 +436,7 @@ For example, an element of the form highlights (if not already highlighted):
|
||||||
discrete occurrences of \"item\" (on the same line) in the value of `item-face'.
|
discrete occurrences of \"item\" (on the same line) in the value of `item-face'.
|
||||||
(Here PRE-MATCH-FORM and POST-MATCH-FORM are nil. Therefore \"item\" is
|
(Here PRE-MATCH-FORM and POST-MATCH-FORM are nil. Therefore \"item\" is
|
||||||
initially searched for starting from the end of the match of \"anchor\", and
|
initially searched for starting from the end of the match of \"anchor\", and
|
||||||
searching for subsequent instance of \"anchor\" resumes from where searching
|
searching for subsequent instances of \"anchor\" resumes from where searching
|
||||||
for \"item\" concluded.)
|
for \"item\" concluded.)
|
||||||
|
|
||||||
The above-mentioned exception is as follows. The limit of the MATCHER search
|
The above-mentioned exception is as follows. The limit of the MATCHER search
|
||||||
|
|
@ -1657,7 +1657,7 @@ Sets various variables using `font-lock-defaults' (or, if nil, using
|
||||||
'((((class grayscale) (background light)) (:foreground "LightGray" :weight bold))
|
'((((class grayscale) (background light)) (:foreground "LightGray" :weight bold))
|
||||||
(((class grayscale) (background dark)) (:foreground "DimGray" :weight bold))
|
(((class grayscale) (background dark)) (:foreground "DimGray" :weight bold))
|
||||||
(((class color) (min-colors 88) (background light)) (:foreground "Purple"))
|
(((class color) (min-colors 88) (background light)) (:foreground "Purple"))
|
||||||
(((class color) (min-colors 88) (background dark)) (:foreground "Cyan"))
|
(((class color) (min-colors 88) (background dark)) (:foreground "Cyan1"))
|
||||||
(((class color) (min-colors 16) (background light)) (:foreground "Purple"))
|
(((class color) (min-colors 16) (background light)) (:foreground "Purple"))
|
||||||
(((class color) (min-colors 16) (background dark)) (:foreground "Cyan"))
|
(((class color) (min-colors 16) (background dark)) (:foreground "Cyan"))
|
||||||
(((class color) (min-colors 8)) (:foreground "cyan" :weight bold))
|
(((class color) (min-colors 8)) (:foreground "cyan" :weight bold))
|
||||||
|
|
@ -1678,7 +1678,7 @@ Sets various variables using `font-lock-defaults' (or, if nil, using
|
||||||
:group 'font-lock-highlighting-faces)
|
:group 'font-lock-highlighting-faces)
|
||||||
|
|
||||||
(defface font-lock-function-name-face
|
(defface font-lock-function-name-face
|
||||||
'((((class color) (min-colors 88) (background light)) (:foreground "Blue"))
|
'((((class color) (min-colors 88) (background light)) (:foreground "Blue1"))
|
||||||
(((class color) (min-colors 88) (background dark)) (:foreground "LightSkyBlue"))
|
(((class color) (min-colors 88) (background dark)) (:foreground "LightSkyBlue"))
|
||||||
(((class color) (min-colors 16) (background light)) (:foreground "Blue"))
|
(((class color) (min-colors 16) (background light)) (:foreground "Blue"))
|
||||||
(((class color) (min-colors 16) (background dark)) (:foreground "LightSkyBlue"))
|
(((class color) (min-colors 16) (background dark)) (:foreground "LightSkyBlue"))
|
||||||
|
|
@ -1728,7 +1728,7 @@ Sets various variables using `font-lock-defaults' (or, if nil, using
|
||||||
:group 'font-lock-highlighting-faces)
|
:group 'font-lock-highlighting-faces)
|
||||||
|
|
||||||
(defface font-lock-warning-face
|
(defface font-lock-warning-face
|
||||||
'((((class color) (min-colors 88) (background light)) (:foreground "Red" :weight bold))
|
'((((class color) (min-colors 88) (background light)) (:foreground "Red1" :weight bold))
|
||||||
(((class color) (min-colors 88) (background dark)) (:foreground "Pink" :weight bold))
|
(((class color) (min-colors 88) (background dark)) (:foreground "Pink" :weight bold))
|
||||||
(((class color) (min-colors 16) (background light)) (:foreground "Red" :weight bold))
|
(((class color) (min-colors 16) (background light)) (:foreground "Red" :weight bold))
|
||||||
(((class color) (min-colors 16) (background dark)) (:foreground "Pink" :weight bold))
|
(((class color) (min-colors 16) (background dark)) (:foreground "Pink" :weight bold))
|
||||||
|
|
|
||||||
|
|
@ -170,7 +170,8 @@ generic-x to enable the specified modes."
|
||||||
'((nil "^\\([-A-Za-z0-9_]+\\)" 1)
|
'((nil "^\\([-A-Za-z0-9_]+\\)" 1)
|
||||||
("*Directories*" "^\\s-*<Directory\\s-*\\([^>]+\\)>" 1)
|
("*Directories*" "^\\s-*<Directory\\s-*\\([^>]+\\)>" 1)
|
||||||
("*Locations*" "^\\s-*<Location\\s-*\\([^>]+\\)>" 1))))))
|
("*Locations*" "^\\s-*<Location\\s-*\\([^>]+\\)>" 1))))))
|
||||||
"Generic mode for Apache or HTTPD configuration files."))
|
"Generic mode for Apache or HTTPD configuration files."
|
||||||
|
:group 'generic-x))
|
||||||
|
|
||||||
(when (memq 'apache-log-generic-mode generic-extras-enable-list)
|
(when (memq 'apache-log-generic-mode generic-extras-enable-list)
|
||||||
|
|
||||||
|
|
@ -183,7 +184,8 @@ generic-x to enable the specified modes."
|
||||||
(2 font-lock-variable-name-face)))
|
(2 font-lock-variable-name-face)))
|
||||||
'("access_log\\'")
|
'("access_log\\'")
|
||||||
nil
|
nil
|
||||||
"Mode for Apache log files"))
|
"Mode for Apache log files"
|
||||||
|
:group 'generic-x))
|
||||||
|
|
||||||
;;; Samba
|
;;; Samba
|
||||||
(when (memq 'samba-generic-mode generic-extras-enable-list)
|
(when (memq 'samba-generic-mode generic-extras-enable-list)
|
||||||
|
|
@ -197,7 +199,8 @@ generic-x to enable the specified modes."
|
||||||
(2 font-lock-type-face)))
|
(2 font-lock-type-face)))
|
||||||
'("smb\\.conf\\'")
|
'("smb\\.conf\\'")
|
||||||
'(generic-bracket-support)
|
'(generic-bracket-support)
|
||||||
"Generic mode for Samba configuration files."))
|
"Generic mode for Samba configuration files."
|
||||||
|
:group 'generic-x))
|
||||||
|
|
||||||
;;; Fvwm
|
;;; Fvwm
|
||||||
;; This is pretty basic. Also, modes for other window managers could
|
;; This is pretty basic. Also, modes for other window managers could
|
||||||
|
|
@ -222,7 +225,8 @@ generic-x to enable the specified modes."
|
||||||
nil
|
nil
|
||||||
'("\\.fvwmrc\\'" "\\.fvwm2rc\\'")
|
'("\\.fvwmrc\\'" "\\.fvwm2rc\\'")
|
||||||
nil
|
nil
|
||||||
"Generic mode for FVWM configuration files."))
|
"Generic mode for FVWM configuration files."
|
||||||
|
:group 'generic-x))
|
||||||
|
|
||||||
;;; X Resource
|
;;; X Resource
|
||||||
;; I'm pretty sure I've seen an actual mode to do this, but I don't
|
;; I'm pretty sure I've seen an actual mode to do this, but I don't
|
||||||
|
|
@ -235,7 +239,8 @@ generic-x to enable the specified modes."
|
||||||
'(("^\\([^:\n]+:\\)" 1 font-lock-variable-name-face))
|
'(("^\\([^:\n]+:\\)" 1 font-lock-variable-name-face))
|
||||||
'("\\.Xdefaults\\'" "\\.Xresources\\'" "\\.Xenvironment\\'" "\\.ad\\'")
|
'("\\.Xdefaults\\'" "\\.Xresources\\'" "\\.Xenvironment\\'" "\\.ad\\'")
|
||||||
nil
|
nil
|
||||||
"Generic mode for X Resource configuration files."))
|
"Generic mode for X Resource configuration files."
|
||||||
|
:group 'generic-x))
|
||||||
|
|
||||||
;;; Hosts
|
;;; Hosts
|
||||||
(when (memq 'hosts-generic-mode generic-extras-enable-list)
|
(when (memq 'hosts-generic-mode generic-extras-enable-list)
|
||||||
|
|
@ -246,7 +251,8 @@ generic-x to enable the specified modes."
|
||||||
'(("\\([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+\\)" 1 font-lock-constant-face))
|
'(("\\([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+\\)" 1 font-lock-constant-face))
|
||||||
'("[hH][oO][sS][tT][sS]\\'")
|
'("[hH][oO][sS][tT][sS]\\'")
|
||||||
nil
|
nil
|
||||||
"Generic mode for HOSTS files."))
|
"Generic mode for HOSTS files."
|
||||||
|
:group 'generic-x))
|
||||||
|
|
||||||
;;; Windows INF files
|
;;; Windows INF files
|
||||||
(when (memq 'inf-generic-mode generic-extras-enable-list)
|
(when (memq 'inf-generic-mode generic-extras-enable-list)
|
||||||
|
|
@ -257,7 +263,8 @@ generic-x to enable the specified modes."
|
||||||
'(("^\\(\\[.*\\]\\)" 1 font-lock-constant-face))
|
'(("^\\(\\[.*\\]\\)" 1 font-lock-constant-face))
|
||||||
'("\\.[iI][nN][fF]\\'")
|
'("\\.[iI][nN][fF]\\'")
|
||||||
'(generic-bracket-support)
|
'(generic-bracket-support)
|
||||||
"Generic mode for MS-Windows INF files."))
|
"Generic mode for MS-Windows INF files."
|
||||||
|
:group 'generic-x))
|
||||||
|
|
||||||
;;; Windows INI files
|
;;; Windows INI files
|
||||||
;; Should define escape character as well!
|
;; Should define escape character as well!
|
||||||
|
|
@ -277,7 +284,8 @@ generic-x to enable the specified modes."
|
||||||
(setq imenu-generic-expression
|
(setq imenu-generic-expression
|
||||||
'((nil "^\\[\\(.*\\)\\]" 1)
|
'((nil "^\\[\\(.*\\)\\]" 1)
|
||||||
("*Variables*" "^\\s-*\\([^=]+\\)\\s-*=" 1))))))
|
("*Variables*" "^\\s-*\\([^=]+\\)\\s-*=" 1))))))
|
||||||
"Generic mode for MS-Windows INI files."))
|
"Generic mode for MS-Windows INI files."
|
||||||
|
:group 'generic-x))
|
||||||
|
|
||||||
;;; Windows REG files
|
;;; Windows REG files
|
||||||
;;; Unfortunately, Windows 95 and Windows NT have different REG file syntax!
|
;;; Unfortunately, Windows 95 and Windows NT have different REG file syntax!
|
||||||
|
|
@ -294,7 +302,8 @@ generic-x to enable the specified modes."
|
||||||
(lambda ()
|
(lambda ()
|
||||||
(setq imenu-generic-expression
|
(setq imenu-generic-expression
|
||||||
'((nil "^\\s-*\\(.*\\)\\s-*=" 1))))))
|
'((nil "^\\s-*\\(.*\\)\\s-*=" 1))))))
|
||||||
"Generic mode for MS-Windows Registry files."))
|
"Generic mode for MS-Windows Registry files."
|
||||||
|
:group 'generic-x))
|
||||||
|
|
||||||
;;; DOS/Windows BAT files
|
;;; DOS/Windows BAT files
|
||||||
(when (memq 'bat-generic-mode generic-extras-enable-list)
|
(when (memq 'bat-generic-mode generic-extras-enable-list)
|
||||||
|
|
@ -368,7 +377,8 @@ generic-x to enable the specified modes."
|
||||||
"\\`[cC][oO][nN][fF][iI][gG]\\."
|
"\\`[cC][oO][nN][fF][iI][gG]\\."
|
||||||
"\\`[aA][uU][tT][oO][eE][xX][eE][cC]\\.")
|
"\\`[aA][uU][tT][oO][eE][xX][eE][cC]\\.")
|
||||||
'(generic-bat-mode-setup-function)
|
'(generic-bat-mode-setup-function)
|
||||||
"Generic mode for MS-Windows BAT files.")
|
"Generic mode for MS-Windows BAT files."
|
||||||
|
:group 'generic-x)
|
||||||
|
|
||||||
(defvar bat-generic-mode-syntax-table nil
|
(defvar bat-generic-mode-syntax-table nil
|
||||||
"Syntax table in use in bat-generic-mode buffers.")
|
"Syntax table in use in bat-generic-mode buffers.")
|
||||||
|
|
@ -446,7 +456,8 @@ generic-x to enable the specified modes."
|
||||||
(lambda ()
|
(lambda ()
|
||||||
(setq imenu-generic-expression
|
(setq imenu-generic-expression
|
||||||
'((nil "\\s-/\\([^/]+\\)/[i, \t\n]" 1))))))
|
'((nil "\\s-/\\([^/]+\\)/[i, \t\n]" 1))))))
|
||||||
"Mode for Mailagent rules files."))
|
"Mode for Mailagent rules files."
|
||||||
|
:group 'generic-x))
|
||||||
|
|
||||||
;; Solaris/Sys V prototype files
|
;; Solaris/Sys V prototype files
|
||||||
(when (memq 'prototype-generic-mode generic-extras-enable-list)
|
(when (memq 'prototype-generic-mode generic-extras-enable-list)
|
||||||
|
|
@ -469,7 +480,8 @@ generic-x to enable the specified modes."
|
||||||
(2 font-lock-variable-name-face)))
|
(2 font-lock-variable-name-face)))
|
||||||
'("prototype\\'")
|
'("prototype\\'")
|
||||||
nil
|
nil
|
||||||
"Mode for Sys V prototype files."))
|
"Mode for Sys V prototype files."
|
||||||
|
:group 'generic-x))
|
||||||
|
|
||||||
;; Solaris/Sys V pkginfo files
|
;; Solaris/Sys V pkginfo files
|
||||||
(when (memq 'pkginfo-generic-mode generic-extras-enable-list)
|
(when (memq 'pkginfo-generic-mode generic-extras-enable-list)
|
||||||
|
|
@ -482,7 +494,8 @@ generic-x to enable the specified modes."
|
||||||
(2 font-lock-variable-name-face)))
|
(2 font-lock-variable-name-face)))
|
||||||
'("pkginfo\\'")
|
'("pkginfo\\'")
|
||||||
nil
|
nil
|
||||||
"Mode for Sys V pkginfo files."))
|
"Mode for Sys V pkginfo files."
|
||||||
|
:group 'generic-x))
|
||||||
|
|
||||||
;; Javascript mode
|
;; Javascript mode
|
||||||
;; Includes extra keywords from Armando Singer [asinger@MAIL.COLGATE.EDU]
|
;; Includes extra keywords from Armando Singer [asinger@MAIL.COLGATE.EDU]
|
||||||
|
|
@ -559,7 +572,8 @@ generic-x to enable the specified modes."
|
||||||
(setq imenu-generic-expression
|
(setq imenu-generic-expression
|
||||||
'((nil "^function\\s-+\\([A-Za-z0-9_]+\\)" 1)
|
'((nil "^function\\s-+\\([A-Za-z0-9_]+\\)" 1)
|
||||||
("*Variables*" "^var\\s-+\\([A-Za-z0-9_]+\\)" 1))))))
|
("*Variables*" "^var\\s-+\\([A-Za-z0-9_]+\\)" 1))))))
|
||||||
"Mode for JavaScript files.")
|
"Mode for JavaScript files."
|
||||||
|
:group 'generic-x)
|
||||||
|
|
||||||
;; VRML files
|
;; VRML files
|
||||||
(define-generic-mode vrml-generic-mode
|
(define-generic-mode vrml-generic-mode
|
||||||
|
|
@ -610,7 +624,8 @@ generic-x to enable the specified modes."
|
||||||
("*Definitions*"
|
("*Definitions*"
|
||||||
"DEF\\s-+\\([-A-Za-z0-9_]+\\)\\s-+\\([A-Za-z0-9]+\\)\\s-*{"
|
"DEF\\s-+\\([-A-Za-z0-9_]+\\)\\s-+\\([A-Za-z0-9]+\\)\\s-*{"
|
||||||
1))))))
|
1))))))
|
||||||
"Generic Mode for VRML files.")
|
"Generic Mode for VRML files."
|
||||||
|
:group 'generic-x)
|
||||||
|
|
||||||
;; Java Manifests
|
;; Java Manifests
|
||||||
(define-generic-mode java-manifest-generic-mode
|
(define-generic-mode java-manifest-generic-mode
|
||||||
|
|
@ -629,7 +644,8 @@ generic-x to enable the specified modes."
|
||||||
(2 font-lock-constant-face)))
|
(2 font-lock-constant-face)))
|
||||||
'("[mM][aA][nN][iI][fF][eE][sS][tT]\\.[mM][fF]\\'")
|
'("[mM][aA][nN][iI][fF][eE][sS][tT]\\.[mM][fF]\\'")
|
||||||
nil
|
nil
|
||||||
"Mode for Java Manifest files")
|
"Mode for Java Manifest files"
|
||||||
|
:group 'generic-x)
|
||||||
|
|
||||||
;; Java properties files
|
;; Java properties files
|
||||||
(define-generic-mode java-properties-generic-mode
|
(define-generic-mode java-properties-generic-mode
|
||||||
|
|
@ -659,7 +675,8 @@ generic-x to enable the specified modes."
|
||||||
(lambda ()
|
(lambda ()
|
||||||
(setq imenu-generic-expression
|
(setq imenu-generic-expression
|
||||||
'((nil "^\\([^#! \t\n\r=:]+\\)" 1))))))
|
'((nil "^\\([^#! \t\n\r=:]+\\)" 1))))))
|
||||||
"Mode for Java properties files.")
|
"Mode for Java properties files."
|
||||||
|
:group 'generic-x)
|
||||||
|
|
||||||
;; C shell alias definitions
|
;; C shell alias definitions
|
||||||
(when (memq 'alias-generic-mode generic-extras-enable-list)
|
(when (memq 'alias-generic-mode generic-extras-enable-list)
|
||||||
|
|
@ -677,7 +694,8 @@ generic-x to enable the specified modes."
|
||||||
(lambda ()
|
(lambda ()
|
||||||
(setq imenu-generic-expression
|
(setq imenu-generic-expression
|
||||||
'((nil "^\\(alias\\|unalias\\)\\s-+\\([-a-zA-Z0-9_]+\\)" 2))))))
|
'((nil "^\\(alias\\|unalias\\)\\s-+\\([-a-zA-Z0-9_]+\\)" 2))))))
|
||||||
"Mode for C Shell alias files."))
|
"Mode for C Shell alias files."
|
||||||
|
:group 'generic-x))
|
||||||
|
|
||||||
;;; Windows RC files
|
;;; Windows RC files
|
||||||
;; Contributed by ACorreir@pervasive-sw.com (Alfred Correira)
|
;; Contributed by ACorreir@pervasive-sw.com (Alfred Correira)
|
||||||
|
|
@ -769,7 +787,8 @@ generic-x to enable the specified modes."
|
||||||
(2 font-lock-variable-name-face nil t))))
|
(2 font-lock-variable-name-face nil t))))
|
||||||
'("\\.[rR][cC]$")
|
'("\\.[rR][cC]$")
|
||||||
nil
|
nil
|
||||||
"Generic mode for MS-Windows Resource files."))
|
"Generic mode for MS-Windows Resource files."
|
||||||
|
:group 'generic-x))
|
||||||
|
|
||||||
;; InstallShield RUL files
|
;; InstallShield RUL files
|
||||||
;; Contributed by Alfred.Correira@Pervasive.Com
|
;; Contributed by Alfred.Correira@Pervasive.Com
|
||||||
|
|
@ -1389,7 +1408,8 @@ generic-x to enable the specified modes."
|
||||||
font-lock-variable-name-face "[^_]" "[^_]"))) ; is this face the best choice?
|
font-lock-variable-name-face "[^_]" "[^_]"))) ; is this face the best choice?
|
||||||
'("\\.[rR][uU][lL]$")
|
'("\\.[rR][uU][lL]$")
|
||||||
'(generic-rul-mode-setup-function)
|
'(generic-rul-mode-setup-function)
|
||||||
"Generic mode for InstallShield RUL files.")
|
"Generic mode for InstallShield RUL files."
|
||||||
|
:group 'generic-x)
|
||||||
|
|
||||||
(define-skeleton rul-if
|
(define-skeleton rul-if
|
||||||
"Insert an if statement."
|
"Insert an if statement."
|
||||||
|
|
@ -1437,7 +1457,8 @@ generic-x to enable the specified modes."
|
||||||
(2 font-lock-variable-name-face)))
|
(2 font-lock-variable-name-face)))
|
||||||
'("\\.mailrc\\'")
|
'("\\.mailrc\\'")
|
||||||
nil
|
nil
|
||||||
"Mode for mailrc files.")
|
"Mode for mailrc files."
|
||||||
|
:group 'generic-x)
|
||||||
|
|
||||||
;; Inetd.conf
|
;; Inetd.conf
|
||||||
(when (memq 'inetd-conf-generic-mode generic-extras-enable-list)
|
(when (memq 'inetd-conf-generic-mode generic-extras-enable-list)
|
||||||
|
|
@ -1457,7 +1478,8 @@ generic-x to enable the specified modes."
|
||||||
(function
|
(function
|
||||||
(lambda ()
|
(lambda ()
|
||||||
(setq imenu-generic-expression
|
(setq imenu-generic-expression
|
||||||
'((nil "^\\([-A-Za-z0-9_]+\\)" 1))))))))
|
'((nil "^\\([-A-Za-z0-9_]+\\)" 1))))))
|
||||||
|
:group 'generic-x))
|
||||||
|
|
||||||
;; Services
|
;; Services
|
||||||
(when (memq 'etc-services-generic-mode generic-extras-enable-list)
|
(when (memq 'etc-services-generic-mode generic-extras-enable-list)
|
||||||
|
|
@ -1475,7 +1497,8 @@ generic-x to enable the specified modes."
|
||||||
(function
|
(function
|
||||||
(lambda ()
|
(lambda ()
|
||||||
(setq imenu-generic-expression
|
(setq imenu-generic-expression
|
||||||
'((nil "^\\([-A-Za-z0-9_]+\\)" 1))))))))
|
'((nil "^\\([-A-Za-z0-9_]+\\)" 1))))))
|
||||||
|
:group 'generic-x))
|
||||||
|
|
||||||
;; Password and Group files
|
;; Password and Group files
|
||||||
(when (memq 'etc-passwd-generic-mode generic-extras-enable-list)
|
(when (memq 'etc-passwd-generic-mode generic-extras-enable-list)
|
||||||
|
|
@ -1517,7 +1540,8 @@ generic-x to enable the specified modes."
|
||||||
(function
|
(function
|
||||||
(lambda ()
|
(lambda ()
|
||||||
(setq imenu-generic-expression
|
(setq imenu-generic-expression
|
||||||
'((nil "^\\([-A-Za-z0-9_]+\\):" 1))))))))
|
'((nil "^\\([-A-Za-z0-9_]+\\):" 1))))))
|
||||||
|
:group 'generic-x))
|
||||||
|
|
||||||
;; Fstab
|
;; Fstab
|
||||||
(when (memq 'etc-fstab-generic-mode generic-extras-enable-list)
|
(when (memq 'etc-fstab-generic-mode generic-extras-enable-list)
|
||||||
|
|
@ -1567,7 +1591,8 @@ generic-x to enable the specified modes."
|
||||||
(function
|
(function
|
||||||
(lambda ()
|
(lambda ()
|
||||||
(setq imenu-generic-expression
|
(setq imenu-generic-expression
|
||||||
'((nil "^\\([/-A-Za-z0-9_]+\\)\\s-+" 1))))))))
|
'((nil "^\\([/-A-Za-z0-9_]+\\)\\s-+" 1))))))
|
||||||
|
:group 'generic-x))
|
||||||
|
|
||||||
;; From Jacques Duthen <jacques.duthen@sncf.fr>
|
;; From Jacques Duthen <jacques.duthen@sncf.fr>
|
||||||
(eval-when-compile
|
(eval-when-compile
|
||||||
|
|
@ -1587,20 +1612,20 @@ generic-x to enable the specified modes."
|
||||||
(defface show-tabs-tab-face
|
(defface show-tabs-tab-face
|
||||||
'((((class grayscale) (background light)) (:background "DimGray" :weight bold))
|
'((((class grayscale) (background light)) (:background "DimGray" :weight bold))
|
||||||
(((class grayscale) (background dark)) (:background "LightGray" :weight bold))
|
(((class grayscale) (background dark)) (:background "LightGray" :weight bold))
|
||||||
(((class color) (background light)) (:background "red"))
|
(((class color) (min-colors 88)) (:background "red1"))
|
||||||
(((class color) (background dark)) (:background "red"))
|
(((class color)) (:background "red"))
|
||||||
(t (:weight bold)))
|
(t (:weight bold)))
|
||||||
"Font Lock mode face used to highlight TABs."
|
"Font Lock mode face used to highlight TABs."
|
||||||
:group 'show-tabs)
|
:group 'generic-x)
|
||||||
|
|
||||||
(defface show-tabs-space-face
|
(defface show-tabs-space-face
|
||||||
'((((class grayscale) (background light)) (:background "DimGray" :weight bold))
|
'((((class grayscale) (background light)) (:background "DimGray" :weight bold))
|
||||||
(((class grayscale) (background dark)) (:background "LightGray" :weight bold))
|
(((class grayscale) (background dark)) (:background "LightGray" :weight bold))
|
||||||
(((class color) (background light)) (:background "yellow"))
|
(((class color) (min-colors 88)) (:background "yellow1"))
|
||||||
(((class color) (background dark)) (:background "yellow"))
|
(((class color)) (:background "yellow"))
|
||||||
(t (:weight bold)))
|
(t (:weight bold)))
|
||||||
"Font Lock mode face used to highlight spaces."
|
"Font Lock mode face used to highlight spaces."
|
||||||
:group 'show-tabs)
|
:group 'generic-x)
|
||||||
|
|
||||||
(define-generic-mode show-tabs-generic-mode
|
(define-generic-mode show-tabs-generic-mode
|
||||||
nil ;; no comment char
|
nil ;; no comment char
|
||||||
|
|
@ -1609,7 +1634,8 @@ generic-x to enable the specified modes."
|
||||||
nil ;; no auto-mode-alist
|
nil ;; no auto-mode-alist
|
||||||
;; '(show-tabs-generic-mode-hook-fun)
|
;; '(show-tabs-generic-mode-hook-fun)
|
||||||
nil
|
nil
|
||||||
"Generic mode to show tabs and trailing spaces")
|
"Generic mode to show tabs and trailing spaces"
|
||||||
|
:group 'generic-x)
|
||||||
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
;; DNS modes
|
;; DNS modes
|
||||||
|
|
@ -1630,7 +1656,8 @@ generic-x to enable the specified modes."
|
||||||
;; List of additional automode-alist expressions
|
;; List of additional automode-alist expressions
|
||||||
'("/etc/named.boot\\'")
|
'("/etc/named.boot\\'")
|
||||||
;; List of set up functions to call
|
;; List of set up functions to call
|
||||||
nil)
|
nil
|
||||||
|
:group 'generic-x)
|
||||||
|
|
||||||
(define-generic-mode named-database-generic-mode
|
(define-generic-mode named-database-generic-mode
|
||||||
;; List of comment characters
|
;; List of comment characters
|
||||||
|
|
@ -1643,7 +1670,8 @@ generic-x to enable the specified modes."
|
||||||
;; List of additional automode-alist expressions
|
;; List of additional automode-alist expressions
|
||||||
nil
|
nil
|
||||||
;; List of set up functions to call
|
;; List of set up functions to call
|
||||||
nil)
|
nil
|
||||||
|
:group 'generic-x)
|
||||||
|
|
||||||
(defvar named-database-time-string "%Y%m%d%H"
|
(defvar named-database-time-string "%Y%m%d%H"
|
||||||
"Timestring for named serial numbers.")
|
"Timestring for named serial numbers.")
|
||||||
|
|
@ -1663,7 +1691,8 @@ generic-x to enable the specified modes."
|
||||||
;; List of additional automode-alist expressions
|
;; List of additional automode-alist expressions
|
||||||
'("/etc/resolv[e]?.conf\\'")
|
'("/etc/resolv[e]?.conf\\'")
|
||||||
;; List of set up functions to call
|
;; List of set up functions to call
|
||||||
nil)
|
nil
|
||||||
|
:group 'generic-x)
|
||||||
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
;; Modes for spice and common electrical engineering circuit netlist formats
|
;; Modes for spice and common electrical engineering circuit netlist formats
|
||||||
|
|
@ -1705,7 +1734,8 @@ generic-x to enable the specified modes."
|
||||||
(function
|
(function
|
||||||
(lambda()
|
(lambda()
|
||||||
(setq font-lock-defaults '(generic-font-lock-keywords nil t)))))
|
(setq font-lock-defaults '(generic-font-lock-keywords nil t)))))
|
||||||
"Generic mode for SPICE circuit netlist files.")
|
"Generic mode for SPICE circuit netlist files."
|
||||||
|
:group 'generic-x)
|
||||||
|
|
||||||
(define-generic-mode ibis-generic-mode
|
(define-generic-mode ibis-generic-mode
|
||||||
'(?|)
|
'(?|)
|
||||||
|
|
@ -1714,7 +1744,8 @@ generic-x to enable the specified modes."
|
||||||
("\\(\\(_\\|\\w\\)+\\)\\s-*=" 1 font-lock-variable-name-face))
|
("\\(\\(_\\|\\w\\)+\\)\\s-*=" 1 font-lock-variable-name-face))
|
||||||
'("\\.[iI][bB][sS]\\'")
|
'("\\.[iI][bB][sS]\\'")
|
||||||
'(generic-bracket-support)
|
'(generic-bracket-support)
|
||||||
"Generic mode for IBIS circuit netlist files.")
|
"Generic mode for IBIS circuit netlist files."
|
||||||
|
:group 'generic-x)
|
||||||
|
|
||||||
(define-generic-mode astap-generic-mode
|
(define-generic-mode astap-generic-mode
|
||||||
nil
|
nil
|
||||||
|
|
@ -1749,7 +1780,8 @@ generic-x to enable the specified modes."
|
||||||
(function
|
(function
|
||||||
(lambda()
|
(lambda()
|
||||||
(setq font-lock-defaults '(generic-font-lock-keywords nil t)))))
|
(setq font-lock-defaults '(generic-font-lock-keywords nil t)))))
|
||||||
"Generic mode for ASTAP circuit netlist files.")
|
"Generic mode for ASTAP circuit netlist files."
|
||||||
|
:group 'generic-x)
|
||||||
|
|
||||||
(define-generic-mode etc-modules-conf-generic-mode
|
(define-generic-mode etc-modules-conf-generic-mode
|
||||||
;; List of comment characters
|
;; List of comment characters
|
||||||
|
|
@ -1791,7 +1823,8 @@ generic-x to enable the specified modes."
|
||||||
;; List of additional automode-alist expressions
|
;; List of additional automode-alist expressions
|
||||||
'("/etc/modules.conf" "/etc/conf.modules")
|
'("/etc/modules.conf" "/etc/conf.modules")
|
||||||
;; List of set up functions to call
|
;; List of set up functions to call
|
||||||
nil)
|
nil
|
||||||
|
:group 'generic-x)
|
||||||
|
|
||||||
(provide 'generic-x)
|
(provide 'generic-x)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -185,7 +185,8 @@ the regexp in `generic-find-file-regexp'. If the value is nil,
|
||||||
;;;###autoload
|
;;;###autoload
|
||||||
(defmacro define-generic-mode (mode comment-list keyword-list
|
(defmacro define-generic-mode (mode comment-list keyword-list
|
||||||
font-lock-list auto-mode-list
|
font-lock-list auto-mode-list
|
||||||
function-list &optional docstring)
|
function-list &optional docstring
|
||||||
|
&rest custom-keyword-args)
|
||||||
"Create a new generic mode MODE.
|
"Create a new generic mode MODE.
|
||||||
|
|
||||||
MODE is the name of the command for the generic mode; it need not
|
MODE is the name of the command for the generic mode; it need not
|
||||||
|
|
@ -216,22 +217,42 @@ as soon as `define-generic-mode' is called.
|
||||||
FUNCTION-LIST is a list of functions to call to do some
|
FUNCTION-LIST is a list of functions to call to do some
|
||||||
additional setup.
|
additional setup.
|
||||||
|
|
||||||
|
The optional CUSTOM-KEYWORD-ARGS are pairs of keywords and
|
||||||
|
values. They will be passed to the generated `defcustom' form of
|
||||||
|
the mode hook variable MODE-hook. Defaults to MODE without the
|
||||||
|
possible trailing \"-mode\". (This default may not be a valid
|
||||||
|
customization group defined with `defgroup'. Make sure it is.)
|
||||||
|
You can specify keyword arguments without specifying a docstring.
|
||||||
|
|
||||||
See the file generic-x.el for some examples of `define-generic-mode'."
|
See the file generic-x.el for some examples of `define-generic-mode'."
|
||||||
(declare (debug (sexp def-form def-form def-form form def-form
|
(declare (debug (sexp def-form def-form def-form form def-form
|
||||||
&optional stringp))
|
[&optional stringp] &rest [keywordp form]))
|
||||||
(indent 1))
|
(indent 1))
|
||||||
|
|
||||||
;; Backward compatibility.
|
;; Backward compatibility.
|
||||||
(when (eq (car-safe mode) 'quote)
|
(when (eq (car-safe mode) 'quote)
|
||||||
(setq mode (eval mode)))
|
(setq mode (eval mode)))
|
||||||
(let* ((mode-name (symbol-name mode))
|
|
||||||
|
(when (and docstring (not (stringp docstring)))
|
||||||
|
;; DOCSTRING is not a string so we assume that it's actually the
|
||||||
|
;; first keyword of CUSTOM-KEYWORD-ARGS.
|
||||||
|
(push docstring custom-keyword-args)
|
||||||
|
(setq docstring nil))
|
||||||
|
|
||||||
|
(let* ((name (symbol-name mode))
|
||||||
(pretty-name (capitalize (replace-regexp-in-string
|
(pretty-name (capitalize (replace-regexp-in-string
|
||||||
"-mode\\'" "" mode-name)))
|
"-mode\\'" "" name)))
|
||||||
(mode-hook (intern (concat mode-name "-hook"))))
|
(mode-hook (intern (concat name "-hook"))))
|
||||||
|
|
||||||
|
(unless (plist-get custom-keyword-args :group)
|
||||||
|
(setq custom-keyword-args
|
||||||
|
(plist-put custom-keyword-args
|
||||||
|
:group `',(intern (replace-regexp-in-string
|
||||||
|
"-mode\\'" "" name)))))
|
||||||
|
|
||||||
`(progn
|
`(progn
|
||||||
;; Add a new entry.
|
;; Add a new entry.
|
||||||
(add-to-list 'generic-mode-list ,mode-name)
|
(add-to-list 'generic-mode-list ,name)
|
||||||
|
|
||||||
;; Add it to auto-mode-alist
|
;; Add it to auto-mode-alist
|
||||||
(dolist (re ,auto-mode-list)
|
(dolist (re ,auto-mode-list)
|
||||||
|
|
@ -240,9 +261,7 @@ See the file generic-x.el for some examples of `define-generic-mode'."
|
||||||
(defcustom ,mode-hook nil
|
(defcustom ,mode-hook nil
|
||||||
,(concat "Hook run when entering " pretty-name " mode.")
|
,(concat "Hook run when entering " pretty-name " mode.")
|
||||||
:type 'hook
|
:type 'hook
|
||||||
:group (or (custom-current-group)
|
,@custom-keyword-args)
|
||||||
',(intern (replace-regexp-in-string
|
|
||||||
"-mode\\'" "" mode-name))))
|
|
||||||
|
|
||||||
(defun ,mode ()
|
(defun ,mode ()
|
||||||
,(or docstring
|
,(or docstring
|
||||||
|
|
@ -256,10 +275,10 @@ See the file generic-x.el for some examples of `define-generic-mode'."
|
||||||
(defun generic-mode-internal (mode comment-list keyword-list
|
(defun generic-mode-internal (mode comment-list keyword-list
|
||||||
font-lock-list function-list)
|
font-lock-list function-list)
|
||||||
"Go into the generic mode MODE."
|
"Go into the generic mode MODE."
|
||||||
(let* ((mode-name (symbol-name mode))
|
(let* ((name (symbol-name mode))
|
||||||
(pretty-name (capitalize (replace-regexp-in-string
|
(pretty-name (capitalize (replace-regexp-in-string
|
||||||
"-mode\\'" "" mode-name)))
|
"-mode\\'" "" name)))
|
||||||
(mode-hook (intern (concat mode-name "-hook"))))
|
(mode-hook (intern (concat name "-hook"))))
|
||||||
|
|
||||||
(kill-all-local-variables)
|
(kill-all-local-variables)
|
||||||
|
|
||||||
|
|
@ -373,7 +392,7 @@ Some generic modes are defined in `generic-x.el'."
|
||||||
imenu-case-fold-search t))
|
imenu-case-fold-search t))
|
||||||
|
|
||||||
;; This generic mode is always defined
|
;; This generic mode is always defined
|
||||||
(define-generic-mode default-generic-mode (list ?#) nil nil nil nil)
|
(define-generic-mode default-generic-mode (list ?#) nil nil nil nil :group 'generic)
|
||||||
|
|
||||||
;; A more general solution would allow us to enter generic-mode for
|
;; A more general solution would allow us to enter generic-mode for
|
||||||
;; *any* comment character, but would require us to synthesize a new
|
;; *any* comment character, but would require us to synthesize a new
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,23 @@
|
||||||
|
2005-04-04 Reiner Steib <Reiner.Steib@gmx.de>
|
||||||
|
|
||||||
|
* message.el (message-make-date): Add defvars in order to silence
|
||||||
|
the byte compiler inside the defun.
|
||||||
|
|
||||||
|
* nnimap.el (nnimap-date-days-ago): Ditto.
|
||||||
|
|
||||||
|
* gnus-demon.el (parse-time-string): Added autoload.
|
||||||
|
|
||||||
|
* gnus-delay.el (parse-time-string): Added autoload.
|
||||||
|
|
||||||
|
* gnus-art.el (parse-time-string): Added autoload.
|
||||||
|
|
||||||
|
* nnultimate.el (parse-time): Require for `parse-time-string'.
|
||||||
|
|
||||||
|
2005-04-03 Katsumi Yamaoka <yamaoka@jpl.org>
|
||||||
|
|
||||||
|
* gnus-sum.el (gnus-summary-make-menu-bar): Avoid the
|
||||||
|
"Unrecognized menu descriptor" error in XEmacs.
|
||||||
|
|
||||||
2005-03-25 Katsumi Yamaoka <yamaoka@jpl.org>
|
2005-03-25 Katsumi Yamaoka <yamaoka@jpl.org>
|
||||||
|
|
||||||
* message.el (message-resend): Bind rfc2047-encode-encoded-words.
|
* message.el (message-resend): Bind rfc2047-encode-encoded-words.
|
||||||
|
|
@ -483,7 +503,7 @@
|
||||||
|
|
||||||
2004-11-04 Katsumi Yamaoka <yamaoka@jpl.org>
|
2004-11-04 Katsumi Yamaoka <yamaoka@jpl.org>
|
||||||
|
|
||||||
* gnus-art. (gnus-article-edit-article): Don't associate the
|
* gnus-art.el (gnus-article-edit-article): Don't associate the
|
||||||
article buffer with a draft file. This is a temporary measure
|
article buffer with a draft file. This is a temporary measure
|
||||||
against the 2004-08-22 change to gnus-article-edit-mode.
|
against the 2004-08-22 change to gnus-article-edit-mode.
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -12604,7 +12604,7 @@
|
||||||
|
|
||||||
* nnfolder.el (nnfolder-read-folder): Use group instead of
|
* nnfolder.el (nnfolder-read-folder): Use group instead of
|
||||||
nnfolder-current-group.
|
nnfolder-current-group.
|
||||||
Suggested by Lorentey Karoly <lorentey@elte.hu>.
|
Suggested by K,Ba(Broly L,Bu(Brentey <lorentey@elte.hu>.
|
||||||
|
|
||||||
2001-11-17 Simon Josefsson <jas@extundo.com>
|
2001-11-17 Simon Josefsson <jas@extundo.com>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -46,6 +46,7 @@
|
||||||
(autoload 'gnus-msg-mail "gnus-msg" nil t)
|
(autoload 'gnus-msg-mail "gnus-msg" nil t)
|
||||||
(autoload 'gnus-button-mailto "gnus-msg")
|
(autoload 'gnus-button-mailto "gnus-msg")
|
||||||
(autoload 'gnus-button-reply "gnus-msg" nil t)
|
(autoload 'gnus-button-reply "gnus-msg" nil t)
|
||||||
|
(autoload 'parse-time-string "parse-time" nil nil)
|
||||||
|
|
||||||
(defgroup gnus-article nil
|
(defgroup gnus-article nil
|
||||||
"Article display."
|
"Article display."
|
||||||
|
|
|
||||||
|
|
@ -37,6 +37,7 @@
|
||||||
|
|
||||||
(require 'nndraft)
|
(require 'nndraft)
|
||||||
(require 'gnus-draft)
|
(require 'gnus-draft)
|
||||||
|
(autoload 'parse-time-string "parse-time" nil nil)
|
||||||
|
|
||||||
;;;###autoload
|
;;;###autoload
|
||||||
(defgroup gnus-delay nil
|
(defgroup gnus-delay nil
|
||||||
|
|
|
||||||
|
|
@ -40,6 +40,8 @@
|
||||||
(require 'itimer)
|
(require 'itimer)
|
||||||
(require 'timer)))
|
(require 'timer)))
|
||||||
|
|
||||||
|
(autoload 'parse-time-string "parse-time" nil nil)
|
||||||
|
|
||||||
(defgroup gnus-demon nil
|
(defgroup gnus-demon nil
|
||||||
"Demonic behaviour."
|
"Demonic behaviour."
|
||||||
:group 'gnus)
|
:group 'gnus)
|
||||||
|
|
|
||||||
|
|
@ -2250,7 +2250,7 @@ gnus-summary-show-article-from-menu-as-charset-%s" cs))))
|
||||||
,@(if (featurep 'xemacs) '(t)
|
,@(if (featurep 'xemacs) '(t)
|
||||||
'(:help "Generate and print a PostScript image"))])
|
'(:help "Generate and print a PostScript image"))])
|
||||||
("Copy, move,... (Backend)"
|
("Copy, move,... (Backend)"
|
||||||
,@(if (featurep 'xemacs) '(t)
|
,@(if (featurep 'xemacs) nil
|
||||||
'(:help "Copying, moving, expiring articles..."))
|
'(:help "Copying, moving, expiring articles..."))
|
||||||
["Respool article..." gnus-summary-respool-article t]
|
["Respool article..." gnus-summary-respool-article t]
|
||||||
["Move article..." gnus-summary-move-article
|
["Move article..." gnus-summary-move-article
|
||||||
|
|
|
||||||
|
|
@ -4568,6 +4568,8 @@ Otherwise, generate and save a value for `canlock-password' first."
|
||||||
"Make a valid data header.
|
"Make a valid data header.
|
||||||
If NOW, use that time instead."
|
If NOW, use that time instead."
|
||||||
(require 'parse-time)
|
(require 'parse-time)
|
||||||
|
(defvar parse-time-weekdays)
|
||||||
|
(defvar parse-time-months)
|
||||||
(let* ((now (or now (current-time)))
|
(let* ((now (or now (current-time)))
|
||||||
(zone (nth 8 (decode-time now)))
|
(zone (nth 8 (decode-time now)))
|
||||||
(sign "+"))
|
(sign "+"))
|
||||||
|
|
|
||||||
|
|
@ -1388,6 +1388,8 @@ function is generally only called when Gnus is shutting down."
|
||||||
|
|
||||||
(defun nnimap-date-days-ago (daysago)
|
(defun nnimap-date-days-ago (daysago)
|
||||||
"Return date, in format \"3-Aug-1998\", for DAYSAGO days ago."
|
"Return date, in format \"3-Aug-1998\", for DAYSAGO days ago."
|
||||||
|
(require 'parse-time)
|
||||||
|
(defvar parse-time-months)
|
||||||
(let* ((time (nnimap-time-substract (current-time) (days-to-time daysago)))
|
(let* ((time (nnimap-time-substract (current-time) (days-to-time daysago)))
|
||||||
(date (format-time-string
|
(date (format-time-string
|
||||||
(format "%%d-%s-%%Y"
|
(format "%%d-%s-%%Y"
|
||||||
|
|
|
||||||
|
|
@ -39,6 +39,7 @@
|
||||||
(require 'mm-util)
|
(require 'mm-util)
|
||||||
(require 'mm-url)
|
(require 'mm-url)
|
||||||
(require 'nnweb)
|
(require 'nnweb)
|
||||||
|
(require 'parse-time)
|
||||||
(autoload 'w3-parse-buffer "w3-parse")
|
(autoload 'w3-parse-buffer "w3-parse")
|
||||||
|
|
||||||
(nnoo-declare nnultimate)
|
(nnoo-declare nnultimate)
|
||||||
|
|
|
||||||
|
|
@ -119,7 +119,10 @@ calls."
|
||||||
:group 'hi-lock-interactive-text-highlighting)
|
:group 'hi-lock-interactive-text-highlighting)
|
||||||
|
|
||||||
(defface hi-yellow
|
(defface hi-yellow
|
||||||
'((((background dark)) (:background "yellow" :foreground "black"))
|
'((((min-colors 88) (background dark))
|
||||||
|
(:background "yellow1" :foreground "black"))
|
||||||
|
(((background dark)) (:background "yellow" :foreground "black"))
|
||||||
|
(((min-colors 88)) (:background "yellow1"))
|
||||||
(t (:background "yellow")))
|
(t (:background "yellow")))
|
||||||
"Default face for hi-lock mode."
|
"Default face for hi-lock mode."
|
||||||
:group 'hi-lock-faces)
|
:group 'hi-lock-faces)
|
||||||
|
|
@ -131,7 +134,10 @@ calls."
|
||||||
:group 'hi-lock-faces)
|
:group 'hi-lock-faces)
|
||||||
|
|
||||||
(defface hi-green
|
(defface hi-green
|
||||||
'((((background dark)) (:background "green" :foreground "black"))
|
'((((min-colors 88) (background dark))
|
||||||
|
(:background "green1" :foreground "black"))
|
||||||
|
(((background dark)) (:background "green" :foreground "black"))
|
||||||
|
(((min-colors 88)) (:background "green1"))
|
||||||
(t (:background "green")))
|
(t (:background "green")))
|
||||||
"Face for hi-lock mode."
|
"Face for hi-lock mode."
|
||||||
:group 'hi-lock-faces)
|
:group 'hi-lock-faces)
|
||||||
|
|
@ -148,17 +154,20 @@ calls."
|
||||||
:group 'hi-lock-faces)
|
:group 'hi-lock-faces)
|
||||||
|
|
||||||
(defface hi-blue-b
|
(defface hi-blue-b
|
||||||
'((t (:weight bold :foreground "blue")))
|
'((((min-colors 88)) (:weight bold :foreground "blue1"))
|
||||||
|
(t (:weight bold :foreground "blue")))
|
||||||
"Face for hi-lock mode."
|
"Face for hi-lock mode."
|
||||||
:group 'hi-lock-faces)
|
:group 'hi-lock-faces)
|
||||||
|
|
||||||
(defface hi-green-b
|
(defface hi-green-b
|
||||||
'((t (:weight bold :foreground "green")))
|
'((((min-colors 88)) (:weight bold :foreground "green1"))
|
||||||
|
(t (:weight bold :foreground "green")))
|
||||||
"Face for hi-lock mode."
|
"Face for hi-lock mode."
|
||||||
:group 'hi-lock-faces)
|
:group 'hi-lock-faces)
|
||||||
|
|
||||||
(defface hi-red-b
|
(defface hi-red-b
|
||||||
'((t (:weight bold :foreground "red")))
|
'((((min-colors 88)) (:weight bold :foreground "red1"))
|
||||||
|
(t (:weight bold :foreground "red")))
|
||||||
"Face for hi-lock mode."
|
"Face for hi-lock mode."
|
||||||
:group 'hi-lock-faces)
|
:group 'hi-lock-faces)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -213,14 +213,16 @@
|
||||||
;; indentation on inserts gets underlined (which can look pretty ugly!).
|
;; indentation on inserts gets underlined (which can look pretty ugly!).
|
||||||
|
|
||||||
(defface highlight-changes-face
|
(defface highlight-changes-face
|
||||||
'((((class color)) (:foreground "red" ))
|
'((((min-colors 88) (class color)) (:foreground "red1" ))
|
||||||
|
(((class color)) (:foreground "red" ))
|
||||||
(t (:inverse-video t)))
|
(t (:inverse-video t)))
|
||||||
"Face used for highlighting changes."
|
"Face used for highlighting changes."
|
||||||
:group 'highlight-changes)
|
:group 'highlight-changes)
|
||||||
|
|
||||||
;; This looks pretty ugly, actually. Maybe the underline should be removed.
|
;; This looks pretty ugly, actually. Maybe the underline should be removed.
|
||||||
(defface highlight-changes-delete-face
|
(defface highlight-changes-delete-face
|
||||||
'((((class color)) (:foreground "red" :underline t))
|
'((((min-colors 88) (class color)) (:foreground "red1" :underline t))
|
||||||
|
(((class color)) (:foreground "red" :underline t))
|
||||||
(t (:inverse-video t)))
|
(t (:inverse-video t)))
|
||||||
"Face used for highlighting deletions."
|
"Face used for highlighting deletions."
|
||||||
:group 'highlight-changes)
|
:group 'highlight-changes)
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
;;; hl-line.el --- highlight the current line
|
;;; hl-line.el --- highlight the current line
|
||||||
|
|
||||||
;; Copyright (C) 1998, 2000, 2001, 2003 Free Software Foundation, Inc.
|
;; Copyright (C) 1998, 2000, 2001, 2003, 2005 Free Software Foundation, Inc.
|
||||||
|
|
||||||
;; Author: Dave Love <fx@gnu.org>
|
;; Author: Dave Love <fx@gnu.org>
|
||||||
;; Maintainer: FSF
|
;; Maintainer: FSF
|
||||||
|
|
@ -113,7 +113,7 @@ When `hl-line-sticky-flag' is nil, Hl-Line mode highlights the
|
||||||
line about point in the selected window only. In this case, it
|
line about point in the selected window only. In this case, it
|
||||||
uses the function `hl-line-unhighlight' on `pre-command-hook' in
|
uses the function `hl-line-unhighlight' on `pre-command-hook' in
|
||||||
addition to `hl-line-highlight' on `post-command-hook'."
|
addition to `hl-line-highlight' on `post-command-hook'."
|
||||||
nil nil nil
|
:group 'hl-line
|
||||||
(if hl-line-mode
|
(if hl-line-mode
|
||||||
(progn
|
(progn
|
||||||
;; In case `kill-all-local-variables' is called.
|
;; In case `kill-all-local-variables' is called.
|
||||||
|
|
|
||||||
12
lisp/ido.el
12
lisp/ido.el
|
|
@ -1,6 +1,6 @@
|
||||||
;;; ido.el --- interactively do things with buffers and files.
|
;;; ido.el --- interactively do things with buffers and files.
|
||||||
|
|
||||||
;; Copyright (C) 1996-2004 Free Software Foundation, Inc.
|
;; Copyright (C) 1996-2004, 2005 Free Software Foundation, Inc.
|
||||||
|
|
||||||
;; Author: Kim F. Storm <storm@cua.dk>
|
;; Author: Kim F. Storm <storm@cua.dk>
|
||||||
;; Based on: iswitchb by Stephen Eglen <stephen@cns.ed.ac.uk>
|
;; Based on: iswitchb by Stephen Eglen <stephen@cns.ed.ac.uk>
|
||||||
|
|
@ -747,13 +747,19 @@ subdirs in the alternatives."
|
||||||
"*Font used by ido for highlighting only match."
|
"*Font used by ido for highlighting only match."
|
||||||
:group 'ido)
|
:group 'ido)
|
||||||
|
|
||||||
(defface ido-subdir-face '((((class color))
|
(defface ido-subdir-face '((((min-colors 88) (class color))
|
||||||
|
(:foreground "red1"))
|
||||||
|
(((class color))
|
||||||
(:foreground "red"))
|
(:foreground "red"))
|
||||||
(t (:underline t)))
|
(t (:underline t)))
|
||||||
"*Font used by ido for highlighting subdirs in the alternatives."
|
"*Font used by ido for highlighting subdirs in the alternatives."
|
||||||
:group 'ido)
|
:group 'ido)
|
||||||
|
|
||||||
(defface ido-indicator-face '((((class color))
|
(defface ido-indicator-face '((((min-colors 88) (class color))
|
||||||
|
(:foreground "yellow1"
|
||||||
|
:background "red1"
|
||||||
|
:width condensed))
|
||||||
|
(((class color))
|
||||||
(:foreground "yellow"
|
(:foreground "yellow"
|
||||||
:background "red"
|
:background "red"
|
||||||
:width condensed))
|
:width condensed))
|
||||||
|
|
|
||||||
|
|
@ -65,7 +65,7 @@ wish to put something like the following in your `.emacs' file:
|
||||||
|
|
||||||
\(add-hook 'ielm-mode-hook
|
\(add-hook 'ielm-mode-hook
|
||||||
'(lambda ()
|
'(lambda ()
|
||||||
(define-key ielm-map \"\C-w\" 'comint-kill-region)
|
(define-key ielm-map \"\\C-w\" 'comint-kill-region)
|
||||||
(define-key ielm-map [C-S-backspace]
|
(define-key ielm-map [C-S-backspace]
|
||||||
'comint-kill-whole-line)))
|
'comint-kill-whole-line)))
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
;;; iimage.el --- Inline image minor mode.
|
;;; iimage.el --- Inline image minor mode.
|
||||||
|
|
||||||
;; Copyright (C) 2004 Free Software Foundation
|
;; Copyright (C) 2004, 2005 Free Software Foundation
|
||||||
|
|
||||||
;; Author: KOSEKI Yoshinori <kose@meadowy.org>
|
;; Author: KOSEKI Yoshinori <kose@meadowy.org>
|
||||||
;; Maintainer: KOSEKI Yoshinori <kose@meadowy.org>
|
;; Maintainer: KOSEKI Yoshinori <kose@meadowy.org>
|
||||||
|
|
@ -51,6 +51,11 @@
|
||||||
(eval-when-compile
|
(eval-when-compile
|
||||||
(require 'image-file))
|
(require 'image-file))
|
||||||
|
|
||||||
|
(defgroup iimage nil
|
||||||
|
"Support for inline images."
|
||||||
|
:version "22.1"
|
||||||
|
:group 'image)
|
||||||
|
|
||||||
(defconst iimage-version "1.1")
|
(defconst iimage-version "1.1")
|
||||||
(defvar iimage-mode nil)
|
(defvar iimage-mode nil)
|
||||||
(defvar iimage-mode-map nil)
|
(defvar iimage-mode-map nil)
|
||||||
|
|
@ -137,7 +142,7 @@ With numeric ARG, display the images if and only if ARG is positive."
|
||||||
;;;###autoload
|
;;;###autoload
|
||||||
(define-minor-mode iimage-mode
|
(define-minor-mode iimage-mode
|
||||||
"Toggle inline image minor mode."
|
"Toggle inline image minor mode."
|
||||||
nil " iImg" iimage-mode-map
|
:group 'iimage :lighter " iImg" :keymap iimage-mode-map
|
||||||
(run-hooks 'iimage-mode-hook)
|
(run-hooks 'iimage-mode-hook)
|
||||||
(iimage-mode-buffer iimage-mode))
|
(iimage-mode-buffer iimage-mode))
|
||||||
|
|
||||||
|
|
|
||||||
26
lisp/info.el
26
lisp/info.el
|
|
@ -1,6 +1,6 @@
|
||||||
;;; info.el --- info package for Emacs
|
;;; info.el --- info package for Emacs
|
||||||
|
|
||||||
;; Copyright (C) 1985,86,92,93,94,95,96,97,98,99,2000,01,02,03,2004
|
;; Copyright (C) 1985,86,92,93,94,95,96,97,98,99,2000,01,02,03,04,2005
|
||||||
;; Free Software Foundation, Inc.
|
;; Free Software Foundation, Inc.
|
||||||
|
|
||||||
;; Maintainer: FSF
|
;; Maintainer: FSF
|
||||||
|
|
@ -83,7 +83,11 @@ The Lisp code is executed when the node is selected.")
|
||||||
:group 'info)
|
:group 'info)
|
||||||
|
|
||||||
(defface info-xref
|
(defface info-xref
|
||||||
'((((class color) (background light)) :foreground "blue" :underline t)
|
'((((min-colors 88)
|
||||||
|
(class color) (background light)) :foreground "blue1" :underline t)
|
||||||
|
(((class color) (background light)) :foreground "blue" :underline t)
|
||||||
|
(((min-colors 88)
|
||||||
|
(class color) (background dark)) :foreground "cyan1" :underline t)
|
||||||
(((class color) (background dark)) :foreground "cyan" :underline t)
|
(((class color) (background dark)) :foreground "cyan" :underline t)
|
||||||
(t :underline t))
|
(t :underline t))
|
||||||
"Face for Info cross-references."
|
"Face for Info cross-references."
|
||||||
|
|
@ -3240,6 +3244,7 @@ Advanced commands:
|
||||||
(setq line-move-ignore-invisible t)
|
(setq line-move-ignore-invisible t)
|
||||||
(make-local-variable 'desktop-save-buffer)
|
(make-local-variable 'desktop-save-buffer)
|
||||||
(setq desktop-save-buffer 'Info-desktop-buffer-misc-data)
|
(setq desktop-save-buffer 'Info-desktop-buffer-misc-data)
|
||||||
|
(add-hook 'kill-buffer-hook 'Info-kill-buffer nil t)
|
||||||
(add-hook 'clone-buffer-hook 'Info-clone-buffer-hook nil t)
|
(add-hook 'clone-buffer-hook 'Info-clone-buffer-hook nil t)
|
||||||
(add-hook 'change-major-mode-hook 'font-lock-defontify nil t)
|
(add-hook 'change-major-mode-hook 'font-lock-defontify nil t)
|
||||||
(add-hook 'isearch-mode-hook 'Info-isearch-start nil t)
|
(add-hook 'isearch-mode-hook 'Info-isearch-start nil t)
|
||||||
|
|
@ -3254,6 +3259,13 @@ Advanced commands:
|
||||||
(Info-set-mode-line)
|
(Info-set-mode-line)
|
||||||
(run-hooks 'Info-mode-hook))
|
(run-hooks 'Info-mode-hook))
|
||||||
|
|
||||||
|
;; When an Info buffer is killed, make sure the associated tags buffer
|
||||||
|
;; is killed too.
|
||||||
|
(defun Info-kill-buffer ()
|
||||||
|
(and (eq major-mode 'Info-mode)
|
||||||
|
Info-tag-table-buffer
|
||||||
|
(kill-buffer Info-tag-table-buffer)))
|
||||||
|
|
||||||
(defun Info-clone-buffer-hook ()
|
(defun Info-clone-buffer-hook ()
|
||||||
(when (bufferp Info-tag-table-buffer)
|
(when (bufferp Info-tag-table-buffer)
|
||||||
(setq Info-tag-table-buffer
|
(setq Info-tag-table-buffer
|
||||||
|
|
@ -3887,16 +3899,6 @@ Preserve text properties."
|
||||||
|
|
||||||
(set-buffer-modified-p nil))))
|
(set-buffer-modified-p nil))))
|
||||||
|
|
||||||
|
|
||||||
;; When an Info buffer is killed, make sure the associated tags buffer
|
|
||||||
;; is killed too.
|
|
||||||
(defun Info-kill-buffer ()
|
|
||||||
(and (eq major-mode 'Info-mode)
|
|
||||||
Info-tag-table-buffer
|
|
||||||
(kill-buffer Info-tag-table-buffer)))
|
|
||||||
|
|
||||||
(add-hook 'kill-buffer-hook 'Info-kill-buffer)
|
|
||||||
|
|
||||||
;;; Speedbar support:
|
;;; Speedbar support:
|
||||||
;; These functions permit speedbar to display the "tags" in the
|
;; These functions permit speedbar to display the "tags" in the
|
||||||
;; current info node.
|
;; current info node.
|
||||||
|
|
|
||||||
|
|
@ -346,7 +346,7 @@ automatically.
|
||||||
In Encoded-kbd mode, a text sent from keyboard is accepted
|
In Encoded-kbd mode, a text sent from keyboard is accepted
|
||||||
as a multilingual text encoded in a coding system set by
|
as a multilingual text encoded in a coding system set by
|
||||||
\\[set-keyboard-coding-system]."
|
\\[set-keyboard-coding-system]."
|
||||||
:global t
|
:global t :group 'keyboard :group 'mule
|
||||||
|
|
||||||
(if encoded-kbd-mode
|
(if encoded-kbd-mode
|
||||||
;; We are turning on Encoded-kbd mode.
|
;; We are turning on Encoded-kbd mode.
|
||||||
|
|
|
||||||
|
|
@ -256,7 +256,7 @@ positions (integers or markers) specifying the region."
|
||||||
(define-minor-mode thai-word-mode
|
(define-minor-mode thai-word-mode
|
||||||
"Minor mode to make word-oriented commands aware of Thai words.
|
"Minor mode to make word-oriented commands aware of Thai words.
|
||||||
The commands affected are \\[forward-word], \\[backward-word], \\[kill-word], \\[backward-kill-word], \\[transpose-words], and \\[fill-paragraph]."
|
The commands affected are \\[forward-word], \\[backward-word], \\[kill-word], \\[backward-kill-word], \\[transpose-words], and \\[fill-paragraph]."
|
||||||
:global t
|
:global t :group 'mule
|
||||||
(cond (thai-word-mode
|
(cond (thai-word-mode
|
||||||
;; This enables linebreak between Thai characters.
|
;; This enables linebreak between Thai characters.
|
||||||
(modify-category-entry (make-char 'thai-tis620) ?|)
|
(modify-category-entry (make-char 'thai-tis620) ?|)
|
||||||
|
|
|
||||||
|
|
@ -101,7 +101,7 @@ wrapped whenever the buffer is changed. You can always call
|
||||||
|
|
||||||
If `longlines-show-hard-newlines' is non-nil, hard newlines will
|
If `longlines-show-hard-newlines' is non-nil, hard newlines will
|
||||||
be marked by a symbol."
|
be marked by a symbol."
|
||||||
nil " ll" nil
|
:group 'longlines :lighter " ll"
|
||||||
(if longlines-mode
|
(if longlines-mode
|
||||||
;; Turn on longlines mode
|
;; Turn on longlines mode
|
||||||
(progn
|
(progn
|
||||||
|
|
|
||||||
|
|
@ -1866,10 +1866,11 @@ Note on function names in this list: all functions of the form
|
||||||
|
|
||||||
(define-minor-mode sc-minor-mode
|
(define-minor-mode sc-minor-mode
|
||||||
"Supercite minor mode."
|
"Supercite minor mode."
|
||||||
nil (" SC" (sc-auto-fill-region-p
|
:group 'supercite
|
||||||
(":f" (sc-fixup-whitespace-p "w"))
|
:lighter (" SC" (sc-auto-fill-region-p
|
||||||
(sc-fixup-whitespace-p ":w")))
|
(":f" (sc-fixup-whitespace-p "w"))
|
||||||
`((,sc-mode-map-prefix . ,sc-mode-map)))
|
(sc-fixup-whitespace-p ":w")))
|
||||||
|
:keymap `((,sc-mode-map-prefix . ,sc-mode-map)))
|
||||||
|
|
||||||
;;;###autoload
|
;;;###autoload
|
||||||
(defun sc-cite-original ()
|
(defun sc-cite-original ()
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
;;; master.el --- make a buffer the master over another buffer
|
;;; master.el --- make a buffer the master over another buffer
|
||||||
|
|
||||||
;; Copyright (C) 1999, 2000, 2001 Alexander Schroeder
|
;; Copyright (C) 1999, 2000, 2001, 2005 Alexander Schroeder
|
||||||
|
|
||||||
;; Author: Alex Schroeder <alex@gnu.org>
|
;; Author: Alex Schroeder <alex@gnu.org>
|
||||||
;; Maintainer: Alex Schroeder <alex@gnu.org>
|
;; Maintainer: Alex Schroeder <alex@gnu.org>
|
||||||
|
|
@ -55,7 +55,10 @@
|
||||||
|
|
||||||
;;; Code:
|
;;; Code:
|
||||||
|
|
||||||
(require 'easy-mmode)
|
(defgroup master nil
|
||||||
|
"Support for master/slave relationships between buffers."
|
||||||
|
:version "22.1"
|
||||||
|
:group 'convenience)
|
||||||
|
|
||||||
;; Variables that don't need initialization.
|
;; Variables that don't need initialization.
|
||||||
|
|
||||||
|
|
@ -83,16 +86,13 @@ following commands:
|
||||||
The slave buffer is stored in the buffer-local variable `master-of'.
|
The slave buffer is stored in the buffer-local variable `master-of'.
|
||||||
You can set this variable using `master-set-slave'. You can show
|
You can set this variable using `master-set-slave'. You can show
|
||||||
yourself the value of `master-of' by calling `master-show-slave'."
|
yourself the value of `master-of' by calling `master-show-slave'."
|
||||||
;; The initial value.
|
:group 'master
|
||||||
nil
|
:keymap
|
||||||
;; The indicator for the mode line.
|
'(("\C-c\C-n" . master-says-scroll-up)
|
||||||
nil
|
("\C-c\C-p" . master-says-scroll-down)
|
||||||
;; The minor mode bindings.
|
("\C-c<" . master-says-beginning-of-buffer)
|
||||||
'(("\C-c\C-n" . master-says-scroll-up)
|
("\C-c>" . master-says-end-of-buffer)
|
||||||
("\C-c\C-p" . master-says-scroll-down)
|
("\C-c\C-l" . master-says-recenter)))
|
||||||
("\C-c<" . master-says-beginning-of-buffer)
|
|
||||||
("\C-c>" . master-says-end-of-buffer)
|
|
||||||
("\C-c\C-l" . master-says-recenter)))
|
|
||||||
|
|
||||||
;; Initialize Master mode by setting a slave buffer.
|
;; Initialize Master mode by setting a slave buffer.
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,8 @@
|
||||||
|
2005-04-08 Dan Nicolaescu <dann@ics.uci.edu>
|
||||||
|
|
||||||
|
* mh-customize.el (mh-speedbar-selected-folder-face): Special case
|
||||||
|
high number of colors displays.
|
||||||
|
|
||||||
2005-03-25 Werner Lemberg <wl@gnu.org>
|
2005-03-25 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
* mh-e.el, mh-identity.el, mh-mime.el: Replace `legal' with `valid'.
|
* mh-e.el, mh-identity.el, mh-mime.el: Replace `legal' with `valid'.
|
||||||
|
|
@ -326,7 +331,7 @@
|
||||||
|
|
||||||
* mh-e.el (Version, mh-version): Updated for release 7.4.4.
|
* mh-e.el (Version, mh-version): Updated for release 7.4.4.
|
||||||
|
|
||||||
* This patch release contains the following patches:
|
This patch release contains the following patches:
|
||||||
|
|
||||||
* mh-xemacs.el: New file from concatenation of mh-xemacs-compat.el
|
* mh-xemacs.el: New file from concatenation of mh-xemacs-compat.el
|
||||||
and mh-xemacs-icons.el which were removed since their names
|
and mh-xemacs-icons.el which were removed since their names
|
||||||
|
|
@ -10929,7 +10934,7 @@
|
||||||
(dist): Leave release in current directory.
|
(dist): Leave release in current directory.
|
||||||
|
|
||||||
|
|
||||||
Copyright (C) 2003, 2004 Free Software Foundation, Inc.
|
Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
|
||||||
|
|
||||||
Copying and distribution of this file, with or without modification,
|
Copying and distribution of this file, with or without modification,
|
||||||
are permitted in any medium without royalty provided the copyright
|
are permitted in any medium without royalty provided the copyright
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
;;; mh-customize.el --- MH-E customization
|
;;; mh-customize.el --- MH-E customization
|
||||||
|
|
||||||
;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
|
;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
|
||||||
|
|
||||||
;; Author: Bill Wohler <wohler@newt.com>
|
;; Author: Bill Wohler <wohler@newt.com>
|
||||||
;; Maintainer: Bill Wohler <wohler@newt.com>
|
;; Maintainer: Bill Wohler <wohler@newt.com>
|
||||||
|
|
@ -2345,9 +2345,9 @@ The background and foreground is used in the image."
|
||||||
|
|
||||||
(defface mh-speedbar-selected-folder-face
|
(defface mh-speedbar-selected-folder-face
|
||||||
'((((class color) (background light))
|
'((((class color) (background light))
|
||||||
(:foreground "red" :underline t))
|
(:foreground "red1" :underline t))
|
||||||
(((class color) (background dark))
|
(((class color) (background dark))
|
||||||
(:foreground "red" :underline t))
|
(:foreground "red1" :underline t))
|
||||||
(t (:underline t)))
|
(t (:underline t)))
|
||||||
"Face used for the current folder."
|
"Face used for the current folder."
|
||||||
:group 'mh-speed-faces)
|
:group 'mh-speed-faces)
|
||||||
|
|
|
||||||
|
|
@ -788,8 +788,7 @@ POS may be a mouse event location in any window.
|
||||||
A clickable link is identified by one of the following methods:
|
A clickable link is identified by one of the following methods:
|
||||||
|
|
||||||
- If the character at POS has a non-nil `follow-link' text or
|
- If the character at POS has a non-nil `follow-link' text or
|
||||||
overlay property, use the value of that property determines what
|
overlay property, the value of that property determines what to do.
|
||||||
to do.
|
|
||||||
|
|
||||||
- If there is a local key-binding or a keybinding at position POS
|
- If there is a local key-binding or a keybinding at position POS
|
||||||
for the `follow-link' event, the binding of that event determines
|
for the `follow-link' event, the binding of that event determines
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
;;; msb.el --- customizable buffer-selection with multiple menus
|
;;; msb.el --- customizable buffer-selection with multiple menus
|
||||||
|
|
||||||
;; Copyright (C) 1993, 94, 95, 97, 98, 99, 2000, 2001, 2003
|
;; Copyright (C) 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2003,
|
||||||
;; Free Software Foundation, Inc.
|
;; 2005 Free Software Foundation, Inc.
|
||||||
|
|
||||||
;; Author: Lars Lindberg <lars.lindberg@home.se>
|
;; Author: Lars Lindberg <lars.lindberg@home.se>
|
||||||
;; Maintainer: FSF
|
;; Maintainer: FSF
|
||||||
|
|
@ -1141,7 +1141,7 @@ variable `msb-menu-cond'."
|
||||||
With arg, turn Msb mode on if and only if arg is positive.
|
With arg, turn Msb mode on if and only if arg is positive.
|
||||||
This mode overrides the binding(s) of `mouse-buffer-menu' to provide a
|
This mode overrides the binding(s) of `mouse-buffer-menu' to provide a
|
||||||
different buffer menu using the function `msb'."
|
different buffer menu using the function `msb'."
|
||||||
:global t
|
:global t :group 'msb
|
||||||
(if msb-mode
|
(if msb-mode
|
||||||
(progn
|
(progn
|
||||||
(add-hook 'menu-bar-update-hook 'msb-menu-bar-update-buffers)
|
(add-hook 'menu-bar-update-hook 'msb-menu-bar-update-buffers)
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
;;; pcvs-info.el --- internal representation of a fileinfo entry
|
;;; pcvs-info.el --- internal representation of a fileinfo entry
|
||||||
|
|
||||||
;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
||||||
;; 2000, 2004 Free Software Foundation, Inc.
|
;; 2000, 2004, 2005 Free Software Foundation, Inc.
|
||||||
|
|
||||||
;; Author: Stefan Monnier <monnier@cs.yale.edu>
|
;; Author: Stefan Monnier <monnier@cs.yale.edu>
|
||||||
;; Keywords: pcl-cvs
|
;; Keywords: pcl-cvs
|
||||||
|
|
@ -105,7 +105,9 @@ to confuse some users sometimes."
|
||||||
:group 'pcl-cvs)
|
:group 'pcl-cvs)
|
||||||
|
|
||||||
(defface cvs-marked-face
|
(defface cvs-marked-face
|
||||||
'((((class color) (background dark))
|
'((((min-colors 88) (class color) (background dark))
|
||||||
|
(:foreground "green1" :weight bold))
|
||||||
|
(((class color) (background dark))
|
||||||
(:foreground "green" :weight bold))
|
(:foreground "green" :weight bold))
|
||||||
(((class color) (background light))
|
(((class color) (background light))
|
||||||
(:foreground "green3" :weight bold))
|
(:foreground "green3" :weight bold))
|
||||||
|
|
|
||||||
23
lisp/pcvs.el
23
lisp/pcvs.el
|
|
@ -918,23 +918,28 @@ This usually doesn't really work but is a handy initval in a prompt."
|
||||||
;;;;
|
;;;;
|
||||||
|
|
||||||
;;;###autoload
|
;;;###autoload
|
||||||
(defun cvs-checkout (modules dir flags)
|
(defun cvs-checkout (modules dir flags &optional root)
|
||||||
"Run a 'cvs checkout MODULES' in DIR.
|
"Run a 'cvs checkout MODULES' in DIR.
|
||||||
Feed the output to a *cvs* buffer, display it in the current window,
|
Feed the output to a *cvs* buffer, display it in the current window,
|
||||||
and run `cvs-mode' on it.
|
and run `cvs-mode' on it.
|
||||||
|
|
||||||
With a prefix argument, prompt for cvs FLAGS to use."
|
With a prefix argument, prompt for cvs FLAGS to use."
|
||||||
(interactive
|
(interactive
|
||||||
(list (cvs-string->strings (read-string "Module(s): " (cvs-get-module)))
|
(let ((root (cvs-get-cvsroot)))
|
||||||
(read-directory-name "CVS Checkout Directory: "
|
(if (or (null root) current-prefix-arg)
|
||||||
nil default-directory nil)
|
(setq root (read-string "CVS Root: ")))
|
||||||
(cvs-add-branch-prefix
|
(list (cvs-string->strings (read-string "Module(s): " (cvs-get-module)))
|
||||||
(cvs-flags-query 'cvs-checkout-flags "cvs checkout flags"))))
|
(read-directory-name "CVS Checkout Directory: "
|
||||||
|
nil default-directory nil)
|
||||||
|
(cvs-add-branch-prefix
|
||||||
|
(cvs-flags-query 'cvs-checkout-flags "cvs checkout flags"))
|
||||||
|
root)))
|
||||||
(when (eq flags t)
|
(when (eq flags t)
|
||||||
(setf flags (cvs-flags-query 'cvs-checkout-flags nil 'noquery)))
|
(setf flags (cvs-flags-query 'cvs-checkout-flags nil 'noquery)))
|
||||||
(cvs-cmd-do "checkout" (or dir default-directory)
|
(let ((cvs-cvsroot root))
|
||||||
(append flags modules) nil 'new
|
(cvs-cmd-do "checkout" (or dir default-directory)
|
||||||
:noexist t))
|
(append flags modules) nil 'new
|
||||||
|
:noexist t)))
|
||||||
|
|
||||||
(defun-cvs-mode (cvs-mode-checkout . NOARGS) (dir)
|
(defun-cvs-mode (cvs-mode-checkout . NOARGS) (dir)
|
||||||
"Run cvs checkout against the current branch.
|
"Run cvs checkout against the current branch.
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
;;; cc-fonts.el --- font lock support for CC Mode
|
;;; cc-fonts.el --- font lock support for CC Mode
|
||||||
|
|
||||||
;; Copyright (C) 2002, 03 Free Software Foundation, Inc.
|
;; Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
|
||||||
|
|
||||||
;; Authors: 2003- Alan Mackenzie
|
;; Authors: 2003- Alan Mackenzie
|
||||||
;; 2002- Martin Stjernholm
|
;; 2002- Martin Stjernholm
|
||||||
|
|
@ -194,7 +194,7 @@
|
||||||
(unless (c-face-name-p c-invalid-face-name)
|
(unless (c-face-name-p c-invalid-face-name)
|
||||||
(defconst c-invalid-face 'c-invalid-face) ; Necessary in Emacs 19.
|
(defconst c-invalid-face 'c-invalid-face) ; Necessary in Emacs 19.
|
||||||
(defface c-invalid-face
|
(defface c-invalid-face
|
||||||
'((((class color) (background light)) (:foreground "red"))
|
'((((class color) (background light)) (:foreground "red1"))
|
||||||
(((class color)) (:foreground "hotpink"))
|
(((class color)) (:foreground "hotpink"))
|
||||||
(t (:inverse-video t)))
|
(t (:inverse-video t)))
|
||||||
"Face used to highlight invalid syntax."
|
"Face used to highlight invalid syntax."
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
;;; compile.el --- run compiler as inferior of Emacs, parse error messages
|
;;; compile.el --- run compiler as inferior of Emacs, parse error messages
|
||||||
|
|
||||||
;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
||||||
;; 2001, 2003, 2004 Free Software Foundation, Inc.
|
;; 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
|
||||||
|
|
||||||
;; Authors: Roland McGrath <roland@gnu.org>,
|
;; Authors: Roland McGrath <roland@gnu.org>,
|
||||||
;; Daniel Pfeiffer <occitan@esperanto.org>
|
;; Daniel Pfeiffer <occitan@esperanto.org>
|
||||||
|
|
@ -464,6 +464,8 @@ starting the compilation process.")
|
||||||
(defface compilation-info-face
|
(defface compilation-info-face
|
||||||
'((((class color) (min-colors 16) (background light))
|
'((((class color) (min-colors 16) (background light))
|
||||||
(:foreground "Green3" :weight bold))
|
(:foreground "Green3" :weight bold))
|
||||||
|
(((class color) (min-colors 88) (background dark))
|
||||||
|
(:foreground "Green1" :weight bold))
|
||||||
(((class color) (min-colors 16) (background dark))
|
(((class color) (min-colors 16) (background dark))
|
||||||
(:foreground "Green" :weight bold))
|
(:foreground "Green" :weight bold))
|
||||||
(((class color)) (:foreground "green" :weight bold))
|
(((class color)) (:foreground "green" :weight bold))
|
||||||
|
|
@ -1233,6 +1235,10 @@ Optional argument MINOR indicates this is called from
|
||||||
(make-local-variable 'compilation-messages-start)
|
(make-local-variable 'compilation-messages-start)
|
||||||
(make-local-variable 'compilation-error-screen-columns)
|
(make-local-variable 'compilation-error-screen-columns)
|
||||||
(make-local-variable 'overlay-arrow-position)
|
(make-local-variable 'overlay-arrow-position)
|
||||||
|
(set (make-local-variable 'overlay-arrow-string) "=>")
|
||||||
|
(setq next-error-overlay-arrow-position nil)
|
||||||
|
(add-hook 'kill-buffer-hook
|
||||||
|
(lambda () (setq next-error-overlay-arrow-position nil)) nil t)
|
||||||
;; Note that compilation-next-error-function is for interfacing
|
;; Note that compilation-next-error-function is for interfacing
|
||||||
;; with the next-error function in simple.el, and it's only
|
;; with the next-error function in simple.el, and it's only
|
||||||
;; coincidentally named similarly to compilation-next-error.
|
;; coincidentally named similarly to compilation-next-error.
|
||||||
|
|
@ -1641,8 +1647,9 @@ and overlay is highlighted between MK and END-MK."
|
||||||
(numberp next-error-highlight)))
|
(numberp next-error-highlight)))
|
||||||
(delete-overlay compilation-highlight-overlay))))))
|
(delete-overlay compilation-highlight-overlay))))))
|
||||||
(when (and (eq next-error-highlight 'fringe-arrow))
|
(when (and (eq next-error-highlight 'fringe-arrow))
|
||||||
(set (make-local-variable 'overlay-arrow-position)
|
(setq next-error-overlay-arrow-position
|
||||||
(copy-marker (line-beginning-position))))))
|
(copy-marker (line-beginning-position))))))
|
||||||
|
|
||||||
|
|
||||||
(defun compilation-find-file (marker filename dir &rest formats)
|
(defun compilation-find-file (marker filename dir &rest formats)
|
||||||
"Find a buffer for file FILENAME.
|
"Find a buffer for file FILENAME.
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
;;; cwarn.el --- highlight suspicious C and C++ constructions
|
;;; cwarn.el --- highlight suspicious C and C++ constructions
|
||||||
|
|
||||||
;; Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
|
;; Copyright (C) 1999, 2000, 2001, 2005 Free Software Foundation, Inc.
|
||||||
|
|
||||||
;; Author: Anders Lindgren <andersl@andersl.com>
|
;; Author: Anders Lindgren <andersl@andersl.com>
|
||||||
;; Keywords: c, languages, faces
|
;; Keywords: c, languages, faces
|
||||||
|
|
@ -193,7 +193,7 @@ be included in the variable `cwarn-configuration'. By default C and
|
||||||
C++ modes are included.
|
C++ modes are included.
|
||||||
|
|
||||||
With ARG, turn CWarn mode on if and only if arg is positive."
|
With ARG, turn CWarn mode on if and only if arg is positive."
|
||||||
nil cwarn-mode-text nil
|
:group 'cwarn :lighter cwarn-mode-text
|
||||||
(cwarn-font-lock-keywords cwarn-mode)
|
(cwarn-font-lock-keywords cwarn-mode)
|
||||||
(if font-lock-mode (font-lock-fontify-buffer)))
|
(if font-lock-mode (font-lock-fontify-buffer)))
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
;;; ebrowse.el --- Emacs C++ class browser & tags facility
|
;;; ebrowse.el --- Emacs C++ class browser & tags facility
|
||||||
|
|
||||||
;; Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000, 2001, 2002
|
;; Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000, 2001, 2002, 2005
|
||||||
;; Free Software Foundation Inc.
|
;; Free Software Foundation Inc.
|
||||||
|
|
||||||
;; Author: Gerd Moellmann <gerd@gnu.org>
|
;; Author: Gerd Moellmann <gerd@gnu.org>
|
||||||
|
|
@ -158,13 +158,15 @@ This space is used to display markers."
|
||||||
|
|
||||||
|
|
||||||
(defface ebrowse-tree-mark-face
|
(defface ebrowse-tree-mark-face
|
||||||
'((t (:foreground "red")))
|
'((((min-colors 88)) (:foreground "red1"))
|
||||||
|
(t (:foreground "red")))
|
||||||
"*The face used for the mark character in the tree."
|
"*The face used for the mark character in the tree."
|
||||||
:group 'ebrowse-faces)
|
:group 'ebrowse-faces)
|
||||||
|
|
||||||
|
|
||||||
(defface ebrowse-root-class-face
|
(defface ebrowse-root-class-face
|
||||||
'((t (:weight bold :foreground "blue")))
|
'((((min-colors 88)) (:weight bold :foreground "blue1"))
|
||||||
|
(t (:weight bold :foreground "blue")))
|
||||||
"*The face used for root classes in the tree."
|
"*The face used for root classes in the tree."
|
||||||
:group 'ebrowse-faces)
|
:group 'ebrowse-faces)
|
||||||
|
|
||||||
|
|
@ -182,7 +184,8 @@ This space is used to display markers."
|
||||||
|
|
||||||
|
|
||||||
(defface ebrowse-member-attribute-face
|
(defface ebrowse-member-attribute-face
|
||||||
'((t (:foreground "red")))
|
'((((min-colors 88)) (:foreground "red1"))
|
||||||
|
(t (:foreground "red")))
|
||||||
"*Face used to display member attributes."
|
"*Face used to display member attributes."
|
||||||
:group 'ebrowse-faces)
|
:group 'ebrowse-faces)
|
||||||
|
|
||||||
|
|
@ -194,7 +197,8 @@ This space is used to display markers."
|
||||||
|
|
||||||
|
|
||||||
(defface ebrowse-progress-face
|
(defface ebrowse-progress-face
|
||||||
'((t (:background "blue")))
|
'((((min-colors 88)) (:background "blue1"))
|
||||||
|
(t (:background "blue")))
|
||||||
"*Face for progress indicator."
|
"*Face for progress indicator."
|
||||||
:group 'ebrowse-faces)
|
:group 'ebrowse-faces)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1508,7 +1508,7 @@ Return first 'INCLUDE-DIRS/REL-FILE-NAME' that exists, or just REL-FILE-NAME if
|
||||||
"Minor mode to do on-the-fly syntax checking.
|
"Minor mode to do on-the-fly syntax checking.
|
||||||
When called interactively, toggles the minor mode.
|
When called interactively, toggles the minor mode.
|
||||||
With arg, turn Flymake mode on if and only if arg is positive."
|
With arg, turn Flymake mode on if and only if arg is positive."
|
||||||
:lighter flymake-mode-line
|
:group 'flymake :lighter flymake-mode-line
|
||||||
(if flymake-mode
|
(if flymake-mode
|
||||||
(if (flymake-can-syntax-check-file (buffer-file-name))
|
(if (flymake-can-syntax-check-file (buffer-file-name))
|
||||||
(flymake-mode-on)
|
(flymake-mode-on)
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
;;; glasses.el --- make cantReadThis readable
|
;;; glasses.el --- make cantReadThis readable
|
||||||
|
|
||||||
;; Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
|
;; Copyright (C) 1999, 2000, 2001, 2005 Free Software Foundation, Inc.
|
||||||
|
|
||||||
;; Author: Milan Zamazal <pdm@zamazal.org>
|
;; Author: Milan Zamazal <pdm@zamazal.org>
|
||||||
;; Maintainer: Milan Zamazal <pdm@zamazal.org>
|
;; Maintainer: Milan Zamazal <pdm@zamazal.org>
|
||||||
|
|
@ -251,7 +251,7 @@ recognized according to the current value of the variable `glasses-separator'."
|
||||||
"Minor mode for making identifiers likeThis readable.
|
"Minor mode for making identifiers likeThis readable.
|
||||||
When this mode is active, it tries to add virtual separators (like underscores)
|
When this mode is active, it tries to add virtual separators (like underscores)
|
||||||
at places they belong to."
|
at places they belong to."
|
||||||
nil " o^o" nil
|
:group 'glasses :lighter " o^o"
|
||||||
(save-excursion
|
(save-excursion
|
||||||
(save-restriction
|
(save-restriction
|
||||||
(widen)
|
(widen)
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
;;; hideif.el --- hides selected code within ifdef
|
;;; hideif.el --- hides selected code within ifdef
|
||||||
|
|
||||||
;; Copyright (C) 1988,1994,2001, 2002 Free Software Foundation, Inc.
|
;; Copyright (C) 1988, 1994, 2001, 2002, 2005 Free Software Foundation, Inc.
|
||||||
|
|
||||||
;; Author: Daniel LaLiberte <liberte@holonexus.org>
|
;; Author: Daniel LaLiberte <liberte@holonexus.org>
|
||||||
;; Maintainer: FSF
|
;; Maintainer: FSF
|
||||||
|
|
@ -197,7 +197,7 @@ how the hiding is done:
|
||||||
After `show-ifdefs', read-only status is restored to previous value.
|
After `show-ifdefs', read-only status is restored to previous value.
|
||||||
|
|
||||||
\\{hide-ifdef-mode-map}"
|
\\{hide-ifdef-mode-map}"
|
||||||
nil " Ifdef" nil
|
:group 'hide-ifdef :lighter " Ifdef"
|
||||||
(if hide-ifdef-mode
|
(if hide-ifdef-mode
|
||||||
(progn
|
(progn
|
||||||
;; inherit global values
|
;; inherit global values
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
;;; idlw-help.el --- HTML Help code for IDLWAVE
|
;;; idlw-help.el --- HTML Help code for IDLWAVE
|
||||||
;; Copyright (c) 2000 Carsten Dominik
|
;; Copyright (c) 2000 Carsten Dominik
|
||||||
;; Copyright (c) 2001, 2002 J.D. Smith
|
;; Copyright (c) 2001, 2002 J.D. Smith
|
||||||
;; Copyright (c) 2003,2004 Free Software Foundation
|
;; Copyright (c) 2003,2004,2005 Free Software Foundation
|
||||||
;;
|
;;
|
||||||
;; Authors: J.D. Smith <jdsmith@as.arizona.edu>
|
;; Authors: J.D. Smith <jdsmith@as.arizona.edu>
|
||||||
;; Carsten Dominik <dominik@astro.uva.nl>
|
;; Carsten Dominik <dominik@astro.uva.nl>
|
||||||
|
|
@ -183,7 +183,8 @@ support."
|
||||||
:type 'string)
|
:type 'string)
|
||||||
|
|
||||||
(defface idlwave-help-link-face
|
(defface idlwave-help-link-face
|
||||||
'((((class color)) (:foreground "Blue"))
|
'((((min-colors 88) (class color)) (:foreground "Blue1"))
|
||||||
|
(((class color)) (:foreground "Blue"))
|
||||||
(t (:weight bold)))
|
(t (:weight bold)))
|
||||||
"Face for highlighting links into IDLWAVE online help."
|
"Face for highlighting links into IDLWAVE online help."
|
||||||
:group 'idlwave-online-help)
|
:group 'idlwave-online-help)
|
||||||
|
|
|
||||||
|
|
@ -574,7 +574,7 @@ documents - you must insert literal tabs by hand.")
|
||||||
;; but it *did* have an asterisk in the docstring!
|
;; but it *did* have an asterisk in the docstring!
|
||||||
(defcustom sh-builtins
|
(defcustom sh-builtins
|
||||||
'((bash sh-append posix
|
'((bash sh-append posix
|
||||||
"." "alias" "bg" "bind" "builtin" "compgen" "complete"
|
"." "alias" "bg" "bind" "builtin" "caller" "compgen" "complete"
|
||||||
"declare" "dirs" "disown" "enable" "fc" "fg" "help" "history"
|
"declare" "dirs" "disown" "enable" "fc" "fg" "help" "history"
|
||||||
"jobs" "kill" "let" "local" "popd" "printf" "pushd" "shopt"
|
"jobs" "kill" "let" "local" "popd" "printf" "pushd" "shopt"
|
||||||
"source" "suspend" "typeset" "unalias")
|
"source" "suspend" "typeset" "unalias")
|
||||||
|
|
@ -779,7 +779,10 @@ See `sh-feature'.")
|
||||||
;; Font-Lock support
|
;; Font-Lock support
|
||||||
|
|
||||||
(defface sh-heredoc-face
|
(defface sh-heredoc-face
|
||||||
'((((class color)
|
'((((min-colors 88) (class color)
|
||||||
|
(background dark))
|
||||||
|
(:foreground "yellow1" :weight bold))
|
||||||
|
(((class color)
|
||||||
(background dark))
|
(background dark))
|
||||||
(:foreground "yellow" :weight bold))
|
(:foreground "yellow" :weight bold))
|
||||||
(((class color)
|
(((class color)
|
||||||
|
|
@ -791,6 +794,10 @@ See `sh-feature'.")
|
||||||
:group 'sh-indentation)
|
:group 'sh-indentation)
|
||||||
(defvar sh-heredoc-face 'sh-heredoc-face)
|
(defvar sh-heredoc-face 'sh-heredoc-face)
|
||||||
|
|
||||||
|
(defface sh-escaped-newline '((t :inherit font-lock-string-face))
|
||||||
|
"Face used for (non-escaped) backslash at end of a line in Shell-script mode."
|
||||||
|
:group 'sh-script
|
||||||
|
:version "22.1")
|
||||||
|
|
||||||
(defvar sh-font-lock-keywords
|
(defvar sh-font-lock-keywords
|
||||||
'((csh sh-append shell
|
'((csh sh-append shell
|
||||||
|
|
@ -815,7 +822,7 @@ See `sh-feature'.")
|
||||||
;; The next entry is only used for defining the others
|
;; The next entry is only used for defining the others
|
||||||
(shell sh-append executable-font-lock-keywords
|
(shell sh-append executable-font-lock-keywords
|
||||||
;; Using font-lock-string-face here confuses sh-get-indent-info.
|
;; Using font-lock-string-face here confuses sh-get-indent-info.
|
||||||
("\\\\$" 0 font-lock-warning-face)
|
("\\(^\\|[^\\]\\)\\(\\\\\\\\\\)*\\(\\\\\\)$" 3 'sh-escaped-newline)
|
||||||
("\\\\[^A-Za-z0-9]" 0 font-lock-string-face)
|
("\\\\[^A-Za-z0-9]" 0 font-lock-string-face)
|
||||||
("\\${?\\([A-Za-z_][A-Za-z0-9_]*\\|[0-9]+\\|[$*_]\\)" 1
|
("\\${?\\([A-Za-z_][A-Za-z0-9_]*\\|[0-9]+\\|[$*_]\\)" 1
|
||||||
font-lock-variable-name-face))
|
font-lock-variable-name-face))
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
;;; tcl.el --- Tcl code editing commands for Emacs
|
;;; tcl.el --- Tcl code editing commands for Emacs
|
||||||
|
|
||||||
;; Copyright (C) 1994,98,1999,2000,01,02,2003,2004 Free Software Foundation, Inc.
|
;; Copyright (C) 1994, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
|
||||||
|
;; Free Software Foundation, Inc.
|
||||||
|
|
||||||
;; Maintainer: FSF
|
;; Maintainer: FSF
|
||||||
;; Author: Tom Tromey <tromey@redhat.com>
|
;; Author: Tom Tromey <tromey@redhat.com>
|
||||||
|
|
@ -41,6 +42,7 @@
|
||||||
;; * tcl-typeword-list is similar, but uses font-lock-type-face.
|
;; * tcl-typeword-list is similar, but uses font-lock-type-face.
|
||||||
;; * tcl-keyword-list is a list of keywords. I've generally used this
|
;; * tcl-keyword-list is a list of keywords. I've generally used this
|
||||||
;; for flow-control words. Eg I add "unwind_protect" to this list.
|
;; for flow-control words. Eg I add "unwind_protect" to this list.
|
||||||
|
;; * tcl-builtin-list lists commands to be given font-lock-builtin-face.
|
||||||
;; * tcl-type-alist can be used to minimally customize indentation
|
;; * tcl-type-alist can be used to minimally customize indentation
|
||||||
;; according to context.
|
;; according to context.
|
||||||
|
|
||||||
|
|
@ -192,6 +194,11 @@ inferior Tcl to load that file. The filename will be appropriately
|
||||||
quoted for Tcl."
|
quoted for Tcl."
|
||||||
:type 'string)
|
:type 'string)
|
||||||
|
|
||||||
|
(defface tcl-escaped-newline '((t :inherit font-lock-string-face))
|
||||||
|
"Face used for (non-escaped) backslash at end of a line in Tcl mode."
|
||||||
|
:group 'tcl
|
||||||
|
:version "22.1")
|
||||||
|
|
||||||
;;
|
;;
|
||||||
;; Keymaps, abbrevs, syntax tables.
|
;; Keymaps, abbrevs, syntax tables.
|
||||||
;;
|
;;
|
||||||
|
|
@ -371,6 +378,21 @@ Call `tcl-set-font-lock-keywords' after changing this list.")
|
||||||
Default list includes some TclX keywords.
|
Default list includes some TclX keywords.
|
||||||
Call `tcl-set-font-lock-keywords' after changing this list.")
|
Call `tcl-set-font-lock-keywords' after changing this list.")
|
||||||
|
|
||||||
|
(defvar tcl-builtin-list
|
||||||
|
'("after" "append" "array" "bgerror" "binary" "catch" "cd" "clock"
|
||||||
|
"close" "concat" "console" "dde" "encoding" "eof" "exec" "expr"
|
||||||
|
"fblocked" "fconfigure" "fcopy" "file" "fileevent" "flush"
|
||||||
|
"format" "gets" "glob" "history" "incr" "info" "interp" "join"
|
||||||
|
"lappend" "lindex" "linsert" "list" "llength" "load" "lrange"
|
||||||
|
"lreplace" "lsort" "namespace" "open" "package" "pid" "puts" "pwd"
|
||||||
|
"read" "regexp" "registry" "regsub" "rename" "scan" "seek" "set"
|
||||||
|
"socket" "source" "split" "string" "subst" "tell" "time" "trace"
|
||||||
|
"unknown" "unset" "vwait")
|
||||||
|
"List of Tcl commands. Used only for highlighting.
|
||||||
|
Call `tcl-set-font-lock-keywords' after changing this list.
|
||||||
|
This list excludes those commands already found in `tcl-proc-list' and
|
||||||
|
`tcl-keyword-list'.")
|
||||||
|
|
||||||
(defvar tcl-font-lock-keywords nil
|
(defvar tcl-font-lock-keywords nil
|
||||||
"Keywords to highlight for Tcl. See variable `font-lock-keywords'.
|
"Keywords to highlight for Tcl. See variable `font-lock-keywords'.
|
||||||
This variable is generally set from `tcl-proc-regexp',
|
This variable is generally set from `tcl-proc-regexp',
|
||||||
|
|
@ -466,14 +488,30 @@ Uses variables `tcl-proc-regexp' and `tcl-keyword-list'."
|
||||||
"\\(\\s-\\|$\\)")
|
"\\(\\s-\\|$\\)")
|
||||||
2 'font-lock-type-face)
|
2 'font-lock-type-face)
|
||||||
|
|
||||||
|
(list (concat "\\_<" (regexp-opt tcl-builtin-list t) "\\_>")
|
||||||
|
1 'font-lock-builtin-face)
|
||||||
|
|
||||||
|
;; When variable names are enclosed in {} braces, any
|
||||||
|
;; character can be used. Otherwise just letters, digits,
|
||||||
|
;; underscores. Variable names can be prefixed with any
|
||||||
|
;; number of "namespace::" qualifiers. A leading "::" refers
|
||||||
|
;; to the global namespace.
|
||||||
|
'("\\${\\([^}]+\\)}" 1 font-lock-variable-name-face)
|
||||||
|
'("\\$\\(\\(?:::\\)?\\(?:[[:alnum:]_]+::\\)*[[:alnum:]_]+\\)"
|
||||||
|
1 font-lock-variable-name-face)
|
||||||
|
'("\\(?:\\s-\\|^\\|\\[\\)set\\s-+{\\([^}]+\\)}"
|
||||||
|
1 font-lock-variable-name-face keep)
|
||||||
|
'("\\(?:\\s-\\|^\\|\\[\\)set\\s-+\\(\\(?:::\\)?\
|
||||||
|
\\(?:[[:alnum:]_]+::\\)*[[:alnum:]_]+\\)"
|
||||||
|
1 font-lock-variable-name-face keep)
|
||||||
|
|
||||||
|
'("\\(^\\|[^\\]\\)\\(\\\\\\\\\\)*\\(\\\\\\)$" 3 'tcl-escaped-newline)
|
||||||
|
|
||||||
;; Keywords. Only recognized if surrounded by whitespace.
|
;; Keywords. Only recognized if surrounded by whitespace.
|
||||||
;; FIXME consider using "not word or symbol", not
|
;; FIXME consider using "not word or symbol", not
|
||||||
;; "whitespace".
|
;; "whitespace".
|
||||||
(cons (concat "\\(\\s-\\|^\\)"
|
(cons (concat "\\_<" (regexp-opt tcl-keyword-list t) "\\_>")
|
||||||
;; FIXME Use regexp-quote?
|
1))))
|
||||||
(regexp-opt tcl-keyword-list t)
|
|
||||||
"\\(\\s-\\|$\\)")
|
|
||||||
2))))
|
|
||||||
|
|
||||||
(if tcl-proc-regexp
|
(if tcl-proc-regexp
|
||||||
()
|
()
|
||||||
|
|
@ -544,8 +582,8 @@ Commands:
|
||||||
|
|
||||||
(set (make-local-variable 'font-lock-defaults)
|
(set (make-local-variable 'font-lock-defaults)
|
||||||
'(tcl-font-lock-keywords nil nil nil beginning-of-defun
|
'(tcl-font-lock-keywords nil nil nil beginning-of-defun
|
||||||
(font-lock-syntactic-keywords . tcl-font-lock-syntactic-keywords)
|
(font-lock-syntactic-keywords . tcl-font-lock-syntactic-keywords)
|
||||||
(parse-sexp-lookup-properties . t)))
|
(parse-sexp-lookup-properties . t)))
|
||||||
|
|
||||||
(set (make-local-variable 'imenu-generic-expression)
|
(set (make-local-variable 'imenu-generic-expression)
|
||||||
tcl-imenu-generic-expression)
|
tcl-imenu-generic-expression)
|
||||||
|
|
@ -1507,5 +1545,5 @@ The first line is assumed to look like \"#!.../program ...\"."
|
||||||
|
|
||||||
(provide 'tcl)
|
(provide 'tcl)
|
||||||
|
|
||||||
;;; arch-tag: 8a032554-c3ef-422e-b84c-acec0522179d
|
;; arch-tag: 8a032554-c3ef-422e-b84c-acec0522179d
|
||||||
;;; tcl.el ends here
|
;;; tcl.el ends here
|
||||||
|
|
|
||||||
|
|
@ -12593,7 +12593,9 @@ This does background highlighting of translate-off regions.")
|
||||||
'vhdl-highlight-faces 'font-lock-variable-name-face 'custom-face)
|
'vhdl-highlight-faces 'font-lock-variable-name-face 'custom-face)
|
||||||
|
|
||||||
(defface vhdl-font-lock-prompt-face
|
(defface vhdl-font-lock-prompt-face
|
||||||
'((((class color) (background light)) (:foreground "Red" :bold t))
|
'((((min-colors 88) (class color) (background light))
|
||||||
|
(:foreground "Red1" :bold t))
|
||||||
|
(((class color) (background light)) (:foreground "Red" :bold t))
|
||||||
(((class color) (background dark)) (:foreground "Pink" :bold t))
|
(((class color) (background dark)) (:foreground "Pink" :bold t))
|
||||||
(t (:inverse-video t)))
|
(t (:inverse-video t)))
|
||||||
"Font lock mode face used to highlight prompts."
|
"Font lock mode face used to highlight prompts."
|
||||||
|
|
@ -12634,6 +12636,8 @@ This does background highlighting of translate-off regions.")
|
||||||
|
|
||||||
(defface vhdl-font-lock-reserved-words-face
|
(defface vhdl-font-lock-reserved-words-face
|
||||||
'((((class color) (background light)) (:foreground "Orange" :bold t))
|
'((((class color) (background light)) (:foreground "Orange" :bold t))
|
||||||
|
(((min-colors 88) (class color) (background dark))
|
||||||
|
(:foreground "Yellow1" :bold t))
|
||||||
(((class color) (background dark)) (:foreground "Yellow" :bold t))
|
(((class color) (background dark)) (:foreground "Yellow" :bold t))
|
||||||
(t ()))
|
(t ()))
|
||||||
"Font lock mode face used to highlight additional reserved words."
|
"Font lock mode face used to highlight additional reserved words."
|
||||||
|
|
@ -14975,7 +14979,8 @@ expansion function)."
|
||||||
:group 'speedbar-faces)
|
:group 'speedbar-faces)
|
||||||
|
|
||||||
(defface vhdl-speedbar-architecture-face
|
(defface vhdl-speedbar-architecture-face
|
||||||
'((((class color) (background light)) (:foreground "Blue"))
|
'((((min-colors 88) (class color) (background light)) (:foreground "Blue1"))
|
||||||
|
(((class color) (background light)) (:foreground "Blue"))
|
||||||
(((class color) (background dark)) (:foreground "LightSkyBlue")))
|
(((class color) (background dark)) (:foreground "LightSkyBlue")))
|
||||||
"Face used for displaying architecture names."
|
"Face used for displaying architecture names."
|
||||||
:group 'speedbar-faces)
|
:group 'speedbar-faces)
|
||||||
|
|
@ -15000,6 +15005,7 @@ expansion function)."
|
||||||
|
|
||||||
(defface vhdl-speedbar-instantiation-face
|
(defface vhdl-speedbar-instantiation-face
|
||||||
'((((class color) (background light)) (:foreground "Brown"))
|
'((((class color) (background light)) (:foreground "Brown"))
|
||||||
|
(((min-colors 88) (class color) (background dark)) (:foreground "Yellow1"))
|
||||||
(((class color) (background dark)) (:foreground "Yellow")))
|
(((class color) (background dark)) (:foreground "Yellow")))
|
||||||
"Face used for displaying instantiation names."
|
"Face used for displaying instantiation names."
|
||||||
:group 'speedbar-faces)
|
:group 'speedbar-faces)
|
||||||
|
|
@ -15017,7 +15023,9 @@ expansion function)."
|
||||||
:group 'speedbar-faces)
|
:group 'speedbar-faces)
|
||||||
|
|
||||||
(defface vhdl-speedbar-architecture-selected-face
|
(defface vhdl-speedbar-architecture-selected-face
|
||||||
'((((class color) (background light)) (:foreground "Blue" :underline t))
|
'((((min-colors 88) (class color) (background light)) (:foreground "Blue1" :underline t))
|
||||||
|
(((min-colors 88) (class color) (background light)) (:foreground "Blue1" :underline t))
|
||||||
|
(((class color) (background light)) (:foreground "Blue" :underline t))
|
||||||
(((class color) (background dark)) (:foreground "LightSkyBlue" :underline t)))
|
(((class color) (background dark)) (:foreground "LightSkyBlue" :underline t)))
|
||||||
"Face used for displaying architecture names."
|
"Face used for displaying architecture names."
|
||||||
:group 'speedbar-faces)
|
:group 'speedbar-faces)
|
||||||
|
|
@ -15036,6 +15044,7 @@ expansion function)."
|
||||||
|
|
||||||
(defface vhdl-speedbar-instantiation-selected-face
|
(defface vhdl-speedbar-instantiation-selected-face
|
||||||
'((((class color) (background light)) (:foreground "Brown" :underline t))
|
'((((class color) (background light)) (:foreground "Brown" :underline t))
|
||||||
|
(((min-colors 88) (class color) (background dark)) (:foreground "Yellow1" :underline t))
|
||||||
(((class color) (background dark)) (:foreground "Yellow" :underline t)))
|
(((class color) (background dark)) (:foreground "Yellow" :underline t)))
|
||||||
"Face used for displaying instantiation names."
|
"Face used for displaying instantiation names."
|
||||||
:group 'speedbar-faces)
|
:group 'speedbar-faces)
|
||||||
|
|
|
||||||
|
|
@ -175,6 +175,7 @@ Reveal mode renders invisible text around point visible again.
|
||||||
Interactively, with no prefix argument, toggle the mode.
|
Interactively, with no prefix argument, toggle the mode.
|
||||||
With universal prefix ARG (or if ARG is nil) turn mode on.
|
With universal prefix ARG (or if ARG is nil) turn mode on.
|
||||||
With zero or negative ARG turn mode off."
|
With zero or negative ARG turn mode off."
|
||||||
|
:group 'reveal
|
||||||
:lighter (global-reveal-mode nil " Reveal")
|
:lighter (global-reveal-mode nil " Reveal")
|
||||||
:keymap reveal-mode-map
|
:keymap reveal-mode-map
|
||||||
(if reveal-mode
|
(if reveal-mode
|
||||||
|
|
|
||||||
|
|
@ -114,6 +114,10 @@ If `fringe-arrow', indicate the locus by the fringe arrow."
|
||||||
|
|
||||||
(defvar next-error-highlight-timer nil)
|
(defvar next-error-highlight-timer nil)
|
||||||
|
|
||||||
|
(defvar next-error-overlay-arrow-position nil)
|
||||||
|
(put 'next-error-overlay-arrow-position 'overlay-arrow-string "=>")
|
||||||
|
(add-to-list 'overlay-arrow-variable-list 'next-error-overlay-arrow-position)
|
||||||
|
|
||||||
(defvar next-error-last-buffer nil
|
(defvar next-error-last-buffer nil
|
||||||
"The most recent next-error buffer.
|
"The most recent next-error buffer.
|
||||||
A buffer becomes most recent when its compilation, grep, or
|
A buffer becomes most recent when its compilation, grep, or
|
||||||
|
|
@ -302,7 +306,7 @@ select the source buffer."
|
||||||
When turned on, cursor motion in the compilation, grep, occur or diff
|
When turned on, cursor motion in the compilation, grep, occur or diff
|
||||||
buffer causes automatic display of the corresponding source code
|
buffer causes automatic display of the corresponding source code
|
||||||
location."
|
location."
|
||||||
nil " Fol" nil
|
:group 'next-error :init-value " Fol"
|
||||||
(if (not next-error-follow-minor-mode)
|
(if (not next-error-follow-minor-mode)
|
||||||
(remove-hook 'post-command-hook 'next-error-follow-mode-post-command-hook t)
|
(remove-hook 'post-command-hook 'next-error-follow-mode-post-command-hook t)
|
||||||
(add-hook 'post-command-hook 'next-error-follow-mode-post-command-hook nil t)
|
(add-hook 'post-command-hook 'next-error-follow-mode-post-command-hook nil t)
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
;;; smerge-mode.el --- Minor mode to resolve diff3 conflicts
|
;;; smerge-mode.el --- Minor mode to resolve diff3 conflicts
|
||||||
|
|
||||||
;; Copyright (C) 1999, 2000, 01, 03, 2004 Free Software Foundation, Inc.
|
;; Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
|
||||||
|
|
||||||
;; Author: Stefan Monnier <monnier@cs.yale.edu>
|
;; Author: Stefan Monnier <monnier@cs.yale.edu>
|
||||||
;; Keywords: revision-control merge diff3 cvs conflict
|
;; Keywords: revision-control merge diff3 cvs conflict
|
||||||
|
|
@ -76,8 +76,12 @@ Used in `smerge-diff-base-mine' and related functions."
|
||||||
:type 'boolean)
|
:type 'boolean)
|
||||||
|
|
||||||
(defface smerge-mine-face
|
(defface smerge-mine-face
|
||||||
'((((background light))
|
'((((min-colors 88) (background light))
|
||||||
|
(:foreground "blue1"))
|
||||||
|
(((background light))
|
||||||
(:foreground "blue"))
|
(:foreground "blue"))
|
||||||
|
(((min-colors 88) (background dark))
|
||||||
|
(:foreground "cyan1"))
|
||||||
(((background dark))
|
(((background dark))
|
||||||
(:foreground "cyan")))
|
(:foreground "cyan")))
|
||||||
"Face for your code."
|
"Face for your code."
|
||||||
|
|
@ -94,7 +98,9 @@ Used in `smerge-diff-base-mine' and related functions."
|
||||||
(defvar smerge-other-face 'smerge-other-face)
|
(defvar smerge-other-face 'smerge-other-face)
|
||||||
|
|
||||||
(defface smerge-base-face
|
(defface smerge-base-face
|
||||||
'((((background light))
|
'((((min-colors 88) (background light))
|
||||||
|
(:foreground "red1"))
|
||||||
|
(((background light))
|
||||||
(:foreground "red"))
|
(:foreground "red"))
|
||||||
(((background dark))
|
(((background dark))
|
||||||
(:foreground "orange")))
|
(:foreground "orange")))
|
||||||
|
|
@ -667,7 +673,7 @@ buffer names."
|
||||||
(define-minor-mode smerge-mode
|
(define-minor-mode smerge-mode
|
||||||
"Minor mode to simplify editing output from the diff3 program.
|
"Minor mode to simplify editing output from the diff3 program.
|
||||||
\\{smerge-mode-map}"
|
\\{smerge-mode-map}"
|
||||||
nil " SMerge" nil
|
:group 'smerge :lighter " SMerge"
|
||||||
(when (and (boundp 'font-lock-mode) font-lock-mode)
|
(when (and (boundp 'font-lock-mode) font-lock-mode)
|
||||||
(set (make-local-variable 'font-lock-multiline) t)
|
(set (make-local-variable 'font-lock-multiline) t)
|
||||||
(save-excursion
|
(save-excursion
|
||||||
|
|
|
||||||
|
|
@ -657,7 +657,7 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
|
||||||
(while (and (not done) args)
|
(while (and (not done) args)
|
||||||
(let* ((longopts '(("--no-init-file") ("--no-site-file") ("--user")
|
(let* ((longopts '(("--no-init-file") ("--no-site-file") ("--user")
|
||||||
("--debug-init") ("--iconic") ("--icon-type")
|
("--debug-init") ("--iconic") ("--icon-type")
|
||||||
("--no-blinking-cursor")))
|
("--no-blinking-cursor") ("--bare-bones")))
|
||||||
(argi (pop args))
|
(argi (pop args))
|
||||||
(orig-argi argi)
|
(orig-argi argi)
|
||||||
argval)
|
argval)
|
||||||
|
|
@ -677,7 +677,7 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
|
||||||
(setq argval nil
|
(setq argval nil
|
||||||
argi orig-argi)))))
|
argi orig-argi)))))
|
||||||
(cond
|
(cond
|
||||||
((equal argi "-Q")
|
((member argi '("-Q" "-bare-bones"))
|
||||||
(setq init-file-user nil
|
(setq init-file-user nil
|
||||||
site-run-file nil
|
site-run-file nil
|
||||||
no-blinking-cursor t
|
no-blinking-cursor t
|
||||||
|
|
@ -1004,8 +1004,27 @@ If this is nil, no message will be displayed."
|
||||||
using the mouse.\n\n"
|
using the mouse.\n\n"
|
||||||
:face (variable-pitch :weight bold)
|
:face (variable-pitch :weight bold)
|
||||||
"Important Help menu items:\n"
|
"Important Help menu items:\n"
|
||||||
:face variable-pitch "\
|
:face variable-pitch
|
||||||
Emacs Tutorial\tLearn-by-doing tutorial for using Emacs efficiently
|
(lambda ()
|
||||||
|
(let* ((en "TUTORIAL")
|
||||||
|
(tut (or (get-language-info current-language-environment
|
||||||
|
'tutorial)
|
||||||
|
en))
|
||||||
|
(title (with-temp-buffer
|
||||||
|
(insert-file-contents
|
||||||
|
(expand-file-name tut data-directory)
|
||||||
|
nil 0 256)
|
||||||
|
(search-forward ".")
|
||||||
|
(buffer-substring (point-min) (1- (point))))))
|
||||||
|
;; If there is a specific tutorial for the current language
|
||||||
|
;; environment and it is not English, append its title.
|
||||||
|
(concat
|
||||||
|
"Emacs Tutorial\tLearn how to use Emacs efficiently"
|
||||||
|
(if (string= en tut)
|
||||||
|
""
|
||||||
|
(concat " (" title ")"))
|
||||||
|
"\n")))
|
||||||
|
:face variable-pitch "\
|
||||||
Emacs FAQ\tFrequently asked questions and answers
|
Emacs FAQ\tFrequently asked questions and answers
|
||||||
Read the Emacs Manual\tView the Emacs manual using Info
|
Read the Emacs Manual\tView the Emacs manual using Info
|
||||||
\(Non)Warranty\tGNU Emacs comes with "
|
\(Non)Warranty\tGNU Emacs comes with "
|
||||||
|
|
@ -1069,14 +1088,18 @@ Values less than 60 seconds are ignored."
|
||||||
|
|
||||||
(defun fancy-splash-insert (&rest args)
|
(defun fancy-splash-insert (&rest args)
|
||||||
"Insert text into the current buffer, with faces.
|
"Insert text into the current buffer, with faces.
|
||||||
Arguments from ARGS should be either strings or pairs `:face FACE',
|
Arguments from ARGS should be either strings, functions called
|
||||||
|
with no args that return a string, or pairs `:face FACE',
|
||||||
where FACE is a valid face specification, as it can be used with
|
where FACE is a valid face specification, as it can be used with
|
||||||
`put-text-properties'."
|
`put-text-properties'."
|
||||||
(let ((current-face nil))
|
(let ((current-face nil))
|
||||||
(while args
|
(while args
|
||||||
(if (eq (car args) :face)
|
(if (eq (car args) :face)
|
||||||
(setq args (cdr args) current-face (car args))
|
(setq args (cdr args) current-face (car args))
|
||||||
(insert (propertize (car args)
|
(insert (propertize (let ((it (car args)))
|
||||||
|
(if (functionp it)
|
||||||
|
(funcall it)
|
||||||
|
it))
|
||||||
'face current-face
|
'face current-face
|
||||||
'help-echo fancy-splash-help-echo)))
|
'help-echo fancy-splash-help-echo)))
|
||||||
(setq args (cdr args)))))
|
(setq args (cdr args)))))
|
||||||
|
|
@ -1461,9 +1484,16 @@ normal otherwise."
|
||||||
nil t))
|
nil t))
|
||||||
(error nil))
|
(error nil))
|
||||||
(kill-buffer buffer)))))
|
(kill-buffer buffer)))))
|
||||||
;; Stop any "Loading image..." message hiding echo-area-message.
|
;; display-splash-screen at the end of command-line-1 calls
|
||||||
(use-fancy-splash-screens-p)
|
;; use-fancy-splash-screens-p. This can cause image.el to be
|
||||||
(display-startup-echo-area-message))
|
;; loaded, putting "Loading image... done" in the echo area.
|
||||||
|
;; This hides startup-echo-area-message. So
|
||||||
|
;; use-fancy-splash-screens-p is called here simply to get the
|
||||||
|
;; loading of image.el (if needed) out of the way before
|
||||||
|
;; display-startup-echo-area-message runs.
|
||||||
|
(progn
|
||||||
|
(use-fancy-splash-screens-p)
|
||||||
|
(display-startup-echo-area-message)))
|
||||||
|
|
||||||
;; Delay 2 seconds after an init file error message
|
;; Delay 2 seconds after an init file error message
|
||||||
;; was displayed, so user can read it.
|
;; was displayed, so user can read it.
|
||||||
|
|
|
||||||
|
|
@ -3231,7 +3231,7 @@ See `term-prompt-regexp'."
|
||||||
((eq char ?P)
|
((eq char ?P)
|
||||||
(term-delete-chars (max 1 term-terminal-parameter)))
|
(term-delete-chars (max 1 term-terminal-parameter)))
|
||||||
;; \E[@ - insert spaces
|
;; \E[@ - insert spaces
|
||||||
((eq char ?@)
|
((eq char ?@) ;; (terminfo: ich)
|
||||||
(term-insert-spaces (max 1 term-terminal-parameter)))
|
(term-insert-spaces (max 1 term-terminal-parameter)))
|
||||||
;; \E[?h - DEC Private Mode Set
|
;; \E[?h - DEC Private Mode Set
|
||||||
((eq char ?h)
|
((eq char ?h)
|
||||||
|
|
|
||||||
|
|
@ -1178,7 +1178,10 @@ See the documentation of `create-fontset-from-fontset-spec for the format.")
|
||||||
(new-fontset font (x-complement-fontset-spec xlfd-fields nil))
|
(new-fontset font (x-complement-fontset-spec xlfd-fields nil))
|
||||||
;; Create a fontset from FONT. The fontset name is
|
;; Create a fontset from FONT. The fontset name is
|
||||||
;; generated from FONT.
|
;; generated from FONT.
|
||||||
(create-fontset-from-ascii-font font resolved-name "startup"))))
|
(if (and (string= "mac" (aref xlfd-fields xlfd-regexp-registry-subnum))
|
||||||
|
(string= "roman" (aref xlfd-fields xlfd-regexp-encoding-subnum)))
|
||||||
|
(create-fontset-from-mac-roman-font font resolved-name "startup")
|
||||||
|
(create-fontset-from-ascii-font font resolved-name "startup")))))
|
||||||
|
|
||||||
;; Apply a geometry resource to the initial frame. Put it at the end
|
;; Apply a geometry resource to the initial frame. Put it at the end
|
||||||
;; of the alist, so that anything specified on the command line takes
|
;; of the alist, so that anything specified on the command line takes
|
||||||
|
|
|
||||||
|
|
@ -107,15 +107,15 @@
|
||||||
("red" 1 (205 0 0)) ; red3
|
("red" 1 (205 0 0)) ; red3
|
||||||
("green" 2 ( 0 205 0)) ; green3
|
("green" 2 ( 0 205 0)) ; green3
|
||||||
("yellow" 3 (205 205 0)) ; yellow3
|
("yellow" 3 (205 205 0)) ; yellow3
|
||||||
("blue" 4 ( 0 0 205)) ; blue3
|
("blue" 4 ( 0 0 238)) ; blue2
|
||||||
("magenta" 5 (205 0 205)) ; magenta3
|
("magenta" 5 (205 0 205)) ; magenta3
|
||||||
("cyan" 6 ( 0 205 205)) ; cyan3
|
("cyan" 6 ( 0 205 205)) ; cyan3
|
||||||
("white" 7 (229 229 229)) ; gray90
|
("white" 7 (229 229 229)) ; gray90
|
||||||
("brightblack" 8 ( 77 77 77)) ; gray30
|
("brightblack" 8 (127 127 127)) ; gray50
|
||||||
("brightred" 9 (255 0 0)) ; red
|
("brightred" 9 (255 0 0)) ; red
|
||||||
("brightgreen" 10 ( 0 255 0)) ; green
|
("brightgreen" 10 ( 0 255 0)) ; green
|
||||||
("brightyellow" 11 (255 255 0)) ; yellow
|
("brightyellow" 11 (255 255 0)) ; yellow
|
||||||
("brightblue" 12 ( 0 0 255)) ; blue
|
("brightblue" 12 (92 92 255)) ; rgb:5c/5c/ff
|
||||||
("brightmagenta" 13 (255 0 255)) ; magenta
|
("brightmagenta" 13 (255 0 255)) ; magenta
|
||||||
("brightcyan" 14 ( 0 255 255)) ; cyan
|
("brightcyan" 14 ( 0 255 255)) ; cyan
|
||||||
("brightwhite" 15 (255 255 255))) ; white
|
("brightwhite" 15 (255 255 255))) ; white
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
;;; bibtex.el --- BibTeX mode for GNU Emacs
|
;;; bibtex.el --- BibTeX mode for GNU Emacs
|
||||||
|
|
||||||
;; Copyright (C) 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2003, 2004
|
;; Copyright (C) 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2003, 2004, 2005
|
||||||
;; Free Software Foundation, Inc.
|
;; Free Software Foundation, Inc.
|
||||||
|
|
||||||
;; Author: Stefan Schoef <schoef@offis.uni-oldenburg.de>
|
;; Author: Stefan Schoef <schoef@offis.uni-oldenburg.de>
|
||||||
|
|
@ -784,41 +784,56 @@ Used by `bibtex-complete-crossref-cleanup' and `bibtex-copy-summary-as-kill'."
|
||||||
(function :tag "Personalized function")))
|
(function :tag "Personalized function")))
|
||||||
|
|
||||||
(defcustom bibtex-generate-url-list
|
(defcustom bibtex-generate-url-list
|
||||||
'((("url" . ".*:.*"))
|
'((("url" . ".*:.*")))
|
||||||
;; Example of a complex setup.
|
|
||||||
(("journal" . "\\<\\(PR[ABCDEL]?\\|RMP\\)\\>")
|
|
||||||
"http://link.aps.org/abstract/"
|
|
||||||
("journal" ".*" downcase)
|
|
||||||
"/v"
|
|
||||||
("volume" ".*" 0)
|
|
||||||
"/p"
|
|
||||||
("pages" "\\`\\([0-9]+\\)" 1)))
|
|
||||||
"List of schemes for generating the URL of a BibTeX entry.
|
"List of schemes for generating the URL of a BibTeX entry.
|
||||||
These schemes are used by `bibtex-url'.
|
These schemes are used by `bibtex-url'.
|
||||||
|
|
||||||
Each scheme is of the form ((FIELD . REGEXP) STEP...).
|
Each scheme should have one of these forms:
|
||||||
|
|
||||||
|
((FIELD . REGEXP))
|
||||||
|
((FIELD . REGEXP) STEP...)
|
||||||
|
((FIELD . REGEXP) STRING STEP...)
|
||||||
|
|
||||||
FIELD is a field name as returned by `bibtex-parse-entry'.
|
FIELD is a field name as returned by `bibtex-parse-entry'.
|
||||||
REGEXP is matched against the text of FIELD. If the match succeeds, then
|
REGEXP is matched against the text of FIELD. If the match succeeds,
|
||||||
this scheme is used. If no STEPs are specified the matched text is used
|
then this scheme is used. If no STRING and STEPs are specified
|
||||||
as the URL, otherwise the URL is built by concatenating the STEPs.
|
the matched text is used as the URL, otherwise the URL is built
|
||||||
|
by evaluating STEPs. If no STRING is specified the STEPs must result
|
||||||
|
in strings which are concatenated. Otherwise the resulting objects
|
||||||
|
are passed through `format' using STRING as format control string.
|
||||||
|
|
||||||
A STEP can be a string or a list (FIELD REGEXP REPLACE) in which case
|
A STEP is a list (FIELD REGEXP REPLACE). The text of FIELD
|
||||||
the text of FIELD is matched against REGEXP, and is replaced with REPLACE.
|
is matched against REGEXP, and is replaced with REPLACE.
|
||||||
REPLACE can be a string, or a number (which selects the corresponding submatch)
|
REPLACE can be a string, or a number (which selects the corresponding
|
||||||
or a function called with the field's text as argument and with the
|
submatch), or a function called with the field's text as argument
|
||||||
`match-data' properly set.
|
and with the `match-data' properly set.
|
||||||
|
|
||||||
Case is always ignored. Always remove the field delimiters."
|
Case is always ignored. Always remove the field delimiters.
|
||||||
|
|
||||||
|
The following is a complex example, see http://link.aps.org/linkfaq.html.
|
||||||
|
|
||||||
|
(((\"journal\" . \"\\\\=<\\(PR[ABCDEL]?\\|RMP\\)\\\\=>\")
|
||||||
|
\"http://link.aps.org/abstract/%s/v%s/p%s\"
|
||||||
|
(\"journal\" \".*\" downcase)
|
||||||
|
(\"volume\" \".*\" 0)
|
||||||
|
(\"pages\" \"\\`[A-Z]?[0-9]+\" 0)))"
|
||||||
:group 'bibtex
|
:group 'bibtex
|
||||||
:type '(repeat
|
:type '(repeat
|
||||||
(list :tag "Scheme"
|
(cons :tag "Scheme"
|
||||||
(cons :tag "Matcher" :extra-offset 4
|
(cons :tag "Matcher" :extra-offset 4
|
||||||
(string :tag "BibTeX field")
|
(string :tag "BibTeX field")
|
||||||
(regexp :tag "Regexp"))
|
(regexp :tag "Regexp"))
|
||||||
(repeat :tag "Steps to generate URL" :inline t
|
(choice
|
||||||
(choice
|
(const :tag "Take match as is" nil)
|
||||||
(string :tag "Literal text")
|
(cons :tag "Formatted"
|
||||||
|
(string :tag "Format control string")
|
||||||
|
(repeat :tag "Steps to generate URL"
|
||||||
|
(list (string :tag "BibTeX field")
|
||||||
|
(regexp :tag "Regexp")
|
||||||
|
(choice (string :tag "Replacement")
|
||||||
|
(integer :tag "Sub-match")
|
||||||
|
(function :tag "Filter")))))
|
||||||
|
(repeat :tag "Concatenated"
|
||||||
(list (string :tag "BibTeX field")
|
(list (string :tag "BibTeX field")
|
||||||
(regexp :tag "Regexp")
|
(regexp :tag "Regexp")
|
||||||
(choice (string :tag "Replacement")
|
(choice (string :tag "Replacement")
|
||||||
|
|
@ -2662,11 +2677,10 @@ begins at the beginning of a line. We use this function for font-locking."
|
||||||
(let ((lst bibtex-generate-url-list) url)
|
(let ((lst bibtex-generate-url-list) url)
|
||||||
(goto-char start)
|
(goto-char start)
|
||||||
(while (and (not found)
|
(while (and (not found)
|
||||||
(setq url (caar lst)))
|
(setq url (car (pop lst))))
|
||||||
(setq found (and (bibtex-string= field (car url))
|
(setq found (and (bibtex-string= field (car url))
|
||||||
(re-search-forward (cdr url) end t)
|
(re-search-forward (cdr url) end t)
|
||||||
(>= (match-beginning 0) pnt))
|
(>= (match-beginning 0) pnt)))))
|
||||||
lst (cdr lst))))
|
|
||||||
(goto-char end))
|
(goto-char end))
|
||||||
(if found (bibtex-button (match-beginning 0) (match-end 0)
|
(if found (bibtex-button (match-beginning 0) (match-end 0)
|
||||||
'bibtex-url (match-beginning 0)))
|
'bibtex-url (match-beginning 0)))
|
||||||
|
|
@ -4283,39 +4297,36 @@ The URL is generated using the schemes defined in `bibtex-generate-url-list'
|
||||||
;; Always ignore case,
|
;; Always ignore case,
|
||||||
(case-fold-search t)
|
(case-fold-search t)
|
||||||
(lst bibtex-generate-url-list)
|
(lst bibtex-generate-url-list)
|
||||||
field url scheme)
|
field url scheme obj fmt)
|
||||||
(while (setq scheme (pop lst))
|
(while (setq scheme (pop lst))
|
||||||
(when (and (setq field (cdr (assoc-string (caar scheme)
|
(when (and (setq field (cdr (assoc-string (caar scheme)
|
||||||
fields-alist t)))
|
fields-alist t)))
|
||||||
;; Always remove field delimiters
|
;; Always remove field delimiters
|
||||||
(progn (setq field (bibtex-remove-delimiters-string field))
|
(progn (setq field (bibtex-remove-delimiters-string field))
|
||||||
(string-match (cdar scheme) field)))
|
(string-match (cdar scheme) field)))
|
||||||
(setq lst nil)
|
(setq lst nil
|
||||||
(if (null (cdr scheme))
|
scheme (cdr scheme)
|
||||||
(setq url (match-string 0 field)))
|
url (if (null scheme) (match-string 0 field)
|
||||||
(dolist (step (cdr scheme))
|
(if (stringp (car scheme))
|
||||||
(cond ((stringp step)
|
(setq fmt (pop scheme)))
|
||||||
(setq url (concat url step)))
|
(dolist (step scheme)
|
||||||
((setq field (cdr (assoc-string (car step) fields-alist t)))
|
;; Always remove field delimiters
|
||||||
;; Always remove field delimiters
|
(setq field (bibtex-remove-delimiters-string
|
||||||
(setq field (bibtex-remove-delimiters-string field))
|
(cdr (assoc-string (car step) fields-alist t))))
|
||||||
(if (string-match (nth 1 step) field)
|
(if (string-match (nth 1 step) field)
|
||||||
(setq field (cond
|
(setq field (cond ((functionp (nth 2 step))
|
||||||
((functionp (nth 2 step))
|
(funcall (nth 2 step) field))
|
||||||
(funcall (nth 2 step) field))
|
((numberp (nth 2 step))
|
||||||
((numberp (nth 2 step))
|
(match-string (nth 2 step) field))
|
||||||
(match-string (nth 2 step) field))
|
(t
|
||||||
(t
|
(replace-match (nth 2 step) t nil field))))
|
||||||
(replace-match (nth 2 step) t nil field))))
|
;; If the scheme is set up correctly,
|
||||||
;; If the scheme is set up correctly,
|
;; we should never reach this point
|
||||||
;; we should never reach this point
|
(error "Match failed: %s" field))
|
||||||
(error "Match failed: %s" field))
|
(push field obj))
|
||||||
(setq url (concat url field)))
|
(if fmt (apply 'format fmt (nreverse obj))
|
||||||
;; If the scheme is set up correctly,
|
(apply 'concat (nreverse obj)))))
|
||||||
;; we should never reach this point
|
(browse-url (message "%s" url))))
|
||||||
(t (error "Step failed: %s" step))))
|
|
||||||
(message "%s" url)
|
|
||||||
(browse-url url)))
|
|
||||||
(unless url (message "No URL known.")))))
|
(unless url (message "No URL known.")))))
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
;;; enriched.el --- read and save files in text/enriched format
|
;;; enriched.el --- read and save files in text/enriched format
|
||||||
|
|
||||||
;; Copyright (c) 1994, 1995, 1996, 2002, 2004 Free Software Foundation, Inc.
|
;; Copyright (c) 1994, 1995, 1996, 2002, 2004, 2005 Free Software Foundation, Inc.
|
||||||
|
|
||||||
;; Author: Boris Goldowsky <boris@gnu.org>
|
;; Author: Boris Goldowsky <boris@gnu.org>
|
||||||
;; Keywords: wp, faces
|
;; Keywords: wp, faces
|
||||||
|
|
@ -183,7 +183,7 @@ etc/enriched.doc in the Emacs distribution directory.
|
||||||
Commands:
|
Commands:
|
||||||
|
|
||||||
\\{enriched-mode-map}"
|
\\{enriched-mode-map}"
|
||||||
nil " Enriched" nil
|
:group 'enriched :lighter " Enriched"
|
||||||
(cond ((null enriched-mode)
|
(cond ((null enriched-mode)
|
||||||
;; Turn mode off
|
;; Turn mode off
|
||||||
(setq buffer-file-format (delq 'text/enriched buffer-file-format))
|
(setq buffer-file-format (delq 'text/enriched buffer-file-format))
|
||||||
|
|
|
||||||
|
|
@ -221,10 +221,10 @@ Set this to nil if you don't want a modeline indicator."
|
||||||
|
|
||||||
(defcustom flyspell-large-region 1000
|
(defcustom flyspell-large-region 1000
|
||||||
"*The threshold that determines if a region is small.
|
"*The threshold that determines if a region is small.
|
||||||
The `flyspell-region' function is invoked if the region is small, the
|
If the region is smaller than this number of characters,
|
||||||
word are checked one after the other using regular flyspell check
|
`flyspell-region' checks the words sequentially using regular
|
||||||
means. If the region is large, a new Ispell process is spawned to get
|
flyspell methods. Else, if the region is large, a new Ispell process is
|
||||||
speed."
|
spawned for speed."
|
||||||
:group 'flyspell
|
:group 'flyspell
|
||||||
:version "21.1"
|
:version "21.1"
|
||||||
:type 'number)
|
:type 'number)
|
||||||
|
|
|
||||||
|
|
@ -279,7 +279,7 @@ the following lines anywhere in the buffer:
|
||||||
:group 'org-startup
|
:group 'org-startup
|
||||||
:type 'boolean)
|
:type 'boolean)
|
||||||
|
|
||||||
(defcustom org-insert-mode-line-in-empty-file t
|
(defcustom org-insert-mode-line-in-empty-file nil
|
||||||
"Non-nil means insert the first line setting Org-mode in empty files.
|
"Non-nil means insert the first line setting Org-mode in empty files.
|
||||||
When the function `org-mode' is called interactively in an empty, this
|
When the function `org-mode' is called interactively in an empty, this
|
||||||
normally means that the file name does not automatically trigger Org-mode.
|
normally means that the file name does not automatically trigger Org-mode.
|
||||||
|
|
@ -3477,7 +3477,7 @@ date."
|
||||||
(defun org-diary-default-entry ()
|
(defun org-diary-default-entry ()
|
||||||
"Add a dummy entry to the diary.
|
"Add a dummy entry to the diary.
|
||||||
Needed to avoid empty dates which mess up holiday display."
|
Needed to avoid empty dates which mess up holiday display."
|
||||||
(add-to-diary-list original-date "Org-mode dummy" ""))
|
(add-to-diary-list original-date "Org-mode dummy" "" nil))
|
||||||
|
|
||||||
(defun org-add-file (&optional file)
|
(defun org-add-file (&optional file)
|
||||||
"Add current file to the list of files in variable `org-agenda-files'.
|
"Add current file to the list of files in variable `org-agenda-files'.
|
||||||
|
|
|
||||||
|
|
@ -221,7 +221,9 @@ With prefix arg, turn Refill mode on iff arg is positive.
|
||||||
When Refill mode is on, the current paragraph will be formatted when
|
When Refill mode is on, the current paragraph will be formatted when
|
||||||
changes are made within it. Self-inserting characters only cause
|
changes are made within it. Self-inserting characters only cause
|
||||||
refilling if they would cause auto-filling."
|
refilling if they would cause auto-filling."
|
||||||
nil " Refill" '(("\177" . backward-delete-char-untabify))
|
:group 'refill
|
||||||
|
:lighter " Refill"
|
||||||
|
:keymap '(("\177" . backward-delete-char-untabify))
|
||||||
;; Remove old state if necessary
|
;; Remove old state if necessary
|
||||||
(when refill-ignorable-overlay
|
(when refill-ignorable-overlay
|
||||||
(delete-overlay refill-ignorable-overlay)
|
(delete-overlay refill-ignorable-overlay)
|
||||||
|
|
|
||||||
|
|
@ -683,7 +683,9 @@ height."
|
||||||
:group 'table)
|
:group 'table)
|
||||||
|
|
||||||
(defface table-cell-face
|
(defface table-cell-face
|
||||||
'((((class color))
|
'((((min-colors 88) (class color))
|
||||||
|
(:foreground "gray90" :background "blue1"))
|
||||||
|
(((class color))
|
||||||
(:foreground "gray90" :background "blue"))
|
(:foreground "gray90" :background "blue"))
|
||||||
(t (:bold t)))
|
(t (:bold t)))
|
||||||
"*Face used for table cell contents."
|
"*Face used for table cell contents."
|
||||||
|
|
|
||||||
|
|
@ -573,7 +573,7 @@ An alternative value is \" . \", if you use a font with a narrow period."
|
||||||
2 '(tex-font-lock-append-prop 'italic) 'append)
|
2 '(tex-font-lock-append-prop 'italic) 'append)
|
||||||
;; This is separate from the previous one because of cases like
|
;; This is separate from the previous one because of cases like
|
||||||
;; {\em foo {\bf bar} bla} where both match.
|
;; {\em foo {\bf bar} bla} where both match.
|
||||||
(list (concat "\\\\\\(bf\\)\\>" args)
|
(list (concat "\\\\\\(bf\\(series\\)?\\)\\>" args)
|
||||||
2 '(tex-font-lock-append-prop 'bold) 'append)))))
|
2 '(tex-font-lock-append-prop 'bold) 'append)))))
|
||||||
"Gaudy expressions to highlight in TeX modes.")
|
"Gaudy expressions to highlight in TeX modes.")
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,7 @@
|
||||||
|
2005-04-04 Lute Kamstra <lute@gnu.org>
|
||||||
|
|
||||||
|
* url-handlers.el (url-handler-mode): Specify :group.
|
||||||
|
|
||||||
2005-02-26 James Cloos <cloos@jhcloos.com> (tiny change)
|
2005-02-26 James Cloos <cloos@jhcloos.com> (tiny change)
|
||||||
|
|
||||||
* url-history.el (url-have-visited-url): Don't barf if
|
* url-history.el (url-have-visited-url): Don't barf if
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
;;; url-handlers.el --- file-name-handler stuff for URL loading
|
;;; url-handlers.el --- file-name-handler stuff for URL loading
|
||||||
|
|
||||||
;; Copyright (c) 1996, 1997, 1998, 1999, 2004 Free Software Foundation, Inc.
|
;; Copyright (c) 1996, 1997, 1998, 1999, 2004, 2005 Free Software Foundation, Inc.
|
||||||
|
|
||||||
;; Keywords: comm, data, processes, hypermedia
|
;; Keywords: comm, data, processes, hypermedia
|
||||||
|
|
||||||
|
|
@ -106,7 +106,7 @@ particularly bad at this\).")
|
||||||
;;;###autoload
|
;;;###autoload
|
||||||
(define-minor-mode url-handler-mode
|
(define-minor-mode url-handler-mode
|
||||||
"Use URL to handle URL-like file names."
|
"Use URL to handle URL-like file names."
|
||||||
:global t
|
:global t :group 'url
|
||||||
(if (not (boundp 'file-name-handler-alist))
|
(if (not (boundp 'file-name-handler-alist))
|
||||||
;; Can't be turned ON anyway.
|
;; Can't be turned ON anyway.
|
||||||
(setq url-handler-mode nil)
|
(setq url-handler-mode nil)
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
;;; wdired.el --- Rename files editing their names in dired buffers
|
;;; wdired.el --- Rename files editing their names in dired buffers
|
||||||
|
|
||||||
;; Copyright (C) 2001, 2004 Free Software Foundation, Inc.
|
;; Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc.
|
||||||
|
|
||||||
;; Filename: wdired.el
|
;; Filename: wdired.el
|
||||||
;; Author: Juan León Lahoz García <juan-leon.lahoz@tecsidel.es>
|
;; Author: Juan León Lahoz García <juanleon1@gmail.com>
|
||||||
;; Version: 1.91
|
;; Version: 2.0
|
||||||
;; Keywords: dired, environment, files, renaming
|
;; Keywords: dired, environment, files, renaming
|
||||||
|
|
||||||
;; This file is part of GNU Emacs.
|
;; This file is part of GNU Emacs.
|
||||||
|
|
@ -156,9 +156,8 @@
|
||||||
|
|
||||||
;;; Code:
|
;;; Code:
|
||||||
|
|
||||||
|
(defvar dired-backup-overwrite) ; Only in emacs 20.x this is a custom var
|
||||||
(eval-when-compile
|
(eval-when-compile
|
||||||
(require 'advice)
|
|
||||||
(defvar dired-backup-overwrite) ; Only in emacs 20.x this is a custom var
|
|
||||||
(set (make-local-variable 'byte-compile-dynamic) t))
|
(set (make-local-variable 'byte-compile-dynamic) t))
|
||||||
|
|
||||||
(eval-and-compile
|
(eval-and-compile
|
||||||
|
|
@ -199,19 +198,6 @@ If nil, \"up\" and \"down\" movement is done as in any other buffer."
|
||||||
(other :tag "As in dired mode" t))
|
(other :tag "As in dired mode" t))
|
||||||
:group 'wdired)
|
:group 'wdired)
|
||||||
|
|
||||||
(defcustom wdired-advise-functions t
|
|
||||||
"*If t some editing commands are advised when wdired is loaded.
|
|
||||||
The advice only has effect in wdired mode. These commands are
|
|
||||||
`query-replace' `query-replace-regexp' `replace-string', and the
|
|
||||||
advice makes them to ignore read-only regions, so no attempts to
|
|
||||||
modify these regions are done by them, and so they don't end
|
|
||||||
prematurely.
|
|
||||||
|
|
||||||
Setting this to nil does not unadvise the functions, if they are
|
|
||||||
already advised, but new Emacs will not advise them."
|
|
||||||
:type 'boolean
|
|
||||||
:group 'wdired)
|
|
||||||
|
|
||||||
(defcustom wdired-allow-to-redirect-links t
|
(defcustom wdired-allow-to-redirect-links t
|
||||||
"*If non-nil, the target of the symbolic links can be changed also.
|
"*If non-nil, the target of the symbolic links can be changed also.
|
||||||
In systems without symbolic links support, this variable has no effect
|
In systems without symbolic links support, this variable has no effect
|
||||||
|
|
@ -309,6 +295,7 @@ See `wdired-mode'."
|
||||||
(interactive)
|
(interactive)
|
||||||
(set (make-local-variable 'wdired-old-content)
|
(set (make-local-variable 'wdired-old-content)
|
||||||
(buffer-substring (point-min) (point-max)))
|
(buffer-substring (point-min) (point-max)))
|
||||||
|
(set (make-local-variable 'query-replace-skip-read-only) t)
|
||||||
(use-local-map wdired-mode-map)
|
(use-local-map wdired-mode-map)
|
||||||
(force-mode-line-update)
|
(force-mode-line-update)
|
||||||
(setq buffer-read-only nil)
|
(setq buffer-read-only nil)
|
||||||
|
|
@ -664,64 +651,6 @@ Like original function but it skips read-only words."
|
||||||
(interactive "p")
|
(interactive "p")
|
||||||
(wdired-xcase-word 'capitalize-word arg))
|
(wdired-xcase-word 'capitalize-word arg))
|
||||||
|
|
||||||
;; The following code is related to advice some interactive functions
|
|
||||||
;; to make some editing commands in wdired mode not to fail trying to
|
|
||||||
;; change read-only text. Notice that some advises advice and unadvise
|
|
||||||
;; them-self to another functions: search-forward and
|
|
||||||
;; re-search-forward. This is to keep these functions advised only
|
|
||||||
;; when is necessary. Since they are built-in commands used heavily in
|
|
||||||
;; lots of places, to have it permanently advised would cause some
|
|
||||||
;; performance loss.
|
|
||||||
|
|
||||||
|
|
||||||
(defun wdired-add-skip-in-replace (command)
|
|
||||||
"Advice COMMAND to skip matches while they have read-only properties.
|
|
||||||
This is useful to avoid \"read-only\" errors in search and replace
|
|
||||||
commands. This advice only has effect in wdired mode."
|
|
||||||
(eval
|
|
||||||
`(defadvice ,command (around wdired-discard-read-only activate)
|
|
||||||
,(format "Make %s to work better with wdired,\n%s." command
|
|
||||||
"skipping read-only matches when invoked without argument")
|
|
||||||
ad-do-it
|
|
||||||
(if (eq major-mode 'wdired-mode)
|
|
||||||
(while (and ad-return-value
|
|
||||||
(text-property-any
|
|
||||||
(max 1 (1- (match-beginning 0))) (match-end 0)
|
|
||||||
'read-only t))
|
|
||||||
ad-do-it))
|
|
||||||
ad-return-value)))
|
|
||||||
|
|
||||||
|
|
||||||
(defun wdired-add-replace-advice (command)
|
|
||||||
"Advice COMMAND to skip matches while they have read-only properties.
|
|
||||||
This is useful to avoid \"read-only\" errors in search and replace
|
|
||||||
commands. This advice only has effect in wdired mode."
|
|
||||||
(eval
|
|
||||||
`(defadvice ,command (around wdired-grok-read-only activate)
|
|
||||||
,(format "Make %s to work better with wdired,\n%s." command
|
|
||||||
"skipping read-only matches when invoked without argument")
|
|
||||||
(if (eq major-mode 'wdired-mode)
|
|
||||||
(progn
|
|
||||||
(wdired-add-skip-in-replace 'search-forward)
|
|
||||||
(wdired-add-skip-in-replace 're-search-forward)
|
|
||||||
(unwind-protect
|
|
||||||
ad-do-it
|
|
||||||
(progn
|
|
||||||
(ad-remove-advice 'search-forward
|
|
||||||
'around 'wdired-discard-read-only)
|
|
||||||
(ad-remove-advice 're-search-forward
|
|
||||||
'around 'wdired-discard-read-only)
|
|
||||||
(ad-update 'search-forward)
|
|
||||||
(ad-update 're-search-forward))))
|
|
||||||
ad-do-it)
|
|
||||||
ad-return-value)))
|
|
||||||
|
|
||||||
|
|
||||||
(if wdired-advise-functions
|
|
||||||
(progn
|
|
||||||
(mapcar 'wdired-add-replace-advice
|
|
||||||
'(query-replace query-replace-regexp replace-string))))
|
|
||||||
|
|
||||||
|
|
||||||
;; The following code deals with changing the access bits (or
|
;; The following code deals with changing the access bits (or
|
||||||
;; permissions) of the files.
|
;; permissions) of the files.
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
;;; whitespace.el --- warn about and clean bogus whitespaces in the file
|
;;; whitespace.el --- warn about and clean bogus whitespaces in the file
|
||||||
|
|
||||||
;; Copyright (C) 1999, 2000 Free Software Foundation, Inc.
|
;; Copyright (C) 1999, 2000, 2005 Free Software Foundation, Inc.
|
||||||
|
|
||||||
;; Author: Rajesh Vaidheeswarran <rv@gnu.org>
|
;; Author: Rajesh Vaidheeswarran <rv@gnu.org>
|
||||||
;; Keywords: convenience
|
;; Keywords: convenience
|
||||||
|
|
@ -319,7 +319,7 @@ To disable timer scans, set this to zero."
|
||||||
:group 'faces)
|
:group 'faces)
|
||||||
|
|
||||||
(defface whitespace-highlight-face '((((class color) (background light))
|
(defface whitespace-highlight-face '((((class color) (background light))
|
||||||
(:background "green"))
|
(:background "green1"))
|
||||||
(((class color) (background dark))
|
(((class color) (background dark))
|
||||||
(:background "sea green"))
|
(:background "sea green"))
|
||||||
(((class grayscale mono)
|
(((class grayscale mono)
|
||||||
|
|
@ -489,16 +489,14 @@ and:
|
||||||
(if whitespace-spacetab "s")
|
(if whitespace-spacetab "s")
|
||||||
(if whitespace-trailing "t")))))
|
(if whitespace-trailing "t")))))
|
||||||
(whitespace-update-modeline whitespace-this-modeline)
|
(whitespace-update-modeline whitespace-this-modeline)
|
||||||
(save-excursion
|
(if (get-buffer whitespace-errbuf)
|
||||||
(get-buffer-create whitespace-errbuf)
|
(kill-buffer whitespace-errbuf))
|
||||||
(kill-buffer whitespace-errbuf)
|
(with-current-buffer (get-buffer-create whitespace-errbuf)
|
||||||
(get-buffer-create whitespace-errbuf)
|
|
||||||
(set-buffer whitespace-errbuf)
|
|
||||||
(if whitespace-errmsg
|
(if whitespace-errmsg
|
||||||
(progn
|
(progn
|
||||||
(insert whitespace-errmsg)
|
(insert whitespace-errmsg)
|
||||||
(if (not (or quiet whitespace-silent))
|
(if (not (or quiet whitespace-silent))
|
||||||
(display-buffer whitespace-errbuf t))
|
(display-buffer (current-buffer) t))
|
||||||
(if (not quiet)
|
(if (not quiet)
|
||||||
(message "Whitespaces: [%s%s] in %s"
|
(message "Whitespaces: [%s%s] in %s"
|
||||||
whitespace-this-modeline
|
whitespace-this-modeline
|
||||||
|
|
@ -511,9 +509,7 @@ and:
|
||||||
(if (and (not quiet) (not (equal whitespace-clean-msg "")))
|
(if (and (not quiet) (not (equal whitespace-clean-msg "")))
|
||||||
(message "%s %s" whitespace-filename
|
(message "%s %s" whitespace-filename
|
||||||
whitespace-clean-msg))))))))
|
whitespace-clean-msg))))))))
|
||||||
(if whitespace-error
|
whitespace-error))
|
||||||
t
|
|
||||||
nil)))
|
|
||||||
|
|
||||||
;;;###autoload
|
;;;###autoload
|
||||||
(defun whitespace-region (s e)
|
(defun whitespace-region (s e)
|
||||||
|
|
@ -736,23 +732,17 @@ Also with whitespaces whose testing has been turned off."
|
||||||
(defun whitespace-highlight-the-space (b e)
|
(defun whitespace-highlight-the-space (b e)
|
||||||
"Highlight the current line, unhighlighting a previously jumped to line."
|
"Highlight the current line, unhighlighting a previously jumped to line."
|
||||||
(if whitespace-display-spaces-in-color
|
(if whitespace-display-spaces-in-color
|
||||||
(progn
|
(let ((ol (whitespace-make-overlay b e)))
|
||||||
(whitespace-unhighlight-the-space)
|
(whitespace-unhighlight-the-space)
|
||||||
(add-to-list 'whitespace-highlighted-space
|
(push ol whitespace-highlighted-space)
|
||||||
(whitespace-make-overlay b e))
|
(whitespace-overlay-put ol 'face 'whitespace-highlight-face))))
|
||||||
(whitespace-overlay-put (whitespace-make-overlay b e) 'face
|
|
||||||
'whitespace-highlight-face))))
|
|
||||||
;; (add-hook 'pre-command-hook 'whitespace-unhighlight-the-space))
|
;; (add-hook 'pre-command-hook 'whitespace-unhighlight-the-space))
|
||||||
|
|
||||||
(defun whitespace-unhighlight-the-space ()
|
(defun whitespace-unhighlight-the-space ()
|
||||||
"Unhighlight the currently highlight line."
|
"Unhighlight the currently highlight line."
|
||||||
(if (and whitespace-display-spaces-in-color whitespace-highlighted-space)
|
(if (and whitespace-display-spaces-in-color whitespace-highlighted-space)
|
||||||
(let ((whitespace-this-space nil))
|
(progn
|
||||||
(while whitespace-highlighted-space
|
(mapc 'whitespace-delete-overlay whitespace-highlighted-space)
|
||||||
(setq whitespace-this-space (car whitespace-highlighted-space))
|
|
||||||
(setq whitespace-highlighted-space
|
|
||||||
(cdr whitespace-highlighted-space))
|
|
||||||
(whitespace-delete-overlay whitespace-this-space))
|
|
||||||
(setq whitespace-highlighted-space nil))
|
(setq whitespace-highlighted-space nil))
|
||||||
(remove-hook 'pre-command-hook 'whitespace-unhighlight-the-space)))
|
(remove-hook 'pre-command-hook 'whitespace-unhighlight-the-space)))
|
||||||
|
|
||||||
|
|
@ -863,5 +853,5 @@ This is meant to be added buffer-locally to `write-file-functions'."
|
||||||
|
|
||||||
(provide 'whitespace)
|
(provide 'whitespace)
|
||||||
|
|
||||||
;;; arch-tag: 4ff44e87-b63c-402d-95a6-15e51e58bd0c
|
;; arch-tag: 4ff44e87-b63c-402d-95a6-15e51e58bd0c
|
||||||
;;; whitespace.el ends here
|
;;; whitespace.el ends here
|
||||||
|
|
|
||||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue