From 959272ecf045739c52dcf65b1b5a4e591de9e920 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 10 Jan 2012 00:32:46 -0800 Subject: Update short copyright year to 2012 (do not merge to trunk) * etc/refcards/calccard.tex, etc/refcards/cs-dired-ref.tex: * etc/refcards/cs-refcard.tex, etc/refcards/cs-survival.tex: * etc/refcards/de-refcard.tex, etc/refcards/dired-ref.tex: * etc/refcards/fr-dired-ref.tex, etc/refcards/fr-refcard.tex: * etc/refcards/fr-survival.tex, etc/refcards/orgcard.tex: * etc/refcards/pl-refcard.tex, etc/refcards/pt-br-refcard.tex: * etc/refcards/refcard.tex, etc/refcards/ru-refcard.tex: * etc/refcards/sk-dired-ref.tex, etc/refcards/sk-refcard.tex: * etc/refcards/sk-survival.tex, etc/refcards/survival.tex: * etc/refcards/vipcard.tex, etc/refcards/viperCard.tex: * lib-src/ebrowse.c (version) : * lib-src/etags.c (print_version) : * lib-src/rcs2log (Copyright): * lisp/version.el (emacs-copyright): * nextstep/Cocoa/Emacs.base/Contents/Info.plist: * nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings: * nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist: Update short copyright year to 2012. --- etc/ChangeLog | 14 ++++++++++++++ etc/refcards/calccard.tex | 2 +- etc/refcards/cs-dired-ref.tex | 2 +- etc/refcards/cs-refcard.tex | 2 +- etc/refcards/cs-survival.tex | 2 +- etc/refcards/de-refcard.tex | 2 +- etc/refcards/dired-ref.tex | 2 +- etc/refcards/fr-dired-ref.tex | 2 +- etc/refcards/fr-refcard.tex | 2 +- etc/refcards/fr-survival.tex | 2 +- etc/refcards/orgcard.tex | 2 +- etc/refcards/pl-refcard.tex | 2 +- etc/refcards/pt-br-refcard.tex | 2 +- etc/refcards/refcard.tex | 2 +- etc/refcards/ru-refcard.tex | 2 +- etc/refcards/sk-dired-ref.tex | 2 +- etc/refcards/sk-refcard.tex | 2 +- etc/refcards/sk-survival.tex | 2 +- etc/refcards/survival.tex | 2 +- etc/refcards/vipcard.tex | 2 +- etc/refcards/viperCard.tex | 2 +- 21 files changed, 34 insertions(+), 20 deletions(-) (limited to 'etc') diff --git a/etc/ChangeLog b/etc/ChangeLog index 6e5bb392cc8..37d3ebeafff 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,17 @@ +2012-01-10 Glenn Morris + + * refcards/calccard.tex, refcards/cs-dired-ref.tex: + * refcards/cs-refcard.tex, refcards/cs-survival.tex: + * refcards/de-refcard.tex, refcards/dired-ref.tex: + * refcards/fr-dired-ref.tex, refcards/fr-refcard.tex: + * refcards/fr-survival.tex, refcards/orgcard.tex: + * refcards/pl-refcard.tex, refcards/pt-br-refcard.tex: + * refcards/refcard.tex, refcards/ru-refcard.tex: + * refcards/sk-dired-ref.tex, refcards/sk-refcard.tex: + * refcards/sk-survival.tex, refcards/survival.tex: + * refcards/vipcard.tex, refcards/viperCard.tex: + Update short copyright year to 2012. + 2011-03-07 Chong Yidong * Version 23.3 released. diff --git a/etc/refcards/calccard.tex b/etc/refcards/calccard.tex index e74cc536151..b68e8b85297 100644 --- a/etc/refcards/calccard.tex +++ b/etc/refcards/calccard.tex @@ -65,7 +65,7 @@ % Internet: gildea@stop.mail-abuse.org \def\emacsversionnumber{23} -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year \def\shortcopyrightnotice{\vskip 1ex plus 2 fill \centerline{\small \copyright\ \year\ Free Software Foundation, Inc. diff --git a/etc/refcards/cs-dired-ref.tex b/etc/refcards/cs-dired-ref.tex index bb91fa60023..4f955cf96e3 100644 --- a/etc/refcards/cs-dired-ref.tex +++ b/etc/refcards/cs-dired-ref.tex @@ -43,7 +43,7 @@ \pdflayout=(0) \def\versionemacs{23} % version of Emacs this is for -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year % Nothing else needs to be changed. diff --git a/etc/refcards/cs-refcard.tex b/etc/refcards/cs-refcard.tex index 252976d6e86..ba8bd2ba2bd 100644 --- a/etc/refcards/cs-refcard.tex +++ b/etc/refcards/cs-refcard.tex @@ -60,7 +60,7 @@ \pdflayout=(0) \def\versionemacs{23} % version of Emacs this is for -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year % Nothing else needs to be changed. diff --git a/etc/refcards/cs-survival.tex b/etc/refcards/cs-survival.tex index b87e561ff3c..c4e303a9f2b 100644 --- a/etc/refcards/cs-survival.tex +++ b/etc/refcards/cs-survival.tex @@ -56,7 +56,7 @@ \chyph \def\versionemacs{23} % version of Emacs this is for -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year \def\copyrightnotice{\penalty-1\vfill \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter diff --git a/etc/refcards/de-refcard.tex b/etc/refcards/de-refcard.tex index 9e074b72396..cb485b256cc 100644 --- a/etc/refcards/de-refcard.tex +++ b/etc/refcards/de-refcard.tex @@ -62,7 +62,7 @@ \mdqoff % deactivates the "-char \def\versionemacs{23} % version of Emacs this is for -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year % Nothing else needs to be changed below this line. diff --git a/etc/refcards/dired-ref.tex b/etc/refcards/dired-ref.tex index fdb46d5b48f..e04a867f877 100644 --- a/etc/refcards/dired-ref.tex +++ b/etc/refcards/dired-ref.tex @@ -45,7 +45,7 @@ \pdflayout=(1) \def\versionemacs{23} % version of Emacs this is for -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year % Nothing else needs to be changed. diff --git a/etc/refcards/fr-dired-ref.tex b/etc/refcards/fr-dired-ref.tex index 549cf341a55..0bd368961a3 100644 --- a/etc/refcards/fr-dired-ref.tex +++ b/etc/refcards/fr-dired-ref.tex @@ -37,7 +37,7 @@ \pdflayout=(0) \def\versionemacs{23} % version of Emacs this is for -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year % Nothing else needs to be changed. diff --git a/etc/refcards/fr-refcard.tex b/etc/refcards/fr-refcard.tex index c02169cc677..3da69552830 100644 --- a/etc/refcards/fr-refcard.tex +++ b/etc/refcards/fr-refcard.tex @@ -57,7 +57,7 @@ \pdflayout=(0l) \def\versionemacs{23} % version of Emacs this is for -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year % Nothing else needs to be changed below this line. diff --git a/etc/refcards/fr-survival.tex b/etc/refcards/fr-survival.tex index fea6ec27cf6..3565216e8a7 100644 --- a/etc/refcards/fr-survival.tex +++ b/etc/refcards/fr-survival.tex @@ -51,7 +51,7 @@ \pdflayout=(0) \def\versionemacs{23} % version of Emacs this is for -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year \def\copyrightnotice{\penalty-1\vfill \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex index 28fb565dc84..18dd5700464 100644 --- a/etc/refcards/orgcard.tex +++ b/etc/refcards/orgcard.tex @@ -1,7 +1,7 @@ % Reference Card for Org Mode \def\orgversionnumber{6.33x} \def\versionyear{2009} % latest update -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year %**start of header \newcount\columnsperpage diff --git a/etc/refcards/pl-refcard.tex b/etc/refcards/pl-refcard.tex index 500689aa852..826e624a6c0 100644 --- a/etc/refcards/pl-refcard.tex +++ b/etc/refcards/pl-refcard.tex @@ -71,7 +71,7 @@ \pdflayout=(0) \def\versionemacs{23} % version of Emacs this is for -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year % Nothing else needs to be changed. diff --git a/etc/refcards/pt-br-refcard.tex b/etc/refcards/pt-br-refcard.tex index 76c1c37caa2..eaf1dbc5f2f 100644 --- a/etc/refcards/pt-br-refcard.tex +++ b/etc/refcards/pt-br-refcard.tex @@ -63,7 +63,7 @@ \pdflayout=(0l) \def\versionemacs{23} % version of Emacs this is for -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year % Nothing else needs to be changed below this line. diff --git a/etc/refcards/refcard.tex b/etc/refcards/refcard.tex index 1c56bef2fc7..1849411db70 100644 --- a/etc/refcards/refcard.tex +++ b/etc/refcards/refcard.tex @@ -64,7 +64,7 @@ % Nothing else needs to be changed below this line. \def\versionemacs{23} % version of Emacs this is for -\def\year{2011} % copyright year +\def\year{2012} % copyright year \def\shortcopyrightnotice{\vskip 1ex plus 2 fill \centerline{\small \copyright\ \year\ Free Software Foundation, Inc. diff --git a/etc/refcards/ru-refcard.tex b/etc/refcards/ru-refcard.tex index 6030dbb17b6..274bafcf7ad 100644 --- a/etc/refcards/ru-refcard.tex +++ b/etc/refcards/ru-refcard.tex @@ -23,7 +23,7 @@ \setlength{\ColThreeWidth}{25mm} \newcommand{\versionemacs}[0]{23} % version of Emacs this is for -\newcommand{\cyear}[0]{2011} % copyright year +\newcommand{\cyear}[0]{2012} % copyright year \newcommand\shortcopyrightnotice[0]{\vskip 1ex plus 2 fill \centerline{\footnotesize \copyright\ \cyear\ Free Software Foundation, Inc. diff --git a/etc/refcards/sk-dired-ref.tex b/etc/refcards/sk-dired-ref.tex index 4a2b707403f..6604b5c6120 100644 --- a/etc/refcards/sk-dired-ref.tex +++ b/etc/refcards/sk-dired-ref.tex @@ -44,7 +44,7 @@ \pdflayout=(0) \def\versionemacs{23} % version of Emacs this is for -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year % Nothing else needs to be changed. diff --git a/etc/refcards/sk-refcard.tex b/etc/refcards/sk-refcard.tex index 534216734c6..9ed211f959c 100644 --- a/etc/refcards/sk-refcard.tex +++ b/etc/refcards/sk-refcard.tex @@ -61,7 +61,7 @@ \pdflayout=(0) \def\versionemacs{23} % version of Emacs this is for -\def\year{2010} % latest copyright year +\def\year{2012} % latest copyright year % Nothing else needs to be changed. diff --git a/etc/refcards/sk-survival.tex b/etc/refcards/sk-survival.tex index b59ba833b94..031ab548485 100644 --- a/etc/refcards/sk-survival.tex +++ b/etc/refcards/sk-survival.tex @@ -57,7 +57,7 @@ \shyph \def\versionemacs{23} % version of Emacs this is for -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year \def\copyrightnotice{\penalty-1\vfill \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter diff --git a/etc/refcards/survival.tex b/etc/refcards/survival.tex index 2d2bff576f2..6642f077c11 100644 --- a/etc/refcards/survival.tex +++ b/etc/refcards/survival.tex @@ -46,7 +46,7 @@ \pdflayout=(1) \def\versionemacs{23} % version of Emacs this is for -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year \def\copyrightnotice{\penalty-1\vfill \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter diff --git a/etc/refcards/vipcard.tex b/etc/refcards/vipcard.tex index bd3beb71d35..9970eacbd7d 100644 --- a/etc/refcards/vipcard.tex +++ b/etc/refcards/vipcard.tex @@ -51,7 +51,7 @@ \pdflayout=(1) \def\versionemacs{18} % version of Emacs this is for -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year \def\versionvip{3.5} % Nothing else needs to be changed. diff --git a/etc/refcards/viperCard.tex b/etc/refcards/viperCard.tex index d403d9d2615..d500a5e37df 100644 --- a/etc/refcards/viperCard.tex +++ b/etc/refcards/viperCard.tex @@ -54,7 +54,7 @@ \pdflayout=(1) \def\versionemacs{21} % version of Emacs this is for -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year \def\versionxemacs{20} % version of XEmacs this is for \def\versionviper{3.0} % version of Viper this is for -- cgit v1.3 From 49f70d46ea38ceb7a501594db7f6ea35e19681aa Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 10 Jan 2012 23:52:35 -0800 Subject: Add 2012 to FSF copyright years for Emacs files (do not merge to trunk) --- ChangeLog | 2 +- INSTALL | 2 +- INSTALL.BZR | 2 +- Makefile.in | 2 +- README | 2 +- admin/ChangeLog | 2 +- admin/README | 2 +- admin/admin.el | 2 +- admin/alloc-colors.c | 2 +- admin/build-configs | 2 +- admin/charsets/mapfiles/README | 2 +- admin/cus-test.el | 2 +- admin/diff-tar-files | 2 +- admin/make-announcement | 2 +- admin/make-emacs | 2 +- admin/notes/copyright | 2 +- admin/notes/font-backend | 2 +- admin/notes/lel-TODO | 2 +- admin/notes/multi-tty | 2 +- admin/notes/unicode | 2 +- admin/nt/README-UNDUMP.W32 | 2 +- admin/nt/README-ftp-server | 2 +- admin/nt/README.W32 | 2 +- admin/nt/makedist.bat | 2 +- admin/quick-install-emacs | 2 +- config.bat | 2 +- configure.in | 4 ++-- doc/emacs/ChangeLog | 2 +- doc/emacs/Makefile.in | 2 +- doc/emacs/abbrevs.texi | 2 +- doc/emacs/ack.texi | 2 +- doc/emacs/anti.texi | 2 +- doc/emacs/arevert-xtra.texi | 2 +- doc/emacs/basic.texi | 2 +- doc/emacs/buffers.texi | 2 +- doc/emacs/building.texi | 2 +- doc/emacs/cal-xtra.texi | 2 +- doc/emacs/calendar.texi | 2 +- doc/emacs/cmdargs.texi | 2 +- doc/emacs/commands.texi | 2 +- doc/emacs/custom.texi | 2 +- doc/emacs/dired-xtra.texi | 2 +- doc/emacs/dired.texi | 2 +- doc/emacs/display.texi | 2 +- doc/emacs/emacs-xtra.texi | 2 +- doc/emacs/emacs.texi | 2 +- doc/emacs/emerge-xtra.texi | 2 +- doc/emacs/entering.texi | 2 +- doc/emacs/files.texi | 2 +- doc/emacs/fixit.texi | 2 +- doc/emacs/fortran-xtra.texi | 2 +- doc/emacs/frames.texi | 2 +- doc/emacs/glossary.texi | 2 +- doc/emacs/gnu.texi | 2 +- doc/emacs/help.texi | 2 +- doc/emacs/indent.texi | 2 +- doc/emacs/killing.texi | 2 +- doc/emacs/kmacro.texi | 2 +- doc/emacs/m-x.texi | 2 +- doc/emacs/macos.texi | 2 +- doc/emacs/maintaining.texi | 2 +- doc/emacs/major.texi | 2 +- doc/emacs/makefile.w32-in | 2 +- doc/emacs/mark.texi | 2 +- doc/emacs/mini.texi | 2 +- doc/emacs/misc.texi | 2 +- doc/emacs/msdog-xtra.texi | 2 +- doc/emacs/msdog.texi | 2 +- doc/emacs/mule.texi | 2 +- doc/emacs/picture-xtra.texi | 2 +- doc/emacs/programs.texi | 2 +- doc/emacs/regs.texi | 2 +- doc/emacs/rmail.texi | 2 +- doc/emacs/screen.texi | 2 +- doc/emacs/search.texi | 2 +- doc/emacs/sending.texi | 2 +- doc/emacs/text.texi | 2 +- doc/emacs/trouble.texi | 2 +- doc/emacs/vc-xtra.texi | 2 +- doc/emacs/vc1-xtra.texi | 2 +- doc/emacs/windows.texi | 2 +- doc/emacs/xresources.texi | 2 +- doc/lispintro/ChangeLog | 2 +- doc/lispintro/Makefile.in | 2 +- doc/lispintro/README | 2 +- doc/lispintro/cons-1.eps | 2 +- doc/lispintro/cons-2.eps | 2 +- doc/lispintro/cons-2a.eps | 2 +- doc/lispintro/cons-3.eps | 2 +- doc/lispintro/cons-4.eps | 2 +- doc/lispintro/cons-5.eps | 2 +- doc/lispintro/drawers.eps | 2 +- doc/lispintro/emacs-lisp-intro.texi | 2 +- doc/lispintro/lambda-1.eps | 2 +- doc/lispintro/lambda-2.eps | 2 +- doc/lispintro/lambda-3.eps | 2 +- doc/lispintro/makefile.w32-in | 2 +- doc/lispref/ChangeLog | 2 +- doc/lispref/Makefile.in | 2 +- doc/lispref/README | 2 +- doc/lispref/abbrevs.texi | 2 +- doc/lispref/advice.texi | 2 +- doc/lispref/anti.texi | 2 +- doc/lispref/back.texi | 2 +- doc/lispref/backups.texi | 2 +- doc/lispref/buffers.texi | 2 +- doc/lispref/commands.texi | 2 +- doc/lispref/compile.texi | 2 +- doc/lispref/control.texi | 2 +- doc/lispref/customize.texi | 2 +- doc/lispref/debugging.texi | 2 +- doc/lispref/display.texi | 2 +- doc/lispref/edebug.texi | 2 +- doc/lispref/elisp-covers.texi | 2 +- doc/lispref/elisp.texi | 2 +- doc/lispref/errors.texi | 2 +- doc/lispref/eval.texi | 2 +- doc/lispref/files.texi | 2 +- doc/lispref/frames.texi | 2 +- doc/lispref/functions.texi | 2 +- doc/lispref/hash.texi | 2 +- doc/lispref/help.texi | 2 +- doc/lispref/hooks.texi | 2 +- doc/lispref/internals.texi | 2 +- doc/lispref/intro.texi | 2 +- doc/lispref/keymaps.texi | 2 +- doc/lispref/lay-flat.texi | 2 +- doc/lispref/lists.texi | 2 +- doc/lispref/loading.texi | 2 +- doc/lispref/locals.texi | 2 +- doc/lispref/macros.texi | 2 +- doc/lispref/makefile.w32-in | 2 +- doc/lispref/maps.texi | 2 +- doc/lispref/markers.texi | 2 +- doc/lispref/minibuf.texi | 2 +- doc/lispref/modes.texi | 2 +- doc/lispref/nonascii.texi | 2 +- doc/lispref/numbers.texi | 2 +- doc/lispref/objects.texi | 2 +- doc/lispref/os.texi | 2 +- doc/lispref/positions.texi | 2 +- doc/lispref/processes.texi | 2 +- doc/lispref/searching.texi | 2 +- doc/lispref/sequences.texi | 2 +- doc/lispref/streams.texi | 2 +- doc/lispref/strings.texi | 2 +- doc/lispref/symbols.texi | 2 +- doc/lispref/syntax.texi | 2 +- doc/lispref/text.texi | 2 +- doc/lispref/tindex.pl | 2 +- doc/lispref/tips.texi | 2 +- doc/lispref/two-volume-cross-refs.txt | 2 +- doc/lispref/two-volume.make | 2 +- doc/lispref/two.el | 2 +- doc/lispref/variables.texi | 2 +- doc/lispref/vol1.texi | 4 ++-- doc/lispref/vol2.texi | 4 ++-- doc/lispref/windows.texi | 2 +- doc/man/ChangeLog | 2 +- doc/man/b2m.1 | 2 +- doc/man/ebrowse.1 | 2 +- doc/man/emacs.1 | 2 +- doc/man/grep-changelog.1 | 2 +- doc/man/rcs-checkin.1 | 2 +- doc/misc/ChangeLog | 2 +- doc/misc/Makefile.in | 2 +- doc/misc/ada-mode.texi | 2 +- doc/misc/auth.texi | 2 +- doc/misc/autotype.texi | 2 +- doc/misc/calc.texi | 2 +- doc/misc/cc-mode.texi | 2 +- doc/misc/cl.texi | 2 +- doc/misc/dbus.texi | 2 +- doc/misc/dired-x.texi | 2 +- doc/misc/ebrowse.texi | 2 +- doc/misc/ede.texi | 2 +- doc/misc/ediff.texi | 2 +- doc/misc/edt.texi | 2 +- doc/misc/eieio.texi | 2 +- doc/misc/emacs-mime.texi | 2 +- doc/misc/epa.texi | 2 +- doc/misc/erc.texi | 2 +- doc/misc/eshell.texi | 2 +- doc/misc/eudc.texi | 2 +- doc/misc/faq.texi | 2 +- doc/misc/flymake.texi | 2 +- doc/misc/forms.texi | 2 +- doc/misc/gnus-coding.texi | 2 +- doc/misc/gnus-faq.texi | 2 +- doc/misc/gnus-news.el | 4 ++-- doc/misc/gnus-news.texi | 2 +- doc/misc/gnus.texi | 2 +- doc/misc/idlwave.texi | 2 +- doc/misc/info.texi | 2 +- doc/misc/mairix-el.texi | 2 +- doc/misc/makefile.w32-in | 2 +- doc/misc/message.texi | 2 +- doc/misc/mh-e.texi | 2 +- doc/misc/newsticker.texi | 2 +- doc/misc/nxml-mode.texi | 2 +- doc/misc/org.texi | 3 ++- doc/misc/pcl-cvs.texi | 2 +- doc/misc/pgg.texi | 2 +- doc/misc/rcirc.texi | 2 +- doc/misc/reftex.texi | 2 +- doc/misc/remember.texi | 2 +- doc/misc/sasl.texi | 2 +- doc/misc/sc.texi | 2 +- doc/misc/sem-user.texi | 2 +- doc/misc/semantic.texi | 2 +- doc/misc/ses.texi | 2 +- doc/misc/sieve.texi | 2 +- doc/misc/smtpmail.texi | 2 +- doc/misc/speedbar.texi | 2 +- doc/misc/tramp.texi | 2 +- doc/misc/trampver.texi | 2 +- doc/misc/url.texi | 2 +- doc/misc/vip.texi | 2 +- doc/misc/viper.texi | 2 +- doc/misc/widget.texi | 2 +- doc/misc/woman.texi | 2 +- etc/CONTRIBUTE | 2 +- etc/ChangeLog | 2 +- etc/DEBUG | 2 +- etc/DISTRIB | 2 +- etc/ERC-NEWS | 2 +- etc/ETAGS.EBNF | 2 +- etc/ETAGS.README | 2 +- etc/GNU | 2 +- etc/GNUS-NEWS | 2 +- etc/HELLO | 2 +- etc/MACHINES | 2 +- etc/MAILINGLISTS | 2 +- etc/MH-E-NEWS | 2 +- etc/MORE.STUFF | 2 +- etc/NEWS | 2 +- etc/NEWS.1-17 | 2 +- etc/NEWS.18 | 2 +- etc/NEWS.19 | 2 +- etc/NEWS.20 | 2 +- etc/NEWS.21 | 2 +- etc/NEWS.22 | 2 +- etc/PROBLEMS | 2 +- etc/README | 2 +- etc/TERMS | 2 +- etc/TODO | 2 +- etc/charsets/README | 4 ++-- etc/compilation.txt | 2 +- etc/edt-user.el | 2 +- etc/emacs-buffer.gdb | 2 +- etc/emacs.bash | 2 +- etc/emacs2.py | 2 +- etc/emacs3.py | 2 +- etc/enriched.doc | 2 +- etc/gnus-tut.txt | 2 +- etc/grammars/bovine-grammar.el | 2 +- etc/grammars/c.by | 2 +- etc/grammars/grammar.wy | 2 +- etc/grammars/java-tags.wy | 2 +- etc/grammars/js.wy | 4 ++-- etc/grammars/make.by | 2 +- etc/grammars/python.wy | 2 +- etc/grammars/scheme.by | 2 +- etc/grammars/srecode-template.wy | 2 +- etc/grammars/wisent-grammar.el | 4 ++-- etc/grep.txt | 2 +- etc/images/README | 6 +++--- etc/images/custom/README | 2 +- etc/images/ezimage/README | 2 +- etc/images/gnus/README | 6 +++--- etc/images/gnus/gnus.svg | 2 +- etc/images/gud/README | 6 +++--- etc/images/icons/README | 4 ++-- etc/images/icons/hicolor/scalable/apps/emacs.svg | 2 +- etc/images/icons/hicolor/scalable/mimetypes/emacs-document.svg | 2 +- etc/images/mh-logo.xpm | 2 +- etc/images/mpc/README | 2 +- etc/images/smilies/README | 2 +- etc/images/smilies/grayscale/README | 2 +- etc/images/smilies/medium/README | 2 +- etc/images/splash.svg | 2 +- etc/images/splash.xpm | 2 +- etc/images/tree-widget/default/README | 2 +- etc/images/tree-widget/folder/README | 2 +- etc/ps-prin0.ps | 2 +- etc/ps-prin1.ps | 2 +- etc/refcards/Makefile | 2 +- etc/refcards/README | 2 +- etc/refcards/calccard.tex | 2 +- etc/refcards/cs-dired-ref.tex | 2 +- etc/refcards/cs-refcard.tex | 2 +- etc/refcards/cs-survival.tex | 2 +- etc/refcards/de-refcard.tex | 2 +- etc/refcards/dired-ref.tex | 2 +- etc/refcards/fr-dired-ref.tex | 2 +- etc/refcards/fr-refcard.tex | 2 +- etc/refcards/fr-survival.tex | 2 +- etc/refcards/gnus-logo.eps | 2 +- etc/refcards/gnus-refcard.tex | 2 +- etc/refcards/orgcard.tex | 2 +- etc/refcards/pdflayout.sty | 2 +- etc/refcards/pl-refcard.tex | 2 +- etc/refcards/pt-br-refcard.tex | 2 +- etc/refcards/refcard.tex | 2 +- etc/refcards/ru-refcard.tex | 2 +- etc/refcards/sk-dired-ref.tex | 2 +- etc/refcards/sk-refcard.tex | 2 +- etc/refcards/sk-survival.tex | 2 +- etc/refcards/survival.tex | 2 +- etc/refcards/vipcard.tex | 2 +- etc/refcards/viperCard.tex | 2 +- etc/schema/locate.rnc | 2 +- etc/schema/relaxng.rnc | 2 +- etc/schema/schemas.xml | 2 +- etc/ses-example.ses | 2 +- etc/srecode/cpp.srt | 2 +- etc/srecode/default.srt | 2 +- etc/srecode/doc-cpp.srt | 2 +- etc/srecode/doc-default.srt | 2 +- etc/srecode/doc-java.srt | 2 +- etc/srecode/ede-make.srt | 2 +- etc/srecode/el.srt | 2 +- etc/srecode/getset-cpp.srt | 2 +- etc/srecode/java.srt | 2 +- etc/srecode/make.srt | 2 +- etc/srecode/template.srt | 2 +- etc/srecode/test.srt | 2 +- etc/srecode/texi.srt | 2 +- etc/srecode/wisent.srt | 2 +- etc/tutorials/TUTORIAL | 2 +- etc/tutorials/TUTORIAL.bg | 2 +- etc/tutorials/TUTORIAL.cn | 4 ++-- etc/tutorials/TUTORIAL.cs | 2 +- etc/tutorials/TUTORIAL.de | 2 +- etc/tutorials/TUTORIAL.eo | 2 +- etc/tutorials/TUTORIAL.es | 2 +- etc/tutorials/TUTORIAL.fr | 2 +- etc/tutorials/TUTORIAL.it | 2 +- etc/tutorials/TUTORIAL.ja | 2 +- etc/tutorials/TUTORIAL.ko | 2 +- etc/tutorials/TUTORIAL.nl | 4 ++-- etc/tutorials/TUTORIAL.pl | 2 +- etc/tutorials/TUTORIAL.pt_BR | 2 +- etc/tutorials/TUTORIAL.ro | 2 +- etc/tutorials/TUTORIAL.ru | 2 +- etc/tutorials/TUTORIAL.sk | 2 +- etc/tutorials/TUTORIAL.sl | 2 +- etc/tutorials/TUTORIAL.sv | 2 +- etc/tutorials/TUTORIAL.th | 2 +- etc/tutorials/TUTORIAL.zh | 2 +- leim/ChangeLog | 2 +- leim/Makefile.in | 2 +- leim/README | 2 +- leim/leim-ext.el | 2 +- leim/makefile.w32-in | 2 +- leim/quail/arabic.el | 2 +- leim/quail/croatian.el | 2 +- leim/quail/cyril-jis.el | 2 +- leim/quail/cyrillic.el | 2 +- leim/quail/czech.el | 2 +- leim/quail/georgian.el | 2 +- leim/quail/greek.el | 2 +- leim/quail/hangul.el | 2 +- leim/quail/hanja.el | 2 +- leim/quail/hanja3.el | 2 +- leim/quail/indian.el | 2 +- leim/quail/ipa.el | 2 +- leim/quail/japanese.el | 2 +- leim/quail/latin-alt.el | 2 +- leim/quail/latin-ltx.el | 2 +- leim/quail/latin-post.el | 2 +- leim/quail/latin-pre.el | 2 +- leim/quail/lrt.el | 2 +- leim/quail/py-punct.el | 2 +- leim/quail/rfc1345.el | 2 +- leim/quail/sgml-input.el | 2 +- leim/quail/sisheng.el | 2 +- leim/quail/slovak.el | 2 +- leim/quail/symbol-ksc.el | 2 +- leim/quail/tibetan.el | 2 +- leim/quail/uni-input.el | 2 +- leim/quail/vntelex.el | 2 +- leim/quail/welsh.el | 2 +- lib-src/ChangeLog | 2 +- lib-src/Makefile.in | 2 +- lib-src/b2m.pl | 2 +- lib-src/digest-doc.c | 2 +- lib-src/ebrowse.c | 2 +- lib-src/emacsclient.c | 2 +- lib-src/etags.c | 2 +- lib-src/fakemail.c | 2 +- lib-src/grep-changelog | 2 +- lib-src/hexl.c | 2 +- lib-src/make-docfile.c | 2 +- lib-src/makefile.w32-in | 2 +- lib-src/movemail.c | 2 +- lib-src/ntlib.c | 2 +- lib-src/ntlib.h | 2 +- lib-src/pop.c | 2 +- lib-src/pop.h | 2 +- lib-src/profile.c | 2 +- lib-src/rcs-checkin | 2 +- lib-src/rcs2log | 2 +- lib-src/sorted-doc.c | 2 +- lib-src/test-distrib.c | 2 +- lib-src/update-game-score.c | 2 +- lib-src/vcdiff | 2 +- lisp/ChangeLog | 2 +- lisp/ChangeLog.1 | 2 +- lisp/ChangeLog.10 | 2 +- lisp/ChangeLog.11 | 2 +- lisp/ChangeLog.12 | 2 +- lisp/ChangeLog.13 | 2 +- lisp/ChangeLog.14 | 2 +- lisp/ChangeLog.2 | 2 +- lisp/ChangeLog.3 | 2 +- lisp/ChangeLog.4 | 2 +- lisp/ChangeLog.5 | 2 +- lisp/ChangeLog.6 | 2 +- lisp/ChangeLog.7 | 2 +- lisp/ChangeLog.8 | 2 +- lisp/ChangeLog.9 | 2 +- lisp/Makefile.in | 2 +- lisp/abbrev.el | 2 +- lisp/abbrevlist.el | 2 +- lisp/add-log.el | 2 +- lisp/align.el | 2 +- lisp/allout.el | 2 +- lisp/ansi-color.el | 2 +- lisp/apropos.el | 2 +- lisp/arc-mode.el | 2 +- lisp/array.el | 2 +- lisp/autoarg.el | 2 +- lisp/autoinsert.el | 2 +- lisp/autorevert.el | 2 +- lisp/avoid.el | 2 +- lisp/battery.el | 2 +- lisp/bindings.el | 2 +- lisp/bookmark.el | 2 +- lisp/bs.el | 2 +- lisp/buff-menu.el | 2 +- lisp/button.el | 2 +- lisp/calc/README | 4 ++-- lisp/calc/README.prev | 2 +- lisp/calc/calc-aent.el | 2 +- lisp/calc/calc-alg.el | 2 +- lisp/calc/calc-arith.el | 2 +- lisp/calc/calc-bin.el | 2 +- lisp/calc/calc-comb.el | 2 +- lisp/calc/calc-cplx.el | 2 +- lisp/calc/calc-embed.el | 2 +- lisp/calc/calc-ext.el | 2 +- lisp/calc/calc-fin.el | 2 +- lisp/calc/calc-forms.el | 2 +- lisp/calc/calc-frac.el | 2 +- lisp/calc/calc-funcs.el | 2 +- lisp/calc/calc-graph.el | 2 +- lisp/calc/calc-help.el | 2 +- lisp/calc/calc-incom.el | 2 +- lisp/calc/calc-keypd.el | 2 +- lisp/calc/calc-lang.el | 2 +- lisp/calc/calc-macs.el | 2 +- lisp/calc/calc-map.el | 2 +- lisp/calc/calc-math.el | 2 +- lisp/calc/calc-menu.el | 2 +- lisp/calc/calc-misc.el | 2 +- lisp/calc/calc-mode.el | 2 +- lisp/calc/calc-mtx.el | 2 +- lisp/calc/calc-nlfit.el | 2 +- lisp/calc/calc-poly.el | 2 +- lisp/calc/calc-prog.el | 2 +- lisp/calc/calc-rewr.el | 2 +- lisp/calc/calc-rules.el | 2 +- lisp/calc/calc-sel.el | 2 +- lisp/calc/calc-stat.el | 2 +- lisp/calc/calc-store.el | 2 +- lisp/calc/calc-stuff.el | 2 +- lisp/calc/calc-trail.el | 2 +- lisp/calc/calc-undo.el | 2 +- lisp/calc/calc-units.el | 2 +- lisp/calc/calc-vec.el | 2 +- lisp/calc/calc-yank.el | 2 +- lisp/calc/calc.el | 2 +- lisp/calc/calcalg2.el | 2 +- lisp/calc/calcalg3.el | 2 +- lisp/calc/calccomp.el | 2 +- lisp/calc/calcsel2.el | 2 +- lisp/calculator.el | 2 +- lisp/calendar/appt.el | 2 +- lisp/calendar/cal-bahai.el | 2 +- lisp/calendar/cal-china.el | 2 +- lisp/calendar/cal-coptic.el | 2 +- lisp/calendar/cal-dst.el | 2 +- lisp/calendar/cal-french.el | 2 +- lisp/calendar/cal-hebrew.el | 2 +- lisp/calendar/cal-html.el | 2 +- lisp/calendar/cal-islam.el | 2 +- lisp/calendar/cal-iso.el | 2 +- lisp/calendar/cal-julian.el | 2 +- lisp/calendar/cal-mayan.el | 2 +- lisp/calendar/cal-menu.el | 2 +- lisp/calendar/cal-move.el | 2 +- lisp/calendar/cal-persia.el | 2 +- lisp/calendar/cal-tex.el | 2 +- lisp/calendar/cal-x.el | 2 +- lisp/calendar/calendar.el | 2 +- lisp/calendar/diary-lib.el | 2 +- lisp/calendar/holidays.el | 2 +- lisp/calendar/icalendar.el | 2 +- lisp/calendar/lunar.el | 2 +- lisp/calendar/parse-time.el | 2 +- lisp/calendar/solar.el | 2 +- lisp/calendar/time-date.el | 2 +- lisp/calendar/timeclock.el | 2 +- lisp/calendar/todo-mode.el | 2 +- lisp/case-table.el | 2 +- lisp/cdl.el | 2 +- lisp/cedet/ChangeLog | 2 +- lisp/cedet/cedet-cscope.el | 2 +- lisp/cedet/cedet-files.el | 2 +- lisp/cedet/cedet-global.el | 2 +- lisp/cedet/cedet-idutils.el | 2 +- lisp/cedet/cedet.el | 2 +- lisp/cedet/data-debug.el | 2 +- lisp/cedet/ede.el | 2 +- lisp/cedet/ede/auto.el | 2 +- lisp/cedet/ede/autoconf-edit.el | 2 +- lisp/cedet/ede/base.el | 2 +- lisp/cedet/ede/cpp-root.el | 2 +- lisp/cedet/ede/custom.el | 2 +- lisp/cedet/ede/dired.el | 2 +- lisp/cedet/ede/emacs.el | 2 +- lisp/cedet/ede/files.el | 2 +- lisp/cedet/ede/generic.el | 2 +- lisp/cedet/ede/linux.el | 2 +- lisp/cedet/ede/locate.el | 2 +- lisp/cedet/ede/make.el | 2 +- lisp/cedet/ede/makefile-edit.el | 2 +- lisp/cedet/ede/pconf.el | 2 +- lisp/cedet/ede/pmake.el | 2 +- lisp/cedet/ede/proj-archive.el | 2 +- lisp/cedet/ede/proj-aux.el | 2 +- lisp/cedet/ede/proj-comp.el | 2 +- lisp/cedet/ede/proj-elisp.el | 2 +- lisp/cedet/ede/proj-info.el | 2 +- lisp/cedet/ede/proj-misc.el | 2 +- lisp/cedet/ede/proj-obj.el | 2 +- lisp/cedet/ede/proj-prog.el | 2 +- lisp/cedet/ede/proj-scheme.el | 2 +- lisp/cedet/ede/proj-shared.el | 2 +- lisp/cedet/ede/proj.el | 2 +- lisp/cedet/ede/project-am.el | 2 +- lisp/cedet/ede/shell.el | 2 +- lisp/cedet/ede/simple.el | 2 +- lisp/cedet/ede/source.el | 2 +- lisp/cedet/ede/speedbar.el | 2 +- lisp/cedet/ede/srecode.el | 2 +- lisp/cedet/ede/system.el | 2 +- lisp/cedet/ede/util.el | 2 +- lisp/cedet/inversion.el | 2 +- lisp/cedet/mode-local.el | 2 +- lisp/cedet/pulse.el | 2 +- lisp/cedet/semantic.el | 2 +- lisp/cedet/semantic/analyze.el | 2 +- lisp/cedet/semantic/analyze/complete.el | 2 +- lisp/cedet/semantic/analyze/debug.el | 2 +- lisp/cedet/semantic/analyze/fcn.el | 2 +- lisp/cedet/semantic/analyze/refs.el | 2 +- lisp/cedet/semantic/bovine.el | 2 +- lisp/cedet/semantic/bovine/c-by.el | 2 +- lisp/cedet/semantic/bovine/c.el | 2 +- lisp/cedet/semantic/bovine/debug.el | 2 +- lisp/cedet/semantic/bovine/el.el | 2 +- lisp/cedet/semantic/bovine/gcc.el | 2 +- lisp/cedet/semantic/bovine/make-by.el | 2 +- lisp/cedet/semantic/bovine/make.el | 2 +- lisp/cedet/semantic/bovine/scm-by.el | 2 +- lisp/cedet/semantic/bovine/scm.el | 2 +- lisp/cedet/semantic/chart.el | 2 +- lisp/cedet/semantic/complete.el | 2 +- lisp/cedet/semantic/ctxt.el | 2 +- lisp/cedet/semantic/db-debug.el | 2 +- lisp/cedet/semantic/db-ebrowse.el | 2 +- lisp/cedet/semantic/db-el.el | 2 +- lisp/cedet/semantic/db-file.el | 2 +- lisp/cedet/semantic/db-find.el | 2 +- lisp/cedet/semantic/db-global.el | 2 +- lisp/cedet/semantic/db-javascript.el | 2 +- lisp/cedet/semantic/db-mode.el | 2 +- lisp/cedet/semantic/db-ref.el | 2 +- lisp/cedet/semantic/db-typecache.el | 2 +- lisp/cedet/semantic/db.el | 2 +- lisp/cedet/semantic/debug.el | 2 +- lisp/cedet/semantic/decorate.el | 2 +- lisp/cedet/semantic/decorate/include.el | 2 +- lisp/cedet/semantic/decorate/mode.el | 2 +- lisp/cedet/semantic/dep.el | 2 +- lisp/cedet/semantic/doc.el | 2 +- lisp/cedet/semantic/ede-grammar.el | 2 +- lisp/cedet/semantic/edit.el | 2 +- lisp/cedet/semantic/find.el | 2 +- lisp/cedet/semantic/format.el | 2 +- lisp/cedet/semantic/fw.el | 2 +- lisp/cedet/semantic/grammar-wy.el | 2 +- lisp/cedet/semantic/grammar.el | 2 +- lisp/cedet/semantic/html.el | 2 +- lisp/cedet/semantic/ia-sb.el | 2 +- lisp/cedet/semantic/ia.el | 2 +- lisp/cedet/semantic/idle.el | 2 +- lisp/cedet/semantic/imenu.el | 2 +- lisp/cedet/semantic/java.el | 2 +- lisp/cedet/semantic/lex-spp.el | 2 +- lisp/cedet/semantic/lex.el | 2 +- lisp/cedet/semantic/mru-bookmark.el | 2 +- lisp/cedet/semantic/sb.el | 2 +- lisp/cedet/semantic/scope.el | 2 +- lisp/cedet/semantic/senator.el | 2 +- lisp/cedet/semantic/sort.el | 2 +- lisp/cedet/semantic/symref.el | 2 +- lisp/cedet/semantic/symref/cscope.el | 2 +- lisp/cedet/semantic/symref/filter.el | 2 +- lisp/cedet/semantic/symref/global.el | 2 +- lisp/cedet/semantic/symref/grep.el | 2 +- lisp/cedet/semantic/symref/idutils.el | 2 +- lisp/cedet/semantic/symref/list.el | 2 +- lisp/cedet/semantic/tag-file.el | 2 +- lisp/cedet/semantic/tag-ls.el | 2 +- lisp/cedet/semantic/tag-write.el | 2 +- lisp/cedet/semantic/tag.el | 2 +- lisp/cedet/semantic/texi.el | 2 +- lisp/cedet/semantic/util-modes.el | 2 +- lisp/cedet/semantic/util.el | 2 +- lisp/cedet/semantic/wisent.el | 2 +- lisp/cedet/semantic/wisent/comp.el | 2 +- lisp/cedet/semantic/wisent/java-tags.el | 2 +- lisp/cedet/semantic/wisent/javascript.el | 2 +- lisp/cedet/semantic/wisent/javat-wy.el | 2 +- lisp/cedet/semantic/wisent/js-wy.el | 2 +- lisp/cedet/semantic/wisent/python-wy.el | 2 +- lisp/cedet/semantic/wisent/python.el | 2 +- lisp/cedet/semantic/wisent/wisent.el | 2 +- lisp/cedet/srecode.el | 2 +- lisp/cedet/srecode/args.el | 2 +- lisp/cedet/srecode/compile.el | 2 +- lisp/cedet/srecode/cpp.el | 2 +- lisp/cedet/srecode/ctxt.el | 2 +- lisp/cedet/srecode/dictionary.el | 2 +- lisp/cedet/srecode/document.el | 2 +- lisp/cedet/srecode/el.el | 2 +- lisp/cedet/srecode/expandproto.el | 2 +- lisp/cedet/srecode/extract.el | 2 +- lisp/cedet/srecode/fields.el | 2 +- lisp/cedet/srecode/filters.el | 2 +- lisp/cedet/srecode/find.el | 2 +- lisp/cedet/srecode/getset.el | 2 +- lisp/cedet/srecode/insert.el | 2 +- lisp/cedet/srecode/java.el | 2 +- lisp/cedet/srecode/map.el | 2 +- lisp/cedet/srecode/mode.el | 2 +- lisp/cedet/srecode/semantic.el | 2 +- lisp/cedet/srecode/srt-mode.el | 2 +- lisp/cedet/srecode/srt-wy.el | 2 +- lisp/cedet/srecode/srt.el | 2 +- lisp/cedet/srecode/table.el | 2 +- lisp/cedet/srecode/template.el | 2 +- lisp/cedet/srecode/texi.el | 2 +- lisp/chistory.el | 2 +- lisp/cmuscheme.el | 2 +- lisp/comint.el | 2 +- lisp/compare-w.el | 2 +- lisp/complete.el | 2 +- lisp/completion.el | 2 +- lisp/cus-dep.el | 2 +- lisp/cus-edit.el | 2 +- lisp/cus-face.el | 2 +- lisp/cus-start.el | 2 +- lisp/cus-theme.el | 2 +- lisp/custom.el | 2 +- lisp/cvs-status.el | 2 +- lisp/dabbrev.el | 2 +- lisp/delim-col.el | 2 +- lisp/delsel.el | 2 +- lisp/descr-text.el | 2 +- lisp/desktop.el | 2 +- lisp/dframe.el | 2 +- lisp/diff-mode.el | 2 +- lisp/diff.el | 2 +- lisp/dired-aux.el | 2 +- lisp/dired-x.el | 2 +- lisp/dired.el | 2 +- lisp/dirtrack.el | 2 +- lisp/disp-table.el | 2 +- lisp/dnd.el | 2 +- lisp/doc-view.el | 2 +- lisp/dos-fns.el | 2 +- lisp/dos-vars.el | 2 +- lisp/dos-w32.el | 2 +- lisp/double.el | 2 +- lisp/ebuff-menu.el | 2 +- lisp/echistory.el | 2 +- lisp/ediff-diff.el | 2 +- lisp/ediff-help.el | 2 +- lisp/ediff-hook.el | 2 +- lisp/ediff-init.el | 2 +- lisp/ediff-merg.el | 2 +- lisp/ediff-mult.el | 2 +- lisp/ediff-ptch.el | 2 +- lisp/ediff-util.el | 2 +- lisp/ediff-vers.el | 2 +- lisp/ediff-wind.el | 2 +- lisp/ediff.el | 2 +- lisp/edmacro.el | 2 +- lisp/ehelp.el | 2 +- lisp/electric.el | 2 +- lisp/elide-head.el | 2 +- lisp/emacs-lisp/advice.el | 2 +- lisp/emacs-lisp/assoc.el | 2 +- lisp/emacs-lisp/authors.el | 2 +- lisp/emacs-lisp/autoload.el | 2 +- lisp/emacs-lisp/avl-tree.el | 2 +- lisp/emacs-lisp/backquote.el | 2 +- lisp/emacs-lisp/benchmark.el | 2 +- lisp/emacs-lisp/bindat.el | 2 +- lisp/emacs-lisp/byte-opt.el | 2 +- lisp/emacs-lisp/byte-run.el | 2 +- lisp/emacs-lisp/bytecomp.el | 2 +- lisp/emacs-lisp/chart.el | 2 +- lisp/emacs-lisp/check-declare.el | 2 +- lisp/emacs-lisp/checkdoc.el | 2 +- lisp/emacs-lisp/cl-extra.el | 2 +- lisp/emacs-lisp/cl-indent.el | 2 +- lisp/emacs-lisp/cl-macs.el | 2 +- lisp/emacs-lisp/cl-seq.el | 2 +- lisp/emacs-lisp/cl-specs.el | 2 +- lisp/emacs-lisp/cl.el | 2 +- lisp/emacs-lisp/copyright.el | 2 +- lisp/emacs-lisp/crm.el | 2 +- lisp/emacs-lisp/cust-print.el | 2 +- lisp/emacs-lisp/debug.el | 2 +- lisp/emacs-lisp/derived.el | 2 +- lisp/emacs-lisp/disass.el | 2 +- lisp/emacs-lisp/easy-mmode.el | 2 +- lisp/emacs-lisp/easymenu.el | 2 +- lisp/emacs-lisp/edebug.el | 2 +- lisp/emacs-lisp/eieio-base.el | 2 +- lisp/emacs-lisp/eieio-comp.el | 2 +- lisp/emacs-lisp/eieio-custom.el | 2 +- lisp/emacs-lisp/eieio-datadebug.el | 2 +- lisp/emacs-lisp/eieio-opt.el | 2 +- lisp/emacs-lisp/eieio-speedbar.el | 2 +- lisp/emacs-lisp/eieio.el | 2 +- lisp/emacs-lisp/eldoc.el | 2 +- lisp/emacs-lisp/elint.el | 2 +- lisp/emacs-lisp/elp.el | 2 +- lisp/emacs-lisp/ewoc.el | 2 +- lisp/emacs-lisp/find-func.el | 2 +- lisp/emacs-lisp/find-gc.el | 2 +- lisp/emacs-lisp/float-sup.el | 2 +- lisp/emacs-lisp/generic.el | 2 +- lisp/emacs-lisp/gulp.el | 2 +- lisp/emacs-lisp/helper.el | 2 +- lisp/emacs-lisp/lisp-mnt.el | 2 +- lisp/emacs-lisp/lisp-mode.el | 2 +- lisp/emacs-lisp/lisp.el | 2 +- lisp/emacs-lisp/macroexp.el | 2 +- lisp/emacs-lisp/map-ynp.el | 2 +- lisp/emacs-lisp/pp.el | 2 +- lisp/emacs-lisp/re-builder.el | 2 +- lisp/emacs-lisp/regexp-opt.el | 2 +- lisp/emacs-lisp/regi.el | 2 +- lisp/emacs-lisp/ring.el | 2 +- lisp/emacs-lisp/rx.el | 2 +- lisp/emacs-lisp/shadow.el | 2 +- lisp/emacs-lisp/smie.el | 2 +- lisp/emacs-lisp/sregex.el | 2 +- lisp/emacs-lisp/syntax.el | 2 +- lisp/emacs-lisp/tcover-ses.el | 2 +- lisp/emacs-lisp/tcover-unsafep.el | 2 +- lisp/emacs-lisp/testcover.el | 2 +- lisp/emacs-lisp/timer.el | 2 +- lisp/emacs-lisp/tq.el | 2 +- lisp/emacs-lisp/trace.el | 2 +- lisp/emacs-lisp/unsafep.el | 2 +- lisp/emacs-lisp/warnings.el | 2 +- lisp/emacs-lock.el | 2 +- lisp/emulation/crisp.el | 2 +- lisp/emulation/cua-base.el | 2 +- lisp/emulation/cua-gmrk.el | 2 +- lisp/emulation/cua-rect.el | 2 +- lisp/emulation/edt-lk201.el | 2 +- lisp/emulation/edt-mapper.el | 2 +- lisp/emulation/edt-pc.el | 2 +- lisp/emulation/edt-vt100.el | 2 +- lisp/emulation/edt.el | 2 +- lisp/emulation/keypad.el | 2 +- lisp/emulation/pc-mode.el | 2 +- lisp/emulation/pc-select.el | 2 +- lisp/emulation/tpu-edt.el | 2 +- lisp/emulation/tpu-extras.el | 2 +- lisp/emulation/tpu-mapper.el | 2 +- lisp/emulation/vip.el | 2 +- lisp/emulation/viper-cmd.el | 2 +- lisp/emulation/viper-ex.el | 2 +- lisp/emulation/viper-init.el | 2 +- lisp/emulation/viper-keym.el | 2 +- lisp/emulation/viper-macs.el | 2 +- lisp/emulation/viper-mous.el | 2 +- lisp/emulation/viper-util.el | 2 +- lisp/emulation/viper.el | 2 +- lisp/emulation/ws-mode.el | 2 +- lisp/env.el | 2 +- lisp/epa-dired.el | 2 +- lisp/epa-file.el | 2 +- lisp/epa-hook.el | 2 +- lisp/epa-mail.el | 2 +- lisp/epa.el | 2 +- lisp/epg-config.el | 2 +- lisp/epg.el | 2 +- lisp/erc/ChangeLog | 2 +- lisp/erc/ChangeLog.01 | 2 +- lisp/erc/ChangeLog.02 | 2 +- lisp/erc/ChangeLog.03 | 2 +- lisp/erc/ChangeLog.04 | 2 +- lisp/erc/ChangeLog.05 | 2 +- lisp/erc/ChangeLog.06 | 2 +- lisp/erc/ChangeLog.07 | 2 +- lisp/erc/ChangeLog.08 | 2 +- lisp/erc/erc-autoaway.el | 2 +- lisp/erc/erc-backend.el | 2 +- lisp/erc/erc-button.el | 2 +- lisp/erc/erc-capab.el | 2 +- lisp/erc/erc-compat.el | 2 +- lisp/erc/erc-dcc.el | 2 +- lisp/erc/erc-ezbounce.el | 2 +- lisp/erc/erc-fill.el | 2 +- lisp/erc/erc-goodies.el | 2 +- lisp/erc/erc-hecomplete.el | 2 +- lisp/erc/erc-ibuffer.el | 2 +- lisp/erc/erc-identd.el | 2 +- lisp/erc/erc-imenu.el | 2 +- lisp/erc/erc-join.el | 2 +- lisp/erc/erc-lang.el | 2 +- lisp/erc/erc-list.el | 2 +- lisp/erc/erc-log.el | 2 +- lisp/erc/erc-match.el | 2 +- lisp/erc/erc-menu.el | 2 +- lisp/erc/erc-netsplit.el | 2 +- lisp/erc/erc-networks.el | 2 +- lisp/erc/erc-notify.el | 2 +- lisp/erc/erc-page.el | 2 +- lisp/erc/erc-pcomplete.el | 2 +- lisp/erc/erc-replace.el | 2 +- lisp/erc/erc-ring.el | 2 +- lisp/erc/erc-services.el | 2 +- lisp/erc/erc-sound.el | 2 +- lisp/erc/erc-speedbar.el | 2 +- lisp/erc/erc-spelling.el | 2 +- lisp/erc/erc-stamp.el | 2 +- lisp/erc/erc-track.el | 2 +- lisp/erc/erc-truncate.el | 2 +- lisp/erc/erc-xdcc.el | 2 +- lisp/erc/erc.el | 2 +- lisp/eshell/em-alias.el | 2 +- lisp/eshell/em-banner.el | 2 +- lisp/eshell/em-basic.el | 2 +- lisp/eshell/em-cmpl.el | 2 +- lisp/eshell/em-dirs.el | 2 +- lisp/eshell/em-glob.el | 2 +- lisp/eshell/em-hist.el | 2 +- lisp/eshell/em-ls.el | 2 +- lisp/eshell/em-pred.el | 2 +- lisp/eshell/em-prompt.el | 2 +- lisp/eshell/em-rebind.el | 2 +- lisp/eshell/em-script.el | 2 +- lisp/eshell/em-smart.el | 2 +- lisp/eshell/em-term.el | 2 +- lisp/eshell/em-unix.el | 2 +- lisp/eshell/em-xtra.el | 2 +- lisp/eshell/esh-arg.el | 2 +- lisp/eshell/esh-cmd.el | 2 +- lisp/eshell/esh-ext.el | 2 +- lisp/eshell/esh-io.el | 2 +- lisp/eshell/esh-mode.el | 2 +- lisp/eshell/esh-module.el | 2 +- lisp/eshell/esh-opt.el | 2 +- lisp/eshell/esh-proc.el | 2 +- lisp/eshell/esh-test.el | 2 +- lisp/eshell/esh-util.el | 2 +- lisp/eshell/esh-var.el | 2 +- lisp/eshell/eshell.el | 2 +- lisp/expand.el | 2 +- lisp/ezimage.el | 2 +- lisp/face-remap.el | 2 +- lisp/facemenu.el | 2 +- lisp/faces.el | 2 +- lisp/ffap.el | 2 +- lisp/filecache.el | 2 +- lisp/files-x.el | 2 +- lisp/files.el | 2 +- lisp/filesets.el | 2 +- lisp/find-cmd.el | 2 +- lisp/find-dired.el | 2 +- lisp/find-file.el | 2 +- lisp/find-lisp.el | 2 +- lisp/finder.el | 2 +- lisp/flow-ctrl.el | 2 +- lisp/foldout.el | 2 +- lisp/follow.el | 2 +- lisp/font-core.el | 2 +- lisp/font-lock.el | 2 +- lisp/font-setting.el | 2 +- lisp/format-spec.el | 2 +- lisp/format.el | 2 +- lisp/forms-d2.el | 2 +- lisp/forms.el | 2 +- lisp/frame.el | 2 +- lisp/fringe.el | 2 +- lisp/generic-x.el | 2 +- lisp/gnus/ChangeLog | 2 +- lisp/gnus/ChangeLog.1 | 2 +- lisp/gnus/ChangeLog.2 | 2 +- lisp/gnus/auth-source.el | 2 +- lisp/gnus/canlock.el | 2 +- lisp/gnus/compface.el | 2 +- lisp/gnus/deuglify.el | 2 +- lisp/gnus/earcon.el | 2 +- lisp/gnus/ecomplete.el | 2 +- lisp/gnus/flow-fill.el | 2 +- lisp/gnus/gmm-utils.el | 2 +- lisp/gnus/gnus-agent.el | 2 +- lisp/gnus/gnus-art.el | 2 +- lisp/gnus/gnus-async.el | 2 +- lisp/gnus/gnus-audio.el | 2 +- lisp/gnus/gnus-bcklg.el | 2 +- lisp/gnus/gnus-bookmark.el | 2 +- lisp/gnus/gnus-cache.el | 2 +- lisp/gnus/gnus-cite.el | 2 +- lisp/gnus/gnus-cus.el | 2 +- lisp/gnus/gnus-delay.el | 2 +- lisp/gnus/gnus-demon.el | 2 +- lisp/gnus/gnus-diary.el | 2 +- lisp/gnus/gnus-dired.el | 2 +- lisp/gnus/gnus-draft.el | 2 +- lisp/gnus/gnus-dup.el | 2 +- lisp/gnus/gnus-eform.el | 2 +- lisp/gnus/gnus-ems.el | 2 +- lisp/gnus/gnus-fun.el | 2 +- lisp/gnus/gnus-group.el | 2 +- lisp/gnus/gnus-int.el | 2 +- lisp/gnus/gnus-kill.el | 2 +- lisp/gnus/gnus-logic.el | 2 +- lisp/gnus/gnus-mh.el | 2 +- lisp/gnus/gnus-ml.el | 2 +- lisp/gnus/gnus-mlspl.el | 2 +- lisp/gnus/gnus-move.el | 2 +- lisp/gnus/gnus-msg.el | 2 +- lisp/gnus/gnus-nocem.el | 2 +- lisp/gnus/gnus-picon.el | 2 +- lisp/gnus/gnus-range.el | 2 +- lisp/gnus/gnus-registry.el | 2 +- lisp/gnus/gnus-salt.el | 2 +- lisp/gnus/gnus-score.el | 2 +- lisp/gnus/gnus-setup.el | 2 +- lisp/gnus/gnus-sieve.el | 2 +- lisp/gnus/gnus-soup.el | 2 +- lisp/gnus/gnus-spec.el | 2 +- lisp/gnus/gnus-srvr.el | 2 +- lisp/gnus/gnus-start.el | 2 +- lisp/gnus/gnus-sum.el | 2 +- lisp/gnus/gnus-topic.el | 2 +- lisp/gnus/gnus-undo.el | 2 +- lisp/gnus/gnus-util.el | 2 +- lisp/gnus/gnus-uu.el | 2 +- lisp/gnus/gnus-vm.el | 2 +- lisp/gnus/gnus-win.el | 2 +- lisp/gnus/gnus.el | 2 +- lisp/gnus/html2text.el | 2 +- lisp/gnus/ietf-drums.el | 2 +- lisp/gnus/legacy-gnus-agent.el | 2 +- lisp/gnus/mail-parse.el | 2 +- lisp/gnus/mail-prsvr.el | 2 +- lisp/gnus/mail-source.el | 2 +- lisp/gnus/mailcap.el | 2 +- lisp/gnus/message.el | 2 +- lisp/gnus/messcompat.el | 2 +- lisp/gnus/mm-bodies.el | 2 +- lisp/gnus/mm-decode.el | 2 +- lisp/gnus/mm-encode.el | 2 +- lisp/gnus/mm-extern.el | 2 +- lisp/gnus/mm-partial.el | 2 +- lisp/gnus/mm-url.el | 2 +- lisp/gnus/mm-util.el | 2 +- lisp/gnus/mm-uu.el | 2 +- lisp/gnus/mm-view.el | 2 +- lisp/gnus/mml-sec.el | 2 +- lisp/gnus/mml-smime.el | 2 +- lisp/gnus/mml.el | 2 +- lisp/gnus/mml1991.el | 2 +- lisp/gnus/mml2015.el | 2 +- lisp/gnus/nnagent.el | 2 +- lisp/gnus/nnbabyl.el | 2 +- lisp/gnus/nndb.el | 2 +- lisp/gnus/nndiary.el | 2 +- lisp/gnus/nndir.el | 2 +- lisp/gnus/nndoc.el | 2 +- lisp/gnus/nndraft.el | 2 +- lisp/gnus/nneething.el | 2 +- lisp/gnus/nnfolder.el | 2 +- lisp/gnus/nngateway.el | 2 +- lisp/gnus/nnheader.el | 2 +- lisp/gnus/nnimap.el | 2 +- lisp/gnus/nnir.el | 2 +- lisp/gnus/nnkiboze.el | 2 +- lisp/gnus/nnlistserv.el | 2 +- lisp/gnus/nnmail.el | 2 +- lisp/gnus/nnmairix.el | 2 +- lisp/gnus/nnmbox.el | 2 +- lisp/gnus/nnmh.el | 2 +- lisp/gnus/nnml.el | 2 +- lisp/gnus/nnoo.el | 2 +- lisp/gnus/nnrss.el | 2 +- lisp/gnus/nnslashdot.el | 2 +- lisp/gnus/nnsoup.el | 2 +- lisp/gnus/nnspool.el | 2 +- lisp/gnus/nntp.el | 2 +- lisp/gnus/nnultimate.el | 2 +- lisp/gnus/nnvirtual.el | 2 +- lisp/gnus/nnwarchive.el | 2 +- lisp/gnus/nnweb.el | 2 +- lisp/gnus/nnwfm.el | 2 +- lisp/gnus/pop3.el | 2 +- lisp/gnus/qp.el | 2 +- lisp/gnus/rfc1843.el | 2 +- lisp/gnus/rfc2045.el | 2 +- lisp/gnus/rfc2047.el | 2 +- lisp/gnus/rfc2104.el | 2 +- lisp/gnus/rfc2231.el | 2 +- lisp/gnus/score-mode.el | 2 +- lisp/gnus/sieve-manage.el | 2 +- lisp/gnus/sieve-mode.el | 2 +- lisp/gnus/sieve.el | 2 +- lisp/gnus/smiley.el | 2 +- lisp/gnus/smime.el | 2 +- lisp/gnus/spam-report.el | 2 +- lisp/gnus/spam-stat.el | 2 +- lisp/gnus/spam-wash.el | 2 +- lisp/gnus/spam.el | 2 +- lisp/gnus/starttls.el | 2 +- lisp/gnus/utf7.el | 2 +- lisp/gnus/webmail.el | 2 +- lisp/gnus/yenc.el | 2 +- lisp/gs.el | 2 +- lisp/help-at-pt.el | 2 +- lisp/help-fns.el | 2 +- lisp/help-macro.el | 2 +- lisp/help-mode.el | 2 +- lisp/help.el | 2 +- lisp/hex-util.el | 2 +- lisp/hexl.el | 2 +- lisp/hfy-cmap.el | 2 +- lisp/hi-lock.el | 2 +- lisp/hilit-chg.el | 2 +- lisp/hippie-exp.el | 2 +- lisp/hl-line.el | 2 +- lisp/htmlfontify.el | 2 +- lisp/ibuf-ext.el | 2 +- lisp/ibuf-macs.el | 2 +- lisp/ibuffer.el | 2 +- lisp/icomplete.el | 2 +- lisp/ido.el | 2 +- lisp/ielm.el | 2 +- lisp/iimage.el | 2 +- lisp/image-dired.el | 2 +- lisp/image-file.el | 2 +- lisp/image-mode.el | 2 +- lisp/image.el | 2 +- lisp/imenu.el | 2 +- lisp/indent.el | 2 +- lisp/info-look.el | 2 +- lisp/info-xref.el | 2 +- lisp/info.el | 2 +- lisp/informat.el | 2 +- lisp/international/ccl.el | 2 +- lisp/international/characters.el | 2 +- lisp/international/fontset.el | 2 +- lisp/international/isearch-x.el | 2 +- lisp/international/iso-ascii.el | 2 +- lisp/international/iso-cvt.el | 2 +- lisp/international/iso-transl.el | 2 +- lisp/international/kinsoku.el | 2 +- lisp/international/kkc.el | 2 +- lisp/international/latexenc.el | 2 +- lisp/international/latin1-disp.el | 2 +- lisp/international/mule-cmds.el | 2 +- lisp/international/mule-conf.el | 2 +- lisp/international/mule-diag.el | 2 +- lisp/international/mule-util.el | 2 +- lisp/international/mule.el | 2 +- lisp/international/ogonek.el | 2 +- lisp/international/quail.el | 2 +- lisp/international/titdic-cnv.el | 2 +- lisp/international/ucs-normalize.el | 2 +- lisp/international/utf-7.el | 2 +- lisp/isearch.el | 2 +- lisp/isearchb.el | 2 +- lisp/iswitchb.el | 2 +- lisp/jit-lock.el | 2 +- lisp/jka-cmpr-hook.el | 2 +- lisp/jka-compr.el | 2 +- lisp/json.el | 2 +- lisp/kermit.el | 2 +- lisp/kmacro.el | 2 +- lisp/language/china-util.el | 2 +- lisp/language/chinese.el | 2 +- lisp/language/cyril-util.el | 2 +- lisp/language/cyrillic.el | 2 +- lisp/language/czech.el | 2 +- lisp/language/english.el | 2 +- lisp/language/ethio-util.el | 2 +- lisp/language/ethiopic.el | 2 +- lisp/language/european.el | 2 +- lisp/language/georgian.el | 2 +- lisp/language/hanja-util.el | 2 +- lisp/language/hebrew.el | 2 +- lisp/language/ind-util.el | 2 +- lisp/language/indian.el | 2 +- lisp/language/japan-util.el | 2 +- lisp/language/japanese.el | 2 +- lisp/language/korea-util.el | 2 +- lisp/language/korean.el | 2 +- lisp/language/lao-util.el | 2 +- lisp/language/lao.el | 2 +- lisp/language/romanian.el | 2 +- lisp/language/slovak.el | 2 +- lisp/language/tai-viet.el | 4 ++-- lisp/language/thai-util.el | 4 ++-- lisp/language/thai.el | 4 ++-- lisp/language/tibet-util.el | 2 +- lisp/language/tibetan.el | 2 +- lisp/language/utf-8-lang.el | 2 +- lisp/language/viet-util.el | 2 +- lisp/language/vietnamese.el | 2 +- lisp/ledit.el | 2 +- lisp/linum.el | 2 +- lisp/loadhist.el | 2 +- lisp/loadup.el | 2 +- lisp/locate.el | 2 +- lisp/log-edit.el | 2 +- lisp/log-view.el | 2 +- lisp/longlines.el | 2 +- lisp/lpr.el | 2 +- lisp/ls-lisp.el | 2 +- lisp/macros.el | 2 +- lisp/mail/binhex.el | 2 +- lisp/mail/blessmail.el | 2 +- lisp/mail/emacsbug.el | 2 +- lisp/mail/footnote.el | 2 +- lisp/mail/hashcash.el | 2 +- lisp/mail/mail-extr.el | 2 +- lisp/mail/mail-hist.el | 2 +- lisp/mail/mail-utils.el | 2 +- lisp/mail/mailabbrev.el | 2 +- lisp/mail/mailalias.el | 2 +- lisp/mail/mailclient.el | 2 +- lisp/mail/mailheader.el | 2 +- lisp/mail/metamail.el | 2 +- lisp/mail/mspools.el | 2 +- lisp/mail/reporter.el | 2 +- lisp/mail/rfc2368.el | 2 +- lisp/mail/rfc822.el | 2 +- lisp/mail/rmail-spam-filter.el | 2 +- lisp/mail/rmail.el | 2 +- lisp/mail/rmailedit.el | 2 +- lisp/mail/rmailkwd.el | 2 +- lisp/mail/rmailmm.el | 2 +- lisp/mail/rmailmsc.el | 2 +- lisp/mail/rmailout.el | 2 +- lisp/mail/rmailsort.el | 2 +- lisp/mail/rmailsum.el | 2 +- lisp/mail/sendmail.el | 2 +- lisp/mail/smtpmail.el | 2 +- lisp/mail/supercite.el | 2 +- lisp/mail/uce.el | 2 +- lisp/mail/undigest.el | 2 +- lisp/mail/unrmail.el | 2 +- lisp/mail/uudecode.el | 2 +- lisp/makefile.w32-in | 2 +- lisp/makesum.el | 2 +- lisp/man.el | 2 +- lisp/master.el | 2 +- lisp/mb-depth.el | 2 +- lisp/md4.el | 2 +- lisp/menu-bar.el | 2 +- lisp/mh-e/ChangeLog | 2 +- lisp/mh-e/ChangeLog.1 | 2 +- lisp/mh-e/mh-acros.el | 2 +- lisp/mh-e/mh-alias.el | 2 +- lisp/mh-e/mh-buffers.el | 2 +- lisp/mh-e/mh-comp.el | 2 +- lisp/mh-e/mh-compat.el | 2 +- lisp/mh-e/mh-e.el | 2 +- lisp/mh-e/mh-folder.el | 2 +- lisp/mh-e/mh-funcs.el | 2 +- lisp/mh-e/mh-gnus.el | 2 +- lisp/mh-e/mh-identity.el | 2 +- lisp/mh-e/mh-inc.el | 2 +- lisp/mh-e/mh-junk.el | 2 +- lisp/mh-e/mh-letter.el | 2 +- lisp/mh-e/mh-limit.el | 2 +- lisp/mh-e/mh-mime.el | 2 +- lisp/mh-e/mh-print.el | 2 +- lisp/mh-e/mh-scan.el | 2 +- lisp/mh-e/mh-search.el | 2 +- lisp/mh-e/mh-seq.el | 2 +- lisp/mh-e/mh-show.el | 2 +- lisp/mh-e/mh-speed.el | 2 +- lisp/mh-e/mh-thread.el | 2 +- lisp/mh-e/mh-tool-bar.el | 2 +- lisp/mh-e/mh-utils.el | 2 +- lisp/mh-e/mh-xface.el | 2 +- lisp/midnight.el | 2 +- lisp/minibuf-eldef.el | 2 +- lisp/minibuffer.el | 2 +- lisp/misc.el | 2 +- lisp/misearch.el | 2 +- lisp/mouse-copy.el | 2 +- lisp/mouse-drag.el | 2 +- lisp/mouse-sel.el | 2 +- lisp/mouse.el | 2 +- lisp/mpc.el | 2 +- lisp/msb.el | 2 +- lisp/mwheel.el | 2 +- lisp/net/ange-ftp.el | 2 +- lisp/net/browse-url.el | 2 +- lisp/net/dbus.el | 2 +- lisp/net/dig.el | 2 +- lisp/net/dns.el | 2 +- lisp/net/eudc-bob.el | 2 +- lisp/net/eudc-export.el | 2 +- lisp/net/eudc-hotlist.el | 2 +- lisp/net/eudc-vars.el | 2 +- lisp/net/eudc.el | 2 +- lisp/net/eudcb-bbdb.el | 2 +- lisp/net/eudcb-ldap.el | 2 +- lisp/net/eudcb-mab.el | 2 +- lisp/net/eudcb-ph.el | 2 +- lisp/net/goto-addr.el | 2 +- lisp/net/hmac-def.el | 2 +- lisp/net/hmac-md5.el | 2 +- lisp/net/imap-hash.el | 2 +- lisp/net/imap.el | 2 +- lisp/net/ldap.el | 2 +- lisp/net/mairix.el | 2 +- lisp/net/net-utils.el | 2 +- lisp/net/netrc.el | 2 +- lisp/net/newst-backend.el | 2 +- lisp/net/newst-plainview.el | 2 +- lisp/net/newst-reader.el | 2 +- lisp/net/newst-ticker.el | 2 +- lisp/net/newst-treeview.el | 2 +- lisp/net/newsticker.el | 2 +- lisp/net/ntlm.el | 2 +- lisp/net/quickurl.el | 2 +- lisp/net/rcirc.el | 2 +- lisp/net/rcompile.el | 2 +- lisp/net/rlogin.el | 2 +- lisp/net/sasl-cram.el | 2 +- lisp/net/sasl-digest.el | 2 +- lisp/net/sasl-ntlm.el | 2 +- lisp/net/sasl.el | 2 +- lisp/net/snmp-mode.el | 2 +- lisp/net/socks.el | 2 +- lisp/net/telnet.el | 2 +- lisp/net/tls.el | 2 +- lisp/net/tramp-cache.el | 2 +- lisp/net/tramp-cmds.el | 2 +- lisp/net/tramp-compat.el | 2 +- lisp/net/tramp-fish.el | 2 +- lisp/net/tramp-ftp.el | 2 +- lisp/net/tramp-gvfs.el | 2 +- lisp/net/tramp-gw.el | 2 +- lisp/net/tramp-imap.el | 2 +- lisp/net/tramp-smb.el | 2 +- lisp/net/tramp-uu.el | 2 +- lisp/net/tramp.el | 6 +++--- lisp/net/trampver.el | 2 +- lisp/net/webjump.el | 2 +- lisp/net/xesam.el | 2 +- lisp/net/zeroconf.el | 2 +- lisp/newcomment.el | 2 +- lisp/novice.el | 2 +- lisp/nxml/nxml-enc.el | 2 +- lisp/nxml/nxml-glyph.el | 2 +- lisp/nxml/nxml-maint.el | 2 +- lisp/nxml/nxml-mode.el | 2 +- lisp/nxml/nxml-ns.el | 2 +- lisp/nxml/nxml-outln.el | 2 +- lisp/nxml/nxml-parse.el | 2 +- lisp/nxml/nxml-rap.el | 2 +- lisp/nxml/nxml-uchnm.el | 2 +- lisp/nxml/nxml-util.el | 2 +- lisp/nxml/rng-cmpct.el | 2 +- lisp/nxml/rng-dt.el | 2 +- lisp/nxml/rng-loc.el | 2 +- lisp/nxml/rng-maint.el | 2 +- lisp/nxml/rng-match.el | 2 +- lisp/nxml/rng-nxml.el | 2 +- lisp/nxml/rng-parse.el | 2 +- lisp/nxml/rng-pttrn.el | 2 +- lisp/nxml/rng-uri.el | 2 +- lisp/nxml/rng-util.el | 2 +- lisp/nxml/rng-valid.el | 2 +- lisp/nxml/rng-xsd.el | 2 +- lisp/nxml/xmltok.el | 2 +- lisp/nxml/xsd-regexp.el | 2 +- lisp/obsolete/awk-mode.el | 2 +- lisp/obsolete/cl-compat.el | 2 +- lisp/obsolete/fast-lock.el | 2 +- lisp/obsolete/iso-acc.el | 2 +- lisp/obsolete/iso-insert.el | 2 +- lisp/obsolete/iso-swed.el | 2 +- lisp/obsolete/keyswap.el | 2 +- lisp/obsolete/lazy-lock.el | 2 +- lisp/obsolete/levents.el | 2 +- lisp/obsolete/lmenu.el | 2 +- lisp/obsolete/lucid.el | 2 +- lisp/obsolete/old-whitespace.el | 2 +- lisp/obsolete/options.el | 2 +- lisp/obsolete/resume.el | 2 +- lisp/obsolete/rnews.el | 2 +- lisp/obsolete/rnewspost.el | 2 +- lisp/obsolete/scribe.el | 2 +- lisp/obsolete/swedish.el | 2 +- lisp/obsolete/sym-comp.el | 2 +- lisp/obsolete/vc-mcvs.el | 2 +- lisp/obsolete/x-menu.el | 2 +- lisp/org/ChangeLog | 2 +- lisp/org/org-agenda.el | 2 +- lisp/org/org-archive.el | 2 +- lisp/org/org-ascii.el | 2 +- lisp/org/org-attach.el | 2 +- lisp/org/org-bbdb.el | 2 +- lisp/org/org-bibtex.el | 2 +- lisp/org/org-clock.el | 2 +- lisp/org/org-colview.el | 2 +- lisp/org/org-compat.el | 2 +- lisp/org/org-crypt.el | 2 +- lisp/org/org-datetree.el | 2 +- lisp/org/org-docbook.el | 2 +- lisp/org/org-exp-blocks.el | 2 +- lisp/org/org-exp.el | 2 +- lisp/org/org-faces.el | 2 +- lisp/org/org-feed.el | 2 +- lisp/org/org-footnote.el | 2 +- lisp/org/org-freemind.el | 2 +- lisp/org/org-gnus.el | 2 +- lisp/org/org-habit.el | 2 +- lisp/org/org-html.el | 2 +- lisp/org/org-icalendar.el | 2 +- lisp/org/org-id.el | 2 +- lisp/org/org-indent.el | 2 +- lisp/org/org-info.el | 2 +- lisp/org/org-inlinetask.el | 2 +- lisp/org/org-install.el | 2 +- lisp/org/org-irc.el | 2 +- lisp/org/org-jsinfo.el | 2 +- lisp/org/org-latex.el | 2 +- lisp/org/org-list.el | 2 +- lisp/org/org-mac-message.el | 2 +- lisp/org/org-macs.el | 2 +- lisp/org/org-mew.el | 2 +- lisp/org/org-mhe.el | 2 +- lisp/org/org-mobile.el | 2 +- lisp/org/org-mouse.el | 2 +- lisp/org/org-plot.el | 2 +- lisp/org/org-protocol.el | 2 +- lisp/org/org-publish.el | 2 +- lisp/org/org-remember.el | 2 +- lisp/org/org-rmail.el | 2 +- lisp/org/org-src.el | 2 +- lisp/org/org-table.el | 2 +- lisp/org/org-timer.el | 2 +- lisp/org/org-vm.el | 2 +- lisp/org/org-w3m.el | 2 +- lisp/org/org-wl.el | 2 +- lisp/org/org-xoxo.el | 2 +- lisp/org/org.el | 2 +- lisp/outline.el | 2 +- lisp/paren.el | 2 +- lisp/password-cache.el | 2 +- lisp/paths.el | 2 +- lisp/pcmpl-cvs.el | 2 +- lisp/pcmpl-gnu.el | 2 +- lisp/pcmpl-linux.el | 2 +- lisp/pcmpl-rpm.el | 2 +- lisp/pcmpl-unix.el | 2 +- lisp/pcomplete.el | 2 +- lisp/pcvs-defs.el | 2 +- lisp/pcvs-info.el | 2 +- lisp/pcvs-parse.el | 2 +- lisp/pcvs-util.el | 2 +- lisp/pcvs.el | 2 +- lisp/pgg-def.el | 2 +- lisp/pgg-gpg.el | 2 +- lisp/pgg-parse.el | 2 +- lisp/pgg-pgp.el | 2 +- lisp/pgg-pgp5.el | 2 +- lisp/pgg.el | 2 +- lisp/play/5x5.el | 2 +- lisp/play/animate.el | 2 +- lisp/play/blackbox.el | 2 +- lisp/play/bruce.el | 2 +- lisp/play/bubbles.el | 2 +- lisp/play/cookie1.el | 2 +- lisp/play/decipher.el | 2 +- lisp/play/dissociate.el | 2 +- lisp/play/doctor.el | 2 +- lisp/play/dunnet.el | 2 +- lisp/play/fortune.el | 2 +- lisp/play/gamegrid.el | 2 +- lisp/play/gametree.el | 2 +- lisp/play/gomoku.el | 2 +- lisp/play/handwrite.el | 2 +- lisp/play/landmark.el | 2 +- lisp/play/life.el | 2 +- lisp/play/morse.el | 2 +- lisp/play/mpuz.el | 2 +- lisp/play/pong.el | 2 +- lisp/play/snake.el | 2 +- lisp/play/solitaire.el | 2 +- lisp/play/spook.el | 2 +- lisp/play/tetris.el | 2 +- lisp/play/yow.el | 2 +- lisp/play/zone.el | 2 +- lisp/printing.el | 2 +- lisp/proced.el | 2 +- lisp/progmodes/ada-mode.el | 2 +- lisp/progmodes/ada-prj.el | 2 +- lisp/progmodes/ada-stmt.el | 2 +- lisp/progmodes/ada-xref.el | 2 +- lisp/progmodes/antlr-mode.el | 2 +- lisp/progmodes/asm-mode.el | 2 +- lisp/progmodes/autoconf.el | 2 +- lisp/progmodes/bug-reference.el | 2 +- lisp/progmodes/cap-words.el | 2 +- lisp/progmodes/cc-align.el | 2 +- lisp/progmodes/cc-awk.el | 2 +- lisp/progmodes/cc-bytecomp.el | 2 +- lisp/progmodes/cc-cmds.el | 2 +- lisp/progmodes/cc-compat.el | 2 +- lisp/progmodes/cc-defs.el | 2 +- lisp/progmodes/cc-engine.el | 2 +- lisp/progmodes/cc-fonts.el | 2 +- lisp/progmodes/cc-langs.el | 2 +- lisp/progmodes/cc-menus.el | 2 +- lisp/progmodes/cc-mode.el | 2 +- lisp/progmodes/cc-styles.el | 2 +- lisp/progmodes/cc-vars.el | 2 +- lisp/progmodes/cfengine.el | 2 +- lisp/progmodes/cmacexp.el | 2 +- lisp/progmodes/compile.el | 2 +- lisp/progmodes/cperl-mode.el | 2 +- lisp/progmodes/cpp.el | 2 +- lisp/progmodes/cwarn.el | 2 +- lisp/progmodes/dcl-mode.el | 2 +- lisp/progmodes/delphi.el | 2 +- lisp/progmodes/ebnf-abn.el | 2 +- lisp/progmodes/ebnf-bnf.el | 2 +- lisp/progmodes/ebnf-dtd.el | 2 +- lisp/progmodes/ebnf-ebx.el | 2 +- lisp/progmodes/ebnf-iso.el | 2 +- lisp/progmodes/ebnf-otz.el | 2 +- lisp/progmodes/ebnf-yac.el | 2 +- lisp/progmodes/ebnf2ps.el | 2 +- lisp/progmodes/ebrowse.el | 2 +- lisp/progmodes/etags.el | 2 +- lisp/progmodes/executable.el | 2 +- lisp/progmodes/f90.el | 2 +- lisp/progmodes/flymake.el | 2 +- lisp/progmodes/fortran.el | 2 +- lisp/progmodes/gdb-ui.el | 2 +- lisp/progmodes/glasses.el | 2 +- lisp/progmodes/grep.el | 2 +- lisp/progmodes/gud.el | 2 +- lisp/progmodes/hideif.el | 2 +- lisp/progmodes/hideshow.el | 2 +- lisp/progmodes/icon.el | 2 +- lisp/progmodes/idlw-complete-structtag.el | 2 +- lisp/progmodes/idlw-help.el | 2 +- lisp/progmodes/idlw-shell.el | 2 +- lisp/progmodes/idlw-toolbar.el | 2 +- lisp/progmodes/idlwave.el | 2 +- lisp/progmodes/inf-lisp.el | 2 +- lisp/progmodes/js.el | 2 +- lisp/progmodes/ld-script.el | 2 +- lisp/progmodes/m4-mode.el | 2 +- lisp/progmodes/make-mode.el | 2 +- lisp/progmodes/mantemp.el | 2 +- lisp/progmodes/meta-mode.el | 2 +- lisp/progmodes/mixal-mode.el | 2 +- lisp/progmodes/octave-inf.el | 2 +- lisp/progmodes/octave-mod.el | 2 +- lisp/progmodes/pascal.el | 2 +- lisp/progmodes/perl-mode.el | 2 +- lisp/progmodes/prolog.el | 2 +- lisp/progmodes/ps-mode.el | 2 +- lisp/progmodes/python.el | 2 +- lisp/progmodes/ruby-mode.el | 2 +- lisp/progmodes/scheme.el | 2 +- lisp/progmodes/sh-script.el | 2 +- lisp/progmodes/simula.el | 2 +- lisp/progmodes/sql.el | 2 +- lisp/progmodes/subword.el | 2 +- lisp/progmodes/tcl.el | 2 +- lisp/progmodes/vera-mode.el | 2 +- lisp/progmodes/verilog-mode.el | 2 +- lisp/progmodes/vhdl-mode.el | 2 +- lisp/progmodes/which-func.el | 2 +- lisp/progmodes/xscheme.el | 2 +- lisp/ps-bdf.el | 2 +- lisp/ps-def.el | 2 +- lisp/ps-mule.el | 2 +- lisp/ps-print.el | 2 +- lisp/ps-samp.el | 2 +- lisp/recentf.el | 2 +- lisp/rect.el | 2 +- lisp/register.el | 2 +- lisp/repeat.el | 2 +- lisp/replace.el | 2 +- lisp/reposition.el | 2 +- lisp/reveal.el | 2 +- lisp/rfn-eshadow.el | 2 +- lisp/rot13.el | 2 +- lisp/ruler-mode.el | 2 +- lisp/s-region.el | 2 +- lisp/savehist.el | 2 +- lisp/saveplace.el | 2 +- lisp/sb-image.el | 2 +- lisp/scroll-all.el | 2 +- lisp/scroll-bar.el | 2 +- lisp/scroll-lock.el | 2 +- lisp/select.el | 2 +- lisp/server.el | 2 +- lisp/ses.el | 2 +- lisp/sha1.el | 2 +- lisp/shadowfile.el | 2 +- lisp/shell.el | 2 +- lisp/simple.el | 2 +- lisp/skeleton.el | 2 +- lisp/smerge-mode.el | 2 +- lisp/sort.el | 2 +- lisp/soundex.el | 2 +- lisp/speedbar.el | 2 +- lisp/startup.el | 2 +- lisp/strokes.el | 2 +- lisp/subr.el | 2 +- lisp/t-mouse.el | 2 +- lisp/tabify.el | 2 +- lisp/talk.el | 2 +- lisp/tar-mode.el | 2 +- lisp/tempo.el | 2 +- lisp/term.el | 2 +- lisp/term/AT386.el | 2 +- lisp/term/README | 2 +- lisp/term/common-win.el | 2 +- lisp/term/internal.el | 2 +- lisp/term/iris-ansi.el | 2 +- lisp/term/news.el | 2 +- lisp/term/ns-win.el | 2 +- lisp/term/pc-win.el | 2 +- lisp/term/rxvt.el | 2 +- lisp/term/sun.el | 2 +- lisp/term/sup-mouse.el | 2 +- lisp/term/tty-colors.el | 2 +- lisp/term/tvi970.el | 2 +- lisp/term/vt100.el | 2 +- lisp/term/w32-win.el | 2 +- lisp/term/w32console.el | 2 +- lisp/term/wyse50.el | 2 +- lisp/term/x-win.el | 2 +- lisp/term/xterm.el | 2 +- lisp/terminal.el | 2 +- lisp/textmodes/artist.el | 2 +- lisp/textmodes/bib-mode.el | 2 +- lisp/textmodes/bibtex-style.el | 2 +- lisp/textmodes/bibtex.el | 2 +- lisp/textmodes/conf-mode.el | 2 +- lisp/textmodes/css-mode.el | 2 +- lisp/textmodes/dns-mode.el | 2 +- lisp/textmodes/enriched.el | 2 +- lisp/textmodes/fill.el | 2 +- lisp/textmodes/flyspell.el | 2 +- lisp/textmodes/ispell.el | 2 +- lisp/textmodes/makeinfo.el | 2 +- lisp/textmodes/nroff-mode.el | 2 +- lisp/textmodes/page-ext.el | 2 +- lisp/textmodes/page.el | 2 +- lisp/textmodes/paragraphs.el | 2 +- lisp/textmodes/picture.el | 2 +- lisp/textmodes/po.el | 2 +- lisp/textmodes/refbib.el | 2 +- lisp/textmodes/refer.el | 2 +- lisp/textmodes/refill.el | 2 +- lisp/textmodes/reftex-auc.el | 2 +- lisp/textmodes/reftex-cite.el | 2 +- lisp/textmodes/reftex-dcr.el | 2 +- lisp/textmodes/reftex-global.el | 2 +- lisp/textmodes/reftex-index.el | 2 +- lisp/textmodes/reftex-parse.el | 2 +- lisp/textmodes/reftex-ref.el | 2 +- lisp/textmodes/reftex-sel.el | 2 +- lisp/textmodes/reftex-toc.el | 2 +- lisp/textmodes/reftex-vars.el | 2 +- lisp/textmodes/reftex.el | 2 +- lisp/textmodes/remember.el | 2 +- lisp/textmodes/rst.el | 2 +- lisp/textmodes/sgml-mode.el | 2 +- lisp/textmodes/spell.el | 2 +- lisp/textmodes/table.el | 2 +- lisp/textmodes/tex-mode.el | 2 +- lisp/textmodes/texinfmt.el | 2 +- lisp/textmodes/texinfo.el | 2 +- lisp/textmodes/texnfo-upd.el | 2 +- lisp/textmodes/text-mode.el | 2 +- lisp/textmodes/tildify.el | 2 +- lisp/textmodes/two-column.el | 2 +- lisp/textmodes/underline.el | 2 +- lisp/thingatpt.el | 2 +- lisp/thumbs.el | 2 +- lisp/time-stamp.el | 2 +- lisp/time.el | 2 +- lisp/timezone.el | 2 +- lisp/tmm.el | 2 +- lisp/tool-bar.el | 2 +- lisp/tooltip.el | 2 +- lisp/tree-widget.el | 2 +- lisp/tutorial.el | 2 +- lisp/type-break.el | 2 +- lisp/uniquify.el | 2 +- lisp/url/ChangeLog | 2 +- lisp/url/url-about.el | 2 +- lisp/url/url-auth.el | 2 +- lisp/url/url-cache.el | 2 +- lisp/url/url-cid.el | 2 +- lisp/url/url-cookie.el | 2 +- lisp/url/url-dav.el | 2 +- lisp/url/url-dired.el | 2 +- lisp/url/url-expand.el | 2 +- lisp/url/url-file.el | 2 +- lisp/url/url-ftp.el | 2 +- lisp/url/url-gw.el | 2 +- lisp/url/url-handlers.el | 2 +- lisp/url/url-history.el | 2 +- lisp/url/url-http.el | 2 +- lisp/url/url-imap.el | 2 +- lisp/url/url-irc.el | 2 +- lisp/url/url-ldap.el | 2 +- lisp/url/url-mailto.el | 2 +- lisp/url/url-methods.el | 2 +- lisp/url/url-misc.el | 2 +- lisp/url/url-news.el | 2 +- lisp/url/url-nfs.el | 2 +- lisp/url/url-ns.el | 2 +- lisp/url/url-parse.el | 2 +- lisp/url/url-privacy.el | 2 +- lisp/url/url-proxy.el | 2 +- lisp/url/url-util.el | 2 +- lisp/url/url-vars.el | 2 +- lisp/url/url.el | 2 +- lisp/userlock.el | 2 +- lisp/vc-annotate.el | 2 +- lisp/vc-arch.el | 2 +- lisp/vc-bzr.el | 2 +- lisp/vc-cvs.el | 2 +- lisp/vc-dav.el | 2 +- lisp/vc-dir.el | 2 +- lisp/vc-dispatcher.el | 2 +- lisp/vc-git.el | 2 +- lisp/vc-hg.el | 2 +- lisp/vc-hooks.el | 2 +- lisp/vc-mtn.el | 2 +- lisp/vc-rcs.el | 2 +- lisp/vc-sccs.el | 2 +- lisp/vc-svn.el | 2 +- lisp/vc.el | 2 +- lisp/vcursor.el | 2 +- lisp/view.el | 2 +- lisp/vt-control.el | 2 +- lisp/vt100-led.el | 2 +- lisp/w32-fns.el | 2 +- lisp/w32-vars.el | 2 +- lisp/wdired.el | 2 +- lisp/whitespace.el | 2 +- lisp/wid-browse.el | 2 +- lisp/wid-edit.el | 2 +- lisp/widget.el | 2 +- lisp/windmove.el | 2 +- lisp/window.el | 2 +- lisp/winner.el | 2 +- lisp/woman.el | 2 +- lisp/x-dnd.el | 2 +- lisp/xml.el | 2 +- lisp/xt-mouse.el | 2 +- lwlib/ChangeLog | 2 +- lwlib/Makefile.in | 2 +- lwlib/lwlib-Xaw.c | 2 +- lwlib/lwlib-Xlw.c | 2 +- lwlib/lwlib-Xm.c | 2 +- lwlib/lwlib-int.h | 2 +- lwlib/lwlib-utils.c | 2 +- lwlib/lwlib.c | 2 +- lwlib/lwlib.h | 2 +- lwlib/xlwmenu.c | 2 +- lwlib/xlwmenu.h | 2 +- lwlib/xlwmenuP.h | 2 +- make-dist | 2 +- msdos/ChangeLog | 2 +- msdos/INSTALL | 2 +- msdos/README | 4 ++-- msdos/mainmake | 2 +- msdos/mainmake.v2 | 2 +- msdos/sed1.inp | 2 +- msdos/sed1v2.inp | 2 +- msdos/sed2.inp | 2 +- msdos/sed2v2.inp | 2 +- msdos/sed2x.inp | 2 +- msdos/sed3.inp | 2 +- msdos/sed3v2.inp | 2 +- msdos/sed4.inp | 2 +- msdos/sed5x.inp | 2 +- msdos/sed6.inp | 2 +- msdos/sedalloc.inp | 2 +- msdos/sedleim.inp | 2 +- msdos/sedlisp.inp | 2 +- nextstep/ChangeLog | 2 +- nextstep/Cocoa/Emacs.base/Contents/Info.plist | 2 +- nextstep/INSTALL | 2 +- nextstep/README | 2 +- nt/ChangeLog | 2 +- nt/INSTALL | 2 +- nt/README | 2 +- nt/addpm.c | 2 +- nt/addsection.c | 2 +- nt/cmdproxy.c | 2 +- nt/config.nt | 2 +- nt/configure.bat | 2 +- nt/ddeclient.c | 2 +- nt/emacs.rc | 2 +- nt/emacsclient.rc | 2 +- nt/envadd.bat | 2 +- nt/gmake.defs | 2 +- nt/icons/README | 6 +++--- nt/inc/grp.h | 2 +- nt/inc/langinfo.h | 2 +- nt/inc/nl_types.h | 2 +- nt/inc/sys/socket.h | 2 +- nt/inc/sys/stat.h | 2 +- nt/makefile.w32-in | 2 +- nt/multi-install-info.bat | 2 +- nt/nmake.defs | 2 +- nt/paths.h | 2 +- nt/preprep.c | 2 +- nt/runemacs.c | 2 +- oldXMenu/Activate.c | 2 +- oldXMenu/ChangeLog | 2 +- oldXMenu/Create.c | 2 +- oldXMenu/FindSel.c | 2 +- oldXMenu/Internal.c | 2 +- oldXMenu/Makefile.in | 2 +- oldXMenu/insque.c | 2 +- src/.gdbinit | 2 +- src/ChangeLog | 2 +- src/ChangeLog.1 | 2 +- src/ChangeLog.10 | 2 +- src/ChangeLog.2 | 2 +- src/ChangeLog.3 | 2 +- src/ChangeLog.4 | 2 +- src/ChangeLog.5 | 2 +- src/ChangeLog.6 | 2 +- src/ChangeLog.7 | 2 +- src/ChangeLog.8 | 2 +- src/ChangeLog.9 | 2 +- src/Makefile.in | 2 +- src/README | 2 +- src/alloc.c | 2 +- src/atimer.c | 2 +- src/atimer.h | 2 +- src/blockinput.h | 2 +- src/buffer.c | 2 +- src/buffer.h | 2 +- src/bytecode.c | 2 +- src/callint.c | 2 +- src/callproc.c | 2 +- src/casefiddle.c | 2 +- src/casetab.c | 2 +- src/category.c | 2 +- src/ccl.c | 2 +- src/character.c | 4 ++-- src/charset.c | 2 +- src/charset.h | 2 +- src/cm.c | 2 +- src/cm.h | 2 +- src/cmds.c | 2 +- src/coding.c | 2 +- src/coding.h | 2 +- src/commands.h | 2 +- src/composite.c | 2 +- src/composite.h | 2 +- src/config.in | 2 +- src/data.c | 2 +- src/dbusbind.c | 2 +- src/dired.c | 2 +- src/dispextern.h | 2 +- src/dispnew.c | 2 +- src/disptab.h | 2 +- src/doc.c | 2 +- src/doprnt.c | 2 +- src/dosfns.c | 2 +- src/dosfns.h | 2 +- src/ecrt0.c | 2 +- src/editfns.c | 2 +- src/emacs-icon.h | 2 +- src/emacs.c | 2 +- src/epaths.in | 2 +- src/eval.c | 2 +- src/fileio.c | 2 +- src/filelock.c | 2 +- src/filemode.c | 2 +- src/firstfile.c | 2 +- src/floatfns.c | 2 +- src/fns.c | 2 +- src/font.c | 2 +- src/font.h | 2 +- src/fontset.c | 2 +- src/fontset.h | 2 +- src/frame.c | 2 +- src/frame.h | 2 +- src/fringe.c | 2 +- src/ftfont.c | 2 +- src/ftxfont.c | 2 +- src/getpagesize.h | 2 +- src/gtkutil.c | 2 +- src/gtkutil.h | 2 +- src/image.c | 2 +- src/indent.c | 2 +- src/indent.h | 2 +- src/insdel.c | 2 +- src/intervals.c | 2 +- src/intervals.h | 2 +- src/keyboard.c | 2 +- src/keyboard.h | 2 +- src/keymap.c | 2 +- src/keymap.h | 2 +- src/lastfile.c | 2 +- src/lisp.h | 2 +- src/lread.c | 2 +- src/m/alpha.h | 2 +- src/m/amdx86-64.h | 2 +- src/m/arm.h | 2 +- src/m/hp800.h | 2 +- src/m/ia64.h | 2 +- src/m/ibmrs6000.h | 2 +- src/m/ibms390.h | 2 +- src/m/ibms390x.h | 2 +- src/m/intel386.h | 2 +- src/m/iris4d.h | 2 +- src/m/m68k.h | 2 +- src/m/macppc.h | 2 +- src/m/mips.h | 2 +- src/m/sparc.h | 2 +- src/m/template.h | 2 +- src/m/vax.h | 2 +- src/macros.c | 2 +- src/macros.h | 2 +- src/makefile.w32-in | 2 +- src/marker.c | 2 +- src/mem-limits.h | 2 +- src/menu.c | 2 +- src/menu.h | 2 +- src/minibuf.c | 2 +- src/msdos.c | 2 +- src/msdos.h | 2 +- src/nsfns.m | 2 +- src/nsfont.m | 2 +- src/nsgui.h | 2 +- src/nsimage.m | 2 +- src/nsmenu.m | 2 +- src/nsselect.m | 2 +- src/nsterm.h | 2 +- src/nsterm.m | 2 +- src/prefix-args.c | 2 +- src/print.c | 2 +- src/process.c | 2 +- src/process.h | 2 +- src/puresize.h | 2 +- src/ralloc.c | 2 +- src/regex.c | 2 +- src/regex.h | 2 +- src/region-cache.c | 2 +- src/region-cache.h | 2 +- src/s/aix4-2.h | 2 +- src/s/bsd-common.h | 2 +- src/s/cygwin.h | 2 +- src/s/darwin.h | 2 +- src/s/freebsd.h | 2 +- src/s/gnu-linux.h | 2 +- src/s/gnu.h | 2 +- src/s/hpux10-20.h | 2 +- src/s/irix6-5.h | 2 +- src/s/lynxos.h | 2 +- src/s/ms-w32.h | 2 +- src/s/msdos.h | 2 +- src/s/netbsd.h | 2 +- src/s/sol2-3.h | 2 +- src/s/template.h | 2 +- src/s/usg5-4-2.h | 2 +- src/s/usg5-4.h | 2 +- src/scroll.c | 2 +- src/search.c | 2 +- src/sheap.c | 2 +- src/sound.c | 2 +- src/syntax.c | 2 +- src/syntax.h | 2 +- src/sysdep.c | 2 +- src/sysselect.h | 2 +- src/syssignal.h | 2 +- src/systime.h | 2 +- src/systty.h | 2 +- src/syswait.h | 2 +- src/term.c | 2 +- src/termchar.h | 2 +- src/termhooks.h | 2 +- src/terminal.c | 2 +- src/terminfo.c | 2 +- src/termopts.h | 2 +- src/textprop.c | 2 +- src/undo.c | 2 +- src/unexaix.c | 2 +- src/unexalpha.c | 2 +- src/unexcw.c | 2 +- src/unexec.c | 2 +- src/unexelf.c | 2 +- src/unexmacosx.c | 2 +- src/unexw32.c | 2 +- src/vm-limit.c | 2 +- src/w16select.c | 2 +- src/w32.c | 2 +- src/w32.h | 2 +- src/w32console.c | 2 +- src/w32fns.c | 2 +- src/w32font.c | 2 +- src/w32font.h | 2 +- src/w32gui.h | 2 +- src/w32heap.c | 2 +- src/w32heap.h | 2 +- src/w32inevt.c | 2 +- src/w32inevt.h | 2 +- src/w32menu.c | 2 +- src/w32proc.c | 2 +- src/w32reg.c | 2 +- src/w32select.c | 2 +- src/w32term.c | 2 +- src/w32term.h | 2 +- src/w32uniscribe.c | 2 +- src/w32xfns.c | 2 +- src/widget.c | 2 +- src/widget.h | 2 +- src/widgetprv.h | 2 +- src/window.c | 2 +- src/window.h | 2 +- src/xdisp.c | 2 +- src/xfaces.c | 2 +- src/xfns.c | 2 +- src/xfont.c | 2 +- src/xftfont.c | 2 +- src/xgselect.c | 2 +- src/xgselect.h | 2 +- src/xmenu.c | 2 +- src/xrdb.c | 2 +- src/xselect.c | 2 +- src/xsettings.c | 2 +- src/xsettings.h | 2 +- src/xsmfns.c | 2 +- src/xterm.c | 2 +- src/xterm.h | 2 +- test/ChangeLog | 2 +- test/bytecomp-testsuite.el | 2 +- test/cedet/cedet-utests.el | 2 +- test/cedet/ede-tests.el | 2 +- test/cedet/semantic-ia-utest.el | 2 +- test/cedet/semantic-tests.el | 2 +- test/cedet/semantic-utest-c.el | 2 +- test/cedet/semantic-utest.el | 2 +- test/cedet/srecode-tests.el | 2 +- test/cedet/tests/test.c | 2 +- test/cedet/tests/test.el | 2 +- test/cedet/tests/test.make | 2 +- test/cedet/tests/testdoublens.cpp | 2 +- test/cedet/tests/testdoublens.hpp | 2 +- test/cedet/tests/testjavacomp.java | 2 +- test/cedet/tests/testpolymorph.cpp | 2 +- test/cedet/tests/testspp.c | 2 +- test/cedet/tests/testsppreplace.c | 2 +- test/cedet/tests/testsppreplaced.c | 2 +- test/cedet/tests/testsubclass.cpp | 2 +- test/cedet/tests/testsubclass.hh | 2 +- test/cedet/tests/testtypedefs.cpp | 2 +- test/cedet/tests/testvarnames.c | 2 +- test/icalendar-testsuite.el | 2 +- test/newsticker-testsuite.el | 2 +- test/redisplay-testsuite.el | 2 +- update-subdirs | 2 +- 2012 files changed, 2039 insertions(+), 2038 deletions(-) (limited to 'etc') diff --git a/ChangeLog b/ChangeLog index e305cb7faa1..e25adc8db30 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7947,7 +7947,7 @@ ;; End: Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, - 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. + 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/INSTALL b/INSTALL index e19749e3ded..8f06673d617 100644 --- a/INSTALL +++ b/INSTALL @@ -1,6 +1,6 @@ GNU Emacs Installation Guide Copyright (C) 1992, 1994, 1996, 1997, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007, 2008, 2009, 2010, 2011 + 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/INSTALL.BZR b/INSTALL.BZR index f31a2e4b5b4..efe02d7c24b 100644 --- a/INSTALL.BZR +++ b/INSTALL.BZR @@ -1,4 +1,4 @@ -Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/Makefile.in b/Makefile.in index 32a09ff7842..5e0d128560d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -3,7 +3,7 @@ # DIST: that first. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -# 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +# 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 # Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/README b/README index efb8fb99a38..4b7610da62b 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, - 2010, 2011 Free Software Foundation, Inc. + 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/admin/ChangeLog b/admin/ChangeLog index 39a8a8f57d5..1ff29e58254 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -877,7 +877,7 @@ ;; End: Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, - 2010, 2011 Free Software Foundation, Inc. + 2010, 2011, 2012 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/admin/README b/admin/README index 17232f5f3a5..3f85d475d7c 100644 --- a/admin/README +++ b/admin/README @@ -1,5 +1,5 @@ Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, - 2010, 2011 Free Software Foundation, Inc. + 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/admin/admin.el b/admin/admin.el index b792287596b..31dc74891ed 100644 --- a/admin/admin.el +++ b/admin/admin.el @@ -1,7 +1,7 @@ ;;; admin.el --- utilities for Emacs administration ;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, -;; 2010, 2011 Free Software Foundation, Inc. +;; 2010, 2011, 2012 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/admin/alloc-colors.c b/admin/alloc-colors.c index 38312604248..784e4c17dd9 100644 --- a/admin/alloc-colors.c +++ b/admin/alloc-colors.c @@ -1,5 +1,5 @@ /* Allocate X colors. Used for testing with dense colormaps. - Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 + Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/admin/build-configs b/admin/build-configs index 759750f8475..5679bce2d1a 100755 --- a/admin/build-configs +++ b/admin/build-configs @@ -1,7 +1,7 @@ #! /usr/bin/perl # Build Emacs in several different configurations. -# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 # Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/admin/charsets/mapfiles/README b/admin/charsets/mapfiles/README index a47c5d7b733..62e768fa4d6 100644 --- a/admin/charsets/mapfiles/README +++ b/admin/charsets/mapfiles/README @@ -1,4 +1,4 @@ -Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright (C) 2009, 2010, 2011, 2012 Free Software Foundation, Inc. Copyright (C) 2009, 2010, 2011 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H13PRO009 diff --git a/admin/cus-test.el b/admin/cus-test.el index 060e100f6c4..0b921f24783 100644 --- a/admin/cus-test.el +++ b/admin/cus-test.el @@ -1,6 +1,6 @@ ;;; cus-test.el --- tests for custom types and load problems -;; Copyright (C) 1998, 2000, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +;; Copyright (C) 1998, 2000, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 ;; Free Software Foundation, Inc. ;; Author: Markus Rost diff --git a/admin/diff-tar-files b/admin/diff-tar-files index 92198bad892..3be05de01c3 100755 --- a/admin/diff-tar-files +++ b/admin/diff-tar-files @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 # Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/admin/make-announcement b/admin/make-announcement index 180c35601b3..41fe5dc99b6 100755 --- a/admin/make-announcement +++ b/admin/make-announcement @@ -1,7 +1,7 @@ #! /bin/bash ## Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, -## 2010, 2011 Free Software Foundation, Inc. +## 2010, 2011, 2012 Free Software Foundation, Inc. ## Author: Francesco Potorti` diff --git a/admin/make-emacs b/admin/make-emacs index 9abfa731be5..03876fff568 100755 --- a/admin/make-emacs +++ b/admin/make-emacs @@ -2,7 +2,7 @@ # Build Emacs with various options for profiling, debugging, # with and without warnings enabled etc. -# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 # Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/admin/notes/copyright b/admin/notes/copyright index 81736e038b6..5d0a77b5c43 100644 --- a/admin/notes/copyright +++ b/admin/notes/copyright @@ -1,4 +1,4 @@ -Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/admin/notes/font-backend b/admin/notes/font-backend index d35102d681e..3b7f35314d9 100644 --- a/admin/notes/font-backend +++ b/admin/notes/font-backend @@ -1,4 +1,4 @@ -Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/admin/notes/lel-TODO b/admin/notes/lel-TODO index f38f9641c58..60600e4a936 100644 --- a/admin/notes/lel-TODO +++ b/admin/notes/lel-TODO @@ -1,6 +1,6 @@ Some lisp/emacs-lisp/ Features and Where They Are Documented -Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/admin/notes/multi-tty b/admin/notes/multi-tty index 1dfc56f7a10..9db2c696b53 100644 --- a/admin/notes/multi-tty +++ b/admin/notes/multi-tty @@ -1,6 +1,6 @@ -*- coding: utf-8; mode: text; -*- -Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. From README.multi-tty in the multi-tty branch. diff --git a/admin/notes/unicode b/admin/notes/unicode index 2ef9baf11b1..e453de698f1 100644 --- a/admin/notes/unicode +++ b/admin/notes/unicode @@ -1,6 +1,6 @@ -*-mode: text; coding: latin-1;-*- -Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/admin/nt/README-UNDUMP.W32 b/admin/nt/README-UNDUMP.W32 index e5dad487e13..f98732720cb 100644 --- a/admin/nt/README-UNDUMP.W32 +++ b/admin/nt/README-UNDUMP.W32 @@ -1,4 +1,4 @@ -Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/admin/nt/README-ftp-server b/admin/nt/README-ftp-server index eab757148d8..24806591be8 100644 --- a/admin/nt/README-ftp-server +++ b/admin/nt/README-ftp-server @@ -1,4 +1,4 @@ -Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/admin/nt/README.W32 b/admin/nt/README.W32 index 600e2c31d12..efc6aca7485 100644 --- a/admin/nt/README.W32 +++ b/admin/nt/README.W32 @@ -1,4 +1,4 @@ -Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/admin/nt/makedist.bat b/admin/nt/makedist.bat index 31361e53e5e..68b2b1f5b14 100755 --- a/admin/nt/makedist.bat +++ b/admin/nt/makedist.bat @@ -1,6 +1,6 @@ @echo off -rem Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +rem Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 rem Free Software Foundation, Inc. rem Cannot use brackets in andrewi's email below because diff --git a/admin/quick-install-emacs b/admin/quick-install-emacs index 1ad9c28aae2..1736b9c24df 100755 --- a/admin/quick-install-emacs +++ b/admin/quick-install-emacs @@ -1,7 +1,7 @@ #!/bin/sh ### quick-install-emacs --- do a halfway-decent job of installing emacs quickly -## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 ## Free Software Foundation, Inc. ## Author: Miles Bader diff --git a/config.bat b/config.bat index e1d9f1b77b8..079e89a63da 100644 --- a/config.bat +++ b/config.bat @@ -2,7 +2,7 @@ rem ---------------------------------------------------------------------- rem Configuration script for MSDOS rem Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003 -rem 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +rem 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. rem This file is part of GNU Emacs. diff --git a/configure.in b/configure.in index bc83bc6d703..a43b514b60a 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl autoconf dnl in the directory containing this script. dnl dnl Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2003, -dnl 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +dnl 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. dnl dnl This file is part of GNU Emacs. dnl @@ -2757,7 +2757,7 @@ fi AH_TOP([/* GNU Emacs site configuration template file. Copyright (C) 1988, 1993, 1994, 1999, 2000, 2001, 2002, 2004, 2005, - 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. + 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 5196706f6c9..a19a2e6c63e 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -7428,7 +7428,7 @@ ;; End: Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, - 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 + 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in index 3f2f635dc7c..09986ecab09 100644 --- a/doc/emacs/Makefile.in +++ b/doc/emacs/Makefile.in @@ -1,7 +1,7 @@ #### Makefile for the Emacs Manual # Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, -# 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/doc/emacs/abbrevs.texi b/doc/emacs/abbrevs.texi index 160c70471dd..c67645fc52a 100644 --- a/doc/emacs/abbrevs.texi +++ b/doc/emacs/abbrevs.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002, 2003, -@c 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Abbrevs @chapter Abbrevs diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi index ff76beb3496..079f1d94298 100644 --- a/doc/emacs/ack.texi +++ b/doc/emacs/ack.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003, -@c 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c diff --git a/doc/emacs/anti.texi b/doc/emacs/anti.texi index fd54aea4eb2..9de2ddf91c2 100644 --- a/doc/emacs/anti.texi +++ b/doc/emacs/anti.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Antinews, Mac OS / GNUstep, X Resources, Top diff --git a/doc/emacs/arevert-xtra.texi b/doc/emacs/arevert-xtra.texi index c19fd3a5cc8..edca8a717db 100644 --- a/doc/emacs/arevert-xtra.texi +++ b/doc/emacs/arevert-xtra.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c diff --git a/doc/emacs/basic.texi b/doc/emacs/basic.texi index abe6081a335..f5782c8f61f 100644 --- a/doc/emacs/basic.texi +++ b/doc/emacs/basic.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Basic, Minibuffer, Exiting, Top diff --git a/doc/emacs/buffers.texi b/doc/emacs/buffers.texi index 7cee61db71e..894078ee040 100644 --- a/doc/emacs/buffers.texi +++ b/doc/emacs/buffers.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Buffers, Windows, Files, Top diff --git a/doc/emacs/building.texi b/doc/emacs/building.texi index bad64b4c697..7248d5860d9 100644 --- a/doc/emacs/building.texi +++ b/doc/emacs/building.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Building, Maintaining, Programs, Top diff --git a/doc/emacs/cal-xtra.texi b/doc/emacs/cal-xtra.texi index 2f6a09ba672..4cf898da1e0 100644 --- a/doc/emacs/cal-xtra.texi +++ b/doc/emacs/cal-xtra.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c diff --git a/doc/emacs/calendar.texi b/doc/emacs/calendar.texi index 94d1042bb86..721a18605fe 100644 --- a/doc/emacs/calendar.texi +++ b/doc/emacs/calendar.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Calendar/Diary, Document View, Dired, Top diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi index 40cce49e20d..8387797872f 100644 --- a/doc/emacs/cmdargs.texi +++ b/doc/emacs/cmdargs.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002, -@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Emacs Invocation, X Resources, GNU Free Documentation License, Top @appendix Command Line Arguments for Emacs Invocation diff --git a/doc/emacs/commands.texi b/doc/emacs/commands.texi index 8d7e2556ddd..f14bbbe966e 100644 --- a/doc/emacs/commands.texi +++ b/doc/emacs/commands.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002, -@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @iftex @chapter Characters, Keys and Commands diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi index 6a95e7a9ea5..11fc356008d 100644 --- a/doc/emacs/custom.texi +++ b/doc/emacs/custom.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Customization, Quitting, Amusements, Top diff --git a/doc/emacs/dired-xtra.texi b/doc/emacs/dired-xtra.texi index aa2e83f129d..fd24c8db03f 100644 --- a/doc/emacs/dired-xtra.texi +++ b/doc/emacs/dired-xtra.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi index 0b3cd7aac0e..b05be0b3ae4 100644 --- a/doc/emacs/dired.texi +++ b/doc/emacs/dired.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Dired, Calendar/Diary, Rmail, Top diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi index e4841c66e72..b2e0d2038c1 100644 --- a/doc/emacs/display.texi +++ b/doc/emacs/display.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. diff --git a/doc/emacs/emacs-xtra.texi b/doc/emacs/emacs-xtra.texi index 9d20b335355..0214eaf106f 100644 --- a/doc/emacs/emacs-xtra.texi +++ b/doc/emacs/emacs-xtra.texi @@ -11,7 +11,7 @@ @copying This manual describes specialized features of Emacs. -Copyright @copyright{} 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright @copyright{} 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi index f839266b918..5f8a9b5b096 100644 --- a/doc/emacs/emacs.texi +++ b/doc/emacs/emacs.texi @@ -13,7 +13,7 @@ updated for Emacs version @value{EMACSVER}. Copyright @copyright{} 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, -2010, 2011 Free Software Foundation, Inc. +2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/emacs/emerge-xtra.texi b/doc/emacs/emerge-xtra.texi index 5db2d2b4a2a..300d418e4d6 100644 --- a/doc/emacs/emerge-xtra.texi +++ b/doc/emacs/emerge-xtra.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c diff --git a/doc/emacs/entering.texi b/doc/emacs/entering.texi index 349e6326ec1..371d4c36a18 100644 --- a/doc/emacs/entering.texi +++ b/doc/emacs/entering.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 2001, 2002, 2003, -@c 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @iftex @chapter Entering and Exiting Emacs diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi index b5e3bff6791..a2a09cea11e 100644 --- a/doc/emacs/files.texi +++ b/doc/emacs/files.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1999, 2000, -@c 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Files, Buffers, Keyboard Macros, Top diff --git a/doc/emacs/fixit.texi b/doc/emacs/fixit.texi index 113e39cfd1a..a0806ed4a34 100644 --- a/doc/emacs/fixit.texi +++ b/doc/emacs/fixit.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002, -@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Fixit, Keyboard Macros, Search, Top @chapter Commands for Fixing Typos diff --git a/doc/emacs/fortran-xtra.texi b/doc/emacs/fortran-xtra.texi index fdf6733d26b..81a0f84c2de 100644 --- a/doc/emacs/fortran-xtra.texi +++ b/doc/emacs/fortran-xtra.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi index 42398766169..e77f93e3964 100644 --- a/doc/emacs/frames.texi +++ b/doc/emacs/frames.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1999, 2000, -@c 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Frames, International, Windows, Top diff --git a/doc/emacs/glossary.texi b/doc/emacs/glossary.texi index d75673c65d3..412ea908ba9 100644 --- a/doc/emacs/glossary.texi +++ b/doc/emacs/glossary.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002, -@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Glossary, Key Index, Intro, Top @unnumbered Glossary diff --git a/doc/emacs/gnu.texi b/doc/emacs/gnu.texi index 7f5bef785f0..47e02f85acc 100644 --- a/doc/emacs/gnu.texi +++ b/doc/emacs/gnu.texi @@ -1,5 +1,5 @@ @c Copyright (C) 1985, 1986, 1987, 1993, 1995, 2001, 2002, 2003, 2004, -@c 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c @c Permission is granted to anyone to make or distribute verbatim copies @c of this document, in any medium, provided that the copyright notice and diff --git a/doc/emacs/help.texi b/doc/emacs/help.texi index d55159ed832..0aede9127d4 100644 --- a/doc/emacs/help.texi +++ b/doc/emacs/help.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Help, Mark, M-x, Top diff --git a/doc/emacs/indent.texi b/doc/emacs/indent.texi index 86e15605edc..3be1be907ec 100644 --- a/doc/emacs/indent.texi +++ b/doc/emacs/indent.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002, -@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Indentation, Text, Major Modes, Top @chapter Indentation diff --git a/doc/emacs/killing.texi b/doc/emacs/killing.texi index 2ad3bc9e739..fd1269eab59 100644 --- a/doc/emacs/killing.texi +++ b/doc/emacs/killing.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. diff --git a/doc/emacs/kmacro.texi b/doc/emacs/kmacro.texi index 6807c62049e..ccfc67f496c 100644 --- a/doc/emacs/kmacro.texi +++ b/doc/emacs/kmacro.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Keyboard Macros, Files, Fixit, Top @chapter Keyboard Macros diff --git a/doc/emacs/m-x.texi b/doc/emacs/m-x.texi index 3489bed0d8c..0052d677682 100644 --- a/doc/emacs/m-x.texi +++ b/doc/emacs/m-x.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002, -@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node M-x, Help, Minibuffer, Top @chapter Running Commands by Name diff --git a/doc/emacs/macos.texi b/doc/emacs/macos.texi index c36efeaeaf4..bfefe8d3375 100644 --- a/doc/emacs/macos.texi +++ b/doc/emacs/macos.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, -@c 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Mac OS / GNUstep, Microsoft Windows, Antinews, Top @appendix Emacs and Mac OS / GNUstep diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi index f7be0015ffa..af9dcee819a 100644 --- a/doc/emacs/maintaining.texi +++ b/doc/emacs/maintaining.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1999, 2000, -@c 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Maintaining, Abbrevs, Building, Top diff --git a/doc/emacs/major.texi b/doc/emacs/major.texi index 78fdbf6a96f..b3ff529cc91 100644 --- a/doc/emacs/major.texi +++ b/doc/emacs/major.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Major Modes, Indentation, International, Top @chapter Major Modes diff --git a/doc/emacs/makefile.w32-in b/doc/emacs/makefile.w32-in index 4013c2fca4b..fef00335a4c 100644 --- a/doc/emacs/makefile.w32-in +++ b/doc/emacs/makefile.w32-in @@ -1,6 +1,6 @@ #### -*- Makefile -*- for the Emacs Manual -# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 # Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/doc/emacs/mark.texi b/doc/emacs/mark.texi index 1b702273be6..9d1d6629f6c 100644 --- a/doc/emacs/mark.texi +++ b/doc/emacs/mark.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002, -@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Mark, Killing, Help, Top diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi index 975f22cd5e4..c3dd44c2260 100644 --- a/doc/emacs/mini.texi +++ b/doc/emacs/mini.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Minibuffer, M-x, Basic, Top diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi index e734fe64617..1c407c0423a 100644 --- a/doc/emacs/misc.texi +++ b/doc/emacs/misc.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @iftex diff --git a/doc/emacs/msdog-xtra.texi b/doc/emacs/msdog-xtra.texi index 70ed3dde916..6ecc36db504 100644 --- a/doc/emacs/msdog-xtra.texi +++ b/doc/emacs/msdog-xtra.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c @c This file is included either in emacs-xtra.texi (when producing the diff --git a/doc/emacs/msdog.texi b/doc/emacs/msdog.texi index 25401932196..68565ba4387 100644 --- a/doc/emacs/msdog.texi +++ b/doc/emacs/msdog.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Microsoft Windows, Manifesto, Mac OS / GNUstep, Top diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi index 7f204890ce4..7195b842723 100644 --- a/doc/emacs/mule.texi +++ b/doc/emacs/mule.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003, 2004, -@c 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node International, Major Modes, Frames, Top @chapter International Character Set Support diff --git a/doc/emacs/picture-xtra.texi b/doc/emacs/picture-xtra.texi index 36254ea9993..c46127696bf 100644 --- a/doc/emacs/picture-xtra.texi +++ b/doc/emacs/picture-xtra.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c @c This file is included either in emacs-xtra.texi (when producing the diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi index c2364fb8c0e..37318b2ae30 100644 --- a/doc/emacs/programs.texi +++ b/doc/emacs/programs.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1999, 2000, -@c 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Programs, Building, Text, Top diff --git a/doc/emacs/regs.texi b/doc/emacs/regs.texi index 5eada94a0ab..79331b449ad 100644 --- a/doc/emacs/regs.texi +++ b/doc/emacs/regs.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002, -@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Registers, Display, CUA Bindings, Top @chapter Registers diff --git a/doc/emacs/rmail.texi b/doc/emacs/rmail.texi index 82e6b32cd88..b57f43853e5 100644 --- a/doc/emacs/rmail.texi +++ b/doc/emacs/rmail.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002, -@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Rmail, Dired, Sending Mail, Top diff --git a/doc/emacs/screen.texi b/doc/emacs/screen.texi index f12c03e1abf..e721ffe2cc5 100644 --- a/doc/emacs/screen.texi +++ b/doc/emacs/screen.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002, -@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Screen, User Input, Acknowledgments, Top diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi index 2b96e519b10..029f6a19200 100644 --- a/doc/emacs/search.texi +++ b/doc/emacs/search.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, 2002, -@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Search, Fixit, Display, Top diff --git a/doc/emacs/sending.texi b/doc/emacs/sending.texi index 8dbe24856ab..218f0d8a1bc 100644 --- a/doc/emacs/sending.texi +++ b/doc/emacs/sending.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, 2002, -@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Sending Mail diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi index e81bb4441e3..a82f4013a2c 100644 --- a/doc/emacs/text.texi +++ b/doc/emacs/text.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Text, Programs, Indentation, Top diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi index 6407467728f..638d238fb57 100644 --- a/doc/emacs/trouble.texi +++ b/doc/emacs/trouble.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002, -@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @iftex diff --git a/doc/emacs/vc-xtra.texi b/doc/emacs/vc-xtra.texi index 89e84287499..f0384f74ee4 100644 --- a/doc/emacs/vc-xtra.texi +++ b/doc/emacs/vc-xtra.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c diff --git a/doc/emacs/vc1-xtra.texi b/doc/emacs/vc1-xtra.texi index 668c3a4168b..cbf01483d63 100644 --- a/doc/emacs/vc1-xtra.texi +++ b/doc/emacs/vc1-xtra.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c diff --git a/doc/emacs/windows.texi b/doc/emacs/windows.texi index a80e18360e2..125d9ccbf9d 100644 --- a/doc/emacs/windows.texi +++ b/doc/emacs/windows.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Windows, Frames, Buffers, Top @chapter Multiple Windows diff --git a/doc/emacs/xresources.texi b/doc/emacs/xresources.texi index 0c44b9f1817..d21ece224ba 100644 --- a/doc/emacs/xresources.texi +++ b/doc/emacs/xresources.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1987, 1993, 1994, 1995, 1997, 2001, 2002, 2003, -@c 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node X Resources, Antinews, Emacs Invocation, Top @appendix X Options and Resources diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog index 70accbc0669..ae8b91c1be7 100644 --- a/doc/lispintro/ChangeLog +++ b/doc/lispintro/ChangeLog @@ -401,7 +401,7 @@ ;; End: Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, - 2008, 2009, 2010, 2011 Free Software Foundation, Inc. + 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in index e85185f060d..fe89fa6deab 100644 --- a/doc/lispintro/Makefile.in +++ b/doc/lispintro/Makefile.in @@ -1,7 +1,7 @@ #### Makefile for the Emacs Lisp Introduction manual # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003, -# 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/doc/lispintro/README b/doc/lispintro/README index 448682bfea7..c6e656f5a3e 100644 --- a/doc/lispintro/README +++ b/doc/lispintro/README @@ -1,4 +1,4 @@ -Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/doc/lispintro/cons-1.eps b/doc/lispintro/cons-1.eps index 13756346e4e..9216124153b 100644 --- a/doc/lispintro/cons-1.eps +++ b/doc/lispintro/cons-1.eps @@ -5,7 +5,7 @@ %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu) % Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -% 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +% 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. % % This file is part of GNU Emacs. % diff --git a/doc/lispintro/cons-2.eps b/doc/lispintro/cons-2.eps index 371ceb37e65..5641ffef638 100644 --- a/doc/lispintro/cons-2.eps +++ b/doc/lispintro/cons-2.eps @@ -5,7 +5,7 @@ %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu) % Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -% 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +% 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. % % This file is part of GNU Emacs. % diff --git a/doc/lispintro/cons-2a.eps b/doc/lispintro/cons-2a.eps index cd4ed67d23a..9665ee9031b 100644 --- a/doc/lispintro/cons-2a.eps +++ b/doc/lispintro/cons-2a.eps @@ -5,7 +5,7 @@ %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu) % Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -% 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +% 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. % % This file is part of GNU Emacs. % diff --git a/doc/lispintro/cons-3.eps b/doc/lispintro/cons-3.eps index c9b40f0e0cb..f20778fc5a1 100644 --- a/doc/lispintro/cons-3.eps +++ b/doc/lispintro/cons-3.eps @@ -5,7 +5,7 @@ %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu) % Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -% 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +% 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. % % This file is part of GNU Emacs. % diff --git a/doc/lispintro/cons-4.eps b/doc/lispintro/cons-4.eps index 83ce2bdd750..8db85b7edc3 100644 --- a/doc/lispintro/cons-4.eps +++ b/doc/lispintro/cons-4.eps @@ -5,7 +5,7 @@ %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu) % Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -% 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +% 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. % % This file is part of GNU Emacs. % diff --git a/doc/lispintro/cons-5.eps b/doc/lispintro/cons-5.eps index 7ad3d4800a9..00a3c7b953b 100644 --- a/doc/lispintro/cons-5.eps +++ b/doc/lispintro/cons-5.eps @@ -5,7 +5,7 @@ %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu) % Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -% 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +% 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. % % This file is part of GNU Emacs. % diff --git a/doc/lispintro/drawers.eps b/doc/lispintro/drawers.eps index 7b76b035459..36fe8213bb8 100644 --- a/doc/lispintro/drawers.eps +++ b/doc/lispintro/drawers.eps @@ -9,7 +9,7 @@ %%EndComments %%BeginProlog -% Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +% Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 % Free Software Foundation, Inc. % % This file is part of GNU Emacs. diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi index 4cce412b225..c3cb93781f8 100644 --- a/doc/lispintro/emacs-lisp-intro.texi +++ b/doc/lispintro/emacs-lisp-intro.texi @@ -229,7 +229,7 @@ people who are not programmers. Edition @value{edition-number}, @value{update-date} @sp 1 Copyright @copyright{} 1990, 1991, 1992, 1993, 1994, 1995, 1997, 2001, - 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 + 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @sp 1 diff --git a/doc/lispintro/lambda-1.eps b/doc/lispintro/lambda-1.eps index 2f1197c0f91..1ced8306672 100644 --- a/doc/lispintro/lambda-1.eps +++ b/doc/lispintro/lambda-1.eps @@ -5,7 +5,7 @@ %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu) % Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -% 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +% 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. % % This file is part of GNU Emacs. % diff --git a/doc/lispintro/lambda-2.eps b/doc/lispintro/lambda-2.eps index 84042f5df04..da24273cac5 100644 --- a/doc/lispintro/lambda-2.eps +++ b/doc/lispintro/lambda-2.eps @@ -5,7 +5,7 @@ %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu) % Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -% 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +% 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. % % This file is part of GNU Emacs. % diff --git a/doc/lispintro/lambda-3.eps b/doc/lispintro/lambda-3.eps index 8ba7da2d4f1..248d77b541f 100644 --- a/doc/lispintro/lambda-3.eps +++ b/doc/lispintro/lambda-3.eps @@ -5,7 +5,7 @@ %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu) % Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -% 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +% 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. % % This file is part of GNU Emacs. % diff --git a/doc/lispintro/makefile.w32-in b/doc/lispintro/makefile.w32-in index 8c7c5eb0527..c50012c3866 100644 --- a/doc/lispintro/makefile.w32-in +++ b/doc/lispintro/makefile.w32-in @@ -1,6 +1,6 @@ #### -*- Makefile -*- for the Emacs Lisp Introduction manual. -# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 # Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 51143c27859..6e9f849714e 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -8811,7 +8811,7 @@ ;; End: Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. + 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in index f4cd5940045..80382a1ab89 100644 --- a/doc/lispref/Makefile.in +++ b/doc/lispref/Makefile.in @@ -1,7 +1,7 @@ # Makefile for the GNU Emacs Lisp Reference Manual. # Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, -# 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +# 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 # Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/doc/lispref/README b/doc/lispref/README index 8587246194a..26fc84c45eb 100644 --- a/doc/lispref/README +++ b/doc/lispref/README @@ -1,4 +1,4 @@ -Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/doc/lispref/abbrevs.texi b/doc/lispref/abbrevs.texi index dcc3c57663b..ddad5ad4b04 100644 --- a/doc/lispref/abbrevs.texi +++ b/doc/lispref/abbrevs.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1999, 2001, 2002, 2003, -@c 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/abbrevs @node Abbrevs, Processes, Syntax Tables, Top diff --git a/doc/lispref/advice.texi b/doc/lispref/advice.texi index 544a6a211eb..e4bcd62fbc6 100644 --- a/doc/lispref/advice.texi +++ b/doc/lispref/advice.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004, -@c 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/advising @node Advising Functions, Debugging, Byte Compilation, Top diff --git a/doc/lispref/anti.texi b/doc/lispref/anti.texi index 5b8397e7e3e..e0dd7b7ae35 100644 --- a/doc/lispref/anti.texi +++ b/doc/lispref/anti.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1999, 2002, 2003, 2004, 2005, 2006, 2007, 2008, -@c 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @c This node must have no pointers. diff --git a/doc/lispref/back.texi b/doc/lispref/back.texi index 373da7b1e12..e408413e33e 100644 --- a/doc/lispref/back.texi +++ b/doc/lispref/back.texi @@ -1,6 +1,6 @@ \input texinfo @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @c diff --git a/doc/lispref/backups.texi b/doc/lispref/backups.texi index e196ce03962..17e18dba062 100644 --- a/doc/lispref/backups.texi +++ b/doc/lispref/backups.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1999, 2001, 2002, 2003, -@c 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/backups @node Backups and Auto-Saving, Buffers, Files, Top diff --git a/doc/lispref/buffers.texi b/doc/lispref/buffers.texi index 98fb748cd36..8d432f8905d 100644 --- a/doc/lispref/buffers.texi +++ b/doc/lispref/buffers.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, 2002, -@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/buffers @node Buffers, Windows, Backups and Auto-Saving, Top diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi index 91aae9594bb..b32c4e52371 100644 --- a/doc/lispref/commands.texi +++ b/doc/lispref/commands.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, 2002, -@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/commands diff --git a/doc/lispref/compile.texi b/doc/lispref/compile.texi index b91e1626233..d06c38f44b8 100644 --- a/doc/lispref/compile.texi +++ b/doc/lispref/compile.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 2001, 2002, 2003, 2004, -@c 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/compile @node Byte Compilation, Advising Functions, Loading, Top diff --git a/doc/lispref/control.texi b/doc/lispref/control.texi index f3da3ccd341..59726912295 100644 --- a/doc/lispref/control.texi +++ b/doc/lispref/control.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, 2002, -@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/control @node Control Structures, Variables, Evaluation, Top diff --git a/doc/lispref/customize.texi b/doc/lispref/customize.texi index 52d8fa42389..fb0fd3bead3 100644 --- a/doc/lispref/customize.texi +++ b/doc/lispref/customize.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -@c 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/customize @node Customization, Loading, Macros, Top diff --git a/doc/lispref/debugging.texi b/doc/lispref/debugging.texi index 13ebbabbb9a..a9448f1c876 100644 --- a/doc/lispref/debugging.texi +++ b/doc/lispref/debugging.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1998, 1999, 2001, 2002, 2003, -@c 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/debugging @node Debugging, Read and Print, Advising Functions, Top diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index 42f68583839..1a9ee5235a3 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/display diff --git a/doc/lispref/edebug.texi b/doc/lispref/edebug.texi index cd2c128696d..40a9f29db51 100644 --- a/doc/lispref/edebug.texi +++ b/doc/lispref/edebug.texi @@ -1,7 +1,7 @@ @comment -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1992, 1993, 1994, 1998, 1999, 2001, 2002, 2003, 2004, -@c 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @c This file can also be used by an independent Edebug User diff --git a/doc/lispref/elisp-covers.texi b/doc/lispref/elisp-covers.texi index f7d1eaae028..d37c3126a0b 100644 --- a/doc/lispref/elisp-covers.texi +++ b/doc/lispref/elisp-covers.texi @@ -1,6 +1,6 @@ \input texinfo @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @c diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi index d0297032f03..92ee8590b77 100644 --- a/doc/lispref/elisp.texi +++ b/doc/lispref/elisp.texi @@ -45,7 +45,7 @@ This is edition @value{VERSION} of the GNU Emacs Lisp Reference Manual,@* corresponding to Emacs version @value{EMACSVER}. Copyright @copyright{} 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, -1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation diff --git a/doc/lispref/errors.texi b/doc/lispref/errors.texi index 1ec1029b96d..527c3306696 100644 --- a/doc/lispref/errors.texi +++ b/doc/lispref/errors.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1999, 2001, 2002, 2003, 2004, -@c 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/errors @node Standard Errors, Standard Buffer-Local Variables, GNU Emacs Internals, Top diff --git a/doc/lispref/eval.texi b/doc/lispref/eval.texi index d5d271c1ad6..1e10b97315d 100644 --- a/doc/lispref/eval.texi +++ b/doc/lispref/eval.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1998, 2001, 2002, 2003, -@c 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/eval @node Evaluation, Control Structures, Symbols, Top diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi index e2560c2abf6..ab67e94fb6f 100644 --- a/doc/lispref/files.texi +++ b/doc/lispref/files.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/files diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi index 0c81718750a..eca5c7306f8 100644 --- a/doc/lispref/frames.texi +++ b/doc/lispref/frames.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/frames diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi index 198cc1a1ae6..c61a6cc9345 100644 --- a/doc/lispref/functions.texi +++ b/doc/lispref/functions.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/functions diff --git a/doc/lispref/hash.texi b/doc/lispref/hash.texi index 82c172c753e..c057bc53f79 100644 --- a/doc/lispref/hash.texi +++ b/doc/lispref/hash.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, -@c 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/hash @node Hash Tables, Symbols, Sequences Arrays Vectors, Top diff --git a/doc/lispref/help.texi b/doc/lispref/help.texi index f1db33582ff..eb8d24cba63 100644 --- a/doc/lispref/help.texi +++ b/doc/lispref/help.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/help @node Documentation, Files, Modes, Top diff --git a/doc/lispref/hooks.texi b/doc/lispref/hooks.texi index c76634be453..4fdbea891dc 100644 --- a/doc/lispref/hooks.texi +++ b/doc/lispref/hooks.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1998, 2001, 2002, 2003, 2004, -@c 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/hooks @node Standard Hooks, Index, Standard Keymaps, Top diff --git a/doc/lispref/internals.texi b/doc/lispref/internals.texi index 4f18c718576..0452fb6fc99 100644 --- a/doc/lispref/internals.texi +++ b/doc/lispref/internals.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1998, 1999, 2001, 2002, 2003, -@c 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/internals @node GNU Emacs Internals, Standard Errors, Tips, Top diff --git a/doc/lispref/intro.texi b/doc/lispref/intro.texi index 881ae942236..5ea45bea6ed 100644 --- a/doc/lispref/intro.texi +++ b/doc/lispref/intro.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 2001, 2002, 2003, 2004, -@c 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/intro diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi index 5befa9136dd..5e20bb4f253 100644 --- a/doc/lispref/keymaps.texi +++ b/doc/lispref/keymaps.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1998, 1999, 2000, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/keymaps diff --git a/doc/lispref/lay-flat.texi b/doc/lispref/lay-flat.texi index 56e6c47990e..53e80b94299 100644 --- a/doc/lispref/lay-flat.texi +++ b/doc/lispref/lay-flat.texi @@ -1,6 +1,6 @@ \input texinfo @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @c diff --git a/doc/lispref/lists.texi b/doc/lispref/lists.texi index 383023401ae..990ea05f61c 100644 --- a/doc/lispref/lists.texi +++ b/doc/lispref/lists.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/lists @node Lists, Sequences Arrays Vectors, Strings and Characters, Top diff --git a/doc/lispref/loading.texi b/doc/lispref/loading.texi index ca06f847fb9..c9e297b429c 100644 --- a/doc/lispref/loading.texi +++ b/doc/lispref/loading.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/loading diff --git a/doc/lispref/locals.texi b/doc/lispref/locals.texi index b35c43c7b42..f685d13c94e 100644 --- a/doc/lispref/locals.texi +++ b/doc/lispref/locals.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1999, 2001, 2002, 2003, 2004, -@c 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/locals @node Standard Buffer-Local Variables, Standard Keymaps, Standard Errors, Top diff --git a/doc/lispref/macros.texi b/doc/lispref/macros.texi index a74bcb17a52..232883b2f59 100644 --- a/doc/lispref/macros.texi +++ b/doc/lispref/macros.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 2001, 2002, -@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/macros @node Macros, Customization, Functions, Top diff --git a/doc/lispref/makefile.w32-in b/doc/lispref/makefile.w32-in index b1419d822da..b6d3f891bee 100644 --- a/doc/lispref/makefile.w32-in +++ b/doc/lispref/makefile.w32-in @@ -1,6 +1,6 @@ # -*- Makefile -*- for the GNU Emacs Lisp Reference Manual. -# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 # Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/doc/lispref/maps.texi b/doc/lispref/maps.texi index bc39a3bf2a4..d1e98eee096 100644 --- a/doc/lispref/maps.texi +++ b/doc/lispref/maps.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1999, 2001, 2002, 2003, 2004, -@c 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/maps diff --git a/doc/lispref/markers.texi b/doc/lispref/markers.texi index 3314ec25c84..bcccd0a90ff 100644 --- a/doc/lispref/markers.texi +++ b/doc/lispref/markers.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/markers @node Markers, Text, Positions, Top diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi index b2ffc5fede7..cf43881fabd 100644 --- a/doc/lispref/minibuf.texi +++ b/doc/lispref/minibuf.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, 2002, -@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/minibuf diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi index 3f3eb2cd1f6..f85c7bd5297 100644 --- a/doc/lispref/modes.texi +++ b/doc/lispref/modes.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/modes @node Modes, Documentation, Keymaps, Top diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi index b66a5446e45..7a9b2040015 100644 --- a/doc/lispref/nonascii.texi +++ b/doc/lispref/nonascii.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004, -@c 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/characters @node Non-ASCII Characters, Searching and Matching, Text, Top diff --git a/doc/lispref/numbers.texi b/doc/lispref/numbers.texi index b27d206eb49..9335e176f9b 100644 --- a/doc/lispref/numbers.texi +++ b/doc/lispref/numbers.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/numbers diff --git a/doc/lispref/objects.texi b/doc/lispref/objects.texi index 7b9603c3361..cabfdbdc41b 100644 --- a/doc/lispref/objects.texi +++ b/doc/lispref/objects.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/objects diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi index fea5e359354..85a23b273f1 100644 --- a/doc/lispref/os.texi +++ b/doc/lispref/os.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/os diff --git a/doc/lispref/positions.texi b/doc/lispref/positions.texi index 92846bf6d56..a1ef1560731 100644 --- a/doc/lispref/positions.texi +++ b/doc/lispref/positions.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/positions @node Positions, Markers, Frames, Top diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi index f3f68a79471..abf35fccd71 100644 --- a/doc/lispref/processes.texi +++ b/doc/lispref/processes.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/processes diff --git a/doc/lispref/searching.texi b/doc/lispref/searching.texi index 360ee1e9ae8..abab468c82d 100644 --- a/doc/lispref/searching.texi +++ b/doc/lispref/searching.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/searching diff --git a/doc/lispref/sequences.texi b/doc/lispref/sequences.texi index 81a0c6b952e..6575f8bb9d2 100644 --- a/doc/lispref/sequences.texi +++ b/doc/lispref/sequences.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/sequences diff --git a/doc/lispref/streams.texi b/doc/lispref/streams.texi index 39943372e2c..6fc2c0c773b 100644 --- a/doc/lispref/streams.texi +++ b/doc/lispref/streams.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1998, 1999, 2001, 2002, -@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/streams @node Read and Print, Minibuffers, Debugging, Top diff --git a/doc/lispref/strings.texi b/doc/lispref/strings.texi index 87b9f4368fb..50ca4f639b4 100644 --- a/doc/lispref/strings.texi +++ b/doc/lispref/strings.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/strings diff --git a/doc/lispref/symbols.texi b/doc/lispref/symbols.texi index 257a2a4c9ac..561242d58e1 100644 --- a/doc/lispref/symbols.texi +++ b/doc/lispref/symbols.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/symbols @node Symbols, Evaluation, Hash Tables, Top diff --git a/doc/lispref/syntax.texi b/doc/lispref/syntax.texi index 0a5c9da1b7f..2ac20707444 100644 --- a/doc/lispref/syntax.texi +++ b/doc/lispref/syntax.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/syntax diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi index f4dce6a1bc6..4f39a8f6ca2 100644 --- a/doc/lispref/text.texi +++ b/doc/lispref/text.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/text diff --git a/doc/lispref/tindex.pl b/doc/lispref/tindex.pl index b1c65fcf2ce..6648f5cf69c 100755 --- a/doc/lispref/tindex.pl +++ b/doc/lispref/tindex.pl @@ -1,7 +1,7 @@ #! /usr/bin/perl # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -# 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/doc/lispref/tips.texi b/doc/lispref/tips.texi index 9be6c061bf1..fe5e316924a 100644 --- a/doc/lispref/tips.texi +++ b/doc/lispref/tips.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1995, 1998, 1999, 2001, 2002, -@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/tips diff --git a/doc/lispref/two-volume-cross-refs.txt b/doc/lispref/two-volume-cross-refs.txt index e8ec103f61c..ff5a42c2e76 100644 --- a/doc/lispref/two-volume-cross-refs.txt +++ b/doc/lispref/two-volume-cross-refs.txt @@ -1,4 +1,4 @@ -Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See end for copying conditions. diff --git a/doc/lispref/two-volume.make b/doc/lispref/two-volume.make index edd23050287..3aa76c1c9bd 100644 --- a/doc/lispref/two-volume.make +++ b/doc/lispref/two-volume.make @@ -1,4 +1,4 @@ -# Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. # See end for copying conditions. # although it would be nice to use tex rather than pdftex to avoid diff --git a/doc/lispref/two.el b/doc/lispref/two.el index 339ec299dd4..237c408c915 100644 --- a/doc/lispref/two.el +++ b/doc/lispref/two.el @@ -1,6 +1,6 @@ ;; Auxiliary functions for preparing a two volume manual. -;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 ;; Free Software Foundation, Inc. ;; --rjc 30mar92 diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi index c4f091484e6..7e9a8187a72 100644 --- a/doc/lispref/variables.texi +++ b/doc/lispref/variables.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, -@c 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/variables diff --git a/doc/lispref/vol1.texi b/doc/lispref/vol1.texi index d6bc4538adb..a62d8bd7961 100644 --- a/doc/lispref/vol1.texi +++ b/doc/lispref/vol1.texi @@ -2,7 +2,7 @@ @c This file is used for printing the GNU Emacs Lisp Reference Manual @c in two volumes. It is a modified version of elisp.texi. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c %**start of header @setfilename elisp @@ -69,7 +69,7 @@ This is edition @value{VERSION} of the GNU Emacs Lisp Reference Manual,@* corresponding to Emacs version @value{EMACSVER}. Copyright @copyright{} 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, -1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation diff --git a/doc/lispref/vol2.texi b/doc/lispref/vol2.texi index 6f7507eb40c..788ea5a2ee4 100644 --- a/doc/lispref/vol2.texi +++ b/doc/lispref/vol2.texi @@ -2,7 +2,7 @@ @c This file is used for printing the GNU Emacs Lisp Reference Manual @c in two volumes. It is a modified version of elisp.texi. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c %**start of header @setfilename elisp @@ -69,7 +69,7 @@ This is edition @value{VERSION} of the GNU Emacs Lisp Reference Manual,@* corresponding to Emacs version @value{EMACSVER}. Copyright @copyright{} 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, -1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi index ee9d1a8374e..51fc5063ded 100644 --- a/doc/lispref/windows.texi +++ b/doc/lispref/windows.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/windows diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog index 394d580c1c9..82afe511cf3 100644 --- a/doc/man/ChangeLog +++ b/doc/man/ChangeLog @@ -102,7 +102,7 @@ ;; add-log-time-zone-rule: t ;; End: - Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. + Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/doc/man/b2m.1 b/doc/man/b2m.1 index e777ec43468..55567b9c104 100644 --- a/doc/man/b2m.1 +++ b/doc/man/b2m.1 @@ -45,7 +45,7 @@ according to the GNU coding standards. Copyright .if t \(co .if n (C) -2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. .PP Permission is granted to make and distribute verbatim copies of this document provided the copyright notice and this permission notice are diff --git a/doc/man/ebrowse.1 b/doc/man/ebrowse.1 index 5481a497809..f6d90fd6ed6 100644 --- a/doc/man/ebrowse.1 +++ b/doc/man/ebrowse.1 @@ -85,7 +85,7 @@ was written by Gerd Moellmann. Copyright .if t \(co .if n (C) -2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. .PP Permission is granted to make and distribute verbatim copies of this document provided the copyright notice and this permission notice are diff --git a/doc/man/emacs.1 b/doc/man/emacs.1 index fddef64571c..432d082b96d 100644 --- a/doc/man/emacs.1 +++ b/doc/man/emacs.1 @@ -643,7 +643,7 @@ Copyright .if t \(co .if n (C) 1995, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, -2009, 2010, 2011 +2009, 2010, 2011, 2012 Free Software Foundation, Inc. .PP Permission is granted to make and distribute verbatim copies of this diff --git a/doc/man/grep-changelog.1 b/doc/man/grep-changelog.1 index 8161b09bcba..fc699565e2a 100644 --- a/doc/man/grep-changelog.1 +++ b/doc/man/grep-changelog.1 @@ -62,7 +62,7 @@ Display basic usage information. Copyright .if t \(co .if n (C) -2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. .PP Permission is granted to make and distribute verbatim copies of this document provided the copyright notice and this permission notice are diff --git a/doc/man/rcs-checkin.1 b/doc/man/rcs-checkin.1 index f50d74dacd5..6f944af7334 100644 --- a/doc/man/rcs-checkin.1 +++ b/doc/man/rcs-checkin.1 @@ -69,7 +69,7 @@ by Eric S. Raymond. Copyright .if t \(co .if n (C) -2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. .PP Permission is granted to make and distribute verbatim copies of this document provided the copyright notice and this permission notice are diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 6c9557cb0ee..90ee930650d 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -6816,7 +6816,7 @@ ;; End: Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, - 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. + 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in index 9e93be4e134..201428e4f16 100644 --- a/doc/misc/Makefile.in +++ b/doc/misc/Makefile.in @@ -1,7 +1,7 @@ #### Makefile for documentation other than the Emacs manual. # Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, -# 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/doc/misc/ada-mode.texi b/doc/misc/ada-mode.texi index 9f4fd44f467..57182e95346 100644 --- a/doc/misc/ada-mode.texi +++ b/doc/misc/ada-mode.texi @@ -4,7 +4,7 @@ @copying Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, -2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/auth.texi b/doc/misc/auth.texi index 5c555e81a78..30973d35153 100644 --- a/doc/misc/auth.texi +++ b/doc/misc/auth.texi @@ -7,7 +7,7 @@ @copying This file describes the Emacs auth-source library. -Copyright @copyright{} 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright @copyright{} 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/autotype.texi b/doc/misc/autotype.texi index 7f9dd0daa02..52fb4399bfa 100644 --- a/doc/misc/autotype.texi +++ b/doc/misc/autotype.texi @@ -11,7 +11,7 @@ @copying Copyright @copyright{} 1994, 1995, 1999, 2001, 2002, 2003, 2004, 2005, -2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi index 0a595d90b80..e08cdfb5949 100644 --- a/doc/misc/calc.texi +++ b/doc/misc/calc.texi @@ -93,7 +93,7 @@ This file documents Calc, the GNU Emacs calculator, included with GNU Emacs 23.3 @end ifnotinfo Copyright @copyright{} 1990, 1991, 2001, 2002, 2003, 2004, -2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi index 4b56e072264..e2be356db87 100644 --- a/doc/misc/cc-mode.texi +++ b/doc/misc/cc-mode.texi @@ -160,7 +160,7 @@ CC Mode This manual is for CC Mode in Emacs. Copyright @copyright{} 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/cl.texi b/doc/misc/cl.texi index 6bdc494a1a5..120aa68ddc2 100644 --- a/doc/misc/cl.texi +++ b/doc/misc/cl.texi @@ -6,7 +6,7 @@ This file documents the GNU Emacs Common Lisp emulation package. Copyright @copyright{} 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi index b34a25b64f8..e8d30aac479 100644 --- a/doc/misc/dbus.texi +++ b/doc/misc/dbus.texi @@ -6,7 +6,7 @@ @c %**end of header @copying -Copyright @copyright{} 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright @copyright{} 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/dired-x.texi b/doc/misc/dired-x.texi index 2a49390041a..a9a1f02d8d1 100644 --- a/doc/misc/dired-x.texi +++ b/doc/misc/dired-x.texi @@ -18,7 +18,7 @@ @copying Copyright @copyright{} 1994, 1995, 1999, 2001, 2002, 2003, 2004, -2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/ebrowse.texi b/doc/misc/ebrowse.texi index 58b04dc7b83..cd4ac7d5274 100644 --- a/doc/misc/ebrowse.texi +++ b/doc/misc/ebrowse.texi @@ -11,7 +11,7 @@ This file documents Ebrowse, a C++ class browser for GNU Emacs. Copyright @copyright{} 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/ede.texi b/doc/misc/ede.texi index 57dc01d9fef..63b1ce4821b 100644 --- a/doc/misc/ede.texi +++ b/doc/misc/ede.texi @@ -6,7 +6,7 @@ This file describes EDE, the Emacs Development Environment. Copyright @copyright{} 1998, 1999, 2000, 2001, 2004, 2005, 2008, 2009, -2010, 2011 Free Software Foundation, Inc. +2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi index 8774fae5067..0c32fa59be4 100644 --- a/doc/misc/ediff.texi +++ b/doc/misc/ediff.texi @@ -26,7 +26,7 @@ This file documents Ediff, a comprehensive visual interface to Unix diff and patch utilities. Copyright @copyright{} 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/edt.texi b/doc/misc/edt.texi index 68c2db73361..361ebb7d2a3 100644 --- a/doc/misc/edt.texi +++ b/doc/misc/edt.texi @@ -6,7 +6,7 @@ This file documents the EDT emulation package for Emacs. Copyright @copyright{} 1986, 1992, 1994, 1995, 1999, 2000, 2001, 2002, -2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/eieio.texi b/doc/misc/eieio.texi index f36efff3a07..b1ef64227da 100644 --- a/doc/misc/eieio.texi +++ b/doc/misc/eieio.texi @@ -11,7 +11,7 @@ @copying This manual documents EIEIO, an object framework for Emacs Lisp. -Copyright @copyright{} 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright @copyright{} 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/emacs-mime.texi b/doc/misc/emacs-mime.texi index 6121f1afd75..9479d92593b 100644 --- a/doc/misc/emacs-mime.texi +++ b/doc/misc/emacs-mime.texi @@ -10,7 +10,7 @@ This file documents the Emacs MIME interface functionality. Copyright @copyright{} 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, -2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/epa.texi b/doc/misc/epa.texi index e6402fb83f5..dcb1a70f152 100644 --- a/doc/misc/epa.texi +++ b/doc/misc/epa.texi @@ -9,7 +9,7 @@ @copying This file describes EasyPG Assistant @value{VERSION}. -Copyright @copyright{} 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright @copyright{} 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi index aa7cb893fd7..d3cb6b69df8 100644 --- a/doc/misc/erc.texi +++ b/doc/misc/erc.texi @@ -8,7 +8,7 @@ @copying This manual is for ERC version 5.3. -Copyright @copyright{} 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright @copyright{} 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi index 25ba50d616e..e05048cb6b5 100644 --- a/doc/misc/eshell.texi +++ b/doc/misc/eshell.texi @@ -9,7 +9,7 @@ This manual is for Eshell, the Emacs shell. Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, -2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/eudc.texi b/doc/misc/eudc.texi index cf40bcce73d..56e12f4ae2d 100644 --- a/doc/misc/eudc.texi +++ b/doc/misc/eudc.texi @@ -13,7 +13,7 @@ directory servers using various protocols such as LDAP or the CCSO white pages directory system (PH/QI) Copyright @copyright{} 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006, -2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/faq.texi b/doc/misc/faq.texi index ae2d0867fd3..55e27fa3952 100644 --- a/doc/misc/faq.texi +++ b/doc/misc/faq.texi @@ -13,7 +13,7 @@ @copying Copyright @copyright{} 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, -2009, 2010, 2011 Free Software Foundation, Inc.@* +2009, 2010, 2011, 2012 Free Software Foundation, Inc.@* Copyright @copyright{} 1994, 1995, 1996, 1997, 1998, 1999, 2000 Reuven M. Lerner@* Copyright @copyright{} 1992, 1993 Steven Byrnes@* diff --git a/doc/misc/flymake.texi b/doc/misc/flymake.texi index 75a660f040e..0effb8b7909 100644 --- a/doc/misc/flymake.texi +++ b/doc/misc/flymake.texi @@ -11,7 +11,7 @@ This manual is for GNU Flymake (version @value{VERSION}, @value{UPDATED}), which is a universal on-the-fly syntax checker for GNU Emacs. -Copyright @copyright{} 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright @copyright{} 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/forms.texi b/doc/misc/forms.texi index 1ac00e6ace4..0ee861599e7 100644 --- a/doc/misc/forms.texi +++ b/doc/misc/forms.texi @@ -19,7 +19,7 @@ This file documents Forms mode, a form-editing major mode for GNU Emacs. Copyright @copyright{} 1989, 1997, 2001, 2002, 2003, 2004, -2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/gnus-coding.texi b/doc/misc/gnus-coding.texi index 666a99fc48a..a28c4cdf375 100644 --- a/doc/misc/gnus-coding.texi +++ b/doc/misc/gnus-coding.texi @@ -7,7 +7,7 @@ @syncodeindex pg cp @copying -Copyright @copyright{} 2004, 2005, 2007, 2008, 2009, 2010, 2011 Free Software +Copyright @copyright{} 2004, 2005, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/gnus-faq.texi b/doc/misc/gnus-faq.texi index d224d36fcda..7eedac3c75f 100644 --- a/doc/misc/gnus-faq.texi +++ b/doc/misc/gnus-faq.texi @@ -2,7 +2,7 @@ @c Uncomment 1st line before texing this file alone. @c %**start of header @c Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, -@c 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c @c Do not modify this file, it was generated from gnus-faq.xml, available from @c . diff --git a/doc/misc/gnus-news.el b/doc/misc/gnus-news.el index 5939773805a..3f48dd4a251 100644 --- a/doc/misc/gnus-news.el +++ b/doc/misc/gnus-news.el @@ -1,5 +1,5 @@ ;;; gnus-news.el --- a hack to create GNUS-NEWS from texinfo source -;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. ;; Author: Reiner Steib ;; Keywords: tools @@ -27,7 +27,7 @@ "GNUS NEWS -- history of user-visible changes. Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, - 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. + 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. Please send Gnus bug reports to bugs@gnus.org. diff --git a/doc/misc/gnus-news.texi b/doc/misc/gnus-news.texi index 4e4480689a3..6960520ed8d 100644 --- a/doc/misc/gnus-news.texi +++ b/doc/misc/gnus-news.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- -@c Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c Permission is granted to anyone to make or distribute verbatim copies @c of this document as received, in any medium, provided that the diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index a3b5ddde4a1..5dc768eb411 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -10,7 +10,7 @@ @copying Copyright @copyright{} 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/idlwave.texi b/doc/misc/idlwave.texi index 54088cef210..c7e5683cba4 100644 --- a/doc/misc/idlwave.texi +++ b/doc/misc/idlwave.texi @@ -23,7 +23,7 @@ This is edition @value{EDITION} of the IDLWAVE User Manual for IDLWAVE @value{VERSION}. Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, -2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/info.texi b/doc/misc/info.texi index 03b9b64a395..a398a5c97f4 100644 --- a/doc/misc/info.texi +++ b/doc/misc/info.texi @@ -15,7 +15,7 @@ This file describes how to use Info, the on-line, menu-driven GNU documentation system. Copyright @copyright{} 1989, 1992, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/mairix-el.texi b/doc/misc/mairix-el.texi index ff5cd922ea9..6d1760b8b5b 100644 --- a/doc/misc/mairix-el.texi +++ b/doc/misc/mairix-el.texi @@ -6,7 +6,7 @@ @documentencoding ISO-8859-1 @copying -Copyright @copyright{} 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright @copyright{} 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/makefile.w32-in b/doc/misc/makefile.w32-in index 942847976e7..e9230b58ba8 100644 --- a/doc/misc/makefile.w32-in +++ b/doc/misc/makefile.w32-in @@ -1,6 +1,6 @@ #### -*- Makefile -*- for documentation other than the Emacs manual. -# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 # Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/doc/misc/message.texi b/doc/misc/message.texi index cc174333261..dfa22d8908e 100644 --- a/doc/misc/message.texi +++ b/doc/misc/message.texi @@ -9,7 +9,7 @@ This file documents Message, the Emacs message composition mode. Copyright @copyright{} 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, -2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/mh-e.texi b/doc/misc/mh-e.texi index 17594701997..f5d8c700adf 100644 --- a/doc/misc/mh-e.texi +++ b/doc/misc/mh-e.texi @@ -25,7 +25,7 @@ This is version @value{VERSION}@value{EDITION} of @cite{The MH-E Manual}, last updated @value{UPDATED}. Copyright @copyright{} 1995, 2001, 2002, 2003, 2005, 2006, 2007, 2008, - 2009, 2010, 2011 Free Software Foundation, Inc. + 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c This dual license has been agreed upon by the FSF. diff --git a/doc/misc/newsticker.texi b/doc/misc/newsticker.texi index f01fe23a6eb..b35582cdab4 100644 --- a/doc/misc/newsticker.texi +++ b/doc/misc/newsticker.texi @@ -13,7 +13,7 @@ This manual is for Newsticker (version @value{VERSION}, @value{UPDATED}). @noindent -Copyright @copyright{} 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright @copyright{} 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/nxml-mode.texi b/doc/misc/nxml-mode.texi index 9ed8bcf88d0..fda1325d549 100644 --- a/doc/misc/nxml-mode.texi +++ b/doc/misc/nxml-mode.texi @@ -8,7 +8,7 @@ This manual documents nxml-mode, an Emacs major mode for editing XML with RELAX NG support. -Copyright @copyright{} 2007, 2008, 2009, 2010, 2011 +Copyright @copyright{} 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/org.texi b/doc/misc/org.texi index b42de909d08..14ad5fa07f9 100644 --- a/doc/misc/org.texi +++ b/doc/misc/org.texi @@ -45,7 +45,8 @@ e.g., @copying This manual is for Org version @value{VERSION}. -Copyright @copyright{} 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation +Copyright @copyright{} 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/pcl-cvs.texi b/doc/misc/pcl-cvs.texi index e466a3bec8f..07777224746 100644 --- a/doc/misc/pcl-cvs.texi +++ b/doc/misc/pcl-cvs.texi @@ -7,7 +7,7 @@ @copying Copyright @copyright{} 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, -1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/pgg.texi b/doc/misc/pgg.texi index daef19a01b5..f8db883bcdb 100644 --- a/doc/misc/pgg.texi +++ b/doc/misc/pgg.texi @@ -9,7 +9,7 @@ This file describes PGG @value{VERSION}, an Emacs interface to various PGP implementations. Copyright @copyright{} 2001, 2003, 2004, 2005, 2006, 2007, 2008, 2009, -2010, 2011 Free Software Foundation, Inc. +2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/rcirc.texi b/doc/misc/rcirc.texi index c8c341534fe..941aab559a8 100644 --- a/doc/misc/rcirc.texi +++ b/doc/misc/rcirc.texi @@ -5,7 +5,7 @@ @c %**end of header @copying -Copyright @copyright{} 2006, 2007, 2008, 2009, 2010, 2011 +Copyright @copyright{} 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/reftex.texi b/doc/misc/reftex.texi index c5cb511c06d..0ac407fabf2 100644 --- a/doc/misc/reftex.texi +++ b/doc/misc/reftex.texi @@ -28,7 +28,7 @@ This is edition @value{EDITION} of the @b{Ref@TeX{}} User Manual for @b{Ref@TeX{}} @value{VERSION} Copyright @copyright{} 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/remember.texi b/doc/misc/remember.texi index bdaf4750d97..de27e5bfad8 100644 --- a/doc/misc/remember.texi +++ b/doc/misc/remember.texi @@ -8,7 +8,7 @@ @copying This manual is for Remember Mode, version 1.9 -Copyright @copyright{} 2001, 2004, 2005, 2007, 2008, 2009, 2010, 2011 +Copyright @copyright{} 2001, 2004, 2005, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/sasl.texi b/doc/misc/sasl.texi index a75f2d80f64..7e369788390 100644 --- a/doc/misc/sasl.texi +++ b/doc/misc/sasl.texi @@ -7,7 +7,7 @@ @copying This file describes the Emacs SASL library, version @value{VERSION}. -Copyright @copyright{} 2000, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright @copyright{} 2000, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/sc.texi b/doc/misc/sc.texi index d4f45fb6b93..5b20f6d241c 100644 --- a/doc/misc/sc.texi +++ b/doc/misc/sc.texi @@ -15,7 +15,7 @@ This document describes Supercite, an Emacs package for citing and attributing replies to mail and news messages. Copyright @copyright{} 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/sem-user.texi b/doc/misc/sem-user.texi index f986c0fd452..c325f342daf 100644 --- a/doc/misc/sem-user.texi +++ b/doc/misc/sem-user.texi @@ -1,7 +1,7 @@ @c This file is included by semantic.texi @c Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2009, -@c 2010, 2011 Free Software Foundation, Inc. +@c 2010, 2011, 2012 Free Software Foundation, Inc. @c Permission is granted to copy, distribute and/or modify this @c document under the terms of the GNU Free Documentation License, diff --git a/doc/misc/semantic.texi b/doc/misc/semantic.texi index 97f9bc21e80..3bc492cc9ba 100644 --- a/doc/misc/semantic.texi +++ b/doc/misc/semantic.texi @@ -25,7 +25,7 @@ This manual documents the Semantic library and utilities. Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, -2009, 2010, 2011 Free Software Foundation, Inc. +2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/ses.texi b/doc/misc/ses.texi index 6a1cbe6203c..01d11fec052 100644 --- a/doc/misc/ses.texi +++ b/doc/misc/ses.texi @@ -12,7 +12,7 @@ This file documents SES: the Simple Emacs Spreadsheet. Copyright @copyright{} 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, -2010, 2011 Free Software Foundation, Inc. +2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/sieve.texi b/doc/misc/sieve.texi index 139d0fa77dd..d02dfe344fb 100644 --- a/doc/misc/sieve.texi +++ b/doc/misc/sieve.texi @@ -9,7 +9,7 @@ This file documents the Emacs Sieve package, for server-side mail filtering. Copyright @copyright{} 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, -2009, 2010, 2011 Free Software Foundation, Inc. +2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/smtpmail.texi b/doc/misc/smtpmail.texi index 40dcf6bc926..b3cf3afda77 100644 --- a/doc/misc/smtpmail.texi +++ b/doc/misc/smtpmail.texi @@ -3,7 +3,7 @@ @settitle Emacs SMTP Library @syncodeindex vr fn @copying -Copyright @copyright{} 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright @copyright{} 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/speedbar.texi b/doc/misc/speedbar.texi index 3e0373d0440..56157a8bad0 100644 --- a/doc/misc/speedbar.texi +++ b/doc/misc/speedbar.texi @@ -5,7 +5,7 @@ @copying Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, -2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index 542e649aeab..00b5dd8d688 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -38,7 +38,7 @@ @copying Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi index 6e0674c4cb3..d53e1489c97 100644 --- a/doc/misc/trampver.texi +++ b/doc/misc/trampver.texi @@ -3,7 +3,7 @@ @c This is part of the Emacs manual. @c Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -@c 2011 Free Software Foundation, Inc. +@c 2011, 2012 Free Software Foundation, Inc. @c See file doclicense.texi for copying conditions. @c In the Tramp CVS, the version number is auto-frobbed from diff --git a/doc/misc/url.texi b/doc/misc/url.texi index 7e65e5c8675..1683bac39e2 100644 --- a/doc/misc/url.texi +++ b/doc/misc/url.texi @@ -21,7 +21,7 @@ This file documents the Emacs Lisp URL loading package. Copyright @copyright{} 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2002, -2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/vip.texi b/doc/misc/vip.texi index 539f6fe2c35..ab6f9a63869 100644 --- a/doc/misc/vip.texi +++ b/doc/misc/vip.texi @@ -4,7 +4,7 @@ @copying Copyright @copyright{} 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/viper.texi b/doc/misc/viper.texi index 0482f78ba15..ad9fb20dd83 100644 --- a/doc/misc/viper.texi +++ b/doc/misc/viper.texi @@ -8,7 +8,7 @@ @copying Copyright @copyright{} 1995, 1996, 1997, 2001, 2002, 2003, 2004, -2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/widget.texi b/doc/misc/widget.texi index ac111870f3e..52b9bea42cb 100644 --- a/doc/misc/widget.texi +++ b/doc/misc/widget.texi @@ -9,7 +9,7 @@ @copying Copyright @copyright{} 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/woman.texi b/doc/misc/woman.texi index 975a9c408fc..b50464a177c 100644 --- a/doc/misc/woman.texi +++ b/doc/misc/woman.texi @@ -19,7 +19,7 @@ This file documents WoMan: A program to browse Unix manual pages `W.O. (without) man'. Copyright @copyright{} 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, -2009, 2010, 2011 Free Software Foundation, Inc. +2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/etc/CONTRIBUTE b/etc/CONTRIBUTE index 404077258b6..dc429ecb62c 100644 --- a/etc/CONTRIBUTE +++ b/etc/CONTRIBUTE @@ -1,4 +1,4 @@ -Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See end for license conditions. diff --git a/etc/ChangeLog b/etc/ChangeLog index 37d3ebeafff..8854fea58b8 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -5012,7 +5012,7 @@ ;; End: Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, - 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 + 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/etc/DEBUG b/etc/DEBUG index 18a5005c5a1..0d777077f80 100644 --- a/etc/DEBUG +++ b/etc/DEBUG @@ -1,7 +1,7 @@ Debugging GNU Emacs Copyright (C) 1985, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, - 2008, 2009, 2010, 2011 Free Software Foundation, Inc. + 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/etc/DISTRIB b/etc/DISTRIB index 6fc09e3472d..7b96ecdd4b9 100644 --- a/etc/DISTRIB +++ b/etc/DISTRIB @@ -3,7 +3,7 @@ Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1995, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, - 2010, 2011 Free Software Foundation, Inc. + 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS index 127bb71098f..3edf79ee750 100644 --- a/etc/ERC-NEWS +++ b/etc/ERC-NEWS @@ -1,6 +1,6 @@ ERC NEWS -*- outline -*- -Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. * Changes in ERC 5.3 diff --git a/etc/ETAGS.EBNF b/etc/ETAGS.EBNF index a112a6bb1c2..667061264db 100644 --- a/etc/ETAGS.EBNF +++ b/etc/ETAGS.EBNF @@ -94,7 +94,7 @@ those. ===================== end of discussion of tag names ===================== -Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. COPYING PERMISSIONS: diff --git a/etc/ETAGS.README b/etc/ETAGS.README index ef4ef952b61..9549ed3a28f 100644 --- a/etc/ETAGS.README +++ b/etc/ETAGS.README @@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Copyright (C) 1984, 1987, 1988, 1989, 1993, 1994, 1995, 1998, 1999, - 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 + 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. This file is not considered part of GNU Emacs. diff --git a/etc/GNU b/etc/GNU index 08c4abc2341..8d008ecd878 100644 --- a/etc/GNU +++ b/etc/GNU @@ -1,5 +1,5 @@ Copyright (C) 1985, 1993, 2001, 2002, 2003, 2004, - 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. + 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. Permission is granted to anyone to make or distribute verbatim copies of this document, in any medium, provided that the copyright notice and diff --git a/etc/GNUS-NEWS b/etc/GNUS-NEWS index dcf378a1af1..d5e8050adfe 100644 --- a/etc/GNUS-NEWS +++ b/etc/GNUS-NEWS @@ -1,7 +1,7 @@ GNUS NEWS -- history of user-visible changes. Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, - 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. + 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. Please send Gnus bug reports to bugs@gnus.org. diff --git a/etc/HELLO b/etc/HELLO index b1bfda34336..be14c4fd139 100644 --- a/etc/HELLO +++ b/etc/HELLO @@ -72,7 +72,7 @@ Korean ($(CGQ1[(B) $(C>H3gGO<H3gGO=J4O1n(B -Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/etc/MACHINES b/etc/MACHINES index 6075e01cbc2..ed56353b288 100644 --- a/etc/MACHINES +++ b/etc/MACHINES @@ -1,7 +1,7 @@ Emacs machines list Copyright (C) 1989, 1990, 1992, 1993, 1998, 2001, 2002, 2003, 2004, - 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. + 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. This is a list of the status of GNU Emacs on various machines and systems. diff --git a/etc/MAILINGLISTS b/etc/MAILINGLISTS index da6b147e1de..ea311e6b793 100644 --- a/etc/MAILINGLISTS +++ b/etc/MAILINGLISTS @@ -318,7 +318,7 @@ mode: outline fill-column: 72 End: -Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. Permission is hereby granted, free of charge, to any person obtaining diff --git a/etc/MH-E-NEWS b/etc/MH-E-NEWS index e70f994ee62..73df347ce97 100644 --- a/etc/MH-E-NEWS +++ b/etc/MH-E-NEWS @@ -1,7 +1,7 @@ * COPYRIGHT Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, - 2010, 2011 Free Software Foundation, Inc. + 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/etc/MORE.STUFF b/etc/MORE.STUFF index 95ebedbcacd..6a7c6e67562 100644 --- a/etc/MORE.STUFF +++ b/etc/MORE.STUFF @@ -1,7 +1,7 @@ More Neat Stuff for your Emacs Copyright (C) 1993, 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, - 2009, 2010, 2011 Free Software Foundation, Inc. + 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. This file describes GNU Emacs programs and resources that are diff --git a/etc/NEWS b/etc/NEWS index bee994cfb0f..35a0486dfa2 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -1,6 +1,6 @@ GNU Emacs NEWS -- history of user-visible changes. -Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. Please send Emacs bug reports to bug-gnu-emacs@gnu.org. diff --git a/etc/NEWS.1-17 b/etc/NEWS.1-17 index 30863639066..0a80679243f 100644 --- a/etc/NEWS.1-17 +++ b/etc/NEWS.1-17 @@ -1,6 +1,6 @@ GNU Emacs NEWS -- history of user-visible changes. 26-Mar-1986 -Copyright (C) 1985, 1986, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright (C) 1985, 1986, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/etc/NEWS.18 b/etc/NEWS.18 index bbee5562ac6..36501e3d62b 100644 --- a/etc/NEWS.18 +++ b/etc/NEWS.18 @@ -1,6 +1,6 @@ GNU Emacs NEWS -- history of user-visible changes. 17-Aug-1988 -Copyright (C) 1988, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright (C) 1988, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/etc/NEWS.19 b/etc/NEWS.19 index 347d2812600..3657f465140 100644 --- a/etc/NEWS.19 +++ b/etc/NEWS.19 @@ -1,6 +1,6 @@ GNU Emacs NEWS -- history of user-visible changes. 1992. -Copyright (C) 1993, 1994, 1995, 2001, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 1993, 1994, 1995, 2001, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/etc/NEWS.20 b/etc/NEWS.20 index 7bbfa63337c..1b166995fb6 100644 --- a/etc/NEWS.20 +++ b/etc/NEWS.20 @@ -1,6 +1,6 @@ GNU Emacs NEWS -- history of user-visible changes. 2006-05-31 -Copyright (C) 1999, 2000, 2001, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 1999, 2000, 2001, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/etc/NEWS.21 b/etc/NEWS.21 index 537d4211da9..dbe1bcd0728 100644 --- a/etc/NEWS.21 +++ b/etc/NEWS.21 @@ -1,6 +1,6 @@ GNU Emacs NEWS -- history of user-visible changes. 2006-05-31 -Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/etc/NEWS.22 b/etc/NEWS.22 index cba39763c30..01dd08d9342 100644 --- a/etc/NEWS.22 +++ b/etc/NEWS.22 @@ -1,6 +1,6 @@ GNU Emacs NEWS -- history of user-visible changes. -Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/etc/PROBLEMS b/etc/PROBLEMS index b419e409e2b..1cc333e7305 100644 --- a/etc/PROBLEMS +++ b/etc/PROBLEMS @@ -1,7 +1,7 @@ Known Problems with GNU Emacs Copyright (C) 1987, 1988, 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 + 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/etc/README b/etc/README index 95779319ca2..cb833ec28fb 100644 --- a/etc/README +++ b/etc/README @@ -9,6 +9,6 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES File: emacs.icon Author: Sun Microsystems, Inc - Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 + Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) diff --git a/etc/TERMS b/etc/TERMS index 653963b23f2..e7cdfab81f9 100644 --- a/etc/TERMS +++ b/etc/TERMS @@ -1,4 +1,4 @@ -Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for copying permissions. diff --git a/etc/TODO b/etc/TODO index 4bd8cacda67..c4e07f3d062 100644 --- a/etc/TODO +++ b/etc/TODO @@ -1,6 +1,6 @@ Emacs TODO List -*-outline-*- -Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/etc/charsets/README b/etc/charsets/README index e9819ae2f34..3f10193e1d4 100644 --- a/etc/charsets/README +++ b/etc/charsets/README @@ -1,8 +1,8 @@ # README file for charset mapping files in this directory. -# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 # National Institute of Advanced Industrial Science and Technology (AIST) # Registration Number H13PRO009 -# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 # Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/etc/compilation.txt b/etc/compilation.txt index 1c5ae4f871e..92aa230997c 100644 --- a/etc/compilation.txt +++ b/etc/compilation.txt @@ -466,7 +466,7 @@ Compilation segmentation fault at Thu Jul 13 10:55:49 Compilation finished at Thu Jul 21 15:02:15 -Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. COPYING PERMISSIONS: diff --git a/etc/edt-user.el b/etc/edt-user.el index 5abf74b5808..ce617252e52 100644 --- a/etc/edt-user.el +++ b/etc/edt-user.el @@ -1,7 +1,7 @@ ;;; edt-user.el --- Sample user customizations for Emacs EDT emulation ;; Copyright (C) 1986, 1992, 1993, 2000, 2001, 2002, 2003, 2004, 2005, -;; 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +;; 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. ;; Author: Kevin Gallagher ;; Maintainer: Kevin Gallagher diff --git a/etc/emacs-buffer.gdb b/etc/emacs-buffer.gdb index ed9169a8e3c..38bffbe8ff2 100644 --- a/etc/emacs-buffer.gdb +++ b/etc/emacs-buffer.gdb @@ -1,6 +1,6 @@ # emacs-buffer.gdb --- gdb macros for recovering buffers from emacs coredumps -# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. # Maintainer: Noah Friedman # Status: Works with Emacs 22.0.51.1 (prerelease) as of 2006-01-12. diff --git a/etc/emacs.bash b/etc/emacs.bash index cfe07c9610b..c8017f82565 100644 --- a/etc/emacs.bash +++ b/etc/emacs.bash @@ -1,6 +1,6 @@ ### emacs.bash --- contact/resume an existing Emacs, or start a new one -## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 ## Free Software Foundation, Inc. ## Author: Noah Friedman diff --git a/etc/emacs2.py b/etc/emacs2.py index 02c12747296..388e2d3e03f 100644 --- a/etc/emacs2.py +++ b/etc/emacs2.py @@ -1,6 +1,6 @@ """Definitions used by commands sent to inferior Python in python.el.""" -# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. # Author: Dave Love # This file is part of GNU Emacs. diff --git a/etc/emacs3.py b/etc/emacs3.py index 778be1c01f6..07b15cddbe1 100644 --- a/etc/emacs3.py +++ b/etc/emacs3.py @@ -1,4 +1,4 @@ -# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. # Author: Dave Love # This file is part of GNU Emacs. diff --git a/etc/enriched.doc b/etc/enriched.doc index 97e90daea98..bf4e430894e 100644 --- a/etc/enriched.doc +++ b/etc/enriched.doc @@ -256,7 +256,7 @@ bug reports are welcome. -Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. COPYING PERMISSIONS: diff --git a/etc/gnus-tut.txt b/etc/gnus-tut.txt index bb801054f44..96e04e2d172 100644 --- a/etc/gnus-tut.txt +++ b/etc/gnus-tut.txt @@ -25,7 +25,7 @@ Ingebrigtsen. If you have a WWW browser, you can investigate to your heart's delight at . ;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -;; 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +;; 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news diff --git a/etc/grammars/bovine-grammar.el b/etc/grammars/bovine-grammar.el index ee08c84eec7..e503a86f094 100644 --- a/etc/grammars/bovine-grammar.el +++ b/etc/grammars/bovine-grammar.el @@ -1,6 +1,6 @@ ;;; bovine-grammar.el --- Bovine's input grammar mode ;; -;; Copyright (C) 2002-2011 Free Software Foundation, Inc. +;; Copyright (C) 2002-2011, 2012 Free Software Foundation, Inc. ;; ;; Author: David Ponce ;; Maintainer: David Ponce diff --git a/etc/grammars/c.by b/etc/grammars/c.by index ca54159aa57..341b430fd7e 100644 --- a/etc/grammars/c.by +++ b/etc/grammars/c.by @@ -1,6 +1,6 @@ ;;; c.by -- LL grammar for C/C++ language specification -;; Copyright (C) 1999-2011 Free Software Foundation, Inc. +;; Copyright (C) 1999-2011, 2012 Free Software Foundation, Inc. ;; ;; Author: Eric M. Ludlam ;; David Ponce diff --git a/etc/grammars/grammar.wy b/etc/grammars/grammar.wy index d1a2bf15abf..a29640ebf80 100644 --- a/etc/grammars/grammar.wy +++ b/etc/grammars/grammar.wy @@ -1,6 +1,6 @@ ;;; semantic-grammar.wy -- LALR grammar of Semantic input grammars ;; -;; Copyright (C) 2002-2011 Free Software Foundation, Inc. +;; Copyright (C) 2002-2011, 2012 Free Software Foundation, Inc. ;; ;; Author: David Ponce ;; Maintainer: David Ponce diff --git a/etc/grammars/java-tags.wy b/etc/grammars/java-tags.wy index 99d2b9df81d..34469a4118b 100644 --- a/etc/grammars/java-tags.wy +++ b/etc/grammars/java-tags.wy @@ -1,6 +1,6 @@ ;;; java-tags.wy -- Semantic LALR grammar for Java -;; Copyright (C) 2002-2011 Free Software Foundation, Inc. +;; Copyright (C) 2002-2011, 2012 Free Software Foundation, Inc. ;; ;; Author: David Ponce ;; Maintainer: David Ponce diff --git a/etc/grammars/js.wy b/etc/grammars/js.wy index f67e2813daf..b0edcb50382 100644 --- a/etc/grammars/js.wy +++ b/etc/grammars/js.wy @@ -1,7 +1,7 @@ ;;; javascript-jv.wy -- LALR grammar for Javascript -;; Copyright (C) 2005-2011 Free Software Foundation, Inc. -;; Copyright (C) 1998-2011 Ecma International. +;; Copyright (C) 2005-2011, 2012 Free Software Foundation, Inc. +;; Copyright (C) 1998-2011, 2012 Ecma International. ;; Author: Joakim Verona diff --git a/etc/grammars/make.by b/etc/grammars/make.by index dab4472b737..cad97994540 100644 --- a/etc/grammars/make.by +++ b/etc/grammars/make.by @@ -1,6 +1,6 @@ ;;; make.by -- BY notation for Makefiles. -;; Copyright (C) 1999-2011 Free Software Foundation, Inc. +;; Copyright (C) 1999-2011, 2012 Free Software Foundation, Inc. ;; ;; Author: Eric M. Ludlam ;; David Ponce diff --git a/etc/grammars/python.wy b/etc/grammars/python.wy index 44d4394f369..e632cefc660 100644 --- a/etc/grammars/python.wy +++ b/etc/grammars/python.wy @@ -1,6 +1,6 @@ ;;; python.wy -- LALR grammar for Python -;; Copyright (C) 2002-2011 Free Software Foundation, Inc. +;; Copyright (C) 2002-2011, 2012 Free Software Foundation, Inc. ;; Copyright (C) 2001-2010 Python Software Foundation ;; Author: Richard Kim diff --git a/etc/grammars/scheme.by b/etc/grammars/scheme.by index bc6612d4c70..f4b131127d6 100644 --- a/etc/grammars/scheme.by +++ b/etc/grammars/scheme.by @@ -1,6 +1,6 @@ ;;; scheme.by -- Scheme BNF language specification -;; Copyright (C) 2001-2011 Free Software Foundation, Inc. +;; Copyright (C) 2001-2011, 2012 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/etc/grammars/srecode-template.wy b/etc/grammars/srecode-template.wy index 4ff2d7e4e41..9bb572e3df9 100644 --- a/etc/grammars/srecode-template.wy +++ b/etc/grammars/srecode-template.wy @@ -1,6 +1,6 @@ ;;; srecode-template.wy --- Semantic Recoder Template parser -;; Copyright (C) 2005-2011 Free Software Foundation, Inc. +;; Copyright (C) 2005-2011, 2012 Free Software Foundation, Inc. ;; Author: Eric Ludlam ;; Keywords: syntax diff --git a/etc/grammars/wisent-grammar.el b/etc/grammars/wisent-grammar.el index 67b6032ea4e..2fbf6165100 100644 --- a/etc/grammars/wisent-grammar.el +++ b/etc/grammars/wisent-grammar.el @@ -1,6 +1,6 @@ ;;; wisent-grammar.el --- Wisent's input grammar mode -;; Copyright (C) 2002-2011 Free Software Foundation, Inc. +;; Copyright (C) 2002-2011, 2012 Free Software Foundation, Inc. ;; ;; Author: David Ponce ;; Maintainer: David Ponce @@ -471,7 +471,7 @@ Menu items are appended to the common grammar menu.") "srecode/srt-wy") ("wisent-javascript-jv-wy.el" "semantic/wisent/js-wy" - "Copyright (C) 1998-2011 Ecma International" + "Copyright (C) 1998-2011, 2012 Ecma International" ,wisent-make-parsers--ecmascript-license) ("wisent-java-tags-wy.el" "semantic/wisent/javat-wy") diff --git a/etc/grep.txt b/etc/grep.txt index 704e82260e4..4b71d4e2db3 100644 --- a/etc/grep.txt +++ b/etc/grep.txt @@ -84,7 +84,7 @@ grep -nH -e "xyzxyz" ../info/* -Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. COPYING PERMISSIONS: diff --git a/etc/images/README b/etc/images/README index 30ef4ec89e7..e340ceb7384 100644 --- a/etc/images/README +++ b/etc/images/README @@ -23,17 +23,17 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES File: mh-logo.xpm Author: Satyaki Das - Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 + Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. Files: splash.pbm, splash.xpm, gnus.pbm Author: Luis Fernandes Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, - 2010, 2011 Free Software Foundation, Inc. + 2010, 2011, 2012 Free Software Foundation, Inc. Files: splash.png, splash.svg Author: Francesc Rocher - Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc. + Copyright (C) 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. * The following icons are from GTK+ 2.x. They are not part of Emacs, but diff --git a/etc/images/custom/README b/etc/images/custom/README index d23ad572422..3a965715012 100644 --- a/etc/images/custom/README +++ b/etc/images/custom/README @@ -6,5 +6,5 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES Files: down.xpm down-pushed.xpm right.xpm right-pushed.xpm Author: Juri Linkov -Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright (C) 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) diff --git a/etc/images/ezimage/README b/etc/images/ezimage/README index 1aaa4c6de4f..a491868c6f6 100644 --- a/etc/images/ezimage/README +++ b/etc/images/ezimage/README @@ -8,5 +8,5 @@ Files: bits.xpm bitsbang.xpm box-minus.xpm box-plus.xpm tag.xpm unlock.xpm Author: Eric M. Ludlam Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, - 2009, 2010, 2011 Free Software Foundation, Inc. + 2009, 2010, 2011, 2012 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) diff --git a/etc/images/gnus/README b/etc/images/gnus/README index cf051cde2ae..017e016c1d7 100644 --- a/etc/images/gnus/README +++ b/etc/images/gnus/README @@ -8,7 +8,7 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES Files: important.xpm, unimportant.xpm Author: Simon Josefsson Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, - 2010, 2011 Free Software Foundation, Inc. + 2010, 2011, 2012 Free Software Foundation, Inc. Files: catchup.pbm catchup.xpm cu-exit.pbm cu-exit.xpm describe-group.pbm describe-group.xpm exit-gnus.pbm exit-gnus.xpm @@ -23,11 +23,11 @@ Files: catchup.pbm catchup.xpm cu-exit.pbm cu-exit.xpm uu-post.pbm uu-post.xpm Author: Luis Fernandes Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, - 2010, 2011 Free Software Foundation, Inc. + 2010, 2011, 2012 Free Software Foundation, Inc. Files: gnus.png, gnus.svg Author: Francesc Rocher - Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc. + Copyright (C) 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. * The following icons are from GNOME 2.x. They are not part of Emacs, diff --git a/etc/images/gnus/gnus.svg b/etc/images/gnus/gnus.svg index dc29686a032..159ef3f182c 100644 --- a/etc/images/gnus/gnus.svg +++ b/etc/images/gnus/gnus.svg @@ -1,7 +1,7 @@ CFBundleShortVersionString - 23.3.50 + 23.3.90 CFBundleSignature EMAx diff --git a/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings b/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings index 154f7d40411..1c0e07a7380 100644 --- a/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings +++ b/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /* Localized versions of Info.plist keys */ CFBundleName = "Emacs"; -CFBundleShortVersionString = "Version 23.3.50"; -CFBundleGetInfoString = "Emacs version 23.3.50, NS Windowing"; +CFBundleShortVersionString = "Version 23.3.90"; +CFBundleGetInfoString = "Emacs version 23.3.90, NS Windowing"; NSHumanReadableCopyright = "Copyright (C) 2012 Free Software Foundation, Inc."; diff --git a/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop b/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop index 32388dd01a8..5d67455578c 100644 --- a/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop +++ b/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Encoding=UTF-8 Type=Application -Version=23.3.50 +Version=23.3.90 Categories=GNUstep Name=Emacs Comment=GNU Emacs for NeXT/Open/GNUstep and OS X diff --git a/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist b/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist index caef8666512..2f8518a1855 100644 --- a/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist +++ b/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist @@ -2,7 +2,7 @@ ApplicationDescription = "GNU Emacs for GNUstep / OS X"; ApplicationIcon = emacs.tiff; ApplicationName = Emacs; - ApplicationRelease = "23.3.50"; + ApplicationRelease = "23.3.90"; Authors = ( "Adrian Robert (GNUstep)", "Christophe de Dinechin (MacOS X)", @@ -13,7 +13,7 @@ ); Copyright = "Copyright (C) 2012 Free Software Foundation, Inc."; CopyrightDescription = "Released under the GNU General Public License Version 3 or later"; - FullVersionID = "Emacs 23.3.50, NS Windowing"; + FullVersionID = "Emacs 23.3.90, NS Windowing"; NSExecutable = Emacs; NSIcon = emacs.tiff; NSPrincipalClass = NSApplication; diff --git a/nt/emacs.rc b/nt/emacs.rc index 8b88d1ea4d4..5643dc88fc2 100644 --- a/nt/emacs.rc +++ b/nt/emacs.rc @@ -7,8 +7,8 @@ Emacs ICON icons\emacs.ico #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 23,3,50,0 - PRODUCTVERSION 23,3,50,0 + FILEVERSION 23,3,90,0 + PRODUCTVERSION 23,3,90,0 FILEFLAGSMASK 0x3FL #ifdef EMACSDEBUG FILEFLAGS 0x1L @@ -25,12 +25,12 @@ BEGIN BEGIN VALUE "CompanyName", "Free Software Foundation\0" VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\0" - VALUE "FileVersion", "23, 3, 50, 0\0" + VALUE "FileVersion", "23, 3, 90, 0\0" VALUE "InternalName", "Emacs\0" VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012\0" VALUE "OriginalFilename", "emacs.exe" VALUE "ProductName", "Emacs\0" - VALUE "ProductVersion", "23, 3, 50, 0\0" + VALUE "ProductVersion", "23, 3, 90, 0\0" VALUE "OLESelfRegister", "\0" END END diff --git a/nt/emacsclient.rc b/nt/emacsclient.rc index c46046fca5e..4ea2526eb94 100644 --- a/nt/emacsclient.rc +++ b/nt/emacsclient.rc @@ -5,8 +5,8 @@ Emacs ICON icons\emacs.ico #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 23,3,50,0 - PRODUCTVERSION 23,3,50,0 + FILEVERSION 23,3,90,0 + PRODUCTVERSION 23,3,90,0 FILEFLAGSMASK 0x3FL #ifdef EMACSDEBUG FILEFLAGS 0x1L @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "Free Software Foundation\0" VALUE "FileDescription", "GNU EmacsClient: Client for the extensible self-documenting text editor\0" - VALUE "FileVersion", "23, 3, 50, 0\0" + VALUE "FileVersion", "23, 3, 90, 0\0" VALUE "InternalName", "EmacsClient\0" VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012\0" VALUE "OriginalFilename", "emacsclientw.exe" VALUE "ProductName", "EmacsClient\0" - VALUE "ProductVersion", "23, 3, 50, 0\0" + VALUE "ProductVersion", "23, 3, 90, 0\0" VALUE "OLESelfRegister", "\0" END END -- cgit v1.3 From 3f0ec69d3bfc440cfeb8063e4435441cb874da72 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sun, 15 Jan 2012 12:11:26 +0800 Subject: Add entry for ede-project-directories to NEWS. --- etc/NEWS | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'etc') diff --git a/etc/NEWS b/etc/NEWS index 35a0486dfa2..4934468d018 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -14,6 +14,18 @@ for changes in older Emacs versions. You can narrow news to a specific version by calling `view-emacs-news' with a prefix argument or by typing C-u C-h C-n. + +* Changes in Specialized Modes and Packages in Emacs 23.4 + +** EDE + +*** New variable `ede-project-directories'. +EDE now refuses to automatically load a project file (Project.ede) +unless the file is in one of the directories specified by this +variable. This reduces the risk of inadvertently loading malicious +project files. The commands `M-x ede-new' and `M-x ede' now offer to +save directories to `ede-project-directories'. + * Installation Changes in Emacs 23.4 -- cgit v1.3 From 6d0bd9ba728ea8714baf9eef1dc9ec34000e2e96 Mon Sep 17 00:00:00 2001 From: Primoz PETERLIN Date: Tue, 17 Jan 2012 22:16:42 +0800 Subject: Update Slovenian tutorial. --- admin/FOR-RELEASE | 4 +- etc/ChangeLog | 4 + etc/tutorials/TUTORIAL.sl | 1323 ++++++++++++++++++------------------ etc/tutorials/TUTORIAL.translators | 4 +- 4 files changed, 678 insertions(+), 657 deletions(-) (limited to 'etc') diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE index daf8e33d041..6b10d51b970 100644 --- a/admin/FOR-RELEASE +++ b/admin/FOR-RELEASE @@ -117,7 +117,7 @@ TUTORIAL.pt_BR TUTORIAL.ro TUTORIAL.ru TUTORIAL.sk -TUTORIAL.sl +TUTORIAL.sl Primoz PETERLIN TUTORIAL.sv TUTORIAL.th TUTORIAL.zh @@ -203,7 +203,7 @@ help.texi hooks.texi index.texi internals.texi -intro.texi +intro.texi cyd keymaps.texi lists.texi loading.texi diff --git a/etc/ChangeLog b/etc/ChangeLog index b4e22c506a3..b13b858ca4e 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,7 @@ +2012-01-17 Primoz PETERLIN + + * tutorials/TUTORIAL.sl: Update. + 2012-01-14 Eli Zaretskii * tutorials/TUTORIAL.he: Update to follow changes to TUTORIAL in diff --git a/etc/tutorials/TUTORIAL.sl b/etc/tutorials/TUTORIAL.sl index ef1fecbc86a..804fe366d50 100644 --- a/etc/tutorials/TUTORIAL.sl +++ b/etc/tutorials/TUTORIAL.sl @@ -1,41 +1,42 @@ -Prvo berilo za Emacs. Pogoji uporabe in raz№irjanja so navedeni na koncu. +Prvo berilo za Emacs. Pogoji uporabe in razЕЎirjanja so navedeni na koncu. -Ukazi v Emacsu v splo№nem vkljuиujejo tipki CONTROL (vиasih oznaиeni -CTRL ali CTL) in META (vиasih oznaиena EDIT ali ALT). Namesto, da bi ju -vedno izpisali s celim imenom, bomo uporabili naslednji okraj№avi: +Ukazi v Emacsu v sploЕЎnem vkljuДЌujejo tipki CONTROL (vДЌasih oznaДЌeni +CTRL ali CTL) in META (vДЌasih oznaДЌena EDIT ali ALT). Namesto, da bi ju +vedno izpisali s celim imenom, bomo uporabili naslednji okrajЕЎavi: - C- pomeni, da moramo drѕati pritisnjeno tipko CONTROL, ko - vtipkamo . Oznaka C-f tako pomeni: drѕimo pritisnjeno + C- pomeni, da moramo drЕѕati pritisnjeno tipko CONTROL, ko + vtipkamo . Oznaka C-f tako pomeni: drЕѕimo pritisnjeno tipko CONTROL in pritisnemo tipko f. - M- pomeni, da moramo drѕati pritisnjeno tipko META, EDIT ali - ALT, ko vtipkamo . Иe na tipkovnici ni tipk META, EDIT + M- pomeni, da moramo drЕѕati pritisnjeno tipko META, EDIT ali + ALT, ko vtipkamo . ДЊe na tipkovnici ni tipk META, EDIT ali ALT, pritisnemo tipko ESC, jo spustimo in zatem - pritisnemo tipko . Tipko ESC bomo oznaиevali z . + pritisnemo tipko . Tipko ESC bomo oznaДЌevali z . Pomembno: Emacs zapustimo z ukazom C-x C-c (dva znaka). -V uиbeniku so vaje, s katerimi preskusite nove ukaze. Oznaиujeta jih -znaka ,>>` ob levem robu. Zgled: +Delno vneЕЎen ukaz prekinete s C-g. +V uДЌbeniku so vaje, s katerimi preskusite nove ukaze. OznaДЌujeta jih +znaka В»>>В« ob levem robu. Zgled: <> -[Sredina strani je iz didaktiиnih razlogov prazna. Besedilo se nadaljuje spodaj] ->> Vtipkajte zdaj ukaz C-v (View next screen, Prikaѕi naslednji zaslon), +[Sredina strani je iz didaktiДЌnih razlogov prazna. Besedilo se nadaljuje spodaj] +>> Vtipkajte zdaj ukaz C-v (View next screen, PrikaЕѕi naslednji zaslon), da se premaknete na naslednji zaslon (kar poskusite, pritisnite hkrati tipko CONTROL in V). Od zdaj naprej boste morali to - napraviti sami vsakiи, ko pridete do konca zaslona. + napraviti sami vsakiДЌ, ko pridete do konca zaslona. -Ste opazili, da sta se dve vrstici s prej№njega zaslona ponovili? Ta -kontinuiteta olaj№a branje pri skakanju s strani na stran. +Ste opazili, da sta se dve vrstici s prejЕЎnjega zaslona ponovili? Ta +kontinuiteta olajЕЎa branje pri skakanju s strani na stran. Prva stvar, ki si jo morate zapomniti, je, kako se premikate po -datoteki. Zdaj ѕe veste, da se premaknete za cel zaslon naprej z +datoteki. Zdaj Еѕe veste, da se premaknete za cel zaslon naprej z ukazom C-v. Za cel zaslon nazaj pa se premaknete z ukazom M-v -(pritisnite tipko META in jo drѕite ter pritisnite tipko v, ali pa -pritisnite in spustite ter zatem pritisnite tipko v, иe tipke -META, EDIT ali ALT na va№i tipkovnici ni). +(pritisnite tipko META in jo drЕѕite ter pritisnite tipko v, ali pa +pritisnite in spustite ter zatem pritisnite tipko v, ДЌe tipke +META, EDIT ali ALT na vaЕЎi tipkovnici ni). >> Nekajkrat pritisnite M-v in C-v, da vidite, kako ukaza delujeta. -* POVZETEK +* povzetek ---------- Za pregled celega zaslona besedila so uporabni naslednji ukazi: @@ -43,110 +44,113 @@ Za pregled celega zaslona besedila so uporabni naslednji ukazi: C-v Premik se za cel zaslon naprej M-v Premik se za cel zaslon nazaj C-l Cel zaslon premaknemo tako, da je zdaj po vertikali - osredninjen okoli besedila, kjer se nahaja kazalиek - (znak v C-l je иrka L, ne №tevka 1) + osredninjen okoli besedila, kjer se nahaja kazalДЌek + (znak v C-l je ДЌrka L, ne ЕЎtevka 1) ->> Poi№иite kazalиek na zaslonu in si zapomnite besedilo okoli njega. - Vtipkajte C-l. - Ponovno poi№иite kazalиek. Besedilo okoli njega je ostalo isto. +>> PoiЕЎДЌite kazalДЌek na zaslonu in si zapomnite besedilo okoli njega. + Zatem vtipkajte C-l. Ponovno poiЕЎДЌite kazalДЌek. Opazili boste, da + je besedilo okoli njega ostalo isto, vendar se je pomaknilo na sredo + zaslona. ДЊe ЕЎe enkrat pritisnite C-l, se bo ta vrstica pomaknila na + vrh zaslona. Pritisnite C-l ЕЎe enkrat, in vrstica se bo pomaknila + na dno zaslona. Za premikanje za cel zaslon naprej ali nazaj lahko tipkovnicah, ki imajo ti tipki, uporabljate tudi PageUp in PageDown. Opisan postopek s C-v in M-v pa deluje povsod. -* PREMIKANJE KAZALИKA +* PREMIKANJE KAZALДЊKA --------------------- Premiki za celo stran naprej in nazaj so sicer uporabni, ampak kako pa pridemo do izbranega mesta na zaslonu? -Naиinov je veи. Najosnovnej№i je uporaba ukazov C-p, C-b, C-f in -C-n. Ti po vrsti premaknejo kazalиek v prej№njo vrstico, znak nazaj, -znak naprej, in v naslednjo vrstico. Ti №tirje ukazi so enakovredni +NaДЌinov je veДЌ. NajosnovnejЕЎi je uporaba ukazov C-p, C-b, C-f in +C-n. Ti po vrsti premaknejo kazalДЌek v prejЕЎnjo vrstico, znak nazaj, +znak naprej, in v naslednjo vrstico. Ti ЕЎtirje ukazi so enakovredni kurzorskim tipkam: - prej№nja vrstica, C-p + prejЕЎnja vrstica, C-p : : - nazaj, C-b .... trenutni poloѕaj kazalиka .... naprej, C-f + nazaj, C-b .... trenutni poloЕѕaj kazalДЌka .... naprej, C-f : : naslednja vrstica, C-n ->> S pritiski na C-n ali C-p premaknite kazalиek v sredinsko vrstico +>> S pritiski na C-n ali C-p premaknite kazalДЌek v sredinsko vrstico na diagramu zgoraj. Zatem pritisnite C-l. S tem diagram postavite na sredino zaslona. -V angle№иini ima izbor tipk nazoren pomen. P kot ,previous` -(prej№nji), N kot ,next` (naslednji), B kot ,backward` (nazaj) in F -kot ,forward` (naprej). Te osnovne ukaze za premikanje kazalиka boste -uporabljali ves иas. +V angleЕЎДЌini ima izbor tipk nazoren pomen. P kot В»previousВ« +(prejЕЎnji), N kot В»nextВ« (naslednji), B kot В»backwardВ« (nazaj) in F +kot В»forwardВ« (naprej). Te osnovne ukaze za premikanje kazalДЌka boste +uporabljali ves ДЌas. ->> Nekajkrat pritisnite C-n, da pride kazalиek do te vrstice. +>> Nekajkrat pritisnite C-n, da pride kazalДЌek do te vrstice. >> Z nekaj C-f se pomaknite na desno na sredo vrstice, nato pa nekajkrat - pritisnite C-p. Opazujte, kaj se dogaja s kazalиkom na sredini + pritisnite C-p. Opazujte, kaj se dogaja s kazalДЌkom na sredini vrstice. -Vsaka vrstice v besedilu je zakljuиena z znakom za novo vrstico -(angl. Newline). Ta loиuje vrstico v besedilu od naslednje. Tudi -zadnja vrstica v datoteki mora biti zaljuиena z znakom za novo vrstico -(иeprav tega Emacs ne zahteva). +Vsaka vrstice v besedilu je zakljuДЌena z znakom za novo vrstico +(angl. Newline). Ta loДЌuje vrstico v besedilu od naslednje. (Tudi +zadnja vrstica v datoteki je po navadi zakljuДЌena z znakom za novo +vrstico, ДЌeprav Emacs tega ne zahteva.) ->> Poskusite ukaz C-b, ko je kazalиek na zaиetku vrstice. Kazalиek se - mora premakniti na konec prej№nje vrstice. To je zato, ker se je +>> Poskusite ukaz C-b, ko je kazalДЌek na zaДЌetku vrstice. KazalДЌek se + mora premakniti na konec prejЕЎnje vrstice. To je zato, ker se je ravnokar premaknil prek znaka za konec vrstice. -Ukaz C-f premika kazalиek prek znaka za novo vrstico enako kot C-b. +Ukaz C-f premika kazalДЌek prek znaka za novo vrstico enako kot C-b. ->> Poskusite №e nekajkrat pritisniti C-b, da dobite obиutek za - premikanje kazalиka. Potem nekajkrat poskusite C-f, da pridete do konca - vrstice. ©e enkrat pritisnite C-f, da skoиite v naslednjo vrstico. +>> Poskusite ЕЎe nekajkrat pritisniti C-b, da dobite obДЌutek za + premikanje kazalДЌka. Potem nekajkrat poskusite C-f, da pridete do konca + vrstice. Е e enkrat pritisnite C-f, da skoДЌite v naslednjo vrstico. -Ko s kazalиkom doseѕete zgornji ali spodnji rob zaslona, se besedilo -toliko premakne, da kazalиek ostane na zaslonu. V angle№иini se temu -pravi ,,scrolling``. To omogoиa, da lahko premaknemo kazalиek na +Ko s kazalДЌkom doseЕѕete zgornji ali spodnji rob zaslona, se besedilo +toliko premakne, da kazalДЌek ostane na zaslonu. V angleЕЎДЌini se temu +pravi В»scrollingВ«. To omogoДЌa, da lahko premaknemo kazalДЌek na katerokoli mesto v besedilu, a vseeno ostanemo na zaslonu. ->> Poskusite kazalиek pripeljati s C-n иisto do dna zaslona in si oglejte, +>> Poskusite kazalДЌek pripeljati s C-n ДЌisto do dna zaslona in si oglejte, kaj se zgodi. -Иe se vam zdi premikanje po en znak prepoиasno, se lahko premikate za -celo besedo. M-f (META-f) premakne kazalиek za eno besedo naprej, M-b +ДЊe se vam zdi premikanje po en znak prepoДЌasno, se lahko premikate za +celo besedo. M-f (META-f) premakne kazalДЌek za eno besedo naprej, M-b pa za besedo nazaj. >> Poskusite nekajkrat M-f in M-b. -Иe je kazalиek sredi besede, ga M-f prestavi na konec besede. Иe je v +ДЊe je kazalДЌek sredi besede, ga M-f prestavi na konec besede. ДЊe je v belini med besedami, ga M-f premakne na konec naslednje besede. M-b deluje podobno, a v nasprotni smeri. ->> Nekajkrat poskusite M-f in M-b, vmes pa №e nekaj C-f in - C-b. Opazujte uиinke M-f in M-b, ko je kazalиek sredi besede ali +>> Nekajkrat poskusite M-f in M-b, vmes pa ЕЎe nekaj C-f in + C-b. Opazujte uДЌinke M-f in M-b, ko je kazalДЌek sredi besede ali med besedami. Ste opazili paralelo med C-f in C-b na eni strani ter M-f in M-b na -drugi? V Emacsu se dostikrat ukazi Meta nana№ajo na operacije nad +drugi? V Emacsu se dostikrat ukazi Meta nanaЕЎajo na operacije nad enotami jezika (besede, stavki, odstavki), medtem ko se ukazi Control -nana№ajo na operacije, neodvisne od zvrsti besedila (znaki, vrstice +nanaЕЎajo na operacije, neodvisne od zvrsti besedila (znaki, vrstice ipd.). Podobna zveza je tudi med vrsticami in stavki: ukaza C-a in C-e -premakneta kazalиek na zaиetek oz. konec vrstice, M-a in M-e pa na -zaиetek oz. konec stavka. +premakneta kazalДЌek na zaДЌetek oz. konec vrstice, M-a in M-e pa na +zaДЌetek oz. konec stavka. >> Poskusite nekaj ukazov C-a, potem pa nekaj ukazov C-e. Poskusite nekaj ukazov M-a, potem pa nekaj ukazov M-e. -Ste opazili, da ponovljeni C-a ne napravijo niи, ponovljeni M-a pa se -premikajo naprej? Иeprav se ne obna№ata enako, pa je vendar obna№anje +Ste opazili, da ponovljeni C-a ne napravijo niДЌ, ponovljeni M-a pa se +premikajo naprej? ДЊeprav se ne obnaЕЎata enako, pa je vendar obnaЕЎanje enega in drugega po svoje naravno. -Poloѕaju kazalиka na zaslonu pravimo tudi ,,point``, toиka. -Parafrazirano: kazalиek kaѕe na zaslonu, kje je toиka v besedilu. +PoloЕѕaju kazalДЌka na zaslonu pravimo tudi В»pointВ«, toДЌka. +Parafrazirano: kazalДЌek kaЕѕe na zaslonu, kje je toДЌka v besedilu. -Povzetek preprostih ukazov za premikanje kazalиka, vkljuиno s premiki +Povzetek preprostih ukazov za premikanje kazalДЌka, vkljuДЌno s premiki po besedo in stavek: C-f Premik za znak naprej @@ -156,335 +160,329 @@ po besedo in stavek: M-b Premik za besedo nazaj C-n Premik v naslednjo vrstico - C-p Premik v prej№njo vrstico + C-p Premik v prejЕЎnjo vrstico - C-a Premik na zaиetek vrstice + C-a Premik na zaДЌetek vrstice C-e Premik na konec vrstice - M-a Premik na zaиetek stavka + M-a Premik na zaДЌetek stavka M-e Premik na konec stavka >> Za vajo nekajkrat poskusite vsakega od teh ukazov. To so najpogosteje uporabljani ukazi. -©e dva pomembna ukaza za premikanje kazalиka sta M-< (META-manj№i od), -ki ga premakne na zaиetek datoteke, in M-> (META-veиji od), ki ga +Е e dva pomembna ukaza za premikanje kazalДЌka sta M-< (META-manjЕЎi od), +ki ga premakne na zaДЌetek datoteke, in M-> (META-veДЌji od), ki ga premakne na konec datoteke. -Na ameri№kih tipkovnicah najdete znak < nad vejico in morate +Na ameriЕЎkih tipkovnicah najdete znak < nad vejico in morate pritisniti tipko Shift, da pridete do njega. Z ukazom M-< je enako - prav tako morate pritisniti tipko Shift, sicer moste izvedli drug -ukaz, Meta-vejica. Na na№ih tipkovnicah sta oba znaka na isti tipko, -in za ukaz M-> morate pritisniti №e tipko Shift. +ukaz, Meta-vejica. Na naЕЎih tipkovnicah sta oba znaka na isti tipko, +in za ukaz M-> morate pritisniti ЕЎe tipko Shift. ->> Poskusite zdaj M-<, skok na zaиetek tega uиbenika. +>> Poskusite zdaj M-<, skok na zaДЌetek tega uДЌbenika. Potem se vrnite nazaj z zaporednimi C-v. ->> Poskusite zdaj M->, skok na konec tega uиbenika. +>> Poskusite zdaj M->, skok na konec tega uДЌbenika. Potem se vrnite nazaj z zaporednimi M-v. -Иe ima va№a tipkovnica kurzorske tipke, lahko premikate kazalиek po -zaslonu tudi z njimi. Vseeno priporoиamo, da se privadite ukazov C-b, -C-f, C-n in C-p, in to iz treh razlogov. Prviи, delujejo na иisto vseh -terminalih. Drugiи, z nekaj prakse v Emacsu boste opazili, da je -tipkanje ukazov s CONTROL hitrej№e od tipkanja s kurzorskimi tipkami, ker -ni treba ves иas premikati desnice s tipkovnice na kurzorske tipke in -nazaj. In tretjiи, ko se enkrat navadite teh ukazov s CONTROL, se boste -enostavneje nauиili tudi bolj zapletenih ukazov za premikanje kazalиka. - -Veиini ukazov v Emacsu lahko podamo №tevilиni argument; najveиkrat ta -pove, kolikokrat zapovrstjo naj se ukaz izvede. Veиkratno ponovitev -ukaza izvedemo tako, da najprej vtipkamo C-u, zatem №tevilo, -kolikokrat naj se ukaz ponovi, in nazadnje ѕeljeni ukaz. Иe ima va№a +ДЊe ima vaЕЎa tipkovnica kurzorske tipke, lahko premikate kazalДЌek po +zaslonu tudi z njimi. Vseeno priporoДЌamo, da se privadite ukazov C-b, +C-f, C-n in C-p, in to iz treh razlogov. PrviДЌ, delujejo na ДЌisto vseh +terminalih. DrugiДЌ, z nekaj prakse v Emacsu boste opazili, da je +tipkanje ukazov s CONTROL hitrejЕЎe od tipkanja s kurzorskimi tipkami, ker +ni treba ves ДЌas premikati desnice s tipkovnice na kurzorske tipke in +nazaj. In tretjiДЌ, ko se enkrat navadite teh ukazov s CONTROL, se boste +enostavneje nauДЌili tudi bolj zapletenih ukazov za premikanje kazalДЌka. + +VeДЌini ukazov v Emacsu lahko podamo ЕЎtevilДЌni argument; najveДЌkrat ta +pove, kolikokrat zapovrstjo naj se ukaz izvede. VeДЌkratno ponovitev +ukaza izvedemo tako, da najprej vtipkamo C-u, zatem ЕЎtevilo, +kolikokrat naj se ukaz ponovi, in nazadnje Еѕeljeni ukaz. ДЊe ima vaЕЎa tipkovnica tipko META (ali EDIT ali ALT), lahko izpustite ukaz C-u in -namesto tega vtipkate №tevilo ponovitev, medtem ko drѕite pritisnjeno -tipko META. Druga metoda je sicer kraj№a, priporoиamo pa prvo, ker -deluje na vseh terminalih. Tak№en №tevilиni argument je ,,prefiksni`` -argument, ker vnesemo argument pred ukazom, na katerega se nana№a. +namesto tega vtipkate ЕЎtevilo ponovitev, medtem ko drЕѕite pritisnjeno +tipko META. Druga metoda je sicer krajЕЎa, priporoДЌamo pa prvo, ker +deluje na vseh terminalih. TakЕЎen ЕЎtevilДЌni argument je В»prefiksniВ« +argument, ker vnesemo argument pred ukazom, na katerega se nanaЕЎa. -Zgled: C-u 8 C-f premakne kazalиek za osem znakov naprej. +Zgled: C-u 8 C-f premakne kazalДЌek za osem znakov naprej. ->> Poskusite s primernim argumentom za №tevilo ponovitev ukaza - C-n ali C-p priti иim bliѕe tej vrstici v enem samem skoku. +>> Poskusite s primernim argumentom za ЕЎtevilo ponovitev ukaza + C-n ali C-p priti ДЌim bliЕѕe tej vrstici v enem samem skoku. -Veиina ukazov, ne pa vsi, uporablja №tevilиni argument kot №tevilo +VeДЌina ukazov, ne pa vsi, uporablja ЕЎtevilДЌni argument kot ЕЎtevilo ponovitev ukaza. Nekateri ukazi - nobeden od tistih, ki smo si jih ogledali do zdaj - ga uporabljajo kot stikalo: s podanim prefiksnim -argumentom napravi ukaz nekaj drugega kot obiиajno. +argumentom napravi ukaz nekaj drugega kot obiДЌajno. -Ukaza C-v in M-v sta tudi izjemi, a drugaиni. Иe jima podamo argument, -premakneta zaslon za navedeno №tevilo vrstic, ne pa zaslonov. Ukaz C-u +Ukaza C-v in M-v sta tudi izjemi, a drugaДЌni. ДЊe jima podamo argument, +premakneta zaslon za navedeno ЕЎtevilo vrstic, ne pa zaslonov. Ukaz C-u 8 C-v, na primer, premakne zaslon navzgor za 8 vrstic. >> Poskusite zdaj C-u 8 C-v -To bi moralo zaslon premakniti navzgor za osem vrstic. Иe bi ga radi +To bi moralo zaslon premakniti navzgor za osem vrstic. ДЊe bi ga radi premaknili nazaj, poskusite M-v z istim argumentom. -Иe uporabljate grafiиni vmesnik, denimo X11 ali MS Windows, imate -verjetno ob robu Emacsovega okna navpiиno pravokotno ploskev, +ДЊe uporabljate grafiДЌni vmesnik, denimo X ali MS Windows, imate +verjetno ob robu Emacsovega okna pokonДЌno pravokotno ploskev, imenovano drsnik. Pogled na besedilo lahko premikate tudi tako, da z -mi№ko kliknete na drsnik. +miЕЎko kliknete na drsnik. ->> Postavite kazalec na vrh oznaиenega obmoиja na drsniku in pritisnite - srednji gumb na mi№ki. To bi moralo premakniti besedilo na mesto, - doloиeno s tem, kako visoko ali nizko na drsnik ste kliknili. ->> Medtem ko drѕite srednji gumb pritisnjen, premikajte mi№ko gor in - dol. Vidite, kako se premika besedilo v Emacsovem oknu, ko - premikate mi№ko? - - -* ИE SE EMACS OBESI -------------------- +* ДЊE SE EMACS PRENEHA ODZIVATI +------------------------------ -Иe se Emacs preneha odzivati na va№e ukaze, ga lahko varno prekinete z +ДЊe se Emacs preneha odzivati na vaЕЎe ukaze, ga lahko varno prekinete z ukazom C-g. Z njim lahko prekinete ukaze, za katere bi trajalo predolgo, da bi se izvedli. -Isti ukaz, C-g, lahko uporabite tudi, da prekliиete №tevilиni -argument, ali pa zaиetek ukaza, ki ga ne ѕelite izvesti. +Isti ukaz, C-g, lahko uporabite tudi, da prekliДЌete ЕЎtevilДЌni +argument, ali pa zaДЌetek ukaza, ki ga ne Еѕelite izvesti. ->> Vtipkajte C-u 100, s иimer ste izbrali №tevilиni argument 100, - zatem pa vtipkajte C-g. Vtipkajte zdaj C-f. Kazalиek se je - premaknil le za en znak, ker ste №tevilиni argument vmes preklicali +>> Vtipkajte C-u 100, s ДЌimer ste izbrali ЕЎtevilДЌni argument 100, + zatem pa vtipkajte C-g. Vtipkajte zdaj C-f. KazalДЌek se je + premaknil le za en znak, ker ste ЕЎtevilДЌni argument vmes preklicali s C-g. -Tudi иe ste po nesreиi vtipkali , se ga lahko znebite s C-g. +Tudi ДЌe ste po nesreДЌi vtipkali , se ga lahko znebite s C-g. -* ONEMOGOИENI UKAZI +* ONEMOGOДЊENI UKAZI ------------------- -Nekaj ukazov v Emacsu je namenoma ,,onemogoиenih``, da bi jih -zaиetniki ne izvedli po nesreиi. +Nekaj ukazov v Emacsu je namenoma В»onemogoДЌenihВ«, da bi jih +zaДЌetniki ne izvedli po nesreДЌi. -Иe vtipkate tak onemogoиen ukaz, se bo na zaslonu pojavilo novo okno z -obvestilom, kateri ukaz ste sku№ali izvesti, in vas vpra№alo, иe ga -res ѕelite izvesti. +ДЊe vtipkate tak onemogoДЌen ukaz, se bo na zaslonu pojavilo novo okno z +obvestilom, kateri ukaz ste skuЕЎali izvesti, in vas vpraЕЎalo, ДЌe ga +res Еѕelite izvesti. -Иe v resnici ѕelite poskusiti ukaz, pritisnite preslednico kot odgovor -na vpra№anje. Normalno verjetno ukaza ne ѕelite izvesti, zato na -vpra№anje odgovorite z ,n`. +ДЊe v resnici Еѕelite poskusiti ukaz, pritisnite preslednico kot odgovor +na vpraЕЎanje. Normalno verjetno ukaza ne Еѕelite izvesti, zato na +vpraЕЎanje odgovorite z В»nВ«. ->> Vtipkajte C-x C-l (ki je onemogoиen ukaz), - zatem na vpra№anje odgovorite n. +>> Vtipkajte C-x C-l (ki je onemogoДЌen ukaz), + zatem na vpraЕЎanje odgovorite n. * OKNA ------ -Emacs lahko prikaѕe veи oken in v vsakem svoje besedilo. Kasneje bomo -razloѕili, kako uporabljamo veи oken hkrati. Zaenkrat bomo povedali -le, kako se znebite dodatnih oken, ki jih lahko odpre vgrajena pomoи ali -pa izpis kak№nega drugega programa. Preprosto je: +Emacs lahko prikaЕѕe veДЌ В»okenВ« in v vsakem svoje besedilo. Kasneje +bomo razloЕѕili, kako uporabljamo veДЌ oken hkrati. Zaenkrat bomo +povedali le, kako se znebite dodatnih oken, ki jih lahko odpre +vgrajena pomoДЌ ali pa izpis kakЕЎnega drugega programa. Preprosto je: C-x 1 Eno okno (torej, zaprimo vsa ostala). -To je CONTROL-x, ki mu sledi №tevka 1. Ukaz C-x 1 raztegne иez cel -zaslon okno, v katerem se nahaja kazalиek, ostala pa zapre. +To je CONTROL-x, ki mu sledi ЕЎtevka 1. Ukaz C-x 1 raztegne ДЌez cel +zaslon okno, v katerem se nahaja kazalДЌek, ostala pa zapre. ->> Premaknite kazalиek do te vrstice in vtipkajte C-u 0 C-l ->> Vtipkajte CONTROL-h k CONTROL-f. - Vidite, kako se je to okno skrиilo in odstopilo prostor oknu, - ki pojasnjuje ukaz CONTROL-f? +>> Premaknite kazalДЌek do te vrstice in vtipkajte C-u 0 C-l +>> Vtipkajte C-h k C-f. + Vidite, kako se je to okno skrДЌilo in odstopilo prostor oknu, + ki pojasnjuje ukaz C-f? >> Vtipkajte C-x 1 in spodnje okno se bo zaprlo. -Za razliko od ukazov, ki smo se jih nauиili do zdaj, je ta ukaz -sestavljen iz dveh znakov. Zaиne se z znakom CONTROL-x. Cela vrsta -ukazov se zaиne enako, in mnogi od njih zadevajo delo z datotekami, -delovnimi podroиji in podobnim. Vsem tem ukazom je skupno, da se -zaиnejo s CONTROL-x, ki mu sledi №e en, dva ali trije znaki. +Za razliko od ukazov, ki smo se jih nauДЌili do zdaj, je ta ukaz +sestavljen iz dveh znakov. ZaДЌne se z znakom CONTROL-x. Cela vrsta +ukazov se zaДЌne enako, in mnogi od njih zadevajo delo z datotekami, +delovnimi podroДЌji in podobnim. Vsem tem ukazom je skupno, da se +zaДЌnejo s CONTROL-x, ki mu sledi ЕЎe en, dva ali trije znaki. * VRIVANJE IN BRISANJE ---------------------- -Иe ѕelite v obstojeиe besedilo vriniti novo, preprosto premaknite -kazalиek na ѕeljeno mesto in zaиnite tipkati. Znake, ki jih lahko -vidite, na primer A, 7, * in podobno, razume Emacs kot del besedila in -jih takoj vrine. S pritiskom na Return (ali Enter) vrinete znak za -skok v novo vrstico. - -Zadnji vtipkani znak lahko izbri№ete s pritiskom na tipko -. To je tista tipka na tipkovnici, ki jo navadno uporabljate -za brisanje nazadnje natipkanega znaka. Navadno je to velika tipka -vrstico ali dve nad tipko , ki je oznaиena z "Backspace", -"Delete" ali "Del". +ДЊe Еѕelite v obstojeДЌe besedilo vriniti novo, preprosto premaknite +kazalДЌek na Еѕeleno mesto in zaДЌnite tipkati. Vidne znake, na primer A, +7, * in podobno, Emacs vrine takoj, ko jih vtipkate. S pritiskom na +tipko (ali ) vrinete znak za skok v novo vrstico. -Иe imate na tipkovnici tipko "Backspace", je to tipka . Naj -vas ne zmede, иe imate poleg tega №e tipko "Delete" - je -"Backspace". +Zadnji vtipkani znak lahko izbriЕЎete s pritiskom na tipko . Ta +tipka je na tipkovnici obiДЌajno oznaДЌena z В»BackspaceВ« - skratka, to +je ista tipka, ki jo tudi v drugih programih uporabljate za brisanje +nazadnje natipkanega znaka. -Splo№no pobri№e znak neposredno pred trenutnim poloѕajem -kazalиka. +Najverjetneje imate na tipkovnici ЕЎe tipko В»DeleteВ«. Naj vas to ne +zmede - z mislimo tipko В»BackspaceВ«. ->> Vtipkajte zdaj nekaj znakov in jih zatem s tipko pobri№ite. - Niи naj vas ne skrbi, иe se je ta vrstica spremenila. Izvirnika - tega uиbenika ne boste pokvarili -- tole je samo va№a osebna kopija. +>> Poskusite zdaj! Vtipkajte zdaj nekaj znakov in jih zatem s tipko + pobriЕЎite. NiДЌ naj vas ne skrbi, ДЌe se je ta vrstica + spremenila. Izvirnika tega uДЌbenika ne boste pokvarili -- tole je + samo vaЕЎa osebna delovna kopija. -Ko vrstica postane predolga za zaslon, se ,,nadaljuje`` v naslednji -vrstici na zaslonu. Obrnjena po№evnica (znak ,\`) ali v grafiиnih -okoljih zavita pu№иica ob desnem robu oznaиuje vrstico, ki se -nadaljuje v naslednji zaslonski vrstici. +Ko vrstica postane predolga za zaslon, se В»nadaljujeВ« v naslednji +vrstici na zaslonu. ДЊe uporabljate grafiДЌno okolje, boste opazili +zaviti puЕЎДЌici ob levem in desnem robu, ki oznaДЌujeta vrstico, ki se +nadaljuje v naslednji zaslonski vrstici. ДЊe uporabljate terminalski +vmesnik, je vrstica, ki se nadaljuje v naslednji zaslonski vrstici, +oznaДЌena z obrnjeno poЕЎevnico (znak В»\В«) v skrajnem desnem stolpcu. ->> Zdaj zaиnite tipkati besedilo, dokler ne doseѕete desnega roba, in - №e naprej. Opazili boste, da se pojavi znak za nadaljevanje. +>> Zdaj zaДЌnite tipkati besedilo, dokler ne doseЕѕete desnega roba, in + ЕЎe naprej. Opazili boste, da se pojavi znak za nadaljevanje. ->> S tipko pobri№ite toliko znakov, da vrstica ne sega - veи иez №irino zaslona. Znak za nadaljevanje v naslednji +>> S tipko pobriЕЎite toliko znakov, da vrstica ne sega + veДЌ ДЌez ЕЎirino zaslona. Znak za nadaljevanje v naslednji vrstici je izginil. -Znak za novo vrstico lahko pobri№emo enako kot vsak drug znak. S tem, -ko pobri№emo znak za novo vrstico, zdruѕimo vrstici v eno samo. Иe bo -nova vrstica predolga, da bi cela pri№la na zaslon, bo razdeljena v -veи zaslonskih vrstic. +Znak za novo vrstico lahko pobriЕЎemo enako kot vsak drug znak. S tem, +ko pobriЕЎemo znak za novo vrstico, zdruЕѕimo vrstici v eno samo. ДЊe bo +nova vrstica predolga, da bi cela priЕЎla na zaslon, bo razdeljena v +veДЌ zaslonskih vrstic. ->> Premaknite kazalиek na zaиetek vrstice in pritisnite . To - zdruѕi vrstico s prej№njo. +>> Premaknite kazalДЌek na zaДЌetek vrstice in pritisnite . To + zdruЕѕi vrstico s prejЕЎnjo. >> Pritisnite . S tem ste ponovno vrinili znak za skok v novo vrstico, ki ste ga malo prej zbrisali. -Spomnimo se, da lahko za veиino ukazov v Emacsu doloиimo, naj se -izvedejo veиkrat zaporedoma; to vkljuиuje tudi vnos teksta. Ponovitev -obiиajnega znaka ga veиkrat vrine v besedilo. +Spomnimo se, da lahko za veДЌino ukazov v Emacsu doloДЌimo, naj se +izvedejo veДЌkrat zaporedoma; to vkljuДЌuje tudi vnos teksta. Ponovitev +obiДЌajnega znaka ga veДЌkrat vrine v besedilo. >> Poskusite zdaj tole: da vnesete osem zvezdic, vtipkajte C-u 8 * -Zdaj ste se nauиili najpreprostej№i naиin, da v Emacsu nekaj natipkate -in popravite. Bri№ete lahko tudi besede ali vrstice. Tu je povzetek +Zdaj ste se nauДЌili najpreprostejЕЎi naДЌin, da v Emacsu nekaj natipkate +in popravite. BriЕЎete lahko tudi besede ali vrstice. Tu je povzetek ukazov za brisanje: - pobri№e znak tik pred kazalиkom (levo od - oznake za kazalиek) - C-d pobri№e znak tik za kazalиkom (,pod` oznako - za kazalиek) + pobriЕЎe znak tik pred kazalДЌkom (levo od + oznake za kazalДЌek) + C-d pobriЕЎe znak tik za kazalДЌkom (В»podВ« oznako + za kazalДЌek) - M- pobri№e besedo tik pred kazalиkom - M-d pobri№e besedo tik za kazalиkom + M- pobriЕЎe besedo tik pred kazalДЌkom + M-d pobriЕЎe besedo tik za kazalДЌkom - C-k zavrѕe besedilo desno od kazalиka do konca vrstice - M-k zavrѕe besedilo od poloѕaja kazalиka do konca stavka + C-k zavrЕѕe besedilo desno od kazalДЌka do konca vrstice + M-k zavrЕѕe besedilo od poloЕѕaja kazalДЌka do konca stavka -Иrka ,d` je iz angle№ke besede ,delete` (pobrisati), иrka ,k` pa iz -besede ,kill` (pobiti). Ste opazili, da in C-d na eni, ter -M- in M-d na drugi strani nadaljujeta paralelo, ki sta jo zaиela -C-f in M-f ( pravzaprav ni kontrolni znak, kar pa naj nas ne +ДЊrka В»dВ« je iz angleЕЎke besede В»deleteВ« (pobrisati), ДЌrka В»kВ« pa iz +besede В»killВ« (pobiti). Ste opazili, da in C-d na eni, ter +M- in M-d na drugi strani nadaljujeta paralelo, ki sta jo zaДЌela +C-f in M-f ( pravzaprav ni kontrolni znak, kar pa naj nas ne moti). C-k in M-k sta v enakem sorodu s C-e in M-e: prvi deluje na vrstice, drugi na stavke. -Obstaja tudi splo№en postopek za brisanje kateregakoli dela delovnega -podroиja. Kazalиek postavimo na en konec podroиja, ki ga ѕelimo -izbrisati, in pritisnemo C-@ ali C-SPC (SPC je -preslednica). Katerikoli od obeh ukazov deluje. Premaknite kazalиek na -drug konec podroиja, ki ga ѕelite izbrisati, in pritisnite C-w. S tem -ste zavrgli vse besedilo med obema mejama. +Obstaja tudi sploЕЎen postopek za brisanje kateregakoli dela delovnega +podroДЌja. KazalДЌek postavimo na en konec podroДЌja, ki ga Еѕelimo +izbrisati, in pritisnemo C-@ ali C- ( je preslednica). +Katerikoli od obeh ukazov deluje. Premaknite kazalДЌek na drug konec +podroДЌja, ki ga Еѕelite izbrisati. Med premikanjem Emacs z barvo +oznaДЌuje podroДЌje med kazalДЌkom in mestom, kjer ste pritisnili +C-. KonДЌno pritisnite C-w. S tem ste zavrgli vse besedilo med +obema mejama. ->> Premaknite kazalиek na иrko O, s katero se zaиenja prej№nji +>> Premaknite kazalДЌek na ДЌrko O, s katero se zaДЌenja prejЕЎnji odstavek. ->> Vtipkajte C-SPC. Emacs prikaѕe sporoиilo "Mark set" (slov. Oznaka - postavljena) na dnu ekrana. ->> Premaknite kazalиek na иrko V v "postavimo" v drugi vrstici istega +>> Vtipkajte C-SPC. Emacs prikaЕѕe sporoДЌilo В»Mark setВ« (slov. В»oznaka + postavljenaВ«) na dnu ekrana. +>> Premaknite kazalДЌek na ДЌrko V v В»postavimoВ« v drugi vrstici istega odstavka. ->> Vtipkajte C-w. S tem zavrѕemo vse besedilo zaиen№i z O in vse do - иrke V. - -Razlika med tem, иe zavrѕete cel odstavek besedila (angl. ,,kill``, -pobiti) ali pa иe pobri№ete znak (angl. ,,delete``), je ta, da lahko -prvega vrnete nazaj z ukazom C-y, drugega pa ne. Na splo№no ukazi, ki -lahko povzroиijo veliko №kode (pobri№ejo veliko besedila), shranijo -pobrisano besedilo; tisti, ki pobri№ejo samo posamezni znak, ali samo -prazne vrstice in presledke, pa ne. - ->> Postavite kazalиek na zaиetek neprazne vrstice. Pritisnite C-k, da - pobri№ete vsebino vrstice. ->> ©e enkrat pritisnite C-k. To pobri№e №e znak za novo vrstico. - -Ste opazili, da prvi C-k pobri№e vsebino vrstice, naslednji C-k pa №e -vrstici samo, s иimer se vse besedilo pod biv№o vrstico premakne za -eno vrstico navzgor? Ukaz C-k obravnava №tevilиni argument malo -drugaиe: pobri№e toliko in toliko vrstic z vsebinami vred. To ni zgolj -ponovitev. C-u 2 C-k pobri№e dve polni vrstici besedila, kar je nekaj -drugega, kot иe dvakrat vtipkate C-k. - -Besedilo, ki ste ga prej pobili, lahko povrnete (angl. ,,yank`` -- +>> Vtipkajte C-w. S tem zavrЕѕemo vse besedilo zaДЌenЕЎi z O in vse do + ДЌrke V. + +Razlika med tem, ДЌe zavrЕѕete cel odstavek besedila (angl. В»killВ«, +pobiti) ali pa ДЌe pobriЕЎete znak (angl. В»deleteВ«), je ta, da lahko +prvega povrnete - na katerokoli mesto v besedilu - z ukazom C-y, +drugega pa ne (seveda pa lahko prekliДЌete brisanje - glejte niЕѕje). Na +sploЕЎno ukazi, ki lahko povzroДЌijo veliko ЕЎkode (pobriЕЎejo veliko +besedila), shranijo pobrisano besedilo; tisti, ki pobriЕЎejo samo +posamezni znak, ali samo prazne vrstice in presledke, pa ne. + +>> Postavite kazalДЌek na zaДЌetek neprazne vrstice. Pritisnite C-k, da + pobriЕЎete vsebino vrstice. +>> Е e enkrat pritisnite C-k. To pobriЕЎe ЕЎe znak za novo vrstico. + +Ste opazili, da prvi C-k pobriЕЎe vsebino vrstice, naslednji C-k pa ЕЎe +vrstici samo, s ДЌimer se vse besedilo pod bivЕЎo vrstico premakne za +eno vrstico navzgor? Ukaz C-k obravnava ЕЎtevilДЌni argument malo +drugaДЌe: pobriЕЎe toliko in toliko vrstic z vsebinami vred. To ni zgolj +ponovitev. C-u 2 C-k pobriЕЎe dve polni vrstici besedila, kar je nekaj +drugega, kot ДЌe dvakrat vtipkate C-k. + +Besedilo, ki ste ga prej pobili, lahko povrnete (angl. В»yankВ« - potegniti). Predstavljajte si, kot da potegnete nazaj nekaj, kar vam je nekdo odnesel. Pobito besedilo lahko potegnete nazaj na isti ali pa -na kak№en drug kraj v besedilu, ali pa celo v kaki drugi -datoteki. Isto besedilo lahko veиkrat potegnete nazaj, tako da je v -delovnem podroиju poveиterjeno. +na kakЕЎen drug kraj v besedilu, ali pa celo v kaki drugi datoteki. +Isto besedilo lahko veДЌkrat potegnete nazaj, tako da je v delovnem +podroДЌju poveДЌterjeno. Nekateri drugi urejevalniki uporabljajo namesto +В»killВ« in В»yankВ« izraza В»cutВ« in В»pasteВ« (glejte glosar v priroДЌniku +za Emacs). -Ukaz za vraиanje pobitega besedila je C-y. +Ukaz za vraДЌanje pobitega besedila je C-y. >> Poskusite z ukazom C-y povrniti pobrisano besedilo. -Иe ste uporabili veи zaporednih ukazov C-k, je vse pobrisano besedilo +ДЊe ste uporabili veДЌ zaporednih ukazov C-k, je vse pobrisano besedilo shranjeno skupaj, in en sam C-y bo vrnil vse tako pobrisane vrstice. >> Poskusite, nekajkrat vtipkajte C-k. Zdaj pa vrnimo pobrisano besedilo: ->> Vtipkajte C-y. Zdaj pa premaknite kazalиek za nekaj vrstic navzdol - in №e enkrat vtipkajte C-y. Vidite zdaj, kako se kopira dele +>> Vtipkajte C-y. Zdaj pa premaknite kazalДЌek za nekaj vrstic navzdol + in ЕЎe enkrat vtipkajte C-y. Vidite zdaj, kako se kopira dele besedila? -Kaj pa, иe ste pobrisali nekaj besedila, ki bi ga radi vrnili, vendar -ste za iskanim odlomkom pobrisali №e nekaj? C-y vrne samo nazadnje -pobrisan odlomek. Vendar tudi prej№nje besedilo ni izgubljeno. Do +Kaj pa, ДЌe ste pobrisali nekaj besedila, ki bi ga radi vrnili, vendar +ste za iskanim odlomkom pobrisali ЕЎe nekaj? C-y vrne samo nazadnje +pobrisan odlomek. Vendar tudi prejЕЎnje besedilo ni izgubljeno. Do njega lahko pridete z ukazom M-y. Ko ste vrnili nazadnje zbrisano besedilo s C-y, pritisnite M-y, ki ga zamenja s predzanje pobrisanim -besedilom. Vsak naslednji M-y prikaѕe №e eno prej. Ko ste konиno -pri№li do iskanega besedila, ni treba napraviti niи posebnega, da bi -ga obdrѕali. Preprosto nadaljujte z urejanjem, in vrnjeno besedilo bo -ostalo, kamor ste ga odloѕili. +besedilom. Vsak naslednji M-y prikaЕѕe ЕЎe eno prej. Ko ste konДЌno +priЕЎli do iskanega besedila, ni treba napraviti niДЌ posebnega, da bi +ga obdrЕѕali. Preprosto nadaljujte z urejanjem, in vrnjeno besedilo bo +ostalo, kamor ste ga odloЕѕili. -Иe pritisnete M-y dovolj velikokrat, se boste vrnili na zaиete, torej +ДЊe pritisnete M-y dovolj velikokrat, se boste vrnili na zaДЌete, torej spet na zadnje pobrisano besedilo. ->> Pobri№ite vrstico, premaknite se nekam drugam, in pobri№ite №e +>> PobriЕЎite vrstico, premaknite se nekam drugam, in pobriЕЎite ЕЎe eno vrstico. Z ukazom C-y dobite nazaj to drugo vrstico. Z ukazom M-y pa jo zamenjate s prvo vrstico. - Ponovite ukaz M-y №e nekajkrat in si oglejte, kaj dobite na - zaslon. Ponavljajte ga, dokler se ne prikaѕe ponovno nazadnje - pobrisana vrstica, in №e naprej. Иe ѕelite, lahko tudi ukazu - M-y podate pozitivno ali negativno №tevilo ponovitev. + Ponovite ukaz M-y ЕЎe nekajkrat in si oglejte, kaj dobite na + zaslon. Ponavljajte ga, dokler se ne prikaЕѕe ponovno nazadnje + pobrisana vrstica, in ЕЎe naprej. ДЊe Еѕelite, lahko tudi ukazu + M-y podate pozitivno ali negativno ЕЎtevilo ponovitev. * PREKLIC UKAZA (UNDO) ---------------------- -Иe ste besedilo spremenili, a ste se kasneje premislili, lahko -besedilo vrnete v prvotno stanje z ukazom Undo, C-x u. Normalno vrne -C-x u zadnjo spremembo besedila; иe ukaz ponovimo, prekliиemo №e -predzadnjo spremembo, in vsaka nadaljnja ponovitev seѕe №e eno +ДЊe ste besedilo spremenili, a ste se kasneje premislili, lahko +besedilo vrnete v prvotno stanje z ukazom Undo, C-/. + +ObiДЌajno C-/ prekliДЌe spremembo besedila, ki jo izvede en ukaz; ДЌe +ukaz C-/ ponovimo, prekliДЌemo ЕЎe spremembo, ki jo je izvedel +predzadnji ukaz, in vsaka nadaljnja ponovitev C-/ seЕѕe ЕЎe eno spremembo globlje v zgodovino. -Emacs hrani bolj ali manj celotno zgodovino na№ih ukazov, z dvema -izjemama: ukazov, ki niso napravili nobene spremembe v besedilu -(npr. premik kazalиka), ne shranjuje, in zaporedje do 20 vrinjenih -znakov shrani kot en sam ukaz. Slednje prihrani nekaj ukazov C-x u, ki -bi jih morali vtipkati. +Emacs hrani bolj ali manj celotno zgodovino naЕЎih ukazov, z dvema +izjemama: ukazov, ki niso napravili nobene spremembe v besedilu (npr. +premik kazalДЌka), ne shranjuje, in zaporedje do 20 vrinjenih znakov +shrani kot en sam ukaz. Slednje prihrani nekaj ukazov C-/, ki bi jih +morali vtipkati. ->> Pobri№ite to vrstico z ukazom C-k, potem jo prikliиite nazaj s C-x u. +>> PobriЕЎite to vrstico z ukazom C-k, potem jo prikliДЌite nazaj s C-/. -C-_ je alternativni ukaz za preklic zadnjega ukaza. Deluje enako kot -s C-x u, ga je pa laѕje odtipkati, иe morate ukaz ponoviti veиkrat -zaporedoma. Teѕava z ukazom C-_ je, da na nekaterih tipkovnicah ni -povsem oиitno, kako ga vtipkati, zato je podvojen №e kot C-x u. Na -nekaterih terminalih moramo na primer vtipkati /, medtem ko drѕimo -pritisnjeno tipko CONTROL. +C-_ je alternativni ukaz za preklic zadnjega ukaza. Deluje povsem +enako kot C-/. Na nekaterih besedilnih terminalih v resnici pritisk +C-/ poЕЎlje Emacsu ukaz C-_. Е e tretja moЕѕnost je C-x u, ki tudi deluje +povsem enako kot C-/, le z nekaj veДЌ tipkanja. -Иe podamo ukazu C-_ ali C-x u numeriиni argument, je to enako, kot иe -bi ukaz roиno ponovili tolikokrat, kot pravi argument. +ДЊe podamo ukazu C-/, C-_ ali C-x u numeriДЌni argument, je to enako, +kot ДЌe bi ukaz roДЌno ponovili tolikokrat, kot pravi argument. -Ukaz za brisanje besedila lahko prekliиete in besedilo povrnete, -enako, kot иe bi besedilo pobili. Razlika med brisanjem in pobijanjem -besedila je le ta, da le slednje lahko potegnete nazaj z ukazom -C-y. Preklic ukaza pa velja za eno in drugo. +Ukaz za brisanje besedila lahko prekliДЌete in besedilo povrnete, +enako, kot ДЌe bi besedilo pobili. Razlika med brisanjem in pobijanjem +besedila je le ta, da le slednje lahko povrnete z ukazom C-y. Preklic +ukaza pa velja za eno in drugo. * DATOTEKE @@ -493,638 +491,657 @@ C-y. Preklic ukaza pa velja za eno in drugo. Da bi bile spremembe v besedilu trajne, morate besedilo shraniti v datoteko. V nasprotnem primeru jih boste za vedno izgubili tisti hip, ko boste zapustili Emacs. Besedilo postavimo v datoteko tako, da -na disku ,,poi№иemo`` (angl. find) datoteko, preden zaиnemo tipkati -(pravimo tudi, da ,,obi№иemo`` datoteko). +na disku В»poiЕЎДЌemoВ« (angl. find) datoteko, preden zaДЌnemo tipkati +(pravimo tudi, da В»obiЕЎДЌemoВ« datoteko). Poiskati datoteko pomeni, da v Emacsu vidimo vsebino datoteke. To je bolj ali manj tako, kot da z Emacsom urejamo datoteko samo. Vendar pa spremembe ne postanejo trajne, dokler datoteke ne shranimo -(angl. save) na disk. Tako imamo moѕnost, da se izognemo temu, da bi -nam na pol spremenjene datoteke leѕale po disku, kadar tega ne -ѕelimo. Ker pa Emacs ohrani izvorno datoteko pod spremenjenim imenom, -lahko prvotno datoteko prikliиemo nazaj celo №e potem, ko smo datoteko -ѕe shranili na disk. - -V predzadnji vrstici na dnu zaslona vidite vrstico, ki se zaиne in -konиa z vezaji, in vsebuje niz znakov ,,--:-- TUTORIAL``. Ta del -zaslona navadno vsebuje ime datoteke, ki smo jo obiskali. Zdajle je to -,,TUTORIAL``, va№a delovna kopija uиbenika Emacsa. Ko boste poiskali -kak№no drugo datoteko, bo na tem mestu pisalo njeno ime. +(angl. save) na disk. Tako imamo moЕѕnost, da se izognemo temu, da bi +nam na pol spremenjene datoteke leЕѕale po disku, kadar tega ne +Еѕelimo. Ker pa Emacs ohrani izvorno datoteko pod spremenjenim imenom, +lahko prvotno datoteko prikliДЌemo nazaj celo ЕЎe potem, ko smo datoteko +Еѕe shranili na disk. + +V predzadnji vrstici na dnu zaslona vidite vrstico, ki se zaДЌne z +vezaji, na zaДЌetku pa vsebuje niz znakov В»--:--- TUTORIALВ« ali nekaj +podobnega. Ta del zaslona navadno vsebuje ime datoteke, ki smo jo +obiskali. Zdajle je to В»TUTORIALВ«, vaЕЎa delovna kopija uДЌbenika +Emacsa. Ko boste poiskali kakЕЎno drugo datoteko, bo na tem mestu +izpisano ime te datoteke. Posebnost ukaza za iskanje datoteke je, da moramo povedati, katero -datoteko i№иemo. Pravimo, da ukaz ,,prebere argument s terminala`` (v -tem primeru je argument ime datoteke). Ko vtipkate ukaz +datoteko iЕЎДЌemo. Pravimo, da ukaz В»prebere argumentВ« (v tem primeru je +argument ime datoteke). Ko vtipkate ukaz - C-x C-f (poi№иi datoteko) + C-x C-f (poiЕЎДЌi datoteko) -vas Emacs povpra№a po imenu datoteke. Kar vtipkate, se sproti vidi v -vrstici na dnu zaslona. Temu delovnemu podroиju pravimo pogovorni +vas Emacs povpraЕЎa po imenu datoteke. Kar vtipkate, se sproti vidi v +vrstici na dnu zaslona. Temu delovnemu podroДЌju pravimo pogovorni vmesnik (minibuffer), kadar se uporablja za tovrstni vnos. Znotraj -pogovornega vmesnika lahko uporabljate obiиajne ukaze za urejanje, иe +pogovornega vmesnika lahko uporabljate obiДЌajne ukaze za urejanje, ДЌe ste se na primer pri tipkanju zmotili. Sredi tipkanja imena datoteke (ali katerega koli drugega opravila v -pogovornem vmesniku) lahko ukaz prekliиete s C-g. +pogovornem vmesniku) lahko ukaz prekliДЌete s C-g. ->> Vtipkajte C-x C-f, zatem pa №e C-g. Zadnji ukaz od treh je +>> Vtipkajte C-x C-f, zatem pa ЕЎe C-g. Zadnji ukaz od treh je zaprl pogovorni vmesnik in tudi preklical ukaz C-x C-f, ki je uporabljal pogovorni vmesnik. Konec z iskanjem datoteke. -Ko ste dokonиali ime, ga vnesete s pritiskom na . S tem se -poѕene ukaz C-x C-f in poi№иe iskano datoteko. Pogovorni vmesnik -izgine, ko je ukaz izveden. +Ko ste dokonДЌali ime, ga vnesete s pritiskom na . Pogovorni +vmesnik izgine, ko je ukaz izveden. -Trenutek kasneje se vsebina datoteke pojavi na zaslonu. Zdaj lahko -dopolnjujete, urejate ali kako drugaиe spreminjate vsebino. Ko ѕelite, -da ostanejo spremembe trajne, izvedete ukaz: +Vsebina datoteke se pojavi na zaslonu. Zdaj lahko dopolnjujete, +urejate ali kako drugaДЌe spreminjate vsebino. Ko Еѕelite, da ostanejo +spremembe trajne, izvedete ukaz: C-x C-s (shrani datoteko) -Besedilo se s tem shrani iz pomnilnika raиunalnika na datoteko na -disk. Ko prviи izvedete ta ukaz, se izvorna datoteka preimenuje, tako +Besedilo se s tem shrani iz pomnilnika raДЌunalnika na datoteko na +disk. Ko prviДЌ izvedete ta ukaz, se izvorna datoteka preimenuje, tako da ni izgubljena. Najdete jo pod novim imenom, ki se od starega -razlikuje po tem, da ima na koncu pripet znak ,,~``. +razlikuje po tem, da ima na koncu pripet znak В»~В«. -Ko je Emacs shranil datoteko, izpi№e njeno ime. Shranjujte raje -pogosteje kot ne, da v primeru, иe gre z raиunalnikom kaj narobe, ne -izgubite veliko. +Ko je Emacs shranil datoteko, izpiЕЎe njeno ime. Shranjujte raje +pogosteje kot ne, da v primeru, ДЌe gre z raДЌunalnikom kaj narobe, ne +izgubite veliko (oglejte si tudi razdelek o samodejnem shranjevanju +niЕѕje). ->> Vtipkajte C-x C-s, s иimer boste shranili svojo kopijo tega - uиbenika. Emacs bo v vrstici na dnu zaslona izpisal ,,Wrote - ...TUTORIAL``. +>> Vtipkajte C-x C-s TUTORIAL . + S tem boste shranili svojo kopijo tega uДЌbenika. Emacs bo v vrstici + na dnu zaslona izpisal В»Wrote ...TUTORIALВ«. -Poi№иete lahko lahko ѕe obstojeиo datoteko, da si jo ogledate ali -popravite, ali pa tudi datoteko, ki №e ne obstaja. To je naиin, kako z -Emacsom ustvarimo novo datoteko: poi№иite datoteko z izbranim imenom, -ki bo sprva prazna, in zaиnite pisati. Ko jo boste prviи shranili, bo -Emacs ustvaril datoteko z vne№enim besedilom. Od tod dalje delate na -ѕe obstojeиi datoteki. +PoiЕЎДЌete lahko lahko Еѕe obstojeДЌo datoteko, da si jo ogledate ali +popravite, ali pa tudi datoteko, ki ЕЎe ne obstaja. To je naДЌin, kako z +Emacsom ustvarimo novo datoteko: poiЕЎДЌite datoteko z izbranim imenom, +ki bo sprva prazna, in zaДЌnite pisati. Ko jo boste prviДЌ shranili, bo +Emacs ustvaril datoteko z vneЕЎenim besedilom. Od tod dalje delate na +Еѕe obstojeДЌi datoteki. -* DELOVNA PODROИJA +* DELOVNA PODROДЊJA ------------------ -Tudi иe ste z ukazom C-x C-f poiskali in odprli drugo datoteko, prva -ostane v Emacsu. Nanjo se vrnete tako, da jo №e enkrat ,,poi№иete`` z +Tudi ДЌe ste z ukazom C-x C-f poiskali in odprli drugo datoteko, prva +ostane v Emacsu. Nanjo se vrnete tako, da jo ЕЎe enkrat В»poiЕЎДЌeteВ« z ukazom C-x C-f. Tako imate lahko v Emacsu hkrati kar precej datotek. ->> Ustvarite datoteko z imenom ,,bla`` tako, da vtipkate C-x C-f - bla . Natipkajte nekaj besedila, ga po potrebi popravite, in - shranite v datoteko ,,bla`` z ukazom C-x C-s. Ko ste konиali, se - vrnite v uиbenik z ukazom C-x C-f TUTORIAL . - -Emacs hrani besedilo vsake datoteke v takoimenovanem ,,delovnem -podroиju`` (angl. buffer). Ko poi№иemo datoteko, Emacs ustvari zanjo -novo delovno podroиje. Vsa obstojeиa delovna podroиja v Emacsu vidimo +Emacs hrani besedilo vsake datoteke v takoimenovanem В»delovnem +podroДЌjuВ« (angl. buffer). Ko poiЕЎДЌemo datoteko, Emacs ustvari zanjo +novo delovno podroДЌje. Vsa obstojeДЌa delovna podroДЌja v Emacsu vidimo z ukazom: - C-x C-b Seznam delovnih podroиij. + C-x C-b Seznam delovnih podroДЌij. >> Poskusite C-x C-b zdaj. -Vidite, da ima vsako delovno podroиje svoje ime, pri nekaterih pa pi№e +Vidite, da ima vsako delovno podroДЌje svoje ime, pri nekaterih pa piЕЎe tudi ime datoteke, katere vsebina se hrani v njem. Vsako besedilo, ki -ga vidite v katerem od Emacsovih oken, je vedno del kak№nega delovnega -podroиja. +ga vidite v katerem od Emacsovih oken, je vedno del kakЕЎnega delovnega +podroДЌja. ->> Z ukazom C-x 1 se znebite seznama delovnih podroиij. +>> Z ukazom C-x 1 se znebite seznama delovnih podroДЌij. -Tudi иe imate veи delovnih podroиij, pa je vedno le eno od njih -trenutno dejavno. To je tisto delovno podroиje, ki ga popravljate. Иe -ѕelite popravljati drugo delovno podroиje, morate ,,preklopiti`` -nanj. Иe bi radi preklopili na delovno podroиje, ki pripada kak№ni -datoteki, ѕe poznate en naиin, kako to storiti: ponovno ,,obi№иete`` -(odprete) to datoteko z ukazom C-x C-f. Obstaja pa №e laѕji naиin: z -ukazom C-x b. Pri tem ukazu morate navesti ime delovnega podroиja. +Tudi ДЌe imate veДЌ delovnih podroДЌij, pa je vedno le eno od njih +trenutno dejavno. To je tisto delovno podroДЌje, ki ga popravljate. ДЊe +Еѕelite popravljati drugo delovno podroДЌje, morate В»preklopitiВ« +nanj. ДЊe bi radi preklopili na delovno podroДЌje, ki pripada kakЕЎni +datoteki, Еѕe poznate en naДЌin, kako to storiti: ponovno В»obiЕЎДЌeteВ« +(odprete) to datoteko z ukazom C-x C-f. Obstaja pa ЕЎe laЕѕji naДЌin: z +ukazom C-x b. Pri tem ukazu morate navesti ime delovnega podroДЌja. ->> Vtipkajte C-x b bla , s иimer se vrnete v delovno podroиje - ,,bla`` z vsebino datoteke ,,bla``, ki ste jo maloprej - odprli. Zatem vtipkajte C-x b TUTORIAL , s иimer se vrnete - nazaj v ta uиbenik. +>> Ustvarite datoteko z imenom В»blaВ« tako, da vtipkate C-x C-f bla + . Zatem se vrnite v ta uДЌbenik z ukazom C-x C-f TUTORIAL + . -Veиinoma se ime delovnega podroиja kar ujema z imenom datoteke (brez -poti do datoteke), ne pa vedno. Seznam delovnih podroиij, ki ga -prikaѕe ukaz C-x C-b, prikaѕe imena vseh delovnih podroиij. +VeДЌinoma se ime delovnega podroДЌja kar ujema z imenom datoteke (brez +poti do datoteke), ne pa vedno. Seznam delovnih podroДЌij, ki ga +prikaЕѕe ukaz C-x C-b, prikaЕѕe imena vseh delovnih podroДЌij in +pripadajoДЌa imena datotek. Vsako besedilo, ki ga vidite v katerem od Emacsovih oken, je vedno del -kak№nega delovnega podroиja. Nekatera delovna podroиja ne pripadajo -nobeni datoteki. Podroиje ,,*Buffer List*``, na primer, je ѕe eno -takih. To delovno podroиje smo ustvarili ravnokar, ko smo pognali ukaz -C-x C-b, in vsebuje seznam delovnih podroиij. Tudi delovno podroиje -,,Messages`` ne pripada nobeni datoteki, ampak vsebuje sporoиila, ki -jih je Emacs izpisoval v odzivnem podroиju na dnu zaslona. - ->> Vtipkajte C-x b *Messages* in si oglejte delovno podroиje - s sporoиili, zatem pa vtipkajte C-x b TUTORIAL in se tako - vrnite v uиbenik. - -Иe ste spreminjali besedilo ene datoteke, potem pa poiskali drugo, to +kakЕЎnega delovnega podroДЌja. Nekatera delovna podroДЌja ne pripadajo +nobeni datoteki. PodroДЌje В»*Buffer List*В«, na primer, je Еѕe eno takih. +To delovno podroДЌje smo ustvarili ravnokar, ko smo pognali ukaz C-x +C-b, in vsebuje seznam delovnih podroДЌij. Temu delovnemu podroДЌju +TUTORIAL sprva ni pripadala datoteka, zdaj pa mu, ker smo v prejЕЎnjem +razdelku vtipkali C-x C-s in ga shranili v datoteko. + +Tudi delovno podroДЌje В»MessagesВ« ne pripada nobeni datoteki, ampak +vsebuje sporoДЌila, ki jih je Emacs izpisoval v odzivnem podroДЌju na +dnu zaslona. + +>> Vtipkajte C-x b *Messages* in si oglejte delovno podroДЌje + s sporoДЌili, zatem pa vtipkajte C-x b TUTORIAL in se tako + vrnite v uДЌbenik. + +ДЊe ste spreminjali besedilo ene datoteke, potem pa poiskali drugo, to ne shrani spremeb v prvo datoteko. Te ostanejo znotraj Emacsa, na -delovnem podroиju, ki pripada prvi datoteki. Ustvarjenje ali -spreminjanje delovnega podroиja druge datoteke nima nobenega vpliva na -podroиje prve. To je zelo uporabno, pomeni pa tudi, da potrebujemo -udobno pot, da shranimo delovno podroиje prve datoteke. Nerodno bi -bilo preklapljanje na prvo podroиje s C-x C-f, da bi shranili s C-x +delovnem podroДЌju, ki pripada prvi datoteki. Ustvarjenje ali +spreminjanje delovnega podroДЌja druge datoteke nima nobenega vpliva na +podroДЌje prve. To je zelo uporabno, pomeni pa tudi, da potrebujemo +udobno pot, da shranimo delovno podroДЌje prve datoteke. Nerodno bi +bilo preklapljanje na prvo podroДЌje s C-x C-f, da bi shranili s C-x C-s. Namesto tega imamo: - C-x s Shrani nekatera delovna podroиja + C-x s Shrani nekatera delovna podroДЌja -Ukaz C-x poi№иe delovna podroиja, katerih vsebina je bila spremenjena, -odkar je bila zadnjiи shranjena na datoteko. Za vsako tako delovno -podroиje C-x s vpra№a, иe ga ѕelite shraniti. +Ukaz C-x poiЕЎДЌe delovna podroДЌja, katerih vsebina je bila spremenjena, +odkar je bila zadnjiДЌ shranjena na datoteko. Za vsako tako delovno +podroДЌje C-x s vpraЕЎa, ДЌe ga Еѕelite shraniti. -* RAZ©IRJEN NABOR UKAZOV +* RAZЕ IRJEN NABOR UKAZOV ------------------------ -©e mnogo, mnogo je ukazov Emacsa, ki bi zasluѕili, da jih obesimo na +Е e mnogo, mnogo je ukazov Emacsa, ki bi zasluЕѕili, da jih obesimo na razne kontrolne in meta znake. Emacs se temu izogne z ukazom X (iz angl. -eXtend - raz№iriti), ki uvede ukaz iz raz№irjenega nabora. Dveh vrst je: +eXtend - razЕЎiriti), ki uvede ukaz iz razЕЎirjenega nabora. Dveh vrst je: - C-x Znakovna raz№iritev (angl. Character eXtend). + C-x Znakovna razЕЎiritev (angl. Character eXtend). Sledi mu en sam znak. - M-x Raz№iritev s poimenovanim ukazom. Sledi mu dolgo ime + M-x RazЕЎiritev s poimenovanim ukazom. Sledi mu dolgo ime ukaza. -Tudi ti ukazi so na splo№no uporabni, ne uporabljamo pa jih tako -pogosto kot tiste, ki ste se jih ѕe nauиili. Dva ukaza iz raz№irjenega -nabora ѕe poznamo: C-x C-f, s katerim poi№иemo datoteko, in C-x C-s, s -katerim datoteko shranimo. ©e en primer je ukaz, s katerim Emacsu -povemo, da ѕelimo konиati z delom iz iziti iz Emacsa. Ta ukaz je C-x -C-c (ne skrbite: preden konиa, Emacs ponudi, da shrani vse spremenjene +Tudi ti ukazi so na sploЕЎno uporabni, ne uporabljamo pa jih tako +pogosto kot tiste, ki ste se jih Еѕe nauДЌili. Dva ukaza iz razЕЎirjenega +nabora Еѕe poznamo: C-x C-f, s katerim poiЕЎДЌemo datoteko, in C-x C-s, s +katerim datoteko shranimo. Е e en primer je ukaz, s katerim Emacsu +povemo, da Еѕelimo konДЌati z delom iz iziti iz Emacsa. Ta ukaz je C-x +C-c (ne skrbite: preden konДЌa, Emacs ponudi, da shrani vse spremenjene datoteke). -Z ukazom C-z Emacs zapustimo samo *zaиasno*, tako da lahko ob vrnitvi -nadaljujemo z delom, kjer smo ostali. +ДЊe uporabljate grafiДЌni vmesnik, ne potrebujete posebnega ukaza za +preklop iz Emacsa v katerikoli drug program, ampak to opravite z miЕЎko +ali ukazom upravljalnika oken. ДЊe pa uporabljate besedilni terminal, +ki lahko prikazuje le en program naenkrat, morate zaДЌasno zapustiti +Emacs, da preklopite na drug program. -Na sistemih, ki to dopu№иajo, ukaz C-z izide iz Emacsa v ukazno -lupino, a ga ne konиa - иe uporabljate ukazno lupino C, se lahko -vrnete z ukazom ,fg` ali splo№neje z ukazom ,,%emacs``. +Z ukazom C-z Emacs zapustimo samo *zaДЌasno*, tako da lahko ob vrnitvi +nadaljujemo z delom, kjer smo ostali. Na sistemih, ki to dopuЕЎДЌajo, +ukaz C-z izide iz Emacsa v ukazno lupino, a ga ne konДЌa - ДЌe +uporabljate ukazno lupino C, se lahko vrnete z ukazom В»fgВ« ali +sploЕЎneje z ukazom В»%emacsВ«. -Drugod ukaz C-z poѕene sekundarno ukazno lupino, tako da lahko -poѕenete kak№en drug program in se kasneje vrnete v Emacs. V tem -primeru pravzaprav Emacsa ne zapustimo. Ukaz ,,exit`` v ukazni lupini -je navadno naиin, da zapremo sekundarno lupino in se vrnemo v Emacs. +Drugod ukaz C-z poЕѕene sekundarno ukazno lupino, tako da lahko +poЕѕenete kakЕЎen drug program in se kasneje vrnete v Emacs. V tem +primeru pravzaprav Emacsa ne zapustimo. Ukaz В»exitВ« v ukazni lupini +je navadno naДЌin, da zapremo sekundarno lupino in se vrnemo v Emacs. -Ukaz C-x C-c uporabimo, иe se nameravamo odjaviti s sistema. To je -tudi pravilen naиin za izhod iz Emacsa, иe je tega pognal program za -delo s po№to ali kak drug program, saj ta verjetno ne ve, kaj -napraviti z zaиasno prekinjenim Emacsom. V vseh ostalih primerih pa, -иe se ne nameravate odjaviti s sistema, uporabite C-z, in se vrnite v -Emacs, ko bi radi spet urejali besedilo. +Ukaz C-x C-c uporabimo, ДЌe se nameravamo odjaviti s sistema. To je +tudi pravilen naДЌin za izhod iz Emacsa, ДЌe je tega pognal program za +delo s poЕЎto ali kak drug program. Ukazov C-x je veliko. Zaenkrat smo spoznali naslednje: - C-x C-f Poi№иi datoteko. + C-x C-f PoiЕЎДЌi datoteko. C-x C-s Shrani datoteko. - C-x C-b Prikaѕi seznam delovnih podroиij. - C-x C-c Konиaj Emacs. + C-x C-b PrikaЕѕi seznam delovnih podroДЌij. + C-x C-c KonДЌaj Emacs. C-x 1 Zapri vsa okna razen enega. C-x u Preklic zadnjega ukaza. -Poimenovani raz№irjeni ukazi so ukazi, ki se uporabljajo №e bolj -poredko, ali pa se uporabljajo samo v nekaterih naиinih dela. Eden +Poimenovani razЕЎirjeni ukazi so ukazi, ki se uporabljajo ЕЎe bolj +poredko, ali pa se uporabljajo samo v nekaterih naДЌinih dela. Eden takih je na primer ukaz replace-string, ki po vsem besedilu zamenja en -niz znakov z drugim. Ko vtipkate M-x, se to izpi№e v pogovornem -vmesniku na dnu zaslona, Emacs pa иaka, da vtipkate ime ukaza, ki ga -ѕelite priklicati; v tem primeru je to ,,replace-string``. Vtipkajte -samo ,,repl s`` in Emacs bo dopolnil ime ( je tabulatorska +niz znakov z drugim. Ko vtipkate M-x, se to izpiЕЎe v pogovornem +vmesniku na dnu zaslona, Emacs pa ДЌaka, da vtipkate ime ukaza, ki ga +Еѕelite priklicati; v tem primeru je to В»replace-stringВ«. Vtipkajte +samo В»repl sВ« in Emacs bo dopolnil ime ( je tabulatorska tipka; navadno jo najdemo nad tipko Caps Lock ali Shift na levi strani tipkovnice). Ukaz vnesete s pritiskom na . -Ukaz replace-string potrebuje dva argumenta -- niz, ki ga ѕelite +Ukaz replace-string potrebuje dva argumenta -- niz, ki ga Еѕelite zamenjati, in niz, s katerim bi radi zamenjali prvega. Vsakega posebej -vnesete in zakljuиite s pritiskom na tipko Return. +vnesete in zakljuДЌite s pritiskom na tipko Return. ->> Premaknite kazalиek na prazno vrstico dve vrstici pod to, zatem +>> Premaknite kazalДЌek na prazno vrstico dve vrstici pod to, zatem vtipkajte M-x repl szamenjalaspremenila. Opazite, kako se je ta vrstica zamenjala? Vse besede z-a-m-e-n-j-a-l-a od tod do konca besedila ste nadomestili z besedo - ,,spremenila``. + В»spremenilaВ«. -* AVTOMATIИNO SHRANJEVANJE +* AVTOMATIДЊNO SHRANJEVANJE -------------------------- -Spremembe v datoteki, ki jih №e niste shranili na disk, so izgubljene, -иe medtem denimo zmanjka elektrike. Da bi vas zavaroval pred tem, -Emacs periodiиno avtomatiиno shrani vse datoteke, ki jih -urejate. Avtomatiиno shranjena datoteka se od izvorne razlikuje po -znaku ,#` na zaиetku in koncu imena: иe se je va№a datoteka imenovala -,,hello.c``, se avtomatiиno shranjena datoteka imenuje -,,#hello.c#``. Ko normalno shranite datoteko, avtomatiиno shranjena -datoteka ni veи potrebna, in Emacs jo pobri№e. +Spremembe v datoteki, ki jih ЕЎe niste shranili na disk, so izgubljene, +ДЌe medtem denimo zmanjka elektrike. Da bi vas zavaroval pred tem, +Emacs periodiДЌno avtomatiДЌno shrani vse datoteke, ki jih +urejate. AvtomatiДЌno shranjena datoteka se od izvorne razlikuje po +znaku В»#В« na zaДЌetku in koncu imena: ДЌe se je vaЕЎa datoteka imenovala +В»hello.cВ«, se avtomatiДЌno shranjena datoteka imenuje +В»#hello.c#В«. Ko normalno shranite datoteko, avtomatiДЌno shranjena +datoteka ni veДЌ potrebna, in Emacs jo pobriЕЎe. -Иe res pride do izgube podatkov v pomnilniku, lahko povrnete avtomatiиno -shranjeno besedilo tako, da normalno poi№иete datoteko (pravo ime -datoteke, ne ime avtomatiиno shranjene datoteke), zatem pa vtipkate M-x -recover file. Ko vas vpra№a za potrditev, vtipkajte yes -za nadaljevanje in povrnitev avtomatiиno shranjenenih podatkov. +ДЊe res pride do izgube podatkov v pomnilniku, lahko povrnete avtomatiДЌno +shranjeno besedilo tako, da normalno poiЕЎДЌete datoteko (pravo ime +datoteke, ne ime avtomatiДЌno shranjene datoteke), zatem pa vtipkate M-x +recover-file . Ko vas vpraЕЎa za potrditev, vtipkajte yes +za nadaljevanje in povrnitev avtomatiДЌno shranjenenih podatkov. -* ODZIVNO PODROИJE +* ODZIVNO PODROДЊJE ------------------ -Kadar Emacs opazi, da poиasi vtipkavate ukaz, odpre v zadnji vrstici -na dnu zaslona odzivno podroиje in v njem sproti prikazuje natipkano. +Kadar Emacs opazi, da poДЌasi vtipkavate ukaz, odpre v zadnji vrstici +na dnu zaslona odzivno podroДЌje in v njem sproti prikazuje natipkano. * STATUSNA VRSTICA ------------------ -Vrstica nad odzivnim podroиjem je statusna vrstica. Ta kaѕe verjetno +Vrstica nad odzivnim podroДЌjem je statusna vrstica. Ta kaЕѕe verjetno nekaj podobnega kot: ---:** TUTORIAL (Fundamental)--L670--58%---------------------- +--:**- TUTORIAL (Fundamental)--L670--58%---------------------- V njej so izpisani pomembni podatki o stanju Emacsa in besedilu, ki ga urejate. -Zdaj ѕe veste, kaj pomeni ime datoteke -- to je datoteka, ki ste jo -poiskali. Oznaka --NN%-- pomeni, da je nad vrhom zaslona №e NN -odstotkov celotne datoteke. Иe je zaиetek datoteke na zaslonu, bo -namesto --00%-- pisalo --Top--. Podobno bo pisalo --Bot--, иe je -zadnja vrstica datoteke na zaslonu. Иe je datoteka, ki jo ogledujete, -tako kratka, da gre vsa na en zaslon, pa bo pisalo --All--. +Zdaj Еѕe veste, kaj pomeni ime datoteke -- to je datoteka, ki ste jo +poiskali. Oznaka --NN%-- pomeni, da je nad vrhom zaslona ЕЎe NN +odstotkov celotne datoteke. ДЊe je zaДЌetek datoteke na zaslonu, bo +namesto В»0%В« pisalo В»TopВ«. Podobno bo pisalo В»BotВ«, ДЌe je +zadnja vrstica datoteke na zaslonu. ДЊe je datoteka, ki jo ogledujete, +tako kratka, da gre vsa na en zaslon, pa bo pisalo В»AllВ«. -Иrka L in №tevilke za njo kaѕejo poloѕaj №e drugaиe, kot zaporedno -№tevilko vrstice, v kateri je kazalиek. +ДЊrka L in ЕЎtevilke za njo kaЕѕejo poloЕѕaj ЕЎe drugaДЌe, kot zaporedno +ЕЎtevilko vrstice, v kateri je kazalДЌek. -Zvezdice na zaиetku vrstice pomenijo, da ste datoteko ѕe spreminjali. +Zvezdice na zaДЌetku vrstice pomenijo, da ste datoteko Еѕe spreminjali. Tik po tem, ko ste odprli ali shranili datoteko, ni nobenih zvezdic, -so samo иrtice. +so samo ДЌrtice. -Del statusne vrstice znotraj oklepajev vam pove, v kak№nem naиinu dela -Emacs. Privzeti naиin je osnovni naиin (Fundamental), v katerem ste -sedaj. Fundamental je eden od glavnih naиinov (angl. major -mode). Emacs pozna veliko razliиnih glavnih naиinov. Nekateri od njih +Del statusne vrstice znotraj oklepajev vam pove, v kakЕЎnem naДЌinu dela +Emacs. Privzeti naДЌin je osnovni naДЌin (Fundamental), v katerem ste +sedaj. Fundamental je eden od glavnih naДЌinov (angl. major +mode). Emacs pozna veliko razliДЌnih glavnih naДЌinov. Nekateri od njih so namenjeni pisanju programov, kot na primer Lisp, ali pisanju -besedil, kot npr. Text. Naenkrat je lahko aktiven le en glavni naиin, -njegovo ime pa je vedno izpisano v statusni vrstici, kjer zdaj pi№e +besedil, kot npr. Text. Naenkrat je lahko aktiven le en glavni naДЌin, +njegovo ime pa je vedno izpisano v statusni vrstici, kjer zdaj piЕЎe Fundamental. -Glavni naиini lahko spremenijo pomen nekaterim ukazom. Obstajajo, +Glavni naДЌini lahko spremenijo pomen nekaterim ukazom. Obstajajo, denimo, ukazi za pisanje komentarjev v programu, in ker ima vsak programski jezik svoje predstave o tem, kako mora komentar izgledati, -mora vsak glavni naиin vnesti komentarje drugaиe. Ker je vsak glavni -naиin ime raz№irjenega ukaza, lahko tako tudi izbiramo glavni -naиin. Na primer, M-x fundamental-mode vas postavi v naиin +mora vsak glavni naДЌin vnesti komentarje drugaДЌe. Ker je vsak glavni +naДЌin ime razЕЎirjenega ukaza, lahko tako tudi izbiramo glavni +naДЌin. Na primer, M-x fundamental-mode vas postavi v naДЌin Fundamental. -Иe nameravate popravljati slovensko (ali angle№ko) besedilo, kot je na -primer tole, boste verjetno izbrali tekstovni naиin (Text). ->> Vtipkajte M-x text mode. +ДЊe nameravate popravljati slovensko (ali angleЕЎko) besedilo, kot je na +primer tole, boste verjetno izbrali tekstovni naДЌin (Text). +>> Vtipkajte M-x text-mode . -Brez skrbi, noben od ukazov Emacsa, ki ste se jih nauиili, se s tem ne -spremeni kaj dosti. Lahko pa opazite, da Emacs zdaj jemlje opu№иaje za -dele besed, ko se premikate z M-f ali M-b. V osnovnem naиinu jih je +Brez skrbi, noben od ukazov Emacsa, ki ste se jih nauДЌili, se s tem ne +spremeni kaj dosti. Lahko pa opazite, da Emacs zdaj jemlje opuЕЎДЌaje za +dele besed, ko se premikate z M-f ali M-b. V osnovnem naДЌinu jih je obravnaval kot meje med besedami. -Glavni naиini navadno poиenjajo majhne spremembe, kot je ta: veиina -ukazov ,,opravi isti posel``, vendar pa to poиnejo na razliиen naиin. +Glavni naДЌini navadno poДЌenjajo majhne spremembe, kot je ta: veДЌina +ukazov В»opravi isti poselВ«, vendar pa to poДЌnejo na razliДЌen naДЌin. -Dokumentacijo o trenutno aktivnem glavnem naиinu dobite z ukazom C-h m. +Dokumentacijo o trenutno aktivnem glavnem naДЌinu dobite z ukazom C-h m. ->> Uporabite C-u C-v enkrat ali veиkrat, toliko, da bo ta vrstica blizu - vrha zaslona. ->> Vtipkajte C-h m, da vidite, v иem se tekstovni naиin (Text) razlikuje +>> Vtipkajte C-l C-l, da postavite to vrstico na vrh zaslona. +>> Vtipkajte C-h m, da vidite, v ДЌem se tekstovni naДЌin (Text) razlikuje od osnovnega (Fundamental). >> Vtipkajte C-x 1, da umaknete dokumentacijo z zaslona. -Glavnim naиinom pravimo glavni naиini zato, ker obstajajo tudi -podnaиini (angl. minor modes). Podnaиini ne nadome№иajo glavnih -naиinom, ampak le spreminjajo njihovo obna№anje. Podnaиine lahko -aktiviramo ali deaktiviramo neodvisno od glavnega naиina in neodvisno -od ostalih podnaиinov. Tako lahko ne uporabljate nobenega podnaиina, -en podnaиin, ali kombinacijo veиih podnaиinov. +Glavnim naДЌinom pravimo glavni naДЌini zato, ker obstajajo tudi +podnaДЌini (angl. minor modes). PodnaДЌini ne nadomeЕЎДЌajo glavnih +naДЌinom, ampak le spreminjajo njihovo obnaЕЎanje. PodnaДЌine lahko +aktiviramo ali deaktiviramo neodvisno od glavnega naДЌina in neodvisno +od ostalih podnaДЌinov. Tako lahko ne uporabljate nobenega podnaДЌina, +en podnaДЌin, ali kombinacijo veДЌih podnaДЌinov. -Podnaиin, ki je zelo uporaben posebno za pisanje besedil, je Auto -Fill. Ko je vklopljen, Emacs med pisanjem avtomatiиno deli vrstice na +PodnaДЌin, ki je zelo uporaben posebno za pisanje besedil, je Auto +Fill. Ko je vklopljen, Emacs med pisanjem avtomatiДЌno deli vrstice na presledkih med besedami, tako da vrstice niso predolge. -Vklopite ga lahko z ukazom M-x auto fill mode. Ko je -vklopljen, ga lahko izklopite z istim ukazom, M-x -auto fill mode. Z istim ukazom torej preklapljamo -(angl. toggle) med vklopljenim in izklopljenim stanjem. +Vklopite ga lahko z ukazom M-x auto-fill-mode . Ko je +vklopljen, ga lahko izklopite z istim ukazom, M-x auto-fill-mode +. Z istim ukazom torej preklapljamo (angl. toggle) med +vklopljenim in izklopljenim stanjem. ->> Vtipkajte zdaj M-x auto fill mode. Potem zaиnite tipkati - "asdf asdkl sdjf sdjkf"... dokler ne opazite, da je Emacs razbil +>> Vtipkajte zdaj M-x auto-fill-mode . Potem zaДЌnite tipkati + В»asdf asdkl sdjf sdjkfВ«... dokler ne opazite, da je Emacs razbil vrstico na dve. Med tipkanjem mora biti dovolj presledkov, saj Auto Fill prelamlja vrstice samo na presledkih. -©irina besedila je navadno postavljena na 70 znakov, kar pa lahko -spremenite z ukazom C-x f. Novo №irino morate podati kot №tevilиni +Е irina besedila je navadno postavljena na 70 znakov, kar pa lahko +spremenite z ukazom C-x f. Novo ЕЎirino morate podati kot ЕЎtevilДЌni argument. >> Vtipkajte C-x f in argument 20. (C-u 2 0 C-x f). Zatem vtipkajte - nekaj besedila in poglejte, иe bo Emacs res delil vrstice pri 20 + nekaj besedila in poglejte, ДЌe bo Emacs res delil vrstice pri 20 znakih. Potem z ukazom C-x f postavite mejo nazaj na 70. -Auto Fill deluje le, kadar pi№ete novo besedilo, ne pa, -kadar popravljate ѕe napisan odstavek. -Tak odstavek lahko poravnate tako, da kazalиek premaknete nekam -znotraj odstavka in ukaѕete M-q (META-q). +Auto Fill deluje le, kadar piЕЎete novo besedilo, ne pa, +kadar popravljate Еѕe napisan odstavek. +Tak odstavek lahko poravnate tako, da kazalДЌek premaknete nekam +znotraj odstavka in ukaЕѕete M-q (META-q). ->> Premaknite kazalиek v prej№nji odstavek in izvedite M-q. +>> Premaknite kazalДЌek v prejЕЎnji odstavek in izvedite M-q. * ISKANJE --------- -Emacs lahko v besedilu poi№иe niz znakov (zaporedje znakov ali besed), -naprej ali nazaj po besedilu. Iskanje spada v skupino ukazov za -premikanje kazalиka, saj premakne kazalиek na kraj v besedilu, kjer je -na№el iskani niz. +Emacs lahko v besedilu poiЕЎДЌe niz znakov (В»nizВ« je zaporedje soslednih +znakov), naprej ali nazaj po besedilu. Iskanje spada v skupino ukazov +za premikanje kazalДЌka, saj premakne kazalДЌek na kraj v besedilu, kjer +je naЕЎel iskani niz. -Iskanje v Emacsu je morda nekoliko drugaиno od tistega, ki ste ga -navajeni, in sicer je ,,inkrementalno``. To pomeni, da se iskanje -odvija hkrati s tem, ko tipkate iskani niz. +Iskanje v Emacsu je В»inkrementalnoВ«. To pomeni, da se iskanje odvija +hkrati s tem, ko tipkate iskani niz. Ukaza za iskanje sta C-s za iskanje naprej po datoteki in C-r za -iskanje nazaj po datoteki. POИAKAJTE! Ne preizku№ajte jih №e ta hip! +iskanje nazaj po datoteki. POДЊAKAJTE! Ne preizkuЕЎajte jih ЕЎe ta hip! -Ko boste natipkali C-s, boste opazili niz ,,I-search`` kot pozivnik +Ko boste natipkali C-s, boste opazili niz В»I-searchВ« kot pozivnik v pogovornem vmesniku. To vam pove, da je Emacs v inkrementalnem iskanju -in vas иaka, da zaиnete tipkati, kar i№иete. zakljuиi iskanje. - ->> Pritisnite zdaj C-s. POИASI, иrko za иrko, vtipkajte besedo - ,,kazalиek``. Za vsako vtipkano иrko se ustavite in si oglejte, kaj - se je zgodilo s kazalиkom. ->> ©e enkrat pritisnite C-s, da poi№иete naslednji ,,kazalиek``. ->> ©estkrat pritisnite in opazujte, kako se premika kazalиek. ->> Konиajte iskanje s tipko . - -Ste videli, kaj se je zgodilo? Emacs pri inkrementalnem iskanju sku№a -poiskati niz, ki ste ga natipkali do tistega hipa. Da poi№иete -naslednje mesto, kjer se pojavi ,,kazalиek``, samo №e enkrat -pritisnete C-s. Иe takega mesta ni, Emacs иivkne in vam sporoиi, da +in vas ДЌaka, da zaДЌnete tipkati, kar iЕЎДЌete. zakljuДЌi iskanje. + +>> Pritisnite zdaj C-s. POДЊASI, ДЌrko za ДЌrko, vtipkajte besedo + В»kazalДЌekВ«. Za vsako vtipkano ДЌrko se ustavite in si oglejte, kaj + se je zgodilo s kazalДЌkom. +>> Е e enkrat pritisnite C-s, da poiЕЎДЌete naslednji В»kazalДЌekВ«. +>> Е estkrat pritisnite in opazujte, kako se premika kazalДЌek. +>> KonДЌajte iskanje s tipko . + +Ste videli, kaj se je zgodilo? Emacs pri inkrementalnem iskanju skuЕЎa +poiskati niz, ki ste ga natipkali do tistega hipa. Da poiЕЎДЌete +naslednje mesto, kjer se pojavi В»kazalДЌekВ«, samo ЕЎe enkrat +pritisnete C-s. ДЊe takega mesta ni, Emacs ДЌivkne in vam sporoДЌi, da iskanje ni uspelo. Tudi C-g prekine iskanje. -OPOZORILO: Na nekaterih sistemih bo s pritiskom na C-s ekran -zmrznil. To je znak, da je operacijski sistem prestregel znak C-s in -ga interpretiral kot znak za prekinitev toka podatkov, namesto da bi -ga posredoval programu Emacs. Ekran ,,odtajate`` s pritiskom na -C-q. Potem si oglejte razdelek ,,Spontaneous Entry to Incremental -Search`` v priroиniku za nasvet, kako se spopasti s to nev№eиnostjo. - -Иe sredi inkrementalnega iskanja pritisnete , boste opazili, -da to pobri№e zadnji znak v iskanem nizu, kazalиek pa se premakne -nazaj na mesto v besedilu, kjer je na№el kraj№i niz. Na primer, -predpostavimo, da ste do zdaj natipkali ,,ka`` in je kazalиek na -mestu, kjer se prviи pojavi ,,ka``. Иe zdaj pritisnete , boste -s tem v pogovornem vmesniku izbrisali ,a`, hkrati pa se bo kazalиek -postavil na mesto, kjer je prviи na№el ,k`, preden ste natipkali №e -,a`. - -Иe sredi iskanja vtipkate katerikoli kontrolni znaki ali metaznak +ДЊe sredi inkrementalnega iskanja pritisnete , boste opazili, +da to pobriЕЎe zadnji znak v iskanem nizu, kazalДЌek pa se premakne +nazaj na mesto v besedilu, kjer je naЕЎel krajЕЎi niz. Na primer, +predpostavimo, da ste do zdaj natipkali В»kaВ« in je kazalДЌek na +mestu, kjer se prviДЌ pojavi В»kaВ«. ДЊe zdaj pritisnete , boste +s tem v pogovornem vmesniku izbrisali В»aВ«, hkrati pa se bo kazalДЌek +postavil na mesto, kjer je prviДЌ naЕЎel В»kВ«, preden ste natipkali ЕЎe +В»aВ«. + +ДЊe sredi iskanja vtipkate katerikoli kontrolni znaki ali metaznak (razen tistih, ki imajo poseben pomen pri iskanju, to sta C-s in C-r), se iskanje prekine. -C-s zaиne iskati na mestu v datoteki, kjer trenutno stoji kazalиek, in -i№иe do konca datoteke. Иe bi radi iskali proti zaиetku datoteke, +C-s zaДЌne iskati na mestu v datoteki, kjer trenutno stoji kazalДЌek, in +iЕЎДЌe do konca datoteke. ДЊe bi radi iskali proti zaДЌetku datoteke, namesto C-s vtipkamo C-r. Vse, kar smo povedali o ukazu C-s, velja tudi za C-r, le smer iskanja je obrnjena. -* VEИ OKEN NA ZASLONU +* VEДЊ OKEN NA ZASLONU --------------------- -Ena simpatiиnih lastnosti Emacsa je, da zna hkrati prikazati veи oken -na ekranu, tudi иe ne delamo v grafiиnem naиinu. +Ena simpatiДЌnih lastnosti Emacsa je, da zna hkrati prikazati veДЌ oken +na zaslonu, tudi ДЌe ne delamo v grafiДЌnem naДЌinu. (Opozorimo naj, da +Emacs uporablja izraz В»okvirВ« (angl. В»frameВ«) - razloЕѕen je v +naslednjem razdelku - za tisto, ДЌemur nekateri drugi programi pravijo +В»oknoВ« (angl. В»windowВ«). PriroДЌnik za Emacs vsebuje glosar +uporabljenih izrazov.) ->> Premaknite kazalиek v to vrstico in vtipkajte C-u 0 C-l (zadnji - znak je CONTROL-L, ne CONTROL-1) +>> Premaknite kazalДЌek v to vrstico in vtipkajte C-l C-l. >> Zdaj vtipkajte C-x 2, da razdelite zaslon na dve okni. - V obeh oknih imate odprt ta priroиnik. Kazalиek je ostal v zgornjem + V obeh oknih imate odprt ta priroДЌnik. KazalДЌek je ostal v zgornjem oknu. >> Pritisnite C-M-v za listanje v spodnjem oknu. - (Иe nimate tipke META, tipkajte ESC C-v). ->> Vtipkajte C-x o (o kot ,,other``, drugi), da preselite kazalиek v + (ДЊe nimate tipke META, tipkajte ESC C-v). +>> Vtipkajte C-x o (o kot В»otherВ«, drugi), da preselite kazalДЌek v spodnje okno. ->> S C-v in M-v se v spodnjem oknu premikate po vsebini datoteke. - Zgornje okno №e vedno kaѕe ta navodila. ->> Ponovni C-x o vas vrne v zgornje okno. Kazalиek se je vrnil na - mesto, kjer je bil, preden smo skoиili v spodnje okno. +>> Z ukazoma C-v in M-v se v spodnjem oknu premikate po vsebini + datoteke. Zgornje okno ЕЎe vedno kaЕѕe ta navodila. +>> Ponovni C-x o vas vrne v zgornje okno. KazalДЌek se je vrnil na + mesto, kjer je bil, preden smo skoДЌili v spodnje okno. -Z ukazom C-x o lahko preklapljamo med okni. Vsako okno si zapomni, kje -v oknu je ostal kazalиek, samo trenutno aktivno okno pa kazalиek tudi -v resnici prikaѕe. Vsi obiиajni ukazi za urejanje, ki smo se jih -nauиili, veljajo za aktivno okno. +Z ukazom C-x o lahko preklapljamo med okni. Izbrano okno, torej tisto, +v katerem urejamo besedilo, je tisto z zelo opaznim kazalДЌkom, ki +utripa, kadar ne tipkamo. Tudi ostala okna pa si zapomnijo, kje je +ostal kazalДЌek. ДЊe poganjate Emacs v grafiДЌnem naДЌinu, je poloЕѕaj +kazalДЌka v teh oknih prikazan kot ne-utripajoДЌ ДЌrtni pravokotnik. Ukaz C-M-v je zelo uporaben, kadar urejamo besedilo v enem oknu, -drugega pa uporabljamo samo za pomoи. Kazalиek ostaja ves иas v oknu, -v katerem urejamo, po vsebini spodnjega okna pa se vseeno lahko -premikamo, ne da bi morali venomer skakati iz enega okna v drugega. +drugega pa uporabljamo samo za pomoДЌ. Ne da bi zapustili izbrano okno, +se lahko premikamo po vsebini drugega okna z ukazon C-M-v. -C-M-v je primer znaka CONTROL-META. Иe imate v resnici tipko META (na -PC navadno levi Alt), lahko vtipkate C-M-v tako, da drѕite pritisnjeni +C-M-v je primer znaka CONTROL-META. ДЊe imate v resnici tipko META (na +PC navadno levi Alt), lahko vtipkate C-M-v tako, da drЕѕite pritisnjeni tako CONTROL kot META, medtem ko vtipkate v. Ni pomembno, katero od -tipk, CONTROL ali META, pritisnete prvo, saj obe delujeta №ele, ko -pritisnete znak, ki sledi (v zgornjem primeru ,v`). +tipk, CONTROL ali META, pritisnete prvo, saj obe delujeta ЕЎele, ko +pritisnete znak, ki sledi (v zgornjem primeru В»vВ«). -Nasprotno pa je vrstni red pritiskanja pomemben, иe nimate tipke META -in namesto nje uporabljate ESC. V tem primeru morate najprej -pritisniti ESC, potem pa Control-v. Obratna kombinacija, CONTROL-ESC v -ne deluje. To je zato, ker je ESC znak sam po sebi, ne pa modifikator, -kot sta CONTROL in META. +Nasprotno pa je vrstni red pritiskanja pomemben, ДЌe nimate tipke META +in namesto nje uporabljate . V tem primeru morate najprej +pritisniti , potem pa Control-v. Obratna kombinacija, +CONTROL- ne deluje. To je zato, ker je znak sam po sebi, ne +pa modifikator, kot sta CONTROL in META. >> V zgornjem oknu vtipkajte C-x 1, da se znebite spodnjega okna. -(Иe bi vtipkali C-x 1 v spodnjem oknu, bi se znebili -zgornjega. Razmi№ljajte o tem ukazu kot ,,Obdrѕi samo eno okno, in -sicer tisto, v katerem sem zdaj.``) +(ДЊe bi vtipkali C-x 1 v spodnjem oknu, bi se znebili +zgornjega. RazmiЕЎljajte o tem ukazu kot В»ObdrЕѕi samo eno okno, in +sicer tisto, v katerem sem zdaj.В«) -Seveda ni nujno, da obe okni kaѕeta isto delovno podroиje. Иe v enem -oknu izvedete C-x C-f in poi№иete novo datoteko, se vsebina drugega +Seveda ni nujno, da obe okni kaЕѕeta isto delovno podroДЌje. ДЊe v enem +oknu izvedete C-x C-f in poiЕЎДЌete novo datoteko, se vsebina drugega okna ne spremeni. V vsakem oknu lahko neodvisno obdelujete drugo datoteko. -Pa №e ena pot, kako v dveh oknih prikaѕete dve razliиni datoteki: +Pa ЕЎe ena pot, kako v dveh oknih prikaЕѕete dve razliДЌni datoteki: ->> Vtipkajte C-x 4 C-f, in na pozivnik vtipkajte ime ene va№ih - datotek. Konиajte z . Odpre se №e eno okno in izbrana - datoteka se pojavi v drugem oknu. Tudi kazalиek se preseli v drugo +>> Vtipkajte C-x 4 C-f, in na pozivnik vtipkajte ime ene vaЕЎih + datotek. KonДЌajte z . Odpre se ЕЎe eno okno in izbrana + datoteka se pojavi v drugem oknu. Tudi kazalДЌek se preseli v drugo okno. >> Vtipkajte C-x o, da se vrnete nazaj v zgornje okno, in C-x 1, da zaprete spodnje okno. +* VEДЊ HKRATNIH OKVIROV +---------------------- + +Emacs lahko ustvari tudi veДЌ В»okvirovВ«. Okvir je zbirka oken, skupaj z +menuji, drsniki, pogovornim vmesnikom ipd. V grafiДЌnem naДЌinu je +Emacsov В»okvirВ« tisto, ДЌemur veДЌina drugih programov pravi В»oknoВ«. ДЊe +delate v grafiДЌnem naДЌinu, je lahko veДЌ okvirov hkrati prikazanih na +zaslonu. V besedilnem terminalu imamo seveda na voljo le en okvir. + +>> Vtipkajte M-x make-frame + Opazite, kako se je na zaslonu pojavil nov okvir. + +Vse, kar ste poДЌeli v prvotnem okviru, lahko poДЌnete tudi v novem. +Prvi okvir ni v niДЌemer poseben. + +>> Vtipkajte M-x delete-frame + Ukaz izbriЕЎe izbrani okvir. + +Okvir lahko izbriЕЎete tudi z obiДЌajnim naДЌinom, ki ga ponuja grafiДЌni +sistem - pogosto s klikom na simbol В»XВ« v enem od zgornjih kotov okna. +ДЊe zaprete zadnji okvir, s tem obenem zaprete tudi Emacs. + + * REKURZIVNI NIVOJI UREJANJA ---------------------------- -Vиasih boste pri№li v nekaj, иemur se pravi ,,rekurzivni nivo -urejanja``. To se vidi po tem, da v statusni vrstici oglati oklepaji -oklepajo ime glavnega naиina. V osnovnem naиinu bi, na primer, videli +VДЌasih boste priЕЎli v nekaj, ДЌemur se pravi В»rekurzivni nivo +urejanjaВ«. To se vidi po tem, da v statusni vrstici oglati oklepaji +oklepajo ime glavnega naДЌina. V osnovnem naДЌinu bi, na primer, videli [(Fundamental)] namesto (Fundamental). -Iz rekurzivnega nivoja urejanja se re№ite, иe vtipkate ESC ESC ESC. To -zaporedje je vsenamenski ukaz ,,pojdi ven``. Uporabite ga lahko tudi -za ukinjanje odveиnih oken, ali vrnitev iz pogovornega vmesnika. +Iz rekurzivnega nivoja urejanja se reЕЎite, ДЌe vtipkate ESC ESC ESC. To +zaporedje je vsenamenski ukaz В»pojdi venВ«. Uporabite ga lahko tudi +za ukinjanje odveДЌnih oken, ali vrnitev iz pogovornega vmesnika. >> Pritisnite M-x, da odprete pogovorni vmesnik, zatem pa vtipkajte ESC ESC ESC, da pridete ven iz njega. Z ukazom C-g ne morete iz rekurzivnega nivoja urejanja, ker C-g -prekliиe ukaze ali argumente ZNOTRAJ rekurzivnega nivoja. +prekliДЌe ukaze ali argumente ZNOTRAJ rekurzivnega nivoja. -* DODATNA POMOИ +* DODATNA POMOДЊ --------------- -V tem uvodu smo posku№ali zbrati dovolj informacij, da lahko zaиnete -Emacs uporabljati. Emacs ponuja toliko, da bi bilo nemogoиe vse to -zbrati tukaj. Verjetno pa bi se vseeno radi nauиili kaj o №tevilnih -koristnih moѕnostih, ki jih №e ne poznate. Emacs ima ѕe vgrajene +V tem uvodu smo poskuЕЎali zbrati dovolj informacij, da lahko zaДЌnete +Emacs uporabljati. Emacs ponuja toliko, da bi bilo nemogoДЌe vse to +zbrati tukaj. Verjetno pa bi se vseeno radi nauДЌili kaj o ЕЎtevilnih +koristnih moЕѕnostih, ki jih ЕЎe ne poznate. Emacs ima Еѕe vgrajene veliko dokumentacije, do katere lahko pridete s pritiskom na CONTROL-h -(h kot ,,help``, pomoи). +(h kot В»helpВ«, pomoДЌ). -Za pomoи pritisnete C-h, potem pa vtipkate znak, ki pove, kak№no pomoи -ѕelite. Иe ste poplnoma izgubljeni, vtipkajte C-h ? in Emacs vam bo -povedal, kak№na pomoи je sploh na voljo. Иe ste vtipkali C-h, pa ste -si premislili, lahko ukaz prekliиete s C-g. +Za pomoДЌ pritisnete C-h, potem pa vtipkate znak, ki pove, kakЕЎno pomoДЌ +Еѕelite. ДЊe ste poplnoma izgubljeni, vtipkajte C-h ? in Emacs vam bo +povedal, kakЕЎna pomoДЌ je sploh na voljo. ДЊe ste vtipkali C-h, pa ste +si premislili, lahko ukaz prekliДЌete s C-g. -(Na nekaterih sistemih se znak C-h preslika v kaj drugega. To ni -dobro, in v takem primeru se pritoѕite sistemskemu vzdrѕevalcu. Medtem -pa, иe C-h ne prikaѕe sporoиila o pomoиi na dnu zaslona, namesto tega -poskusite pritisniti tipko F1 ali pa vtipkajte M-x help .) +(ДЊe C-h ne prikaЕѕe sporoДЌila o pomoДЌi na dnu zaslona, poskusite +namesto tega pritisniti tipko F1 ali pa vtipkajte M-x help .) -Najosnovnej№i tip pomoиi prikaѕe C-h c. Pritisnite C-h, tipko c, zatem +NajosnovnejЕЎi tip pomoДЌi prikaЕѕe C-h c. Pritisnite C-h, tipko c, zatem pa ukazni znak ali zaporedje ukaznih znakov, in Emacs bo izpisal kratek opis ukaza. >> Vtipkajte C-h c C-p. - Izpi№e se nekaj takega kot + IzpiЕЎe se nekaj takega kot C-p runs the command previous-line -Ukaz je izpisal ime funkcije, ki izvede ukaz. Imena funkcij -uporabljamo, kadar pi№emo prilagoditve in raz№iritve Emacsa. Ker pa so -navadno imena funkcij izbrana tako, da kaj povedo o tem, kaj funkcija -poиne, bo verjetno to tudi dovolj za kratko osveѕitev, иe ste se z -ukazom ѕe kdaj sreиali. +Ukaz je izpisal ime funkcije, ki izvede ukaz. Ker so navadno imena +funkcij izbrana tako, da kaj povedo o tem, kaj funkcija poДЌne, bo +verjetno to tudi dovolj za kratko osveЕѕitev, ДЌe ste se z ukazom Еѕe +kdaj sreДЌali. Ukazu C-h lahko sledi tudi zaporedje znakov, kot na primer C-x C-s, -ali, иe nimate tipke META, v. +ali, ДЌe nimate tipke META, v. -Za veи informacij o ukazu vtipkajte C-h k namesto C-h c. +Za veДЌ informacij o ukazu vtipkajte C-h k namesto C-h c. >> Vtipkajte C-h k C-p. -To odpre novo okno in v njem prikaѕe dokumentacijo o funkciji, obenem +To odpre novo okno in v njem prikaЕѕe dokumentacijo o funkciji, obenem z njenim imenom. Ko ste opravili, vtipkajte C-x 1, da se znebite okna -z pomoиjo. Tega seveda ni potrebno napraviti takoj, ampak lahko -urejate, medtem ko imate odprto okno s pomoиjo, in ga zaprete, ko ste -konиali. +z pomoДЌjo. Tega ni potrebno napraviti ta hip. Namesto tega lahko +urejate, medtem ko imate odprto okno s pomoДЌjo, in ga zaprete, ko ste +konДЌali. -Sledi №e nekaj uporabnih moѕnosti, ki jih ponuja pomoи: +Sledi ЕЎe nekaj uporabnih moЕѕnosti, ki jih ponuja pomoДЌ: - C-h f Opi№i funkcijo. Kot argument morate podati ime + C-h f OpiЕЎi funkcijo. Kot argument morate podati ime funkcije. ->> Poskusite C-h f previous-line. - To izpi№e vse podatke, ki jih ima Emacs o funkciji, ki izvede ukaz C-p. +>> Poskusite C-h f previous-line . + To izpiЕЎe vse podatke, ki jih ima Emacs o funkciji, ki izvede ukaz C-p. -Podoben ukaz C-h v izpi№e dokumentacijo za spremenljivke, s katerimi -lahko nastavite obna№anje Emacsa. Ob pozivniku morate vpisati ime -spremenljivke. +Podoben ukaz C-h v izpiЕЎe dokumentacijo za spremenljivke, vkljuДЌno s +tistimi, s katerimi lahko nastavite obnaЕЎanje Emacsa. Ob pozivniku +morate vpisati ime spremenljivke. - C-h a Apropos. Vtipkajte kljuиno besedo in Emacs bo izpisal - vse ukaze, ki vsebujejo to kljuиno besedo. Vse te - ukaze lahko prikliиete z META-x. Pri nekaterih ukazih + C-h a Apropos. Vtipkajte kljuДЌno besedo in Emacs bo izpisal + vse ukaze, ki vsebujejo to kljuДЌno besedo. Vse te + ukaze lahko prikliДЌete z META-x. Pri nekaterih ukazih bo Apropos izpisal tudi eno ali dvoznakovno - zaporedje, s katerim doseѕete isti uиinek. + zaporedje, s katerim doseЕѕete isti uДЌinek. ->> Vtipkajte C-h a file. +>> Vtipkajte C-h a file . To odpre novo okno, v katerem so vsa dolga imena ukazov, ki vsebujejo -,,file`` v imenu. Izvedete jih lahko z M-x. Pri nekaterih se izpi№e +В»fileВ« v imenu. Izvedete jih lahko z M-x. Pri nekaterih se izpiЕЎe tudi kratek ukaz, npr. C-x C-f ali C-x C-w pri ukazih find-file in write-file. ->> Pritisnite C-M-v, da se sprehajate po oknu s pomoиjo. Poskusite +>> Pritisnite C-M-v, da se sprehajate po oknu s pomoДЌjo. Poskusite nekajkrat. ->> Vtipkajte C-x 1, da zaprete okno s pomoиjo. +>> Vtipkajte C-x 1, da zaprete okno s pomoДЌjo. - C-h i Priroиniki z navodili za uporabo (tkim. datoteke - "info"). Ta ukaz vas prestavi v posebno delovno - podroиje, imenovano "info". V njem lahko prebirate - priroиnike za programe, ki so name№иeni v sistemu. Z - ukazom m emacs denimo dobite priroиnik za - urejevalnik Emacs. Иe sistema Info №e niste + C-h i PriroДЌniki z navodili za uporabo (tkim. datoteke + В»infoВ«). Ta ukaz vas prestavi v posebno delovno + podroДЌje, imenovano В»*info*В«. V njem lahko prebirate + priroДЌnike za programe, ki so nameЕЎДЌeni v sistemu. Z + ukazom m emacs denimo dobite priroДЌnik za + urejevalnik Emacs. ДЊe sistema Info ЕЎe niste uporabljali, vtipkajte ? in Emacs vas bo popeljal na - vуdeni izlet po naиinu Info in moѕnostih, ki jih - ponuja. Ko boste zakljuиili z branjem tega prvega - berila, bo priroиnik za Emacs v sistemu Info va№ + vГіdeni izlet po naДЌinu Info in moЕѕnostih, ki jih + ponuja. Ko boste zakljuДЌili z branjem tega prvega + berila, bo priroДЌnik za Emacs v sistemu Info vaЕЎ glavni vir dokumentacije. -* DRUGE MO®NOSTI +* DRUGE MOЕЅNOSTI ---------------- -©e veи se lahko nauиite o Emacsu z branjem priroиnika, bodisi -natisnjenega, bodisi na zaslonu v sistemu Info (uporabite menu Help -ali vtipkajte F10 h r). Dve moѕnosti, ki vam bosta morda posebej v№eи, -sta samodejno zakljuиevanje vrstice, s katerim prihranite nekaj -tipkanja, in dired, s katerim poenostavimo delo z datotekami. +Е e veДЌ se lahko nauДЌite o Emacsu z branjem priroДЌnika, bodisi +natisnjenega, bodisi znotraj samega Emacsa (uporabite menu Help ali +vtipkajte C-h r). Dve moЕѕnosti, ki vam bosta morda posebej vЕЎeДЌ, sta +samodejno zakljuДЌevanje vrstice, s katerim prihranite nekaj tipkanja, +in dired, s katerim poenostavimo delo z datotekami. -Samodejno zakljuиevanje vrstic je naиin, s katerim prihranimo nekaj -tipkanja. Иe ѕelite denimo preklopiti v delovno podroиje *Messages*, +Samodejno zakljuДЌevanje vrstic je naДЌin, s katerim prihranimo nekaj +tipkanja. ДЊe Еѕelite denimo preklopiti v delovno podroДЌje *Messages*, je dovolj, da vtipkate C-x b *M in Emacs bo sam dopolnil -preostanek imena delovnega podroиja. Samodejno zakljuиevanje je -opisano v sistemu Info v priroиniku za Emacs, razdelek ,,Completion``. +preostanek imena delovnega podroДЌja. Samodejno zakljuДЌevanje deluje +tudi za imena ukazov in imena datotek. Samodejno zakljuДЌevanje je +opisano v priroДЌniku za Emacs, razdelek В»CompletionВ«. -Dired omogoиa izpis seznama datotek v imeniku (in po moѕnosti tudi +Dired omogoДЌa izpis seznama datotek v imeniku (in po moЕѕnosti tudi podimenikih), premikanje po seznamu, obiskovanje (odpiranje), preimenovanje, brisanje in druge operacije z datotekami. Dired je -opisav v sistemu Info v priroиniku za Emacs, razdelek ,,Dired``. +opisav v priroДЌniku za Emacs, razdelek В»DiredВ«. -Priroиnik opisuje tudi mnoge druge moѕnosti Emacsa. +PriroДЌnik opisuje tudi mnoge druge moЕѕnosti Emacsa. -* ZAKLJUИEK +* ZAKLJUДЊEK ----------- -Zapomnite si, da Emacs zapustite z ukazom C-x C-c. Иe bi radi samo -zaиasno skoиili v ukazno lupino in se kasneje vrnili v Emacs, pa -storite to z ukazom C-z. +Emacs zapustite z ukazom C-x C-c. -Ta uиbenik je napisan z namenom, da bi bil razumljiv vsem novincem v -Emacsu. Иe se vam kaj ne zdi jasno napisano, ne valite krivde nase - -pritoѕite se! +Ta uДЌbenik je napisan z namenom, da bi bil razumljiv vsem novincem v +Emacsu. ДЊe se vam kaj ne zdi jasno napisano, ne valite krivde nase - +pritoЕѕite se! -* RAZMNO®EVANJE IN RAZ©IRJANJE +* RAZMNOЕЅEVANJE IN RAZЕ IRJANJE ------------------------------ -Angle№ki izvirnik tega uvoda v Emacs je naslednik dolge vrste tovrstnih -besedil, zaиen№i s tistim, ki ga je Stuart Cracraft napisal za izvorni -Emacs. V sloven№иino ga je prevedel Primoѕ Peterlin. +AngleЕЎki izvirnik tega uvoda v Emacs je naslednik dolge vrste tovrstnih +besedil, zaДЌenЕЎi s tistim, ki ga je Stuart Cracraft napisal za izvorni +Emacs. V slovenЕЎДЌino ga je prevedel PrimoЕѕ Peterlin. To besedilo, kot sam GNU Emacs, je avtorsko delo, in njegovo -razmnoѕevanje in raz№irjanje je dovoljeno pod naslednjimi pogoji: +razmnoЕѕevanje in razЕЎirjanje je dovoljeno pod naslednjimi pogoji: + +Copyright В© 1985, 1996, 1998, 2001-2012 Free Software Foundation, Inc. -Copyright (C) 1985, 1996, 1998, 2001-2012 Free Software Foundation, Inc. + Ta datoteka je del paketa GNU Emacs. - Dovoljeno je izdelovati in raz№irjati neokrnjene kopije tega spisa - v kakr№nikoli obliki pod pogojem, da je ohranjena navedba o - avtorstvu in to dovoljenje, ter da distributer dovoljuje prejemniku - nadaljnje raz№irjanje pod pogoji, navedenimi v tem dovoljenju. + GNU Emacs je prost program; lahko ga redistribuirate in/ali prirejate + po pogojih, doloДЌenih v dovoljenju za rabo В»GNU General Public LicenseВ«, + izdanem pri Free Software Foundation, bodisi 3. izdaje tega dovoljenja, + bodisi katerekoli kasnejЕЎe izdaje, ki je na voljo. - Pod pogoji iz prej№njega odstavka je dovoljeno raz№irjati - spremenjene verzije tega spisa ali njegovih delov, иe je jasno - oznaиeno, kdo je nazadnje vnesel spremembe. + GNU Emacs je ponujen v dobri veri, da je uporaben, vendar zanj NI + NOBENEGA JAMSTVA, niti implicitnih jamstev PRIMERNOSTI ZA PRODAJO + ali USTREZNOSTI ZA DOLOДЊEN NAMEN. Podrobnosti so na voljo v В»GNU + General Public LicenseВ«. -Pogoji za razmnoѕevanje in raz№irjanje samega Emacsa so malo drugaиni, -a v istem duhu. Prosimo, preberite datoteko COPYING in potem dajte -kopijo programa GNU Emacs svojim prijateljem. Pomagajte zatreti -obstrukcionizem (,,lastni№tvo``) v programju tako, da uporabljate, -pi№ete in delite prosto programje! + Kopijo В»GNU General Public LicenseВ« bi morali prejeti skupaj s paketom + GNU Emacs. ДЊe je niste, je na voljo na . + +Prosimo, preberite datoteko COPYING in potem ponudite kopijo programa +GNU Emacs svojim prijateljem. Pomagajte zatreti obstrukcionizem +(В»lastniЕЎtvoВ«) v programju tako, da uporabljate, piЕЎete in delite +prosto programje! ;;; Local Variables: -;;; coding: iso-latin-2 +;;; coding: utf-8 ;;; sentence-end-double-space: nil ;;; End: - diff --git a/etc/tutorials/TUTORIAL.translators b/etc/tutorials/TUTORIAL.translators index 64780687bb1..3408ef79fd3 100644 --- a/etc/tutorials/TUTORIAL.translators +++ b/etc/tutorials/TUTORIAL.translators @@ -75,8 +75,8 @@ Author: Miroslav VaЕЎko Maintainer: Maintainer needed. * TUTORIAL.sl: -Author: PrimoЕѕ Peterlin -Maintainer: PrimoЕѕ Peterlin +Author: PrimoЕѕ Peterlin +Maintainer: PrimoЕѕ Peterlin * TUTORIAL.sv: Author: Mats Lidell -- cgit v1.3 From 0a1cb9ede18ed66a5c1792ed2de09946ba7e61de Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 17 Jan 2012 19:38:59 -0800 Subject: * etc/TODO: Add entry for writing tests. --- etc/TODO | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'etc') diff --git a/etc/TODO b/etc/TODO index 411581673e3..db1d50192f2 100644 --- a/etc/TODO +++ b/etc/TODO @@ -71,6 +71,12 @@ things in their .emacs. ** See if other files can use generated-autoload-file (see eg ps-print). +** Write more tests. Pick a fixed bug from the database, write a test +case to make sure it stays fixed. Or pick your favorite programming +major-mode, and write a test for its indentation. Or a version +control backend, and write a test for its status parser. Etc. +See test/automated for examples. + * Small but important fixes needed in existing features: ** Flymake's customization mechanism needs to be both simpler (fewer -- cgit v1.3 From 3fcca64dce0c0e9f6c6fc55f19ce47fe9e861352 Mon Sep 17 00:00:00 2001 From: Werner LEMBERG Date: Wed, 18 Jan 2012 11:33:30 +0100 Subject: * tutorial/TUTORIAL.de: Updated; synchronize with TUTORIAL. Minor typographical improvements. --- etc/ChangeLog | 5 + etc/tutorials/TUTORIAL.de | 746 ++++++++++++++++++++++------------------------ 2 files changed, 362 insertions(+), 389 deletions(-) (limited to 'etc') diff --git a/etc/ChangeLog b/etc/ChangeLog index b13b858ca4e..c6ba86a029a 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,8 @@ +2012-01-19 Werner Lemberg + + * tutorial/TUTORIAL.de: Updated; synchronize with TUTORIAL. + Minor typographical improvements. + 2012-01-17 Primoz PETERLIN * tutorials/TUTORIAL.sl: Update. diff --git a/etc/tutorials/TUTORIAL.de b/etc/tutorials/TUTORIAL.de index 2908203b391..3e6927441c8 100644 --- a/etc/tutorials/TUTORIAL.de +++ b/etc/tutorials/TUTORIAL.de @@ -15,7 +15,7 @@ EDIT oder ALT genannt). Folgende Abk M-f Halten Sie die META-Taste gedrьckt und geben Sie den Buchstaben (klein) f ein. -`>>' am linken Rand ist ein Hinweis, einen Befehl auszuprobieren: +»>>« am linken Rand ist ein Hinweis, einen Befehl auszuprobieren: <> [Leerzeilen befinden sich hier aus didaktischen Grьnden. Fortsetzung unten.] >> Drьcken Sie C-v, um zur nдchsten Bildschirmseite vorzublдttern. @@ -32,7 +32,7 @@ Wichtig: Sie k Im weiteren wird die ESC-Taste mit bezeichnet. [Falls die deutschen Umlaute nicht korrekt auf dem Bildschirm -erscheinen, lesen Sie bitte den Abschnitt `MULE' kurz vor Ende dieser +erscheinen, lesen Sie bitte den Abschnitt »MULE« kurz vor Ende dieser Einfьhrung.] Zunдchst mьssen Sie wissen, wie man sich innerhalb eines Dokuments @@ -43,9 +43,9 @@ Sie zuerst und anschlie >> Probieren Sie einige Male M-v und C-v aus. -[Auf den meisten Tastaturen bewirkt die PgUp-Taste (`page up', auch -mit `Bild' und einem Aufwдrtspfeil beschriftet) dasselbe wie M-v bzw. -die PgDn-Taste (`page down', `Bild' mit Abwдrtspfeil) dasselbe wie +[Auf den meisten Tastaturen bewirkt die PgUp-Taste (»page up«, auch +mit »Bild« und einem Aufwдrtspfeil beschriftet) dasselbe wie M-v bzw. +die PgDn-Taste (»page down«, »Bild« mit Abwдrtspfeil) dasselbe wie C-v.] @@ -60,13 +60,14 @@ betrachten: C-l lцsche den Bildschirm und stelle den ganzen Text erneut dar, wobei der Text rund um den Cursor zur Mitte des Bildschirms bewegt wird. - (`l' ist der Buchstabe `klein L', nicht die Ziffer 1.) + (»l« ist der Buchstabe »klein L«, nicht die Ziffer 1.) ->> Lokalisieren Sie den Cursor und merken sich den Text in dessen - Umgebung. Drьcken Sie C-l. Der Cursor ist jetzt ungefдhr in der - (vertikalen) Bildschirmmitte, und er hat seine Position relativ zum - Text nicht geдndert. +>> Finden Sie den Cursor und merken sich den Text in dessen Umgebung. + Drьcken Sie C-l. Der Cursor ist jetzt ungefдhr in der (vertikalen) + Bildschirmmitte, und er hat seine Position relativ zum Text nicht + geдndert. Wiederholtes Drьcken von C-l bewegt den Text zum oberen + Bildschirmrand, dann zum unteren, und dann wieder zur Mitte. * KONTROLLE DES CURSORS @@ -91,7 +92,7 @@ Befehl den Cursor wohin bewegt: [Die Buchstaben p, b, f und n stehen fьr die englischen Wцrter -`previous', `backward', `forward' und `next'.] +»previous«, »backward«, »forward« und »next«.] >> Bewegen Sie den Cursor zur Zeile in der Mitte des Diagramms mittels C-n oder C-p. Geben Sie dann C-l ein, und das ganze Diagramm ist @@ -113,8 +114,10 @@ unterst Beobachten Sie, was C-p tut, wenn der Cursor sich in der Zeilenmitte befindet. -Jede Textzeile endet mit einem Zeilenvorschub-Zeichen (`newline'), das -sie von der folgenden Zeile trennt. +Jede Textzeile endet mit einem Zeilenvorschub-Zeichen (»newline«), das +sie von der folgenden Zeile trennt. Die letzte Zeile in einer Datei +hat normalerweise ebenfalls einen Zeilenvorschub am Schluss, Emacs +benцtigt ihn aber nicht. >> Probieren Sie C-b am Anfang einer Zeile. Der Cursor sollte zum Ende der vorigen Zeile springen: C-b ьberspringt @@ -132,7 +135,7 @@ C-f Wenn Sie den Cursor entweder nach oben oder nach unten ьber den Bildschirmrand hinaus bewegen wollen, dann wird statt dessen Text in -den Bildschirm hineingeschoben. Dies nennt man `scrolling'. Auf +den Bildschirm hineingeschoben. Dies nennt man »scrolling«. Auf diese Weise verhindert Emacs, dass der Cursor je den sichtbaren Bereich verlдsst. @@ -155,7 +158,7 @@ analog, aber in die entgegengesetzte Richtung. zwischen Wцrtern zu beobachten. Beachten Sie die Parallele zwischen C-f und C-b einerseits und M-f und -M-b andererseits. Sehr oft werden mit `META-' beginnende Befehle fьr +M-b andererseits. Sehr oft werden mit »META-« beginnende Befehle fьr Operationen verwendet, die mit Sprache zu tun haben (Wцrter, Sдtze, Absдtze), wдhrend CONTROL-Befehle mit den Text-Basiseinheiten operieren, unabhдngig davon, was Sie gerade editieren (Zeichen, @@ -181,26 +184,26 @@ lassen. Dadurch erm Abkьrzungspunkten und dem Satzende unterscheiden kann, was fьr Textsuche in wissenschaftlichen Texten oft vorteilhaft ist.] -[Anmerkung 2: Die Tasten `Home' (Pos1) und `End' (Ende) verhalten sich +[Anmerkung 2: Die Tasten »Home« (Pos1) und »End« (Ende) verhalten sich standardmдЯig wie C-a und C-e, wie wohl die meisten Benutzer annehmen.] -Die aktuelle Position des Cursors wird im Englischen auch `point' -(Punkt) genannt. Beachten Sie bitte, dass sich `point' stets +Die aktuelle Position des Cursors wird im Englischen auch »point« +(Punkt) genannt. Beachten Sie bitte, dass sich »point« stets *zwischen* zwei Zeichen befindet, nдmlich genau vor dem Cursor-Kдstchen. Hier ist eine Zusammenfassung von einfachen Bewegungsbefehlen fьr den Cursor einschlieЯlich der Wort- und Satzbewegungsbefehle: - C-f ein Zeichen vorwдrts (auch `Pfeil rechts'-Taste) - C-b ein Zeichen zurьck (auch `Pfeil links'-Taste) + C-f ein Zeichen vorwдrts (auch »Pfeil rechts«-Taste) + C-b ein Zeichen zurьck (auch »Pfeil links«-Taste) M-f ein Wort vorwдrts M-b ein Wort zurьck - C-n eine Zeile vorwдrts (auch `Pfeil hinunter'-Taste) - C-p eine Zeile zurьck (auch `Pfeil hinauf'-Taste) + C-n eine Zeile vorwдrts (auch »Pfeil hinunter«-Taste) + C-p eine Zeile zurьck (auch »Pfeil hinauf«-Taste) C-a zum Zeilenanfang C-e zum Zeilenende @@ -215,7 +218,7 @@ Zwei weitere wichtige Befehle f Kleiner-als) und M-> (META GrцЯer-als), welche zum Anfang bzw. zum Ende des ganzen Textes springen. -Bei den meisten Terminal-Tastaturen befindet sich `<' ьber dem Komma, +Bei den meisten Terminal-Tastaturen befindet sich »<« ьber dem Komma, d.h., Sie mьssen zusдtzlich die SHIFT-Taste verwenden (der Umschalter ist auf deutschen Tastaturen normalerweise mit einem dicken Aufwдrtspfeil markiert). Ohne SHIFT-Taste wьrden Sie M-Komma @@ -224,17 +227,17 @@ eingeben. >> Testen Sie nun M-<, um an den Anfang der Einfьhrung zu gelangen. Verwenden Sie dann C-v, um wieder hierher zu kommen. -[Anmerkung: Die Tastenkombinationen `C-Home' (Pos1) und `C-End' (Ende) +[Anmerkung: Die Tastenkombinationen »C-Home« (Pos1) und »C-End« (Ende) verhalten sich standardmдЯig wie M-< und M->.] Ein weiteres, oft benьtztes Konzept in Emacs ist die Markierung -(`mark'). Der Grundbefehl dazu ist C-SPC (oder gleichwertig C-@, -`SPC' bezeichnet die Leertaste, engl. `space key'); mit ihm kann eine +(»mark«). Der Grundbefehl dazu ist C-SPC (oder gleichwertig C-@, +»SPC« bezeichnet die Leertaste, engl. »space key«); mit ihm kann eine Markierung gesetzt werden. Mit C-u C-SPC kommt man zu dieser Markierung zurьck, falls man den Cursor inzwischen weiterbewegt hat. Viele Befehle, die groЯe Sprьnge in einem Text ausfьhren (so auch M-> und M-<) setzen eine Markierung implizit, was in der untersten Zeile -(dem Echobereich, s.u.) als `Mark set' angezeigt wird. +(dem Echobereich, s.u.) als »Mark set« angezeigt wird. >> Verwenden Sie jetzt M->, um zum Ende der Einfьhrung zu springen und benьtzen Sie C-u C-SPC, um hierher zurьckzukehren. @@ -257,7 +260,7 @@ Ziffern und dann der Befehl selbst. Alternativ k META-Taste (bzw. EDIT- oder ALT-Taste) gedrьckt halten und dann die Ziffern des Wiederholungszдhlers eingeben. Wir empfehlen allerdings, die C-u-Methode zu lernen, da sie mit jedem Terminal funktioniert. -Das numerische Argument wird auch `Prдfix-Argument' genannt, da man es +Das numerische Argument wird auch »Prдfix-Argument« genannt, da man es vor dem zugehцrigen Befehl eingibt. Beispiel: C-u 8 C-f bewegt den Cursor acht Zeichen vorwдrts. @@ -268,7 +271,7 @@ Beispiel: C-u 8 C-f bewegt den Cursor acht Zeichen vorw Wie gesagt, die meisten Befehle verwenden das numerische Argument als Wiederholungszдhler, jedoch nicht alle. Einige davon, die allerdings -noch nicht besprochen wurden, benьtzen es als Flag (`Flagge'), d.h., +noch nicht besprochen wurden, benьtzen es als Flag (»Flagge«), d.h., allein das Vorhandensein eines Prдfix-Arguments, unabhдngig von seinem Wert, signalisiert dem Befehl, etwas anderes zu tun. @@ -283,27 +286,20 @@ Der Bildschirminhalt sollte jetzt um acht Zeilen nach oben verschoben sein. Wollen Sie ihn nach unten verschieben, dann geben Sie M-v mit einem numerischen Argument ein. -Wenn Sie eine graphische Oberflдche wie X11 oder MS-Windows verwenden, -dann befindet sich ein schmaler, langgezogener rechteckiger Bereich auf -der linken oder rechten Seite des Emacs-Fensters. Dieser Bereich -wird Scrollbar genannt (`Verschiebungsbalken'). Sie kцnnen Text +Wenn Sie eine graphische Oberflдche wie X oder MS-Windows verwenden, +dann befindet sich ein schmaler, langgezogener rechteckiger Bereich +auf der linken oder rechten Seite des Emacs-Fensters. Dieser Bereich +wird Scrollbar genannt (»Verschiebungsbalken«). Sie kцnnen Text verschieben, indem Sie mit der Maus auf den Scrollbar klicken. ->> Drьcken Sie die mittlere Taste (oder die linke und rechte Taste - gleichzeitig, falls Sie eine Zwei-Tasten-Maus verwenden) innerhalb - des Scrollbar-Bereichs. Das sollte den Text zu einer Position - verschieben, die davon abhдngt, wie weit oben oder unten Sie - geklickt haben. - ->> Bewegen Sie nun die Maus auf und ab, wдhrend Sie die mittlere Taste - gedrьckt halten. Sie werden sehen, dass der Text entsprechend der - Mausbewegungen nach oben oder unter verschoben wird. +Hat Ihre Maus ein Mausrad, kцnnen Sie damit ebenfalls Text +verschieben. * WENN EMACS NICHT MEHR REAGIERT -------------------------------- -Wenn Emacs `hдngt', also auf keine Ihrer Eingaben reagiert, drьcken +Wenn Emacs »hдngt«, also auf keine Ihrer Eingaben reagiert, drьcken Sie C-g. Sie kцnnen C-g auch dazu benьtzen, einen Befehl zu stoppen, der zu lange braucht. @@ -323,13 +319,13 @@ mit C-g r * DEAKTIVIERTE BEFEHLE ---------------------- -Ein paar Befehle von Emacs sind deaktiviert (`disabled'), damit +Ein paar Befehle von Emacs sind deaktiviert (»disabled«), damit Anfдnger sie nicht unabsichtlich benutzen. Wenn Sie einen solchen Befehl eingeben, dann gibt Emacs eine Meldung aus und fragt Sie, ob Sie ihn wirklich ausfьhren wollen. -Antworten Sie mit y (fьr `yes') oder drьcken Sie die Leertaste, wenn +Antworten Sie mit y (fьr »yes«) oder drьcken Sie die Leertaste, wenn Sie den Befehl ausfьhren wollen, sonst mit n. >> Geben Sie C-x C-l ein (das ist ein deaktivierter Befehl) und @@ -339,7 +335,7 @@ Sie den Befehl ausf * FENSTER --------- -Emacs kann mehrere Fenster (`windows') haben, von denen jedes seinen +Emacs kann mehrere Fenster (»windows«) haben, von denen jedes seinen eigenen Text darstellt. Spдter erklдren wir, wie man mit Fenstern umgeht. Hier wollen wir nur erklдren, wie man ein (vielleicht irrtьmlich erzeugtes) Fenster wieder entfernt und zum normalen @@ -351,14 +347,14 @@ Das ist C-x gefolgt von der Ziffer 1. C-x 1 expandiert das Fenster, in dem der Cursor sich befindet, sodass es den ganzen Bildschirm erfasst. Alle anderen Fenster werden gelцscht. -[Anmerkung: Emacs verwendet das Wort Fenster (`windows') in einem +[Anmerkung: Emacs verwendet das Wort Fenster (»windows«) in einem anderen Sinn, als Sie es vielleicht gewцhnt sind. Wenn Sie einen Textbildschirm vor sich haben, dann ist die Terminologie eindeutig. Wenn Sie allerdings eine graphische Oberflдche benutzen, dann bezeichnet ein Emacs-Fenster einen Teilbereich des Fensters (von Ihrer graphischen Oberflдche erzeugt), in dem Emacs lдuft, in vцlliger Analogie zum Textmodus. Fьr (graphische) Fenster im herkцmmlichen -Sinn verwenden die Emacs-Entwickler den Ausdruck Rahmen (`frame').] +Sinn verwenden die Emacs-Entwickler den Ausdruck »Rahmen« (»frame«).] >> Bewegen Sie den Cursor zu dieser Zeile und geben Sie C-u 0 C-l ein. @@ -376,38 +372,32 @@ Sinn verwenden die Emacs-Entwickler den Ausdruck Rahmen (`frame').] Wenn Sie Text einfьgen wollen, dann geben Sie ihn einfach ein. Sichtbare Zeichen, z.B. A, 7, * usw. werden als Text von Emacs sofort eingefьgt. Drьcken Sie (die Zeilenvorschubtaste, meistens -mit `Enter' oder nur mit einem Rьckwдrts-Hakenpfeil beschriftet), um +mit »Enter« oder nur mit einem Rьckwдrts-Hakenpfeil beschriftet), um ein Zeilenvorschubzeichen einzufьgen. -Sie kцnnen das zuletzt eingegebene Zeichen lцschen, indem Sie -drьcken. ist einer Taste auf der Tastatur zugeordnet, die -mit `Del' oder `Entf' beschriftet ist. In manchen Fдllen dient die -Backspace-Taste (oft auch nur als Rьckwдrtspfeil beschriftet) als -, aber nicht immer! +Sie kцnnen das zuletzt eingegebene Zeichen lцschen, indem Sie +drьcken. ist der Backspace-Taste zugeordnet (oft auch nur als +Rьckwдrtspfeil beschriftet). -Allgemein gesprochen lцscht das Zeichen unmittelbar vor der +Allgemein gesprochen lцscht das Zeichen unmittelbar vor der aktuellen Cursorposition. -[Beachten Sie, dass ein logischer Befehlsname ist, der auf -die jeweilige Tastatur abgebildet wird. Lesen Sie im Abschnitt `Init -Rebinding' des Emacs-Handbuches nach, wie Sie gegebenenfalls die -Tastaturbelegung verдndern kцnnen.] - >> Probieren Sie das jetzt aus: Geben Sie ein paar Zeichen ein und - lцschen Sie sie wieder mit . Sie brauchen sich keine - Sorgen zu machen, dieses Dokument zu verдndern: Was Sie hier lesen, - ist nur eine (persцnliche) Kopie des originalen Dokuments. + lцschen Sie sie wieder mit . Sie brauchen sich keine Sorgen + zu machen, dieses Dokument zu verдndern: Was Sie hier lesen, ist + nur eine (persцnliche) Kopie des originalen Dokuments. -Wenn eine Textzeile zu lang wird fьr eine Bildschirmzeile, dann wird -sie auf einer zweiten Bildschirmzeile `fortgesetzt'. Ein -`Backslash'-Zeichen (`\') bzw. ein kleiner gebogener Pfeil (bei -graphischen Oberflдchen) am rechten Rand verdeutlicht das. +Wenn eine Textzeile zu lang fьr eine Bildschirmzeile ist, wird sie auf +einer zweiten Bildschirmzeile »fortgesetzt«: Bei graphischen +Oberflдchen erscheinen zwei kleine gebogene Pfeile links und rechts +vom Textbereich (diese schmalen Spalten werden »fringe« genannt), bei +Terminals ein »Backslash«-Zeichen (»\«) am rechten Rand. >> Fьgen Sie Text ein, bis Sie den rechten Rand erreicht haben. Fьgen Sie weiter Text ein. Beobachten Sie, wie eine Fortsetzungszeile erscheint. ->> Verwenden Sie so oft, bis die Textzeile wieder auf eine +>> Verwenden Sie so oft, bis die Textzeile wieder auf eine Bildschirmzeile passt. Die Fortsetzungszeile verschwindet wieder. Sie kцnnen das Zeilenvorschubzeichen wie jedes andere Zeichen lцschen: @@ -415,7 +405,7 @@ Die Zeilen vor und nach ihm werden dann zu einer zusammengeh diese lдnger als die Bildschirmbreite, erscheint eine Fortsetzungszeile. ->> Bewegen Sie den Cursor zum Anfang der Zeile und geben Sie +>> Bewegen Sie den Cursor zum Anfang der Zeile und geben Sie ein: Die momentane Zeile wird an die vorige angehдngt. >> Geben Sie ein, um wieder ein Zeilenvorschubzeichen @@ -432,10 +422,10 @@ Bis jetzt kennen Sie die Grundbefehle, um Text in Emacs einzugeben und Fehler zu korrigieren -- fast analog zu den Bewegungsbefehlen ist es mцglich, ganze Wцrter, Sдtze oder Zeilen zu lцschen: - lцsche ein Zeichen vor dem Cursor + lцsche ein Zeichen vor dem Cursor C-d lцsche das Zeichen unter dem Cursor - M- lцsche bis zum (nдchsten) Wortanfang unmittelbar + M- lцsche bis zum (nдchsten) Wortanfang unmittelbar vor dem Cursor M-d lцsche bis zum (nдchsten) Wortende nach (bzw. unter) dem Cursor @@ -445,42 +435,40 @@ m M-k lцsche bis zum nдchsten Satzende nach (bzw. unter) dem Cursor -Beachten Sie bitte, dass je nach Tastaturbelegung die Del- -(Entf-) oder die Backspace- (Rьckwдrtspfeil-) Taste sein kann. - Eine andere, einheitliche Methode zum Lцschen von Text ist das Befehlspaar C-@ (oder C-SPC) und C-w. Gehen sie zum Anfang des zu lцschenden Textes und drьcken Sie C-@ oder C-SPC. Gehen Sie dann zum Ende des zu lцschenden Textes und drьcken Sie C-w, um ihn zu entfernen. ->> Bewegen Sie den Cursor zum Buchstaben `E' am Anfang des letzten +>> Bewegen Sie den Cursor zum Buchstaben »E« am Anfang des letzten Absatzes. ->> Drьcken Sie C-SPC. Emacs sollte die Meldung `Mark set' am unteren +>> Drьcken Sie C-SPC. Emacs sollte die Meldung »Mark set« am unteren Bildschirmrand zeigen. ->> Bewegen Sie den Cursor zum Buchstaben `A' in der zweiten Zeile des +>> Bewegen Sie den Cursor zum Buchstaben »A« in der zweiten Zeile des letzten Absatzes. ->> Geben Sie C-w ein. Der ganze Text, beginnend mit dem `E' und - endend vor dem `A', ist nun gelцscht. +>> Geben Sie C-w ein. Der ganze Text, beginnend mit dem »E« und + endend vor dem »A«, ist nun gelцscht. Lцschen Sie mehr als ein Zeichen auf einmal, speichert Emacs den gelцschten Text, damit Sie ihn bei Bedarf wieder zurьckholen kцnnen. Einfьgen von bereits gelцschtem Text wird im englischen Dokumentation -von Emacs als `yanking' (wцrtlich `herausreiЯen') bezeichnet. Sie +von Emacs als »yanking« (wцrtlich »herausreiЯen«) bezeichnet. Sie kцnnen den gelцschten Text an einer beliebigen Stelle wieder einzufьgen. Solange Sie nichts neues lцschen, steht Ihnen dieser gelцschte Textteil immer wieder zu Verfьgung. Der Befehl dazu ist C-y -(das Ypsilon steht fьr `yank'). +(das Ypsilon steht fьr »yank«). Emacs unterscheidet zwei Klassen von Lцschbefehlen (was man im -Deutschen leider nicht gut wiedergeben kann): `killing' (umbringen) -und `deleting' (lцschen). Wenn man sich vorstellt, dass `yanking' den -Begriff `von den Toten erwecken' darstellt, dann hat man ungefдhr eine -Vorstellung von der Metapher -- Von einem `kill'-Befehl gelцschter -Text wird gespeichert und kann bei Bedarf mit C-y zurьckgeholt -werden. Von einem `delete'-Befehl entfernter Text (in der Regel -einzelne Zeichen, leere Zeilen und Zwischenrдume) wird nicht extra -gespeichert und kann daher auch nicht zurьckgeholt werden. +Deutschen leider nicht gut wiedergeben kann): »killing« (umbringen) +und »deleting« (lцschen). Wenn man sich vorstellt, dass »yanking« den +Begriff »von den Toten erwecken« darstellt, dann hat man ungefдhr eine +Vorstellung von der Metapher -- Von einem »kill«-Befehl gelцschter +Text wird gespeichert und kann bei Bedarf mit C-y zurьckgeholt werden. +Von einem »delete«-Befehl entfernter Text (in der Regel einzelne +Zeichen, leere Zeilen und Zwischenrдume) wird nicht extra gespeichert +und kann daher auch nicht zurьckgeholt werden. Allerdings besteht die +Mцglichkeit zum »Undo«, siehe weiter unten. >> Bringen Sie den Cursor an den Anfang einer nicht-leeren Zeile und geben Sie C-k ein, um die Zeile zu lцschen. @@ -495,12 +483,16 @@ behandelt: es l Zeilenvorschьbe: C-u 2 C-k lцscht zwei Zeilen komplett; zweimal C-k lцscht dagegen nur eine Zeile. -Wie schon erwдhnt, bringt C-y den zuletzt gelцschten (`gekillten') +Wie schon erwдhnt, bringt C-y den zuletzt gelцschten (»gekillten«) Text zurьck -- man kann diesen Text einfьgen, wo man will: an der ursprьnglichen Stelle, an einer anderen Stelle, oder sogar in einer anderen Datei. Mehrmaliges Ausfьhren von C-y fьgt den Text mehrmals ein. +In anderen Editoren wird »kill« und »yank« oft als »cut« +(ausschneiden) und »paste« (einfьgen) bezeichnet. Nдheres dazu findet +sich im Abschnitt »Glossary« des Emacs-Handbuchs. + >> Probieren Sie jetzt C-y, um diesen Effekt zu sehen. Fьhren Sie C-k mehrmals hintereinander aus, dann wird der so @@ -509,14 +501,14 @@ Text zur >> Drьcken Sie mehrmals C-k. -Holen Sie jetzt den Text `von den Toten' zurьck: +Holen Sie jetzt den Text »von den Toten« zurьck: >> Drьcken Sie C-y. Bewegen Sie dann den Cursor ein paar Zeilen nach unten und drьcken Sie C-y erneut. Der eben eingefьgte Text wird noch einmal an anderer Stelle kopiert. Wie kцnnen Sie gelцschten Text wieder einfьgen, wenn Sie in der -Zwischenzeit noch etwas anderes `gekillt' haben? C-y wьrde das +Zwischenzeit noch etwas anderes »gekillt« haben? C-y wьrde das zuletzt gelцschte Textstьck zurьckholen, was aber nicht das gewьnschte ist. Verwenden Sie nun M-y (unmittelbar nach der erstmaligen Ausfьhrung von C-y), um den gerade mit C-y eingefьgten Textteil durch @@ -546,7 +538,7 @@ durchgesehen. Die meisten graphischen Oberflдchen bieten auch die Mцglichkeit, mit der linken Maustaste einen Textteil zu markieren (er erscheint dann normalerweise grau unterlegt). Der Befehl C-w lцscht diesen -markierten Textteil (in Emacs auch `Region' genannt) und fьgt ihn in +markierten Textteil (in Emacs auch »Region« genannt) und fьgt ihn in den Lцschring ein. Dasselbe geht auch ohne Maus: Bewegen Sie den Cursor zum Beginn des zu @@ -562,54 +554,48 @@ man Befehle mit langen Namen ausf ------ Wenn Sie etwas am Text geдndert haben und nachtrдglich bemerken, dass -das ein Fehler war, so kцnnen Sie den Fehler mit dem Befehl C-x u -ungeschehen machen (`undo'). +das ein Fehler war, so kцnnen Sie den Fehler mit dem Befehl C-/ +ungeschehen machen (»undo«). -Normalerweise macht C-x u das Verhalten von einem Befehl ungeschehen; -fьhren Sie C-x u mehrmals hintereinander aus, werden die jeweiligen +Normalerweise macht C-/ das Verhalten von einem Befehl ungeschehen; +fьhren Sie C-/ mehrmals hintereinander aus, werden die jeweiligen vorigen Befehle widerrufen. Es gibt jedoch zwei Ausnahmen: Befehle, die den Text nicht дndern, werden nicht gezдhlt (z.B. Cursorbewegungen und Blдttern im Text). -Und Befehle, die sich selbst einfьgen (`self-inserting': Drьcken Sie -zum Beispiel die `u'-Taste, dann wird der Buchstabe u eingefьgt) +Und Befehle, die sich selbst einfьgen (»self-inserting«: Drьcken Sie +zum Beispiel die »u«-Taste, dann wird der Buchstabe u eingefьgt) werden in Gruppen von bis zu 20 Zeichen wiederhergestellt, um die -Anzahl der notwendigen C-x u-Befehle zu reduzieren. +Anzahl der notwendigen C-/-Befehle zu reduzieren. >> Lцschen Sie diese Zeilen mit C-k und drьcken Sie anschlieЯend - mehrmals C-x u, und die Zeilen erscheinen wieder. + mehrmals C-/, und die Zeilen erscheinen wieder. -C-_ ist ein alternativer Undo-Befehl; er arbeitet genauso wie C-x u, -ist jedoch einfacher zu tippen, wenn Sie den Befehl mehrmals -hintereinander ausfьhren mцchten. Der Nachteil von C-_ ist, dass bei -manchen Tastaturen nicht sofort einsichtig ist, wie man das eingibt. - -Eine weitere Eingabemцglichkeit bei vielen Terminals ist C-/. - -Ein numerisches Argument fьr C-_, C-x u oder C-/ wird als +Alternative Tastenkombinationen fьr C-/ sind C-_ und C-x u. Ein +numerisches Argument fьr C-/, C-_ oder C-x u wird als Wiederholungszдhler interpretiert. Der Unterschied zwischen der Undo-Funktion und dem oben erklдrten C-y ist, dass erstere gelцschten Text an exakt der gleichen Position wie vorher wiederherstellt, wohingegen C-y den gelцschten Text an der -momentanen Cursorposition einfьgt. Im ьbrigen kann auch `gekillter' -Text wieder hergestellt werden; der Unterschied zwischen `killing' und -`yanking' betrifft nur C-y, aber nicht die Undo-Funktion. +momentanen Cursorposition einfьgt. Im ьbrigen kann auch »gekillter« +Text wieder hergestellt werden; der Unterschied zwischen »killing« und +»yanking« betrifft nur C-y, aber nicht die Undo-Funktion. * DATEIEN --------- -Um editierten Text zu sichern, muss man ihn in einer Datei (`file') -speichern (`save'). Wird Emacs beendet, ohne dass man vorher den Text +Um editierten Text zu sichern, muss man ihn in einer Datei (»file«) +speichern (»save«). Wird Emacs beendet, ohne dass man vorher den Text gespeichert hat, dann ist der Text verloren. Will man andererseits bereits gesicherten Text mit Emacs editieren, so muss die entsprechende Datei in Emacs geladen werden (im Englischen -wird das als `finding' (finden) bzw. als `visiting' (besuchen) +wird das als »finding« (finden) bzw. als »visiting« (besuchen) bezeichnet). -Eine Datei `finden' bedeutet, dass man den Inhalt dieser Datei mit +Eine Datei »finden« bedeutet, dass man den Inhalt dieser Datei mit Emacs bearbeitet -- es ist fast so, als ob man die Datei selbst editiert. Jedoch werden Дnderungen an dieser Datei erst dann dauerhaft, wenn man sie speichert; auf diese Weise wird vermieden, @@ -621,9 +607,9 @@ die Wenn Sie die untere Bildschirmkante genauer betrachten, dann werden Sie eine Zeile finden, die mit einem oder mehreren Bindestrichen beginnt und endet; sie enthдlt unter anderem die Zeichenkette -`TUTORIAL.de'. An dieser Position befindet sich immer der Name der -Datei, die Sie momentan bearbeiten (`visit'). Gerade in diesem -Augenblick bearbeiten Sie eine Datei mit dem Namen `TUTORIAL.de' +»TUTORIAL.de«. An dieser Position befindet sich immer der Name der +Datei, die Sie momentan bearbeiten (»visit«). Gerade in diesem +Augenblick bearbeiten Sie eine Datei mit dem Namen »TUTORIAL.de« (genauer gesagt, Emacs hat eine identische Kopie geladen). Die Befehle fьr das Laden und Speichern von Dateien bestehen aus zwei @@ -634,14 +620,14 @@ drei oder vier Zeichen lang -- Sie haben bereits C-x u und C-x 1 kennengelernt. Um eine Datei in Emacs laden zu kцnnen, muss man dem Lade-Befehl den -Namen der Datei mitteilen. Der Befehl `liest ein Argument vom -Terminal' (in diesem Fall ist das der Name der Datei). Nachdem Sie +Namen der Datei mitteilen. Der Befehl »liest ein Argument« (in diesem +Fall ist das der Name der Datei). Nachdem Sie C-x C-f (lade Datei) eingegeben haben, werden Sie von Emacs nach dem Dateinamen gefragt. Die Zeichen, die Sie eingeben, werden in der untersten Bildschirmzeile -dargestellt, dem sogenannten Minipuffer (`minibuffer'). Sie kцnnen +dargestellt, dem sogenannten Minipuffer (»minibuffer«). Sie kцnnen ganz normale Emacs-Editierfunktionen verwenden, um den Dateinamen zu дndern. @@ -653,39 +639,42 @@ Minipuffer benutzen) mit C-g abbrechen. ab (Sie haben also keine Datei geladen). Wenn Sie den Dateinamen fertig eingegeben haben, drьcken Sie , -um den Befehl abzuschlieЯen; C-x C-f wird ausgefьhrt und lдdt die von -Ihnen ausgesuchte Datei. Der Minipuffer verschwindet wieder, sobald -C-x C-f beendet ist. +um den Befehl abzuschlieЯen. Der Minipuffer verschwindet wieder, und +C-x C-f lдdt die von Ihnen ausgesuchte Datei. -Ein paar Augenblicke spдter erscheint der Dateiinhalt auf dem -Bildschirm, und Sie kцnnen den Text editieren. Wenn Sie Ihre -Дnderungen permanent speichern wollen, dann drьcken Sie +Der Dateiinhalt erscheint jetzt auf dem Bildschirm, und Sie kцnnen den +Text editieren. Wenn Sie Ihre Дnderungen permanent speichern wollen, +dann drьcken Sie C-x C-s (sichere Datei) und Emacs kopiert den Text in die Datei. Beim ersten Mal benennt Emacs die Originaldatei um, damit sie nicht verloren ist. Der neue -Name besteht aus dem Originalnamen plus einer angehдngten Tilde `~' +Name besteht aus dem Originalnamen plus einer angehдngten Tilde »~« [unter einigen Betriebssystemen wird statt dessen die -Namenserweiterung durch `.bak' ersetzt]. +Namenserweiterung durch ».bak« ersetzt]. Emacs schreibt den Namen der gesicherten Datei in die unterste Zeile, sobald C-x C-s fertig ausgefьhrt ist. Sie sollten den editierten Text oft speichern, damit nicht allzuviel bei einem etwaigen Systemabsturz -verloren geht. +verloren geht (siehe auch den Abschnitt »AUTOMATISCHES SPEICHERN« +weiter unten). + +>> Geben Sie + + C-x C-s TUTORIAL.de ->> Geben Sie C-x C-s ein, um Ihre Kopie der Einfьhrung zu sichern. - Die Ausgabe am unteren Bildschirmrand sollte `Wrote ...TUTORIAL.de' - sein. + ein, um Ihre Kopie der Einfьhrung zu sichern. Die Ausgabe am + unteren Bildschirmrand sollte »Wrote ...TUTORIAL.de« sein. [Manche Terminals werden durch C-s angehalten und mьssen durch C-q -wieder `entsperrt' werden. Eine erste Abhilfe zur Umschiffung dieses -C-s-Problems schafft die Befehlsfolge `M-x save-buffer', welche exakt +wieder »entsperrt« werden. Eine erste Abhilfe zur Umschiffung dieses +C-s-Problems schafft die Befehlsfolge »M-x save-buffer«, welche exakt das gleiche wie C-x C-s bewirkt. Mehr Hilfe dazu finden Sie im -Abschnitt `Spontaneous Entry to Incremental Search' im +Abschnitt »Spontaneous Entry to Incremental Search« im Emacs-Handbuch.] -Sie kцnnen eine existierende Datei anschauen (`view') oder editieren. +Sie kцnnen eine existierende Datei anschauen (»view«) oder editieren. Sie kцnnen aber auch eine Datei laden, die noch gar nicht existiert, um so eine neue Datei zu erzeugen: Sie цffnen dazu die (nicht-existente) Datei, die natьrlich leer ist, und beginnen dann @@ -703,18 +692,8 @@ laden, dann bleibt die erste in Emacs. Sie k zurьckschalten, indem Sie noch einmal C-x C-f eingeben. Auf diese Weise lassen sich eine ganze Reihe von Dateien laden und bearbeiten. ->> Erzeugen Sie eine Datei mit dem Namen `foo', indem Sie - - C-x C-f foo - - eingeben. Tippen Sie etwas Text ein, editieren Sie ihn und - speichern Sie ihn abschlieЯend mit C-x C-s. Kehren Sie - anschlieЯend zu dieser Einfьhrung zurьck mit - - C-x C-f TUTORIAL.de - Emacs speichert jeden Text, der aus einer Datei in Emacs geladen wird, -in einem `Puffer'-Objekt. Um eine Liste der momentan existierenden +in einem »Puffer«-Objekt. Um eine Liste der momentan existierenden Puffer zu sehen, geben Sie C-x C-b (liste Puffer auf) @@ -726,7 +705,7 @@ ein. Beachten Sie, dass jeder Puffer einen Namen hat und manche auch mit dem Namen einer Datei assoziiert sind, dessen Inhalt sie enthalten. Manche Puffer aber haben keinen zugehцrige Datei, z.B. der mit dem -Namen `*Buffer List*'. Er wurde von dem Befehl C-x C-b erzeugt, um +Namen »*Buffer List*«. Er wurde von dem Befehl C-x C-b erzeugt, um die Pufferliste darzustellen. JEDER Text, den Sie innerhalb Emacs in einem Fenster sehen, ist immer ein Ausschnitt eines Puffers. @@ -734,28 +713,39 @@ einem Fenster sehen, ist immer ein Ausschnitt eines Puffers. zu lassen. Wieviele Puffer auch in Emacs geladen sind, nur ein einziger ist der -`momentane' Puffer, nдmlich derjenige, den Sie gerade editieren. Will +»momentane« Puffer, nдmlich derjenige, den Sie gerade editieren. Will man einen anderen Puffer editieren, muss man zuerst zu diesem Puffer -wechseln (`switch'). Wie schon weiter oben erklдrt, kann man mittels +wechseln (»switch«). Wie schon weiter oben erklдrt, kann man mittels C-x C-f zu einem Puffer wechseln, der zu einer Datei gehцrt. Emacs hat jedoch einen einfacheren Befehl, C-x b, um einen beliebigen Puffer namentlich auszuwдhlen. ->> Geben Sie C-x b foo ein, um zurьck zum Puffer `foo' zu - schalten, der den Text der Datei `foo' enthдlt. AnschlieЯend geben - Sie C-x b TUTORIAL.de ein, um wieder zu dieser Einfьhrung - zu gelangen. +>> Geben Sie + + C-x C-f foo + + ein, um eine Datei mit dem Namen »foo« zu erzeugen. Mittels + + C-x b TUTORIAL.de + + gelangen Sie wieder zu dieser Einfьhrung. In der Regel ist der Puffername identisch zu einem Dateinamen (ohne den Verzeichnisprдfix), jedoch nicht immer. Die von C-x C-b erzeugte -Pufferliste zeigt stets die Namen aller Puffer. +Pufferliste zeigt stets die Namen aller Puffer mit den +korrespondierenden Dateinamen. JEDER Text in Emacs ist Teil eines Puffers, aber nicht jeder Puffer -entspricht einer Datei. So ist z.B. der Puffer `*Buffer List*' mit +entspricht einer Datei. So ist z.B. der Puffer »*Buffer List*« mit keiner Datei assoziiert -- er wurde direkt von dem Befehl C-x C-b -erzeugt. Genauso hat der Puffer `*Messages*' keine Entsprechung als -Datei; er enthдlt alle Mitteilungen, die in der untersten Zeile -wдhrend des Arbeitens mit Emacs erscheinen. +erzeugt. Auch dieser »TUTORIAL.de«-Puffer war anfangs keiner Datei +zugeordnet, jetzt allerdings schon, denn Sie haben im letzten +Abschnitt den Befehl C-x C-s eingegeben und so den Pufferinhalt als +Datei gespeichert. + +Der Puffer »*Messages*« hat ebenfalls keine Entsprechung als Datei; er +enthдlt alle Mitteilungen, die in der untersten Zeile wдhrend des +Arbeitens mit Emacs erscheinen. >> Geben Sie C-x b *Messages* ein, um sich den Mitteilungspuffer anzuschauen. @@ -778,7 +768,7 @@ Sie ihn speichern wollen. >> Fьgen Sie eine Textzeile ein und drьcken Sie dann C-x s. Emacs fragt Sie jetzt, ob Sie einen Puffer mit dem Namen - TUTORIAL.de speichern wollen. Bejahen Sie, indem Sie `y' drьcken. + TUTORIAL.de speichern wollen. Bejahen Sie, indem Sie »y« drьcken. [Anmerkung: Sie verдndern nicht die Originaldatei, sondern eine persцnliche Kopie.] @@ -793,7 +783,7 @@ sie trotzdem alle benutzen zu k C-x Zeichenerweiterung. Gefolgt von einem Zeichen. M-x Befehlserweiterung. Gefolgt von einem (langen) Namen. -[Das `x' steht fьr das englische Wort `extension'.] Diese beiden +[Das »x« steht fьr das englische Wort »extension«.] Diese beiden Befehle sind prinzipiell sehr nьtzlich, werden aber weniger oft benцtigt als die bisher vorgestellten. Sie haben bereits mehrere Befehle aus der ersten Kategorie kennengelernt; unter anderem C-x C-f, @@ -804,31 +794,25 @@ vielleicht vergessen haben, Daten oder Text zu sichern -- Emacs fragt bei jedem geдndertem Puffer (bzw. Datei), ob er gespeichert werden soll. -C-z ist der Befehl um Emacs *zeitweise* zu verlassen; es ist also -mцglich, spдter an der unterbrochenen Stelle nahtlos weiterzuarbeiten. - -Auf den meisten Systemen wie Linux oder FreeBSD wird Emacs -`suspendiert', wenn Sie C-z drьcken, d.h., Sie kehren zurьck zur -Eingabezeile des Betriebssystems, ohne Emacs zu beenden. In der Regel -kцnnen Sie dann mittels des Befehls `fg' bzw. `%emacs' wieder zu Emacs -umschalten. Unter graphischen Oberflдchen wie X11 bewirkt C-z in der -Regel, dass Emacs ikonofiziert wird, also als Ikone (`Icon') darauf -wartet, mit einem Mausklick bei Bedarf wieder vergrцЯert zu werden. +Unter graphischen Oberflдchen wie X bewirkt C-z in der Regel, dass +Emacs ikonofiziert wird, also als Ikone (»Icon«) darauf wartet, mit +einem Mausklick bei Bedarf wieder vergrцЯert zu werden. Auf einem +Textterminal dagegen wird Emacs »suspendiert«, wenn Sie C-z drьcken, +d.h., Sie kehren zurьck zur Eingabezeile des Terminals, ohne Emacs zu +beenden, und kцnnen beliebige andere Befehle ausfьhren. In der Regel +kцnnen Sie spдter mittels des Befehls »fg« bzw. »%emacs« wieder zu +Emacs umschalten. Bei Betriebssystemen bzw. Shells, die Suspension von Programmen nicht implementiert haben (z.B. MS-DOS), startet C-z einen -System-Befehlsinterpreter innerhalb von Emacs (`subshell'). -Normalerweise mьssen Sie dann `exit' in die Befehlszeile schreiben, um +System-Befehlsinterpreter innerhalb von Emacs (»subshell«). +Normalerweise mьssen Sie dann »exit« in die Befehlszeile schreiben, um zu Emacs zurьckzukehren. Der beste Zeitpunkt fьr C-x C-c ist, wenn Sie sich ausloggen (bzw. Ihren Computer ausschalten); Sie sollten Emacs ebenfalls beenden, wenn Sie Emacs von einem anderen Programm aus aufgerufen -haben (z.B. einem Programm, das E-mails liest), da solche Programme -oft nicht wissen, wie sie mit Emacs im Suspend-Modus umgehen sollen. -In allen anderen Fдllen ist es meistens gьnstiger, C-z zu benutzen und -Emacs nicht zu beenden, damit man im Bedarfsfalle sofort an der -gleichen Stelle weiterarbeiten kann. +haben (z.B. einem Programm, das E-mails liest). Hier ist eine Liste aller C-x-Befehle, die Sie bereits kennengelernt haben: @@ -846,19 +830,19 @@ Ein Beispiel f global (also in der ganzen Datei bzw. Puffer) eine Zeichenkette durch eine andere ersetzt. Wenn Sie M-x drьcken, dann fragt Sie Emacs in der untersten Bildschirmzeile nach dem Namen des Befehls (in diesem -Fall `replace-string'). Geben Sie jetzt `repl s' ein und Emacs +Fall »replace-string«). Geben Sie jetzt »repl s« ein und Emacs vervollstдndigt den Namen. SchlieЯen Sie die Eingabe mit ab. [ bezeichnet die Tabulatortaste.] >> Bewegen Sie den Cursor zu der leeren Zeile sechs Zeilen unter dieser. Geben Sie dann - M-x repl sBildschirmText + M-x repl s Bildschirm Text ein und kehren Sie mit C-u C-SPC an diese Position zurьck. Beachten Sie wie diese Bildschirmzeile jetzt aussieht: Sie haben - den Wortteil B-i-l-d-s-c-h-i-r-m durch `Text' ersetzt (und zwar im + den Wortteil B-i-l-d-s-c-h-i-r-m durch »Text« ersetzt (und zwar im ganzen Dokument beginnend von der Cursorposition). >> Drьcken Sie jetzt C-x u, um diese Дnderungen auf einmal rьckgдngig @@ -872,17 +856,17 @@ Haben Sie gespeichert, dann kцnnen sie verloren gehen, falls der Computer abstьrzt. Um Sie davor zu schьtzen, sichert Emacs in bestimmten Zeitintervallen jede von Ihnen editierte Datei in sogenannten -`auto save'-Dateien. Sie sind daran zu erkennen, dass sie mit einem # -beginnen und enden; z.B. ist `#hello.c#' der Name der Auto-Save-Datei -von `hello.c'. Wenn Sie Ihren Text auf normalem Wege speichern, wird +»auto save«-Dateien. Sie sind daran zu erkennen, dass sie mit einem # +beginnen und enden; z.B. ist »#hello.c#« der Name der Auto-Save-Datei +von »hello.c«. Wenn Sie Ihren Text auf normalem Wege speichern, wird die Auto-Save-Datei gelцscht. Stьrzt der Rechner einmal wirklich ab, kцnnen Sie die Дnderungen, die beim letzten Auto-Save gespeichert worden sind, folgendermaЯen wiederherstellen: Laden Sie die Datei auf normalem Wege (die Datei, die Sie bearbeitet haben, nicht die Auto-Save-Datei) und geben Sie -dann `M-x recover-file' ein. Wenn Emacs Sie um Bestдtigung -fragt, antworten Sie mit `yes', um den Inhalt der +dann »M-x recover-file « ein. Wenn Emacs Sie um Bestдtigung +fragt, antworten Sie mit »yes «, um den Inhalt der Auto-Save-Datei zu ьbernehmen. @@ -890,8 +874,8 @@ Auto-Save-Datei zu ------------------ Geben Sie Befehle langsam ein, dann zeigt Ihnen Emacs Ihre eigene -Eingabe am unteren Bildschirmrand im sogenannten Echo-Bereich (`echo -area'). Der Echo-Bereich enthдlt die unterste Bildschirmzeile. +Eingabe am unteren Bildschirmrand im sogenannten Echo-Bereich (»echo +area«). Der Echo-Bereich enthдlt die unterste Bildschirmzeile. [Mini-Puffer und Echo-Bereich fallen normalerweise zusammen, sind aber nicht das gleiche, da innerhalb des Echo-Bereiches nichts eingegeben @@ -902,30 +886,30 @@ werden kann.] ------------------ Die Bildschirmzeile unmittelbar ьber dem Echo-Bereich ist die -Statuszeile (`mode line'). Sie schaut ungefдhr so aus: +Statuszeile (»mode line«). Sie schaut ungefдhr so aus: --1:** TUTORIAL.de 59% L905 (Fundamental)---------------------- +-1:**- TUTORIAL.de 58% L891 (Fundamental) Diese Zeile gibt nьtzliche Hinweise ьber den momentanen Zustand von Emacs und den Text, den Sie gerade editieren. -Sie wissen bereits, was der Dateiname bedeutet. `--NN%--' zeigt die -momentane Position innerhalb des Textes an: NN Prozent davon sind -oberhalb des Bildschirms. Ist der Dateianfang zu sehen, dann -erscheint `Top' anstelle von `00%'. Analog dazu erscheint `Bot' (fьr -das englische Wort `bottom'), wenn das Dateiende sichtbar ist. Wenn -Sie einen Text betrachten, der komplett auf den Bildschirm passt, dann -erscheint `All'. +Sie wissen bereits, was der Dateiname bedeutet. »NN%« zeigt die +momentane Position innerhalb des Puffertextes an: NN Prozent davon +sind oberhalb des Bildschirms. Ist der Dateianfang zu sehen, dann +erscheint »Top« anstelle von »00%«. Analog dazu erscheint »Bot« (fьr +das englische Wort »bottom«), wenn das Dateiende sichtbar ist. Wenn +Sie einen Puffer betrachten, der komplett auf den Bildschirm passt, +dann erscheint »All«. -Das `L' und die nachfolgenden Ziffern geben die aktuelle Zeilennummer +Das »L« und die nachfolgenden Ziffern geben die aktuelle Zeilennummer an, in der sich der Cursor befindet. -Am Anfang der Zeile sehen Sie `-1:**'. Die Zeichen vor dem +Am Anfang der Zeile sehen Sie »-1:**-«. Die Zeichen vor dem Doppelpunkt geben an, in welcher Kodierung der Text ist und welche Eingabemethode verwendet wird. Dazu mehr weiter unten im Abschnitt -`MULE'. +»MULE«. -[Anstelle des Doppelpunktes kцnnen auch ein `\' und `/' stehen, falls +[Anstelle des Doppelpunktes kцnnen auch ein »\« und »/« stehen, falls Sie Dateien editieren, die der MS-DOS- bzw. der Macintosh-Textkonvention folgen: MS-DOS verwendet als Zeilenvorschubzeichen CR-LF (Carriage Return gefolgt von Linefeed), @@ -938,24 +922,24 @@ Prozentzeichen nach dem Doppelpunkt stehen f gelesen, aber nicht editiert werden kann. Der eingeklammerte Teil gibt an, in welchem Editiermodus Sie sich -befinden. Der Standardmodus heiЯt `Fundamental' (Sie verwenden ihn -gerade); er ist ein Beispiel fьr einen Hauptmodus (`major mode'). +befinden. Der Standardmodus heiЯt »Fundamental« (Sie verwenden ihn +gerade); er ist ein Beispiel fьr einen Hauptmodus (»major mode«). Emacs hat viele Hauptmodi implementiert. Manche davon werden fьr verschiedene (Computer-)Sprachen und/oder Textarten verwendet, z.B. Lisp-Modus, Text-Modus usw. Es kann immer nur ein Hauptmodus aktiviert sein, und der Name befindet sich dort, wo jetzt gerade -`Fundamental' steht. +»Fundamental« steht. Einige Befehle verhalten sich jeweils in verschiedenen Hauptmodi anders. Es gibt zum Beispiel einen Befehl, um einen Kommentar in den Quellcode eines Computerprogramm einzufьgen -- die Tastenfolge dafьr ist zwar (in der Regel) die gleiche, doch wird ein Kommentar mit der fьr die aktuelle Programmiersprache gьltigen Syntax eingefьgt -(z.B. `// ...' fьr ein Programm in C++ oder `; ...' fьr Lisp). Um in +(z.B. »// ...« fьr ein Programm in C++ oder »; ...« fьr Lisp). Um in einen Hauptmodus zu schalten, hдngen Sie einfach das englische Wort -`-mode' an den (kleingeschriebenen) Namen des Modus an und fьhren den -Befehl mittels M-x aus. Beispiel: `M-x fundamental-mode' schaltet in +»-mode« an den (kleingeschriebenen) Namen des Modus an und fьhren den +Befehl mittels M-x aus. Beispiel: »M-x fundamental-mode« schaltet in den Fundamental-Modus. Weitere wichtige Modi sind c-mode, perl-mode, lisp-mode, text-mode u.a. Die meisten davon werden automatisch aktiviert, und zwar entsprechend der Namenserweiterung der zu ladenden @@ -965,30 +949,30 @@ C-Modus aktiviert. Wenn Sie deutschen oder englischen Text bearbeiten, dann sollten Sie den Textmodus verwenden. [Falls Ihre Tastatur keine Umlaut-Tasten hat, mьssen Sie noch einen weiteren Nebenmodus aktivieren. Lesen Sie -dazu den Abschnitt `MULE' weiter unten.] +dazu den Abschnitt »MULE« weiter unten.] ->> Geben Sie `M-x text mode' ein. +>> Geben Sie »M-x text-mode « ein. Sie brauchen keine Angst zu haben, dass sich die bisher dargestellte Tastaturbelegung von Emacs stark дndert. Beobachten Sie z.B. die Befehle M-f und M-b: Apostrophe werden nun als Teil eines Wortes betrachtet (wie man's leicht an diesem Beispiel ausprobieren kann), wohingegen im Fundamentalmodus Apostrophe als Worttrenner -(`word-separator') behandelt werden. +(»word-separator«) behandelt werden. Normalerweise ist das eben genannte Beispiel die Methode von -Hauptmodi: Die meisten Befehle tun `das gleiche', arbeiten aber +Hauptmodi: Die meisten Befehle tun »das gleiche«, arbeiten aber jeweils ein bisschen anders. Dokumentation zum derzeit aktuellen Hauptmodus bekommen Sie mit C-h m. ->> Drьcken Sie C-u C-v ein- oder mehrmals, um diese Zeile in die Nдhe - des oberen Bildschirmrands zu bringen. +>> Drьcken Sie C-l C-l, um diese Zeile an den oberen Bildschirmrand zu + bringen. >> Lesen Sie nun mittels C-h m die englische Dokumentation zum Textmodus. >> Entfernen Sie schlieЯlich das Dokumentationsfenster mit C-x 1. -Neben den Hauptmodi gibt es auch Nebenmodi (`minor modes'). Nebenmodi +Neben den Hauptmodi gibt es auch Nebenmodi (»minor modes«). Nebenmodi sind keine Alternativen zu Hauptmodi, sondern stellen Ergдnzungen zur Verfьgung, die (normalerweise) in allen Hauptmodi funktionieren (z.B. der Ьberschreibmodus: Zeichen werden nicht eingefьgt, sondern @@ -998,20 +982,20 @@ Sie k Nebenmodi haben. Ein Nebenmodus, welcher дuЯerst nьtzlich ist, besonders fьr das -Editieren von Text, ist der automatische Zeilenumbruch (`Auto Fill -mode'). Ist dieser Modus aktiviert, dann bricht Emacs die laufende +Editieren von Text, ist der automatische Zeilenumbruch (»Auto Fill +mode«). Ist dieser Modus aktiviert, dann bricht Emacs die laufende Zeile selbsttдtig zwischen Wцrtern um, sobald sie zu lang wird. -Sie kцnnen den Zeilenumbruchmodus einschalten mittels `M-x auto fill -mode'. Wenn der Modus aktiviert ist, kцnnen Sie ihn mit dem -gleichen Befehl wieder ausschalten. Mit anderen Worten, der Befehl -verhдlt sich wie ein Lichttaster, der bei Betдtigung entweder das -Licht ein- oder ausschaltet, je nachdem, ob das Licht vorher +Sie kцnnen den Zeilenumbruchmodus mittels »M-x auto-fill-mode +« einschalten. Wenn der Modus aktiviert ist, kцnnen Sie ihn +mit dem gleichen Befehl wieder ausschalten. Mit anderen Worten, der +Befehl verhдlt sich wie ein Lichttaster, der bei Betдtigung entweder +das Licht ein- oder ausschaltet, je nachdem, ob das Licht vorher ausgeschaltet bzw. eingeschaltet war. Wir sagen, dass dieser Befehl -den Modus umschaltet (`toggle'). +den Modus umschaltet (»toggle«). ->> Geben Sie nun M-x auto fill mode ein. Fьgen Sie - anschlieЯend eine Zeile ein, die aus lauter `asdf ' besteht, und +>> Geben Sie nun M-x auto-fill-mode ein. Fьgen Sie + anschlieЯend eine Zeile ein, die aus lauter »asdf « besteht, und zwar so lange, bis die Zeile automatisch umgebrochen wird. Vergessen Sie nicht, Leerzeichen einzugeben, da nur dort ein Umbruch erfolgt. @@ -1038,56 +1022,56 @@ Absatzes stehen muss. * SUCHEN -------- -Emacs kann Zeichenketten (`strings') entweder in Richtung Pufferende -(vorwдrts, `forward') oder in Richtung Pufferanfang (rьckwдrts, -`backward') suchen. Gleichzeitig wird der Cursor an die nдchste -Stelle bewegt, wo diese Zeichenkette erscheint. +Emacs kann Zeichenketten (»strings«, eine Folge von zusammenhдngenden +Zeichen) entweder in Richtung Pufferende (vorwдrts, »forward«) oder in +Richtung Pufferanfang (rьckwдrts, »backward«) suchen. Gleichzeitig +wird der Cursor an die nдchste Stelle bewegt, wo diese Zeichenkette +erscheint. -Hier unterscheidet sich Emacs von vielen anderen Editoren, da nдmlich -die Standard-Suchoperation inkrementelles Suchen ist, d.h., die Suche -beginnt dann, wenn Sie die Zeichen eingeben. +Die Standard-Suchoperation von Emacs ist inkrementelles Suchen, d.h., +die Suche beginnt dann, wenn Sie die Zeichen eingeben. Der Befehl fьr Vorwдrtssuchen ist C-s und C-r fьr Rьckwдrtssuchen. ABER HALT! Probieren Sie bitte diese Befehle noch nicht. -Wenn Sie C-s eingeben, dann erscheint die Zeichenkette `I-search:' als +Wenn Sie C-s eingeben, dann erscheint die Zeichenkette »I-search:« als Eingabeaufforderung im Echobereich. Das bedeutet, dass Emacs jetzt eine inkrementellen Suche ausfьhrt und darauf wartet, dass Sie die zu suchende Zeichenkette eingeben. beendet die Suche. >> Geben Sie jetzt C-s ein, um einen Suchvorgang zu starten. Schreiben - Sie LANGSAM, einen Buchstaben nach dem anderen, das Wort `Cursor', + Sie LANGSAM, einen Buchstaben nach dem anderen, das Wort »Cursor«, und warten Sie jeweils ab, was mit dem Cursor passiert. Sie haben - jetzt das Wort `Cursor' einmal gefunden. + jetzt das Wort »Cursor« einmal gefunden. >> Drьcken Sie C-s noch einmal, um die nдchste Stelle zu suchen, wo das - Wort `Cursor' vorkommt. ->> Drьcken Sie nun viermal und beobachten Sie, wie der Cursor + Wort »Cursor« vorkommt. +>> Drьcken Sie nun viermal und beobachten Sie, wie der Cursor zurьckspringt. >> Beenden Sie die Suche mit . Verstehen Sie, was gerade vorgegangen ist? Emacs versucht wдhrend einer inkrementellen Suche zu der Stelle zu gehen, wo die Zeichenkette steht, die Sie bis jetzt eingegeben haben. Um die darauffolgende -Position zu suchen, wo `Cursor' steht, genьgt es, noch einmal C-s zu +Position zu suchen, wo »Cursor« steht, genьgt es, noch einmal C-s zu betдtigen. Wenn es keine nдchste Position gibt, dann ertцnt ein kurzer Ton, und Emacs sagt Ihnen, dass die Suche im Augenblick -fehlschlдgt (`failing'). C-g beendet ebenfalls einen Suchvorgang. +fehlschlдgt (»failing«). C-g beendet ebenfalls einen Suchvorgang. Wenn Sie sich mitten in einer inkrementellen Suche befinden und - drьcken, wird das letzte Zeichen im Suchstring gelцscht, und + drьcken, wird das letzte Zeichen im Suchstring gelцscht, und der Cursor springt zurьck auf die letzte Suchposition. Angenommen, -Sie haben `c' eingegeben, um das erste Auftreten von `c' zu suchen. -Geben Sie jetzt `u' ein, dann springt der Cursor zu dem ersten -Auftreten der Zeichenkette `cu'. Wenn Sie jetzt mit das `u' -vom Suchstring lцschen, dann springt der Cursor zurьck zum ersten `c'. -Drьcken Sie dagegen ein paar mal C-s, um weitere `cu'-Zeichenketten zu -finden, dann bewirkt , dass Sie zum letzten Auftreten von `cu' -zurьckspringen, und erst wenn es kein weiteres `cu' mehr gibt, springt -der Cursor zum ersten `c' zurьck. +Sie haben »c« eingegeben, um das erste Auftreten von »c« zu suchen. +Geben Sie jetzt »u« ein, dann springt der Cursor zu dem ersten +Auftreten der Zeichenkette »cu«. Wenn Sie jetzt mit das »u« +vom Suchstring lцschen, dann springt der Cursor zurьck zum ersten »c«. +Drьcken Sie dagegen ein paar mal C-s, um weitere »cu«-Zeichenketten zu +finden, dann bewirkt , dass Sie zum letzten Auftreten von »cu« +zurьckspringen, und erst wenn es kein weiteres »cu« mehr gibt, springt +der Cursor zum ersten »c« zurьck. Die Suche wird ebenfalls beendet, wenn Sie ein CONTROL- oder -META-Zeichen eingeben (mit ein paar Ausnahmen -- Zeichen, die -bei einer Suche speziell gehandhabt werden wie C-s oder C-r). +META-Zeichen eingeben (mit ein paar Ausnahmen -- Zeichen, die bei +einer Suche speziell gehandhabt werden wie C-s oder C-r). C-s versucht, die Zeichenkette NACH der aktuellen Cursorposition zu finden. Wollen Sie etwas davor suchen, mьssen Sie C-r verwenden. Das @@ -1101,7 +1085,11 @@ Suchrichtung. Eine weitere, nьtzliche Fдhigkeit von Emacs ist die Mцglichkeit, mehr als ein Fenster zur gleichen Zeit auf dem Bildschirm darzustellen. ->> Bewegen Sie den Cursor zu dieser Zeile und geben Sie C-u 0 C-l ein. +[Der Unterschied zu graphischen Fenstern im herkцmmlichen Sinn +(»frame« in der Emacs-Terminologie) wurde bereits weiter oben +besprochen.] + +>> Bewegen Sie den Cursor zu dieser Zeile und geben Sie C-l C-l ein. >> Drьcken Sie nun C-x 2, um den Bildschirm in zwei Fenster zu teilen. Beide Fenster zeigen diese Einfьhrung an, und der Cursor bleibt im @@ -1111,8 +1099,8 @@ als ein Fenster zur gleichen Zeit auf dem Bildschirm darzustellen. statt dessen auch ESC C-v verwenden, falls Sie keine META-Taste haben; siehe auch weiter unten). ->> Mittels C-x o (das `o' steht fьr das englische Wort `other', `das - andere') kцnnen Sie den Cursor in das untere Fenster bewegen. +>> Mittels C-x o (das »o« steht fьr das englische Wort »other«, »das + andere«) kцnnen Sie den Cursor in das untere Fenster bewegen. >> Benьtzen Sie C-v und M-v, um im unteren Fenster zu blдttern. Lesen Sie die Emacs-Einfьhrung jedoch im oberen Fenster weiter. @@ -1122,16 +1110,16 @@ als ein Fenster zur gleichen Zeit auf dem Bildschirm darzustellen. C-x o ist der Befehl, um zwischen (Emacs-)Fenstern hin- und herzuschalten. Jedes Fenster hat eine eigene Cursorposition, aber nur -das aktuelle Fenster zeigt den Cursor an (unter X11 wird die -nicht-aktuelle Cursorposition durch ein leeres Rechteck dargestellt). -Alle normalen Editierbefehle betreffen das Fenster, in dem sich der -Cursor befindet. Wir nennen dieses Fenster `ausgewдhlt' (`selected -window'). +das aktuelle Fenster zeigt den Cursor an (auf einer graphischen +Oberflдche wird die nicht-aktuelle Cursorposition durch ein leeres +Rechteck dargestellt). Alle normalen Editierbefehle betreffen das +Fenster, in dem sich der Cursor befindet. Wir nennen dieses Fenster +»ausgewдhlt« (»selected window«). Der Befehl M-C-v ist sehr nьtzlich, wenn man Text in einem Fenster -editiert und das andere Fenster als Referenz verwendet. Der Cursor -bleibt stets im gleichen Arbeitsfenster, und mit M-C-v kann man bequem -vorwдrtsblдttern. +editiert und das andere Fenster als Referenz verwendet. Ohne das +momentante Arbeitsfenster verlassen zu mьssen, kann man mit M-C-v im +anderen Fenster bequem vorwдrtsblдttern. M-C-v ist ein Beispiel eines CONTROL-META-Zeichens. Haben Sie eine META-Taste, dann kann man M-C-v erzeugen, indem man CTRL und META @@ -1147,24 +1135,24 @@ META oder CTRL. Der umgekehrte Befehl zu M-C-v ist M-C-S-v, um im anderen Fenster rьckwдrts zu blдttern (d.h., Sie mьssen die META-Taste sowie die -CONTROL- und SHIFT-Taste zusammen mit `v' betдtigen) -- jetzt werden +CONTROL- und SHIFT-Taste zusammen mit »v« betдtigen) -- jetzt werden Sie wahrscheinlich verstehen, warum manche Kritiker das Wort Emacs als Abkьrzung von Escape-Meta-Alt-Control-Shift betrachten. Leider funktioniert diese Befehlsfolge normalerweise nur mit graphischen -Oberflдchen wie X11, da C-v von C-S-v auf den meisten Textterminals -nicht unterschieden werden kann. +Oberflдchen, da C-v von C-S-v auf den meisten Textterminals nicht +unterschieden werden kann. -[Unter X11 kann man auЯerdem in der Regel mit den bequemeren -Tastenkombinationen META-`Bild mit Aufwдrtspfeil' bzw. META-`Bild mit -Abwдrtspfeil' ebenfalls im anderen Fenster rьck- bzw. vorwдrts -blдttern.] +[Auf graphischen Oberflдchen kann man auЯerdem in der Regel mit den +bequemeren Tastenkombinationen META-»Bild mit Aufwдrtspfeil« +bzw. META-»Bild mit Abwдrtspfeil« ebenfalls im anderen Fenster rьck- +bzw. vorwдrts blдttern.] >> Entfernen Sie mit C-x 1 (eingegeben im oberen Fenster) das untere Fenster. (Hдtten Sie C-x 1 im unteren Fenster eingegeben, dann wдre das obere -Fenster geschlossen worden -- eine Eselsbrьcke fьr C-x 1 ist `ich will -nur das *eine* Fenster, in dem ich mich gerade befinde.') +Fenster geschlossen worden -- eine Eselsbrьcke fьr C-x 1 ist »ich will +nur das *eine* Fenster, in dem ich mich gerade befinde.«) Sie mьssen nicht den gleichen Puffer in beiden Fenstern darstellen. Wenn Sie C-x C-f verwenden, um in einem Fenster eine Datei zu laden, @@ -1184,11 +1172,42 @@ Texte darzustellen: Sie C-x 1 ein, um das untere Fenster zu schlieЯen. +* MEHRFACHE RAHMEN +------------------ + +Emacs kann auch mehrfache Rahmen erzeugen, sobald das Programm auf +einer graphischen Oberflдche ausgefьhrt wird. In der +Emacs-Terminologie bezeichnet ein »Rahmen« eine Gruppe von Fenstern, +gemeinsam mit deren Menus, Scrollbars, Echo-Bereichen, usw. Auf einem +Textterminal kann genau ein Rahmen dargestellt werden. + +>> Geben Sie + + M-x make-frame + + ein, um einen neuen Rahmen zu erzeugen. + +Alles, was Sie im ursprьnglichen, ersten Rahmen tun kцnnen, +funktioniert genauso im neuen Rahmen. Beide Rahmen sind also vцllig +gleichwertig. + +>> Geben Sie + + M-x delete-frame + + ein, um den ausgewдhlten Rahmen zu entfernen. + +Ein Rahmen kann auch mit der normalen Methode der graphischen +Oberflдche entfernt werden; meistens gibt es dafьr einen Knopf mit +einem »X« in der linken oder rechten oberen Ecke des Rahmens. Wird +der letzte Rahmen geschlossen, beendet man Emacs, wie erwartet. + + * REKURSIVE EDITIER-EBENEN -------------------------- Manchmal kann es passieren, dass Sie in eine sogenannte rekursive -Editier-Ebene geraten (`recursive editing level'). Sie kцnnen das an +Editier-Ebene geraten (»recursive editing level«). Sie kцnnen das an den eckigen Klammern in der Statuszeile erkennen, welche den derzeitigen Hauptmodus zusдtzlich umschlieЯen, z.B. [(Fundamental)] anstelle von (Fundamental). @@ -1211,91 +1230,49 @@ dargestellt. Details finden Sie im Emacs-Handbuch beschrieben. * MULE ------ -Mule ist die Abkьrzung fьr `Multi-lingual Enhancement to GNU Emacs'. +Mule ist die Abkьrzung fьr »Multi-lingual Enhancement to GNU Emacs«. Frьher wurde damit eine spezielle Emacs-Variante bezeichnet, die allerdings seit der Version 20 mit Emacs verschmolzen ist. Emacs unterstьtzt eine groЯe Anzahl von internationalen Zeichensдtzen, z.B. verschiedene europдische Varianten des lateinischen Alphabets, Chinesisch, Russisch oder Thai, um nur einige zu nennen. In dieser -Einfьhrung wird jedoch nur auf den deutschen Zeichensatz sowie +Einfьhrung wird jedoch nur auf Unicode und Latin-1 sowie Eingabemцglichkeiten fьr Deutsch nдher eingegangen. -Der Standard-Zeichensatz fьr Deutsch ist Latin-1 (auch bekannt unter -dem Namen ISO-8859-1), obwohl Unicode -- und da besonders die -Kodierungsvariante UTF-8 -- sich immer mehr durchzusetzt. Wenn -anstelle der deutschen Umlaute unansehnliche Konstrukte wie `\201д' -dargestellt werden, dann ist die sogenannte -Multibyte-Zeichenunterstьtzung deaktiviert (intern werden in Emacs -Nicht-ASCII-Zeichensдtze durch mehr als ein Byte reprдsentiert). Der -Befehl `M-x toggle-enable-multibyte-characters' aktiviert die -Multibyte-Zeichenunterstьtzung. Denken Sie daran, die Tabulatortaste -zur Vervollstдndigung von Befehlsnamen zu benьtzen, z.B. `M-x -toggle-e'. - -Wenn anstelle der Umlaute `д', `ц' oder `ь' die Zeichen `d', `v' und -`|' erscheinen (also `kleines D', `kleines V' und ein senkrechter -Strich), dann wird das achte Bit von jedem Byte abgeschnitten, sodass -nur ASCII-Zeichen dargestellt werden kцnnen. In der Regel gibt es -zwei Ursachen fьr dieses Problem: Sie haben sich nicht `8-bit clean' -(z.B. mittels `telnet -8 ...') eingeloggt oder Ihr -Telekommunikationsprogramm ist nicht fьr 8-bit konfiguriert. Beides -ist heutzutage eher unwahrscheinlich, daher wird hier nicht weiter -darauf eingegangen. - ->> Geben Sie `M-x toggle-enable-multibyte-characters' ein. Die - deutschen Umlaute (so sie von Ihrem Terminal darstellbar sind) - verschwinden und werden durch Zahlenkonstrukte ersetzt. So wird - zum Beispiel Umlaut a (`д') dargestellt als `\201д'. - ->> Aktivieren Sie wieder die Multibyte-Zeichenunterstьtzung mittels - `M-x toggle-enable-multibyte-characters'. - -Sehen Sie anstelle der Umlaute leere Kдstchen (unter X11 oder anderen -graphischen Oberflдchen), sollten Sie Emacs mit C-x C-c beenden und -folgendermaЯen neu starten: - - emacs -fn fontset-standard - -Sie kцnnen auch probieren, Emacs mit der `--unibyte'-Option zu -starten, um Latin-1-Zeichen direkt darzustellen. - -Falls das alles nichts nьtzt oder Sie Fragezeichen anstelle der -Umlaute auf ihrem Textterminal sehen, sollten Sie sich an Ihren -Systemadministrator wenden und sich beschweren, dass kein -Latin-1-Zeichensatz installiert ist (was heutzutage eigentlich eine -Selbstverstдndlichkeit sein sollte). Falls statt der Umlaute andere -Zeichen auf ihrem Textterminal erscheinen (z.B. kyrillische -Buchstaben), dann erkundigen Sie sich, wie sie auf Latin-1 umschalten -kцnnen. - -Lesen Sie im Emacs-Handbuch nach unter dem Stichwort `International', +Lesen Sie im Emacs-Handbuch unter dem Stichwort »International« nach, welche weitere Optionen es bezьglich Zeichensдtze gibt. -Ist die Sprachumgebung (`locale') Ihres Betriebssystems korrekt auf -Deutsch gesetzt, verwendet Emacs diese Einstellungen automatisch. -Anderenfalls empfiehlt es sich, Latin-1 als Standardkodierung zu -aktivieren, wenn Sie primдr Deutsch verwenden. Benutzen Sie zu diesem -Zweck die Befehlsfolge - - C-x l latin-1 - -(C-x l fьhrt die Funktion set-language-environment aus), um -in einer laufenden Emacs-Sitzung auf Latin-1 umzuschalten. Dadurch -wird erreicht, dass Emacs beim Laden einer Datei (und Speichern -derselben) standardmдЯig die Latin-1-Zeichenkodierung verwendet. Sie -kцnnen an der Ziffer 1 unmittelbar vor dem Doppelpunkt links unten in -der Statuszeile erkennen, dass Sie Latin-1 aktiviert haben. Beachten -Sie allerdings, dass set-language-environment keinen Einfluss auf die -Kodierung bereits existierender Puffer hat! Haben Sie eine Datei mit -deutschem Text in Latin-1-Kodierung irrtьmlicherweise in einer -falschen Kodierung geladen, dann mьssen Sie diesen Puffer aus Emacs -mit dem Befehl C-x k (kill-buffer) entfernen und die Datei erneut -laden, nachdem Sie mit set-language-environment auf Latin-1 -umgeschaltet haben. +Die Standard-Zeichensдtze fьr Deutsch sind Latin-1 (auch bekannt unter +dem Namen ISO-8859-1) und Unicode -- und da besonders dessen +Kodierungsvariante UTF-8. Werden anstelle der deutschen Umlaute +unansehnliche Konstrukte wie »\374« dargestellt, hat Emacs die +Kodierung nicht richtig erkannt. Sie kцnnen die Anwendung einer +Kodierung auf einen Befehl erzwingen, indem Sie diesen mit der Sequenz +»C-x c KODIERUNG« einleiten. Das Laden einer Datei »foo« mit +der Kodierung »UTF-8« ist beispielsweise + + C-x c utf-8 C-x C-f foo + +Ist die Sprachumgebung (»locale«) Ihres Betriebssystems korrekt auf +Deutsch gesetzt, verwendet Emacs diese Einstellungen automatisch +(inklusive einer Standard-Kodierung). Wollen Sie andere Einstellungen +verwenden, geben Sie »C-x l« ein (ein Tastenkьrzel fьr die +Funktion set-language-environment). Mittels + + C-x l latin-1 + +kцnnen Sie z.B. in einer laufenden Emacs-Sitzung auf Latin-1 +umzuschalten. Dadurch wird erreicht, dass Emacs beim Laden einer +Datei (und Speichern derselben) standardmдЯig die +Latin-1-Zeichenkodierung verwendet. Sie kцnnen an der Ziffer 1 +unmittelbar vor dem Doppelpunkt links unten in der Statuszeile +erkennen, dass Sie Latin-1 aktiviert haben. Beachten Sie allerdings, +dass set-language-environment keinen Einfluss auf die Kodierung +bereits existierender Puffer hat! >> Fьhren Sie jetzt C-x l latin-1 aus und цffnen Sie - anschlieЯend eine (neue) Datei mit dem Namen `bar' in einem anderen + anschlieЯend eine (neue) Datei mit dem Namen »bar« in einem anderen Fenster mittels C-x 4 C-f bar . In der Statuszeile des zweiten Fensters sehen Sie die Ziffer 1 unmittelbar vor dem Doppelpunkt. @@ -1305,10 +1282,10 @@ umgeschaltet haben. Wie kцnnen Sie nun deutsche Umlaute eingeben? Es gibt prinzipiell zwei unterschiedliche Fдlle: Sie besitzen eine deutsche Tastatur mit Tasten fьr die Umlaute oder Sie haben eine nicht-deutsche Tastatur. -Im ersteren Fall sollten Sie die Eingabemethode `german' auswдhlen, +Im ersteren Fall sollten Sie die Eingabemethode »german« auswдhlen, welche direkt die Umlaute auf die entsprechenden Tasten abbildet. Im letzteren Fall gibt es mehrere Mцglichkeiten, wovon zwei hier erklдrt -werden sollen, nдmlich `latin-1-prefix' und `latin-1-postfix'. Die +werden sollen, nдmlich »latin-1-prefix« und »latin-1-postfix«. Die Prдfix-Methode erwartet zuerst den Akzent und dann den Basisbuchstaben ('a wird zu б, "s zu Я etc.), wдhrend bei der Postfix-Methode zuerst der Basisbuchstabe und dann der Akzent einzugeben ist (a" wird zu д, @@ -1326,8 +1303,8 @@ angezeigt. Ist der Eingabemodus einmal gew ein- und ausschalten. >> Geben Sie C-u C-\ latin-1-postfix ein. Beobachten Sie, - wie links unten in der Statuszeile die Anzeige von `1:**' auf - `1<1:**' springt. Probieren Sie д einzugeben mittels a". + wie links unten in der Statuszeile die Anzeige von »1:**-« auf + »1<1:**-« springt. Probieren Sie д einzugeben mittels a". >> Deaktivieren Sie den Eingabemodus wieder mit C-\. @@ -1338,9 +1315,9 @@ beschriebenen Eingabemethoden: 1< latin-1-postfix 1> latin-1-prefix -So bedeutet die Angabe `DE@1:**', dass Sie die Eingabemethode `german' -in einem Puffer mit Latin-1-Kodierung verwenden, und dass die Datei -bereits modifiziert wurde. +So bedeutet die Angabe »DE@1:**-«, dass Sie die Eingabemethode +»german« in einem Puffer mit Latin-1-Kodierung verwenden, und dass die +Datei bereits modifiziert wurde. [Arbeitet Emacs in einem Terminal, werden noch zwei zusдtzliche Spalten zwischen Eingabemethode und Pufferkodierung eingefьgt, und @@ -1356,7 +1333,7 @@ jedoch so m sprдnge, an dieser Stelle mehr zu erklдren. Um Sie im weiteren Lernverlauf zu unterstьtzen, stellt Emacs eine Reihe von Hilfe-Funktionen zu Verfьgung, die alle mit dem Prдfix C-h (dem -Hilfe-Zeichen, `Help character') beginnen. +Hilfe-Zeichen, »Help character«) beginnen. Nach dem Drьcken von C-h geben Sie ein weiteres Zeichen ein, um Emacs zu sagen, worьber Sie mehr Informationen brauchen. Sollten Sie @@ -1364,11 +1341,7 @@ WIRKLICH verloren sein, geben Sie C-h ? ein, und Emacs sagt Ihnen, welche Art von Hilfe er Ihnen zu Verfьgung stellen kann. Haben Sie C-h versehentlich gedrьckt, kцnnen Sie mit C-g sofort abbrechen. -(Es kann vorkommen, dass bei manchen Computern bzw. Terminals C-h -etwas anderes bedeutet. Da erfahrungsgemдЯ C-h eine der -meistbenцtigten Emacs-Befehle ist, haben Sie einen wirklichen Grund, -sich in diesem Fall beim Systemadministrator zu beschweren. -Alternativen zu C-h sind die F1-Taste und der lange Befehl M-x help +(Alternativen zu C-h sind die F1-Taste und der lange Befehl M-x help .) Die elementarste Hilfestellung gibt C-h c. Drьcken Sie C-h, dann das @@ -1380,11 +1353,10 @@ Beschreibung des Befehls an. C-p runs the command previous-line -Somit wissen Sie den `Namen der Funktion'. Funktionsnamen werden -hauptsдchlich benutzt, um Emacs anzupassen bzw. zu erweitern. Aber da -Namen in der Regel beschreiben, was die jeweilige Funktion tut, kцnnen -sie auch als sehr kurze Beschreibung dienen -- ausreichend, um Sie an -Befehle zu erinnern, die Sie bereits gelernt haben. +Somit wissen Sie den »Namen der Funktion«. Da Namen in der Regel +beschreiben, was die jeweilige Funktion tut, kцnnen sie auch als sehr +kurze Beschreibung dienen -- ausreichend, um Sie an Befehle zu +erinnern, die Sie bereits gelernt haben. Aus mehr als einem Zeichen bestehende Befehle, z.B. C-x C-s oder v, sind ebenfalls erlaubt nach C-h c. @@ -1406,20 +1378,20 @@ Hier einige weitere n C-h f Beschreibt eine Funktion. Sie mьssen den Namen der Funktion eingeben. ->> Probieren Sie C-h f previous-line. +>> Probieren Sie C-h f previous-line . Alle Information ьber den C-p-Befehl wird angezeigt. Sie kцnnen die Tabulator-Taste stets benьtzen, um den Namen des -jeweiligen Befehls zu vervollstдndigen. Geben Sie z.B. `C-h f -previous' ein, dann werden alle Befehle angezeigt, deren Namen -mit `previous-' beginnen. Ergдnzen Sie die Zeichenkette auf -`previous-l' und drьcken Sie dann , bleibt nur noch der Befehl -`previous-line' ьbrig, und Sie kцnnen mit abschlieЯen. +jeweiligen Befehls zu vervollstдndigen. Geben Sie z.B. »C-h f +previous« ein, dann werden alle Befehle angezeigt, deren Namen +mit »previous-« beginnen. Ergдnzen Sie die Zeichenkette auf +»previous-l« und drьcken Sie dann , bleibt nur noch der Befehl +»previous-line« ьbrig, und Sie kцnnen mit abschlieЯen. Ein дhnlicher Befehl ist C-h v. Er zeigt den Wert und die -Dokumentation von Variablen, deren Werte man дndern kann (um Emacs an -persцnliche Bedьrfnisse anzupassen). Auch hier kann man die -Tabulator-Taste zur Vervollstдndigung benutzen. +Dokumentation von Variablen, deren Werte man дndern kann (um +beispielsweise Emacs an persцnliche Bedьrfnisse anzupassen). Auch +hier kann man die Tabulator-Taste zur Vervollstдndigung benutzen. C-h a Ein Befehls-Apropos. Gibt man ein Schlьsselwort ein, zeigt Emacs alle Befehle, die dieses Schlьsselwort @@ -1429,9 +1401,9 @@ Tabulator-Taste zur Vervollst einem oder zwei Zeichen) aufgelistet, welche den gleichen Befehl startet. ->> Geben Sie C-h a file ein. +>> Geben Sie C-h a file ein. -Alle M-x-Befehle, die das Wort `file' in ihrem Namen enthalten, werden +Alle M-x-Befehle, die das Wort »file« in ihrem Namen enthalten, werden angezeigt. Beachten Sie, dass auch C-x C-f aufgelistet wird neben dem zugehцrigen langen Namen, find-file. @@ -1440,30 +1412,26 @@ zugeh >> SchlieЯen Sie das Hilfefenster mit C-x 1. C-h i Dieser Befehl цffnet einen speziellen Puffer, um - Online-Handbьcher zu lesen (im `Info'-Format), die auf - dem verwendeten Computersystem installiert sind. - Geben Sie z.B. m emacs ein, um das - Emacs-Handbuch zu lesen. Haben Sie `Info' noch nie - benutzt, tippen Sie ?, und Emacs fьhrt Sie Schritt fьr - Schritt durch die Mцglichkeiten des Info-Modus. Wenn - Sie diese Einfьhrung fertiggelesen haben, sollten Sie - das Info-Handbuch fьr Emacs als primдre Dokumentation + Handbьcher zu lesen (im »Info«-Format), die auf dem + verwendeten Computersystem installiert sind. Geben + Sie z.B. m emacs ein, um das Emacs-Handbuch + zu lesen. Haben Sie »Info« noch nie benutzt, tippen + Sie ?, und Emacs fьhrt Sie Schritt fьr Schritt durch + die Mцglichkeiten des Info-Modus. Wenn Sie diese + Einfьhrung fertiggelesen haben, sollten Sie das + Info-Handbuch fьr Emacs als primдre Dokumentation benutzen. * SCHLUSSBEMERKUNG ------------------ -Das Wichtigste: Emacs wird mit C-x C-c beendet und mit C-z temporдr -unterbrochen. +Das Wichtigste: Emacs wird mit C-x C-c beendet. Diese Einfьhrung soll fьr alle neuen Benutzer von Emacs verstдndlich sein. Wenn daher etwas unklar sein sollte, hadern Sie nicht mit sich -selbst. Schreiben Sie an die Free Software Foundation oder an den -Autor und erlдutern Sie, was fьr Sie unklar geblieben ist. Eine -weitere Kontaktadresse ist die Mailing-Liste `de@li.org', in der -Probleme mit der Adaption von GNU-Programmen an das Deutsche -diskutiert werden. +selbst. Schreiben Sie an die Free Software Foundation, den Autor oder +den Ьbersetzer und erlдutern Sie, was fьr Sie unklar geblieben ist. * RECHTLICHES -- cgit v1.3 From c3fae8e7fad0b8f7b4f4ddbf54ecda182476313d Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Wed, 18 Jan 2012 22:58:01 +0800 Subject: Reorganize Emacs 23.4 NEWS. --- etc/NEWS | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'etc') diff --git a/etc/NEWS b/etc/NEWS index 4934468d018..136bdf1b3f6 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -15,6 +15,15 @@ You can narrow news to a specific version by calling `view-emacs-news' with a prefix argument or by typing C-u C-h C-n. +* Installation Changes in Emacs 23.4 + +** The MS-Windows build prefers libpng version 1.14 or later. +Versions of libpng before 1.14 had security issues, so we now +recommend to use version 1.14 or later. Precompiled Windows binaries +require version 1.14 or later. See README.W32 and nt/INSTALL for +details and pointers to URLs where the latest libpng can be +downloaded. + * Changes in Specialized Modes and Packages in Emacs 23.4 ** EDE @@ -26,22 +35,11 @@ variable. This reduces the risk of inadvertently loading malicious project files. The commands `M-x ede-new' and `M-x ede' now offer to save directories to `ede-project-directories'. - -* Installation Changes in Emacs 23.4 - -** The MS-Windows build prefers libpng version 1.14 or later. -Versions of libpng before 1.14 had security issues, so we now -recommend to use version 1.14 or later. Precompiled Windows binaries -require version 1.14 or later. See README.W32 and nt/INSTALL for -details and pointers to URLs where the latest libpng can be -downloaded. - - * Changes in Emacs 23.4 on non-free operating systems ** The MS-Windows port can now use more than 500MB of heap. Depending on the available virtual memory, Emacs on Windows can now -have up to 2GB of heap space. This allows, e.g., to visit several +have up to 2GB of heap space. This allows, e.g., visiting several large (> 256MB) files in the same session. -- cgit v1.3 From 110544dea07071e88b8970cf024cb862b0870b41 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 18 Jan 2012 23:03:15 -0800 Subject: Revert unintentional addition of 2012 to Ecma copyright years. This was done by mistake in emacs-23 2010-06-25T08:19:11Z!agustin.martin@hispalinux.es, and then propagated to one more file in 2010-06-26T12:01:31Z!eliz@gnu.org. --- etc/grammars/js.wy | 2 +- etc/grammars/wisent-grammar.el | 2 +- lisp/cedet/semantic/wisent/js-wy.el | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'etc') diff --git a/etc/grammars/js.wy b/etc/grammars/js.wy index b0edcb50382..56591943b22 100644 --- a/etc/grammars/js.wy +++ b/etc/grammars/js.wy @@ -1,7 +1,7 @@ ;;; javascript-jv.wy -- LALR grammar for Javascript ;; Copyright (C) 2005-2011, 2012 Free Software Foundation, Inc. -;; Copyright (C) 1998-2011, 2012 Ecma International. +;; Copyright (C) 1998-2011 Ecma International. ;; Author: Joakim Verona diff --git a/etc/grammars/wisent-grammar.el b/etc/grammars/wisent-grammar.el index 59d58c28325..77fdfddc5bf 100644 --- a/etc/grammars/wisent-grammar.el +++ b/etc/grammars/wisent-grammar.el @@ -471,7 +471,7 @@ Menu items are appended to the common grammar menu.") "srecode/srt-wy") ("wisent-javascript-jv-wy.el" "semantic/wisent/js-wy" - "Copyright (C) 1998-2011, 2012 Ecma International." + "Copyright (C) 1998-2011 Ecma International." ,wisent-make-parsers--ecmascript-license) ("wisent-java-tags-wy.el" "semantic/wisent/javat-wy") diff --git a/lisp/cedet/semantic/wisent/js-wy.el b/lisp/cedet/semantic/wisent/js-wy.el index 19c69ecb51b..1862de2d838 100644 --- a/lisp/cedet/semantic/wisent/js-wy.el +++ b/lisp/cedet/semantic/wisent/js-wy.el @@ -1,7 +1,7 @@ ;;; semantic/wisent/js-wy.el --- Generated parser support file ;; Copyright (C) 2005, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. -;; Copyright (C) 1998-2012 Ecma International. +;; Copyright (C) 1998-2011 Ecma International. ;; This file is part of GNU Emacs. -- cgit v1.3 From 685305ebe0455a8d5211bedf41b588bccfb432c8 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 18 Jan 2012 23:15:48 -0800 Subject: Copy copyright fix from 2010-06-26T12:01:31Z!eliz@gnu.org to one more file. --- etc/grammars/python.wy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'etc') diff --git a/etc/grammars/python.wy b/etc/grammars/python.wy index e632cefc660..4b288dcb9a2 100644 --- a/etc/grammars/python.wy +++ b/etc/grammars/python.wy @@ -1,7 +1,8 @@ ;;; python.wy -- LALR grammar for Python ;; Copyright (C) 2002-2011, 2012 Free Software Foundation, Inc. -;; Copyright (C) 2001-2010 Python Software Foundation +;; Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, +;; 2009, 2010 Python Software Foundation; All Rights Reserved ;; Author: Richard Kim ;; Maintainer: Richard Kim -- cgit v1.3 From a2f0118ce5c18ea397c9571e401231b2fca7aa61 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 20 Jan 2012 16:26:00 -0800 Subject: * etc/NEWS: Relocate MS Windows change to "non-free" section. --- etc/NEWS | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'etc') diff --git a/etc/NEWS b/etc/NEWS index 0b0e5e571aa..11537363ef4 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -84,10 +84,6 @@ longer have any effect. (They were declared obsolete in Emacs 23.) ** New command line option `--no-site-lisp' removes site-lisp directories from load-path. -Q now implies this. ---- -** On Windows, Emacs now warns when the obsolete _emacs init file is used, -and also when HOME is set to C:\ by default. - * Changes in Emacs 24.1 @@ -1378,6 +1374,10 @@ Use `filter-buffer-substring-functions' instead. * Changes in Emacs 24.1 on non-free operating systems +--- +** On MS Windows, Emacs now warns when the obsolete _emacs init file is used, +and also when HOME is set to C:\ by default. + ** New configure.bat option --enable-checking builds Emacs with extra runtime checks. -- cgit v1.3 From 7b447e9bda80e5de478922771a62c2b3a8f9b2aa Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 20 Jan 2012 16:41:05 -0800 Subject: File-local variable fixes. * lisp/files.el (local-enable-local-variables): Doc fix. (inhibit-local-variables-regexps): Rename from inhibit-first-line-modes-regexps. Keep old name as obsolete alias. Doc fix. Add some extensions from auto-coding-alist. (inhibit-local-variables-suffixes): Rename from inhibit-first-line-modes-suffixes. Doc fix. (inhibit-local-variables-p): New function, extracted from set-auto-mode-1. (set-auto-mode): Doc fix. Respect inhibit-local-variables-regexps. (set-auto-mode-1): Doc fix. Use inhibit-local-variables-p. (hack-local-variables): Doc fix. Make the mode-only case respect enable-local-variables and friends. Respect inhibit-local-variables-regexps for file-locals, but not for directory-locals. (set-visited-file-name): Take account of inhibit-local-variables-regexps. Whether it applies may change as the file name is changed. * lisp/jka-cmpr-hook.el (jka-compr-install): * lisp/jka-compr.el (jka-compr-uninstall): Update for inhibit-first-line-modes-suffixes name change. * etc/NEWS: Mention this change. Fixes: debbugs:10506 --- etc/NEWS | 8 ++ lisp/ChangeLog | 23 ++++ lisp/files.el | 306 +++++++++++++++++++++++++++++++------------------- lisp/jka-cmpr-hook.el | 12 +- lisp/jka-compr.el | 9 +- 5 files changed, 234 insertions(+), 124 deletions(-) (limited to 'etc') diff --git a/etc/NEWS b/etc/NEWS index 11537363ef4..743e3ce2e7b 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -369,6 +369,14 @@ turn on `whitespace-mode' for *vc-diff* buffers. Modes should call *** Using "mode: MINOR-MODE" to enable a minor mode is deprecated. Instead, use "eval: (minor-mode 1)". +FIXME: inhibit-first-line-modes-regexps was not mentioned in lispref, +but this probably should be. +*** The variable `inhibit-first-line-modes-regexps' has been renamed +to `inhibit-local-variables-regexps'. As the name suggests, it now +applies to ALL file local variables, not just -*- mode ones. +The associated `inhibit-first-line-modes-suffixes' has been renamed +in the corresponding way. + +++ ** The variable `focus-follows-mouse' now always defaults to nil. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 71211ca9af9..248de3429fa 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,26 @@ +2012-01-21 Glenn Morris + + * files.el (local-enable-local-variables): Doc fix. + (inhibit-local-variables-regexps): Rename from + inhibit-first-line-modes-regexps. Keep old name as obsolete alias. + Doc fix. Add some extensions from auto-coding-alist. + (inhibit-local-variables-suffixes): + Rename from inhibit-first-line-modes-suffixes. Doc fix. + (inhibit-local-variables-p): + New function, extracted from set-auto-mode-1. + (set-auto-mode): Doc fix. Respect inhibit-local-variables-regexps. + (set-auto-mode-1): Doc fix. Use inhibit-local-variables-p. + (hack-local-variables): Doc fix. Make the mode-only case + respect enable-local-variables and friends. + Respect inhibit-local-variables-regexps for file-locals, but + not for directory-locals. + (set-visited-file-name): + Take account of inhibit-local-variables-regexps. + Whether it applies may change as the file name is changed. + * jka-cmpr-hook.el (jka-compr-install): + * jka-compr.el (jka-compr-uninstall): + Update for inhibit-first-line-modes-suffixes name change. + 2012-01-20 Martin Rudalics * help-macro.el (make-help-screen): Temporarily restore original diff --git a/lisp/files.el b/lisp/files.el index 6056a70d4a1..7a72775ac3f 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -510,14 +510,36 @@ and ignores this variable." (other :tag "Query" other)) :group 'find-file) +;; This is an odd variable IMO. +;; You might wonder why it is needed, when we could just do: +;; (set (make-local-variable 'enable-local-variables) nil) +;; These two are not precisely the same. +;; Setting this variable does not cause -*- mode settings to be +;; ignored, whereas setting enable-local-variables does. +;; Only three places in Emacs use this variable: tar and arc modes, +;; and rmail. The first two don't need it. They already use +;; inhibit-local-variables-regexps, which is probably enough, and +;; could also just set enable-local-variables locally to nil. +;; Them setting it has the side-effect that dir-locals cannot apply to +;; eg tar files (?). FIXME Is this appropriate? +;; AFAICS, rmail is the only thing that needs this, and the only +;; reason it uses it is for BABYL files (which are obsolete). +;; These contain "-*- rmail -*-" in the first line, which rmail wants +;; to respect, so that find-file on a BABYL file will switch to +;; rmail-mode automatically (this is nice, but hardly essential, +;; since most people are used to explicitly running a command to +;; access their mail; M-x gnus etc). Rmail files may happen to +;; contain Local Variables sections in messages, which Rmail wants to +;; ignore. So AFAICS the only reason this variable exists is for a +;; minor convenience feature for handling of an obsolete Rmail file format. (defvar local-enable-local-variables t "Like `enable-local-variables' but meant for buffer-local bindings. The meaningful values are nil and non-nil. The default is non-nil. If a major mode sets this to nil, buffer-locally, then any local -variables list in the file will be ignored. +variables list in a file visited in that mode will be ignored. -This variable does not affect the use of major modes -specified in a -*- line.") +This variable does not affect the use of major modes specified +in a -*- line.") (defcustom enable-local-eval 'maybe "Control processing of the \"variable\" `eval' in a file's local variables. @@ -2475,17 +2497,55 @@ of a script, mode MODE is enabled. See also `auto-mode-alist'.") -(defvar inhibit-first-line-modes-regexps - (mapcar 'purecopy '("\\.tar\\'" "\\.tgz\\'" "\\.tiff?\\'" - "\\.gif\\'" "\\.png\\'" "\\.jpe?g\\'")) - "List of regexps; if one matches a file name, don't look for `-*-'. -See also `inhibit-first-line-modes-suffixes'.") - -(defvar inhibit-first-line-modes-suffixes nil - "List of regexps for what to ignore, for `inhibit-first-line-modes-regexps'. -When checking `inhibit-first-line-modes-regexps', we first discard +(define-obsolete-variable-alias 'inhibit-first-line-modes-regexps + 'inhibit-file-local-variables-regexps "24.1") + +;; TODO really this should be a list of modes (eg tar-mode), not regexps, +;; because we are duplicating info from auto-mode-alist. +;; TODO many elements of this list are also in auto-coding-alist. +(defvar inhibit-local-variables-regexps + (mapcar 'purecopy '("\\.tar\\'" "\\.t[bg]z\\'" + "\\.arc\\'" "\\.zip\\'" "\\.lzh\\'" "\\.lha\\'" + "\\.zoo\\'" "\\.[jew]ar\\'" "\\.xpi\\'" "\\.rar\\'" + "\\.7z\\'" + "\\.sx[dmicw]\\'" "\\.odt\\'" + "\\.tiff?\\'" "\\.gif\\'" "\\.png\\'" "\\.jpe?g\\'")) + "List of regexps matching file names in which to ignore local variables. +This includes `-*-' lines as well as trailing \"Local Variables\" sections. +Files matching this list are typically binary file formats. +They may happen to contain sequences that look like local variable +specifications, but are not really, or they may be containers for +member files with their own local variable sections, which are +not appropriate for the containing file. +See also `inhibit-local-variables-suffixes'.") + +(define-obsolete-variable-alias 'inhibit-first-line-modes-suffixes + 'inhibit-local-variables-suffixes "24.1") + +(defvar inhibit-local-variables-suffixes nil + "List of regexps matching suffixes to remove from file names. +When checking `inhibit-local-variables-regexps', we first discard from the end of the file name anything that matches one of these regexps.") +;; TODO explicitly add case-fold-search t? +(defun inhibit-local-variables-p () + "Return non-nil if file local variables should be ignored. +This checks the file (or buffer) name against `inhibit-local-variables-regexps' +and `inhibit-local-variables-suffixes'." + (let ((temp inhibit-local-variables-regexps) + (name (if buffer-file-name + (file-name-sans-versions buffer-file-name) + (buffer-name)))) + (while (let ((sufs inhibit-local-variables-suffixes)) + (while (and sufs (not (string-match (car sufs) name))) + (setq sufs (cdr sufs))) + sufs) + (setq name (substring name 0 (match-beginning 0)))) + (while (and temp + (not (string-match (car temp) name))) + (setq temp (cdr temp))) + temp)) + (defvar auto-mode-interpreter-regexp (purecopy "#![ \t]?\\([^ \t\n]*\ /bin/env[ \t]\\)?\\([^ \t\n]+\\)") @@ -2549,21 +2609,23 @@ Also applies to `magic-fallback-mode-alist'.") "Select major mode appropriate for current buffer. To find the right major mode, this function checks for a -*- mode tag -\(unless `inhibit-first-line-modes-regexps' says not to), checks for a `mode:' entry in the Local Variables section of the file, checks if it uses an interpreter listed in `interpreter-mode-alist', matches the buffer beginning against `magic-mode-alist', compares the filename against the entries in `auto-mode-alist', then matches the buffer beginning against `magic-fallback-mode-alist'. -If `enable-local-variables' is nil, this function does not check for -any mode: tag anywhere in the file. +If `enable-local-variables' is nil, or if the file name matches +`inhibit-local-variables-regexps', this function does not check +for any mode: tag anywhere in the file. If `local-enable-local-variables' +is nil, then the only mode: tag that can be relevant is a -*- one. If the optional argument KEEP-MODE-IF-SAME is non-nil, then we set the major mode only if that would change it. In other words we don't actually set it to the same mode the buffer already has." ;; Look for -*-MODENAME-*- or -*- ... mode: MODENAME; ... -*- - (let (end done mode modes) + (let ((try-locals (not (inhibit-local-variables-p))) + end done mode modes) ;; Once we drop the deprecated feature where mode: is also allowed to ;; specify minor-modes (ie, there can be more than one "mode:"), we can ;; remove this section and just let (hack-local-variables t) handle it. @@ -2571,7 +2633,9 @@ we don't actually set it to the same mode the buffer already has." (save-excursion (goto-char (point-min)) (skip-chars-forward " \t\n") + ;; Note by design local-enable-local-variables does not matter here. (and enable-local-variables + try-locals (setq end (set-auto-mode-1)) (if (save-excursion (search-forward ":" end t)) ;; Find all specifications for the `mode:' variable @@ -2602,8 +2666,12 @@ we don't actually set it to the same mode the buffer already has." (or (set-auto-mode-0 mode keep-mode-if-same) ;; continuing would call minor modes again, toggling them off (throw 'nop nil)))))) + ;; hack-local-variables checks local-enable-local-variables etc, but + ;; we might as well be explicit here for the sake of clarity. (and (not done) enable-local-variables + local-enable-local-variables + try-locals (setq mode (hack-local-variables t)) (not (memq mode modes)) ; already tried and failed (if (not (functionp mode)) @@ -2713,38 +2781,24 @@ same, do nothing and return nil." (defun set-auto-mode-1 () "Find the -*- spec in the buffer. Call with point at the place to start searching from. -If one is found, set point to the beginning -and return the position of the end. -Otherwise, return nil; point may be changed." +If one is found, set point to the beginning and return the position +of the end. Otherwise, return nil; may change point. +The variable `inhibit-local-variables-regexps' can cause a -*- spec to +be ignored; but `enable-local-variables' and `local-enable-local-variables' +have no effect." (let (beg end) (and ;; Don't look for -*- if this file name matches any - ;; of the regexps in inhibit-first-line-modes-regexps. - (let ((temp inhibit-first-line-modes-regexps) - (name (if buffer-file-name - (file-name-sans-versions buffer-file-name) - (buffer-name)))) - (while (let ((sufs inhibit-first-line-modes-suffixes)) - (while (and sufs (not (string-match (car sufs) name))) - (setq sufs (cdr sufs))) - sufs) - (setq name (substring name 0 (match-beginning 0)))) - (while (and temp - (not (string-match (car temp) name))) - (setq temp (cdr temp))) - (not temp)) - + ;; of the regexps in inhibit-local-variables-regexps. + (not (inhibit-local-variables-p)) (search-forward "-*-" (line-end-position - ;; If the file begins with "#!" - ;; (exec interpreter magic), look - ;; for mode frobs in the first two - ;; lines. You cannot necessarily - ;; put them in the first line of - ;; such a file without screwing up - ;; the interpreter invocation. - ;; The same holds for - ;; '\" - ;; in man pages (preprocessor + ;; If the file begins with "#!" (exec + ;; interpreter magic), look for mode frobs + ;; in the first two lines. You cannot + ;; necessarily put them in the first line + ;; of such a file without screwing up the + ;; interpreter invocation. The same holds + ;; for '\" in man pages (preprocessor ;; magic for the `man' program). (and (looking-at "^\\(#!\\|'\\\\\"\\)") 2)) t) (progn @@ -3089,19 +3143,41 @@ Uses `hack-local-variables-apply' to apply the variables. If MODE-ONLY is non-nil, all we do is check whether a \"mode:\" is specified, and return the corresponding mode symbol, or nil. In this case, we try to ignore minor-modes, and only return a -major-mode." +major-mode. + +If `enable-local-variables' or `local-enable-local-variables' is nil, +this function does nothing. If `inhibit-local-variables-regexps' +applies to the file in question, the file is not scanned for +local variables, but directory-local variables may still be applied." + ;; We don't let inhibit-local-variables-p influence the value of + ;; enable-local-variables, because then it would affect dir-local + ;; variables. We don't want to search eg tar files for file local + ;; variable sections, but there is no reason dir-locals cannot apply + ;; to them. The real meaning of inhibit-local-variables-p is "do + ;; not scan this file for local variables". (let ((enable-local-variables (and local-enable-local-variables enable-local-variables)) result) (unless mode-only (setq file-local-variables-alist nil) (report-errors "Directory-local variables error: %s" + ;; Note this is a no-op if enable-local-variables is nil. (hack-dir-local-variables))) - (when (or mode-only enable-local-variables) - ;; If MODE-ONLY is non-nil, and the prop line specifies a mode, - ;; then we're done, and have no need to scan further. - (unless (and (setq result (hack-local-variables-prop-line mode-only)) - mode-only) + ;; This entire function is basically a no-op if enable-local-variables + ;; is nil. All it does is set file-local-variables-alist to nil. + (when enable-local-variables + ;; This part used to ignore enable-local-variables when mode-only + ;; was non-nil. That was inappropriate, eg consider the + ;; (artificial) example of: + ;; (setq local-enable-local-variables nil) + ;; Open a file foo.txt that contains "mode: sh". + ;; It correctly opens in text-mode. + ;; M-x set-visited-file name foo.c, and it incorrectly stays in text-mode. + (unless (or (inhibit-local-variables-p) + ;; If MODE-ONLY is non-nil, and the prop line specifies a + ;; mode, then we're done, and have no need to scan further. + (and (setq result (hack-local-variables-prop-line mode-only)) + mode-only)) ;; Look for "Local variables:" line in last page. (save-excursion (goto-char (point-max)) @@ -3191,14 +3267,13 @@ major-mode." (indirect-variable var)) val) result) (error nil))))) - (forward-line 1))))))))) - ;; Now we've read all the local variables. - ;; If MODE-ONLY is non-nil, return whether the mode was specified. - (cond (mode-only result) - ;; Otherwise, set the variables. - (enable-local-variables - (hack-local-variables-filter result nil) - (hack-local-variables-apply))))) + (forward-line 1)))))))) + ;; Now we've read all the local variables. + ;; If MODE-ONLY is non-nil, return whether the mode was specified. + (if mode-only result + ;; Otherwise, set the variables. + (hack-local-variables-filter result nil) + (hack-local-variables-apply))))) (defun hack-local-variables-apply () "Apply the elements of `file-local-variables-alist'. @@ -3610,7 +3685,7 @@ the old visited file has been renamed to the new name FILENAME." (interactive "FSet visited file name: ") (if (buffer-base-buffer) (error "An indirect buffer cannot visit a file")) - (let (truename) + (let (truename old-try-locals) (if filename (setq filename (if (string-equal filename "") @@ -3635,7 +3710,8 @@ the old visited file has been renamed to the new name FILENAME." (progn (and filename (lock-buffer filename)) (unlock-buffer))) - (setq buffer-file-name filename) + (setq old-try-locals (not (inhibit-local-variables-p)) + buffer-file-name filename) (if filename ; make buffer name reflect filename. (let ((new-name (file-name-nondirectory buffer-file-name))) (setq default-directory (file-name-directory buffer-file-name)) @@ -3655,59 +3731,63 @@ the old visited file has been renamed to the new name FILENAME." (setq buffer-file-number (if filename (nthcdr 10 (file-attributes buffer-file-name)) - nil))) - ;; write-file-functions is normally used for things like ftp-find-file - ;; that visit things that are not local files as if they were files. - ;; Changing to visit an ordinary local file instead should flush the hook. - (kill-local-variable 'write-file-functions) - (kill-local-variable 'local-write-file-hooks) - (kill-local-variable 'revert-buffer-function) - (kill-local-variable 'backup-inhibited) - ;; If buffer was read-only because of version control, - ;; that reason is gone now, so make it writable. - (if vc-mode - (setq buffer-read-only nil)) - (kill-local-variable 'vc-mode) - ;; Turn off backup files for certain file names. - ;; Since this is a permanent local, the major mode won't eliminate it. - (and buffer-file-name - backup-enable-predicate - (not (funcall backup-enable-predicate buffer-file-name)) - (progn - (make-local-variable 'backup-inhibited) - (setq backup-inhibited t))) - (let ((oauto buffer-auto-save-file-name)) - ;; If auto-save was not already on, turn it on if appropriate. - (if (not buffer-auto-save-file-name) - (and buffer-file-name auto-save-default - (auto-save-mode t)) - ;; If auto save is on, start using a new name. - ;; We deliberately don't rename or delete the old auto save - ;; for the old visited file name. This is because perhaps - ;; the user wants to save the new state and then compare with the - ;; previous state from the auto save file. - (setq buffer-auto-save-file-name - (make-auto-save-file-name))) - ;; Rename the old auto save file if any. - (and oauto buffer-auto-save-file-name - (file-exists-p oauto) - (rename-file oauto buffer-auto-save-file-name t))) - (and buffer-file-name - (not along-with-file) - (set-buffer-modified-p t)) - ;; Update the major mode, if the file name determines it. - (condition-case nil - ;; Don't change the mode if it is special. - (or (not change-major-mode-with-file-name) - (get major-mode 'mode-class) - ;; Don't change the mode if the local variable list specifies it. - (hack-local-variables t) - ;; TODO consider making normal-mode handle this case. - (let ((old major-mode)) - (set-auto-mode t) - (or (eq old major-mode) - (hack-local-variables)))) - (error nil))) + nil)) + ;; write-file-functions is normally used for things like ftp-find-file + ;; that visit things that are not local files as if they were files. + ;; Changing to visit an ordinary local file instead should flush the hook. + (kill-local-variable 'write-file-functions) + (kill-local-variable 'local-write-file-hooks) + (kill-local-variable 'revert-buffer-function) + (kill-local-variable 'backup-inhibited) + ;; If buffer was read-only because of version control, + ;; that reason is gone now, so make it writable. + (if vc-mode + (setq buffer-read-only nil)) + (kill-local-variable 'vc-mode) + ;; Turn off backup files for certain file names. + ;; Since this is a permanent local, the major mode won't eliminate it. + (and buffer-file-name + backup-enable-predicate + (not (funcall backup-enable-predicate buffer-file-name)) + (progn + (make-local-variable 'backup-inhibited) + (setq backup-inhibited t))) + (let ((oauto buffer-auto-save-file-name)) + ;; If auto-save was not already on, turn it on if appropriate. + (if (not buffer-auto-save-file-name) + (and buffer-file-name auto-save-default + (auto-save-mode t)) + ;; If auto save is on, start using a new name. + ;; We deliberately don't rename or delete the old auto save + ;; for the old visited file name. This is because perhaps + ;; the user wants to save the new state and then compare with the + ;; previous state from the auto save file. + (setq buffer-auto-save-file-name + (make-auto-save-file-name))) + ;; Rename the old auto save file if any. + (and oauto buffer-auto-save-file-name + (file-exists-p oauto) + (rename-file oauto buffer-auto-save-file-name t))) + (and buffer-file-name + (not along-with-file) + (set-buffer-modified-p t)) + ;; Update the major mode, if the file name determines it. + (condition-case nil + ;; Don't change the mode if it is special. + (or (not change-major-mode-with-file-name) + (get major-mode 'mode-class) + ;; Don't change the mode if the local variable list specifies it. + ;; The file name can influence whether the local variables apply. + (and old-try-locals + ;; h-l-v also checks it, but might as well be explcit. + (not (inhibit-local-variables-p)) + (hack-local-variables t)) + ;; TODO consider making normal-mode handle this case. + (let ((old major-mode)) + (set-auto-mode t) + (or (eq old major-mode) + (hack-local-variables)))) + (error nil)))) (defun write-file (filename &optional confirm) "Write current buffer into file FILENAME. diff --git a/lisp/jka-cmpr-hook.el b/lisp/jka-cmpr-hook.el index d09e64634c3..600ed549731 100644 --- a/lisp/jka-cmpr-hook.el +++ b/lisp/jka-cmpr-hook.el @@ -119,7 +119,7 @@ based on the filename itself and `jka-compr-compression-info-list'." (defun jka-compr-install () "Install jka-compr. This adds entries to `file-name-handler-alist' and `auto-mode-alist' -and `inhibit-first-line-modes-suffixes'." +and `inhibit-local-variables-suffixes'." (setq jka-compr-file-name-handler-entry (cons (jka-compr-build-file-regexp) 'jka-compr-handler)) @@ -145,12 +145,12 @@ and `inhibit-first-line-modes-suffixes'." ;; are chosen right according to the file names ;; sans `.gz'. (push (list (jka-compr-info-regexp x) nil 'jka-compr) auto-mode-alist) - ;; Also add these regexps to - ;; inhibit-first-line-modes-suffixes, so that a - ;; -*- line in the first file of a compressed tar - ;; file doesn't override tar-mode. + ;; Also add these regexps to inhibit-local-variables-suffixes, + ;; so that a -*- line in the first file of a compressed tar file, + ;; or a Local Variables section in a member file at the end of + ;; the tar file don't override tar-mode. (push (jka-compr-info-regexp x) - inhibit-first-line-modes-suffixes))) + inhibit-local-variables-suffixes))) (setq auto-mode-alist (append auto-mode-alist jka-compr-mode-alist-additions)) diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el index 786e4292d5f..8a8d7cdbb52 100644 --- a/lisp/jka-compr.el +++ b/lisp/jka-compr.el @@ -657,16 +657,15 @@ It is not recommended to set this variable permanently to anything but nil.") (defun jka-compr-uninstall () "Uninstall jka-compr. This removes the entries in `file-name-handler-alist' and `auto-mode-alist' -and `inhibit-first-line-modes-suffixes' that were added +and `inhibit-local-variables-suffixes' that were added by `jka-compr-installed'." - ;; Delete from inhibit-first-line-modes-suffixes - ;; what jka-compr-install added. + ;; Delete from inhibit-local-variables-suffixes what jka-compr-install added. (mapc (function (lambda (x) (and (jka-compr-info-strip-extension x) - (setq inhibit-first-line-modes-suffixes + (setq inhibit-local-variables-suffixes (delete (jka-compr-info-regexp x) - inhibit-first-line-modes-suffixes))))) + inhibit-local-variables-suffixes))))) jka-compr-compression-info-list--internal) (let* ((fnha (cons nil file-name-handler-alist)) -- cgit v1.3 From 61086eb66b6a222124f302c197e14021711d29d3 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 20 Jan 2012 19:15:07 -0800 Subject: Document inhibit-local-variables-regexps in the lispref. * doc/lispref/modes.texi (Auto Major Mode): * doc/lispref/variables.texi (File Local Variables): Mention inhibit-local-variables-regexps. * etc/NEWS: Markup. --- doc/lispref/ChangeLog | 6 ++++++ doc/lispref/modes.texi | 12 ++++++++++++ doc/lispref/variables.texi | 7 +++++++ etc/NEWS | 3 +-- 4 files changed, 26 insertions(+), 2 deletions(-) (limited to 'etc') diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 44467d5f51b..872c4f564ac 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,9 @@ +2012-01-21 Glenn Morris + + * modes.texi (Auto Major Mode): + * variables.texi (File Local Variables): + Mention inhibit-local-variables-regexps. + 2012-01-19 Martin Rudalics * windows.texi (Window Configurations): Rewrite references to diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi index 5d09b79748e..b3aac231d5b 100644 --- a/doc/lispref/modes.texi +++ b/doc/lispref/modes.texi @@ -588,6 +588,18 @@ Chosen, emacs, The GNU Emacs Manual}. If @code{enable-local-variables} is @code{nil}, @code{set-auto-mode} does not check the @w{@samp{-*-}} line, or near the end of the file, for any mode tag. +@vindex inhibit-local-variables-regexps +There are some file types where it is not appropriate to scan the file +contents for a mode specifier. For example, a tar archive may happen to +contain, near the end of the file, a member file that has a local +variables section specifying a mode for that particular file. This +should not be applied to the containing tar file. Similarly, a tiff +image file might just happen to contain a first line that seems to +match the @w{@samp{-*-}} pattern. For these reasons, both these file +extensions are members of the list @var{inhibit-local-variables-regexps}. +Add patterns to this list to prevent Emacs searching them for local +variables of any kind (not just mode specifiers). + If @var{keep-mode-if-same} is non-@code{nil}, this function does not call the mode command if the buffer is already in the proper major mode. For instance, @code{set-visited-file-name} sets this to diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi index b0a6795021b..a8f75f5a160 100644 --- a/doc/lispref/variables.texi +++ b/doc/lispref/variables.texi @@ -1660,6 +1660,13 @@ Query (once) about all the variables. @end table @end defopt +@defvar inhibit-local-variables-regexps +This is a list of regular expressions. If a file has a name +matching an element of this list, then it is not scanned for +any form of file-local variable. For examples of why you might want +to use this, @pxref{Auto Major Mode}. +@end defvar + @defun hack-local-variables &optional mode-only This function parses, and binds or evaluates as appropriate, any local variables specified by the contents of the current buffer. The variable diff --git a/etc/NEWS b/etc/NEWS index 743e3ce2e7b..b22f79225d5 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -369,8 +369,7 @@ turn on `whitespace-mode' for *vc-diff* buffers. Modes should call *** Using "mode: MINOR-MODE" to enable a minor mode is deprecated. Instead, use "eval: (minor-mode 1)". -FIXME: inhibit-first-line-modes-regexps was not mentioned in lispref, -but this probably should be. ++++ *** The variable `inhibit-first-line-modes-regexps' has been renamed to `inhibit-local-variables-regexps'. As the name suggests, it now applies to ALL file local variables, not just -*- mode ones. -- cgit v1.3 From 7a22e700110b98363a940b14efa8ad5af57c29e2 Mon Sep 17 00:00:00 2001 From: Ognyan Kulev Date: Sat, 21 Jan 2012 22:58:38 +0800 Subject: Update TUTORIAL.bg. --- admin/FOR-RELEASE | 6 +- etc/ChangeLog | 4 + etc/NEWS | 17 +- etc/tutorials/TUTORIAL.bg | 692 +++++++++++++++++++------------------ etc/tutorials/TUTORIAL.translators | 4 +- 5 files changed, 365 insertions(+), 358 deletions(-) (limited to 'etc') diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE index 6b10d51b970..9335e5b1fbe 100644 --- a/admin/FOR-RELEASE +++ b/admin/FOR-RELEASE @@ -100,10 +100,10 @@ names of the people who have checked it. SECTION READERS ---------------------------------- TUTORIAL cyd -TUTORIAL.bg +TUTORIAL.bg ogi TUTORIAL.cn TUTORIAL.cs -TUTORIAL.de +TUTORIAL.de wl TUTORIAL.eo TUTORIAL.es TUTORIAL.fr @@ -215,7 +215,7 @@ minibuf.texi modes.texi nonascii.texi numbers.texi -objects.texi +objects.texi cyd os.texi package.texi positions.texi diff --git a/etc/ChangeLog b/etc/ChangeLog index c6ba86a029a..60ccded8ad6 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,7 @@ +2012-01-21 Ognyan Kulev + + * tutorials/TUTORIAL.bg: Updated; synchronize with TUTORIAL. + 2012-01-19 Werner Lemberg * tutorial/TUTORIAL.de: Updated; synchronize with TUTORIAL. diff --git a/etc/NEWS b/etc/NEWS index b22f79225d5..40a1c194365 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -1382,20 +1382,19 @@ Use `filter-buffer-substring-functions' instead. * Changes in Emacs 24.1 on non-free operating systems --- -** On MS Windows, Emacs now warns when the obsolete _emacs init file is used, +** On MS Windows, Emacs warns when using the obsolete init file _emacs, and also when HOME is set to C:\ by default. -** New configure.bat option --enable-checking builds Emacs with extra -runtime checks. +** New configure.bat options -** New configure.bat option --distfiles to specify files to be -included in binary distribution. +*** --enable-checking builds Emacs with extra runtime checks. -** New configure.bat option --without-gnutls to disable automatic -GnuTLS detection. +*** --distfiles specifies files to be included in binary distribution. -** New configure.bat option --lib for general library linkage, works -with the USER_LIBS build variable. +*** --without-gnutls disables automatic GnuTLS detection. + +*** --lib for general library linkage, works with the USER_LIBS build +variable. ** New make target `dist' to create binary distribution for MS Windows. diff --git a/etc/tutorials/TUTORIAL.bg b/etc/tutorials/TUTORIAL.bg index 22f96f169b9..91198961bff 100644 --- a/etc/tutorials/TUTORIAL.bg +++ b/etc/tutorials/TUTORIAL.bg @@ -1,4 +1,4 @@ -Въведението на Емакс. Условията за копиране са в края на текста. +Въведение в Емакс. Условията за копиране са в края на текста. Командите на Емакс най-често включват клавишите CONTROL (понякога отбелязван с CTRL или CTL) и META (понякога отбелязван с EDIT или @@ -14,14 +14,14 @@ ALT). клавиша ESC и след това въведете <знак>. Ние записваме , за да отбележим клавиша ESC. -Важна бележка: в края на Емакс сесията въведете двата знака C-x C-c. -Знаците ">>" отляво ви дават указание да изпълните команда. Например: +Важна бележка: в края на Емакс сесията въведете C-x C-c. (Два знака.) +За да прекъснете частично въведена команда, използвайте C-g. +Знаците „>>“ отляво ви дават указание да изпълните команда. Например: <> ->> Сега въведете C-v (Покажи следващия екран), за да се придвижите към -следващия екран. - (Направете го сега, задръжте CONTROL, докато натискате v). - Отсега нататък вие ще правите това винаги, когато прочетете - екрана. +>> Сега въведете C-v (Показване на следващия екран), за да се придвижите + към следващия екран. (Направете го сега, задръжте CONTROL, + докато натискате „v“). Отсега нататък вие ще правите това винаги, + когато прочетете екрана. Забележете, че има припокриване на два реда, когато се придвижвате от екран в екран; това осигурява някаква приемственост, така че да можете @@ -30,8 +30,8 @@ ALT). Първото нещо, което трябва да знаете, е как да се придвижвате от едно място на текста към друго. Вие вече знаете как да се придвижвате екран напред, с C-v. За да се придвижите екран назад, въведете M-v -(задръжте клавиша META и натиснете v, или въведете v, ако нямате -клавиш META, EDIT или ALT). +(задръжте клавиша META и натиснете „v“, или въведете и после „v“, +ако нямате клавиш META, EDIT или ALT). >> Опитайте се да въведете M-v и след това C-v няколко пъти. @@ -49,7 +49,11 @@ ALT). >> Намерете курсора и си запомнете какъв е текстът около него. След това въведете C-l. - Намерете пак курсора и вижте, че същият текст е пак около курсора. + Намерете пак курсора и вижте, че същият текст е пак около курсора, + но сега вече в средата на екрана. + Ако пак натиснете C-l, тази част от текста ще се придвижи в горния + край на екрана. Натиснете отново C-l и този текст ще отиде в долния + край на екрана. Може също да използвате клавишите PageUp и PageDown за придвижване по екрани, ако вашият терминал ги притежава, но вие можете да редактирате @@ -65,7 +69,7 @@ ALT). Има няколко начина да го направите. Може да използвате клавишите стрелки, но е по-ефективно да държите ръцете си в стандартно положение и да използвате командите C-p, C-b, C-f и C-n. Тези знаци са -еквивалентни на четирите клавиши стрелки, ето така: +еквивалентни на четирите клавиши стрелки по следния начин: Предишен ред (Previous), C-p : @@ -76,38 +80,37 @@ ALT). Следващ ред (Next), C-n >> Придвижете курсора до реда в средата на тази диаграма, използвайки - C-n и C-p. След това натиснете C-l, за да видите цялата диаграма, + C-n и C-p. След това натиснете C-l и ще видите цялата диаграма, центрирана на екрана. Ще намерите, че запомнянето на тези букви по думите на английски на -действията, които извършват, е лесно: P за Previous (предишен), N за -Next (следващ), B за Backward (назад) и F за Forward (напред). Вие ще -използвате тези основни команди за придвижване на курсора през цялото -време. +действията, които извършват, е лесно: „P“ за Previous (предишен), „N“ +за Next (следващ), „B“ за Backward (назад) и „F“ за Forward (напред). +Вие ще използвате тези основни команди за придвижване на курсора през +цялото време. ->> Въведете няколко C-n, за да доведете курсора до този ред. +>> Въведете няколко пъти C-n, за да доведете курсора до този ред. ->> Придвижете се в реда с няколко C-f и след това с няколко C-p. +>> Придвижете се вътре в реда с няколко C-f и след това с няколко C-p. Вижте какво прави C-p, когато курсорът е в средата на реда. Всеки ред от текст завършва със знак за нов ред, който служи за -отделянето на реда от следващия ред. Последният ред във вашия файл -трябва да има знак за нов ред в края (но Емакс не изисква такъв, -когато прочита файла). +отделянето на реда от следващия ред. (Последният ред във вашия файл +трябва да има знак за нов ред в края, но Емакс не изисква такъв.) >> Опитайте C-b в началото на ред. Това трябва да ви придвижи в края на предишния ред. Това е така, защото курсорът се придвижва към знака за нов ред на предишния ред. -C-f може да придвижва през знак за нов ред точно както C-b. +C-f може да придвижва през знак за нов ред, точно както C-b. ->> Направете няколко C-b придвижвания, така че да добиете усещане къде - се намира курсорът. След това няколко C-f, за да се върнете в края - на реда. След това още няколко C-f, за да се придвижите до +>> Направете няколко придвижвания с C-b, така че да добиете усещане + къде се намира курсорът. След това няколко C-f, докато се върнете + в края на реда. След това още няколко C-f, за да се придвижите до следващия ред. Когато се придвижвате след горния или долния край на екрана, текстът -отвъд края се измества към екрана. Това се нарича "скролиране". То +отвъд края се измества към екрана. Това се нарича „скролиране“. То позволява на Емакс да придвижва курсора към зададеното място в текста, без да го изкарва извън екрана. @@ -146,9 +149,8 @@ Control- клавишни комбинации не са точно аналогични, всяка една от тях изглежда естествена. -Положението на курсора в текста се нарича също "точка". -Перефразирано, курсорът показва на екрана къде е разположена точката в -текста. +Положението на курсора в текста се нарича „точка“. Перефразирано, +курсорът показва на екрана къде е разположена точката в текста. Ето обобщение на простите действия, движещи курсора, включително придвижващите по дума и изречение: @@ -175,7 +177,7 @@ Control- която придвижва до началото на целия текст, и M-> (Meta по-голямо), която премества до края на целия текст. -При повечето терминали знакът "<" е отбелязан над запетаята, така че +При повечето терминали знакът „<“ е отбелязан над запетаята, така че трябва да използвате клавиша Shift, за да го напишете. На тези терминали трябва да използвате Shift, за да въведете и M-<; без клавиша Shift бихте въвели M-запетая. @@ -206,17 +208,17 @@ Shift (или EDIT или ALT), има друг, алтернативен начин да въведете числов аргумент: въведете цифрите, докато задържате клавиша META. Ние препоръчваме да научите начина с C-u, защото той работи на който и да -е терминал. Числовият аргумент се нарича също "префиксен аргумент", +е терминал. Числовият аргумент се нарича също „префиксен аргумент“, защото го въвеждате преди командата, за която е предназначен. -Например, C-u 8 C-f придвижва осем знака напред. +Например C-u 8 C-f придвижва осем знака напред. >> Опитайте използването на C-n или C-p с числов аргумент, за да придвижите курсора до ред, близък до този, само с една команда. Повечето команди използват числовия аргумент като брояч на повторенията, но някои го използват за други цели. Няколко команди -(но никоя от тези, които сте научили досега) го използват като флаг -- +(но никоя от тези, които сте научили досега) го използват като флаг – присъствието на числов аргумент, независимо от стойноста му, кара командата да върши нещо различно. @@ -234,13 +236,8 @@ C-v bar), в лявата страна на прозореца на Емакс. Вие можете да скролирате текста, щракайки с мишката в плъзгача. ->> Опитайте да натиснете средния бутон на върха на осветената област - вътре в плъзгача. Това би трябвало да скролира текста към - положение, определено от това колко високо или ниско сте щракнали. - ->> Опитайте се да движите мишката нагоре и надолу, докато сте - задържали десния бутон натиснат. Ще видите, че текстът се скролира - нагоре и надолу, като движите мишката. +Ако вашата мишка има търкалце, можете и него да използвате за +скролиране. * КОГАТО ЕМАКС Е БЛОКИРАЛ @@ -263,7 +260,7 @@ bar), * ЗАБРАНЕНИ КОМАНДИ ------------------- -Някои команди на Емакс са "забранени", така че начинаещите потребители +Някои команди на Емакс са „забранени“, така че начинаещите потребители да не могат да ги употребят по погрешка. Ако въведете някоя от забранените команди, Емакс извежда съобщение, @@ -272,16 +269,16 @@ bar), Ако наистина искате да изпробвате командата, въведете клавиша интервал в отговор на въпроса. Обикновено ако не искате да изпълните -забранената команда, отговаряте на въпроса с "n". +забранената команда, отговаряте на въпроса с „n“. >> Въведете C-x C-l (която е забранена команда), и след това въведете - "n" в отговор на въпроса. + „n“ в отговор на въпроса. * ПРОЗОРЦИ ---------- -Емакс може да управлява няколко прозореца, всеки извеждайки свой +Емакс може да управлява няколко „прозореца“, всеки извеждайки свой собствен текст. Ние ще обясним по-късно как да използвате няколко прозореца. Точно сега ние искаме да обясним как да се отървете от допълнителни прозорци и да се върнете към основното редактиране с един @@ -301,57 +298,52 @@ bar), >> Въведете C-x 1 и вижте как прозорецът с документацията изчезва. Тази команда не е като другите команди, които сте научили, в това -отношение, че се състои от два знака. Започва със знака C-x. Има -цяла редица от команди, които започват с C-x; много от тях имат нещо -общо с прозорци, файлове, буфери и свързаните с тях неща. Тези -команди са от два, три или четири знака. +отношение, че се състои от два знака. Започва със знака CONTROL-x. +Има цяла редица от команди, които започват с CONTROL-x; много от тях +имат нещо общо с прозорци, файлове, буфери и свързаните с тях неща. +Тези команди са от два, три или четири знака. * ВМЪКВАНЕ И ИЗТРИВАНЕ ---------------------- Ако искате да вмъкнете текст, просто го въведете. Знаците, които -могат да се виждат, като А, 7, * и т.н., се възприемат от Емакс като -текст и се вмъкват веднага. Въведете (клавишът за връщане в -началото на реда), за да вмъкнете знак за нов ред. - -Може да изтриете последния знак, който сте въвели, с въвеждане на -. е клавиш от клавиатурата -- същият, който -обикновено използвате извън Емакс, за да изтриете последния въведен от -вас знак. Обикновено е голям клавиш, на няколко реда разстояние от -клавиша , и обикновено е отбелязан с "Delete", "Del" или -"Backspace". +могат да се виждат, като А, 7, * и т.н., се вмъкват веднага. За да +вмъкнете знак за нов ред, натиснете (това е клавишът, който +понякога е отбелязван като „Enter“). -Ако големият клавиш там е с етикет "Backspace", тогава той е този, -който ще използвате за . Може да има още един клавиш с -етикет "Delete" някъде другаде, но той не е . +За да изтриете знака непосредствено преди текущото положение на +курсора, въведете . Обикновено това е клавишът, отбелязван като +„Backspace“ – нормалният за това действие и извън Емакс. -По-общо казано, изтрива знака точно преди текущото място на -курсора. +Може да има още един клавиш с етикет някъде другаде, но той +не е , за който става въпрос тук. ->> Направете това сега -- напишете няколко знака, после ги изтрийте с - въвеждане на няколко пъти. Не се безпокойте, че този - файл ще бъде променен; вие няма да промените първоначалното - въведение. Това е ваше лично копие. +>> Направете това сега – напишете няколко знака, после ги изтрийте с + въвеждане на няколко пъти. Не се безпокойте, че този файл ще + бъде променен; вие няма да промените първоначалното въведение. + Това е ваше лично копие. Когато ред от текста стане твърде дълъг, за да се събере в ред от -екрана, редът от текста се "продължава" на следващия ред. Обратна -наклонена черта ("\") (или, ако използвате графичен интерфейс, малка -изкривена стрелка) в дясната граница отбелязва ред, който е бил -продължен. +екрана, редът от текста се „продължава“ на следващия ред. Ако +използвате графичен дисплей, в малкото пространство отстрани на текста +(левият и десният „ръб“) ще се появят малки извити стрелки за +отбелязване къде редът продължава. Ако използвате текстов терминал, +продължените редове се отбелязват с обратна наклонена черта („\“) в +най-дясната колона на прозореца. >> Въведете текст, докато стигнете дясната граница, и продължете с вмъкването. Ще видите продължението на реда да се показва. ->> Използвайте няколко , за да изтриете текста, докато редът - се вмести в един екранен ред. Продължението на реда изчезва. +>> Използвайте няколко , за да изтриете текста, докато редът се + вмести в един екранен ред. Продължението на реда изчезва. Може да изтриете знака за нов ред точно както всеки друг знак. Изтриването на знака за нов ред между два реда ги слива в един ред. Ако полученият комбиниран ред е твърде дълъг, за да се вмести в ширината на екрана, той ще бъде показан като продължен ред. ->> Придвижете курсора в началото на ред и въведете . Това ще +>> Придвижете курсора в началото на ред и въведете . Това ще слее този ред с предишния. >> Въведете , за да вмъкнете наново знака за нов ред, който @@ -361,48 +353,52 @@ bar), на повторенията; това включва вмъкването на текстови знаци. Повтарянето на текстов знак го вмъква няколко пъти. ->> Опитайте това сега -- въведете C-u 8 *, за да вмъкнете ********. +>> Опитайте това сега – въведете C-u 8 *, за да вмъкнете ********. Сега вие сте научили най-основните начини за въвеждане на нещо в Емакс и поправяне на грешки. Можете също така да изтривате думи или редове. Ето обобщение на изтриващите действия: - изтриване на знака точно преди курсора - C-d изтриване на знака точно след курсора + Изтриване на знака точно преди курсора + C-d Изтриване на знака точно след курсора - M- изтриване на думата непосредствено преди курсора - M-d изтриване на думата след курсора + M- Изтриване на думата непосредствено преди курсора + M-d Изтриване на думата след курсора - C-k изтриване от мястото на курсора до края на реда - M-k изтриване до края на текущото изречение + C-k Изтриване от мястото на курсора до края на реда + M-k Изтриване до края на текущото изречение -Забележете, че и C-d, сравнени с M- и M-d, -разширяват подобието, започнато от C-f и M-f (добре, не е -наистина контролиращ знак, но нека не се безпокоим за това). C-k и -M-k са подобни на C-e и M-e в смисъл, че едните са за редове, а -другите -- за изречения. +Забележете, че и C-d, сравнени с M- и M-d, разширяват +подобието, започнато от C-f и M-f (добре, не е наистина +контролиращ знак, но нека не се безпокоим за това). C-k и M-k са +подобни на C-e и M-e в смисъл, че едните са за редове, а другите – за +изречения. -Можете също да премахнете всяка част от буфера с един универсален -начин. Придвижете се до единия край на частта и въведете C-@ или -C-интервал (което и да е от двете). Придвижете се до другия край на -частта и въведете C-w. Това ще изреже целия текст между тези два -края. +Можете също да премахнете всяка част от текста по един универсален +начин. Придвижете се до единия край и въведете C- ( е +интервалът).. Придвижете се до другия край на текста, който искате да +изтриете. Докато го правите, Емакс осветява текстът между курсора и +мястото, където се въвели C-. Накрая въведете C-w. Това ще +изреже целия текст между тези два края. ->> Придвижете курсора до знака "М" в началото на предишния абзац. ->> Въведете C-интервал. Емакс трябва да изведе съобщение "Mark set" в +>> Придвижете курсора до знака „М“ в началото на предишния абзац. +>> Въведете C-. Емакс трябва да изведе съобщение „Mark set“ в долния край на екрана. ->> Придвижете курсора до буквата "р" в "край" на втория ред от абзаца. ->> Въведете C-w. Това ще изреже текста, започващ от "М" и завършващ - точно преди "р". - -Разликата между "изрязване" (kill, cut) и "изтриване" (delete) е, че -"изрязаният" текст може да бъде вмъкнат наново, докато "изтритите" -неща не могат да се вмъкнат наново. Поставянето наново на изрязан -текст се нарича "вмъкване" (yank, paste). Общо казано, командите, -които отстраняват много текст, го изрязват (така че той да може да -бъде вмъкнат), докато командите, които отстраняват само един знак или +>> Придвижете курсора до буквата „р“ в „край“ на втория ред от абзаца. +>> Въведете C-w. Това ще изреже текста, започващ от „М“ и завършващ + точно преди „р“. + +Разликата между „изрязване“ (kill, cut) и „изтриване“ (delete) е, че +„изрязаният“ текст може да бъде вмъкнат наново, докато „изтритите“ +неща не могат да се вмъкнат наново (обаче можете да отмените +изтриването – вж. по-долу). Поставянето наново на изрязан текст се +нарича „вмъкване“ (yank, paste). Общо казано, командите, които +отстраняват много текст, го изрязват (така че той да може да бъде +вмъкнат), докато командите, които отстраняват само един знак или изтриват само празни редове и знаци, извършват изтриване (така че не -можете да вмъкнете наново този текст). +можете да вмъкнете наново този текст). и C-d изтриват в +обикновения случай, когато няма префиксен аргумент. При наличие на +аргумент те отрязват. >> Придвижете курсора до началото на ред, който не е празен. Тогава въведете C-k, за да изрежете текста на този ред. @@ -414,14 +410,16 @@ C-k C-k обработва числовите аргументи по специален начин: премахват се толкова на брой редове И тяхното съдържание. Това не е просто повторение. C-u 2 C-k изрязва два реда и техните знаци за нов ред; -въвеждането на C-k два пъти не прави това. +въвеждането два пъти на C-k не прави това. -Връщането обратно на текст се нарича "вмъкване". (Мислете за него +Връщането обратно на текст се нарича „вмъкване“. (Мислете за него като за изваждане обратно, или дръпване обратно, на текст, който е бил изрязан.) Можете да вмъквате изрязания текст или на същото място, -откъдето е бил премахнат, или на друго място в буфера, даже и в +откъдето е бил премахнат, или на друго място в буфера, или даже в различен файл. Можете да вмъквате един и същ текст няколко пъти; това -прави няколко копия от него. +прави няколко копия от него. Някои други редактори наричат +изрязването (kill) и вмъкването (yank) съответно изрязване (cut) и +поставяне (paste) (вж. Речника на Ръководството на Емакс). Командата за вмъкване е C-y. Тя вмъква наново последния изрязан текст в текущото място на курсора. @@ -466,31 +464,30 @@ C-k -------- Ако направите промяна в текста и след това решите, че това е било -грешка, вие можете да отмените промяната с командата за отменяне, C-x -u. +грешка, вие можете да отмените промяната с командата за отменяне, C-/. -Обикновено C-x u отменя промените, направени от една команда; ако -повтаряте C-x u няколко пъти последователно, всяко повторение отменя -още една команда. +Обикновено C-/ отменя промените, направени от една команда; ако +повтаряте C-/ няколко пъти последователно, всяко повторение отменя още +една команда. Но има две изключения: командите, които не променят текста, не се броят (това включва придвижването на курсора и скролиращите команди), и самовмъкващите се знаци обикновено се обработват на групи, всяка до -20 знака. (Това намалява броя на C-x u, които трябва да въведете, за -да отмените въведен текст.) +20 знака. (Това намалява броя на C-/, които трябва да въведете, за да +отмените въведен текст.) ->> Изрежете този ред с C-k, след това въведете C-x u и той трябва да - се появи отново. +>> Изрежете този ред с C-k, след това въведете C-/ и той трябва да се + появи отново. -C-_ е алтернативна отменяща команда; тя работи точно като C-x u, но е -по-лесна за въвеждане няколко пъти последователно. Недостатъкът на -C_- е, че на някои клавиатури не е очевидно как трябва да се въведе. -Затова осигуряваме и C-x u. На някои терминали може да въведете C-_ с -въвеждане на /, докато задържате CONTROL. +C-_ е алтернативна отменяща команда; тя работи точно като C-/. На +някои терминали въвеждането на C-/ всъщност изпраща C-_ на Емакс. +Като алтернатива, C-x u работи точно като C-/, но е по-неудобна за +въвеждане. -Числов аргумент към C-_ или C-x u действа като брояч на повторенията. +Числов аргумент към C-/, C-_ или C-x u действа като брояч на +повторения. -Може да отменята изтриване на текст точно както отменяте изрязване на +Може да отменяте изтриване на текст точно както отменяте изрязване на текст. Различието между изрязването на нещо и изтриването му въздейства дали ще може да го извадите с C-y; за отменянето няма разлика между двата вида. @@ -501,35 +498,35 @@ C_- За да направите текста, който редактирате, постоянен, трябва да го сложите във файл. В противен случай той ще изчезне, когато Емакс -приключи. За да сложите вашия текст във файл, трябва да "намерите" -файла преди да въвеждате текст. (Това също се нарича "посещаване" на -файла.) +приключи. За да сложите вашия текст във файл, трябва да „намерите“ +(find) файла преди да въвеждате текст. (Това също се нарича +„посещаване“ (visit) на файл.) Намиране на файл означава, че виждате съдържанието му в Емакс. В много случаи това е като да редактирате самия файл. Обаче промените, които правите, използвайки Емакс, не остават постоянни, докато не -"запишете" файла. Това е така, за да се предотврати оставянето на -полупроменен файл в системата, когато не искате това. Дори когато +„запишете“ (save) файла. Това е така, за да се предотврати оставянето +на полупроменен файл в системата, когато не искате това. Дори когато записвате, Емакс оставя началния файл под променено име, в случай, че по-късно решите, че вашите промени са били грешка. -Ако погледнете в дъното на екрана, ще видите ред, който започва и -завършва с тирета и започва с "-b:-- TUTORIAL.bg" или нещо подобно. -Тази част от екрана показва името на файла, който сте посетили. Точно -сега вие сте посетили файл, наречен "TUTORIAL.bg", който е вашето -лично копие-чернова на Емакс въведението. Когато намерите файл в -Емакс, името на този файл ще се появи на същото място. +Ако погледнете в дъното на екрана, ще видите ред, който започва с +тирета – „ b:--- TUTORIAL.bg“ или нещо подобно. Тази част от екрана +показва името на файла, който сте посетили. Точно сега вие сте +посетили файл, наречен „TUTORIAL.bg“, който е вашето лично +копие-чернова на Емакс въведението. Когато намерите файл в Емакс, +името на този файл ще се появи на това място. Особеност на командата за намиране на файл е, че трябва да кажете -името на файла, който искате. Ние го наричаме "четене на аргумент от -терминала" (в този случай аргументът е името на файла). След като +името на файла, който искате. Казваме, че командата „чете на +аргумент“ (в този случай аргументът е името на файла). След като въведете командата C-x C-f Намиране на файл Емакс ви подканя да въведете името на файла. Името на файла, което напишете, се появява в дъното на екрана. Редът в дъното на екрана се -нарича минибуфер, когато се използва за този вид вход. Можете да +нарича минибуфер, когато се използва за този вид въвеждане. Можете да използвате обикновените команди за редактиране на Емакс, за да редактирате името на файла. @@ -541,35 +538,36 @@ C_- Така че не намирате файл. Когато приключите с въвеждането на името на файла, въведете , -за да покажете това. Тогава C-x C-f тръгва да работи и намира файла, -който сте избрали. Минибуферът изчезва, когато командата C-x C-f -свърши. +за да завършите. Минибуферът изчезва и командата C-x C-f тръгва да +работи и намира файла, който сте избрали. След малко съдържанието на файла се появява на екрана и вие можете да редактирате съдържанието му. Когато пожелаете да запазите вашите промени за постоянно, въведете командата - C-x C-s Запазване на файла + C-x C-s Запис (save) на файла Това копира текста от Емакс във файла. Първия път, когато това се направи, Емакс преименува началния файл с ново име, така че той да не -се изгуби. Новото име се построява с добавяне на "~" в края на името +се изгуби. Новото име се построява с добавяне на „~“ в края на името на началния файл. Когато запазването е свършило, Емакс извежда името на файла, който е бил записан. Трябва да записвате достатъчно често, така че да не -изгубите много работа, ако системата се срине по някаква причина. +изгубите много работа, ако системата се срине по някаква причина +(вж. раздела „Автоматичен запис“ по-долу). ->> Въведете C-x C-s, запазвайки вашето копие от въведението. - Това трябва да изведе "Wrote ...TUTORIAL.bg" в дъното на екрана. +>> Въведете C-x C-s TUTORIAL.bg . + Това ще запише въведението във файл с име TUTORIAL.bg и ще покаже + „Wrote ...TUTORIAL.bg“ в дъното на екрана. Може да намерите съществуващ файл, да го разгледате и да го редактирате. Можете също да намерите файл, който не съществува. Това е начинът за създаване на нови файлове в Емакс: намирате файла, който ще бъде в началото празен, и тогава започвате вмъкването на текста за -файла. Когато говорите за "записване" на файл, Емакс всъщност ще -създаде файла с текста, който сте въвели. Оттам нататък може да -считате, че редактирате вече съществуващ файл. +файла. Когато искате „запис“ на файл, Емакс всъщност ще създаде файла +с текста, който сте въвели. Оттам нататък може да считате, че +редактирате вече съществуващ файл. * БУФЕРИ @@ -579,53 +577,50 @@ C_- Можете да превключите обратно към него, като го намерите пак с C-x C-f. По този начин може да получите доста на брой файлове в Емакс. ->> Създайте файл с име "foo", въвеждайки C-x C-f foo . - Вмъкнете малко текст, редактирайте го и запазете "foo" с въвеждане - на C-x C-s. - Накрая въведете C-x C-f TUTORIAL.bg , за да се върнете - обратно във въведението. +Емакс съхранява текста на всеки файла в обект, наричан „буфер“. +Намирането на файл създава нов буфер вътре в Емакс. За да видите +списък с всички съществуващи буфери, въведете -Емакс запазва текста на всеки файл в обект, наричан "буфер". -Намирането на файл прави нов буфер в Емакс. За да видите списък на -буферите, които в момента съществуват във вашия Емакс, въведете + C-x C-b Списък на буферите - C-x C-b Показване на буферите +>> Опитайте C-x C-b още сега. ->> Опитайте C-x C-b сега. +Забележете, че всеки буфер има име, а също може да има и име на файл, +чието съдържание се пази в буфера. ВСЕКИ текст, който виждате в +прозорец на Емакс, винаги е част от някой буфер. -Вижте как всеки буфер има име, а понякога и име на файл за файла, -чието съдържание държи. ВСЕКИ текст, който виждате в Емакс прозорец, -е винаги част от някакъв буфер. +>> Въведете C-x 1, за да махнете списъка на буфери. ->> Въведете C-x 1, за да махнете списъка с буферите. - -Когато имате няколко буфера, само един от тях е "текущ" в даден момент +Когато имате няколко буфера, само един от тях е „текущ“ в даден момент от време. Това е буферът, който редактирате. Ако искате да -редактирате друг буфер, се нуждаете от "превключване" към него. Ако +редактирате друг буфер, се нуждаете от „превключване“ към него. Ако искате да се превключите към буфер, който съответства на файл, можете да го направите, като просто посетите файла отново с C-x C-f. Но има и по-лесен начин: използването на командата C-x b. В тази команда трябва да въведете името на буфера. ->> Въведете C-x b foo , за да се върнете към буфера "foo", - който държи текста на файла "foo". Тогава въведете C-x b TUTORIAL - , за да се върнете в това въведение. +>> Суздайте файл с име „foo“ чрез въвеждане на C-x C-f foo . + Тогава въведете C-x b TUTORIAL.bg , за да се върнете в това + въведение. В повечето случаи името на буфера е същото като името на файла (без частта в коя директория се намира). Обаче това не винаги е вярно. -Списъкът с буферите, който правите с C-x C-b, винаги ви показва името -на всеки буфер. +Списъкът с буферите, който правите с C-x C-b, винаги ви показва и +името на буфера, и името на файла. ВСЕКИ текст, който виждате в Емакс прозорец, е винаги част от някакъв -буфер. Някои буфери не съответстват на файлове. Например буферът, -именуван "*Buffer List*", не съответства на файл. Това е буферът, -който съдържа списъка с буферите, които сте направили с C-x C-b. -Буферът, именуван "*Messages*", също не съответства на файл; той +буфер. Някои буфери не съответстват на файлове. Буферът, именуван +„*Buffer List*“, които сте направили с C-x C-b, не съответства на +файл. Това е буферът, който съдържа списъка с буферите. Този буфер +TUTORIAL.bg отначало не е бил към файл, но вече е, защото в предишния +раздел въведохте C-x C-s и го записахте във файл. + +Буферът, именуван „*Messages*“, също не съответства на файл; той съдържа съобщенията, които се появяват в дъното на екрана по време на Емакс сесията. >> Въведете C-x b *Messages* , за да видите буфера със - съобщенията. След това въведете C-x b TUTORIAL , за да + съобщенията. След това въведете C-x b TUTORIAL.bg , за да се върнете към това въведение. Ако направите промени в текста на един файл и тогава намерите друг @@ -636,14 +631,15 @@ C-f. буфера на първия файл. Ще е неудобно да превключите обратно с C-x C-f, за да го запазите с C-x C-s. Така че имаме - C-x s Запазва някои буфери + C-x s Запис на някои (some) буфери C-x s пита за всеки буфер, който съдържа промени, които не сте -запазили. Въпросът за всеки такъв буфер е дали да бъде запазен. +запазили. Командата задава въпрос за всеки такъв буфер дали да бъде +запазен. ->> Вмъкнете ред в текста, след това въведете C-x s. - Трябва да бъдете попитан дали да запазите буфера, именуван "TUTORIAL". - Отговорете с "да" на въпроса, като въведете "y". +>> Вмъкнете ред с текст, след това въведете C-x s. + Трябва да бъдете попитан дали да запазите буфера, именуван „TUTORIAL.bg“. + Отговорете с „да“ на въпроса, като въведете „y“ (yes). * РАЗШИРЯВАНЕ НА НАБОРА КОМАНДИ @@ -659,53 +655,47 @@ C-x s Тези команди са общо взето полезни, но по-малко, отколкото командите, които досега сте научили. Вече видяхте две от тях: командите върху -файлове C-x C-f за намиране (Find) и C-x C-s за запазване (Save). -Друг пример е командата за край на Емакс сесията -- това е командата -C-x C-c. (Не се безпокойте, че може да изгубите всички промени, които -сте направили; C-x C-c предлага да запази всеки променен файл, преди -да премахне Емакс.) - -C-z е командата за излизане от Емакс *временно* -- така че да можете -да се върнете към същата Емакс сесия по-късно. - -На системи, които позволяват това, C-z "изоставя" (suspend) Емакс, -т.е. връща към обвивката, но не разрушава Емакс. В повечето обвивки -можете да продължите Емакс сесията с командата "fg" или с "%emacs". - -На системи, които не позволяват изоставяне, C-z създава нова -подобвивка, която върви под Емакс, за да ви даде шанс да стартирате -други програми и да се върнете към Емакс след това; това не е истинско -"излизане" от Емакс. В този случай командата на обвивката "exit" е -обикновеният начин да се върнете обратно към Емакс от подобвивката. - -Моментът да използвате C-x C-c е, когато искате да излезете от -системата. Това е и правилната команда за излизане, когато Емакс е -извикан от пощенска програма или други странични програми, тъй като те -може и да не знаят как да се справят с изоставянето на Емакс. При -обикновени обстоятелства, обаче, ако не сте тръгнали да излизате от -системата, по-добре е да изоставите Емакс с C-z, вместо да излизате от -Емакс. +файлове C-x C-f за намиране (Find) и C-x C-s за запис (Save). Друг +пример е командата за край на Емакс сесията -- това е командата C-x +C-c. (Не се безпокойте, че може да изгубите всички промени, които сте +направили; C-x C-c предлага да запази всеки променен файл, преди да +премахне Емакс.) + +Ако сте на графичен дисплей, не е нужна специална команда за +придвижване от Емакс към друго работещо приложение. Можете да +извършите това с мишката или с команди към управлението на прозорци. +Но ако сте на текстов терминал, който може да показва само едно +приложение в даден момент, се нуждаете от начин за „изоставяне“ +(suspend) на Емакс и придвижване към други програми. + +C-z е командата за излизане от Емакс *временно* – така че да можете да +се върнете към същата Емакс сесия по-късно. Когато Емакс върви на +текстов терминал, C-z „изоставя“ Емакс, т.е. връща се към обвивката, +но не унищожава задачата (job) на Емакс. В повечето популярни обвивки +можете да продължите Емакс с командата „fg“ или с „%emacs“. Има много команди C-x. Ето списък на тези, които сте научили: - C-x C-f Намиране на файл. - C-x C-s Запазване на файл. - C-x C-b Списък на буферите. - C-x C-c Излизане от Емакс. - C-x 1 Изтриване на всички прозорци освен един. - C-x u Отмяна. - -Именуваните разширени команди са команди, които се използват даже още -по-рядко, или команди, които се използват само в определени режими. -Пример е командата replace-string, която заменя глобално един низ с -друг. Когато въведете M-x, Емакс ви подсказва в дъното на екрана с -M-x и вие трябва да въведете името на командата, в този случай -"replace-string". Просто въведете "repl s" и Емакс ще завърши -името. ( е клавишът Tab, обикновено намиращ се над клавиша -CapsLock или клавиша Shift близо до левия край на клавиатурата.) -Завършете името на командата с . - -Командата replace-string изисква два аргумента -- низът, който ще бъде + C-x C-f Намиране на файл + C-x C-s Запис на файл + C-x s Запис на някои буфери + C-x C-b Списък на буферите + C-x b Превключване към буфер + C-x C-c Излизане от Емакс + C-x 1 Изтриване на всички прозорци освен един + C-x u Отмяна + +Именуваните разширени (X) команди са команди, които се използват даже +още по-рядко, или команди, които се използват само в определени +режими. Пример е командата replace-string, която заменя глобално един +низ с друг. Когато въведете M-x, Емакс ви подсказва в дъното на +екрана с M-x и вие трябва да въведете името на командата, в този +случай „replace-string“. Просто въведете „repl s“ и Емакс ще +завърши името. ( е клавишът Tab, обикновено намиращ се над +клавиша CapsLock или клавиша Shift близо до левия край на +клавиатурата.) Завършете името на командата с . + +Командата replace-string изисква два аргумента – низът, който ще бъде заменян, и низът, който ще го замени. Трябва да завършите въвеждането на всеки аргумент с . @@ -713,28 +703,26 @@ CapsLock Тогава въведете M-x repl sпроменяизменя Забележете как този ред се променя: вие заменихте думата - п-р-о-м-е-н-я с "изменя", където и да се намира след началното + п-р-о-м-е-н-я с „изменя“, където и да се намира след началното място на курсора. -ЗАБЕЛЕЖКА: Превключването към въвеждане на кирилски буква става с C-\. - * АВТОМАТИЧНО ЗАПАЗВАНЕ ----------------------- Когато сте направили промени във файл, но още не сте го запазили, те могат да бъдат загубени, ако компютърът внезапно се изключи. За да ви -предпази от такива ситуации, Емакс периодично запазва "автоматично -запазван" файл за всеки файл, който редактирате. Името на автоматично +предпази от такива ситуации, Емакс периодично запазва „автоматично +запазван“ файл за всеки файл, който редактирате. Името на автоматично запазвания файл има # в началото и в края; например, ако вашият файл е -с име "hello.c", името на неговия автоматично запазван файл ще бъде +с име „hello.c“, името на неговия автоматично запазван файл ще бъде "#hello.c#". Когато запазвате файл по обикновения начин, Емакс изтрива неговия автоматично записван файл. Ако компютърът зависне, може да възстановите вашата автоматично запазвана редакция, като намерите файла както обикновено (файлът, който сте редактирали, не автоматично запазвания) и след това въведете -M-x recover file. Когато командата изиска потвърждение, +M-x recover-file . Когато командата изиска потвърждение, въведете yes, за да продължите и да възстановите автоматично запазваните данни. @@ -743,28 +731,28 @@ M-x recover file. -------------- Ако Емакс види, че въвеждате многознакови команди бавно, ще ви ги -покаже в дъното на екрана, в област, наричана "ехо област". Ехо +покаже в дъното на екрана, в област, наричана „ехо област“. Ехо областта обхваща последния ред от екрана. * РЕД НА РЕЖИМА ---------------- -Редът точно над ехо областта се нарича "ред на режима" (mode line). +Редът точно над ехо областта се нарича „ред на режима“ (mode line). Той показва нещо като: --b:** TUTORIAL.bg (Fundamental)--L670--58%---------------- + b:**- TUTORIAL.bg 63% L744 (Fundamental) Този ред дава полезна информация за състоянието на Емакс и текста, който редактирате. -Вече знаете какво означава името на файла -- това е файлът, който сте -намерили. -NN%-- показва вашата текуща позиция в текста; това -означава, че NN процента от текста е над върха на екрана. Ако -началото на файла е на екрана, ще се показва --Top-- (връх) вместо ---00%--. Ако края на файла е на екрана, ще се показва --Bot-- (дъно). -Ако гледате текст, който е толкова малък, че се показва изцяло на -екрана, редът на режима ще изведе --All--. +Вече знаете какво означава името на файла – това е файлът, който сте +намерили. NN% показва вашата текуща позиция в текста; това означава, +че NN процента от текста е над върха на екрана. Ако началото на файла +е на екрана, ще се показва „Top“ (връх) вместо „ 0%“. Ако края на +файла е на екрана, ще се показва „Bot“ (bottom – дъно). Ако гледате +текст, който е толкова малък, че се показва изцяло на екрана, редът на +режима ще изведе „All“ (всичко). Знакът L и цифрите показват мястото по друг начин: това е номерът на текущия ред на точката. @@ -776,13 +764,13 @@ M-x recover file. Частта от реда на режима вътре в скобите е, за да ви покаже в какъв режим на редактиране се намирате. Подразбиращият се режим е Fundamental (Основен), който използвате в момента. Това е пример за -"главен режим" (major mode). +„главен режим“ (major mode). Емакс има много главни режими. Някои от тях са предвидени за редактиране на различни езици и/или видове текст, като например режим -Лисп, режим Текст и други. Във всеки един момент от време точно един -главен режим е активен и неговото име може винаги да бъде намерено в -реда на режима, точно както "Fundamental" сега. +Lisp (Лисп), режим Text (текст) и други. Във всеки един момент от +време точно един главен режим е активен и неговото име може винаги да +бъде намерено в реда на режима, точно както „Fundamental“ сега. Всеки главен режим прави някои команди да се държат по различен начин. Например, има команди за редактиране на коментари в програми, и тъй @@ -793,9 +781,9 @@ Fundamental ( команда за превключване към режим Fundamental. Когато редактирате текст на естествен език, като този файл, -най-вероятно трябва да използвате режим Текст (text). +най-вероятно трябва да използвате режим Text (текст). ->> Въведете M-x text mode. +>> Въведете M-x text-mode . Не се безпокойте, никоя от Емакс командите, които сте научили, няма да се промени по някакъв съществен начин. Но може да забележите, че M-f @@ -804,13 +792,13 @@ Fundamental ( разделители на думи. Главните режими обикновено правят малки промени като тази: повечето -команди вършат "същата работа" във всеки главен режим, но работят по +команди вършат „същата работа“ във всеки главен режим, но работят по малко по-различен начин. За да видите документацията на вашия текущ главен режим, въведете C-h m. ->> Употребете C-u C-v веднъж или повече пъти, за да докарате този ред +>> Употребете C-l C-l веднъж или повече пъти, за да докарате този ред близо до върха на екрана. >> Въведете C-h m, за да видите как текстовият режим се различава от основния режим. @@ -824,20 +812,20 @@ m. малки режими, да използвате един малък режим, или да използвате някаква комбинация от няколко малки режима. -Един главен режим, който е много полезен, особено за редактиране на +Един малък режим, който е много полезен, особено за редактиране на текст на естествен език, е режимът на автоматично запълване (Auto Fill mode). Когато този режим е включен, Емакс автоматично разделя реда при мястото между думите, когато вмъквате текст и направите ред, който е твърде дълъг. Може да включите режима на автоматично запълване, като изпълните M-x -auto fill mode. Когато режимът е включен, може да го -изключите с M-x auto fill mode. Ако режимът е изключен, тази +auto-fill-mode . Когато режимът е включен, може да го +изключите с M-x auto-fill-mode. Ако режимът е изключен, тази команда го включва, а ако е включен, го изключва. Казваме, че -командата "обръща режима". +командата „превключва (toggle) режима“. ->> Въведете M-x auto fill mode сега. След това вмъкнете ред - от "asdf " отново и отново, докато не видите, че текстът се разделя +>> Въведете M-x auto-fill-mode сега. След това вмъкнете ред + от „asdf “ отново и отново, докато не видите, че текстът се разделя на два реда. Трябва да слагате интервали между думите, защото автоматичното запълване разделя редовете само при интервалите. @@ -866,51 +854,42 @@ auto fill mode. на низ е придвижваща курсора команда; тя премества курсора на следващото място, където се среща низът. -Командата за търсене на Емакс се различава от командата за търсене на -повечето редактори по това, че тя е "постъпкова". Това означава, че +Командата за търсене на Емакс е „постъпкова“. Това означава, че търсенето се извършва още докато въвеждате текста, който търсите. Командата за започване на търсене е C-s за търсене напред, и C-r за търсене назад. НО ПОЧАКАЙТЕ! Не ги пробвайте сега. -Когато въведете C-s, ще забележите, че низът "I-search" се появява +Когато въведете C-s, ще забележите, че низът „I-search“ се появява като подсказка в ехо областта. Това ви казва, че Емакс е в това, което се нарича постъпково търсене, чакайки ви да въвеждате текста, който искате да търсите. приключва търсенето. >> Сега въведете C-s, за да започнете търсенето. БАВНО, буква по - буква, въведете думата "търсене", изчаквайки след въвеждането на + буква, въведете думата „курсор“, изчаквайки след въвеждането на всеки знак, за да може да забележите какво става с курсора. Сега - извършихте търсене на "търсене" веднъж. ->> Въведете отново C-s, за да търсите друго съвпадение с "търсене". ->> Сега въведете три пъти и вижте как се придвижва курсора. + извършихте търсене на „курсор“ веднъж. +>> Въведете отново C-s, за да търсите друго съвпадение с „курсор“. +>> Сега въведете четири пъти и вижте как се придвижва курсора. >> Въведете , за да прекратите търсенето. Забелязахте ли какво стана? Емакс, когато търси постъпково, се опитва да намери следващото съвпадение на низа, който се въвежда. За да -отидете на следващото съвпадение на "търсне", просто отново въведете +отидете на следващото съвпадение на „курсор“, просто отново въведете C-s. Ако няма такова съвпадение, Емакс бибипва и ви казва, че -търсенето е "провалено" (failing). C-g също прекратява търсенето. - -ЗАБЕЛЕЖКА: На някои системи въвеждането на C-s ще замрази екрана и вие -няма да може да видите повече реакция от Емакс. Това показва, че -"способност" на операционната система, наречена "управление на потока" -(flow control), е прихванала C-s и не го пропуска до Емакс. За да -размразите екрана, въведете C-q. Тогава вижте секцията "Спонтанно -включване на постъпковото търсене" (Spontaneous Entry to Incremental -Search) в ръководството на Емакс за съвет как да се справите с тази -"способност". - -Ако сте в средата на постъпково търсене и въведете , ще +търсенето е „провалено“ (failing). C-g също така прекратява +търсенето. + +Ако сте в средата на постъпково търсене и въведете , ще забележите, че последният знак в търсения низ се изтрива и търсенето се връща към последното място на търсене. Например, предположете, че -сте въвели "т", за да намерите първото съвпадение с "т". Сега, ако -въведете "ъ", курсорът ще се придвижи към първото съвпадение на "тъ". -Сега въведете . Това изтрива знака "ъ" от низа за търсене и -курсорът се премества назад, до първото съвпадение с "т". +сте въвели „к“, за да намерите първото съвпадение с „к“. Сега, ако +въведете „у“, курсорът ще се придвижи към първото съвпадение на „ку“. +Сега въведете . Това изтрива знака „у“ от низа за търсене и +курсорът се премества назад, до първото съвпадение с „к“. Ако сте в средата на търсене и въведете контролен или мета знак (с -няколко изключения -- знаците, които са специални по време на търсене, +няколко изключения – знаците, които са специални по време на търсене, като C-s и C-r), търсенето се прекратява. C-s започва търсене, което гледа за съвпадение с низа, даден за @@ -924,9 +903,11 @@ C-s Една от привлекателните способности на Емакс е тази, че може да гледате повече от един прозорец на екрана в даден момент от време. +(Обърнете внимание, че Емакс използва думата „рамки“, описана в +следващия раздел, за това, което други приложения наричат „прозорец“. +Ръководството на Емак съдържа речника на термините на Емакс.) ->> Придвижете курсора до този ред и въведете C-u 0 C-l (това е - CONTROL-L, не CONTROL-1). +>> Придвижете курсора до този ред и въведете C-l C-l. >> Сега въведете C-x 2, което ще раздели екрана на два отделни прозореца. Двата прозореца показват това въведение. Курсорът @@ -935,7 +916,7 @@ C-s >> Въведете C-M-v, за да скролирате долния прозорец. (Ако нямате истински клавиш META, въведете ESC C-v.) ->> Въведете C-x o ("o" от "other" -- "друг"), за да придвижите +>> Въведете C-x o („o“ от „other“ – „друг“), за да придвижите курсора в долния прозорец. >> Използвайте C-v и M-v в долния прозорец, за да го скролирате. Продължете четенето на тези насоки от въведението в горния @@ -946,32 +927,32 @@ C-s преди. Може да продължите да използвате C-x o, за да превключвате между -прозорците. Всеки прозорец има собствено място на курсора, но само -един прозорец показва курсор. Всички обикновени команди за -редактиране се прилагат в прозореца, в който е курсорът. Ние наричаме -този прозорец "текущ прозорец". +прозорците. „Текущият прозорец“, където се извършва редактирането, е +този с явен курсор, който мига, когато не въвеждате. Другите прозорци +имат собствени положения на курсора. Ако Емакс е на графичен дисплей, +тези курсори ще са изчертани като немигащи празни кутии. Командата C-M-v е много полезна, когато редактирате текст в един прозорец и използвате другия прозорец просто за справка. Може да държите курсора винаги в прозореца, където редактирате, и да напредвате последователно в другия прозорец чрез C-M-v. -C-M-v е пример за знак CONTROL-META. Ако имате истински клавиш META, -може да въвеждате C-M-v, задържайки едновременно CONTROL и META, -докато въвеждате v. Няма значение дали CONTROL или META "е натиснат -първи", защото и двата клавиша действат, модифицирайки знака, който -сте въвели. +C-M-v е пример за знак CONTROL-META. Ако имате истински клавиш META +(или Alt), може да въвеждате C-M-v, задържайки едновременно CONTROL и +META, докато въвеждате „v“. Няма значение дали CONTROL или META „е +натиснат първи“, защото и двата клавиша действат, модифицирайки знака, +който натискате. -Ако нямате истински клавиш META и използвате ESC вместо това, редът -има значение: трябва да въвеждате ESC, последван от CONTROL-v, защото -CONTROL-ESC v няма да работи. Това е така, защото ESC е собствен -знак, а не модификатор. +Ако нямате истински клавиш META и използвате вместо това, редът +вече има значение: трябва да въвеждате , последван от CONTROL-v, +защото CONTROL- v няма да работи. Това е така, защото е +собствен знак, а не модификатор. >> Въведете C-x 1 (в горния прозорец), за да махнете долния прозорец. (Ако сте въвели C-x 1 в долния прозорец, това ще махне горния. -Мислете за тази команда като "Задръж точно един прозорец -- този, в -който съм сега".) +Мислете за тази команда като „Задръж точно един прозорец – този, в +който съм сега“.) Няма нужда да извеждате един и същи буфер в двата прозореца. Ако използвате C-x C-f, за да намерите файл в единия прозорец, другият @@ -989,22 +970,47 @@ CONTROL-ESC v изтриете долния. +* МНОЖЕСТВО РАМКИ +----------------- + +Емакс може да създава и „рамки“. Рамката (frame) е това, което +наричаме един набор от прозорци, заедно с техните менюта, плъзгачи, +ехо области и т.н. В графичен дисплей Емакс нарича „рамка“ това, +което повечето други приложения наричат „прозорец“. На екрана могат +да бъдат показвани няколко графични рамки едновременно. В текстов +терминал може да се показва само една рамка в даден момент от време. + +>> Въведете M-x make-frame . + Вижте как се появява нова рамка на екрана. + +В новата рамка можете да правите всичко, което правите и в +оригиналната рамка. Няма нищо специално в първата рамка. + +>> Въведете M-x delete-frame + Избраната рамка се премахва. + +Можете да премахвате рамки и по нормалния за това начин в графичната +система, най-често с натискане на бутона, отбелязан като „X“ в горен +ъгъл на рамката. Ако премахнете и последната рамка на работещ Емакс, +това ще излезе от Емакс. + + * ВЛОЖЕНИ НИВА НА РЕДАКТИРАНЕ ----------------------------- -Понякога ще се озовете в това, което се нарича "вложено ниво на -редактиране" (recursive editing level). Това се отбелязва от +Понякога ще се озовете в това, което се нарича „вложено ниво на +редактиране“ (recursive editing level). Това се отбелязва от квадратни скоби в реда на режима, които ограждат скобите около името на главния режим. Например, може да видите [(Fundamental)] вместо (Fundamental). -За да се махнете от вложеното ниво на редактиране, въведете ESC ESC -ESC. Това е обща команда за "излизане". Може и да я използвате за -махане (скриване) на допълнителни прозорци, както и за да се махнете -от минибуфера. +За да се махнете от вложеното ниво на редактиране, въведете + . Това е обща команда за „излизане“. Може и да я +използвате за махане (скриване) на допълнителни прозорци, както и за +да се махнете от минибуфера. ->> Въведете M-x, за да влезете в минибуфер; тогава въведете ESC ESC - ESC, за да излезете. +>> Въведете M-x, за да влезете в минибуфер; тогава въведете + , за да излезете. Не можете да използвате C-g, за да излезете от вложено ниво на редактиране. Това е така, защото C-g се използва за прекратяване на @@ -1028,13 +1034,10 @@ CONTROL-h, помогне. Ако сте въвели C-h и решите, че не се нуждаете от помощ, просто въведете C-g, за да я прекратите. -(Някои компютри променят значението на знака C-h. Те наистина не -трябва да правят това като сляпа мярка за всички потребители, така че -имате основание да се оплачете на системния администратор. Между -другото, ако C-h не извежда съобщение за помощ в дъното на екрана, -опитайте клавиша F1 или M-x help вместо това.) +(Ако C-h не извежда съобщение за помощ в дъното на екрана, опитайте +клавиша F1 или M-x help вместо това.) -Най-основното помощно средство е C-h c. Въведете C-h, знака c и +Най-основното помощно средство е C-h c. Въведете C-h, знака „c“ и команден знак или последователност от знаци, образуващи команда; тогава Емакс ще изведе много кратко описание на командата. @@ -1045,10 +1048,10 @@ CONTROL-h, C-p runs the command previous-line (C-p изпълнява командата предишен-ред) -Това ви казва "името на функцията". Имената на функциите се използват +Това ви казва „името на функцията“. Имената на функциите се използват най-вече за настройване и разширяване на Емакс. Но тъй като имената на функциите са избрани така, че да показват какво прави командата, те -могат да служат и за много кратка документация -- достатъчна, за да ви +могат да служат и за много кратка документация – достатъчна, за да ви припомни команди, които вече сте учили. Многознакови команди, като C-x C-s и (ако нямате клавиш META или EDIT @@ -1070,7 +1073,7 @@ c. C-h f Описва функция. Трябва да въведете името на функцията. ->> Опитайте с въвеждане на C-h f previous-line. +>> Опитайте с въвеждане на C-h f previous-line . Това извежда цялата информация, която Емакс знае за функцията, която осъществява командата C-p. @@ -1086,11 +1089,12 @@ c. двузнакова последователност от клавиши, която пуска същата команда. ->> Въведете C-h a file. +>> Въведете C-h a file . Това извежда в друг прозорец списък на всички M-x команди, които -съдържат "file" в тяхното име. Ще видите знакови команди като C-x -C-f, изброени измежду съответните имена на команди, като find-file. +съдържат „file“ (файл) в тяхното име. Ще видите знакови команди като +C-x C-f, изброени измежду съответните имена на команди, като +find-file. >> Въведете C-M-v, за да скролирате помощния прозорец. Направете го няколко пъти. @@ -1098,7 +1102,7 @@ C-f, >> Въведете C-x 1, за да изтриете помощния прозорец. C-h i Четене на ръководства (Info). Тази команда ви праща в - специален буфер, наричан "*info*", където може да + специален буфер, наричан „*info*“, където може да четете ръководствата на инсталираните във вашата система пакети. Въведете m emacs , за да четете ръководството на Емакс. Ако никога преди това @@ -1113,8 +1117,8 @@ C-f, ----------------- Може да научите повече за Емакс с четене на неговото ръководство, или -като книга, или в Инфо (използвайте менюто помощ (Help) или въведете -F10 h r). Две възможности, които може да желаете в началото, са +като книга, или в Инфо (използвайте менюто Помощ (Help) или въведете +C-h r). Две възможности, които може да желаете в началото, са довършване (completion), което спестява писане, и dired, който опростява боравенето с файлове. @@ -1122,8 +1126,8 @@ F10 h r). искате да превключите към буфера *Messages*, може да въведете C-x b *M и Емакс ще запълни останалата част от името на буфера, доколкото може да се определи от това, което сте въвели. Довършването -е описано в Инфо-ръководството на Емакс в страницата "Довършване" -("Completion"). +е описано в Инфо-ръководството на Емакс в страницата „Довършване“ +(„Completion“). Dired ви позволява да гледате списъка от файлове в директория (и като възможност: нейните поддиректории), да се придвижвате в този списък, @@ -1138,13 +1142,11 @@ Dired * ЗАКЛЮЧЕНИЕ ------------ -Запомнете: за да излезете безвъзвратно от Емакс, използвайте C-x C-c. -За да излезете временно в обвивка, така че да се върнете в Емакс -по-късно, използвайте C-z. +За да излезете безвъзвратно от Емакс, използвайте C-x C-c. Това въведение е предвидено да бъде разбираемо за всички нови -потребители, така че ако намирате нещо неясно, не се самообвинявайте --- оплачете се! +потребители, така че ако намирате нещо неясно, не се самообвинявайте – +оплачете се! * КОПИРАНЕ @@ -1160,26 +1162,28 @@ Dired 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-2012 Free Software Foundation, Inc. + Copyright (C) 1985, 1996, 1998, 2001-2012 Free Software Foundation, Inc. + + This file is part of GNU Emacs. + + GNU Emacs is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - Permission is granted to anyone to make or distribute verbatim copies - of this document as received, in any medium, provided that the - copyright notice and permission notice are preserved, - and that the distributor grants the recipient permission - for further redistribution as permitted by this notice. + GNU Emacs is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - Permission is granted to distribute modified versions - of this document, or of portions of it, - under the above conditions, provided also that they - carry prominent notices stating who last altered them. + You should have received a copy of the GNU General Public License + along with GNU Emacs. If not, see . -Условията за копиране на самия Емакс са по-сложни, но в същия дух. Моля, прочетете файла COPYING и тогава давайте копия на ГНУ Емакс на свои приятели. Помогнете да спрем затвореността на програмите -("притежанието"), като използваме, пишем и споделяме свободен софтуер! +(„притежанието“), като използваме, пишем и споделяме свободен софтуер! -Преводът на български е извършен от Огнян Кулев -. +Преводът на български е извършен от Огнян Кулев . ;;; Local Variables: ;;; coding: windows-1251 diff --git a/etc/tutorials/TUTORIAL.translators b/etc/tutorials/TUTORIAL.translators index 3408ef79fd3..3ec948eb79a 100644 --- a/etc/tutorials/TUTORIAL.translators +++ b/etc/tutorials/TUTORIAL.translators @@ -2,8 +2,8 @@ This file contains the list of translators and maintainers of the tutorial. * TUTORIAL.bg: -Author: Ognyan Kulev -Maintainer: Ognyan Kulev +Author: Ognyan Kulev +Maintainer: Ognyan Kulev * TUTORIAL.cn: Author: Sun Yijiang -- cgit v1.3 From fead402dddeefba612ab1222b392d5bd0c636400 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sun, 22 Jan 2012 00:04:55 +0800 Subject: Emacs Lisp manual updates. * doc/lispref/intro.texi (A Sample Function Description): Special notation used for macros too. * doc/lispref/objects.texi (Ctl-Char Syntax, Other Char Bits): Copyedits. (Symbol Type): Add xref for keyword symbols. (Sequence Type): Clarify differences between sequence types. (Cons Cell Type): Add "linked list" index entry. (Non-ASCII in Strings): Copyedits. (Equality Predicates): Symbols with same name need not be eq. * doc/lispref/numbers.texi (Float Basics): Document isnan, copysign, frexp and ldexp. Move float-e and float-pi to Math Functions node. --- doc/lispref/ChangeLog | 15 ++++ doc/lispref/intro.texi | 23 +++--- doc/lispref/numbers.texi | 124 ++++++++++++++-------------- doc/lispref/objects.texi | 207 ++++++++++++++++++++++++----------------------- etc/NEWS | 3 + 5 files changed, 202 insertions(+), 170 deletions(-) (limited to 'etc') diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 872c4f564ac..3c18de96d72 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,18 @@ +2012-01-21 Chong Yidong + + * intro.texi (A Sample Function Description): Special notation + used for macros too. + + * objects.texi (Ctl-Char Syntax, Other Char Bits): Copyedits. + (Symbol Type): Add xref for keyword symbols. + (Sequence Type): Clarify differences between sequence types. + (Cons Cell Type): Add "linked list" index entry. + (Non-ASCII in Strings): Copyedits. + (Equality Predicates): Symbols with same name need not be eq. + + * numbers.texi (Float Basics): Document isnan, copysign, frexp and + ldexp. Move float-e and float-pi to Math Functions node. + 2012-01-21 Glenn Morris * modes.texi (Auto Major Mode): diff --git a/doc/lispref/intro.texi b/doc/lispref/intro.texi index 64c856d3ed4..a68bcfa0fe7 100644 --- a/doc/lispref/intro.texi +++ b/doc/lispref/intro.texi @@ -162,7 +162,7 @@ being described, are formatted like this: @var{first-number}. @cindex @code{nil} @cindex false - In Lisp, the symbol @code{nil} has three separate meanings: it + In Emacs Lisp, the symbol @code{nil} has three separate meanings: it is a symbol with the name @samp{nil}; it is the logical truth value @var{false}; and it is the empty list---the list of zero elements. When used as a variable, @code{nil} always has the value @code{nil}. @@ -396,13 +396,14 @@ Form', respectively. Commands are simply functions that may be called interactively; macros process their arguments differently from functions (the arguments are not evaluated), but are presented the same way. - Special form descriptions use a more complex notation to specify -optional and repeated arguments because they can break the argument -list down into separate arguments in more complicated ways. -@samp{@r{[}@var{optional-arg}@r{]}} means that @var{optional-arg} is -optional and @samp{@var{repeated-args}@dots{}} stands for zero or more -arguments. Parentheses are used when several arguments are grouped into -additional levels of list structure. Here is an example: + The descriptions of macros and special forms use a more complex +notation to specify optional and repeated arguments, because they can +break the argument list down into separate arguments in more +complicated ways. @samp{@r{[}@var{optional-arg}@r{]}} means that +@var{optional-arg} is optional and @samp{@var{repeated-args}@dots{}} +stands for zero or more arguments. Parentheses are used when several +arguments are grouped into additional levels of list structure. Here +is an example: @defspec count-loop (@var{var} [@var{from} @var{to} [@var{inc}]]) @var{body}@dots{} This imaginary special form implements a loop that executes the @@ -485,9 +486,9 @@ giving a prefix argument makes @var{here} non-@code{nil}. @end deffn @defvar emacs-build-time -The value of this variable indicates the time at which Emacs was built -at the local site. It is a list of three integers, like the value -of @code{current-time} (@pxref{Time of Day}). +The value of this variable indicates the time at which Emacs was +built. It is a list of three integers, like the value of +@code{current-time} (@pxref{Time of Day}). @example @group diff --git a/doc/lispref/numbers.texi b/doc/lispref/numbers.texi index 6768ecece9c..77db0f86c26 100644 --- a/doc/lispref/numbers.texi +++ b/doc/lispref/numbers.texi @@ -168,34 +168,37 @@ character codepoint. @node Float Basics @section Floating Point Basics +@cindex @acronym{IEEE} floating point Floating point numbers are useful for representing numbers that are not integral. The precise range of floating point numbers is machine-specific; it is the same as the range of the C data type -@code{double} on the machine you are using. +@code{double} on the machine you are using. Emacs uses the +@acronym{IEEE} floating point standard where possible (the standard is +supported by most modern computers). - The read-syntax for floating point numbers requires either a decimal + The read syntax for floating point numbers requires either a decimal point (with at least one digit following), an exponent, or both. For example, @samp{1500.0}, @samp{15e2}, @samp{15.0e2}, @samp{1.5e3}, and @samp{.15e4} are five ways of writing a floating point number whose -value is 1500. They are all equivalent. You can also use a minus sign -to write negative floating point numbers, as in @samp{-1.0}. +value is 1500. They are all equivalent. You can also use a minus +sign to write negative floating point numbers, as in @samp{-1.0}. + + Emacs Lisp treats @code{-0.0} as equal to ordinary zero (with +respect to @code{equal} and @code{=}), even though the two are +distinguishable in the @acronym{IEEE} floating point standard. -@cindex @acronym{IEEE} floating point @cindex positive infinity @cindex negative infinity @cindex infinity @cindex NaN - Most modern computers support the @acronym{IEEE} floating point standard, -which provides for positive infinity and negative infinity as floating point -values. It also provides for a class of values called NaN or -``not-a-number''; numerical functions return such values in cases where -there is no correct answer. For example, @code{(/ 0.0 0.0)} returns a -NaN. For practical purposes, there's no significant difference between -different NaN values in Emacs Lisp, and there's no rule for precisely -which NaN value should be used in a particular case, so Emacs Lisp -doesn't try to distinguish them (but it does report the sign, if you -print it). Here are the read syntaxes for these special floating -point values: + The @acronym{IEEE} floating point standard supports positive +infinity and negative infinity as floating point values. It also +provides for a class of values called NaN or ``not-a-number''; +numerical functions return such values in cases where there is no +correct answer. For example, @code{(/ 0.0 0.0)} returns a NaN. (NaN +values can also carry a sign, but for practical purposes there's no +significant difference between different NaN values in Emacs Lisp.) +Here are the read syntaxes for these special floating point values: @table @asis @item positive infinity @@ -206,16 +209,37 @@ point values: @samp{0.0e+NaN} or @samp{-0.0e+NaN}. @end table - To test whether a floating point value is a NaN, compare it with -itself using @code{=}. That returns @code{nil} for a NaN, and -@code{t} for any other floating point value. +@defun isnan number +This predicate tests whether its argument is NaN, and returns @code{t} +if so, @code{nil} otherwise. The argument must be a number. +@end defun + + The following functions are specialized for handling floating point +numbers: + +@defun frexp x +This function returns a cons cell @code{(@var{sig} . @var{exp})}, +where @var{sig} and @var{exp} are respectively the significand and +exponent of the floating point number @var{x}: + +@smallexample +@var{x} = @var{sig} * 2^@var{exp} +@end smallexample + +@var{sig} is a floating point number between 0.5 (inclusive) and 1.0 +(exclusive). If @var{x} is zero, the return value is @code{(0 . 0)}. +@end defun - The value @code{-0.0} is distinguishable from ordinary zero in -@acronym{IEEE} floating point, but Emacs Lisp @code{equal} and -@code{=} consider them equal values. +@defun ldexp sig &optional exp +This function returns a floating point number corresponding to the +significand @var{sig} and exponent @var{exp}. +@end defun - You can use @code{logb} to extract the binary exponent of a floating -point number (or estimate the logarithm of an integer): +@defun copysign x1 x2 +This function copies the sign of @var{x2} to the value of @var{x1}, +and returns the result. @var{x1} and @var{x2} must be floating point +numbers. +@end defun @defun logb number This function returns the binary exponent of @var{number}. More @@ -230,14 +254,6 @@ down to an integer. @end example @end defun -@defvar float-e -The mathematical constant @math{e} (2.71828@dots{}). -@end defvar - -@defvar float-pi -The mathematical constant @math{pi} (3.14159@dots{}). -@end defvar - @node Predicates on Numbers @section Type Predicates for Numbers @cindex predicates for numbers @@ -1122,35 +1138,15 @@ angle in radians between the vector @code{[@var{x}, @var{y}]} and the @end defun @defun exp arg -This is the exponential function; it returns -@tex -@math{e} -@end tex -@ifnottex -@i{e} -@end ifnottex -to the power @var{arg}. -@tex -@math{e} -@end tex -@ifnottex -@i{e} -@end ifnottex -is a fundamental mathematical constant also called the base of natural -logarithms. +This is the exponential function; it returns @math{e} to the power +@var{arg}. @end defun @defun log arg &optional base -This function returns the logarithm of @var{arg}, with base @var{base}. -If you don't specify @var{base}, the base -@tex -@math{e} -@end tex -@ifnottex -@i{e} -@end ifnottex -is used. If @var{arg} is negative, it signals a @code{domain-error} -error. +This function returns the logarithm of @var{arg}, with base +@var{base}. If you don't specify @var{base}, the natural base +@math{e} is used. If @var{arg} is negative, it signals a +@code{domain-error} error. @end defun @ignore @@ -1185,6 +1181,17 @@ This returns the square root of @var{arg}. If @var{arg} is negative, it signals a @code{domain-error} error. @end defun +In addition, Emacs defines the following common mathematical +constants: + +@defvar float-e +The mathematical constant @math{e} (2.71828@dots{}). +@end defvar + +@defvar float-pi +The mathematical constant @math{pi} (3.14159@dots{}). +@end defvar + @node Random Numbers @section Random Numbers @cindex random numbers @@ -1218,7 +1225,6 @@ nonnegative and less than @var{limit}. If @var{limit} is @code{t}, it means to choose a new seed based on the current time of day and on Emacs's process @acronym{ID} number. -@c "Emacs'" is incorrect usage! On some machines, any integer representable in Lisp may be the result of @code{random}. On other machines, the result can never be larger diff --git a/doc/lispref/objects.texi b/doc/lispref/objects.texi index 3fb676edcd4..87bcc20daba 100644 --- a/doc/lispref/objects.texi +++ b/doc/lispref/objects.texi @@ -427,10 +427,10 @@ codes for these non-@acronym{ASCII} control characters include the @ifnottex 2**26 @end ifnottex -bit as well as the code for the corresponding non-control -character. Ordinary terminals have no way of generating non-@acronym{ASCII} -control characters, but you can generate them straightforwardly using X -and other window systems. +bit as well as the code for the corresponding non-control character. +Ordinary text terminals have no way of generating non-@acronym{ASCII} +control characters, but you can generate them straightforwardly using +X and other window systems. For historical reasons, Emacs treats the @key{DEL} character as the control equivalent of @kbd{?}: @@ -501,10 +501,10 @@ character is upper case or lower case. Emacs uses the @end ifnottex bit to indicate that the shift key was used in typing a control character. This distinction is possible only when you use X terminals -or other special terminals; ordinary terminals do not report the -distinction to the computer in any way. The Lisp syntax for -the shift bit is @samp{\S-}; thus, @samp{?\C-\S-o} or @samp{?\C-\S-O} -represents the shifted-control-o character. +or other special terminals; ordinary text terminals do not report the +distinction. The Lisp syntax for the shift bit is @samp{\S-}; thus, +@samp{?\C-\S-o} or @samp{?\C-\S-O} represents the shifted-control-o +character. @cindex hyper characters @cindex super characters @@ -541,9 +541,9 @@ intended. But you can use one symbol in all of these ways, independently. A symbol whose name starts with a colon (@samp{:}) is called a -@dfn{keyword symbol}. These symbols automatically act as constants, and -are normally used only by comparing an unknown symbol with a few -specific alternatives. +@dfn{keyword symbol}. These symbols automatically act as constants, +and are normally used only by comparing an unknown symbol with a few +specific alternatives. @xref{Constant Variables}. @cindex @samp{\} in symbols @cindex backslash in symbols @@ -617,26 +617,28 @@ all symbols; @pxref{Creating Symbols}.) @subsection Sequence Types A @dfn{sequence} is a Lisp object that represents an ordered set of -elements. There are two kinds of sequence in Emacs Lisp, lists and -arrays. Thus, an object of type list or of type array is also -considered a sequence. - - Arrays are further subdivided into strings, vectors, char-tables and -bool-vectors. Vectors can hold elements of any type, but string -elements must be characters, and bool-vector elements must be @code{t} -or @code{nil}. Char-tables are like vectors except that they are -indexed by any valid character code. The characters in a string can -have text properties like characters in a buffer (@pxref{Text -Properties}), but vectors do not support text properties, even when -their elements happen to be characters. - - Lists, strings and the other array types are different, but they have -important similarities. For example, all have a length @var{l}, and all -have elements which can be indexed from zero to @var{l} minus one. -Several functions, called sequence functions, accept any kind of -sequence. For example, the function @code{elt} can be used to extract -an element of a sequence, given its index. @xref{Sequences Arrays -Vectors}. +elements. There are two kinds of sequence in Emacs Lisp: @dfn{lists} +and @dfn{arrays}. + + Lists are the most commonly-used sequences. A list can hold +elements of any type, and its length can be easily changed by adding +or removing elements. See the next subsection for more about lists. + + Arrays are fixed-length sequences. They are further subdivided into +strings, vectors, char-tables and bool-vectors. Vectors can hold +elements of any type, whereas string elements must be characters, and +bool-vector elements must be @code{t} or @code{nil}. Char-tables are +like vectors except that they are indexed by any valid character code. +The characters in a string can have text properties like characters in +a buffer (@pxref{Text Properties}), but vectors do not support text +properties, even when their elements happen to be characters. + + Lists, strings and the other array types also share important +similarities. For example, all have a length @var{l}, and all have +elements which can be indexed from zero to @var{l} minus one. Several +functions, called sequence functions, accept any kind of sequence. +For example, the function @code{length} reports the length of any kind +of sequence. @xref{Sequences Arrays Vectors}. It is generally impossible to read the same sequence twice, since sequences are always created anew upon reading. If you read the read @@ -650,24 +652,27 @@ same object, @code{nil}. @cindex decrement field of register @cindex pointers - A @dfn{cons cell} is an object that consists of two slots, called the -@sc{car} slot and the @sc{cdr} slot. Each slot can @dfn{hold} or -@dfn{refer to} any Lisp object. We also say that ``the @sc{car} of -this cons cell is'' whatever object its @sc{car} slot currently holds, -and likewise for the @sc{cdr}. - -@quotation -A note to C programmers: in Lisp, we do not distinguish between -``holding'' a value and ``pointing to'' the value, because pointers in -Lisp are implicit. -@end quotation + A @dfn{cons cell} is an object that consists of two slots, called +the @sc{car} slot and the @sc{cdr} slot. Each slot can @dfn{hold} any +Lisp object. We also say that ``the @sc{car} of this cons cell is'' +whatever object its @sc{car} slot currently holds, and likewise for +the @sc{cdr}. +@cindex list structure A @dfn{list} is a series of cons cells, linked together so that the @sc{cdr} slot of each cons cell holds either the next cons cell or the empty list. The empty list is actually the symbol @code{nil}. -@xref{Lists}, for functions that work on lists. Because most cons -cells are used as part of lists, the phrase @dfn{list structure} has -come to refer to any structure made out of cons cells. +@xref{Lists}, for details. Because most cons cells are used as part +of lists, we refer to any structure made out of cons cells as a +@dfn{list structure}. + +@cindex linked list +@quotation +A note to C programmers: a Lisp list thus works as a @dfn{linked list} +built up of cons cells. Because pointers in Lisp are implicit, we do +not distinguish between a cons cell slot ``holding'' a value versus +``pointing to'' the value. +@end quotation @cindex atoms Because cons cells are so central to Lisp, we also have a word for @@ -1025,40 +1030,40 @@ but the newline is ignored if escaped." @node Non-ASCII in Strings @subsubsection Non-@acronym{ASCII} Characters in Strings - You can include a non-@acronym{ASCII} international character in a string -constant by writing it literally. There are two text representations -for non-@acronym{ASCII} characters in Emacs strings (and in buffers): unibyte -and multibyte. If the string constant is read from a multibyte source, -such as a multibyte buffer or string, or a file that would be visited as -multibyte, then the character is read as a multibyte character, and that -makes the string multibyte. If the string constant is read from a -unibyte source, then the character is read as unibyte and that makes the -string unibyte. - - You can also represent a multibyte non-@acronym{ASCII} character with its -character code: use a hex escape, @samp{\x@var{nnnnnnn}}, with as many -digits as necessary. (Multibyte non-@acronym{ASCII} character codes are all -greater than 256.) Any character which is not a valid hex digit -terminates this construct. If the next character in the string could be -interpreted as a hex digit, write @w{@samp{\ }} (backslash and space) to -terminate the hex escape---for example, @w{@samp{\xe0\ }} represents -one character, @samp{a} with grave accent. @w{@samp{\ }} in a string -constant is just like backslash-newline; it does not contribute any -character to the string, but it does terminate the preceding hex escape. + You can include a non-@acronym{ASCII} international character in a +string constant by writing it literally. There are two text +representations for non-@acronym{ASCII} characters in Emacs strings +(and in buffers): unibyte and multibyte (@pxref{Text +Representations}). If the string constant is read from a multibyte +source, such as a multibyte buffer or string, or a file that would be +visited as multibyte, then Emacs reads the non-@acronym{ASCII} +character as a multibyte character and automatically makes the string +a multibyte string. If the string constant is read from a unibyte +source, then Emacs reads the non-@acronym{ASCII} character as unibyte, +and makes the string unibyte. + + Instead of writing a non-@acronym{ASCII} character literally into a +multibyte string, you can write it as its character code using a hex +escape, @samp{\x@var{nnnnnnn}}, with as many digits as necessary. +(Multibyte non-@acronym{ASCII} character codes are all greater than +256.) You can also specify a character in a multibyte string using +the @samp{\u} or @samp{\U} Unicode escape syntax (@pxref{General +Escape Syntax}). In either case, any character which is not a valid +hex digit terminates the construct. If the next character in the +string could be interpreted as a hex digit, write @w{@samp{\ }} +(backslash and space) to terminate the hex escape---for example, +@w{@samp{\xe0\ }} represents one character, @samp{a} with grave +accent. @w{@samp{\ }} in a string constant is just like +backslash-newline; it does not contribute any character to the string, +but it does terminate the preceding hex escape. Using any hex escape +in a string (even for an @acronym{ASCII} character) automatically +forces the string to be multibyte. You can represent a unibyte non-@acronym{ASCII} character with its character code, which must be in the range from 128 (0200 octal) to 255 (0377 octal). If you write all such character codes in octal and the string contains no other characters forcing it to be multibyte, -this produces a unibyte string. However, using any hex escape in a -string (even for an @acronym{ASCII} character) forces the string to be -multibyte. - - You can also specify characters in a string by their numeric values -in Unicode, using @samp{\u} and @samp{\U} (@pxref{Character Type}). - - @xref{Text Representations}, for more information about the two -text representations. +this produces a unibyte string. @node Nonprinting Characters @subsubsection Nonprinting Characters in Strings @@ -1922,23 +1927,24 @@ This function returns a symbol naming the primitive type of @section Equality Predicates @cindex equality - Here we describe functions that test for equality between any two -objects. Other functions test equality of contents between objects of specific -types, e.g., strings. For these predicates, see the appropriate chapter -describing the data type. + Here we describe functions that test for equality between two +objects. Other functions test equality of contents between objects of +specific types, e.g.@: strings. For these predicates, see the +appropriate chapter describing the data type. @defun eq object1 object2 This function returns @code{t} if @var{object1} and @var{object2} are -the same object, @code{nil} otherwise. - -@code{eq} returns @code{t} if @var{object1} and @var{object2} are -integers with the same value. Also, since symbol names are normally -unique, if the arguments are symbols with the same name, they are -@code{eq}. For other types (e.g., lists, vectors, strings), two -arguments with the same contents or elements are not necessarily -@code{eq} to each other: they are @code{eq} only if they are the same -object, meaning that a change in the contents of one will be reflected -by the same change in the contents of the other. +the same object, and @code{nil} otherwise. + +If @var{object1} and @var{object2} are integers with the same value, +they are considered to be the same object (i.e.@: @code{eq} returns +@code{t}). If @var{object1} and @var{object2} are symbols with the +same name, they are normally the same object---but see @ref{Creating +Symbols} for exceptions. For other types (e.g.@: lists, vectors, +strings), two arguments with the same contents or elements are not +necessarily @code{eq} to each other: they are @code{eq} only if they +are the same object, meaning that a change in the contents of one will +be reflected by the same change in the contents of the other. @example @group @@ -1988,6 +1994,7 @@ by the same change in the contents of the other. @end group @end example +@noindent The @code{make-symbol} function returns an uninterned symbol, distinct from the symbol that is used if you write the name in a Lisp expression. Distinct symbols with the same name are not @code{eq}. @xref{Creating @@ -2003,11 +2010,11 @@ Symbols}. @defun equal object1 object2 This function returns @code{t} if @var{object1} and @var{object2} have -equal components, @code{nil} otherwise. Whereas @code{eq} tests if its -arguments are the same object, @code{equal} looks inside nonidentical -arguments to see if their elements or contents are the same. So, if two -objects are @code{eq}, they are @code{equal}, but the converse is not -always true. +equal components, and @code{nil} otherwise. Whereas @code{eq} tests +if its arguments are the same object, @code{equal} looks inside +nonidentical arguments to see if their elements or contents are the +same. So, if two objects are @code{eq}, they are @code{equal}, but +the converse is not always true. @example @group @@ -2059,13 +2066,13 @@ always true. @end example Comparison of strings is case-sensitive, but does not take account of -text properties---it compares only the characters in the strings. Use -@code{equal-including-properties} to also compare text properties. For -technical reasons, a unibyte string and a multibyte string are -@code{equal} if and only if they contain the same sequence of -character codes and all these codes are either in the range 0 through -127 (@acronym{ASCII}) or 160 through 255 (@code{eight-bit-graphic}). -(@pxref{Text Representations}). +text properties---it compares only the characters in the strings. +@xref{Text Properties}. Use @code{equal-including-properties} to also +compare text properties. For technical reasons, a unibyte string and +a multibyte string are @code{equal} if and only if they contain the +same sequence of character codes and all these codes are either in the +range 0 through 127 (@acronym{ASCII}) or 160 through 255 +(@code{eight-bit-graphic}). (@pxref{Text Representations}). @example @group diff --git a/etc/NEWS b/etc/NEWS index 40a1c194365..f745645d6fb 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -1367,6 +1367,9 @@ This means that the empty symbol can now be read back. Also, #: by itself (when not immediately followed by a possible symbol character) stands for an empty uninterned symbol. ++++ +** New math functions `isnan', `copysign', `frexp', `ldexp'. + ** Obsolete functions and variables *** buffer-substring-filters is obsolete. -- cgit v1.3 From 20d2304d18b31ed4de8a535f1a66defeeaa424a1 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Mon, 23 Jan 2012 14:52:18 +0800 Subject: * doc/emacs/anti.texi (Antinews): Add Emacs 24 antinews. --- doc/emacs/ChangeLog | 4 +++ doc/emacs/anti.texi | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++++- etc/NEWS | 10 +++--- 3 files changed, 103 insertions(+), 6 deletions(-) (limited to 'etc') diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 90a7f69ea72..8a461d2a366 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,7 @@ +2012-01-23 Chong Yidong + + * anti.texi (Antinews): Add Emacs 24 antinews. + 2012-01-16 Volker Sobek (tiny change) * programs.texi (Comment Commands): Typo (bug#10514). diff --git a/doc/emacs/anti.texi b/doc/emacs/anti.texi index d9f17c91f5e..7bc405e442e 100644 --- a/doc/emacs/anti.texi +++ b/doc/emacs/anti.texi @@ -13,7 +13,100 @@ greater simplicity that results from the absence of many Emacs @itemize @bullet @item -FIXME +Support for displaying and editing ``bidirectional'' text has been +removed. Text is now always displayed on the screen in a single +consistent direction---left to right---regardless of the underlying +script. Similarly, @kbd{C-f} and @kbd{C-b} always move the text +cursor to the right and left respectively. Also, @key{right} and +@key{left} are now equivalent to @kbd{C-f} and @kbd{C-b}, as you might +expect, rather than moving forward or backward based on the underlying +``paragraph direction''. + +Users of ``right-to-left'' languages, like Arabic and Hebrew, may +adapt by reading and/or editing text in left-to-right order. + +@item +The Emacs Lisp package manager has been removed. Instead of using a +``user interface'' (@kbd{M-x list-packages}), additional Lisp packages +must now be installed by hand, which is the most flexible and +``Lispy'' method anyway. Typically, this just involves editing your +init file to add the package installation directory to the load path +and defining some autoloads; see each package's commentary section +and/or README file for details. + +@item +The option @code{delete-active-region} has been deleted. When the +region is active, typing @key{DEL} or @key{delete} no longer deletes +the text in the region; it deletes a single character instead. + +@item +We have reworked how Emacs handles the clipboard and the X primary +selection. Commands for killing and yanking, like @kbd{C-w} and +@kbd{C-y}, use the primary selection and not the clipboard, so you can +use these commands without interfering with ``cutting'' or ``pasting'' +in other programs. The @samp{Cut}/@samp{Copy}/@samp{Paste} menu items +are bound to separate clipboard commands, not to the same commands as +@kbd{C-w}/@kbd{M-w}/@kbd{C-y}. + +Selecting text by dragging with the mouse now puts the text in the +kill ring, in addition to the primary selection. But note that +selecting an active region with @kbd{C-@key{SPC}} does @emph{not} +alter the kill ring nor the primary selection, even though the text +highlighting is visually identical. + +@item +In Isearch, @kbd{C-y} and @kbd{M-y} are no longer bound to +@code{isearch-yank-kill} and @code{isearch-yank-pop} respectively. +Instead, @kbd{C-y} yanks the rest of the current line into the search +string (@code{isearch-yank-line}), whereas @kbd{M-y} does +@code{isearch-yank-kill}. The mismatch with the usual meanings of +@kbd{C-y} and @kbd{M-y} is unintended. + +@item +Various completion features have been simplified. The options +@code{completion-cycle-threshold} and +@code{completion-category-overrides} have been removed. Due to the +latter removal, Emacs uses a single consistent scheme to generate +completions, instead of using a separate scheme for (say) buffer name +completion. Several major modes, such as Shell mode, now implement +their own inline completion commands instead of using +@code{completion-at-point}. + +@item +We have removed various options for controlling how windows are used, +e.g.@: @code{display-buffer-base-action}, @code{display-buffer-alist}, +@code{window-combination-limit}, and @code{window-combination-resize}. + +@item +The command @kbd{M-x customize-themes} has been removed. Emacs no +longer comes with pre-defined themes (you can write your own). + +@item +Emacs no longer adapts various aspects of its display to GTK+ +settings, opting instead for a uniform toolkit-independent look. GTK+ +scroll bars are placed on the left, the same position as non-GTK+ X +scroll bars. Emacs no longer refers to GTK+ to set the default +@code{region} face, nor for drawing tooltips. + +@item +Setting the option @code{delete-by-moving-to-trash} to a +non-@code{nil} now causes all file deletions to use the system trash, +even temporary files created by Lisp programs; furthermore, the +@kbd{M-x delete-file} and @kbd{M-x delete-directory} commands no +longer accept prefix arguments to force true deletion. + +@item +On GNU/Linux and Unix, the default method for sending mail (as +specified by @code{send-mail-function}) is to use the +@command{sendmail} program. Emacs no longer asks for a delivery +method the first time you try to send mail, trusting instead that the +system is configured for mail delivery, as it ought to be. + +@item +Several VC features have been removed, including the @kbd{C-x v +} and +@kbd{C-x v m} commands for pulling and merging on distributed version +control systems, and the ability to view inline log entries in the log +buffers made by @kbd{C-x v L}. @item To keep up with decreasing computer memory capacity and disk space, many diff --git a/etc/NEWS b/etc/NEWS index f745645d6fb..ccf2441c656 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -430,11 +430,6 @@ These maximize and minimize the size of a window within its frame. These functions allow to navigate through the live buffers that have been shown in a specific window. -+++ -*** New functions `window-state-get' and `window-state-put'. -These functions allow to save and restore the state of an arbitrary -frame or window as an Elisp object. - ** The inactive minibuffer has its own major mode `minibuffer-inactive-mode'. This is handy for minibuffer-only frames, and is also used for the "mouse-1 pops up *Messages*" feature, which can now easily be changed. @@ -1161,6 +1156,11 @@ state before the last buffer display operation in that window. iconifying or deleting a frame when burying a buffer shown in a dedicated frame or quitting a window showing a buffer in a frame of its own. ++++ +*** New functions `window-state-get' and `window-state-put'. +These functions allow to save and restore the state of an arbitrary +frame or window as an Elisp object. + ** Completion *** New variable completion-extra-properties used to specify extra properties -- cgit v1.3