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 2005-04-09 02:16:29 +00:00
commit 768d4533ce
125 changed files with 2151 additions and 1031 deletions

View file

@ -182,7 +182,7 @@ man/regs.texi "Luc Teirlinck" Chong Yidong
man/rmail.texi Chong Yidong
man/screen.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/trouble.texi Chong Yidong
man/windows.texi "Luc Teirlinck" Chong Yidong
@ -263,12 +263,12 @@ SECTION READERS
etc/TUTORIAL rms
etc/TUTORIAL.bg Ognyan Kulev <ogi@fmi.uni-sofia.bg>
etc/TUTORIAL.cn
etc/TUTORIAL.cs
etc/TUTORIAL.de
etc/TUTORIAL.cs Pavel Janík <Pavel@Janik.cz>
etc/TUTORIAL.de Werner LEMBERG <wl@gnu.org>
etc/TUTORIAL.es Marcelo Toledo
etc/TUTORIAL.fr
etc/TUTORIAL.it
etc/TUTORIAL.ja
etc/TUTORIAL.fr Thien-Thi Nguyen
etc/TUTORIAL.it Thien-Thi Nguyen
etc/TUTORIAL.ja Kenichi Handa <handa@m17n.org>
etc/TUTORIAL.ko
etc/TUTORIAL.nl Lute Kamstra
etc/TUTORIAL.pl
@ -276,7 +276,7 @@ etc/TUTORIAL.pt_BR Marcelo Toledo
etc/TUTORIAL.ro
etc/TUTORIAL.ru
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.th
etc/TUTORIAL.zh

View file

@ -1,5 +1,31 @@
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>
* TUTORIAL.ja, TUTORIAL.cn, TUTORIAL.ru, TUTORIAL.zh: Remove the
old intro line that apparently was a longer version of "Emacs
tutorial".
@ -9,18 +35,17 @@
2005-04-01 Marcelo Toledo <marcelo@marcelotoledo.org>
* TUTORIAL.pt_BR, TUTORIAL.cn, TUTORIAL.cs, TUTORIAL.de,
TUTORIAL.es, TUTORIAL.fr, TUTORIAL.it, TUTORIAL.ja, TUTORIAL.ko,
TUTORIAL.pl, TUTORIAL.pt_BR, TUTORIAL.ro, TUTORIAL.ru,
TUTORIAL.sk, TUTORIAL.sl, TUTORIAL.th, TUTORIAL.zh: Fix title
line.
* TUTORIAL.es, TUTORIAL.fr, TUTORIAL.it, TUTORIAL.ja, TUTORIAL.ko,
* TUTORIAL.pl, TUTORIAL.pt_BR, TUTORIAL.ro, TUTORIAL.ru,
* TUTORIAL.sk, TUTORIAL.sl, TUTORIAL.th, TUTORIAL.zh: Fix title
line.
* TUTORIAL.bg: Fix title line; Applied TUTORIAL changes in
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>.
* TUTORIAL.sv: Sync some other changes with the TUTORIAL version
2005-04-01T00:31:25Z!rms@gnu.org by Mats Lidell <matsl@contactor.se>.
Minor fixes; patch by Ognyan Kulev <ogi@fmi.uni-sofia.bg>.
* TUTORIAL.sv: Sync some other changes with the TUTORIAL version
2005-04-01T00:31:25Z!rms@gnu.org patch by Mats Lidell <matsl@contactor.se>.
2005-04-01 Lute Kamstra <lute@gnu.org>

View file

@ -193,6 +193,8 @@ versions which recognize Thai words. Affected commands are
M-t (transpose-words)
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.
---
@ -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.
+++
** 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
the menu-bar, the tool-bar, the scroll-bars, tool tips, the blinking

View file

@ -1,5 +1,5 @@
tutoriál k Emacsu.
Copyright (c) 1985 Free Software Foundation, Inc; podmínky viz na konci.
Tutoriál k Emacsu. 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>.
Máte před sebou tutoriál k Emacsu.

View file

@ -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
auch als CTRL, CTL oder STRG beschriftet) sowie die META-Taste (auch

View file

@ -1,5 +1,5 @@
Esercitazione di Emacs. Copyright (c) 2003 Free Software Foundation, Inc.
Condizioni d'uso alla fine del file.
Esercitazione di Emacs. 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
volte indicato con CTRL o CTL) o del tasto META (a volte indicato con EDIT
@ -817,7 +817,7 @@ margine che si desidera.
testo e osserva come Emacs interrompe le righe a 20 caratteri. Infine
torna di nuovo a un margine di 70 caratteri con C-x f.
Se si modifica il testo all'interno di un paragrafo la modalità
Se si modifica il testo all'interno di un paragrafo la modalità
"Auto Fill" non
lo risistema.
Per risistemare i margini di un paragrafo

View file

@ -1,5 +1,5 @@
Emacs $BF~Lg%,%$%I$G$9(B.
Copyright (c) 1985, 1996, 1998, 2001, 2002 Free Software Foundation.
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, 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
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
$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%=%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
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$$$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$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
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)
@ -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
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
of this document as received, in any medium, provided that the

View file

@ -1,5 +1,6 @@
användarhandledningen till Emacs. I slutet finns kopieringsvillkoren.
Copyright (c) 1985, 1996, 1998, 2001, 2002 Free Software Foundation, Inc.
Emacs användarhandledning. I slutet finns kopieringsvillkoren.
Copyright (c) 1985, 1996, 1998, 2001, 2002, 2005 Free Software
Foundation, Inc.
Emacs-kommandon innebär ofta användning av kontrolltangenten (vanligen
märkt CTRL eller CTL) eller META-tangenten ( vissa tangentbord märkt
@ -48,6 +49,10 @@ F
Hitta markören igen och notera att det är samma text som står kring
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
------------------------------
@ -55,12 +60,10 @@ F
Att flytta sig från skärmbild till skärmbild kan vara bra, men hur
förflyttar man sig till en speciell plats skärmen?
Det finns flera sätt att göra detta . Det vanligaste är att använda
kommandona C-p, C-b, C-f och C-n. Vart och ett av dessa kommandon
flyttar markören en rad eller en kolumn i en bestämd riktning
skärmen. Här visas dessa fyra kommandon och i vilken riktning de
flyttar markören:
Det finns flera sätt att göra detta. Du kan använda piltangenterna,
men det är mer effektivt att ha händerna i standardläget och använda
kommandona C-p, C-b, C-f och C-n. Dessa tecken är likvärdiga med de
fyra piltangenterna. här:
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
skärmbilden.
Detta är säkert lite enklare att förstå om du tänker dessa
förkortningar: P för föregående (previous), N för nästa (next), B för
bakåt (backward) och F för framåt (forward). Detta är de grundläggande
kommandona för att flytta markören och du kommer säkert att använda
dem hela tiden, det är en stor fördel om du lär dig dem nu.
Detta är enklare att komma ihåg om du tänker dessa förkortningar: P
för föregående (previous), N för nästa (next), B för bakåt (backward)
och F för framåt (forward). Dessa är de grundläggande kommandona för
att flytta markören och du kommer att använda dem hela tiden.
>> Gör några C-n 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
radbrytning.
Du kan radera det sista tecknet du skrev genom att trycka <Delete>.
<Delete> är en tangent tangentbordet, som kan vara märkt "Del". I
några fall fungerar också "backsteg" som <Delete> men inte alltid!
Du kan radera det sista tecknet du skrev genom att trycka <Delback>.
<Delback> är en tangent tangentbordet -- samma som du normalt
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" ä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.
>> 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
kommer inte att kunna förändra originalet till vägledningen. Detta
är bara en lokal kopia.
använda <Delback>. Var inte rädd för att skriva i den här filen,
du kommer inte att kunna förändra originalet till vägledningen.
Detta är bara en lokal kopia.
När en rad blir för lång för att rymmas en skärmbredd fortsätter
den 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 att se hur
fortsättningstecknet ser ut.
>> Använd <Delete> för att radera texten tills raden ryms en
>> Använd <Delback> för att radera texten tills raden ryms en
skärmbredd igen. Fortsättningstecknet kommer att försvinna.
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
skärmbredd, 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.
>> 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
översikt över kommandon för radering:
<Delete> raderar tecknet som står precis före markören
C-d raderar tecknet som står precis under markören
<Delback> Raderar tecknet som står precis före markören
C-d Raderar tecknet som står precis under markören
M-<Delete> raderar ordet precis före markören
M-d raderar ordet precis efter markören
M-<Delback> Raderar ordet precis före markören
M-d Raderar ordet precis efter markören
C-k raderar från markören till slutet av raden
M-k raderar till slutet av stycket
C-k Raderar från markören till slutet av raden
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
mönstret som började med C-f och M-f. (<Delete> är inte precis
Lägg märke till att <Delback> och C-d kontra M-<Delback> och M-d
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
fungerar 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
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å
@ -400,13 +408,13 @@ raderar s
en repetition av kommandot. C-u 2 C-k raderar två rader samt de tomma
raderna, medan C-k två gånger inte kommer att göra det.
Att sätta in borttagen text kallas att "återhämta" den (yanking).
Att sätta in borttagen text kallas att "återhämta" den (yanking).
(Tänk det som att du rycker, eller drar, tillbaka någon text som
tagits bort.) Du kan antingen hämta tillbaka borttagen text till samma
plats som där den blev borttagen, eller kan du sätta in den en
annan plats i bufferten eller till och med i en helt annan fil. Du kan
också hämta tillbaka den flera gånger att du får flera lika
förekomster av den.
annan plats i texten du redigerar eller till och med i en helt annan
fil. Du kan också hämta tillbaka samma text flera gånger att du får
flera lika förekomster av den.
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.
@ -495,8 +503,8 @@ nytt namn, som backup, ifall du senare
Om du tittar nästan längst ner skärmbilden kommer du se en rad
som börjar och slutar med minustecken, och som innehåller texten
"--:-- TUTORIAL.se". Denna del av skärmbilden visar alltid namnet
filen du besöker. Just nu är du inne i en fil som heter "TUTORIAL.se"
"--:-- TUTORIAL.sv". Denna del av skärmbilden visar alltid namnet
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
du än är inne i kommer filnamnet stå där.
@ -539,7 +547,7 @@ blev sparad. Du b
systemet kraschar.
>> 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
skärmbilden.
Observera: 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>.
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.
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.
Se hur varje buffert har ett namn och att de också kan ha namnet
den fil som innehållet kommer från. 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. Vilken
text du än ser i ett Emacs-fönster tillhör den alltid en buffert.
den fil som innehållet kommer från. Vilken text du än ser i ett
Emacs-fönster tillhör den alltid en buffert.
>> Skriv C-x 1 för att bli kvitt buffertlistan.
När du har flera buffertar är bara en av dem "gällande" åt gången.
Det är den buffert du redigerar. Om du vill redigera en annan buffert
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 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 . Bufferlistan du skapar med
C-x C-b visar alltid namnen 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 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, kommer
inte den första filen sparas. Förändringen ligger kvar i
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
Du skall nu frågan om du önskar spara bufferten
TUTORIAL.se. Svara ja frågan genom att trycka "y" (yes).
TUTORIAL.sv. Svara ja frågan genom att trycka "y" (yes).
* UTVIDGNING AV KOMMANDOMÄNGDEN
@ -617,9 +649,9 @@ META-tangenter. F
kommandonamn.
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
för finn, och C-x C-s för spara. Ett annat exempel är kommandot för
att avsluta Emacs som är C-x C-c. Var inte rädd för att förlora
kommandon du redan har lärt dig. Du har redan sett några av dem, C-x
C-f för finn, och C-x C-s för spara. Ett annat exempel är kommandot
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
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
hittills:
C-x C-f Finn fil.
C-x C-s Spara fil.
C-x C-b Lista buffertar.
C-x C-c Avsluta Emacs.
C-x 1 Ta bort alla utom ett fönster.
C-x u Ångra.
C-x C-f Finn fil
C-x C-s Spara fil
C-x s Spara några buffertar
C-x C-b Lista buffertar
C-x b Byt buffert
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
eller bara i vissa lägen. Ett exempel ett sådant kommando är
@ -707,16 +741,16 @@ sk
Raden precis över ekoområdet kallas "lägesrad" (mode line). Den ser
ungefär ut här:
--:** TUTORIAL (Fundamental)--L670--58%----------------
--:** TUTORIAL 63% L749 (Fundamental)-----------------------
Raden innehåller information om Emacs och texten du redigerar.
Du vet redan vad filnamnet betyder, det är den fil du har funnit.
-NN%-- visar den aktuella positionen i texten, dvs. NN procent av
texten befinner sig över toppen av skärmbilden. Om toppen av filen är
i skärmbilden kommer det stå --Top-- istället för --00%-- och om
slutet av filen är i skärmbilden kommer det stå --Bot--. Om du ser
en fil där hela texten passar in en sida kommer det stå --All--.
Du vet redan vad filnamnet betyder, det är den fil du har funnit. NN%
visar den aktuella positionen i texten, dvs. NN procent av texten
befinner sig över toppen av skärmbilden. Om toppen av filen är i
skärmbilden kommer det stå "Top" istället för " 0%" och om slutet av
filen är i skärmbilden kommer det stå "Bot". Om du ser en fil där
hela texten passar in en sida kommer det stå "All".
Bokstaven L följd av siffror anger positionen ett annat
sätt. Siffrorna visar vilken rad som markören befinner sig .
@ -830,7 +864,7 @@ efter. <Return> avslutar s
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
"markör".
>> Tryck nu <Delete> fyra gånger och se hur markören flyttar sig
>> Tryck nu <Delback> fyra gånger och se hur markören flyttar sig
>> Tryck <Return> för att avsluta sökandet.
Såg du vad som hände? Under inkrementell sökning försöker Emacs att
@ -846,12 +880,12 @@ den vidare till Emacs. F
fall avsnittet "Spontaneous Entry to Incremental Search" i
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
lägga märke till att den sista bokstaven i söksträngen blir raderad
Om du är inne i en inkrementell sökning och trycker <Delback> kommer
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
exempel skriver "m" för att söka efter den första förekomsten av "m",
och sedan trycker "a" 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
förekomsten av "m".
@ -879,7 +913,7 @@ sk
det övre 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
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 att de
"modifierar" de andra tangenterna du trycker.
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,
KONTROLL-ESC v fungerar inte. Det är för att ESC är ett tecken i sig
och inte en äkta "modifierare".
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,
KONTROLL-<ESC> v fungerar inte. Det är för att <ESC> är ett tecken i
sig och inte en äkta "modifierare".
>> Skriv C-x 1 i det övre fönstret för att bli kvitt det nedre
fönstret.
@ -945,12 +979,12 @@ Ibland kan du hamna i n
huvudläget i lägesraden. Till exempel kan det stå [(Fundamental)]
istället för (Fundamental).
För att komma ur rekursiv redigering trycker du ESC ESC ESC. Detta är
ett generellt brytkommando. Du kan också använda det för att bli kvitt
extra fönster och för att komma ut ur minibufferten.
För att komma ur rekursiv redigering trycker du <ESC> <ESC> <ESC>.
Detta är ett generellt brytkommando. Du kan också använda det för att
bli kvitt extra fönster och för att komma ut ur minibufferten.
>> Skriv M-x för att komma in i minibufferten. Skriv ESC ESC ESC
för att komma ut.
>> Skriv M-x för att komma in i minibufferten. Skriv <ESC> <ESC>
<ESC> för att komma ut.
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
@ -984,7 +1018,8 @@ Den mest grundl
och en knappsekvens. Emacs ger en beskrivning av kommandot.
>> Skriv C-h c C-p.
Meddelandet skall bli något i stil med
Meddelandet skall bli något i stil med:
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!
* 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
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 olika sätt filerna. Dired finns beskrivet i Info i
Emacs-manualen i noden "Dired".
Manualen beskriver även många andra Emacs funktioner.
* KOPIERING
-----------
@ -1070,7 +1128,7 @@ Lidell
This version of the tutorial, like GNU Emacs, is copyrighted, and
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
of this document as received, in any medium, provided that the

View file

@ -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:
;;; coding: utf-8

View file

@ -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>
* quail/latin-ltx.el ("TeX"): Enable quail-completion by typing

View file

@ -40,7 +40,8 @@ ISOgrk2, ISOgrk3, ISOgrk4, ISOlat1, ISOlat2, ISOnum, ISOpub, ISOtech,
HTMLspecial and HTMLsymbol.
E.g.: &aacute; -> á"
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
("&Aacgr;" ?\Ά) ;; GREEK CAPITAL LETTER ALPHA WITH TONOS

View file

@ -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>
* simple.el (visible-mode): Use explicit :group keyword.
@ -110,12 +430,12 @@
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.
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.
2005-03-31 Thien-Thi Nguyen <ttn@gnu.org>
@ -1526,7 +1846,7 @@
(debug-entry-code): New const.
(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):
Fix BUFFER_MAGNIFICATION to 2.
@ -2688,7 +3008,7 @@
* simple.el (eval-expression-print-format): Avoid warning
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
with small changes,
@ -7405,8 +7725,7 @@
2004-09-21 Kenichi Handa <handa@m17n.org>
* descr-text.el (describe-char): Checking of quail activation
fixed.
* descr-text.el (describe-char): Checking of quail activation fixed.
2004-09-21 Jay Belanger <belanger@truman.edu>

View file

@ -1063,7 +1063,7 @@
* vc-hooks.el (vc-status): If vc-locking-user returns a number,
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
XEmacs 19.12.

View file

@ -1,7 +1,7 @@
;;; add-log.el --- change log maintenance commands for Emacs
;; Copyright (C) 1985, 86, 88, 93, 94, 97, 98, 2000, 03, 2004
;; Free Software Foundation, Inc.
;; Copyright (C) 1985, 1986, 1988, 1993, 1994, 1997, 1998, 2000, 2003,
;; 2004, 2005 Free Software Foundation, Inc.
;; Maintainer: FSF
;; 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)))
;;
;; File names.
("^\t\\* \\([^ ,:([\n]+\\)"
(1 'change-log-file-face)
("^\\( +\\|\t\\)\\* \\([^ ,:([\n]+\\)"
(2 'change-log-file-face)
;; Possibly further names in a list:
("\\=, \\([^ ,:([\n]+\\)" nil nil (1 'change-log-file-face))
;; Possibly a parenthesized list of names:
("\\= (\\([^() ,\n]+\\|(\\(setf\\|SETF\\) [^() ,\n]+)\\)"
("\\= (\\([^(),\n]+\\|(\\(setf\\|SETF\\) [^() ,\n]+)\\)"
nil nil (1 'change-log-list-face))
("\\=, *\\([^() ,\n]+\\|(\\(setf\\|SETF\\) [^() ,\n]+)\\)"
("\\=, *\\([^(),\n]+\\|(\\(setf\\|SETF\\) [^() ,\n]+)\\)"
nil nil (1 'change-log-list-face)))
;;
;; Function or variable names.
("^\t(\\([^() ,\n]+\\|(\\(setf\\|SETF\\) [^() ,\n]+)\\)"
(1 'change-log-list-face)
("\\=, *\\([^() ,\n]+\\|(\\(setf\\|SETF\\) [^() ,\n]+)\\)" nil nil
("^\\( +\\|\t\\)(\\([^(),\n]+\\|(\\(setf\\|SETF\\) [^() ,\n]+)\\)"
(2 'change-log-list-face)
("\\=, *\\([^(),\n]+\\|(\\(setf\\|SETF\\) [^() ,\n]+)\\)" nil nil
(1 'change-log-list-face)))
;;
;; Conditionals.
@ -250,8 +250,8 @@ Note: The search is conducted only within 10%, at the beginning of the file."
;; Acknowledgements.
;; Don't include plain "From" because that is vague;
;; we want to encourage people to say something more specific.
("\\(^\t\\| \\)\\(Patch\\(es\\)? by\\|Report\\(ed by\\| from\\)\\|Suggest\\(ed by\\|ion from\\)\\)"
2 'change-log-acknowledgement-face))
("\\(^\\( +\\|\t\\)\\| \\)\\(Patch\\(es\\)? by\\|Report\\(ed by\\| from\\)\\|Suggest\\(ed by\\|ion from\\)\\)"
3 'change-log-acknowledgement-face))
"Additional expressions to highlight in Change Log mode.")
(defvar change-log-mode-map

View file

@ -1,6 +1,6 @@
;;; 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>
;; 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 `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."
nil auto-revert-mode-text nil
:group 'auto-revert :lighter auto-revert-mode-text
(if auto-revert-mode
(if (not (memq (current-buffer) auto-revert-buffer-list))
(push (current-buffer) auto-revert-buffer-list))

View file

@ -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'.
The mode line will be updated automatically every `battery-update-interval'
seconds."
:global t
:global t :group 'battery
(setq battery-mode-line-string "")
(or global-mode-string (setq global-mode-string '("")))
(and battery-update-timer (cancel-timer battery-update-timer))

View file

@ -141,6 +141,7 @@ Auto Revert Mode.")
(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 [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.

View file

@ -519,7 +519,22 @@ T means abort and give an error message.")
("" "(") ; (
("" ")") ; )
("" "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
in Calc algebraic input.")
@ -527,11 +542,18 @@ in Calc algebraic input.")
"⁰¹²³⁴⁵⁶⁷⁸⁹⁺⁻⁽⁾ⁿⁱ" ; 0123456789+-()ni
"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)
"Replace some substrings of STR by Calc equivalents."
(setq str
(replace-regexp-in-string (concat "[" math-read-superscripts "]+")
"^(\\&)" str))
(setq str
(replace-regexp-in-string (concat "[" math-read-subscripts "]+")
"_(\\&)" str))
(let ((rep-list math-read-replacement-list))
(while rep-list
(setq str

View file

@ -231,7 +231,8 @@
(f90-mode . fortran))
"*Alist of major modes with appropriate Calc languages."
: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
"%Embed\n\\(% .*\n\\)*"

View file

@ -209,8 +209,12 @@ If nil, make an icon of the frame. If non-nil, delete the frame."
(defvar diary-face 'diary-face
"Face name to use for diary entries.")
(defface diary-face
'((((class color) (background light))
'((((min-colors 88) (class color) (background light))
:foreground "red1")
(((class color) (background light))
:foreground "red")
(((min-colors 88) (class color) (background dark))
:foreground "yellow1")
(((class color) (background dark))
:foreground "yellow")
(t

View file

@ -1647,7 +1647,7 @@ marked on the calendar."
(or (diary-remind sexp (car 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'.
Do nothing if DATE or STRING is nil."
(when (and date string)

View file

@ -1,5 +1,5 @@
;;; time-date.el --- date and time handling functions
;; Copyright (C) 1998, 1999, 2000, 2004, 2005 Free Software Foundation, Inc.
;;; time-date.el --- Date and time handling functions
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Masanobu Umeda <umerin@mse.kyutech.ac.jp>

View file

@ -1,6 +1,6 @@
;;; 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>
;; Created: 25 Mar 1999
@ -78,7 +78,7 @@
;;; Code:
(defgroup timeclock nil
"Keeping track time of the time that gets spent."
"Keeping track of the time that gets spent."
:group 'data)
;;; User Variables:

View file

@ -186,11 +186,11 @@ wish to put something like the following in your `.emacs' file:
\(add-hook 'comint-mode-hook
(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]
'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'."
:type 'boolean
:group 'comint
@ -228,7 +228,8 @@ This variable is buffer-local."
:group 'comint)
(defface comint-highlight-prompt
'((((background dark)) (:foreground "cyan"))
'((((min-colors 88) (background dark)) (:foreground "cyan1"))
(((background dark)) (:foreground "cyan"))
(t (:foreground "dark blue")))
"Face to use to highlight prompts."
:group 'comint)

View file

@ -1633,7 +1633,7 @@ item in another window.\n\n"))
:group 'custom-buffer)
(defface custom-invalid-face '((((class color))
(:foreground "yellow" :background "red"))
(:foreground "yellow1" :background "red1"))
(t
(:weight bold :slant italic :underline t)))
"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."
: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"))
(t
(:slant italic :bold)))
"Face used when the customize item has been modified."
: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"))
(t
(:slant italic)))
"Face used when the customize item has been set."
: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"))
(t
(:slant italic)))
@ -2148,9 +2154,12 @@ If INITIAL-STRING is non-nil, use that rather than \"Parent groups:\"."
`((((class color)
(background dark))
(: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)
(background light))
(:foreground "blue" :weight bold :height 1.2 :inherit variable-pitch))
(:foreground "blue" :weight bold :height 1.2 :inherit variable-pitch))
(t (:weight bold)))
"Face used for unpushable variable tags."
:group 'custom-faces)
@ -3296,65 +3305,37 @@ restoring it to the state of a face that has never been customized."
(defvar widget-face-prompt-value-history nil
"History of input to `widget-face-prompt-value'.")
(define-widget 'face 'restricted-sexp
"A Lisp face name."
(define-widget 'face 'symbol
"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 ()
(interactive)
(lisp-complete-symbol 'facep))
:prompt-value 'widget-field-prompt-value
:prompt-internal 'widget-symbol-prompt-internal
:prompt-match 'facep
:prompt-history 'widget-face-prompt-value-history
:value-create 'widget-face-value-create
:action 'widget-field-action
:match-alternatives '(facep)
:validate (lambda (widget)
(unless (facep (widget-value widget))
(widget-put widget :error (format "Invalid face: %S"
(widget-value widget)))
widget))
:value 'ignore
:tag "Function")
(widget-put widget
:error (format "Invalid face: %S"
(widget-value widget)))
widget)))
(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
;;; in the new font when you specify one. Does anyone know how to
;;; make that work? -- rms.
(defun widget-face-value-create (widget)
"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)))
(defun widget-face-notify (widget child &optional event)
"Update the sample, and notify the parent."
(overlay-put (widget-get widget :sample-overlay)
'face (widget-apply widget :sample-face-get))
(widget-default-notify widget child event))
;;; The `hook' Widget.
@ -3420,6 +3401,9 @@ and so forth. The remaining group tags are shown with
`((((class color)
(background dark))
(: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)
(background light))
(: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)
(background dark))
(:foreground "light blue" :weight bold :height 1.2))
(((min-colors 88) (class color)
(background light))
(:foreground "blue1" :weight bold :height 1.2))
(((class color)
(background light))
(:foreground "blue" :weight bold :height 1.2))

View file

@ -158,14 +158,14 @@ If nil, just print error messages in the message buffer."
(defcustom desktop-no-desktop-file-hook nil
"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
:group 'desktop
:version "22.1")
(defcustom desktop-after-read-hook nil
"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
:group 'desktop
:version "22.1")

View file

@ -1,7 +1,7 @@
;;; diff-mode.el --- a mode for viewing/editing context diffs
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004
;; Free Software Foundation, Inc.
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
;; Free Software Foundation, Inc.
;; Author: Stefan Monnier <monnier@cs.yale.edu>
;; Keywords: convenience patch diff
@ -263,7 +263,7 @@ when editing big diffs)."
(save-excursion
(while (re-search-backward re start t)
(replace-match "" t t)))))))
(defvar diff-font-lock-keywords
`(("^\\(@@ -[0-9,]+ \\+[0-9,]+ @@\\)\\(.*\\)$" ;unified
@ -484,7 +484,7 @@ If the OLD prefix arg is passed, tell the file NAME of the old file."
(let ((fs (diff-hunk-file-names old)))
(unless fs (error "No file name to look for"))
(push (cons fs name) diff-remembered-files-alist)))
(defun diff-hunk-file-names (&optional old)
"Give the list of file names textually mentioned for the current hunk."
(save-excursion
@ -952,7 +952,7 @@ a diff with \\[diff-reverse-direction]."
(define-minor-mode diff-minor-mode
"Minor mode for viewing/editing context diffs.
\\{diff-minor-mode-map}"
nil " Diff" nil
:group 'diff-mode :lighter " Diff"
;; FIXME: setup font-lock
;; setup change hooks
(if (not diff-update-on-the-fly)

View file

@ -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.
The names are separated by a space.
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
in this case.
If on a subdir headerline, use absolute subdirname instead;
prefix arg and marked files are ignored in this case.
You can then feed the file name(s) to other commands with \\[yank]."
(interactive "P")
@ -1950,10 +1951,11 @@ You can then feed the file name(s) to other commands with \\[yank]."
(if arg
(cond ((zerop (prefix-numeric-value arg))
(dired-get-marked-files))
((integerp arg)
(dired-get-marked-files 'no-dir arg))
(t ; else a raw arg
(dired-get-marked-files t)))
((consp arg)
(dired-get-marked-files t))
(t
(dired-get-marked-files
'no-dir (prefix-numeric-value arg))))
(dired-get-marked-files 'no-dir))
" "))))
(if (eq last-command 'kill-region)

View file

@ -1,6 +1,7 @@
;;; 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>
@ -43,7 +44,7 @@
;; end pacifier
;; Is it XEmacs?
(defconst ediff-xemacs-p (string-match "XEmacs" emacs-version))
(defconst ediff-xemacs-p (featurep 'xemacs))
;; Is it Emacs?
(defconst ediff-emacs-p (not ediff-xemacs-p))
@ -53,7 +54,7 @@
;; compiler at hand.
;; Suggested by rms.
(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))
(defvar ediff-force-faces nil
@ -1145,9 +1146,9 @@ this variable represents.")
(defface ediff-even-diff-face-B
(if ediff-emacs-p
`((((class color) (min-colors 16))
`((((class color) (min-colors 16))
(:foreground "White" :background "Grey"))
(((class color))
(((class color))
(:foreground "blue3" :background "Grey" :weight bold))
(t (:italic t :stipple ,stipple-pixmap)))
`((((type tty)) (:foreground "blue3" :background "Grey" :weight bold))

View file

@ -41,7 +41,6 @@ files.")
(defconst authors-aliases
'(
("Andrew Innes" "Andrw Innes")
("Barry A. Warsaw" "Barry A. Warsaw, Century Computing, Inc."
"Barry A. Warsaw, ITB" "Barry Warsaw")
("Bj,Av(Brn Torkelsson" "Bjorn Torkelsson")
@ -57,7 +56,7 @@ files.")
("Edward M. Reingold" "Ed Reingold" "Edward M Reingold"
"Reingold Edward M")
("Eli Zaretskii" "eliz")
; ("Emilio C. Lopes" "Emilio Lopes")
("Emilio C. Lopes" "Emilio Lopes")
("Era Eriksson" "Era@Iki.Fi")
("Eric M. Ludlam" "Eric Ludlam")
("Eric S. Raymond" "Eric Raymond")
@ -79,8 +78,10 @@ files.")
("Jay K. Adams" "jka@ece.cmu.edu" "Jay Adams")
("J,Ai(Br,At(Bme Marant" "J,bi(Br,bt(Bme Marant" "Jerome Marant")
("Jens-Ulrik Holger Petersen" "Jens-Ulrik Petersen")
("John W. Eaton" "John Eaton")
("Jonathan I. Kamens" "Jonathan Kamens")
("Joseph Arceneaux" "Joe Arceneaux")
("Juan Le,As(Bn Lahoz Garc,Am(Ba" "Juan-Leon Lahoz Garcia")
("K. Shane Hartman" "Shane Hartman")
("Kai Gro,A_(Bjohann" "Kai Grossjohann" "Kai Gro,b_(Bjohann"
"Kai.Grossjohann@Cs.Uni-Dortmund.De"
@ -89,14 +90,17 @@ files.")
("Kazushi Marukawa" "Kazushi")
("Ken Manheimer" "Kenneth Manheimer")
("Kenichi Handa" "Ken'ichi Handa" "Kenichi HANDA")
("Kevin Greiner" "Kevin J. Greiner")
("Kim F. Storm" "Kim Storm")
("Kyle Jones" "Kyle E. Jones")
("Marcus G. Daniels" "Marcus Daniels")
("Mark D. Baushke" "Mark D Baushke")
("Martin Lorentzon" "Martin Lorentzson")
("Matt Swift" "Matthew Swift")
("Michael R. Mauger" "Michael Mauger")
("Michael D. Ernst" "Michael Ernst")
("Michael I. Bushnell" "Michael I Bushnell" "Michael I. Bushnell, P/Bsg")
("Mikio Nakajima" "Nakajima Mikio")
("Paul Eggert" "eggert")
("Paul Reilly" "(pmr@legacy.pajato.com)")
("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)")
("Steven L. Baur" "SL Baur" "Steven L Baur")
("Takaaki Ota" "Tak Ota")
("Takahashi Naoto" "Naoto Takahashi")
("Teodor Zlatanov" "Ted Zlatanov")
("Torbj,Av(Brn Axelsson" "Torbjvrn Axelsson")
("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
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
'(("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"
"ymakefile" "linux.h")
("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"
"uaf.h")
("Sam Kendall" :changed "etags.c" "etags.el")
@ -260,7 +272,8 @@ listed.")
(defconst authors-valid-file-names
'("aclocal.m4"
"makedist.bat")
"makedist.bat"
"make-delta")
"File names which are valid, but no longer exists (or cannot be
found) in the repository.")
@ -274,6 +287,9 @@ found) in the repository.")
("s/windowsnt.h" . "s/ms-w32.h")
("config.emacs" . "configure")
("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.
Elements are (OLDNAME . NEWNAME).")
@ -372,7 +388,8 @@ from `authors-obsolete-files-regexps'."
ACTION is a keyword symbol describing what he did. Record file,
author and what he did in hash table TABLE. See the description of
`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 ""))
(let* ((value (gethash author table))
(entry (assoc file value))

View file

@ -110,7 +110,7 @@ When this is `function', only ask when called non-interactively."
(concat "Add " copyright-current-year
" to copyright? "))))
(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"))))
(if (and (eq (% (- (string-to-number copyright-current-year)
(string-to-number (buffer-substring

View file

@ -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
will be passed to `defcustom' if the minor mode is global):
: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
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.
:init-value VAL Same as the INIT-VALUE argument.
:lighter SPEC Same as the LIGHTER argument.
@ -153,10 +156,9 @@ For example, you could write
(unless group
;; We might as well provide a best-guess default group.
(setq group
`(:group (or (custom-current-group)
',(intern (replace-regexp-in-string
"-mode\\'" "" mode-name))))))
`(:group ',(intern (replace-regexp-in-string
"-mode\\'" "" mode-name)))))
`(progn
;; Define the variable to enable or disable the mode.
,(if (not globalp)
@ -220,8 +222,8 @@ With zero or negative ARG turn mode off.
;; Return the new setting.
,mode)
;; Autoloading an easy-mmode-define-minor-mode autoloads
;; everything up-to-here.
;; Autoloading a define-minor-mode autoloads everything
;; up-to-here.
:autoload-end
;; The toggle's hook.
@ -280,9 +282,8 @@ KEYS is a list of CL-style keyword arguments:
(unless group
;; We might as well provide a best-guess default group.
(setq group
`(:group (or (custom-current-group)
',(intern (replace-regexp-in-string
"-mode\\'" "" (symbol-name mode)))))))
`(:group ',(intern (replace-regexp-in-string
"-mode\\'" "" (symbol-name mode))))))
`(progn
;; The actual global minor-mode

View file

@ -1,6 +1,7 @@
;;; 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>
;; Maintainer: friedman@splode.com
@ -150,7 +151,7 @@ If point is over a documented variable, print that variable's docstring
instead.
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)
(if eldoc-mode
(progn

View file

@ -31,18 +31,16 @@
;; Note that this variable is used by non-lisp modes too.
(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.
See function `beginning-of-defun'.
Setting this variable automatically makes it local to the current buffer."
See function `beginning-of-defun'."
:type '(choice (const nil)
regexp)
:group 'lisp)
(make-variable-buffer-local 'defun-prompt-regexp)
(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
:group 'lisp)
@ -74,7 +72,7 @@ move forward across N balanced expressions."
The place mark goes is the same place \\[forward-sexp] would
move to with the same argument.
Interactively, if this command is repeated
or (in Transient Mark mode) if the mark is active,
or (in Transient Mark mode) if the mark is active,
it marks the next ARG sexps after the ones already marked."
(interactive "P\np")
(cond ((and allow-extend
@ -233,13 +231,14 @@ recipe (see `end-of-defun'). Major modes can define this if the
normal method is not appropriate.")
(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.
Otherwise, that's the beginning of the buffer."
(if (> arg 0) (point-max) (point-min)))
(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.
An end of a defun occurs right after the close-parenthesis that
@ -299,7 +298,7 @@ is called as a function to find the defun's end."
The defun marked is the one that contains point or follows point.
Interactively, if this command is repeated
or (in Transient Mark mode) if the mark is active,
or (in Transient Mark mode) if the mark is active,
it marks the next defun after the ones already marked."
(interactive "p")
(cond ((and allow-extend
@ -424,7 +423,8 @@ character is inserted ARG times."
(prefix-numeric-value 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.
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

View file

@ -1,6 +1,6 @@
;;; 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>
;; Keywords: matching, lisp, tools
@ -177,7 +177,9 @@ Set it to nil if you don't want limits here."
:group 're-builder)
(defface reb-match-3
'((((class color) (background light))
'((((min-colors 88) (class color) (background light))
:background "yellow1")
(((class color) (background light))
:background "yellow")
(((class color) (background dark))
:background "sienna4")

View file

@ -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
paste (in addition to the normal emacs bindings)."
:global t
:group 'cua
:set-after '(cua-enable-modeline-indications cua-use-hyper-key)
:require 'cua-base
:link '(emacs-commentary-link "cua-base.el")

View file

@ -217,10 +217,13 @@ Sensible values are nil, \"news\", or \"mailto\"."
"*A regexp matching filename wildcard characters, or nil.
If `find-file-at-point' gets a filename matching this pattern,
it passes it on to `find-file' with non-nil WILDCARDS argument,
which expands wildcards and visits multiple files. To visit
a file whose name contains wildcard characters you can suppress
wildcard expansion by setting `find-file-wildcards'.
and `ffap-pass-wildcards-to-dired' is nil, it passes it on to
`find-file' with non-nil WILDCARDS argument, which expands
wildcards and visits multiple files. To visit a file whose name
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,
it passes it on to `dired'."
@ -230,6 +233,11 @@ it passes it on to `dired'."
)
: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
;; Suggestion from RHOGEE, 11 Jul 1994. Disabled, I think this is
;; 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)
(let (current-prefix-arg) ; w3 2.3.25 bug, reported by KPC
(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
(string-match ffap-dired-wildcards filename)
find-file-wildcards

View file

@ -250,8 +250,15 @@ key is supported."
; (customize-set-variable var val))
; (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)
"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)))
(if ignore-flag
(setq filesets-ignore-next-set-default

View file

@ -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
your own function which is called when `font-lock-mode' is toggled via
`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
;; batch job) or if the buffer is invisible (the name starts with a space).
(when (or noninteractive (eq (aref (buffer-name) 0) ?\ ))

View file

@ -383,14 +383,14 @@ word \"bar\" following the word \"anchor\" then MATCH-ANCHORED may be required.
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
expression whose value is the face name to use. Face default attributes
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
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
`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,
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
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):
@ -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'.
(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
searching for subsequent instance of \"anchor\" resumes from where searching
searching for subsequent instances of \"anchor\" resumes from where searching
for \"item\" concluded.)
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 dark)) (:foreground "DimGray" :weight bold))
(((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 dark)) (:foreground "Cyan"))
(((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)
(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 16) (background light)) (:foreground "Blue"))
(((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)
(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 16) (background light)) (:foreground "Red" :weight bold))
(((class color) (min-colors 16) (background dark)) (:foreground "Pink" :weight bold))

View file

@ -170,7 +170,8 @@ generic-x to enable the specified modes."
'((nil "^\\([-A-Za-z0-9_]+\\)" 1)
("*Directories*" "^\\s-*<Directory\\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)
@ -183,7 +184,8 @@ generic-x to enable the specified modes."
(2 font-lock-variable-name-face)))
'("access_log\\'")
nil
"Mode for Apache log files"))
"Mode for Apache log files"
:group 'generic-x))
;;; Samba
(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)))
'("smb\\.conf\\'")
'(generic-bracket-support)
"Generic mode for Samba configuration files."))
"Generic mode for Samba configuration files."
:group 'generic-x))
;;; Fvwm
;; This is pretty basic. Also, modes for other window managers could
@ -222,7 +225,8 @@ generic-x to enable the specified modes."
nil
'("\\.fvwmrc\\'" "\\.fvwm2rc\\'")
nil
"Generic mode for FVWM configuration files."))
"Generic mode for FVWM configuration files."
:group 'generic-x))
;;; X Resource
;; 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))
'("\\.Xdefaults\\'" "\\.Xresources\\'" "\\.Xenvironment\\'" "\\.ad\\'")
nil
"Generic mode for X Resource configuration files."))
"Generic mode for X Resource configuration files."
:group 'generic-x))
;;; Hosts
(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))
'("[hH][oO][sS][tT][sS]\\'")
nil
"Generic mode for HOSTS files."))
"Generic mode for HOSTS files."
:group 'generic-x))
;;; Windows INF files
(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))
'("\\.[iI][nN][fF]\\'")
'(generic-bracket-support)
"Generic mode for MS-Windows INF files."))
"Generic mode for MS-Windows INF files."
:group 'generic-x))
;;; Windows INI files
;; Should define escape character as well!
@ -277,7 +284,8 @@ generic-x to enable the specified modes."
(setq imenu-generic-expression
'((nil "^\\[\\(.*\\)\\]" 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
;;; Unfortunately, Windows 95 and Windows NT have different REG file syntax!
@ -294,7 +302,8 @@ generic-x to enable the specified modes."
(lambda ()
(setq imenu-generic-expression
'((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
(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]\\."
"\\`[aA][uU][tT][oO][eE][xX][eE][cC]\\.")
'(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
"Syntax table in use in bat-generic-mode buffers.")
@ -446,7 +456,8 @@ generic-x to enable the specified modes."
(lambda ()
(setq imenu-generic-expression
'((nil "\\s-/\\([^/]+\\)/[i, \t\n]" 1))))))
"Mode for Mailagent rules files."))
"Mode for Mailagent rules files."
:group 'generic-x))
;; Solaris/Sys V prototype files
(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)))
'("prototype\\'")
nil
"Mode for Sys V prototype files."))
"Mode for Sys V prototype files."
:group 'generic-x))
;; Solaris/Sys V pkginfo files
(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)))
'("pkginfo\\'")
nil
"Mode for Sys V pkginfo files."))
"Mode for Sys V pkginfo files."
:group 'generic-x))
;; Javascript mode
;; 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
'((nil "^function\\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
(define-generic-mode vrml-generic-mode
@ -610,7 +624,8 @@ generic-x to enable the specified modes."
("*Definitions*"
"DEF\\s-+\\([-A-Za-z0-9_]+\\)\\s-+\\([A-Za-z0-9]+\\)\\s-*{"
1))))))
"Generic Mode for VRML files.")
"Generic Mode for VRML files."
:group 'generic-x)
;; Java Manifests
(define-generic-mode java-manifest-generic-mode
@ -629,7 +644,8 @@ generic-x to enable the specified modes."
(2 font-lock-constant-face)))
'("[mM][aA][nN][iI][fF][eE][sS][tT]\\.[mM][fF]\\'")
nil
"Mode for Java Manifest files")
"Mode for Java Manifest files"
:group 'generic-x)
;; Java properties files
(define-generic-mode java-properties-generic-mode
@ -659,7 +675,8 @@ generic-x to enable the specified modes."
(lambda ()
(setq imenu-generic-expression
'((nil "^\\([^#! \t\n\r=:]+\\)" 1))))))
"Mode for Java properties files.")
"Mode for Java properties files."
:group 'generic-x)
;; C shell alias definitions
(when (memq 'alias-generic-mode generic-extras-enable-list)
@ -677,7 +694,8 @@ generic-x to enable the specified modes."
(lambda ()
(setq imenu-generic-expression
'((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
;; 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))))
'("\\.[rR][cC]$")
nil
"Generic mode for MS-Windows Resource files."))
"Generic mode for MS-Windows Resource files."
:group 'generic-x))
;; InstallShield RUL files
;; 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?
'("\\.[rR][uU][lL]$")
'(generic-rul-mode-setup-function)
"Generic mode for InstallShield RUL files.")
"Generic mode for InstallShield RUL files."
:group 'generic-x)
(define-skeleton rul-if
"Insert an if statement."
@ -1437,7 +1457,8 @@ generic-x to enable the specified modes."
(2 font-lock-variable-name-face)))
'("\\.mailrc\\'")
nil
"Mode for mailrc files.")
"Mode for mailrc files."
:group 'generic-x)
;; Inetd.conf
(when (memq 'inetd-conf-generic-mode generic-extras-enable-list)
@ -1457,7 +1478,8 @@ generic-x to enable the specified modes."
(function
(lambda ()
(setq imenu-generic-expression
'((nil "^\\([-A-Za-z0-9_]+\\)" 1))))))))
'((nil "^\\([-A-Za-z0-9_]+\\)" 1))))))
:group 'generic-x))
;; Services
(when (memq 'etc-services-generic-mode generic-extras-enable-list)
@ -1475,7 +1497,8 @@ generic-x to enable the specified modes."
(function
(lambda ()
(setq imenu-generic-expression
'((nil "^\\([-A-Za-z0-9_]+\\)" 1))))))))
'((nil "^\\([-A-Za-z0-9_]+\\)" 1))))))
:group 'generic-x))
;; Password and Group files
(when (memq 'etc-passwd-generic-mode generic-extras-enable-list)
@ -1517,7 +1540,8 @@ generic-x to enable the specified modes."
(function
(lambda ()
(setq imenu-generic-expression
'((nil "^\\([-A-Za-z0-9_]+\\):" 1))))))))
'((nil "^\\([-A-Za-z0-9_]+\\):" 1))))))
:group 'generic-x))
;; Fstab
(when (memq 'etc-fstab-generic-mode generic-extras-enable-list)
@ -1567,7 +1591,8 @@ generic-x to enable the specified modes."
(function
(lambda ()
(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>
(eval-when-compile
@ -1587,20 +1612,20 @@ generic-x to enable the specified modes."
(defface show-tabs-tab-face
'((((class grayscale) (background light)) (:background "DimGray" :weight bold))
(((class grayscale) (background dark)) (:background "LightGray" :weight bold))
(((class color) (background light)) (:background "red"))
(((class color) (background dark)) (:background "red"))
(((class color) (min-colors 88)) (:background "red1"))
(((class color)) (:background "red"))
(t (:weight bold)))
"Font Lock mode face used to highlight TABs."
:group 'show-tabs)
:group 'generic-x)
(defface show-tabs-space-face
'((((class grayscale) (background light)) (:background "DimGray" :weight bold))
(((class grayscale) (background dark)) (:background "LightGray" :weight bold))
(((class color) (background light)) (:background "yellow"))
(((class color) (background dark)) (:background "yellow"))
(((class color) (min-colors 88)) (:background "yellow1"))
(((class color)) (:background "yellow"))
(t (:weight bold)))
"Font Lock mode face used to highlight spaces."
:group 'show-tabs)
:group 'generic-x)
(define-generic-mode show-tabs-generic-mode
nil ;; no comment char
@ -1609,7 +1634,8 @@ generic-x to enable the specified modes."
nil ;; no auto-mode-alist
;; '(show-tabs-generic-mode-hook-fun)
nil
"Generic mode to show tabs and trailing spaces")
"Generic mode to show tabs and trailing spaces"
:group 'generic-x)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; DNS modes
@ -1630,7 +1656,8 @@ generic-x to enable the specified modes."
;; List of additional automode-alist expressions
'("/etc/named.boot\\'")
;; List of set up functions to call
nil)
nil
:group 'generic-x)
(define-generic-mode named-database-generic-mode
;; List of comment characters
@ -1643,7 +1670,8 @@ generic-x to enable the specified modes."
;; List of additional automode-alist expressions
nil
;; List of set up functions to call
nil)
nil
:group 'generic-x)
(defvar named-database-time-string "%Y%m%d%H"
"Timestring for named serial numbers.")
@ -1663,7 +1691,8 @@ generic-x to enable the specified modes."
;; List of additional automode-alist expressions
'("/etc/resolv[e]?.conf\\'")
;; List of set up functions to call
nil)
nil
:group 'generic-x)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Modes for spice and common electrical engineering circuit netlist formats
@ -1705,7 +1734,8 @@ generic-x to enable the specified modes."
(function
(lambda()
(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
'(?|)
@ -1714,7 +1744,8 @@ generic-x to enable the specified modes."
("\\(\\(_\\|\\w\\)+\\)\\s-*=" 1 font-lock-variable-name-face))
'("\\.[iI][bB][sS]\\'")
'(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
nil
@ -1749,7 +1780,8 @@ generic-x to enable the specified modes."
(function
(lambda()
(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
;; List of comment characters
@ -1791,7 +1823,8 @@ generic-x to enable the specified modes."
;; List of additional automode-alist expressions
'("/etc/modules.conf" "/etc/conf.modules")
;; List of set up functions to call
nil)
nil
:group 'generic-x)
(provide 'generic-x)

View file

@ -185,7 +185,8 @@ the regexp in `generic-find-file-regexp'. If the value is nil,
;;;###autoload
(defmacro define-generic-mode (mode comment-list keyword-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.
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
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'."
(declare (debug (sexp def-form def-form def-form form def-form
&optional stringp))
[&optional stringp] &rest [keywordp form]))
(indent 1))
;; Backward compatibility.
(when (eq (car-safe mode) 'quote)
(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
"-mode\\'" "" mode-name)))
(mode-hook (intern (concat mode-name "-hook"))))
"-mode\\'" "" name)))
(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
;; 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
(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
,(concat "Hook run when entering " pretty-name " mode.")
:type 'hook
:group (or (custom-current-group)
',(intern (replace-regexp-in-string
"-mode\\'" "" mode-name))))
,@custom-keyword-args)
(defun ,mode ()
,(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
font-lock-list function-list)
"Go into the generic mode MODE."
(let* ((mode-name (symbol-name mode))
(let* ((name (symbol-name mode))
(pretty-name (capitalize (replace-regexp-in-string
"-mode\\'" "" mode-name)))
(mode-hook (intern (concat mode-name "-hook"))))
"-mode\\'" "" name)))
(mode-hook (intern (concat name "-hook"))))
(kill-all-local-variables)
@ -373,7 +392,7 @@ Some generic modes are defined in `generic-x.el'."
imenu-case-fold-search t))
;; 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
;; *any* comment character, but would require us to synthesize a new

View file

@ -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>
* message.el (message-resend): Bind rfc2047-encode-encoded-words.
@ -483,7 +503,7 @@
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
against the 2004-08-22 change to gnus-article-edit-mode.

View file

@ -12604,7 +12604,7 @@
* nnfolder.el (nnfolder-read-folder): Use group instead of
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>

View file

@ -46,6 +46,7 @@
(autoload 'gnus-msg-mail "gnus-msg" nil t)
(autoload 'gnus-button-mailto "gnus-msg")
(autoload 'gnus-button-reply "gnus-msg" nil t)
(autoload 'parse-time-string "parse-time" nil nil)
(defgroup gnus-article nil
"Article display."

View file

@ -37,6 +37,7 @@
(require 'nndraft)
(require 'gnus-draft)
(autoload 'parse-time-string "parse-time" nil nil)
;;;###autoload
(defgroup gnus-delay nil

View file

@ -40,6 +40,8 @@
(require 'itimer)
(require 'timer)))
(autoload 'parse-time-string "parse-time" nil nil)
(defgroup gnus-demon nil
"Demonic behaviour."
:group 'gnus)

View file

@ -2250,7 +2250,7 @@ gnus-summary-show-article-from-menu-as-charset-%s" cs))))
,@(if (featurep 'xemacs) '(t)
'(:help "Generate and print a PostScript image"))])
("Copy, move,... (Backend)"
,@(if (featurep 'xemacs) '(t)
,@(if (featurep 'xemacs) nil
'(:help "Copying, moving, expiring articles..."))
["Respool article..." gnus-summary-respool-article t]
["Move article..." gnus-summary-move-article

View file

@ -4568,6 +4568,8 @@ Otherwise, generate and save a value for `canlock-password' first."
"Make a valid data header.
If NOW, use that time instead."
(require 'parse-time)
(defvar parse-time-weekdays)
(defvar parse-time-months)
(let* ((now (or now (current-time)))
(zone (nth 8 (decode-time now)))
(sign "+"))

View file

@ -1388,6 +1388,8 @@ function is generally only called when Gnus is shutting down."
(defun nnimap-date-days-ago (daysago)
"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)))
(date (format-time-string
(format "%%d-%s-%%Y"

View file

@ -39,6 +39,7 @@
(require 'mm-util)
(require 'mm-url)
(require 'nnweb)
(require 'parse-time)
(autoload 'w3-parse-buffer "w3-parse")
(nnoo-declare nnultimate)

View file

@ -119,7 +119,10 @@ calls."
:group 'hi-lock-interactive-text-highlighting)
(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")))
"Default face for hi-lock mode."
:group 'hi-lock-faces)
@ -131,7 +134,10 @@ calls."
:group 'hi-lock-faces)
(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")))
"Face for hi-lock mode."
:group 'hi-lock-faces)
@ -148,17 +154,20 @@ calls."
:group 'hi-lock-faces)
(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."
:group 'hi-lock-faces)
(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."
:group 'hi-lock-faces)
(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."
:group 'hi-lock-faces)

View file

@ -213,14 +213,16 @@
;; indentation on inserts gets underlined (which can look pretty ugly!).
(defface highlight-changes-face
'((((class color)) (:foreground "red" ))
'((((min-colors 88) (class color)) (:foreground "red1" ))
(((class color)) (:foreground "red" ))
(t (:inverse-video t)))
"Face used for highlighting changes."
:group 'highlight-changes)
;; This looks pretty ugly, actually. Maybe the underline should be removed.
(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)))
"Face used for highlighting deletions."
:group 'highlight-changes)

View file

@ -1,6 +1,6 @@
;;; 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>
;; 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
uses the function `hl-line-unhighlight' on `pre-command-hook' in
addition to `hl-line-highlight' on `post-command-hook'."
nil nil nil
:group 'hl-line
(if hl-line-mode
(progn
;; In case `kill-all-local-variables' is called.

View file

@ -1,6 +1,6 @@
;;; 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>
;; 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."
:group 'ido)
(defface ido-subdir-face '((((class color))
(defface ido-subdir-face '((((min-colors 88) (class color))
(:foreground "red1"))
(((class color))
(:foreground "red"))
(t (:underline t)))
"*Font used by ido for highlighting subdirs in the alternatives."
: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"
:background "red"
:width condensed))

View file

@ -65,7 +65,7 @@ wish to put something like the following in your `.emacs' file:
\(add-hook 'ielm-mode-hook
'(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]
'comint-kill-whole-line)))

View file

@ -1,6 +1,6 @@
;;; 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>
;; Maintainer: KOSEKI Yoshinori <kose@meadowy.org>
@ -51,6 +51,11 @@
(eval-when-compile
(require 'image-file))
(defgroup iimage nil
"Support for inline images."
:version "22.1"
:group 'image)
(defconst iimage-version "1.1")
(defvar iimage-mode nil)
(defvar iimage-mode-map nil)
@ -137,7 +142,7 @@ With numeric ARG, display the images if and only if ARG is positive."
;;;###autoload
(define-minor-mode iimage-mode
"Toggle inline image minor mode."
nil " iImg" iimage-mode-map
:group 'iimage :lighter " iImg" :keymap iimage-mode-map
(run-hooks 'iimage-mode-hook)
(iimage-mode-buffer iimage-mode))

View file

@ -1,6 +1,6 @@
;;; 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.
;; Maintainer: FSF
@ -83,7 +83,11 @@ The Lisp code is executed when the node is selected.")
:group 'info)
(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)
(t :underline t))
"Face for Info cross-references."
@ -3240,6 +3244,7 @@ Advanced commands:
(setq line-move-ignore-invisible t)
(make-local-variable 'desktop-save-buffer)
(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 'change-major-mode-hook 'font-lock-defontify nil t)
(add-hook 'isearch-mode-hook 'Info-isearch-start nil t)
@ -3254,6 +3259,13 @@ Advanced commands:
(Info-set-mode-line)
(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 ()
(when (bufferp Info-tag-table-buffer)
(setq Info-tag-table-buffer
@ -3887,16 +3899,6 @@ Preserve text properties."
(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:
;; These functions permit speedbar to display the "tags" in the
;; current info node.

View file

@ -346,7 +346,7 @@ automatically.
In Encoded-kbd mode, a text sent from keyboard is accepted
as a multilingual text encoded in a coding system set by
\\[set-keyboard-coding-system]."
:global t
:global t :group 'keyboard :group 'mule
(if encoded-kbd-mode
;; We are turning on Encoded-kbd mode.

View file

@ -174,7 +174,7 @@
(defun thai-compose-syllable (beg end &optional category-set string)
(or category-set
(setq category-set
(setq category-set
(char-category-set (if string (aref string beg) (char-after beg)))))
(if (aref category-set ?c)
;; Starting with a consonant. We do relative composition.
@ -183,9 +183,9 @@
(compose-region beg end))
;; Vowel tone sequence.
(if string
(compose-string string beg end (list (aref string beg) '(Bc . Bc)
(compose-string string beg end (list (aref string beg) '(Bc . Bc)
(aref string (1+ beg))))
(compose-region beg end (list (char-after beg) '(Bc . Bc)
(compose-region beg end (list (char-after beg) '(Bc . Bc)
(char-after (1+ beg))))))
(- end beg))
@ -256,7 +256,7 @@ positions (integers or markers) specifying the region."
(define-minor-mode thai-word-mode
"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]."
:global t
:global t :group 'mule
(cond (thai-word-mode
;; This enables linebreak between Thai characters.
(modify-category-entry (make-char 'thai-tis620) ?|)

View file

@ -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
be marked by a symbol."
nil " ll" nil
:group 'longlines :lighter " ll"
(if longlines-mode
;; Turn on longlines mode
(progn

View file

@ -1866,10 +1866,11 @@ Note on function names in this list: all functions of the form
(define-minor-mode sc-minor-mode
"Supercite minor mode."
nil (" SC" (sc-auto-fill-region-p
(":f" (sc-fixup-whitespace-p "w"))
(sc-fixup-whitespace-p ":w")))
`((,sc-mode-map-prefix . ,sc-mode-map)))
:group 'supercite
:lighter (" SC" (sc-auto-fill-region-p
(":f" (sc-fixup-whitespace-p "w"))
(sc-fixup-whitespace-p ":w")))
:keymap `((,sc-mode-map-prefix . ,sc-mode-map)))
;;;###autoload
(defun sc-cite-original ()

View file

@ -1,6 +1,6 @@
;;; 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>
;; Maintainer: Alex Schroeder <alex@gnu.org>
@ -55,7 +55,10 @@
;;; 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.
@ -83,16 +86,13 @@ following commands:
The slave buffer is stored in the buffer-local variable `master-of'.
You can set this variable using `master-set-slave'. You can show
yourself the value of `master-of' by calling `master-show-slave'."
;; The initial value.
nil
;; The indicator for the mode line.
nil
;; The minor mode bindings.
'(("\C-c\C-n" . master-says-scroll-up)
("\C-c\C-p" . master-says-scroll-down)
("\C-c<" . master-says-beginning-of-buffer)
("\C-c>" . master-says-end-of-buffer)
("\C-c\C-l" . master-says-recenter)))
:group 'master
:keymap
'(("\C-c\C-n" . master-says-scroll-up)
("\C-c\C-p" . master-says-scroll-down)
("\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.

View file

@ -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>
* mh-e.el, mh-identity.el, mh-mime.el: Replace `legal' with `valid'.
@ -85,18 +90,18 @@
2004-08-15 Bill Wohler <wohler@newt.com>
* Released MH-E version 7.4.80.
* MH-E-NEWS, README: Updated for release 7.4.80.
* mh-e.el (Version, mh-version): Updated for release 7.4.80.
2004-08-15 Bill Wohler <wohler@newt.com>
* mh-funcs.el, mh-gnus.el, mh-inc.el, mh-init.el, mh-junk.el,
mh-pick.el, mh-print.el, mh-xemacs.el: Added 2004 to Copyright.
* mh-acros.el, mh-alias.el: Checkdoc fixes.
2004-08-12 Satyaki Das <satyaki@theforce.stanford.edu>
* mh-acros.el (cl): Load cl in this file. That is all right, since
@ -130,7 +135,7 @@
do a good job of suppressing compilation warnings in 21.3 and CVS
Emacs (21.4). This replaces (require 'cl) or (require
'utils) (mh-require-cl) calls:
(eval-when-compile (require 'mh-acros))
(mh-require-cl)
@ -151,7 +156,7 @@
* mh-seq.el (mh-thread-message, mh-thread-container): Use
mh-defstruct instead of defstruct.
(mh-thread-id-container, mh-thread-get-message-container)
(mh-thread-id-container, mh-thread-get-message-container)
(mh-thread-get-message): Use the slightly different structure
constructor function.
@ -240,8 +245,8 @@
programs are run in background. Running in foreground can be slow.
Defaults to nil to spare machines with little memory.
* mh-junk.el (mh-spamassassin-blacklist, mh-bogofilter-blacklist)
(mh-bogofilter-whitelist, mh-spamprobe-blacklist)
* mh-junk.el (mh-spamassassin-blacklist, mh-bogofilter-blacklist)
(mh-bogofilter-whitelist, mh-spamprobe-blacklist)
(mh-spamprobe-whitelist): Use new option mh-junk-background.
2004-07-25 Satyaki Das <satyaki@theforce.stanford.edu>
@ -266,7 +271,7 @@
* mh-customize.el (mh-invisible-header-fields-internal): Added
header fields emitted by T-Mobile picture phones (X-Mms-*, and
commented out X-Operator field saying it's like X-Mailer).
2004-07-12 Bill Wohler <wohler@newt.com>
* mh-gnus.el: Set local variables indent-tabs-mode and
@ -306,7 +311,7 @@
* mh-init.el (mh-variant-set, mh-sys-path, mh-variant-mu-mh-info):
Prefer GNU mailutils over GNU Mailutils MH.
* mh-comp.el (sc-cite-original, mh-smail, mh-smail-batch)
(mh-edit-again, mh-extract-rejected-mail, mh-forward)
(mh-smail-other-window, mh-reply, mh-send, mh-send-other-window):
@ -325,8 +330,8 @@
* MH-E-NEWS, README: 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
and mh-xemacs-icons.el which were removed since their names
@ -390,9 +395,9 @@
(require 'mouse): To shush compiler.
* Use new function mh-require-cl throughout.
* Add arch taglines (courtesy Miles Bader).
* mh-unit.el (mh-unit-files): Replaced mh-xemacs-compat.el and
mh-xemacs-icons.el with mh-xemacs.el.
@ -409,10 +414,10 @@
2004-07-07 Stephen Gildea
* mh-customize.el (mh-invisible-header-fields-internal):
* mh-customize.el (mh-invisible-header-fields-internal):
Add X-Greylist, X-Source*, and X-WebTV-Signature.
Replace specific X-Spam-* headers with general pattern.
2004-06-15 Bill Wohler <wohler@newt.com>
* README: Vladimir Ivanovic reports that mh-rmail works with
@ -438,7 +443,7 @@
2004-04-07 Satyaki Das <satyaki@theforce.stanford.edu>
* mh-mime.el (mh-insert-mime-button)
* mh-mime.el (mh-insert-mime-button)
(mh-insert-mime-security-button): Add evaporate property to
overlays used in MIME part buttons. This avoids problems with
CVS Emacs.
@ -459,10 +464,10 @@
2003-12-26 Jeffrey C Honig <jch@honig.net>
* mh-junk.el (mh-junk-blacklist, mh-junk-whitelist)
(mh-spamassassin-blacklist, mh-spamassassin-blacklist)
(mh-spamassassin-blacklist, mh-spamassassin-whitelist)
(mh-spamassassin-whitelist, mh-bogofilter-blacklist)
* mh-junk.el (mh-junk-blacklist, mh-junk-whitelist)
(mh-spamassassin-blacklist, mh-spamassassin-blacklist)
(mh-spamassassin-blacklist, mh-spamassassin-whitelist)
(mh-spamassassin-whitelist, mh-bogofilter-blacklist)
(mh-spamprobe-blacklist): Add progress messages. Change "Couldn't"
to "Unable" in error messages. Run bogofilter and spamprobe in
the foreground to prevent a large number of processes from
@ -536,9 +541,9 @@
* MH-E-NEWS, README: Updated for release 7.4.3.
* mh-e.el (Version, mh-version): Updated for release 7.4.3.
* This patch release contains the following two patches:
* mh-identity.el (mh-identity-make-menu): Removed condition on
mh-auto-fields-list. Use it to enable or disable menu item
instead.
@ -576,10 +581,10 @@
2003-11-14 Mark D. Baushke <mdb@gnu.org>
* mh-customize.el (mh-invisible-header-fields-internal):
* mh-customize.el (mh-invisible-header-fields-internal):
Add X-AntiAbuse and X-MailScanner.
(Patch from Stephen Gildea.)
2003-11-13 Peter S Galbraith <psg@debian.org>
* mh-identity.el (mh-identity-handler-attribution-verb): New
@ -689,14 +694,14 @@
2003-11-02 Jeffrey C Honig <jch@honig.net>
* mh-loaddefs.el: Regenerated.
* mh-loaddefs.el: Regenerated.
* mh-funcs.el (mh-print-msg): Move to mh-print.el.
* mh-e.el (mh-folder-mode-map): Add mh-print-msg ("l") back, it
will print a message that this usage is deprecated.
* mh-print.el (require, mh-ps-print-msg, mh-ps-print-msg-file):
* mh-print.el (require, mh-ps-print-msg, mh-ps-print-msg-file):
Require mh-funcs for mh-note-printed. PS print functions were not
setting the printed notation. Move mh-print-msg here for
consistency. Print message if mh-print-msg invoked via deprecated
@ -790,7 +795,7 @@
(custom-load.elc): Allow for '-no-autoloads'.
(compile-xemacs): New. It allows for the '-no-autoloads' option
and byte-compiles all the source files with a single instance of
XEmacs.
XEmacs.
* mh-e.el (mh-folder-mode): Only load the toolbar in XEmacs if
toolbar support is available.
@ -874,7 +879,7 @@
2003-10-09 Peter S Galbraith <psg@debian.org>
* mh-customize.el (mail-citation-hook): Moved from mh-comp.el and
made into a defcustom.
made into a defcustom.
2003-10-09 Satyaki Das <satyakid@stanford.edu>
@ -938,10 +943,10 @@
parenthetical comment.
* mh-loaddefs.el: Regenerated.
* mh-customize.el (mh-mml-method-default): What method should be
used in secure directives.
* mh-mime.el (mh-secure-message): New function used to generate
the mml security tags.
(mh-mml-unsecure-message): New wrapper function around
@ -1061,7 +1066,7 @@
* mh-customize.el (mh-identity-handlers): New defcustom. Alist of
Handler functions for mh-identity (downcased) fields.
(mh-identity-list): Add support for pgg-default-user-id.
(mh-identity-list): Add support for pgg-default-user-id.
* mh-identity.el (mh-insert-identity): Modified to use
`mh-identity-handlers', adding hacking flexibility for those who
@ -1084,7 +1089,7 @@
(mh-header-field-delete): Make more robust wrt the field having a
trailing colon or not.
(mh-identity-make-menu): Add a "Customize Identities" menu entry.
* mh-loaddefs.el: Regenerated.
2003-09-21 Peter S Galbraith <psg@debian.org>
@ -1093,7 +1098,7 @@
with version numbers.
* mh-e.el (mh-scan-format): patch from Sergey Poznyakoff.
GNU mailutils now supports the %(decode) format
GNU mailutils now supports the %(decode) format
2003-09-20 Satyaki Das <satyakid@stanford.edu>
@ -1422,7 +1427,7 @@
* mh-utils.el (mh-find-path): Run setup code only if
`mh-find-path-run' is nil such that this is only done once.
Also remove the `setq' for `read-mail-command' and `mail-user-agent'.
2003-08-18 Peter S Galbraith <psg@debian.org>
* mh-e.el: require 'mh-utils first
@ -1441,16 +1446,16 @@
(mh-path-search): Deleted. Was only used by `mh-find-progs'.
* mh-e.el: require mh-init.el.
(mh-version): Use simpler `mh-variant-in-use'.
(mh-version): Use simpler `mh-variant-in-use'.
(mh-scan-format): Use (mh-variant-p 'nmh) instead of mh-nmh-flag.
* mh-comp.el (mh-insert-x-mailer): Use simpler `mh-variant-in-use'.
* mh-utils.el (mh-progs, mh-lib, mh-lib-progs)
* mh-utils.el (mh-progs, mh-lib, mh-lib-progs)
(mh-flists-present-flag): Moved to mh-init.el.
(mh-nmh-flag): Deleted. Use (mh-variant-p 'nmh) instead.
* mh-comp.el (mh-repl-group-formfile, mh-forward, mh-reply)
* mh-comp.el (mh-repl-group-formfile, mh-forward, mh-reply)
(mh-send-letter): Use (mh-variant-p 'nmh) instead of mh-nmh-flag.
* mh-mime.el (mh-edit-mhn, mh-mime-save-parts): Use (mh-variant-p
@ -1484,7 +1489,7 @@
(mh-variant-in-use, mh-variant-p): Developers may check which
variant is currently in use with the variable `mh-variant-in-use'
or the function `mh-variant-p'.
2003-08-15 Bill Wohler <wohler@newt.com>
* mh-customize.el (mh-auto-fields-list): The manual uses Fcc
@ -1653,7 +1658,7 @@
* mh-identity.el (mh-insert-identity): Refactor to use
mh-insert-signature
* mh-comp.el (mh-signature-separator-p): Removed.
* mh-comp.el (mh-insert-signature): Merge MIME awareness from
@ -1724,8 +1729,8 @@
* mh-funcs.el (mh-undo-folder): Ditto.
* mh-mime.el (mh-mime-save-parts): Ditto.
* mh-seq.el (mh-subject-to-sequence-unthreaded)
* mh-seq.el (mh-subject-to-sequence-unthreaded)
(mh-narrow-to-subject, mh-delete-subject): Ditto.
* mh-index.el (mh-index-sequenced-messages)
@ -2021,7 +2026,7 @@
(mh-unit-equal): New function that throws an error if RESULT
doesn't equal EXPECTED.
(mh-unit): Call mh-unit-x-image-url-cache-canonicalize.
2003-07-29 Satyaki Das <satyakid@stanford.edu>
* mh-unit.el (mh-unit-update-call-graph): Make the function work
@ -2159,10 +2164,10 @@
hoping to quote the hint `t' but checkdoc wouldn't let me.
(mh-note-deleted, mh-note-refiled, mh-note-cur): Moved to Scan
Line Formats section.
(mh-scan-good-msg-regexp, mh-scan-deleted-msg-regexp)
(mh-scan-refiled-msg-regexp, mh-scan-valid-regexp)
(mh-scan-cur-msg-number-regexp, mh-scan-date-regexp)
(mh-scan-rcpt-regexp, mh-scan-body-regexp)
(mh-scan-good-msg-regexp, mh-scan-deleted-msg-regexp)
(mh-scan-refiled-msg-regexp, mh-scan-valid-regexp)
(mh-scan-cur-msg-number-regexp, mh-scan-date-regexp)
(mh-scan-rcpt-regexp, mh-scan-body-regexp)
(mh-scan-subject-regexp, mh-scan-format-regexp): Cleaned
up docstrings (changed phrases to sentences).
(mh-scan-cur-msg-regexp): Marked this variable as obsolete; it
@ -2350,7 +2355,7 @@
* mh-utils.el (mh-replace-in-string): New function name instead of
`dired-replace-in-string'.
* mh-alias.el (mh-alias-gcos-name): Use it.
* mh-alias.el (mh-alias-apropos): New command. Show all aliases
that match REGEXP either in name or content.
@ -2374,7 +2379,7 @@
2003-06-02 Peter S Galbraith <psg@debian.org>
* mh-utils.el (dired-replace-in-string): Bind if not already
defined. Borrowed from dired.el
defined. Borrowed from dired.el
* mh-alias.el (mh-alias-gcos-name): switch to using
dired-replace-in-string.
@ -2425,7 +2430,7 @@
second time. I have wrapped the value around \b word delimiters.
Hope there are no side effects for other code.
* mh-comp.el (mh-insert-auto-fields): Attempt regardless of
* mh-comp.el (mh-insert-auto-fields): Attempt regardless of
`mh-insert-auto-fields-done-local' flag in interactive use.
* mh-comp.el (mh-insert-auto-fields-done-local): Keep track of
@ -3153,7 +3158,7 @@
* mh-e.el (mh-folder-map): Add "F'" to the map for
mh-index-ticked-messages.
(mh-help-messages): Replace broken [t]hread with [n]ew messages.
* mh-customize.el (mh-index-ticked-messages-folders): New user
customizable flag that controls the folders to be searched by
mh-index-ticked-messages.
@ -3224,7 +3229,7 @@
* mh-unit.el (mh-unit): As it turns out, lm-crack-copyright has
been updated to handle multiple-line copyrights in 21.3, so
updated code to run lm-verify only if user has 21.3 or greater.
Delete buffers after use, unless user already had buffer open.
Delete buffers after use, unless user already had buffer open.
2003-04-27 Satyaki Das <satyakid@stanford.edu>
@ -3433,7 +3438,7 @@
'mh-customize'.
* mh-customize.el: Require 'mh-xemacs-icons' instead of
'mh-xemacs-toolbar'.
'mh-xemacs-toolbar'.
2003-04-17 Peter S Galbraith <psg@debian.org>
@ -10928,9 +10933,9 @@
$(EMACS_HOME)/src.
(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,
are permitted in any medium without royalty provided the copyright
notice and this notice are preserved.

View file

@ -1,6 +1,6 @@
;;; 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>
;; 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
'((((class color) (background light))
(:foreground "red" :underline t))
(:foreground "red1" :underline t))
(((class color) (background dark))
(:foreground "red" :underline t))
(:foreground "red1" :underline t))
(t (:underline t)))
"Face used for the current folder."
:group 'mh-speed-faces)

View file

@ -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:
- If the character at POS has a non-nil `follow-link' text or
overlay property, use the value of that property determines what
to do.
overlay property, the value of that property determines what to do.
- If there is a local key-binding or a keybinding at position POS
for the `follow-link' event, the binding of that event determines

View file

@ -1,7 +1,7 @@
;;; msb.el --- customizable buffer-selection with multiple menus
;; Copyright (C) 1993, 94, 95, 97, 98, 99, 2000, 2001, 2003
;; Free Software Foundation, Inc.
;; Copyright (C) 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2003,
;; 2005 Free Software Foundation, Inc.
;; Author: Lars Lindberg <lars.lindberg@home.se>
;; Maintainer: FSF
@ -1141,7 +1141,7 @@ variable `msb-menu-cond'."
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
different buffer menu using the function `msb'."
:global t
:global t :group 'msb
(if msb-mode
(progn
(add-hook 'menu-bar-update-hook 'msb-menu-bar-update-buffers)

View file

@ -1,7 +1,7 @@
;;; pcvs-info.el --- internal representation of a fileinfo entry
;; 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>
;; Keywords: pcl-cvs
@ -105,7 +105,9 @@ to confuse some users sometimes."
:group 'pcl-cvs)
(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))
(((class color) (background light))
(:foreground "green3" :weight bold))

View file

@ -918,23 +918,28 @@ This usually doesn't really work but is a handy initval in a prompt."
;;;;
;;;###autoload
(defun cvs-checkout (modules dir flags)
(defun cvs-checkout (modules dir flags &optional root)
"Run a 'cvs checkout MODULES' in DIR.
Feed the output to a *cvs* buffer, display it in the current window,
and run `cvs-mode' on it.
With a prefix argument, prompt for cvs FLAGS to use."
(interactive
(list (cvs-string->strings (read-string "Module(s): " (cvs-get-module)))
(read-directory-name "CVS Checkout Directory: "
nil default-directory nil)
(cvs-add-branch-prefix
(cvs-flags-query 'cvs-checkout-flags "cvs checkout flags"))))
(let ((root (cvs-get-cvsroot)))
(if (or (null root) current-prefix-arg)
(setq root (read-string "CVS Root: ")))
(list (cvs-string->strings (read-string "Module(s): " (cvs-get-module)))
(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)
(setf flags (cvs-flags-query 'cvs-checkout-flags nil 'noquery)))
(cvs-cmd-do "checkout" (or dir default-directory)
(append flags modules) nil 'new
:noexist t))
(let ((cvs-cvsroot root))
(cvs-cmd-do "checkout" (or dir default-directory)
(append flags modules) nil 'new
:noexist t)))
(defun-cvs-mode (cvs-mode-checkout . NOARGS) (dir)
"Run cvs checkout against the current branch.

View file

@ -1,6 +1,6 @@
;;; 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
;; 2002- Martin Stjernholm
@ -194,7 +194,7 @@
(unless (c-face-name-p c-invalid-face-name)
(defconst c-invalid-face 'c-invalid-face) ; Necessary in Emacs 19.
(defface c-invalid-face
'((((class color) (background light)) (:foreground "red"))
'((((class color) (background light)) (:foreground "red1"))
(((class color)) (:foreground "hotpink"))
(t (:inverse-video t)))
"Face used to highlight invalid syntax."

View file

@ -1,7 +1,7 @@
;;; compile.el --- run compiler as inferior of Emacs, parse error messages
;; 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>,
;; Daniel Pfeiffer <occitan@esperanto.org>
@ -464,6 +464,8 @@ starting the compilation process.")
(defface compilation-info-face
'((((class color) (min-colors 16) (background light))
(:foreground "Green3" :weight bold))
(((class color) (min-colors 88) (background dark))
(:foreground "Green1" :weight bold))
(((class color) (min-colors 16) (background dark))
(: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-error-screen-columns)
(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
;; with the next-error function in simple.el, and it's only
;; coincidentally named similarly to compilation-next-error.
@ -1641,8 +1647,9 @@ and overlay is highlighted between MK and END-MK."
(numberp next-error-highlight)))
(delete-overlay compilation-highlight-overlay))))))
(when (and (eq next-error-highlight 'fringe-arrow))
(set (make-local-variable 'overlay-arrow-position)
(copy-marker (line-beginning-position))))))
(setq next-error-overlay-arrow-position
(copy-marker (line-beginning-position))))))
(defun compilation-find-file (marker filename dir &rest formats)
"Find a buffer for file FILENAME.

View file

@ -1,6 +1,6 @@
;;; 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>
;; Keywords: c, languages, faces
@ -193,7 +193,7 @@ be included in the variable `cwarn-configuration'. By default C and
C++ modes are included.
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)
(if font-lock-mode (font-lock-fontify-buffer)))

View file

@ -1,6 +1,6 @@
;;; 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.
;; Author: Gerd Moellmann <gerd@gnu.org>
@ -158,13 +158,15 @@ This space is used to display markers."
(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."
:group 'ebrowse-faces)
(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."
:group 'ebrowse-faces)
@ -182,7 +184,8 @@ This space is used to display markers."
(defface ebrowse-member-attribute-face
'((t (:foreground "red")))
'((((min-colors 88)) (:foreground "red1"))
(t (:foreground "red")))
"*Face used to display member attributes."
:group 'ebrowse-faces)
@ -194,7 +197,8 @@ This space is used to display markers."
(defface ebrowse-progress-face
'((t (:background "blue")))
'((((min-colors 88)) (:background "blue1"))
(t (:background "blue")))
"*Face for progress indicator."
:group 'ebrowse-faces)

View file

@ -964,7 +964,7 @@ Convert it to flymake internal format."
(if (consp file) (setq file (car file)))
(if (consp line) (setq line (car line)))
(if (consp col) (setq col (car col)))
(when (not (functionp line))
(setq converted-list (cons (list regexp file line col) converted-list)))))
converted-list))
@ -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.
When called interactively, toggles the minor mode.
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-can-syntax-check-file (buffer-file-name))
(flymake-mode-on)

View file

@ -1,6 +1,6 @@
;;; 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>
;; 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.
When this mode is active, it tries to add virtual separators (like underscores)
at places they belong to."
nil " o^o" nil
:group 'glasses :lighter " o^o"
(save-excursion
(save-restriction
(widen)

View file

@ -1,6 +1,6 @@
;;; 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>
;; Maintainer: FSF
@ -197,7 +197,7 @@ how the hiding is done:
After `show-ifdefs', read-only status is restored to previous value.
\\{hide-ifdef-mode-map}"
nil " Ifdef" nil
:group 'hide-ifdef :lighter " Ifdef"
(if hide-ifdef-mode
(progn
;; inherit global values

View file

@ -1,7 +1,7 @@
;;; idlw-help.el --- HTML Help code for IDLWAVE
;; Copyright (c) 2000 Carsten Dominik
;; 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>
;; Carsten Dominik <dominik@astro.uva.nl>
@ -183,7 +183,8 @@ support."
:type 'string)
(defface idlwave-help-link-face
'((((class color)) (:foreground "Blue"))
'((((min-colors 88) (class color)) (:foreground "Blue1"))
(((class color)) (:foreground "Blue"))
(t (:weight bold)))
"Face for highlighting links into IDLWAVE online help."
:group 'idlwave-online-help)

View file

@ -574,7 +574,7 @@ documents - you must insert literal tabs by hand.")
;; but it *did* have an asterisk in the docstring!
(defcustom sh-builtins
'((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"
"jobs" "kill" "let" "local" "popd" "printf" "pushd" "shopt"
"source" "suspend" "typeset" "unalias")
@ -779,7 +779,10 @@ See `sh-feature'.")
;; Font-Lock support
(defface sh-heredoc-face
'((((class color)
'((((min-colors 88) (class color)
(background dark))
(:foreground "yellow1" :weight bold))
(((class color)
(background dark))
(:foreground "yellow" :weight bold))
(((class color)
@ -791,6 +794,10 @@ See `sh-feature'.")
:group 'sh-indentation)
(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
'((csh sh-append shell
@ -815,7 +822,7 @@ See `sh-feature'.")
;; The next entry is only used for defining the others
(shell sh-append executable-font-lock-keywords
;; 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-z_][A-Za-z0-9_]*\\|[0-9]+\\|[$*_]\\)" 1
font-lock-variable-name-face))

View file

@ -1,6 +1,7 @@
;;; 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
;; Author: Tom Tromey <tromey@redhat.com>
@ -41,6 +42,7 @@
;; * tcl-typeword-list is similar, but uses font-lock-type-face.
;; * 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.
;; * tcl-builtin-list lists commands to be given font-lock-builtin-face.
;; * tcl-type-alist can be used to minimally customize indentation
;; according to context.
@ -192,6 +194,11 @@ inferior Tcl to load that file. The filename will be appropriately
quoted for Tcl."
: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.
;;
@ -371,6 +378,21 @@ Call `tcl-set-font-lock-keywords' after changing this list.")
Default list includes some TclX keywords.
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
"Keywords to highlight for Tcl. See variable `font-lock-keywords'.
This variable is generally set from `tcl-proc-regexp',
@ -466,14 +488,30 @@ Uses variables `tcl-proc-regexp' and `tcl-keyword-list'."
"\\(\\s-\\|$\\)")
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.
;; FIXME consider using "not word or symbol", not
;; "whitespace".
(cons (concat "\\(\\s-\\|^\\)"
;; FIXME Use regexp-quote?
(regexp-opt tcl-keyword-list t)
"\\(\\s-\\|$\\)")
2))))
(cons (concat "\\_<" (regexp-opt tcl-keyword-list t) "\\_>")
1))))
(if tcl-proc-regexp
()
@ -544,8 +582,8 @@ Commands:
(set (make-local-variable 'font-lock-defaults)
'(tcl-font-lock-keywords nil nil nil beginning-of-defun
(font-lock-syntactic-keywords . tcl-font-lock-syntactic-keywords)
(parse-sexp-lookup-properties . t)))
(font-lock-syntactic-keywords . tcl-font-lock-syntactic-keywords)
(parse-sexp-lookup-properties . t)))
(set (make-local-variable 'imenu-generic-expression)
tcl-imenu-generic-expression)
@ -1507,5 +1545,5 @@ The first line is assumed to look like \"#!.../program ...\"."
(provide 'tcl)
;;; arch-tag: 8a032554-c3ef-422e-b84c-acec0522179d
;; arch-tag: 8a032554-c3ef-422e-b84c-acec0522179d
;;; tcl.el ends here

View file

@ -12593,7 +12593,9 @@ This does background highlighting of translate-off regions.")
'vhdl-highlight-faces 'font-lock-variable-name-face 'custom-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))
(t (:inverse-video t)))
"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
'((((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))
(t ()))
"Font lock mode face used to highlight additional reserved words."
@ -14975,7 +14979,8 @@ expansion function)."
:group 'speedbar-faces)
(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")))
"Face used for displaying architecture names."
:group 'speedbar-faces)
@ -15000,6 +15005,7 @@ expansion function)."
(defface vhdl-speedbar-instantiation-face
'((((class color) (background light)) (:foreground "Brown"))
(((min-colors 88) (class color) (background dark)) (:foreground "Yellow1"))
(((class color) (background dark)) (:foreground "Yellow")))
"Face used for displaying instantiation names."
:group 'speedbar-faces)
@ -15017,7 +15023,9 @@ expansion function)."
:group 'speedbar-faces)
(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)))
"Face used for displaying architecture names."
:group 'speedbar-faces)
@ -15036,6 +15044,7 @@ expansion function)."
(defface vhdl-speedbar-instantiation-selected-face
'((((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)))
"Face used for displaying instantiation names."
:group 'speedbar-faces)

View file

@ -175,6 +175,7 @@ Reveal mode renders invisible text around point visible again.
Interactively, with no prefix argument, toggle the mode.
With universal prefix ARG (or if ARG is nil) turn mode on.
With zero or negative ARG turn mode off."
:group 'reveal
:lighter (global-reveal-mode nil " Reveal")
:keymap reveal-mode-map
(if reveal-mode

View file

@ -114,6 +114,10 @@ If `fringe-arrow', indicate the locus by the fringe arrow."
(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
"The most recent next-error buffer.
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
buffer causes automatic display of the corresponding source code
location."
nil " Fol" nil
:group 'next-error :init-value " Fol"
(if (not next-error-follow-minor-mode)
(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)

View file

@ -1,6 +1,6 @@
;;; 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>
;; Keywords: revision-control merge diff3 cvs conflict
@ -76,8 +76,12 @@ Used in `smerge-diff-base-mine' and related functions."
:type 'boolean)
(defface smerge-mine-face
'((((background light))
'((((min-colors 88) (background light))
(:foreground "blue1"))
(((background light))
(:foreground "blue"))
(((min-colors 88) (background dark))
(:foreground "cyan1"))
(((background dark))
(:foreground "cyan")))
"Face for your code."
@ -94,7 +98,9 @@ Used in `smerge-diff-base-mine' and related functions."
(defvar smerge-other-face 'smerge-other-face)
(defface smerge-base-face
'((((background light))
'((((min-colors 88) (background light))
(:foreground "red1"))
(((background light))
(:foreground "red"))
(((background dark))
(:foreground "orange")))
@ -667,7 +673,7 @@ buffer names."
(define-minor-mode smerge-mode
"Minor mode to simplify editing output from the diff3 program.
\\{smerge-mode-map}"
nil " SMerge" nil
:group 'smerge :lighter " SMerge"
(when (and (boundp 'font-lock-mode) font-lock-mode)
(set (make-local-variable 'font-lock-multiline) t)
(save-excursion

View file

@ -657,7 +657,7 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
(while (and (not done) args)
(let* ((longopts '(("--no-init-file") ("--no-site-file") ("--user")
("--debug-init") ("--iconic") ("--icon-type")
("--no-blinking-cursor")))
("--no-blinking-cursor") ("--bare-bones")))
(argi (pop args))
(orig-argi argi)
argval)
@ -677,7 +677,7 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
(setq argval nil
argi orig-argi)))))
(cond
((equal argi "-Q")
((member argi '("-Q" "-bare-bones"))
(setq init-file-user nil
site-run-file nil
no-blinking-cursor t
@ -1004,8 +1004,27 @@ If this is nil, no message will be displayed."
using the mouse.\n\n"
:face (variable-pitch :weight bold)
"Important Help menu items:\n"
:face variable-pitch "\
Emacs Tutorial\tLearn-by-doing tutorial for using Emacs efficiently
:face variable-pitch
(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
Read the Emacs Manual\tView the Emacs manual using Info
\(Non)Warranty\tGNU Emacs comes with "
@ -1069,14 +1088,18 @@ Values less than 60 seconds are ignored."
(defun fancy-splash-insert (&rest args)
"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
`put-text-properties'."
(let ((current-face nil))
(while args
(if (eq (car args) :face)
(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
'help-echo fancy-splash-help-echo)))
(setq args (cdr args)))))
@ -1461,9 +1484,16 @@ normal otherwise."
nil t))
(error nil))
(kill-buffer buffer)))))
;; Stop any "Loading image..." message hiding echo-area-message.
(use-fancy-splash-screens-p)
(display-startup-echo-area-message))
;; display-splash-screen at the end of command-line-1 calls
;; use-fancy-splash-screens-p. This can cause image.el to be
;; 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
;; was displayed, so user can read it.

View file

@ -3231,7 +3231,7 @@ See `term-prompt-regexp'."
((eq char ?P)
(term-delete-chars (max 1 term-terminal-parameter)))
;; \E[@ - insert spaces
((eq char ?@)
((eq char ?@) ;; (terminfo: ich)
(term-insert-spaces (max 1 term-terminal-parameter)))
;; \E[?h - DEC Private Mode Set
((eq char ?h)

View file

@ -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))
;; Create a fontset from FONT. The fontset name is
;; 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
;; of the alist, so that anything specified on the command line takes

View file

@ -107,15 +107,15 @@
("red" 1 (205 0 0)) ; red3
("green" 2 ( 0 205 0)) ; green3
("yellow" 3 (205 205 0)) ; yellow3
("blue" 4 ( 0 0 205)) ; blue3
("blue" 4 ( 0 0 238)) ; blue2
("magenta" 5 (205 0 205)) ; magenta3
("cyan" 6 ( 0 205 205)) ; cyan3
("white" 7 (229 229 229)) ; gray90
("brightblack" 8 ( 77 77 77)) ; gray30
("brightblack" 8 (127 127 127)) ; gray50
("brightred" 9 (255 0 0)) ; red
("brightgreen" 10 ( 0 255 0)) ; green
("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
("brightcyan" 14 ( 0 255 255)) ; cyan
("brightwhite" 15 (255 255 255))) ; white

View file

@ -1,6 +1,6 @@
;;; 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.
;; 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")))
(defcustom bibtex-generate-url-list
'((("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)))
'((("url" . ".*:.*")))
"List of schemes for generating the URL of a BibTeX entry.
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'.
REGEXP is matched against the text of FIELD. If the match succeeds, then
this scheme is used. If no STEPs are specified the matched text is used
as the URL, otherwise the URL is built by concatenating the STEPs.
REGEXP is matched against the text of FIELD. If the match succeeds,
then this scheme is used. If no STRING and STEPs are specified
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
the text of FIELD is matched against REGEXP, and is replaced with REPLACE.
REPLACE can be a string, or a number (which selects the corresponding submatch)
or a function called with the field's text as argument and with the
`match-data' properly set.
A STEP is a list (FIELD REGEXP REPLACE). The text of FIELD
is matched against REGEXP, and is replaced with REPLACE.
REPLACE can be a string, or a number (which selects the corresponding
submatch), or a function called with the field's text as argument
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
:type '(repeat
(list :tag "Scheme"
(cons :tag "Scheme"
(cons :tag "Matcher" :extra-offset 4
(string :tag "BibTeX field")
(regexp :tag "Regexp"))
(repeat :tag "Steps to generate URL" :inline t
(choice
(string :tag "Literal text")
(choice
(const :tag "Take match as is" nil)
(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")
(regexp :tag "Regexp")
(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)
(goto-char start)
(while (and (not found)
(setq url (caar lst)))
(setq url (car (pop lst))))
(setq found (and (bibtex-string= field (car url))
(re-search-forward (cdr url) end t)
(>= (match-beginning 0) pnt))
lst (cdr lst))))
(>= (match-beginning 0) pnt)))))
(goto-char end))
(if found (bibtex-button (match-beginning 0) (match-end 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,
(case-fold-search t)
(lst bibtex-generate-url-list)
field url scheme)
field url scheme obj fmt)
(while (setq scheme (pop lst))
(when (and (setq field (cdr (assoc-string (caar scheme)
fields-alist t)))
;; Always remove field delimiters
(progn (setq field (bibtex-remove-delimiters-string field))
(string-match (cdar scheme) field)))
(setq lst nil)
(if (null (cdr scheme))
(setq url (match-string 0 field)))
(dolist (step (cdr scheme))
(cond ((stringp step)
(setq url (concat url step)))
((setq field (cdr (assoc-string (car step) fields-alist t)))
;; Always remove field delimiters
(setq field (bibtex-remove-delimiters-string field))
(if (string-match (nth 1 step) field)
(setq field (cond
((functionp (nth 2 step))
(funcall (nth 2 step) field))
((numberp (nth 2 step))
(match-string (nth 2 step) field))
(t
(replace-match (nth 2 step) t nil field))))
;; If the scheme is set up correctly,
;; we should never reach this point
(error "Match failed: %s" field))
(setq url (concat url field)))
;; If the scheme is set up correctly,
;; we should never reach this point
(t (error "Step failed: %s" step))))
(message "%s" url)
(browse-url url)))
(setq lst nil
scheme (cdr scheme)
url (if (null scheme) (match-string 0 field)
(if (stringp (car scheme))
(setq fmt (pop scheme)))
(dolist (step scheme)
;; Always remove field delimiters
(setq field (bibtex-remove-delimiters-string
(cdr (assoc-string (car step) fields-alist t))))
(if (string-match (nth 1 step) field)
(setq field (cond ((functionp (nth 2 step))
(funcall (nth 2 step) field))
((numberp (nth 2 step))
(match-string (nth 2 step) field))
(t
(replace-match (nth 2 step) t nil field))))
;; If the scheme is set up correctly,
;; we should never reach this point
(error "Match failed: %s" field))
(push field obj))
(if fmt (apply 'format fmt (nreverse obj))
(apply 'concat (nreverse obj)))))
(browse-url (message "%s" url))))
(unless url (message "No URL known.")))))

View file

@ -1,6 +1,6 @@
;;; 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>
;; Keywords: wp, faces
@ -183,7 +183,7 @@ etc/enriched.doc in the Emacs distribution directory.
Commands:
\\{enriched-mode-map}"
nil " Enriched" nil
:group 'enriched :lighter " Enriched"
(cond ((null enriched-mode)
;; Turn mode off
(setq buffer-file-format (delq 'text/enriched buffer-file-format))

View file

@ -221,10 +221,10 @@ Set this to nil if you don't want a modeline indicator."
(defcustom flyspell-large-region 1000
"*The threshold that determines if a region is small.
The `flyspell-region' function is invoked if the region is small, the
word are checked one after the other using regular flyspell check
means. If the region is large, a new Ispell process is spawned to get
speed."
If the region is smaller than this number of characters,
`flyspell-region' checks the words sequentially using regular
flyspell methods. Else, if the region is large, a new Ispell process is
spawned for speed."
:group 'flyspell
:version "21.1"
:type 'number)

View file

@ -279,7 +279,7 @@ the following lines anywhere in the buffer:
:group 'org-startup
: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.
When the function `org-mode' is called interactively in an empty, this
normally means that the file name does not automatically trigger Org-mode.
@ -3477,7 +3477,7 @@ date."
(defun org-diary-default-entry ()
"Add a dummy entry to the diary.
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)
"Add current file to the list of files in variable `org-agenda-files'.

View file

@ -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
changes are made within it. Self-inserting characters only cause
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
(when refill-ignorable-overlay
(delete-overlay refill-ignorable-overlay)

View file

@ -683,7 +683,9 @@ height."
:group 'table)
(defface table-cell-face
'((((class color))
'((((min-colors 88) (class color))
(:foreground "gray90" :background "blue1"))
(((class color))
(:foreground "gray90" :background "blue"))
(t (:bold t)))
"*Face used for table cell contents."

View file

@ -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)
;; This is separate from the previous one because of cases like
;; {\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)))))
"Gaudy expressions to highlight in TeX modes.")

View file

@ -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)
* url-history.el (url-have-visited-url): Don't barf if

View file

@ -1,6 +1,6 @@
;;; 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
@ -106,7 +106,7 @@ particularly bad at this\).")
;;;###autoload
(define-minor-mode url-handler-mode
"Use URL to handle URL-like file names."
:global t
:global t :group 'url
(if (not (boundp 'file-name-handler-alist))
;; Can't be turned ON anyway.
(setq url-handler-mode nil)

View file

@ -1,10 +1,10 @@
;;; 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
;; Author: Juan León Lahoz García <juan-leon.lahoz@tecsidel.es>
;; Version: 1.91
;; Author: Juan León Lahoz García <juanleon1@gmail.com>
;; Version: 2.0
;; Keywords: dired, environment, files, renaming
;; This file is part of GNU Emacs.
@ -156,9 +156,8 @@
;;; Code:
(defvar dired-backup-overwrite) ; Only in emacs 20.x this is a custom var
(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))
(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))
: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
"*If non-nil, the target of the symbolic links can be changed also.
In systems without symbolic links support, this variable has no effect
@ -309,6 +295,7 @@ See `wdired-mode'."
(interactive)
(set (make-local-variable 'wdired-old-content)
(buffer-substring (point-min) (point-max)))
(set (make-local-variable 'query-replace-skip-read-only) t)
(use-local-map wdired-mode-map)
(force-mode-line-update)
(setq buffer-read-only nil)
@ -664,64 +651,6 @@ Like original function but it skips read-only words."
(interactive "p")
(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
;; permissions) of the files.

View file

@ -1,6 +1,6 @@
;;; 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>
;; Keywords: convenience
@ -319,7 +319,7 @@ To disable timer scans, set this to zero."
:group 'faces)
(defface whitespace-highlight-face '((((class color) (background light))
(:background "green"))
(:background "green1"))
(((class color) (background dark))
(:background "sea green"))
(((class grayscale mono)
@ -489,16 +489,14 @@ and:
(if whitespace-spacetab "s")
(if whitespace-trailing "t")))))
(whitespace-update-modeline whitespace-this-modeline)
(save-excursion
(get-buffer-create whitespace-errbuf)
(kill-buffer whitespace-errbuf)
(get-buffer-create whitespace-errbuf)
(set-buffer whitespace-errbuf)
(if (get-buffer whitespace-errbuf)
(kill-buffer whitespace-errbuf))
(with-current-buffer (get-buffer-create whitespace-errbuf)
(if whitespace-errmsg
(progn
(insert whitespace-errmsg)
(if (not (or quiet whitespace-silent))
(display-buffer whitespace-errbuf t))
(display-buffer (current-buffer) t))
(if (not quiet)
(message "Whitespaces: [%s%s] in %s"
whitespace-this-modeline
@ -511,9 +509,7 @@ and:
(if (and (not quiet) (not (equal whitespace-clean-msg "")))
(message "%s %s" whitespace-filename
whitespace-clean-msg))))))))
(if whitespace-error
t
nil)))
whitespace-error))
;;;###autoload
(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)
"Highlight the current line, unhighlighting a previously jumped to line."
(if whitespace-display-spaces-in-color
(progn
(let ((ol (whitespace-make-overlay b e)))
(whitespace-unhighlight-the-space)
(add-to-list 'whitespace-highlighted-space
(whitespace-make-overlay b e))
(whitespace-overlay-put (whitespace-make-overlay b e) 'face
'whitespace-highlight-face))))
(push ol whitespace-highlighted-space)
(whitespace-overlay-put ol 'face 'whitespace-highlight-face))))
;; (add-hook 'pre-command-hook 'whitespace-unhighlight-the-space))
(defun whitespace-unhighlight-the-space ()
"Unhighlight the currently highlight line."
(if (and whitespace-display-spaces-in-color whitespace-highlighted-space)
(let ((whitespace-this-space nil))
(while 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))
(progn
(mapc 'whitespace-delete-overlay whitespace-highlighted-space)
(setq whitespace-highlighted-space nil))
(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)
;;; arch-tag: 4ff44e87-b63c-402d-95a6-15e51e58bd0c
;; arch-tag: 4ff44e87-b63c-402d-95a6-15e51e58bd0c
;;; whitespace.el ends here

Some files were not shown because too many files have changed in this diff Show more