diff options
| author | Miles Bader <miles@gnu.org> | 2006-06-07 18:05:10 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-06-07 18:05:10 +0000 |
| commit | b883cdb2fefa8ea9c3b0d82eba7a9ee792f871bb (patch) | |
| tree | de3804210a8cd955e0d3b9abc15679480930bc82 | |
| parent | 885b7d0991bd4b4b8f4bd1d3cd21c18a697bbce2 (diff) | |
| parent | 26c9afc3239e18b03537faaea33e3e82e28099e6 (diff) | |
| download | emacs-b883cdb2fefa8ea9c3b0d82eba7a9ee792f871bb.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 285-296)
- Update from CVS
- Merge from gnus--rel--5.10
- Update from CVS: admin/FOR-RELEASE: Update refcard section.
* gnus--rel--5.10 (patch 102-104)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-64
289 files changed, 27772 insertions, 23253 deletions
@@ -3,19 +3,24 @@ Foundation's distribution of GNU Emacs. To show our appreciation for their public spirit, we list here in alphabetical order a condensed list of their contributions. -Aaron Hawley: changed files.el - Aaron Larson: changed bibtex.el +Aaron S. Hawley: changed files.texi files.el isearch.el misc.texi + Abraham Nahum: changed configure.in dgux4.h sysdep.c Abramo Bagnara: changed term.c +Adrian Aichner: changed erc-log.el erc.el erc-autojoin.el erc-backend.el + erc-dcc.el erc-members.el erc-nets.el erc-sound.el + Adrian Colley: changed aix3-2.h Adrian Lanz: changed mail-source.el -Aidan Kehoe: changed mm-util.el +Agustin Martin: changed flyspell.el ispell.el + +Aidan Kehoe: changed mm-util.el erc.el Ake Stenhoff: wrote imenu.el and changed cc-mode.el perl-mode.el @@ -26,10 +31,10 @@ Aki Vehtari: changed bibtex.el gnus-art.el gnus-score.el gnus-sum.el Alakazam Petrofsky: changed hanoi.el Alan Mackenzie: wrote cc-awk.el -and changed cc-engine.el cc-mode.el cc-fonts.el cc-cmds.el cc-vars.el - isearch.el search.texi buffers.texi cc-align.el cc-defs.el cc-langs.el - cc-mode-19.el cc-styles.el ebrowse.el emacs.texi fill.el frames.texi - page.el programs.texi regexp-opt.el simple.el text.texi +and changed cc-cmds.el cc-mode.el cc-engine.el cc-vars.el cc-defs.el + cc-langs.el cc-styles.el cc-mode.texi lread.c cc-align.el cc-fonts.el + cc-subword.el isearch.el programs.texi search.texi subr.el text.texi + buffers.texi cc-fix.el cc-mode-19.el ebrowse.el and 14 other files Alan Shutko: changed diary-lib.el calendar.el bindings.el cal-hebrew.el easy-mmode.el gnus-sum.el ibuf-ext.el ibuffer.el lunar.el macros.el @@ -45,18 +50,25 @@ Alex Ott: changed TUTORIAL.ru ispell.el ru-refcard.ps ru-refcard.tex Alex Rezinsky: wrote which-func.el -Alex Schroeder: wrote ansi-color.el cus-theme.el master.el spam-stat.el - sql.el -and changed comint.el custom.el goto-addr.el sending.texi smtpmail.texi - Makefile.in cmdargs.texi cus-edit.el cus-face.el misc.texi nnrss.el - xml.el +Alex Schroeder: wrote ansi-color.el cus-theme.el erc-compat.el + erc-hecomplete.el erc-join.el erc-lang.el erc-ring.el master.el + spam-stat.el sql.el +and changed erc.el erc-track.el erc-button.el erc-stamp.el erc-match.el + erc-autoaway.el erc-nickserv.el Makefile erc-autojoin.el erc-fill.el + erc-pcomplete.el erc-complete.el erc-ibuffer.el erc-members.el + comint.el custom.el erc-bbdb.el erc-chess.el erc-ezbounce.el + erc-imenu.el erc-page.el and 25 other files Alexander Klimov: changed man.el Alexander Kreuzer: changed nnrss.el +Alexander L. Belikoff: wrote erc.el + Alexander Pohoyda: changed rmailsum.el man.el rmail.el sendmail.el +Alexander Shopov: changed code-pages.el + Alexander Zhuckov: changed ebrowse.c Alexandre Oliva: wrote gnus-mlspl.el @@ -66,7 +78,7 @@ Alexandre Veyrenc: changed fr-refcard.tex Alfred Correira: changed generic-x.el -Alfred M. Szmidt: changed compile.el +Alfred M. Szmidt: changed compile.el html2text.el Ami Fischman: changed calendar.el diary-lib.el @@ -77,13 +89,19 @@ and changed font-lock.el etags.c compile.el Andre Spiegel: changed vc.el vc-hooks.el vc-cvs.el vc-rcs.el vc-sccs.el files.el dired.el files.texi cperl-mode.el ediff-util.el log-view.el - parse-time.el startup.el vc-arch.el vc-mcvs.el vc-svn.el viper-util.el + parse-time.el startup.el tramp-vc.el vc-arch.el vc-mcvs.el vc-svn.el + vcdiff viper-util.el Andre Srinivasan: changed gnus.texi Andreas B,A|(Bsching: changed emacsclient.c -Andreas Fuchs: changed mml-sec.el +Andreas Fuchs: wrote erc-ezbounce.el erc-fill.el erc-match.el + erc-replace.el erc-truncate.el +and changed erc.el erc-bbdb.el erc-button.el erc-log.el erc-stamp.el + erc-autoaway.el erc-autojoin.el erc-dcc.el erc-imenu.el erc-list.el + erc-members.el erc-menu.el erc-netsplit.el erc-notify.el erc-ring.el + erc-speedbar.el erc-track.el erc-xdcc.el mml-sec.el Andreas Jaeger: changed gnus-msg.el gnus-start.el gnus-xmas.el @@ -91,10 +109,12 @@ Andreas Leue: changed artist.el Andreas Luik: changed xfns.c xterm.c -Andreas Schwab: changed Makefile.in files.el xdisp.c lisp.h alloc.c fns.c - coding.c configure.in dired.el editfns.c info.el eval.c fileio.c - print.c simple.el buffer.c keyboard.c minibuf.c xterm.c emacs.c - process.c and 435 other files +Andreas Schwab: changed Makefile.in files.el lisp.h xdisp.c alloc.c + configure.in fns.c coding.c dired.el editfns.c info.el eval.c fileio.c + print.c simple.el buffer.c minibuf.c xterm.c emacs.c keyboard.c + process.c and 442 other files + +Andreas Seltenreich: changed nnweb.el gnus-art.el url-http.el Andrew Choi: wrote mac-win.el and changed macterm.c mac.c macfns.c INSTALL macmenu.c darwin.h macterm.h @@ -116,25 +136,28 @@ Andrew Innes: changed makefile.w32-in w32fns.c w32term.c w32.c w32proc.c Andrew Oram: changed man/calendar.texi miscellaneous changes to files in man/ +Andrey Slusar: changed gnus.el + Andy Norman: wrote ange-ftp.el Andy Petrusenco: changed w32term.c -Ari Roponen: changed startup.el +Ari Roponen: changed atimer.c startup.el -Arisawa Akihiro: changed ps-print.el time.el utf-8.el +Arisawa Akihiro: changed mm-decode.el mm-view.el ps-print.el time.el + utf-8.el Arne Georg Gleditsch: changed gnus-sum.el Arne J,Ax(Brgensen: wrote latexenc.el -and changed smime.el mm-decode.el mule-conf.el nnimap.el nnrss.el - wid-edit.el +and changed smime.el gnus-art.el gnus-sieve.el message.el mm-decode.el + mule-conf.el nnimap.el nnrss.el wid-edit.el Artem Chuprina: changed message.el Ashwin Ram: wrote refer.el -Aubrey Jaffer: changed info.el +Aubrey Jaffer: changed info.el unexelf.c Axel Boldt: changed ehelp.el electric.el @@ -148,12 +171,14 @@ and changed cc-mode.el cc-cmds.el cc-engine.el cc-langs.el cc-styles.el Barry Fishman: changed gnu-linux.h +Ben A. Mesander: wrote erc-dcc.el + Ben Harris: changed configure.in Ben Key: changed w32.c w32fns.c w32menu.c makefile.w32-in w32.h w32term.c emacs.c gmake.defs ms-w32.h nmake.defs sound.c -Ben North: changed fill.el lisp-mode.el +Ben North: changed fill.el isearch.el lisp-mode.el Benjamin Drieu: wrote pong.el @@ -169,9 +194,6 @@ Bill Carpenter: wrote feedmail.el (public domain) Bill Mann: changed configure.in unexaix.c ibmrs6000.h usg5-4-3.h -Bill Perry: wrote url-dav.el url-gw.el url-http.el url-util.el url.el - vc-dav.el - Bill Pringlemeir: changed messcompat.el Bill Richter: changed fill.el quail.el ccl.el encoded-kb.el fontset.el @@ -182,15 +204,19 @@ Bill Rosenblatt: wrote float.el Bill Rozas: wrote scheme.el and changed xscheme.el -Bill Wohler: wrote mh-comp.el mh-customize.el mh-e.el mh-funcs.el - mh-loaddefs.el mh-mime.el mh-pick.el mh-seq.el mh-utils.el -and changed mh-index.el MH-E-NEWS Makefile README mh-identity.el - mh-alias.el mh-speed.el mh-unit.el mh-xemacs-compat.el mh-junk.el - mh-inc.el mh-xemacs.el mh-gnus.el mh-init.el mh-xemacs-toolbar.el - ChangeLog mh-acros.el *.el *.pbm alias.pbm alias.xpm and 26 other files +Bill Wohler: wrote mh-buffers.el mh-comp.el mh-compat.el mh-e.el + mh-folder.el mh-funcs.el mh-letter.el mh-loaddefs.el mh-mime.el + mh-scan.el mh-seq.el mh-show.el mh-utils.el mh-xface.el +and changed mh-customize.el mh-index.el MH-E-NEWS mh-alias.el Makefile + mh-identity.el mh-pick.el README mh-speed.el mh-init.el mh-junk.el + mh-acros.el mh-e.texi mh-gnus.el mh-unit.el mh-inc.el + mh-xemacs-compat.el mh-print.el mh-search.el Makefile.in image.el + and 89 other files Bjorn Solberg: changed nnimap.el +Bj,Av(Brn Lindstr,Av(Bm: changed rcirc.texi + Bj,Av(Brn Torkelsson: changed gnus-art.el gnus-group.el gnus-srvr.el gnus-sum.el gnus-mlspl.el gnus-msg.el message.el dgnushack.el gnus-agent.el gnus-cus.el gnus-gl.el gnus-nocem.el gnus-score.el @@ -214,6 +240,8 @@ and changed fill.el simple.el indent.el paragraphs.el cmds.c intervals.c text-mode.el textprop.c ada.el allout.el awk-mode.el bibtex.el buffer.c buffer.h c-mode.el and 38 other files +Boris Samorodov: changed imap.el + Boyd Lynn Gerber: changed configure.in Brad Howes: changed gnus-demon.el @@ -231,15 +259,22 @@ Brian Fox: changed Makefile.in configure.in minibuf.c dired.el files.el Brian Marick: wrote hideif.el +Brian P Templeton: changed erc.el erc-compat.el erc-fill.el + erc-nickserv.el erc-pcomplete.el erc-stamp.el erc-track.el + +Brian Palmer: changed erc.el erc-list.el + Brian Preble: changed abbrev.el apropos.el asm-mode.el doctex.el abbrevlist.el ada.el add-log.el appt.el array.el autoload.el awk-mode.el bg-mouse.el bib-mode.el blackbox.el buff-menu.el bug-screen.el bytecomp.el c++-mode.el c-comment.el c-fill.el c-mode.el and 92 other files -Bryan O'sullivan: changed ange-ftp.el +Bryan D. O'connor: changed make-package -Bzyl Wlodzimierz: changed latin-pre.el +Bryan Henderson: changed Makefile term.el + +Bryan O'sullivan: changed ange-ftp.el Caleb Deupree: changed winnt.el @@ -251,8 +286,8 @@ Carsten Dominik: wrote idlw-complete-structtag.el idlw-toolbar.el org.el reftex-auc.el reftex-cite.el reftex-dcr.el reftex-global.el reftex-index.el reftex-parse.el reftex-ref.el reftex-sel.el reftex-toc.el reftex-vars.el reftex.el -and changed org.texi idlw-shell.el idlwave.el idlw-rinfo.el reftex.texi - diary-lib.el reftex-vcr.el bibtex.el bookmark.el files.el +and changed org.texi orgcard.tex idlw-shell.el idlwave.el idlw-rinfo.el + reftex.texi diary-lib.el reftex-vcr.el bibtex.el bookmark.el files.el idlwave-rinfo.el idlwave-shell.el idlwave-toolbar.el Caveh Jalali: changed configure.in intel386.h sol2-4.h @@ -266,19 +301,23 @@ Charles Hannum: changed aix3-1.h aix3-2.h configure ibmrs6000.h Charlie Martin: wrote autoinsert.el -Cheng Gao: changed MORE.STUFF flymake.el tips.texi +Cheng Gao: changed MORE.STUFF flymake.el tips.texi url-dired.el + url-file.el url-handlers.el url-http.el url-nfs.el -Chong Yidong: changed text.texi files.texi dired.texi display.texi - anti.texi frames.texi longlines.el misc.texi positions.texi ack.texi - buff-menu.el building.texi calendar.texi custom.el custom.texi - emacs.texi help.texi minibuf.texi modes.texi mule.texi nonascii.texi - and 26 other files +Chong Yidong: changed custom.el cus-edit.el display.texi longlines.el + files.texi text.texi FOR-RELEASE custom.texi files.el simple.el + cus-theme.el wid-edit.el xterm.c frames.texi info.el mouse.el anti.texi + dired.texi image.c keymaps.texi misc.texi and 112 other files Chris Hanson: changed xscheme.el scheme.el xterm.c hpux.h x11term.c hp9000s300.h keyboard.c process.c texinfmt.el emacsclient.c sort.el syntax.c texnfo-upd.el x11fns.c xfns.c dired.el fileio.c hp9000s800.h indent.c info.el man.el and 17 other files +Chris Moore: changed wdired.el + +Chris Prince: changed w32term.c + Chris Smith: wrote icon.el and changed icon-mode.el @@ -286,10 +325,14 @@ Christian Limpach: changed configure.in Christian Lynbech: changed appt.el emacsserver.c +Christian Neukirchen: changed mm-util.el + Christian Plaunt: wrote soundex.el Christian Von Roques: changed gnus-start.el +Christoph Bauer: changed configure.in + Christoph Conrad: changed qp.el Christoph Wedler: wrote antlr-mode.el @@ -301,6 +344,8 @@ and changed files.el ispell.el replace.el time.el Chunyu Wang: changed pcl-cvs.texi +Claudio Fontana: changed Makefile.in + Colin Marquardt: changed gnus.el message.el Colin Rafferty: changed message.el @@ -312,15 +357,20 @@ and changed calc.el replace.el update-game-score.c calc-ext.el calc-math.el calc-prog.el calc-units.el calcalg2.el font-core.el info.el calc-alg.el and 78 other files +Craig Mcdaniel: changed sheap.c + Daiki Ueno: wrote pgg-def.el pgg-gpg.el pgg-parse.el pgg-pgp.el pgg-pgp5.el pgg.el starttls.el -and changed gnus-agent.el mml2015.el +and changed mml2015.el gnus-agent.el mml1991.el Dale Hagglund: changed unexelf.c Dale R. Worley: wrote emerge.el (public domain) +and changed mail-extr.el -Dale Worley: changed mail-extr.el +Damien Elmes: changed erc.el erc-dcc.el erc-track.el erc-log.el + erc-pcomplete.el README erc-button.el erc-nets.el erc-ring.el Makefile + erc-fill.el erc-match.el erc-members.el erc-nickserv.el Damon Anton Permezel: wrote hanoi.el (public domain) @@ -328,12 +378,12 @@ Dan Christensen: changed nnfolder.el gnus-art.el gnus-group.el gnus-score.el gnus-sum.el nnmail.el Dan Nicolaescu: wrote iris-ansi.el romanian.el -and changed hideshow.el term.el xterm.el icon.el isearch.el cus-edit.el - eterm.ti eterm sh-script.el vhdl-mode.el bindings.el compile.el - dabbrev.el faces.el grep.el imenu.el outline.el replace.el simple.el - speedbar.el abbrev.el and 112 other files +and changed term.el hideshow.el xterm.el isearch.el icon.el cus-edit.el + font-lock.el lisp.h sh-script.el eterm-color.ti faces.el rxvt.el + vhdl-mode.el bindings.el compile.el dabbrev.el grep.el ibuffer.el + imenu.el outline.el replace.el and 153 other files -Daniel Brockman: changed ibuffer.el +Daniel Brockman: changed cus-start.el format-spec.el ibuffer.el Daniel Laliberte: wrote cl-specs.el cust-print.el edebug.el hideif.el isearch.el @@ -353,7 +403,7 @@ and changed compile.el files.el make-mode.el apropos.el buff-menu.el bindings.el button.el cc-fonts.el cc-mode.el and 12 other files Daniel Pittman: wrote tramp-vc.el -and changed gnus-sum.el +and changed gnus-sum.el nnimap.el Daniel Quinlan: changed dired.el info.el @@ -378,7 +428,7 @@ Dave Love: wrote autoarg.el autoconf.el benchmark.el cfengine.el and changed configure.in Makefile.in help.el fortran.el browse-url.el mule-cmds.el simple.el xterm.c cus-edit.el files.el info.el mule.el wid-edit.el vc.el fns.c rfc2047.el bindings.el cus-start.el buffer.c - byte-opt.el bytecomp.el and 728 other files + byte-opt.el bytecomp.el and 729 other files Dave Pearson: wrote 5x5.el quickurl.el @@ -408,7 +458,11 @@ and changed info.el bytecomp.el David Hansen: changed nnrss.el tempo.el -David Herring: changed comint.el +David Hedbor: changed gnus-art.el mm-decode.el mm-view.el gnus-agent.el + gnus-cite.el gnus-cus.el gnus-eform.el gnus-group.el gnus-msg.el + gnus-score.el gnus-spec.el gnus-util.el gnus.el mail-source.el + message.el mm-encode.el mm-util.el nndoc.el nnmail.el score-mode.el + webmail.el David Hunter: changed config.nt flymake.el ms-w32.h process.c @@ -417,11 +471,11 @@ David J. Mackenzie: changed configure.in etags.c fakemail.c movemail.c avoid.el b2m.c digest-doc.c emacsclient.c emacsserver.c emacstool.c etags-vmslib.c fortran.el hexl.c isearch.el and 12 other files -David Kastrup: changed greek.el replace.el search.c ange-ftp.el calc.el - faq.texi meta-mode.el process.c search.texi DEBUG MAILINGLISTS +David Kastrup: changed greek.el replace.el search.c ange-ftp.el faq.texi + calc.el meta-mode.el process.c search.texi DEBUG MAILINGLISTS Makefile.in autoload.el browse-url.el buffer.c building.texi - calc-alg.el configure.in cus-theme.el desktop.el easymenu.el - and 18 other files + calc-alg.el configure.in cus-theme.el desktop.el dispnew.c + and 21 other files David K,Ae(Bgedal: wrote tempo.el and changed sendmail.el xmenu.c @@ -434,6 +488,7 @@ David Lawrence: changed loaddefs.el comint.el simple.el files.el David M. Brown: wrote array.el David M. Koppelman: wrote hi-lock.el +and changed display.texi David M. Smith: wrote ielm.el and changed imenu.el @@ -452,12 +507,14 @@ David Mosberger-Tang: changed alpha.h unexelf.c cm.h config.in sysdep.c terminfo.c unexelf1.c yow.c David Ponce: wrote recentf.el ruler-mode.el tree-widget.el -and changed w32menu.c w32term.c keyboard.c bytecomp.el callint.c - commands.texi cus-edit.el emacs.rc fileio.c files.el lread.c - makefile.w32-in mouse.el print.c termhooks.h tree-widget w32fns.c - which-func.el wid-edit.el windows.texi +and changed w32menu.c w32term.c close.png close.xpm empty.png empty.xpm + end-guide.png end-guide.xpm guide.png guide.xpm handle.png handle.xpm + keyboard.c leaf.png leaf.xpm no-guide.png no-guide.xpm no-handle.png + no-handle.xpm open.png open.xpm and 20 other files -David Reitter: changed menu-bar.el url-http.el +David Reitter: wrote mailclient.el +and changed commands.h easy-mmode.el emacsbug.el keymap.c macterm.c + menu-bar.el minibuf.c sendmail.el url-http.el David Robinson: changed menu-bar.el x-win.el @@ -465,22 +522,29 @@ David S. Goldberg: changed gnus-art.el David Z. Maze: changed nnrss.el -Davis Herring: changed isearch.el - Decklin Foster: changed nngateway.el -Deepak Goel: changed README appt.el calc-forms.el calc.el diary-lib.el - doctor.el snake.el +Deepak Goel: changed README ada-mode.el ada-xref.el appt.el apropos.el + artist.el bibtex.el bookmark.el calc-forms.el calc-mode.el + calc-units.el calc.el cmacexp.el decipher.el desktop.el diary-lib.el + dired-aux.el dnd.el doctor.el ebnf2ps.el echistory.el + and 50 other files Denis Howe: wrote browse-url.el +Derek Atkins: changed pgg-pgp.el + Derek L. Davies: changed gud.el Detlev Zundel: wrote re-builder.el Dhruva Krishnamurthy: changed makefile.w32-in -Diane Murray: changed rmail-spam-filter.el rmail.el +Diane Murray: changed erc.el erc-button.el erc-menu.el erc-match.el + erc-track.el erc-nets.el erc-backend.el erc-list.el erc-nickserv.el + erc-autoaway.el erc-stamp.el erc-compat.el erc-goodies.el erc-log.el + Makefile erc-fill.el erc-ibuffer.el erc-notify.el erc-ring.el + erc-speak.el erc-speedbar.el and 22 other files Dick King: wrote uniquify.el @@ -502,7 +566,7 @@ Don Woods: changed replace.el Doug Cutting: wrote disass.el -Drew Csillag: changed m4-mode.el +Drew Adams: changed speedbar.el E. Jay Berkenbilt: changed flyspell.el ispell.el window.h @@ -520,6 +584,11 @@ and changed diary.el tex-mode.el cal-tex.el cal-mayan.el holiday.el diary-insert.el cal-persian.el cal-islamic.el calendar.texi list-holidays.el +Edward O'connor: changed erc.el erc-viper.el erc-log.el erc-track.el + viper.el erc-backend.el erc-chess.el erc-dcc.el erc-ezbounce.el + erc-list.el erc-macs.el erc-match.el erc-ring.el erc-stamp.el + goto-addr.el + Edwin Steiner: changed gnus-nocem.el Ehud Karni: changed rmail.el aviion-intel.h compile.el complete.el @@ -532,39 +601,45 @@ Eli Barzilay: wrote calculator.el Eli Tziperman: wrote rmail-spam-filter.el Eli Zaretskii: wrote codepage.el rxvt.el tty-colors.el -and changed msdos.c Makefile.in files.el info.el fileio.c mainmake.v2 - config.bat pc-win.el startup.el internal.el msdos.h simple.el xfaces.c - dosfns.c menu-bar.el faces.el frame.c frame.el rmail.el makefile.w32-in - w16select.c and 430 other files +and changed msdos.c Makefile.in files.el info.el makefile.w32-in fileio.c + startup.el mainmake.v2 config.bat menu-bar.el pc-win.el simple.el + internal.el msdos.h xfaces.c rmail.el dosfns.c frame.c faces.el emacs.c + frame.el and 501 other files -Emilio C. Lopes: changed cmuscheme.el help.el woman.el apropos.el - bookmark.el cal-menu.el calendar.el calendar.texi display.texi - emacsclient.1 esh-cmd.el fortran.el hscroll.el iso-acc.el lisp.el - process.c window.el +Emanuele Giaquinta: changed rxvt.el configure.in etags.c frame.el + sh-script.el text.texi + +Emilio C. Lopes: changed woman.el cmuscheme.el help.el vc.el advice.el + animate.el apropos.el artist.el bookmark.el cal-menu.el calc-prog.el + calc-store.el calcalg3.el calendar.el calendar.texi checkdoc.el + code-pages.el codepage.el compile.el completion.el cus-edit.el + and 53 other files Emmanuel Briot: wrote ada-prj.el xml.el and changed ada-mode.el ada-stmt.el ada-xref.el Enami Tsugutomo: changed frame.c keyboard.c dispnew.c fileio.c process.c - simple.el xdisp.c add-log.el bytecomp.el configure.in editfns.c emacs.c - frame.h gnus-group.el perl-mode.el rmailsum.el sysdep.c vc.el window.c - window.el + xdisp.c add-log.el bytecomp.el configure.in editfns.c emacs.c frame.h + gnus-group.el perl-mode.el rmailsum.el simple.el sysdep.c vc.el + window.c window.el Era Eriksson: changed dired.el shell.el Eric Decker: changed hp9000s800.h hpux.h sysdep.c Eric Ding: wrote goto-addr.el -and changed mh-utils.el mh-comp.el mh-e.el mh-mime.el +and changed mh-utils.el mh-e.el mh-comp.el mh-mime.el Eric Hanchrow: changed TUTORIAL.es abbrev.el autorevert.el dired.el - emacsclient.c make-dist + emacsclient.c ispell.el make-dist -Eric M. Ludlam: wrote checkdoc.el speedbar.el +Eric M. Ludlam: wrote checkdoc.el dframe.el ezimage.el sb-image.el + speedbar.el and changed info.el rmail.el speedbspec.el gud.el Makefile.in comint.el - dir lisp-mnt.el rmailout.el sb-dir+.xpm sb-dir-.xpm sb-dir-minus.xpm - sb-dir-plus.xpm sb-dir.xpm sb-file+.xpm sb-file-.xpm sb-file.xpm - sb-mail.xpm sb-pg-minus.xpm sb-pg-plus.xpm sb-pg.xpm and 9 other files + dir lisp-mnt.el rmailout.el sb-*.xpm sb-dir+.xpm sb-dir-.xpm + sb-dir-minus.xpm sb-dir-plus.xpm sb-dir.xpm sb-file+.xpm sb-file-.xpm + sb-file.xpm sb-mail.xpm sb-pg-minus.xpm sb-pg-plus.xpm + and 10 other files Eric Marsden: changed url-util.el @@ -617,12 +692,16 @@ Francesco Potort,Al(B: wrote cmacexp.el and changed etags.c man.el delta.h undigest.el comint.el configure.in uniquify.el latin-post.el rmail.el etags.1 etags.el latin-alt.el sgml-mode.el Makefile.in data.c european.el filelock.c files.el - generic-x.el gud.el hanoi.el and 41 other files + generic-x.el gud.el hanoi.el and 42 other files Francis J. Wright: wrote woman.el and changed dired.el comint.el files.el -Francis Litterio: changed keymaps.texi message.el os.texi saveplace.el +Francis Litterio: changed erc.el erc-list.el erc-dcc.el erc-notify.el + erc-button.el erc-goodies.el erc-nets.el erc-ring.el Makefile + erc-pcomplete.el erc-backend.el erc-ibuffer.el erc-match.el + erc-nickserv.el erc-page.el erc-speedbar.el keymaps.texi message.el + os.texi saveplace.el Francois Felix Ingrand: changed gnus-salt.el @@ -690,6 +769,8 @@ and changed w32.c w32fns.c fileio.c w32heap.c w32term.c w32inevt.c emacs.bat loadup.el w32-win.el emacs.c keyboard.c process.c w32console.c addpm.c cmdproxy.c and 107 other files +Georg C. F. Greve: changed pgg-gpg.el + George V. Reilly: changed emacs.ico Georges Brun-Cottan: wrote easy-mmode.el @@ -698,20 +779,25 @@ Gerd Moellmann: wrote authors.el ebrowse.el jit-lock.el rx.el tooltip.el and changed xdisp.c xterm.c dispnew.c dispextern.h xfns.c xfaces.c window.c keyboard.c lisp.h Makefile.in faces.el alloc.c buffer.c startup.el xterm.h fns.c simple.el term.c configure.in frame.c xmenu.c - and 622 other files + and 618 other files + +Gergely Nagy: changed erc.el Germano Caronni: changed ralloc.c Gernot Heiser: changed refer.el +Giorgos Keramidas: changed amdx86-64.h configure.in display.texi fringe.c + fringe.el lisp.h windows.texi + Giuseppe Scrivano: changed buffer.c configure configure.in sysdep.c xsmfns.c -Glenn Morris: changed f90.el diary-lib.el fortran.el calendar.el - calendar.texi appt.el sh-script.el timeclock.el cal-hebrew.el - cal-islam.el cal-menu.el files.el programs.texi scroll-all.el - startup.el cal-coptic.el cal-julian.el cal-move.el cal-x.el - display.texi emacs-xtra.texi and 37 other files +Glenn Morris: changed f90.el diary-lib.el calendar.el fortran.el + calendar.texi appt.el sh-script.el timeclock.el cal-menu.el + cal-hebrew.el cal-islam.el files.el holidays.el programs.texi + scroll-all.el startup.el cal-coptic.el cal-julian.el cal-move.el + cal-tex.el cal-x.el and 37 other files Glynn Clements: wrote gamegrid.el snake.el tetris.el @@ -762,20 +848,26 @@ Harald Maier: changed w32heap.c Heiko Muenkel: changed b2m.c -Helmut Waitzmann: changed gnus.texi +Helmut Waitzmann: changed gnus-sum.el gnus.texi -Henrik Enberg: changed lread.c +Henrik Enberg: changed lread.c rmailout.el xfaces.c Henry Guillaume: wrote find-file.el Henry Kautz: wrote bib-mode.el refbib.el +Herbert Euler: changed TUTORIAL.cn + Hewlett-Packard: changed emacsclient.c emacsserver.c keyboard.c server.el -Hiroshi Fujishima: changed faq.texi +Hideki Iwamoto: changed etags.c + +Hiroshi Fujishima: changed faq.texi mail-source.el spam-stat.el Hiroshi Nakano: changed ralloc.c unexelf.c +Hoan Ton-That: changed erc-log.el + Holger Schauer: wrote fortune.el Hovav Shacham: wrote windmove.el @@ -788,7 +880,7 @@ Howard Melman: changed imenu.el picture.el Howie Kaye: wrote sort.el -Hrvoje Nik,B9(Bi,Bf(B: wrote croatian.el +Hrvoje Nik,B9(Bi,Bf(B: wrote croatian.el savehist.el and changed gnus-xmas.el message.el nnmail.el fileio.c fns.c gnus-art.el gnus-salt.el gnus-spec.el mm-decode.el add-log.el appt.el arc-mode.el avoid.el bookmark.el cal-china.el cal-tex.el calendar.el cl-indent.el @@ -805,7 +897,7 @@ and changed ange-ftp.el desktop.el tex-mode.el Ilja Weis: wrote gnus-topic.el -Ilya N. Golubev: changed shell.el +Ilya N. Golubev: changed mm-util.el shell.el Ilya Zakharevich: wrote tmm.el and changed syntax.c cperl-mode.el syntax.h textprop.c dired.c @@ -836,8 +928,9 @@ Ivar Rummelhoff: wrote winner.el Iwamuro Motonori: changed gnus-kill.el -J.D. Smith: wrote idlw-rinfo.el -and changed idlwave.el idlw-shell.el idlw-toolbar.el idlw-help.el +J.D. Smith: changed idlwave.el idlw-shell.el idlw-rinfo.el + idlw-toolbar.el idlw-help.el vc.el bibtex.el comint.el files.texi + idlw-complete-structtag.el idlwave.texi misc.texi mouse.el Jack Repenning: changed unexelfsgi.c @@ -866,12 +959,12 @@ and changed bytecode.c mail-extr.el subr.el Jan Dj,Ad(Brv: wrote dnd.el x-dnd.el and changed gtkutil.c xterm.c xfns.c xmenu.c xterm.h gtkutil.h - configure.in Makefile.in config.in keyboard.c configure frames.texi - xselect.c emacs.c alloc.c xdisp.c xlwmenu.c fileio.c frame.c x-win.el - xfaces.c and 158 other files + configure.in Makefile.in config.in configure frames.texi keyboard.c + emacs.c x-win.el xselect.c xlwmenu.c alloc.c startup.el xdisp.c + xresources.texi fileio.c and 170 other files Jan Nieuwenhuizen: changed info.el TUTORIAL.nl emacs.c emacsclient.c - gud.el nnmh.el server.el startup.el + gnus-start.el gud.el nnmh.el server.el startup.el Jan Schormann: wrote solitaire.el @@ -881,8 +974,8 @@ Jan-Hein Buhrman: changed ange-ftp.el env.el Jari Aalto: changed add-log.el filecache.el gnus-art.el lisp-mnt.el nnmail.el apropos.el autorevert.el compile.el cperl-mode.el debug.el - executable.el files.el finder.el font-lock.el grep.el ls-lisp.el man.el - terminal.el + executable.el files.el finder.el font-lock.el gnus.texi grep.el + ls-lisp.el man.el sendmail.el terminal.el Jason Merrill: changed imap.el @@ -890,13 +983,13 @@ Jason Rumney: wrote w32-vars.el and changed w32fns.c w32term.c w32menu.c w32-win.el w32term.h makefile.w32-in w32.c w32bdf.c w32-fns.el w32select.c w32console.c w32gui.h w32proc.c keyboard.c mule-cmds.el emacs.c fileio.c w32bdf.h - w32inevt.c config.nt configure.bat and 76 other files + w32inevt.c config.nt configure.bat and 78 other files Jay Belanger: changed calc.texi calc.el calc-ext.el calc-embed.el - calc-aent.el calc-prog.el calc-help.el calc-graph.el calc-lang.el - calc-store.el calc-yank.el calc-units.el calcalg2.el calc-misc.el - calc-alg.el calc-arith.el calc-poly.el calccomp.el calc-vec.el - calc-forms.el calc-math.el and 23 other files + calc-aent.el calc-prog.el calc-arith.el calc-help.el calc-lang.el + calcalg2.el calc-graph.el calc-store.el calc-units.el calc-misc.el + calc-yank.el calc-alg.el calc-poly.el calccomp.el calc-mode.el + calc-vec.el calc-forms.el and 26 other files Jay K. Adams: wrote jka-cmpr-hook.el jka-compr.el @@ -915,21 +1008,22 @@ Jeff Peck: wrote sun-curs.el sun-fns.el sun-mouse.el sun.el Jeffrey C Honig: wrote mh-print.el and changed mh-comp.el mh-e.el mh-utils.el mh-customize.el mh-funcs.el - mh-seq.el Makefile bsdos4.h mh-alias.el mh-junk.el mh-loaddefs.el - mh-mime.el + mh-mime.el mh-seq.el Makefile bsdos4.h mh-alias.el mh-junk.el + mh-loaddefs.el Jens Krinke: changed smime.el Jens Lautenbacher: changed gnus.el Jens Petersen: wrote find-func.el -and changed ffap.el +and changed ffap.el mule-cmds.el Jens Toivo Berger Thielemann: changed word-help.el Jens-Ulrik Holger Petersen: changed cus-edit.el find-func.el gnus.el -Jeremy Maitin-Shepard: changed mml.el +Jeremy Bertram Maitin-Shepard: changed erc.el erc-backend.el + erc-button.el mml.el Jerry Frain: changed systime.h usg5-4.h @@ -937,9 +1031,9 @@ Jerry James: changed format.el Jesper Harder: wrote yenc.el and changed gnus-art.el gnus-sum.el message.el gnus-msg.el gnus.el - gnus-group.el mm-bodies.el gnus-util.el mm-util.el mm-decode.el - rfc2047.el mml.el mml1991.el mailcap.el mm-uu.el pgg-gpg.el - gnus-srvr.el gnus-uu.el info.el nnmail.el pgg.el and 180 other files + gnus-group.el mm-bodies.el gnus-util.el mm-decode.el mm-util.el + rfc2047.el mml.el mml1991.el mailcap.el mm-uu.el pgg-gpg.el smtpmail.el + gnus-srvr.el gnus-uu.el info.el nnmail.el and 180 other files Jhair Tocancipa Triana: changed gnus-audio.el @@ -966,9 +1060,11 @@ Jirka Kosek: changed mule.el Joakim Hove: wrote html2text.el +Joakim Verona: changed nnrss.el + Joanna Pluta: changed TUTORIAL.pl -Jochen K,A|(Bpper: changed calc-units.el +Jochen K,A|(Bpper: changed calc-units.el gnus.texi Joe Buehler: changed Makefile.in cygwin.h MACHINES browse-url.el comint.el configure configure.in dired-aux.el dired.el dirtrack.el @@ -987,6 +1083,7 @@ Joe Ramey: changed filelock.c rmailsum.el Joe Reiss: changed gnus-art.el Joe Wells: wrote apropos.el mail-extr.el resume.el +and changed arc-mode.el Joel N. Weber Ii: changed comint.el make-dist @@ -994,9 +1091,11 @@ Joel Ray Holveck: changed gnus-sum.el info.el Joev Dubach: changed nntp.el -Johan Bockgard: changed cl-macs.el cl.texi - -Johan Bockg,Ae(Brd: changed cl-macs.el custom.el flyspell.el help-fns.el +Johan Bockg,Ae(Brd: changed erc.el erc-backend.el cl-macs.el erc-match.el + erc-nickserv.el erc-ring.el erc-speak.el erc-track.el align.el + calendar.el cl.texi custom.el dired-aux.el display.texi erc-bbdb.el + erc-button.el erc-compat.el erc-dcc.el erc-list.el erc-log.el + erc-nicklist.el and 9 other files Johan Vromans: wrote forms-d2.el forms.el iso-acc.el and changed complete.el @@ -1015,14 +1114,18 @@ John Heidemann: wrote mouse-copy.el mouse-drag.el zone-mode.el John Hughes: changed term.c +John Mongan: changed f90.el + John Paul Wallington: changed ibuffer.el ibuf-ext.el subr.el files.el - thumbs.el fns.c rmail.el bindings.el bytecomp.el cus-theme.el - help-fns.el info.el re-builder.el startup.el apropos.el browse-url.el - cus-start.el display.texi ebuff-menu.el emerge.el eudc.el - and 105 other files + help-fns.el thumbs.el fns.c rmail.el bindings.el bytecomp.el + cus-theme.el info.el re-builder.el startup.el xfns.c apropos.el + arc-mode.el browse-url.el comint.el cus-start.el display.texi + and 113 other files John Robinson: wrote bg-mouse.el +John Sullivan: changed window.c + John Tobey: changed gud.el John W. Eaton: wrote octave-hlp.el octave-inf.el octave-mod.el @@ -1030,13 +1133,16 @@ John W. Eaton: wrote octave-hlp.el octave-inf.el octave-mod.el John Wiegley: wrote align.el cal-bahai.el em-alias.el em-banner.el em-basic.el em-cmpl.el em-dirs.el em-glob.el em-hist.el em-ls.el em-pred.el em-prompt.el em-rebind.el em-script.el em-smart.el - em-term.el em-unix.el em-xtra.el esh-arg.el esh-cmd.el esh-ext.el - esh-io.el esh-maint.el esh-mode.el esh-module.el esh-opt.el esh-proc.el - esh-test.el esh-util.el esh-var.el eshell.el isearchb.el pcmpl-cvs.el - pcomplete.el timeclock.el -and changed iswitchb.el Makefile.in allout.el cal-menu.el calendar.el - compile.el desktop.el diary-lib.el flyspell.el holidays.el outline.el - pcmpl-gnu.el term.el + em-term.el em-unix.el em-xtra.el erc-identd.el esh-arg.el esh-cmd.el + esh-ext.el esh-io.el esh-maint.el esh-mode.el esh-module.el esh-opt.el + esh-proc.el esh-test.el esh-util.el esh-var.el eshell.el eudcb-mab.el + isearchb.el pcmpl-cvs.el pcomplete.el timeclock.el +and changed erc-chess.el erc.el iswitchb.el Makefile.in TODO allout.el + cal-menu.el calendar.el compile.el desktop.el diary-lib.el erc-bbdb.el + erc-button.el erc-complete.el erc-fill.el erc-ibuffer.el erc-list.el + erc-match.el erc-menu.el erc-nets.el erc-replace.el and 10 other files + +John Williams: changed etags.el Jon K Hellan: wrote utf7.el @@ -1054,7 +1160,12 @@ and changed testcover.el Makefile.in files.el functions.texi ses-example.ses ses.el ses.texi testcover-ses.el testcover-unsafep.el unsafep.el variables.texi -Jorgen Schaefer: changed type-break.el +Jorgen Schaefer: wrote erc-autoaway.el erc-goodies.el erc-spelling.el +and changed erc.el erc-track.el erc-backend.el erc-match.el erc-stamp.el + erc-button.el erc-fill.el erc-truncate.el erc-compat.el erc-members.el + Makefile erc-dcc.el erc-ibuffer.el erc-page.el erc-pcomplete.el + erc-sound.el erc-bbdb.el erc-imenu.el erc-lang.el erc-list.el + erc-macs.el and 8 other files Jose E. Marchesi: changed smtpmail.el @@ -1074,13 +1185,17 @@ Josh Huber: changed mml-sec.el gnus-msg.el message.el mml.el mml2015.el Joshua Varner: changed intro.texi +Jouni K Seppanen: changed nnimap.el + Juan Le,As(Bn Lahoz Garc,Am(Ba: wrote wdired.el and changed files.el perl-mode.el Juanma Barranquero: changed makefile.w32-in help-fns.el subr.el faces.el - files.el w32fns.c cperl-mode.el replace.el simple.el eval.c comint.el - sh-script.el xdisp.c allout.el idlwave.el process.c thumbs.el - vhdl-mode.el xfaces.c .cvsignore desktop.el and 539 other files + files.el w32fns.c cperl-mode.el replace.el simple.el eval.c + sh-script.el vhdl-mode.el comint.el org.el xdisp.c allout.el bs.el + desktop.el idlwave.el keyboard.c process.c and 550 other files + +Juergen Hoetzel: changed url-handlers.el Juergen Nickelsen: wrote ws-mode.el @@ -1090,15 +1205,15 @@ Junio Hamano: changed window.el Jure Cuhalev: changed ispell.el -Juri Linkov: changed info.el isearch.el compile.el replace.el simple.el - grep.el faces.el dired.el descr-text.el display.texi dired-aux.el - edebug.el lisp.el files.el help-fns.el lisp-mode.el help.el ispell.el - mule.el startup.el building.texi and 151 other files +Juri Linkov: changed info.el simple.el isearch.el replace.el compile.el + faces.el display.texi grep.el descr-text.el cus-edit.el dired.el + dired-aux.el edebug.el files.el lisp-mode.el lisp.el mule.el + compare-w.el desktop.el files.texi font-lock.el and 218 other files Justin Sheehy: changed gnus-sum.el nntp.el J,Ai(Br,At(Bme Marant: changed Makefile.in make-dist bindings.el configure - configure.in emacsclient.c + configure.in emacsclient.c misc.texi K. Shane Hartman: wrote chistory.el echistory.el electric.el emacsbug.el helper.el picture.el view.el @@ -1119,12 +1234,14 @@ and changed message.el gnus-agent.el gnus-sum.el gnus-art.el nnmail.el Kailash C. Chowksey: changed HELLO Makefile.in ind-util.el kannada.el knd-util.el loadup.el makefile.w32-in -Karl Berry: changed info.texi filelock.c copyright.el dired.c elisp.texi - texinfo.el compile.el emacs.texi fileio.c help.texi isc2-2.h sort.el - syntax.texi tex-mode.el +Karl Berry: changed info.texi emacs.texi elisp.texi emacs-xtra.texi + filelock.c copyright.el dired.c faq.texi gnu.texi help.texi msdog.texi + texinfo.el texinfo.tex ada-mode.texi autotype.texi building.texi + calc.texi cc-mode.texi cl.texi cmdargs.texi compile.el + and 37 other files -Karl Chen: changed files.el align.el gnus-art.el help-mode.el python.el - vc-svn.el +Karl Chen: changed files.el align.el cc-vars.el gnus-art.el help-mode.el + jka-cmpr-hook.el perl-mode.el python.el tex-mode.el vc-svn.el Karl Eichwalder: changed Makefile.in add-log.el bookmark.el dired-aux.el dired.el info.el menu-bar.el midnight.el po.el @@ -1148,11 +1265,10 @@ Karl Pfl,Ad(Bsterer: changed spam-stat.el Katsuhiro Hermit Endo: changed gnus-spec.el Katsumi Yamaoka: wrote canlock.el -and changed gnus-art.el message.el gnus-sum.el mm-view.el gnus-msg.el - gnus-util.el mm-decode.el gnus.el lpath.el mm-util.el gnus-agent.el - dgnushack.el gnus-group.el nntp.el gnus-start.el spam.el mml.el - nndraft.el emacs-mime.texi gnus-score.el gnus-spec.el - and 59 other files +and changed gnus-art.el message.el gnus-sum.el gnus.texi mm-decode.el + mm-view.el gnus-util.el gnus-msg.el gnus.el lpath.el mm-util.el + gnus-start.el gnus-group.el mm-uu.el dgnushack.el gnus-agent.el nntp.el + mml.el nnrss.el rfc2047.el spam.el and 68 other files Kaveh R. Ghazi: changed delta88k.h xterm.c @@ -1176,20 +1292,21 @@ Ken Brush: changed emacsclient.c Ken Laprade: changed simple.el Ken Manheimer: wrote allout.el icomplete.el +and changed pgg-gpg.el pgg.el pgg-pgp.el pgg-pgp5.el edebug.el pgg.texi -Ken Raeburn: changed lisp.h alloc.c buffer.c keyboard.c lread.c coding.c - minibuf.c Makefile.in fns.c editfns.c fileio.c keymap.c xfns.c xterm.c - charset.h fontset.c search.c undo.c window.c xdisp.c charset.c - and 83 other files +Ken Raeburn: changed lisp.h buffer.c alloc.c keyboard.c lread.c minibuf.c + coding.c Makefile.in editfns.c fileio.c fns.c keymap.c undo.c xdisp.c + xfns.c xterm.c charset.h fontset.c search.c window.c charset.c + and 84 other files Ken Stevens: wrote ispell.el Kenichi Handa: wrote cyrillic.el isearch-x.el py-punct.el pypunct-b5.el quail.el thai-word.el -and changed coding.c mule-cmds.el mule.el charset.c fns.c fileio.c - xterm.c ccl.c mule-conf.el Makefile.in fontset.c charset.h fontset.el - coding.h mule-diag.el xdisp.c editfns.c insdel.c japanese.el process.c - mule-util.el and 267 other files +and changed coding.c mule-cmds.el mule.el charset.c fileio.c xterm.c + fns.c ccl.c mule-conf.el Makefile.in fontset.c charset.h coding.h + fontset.el mule-diag.el xdisp.c editfns.c process.c insdel.c + japanese.el characters.el and 276 other files Kenneth Stailey: changed alpha.h configure.in ns32000.h openbsd.h pmax.h sparc.h unexalpha.c unexelf.c @@ -1211,46 +1328,47 @@ and changed dispnew.c addpm.c config.nt dispextern.h emacs.c facemenu.el and 16 other files Kevin Greiner: changed gnus-agent.el gnus-start.el gnus-sum.el - gnus-int.el gnus.el gnus-util.el nntp.el gnus-group.el gnus-cus.el + gnus-int.el gnus.el nntp.el gnus-util.el gnus-group.el gnus-cus.el legacy-gnus-agent.el gnus-art.el gnus-cache.el gnus-range.el gnus-srvr.el nnagent.el nnheader.el dgnushack.el gnus-async.el gnus-draft.el gnus-registry.el gnus-salt.el and 4 other files Kevin Layer: changed w32proc.c -Kevin Rodgers: changed compile.el mailabbrev.el dired-x.el ange-ftp.el - byte-opt.el desktop.el dired-x.texi ffap.el files.el isearch.el - loadhist.el mailalias.el menu-bar.el print.c replace.el sendmail.el - simple.el vc.el xfns.c +Kevin Rodgers: changed compile.el mailabbrev.el dired-x.el simple.el + ange-ftp.el byte-opt.el desktop.el dired-x.texi ffap.el files.el + flyspell.el isearch.el lisp.el loadhist.el mailalias.el menu-bar.el + print.c replace.el sendmail.el vc.el xfns.c Kevin Ryde: wrote info-xref.el -and changed info-look.el info.el gnus-art.el gnus-sum.el MORE.STUFF - cc-align.el display.texi em-alias.el em-dirs.el em-hist.el em-unix.el - emacs-lisp-intro.texi ffap.el frames.texi glossary.texi gnus.texi - makeinfo.el programs.texi simple.el streams.texi strings.texi - and 3 other files +and changed info-look.el info.el gnus-art.el gnus-sum.el mailcap.el + text.texi MORE.STUFF cc-align.el compile.texi display.texi em-alias.el + em-dirs.el em-hist.el em-unix.el emacs-lisp-intro.texi ffap.el + frames.texi glossary.texi gnus.texi makeinfo.el mule.el + and 10 other files Kim F. Storm: wrote bindat.el cua-base.el cua-gmrk.el cua-rect.el ido.el keypad.el kmacro.el -and changed xdisp.c dispextern.h simple.el process.c keyboard.c window.c - xterm.c w32term.c lisp.h macterm.c subr.el fringe.c dispnew.c xfaces.c - alloc.c fns.c xterm.h info.el display.texi msdos.c xfns.c - and 199 other files +and changed xdisp.c dispextern.h simple.el xterm.c process.c window.c + keyboard.c w32term.c subr.el fringe.c lisp.h macterm.c dispnew.c + alloc.c xfaces.c fns.c xterm.h display.texi info.el xfns.c Makefile.in + and 219 other files Kim-Minh Kaplan: changed gnus-picon.el gnus-sum.el gnus-start.el gnus-win.el gnus-xmas.el gnus.texi message.el nndraft.el nnml.el Kishore Kumar: changed terminal.el -Klaus Straubinger: changed url-http.el +Klaus Straubinger: changed url-http.el url-history.el url-cookie.el + url.el -Klaus Zeitler: changed configure.in sh-script.el vcursor.el +Klaus Zeitler: changed configure.in files.el sh-script.el vcursor.el Koaunghi Un: wrote hanja3.el and changed hanja.el hangul.el hangul3.el hanja-jis.el symbol-ksc.el -Kobayashi Yasuhiro: changed w32fns.c configure.bat w32term.c w32term.h - window.c xfns.c +Kobayashi Yasuhiro: changed w32fns.c configure.bat info.el w32term.c + w32term.h window.c xfns.c Kohtala Marko: changed info.el @@ -1263,12 +1381,12 @@ and changed battery.el ielm.el term.el Kurt Swanson: changed gnus-art.el gnus-salt.el gnus-sum.el gnus-ems.el gnus-group.el gnus-msg.el gnus-score.el gnus-util.el nnmail.el window.c -Kyle E. Jones: wrote mldrag.el - -Kyle Jones: wrote life.el +Kyle Jones: wrote life.el mldrag.el and changed saveconf.el buffer.c mail-utils.el sendmail.el -K,Ba(Broly L,Bu(Brentey: changed keyboard.c coding.c xfns.c xterm.c xterm.h +Kyotaro Horiguchi: changed coding.c indent.c + +K,Aa(Broly L$,1 q(Brentey: changed keyboard.c coding.c xfns.c xterm.c xterm.h Larry Kolodney: wrote cvtmail.c @@ -1277,10 +1395,10 @@ Lars Balker Rasmussen: changed gnus-art.el gnus-agent.el message.el Lars Brinkhoff: changed building.texi config.in configure configure.in editfns.c fns.c os.texi -Lars Hansen: changed desktop.el mh-e.el info.el dired.el rmail.el - dired-x.el dired-x.texi dired.c files.texi grp.h ls-lisp.el misc.texi - url-auth.el url-cache.el url-dired.el url-ftp.el url-irc.el url-misc.el - url-news.el url-privacy.el url-vars.el and 33 other files +Lars Hansen: changed desktop.el info.el mh-e.el dired-x.el dired-x.texi + dired.el ls-lisp.el rmail.el tramp.el dired.c files.texi grp.h + hilit-chg.el misc.texi url-auth.el url-cache.el url-dired.el url-ftp.el + url-irc.el url-misc.el url-news.el and 40 other files Lars Lindberg: wrote imenu.el msb.el and changed dabbrev.el @@ -1305,7 +1423,11 @@ and changed gnus.el gnus-msg.el gnus-score.el gnus-topic.el gnus-xmas.el Lasse Rasinen: changed gnus-start.el -Lawrence Mitchell: changed subr.el +Lawrence Mitchell: wrote erc-backend.el erc-log.el erc-nicklist.el +and changed erc.el erc-match.el erc-nets.el erc-nickserv.el erc-button.el + erc-compat.el erc-dcc.el erc-fill.el erc-list.el erc-track.el Makefile + erc-autoaway.el erc-autojoin.el erc-bbdb.el erc-ezbounce.el erc-menu.el + erc-netsplit.el erc-notify.el erc-sound.el subr.el Lawrence R. Dodd: wrote dired-x.el and changed fortran.el ispell.el sendmail.el cmuscheme.el comint.el @@ -1315,7 +1437,8 @@ and changed fortran.el ispell.el sendmail.el cmuscheme.el comint.el Leigh Stoller: changed emacsclient.c emacsserver.c server.el -Lennart Borgman: changed w32term.c w32term.h +Lennart Borgman: changed mouse.el recentf.el texinfmt.el w32term.c + w32term.h window.el Lennart Staflin: changed dired.el diary-ins.el diary-lib.el tq.el xdisp.c @@ -1325,10 +1448,10 @@ Leonard H. Tower Jr.: changed rnews.el rnewspost.el emacsbug.el Lloyd Zusman: changed mml.el Luc Teirlinck: wrote help-at-pt.el -and changed files.el autorevert.el simple.el subr.el frames.texi - display.texi files.texi dired.el Makefile.in frame.el ielm.el - startup.el variables.texi comint.el custom.el fns.c minibuf.texi - modes.texi buffer.c buffers.texi commands.texi and 187 other files +and changed files.el autorevert.el cus-edit.el subr.el simple.el + frames.texi startup.el display.texi files.texi Makefile.in dired.el + comint.el custom.texi emacs.texi fns.c frame.el ielm.el minibuf.texi + modes.texi variables.texi buffers.texi and 216 other files Lucid, Inc.: changed byte-opt.el byte-run.el bytecode.c bytecomp.el delsel.el disass.el faces.el font-lock.el lmenu.el lselect.el @@ -1338,10 +1461,14 @@ Lute Kamstra: changed modes.texi generic.el debug.el generic-x.el font-lock.el subr.el debugging.texi easy-mmode.el elisp.texi hl-line.el simple.el Makefile.in battery.el bindings.el calc.el cmdargs.texi edebug.texi emacs.texi info.el make-tarball.txt octave-inf.el - and 219 other files + and 218 other files Lynn Slater: wrote help-macro.el +L$,1 q(Brentey K,Aa(Broly: changed bindings.el xfns.c TODO buff-menu.el buffer.c + buffers.texi cmds.c editfns.c frame.el menu-bar.el print.c simple.el + xdisp.c + MCC: wrote xmenu.c and changed emacsclient.c emacsserver.c etags.c lisp.h movemail.c rmail.el rmailedit.el rmailkwd.el rmailmsc.el rmailout.el rmailsum.el @@ -1375,7 +1502,16 @@ Marcus G. Daniels: changed xterm.c configure.in lwlib-Xm.c lwlib.c Marek Martin: changed nnfolder.el -Mario Lang: changed battery.el diff.el files.el gud.el +Marien Zwart: changed python.el + +Mario Lang: wrote erc-button.el erc-ibuffer.el erc-imenu.el erc-list.el + erc-menu.el erc-netsplit.el erc-networks.el erc-notify.el + erc-speedbar.el erc-stamp.el erc-track.el erc-xdcc.el +and changed erc.el erc-dcc.el erc-speak.el Makefile erc-bbdb.el + erc-complete.el erc-pcomplete.el erc-chess.el erc-fill.el battery.el + erc-match.el TODO erc-autojoin.el erc-nets.el erc-nickserv.el + erc-ring.el diff.el erc-ezbounce.el erc-identd.el erc-lang.el + erc-log.el and 6 other files Mark A. Hershberger: changed xml.el nnrss.el cperl-mode.el mm-url.el gnus-group.el @@ -1383,7 +1519,7 @@ Mark A. Hershberger: changed xml.el nnrss.el cperl-mode.el mm-url.el Mark D. Baushke: changed mh-e.el mh-utils.el mh-mime.el mh-comp.el mh-customize.el mh-index.el mh-loaddefs.el Makefile mh-identity.el mh-seq.el mh-speed.el mh-funcs.el mh-alias.el MH-E-NEWS etags.c - mh-junk.el mh-pick.el mh-xemacs-compat.el + mh-junk.el mh-pick.el mh-tool-bar.el mh-xemacs-compat.el Mark Diekhans: changed compile.el @@ -1397,7 +1533,7 @@ Mark Neale: changed fortran.el Mark Osbourne: changed hexl-mode.el -Mark Plaksin: changed nnrss.el +Mark Plaksin: changed nnrss.el term.el Mark W Maimone: changed mpuz.el @@ -1436,14 +1572,15 @@ Martin Lorentzon: changed vc.el vc-cvs.el vc-hooks.el vc-rcs.el Martin Neitzel: changed sc.el -Martin Rudalics: changed font-lock.el +Martin Rudalics: changed cus-edit.el wid-edit.el font-lock.el syntax.c + custom.el files.el find-func.el hideif.el info.el insdel.c lisp-mode.el + midnight.el mouse.el mwheel.el re-builder.el widget.el Martin Stjernholm: wrote cc-bytecomp.el -and changed cc-engine.el cc-cmds.el cc-langs.el cc-mode.el cc-defs.el - cc-vars.el cc-align.el cc-styles.el cc-fonts.el cc-menus.el - cc-mode.texi Makefile.in cc-fix.el cc-mode-19.el ack.texi awk-mode.el - cc-guess.el cc-lobotomy.el cc-make.el cc-style.el files.el - and 3 other files +and changed cc-engine.el cc-cmds.el cc-langs.el cc-defs.el cc-mode.el + cc-vars.el cc-fonts.el cc-align.el cc-styles.el cc-menus.el cc-fix.el + cc-mode.texi Makefile.in cc-guess.el cc-mode-19.el ack.texi awk-mode.el + cc-awk.el cc-lobotomy.el cc-make.el cc-style.el and 5 other files Masahiko Sato: wrote vip.el @@ -1452,14 +1589,21 @@ Masanobu Umeda: wrote gnus-kill.el gnus-mh.el gnus-msg.el gnus.el timezone.el and changed gnuspost.el -Masatake Yamato: wrote ld-script.el -and changed etags.el xdisp.c bindings.el hexl.el asm-mode.el faces.el - pcvs.el register.el ruler-mode.el wid-edit.el buffer.c cus-face.el - display.texi gud.el help.el man.el server.el simple.el smerge-mode.el - add-log.el animate.el and 31 other files +Masatake Yamato: wrote cc-subword.el ld-script.el +and changed etags.el asm-mode.el xdisp.c bindings.el hexl.el man.el + simple.el wid-edit.el compile.el faces.el pcvs.el register.el + ruler-mode.el add-log.el buffer.c cus-face.el dired-x.el display.texi + font-lock.el gdb-ui.el gud.el and 56 other files Masayuki Ataka: changed texinfmt.el texinfo.el characters.el make-mode.el +Masayuki Fujii: changed dnd.el w32-win.el + +Mathias Dahl: wrote tumme.el +and changed dired.el dired.texi + +Mathias Megyei: changed Makefile.in + Mats Lidell: changed TUTORIAL.sv european.el Matt Hodges: changed em-pred.el icon.el paragraphs.el simple.el table.el @@ -1486,21 +1630,23 @@ Matthieu Devin: wrote delsel.el Matthieu Moy: changed message.el -Max Froumentin: changed gnus-art.el +Max Froumentin: changed gnus-art.el mml.el Michael Albinus: wrote tramp-ftp.el tramp-smb.el -and changed tramp.el tramp.texi tramp-vc.el files.el ange-ftp.el - files.texi tramp-util.el tramp-uu.el find-dired.el tramp*.el - trampver.el woman.el +and changed tramp.el tramp.texi tramp-vc.el tramp-util.el ange-ftp.el + files.el files.texi tramp-uu.el vc.el dired-x.el dired.el faq.texi + find-dired.el locate.el mini.texi tramp*.el trampver.el woman.el Michael Ben-Gershon: changed acorn.h configure.in riscix1-1.h riscix1-2.h unexec.c +Michael Cadilhac: changed blackbox.el rect.el subr.el zone.el + Michael D. Ernst: wrote reposition.el -and changed dired-x.el uniquify.el ispell.el rmail.el bibtex.el dired.el +and changed dired-x.el uniquify.el ispell.el bibtex.el rmail.el dired.el simple.el dired-aux.el gud.el rmailsum.el bytecomp.el compare-w.el fill.el shadow.el texnfo-upd.el vc.el allout.el comint.el complete.el - cust-print.el edebug.el and 23 other files + cust-print.el edebug.el and 29 other files Michael D. Prange: wrote fortran.el and changed tex-mode.el @@ -1523,9 +1669,15 @@ Michael Kifer: wrote cal-x.el ediff-diff.el ediff-help.el ediff-hook.el ediff-vers.el ediff-wind.el ediff.el viper-cmd.el viper-ex.el viper-init.el viper-keym.el viper-macs.el viper-mous.el viper-util.el viper.el -and changed ediff*.el viper*.el ediff-hooks.el ediff-merge.el menu-bar.el - appt.el desktop.el ediff-meta.el ediff-nult.el ediff.texi - viper-mouse.el viper.texi +and changed ediff-merge.el ediff*.el viper*.el ediff-hooks.el menu-bar.el + viper-utils.el appt.el desktop.el ediff-meta.el ediff-nult.el + ediff.texi viper-mouse.el viper.texi + +Michael Olson: changed erc.el erc-backend.el Makefile erc-stamp.el + erc-track.el erc-dcc.el erc-identd.el erc-match.el erc-notify.el + erc.texi erc-ibuffer.el erc-list.el FOR-RELEASE erc-autoaway.el + erc-bbdb.el erc-compat.el erc-goodies.el erc-log.el erc-nicklist.el + erc-pcomplete.el erc-spelling.el and 40 other files Michael Piotrowski: changed ps-print.el @@ -1553,6 +1705,9 @@ Michael Welsh Duggan: changed lisp.h w32term.c buffer.c gnus-spec.el Michal Jankowski: changed insdel.c keyboard.c +Micha,Ak(Bl Cadilhac: changed dispnew.c ispell.el make-mode.el print.c + process.c + Michelangelo Grigni: wrote ffap.el and changed gnus-score.el @@ -1581,16 +1736,18 @@ Mikio Nakajima: changed ring.el viper-util.el Milan Zamazal: wrote czech.el glasses.el tildify.el and changed slovak.el abbrev.el compile.el filecache.el files.el -Miles Bader: wrote button.el image-file.el macroexp.el minibuf-eldef.el - rfn-eshadow.el +Miles Bader: wrote button.el image-file.el macroexp.el mb-depth.el + minibuf-eldef.el rfn-eshadow.el and changed comint.el faces.el simple.el editfns.c xfaces.c info.el - xdisp.c minibuf.c wid-edit.el xterm.c window.el cus-edit.el - diff-mode.el subr.el dispextern.h xfns.c help.el lisp.h - quick-install-emacs textprop.c menu-bar.el and 205 other files + xdisp.c minibuf.c wid-edit.el xterm.c subr.el window.el cus-edit.el + diff-mode.el dispextern.h xfns.c help.el lisp.h quick-install-emacs + textprop.c menu-bar.el and 239 other files Miyashita Hisashi: changed ccl.c coding.c coding.h mule-cmds.el mule-conf.el mule.el pop3.el +Miyoshi Masanori: changed mouse.el xdisp.c + Morioka Tomohiko: changed rmail.el rmailout.el rmailsum.el fns.c message.el nnheader.el nnmail.el rmailkwd.el smiley.el @@ -1636,16 +1793,15 @@ Nevin Kapur: changed nnmail.el gnus-group.el gnus-sum.el gnus.el Niall Mansfield: changed etags.c Nick Roberts: wrote gdb-ui.el -and changed gud.el building.texi tooltip.el cc-mode.el subr.el - xt-mouse.el frames.texi gud-display.pbm DEBUG TODO bindings.el - byte-run.el bytecomp.el cc-vars.el cmacexp.el emacs.c gud-break.pbm - gud-break.xpm gud-cont.pbm gud-cont.xpm gud-display.xpm - and 64 other files +and changed gud.el building.texi tooltip.el speedbar.el cc-mode.el + thumbs.el DEBUG subr.el xt-mouse.el .gdbinit comint.el bindings.el + descr-text.el frames.texi gud-display.pbm speedbar.texi xdisp.c TODO + byte-run.el bytecomp.el cc-vars.el and 94 other files Nico Francois: changed w32fns.c w32inevt.c w32menu.c Noah Friedman: wrote eldoc.el rlogin.el rsz-mini.el type-break.el -and changed comint.el files.el emacs-buffer.gdb mailabbrev.el sendmail.el +and changed comint.el emacs-buffer.gdb files.el mailabbrev.el sendmail.el subr.el timer.el yow.el battery.el complete.el config.in configure.in copyright.h fns.c gnu-linux.h hpux7.h irix3-3.h lisp-mnt.el loaddefs.el mailalias.el menu-bar.el and 14 other files @@ -1654,7 +1810,8 @@ Nobuyuki Hikichi: changed news-risc.h Noel Cragg: changed mh-junk.el -Nozomu Ando: changed buffer.c sysselect.h unexmacosx.c +Nozomu Ando: changed buffer.c mips.h pmax.h smtpmail.el sysselect.h + unexelf.c unexmacosx.c Nuutti Kotivuori: changed gnus-cache.el @@ -1672,7 +1829,8 @@ Olin Shivers: wrote cmuscheme.el comint.el inf-lisp.el shell.el Olive Lin: changed tex-mode.el -Oliver Scholz: changed gamegrid.el rx.el startup.el update-game-score.c +Oliver Scholz: changed gamegrid.el nonascii.texi rx.el startup.el + update-game-score.c Oliver Seidel: wrote todo-mode.el @@ -1682,6 +1840,8 @@ Olivier Lecarme: changed make-mode.el ange-ftp.el apropos.el bibtex.el cpp.el facemenu.el forms.el hscroll.el indent.el nroff-mode.el paragraphs.el server.el sort.el +Olli Savia: changed etags.c syssignal.h + Oscar Figueiredo: wrote eudc-bob.el eudc-export.el eudc-hotlist.el eudc-vars.el eudc.el eudcb-bbdb.el eudcb-ldap.el eudcb-ph.el ldap.el and changed ph.el @@ -1694,11 +1854,13 @@ Pace Willisson: wrote ispell.el Pascal Dupuis: changed octave-inf.el +Pascal Rigaux: changed rfc2231.el + Paul D. Smith: wrote snmp-mode.el and changed imenu.el make-mode.el Paul Eggert: wrote cal-dst.el rcs2log vcdiff -and changed vc.el editfns.c Makefile.in configure.in vc-hooks.el data.c +and changed editfns.c vc.el Makefile.in configure.in vc-hooks.el data.c emacs.c gnus.el calendar.el config.in floatfns.c process.c sysdep.c dired.el xterm.c callproc.c fileio.c filelock.c lread.c print.c rmail.el and 287 other files @@ -1767,6 +1929,8 @@ Pete-Temp: changed gnus-art.el Peter Breton: wrote dirtrack.el filecache.el find-lisp.el generic-x.el generic.el locate.el net-utils.el +Peter Doornbosch: changed vc-svn.el + Peter Heslin: changed flyspell.el outline.el Peter Kleiweg: wrote ps-mode.el @@ -1777,12 +1941,13 @@ Peter Runestig: changed makefile.w32-in configure.bat dos-w32.el emacs.rc envadd.bat gmake.defs multi-install-info.bat nmake.defs w32fns.c zone-mode.el -Peter S. Galbraith: wrote mh-alias.el mh-identity.el mh-inc.el mh-init.el +Peter S. Galbraith: wrote mh-alias.el mh-identity.el mh-inc.el + mh-limit.el and changed mh-comp.el mh-e.el mh-utils.el mh-mime.el mh-customize.el - mh-seq.el Makefile mh-loaddefs.el mh-pick.el mh-xemacs-compat.el - mh-xemacs-toolbar.el README info-look.el mh-funcs.el .cvsignore - MH-E-NEWS alias.pbm alias.xpm cabinet.xpm goto-addr.el highlight.xpm - and 12 other files + mh-seq.el Makefile mh-init.el mh-loaddefs.el mh-pick.el + mh-xemacs-compat.el mh-xemacs-toolbar.el README info-look.el + mh-compat.el mh-funcs.el .cvsignore MH-E-NEWS alias.pbm alias.xpm + cabinet.xpm and 14 other files Peter Seibel: changed cl-indent.el lisp-mode.el @@ -1797,7 +1962,7 @@ Philippe Schnoebelen: wrote gomoku.el mpuz.el Philippe Waroquiers: changed etags.el -Piet Van Oostrum: changed data.c fileio.c smtpmail.el +Piet Van Oostrum: changed data.c fileio.c flyspell.el smtpmail.el Pieter E.J. Pareit: wrote mixal-mode.el @@ -1822,7 +1987,8 @@ Rajesh Vaidheeswarran: wrote whitespace.el and changed ffap.el Ralf Angeli: wrote scroll-lock.el -and changed comint.el gnus-art.el window.c +and changed comint.el flow-fill.el gnus-art.el killing.texi mm-view.el + smtpmail.el tex-mode.el window.c Ralf Fassel: changed dabbrev.el files.el fill.el iso-acc.el tar-mode.el @@ -1842,11 +2008,12 @@ Ray Blaak: wrote delphi.el Raymond Scholz: wrote deuglify.el and changed gnus-art.el gnus-msg.el gnus.texi message.el nnmail.el -Reiner Steib: changed gnus-art.el message.el gnus-sum.el gnus.el - gnus.texi gnus-msg.el gnus-score.el gnus-group.el mml.el gnus-faq.texi - gnus-start.el gnus-util.el message.texi deuglify.el gnus-agent.el - mm-decode.el nnimap.el nnmail.el nnweb.el spam-report.el spam.el - and 102 other files +Reiner Steib: wrote gmm-utils.el +and changed message.el gnus-art.el gnus.texi gnus-sum.el gnus.el + gnus-group.el mml.el gnus-faq.texi gnus-score.el gnus-start.el + gnus-util.el gnus-msg.el message.texi gnus-agent.el files.el mm-util.el + spam-report.el nnweb.el spam.el deuglify.el mm-decode.el + and 151 other files Remek Trzaska: changed gnus-ems.el @@ -1872,8 +2039,8 @@ Richard M. Stallman: wrote [The original GNU emacs and numerous files] easymenu.el font-lock.el image-mode.el menu-bar.el paren.el and changed keyboard.c files.el simple.el xterm.c xdisp.c rmail.el fileio.c process.c sysdep.c xfns.c buffer.c Makefile.in window.c - configure.in subr.el sendmail.el emacs.c dispnew.c editfns.c startup.el - info.el and 1301 other files + configure.in subr.el emacs.c sendmail.el startup.el editfns.c info.el + dispnew.c and 1319 other files Richard Mlynarik: wrote cl-indent.el ebuff-menu.el ehelp.el env.c rfc822.el terminal.el yow.el @@ -1910,6 +2077,8 @@ and changed texinfmt.el emacs.tex page-ext.el info.el loaddefs.el Roderick Schertler: changed dgux.h dgux4.h gud.el sysdep.c +Rodrigo Real: changed pt-br-refcard.tex pt-br-refcard.ps + Roger Breitenstein: changed smtpmail.el Roland B. Roberts: wrote logout.com mailemacs.com vms-pmail.el @@ -1924,14 +2093,18 @@ and changed compile.el add-log.el configure.in files.el vc.el Makefile.in menu-bar.el loaddefs.el mem-limits.h ralloc.c fileio.c data.c process.c rlogin.el rmail.el and 137 other files -Roland Winkler: changed bibtex.el +Roland Winkler: changed bibtex.el appt.el artist.el conf-mode.el + flyspell.el ispell.el make-mode.el sgml-mode.el sh-script.el + skeleton.el Rolf Ebert: wrote ada-mode.el and changed files.el find-file.el -Romain Francoise: changed gnus-fun.el ibuf-ext.el message.el FOR-RELEASE - antlr-mode.el compile.el ibuffer.el sgml-mode.el buffer.c data.c - gnus-art.el gnus-uu.el indent.c makeinfo.el python.el term.c +Romain Francoise: changed faq.texi ibuf-ext.el dired-x.el message.el + puresize.h replace.el compile.el files.texi gnus-fun.el help-fns.el + rcirc.el subr.el FOR-RELEASE Makefile.in antlr-mode.el bookmark.el + buffer.c comint.el diary-lib.el dired.el doclicense.texi + and 92 other files Roman Belenov: changed which-func.el @@ -1945,8 +2118,13 @@ Rune Kleveland: changed xfns.c Russ Allbery: changed message.el +Ryan Yeske: wrote rcirc.el +and changed ffap.el rmailsum.el + Ryszard Kubiak: changed ogonek.el +Sacha Chua: wrote erc-pcomplete.el + Saito Takuya: changed compile.el mule.el Sam Dooley: changed keyboard.c @@ -1961,18 +2139,22 @@ and changed cl-indent.el font-lock.el ange-ftp.el mouse.el tex-mode.el dired.el pcvs.el sgml-mode.el simple.el browse-url.el buff-menu.el bytecomp.el cc-mode.el compile.el etags.el and 94 other files +Sandra Jean Chua: changed erc-pcomplete.el erc.el erc-button.el + Sanghyuk Suh: changed mac-win.el macterm.c Sascha L,A|(Bdecke: wrote mml1991.el and changed gnus-win.el -Satyaki Das: wrote mh-acros.el mh-gnus.el mh-index.el mh-junk.el - mh-speed.el -and changed mh-e.el mh-utils.el mh-seq.el mh-comp.el mh-mime.el - mh-customize.el mh-loaddefs.el mh-funcs.el Makefile mh-alias.el - mh-pick.el mh-unit.el mh-make.el mh-xemacs-toolbar.el mh-identity.el - mh-init.el mh-xemacs-compat.el mh-inc.el highlight.xpm mh-func.el - mh-loadddefs.el and 6 other files +Sascha Wilde: changed pgg-gpg.el pgg.el pgg.texi + +Satyaki Das: wrote mh-acros.el mh-gnus.el mh-junk.el mh-search.el + mh-speed.el mh-thread.el mh-tool-bar.el +and changed mh-e.el mh-utils.el mh-seq.el mh-index.el mh-comp.el + mh-mime.el mh-customize.el mh-loaddefs.el mh-funcs.el Makefile + mh-alias.el mh-pick.el mh-unit.el mh-init.el mh-identity.el mh-make.el + mh-xemacs-toolbar.el mh-xemacs-compat.el mh-inc.el highlight.xpm + mh-func.el and 7 other files Schlumberger Technology Corporation: changed gud.el @@ -2022,10 +2204,10 @@ Simon Josefsson: wrote dig.el dns-mode.el flow-fill.el fringe.el imap.el sieve-manage.el sieve-mode.el sieve.el smime.el starttls.el tls.el url-imap.el and changed message.el gnus-sum.el gnus-art.el smtpmail.el pgg-gpg.el - pgg.el mml2015.el gnus-agent.el mml.el mm-decode.el mml1991.el + pgg.el gnus-agent.el mml2015.el mml.el mm-decode.el mml1991.el gnus-group.el gnus-msg.el gnus.el pgg-pgp5.el gnus-cache.el - gnus-sieve.el browse-url.el gnus-int.el mail-source.el gnus-spec.el - and 88 other files + gnus-sieve.el browse-url.el gnus-int.el mail-source.el pgg-parse.el + and 91 other files Simon Leinen: changed smtpmail.el Makefile Makefile.in cm.c cm.h hpux9.h indent.c process.c sc.texinfo sgml-mode.el term.c xfns.c xmenu.c @@ -2039,7 +2221,7 @@ and changed comint.el font-lock.el shell.el rmail.el fortran.el Skip Collins: changed w32fns.c w32term.c w32term.h -Slawomir Nowaczyk: changed TUTORIAL.pl +Slawomir Nowaczyk: changed TUTORIAL.pl flyspell.el ls-lisp.el Spencer Thomas: changed dabbrev.el emacsclient.c emacsserver.c gnus.texi server.el tcp.c unexec.c @@ -2049,10 +2231,10 @@ Stanislav Shalunov: wrote uce.el Stefan Monnier: wrote bibtex.el cvs-status.el diff-mode.el log-edit.el log-view.el pcvs-defs.el pcvs-info.el pcvs-parse.el pcvs-util.el reveal.el smerge-mode.el -and changed vc.el pcvs.el font-lock.el newcomment.el subr.el lisp.h - keyboard.c tex-mode.el keymap.c fill.el easy-mmode.el alloc.c - compile.el info.el regex.c vc-hooks.el xdisp.c syntax.c simple.el - files.el vc-cvs.el and 465 other files +and changed vc.el font-lock.el newcomment.el pcvs.el subr.el lisp.h + keyboard.c tex-mode.el keymap.c alloc.c fill.el easy-mmode.el simple.el + compile.el info.el regex.c files.el syntax.c vc-hooks.el xdisp.c + vc-cvs.el and 497 other files Stephan Stahl: changed which-func.el buff-menu.el buffer.c dired-x.texi ediff-mult.el @@ -2066,10 +2248,10 @@ and changed diary-lib.el locate.el octave-inf.el replace.el hexl.el bib-mode.el bruce.el c-mode.el ccl.el and 71 other files Stephen Gildea: wrote mh-funcs.el mh-pick.el refcard.tex -and changed time-stamp.el mh-e.el mh-utils.el mh-comp.el files.el - fortran.el mh-customize.el mh-e.texi mh-mime.el mwheel.el tex-mode.el +and changed time-stamp.el mh-e.el mh-utils.el mh-comp.el mh-customize.el + files.el fortran.el mh-e.texi mh-mime.el mwheel.el tex-mode.el -Stephen J. Turnbull: changed strings.texi subr.el +Stephen J. Turnbull: changed ediff-init.el strings.texi subr.el Steve Fisk: wrote cal-tex.el @@ -2080,8 +2262,10 @@ Steve Strassman: wrote spook.el Steve Youngs: changed mh-utils.el mh-xemacs-compat.el dgnushack.el mh-customize.el mh-e.el mh-comp.el mh-mime.el Makefile gnus-xmas.el Makefile.in browse-url.el dns.el gnus-art.el gnus-sum.el gnus-util.el - lpath.el mh-seq.el .cvsignore em-unix.el gnus-async.el gnus.el - and 16 other files + lpath.el mh-seq.el .cvsignore em-unix.el gnus-async.el mail-source.el + and 15 other files + +Steven Huwig: changed emacs.py python.el Steven L. Baur: wrote earcon.el footnote.el gnus-audio.el gnus-setup.el and changed gnus-xmas.el gnus-msg.el add-log.el dgnushack.el edebug.el @@ -2090,22 +2274,28 @@ and changed gnus-xmas.el gnus-msg.el add-log.el dgnushack.el edebug.el Steven Suhr: changed dispnew.c scroll.c term.c termchar.h -Steven Tamm: changed macterm.c make-package mac.c macfns.c unexmacosx.c - INSTALL configure.in mac-win.el Makefile.in README configure darwin.h +Steven Tamm: changed macterm.c make-package mac.c macfns.c configure.in + unexmacosx.c INSTALL configure mac-win.el Makefile.in README darwin.h editfns.c lread.c macmenu.c scroll-bar.el MACHINES config.h config.in dispnew.c eval.c and 8 other files Stewart M. Clamen: wrote cal-mayan.el +Stuart Herring: changed isearch.el align.el allout.el comint.el edebug.el + files.el + Sudish Joseph: changed mac-win.el Sun Microsystems, Inc: wrote emacs.icon emacstool.1 emacstool.c sun-curs.el sun-fns.el sun-mouse.el sun.el sunfns.c and changed emacsclient.c emacsserver.c server.el +Sun Yijiang: changed TUTORIAL.cn + Sundar Narasimhan: changed rnews.el rnewspost.el -Sven Joachim: changed sed3v2.inp +Sven Joachim: changed arc-mode.el de-refcard.tex files.el files.texi + help.el sed3v2.inp sh-script.el Svend Tollak Munkejord: changed deuglify.el @@ -2132,8 +2322,8 @@ Ted Lemon: changed emacs.c lastfile.c puresize.h Teodor Zlatanov: wrote gnus-registry.el spam-report.el and changed spam.el gnus.el gnus-sum.el nnmail.el spam-stat.el gnus-start.el gnus.texi gnus-group.el lpath.el nnbabyl.el nnfolder.el - nnimap.el nnmbox.el nnmh.el nnml.el replace.el simple.el building.texi - compile.el dig.el gnus-draft.el and 4 other files + nnimap.el nnmbox.el nnmh.el nnml.el replace.el simple.el basic.texi + building.texi commands.texi compile.el and 9 other files Terje Rosten: changed xfns.c version.el xterm.c xterm.h @@ -2144,10 +2334,10 @@ Terry Jones: wrote shadow.el Theodore Jump: changed w32-win.el w32faces.c Thien-Thi Nguyen: wrote hideshow.el make-mms-derivative.el -and changed info.el zone.el Makefile.in fileio.c scheme.el dcl-mode.el - lisp-mode.el sysdep.c vc.el TUTORIAL.it TUTORIAL.ja diary-lib.el - dired.el ebuff-menu.el emacs.c floatfns.c frames.texi grep.el - help-fns.el make-docfile.c modes.texi and 103 other files +and changed ewoc.el info.el processes.texi zone.el Makefile.in fileio.c + scheme.el vc.el dcl-mode.el display.texi lisp-mode.el pcvs.el sysdep.c + MORE.STUFF TUTORIAL.it TUTORIAL.ja bindat.el diary-lib.el diff-mode.el + dired.el ebuff-menu.el and 114 other files Thierry Emery: changed kinsoku.el timezone.el url-http.el wid-edit.el @@ -2173,10 +2363,14 @@ Thor Kristoffersen: changed nntp.el Thorsten Ohl: changed lread.c next.h +Tijs Van Bakel: changed erc.el + Tim Fleehart: wrote makefile.nt Tim Van Holder: changed Makefile.in compile.el configure.in which-func.el +Tobias C. Rittweiler: changed font-lock.el + Toby Allsopp: changed eudc.el Toby Speight: changed window.el @@ -2209,6 +2403,8 @@ Torbj,Av(Brn Axelsson: changed options.el Torbj,Av(Brn Einarsson: wrote f90.el +Torsten Bronger: changed latin-ltx.el + Toru Tomabechi: wrote tibet-util.el tibetan.el Toshiaki Nomura: changed uxpds.h @@ -2224,14 +2420,14 @@ Tsuchiya Masatoshi: changed gnus-art.el nneething.el mm-view.el lpath.el nndiary.el nnfolder.el nnimap.el nnmaildir.el pgg.el rfc2047.el -Tsugutomo Enami: changed nnheader.el regex.c regex.h +Tsugutomo Enami: changed nnheader.el regex.c regex.h simple.el Tsuyoshi Akiho: changed gnus-sum.el nnrss.el Tudor Hulubei: changed iso-acc.el latin-pre.el -Ulf Jasper: wrote icalendar.el -and changed calendar.texi +Ulf Jasper: wrote icalendar.el newsticker.el +and changed calendar.texi newsticker.texi Makefile.in Ulrich Leodolter: changed w32proc.c @@ -2262,6 +2458,8 @@ Vinicius Jose Latorre: wrote delim-col.el ebnf-abn.el ebnf-bnf.el and changed ps-print.el ps-prin1.ps ps-prin0.ps ps-prin3.ps ps-bdf.el ps-prin2.ps lpr.el subr.el ps-print-def.el ps-print0.ps ps-vars.el +Vivek Dasmohapatra: changed emacs.c sh-script.el xterm.c xterm.h + Vladimir Alexiev: changed arc-mode.el nnvirtual.el tmm.el Walter C. Pelissero: changed browse-url.el url-methods.el @@ -2274,7 +2472,7 @@ Werner Lemberg: wrote sisheng.el vntelex.el and changed Makefile.in TUTORIAL.de calc.texi chinese.el czech.el european.el idlwave.el reftex-vars.el reftex.el reftex.texi slovak.el supercite.el .cvsignore advice.el calc-forms.el calc-sel.el calendar.el - china-util.el cl-macs.el cl.texi complete.el and 42 other files + china-util.el cl-macs.el cl.texi complete.el and 43 other files Wes Hardaker: changed gnus-score.el gnus-art.el gnus-sum.el gnus-win.el @@ -2284,12 +2482,13 @@ William F. Mann: wrote perl-mode.el William F. Schelter: wrote telnet.el -William M. Perry: wrote mailcap.el -and changed url-http.el url-dav.el url-handlers.el url.el url-file.el - url-util.el url-methods.el url-vars.el url-https.el aclocal.m4 - mule-sysdp.el url-imap.el url-news.el url-nfs.el configure.in image.el - mwheel.el url-about.el url-auth.el url-cid.el url-dired.el - and 12 other files +William M. Perry: wrote mailcap.el url-dav.el url-gw.el url-http.el + url-util.el url.el vc-dav.el +and changed url-handlers.el url-file.el url-methods.el url-vars.el + url-https.el aclocal.m4 mule-sysdp.el url-imap.el url-news.el + url-nfs.el configure.in image.el mwheel.el url-about.el url-auth.el + url-cid.el url-dired.el url-expand.el url-ftp.el url-history.el + url-irc.el and 6 other files William Sommerfeld: wrote emacsclient.c emacsserver.c scribe.el server.el @@ -2311,16 +2510,18 @@ and changed process.c alloc.c callint.c config.h.in config.in Wolfgang Scherer: changed vc-cvs.el +Wolfram Fenske: changed nnimap.el + Wolfram Gloger: changed emacs.c -Xavier Maillard: changed gnus-faq.texi +Xavier Maillard: changed gnus-faq.texi gnus-score.el -Yagi Tatsuya: changed gnus-start.el +Yagi Tatsuya: changed gnus-art.el gnus-start.el Yamamoto Mitsuharu: changed macterm.c macfns.c mac-win.el mac.c macterm.h - macgui.h macmenu.c image.c keyboard.c emacs.c makefile.MPW xfaces.c - config.h darwin.h macselect.c xdisp.c Info.plist Makefile.in - dispextern.h make-docfile.c s-mac.h and 29 other files + macgui.h image.c macmenu.c macselect.c keyboard.c xdisp.c makefile.MPW + emacs.c xfaces.c config.h darwin.h macos.texi Makefile.in dispextern.h + w32term.c Info.plist and 55 other files Yann Dirson: changed imenu.el @@ -2332,7 +2533,7 @@ Yutaka Niibe: changed indent.c xdisp.c configure.in Makefile.in dispnew.c sysdep.c config.in dired.el emacs.c fill.el fns.c gmalloc.c gnu-linux.h indent.h process.c simple.el term.c window.c -Zhang Wei: changed x-win.el +Zhang Wei: changed xfns.c erc.el x-win.el Zoltan Kemenczy: changed gud.el diff --git a/ChangeLog b/ChangeLog index e2f103f8169..a7b95ad43bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2006-06-05 Kim F. Storm <storm@cua.dk> + + * AUTHORS: Regenerate. + +2006-05-18 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> + + * configure.in: Add check for ALSA. + * configure: Regenerate. + 2006-05-06 Eli Zaretskii <eliz@gnu.org> * Makefile.in (INFO_FILES): Remove emacs-xtra. @@ -6,8 +15,8 @@ 2006-04-20 Ramprasad B <ramprasad_i82@yahoo.com> - * Copyright (sources/emacs): updated copyright year(s) - + * Copyright (sources/emacs): Update copyright year(s). + 2006-04-01 Eli Zaretskii <eliz@gnu.org> * configure: Regenerated. @@ -19,9 +28,8 @@ 2006-04-01 Christoph Bauer <Christoph.Bauer@lms-gmbh.de> (tiny change) - * configure.in (hppa*-hp-hpux1[1-9]*): Add - -D_INCLUDE__STDC_A1_SOURCE to CFLAGS. Update Copyright years - written to src/config.in. + * configure.in (hppa*-hp-hpux1[1-9]*): Add -D_INCLUDE__STDC_A1_SOURCE + to CFLAGS. Update Copyright years written to src/config.in. 2006-03-18 Claudio Fontana <claudio@gnu.org> diff --git a/admin/ChangeLog b/admin/ChangeLog index 08bef4585a7..ac84b259f93 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,19 @@ +2006-06-07 Reiner Steib <Reiner.Steib@gmx.de> + + * FOR-RELEASE: Update refcard section. + +2006-05-25 Chong Yidong <cyd@stupidchicken.com> + + * FOR-RELEASE: Key sequence elisp node done. + +2006-05-24 Reiner Steib <Reiner.Steib@gmx.de> + + * FOR-RELEASE: Update refcard translations. Add coding cookie. + +2006-05-21 Chong Yidong <cyd@mit.edu> + + * FOR-RELEASE: point-entered /point-left bug fixed. + 2006-05-12 Eli Zaretskii <eliz@gnu.org> * FOR-RELEASE: Spell-checking the manuals is now done; remove the @@ -11,7 +27,7 @@ 2006-04-17 Ramprasad B <ramprasad_i82@yahoo.com> * ./* (Copyright): Updated Copyright year(s) - + 2006-02-24 Reiner Steib <Reiner.Steib@gmx.de> * FOR-RELEASE (BUGS): Add URLs/MIDs. diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE index 5d634762d9d..fb9ff705b05 100644 --- a/admin/FOR-RELEASE +++ b/admin/FOR-RELEASE @@ -21,6 +21,19 @@ face name prefixes should be in it for good results. ** Ask maintainers of refcard translations to update them. +Requests to have been sent out on 2006-05-23 (Reiner Steib). + +LANG Translator Status +cs Pavel JanÃk No response +de Sven Joachim Done +fr Eric Jacoboni No response +pl WÅ‚odek Bzyl No response +pt-br Rodrigo Real Done +ru Alex Ott Working +sk Miroslav VaÅ¡ko No response + +If there's no update for a translation on 2006-06-07, notify RMS. + ** Send an email to the various distributions, including the GNOME and KDE projects, to use the new Emacs icons in etc/images/icons. @@ -32,9 +45,6 @@ reliable decoding regardless of user options. ** JD Smith's 17 Apr 2006 bug report that CVS operations get mysterious unreproducible failures. -** David Hansen's bug report on 16 Apr 2006 about point-entered and -point-left text properties. - ** Is there a basic problem with cl-byte-compile-compiler-macro? ** Markus Gritsch's report about Emacs looping on Windoze with the following @@ -63,9 +73,6 @@ It seems that to fix this, w32 server sockets must use WSAAsyncSelect * DOCUMENTATION -** Add a node to the Lisp manual describing key sequences from the -Lisp point of view. - ** Check man/info.texi. ** Check the Emacs Lisp manual. @@ -142,7 +149,7 @@ SECTION READERS etc/TUTORIAL rms etc/TUTORIAL.bg Ognyan Kulev <ogi@fmi.uni-sofia.bg> etc/TUTORIAL.cn -etc/TUTORIAL.cs Pavel Janík <Pavel@Janik.cz> +etc/TUTORIAL.cs Pavel JanÃk <Pavel@Janik.cz> etc/TUTORIAL.de Werner LEMBERG <wl@gnu.org> etc/TUTORIAL.es Marcelo Toledo etc/TUTORIAL.fr ttn @@ -154,7 +161,7 @@ etc/TUTORIAL.pl Slawomir Nowaczyk <slawek@cs.lth.se> etc/TUTORIAL.pt_BR Marcelo Toledo etc/TUTORIAL.ro etc/TUTORIAL.ru Alex Ott <alexott@gmail.com> -etc/TUTORIAL.sk Pavel Janík <Pavel@Janik.cz> +etc/TUTORIAL.sk Pavel JanÃk <Pavel@Janik.cz> etc/TUTORIAL.sl Primoz PETERLIN <primoz.peterlin@biofiz.mf.uni-lj.si> etc/TUTORIAL.sv Mats Lidell <matsl@contactor.se> etc/TUTORIAL.th Virach Sornlertlamvanich <virach@tcllab.org> @@ -163,4 +170,5 @@ etc/TUTORIAL.zh Local variables: mode: outline +coding: utf-8 end: diff --git a/configure b/configure index 6969f29fed4..c84eb76bdd5 100755 --- a/configure +++ b/configure @@ -310,7 +310,7 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP LN_S INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB INSTALL_INFO GZIP_PROG LIBSOUND SET_MAKE PKG_CONFIG GTK_CFLAGS GTK_LIBS XFT_CFLAGS XFT_LIBS FREETYPE_CFLAGS FREETYPE_LIBS FONTCONFIG_CFLAGS FONTCONFIG_LIBS HAVE_LIBOTF LIBOTF_CFLAGS LIBOTF_LIBS ALLOCA liblockfile LIBOBJS NEED_SETGID KMEM_GROUP GETLOADAVG_LIBS GETOPT_H GETOPTOBJS version configuration canonical srcdir lispdir locallisppath lisppath x_default_search_path etcdir archlibdir docdir bitmapdir gamedir gameuser c_switch_system c_switch_machine LD_SWITCH_X_SITE LD_SWITCH_X_SITE_AUX C_SWITCH_X_SITE X_TOOLKIT_TYPE machfile opsysfile carbon_appdir LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP LN_S INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB INSTALL_INFO GZIP_PROG LIBSOUND PKG_CONFIG ALSA_CFLAGS ALSA_LIBS CFLAGS_SOUND SET_MAKE GTK_CFLAGS GTK_LIBS XFT_CFLAGS XFT_LIBS FREETYPE_CFLAGS FREETYPE_LIBS FONTCONFIG_CFLAGS FONTCONFIG_LIBS HAVE_LIBOTF LIBOTF_CFLAGS LIBOTF_LIBS ALLOCA liblockfile LIBOBJS NEED_SETGID KMEM_GROUP GETLOADAVG_LIBS GETOPT_H GETOPTOBJS version configuration canonical srcdir lispdir locallisppath lisppath x_default_search_path etcdir archlibdir docdir bitmapdir gamedir gameuser c_switch_system c_switch_machine LD_SWITCH_X_SITE LD_SWITCH_X_SITE_AUX C_SWITCH_X_SITE X_TOOLKIT_TYPE machfile opsysfile carbon_appdir LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -5188,6 +5188,10 @@ rm -f conftest* fi + + + + if test "${with_sound}" != "no"; then # Sound support for GNU/Linux and the free BSDs. echo "$as_me:$LINENO: checking for ANSI C header files" >&5 @@ -5652,6 +5656,117 @@ else fi + + ALSA_REQUIRED=1.0.0 + ALSA_MODULES="alsa >= $ALSA_REQUIRED" + if test "X${with_pkg_config_prog}" != X; then + PKG_CONFIG="${with_pkg_config_prog}" + fi + + succeeded=no + + if test -z "$PKG_CONFIG"; then + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG + +if test -n "$PKG_CONFIG"; then + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + fi + + if test "$PKG_CONFIG" = "no" ; then + HAVE_ALSA=no + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo "$as_me:$LINENO: checking for $ALSA_MODULES" >&5 +echo $ECHO_N "checking for $ALSA_MODULES... $ECHO_C" >&6 + + if $PKG_CONFIG --exists "$ALSA_MODULES" ; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + succeeded=yes + + echo "$as_me:$LINENO: checking ALSA_CFLAGS" >&5 +echo $ECHO_N "checking ALSA_CFLAGS... $ECHO_C" >&6 + ALSA_CFLAGS=`$PKG_CONFIG --cflags "$ALSA_MODULES"` + echo "$as_me:$LINENO: result: $ALSA_CFLAGS" >&5 +echo "${ECHO_T}$ALSA_CFLAGS" >&6 + + echo "$as_me:$LINENO: checking ALSA_LIBS" >&5 +echo $ECHO_N "checking ALSA_LIBS... $ECHO_C" >&6 + ALSA_LIBS=`$PKG_CONFIG --libs "$ALSA_MODULES"` + echo "$as_me:$LINENO: result: $ALSA_LIBS" >&5 +echo "${ECHO_T}$ALSA_LIBS" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + ALSA_CFLAGS="" + ALSA_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + ALSA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$ALSA_MODULES"` + + fi + + + + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + HAVE_ALSA=yes + else + HAVE_ALSA=no + fi + + if test $HAVE_ALSA = yes; then + LIBSOUND="$LIBSOUND $ALSA_LIBS" + CFLAGS_SOUND="$CFLAGS_SOUND $ALSA_CFLAGS" + +cat >>confdefs.h <<\_ACEOF +#define HAVE_ALSA 1 +_ACEOF + + fi + fi @@ -10218,8 +10333,6 @@ echo "${ECHO_T}before 5" >&6 fi fi - - HAVE_GTK=no if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk"; then if test "$USE_X_TOOLKIT" != "none" && test "$USE_X_TOOLKIT" != "maybe"; then @@ -10281,10 +10394,11 @@ fi fi if test "$PKG_CONFIG" = "no" ; then - echo "*** The pkg-config script could not be found. Make sure it is" - echo "*** in your path, or give the full path to pkg-config with" - echo "*** the PKG_CONFIG environment variable or --with-pkg-config-prog." - echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + { { echo "$as_me:$LINENO: error: + *** The pkg-config script could not be found. Make sure it is in your path, or give the full path to pkg-config with the PKG_CONFIG environment variable or --with-pkg-config-prog. Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." >&5 +echo "$as_me: error: + *** The pkg-config script could not be found. Make sure it is in your path, or give the full path to pkg-config with the PKG_CONFIG environment variable or --with-pkg-config-prog. Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." >&2;} + { (exit 1); exit 1; }; } else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then @@ -10308,6 +10422,8 @@ echo $ECHO_N "checking GTK_LIBS... $ECHO_C" >&6 echo "$as_me:$LINENO: result: $GTK_LIBS" >&5 echo "${ECHO_T}$GTK_LIBS" >&6 else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 GTK_CFLAGS="" GTK_LIBS="" ## If we have a custom action on failure, don't print errors, but @@ -24295,8 +24411,11 @@ s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t s,@INSTALL_INFO@,$INSTALL_INFO,;t t s,@GZIP_PROG@,$GZIP_PROG,;t t s,@LIBSOUND@,$LIBSOUND,;t t -s,@SET_MAKE@,$SET_MAKE,;t t s,@PKG_CONFIG@,$PKG_CONFIG,;t t +s,@ALSA_CFLAGS@,$ALSA_CFLAGS,;t t +s,@ALSA_LIBS@,$ALSA_LIBS,;t t +s,@CFLAGS_SOUND@,$CFLAGS_SOUND,;t t +s,@SET_MAKE@,$SET_MAKE,;t t s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t s,@GTK_LIBS@,$GTK_LIBS,;t t s,@XFT_CFLAGS@,$XFT_CFLAGS,;t t diff --git a/configure.in b/configure.in index 041bba9c1a1..dc7111f6bde 100644 --- a/configure.in +++ b/configure.in @@ -1489,12 +1489,83 @@ AC_CONFIG_LIBOBJ_DIR(src) dnl Do this early because it can frob feature test macros for Unix-98 &c. AC_SYS_LARGEFILE + +dnl This function defintion taken from Gnome 2.0 +dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) +dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page +dnl also defines GSTUFF_PKG_ERRORS on error +AC_DEFUN([PKG_CHECK_MODULES], [ + succeeded=no + + if test -z "$PKG_CONFIG"; then + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + fi + + if test "$PKG_CONFIG" = "no" ; then + ifelse([$4], , [AC_MSG_ERROR([ + *** The pkg-config script could not be found. Make sure it is in your path, or give the full path to pkg-config with the PKG_CONFIG environment variable or --with-pkg-config-prog. Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config.])], [$4]) + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + AC_MSG_CHECKING(for $2) + + if $PKG_CONFIG --exists "$2" ; then + AC_MSG_RESULT(yes) + succeeded=yes + + AC_MSG_CHECKING($1_CFLAGS) + $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` + AC_MSG_RESULT($$1_CFLAGS) + + AC_MSG_CHECKING($1_LIBS) + $1_LIBS=`$PKG_CONFIG --libs "$2"` + AC_MSG_RESULT($$1_LIBS) + else + AC_MSG_RESULT(no) + $1_CFLAGS="" + $1_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + ifelse([$4], ,echo $$1_PKG_ERRORS,) + fi + + AC_SUBST($1_CFLAGS) + AC_SUBST($1_LIBS) + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + ifelse([$3], , :, [$3]) + else + ifelse([$4], , [AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.])], [$4]) + fi +]) + + if test "${with_sound}" != "no"; then # Sound support for GNU/Linux and the free BSDs. AC_CHECK_HEADERS(machine/soundcard.h sys/soundcard.h soundcard.h) # Emulation library used on NetBSD. AC_CHECK_LIB(ossaudio, _oss_ioctl, LIBSOUND=-lossaudio, LIBSOUND=) AC_SUBST(LIBSOUND) + + ALSA_REQUIRED=1.0.0 + ALSA_MODULES="alsa >= $ALSA_REQUIRED" + dnl Check if --with-pkg-config-prog has been given. + if test "X${with_pkg_config_prog}" != X; then + PKG_CONFIG="${with_pkg_config_prog}" + fi + PKG_CHECK_MODULES(ALSA, $ALSA_MODULES, HAVE_ALSA=yes, HAVE_ALSA=no) + if test $HAVE_ALSA = yes; then + LIBSOUND="$LIBSOUND $ALSA_LIBS" + CFLAGS_SOUND="$CFLAGS_SOUND $ALSA_CFLAGS" + AC_DEFINE(HAVE_ALSA, 1, [Define to 1 if ALSA is available.]) + fi + AC_SUBST(CFLAGS_SOUND) fi dnl checks for header files @@ -1952,62 +2023,6 @@ fail; fi fi -dnl This function defintion taken from Gnome 2.0 -dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) -dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page -dnl also defines GSTUFF_PKG_ERRORS on error -AC_DEFUN([PKG_CHECK_MODULES], [ - succeeded=no - - if test -z "$PKG_CONFIG"; then - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - fi - - if test "$PKG_CONFIG" = "no" ; then - echo "*** The pkg-config script could not be found. Make sure it is" - echo "*** in your path, or give the full path to pkg-config with" - echo "*** the PKG_CONFIG environment variable or --with-pkg-config-prog." - echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." - else - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - AC_MSG_CHECKING(for $2) - - if $PKG_CONFIG --exists "$2" ; then - AC_MSG_RESULT(yes) - succeeded=yes - - AC_MSG_CHECKING($1_CFLAGS) - $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` - AC_MSG_RESULT($$1_CFLAGS) - - AC_MSG_CHECKING($1_LIBS) - $1_LIBS=`$PKG_CONFIG --libs "$2"` - AC_MSG_RESULT($$1_LIBS) - else - $1_CFLAGS="" - $1_LIBS="" - ## If we have a custom action on failure, don't print errors, but - ## do set a variable so people can do so. - $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` - ifelse([$4], ,echo $$1_PKG_ERRORS,) - fi - - AC_SUBST($1_CFLAGS) - AC_SUBST($1_LIBS) - else - echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." - echo "*** See http://www.freedesktop.org/software/pkgconfig" - fi - fi - - if test $succeeded = yes; then - ifelse([$3], , :, [$3]) - else - ifelse([$4], , [AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.])], [$4]) - fi -]) - HAVE_GTK=no if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk"; then if test "$USE_X_TOOLKIT" != "none" && test "$USE_X_TOOLKIT" != "maybe"; then @@ -3010,6 +3025,9 @@ AH_BOTTOM([ #ifdef HAVE_SOUNDCARD_H #define HAVE_SOUND 1 #endif +#ifdef HAVE_ALSA +#define HAVE_SOUND 1 +#endif #endif /* __FreeBSD__ || __NetBSD__ || __linux__ */ /* If using GNU, then support inline function declarations. */ diff --git a/etc/ChangeLog b/etc/ChangeLog index 8d911dcb578..5532a00c1bb 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,113 @@ +2006-06-07 Kenichi Handa <handa@m17n.org> + + * NEWS: Mention how to disable character translation for a file. + +2006-06-04 Sven Joachim <svenjoac@gmx.de> + + * de-refcard.tex: Update for Emacs 22: Use German quotes + and umlauts; fix overfull /hboxes; many rewordings. + +2006-06-04 Kim F. Storm <storm@cua.dk> + + * NEWS: Move news for pre-22 versions into... + * NEWS.21, NEWS.20: ... new files for Emacs 21 and Emacs 20 news. + * ONEWS, ONEWS.1, ONEWS.2, ONEWS.3, ONEWS.4: Remove (rename) files ... + * NEWS.19, NEWS.18, NEWS.1-17: ... and organize news about older Emacs + versions in separte files. Update copyright notices. + +2006-06-03 Eli Zaretskii <eliz@gnu.org> + + * LPF, LEDIT: Remove files. + + * FTP, README, HELLO, MACHINES, MAILINGLISTS, MORE.STUFF, ETAGS.EBNF: + * MOTIVATION, ORDERS, SERVICE, TERMS, TODO: + * enriched.doc, ulimit.hack, ses-example.ses, ms-7bkermit, emacs.csh: + * Xkeymap.txt, compilation.txt, grep.txt: + Add copyright notice and copying permissions. + +2006-05-31 David Ponce <david@dponce.com> + + * tree-widget/default/close.png, tree-widget/default/close.xpm: + * tree-widget/default/empty.png, tree-widget/default/empty.xpm: + * tree-widget/default/end-guide.png, tree-widget/default/end-guide.xpm: + * tree-widget/default/guide.png, tree-widget/default/guide.xpm: + * tree-widget/default/handle.png, tree-widget/default/handle.xpm: + * tree-widget/default/leaf.png, tree-widget/default/leaf.xpm: + * tree-widget/default/no-guide.png, tree-widget/default/no-guide.xpm: + * tree-widget/default/no-handle.png, tree-widget/default/no-handle.xpm: + * tree-widget/default/open.png, tree-widget/default/open.xpm: + * tree-widget/folder/close.png, tree-widget/folder/close.xpm: + * tree-widget/folder/empty.png, tree-widget/folder/empty.xpm: + * tree-widget/folder/end-guide.png, tree-widget/folder/end-guide.xpm: + * tree-widget/folder/guide.png, tree-widget/folder/guide.xpm: + * tree-widget/folder/handle.png, tree-widget/folder/handle.xpm: + * tree-widget/folder/leaf.png, tree-widget/folder/leaf.xpm: + * tree-widget/folder/no-guide.png, tree-widget/folder/no-guide.xpm: + * tree-widget/folder/no-handle.png, tree-widget/folder/no-handle.xpm: + * tree-widget/folder/open.png, tree-widget/folder/open.xpm: + Reduce the size of images. + +2006-05-29 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> + + * NEWS: Mention F10 for Gtk+/Leddtif/Lucid menus. + +2006-05-26 Eli Zaretskii <eliz@gnu.org> + + * ledit.l: Remove file. + +2006-05-26 Kenichi Handa <handa@m17n.org> + + * NEWS (find-operation-coding-system): Mention the new argument + format. + +2006-05-24 Carsten Dominik <dominik@science.uva.nl> + + * orgcard.tex: (section{Motion}): Added the item navigation + commands. + (section{Publishing}): New section. + (section{Links}): Documented elisp and shell links. + +2006-05-20 Rodrigo Real <rreal@ucpel.tche.br> + + * pt-br-refcard.tex: Update. + +2006-05-23 Reiner Steib <Reiner.Steib@gmx.de> + + * pl-refcard.tex (Local variables): Add compile-command. + + * ru-refcard.tex (Local variables): Add compile-command and + coding. + + * pt-br-refcard.tex: Don't \input psfig. + + * refcard.tex (section{Info}): Add `i'. Use `s' instead of `M-s'. + + * de-refcard.tex (section{Info}): Ditto. + + * fr-refcard.tex (section{Info}): Ditto. Translation suggested by + Stefan Monnier <monnier@iro.umontreal.ca>. + + * pl-refcard.tex (section{Info}): Ditto. Translation suggested by + Slawomir Nowaczyk <slawomir.nowaczyk.847@student.lu.se>. + + * cs-refcard.tex (section{Info}): Use `s' instead of `M-s'. Entry + for `i' is not translated yet. + + * pt-br-refcard.tex (section{Info}): Ditto. + + * ru-refcard.tex (section{Info}): Ditto. + + * sk-refcard.tex (section{Info}): Ditto. + +2006-05-22 Reiner Steib <Reiner.Steib@gmx.de> + + * MORE.STUFF: Update AUCTeX entry. + +2006-05-20 Rodrigo Real <rreal@ucpel.tche.br> + + * pt-br-refcard.tex: + * pt-br-refcard.ps: New files. + 2006-05-15 Reiner Steib <Reiner.Steib@gmx.de> * sk-refcard.tex: Add coding cookie. @@ -44,8 +154,8 @@ 2006-04-18 Reiner Steib <Reiner.Steib@gmx.de> - * gnus-refcard.tex: Bump version to 5.11. Remove duplicate - \def's. Update date. + * gnus-refcard.tex: Bump version to 5.11. Remove duplicate \def's. + Update date. 2006-04-18 Bill Wohler <wohler@newt.com> @@ -82,8 +192,7 @@ * images/README: Update with following information. * images/data-save.xpm, images/mail/flag-for-followup.xpm: - * images/zoom-in.xpm, images/zoom-out.xpm: New images from GNOME - 2.12. + * images/zoom-in.xpm, images/zoom-out.xpm: New images from GNOME 2.12. * images/contact.pbm, images/data-save.pbm, images/delete.pbm: * images/mail/flag-for-followup.pbm, images/mail/inbox.pbm: @@ -115,8 +224,7 @@ * images/mail/alias.xpm, images/mail/refile.pbm: * images/mail/refile.xpm, images/page-down.pbm: * images/page-down.xpm, images/widen.pbm, images/widen.xpm: Remove - custom MH-E icons since MH-E is now using the equivalent GTK/GNOME - icons. + custom MH-E icons -- MH-E is now using the equivalent GTK/GNOME icons. 2006-03-23 Romain Francoise <romain@orebokech.com> @@ -147,8 +255,7 @@ * images/mail/save.xpm, images/mail/send.xpm: * images/mail/spam.xpm, images/next-page.xpm: * images/refresh.xpm, images/separator.xpm: - * images/sort-ascending.xpm: - * images/sort-column-ascending.xpm: + * images/sort-ascending.xpm, images/sort-column-ascending.xpm: * images/sort-criteria.xpm, images/sort-descending.xpm: * images/sort-row-ascending.xpm: New icons, copied from Gnus trunk (originally from Gnome 2.6). @@ -637,21 +744,10 @@ Update FSF's address in GPL notices. - * INTERVIEW: - * calccard.tex: - * cs-dired-ref.tex: - * cs-refcard.tex: - * dired-ref.tex: - * fr-drdref.tex: - * fr-refcard.tex: - * gfdl.1: - * pl-refcard.tex: - * refcard.tex: - * ru-refcard.tex: - * sk-dired-ref.tex: - * sk-refcard.tex: - * vipcard.tex: - * viperCard.tex: Update FSF's address. + * INTERVIEW, calccard.tex, cs-dired-ref.tex, cs-refcard.tex: + * dired-ref.tex, fr-drdref.tex, fr-refcard.tex, gfdl.1: + * pl-refcard.tex, refcard.tex, ru-refcard.tex, sk-dired-ref.tex: + * sk-refcard.tex, vipcard.tex, viperCard.tex: Update FSF's address. 2005-07-03 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> diff --git a/etc/ETAGS.EBNF b/etc/ETAGS.EBNF index 4d09eaa581d..395080b9c0a 100644 --- a/etc/ETAGS.EBNF +++ b/etc/ETAGS.EBNF @@ -1,5 +1,7 @@ -*- indented-text -*- +See the end of this file for copyright information. + This file contains two sections: 1) An EBNF (Extended Backus-Naur Form) description of the format of @@ -91,3 +93,22 @@ rightmost consecutive characters in the pattern which are not one of those. ===================== end of discussion of tag names ===================== + +Copyright (c) 2002, 2004, 2006 +Free software Foundation, Inc. + +COPYING PERMISSIONS: + + This document 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 2 of the License, or + (at your option) any later version. + + This program 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. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA @@ -1,2 +1,7 @@ Please refer to <http://www.gnu.org/software/emacs/> for information about obtaining Emacs. + +Copyright (c) 2000, 2006 Free Software Foundation, Inc. + +Verbatim copying and distribution is permitted in any medium +provided this notice is preserved. diff --git a/etc/HELLO b/etc/HELLO index 2e5181fc41b..ae7b85b49ff 100644 --- a/etc/HELLO +++ b/etc/HELLO @@ -66,3 +66,24 @@ Maltese (Malti) Bon,Cu(Bu, Sa,C11(Ba ;;; Local Variables: ;;; tab-width: 32 ;;; End: + + + +Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 +Free software Foundation, Inc. + +COPYING PERMISSIONS: + + This document 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 2 of the License, or + (at your option) any later version. + + This program 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. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA diff --git a/etc/LEDIT b/etc/LEDIT deleted file mode 100644 index 009243f5ec0..00000000000 --- a/etc/LEDIT +++ /dev/null @@ -1,77 +0,0 @@ -Date: 17 Apr 85 15:45:42 EST (Wed) -From: Martin David Connor <mdc@MIT-HTVAX.ARPA> - - Date: Sat, 13 Apr 85 16:28:15 est - From: Richard M. Stallman <rms@mit-prep> - - Can you help this person? Also, can you give me the rest of ledit - to distribute, plus some info on how to use it? - -I have put the files "ledit.l" and "leditcfns.c" on prep:~mdc. -Much to my disgust ledit.l relied on some bogus little package of -functions on HT, so I had to massage it a bit. - -To get it to work, one must: - - - Compile leditcfns.c with something like: - - cc leditcfns.c - - - Edit ledit.l, changing the line beginning "(cfasl" to - have the right pathname for the cfns file you compiled in - the last step. - - - Compile ledit.l with: - - liszt ledit.l - -Then put the following lines in your .lisprc file: - - ;load in functions for emacs interface - (load "//src//mdc//ledit//ledit") ; Location of Ledit library - (set-proc-str "%gnumacs") ; Name of editor - -Then you can use ^E <RETURN> to get from LISP back to gnumacs. - -Here is the part of my .emacs file that pertains to ledit. - - ;;; Set up ledit mode - (setq ledit-go-to-lisp-string "%lisp") - (setq lisp-mode-hook 'ledit-from-lisp-mode) - - Date: Sat, 13 Apr 85 11:26:32 cst - From: neves@wisc-ai.arpa (David Neves) - - This is a documentation question. - I cannot figure out how to use Ledit. I suspect I need some - function on the Franz Lisp end of things to go to Emacs and read in - the temporary file. Is this true? Is the Lisp job started within - Emacs or outside of emacs? I'm just plain confused. Perhaps a couple - of words from someone in the know would help. - - A related question. I have been using a shell buffer when interacting - with Lisp (ie. put a definition in the kill buffer and then yank it - into the shell buffer to redefine it). This is nice but tends to fill - up the shell buffer with lots of code (I'd rather keep calls to functions - in the shell and not the functions themselves). - My question: Is using the shell buffer "better" than ledit? Am I using - it in the best way (i.e. copying definitions from an edit buffer to the - shell buffer)? -Thanks, David Neves - -I have found that ledit works well for doing programming development -when you are changing lots of little pieces of a file and don't wish -to recompile the whole file. Of course M-X Compile is very nice for -calling up a liszt on a buffer and watching it in the another window. -Of course the interface of something like NIL is even better because -you can compile your function directly into your lisp. But since NIL -doesn't run under Unix, this is probably the next best thing. - -I have tried the 2 window method (shell in lower window, lisp code in -upper), and have found it a little awkward. It does have certain -advantages, but most of the time, I get be fine using M-C-D to save a -defun for lisp, and C-X Z to jump back to LISP. C-E RETURN from lisp -is also mnemonic for getting back to gnumacs. - -I hope this helps somewhat. - - diff --git a/etc/LPF b/etc/LPF deleted file mode 100644 index 02c7d28d150..00000000000 --- a/etc/LPF +++ /dev/null @@ -1,43 +0,0 @@ - Protect Your Freedom to Write Programs - Join the League for Programming Freedom - (Version of February 3, 1994) - -Ten years ago, programmers were allowed to write programs using all -the techniques they knew, and providing whatever features they felt -were useful. This is no longer the case. New monopolies, known as -software patents and interface copyrights, have taken away our freedom -of expression and our ability to do a good job. - -"Look and feel" lawsuits attempt to monopolize well-known command -languages; some have succeeded. Copyrights on command languages -enforce gratuitous incompatibility, close opportunities for -competition, and stifle incremental improvements. - -Software patents are even more dangerous; they make every design -decision in the development of a program carry a risk of a lawsuit, -with draconian pretrial seizure. It is difficult and expensive to -find out whether the techniques you consider using are patented; it is -impossible to find out whether they will be patented in the future. - -The League for Programming Freedom is a grass-roots organization of -professors, students, businessmen, programmers and users dedicated to -bringing back the freedom to write programs. The League is not -opposed to the legal system that Congress expressly established for -software--copyright on individual programs. Our aim is to reverse the -recent changes that prevent programmers from doing their work. - -The League works to abolish the new monopolies by publishing articles, -talking with public officials, denouncing egregious offenders, and -filing amicus curiae briefs, most notably against Lotus in its suit -against Borland. We testified twice at the recent Patent Office -hearings on software patents. We welcome suggestions for other -activities, as well as help in carrying them out. - - -(Added 2003) The League for Programming Freedom is inactive nowadays, -though its web site www.programming-freedom.org is still maintained. -It would be very useful to find a person who could take the initiative -to get the LPF operating again. It will be a substantial job, -requiring persistence and working with a lawyer. If you want to do -it, please write to rms@gnu.org. - diff --git a/etc/MACHINES b/etc/MACHINES index ee57fc6d0b0..9d7e81ebb97 100644 --- a/etc/MACHINES +++ b/etc/MACHINES @@ -1,3 +1,9 @@ +Emacs machines list + +Copyright (c) 1989, 1990, 1992, 1993, 1998, 2001, 2003, 2006 +Free software Foundation, Inc. +See the end of the file for copying permissions. + This is a list of the status of GNU Emacs on various machines and systems. For each system and machine, we give the configuration name you should @@ -1470,5 +1476,17 @@ mode: indented-text fill-prefix: " " End: +COPYING PERMISSIONS: + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this file, to deal in the file without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the file, and to + permit persons to whom the file is furnished to do so, subject to + the following condition: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the file. + arch-tag: 7d2e93c7-e982-40ec-9055-3cd064042473 diff --git a/etc/MAILINGLISTS b/etc/MAILINGLISTS index ff3d5013b74..531e57522ee 100644 --- a/etc/MAILINGLISTS +++ b/etc/MAILINGLISTS @@ -1,8 +1,10 @@ GNU Project Electronic Mailing Lists and gnUSENET Newsgroups - Last Updated 2004-10-19 + Last Updated 2006-06-03 Please report improvements to: gnu@gnu.org + See the end of this file for copyright notice and copying conditions + * Mailing list archives The GNU mailing lists are archived at http://lists.gnu.org. @@ -316,4 +318,18 @@ mode: outline fill-column: 72 End: +Copyright (c) 1999, 2003, 2004, 2006 +Free software Foundation, Inc. + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this file, to deal in the file without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the file, and to + permit persons to whom the file is furnished to do so, subject to + the following condition: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the file. + + arch-tag: 6e42bba8-7532-4a23-8486-99dbc5770a8e diff --git a/etc/MORE.STUFF b/etc/MORE.STUFF index 69bdd2d2bfb..b3ccc33dda6 100644 --- a/etc/MORE.STUFF +++ b/etc/MORE.STUFF @@ -1,4 +1,7 @@ More Neat Stuff for your Emacs +Copyright (c) 1993, 1999, 2003, 2004, 2005, 2006 +Free software Foundation, Inc. +See the end of the file for copying permissions. This file describes GNU Emacs programs and resources that are maintained by other people. Some of these may become part of the @@ -117,9 +120,9 @@ the future. You might like to check whether they are packaged for your system. Several are for Debian GNU/Linux in particular. - * AUCTeX: fancy (La)TeX support: <URL:http://www.gnu.org/software/auctex/> - There's an AUCTeX mail list/newsgroup: - <URL:news://sunsite.dk/emacs.auctex>. + * AUCTeX: <URL:http://www.gnu.org/software/auctex/> + An extensible package that supports writing and formatting TeX + files (including AMS-TeX, LaTeX, Texinfo, ConTeXt, and docTeX). * BBDB: personal Info Rolodex integrated with mail/news: <URL:http://bbdb.sourceforge.net/> @@ -269,4 +272,12 @@ mode: view eval: (goto-address) End: +COPYING PERMISSIONS + Permission to use, copy, modify, and distribute this + software and its documentation for any purpose and without + fee is hereby granted, provided that the above copyright + notice appear in all copies and that both that copyright + notice and this permission notice appear in supporting + documentation. + arch-tag: c1d4e7c8-db85-44e6-909e-659e2b20fefa diff --git a/etc/MOTIVATION b/etc/MOTIVATION index 267a2333f76..50194925f13 100644 --- a/etc/MOTIVATION +++ b/etc/MOTIVATION @@ -7,6 +7,9 @@ Special to the Boston Globe [reprinted with permission of the author from the Monday 19 January 1987 Boston Globe] +Verbatim copying and distribution is permitted in any medium +provided this notice is preserved. + In the laboratory, rats get Rice Krispies. In the classroom the top students get A's, and in the factory or office the best workers get raises. It's an article of faith for most of us that rewards promote @@ -1,12 +1,18 @@ -GNU Emacs NEWS -- history of user-visible changes. 2003-05-21 -Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +GNU Emacs NEWS -- history of user-visible changes. 2006-06-04 +Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. See the end for copying conditions. Please send Emacs bug reports to bug-gnu-emacs@gnu.org. -For older news, see the file ONEWS -You can narrow news to the specific version by calling -`view-emacs-news' with a prefix argument or by typing C-u C-h C-n. +If possible, use M-x report-emacs-bug. + +This file is about changes in emacs version 22. + +See files NEWS.21, NEWS.20, NEWS.19, NEWS.18, and NEWS.1-17 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. Temporary note: +++ indicates that the appropriate manual has already been updated. @@ -147,6 +153,12 @@ Type `C-u C-h t' to choose one of them in case your language setup doesn't automatically select the right one. --- +** A Portuguese translation of Emacs' reference card has been added. +Its name is `pt-br-refcard.tex'. The corresponding PostScript file is +also included. + + +--- ** A French translation of the `Emacs Survival Guide' is available. --- @@ -828,7 +840,7 @@ it remains unchanged. +++ *** New user option `history-delete-duplicates'. If set to t when adding a new history element, all previous identical -elements are deleted. +elements are deleted from the history list. ** Redisplay changes: @@ -1059,6 +1071,11 @@ disabled by customizing the variable `use-file-dialog'. be navigated with the arrow keys (like Gtk+, Mac and W32). +++ +*** The menu bar for Motif/Lesstif/Lucid/Gtk+ can be navigated with keys. +Pressing F10 shows the first menu in the menu bar. Navigation is done with +the arrow keys, select with the return key and cancel with the escape keys. + ++++ *** The Lucid menus can display multilingual text in your locale. You have to explicitly specify a fontSet resource for this to work, for example `-xrm "Emacs*fontSet: -*-helvetica-medium-r-*--*-120-*-*-*-*-*-*,*"'. @@ -1148,6 +1165,18 @@ mouse-wheel-inhibit-click-time variables. ** Multilingual Environment (Mule) changes: +*** You can disable character translation for a file using the -*- +construct. Include `enable-character-translation: nil' inside the +-*-...-*- to disable any character translation that may happen by +various global and per-coding-system translation tables. You can also +specify it in a local variable list at the end of the file. For +shortcut, instead of using this long variable name, you can append the +character "!" at the end of coding-system name specified in -*- +construct or in a local variable list. For example, if a file has the +following header, it is decoded by the coding system `iso-latin-1' +without any character translation: +;; -*- coding: iso-latin-1!; -*- + --- *** Language environment and various default coding systems are setup more correctly according to the current locale name. If the locale @@ -1368,6 +1397,10 @@ with different file attributes in two dired buffers. of marked files with the value entered in the minibuffer. +++ +*** The Dired command `dired-goto-file' is now bound to j, not M-g. +This is to avoid hiding the global key binding of M-g. + ++++ *** In Dired's ! command (dired-do-shell-command), `*' and `?' now control substitution of the file names only when they are surrounded by whitespace. This means you can now use them as shell wildcards @@ -1376,8 +1409,8 @@ double quotes make no difference in the shell, but they prevent special treatment in `dired-do-shell-command'. +++ -*** In Dired, the w command now copies the current line's file name -into the kill ring. With a zero prefix arg, copies absolute file names. +*** In Dired, the w command now stores the current line's file name +into the kill ring. With a zero prefix arg, it stores the absolute file name. +++ *** In Dired-x, Omitting files is now a minor mode, dired-omit-mode. @@ -2057,12 +2090,18 @@ subprocess are controlled by the user options `scheme-trace-command', `scheme-untrace-command' and `scheme-expand-current-form'. --- -** Makefile mode has submodes for automake, gmake, makepp, BSD make and imake. +** Changes in Makefile mode + +*** Makefile mode has submodes for automake, gmake, makepp, BSD make and imake. The former two couldn't be differentiated before, and the latter three are new. Font-locking is robust now and offers new customizable faces. +*** The variable `makefile-query-one-target-method' has been renamed +to `makefile-query-one-target-method-function'. The old name is still +available as alias. + +++ ** In Outline mode, `hide-body' no longer hides lines at the top of the file that precede the first header line. @@ -2678,6 +2717,10 @@ i.e., there is always a closing tag. By default, its setting is inferred on a buffer-by-buffer basis from the file name or buffer contents. +*** The variable `sgml-transformation' has been renamed to +`sgml-transformation-function'. The old name is still available as +alias. + +++ *** `xml-mode' is now an alias for `sgml-mode', which has XML support. @@ -2755,6 +2798,10 @@ extracting the content of a BibTeX field. `bibtex-autokey-titleword-case-convert-function'. The old names are still available as aliases. +** In Artist mode the variable `artist-text-renderer' has been +renamed to `artist-text-renderer-function'. The old name is still +available as alias. + +++ ** In Enriched mode, `set-left-margin' and `set-right-margin' are now by default bound to `C-c [' and `C-c ]' instead of the former `C-c C-l' @@ -3366,7 +3413,9 @@ C-x C-f passes the file name to `find-file' with non-nil WILDCARDS argument, which visits multiple files, and C-x d passes it to `dired'. --- -** In skeleton.el, `-' marks the `skeleton-point' without interregion interaction. +** Changes in Skeleton + +*** In skeleton.el, `-' marks the `skeleton-point' without interregion interaction. `@' has reverted to only setting `skeleton-positions' and no longer sets `skeleton-point'. Skeletons which used @ to mark @@ -3374,6 +3423,12 @@ sets `skeleton-point'. Skeletons which used @ to mark updated `skeleton-insert' docstring explains these new features along with other details of skeleton construction. +*** The variables `skeleton-transformation', `skeleton-filter', and +`skeleton-pair-filter' have been renamed to +`skeleton-transformation-function', `skeleton-filter-function', and +`skeleton-pair-filter-function'. The old names are still available +as aliases. + --- ** Hideshow mode changes @@ -3483,6 +3538,27 @@ variable `calculator-radix-grouping-mode'. --- ** cplus-md.el has been deleted. + +** Ewoc changes + +*** The new function `ewoc-delete' deletes specified nodes. + +*** `ewoc-create' now takes optional arg NOSEP, which inhibits insertion of +a newline after each pretty-printed entry and after the header and footer. +This allows you to create multiple-entry ewocs on a single line and to +effect "invisible" nodes by arranging for the pretty-printer to not print +anything for those nodes. + +For example, these two sequences of expressions behave identically: + +;; NOSEP nil +(defun PP (data) (insert (format "%S" data))) +(ewoc-create 'PP "start\n") + +;; NOSEP t +(defun PP (data) (insert (format "%S\n" data))) +(ewoc-create 'PP "start\n\n" "\n" t) + * Changes in Emacs 22.1 on non-free operating systems @@ -3600,6 +3676,9 @@ w32-use-full-screen-buffer to t. * Incompatible Lisp Changes in Emacs 22.1 +** The function find-operation-coding-system accepts a cons (FILENAME +. BUFFER) in an argument correponding to the target. + --- ** The variables post-command-idle-hook and post-command-idle-delay have been removed. Use run-with-idle-timer instead. @@ -3630,6 +3709,7 @@ deleting the part of subprocess output that matches the input. +++ ** The variable `memory-full' now remains t until there is no longer a shortage of memory. + * Lisp Changes in Emacs 22.1 @@ -4276,11 +4356,6 @@ ignore the leading dots in file names, so that file names such as `.emacs' are treated as extensionless. +++ -*** `copy-file' now takes an additional option arg MUSTBENEW. - -This argument works like the MUSTBENEW argument of write-file. - -+++ *** `visited-file-modtime' and `calendar-time-from-absolute' now return a list of two integers, instead of a cons. @@ -4374,10 +4449,6 @@ defaults to the current buffer. was selected when entering the minibuffer. +++ -*** `read-from-minibuffer' now accepts an additional argument KEEP-ALL -saying to put all inputs in the history list, even empty ones. - -+++ *** The `read-file-name' function now takes an additional argument which specifies a predicate which the file name read must satisfy. The new variable `read-file-name-predicate' contains the predicate argument @@ -4399,6 +4470,12 @@ whether completion ignores case when reading a file name with the It is like `read-file-name' except that the defaulting works better for directories, and completion inside it shows only directories. ++++ +*** The new variable `history-add-new-input' specifies whether to add new +elements in history. If set to nil, minibuffer reading functions don't +add new elements to the history list, so it is possible to do this +afterwards by calling `add-to-history' explicitly. + ** Completion changes: +++ @@ -5672,9335 +5749,14 @@ red splotch. It is an error if the argument to `noreturn' does return. The macro `1value' suppresses a brown splotch for its argument. This macro is a no-op except during test-coverage -- then it signals an error if the argument actually returns differing values. - -* Installation changes in Emacs 21.3 - -** Support for GNU/Linux on little-endian MIPS and on IBM S390 has -been added. - - -* Changes in Emacs 21.3 - -** The obsolete C mode (c-mode.el) has been removed to avoid problems -with Custom. - -** UTF-16 coding systems are available, encoding the same characters -as mule-utf-8. - -** There is a new language environment for UTF-8 (set up automatically -in UTF-8 locales). - -** Translation tables are available between equivalent characters in -different Emacs charsets -- for instance `e with acute' coming from the -Latin-1 and Latin-2 charsets. User options `unify-8859-on-encoding-mode' -and `unify-8859-on-decoding-mode' respectively turn on translation -between ISO 8859 character sets (`unification') on encoding -(e.g. writing a file) and decoding (e.g. reading a file). Note that -`unify-8859-on-encoding-mode' is useful and safe, but -`unify-8859-on-decoding-mode' can cause text to change when you read -it and write it out again without edits, so it is not generally advisable. -By default `unify-8859-on-encoding-mode' is turned on. - -** In Emacs running on the X window system, the default value of -`selection-coding-system' is now `compound-text-with-extensions'. - -If you want the old behavior, set selection-coding-system to -compound-text, which may be significantly more efficient. Using -compound-text-with-extensions seems to be necessary only for decoding -text from applications under XFree86 4.2, whose behavior is actually -contrary to the compound text specification. - - -* Installation changes in Emacs 21.2 - -** Support for BSD/OS 5.0 has been added. - -** Support for AIX 5.1 was added. - - -* Changes in Emacs 21.2 - -** Emacs now supports compound-text extended segments in X selections. - -X applications can use `extended segments' to encode characters in -compound text that belong to character sets which are not part of the -list of approved standard encodings for X, e.g. Big5. To paste -selections with such characters into Emacs, use the new coding system -compound-text-with-extensions as the value of selection-coding-system. - -** The default values of `tooltip-delay' and `tooltip-hide-delay' -were changed. - -** On terminals whose erase-char is ^H (Backspace), Emacs -now uses normal-erase-is-backspace-mode. - -** When the *scratch* buffer is recreated, its mode is set from -initial-major-mode, which normally is lisp-interaction-mode, -instead of using default-major-mode. - -** The new option `Info-scroll-prefer-subnodes' causes Info to behave -like the stand-alone Info reader (from the GNU Texinfo package) as far -as motion between nodes and their subnodes is concerned. If it is t -(the default), Emacs behaves as before when you type SPC in a menu: it -visits the subnode pointed to by the first menu entry. If this option -is nil, SPC scrolls to the end of the current node, and only then goes -to the first menu item, like the stand-alone reader does. - -This change was already in Emacs 21.1, but wasn't advertised in the -NEWS. - - -* Lisp Changes in Emacs 21.2 - -** The meanings of scroll-up-aggressively and scroll-down-aggressively -have been interchanged, so that the former now controls scrolling up, -and the latter now controls scrolling down. - -** The variable `compilation-parse-errors-filename-function' can -be used to transform filenames found in compilation output. - - -* Installation Changes in Emacs 21.1 - -See the INSTALL file for information on installing extra libraries and -fonts to take advantage of the new graphical features and extra -charsets in this release. - -** Support for GNU/Linux on IA64 machines has been added. - -** Support for LynxOS has been added. - -** There are new configure options associated with the support for -images and toolkit scrollbars. Use the --help option in `configure' -to list them. - -** You can build a 64-bit Emacs for SPARC/Solaris systems which -support 64-bit executables and also on Irix 6.5. This increases the -maximum buffer size. See etc/MACHINES for instructions. Changes to -build on other 64-bit systems should be straightforward modulo any -necessary changes to unexec. - -** There is a new configure option `--disable-largefile' to omit -Unix-98-style support for large files if that is available. - -** There is a new configure option `--without-xim' that instructs -Emacs to not use X Input Methods (XIM), if these are available. - -** `movemail' defaults to supporting POP. You can turn this off using -the --without-pop configure option, should that be necessary. - -** This version can be built for the Macintosh, but does not implement -all of the new display features described below. The port currently -lacks unexec, asynchronous processes, and networking support. See the -"Emacs and the Mac OS" appendix in the Emacs manual, for the -description of aspects specific to the Mac. - -** Note that the MS-Windows port does not yet implement various of the -new display features described below. - - -* Changes in Emacs 21.1 - -** Emacs has a new redisplay engine. - -The new redisplay handles characters of variable width and height. -Italic text can be used without redisplay problems. Fonts containing -oversized characters, i.e. characters larger than the logical height -of a font can be used. Images of various formats can be displayed in -the text. - -** Emacs has a new face implementation. - -The new faces no longer fundamentally use X font names to specify the -font. Instead, each face has several independent attributes--family, -height, width, weight and slant--that it may or may not specify. -These attributes can be merged from various faces, and then together -specify a font. - -Faces are supported on terminals that can display color or fonts. -These terminal capabilities are auto-detected. Details can be found -under Lisp changes, below. - -** Emacs can display faces on TTY frames. - -Emacs automatically detects terminals that are able to display colors. -Faces with a weight greater than normal are displayed extra-bright, if -the terminal supports it. Faces with a weight less than normal and -italic faces are displayed dimmed, if the terminal supports it. -Underlined faces are displayed underlined if possible. Other face -attributes such as `overline', `strike-through', and `box' are ignored -on terminals. - -The command-line options `-fg COLOR', `-bg COLOR', and `-rv' are now -supported on character terminals. - -Emacs automatically remaps all X-style color specifications to one of -the colors supported by the terminal. This means you could have the -same color customizations that work both on a windowed display and on -a TTY or when Emacs is invoked with the -nw option. - -** New default font is Courier 12pt under X. - -** Sound support - -Emacs supports playing sound files on GNU/Linux and FreeBSD (Voxware -driver and native BSD driver, a.k.a. Luigi's driver). Currently -supported file formats are RIFF-WAVE (*.wav) and Sun Audio (*.au). -You must configure Emacs with the option `--with-sound=yes' to enable -sound support. - -** Emacs now resizes mini-windows if appropriate. - -If a message is longer than one line, or minibuffer contents are -longer than one line, Emacs can resize the minibuffer window unless it -is on a frame of its own. You can control resizing and the maximum -minibuffer window size by setting the following variables: - -- User option: max-mini-window-height - -Maximum height for resizing mini-windows. If a float, it specifies a -fraction of the mini-window frame's height. If an integer, it -specifies a number of lines. - -Default is 0.25. - -- User option: resize-mini-windows - -How to resize mini-windows. If nil, don't resize. If t, always -resize to fit the size of the text. If `grow-only', let mini-windows -grow only, until they become empty, at which point they are shrunk -again. - -Default is `grow-only'. - -** LessTif support. - -Emacs now runs with the LessTif toolkit (see -<http://www.lesstif.org>). You will need version 0.92.26, or later. - -** LessTif/Motif file selection dialog. - -When Emacs is configured to use LessTif or Motif, reading a file name -from a menu will pop up a file selection dialog if `use-dialog-box' is -non-nil. - -** File selection dialog on MS-Windows is supported. - -When a file is visited by clicking File->Open, the MS-Windows version -now pops up a standard file selection dialog where you can select a -file to visit. File->Save As also pops up that dialog. - -** Toolkit scroll bars. - -Emacs now uses toolkit scroll bars if available. When configured for -LessTif/Motif, it will use that toolkit's scroll bar. Otherwise, when -configured for Lucid and Athena widgets, it will use the Xaw3d scroll -bar if Xaw3d is available. You can turn off the use of toolkit scroll -bars by specifying `--with-toolkit-scroll-bars=no' when configuring -Emacs. - -When you encounter problems with the Xaw3d scroll bar, watch out how -Xaw3d is compiled on your system. If the Makefile generated from -Xaw3d's Imakefile contains a `-DNARROWPROTO' compiler option, and your -Emacs system configuration file `s/your-system.h' does not contain a -define for NARROWPROTO, you might consider adding it. Take -`s/freebsd.h' as an example. - -Alternatively, if you don't have access to the Xaw3d source code, take -a look at your system's imake configuration file, for example in the -directory `/usr/X11R6/lib/X11/config' (paths are different on -different systems). You will find files `*.cf' there. If your -system's cf-file contains a line like `#define NeedWidePrototypes NO', -add a `#define NARROWPROTO' to your Emacs system configuration file. - -The reason for this is that one Xaw3d function uses `double' or -`float' function parameters depending on the setting of NARROWPROTO. -This is not a problem when Imakefiles are used because each system's -imake configuration file contains the necessary information. Since -Emacs doesn't use imake, this has do be done manually. - -** Tool bar support. - -Emacs supports a tool bar at the top of a frame under X. For details -of how to define a tool bar, see the page describing Lisp-level -changes. Tool-bar global minor mode controls whether or not it is -displayed and is on by default. The appearance of the bar is improved -if Emacs has been built with XPM image support. Otherwise monochrome -icons will be used. - -To make the tool bar more useful, we need contributions of extra icons -for specific modes (with copyright assignments). - -** Tooltips. - -Tooltips are small X windows displaying a help string at the current -mouse position. The Lisp package `tooltip' implements them. You can -turn them off via the user option `tooltip-mode'. - -Tooltips also provides support for GUD debugging. If activated, -variable values can be displayed in tooltips by pointing at them with -the mouse in source buffers. You can customize various aspects of the -tooltip display in the group `tooltip'. - -** Automatic Hscrolling - -Horizontal scrolling now happens automatically if -`automatic-hscrolling' is set (the default). This setting can be -customized. - -If a window is scrolled horizontally with set-window-hscroll, or -scroll-left/scroll-right (C-x <, C-x >), this serves as a lower bound -for automatic horizontal scrolling. Automatic scrolling will scroll -the text more to the left if necessary, but won't scroll the text more -to the right than the column set with set-window-hscroll etc. - -** When using a windowing terminal, each Emacs window now has a cursor -of its own. By default, when a window is selected, the cursor is -solid; otherwise, it is hollow. The user-option -`cursor-in-non-selected-windows' controls how to display the -cursor in non-selected windows. If nil, no cursor is shown, if -non-nil a hollow box cursor is shown. - -** Fringes to the left and right of windows are used to display -truncation marks, continuation marks, overlay arrows and alike. The -foreground, background, and stipple of these areas can be changed by -customizing face `fringe'. - -** The mode line under X is now drawn with shadows by default. -You can change its appearance by modifying the face `mode-line'. -In particular, setting the `:box' attribute to nil turns off the 3D -appearance of the mode line. (The 3D appearance makes the mode line -occupy more space, and thus might cause the first or the last line of -the window to be partially obscured.) - -The variable `mode-line-inverse-video', which was used in older -versions of emacs to make the mode-line stand out, is now deprecated. -However, setting it to nil will cause the `mode-line' face to be -ignored, and mode-lines to be drawn using the default text face. - -** Mouse-sensitive mode line. - -Different parts of the mode line have been made mouse-sensitive on all -systems which support the mouse. Moving the mouse to a -mouse-sensitive part in the mode line changes the appearance of the -mouse pointer to an arrow, and help about available mouse actions is -displayed either in the echo area, or in the tooltip window if you -have enabled one. - -Currently, the following actions have been defined: - -- Mouse-1 on the buffer name in the mode line goes to the next buffer. - -- Mouse-3 on the buffer-name goes to the previous buffer. - -- Mouse-2 on the read-only or modified status in the mode line (`%' or -`*') toggles the status. - -- Mouse-3 on the major mode name displays a major mode menu. - -- Mouse-3 on the mode name displays a minor-mode menu. - -** Hourglass pointer - -Emacs can optionally display an hourglass pointer under X. You can -turn the display on or off by customizing group `cursor'. - -** Blinking cursor - -M-x blink-cursor-mode toggles a blinking cursor under X and on -terminals having terminal capabilities `vi', `vs', and `ve'. Blinking -and related parameters like frequency and delay can be customized in -the group `cursor'. - -** New font-lock support mode `jit-lock-mode'. - -This support mode is roughly equivalent to `lazy-lock' but is -generally faster. It supports stealth and deferred fontification. -See the documentation of the function `jit-lock-mode' for more -details. - -Font-lock uses jit-lock-mode as default support mode, so you don't -have to do anything to activate it. - -** The default binding of the Delete key has changed. - -The new user-option `normal-erase-is-backspace' can be set to -determine the effect of the Delete and Backspace function keys. - -On window systems, the default value of this option is chosen -according to the keyboard used. If the keyboard has both a Backspace -key and a Delete key, and both are mapped to their usual meanings, the -option's default value is set to t, so that Backspace can be used to -delete backward, and Delete can be used to delete forward. On -keyboards which either have only one key (usually labeled DEL), or two -keys DEL and BS which produce the same effect, the option's value is -set to nil, and these keys delete backward. - -If not running under a window system, setting this option accomplishes -a similar effect by mapping C-h, which is usually generated by the -Backspace key, to DEL, and by mapping DEL to C-d via -`keyboard-translate'. The former functionality of C-h is available on -the F1 key. You should probably not use this setting on a text-only -terminal if you don't have both Backspace, Delete and F1 keys. - -Programmatically, you can call function normal-erase-is-backspace-mode -to toggle the behavior of the Delete and Backspace keys. - -** The default for user-option `next-line-add-newlines' has been -changed to nil, i.e. C-n will no longer add newlines at the end of a -buffer by default. - -** The <home> and <end> keys now move to the beginning or end of the -current line, respectively. C-<home> and C-<end> move to the -beginning and end of the buffer. - -** Emacs now checks for recursive loads of Lisp files. If the -recursion depth exceeds `recursive-load-depth-limit', an error is -signaled. - -** When an error is signaled during the loading of the user's init -file, Emacs now pops up the *Messages* buffer. - -** Emacs now refuses to load compiled Lisp files which weren't -compiled with Emacs. Set `load-dangerous-libraries' to t to change -this behavior. - -The reason for this change is an incompatible change in XEmacs's byte -compiler. Files compiled with XEmacs can contain byte codes that let -Emacs dump core. - -** Toggle buttons and radio buttons in menus. - -When compiled with LessTif (or Motif) support, Emacs uses toolkit -widgets for radio and toggle buttons in menus. When configured for -Lucid, Emacs draws radio buttons and toggle buttons similar to Motif. - -** The menu bar configuration has changed. The new configuration is -more CUA-compliant. The most significant change is that Options is -now a separate menu-bar item, with Mule and Customize as its submenus. - -** Item Save Options on the Options menu allows saving options set -using that menu. - -** Highlighting of trailing whitespace. - -When `show-trailing-whitespace' is non-nil, Emacs displays trailing -whitespace in the face `trailing-whitespace'. Trailing whitespace is -defined as spaces or tabs at the end of a line. To avoid busy -highlighting when entering new text, trailing whitespace is not -displayed if point is at the end of the line containing the -whitespace. - -** C-x 5 1 runs the new command delete-other-frames which deletes -all frames except the selected one. - -** The new user-option `confirm-kill-emacs' can be customized to -let Emacs ask for confirmation before exiting. - -** The header line in an Info buffer is now displayed as an emacs -header-line (which is like a mode-line, but at the top of the window), -so that it remains visible even when the buffer has been scrolled. -This behavior may be disabled by customizing the option -`Info-use-header-line'. - -** Polish, Czech, German, and French translations of Emacs' reference card -have been added. They are named `pl-refcard.tex', `cs-refcard.tex', -`de-refcard.tex' and `fr-refcard.tex'. Postscript files are included. - -** An `Emacs Survival Guide', etc/survival.tex, is available. - -** A reference card for Dired has been added. Its name is -`dired-ref.tex'. A French translation is available in -`fr-drdref.tex'. - -** C-down-mouse-3 is bound differently. Now if the menu bar is not -displayed it pops up a menu containing the items which would be on the -menu bar. If the menu bar is displayed, it pops up the major mode -menu or the Edit menu if there is no major mode menu. - -** Variable `load-path' is no longer customizable through Customize. - -You can no longer use `M-x customize-variable' to customize `load-path' -because it now contains a version-dependent component. You can still -use `add-to-list' and `setq' to customize this variable in your -`~/.emacs' init file or to modify it from any Lisp program in general. - -** C-u C-x = provides detailed information about the character at -point in a pop-up window. - -** Emacs can now support 'wheeled' mice (such as the MS IntelliMouse) -under XFree86. To enable this, use the `mouse-wheel-mode' command, or -customize the variable `mouse-wheel-mode'. - -The variables `mouse-wheel-follow-mouse' and `mouse-wheel-scroll-amount' -determine where and by how much buffers are scrolled. - -** Emacs' auto-save list files are now by default stored in a -sub-directory `.emacs.d/auto-save-list/' of the user's home directory. -(On MS-DOS, this subdirectory's name is `_emacs.d/auto-save.list/'.) -You can customize `auto-save-list-file-prefix' to change this location. - -** The function `getenv' is now callable interactively. - -** The new user-option `even-window-heights' can be set to nil -to prevent `display-buffer' from evening out window heights. - -** The new command M-x delete-trailing-whitespace RET will delete the -trailing whitespace within the current restriction. You can also add -this function to `write-file-hooks' or `local-write-file-hooks'. - -** When visiting a file with M-x find-file-literally, no newlines will -be added to the end of the buffer even if `require-final-newline' is -non-nil. - -** The new user-option `find-file-suppress-same-file-warnings' can be -set to suppress warnings ``X and Y are the same file'' when visiting a -file that is already visited under a different name. - -** The new user-option `electric-help-shrink-window' can be set to -nil to prevent adjusting the help window size to the buffer size. - -** New command M-x describe-character-set reads a character set name -and displays information about that. - -** The new variable `auto-mode-interpreter-regexp' contains a regular -expression matching interpreters, for file mode determination. - -This regular expression is matched against the first line of a file to -determine the file's mode in `set-auto-mode' when Emacs can't deduce a -mode from the file's name. If it matches, the file is assumed to be -interpreted by the interpreter matched by the second group of the -regular expression. The mode is then determined as the mode -associated with that interpreter in `interpreter-mode-alist'. - -** New function executable-make-buffer-file-executable-if-script-p is -suitable as an after-save-hook as an alternative to `executable-chmod'. - -** The most preferred coding-system is now used to save a buffer if -buffer-file-coding-system is `undecided' and it is safe for the buffer -contents. (The most preferred is set by set-language-environment or -by M-x prefer-coding-system.) Thus if you visit an ASCII file and -insert a non-ASCII character from your current language environment, -the file will be saved silently with the appropriate coding. -Previously you would be prompted for a safe coding system. - -** The many obsolete language `setup-...-environment' commands have -been removed -- use `set-language-environment'. - -** The new Custom option `keyboard-coding-system' specifies a coding -system for keyboard input. - -** New variable `inhibit-iso-escape-detection' determines if Emacs' -coding system detection algorithm should pay attention to ISO2022's -escape sequences. If this variable is non-nil, the algorithm ignores -such escape sequences. The default value is nil, and it is -recommended not to change it except for the special case that you -always want to read any escape code verbatim. If you just want to -read a specific file without decoding escape codes, use C-x RET c -(`universal-coding-system-argument'). For instance, C-x RET c latin-1 -RET C-x C-f filename RET. - -** Variable `default-korean-keyboard' is initialized properly from the -environment variable `HANGUL_KEYBOARD_TYPE'. - -** New command M-x list-charset-chars reads a character set name and -displays all characters in that character set. - -** M-x set-terminal-coding-system (C-x RET t) now allows CCL-based -coding systems such as cpXXX and cyrillic-koi8. - -** Emacs now attempts to determine the initial language environment -and preferred and locale coding systems systematically from the -LC_ALL, LC_CTYPE, and LANG environment variables during startup. - -** New language environments `Polish', `Latin-8' and `Latin-9'. -Latin-8 and Latin-9 correspond respectively to the ISO character sets -8859-14 (Celtic) and 8859-15 (updated Latin-1, with the Euro sign). -GNU Intlfonts doesn't support these yet but recent X releases have -8859-15. See etc/INSTALL for information on obtaining extra fonts. -There are new Leim input methods for Latin-8 and Latin-9 prefix (only) -and Polish `slash'. - -** New language environments `Dutch' and `Spanish'. -These new environments mainly select appropriate translations -of the tutorial. - -** In Ethiopic language environment, special key bindings for -function keys are changed as follows. This is to conform to "Emacs -Lisp Coding Convention". - - new command old-binding - --- ------- ----------- - f3 ethio-fidel-to-sera-buffer f5 - S-f3 ethio-fidel-to-sera-region f5 - C-f3 ethio-fidel-to-sera-mail-or-marker f5 - - f4 ethio-sera-to-fidel-buffer unchanged - S-f4 ethio-sera-to-fidel-region unchanged - C-f4 ethio-sera-to-fidel-mail-or-marker unchanged - - S-f5 ethio-toggle-punctuation f3 - S-f6 ethio-modify-vowel f6 - S-f7 ethio-replace-space f7 - S-f8 ethio-input-special-character f8 - S-f9 ethio-replace-space unchanged - C-f9 ethio-toggle-space f2 - -** There are new Leim input methods. -New input methods "turkish-postfix", "turkish-alt-postfix", -"greek-mizuochi", "TeX", and "greek-babel" are now part of the Leim -package. - -** The rule of input method "slovak" is slightly changed. Now the -rules for translating "q" and "Q" to "`" (backquote) are deleted, thus -typing them inserts "q" and "Q" respectively. Rules for translating -"=q", "+q", "=Q", and "+Q" to "`" are also deleted. Now, to input -"`", you must type "=q". - -** When your terminal can't display characters from some of the ISO -8859 character sets but can display Latin-1, you can display -more-or-less mnemonic sequences of ASCII/Latin-1 characters instead of -empty boxes (under a window system) or question marks (not under a -window system). Customize the option `latin1-display' to turn this -on. - -** M-; now calls comment-dwim which tries to do something clever based -on the context. M-x kill-comment is now an alias to comment-kill, -defined in newcomment.el. You can choose different styles of region -commenting with the variable `comment-style'. - -** New user options `display-time-mail-face' and -`display-time-use-mail-icon' control the appearance of mode-line mail -indicator used by the display-time package. On a suitable display the -indicator can be an icon and is mouse-sensitive. - -** On window-systems, additional space can be put between text lines -on the display using several methods - -- By setting frame parameter `line-spacing' to PIXELS. PIXELS must be -a positive integer, and specifies that PIXELS number of pixels should -be put below text lines on the affected frame or frames. - -- By setting X resource `lineSpacing', class `LineSpacing'. This is -equivalent to specifying the frame parameter. - -- By specifying `--line-spacing=N' or `-lsp N' on the command line. - -- By setting buffer-local variable `line-spacing'. The meaning is -the same, but applies to the a particular buffer only. - -** The new command `clone-indirect-buffer' can be used to create -an indirect buffer that is a twin copy of the current buffer. The -command `clone-indirect-buffer-other-window', bound to C-x 4 c, -does the same but displays the indirect buffer in another window. - -** New user options `backup-directory-alist' and -`make-backup-file-name-function' control the placement of backups, -typically in a single directory or in an invisible sub-directory. - -** New commands iso-iso2sgml and iso-sgml2iso convert between Latin-1 -characters and the corresponding SGML (HTML) entities. - -** New X resources recognized - -*** The X resource `synchronous', class `Synchronous', specifies -whether Emacs should run in synchronous mode. Synchronous mode -is useful for debugging X problems. - -Example: - - emacs.synchronous: true - -*** The X resource `visualClass, class `VisualClass', specifies the -visual Emacs should use. The resource's value should be a string of -the form `CLASS-DEPTH', where CLASS is the name of the visual class, -and DEPTH is the requested color depth as a decimal number. Valid -visual class names are - - TrueColor - PseudoColor - DirectColor - StaticColor - GrayScale - StaticGray - -Visual class names specified as X resource are case-insensitive, i.e. -`pseudocolor', `Pseudocolor' and `PseudoColor' all have the same -meaning. - -The program `xdpyinfo' can be used to list the visual classes -supported on your display, and which depths they have. If -`visualClass' is not specified, Emacs uses the display's default -visual. - -Example: - - emacs.visualClass: TrueColor-8 - -*** The X resource `privateColormap', class `PrivateColormap', -specifies that Emacs should use a private colormap if it is using the -default visual, and that visual is of class PseudoColor. Recognized -resource values are `true' or `on'. - -Example: - - emacs.privateColormap: true - -** Faces and frame parameters. - -There are four new faces `scroll-bar', `border', `cursor' and `mouse'. -Setting the frame parameters `scroll-bar-foreground' and -`scroll-bar-background' sets foreground and background color of face -`scroll-bar' and vice versa. Setting frame parameter `border-color' -sets the background color of face `border' and vice versa. Likewise -for frame parameters `cursor-color' and face `cursor', and frame -parameter `mouse-color' and face `mouse'. - -Changing frame parameter `font' sets font-related attributes of the -`default' face and vice versa. Setting frame parameters -`foreground-color' or `background-color' sets the colors of the -`default' face and vice versa. - -** New face `menu'. - -The face `menu' can be used to change colors and font of Emacs' menus. - -** New frame parameter `screen-gamma' for gamma correction. - -The new frame parameter `screen-gamma' specifies gamma-correction for -colors. Its value may be nil, the default, in which case no gamma -correction occurs, or a number > 0, usually a float, that specifies -the screen gamma of a frame's display. - -PC monitors usually have a screen gamma of 2.2. smaller values result -in darker colors. You might want to try a screen gamma of 1.5 for LCD -color displays. The viewing gamma Emacs uses is 0.4545. (1/2.2). - -The X resource name of this parameter is `screenGamma', class -`ScreenGamma'. - -** Tabs and variable-width text. - -Tabs are now displayed with stretch properties; the width of a tab is -defined as a multiple of the normal character width of a frame, and is -independent of the fonts used in the text where the tab appears. -Thus, tabs can be used to line up text in different fonts. - -** Enhancements of the Lucid menu bar - -*** The Lucid menu bar now supports the resource "margin". - - emacs.pane.menubar.margin: 5 - -The default margin is 4 which makes the menu bar appear like the -LessTif/Motif one. - -*** Arrows that indicate sub-menus are now drawn with shadows, as in -LessTif and Motif. - -** A block cursor can be drawn as wide as the glyph under it under X. - -As an example: if a block cursor is over a tab character, it will be -drawn as wide as that tab on the display. To do this, set -`x-stretch-cursor' to a non-nil value. - -** Empty display lines at the end of a buffer may be marked with a -bitmap (this is similar to the tilde displayed by vi and Less). - -This behavior is activated by setting the buffer-local variable -`indicate-empty-lines' to a non-nil value. The default value of this -variable is found in `default-indicate-empty-lines'. - -** There is a new "aggressive" scrolling method. - -When scrolling up because point is above the window start, if the -value of the buffer-local variable `scroll-up-aggressively' is a -number, Emacs chooses a new window start so that point ends up that -fraction of the window's height from the top of the window. - -When scrolling down because point is below the window end, if the -value of the buffer-local variable `scroll-down-aggressively' is a -number, Emacs chooses a new window start so that point ends up that -fraction of the window's height from the bottom of the window. - -** You can now easily create new *Info* buffers using either -M-x clone-buffer, C-u m <entry> RET or C-u g <entry> RET. -M-x clone-buffer can also be used on *Help* and several other special -buffers. - -** The command `Info-search' now uses a search history. - -** Listing buffers with M-x list-buffers (C-x C-b) now shows -abbreviated file names. Abbreviations can be customized by changing -`directory-abbrev-alist'. - -** A new variable, backup-by-copying-when-privileged-mismatch, gives -the highest file uid for which backup-by-copying-when-mismatch will be -forced on. The assumption is that uids less than or equal to this -value are special uids (root, bin, daemon, etc.--not real system -users) and that files owned by these users should not change ownership, -even if your system policy allows users other than root to edit them. - -The default is 200; set the variable to nil to disable the feature. - -** The rectangle commands now avoid inserting undesirable spaces, -notably at the end of lines. - -All these functions have been rewritten to avoid inserting unwanted -spaces, and an optional prefix now allows them to behave the old way. - -** The function `replace-rectangle' is an alias for `string-rectangle'. - -** The new command M-x string-insert-rectangle is like `string-rectangle', -but inserts text instead of replacing it. - -** The new command M-x query-replace-regexp-eval acts like -query-replace-regexp, but takes a Lisp expression which is evaluated -after each match to get the replacement text. - -** M-x query-replace recognizes a new command `e' (or `E') that lets -you edit the replacement string. - -** The new command mail-abbrev-complete-alias, bound to `M-TAB' -(if you load the library `mailabbrev'), lets you complete mail aliases -in the text, analogous to lisp-complete-symbol. - -** The variable `echo-keystrokes' may now have a floating point value. - -** If your init file is compiled (.emacs.elc), `user-init-file' is set -to the source name (.emacs.el), if that exists, after loading it. - -** The help string specified for a menu-item whose definition contains -the property `:help HELP' is now displayed under X, on MS-Windows, and -MS-DOS, either in the echo area or with tooltips. Many standard menus -displayed by Emacs now have help strings. - --- -** New user option `read-mail-command' specifies a command to use to -read mail from the menu etc. - -** The environment variable `EMACSLOCKDIR' is no longer used on MS-Windows. -This environment variable was used when creating lock files. Emacs on -MS-Windows does not use this variable anymore. This change was made -before Emacs 21.1, but wasn't documented until now. - -** Highlighting of mouse-sensitive regions is now supported in the -MS-DOS version of Emacs. - -** The new command `msdos-set-mouse-buttons' forces the MS-DOS version -of Emacs to behave as if the mouse had a specified number of buttons. -This comes handy with mice that don't report their number of buttons -correctly. One example is the wheeled mice, which report 3 buttons, -but clicks on the middle button are not passed to the MS-DOS version -of Emacs. - -** Customize changes - -*** Customize now supports comments about customized items. Use the -`State' menu to add comments, or give a prefix argument to -M-x customize-set-variable or M-x customize-set-value. Note that -customization comments will cause the customizations to fail in -earlier versions of Emacs. - -*** The new option `custom-buffer-done-function' says whether to kill -Custom buffers when you've done with them or just bury them (the -default). - -*** If Emacs was invoked with the `-q' or `--no-init-file' options, it -does not allow you to save customizations in your `~/.emacs' init -file. This is because saving customizations from such a session would -wipe out all the other customizationss you might have on your init -file. - -** If Emacs was invoked with the `-q' or `--no-init-file' options, it -does not save disabled and enabled commands for future sessions, to -avoid overwriting existing customizations of this kind that are -already in your init file. - -** New features in evaluation commands - -*** The commands to evaluate Lisp expressions, such as C-M-x in Lisp -modes, C-j in Lisp Interaction mode, and M-:, now bind the variables -print-level, print-length, and debug-on-error based on the new -customizable variables eval-expression-print-level, -eval-expression-print-length, and eval-expression-debug-on-error. - -The default values for the first two of these variables are 12 and 4 -respectively, which means that `eval-expression' now prints at most -the first 12 members of a list and at most 4 nesting levels deep (if -the list is longer or deeper than that, an ellipsis `...' is -printed). - -<RET> or <mouse-2> on the printed text toggles between an abbreviated -printed representation and an unabbreviated one. - -The default value of eval-expression-debug-on-error is t, so any error -during evaluation produces a backtrace. - -*** The function `eval-defun' (C-M-x) now loads Edebug and instruments -code when called with a prefix argument. - -** CC mode changes. - -Note: This release contains changes that might not be compatible with -current user setups (although it's believed that these -incompatibilities will only show in very uncommon circumstances). -However, since the impact is uncertain, these changes may be rolled -back depending on user feedback. Therefore there's no forward -compatibility guarantee wrt the new features introduced in this -release. - -*** The hardcoded switch to "java" style in Java mode is gone. -CC Mode used to automatically set the style to "java" when Java mode -is entered. This has now been removed since it caused too much -confusion. - -However, to keep backward compatibility to a certain extent, the -default value for c-default-style now specifies the "java" style for -java-mode, but "gnu" for all other modes (as before). So you won't -notice the change if you haven't touched that variable. - -*** New cleanups, space-before-funcall and compact-empty-funcall. -Two new cleanups have been added to c-cleanup-list: - -space-before-funcall causes a space to be inserted before the opening -parenthesis of a function call, which gives the style "foo (bar)". - -compact-empty-funcall causes any space before a function call opening -parenthesis to be removed if there are no arguments to the function. -It's typically useful together with space-before-funcall to get the -style "foo (bar)" and "foo()". - -*** Some keywords now automatically trigger reindentation. -Keywords like "else", "while", "catch" and "finally" have been made -"electric" to make them reindent automatically when they continue an -earlier statement. An example: - -for (i = 0; i < 17; i++) - if (a[i]) - res += a[i]->offset; -else - -Here, the "else" should be indented like the preceding "if", since it -continues that statement. CC Mode will automatically reindent it after -the "else" has been typed in full, since it's not until then it's -possible to decide whether it's a new statement or a continuation of -the preceding "if". - -CC Mode uses Abbrev mode to achieve this, which is therefore turned on -by default. - -*** M-a and M-e now moves by sentence in multiline strings. -Previously these two keys only moved by sentence in comments, which -meant that sentence movement didn't work in strings containing -documentation or other natural language text. - -The reason it's only activated in multiline strings (i.e. strings that -contain a newline, even when escaped by a '\') is to avoid stopping in -the short strings that often reside inside statements. Multiline -strings almost always contain text in a natural language, as opposed -to other strings that typically contain format specifications, -commands, etc. Also, it's not that bothersome that M-a and M-e misses -sentences in single line strings, since they're short anyway. - -*** Support for autodoc comments in Pike mode. -Autodoc comments for Pike are used to extract documentation from the -source, like Javadoc in Java. Pike mode now recognize this markup in -comment prefixes and paragraph starts. - -*** The comment prefix regexps on c-comment-prefix may be mode specific. -When c-comment-prefix is an association list, it specifies the comment -line prefix on a per-mode basis, like c-default-style does. This -change came about to support the special autodoc comment prefix in -Pike mode only. - -*** Better handling of syntactic errors. -The recovery after unbalanced parens earlier in the buffer has been -improved; CC Mode now reports them by dinging and giving a message -stating the offending line, but still recovers and indent the -following lines in a sane way (most of the time). An "else" with no -matching "if" is handled similarly. If an error is discovered while -indenting a region, the whole region is still indented and the error -is reported afterwards. - -*** Lineup functions may now return absolute columns. -A lineup function can give an absolute column to indent the line to by -returning a vector with the desired column as the first element. - -*** More robust and warning-free byte compilation. -Although this is strictly not a user visible change (well, depending -on the view of a user), it's still worth mentioning that CC Mode now -can be compiled in the standard ways without causing trouble. Some -code have also been moved between the subpackages to enhance the -modularity somewhat. Thanks to Martin Buchholz for doing the -groundwork. - -*** c-style-variables-are-local-p now defaults to t. -This is an incompatible change that has been made to make the behavior -of the style system wrt global variable settings less confusing for -non-advanced users. If you know what this variable does you might -want to set it to nil in your .emacs, otherwise you probably don't -have to bother. - -Defaulting c-style-variables-are-local-p to t avoids the confusing -situation that occurs when a user sets some style variables globally -and edits both a Java and a non-Java file in the same Emacs session. -If the style variables aren't buffer local in this case, loading of -the second file will cause the default style (either "gnu" or "java" -by default) to override the global settings made by the user. - -*** New initialization procedure for the style system. -When the initial style for a buffer is determined by CC Mode (from the -variable c-default-style), the global values of style variables now -take precedence over the values specified by the chosen style. This -is different than the old behavior: previously, the style-specific -settings would override the global settings. This change makes it -possible to do simple configuration in the intuitive way with -Customize or with setq lines in one's .emacs file. - -By default, the global value of every style variable is the new -special symbol set-from-style, which causes the value to be taken from -the style system. This means that in effect, only an explicit setting -of a style variable will cause the "overriding" behavior described -above. - -Also note that global settings override style-specific settings *only* -when the initial style of a buffer is chosen by a CC Mode major mode -function. When a style is chosen in other ways --- for example, by a -call like (c-set-style "gnu") in a hook, or via M-x c-set-style --- -then the style-specific values take precedence over any global style -values. In Lisp terms, global values override style-specific values -only when the new second argument to c-set-style is non-nil; see the -function documentation for more info. - -The purpose of these changes is to make it easier for users, -especially novice users, to do simple customizations with Customize or -with setq in their .emacs files. On the other hand, the new system is -intended to be compatible with advanced users' customizations as well, -such as those that choose styles in hooks or whatnot. This new system -is believed to be almost entirely compatible with current -configurations, in spite of the changed precedence between style and -global variable settings when a buffer's default style is set. - -(Thanks to Eric Eide for clarifying this explanation a bit.) - -**** c-offsets-alist is now a customizable variable. -This became possible as a result of the new initialization behavior. - -This variable is treated slightly differently from the other style -variables; instead of using the symbol set-from-style, it will be -completed with the syntactic symbols it doesn't already contain when -the style is first initialized. This means it now defaults to the -empty list to make all syntactic elements get their values from the -style system. - -**** Compatibility variable to restore the old behavior. -In case your configuration doesn't work with this change, you can set -c-old-style-variable-behavior to non-nil to get the old behavior back -as far as possible. - -*** Improvements to line breaking and text filling. -CC Mode now handles this more intelligently and seamlessly wrt the -surrounding code, especially inside comments. For details see the new -chapter about this in the manual. - -**** New variable to recognize comment line prefix decorations. -The variable c-comment-prefix-regexp has been added to properly -recognize the line prefix in both block and line comments. It's -primarily used to initialize the various paragraph recognition and -adaptive filling variables that the text handling functions uses. - -**** New variable c-block-comment-prefix. -This is a generalization of the now obsolete variable -c-comment-continuation-stars to handle arbitrary strings. - -**** CC Mode now uses adaptive fill mode. -This to make it adapt better to the paragraph style inside comments. - -It's also possible to use other adaptive filling packages inside CC -Mode, notably Kyle E. Jones' Filladapt mode (http://wonderworks.com/). -A new convenience function c-setup-filladapt sets up Filladapt for use -inside CC Mode. - -Note though that the 2.12 version of Filladapt lacks a feature that -causes it to work suboptimally when c-comment-prefix-regexp can match -the empty string (which it commonly does). A patch for that is -available from the CC Mode web site (http://www.python.org/emacs/ -cc-mode/). - -**** The variables `c-hanging-comment-starter-p' and -`c-hanging-comment-ender-p', which controlled how comment starters and -enders were filled, are not used anymore. The new version of the -function `c-fill-paragraph' keeps the comment starters and enders as -they were before the filling. - -**** It's now possible to selectively turn off auto filling. -The variable c-ignore-auto-fill is used to ignore auto fill mode in -specific contexts, e.g. in preprocessor directives and in string -literals. - -**** New context sensitive line break function c-context-line-break. -It works like newline-and-indent in normal code, and adapts the line -prefix according to the comment style when used inside comments. If -you're normally using newline-and-indent, you might want to switch to -this function. - -*** Fixes to IDL mode. -It now does a better job in recognizing only the constructs relevant -to IDL. E.g. it no longer matches "class" as the beginning of a -struct block, but it does match the CORBA 2.3 "valuetype" keyword. -Thanks to Eric Eide. - -*** Improvements to the Whitesmith style. -It now keeps the style consistently on all levels and both when -opening braces hangs and when they don't. - -**** New lineup function c-lineup-whitesmith-in-block. - -*** New lineup functions c-lineup-template-args and c-indent-multi-line-block. -See their docstrings for details. c-lineup-template-args does a -better job of tracking the brackets used as parens in C++ templates, -and is used by default to line up continued template arguments. - -*** c-lineup-comment now preserves alignment with a comment on the -previous line. It used to instead preserve comments that started in -the column specified by comment-column. - -*** c-lineup-C-comments handles "free form" text comments. -In comments with a long delimiter line at the start, the indentation -is kept unchanged for lines that start with an empty comment line -prefix. This is intended for the type of large block comments that -contain documentation with its own formatting. In these you normally -don't want CC Mode to change the indentation. - -*** The `c' syntactic symbol is now relative to the comment start -instead of the previous line, to make integers usable as lineup -arguments. - -*** All lineup functions have gotten docstrings. - -*** More preprocessor directive movement functions. -c-down-conditional does the reverse of c-up-conditional. -c-up-conditional-with-else and c-down-conditional-with-else are -variants of these that also stops at "#else" lines (suggested by Don -Provan). - -*** Minor improvements to many movement functions in tricky situations. - -** Dired changes - -*** New variable `dired-recursive-deletes' determines if the delete -command will delete non-empty directories recursively. The default -is, delete only empty directories. - -*** New variable `dired-recursive-copies' determines if the copy -command will copy directories recursively. The default is, do not -copy directories recursively. - -*** In command `dired-do-shell-command' (usually bound to `!') a `?' -in the shell command has a special meaning similar to `*', but with -the difference that the command will be run on each file individually. - -*** The new command `dired-find-alternate-file' (usually bound to `a') -replaces the Dired buffer with the buffer for an alternate file or -directory. - -*** The new command `dired-show-file-type' (usually bound to `y') shows -a message in the echo area describing what type of file the point is on. -This command invokes the external program `file' do its work, and so -will only work on systems with that program, and will be only as -accurate or inaccurate as it is. - -*** Dired now properly handles undo changes of adding/removing `-R' -from ls switches. - -*** Dired commands that prompt for a destination file now allow the use -of the `M-n' command in the minibuffer to insert the source filename, -which the user can then edit. This only works if there is a single -source file, not when operating on multiple marked files. - -** Gnus changes. - -The Gnus NEWS entries are short, but they reflect sweeping changes in -four areas: Article display treatment, MIME treatment, -internationalization and mail-fetching. - -*** The mail-fetching functions have changed. See the manual for the -many details. In particular, all procmail fetching variables are gone. - -If you used procmail like in - -(setq nnmail-use-procmail t) -(setq nnmail-spool-file 'procmail) -(setq nnmail-procmail-directory "~/mail/incoming/") -(setq nnmail-procmail-suffix "\\.in") - -this now has changed to - -(setq mail-sources - '((directory :path "~/mail/incoming/" - :suffix ".in"))) - -More information is available in the info doc at Select Methods -> -Getting Mail -> Mail Sources - -*** Gnus is now a MIME-capable reader. This affects many parts of -Gnus, and adds a slew of new commands. See the manual for details. -Separate MIME packages like RMIME, mime-compose etc., will probably no -longer work; remove them and use the native facilities. - -The FLIM/SEMI package still works with Emacs 21, but if you want to -use the native facilities, you must remove any mailcap.el[c] that was -installed by FLIM/SEMI version 1.13 or earlier. - -*** Gnus has also been multilingualized. This also affects too many -parts of Gnus to summarize here, and adds many new variables. There -are built-in facilities equivalent to those of gnus-mule.el, which is -now just a compatibility layer. - -*** gnus-mule.el is now just a compatibility layer over the built-in -Gnus facilities. - -*** gnus-auto-select-first can now be a function to be -called to position point. - -*** The user can now decide which extra headers should be included in -summary buffers and NOV files. - -*** `gnus-article-display-hook' has been removed. Instead, a number -of variables starting with `gnus-treat-' have been added. - -*** The Gnus posting styles have been redone again and now work in a -subtly different manner. - -*** New web-based backends have been added: nnslashdot, nnwarchive -and nnultimate. nnweb has been revamped, again, to keep up with -ever-changing layouts. - -*** Gnus can now read IMAP mail via nnimap. - -*** There is image support of various kinds and some sound support. - -** Changes in Texinfo mode. - -*** A couple of new key bindings have been added for inserting Texinfo -macros - - Key binding Macro - ------------------------- - C-c C-c C-s @strong - C-c C-c C-e @emph - C-c C-c u @uref - C-c C-c q @quotation - C-c C-c m @email - C-c C-o @<block> ... @end <block> - M-RET @item - -*** The " key now inserts either " or `` or '' depending on context. - -** Changes in Outline mode. - -There is now support for Imenu to index headings. A new command -`outline-headers-as-kill' copies the visible headings in the region to -the kill ring, e.g. to produce a table of contents. - -** Changes to Emacs Server - -*** The new option `server-kill-new-buffers' specifies what to do -with buffers when done with them. If non-nil, the default, buffers -are killed, unless they were already present before visiting them with -Emacs Server. If nil, `server-temp-file-regexp' specifies which -buffers to kill, as before. - -Please note that only buffers are killed that still have a client, -i.e. buffers visited with `emacsclient --no-wait' are never killed in -this way. - -** Both emacsclient and Emacs itself now accept command line options -of the form +LINE:COLUMN in addition to +LINE. - -** Changes to Show Paren mode. - -*** Overlays used by Show Paren mode now use a priority property. -The new user option show-paren-priority specifies the priority to -use. Default is 1000. - -** New command M-x check-parens can be used to find unbalanced paren -groups and strings in buffers in Lisp mode (or other modes). - -** Changes to hideshow.el - -*** Generalized block selection and traversal - -A block is now recognized by its start and end regexps (both strings), -and an integer specifying which sub-expression in the start regexp -serves as the place where a `forward-sexp'-like function can operate. -See the documentation of variable `hs-special-modes-alist'. - -*** During incremental search, if Hideshow minor mode is active, -hidden blocks are temporarily shown. The variable `hs-headline' can -be used in the mode line format to show the line at the beginning of -the open block. - -*** User option `hs-hide-all-non-comment-function' specifies a -function to be called at each top-level block beginning, instead of -the normal block-hiding function. - -*** The command `hs-show-region' has been removed. - -*** The key bindings have changed to fit the Emacs conventions, -roughly imitating those of Outline minor mode. Notably, the prefix -for all bindings is now `C-c @'. For details, see the documentation -for `hs-minor-mode'. - -*** The variable `hs-show-hidden-short-form' has been removed, and -hideshow.el now always behaves as if this variable were set to t. - -** Changes to Change Log mode and Add-Log functions - -*** If you invoke `add-change-log-entry' from a backup file, it makes -an entry appropriate for the file's parent. This is useful for making -log entries by comparing a version with deleted functions. - -**** New command M-x change-log-merge merges another log into the -current buffer. - -*** New command M-x change-log-redate fixes any old-style date entries -in a log file. - -*** Change Log mode now adds a file's version number to change log -entries if user-option `change-log-version-info-enabled' is non-nil. -Unless the file is under version control the search for a file's -version number is performed based on regular expressions from -`change-log-version-number-regexp-list' which can be customized. -Version numbers are only found in the first 10 percent of a file. - -*** Change Log mode now defines its own faces for font-lock highlighting. - -** Changes to cmuscheme - -*** The user-option `scheme-program-name' has been renamed -`cmuscheme-program-name' due to conflicts with xscheme.el. - -** Changes in Font Lock - -*** The new function `font-lock-remove-keywords' can be used to remove -font-lock keywords from the current buffer or from a specific major mode. - -*** Multi-line patterns are now supported. Modes using this, should -set font-lock-multiline to t in their font-lock-defaults. - -*** `font-lock-syntactic-face-function' allows major-modes to choose -the face used for each string/comment. - -*** A new standard face `font-lock-doc-face'. -Meant for Lisp docstrings, Javadoc comments and other "documentation in code". - -** Changes to Shell mode - -*** The `shell' command now accepts an optional argument to specify the buffer -to use, which defaults to "*shell*". When used interactively, a -non-default buffer may be specified by giving the `shell' command a -prefix argument (causing it to prompt for the buffer name). - -** Comint (subshell) changes - -These changes generally affect all modes derived from comint mode, which -include shell-mode, gdb-mode, scheme-interaction-mode, etc. - -*** Comint now by default interprets some carriage-control characters. -Comint now removes CRs from CR LF sequences, and treats single CRs and -BSs in the output in a way similar to a terminal (by deleting to the -beginning of the line, or deleting the previous character, -respectively). This is achieved by adding `comint-carriage-motion' to -the `comint-output-filter-functions' hook by default. - -*** By default, comint no longer uses the variable `comint-prompt-regexp' -to distinguish prompts from user-input. Instead, it notices which -parts of the text were output by the process, and which entered by the -user, and attaches `field' properties to allow emacs commands to use -this information. Common movement commands, notably beginning-of-line, -respect field boundaries in a fairly natural manner. To disable this -feature, and use the old behavior, customize the user option -`comint-use-prompt-regexp-instead-of-fields'. - -*** Comint now includes new features to send commands to running processes -and redirect the output to a designated buffer or buffers. - -*** The command M-x comint-redirect-send-command reads a command and -buffer name from the mini-buffer. The command is sent to the current -buffer's process, and its output is inserted into the specified buffer. - -The command M-x comint-redirect-send-command-to-process acts like -M-x comint-redirect-send-command but additionally reads the name of -the buffer whose process should be used from the mini-buffer. - -*** Packages based on comint now highlight user input and program prompts, -and support choosing previous input with mouse-2. To control these features, -see the user-options `comint-highlight-input' and `comint-highlight-prompt'. - -*** The new command `comint-write-output' (usually bound to `C-c C-s') -saves the output from the most recent command to a file. With a prefix -argument, it appends to the file. - -*** The command `comint-kill-output' has been renamed `comint-delete-output' -(usually bound to `C-c C-o'); the old name is aliased to it for -compatibility. - -*** The new function `comint-add-to-input-history' adds commands to the input -ring (history). - -*** The new variable `comint-input-history-ignore' is a regexp for -identifying history lines that should be ignored, like tcsh time-stamp -strings, starting with a `#'. The default value of this variable is "^#". - -** Changes to Rmail mode - -*** The new user-option rmail-user-mail-address-regexp can be -set to fine tune the identification of the correspondent when -receiving new mail. If it matches the address of the sender, the -recipient is taken as correspondent of a mail. If nil, the default, -`user-login-name' and `user-mail-address' are used to exclude yourself -as correspondent. - -Usually you don't have to set this variable, except if you collect -mails sent by you under different user names. Then it should be a -regexp matching your mail addresses. - -*** The new user-option rmail-confirm-expunge controls whether and how -to ask for confirmation before expunging deleted messages from an -Rmail file. You can choose between no confirmation, confirmation -with y-or-n-p, or confirmation with yes-or-no-p. Default is to ask -for confirmation with yes-or-no-p. - -*** RET is now bound in the Rmail summary to rmail-summary-goto-msg, -like `j'. - -*** There is a new user option `rmail-digest-end-regexps' that -specifies the regular expressions to detect the line that ends a -digest message. - -*** The new user option `rmail-automatic-folder-directives' specifies -in which folder to put messages automatically. - -*** The new function `rmail-redecode-body' allows to fix a message -with non-ASCII characters if Emacs happens to decode it incorrectly -due to missing or malformed "charset=" header. - -** The new user-option `mail-envelope-from' can be used to specify -an envelope-from address different from user-mail-address. - -** The variable mail-specify-envelope-from controls whether to -use the -f option when sending mail. - -** The Rmail command `o' (`rmail-output-to-rmail-file') now writes the -current message in the internal `emacs-mule' encoding, rather than in -the encoding taken from the variable `buffer-file-coding-system'. -This allows to save messages whose characters cannot be safely encoded -by the buffer's coding system, and makes sure the message will be -displayed correctly when you later visit the target Rmail file. - -If you want your Rmail files be encoded in a specific coding system -other than `emacs-mule', you can customize the variable -`rmail-file-coding-system' to set its value to that coding system. - -** Changes to TeX mode - -*** The default mode has been changed from `plain-tex-mode' to -`latex-mode'. - -*** latex-mode now has a simple indentation algorithm. - -*** M-f and M-p jump around \begin...\end pairs. - -*** Added support for outline-minor-mode. - -** Changes to RefTeX mode - -*** RefTeX has new support for index generation. Index entries can be - created with `C-c <', with completion available on index keys. - Pressing `C-c /' indexes the word at the cursor with a default - macro. `C-c >' compiles all index entries into an alphabetically - sorted *Index* buffer which looks like the final index. Entries - can be edited from that buffer. - -*** Label and citation key selection now allow to select several - items and reference them together (use `m' to mark items, `a' or - `A' to use all marked entries). - -*** reftex.el has been split into a number of smaller files to reduce - memory use when only a part of RefTeX is being used. - -*** a new command `reftex-view-crossref-from-bibtex' (bound to `C-c &' - in BibTeX-mode) can be called in a BibTeX database buffer in order - to show locations in LaTeX documents where a particular entry has - been cited. - -** Emacs Lisp mode now allows multiple levels of outline headings. -The level of a heading is determined from the number of leading -semicolons in a heading line. Toplevel forms starting with a `(' -in column 1 are always made leaves. - -** The M-x time-stamp command (most commonly used on write-file-hooks) -has the following new features: - -*** The patterns for finding the time stamp and for updating a pattern -may match text spanning multiple lines. For example, some people like -to have the filename and date on separate lines. The new variable -time-stamp-inserts-lines controls the matching for multi-line patterns. - -*** More than one time stamp can be updated in the same file. This -feature is useful if you need separate time stamps in a program source -file to both include in formatted documentation and insert in the -compiled binary. The same time-stamp will be written at each matching -pattern. The variable time-stamp-count enables this new feature; it -defaults to 1. - -** Partial Completion mode now completes environment variables in -file names. - -** Ispell changes - -*** The command `ispell' now spell-checks a region if -transient-mark-mode is on, and the mark is active. Otherwise it -spell-checks the current buffer. - -*** Support for synchronous subprocesses - DOS/Windoze - has been -added. - -*** An "alignment error" bug was fixed when a manual spelling -correction is made and re-checked. - -*** Italian, Portuguese, and Slovak dictionary definitions have been added. - -*** Region skipping performance has been vastly improved in some -cases. - -*** Spell checking HTML buffers has been improved and isn't so strict -on syntax errors. - -*** The buffer-local words are now always placed on a new line at the -end of the buffer. - -*** Spell checking now works in the MS-DOS version of Emacs. - -** Makefile mode changes - -*** The mode now uses the abbrev table `makefile-mode-abbrev-table'. - -*** Conditionals and include statements are now highlighted when -Fontlock mode is active. - -** Isearch changes - -*** Isearch now puts a call to `isearch-resume' in the command history, -so that searches can be resumed. - -*** In Isearch mode, C-M-s and C-M-r are now bound like C-s and C-r, -respectively, i.e. you can repeat a regexp isearch with the same keys -that started the search. - -*** In Isearch mode, mouse-2 in the echo area now yanks the current -selection into the search string rather than giving an error. - -*** There is a new lazy highlighting feature in incremental search. - -Lazy highlighting is switched on/off by customizing variable -`isearch-lazy-highlight'. When active, all matches for the current -search string are highlighted. The current match is highlighted as -before using face `isearch' or `region'. All other matches are -highlighted using face `isearch-lazy-highlight-face' which defaults to -`secondary-selection'. - -The extra highlighting makes it easier to anticipate where the cursor -will end up each time you press C-s or C-r to repeat a pending search. -Highlighting of these additional matches happens in a deferred fashion -using "idle timers," so the cycles needed do not rob isearch of its -usual snappy response. - -If `isearch-lazy-highlight-cleanup' is set to t, highlights for -matches are automatically cleared when you end the search. If it is -set to nil, you can remove the highlights manually with `M-x -isearch-lazy-highlight-cleanup'. - -** VC Changes - -VC has been overhauled internally. It is now modular, making it -easier to plug-in arbitrary version control backends. (See Lisp -Changes for details on the new structure.) As a result, the mechanism -to enable and disable support for particular version systems has -changed: everything is now controlled by the new variable -`vc-handled-backends'. Its value is a list of symbols that identify -version systems; the default is '(RCS CVS SCCS). When finding a file, -each of the backends in that list is tried in order to see whether the -file is registered in that backend. - -When registering a new file, VC first tries each of the listed -backends to see if any of them considers itself "responsible" for the -directory of the file (e.g. because a corresponding subdirectory for -master files exists). If none of the backends is responsible, then -the first backend in the list that could register the file is chosen. -As a consequence, the variable `vc-default-back-end' is now obsolete. - -The old variable `vc-master-templates' is also obsolete, although VC -still supports it for backward compatibility. To define templates for -RCS or SCCS, you should rather use the new variables -vc-{rcs,sccs}-master-templates. (There is no such feature under CVS -where it doesn't make sense.) - -The variables `vc-ignore-vc-files' and `vc-handle-cvs' are also -obsolete now, you must set `vc-handled-backends' to nil or exclude -`CVS' from the list, respectively, to achieve their effect now. - -*** General Changes - -The variable `vc-checkout-carefully' is obsolete: the corresponding -checks are always done now. - -VC Dired buffers are now kept up-to-date during all version control -operations. - -`vc-diff' output is now displayed in `diff-mode'. -`vc-print-log' uses `log-view-mode'. -`vc-log-mode' (used for *VC-Log*) has been replaced by `log-edit-mode'. - -The command C-x v m (vc-merge) now accepts an empty argument as the -first revision number. This means that any recent changes on the -current branch should be picked up from the repository and merged into -the working file (``merge news''). - -The commands C-x v s (vc-create-snapshot) and C-x v r -(vc-retrieve-snapshot) now ask for a directory name from which to work -downwards. - -*** Multiple Backends - -VC now lets you register files in more than one backend. This is -useful, for example, if you are working with a slow remote CVS -repository. You can then use RCS for local editing, and occasionally -commit your changes back to CVS, or pick up changes from CVS into your -local RCS archives. - -To make this work, the ``more local'' backend (RCS in our example) -should come first in `vc-handled-backends', and the ``more remote'' -backend (CVS) should come later. (The default value of -`vc-handled-backends' already has it that way.) - -You can then commit changes to another backend (say, RCS), by typing -C-u C-x v v RCS RET (i.e. vc-next-action now accepts a backend name as -a revision number). VC registers the file in the more local backend -if that hasn't already happened, and commits to a branch based on the -current revision number from the more remote backend. - -If a file is registered in multiple backends, you can switch to -another one using C-x v b (vc-switch-backend). This does not change -any files, it only changes VC's perspective on the file. Use this to -pick up changes from CVS while working under RCS locally. - -After you are done with your local RCS editing, you can commit your -changes back to CVS using C-u C-x v v CVS RET. In this case, the -local RCS archive is removed after the commit, and the log entry -buffer is initialized to contain the entire RCS change log of the file. - -*** Changes for CVS - -There is a new user option, `vc-cvs-stay-local'. If it is `t' (the -default), then VC avoids network queries for files registered in -remote repositories. The state of such files is then only determined -by heuristics and past information. `vc-cvs-stay-local' can also be a -regexp to match against repository hostnames; only files from hosts -that match it are treated locally. If the variable is nil, then VC -queries the repository just as often as it does for local files. - -If `vc-cvs-stay-local' is on, then VC also makes local backups of -repository versions. This means that ordinary diffs (C-x v =) and -revert operations (C-x v u) can be done completely locally, without -any repository interactions at all. The name of a local version -backup of FILE is FILE.~REV.~, where REV is the repository version -number. This format is similar to that used by C-x v ~ -(vc-version-other-window), except for the trailing dot. As a matter -of fact, the two features can each use the files created by the other, -the only difference being that files with a trailing `.' are deleted -automatically after commit. (This feature doesn't work on MS-DOS, -since DOS disallows more than a single dot in the trunk of a file -name.) - -If `vc-cvs-stay-local' is on, and there have been changes in the -repository, VC notifies you about it when you actually try to commit. -If you want to check for updates from the repository without trying to -commit, you can either use C-x v m RET to perform an update on the -current file, or you can use C-x v r RET to get an update for an -entire directory tree. - -The new user option `vc-cvs-use-edit' indicates whether VC should call -"cvs edit" to make files writeable; it defaults to `t'. (This option -is only meaningful if the CVSREAD variable is set, or if files are -"watched" by other developers.) - -The commands C-x v s (vc-create-snapshot) and C-x v r -(vc-retrieve-snapshot) are now also implemented for CVS. If you give -an empty snapshot name to the latter, that performs a `cvs update', -starting at the given directory. - -*** Lisp Changes in VC - -VC has been restructured internally to make it modular. You can now -add support for arbitrary version control backends by writing a -library that provides a certain set of backend-specific functions, and -then telling VC to use that library. For example, to add support for -a version system named SYS, you write a library named vc-sys.el, which -provides a number of functions vc-sys-... (see commentary at the top -of vc.el for a detailed list of them). To make VC use that library, -you need to put it somewhere into Emacs' load path and add the symbol -`SYS' to the list `vc-handled-backends'. - -** The customizable EDT emulation package now supports the EDT -SUBS command and EDT scroll margins. It also works with more -terminal/keyboard configurations and it now works under XEmacs. -See etc/edt-user.doc for more information. - -** New modes and packages - -*** The new global minor mode `minibuffer-electric-default-mode' -automatically hides the `(default ...)' part of minibuffer prompts when -the default is not applicable. - -*** Artist is an Emacs lisp package that allows you to draw lines, -rectangles and ellipses by using your mouse and/or keyboard. The -shapes are made up with the ascii characters |, -, / and \. - -Features are: - -- Intersecting: When a `|' intersects with a `-', a `+' is - drawn, like this: | \ / - --+-- X - | / \ - -- Rubber-banding: When drawing lines you can interactively see the - result while holding the mouse button down and moving the mouse. If - your machine is not fast enough (a 386 is a bit too slow, but a - pentium is well enough), you can turn this feature off. You will - then see 1's and 2's which mark the 1st and 2nd endpoint of the line - you are drawing. - -- Arrows: After having drawn a (straight) line or a (straight) - poly-line, you can set arrows on the line-ends by typing < or >. - -- Flood-filling: You can fill any area with a certain character by - flood-filling. - -- Cut copy and paste: You can cut, copy and paste rectangular - regions. Artist also interfaces with the rect package (this can be - turned off if it causes you any trouble) so anything you cut in - artist can be yanked with C-x r y and vice versa. - -- Drawing with keys: Everything you can do with the mouse, you can - also do without the mouse. - -- Aspect-ratio: You can set the variable artist-aspect-ratio to - reflect the height-width ratio for the font you are using. Squares - and circles are then drawn square/round. Note, that once your - ascii-file is shown with font with a different height-width ratio, - the squares won't be square and the circles won't be round. - -- Drawing operations: The following drawing operations are implemented: - - lines straight-lines - rectangles squares - poly-lines straight poly-lines - ellipses circles - text (see-thru) text (overwrite) - spray-can setting size for spraying - vaporize line vaporize lines - erase characters erase rectangles - - Straight lines are lines that go horizontally, vertically or - diagonally. Plain lines go in any direction. The operations in - the right column are accessed by holding down the shift key while - drawing. - - It is possible to vaporize (erase) entire lines and connected lines - (rectangles for example) as long as the lines being vaporized are - straight and connected at their endpoints. Vaporizing is inspired - by the drawrect package by Jari Aalto <jari.aalto@poboxes.com>. - -- Picture mode compatibility: Artist is picture mode compatible (this - can be turned off). - -*** The new package Eshell is an operating system command shell -implemented entirely in Emacs Lisp. Use `M-x eshell' to invoke it. -It functions similarly to bash and zsh, and allows running of Lisp -functions and external commands using the same syntax. It supports -history lists, aliases, extended globbing, smart scrolling, etc. It -will work on any platform Emacs has been ported to. And since most of -the basic commands -- ls, rm, mv, cp, ln, du, cat, etc. -- have been -rewritten in Lisp, it offers an operating-system independent shell, -all within the scope of your Emacs process. - -*** The new package timeclock.el is a mode is for keeping track of time -intervals. You can use it for whatever purpose you like, but the -typical scenario is to keep track of how much time you spend working -on certain projects. - -*** The new package hi-lock.el provides commands to highlight matches -of interactively entered regexps. For example, - - M-x highlight-regexp RET clearly RET RET - -will highlight all occurrences of `clearly' using a yellow background -face. New occurrences of `clearly' will be highlighted as they are -typed. `M-x unhighlight-regexp RET' will remove the highlighting. -Any existing face can be used for highlighting and a set of -appropriate faces is provided. The regexps can be written into the -current buffer in a form that will be recognized the next time the -corresponding file is read. There are commands to highlight matches -to phrases and to highlight entire lines containing a match. - -*** The new package zone.el plays games with Emacs' display when -Emacs is idle. - -*** The new package tildify.el allows to add hard spaces or other text -fragments in accordance with the current major mode. - -*** The new package xml.el provides a simple but generic XML -parser. It doesn't parse the DTDs however. - -*** The comment operations are now provided by the newcomment.el -package which allows different styles of comment-region and should -be more robust while offering the same functionality. -`comment-region' now doesn't always comment a-line-at-a-time, but only -comments the region, breaking the line at point if necessary. - -*** The Ebrowse package implements a C++ class browser and tags -facilities tailored for use with C++. It is documented in a -separate Texinfo file. - -*** The PCL-CVS package available by either running M-x cvs-examine or -by visiting a CVS administrative directory (with a prefix argument) -provides an alternative interface to VC-dired for CVS. It comes with -`log-view-mode' to view RCS and SCCS logs and `log-edit-mode' used to -enter check-in log messages. - -*** The new package called `woman' allows to browse Unix man pages -without invoking external programs. - -The command `M-x woman' formats manual pages entirely in Emacs Lisp -and then displays them, like `M-x manual-entry' does. Unlike -`manual-entry', `woman' does not invoke any external programs, so it -is useful on systems such as MS-DOS/MS-Windows where the `man' and -Groff or `troff' commands are not readily available. - -The command `M-x woman-find-file' asks for the file name of a man -page, then formats and displays it like `M-x woman' does. - -*** The new command M-x re-builder offers a convenient interface for -authoring regular expressions with immediate visual feedback. - -The buffer from which the command was called becomes the target for -the regexp editor popping up in a separate window. Matching text in -the target buffer is immediately color marked during the editing. -Each sub-expression of the regexp will show up in a different face so -even complex regexps can be edited and verified on target data in a -single step. - -On displays not supporting faces the matches instead blink like -matching parens to make them stand out. On such a setup you will -probably also want to use the sub-expression mode when the regexp -contains such to get feedback about their respective limits. - -*** glasses-mode is a minor mode that makes -unreadableIdentifiersLikeThis readable. It works as glasses, without -actually modifying content of a buffer. - -*** The package ebnf2ps translates an EBNF to a syntactic chart in -PostScript. - -Currently accepts ad-hoc EBNF, ISO EBNF and Bison/Yacc. - -The ad-hoc default EBNF syntax has the following elements: - - ; comment (until end of line) - A non-terminal - "C" terminal - ?C? special - $A default non-terminal - $"C" default terminal - $?C? default special - A = B. production (A is the header and B the body) - C D sequence (C occurs before D) - C | D alternative (C or D occurs) - A - B exception (A excluding B, B without any non-terminal) - n * A repetition (A repeats n (integer) times) - (C) group (expression C is grouped together) - [C] optional (C may or not occurs) - C+ one or more occurrences of C - {C}+ one or more occurrences of C - {C}* zero or more occurrences of C - {C} zero or more occurrences of C - C / D equivalent to: C {D C}* - {C || D}+ equivalent to: C {D C}* - {C || D}* equivalent to: [C {D C}*] - {C || D} equivalent to: [C {D C}*] - -Please, see ebnf2ps documentation for EBNF syntax and how to use it. - -*** The package align.el will align columns within a region, using M-x -align. Its mode-specific rules, based on regular expressions, -determine where the columns should be split. In C and C++, for -example, it will align variable names in declaration lists, or the -equal signs of assignments. - -*** `paragraph-indent-minor-mode' is a new minor mode supporting -paragraphs in the same style as `paragraph-indent-text-mode'. - -*** bs.el is a new package for buffer selection similar to -list-buffers or electric-buffer-list. Use M-x bs-show to display a -buffer menu with this package. See the Custom group `bs'. - -*** find-lisp.el is a package emulating the Unix find command in Lisp. - -*** calculator.el is a small calculator package that is intended to -replace desktop calculators such as xcalc and calc.exe. Actually, it -is not too small - it has more features than most desktop calculators, -and can be customized easily to get many more functions. It should -not be confused with "calc" which is a much bigger mathematical tool -which answers different needs. - -*** The minor modes cwarn-mode and global-cwarn-mode highlights -suspicious C and C++ constructions. Currently, assignments inside -expressions, semicolon following `if', `for' and `while' (except, of -course, after a `do .. while' statement), and C++ functions with -reference parameters are recognized. The modes require font-lock mode -to be enabled. - -*** smerge-mode.el provides `smerge-mode', a simple minor-mode for files -containing diff3-style conflict markers, such as generated by RCS. - -*** 5x5.el is a simple puzzle game. - -*** hl-line.el provides `hl-line-mode', a minor mode to highlight the -current line in the current buffer. It also provides -`global-hl-line-mode' to provide the same behavior in all buffers. - -*** ansi-color.el translates ANSI terminal escapes into text-properties. - -Please note: if `ansi-color-for-comint-mode' and -`global-font-lock-mode' are non-nil, loading ansi-color.el will -disable font-lock and add `ansi-color-apply' to -`comint-preoutput-filter-functions' for all shell-mode buffers. This -displays the output of "ls --color=yes" using the correct foreground -and background colors. - -*** delphi.el provides a major mode for editing the Delphi (Object -Pascal) language. - -*** quickurl.el provides a simple method of inserting a URL based on -the text at point. - -*** sql.el provides an interface to SQL data bases. - -*** fortune.el uses the fortune program to create mail/news signatures. - -*** whitespace.el is a package for warning about and cleaning bogus -whitespace in a file. - -*** PostScript mode (ps-mode) is a new major mode for editing PostScript -files. It offers: interaction with a PostScript interpreter, including -(very basic) error handling; fontification, easily customizable for -interpreter messages; auto-indentation; insertion of EPSF templates and -often used code snippets; viewing of BoundingBox; commenting out / -uncommenting regions; conversion of 8bit characters to PostScript octal -codes. All functionality is accessible through a menu. - -*** delim-col helps to prettify columns in a text region or rectangle. - -Here is an example of columns: - -horse apple bus -dog pineapple car EXTRA -porcupine strawberry airplane - -Doing the following settings: - - (setq delimit-columns-str-before "[ ") - (setq delimit-columns-str-after " ]") - (setq delimit-columns-str-separator ", ") - (setq delimit-columns-separator "\t") - - -Selecting the lines above and typing: - - M-x delimit-columns-region - -It results: - -[ horse , apple , bus , ] -[ dog , pineapple , car , EXTRA ] -[ porcupine, strawberry, airplane, ] - -delim-col has the following options: - - delimit-columns-str-before Specify a string to be inserted - before all columns. - - delimit-columns-str-separator Specify a string to be inserted - between each column. - - delimit-columns-str-after Specify a string to be inserted - after all columns. - - delimit-columns-separator Specify a regexp which separates - each column. - -delim-col has the following commands: - - delimit-columns-region Prettify all columns in a text region. - delimit-columns-rectangle Prettify all columns in a text rectangle. - -*** Recentf mode maintains a menu for visiting files that were -operated on recently. User option recentf-menu-filter specifies a -menu filter function to change the menu appearance. For example, the -recent file list can be displayed: - -- organized by major modes, directories or user defined rules. -- sorted by file paths, file names, ascending or descending. -- showing paths relative to the current default-directory - -The `recentf-filter-changer' menu filter function allows to -dynamically change the menu appearance. - -*** elide-head.el provides a mechanism for eliding boilerplate header -text. - -*** footnote.el provides `footnote-mode', a minor mode supporting use -of footnotes. It is intended for use with Message mode, but isn't -specific to Message mode. - -*** diff-mode.el provides `diff-mode', a major mode for -viewing/editing context diffs (patches). It is selected for files -with extension `.diff', `.diffs', `.patch' and `.rej'. - -*** EUDC, the Emacs Unified Directory Client, provides a common user -interface to access directory servers using different directory -protocols. It has a separate manual. - -*** autoconf.el provides a major mode for editing configure.in files -for Autoconf, selected automatically. - -*** windmove.el provides moving between windows. - -*** crm.el provides a facility to read multiple strings from the -minibuffer with completion. - -*** todo-mode.el provides management of TODO lists and integration -with the diary features. - -*** autoarg.el provides a feature reported from Twenex Emacs whereby -numeric keys supply prefix args rather than self inserting. - -*** The function `turn-off-auto-fill' unconditionally turns off Auto -Fill mode. - -*** pcomplete.el is a library that provides programmable completion -facilities for Emacs, similar to what zsh and tcsh offer. The main -difference is that completion functions are written in Lisp, meaning -they can be profiled, debugged, etc. - -*** antlr-mode is a new major mode for editing ANTLR grammar files. -It is automatically turned on for files whose names have the extension -`.g'. - -** Changes in sort.el - -The function sort-numeric-fields interprets numbers starting with `0' -as octal and numbers starting with `0x' or `0X' as hexadecimal. The -new user-option sort-numeric-base can be used to specify a default -numeric base. - -** Changes to Ange-ftp - -*** Ange-ftp allows you to specify of a port number in remote file -names cleanly. It is appended to the host name, separated by a hash -sign, e.g. `/foo@bar.org#666:mumble'. (This syntax comes from EFS.) - -*** If the new user-option `ange-ftp-try-passive-mode' is set, passive -ftp mode will be used if the ftp client supports that. - -*** Ange-ftp handles the output of the w32-style clients which -output ^M at the end of lines. - -** The recommended way of using Iswitchb is via the new global minor -mode `iswitchb-mode'. - -** Just loading the msb package doesn't switch on Msb mode anymore. -If you have `(require 'msb)' in your .emacs, please replace it with -`(msb-mode 1)'. - -** Flyspell mode has various new options. See the `flyspell' Custom -group. - -** The user option `backward-delete-char-untabify-method' controls the -behavior of `backward-delete-char-untabify'. The following values -are recognized: - -`untabify' -- turn a tab to many spaces, then delete one space; -`hungry' -- delete all whitespace, both tabs and spaces; -`all' -- delete all whitespace, including tabs, spaces and newlines; -nil -- just delete one character. - -Default value is `untabify'. - -[This change was made in Emacs 20.3 but not mentioned then.] - -** In Cperl mode `cperl-invalid-face' should now be a normal face -symbol, not double-quoted. - -** Some packages are declared obsolete, to be removed in a future -version. They are: auto-show, c-mode, hilit19, hscroll, ooutline, -profile, rnews, rnewspost, and sc. Their implementations have been -moved to lisp/obsolete. - -** auto-compression mode is no longer enabled just by loading jka-compr.el. -To control it, set `auto-compression-mode' via Custom or use the -`auto-compression-mode' command. - -** `browse-url-gnome-moz' is a new option for -`browse-url-browser-function', invoking Mozilla in GNOME, and -`browse-url-kde' can be chosen for invoking the KDE browser. - -** The user-option `browse-url-new-window-p' has been renamed to -`browse-url-new-window-flag'. - -** The functions `keep-lines', `flush-lines' and `how-many' now -operate on the active region in Transient Mark mode. - -** `gnus-user-agent' is a new possibility for `mail-user-agent'. It -is like `message-user-agent', but with all the Gnus paraphernalia. - -** The Strokes package has been updated. If your Emacs has XPM -support, you can use it for pictographic editing. In Strokes mode, -use C-mouse-2 to compose a complex stoke and insert it into the -buffer. You can encode or decode a strokes buffer with new commands -M-x strokes-encode-buffer and M-x strokes-decode-buffer. There is a -new command M-x strokes-list-strokes. - -** Hexl contains a new command `hexl-insert-hex-string' which inserts -a string of hexadecimal numbers read from the mini-buffer. - -** Hexl mode allows to insert non-ASCII characters. - -The non-ASCII characters are encoded using the same encoding as the -file you are visiting in Hexl mode. - -** Shell script mode changes. - -Shell script mode (sh-script) can now indent scripts for shells -derived from sh and rc. The indentation style is customizable, and -sh-script can attempt to "learn" the current buffer's style. - -** Etags changes. - -*** In DOS, etags looks for file.cgz if it cannot find file.c. - -*** New option --ignore-case-regex is an alternative to --regex. It is now -possible to bind a regexp to a language, by prepending the regexp with -{lang}, where lang is one of the languages that `etags --help' prints out. -This feature is useful especially for regex files, where each line contains -a regular expression. The manual contains details. - -*** In C and derived languages, etags creates tags for function -declarations when given the --declarations option. - -*** In C++, tags are created for "operator". The tags have the form -"operator+", without spaces between the keyword and the operator. - -*** You shouldn't generally need any more the -C or -c++ option: etags -automatically switches to C++ parsing when it meets the `class' or -`template' keywords. - -*** Etags now is able to delve at arbitrary deeps into nested structures in -C-like languages. Previously, it was limited to one or two brace levels. - -*** New language Ada: tags are functions, procedures, packages, tasks, and -types. - -*** In Fortran, `procedure' is not tagged. - -*** In Java, tags are created for "interface". - -*** In Lisp, "(defstruct (foo", "(defun (operator" and similar constructs -are now tagged. - -*** In makefiles, tags the targets. - -*** In Perl, the --globals option tags global variables. my and local -variables are tagged. - -*** New language Python: def and class at the beginning of a line are tags. - -*** .ss files are Scheme files, .pdb is Postscript with C syntax, .psw is -for PSWrap. - -** Changes in etags.el - -*** The new user-option tags-case-fold-search can be used to make -tags operations case-sensitive or case-insensitive. The default -is to use the same setting as case-fold-search. - -*** You can display additional output with M-x tags-apropos by setting -the new variable tags-apropos-additional-actions. - -If non-nil, the variable's value should be a list of triples (TITLE -FUNCTION TO-SEARCH). For each triple, M-x tags-apropos processes -TO-SEARCH and lists tags from it. TO-SEARCH should be an alist, -obarray, or symbol. If it is a symbol, the symbol's value is used. - -TITLE is a string to use to label the list of tags from TO-SEARCH. - -FUNCTION is a function to call when an entry is selected in the Tags -List buffer. It is called with one argument, the selected symbol. - -A useful example value for this variable might be something like: - - '(("Emacs Lisp" Info-goto-emacs-command-node obarray) - ("Common Lisp" common-lisp-hyperspec common-lisp-hyperspec-obarray) - ("SCWM" scwm-documentation scwm-obarray)) - -*** The face tags-tag-face can be used to customize the appearance -of tags in the output of M-x tags-apropos. - -*** Setting tags-apropos-verbose to a non-nil value displays the -names of tags files in the *Tags List* buffer. - -*** You can now search for tags that are part of the filename itself. -If you have tagged the files topfile.c subdir/subfile.c -/tmp/tempfile.c, you can now search for tags "topfile.c", "subfile.c", -"dir/sub", "tempfile", "tempfile.c". If the tag matches the file name, -point will go to the beginning of the file. - -*** Compressed files are now transparently supported if -auto-compression-mode is active. You can tag (with Etags) and search -(with find-tag) both compressed and uncompressed files. - -*** Tags commands like M-x tags-search no longer change point -in buffers where no match is found. In buffers where a match is -found, the original value of point is pushed on the marker ring. - -** Fortran mode has a new command `fortran-strip-sequence-nos' to -remove text past column 72. The syntax class of `\' in Fortran is now -appropriate for C-style escape sequences in strings. - -** SGML mode's default `sgml-validate-command' is now `nsgmls'. - -** A new command `view-emacs-problems' (C-h P) displays the PROBLEMS file. - -** The Dabbrev package has a new user-option `dabbrev-ignored-regexps' -containing a list of regular expressions. Buffers matching a regular -expression from that list, are not checked. - -** Emacs can now figure out modification times of remote files. -When you do C-x C-f /user@host:/path/file RET and edit the file, -and someone else modifies the file, you will be prompted to revert -the buffer, just like for the local files. - -** The buffer menu (C-x C-b) no longer lists the *Buffer List* buffer. - -** When invoked with a prefix argument, the command `list-abbrevs' now -displays local abbrevs, only. - -** Refill minor mode provides preliminary support for keeping -paragraphs filled as you modify them. - -** The variable `double-click-fuzz' specifies how much the mouse -may be moved between clicks that are recognized as a pair. Its value -is measured in pixels. - -** The new global minor mode `auto-image-file-mode' allows image files -to be visited as images. - -** Two new user-options `grep-command' and `grep-find-command' -were added to compile.el. - -** Withdrawn packages - -*** mldrag.el has been removed. mouse.el provides the same -functionality with aliases for the mldrag functions. - -*** eval-reg.el has been obsoleted by changes to edebug.el and removed. - -*** ph.el has been obsoleted by EUDC and removed. - - -* Incompatible Lisp changes - -There are a few Lisp changes which are not backwards-compatible and -may require changes to existing code. Here is a list for reference. -See the sections below for details. - -** Since `format' preserves text properties, the idiom -`(format "%s" foo)' no longer works to copy and remove properties. -Use `copy-sequence' to copy the string, then use `set-text-properties' -to remove the properties of the copy. - -** Since the `keymap' text property now has significance, some code -which uses both `local-map' and `keymap' properties (for portability) -may, for instance, give rise to duplicate menus when the keymaps from -these properties are active. - -** The change in the treatment of non-ASCII characters in search -ranges may affect some code. - -** A non-nil value for the LOCAL arg of add-hook makes the hook -buffer-local even if `make-local-hook' hasn't been called, which might -make a difference to some code. - -** The new treatment of the minibuffer prompt might affect code which -operates on the minibuffer. - -** The new character sets `eight-bit-control' and `eight-bit-graphic' -cause `no-conversion' and `emacs-mule-unix' coding systems to produce -different results when reading files with non-ASCII characters -(previously, both coding systems would produce the same results). -Specifically, `no-conversion' interprets each 8-bit byte as a separate -character. This makes `no-conversion' inappropriate for reading -multibyte text, e.g. buffers written to disk in their internal MULE -encoding (auto-saving does that, for example). If a Lisp program -reads such files with `no-conversion', each byte of the multibyte -sequence, including the MULE leading codes such as \201, is treated as -a separate character, which prevents them from being interpreted in -the buffer as multibyte characters. - -Therefore, Lisp programs that read files which contain the internal -MULE encoding should use `emacs-mule-unix'. `no-conversion' is only -appropriate for reading truly binary files. - -** Code that relies on the obsolete `before-change-function' and -`after-change-function' to detect buffer changes will now fail. Use -`before-change-functions' and `after-change-functions' instead. - -** Code that uses `concat' with integer args now gets an error, as -long promised. So does any code that uses derivatives of `concat', -such as `mapconcat'. - -** The function base64-decode-string now always returns a unibyte -string. - -** Not a Lisp incompatibility as such but, with the introduction of -extra private charsets, there is now only one slot free for a new -dimension-2 private charset. User code which tries to add more than -one extra will fail unless you rebuild Emacs with some standard -charset(s) removed; that is probably inadvisable because it changes -the emacs-mule encoding. Also, files stored in the emacs-mule -encoding using Emacs 20 with additional private charsets defined will -probably not be read correctly by Emacs 21. - -** The variable `directory-sep-char' is slated for removal. -Not really a change (yet), but a projected one that you should be -aware of: The variable `directory-sep-char' is deprecated, and should -not be used. It was always ignored on GNU/Linux and Unix systems and -on MS-DOS, but the MS-Windows port tried to support it by adapting the -behavior of certain primitives to the value of this variable. It -turned out that such support cannot be reliable, so it was decided to -remove this variable in the near future. Lisp programs are well -advised not to set it to anything but '/', because any different value -will not have any effect when support for this variable is removed. - - -* Lisp changes made after edition 2.6 of the Emacs Lisp Manual, -(Display-related features are described in a page of their own below.) - -** Function assq-delete-all replaces function assoc-delete-all. - -** The new function animate-string, from lisp/play/animate.el -allows the animated display of strings. - -** The new function `interactive-form' can be used to obtain the -interactive form of a function. - -** The keyword :set-after in defcustom allows to specify dependencies -between custom options. Example: - - (defcustom default-input-method nil - "*Default input method for multilingual text (a string). - This is the input method activated automatically by the command - `toggle-input-method' (\\[toggle-input-method])." - :group 'mule - :type '(choice (const nil) string) - :set-after '(current-language-environment)) - -This specifies that default-input-method should be set after -current-language-environment even if default-input-method appears -first in a custom-set-variables statement. - -** The new hook `kbd-macro-termination-hook' is run at the end of -function execute-kbd-macro. Functions on this hook are called with no -args. The hook is run independent of how the macro was terminated -(signal or normal termination). - -** Functions `butlast' and `nbutlast' for removing trailing elements -from a list are now available without requiring the CL package. - -** The new user-option `even-window-heights' can be set to nil -to prevent `display-buffer' from evening out window heights. - -** The user-option `face-font-registry-alternatives' specifies -alternative font registry names to try when looking for a font. - -** Function `md5' calculates the MD5 "message digest"/"checksum". - -** Function `delete-frame' runs `delete-frame-hook' before actually -deleting the frame. The hook is called with one arg, the frame -being deleted. - -** `add-hook' now makes the hook local if called with a non-nil LOCAL arg. - -** The treatment of non-ASCII characters in search ranges has changed. -If a range in a regular expression or the arg of -skip-chars-forward/backward starts with a unibyte character C and ends -with a multibyte character C2, the range is divided into two: one is -C..?\377, the other is C1..C2, where C1 is the first character of C2's -charset. - -** The new function `display-message-or-buffer' displays a message in -the echo area or pops up a buffer, depending on the length of the -message. - -** The new macro `with-auto-compression-mode' allows evaluating an -expression with auto-compression-mode enabled. - -** In image specifications, `:heuristic-mask' has been replaced -with the more general `:mask' property. - -** Image specifications accept more `:conversion's. - -** A `?' can be used in a symbol name without escaping it with a -backslash. - -** Reading from the mini-buffer now reads from standard input if Emacs -is running in batch mode. For example, - - (message "%s" (read t)) - -will read a Lisp expression from standard input and print the result -to standard output. - -** The argument of `down-list', `backward-up-list', `up-list', -`kill-sexp', `backward-kill-sexp' and `mark-sexp' is now optional. - -** If `display-buffer-reuse-frames' is set, function `display-buffer' -will raise frames displaying a buffer, instead of creating a new -frame or window. - -** Two new functions for removing elements from lists/sequences -were added - -- Function: remove ELT SEQ - -Return a copy of SEQ with all occurrences of ELT removed. SEQ must be -a list, vector, or string. The comparison is done with `equal'. - -- Function: remq ELT LIST - -Return a copy of LIST with all occurrences of ELT removed. The -comparison is done with `eq'. - -** The function `delete' now also works with vectors and strings. - -** The meaning of the `:weakness WEAK' argument of make-hash-table -has been changed: WEAK can now have new values `key-or-value' and -`key-and-value', in addition to `nil', `key', `value', and `t'. - -** Function `aset' stores any multibyte character in any string -without signaling "Attempt to change char length of a string". It may -convert a unibyte string to multibyte if necessary. - -** The value of the `help-echo' text property is called as a function -or evaluated, if it is not a string already, to obtain a help string. - -** Function `make-obsolete' now has an optional arg to say when the -function was declared obsolete. - -** Function `plist-member' is renamed from `widget-plist-member' (which is -retained as an alias). - -** Easy-menu's :filter now takes the unconverted form of the menu and -the result is automatically converted to Emacs' form. - -** The new function `window-list' has been defined - -- Function: window-list &optional FRAME WINDOW MINIBUF - -Return a list of windows on FRAME, starting with WINDOW. FRAME nil or -omitted means use the selected frame. WINDOW nil or omitted means use -the selected window. MINIBUF t means include the minibuffer window, -even if it isn't active. MINIBUF nil or omitted means include the -minibuffer window only if it's active. MINIBUF neither nil nor t -means never include the minibuffer window. - -** There's a new function `get-window-with-predicate' defined as follows - -- Function: get-window-with-predicate PREDICATE &optional MINIBUF ALL-FRAMES DEFAULT - -Return a window satisfying PREDICATE. - -This function cycles through all visible windows using `walk-windows', -calling PREDICATE on each one. PREDICATE is called with a window as -argument. The first window for which PREDICATE returns a non-nil -value is returned. If no window satisfies PREDICATE, DEFAULT is -returned. - -Optional second arg MINIBUF t means count the minibuffer window even -if not active. MINIBUF nil or omitted means count the minibuffer iff -it is active. MINIBUF neither t nor nil means not to count the -minibuffer even if it is active. - -Several frames may share a single minibuffer; if the minibuffer -counts, all windows on all frames that share that minibuffer count -too. Therefore, if you are using a separate minibuffer frame -and the minibuffer is active and MINIBUF says it counts, -`walk-windows' includes the windows in the frame from which you -entered the minibuffer, as well as the minibuffer window. - -ALL-FRAMES is the optional third argument. -ALL-FRAMES nil or omitted means cycle within the frames as specified above. -ALL-FRAMES = `visible' means include windows on all visible frames. -ALL-FRAMES = 0 means include windows on all visible and iconified frames. -ALL-FRAMES = t means include windows on all frames including invisible frames. -If ALL-FRAMES is a frame, it means include windows on that frame. -Anything else means restrict to the selected frame. - -** The function `single-key-description' now encloses function key and -event names in angle brackets. When called with a second optional -argument non-nil, angle brackets won't be printed. - -** If the variable `message-truncate-lines' is bound to t around a -call to `message', the echo area will not be resized to display that -message; it will be truncated instead, as it was done in 20.x. -Default value is nil. - -** The user option `line-number-display-limit' can now be set to nil, -meaning no limit. - -** The new user option `line-number-display-limit-width' controls -the maximum width of lines in a buffer for which Emacs displays line -numbers in the mode line. The default is 200. - -** `select-safe-coding-system' now also checks the most preferred -coding-system if buffer-file-coding-system is `undecided' and -DEFAULT-CODING-SYSTEM is not specified, - -** The function `subr-arity' provides information about the argument -list of a primitive. - -** `where-is-internal' now also accepts a list of keymaps. - -** The text property `keymap' specifies a key map which overrides the -buffer's local map and the map specified by the `local-map' property. -This is probably what most current uses of `local-map' want, rather -than replacing the local map. - -** The obsolete variables `before-change-function' and -`after-change-function' are no longer acted upon and have been -removed. Use `before-change-functions' and `after-change-functions' -instead. - -** The function `apropos-mode' runs the hook `apropos-mode-hook'. - -** `concat' no longer accepts individual integer arguments, -as promised long ago. - -** The new function `float-time' returns the current time as a float. - -** The new variable auto-coding-regexp-alist specifies coding systems -for reading specific files, analogous to auto-coding-alist, but -patterns are checked against file contents instead of file names. - - -* Lisp changes in Emacs 21.1 (see following page for display-related features) - -** The new package rx.el provides an alternative sexp notation for -regular expressions. - -- Function: rx-to-string SEXP - -Translate SEXP into a regular expression in string notation. - -- Macro: rx SEXP - -Translate SEXP into a regular expression in string notation. - -The following are valid subforms of regular expressions in sexp -notation. - -STRING - matches string STRING literally. - -CHAR - matches character CHAR literally. - -`not-newline' - matches any character except a newline. - . -`anything' - matches any character - -`(any SET)' - matches any character in SET. SET may be a character or string. - Ranges of characters can be specified as `A-Z' in strings. - -'(in SET)' - like `any'. - -`(not (any SET))' - matches any character not in SET - -`line-start' - matches the empty string, but only at the beginning of a line - in the text being matched - -`line-end' - is similar to `line-start' but matches only at the end of a line - -`string-start' - matches the empty string, but only at the beginning of the - string being matched against. - -`string-end' - matches the empty string, but only at the end of the - string being matched against. - -`buffer-start' - matches the empty string, but only at the beginning of the - buffer being matched against. - -`buffer-end' - matches the empty string, but only at the end of the - buffer being matched against. - -`point' - matches the empty string, but only at point. - -`word-start' - matches the empty string, but only at the beginning or end of a - word. - -`word-end' - matches the empty string, but only at the end of a word. - -`word-boundary' - matches the empty string, but only at the beginning or end of a - word. - -`(not word-boundary)' - matches the empty string, but not at the beginning or end of a - word. - -`digit' - matches 0 through 9. - -`control' - matches ASCII control characters. - -`hex-digit' - matches 0 through 9, a through f and A through F. - -`blank' - matches space and tab only. - -`graphic' - matches graphic characters--everything except ASCII control chars, - space, and DEL. - -`printing' - matches printing characters--everything except ASCII control chars - and DEL. - -`alphanumeric' - matches letters and digits. (But at present, for multibyte characters, - it matches anything that has word syntax.) - -`letter' - matches letters. (But at present, for multibyte characters, - it matches anything that has word syntax.) - -`ascii' - matches ASCII (unibyte) characters. - -`nonascii' - matches non-ASCII (multibyte) characters. - -`lower' - matches anything lower-case. - -`upper' - matches anything upper-case. - -`punctuation' - matches punctuation. (But at present, for multibyte characters, - it matches anything that has non-word syntax.) - -`space' - matches anything that has whitespace syntax. - -`word' - matches anything that has word syntax. - -`(syntax SYNTAX)' - matches a character with syntax SYNTAX. SYNTAX must be one - of the following symbols. - - `whitespace' (\\s- in string notation) - `punctuation' (\\s.) - `word' (\\sw) - `symbol' (\\s_) - `open-parenthesis' (\\s() - `close-parenthesis' (\\s)) - `expression-prefix' (\\s') - `string-quote' (\\s\") - `paired-delimiter' (\\s$) - `escape' (\\s\\) - `character-quote' (\\s/) - `comment-start' (\\s<) - `comment-end' (\\s>) - -`(not (syntax SYNTAX))' - matches a character that has not syntax SYNTAX. - -`(category CATEGORY)' - matches a character with category CATEGORY. CATEGORY must be - either a character to use for C, or one of the following symbols. - - `consonant' (\\c0 in string notation) - `base-vowel' (\\c1) - `upper-diacritical-mark' (\\c2) - `lower-diacritical-mark' (\\c3) - `tone-mark' (\\c4) - `symbol' (\\c5) - `digit' (\\c6) - `vowel-modifying-diacritical-mark' (\\c7) - `vowel-sign' (\\c8) - `semivowel-lower' (\\c9) - `not-at-end-of-line' (\\c<) - `not-at-beginning-of-line' (\\c>) - `alpha-numeric-two-byte' (\\cA) - `chinse-two-byte' (\\cC) - `greek-two-byte' (\\cG) - `japanese-hiragana-two-byte' (\\cH) - `indian-two-byte' (\\cI) - `japanese-katakana-two-byte' (\\cK) - `korean-hangul-two-byte' (\\cN) - `cyrillic-two-byte' (\\cY) - `ascii' (\\ca) - `arabic' (\\cb) - `chinese' (\\cc) - `ethiopic' (\\ce) - `greek' (\\cg) - `korean' (\\ch) - `indian' (\\ci) - `japanese' (\\cj) - `japanese-katakana' (\\ck) - `latin' (\\cl) - `lao' (\\co) - `tibetan' (\\cq) - `japanese-roman' (\\cr) - `thai' (\\ct) - `vietnamese' (\\cv) - `hebrew' (\\cw) - `cyrillic' (\\cy) - `can-break' (\\c|) - -`(not (category CATEGORY))' - matches a character that has not category CATEGORY. - -`(and SEXP1 SEXP2 ...)' - matches what SEXP1 matches, followed by what SEXP2 matches, etc. - -`(submatch SEXP1 SEXP2 ...)' - like `and', but makes the match accessible with `match-end', - `match-beginning', and `match-string'. - -`(group SEXP1 SEXP2 ...)' - another name for `submatch'. - -`(or SEXP1 SEXP2 ...)' - matches anything that matches SEXP1 or SEXP2, etc. If all - args are strings, use `regexp-opt' to optimize the resulting - regular expression. - -`(minimal-match SEXP)' - produce a non-greedy regexp for SEXP. Normally, regexps matching - zero or more occurrences of something are \"greedy\" in that they - match as much as they can, as long as the overall regexp can - still match. A non-greedy regexp matches as little as possible. - -`(maximal-match SEXP)' - produce a greedy regexp for SEXP. This is the default. - -`(zero-or-more SEXP)' - matches zero or more occurrences of what SEXP matches. - -`(0+ SEXP)' - like `zero-or-more'. - -`(* SEXP)' - like `zero-or-more', but always produces a greedy regexp. - -`(*? SEXP)' - like `zero-or-more', but always produces a non-greedy regexp. - -`(one-or-more SEXP)' - matches one or more occurrences of A. - -`(1+ SEXP)' - like `one-or-more'. - -`(+ SEXP)' - like `one-or-more', but always produces a greedy regexp. - -`(+? SEXP)' - like `one-or-more', but always produces a non-greedy regexp. - -`(zero-or-one SEXP)' - matches zero or one occurrences of A. - -`(optional SEXP)' - like `zero-or-one'. - -`(? SEXP)' - like `zero-or-one', but always produces a greedy regexp. - -`(?? SEXP)' - like `zero-or-one', but always produces a non-greedy regexp. - -`(repeat N SEXP)' - matches N occurrences of what SEXP matches. - -`(repeat N M SEXP)' - matches N to M occurrences of what SEXP matches. - -`(eval FORM)' - evaluate FORM and insert result. If result is a string, - `regexp-quote' it. - -`(regexp REGEXP)' - include REGEXP in string notation in the result. - -*** The features `md5' and `overlay' are now provided by default. - -*** The special form `save-restriction' now works correctly even if the -buffer is widened inside the save-restriction and changes made outside -the original restriction. Previously, doing this would cause the saved -restriction to be restored incorrectly. - -*** The functions `find-charset-region' and `find-charset-string' include -`eight-bit-control' and/or `eight-bit-graphic' in the returned list -when they find 8-bit characters. Previously, they included `ascii' in a -multibyte buffer and `unknown' in a unibyte buffer. - -*** The functions `set-buffer-multibyte', `string-as-multibyte' and -`string-as-unibyte' change the byte sequence of a buffer or a string -if it contains a character from the `eight-bit-control' character set. - -*** The handling of multibyte sequences in a multibyte buffer is -changed. Previously, a byte sequence matching the pattern -[\200-\237][\240-\377]+ was interpreted as a single character -regardless of the length of the trailing bytes [\240-\377]+. Thus, if -the sequence was longer than what the leading byte indicated, the -extra trailing bytes were ignored by Lisp functions. Now such extra -bytes are independent 8-bit characters belonging to the charset -eight-bit-graphic. - -** Fontsets are now implemented using char-tables. - -A fontset can now be specified for each independent character, for -a group of characters or for a character set rather than just for a -character set as previously. - -*** The arguments of the function `set-fontset-font' are changed. -They are NAME, CHARACTER, FONTNAME, and optional FRAME. The function -modifies fontset NAME to use FONTNAME for CHARACTER. - -CHARACTER may be a cons (FROM . TO), where FROM and TO are non-generic -characters. In that case FONTNAME is used for all characters in the -range FROM and TO (inclusive). CHARACTER may be a charset. In that -case FONTNAME is used for all character in the charset. - -FONTNAME may be a cons (FAMILY . REGISTRY), where FAMILY is the family -name of a font and REGISTRY is a registry name of a font. - -*** Variable x-charset-registry has been deleted. The default charset -registries of character sets are set in the default fontset -"fontset-default". - -*** The function `create-fontset-from-fontset-spec' ignores the second -argument STYLE-VARIANT. It never creates style-variant fontsets. - -** The method of composing characters is changed. Now character -composition is done by a special text property `composition' in -buffers and strings. - -*** Charset composition is deleted. Emacs never creates a `composite -character' which is an independent character with a unique character -code. Thus the following functions handling `composite characters' -have been deleted: composite-char-component, -composite-char-component-count, composite-char-composition-rule, -composite-char-composition-rule and decompose-composite-char delete. -The variables leading-code-composition and min-composite-char have -also been deleted. - -*** Three more glyph reference points are added. They can be used to -specify a composition rule. See the documentation of the variable -`reference-point-alist' for more detail. - -*** The function `compose-region' takes new arguments COMPONENTS and -MODIFICATION-FUNC. With COMPONENTS, you can specify not only a -composition rule but also characters to be composed. Such characters -may differ between buffer and string text. - -*** The function `compose-string' takes new arguments START, END, -COMPONENTS, and MODIFICATION-FUNC. - -*** The function `compose-string' puts text property `composition' -directly on the argument STRING instead of returning a new string. -Likewise, the function `decompose-string' just removes text property -`composition' from STRING. - -*** The new function `find-composition' returns information about -a composition at a specified position in a buffer or a string. - -*** The function `decompose-composite-char' is now labeled as -obsolete. - -** The new coding system `mac-roman' is primarily intended for use on -the Macintosh but may be used generally for Macintosh-encoded text. - -** The new character sets `mule-unicode-0100-24ff', -`mule-unicode-2500-33ff', and `mule-unicode-e000-ffff' have been -introduced for Unicode characters in the range U+0100..U+24FF, -U+2500..U+33FF, U+E000..U+FFFF respectively. - -Note that the character sets are not yet unified in Emacs, so -characters which belong to charsets such as Latin-2, Greek, Hebrew, -etc. and the same characters in the `mule-unicode-*' charsets are -different characters, as far as Emacs is concerned. For example, text -which includes Unicode characters from the Latin-2 locale cannot be -encoded by Emacs with ISO 8859-2 coding system. - -** The new coding system `mule-utf-8' has been added. -It provides limited support for decoding/encoding UTF-8 text. For -details, please see the documentation string of this coding system. - -** The new character sets `japanese-jisx0213-1' and -`japanese-jisx0213-2' have been introduced for the new Japanese -standard JIS X 0213 Plane 1 and Plane 2. - -** The new character sets `latin-iso8859-14' and `latin-iso8859-15' -have been introduced. - -** The new character sets `eight-bit-control' and `eight-bit-graphic' -have been introduced for 8-bit characters in the ranges 0x80..0x9F and -0xA0..0xFF respectively. Note that the multibyte representation of -eight-bit-control is never exposed; this leads to an exception in the -emacs-mule coding system, which encodes everything else to the -buffer/string internal representation. Note that to search for -eight-bit-graphic characters in a multibyte buffer, the search string -must be multibyte, otherwise such characters will be converted to -their multibyte equivalent. - -** If the APPEND argument of `write-region' is an integer, it seeks to -that offset in the file before writing. - -** The function `add-minor-mode' has been added for convenience and -compatibility with XEmacs (and is used internally by define-minor-mode). - -** The function `shell-command' now sets the default directory of the -`*Shell Command Output*' buffer to the default directory of the buffer -from which the command was issued. - -** The functions `query-replace', `query-replace-regexp', -`query-replace-regexp-eval' `map-query-replace-regexp', -`replace-string', `replace-regexp', and `perform-replace' take two -additional optional arguments START and END that specify the region to -operate on. - -** The new function `count-screen-lines' is a more flexible alternative -to `window-buffer-height'. - -- Function: count-screen-lines &optional BEG END COUNT-FINAL-NEWLINE WINDOW - -Return the number of screen lines in the region between BEG and END. -The number of screen lines may be different from the number of actual -lines, due to line breaking, display table, etc. - -Optional arguments BEG and END default to `point-min' and `point-max' -respectively. - -If region ends with a newline, ignore it unless optional third argument -COUNT-FINAL-NEWLINE is non-nil. - -The optional fourth argument WINDOW specifies the window used for -obtaining parameters such as width, horizontal scrolling, and so -on. The default is to use the selected window's parameters. - -Like `vertical-motion', `count-screen-lines' always uses the current -buffer, regardless of which buffer is displayed in WINDOW. This makes -possible to use `count-screen-lines' in any buffer, whether or not it -is currently displayed in some window. - -** The new function `mapc' is like `mapcar' but doesn't collect the -argument function's results. - -** The functions base64-decode-region and base64-decode-string now -signal an error instead of returning nil if decoding fails. Also, -`base64-decode-string' now always returns a unibyte string (in Emacs -20, it returned a multibyte string when the result was a valid multibyte -sequence). - -** The function sendmail-user-agent-compose now recognizes a `body' -header in the list of headers passed to it. - -** The new function member-ignore-case works like `member', but -ignores differences in case and text representation. - -** The buffer-local variable cursor-type can be used to specify the -cursor to use in windows displaying a buffer. Values are interpreted -as follows: - - t use the cursor specified for the frame (default) - nil don't display a cursor - `bar' display a bar cursor with default width - (bar . WIDTH) display a bar cursor with width WIDTH - others display a box cursor. - -** The variable open-paren-in-column-0-is-defun-start controls whether -an open parenthesis in column 0 is considered to be the start of a -defun. If set, the default, it is considered a defun start. If not -set, an open parenthesis in column 0 has no special meaning. - -** The new function `string-to-syntax' can be used to translate syntax -specifications in string form as accepted by `modify-syntax-entry' to -the cons-cell form that is used for the values of the `syntax-table' -text property, and in `font-lock-syntactic-keywords'. - -Example: - - (string-to-syntax "()") - => (4 . 41) - -** Emacs' reader supports CL read syntax for integers in bases -other than 10. - -*** `#BINTEGER' or `#bINTEGER' reads INTEGER in binary (radix 2). -INTEGER optionally contains a sign. - - #b1111 - => 15 - #b-1111 - => -15 - -*** `#OINTEGER' or `#oINTEGER' reads INTEGER in octal (radix 8). - - #o666 - => 438 - -*** `#XINTEGER' or `#xINTEGER' reads INTEGER in hexadecimal (radix 16). - - #xbeef - => 48815 - -*** `#RADIXrINTEGER' reads INTEGER in radix RADIX, 2 <= RADIX <= 36. - - #2R-111 - => -7 - #25rah - => 267 - -** The function `documentation-property' now evaluates the value of -the given property to obtain a string if it doesn't refer to etc/DOC -and isn't a string. - -** If called for a symbol, the function `documentation' now looks for -a `function-documentation' property of that symbol. If it has a non-nil -value, the documentation is taken from that value. If the value is -not a string, it is evaluated to obtain a string. - -** The last argument of `define-key-after' defaults to t for convenience. - -** The new function `replace-regexp-in-string' replaces all matches -for a regexp in a string. - -** `mouse-position' now runs the abnormal hook -`mouse-position-function'. - -** The function string-to-number now returns a float for numbers -that don't fit into a Lisp integer. - -** The variable keyword-symbols-constants-flag has been removed. -Keywords are now always considered constants. - -** The new function `delete-and-extract-region' deletes text and -returns it. - -** The function `clear-this-command-keys' now also clears the vector -returned by function `recent-keys'. - -** Variables `beginning-of-defun-function' and `end-of-defun-function' -can be used to define handlers for the functions that find defuns. -Major modes can define these locally instead of rebinding C-M-a -etc. if the normal conventions for defuns are not appropriate for the -mode. - -** easy-mmode-define-minor-mode now takes an additional BODY argument -and is renamed `define-minor-mode'. - -** If an abbrev has a hook function which is a symbol, and that symbol -has a non-nil `no-self-insert' property, the return value of the hook -function specifies whether an expansion has been done or not. If it -returns nil, abbrev-expand also returns nil, meaning "no expansion has -been performed." - -When abbrev expansion is done by typing a self-inserting character, -and the abbrev has a hook with the `no-self-insert' property, and the -hook function returns non-nil meaning expansion has been done, -then the self-inserting character is not inserted. - -** The function `intern-soft' now accepts a symbol as first argument. -In this case, that exact symbol is looked up in the specified obarray, -and the function's value is nil if it is not found. - -** The new macro `with-syntax-table' can be used to evaluate forms -with the syntax table of the current buffer temporarily set to a -specified table. - - (with-syntax-table TABLE &rest BODY) - -Evaluate BODY with syntax table of current buffer set to a copy of -TABLE. The current syntax table is saved, BODY is evaluated, and the -saved table is restored, even in case of an abnormal exit. Value is -what BODY returns. - -** Regular expressions now support intervals \{n,m\} as well as -Perl's shy-groups \(?:...\) and non-greedy *? +? and ?? operators. -Also back-references like \2 are now considered as an error if the -corresponding subgroup does not exist (or is not closed yet). -Previously it would have been silently turned into `2' (ignoring the `\'). - -** The optional argument BUFFER of function file-local-copy has been -removed since it wasn't used by anything. - -** The file name argument of function `file-locked-p' is now required -instead of being optional. - -** The new built-in error `text-read-only' is signaled when trying to -modify read-only text. - -** New functions and variables for locales. - -The new variable `locale-coding-system' specifies how to encode and -decode strings passed to low-level message functions like strerror and -time functions like strftime. The new variables -`system-messages-locale' and `system-time-locale' give the system -locales to be used when invoking these two types of functions. - -The new function `set-locale-environment' sets the language -environment, preferred coding system, and locale coding system from -the system locale as specified by the LC_ALL, LC_CTYPE, and LANG -environment variables. Normally, it is invoked during startup and need -not be invoked thereafter. It uses the new variables -`locale-language-names', `locale-charset-language-names', and -`locale-preferred-coding-systems' to make its decisions. - -** syntax tables now understand nested comments. -To declare a comment syntax as allowing nesting, just add an `n' -modifier to either of the characters of the comment end and the comment -start sequences. - -** The function `pixmap-spec-p' has been renamed `bitmap-spec-p' -because `bitmap' is more in line with the usual X terminology. - -** New function `propertize' - -The new function `propertize' can be used to conveniently construct -strings with text properties. - -- Function: propertize STRING &rest PROPERTIES - -Value is a copy of STRING with text properties assigned as specified -by PROPERTIES. PROPERTIES is a sequence of pairs PROPERTY VALUE, with -PROPERTY being the name of a text property and VALUE being the -specified value of that property. Example: - - (propertize "foo" 'face 'bold 'read-only t) - -** push and pop macros. - -Simple versions of the push and pop macros of Common Lisp -are now defined in Emacs Lisp. These macros allow only symbols -as the place that holds the list to be changed. - -(push NEWELT LISTNAME) add NEWELT to the front of LISTNAME's value. -(pop LISTNAME) return first elt of LISTNAME, and remove it - (thus altering the value of LISTNAME). - -** New dolist and dotimes macros. - -Simple versions of the dolist and dotimes macros of Common Lisp -are now defined in Emacs Lisp. - -(dolist (VAR LIST [RESULT]) BODY...) - Execute body once for each element of LIST, - using the variable VAR to hold the current element. - Then return the value of RESULT, or nil if RESULT is omitted. - -(dotimes (VAR COUNT [RESULT]) BODY...) - Execute BODY with VAR bound to successive integers running from 0, - inclusive, to COUNT, exclusive. - Then return the value of RESULT, or nil if RESULT is omitted. - -** Regular expressions now support Posix character classes such as -[:alpha:], [:space:] and so on. These must be used within a character -class--for instance, [-[:digit:].+] matches digits or a period -or a sign. - -[:digit:] matches 0 through 9 -[:cntrl:] matches ASCII control characters -[:xdigit:] matches 0 through 9, a through f and A through F. -[:blank:] matches space and tab only -[:graph:] matches graphic characters--everything except ASCII control chars, - space, and DEL. -[:print:] matches printing characters--everything except ASCII control chars - and DEL. -[:alnum:] matches letters and digits. - (But at present, for multibyte characters, - it matches anything that has word syntax.) -[:alpha:] matches letters. - (But at present, for multibyte characters, - it matches anything that has word syntax.) -[:ascii:] matches ASCII (unibyte) characters. -[:nonascii:] matches non-ASCII (multibyte) characters. -[:lower:] matches anything lower-case. -[:punct:] matches punctuation. - (But at present, for multibyte characters, - it matches anything that has non-word syntax.) -[:space:] matches anything that has whitespace syntax. -[:upper:] matches anything upper-case. -[:word:] matches anything that has word syntax. - -** Emacs now has built-in hash tables. - -The following functions are defined for hash tables: - -- Function: make-hash-table ARGS - -The argument list ARGS consists of keyword/argument pairs. All arguments -are optional. The following arguments are defined: - -:test TEST - -TEST must be a symbol specifying how to compare keys. Default is `eql'. -Predefined are `eq', `eql' and `equal'. If TEST is not predefined, -it must have been defined with `define-hash-table-test'. - -:size SIZE - -SIZE must be an integer > 0 giving a hint to the implementation how -many elements will be put in the hash table. Default size is 65. - -:rehash-size REHASH-SIZE - -REHASH-SIZE specifies by how much to grow a hash table once it becomes -full. If REHASH-SIZE is an integer, add that to the hash table's old -size to get the new size. Otherwise, REHASH-SIZE must be a float > -1.0, and the new size is computed by multiplying REHASH-SIZE with the -old size. Default rehash size is 1.5. - -:rehash-threshold THRESHOLD - -THRESHOLD must be a float > 0 and <= 1.0 specifying when to resize the -hash table. It is resized when the ratio of (number of entries) / -(size of hash table) is >= THRESHOLD. Default threshold is 0.8. - -:weakness WEAK - -WEAK must be either nil, one of the symbols `key, `value', -`key-or-value', `key-and-value', or t, meaning the same as -`key-and-value'. Entries are removed from weak tables during garbage -collection if their key and/or value are not referenced elsewhere -outside of the hash table. Default are non-weak hash tables. - -- Function: makehash &optional TEST - -Similar to make-hash-table, but only TEST can be specified. - -- Function: hash-table-p TABLE - -Returns non-nil if TABLE is a hash table object. - -- Function: copy-hash-table TABLE - -Returns a copy of TABLE. Only the table itself is copied, keys and -values are shared. - -- Function: hash-table-count TABLE - -Returns the number of entries in TABLE. - -- Function: hash-table-rehash-size TABLE - -Returns the rehash size of TABLE. - -- Function: hash-table-rehash-threshold TABLE - -Returns the rehash threshold of TABLE. - -- Function: hash-table-rehash-size TABLE - -Returns the size of TABLE. - -- Function: hash-table-test TABLE - -Returns the test TABLE uses to compare keys. - -- Function: hash-table-weakness TABLE - -Returns the weakness specified for TABLE. - -- Function: clrhash TABLE - -Clear TABLE. - -- Function: gethash KEY TABLE &optional DEFAULT - -Look up KEY in TABLE and return its associated VALUE or DEFAULT if -not found. - -- Function: puthash KEY VALUE TABLE - -Associate KEY with VALUE in TABLE. If KEY is already associated with -another value, replace the old value with VALUE. - -- Function: remhash KEY TABLE - -Remove KEY from TABLE if it is there. - -- Function: maphash FUNCTION TABLE - -Call FUNCTION for all elements in TABLE. FUNCTION must take two -arguments KEY and VALUE. - -- Function: sxhash OBJ - -Return a hash code for Lisp object OBJ. - -- Function: define-hash-table-test NAME TEST-FN HASH-FN - -Define a new hash table test named NAME. If NAME is specified as -a test in `make-hash-table', the table created will use TEST-FN for -comparing keys, and HASH-FN to compute hash codes for keys. Test -and hash function are stored as symbol property `hash-table-test' -of NAME with a value of (TEST-FN HASH-FN). - -TEST-FN must take two arguments and return non-nil if they are the same. - -HASH-FN must take one argument and return an integer that is the hash -code of the argument. The function should use the whole range of -integer values for hash code computation, including negative integers. - -Example: The following creates a hash table whose keys are supposed to -be strings that are compared case-insensitively. - - (defun case-fold-string= (a b) - (compare-strings a nil nil b nil nil t)) - - (defun case-fold-string-hash (a) - (sxhash (upcase a))) - - (define-hash-table-test 'case-fold 'case-fold-string= - 'case-fold-string-hash)) - - (make-hash-table :test 'case-fold) - -** The Lisp reader handles circular structure. - -It now works to use the #N= and #N# constructs to represent -circular structures. For example, #1=(a . #1#) represents -a cons cell which is its own cdr. - -** The Lisp printer handles circular structure. - -If you bind print-circle to a non-nil value, the Lisp printer outputs -#N= and #N# constructs to represent circular and shared structure. - -** If the second argument to `move-to-column' is anything but nil or -t, that means replace a tab with spaces if necessary to reach the -specified column, but do not add spaces at the end of the line if it -is too short to reach that column. - -** perform-replace has a new feature: the REPLACEMENTS argument may -now be a cons cell (FUNCTION . DATA). This means to call FUNCTION -after each match to get the replacement text. FUNCTION is called with -two arguments: DATA, and the number of replacements already made. - -If the FROM-STRING contains any upper-case letters, -perform-replace also turns off `case-fold-search' temporarily -and inserts the replacement text without altering case in it. - -** The function buffer-size now accepts an optional argument -to specify which buffer to return the size of. - -** The calendar motion commands now run the normal hook -calendar-move-hook after moving point. - -** The new variable small-temporary-file-directory specifies a -directory to use for creating temporary files that are likely to be -small. (Certain Emacs features use this directory.) If -small-temporary-file-directory is nil, they use -temporary-file-directory instead. - -** The variable `inhibit-modification-hooks', if non-nil, inhibits all -the hooks that track changes in the buffer. This affects -`before-change-functions' and `after-change-functions', as well as -hooks attached to text properties and overlay properties. - -** assq-delete-all is a new function that deletes all the -elements of an alist which have a car `eq' to a particular value. - -** make-temp-file provides a more reliable way to create a temporary file. - -make-temp-file is used like make-temp-name, except that it actually -creates the file before it returns. This prevents a timing error, -ensuring that no other job can use the same name for a temporary file. - -** New exclusive-open feature in `write-region' - -The optional seventh arg is now called MUSTBENEW. If non-nil, it insists -on a check for an existing file with the same name. If MUSTBENEW -is `excl', that means to get an error if the file already exists; -never overwrite. If MUSTBENEW is neither nil nor `excl', that means -ask for confirmation before overwriting, but do go ahead and -overwrite the file if the user gives confirmation. - -If the MUSTBENEW argument in `write-region' is `excl', -that means to use a special feature in the `open' system call -to get an error if the file exists at that time. -The error reported is `file-already-exists'. - -** Function `format' now handles text properties. - -Text properties of the format string are applied to the result string. -If the result string is longer than the format string, text properties -ending at the end of the format string are extended to the end of the -result string. - -Text properties from string arguments are applied to the result -string where arguments appear in the result string. - -Example: - - (let ((s1 "hello, %s") - (s2 "world")) - (put-text-property 0 (length s1) 'face 'bold s1) - (put-text-property 0 (length s2) 'face 'italic s2) - (format s1 s2)) - -results in a bold-face string with an italic `world' at the end. - -** Messages can now be displayed with text properties. - -Text properties are handled as described above for function `format'. -The following example displays a bold-face message with an italic -argument in it. - - (let ((msg "hello, %s!") - (arg "world")) - (put-text-property 0 (length msg) 'face 'bold msg) - (put-text-property 0 (length arg) 'face 'italic arg) - (message msg arg)) - -** Sound support - -Emacs supports playing sound files on GNU/Linux and the free BSDs -(Voxware driver and native BSD driver, aka as Luigi's driver). - -Currently supported file formats are RIFF-WAVE (*.wav) and Sun Audio -(*.au). You must configure Emacs with the option `--with-sound=yes' -to enable sound support. - -Sound files can be played by calling (play-sound SOUND). SOUND is a -list of the form `(sound PROPERTY...)'. The function is only defined -when sound support is present for the system on which Emacs runs. The -functions runs `play-sound-functions' with one argument which is the -sound to play, before playing the sound. - -The following sound properties are supported: - -- `:file FILE' - -FILE is a file name. If FILE isn't an absolute name, it will be -searched relative to `data-directory'. - -- `:data DATA' - -DATA is a string containing sound data. Either :file or :data -may be present, but not both. - -- `:volume VOLUME' - -VOLUME must be an integer in the range 0..100 or a float in the range -0..1. This property is optional. - -- `:device DEVICE' - -DEVICE is a string specifying the system device on which to play the -sound. The default device is system-dependent. - -Other properties are ignored. - -An alternative interface is called as -(play-sound-file FILE &optional VOLUME DEVICE). - -** `multimedia' is a new Finder keyword and Custom group. - -** keywordp is a new predicate to test efficiently for an object being -a keyword symbol. - -** Changes to garbage collection - -*** The function garbage-collect now additionally returns the number -of live and free strings. - -*** There is a new variable `strings-consed' holding the number of -strings that have been consed so far. - - -* Lisp-level Display features added after release 2.6 of the Emacs -Lisp Manual - -** The user-option `resize-mini-windows' controls how Emacs resizes -mini-windows. - -** The function `pos-visible-in-window-p' now has a third optional -argument, PARTIALLY. If a character is only partially visible, nil is -returned, unless PARTIALLY is non-nil. - -** On window systems, `glyph-table' is no longer used. - -** Help strings in menu items are now used to provide `help-echo' text. - -** The function `image-size' can be used to determine the size of an -image. - -- Function: image-size SPEC &optional PIXELS FRAME - -Return the size of an image as a pair (WIDTH . HEIGHT). - -SPEC is an image specification. PIXELS non-nil means return sizes -measured in pixels, otherwise return sizes measured in canonical -character units (fractions of the width/height of the frame's default -font). FRAME is the frame on which the image will be displayed. -FRAME nil or omitted means use the selected frame. - -** The function `image-mask-p' can be used to determine if an image -has a mask bitmap. - -- Function: image-mask-p SPEC &optional FRAME - -Return t if image SPEC has a mask bitmap. -FRAME is the frame on which the image will be displayed. FRAME nil -or omitted means use the selected frame. - -** The function `find-image' can be used to find a usable image -satisfying one of a list of specifications. - -** The STRING argument of `put-image' and `insert-image' is now -optional. - -** Image specifications may contain the property `:ascent center' (see -below). - - -* New Lisp-level Display features in Emacs 21.1 - -** The function tty-suppress-bold-inverse-default-colors can be used -to make Emacs avoid displaying text with bold black foreground on TTYs. - -Some terminals, notably PC consoles, emulate bold text by displaying -text in brighter colors. On such a console, a bold black foreground -is displayed in a gray color. If this turns out to be hard to read on -your monitor---the problem occurred with the mode line on -laptops---you can instruct Emacs to ignore the text's boldness, and to -just display it black instead. - -This situation can't be detected automatically. You will have to put -a line like - - (tty-suppress-bold-inverse-default-colors t) - -in your `.emacs'. - -** New face implementation. - -Emacs faces have been reimplemented from scratch. They don't use XLFD -font names anymore and face merging now works as expected. - -*** New faces. - -Each face can specify the following display attributes: - - 1. Font family or fontset alias name. - - 2. Relative proportionate width, aka character set width or set - width (swidth), e.g. `semi-compressed'. - - 3. Font height in 1/10pt - - 4. Font weight, e.g. `bold'. - - 5. Font slant, e.g. `italic'. - - 6. Foreground color. - - 7. Background color. - - 8. Whether or not characters should be underlined, and in what color. - - 9. Whether or not characters should be displayed in inverse video. - - 10. A background stipple, a bitmap. - - 11. Whether or not characters should be overlined, and in what color. - - 12. Whether or not characters should be strike-through, and in what - color. - - 13. Whether or not a box should be drawn around characters, its - color, the width of the box lines, and 3D appearance. - -Faces are frame-local by nature because Emacs allows to define the -same named face (face names are symbols) differently for different -frames. Each frame has an alist of face definitions for all named -faces. The value of a named face in such an alist is a Lisp vector -with the symbol `face' in slot 0, and a slot for each of the face -attributes mentioned above. - -There is also a global face alist `face-new-frame-defaults'. Face -definitions from this list are used to initialize faces of newly -created frames. - -A face doesn't have to specify all attributes. Those not specified -have a nil value. Faces specifying all attributes are called -`fully-specified'. - -*** Face merging. - -The display style of a given character in the text is determined by -combining several faces. This process is called `face merging'. Any -aspect of the display style that isn't specified by overlays or text -properties is taken from the `default' face. Since it is made sure -that the default face is always fully-specified, face merging always -results in a fully-specified face. - -*** Face realization. - -After all face attributes for a character have been determined by -merging faces of that character, that face is `realized'. The -realization process maps face attributes to what is physically -available on the system where Emacs runs. The result is a `realized -face' in form of an internal structure which is stored in the face -cache of the frame on which it was realized. - -Face realization is done in the context of the charset of the -character to display because different fonts and encodings are used -for different charsets. In other words, for characters of different -charsets, different realized faces are needed to display them. - -Except for composite characters, faces are always realized for a -specific character set and contain a specific font, even if the face -being realized specifies a fontset. The reason is that the result of -the new font selection stage is better than what can be done with -statically defined font name patterns in fontsets. - -In unibyte text, Emacs' charsets aren't applicable; function -`char-charset' reports ASCII for all characters, including those > -0x7f. The X registry and encoding of fonts to use is determined from -the variable `face-default-registry' in this case. The variable is -initialized at Emacs startup time from the font the user specified for -Emacs. - -Currently all unibyte text, i.e. all buffers with -`enable-multibyte-characters' nil are displayed with fonts of the same -registry and encoding `face-default-registry'. This is consistent -with the fact that languages can also be set globally, only. - -**** Clearing face caches. - -The Lisp function `clear-face-cache' can be called to clear face caches -on all frames. If called with a non-nil argument, it will also unload -unused fonts. - -*** Font selection. - -Font selection tries to find the best available matching font for a -given (charset, face) combination. This is done slightly differently -for faces specifying a fontset, or a font family name. - -If the face specifies a fontset name, that fontset determines a -pattern for fonts of the given charset. If the face specifies a font -family, a font pattern is constructed. Charset symbols have a -property `x-charset-registry' for that purpose that maps a charset to -an XLFD registry and encoding in the font pattern constructed. - -Available fonts on the system on which Emacs runs are then matched -against the font pattern. The result of font selection is the best -match for the given face attributes in this font list. - -Font selection can be influenced by the user. - -The user can specify the relative importance he gives the face -attributes width, height, weight, and slant by setting -face-font-selection-order (faces.el) to a list of face attribute -names. The default is (:width :height :weight :slant), and means -that font selection first tries to find a good match for the font -width specified by a face, then---within fonts with that width---tries -to find a best match for the specified font height, etc. - -Setting `face-font-family-alternatives' allows the user to specify -alternative font families to try if a family specified by a face -doesn't exist. - -Setting `face-font-registry-alternatives' allows the user to specify -all alternative font registry names to try for a face specifying a -registry. - -Please note that the interpretations of the above two variables are -slightly different. - -Setting face-ignored-fonts allows the user to ignore specific fonts. - - -**** Scalable fonts - -Emacs can make use of scalable fonts but doesn't do so by default, -since the use of too many or too big scalable fonts may crash XFree86 -servers. - -To enable scalable font use, set the variable -`scalable-fonts-allowed'. A value of nil, the default, means never use -scalable fonts. A value of t means any scalable font may be used. -Otherwise, the value must be a list of regular expressions. A -scalable font may then be used if it matches a regular expression from -that list. Example: - - (setq scalable-fonts-allowed '("muleindian-2$")) - -allows the use of scalable fonts with registry `muleindian-2'. - -*** Functions and variables related to font selection. - -- Function: x-family-fonts &optional FAMILY FRAME - -Return a list of available fonts of family FAMILY on FRAME. If FAMILY -is omitted or nil, list all families. Otherwise, FAMILY must be a -string, possibly containing wildcards `?' and `*'. - -If FRAME is omitted or nil, use the selected frame. Each element of -the result is a vector [FAMILY WIDTH POINT-SIZE WEIGHT SLANT FIXED-P -FULL REGISTRY-AND-ENCODING]. FAMILY is the font family name. -POINT-SIZE is the size of the font in 1/10 pt. WIDTH, WEIGHT, and -SLANT are symbols describing the width, weight and slant of the font. -These symbols are the same as for face attributes. FIXED-P is non-nil -if the font is fixed-pitch. FULL is the full name of the font, and -REGISTRY-AND-ENCODING is a string giving the registry and encoding of -the font. The result list is sorted according to the current setting -of the face font sort order. - -- Function: x-font-family-list - -Return a list of available font families on FRAME. If FRAME is -omitted or nil, use the selected frame. Value is a list of conses -(FAMILY . FIXED-P) where FAMILY is a font family, and FIXED-P is -non-nil if fonts of that family are fixed-pitch. - -- Variable: font-list-limit - -Limit for font matching. If an integer > 0, font matching functions -won't load more than that number of fonts when searching for a -matching font. The default is currently 100. - -*** Setting face attributes. - -For the most part, the new face implementation is interface-compatible -with the old one. Old face attribute related functions are now -implemented in terms of the new functions `set-face-attribute' and -`face-attribute'. - -Face attributes are identified by their names which are keyword -symbols. All attributes can be set to `unspecified'. - -The following attributes are recognized: - -`:family' - -VALUE must be a string specifying the font family, e.g. ``courier'', -or a fontset alias name. If a font family is specified, wild-cards `*' -and `?' are allowed. - -`:width' - -VALUE specifies the relative proportionate width of the font to use. -It must be one of the symbols `ultra-condensed', `extra-condensed', -`condensed', `semi-condensed', `normal', `semi-expanded', `expanded', -`extra-expanded', or `ultra-expanded'. - -`:height' - -VALUE must be either an integer specifying the height of the font to use -in 1/10 pt, a floating point number specifying the amount by which to -scale any underlying face, or a function, which is called with the old -height (from the underlying face), and should return the new height. - -`:weight' - -VALUE specifies the weight of the font to use. It must be one of the -symbols `ultra-bold', `extra-bold', `bold', `semi-bold', `normal', -`semi-light', `light', `extra-light', `ultra-light'. - -`:slant' - -VALUE specifies the slant of the font to use. It must be one of the -symbols `italic', `oblique', `normal', `reverse-italic', or -`reverse-oblique'. - -`:foreground', `:background' - -VALUE must be a color name, a string. - -`:underline' - -VALUE specifies whether characters in FACE should be underlined. If -VALUE is t, underline with foreground color of the face. If VALUE is -a string, underline with that color. If VALUE is nil, explicitly -don't underline. - -`:overline' - -VALUE specifies whether characters in FACE should be overlined. If -VALUE is t, overline with foreground color of the face. If VALUE is a -string, overline with that color. If VALUE is nil, explicitly don't -overline. - -`:strike-through' - -VALUE specifies whether characters in FACE should be drawn with a line -striking through them. If VALUE is t, use the foreground color of the -face. If VALUE is a string, strike-through with that color. If VALUE -is nil, explicitly don't strike through. - -`:box' - -VALUE specifies whether characters in FACE should have a box drawn -around them. If VALUE is nil, explicitly don't draw boxes. If -VALUE is t, draw a box with lines of width 1 in the foreground color -of the face. If VALUE is a string, the string must be a color name, -and the box is drawn in that color with a line width of 1. Otherwise, -VALUE must be a property list of the form `(:line-width WIDTH -:color COLOR :style STYLE)'. If a keyword/value pair is missing from -the property list, a default value will be used for the value, as -specified below. WIDTH specifies the width of the lines to draw; it -defaults to 1. COLOR is the name of the color to draw in, default is -the foreground color of the face for simple boxes, and the background -color of the face for 3D boxes. STYLE specifies whether a 3D box -should be draw. If STYLE is `released-button', draw a box looking -like a released 3D button. If STYLE is `pressed-button' draw a box -that appears like a pressed button. If STYLE is nil, the default if -the property list doesn't contain a style specification, draw a 2D -box. - -`:inverse-video' - -VALUE specifies whether characters in FACE should be displayed in -inverse video. VALUE must be one of t or nil. - -`:stipple' - -If VALUE is a string, it must be the name of a file of pixmap data. -The directories listed in the `x-bitmap-file-path' variable are -searched. Alternatively, VALUE may be a list of the form (WIDTH -HEIGHT DATA) where WIDTH and HEIGHT are the size in pixels, and DATA -is a string containing the raw bits of the bitmap. VALUE nil means -explicitly don't use a stipple pattern. - -For convenience, attributes `:family', `:width', `:height', `:weight', -and `:slant' may also be set in one step from an X font name: - -`:font' - -Set font-related face attributes from VALUE. VALUE must be a valid -XLFD font name. If it is a font name pattern, the first matching font -is used--this is for compatibility with the behavior of previous -versions of Emacs. - -For compatibility with Emacs 20, keywords `:bold' and `:italic' can -be used to specify that a bold or italic font should be used. VALUE -must be t or nil in that case. A value of `unspecified' is not allowed." - -Please see also the documentation of `set-face-attribute' and -`defface'. - -`:inherit' - -VALUE is the name of a face from which to inherit attributes, or a list -of face names. Attributes from inherited faces are merged into the face -like an underlying face would be, with higher priority than underlying faces. - -*** Face attributes and X resources - -The following X resource names can be used to set face attributes -from X resources: - - Face attribute X resource class ------------------------------------------------------------------------ - :family attributeFamily . Face.AttributeFamily - :width attributeWidth Face.AttributeWidth - :height attributeHeight Face.AttributeHeight - :weight attributeWeight Face.AttributeWeight - :slant attributeSlant Face.AttributeSlant - foreground attributeForeground Face.AttributeForeground - :background attributeBackground . Face.AttributeBackground - :overline attributeOverline Face.AttributeOverline - :strike-through attributeStrikeThrough Face.AttributeStrikeThrough - :box attributeBox Face.AttributeBox - :underline attributeUnderline Face.AttributeUnderline - :inverse-video attributeInverse Face.AttributeInverse - :stipple attributeStipple Face.AttributeStipple - or attributeBackgroundPixmap - Face.AttributeBackgroundPixmap - :font attributeFont Face.AttributeFont - :bold attributeBold Face.AttributeBold - :italic attributeItalic . Face.AttributeItalic - :font attributeFont Face.AttributeFont - -*** Text property `face'. - -The value of the `face' text property can now be a single face -specification or a list of such specifications. Each face -specification can be - -1. A symbol or string naming a Lisp face. - -2. A property list of the form (KEYWORD VALUE ...) where each - KEYWORD is a face attribute name, and VALUE is an appropriate value - for that attribute. Please see the doc string of `set-face-attribute' - for face attribute names. - -3. Conses of the form (FOREGROUND-COLOR . COLOR) or - (BACKGROUND-COLOR . COLOR) where COLOR is a color name. This is - for compatibility with previous Emacs versions. - -** Support functions for colors on text-only terminals. - -The function `tty-color-define' can be used to define colors for use -on TTY and MSDOS frames. It maps a color name to a color number on -the terminal. Emacs defines a couple of common color mappings by -default. You can get defined colors with a call to -`defined-colors'. The function `tty-color-clear' can be -used to clear the mapping table. - -** Unified support for colors independent of frame type. - -The new functions `defined-colors', `color-defined-p', `color-values', -and `display-color-p' work for any type of frame. On frames whose -type is neither x nor w32, these functions transparently map X-style -color specifications to the closest colors supported by the frame -display. Lisp programs should use these new functions instead of the -old `x-defined-colors', `x-color-defined-p', `x-color-values', and -`x-display-color-p'. (The old function names are still available for -compatibility; they are now aliases of the new names.) Lisp programs -should no more look at the value of the variable window-system to -modify their color-related behavior. - -The primitives `color-gray-p' and `color-supported-p' also work for -any frame type. - -** Platform-independent functions to describe display capabilities. - -The new functions `display-mouse-p', `display-popup-menus-p', -`display-graphic-p', `display-selections-p', `display-screens', -`display-pixel-width', `display-pixel-height', `display-mm-width', -`display-mm-height', `display-backing-store', `display-save-under', -`display-planes', `display-color-cells', `display-visual-class', and -`display-grayscale-p' describe the basic capabilities of a particular -display. Lisp programs should call these functions instead of testing -the value of the variables `window-system' or `system-type', or calling -platform-specific functions such as `x-display-pixel-width'. - -The new function `display-images-p' returns non-nil if a particular -display can display image files. - -** The minibuffer prompt is now actually inserted in the minibuffer. - -This makes it possible to scroll through the prompt, if you want to. -To disallow this completely (like previous versions of emacs), customize -the variable `minibuffer-prompt-properties', and turn on the -`Inviolable' option. - -The function `minibuffer-prompt-end' returns the current position of the -end of the minibuffer prompt, if the minibuffer is current. -Otherwise, it returns `(point-min)'. - -** New `field' abstraction in buffers. - -There is now code to support an abstraction called `fields' in emacs -buffers. A field is a contiguous region of text with the same `field' -property (which can be a text property or an overlay). - -Many emacs functions, such as forward-word, forward-sentence, -forward-paragraph, beginning-of-line, etc., stop moving when they come -to the boundary between fields; beginning-of-line and end-of-line will -not let the point move past the field boundary, but other movement -commands continue into the next field if repeated. Stopping at field -boundaries can be suppressed programmatically by binding -`inhibit-field-text-motion' to a non-nil value around calls to these -functions. - -Now that the minibuffer prompt is inserted into the minibuffer, it is in -a separate field from the user-input part of the buffer, so that common -editing commands treat the user's text separately from the prompt. - -The following functions are defined for operating on fields: - -- Function: constrain-to-field NEW-POS OLD-POS &optional ESCAPE-FROM-EDGE ONLY-IN-LINE INHIBIT-CAPTURE-PROPERTY - -Return the position closest to NEW-POS that is in the same field as OLD-POS. - -A field is a region of text with the same `field' property. -If NEW-POS is nil, then the current point is used instead, and set to the -constrained position if that is different. - -If OLD-POS is at the boundary of two fields, then the allowable -positions for NEW-POS depends on the value of the optional argument -ESCAPE-FROM-EDGE: If ESCAPE-FROM-EDGE is nil, then NEW-POS is -constrained to the field that has the same `field' char-property -as any new characters inserted at OLD-POS, whereas if ESCAPE-FROM-EDGE -is non-nil, NEW-POS is constrained to the union of the two adjacent -fields. Additionally, if two fields are separated by another field with -the special value `boundary', then any point within this special field is -also considered to be `on the boundary'. - -If the optional argument ONLY-IN-LINE is non-nil and constraining -NEW-POS would move it to a different line, NEW-POS is returned -unconstrained. This useful for commands that move by line, like -C-n or C-a, which should generally respect field boundaries -only in the case where they can still move to the right line. - -If the optional argument INHIBIT-CAPTURE-PROPERTY is non-nil, and OLD-POS has -a non-nil property of that name, then any field boundaries are ignored. - -Field boundaries are not noticed if `inhibit-field-text-motion' is non-nil. - -- Function: delete-field &optional POS - -Delete the field surrounding POS. -A field is a region of text with the same `field' property. -If POS is nil, the value of point is used for POS. - -- Function: field-beginning &optional POS ESCAPE-FROM-EDGE - -Return the beginning of the field surrounding POS. -A field is a region of text with the same `field' property. -If POS is nil, the value of point is used for POS. -If ESCAPE-FROM-EDGE is non-nil and POS is at the beginning of its -field, then the beginning of the *previous* field is returned. - -- Function: field-end &optional POS ESCAPE-FROM-EDGE - -Return the end of the field surrounding POS. -A field is a region of text with the same `field' property. -If POS is nil, the value of point is used for POS. -If ESCAPE-FROM-EDGE is non-nil and POS is at the end of its field, -then the end of the *following* field is returned. - -- Function: field-string &optional POS - -Return the contents of the field surrounding POS as a string. -A field is a region of text with the same `field' property. -If POS is nil, the value of point is used for POS. - -- Function: field-string-no-properties &optional POS - -Return the contents of the field around POS, without text-properties. -A field is a region of text with the same `field' property. -If POS is nil, the value of point is used for POS. - -** Image support. - -Emacs can now display images. Images are inserted into text by giving -strings or buffer text a `display' text property containing one of -(AREA IMAGE) or IMAGE. The display of the `display' property value -replaces the display of the characters having that property. - -If the property value has the form (AREA IMAGE), AREA must be one of -`(margin left-margin)', `(margin right-margin)' or `(margin nil)'. If -AREA is `(margin nil)', IMAGE will be displayed in the text area of a -window, otherwise it will be displayed in the left or right marginal -area. - -IMAGE is an image specification. - -*** Image specifications - -Image specifications are lists of the form `(image PROPS)' where PROPS -is a property list whose keys are keyword symbols. Each -specifications must contain a property `:type TYPE' with TYPE being a -symbol specifying the image type, e.g. `xbm'. Properties not -described below are ignored. - -The following is a list of properties all image types share. - -`:ascent ASCENT' - -ASCENT must be a number in the range 0..100, or the symbol `center'. -If it is a number, it specifies the percentage of the image's height -to use for its ascent. - -If not specified, ASCENT defaults to the value 50 which means that the -image will be centered with the base line of the row it appears in. - -If ASCENT is `center' the image is vertically centered around a -centerline which is the vertical center of text drawn at the position -of the image, in the manner specified by the text properties and -overlays that apply to the image. - -`:margin MARGIN' - -MARGIN must be either a number >= 0 specifying how many pixels to put -as margin around the image, or a pair (X . Y) with X specifying the -horizontal margin and Y specifying the vertical margin. Default is 0. - -`:relief RELIEF' - -RELIEF is analogous to the `:relief' attribute of faces. Puts a relief -around an image. - -`:conversion ALGO' - -Apply an image algorithm to the image before displaying it. - -ALGO `laplace' or `emboss' means apply a Laplace or ``emboss'' -edge-detection algorithm to the image. - -ALGO `(edge-detection :matrix MATRIX :color-adjust ADJUST)' means -apply a general edge-detection algorithm. MATRIX must be either a -nine-element list or a nine-element vector of numbers. A pixel at -position x/y in the transformed image is computed from original pixels -around that position. MATRIX specifies, for each pixel in the -neighborhood of x/y, a factor with which that pixel will influence the -transformed pixel; element 0 specifies the factor for the pixel at -x-1/y-1, element 1 the factor for the pixel at x/y-1 etc. as shown -below. - - (x-1/y-1 x/y-1 x+1/y-1 - x-1/y x/y x+1/y - x-1/y+1 x/y+1 x+1/y+1) - -The resulting pixel is computed from the color intensity of the color -resulting from summing up the RGB values of surrounding pixels, -multiplied by the specified factors, and dividing that sum by the sum -of the factors' absolute values. - -Laplace edge-detection currently uses a matrix of - - (1 0 0 - 0 0 0 - 9 9 -1) - -Emboss edge-detection uses a matrix of - - ( 2 -1 0 - -1 0 1 - 0 1 -2) - -ALGO `disabled' means transform the image so that it looks -``disabled''. - -`:mask MASK' - -If MASK is `heuristic' or `(heuristic BG)', build a clipping mask for -the image, so that the background of a frame is visible behind the -image. If BG is not specified, or if BG is t, determine the -background color of the image by looking at the 4 corners of the -image, assuming the most frequently occurring color from the corners is -the background color of the image. Otherwise, BG must be a list `(RED -GREEN BLUE)' specifying the color to assume for the background of the -image. - -If MASK is nil, remove a mask from the image, if it has one. Images -in some formats include a mask which can be removed by specifying -`:mask nil'. - -`:file FILE' - -Load image from FILE. If FILE is not absolute after expanding it, -search for the image in `data-directory'. Some image types support -building images from data. When this is done, no `:file' property -may be present in the image specification. - -`:data DATA' - -Get image data from DATA. (As of this writing, this is not yet -supported for image type `postscript'). Either :file or :data may be -present in an image specification, but not both. All image types -support strings as DATA, some types allow additional types of DATA. - -*** Supported image types - -**** XBM, image type `xbm'. - -XBM images don't require an external library. Additional image -properties supported are: - -`:foreground FG' - -FG must be a string specifying the image foreground color, or nil -meaning to use the default. Default is the frame's foreground color. - -`:background BG' - -BG must be a string specifying the image background color, or nil -meaning to use the default. Default is the frame's background color. - -XBM images can be constructed from data instead of file. In this -case, the image specification must contain the following properties -instead of a `:file' property. - -`:width WIDTH' - -WIDTH specifies the width of the image in pixels. - -`:height HEIGHT' - -HEIGHT specifies the height of the image in pixels. - -`:data DATA' - -DATA must be either - - 1. a string large enough to hold the bitmap data, i.e. it must - have a size >= (WIDTH + 7) / 8 * HEIGHT - - 2. a bool-vector of size >= WIDTH * HEIGHT - - 3. a vector of strings or bool-vectors, one for each line of the - bitmap. - - 4. a string that's an in-memory XBM file. Neither width nor - height may be specified in this case because these are defined - in the file. - -**** XPM, image type `xpm' - -XPM images require the external library `libXpm', package -`xpm-3.4k.tar.gz', version 3.4k or later. Make sure the library is -found when Emacs is configured by supplying appropriate paths via -`--x-includes' and `--x-libraries'. - -Additional image properties supported are: - -`:color-symbols SYMBOLS' - -SYMBOLS must be a list of pairs (NAME . COLOR), with NAME being the -name of color as it appears in an XPM file, and COLOR being an X color -name. - -XPM images can be built from memory instead of files. In that case, -add a `:data' property instead of a `:file' property. - -The XPM library uses libz in its implementation so that it is able -to display compressed images. - -**** PBM, image type `pbm' - -PBM images don't require an external library. Color, gray-scale and -mono images are supported. Additional image properties supported for -mono images are: - -`:foreground FG' - -FG must be a string specifying the image foreground color, or nil -meaning to use the default. Default is the frame's foreground color. - -`:background FG' - -BG must be a string specifying the image background color, or nil -meaning to use the default. Default is the frame's background color. - -**** JPEG, image type `jpeg' - -Support for JPEG images requires the external library `libjpeg', -package `jpegsrc.v6a.tar.gz', or later. There are no additional image -properties defined. - -**** TIFF, image type `tiff' - -Support for TIFF images requires the external library `libtiff', -package `tiff-v3.4-tar.gz', or later. There are no additional image -properties defined. - -**** GIF, image type `gif' - -Support for GIF images requires the external library `libungif', package -`libungif-4.1.0', or later. -Additional image properties supported are: - -`:index INDEX' - -INDEX must be an integer >= 0. Load image number INDEX from a -multi-image GIF file. If INDEX is too large, the image displays -as a hollow box. - -This could be used to implement limited support for animated GIFs. -For example, the following function displays a multi-image GIF file -at point-min in the current buffer, switching between sub-images -every 0.1 seconds. - -(defun show-anim (file max) - "Display multi-image GIF file FILE which contains MAX subimages." - (display-anim (current-buffer) file 0 max t)) - -(defun display-anim (buffer file idx max first-time) - (when (= idx max) - (setq idx 0)) - (let ((img (create-image file nil nil :index idx))) - (save-excursion - (set-buffer buffer) - (goto-char (point-min)) - (unless first-time (delete-char 1)) - (insert-image img "x")) - (run-with-timer 0.1 nil 'display-anim buffer file (1+ idx) max nil))) - -**** PNG, image type `png' - -Support for PNG images requires the external library `libpng', -package `libpng-1.0.2.tar.gz', or later. There are no additional image -properties defined. - -**** Ghostscript, image type `postscript'. - -Additional image properties supported are: - -`:pt-width WIDTH' - -WIDTH is width of the image in pt (1/72 inch). WIDTH must be an -integer. This is a required property. - -`:pt-height HEIGHT' - -HEIGHT specifies the height of the image in pt (1/72 inch). HEIGHT -must be a integer. This is an required property. - -`:bounding-box BOX' - -BOX must be a list or vector of 4 integers giving the bounding box of -the PS image, analogous to the `BoundingBox' comment found in PS -files. This is an required property. - -Part of the Ghostscript interface is implemented in Lisp. See -lisp/gs.el. - -*** Lisp interface. - -The variable `image-types' contains a list of those image types -which are supported in the current configuration. - -Images are stored in an image cache and removed from the cache when -they haven't been displayed for `image-cache-eviction-delay seconds. -The function `clear-image-cache' can be used to clear the image cache -manually. Images in the cache are compared with `equal', i.e. all -images with `equal' specifications share the same image. - -*** Simplified image API, image.el - -The new Lisp package image.el contains functions that simplify image -creation and putting images into text. The function `create-image' -can be used to create images. The macro `defimage' can be used to -define an image based on available image types. The functions -`put-image' and `insert-image' can be used to insert an image into a -buffer. - -** Display margins. - -Windows can now have margins which are used for special text -and images. - -To give a window margins, either set the buffer-local variables -`left-margin-width' and `right-margin-width', or call -`set-window-margins'. The function `window-margins' can be used to -obtain the current settings. To make `left-margin-width' and -`right-margin-width' take effect, you must set them before displaying -the buffer in a window, or use `set-window-buffer' to force an update -of the display margins. - -You can put text in margins by giving it a `display' text property -containing a pair of the form `(LOCATION . VALUE)', where LOCATION is -one of `left-margin' or `right-margin' or nil. VALUE can be either a -string, an image specification or a stretch specification (see later -in this file). - -** Help display - -Emacs displays short help messages in the echo area, when the mouse -moves over a tool-bar item or a piece of text that has a text property -`help-echo'. This feature also applies to strings in the mode line -that have a `help-echo' property. - -If the value of the `help-echo' property is a function, that function -is called with three arguments WINDOW, OBJECT and POSITION. WINDOW is -the window in which the help was found. - -If OBJECT is a buffer, POS is the position in the buffer where the -`help-echo' text property was found. - -If OBJECT is an overlay, that overlay has a `help-echo' property, and -POS is the position in the overlay's buffer under the mouse. - -If OBJECT is a string (an overlay string or a string displayed with -the `display' property), POS is the position in that string under the -mouse. - -If the value of the `help-echo' property is neither a function nor a -string, it is evaluated to obtain a help string. - -For tool-bar and menu-bar items, their key definition is used to -determine the help to display. If their definition contains a -property `:help FORM', FORM is evaluated to determine the help string. -For tool-bar items without a help form, the caption of the item is -used as help string. - -The hook `show-help-function' can be set to a function that displays -the help string differently. For example, enabling a tooltip window -causes the help display to appear there instead of in the echo area. - -** Vertical fractional scrolling. - -The display of text in windows can be scrolled smoothly in pixels. -This is useful, for example, for making parts of large images visible. - -The function `window-vscroll' returns the current value of vertical -scrolling, a non-negative fraction of the canonical character height. -The function `set-window-vscroll' can be used to set the vertical -scrolling value. Here is an example of how these function might be -used. - - (global-set-key [A-down] - #'(lambda () - (interactive) - (set-window-vscroll (selected-window) - (+ 0.5 (window-vscroll))))) - (global-set-key [A-up] - #'(lambda () - (interactive) - (set-window-vscroll (selected-window) - (- (window-vscroll) 0.5))))) - -** New hook `fontification-functions'. - -Functions from `fontification-functions' are called from redisplay -when it encounters a region of text that is not yet fontified. This -variable automatically becomes buffer-local when set. Each function -is called with one argument, POS. - -At least one of the hook functions should fontify one or more -characters starting at POS in the current buffer. It should mark them -as fontified by giving them a non-nil value of the `fontified' text -property. It may be reasonable for these functions to check for the -`fontified' property and not put it back on, but they do not have to. - -** Tool bar support. - -Emacs supports a tool bar at the top of a frame under X. The frame -parameter `tool-bar-lines' (X resource "toolBar", class "ToolBar") -controls how may lines to reserve for the tool bar. A zero value -suppresses the tool bar. If the value is non-zero and -`auto-resize-tool-bars' is non-nil the tool bar's size will be changed -automatically so that all tool bar items are visible. - -*** Tool bar item definitions - -Tool bar items are defined using `define-key' with a prefix-key -`tool-bar'. For example `(define-key global-map [tool-bar item1] ITEM)' -where ITEM is a list `(menu-item CAPTION BINDING PROPS...)'. - -CAPTION is the caption of the item, If it's not a string, it is -evaluated to get a string. The caption is currently not displayed in -the tool bar, but it is displayed if the item doesn't have a `:help' -property (see below). - -BINDING is the tool bar item's binding. Tool bar items with keymaps as -binding are currently ignored. - -The following properties are recognized: - -`:enable FORM'. - -FORM is evaluated and specifies whether the tool bar item is enabled -or disabled. - -`:visible FORM' - -FORM is evaluated and specifies whether the tool bar item is displayed. - -`:filter FUNCTION' - -FUNCTION is called with one parameter, the same list BINDING in which -FUNCTION is specified as the filter. The value FUNCTION returns is -used instead of BINDING to display this item. - -`:button (TYPE SELECTED)' - -TYPE must be one of `:radio' or `:toggle'. SELECTED is evaluated -and specifies whether the button is selected (pressed) or not. - -`:image IMAGES' - -IMAGES is either a single image specification or a vector of four -image specifications. If it is a vector, this table lists the -meaning of each of the four elements: - - Index Use when item is - ---------------------------------------- - 0 enabled and selected - 1 enabled and deselected - 2 disabled and selected - 3 disabled and deselected - -If IMAGE is a single image specification, a Laplace edge-detection -algorithm is used on that image to draw the image in disabled state. - -`:help HELP-STRING'. - -Gives a help string to display for the tool bar item. This help -is displayed when the mouse is moved over the item. - -The function `toolbar-add-item' is a convenience function for adding -toolbar items generally, and `tool-bar-add-item-from-menu' can be used -to define a toolbar item with a binding copied from an item on the -menu bar. - -The default bindings use a menu-item :filter to derive the tool-bar -dynamically from variable `tool-bar-map' which may be set -buffer-locally to override the global map. - -*** Tool-bar-related variables. - -If `auto-resize-tool-bar' is non-nil, the tool bar will automatically -resize to show all defined tool bar items. It will never grow larger -than 1/4 of the frame's size. - -If `auto-raise-tool-bar-buttons' is non-nil, tool bar buttons will be -raised when the mouse moves over them. - -You can add extra space between tool bar items by setting -`tool-bar-button-margin' to a positive integer specifying a number of -pixels, or a pair of integers (X . Y) specifying horizontal and -vertical margins . Default is 1. - -You can change the shadow thickness of tool bar buttons by setting -`tool-bar-button-relief' to an integer. Default is 3. - -*** Tool-bar clicks with modifiers. - -You can bind commands to clicks with control, shift, meta etc. on -a tool bar item. If - - (define-key global-map [tool-bar shell] - '(menu-item "Shell" shell - :image (image :type xpm :file "shell.xpm"))) - -is the original tool bar item definition, then - - (define-key global-map [tool-bar S-shell] 'some-command) - -makes a binding to run `some-command' for a shifted click on the same -item. - -** Mode line changes. - -*** Mouse-sensitive mode line. - -The mode line can be made mouse-sensitive by displaying strings there -that have a `local-map' text property. There are three ways to display -a string with a `local-map' property in the mode line. - -1. The mode line spec contains a variable whose string value has -a `local-map' text property. - -2. The mode line spec contains a format specifier (e.g. `%12b'), and -that format specifier has a `local-map' property. - -3. The mode line spec contains a list containing `:eval FORM'. FORM -is evaluated. If the result is a string, and that string has a -`local-map' property. - -The same mechanism is used to determine the `face' and `help-echo' -properties of strings in the mode line. See `bindings.el' for an -example. - -*** If a mode line element has the form `(:eval FORM)', FORM is -evaluated and the result is used as mode line element. - -*** You can suppress mode-line display by setting the buffer-local -variable mode-line-format to nil. - -*** A headerline can now be displayed at the top of a window. - -This mode line's contents are controlled by the new variable -`header-line-format' and `default-header-line-format' which are -completely analogous to `mode-line-format' and -`default-mode-line-format'. A value of nil means don't display a top -line. - -The appearance of top mode lines is controlled by the face -`header-line'. - -The function `coordinates-in-window-p' returns `header-line' for a -position in the header-line. - -** Text property `display' - -The `display' text property is used to insert images into text, -replace text with other text, display text in marginal area, and it is -also used to control other aspects of how text displays. The value of -the `display' property should be a display specification, as described -below, or a list or vector containing display specifications. - -*** Replacing text, displaying text in marginal areas - -To replace the text having the `display' property with some other -text, use a display specification of the form `(LOCATION STRING)'. - -If LOCATION is `(margin left-margin)', STRING is displayed in the left -marginal area, if it is `(margin right-margin)', it is displayed in -the right marginal area, and if LOCATION is `(margin nil)' STRING -is displayed in the text. In the latter case you can also use the -simpler form STRING as property value. - -*** Variable width and height spaces - -To display a space of fractional width or height, use a display -specification of the form `(LOCATION STRECH)'. If LOCATION is -`(margin left-margin)', the space is displayed in the left marginal -area, if it is `(margin right-margin)', it is displayed in the right -marginal area, and if LOCATION is `(margin nil)' the space is -displayed in the text. In the latter case you can also use the -simpler form STRETCH as property value. - -The stretch specification STRETCH itself is a list of the form `(space -PROPS)', where PROPS is a property list which can contain the -properties described below. - -The display of the fractional space replaces the display of the -characters having the `display' property. - -- :width WIDTH - -Specifies that the space width should be WIDTH times the normal -character width. WIDTH can be an integer or floating point number. - -- :relative-width FACTOR - -Specifies that the width of the stretch should be computed from the -first character in a group of consecutive characters that have the -same `display' property. The computation is done by multiplying the -width of that character by FACTOR. - -- :align-to HPOS - -Specifies that the space should be wide enough to reach HPOS. The -value HPOS is measured in units of the normal character width. - -Exactly one of the above properties should be used. - -- :height HEIGHT - -Specifies the height of the space, as HEIGHT, measured in terms of the -normal line height. - -- :relative-height FACTOR - -The height of the space is computed as the product of the height -of the text having the `display' property and FACTOR. - -- :ascent ASCENT - -Specifies that ASCENT percent of the height of the stretch should be -used for the ascent of the stretch, i.e. for the part above the -baseline. The value of ASCENT must be a non-negative number less or -equal to 100. - -You should not use both `:height' and `:relative-height' together. - -*** Images - -A display specification for an image has the form `(LOCATION -. IMAGE)', where IMAGE is an image specification. The image replaces, -in the display, the characters having this display specification in -their `display' text property. If LOCATION is `(margin left-margin)', -the image will be displayed in the left marginal area, if it is -`(margin right-margin)' it will be displayed in the right marginal -area, and if LOCATION is `(margin nil)' the image will be displayed in -the text. In the latter case you can also use the simpler form IMAGE -as display specification. - -*** Other display properties - -- (space-width FACTOR) - -Specifies that space characters in the text having that property -should be displayed FACTOR times as wide as normal; FACTOR must be an -integer or float. - -- (height HEIGHT) - -Display text having this property in a font that is smaller or larger. - -If HEIGHT is a list of the form `(+ N)', where N is an integer, that -means to use a font that is N steps larger. If HEIGHT is a list of -the form `(- N)', that means to use a font that is N steps smaller. A -``step'' is defined by the set of available fonts; each size for which -a font is available counts as a step. - -If HEIGHT is a number, that means to use a font that is HEIGHT times -as tall as the frame's default font. - -If HEIGHT is a symbol, it is called as a function with the current -height as argument. The function should return the new height to use. - -Otherwise, HEIGHT is evaluated to get the new height, with the symbol -`height' bound to the current specified font height. - -- (raise FACTOR) - -FACTOR must be a number, specifying a multiple of the current -font's height. If it is positive, that means to display the characters -raised. If it is negative, that means to display them lower down. The -amount of raising or lowering is computed without taking account of the -`height' subproperty. - -*** Conditional display properties - -All display specifications can be conditionalized. If a specification -has the form `(when CONDITION . SPEC)', the specification SPEC applies -only when CONDITION yields a non-nil value when evaluated. During the -evaluation, `object' is bound to the string or buffer having the -conditional display property; `position' and `buffer-position' are -bound to the position within `object' and the buffer position where -the display property was found, respectively. Both positions can be -different when object is a string. - -The normal specification consisting of SPEC only is equivalent to -`(when t . SPEC)'. - -** New menu separator types. - -Emacs now supports more than one menu separator type. Menu items with -item names consisting of dashes only (including zero dashes) are -treated like before. In addition, the following item names are used -to specify other menu separator types. - -- `--no-line' or `--space', or `--:space', or `--:noLine' - -No separator lines are drawn, but a small space is inserted where the -separator occurs. - -- `--single-line' or `--:singleLine' - -A single line in the menu's foreground color. - -- `--double-line' or `--:doubleLine' - -A double line in the menu's foreground color. - -- `--single-dashed-line' or `--:singleDashedLine' - -A single dashed line in the menu's foreground color. - -- `--double-dashed-line' or `--:doubleDashedLine' - -A double dashed line in the menu's foreground color. - -- `--shadow-etched-in' or `--:shadowEtchedIn' - -A single line with 3D sunken appearance. This is the form -displayed for item names consisting of dashes only. - -- `--shadow-etched-out' or `--:shadowEtchedOut' - -A single line with 3D raised appearance. - -- `--shadow-etched-in-dash' or `--:shadowEtchedInDash' - -A single dashed line with 3D sunken appearance. - -- `--shadow-etched-out-dash' or `--:shadowEtchedOutDash' - -A single dashed line with 3D raise appearance. - -- `--shadow-double-etched-in' or `--:shadowDoubleEtchedIn' - -Two lines with 3D sunken appearance. - -- `--shadow-double-etched-out' or `--:shadowDoubleEtchedOut' - -Two lines with 3D raised appearance. - -- `--shadow-double-etched-in-dash' or `--:shadowDoubleEtchedInDash' - -Two dashed lines with 3D sunken appearance. - -- `--shadow-double-etched-out-dash' or `--:shadowDoubleEtchedOutDash' - -Two dashed lines with 3D raised appearance. - -Under LessTif/Motif, the last four separator types are displayed like -the corresponding single-line separators. - -** New frame parameters for scroll bar colors. - -The new frame parameters `scroll-bar-foreground' and -`scroll-bar-background' can be used to change scroll bar colors. -Their value must be either a color name, a string, or nil to specify -that scroll bars should use a default color. For toolkit scroll bars, -default colors are toolkit specific. For non-toolkit scroll bars, the -default background is the background color of the frame, and the -default foreground is black. - -The X resource name of these parameters are `scrollBarForeground' -(class ScrollBarForeground) and `scrollBarBackground' (class -`ScrollBarBackground'). - -Setting these parameters overrides toolkit specific X resource -settings for scroll bar colors. - -** You can set `redisplay-dont-pause' to a non-nil value to prevent -display updates from being interrupted when input is pending. - -** Changing a window's width may now change its window start if it -starts on a continuation line. The new window start is computed based -on the window's new width, starting from the start of the continued -line as the start of the screen line with the minimum distance from -the original window start. - -** The variable `hscroll-step' and the functions -`hscroll-point-visible' and `hscroll-window-column' have been removed -now that proper horizontal scrolling is implemented. - -** Windows can now be made fixed-width and/or fixed-height. - -A window is fixed-size if its buffer has a buffer-local variable -`window-size-fixed' whose value is not nil. A value of `height' makes -windows fixed-height, a value of `width' makes them fixed-width, any -other non-nil value makes them both fixed-width and fixed-height. - -The following code makes all windows displaying the current buffer -fixed-width and fixed-height. - - (set (make-local-variable 'window-size-fixed) t) - -A call to enlarge-window on a window gives an error if that window is -fixed-width and it is tried to change the window's width, or if the -window is fixed-height, and it is tried to change its height. To -change the size of a fixed-size window, bind `window-size-fixed' -temporarily to nil, for example - - (let ((window-size-fixed nil)) - (enlarge-window 10)) - -Likewise, an attempt to split a fixed-height window vertically, -or a fixed-width window horizontally results in a error. - -** The cursor-type frame parameter is now supported on MS-DOS -terminals. When Emacs starts, it by default changes the cursor shape -to a solid box, as it does on Unix. The `cursor-type' frame parameter -overrides this as it does on Unix, except that the bar cursor is -horizontal rather than vertical (since the MS-DOS display doesn't -support a vertical-bar cursor). - - - -* Emacs 20.7 is a bug-fix release with few user-visible changes - -** It is now possible to use CCL-based coding systems for keyboard -input. - -** ange-ftp now handles FTP security extensions, like Kerberos. - -** Rmail has been extended to recognize more forms of digest messages. - -** Now, most coding systems set in keyboard coding system work not -only for character input, but also in incremental search. The -exceptions are such coding systems that handle 2-byte character sets -(e.g euc-kr, euc-jp) and that use ISO's escape sequence -(e.g. iso-2022-jp). They are ignored in incremental search. - -** Support for Macintosh PowerPC-based machines running GNU/Linux has -been added. -* Emacs 20.6 is a bug-fix release with one user-visible change - -** Support for ARM-based non-RISCiX machines has been added. - - - -* Emacs 20.5 is a bug-fix release with no user-visible changes. - -** Not new, but not mentioned before: -M-w when Transient Mark mode is enabled disables the mark. - -* Changes in Emacs 20.4 - -** Init file may be called .emacs.el. - -You can now call the Emacs init file `.emacs.el'. -Formerly the name had to be `.emacs'. If you use the name -`.emacs.el', you can byte-compile the file in the usual way. - -If both `.emacs' and `.emacs.el' exist, the latter file -is the one that is used. - -** shell-command, and shell-command-on-region, now return -the exit code of the command (unless it is asynchronous). -Also, you can specify a place to put the error output, -separate from the command's regular output. -Interactively, the variable shell-command-default-error-buffer -says where to put error output; set it to a buffer name. -In calls from Lisp, an optional argument ERROR-BUFFER specifies -the buffer name. - -When you specify a non-nil error buffer (or buffer name), any error -output is inserted before point in that buffer, with \f\n to separate -it from the previous batch of error output. The error buffer is not -cleared, so error output from successive commands accumulates there. - -** Setting the default value of enable-multibyte-characters to nil in -the .emacs file, either explicitly using setq-default, or via Custom, -is now essentially equivalent to using --unibyte: all buffers -created during startup will be made unibyte after loading .emacs. - -** C-x C-f now handles the wildcards * and ? in file names. For -example, typing C-x C-f c*.c RET visits all the files whose names -match c*.c. To visit a file whose name contains * or ?, add the -quoting sequence /: to the beginning of the file name. - -** The M-x commands keep-lines, flush-lines and count-matches -now have the same feature as occur and query-replace: -if the pattern contains any upper case letters, then -they never ignore case. - -** The end-of-line format conversion feature previously mentioned -under `* Emacs 20.1 changes for MS-DOS and MS-Windows' actually -applies to all operating systems. Emacs recognizes from the contents -of a file what convention it uses to separate lines--newline, CRLF, or -just CR--and automatically converts the contents to the normal Emacs -convention (using newline to separate lines) for editing. This is a -part of the general feature of coding system conversion. - -If you subsequently save the buffer, Emacs converts the text back to -the same format that was used in the file before. - -You can turn off end-of-line conversion by setting the variable -`inhibit-eol-conversion' to non-nil, e.g. with Custom in the MULE group. - -** The character set property `prefered-coding-system' has been -renamed to `preferred-coding-system', for the sake of correct spelling. -This is a fairly internal feature, so few programs should be affected. - -** Mode-line display of end-of-line format is changed. -The indication of the end-of-line format of the file visited by a -buffer is now more explicit when that format is not the usual one for -your operating system. For example, the DOS-style end-of-line format -is displayed as "(DOS)" on Unix and GNU/Linux systems. The usual -end-of-line format is still displayed as a single character (colon for -Unix, backslash for DOS and Windows, and forward slash for the Mac). - -The values of the variables eol-mnemonic-unix, eol-mnemonic-dos, -eol-mnemonic-mac, and eol-mnemonic-undecided, which are strings, -control what is displayed in the mode line for each end-of-line -format. You can now customize these variables. - -** In the previous version of Emacs, tar-mode didn't work well if a -filename contained non-ASCII characters. Now this is fixed. Such a -filename is decoded by file-name-coding-system if the default value of -enable-multibyte-characters is non-nil. - -** The command temp-buffer-resize-mode toggles a minor mode -in which temporary buffers (such as help buffers) are given -windows just big enough to hold the whole contents. - -** If you use completion.el, you must now run the function -dynamic-completion-mode to enable it. Just loading the file -doesn't have any effect. - -** In Flyspell mode, the default is now to make just one Ispell process, -not one per buffer. - -** If you use iswitchb but do not call (iswitchb-default-keybindings) to -use the default keybindings, you will need to add the following line: - (add-hook 'minibuffer-setup-hook 'iswitchb-minibuffer-setup) - -** Auto-show mode is no longer enabled just by loading auto-show.el. -To control it, set `auto-show-mode' via Custom or use the -`auto-show-mode' command. - -** Handling of X fonts' ascent/descent parameters has been changed to -avoid redisplay problems. As a consequence, compared with previous -versions the line spacing and frame size now differ with some font -choices, typically increasing by a pixel per line. This change -occurred in version 20.3 but was not documented then. - -** If you select the bar cursor style, it uses the frame's -cursor-color, rather than the cursor foreground pixel. - -** In multibyte mode, Rmail decodes incoming MIME messages using the -character set specified in the message. If you want to disable this -feature, set the variable rmail-decode-mime-charset to nil. - -** Not new, but not mentioned previously in NEWS: when you use #! at -the beginning of a file to make it executable and specify an -interpreter program, Emacs looks on the second line for the -*- mode -and variable specification, as well as on the first line. - -** Support for IBM codepage encoding of non-ASCII characters. - -The new command M-x codepage-setup creates a special coding system -that can be used to convert text between a specific IBM codepage and -one of the character sets built into Emacs which matches that -codepage. For example, codepage 850 corresponds to Latin-1 character -set, codepage 855 corresponds to Cyrillic-ISO character set, etc. - -Windows codepages 1250, 1251 and some others, where Windows deviates -from the corresponding ISO character set, are also supported. - -IBM box-drawing characters and other glyphs which don't have -equivalents in the corresponding ISO character set, are converted to -a character defined by dos-unsupported-char-glyph on MS-DOS, and to -`?' on other systems. - -IBM codepages are widely used on MS-DOS and MS-Windows, so this -feature is most useful on those platforms, but it can also be used on -Unix. - -Emacs compiled for MS-DOS automatically loads the support for the -current codepage when it starts. - -** Mail changes - -*** When mail is sent using compose-mail (C-x m), and if -`mail-send-nonascii' is set to the new default value `mime', -appropriate MIME headers are added. The headers are added only if -non-ASCII characters are present in the body of the mail, and no other -MIME headers are already present. For example, the following three -headers are added if the coding system used in the *mail* buffer is -latin-1: - - MIME-version: 1.0 - Content-type: text/plain; charset=iso-8859-1 - Content-Transfer-Encoding: 8bit - -*** The new variable default-sendmail-coding-system specifies the -default way to encode outgoing mail. This has higher priority than -default-buffer-file-coding-system but has lower priority than -sendmail-coding-system and the local value of -buffer-file-coding-system. - -You should not set this variable manually. Instead, set -sendmail-coding-system to specify a fixed encoding for all outgoing -mail. - -*** When you try to send a message that contains non-ASCII characters, -if the coding system specified by those variables doesn't handle them, -Emacs will ask you to select a suitable coding system while showing a -list of possible coding systems. - -** CC Mode changes - -*** c-default-style can now take an association list that maps major -modes to style names. When this variable is an alist, Java mode no -longer hardcodes a setting to "java" style. See the variable's -docstring for details. - -*** It's now possible to put a list as the offset on a syntactic -symbol. The list is evaluated recursively until a non-nil offset is -found. This is useful to combine several lineup functions to act in a -prioritized order on a single line. However, none of the supplied -lineup functions use this feature currently. - -*** New syntactic symbol catch-clause, which is used on the "catch" and -"finally" lines in try-catch constructs in C++ and Java. - -*** New cleanup brace-catch-brace on c-cleanup-list, which does for -"catch" lines what brace-elseif-brace does for "else if" lines. - -*** The braces of Java anonymous inner classes are treated separately -from the braces of other classes in auto-newline mode. Two new -symbols inexpr-class-open and inexpr-class-close may be used on -c-hanging-braces-alist to control the automatic newlines used for -anonymous classes. - -*** Support for the Pike language added, along with new Pike specific -syntactic symbols: inlambda, lambda-intro-cont - -*** Support for Java anonymous classes via new syntactic symbol -inexpr-class. New syntactic symbol inexpr-statement for Pike -support and gcc-style statements inside expressions. New lineup -function c-lineup-inexpr-block. - -*** New syntactic symbol brace-entry-open which is used in brace lists -(i.e. static initializers) when a list entry starts with an open -brace. These used to be recognized as brace-list-entry's. -c-electric-brace also recognizes brace-entry-open braces -(brace-list-entry's can no longer be electrified). - -*** New command c-indent-line-or-region, not bound by default. - -*** `#' is only electric when typed in the indentation of a line. - -*** Parentheses are now electric (via the new command c-electric-paren) -for auto-reindenting lines when parens are typed. - -*** In "gnu" style, inline-open offset is now set to zero. - -*** Uniform handling of the inclass syntactic symbol. The indentation -associated with it is now always relative to the class opening brace. -This means that the indentation behavior has changed in some -circumstances, but only if you've put anything besides 0 on the -class-open syntactic symbol (none of the default styles do that). - -** Gnus changes. - -*** New functionality for using Gnus as an offline newsreader has been -added. A plethora of new commands and modes have been added. See the -Gnus manual for the full story. - -*** The nndraft backend has returned, but works differently than -before. All Message buffers are now also articles in the nndraft -group, which is created automatically. - -*** `gnus-alter-header-function' can now be used to alter header -values. - -*** `gnus-summary-goto-article' now accept Message-ID's. - -*** A new Message command for deleting text in the body of a message -outside the region: `C-c C-v'. - -*** You can now post to component group in nnvirtual groups with -`C-u C-c C-c'. - -*** `nntp-rlogin-program' -- new variable to ease customization. - -*** `C-u C-c C-c' in `gnus-article-edit-mode' will now inhibit -re-highlighting of the article buffer. - -*** New element in `gnus-boring-article-headers' -- `long-to'. - -*** `M-i' symbolic prefix command. See the section "Symbolic -Prefixes" in the Gnus manual for details. - -*** `L' and `I' in the summary buffer now take the symbolic prefix -`a' to add the score rule to the "all.SCORE" file. - -*** `gnus-simplify-subject-functions' variable to allow greater -control over simplification. - -*** `A T' -- new command for fetching the current thread. - -*** `/ T' -- new command for including the current thread in the -limit. - -*** `M-RET' is a new Message command for breaking cited text. - -*** \\1-expressions are now valid in `nnmail-split-methods'. - -*** The `custom-face-lookup' function has been removed. -If you used this function in your initialization files, you must -rewrite them to use `face-spec-set' instead. - -*** Canceling now uses the current select method. Symbolic prefix -`a' forces normal posting method. - -*** New command to translate M******** sm*rtq**t*s into proper text --- `W d'. - -*** For easier debugging of nntp, you can set `nntp-record-commands' -to a non-nil value. - -*** nntp now uses ~/.authinfo, a .netrc-like file, for controlling -where and how to send AUTHINFO to NNTP servers. - -*** A command for editing group parameters from the summary buffer -has been added. - -*** A history of where mails have been split is available. - -*** A new article date command has been added -- `article-date-iso8601'. - -*** Subjects can be simplified when threading by setting -`gnus-score-thread-simplify'. - -*** A new function for citing in Message has been added -- -`message-cite-original-without-signature'. - -*** `article-strip-all-blank-lines' -- new article command. - -*** A new Message command to kill to the end of the article has -been added. - -*** A minimum adaptive score can be specified by using the -`gnus-adaptive-word-minimum' variable. - -*** The "lapsed date" article header can be kept continually -updated by the `gnus-start-date-timer' command. - -*** Web listserv archives can be read with the nnlistserv backend. - -*** Old dejanews archives can now be read by nnweb. - -*** `gnus-posting-styles' has been re-activated. - -** Changes to TeX and LaTeX mode - -*** The new variable `tex-start-options-string' can be used to give -options for the TeX run. The default value causes TeX to run in -nonstopmode. For an interactive TeX run set it to nil or "". - -*** The command `tex-feed-input' sends input to the Tex Shell. In a -TeX buffer it is bound to the keys C-RET, C-c RET, and C-c C-m (some -of these keys may not work on all systems). For instance, if you run -TeX interactively and if the TeX run stops because of an error, you -can continue it without leaving the TeX buffer by typing C-RET. - -*** The Tex Shell Buffer is now in `compilation-shell-minor-mode'. -All error-parsing commands of the Compilation major mode are available -but bound to keys that don't collide with the shell. Thus you can use -the Tex Shell for command line executions like a usual shell. - -*** The commands `tex-validate-region' and `tex-validate-buffer' check -the matching of braces and $'s. The errors are listed in a *Occur* -buffer and you can use C-c C-c or mouse-2 to go to a particular -mismatch. - -** Changes to RefTeX mode - -*** The table of contents buffer can now also display labels and -file boundaries in addition to sections. Use `l', `i', and `c' keys. - -*** Labels derived from context (the section heading) are now -lowercase by default. To make the label legal in LaTeX, latin-1 -characters will lose their accent. All Mule characters will be -removed from the label. - -*** The automatic display of cross reference information can also use -a window instead of the echo area. See variable `reftex-auto-view-crossref'. - -*** kpsewhich can be used by RefTeX to find TeX and BibTeX files. See the -customization group `reftex-finding-files'. - -*** The option `reftex-bibfile-ignore-list' has been renamed to -`reftex-bibfile-ignore-regexps' and indeed can be fed with regular -expressions. - -*** Multiple Selection buffers are now hidden buffers. - -** New/deleted modes and packages - -*** The package snmp-mode.el provides major modes for editing SNMP and -SNMPv2 MIBs. It has entries on `auto-mode-alist'. - -*** The package sql.el provides a major mode, M-x sql-mode, for -editing SQL files, and M-x sql-interactive-mode for interacting with -SQL interpreters. It has an entry on `auto-mode-alist'. - -*** ispell4.el has been deleted. It got in the way of ispell.el and -this was hard to fix reliably. It has long been obsolete -- use -Ispell 3.1 and ispell.el. - -* MS-DOS changes in Emacs 20.4 - -** Emacs compiled for MS-DOS now supports MULE features better. -This includes support for display of all ISO 8859-N character sets, -conversion to and from IBM codepage encoding of non-ASCII characters, -and automatic setup of the MULE environment at startup. For details, -check out the section `MS-DOS and MULE' in the manual. - -The MS-DOS installation procedure automatically configures and builds -Emacs with input method support if it finds an unpacked Leim -distribution when the config.bat script is run. - -** Formerly, the value of lpr-command did not affect printing on -MS-DOS unless print-region-function was set to nil, but now it -controls whether an external program is invoked or output is written -directly to a printer port. Similarly, in the previous version of -Emacs, the value of ps-lpr-command did not affect PostScript printing -on MS-DOS unless ps-printer-name was set to something other than a -string (eg. t or `pipe'), but now it controls whether an external -program is used. (These changes were made so that configuration of -printing variables would be almost identical across all platforms.) - -** In the previous version of Emacs, PostScript and non-PostScript -output was piped to external programs, but because most print programs -available for MS-DOS and MS-Windows cannot read data from their standard -input, on those systems the data to be output is now written to a -temporary file whose name is passed as the last argument to the external -program. - -An exception is made for `print', a standard program on Windows NT, -and `nprint', a standard program on Novell Netware. For both of these -programs, the command line is constructed in the appropriate syntax -automatically, using only the value of printer-name or ps-printer-name -as appropriate--the value of the relevant `-switches' variable is -ignored, as both programs have no useful switches. - -** The value of the variable dos-printer (cf. dos-ps-printer), if it has -a value, overrides the value of printer-name (cf. ps-printer-name), on -MS-DOS and MS-Windows only. This has been true since version 20.3, but -was not documented clearly before. - -** All the Emacs games now work on MS-DOS terminals. -This includes Tetris and Snake. - -* Lisp changes in Emacs 20.4 - -** New functions line-beginning-position and line-end-position -return the position of the beginning or end of the current line. -They both accept an optional argument, which has the same -meaning as the argument to beginning-of-line or end-of-line. - -** find-file and allied functions now have an optional argument -WILDCARD. If this is non-nil, they do wildcard processing, -and visit all files that match the wildcard pattern. - -** Changes in the file-attributes function. - -*** The file size returned by file-attributes may be an integer or a float. -It is an integer if the size fits in a Lisp integer, float otherwise. - -*** The inode number returned by file-attributes may be an integer (if -the number fits in a Lisp integer) or a cons cell containing two -integers. - -** The new function directory-files-and-attributes returns a list of -files in a directory and their attributes. It accepts the same -arguments as directory-files and has similar semantics, except that -file names and attributes are returned. - -** The new function file-attributes-lessp is a helper function for -sorting the list generated by directory-files-and-attributes. It -accepts two arguments, each a list of a file name and its attributes. -It compares the file names of each according to string-lessp and -returns the result. - -** The new function file-expand-wildcards expands a wildcard-pattern -to produce a list of existing files that match the pattern. - -** New functions for base64 conversion: - -The function base64-encode-region converts a part of the buffer -into the base64 code used in MIME. base64-decode-region -performs the opposite conversion. Line-breaking is supported -optionally. - -Functions base64-encode-string and base64-decode-string do a similar -job on the text in a string. They return the value as a new string. - -** -The new function process-running-child-p -will tell you if a subprocess has given control of its -terminal to its own child process. - -** interrupt-process and such functions have a new feature: -when the second argument is `lambda', they send a signal -to the running child of the subshell, if any, but if the shell -itself owns its terminal, no signal is sent. - -** There are new widget types `plist' and `alist' which can -be used for customizing variables whose values are plists or alists. - -** easymenu.el now understands `:key-sequence' and `:style button'. -:included is an alias for :visible. - -easy-menu-add-item now understands the values returned by -easy-menu-remove-item and easy-menu-item-present-p. This can be used -to move or copy menu entries. - -** Multibyte editing changes - -*** The definitions of sref and char-bytes are changed. Now, sref is -an alias of aref and char-bytes always returns 1. This change is to -make some Emacs Lisp code which works on 20.2 and earlier also -work on the latest Emacs. Such code uses a combination of sref and -char-bytes in a loop typically as below: - (setq char (sref str idx) - idx (+ idx (char-bytes idx))) -The byte-compiler now warns that this is obsolete. - -If you want to know how many bytes a specific multibyte character -(say, CH) occupies in a multibyte buffer, use this code: - (charset-bytes (char-charset ch)) - -*** In multibyte mode, when you narrow a buffer to some region, and the -region is preceded or followed by non-ASCII codes, inserting or -deleting at the head or the end of the region may signal this error: - - Byte combining across boundary of accessible buffer text inhibited - -This is to avoid some bytes being combined together into a character -across the boundary. - -*** The functions find-charset-region and find-charset-string include -`unknown' in the returned list in the following cases: - o The current buffer or the target string is unibyte and - contains 8-bit characters. - o The current buffer or the target string is multibyte and - contains invalid characters. - -*** The functions decode-coding-region and encode-coding-region remove -text properties of the target region. Ideally, they should correctly -preserve text properties, but for the moment, it's hard. Removing -text properties is better than preserving them in a less-than-correct -way. - -*** prefer-coding-system sets EOL conversion of default coding systems. -If the argument to prefer-coding-system specifies a certain type of -end of line conversion, the default coding systems set by -prefer-coding-system will specify that conversion type for end of line. - -*** The new function thai-compose-string can be used to properly -compose Thai characters in a string. - -** The primitive `define-prefix-command' now takes an optional third -argument NAME, which should be a string. It supplies the menu name -for the created keymap. Keymaps created in order to be displayed as -menus should always use the third argument. - -** The meanings of optional second arguments for read-char, -read-event, and read-char-exclusive are flipped. Now the second -arguments are INHERIT-INPUT-METHOD. These functions use the current -input method (if any) if and only if INHERIT-INPUT-METHOD is non-nil. - -** The new function clear-this-command-keys empties out the contents -of the vector that (this-command-keys) returns. This is useful in -programs that read passwords, to prevent the passwords from echoing -inadvertently as part of the next command in certain cases. - -** The new macro `with-temp-message' displays a temporary message in -the echo area, while executing some Lisp code. Like `progn', it -returns the value of the last form, but it also restores the previous -echo area contents. - - (with-temp-message MESSAGE &rest BODY) - -** The function `require' now takes an optional third argument -NOERROR. If it is non-nil, then there is no error if the -requested feature cannot be loaded. - -** In the function modify-face, an argument of (nil) for the -foreground color, background color or stipple pattern -means to clear out that attribute. - -** The `outer-window-id' frame property of an X frame -gives the window number of the outermost X window for the frame. - -** Temporary buffers made with with-output-to-temp-buffer are now -read-only by default, and normally use the major mode Help mode -unless you put them in some other non-Fundamental mode before the -end of with-output-to-temp-buffer. - -** The new functions gap-position and gap-size return information on -the gap of the current buffer. - -** The new functions position-bytes and byte-to-position provide a way -to convert between character positions and byte positions in the -current buffer. - -** vc.el defines two new macros, `edit-vc-file' and `with-vc-file', to -facilitate working with version-controlled files from Lisp programs. -These macros check out a given file automatically if needed, and check -it back in after any modifications have been made. - -* Installation Changes in Emacs 20.3 - -** The default value of load-path now includes most subdirectories of -the site-specific directories /usr/local/share/emacs/site-lisp and -/usr/local/share/emacs/VERSION/site-lisp, in addition to those -directories themselves. Both immediate subdirectories and -subdirectories multiple levels down are added to load-path. - -Not all subdirectories are included, though. Subdirectories whose -names do not start with a letter or digit are excluded. -Subdirectories named RCS or CVS are excluded. Also, a subdirectory -which contains a file named `.nosearch' is excluded. You can use -these methods to prevent certain subdirectories from being searched. - -Emacs finds these subdirectories and adds them to load-path when it -starts up. While it would be cleaner to find the subdirectories each -time Emacs loads a file, that would be much slower. - -This feature is an incompatible change. If you have stored some Emacs -Lisp files in a subdirectory of the site-lisp directory specifically -to prevent them from being used, you will need to rename the -subdirectory to start with a non-alphanumeric character, or create a -`.nosearch' file in it, in order to continue to achieve the desired -results. - -** Emacs no longer includes an old version of the C preprocessor from -GCC. This was formerly used to help compile Emacs with C compilers -that had limits on the significant length of an identifier, but in -fact we stopped supporting such compilers some time ago. - -* Changes in Emacs 20.3 - -** The new command C-x z (repeat) repeats the previous command -including its argument. If you repeat the z afterward, -it repeats the command additional times; thus, you can -perform many repetitions with one keystroke per repetition. - -** Emacs now supports "selective undo" which undoes only within a -specified region. To do this, set point and mark around the desired -region and type C-u C-x u (or C-u C-_). You can then continue undoing -further, within the same region, by repeating the ordinary undo -command C-x u or C-_. This will keep undoing changes that were made -within the region you originally specified, until either all of them -are undone, or it encounters a change which crosses the edge of that -region. - -In Transient Mark mode, undoing when a region is active requests -selective undo. - -** If you specify --unibyte when starting Emacs, then all buffers are -unibyte, except when a Lisp program specifically creates a multibyte -buffer. Setting the environment variable EMACS_UNIBYTE has the same -effect. The --no-unibyte option overrides EMACS_UNIBYTE and directs -Emacs to run normally in multibyte mode. - -The option --unibyte does not affect the reading of Emacs Lisp files, -though. If you want a Lisp file to be read in unibyte mode, use --*-unibyte: t;-*- on its first line. That will force Emacs to -load that file in unibyte mode, regardless of how Emacs was started. - -** toggle-enable-multibyte-characters no longer has a key binding and -no longer appears in the menu bar. We've realized that changing the -enable-multibyte-characters variable in an existing buffer is -something that most users not do. - -** You can specify a coding system to use for the next cut or paste -operations through the window system with the command C-x RET X. -The coding system can make a difference for communication with other -applications. - -C-x RET x specifies a coding system for all subsequent cutting and -pasting operations. - -** You can specify the printer to use for commands that do printing by -setting the variable `printer-name'. Just what a printer name looks -like depends on your operating system. You can specify a different -printer for the Postscript printing commands by setting -`ps-printer-name'. - -** Emacs now supports on-the-fly spell checking by the means of a -minor mode. It is called M-x flyspell-mode. You don't have to remember -any other special commands to use it, and you will hardly notice it -except when you make a spelling error. Flyspell works by highlighting -incorrect words as soon as they are completed or as soon as the cursor -hits a new word. - -Flyspell mode works with whichever dictionary you have selected for -Ispell in Emacs. In TeX mode, it understands TeX syntax so as not -to be confused by TeX commands. - -You can correct a misspelled word by editing it into something -correct. You can also correct it, or accept it as correct, by -clicking on the word with Mouse-2; that gives you a pop-up menu -of various alternative replacements and actions. - -Flyspell mode also proposes "automatic" corrections. M-TAB replaces -the current misspelled word with a possible correction. If several -corrections are made possible, M-TAB cycles through them in -alphabetical order, or in order of decreasing likelihood if -flyspell-sort-corrections is nil. - -Flyspell mode also flags an error when a word is repeated, if -flyspell-mark-duplications-flag is non-nil. - -** Changes in input method usage. - -Now you can use arrow keys (right, left, down, up) for selecting among -the alternatives just the same way as you do by C-f, C-b, C-n, and C-p -respectively. - -You can use the ENTER key to accept the current conversion. - -If you type TAB to display a list of alternatives, you can select one -of the alternatives with Mouse-2. - -The meaning of the variable `input-method-verbose-flag' is changed so -that you can set it to t, nil, `default', or `complex-only'. - - If the value is nil, extra guidance is never given. - - If the value is t, extra guidance is always given. - - If the value is `complex-only', extra guidance is always given only - when you are using complex input methods such as chinese-py. - - If the value is `default' (this is the default), extra guidance is - given in the following case: - o When you are using a complex input method. - o When you are using a simple input method but not in the minibuffer. - -If you are using Emacs through a very slow line, setting -input-method-verbose-flag to nil or to complex-only is a good choice, -and if you are using an input method you are not familiar with, -setting it to t is helpful. - -The old command select-input-method is now called set-input-method. - -In the language environment "Korean", you can use the following -keys: - Shift-SPC toggle-korean-input-method - C-F9 quail-hangul-switch-symbol-ksc - F9 quail-hangul-switch-hanja -These key bindings are canceled when you switch to another language -environment. - -** The minibuffer history of file names now records the specified file -names, not the entire minibuffer input. For example, if the -minibuffer starts out with /usr/foo/, you might type in /etc/passwd to -get - - /usr/foo//etc/passwd - -which stands for the file /etc/passwd. - -Formerly, this used to put /usr/foo//etc/passwd in the history list. -Now this puts just /etc/passwd in the history list. - -** If you are root, Emacs sets backup-by-copying-when-mismatch to t -at startup, so that saving a file will be sure to preserve -its owner and group. - -** find-func.el can now also find the place of definition of Emacs -Lisp variables in user-loaded libraries. - -** C-x r t (string-rectangle) now deletes the existing rectangle -contents before inserting the specified string on each line. - -** There is a new command delete-whitespace-rectangle -which deletes whitespace starting from a particular column -in all the lines on a rectangle. The column is specified -by the left edge of the rectangle. - -** You can now store a number into a register with C-u NUMBER C-x r n REG, -increment it by INC with C-u INC C-x r + REG (to increment by one, omit -C-u INC), and insert it in the buffer with C-x r g REG. This is useful -for writing keyboard macros. - -** The new command M-x speedbar displays a frame in which directories, -files, and tags can be displayed, manipulated, and jumped to. The -frame defaults to 20 characters in width, and is the same height as -the frame that it was started from. Some major modes define -additional commands for the speedbar, including Rmail, GUD/GDB, and -info. - -** query-replace-regexp is now bound to C-M-%. - -** In Transient Mark mode, when the region is active, M-x -query-replace and the other replace commands now operate on the region -contents only. - -** M-x write-region, when used interactively, now asks for -confirmation before overwriting an existing file. When you call -the function from a Lisp program, a new optional argument CONFIRM -says whether to ask for confirmation in this case. - -** If you use find-file-literally and the file is already visited -non-literally, the command asks you whether to revisit the file -literally. If you say no, it signals an error. - -** Major modes defined with the "derived mode" feature -now use the proper name for the mode hook: WHATEVER-mode-hook. -Formerly they used the name WHATEVER-mode-hooks, but that is -inconsistent with Emacs conventions. - -** shell-command-on-region (and shell-command) reports success or -failure if the command produces no output. - -** Set focus-follows-mouse to nil if your window system or window -manager does not transfer focus to another window when you just move -the mouse. - -** mouse-menu-buffer-maxlen has been renamed to -mouse-buffer-menu-maxlen to be consistent with the other related -function and variable names. - -** The new variable auto-coding-alist specifies coding systems for -reading specific files. This has higher priority than -file-coding-system-alist. - -** If you set the variable unibyte-display-via-language-environment to -t, then Emacs displays non-ASCII characters are displayed by -converting them to the equivalent multibyte characters according to -the current language environment. As a result, they are displayed -according to the current fontset. - -** C-q's handling of codes in the range 0200 through 0377 is changed. - -The codes in the range 0200 through 0237 are inserted as one byte of -that code regardless of the values of nonascii-translation-table and -nonascii-insert-offset. - -For the codes in the range 0240 through 0377, if -enable-multibyte-characters is non-nil and nonascii-translation-table -nor nonascii-insert-offset can't convert them to valid multibyte -characters, they are converted to Latin-1 characters. - -** If you try to find a file that is not read-accessible, you now get -an error, rather than an empty buffer and a warning. - -** In the minibuffer history commands M-r and M-s, an upper case -letter in the regular expression forces case-sensitive search. - -** In the *Help* buffer, cross-references to commands and variables -are inferred and hyperlinked. Use C-h m in Help mode for the relevant -command keys. - -** M-x apropos-command, with a prefix argument, no longer looks for -user option variables--instead it looks for noninteractive functions. - -Meanwhile, the command apropos-variable normally searches for -user option variables; with a prefix argument, it looks at -all variables that have documentation. - -** When you type a long line in the minibuffer, and the minibuffer -shows just one line, automatically scrolling works in a special way -that shows you overlap with the previous line of text. The variable -minibuffer-scroll-overlap controls how many characters of overlap -it should show; the default is 20. - -Meanwhile, Resize Minibuffer mode is still available; in that mode, -the minibuffer grows taller (up to a point) as needed to show the whole -of your input. - -** The new command M-x customize-changed-options lets you customize -all the options whose meanings or default values have changed in -recent Emacs versions. You specify a previous Emacs version number as -argument, and the command creates a customization buffer showing all -the customizable options which were changed since that version. -Newly added options are included as well. - -If you don't specify a particular version number argument, -then the customization buffer shows all the customizable options -for which Emacs versions of changes are recorded. - -This function is also bound to the Changed Options entry in the -Customize menu. - -** When you run M-x grep with a prefix argument, it figures out -the tag around point and puts that into the default grep command. - -** The new command M-* (pop-tag-mark) pops back through a history of -buffer positions from which M-. or other tag-finding commands were -invoked. - -** The new variable comment-padding specifies the number of spaces -that `comment-region' will insert before the actual text of the comment. -The default is 1. - -** In Fortran mode the characters `.', `_' and `$' now have symbol -syntax, not word syntax. Fortran mode now supports `imenu' and has -new commands fortran-join-line (M-^) and fortran-narrow-to-subprogram -(C-x n d). M-q can be used to fill a statement or comment block -sensibly. - -** GUD now supports jdb, the Java debugger, and pdb, the Python debugger. - -** If you set the variable add-log-keep-changes-together to a non-nil -value, the command `C-x 4 a' will automatically notice when you make -two entries in one day for one file, and combine them. - -** You can use the command M-x diary-mail-entries to mail yourself a -reminder about upcoming diary entries. See the documentation string -for a sample shell script for calling this function automatically -every night. - -** Desktop changes - -*** All you need to do to enable use of the Desktop package, is to set -the variable desktop-enable to t with Custom. - -*** Minor modes are now restored. Which minor modes are restored -and how modes are restored is controlled by `desktop-minor-mode-table'. - -** There is no need to do anything special, now, to enable Gnus to -read and post multi-lingual articles. - -** Outline mode has now support for showing hidden outlines when -doing an isearch. In order for this to happen search-invisible should -be set to open (the default). If an isearch match is inside a hidden -outline the outline is made visible. If you continue pressing C-s and -the match moves outside the formerly invisible outline, the outline is -made invisible again. - -** Mail reading and sending changes - -*** The Rmail e command now switches to displaying the whole header of -the message before it lets you edit the message. This is so that any -changes you make in the header will not be lost if you subsequently -toggle. - -*** The w command in Rmail, which writes the message body into a file, -now works in the summary buffer as well. (The command to delete the -summary buffer is now Q.) The default file name for the w command, if -the message has no subject, is stored in the variable -rmail-default-body-file. - -*** Most of the commands and modes that operate on mail and netnews no -longer depend on the value of mail-header-separator. Instead, they -handle whatever separator the buffer happens to use. - -*** If you set mail-signature to a value which is not t, nil, or a string, -it should be an expression. When you send a message, this expression -is evaluated to insert the signature. - -*** The new Lisp library feedmail.el (version 8) enhances processing of -outbound email messages. It works in coordination with other email -handling packages (e.g., rmail, VM, gnus) and is responsible for -putting final touches on messages and actually submitting them for -transmission. Users of the emacs program "fakemail" might be -especially interested in trying feedmail. - -feedmail is not enabled by default. See comments at the top of -feedmail.el for set-up instructions. Among the bigger features -provided by feedmail are: - -**** you can park outgoing messages into a disk-based queue and -stimulate sending some or all of them later (handy for laptop users); -there is also a queue for draft messages - -**** you can get one last look at the prepped outbound message and -be prompted for confirmation - -**** does smart filling of address headers - -**** can generate a MESSAGE-ID: line and a DATE: line; the date can be -the time the message was written or the time it is being sent; this -can make FCC copies more closely resemble copies that recipients get - -**** you can specify an arbitrary function for actually transmitting -the message; included in feedmail are interfaces for /bin/[r]mail, -/usr/lib/sendmail, and Emacs Lisp smtpmail; it's easy to write a new -function for something else (10-20 lines of Lisp code). - -** Dired changes - -*** The Dired function dired-do-toggle, which toggles marked and unmarked -files, is now bound to "t" instead of "T". - -*** dired-at-point has been added to ffap.el. It allows one to easily -run Dired on the directory name at point. - -*** Dired has a new command: %g. It searches the contents of -files in the directory and marks each file that contains a match -for a specified regexp. - -** VC Changes - -*** New option vc-ignore-vc-files lets you turn off version control -conveniently. - -*** VC Dired has been completely rewritten. It is now much -faster, especially for CVS, and works very similar to ordinary -Dired. - -VC Dired is invoked by typing C-x v d and entering the name of the -directory to display. By default, VC Dired gives you a recursive -listing of all files at or below the given directory which are -currently locked (for CVS, all files not up-to-date are shown). - -You can change the listing format by setting vc-dired-recurse to nil, -then it shows only the given directory, and you may also set -vc-dired-terse-display to nil, then it shows all files under version -control plus the names of any subdirectories, so that you can type `i' -on such lines to insert them manually, as in ordinary Dired. - -All Dired commands operate normally in VC Dired, except for `v', which -is redefined as the version control prefix. That means you may type -`v l', `v =' etc. to invoke `vc-print-log', `vc-diff' and the like on -the file named in the current Dired buffer line. `v v' invokes -`vc-next-action' on this file, or on all files currently marked. - -The new command `v t' (vc-dired-toggle-terse-mode) allows you to -toggle between terse display (only locked files) and full display (all -VC files plus subdirectories). There is also a special command, -`* l', to mark all files currently locked. - -Giving a prefix argument to C-x v d now does the same thing as in -ordinary Dired: it allows you to supply additional options for the ls -command in the minibuffer, to fine-tune VC Dired's output. - -*** Under CVS, if you merge changes from the repository into a working -file, and CVS detects conflicts, VC now offers to start an ediff -session to resolve them. - -Alternatively, you can use the new command `vc-resolve-conflicts' to -resolve conflicts in a file at any time. It works in any buffer that -contains conflict markers as generated by rcsmerge (which is what CVS -uses as well). - -*** You can now transfer changes between branches, using the new -command vc-merge (C-x v m). It is implemented for RCS and CVS. When -you invoke it in a buffer under version-control, you can specify -either an entire branch or a pair of versions, and the changes on that -branch or between the two versions are merged into the working file. -If this results in any conflicts, they may be resolved interactively, -using ediff. - -** Changes in Font Lock - -*** The face and variable previously known as font-lock-reference-face -are now called font-lock-constant-face to better reflect their typical -use for highlighting constants and labels. (Its face properties are -unchanged.) The variable font-lock-reference-face remains for now for -compatibility reasons, but its value is font-lock-constant-face. - -** Frame name display changes - -*** The command set-frame-name lets you set the name of the current -frame. You can use the new command select-frame-by-name to select and -raise a frame; this is mostly useful on character-only terminals, or -when many frames are invisible or iconified. - -*** On character-only terminal (not a window system), changing the -frame name is now reflected on the mode line and in the Buffers/Frames -menu. - -** Comint (subshell) changes - -*** In Comint modes, the commands to kill, stop or interrupt a -subjob now also kill pending input. This is for compatibility -with ordinary shells, where the signal characters do this. - -*** There are new commands in Comint mode. - -C-c C-x fetches the "next" line from the input history; -that is, the line after the last line you got. -You can use this command to fetch successive lines, one by one. - -C-c SPC accumulates lines of input. More precisely, it arranges to -send the current line together with the following line, when you send -the following line. - -C-c C-a if repeated twice consecutively now moves to the process mark, -which separates the pending input from the subprocess output and the -previously sent input. - -C-c M-r now runs comint-previous-matching-input-from-input; -it searches for a previous command, using the current pending input -as the search string. - -*** New option compilation-scroll-output can be set to scroll -automatically in compilation-mode windows. - -** C mode changes - -*** Multiline macros are now handled, both as they affect indentation, -and as recognized syntax. New syntactic symbol cpp-macro-cont is -assigned to second and subsequent lines of a multiline macro -definition. - -*** A new style "user" which captures all non-hook-ified -(i.e. top-level) .emacs file variable settings and customizations. -Style "cc-mode" is an alias for "user" and is deprecated. "gnu" -style is still the default however. - -*** "java" style now conforms to Sun's JDK coding style. - -*** There are new commands c-beginning-of-defun, c-end-of-defun which -are alternatives which you could bind to C-M-a and C-M-e if you prefer -them. They do not have key bindings by default. - -*** New and improved implementations of M-a (c-beginning-of-statement) -and M-e (c-end-of-statement). - -*** C++ namespace blocks are supported, with new syntactic symbols -namespace-open, namespace-close, and innamespace. - -*** File local variable settings of c-file-style and c-file-offsets -makes the style variables local to that buffer only. - -*** New indentation functions c-lineup-close-paren, -c-indent-one-line-block, c-lineup-dont-change. - -*** Improvements (hopefully!) to the way CC Mode is loaded. You -should now be able to do a (require 'cc-mode) to get the entire -package loaded properly for customization in your .emacs file. A new -variable c-initialize-on-load controls this and is t by default. - -** Changes to hippie-expand. - -*** New customization variable `hippie-expand-dabbrev-skip-space'. If -non-nil, trailing spaces may be included in the abbreviation to search for, -which then gives the same behavior as the original `dabbrev-expand'. - -*** New customization variable `hippie-expand-dabbrev-as-symbol'. If -non-nil, characters of syntax '_' is considered part of the word when -expanding dynamically. - -*** New customization variable `hippie-expand-no-restriction'. If -non-nil, narrowed buffers are widened before they are searched. - -*** New customization variable `hippie-expand-only-buffers'. If -non-empty, buffers searched are restricted to the types specified in -this list. Useful for example when constructing new special-purpose -expansion functions with `make-hippie-expand-function'. - -*** Text properties of the expansion are no longer copied. - -** Changes in BibTeX mode. - -*** Any titleword matching a regexp in the new variable -bibtex-autokey-titleword-ignore (case sensitive) is ignored during -automatic key generation. This replaces variable -bibtex-autokey-titleword-first-ignore, which only checked for matches -against the first word in the title. - -*** Autokey generation now uses all words from the title, not just -capitalized words. To avoid conflicts with existing customizations, -bibtex-autokey-titleword-ignore is set up such that words starting with -lowerkey characters will still be ignored. Thus, if you want to use -lowercase words from the title, you will have to overwrite the -bibtex-autokey-titleword-ignore standard setting. - -*** Case conversion of names and title words for automatic key -generation is more flexible. Variable bibtex-autokey-preserve-case is -replaced by bibtex-autokey-titleword-case-convert and -bibtex-autokey-name-case-convert. - -** Changes in vcursor.el. - -*** Support for character terminals is available: there is a new keymap -and the vcursor will appear as an arrow between buffer text. A -variable `vcursor-interpret-input' allows input from the vcursor to be -entered exactly as if typed. Numerous functions, including -`vcursor-compare-windows', have been rewritten to improve consistency -in the selection of windows and corresponding keymaps. - -*** vcursor options can now be altered with M-x customize under the -Editing group once the package is loaded. - -*** Loading vcursor now does not define keys by default, as this is -generally a bad side effect. Use M-x customize to set -vcursor-key-bindings to t to restore the old behavior. - -*** vcursor-auto-disable can be `copy', which turns off copying from the -vcursor, but doesn't disable it, after any non-vcursor command. - -** Ispell changes. - -*** You can now spell check comments and strings in the current -buffer with M-x ispell-comments-and-strings. Comments and strings -are identified by syntax tables in effect. - -*** Generic region skipping implemented. -A single buffer can be broken into a number of regions where text will -and will not be checked. The definitions of the regions can be user -defined. New applications and improvements made available by this -include: - - o URLs are automatically skipped - o EMail message checking is vastly improved. - -*** Ispell can highlight the erroneous word even on non-window terminals. - -** Changes to RefTeX mode - -RefTeX has been updated in order to make it more usable with very -large projects (like a several volume math book). The parser has been -re-written from scratch. To get maximum speed from RefTeX, check the -section `Optimizations' in the manual. - -*** New recursive parser. - -The old version of RefTeX created a single large buffer containing the -entire multifile document in order to parse the document. The new -recursive parser scans the individual files. - -*** Parsing only part of a document. - -Reparsing of changed document parts can now be made faster by enabling -partial scans. To use this feature, read the documentation string of -the variable `reftex-enable-partial-scans' and set the variable to t. - - (setq reftex-enable-partial-scans t) - -*** Storing parsing information in a file. - -This can improve startup times considerably. To turn it on, use - - (setq reftex-save-parse-info t) - -*** Using multiple selection buffers - -If the creation of label selection buffers is too slow (this happens -for large documents), you can reuse these buffers by setting - - (setq reftex-use-multiple-selection-buffers t) - -*** References to external documents. - -The LaTeX package `xr' allows to cross-reference labels in external -documents. RefTeX can provide information about the external -documents as well. To use this feature, set up the \externaldocument -macros required by the `xr' package and rescan the document with -RefTeX. The external labels can then be accessed with the `x' key in -the selection buffer provided by `reftex-reference' (bound to `C-c )'). -The `x' key also works in the table of contents buffer. - -*** Many more labeled LaTeX environments are recognized by default. - -The built-in command list now covers all the standard LaTeX commands, -and all of the major packages included in the LaTeX distribution. - -Also, RefTeX now understands the \appendix macro and changes -the enumeration of sections in the *toc* buffer accordingly. - -*** Mouse support for selection and *toc* buffers - -The mouse can now be used to select items in the selection and *toc* -buffers. See also the new option `reftex-highlight-selection'. - -*** New keymaps for selection and table of contents modes. - -The selection processes for labels and citation keys, and the table of -contents buffer now have their own keymaps: `reftex-select-label-map', -`reftex-select-bib-map', `reftex-toc-map'. The selection processes -have a number of new keys predefined. In particular, TAB lets you -enter a label with completion. Check the on-the-fly help (press `?' -at the selection prompt) or read the Info documentation to find out -more. - -*** Support for the varioref package - -The `v' key in the label selection buffer toggles \ref versus \vref. - -*** New hooks - -Three new hooks can be used to redefine the way labels, references, -and citations are created. These hooks are -`reftex-format-label-function', `reftex-format-ref-function', -`reftex-format-cite-function'. - -*** Citations outside LaTeX - -The command `reftex-citation' may also be used outside LaTeX (e.g. in -a mail buffer). See the Info documentation for details. - -*** Short context is no longer fontified. - -The short context in the label menu no longer copies the -fontification from the text in the buffer. If you prefer it to be -fontified, use - - (setq reftex-refontify-context t) - -** file-cache-minibuffer-complete now accepts a prefix argument. -With a prefix argument, it does not try to do completion of -the file name within its directory; it only checks for other -directories that contain the same file name. - -Thus, given the file name Makefile, and assuming that a file -Makefile.in exists in the same directory, ordinary -file-cache-minibuffer-complete will try to complete Makefile to -Makefile.in and will therefore never look for other directories that -have Makefile. A prefix argument tells it not to look for longer -names such as Makefile.in, so that instead it will look for other -directories--just as if the name were already complete in its present -directory. - -** New modes and packages - -*** There is a new alternative major mode for Perl, Cperl mode. -It has many more features than Perl mode, and some people prefer -it, but some do not. - -*** There is a new major mode, M-x vhdl-mode, for editing files of VHDL -code. - -*** M-x which-function-mode enables a minor mode that displays the -current function name continuously in the mode line, as you move -around in a buffer. - -Which Function mode is effective in major modes which support Imenu. - -*** Gametree is a major mode for editing game analysis trees. The author -uses it for keeping notes about his postal Chess games, but it should -be helpful for other two-player games as well, as long as they have an -established system of notation similar to Chess. - -*** The new minor mode checkdoc-minor-mode provides Emacs Lisp -documentation string checking for style and spelling. The style -guidelines are found in the Emacs Lisp programming manual. - -*** The net-utils package makes some common networking features -available in Emacs. Some of these functions are wrappers around -system utilities (ping, nslookup, etc.); others are implementations of -simple protocols (finger, whois) in Emacs Lisp. There are also -functions to make simple connections to TCP/IP ports for debugging and -the like. - -*** highlight-changes-mode is a minor mode that uses colors to -identify recently changed parts of the buffer text. - -*** The new package `midnight' lets you specify things to be done -within Emacs at midnight--by default, kill buffers that you have not -used in a considerable time. To use this feature, customize -the user option `midnight-mode' to t. - -*** The file generic-x.el defines a number of simple major modes. - - apache-generic-mode: For Apache and NCSA httpd configuration files - samba-generic-mode: Samba configuration files - fvwm-generic-mode: For fvwm initialization files - x-resource-generic-mode: For X resource files - hosts-generic-mode: For hosts files (.rhosts, /etc/hosts, etc.) - mailagent-rules-generic-mode: For mailagent .rules files - javascript-generic-mode: For JavaScript files - vrml-generic-mode: For VRML files - java-manifest-generic-mode: For Java MANIFEST files - java-properties-generic-mode: For Java property files - mailrc-generic-mode: For .mailrc files - - Platform-specific modes: - - prototype-generic-mode: For Solaris/Sys V prototype files - pkginfo-generic-mode: For Solaris/Sys V pkginfo files - alias-generic-mode: For C shell alias files - inf-generic-mode: For MS-Windows INF files - ini-generic-mode: For MS-Windows INI files - reg-generic-mode: For MS-Windows Registry files - bat-generic-mode: For MS-Windows BAT scripts - rc-generic-mode: For MS-Windows Resource files - rul-generic-mode: For InstallShield scripts - -* Lisp changes in Emacs 20.3 since the Emacs Lisp Manual was published - -** If you want a Lisp file to be read in unibyte mode, -use -*-unibyte: t;-*- on its first line. -That will force Emacs to read that file in unibyte mode. -Otherwise, the file will be loaded and byte-compiled in multibyte mode. - -Thus, each lisp file is read in a consistent way regardless of whether -you started Emacs with --unibyte, so that a Lisp program gives -consistent results regardless of how Emacs was started. - -** The new function assoc-default is useful for searching an alist, -and using a default value if the key is not found there. You can -specify a comparison predicate, so this function is useful for -searching comparing a string against an alist of regular expressions. - -** The functions unibyte-char-to-multibyte and -multibyte-char-to-unibyte convert between unibyte and multibyte -character codes, in a way that is appropriate for the current language -environment. - -** The functions read-event, read-char and read-char-exclusive now -take two optional arguments. PROMPT, if non-nil, specifies a prompt -string. SUPPRESS-INPUT-METHOD, if non-nil, says to disable the -current input method for reading this one event. - -** Two new variables print-escape-nonascii and print-escape-multibyte -now control whether to output certain characters as -backslash-sequences. print-escape-nonascii applies to single-byte -non-ASCII characters; print-escape-multibyte applies to multibyte -characters. Both of these variables are used only when printing -in readable fashion (prin1 uses them, princ does not). - -* Lisp changes in Emacs 20.3 before the Emacs Lisp Manual was published - -** Compiled Emacs Lisp files made with the modified "MBSK" version -of Emacs 20.2 do not work in Emacs 20.3. - -** Buffer positions are now measured in characters, as they were -in Emacs 19 and before. This means that (forward-char 1) -always increases point by 1. - -The function chars-in-region now just subtracts its arguments. It is -considered obsolete. The function char-boundary-p has been deleted. - -See below for additional changes relating to multibyte characters. - -** defcustom, defface and defgroup now accept the keyword `:version'. -Use this to specify in which version of Emacs a certain variable's -default value changed. For example, - - (defcustom foo-max 34 "*Maximum number of foo's allowed." - :type 'integer - :group 'foo - :version "20.3") - - (defgroup foo-group nil "The foo group." - :version "20.3") - -If an entire new group is added or the variables in it have the -default values changed, then just add a `:version' to that group. It -is recommended that new packages added to the distribution contain a -`:version' in the top level group. - -This information is used to control the customize-changed-options command. - -** It is now an error to change the value of a symbol whose name -starts with a colon--if it is interned in the standard obarray. - -However, setting such a symbol to its proper value, which is that -symbol itself, is not an error. This is for the sake of programs that -support previous Emacs versions by explicitly setting these variables -to themselves. - -If you set the variable keyword-symbols-constant-flag to nil, -this error is suppressed, and you can set these symbols to any -values whatever. - -** There is a new debugger command, R. -It evaluates an expression like e, but saves the result -in the buffer *Debugger-record*. - -** Frame-local variables. - -You can now make a variable local to various frames. To do this, call -the function make-variable-frame-local; this enables frames to have -local bindings for that variable. - -These frame-local bindings are actually frame parameters: you create a -frame-local binding in a specific frame by calling -modify-frame-parameters and specifying the variable name as the -parameter name. - -Buffer-local bindings take precedence over frame-local bindings. -Thus, if the current buffer has a buffer-local binding, that binding is -active; otherwise, if the selected frame has a frame-local binding, -that binding is active; otherwise, the default binding is active. - -It would not be hard to implement window-local bindings, but it is not -clear that this would be very useful; windows tend to come and go in a -very transitory fashion, so that trying to produce any specific effect -through a window-local binding would not be very robust. - -** `sregexq' and `sregex' are two new functions for constructing -"symbolic regular expressions." These are Lisp expressions that, when -evaluated, yield conventional string-based regexps. The symbolic form -makes it easier to construct, read, and maintain complex patterns. -See the documentation in sregex.el. - -** parse-partial-sexp's return value has an additional element which -is used to pass information along if you pass it to another call to -parse-partial-sexp, starting its scan where the first call ended. -The contents of this field are not yet finalized. - -** eval-region now accepts a fourth optional argument READ-FUNCTION. -If it is non-nil, that function is used instead of `read'. - -** unload-feature by default removes the feature's functions from -known hooks to avoid trouble, but a package providing FEATURE can -define a hook FEATURE-unload-hook to be run by unload-feature instead. - -** read-from-minibuffer no longer returns the argument DEFAULT-VALUE -when the user enters empty input. It now returns the null string, as -it did in Emacs 19. The default value is made available in the -history via M-n, but it is not applied here as a default. - -The other, more specialized minibuffer-reading functions continue to -return the default value (not the null string) when the user enters -empty input. - -** The new variable read-buffer-function controls which routine to use -for selecting buffers. For example, if you set this variable to -`iswitchb-read-buffer', iswitchb will be used to read buffer names. -Other functions can also be used if they accept the same arguments as -`read-buffer' and return the selected buffer name as a string. - -** The new function read-passwd reads a password from the terminal, -echoing a period for each character typed. It takes three arguments: -a prompt string, a flag which says "read it twice to make sure", and a -default password to use if the user enters nothing. - -** The variable fill-nobreak-predicate gives major modes a way to -specify not to break a line at certain places. Its value is a -function which is called with no arguments, with point located at the -place where a break is being considered. If the function returns -non-nil, then the line won't be broken there. - -** window-end now takes an optional second argument, UPDATE. -If this is non-nil, then the function always returns an accurate -up-to-date value for the buffer position corresponding to the -end of the window, even if this requires computation. - -** other-buffer now takes an optional argument FRAME -which specifies which frame's buffer list to use. -If it is nil, that means use the selected frame's buffer list. - -** The new variable buffer-display-time, always local in every buffer, -holds the value of (current-time) as of the last time that a window -was directed to display this buffer. - -** It is now meaningful to compare two window-configuration objects -with `equal'. Two window-configuration objects are equal if they -describe equivalent arrangements of windows, in the same frame--in -other words, if they would give the same results if passed to -set-window-configuration. - -** compare-window-configurations is a new function that compares two -window configurations loosely. It ignores differences in saved buffer -positions and scrolling, and considers only the structure and sizes of -windows and the choice of buffers to display. - -** The variable minor-mode-overriding-map-alist allows major modes to -override the key bindings of a minor mode. The elements of this alist -look like the elements of minor-mode-map-alist: (VARIABLE . KEYMAP). - -If the VARIABLE in an element of minor-mode-overriding-map-alist has a -non-nil value, the paired KEYMAP is active, and totally overrides the -map (if any) specified for the same variable in minor-mode-map-alist. - -minor-mode-overriding-map-alist is automatically local in all buffers, -and it is meant to be set by major modes. - -** The function match-string-no-properties is like match-string -except that it discards all text properties from the result. - -** The function load-average now accepts an optional argument -USE-FLOATS. If it is non-nil, the load average values are returned as -floating point numbers, rather than as integers to be divided by 100. - -** The new variable temporary-file-directory specifies the directory -to use for creating temporary files. The default value is determined -in a reasonable way for your operating system; on GNU and Unix systems -it is based on the TMP and TMPDIR environment variables. - -** Menu changes - -*** easymenu.el now uses the new menu item format and supports the -keywords :visible and :filter. The existing keyword :keys is now -better supported. - -The variable `easy-menu-precalculate-equivalent-keybindings' controls -a new feature which calculates keyboard equivalents for the menu when -you define the menu. The default is t. If you rarely use menus, you -can set the variable to nil to disable this precalculation feature; -then the calculation is done only if you use the menu bar. - -*** A new format for menu items is supported. - -In a keymap, a key binding that has the format - (STRING . REAL-BINDING) or (STRING HELP-STRING . REAL-BINDING) -defines a menu item. Now a menu item definition may also be a list that -starts with the symbol `menu-item'. - -The format is: - (menu-item ITEM-NAME) or - (menu-item ITEM-NAME REAL-BINDING . ITEM-PROPERTY-LIST) -where ITEM-NAME is an expression which evaluates to the menu item -string, and ITEM-PROPERTY-LIST has the form of a property list. -The supported properties include - -:enable FORM Evaluate FORM to determine whether the - item is enabled. -:visible FORM Evaluate FORM to determine whether the - item should appear in the menu. -:filter FILTER-FN - FILTER-FN is a function of one argument, - which will be REAL-BINDING. - It should return a binding to use instead. -:keys DESCRIPTION - DESCRIPTION is a string that describes an equivalent keyboard - binding for REAL-BINDING. DESCRIPTION is expanded with - `substitute-command-keys' before it is used. -:key-sequence KEY-SEQUENCE - KEY-SEQUENCE is a key-sequence for an equivalent - keyboard binding. -:key-sequence nil - This means that the command normally has no - keyboard equivalent. -:help HELP HELP is the extra help string (not currently used). -:button (TYPE . SELECTED) - TYPE is :toggle or :radio. - SELECTED is a form, to be evaluated, and its - value says whether this button is currently selected. - -Buttons are at the moment only simulated by prefixes in the menu. -Eventually ordinary X-buttons may be supported. - -(menu-item ITEM-NAME) defines unselectable item. - -** New event types - -*** The new event type `mouse-wheel' is generated by a wheel on a -mouse (such as the MS Intellimouse). The event contains a delta that -corresponds to the amount and direction that the wheel is rotated, -which is typically used to implement a scroll or zoom. The format is: - - (mouse-wheel POSITION DELTA) - -where POSITION is a list describing the position of the event in the -same format as a mouse-click event, and DELTA is a signed number -indicating the number of increments by which the wheel was rotated. A -negative DELTA indicates that the wheel was rotated backwards, towards -the user, and a positive DELTA indicates that the wheel was rotated -forward, away from the user. - -As of now, this event type is generated only on MS Windows. - -*** The new event type `drag-n-drop' is generated when a group of -files is selected in an application outside of Emacs, and then dragged -and dropped onto an Emacs frame. The event contains a list of -filenames that were dragged and dropped, which are then typically -loaded into Emacs. The format is: - - (drag-n-drop POSITION FILES) - -where POSITION is a list describing the position of the event in the -same format as a mouse-click event, and FILES is the list of filenames -that were dragged and dropped. - -As of now, this event type is generated only on MS Windows. - -** Changes relating to multibyte characters. - -*** The variable enable-multibyte-characters is now read-only; -any attempt to set it directly signals an error. The only way -to change this value in an existing buffer is with set-buffer-multibyte. - -*** In a string constant, `\ ' now stands for "nothing at all". You -can use it to terminate a hex escape which is followed by a character -that could otherwise be read as part of the hex escape. - -*** String indices are now measured in characters, as they were -in Emacs 19 and before. - -The function chars-in-string has been deleted. -The function concat-chars has been renamed to `string'. - -*** The function set-buffer-multibyte sets the flag in the current -buffer that says whether the buffer uses multibyte representation or -unibyte representation. If the argument is nil, it selects unibyte -representation. Otherwise it selects multibyte representation. - -This function does not change the contents of the buffer, viewed -as a sequence of bytes. However, it does change the contents -viewed as characters; a sequence of two bytes which is treated as -one character when the buffer uses multibyte representation -will count as two characters using unibyte representation. - -This function sets enable-multibyte-characters to record which -representation is in use. It also adjusts various data in the buffer -(including its markers, overlays and text properties) so that they are -consistent with the new representation. - -*** string-make-multibyte takes a string and converts it to multibyte -representation. Most of the time, you don't need to care -about the representation, because Emacs converts when necessary; -however, it makes a difference when you compare strings. - -The conversion of non-ASCII characters works by adding the value of -nonascii-insert-offset to each character, or by translating them -using the table nonascii-translation-table. - -*** string-make-unibyte takes a string and converts it to unibyte -representation. Most of the time, you don't need to care about the -representation, but it makes a difference when you compare strings. - -The conversion from multibyte to unibyte representation -loses information; the only time Emacs performs it automatically -is when inserting a multibyte string into a unibyte buffer. - -*** string-as-multibyte takes a string, and returns another string -which contains the same bytes, but treats them as multibyte. - -*** string-as-unibyte takes a string, and returns another string -which contains the same bytes, but treats them as unibyte. - -*** The new function compare-strings lets you compare -portions of two strings. Unibyte strings are converted to multibyte, -so that a unibyte string can match a multibyte string. -You can specify whether to ignore case or not. - -*** assoc-ignore-case now uses compare-strings so that -it can treat unibyte and multibyte strings as equal. - -*** Regular expression operations and buffer string searches now -convert the search pattern to multibyte or unibyte to accord with the -buffer or string being searched. - -One consequence is that you cannot always use \200-\377 inside of -[...] to match all non-ASCII characters. This does still work when -searching or matching a unibyte buffer or string, but not when -searching or matching a multibyte string. Unfortunately, there is no -obvious choice of syntax to use within [...] for that job. But, what -you want is just to match all non-ASCII characters, the regular -expression [^\0-\177] works for it. - -*** Structure of coding system changed. - -All coding systems (including aliases and subsidiaries) are named -by symbols; the symbol's `coding-system' property is a vector -which defines the coding system. Aliases share the same vector -as the principal name, so that altering the contents of this -vector affects the principal name and its aliases. You can define -your own alias name of a coding system by the function -define-coding-system-alias. - -The coding system definition includes a property list of its own. Use -the new functions `coding-system-get' and `coding-system-put' to -access such coding system properties as post-read-conversion, -pre-write-conversion, character-translation-table-for-decode, -character-translation-table-for-encode, mime-charset, and -safe-charsets. For instance, (coding-system-get 'iso-latin-1 -'mime-charset) gives the corresponding MIME-charset parameter -`iso-8859-1'. - -Among the coding system properties listed above, safe-charsets is new. -The value of this property is a list of character sets which this -coding system can correctly encode and decode. For instance: -(coding-system-get 'iso-latin-1 'safe-charsets) => (ascii latin-iso8859-1) - -Here, "correctly encode" means that the encoded character sets can -also be handled safely by systems other than Emacs as far as they -are capable of that coding system. Though, Emacs itself can encode -the other character sets and read it back correctly. - -*** The new function select-safe-coding-system can be used to find a -proper coding system for encoding the specified region or string. -This function requires a user interaction. - -*** The new functions find-coding-systems-region and -find-coding-systems-string are helper functions used by -select-safe-coding-system. They return a list of all proper coding -systems to encode a text in some region or string. If you don't want -a user interaction, use one of these functions instead of -select-safe-coding-system. - -*** The explicit encoding and decoding functions, such as -decode-coding-region and encode-coding-string, now set -last-coding-system-used to reflect the actual way encoding or decoding -was done. - -*** The new function detect-coding-with-language-environment can be -used to detect a coding system of text according to priorities of -coding systems used by some specific language environment. - -*** The functions detect-coding-region and detect-coding-string always -return a list if the arg HIGHEST is nil. Thus, if only ASCII -characters are found, they now return a list of single element -`undecided' or its subsidiaries. - -*** The new functions coding-system-change-eol-conversion and -coding-system-change-text-conversion can be used to get a different -coding system than what specified only in how end-of-line or text is -converted. - -*** The new function set-selection-coding-system can be used to set a -coding system for communicating with other X clients. - -*** The function `map-char-table' now passes as argument only valid -character codes, plus generic characters that stand for entire -character sets or entire subrows of a character set. In other words, -each time `map-char-table' calls its FUNCTION argument, the key value -either will be a valid individual character code, or will stand for a -range of characters. - -*** The new function `char-valid-p' can be used for checking whether a -Lisp object is a valid character code or not. - -*** The new function `charset-after' returns a charset of a character -in the current buffer at position POS. - -*** Input methods are now implemented using the variable -input-method-function. If this is non-nil, its value should be a -function; then, whenever Emacs reads an input event that is a printing -character with no modifier bits, it calls that function, passing the -event as an argument. Often this function will read more input, first -binding input-method-function to nil. - -The return value should be a list of the events resulting from input -method processing. These events will be processed sequentially as -input, before resorting to unread-command-events. Events returned by -the input method function are not passed to the input method function, -not even if they are printing characters with no modifier bits. - -The input method function is not called when reading the second and -subsequent events of a key sequence. - -*** You can customize any language environment by using -set-language-environment-hook and exit-language-environment-hook. - -The hook `exit-language-environment-hook' should be used to undo -customizations that you made with set-language-environment-hook. For -instance, if you set up a special key binding for a specific language -environment by set-language-environment-hook, you should set up -exit-language-environment-hook to restore the normal key binding. - -* Changes in Emacs 20.1 - -** Emacs has a new facility for customization of its many user -options. It is called M-x customize. With this facility you can look -at the many user options in an organized way; they are grouped into a -tree structure. - -M-x customize also knows what sorts of values are legitimate for each -user option and ensures that you don't use invalid values. - -With M-x customize, you can set options either for the present Emacs -session or permanently. (Permanent settings are stored automatically -in your .emacs file.) - -** Scroll bars are now on the left side of the window. -You can change this with M-x customize-option scroll-bar-mode. - -** The mode line no longer includes the string `Emacs'. -This makes more space in the mode line for other information. - -** When you select a region with the mouse, it is highlighted -immediately afterward. At that time, if you type the DELETE key, it -kills the region. - -The BACKSPACE key, and the ASCII character DEL, do not do this; they -delete the character before point, as usual. - -** In an incremental search the whole current match is highlighted -on terminals which support this. (You can disable this feature -by setting search-highlight to nil.) - -** In the minibuffer, in some cases, you can now use M-n to -insert the default value into the minibuffer as text. In effect, -the default value (if the minibuffer routines know it) is tacked -onto the history "in the future". (The more normal use of the -history list is to use M-p to insert minibuffer input used in the -past.) - -** In Text mode, now only blank lines separate paragraphs. -This makes it possible to get the full benefit of Adaptive Fill mode -in Text mode, and other modes derived from it (such as Mail mode). -TAB in Text mode now runs the command indent-relative; this -makes a practical difference only when you use indented paragraphs. - -As a result, the old Indented Text mode is now identical to Text mode, -and is an alias for it. - -If you want spaces at the beginning of a line to start a paragraph, -use the new mode, Paragraph Indent Text mode. - -** Scrolling changes - -*** Scroll commands to scroll a whole screen now preserve the screen -position of the cursor, if scroll-preserve-screen-position is non-nil. - -In this mode, if you scroll several screens back and forth, finishing -on the same screen where you started, the cursor goes back to the line -where it started. - -*** If you set scroll-conservatively to a small number, then when you -move point a short distance off the screen, Emacs will scroll the -screen just far enough to bring point back on screen, provided that -does not exceed `scroll-conservatively' lines. - -*** The new variable scroll-margin says how close point can come to the -top or bottom of a window. It is a number of screen lines; if point -comes within that many lines of the top or bottom of the window, Emacs -recenters the window. - -** International character set support (MULE) - -Emacs now supports a wide variety of international character sets, -including European variants of the Latin alphabet, as well as Chinese, -Devanagari (Hindi and Marathi), Ethiopian, Greek, IPA, Japanese, -Korean, Lao, Russian, Thai, Tibetan, and Vietnamese scripts. These -features have been merged from the modified version of Emacs known as -MULE (for "MULti-lingual Enhancement to GNU Emacs") - -Users of these scripts have established many more-or-less standard -coding systems for storing files. Emacs uses a single multibyte -character encoding within Emacs buffers; it can translate from a wide -variety of coding systems when reading a file and can translate back -into any of these coding systems when saving a file. - -Keyboards, even in the countries where these character sets are used, -generally don't have keys for all the characters in them. So Emacs -supports various "input methods", typically one for each script or -language, to make it possible to type them. - -The Emacs internal multibyte encoding represents a non-ASCII -character as a sequence of bytes in the range 0200 through 0377. - -The new prefix key C-x RET is used for commands that pertain -to multibyte characters, coding systems, and input methods. - -You can disable multibyte character support as follows: - - (setq-default enable-multibyte-characters nil) - -Calling the function standard-display-european turns off multibyte -characters, unless you specify a non-nil value for the second -argument, AUTO. This provides compatibility for people who are -already using standard-display-european to continue using unibyte -characters for their work until they want to change. - -*** Input methods - -An input method is a kind of character conversion which is designed -specifically for interactive input. In Emacs, typically each language -has its own input method (though sometimes several languages which use -the same characters can share one input method). Some languages -support several input methods. - -The simplest kind of input method works by mapping ASCII letters into -another alphabet. This is how the Greek and Russian input methods -work. - -A more powerful technique is composition: converting sequences of -characters into one letter. Many European input methods use -composition to produce a single non-ASCII letter from a sequence which -consists of a letter followed by diacritics. For example, a' is one -sequence of two characters that might be converted into a single -letter. - -The input methods for syllabic scripts typically use mapping followed -by conversion. The input methods for Thai and Korean work this way. -First, letters are mapped into symbols for particular sounds or tone -marks; then, sequences of these which make up a whole syllable are -mapped into one syllable sign--most often a "composite character". - -None of these methods works very well for Chinese and Japanese, so -they are handled specially. First you input a whole word using -phonetic spelling; then, after the word is in the buffer, Emacs -converts it into one or more characters using a large dictionary. - -Since there is more than one way to represent a phonetically spelled -word using Chinese characters, Emacs can only guess which one to use; -typically these input methods give you a way to say "guess again" if -the first guess is wrong. - -*** The command C-x RET m (toggle-enable-multibyte-characters) -turns multibyte character support on or off for the current buffer. - -If multibyte character support is turned off in a buffer, then each -byte is a single character, even codes 0200 through 0377--exactly as -they did in Emacs 19.34. This includes the features for support for -the European characters, ISO Latin-1 and ISO Latin-2. - -However, there is no need to turn off multibyte character support to -use ISO Latin-1 or ISO Latin-2; the Emacs multibyte character set -includes all the characters in these character sets, and Emacs can -translate automatically to and from either one. - -*** Visiting a file in unibyte mode. - -Turning off multibyte character support in the buffer after visiting a -file with multibyte code conversion will display the multibyte -sequences already in the buffer, byte by byte. This is probably not -what you want. - -If you want to edit a file of unibyte characters (Latin-1, for -example), you can do it by specifying `no-conversion' as the coding -system when reading the file. This coding system also turns off -multibyte characters in that buffer. - -If you turn off multibyte character support entirely, this turns off -character conversion as well. - -*** Displaying international characters on X Windows. - -A font for X typically displays just one alphabet or script. -Therefore, displaying the entire range of characters Emacs supports -requires using many fonts. - -Therefore, Emacs now supports "fontsets". Each fontset is a -collection of fonts, each assigned to a range of character codes. - -A fontset has a name, like a font. Individual fonts are defined by -the X server; fontsets are defined within Emacs itself. But once you -have defined a fontset, you can use it in a face or a frame just as -you would use a font. - -If a fontset specifies no font for a certain character, or if it -specifies a font that does not exist on your system, then it cannot -display that character. It will display an empty box instead. - -The fontset height and width are determined by the ASCII characters -(that is, by the font in the fontset which is used for ASCII -characters). - -*** Defining fontsets. - -Emacs does not use any fontset by default. Its default font is still -chosen as in previous versions. You can tell Emacs to use a fontset -with the `-fn' option or the `Font' X resource. - -Emacs creates a standard fontset automatically according to the value -of standard-fontset-spec. This fontset's short name is -`fontset-standard'. Bold, italic, and bold-italic variants of the -standard fontset are created automatically. - -If you specify a default ASCII font with the `Font' resource or `-fn' -argument, a fontset is generated from it. This works by replacing the -FOUNDARY, FAMILY, ADD_STYLE, and AVERAGE_WIDTH fields of the font name -with `*' then using this to specify a fontset. This fontset's short -name is `fontset-startup'. - -Emacs checks resources of the form Fontset-N where N is 0, 1, 2... -The resource value should have this form: - FONTSET-NAME, [CHARSET-NAME:FONT-NAME]... -FONTSET-NAME should have the form of a standard X font name, except: - * most fields should be just the wild card "*". - * the CHARSET_REGISTRY field should be "fontset" - * the CHARSET_ENCODING field can be any nickname of the fontset. -The construct CHARSET-NAME:FONT-NAME can be repeated any number -of times; each time specifies the font for one character set. -CHARSET-NAME should be the name of a character set, and FONT-NAME -should specify an actual font to use for that character set. - -Each of these fontsets has an alias which is made from the -last two font name fields, CHARSET_REGISTRY and CHARSET_ENCODING. -You can refer to the fontset by that alias or by its full name. - -For any character sets that you don't mention, Emacs tries to choose a -font by substituting into FONTSET-NAME. For instance, with the -following resource, - Emacs*Fontset-0: -*-fixed-medium-r-normal-*-24-*-*-*-*-*-fontset-24 -the font for ASCII is generated as below: - -*-fixed-medium-r-normal-*-24-*-ISO8859-1 -Here is the substitution rule: - Change CHARSET_REGISTRY and CHARSET_ENCODING to that of the charset - defined in the variable x-charset-registries. For instance, ASCII has - the entry (ascii . "ISO8859-1") in this variable. Then, reduce - sequences of wild cards -*-...-*- with a single wildcard -*-. - (This is to prevent use of auto-scaled fonts.) - -The function which processes the fontset resource value to create the -fontset is called create-fontset-from-fontset-spec. You can also call -that function explicitly to create a fontset. - -With the X resource Emacs.Font, you can specify a fontset name just -like an actual font name. But be careful not to specify a fontset -name in a wildcard resource like Emacs*Font--that tries to specify the -fontset for other purposes including menus, and they cannot handle -fontsets. - -*** The command M-x set-language-environment sets certain global Emacs -defaults for a particular choice of language. - -Selecting a language environment typically specifies a default input -method and which coding systems to recognize automatically when -visiting files. However, it does not try to reread files you have -already visited; the text in those buffers is not affected. The -language environment may also specify a default choice of coding -system for new files that you create. - -It makes no difference which buffer is current when you use -set-language-environment, because these defaults apply globally to the -whole Emacs session. - -For example, M-x set-language-environment RET Latin-1 RET -chooses the Latin-1 character set. In the .emacs file, you can do this -with (set-language-environment "Latin-1"). - -*** The command C-x RET f (set-buffer-file-coding-system) -specifies the file coding system for the current buffer. This -specifies what sort of character code translation to do when saving -the file. As an argument, you must specify the name of one of the -coding systems that Emacs supports. - -*** The command C-x RET c (universal-coding-system-argument) -lets you specify a coding system when you read or write a file. -This command uses the minibuffer to read a coding system name. -After you exit the minibuffer, the specified coding system -is used for *the immediately following command*. - -So if the immediately following command is a command to read or -write a file, it uses the specified coding system for that file. - -If the immediately following command does not use the coding system, -then C-x RET c ultimately has no effect. - -For example, C-x RET c iso-8859-1 RET C-x C-f temp RET -visits the file `temp' treating it as ISO Latin-1. - -*** You can specify the coding system for a file using the -*- -construct. Include `coding: CODINGSYSTEM;' inside the -*-...-*- -to specify use of coding system CODINGSYSTEM. You can also -specify the coding system in a local variable list at the end -of the file. - -*** The command C-x RET t (set-terminal-coding-system) specifies -the coding system for terminal output. If you specify a character -code for terminal output, all characters output to the terminal are -translated into that character code. - -This feature is useful for certain character-only terminals built in -various countries to support the languages of those countries. - -By default, output to the terminal is not translated at all. - -*** The command C-x RET k (set-keyboard-coding-system) specifies -the coding system for keyboard input. - -Character code translation of keyboard input is useful for terminals -with keys that send non-ASCII graphic characters--for example, -some terminals designed for ISO Latin-1 or subsets of it. - -By default, keyboard input is not translated at all. - -Character code translation of keyboard input is similar to using an -input method, in that both define sequences of keyboard input that -translate into single characters. However, input methods are designed -to be convenient for interactive use, while the code translations are -designed to work with terminals. - -*** The command C-x RET p (set-buffer-process-coding-system) -specifies the coding system for input and output to a subprocess. -This command applies to the current buffer; normally, each subprocess -has its own buffer, and thus you can use this command to specify -translation to and from a particular subprocess by giving the command -in the corresponding buffer. - -By default, process input and output are not translated at all. - -*** The variable file-name-coding-system specifies the coding system -to use for encoding file names before operating on them. -It is also used for decoding file names obtained from the system. - -*** The command C-\ (toggle-input-method) activates or deactivates -an input method. If no input method has been selected before, the -command prompts for you to specify the language and input method you -want to use. - -C-u C-\ (select-input-method) lets you switch to a different input -method. C-h C-\ (or C-h I) describes the current input method. - -*** Some input methods remap the keyboard to emulate various keyboard -layouts commonly used for particular scripts. How to do this -remapping properly depends on your actual keyboard layout. To specify -which layout your keyboard has, use M-x quail-set-keyboard-layout. - -*** The command C-h C (describe-coding-system) displays -the coding systems currently selected for various purposes, plus -related information. - -*** The command C-h h (view-hello-file) displays a file called -HELLO, which has examples of text in many languages, using various -scripts. - -*** The command C-h L (describe-language-support) displays -information about the support for a particular language. -You specify the language as an argument. - -*** The mode line now contains a letter or character that identifies -the coding system used in the visited file. It normally follows the -first dash. - -A dash indicates the default state of affairs: no code conversion -(except CRLF => newline if appropriate). `=' means no conversion -whatsoever. The ISO 8859 coding systems are represented by digits -1 through 9. Other coding systems are represented by letters: - - A alternativnyj (Russian) - B big5 (Chinese) - C cn-gb-2312 (Chinese) - C iso-2022-cn (Chinese) - D in-is13194-devanagari (Indian languages) - E euc-japan (Japanese) - I iso-2022-cjk or iso-2022-ss2 (Chinese, Japanese, Korean) - J junet (iso-2022-7) or old-jis (iso-2022-jp-1978-irv) (Japanese) - K euc-korea (Korean) - R koi8 (Russian) - Q tibetan - S shift_jis (Japanese) - T lao - T tis620 (Thai) - V viscii or vscii (Vietnamese) - i iso-2022-lock (Chinese, Japanese, Korean) - k iso-2022-kr (Korean) - v viqr (Vietnamese) - z hz (Chinese) - -When you are using a character-only terminal (not a window system), -two additional characters appear in between the dash and the file -coding system. These two characters describe the coding system for -keyboard input, and the coding system for terminal output. - -*** The new variable rmail-file-coding-system specifies the code -conversion to use for RMAIL files. The default value is nil. - -When you read mail with Rmail, each message is decoded automatically -into Emacs' internal format. This has nothing to do with -rmail-file-coding-system. That variable controls reading and writing -Rmail files themselves. - -*** The new variable sendmail-coding-system specifies the code -conversion for outgoing mail. The default value is nil. - -Actually, there are three different ways of specifying the coding system -for sending mail: - -- If you use C-x RET f in the mail buffer, that takes priority. -- Otherwise, if you set sendmail-coding-system non-nil, that specifies it. -- Otherwise, the default coding system for new files is used, - if that is non-nil. That comes from your language environment. -- Otherwise, Latin-1 is used. - -*** The command C-h t (help-with-tutorial) accepts a prefix argument -to specify the language for the tutorial file. Currently, English, -Japanese, Korean and Thai are supported. We welcome additional -translations. - -** An easy new way to visit a file with no code or format conversion -of any kind: Use M-x find-file-literally. There is also a command -insert-file-literally which inserts a file into the current buffer -without any conversion. - -** C-q's handling of octal character codes is changed. -You can now specify any number of octal digits. -RET terminates the digits and is discarded; -any other non-digit terminates the digits and is then used as input. - -** There are new commands for looking up Info documentation for -functions, variables and file names used in your programs. - -Type M-x info-lookup-symbol to look up a symbol in the buffer at point. -Type M-x info-lookup-file to look up a file in the buffer at point. - -Precisely which Info files are used to look it up depends on the major -mode. For example, in C mode, the GNU libc manual is used. - -** M-TAB in most programming language modes now runs the command -complete-symbol. This command performs completion on the symbol name -in the buffer before point. - -With a numeric argument, it performs completion based on the set of -symbols documented in the Info files for the programming language that -you are using. - -With no argument, it does completion based on the current tags tables, -just like the old binding of M-TAB (complete-tag). - -** File locking works with NFS now. - -The lock file for FILENAME is now a symbolic link named .#FILENAME, -in the same directory as FILENAME. - -This means that collision detection between two different machines now -works reasonably well; it also means that no file server or directory -can become a bottleneck. - -The new method does have drawbacks. It means that collision detection -does not operate when you edit a file in a directory where you cannot -create new files. Collision detection also doesn't operate when the -file server does not support symbolic links. But these conditions are -rare, and the ability to have collision detection while using NFS is -so useful that the change is worth while. - -When Emacs or a system crashes, this may leave behind lock files which -are stale. So you may occasionally get warnings about spurious -collisions. When you determine that the collision is spurious, just -tell Emacs to go ahead anyway. - -** If you wish to use Show Paren mode to display matching parentheses, -it is no longer sufficient to load paren.el. Instead you must call -show-paren-mode. - -** If you wish to use Delete Selection mode to replace a highlighted -selection when you insert new text, it is no longer sufficient to load -delsel.el. Instead you must call the function delete-selection-mode. - -** If you wish to use Partial Completion mode to complete partial words -within symbols or filenames, it is no longer sufficient to load -complete.el. Instead you must call the function partial-completion-mode. - -** If you wish to use uniquify to rename buffers for you, -it is no longer sufficient to load uniquify.el. You must also -set uniquify-buffer-name-style to one of the non-nil legitimate values. - -** Changes in View mode. - -*** Several new commands are available in View mode. -Do H in view mode for a list of commands. - -*** There are two new commands for entering View mode: -view-file-other-frame and view-buffer-other-frame. - -*** Exiting View mode does a better job of restoring windows to their -previous state. - -*** New customization variable view-scroll-auto-exit. If non-nil, -scrolling past end of buffer makes view mode exit. - -*** New customization variable view-exits-all-viewing-windows. If -non-nil, view-mode will at exit restore all windows viewing buffer, -not just the selected window. - -*** New customization variable view-read-only. If non-nil, visiting a -read-only file automatically enters View mode, and toggle-read-only -turns View mode on or off. - -*** New customization variable view-remove-frame-by-deleting controls -how to remove a not needed frame at view mode exit. If non-nil, -delete the frame, if nil make an icon of it. - -** C-x v l, the command to print a file's version control log, -now positions point at the entry for the file's current branch version. - -** C-x v =, the command to compare a file with the last checked-in version, -has a new feature. If the file is currently not locked, so that it is -presumably identical to the last checked-in version, the command now asks -which version to compare with. - -** When using hideshow.el, incremental search can temporarily show hidden -blocks if a match is inside the block. - -The block is hidden again if the search is continued and the next match -is outside the block. By customizing the variable -isearch-hide-immediately you can choose to hide all the temporarily -shown blocks only when exiting from incremental search. - -By customizing the variable hs-isearch-open you can choose what kind -of blocks to temporarily show during isearch: comment blocks, code -blocks, all of them or none. - -** The new command C-x 4 0 (kill-buffer-and-window) kills the -current buffer and deletes the selected window. It asks for -confirmation first. - -** C-x C-w, which saves the buffer into a specified file name, -now changes the major mode according to that file name. -However, the mode will not be changed if -(1) a local variables list or the `-*-' line specifies a major mode, or -(2) the current major mode is a "special" mode, - not suitable for ordinary files, or -(3) the new file name does not particularly specify any mode. - -This applies to M-x set-visited-file-name as well. - -However, if you set change-major-mode-with-file-name to nil, then -these commands do not change the major mode. - -** M-x occur changes. - -*** If the argument to M-x occur contains upper case letters, -it performs a case-sensitive search. - -*** In the *Occur* buffer made by M-x occur, -if you type g or M-x revert-buffer, this repeats the search -using the same regular expression and the same buffer as before. - -** In Transient Mark mode, the region in any one buffer is highlighted -in just one window at a time. At first, it is highlighted in the -window where you set the mark. The buffer's highlighting remains in -that window unless you select to another window which shows the same -buffer--then the highlighting moves to that window. - -** The feature to suggest key bindings when you use M-x now operates -after the command finishes. The message suggesting key bindings -appears temporarily in the echo area. The previous echo area contents -come back after a few seconds, in case they contain useful information. - -** Each frame now independently records the order for recently -selected buffers, so that the default for C-x b is now based on the -buffers recently selected in the selected frame. - -** Outline mode changes. - -*** Outline mode now uses overlays (this is the former noutline.el). - -*** Incremental searches skip over invisible text in Outline mode. - -** When a minibuffer window is active but not the selected window, if -you try to use the minibuffer, you used to get a nested minibuffer. -Now, this not only gives an error, it also cancels the minibuffer that -was already active. - -The motive for this change is so that beginning users do not -unknowingly move away from minibuffers, leaving them active, and then -get confused by it. - -If you want to be able to have recursive minibuffers, you must -set enable-recursive-minibuffers to non-nil. - -** Changes in dynamic abbrevs. - -*** Expanding dynamic abbrevs with M-/ is now smarter about case -conversion. If the expansion has mixed case not counting the first -character, and the abbreviation matches the beginning of the expansion -including case, then the expansion is copied verbatim. - -The expansion is also copied verbatim if the abbreviation itself has -mixed case. And using SPC M-/ to copy an additional word always -copies it verbatim except when the previous copied word is all caps. - -*** The values of `dabbrev-case-replace' and `dabbrev-case-fold-search' -are no longer Lisp expressions. They have simply three possible -values. - -`dabbrev-case-replace' has these three values: nil (don't preserve -case), t (do), or `case-replace' (do like M-x query-replace). -`dabbrev-case-fold-search' has these three values: nil (don't ignore -case), t (do), or `case-fold-search' (do like search). - -** Minibuffer history lists are truncated automatically now to a -certain length. The variable history-length specifies how long they -can be. The default value is 30. - -** Changes in Mail mode. - -*** The key C-x m no longer runs the `mail' command directly. -Instead, it runs the command `compose-mail', which invokes the mail -composition mechanism you have selected with the variable -`mail-user-agent'. The default choice of user agent is -`sendmail-user-agent', which gives behavior compatible with the old -behavior. - -C-x 4 m now runs compose-mail-other-window, and C-x 5 m runs -compose-mail-other-frame. - -*** While composing a reply to a mail message, from Rmail, you can use -the command C-c C-r to cite just the region from the message you are -replying to. This copies the text which is the selected region in the -buffer that shows the original message. - -*** The command C-c C-i inserts a file at the end of the message, -with separator lines around the contents. - -*** The command M-x expand-mail-aliases expands all mail aliases -in suitable mail headers. Emacs automatically extracts mail alias -definitions from your mail alias file (e.g., ~/.mailrc). You do not -need to expand mail aliases yourself before sending mail. - -*** New features in the mail-complete command. - -**** The mail-complete command now inserts the user's full name, -for local users or if that is known. The variable mail-complete-style -controls the style to use, and whether to do this at all. -Its values are like those of mail-from-style. - -**** The variable mail-passwd-command lets you specify a shell command -to run to fetch a set of password-entries that add to the ones in -/etc/passwd. - -**** The variable mail-passwd-file now specifies a list of files to read -to get the list of user ids. By default, one file is used: -/etc/passwd. - -** You can "quote" a file name to inhibit special significance of -special syntax, by adding `/:' to the beginning. Thus, if you have a -directory named `/foo:', you can prevent it from being treated as a -reference to a remote host named `foo' by writing it as `/:/foo:'. - -Emacs uses this new construct automatically when necessary, such as -when you start it with a working directory whose name might otherwise -be taken to be magic. - -** There is a new command M-x grep-find which uses find to select -files to search through, and grep to scan them. The output is -available in a Compile mode buffer, as with M-x grep. - -M-x grep now uses the -e option if the grep program supports that. -(-e prevents problems if the search pattern starts with a dash.) - -** In Dired, the & command now flags for deletion the files whose names -suggest they are probably not needed in the long run. - -In Dired, * is now a prefix key for mark-related commands. - -new key dired.el binding old key -------- ---------------- ------- - * c dired-change-marks c - * m dired-mark m - * * dired-mark-executables * (binding deleted) - * / dired-mark-directories / (binding deleted) - * @ dired-mark-symlinks @ (binding deleted) - * u dired-unmark u - * DEL dired-unmark-backward DEL - * ? dired-unmark-all-files C-M-? - * ! dired-unmark-all-marks - * % dired-mark-files-regexp % m - * C-n dired-next-marked-file M-} - * C-p dired-prev-marked-file M-{ - -** Rmail changes. - -*** When Rmail cannot convert your incoming mail into Babyl format, it -saves the new mail in the file RMAILOSE.n, where n is an integer -chosen to make a unique name. This way, Rmail will not keep crashing -each time you run it. - -*** In Rmail, the variable rmail-summary-line-count-flag now controls -whether to include the line count in the summary. Non-nil means yes. - -*** In Rmail summary buffers, d and C-d (the commands to delete -messages) now take repeat counts as arguments. A negative argument -means to move in the opposite direction. - -*** In Rmail, the t command now takes an optional argument which lets -you specify whether to show the message headers in full or pruned. - -*** In Rmail, the new command w (rmail-output-body-to-file) writes -just the body of the current message into a file, without the headers. -It takes the file name from the message subject, by default, but you -can edit that file name in the minibuffer before it is actually used -for output. - -** Gnus changes. - -*** nntp.el has been totally rewritten in an asynchronous fashion. - -*** Article prefetching functionality has been moved up into -Gnus. - -*** Scoring can now be performed with logical operators like -`and', `or', `not', and parent redirection. - -*** Article washing status can be displayed in the -article mode line. - -*** gnus.el has been split into many smaller files. - -*** Suppression of duplicate articles based on Message-ID. - -(setq gnus-suppress-duplicates t) - -*** New variables for specifying what score and adapt files -are to be considered home score and adapt files. See -`gnus-home-score-file' and `gnus-home-adapt-files'. - -*** Groups can inherit group parameters from parent topics. - -*** Article editing has been revamped and is now usable. - -*** Signatures can be recognized in more intelligent fashions. -See `gnus-signature-separator' and `gnus-signature-limit'. - -*** Summary pick mode has been made to look more nn-like. -Line numbers are displayed and the `.' command can be -used to pick articles. - -*** Commands for moving the .newsrc.eld from one server to -another have been added. - - `M-x gnus-change-server' - -*** A way to specify that "uninteresting" fields be suppressed when -generating lines in buffers. - -*** Several commands in the group buffer can be undone with -`C-M-_'. - -*** Scoring can be done on words using the new score type `w'. - -*** Adaptive scoring can be done on a Subject word-by-word basis: - - (setq gnus-use-adaptive-scoring '(word)) - -*** Scores can be decayed. - - (setq gnus-decay-scores t) - -*** Scoring can be performed using a regexp on the Date header. The -Date is normalized to compact ISO 8601 format first. - -*** A new command has been added to remove all data on articles from -the native server. - - `M-x gnus-group-clear-data-on-native-groups' - -*** A new command for reading collections of documents -(nndoc with nnvirtual on top) has been added -- `C-M-d'. - -*** Process mark sets can be pushed and popped. - -*** A new mail-to-news backend makes it possible to post -even when the NNTP server doesn't allow posting. - -*** A new backend for reading searches from Web search engines -(DejaNews, Alta Vista, InReference) has been added. - - Use the `G w' command in the group buffer to create such - a group. - -*** Groups inside topics can now be sorted using the standard -sorting functions, and each topic can be sorted independently. - - See the commands under the `T S' submap. - -*** Subsets of the groups can be sorted independently. - - See the commands under the `G P' submap. - -*** Cached articles can be pulled into the groups. - - Use the `Y c' command. - -*** Score files are now applied in a more reliable order. - -*** Reports on where mail messages end up can be generated. - - `M-x nnmail-split-history' - -*** More hooks and functions have been added to remove junk -from incoming mail before saving the mail. - - See `nnmail-prepare-incoming-header-hook'. - -*** The nnml mail backend now understands compressed article files. - -*** To enable Gnus to read/post multi-lingual articles, you must execute -the following code, for instance, in your .emacs. - - (add-hook 'gnus-startup-hook 'gnus-mule-initialize) - -Then, when you start Gnus, it will decode non-ASCII text automatically -and show appropriate characters. (Note: if you are using gnus-mime -from the SEMI package, formerly known as TM, you should NOT add this -hook to gnus-startup-hook; gnus-mime has its own method of handling -this issue.) - -Since it is impossible to distinguish all coding systems -automatically, you may need to specify a choice of coding system for a -particular news group. This can be done by: - - (gnus-mule-add-group NEWSGROUP 'CODING-SYSTEM) - -Here NEWSGROUP should be a string which names a newsgroup or a tree -of newsgroups. If NEWSGROUP is "XXX.YYY", all news groups under -"XXX.YYY" (including "XXX.YYY.ZZZ") will use the specified coding -system. CODING-SYSTEM specifies which coding system to use (for both -for reading and posting). - -CODING-SYSTEM can also be a cons cell of the form - (READ-CODING-SYSTEM . POST-CODING-SYSTEM) -Then READ-CODING-SYSTEM is used when you read messages from the -newsgroups, while POST-CODING-SYSTEM is used when you post messages -there. - -Emacs knows the right coding systems for certain newsgroups by -default. Here are some of these default settings: - - (gnus-mule-add-group "fj" 'iso-2022-7) - (gnus-mule-add-group "alt.chinese.text" 'hz-gb-2312) - (gnus-mule-add-group "alt.hk" 'hz-gb-2312) - (gnus-mule-add-group "alt.chinese.text.big5" 'cn-big5) - (gnus-mule-add-group "soc.culture.vietnamese" '(nil . viqr)) - -When you reply by mail to an article, these settings are ignored; -the mail is encoded according to sendmail-coding-system, as usual. - -** CC mode changes. - -*** If you edit primarily one style of C (or C++, Objective-C, Java) -code, you may want to make the CC Mode style variables have global -values so that you can set them directly in your .emacs file. To do -this, set c-style-variables-are-local-p to nil in your .emacs file. -Note that this only takes effect if you do it *before* cc-mode.el is -loaded. - -If you typically edit more than one style of C (or C++, Objective-C, -Java) code in a single Emacs session, you may want to make the CC Mode -style variables have buffer local values. By default, all buffers -share the same style variable settings; to make them buffer local, set -c-style-variables-are-local-p to t in your .emacs file. Note that you -must do this *before* CC Mode is loaded. - -*** The new variable c-indentation-style holds the C style name -of the current buffer. - -*** The variable c-block-comments-indent-p has been deleted, because -it is no longer necessary. C mode now handles all the supported styles -of block comments, with no need to say which one you will use. - -*** There is a new indentation style "python", which specifies the C -style that the Python developers like. - -*** There is a new c-cleanup-list option: brace-elseif-brace. -This says to put ...} else if (...) {... on one line, -just as brace-else-brace says to put ...} else {... on one line. - -** VC Changes [new] - -*** In vc-retrieve-snapshot (C-x v r), if you don't specify a snapshot -name, it retrieves the *latest* versions of all files in the current -directory and its subdirectories (aside from files already locked). - -This feature is useful if your RCS directory is a link to a common -master directory, and you want to pick up changes made by other -developers. - -You can do the same thing for an individual file by typing C-u C-x C-q -RET in a buffer visiting that file. - -*** VC can now handle files under CVS that are being "watched" by -other developers. Such files are made read-only by CVS. To get a -writable copy, type C-x C-q in a buffer visiting such a file. VC then -calls "cvs edit", which notifies the other developers of it. - -*** vc-version-diff (C-u C-x v =) now suggests reasonable defaults for -version numbers, based on the current state of the file. - -** Calendar changes. - -*** A new function, list-holidays, allows you list holidays or -subclasses of holidays for ranges of years. Related menu items allow -you do this for the year of the selected date, or the -following/previous years. - -*** There is now support for the Baha'i calendar system. Use `pb' in -the *Calendar* buffer to display the current Baha'i date. The Baha'i -calendar, or "Badi calendar" is a system of 19 months with 19 days -each, and 4 intercalary days (5 during a Gregorian leap year). The -calendar begins May 23, 1844, with each of the months named after a -supposed attribute of God. - -** ps-print changes - -There are some new user variables and subgroups for customizing the page -layout. - -*** Headers & Footers (subgroup) - -Some printer systems print a header page and force the first page to -be printed on the back of the header page when using duplex. If your -printer system has this behavior, set variable -`ps-banner-page-when-duplexing' to t. - -If variable `ps-banner-page-when-duplexing' is non-nil, it prints a -blank page as the very first printed page. So, it behaves as if the -very first character of buffer (or region) were a form feed ^L (\014). - -The variable `ps-spool-config' specifies who is responsible for -setting duplex mode and page size. Valid values are: - - lpr-switches duplex and page size are configured by `ps-lpr-switches'. - Don't forget to set `ps-lpr-switches' to select duplex - printing for your printer. - - setpagedevice duplex and page size are configured by ps-print using the - setpagedevice PostScript operator. - - nil duplex and page size are configured by ps-print *not* using - the setpagedevice PostScript operator. - -The variable `ps-spool-tumble' specifies how the page images on -opposite sides of a sheet are oriented with respect to each other. If -`ps-spool-tumble' is nil, ps-print produces output suitable for -bindings on the left or right. If `ps-spool-tumble' is non-nil, -ps-print produces output suitable for bindings at the top or bottom. -This variable takes effect only if `ps-spool-duplex' is non-nil. -The default value is nil. - -The variable `ps-header-frame-alist' specifies a header frame -properties alist. Valid frame properties are: - - fore-color Specify the foreground frame color. - Value should be a float number between 0.0 (black - color) and 1.0 (white color), or a string which is a - color name, or a list of 3 float numbers which - correspond to the Red Green Blue color scale, each - float number between 0.0 (dark color) and 1.0 (bright - color). The default is 0 ("black"). - - back-color Specify the background frame color (similar to fore-color). - The default is 0.9 ("gray90"). - - shadow-color Specify the shadow color (similar to fore-color). - The default is 0 ("black"). - - border-color Specify the border color (similar to fore-color). - The default is 0 ("black"). - - border-width Specify the border width. - The default is 0.4. - -Any other property is ignored. - -Don't change this alist directly; instead use Custom, or the -`ps-value', `ps-get', `ps-put' and `ps-del' functions (see there for -documentation). - -Ps-print can also print footers. The footer variables are: -`ps-print-footer', `ps-footer-offset', `ps-print-footer-frame', -`ps-footer-font-family', `ps-footer-font-size', `ps-footer-line-pad', -`ps-footer-lines', `ps-left-footer', `ps-right-footer' and -`ps-footer-frame-alist'. These variables are similar to those -controlling headers. - -*** Color management (subgroup) - -If `ps-print-color-p' is non-nil, the buffer's text will be printed in -color. - -*** Face Management (subgroup) - -If you need to print without worrying about face background colors, -set the variable `ps-use-face-background' which specifies if face -background should be used. Valid values are: - - t always use face background color. - nil never use face background color. - (face...) list of faces whose background color will be used. - -*** N-up printing (subgroup) - -The variable `ps-n-up-printing' specifies the number of pages per -sheet of paper. - -The variable `ps-n-up-margin' specifies the margin in points (pt) -between the sheet border and the n-up printing. - -If variable `ps-n-up-border-p' is non-nil, a border is drawn around -each page. - -The variable `ps-n-up-filling' specifies how the page matrix is filled -on each sheet of paper. Following are the valid values for -`ps-n-up-filling' with a filling example using a 3x4 page matrix: - - `left-top' 1 2 3 4 `left-bottom' 9 10 11 12 - 5 6 7 8 5 6 7 8 - 9 10 11 12 1 2 3 4 - - `right-top' 4 3 2 1 `right-bottom' 12 11 10 9 - 8 7 6 5 8 7 6 5 - 12 11 10 9 4 3 2 1 - - `top-left' 1 4 7 10 `bottom-left' 3 6 9 12 - 2 5 8 11 2 5 8 11 - 3 6 9 12 1 4 7 10 - - `top-right' 10 7 4 1 `bottom-right' 12 9 6 3 - 11 8 5 2 11 8 5 2 - 12 9 6 3 10 7 4 1 - -Any other value is treated as `left-top'. - -*** Zebra stripes (subgroup) - -The variable `ps-zebra-color' controls the zebra stripes grayscale or -RGB color. - -The variable `ps-zebra-stripe-follow' specifies how zebra stripes -continue on next page. Visually, valid values are (the character `+' -to the right of each column indicates that a line is printed): - - `nil' `follow' `full' `full-follow' - Current Page -------- ----------- --------- ---------------- - 1 XXXXX + 1 XXXXXXXX + 1 XXXXXX + 1 XXXXXXXXXXXXX + - 2 XXXXX + 2 XXXXXXXX + 2 XXXXXX + 2 XXXXXXXXXXXXX + - 3 XXXXX + 3 XXXXXXXX + 3 XXXXXX + 3 XXXXXXXXXXXXX + - 4 + 4 + 4 + 4 + - 5 + 5 + 5 + 5 + - 6 + 6 + 6 + 6 + - 7 XXXXX + 7 XXXXXXXX + 7 XXXXXX + 7 XXXXXXXXXXXXX + - 8 XXXXX + 8 XXXXXXXX + 8 XXXXXX + 8 XXXXXXXXXXXXX + - 9 XXXXX + 9 XXXXXXXX + 9 XXXXXX + 9 XXXXXXXXXXXXX + - 10 + 10 + - 11 + 11 + - -------- ----------- --------- ---------------- - Next Page -------- ----------- --------- ---------------- - 12 XXXXX + 12 + 10 XXXXXX + 10 + - 13 XXXXX + 13 XXXXXXXX + 11 XXXXXX + 11 + - 14 XXXXX + 14 XXXXXXXX + 12 XXXXXX + 12 + - 15 + 15 XXXXXXXX + 13 + 13 XXXXXXXXXXXXX + - 16 + 16 + 14 + 14 XXXXXXXXXXXXX + - 17 + 17 + 15 + 15 XXXXXXXXXXXXX + - 18 XXXXX + 18 + 16 XXXXXX + 16 + - 19 XXXXX + 19 XXXXXXXX + 17 XXXXXX + 17 + - 20 XXXXX + 20 XXXXXXXX + 18 XXXXXX + 18 + - 21 + 21 XXXXXXXX + - 22 + 22 + - -------- ----------- --------- ---------------- - -Any other value is treated as `nil'. - - -*** Printer management (subgroup) - -The variable `ps-printer-name-option' determines the option used by -some utilities to indicate the printer name; it's used only when -`ps-printer-name' is a non-empty string. If you're using the lpr -utility to print, for example, `ps-printer-name-option' should be set -to "-P". - -The variable `ps-manual-feed' indicates if the printer requires manual -paper feeding. If it's nil, automatic feeding takes place. If it's -non-nil, manual feeding takes place. - -The variable `ps-end-with-control-d' specifies whether C-d (\x04) -should be inserted at end of the generated PostScript. Non-nil means -do so. - -*** Page settings (subgroup) - -If variable `ps-warn-paper-type' is nil, it's *not* treated as an -error if the PostScript printer doesn't have a paper with the size -indicated by `ps-paper-type'; the default paper size will be used -instead. If `ps-warn-paper-type' is non-nil, an error is signaled if -the PostScript printer doesn't support a paper with the size indicated -by `ps-paper-type'. This is used when `ps-spool-config' is set to -`setpagedevice'. - -The variable `ps-print-upside-down' determines the orientation for -printing pages: nil means `normal' printing, non-nil means -`upside-down' printing (that is, the page is rotated by 180 degrees). - -The variable `ps-selected-pages' specifies which pages to print. If -it's nil, all pages are printed. If it's a list, list elements may be -integers specifying a single page to print, or cons cells (FROM . TO) -specifying to print from page FROM to TO. Invalid list elements, that -is integers smaller than one, or elements whose FROM is greater than -its TO, are ignored. - -The variable `ps-even-or-odd-pages' specifies how to print even/odd -pages. Valid values are: - - nil print all pages. - - `even-page' print only even pages. - - `odd-page' print only odd pages. - - `even-sheet' print only even sheets. - That is, if `ps-n-up-printing' is 1, it behaves like - `even-page', but for values greater than 1, it'll - print only the even sheet of paper. - - `odd-sheet' print only odd sheets. - That is, if `ps-n-up-printing' is 1, it behaves like - `odd-page'; but for values greater than 1, it'll print - only the odd sheet of paper. - -Any other value is treated as nil. - -If you set `ps-selected-pages' (see there for documentation), pages -are filtered by `ps-selected-pages', and then by -`ps-even-or-odd-pages'. For example, if we have: - - (setq ps-selected-pages '(1 4 (6 . 10) (12 . 16) 20)) - -and we combine this with `ps-even-or-odd-pages' and -`ps-n-up-printing', we get: - -`ps-n-up-printing' = 1: - `ps-even-or-odd-pages' PAGES PRINTED - nil 1, 4, 6, 7, 8, 9, 10, 12, 13, 14, 15, 16, 20 - even-page 4, 6, 8, 10, 12, 14, 16, 20 - odd-page 1, 7, 9, 13, 15 - even-sheet 4, 6, 8, 10, 12, 14, 16, 20 - odd-sheet 1, 7, 9, 13, 15 - -`ps-n-up-printing' = 2: - `ps-even-or-odd-pages' PAGES PRINTED - nil 1/4, 6/7, 8/9, 10/12, 13/14, 15/16, 20 - even-page 4/6, 8/10, 12/14, 16/20 - odd-page 1/7, 9/13, 15 - even-sheet 6/7, 10/12, 15/16 - odd-sheet 1/4, 8/9, 13/14, 20 - -*** Miscellany (subgroup) - -The variable `ps-error-handler-message' specifies where error handler -messages should be sent. - -It is also possible to add a user-defined PostScript prologue code in -front of all generated prologue code by setting the variable -`ps-user-defined-prologue'. - -The variable `ps-line-number-font' specifies the font for line numbers. - -The variable `ps-line-number-font-size' specifies the font size in -points for line numbers. - -The variable `ps-line-number-color' specifies the color for line -numbers. See `ps-zebra-color' for documentation. - -The variable `ps-line-number-step' specifies the interval in which -line numbers are printed. For example, if `ps-line-number-step' is set -to 2, the printing will look like: - - 1 one line - one line - 3 one line - one line - 5 one line - one line - ... - -Valid values are: - -integer an integer specifying the interval in which line numbers are - printed. If it's smaller than or equal to zero, 1 - is used. - -`zebra' specifies that only the line number of the first line in a - zebra stripe is to be printed. - -Any other value is treated as `zebra'. - -The variable `ps-line-number-start' specifies the starting point in -the interval given by `ps-line-number-step'. For example, if -`ps-line-number-step' is set to 3, and `ps-line-number-start' is set to -3, the output will look like: - - one line - one line - 3 one line - one line - one line - 6 one line - one line - one line - 9 one line - one line - ... - -The variable `ps-postscript-code-directory' specifies the directory -where the PostScript prologue file used by ps-print is found. - -The variable `ps-line-spacing' determines the line spacing in points, -for ordinary text, when generating PostScript (similar to -`ps-font-size'). - -The variable `ps-paragraph-spacing' determines the paragraph spacing, -in points, for ordinary text, when generating PostScript (similar to -`ps-font-size'). - -The variable `ps-paragraph-regexp' specifies the paragraph delimiter. - -The variable `ps-begin-cut-regexp' and `ps-end-cut-regexp' specify the -start and end of a region to cut out when printing. - -** hideshow changes. - -*** now supports hiding of blocks of single line comments (like // for -C++, ; for lisp). - -*** Support for java-mode added. - -*** When doing `hs-hide-all' it is now possible to also hide the comments -in the file if `hs-hide-comments-when-hiding-all' is set. - -*** The new function `hs-hide-initial-comment' hides the comments at -the beginning of the files. Finally those huge RCS logs don't stay in your -way! This is run by default when entering the `hs-minor-mode'. - -*** Now uses overlays instead of `selective-display', so is more -robust and a lot faster. - -*** A block beginning can span multiple lines. - -*** The new variable `hs-show-hidden-short-form' if t, directs hideshow -to show only the beginning of a block when it is hidden. See the -documentation for more details. - -** Changes in Enriched mode. - -*** When you visit a file in enriched-mode, Emacs will make sure it is -filled to the current fill-column. This behavior is now independent -of the size of the window. When you save the file, the fill-column in -use is stored as well, so that the whole buffer need not be refilled -the next time unless the fill-column is different. - -*** use-hard-newlines is now a minor mode. When it is enabled, Emacs -distinguishes between hard and soft newlines, and treats hard newlines -as paragraph boundaries. Otherwise all newlines inserted are marked -as soft, and paragraph boundaries are determined solely from the text. - -** Font Lock mode - -*** Custom support - -The variables font-lock-face-attributes, font-lock-display-type and -font-lock-background-mode are now obsolete; the recommended way to specify -the faces to use for Font Lock mode is with M-x customize-group on the new -custom group font-lock-faces. If you set font-lock-face-attributes in your -~/.emacs file, Font Lock mode will respect its value. However, you should -consider converting from setting that variable to using M-x customize. - -You can still use X resources to specify Font Lock face appearances. - -*** Maximum decoration - -Fontification now uses the maximum level of decoration supported by -default. Previously, fontification used a mode-specific default level -of decoration, which is typically the minimum level of decoration -supported. You can set font-lock-maximum-decoration to nil -to get the old behavior. - -*** New support - -Support is now provided for Java, Objective-C, AWK and SIMULA modes. - -Note that Font Lock mode can be turned on without knowing exactly what modes -support Font Lock mode, via the command global-font-lock-mode. - -*** Configurable support - -Support for C, C++, Objective-C and Java can be more easily configured for -additional types and classes via the new variables c-font-lock-extra-types, -c++-font-lock-extra-types, objc-font-lock-extra-types and, you guessed it, -java-font-lock-extra-types. These value of each of these variables should be a -list of regexps matching the extra type names. For example, the default value -of c-font-lock-extra-types is ("\\sw+_t") which means fontification follows the -convention that C type names end in _t. This results in slower fontification. - -Of course, you can change the variables that specify fontification in whatever -way you wish, typically by adding regexps. However, these new variables make -it easier to make specific and common changes for the fontification of types. - -*** Adding highlighting patterns to existing support - -You can use the new function font-lock-add-keywords to add your own -highlighting patterns, such as for project-local or user-specific constructs, -for any mode. - -For example, to highlight `FIXME:' words in C comments, put: - - (font-lock-add-keywords 'c-mode '(("\\<FIXME:" 0 font-lock-warning-face t))) - -in your ~/.emacs. - -*** New faces - -Font Lock now defines two new faces, font-lock-builtin-face and -font-lock-warning-face. These are intended to highlight builtin keywords, -distinct from a language's normal keywords, and objects that should be brought -to user attention, respectively. Various modes now use these new faces. - -*** Changes to fast-lock support mode - -The fast-lock package, one of the two Font Lock support modes, can now process -cache files silently. You can use the new variable fast-lock-verbose, in the -same way as font-lock-verbose, to control this feature. - -*** Changes to lazy-lock support mode - -The lazy-lock package, one of the two Font Lock support modes, can now fontify -according to the true syntactic context relative to other lines. You can use -the new variable lazy-lock-defer-contextually to control this feature. If -non-nil, changes to the buffer will cause subsequent lines in the buffer to be -refontified after lazy-lock-defer-time seconds of idle time. If nil, then only -the modified lines will be refontified; this is the same as the previous Lazy -Lock mode behavior and the behavior of Font Lock mode. - -This feature is useful in modes where strings or comments can span lines. -For example, if a string or comment terminating character is deleted, then if -this feature is enabled subsequent lines in the buffer will be correctly -refontified to reflect their new syntactic context. Previously, only the line -containing the deleted character would be refontified and you would have to use -the command M-o M-o (font-lock-fontify-block) to refontify some lines. - -As a consequence of this new feature, two other variables have changed: - -Variable `lazy-lock-defer-driven' is renamed `lazy-lock-defer-on-scrolling'. -Variable `lazy-lock-defer-time' can now only be a time, i.e., a number. -Buffer modes for which on-the-fly deferral applies can be specified via the -new variable `lazy-lock-defer-on-the-fly'. - -If you set these variables in your ~/.emacs, then you may have to change those -settings. - -** Ada mode changes. - -*** There is now better support for using find-file.el with Ada mode. -If you switch between spec and body, the cursor stays in the same -procedure (modulo overloading). If a spec has no body file yet, but -you try to switch to its body file, Ada mode now generates procedure -stubs. - -*** There are two new commands: - - `ada-make-local' : invokes gnatmake on the current buffer - - `ada-check-syntax' : check syntax of current buffer. - -The user options `ada-compiler-make', `ada-make-options', -`ada-language-version', `ada-compiler-syntax-check', and -`ada-compile-options' are used within these commands. - -*** Ada mode can now work with Outline minor mode. The outline level -is calculated from the indenting, not from syntactic constructs. -Outlining does not work if your code is not correctly indented. - -*** The new function `ada-gnat-style' converts the buffer to the style of -formatting used in GNAT. It places two blanks after a comment start, -places one blank between a word end and an opening '(', and puts one -space between a comma and the beginning of a word. - -** Scheme mode changes. - -*** Scheme mode indentation now uses many of the facilities of Lisp -mode; therefore, the variables to customize it are the variables used -for Lisp mode which have names starting with `lisp-'. The variables -with names starting with `scheme-' which used to do this no longer -have any effect. - -If you want to use different indentation for Scheme and Lisp, this is -still possible, but now you must do it by adding a hook to -scheme-mode-hook, which could work by setting the `lisp-' indentation -variables as buffer-local variables. - -*** DSSSL mode is a variant of Scheme mode, for editing DSSSL scripts. -Use M-x dsssl-mode. - -** Changes to the emacsclient program - -*** If a socket can't be found, and environment variables LOGNAME or -USER are set, emacsclient now looks for a socket based on the UID -associated with the name. That is an emacsclient running as root -can connect to an Emacs server started by a non-root user. - -*** The emacsclient program now accepts an option --no-wait which tells -it to return immediately without waiting for you to "finish" the -buffer in Emacs. - -*** The new option --alternate-editor allows to specify an editor to -use if Emacs is not running. The environment variable -ALTERNATE_EDITOR can be used for the same effect; the command line -option takes precedence. - -** M-x eldoc-mode enables a minor mode in which the echo area -constantly shows the parameter list for function being called at point -(in Emacs Lisp and Lisp Interaction modes only). - -** C-x n d now runs the new command narrow-to-defun, -which narrows the accessible parts of the buffer to just -the current defun. - -** Emacs now handles the `--' argument in the standard way; all -following arguments are treated as ordinary file names. - -** On MSDOS and Windows, the bookmark file is now called _emacs.bmk, -and the saved desktop file is now called _emacs.desktop (truncated if -necessary). - -** When you kill a buffer that visits a file, -if there are any registers that save positions in the file, -these register values no longer become completely useless. -If you try to go to such a register with C-x j, then you are -asked whether to visit the file again. If you say yes, -it visits the file and then goes to the same position. - -** When you visit a file that changes frequently outside Emacs--for -example, a log of output from a process that continues to run--it may -be useful for Emacs to revert the file without querying you whenever -you visit the file afresh with C-x C-f. - -You can request this behavior for certain files by setting the -variable revert-without-query to a list of regular expressions. If a -file's name matches any of these regular expressions, find-file and -revert-buffer revert the buffer without asking for permission--but -only if you have not edited the buffer text yourself. - -** set-default-font has been renamed to set-frame-font -since it applies only to the current frame. - -** In TeX mode, you can use the variable tex-main-file to specify the -file for tex-file to run TeX on. (By default, tex-main-file is nil, -and tex-file runs TeX on the current visited file.) - -This is useful when you are editing a document that consists of -multiple files. In each of the included files, you can set up a local -variable list which specifies the top-level file of your document for -tex-main-file. Then tex-file will run TeX on the whole document -instead of just the file you are editing. - -** RefTeX mode - -RefTeX mode is a new minor mode with special support for \label, \ref -and \cite macros in LaTeX documents. RefTeX distinguishes labels of -different environments (equation, figure, ...) and has full support for -multifile documents. To use it, select a buffer with a LaTeX document and -turn the mode on with M-x reftex-mode. Here are the main user commands: - -C-c ( reftex-label - Creates a label semi-automatically. RefTeX is context sensitive and - knows which kind of label is needed. - -C-c ) reftex-reference - Offers in a menu all labels in the document, along with context of the - label definition. The selected label is referenced as \ref{LABEL}. - -C-c [ reftex-citation - Prompts for a regular expression and displays a list of matching BibTeX - database entries. The selected entry is cited with a \cite{KEY} macro. - -C-c & reftex-view-crossref - Views the cross reference of a \ref or \cite command near point. - -C-c = reftex-toc - Shows a table of contents of the (multifile) document. From there you - can quickly jump to every section. - -Under X, RefTeX installs a "Ref" menu in the menu bar, with additional -commands. Press `?' to get help when a prompt mentions this feature. -Full documentation and customization examples are in the file -reftex.el. You can use the finder to view the file documentation: -C-h p --> tex --> reftex.el - -** Changes in BibTeX mode. - -*** Info documentation is now available. - -*** Don't allow parentheses in string constants anymore. This confused -both the BibTeX program and Emacs BibTeX mode. - -*** Renamed variable bibtex-mode-user-optional-fields to -bibtex-user-optional-fields. - -*** Removed variable bibtex-include-OPTannote -(use bibtex-user-optional-fields instead). - -*** New interactive functions to copy and kill fields and complete -entries to the BibTeX kill ring, from where they can be yanked back by -appropriate functions. - -*** New interactive functions for repositioning and marking of -entries. They are bound by default to C-M-l and C-M-h. - -*** New hook bibtex-clean-entry-hook. It is called after entry has -been cleaned. - -*** New variable bibtex-field-delimiters, which replaces variables -bibtex-field-{left|right}-delimiter. - -*** New variable bibtex-entry-delimiters to determine how entries -shall be delimited. - -*** Allow preinitialization of fields. See documentation of -bibtex-user-optional-fields, bibtex-entry-field-alist, and -bibtex-include-OPTkey for details. - -*** Book and InBook entries require either an author or an editor -field. This is now supported by bibtex.el. Alternative fields are -prefixed with `ALT'. - -*** New variable bibtex-entry-format, which replaces variable -bibtex-clean-entry-zap-empty-opts and allows specification of many -formatting options performed on cleaning an entry (see variable -documentation). - -*** Even more control on how automatic keys are generated. See -documentation of bibtex-generate-autokey for details. Transcriptions -for foreign languages other than German are now handled, too. - -*** New boolean user option bibtex-comma-after-last-field to decide if -comma should be inserted at end of last field. - -*** New boolean user option bibtex-align-at-equal-sign to determine if -alignment should be made at left side of field contents or at equal -signs. New user options to control entry layout (e.g. indentation). - -*** New function bibtex-fill-entry to realign entries. - -*** New function bibtex-reformat to reformat region or buffer. - -*** New function bibtex-convert-alien to convert a BibTeX database -from alien sources. - -*** New function bibtex-complete-key (similar to bibtex-complete-string) -to complete prefix to a key defined in buffer. Mainly useful in -crossref entries. - -*** New function bibtex-count-entries to count entries in buffer or -region. - -*** Added support for imenu. - -*** The function `bibtex-validate' now checks current region instead -of buffer if mark is active. Now it shows all errors of buffer in a -`compilation mode' buffer. You can use the normal commands (e.g. -`next-error') for compilation modes to jump to errors. - -*** New variable `bibtex-string-file-path' to determine where the files -from `bibtex-string-files' are searched. - -** Iso Accents mode now supports Latin-3 as an alternative. - -** The command next-error now opens blocks hidden by hideshow. - -** The function using-unix-filesystems has been replaced by the -functions add-untranslated-filesystem and remove-untranslated-filesystem. -Each of these functions takes the name of a drive letter or directory -as an argument. - -When a filesystem is added as untranslated, all files on it are read -and written in binary mode (no cr/lf translation is performed). - -** browse-url changes - -*** New methods for: Grail (browse-url-generic), MMM (browse-url-mmm), -Lynx in a separate xterm (browse-url-lynx-xterm) or in an Emacs window -(browse-url-lynx-emacs), remote W3 (browse-url-w3-gnudoit), generic -non-remote-controlled browsers (browse-url-generic) and associated -customization variables. - -*** New commands `browse-url-of-region' and `browse-url'. - -*** URLs marked up with <URL:...> (RFC1738) work if broken across -lines. Browsing methods can be associated with URL regexps -(e.g. mailto: URLs) via `browse-url-browser-function'. - -** Changes in Ediff - -*** Clicking Mouse-2 on a brief command description in Ediff control panel -pops up the Info file for this command. - -*** There is now a variable, ediff-autostore-merges, which controls whether -the result of a merge is saved in a file. By default, this is done only when -merge is done from a session group (eg, when merging files in two different -directories). - -*** Since Emacs 19.31 (this hasn't been announced before), Ediff can compare -and merge groups of files residing in different directories, or revisions of -files in the same directory. - -*** Since Emacs 19.31, Ediff can apply multi-file patches interactively. -The patches must be in the context format or GNU unified format. (The bug -related to the GNU format has now been fixed.) - -** Changes in Viper - -*** The startup file is now .viper instead of .vip -*** All variable/function names have been changed to start with viper- - instead of vip-. -*** C-\ now simulates the meta-key in all Viper states. -*** C-z in Insert state now escapes to Vi for the duration of the next -Viper command. In Vi and Insert states, C-z behaves as before. -*** C-c \ escapes to Vi for one command if Viper is in Insert or Emacs states. -*** _ is no longer the meta-key in Vi state. -*** The variable viper-insert-state-cursor-color can be used to change cursor -color when Viper is in insert state. -*** If search lands the cursor near the top or the bottom of the window, -Viper pulls the window up or down to expose more context. The variable -viper-adjust-window-after-search controls this behavior. - -** Etags changes. - -*** In C, C++, Objective C and Java, Etags tags global variables by -default. The resulting tags files are inflated by 30% on average. -Use --no-globals to turn this feature off. Etags can also tag -variables which are members of structure-like constructs, but it does -not by default. Use --members to turn this feature on. - -*** C++ member functions are now recognized as tags. - -*** Java is tagged like C++. In addition, "extends" and "implements" -constructs are tagged. Files are recognized by the extension .java. - -*** Etags can now handle programs written in Postscript. Files are -recognized by the extensions .ps and .pdb (Postscript with C syntax). -In Postscript, tags are lines that start with a slash. - -*** Etags now handles Objective C and Objective C++ code. The usual C and -C++ tags are recognized in these languages; in addition, etags -recognizes special Objective C syntax for classes, class categories, -methods and protocols. - -*** Etags also handles Cobol. Files are recognized by the extension -.cobol. The tagged lines are those containing a word that begins in -column 8 and ends in a full stop, i.e. anything that could be a -paragraph name. - -*** Regexps in Etags now support intervals, as in ed or grep. The syntax of -an interval is \{M,N\}, and it means to match the preceding expression -at least M times and as many as N times. - -** The format for specifying a custom format for time-stamp to insert -in files has changed slightly. - -With the new enhancements to the functionality of format-time-string, -time-stamp-format will change to be eventually compatible with it. -This conversion is being done in two steps to maintain compatibility -with old time-stamp-format values. - -In the new scheme, alternate case is signified by the number-sign -(`#') modifier, rather than changing the case of the format character. -This feature is as yet incompletely implemented for compatibility -reasons. - -In the old time-stamp-format, all numeric fields defaulted to their -natural width. (With format-time-string, each format has a -fixed-width default.) In this version, you can specify the colon -(`:') modifier to a numeric conversion to mean "give me the historical -time-stamp-format width default." Do not use colon if you are -specifying an explicit width, as in "%02d". - -Numbers are no longer truncated to the requested width, except in the -case of "%02y", which continues to give a two-digit year. Digit -truncation probably wasn't being used for anything else anyway. - -The new formats will work with old versions of Emacs. New formats are -being recommended now to allow time-stamp-format to change in the -future to be compatible with format-time-string. The new forms being -recommended now will continue to work then. - -See the documentation string for the variable time-stamp-format for -details. - -** There are some additional major modes: - -dcl-mode, for editing VMS DCL files. -m4-mode, for editing files of m4 input. -meta-mode, for editing MetaFont and MetaPost source files. - -** In Shell mode, the command shell-copy-environment-variable lets you -copy the value of a specified environment variable from the subshell -into Emacs. - -** New Lisp packages include: - -*** battery.el displays battery status for laptops. - -*** M-x bruce (named after Lenny Bruce) is a program that might -be used for adding some indecent words to your email. - -*** M-x crisp-mode enables an emulation for the CRiSP editor. - -*** M-x dirtrack arranges for better tracking of directory changes -in shell buffers. - -*** The new library elint.el provides for linting of Emacs Lisp code. -See the documentation for `elint-initialize', `elint-current-buffer' -and `elint-defun'. - -*** M-x expand-add-abbrevs defines a special kind of abbrev which is -meant for programming constructs. These abbrevs expand like ordinary -ones, when you type SPC, but only at the end of a line and not within -strings or comments. - -These abbrevs can act as templates: you can define places within an -abbrev for insertion of additional text. Once you expand the abbrev, -you can then use C-x a p and C-x a n to move back and forth to these -insertion points. Thus you can conveniently insert additional text -at these points. - -*** filecache.el remembers the location of files so that you -can visit them by short forms of their names. - -*** find-func.el lets you find the definition of the user-loaded -Emacs Lisp function at point. - -*** M-x handwrite converts text to a "handwritten" picture. - -*** M-x iswitchb-buffer is a command for switching to a buffer, much like -switch-buffer, but it reads the argument in a more helpful way. - -*** M-x landmark implements a neural network for landmark learning. - -*** M-x locate provides a convenient interface to the `locate' program. - -*** M4 mode is a new mode for editing files of m4 input. - -*** mantemp.el creates C++ manual template instantiations -from the GCC error messages which indicate which instantiations are needed. - -*** mouse-copy.el provides a one-click copy and move feature. -You can drag a region with M-mouse-1, and it is automatically -inserted at point. M-Shift-mouse-1 deletes the text from its -original place after inserting the copy. - -*** mouse-drag.el lets you do scrolling by dragging Mouse-2 -on the buffer. - -You click the mouse and move; that distance either translates into the -velocity to scroll (with mouse-drag-throw) or the distance to scroll -(with mouse-drag-drag). Horizontal scrolling is enabled when needed. - -Enable mouse-drag with: - (global-set-key [down-mouse-2] 'mouse-drag-throw) --or- - (global-set-key [down-mouse-2] 'mouse-drag-drag) - -*** mspools.el is useful for determining which mail folders have -mail waiting to be read in them. It works with procmail. - -*** Octave mode is a major mode for editing files of input for Octave. -It comes with a facility for communicating with an Octave subprocess. - -*** ogonek - -The ogonek package provides functions for changing the coding of -Polish diacritic characters in buffers. Codings known from various -platforms are supported such as ISO8859-2, Mazovia, IBM Latin2, and -TeX. For example, you can change the coding from Mazovia to -ISO8859-2. Another example is a change of coding from ISO8859-2 to -prefix notation (in which `/a' stands for the aogonek character, for -instance) and vice versa. - -To use this package load it using - M-x load-library [enter] ogonek -Then, you may get an explanation by calling one of - M-x ogonek-jak -- in Polish - M-x ogonek-how -- in English -The info specifies the commands and variables provided as well as the -ways of customization in `.emacs'. - -*** Interface to ph. - -Emacs provides a client interface to CCSO Nameservers (ph/qi) - -The CCSO nameserver is used in many universities to provide directory -services about people. ph.el provides a convenient Emacs interface to -these servers. - -*** uce.el is useful for replying to unsolicited commercial email. - -*** vcursor.el implements a "virtual cursor" feature. -You can move the virtual cursor with special commands -while the real cursor does not move. - -*** webjump.el is a "hot list" package which you can set up -for visiting your favorite web sites. - -*** M-x winner-mode is a minor mode which saves window configurations, -so you can move back to other configurations that you have recently used. - -** movemail change - -Movemail no longer needs to be installed setuid root in order for POP -mail retrieval to function properly. This is because it no longer -supports the RPOP (reserved-port POP) protocol; instead, it uses the -user's POP password to authenticate to the mail server. - -This change was made earlier, but not reported in NEWS before. - -* Emacs 20.1 changes for MS-DOS and MS-Windows. - -** Changes in handling MS-DOS/MS-Windows text files. - -Emacs handles three different conventions for representing -end-of-line: CRLF for MSDOS, LF for Unix and GNU, and CR (used on the -Macintosh). Emacs determines which convention is used in a specific -file based on the contents of that file (except for certain special -file names), and when it saves the file, it uses the same convention. - -To save the file and change the end-of-line convention, you can use -C-x RET f (set-buffer-file-coding-system) to specify a different -coding system for the buffer. Then, when you save the file, the newly -specified coding system will take effect. For example, to save with -LF, specify undecided-unix (or some other ...-unix coding system); to -save with CRLF, specify undecided-dos. - -* Lisp Changes in Emacs 20.1 - -** Byte-compiled files made with Emacs 20 will, in general, work in -Emacs 19 as well, as long as the source code runs in Emacs 19. And -vice versa: byte-compiled files made with Emacs 19 should also run in -Emacs 20, as long as the program itself works in Emacs 20. - -** Windows-specific functions and variables have been renamed -to start with w32- instead of win32-. - -In hacker language, calling something a "win" is a form of praise. We -don't want to praise a non-free Microsoft system, so we don't call it -"win". - -** Basic Lisp changes - -*** A symbol whose name starts with a colon now automatically -evaluates to itself. Therefore such a symbol can be used as a constant. - -*** The defined purpose of `defconst' has been changed. It should now -be used only for values that should not be changed whether by a program -or by the user. - -The actual behavior of defconst has not been changed. - -*** There are new macros `when' and `unless' - -(when CONDITION BODY...) is short for (if CONDITION (progn BODY...)) -(unless CONDITION BODY...) is short for (if CONDITION nil BODY...) - -*** Emacs now defines functions caar, cadr, cdar and cddr with their -usual Lisp meanings. For example, caar returns the car of the car of -its argument. - -*** equal, when comparing strings, now ignores their text properties. - -*** The new function `functionp' tests whether an object is a function. - -*** arrayp now returns t for char-tables and bool-vectors. - -*** Certain primitives which use characters (as integers) now get an -error if the integer is not a valid character code. These primitives -include insert-char, char-to-string, and the %c construct in the -`format' function. - -*** The `require' function now insists on adding a suffix, either .el -or .elc, to the file name. Thus, (require 'foo) will not use a file -whose name is just foo. It insists on foo.el or foo.elc. - -*** The `autoload' function, when the file name does not contain -either a directory name or the suffix .el or .elc, insists on -adding one of these suffixes. - -*** string-to-number now takes an optional second argument BASE -which specifies the base to use when converting an integer. -If BASE is omitted, base 10 is used. - -We have not implemented other radices for floating point numbers, -because that would be much more work and does not seem useful. - -*** substring now handles vectors as well as strings. - -*** The Common Lisp function eql is no longer defined normally. -You must load the `cl' library to define it. - -*** The new macro `with-current-buffer' lets you evaluate an expression -conveniently with a different current buffer. It looks like this: - - (with-current-buffer BUFFER BODY-FORMS...) - -BUFFER is the expression that says which buffer to use. -BODY-FORMS say what to do in that buffer. - -*** The new primitive `save-current-buffer' saves and restores the -choice of current buffer, like `save-excursion', but without saving or -restoring the value of point or the mark. `with-current-buffer' -works using `save-current-buffer'. - -*** The new macro `with-temp-file' lets you do some work in a new buffer and -write the output to a specified file. Like `progn', it returns the value -of the last form. - -*** The new macro `with-temp-buffer' lets you do some work in a new buffer, -which is discarded after use. Like `progn', it returns the value of the -last form. If you wish to return the buffer contents, use (buffer-string) -as the last form. - -*** The new function split-string takes a string, splits it at certain -characters, and returns a list of the substrings in between the -matches. - -For example, (split-string "foo bar lose" " +") returns ("foo" "bar" "lose"). - -*** The new macro with-output-to-string executes some Lisp expressions -with standard-output set up so that all output feeds into a string. -Then it returns that string. - -For example, if the current buffer name is `foo', - -(with-output-to-string - (princ "The buffer is ") - (princ (buffer-name))) - -returns "The buffer is foo". - -** Non-ASCII characters are now supported, if enable-multibyte-characters -is non-nil. - -These characters have character codes above 256. When inserted in the -buffer or stored in a string, they are represented as multibyte -characters that occupy several buffer positions each. - -*** When enable-multibyte-characters is non-nil, a single character in -a buffer or string can be two or more bytes (as many as four). - -Buffers and strings are still made up of unibyte elements; -character positions and string indices are always measured in bytes. -Therefore, moving forward one character can increase the buffer -position by 2, 3 or 4. The function forward-char moves by whole -characters, and therefore is no longer equivalent to - (lambda (n) (goto-char (+ (point) n))). - -ASCII characters (codes 0 through 127) are still single bytes, always. -Sequences of byte values 128 through 255 are used to represent -non-ASCII characters. These sequences are called "multibyte -characters". - -The first byte of a multibyte character is always in the range 128 -through 159 (octal 0200 through 0237). These values are called -"leading codes". The second and subsequent bytes are always in the -range 160 through 255 (octal 0240 through 0377). The first byte, the -leading code, determines how many bytes long the sequence is. - -*** The function forward-char moves over characters, and therefore -(forward-char 1) may increase point by more than 1 if it moves over a -multibyte character. Likewise, delete-char always deletes a -character, which may be more than one buffer position. - -This means that some Lisp programs, which assume that a character is -always one buffer position, need to be changed. - -However, all ASCII characters are always one buffer position. - -*** The regexp [\200-\377] no longer matches all non-ASCII characters, -because when enable-multibyte-characters is non-nil, these characters -have codes that are not in the range octal 200 to octal 377. However, -the regexp [^\000-\177] does match all non-ASCII characters, -guaranteed. - -*** The function char-boundary-p returns non-nil if position POS is -between two characters in the buffer (not in the middle of a -character). - -When the value is non-nil, it says what kind of character follows POS: - - 0 if POS is at an ASCII character or at the end of range, - 1 if POS is before a 2-byte length multi-byte form, - 2 if POS is at a head of 3-byte length multi-byte form, - 3 if POS is at a head of 4-byte length multi-byte form, - 4 if POS is at a head of multi-byte form of a composite character. - -*** The function char-bytes returns how many bytes the character CHAR uses. - -*** Strings can contain multibyte characters. The function -`length' returns the string length counting bytes, which may be -more than the number of characters. - -You can include a multibyte character in a string constant by writing -it literally. You can also represent it with a hex escape, -\xNNNNNNN..., using as many digits as necessary. Any character which -is not a valid hex digit terminates this construct. If you want to -follow it with a character that is a hex digit, write backslash and -newline in between; that will terminate the hex escape. - -*** The function concat-chars takes arguments which are characters -and returns a string containing those characters. - -*** The function sref access a multibyte character in a string. -(sref STRING INDX) returns the character in STRING at INDEX. INDEX -counts from zero. If INDEX is at a position in the middle of a -character, sref signals an error. - -*** The function chars-in-string returns the number of characters -in a string. This is less than the length of the string, if the -string contains multibyte characters (the length counts bytes). - -*** The function chars-in-region returns the number of characters -in a region from BEG to END. This is less than (- END BEG) if the -region contains multibyte characters (the length counts bytes). - -*** The function string-to-list converts a string to a list of -the characters in it. string-to-vector converts a string -to a vector of the characters in it. - -*** The function store-substring alters part of the contents -of a string. You call it as follows: - - (store-substring STRING IDX OBJ) - -This says to alter STRING, by storing OBJ starting at index IDX in -STRING. OBJ may be either a character or a (smaller) string. -This function really does alter the contents of STRING. -Since it is impossible to change the length of an existing string, -it is an error if OBJ doesn't fit within STRING's actual length. - -*** char-width returns the width (in columns) of the character CHAR, -if it were displayed in the current buffer and the selected window. - -*** string-width returns the width (in columns) of the text in STRING, -if it were displayed in the current buffer and the selected window. - -*** truncate-string-to-width shortens a string, if necessary, -to fit within a certain number of columns. (Of course, it does -not alter the string that you give it; it returns a new string -which contains all or just part of the existing string.) - -(truncate-string-to-width STR END-COLUMN &optional START-COLUMN PADDING) - -This returns the part of STR up to column END-COLUMN. - -The optional argument START-COLUMN specifies the starting column. -If this is non-nil, then the first START-COLUMN columns of the string -are not included in the resulting value. - -The optional argument PADDING, if non-nil, is a padding character to be added -at the beginning and end the resulting string, to extend it to exactly -WIDTH columns. If PADDING is nil, that means do not pad; then, if STRING -is narrower than WIDTH, the value is equal to STRING. - -If PADDING and START-COLUMN are both non-nil, and if there is no clean -place in STRING that corresponds to START-COLUMN (because one -character extends across that column), then the padding character -PADDING is added one or more times at the beginning of the result -string, so that its columns line up as if it really did start at -column START-COLUMN. - -*** When the functions in the list after-change-functions are called, -the third argument is the number of bytes in the pre-change text, not -necessarily the number of characters. It is, in effect, the -difference in buffer position between the beginning and the end of the -changed text, before the change. - -*** The characters Emacs uses are classified in various character -sets, each of which has a name which is a symbol. In general there is -one character set for each script, not for each language. - -**** The function charsetp tests whether an object is a character set name. - -**** The variable charset-list holds a list of character set names. - -**** char-charset, given a character code, returns the name of the character -set that the character belongs to. (The value is a symbol.) - -**** split-char, given a character code, returns a list containing the -name of the character set, followed by one or two byte-values -which identify the character within that character set. - -**** make-char, given a character set name and one or two subsequent -byte-values, constructs a character code. This is roughly the -opposite of split-char. - -**** find-charset-region returns a list of the character sets -of all the characters between BEG and END. - -**** find-charset-string returns a list of the character sets -of all the characters in a string. - -*** Here are the Lisp facilities for working with coding systems -and specifying coding systems. - -**** The function coding-system-list returns a list of all coding -system names (symbols). With optional argument t, it returns a list -of all distinct base coding systems, not including variants. -(Variant coding systems are those like latin-1-dos, latin-1-unix -and latin-1-mac which specify the end-of-line conversion as well -as what to do about code conversion.) - -**** coding-system-p tests a symbol to see if it is a coding system -name. It returns t if so, nil if not. - -**** file-coding-system-alist specifies which coding systems to use -for certain file names. It works like network-coding-system-alist, -except that the PATTERN is matched against the file name. - -Each element has the format (PATTERN . VAL), where PATTERN determines -which file names the element applies to. PATTERN should be a regexp -to match against a file name. - -VAL is a coding system, a cons cell containing two coding systems, or -a function symbol. If VAL is a coding system, it is used for both -decoding what received from the network stream and encoding what sent -to the network stream. If VAL is a cons cell containing two coding -systems, the car specifies the coding system for decoding, and the cdr -specifies the coding system for encoding. - -If VAL is a function symbol, the function must return a coding system -or a cons cell containing two coding systems, which is used as above. - -**** The variable network-coding-system-alist specifies -the coding system to use for network sockets. - -Each element has the format (PATTERN . VAL), where PATTERN determines -which network sockets the element applies to. PATTERN should be -either a port number or a regular expression matching some network -service names. - -VAL is a coding system, a cons cell containing two coding systems, or -a function symbol. If VAL is a coding system, it is used for both -decoding what received from the network stream and encoding what sent -to the network stream. If VAL is a cons cell containing two coding -systems, the car specifies the coding system for decoding, and the cdr -specifies the coding system for encoding. - -If VAL is a function symbol, the function must return a coding system -or a cons cell containing two coding systems, which is used as above. - -**** process-coding-system-alist specifies which coding systems to use -for certain subprocess. It works like network-coding-system-alist, -except that the PATTERN is matched against the program name used to -start the subprocess. - -**** The variable default-process-coding-system specifies the coding -systems to use for subprocess (and net connection) input and output, -when nothing else specifies what to do. The value is a cons cell -(OUTPUT-CODING . INPUT-CODING). OUTPUT-CODING applies to output -to the subprocess, and INPUT-CODING applies to input from it. - -**** The variable coding-system-for-write, if non-nil, specifies the -coding system to use for writing a file, or for output to a synchronous -subprocess. - -It also applies to any asynchronous subprocess or network connection, -but in a different way: the value of coding-system-for-write when you -start the subprocess or connection affects that subprocess or -connection permanently or until overridden. - -The variable coding-system-for-write takes precedence over -file-coding-system-alist, process-coding-system-alist and -network-coding-system-alist, and all other methods of specifying a -coding system for output. But most of the time this variable is nil. -It exists so that Lisp programs can bind it to a specific coding -system for one operation at a time. - -**** coding-system-for-read applies similarly to input from -files, subprocesses or network connections. - -**** The function process-coding-system tells you what -coding systems(s) an existing subprocess is using. -The value is a cons cell, - (DECODING-CODING-SYSTEM . ENCODING-CODING-SYSTEM) -where DECODING-CODING-SYSTEM is used for decoding output from -the subprocess, and ENCODING-CODING-SYSTEM is used for encoding -input to the subprocess. - -**** The function set-process-coding-system can be used to -change the coding systems in use for an existing subprocess. - -** Emacs has a new facility to help users manage the many -customization options. To make a Lisp program work with this facility, -you need to use the new macros defgroup and defcustom. - -You use defcustom instead of defvar, for defining a user option -variable. The difference is that you specify two additional pieces of -information (usually): the "type" which says what values are -legitimate, and the "group" which specifies the hierarchy for -customization. - -Thus, instead of writing - - (defvar foo-blurgoze nil - "*Non-nil means that foo will act very blurgozely.") - -you would now write this: - - (defcustom foo-blurgoze nil - "*Non-nil means that foo will act very blurgozely." - :type 'boolean - :group foo) - -The type `boolean' means that this variable has only -two meaningful states: nil and non-nil. Other type values -describe other possibilities; see the manual for Custom -for a description of them. - -The "group" argument is used to specify a group which the option -should belong to. You define a new group like this: - - (defgroup ispell nil - "Spell checking using Ispell." - :group 'processes) - -The "group" argument in defgroup specifies the parent group. The root -group is called `emacs'; it should not contain any variables itself, -but only other groups. The immediate subgroups of `emacs' correspond -to the keywords used by C-h p. Under these subgroups come -second-level subgroups that belong to individual packages. - -Each Emacs package should have its own set of groups. A simple -package should have just one group; a more complex package should -have a hierarchy of its own groups. The sole or root group of a -package should be a subgroup of one or more of the "keyword" -first-level subgroups. - -** New `widget' library for inserting UI components in buffers. - -This library, used by the new custom library, is documented in a -separate manual that accompanies Emacs. - -** easy-mmode - -The easy-mmode package provides macros and functions that make -developing minor modes easier. Roughly, the programmer has to code -only the functionality of the minor mode. All the rest--toggles, -predicate, and documentation--can be done in one call to the macro -`easy-mmode-define-minor-mode' (see the documentation). See also -`easy-mmode-define-keymap'. - -** Text property changes - -*** The `intangible' property now works on overlays as well as on a -text property. - -*** The new functions next-char-property-change and -previous-char-property-change scan through the buffer looking for a -place where either a text property or an overlay might change. The -functions take two arguments, POSITION and LIMIT. POSITION is the -starting position for the scan. LIMIT says where to stop the scan. - -If no property change is found before LIMIT, the value is LIMIT. If -LIMIT is nil, scan goes to the beginning or end of the accessible part -of the buffer. If no property change is found, the value is the -position of the beginning or end of the buffer. - -*** In the `local-map' text property or overlay property, the property -value can now be a symbol whose function definition is a keymap. This -is an alternative to using the keymap itself. - -** Changes in invisibility features - -*** Isearch can now temporarily show parts of the buffer which are -hidden by an overlay with a invisible property, when the search match -is inside that portion of the buffer. To enable this the overlay -should have a isearch-open-invisible property which is a function that -would be called having the overlay as an argument, the function should -make the overlay visible. - -During incremental search the overlays are shown by modifying the -invisible and intangible properties, if beside this more actions are -needed the overlay should have a isearch-open-invisible-temporary -which is a function. The function is called with 2 arguments: one is -the overlay and the second is nil when it should show the overlay and -t when it should hide it. - -*** add-to-invisibility-spec, remove-from-invisibility-spec - -Modes that use overlays to hide portions of a buffer should set the -invisible property of the overlay to the mode's name (or another symbol) -and modify the `buffer-invisibility-spec' to include that symbol. -Use `add-to-invisibility-spec' and `remove-from-invisibility-spec' to -manipulate the `buffer-invisibility-spec'. -Here is an example of how to do this: - - ;; If we want to display an ellipsis: - (add-to-invisibility-spec '(my-symbol . t)) - ;; If you don't want ellipsis: - (add-to-invisibility-spec 'my-symbol) - - ... - (overlay-put (make-overlay beginning end) 'invisible 'my-symbol) - - ... - ;; When done with the overlays: - (remove-from-invisibility-spec '(my-symbol . t)) - ;; Or respectively: - (remove-from-invisibility-spec 'my-symbol) - -** Changes in syntax parsing. - -*** The syntax-directed buffer-scan functions (such as -`parse-partial-sexp', `forward-word' and similar functions) can now -obey syntax information specified by text properties, if the variable -`parse-sexp-lookup-properties' is non-nil. - -If the value of `parse-sexp-lookup-properties' is nil, the behavior -is as before: the syntax-table of the current buffer is always -used to determine the syntax of the character at the position. - -When `parse-sexp-lookup-properties' is non-nil, the syntax of a -character in the buffer is calculated thus: - - a) if the `syntax-table' text-property of that character - is a cons, this cons becomes the syntax-type; - - Valid values of `syntax-table' text-property are: nil, a valid - syntax-table, and a valid syntax-table element, i.e., - a cons cell of the form (SYNTAX-CODE . MATCHING-CHAR). - - b) if the character's `syntax-table' text-property - is a syntax table, this syntax table is used - (instead of the syntax-table of the current buffer) to - determine the syntax type of the character. - - c) otherwise the syntax-type is determined by the syntax-table - of the current buffer. - -*** The meaning of \s in regular expressions is also affected by the -value of `parse-sexp-lookup-properties'. The details are the same as -for the syntax-directed buffer-scan functions. - -*** There are two new syntax-codes, `!' and `|' (numeric values 14 -and 15). A character with a code `!' starts a comment which is ended -only by another character with the same code (unless quoted). A -character with a code `|' starts a string which is ended only by -another character with the same code (unless quoted). - -These codes are mainly meant for use as values of the `syntax-table' -text property. - -*** The function `parse-partial-sexp' has new semantics for the sixth -arg COMMENTSTOP. If it is `syntax-table', parse stops after the start -of a comment or a string, or after end of a comment or a string. - -*** The state-list which the return value from `parse-partial-sexp' -(and can also be used as an argument) now has an optional ninth -element: the character address of the start of last comment or string; -nil if none. The fourth and eighth elements have special values if the -string/comment is started by a "!" or "|" syntax-code. - -*** Since new features of `parse-partial-sexp' allow a complete -syntactic parsing, `font-lock' no longer supports -`font-lock-comment-start-regexp'. - -** Changes in face features - -*** The face functions are now unconditionally defined in Emacs, even -if it does not support displaying on a device that supports faces. - -*** The function face-documentation returns the documentation string -of a face (or nil if it doesn't have one). - -*** The function face-bold-p returns t if a face should be bold. -set-face-bold-p sets that flag. - -*** The function face-italic-p returns t if a face should be italic. -set-face-italic-p sets that flag. - -*** You can now specify foreground and background colors for text -by adding elements of the form (foreground-color . COLOR-NAME) -and (background-color . COLOR-NAME) to the list of faces in -the `face' property (either the character's text property or an -overlay property). - -This means that you no longer need to create named faces to use -arbitrary colors in a Lisp package. - -** Changes in file-handling functions - -*** File-access primitive functions no longer discard an extra redundant -directory name from the beginning of the file name. In other words, -they no longer do anything special with // or /~. That conversion -is now done only in substitute-in-file-name. - -This makes it possible for a Lisp program to open a file whose name -begins with ~. - -*** If copy-file is unable to set the date of the output file, -it now signals an error with the condition file-date-error. - -*** The inode number returned by file-attributes may be an integer (if -the number fits in a Lisp integer) or a list of integers. - -*** insert-file-contents can now read from a special file, -as long as the arguments VISIT and REPLACE are nil. - -*** The RAWFILE arg to find-file-noselect, if non-nil, now suppresses -character code conversion as well as other things. - -Meanwhile, this feature does work with remote file names -(formerly it did not). - -*** Lisp packages which create temporary files should use the TMPDIR -environment variable to decide which directory to put them in. - -*** interpreter-mode-alist elements now specify regexps -instead of constant strings. - -*** expand-file-name no longer treats `//' or `/~' specially. It used -to delete all the text of a file name up through the first slash of -any `//' or `/~' sequence. Now it passes them straight through. - -substitute-in-file-name continues to treat those sequences specially, -in the same way as before. - -*** The variable `format-alist' is more general now. -The FROM-FN and TO-FN in a format definition can now be strings -which specify shell commands to use as filters to perform conversion. - -*** The new function access-file tries to open a file, and signals an -error if that fails. If the open succeeds, access-file does nothing -else, and returns nil. - -*** The function insert-directory now signals an error if the specified -directory cannot be listed. - -** Changes in minibuffer input - -*** The functions read-buffer, read-variable, read-command, read-string -read-file-name, read-from-minibuffer and completing-read now take an -additional argument which specifies the default value. If this -argument is non-nil, it should be a string; that string is used in two -ways: - - It is returned if the user enters empty input. - It is available through the history command M-n. - -*** The functions read-string, read-from-minibuffer, -read-no-blanks-input and completing-read now take an additional -argument INHERIT-INPUT-METHOD. If this is non-nil, then the -minibuffer inherits the current input method and the setting of -enable-multibyte-characters from the previously current buffer. - -In an interactive spec, you can use M instead of s to read an -argument in this way. - -*** All minibuffer input functions discard text properties -from the text you enter in the minibuffer, unless the variable -minibuffer-allow-text-properties is non-nil. - -** Echo area features - -*** Clearing the echo area now runs the normal hook -echo-area-clear-hook. Note that the echo area can be used while the -minibuffer is active; in that case, the minibuffer is still active -after the echo area is cleared. - -*** The function current-message returns the message currently displayed -in the echo area, or nil if there is none. - -** Keyboard input features - -*** tty-erase-char is a new variable that reports which character was -set up as the terminal's erase character when time Emacs was started. - -*** num-nonmacro-input-events is the total number of input events -received so far from the terminal. It does not count those generated -by keyboard macros. - -** Frame-related changes - -*** make-frame runs the normal hook before-make-frame-hook just before -creating a frame, and just after creating a frame it runs the abnormal -hook after-make-frame-functions with the new frame as arg. - -*** The new hook window-configuration-change-hook is now run every time -the window configuration has changed. The frame whose configuration -has changed is the selected frame when the hook is run. - -*** Each frame now independently records the order for recently -selected buffers, in its buffer-list frame parameter, so that the -value of other-buffer is now based on the buffers recently displayed -in the selected frame. - -*** The value of the frame parameter vertical-scroll-bars -is now `left', `right' or nil. A non-nil value specifies -which side of the window to put the scroll bars on. - -** X Windows features - -*** You can examine X resources for other applications by binding -x-resource-class around a call to x-get-resource. The usual value of -x-resource-class is "Emacs", which is the correct value for Emacs. - -*** In menus, checkboxes and radio buttons now actually work. -The menu displays the current status of the box or button. - -*** The function x-list-fonts now takes an optional fourth argument -MAXIMUM which sets a limit on how many matching fonts to return. -A smaller value of MAXIMUM makes the function faster. - -If the only question is whether *any* font matches the pattern, -it is good to supply 1 for this argument. - -** Subprocess features - -*** A reminder: it is no longer necessary for subprocess filter -functions and sentinels to do save-match-data, because Emacs does this -automatically. - -*** The new function shell-command-to-string executes a shell command -and returns the output from the command as a string. - -*** The new function process-contact returns t for a child process, -and (HOSTNAME SERVICE) for a net connection. - -** An error in running pre-command-hook or post-command-hook -does clear the variable to nil. The documentation was wrong before. - -** In define-key-after, if AFTER is t, the new binding now always goes -at the end of the keymap. If the keymap is a menu, this means it -goes after the other menu items. - -** If you have a program that makes several changes in the same area -of the buffer, you can use the macro combine-after-change-calls -around that Lisp code to make it faster when after-change hooks -are in use. - -The macro arranges to call the after-change functions just once for a -series of several changes--if that seems safe. - -Don't alter the variables after-change-functions and -after-change-function within the body of a combine-after-change-calls -form. - -** If you define an abbrev (with define-abbrev) whose EXPANSION -is not a string, then the abbrev does not expand in the usual sense, -but its hook is still run. - -** Normally, the Lisp debugger is not used (even if you have enabled it) -for errors that are handled by condition-case. - -If you set debug-on-signal to a non-nil value, then the debugger is called -regardless of whether there is a handler for the condition. This is -useful for debugging problems that happen inside of a condition-case. - -This mode of operation seems to be unreliable in other ways. Errors that -are normal and ought to be handled, perhaps in timers or process -filters, will instead invoke the debugger. So don't say you weren't -warned. - -** The new variable ring-bell-function lets you specify your own -way for Emacs to "ring the bell". - -** If run-at-time's TIME argument is t, the action is repeated at -integral multiples of REPEAT from the epoch; this is useful for -functions like display-time. - -** You can use the function locate-library to find the precise file -name of a Lisp library. This isn't new, but wasn't documented before. - -** Commands for entering view mode have new optional arguments that -can be used from Lisp. Low-level entrance to and exit from view mode -is done by functions view-mode-enter and view-mode-exit. - -** batch-byte-compile-file now makes Emacs return a nonzero status code -if there is an error in compilation. - -** pop-to-buffer, switch-to-buffer-other-window and -switch-to-buffer-other-frame now accept an additional optional -argument NORECORD, much like switch-to-buffer. If it is non-nil, -they don't put the buffer at the front of the buffer list. - -** If your .emacs file leaves the *scratch* buffer non-empty, -Emacs does not display the startup message, so as to avoid changing -the *scratch* buffer. - -** The new function regexp-opt returns an efficient regexp to match a string. -The arguments are STRINGS and (optionally) PAREN. This function can be used -where regexp matching or searching is intensively used and speed is important, -e.g., in Font Lock mode. - -** The variable buffer-display-count is local to each buffer, -and is incremented each time the buffer is displayed in a window. -It starts at 0 when the buffer is created. - -** The new function compose-mail starts composing a mail message -using the user's chosen mail composition agent (specified with the -variable mail-user-agent). It has variants compose-mail-other-window -and compose-mail-other-frame. - -** The `user-full-name' function now takes an optional parameter which -can either be a number (the UID) or a string (the login name). The -full name of the specified user will be returned. - -** Lisp packages that load files of customizations, or any other sort -of user profile, should obey the variable init-file-user in deciding -where to find it. They should load the profile of the user name found -in that variable. If init-file-user is nil, meaning that the -q -option was used, then Lisp packages should not load the customization -files at all. - -** format-time-string now allows you to specify the field width -and type of padding. This works as in printf: you write the field -width as digits in the middle of a %-construct. If you start -the field width with 0, it means to pad with zeros. - -For example, %S normally specifies the number of seconds since the -minute; %03S means to pad this with zeros to 3 positions, %_3S to pad -with spaces to 3 positions. Plain %3S pads with zeros, because that -is how %S normally pads to two positions. - -** thing-at-point now supports a new kind of "thing": url. - -** imenu.el changes. - -You can now specify a function to be run when selecting an -item from menu created by imenu. - -An example of using this feature: if we define imenu items for the -#include directives in a C file, we can open the included file when we -select one of those items. - -* For older news, see the file ONEWS - ---------------------------------------------------------------------- Copyright information: -Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006 Free Software Foundation, Inc. +Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 + Free Software Foundation, Inc. Permission is granted to anyone to make or distribute verbatim copies of this document as received, in any medium, provided that the diff --git a/etc/ONEWS.2 b/etc/NEWS.1-17 index d9f75c278ed..0297c928b72 100644 --- a/etc/ONEWS.2 +++ b/etc/NEWS.1-17 @@ -1,8 +1,10 @@ GNU Emacs NEWS -- history of user-visible changes. 26-Mar-1986 -Copyright (C) 1986 Richard M. Stallman. +Copyright (C) 1985, 1986, 2006 Richard M. Stallman. See the end for copying conditions. -For older news, see the file ONEWS.1. +This file is about changes in emacs versions 1 through 17. + + Changes in Emacs 17 @@ -407,6 +409,7 @@ By default it is still "--text follows this line--". Just before each garbage collection, all but the last 30 elements of the command history are discarded. + Incompatible Lisp Programming Changes in Emacs 17 @@ -484,6 +487,7 @@ The functions `forward-to-word', `backward-to-word', `upcase-char', `mark-beginning-of-buffer' and `mark-end-of-buffer' have been removed. Their definitions can be found in file lisp/unused.el if you need them. + Upward Compatible Lisp Programming Changes in Emacs 17 @@ -804,6 +808,8 @@ a period in `modify-syntax-entry'. Backup suffixes of all kinds are now stripped from a file's name before searching `auto-mode-alist'. + + Changes in Emacs 16 @@ -1325,13 +1331,1187 @@ except when `-batch' has been specified. * Emacs can be built with output redirected to a file. This is because -batch (see above) is now used in building Emacs. + + + +Changes in Emacs 15 + +* Emacs now runs on Sun and Megatest 68000 systems; + also on at least one 16000 system running 4.2. + +* Emacs now alters the output-start and output-stop characters + to prevent C-s and C-q from being considered as flow control + by cretinous rlogin software in 4.2. + +* It is now possible convert Mocklisp code (for Gosling Emacs) to Lisp code + that can run in GNU Emacs. M-x convert-mocklisp-buffer + converts the contents of the current buffer from Mocklisp to + GNU Emacs Lisp. You should then save the converted buffer with C-x C-w + under a name ending in ".el" + + There are probably some Mocklisp constructs that are not handled. + If you encounter one, feel free to report the failure as a bug. + The construct will be handled in a future Emacs release, if that is not + not too hard to do. + + Note that lisp code converted from Mocklisp code will not necessarily + run as fast as code specifically written for GNU Emacs, nor will it use + the many features of GNU Emacs which are not present in Gosling's emacs. + (In particular, the byte-compiler (m-x byte-compile-file) knows little + about compilation of code directly converted from mocklisp.) + It is envisaged that old mocklisp code will be incrementally converted + to GNU lisp code, with M-x convert-mocklisp-buffer being the first + step in this process. + +* Control-x n (narrow-to-region) is now by default a disabled command. + + This means that, if you issue this command, it will ask whether + you really mean it. You have the opportunity to enable the + command permanently at that time, so you will not be asked again. + This will place the form "(put 'narrow-to-region 'disabled nil)" in your + .emacs file. + +* Tags now prompts for the tag table file name to use. + + All the tags commands ask for the tag table file name + if you have not yet specified one. + + Also, the command M-x visit-tag-table can now be used to + specify the tag table file name initially, or to switch + to a new tag table. + +* If truncate-partial-width-windows is non-nil (as it intially is), + all windows less than the full screen width (that is, + made by side-by-side splitting) truncate lines rather than continuing + them. + +* Emacs now checks for Lisp stack overflow to avoid fatal errors. + The depth in eval, apply and funcall may not exceed max-lisp-eval-depth. + The depth in variable bindings and unwind-protects may not exceed + max-specpdl-size. If either limit is exceeded, an error occurs. + You can set the limits to larger values if you wish, but if you make them + too large, you are vulnerable to a fatal error if you invoke + Lisp code that does infinite recursion. + +* New hooks find-file-hook and write-file-hook. + Both of these variables if non-nil should be functions of no arguments. + At the time they are called (current-buffer) will be the buffer being + read or written respectively. + + find-file-hook is called whenever a file is read into its own buffer, + such as by calling find-file, revert-buffer, etc. It is not called by + functions such as insert-file which do not read the file into a buffer of + its own. + find-file-hook is called after the file has been read in and its + local variables (if any) have been processed. + + write-file-hook is called just before writing out a file from a buffer. + +* The initial value of shell-prompt-pattern is now "^[^#$%>]*[#$%>] *" + +* If the .emacs file sets inhibit-startup-message to non-nil, + the messages normally printed by Emacs at startup time + are inhibited. + +* Facility for run-time conditionalization on the basis of emacs features. + + The new variable features is a list of symbols which represent "features" + of the executing emacs, for use in run-time conditionalization. + + The function featurep of one argument may be used to test for the + presence of a feature. It is just the same as + (not (null (memq FEATURE features))) where FEATURE is its argument. + For example, (if (featurep 'magic-window-hack) + (transmogrify-window 'vertical) + (split-window-vertically)) + + The function provide of one argument "announces" that FEATURE is present. + It is much the same as (if (not (featurep FEATURE)) + (setq features (cons FEATURE features))) + + The function require with arguments FEATURE and FILE-NAME loads FILE-NAME + (which should contain the form (provide FEATURE)) unless FEATURE is present. + It is much the same as (if (not (featurep FEATURE)) + (progn (load FILE-NAME) + (if (not featurep FEATURE) (error ...)))) + FILE-NAME is optional and defaults to FEATURE. + +* New function load-average. + + This returns a list of three integers, which are + the current 1 minute, 5 minute and 15 minute load averages, + each multiplied by a hundred (since normally they are floating + point numbers). + +* Per-terminal libraries loaded automatically. + + Emacs when starting up on terminal type T automatically loads + a library named term-T. T is the value of the TERM environment variable. + Thus, on terminal type vt100, Emacs would do (load "term-vt100" t t). + Such libraries are good places to set the character translation table. + + It is a bad idea to redefine lots of commands in a per-terminal library, + since this affects all users. Instead, define a command to do the + redefinitions and let the user's init file, which is loaded later, + call that command or not, as the user prefers. + +* Programmer's note: detecting killed buffers. + + Buffers are eliminated by explicitly killing them, using + the function kill-buffer. This does not eliminate or affect + the pointers to the buffer which may exist in list structure. + If you have a pointer to a buffer and wish to tell whether + the buffer has been killed, use the function buffer-name. + It returns nil on a killed buffer, and a string on a live buffer. + +* New ways to access the last command input character. + + The function last-key-struck, which used to return the last + input character that was read by command input, is eliminated. + Instead, you can find this information as the value of the + variable last-command-char. (This variable used to be called + last-key). + + Another new variable, last-input-char, holds the last character + read from the command input stream regardless of what it was + read for. last-input-char and last-command-char are different + only inside a command that has called read-char to read input. + +* The new switch -kill causes Emacs to exit after processing the + preceding command line arguments. Thus, + emacs -l lib data -e do-it -kill + means to load lib, find file data, call do-it on no arguments, + and then exit. + +* The config.h file has been modularized. + + Options that depend on the machine you are running on are defined + in a file whose name starts with "m-", such as m-vax.h. + Options that depend on the operating system software version you are + running on are defined in a file whose name starts with "s-", + such as s-bsd4.2.h. + + config.h includes one m- file and one s- file. It also defines a + few other options whose values do not follow from the machine type + and system type being used. Installers normally will have to + select the correct m- and s- files but will never have to change their + contents. + +* Termcap AL and DL strings are understood. + + If the termcap entry defines AL and DL strings, for insertion + and deletion of multiple lines in one blow, Emacs now uses them. + This matters most on certain bit map display terminals for which + scrolling is comparatively slow. + +* Bias against scrolling screen far on fast terminals. + + Emacs now prefers to redraw a few lines rather than + shift them a long distance on the screen, when the terminal is fast. + +* New major mode, mim-mode. + + This major mode is for editing MDL code. Perhaps a MDL + user can explain why it is not called mdl-mode. + You must load the library mim-mode explicitly to use this. + +* GNU documentation formatter `texinfo'. + + The `texinfo' library defines a format for documentation + files which can be passed through Tex to make a printed manual + or passed through texinfo to make an Info file. Texinfo is + documented fully by its own Info file; compare this file + with its source, texinfo.texinfo, for additional guidance. + + All documentation files for GNU utilities should be written + in texinfo input format. + + Tex processing of texinfo files requires the Botex macro package. + This is not ready for distribution yet, but will appear at + a later time. + +* New function read-from-string (emacs 15.29) + + read-from-string takes three arguments: a string to read from, + and optionally start and end indices which delimit a substring + from which to read. (They default to 0 and the length of the string, + respectively.) + + This function returns a cons cell whose car is the object produced + by reading from the string and whose cdr is a number giving the + index in the string of the first character not read. That index may + be passed as the second argument to a later call to read-from-string + to read the next form represented by the string. + + In addition, the function read now accepts a string as its argument. + In this case, it calls read-from-string on the whole string, and + returns the car of the result. (ie the actual object read.) + + + +Changes in Emacs 14 + +* Completion now prints various messages such as [Sole Completion] + or [Next Character Not Unique] to describe the results obtained. + These messages appear after the text in the minibuffer, and remain + on the screen until a few seconds go by or you type a key. + +* The buffer-read-only flag is implemented. + Setting or binding this per-buffer variable to a non-nil value + makes illegal any operation which would modify the textual content of + the buffer. (Such operations signal a buffer-read-only error) + The read-only state of a buffer may be altered using toggle-read-only + (C-x C-q) + The buffers used by Rmail, Dired, Rnews, and Info are now read-only + by default to prevent accidental damage to the information in those + buffers. + +* Functions car-safe and cdr-safe. + These functions are like car and cdr when the argument is a cons. + Given an argument not a cons, car-safe always returns nil, with + no error; the same for cdr-safe. + +* The new function user-real-login-name returns the name corresponding + to the real uid of the Emacs process. This is usually the same + as what user-login-name returns; however, when Emacs is invoked + from su, user-real-login-name returns "root" but user-login-name + returns the name of the user who invoked su. + + + +Changes in Emacs 13 + +* There is a new version numbering scheme. + + What used to be the first version number, which was 1, + has been discarded since it does not seem that I need three + levels of version number. + + However, a new third version number has been added to represent + changes by user sites. This number will always be zero in + Emacs when I distribute it; it will be incremented each time + Emacs is built at another site. + +* There is now a reader syntax for Meta characters: + \M-CHAR means CHAR or'ed with the Meta bit. For example: + + ?\M-x is (+ ?x 128) + ?\M-\n is (+ ?\n 128) + ?\M-\^f is (+ ?\^f 128) + + This syntax can be used in strings too. Note, however, that + Meta characters are not meaningful in key sequences being passed + to define-key or lookup-key; you must use ESC characters (\e) + in them instead. + + ?\C- can be used likewise for control characters. (13.9) + +* Installation change + The string "../lisp" now adds to the front of the load-path + used for searching for Lisp files during Emacs initialization. + It used to replace the path specified in paths.h entirely. + Now the directory ../lisp is searched first and the directoris + specified in paths.h are searched afterward. + + + +Changes in Emacs 1.12 + +* There is a new installation procedure. + See the file INSTALL that comes in the top level + directory in the tar file or tape. + +* The Meta key is now supported on terminals that have it. + This is a shift key which causes the high bit to be turned on + in all input characters typed while it is held down. + + read-char now returns a value in the range 128-255 if + a Meta character is typed. When interpreted as command + input, a Meta character is equivalent to a two character + sequence, the meta prefix character followed by the un-metized + character (Meta-G unmetized is G). + + The meta prefix character + is specified by the value of the variable meta-prefix-char. + If this character (normally Escape) has been redefined locally + with a non-prefix definition (such as happens in completing + minibuffers) then the local redefinition is suppressed when + the character is not the last one in a key sequence. + So the local redefinition is effective if you type the character + explicitly, but not effective if the character comes from + the use of the Meta key. + +* `-' is no longer a completion command in the minibuffer. + It is an ordinary self-inserting character. + +* The list load-path of directories load to search for Lisp files + is now controlled by the EMACSLOADPATH environment variable +[[ Note this was originally EMACS-LOAD-PATH and has been changed + again; sh does not deal properly with hyphens in env variable names]] + rather than the EPATH environment variable. This is to avoid + conflicts with other Emacses. + + While Emacs is being built initially, the load-path + is now just ("../lisp"), ignoring paths.h. It does not + ignore EMACSLOADPATH, however; you should avoid having + this variable set while building Emacs. + +* You can now specify a translation table for keyboard + input characters, as a way of exchanging or substituting + keys on the keyboard. + + If the value of keyboard-translate-table is a string, + every character received from the keyboard is used as an + index in that string, and the character at that index in + the string is used as input instead of what was actually + typed. If the actual input character is >= the length of + the string, it is used unchanged. + + One way this feature can be used is to fix bad keyboard + designes. For example, on some terminals, Delete is + Shift-Underscore. Since Delete is a more useful character + than Underscore, it is an improvement to make the unshifted + character Delete and the shifted one Underscore. This can + be done with + + ;; First make a translate table that does the identity translation. + (setq keyboard-translate-table (make-string 128 0)) + (let ((i 0)) + (while (< i 128) + (aset keyboard-translate-table i i) + (setq i (1+ i)))) + + ;; Now alter translations of some characters. + (aset keyboard-translate-table ?\_ ?\^?) + (aset keyboard-translate-table ?\^? ?\_) + + If your terminal has a Meta key and can therefore send + codes up to 255, Meta characters are translated through + elements 128 through 255 of the translate table, and therefore + are translated independently of the corresponding non-Meta + characters. You must therefore establish translations + independently for the Meta characters if you want them too: + + ;; First make a translate table that does the identity translation. + (setq keyboard-translate-table (make-string 256 0)) + (let ((i 0)) + (while (< i 256) + (aset keyboard-translate-table i i) + (setq i (1+ i)))) + + ;; Now alter translations of some characters. + (aset keyboard-translate-table ?\_ ?\^?) + (aset keyboard-translate-table ?\^? ?\_) + + ;; Now alter translations of some Meta characters. + (aset keyboard-translate-table (+ 128 ?\_) (+ 128 ?\^?)) + (aset keyboard-translate-table (+ 128 ?\^?) (+ 128 ?\_)) + +* (process-kill-without-query PROCESS) + +This marks the process so that, when you kill Emacs, +you will not on its account be queried about active subprocesses. + + + +Changes in Emacs 1.11 + +* The commands C-c and C-z have been interchanged, + for greater compatibility with normal Unix usage. + C-z now runs suspend-emacs and C-c runs exit-recursive-edit. + +* The value returned by file-name-directory now ends + with a slash. (file-name-directory "foo/bar") => "foo/". + This avoids confusing results when dealing with files + in the root directory. + + The value of the per-buffer variable default-directory + is also supposed to have a final slash now. + +* There are now variables to control the switches passed to + `ls' by the C-x C-d command (list-directory). + list-directory-brief-switches is a string, initially "-CF", + used for brief listings, and list-directory-verbose-switches + is a string, initially "-l", used for verbose ones. + +* For Ann Arbor Ambassador terminals, the termcap "ti" string + is now used to initialize the screen geometry on entry to Emacs, + and the "te" string is used to set it back on exit. + If the termcap entry does not define the "ti" or "te" string, + Emacs does what it used to do. + + + +Changes in Emacs 1.10 + +* GNU Emacs has been made almost 1/3 smaller. + It now dumps out as only 530kbytes on Vax 4.2bsd. + +* The term "checkpoint" has been replaced by "auto save" + throughout the function names, variable names and documentation + of GNU Emacs. + +* The function load now tries appending ".elc" and ".el" + to the specified filename BEFORE it tries the filename + without change. + +* rmail now makes the mode line display the total number + of messages and the current message number. + The "f" command now means forward a message to another user. + The command to search through all messages for a string is now "F". + The "u" command now means to move back to the previous + message and undelete it. To undelete the selected message, use Meta-u. + +* The hyphen character is now equivalent to a Space while + in completing minibuffers. Both mean to complete an additional word. + +* The Lisp function error now takes args like format + which are used to construct the error message. + +* Redisplay will refuse to start its display at the end of the buffer. + It will pick a new place to display from, rather than use that. + +* The value returned by garbage-collect has been changed. + Its first element is no longer a number but a cons, + whose car is the number of cons cells now in use, + and whose cdr is the number of cons cells that have been + made but are now free. + The second element is similar but describes symbols rather than cons cells. + The third element is similar but describes markers. + +* The variable buffer-name has been eliminated. + The function buffer-name still exists. This is to prevent + user programs from changing buffer names without going + through the rename-buffer function. + + + +Changes in Emacs 1.9 + +* When a fill prefix is in effect, paragraphs are started + or separated by lines that do not start with the fill prefix. + Also, a line which consists of the fill prefix followed by + white space separates paragraphs. + +* C-x C-v runs the new function find-alternate-file. + It finds the specified file, switches to that buffer, + and kills the previous current buffer. (It requires + confirmation if that buffer had changes.) This is + most useful after you find the wrong file due to a typo. + +* Exiting the minibuffer moves the cursor to column 0, + to show you that it has really been exited. + +* Meta-g (fill-region) now fills each paragraph in the + region individually. To fill the region as if it were + a single paragraph (for when the paragraph-delimiting mechanism + does the wrong thing), use fill-region-as-paragraph. + +* Tab in text mode now runs the function tab-to-tab-stop. + A new mode called indented-text-mode is like text-mode + except that in it Tab runs the function indent-relative, + which indents the line under the previous line. + If auto fill is enabled while in indented-text-mode, + the new lines that it makes are indented. + +* Functions kill-rectangle and yank-rectangle. + kill-rectangle deletes the rectangle specified by dot and mark + (or by two arguments) and saves it in the variable killed-rectangle. + yank-rectangle inserts the rectangle in that variable. + + Tab characters in a rectangle being saved are replaced + by spaces in such a way that their appearance will + not be changed if the rectangle is later reinserted + at a different column position. + +* `+' in a regular expression now means + to repeat the previous expression one or more times. + `?' means to repeat it zero or one time. + They are in all regards like `*' except for the + number of repetitions they match. + + \< in a regular expression now matches the null string + when it is at the beginning of a word; \> matches + the null string at the end of a word. + +* C-x p narrows the buffer so that only the current page + is visible. + +* C-x ) with argument repeats the kbd macro just + defined that many times, counting the definition + as one repetition. + +* C-x ( with argument begins defining a kbd macro + starting with the last one defined. It executes that + previous kbd macro initially, just as if you began + by typing it over again. + +* C-x q command queries the user during kbd macro execution. + With prefix argument, enters recursive edit, + reading keyboard commands even within a kbd macro. + You can give different commands each time the macro executes. + Without prefix argument, reads a character. Your options are: + Space -- execute the rest of the macro. + Delete -- skip the rest of the macro; start next repetition. + C-d -- skip rest of the macro and don't repeat it any more. + C-r -- enter a recursive edit, then on exit ask again for a character + C-l -- redisplay screen and ask again." + +* write-kbd-macro and append-kbd-macro are used to save + a kbd macro definition in a file (as Lisp code to + redefine the macro when the file is loaded). + These commands differ in that write-kbd-macro + discards the previous contents of the file. + If given a prefix argument, both commands + record the keys which invoke the macro as well as the + macro's definition. + +* The variable global-minor-modes is used to display + strings in the mode line of all buffers. It should be + a list of elements thaht are conses whose cdrs are strings + to be displayed. This complements the variable + minor-modes, which has the same effect but has a separate + value in each buffer. + +* C-x = describes horizontal scrolling in effect, if any. + +* Return now auto-fills the line it is ending, in auto fill mode. + Space with zero as argument auto-fills the line before it + just like Space without an argument. + + + +Changes in Emacs 1.8 + +This release mostly fixes bugs. There are a few new features: + +* apropos now sorts the symbols before displaying them. + Also, it returns a list of the symbols found. + + apropos now accepts a second arg PRED which should be a function + of one argument; if PRED is non-nil, each symbol is tested + with PRED and only symbols for which PRED returns non-nil + appear in the output or the returned list. + + If the third argument to apropos is non-nil, apropos does not + display anything; it merely returns the list of symbols found. + + C-h a now runs the new function command-apropos rather than + apropos, and shows only symbols with definitions as commands. + +* M-x shell sends the command + if (-f ~/.emacs_NAME)source ~/.emacs_NAME + invisibly to the shell when it starts. Here NAME + is replaced by the name of shell used, + as it came from your ESHELL or SHELL environment variable + but with directory name, if any, removed. + +* M-, now runs the command tags-loop-continue, which is used + to resume a terminated tags-search or tags-query-replace. + + + +Changes in Emacs 1.7 + +It's Beat CCA Week. + +* The initial buffer is now called "*scratch*" instead of "scratch", + so that all buffer names used automatically by Emacs now have *'s. + +* Undo information is now stored separately for each buffer. + The Undo command (C-x u) always applies to the current + buffer only. + + C-_ is now a synonym for C-x u. + + (buffer-flush-undo BUFFER) causes undo information not to + be kept for BUFFER, and frees the space that would have + been used to hold it. In any case, no undo information is + kept for buffers whose names start with spaces. (These + buffers also do not appear in the C-x C-b display.) + +* Rectangle operations are now implemented. + C-x r stores the rectangle described by dot and mark + into a register; it reads the register name from the keyboard. + C-x g, the command to insert the contents of a register, + can be used to reinsert the rectangle elsewhere. + + Other rectangle commands include + open-rectangle: + insert a blank rectangle in the position and size + described by dot and mark, at its corners; + the existing text is pushed to the right. + clear-rectangle: + replace the rectangle described by dot ane mark + with blanks. The previous text is deleted. + delete-rectangle: + delete the text of the specified rectangle, + moving the text beyond it on each line leftward. + +* Side-by-side windows are allowed. Use C-x 5 to split the + current window into two windows side by side. + C-x } makes the selected window ARG columns wider at the + expense of the windows at its sides. C-x { makes the selected + window ARG columns narrower. An argument to C-x 5 specifies + how many columns to give to the leftmost of the two windows made. + + C-x 2 now accepts a numeric argument to specify the number of + lines to give to the uppermost of the two windows it makes. + +* Horizontal scrolling of the lines in a window is now implemented. + C-x < (scroll-left) scrolls all displayed lines left, + with the numeric argument (default 1) saying how far to scroll. + When the window is scrolled left, some amount of the beginning + of each nonempty line is replaced by an "$". + C-x > scrolls right. If a window has no text hidden at the left + margin, it cannot be scrolled any farther right than that. + When nonzero leftwards scrolling is in effect in a window. + lines are automatically truncated at the window's right margin + regardless of the value of the variable truncate-lines in the + buffer being displayed. + +* C-x C-d now uses the default output format of `ls', + which gives just file names in multiple columns. + C-u C-x C-d passes the -l switch to `ls'. + +* C-t at the end of a line now exchanges the two preceding characters. + + All the transpose commands now interpret zero as an argument + to mean to transpose the textual unit after or around dot + with the one after or around the mark. + +* M-! executes a shell command in an inferior shell + and displays the output from it. With a prefix argument, + it inserts the output in the current buffer after dot + and sets the mark after the output. The shell command + gets /dev/null as its standard input. + + M-| is like M-! but passes the contents of the region + as input to the shell command. A prefix argument makes + the output from the command replace the contents of the region. + +* The mode line will now say "Def" after the major mode + while a keyboard macro is being defined. + +* The variable fill-prefix is now used by Meta-q. + Meta-q removes the fill prefix from lines that start with it + before filling, and inserts the fill prefix on each line + after filling. + + The command C-x . sets the fill prefix equal to the text + on the current line before dot. + +* The new command Meta-j (indent-new-comment-line), + is like Linefeed (indent-new-line) except when dot is inside a comment; + in that case, Meta-j inserts a comment starter on the new line, + indented under the comment starter above. It also inserts + a comment terminator at the end of the line above, + if the language being edited calls for one. + +* Rmail should work correctly now, and has some C-h m documentation. + + + +Changes in Emacs 1.6 + +* save-buffers-kill-emacs is now on C-x C-c + while C-x C-z does suspend-emacs. This is to make + C-x C-c like the normal Unix meaning of C-c + and C-x C-z linke the normal Unix meaning of C-z. + +* M-ESC (eval-expression) is now a disabled command by default. + This prevents users who type ESC ESC accidentally from + getting confusing results. Put + (put 'eval-expression 'disabled nil) + in your ~/.emacs file to enable the command. + +* Self-inserting text is grouped into bunches for undoing. + Each C-x u command undoes up to 20 consecutive self-inserting + characters. + +* Help f now uses as a default the function being called + in the innermost Lisp expression that dot is in. + This makes it more convenient to use while writing + Lisp code to run in Emacs. + (If the text around dot does not appear to be a call + to a Lisp function, there is no default.) + + Likewise, Help v uses the symbol around or before dot + as a default, if that is a variable name. + +* Commands that read filenames now insert the default + directory in the minibuffer, to become part of your input. + This allows you to see what the default is. + You may type a filename which goes at the end of the + default directory, or you may edit the default directory + as you like to create the input you want to give. + You may also type an absolute pathname (starting with /) + or refer to a home directory (input starting with ~) + after the default; the presence of // or /~ causes + everything up through the slash that precedes your + type-in to be ignored. + + Returning the default directory without change, + including the terminating slash, requests the use + of the default file name (usually the visited file's name). + + Set the variable insert-default-directory to nil + to turn off this feature. + +* M-x shell now uses the environment variable ESHELL, + if it exists, as the file name of the shell to run. + If there is no ESHELL variable, the SHELL variable is used. + This is because some shells do not work properly as inferiors + of Emacs (or anything like Emacs). + +* A new variable minor-modes now exists, with a separate value + in each buffer. Its value should be an alist of elements + (MODE-FUNCTION-SYMBOL . PRETTY-NAME-STRING), one for each + minor mode that is turned on in the buffer. The pretty + name strings are displayed in the mode line after the name of the + major mode (with spaces between them). The mode function + symbols should be symbols whose function definitions will + turn on the minor mode if given 1 as an argument; they are present + so that Help m can find their documentation strings. + +* The format of tag table files has been changed. + The new format enables Emacs to find tags much faster. + + A new program, etags, exists to make the kind of + tag table that Emacs wants. etags is invoked just + like ctags; in fact, if you give it any switches, + it does exactly what ctags would do. Give it the + empty switch ("-") to make it act like ctags with no switches. + + etags names the tag table file "TAGS" rather than "tags", + so that these tag tables and the standard Unix ones + can coexist. + + The tags library can no longer use standard ctags-style + tag tables files. + +* The file of Lisp code Emacs reads on startup is now + called ~/.emacs rather than ~/.emacs_pro. + +* copy-file now gives the copied file the same mode bits + as the original file. + +* Output from a process inserted into the process's buffer + no longer sets the buffer's mark. Instead it sets a + marker associated with the process to point to the end + of the inserted text. You can access this marker with + (process-mark PROCESS) + and then either examine its position with marker-position + or set its position with set-marker. + +* completing-read takes a new optional fifth argument which, + if non-nil, should be a string of text to insert into + the minibuffer before reading user commands. + +* The Lisp function elt now exists: + (elt ARRAY N) is like (aref ARRAY N), + (elt LIST N) is like (nth N LIST). + +* rplaca is now a synonym for setcar, and rplacd for setcdr. + eql is now a synonym for eq; it turns out that the Common Lisp + distinction between eq and eql is insignificant in Emacs. + numberp is a new synonym for integerp. + +* auto-save has been renamed to auto-save-mode. + +* Auto save file names for buffers are now created by the + function make-auto-save-file-name. This is so you can + redefine that function to change the way auto save file names + are chosen. + +* expand-file-name no longer discards a final slash. + (expand-file-name "foo" "/lose") => "/lose/foo" + (expand-file-name "foo/" "/lose") => "/lose/foo/" + + Also, expand-file-name no longer substitutes $ constructs. + A new function substitute-in-file-name does this. Reading + a file name with read-file-name or the `f' or`F' option + of interactive calling uses substitute-in-file-name + on the file name that was read and returns the result. + + All I/O primitives including insert-file-contents and + delete-file call expand-file-name on the file name supplied. + This change makes them considerably faster in the usual case. + +* Interactive calling spec strings allow the new code letter 'D' + which means to read a directory name. It is like 'f' except + that the default if the user makes no change in the minibuffer + is to return the current default directory rather than the + current visited file name. + + + +Changes in Emacs 1.5 + +* suspend-emacs now accepts an optional argument + which is a string to be stuffed as terminal input + to be read by Emacs's superior shell after Emacs exits. + + A library called ledit exists which uses this feature + to transmit text to a Lisp job running as a sibling of + Emacs. + +* If find-file is given the name of a directory, + it automatically invokes dired on that directory + rather than reading in the binary data that make up + the actual contents of the directory according to Unix. + +* Saving an Emacs buffer now preserves the file modes + of any previously existing file with the same name. + This works using new Lisp functions file-modes and + set-file-modes, which can be used to read or set the mode + bits of any file. + +* The Lisp function cond now exists, with its traditional meaning. + +* defvar and defconst now permit the documentation string + to be omitted. defvar also permits the initial value + to be omitted; then it acts only as a comment. + + + +Changes in Emacs 1.4 + +* Auto-filling now normally indents the new line it creates + by calling indent-according-to-mode. This function, meanwhile, + has in Fundamental and Text modes the effect of making the line + have an indentation of the value of left-margin, a per-buffer variable. + + Tab no longer precisely does indent-according-to-mode; + it does that in all modes that supply their own indentation routine, + but in Fundamental, Text and allied modes it inserts a tab character. + +* The command M-x grep now invokes grep (on arguments + supplied by the user) and reads the output from grep + asynchronously into a buffer. The command C-x ` can + be used to move to the lines that grep has found. + This is an adaptation of the mechanism used for + running compilations and finding the loci of error messages. + + You can now use C-x ` even while grep or compilation + is proceeding; as more matches or error messages arrive, + C-x ` will parse them and be able to find them. + +* M-x mail now provides a command to send the message + and "exit"--that is, return to the previously selected + buffer. It is C-z C-z. + +* Tab in C mode now tries harder to adapt to all indentation styles. + If the line being indented is a statement that is not the first + one in the containing compound-statement, it is aligned under + the beginning of the first statement. + +* The functions screen-width and screen-height return the + total width and height of the screen as it is now being used. + set-screen-width and set-screen-height tell Emacs how big + to assume the screen is; they each take one argument, + an integer. + +* The Lisp function 'function' now exists. function is the + same as quote, except that it serves as a signal to the + Lisp compiler that the argument should be compiled as + a function. Example: + (mapcar (function (lambda (x) (+ x 5))) list) + +* The function set-key has been renamed to global-set-key. + undefine-key and local-undefine-key has been renamed to + global-unset-key and local-unset-key. + +* Emacs now collects input from asynchronous subprocesses + while waiting in the functions sleep-for and sit-for. + +* Shell mode's Newline command attempts to distinguish subshell + prompts from user input when issued in the middle of the buffer. + It no longer reexecutes from dot to the end of the line; + it reeexecutes the entire line minus any prompt. + The prompt is recognized by searching for the value of + shell-prompt-pattern, starting from the beginning of the line. + Anything thus skipped is not reexecuted. + + -For older news, see the file ONEWS.1. +Changes in Emacs 1.3 +* An undo facility exists now. Type C-x u to undo a batch of + changes (usually one command's changes, but some commands + such as query-replace divide their changes into multiple + batches. You can repeat C-x u to undo further. As long + as no commands other than C-x u intervene, each one undoes + another batch. A numeric argument to C-x u acts as a repeat + count. + + If you keep on undoing, eventually you may be told that + you have used up all the recorded undo information. + Some actions, such as reading in files, discard all + undo information. + + The undo information is not currently stored separately + for each buffer, so it is mainly good if you do something + totally spastic. [This has since been fixed.] + +* A learn-by-doing tutorial introduction to Emacs now exists. + Type C-h t to enter it. + +* An Info documentation browser exists. Do M-x info to enter it. + It contains a tutorial introduction so that no more documentation + is needed here. As of now, the only documentation in it + is that of Info itself. + +* Help k and Help c are now different. Help c prints just the + name of the function which the specified key invokes. Help k + prints the documentation of the function as well. + +* A document of the differences between GNU Emacs and Twenex Emacs + now exists. It is called DIFF, in the same directory as this file. + +* C mode can now indent comments better, including multi-line ones. + Meta-Control-q now reindents comment lines within the expression + being aligned. + +* Insertion of a close-parenthesis now shows the matching open-parenthesis + even if it is off screen, by printing the text following it on its line + in the minibuffer. + +* A file can now contain a list of local variable values + to be in effect when the file is edited. See the file DIFF + in the same directory as this file for full details. + +* A function nth is defined. It means the same thing as in Common Lisp. + +* The function install-command has been renamed to set-key. + It now takes the key sequence as the first argument + and the definition for it as the second argument. + Likewise, local-install-command has been renamed to local-set-key. + + + +Changes in Emacs 1.2 + +* A Lisp single-stepping and debugging facility exists. + To cause the debugger to be entered when an error + occurs, set the variable debug-on-error non-nil. + + To cause the debugger to be entered whenever function foo + is called, do (debug-on-entry 'foo). To cancel this, + do (cancel-debug-on-entry 'foo). debug-on-entry does + not work for primitives (written in C), only functions + written in Lisp. Most standard Emacs commands are in Lisp. + + When the debugger is entered, the selected window shows + a buffer called " *Backtrace" which displays a series + of stack frames, most recently entered first. For each + frame, the function name called is shown, usually followed + by the argument values unless arguments are still being + calculated. At the beginning of the buffer is a description + of why the debugger was entered: function entry, function exit, + error, or simply that the user called the function `debug'. + + To exit the debugger and return to top level, type `q'. + + In the debugger, you can evaluate Lisp expressions by + typing `e'. This is equivalent to `M-ESC'. + + When the debugger is entered due to an error, that is + all you can do. When it is entered due to function entry + (such as, requested by debug-on-entry), you have two + options: + Continue execution and reenter debugger after the + completion of the function being entered. Type `c'. + Continue execution but enter the debugger before + the next subexpression. Type `d'. + + You will see that some stack frames are marked with *. + This means the debugger will be entered when those + frames exit. You will see the value being returned + in the first line of the backtrace buffer. Your options: + Continue execution, and return that value. Type `c'. + Continue execution, and return a specified value. Type `r'. + + You can mark a frame to enter the debugger on exit + with the `b' command, or clear such a mark with `u'. + +* Lisp macros now exist. + For example, you can write + (defmacro cadr (arg) (list 'car (list 'cdr arg))) + and then the expression + (cadr foo) + will expand into + (car (cdr foo)) + + + +Changes in Emacs 1.1 + +* The initial buffer is now called "scratch" and is in a + new major mode, Lisp Interaction mode. This mode is + intended for typing Lisp expressions, evaluating them, + and having the values printed into the buffer. + + Type Linefeed after a Lisp expression, to evaluate the + expression and have its value printed into the buffer, + advancing dot. + + The other commands of Lisp mode are available. + +* The C-x C-e command for evaluating the Lisp expression + before dot has been changed to print the value in the + minibuffer line rather than insert it in the buffer. + A numeric argument causes the printed value to appear + in the buffer instead. + +* In Lisp mode, the command M-C-x evaluates the defun + containing or following dot. The value is printed in + the minibuffer. + +* The value of a Lisp expression evaluated using M-ESC + is now printed in the minibuffer. + +* M-q now runs fill-paragraph, independent of major mode. + +* C-h m now prints documentation on the current buffer's + major mode. What it prints is the documentation of the + major mode name as a function. All major modes have been + equipped with documentation that describes all commands + peculiar to the major mode, for this purpose. + +* You can display a Unix manual entry with + the M-x manual-entry command. + +* You can run a shell, displaying its output in a buffer, + with the M-x shell command. The Return key sends input + to the subshell. Output is printed inserted automatically + in the buffer. Commands C-c, C-d, C-u, C-w and C-z are redefined + for controlling the subshell and its subjobs. + "cd", "pushd" and "popd" commands are recognized as you + enter them, so that the default directory of the Emacs buffer + always remains the same as that of the subshell. + +* C-x $ (that's a real dollar sign) controls line-hiding based + on indentation. With a numeric arg N > 0, it causes all lines + indented by N or more columns to become invisible. + They are, effectively, tacked onto the preceding line, where + they are represented by " ..." on the screen. + (The end of the preceding visible line corresponds to a + screen cursor position before the "...". Anywhere in the + invisible lines that follow appears on the screen as a cursor + position after the "...".) + Currently, all editing commands treat invisible lines just + like visible ones, except for C-n and C-p, which have special + code to count visible lines only. + C-x $ with no argument turns off this mode, which in any case + is remembered separately for each buffer. + +* Outline mode is another form of selective display. + It is a major mode invoked with M-x outline-mode. + It is intended for editing files that are structured as + outlines, with heading lines (lines that begin with one + or more asterisks) and text lines (all other lines). + The number of asterisks in a heading line are its level; + the subheadings of a heading line are all following heading + lines at higher levels, until but not including the next + heading line at the same or a lower level, regardless + of intervening text lines. + + In outline mode, you have commands to hide (remove from display) + or show the text or subheadings under each heading line + independently. Hidden text or subheadings are invisibly + attached to the end of the preceding heading line, so that + if you kill the hading line and yank it back elsewhere + all the invisible lines accompany it. + + All editing commands treat hidden outline-mode lines + as part of the preceding visible line. + +* C-x C-z runs save-buffers-kill-emacs + offers to save each file buffer, then exits. + +* C-c's function is now called suspend-emacs. + +* The command C-x m runs mail, which switches to a buffer *mail* + and lets you compose a message to send. C-x 4 m runs mail in + another window. Type C-z C-s in the mail buffer to send the + message according to what you have entered in the buffer. + + You must separate the headers from the message text with + an empty line. + +* You can now dired partial directories (specified with names + containing *'s, etc, all processed by the shell). Also, you + can dired more than one directory; dired names the buffer + according to the filespec or directory name. Reinvoking + dired on a directory already direded just switches back to + the same directory used last time; do M-x revert if you want + to read in the current contents of the directory. + + C-x d runs dired, and C-x 4 d runs dired in another window. + + C-x C-d (list-directory) also allows partial directories now. + + +Lisp programming changes + +* t as an output stream now means "print to the minibuffer". + If there is already text in the minibuffer printed via t + as an output stream, the new text is appended to the old + (or is truncated and lost at the margin). If the minibuffer + contains text put there for some other reason, it is cleared + first. + + t is now the top-level value of standard-output. + + t as an input stream now means "read via the minibuffer". + The minibuffer is used to read a line of input, with editing, + and this line is then parsed. Any excess not used by `read' + is ignored; each `read' from t reads fresh input. + t is now the top-level value of standard-input. + +* A marker may be used as an input stream or an output stream. + The effect is to grab input from where the marker points, + advancing it over the characters read, or to insert output + at the marker and advance it. + +* Output from an asynchronous subprocess is now inserted at + the end of the associated buffer, not at the buffer's dot, + and the buffer's mark is set to the end of the inserted output + each time output is inserted. + +* (pos-visible-in-window-p POS WINDOW) + returns t if position POS in WINDOW's buffer is in the range + that is being displayed in WINDOW; nil if it is scrolled + vertically out of visibility. + + If display in WINDOW is not currently up to date, this function + calculates carefully whether POS would appear if display were + done immediately based on the current (window-start WINDOW). + + POS defaults to (dot), and WINDOW to (selected-window). + +* Variable buffer-alist replaced by function (buffer-list). + The actual alist of buffers used internally by Emacs is now + no longer accessible, to prevent the user from crashing Emacs + by modifying it. The function buffer-list returns a list + of all existing buffers. Modifying this list cannot hurt anything + as a new list is constructed by each call to buffer-list. + +* load now takes an optional third argument NOMSG which, if non-nil, + prevents load from printing a message when it starts and when + it is done. + +* byte-recompile-directory is a new function which finds all + the .elc files in a directory, and regenerates each one which + is older than the corresponding .el (Lisp source) file. + + + ---------------------------------------------------------------------- Copyright information: -Copyright (C) 1985 Richard M. Stallman +Copyright (C) 1985, 1986, 2006 Richard M. Stallman Permission is granted to anyone to make or distribute verbatim copies of this document as received, in any medium, provided that the diff --git a/etc/ONEWS.3 b/etc/NEWS.18 index f7f36c4b1d1..9d68613d1ca 100644 --- a/etc/ONEWS.3 +++ b/etc/NEWS.18 @@ -1,8 +1,10 @@ GNU Emacs NEWS -- history of user-visible changes. 17-Aug-1988 -Copyright (C) 1988 Free Software Foundation, Inc. +Copyright (C) 1988, 2006 Free Software Foundation, Inc. See the end for copying conditions. -For older news, see the file ONEWS.2. +This file is about changes in emacs version 18. + + Changes in version 18.52. @@ -111,6 +113,8 @@ The second is used with the window system: it iconifies the Emacs window. ** VMS: the new function `define-logical-name' allows you to create job-wide logical names. The old function `define-dcl-symbol' has been removed. + + Changes in version 18.50. @@ -166,6 +170,8 @@ Emacs run. End of file causes Emacs to exit. These variables cannot really work because the 24-bit range of an integer in (most ports of) GNU Emacs is not large enough to hold their values on many systems. + + Changes in version 18.45, since version 18.41. @@ -221,6 +227,8 @@ case. You can use either upper or lower case indiscriminately. This is a new name for the function formerly called `define-logical-name'. + + Editing Changes in Emacs 18 @@ -798,6 +806,7 @@ can put in requests at the same time. The client/server work only on Berkeley Unix, since they use the Berkeley sockets mechanism for their communication. + Changes in Lisp programming in Emacs version 18. @@ -1586,13 +1595,13 @@ LD_SWITCH_MACHINE can be defined by the m- file to specify extra `ld' switches. C_DEBUG_SWITCH defines the switches to give `cc' when debugging. Default `-g'. C_OPTIMIZE_SWITCH defines the switches to give `cc' to optimize. Default `-O'. C_SWITCH_MACHINE can be defined by the m- file to specify extra `cc' switches. - -For older news, see the file ONEWS.2. + + ---------------------------------------------------------------------- Copyright information: -Copyright (C) 1988 Free Software Foundation, Inc. +Copyright (C) 1988, 2006 Free Software Foundation, Inc. Permission is granted to anyone to make or distribute verbatim copies of this document as received, in any medium, provided that the diff --git a/etc/ONEWS b/etc/NEWS.19 index e92965c89d9..ce06d2a8bfa 100644 --- a/etc/ONEWS +++ b/etc/NEWS.19 @@ -1,10 +1,14 @@ GNU Emacs NEWS -- history of user-visible changes. 1992. -Copyright (C) 1995, 2001 Free Software Foundation, Inc. +Copyright (C) 1993, 1994, 1995, 2001, 2006 Free Software Foundation, Inc. See the end for copying conditions. -For older news, see the file ONEWS.4. +This file is about changes in emacs versions 19. + + * Emacs 19.34 is a bug-fix release with no user-visible changes. + + * Changes in Emacs 19.33. @@ -14,6 +18,8 @@ mode should do that--it is the user's choice.) ** The variable normal-auto-fill-function specifies the function to use for auto-fill-function, if and when Auto Fill is turned on. Major modes can set this locally to alter how Auto Fill works. + + * Editing Changes in Emacs 19.32 @@ -255,6 +261,7 @@ cited text to hide is now customizable. The Gnus manual has been expanded. It explains all these new features in greater detail. + * Lisp Changes in Emacs 19.32 @@ -279,6 +286,8 @@ name. In such a case, you should give that alias symbol a non-nil menu-alias property. That property tells the menu system to look for equivalent keys for the real name instead of equivalent keys for the alias. + + * Editing Changes in Emacs 19.31 @@ -583,6 +592,7 @@ implementation of Emacs timers, see below). **** `M-x list-colors-display' displays all the available colors. **** The `TPU-EDT' package works. + * Lisp changes in Emacs 19.31. @@ -1029,7 +1039,7 @@ your working file with the latest version from the master. *** RCS customization. There is a new variable vc-consult-headers. If it is t (the default), -VC searches for RCS headers in working files (like `$Id: ONEWS,v 1.8 2003/02/04 14:30:40 lektu Exp $') and +VC searches for RCS headers in working files (like `$Id: NEWS.19,v 1.1 2006/06/04 01:01:51 kfstorm Exp $') and determines the state of the file from them, not from the master file. This is fast and more reliable when you use branches. (The variable was already present in Emacs 19.29, but didn't get mentioned in the @@ -1290,6 +1300,7 @@ new file should include all the special entries from the old one. This new file is under active development as part of the ncurses project. If you have any questions about this file, or problems with an entry in it, email terminfo@ccil.org. + * Lisp changes in Emacs 19.30. @@ -1453,6 +1464,8 @@ sequence containing the events that were used to invoke the command. ** The environment variable NAME, if set, now specifies the value of (user-full-name), when Emacs starts up. + + * User Editing Changes in Emacs 19.29 @@ -2155,6 +2168,7 @@ bibtex-sort-ignore-string-entries is now t. used reference types are now on control-modified keys, mediocre used types are on unmodified keys, seldom used types are on shift-modified keys and almost never used types on meta-modified keys. + * Configuration Changes in Emacs 19.29 @@ -2171,6 +2185,7 @@ automatically enable X support if X is installed on your machine.) mail-host-address to a string in the dumped Emacs, that string becomes the default host address for initializing user-mail-address. It is used instead of the value of (system-name). + * Lisp-Level Changes in Emacs 19.29 @@ -2906,6 +2921,8 @@ three integers.) **** The new function encode-time converts specific items of time information--the second, minute, hour, day, month, year, and time zone--into a time value. + + * Changes in Emacs 19.27 @@ -2921,6 +2938,8 @@ reach the end of a subnode, SPC moves into the next subnode, and so on. DEL more or less scrolls through the same text in reverse order. + + * User Editing Changes in Emacs 19.26 @@ -2998,6 +3017,7 @@ for asking for a list of the subcommands of C-c C-v. setting just one variable, user-mail-address. This currently applies to posting news with GNUS and to making change log entries. It may apply to additional Emacs features in the future. + * Lisp-Level Changes in Emacs 19.26: @@ -3044,6 +3064,7 @@ delete-old-versions. other window for C-M-v to scroll. ** Note that the function fceiling was mistakenly documented as fceil before. + * Changes in cc-mode.el in Emacs 19.26: @@ -3081,11 +3102,15 @@ other window for C-M-v to scroll. ** new buffer-local variable c-comment-start-regexp for (potential) flexibility in adding new modes based on cc-mode.el + + * Changes in Emacs 19.25 The variable x-cross-pointer-shape (which didn't really exist) has been renamed to x-sensitive-text-pointer-shape, and now does exist. + + * Changes in Emacs 19.24 @@ -3110,6 +3135,8 @@ s-region.el Set region by holding shift. skeleton.el Templates for statement insertion. soundex.el Classifying words by how they sound. tempo.el Template insertion with hotspots. + + * User Editing Changes in 19.23. @@ -3407,6 +3434,7 @@ debugged. *** A new command, top-level-nonstop, does not even stop for unwind-protect, as top-level would. + * Changes in CC mode in Emacs 19.23. @@ -3577,6 +3605,7 @@ convention of VariableNamesWithoutUnderscoresButEachWordCapitalized. c-label-offset c-continued-statement-offset c-continued-brace-offset + * Lisp programming changes in Emacs 19.23. @@ -3977,6 +4006,8 @@ Now the file version.el contains only the first two version numbers. The third component is now determined on the basis of the names of the existing executable files. This means that version.el is not altered by building Emacs. + + * Changes in 19.22. @@ -4039,12 +4070,16 @@ greater than what it used to be. It is the position between the two characters whose properties differ, which is one greater than the position of the first character found (while scanning back) with different properties. + + * User editing changes in version 19.21. ** ISO Accents mode supports four additional characters: A-with-ring (entered as /A), AE ligature (entered as /E), and their lower-case equivalents. + + * User editing changes in version 19.20. (See following page for Lisp programming changes.) @@ -4265,6 +4300,7 @@ whether `pushd' behaves like `cd' if no argument is given (`shell-pushd-dextract'), and only add directories to the directory stack if they are not already on it (`shell-pushd-dunique'). The configuration you choose should match the underlying shell, of course. + * Emacs Lisp programming changes in Emacs 19.20. @@ -4442,6 +4478,8 @@ delete-region in comint-previous-matching-input. The input history retrieval commands still wrap-around the input ring, unlike Emacs command history. + + * Changes in version 19.19. @@ -4474,6 +4512,8 @@ taken. ** `%' no longer allows floating point arguments, since the results were often inconsistent with integer `%'. + + * Changes in version 19.18. @@ -4614,6 +4654,8 @@ of the directory containing the Emacs executable that was run. ** The new function minibuffer-window-active-p takes one argument, a minibuffer window, and returns t if the window is currently active. + + * Changes in version 19.17. @@ -4801,6 +4843,7 @@ argument FRAME, which specifies which frames it should affect. + If FRAME is a frame, then `delete-windows-on' only deletes windows on the given frame; other frames are unaffected. + * Changes in version 19.16. @@ -4927,6 +4970,7 @@ in a singleton list when it first inserts the prefix, but doesn't insert the prefix when processing events whose PLACE-SYMBOLs are already thus enclosed. + * Changes in version 19.15. @@ -4973,6 +5017,8 @@ it works the same in Emacs 18 and Emacs 19. (This change actually took place earlier, but we didn't know about it and thus didn't document it.) + + * Changes in version 19.14. @@ -5017,6 +5063,8 @@ and END that specify which part of the file to insert. BEG defaults to 0 (the beginning of the file), and END defaults to the end of the file. If you specify BEG or END, then the argument VISIT must be nil. + + * Changes in version 19.13. @@ -5035,11 +5083,15 @@ the search a case-sensitive one. C-c LETTER, since those keys are reserved for users. Those commands have been moved to C-c M-LETTER. We may move them again for greater consistency with other modes. + + * Changes in version 19.12. ** You can now make many of the sort commands ignore case by setting `sort-fold-case' to a non-nil value. + + * Changes in version 19.11. @@ -5057,6 +5109,8 @@ that you write. This is what `basic-save-buffer' does when it writes a file in the usual way. (This is not actually new, but wasn't documented before.) + + * Changes in version 19.10. @@ -5069,6 +5123,8 @@ The reason for this change is to make function keys work after C-x. the region is highlighted in windows other than the selected window (in Transient Mark mode only, of course, and currently only when using X). + + * Changes in version 19.8. @@ -6458,14 +6514,13 @@ distribution, using the contents of the source tree. Object files, old file versions, executables, DOC files, and other architecture-specific or easy-to-recreate files are not included in the tar file. - -* For older news, see the file ONEWS.4. For Lisp changes in (the first -* release of) Emacs 19, see the file LNEWS. + + ---------------------------------------------------------------------- Copyright information: -Copyright (C) 1993, 1994, 1995 Free Software Foundation, Inc. +Copyright (C) 1993, 1994, 1995, 2001, 2006 Free Software Foundation, Inc. Permission is granted to anyone to make or distribute verbatim copies of this document as received, in any medium, provided that the diff --git a/etc/NEWS.20 b/etc/NEWS.20 new file mode 100644 index 00000000000..44d5600ecb4 --- /dev/null +++ b/etc/NEWS.20 @@ -0,0 +1,4513 @@ +GNU Emacs NEWS -- history of user-visible changes. 2006-05-31 +Copyright (C) 1999, 2000, 2001, 2006 + Free Software Foundation, Inc. +See the end for copying conditions. + +Please send Emacs bug reports to bug-gnu-emacs@gnu.org. +If possible, use M-x report-emacs-bug. + +This file is about changes in emacs version 20. + + + +* Emacs 20.7 is a bug-fix release with few user-visible changes + +** It is now possible to use CCL-based coding systems for keyboard +input. + +** ange-ftp now handles FTP security extensions, like Kerberos. + +** Rmail has been extended to recognize more forms of digest messages. + +** Now, most coding systems set in keyboard coding system work not +only for character input, but also in incremental search. The +exceptions are such coding systems that handle 2-byte character sets +(e.g euc-kr, euc-jp) and that use ISO's escape sequence +(e.g. iso-2022-jp). They are ignored in incremental search. + +** Support for Macintosh PowerPC-based machines running GNU/Linux has +been added. + + + +* Emacs 20.6 is a bug-fix release with one user-visible change + +** Support for ARM-based non-RISCiX machines has been added. + + + +* Emacs 20.5 is a bug-fix release with no user-visible changes. + +** Not new, but not mentioned before: +M-w when Transient Mark mode is enabled disables the mark. + + + +* Changes in Emacs 20.4 + +** Init file may be called .emacs.el. + +You can now call the Emacs init file `.emacs.el'. +Formerly the name had to be `.emacs'. If you use the name +`.emacs.el', you can byte-compile the file in the usual way. + +If both `.emacs' and `.emacs.el' exist, the latter file +is the one that is used. + +** shell-command, and shell-command-on-region, now return +the exit code of the command (unless it is asynchronous). +Also, you can specify a place to put the error output, +separate from the command's regular output. +Interactively, the variable shell-command-default-error-buffer +says where to put error output; set it to a buffer name. +In calls from Lisp, an optional argument ERROR-BUFFER specifies +the buffer name. + +When you specify a non-nil error buffer (or buffer name), any error +output is inserted before point in that buffer, with \f\n to separate +it from the previous batch of error output. The error buffer is not +cleared, so error output from successive commands accumulates there. + +** Setting the default value of enable-multibyte-characters to nil in +the .emacs file, either explicitly using setq-default, or via Custom, +is now essentially equivalent to using --unibyte: all buffers +created during startup will be made unibyte after loading .emacs. + +** C-x C-f now handles the wildcards * and ? in file names. For +example, typing C-x C-f c*.c RET visits all the files whose names +match c*.c. To visit a file whose name contains * or ?, add the +quoting sequence /: to the beginning of the file name. + +** The M-x commands keep-lines, flush-lines and count-matches +now have the same feature as occur and query-replace: +if the pattern contains any upper case letters, then +they never ignore case. + +** The end-of-line format conversion feature previously mentioned +under `* Emacs 20.1 changes for MS-DOS and MS-Windows' actually +applies to all operating systems. Emacs recognizes from the contents +of a file what convention it uses to separate lines--newline, CRLF, or +just CR--and automatically converts the contents to the normal Emacs +convention (using newline to separate lines) for editing. This is a +part of the general feature of coding system conversion. + +If you subsequently save the buffer, Emacs converts the text back to +the same format that was used in the file before. + +You can turn off end-of-line conversion by setting the variable +`inhibit-eol-conversion' to non-nil, e.g. with Custom in the MULE group. + +** The character set property `prefered-coding-system' has been +renamed to `preferred-coding-system', for the sake of correct spelling. +This is a fairly internal feature, so few programs should be affected. + +** Mode-line display of end-of-line format is changed. +The indication of the end-of-line format of the file visited by a +buffer is now more explicit when that format is not the usual one for +your operating system. For example, the DOS-style end-of-line format +is displayed as "(DOS)" on Unix and GNU/Linux systems. The usual +end-of-line format is still displayed as a single character (colon for +Unix, backslash for DOS and Windows, and forward slash for the Mac). + +The values of the variables eol-mnemonic-unix, eol-mnemonic-dos, +eol-mnemonic-mac, and eol-mnemonic-undecided, which are strings, +control what is displayed in the mode line for each end-of-line +format. You can now customize these variables. + +** In the previous version of Emacs, tar-mode didn't work well if a +filename contained non-ASCII characters. Now this is fixed. Such a +filename is decoded by file-name-coding-system if the default value of +enable-multibyte-characters is non-nil. + +** The command temp-buffer-resize-mode toggles a minor mode +in which temporary buffers (such as help buffers) are given +windows just big enough to hold the whole contents. + +** If you use completion.el, you must now run the function +dynamic-completion-mode to enable it. Just loading the file +doesn't have any effect. + +** In Flyspell mode, the default is now to make just one Ispell process, +not one per buffer. + +** If you use iswitchb but do not call (iswitchb-default-keybindings) to +use the default keybindings, you will need to add the following line: + (add-hook 'minibuffer-setup-hook 'iswitchb-minibuffer-setup) + +** Auto-show mode is no longer enabled just by loading auto-show.el. +To control it, set `auto-show-mode' via Custom or use the +`auto-show-mode' command. + +** Handling of X fonts' ascent/descent parameters has been changed to +avoid redisplay problems. As a consequence, compared with previous +versions the line spacing and frame size now differ with some font +choices, typically increasing by a pixel per line. This change +occurred in version 20.3 but was not documented then. + +** If you select the bar cursor style, it uses the frame's +cursor-color, rather than the cursor foreground pixel. + +** In multibyte mode, Rmail decodes incoming MIME messages using the +character set specified in the message. If you want to disable this +feature, set the variable rmail-decode-mime-charset to nil. + +** Not new, but not mentioned previously in NEWS: when you use #! at +the beginning of a file to make it executable and specify an +interpreter program, Emacs looks on the second line for the -*- mode +and variable specification, as well as on the first line. + +** Support for IBM codepage encoding of non-ASCII characters. + +The new command M-x codepage-setup creates a special coding system +that can be used to convert text between a specific IBM codepage and +one of the character sets built into Emacs which matches that +codepage. For example, codepage 850 corresponds to Latin-1 character +set, codepage 855 corresponds to Cyrillic-ISO character set, etc. + +Windows codepages 1250, 1251 and some others, where Windows deviates +from the corresponding ISO character set, are also supported. + +IBM box-drawing characters and other glyphs which don't have +equivalents in the corresponding ISO character set, are converted to +a character defined by dos-unsupported-char-glyph on MS-DOS, and to +`?' on other systems. + +IBM codepages are widely used on MS-DOS and MS-Windows, so this +feature is most useful on those platforms, but it can also be used on +Unix. + +Emacs compiled for MS-DOS automatically loads the support for the +current codepage when it starts. + +** Mail changes + +*** When mail is sent using compose-mail (C-x m), and if +`mail-send-nonascii' is set to the new default value `mime', +appropriate MIME headers are added. The headers are added only if +non-ASCII characters are present in the body of the mail, and no other +MIME headers are already present. For example, the following three +headers are added if the coding system used in the *mail* buffer is +latin-1: + + MIME-version: 1.0 + Content-type: text/plain; charset=iso-8859-1 + Content-Transfer-Encoding: 8bit + +*** The new variable default-sendmail-coding-system specifies the +default way to encode outgoing mail. This has higher priority than +default-buffer-file-coding-system but has lower priority than +sendmail-coding-system and the local value of +buffer-file-coding-system. + +You should not set this variable manually. Instead, set +sendmail-coding-system to specify a fixed encoding for all outgoing +mail. + +*** When you try to send a message that contains non-ASCII characters, +if the coding system specified by those variables doesn't handle them, +Emacs will ask you to select a suitable coding system while showing a +list of possible coding systems. + +** CC Mode changes + +*** c-default-style can now take an association list that maps major +modes to style names. When this variable is an alist, Java mode no +longer hardcodes a setting to "java" style. See the variable's +docstring for details. + +*** It's now possible to put a list as the offset on a syntactic +symbol. The list is evaluated recursively until a non-nil offset is +found. This is useful to combine several lineup functions to act in a +prioritized order on a single line. However, none of the supplied +lineup functions use this feature currently. + +*** New syntactic symbol catch-clause, which is used on the "catch" and +"finally" lines in try-catch constructs in C++ and Java. + +*** New cleanup brace-catch-brace on c-cleanup-list, which does for +"catch" lines what brace-elseif-brace does for "else if" lines. + +*** The braces of Java anonymous inner classes are treated separately +from the braces of other classes in auto-newline mode. Two new +symbols inexpr-class-open and inexpr-class-close may be used on +c-hanging-braces-alist to control the automatic newlines used for +anonymous classes. + +*** Support for the Pike language added, along with new Pike specific +syntactic symbols: inlambda, lambda-intro-cont + +*** Support for Java anonymous classes via new syntactic symbol +inexpr-class. New syntactic symbol inexpr-statement for Pike +support and gcc-style statements inside expressions. New lineup +function c-lineup-inexpr-block. + +*** New syntactic symbol brace-entry-open which is used in brace lists +(i.e. static initializers) when a list entry starts with an open +brace. These used to be recognized as brace-list-entry's. +c-electric-brace also recognizes brace-entry-open braces +(brace-list-entry's can no longer be electrified). + +*** New command c-indent-line-or-region, not bound by default. + +*** `#' is only electric when typed in the indentation of a line. + +*** Parentheses are now electric (via the new command c-electric-paren) +for auto-reindenting lines when parens are typed. + +*** In "gnu" style, inline-open offset is now set to zero. + +*** Uniform handling of the inclass syntactic symbol. The indentation +associated with it is now always relative to the class opening brace. +This means that the indentation behavior has changed in some +circumstances, but only if you've put anything besides 0 on the +class-open syntactic symbol (none of the default styles do that). + +** Gnus changes. + +*** New functionality for using Gnus as an offline newsreader has been +added. A plethora of new commands and modes have been added. See the +Gnus manual for the full story. + +*** The nndraft backend has returned, but works differently than +before. All Message buffers are now also articles in the nndraft +group, which is created automatically. + +*** `gnus-alter-header-function' can now be used to alter header +values. + +*** `gnus-summary-goto-article' now accept Message-ID's. + +*** A new Message command for deleting text in the body of a message +outside the region: `C-c C-v'. + +*** You can now post to component group in nnvirtual groups with +`C-u C-c C-c'. + +*** `nntp-rlogin-program' -- new variable to ease customization. + +*** `C-u C-c C-c' in `gnus-article-edit-mode' will now inhibit +re-highlighting of the article buffer. + +*** New element in `gnus-boring-article-headers' -- `long-to'. + +*** `M-i' symbolic prefix command. See the section "Symbolic +Prefixes" in the Gnus manual for details. + +*** `L' and `I' in the summary buffer now take the symbolic prefix +`a' to add the score rule to the "all.SCORE" file. + +*** `gnus-simplify-subject-functions' variable to allow greater +control over simplification. + +*** `A T' -- new command for fetching the current thread. + +*** `/ T' -- new command for including the current thread in the +limit. + +*** `M-RET' is a new Message command for breaking cited text. + +*** \\1-expressions are now valid in `nnmail-split-methods'. + +*** The `custom-face-lookup' function has been removed. +If you used this function in your initialization files, you must +rewrite them to use `face-spec-set' instead. + +*** Canceling now uses the current select method. Symbolic prefix +`a' forces normal posting method. + +*** New command to translate M******** sm*rtq**t*s into proper text +-- `W d'. + +*** For easier debugging of nntp, you can set `nntp-record-commands' +to a non-nil value. + +*** nntp now uses ~/.authinfo, a .netrc-like file, for controlling +where and how to send AUTHINFO to NNTP servers. + +*** A command for editing group parameters from the summary buffer +has been added. + +*** A history of where mails have been split is available. + +*** A new article date command has been added -- `article-date-iso8601'. + +*** Subjects can be simplified when threading by setting +`gnus-score-thread-simplify'. + +*** A new function for citing in Message has been added -- +`message-cite-original-without-signature'. + +*** `article-strip-all-blank-lines' -- new article command. + +*** A new Message command to kill to the end of the article has +been added. + +*** A minimum adaptive score can be specified by using the +`gnus-adaptive-word-minimum' variable. + +*** The "lapsed date" article header can be kept continually +updated by the `gnus-start-date-timer' command. + +*** Web listserv archives can be read with the nnlistserv backend. + +*** Old dejanews archives can now be read by nnweb. + +*** `gnus-posting-styles' has been re-activated. + +** Changes to TeX and LaTeX mode + +*** The new variable `tex-start-options-string' can be used to give +options for the TeX run. The default value causes TeX to run in +nonstopmode. For an interactive TeX run set it to nil or "". + +*** The command `tex-feed-input' sends input to the Tex Shell. In a +TeX buffer it is bound to the keys C-RET, C-c RET, and C-c C-m (some +of these keys may not work on all systems). For instance, if you run +TeX interactively and if the TeX run stops because of an error, you +can continue it without leaving the TeX buffer by typing C-RET. + +*** The Tex Shell Buffer is now in `compilation-shell-minor-mode'. +All error-parsing commands of the Compilation major mode are available +but bound to keys that don't collide with the shell. Thus you can use +the Tex Shell for command line executions like a usual shell. + +*** The commands `tex-validate-region' and `tex-validate-buffer' check +the matching of braces and $'s. The errors are listed in a *Occur* +buffer and you can use C-c C-c or mouse-2 to go to a particular +mismatch. + +** Changes to RefTeX mode + +*** The table of contents buffer can now also display labels and +file boundaries in addition to sections. Use `l', `i', and `c' keys. + +*** Labels derived from context (the section heading) are now +lowercase by default. To make the label legal in LaTeX, latin-1 +characters will lose their accent. All Mule characters will be +removed from the label. + +*** The automatic display of cross reference information can also use +a window instead of the echo area. See variable `reftex-auto-view-crossref'. + +*** kpsewhich can be used by RefTeX to find TeX and BibTeX files. See the +customization group `reftex-finding-files'. + +*** The option `reftex-bibfile-ignore-list' has been renamed to +`reftex-bibfile-ignore-regexps' and indeed can be fed with regular +expressions. + +*** Multiple Selection buffers are now hidden buffers. + +** New/deleted modes and packages + +*** The package snmp-mode.el provides major modes for editing SNMP and +SNMPv2 MIBs. It has entries on `auto-mode-alist'. + +*** The package sql.el provides a major mode, M-x sql-mode, for +editing SQL files, and M-x sql-interactive-mode for interacting with +SQL interpreters. It has an entry on `auto-mode-alist'. + +*** ispell4.el has been deleted. It got in the way of ispell.el and +this was hard to fix reliably. It has long been obsolete -- use +Ispell 3.1 and ispell.el. + + +* MS-DOS changes in Emacs 20.4 + +** Emacs compiled for MS-DOS now supports MULE features better. +This includes support for display of all ISO 8859-N character sets, +conversion to and from IBM codepage encoding of non-ASCII characters, +and automatic setup of the MULE environment at startup. For details, +check out the section `MS-DOS and MULE' in the manual. + +The MS-DOS installation procedure automatically configures and builds +Emacs with input method support if it finds an unpacked Leim +distribution when the config.bat script is run. + +** Formerly, the value of lpr-command did not affect printing on +MS-DOS unless print-region-function was set to nil, but now it +controls whether an external program is invoked or output is written +directly to a printer port. Similarly, in the previous version of +Emacs, the value of ps-lpr-command did not affect PostScript printing +on MS-DOS unless ps-printer-name was set to something other than a +string (eg. t or `pipe'), but now it controls whether an external +program is used. (These changes were made so that configuration of +printing variables would be almost identical across all platforms.) + +** In the previous version of Emacs, PostScript and non-PostScript +output was piped to external programs, but because most print programs +available for MS-DOS and MS-Windows cannot read data from their standard +input, on those systems the data to be output is now written to a +temporary file whose name is passed as the last argument to the external +program. + +An exception is made for `print', a standard program on Windows NT, +and `nprint', a standard program on Novell Netware. For both of these +programs, the command line is constructed in the appropriate syntax +automatically, using only the value of printer-name or ps-printer-name +as appropriate--the value of the relevant `-switches' variable is +ignored, as both programs have no useful switches. + +** The value of the variable dos-printer (cf. dos-ps-printer), if it has +a value, overrides the value of printer-name (cf. ps-printer-name), on +MS-DOS and MS-Windows only. This has been true since version 20.3, but +was not documented clearly before. + +** All the Emacs games now work on MS-DOS terminals. +This includes Tetris and Snake. + + +* Lisp changes in Emacs 20.4 + +** New functions line-beginning-position and line-end-position +return the position of the beginning or end of the current line. +They both accept an optional argument, which has the same +meaning as the argument to beginning-of-line or end-of-line. + +** find-file and allied functions now have an optional argument +WILDCARD. If this is non-nil, they do wildcard processing, +and visit all files that match the wildcard pattern. + +** Changes in the file-attributes function. + +*** The file size returned by file-attributes may be an integer or a float. +It is an integer if the size fits in a Lisp integer, float otherwise. + +*** The inode number returned by file-attributes may be an integer (if +the number fits in a Lisp integer) or a cons cell containing two +integers. + +** The new function directory-files-and-attributes returns a list of +files in a directory and their attributes. It accepts the same +arguments as directory-files and has similar semantics, except that +file names and attributes are returned. + +** The new function file-attributes-lessp is a helper function for +sorting the list generated by directory-files-and-attributes. It +accepts two arguments, each a list of a file name and its attributes. +It compares the file names of each according to string-lessp and +returns the result. + +** The new function file-expand-wildcards expands a wildcard-pattern +to produce a list of existing files that match the pattern. + +** New functions for base64 conversion: + +The function base64-encode-region converts a part of the buffer +into the base64 code used in MIME. base64-decode-region +performs the opposite conversion. Line-breaking is supported +optionally. + +Functions base64-encode-string and base64-decode-string do a similar +job on the text in a string. They return the value as a new string. + +** +The new function process-running-child-p +will tell you if a subprocess has given control of its +terminal to its own child process. + +** interrupt-process and such functions have a new feature: +when the second argument is `lambda', they send a signal +to the running child of the subshell, if any, but if the shell +itself owns its terminal, no signal is sent. + +** There are new widget types `plist' and `alist' which can +be used for customizing variables whose values are plists or alists. + +** easymenu.el now understands `:key-sequence' and `:style button'. +:included is an alias for :visible. + +easy-menu-add-item now understands the values returned by +easy-menu-remove-item and easy-menu-item-present-p. This can be used +to move or copy menu entries. + +** Multibyte editing changes + +*** The definitions of sref and char-bytes are changed. Now, sref is +an alias of aref and char-bytes always returns 1. This change is to +make some Emacs Lisp code which works on 20.2 and earlier also +work on the latest Emacs. Such code uses a combination of sref and +char-bytes in a loop typically as below: + (setq char (sref str idx) + idx (+ idx (char-bytes idx))) +The byte-compiler now warns that this is obsolete. + +If you want to know how many bytes a specific multibyte character +(say, CH) occupies in a multibyte buffer, use this code: + (charset-bytes (char-charset ch)) + +*** In multibyte mode, when you narrow a buffer to some region, and the +region is preceded or followed by non-ASCII codes, inserting or +deleting at the head or the end of the region may signal this error: + + Byte combining across boundary of accessible buffer text inhibited + +This is to avoid some bytes being combined together into a character +across the boundary. + +*** The functions find-charset-region and find-charset-string include +`unknown' in the returned list in the following cases: + o The current buffer or the target string is unibyte and + contains 8-bit characters. + o The current buffer or the target string is multibyte and + contains invalid characters. + +*** The functions decode-coding-region and encode-coding-region remove +text properties of the target region. Ideally, they should correctly +preserve text properties, but for the moment, it's hard. Removing +text properties is better than preserving them in a less-than-correct +way. + +*** prefer-coding-system sets EOL conversion of default coding systems. +If the argument to prefer-coding-system specifies a certain type of +end of line conversion, the default coding systems set by +prefer-coding-system will specify that conversion type for end of line. + +*** The new function thai-compose-string can be used to properly +compose Thai characters in a string. + +** The primitive `define-prefix-command' now takes an optional third +argument NAME, which should be a string. It supplies the menu name +for the created keymap. Keymaps created in order to be displayed as +menus should always use the third argument. + +** The meanings of optional second arguments for read-char, +read-event, and read-char-exclusive are flipped. Now the second +arguments are INHERIT-INPUT-METHOD. These functions use the current +input method (if any) if and only if INHERIT-INPUT-METHOD is non-nil. + +** The new function clear-this-command-keys empties out the contents +of the vector that (this-command-keys) returns. This is useful in +programs that read passwords, to prevent the passwords from echoing +inadvertently as part of the next command in certain cases. + +** The new macro `with-temp-message' displays a temporary message in +the echo area, while executing some Lisp code. Like `progn', it +returns the value of the last form, but it also restores the previous +echo area contents. + + (with-temp-message MESSAGE &rest BODY) + +** The function `require' now takes an optional third argument +NOERROR. If it is non-nil, then there is no error if the +requested feature cannot be loaded. + +** In the function modify-face, an argument of (nil) for the +foreground color, background color or stipple pattern +means to clear out that attribute. + +** The `outer-window-id' frame property of an X frame +gives the window number of the outermost X window for the frame. + +** Temporary buffers made with with-output-to-temp-buffer are now +read-only by default, and normally use the major mode Help mode +unless you put them in some other non-Fundamental mode before the +end of with-output-to-temp-buffer. + +** The new functions gap-position and gap-size return information on +the gap of the current buffer. + +** The new functions position-bytes and byte-to-position provide a way +to convert between character positions and byte positions in the +current buffer. + +** vc.el defines two new macros, `edit-vc-file' and `with-vc-file', to +facilitate working with version-controlled files from Lisp programs. +These macros check out a given file automatically if needed, and check +it back in after any modifications have been made. + + + +* Installation Changes in Emacs 20.3 + +** The default value of load-path now includes most subdirectories of +the site-specific directories /usr/local/share/emacs/site-lisp and +/usr/local/share/emacs/VERSION/site-lisp, in addition to those +directories themselves. Both immediate subdirectories and +subdirectories multiple levels down are added to load-path. + +Not all subdirectories are included, though. Subdirectories whose +names do not start with a letter or digit are excluded. +Subdirectories named RCS or CVS are excluded. Also, a subdirectory +which contains a file named `.nosearch' is excluded. You can use +these methods to prevent certain subdirectories from being searched. + +Emacs finds these subdirectories and adds them to load-path when it +starts up. While it would be cleaner to find the subdirectories each +time Emacs loads a file, that would be much slower. + +This feature is an incompatible change. If you have stored some Emacs +Lisp files in a subdirectory of the site-lisp directory specifically +to prevent them from being used, you will need to rename the +subdirectory to start with a non-alphanumeric character, or create a +`.nosearch' file in it, in order to continue to achieve the desired +results. + +** Emacs no longer includes an old version of the C preprocessor from +GCC. This was formerly used to help compile Emacs with C compilers +that had limits on the significant length of an identifier, but in +fact we stopped supporting such compilers some time ago. + + +* Changes in Emacs 20.3 + +** The new command C-x z (repeat) repeats the previous command +including its argument. If you repeat the z afterward, +it repeats the command additional times; thus, you can +perform many repetitions with one keystroke per repetition. + +** Emacs now supports "selective undo" which undoes only within a +specified region. To do this, set point and mark around the desired +region and type C-u C-x u (or C-u C-_). You can then continue undoing +further, within the same region, by repeating the ordinary undo +command C-x u or C-_. This will keep undoing changes that were made +within the region you originally specified, until either all of them +are undone, or it encounters a change which crosses the edge of that +region. + +In Transient Mark mode, undoing when a region is active requests +selective undo. + +** If you specify --unibyte when starting Emacs, then all buffers are +unibyte, except when a Lisp program specifically creates a multibyte +buffer. Setting the environment variable EMACS_UNIBYTE has the same +effect. The --no-unibyte option overrides EMACS_UNIBYTE and directs +Emacs to run normally in multibyte mode. + +The option --unibyte does not affect the reading of Emacs Lisp files, +though. If you want a Lisp file to be read in unibyte mode, use +-*-unibyte: t;-*- on its first line. That will force Emacs to +load that file in unibyte mode, regardless of how Emacs was started. + +** toggle-enable-multibyte-characters no longer has a key binding and +no longer appears in the menu bar. We've realized that changing the +enable-multibyte-characters variable in an existing buffer is +something that most users not do. + +** You can specify a coding system to use for the next cut or paste +operations through the window system with the command C-x RET X. +The coding system can make a difference for communication with other +applications. + +C-x RET x specifies a coding system for all subsequent cutting and +pasting operations. + +** You can specify the printer to use for commands that do printing by +setting the variable `printer-name'. Just what a printer name looks +like depends on your operating system. You can specify a different +printer for the Postscript printing commands by setting +`ps-printer-name'. + +** Emacs now supports on-the-fly spell checking by the means of a +minor mode. It is called M-x flyspell-mode. You don't have to remember +any other special commands to use it, and you will hardly notice it +except when you make a spelling error. Flyspell works by highlighting +incorrect words as soon as they are completed or as soon as the cursor +hits a new word. + +Flyspell mode works with whichever dictionary you have selected for +Ispell in Emacs. In TeX mode, it understands TeX syntax so as not +to be confused by TeX commands. + +You can correct a misspelled word by editing it into something +correct. You can also correct it, or accept it as correct, by +clicking on the word with Mouse-2; that gives you a pop-up menu +of various alternative replacements and actions. + +Flyspell mode also proposes "automatic" corrections. M-TAB replaces +the current misspelled word with a possible correction. If several +corrections are made possible, M-TAB cycles through them in +alphabetical order, or in order of decreasing likelihood if +flyspell-sort-corrections is nil. + +Flyspell mode also flags an error when a word is repeated, if +flyspell-mark-duplications-flag is non-nil. + +** Changes in input method usage. + +Now you can use arrow keys (right, left, down, up) for selecting among +the alternatives just the same way as you do by C-f, C-b, C-n, and C-p +respectively. + +You can use the ENTER key to accept the current conversion. + +If you type TAB to display a list of alternatives, you can select one +of the alternatives with Mouse-2. + +The meaning of the variable `input-method-verbose-flag' is changed so +that you can set it to t, nil, `default', or `complex-only'. + + If the value is nil, extra guidance is never given. + + If the value is t, extra guidance is always given. + + If the value is `complex-only', extra guidance is always given only + when you are using complex input methods such as chinese-py. + + If the value is `default' (this is the default), extra guidance is + given in the following case: + o When you are using a complex input method. + o When you are using a simple input method but not in the minibuffer. + +If you are using Emacs through a very slow line, setting +input-method-verbose-flag to nil or to complex-only is a good choice, +and if you are using an input method you are not familiar with, +setting it to t is helpful. + +The old command select-input-method is now called set-input-method. + +In the language environment "Korean", you can use the following +keys: + Shift-SPC toggle-korean-input-method + C-F9 quail-hangul-switch-symbol-ksc + F9 quail-hangul-switch-hanja +These key bindings are canceled when you switch to another language +environment. + +** The minibuffer history of file names now records the specified file +names, not the entire minibuffer input. For example, if the +minibuffer starts out with /usr/foo/, you might type in /etc/passwd to +get + + /usr/foo//etc/passwd + +which stands for the file /etc/passwd. + +Formerly, this used to put /usr/foo//etc/passwd in the history list. +Now this puts just /etc/passwd in the history list. + +** If you are root, Emacs sets backup-by-copying-when-mismatch to t +at startup, so that saving a file will be sure to preserve +its owner and group. + +** find-func.el can now also find the place of definition of Emacs +Lisp variables in user-loaded libraries. + +** C-x r t (string-rectangle) now deletes the existing rectangle +contents before inserting the specified string on each line. + +** There is a new command delete-whitespace-rectangle +which deletes whitespace starting from a particular column +in all the lines on a rectangle. The column is specified +by the left edge of the rectangle. + +** You can now store a number into a register with C-u NUMBER C-x r n REG, +increment it by INC with C-u INC C-x r + REG (to increment by one, omit +C-u INC), and insert it in the buffer with C-x r g REG. This is useful +for writing keyboard macros. + +** The new command M-x speedbar displays a frame in which directories, +files, and tags can be displayed, manipulated, and jumped to. The +frame defaults to 20 characters in width, and is the same height as +the frame that it was started from. Some major modes define +additional commands for the speedbar, including Rmail, GUD/GDB, and +info. + +** query-replace-regexp is now bound to C-M-%. + +** In Transient Mark mode, when the region is active, M-x +query-replace and the other replace commands now operate on the region +contents only. + +** M-x write-region, when used interactively, now asks for +confirmation before overwriting an existing file. When you call +the function from a Lisp program, a new optional argument CONFIRM +says whether to ask for confirmation in this case. + +** If you use find-file-literally and the file is already visited +non-literally, the command asks you whether to revisit the file +literally. If you say no, it signals an error. + +** Major modes defined with the "derived mode" feature +now use the proper name for the mode hook: WHATEVER-mode-hook. +Formerly they used the name WHATEVER-mode-hooks, but that is +inconsistent with Emacs conventions. + +** shell-command-on-region (and shell-command) reports success or +failure if the command produces no output. + +** Set focus-follows-mouse to nil if your window system or window +manager does not transfer focus to another window when you just move +the mouse. + +** mouse-menu-buffer-maxlen has been renamed to +mouse-buffer-menu-maxlen to be consistent with the other related +function and variable names. + +** The new variable auto-coding-alist specifies coding systems for +reading specific files. This has higher priority than +file-coding-system-alist. + +** If you set the variable unibyte-display-via-language-environment to +t, then Emacs displays non-ASCII characters are displayed by +converting them to the equivalent multibyte characters according to +the current language environment. As a result, they are displayed +according to the current fontset. + +** C-q's handling of codes in the range 0200 through 0377 is changed. + +The codes in the range 0200 through 0237 are inserted as one byte of +that code regardless of the values of nonascii-translation-table and +nonascii-insert-offset. + +For the codes in the range 0240 through 0377, if +enable-multibyte-characters is non-nil and nonascii-translation-table +nor nonascii-insert-offset can't convert them to valid multibyte +characters, they are converted to Latin-1 characters. + +** If you try to find a file that is not read-accessible, you now get +an error, rather than an empty buffer and a warning. + +** In the minibuffer history commands M-r and M-s, an upper case +letter in the regular expression forces case-sensitive search. + +** In the *Help* buffer, cross-references to commands and variables +are inferred and hyperlinked. Use C-h m in Help mode for the relevant +command keys. + +** M-x apropos-command, with a prefix argument, no longer looks for +user option variables--instead it looks for noninteractive functions. + +Meanwhile, the command apropos-variable normally searches for +user option variables; with a prefix argument, it looks at +all variables that have documentation. + +** When you type a long line in the minibuffer, and the minibuffer +shows just one line, automatically scrolling works in a special way +that shows you overlap with the previous line of text. The variable +minibuffer-scroll-overlap controls how many characters of overlap +it should show; the default is 20. + +Meanwhile, Resize Minibuffer mode is still available; in that mode, +the minibuffer grows taller (up to a point) as needed to show the whole +of your input. + +** The new command M-x customize-changed-options lets you customize +all the options whose meanings or default values have changed in +recent Emacs versions. You specify a previous Emacs version number as +argument, and the command creates a customization buffer showing all +the customizable options which were changed since that version. +Newly added options are included as well. + +If you don't specify a particular version number argument, +then the customization buffer shows all the customizable options +for which Emacs versions of changes are recorded. + +This function is also bound to the Changed Options entry in the +Customize menu. + +** When you run M-x grep with a prefix argument, it figures out +the tag around point and puts that into the default grep command. + +** The new command M-* (pop-tag-mark) pops back through a history of +buffer positions from which M-. or other tag-finding commands were +invoked. + +** The new variable comment-padding specifies the number of spaces +that `comment-region' will insert before the actual text of the comment. +The default is 1. + +** In Fortran mode the characters `.', `_' and `$' now have symbol +syntax, not word syntax. Fortran mode now supports `imenu' and has +new commands fortran-join-line (M-^) and fortran-narrow-to-subprogram +(C-x n d). M-q can be used to fill a statement or comment block +sensibly. + +** GUD now supports jdb, the Java debugger, and pdb, the Python debugger. + +** If you set the variable add-log-keep-changes-together to a non-nil +value, the command `C-x 4 a' will automatically notice when you make +two entries in one day for one file, and combine them. + +** You can use the command M-x diary-mail-entries to mail yourself a +reminder about upcoming diary entries. See the documentation string +for a sample shell script for calling this function automatically +every night. + +** Desktop changes + +*** All you need to do to enable use of the Desktop package, is to set +the variable desktop-enable to t with Custom. + +*** Minor modes are now restored. Which minor modes are restored +and how modes are restored is controlled by `desktop-minor-mode-table'. + +** There is no need to do anything special, now, to enable Gnus to +read and post multi-lingual articles. + +** Outline mode has now support for showing hidden outlines when +doing an isearch. In order for this to happen search-invisible should +be set to open (the default). If an isearch match is inside a hidden +outline the outline is made visible. If you continue pressing C-s and +the match moves outside the formerly invisible outline, the outline is +made invisible again. + +** Mail reading and sending changes + +*** The Rmail e command now switches to displaying the whole header of +the message before it lets you edit the message. This is so that any +changes you make in the header will not be lost if you subsequently +toggle. + +*** The w command in Rmail, which writes the message body into a file, +now works in the summary buffer as well. (The command to delete the +summary buffer is now Q.) The default file name for the w command, if +the message has no subject, is stored in the variable +rmail-default-body-file. + +*** Most of the commands and modes that operate on mail and netnews no +longer depend on the value of mail-header-separator. Instead, they +handle whatever separator the buffer happens to use. + +*** If you set mail-signature to a value which is not t, nil, or a string, +it should be an expression. When you send a message, this expression +is evaluated to insert the signature. + +*** The new Lisp library feedmail.el (version 8) enhances processing of +outbound email messages. It works in coordination with other email +handling packages (e.g., rmail, VM, gnus) and is responsible for +putting final touches on messages and actually submitting them for +transmission. Users of the emacs program "fakemail" might be +especially interested in trying feedmail. + +feedmail is not enabled by default. See comments at the top of +feedmail.el for set-up instructions. Among the bigger features +provided by feedmail are: + +**** you can park outgoing messages into a disk-based queue and +stimulate sending some or all of them later (handy for laptop users); +there is also a queue for draft messages + +**** you can get one last look at the prepped outbound message and +be prompted for confirmation + +**** does smart filling of address headers + +**** can generate a MESSAGE-ID: line and a DATE: line; the date can be +the time the message was written or the time it is being sent; this +can make FCC copies more closely resemble copies that recipients get + +**** you can specify an arbitrary function for actually transmitting +the message; included in feedmail are interfaces for /bin/[r]mail, +/usr/lib/sendmail, and Emacs Lisp smtpmail; it's easy to write a new +function for something else (10-20 lines of Lisp code). + +** Dired changes + +*** The Dired function dired-do-toggle, which toggles marked and unmarked +files, is now bound to "t" instead of "T". + +*** dired-at-point has been added to ffap.el. It allows one to easily +run Dired on the directory name at point. + +*** Dired has a new command: %g. It searches the contents of +files in the directory and marks each file that contains a match +for a specified regexp. + +** VC Changes + +*** New option vc-ignore-vc-files lets you turn off version control +conveniently. + +*** VC Dired has been completely rewritten. It is now much +faster, especially for CVS, and works very similar to ordinary +Dired. + +VC Dired is invoked by typing C-x v d and entering the name of the +directory to display. By default, VC Dired gives you a recursive +listing of all files at or below the given directory which are +currently locked (for CVS, all files not up-to-date are shown). + +You can change the listing format by setting vc-dired-recurse to nil, +then it shows only the given directory, and you may also set +vc-dired-terse-display to nil, then it shows all files under version +control plus the names of any subdirectories, so that you can type `i' +on such lines to insert them manually, as in ordinary Dired. + +All Dired commands operate normally in VC Dired, except for `v', which +is redefined as the version control prefix. That means you may type +`v l', `v =' etc. to invoke `vc-print-log', `vc-diff' and the like on +the file named in the current Dired buffer line. `v v' invokes +`vc-next-action' on this file, or on all files currently marked. + +The new command `v t' (vc-dired-toggle-terse-mode) allows you to +toggle between terse display (only locked files) and full display (all +VC files plus subdirectories). There is also a special command, +`* l', to mark all files currently locked. + +Giving a prefix argument to C-x v d now does the same thing as in +ordinary Dired: it allows you to supply additional options for the ls +command in the minibuffer, to fine-tune VC Dired's output. + +*** Under CVS, if you merge changes from the repository into a working +file, and CVS detects conflicts, VC now offers to start an ediff +session to resolve them. + +Alternatively, you can use the new command `vc-resolve-conflicts' to +resolve conflicts in a file at any time. It works in any buffer that +contains conflict markers as generated by rcsmerge (which is what CVS +uses as well). + +*** You can now transfer changes between branches, using the new +command vc-merge (C-x v m). It is implemented for RCS and CVS. When +you invoke it in a buffer under version-control, you can specify +either an entire branch or a pair of versions, and the changes on that +branch or between the two versions are merged into the working file. +If this results in any conflicts, they may be resolved interactively, +using ediff. + +** Changes in Font Lock + +*** The face and variable previously known as font-lock-reference-face +are now called font-lock-constant-face to better reflect their typical +use for highlighting constants and labels. (Its face properties are +unchanged.) The variable font-lock-reference-face remains for now for +compatibility reasons, but its value is font-lock-constant-face. + +** Frame name display changes + +*** The command set-frame-name lets you set the name of the current +frame. You can use the new command select-frame-by-name to select and +raise a frame; this is mostly useful on character-only terminals, or +when many frames are invisible or iconified. + +*** On character-only terminal (not a window system), changing the +frame name is now reflected on the mode line and in the Buffers/Frames +menu. + +** Comint (subshell) changes + +*** In Comint modes, the commands to kill, stop or interrupt a +subjob now also kill pending input. This is for compatibility +with ordinary shells, where the signal characters do this. + +*** There are new commands in Comint mode. + +C-c C-x fetches the "next" line from the input history; +that is, the line after the last line you got. +You can use this command to fetch successive lines, one by one. + +C-c SPC accumulates lines of input. More precisely, it arranges to +send the current line together with the following line, when you send +the following line. + +C-c C-a if repeated twice consecutively now moves to the process mark, +which separates the pending input from the subprocess output and the +previously sent input. + +C-c M-r now runs comint-previous-matching-input-from-input; +it searches for a previous command, using the current pending input +as the search string. + +*** New option compilation-scroll-output can be set to scroll +automatically in compilation-mode windows. + +** C mode changes + +*** Multiline macros are now handled, both as they affect indentation, +and as recognized syntax. New syntactic symbol cpp-macro-cont is +assigned to second and subsequent lines of a multiline macro +definition. + +*** A new style "user" which captures all non-hook-ified +(i.e. top-level) .emacs file variable settings and customizations. +Style "cc-mode" is an alias for "user" and is deprecated. "gnu" +style is still the default however. + +*** "java" style now conforms to Sun's JDK coding style. + +*** There are new commands c-beginning-of-defun, c-end-of-defun which +are alternatives which you could bind to C-M-a and C-M-e if you prefer +them. They do not have key bindings by default. + +*** New and improved implementations of M-a (c-beginning-of-statement) +and M-e (c-end-of-statement). + +*** C++ namespace blocks are supported, with new syntactic symbols +namespace-open, namespace-close, and innamespace. + +*** File local variable settings of c-file-style and c-file-offsets +makes the style variables local to that buffer only. + +*** New indentation functions c-lineup-close-paren, +c-indent-one-line-block, c-lineup-dont-change. + +*** Improvements (hopefully!) to the way CC Mode is loaded. You +should now be able to do a (require 'cc-mode) to get the entire +package loaded properly for customization in your .emacs file. A new +variable c-initialize-on-load controls this and is t by default. + +** Changes to hippie-expand. + +*** New customization variable `hippie-expand-dabbrev-skip-space'. If +non-nil, trailing spaces may be included in the abbreviation to search for, +which then gives the same behavior as the original `dabbrev-expand'. + +*** New customization variable `hippie-expand-dabbrev-as-symbol'. If +non-nil, characters of syntax '_' is considered part of the word when +expanding dynamically. + +*** New customization variable `hippie-expand-no-restriction'. If +non-nil, narrowed buffers are widened before they are searched. + +*** New customization variable `hippie-expand-only-buffers'. If +non-empty, buffers searched are restricted to the types specified in +this list. Useful for example when constructing new special-purpose +expansion functions with `make-hippie-expand-function'. + +*** Text properties of the expansion are no longer copied. + +** Changes in BibTeX mode. + +*** Any titleword matching a regexp in the new variable +bibtex-autokey-titleword-ignore (case sensitive) is ignored during +automatic key generation. This replaces variable +bibtex-autokey-titleword-first-ignore, which only checked for matches +against the first word in the title. + +*** Autokey generation now uses all words from the title, not just +capitalized words. To avoid conflicts with existing customizations, +bibtex-autokey-titleword-ignore is set up such that words starting with +lowerkey characters will still be ignored. Thus, if you want to use +lowercase words from the title, you will have to overwrite the +bibtex-autokey-titleword-ignore standard setting. + +*** Case conversion of names and title words for automatic key +generation is more flexible. Variable bibtex-autokey-preserve-case is +replaced by bibtex-autokey-titleword-case-convert and +bibtex-autokey-name-case-convert. + +** Changes in vcursor.el. + +*** Support for character terminals is available: there is a new keymap +and the vcursor will appear as an arrow between buffer text. A +variable `vcursor-interpret-input' allows input from the vcursor to be +entered exactly as if typed. Numerous functions, including +`vcursor-compare-windows', have been rewritten to improve consistency +in the selection of windows and corresponding keymaps. + +*** vcursor options can now be altered with M-x customize under the +Editing group once the package is loaded. + +*** Loading vcursor now does not define keys by default, as this is +generally a bad side effect. Use M-x customize to set +vcursor-key-bindings to t to restore the old behavior. + +*** vcursor-auto-disable can be `copy', which turns off copying from the +vcursor, but doesn't disable it, after any non-vcursor command. + +** Ispell changes. + +*** You can now spell check comments and strings in the current +buffer with M-x ispell-comments-and-strings. Comments and strings +are identified by syntax tables in effect. + +*** Generic region skipping implemented. +A single buffer can be broken into a number of regions where text will +and will not be checked. The definitions of the regions can be user +defined. New applications and improvements made available by this +include: + + o URLs are automatically skipped + o EMail message checking is vastly improved. + +*** Ispell can highlight the erroneous word even on non-window terminals. + +** Changes to RefTeX mode + +RefTeX has been updated in order to make it more usable with very +large projects (like a several volume math book). The parser has been +re-written from scratch. To get maximum speed from RefTeX, check the +section `Optimizations' in the manual. + +*** New recursive parser. + +The old version of RefTeX created a single large buffer containing the +entire multifile document in order to parse the document. The new +recursive parser scans the individual files. + +*** Parsing only part of a document. + +Reparsing of changed document parts can now be made faster by enabling +partial scans. To use this feature, read the documentation string of +the variable `reftex-enable-partial-scans' and set the variable to t. + + (setq reftex-enable-partial-scans t) + +*** Storing parsing information in a file. + +This can improve startup times considerably. To turn it on, use + + (setq reftex-save-parse-info t) + +*** Using multiple selection buffers + +If the creation of label selection buffers is too slow (this happens +for large documents), you can reuse these buffers by setting + + (setq reftex-use-multiple-selection-buffers t) + +*** References to external documents. + +The LaTeX package `xr' allows to cross-reference labels in external +documents. RefTeX can provide information about the external +documents as well. To use this feature, set up the \externaldocument +macros required by the `xr' package and rescan the document with +RefTeX. The external labels can then be accessed with the `x' key in +the selection buffer provided by `reftex-reference' (bound to `C-c )'). +The `x' key also works in the table of contents buffer. + +*** Many more labeled LaTeX environments are recognized by default. + +The built-in command list now covers all the standard LaTeX commands, +and all of the major packages included in the LaTeX distribution. + +Also, RefTeX now understands the \appendix macro and changes +the enumeration of sections in the *toc* buffer accordingly. + +*** Mouse support for selection and *toc* buffers + +The mouse can now be used to select items in the selection and *toc* +buffers. See also the new option `reftex-highlight-selection'. + +*** New keymaps for selection and table of contents modes. + +The selection processes for labels and citation keys, and the table of +contents buffer now have their own keymaps: `reftex-select-label-map', +`reftex-select-bib-map', `reftex-toc-map'. The selection processes +have a number of new keys predefined. In particular, TAB lets you +enter a label with completion. Check the on-the-fly help (press `?' +at the selection prompt) or read the Info documentation to find out +more. + +*** Support for the varioref package + +The `v' key in the label selection buffer toggles \ref versus \vref. + +*** New hooks + +Three new hooks can be used to redefine the way labels, references, +and citations are created. These hooks are +`reftex-format-label-function', `reftex-format-ref-function', +`reftex-format-cite-function'. + +*** Citations outside LaTeX + +The command `reftex-citation' may also be used outside LaTeX (e.g. in +a mail buffer). See the Info documentation for details. + +*** Short context is no longer fontified. + +The short context in the label menu no longer copies the +fontification from the text in the buffer. If you prefer it to be +fontified, use + + (setq reftex-refontify-context t) + +** file-cache-minibuffer-complete now accepts a prefix argument. +With a prefix argument, it does not try to do completion of +the file name within its directory; it only checks for other +directories that contain the same file name. + +Thus, given the file name Makefile, and assuming that a file +Makefile.in exists in the same directory, ordinary +file-cache-minibuffer-complete will try to complete Makefile to +Makefile.in and will therefore never look for other directories that +have Makefile. A prefix argument tells it not to look for longer +names such as Makefile.in, so that instead it will look for other +directories--just as if the name were already complete in its present +directory. + +** New modes and packages + +*** There is a new alternative major mode for Perl, Cperl mode. +It has many more features than Perl mode, and some people prefer +it, but some do not. + +*** There is a new major mode, M-x vhdl-mode, for editing files of VHDL +code. + +*** M-x which-function-mode enables a minor mode that displays the +current function name continuously in the mode line, as you move +around in a buffer. + +Which Function mode is effective in major modes which support Imenu. + +*** Gametree is a major mode for editing game analysis trees. The author +uses it for keeping notes about his postal Chess games, but it should +be helpful for other two-player games as well, as long as they have an +established system of notation similar to Chess. + +*** The new minor mode checkdoc-minor-mode provides Emacs Lisp +documentation string checking for style and spelling. The style +guidelines are found in the Emacs Lisp programming manual. + +*** The net-utils package makes some common networking features +available in Emacs. Some of these functions are wrappers around +system utilities (ping, nslookup, etc.); others are implementations of +simple protocols (finger, whois) in Emacs Lisp. There are also +functions to make simple connections to TCP/IP ports for debugging and +the like. + +*** highlight-changes-mode is a minor mode that uses colors to +identify recently changed parts of the buffer text. + +*** The new package `midnight' lets you specify things to be done +within Emacs at midnight--by default, kill buffers that you have not +used in a considerable time. To use this feature, customize +the user option `midnight-mode' to t. + +*** The file generic-x.el defines a number of simple major modes. + + apache-generic-mode: For Apache and NCSA httpd configuration files + samba-generic-mode: Samba configuration files + fvwm-generic-mode: For fvwm initialization files + x-resource-generic-mode: For X resource files + hosts-generic-mode: For hosts files (.rhosts, /etc/hosts, etc.) + mailagent-rules-generic-mode: For mailagent .rules files + javascript-generic-mode: For JavaScript files + vrml-generic-mode: For VRML files + java-manifest-generic-mode: For Java MANIFEST files + java-properties-generic-mode: For Java property files + mailrc-generic-mode: For .mailrc files + + Platform-specific modes: + + prototype-generic-mode: For Solaris/Sys V prototype files + pkginfo-generic-mode: For Solaris/Sys V pkginfo files + alias-generic-mode: For C shell alias files + inf-generic-mode: For MS-Windows INF files + ini-generic-mode: For MS-Windows INI files + reg-generic-mode: For MS-Windows Registry files + bat-generic-mode: For MS-Windows BAT scripts + rc-generic-mode: For MS-Windows Resource files + rul-generic-mode: For InstallShield scripts + + +* Lisp changes in Emacs 20.3 since the Emacs Lisp Manual was published + +** If you want a Lisp file to be read in unibyte mode, +use -*-unibyte: t;-*- on its first line. +That will force Emacs to read that file in unibyte mode. +Otherwise, the file will be loaded and byte-compiled in multibyte mode. + +Thus, each lisp file is read in a consistent way regardless of whether +you started Emacs with --unibyte, so that a Lisp program gives +consistent results regardless of how Emacs was started. + +** The new function assoc-default is useful for searching an alist, +and using a default value if the key is not found there. You can +specify a comparison predicate, so this function is useful for +searching comparing a string against an alist of regular expressions. + +** The functions unibyte-char-to-multibyte and +multibyte-char-to-unibyte convert between unibyte and multibyte +character codes, in a way that is appropriate for the current language +environment. + +** The functions read-event, read-char and read-char-exclusive now +take two optional arguments. PROMPT, if non-nil, specifies a prompt +string. SUPPRESS-INPUT-METHOD, if non-nil, says to disable the +current input method for reading this one event. + +** Two new variables print-escape-nonascii and print-escape-multibyte +now control whether to output certain characters as +backslash-sequences. print-escape-nonascii applies to single-byte +non-ASCII characters; print-escape-multibyte applies to multibyte +characters. Both of these variables are used only when printing +in readable fashion (prin1 uses them, princ does not). + + +* Lisp changes in Emacs 20.3 before the Emacs Lisp Manual was published + +** Compiled Emacs Lisp files made with the modified "MBSK" version +of Emacs 20.2 do not work in Emacs 20.3. + +** Buffer positions are now measured in characters, as they were +in Emacs 19 and before. This means that (forward-char 1) +always increases point by 1. + +The function chars-in-region now just subtracts its arguments. It is +considered obsolete. The function char-boundary-p has been deleted. + +See below for additional changes relating to multibyte characters. + +** defcustom, defface and defgroup now accept the keyword `:version'. +Use this to specify in which version of Emacs a certain variable's +default value changed. For example, + + (defcustom foo-max 34 "*Maximum number of foo's allowed." + :type 'integer + :group 'foo + :version "20.3") + + (defgroup foo-group nil "The foo group." + :version "20.3") + +If an entire new group is added or the variables in it have the +default values changed, then just add a `:version' to that group. It +is recommended that new packages added to the distribution contain a +`:version' in the top level group. + +This information is used to control the customize-changed-options command. + +** It is now an error to change the value of a symbol whose name +starts with a colon--if it is interned in the standard obarray. + +However, setting such a symbol to its proper value, which is that +symbol itself, is not an error. This is for the sake of programs that +support previous Emacs versions by explicitly setting these variables +to themselves. + +If you set the variable keyword-symbols-constant-flag to nil, +this error is suppressed, and you can set these symbols to any +values whatever. + +** There is a new debugger command, R. +It evaluates an expression like e, but saves the result +in the buffer *Debugger-record*. + +** Frame-local variables. + +You can now make a variable local to various frames. To do this, call +the function make-variable-frame-local; this enables frames to have +local bindings for that variable. + +These frame-local bindings are actually frame parameters: you create a +frame-local binding in a specific frame by calling +modify-frame-parameters and specifying the variable name as the +parameter name. + +Buffer-local bindings take precedence over frame-local bindings. +Thus, if the current buffer has a buffer-local binding, that binding is +active; otherwise, if the selected frame has a frame-local binding, +that binding is active; otherwise, the default binding is active. + +It would not be hard to implement window-local bindings, but it is not +clear that this would be very useful; windows tend to come and go in a +very transitory fashion, so that trying to produce any specific effect +through a window-local binding would not be very robust. + +** `sregexq' and `sregex' are two new functions for constructing +"symbolic regular expressions." These are Lisp expressions that, when +evaluated, yield conventional string-based regexps. The symbolic form +makes it easier to construct, read, and maintain complex patterns. +See the documentation in sregex.el. + +** parse-partial-sexp's return value has an additional element which +is used to pass information along if you pass it to another call to +parse-partial-sexp, starting its scan where the first call ended. +The contents of this field are not yet finalized. + +** eval-region now accepts a fourth optional argument READ-FUNCTION. +If it is non-nil, that function is used instead of `read'. + +** unload-feature by default removes the feature's functions from +known hooks to avoid trouble, but a package providing FEATURE can +define a hook FEATURE-unload-hook to be run by unload-feature instead. + +** read-from-minibuffer no longer returns the argument DEFAULT-VALUE +when the user enters empty input. It now returns the null string, as +it did in Emacs 19. The default value is made available in the +history via M-n, but it is not applied here as a default. + +The other, more specialized minibuffer-reading functions continue to +return the default value (not the null string) when the user enters +empty input. + +** The new variable read-buffer-function controls which routine to use +for selecting buffers. For example, if you set this variable to +`iswitchb-read-buffer', iswitchb will be used to read buffer names. +Other functions can also be used if they accept the same arguments as +`read-buffer' and return the selected buffer name as a string. + +** The new function read-passwd reads a password from the terminal, +echoing a period for each character typed. It takes three arguments: +a prompt string, a flag which says "read it twice to make sure", and a +default password to use if the user enters nothing. + +** The variable fill-nobreak-predicate gives major modes a way to +specify not to break a line at certain places. Its value is a +function which is called with no arguments, with point located at the +place where a break is being considered. If the function returns +non-nil, then the line won't be broken there. + +** window-end now takes an optional second argument, UPDATE. +If this is non-nil, then the function always returns an accurate +up-to-date value for the buffer position corresponding to the +end of the window, even if this requires computation. + +** other-buffer now takes an optional argument FRAME +which specifies which frame's buffer list to use. +If it is nil, that means use the selected frame's buffer list. + +** The new variable buffer-display-time, always local in every buffer, +holds the value of (current-time) as of the last time that a window +was directed to display this buffer. + +** It is now meaningful to compare two window-configuration objects +with `equal'. Two window-configuration objects are equal if they +describe equivalent arrangements of windows, in the same frame--in +other words, if they would give the same results if passed to +set-window-configuration. + +** compare-window-configurations is a new function that compares two +window configurations loosely. It ignores differences in saved buffer +positions and scrolling, and considers only the structure and sizes of +windows and the choice of buffers to display. + +** The variable minor-mode-overriding-map-alist allows major modes to +override the key bindings of a minor mode. The elements of this alist +look like the elements of minor-mode-map-alist: (VARIABLE . KEYMAP). + +If the VARIABLE in an element of minor-mode-overriding-map-alist has a +non-nil value, the paired KEYMAP is active, and totally overrides the +map (if any) specified for the same variable in minor-mode-map-alist. + +minor-mode-overriding-map-alist is automatically local in all buffers, +and it is meant to be set by major modes. + +** The function match-string-no-properties is like match-string +except that it discards all text properties from the result. + +** The function load-average now accepts an optional argument +USE-FLOATS. If it is non-nil, the load average values are returned as +floating point numbers, rather than as integers to be divided by 100. + +** The new variable temporary-file-directory specifies the directory +to use for creating temporary files. The default value is determined +in a reasonable way for your operating system; on GNU and Unix systems +it is based on the TMP and TMPDIR environment variables. + +** Menu changes + +*** easymenu.el now uses the new menu item format and supports the +keywords :visible and :filter. The existing keyword :keys is now +better supported. + +The variable `easy-menu-precalculate-equivalent-keybindings' controls +a new feature which calculates keyboard equivalents for the menu when +you define the menu. The default is t. If you rarely use menus, you +can set the variable to nil to disable this precalculation feature; +then the calculation is done only if you use the menu bar. + +*** A new format for menu items is supported. + +In a keymap, a key binding that has the format + (STRING . REAL-BINDING) or (STRING HELP-STRING . REAL-BINDING) +defines a menu item. Now a menu item definition may also be a list that +starts with the symbol `menu-item'. + +The format is: + (menu-item ITEM-NAME) or + (menu-item ITEM-NAME REAL-BINDING . ITEM-PROPERTY-LIST) +where ITEM-NAME is an expression which evaluates to the menu item +string, and ITEM-PROPERTY-LIST has the form of a property list. +The supported properties include + +:enable FORM Evaluate FORM to determine whether the + item is enabled. +:visible FORM Evaluate FORM to determine whether the + item should appear in the menu. +:filter FILTER-FN + FILTER-FN is a function of one argument, + which will be REAL-BINDING. + It should return a binding to use instead. +:keys DESCRIPTION + DESCRIPTION is a string that describes an equivalent keyboard + binding for REAL-BINDING. DESCRIPTION is expanded with + `substitute-command-keys' before it is used. +:key-sequence KEY-SEQUENCE + KEY-SEQUENCE is a key-sequence for an equivalent + keyboard binding. +:key-sequence nil + This means that the command normally has no + keyboard equivalent. +:help HELP HELP is the extra help string (not currently used). +:button (TYPE . SELECTED) + TYPE is :toggle or :radio. + SELECTED is a form, to be evaluated, and its + value says whether this button is currently selected. + +Buttons are at the moment only simulated by prefixes in the menu. +Eventually ordinary X-buttons may be supported. + +(menu-item ITEM-NAME) defines unselectable item. + +** New event types + +*** The new event type `mouse-wheel' is generated by a wheel on a +mouse (such as the MS Intellimouse). The event contains a delta that +corresponds to the amount and direction that the wheel is rotated, +which is typically used to implement a scroll or zoom. The format is: + + (mouse-wheel POSITION DELTA) + +where POSITION is a list describing the position of the event in the +same format as a mouse-click event, and DELTA is a signed number +indicating the number of increments by which the wheel was rotated. A +negative DELTA indicates that the wheel was rotated backwards, towards +the user, and a positive DELTA indicates that the wheel was rotated +forward, away from the user. + +As of now, this event type is generated only on MS Windows. + +*** The new event type `drag-n-drop' is generated when a group of +files is selected in an application outside of Emacs, and then dragged +and dropped onto an Emacs frame. The event contains a list of +filenames that were dragged and dropped, which are then typically +loaded into Emacs. The format is: + + (drag-n-drop POSITION FILES) + +where POSITION is a list describing the position of the event in the +same format as a mouse-click event, and FILES is the list of filenames +that were dragged and dropped. + +As of now, this event type is generated only on MS Windows. + +** Changes relating to multibyte characters. + +*** The variable enable-multibyte-characters is now read-only; +any attempt to set it directly signals an error. The only way +to change this value in an existing buffer is with set-buffer-multibyte. + +*** In a string constant, `\ ' now stands for "nothing at all". You +can use it to terminate a hex escape which is followed by a character +that could otherwise be read as part of the hex escape. + +*** String indices are now measured in characters, as they were +in Emacs 19 and before. + +The function chars-in-string has been deleted. +The function concat-chars has been renamed to `string'. + +*** The function set-buffer-multibyte sets the flag in the current +buffer that says whether the buffer uses multibyte representation or +unibyte representation. If the argument is nil, it selects unibyte +representation. Otherwise it selects multibyte representation. + +This function does not change the contents of the buffer, viewed +as a sequence of bytes. However, it does change the contents +viewed as characters; a sequence of two bytes which is treated as +one character when the buffer uses multibyte representation +will count as two characters using unibyte representation. + +This function sets enable-multibyte-characters to record which +representation is in use. It also adjusts various data in the buffer +(including its markers, overlays and text properties) so that they are +consistent with the new representation. + +*** string-make-multibyte takes a string and converts it to multibyte +representation. Most of the time, you don't need to care +about the representation, because Emacs converts when necessary; +however, it makes a difference when you compare strings. + +The conversion of non-ASCII characters works by adding the value of +nonascii-insert-offset to each character, or by translating them +using the table nonascii-translation-table. + +*** string-make-unibyte takes a string and converts it to unibyte +representation. Most of the time, you don't need to care about the +representation, but it makes a difference when you compare strings. + +The conversion from multibyte to unibyte representation +loses information; the only time Emacs performs it automatically +is when inserting a multibyte string into a unibyte buffer. + +*** string-as-multibyte takes a string, and returns another string +which contains the same bytes, but treats them as multibyte. + +*** string-as-unibyte takes a string, and returns another string +which contains the same bytes, but treats them as unibyte. + +*** The new function compare-strings lets you compare +portions of two strings. Unibyte strings are converted to multibyte, +so that a unibyte string can match a multibyte string. +You can specify whether to ignore case or not. + +*** assoc-ignore-case now uses compare-strings so that +it can treat unibyte and multibyte strings as equal. + +*** Regular expression operations and buffer string searches now +convert the search pattern to multibyte or unibyte to accord with the +buffer or string being searched. + +One consequence is that you cannot always use \200-\377 inside of +[...] to match all non-ASCII characters. This does still work when +searching or matching a unibyte buffer or string, but not when +searching or matching a multibyte string. Unfortunately, there is no +obvious choice of syntax to use within [...] for that job. But, what +you want is just to match all non-ASCII characters, the regular +expression [^\0-\177] works for it. + +*** Structure of coding system changed. + +All coding systems (including aliases and subsidiaries) are named +by symbols; the symbol's `coding-system' property is a vector +which defines the coding system. Aliases share the same vector +as the principal name, so that altering the contents of this +vector affects the principal name and its aliases. You can define +your own alias name of a coding system by the function +define-coding-system-alias. + +The coding system definition includes a property list of its own. Use +the new functions `coding-system-get' and `coding-system-put' to +access such coding system properties as post-read-conversion, +pre-write-conversion, character-translation-table-for-decode, +character-translation-table-for-encode, mime-charset, and +safe-charsets. For instance, (coding-system-get 'iso-latin-1 +'mime-charset) gives the corresponding MIME-charset parameter +`iso-8859-1'. + +Among the coding system properties listed above, safe-charsets is new. +The value of this property is a list of character sets which this +coding system can correctly encode and decode. For instance: +(coding-system-get 'iso-latin-1 'safe-charsets) => (ascii latin-iso8859-1) + +Here, "correctly encode" means that the encoded character sets can +also be handled safely by systems other than Emacs as far as they +are capable of that coding system. Though, Emacs itself can encode +the other character sets and read it back correctly. + +*** The new function select-safe-coding-system can be used to find a +proper coding system for encoding the specified region or string. +This function requires a user interaction. + +*** The new functions find-coding-systems-region and +find-coding-systems-string are helper functions used by +select-safe-coding-system. They return a list of all proper coding +systems to encode a text in some region or string. If you don't want +a user interaction, use one of these functions instead of +select-safe-coding-system. + +*** The explicit encoding and decoding functions, such as +decode-coding-region and encode-coding-string, now set +last-coding-system-used to reflect the actual way encoding or decoding +was done. + +*** The new function detect-coding-with-language-environment can be +used to detect a coding system of text according to priorities of +coding systems used by some specific language environment. + +*** The functions detect-coding-region and detect-coding-string always +return a list if the arg HIGHEST is nil. Thus, if only ASCII +characters are found, they now return a list of single element +`undecided' or its subsidiaries. + +*** The new functions coding-system-change-eol-conversion and +coding-system-change-text-conversion can be used to get a different +coding system than what specified only in how end-of-line or text is +converted. + +*** The new function set-selection-coding-system can be used to set a +coding system for communicating with other X clients. + +*** The function `map-char-table' now passes as argument only valid +character codes, plus generic characters that stand for entire +character sets or entire subrows of a character set. In other words, +each time `map-char-table' calls its FUNCTION argument, the key value +either will be a valid individual character code, or will stand for a +range of characters. + +*** The new function `char-valid-p' can be used for checking whether a +Lisp object is a valid character code or not. + +*** The new function `charset-after' returns a charset of a character +in the current buffer at position POS. + +*** Input methods are now implemented using the variable +input-method-function. If this is non-nil, its value should be a +function; then, whenever Emacs reads an input event that is a printing +character with no modifier bits, it calls that function, passing the +event as an argument. Often this function will read more input, first +binding input-method-function to nil. + +The return value should be a list of the events resulting from input +method processing. These events will be processed sequentially as +input, before resorting to unread-command-events. Events returned by +the input method function are not passed to the input method function, +not even if they are printing characters with no modifier bits. + +The input method function is not called when reading the second and +subsequent events of a key sequence. + +*** You can customize any language environment by using +set-language-environment-hook and exit-language-environment-hook. + +The hook `exit-language-environment-hook' should be used to undo +customizations that you made with set-language-environment-hook. For +instance, if you set up a special key binding for a specific language +environment by set-language-environment-hook, you should set up +exit-language-environment-hook to restore the normal key binding. + + + +* Changes in Emacs 20.1 + +** Emacs has a new facility for customization of its many user +options. It is called M-x customize. With this facility you can look +at the many user options in an organized way; they are grouped into a +tree structure. + +M-x customize also knows what sorts of values are legitimate for each +user option and ensures that you don't use invalid values. + +With M-x customize, you can set options either for the present Emacs +session or permanently. (Permanent settings are stored automatically +in your .emacs file.) + +** Scroll bars are now on the left side of the window. +You can change this with M-x customize-option scroll-bar-mode. + +** The mode line no longer includes the string `Emacs'. +This makes more space in the mode line for other information. + +** When you select a region with the mouse, it is highlighted +immediately afterward. At that time, if you type the DELETE key, it +kills the region. + +The BACKSPACE key, and the ASCII character DEL, do not do this; they +delete the character before point, as usual. + +** In an incremental search the whole current match is highlighted +on terminals which support this. (You can disable this feature +by setting search-highlight to nil.) + +** In the minibuffer, in some cases, you can now use M-n to +insert the default value into the minibuffer as text. In effect, +the default value (if the minibuffer routines know it) is tacked +onto the history "in the future". (The more normal use of the +history list is to use M-p to insert minibuffer input used in the +past.) + +** In Text mode, now only blank lines separate paragraphs. +This makes it possible to get the full benefit of Adaptive Fill mode +in Text mode, and other modes derived from it (such as Mail mode). +TAB in Text mode now runs the command indent-relative; this +makes a practical difference only when you use indented paragraphs. + +As a result, the old Indented Text mode is now identical to Text mode, +and is an alias for it. + +If you want spaces at the beginning of a line to start a paragraph, +use the new mode, Paragraph Indent Text mode. + +** Scrolling changes + +*** Scroll commands to scroll a whole screen now preserve the screen +position of the cursor, if scroll-preserve-screen-position is non-nil. + +In this mode, if you scroll several screens back and forth, finishing +on the same screen where you started, the cursor goes back to the line +where it started. + +*** If you set scroll-conservatively to a small number, then when you +move point a short distance off the screen, Emacs will scroll the +screen just far enough to bring point back on screen, provided that +does not exceed `scroll-conservatively' lines. + +*** The new variable scroll-margin says how close point can come to the +top or bottom of a window. It is a number of screen lines; if point +comes within that many lines of the top or bottom of the window, Emacs +recenters the window. + +** International character set support (MULE) + +Emacs now supports a wide variety of international character sets, +including European variants of the Latin alphabet, as well as Chinese, +Devanagari (Hindi and Marathi), Ethiopian, Greek, IPA, Japanese, +Korean, Lao, Russian, Thai, Tibetan, and Vietnamese scripts. These +features have been merged from the modified version of Emacs known as +MULE (for "MULti-lingual Enhancement to GNU Emacs") + +Users of these scripts have established many more-or-less standard +coding systems for storing files. Emacs uses a single multibyte +character encoding within Emacs buffers; it can translate from a wide +variety of coding systems when reading a file and can translate back +into any of these coding systems when saving a file. + +Keyboards, even in the countries where these character sets are used, +generally don't have keys for all the characters in them. So Emacs +supports various "input methods", typically one for each script or +language, to make it possible to type them. + +The Emacs internal multibyte encoding represents a non-ASCII +character as a sequence of bytes in the range 0200 through 0377. + +The new prefix key C-x RET is used for commands that pertain +to multibyte characters, coding systems, and input methods. + +You can disable multibyte character support as follows: + + (setq-default enable-multibyte-characters nil) + +Calling the function standard-display-european turns off multibyte +characters, unless you specify a non-nil value for the second +argument, AUTO. This provides compatibility for people who are +already using standard-display-european to continue using unibyte +characters for their work until they want to change. + +*** Input methods + +An input method is a kind of character conversion which is designed +specifically for interactive input. In Emacs, typically each language +has its own input method (though sometimes several languages which use +the same characters can share one input method). Some languages +support several input methods. + +The simplest kind of input method works by mapping ASCII letters into +another alphabet. This is how the Greek and Russian input methods +work. + +A more powerful technique is composition: converting sequences of +characters into one letter. Many European input methods use +composition to produce a single non-ASCII letter from a sequence which +consists of a letter followed by diacritics. For example, a' is one +sequence of two characters that might be converted into a single +letter. + +The input methods for syllabic scripts typically use mapping followed +by conversion. The input methods for Thai and Korean work this way. +First, letters are mapped into symbols for particular sounds or tone +marks; then, sequences of these which make up a whole syllable are +mapped into one syllable sign--most often a "composite character". + +None of these methods works very well for Chinese and Japanese, so +they are handled specially. First you input a whole word using +phonetic spelling; then, after the word is in the buffer, Emacs +converts it into one or more characters using a large dictionary. + +Since there is more than one way to represent a phonetically spelled +word using Chinese characters, Emacs can only guess which one to use; +typically these input methods give you a way to say "guess again" if +the first guess is wrong. + +*** The command C-x RET m (toggle-enable-multibyte-characters) +turns multibyte character support on or off for the current buffer. + +If multibyte character support is turned off in a buffer, then each +byte is a single character, even codes 0200 through 0377--exactly as +they did in Emacs 19.34. This includes the features for support for +the European characters, ISO Latin-1 and ISO Latin-2. + +However, there is no need to turn off multibyte character support to +use ISO Latin-1 or ISO Latin-2; the Emacs multibyte character set +includes all the characters in these character sets, and Emacs can +translate automatically to and from either one. + +*** Visiting a file in unibyte mode. + +Turning off multibyte character support in the buffer after visiting a +file with multibyte code conversion will display the multibyte +sequences already in the buffer, byte by byte. This is probably not +what you want. + +If you want to edit a file of unibyte characters (Latin-1, for +example), you can do it by specifying `no-conversion' as the coding +system when reading the file. This coding system also turns off +multibyte characters in that buffer. + +If you turn off multibyte character support entirely, this turns off +character conversion as well. + +*** Displaying international characters on X Windows. + +A font for X typically displays just one alphabet or script. +Therefore, displaying the entire range of characters Emacs supports +requires using many fonts. + +Therefore, Emacs now supports "fontsets". Each fontset is a +collection of fonts, each assigned to a range of character codes. + +A fontset has a name, like a font. Individual fonts are defined by +the X server; fontsets are defined within Emacs itself. But once you +have defined a fontset, you can use it in a face or a frame just as +you would use a font. + +If a fontset specifies no font for a certain character, or if it +specifies a font that does not exist on your system, then it cannot +display that character. It will display an empty box instead. + +The fontset height and width are determined by the ASCII characters +(that is, by the font in the fontset which is used for ASCII +characters). + +*** Defining fontsets. + +Emacs does not use any fontset by default. Its default font is still +chosen as in previous versions. You can tell Emacs to use a fontset +with the `-fn' option or the `Font' X resource. + +Emacs creates a standard fontset automatically according to the value +of standard-fontset-spec. This fontset's short name is +`fontset-standard'. Bold, italic, and bold-italic variants of the +standard fontset are created automatically. + +If you specify a default ASCII font with the `Font' resource or `-fn' +argument, a fontset is generated from it. This works by replacing the +FOUNDARY, FAMILY, ADD_STYLE, and AVERAGE_WIDTH fields of the font name +with `*' then using this to specify a fontset. This fontset's short +name is `fontset-startup'. + +Emacs checks resources of the form Fontset-N where N is 0, 1, 2... +The resource value should have this form: + FONTSET-NAME, [CHARSET-NAME:FONT-NAME]... +FONTSET-NAME should have the form of a standard X font name, except: + * most fields should be just the wild card "*". + * the CHARSET_REGISTRY field should be "fontset" + * the CHARSET_ENCODING field can be any nickname of the fontset. +The construct CHARSET-NAME:FONT-NAME can be repeated any number +of times; each time specifies the font for one character set. +CHARSET-NAME should be the name of a character set, and FONT-NAME +should specify an actual font to use for that character set. + +Each of these fontsets has an alias which is made from the +last two font name fields, CHARSET_REGISTRY and CHARSET_ENCODING. +You can refer to the fontset by that alias or by its full name. + +For any character sets that you don't mention, Emacs tries to choose a +font by substituting into FONTSET-NAME. For instance, with the +following resource, + Emacs*Fontset-0: -*-fixed-medium-r-normal-*-24-*-*-*-*-*-fontset-24 +the font for ASCII is generated as below: + -*-fixed-medium-r-normal-*-24-*-ISO8859-1 +Here is the substitution rule: + Change CHARSET_REGISTRY and CHARSET_ENCODING to that of the charset + defined in the variable x-charset-registries. For instance, ASCII has + the entry (ascii . "ISO8859-1") in this variable. Then, reduce + sequences of wild cards -*-...-*- with a single wildcard -*-. + (This is to prevent use of auto-scaled fonts.) + +The function which processes the fontset resource value to create the +fontset is called create-fontset-from-fontset-spec. You can also call +that function explicitly to create a fontset. + +With the X resource Emacs.Font, you can specify a fontset name just +like an actual font name. But be careful not to specify a fontset +name in a wildcard resource like Emacs*Font--that tries to specify the +fontset for other purposes including menus, and they cannot handle +fontsets. + +*** The command M-x set-language-environment sets certain global Emacs +defaults for a particular choice of language. + +Selecting a language environment typically specifies a default input +method and which coding systems to recognize automatically when +visiting files. However, it does not try to reread files you have +already visited; the text in those buffers is not affected. The +language environment may also specify a default choice of coding +system for new files that you create. + +It makes no difference which buffer is current when you use +set-language-environment, because these defaults apply globally to the +whole Emacs session. + +For example, M-x set-language-environment RET Latin-1 RET +chooses the Latin-1 character set. In the .emacs file, you can do this +with (set-language-environment "Latin-1"). + +*** The command C-x RET f (set-buffer-file-coding-system) +specifies the file coding system for the current buffer. This +specifies what sort of character code translation to do when saving +the file. As an argument, you must specify the name of one of the +coding systems that Emacs supports. + +*** The command C-x RET c (universal-coding-system-argument) +lets you specify a coding system when you read or write a file. +This command uses the minibuffer to read a coding system name. +After you exit the minibuffer, the specified coding system +is used for *the immediately following command*. + +So if the immediately following command is a command to read or +write a file, it uses the specified coding system for that file. + +If the immediately following command does not use the coding system, +then C-x RET c ultimately has no effect. + +For example, C-x RET c iso-8859-1 RET C-x C-f temp RET +visits the file `temp' treating it as ISO Latin-1. + +*** You can specify the coding system for a file using the -*- +construct. Include `coding: CODINGSYSTEM;' inside the -*-...-*- +to specify use of coding system CODINGSYSTEM. You can also +specify the coding system in a local variable list at the end +of the file. + +*** The command C-x RET t (set-terminal-coding-system) specifies +the coding system for terminal output. If you specify a character +code for terminal output, all characters output to the terminal are +translated into that character code. + +This feature is useful for certain character-only terminals built in +various countries to support the languages of those countries. + +By default, output to the terminal is not translated at all. + +*** The command C-x RET k (set-keyboard-coding-system) specifies +the coding system for keyboard input. + +Character code translation of keyboard input is useful for terminals +with keys that send non-ASCII graphic characters--for example, +some terminals designed for ISO Latin-1 or subsets of it. + +By default, keyboard input is not translated at all. + +Character code translation of keyboard input is similar to using an +input method, in that both define sequences of keyboard input that +translate into single characters. However, input methods are designed +to be convenient for interactive use, while the code translations are +designed to work with terminals. + +*** The command C-x RET p (set-buffer-process-coding-system) +specifies the coding system for input and output to a subprocess. +This command applies to the current buffer; normally, each subprocess +has its own buffer, and thus you can use this command to specify +translation to and from a particular subprocess by giving the command +in the corresponding buffer. + +By default, process input and output are not translated at all. + +*** The variable file-name-coding-system specifies the coding system +to use for encoding file names before operating on them. +It is also used for decoding file names obtained from the system. + +*** The command C-\ (toggle-input-method) activates or deactivates +an input method. If no input method has been selected before, the +command prompts for you to specify the language and input method you +want to use. + +C-u C-\ (select-input-method) lets you switch to a different input +method. C-h C-\ (or C-h I) describes the current input method. + +*** Some input methods remap the keyboard to emulate various keyboard +layouts commonly used for particular scripts. How to do this +remapping properly depends on your actual keyboard layout. To specify +which layout your keyboard has, use M-x quail-set-keyboard-layout. + +*** The command C-h C (describe-coding-system) displays +the coding systems currently selected for various purposes, plus +related information. + +*** The command C-h h (view-hello-file) displays a file called +HELLO, which has examples of text in many languages, using various +scripts. + +*** The command C-h L (describe-language-support) displays +information about the support for a particular language. +You specify the language as an argument. + +*** The mode line now contains a letter or character that identifies +the coding system used in the visited file. It normally follows the +first dash. + +A dash indicates the default state of affairs: no code conversion +(except CRLF => newline if appropriate). `=' means no conversion +whatsoever. The ISO 8859 coding systems are represented by digits +1 through 9. Other coding systems are represented by letters: + + A alternativnyj (Russian) + B big5 (Chinese) + C cn-gb-2312 (Chinese) + C iso-2022-cn (Chinese) + D in-is13194-devanagari (Indian languages) + E euc-japan (Japanese) + I iso-2022-cjk or iso-2022-ss2 (Chinese, Japanese, Korean) + J junet (iso-2022-7) or old-jis (iso-2022-jp-1978-irv) (Japanese) + K euc-korea (Korean) + R koi8 (Russian) + Q tibetan + S shift_jis (Japanese) + T lao + T tis620 (Thai) + V viscii or vscii (Vietnamese) + i iso-2022-lock (Chinese, Japanese, Korean) + k iso-2022-kr (Korean) + v viqr (Vietnamese) + z hz (Chinese) + +When you are using a character-only terminal (not a window system), +two additional characters appear in between the dash and the file +coding system. These two characters describe the coding system for +keyboard input, and the coding system for terminal output. + +*** The new variable rmail-file-coding-system specifies the code +conversion to use for RMAIL files. The default value is nil. + +When you read mail with Rmail, each message is decoded automatically +into Emacs' internal format. This has nothing to do with +rmail-file-coding-system. That variable controls reading and writing +Rmail files themselves. + +*** The new variable sendmail-coding-system specifies the code +conversion for outgoing mail. The default value is nil. + +Actually, there are three different ways of specifying the coding system +for sending mail: + +- If you use C-x RET f in the mail buffer, that takes priority. +- Otherwise, if you set sendmail-coding-system non-nil, that specifies it. +- Otherwise, the default coding system for new files is used, + if that is non-nil. That comes from your language environment. +- Otherwise, Latin-1 is used. + +*** The command C-h t (help-with-tutorial) accepts a prefix argument +to specify the language for the tutorial file. Currently, English, +Japanese, Korean and Thai are supported. We welcome additional +translations. + +** An easy new way to visit a file with no code or format conversion +of any kind: Use M-x find-file-literally. There is also a command +insert-file-literally which inserts a file into the current buffer +without any conversion. + +** C-q's handling of octal character codes is changed. +You can now specify any number of octal digits. +RET terminates the digits and is discarded; +any other non-digit terminates the digits and is then used as input. + +** There are new commands for looking up Info documentation for +functions, variables and file names used in your programs. + +Type M-x info-lookup-symbol to look up a symbol in the buffer at point. +Type M-x info-lookup-file to look up a file in the buffer at point. + +Precisely which Info files are used to look it up depends on the major +mode. For example, in C mode, the GNU libc manual is used. + +** M-TAB in most programming language modes now runs the command +complete-symbol. This command performs completion on the symbol name +in the buffer before point. + +With a numeric argument, it performs completion based on the set of +symbols documented in the Info files for the programming language that +you are using. + +With no argument, it does completion based on the current tags tables, +just like the old binding of M-TAB (complete-tag). + +** File locking works with NFS now. + +The lock file for FILENAME is now a symbolic link named .#FILENAME, +in the same directory as FILENAME. + +This means that collision detection between two different machines now +works reasonably well; it also means that no file server or directory +can become a bottleneck. + +The new method does have drawbacks. It means that collision detection +does not operate when you edit a file in a directory where you cannot +create new files. Collision detection also doesn't operate when the +file server does not support symbolic links. But these conditions are +rare, and the ability to have collision detection while using NFS is +so useful that the change is worth while. + +When Emacs or a system crashes, this may leave behind lock files which +are stale. So you may occasionally get warnings about spurious +collisions. When you determine that the collision is spurious, just +tell Emacs to go ahead anyway. + +** If you wish to use Show Paren mode to display matching parentheses, +it is no longer sufficient to load paren.el. Instead you must call +show-paren-mode. + +** If you wish to use Delete Selection mode to replace a highlighted +selection when you insert new text, it is no longer sufficient to load +delsel.el. Instead you must call the function delete-selection-mode. + +** If you wish to use Partial Completion mode to complete partial words +within symbols or filenames, it is no longer sufficient to load +complete.el. Instead you must call the function partial-completion-mode. + +** If you wish to use uniquify to rename buffers for you, +it is no longer sufficient to load uniquify.el. You must also +set uniquify-buffer-name-style to one of the non-nil legitimate values. + +** Changes in View mode. + +*** Several new commands are available in View mode. +Do H in view mode for a list of commands. + +*** There are two new commands for entering View mode: +view-file-other-frame and view-buffer-other-frame. + +*** Exiting View mode does a better job of restoring windows to their +previous state. + +*** New customization variable view-scroll-auto-exit. If non-nil, +scrolling past end of buffer makes view mode exit. + +*** New customization variable view-exits-all-viewing-windows. If +non-nil, view-mode will at exit restore all windows viewing buffer, +not just the selected window. + +*** New customization variable view-read-only. If non-nil, visiting a +read-only file automatically enters View mode, and toggle-read-only +turns View mode on or off. + +*** New customization variable view-remove-frame-by-deleting controls +how to remove a not needed frame at view mode exit. If non-nil, +delete the frame, if nil make an icon of it. + +** C-x v l, the command to print a file's version control log, +now positions point at the entry for the file's current branch version. + +** C-x v =, the command to compare a file with the last checked-in version, +has a new feature. If the file is currently not locked, so that it is +presumably identical to the last checked-in version, the command now asks +which version to compare with. + +** When using hideshow.el, incremental search can temporarily show hidden +blocks if a match is inside the block. + +The block is hidden again if the search is continued and the next match +is outside the block. By customizing the variable +isearch-hide-immediately you can choose to hide all the temporarily +shown blocks only when exiting from incremental search. + +By customizing the variable hs-isearch-open you can choose what kind +of blocks to temporarily show during isearch: comment blocks, code +blocks, all of them or none. + +** The new command C-x 4 0 (kill-buffer-and-window) kills the +current buffer and deletes the selected window. It asks for +confirmation first. + +** C-x C-w, which saves the buffer into a specified file name, +now changes the major mode according to that file name. +However, the mode will not be changed if +(1) a local variables list or the `-*-' line specifies a major mode, or +(2) the current major mode is a "special" mode, + not suitable for ordinary files, or +(3) the new file name does not particularly specify any mode. + +This applies to M-x set-visited-file-name as well. + +However, if you set change-major-mode-with-file-name to nil, then +these commands do not change the major mode. + +** M-x occur changes. + +*** If the argument to M-x occur contains upper case letters, +it performs a case-sensitive search. + +*** In the *Occur* buffer made by M-x occur, +if you type g or M-x revert-buffer, this repeats the search +using the same regular expression and the same buffer as before. + +** In Transient Mark mode, the region in any one buffer is highlighted +in just one window at a time. At first, it is highlighted in the +window where you set the mark. The buffer's highlighting remains in +that window unless you select to another window which shows the same +buffer--then the highlighting moves to that window. + +** The feature to suggest key bindings when you use M-x now operates +after the command finishes. The message suggesting key bindings +appears temporarily in the echo area. The previous echo area contents +come back after a few seconds, in case they contain useful information. + +** Each frame now independently records the order for recently +selected buffers, so that the default for C-x b is now based on the +buffers recently selected in the selected frame. + +** Outline mode changes. + +*** Outline mode now uses overlays (this is the former noutline.el). + +*** Incremental searches skip over invisible text in Outline mode. + +** When a minibuffer window is active but not the selected window, if +you try to use the minibuffer, you used to get a nested minibuffer. +Now, this not only gives an error, it also cancels the minibuffer that +was already active. + +The motive for this change is so that beginning users do not +unknowingly move away from minibuffers, leaving them active, and then +get confused by it. + +If you want to be able to have recursive minibuffers, you must +set enable-recursive-minibuffers to non-nil. + +** Changes in dynamic abbrevs. + +*** Expanding dynamic abbrevs with M-/ is now smarter about case +conversion. If the expansion has mixed case not counting the first +character, and the abbreviation matches the beginning of the expansion +including case, then the expansion is copied verbatim. + +The expansion is also copied verbatim if the abbreviation itself has +mixed case. And using SPC M-/ to copy an additional word always +copies it verbatim except when the previous copied word is all caps. + +*** The values of `dabbrev-case-replace' and `dabbrev-case-fold-search' +are no longer Lisp expressions. They have simply three possible +values. + +`dabbrev-case-replace' has these three values: nil (don't preserve +case), t (do), or `case-replace' (do like M-x query-replace). +`dabbrev-case-fold-search' has these three values: nil (don't ignore +case), t (do), or `case-fold-search' (do like search). + +** Minibuffer history lists are truncated automatically now to a +certain length. The variable history-length specifies how long they +can be. The default value is 30. + +** Changes in Mail mode. + +*** The key C-x m no longer runs the `mail' command directly. +Instead, it runs the command `compose-mail', which invokes the mail +composition mechanism you have selected with the variable +`mail-user-agent'. The default choice of user agent is +`sendmail-user-agent', which gives behavior compatible with the old +behavior. + +C-x 4 m now runs compose-mail-other-window, and C-x 5 m runs +compose-mail-other-frame. + +*** While composing a reply to a mail message, from Rmail, you can use +the command C-c C-r to cite just the region from the message you are +replying to. This copies the text which is the selected region in the +buffer that shows the original message. + +*** The command C-c C-i inserts a file at the end of the message, +with separator lines around the contents. + +*** The command M-x expand-mail-aliases expands all mail aliases +in suitable mail headers. Emacs automatically extracts mail alias +definitions from your mail alias file (e.g., ~/.mailrc). You do not +need to expand mail aliases yourself before sending mail. + +*** New features in the mail-complete command. + +**** The mail-complete command now inserts the user's full name, +for local users or if that is known. The variable mail-complete-style +controls the style to use, and whether to do this at all. +Its values are like those of mail-from-style. + +**** The variable mail-passwd-command lets you specify a shell command +to run to fetch a set of password-entries that add to the ones in +/etc/passwd. + +**** The variable mail-passwd-file now specifies a list of files to read +to get the list of user ids. By default, one file is used: +/etc/passwd. + +** You can "quote" a file name to inhibit special significance of +special syntax, by adding `/:' to the beginning. Thus, if you have a +directory named `/foo:', you can prevent it from being treated as a +reference to a remote host named `foo' by writing it as `/:/foo:'. + +Emacs uses this new construct automatically when necessary, such as +when you start it with a working directory whose name might otherwise +be taken to be magic. + +** There is a new command M-x grep-find which uses find to select +files to search through, and grep to scan them. The output is +available in a Compile mode buffer, as with M-x grep. + +M-x grep now uses the -e option if the grep program supports that. +(-e prevents problems if the search pattern starts with a dash.) + +** In Dired, the & command now flags for deletion the files whose names +suggest they are probably not needed in the long run. + +In Dired, * is now a prefix key for mark-related commands. + +new key dired.el binding old key +------- ---------------- ------- + * c dired-change-marks c + * m dired-mark m + * * dired-mark-executables * (binding deleted) + * / dired-mark-directories / (binding deleted) + * @ dired-mark-symlinks @ (binding deleted) + * u dired-unmark u + * DEL dired-unmark-backward DEL + * ? dired-unmark-all-files C-M-? + * ! dired-unmark-all-marks + * % dired-mark-files-regexp % m + * C-n dired-next-marked-file M-} + * C-p dired-prev-marked-file M-{ + +** Rmail changes. + +*** When Rmail cannot convert your incoming mail into Babyl format, it +saves the new mail in the file RMAILOSE.n, where n is an integer +chosen to make a unique name. This way, Rmail will not keep crashing +each time you run it. + +*** In Rmail, the variable rmail-summary-line-count-flag now controls +whether to include the line count in the summary. Non-nil means yes. + +*** In Rmail summary buffers, d and C-d (the commands to delete +messages) now take repeat counts as arguments. A negative argument +means to move in the opposite direction. + +*** In Rmail, the t command now takes an optional argument which lets +you specify whether to show the message headers in full or pruned. + +*** In Rmail, the new command w (rmail-output-body-to-file) writes +just the body of the current message into a file, without the headers. +It takes the file name from the message subject, by default, but you +can edit that file name in the minibuffer before it is actually used +for output. + +** Gnus changes. + +*** nntp.el has been totally rewritten in an asynchronous fashion. + +*** Article prefetching functionality has been moved up into +Gnus. + +*** Scoring can now be performed with logical operators like +`and', `or', `not', and parent redirection. + +*** Article washing status can be displayed in the +article mode line. + +*** gnus.el has been split into many smaller files. + +*** Suppression of duplicate articles based on Message-ID. + +(setq gnus-suppress-duplicates t) + +*** New variables for specifying what score and adapt files +are to be considered home score and adapt files. See +`gnus-home-score-file' and `gnus-home-adapt-files'. + +*** Groups can inherit group parameters from parent topics. + +*** Article editing has been revamped and is now usable. + +*** Signatures can be recognized in more intelligent fashions. +See `gnus-signature-separator' and `gnus-signature-limit'. + +*** Summary pick mode has been made to look more nn-like. +Line numbers are displayed and the `.' command can be +used to pick articles. + +*** Commands for moving the .newsrc.eld from one server to +another have been added. + + `M-x gnus-change-server' + +*** A way to specify that "uninteresting" fields be suppressed when +generating lines in buffers. + +*** Several commands in the group buffer can be undone with +`C-M-_'. + +*** Scoring can be done on words using the new score type `w'. + +*** Adaptive scoring can be done on a Subject word-by-word basis: + + (setq gnus-use-adaptive-scoring '(word)) + +*** Scores can be decayed. + + (setq gnus-decay-scores t) + +*** Scoring can be performed using a regexp on the Date header. The +Date is normalized to compact ISO 8601 format first. + +*** A new command has been added to remove all data on articles from +the native server. + + `M-x gnus-group-clear-data-on-native-groups' + +*** A new command for reading collections of documents +(nndoc with nnvirtual on top) has been added -- `C-M-d'. + +*** Process mark sets can be pushed and popped. + +*** A new mail-to-news backend makes it possible to post +even when the NNTP server doesn't allow posting. + +*** A new backend for reading searches from Web search engines +(DejaNews, Alta Vista, InReference) has been added. + + Use the `G w' command in the group buffer to create such + a group. + +*** Groups inside topics can now be sorted using the standard +sorting functions, and each topic can be sorted independently. + + See the commands under the `T S' submap. + +*** Subsets of the groups can be sorted independently. + + See the commands under the `G P' submap. + +*** Cached articles can be pulled into the groups. + + Use the `Y c' command. + +*** Score files are now applied in a more reliable order. + +*** Reports on where mail messages end up can be generated. + + `M-x nnmail-split-history' + +*** More hooks and functions have been added to remove junk +from incoming mail before saving the mail. + + See `nnmail-prepare-incoming-header-hook'. + +*** The nnml mail backend now understands compressed article files. + +*** To enable Gnus to read/post multi-lingual articles, you must execute +the following code, for instance, in your .emacs. + + (add-hook 'gnus-startup-hook 'gnus-mule-initialize) + +Then, when you start Gnus, it will decode non-ASCII text automatically +and show appropriate characters. (Note: if you are using gnus-mime +from the SEMI package, formerly known as TM, you should NOT add this +hook to gnus-startup-hook; gnus-mime has its own method of handling +this issue.) + +Since it is impossible to distinguish all coding systems +automatically, you may need to specify a choice of coding system for a +particular news group. This can be done by: + + (gnus-mule-add-group NEWSGROUP 'CODING-SYSTEM) + +Here NEWSGROUP should be a string which names a newsgroup or a tree +of newsgroups. If NEWSGROUP is "XXX.YYY", all news groups under +"XXX.YYY" (including "XXX.YYY.ZZZ") will use the specified coding +system. CODING-SYSTEM specifies which coding system to use (for both +for reading and posting). + +CODING-SYSTEM can also be a cons cell of the form + (READ-CODING-SYSTEM . POST-CODING-SYSTEM) +Then READ-CODING-SYSTEM is used when you read messages from the +newsgroups, while POST-CODING-SYSTEM is used when you post messages +there. + +Emacs knows the right coding systems for certain newsgroups by +default. Here are some of these default settings: + + (gnus-mule-add-group "fj" 'iso-2022-7) + (gnus-mule-add-group "alt.chinese.text" 'hz-gb-2312) + (gnus-mule-add-group "alt.hk" 'hz-gb-2312) + (gnus-mule-add-group "alt.chinese.text.big5" 'cn-big5) + (gnus-mule-add-group "soc.culture.vietnamese" '(nil . viqr)) + +When you reply by mail to an article, these settings are ignored; +the mail is encoded according to sendmail-coding-system, as usual. + +** CC mode changes. + +*** If you edit primarily one style of C (or C++, Objective-C, Java) +code, you may want to make the CC Mode style variables have global +values so that you can set them directly in your .emacs file. To do +this, set c-style-variables-are-local-p to nil in your .emacs file. +Note that this only takes effect if you do it *before* cc-mode.el is +loaded. + +If you typically edit more than one style of C (or C++, Objective-C, +Java) code in a single Emacs session, you may want to make the CC Mode +style variables have buffer local values. By default, all buffers +share the same style variable settings; to make them buffer local, set +c-style-variables-are-local-p to t in your .emacs file. Note that you +must do this *before* CC Mode is loaded. + +*** The new variable c-indentation-style holds the C style name +of the current buffer. + +*** The variable c-block-comments-indent-p has been deleted, because +it is no longer necessary. C mode now handles all the supported styles +of block comments, with no need to say which one you will use. + +*** There is a new indentation style "python", which specifies the C +style that the Python developers like. + +*** There is a new c-cleanup-list option: brace-elseif-brace. +This says to put ...} else if (...) {... on one line, +just as brace-else-brace says to put ...} else {... on one line. + +** VC Changes [new] + +*** In vc-retrieve-snapshot (C-x v r), if you don't specify a snapshot +name, it retrieves the *latest* versions of all files in the current +directory and its subdirectories (aside from files already locked). + +This feature is useful if your RCS directory is a link to a common +master directory, and you want to pick up changes made by other +developers. + +You can do the same thing for an individual file by typing C-u C-x C-q +RET in a buffer visiting that file. + +*** VC can now handle files under CVS that are being "watched" by +other developers. Such files are made read-only by CVS. To get a +writable copy, type C-x C-q in a buffer visiting such a file. VC then +calls "cvs edit", which notifies the other developers of it. + +*** vc-version-diff (C-u C-x v =) now suggests reasonable defaults for +version numbers, based on the current state of the file. + +** Calendar changes. + +*** A new function, list-holidays, allows you list holidays or +subclasses of holidays for ranges of years. Related menu items allow +you do this for the year of the selected date, or the +following/previous years. + +*** There is now support for the Baha'i calendar system. Use `pb' in +the *Calendar* buffer to display the current Baha'i date. The Baha'i +calendar, or "Badi calendar" is a system of 19 months with 19 days +each, and 4 intercalary days (5 during a Gregorian leap year). The +calendar begins May 23, 1844, with each of the months named after a +supposed attribute of God. + +** ps-print changes + +There are some new user variables and subgroups for customizing the page +layout. + +*** Headers & Footers (subgroup) + +Some printer systems print a header page and force the first page to +be printed on the back of the header page when using duplex. If your +printer system has this behavior, set variable +`ps-banner-page-when-duplexing' to t. + +If variable `ps-banner-page-when-duplexing' is non-nil, it prints a +blank page as the very first printed page. So, it behaves as if the +very first character of buffer (or region) were a form feed ^L (\014). + +The variable `ps-spool-config' specifies who is responsible for +setting duplex mode and page size. Valid values are: + + lpr-switches duplex and page size are configured by `ps-lpr-switches'. + Don't forget to set `ps-lpr-switches' to select duplex + printing for your printer. + + setpagedevice duplex and page size are configured by ps-print using the + setpagedevice PostScript operator. + + nil duplex and page size are configured by ps-print *not* using + the setpagedevice PostScript operator. + +The variable `ps-spool-tumble' specifies how the page images on +opposite sides of a sheet are oriented with respect to each other. If +`ps-spool-tumble' is nil, ps-print produces output suitable for +bindings on the left or right. If `ps-spool-tumble' is non-nil, +ps-print produces output suitable for bindings at the top or bottom. +This variable takes effect only if `ps-spool-duplex' is non-nil. +The default value is nil. + +The variable `ps-header-frame-alist' specifies a header frame +properties alist. Valid frame properties are: + + fore-color Specify the foreground frame color. + Value should be a float number between 0.0 (black + color) and 1.0 (white color), or a string which is a + color name, or a list of 3 float numbers which + correspond to the Red Green Blue color scale, each + float number between 0.0 (dark color) and 1.0 (bright + color). The default is 0 ("black"). + + back-color Specify the background frame color (similar to fore-color). + The default is 0.9 ("gray90"). + + shadow-color Specify the shadow color (similar to fore-color). + The default is 0 ("black"). + + border-color Specify the border color (similar to fore-color). + The default is 0 ("black"). + + border-width Specify the border width. + The default is 0.4. + +Any other property is ignored. + +Don't change this alist directly; instead use Custom, or the +`ps-value', `ps-get', `ps-put' and `ps-del' functions (see there for +documentation). + +Ps-print can also print footers. The footer variables are: +`ps-print-footer', `ps-footer-offset', `ps-print-footer-frame', +`ps-footer-font-family', `ps-footer-font-size', `ps-footer-line-pad', +`ps-footer-lines', `ps-left-footer', `ps-right-footer' and +`ps-footer-frame-alist'. These variables are similar to those +controlling headers. + +*** Color management (subgroup) + +If `ps-print-color-p' is non-nil, the buffer's text will be printed in +color. + +*** Face Management (subgroup) + +If you need to print without worrying about face background colors, +set the variable `ps-use-face-background' which specifies if face +background should be used. Valid values are: + + t always use face background color. + nil never use face background color. + (face...) list of faces whose background color will be used. + +*** N-up printing (subgroup) + +The variable `ps-n-up-printing' specifies the number of pages per +sheet of paper. + +The variable `ps-n-up-margin' specifies the margin in points (pt) +between the sheet border and the n-up printing. + +If variable `ps-n-up-border-p' is non-nil, a border is drawn around +each page. + +The variable `ps-n-up-filling' specifies how the page matrix is filled +on each sheet of paper. Following are the valid values for +`ps-n-up-filling' with a filling example using a 3x4 page matrix: + + `left-top' 1 2 3 4 `left-bottom' 9 10 11 12 + 5 6 7 8 5 6 7 8 + 9 10 11 12 1 2 3 4 + + `right-top' 4 3 2 1 `right-bottom' 12 11 10 9 + 8 7 6 5 8 7 6 5 + 12 11 10 9 4 3 2 1 + + `top-left' 1 4 7 10 `bottom-left' 3 6 9 12 + 2 5 8 11 2 5 8 11 + 3 6 9 12 1 4 7 10 + + `top-right' 10 7 4 1 `bottom-right' 12 9 6 3 + 11 8 5 2 11 8 5 2 + 12 9 6 3 10 7 4 1 + +Any other value is treated as `left-top'. + +*** Zebra stripes (subgroup) + +The variable `ps-zebra-color' controls the zebra stripes grayscale or +RGB color. + +The variable `ps-zebra-stripe-follow' specifies how zebra stripes +continue on next page. Visually, valid values are (the character `+' +to the right of each column indicates that a line is printed): + + `nil' `follow' `full' `full-follow' + Current Page -------- ----------- --------- ---------------- + 1 XXXXX + 1 XXXXXXXX + 1 XXXXXX + 1 XXXXXXXXXXXXX + + 2 XXXXX + 2 XXXXXXXX + 2 XXXXXX + 2 XXXXXXXXXXXXX + + 3 XXXXX + 3 XXXXXXXX + 3 XXXXXX + 3 XXXXXXXXXXXXX + + 4 + 4 + 4 + 4 + + 5 + 5 + 5 + 5 + + 6 + 6 + 6 + 6 + + 7 XXXXX + 7 XXXXXXXX + 7 XXXXXX + 7 XXXXXXXXXXXXX + + 8 XXXXX + 8 XXXXXXXX + 8 XXXXXX + 8 XXXXXXXXXXXXX + + 9 XXXXX + 9 XXXXXXXX + 9 XXXXXX + 9 XXXXXXXXXXXXX + + 10 + 10 + + 11 + 11 + + -------- ----------- --------- ---------------- + Next Page -------- ----------- --------- ---------------- + 12 XXXXX + 12 + 10 XXXXXX + 10 + + 13 XXXXX + 13 XXXXXXXX + 11 XXXXXX + 11 + + 14 XXXXX + 14 XXXXXXXX + 12 XXXXXX + 12 + + 15 + 15 XXXXXXXX + 13 + 13 XXXXXXXXXXXXX + + 16 + 16 + 14 + 14 XXXXXXXXXXXXX + + 17 + 17 + 15 + 15 XXXXXXXXXXXXX + + 18 XXXXX + 18 + 16 XXXXXX + 16 + + 19 XXXXX + 19 XXXXXXXX + 17 XXXXXX + 17 + + 20 XXXXX + 20 XXXXXXXX + 18 XXXXXX + 18 + + 21 + 21 XXXXXXXX + + 22 + 22 + + -------- ----------- --------- ---------------- + +Any other value is treated as `nil'. + + +*** Printer management (subgroup) + +The variable `ps-printer-name-option' determines the option used by +some utilities to indicate the printer name; it's used only when +`ps-printer-name' is a non-empty string. If you're using the lpr +utility to print, for example, `ps-printer-name-option' should be set +to "-P". + +The variable `ps-manual-feed' indicates if the printer requires manual +paper feeding. If it's nil, automatic feeding takes place. If it's +non-nil, manual feeding takes place. + +The variable `ps-end-with-control-d' specifies whether C-d (\x04) +should be inserted at end of the generated PostScript. Non-nil means +do so. + +*** Page settings (subgroup) + +If variable `ps-warn-paper-type' is nil, it's *not* treated as an +error if the PostScript printer doesn't have a paper with the size +indicated by `ps-paper-type'; the default paper size will be used +instead. If `ps-warn-paper-type' is non-nil, an error is signaled if +the PostScript printer doesn't support a paper with the size indicated +by `ps-paper-type'. This is used when `ps-spool-config' is set to +`setpagedevice'. + +The variable `ps-print-upside-down' determines the orientation for +printing pages: nil means `normal' printing, non-nil means +`upside-down' printing (that is, the page is rotated by 180 degrees). + +The variable `ps-selected-pages' specifies which pages to print. If +it's nil, all pages are printed. If it's a list, list elements may be +integers specifying a single page to print, or cons cells (FROM . TO) +specifying to print from page FROM to TO. Invalid list elements, that +is integers smaller than one, or elements whose FROM is greater than +its TO, are ignored. + +The variable `ps-even-or-odd-pages' specifies how to print even/odd +pages. Valid values are: + + nil print all pages. + + `even-page' print only even pages. + + `odd-page' print only odd pages. + + `even-sheet' print only even sheets. + That is, if `ps-n-up-printing' is 1, it behaves like + `even-page', but for values greater than 1, it'll + print only the even sheet of paper. + + `odd-sheet' print only odd sheets. + That is, if `ps-n-up-printing' is 1, it behaves like + `odd-page'; but for values greater than 1, it'll print + only the odd sheet of paper. + +Any other value is treated as nil. + +If you set `ps-selected-pages' (see there for documentation), pages +are filtered by `ps-selected-pages', and then by +`ps-even-or-odd-pages'. For example, if we have: + + (setq ps-selected-pages '(1 4 (6 . 10) (12 . 16) 20)) + +and we combine this with `ps-even-or-odd-pages' and +`ps-n-up-printing', we get: + +`ps-n-up-printing' = 1: + `ps-even-or-odd-pages' PAGES PRINTED + nil 1, 4, 6, 7, 8, 9, 10, 12, 13, 14, 15, 16, 20 + even-page 4, 6, 8, 10, 12, 14, 16, 20 + odd-page 1, 7, 9, 13, 15 + even-sheet 4, 6, 8, 10, 12, 14, 16, 20 + odd-sheet 1, 7, 9, 13, 15 + +`ps-n-up-printing' = 2: + `ps-even-or-odd-pages' PAGES PRINTED + nil 1/4, 6/7, 8/9, 10/12, 13/14, 15/16, 20 + even-page 4/6, 8/10, 12/14, 16/20 + odd-page 1/7, 9/13, 15 + even-sheet 6/7, 10/12, 15/16 + odd-sheet 1/4, 8/9, 13/14, 20 + +*** Miscellany (subgroup) + +The variable `ps-error-handler-message' specifies where error handler +messages should be sent. + +It is also possible to add a user-defined PostScript prologue code in +front of all generated prologue code by setting the variable +`ps-user-defined-prologue'. + +The variable `ps-line-number-font' specifies the font for line numbers. + +The variable `ps-line-number-font-size' specifies the font size in +points for line numbers. + +The variable `ps-line-number-color' specifies the color for line +numbers. See `ps-zebra-color' for documentation. + +The variable `ps-line-number-step' specifies the interval in which +line numbers are printed. For example, if `ps-line-number-step' is set +to 2, the printing will look like: + + 1 one line + one line + 3 one line + one line + 5 one line + one line + ... + +Valid values are: + +integer an integer specifying the interval in which line numbers are + printed. If it's smaller than or equal to zero, 1 + is used. + +`zebra' specifies that only the line number of the first line in a + zebra stripe is to be printed. + +Any other value is treated as `zebra'. + +The variable `ps-line-number-start' specifies the starting point in +the interval given by `ps-line-number-step'. For example, if +`ps-line-number-step' is set to 3, and `ps-line-number-start' is set to +3, the output will look like: + + one line + one line + 3 one line + one line + one line + 6 one line + one line + one line + 9 one line + one line + ... + +The variable `ps-postscript-code-directory' specifies the directory +where the PostScript prologue file used by ps-print is found. + +The variable `ps-line-spacing' determines the line spacing in points, +for ordinary text, when generating PostScript (similar to +`ps-font-size'). + +The variable `ps-paragraph-spacing' determines the paragraph spacing, +in points, for ordinary text, when generating PostScript (similar to +`ps-font-size'). + +The variable `ps-paragraph-regexp' specifies the paragraph delimiter. + +The variable `ps-begin-cut-regexp' and `ps-end-cut-regexp' specify the +start and end of a region to cut out when printing. + +** hideshow changes. + +*** now supports hiding of blocks of single line comments (like // for +C++, ; for lisp). + +*** Support for java-mode added. + +*** When doing `hs-hide-all' it is now possible to also hide the comments +in the file if `hs-hide-comments-when-hiding-all' is set. + +*** The new function `hs-hide-initial-comment' hides the comments at +the beginning of the files. Finally those huge RCS logs don't stay in your +way! This is run by default when entering the `hs-minor-mode'. + +*** Now uses overlays instead of `selective-display', so is more +robust and a lot faster. + +*** A block beginning can span multiple lines. + +*** The new variable `hs-show-hidden-short-form' if t, directs hideshow +to show only the beginning of a block when it is hidden. See the +documentation for more details. + +** Changes in Enriched mode. + +*** When you visit a file in enriched-mode, Emacs will make sure it is +filled to the current fill-column. This behavior is now independent +of the size of the window. When you save the file, the fill-column in +use is stored as well, so that the whole buffer need not be refilled +the next time unless the fill-column is different. + +*** use-hard-newlines is now a minor mode. When it is enabled, Emacs +distinguishes between hard and soft newlines, and treats hard newlines +as paragraph boundaries. Otherwise all newlines inserted are marked +as soft, and paragraph boundaries are determined solely from the text. + +** Font Lock mode + +*** Custom support + +The variables font-lock-face-attributes, font-lock-display-type and +font-lock-background-mode are now obsolete; the recommended way to specify +the faces to use for Font Lock mode is with M-x customize-group on the new +custom group font-lock-faces. If you set font-lock-face-attributes in your +~/.emacs file, Font Lock mode will respect its value. However, you should +consider converting from setting that variable to using M-x customize. + +You can still use X resources to specify Font Lock face appearances. + +*** Maximum decoration + +Fontification now uses the maximum level of decoration supported by +default. Previously, fontification used a mode-specific default level +of decoration, which is typically the minimum level of decoration +supported. You can set font-lock-maximum-decoration to nil +to get the old behavior. + +*** New support + +Support is now provided for Java, Objective-C, AWK and SIMULA modes. + +Note that Font Lock mode can be turned on without knowing exactly what modes +support Font Lock mode, via the command global-font-lock-mode. + +*** Configurable support + +Support for C, C++, Objective-C and Java can be more easily configured for +additional types and classes via the new variables c-font-lock-extra-types, +c++-font-lock-extra-types, objc-font-lock-extra-types and, you guessed it, +java-font-lock-extra-types. These value of each of these variables should be a +list of regexps matching the extra type names. For example, the default value +of c-font-lock-extra-types is ("\\sw+_t") which means fontification follows the +convention that C type names end in _t. This results in slower fontification. + +Of course, you can change the variables that specify fontification in whatever +way you wish, typically by adding regexps. However, these new variables make +it easier to make specific and common changes for the fontification of types. + +*** Adding highlighting patterns to existing support + +You can use the new function font-lock-add-keywords to add your own +highlighting patterns, such as for project-local or user-specific constructs, +for any mode. + +For example, to highlight `FIXME:' words in C comments, put: + + (font-lock-add-keywords 'c-mode '(("\\<FIXME:" 0 font-lock-warning-face t))) + +in your ~/.emacs. + +*** New faces + +Font Lock now defines two new faces, font-lock-builtin-face and +font-lock-warning-face. These are intended to highlight builtin keywords, +distinct from a language's normal keywords, and objects that should be brought +to user attention, respectively. Various modes now use these new faces. + +*** Changes to fast-lock support mode + +The fast-lock package, one of the two Font Lock support modes, can now process +cache files silently. You can use the new variable fast-lock-verbose, in the +same way as font-lock-verbose, to control this feature. + +*** Changes to lazy-lock support mode + +The lazy-lock package, one of the two Font Lock support modes, can now fontify +according to the true syntactic context relative to other lines. You can use +the new variable lazy-lock-defer-contextually to control this feature. If +non-nil, changes to the buffer will cause subsequent lines in the buffer to be +refontified after lazy-lock-defer-time seconds of idle time. If nil, then only +the modified lines will be refontified; this is the same as the previous Lazy +Lock mode behavior and the behavior of Font Lock mode. + +This feature is useful in modes where strings or comments can span lines. +For example, if a string or comment terminating character is deleted, then if +this feature is enabled subsequent lines in the buffer will be correctly +refontified to reflect their new syntactic context. Previously, only the line +containing the deleted character would be refontified and you would have to use +the command M-o M-o (font-lock-fontify-block) to refontify some lines. + +As a consequence of this new feature, two other variables have changed: + +Variable `lazy-lock-defer-driven' is renamed `lazy-lock-defer-on-scrolling'. +Variable `lazy-lock-defer-time' can now only be a time, i.e., a number. +Buffer modes for which on-the-fly deferral applies can be specified via the +new variable `lazy-lock-defer-on-the-fly'. + +If you set these variables in your ~/.emacs, then you may have to change those +settings. + +** Ada mode changes. + +*** There is now better support for using find-file.el with Ada mode. +If you switch between spec and body, the cursor stays in the same +procedure (modulo overloading). If a spec has no body file yet, but +you try to switch to its body file, Ada mode now generates procedure +stubs. + +*** There are two new commands: + - `ada-make-local' : invokes gnatmake on the current buffer + - `ada-check-syntax' : check syntax of current buffer. + +The user options `ada-compiler-make', `ada-make-options', +`ada-language-version', `ada-compiler-syntax-check', and +`ada-compile-options' are used within these commands. + +*** Ada mode can now work with Outline minor mode. The outline level +is calculated from the indenting, not from syntactic constructs. +Outlining does not work if your code is not correctly indented. + +*** The new function `ada-gnat-style' converts the buffer to the style of +formatting used in GNAT. It places two blanks after a comment start, +places one blank between a word end and an opening '(', and puts one +space between a comma and the beginning of a word. + +** Scheme mode changes. + +*** Scheme mode indentation now uses many of the facilities of Lisp +mode; therefore, the variables to customize it are the variables used +for Lisp mode which have names starting with `lisp-'. The variables +with names starting with `scheme-' which used to do this no longer +have any effect. + +If you want to use different indentation for Scheme and Lisp, this is +still possible, but now you must do it by adding a hook to +scheme-mode-hook, which could work by setting the `lisp-' indentation +variables as buffer-local variables. + +*** DSSSL mode is a variant of Scheme mode, for editing DSSSL scripts. +Use M-x dsssl-mode. + +** Changes to the emacsclient program + +*** If a socket can't be found, and environment variables LOGNAME or +USER are set, emacsclient now looks for a socket based on the UID +associated with the name. That is an emacsclient running as root +can connect to an Emacs server started by a non-root user. + +*** The emacsclient program now accepts an option --no-wait which tells +it to return immediately without waiting for you to "finish" the +buffer in Emacs. + +*** The new option --alternate-editor allows to specify an editor to +use if Emacs is not running. The environment variable +ALTERNATE_EDITOR can be used for the same effect; the command line +option takes precedence. + +** M-x eldoc-mode enables a minor mode in which the echo area +constantly shows the parameter list for function being called at point +(in Emacs Lisp and Lisp Interaction modes only). + +** C-x n d now runs the new command narrow-to-defun, +which narrows the accessible parts of the buffer to just +the current defun. + +** Emacs now handles the `--' argument in the standard way; all +following arguments are treated as ordinary file names. + +** On MSDOS and Windows, the bookmark file is now called _emacs.bmk, +and the saved desktop file is now called _emacs.desktop (truncated if +necessary). + +** When you kill a buffer that visits a file, +if there are any registers that save positions in the file, +these register values no longer become completely useless. +If you try to go to such a register with C-x j, then you are +asked whether to visit the file again. If you say yes, +it visits the file and then goes to the same position. + +** When you visit a file that changes frequently outside Emacs--for +example, a log of output from a process that continues to run--it may +be useful for Emacs to revert the file without querying you whenever +you visit the file afresh with C-x C-f. + +You can request this behavior for certain files by setting the +variable revert-without-query to a list of regular expressions. If a +file's name matches any of these regular expressions, find-file and +revert-buffer revert the buffer without asking for permission--but +only if you have not edited the buffer text yourself. + +** set-default-font has been renamed to set-frame-font +since it applies only to the current frame. + +** In TeX mode, you can use the variable tex-main-file to specify the +file for tex-file to run TeX on. (By default, tex-main-file is nil, +and tex-file runs TeX on the current visited file.) + +This is useful when you are editing a document that consists of +multiple files. In each of the included files, you can set up a local +variable list which specifies the top-level file of your document for +tex-main-file. Then tex-file will run TeX on the whole document +instead of just the file you are editing. + +** RefTeX mode + +RefTeX mode is a new minor mode with special support for \label, \ref +and \cite macros in LaTeX documents. RefTeX distinguishes labels of +different environments (equation, figure, ...) and has full support for +multifile documents. To use it, select a buffer with a LaTeX document and +turn the mode on with M-x reftex-mode. Here are the main user commands: + +C-c ( reftex-label + Creates a label semi-automatically. RefTeX is context sensitive and + knows which kind of label is needed. + +C-c ) reftex-reference + Offers in a menu all labels in the document, along with context of the + label definition. The selected label is referenced as \ref{LABEL}. + +C-c [ reftex-citation + Prompts for a regular expression and displays a list of matching BibTeX + database entries. The selected entry is cited with a \cite{KEY} macro. + +C-c & reftex-view-crossref + Views the cross reference of a \ref or \cite command near point. + +C-c = reftex-toc + Shows a table of contents of the (multifile) document. From there you + can quickly jump to every section. + +Under X, RefTeX installs a "Ref" menu in the menu bar, with additional +commands. Press `?' to get help when a prompt mentions this feature. +Full documentation and customization examples are in the file +reftex.el. You can use the finder to view the file documentation: +C-h p --> tex --> reftex.el + +** Changes in BibTeX mode. + +*** Info documentation is now available. + +*** Don't allow parentheses in string constants anymore. This confused +both the BibTeX program and Emacs BibTeX mode. + +*** Renamed variable bibtex-mode-user-optional-fields to +bibtex-user-optional-fields. + +*** Removed variable bibtex-include-OPTannote +(use bibtex-user-optional-fields instead). + +*** New interactive functions to copy and kill fields and complete +entries to the BibTeX kill ring, from where they can be yanked back by +appropriate functions. + +*** New interactive functions for repositioning and marking of +entries. They are bound by default to C-M-l and C-M-h. + +*** New hook bibtex-clean-entry-hook. It is called after entry has +been cleaned. + +*** New variable bibtex-field-delimiters, which replaces variables +bibtex-field-{left|right}-delimiter. + +*** New variable bibtex-entry-delimiters to determine how entries +shall be delimited. + +*** Allow preinitialization of fields. See documentation of +bibtex-user-optional-fields, bibtex-entry-field-alist, and +bibtex-include-OPTkey for details. + +*** Book and InBook entries require either an author or an editor +field. This is now supported by bibtex.el. Alternative fields are +prefixed with `ALT'. + +*** New variable bibtex-entry-format, which replaces variable +bibtex-clean-entry-zap-empty-opts and allows specification of many +formatting options performed on cleaning an entry (see variable +documentation). + +*** Even more control on how automatic keys are generated. See +documentation of bibtex-generate-autokey for details. Transcriptions +for foreign languages other than German are now handled, too. + +*** New boolean user option bibtex-comma-after-last-field to decide if +comma should be inserted at end of last field. + +*** New boolean user option bibtex-align-at-equal-sign to determine if +alignment should be made at left side of field contents or at equal +signs. New user options to control entry layout (e.g. indentation). + +*** New function bibtex-fill-entry to realign entries. + +*** New function bibtex-reformat to reformat region or buffer. + +*** New function bibtex-convert-alien to convert a BibTeX database +from alien sources. + +*** New function bibtex-complete-key (similar to bibtex-complete-string) +to complete prefix to a key defined in buffer. Mainly useful in +crossref entries. + +*** New function bibtex-count-entries to count entries in buffer or +region. + +*** Added support for imenu. + +*** The function `bibtex-validate' now checks current region instead +of buffer if mark is active. Now it shows all errors of buffer in a +`compilation mode' buffer. You can use the normal commands (e.g. +`next-error') for compilation modes to jump to errors. + +*** New variable `bibtex-string-file-path' to determine where the files +from `bibtex-string-files' are searched. + +** Iso Accents mode now supports Latin-3 as an alternative. + +** The command next-error now opens blocks hidden by hideshow. + +** The function using-unix-filesystems has been replaced by the +functions add-untranslated-filesystem and remove-untranslated-filesystem. +Each of these functions takes the name of a drive letter or directory +as an argument. + +When a filesystem is added as untranslated, all files on it are read +and written in binary mode (no cr/lf translation is performed). + +** browse-url changes + +*** New methods for: Grail (browse-url-generic), MMM (browse-url-mmm), +Lynx in a separate xterm (browse-url-lynx-xterm) or in an Emacs window +(browse-url-lynx-emacs), remote W3 (browse-url-w3-gnudoit), generic +non-remote-controlled browsers (browse-url-generic) and associated +customization variables. + +*** New commands `browse-url-of-region' and `browse-url'. + +*** URLs marked up with <URL:...> (RFC1738) work if broken across +lines. Browsing methods can be associated with URL regexps +(e.g. mailto: URLs) via `browse-url-browser-function'. + +** Changes in Ediff + +*** Clicking Mouse-2 on a brief command description in Ediff control panel +pops up the Info file for this command. + +*** There is now a variable, ediff-autostore-merges, which controls whether +the result of a merge is saved in a file. By default, this is done only when +merge is done from a session group (eg, when merging files in two different +directories). + +*** Since Emacs 19.31 (this hasn't been announced before), Ediff can compare +and merge groups of files residing in different directories, or revisions of +files in the same directory. + +*** Since Emacs 19.31, Ediff can apply multi-file patches interactively. +The patches must be in the context format or GNU unified format. (The bug +related to the GNU format has now been fixed.) + +** Changes in Viper + +*** The startup file is now .viper instead of .vip +*** All variable/function names have been changed to start with viper- + instead of vip-. +*** C-\ now simulates the meta-key in all Viper states. +*** C-z in Insert state now escapes to Vi for the duration of the next +Viper command. In Vi and Insert states, C-z behaves as before. +*** C-c \ escapes to Vi for one command if Viper is in Insert or Emacs states. +*** _ is no longer the meta-key in Vi state. +*** The variable viper-insert-state-cursor-color can be used to change cursor +color when Viper is in insert state. +*** If search lands the cursor near the top or the bottom of the window, +Viper pulls the window up or down to expose more context. The variable +viper-adjust-window-after-search controls this behavior. + +** Etags changes. + +*** In C, C++, Objective C and Java, Etags tags global variables by +default. The resulting tags files are inflated by 30% on average. +Use --no-globals to turn this feature off. Etags can also tag +variables which are members of structure-like constructs, but it does +not by default. Use --members to turn this feature on. + +*** C++ member functions are now recognized as tags. + +*** Java is tagged like C++. In addition, "extends" and "implements" +constructs are tagged. Files are recognized by the extension .java. + +*** Etags can now handle programs written in Postscript. Files are +recognized by the extensions .ps and .pdb (Postscript with C syntax). +In Postscript, tags are lines that start with a slash. + +*** Etags now handles Objective C and Objective C++ code. The usual C and +C++ tags are recognized in these languages; in addition, etags +recognizes special Objective C syntax for classes, class categories, +methods and protocols. + +*** Etags also handles Cobol. Files are recognized by the extension +.cobol. The tagged lines are those containing a word that begins in +column 8 and ends in a full stop, i.e. anything that could be a +paragraph name. + +*** Regexps in Etags now support intervals, as in ed or grep. The syntax of +an interval is \{M,N\}, and it means to match the preceding expression +at least M times and as many as N times. + +** The format for specifying a custom format for time-stamp to insert +in files has changed slightly. + +With the new enhancements to the functionality of format-time-string, +time-stamp-format will change to be eventually compatible with it. +This conversion is being done in two steps to maintain compatibility +with old time-stamp-format values. + +In the new scheme, alternate case is signified by the number-sign +(`#') modifier, rather than changing the case of the format character. +This feature is as yet incompletely implemented for compatibility +reasons. + +In the old time-stamp-format, all numeric fields defaulted to their +natural width. (With format-time-string, each format has a +fixed-width default.) In this version, you can specify the colon +(`:') modifier to a numeric conversion to mean "give me the historical +time-stamp-format width default." Do not use colon if you are +specifying an explicit width, as in "%02d". + +Numbers are no longer truncated to the requested width, except in the +case of "%02y", which continues to give a two-digit year. Digit +truncation probably wasn't being used for anything else anyway. + +The new formats will work with old versions of Emacs. New formats are +being recommended now to allow time-stamp-format to change in the +future to be compatible with format-time-string. The new forms being +recommended now will continue to work then. + +See the documentation string for the variable time-stamp-format for +details. + +** There are some additional major modes: + +dcl-mode, for editing VMS DCL files. +m4-mode, for editing files of m4 input. +meta-mode, for editing MetaFont and MetaPost source files. + +** In Shell mode, the command shell-copy-environment-variable lets you +copy the value of a specified environment variable from the subshell +into Emacs. + +** New Lisp packages include: + +*** battery.el displays battery status for laptops. + +*** M-x bruce (named after Lenny Bruce) is a program that might +be used for adding some indecent words to your email. + +*** M-x crisp-mode enables an emulation for the CRiSP editor. + +*** M-x dirtrack arranges for better tracking of directory changes +in shell buffers. + +*** The new library elint.el provides for linting of Emacs Lisp code. +See the documentation for `elint-initialize', `elint-current-buffer' +and `elint-defun'. + +*** M-x expand-add-abbrevs defines a special kind of abbrev which is +meant for programming constructs. These abbrevs expand like ordinary +ones, when you type SPC, but only at the end of a line and not within +strings or comments. + +These abbrevs can act as templates: you can define places within an +abbrev for insertion of additional text. Once you expand the abbrev, +you can then use C-x a p and C-x a n to move back and forth to these +insertion points. Thus you can conveniently insert additional text +at these points. + +*** filecache.el remembers the location of files so that you +can visit them by short forms of their names. + +*** find-func.el lets you find the definition of the user-loaded +Emacs Lisp function at point. + +*** M-x handwrite converts text to a "handwritten" picture. + +*** M-x iswitchb-buffer is a command for switching to a buffer, much like +switch-buffer, but it reads the argument in a more helpful way. + +*** M-x landmark implements a neural network for landmark learning. + +*** M-x locate provides a convenient interface to the `locate' program. + +*** M4 mode is a new mode for editing files of m4 input. + +*** mantemp.el creates C++ manual template instantiations +from the GCC error messages which indicate which instantiations are needed. + +*** mouse-copy.el provides a one-click copy and move feature. +You can drag a region with M-mouse-1, and it is automatically +inserted at point. M-Shift-mouse-1 deletes the text from its +original place after inserting the copy. + +*** mouse-drag.el lets you do scrolling by dragging Mouse-2 +on the buffer. + +You click the mouse and move; that distance either translates into the +velocity to scroll (with mouse-drag-throw) or the distance to scroll +(with mouse-drag-drag). Horizontal scrolling is enabled when needed. + +Enable mouse-drag with: + (global-set-key [down-mouse-2] 'mouse-drag-throw) +-or- + (global-set-key [down-mouse-2] 'mouse-drag-drag) + +*** mspools.el is useful for determining which mail folders have +mail waiting to be read in them. It works with procmail. + +*** Octave mode is a major mode for editing files of input for Octave. +It comes with a facility for communicating with an Octave subprocess. + +*** ogonek + +The ogonek package provides functions for changing the coding of +Polish diacritic characters in buffers. Codings known from various +platforms are supported such as ISO8859-2, Mazovia, IBM Latin2, and +TeX. For example, you can change the coding from Mazovia to +ISO8859-2. Another example is a change of coding from ISO8859-2 to +prefix notation (in which `/a' stands for the aogonek character, for +instance) and vice versa. + +To use this package load it using + M-x load-library [enter] ogonek +Then, you may get an explanation by calling one of + M-x ogonek-jak -- in Polish + M-x ogonek-how -- in English +The info specifies the commands and variables provided as well as the +ways of customization in `.emacs'. + +*** Interface to ph. + +Emacs provides a client interface to CCSO Nameservers (ph/qi) + +The CCSO nameserver is used in many universities to provide directory +services about people. ph.el provides a convenient Emacs interface to +these servers. + +*** uce.el is useful for replying to unsolicited commercial email. + +*** vcursor.el implements a "virtual cursor" feature. +You can move the virtual cursor with special commands +while the real cursor does not move. + +*** webjump.el is a "hot list" package which you can set up +for visiting your favorite web sites. + +*** M-x winner-mode is a minor mode which saves window configurations, +so you can move back to other configurations that you have recently used. + +** movemail change + +Movemail no longer needs to be installed setuid root in order for POP +mail retrieval to function properly. This is because it no longer +supports the RPOP (reserved-port POP) protocol; instead, it uses the +user's POP password to authenticate to the mail server. + +This change was made earlier, but not reported in NEWS before. + + +* Emacs 20.1 changes for MS-DOS and MS-Windows. + +** Changes in handling MS-DOS/MS-Windows text files. + +Emacs handles three different conventions for representing +end-of-line: CRLF for MSDOS, LF for Unix and GNU, and CR (used on the +Macintosh). Emacs determines which convention is used in a specific +file based on the contents of that file (except for certain special +file names), and when it saves the file, it uses the same convention. + +To save the file and change the end-of-line convention, you can use +C-x RET f (set-buffer-file-coding-system) to specify a different +coding system for the buffer. Then, when you save the file, the newly +specified coding system will take effect. For example, to save with +LF, specify undecided-unix (or some other ...-unix coding system); to +save with CRLF, specify undecided-dos. + + +* Lisp Changes in Emacs 20.1 + +** Byte-compiled files made with Emacs 20 will, in general, work in +Emacs 19 as well, as long as the source code runs in Emacs 19. And +vice versa: byte-compiled files made with Emacs 19 should also run in +Emacs 20, as long as the program itself works in Emacs 20. + +** Windows-specific functions and variables have been renamed +to start with w32- instead of win32-. + +In hacker language, calling something a "win" is a form of praise. We +don't want to praise a non-free Microsoft system, so we don't call it +"win". + +** Basic Lisp changes + +*** A symbol whose name starts with a colon now automatically +evaluates to itself. Therefore such a symbol can be used as a constant. + +*** The defined purpose of `defconst' has been changed. It should now +be used only for values that should not be changed whether by a program +or by the user. + +The actual behavior of defconst has not been changed. + +*** There are new macros `when' and `unless' + +(when CONDITION BODY...) is short for (if CONDITION (progn BODY...)) +(unless CONDITION BODY...) is short for (if CONDITION nil BODY...) + +*** Emacs now defines functions caar, cadr, cdar and cddr with their +usual Lisp meanings. For example, caar returns the car of the car of +its argument. + +*** equal, when comparing strings, now ignores their text properties. + +*** The new function `functionp' tests whether an object is a function. + +*** arrayp now returns t for char-tables and bool-vectors. + +*** Certain primitives which use characters (as integers) now get an +error if the integer is not a valid character code. These primitives +include insert-char, char-to-string, and the %c construct in the +`format' function. + +*** The `require' function now insists on adding a suffix, either .el +or .elc, to the file name. Thus, (require 'foo) will not use a file +whose name is just foo. It insists on foo.el or foo.elc. + +*** The `autoload' function, when the file name does not contain +either a directory name or the suffix .el or .elc, insists on +adding one of these suffixes. + +*** string-to-number now takes an optional second argument BASE +which specifies the base to use when converting an integer. +If BASE is omitted, base 10 is used. + +We have not implemented other radices for floating point numbers, +because that would be much more work and does not seem useful. + +*** substring now handles vectors as well as strings. + +*** The Common Lisp function eql is no longer defined normally. +You must load the `cl' library to define it. + +*** The new macro `with-current-buffer' lets you evaluate an expression +conveniently with a different current buffer. It looks like this: + + (with-current-buffer BUFFER BODY-FORMS...) + +BUFFER is the expression that says which buffer to use. +BODY-FORMS say what to do in that buffer. + +*** The new primitive `save-current-buffer' saves and restores the +choice of current buffer, like `save-excursion', but without saving or +restoring the value of point or the mark. `with-current-buffer' +works using `save-current-buffer'. + +*** The new macro `with-temp-file' lets you do some work in a new buffer and +write the output to a specified file. Like `progn', it returns the value +of the last form. + +*** The new macro `with-temp-buffer' lets you do some work in a new buffer, +which is discarded after use. Like `progn', it returns the value of the +last form. If you wish to return the buffer contents, use (buffer-string) +as the last form. + +*** The new function split-string takes a string, splits it at certain +characters, and returns a list of the substrings in between the +matches. + +For example, (split-string "foo bar lose" " +") returns ("foo" "bar" "lose"). + +*** The new macro with-output-to-string executes some Lisp expressions +with standard-output set up so that all output feeds into a string. +Then it returns that string. + +For example, if the current buffer name is `foo', + +(with-output-to-string + (princ "The buffer is ") + (princ (buffer-name))) + +returns "The buffer is foo". + +** Non-ASCII characters are now supported, if enable-multibyte-characters +is non-nil. + +These characters have character codes above 256. When inserted in the +buffer or stored in a string, they are represented as multibyte +characters that occupy several buffer positions each. + +*** When enable-multibyte-characters is non-nil, a single character in +a buffer or string can be two or more bytes (as many as four). + +Buffers and strings are still made up of unibyte elements; +character positions and string indices are always measured in bytes. +Therefore, moving forward one character can increase the buffer +position by 2, 3 or 4. The function forward-char moves by whole +characters, and therefore is no longer equivalent to + (lambda (n) (goto-char (+ (point) n))). + +ASCII characters (codes 0 through 127) are still single bytes, always. +Sequences of byte values 128 through 255 are used to represent +non-ASCII characters. These sequences are called "multibyte +characters". + +The first byte of a multibyte character is always in the range 128 +through 159 (octal 0200 through 0237). These values are called +"leading codes". The second and subsequent bytes are always in the +range 160 through 255 (octal 0240 through 0377). The first byte, the +leading code, determines how many bytes long the sequence is. + +*** The function forward-char moves over characters, and therefore +(forward-char 1) may increase point by more than 1 if it moves over a +multibyte character. Likewise, delete-char always deletes a +character, which may be more than one buffer position. + +This means that some Lisp programs, which assume that a character is +always one buffer position, need to be changed. + +However, all ASCII characters are always one buffer position. + +*** The regexp [\200-\377] no longer matches all non-ASCII characters, +because when enable-multibyte-characters is non-nil, these characters +have codes that are not in the range octal 200 to octal 377. However, +the regexp [^\000-\177] does match all non-ASCII characters, +guaranteed. + +*** The function char-boundary-p returns non-nil if position POS is +between two characters in the buffer (not in the middle of a +character). + +When the value is non-nil, it says what kind of character follows POS: + + 0 if POS is at an ASCII character or at the end of range, + 1 if POS is before a 2-byte length multi-byte form, + 2 if POS is at a head of 3-byte length multi-byte form, + 3 if POS is at a head of 4-byte length multi-byte form, + 4 if POS is at a head of multi-byte form of a composite character. + +*** The function char-bytes returns how many bytes the character CHAR uses. + +*** Strings can contain multibyte characters. The function +`length' returns the string length counting bytes, which may be +more than the number of characters. + +You can include a multibyte character in a string constant by writing +it literally. You can also represent it with a hex escape, +\xNNNNNNN..., using as many digits as necessary. Any character which +is not a valid hex digit terminates this construct. If you want to +follow it with a character that is a hex digit, write backslash and +newline in between; that will terminate the hex escape. + +*** The function concat-chars takes arguments which are characters +and returns a string containing those characters. + +*** The function sref access a multibyte character in a string. +(sref STRING INDX) returns the character in STRING at INDEX. INDEX +counts from zero. If INDEX is at a position in the middle of a +character, sref signals an error. + +*** The function chars-in-string returns the number of characters +in a string. This is less than the length of the string, if the +string contains multibyte characters (the length counts bytes). + +*** The function chars-in-region returns the number of characters +in a region from BEG to END. This is less than (- END BEG) if the +region contains multibyte characters (the length counts bytes). + +*** The function string-to-list converts a string to a list of +the characters in it. string-to-vector converts a string +to a vector of the characters in it. + +*** The function store-substring alters part of the contents +of a string. You call it as follows: + + (store-substring STRING IDX OBJ) + +This says to alter STRING, by storing OBJ starting at index IDX in +STRING. OBJ may be either a character or a (smaller) string. +This function really does alter the contents of STRING. +Since it is impossible to change the length of an existing string, +it is an error if OBJ doesn't fit within STRING's actual length. + +*** char-width returns the width (in columns) of the character CHAR, +if it were displayed in the current buffer and the selected window. + +*** string-width returns the width (in columns) of the text in STRING, +if it were displayed in the current buffer and the selected window. + +*** truncate-string-to-width shortens a string, if necessary, +to fit within a certain number of columns. (Of course, it does +not alter the string that you give it; it returns a new string +which contains all or just part of the existing string.) + +(truncate-string-to-width STR END-COLUMN &optional START-COLUMN PADDING) + +This returns the part of STR up to column END-COLUMN. + +The optional argument START-COLUMN specifies the starting column. +If this is non-nil, then the first START-COLUMN columns of the string +are not included in the resulting value. + +The optional argument PADDING, if non-nil, is a padding character to be added +at the beginning and end the resulting string, to extend it to exactly +WIDTH columns. If PADDING is nil, that means do not pad; then, if STRING +is narrower than WIDTH, the value is equal to STRING. + +If PADDING and START-COLUMN are both non-nil, and if there is no clean +place in STRING that corresponds to START-COLUMN (because one +character extends across that column), then the padding character +PADDING is added one or more times at the beginning of the result +string, so that its columns line up as if it really did start at +column START-COLUMN. + +*** When the functions in the list after-change-functions are called, +the third argument is the number of bytes in the pre-change text, not +necessarily the number of characters. It is, in effect, the +difference in buffer position between the beginning and the end of the +changed text, before the change. + +*** The characters Emacs uses are classified in various character +sets, each of which has a name which is a symbol. In general there is +one character set for each script, not for each language. + +**** The function charsetp tests whether an object is a character set name. + +**** The variable charset-list holds a list of character set names. + +**** char-charset, given a character code, returns the name of the character +set that the character belongs to. (The value is a symbol.) + +**** split-char, given a character code, returns a list containing the +name of the character set, followed by one or two byte-values +which identify the character within that character set. + +**** make-char, given a character set name and one or two subsequent +byte-values, constructs a character code. This is roughly the +opposite of split-char. + +**** find-charset-region returns a list of the character sets +of all the characters between BEG and END. + +**** find-charset-string returns a list of the character sets +of all the characters in a string. + +*** Here are the Lisp facilities for working with coding systems +and specifying coding systems. + +**** The function coding-system-list returns a list of all coding +system names (symbols). With optional argument t, it returns a list +of all distinct base coding systems, not including variants. +(Variant coding systems are those like latin-1-dos, latin-1-unix +and latin-1-mac which specify the end-of-line conversion as well +as what to do about code conversion.) + +**** coding-system-p tests a symbol to see if it is a coding system +name. It returns t if so, nil if not. + +**** file-coding-system-alist specifies which coding systems to use +for certain file names. It works like network-coding-system-alist, +except that the PATTERN is matched against the file name. + +Each element has the format (PATTERN . VAL), where PATTERN determines +which file names the element applies to. PATTERN should be a regexp +to match against a file name. + +VAL is a coding system, a cons cell containing two coding systems, or +a function symbol. If VAL is a coding system, it is used for both +decoding what received from the network stream and encoding what sent +to the network stream. If VAL is a cons cell containing two coding +systems, the car specifies the coding system for decoding, and the cdr +specifies the coding system for encoding. + +If VAL is a function symbol, the function must return a coding system +or a cons cell containing two coding systems, which is used as above. + +**** The variable network-coding-system-alist specifies +the coding system to use for network sockets. + +Each element has the format (PATTERN . VAL), where PATTERN determines +which network sockets the element applies to. PATTERN should be +either a port number or a regular expression matching some network +service names. + +VAL is a coding system, a cons cell containing two coding systems, or +a function symbol. If VAL is a coding system, it is used for both +decoding what received from the network stream and encoding what sent +to the network stream. If VAL is a cons cell containing two coding +systems, the car specifies the coding system for decoding, and the cdr +specifies the coding system for encoding. + +If VAL is a function symbol, the function must return a coding system +or a cons cell containing two coding systems, which is used as above. + +**** process-coding-system-alist specifies which coding systems to use +for certain subprocess. It works like network-coding-system-alist, +except that the PATTERN is matched against the program name used to +start the subprocess. + +**** The variable default-process-coding-system specifies the coding +systems to use for subprocess (and net connection) input and output, +when nothing else specifies what to do. The value is a cons cell +(OUTPUT-CODING . INPUT-CODING). OUTPUT-CODING applies to output +to the subprocess, and INPUT-CODING applies to input from it. + +**** The variable coding-system-for-write, if non-nil, specifies the +coding system to use for writing a file, or for output to a synchronous +subprocess. + +It also applies to any asynchronous subprocess or network connection, +but in a different way: the value of coding-system-for-write when you +start the subprocess or connection affects that subprocess or +connection permanently or until overridden. + +The variable coding-system-for-write takes precedence over +file-coding-system-alist, process-coding-system-alist and +network-coding-system-alist, and all other methods of specifying a +coding system for output. But most of the time this variable is nil. +It exists so that Lisp programs can bind it to a specific coding +system for one operation at a time. + +**** coding-system-for-read applies similarly to input from +files, subprocesses or network connections. + +**** The function process-coding-system tells you what +coding systems(s) an existing subprocess is using. +The value is a cons cell, + (DECODING-CODING-SYSTEM . ENCODING-CODING-SYSTEM) +where DECODING-CODING-SYSTEM is used for decoding output from +the subprocess, and ENCODING-CODING-SYSTEM is used for encoding +input to the subprocess. + +**** The function set-process-coding-system can be used to +change the coding systems in use for an existing subprocess. + +** Emacs has a new facility to help users manage the many +customization options. To make a Lisp program work with this facility, +you need to use the new macros defgroup and defcustom. + +You use defcustom instead of defvar, for defining a user option +variable. The difference is that you specify two additional pieces of +information (usually): the "type" which says what values are +legitimate, and the "group" which specifies the hierarchy for +customization. + +Thus, instead of writing + + (defvar foo-blurgoze nil + "*Non-nil means that foo will act very blurgozely.") + +you would now write this: + + (defcustom foo-blurgoze nil + "*Non-nil means that foo will act very blurgozely." + :type 'boolean + :group foo) + +The type `boolean' means that this variable has only +two meaningful states: nil and non-nil. Other type values +describe other possibilities; see the manual for Custom +for a description of them. + +The "group" argument is used to specify a group which the option +should belong to. You define a new group like this: + + (defgroup ispell nil + "Spell checking using Ispell." + :group 'processes) + +The "group" argument in defgroup specifies the parent group. The root +group is called `emacs'; it should not contain any variables itself, +but only other groups. The immediate subgroups of `emacs' correspond +to the keywords used by C-h p. Under these subgroups come +second-level subgroups that belong to individual packages. + +Each Emacs package should have its own set of groups. A simple +package should have just one group; a more complex package should +have a hierarchy of its own groups. The sole or root group of a +package should be a subgroup of one or more of the "keyword" +first-level subgroups. + +** New `widget' library for inserting UI components in buffers. + +This library, used by the new custom library, is documented in a +separate manual that accompanies Emacs. + +** easy-mmode + +The easy-mmode package provides macros and functions that make +developing minor modes easier. Roughly, the programmer has to code +only the functionality of the minor mode. All the rest--toggles, +predicate, and documentation--can be done in one call to the macro +`easy-mmode-define-minor-mode' (see the documentation). See also +`easy-mmode-define-keymap'. + +** Text property changes + +*** The `intangible' property now works on overlays as well as on a +text property. + +*** The new functions next-char-property-change and +previous-char-property-change scan through the buffer looking for a +place where either a text property or an overlay might change. The +functions take two arguments, POSITION and LIMIT. POSITION is the +starting position for the scan. LIMIT says where to stop the scan. + +If no property change is found before LIMIT, the value is LIMIT. If +LIMIT is nil, scan goes to the beginning or end of the accessible part +of the buffer. If no property change is found, the value is the +position of the beginning or end of the buffer. + +*** In the `local-map' text property or overlay property, the property +value can now be a symbol whose function definition is a keymap. This +is an alternative to using the keymap itself. + +** Changes in invisibility features + +*** Isearch can now temporarily show parts of the buffer which are +hidden by an overlay with a invisible property, when the search match +is inside that portion of the buffer. To enable this the overlay +should have a isearch-open-invisible property which is a function that +would be called having the overlay as an argument, the function should +make the overlay visible. + +During incremental search the overlays are shown by modifying the +invisible and intangible properties, if beside this more actions are +needed the overlay should have a isearch-open-invisible-temporary +which is a function. The function is called with 2 arguments: one is +the overlay and the second is nil when it should show the overlay and +t when it should hide it. + +*** add-to-invisibility-spec, remove-from-invisibility-spec + +Modes that use overlays to hide portions of a buffer should set the +invisible property of the overlay to the mode's name (or another symbol) +and modify the `buffer-invisibility-spec' to include that symbol. +Use `add-to-invisibility-spec' and `remove-from-invisibility-spec' to +manipulate the `buffer-invisibility-spec'. +Here is an example of how to do this: + + ;; If we want to display an ellipsis: + (add-to-invisibility-spec '(my-symbol . t)) + ;; If you don't want ellipsis: + (add-to-invisibility-spec 'my-symbol) + + ... + (overlay-put (make-overlay beginning end) 'invisible 'my-symbol) + + ... + ;; When done with the overlays: + (remove-from-invisibility-spec '(my-symbol . t)) + ;; Or respectively: + (remove-from-invisibility-spec 'my-symbol) + +** Changes in syntax parsing. + +*** The syntax-directed buffer-scan functions (such as +`parse-partial-sexp', `forward-word' and similar functions) can now +obey syntax information specified by text properties, if the variable +`parse-sexp-lookup-properties' is non-nil. + +If the value of `parse-sexp-lookup-properties' is nil, the behavior +is as before: the syntax-table of the current buffer is always +used to determine the syntax of the character at the position. + +When `parse-sexp-lookup-properties' is non-nil, the syntax of a +character in the buffer is calculated thus: + + a) if the `syntax-table' text-property of that character + is a cons, this cons becomes the syntax-type; + + Valid values of `syntax-table' text-property are: nil, a valid + syntax-table, and a valid syntax-table element, i.e., + a cons cell of the form (SYNTAX-CODE . MATCHING-CHAR). + + b) if the character's `syntax-table' text-property + is a syntax table, this syntax table is used + (instead of the syntax-table of the current buffer) to + determine the syntax type of the character. + + c) otherwise the syntax-type is determined by the syntax-table + of the current buffer. + +*** The meaning of \s in regular expressions is also affected by the +value of `parse-sexp-lookup-properties'. The details are the same as +for the syntax-directed buffer-scan functions. + +*** There are two new syntax-codes, `!' and `|' (numeric values 14 +and 15). A character with a code `!' starts a comment which is ended +only by another character with the same code (unless quoted). A +character with a code `|' starts a string which is ended only by +another character with the same code (unless quoted). + +These codes are mainly meant for use as values of the `syntax-table' +text property. + +*** The function `parse-partial-sexp' has new semantics for the sixth +arg COMMENTSTOP. If it is `syntax-table', parse stops after the start +of a comment or a string, or after end of a comment or a string. + +*** The state-list which the return value from `parse-partial-sexp' +(and can also be used as an argument) now has an optional ninth +element: the character address of the start of last comment or string; +nil if none. The fourth and eighth elements have special values if the +string/comment is started by a "!" or "|" syntax-code. + +*** Since new features of `parse-partial-sexp' allow a complete +syntactic parsing, `font-lock' no longer supports +`font-lock-comment-start-regexp'. + +** Changes in face features + +*** The face functions are now unconditionally defined in Emacs, even +if it does not support displaying on a device that supports faces. + +*** The function face-documentation returns the documentation string +of a face (or nil if it doesn't have one). + +*** The function face-bold-p returns t if a face should be bold. +set-face-bold-p sets that flag. + +*** The function face-italic-p returns t if a face should be italic. +set-face-italic-p sets that flag. + +*** You can now specify foreground and background colors for text +by adding elements of the form (foreground-color . COLOR-NAME) +and (background-color . COLOR-NAME) to the list of faces in +the `face' property (either the character's text property or an +overlay property). + +This means that you no longer need to create named faces to use +arbitrary colors in a Lisp package. + +** Changes in file-handling functions + +*** File-access primitive functions no longer discard an extra redundant +directory name from the beginning of the file name. In other words, +they no longer do anything special with // or /~. That conversion +is now done only in substitute-in-file-name. + +This makes it possible for a Lisp program to open a file whose name +begins with ~. + +*** If copy-file is unable to set the date of the output file, +it now signals an error with the condition file-date-error. + +*** The inode number returned by file-attributes may be an integer (if +the number fits in a Lisp integer) or a list of integers. + +*** insert-file-contents can now read from a special file, +as long as the arguments VISIT and REPLACE are nil. + +*** The RAWFILE arg to find-file-noselect, if non-nil, now suppresses +character code conversion as well as other things. + +Meanwhile, this feature does work with remote file names +(formerly it did not). + +*** Lisp packages which create temporary files should use the TMPDIR +environment variable to decide which directory to put them in. + +*** interpreter-mode-alist elements now specify regexps +instead of constant strings. + +*** expand-file-name no longer treats `//' or `/~' specially. It used +to delete all the text of a file name up through the first slash of +any `//' or `/~' sequence. Now it passes them straight through. + +substitute-in-file-name continues to treat those sequences specially, +in the same way as before. + +*** The variable `format-alist' is more general now. +The FROM-FN and TO-FN in a format definition can now be strings +which specify shell commands to use as filters to perform conversion. + +*** The new function access-file tries to open a file, and signals an +error if that fails. If the open succeeds, access-file does nothing +else, and returns nil. + +*** The function insert-directory now signals an error if the specified +directory cannot be listed. + +** Changes in minibuffer input + +*** The functions read-buffer, read-variable, read-command, read-string +read-file-name, read-from-minibuffer and completing-read now take an +additional argument which specifies the default value. If this +argument is non-nil, it should be a string; that string is used in two +ways: + + It is returned if the user enters empty input. + It is available through the history command M-n. + +*** The functions read-string, read-from-minibuffer, +read-no-blanks-input and completing-read now take an additional +argument INHERIT-INPUT-METHOD. If this is non-nil, then the +minibuffer inherits the current input method and the setting of +enable-multibyte-characters from the previously current buffer. + +In an interactive spec, you can use M instead of s to read an +argument in this way. + +*** All minibuffer input functions discard text properties +from the text you enter in the minibuffer, unless the variable +minibuffer-allow-text-properties is non-nil. + +** Echo area features + +*** Clearing the echo area now runs the normal hook +echo-area-clear-hook. Note that the echo area can be used while the +minibuffer is active; in that case, the minibuffer is still active +after the echo area is cleared. + +*** The function current-message returns the message currently displayed +in the echo area, or nil if there is none. + +** Keyboard input features + +*** tty-erase-char is a new variable that reports which character was +set up as the terminal's erase character when time Emacs was started. + +*** num-nonmacro-input-events is the total number of input events +received so far from the terminal. It does not count those generated +by keyboard macros. + +** Frame-related changes + +*** make-frame runs the normal hook before-make-frame-hook just before +creating a frame, and just after creating a frame it runs the abnormal +hook after-make-frame-functions with the new frame as arg. + +*** The new hook window-configuration-change-hook is now run every time +the window configuration has changed. The frame whose configuration +has changed is the selected frame when the hook is run. + +*** Each frame now independently records the order for recently +selected buffers, in its buffer-list frame parameter, so that the +value of other-buffer is now based on the buffers recently displayed +in the selected frame. + +*** The value of the frame parameter vertical-scroll-bars +is now `left', `right' or nil. A non-nil value specifies +which side of the window to put the scroll bars on. + +** X Windows features + +*** You can examine X resources for other applications by binding +x-resource-class around a call to x-get-resource. The usual value of +x-resource-class is "Emacs", which is the correct value for Emacs. + +*** In menus, checkboxes and radio buttons now actually work. +The menu displays the current status of the box or button. + +*** The function x-list-fonts now takes an optional fourth argument +MAXIMUM which sets a limit on how many matching fonts to return. +A smaller value of MAXIMUM makes the function faster. + +If the only question is whether *any* font matches the pattern, +it is good to supply 1 for this argument. + +** Subprocess features + +*** A reminder: it is no longer necessary for subprocess filter +functions and sentinels to do save-match-data, because Emacs does this +automatically. + +*** The new function shell-command-to-string executes a shell command +and returns the output from the command as a string. + +*** The new function process-contact returns t for a child process, +and (HOSTNAME SERVICE) for a net connection. + +** An error in running pre-command-hook or post-command-hook +does clear the variable to nil. The documentation was wrong before. + +** In define-key-after, if AFTER is t, the new binding now always goes +at the end of the keymap. If the keymap is a menu, this means it +goes after the other menu items. + +** If you have a program that makes several changes in the same area +of the buffer, you can use the macro combine-after-change-calls +around that Lisp code to make it faster when after-change hooks +are in use. + +The macro arranges to call the after-change functions just once for a +series of several changes--if that seems safe. + +Don't alter the variables after-change-functions and +after-change-function within the body of a combine-after-change-calls +form. + +** If you define an abbrev (with define-abbrev) whose EXPANSION +is not a string, then the abbrev does not expand in the usual sense, +but its hook is still run. + +** Normally, the Lisp debugger is not used (even if you have enabled it) +for errors that are handled by condition-case. + +If you set debug-on-signal to a non-nil value, then the debugger is called +regardless of whether there is a handler for the condition. This is +useful for debugging problems that happen inside of a condition-case. + +This mode of operation seems to be unreliable in other ways. Errors that +are normal and ought to be handled, perhaps in timers or process +filters, will instead invoke the debugger. So don't say you weren't +warned. + +** The new variable ring-bell-function lets you specify your own +way for Emacs to "ring the bell". + +** If run-at-time's TIME argument is t, the action is repeated at +integral multiples of REPEAT from the epoch; this is useful for +functions like display-time. + +** You can use the function locate-library to find the precise file +name of a Lisp library. This isn't new, but wasn't documented before. + +** Commands for entering view mode have new optional arguments that +can be used from Lisp. Low-level entrance to and exit from view mode +is done by functions view-mode-enter and view-mode-exit. + +** batch-byte-compile-file now makes Emacs return a nonzero status code +if there is an error in compilation. + +** pop-to-buffer, switch-to-buffer-other-window and +switch-to-buffer-other-frame now accept an additional optional +argument NORECORD, much like switch-to-buffer. If it is non-nil, +they don't put the buffer at the front of the buffer list. + +** If your .emacs file leaves the *scratch* buffer non-empty, +Emacs does not display the startup message, so as to avoid changing +the *scratch* buffer. + +** The new function regexp-opt returns an efficient regexp to match a string. +The arguments are STRINGS and (optionally) PAREN. This function can be used +where regexp matching or searching is intensively used and speed is important, +e.g., in Font Lock mode. + +** The variable buffer-display-count is local to each buffer, +and is incremented each time the buffer is displayed in a window. +It starts at 0 when the buffer is created. + +** The new function compose-mail starts composing a mail message +using the user's chosen mail composition agent (specified with the +variable mail-user-agent). It has variants compose-mail-other-window +and compose-mail-other-frame. + +** The `user-full-name' function now takes an optional parameter which +can either be a number (the UID) or a string (the login name). The +full name of the specified user will be returned. + +** Lisp packages that load files of customizations, or any other sort +of user profile, should obey the variable init-file-user in deciding +where to find it. They should load the profile of the user name found +in that variable. If init-file-user is nil, meaning that the -q +option was used, then Lisp packages should not load the customization +files at all. + +** format-time-string now allows you to specify the field width +and type of padding. This works as in printf: you write the field +width as digits in the middle of a %-construct. If you start +the field width with 0, it means to pad with zeros. + +For example, %S normally specifies the number of seconds since the +minute; %03S means to pad this with zeros to 3 positions, %_3S to pad +with spaces to 3 positions. Plain %3S pads with zeros, because that +is how %S normally pads to two positions. + +** thing-at-point now supports a new kind of "thing": url. + +** imenu.el changes. + +You can now specify a function to be run when selecting an +item from menu created by imenu. + +An example of using this feature: if we define imenu items for the +#include directives in a C file, we can open the included file when we +select one of those items. + + +---------------------------------------------------------------------- +Copyright information: + +Copyright (C) 1999, 2000, 2006 + Free Software Foundation, Inc. + + 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 this permission notice are preserved, + thus giving the recipient permission to redistribute in turn. + + 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 changed them. + +Local variables: +mode: outline +paragraph-separate: "[ ]*$" +end: diff --git a/etc/NEWS.21 b/etc/NEWS.21 new file mode 100644 index 00000000000..44462b3f827 --- /dev/null +++ b/etc/NEWS.21 @@ -0,0 +1,4900 @@ +GNU Emacs NEWS -- history of user-visible changes. 2006-05-31 +Copyright (C) 2000, 2001, 2002, 2003, 2006 + Free Software Foundation, Inc. +See the end for copying conditions. + +This file is about changes in emacs version 21. + + + +* Emacs 21.4 is a bug-fix release with no user-visible changes. + + + +* Installation changes in Emacs 21.3 + +** Support for GNU/Linux on little-endian MIPS and on IBM S390 has +been added. + + +* Changes in Emacs 21.3 + +** The obsolete C mode (c-mode.el) has been removed to avoid problems +with Custom. + +** UTF-16 coding systems are available, encoding the same characters +as mule-utf-8. + +** There is a new language environment for UTF-8 (set up automatically +in UTF-8 locales). + +** Translation tables are available between equivalent characters in +different Emacs charsets -- for instance `e with acute' coming from the +Latin-1 and Latin-2 charsets. User options `unify-8859-on-encoding-mode' +and `unify-8859-on-decoding-mode' respectively turn on translation +between ISO 8859 character sets (`unification') on encoding +(e.g. writing a file) and decoding (e.g. reading a file). Note that +`unify-8859-on-encoding-mode' is useful and safe, but +`unify-8859-on-decoding-mode' can cause text to change when you read +it and write it out again without edits, so it is not generally advisable. +By default `unify-8859-on-encoding-mode' is turned on. + +** In Emacs running on the X window system, the default value of +`selection-coding-system' is now `compound-text-with-extensions'. + +If you want the old behavior, set selection-coding-system to +compound-text, which may be significantly more efficient. Using +compound-text-with-extensions seems to be necessary only for decoding +text from applications under XFree86 4.2, whose behavior is actually +contrary to the compound text specification. + + + +* Installation changes in Emacs 21.2 + +** Support for BSD/OS 5.0 has been added. + +** Support for AIX 5.1 was added. + + +* Changes in Emacs 21.2 + +** Emacs now supports compound-text extended segments in X selections. + +X applications can use `extended segments' to encode characters in +compound text that belong to character sets which are not part of the +list of approved standard encodings for X, e.g. Big5. To paste +selections with such characters into Emacs, use the new coding system +compound-text-with-extensions as the value of selection-coding-system. + +** The default values of `tooltip-delay' and `tooltip-hide-delay' +were changed. + +** On terminals whose erase-char is ^H (Backspace), Emacs +now uses normal-erase-is-backspace-mode. + +** When the *scratch* buffer is recreated, its mode is set from +initial-major-mode, which normally is lisp-interaction-mode, +instead of using default-major-mode. + +** The new option `Info-scroll-prefer-subnodes' causes Info to behave +like the stand-alone Info reader (from the GNU Texinfo package) as far +as motion between nodes and their subnodes is concerned. If it is t +(the default), Emacs behaves as before when you type SPC in a menu: it +visits the subnode pointed to by the first menu entry. If this option +is nil, SPC scrolls to the end of the current node, and only then goes +to the first menu item, like the stand-alone reader does. + +This change was already in Emacs 21.1, but wasn't advertised in the +NEWS. + + +* Lisp Changes in Emacs 21.2 + +** The meanings of scroll-up-aggressively and scroll-down-aggressively +have been interchanged, so that the former now controls scrolling up, +and the latter now controls scrolling down. + +** The variable `compilation-parse-errors-filename-function' can +be used to transform filenames found in compilation output. + + + +* Installation Changes in Emacs 21.1 + +See the INSTALL file for information on installing extra libraries and +fonts to take advantage of the new graphical features and extra +charsets in this release. + +** Support for GNU/Linux on IA64 machines has been added. + +** Support for LynxOS has been added. + +** There are new configure options associated with the support for +images and toolkit scrollbars. Use the --help option in `configure' +to list them. + +** You can build a 64-bit Emacs for SPARC/Solaris systems which +support 64-bit executables and also on Irix 6.5. This increases the +maximum buffer size. See etc/MACHINES for instructions. Changes to +build on other 64-bit systems should be straightforward modulo any +necessary changes to unexec. + +** There is a new configure option `--disable-largefile' to omit +Unix-98-style support for large files if that is available. + +** There is a new configure option `--without-xim' that instructs +Emacs to not use X Input Methods (XIM), if these are available. + +** `movemail' defaults to supporting POP. You can turn this off using +the --without-pop configure option, should that be necessary. + +** This version can be built for the Macintosh, but does not implement +all of the new display features described below. The port currently +lacks unexec, asynchronous processes, and networking support. See the +"Emacs and the Mac OS" appendix in the Emacs manual, for the +description of aspects specific to the Mac. + +** Note that the MS-Windows port does not yet implement various of the +new display features described below. + + +* Changes in Emacs 21.1 + +** Emacs has a new redisplay engine. + +The new redisplay handles characters of variable width and height. +Italic text can be used without redisplay problems. Fonts containing +oversized characters, i.e. characters larger than the logical height +of a font can be used. Images of various formats can be displayed in +the text. + +** Emacs has a new face implementation. + +The new faces no longer fundamentally use X font names to specify the +font. Instead, each face has several independent attributes--family, +height, width, weight and slant--that it may or may not specify. +These attributes can be merged from various faces, and then together +specify a font. + +Faces are supported on terminals that can display color or fonts. +These terminal capabilities are auto-detected. Details can be found +under Lisp changes, below. + +** Emacs can display faces on TTY frames. + +Emacs automatically detects terminals that are able to display colors. +Faces with a weight greater than normal are displayed extra-bright, if +the terminal supports it. Faces with a weight less than normal and +italic faces are displayed dimmed, if the terminal supports it. +Underlined faces are displayed underlined if possible. Other face +attributes such as `overline', `strike-through', and `box' are ignored +on terminals. + +The command-line options `-fg COLOR', `-bg COLOR', and `-rv' are now +supported on character terminals. + +Emacs automatically remaps all X-style color specifications to one of +the colors supported by the terminal. This means you could have the +same color customizations that work both on a windowed display and on +a TTY or when Emacs is invoked with the -nw option. + +** New default font is Courier 12pt under X. + +** Sound support + +Emacs supports playing sound files on GNU/Linux and FreeBSD (Voxware +driver and native BSD driver, a.k.a. Luigi's driver). Currently +supported file formats are RIFF-WAVE (*.wav) and Sun Audio (*.au). +You must configure Emacs with the option `--with-sound=yes' to enable +sound support. + +** Emacs now resizes mini-windows if appropriate. + +If a message is longer than one line, or minibuffer contents are +longer than one line, Emacs can resize the minibuffer window unless it +is on a frame of its own. You can control resizing and the maximum +minibuffer window size by setting the following variables: + +- User option: max-mini-window-height + +Maximum height for resizing mini-windows. If a float, it specifies a +fraction of the mini-window frame's height. If an integer, it +specifies a number of lines. + +Default is 0.25. + +- User option: resize-mini-windows + +How to resize mini-windows. If nil, don't resize. If t, always +resize to fit the size of the text. If `grow-only', let mini-windows +grow only, until they become empty, at which point they are shrunk +again. + +Default is `grow-only'. + +** LessTif support. + +Emacs now runs with the LessTif toolkit (see +<http://www.lesstif.org>). You will need version 0.92.26, or later. + +** LessTif/Motif file selection dialog. + +When Emacs is configured to use LessTif or Motif, reading a file name +from a menu will pop up a file selection dialog if `use-dialog-box' is +non-nil. + +** File selection dialog on MS-Windows is supported. + +When a file is visited by clicking File->Open, the MS-Windows version +now pops up a standard file selection dialog where you can select a +file to visit. File->Save As also pops up that dialog. + +** Toolkit scroll bars. + +Emacs now uses toolkit scroll bars if available. When configured for +LessTif/Motif, it will use that toolkit's scroll bar. Otherwise, when +configured for Lucid and Athena widgets, it will use the Xaw3d scroll +bar if Xaw3d is available. You can turn off the use of toolkit scroll +bars by specifying `--with-toolkit-scroll-bars=no' when configuring +Emacs. + +When you encounter problems with the Xaw3d scroll bar, watch out how +Xaw3d is compiled on your system. If the Makefile generated from +Xaw3d's Imakefile contains a `-DNARROWPROTO' compiler option, and your +Emacs system configuration file `s/your-system.h' does not contain a +define for NARROWPROTO, you might consider adding it. Take +`s/freebsd.h' as an example. + +Alternatively, if you don't have access to the Xaw3d source code, take +a look at your system's imake configuration file, for example in the +directory `/usr/X11R6/lib/X11/config' (paths are different on +different systems). You will find files `*.cf' there. If your +system's cf-file contains a line like `#define NeedWidePrototypes NO', +add a `#define NARROWPROTO' to your Emacs system configuration file. + +The reason for this is that one Xaw3d function uses `double' or +`float' function parameters depending on the setting of NARROWPROTO. +This is not a problem when Imakefiles are used because each system's +imake configuration file contains the necessary information. Since +Emacs doesn't use imake, this has do be done manually. + +** Tool bar support. + +Emacs supports a tool bar at the top of a frame under X. For details +of how to define a tool bar, see the page describing Lisp-level +changes. Tool-bar global minor mode controls whether or not it is +displayed and is on by default. The appearance of the bar is improved +if Emacs has been built with XPM image support. Otherwise monochrome +icons will be used. + +To make the tool bar more useful, we need contributions of extra icons +for specific modes (with copyright assignments). + +** Tooltips. + +Tooltips are small X windows displaying a help string at the current +mouse position. The Lisp package `tooltip' implements them. You can +turn them off via the user option `tooltip-mode'. + +Tooltips also provides support for GUD debugging. If activated, +variable values can be displayed in tooltips by pointing at them with +the mouse in source buffers. You can customize various aspects of the +tooltip display in the group `tooltip'. + +** Automatic Hscrolling + +Horizontal scrolling now happens automatically if +`automatic-hscrolling' is set (the default). This setting can be +customized. + +If a window is scrolled horizontally with set-window-hscroll, or +scroll-left/scroll-right (C-x <, C-x >), this serves as a lower bound +for automatic horizontal scrolling. Automatic scrolling will scroll +the text more to the left if necessary, but won't scroll the text more +to the right than the column set with set-window-hscroll etc. + +** When using a windowing terminal, each Emacs window now has a cursor +of its own. By default, when a window is selected, the cursor is +solid; otherwise, it is hollow. The user-option +`cursor-in-non-selected-windows' controls how to display the +cursor in non-selected windows. If nil, no cursor is shown, if +non-nil a hollow box cursor is shown. + +** Fringes to the left and right of windows are used to display +truncation marks, continuation marks, overlay arrows and alike. The +foreground, background, and stipple of these areas can be changed by +customizing face `fringe'. + +** The mode line under X is now drawn with shadows by default. +You can change its appearance by modifying the face `mode-line'. +In particular, setting the `:box' attribute to nil turns off the 3D +appearance of the mode line. (The 3D appearance makes the mode line +occupy more space, and thus might cause the first or the last line of +the window to be partially obscured.) + +The variable `mode-line-inverse-video', which was used in older +versions of emacs to make the mode-line stand out, is now deprecated. +However, setting it to nil will cause the `mode-line' face to be +ignored, and mode-lines to be drawn using the default text face. + +** Mouse-sensitive mode line. + +Different parts of the mode line have been made mouse-sensitive on all +systems which support the mouse. Moving the mouse to a +mouse-sensitive part in the mode line changes the appearance of the +mouse pointer to an arrow, and help about available mouse actions is +displayed either in the echo area, or in the tooltip window if you +have enabled one. + +Currently, the following actions have been defined: + +- Mouse-1 on the buffer name in the mode line goes to the next buffer. + +- Mouse-3 on the buffer-name goes to the previous buffer. + +- Mouse-2 on the read-only or modified status in the mode line (`%' or +`*') toggles the status. + +- Mouse-3 on the major mode name displays a major mode menu. + +- Mouse-3 on the mode name displays a minor-mode menu. + +** Hourglass pointer + +Emacs can optionally display an hourglass pointer under X. You can +turn the display on or off by customizing group `cursor'. + +** Blinking cursor + +M-x blink-cursor-mode toggles a blinking cursor under X and on +terminals having terminal capabilities `vi', `vs', and `ve'. Blinking +and related parameters like frequency and delay can be customized in +the group `cursor'. + +** New font-lock support mode `jit-lock-mode'. + +This support mode is roughly equivalent to `lazy-lock' but is +generally faster. It supports stealth and deferred fontification. +See the documentation of the function `jit-lock-mode' for more +details. + +Font-lock uses jit-lock-mode as default support mode, so you don't +have to do anything to activate it. + +** The default binding of the Delete key has changed. + +The new user-option `normal-erase-is-backspace' can be set to +determine the effect of the Delete and Backspace function keys. + +On window systems, the default value of this option is chosen +according to the keyboard used. If the keyboard has both a Backspace +key and a Delete key, and both are mapped to their usual meanings, the +option's default value is set to t, so that Backspace can be used to +delete backward, and Delete can be used to delete forward. On +keyboards which either have only one key (usually labeled DEL), or two +keys DEL and BS which produce the same effect, the option's value is +set to nil, and these keys delete backward. + +If not running under a window system, setting this option accomplishes +a similar effect by mapping C-h, which is usually generated by the +Backspace key, to DEL, and by mapping DEL to C-d via +`keyboard-translate'. The former functionality of C-h is available on +the F1 key. You should probably not use this setting on a text-only +terminal if you don't have both Backspace, Delete and F1 keys. + +Programmatically, you can call function normal-erase-is-backspace-mode +to toggle the behavior of the Delete and Backspace keys. + +** The default for user-option `next-line-add-newlines' has been +changed to nil, i.e. C-n will no longer add newlines at the end of a +buffer by default. + +** The <home> and <end> keys now move to the beginning or end of the +current line, respectively. C-<home> and C-<end> move to the +beginning and end of the buffer. + +** Emacs now checks for recursive loads of Lisp files. If the +recursion depth exceeds `recursive-load-depth-limit', an error is +signaled. + +** When an error is signaled during the loading of the user's init +file, Emacs now pops up the *Messages* buffer. + +** Emacs now refuses to load compiled Lisp files which weren't +compiled with Emacs. Set `load-dangerous-libraries' to t to change +this behavior. + +The reason for this change is an incompatible change in XEmacs's byte +compiler. Files compiled with XEmacs can contain byte codes that let +Emacs dump core. + +** Toggle buttons and radio buttons in menus. + +When compiled with LessTif (or Motif) support, Emacs uses toolkit +widgets for radio and toggle buttons in menus. When configured for +Lucid, Emacs draws radio buttons and toggle buttons similar to Motif. + +** The menu bar configuration has changed. The new configuration is +more CUA-compliant. The most significant change is that Options is +now a separate menu-bar item, with Mule and Customize as its submenus. + +** Item Save Options on the Options menu allows saving options set +using that menu. + +** Highlighting of trailing whitespace. + +When `show-trailing-whitespace' is non-nil, Emacs displays trailing +whitespace in the face `trailing-whitespace'. Trailing whitespace is +defined as spaces or tabs at the end of a line. To avoid busy +highlighting when entering new text, trailing whitespace is not +displayed if point is at the end of the line containing the +whitespace. + +** C-x 5 1 runs the new command delete-other-frames which deletes +all frames except the selected one. + +** The new user-option `confirm-kill-emacs' can be customized to +let Emacs ask for confirmation before exiting. + +** The header line in an Info buffer is now displayed as an emacs +header-line (which is like a mode-line, but at the top of the window), +so that it remains visible even when the buffer has been scrolled. +This behavior may be disabled by customizing the option +`Info-use-header-line'. + +** Polish, Czech, German, and French translations of Emacs' reference card +have been added. They are named `pl-refcard.tex', `cs-refcard.tex', +`de-refcard.tex' and `fr-refcard.tex'. Postscript files are included. + +** An `Emacs Survival Guide', etc/survival.tex, is available. + +** A reference card for Dired has been added. Its name is +`dired-ref.tex'. A French translation is available in +`fr-drdref.tex'. + +** C-down-mouse-3 is bound differently. Now if the menu bar is not +displayed it pops up a menu containing the items which would be on the +menu bar. If the menu bar is displayed, it pops up the major mode +menu or the Edit menu if there is no major mode menu. + +** Variable `load-path' is no longer customizable through Customize. + +You can no longer use `M-x customize-variable' to customize `load-path' +because it now contains a version-dependent component. You can still +use `add-to-list' and `setq' to customize this variable in your +`~/.emacs' init file or to modify it from any Lisp program in general. + +** C-u C-x = provides detailed information about the character at +point in a pop-up window. + +** Emacs can now support 'wheeled' mice (such as the MS IntelliMouse) +under XFree86. To enable this, use the `mouse-wheel-mode' command, or +customize the variable `mouse-wheel-mode'. + +The variables `mouse-wheel-follow-mouse' and `mouse-wheel-scroll-amount' +determine where and by how much buffers are scrolled. + +** Emacs' auto-save list files are now by default stored in a +sub-directory `.emacs.d/auto-save-list/' of the user's home directory. +(On MS-DOS, this subdirectory's name is `_emacs.d/auto-save.list/'.) +You can customize `auto-save-list-file-prefix' to change this location. + +** The function `getenv' is now callable interactively. + +** The new user-option `even-window-heights' can be set to nil +to prevent `display-buffer' from evening out window heights. + +** The new command M-x delete-trailing-whitespace RET will delete the +trailing whitespace within the current restriction. You can also add +this function to `write-file-hooks' or `local-write-file-hooks'. + +** When visiting a file with M-x find-file-literally, no newlines will +be added to the end of the buffer even if `require-final-newline' is +non-nil. + +** The new user-option `find-file-suppress-same-file-warnings' can be +set to suppress warnings ``X and Y are the same file'' when visiting a +file that is already visited under a different name. + +** The new user-option `electric-help-shrink-window' can be set to +nil to prevent adjusting the help window size to the buffer size. + +** New command M-x describe-character-set reads a character set name +and displays information about that. + +** The new variable `auto-mode-interpreter-regexp' contains a regular +expression matching interpreters, for file mode determination. + +This regular expression is matched against the first line of a file to +determine the file's mode in `set-auto-mode' when Emacs can't deduce a +mode from the file's name. If it matches, the file is assumed to be +interpreted by the interpreter matched by the second group of the +regular expression. The mode is then determined as the mode +associated with that interpreter in `interpreter-mode-alist'. + +** New function executable-make-buffer-file-executable-if-script-p is +suitable as an after-save-hook as an alternative to `executable-chmod'. + +** The most preferred coding-system is now used to save a buffer if +buffer-file-coding-system is `undecided' and it is safe for the buffer +contents. (The most preferred is set by set-language-environment or +by M-x prefer-coding-system.) Thus if you visit an ASCII file and +insert a non-ASCII character from your current language environment, +the file will be saved silently with the appropriate coding. +Previously you would be prompted for a safe coding system. + +** The many obsolete language `setup-...-environment' commands have +been removed -- use `set-language-environment'. + +** The new Custom option `keyboard-coding-system' specifies a coding +system for keyboard input. + +** New variable `inhibit-iso-escape-detection' determines if Emacs' +coding system detection algorithm should pay attention to ISO2022's +escape sequences. If this variable is non-nil, the algorithm ignores +such escape sequences. The default value is nil, and it is +recommended not to change it except for the special case that you +always want to read any escape code verbatim. If you just want to +read a specific file without decoding escape codes, use C-x RET c +(`universal-coding-system-argument'). For instance, C-x RET c latin-1 +RET C-x C-f filename RET. + +** Variable `default-korean-keyboard' is initialized properly from the +environment variable `HANGUL_KEYBOARD_TYPE'. + +** New command M-x list-charset-chars reads a character set name and +displays all characters in that character set. + +** M-x set-terminal-coding-system (C-x RET t) now allows CCL-based +coding systems such as cpXXX and cyrillic-koi8. + +** Emacs now attempts to determine the initial language environment +and preferred and locale coding systems systematically from the +LC_ALL, LC_CTYPE, and LANG environment variables during startup. + +** New language environments `Polish', `Latin-8' and `Latin-9'. +Latin-8 and Latin-9 correspond respectively to the ISO character sets +8859-14 (Celtic) and 8859-15 (updated Latin-1, with the Euro sign). +GNU Intlfonts doesn't support these yet but recent X releases have +8859-15. See etc/INSTALL for information on obtaining extra fonts. +There are new Leim input methods for Latin-8 and Latin-9 prefix (only) +and Polish `slash'. + +** New language environments `Dutch' and `Spanish'. +These new environments mainly select appropriate translations +of the tutorial. + +** In Ethiopic language environment, special key bindings for +function keys are changed as follows. This is to conform to "Emacs +Lisp Coding Convention". + + new command old-binding + --- ------- ----------- + f3 ethio-fidel-to-sera-buffer f5 + S-f3 ethio-fidel-to-sera-region f5 + C-f3 ethio-fidel-to-sera-mail-or-marker f5 + + f4 ethio-sera-to-fidel-buffer unchanged + S-f4 ethio-sera-to-fidel-region unchanged + C-f4 ethio-sera-to-fidel-mail-or-marker unchanged + + S-f5 ethio-toggle-punctuation f3 + S-f6 ethio-modify-vowel f6 + S-f7 ethio-replace-space f7 + S-f8 ethio-input-special-character f8 + S-f9 ethio-replace-space unchanged + C-f9 ethio-toggle-space f2 + +** There are new Leim input methods. +New input methods "turkish-postfix", "turkish-alt-postfix", +"greek-mizuochi", "TeX", and "greek-babel" are now part of the Leim +package. + +** The rule of input method "slovak" is slightly changed. Now the +rules for translating "q" and "Q" to "`" (backquote) are deleted, thus +typing them inserts "q" and "Q" respectively. Rules for translating +"=q", "+q", "=Q", and "+Q" to "`" are also deleted. Now, to input +"`", you must type "=q". + +** When your terminal can't display characters from some of the ISO +8859 character sets but can display Latin-1, you can display +more-or-less mnemonic sequences of ASCII/Latin-1 characters instead of +empty boxes (under a window system) or question marks (not under a +window system). Customize the option `latin1-display' to turn this +on. + +** M-; now calls comment-dwim which tries to do something clever based +on the context. M-x kill-comment is now an alias to comment-kill, +defined in newcomment.el. You can choose different styles of region +commenting with the variable `comment-style'. + +** New user options `display-time-mail-face' and +`display-time-use-mail-icon' control the appearance of mode-line mail +indicator used by the display-time package. On a suitable display the +indicator can be an icon and is mouse-sensitive. + +** On window-systems, additional space can be put between text lines +on the display using several methods + +- By setting frame parameter `line-spacing' to PIXELS. PIXELS must be +a positive integer, and specifies that PIXELS number of pixels should +be put below text lines on the affected frame or frames. + +- By setting X resource `lineSpacing', class `LineSpacing'. This is +equivalent to specifying the frame parameter. + +- By specifying `--line-spacing=N' or `-lsp N' on the command line. + +- By setting buffer-local variable `line-spacing'. The meaning is +the same, but applies to the a particular buffer only. + +** The new command `clone-indirect-buffer' can be used to create +an indirect buffer that is a twin copy of the current buffer. The +command `clone-indirect-buffer-other-window', bound to C-x 4 c, +does the same but displays the indirect buffer in another window. + +** New user options `backup-directory-alist' and +`make-backup-file-name-function' control the placement of backups, +typically in a single directory or in an invisible sub-directory. + +** New commands iso-iso2sgml and iso-sgml2iso convert between Latin-1 +characters and the corresponding SGML (HTML) entities. + +** New X resources recognized + +*** The X resource `synchronous', class `Synchronous', specifies +whether Emacs should run in synchronous mode. Synchronous mode +is useful for debugging X problems. + +Example: + + emacs.synchronous: true + +*** The X resource `visualClass, class `VisualClass', specifies the +visual Emacs should use. The resource's value should be a string of +the form `CLASS-DEPTH', where CLASS is the name of the visual class, +and DEPTH is the requested color depth as a decimal number. Valid +visual class names are + + TrueColor + PseudoColor + DirectColor + StaticColor + GrayScale + StaticGray + +Visual class names specified as X resource are case-insensitive, i.e. +`pseudocolor', `Pseudocolor' and `PseudoColor' all have the same +meaning. + +The program `xdpyinfo' can be used to list the visual classes +supported on your display, and which depths they have. If +`visualClass' is not specified, Emacs uses the display's default +visual. + +Example: + + emacs.visualClass: TrueColor-8 + +*** The X resource `privateColormap', class `PrivateColormap', +specifies that Emacs should use a private colormap if it is using the +default visual, and that visual is of class PseudoColor. Recognized +resource values are `true' or `on'. + +Example: + + emacs.privateColormap: true + +** Faces and frame parameters. + +There are four new faces `scroll-bar', `border', `cursor' and `mouse'. +Setting the frame parameters `scroll-bar-foreground' and +`scroll-bar-background' sets foreground and background color of face +`scroll-bar' and vice versa. Setting frame parameter `border-color' +sets the background color of face `border' and vice versa. Likewise +for frame parameters `cursor-color' and face `cursor', and frame +parameter `mouse-color' and face `mouse'. + +Changing frame parameter `font' sets font-related attributes of the +`default' face and vice versa. Setting frame parameters +`foreground-color' or `background-color' sets the colors of the +`default' face and vice versa. + +** New face `menu'. + +The face `menu' can be used to change colors and font of Emacs' menus. + +** New frame parameter `screen-gamma' for gamma correction. + +The new frame parameter `screen-gamma' specifies gamma-correction for +colors. Its value may be nil, the default, in which case no gamma +correction occurs, or a number > 0, usually a float, that specifies +the screen gamma of a frame's display. + +PC monitors usually have a screen gamma of 2.2. smaller values result +in darker colors. You might want to try a screen gamma of 1.5 for LCD +color displays. The viewing gamma Emacs uses is 0.4545. (1/2.2). + +The X resource name of this parameter is `screenGamma', class +`ScreenGamma'. + +** Tabs and variable-width text. + +Tabs are now displayed with stretch properties; the width of a tab is +defined as a multiple of the normal character width of a frame, and is +independent of the fonts used in the text where the tab appears. +Thus, tabs can be used to line up text in different fonts. + +** Enhancements of the Lucid menu bar + +*** The Lucid menu bar now supports the resource "margin". + + emacs.pane.menubar.margin: 5 + +The default margin is 4 which makes the menu bar appear like the +LessTif/Motif one. + +*** Arrows that indicate sub-menus are now drawn with shadows, as in +LessTif and Motif. + +** A block cursor can be drawn as wide as the glyph under it under X. + +As an example: if a block cursor is over a tab character, it will be +drawn as wide as that tab on the display. To do this, set +`x-stretch-cursor' to a non-nil value. + +** Empty display lines at the end of a buffer may be marked with a +bitmap (this is similar to the tilde displayed by vi and Less). + +This behavior is activated by setting the buffer-local variable +`indicate-empty-lines' to a non-nil value. The default value of this +variable is found in `default-indicate-empty-lines'. + +** There is a new "aggressive" scrolling method. + +When scrolling up because point is above the window start, if the +value of the buffer-local variable `scroll-up-aggressively' is a +number, Emacs chooses a new window start so that point ends up that +fraction of the window's height from the top of the window. + +When scrolling down because point is below the window end, if the +value of the buffer-local variable `scroll-down-aggressively' is a +number, Emacs chooses a new window start so that point ends up that +fraction of the window's height from the bottom of the window. + +** You can now easily create new *Info* buffers using either +M-x clone-buffer, C-u m <entry> RET or C-u g <entry> RET. +M-x clone-buffer can also be used on *Help* and several other special +buffers. + +** The command `Info-search' now uses a search history. + +** Listing buffers with M-x list-buffers (C-x C-b) now shows +abbreviated file names. Abbreviations can be customized by changing +`directory-abbrev-alist'. + +** A new variable, backup-by-copying-when-privileged-mismatch, gives +the highest file uid for which backup-by-copying-when-mismatch will be +forced on. The assumption is that uids less than or equal to this +value are special uids (root, bin, daemon, etc.--not real system +users) and that files owned by these users should not change ownership, +even if your system policy allows users other than root to edit them. + +The default is 200; set the variable to nil to disable the feature. + +** The rectangle commands now avoid inserting undesirable spaces, +notably at the end of lines. + +All these functions have been rewritten to avoid inserting unwanted +spaces, and an optional prefix now allows them to behave the old way. + +** The function `replace-rectangle' is an alias for `string-rectangle'. + +** The new command M-x string-insert-rectangle is like `string-rectangle', +but inserts text instead of replacing it. + +** The new command M-x query-replace-regexp-eval acts like +query-replace-regexp, but takes a Lisp expression which is evaluated +after each match to get the replacement text. + +** M-x query-replace recognizes a new command `e' (or `E') that lets +you edit the replacement string. + +** The new command mail-abbrev-complete-alias, bound to `M-TAB' +(if you load the library `mailabbrev'), lets you complete mail aliases +in the text, analogous to lisp-complete-symbol. + +** The variable `echo-keystrokes' may now have a floating point value. + +** If your init file is compiled (.emacs.elc), `user-init-file' is set +to the source name (.emacs.el), if that exists, after loading it. + +** The help string specified for a menu-item whose definition contains +the property `:help HELP' is now displayed under X, on MS-Windows, and +MS-DOS, either in the echo area or with tooltips. Many standard menus +displayed by Emacs now have help strings. + +-- +** New user option `read-mail-command' specifies a command to use to +read mail from the menu etc. + +** The environment variable `EMACSLOCKDIR' is no longer used on MS-Windows. +This environment variable was used when creating lock files. Emacs on +MS-Windows does not use this variable anymore. This change was made +before Emacs 21.1, but wasn't documented until now. + +** Highlighting of mouse-sensitive regions is now supported in the +MS-DOS version of Emacs. + +** The new command `msdos-set-mouse-buttons' forces the MS-DOS version +of Emacs to behave as if the mouse had a specified number of buttons. +This comes handy with mice that don't report their number of buttons +correctly. One example is the wheeled mice, which report 3 buttons, +but clicks on the middle button are not passed to the MS-DOS version +of Emacs. + +** Customize changes + +*** Customize now supports comments about customized items. Use the +`State' menu to add comments, or give a prefix argument to +M-x customize-set-variable or M-x customize-set-value. Note that +customization comments will cause the customizations to fail in +earlier versions of Emacs. + +*** The new option `custom-buffer-done-function' says whether to kill +Custom buffers when you've done with them or just bury them (the +default). + +*** If Emacs was invoked with the `-q' or `--no-init-file' options, it +does not allow you to save customizations in your `~/.emacs' init +file. This is because saving customizations from such a session would +wipe out all the other customizationss you might have on your init +file. + +** If Emacs was invoked with the `-q' or `--no-init-file' options, it +does not save disabled and enabled commands for future sessions, to +avoid overwriting existing customizations of this kind that are +already in your init file. + +** New features in evaluation commands + +*** The commands to evaluate Lisp expressions, such as C-M-x in Lisp +modes, C-j in Lisp Interaction mode, and M-:, now bind the variables +print-level, print-length, and debug-on-error based on the new +customizable variables eval-expression-print-level, +eval-expression-print-length, and eval-expression-debug-on-error. + +The default values for the first two of these variables are 12 and 4 +respectively, which means that `eval-expression' now prints at most +the first 12 members of a list and at most 4 nesting levels deep (if +the list is longer or deeper than that, an ellipsis `...' is +printed). + +<RET> or <mouse-2> on the printed text toggles between an abbreviated +printed representation and an unabbreviated one. + +The default value of eval-expression-debug-on-error is t, so any error +during evaluation produces a backtrace. + +*** The function `eval-defun' (C-M-x) now loads Edebug and instruments +code when called with a prefix argument. + +** CC mode changes. + +Note: This release contains changes that might not be compatible with +current user setups (although it's believed that these +incompatibilities will only show in very uncommon circumstances). +However, since the impact is uncertain, these changes may be rolled +back depending on user feedback. Therefore there's no forward +compatibility guarantee wrt the new features introduced in this +release. + +*** The hardcoded switch to "java" style in Java mode is gone. +CC Mode used to automatically set the style to "java" when Java mode +is entered. This has now been removed since it caused too much +confusion. + +However, to keep backward compatibility to a certain extent, the +default value for c-default-style now specifies the "java" style for +java-mode, but "gnu" for all other modes (as before). So you won't +notice the change if you haven't touched that variable. + +*** New cleanups, space-before-funcall and compact-empty-funcall. +Two new cleanups have been added to c-cleanup-list: + +space-before-funcall causes a space to be inserted before the opening +parenthesis of a function call, which gives the style "foo (bar)". + +compact-empty-funcall causes any space before a function call opening +parenthesis to be removed if there are no arguments to the function. +It's typically useful together with space-before-funcall to get the +style "foo (bar)" and "foo()". + +*** Some keywords now automatically trigger reindentation. +Keywords like "else", "while", "catch" and "finally" have been made +"electric" to make them reindent automatically when they continue an +earlier statement. An example: + +for (i = 0; i < 17; i++) + if (a[i]) + res += a[i]->offset; +else + +Here, the "else" should be indented like the preceding "if", since it +continues that statement. CC Mode will automatically reindent it after +the "else" has been typed in full, since it's not until then it's +possible to decide whether it's a new statement or a continuation of +the preceding "if". + +CC Mode uses Abbrev mode to achieve this, which is therefore turned on +by default. + +*** M-a and M-e now moves by sentence in multiline strings. +Previously these two keys only moved by sentence in comments, which +meant that sentence movement didn't work in strings containing +documentation or other natural language text. + +The reason it's only activated in multiline strings (i.e. strings that +contain a newline, even when escaped by a '\') is to avoid stopping in +the short strings that often reside inside statements. Multiline +strings almost always contain text in a natural language, as opposed +to other strings that typically contain format specifications, +commands, etc. Also, it's not that bothersome that M-a and M-e misses +sentences in single line strings, since they're short anyway. + +*** Support for autodoc comments in Pike mode. +Autodoc comments for Pike are used to extract documentation from the +source, like Javadoc in Java. Pike mode now recognize this markup in +comment prefixes and paragraph starts. + +*** The comment prefix regexps on c-comment-prefix may be mode specific. +When c-comment-prefix is an association list, it specifies the comment +line prefix on a per-mode basis, like c-default-style does. This +change came about to support the special autodoc comment prefix in +Pike mode only. + +*** Better handling of syntactic errors. +The recovery after unbalanced parens earlier in the buffer has been +improved; CC Mode now reports them by dinging and giving a message +stating the offending line, but still recovers and indent the +following lines in a sane way (most of the time). An "else" with no +matching "if" is handled similarly. If an error is discovered while +indenting a region, the whole region is still indented and the error +is reported afterwards. + +*** Lineup functions may now return absolute columns. +A lineup function can give an absolute column to indent the line to by +returning a vector with the desired column as the first element. + +*** More robust and warning-free byte compilation. +Although this is strictly not a user visible change (well, depending +on the view of a user), it's still worth mentioning that CC Mode now +can be compiled in the standard ways without causing trouble. Some +code have also been moved between the subpackages to enhance the +modularity somewhat. Thanks to Martin Buchholz for doing the +groundwork. + +*** c-style-variables-are-local-p now defaults to t. +This is an incompatible change that has been made to make the behavior +of the style system wrt global variable settings less confusing for +non-advanced users. If you know what this variable does you might +want to set it to nil in your .emacs, otherwise you probably don't +have to bother. + +Defaulting c-style-variables-are-local-p to t avoids the confusing +situation that occurs when a user sets some style variables globally +and edits both a Java and a non-Java file in the same Emacs session. +If the style variables aren't buffer local in this case, loading of +the second file will cause the default style (either "gnu" or "java" +by default) to override the global settings made by the user. + +*** New initialization procedure for the style system. +When the initial style for a buffer is determined by CC Mode (from the +variable c-default-style), the global values of style variables now +take precedence over the values specified by the chosen style. This +is different than the old behavior: previously, the style-specific +settings would override the global settings. This change makes it +possible to do simple configuration in the intuitive way with +Customize or with setq lines in one's .emacs file. + +By default, the global value of every style variable is the new +special symbol set-from-style, which causes the value to be taken from +the style system. This means that in effect, only an explicit setting +of a style variable will cause the "overriding" behavior described +above. + +Also note that global settings override style-specific settings *only* +when the initial style of a buffer is chosen by a CC Mode major mode +function. When a style is chosen in other ways --- for example, by a +call like (c-set-style "gnu") in a hook, or via M-x c-set-style --- +then the style-specific values take precedence over any global style +values. In Lisp terms, global values override style-specific values +only when the new second argument to c-set-style is non-nil; see the +function documentation for more info. + +The purpose of these changes is to make it easier for users, +especially novice users, to do simple customizations with Customize or +with setq in their .emacs files. On the other hand, the new system is +intended to be compatible with advanced users' customizations as well, +such as those that choose styles in hooks or whatnot. This new system +is believed to be almost entirely compatible with current +configurations, in spite of the changed precedence between style and +global variable settings when a buffer's default style is set. + +(Thanks to Eric Eide for clarifying this explanation a bit.) + +**** c-offsets-alist is now a customizable variable. +This became possible as a result of the new initialization behavior. + +This variable is treated slightly differently from the other style +variables; instead of using the symbol set-from-style, it will be +completed with the syntactic symbols it doesn't already contain when +the style is first initialized. This means it now defaults to the +empty list to make all syntactic elements get their values from the +style system. + +**** Compatibility variable to restore the old behavior. +In case your configuration doesn't work with this change, you can set +c-old-style-variable-behavior to non-nil to get the old behavior back +as far as possible. + +*** Improvements to line breaking and text filling. +CC Mode now handles this more intelligently and seamlessly wrt the +surrounding code, especially inside comments. For details see the new +chapter about this in the manual. + +**** New variable to recognize comment line prefix decorations. +The variable c-comment-prefix-regexp has been added to properly +recognize the line prefix in both block and line comments. It's +primarily used to initialize the various paragraph recognition and +adaptive filling variables that the text handling functions uses. + +**** New variable c-block-comment-prefix. +This is a generalization of the now obsolete variable +c-comment-continuation-stars to handle arbitrary strings. + +**** CC Mode now uses adaptive fill mode. +This to make it adapt better to the paragraph style inside comments. + +It's also possible to use other adaptive filling packages inside CC +Mode, notably Kyle E. Jones' Filladapt mode (http://wonderworks.com/). +A new convenience function c-setup-filladapt sets up Filladapt for use +inside CC Mode. + +Note though that the 2.12 version of Filladapt lacks a feature that +causes it to work suboptimally when c-comment-prefix-regexp can match +the empty string (which it commonly does). A patch for that is +available from the CC Mode web site (http://www.python.org/emacs/ +cc-mode/). + +**** The variables `c-hanging-comment-starter-p' and +`c-hanging-comment-ender-p', which controlled how comment starters and +enders were filled, are not used anymore. The new version of the +function `c-fill-paragraph' keeps the comment starters and enders as +they were before the filling. + +**** It's now possible to selectively turn off auto filling. +The variable c-ignore-auto-fill is used to ignore auto fill mode in +specific contexts, e.g. in preprocessor directives and in string +literals. + +**** New context sensitive line break function c-context-line-break. +It works like newline-and-indent in normal code, and adapts the line +prefix according to the comment style when used inside comments. If +you're normally using newline-and-indent, you might want to switch to +this function. + +*** Fixes to IDL mode. +It now does a better job in recognizing only the constructs relevant +to IDL. E.g. it no longer matches "class" as the beginning of a +struct block, but it does match the CORBA 2.3 "valuetype" keyword. +Thanks to Eric Eide. + +*** Improvements to the Whitesmith style. +It now keeps the style consistently on all levels and both when +opening braces hangs and when they don't. + +**** New lineup function c-lineup-whitesmith-in-block. + +*** New lineup functions c-lineup-template-args and c-indent-multi-line-block. +See their docstrings for details. c-lineup-template-args does a +better job of tracking the brackets used as parens in C++ templates, +and is used by default to line up continued template arguments. + +*** c-lineup-comment now preserves alignment with a comment on the +previous line. It used to instead preserve comments that started in +the column specified by comment-column. + +*** c-lineup-C-comments handles "free form" text comments. +In comments with a long delimiter line at the start, the indentation +is kept unchanged for lines that start with an empty comment line +prefix. This is intended for the type of large block comments that +contain documentation with its own formatting. In these you normally +don't want CC Mode to change the indentation. + +*** The `c' syntactic symbol is now relative to the comment start +instead of the previous line, to make integers usable as lineup +arguments. + +*** All lineup functions have gotten docstrings. + +*** More preprocessor directive movement functions. +c-down-conditional does the reverse of c-up-conditional. +c-up-conditional-with-else and c-down-conditional-with-else are +variants of these that also stops at "#else" lines (suggested by Don +Provan). + +*** Minor improvements to many movement functions in tricky situations. + +** Dired changes + +*** New variable `dired-recursive-deletes' determines if the delete +command will delete non-empty directories recursively. The default +is, delete only empty directories. + +*** New variable `dired-recursive-copies' determines if the copy +command will copy directories recursively. The default is, do not +copy directories recursively. + +*** In command `dired-do-shell-command' (usually bound to `!') a `?' +in the shell command has a special meaning similar to `*', but with +the difference that the command will be run on each file individually. + +*** The new command `dired-find-alternate-file' (usually bound to `a') +replaces the Dired buffer with the buffer for an alternate file or +directory. + +*** The new command `dired-show-file-type' (usually bound to `y') shows +a message in the echo area describing what type of file the point is on. +This command invokes the external program `file' do its work, and so +will only work on systems with that program, and will be only as +accurate or inaccurate as it is. + +*** Dired now properly handles undo changes of adding/removing `-R' +from ls switches. + +*** Dired commands that prompt for a destination file now allow the use +of the `M-n' command in the minibuffer to insert the source filename, +which the user can then edit. This only works if there is a single +source file, not when operating on multiple marked files. + +** Gnus changes. + +The Gnus NEWS entries are short, but they reflect sweeping changes in +four areas: Article display treatment, MIME treatment, +internationalization and mail-fetching. + +*** The mail-fetching functions have changed. See the manual for the +many details. In particular, all procmail fetching variables are gone. + +If you used procmail like in + +(setq nnmail-use-procmail t) +(setq nnmail-spool-file 'procmail) +(setq nnmail-procmail-directory "~/mail/incoming/") +(setq nnmail-procmail-suffix "\\.in") + +this now has changed to + +(setq mail-sources + '((directory :path "~/mail/incoming/" + :suffix ".in"))) + +More information is available in the info doc at Select Methods -> +Getting Mail -> Mail Sources + +*** Gnus is now a MIME-capable reader. This affects many parts of +Gnus, and adds a slew of new commands. See the manual for details. +Separate MIME packages like RMIME, mime-compose etc., will probably no +longer work; remove them and use the native facilities. + +The FLIM/SEMI package still works with Emacs 21, but if you want to +use the native facilities, you must remove any mailcap.el[c] that was +installed by FLIM/SEMI version 1.13 or earlier. + +*** Gnus has also been multilingualized. This also affects too many +parts of Gnus to summarize here, and adds many new variables. There +are built-in facilities equivalent to those of gnus-mule.el, which is +now just a compatibility layer. + +*** gnus-mule.el is now just a compatibility layer over the built-in +Gnus facilities. + +*** gnus-auto-select-first can now be a function to be +called to position point. + +*** The user can now decide which extra headers should be included in +summary buffers and NOV files. + +*** `gnus-article-display-hook' has been removed. Instead, a number +of variables starting with `gnus-treat-' have been added. + +*** The Gnus posting styles have been redone again and now work in a +subtly different manner. + +*** New web-based backends have been added: nnslashdot, nnwarchive +and nnultimate. nnweb has been revamped, again, to keep up with +ever-changing layouts. + +*** Gnus can now read IMAP mail via nnimap. + +*** There is image support of various kinds and some sound support. + +** Changes in Texinfo mode. + +*** A couple of new key bindings have been added for inserting Texinfo +macros + + Key binding Macro + ------------------------- + C-c C-c C-s @strong + C-c C-c C-e @emph + C-c C-c u @uref + C-c C-c q @quotation + C-c C-c m @email + C-c C-o @<block> ... @end <block> + M-RET @item + +*** The " key now inserts either " or `` or '' depending on context. + +** Changes in Outline mode. + +There is now support for Imenu to index headings. A new command +`outline-headers-as-kill' copies the visible headings in the region to +the kill ring, e.g. to produce a table of contents. + +** Changes to Emacs Server + +*** The new option `server-kill-new-buffers' specifies what to do +with buffers when done with them. If non-nil, the default, buffers +are killed, unless they were already present before visiting them with +Emacs Server. If nil, `server-temp-file-regexp' specifies which +buffers to kill, as before. + +Please note that only buffers are killed that still have a client, +i.e. buffers visited with `emacsclient --no-wait' are never killed in +this way. + +** Both emacsclient and Emacs itself now accept command line options +of the form +LINE:COLUMN in addition to +LINE. + +** Changes to Show Paren mode. + +*** Overlays used by Show Paren mode now use a priority property. +The new user option show-paren-priority specifies the priority to +use. Default is 1000. + +** New command M-x check-parens can be used to find unbalanced paren +groups and strings in buffers in Lisp mode (or other modes). + +** Changes to hideshow.el + +*** Generalized block selection and traversal + +A block is now recognized by its start and end regexps (both strings), +and an integer specifying which sub-expression in the start regexp +serves as the place where a `forward-sexp'-like function can operate. +See the documentation of variable `hs-special-modes-alist'. + +*** During incremental search, if Hideshow minor mode is active, +hidden blocks are temporarily shown. The variable `hs-headline' can +be used in the mode line format to show the line at the beginning of +the open block. + +*** User option `hs-hide-all-non-comment-function' specifies a +function to be called at each top-level block beginning, instead of +the normal block-hiding function. + +*** The command `hs-show-region' has been removed. + +*** The key bindings have changed to fit the Emacs conventions, +roughly imitating those of Outline minor mode. Notably, the prefix +for all bindings is now `C-c @'. For details, see the documentation +for `hs-minor-mode'. + +*** The variable `hs-show-hidden-short-form' has been removed, and +hideshow.el now always behaves as if this variable were set to t. + +** Changes to Change Log mode and Add-Log functions + +*** If you invoke `add-change-log-entry' from a backup file, it makes +an entry appropriate for the file's parent. This is useful for making +log entries by comparing a version with deleted functions. + +**** New command M-x change-log-merge merges another log into the +current buffer. + +*** New command M-x change-log-redate fixes any old-style date entries +in a log file. + +*** Change Log mode now adds a file's version number to change log +entries if user-option `change-log-version-info-enabled' is non-nil. +Unless the file is under version control the search for a file's +version number is performed based on regular expressions from +`change-log-version-number-regexp-list' which can be customized. +Version numbers are only found in the first 10 percent of a file. + +*** Change Log mode now defines its own faces for font-lock highlighting. + +** Changes to cmuscheme + +*** The user-option `scheme-program-name' has been renamed +`cmuscheme-program-name' due to conflicts with xscheme.el. + +** Changes in Font Lock + +*** The new function `font-lock-remove-keywords' can be used to remove +font-lock keywords from the current buffer or from a specific major mode. + +*** Multi-line patterns are now supported. Modes using this, should +set font-lock-multiline to t in their font-lock-defaults. + +*** `font-lock-syntactic-face-function' allows major-modes to choose +the face used for each string/comment. + +*** A new standard face `font-lock-doc-face'. +Meant for Lisp docstrings, Javadoc comments and other "documentation in code". + +** Changes to Shell mode + +*** The `shell' command now accepts an optional argument to specify the buffer +to use, which defaults to "*shell*". When used interactively, a +non-default buffer may be specified by giving the `shell' command a +prefix argument (causing it to prompt for the buffer name). + +** Comint (subshell) changes + +These changes generally affect all modes derived from comint mode, which +include shell-mode, gdb-mode, scheme-interaction-mode, etc. + +*** Comint now by default interprets some carriage-control characters. +Comint now removes CRs from CR LF sequences, and treats single CRs and +BSs in the output in a way similar to a terminal (by deleting to the +beginning of the line, or deleting the previous character, +respectively). This is achieved by adding `comint-carriage-motion' to +the `comint-output-filter-functions' hook by default. + +*** By default, comint no longer uses the variable `comint-prompt-regexp' +to distinguish prompts from user-input. Instead, it notices which +parts of the text were output by the process, and which entered by the +user, and attaches `field' properties to allow emacs commands to use +this information. Common movement commands, notably beginning-of-line, +respect field boundaries in a fairly natural manner. To disable this +feature, and use the old behavior, customize the user option +`comint-use-prompt-regexp-instead-of-fields'. + +*** Comint now includes new features to send commands to running processes +and redirect the output to a designated buffer or buffers. + +*** The command M-x comint-redirect-send-command reads a command and +buffer name from the mini-buffer. The command is sent to the current +buffer's process, and its output is inserted into the specified buffer. + +The command M-x comint-redirect-send-command-to-process acts like +M-x comint-redirect-send-command but additionally reads the name of +the buffer whose process should be used from the mini-buffer. + +*** Packages based on comint now highlight user input and program prompts, +and support choosing previous input with mouse-2. To control these features, +see the user-options `comint-highlight-input' and `comint-highlight-prompt'. + +*** The new command `comint-write-output' (usually bound to `C-c C-s') +saves the output from the most recent command to a file. With a prefix +argument, it appends to the file. + +*** The command `comint-kill-output' has been renamed `comint-delete-output' +(usually bound to `C-c C-o'); the old name is aliased to it for +compatibility. + +*** The new function `comint-add-to-input-history' adds commands to the input +ring (history). + +*** The new variable `comint-input-history-ignore' is a regexp for +identifying history lines that should be ignored, like tcsh time-stamp +strings, starting with a `#'. The default value of this variable is "^#". + +** Changes to Rmail mode + +*** The new user-option rmail-user-mail-address-regexp can be +set to fine tune the identification of the correspondent when +receiving new mail. If it matches the address of the sender, the +recipient is taken as correspondent of a mail. If nil, the default, +`user-login-name' and `user-mail-address' are used to exclude yourself +as correspondent. + +Usually you don't have to set this variable, except if you collect +mails sent by you under different user names. Then it should be a +regexp matching your mail addresses. + +*** The new user-option rmail-confirm-expunge controls whether and how +to ask for confirmation before expunging deleted messages from an +Rmail file. You can choose between no confirmation, confirmation +with y-or-n-p, or confirmation with yes-or-no-p. Default is to ask +for confirmation with yes-or-no-p. + +*** RET is now bound in the Rmail summary to rmail-summary-goto-msg, +like `j'. + +*** There is a new user option `rmail-digest-end-regexps' that +specifies the regular expressions to detect the line that ends a +digest message. + +*** The new user option `rmail-automatic-folder-directives' specifies +in which folder to put messages automatically. + +*** The new function `rmail-redecode-body' allows to fix a message +with non-ASCII characters if Emacs happens to decode it incorrectly +due to missing or malformed "charset=" header. + +** The new user-option `mail-envelope-from' can be used to specify +an envelope-from address different from user-mail-address. + +** The variable mail-specify-envelope-from controls whether to +use the -f option when sending mail. + +** The Rmail command `o' (`rmail-output-to-rmail-file') now writes the +current message in the internal `emacs-mule' encoding, rather than in +the encoding taken from the variable `buffer-file-coding-system'. +This allows to save messages whose characters cannot be safely encoded +by the buffer's coding system, and makes sure the message will be +displayed correctly when you later visit the target Rmail file. + +If you want your Rmail files be encoded in a specific coding system +other than `emacs-mule', you can customize the variable +`rmail-file-coding-system' to set its value to that coding system. + +** Changes to TeX mode + +*** The default mode has been changed from `plain-tex-mode' to +`latex-mode'. + +*** latex-mode now has a simple indentation algorithm. + +*** M-f and M-p jump around \begin...\end pairs. + +*** Added support for outline-minor-mode. + +** Changes to RefTeX mode + +*** RefTeX has new support for index generation. Index entries can be + created with `C-c <', with completion available on index keys. + Pressing `C-c /' indexes the word at the cursor with a default + macro. `C-c >' compiles all index entries into an alphabetically + sorted *Index* buffer which looks like the final index. Entries + can be edited from that buffer. + +*** Label and citation key selection now allow to select several + items and reference them together (use `m' to mark items, `a' or + `A' to use all marked entries). + +*** reftex.el has been split into a number of smaller files to reduce + memory use when only a part of RefTeX is being used. + +*** a new command `reftex-view-crossref-from-bibtex' (bound to `C-c &' + in BibTeX-mode) can be called in a BibTeX database buffer in order + to show locations in LaTeX documents where a particular entry has + been cited. + +** Emacs Lisp mode now allows multiple levels of outline headings. +The level of a heading is determined from the number of leading +semicolons in a heading line. Toplevel forms starting with a `(' +in column 1 are always made leaves. + +** The M-x time-stamp command (most commonly used on write-file-hooks) +has the following new features: + +*** The patterns for finding the time stamp and for updating a pattern +may match text spanning multiple lines. For example, some people like +to have the filename and date on separate lines. The new variable +time-stamp-inserts-lines controls the matching for multi-line patterns. + +*** More than one time stamp can be updated in the same file. This +feature is useful if you need separate time stamps in a program source +file to both include in formatted documentation and insert in the +compiled binary. The same time-stamp will be written at each matching +pattern. The variable time-stamp-count enables this new feature; it +defaults to 1. + +** Partial Completion mode now completes environment variables in +file names. + +** Ispell changes + +*** The command `ispell' now spell-checks a region if +transient-mark-mode is on, and the mark is active. Otherwise it +spell-checks the current buffer. + +*** Support for synchronous subprocesses - DOS/Windoze - has been +added. + +*** An "alignment error" bug was fixed when a manual spelling +correction is made and re-checked. + +*** Italian, Portuguese, and Slovak dictionary definitions have been added. + +*** Region skipping performance has been vastly improved in some +cases. + +*** Spell checking HTML buffers has been improved and isn't so strict +on syntax errors. + +*** The buffer-local words are now always placed on a new line at the +end of the buffer. + +*** Spell checking now works in the MS-DOS version of Emacs. + +*** The variable `ispell-format-word' has been renamed to +`ispell-format-word-function'. The old name is still available as +alias. + +** Makefile mode changes + +*** The mode now uses the abbrev table `makefile-mode-abbrev-table'. + +*** Conditionals and include statements are now highlighted when +Fontlock mode is active. + +** Isearch changes + +*** Isearch now puts a call to `isearch-resume' in the command history, +so that searches can be resumed. + +*** In Isearch mode, C-M-s and C-M-r are now bound like C-s and C-r, +respectively, i.e. you can repeat a regexp isearch with the same keys +that started the search. + +*** In Isearch mode, mouse-2 in the echo area now yanks the current +selection into the search string rather than giving an error. + +*** There is a new lazy highlighting feature in incremental search. + +Lazy highlighting is switched on/off by customizing variable +`isearch-lazy-highlight'. When active, all matches for the current +search string are highlighted. The current match is highlighted as +before using face `isearch' or `region'. All other matches are +highlighted using face `isearch-lazy-highlight-face' which defaults to +`secondary-selection'. + +The extra highlighting makes it easier to anticipate where the cursor +will end up each time you press C-s or C-r to repeat a pending search. +Highlighting of these additional matches happens in a deferred fashion +using "idle timers," so the cycles needed do not rob isearch of its +usual snappy response. + +If `isearch-lazy-highlight-cleanup' is set to t, highlights for +matches are automatically cleared when you end the search. If it is +set to nil, you can remove the highlights manually with `M-x +isearch-lazy-highlight-cleanup'. + +** VC Changes + +VC has been overhauled internally. It is now modular, making it +easier to plug-in arbitrary version control backends. (See Lisp +Changes for details on the new structure.) As a result, the mechanism +to enable and disable support for particular version systems has +changed: everything is now controlled by the new variable +`vc-handled-backends'. Its value is a list of symbols that identify +version systems; the default is '(RCS CVS SCCS). When finding a file, +each of the backends in that list is tried in order to see whether the +file is registered in that backend. + +When registering a new file, VC first tries each of the listed +backends to see if any of them considers itself "responsible" for the +directory of the file (e.g. because a corresponding subdirectory for +master files exists). If none of the backends is responsible, then +the first backend in the list that could register the file is chosen. +As a consequence, the variable `vc-default-back-end' is now obsolete. + +The old variable `vc-master-templates' is also obsolete, although VC +still supports it for backward compatibility. To define templates for +RCS or SCCS, you should rather use the new variables +vc-{rcs,sccs}-master-templates. (There is no such feature under CVS +where it doesn't make sense.) + +The variables `vc-ignore-vc-files' and `vc-handle-cvs' are also +obsolete now, you must set `vc-handled-backends' to nil or exclude +`CVS' from the list, respectively, to achieve their effect now. + +*** General Changes + +The variable `vc-checkout-carefully' is obsolete: the corresponding +checks are always done now. + +VC Dired buffers are now kept up-to-date during all version control +operations. + +`vc-diff' output is now displayed in `diff-mode'. +`vc-print-log' uses `log-view-mode'. +`vc-log-mode' (used for *VC-Log*) has been replaced by `log-edit-mode'. + +The command C-x v m (vc-merge) now accepts an empty argument as the +first revision number. This means that any recent changes on the +current branch should be picked up from the repository and merged into +the working file (``merge news''). + +The commands C-x v s (vc-create-snapshot) and C-x v r +(vc-retrieve-snapshot) now ask for a directory name from which to work +downwards. + +*** Multiple Backends + +VC now lets you register files in more than one backend. This is +useful, for example, if you are working with a slow remote CVS +repository. You can then use RCS for local editing, and occasionally +commit your changes back to CVS, or pick up changes from CVS into your +local RCS archives. + +To make this work, the ``more local'' backend (RCS in our example) +should come first in `vc-handled-backends', and the ``more remote'' +backend (CVS) should come later. (The default value of +`vc-handled-backends' already has it that way.) + +You can then commit changes to another backend (say, RCS), by typing +C-u C-x v v RCS RET (i.e. vc-next-action now accepts a backend name as +a revision number). VC registers the file in the more local backend +if that hasn't already happened, and commits to a branch based on the +current revision number from the more remote backend. + +If a file is registered in multiple backends, you can switch to +another one using C-x v b (vc-switch-backend). This does not change +any files, it only changes VC's perspective on the file. Use this to +pick up changes from CVS while working under RCS locally. + +After you are done with your local RCS editing, you can commit your +changes back to CVS using C-u C-x v v CVS RET. In this case, the +local RCS archive is removed after the commit, and the log entry +buffer is initialized to contain the entire RCS change log of the file. + +*** Changes for CVS + +There is a new user option, `vc-cvs-stay-local'. If it is `t' (the +default), then VC avoids network queries for files registered in +remote repositories. The state of such files is then only determined +by heuristics and past information. `vc-cvs-stay-local' can also be a +regexp to match against repository hostnames; only files from hosts +that match it are treated locally. If the variable is nil, then VC +queries the repository just as often as it does for local files. + +If `vc-cvs-stay-local' is on, then VC also makes local backups of +repository versions. This means that ordinary diffs (C-x v =) and +revert operations (C-x v u) can be done completely locally, without +any repository interactions at all. The name of a local version +backup of FILE is FILE.~REV.~, where REV is the repository version +number. This format is similar to that used by C-x v ~ +(vc-version-other-window), except for the trailing dot. As a matter +of fact, the two features can each use the files created by the other, +the only difference being that files with a trailing `.' are deleted +automatically after commit. (This feature doesn't work on MS-DOS, +since DOS disallows more than a single dot in the trunk of a file +name.) + +If `vc-cvs-stay-local' is on, and there have been changes in the +repository, VC notifies you about it when you actually try to commit. +If you want to check for updates from the repository without trying to +commit, you can either use C-x v m RET to perform an update on the +current file, or you can use C-x v r RET to get an update for an +entire directory tree. + +The new user option `vc-cvs-use-edit' indicates whether VC should call +"cvs edit" to make files writeable; it defaults to `t'. (This option +is only meaningful if the CVSREAD variable is set, or if files are +"watched" by other developers.) + +The commands C-x v s (vc-create-snapshot) and C-x v r +(vc-retrieve-snapshot) are now also implemented for CVS. If you give +an empty snapshot name to the latter, that performs a `cvs update', +starting at the given directory. + +*** Lisp Changes in VC + +VC has been restructured internally to make it modular. You can now +add support for arbitrary version control backends by writing a +library that provides a certain set of backend-specific functions, and +then telling VC to use that library. For example, to add support for +a version system named SYS, you write a library named vc-sys.el, which +provides a number of functions vc-sys-... (see commentary at the top +of vc.el for a detailed list of them). To make VC use that library, +you need to put it somewhere into Emacs' load path and add the symbol +`SYS' to the list `vc-handled-backends'. + +** The customizable EDT emulation package now supports the EDT +SUBS command and EDT scroll margins. It also works with more +terminal/keyboard configurations and it now works under XEmacs. +See etc/edt-user.doc for more information. + +** New modes and packages + +*** The new global minor mode `minibuffer-electric-default-mode' +automatically hides the `(default ...)' part of minibuffer prompts when +the default is not applicable. + +*** Artist is an Emacs lisp package that allows you to draw lines, +rectangles and ellipses by using your mouse and/or keyboard. The +shapes are made up with the ascii characters |, -, / and \. + +Features are: + +- Intersecting: When a `|' intersects with a `-', a `+' is + drawn, like this: | \ / + --+-- X + | / \ + +- Rubber-banding: When drawing lines you can interactively see the + result while holding the mouse button down and moving the mouse. If + your machine is not fast enough (a 386 is a bit too slow, but a + pentium is well enough), you can turn this feature off. You will + then see 1's and 2's which mark the 1st and 2nd endpoint of the line + you are drawing. + +- Arrows: After having drawn a (straight) line or a (straight) + poly-line, you can set arrows on the line-ends by typing < or >. + +- Flood-filling: You can fill any area with a certain character by + flood-filling. + +- Cut copy and paste: You can cut, copy and paste rectangular + regions. Artist also interfaces with the rect package (this can be + turned off if it causes you any trouble) so anything you cut in + artist can be yanked with C-x r y and vice versa. + +- Drawing with keys: Everything you can do with the mouse, you can + also do without the mouse. + +- Aspect-ratio: You can set the variable artist-aspect-ratio to + reflect the height-width ratio for the font you are using. Squares + and circles are then drawn square/round. Note, that once your + ascii-file is shown with font with a different height-width ratio, + the squares won't be square and the circles won't be round. + +- Drawing operations: The following drawing operations are implemented: + + lines straight-lines + rectangles squares + poly-lines straight poly-lines + ellipses circles + text (see-thru) text (overwrite) + spray-can setting size for spraying + vaporize line vaporize lines + erase characters erase rectangles + + Straight lines are lines that go horizontally, vertically or + diagonally. Plain lines go in any direction. The operations in + the right column are accessed by holding down the shift key while + drawing. + + It is possible to vaporize (erase) entire lines and connected lines + (rectangles for example) as long as the lines being vaporized are + straight and connected at their endpoints. Vaporizing is inspired + by the drawrect package by Jari Aalto <jari.aalto@poboxes.com>. + +- Picture mode compatibility: Artist is picture mode compatible (this + can be turned off). + +*** The new package Eshell is an operating system command shell +implemented entirely in Emacs Lisp. Use `M-x eshell' to invoke it. +It functions similarly to bash and zsh, and allows running of Lisp +functions and external commands using the same syntax. It supports +history lists, aliases, extended globbing, smart scrolling, etc. It +will work on any platform Emacs has been ported to. And since most of +the basic commands -- ls, rm, mv, cp, ln, du, cat, etc. -- have been +rewritten in Lisp, it offers an operating-system independent shell, +all within the scope of your Emacs process. + +*** The new package timeclock.el is a mode is for keeping track of time +intervals. You can use it for whatever purpose you like, but the +typical scenario is to keep track of how much time you spend working +on certain projects. + +*** The new package hi-lock.el provides commands to highlight matches +of interactively entered regexps. For example, + + M-x highlight-regexp RET clearly RET RET + +will highlight all occurrences of `clearly' using a yellow background +face. New occurrences of `clearly' will be highlighted as they are +typed. `M-x unhighlight-regexp RET' will remove the highlighting. +Any existing face can be used for highlighting and a set of +appropriate faces is provided. The regexps can be written into the +current buffer in a form that will be recognized the next time the +corresponding file is read. There are commands to highlight matches +to phrases and to highlight entire lines containing a match. + +*** The new package zone.el plays games with Emacs' display when +Emacs is idle. + +*** The new package tildify.el allows to add hard spaces or other text +fragments in accordance with the current major mode. + +*** The new package xml.el provides a simple but generic XML +parser. It doesn't parse the DTDs however. + +*** The comment operations are now provided by the newcomment.el +package which allows different styles of comment-region and should +be more robust while offering the same functionality. +`comment-region' now doesn't always comment a-line-at-a-time, but only +comments the region, breaking the line at point if necessary. + +*** The Ebrowse package implements a C++ class browser and tags +facilities tailored for use with C++. It is documented in a +separate Texinfo file. + +*** The PCL-CVS package available by either running M-x cvs-examine or +by visiting a CVS administrative directory (with a prefix argument) +provides an alternative interface to VC-dired for CVS. It comes with +`log-view-mode' to view RCS and SCCS logs and `log-edit-mode' used to +enter check-in log messages. + +*** The new package called `woman' allows to browse Unix man pages +without invoking external programs. + +The command `M-x woman' formats manual pages entirely in Emacs Lisp +and then displays them, like `M-x manual-entry' does. Unlike +`manual-entry', `woman' does not invoke any external programs, so it +is useful on systems such as MS-DOS/MS-Windows where the `man' and +Groff or `troff' commands are not readily available. + +The command `M-x woman-find-file' asks for the file name of a man +page, then formats and displays it like `M-x woman' does. + +*** The new command M-x re-builder offers a convenient interface for +authoring regular expressions with immediate visual feedback. + +The buffer from which the command was called becomes the target for +the regexp editor popping up in a separate window. Matching text in +the target buffer is immediately color marked during the editing. +Each sub-expression of the regexp will show up in a different face so +even complex regexps can be edited and verified on target data in a +single step. + +On displays not supporting faces the matches instead blink like +matching parens to make them stand out. On such a setup you will +probably also want to use the sub-expression mode when the regexp +contains such to get feedback about their respective limits. + +*** glasses-mode is a minor mode that makes +unreadableIdentifiersLikeThis readable. It works as glasses, without +actually modifying content of a buffer. + +*** The package ebnf2ps translates an EBNF to a syntactic chart in +PostScript. + +Currently accepts ad-hoc EBNF, ISO EBNF and Bison/Yacc. + +The ad-hoc default EBNF syntax has the following elements: + + ; comment (until end of line) + A non-terminal + "C" terminal + ?C? special + $A default non-terminal + $"C" default terminal + $?C? default special + A = B. production (A is the header and B the body) + C D sequence (C occurs before D) + C | D alternative (C or D occurs) + A - B exception (A excluding B, B without any non-terminal) + n * A repetition (A repeats n (integer) times) + (C) group (expression C is grouped together) + [C] optional (C may or not occurs) + C+ one or more occurrences of C + {C}+ one or more occurrences of C + {C}* zero or more occurrences of C + {C} zero or more occurrences of C + C / D equivalent to: C {D C}* + {C || D}+ equivalent to: C {D C}* + {C || D}* equivalent to: [C {D C}*] + {C || D} equivalent to: [C {D C}*] + +Please, see ebnf2ps documentation for EBNF syntax and how to use it. + +*** The package align.el will align columns within a region, using M-x +align. Its mode-specific rules, based on regular expressions, +determine where the columns should be split. In C and C++, for +example, it will align variable names in declaration lists, or the +equal signs of assignments. + +*** `paragraph-indent-minor-mode' is a new minor mode supporting +paragraphs in the same style as `paragraph-indent-text-mode'. + +*** bs.el is a new package for buffer selection similar to +list-buffers or electric-buffer-list. Use M-x bs-show to display a +buffer menu with this package. See the Custom group `bs'. + +*** find-lisp.el is a package emulating the Unix find command in Lisp. + +*** calculator.el is a small calculator package that is intended to +replace desktop calculators such as xcalc and calc.exe. Actually, it +is not too small - it has more features than most desktop calculators, +and can be customized easily to get many more functions. It should +not be confused with "calc" which is a much bigger mathematical tool +which answers different needs. + +*** The minor modes cwarn-mode and global-cwarn-mode highlights +suspicious C and C++ constructions. Currently, assignments inside +expressions, semicolon following `if', `for' and `while' (except, of +course, after a `do .. while' statement), and C++ functions with +reference parameters are recognized. The modes require font-lock mode +to be enabled. + +*** smerge-mode.el provides `smerge-mode', a simple minor-mode for files +containing diff3-style conflict markers, such as generated by RCS. + +*** 5x5.el is a simple puzzle game. + +*** hl-line.el provides `hl-line-mode', a minor mode to highlight the +current line in the current buffer. It also provides +`global-hl-line-mode' to provide the same behavior in all buffers. + +*** ansi-color.el translates ANSI terminal escapes into text-properties. + +Please note: if `ansi-color-for-comint-mode' and +`global-font-lock-mode' are non-nil, loading ansi-color.el will +disable font-lock and add `ansi-color-apply' to +`comint-preoutput-filter-functions' for all shell-mode buffers. This +displays the output of "ls --color=yes" using the correct foreground +and background colors. + +*** delphi.el provides a major mode for editing the Delphi (Object +Pascal) language. + +*** quickurl.el provides a simple method of inserting a URL based on +the text at point. + +*** sql.el provides an interface to SQL data bases. + +*** fortune.el uses the fortune program to create mail/news signatures. + +*** whitespace.el is a package for warning about and cleaning bogus +whitespace in a file. + +*** PostScript mode (ps-mode) is a new major mode for editing PostScript +files. It offers: interaction with a PostScript interpreter, including +(very basic) error handling; fontification, easily customizable for +interpreter messages; auto-indentation; insertion of EPSF templates and +often used code snippets; viewing of BoundingBox; commenting out / +uncommenting regions; conversion of 8bit characters to PostScript octal +codes. All functionality is accessible through a menu. + +*** delim-col helps to prettify columns in a text region or rectangle. + +Here is an example of columns: + +horse apple bus +dog pineapple car EXTRA +porcupine strawberry airplane + +Doing the following settings: + + (setq delimit-columns-str-before "[ ") + (setq delimit-columns-str-after " ]") + (setq delimit-columns-str-separator ", ") + (setq delimit-columns-separator "\t") + + +Selecting the lines above and typing: + + M-x delimit-columns-region + +It results: + +[ horse , apple , bus , ] +[ dog , pineapple , car , EXTRA ] +[ porcupine, strawberry, airplane, ] + +delim-col has the following options: + + delimit-columns-str-before Specify a string to be inserted + before all columns. + + delimit-columns-str-separator Specify a string to be inserted + between each column. + + delimit-columns-str-after Specify a string to be inserted + after all columns. + + delimit-columns-separator Specify a regexp which separates + each column. + +delim-col has the following commands: + + delimit-columns-region Prettify all columns in a text region. + delimit-columns-rectangle Prettify all columns in a text rectangle. + +*** Recentf mode maintains a menu for visiting files that were +operated on recently. User option recentf-menu-filter specifies a +menu filter function to change the menu appearance. For example, the +recent file list can be displayed: + +- organized by major modes, directories or user defined rules. +- sorted by file paths, file names, ascending or descending. +- showing paths relative to the current default-directory + +The `recentf-filter-changer' menu filter function allows to +dynamically change the menu appearance. + +*** elide-head.el provides a mechanism for eliding boilerplate header +text. + +*** footnote.el provides `footnote-mode', a minor mode supporting use +of footnotes. It is intended for use with Message mode, but isn't +specific to Message mode. + +*** diff-mode.el provides `diff-mode', a major mode for +viewing/editing context diffs (patches). It is selected for files +with extension `.diff', `.diffs', `.patch' and `.rej'. + +*** EUDC, the Emacs Unified Directory Client, provides a common user +interface to access directory servers using different directory +protocols. It has a separate manual. + +*** autoconf.el provides a major mode for editing configure.in files +for Autoconf, selected automatically. + +*** windmove.el provides moving between windows. + +*** crm.el provides a facility to read multiple strings from the +minibuffer with completion. + +*** todo-mode.el provides management of TODO lists and integration +with the diary features. + +*** autoarg.el provides a feature reported from Twenex Emacs whereby +numeric keys supply prefix args rather than self inserting. + +*** The function `turn-off-auto-fill' unconditionally turns off Auto +Fill mode. + +*** pcomplete.el is a library that provides programmable completion +facilities for Emacs, similar to what zsh and tcsh offer. The main +difference is that completion functions are written in Lisp, meaning +they can be profiled, debugged, etc. + +*** antlr-mode is a new major mode for editing ANTLR grammar files. +It is automatically turned on for files whose names have the extension +`.g'. + +** Changes in sort.el + +The function sort-numeric-fields interprets numbers starting with `0' +as octal and numbers starting with `0x' or `0X' as hexadecimal. The +new user-option sort-numeric-base can be used to specify a default +numeric base. + +** Changes to Ange-ftp + +*** Ange-ftp allows you to specify of a port number in remote file +names cleanly. It is appended to the host name, separated by a hash +sign, e.g. `/foo@bar.org#666:mumble'. (This syntax comes from EFS.) + +*** If the new user-option `ange-ftp-try-passive-mode' is set, passive +ftp mode will be used if the ftp client supports that. + +*** Ange-ftp handles the output of the w32-style clients which +output ^M at the end of lines. + +** The recommended way of using Iswitchb is via the new global minor +mode `iswitchb-mode'. + +** Just loading the msb package doesn't switch on Msb mode anymore. +If you have `(require 'msb)' in your .emacs, please replace it with +`(msb-mode 1)'. + +** Changes in Flyspell mode + +*** Flyspell mode has various new options. See the `flyspell' Custom +group. + +*** The variable `flyspell-generic-check-word-p' has been renamed +to `flyspell-generic-check-word-predicate'. The old name is still +available as alias. + +** The user option `backward-delete-char-untabify-method' controls the +behavior of `backward-delete-char-untabify'. The following values +are recognized: + +`untabify' -- turn a tab to many spaces, then delete one space; +`hungry' -- delete all whitespace, both tabs and spaces; +`all' -- delete all whitespace, including tabs, spaces and newlines; +nil -- just delete one character. + +Default value is `untabify'. + +[This change was made in Emacs 20.3 but not mentioned then.] + +** In Cperl mode `cperl-invalid-face' should now be a normal face +symbol, not double-quoted. + +** Some packages are declared obsolete, to be removed in a future +version. They are: auto-show, c-mode, hilit19, hscroll, ooutline, +profile, rnews, rnewspost, and sc. Their implementations have been +moved to lisp/obsolete. + +** auto-compression mode is no longer enabled just by loading jka-compr.el. +To control it, set `auto-compression-mode' via Custom or use the +`auto-compression-mode' command. + +** `browse-url-gnome-moz' is a new option for +`browse-url-browser-function', invoking Mozilla in GNOME, and +`browse-url-kde' can be chosen for invoking the KDE browser. + +** The user-option `browse-url-new-window-p' has been renamed to +`browse-url-new-window-flag'. + +** The functions `keep-lines', `flush-lines' and `how-many' now +operate on the active region in Transient Mark mode. + +** `gnus-user-agent' is a new possibility for `mail-user-agent'. It +is like `message-user-agent', but with all the Gnus paraphernalia. + +** The Strokes package has been updated. If your Emacs has XPM +support, you can use it for pictographic editing. In Strokes mode, +use C-mouse-2 to compose a complex stoke and insert it into the +buffer. You can encode or decode a strokes buffer with new commands +M-x strokes-encode-buffer and M-x strokes-decode-buffer. There is a +new command M-x strokes-list-strokes. + +** Hexl contains a new command `hexl-insert-hex-string' which inserts +a string of hexadecimal numbers read from the mini-buffer. + +** Hexl mode allows to insert non-ASCII characters. + +The non-ASCII characters are encoded using the same encoding as the +file you are visiting in Hexl mode. + +** Shell script mode changes. + +Shell script mode (sh-script) can now indent scripts for shells +derived from sh and rc. The indentation style is customizable, and +sh-script can attempt to "learn" the current buffer's style. + +** Etags changes. + +*** In DOS, etags looks for file.cgz if it cannot find file.c. + +*** New option --ignore-case-regex is an alternative to --regex. It is now +possible to bind a regexp to a language, by prepending the regexp with +{lang}, where lang is one of the languages that `etags --help' prints out. +This feature is useful especially for regex files, where each line contains +a regular expression. The manual contains details. + +*** In C and derived languages, etags creates tags for function +declarations when given the --declarations option. + +*** In C++, tags are created for "operator". The tags have the form +"operator+", without spaces between the keyword and the operator. + +*** You shouldn't generally need any more the -C or -c++ option: etags +automatically switches to C++ parsing when it meets the `class' or +`template' keywords. + +*** Etags now is able to delve at arbitrary deeps into nested structures in +C-like languages. Previously, it was limited to one or two brace levels. + +*** New language Ada: tags are functions, procedures, packages, tasks, and +types. + +*** In Fortran, `procedure' is not tagged. + +*** In Java, tags are created for "interface". + +*** In Lisp, "(defstruct (foo", "(defun (operator" and similar constructs +are now tagged. + +*** In makefiles, tags the targets. + +*** In Perl, the --globals option tags global variables. my and local +variables are tagged. + +*** New language Python: def and class at the beginning of a line are tags. + +*** .ss files are Scheme files, .pdb is Postscript with C syntax, .psw is +for PSWrap. + +** Changes in etags.el + +*** The new user-option tags-case-fold-search can be used to make +tags operations case-sensitive or case-insensitive. The default +is to use the same setting as case-fold-search. + +*** You can display additional output with M-x tags-apropos by setting +the new variable tags-apropos-additional-actions. + +If non-nil, the variable's value should be a list of triples (TITLE +FUNCTION TO-SEARCH). For each triple, M-x tags-apropos processes +TO-SEARCH and lists tags from it. TO-SEARCH should be an alist, +obarray, or symbol. If it is a symbol, the symbol's value is used. + +TITLE is a string to use to label the list of tags from TO-SEARCH. + +FUNCTION is a function to call when an entry is selected in the Tags +List buffer. It is called with one argument, the selected symbol. + +A useful example value for this variable might be something like: + + '(("Emacs Lisp" Info-goto-emacs-command-node obarray) + ("Common Lisp" common-lisp-hyperspec common-lisp-hyperspec-obarray) + ("SCWM" scwm-documentation scwm-obarray)) + +*** The face tags-tag-face can be used to customize the appearance +of tags in the output of M-x tags-apropos. + +*** Setting tags-apropos-verbose to a non-nil value displays the +names of tags files in the *Tags List* buffer. + +*** You can now search for tags that are part of the filename itself. +If you have tagged the files topfile.c subdir/subfile.c +/tmp/tempfile.c, you can now search for tags "topfile.c", "subfile.c", +"dir/sub", "tempfile", "tempfile.c". If the tag matches the file name, +point will go to the beginning of the file. + +*** Compressed files are now transparently supported if +auto-compression-mode is active. You can tag (with Etags) and search +(with find-tag) both compressed and uncompressed files. + +*** Tags commands like M-x tags-search no longer change point +in buffers where no match is found. In buffers where a match is +found, the original value of point is pushed on the marker ring. + +** Fortran mode has a new command `fortran-strip-sequence-nos' to +remove text past column 72. The syntax class of `\' in Fortran is now +appropriate for C-style escape sequences in strings. + +** SGML mode's default `sgml-validate-command' is now `nsgmls'. + +** A new command `view-emacs-problems' (C-h P) displays the PROBLEMS file. + +** The Dabbrev package has a new user-option `dabbrev-ignored-regexps' +containing a list of regular expressions. Buffers matching a regular +expression from that list, are not checked. + +** Emacs can now figure out modification times of remote files. +When you do C-x C-f /user@host:/path/file RET and edit the file, +and someone else modifies the file, you will be prompted to revert +the buffer, just like for the local files. + +** The buffer menu (C-x C-b) no longer lists the *Buffer List* buffer. + +** When invoked with a prefix argument, the command `list-abbrevs' now +displays local abbrevs, only. + +** Refill minor mode provides preliminary support for keeping +paragraphs filled as you modify them. + +** The variable `double-click-fuzz' specifies how much the mouse +may be moved between clicks that are recognized as a pair. Its value +is measured in pixels. + +** The new global minor mode `auto-image-file-mode' allows image files +to be visited as images. + +** Two new user-options `grep-command' and `grep-find-command' +were added to compile.el. + +** Withdrawn packages + +*** mldrag.el has been removed. mouse.el provides the same +functionality with aliases for the mldrag functions. + +*** eval-reg.el has been obsoleted by changes to edebug.el and removed. + +*** ph.el has been obsoleted by EUDC and removed. + + +* Incompatible Lisp changes in 21.1 + +There are a few Lisp changes which are not backwards-compatible and +may require changes to existing code. Here is a list for reference. +See the sections below for details. + +** Since `format' preserves text properties, the idiom +`(format "%s" foo)' no longer works to copy and remove properties. +Use `copy-sequence' to copy the string, then use `set-text-properties' +to remove the properties of the copy. + +** Since the `keymap' text property now has significance, some code +which uses both `local-map' and `keymap' properties (for portability) +may, for instance, give rise to duplicate menus when the keymaps from +these properties are active. + +** The change in the treatment of non-ASCII characters in search +ranges may affect some code. + +** A non-nil value for the LOCAL arg of add-hook makes the hook +buffer-local even if `make-local-hook' hasn't been called, which might +make a difference to some code. + +** The new treatment of the minibuffer prompt might affect code which +operates on the minibuffer. + +** The new character sets `eight-bit-control' and `eight-bit-graphic' +cause `no-conversion' and `emacs-mule-unix' coding systems to produce +different results when reading files with non-ASCII characters +(previously, both coding systems would produce the same results). +Specifically, `no-conversion' interprets each 8-bit byte as a separate +character. This makes `no-conversion' inappropriate for reading +multibyte text, e.g. buffers written to disk in their internal MULE +encoding (auto-saving does that, for example). If a Lisp program +reads such files with `no-conversion', each byte of the multibyte +sequence, including the MULE leading codes such as \201, is treated as +a separate character, which prevents them from being interpreted in +the buffer as multibyte characters. + +Therefore, Lisp programs that read files which contain the internal +MULE encoding should use `emacs-mule-unix'. `no-conversion' is only +appropriate for reading truly binary files. + +** Code that relies on the obsolete `before-change-function' and +`after-change-function' to detect buffer changes will now fail. Use +`before-change-functions' and `after-change-functions' instead. + +** Code that uses `concat' with integer args now gets an error, as +long promised. So does any code that uses derivatives of `concat', +such as `mapconcat'. + +** The function base64-decode-string now always returns a unibyte +string. + +** Not a Lisp incompatibility as such but, with the introduction of +extra private charsets, there is now only one slot free for a new +dimension-2 private charset. User code which tries to add more than +one extra will fail unless you rebuild Emacs with some standard +charset(s) removed; that is probably inadvisable because it changes +the emacs-mule encoding. Also, files stored in the emacs-mule +encoding using Emacs 20 with additional private charsets defined will +probably not be read correctly by Emacs 21. + +** The variable `directory-sep-char' is slated for removal. +Not really a change (yet), but a projected one that you should be +aware of: The variable `directory-sep-char' is deprecated, and should +not be used. It was always ignored on GNU/Linux and Unix systems and +on MS-DOS, but the MS-Windows port tried to support it by adapting the +behavior of certain primitives to the value of this variable. It +turned out that such support cannot be reliable, so it was decided to +remove this variable in the near future. Lisp programs are well +advised not to set it to anything but '/', because any different value +will not have any effect when support for this variable is removed. + + +* Lisp changes made after edition 2.6 of the Emacs Lisp Manual, +(Display-related features are described in a page of their own below.) + +** Function assq-delete-all replaces function assoc-delete-all. + +** The new function animate-string, from lisp/play/animate.el +allows the animated display of strings. + +** The new function `interactive-form' can be used to obtain the +interactive form of a function. + +** The keyword :set-after in defcustom allows to specify dependencies +between custom options. Example: + + (defcustom default-input-method nil + "*Default input method for multilingual text (a string). + This is the input method activated automatically by the command + `toggle-input-method' (\\[toggle-input-method])." + :group 'mule + :type '(choice (const nil) string) + :set-after '(current-language-environment)) + +This specifies that default-input-method should be set after +current-language-environment even if default-input-method appears +first in a custom-set-variables statement. + +** The new hook `kbd-macro-termination-hook' is run at the end of +function execute-kbd-macro. Functions on this hook are called with no +args. The hook is run independent of how the macro was terminated +(signal or normal termination). + +** Functions `butlast' and `nbutlast' for removing trailing elements +from a list are now available without requiring the CL package. + +** The new user-option `even-window-heights' can be set to nil +to prevent `display-buffer' from evening out window heights. + +** The user-option `face-font-registry-alternatives' specifies +alternative font registry names to try when looking for a font. + +** Function `md5' calculates the MD5 "message digest"/"checksum". + +** Function `delete-frame' runs `delete-frame-hook' before actually +deleting the frame. The hook is called with one arg, the frame +being deleted. + +** `add-hook' now makes the hook local if called with a non-nil LOCAL arg. + +** The treatment of non-ASCII characters in search ranges has changed. +If a range in a regular expression or the arg of +skip-chars-forward/backward starts with a unibyte character C and ends +with a multibyte character C2, the range is divided into two: one is +C..?\377, the other is C1..C2, where C1 is the first character of C2's +charset. + +** The new function `display-message-or-buffer' displays a message in +the echo area or pops up a buffer, depending on the length of the +message. + +** The new macro `with-auto-compression-mode' allows evaluating an +expression with auto-compression-mode enabled. + +** In image specifications, `:heuristic-mask' has been replaced +with the more general `:mask' property. + +** Image specifications accept more `:conversion's. + +** A `?' can be used in a symbol name without escaping it with a +backslash. + +** Reading from the mini-buffer now reads from standard input if Emacs +is running in batch mode. For example, + + (message "%s" (read t)) + +will read a Lisp expression from standard input and print the result +to standard output. + +** The argument of `down-list', `backward-up-list', `up-list', +`kill-sexp', `backward-kill-sexp' and `mark-sexp' is now optional. + +** If `display-buffer-reuse-frames' is set, function `display-buffer' +will raise frames displaying a buffer, instead of creating a new +frame or window. + +** Two new functions for removing elements from lists/sequences +were added + +- Function: remove ELT SEQ + +Return a copy of SEQ with all occurrences of ELT removed. SEQ must be +a list, vector, or string. The comparison is done with `equal'. + +- Function: remq ELT LIST + +Return a copy of LIST with all occurrences of ELT removed. The +comparison is done with `eq'. + +** The function `delete' now also works with vectors and strings. + +** The meaning of the `:weakness WEAK' argument of make-hash-table +has been changed: WEAK can now have new values `key-or-value' and +`key-and-value', in addition to `nil', `key', `value', and `t'. + +** Function `aset' stores any multibyte character in any string +without signaling "Attempt to change char length of a string". It may +convert a unibyte string to multibyte if necessary. + +** The value of the `help-echo' text property is called as a function +or evaluated, if it is not a string already, to obtain a help string. + +** Function `make-obsolete' now has an optional arg to say when the +function was declared obsolete. + +** Function `plist-member' is renamed from `widget-plist-member' (which is +retained as an alias). + +** Easy-menu's :filter now takes the unconverted form of the menu and +the result is automatically converted to Emacs' form. + +** The new function `window-list' has been defined + +- Function: window-list &optional FRAME WINDOW MINIBUF + +Return a list of windows on FRAME, starting with WINDOW. FRAME nil or +omitted means use the selected frame. WINDOW nil or omitted means use +the selected window. MINIBUF t means include the minibuffer window, +even if it isn't active. MINIBUF nil or omitted means include the +minibuffer window only if it's active. MINIBUF neither nil nor t +means never include the minibuffer window. + +** There's a new function `get-window-with-predicate' defined as follows + +- Function: get-window-with-predicate PREDICATE &optional MINIBUF ALL-FRAMES DEFAULT + +Return a window satisfying PREDICATE. + +This function cycles through all visible windows using `walk-windows', +calling PREDICATE on each one. PREDICATE is called with a window as +argument. The first window for which PREDICATE returns a non-nil +value is returned. If no window satisfies PREDICATE, DEFAULT is +returned. + +Optional second arg MINIBUF t means count the minibuffer window even +if not active. MINIBUF nil or omitted means count the minibuffer iff +it is active. MINIBUF neither t nor nil means not to count the +minibuffer even if it is active. + +Several frames may share a single minibuffer; if the minibuffer +counts, all windows on all frames that share that minibuffer count +too. Therefore, if you are using a separate minibuffer frame +and the minibuffer is active and MINIBUF says it counts, +`walk-windows' includes the windows in the frame from which you +entered the minibuffer, as well as the minibuffer window. + +ALL-FRAMES is the optional third argument. +ALL-FRAMES nil or omitted means cycle within the frames as specified above. +ALL-FRAMES = `visible' means include windows on all visible frames. +ALL-FRAMES = 0 means include windows on all visible and iconified frames. +ALL-FRAMES = t means include windows on all frames including invisible frames. +If ALL-FRAMES is a frame, it means include windows on that frame. +Anything else means restrict to the selected frame. + +** The function `single-key-description' now encloses function key and +event names in angle brackets. When called with a second optional +argument non-nil, angle brackets won't be printed. + +** If the variable `message-truncate-lines' is bound to t around a +call to `message', the echo area will not be resized to display that +message; it will be truncated instead, as it was done in 20.x. +Default value is nil. + +** The user option `line-number-display-limit' can now be set to nil, +meaning no limit. + +** The new user option `line-number-display-limit-width' controls +the maximum width of lines in a buffer for which Emacs displays line +numbers in the mode line. The default is 200. + +** `select-safe-coding-system' now also checks the most preferred +coding-system if buffer-file-coding-system is `undecided' and +DEFAULT-CODING-SYSTEM is not specified, + +** The function `subr-arity' provides information about the argument +list of a primitive. + +** `where-is-internal' now also accepts a list of keymaps. + +** The text property `keymap' specifies a key map which overrides the +buffer's local map and the map specified by the `local-map' property. +This is probably what most current uses of `local-map' want, rather +than replacing the local map. + +** The obsolete variables `before-change-function' and +`after-change-function' are no longer acted upon and have been +removed. Use `before-change-functions' and `after-change-functions' +instead. + +** The function `apropos-mode' runs the hook `apropos-mode-hook'. + +** `concat' no longer accepts individual integer arguments, +as promised long ago. + +** The new function `float-time' returns the current time as a float. + +** The new variable auto-coding-regexp-alist specifies coding systems +for reading specific files, analogous to auto-coding-alist, but +patterns are checked against file contents instead of file names. + + +* Lisp changes in Emacs 21.1 (see following page for display-related features) + +** The new package rx.el provides an alternative sexp notation for +regular expressions. + +- Function: rx-to-string SEXP + +Translate SEXP into a regular expression in string notation. + +- Macro: rx SEXP + +Translate SEXP into a regular expression in string notation. + +The following are valid subforms of regular expressions in sexp +notation. + +STRING + matches string STRING literally. + +CHAR + matches character CHAR literally. + +`not-newline' + matches any character except a newline. + . +`anything' + matches any character + +`(any SET)' + matches any character in SET. SET may be a character or string. + Ranges of characters can be specified as `A-Z' in strings. + +'(in SET)' + like `any'. + +`(not (any SET))' + matches any character not in SET + +`line-start' + matches the empty string, but only at the beginning of a line + in the text being matched + +`line-end' + is similar to `line-start' but matches only at the end of a line + +`string-start' + matches the empty string, but only at the beginning of the + string being matched against. + +`string-end' + matches the empty string, but only at the end of the + string being matched against. + +`buffer-start' + matches the empty string, but only at the beginning of the + buffer being matched against. + +`buffer-end' + matches the empty string, but only at the end of the + buffer being matched against. + +`point' + matches the empty string, but only at point. + +`word-start' + matches the empty string, but only at the beginning or end of a + word. + +`word-end' + matches the empty string, but only at the end of a word. + +`word-boundary' + matches the empty string, but only at the beginning or end of a + word. + +`(not word-boundary)' + matches the empty string, but not at the beginning or end of a + word. + +`digit' + matches 0 through 9. + +`control' + matches ASCII control characters. + +`hex-digit' + matches 0 through 9, a through f and A through F. + +`blank' + matches space and tab only. + +`graphic' + matches graphic characters--everything except ASCII control chars, + space, and DEL. + +`printing' + matches printing characters--everything except ASCII control chars + and DEL. + +`alphanumeric' + matches letters and digits. (But at present, for multibyte characters, + it matches anything that has word syntax.) + +`letter' + matches letters. (But at present, for multibyte characters, + it matches anything that has word syntax.) + +`ascii' + matches ASCII (unibyte) characters. + +`nonascii' + matches non-ASCII (multibyte) characters. + +`lower' + matches anything lower-case. + +`upper' + matches anything upper-case. + +`punctuation' + matches punctuation. (But at present, for multibyte characters, + it matches anything that has non-word syntax.) + +`space' + matches anything that has whitespace syntax. + +`word' + matches anything that has word syntax. + +`(syntax SYNTAX)' + matches a character with syntax SYNTAX. SYNTAX must be one + of the following symbols. + + `whitespace' (\\s- in string notation) + `punctuation' (\\s.) + `word' (\\sw) + `symbol' (\\s_) + `open-parenthesis' (\\s() + `close-parenthesis' (\\s)) + `expression-prefix' (\\s') + `string-quote' (\\s\") + `paired-delimiter' (\\s$) + `escape' (\\s\\) + `character-quote' (\\s/) + `comment-start' (\\s<) + `comment-end' (\\s>) + +`(not (syntax SYNTAX))' + matches a character that has not syntax SYNTAX. + +`(category CATEGORY)' + matches a character with category CATEGORY. CATEGORY must be + either a character to use for C, or one of the following symbols. + + `consonant' (\\c0 in string notation) + `base-vowel' (\\c1) + `upper-diacritical-mark' (\\c2) + `lower-diacritical-mark' (\\c3) + `tone-mark' (\\c4) + `symbol' (\\c5) + `digit' (\\c6) + `vowel-modifying-diacritical-mark' (\\c7) + `vowel-sign' (\\c8) + `semivowel-lower' (\\c9) + `not-at-end-of-line' (\\c<) + `not-at-beginning-of-line' (\\c>) + `alpha-numeric-two-byte' (\\cA) + `chinse-two-byte' (\\cC) + `greek-two-byte' (\\cG) + `japanese-hiragana-two-byte' (\\cH) + `indian-two-byte' (\\cI) + `japanese-katakana-two-byte' (\\cK) + `korean-hangul-two-byte' (\\cN) + `cyrillic-two-byte' (\\cY) + `ascii' (\\ca) + `arabic' (\\cb) + `chinese' (\\cc) + `ethiopic' (\\ce) + `greek' (\\cg) + `korean' (\\ch) + `indian' (\\ci) + `japanese' (\\cj) + `japanese-katakana' (\\ck) + `latin' (\\cl) + `lao' (\\co) + `tibetan' (\\cq) + `japanese-roman' (\\cr) + `thai' (\\ct) + `vietnamese' (\\cv) + `hebrew' (\\cw) + `cyrillic' (\\cy) + `can-break' (\\c|) + +`(not (category CATEGORY))' + matches a character that has not category CATEGORY. + +`(and SEXP1 SEXP2 ...)' + matches what SEXP1 matches, followed by what SEXP2 matches, etc. + +`(submatch SEXP1 SEXP2 ...)' + like `and', but makes the match accessible with `match-end', + `match-beginning', and `match-string'. + +`(group SEXP1 SEXP2 ...)' + another name for `submatch'. + +`(or SEXP1 SEXP2 ...)' + matches anything that matches SEXP1 or SEXP2, etc. If all + args are strings, use `regexp-opt' to optimize the resulting + regular expression. + +`(minimal-match SEXP)' + produce a non-greedy regexp for SEXP. Normally, regexps matching + zero or more occurrences of something are \"greedy\" in that they + match as much as they can, as long as the overall regexp can + still match. A non-greedy regexp matches as little as possible. + +`(maximal-match SEXP)' + produce a greedy regexp for SEXP. This is the default. + +`(zero-or-more SEXP)' + matches zero or more occurrences of what SEXP matches. + +`(0+ SEXP)' + like `zero-or-more'. + +`(* SEXP)' + like `zero-or-more', but always produces a greedy regexp. + +`(*? SEXP)' + like `zero-or-more', but always produces a non-greedy regexp. + +`(one-or-more SEXP)' + matches one or more occurrences of A. + +`(1+ SEXP)' + like `one-or-more'. + +`(+ SEXP)' + like `one-or-more', but always produces a greedy regexp. + +`(+? SEXP)' + like `one-or-more', but always produces a non-greedy regexp. + +`(zero-or-one SEXP)' + matches zero or one occurrences of A. + +`(optional SEXP)' + like `zero-or-one'. + +`(? SEXP)' + like `zero-or-one', but always produces a greedy regexp. + +`(?? SEXP)' + like `zero-or-one', but always produces a non-greedy regexp. + +`(repeat N SEXP)' + matches N occurrences of what SEXP matches. + +`(repeat N M SEXP)' + matches N to M occurrences of what SEXP matches. + +`(eval FORM)' + evaluate FORM and insert result. If result is a string, + `regexp-quote' it. + +`(regexp REGEXP)' + include REGEXP in string notation in the result. + +*** The features `md5' and `overlay' are now provided by default. + +*** The special form `save-restriction' now works correctly even if the +buffer is widened inside the save-restriction and changes made outside +the original restriction. Previously, doing this would cause the saved +restriction to be restored incorrectly. + +*** The functions `find-charset-region' and `find-charset-string' include +`eight-bit-control' and/or `eight-bit-graphic' in the returned list +when they find 8-bit characters. Previously, they included `ascii' in a +multibyte buffer and `unknown' in a unibyte buffer. + +*** The functions `set-buffer-multibyte', `string-as-multibyte' and +`string-as-unibyte' change the byte sequence of a buffer or a string +if it contains a character from the `eight-bit-control' character set. + +*** The handling of multibyte sequences in a multibyte buffer is +changed. Previously, a byte sequence matching the pattern +[\200-\237][\240-\377]+ was interpreted as a single character +regardless of the length of the trailing bytes [\240-\377]+. Thus, if +the sequence was longer than what the leading byte indicated, the +extra trailing bytes were ignored by Lisp functions. Now such extra +bytes are independent 8-bit characters belonging to the charset +eight-bit-graphic. + +** Fontsets are now implemented using char-tables. + +A fontset can now be specified for each independent character, for +a group of characters or for a character set rather than just for a +character set as previously. + +*** The arguments of the function `set-fontset-font' are changed. +They are NAME, CHARACTER, FONTNAME, and optional FRAME. The function +modifies fontset NAME to use FONTNAME for CHARACTER. + +CHARACTER may be a cons (FROM . TO), where FROM and TO are non-generic +characters. In that case FONTNAME is used for all characters in the +range FROM and TO (inclusive). CHARACTER may be a charset. In that +case FONTNAME is used for all character in the charset. + +FONTNAME may be a cons (FAMILY . REGISTRY), where FAMILY is the family +name of a font and REGISTRY is a registry name of a font. + +*** Variable x-charset-registry has been deleted. The default charset +registries of character sets are set in the default fontset +"fontset-default". + +*** The function `create-fontset-from-fontset-spec' ignores the second +argument STYLE-VARIANT. It never creates style-variant fontsets. + +** The method of composing characters is changed. Now character +composition is done by a special text property `composition' in +buffers and strings. + +*** Charset composition is deleted. Emacs never creates a `composite +character' which is an independent character with a unique character +code. Thus the following functions handling `composite characters' +have been deleted: composite-char-component, +composite-char-component-count, composite-char-composition-rule, +composite-char-composition-rule and decompose-composite-char delete. +The variables leading-code-composition and min-composite-char have +also been deleted. + +*** Three more glyph reference points are added. They can be used to +specify a composition rule. See the documentation of the variable +`reference-point-alist' for more detail. + +*** The function `compose-region' takes new arguments COMPONENTS and +MODIFICATION-FUNC. With COMPONENTS, you can specify not only a +composition rule but also characters to be composed. Such characters +may differ between buffer and string text. + +*** The function `compose-string' takes new arguments START, END, +COMPONENTS, and MODIFICATION-FUNC. + +*** The function `compose-string' puts text property `composition' +directly on the argument STRING instead of returning a new string. +Likewise, the function `decompose-string' just removes text property +`composition' from STRING. + +*** The new function `find-composition' returns information about +a composition at a specified position in a buffer or a string. + +*** The function `decompose-composite-char' is now labeled as +obsolete. + +** The new coding system `mac-roman' is primarily intended for use on +the Macintosh but may be used generally for Macintosh-encoded text. + +** The new character sets `mule-unicode-0100-24ff', +`mule-unicode-2500-33ff', and `mule-unicode-e000-ffff' have been +introduced for Unicode characters in the range U+0100..U+24FF, +U+2500..U+33FF, U+E000..U+FFFF respectively. + +Note that the character sets are not yet unified in Emacs, so +characters which belong to charsets such as Latin-2, Greek, Hebrew, +etc. and the same characters in the `mule-unicode-*' charsets are +different characters, as far as Emacs is concerned. For example, text +which includes Unicode characters from the Latin-2 locale cannot be +encoded by Emacs with ISO 8859-2 coding system. + +** The new coding system `mule-utf-8' has been added. +It provides limited support for decoding/encoding UTF-8 text. For +details, please see the documentation string of this coding system. + +** The new character sets `japanese-jisx0213-1' and +`japanese-jisx0213-2' have been introduced for the new Japanese +standard JIS X 0213 Plane 1 and Plane 2. + +** The new character sets `latin-iso8859-14' and `latin-iso8859-15' +have been introduced. + +** The new character sets `eight-bit-control' and `eight-bit-graphic' +have been introduced for 8-bit characters in the ranges 0x80..0x9F and +0xA0..0xFF respectively. Note that the multibyte representation of +eight-bit-control is never exposed; this leads to an exception in the +emacs-mule coding system, which encodes everything else to the +buffer/string internal representation. Note that to search for +eight-bit-graphic characters in a multibyte buffer, the search string +must be multibyte, otherwise such characters will be converted to +their multibyte equivalent. + +** If the APPEND argument of `write-region' is an integer, it seeks to +that offset in the file before writing. + +** The function `add-minor-mode' has been added for convenience and +compatibility with XEmacs (and is used internally by define-minor-mode). + +** The function `shell-command' now sets the default directory of the +`*Shell Command Output*' buffer to the default directory of the buffer +from which the command was issued. + +** The functions `query-replace', `query-replace-regexp', +`query-replace-regexp-eval' `map-query-replace-regexp', +`replace-string', `replace-regexp', and `perform-replace' take two +additional optional arguments START and END that specify the region to +operate on. + +** The new function `count-screen-lines' is a more flexible alternative +to `window-buffer-height'. + +- Function: count-screen-lines &optional BEG END COUNT-FINAL-NEWLINE WINDOW + +Return the number of screen lines in the region between BEG and END. +The number of screen lines may be different from the number of actual +lines, due to line breaking, display table, etc. + +Optional arguments BEG and END default to `point-min' and `point-max' +respectively. + +If region ends with a newline, ignore it unless optional third argument +COUNT-FINAL-NEWLINE is non-nil. + +The optional fourth argument WINDOW specifies the window used for +obtaining parameters such as width, horizontal scrolling, and so +on. The default is to use the selected window's parameters. + +Like `vertical-motion', `count-screen-lines' always uses the current +buffer, regardless of which buffer is displayed in WINDOW. This makes +possible to use `count-screen-lines' in any buffer, whether or not it +is currently displayed in some window. + +** The new function `mapc' is like `mapcar' but doesn't collect the +argument function's results. + +** The functions base64-decode-region and base64-decode-string now +signal an error instead of returning nil if decoding fails. Also, +`base64-decode-string' now always returns a unibyte string (in Emacs +20, it returned a multibyte string when the result was a valid multibyte +sequence). + +** The function sendmail-user-agent-compose now recognizes a `body' +header in the list of headers passed to it. + +** The new function member-ignore-case works like `member', but +ignores differences in case and text representation. + +** The buffer-local variable cursor-type can be used to specify the +cursor to use in windows displaying a buffer. Values are interpreted +as follows: + + t use the cursor specified for the frame (default) + nil don't display a cursor + `bar' display a bar cursor with default width + (bar . WIDTH) display a bar cursor with width WIDTH + others display a box cursor. + +** The variable open-paren-in-column-0-is-defun-start controls whether +an open parenthesis in column 0 is considered to be the start of a +defun. If set, the default, it is considered a defun start. If not +set, an open parenthesis in column 0 has no special meaning. + +** The new function `string-to-syntax' can be used to translate syntax +specifications in string form as accepted by `modify-syntax-entry' to +the cons-cell form that is used for the values of the `syntax-table' +text property, and in `font-lock-syntactic-keywords'. + +Example: + + (string-to-syntax "()") + => (4 . 41) + +** Emacs' reader supports CL read syntax for integers in bases +other than 10. + +*** `#BINTEGER' or `#bINTEGER' reads INTEGER in binary (radix 2). +INTEGER optionally contains a sign. + + #b1111 + => 15 + #b-1111 + => -15 + +*** `#OINTEGER' or `#oINTEGER' reads INTEGER in octal (radix 8). + + #o666 + => 438 + +*** `#XINTEGER' or `#xINTEGER' reads INTEGER in hexadecimal (radix 16). + + #xbeef + => 48815 + +*** `#RADIXrINTEGER' reads INTEGER in radix RADIX, 2 <= RADIX <= 36. + + #2R-111 + => -7 + #25rah + => 267 + +** The function `documentation-property' now evaluates the value of +the given property to obtain a string if it doesn't refer to etc/DOC +and isn't a string. + +** If called for a symbol, the function `documentation' now looks for +a `function-documentation' property of that symbol. If it has a non-nil +value, the documentation is taken from that value. If the value is +not a string, it is evaluated to obtain a string. + +** The last argument of `define-key-after' defaults to t for convenience. + +** The new function `replace-regexp-in-string' replaces all matches +for a regexp in a string. + +** `mouse-position' now runs the abnormal hook +`mouse-position-function'. + +** The function string-to-number now returns a float for numbers +that don't fit into a Lisp integer. + +** The variable keyword-symbols-constants-flag has been removed. +Keywords are now always considered constants. + +** The new function `delete-and-extract-region' deletes text and +returns it. + +** The function `clear-this-command-keys' now also clears the vector +returned by function `recent-keys'. + +** Variables `beginning-of-defun-function' and `end-of-defun-function' +can be used to define handlers for the functions that find defuns. +Major modes can define these locally instead of rebinding C-M-a +etc. if the normal conventions for defuns are not appropriate for the +mode. + +** easy-mmode-define-minor-mode now takes an additional BODY argument +and is renamed `define-minor-mode'. + +** If an abbrev has a hook function which is a symbol, and that symbol +has a non-nil `no-self-insert' property, the return value of the hook +function specifies whether an expansion has been done or not. If it +returns nil, abbrev-expand also returns nil, meaning "no expansion has +been performed." + +When abbrev expansion is done by typing a self-inserting character, +and the abbrev has a hook with the `no-self-insert' property, and the +hook function returns non-nil meaning expansion has been done, +then the self-inserting character is not inserted. + +** The function `intern-soft' now accepts a symbol as first argument. +In this case, that exact symbol is looked up in the specified obarray, +and the function's value is nil if it is not found. + +** The new macro `with-syntax-table' can be used to evaluate forms +with the syntax table of the current buffer temporarily set to a +specified table. + + (with-syntax-table TABLE &rest BODY) + +Evaluate BODY with syntax table of current buffer set to a copy of +TABLE. The current syntax table is saved, BODY is evaluated, and the +saved table is restored, even in case of an abnormal exit. Value is +what BODY returns. + +** Regular expressions now support intervals \{n,m\} as well as +Perl's shy-groups \(?:...\) and non-greedy *? +? and ?? operators. +Also back-references like \2 are now considered as an error if the +corresponding subgroup does not exist (or is not closed yet). +Previously it would have been silently turned into `2' (ignoring the `\'). + +** The optional argument BUFFER of function file-local-copy has been +removed since it wasn't used by anything. + +** The file name argument of function `file-locked-p' is now required +instead of being optional. + +** The new built-in error `text-read-only' is signaled when trying to +modify read-only text. + +** New functions and variables for locales. + +The new variable `locale-coding-system' specifies how to encode and +decode strings passed to low-level message functions like strerror and +time functions like strftime. The new variables +`system-messages-locale' and `system-time-locale' give the system +locales to be used when invoking these two types of functions. + +The new function `set-locale-environment' sets the language +environment, preferred coding system, and locale coding system from +the system locale as specified by the LC_ALL, LC_CTYPE, and LANG +environment variables. Normally, it is invoked during startup and need +not be invoked thereafter. It uses the new variables +`locale-language-names', `locale-charset-language-names', and +`locale-preferred-coding-systems' to make its decisions. + +** syntax tables now understand nested comments. +To declare a comment syntax as allowing nesting, just add an `n' +modifier to either of the characters of the comment end and the comment +start sequences. + +** The function `pixmap-spec-p' has been renamed `bitmap-spec-p' +because `bitmap' is more in line with the usual X terminology. + +** New function `propertize' + +The new function `propertize' can be used to conveniently construct +strings with text properties. + +- Function: propertize STRING &rest PROPERTIES + +Value is a copy of STRING with text properties assigned as specified +by PROPERTIES. PROPERTIES is a sequence of pairs PROPERTY VALUE, with +PROPERTY being the name of a text property and VALUE being the +specified value of that property. Example: + + (propertize "foo" 'face 'bold 'read-only t) + +** push and pop macros. + +Simple versions of the push and pop macros of Common Lisp +are now defined in Emacs Lisp. These macros allow only symbols +as the place that holds the list to be changed. + +(push NEWELT LISTNAME) add NEWELT to the front of LISTNAME's value. +(pop LISTNAME) return first elt of LISTNAME, and remove it + (thus altering the value of LISTNAME). + +** New dolist and dotimes macros. + +Simple versions of the dolist and dotimes macros of Common Lisp +are now defined in Emacs Lisp. + +(dolist (VAR LIST [RESULT]) BODY...) + Execute body once for each element of LIST, + using the variable VAR to hold the current element. + Then return the value of RESULT, or nil if RESULT is omitted. + +(dotimes (VAR COUNT [RESULT]) BODY...) + Execute BODY with VAR bound to successive integers running from 0, + inclusive, to COUNT, exclusive. + Then return the value of RESULT, or nil if RESULT is omitted. + +** Regular expressions now support Posix character classes such as +[:alpha:], [:space:] and so on. These must be used within a character +class--for instance, [-[:digit:].+] matches digits or a period +or a sign. + +[:digit:] matches 0 through 9 +[:cntrl:] matches ASCII control characters +[:xdigit:] matches 0 through 9, a through f and A through F. +[:blank:] matches space and tab only +[:graph:] matches graphic characters--everything except ASCII control chars, + space, and DEL. +[:print:] matches printing characters--everything except ASCII control chars + and DEL. +[:alnum:] matches letters and digits. + (But at present, for multibyte characters, + it matches anything that has word syntax.) +[:alpha:] matches letters. + (But at present, for multibyte characters, + it matches anything that has word syntax.) +[:ascii:] matches ASCII (unibyte) characters. +[:nonascii:] matches non-ASCII (multibyte) characters. +[:lower:] matches anything lower-case. +[:punct:] matches punctuation. + (But at present, for multibyte characters, + it matches anything that has non-word syntax.) +[:space:] matches anything that has whitespace syntax. +[:upper:] matches anything upper-case. +[:word:] matches anything that has word syntax. + +** Emacs now has built-in hash tables. + +The following functions are defined for hash tables: + +- Function: make-hash-table ARGS + +The argument list ARGS consists of keyword/argument pairs. All arguments +are optional. The following arguments are defined: + +:test TEST + +TEST must be a symbol specifying how to compare keys. Default is `eql'. +Predefined are `eq', `eql' and `equal'. If TEST is not predefined, +it must have been defined with `define-hash-table-test'. + +:size SIZE + +SIZE must be an integer > 0 giving a hint to the implementation how +many elements will be put in the hash table. Default size is 65. + +:rehash-size REHASH-SIZE + +REHASH-SIZE specifies by how much to grow a hash table once it becomes +full. If REHASH-SIZE is an integer, add that to the hash table's old +size to get the new size. Otherwise, REHASH-SIZE must be a float > +1.0, and the new size is computed by multiplying REHASH-SIZE with the +old size. Default rehash size is 1.5. + +:rehash-threshold THRESHOLD + +THRESHOLD must be a float > 0 and <= 1.0 specifying when to resize the +hash table. It is resized when the ratio of (number of entries) / +(size of hash table) is >= THRESHOLD. Default threshold is 0.8. + +:weakness WEAK + +WEAK must be either nil, one of the symbols `key, `value', +`key-or-value', `key-and-value', or t, meaning the same as +`key-and-value'. Entries are removed from weak tables during garbage +collection if their key and/or value are not referenced elsewhere +outside of the hash table. Default are non-weak hash tables. + +- Function: makehash &optional TEST + +Similar to make-hash-table, but only TEST can be specified. + +- Function: hash-table-p TABLE + +Returns non-nil if TABLE is a hash table object. + +- Function: copy-hash-table TABLE + +Returns a copy of TABLE. Only the table itself is copied, keys and +values are shared. + +- Function: hash-table-count TABLE + +Returns the number of entries in TABLE. + +- Function: hash-table-rehash-size TABLE + +Returns the rehash size of TABLE. + +- Function: hash-table-rehash-threshold TABLE + +Returns the rehash threshold of TABLE. + +- Function: hash-table-rehash-size TABLE + +Returns the size of TABLE. + +- Function: hash-table-test TABLE + +Returns the test TABLE uses to compare keys. + +- Function: hash-table-weakness TABLE + +Returns the weakness specified for TABLE. + +- Function: clrhash TABLE + +Clear TABLE. + +- Function: gethash KEY TABLE &optional DEFAULT + +Look up KEY in TABLE and return its associated VALUE or DEFAULT if +not found. + +- Function: puthash KEY VALUE TABLE + +Associate KEY with VALUE in TABLE. If KEY is already associated with +another value, replace the old value with VALUE. + +- Function: remhash KEY TABLE + +Remove KEY from TABLE if it is there. + +- Function: maphash FUNCTION TABLE + +Call FUNCTION for all elements in TABLE. FUNCTION must take two +arguments KEY and VALUE. + +- Function: sxhash OBJ + +Return a hash code for Lisp object OBJ. + +- Function: define-hash-table-test NAME TEST-FN HASH-FN + +Define a new hash table test named NAME. If NAME is specified as +a test in `make-hash-table', the table created will use TEST-FN for +comparing keys, and HASH-FN to compute hash codes for keys. Test +and hash function are stored as symbol property `hash-table-test' +of NAME with a value of (TEST-FN HASH-FN). + +TEST-FN must take two arguments and return non-nil if they are the same. + +HASH-FN must take one argument and return an integer that is the hash +code of the argument. The function should use the whole range of +integer values for hash code computation, including negative integers. + +Example: The following creates a hash table whose keys are supposed to +be strings that are compared case-insensitively. + + (defun case-fold-string= (a b) + (compare-strings a nil nil b nil nil t)) + + (defun case-fold-string-hash (a) + (sxhash (upcase a))) + + (define-hash-table-test 'case-fold 'case-fold-string= + 'case-fold-string-hash)) + + (make-hash-table :test 'case-fold) + +** The Lisp reader handles circular structure. + +It now works to use the #N= and #N# constructs to represent +circular structures. For example, #1=(a . #1#) represents +a cons cell which is its own cdr. + +** The Lisp printer handles circular structure. + +If you bind print-circle to a non-nil value, the Lisp printer outputs +#N= and #N# constructs to represent circular and shared structure. + +** If the second argument to `move-to-column' is anything but nil or +t, that means replace a tab with spaces if necessary to reach the +specified column, but do not add spaces at the end of the line if it +is too short to reach that column. + +** perform-replace has a new feature: the REPLACEMENTS argument may +now be a cons cell (FUNCTION . DATA). This means to call FUNCTION +after each match to get the replacement text. FUNCTION is called with +two arguments: DATA, and the number of replacements already made. + +If the FROM-STRING contains any upper-case letters, +perform-replace also turns off `case-fold-search' temporarily +and inserts the replacement text without altering case in it. + +** The function buffer-size now accepts an optional argument +to specify which buffer to return the size of. + +** The calendar motion commands now run the normal hook +calendar-move-hook after moving point. + +** The new variable small-temporary-file-directory specifies a +directory to use for creating temporary files that are likely to be +small. (Certain Emacs features use this directory.) If +small-temporary-file-directory is nil, they use +temporary-file-directory instead. + +** The variable `inhibit-modification-hooks', if non-nil, inhibits all +the hooks that track changes in the buffer. This affects +`before-change-functions' and `after-change-functions', as well as +hooks attached to text properties and overlay properties. + +** assq-delete-all is a new function that deletes all the +elements of an alist which have a car `eq' to a particular value. + +** make-temp-file provides a more reliable way to create a temporary file. + +make-temp-file is used like make-temp-name, except that it actually +creates the file before it returns. This prevents a timing error, +ensuring that no other job can use the same name for a temporary file. + +** New exclusive-open feature in `write-region' + +The optional seventh arg is now called MUSTBENEW. If non-nil, it insists +on a check for an existing file with the same name. If MUSTBENEW +is `excl', that means to get an error if the file already exists; +never overwrite. If MUSTBENEW is neither nil nor `excl', that means +ask for confirmation before overwriting, but do go ahead and +overwrite the file if the user gives confirmation. + +If the MUSTBENEW argument in `write-region' is `excl', +that means to use a special feature in the `open' system call +to get an error if the file exists at that time. +The error reported is `file-already-exists'. + +** Function `format' now handles text properties. + +Text properties of the format string are applied to the result string. +If the result string is longer than the format string, text properties +ending at the end of the format string are extended to the end of the +result string. + +Text properties from string arguments are applied to the result +string where arguments appear in the result string. + +Example: + + (let ((s1 "hello, %s") + (s2 "world")) + (put-text-property 0 (length s1) 'face 'bold s1) + (put-text-property 0 (length s2) 'face 'italic s2) + (format s1 s2)) + +results in a bold-face string with an italic `world' at the end. + +** Messages can now be displayed with text properties. + +Text properties are handled as described above for function `format'. +The following example displays a bold-face message with an italic +argument in it. + + (let ((msg "hello, %s!") + (arg "world")) + (put-text-property 0 (length msg) 'face 'bold msg) + (put-text-property 0 (length arg) 'face 'italic arg) + (message msg arg)) + +** Sound support + +Emacs supports playing sound files on GNU/Linux and the free BSDs +(Voxware driver and native BSD driver, aka as Luigi's driver). + +Currently supported file formats are RIFF-WAVE (*.wav) and Sun Audio +(*.au). You must configure Emacs with the option `--with-sound=yes' +to enable sound support. + +Sound files can be played by calling (play-sound SOUND). SOUND is a +list of the form `(sound PROPERTY...)'. The function is only defined +when sound support is present for the system on which Emacs runs. The +functions runs `play-sound-functions' with one argument which is the +sound to play, before playing the sound. + +The following sound properties are supported: + +- `:file FILE' + +FILE is a file name. If FILE isn't an absolute name, it will be +searched relative to `data-directory'. + +- `:data DATA' + +DATA is a string containing sound data. Either :file or :data +may be present, but not both. + +- `:volume VOLUME' + +VOLUME must be an integer in the range 0..100 or a float in the range +0..1. This property is optional. + +- `:device DEVICE' + +DEVICE is a string specifying the system device on which to play the +sound. The default device is system-dependent. + +Other properties are ignored. + +An alternative interface is called as +(play-sound-file FILE &optional VOLUME DEVICE). + +** `multimedia' is a new Finder keyword and Custom group. + +** keywordp is a new predicate to test efficiently for an object being +a keyword symbol. + +** Changes to garbage collection + +*** The function garbage-collect now additionally returns the number +of live and free strings. + +*** There is a new variable `strings-consed' holding the number of +strings that have been consed so far. + + +* Lisp-level Display features added after release 2.6 of the Emacs +Lisp Manual + +** The user-option `resize-mini-windows' controls how Emacs resizes +mini-windows. + +** The function `pos-visible-in-window-p' now has a third optional +argument, PARTIALLY. If a character is only partially visible, nil is +returned, unless PARTIALLY is non-nil. + +** On window systems, `glyph-table' is no longer used. + +** Help strings in menu items are now used to provide `help-echo' text. + +** The function `image-size' can be used to determine the size of an +image. + +- Function: image-size SPEC &optional PIXELS FRAME + +Return the size of an image as a pair (WIDTH . HEIGHT). + +SPEC is an image specification. PIXELS non-nil means return sizes +measured in pixels, otherwise return sizes measured in canonical +character units (fractions of the width/height of the frame's default +font). FRAME is the frame on which the image will be displayed. +FRAME nil or omitted means use the selected frame. + +** The function `image-mask-p' can be used to determine if an image +has a mask bitmap. + +- Function: image-mask-p SPEC &optional FRAME + +Return t if image SPEC has a mask bitmap. +FRAME is the frame on which the image will be displayed. FRAME nil +or omitted means use the selected frame. + +** The function `find-image' can be used to find a usable image +satisfying one of a list of specifications. + +** The STRING argument of `put-image' and `insert-image' is now +optional. + +** Image specifications may contain the property `:ascent center' (see +below). + + +* New Lisp-level Display features in Emacs 21.1 + +** The function tty-suppress-bold-inverse-default-colors can be used +to make Emacs avoid displaying text with bold black foreground on TTYs. + +Some terminals, notably PC consoles, emulate bold text by displaying +text in brighter colors. On such a console, a bold black foreground +is displayed in a gray color. If this turns out to be hard to read on +your monitor---the problem occurred with the mode line on +laptops---you can instruct Emacs to ignore the text's boldness, and to +just display it black instead. + +This situation can't be detected automatically. You will have to put +a line like + + (tty-suppress-bold-inverse-default-colors t) + +in your `.emacs'. + +** New face implementation. + +Emacs faces have been reimplemented from scratch. They don't use XLFD +font names anymore and face merging now works as expected. + +*** New faces. + +Each face can specify the following display attributes: + + 1. Font family or fontset alias name. + + 2. Relative proportionate width, aka character set width or set + width (swidth), e.g. `semi-compressed'. + + 3. Font height in 1/10pt + + 4. Font weight, e.g. `bold'. + + 5. Font slant, e.g. `italic'. + + 6. Foreground color. + + 7. Background color. + + 8. Whether or not characters should be underlined, and in what color. + + 9. Whether or not characters should be displayed in inverse video. + + 10. A background stipple, a bitmap. + + 11. Whether or not characters should be overlined, and in what color. + + 12. Whether or not characters should be strike-through, and in what + color. + + 13. Whether or not a box should be drawn around characters, its + color, the width of the box lines, and 3D appearance. + +Faces are frame-local by nature because Emacs allows to define the +same named face (face names are symbols) differently for different +frames. Each frame has an alist of face definitions for all named +faces. The value of a named face in such an alist is a Lisp vector +with the symbol `face' in slot 0, and a slot for each of the face +attributes mentioned above. + +There is also a global face alist `face-new-frame-defaults'. Face +definitions from this list are used to initialize faces of newly +created frames. + +A face doesn't have to specify all attributes. Those not specified +have a nil value. Faces specifying all attributes are called +`fully-specified'. + +*** Face merging. + +The display style of a given character in the text is determined by +combining several faces. This process is called `face merging'. Any +aspect of the display style that isn't specified by overlays or text +properties is taken from the `default' face. Since it is made sure +that the default face is always fully-specified, face merging always +results in a fully-specified face. + +*** Face realization. + +After all face attributes for a character have been determined by +merging faces of that character, that face is `realized'. The +realization process maps face attributes to what is physically +available on the system where Emacs runs. The result is a `realized +face' in form of an internal structure which is stored in the face +cache of the frame on which it was realized. + +Face realization is done in the context of the charset of the +character to display because different fonts and encodings are used +for different charsets. In other words, for characters of different +charsets, different realized faces are needed to display them. + +Except for composite characters, faces are always realized for a +specific character set and contain a specific font, even if the face +being realized specifies a fontset. The reason is that the result of +the new font selection stage is better than what can be done with +statically defined font name patterns in fontsets. + +In unibyte text, Emacs' charsets aren't applicable; function +`char-charset' reports ASCII for all characters, including those > +0x7f. The X registry and encoding of fonts to use is determined from +the variable `face-default-registry' in this case. The variable is +initialized at Emacs startup time from the font the user specified for +Emacs. + +Currently all unibyte text, i.e. all buffers with +`enable-multibyte-characters' nil are displayed with fonts of the same +registry and encoding `face-default-registry'. This is consistent +with the fact that languages can also be set globally, only. + +**** Clearing face caches. + +The Lisp function `clear-face-cache' can be called to clear face caches +on all frames. If called with a non-nil argument, it will also unload +unused fonts. + +*** Font selection. + +Font selection tries to find the best available matching font for a +given (charset, face) combination. This is done slightly differently +for faces specifying a fontset, or a font family name. + +If the face specifies a fontset name, that fontset determines a +pattern for fonts of the given charset. If the face specifies a font +family, a font pattern is constructed. Charset symbols have a +property `x-charset-registry' for that purpose that maps a charset to +an XLFD registry and encoding in the font pattern constructed. + +Available fonts on the system on which Emacs runs are then matched +against the font pattern. The result of font selection is the best +match for the given face attributes in this font list. + +Font selection can be influenced by the user. + +The user can specify the relative importance he gives the face +attributes width, height, weight, and slant by setting +face-font-selection-order (faces.el) to a list of face attribute +names. The default is (:width :height :weight :slant), and means +that font selection first tries to find a good match for the font +width specified by a face, then---within fonts with that width---tries +to find a best match for the specified font height, etc. + +Setting `face-font-family-alternatives' allows the user to specify +alternative font families to try if a family specified by a face +doesn't exist. + +Setting `face-font-registry-alternatives' allows the user to specify +all alternative font registry names to try for a face specifying a +registry. + +Please note that the interpretations of the above two variables are +slightly different. + +Setting face-ignored-fonts allows the user to ignore specific fonts. + + +**** Scalable fonts + +Emacs can make use of scalable fonts but doesn't do so by default, +since the use of too many or too big scalable fonts may crash XFree86 +servers. + +To enable scalable font use, set the variable +`scalable-fonts-allowed'. A value of nil, the default, means never use +scalable fonts. A value of t means any scalable font may be used. +Otherwise, the value must be a list of regular expressions. A +scalable font may then be used if it matches a regular expression from +that list. Example: + + (setq scalable-fonts-allowed '("muleindian-2$")) + +allows the use of scalable fonts with registry `muleindian-2'. + +*** Functions and variables related to font selection. + +- Function: x-family-fonts &optional FAMILY FRAME + +Return a list of available fonts of family FAMILY on FRAME. If FAMILY +is omitted or nil, list all families. Otherwise, FAMILY must be a +string, possibly containing wildcards `?' and `*'. + +If FRAME is omitted or nil, use the selected frame. Each element of +the result is a vector [FAMILY WIDTH POINT-SIZE WEIGHT SLANT FIXED-P +FULL REGISTRY-AND-ENCODING]. FAMILY is the font family name. +POINT-SIZE is the size of the font in 1/10 pt. WIDTH, WEIGHT, and +SLANT are symbols describing the width, weight and slant of the font. +These symbols are the same as for face attributes. FIXED-P is non-nil +if the font is fixed-pitch. FULL is the full name of the font, and +REGISTRY-AND-ENCODING is a string giving the registry and encoding of +the font. The result list is sorted according to the current setting +of the face font sort order. + +- Function: x-font-family-list + +Return a list of available font families on FRAME. If FRAME is +omitted or nil, use the selected frame. Value is a list of conses +(FAMILY . FIXED-P) where FAMILY is a font family, and FIXED-P is +non-nil if fonts of that family are fixed-pitch. + +- Variable: font-list-limit + +Limit for font matching. If an integer > 0, font matching functions +won't load more than that number of fonts when searching for a +matching font. The default is currently 100. + +*** Setting face attributes. + +For the most part, the new face implementation is interface-compatible +with the old one. Old face attribute related functions are now +implemented in terms of the new functions `set-face-attribute' and +`face-attribute'. + +Face attributes are identified by their names which are keyword +symbols. All attributes can be set to `unspecified'. + +The following attributes are recognized: + +`:family' + +VALUE must be a string specifying the font family, e.g. ``courier'', +or a fontset alias name. If a font family is specified, wild-cards `*' +and `?' are allowed. + +`:width' + +VALUE specifies the relative proportionate width of the font to use. +It must be one of the symbols `ultra-condensed', `extra-condensed', +`condensed', `semi-condensed', `normal', `semi-expanded', `expanded', +`extra-expanded', or `ultra-expanded'. + +`:height' + +VALUE must be either an integer specifying the height of the font to use +in 1/10 pt, a floating point number specifying the amount by which to +scale any underlying face, or a function, which is called with the old +height (from the underlying face), and should return the new height. + +`:weight' + +VALUE specifies the weight of the font to use. It must be one of the +symbols `ultra-bold', `extra-bold', `bold', `semi-bold', `normal', +`semi-light', `light', `extra-light', `ultra-light'. + +`:slant' + +VALUE specifies the slant of the font to use. It must be one of the +symbols `italic', `oblique', `normal', `reverse-italic', or +`reverse-oblique'. + +`:foreground', `:background' + +VALUE must be a color name, a string. + +`:underline' + +VALUE specifies whether characters in FACE should be underlined. If +VALUE is t, underline with foreground color of the face. If VALUE is +a string, underline with that color. If VALUE is nil, explicitly +don't underline. + +`:overline' + +VALUE specifies whether characters in FACE should be overlined. If +VALUE is t, overline with foreground color of the face. If VALUE is a +string, overline with that color. If VALUE is nil, explicitly don't +overline. + +`:strike-through' + +VALUE specifies whether characters in FACE should be drawn with a line +striking through them. If VALUE is t, use the foreground color of the +face. If VALUE is a string, strike-through with that color. If VALUE +is nil, explicitly don't strike through. + +`:box' + +VALUE specifies whether characters in FACE should have a box drawn +around them. If VALUE is nil, explicitly don't draw boxes. If +VALUE is t, draw a box with lines of width 1 in the foreground color +of the face. If VALUE is a string, the string must be a color name, +and the box is drawn in that color with a line width of 1. Otherwise, +VALUE must be a property list of the form `(:line-width WIDTH +:color COLOR :style STYLE)'. If a keyword/value pair is missing from +the property list, a default value will be used for the value, as +specified below. WIDTH specifies the width of the lines to draw; it +defaults to 1. COLOR is the name of the color to draw in, default is +the foreground color of the face for simple boxes, and the background +color of the face for 3D boxes. STYLE specifies whether a 3D box +should be draw. If STYLE is `released-button', draw a box looking +like a released 3D button. If STYLE is `pressed-button' draw a box +that appears like a pressed button. If STYLE is nil, the default if +the property list doesn't contain a style specification, draw a 2D +box. + +`:inverse-video' + +VALUE specifies whether characters in FACE should be displayed in +inverse video. VALUE must be one of t or nil. + +`:stipple' + +If VALUE is a string, it must be the name of a file of pixmap data. +The directories listed in the `x-bitmap-file-path' variable are +searched. Alternatively, VALUE may be a list of the form (WIDTH +HEIGHT DATA) where WIDTH and HEIGHT are the size in pixels, and DATA +is a string containing the raw bits of the bitmap. VALUE nil means +explicitly don't use a stipple pattern. + +For convenience, attributes `:family', `:width', `:height', `:weight', +and `:slant' may also be set in one step from an X font name: + +`:font' + +Set font-related face attributes from VALUE. VALUE must be a valid +XLFD font name. If it is a font name pattern, the first matching font +is used--this is for compatibility with the behavior of previous +versions of Emacs. + +For compatibility with Emacs 20, keywords `:bold' and `:italic' can +be used to specify that a bold or italic font should be used. VALUE +must be t or nil in that case. A value of `unspecified' is not allowed." + +Please see also the documentation of `set-face-attribute' and +`defface'. + +`:inherit' + +VALUE is the name of a face from which to inherit attributes, or a list +of face names. Attributes from inherited faces are merged into the face +like an underlying face would be, with higher priority than underlying faces. + +*** Face attributes and X resources + +The following X resource names can be used to set face attributes +from X resources: + + Face attribute X resource class +----------------------------------------------------------------------- + :family attributeFamily . Face.AttributeFamily + :width attributeWidth Face.AttributeWidth + :height attributeHeight Face.AttributeHeight + :weight attributeWeight Face.AttributeWeight + :slant attributeSlant Face.AttributeSlant + foreground attributeForeground Face.AttributeForeground + :background attributeBackground . Face.AttributeBackground + :overline attributeOverline Face.AttributeOverline + :strike-through attributeStrikeThrough Face.AttributeStrikeThrough + :box attributeBox Face.AttributeBox + :underline attributeUnderline Face.AttributeUnderline + :inverse-video attributeInverse Face.AttributeInverse + :stipple attributeStipple Face.AttributeStipple + or attributeBackgroundPixmap + Face.AttributeBackgroundPixmap + :font attributeFont Face.AttributeFont + :bold attributeBold Face.AttributeBold + :italic attributeItalic . Face.AttributeItalic + :font attributeFont Face.AttributeFont + +*** Text property `face'. + +The value of the `face' text property can now be a single face +specification or a list of such specifications. Each face +specification can be + +1. A symbol or string naming a Lisp face. + +2. A property list of the form (KEYWORD VALUE ...) where each + KEYWORD is a face attribute name, and VALUE is an appropriate value + for that attribute. Please see the doc string of `set-face-attribute' + for face attribute names. + +3. Conses of the form (FOREGROUND-COLOR . COLOR) or + (BACKGROUND-COLOR . COLOR) where COLOR is a color name. This is + for compatibility with previous Emacs versions. + +** Support functions for colors on text-only terminals. + +The function `tty-color-define' can be used to define colors for use +on TTY and MSDOS frames. It maps a color name to a color number on +the terminal. Emacs defines a couple of common color mappings by +default. You can get defined colors with a call to +`defined-colors'. The function `tty-color-clear' can be +used to clear the mapping table. + +** Unified support for colors independent of frame type. + +The new functions `defined-colors', `color-defined-p', `color-values', +and `display-color-p' work for any type of frame. On frames whose +type is neither x nor w32, these functions transparently map X-style +color specifications to the closest colors supported by the frame +display. Lisp programs should use these new functions instead of the +old `x-defined-colors', `x-color-defined-p', `x-color-values', and +`x-display-color-p'. (The old function names are still available for +compatibility; they are now aliases of the new names.) Lisp programs +should no more look at the value of the variable window-system to +modify their color-related behavior. + +The primitives `color-gray-p' and `color-supported-p' also work for +any frame type. + +** Platform-independent functions to describe display capabilities. + +The new functions `display-mouse-p', `display-popup-menus-p', +`display-graphic-p', `display-selections-p', `display-screens', +`display-pixel-width', `display-pixel-height', `display-mm-width', +`display-mm-height', `display-backing-store', `display-save-under', +`display-planes', `display-color-cells', `display-visual-class', and +`display-grayscale-p' describe the basic capabilities of a particular +display. Lisp programs should call these functions instead of testing +the value of the variables `window-system' or `system-type', or calling +platform-specific functions such as `x-display-pixel-width'. + +The new function `display-images-p' returns non-nil if a particular +display can display image files. + +** The minibuffer prompt is now actually inserted in the minibuffer. + +This makes it possible to scroll through the prompt, if you want to. +To disallow this completely (like previous versions of emacs), customize +the variable `minibuffer-prompt-properties', and turn on the +`Inviolable' option. + +The function `minibuffer-prompt-end' returns the current position of the +end of the minibuffer prompt, if the minibuffer is current. +Otherwise, it returns `(point-min)'. + +** New `field' abstraction in buffers. + +There is now code to support an abstraction called `fields' in emacs +buffers. A field is a contiguous region of text with the same `field' +property (which can be a text property or an overlay). + +Many emacs functions, such as forward-word, forward-sentence, +forward-paragraph, beginning-of-line, etc., stop moving when they come +to the boundary between fields; beginning-of-line and end-of-line will +not let the point move past the field boundary, but other movement +commands continue into the next field if repeated. Stopping at field +boundaries can be suppressed programmatically by binding +`inhibit-field-text-motion' to a non-nil value around calls to these +functions. + +Now that the minibuffer prompt is inserted into the minibuffer, it is in +a separate field from the user-input part of the buffer, so that common +editing commands treat the user's text separately from the prompt. + +The following functions are defined for operating on fields: + +- Function: constrain-to-field NEW-POS OLD-POS &optional ESCAPE-FROM-EDGE ONLY-IN-LINE INHIBIT-CAPTURE-PROPERTY + +Return the position closest to NEW-POS that is in the same field as OLD-POS. + +A field is a region of text with the same `field' property. +If NEW-POS is nil, then the current point is used instead, and set to the +constrained position if that is different. + +If OLD-POS is at the boundary of two fields, then the allowable +positions for NEW-POS depends on the value of the optional argument +ESCAPE-FROM-EDGE: If ESCAPE-FROM-EDGE is nil, then NEW-POS is +constrained to the field that has the same `field' char-property +as any new characters inserted at OLD-POS, whereas if ESCAPE-FROM-EDGE +is non-nil, NEW-POS is constrained to the union of the two adjacent +fields. Additionally, if two fields are separated by another field with +the special value `boundary', then any point within this special field is +also considered to be `on the boundary'. + +If the optional argument ONLY-IN-LINE is non-nil and constraining +NEW-POS would move it to a different line, NEW-POS is returned +unconstrained. This useful for commands that move by line, like +C-n or C-a, which should generally respect field boundaries +only in the case where they can still move to the right line. + +If the optional argument INHIBIT-CAPTURE-PROPERTY is non-nil, and OLD-POS has +a non-nil property of that name, then any field boundaries are ignored. + +Field boundaries are not noticed if `inhibit-field-text-motion' is non-nil. + +- Function: delete-field &optional POS + +Delete the field surrounding POS. +A field is a region of text with the same `field' property. +If POS is nil, the value of point is used for POS. + +- Function: field-beginning &optional POS ESCAPE-FROM-EDGE + +Return the beginning of the field surrounding POS. +A field is a region of text with the same `field' property. +If POS is nil, the value of point is used for POS. +If ESCAPE-FROM-EDGE is non-nil and POS is at the beginning of its +field, then the beginning of the *previous* field is returned. + +- Function: field-end &optional POS ESCAPE-FROM-EDGE + +Return the end of the field surrounding POS. +A field is a region of text with the same `field' property. +If POS is nil, the value of point is used for POS. +If ESCAPE-FROM-EDGE is non-nil and POS is at the end of its field, +then the end of the *following* field is returned. + +- Function: field-string &optional POS + +Return the contents of the field surrounding POS as a string. +A field is a region of text with the same `field' property. +If POS is nil, the value of point is used for POS. + +- Function: field-string-no-properties &optional POS + +Return the contents of the field around POS, without text-properties. +A field is a region of text with the same `field' property. +If POS is nil, the value of point is used for POS. + +** Image support. + +Emacs can now display images. Images are inserted into text by giving +strings or buffer text a `display' text property containing one of +(AREA IMAGE) or IMAGE. The display of the `display' property value +replaces the display of the characters having that property. + +If the property value has the form (AREA IMAGE), AREA must be one of +`(margin left-margin)', `(margin right-margin)' or `(margin nil)'. If +AREA is `(margin nil)', IMAGE will be displayed in the text area of a +window, otherwise it will be displayed in the left or right marginal +area. + +IMAGE is an image specification. + +*** Image specifications + +Image specifications are lists of the form `(image PROPS)' where PROPS +is a property list whose keys are keyword symbols. Each +specifications must contain a property `:type TYPE' with TYPE being a +symbol specifying the image type, e.g. `xbm'. Properties not +described below are ignored. + +The following is a list of properties all image types share. + +`:ascent ASCENT' + +ASCENT must be a number in the range 0..100, or the symbol `center'. +If it is a number, it specifies the percentage of the image's height +to use for its ascent. + +If not specified, ASCENT defaults to the value 50 which means that the +image will be centered with the base line of the row it appears in. + +If ASCENT is `center' the image is vertically centered around a +centerline which is the vertical center of text drawn at the position +of the image, in the manner specified by the text properties and +overlays that apply to the image. + +`:margin MARGIN' + +MARGIN must be either a number >= 0 specifying how many pixels to put +as margin around the image, or a pair (X . Y) with X specifying the +horizontal margin and Y specifying the vertical margin. Default is 0. + +`:relief RELIEF' + +RELIEF is analogous to the `:relief' attribute of faces. Puts a relief +around an image. + +`:conversion ALGO' + +Apply an image algorithm to the image before displaying it. + +ALGO `laplace' or `emboss' means apply a Laplace or ``emboss'' +edge-detection algorithm to the image. + +ALGO `(edge-detection :matrix MATRIX :color-adjust ADJUST)' means +apply a general edge-detection algorithm. MATRIX must be either a +nine-element list or a nine-element vector of numbers. A pixel at +position x/y in the transformed image is computed from original pixels +around that position. MATRIX specifies, for each pixel in the +neighborhood of x/y, a factor with which that pixel will influence the +transformed pixel; element 0 specifies the factor for the pixel at +x-1/y-1, element 1 the factor for the pixel at x/y-1 etc. as shown +below. + + (x-1/y-1 x/y-1 x+1/y-1 + x-1/y x/y x+1/y + x-1/y+1 x/y+1 x+1/y+1) + +The resulting pixel is computed from the color intensity of the color +resulting from summing up the RGB values of surrounding pixels, +multiplied by the specified factors, and dividing that sum by the sum +of the factors' absolute values. + +Laplace edge-detection currently uses a matrix of + + (1 0 0 + 0 0 0 + 9 9 -1) + +Emboss edge-detection uses a matrix of + + ( 2 -1 0 + -1 0 1 + 0 1 -2) + +ALGO `disabled' means transform the image so that it looks +``disabled''. + +`:mask MASK' + +If MASK is `heuristic' or `(heuristic BG)', build a clipping mask for +the image, so that the background of a frame is visible behind the +image. If BG is not specified, or if BG is t, determine the +background color of the image by looking at the 4 corners of the +image, assuming the most frequently occurring color from the corners is +the background color of the image. Otherwise, BG must be a list `(RED +GREEN BLUE)' specifying the color to assume for the background of the +image. + +If MASK is nil, remove a mask from the image, if it has one. Images +in some formats include a mask which can be removed by specifying +`:mask nil'. + +`:file FILE' + +Load image from FILE. If FILE is not absolute after expanding it, +search for the image in `data-directory'. Some image types support +building images from data. When this is done, no `:file' property +may be present in the image specification. + +`:data DATA' + +Get image data from DATA. (As of this writing, this is not yet +supported for image type `postscript'). Either :file or :data may be +present in an image specification, but not both. All image types +support strings as DATA, some types allow additional types of DATA. + +*** Supported image types + +**** XBM, image type `xbm'. + +XBM images don't require an external library. Additional image +properties supported are: + +`:foreground FG' + +FG must be a string specifying the image foreground color, or nil +meaning to use the default. Default is the frame's foreground color. + +`:background BG' + +BG must be a string specifying the image background color, or nil +meaning to use the default. Default is the frame's background color. + +XBM images can be constructed from data instead of file. In this +case, the image specification must contain the following properties +instead of a `:file' property. + +`:width WIDTH' + +WIDTH specifies the width of the image in pixels. + +`:height HEIGHT' + +HEIGHT specifies the height of the image in pixels. + +`:data DATA' + +DATA must be either + + 1. a string large enough to hold the bitmap data, i.e. it must + have a size >= (WIDTH + 7) / 8 * HEIGHT + + 2. a bool-vector of size >= WIDTH * HEIGHT + + 3. a vector of strings or bool-vectors, one for each line of the + bitmap. + + 4. a string that's an in-memory XBM file. Neither width nor + height may be specified in this case because these are defined + in the file. + +**** XPM, image type `xpm' + +XPM images require the external library `libXpm', package +`xpm-3.4k.tar.gz', version 3.4k or later. Make sure the library is +found when Emacs is configured by supplying appropriate paths via +`--x-includes' and `--x-libraries'. + +Additional image properties supported are: + +`:color-symbols SYMBOLS' + +SYMBOLS must be a list of pairs (NAME . COLOR), with NAME being the +name of color as it appears in an XPM file, and COLOR being an X color +name. + +XPM images can be built from memory instead of files. In that case, +add a `:data' property instead of a `:file' property. + +The XPM library uses libz in its implementation so that it is able +to display compressed images. + +**** PBM, image type `pbm' + +PBM images don't require an external library. Color, gray-scale and +mono images are supported. Additional image properties supported for +mono images are: + +`:foreground FG' + +FG must be a string specifying the image foreground color, or nil +meaning to use the default. Default is the frame's foreground color. + +`:background FG' + +BG must be a string specifying the image background color, or nil +meaning to use the default. Default is the frame's background color. + +**** JPEG, image type `jpeg' + +Support for JPEG images requires the external library `libjpeg', +package `jpegsrc.v6a.tar.gz', or later. There are no additional image +properties defined. + +**** TIFF, image type `tiff' + +Support for TIFF images requires the external library `libtiff', +package `tiff-v3.4-tar.gz', or later. There are no additional image +properties defined. + +**** GIF, image type `gif' + +Support for GIF images requires the external library `libungif', package +`libungif-4.1.0', or later. + +Additional image properties supported are: + +`:index INDEX' + +INDEX must be an integer >= 0. Load image number INDEX from a +multi-image GIF file. If INDEX is too large, the image displays +as a hollow box. + +This could be used to implement limited support for animated GIFs. +For example, the following function displays a multi-image GIF file +at point-min in the current buffer, switching between sub-images +every 0.1 seconds. + +(defun show-anim (file max) + "Display multi-image GIF file FILE which contains MAX subimages." + (display-anim (current-buffer) file 0 max t)) + +(defun display-anim (buffer file idx max first-time) + (when (= idx max) + (setq idx 0)) + (let ((img (create-image file nil nil :index idx))) + (save-excursion + (set-buffer buffer) + (goto-char (point-min)) + (unless first-time (delete-char 1)) + (insert-image img "x")) + (run-with-timer 0.1 nil 'display-anim buffer file (1+ idx) max nil))) + +**** PNG, image type `png' + +Support for PNG images requires the external library `libpng', +package `libpng-1.0.2.tar.gz', or later. There are no additional image +properties defined. + +**** Ghostscript, image type `postscript'. + +Additional image properties supported are: + +`:pt-width WIDTH' + +WIDTH is width of the image in pt (1/72 inch). WIDTH must be an +integer. This is a required property. + +`:pt-height HEIGHT' + +HEIGHT specifies the height of the image in pt (1/72 inch). HEIGHT +must be a integer. This is an required property. + +`:bounding-box BOX' + +BOX must be a list or vector of 4 integers giving the bounding box of +the PS image, analogous to the `BoundingBox' comment found in PS +files. This is an required property. + +Part of the Ghostscript interface is implemented in Lisp. See +lisp/gs.el. + +*** Lisp interface. + +The variable `image-types' contains a list of those image types +which are supported in the current configuration. + +Images are stored in an image cache and removed from the cache when +they haven't been displayed for `image-cache-eviction-delay seconds. +The function `clear-image-cache' can be used to clear the image cache +manually. Images in the cache are compared with `equal', i.e. all +images with `equal' specifications share the same image. + +*** Simplified image API, image.el + +The new Lisp package image.el contains functions that simplify image +creation and putting images into text. The function `create-image' +can be used to create images. The macro `defimage' can be used to +define an image based on available image types. The functions +`put-image' and `insert-image' can be used to insert an image into a +buffer. + +** Display margins. + +Windows can now have margins which are used for special text +and images. + +To give a window margins, either set the buffer-local variables +`left-margin-width' and `right-margin-width', or call +`set-window-margins'. The function `window-margins' can be used to +obtain the current settings. To make `left-margin-width' and +`right-margin-width' take effect, you must set them before displaying +the buffer in a window, or use `set-window-buffer' to force an update +of the display margins. + +You can put text in margins by giving it a `display' text property +containing a pair of the form `(LOCATION . VALUE)', where LOCATION is +one of `left-margin' or `right-margin' or nil. VALUE can be either a +string, an image specification or a stretch specification (see later +in this file). + +** Help display + +Emacs displays short help messages in the echo area, when the mouse +moves over a tool-bar item or a piece of text that has a text property +`help-echo'. This feature also applies to strings in the mode line +that have a `help-echo' property. + +If the value of the `help-echo' property is a function, that function +is called with three arguments WINDOW, OBJECT and POSITION. WINDOW is +the window in which the help was found. + +If OBJECT is a buffer, POS is the position in the buffer where the +`help-echo' text property was found. + +If OBJECT is an overlay, that overlay has a `help-echo' property, and +POS is the position in the overlay's buffer under the mouse. + +If OBJECT is a string (an overlay string or a string displayed with +the `display' property), POS is the position in that string under the +mouse. + +If the value of the `help-echo' property is neither a function nor a +string, it is evaluated to obtain a help string. + +For tool-bar and menu-bar items, their key definition is used to +determine the help to display. If their definition contains a +property `:help FORM', FORM is evaluated to determine the help string. +For tool-bar items without a help form, the caption of the item is +used as help string. + +The hook `show-help-function' can be set to a function that displays +the help string differently. For example, enabling a tooltip window +causes the help display to appear there instead of in the echo area. + +** Vertical fractional scrolling. + +The display of text in windows can be scrolled smoothly in pixels. +This is useful, for example, for making parts of large images visible. + +The function `window-vscroll' returns the current value of vertical +scrolling, a non-negative fraction of the canonical character height. +The function `set-window-vscroll' can be used to set the vertical +scrolling value. Here is an example of how these function might be +used. + + (global-set-key [A-down] + #'(lambda () + (interactive) + (set-window-vscroll (selected-window) + (+ 0.5 (window-vscroll))))) + (global-set-key [A-up] + #'(lambda () + (interactive) + (set-window-vscroll (selected-window) + (- (window-vscroll) 0.5))))) + +** New hook `fontification-functions'. + +Functions from `fontification-functions' are called from redisplay +when it encounters a region of text that is not yet fontified. This +variable automatically becomes buffer-local when set. Each function +is called with one argument, POS. + +At least one of the hook functions should fontify one or more +characters starting at POS in the current buffer. It should mark them +as fontified by giving them a non-nil value of the `fontified' text +property. It may be reasonable for these functions to check for the +`fontified' property and not put it back on, but they do not have to. + +** Tool bar support. + +Emacs supports a tool bar at the top of a frame under X. The frame +parameter `tool-bar-lines' (X resource "toolBar", class "ToolBar") +controls how may lines to reserve for the tool bar. A zero value +suppresses the tool bar. If the value is non-zero and +`auto-resize-tool-bars' is non-nil the tool bar's size will be changed +automatically so that all tool bar items are visible. + +*** Tool bar item definitions + +Tool bar items are defined using `define-key' with a prefix-key +`tool-bar'. For example `(define-key global-map [tool-bar item1] ITEM)' +where ITEM is a list `(menu-item CAPTION BINDING PROPS...)'. + +CAPTION is the caption of the item, If it's not a string, it is +evaluated to get a string. The caption is currently not displayed in +the tool bar, but it is displayed if the item doesn't have a `:help' +property (see below). + +BINDING is the tool bar item's binding. Tool bar items with keymaps as +binding are currently ignored. + +The following properties are recognized: + +`:enable FORM'. + +FORM is evaluated and specifies whether the tool bar item is enabled +or disabled. + +`:visible FORM' + +FORM is evaluated and specifies whether the tool bar item is displayed. + +`:filter FUNCTION' + +FUNCTION is called with one parameter, the same list BINDING in which +FUNCTION is specified as the filter. The value FUNCTION returns is +used instead of BINDING to display this item. + +`:button (TYPE SELECTED)' + +TYPE must be one of `:radio' or `:toggle'. SELECTED is evaluated +and specifies whether the button is selected (pressed) or not. + +`:image IMAGES' + +IMAGES is either a single image specification or a vector of four +image specifications. If it is a vector, this table lists the +meaning of each of the four elements: + + Index Use when item is + ---------------------------------------- + 0 enabled and selected + 1 enabled and deselected + 2 disabled and selected + 3 disabled and deselected + +If IMAGE is a single image specification, a Laplace edge-detection +algorithm is used on that image to draw the image in disabled state. + +`:help HELP-STRING'. + +Gives a help string to display for the tool bar item. This help +is displayed when the mouse is moved over the item. + +The function `toolbar-add-item' is a convenience function for adding +toolbar items generally, and `tool-bar-add-item-from-menu' can be used +to define a toolbar item with a binding copied from an item on the +menu bar. + +The default bindings use a menu-item :filter to derive the tool-bar +dynamically from variable `tool-bar-map' which may be set +buffer-locally to override the global map. + +*** Tool-bar-related variables. + +If `auto-resize-tool-bar' is non-nil, the tool bar will automatically +resize to show all defined tool bar items. It will never grow larger +than 1/4 of the frame's size. + +If `auto-raise-tool-bar-buttons' is non-nil, tool bar buttons will be +raised when the mouse moves over them. + +You can add extra space between tool bar items by setting +`tool-bar-button-margin' to a positive integer specifying a number of +pixels, or a pair of integers (X . Y) specifying horizontal and +vertical margins . Default is 1. + +You can change the shadow thickness of tool bar buttons by setting +`tool-bar-button-relief' to an integer. Default is 3. + +*** Tool-bar clicks with modifiers. + +You can bind commands to clicks with control, shift, meta etc. on +a tool bar item. If + + (define-key global-map [tool-bar shell] + '(menu-item "Shell" shell + :image (image :type xpm :file "shell.xpm"))) + +is the original tool bar item definition, then + + (define-key global-map [tool-bar S-shell] 'some-command) + +makes a binding to run `some-command' for a shifted click on the same +item. + +** Mode line changes. + +*** Mouse-sensitive mode line. + +The mode line can be made mouse-sensitive by displaying strings there +that have a `local-map' text property. There are three ways to display +a string with a `local-map' property in the mode line. + +1. The mode line spec contains a variable whose string value has +a `local-map' text property. + +2. The mode line spec contains a format specifier (e.g. `%12b'), and +that format specifier has a `local-map' property. + +3. The mode line spec contains a list containing `:eval FORM'. FORM +is evaluated. If the result is a string, and that string has a +`local-map' property. + +The same mechanism is used to determine the `face' and `help-echo' +properties of strings in the mode line. See `bindings.el' for an +example. + +*** If a mode line element has the form `(:eval FORM)', FORM is +evaluated and the result is used as mode line element. + +*** You can suppress mode-line display by setting the buffer-local +variable mode-line-format to nil. + +*** A headerline can now be displayed at the top of a window. + +This mode line's contents are controlled by the new variable +`header-line-format' and `default-header-line-format' which are +completely analogous to `mode-line-format' and +`default-mode-line-format'. A value of nil means don't display a top +line. + +The appearance of top mode lines is controlled by the face +`header-line'. + +The function `coordinates-in-window-p' returns `header-line' for a +position in the header-line. + +** Text property `display' + +The `display' text property is used to insert images into text, +replace text with other text, display text in marginal area, and it is +also used to control other aspects of how text displays. The value of +the `display' property should be a display specification, as described +below, or a list or vector containing display specifications. + +*** Replacing text, displaying text in marginal areas + +To replace the text having the `display' property with some other +text, use a display specification of the form `(LOCATION STRING)'. + +If LOCATION is `(margin left-margin)', STRING is displayed in the left +marginal area, if it is `(margin right-margin)', it is displayed in +the right marginal area, and if LOCATION is `(margin nil)' STRING +is displayed in the text. In the latter case you can also use the +simpler form STRING as property value. + +*** Variable width and height spaces + +To display a space of fractional width or height, use a display +specification of the form `(LOCATION STRECH)'. If LOCATION is +`(margin left-margin)', the space is displayed in the left marginal +area, if it is `(margin right-margin)', it is displayed in the right +marginal area, and if LOCATION is `(margin nil)' the space is +displayed in the text. In the latter case you can also use the +simpler form STRETCH as property value. + +The stretch specification STRETCH itself is a list of the form `(space +PROPS)', where PROPS is a property list which can contain the +properties described below. + +The display of the fractional space replaces the display of the +characters having the `display' property. + +- :width WIDTH + +Specifies that the space width should be WIDTH times the normal +character width. WIDTH can be an integer or floating point number. + +- :relative-width FACTOR + +Specifies that the width of the stretch should be computed from the +first character in a group of consecutive characters that have the +same `display' property. The computation is done by multiplying the +width of that character by FACTOR. + +- :align-to HPOS + +Specifies that the space should be wide enough to reach HPOS. The +value HPOS is measured in units of the normal character width. + +Exactly one of the above properties should be used. + +- :height HEIGHT + +Specifies the height of the space, as HEIGHT, measured in terms of the +normal line height. + +- :relative-height FACTOR + +The height of the space is computed as the product of the height +of the text having the `display' property and FACTOR. + +- :ascent ASCENT + +Specifies that ASCENT percent of the height of the stretch should be +used for the ascent of the stretch, i.e. for the part above the +baseline. The value of ASCENT must be a non-negative number less or +equal to 100. + +You should not use both `:height' and `:relative-height' together. + +*** Images + +A display specification for an image has the form `(LOCATION +. IMAGE)', where IMAGE is an image specification. The image replaces, +in the display, the characters having this display specification in +their `display' text property. If LOCATION is `(margin left-margin)', +the image will be displayed in the left marginal area, if it is +`(margin right-margin)' it will be displayed in the right marginal +area, and if LOCATION is `(margin nil)' the image will be displayed in +the text. In the latter case you can also use the simpler form IMAGE +as display specification. + +*** Other display properties + +- (space-width FACTOR) + +Specifies that space characters in the text having that property +should be displayed FACTOR times as wide as normal; FACTOR must be an +integer or float. + +- (height HEIGHT) + +Display text having this property in a font that is smaller or larger. + +If HEIGHT is a list of the form `(+ N)', where N is an integer, that +means to use a font that is N steps larger. If HEIGHT is a list of +the form `(- N)', that means to use a font that is N steps smaller. A +``step'' is defined by the set of available fonts; each size for which +a font is available counts as a step. + +If HEIGHT is a number, that means to use a font that is HEIGHT times +as tall as the frame's default font. + +If HEIGHT is a symbol, it is called as a function with the current +height as argument. The function should return the new height to use. + +Otherwise, HEIGHT is evaluated to get the new height, with the symbol +`height' bound to the current specified font height. + +- (raise FACTOR) + +FACTOR must be a number, specifying a multiple of the current +font's height. If it is positive, that means to display the characters +raised. If it is negative, that means to display them lower down. The +amount of raising or lowering is computed without taking account of the +`height' subproperty. + +*** Conditional display properties + +All display specifications can be conditionalized. If a specification +has the form `(when CONDITION . SPEC)', the specification SPEC applies +only when CONDITION yields a non-nil value when evaluated. During the +evaluation, `object' is bound to the string or buffer having the +conditional display property; `position' and `buffer-position' are +bound to the position within `object' and the buffer position where +the display property was found, respectively. Both positions can be +different when object is a string. + +The normal specification consisting of SPEC only is equivalent to +`(when t . SPEC)'. + +** New menu separator types. + +Emacs now supports more than one menu separator type. Menu items with +item names consisting of dashes only (including zero dashes) are +treated like before. In addition, the following item names are used +to specify other menu separator types. + +- `--no-line' or `--space', or `--:space', or `--:noLine' + +No separator lines are drawn, but a small space is inserted where the +separator occurs. + +- `--single-line' or `--:singleLine' + +A single line in the menu's foreground color. + +- `--double-line' or `--:doubleLine' + +A double line in the menu's foreground color. + +- `--single-dashed-line' or `--:singleDashedLine' + +A single dashed line in the menu's foreground color. + +- `--double-dashed-line' or `--:doubleDashedLine' + +A double dashed line in the menu's foreground color. + +- `--shadow-etched-in' or `--:shadowEtchedIn' + +A single line with 3D sunken appearance. This is the form +displayed for item names consisting of dashes only. + +- `--shadow-etched-out' or `--:shadowEtchedOut' + +A single line with 3D raised appearance. + +- `--shadow-etched-in-dash' or `--:shadowEtchedInDash' + +A single dashed line with 3D sunken appearance. + +- `--shadow-etched-out-dash' or `--:shadowEtchedOutDash' + +A single dashed line with 3D raise appearance. + +- `--shadow-double-etched-in' or `--:shadowDoubleEtchedIn' + +Two lines with 3D sunken appearance. + +- `--shadow-double-etched-out' or `--:shadowDoubleEtchedOut' + +Two lines with 3D raised appearance. + +- `--shadow-double-etched-in-dash' or `--:shadowDoubleEtchedInDash' + +Two dashed lines with 3D sunken appearance. + +- `--shadow-double-etched-out-dash' or `--:shadowDoubleEtchedOutDash' + +Two dashed lines with 3D raised appearance. + +Under LessTif/Motif, the last four separator types are displayed like +the corresponding single-line separators. + +** New frame parameters for scroll bar colors. + +The new frame parameters `scroll-bar-foreground' and +`scroll-bar-background' can be used to change scroll bar colors. +Their value must be either a color name, a string, or nil to specify +that scroll bars should use a default color. For toolkit scroll bars, +default colors are toolkit specific. For non-toolkit scroll bars, the +default background is the background color of the frame, and the +default foreground is black. + +The X resource name of these parameters are `scrollBarForeground' +(class ScrollBarForeground) and `scrollBarBackground' (class +`ScrollBarBackground'). + +Setting these parameters overrides toolkit specific X resource +settings for scroll bar colors. + +** You can set `redisplay-dont-pause' to a non-nil value to prevent +display updates from being interrupted when input is pending. + +** Changing a window's width may now change its window start if it +starts on a continuation line. The new window start is computed based +on the window's new width, starting from the start of the continued +line as the start of the screen line with the minimum distance from +the original window start. + +** The variable `hscroll-step' and the functions +`hscroll-point-visible' and `hscroll-window-column' have been removed +now that proper horizontal scrolling is implemented. + +** Windows can now be made fixed-width and/or fixed-height. + +A window is fixed-size if its buffer has a buffer-local variable +`window-size-fixed' whose value is not nil. A value of `height' makes +windows fixed-height, a value of `width' makes them fixed-width, any +other non-nil value makes them both fixed-width and fixed-height. + +The following code makes all windows displaying the current buffer +fixed-width and fixed-height. + + (set (make-local-variable 'window-size-fixed) t) + +A call to enlarge-window on a window gives an error if that window is +fixed-width and it is tried to change the window's width, or if the +window is fixed-height, and it is tried to change its height. To +change the size of a fixed-size window, bind `window-size-fixed' +temporarily to nil, for example + + (let ((window-size-fixed nil)) + (enlarge-window 10)) + +Likewise, an attempt to split a fixed-height window vertically, +or a fixed-width window horizontally results in a error. + +** The cursor-type frame parameter is now supported on MS-DOS +terminals. When Emacs starts, it by default changes the cursor shape +to a solid box, as it does on Unix. The `cursor-type' frame parameter +overrides this as it does on Unix, except that the bar cursor is +horizontal rather than vertical (since the MS-DOS display doesn't +support a vertical-bar cursor). + + + +---------------------------------------------------------------------- +Copyright information: + +Copyright (C) 2000, 2001, 2002, 2003, 2006 + Free Software Foundation, Inc. + + 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 this permission notice are preserved, + thus giving the recipient permission to redistribute in turn. + + 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 changed them. + +Local variables: +mode: outline +paragraph-separate: "[ ]*$" +end: diff --git a/etc/ONEWS.1 b/etc/ONEWS.1 deleted file mode 100644 index 4f75a7bc6e0..00000000000 --- a/etc/ONEWS.1 +++ /dev/null @@ -1,1167 +0,0 @@ -Old GNU Emacs NEWS -- history of user-visible changes thru version 15. -Copyright (C) 1985 Richard M. Stallman. -See the end for copying conditions. - -Changes in Emacs 15 - -* Emacs now runs on Sun and Megatest 68000 systems; - also on at least one 16000 system running 4.2. - -* Emacs now alters the output-start and output-stop characters - to prevent C-s and C-q from being considered as flow control - by cretinous rlogin software in 4.2. - -* It is now possible convert Mocklisp code (for Gosling Emacs) to Lisp code - that can run in GNU Emacs. M-x convert-mocklisp-buffer - converts the contents of the current buffer from Mocklisp to - GNU Emacs Lisp. You should then save the converted buffer with C-x C-w - under a name ending in ".el" - - There are probably some Mocklisp constructs that are not handled. - If you encounter one, feel free to report the failure as a bug. - The construct will be handled in a future Emacs release, if that is not - not too hard to do. - - Note that lisp code converted from Mocklisp code will not necessarily - run as fast as code specifically written for GNU Emacs, nor will it use - the many features of GNU Emacs which are not present in Gosling's emacs. - (In particular, the byte-compiler (m-x byte-compile-file) knows little - about compilation of code directly converted from mocklisp.) - It is envisaged that old mocklisp code will be incrementally converted - to GNU lisp code, with M-x convert-mocklisp-buffer being the first - step in this process. - -* Control-x n (narrow-to-region) is now by default a disabled command. - - This means that, if you issue this command, it will ask whether - you really mean it. You have the opportunity to enable the - command permanently at that time, so you will not be asked again. - This will place the form "(put 'narrow-to-region 'disabled nil)" in your - .emacs file. - -* Tags now prompts for the tag table file name to use. - - All the tags commands ask for the tag table file name - if you have not yet specified one. - - Also, the command M-x visit-tag-table can now be used to - specify the tag table file name initially, or to switch - to a new tag table. - -* If truncate-partial-width-windows is non-nil (as it intially is), - all windows less than the full screen width (that is, - made by side-by-side splitting) truncate lines rather than continuing - them. - -* Emacs now checks for Lisp stack overflow to avoid fatal errors. - The depth in eval, apply and funcall may not exceed max-lisp-eval-depth. - The depth in variable bindings and unwind-protects may not exceed - max-specpdl-size. If either limit is exceeded, an error occurs. - You can set the limits to larger values if you wish, but if you make them - too large, you are vulnerable to a fatal error if you invoke - Lisp code that does infinite recursion. - -* New hooks find-file-hook and write-file-hook. - Both of these variables if non-nil should be functions of no arguments. - At the time they are called (current-buffer) will be the buffer being - read or written respectively. - - find-file-hook is called whenever a file is read into its own buffer, - such as by calling find-file, revert-buffer, etc. It is not called by - functions such as insert-file which do not read the file into a buffer of - its own. - find-file-hook is called after the file has been read in and its - local variables (if any) have been processed. - - write-file-hook is called just before writing out a file from a buffer. - -* The initial value of shell-prompt-pattern is now "^[^#$%>]*[#$%>] *" - -* If the .emacs file sets inhibit-startup-message to non-nil, - the messages normally printed by Emacs at startup time - are inhibited. - -* Facility for run-time conditionalization on the basis of emacs features. - - The new variable features is a list of symbols which represent "features" - of the executing emacs, for use in run-time conditionalization. - - The function featurep of one argument may be used to test for the - presence of a feature. It is just the same as - (not (null (memq FEATURE features))) where FEATURE is its argument. - For example, (if (featurep 'magic-window-hack) - (transmogrify-window 'vertical) - (split-window-vertically)) - - The function provide of one argument "announces" that FEATURE is present. - It is much the same as (if (not (featurep FEATURE)) - (setq features (cons FEATURE features))) - - The function require with arguments FEATURE and FILE-NAME loads FILE-NAME - (which should contain the form (provide FEATURE)) unless FEATURE is present. - It is much the same as (if (not (featurep FEATURE)) - (progn (load FILE-NAME) - (if (not featurep FEATURE) (error ...)))) - FILE-NAME is optional and defaults to FEATURE. - -* New function load-average. - - This returns a list of three integers, which are - the current 1 minute, 5 minute and 15 minute load averages, - each multiplied by a hundred (since normally they are floating - point numbers). - -* Per-terminal libraries loaded automatically. - - Emacs when starting up on terminal type T automatically loads - a library named term-T. T is the value of the TERM environment variable. - Thus, on terminal type vt100, Emacs would do (load "term-vt100" t t). - Such libraries are good places to set the character translation table. - - It is a bad idea to redefine lots of commands in a per-terminal library, - since this affects all users. Instead, define a command to do the - redefinitions and let the user's init file, which is loaded later, - call that command or not, as the user prefers. - -* Programmer's note: detecting killed buffers. - - Buffers are eliminated by explicitly killing them, using - the function kill-buffer. This does not eliminate or affect - the pointers to the buffer which may exist in list structure. - If you have a pointer to a buffer and wish to tell whether - the buffer has been killed, use the function buffer-name. - It returns nil on a killed buffer, and a string on a live buffer. - -* New ways to access the last command input character. - - The function last-key-struck, which used to return the last - input character that was read by command input, is eliminated. - Instead, you can find this information as the value of the - variable last-command-char. (This variable used to be called - last-key). - - Another new variable, last-input-char, holds the last character - read from the command input stream regardless of what it was - read for. last-input-char and last-command-char are different - only inside a command that has called read-char to read input. - -* The new switch -kill causes Emacs to exit after processing the - preceding command line arguments. Thus, - emacs -l lib data -e do-it -kill - means to load lib, find file data, call do-it on no arguments, - and then exit. - -* The config.h file has been modularized. - - Options that depend on the machine you are running on are defined - in a file whose name starts with "m-", such as m-vax.h. - Options that depend on the operating system software version you are - running on are defined in a file whose name starts with "s-", - such as s-bsd4.2.h. - - config.h includes one m- file and one s- file. It also defines a - few other options whose values do not follow from the machine type - and system type being used. Installers normally will have to - select the correct m- and s- files but will never have to change their - contents. - -* Termcap AL and DL strings are understood. - - If the termcap entry defines AL and DL strings, for insertion - and deletion of multiple lines in one blow, Emacs now uses them. - This matters most on certain bit map display terminals for which - scrolling is comparatively slow. - -* Bias against scrolling screen far on fast terminals. - - Emacs now prefers to redraw a few lines rather than - shift them a long distance on the screen, when the terminal is fast. - -* New major mode, mim-mode. - - This major mode is for editing MDL code. Perhaps a MDL - user can explain why it is not called mdl-mode. - You must load the library mim-mode explicitly to use this. - -* GNU documentation formatter `texinfo'. - - The `texinfo' library defines a format for documentation - files which can be passed through Tex to make a printed manual - or passed through texinfo to make an Info file. Texinfo is - documented fully by its own Info file; compare this file - with its source, texinfo.texinfo, for additional guidance. - - All documentation files for GNU utilities should be written - in texinfo input format. - - Tex processing of texinfo files requires the Botex macro package. - This is not ready for distribution yet, but will appear at - a later time. - -* New function read-from-string (emacs 15.29) - - read-from-string takes three arguments: a string to read from, - and optionally start and end indices which delimit a substring - from which to read. (They default to 0 and the length of the string, - respectively.) - - This function returns a cons cell whose car is the object produced - by reading from the string and whose cdr is a number giving the - index in the string of the first character not read. That index may - be passed as the second argument to a later call to read-from-string - to read the next form represented by the string. - - In addition, the function read now accepts a string as its argument. - In this case, it calls read-from-string on the whole string, and - returns the car of the result. (ie the actual object read.) - -Changes in Emacs 14 - -* Completion now prints various messages such as [Sole Completion] - or [Next Character Not Unique] to describe the results obtained. - These messages appear after the text in the minibuffer, and remain - on the screen until a few seconds go by or you type a key. - -* The buffer-read-only flag is implemented. - Setting or binding this per-buffer variable to a non-nil value - makes illegal any operation which would modify the textual content of - the buffer. (Such operations signal a buffer-read-only error) - The read-only state of a buffer may be altered using toggle-read-only - (C-x C-q) - The buffers used by Rmail, Dired, Rnews, and Info are now read-only - by default to prevent accidental damage to the information in those - buffers. - -* Functions car-safe and cdr-safe. - These functions are like car and cdr when the argument is a cons. - Given an argument not a cons, car-safe always returns nil, with - no error; the same for cdr-safe. - -* The new function user-real-login-name returns the name corresponding - to the real uid of the Emacs process. This is usually the same - as what user-login-name returns; however, when Emacs is invoked - from su, user-real-login-name returns "root" but user-login-name - returns the name of the user who invoked su. - -Changes in Emacs 13 - -* There is a new version numbering scheme. - - What used to be the first version number, which was 1, - has been discarded since it does not seem that I need three - levels of version number. - - However, a new third version number has been added to represent - changes by user sites. This number will always be zero in - Emacs when I distribute it; it will be incremented each time - Emacs is built at another site. - -* There is now a reader syntax for Meta characters: - \M-CHAR means CHAR or'ed with the Meta bit. For example: - - ?\M-x is (+ ?x 128) - ?\M-\n is (+ ?\n 128) - ?\M-\^f is (+ ?\^f 128) - - This syntax can be used in strings too. Note, however, that - Meta characters are not meaningful in key sequences being passed - to define-key or lookup-key; you must use ESC characters (\e) - in them instead. - - ?\C- can be used likewise for control characters. (13.9) - -* Installation change - The string "../lisp" now adds to the front of the load-path - used for searching for Lisp files during Emacs initialization. - It used to replace the path specified in paths.h entirely. - Now the directory ../lisp is searched first and the directoris - specified in paths.h are searched afterward. - -Changes in Emacs 1.12 - -* There is a new installation procedure. - See the file INSTALL that comes in the top level - directory in the tar file or tape. - -* The Meta key is now supported on terminals that have it. - This is a shift key which causes the high bit to be turned on - in all input characters typed while it is held down. - - read-char now returns a value in the range 128-255 if - a Meta character is typed. When interpreted as command - input, a Meta character is equivalent to a two character - sequence, the meta prefix character followed by the un-metized - character (Meta-G unmetized is G). - - The meta prefix character - is specified by the value of the variable meta-prefix-char. - If this character (normally Escape) has been redefined locally - with a non-prefix definition (such as happens in completing - minibuffers) then the local redefinition is suppressed when - the character is not the last one in a key sequence. - So the local redefinition is effective if you type the character - explicitly, but not effective if the character comes from - the use of the Meta key. - -* `-' is no longer a completion command in the minibuffer. - It is an ordinary self-inserting character. - -* The list load-path of directories load to search for Lisp files - is now controlled by the EMACSLOADPATH environment variable -[[ Note this was originally EMACS-LOAD-PATH and has been changed - again; sh does not deal properly with hyphens in env variable names]] - rather than the EPATH environment variable. This is to avoid - conflicts with other Emacses. - - While Emacs is being built initially, the load-path - is now just ("../lisp"), ignoring paths.h. It does not - ignore EMACSLOADPATH, however; you should avoid having - this variable set while building Emacs. - -* You can now specify a translation table for keyboard - input characters, as a way of exchanging or substituting - keys on the keyboard. - - If the value of keyboard-translate-table is a string, - every character received from the keyboard is used as an - index in that string, and the character at that index in - the string is used as input instead of what was actually - typed. If the actual input character is >= the length of - the string, it is used unchanged. - - One way this feature can be used is to fix bad keyboard - designes. For example, on some terminals, Delete is - Shift-Underscore. Since Delete is a more useful character - than Underscore, it is an improvement to make the unshifted - character Delete and the shifted one Underscore. This can - be done with - - ;; First make a translate table that does the identity translation. - (setq keyboard-translate-table (make-string 128 0)) - (let ((i 0)) - (while (< i 128) - (aset keyboard-translate-table i i) - (setq i (1+ i)))) - - ;; Now alter translations of some characters. - (aset keyboard-translate-table ?\_ ?\^?) - (aset keyboard-translate-table ?\^? ?\_) - - If your terminal has a Meta key and can therefore send - codes up to 255, Meta characters are translated through - elements 128 through 255 of the translate table, and therefore - are translated independently of the corresponding non-Meta - characters. You must therefore establish translations - independently for the Meta characters if you want them too: - - ;; First make a translate table that does the identity translation. - (setq keyboard-translate-table (make-string 256 0)) - (let ((i 0)) - (while (< i 256) - (aset keyboard-translate-table i i) - (setq i (1+ i)))) - - ;; Now alter translations of some characters. - (aset keyboard-translate-table ?\_ ?\^?) - (aset keyboard-translate-table ?\^? ?\_) - - ;; Now alter translations of some Meta characters. - (aset keyboard-translate-table (+ 128 ?\_) (+ 128 ?\^?)) - (aset keyboard-translate-table (+ 128 ?\^?) (+ 128 ?\_)) - -* (process-kill-without-query PROCESS) - -This marks the process so that, when you kill Emacs, -you will not on its account be queried about active subprocesses. - -Changes in Emacs 1.11 - -* The commands C-c and C-z have been interchanged, - for greater compatibility with normal Unix usage. - C-z now runs suspend-emacs and C-c runs exit-recursive-edit. - -* The value returned by file-name-directory now ends - with a slash. (file-name-directory "foo/bar") => "foo/". - This avoids confusing results when dealing with files - in the root directory. - - The value of the per-buffer variable default-directory - is also supposed to have a final slash now. - -* There are now variables to control the switches passed to - `ls' by the C-x C-d command (list-directory). - list-directory-brief-switches is a string, initially "-CF", - used for brief listings, and list-directory-verbose-switches - is a string, initially "-l", used for verbose ones. - -* For Ann Arbor Ambassador terminals, the termcap "ti" string - is now used to initialize the screen geometry on entry to Emacs, - and the "te" string is used to set it back on exit. - If the termcap entry does not define the "ti" or "te" string, - Emacs does what it used to do. - -Changes in Emacs 1.10 - -* GNU Emacs has been made almost 1/3 smaller. - It now dumps out as only 530kbytes on Vax 4.2bsd. - -* The term "checkpoint" has been replaced by "auto save" - throughout the function names, variable names and documentation - of GNU Emacs. - -* The function load now tries appending ".elc" and ".el" - to the specified filename BEFORE it tries the filename - without change. - -* rmail now makes the mode line display the total number - of messages and the current message number. - The "f" command now means forward a message to another user. - The command to search through all messages for a string is now "F". - The "u" command now means to move back to the previous - message and undelete it. To undelete the selected message, use Meta-u. - -* The hyphen character is now equivalent to a Space while - in completing minibuffers. Both mean to complete an additional word. - -* The Lisp function error now takes args like format - which are used to construct the error message. - -* Redisplay will refuse to start its display at the end of the buffer. - It will pick a new place to display from, rather than use that. - -* The value returned by garbage-collect has been changed. - Its first element is no longer a number but a cons, - whose car is the number of cons cells now in use, - and whose cdr is the number of cons cells that have been - made but are now free. - The second element is similar but describes symbols rather than cons cells. - The third element is similar but describes markers. - -* The variable buffer-name has been eliminated. - The function buffer-name still exists. This is to prevent - user programs from changing buffer names without going - through the rename-buffer function. - -Changes in Emacs 1.9 - -* When a fill prefix is in effect, paragraphs are started - or separated by lines that do not start with the fill prefix. - Also, a line which consists of the fill prefix followed by - white space separates paragraphs. - -* C-x C-v runs the new function find-alternate-file. - It finds the specified file, switches to that buffer, - and kills the previous current buffer. (It requires - confirmation if that buffer had changes.) This is - most useful after you find the wrong file due to a typo. - -* Exiting the minibuffer moves the cursor to column 0, - to show you that it has really been exited. - -* Meta-g (fill-region) now fills each paragraph in the - region individually. To fill the region as if it were - a single paragraph (for when the paragraph-delimiting mechanism - does the wrong thing), use fill-region-as-paragraph. - -* Tab in text mode now runs the function tab-to-tab-stop. - A new mode called indented-text-mode is like text-mode - except that in it Tab runs the function indent-relative, - which indents the line under the previous line. - If auto fill is enabled while in indented-text-mode, - the new lines that it makes are indented. - -* Functions kill-rectangle and yank-rectangle. - kill-rectangle deletes the rectangle specified by dot and mark - (or by two arguments) and saves it in the variable killed-rectangle. - yank-rectangle inserts the rectangle in that variable. - - Tab characters in a rectangle being saved are replaced - by spaces in such a way that their appearance will - not be changed if the rectangle is later reinserted - at a different column position. - -* `+' in a regular expression now means - to repeat the previous expression one or more times. - `?' means to repeat it zero or one time. - They are in all regards like `*' except for the - number of repetitions they match. - - \< in a regular expression now matches the null string - when it is at the beginning of a word; \> matches - the null string at the end of a word. - -* C-x p narrows the buffer so that only the current page - is visible. - -* C-x ) with argument repeats the kbd macro just - defined that many times, counting the definition - as one repetition. - -* C-x ( with argument begins defining a kbd macro - starting with the last one defined. It executes that - previous kbd macro initially, just as if you began - by typing it over again. - -* C-x q command queries the user during kbd macro execution. - With prefix argument, enters recursive edit, - reading keyboard commands even within a kbd macro. - You can give different commands each time the macro executes. - Without prefix argument, reads a character. Your options are: - Space -- execute the rest of the macro. - Delete -- skip the rest of the macro; start next repetition. - C-d -- skip rest of the macro and don't repeat it any more. - C-r -- enter a recursive edit, then on exit ask again for a character - C-l -- redisplay screen and ask again." - -* write-kbd-macro and append-kbd-macro are used to save - a kbd macro definition in a file (as Lisp code to - redefine the macro when the file is loaded). - These commands differ in that write-kbd-macro - discards the previous contents of the file. - If given a prefix argument, both commands - record the keys which invoke the macro as well as the - macro's definition. - -* The variable global-minor-modes is used to display - strings in the mode line of all buffers. It should be - a list of elements thaht are conses whose cdrs are strings - to be displayed. This complements the variable - minor-modes, which has the same effect but has a separate - value in each buffer. - -* C-x = describes horizontal scrolling in effect, if any. - -* Return now auto-fills the line it is ending, in auto fill mode. - Space with zero as argument auto-fills the line before it - just like Space without an argument. - -Changes in Emacs 1.8 - -This release mostly fixes bugs. There are a few new features: - -* apropos now sorts the symbols before displaying them. - Also, it returns a list of the symbols found. - - apropos now accepts a second arg PRED which should be a function - of one argument; if PRED is non-nil, each symbol is tested - with PRED and only symbols for which PRED returns non-nil - appear in the output or the returned list. - - If the third argument to apropos is non-nil, apropos does not - display anything; it merely returns the list of symbols found. - - C-h a now runs the new function command-apropos rather than - apropos, and shows only symbols with definitions as commands. - -* M-x shell sends the command - if (-f ~/.emacs_NAME)source ~/.emacs_NAME - invisibly to the shell when it starts. Here NAME - is replaced by the name of shell used, - as it came from your ESHELL or SHELL environment variable - but with directory name, if any, removed. - -* M-, now runs the command tags-loop-continue, which is used - to resume a terminated tags-search or tags-query-replace. - -Changes in Emacs 1.7 - -It's Beat CCA Week. - -* The initial buffer is now called "*scratch*" instead of "scratch", - so that all buffer names used automatically by Emacs now have *'s. - -* Undo information is now stored separately for each buffer. - The Undo command (C-x u) always applies to the current - buffer only. - - C-_ is now a synonym for C-x u. - - (buffer-flush-undo BUFFER) causes undo information not to - be kept for BUFFER, and frees the space that would have - been used to hold it. In any case, no undo information is - kept for buffers whose names start with spaces. (These - buffers also do not appear in the C-x C-b display.) - -* Rectangle operations are now implemented. - C-x r stores the rectangle described by dot and mark - into a register; it reads the register name from the keyboard. - C-x g, the command to insert the contents of a register, - can be used to reinsert the rectangle elsewhere. - - Other rectangle commands include - open-rectangle: - insert a blank rectangle in the position and size - described by dot and mark, at its corners; - the existing text is pushed to the right. - clear-rectangle: - replace the rectangle described by dot ane mark - with blanks. The previous text is deleted. - delete-rectangle: - delete the text of the specified rectangle, - moving the text beyond it on each line leftward. - -* Side-by-side windows are allowed. Use C-x 5 to split the - current window into two windows side by side. - C-x } makes the selected window ARG columns wider at the - expense of the windows at its sides. C-x { makes the selected - window ARG columns narrower. An argument to C-x 5 specifies - how many columns to give to the leftmost of the two windows made. - - C-x 2 now accepts a numeric argument to specify the number of - lines to give to the uppermost of the two windows it makes. - -* Horizontal scrolling of the lines in a window is now implemented. - C-x < (scroll-left) scrolls all displayed lines left, - with the numeric argument (default 1) saying how far to scroll. - When the window is scrolled left, some amount of the beginning - of each nonempty line is replaced by an "$". - C-x > scrolls right. If a window has no text hidden at the left - margin, it cannot be scrolled any farther right than that. - When nonzero leftwards scrolling is in effect in a window. - lines are automatically truncated at the window's right margin - regardless of the value of the variable truncate-lines in the - buffer being displayed. - -* C-x C-d now uses the default output format of `ls', - which gives just file names in multiple columns. - C-u C-x C-d passes the -l switch to `ls'. - -* C-t at the end of a line now exchanges the two preceding characters. - - All the transpose commands now interpret zero as an argument - to mean to transpose the textual unit after or around dot - with the one after or around the mark. - -* M-! executes a shell command in an inferior shell - and displays the output from it. With a prefix argument, - it inserts the output in the current buffer after dot - and sets the mark after the output. The shell command - gets /dev/null as its standard input. - - M-| is like M-! but passes the contents of the region - as input to the shell command. A prefix argument makes - the output from the command replace the contents of the region. - -* The mode line will now say "Def" after the major mode - while a keyboard macro is being defined. - -* The variable fill-prefix is now used by Meta-q. - Meta-q removes the fill prefix from lines that start with it - before filling, and inserts the fill prefix on each line - after filling. - - The command C-x . sets the fill prefix equal to the text - on the current line before dot. - -* The new command Meta-j (indent-new-comment-line), - is like Linefeed (indent-new-line) except when dot is inside a comment; - in that case, Meta-j inserts a comment starter on the new line, - indented under the comment starter above. It also inserts - a comment terminator at the end of the line above, - if the language being edited calls for one. - -* Rmail should work correctly now, and has some C-h m documentation. - -Changes in Emacs 1.6 - -* save-buffers-kill-emacs is now on C-x C-c - while C-x C-z does suspend-emacs. This is to make - C-x C-c like the normal Unix meaning of C-c - and C-x C-z linke the normal Unix meaning of C-z. - -* M-ESC (eval-expression) is now a disabled command by default. - This prevents users who type ESC ESC accidentally from - getting confusing results. Put - (put 'eval-expression 'disabled nil) - in your ~/.emacs file to enable the command. - -* Self-inserting text is grouped into bunches for undoing. - Each C-x u command undoes up to 20 consecutive self-inserting - characters. - -* Help f now uses as a default the function being called - in the innermost Lisp expression that dot is in. - This makes it more convenient to use while writing - Lisp code to run in Emacs. - (If the text around dot does not appear to be a call - to a Lisp function, there is no default.) - - Likewise, Help v uses the symbol around or before dot - as a default, if that is a variable name. - -* Commands that read filenames now insert the default - directory in the minibuffer, to become part of your input. - This allows you to see what the default is. - You may type a filename which goes at the end of the - default directory, or you may edit the default directory - as you like to create the input you want to give. - You may also type an absolute pathname (starting with /) - or refer to a home directory (input starting with ~) - after the default; the presence of // or /~ causes - everything up through the slash that precedes your - type-in to be ignored. - - Returning the default directory without change, - including the terminating slash, requests the use - of the default file name (usually the visited file's name). - - Set the variable insert-default-directory to nil - to turn off this feature. - -* M-x shell now uses the environment variable ESHELL, - if it exists, as the file name of the shell to run. - If there is no ESHELL variable, the SHELL variable is used. - This is because some shells do not work properly as inferiors - of Emacs (or anything like Emacs). - -* A new variable minor-modes now exists, with a separate value - in each buffer. Its value should be an alist of elements - (MODE-FUNCTION-SYMBOL . PRETTY-NAME-STRING), one for each - minor mode that is turned on in the buffer. The pretty - name strings are displayed in the mode line after the name of the - major mode (with spaces between them). The mode function - symbols should be symbols whose function definitions will - turn on the minor mode if given 1 as an argument; they are present - so that Help m can find their documentation strings. - -* The format of tag table files has been changed. - The new format enables Emacs to find tags much faster. - - A new program, etags, exists to make the kind of - tag table that Emacs wants. etags is invoked just - like ctags; in fact, if you give it any switches, - it does exactly what ctags would do. Give it the - empty switch ("-") to make it act like ctags with no switches. - - etags names the tag table file "TAGS" rather than "tags", - so that these tag tables and the standard Unix ones - can coexist. - - The tags library can no longer use standard ctags-style - tag tables files. - -* The file of Lisp code Emacs reads on startup is now - called ~/.emacs rather than ~/.emacs_pro. - -* copy-file now gives the copied file the same mode bits - as the original file. - -* Output from a process inserted into the process's buffer - no longer sets the buffer's mark. Instead it sets a - marker associated with the process to point to the end - of the inserted text. You can access this marker with - (process-mark PROCESS) - and then either examine its position with marker-position - or set its position with set-marker. - -* completing-read takes a new optional fifth argument which, - if non-nil, should be a string of text to insert into - the minibuffer before reading user commands. - -* The Lisp function elt now exists: - (elt ARRAY N) is like (aref ARRAY N), - (elt LIST N) is like (nth N LIST). - -* rplaca is now a synonym for setcar, and rplacd for setcdr. - eql is now a synonym for eq; it turns out that the Common Lisp - distinction between eq and eql is insignificant in Emacs. - numberp is a new synonym for integerp. - -* auto-save has been renamed to auto-save-mode. - -* Auto save file names for buffers are now created by the - function make-auto-save-file-name. This is so you can - redefine that function to change the way auto save file names - are chosen. - -* expand-file-name no longer discards a final slash. - (expand-file-name "foo" "/lose") => "/lose/foo" - (expand-file-name "foo/" "/lose") => "/lose/foo/" - - Also, expand-file-name no longer substitutes $ constructs. - A new function substitute-in-file-name does this. Reading - a file name with read-file-name or the `f' or`F' option - of interactive calling uses substitute-in-file-name - on the file name that was read and returns the result. - - All I/O primitives including insert-file-contents and - delete-file call expand-file-name on the file name supplied. - This change makes them considerably faster in the usual case. - -* Interactive calling spec strings allow the new code letter 'D' - which means to read a directory name. It is like 'f' except - that the default if the user makes no change in the minibuffer - is to return the current default directory rather than the - current visited file name. - -Changes in Emacs 1.5 - -* suspend-emacs now accepts an optional argument - which is a string to be stuffed as terminal input - to be read by Emacs's superior shell after Emacs exits. - - A library called ledit exists which uses this feature - to transmit text to a Lisp job running as a sibling of - Emacs. - -* If find-file is given the name of a directory, - it automatically invokes dired on that directory - rather than reading in the binary data that make up - the actual contents of the directory according to Unix. - -* Saving an Emacs buffer now preserves the file modes - of any previously existing file with the same name. - This works using new Lisp functions file-modes and - set-file-modes, which can be used to read or set the mode - bits of any file. - -* The Lisp function cond now exists, with its traditional meaning. - -* defvar and defconst now permit the documentation string - to be omitted. defvar also permits the initial value - to be omitted; then it acts only as a comment. - -Changes in Emacs 1.4 - -* Auto-filling now normally indents the new line it creates - by calling indent-according-to-mode. This function, meanwhile, - has in Fundamental and Text modes the effect of making the line - have an indentation of the value of left-margin, a per-buffer variable. - - Tab no longer precisely does indent-according-to-mode; - it does that in all modes that supply their own indentation routine, - but in Fundamental, Text and allied modes it inserts a tab character. - -* The command M-x grep now invokes grep (on arguments - supplied by the user) and reads the output from grep - asynchronously into a buffer. The command C-x ` can - be used to move to the lines that grep has found. - This is an adaptation of the mechanism used for - running compilations and finding the loci of error messages. - - You can now use C-x ` even while grep or compilation - is proceeding; as more matches or error messages arrive, - C-x ` will parse them and be able to find them. - -* M-x mail now provides a command to send the message - and "exit"--that is, return to the previously selected - buffer. It is C-z C-z. - -* Tab in C mode now tries harder to adapt to all indentation styles. - If the line being indented is a statement that is not the first - one in the containing compound-statement, it is aligned under - the beginning of the first statement. - -* The functions screen-width and screen-height return the - total width and height of the screen as it is now being used. - set-screen-width and set-screen-height tell Emacs how big - to assume the screen is; they each take one argument, - an integer. - -* The Lisp function 'function' now exists. function is the - same as quote, except that it serves as a signal to the - Lisp compiler that the argument should be compiled as - a function. Example: - (mapcar (function (lambda (x) (+ x 5))) list) - -* The function set-key has been renamed to global-set-key. - undefine-key and local-undefine-key has been renamed to - global-unset-key and local-unset-key. - -* Emacs now collects input from asynchronous subprocesses - while waiting in the functions sleep-for and sit-for. - -* Shell mode's Newline command attempts to distinguish subshell - prompts from user input when issued in the middle of the buffer. - It no longer reexecutes from dot to the end of the line; - it reeexecutes the entire line minus any prompt. - The prompt is recognized by searching for the value of - shell-prompt-pattern, starting from the beginning of the line. - Anything thus skipped is not reexecuted. - -Changes in Emacs 1.3 - -* An undo facility exists now. Type C-x u to undo a batch of - changes (usually one command's changes, but some commands - such as query-replace divide their changes into multiple - batches. You can repeat C-x u to undo further. As long - as no commands other than C-x u intervene, each one undoes - another batch. A numeric argument to C-x u acts as a repeat - count. - - If you keep on undoing, eventually you may be told that - you have used up all the recorded undo information. - Some actions, such as reading in files, discard all - undo information. - - The undo information is not currently stored separately - for each buffer, so it is mainly good if you do something - totally spastic. [This has since been fixed.] - -* A learn-by-doing tutorial introduction to Emacs now exists. - Type C-h t to enter it. - -* An Info documentation browser exists. Do M-x info to enter it. - It contains a tutorial introduction so that no more documentation - is needed here. As of now, the only documentation in it - is that of Info itself. - -* Help k and Help c are now different. Help c prints just the - name of the function which the specified key invokes. Help k - prints the documentation of the function as well. - -* A document of the differences between GNU Emacs and Twenex Emacs - now exists. It is called DIFF, in the same directory as this file. - -* C mode can now indent comments better, including multi-line ones. - Meta-Control-q now reindents comment lines within the expression - being aligned. - -* Insertion of a close-parenthesis now shows the matching open-parenthesis - even if it is off screen, by printing the text following it on its line - in the minibuffer. - -* A file can now contain a list of local variable values - to be in effect when the file is edited. See the file DIFF - in the same directory as this file for full details. - -* A function nth is defined. It means the same thing as in Common Lisp. - -* The function install-command has been renamed to set-key. - It now takes the key sequence as the first argument - and the definition for it as the second argument. - Likewise, local-install-command has been renamed to local-set-key. - -Changes in Emacs 1.2 - -* A Lisp single-stepping and debugging facility exists. - To cause the debugger to be entered when an error - occurs, set the variable debug-on-error non-nil. - - To cause the debugger to be entered whenever function foo - is called, do (debug-on-entry 'foo). To cancel this, - do (cancel-debug-on-entry 'foo). debug-on-entry does - not work for primitives (written in C), only functions - written in Lisp. Most standard Emacs commands are in Lisp. - - When the debugger is entered, the selected window shows - a buffer called " *Backtrace" which displays a series - of stack frames, most recently entered first. For each - frame, the function name called is shown, usually followed - by the argument values unless arguments are still being - calculated. At the beginning of the buffer is a description - of why the debugger was entered: function entry, function exit, - error, or simply that the user called the function `debug'. - - To exit the debugger and return to top level, type `q'. - - In the debugger, you can evaluate Lisp expressions by - typing `e'. This is equivalent to `M-ESC'. - - When the debugger is entered due to an error, that is - all you can do. When it is entered due to function entry - (such as, requested by debug-on-entry), you have two - options: - Continue execution and reenter debugger after the - completion of the function being entered. Type `c'. - Continue execution but enter the debugger before - the next subexpression. Type `d'. - - You will see that some stack frames are marked with *. - This means the debugger will be entered when those - frames exit. You will see the value being returned - in the first line of the backtrace buffer. Your options: - Continue execution, and return that value. Type `c'. - Continue execution, and return a specified value. Type `r'. - - You can mark a frame to enter the debugger on exit - with the `b' command, or clear such a mark with `u'. - -* Lisp macros now exist. - For example, you can write - (defmacro cadr (arg) (list 'car (list 'cdr arg))) - and then the expression - (cadr foo) - will expand into - (car (cdr foo)) - -Changes in Emacs 1.1 - -* The initial buffer is now called "scratch" and is in a - new major mode, Lisp Interaction mode. This mode is - intended for typing Lisp expressions, evaluating them, - and having the values printed into the buffer. - - Type Linefeed after a Lisp expression, to evaluate the - expression and have its value printed into the buffer, - advancing dot. - - The other commands of Lisp mode are available. - -* The C-x C-e command for evaluating the Lisp expression - before dot has been changed to print the value in the - minibuffer line rather than insert it in the buffer. - A numeric argument causes the printed value to appear - in the buffer instead. - -* In Lisp mode, the command M-C-x evaluates the defun - containing or following dot. The value is printed in - the minibuffer. - -* The value of a Lisp expression evaluated using M-ESC - is now printed in the minibuffer. - -* M-q now runs fill-paragraph, independent of major mode. - -* C-h m now prints documentation on the current buffer's - major mode. What it prints is the documentation of the - major mode name as a function. All major modes have been - equipped with documentation that describes all commands - peculiar to the major mode, for this purpose. - -* You can display a Unix manual entry with - the M-x manual-entry command. - -* You can run a shell, displaying its output in a buffer, - with the M-x shell command. The Return key sends input - to the subshell. Output is printed inserted automatically - in the buffer. Commands C-c, C-d, C-u, C-w and C-z are redefined - for controlling the subshell and its subjobs. - "cd", "pushd" and "popd" commands are recognized as you - enter them, so that the default directory of the Emacs buffer - always remains the same as that of the subshell. - -* C-x $ (that's a real dollar sign) controls line-hiding based - on indentation. With a numeric arg N > 0, it causes all lines - indented by N or more columns to become invisible. - They are, effectively, tacked onto the preceding line, where - they are represented by " ..." on the screen. - (The end of the preceding visible line corresponds to a - screen cursor position before the "...". Anywhere in the - invisible lines that follow appears on the screen as a cursor - position after the "...".) - Currently, all editing commands treat invisible lines just - like visible ones, except for C-n and C-p, which have special - code to count visible lines only. - C-x $ with no argument turns off this mode, which in any case - is remembered separately for each buffer. - -* Outline mode is another form of selective display. - It is a major mode invoked with M-x outline-mode. - It is intended for editing files that are structured as - outlines, with heading lines (lines that begin with one - or more asterisks) and text lines (all other lines). - The number of asterisks in a heading line are its level; - the subheadings of a heading line are all following heading - lines at higher levels, until but not including the next - heading line at the same or a lower level, regardless - of intervening text lines. - - In outline mode, you have commands to hide (remove from display) - or show the text or subheadings under each heading line - independently. Hidden text or subheadings are invisibly - attached to the end of the preceding heading line, so that - if you kill the hading line and yank it back elsewhere - all the invisible lines accompany it. - - All editing commands treat hidden outline-mode lines - as part of the preceding visible line. - -* C-x C-z runs save-buffers-kill-emacs - offers to save each file buffer, then exits. - -* C-c's function is now called suspend-emacs. - -* The command C-x m runs mail, which switches to a buffer *mail* - and lets you compose a message to send. C-x 4 m runs mail in - another window. Type C-z C-s in the mail buffer to send the - message according to what you have entered in the buffer. - - You must separate the headers from the message text with - an empty line. - -* You can now dired partial directories (specified with names - containing *'s, etc, all processed by the shell). Also, you - can dired more than one directory; dired names the buffer - according to the filespec or directory name. Reinvoking - dired on a directory already direded just switches back to - the same directory used last time; do M-x revert if you want - to read in the current contents of the directory. - - C-x d runs dired, and C-x 4 d runs dired in another window. - - C-x C-d (list-directory) also allows partial directories now. - -Lisp programming changes - -* t as an output stream now means "print to the minibuffer". - If there is already text in the minibuffer printed via t - as an output stream, the new text is appended to the old - (or is truncated and lost at the margin). If the minibuffer - contains text put there for some other reason, it is cleared - first. - - t is now the top-level value of standard-output. - - t as an input stream now means "read via the minibuffer". - The minibuffer is used to read a line of input, with editing, - and this line is then parsed. Any excess not used by `read' - is ignored; each `read' from t reads fresh input. - t is now the top-level value of standard-input. - -* A marker may be used as an input stream or an output stream. - The effect is to grab input from where the marker points, - advancing it over the characters read, or to insert output - at the marker and advance it. - -* Output from an asynchronous subprocess is now inserted at - the end of the associated buffer, not at the buffer's dot, - and the buffer's mark is set to the end of the inserted output - each time output is inserted. - -* (pos-visible-in-window-p POS WINDOW) - returns t if position POS in WINDOW's buffer is in the range - that is being displayed in WINDOW; nil if it is scrolled - vertically out of visibility. - - If display in WINDOW is not currently up to date, this function - calculates carefully whether POS would appear if display were - done immediately based on the current (window-start WINDOW). - - POS defaults to (dot), and WINDOW to (selected-window). - -* Variable buffer-alist replaced by function (buffer-list). - The actual alist of buffers used internally by Emacs is now - no longer accessible, to prevent the user from crashing Emacs - by modifying it. The function buffer-list returns a list - of all existing buffers. Modifying this list cannot hurt anything - as a new list is constructed by each call to buffer-list. - -* load now takes an optional third argument NOMSG which, if non-nil, - prevents load from printing a message when it starts and when - it is done. - -* byte-recompile-directory is a new function which finds all - the .elc files in a directory, and regenerates each one which - is older than the corresponding .el (Lisp source) file. - ----------------------------------------------------------------------- -Copyright information: - -Copyright (C) 1985 Richard M. Stallman - - 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 this permission notice are preserved, - thus giving the recipient permission to redistribute in turn. - - 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 changed them. - -Local variables: -mode: text -end: - -arch-tag: c006f958-d769-44c7-a9f4-e2faf070624d diff --git a/etc/ONEWS.4 b/etc/ONEWS.4 deleted file mode 100644 index f3da0d6e62b..00000000000 --- a/etc/ONEWS.4 +++ /dev/null @@ -1,1693 +0,0 @@ -GNU Emacs NEWS -- history of user-visible changes. 1992. -Copyright (C) 1992 Free Software Foundation, Inc. -See the end for copying conditions. - -For older news, see the file ONEWS.3. - -Changes in version 18.58. - -* RMAIL reply now properly parses nested comments in addesses. - -* The "visual bell" feature when used with X windows -now flashes only 1/4 of the window's total area. This is because -flashing the whole window is too slow on some systems. - -* `call-process' and `call-process-region' now return an indication -of the exit status of the subprocess: either a numeric exit code -or a string describing the signal which caused termination. - -* It is possible for regular expression matching to overflow the stack -of failure points. In the past, such overflow was treated as simple -failure to match. Now it causes an error. - -* You can use C-u to end a numeric argument. Thus, type C-u 1 0 0 C-u 1 -to insert 100 1's. - -* Emacs now knows how to get resource values from the X server. - -* Job control commands in shell mode work properly on more systems -because they now work by "typing" signal characters such as C-c. - -* copy-keymap no longer recursively copies keymaps reached through -symbols' function definitions (i.e., those that have names). It does -copy nested keymaps that appear directly in the other copied keymaps. - -Changes in version 18.56. - -* C-g should now work to interrupt a running program -on all kinds of systems even when using X windows. - -* Quitting is inhibited while a filter or sentinel is running. -Those functions can run asynchronously while Emacs is waiting -for keyboard input, and if they allow quitting, they -make the behavior of C-g unpredictable. - -* Storing text into the X windows cut buffer -now clears out any selection. - -* The undo facility is completely rewritten, and now -uses Lisp data structures. It can record much more -information. You can use the variables undo-threshold -and undo-high-threshold to control how much. - -* There is no longer a maximum screen height or width. - -Changes in version 18.52. - -* X windows version 10 is supported under system V. - -* Pop-up menus are now supported with the same Lisp interface in -both version 10 and 11 of X windows. - -* C-x 4 a is a new command to edit a change-log entry in another window. - -* The emacs client program now allows an option +NNN to specify the -line number to go to in the file whose name follows. Thus, - emacsclient foo.c +45 bar.c -will find the files `foo.c' and `bar.c', going to line 45 in `bar.c'. - -* Dired allows empty directories to be deleted like files. - -* When the terminal type is used to find a terminal-specific file to -run, Emacs now tries the entire terminal type first. If that doesn't -yield a file that exists, the last hyphen and what follows it is -stripped. If that doesn't yield a file that exists, the previous -hyphen is stripped, and so on until all hyphens are gone. For -example, if the terminal type is `aaa-48-foo', Emacs will try first -`term/aaa-48-foo.el', then `term/aaa-48.el' and finally `term/aaa.el'. - -Underscores now receive the same treatment as hyphens. - -* Texinfo features: @defun, etc. texinfo-show-structure. -New template commands. texinfo-format-region. - -* The special "local variable" `eval' is now ignored if you are running -as root. - -* New command `c-macro-expand' shows the result of C macro expansion -in the region. It works using the C preprocessor, so its results -are completely accurate. - -* Errors in trying to auto save now flash error messages for a few seconds. - -* Killing a buffer now sends SIGHUP to the buffer's process. - -* New hooks. - -** `spell-region' now allows you to filter the text before spelling-checking. -If the value of `spell-filter' is non-nil, it is called, with no arguments, -looking at a temporary buffer containing a copy of the text to be checked. -It can alter the text freely before the spell program sees it. - -** The variable `lpr-command' now specifies the command to be used when -you use the commands to print text (such as M-x print-buffer). - -** Posting netnews now calls the value of `news-inews-hook' (if not nil) -as a function of no arguments before the actual posting. - -** Rmail now calls the value of `rmail-show-message-hook' (if not nil) -as a function of no arguments, each time a new message is selected. - -** `kill-emacs' calls the value of `kill-emacs-hook' as a function of no args -unless Emacs is running in batch mode. - -* New libraries. -See the source code of each library for more information. - -** icon.el: a major mode for editing programs written in Icon. - -** life.el: a simulator for the cellular automaton "life". Load the -library and run M-x life. - -** doctex.el: a library for converting the Emacs `etc/DOC' file of -documentation strings into TeX input. - -** saveconf.el: a library which records the arrangement of windows and -buffers when you exit Emacs, and automatically recreates the same -setup the next time you start Emacs. - -** uncompress.el: a library that automatically uncompresses files -when you visit them. - -** c-fill.el: a mode for editing filled comments in C. - -** kermit.el: an extended version of shell-mode designed for running kermit. - -** spook.el: a library for adding some "distract the NSA" keywords to every -message you send. - -** hideif.el: a library for hiding parts of a C program based on preprocessor -conditionals. - -** autoinsert.el: a library to put in some initial text when you visit -a nonexistent file. The text used depends on the major mode, and -comes from a directory of files created by you. - -* New programming features. - -** The variable `window-system-version' now contains the version number -of the window system you are using (if appropriate). When using X windows, -its value is either 10 or 11. - -** (interactive "N") uses the prefix argument if any; otherwise, it reads -a number using the minibuffer. - -** VMS: there are two new functions `vms-system-info' and `shrink-to-icon'. -The former allows you to get many kinds of system status information. -See its self-documentation for full details. -The second is used with the window system: it iconifies the Emacs window. - -** VMS: the new function `define-logical-name' allows you to create -job-wide logical names. The old function `define-dcl-symbol' has been -removed. - -Changes in version 18.50. - -* X windows version 11 is supported. - -Define X11 in config.h if you want X version 11 instead of version 10. - -* The command M-x gdb runs the GDB debugger as an inferior. -It asks for the filename of the executable you want to debug. - -GDB runs as an inferior with I/O through an Emacs buffer. All the -facilities of Shell mode are available. In addition, each time your -program stops, and each time you select a new stack frame, the source -code is displayed in another window with an arrow added to the line -where the program is executing. - -Special GDB-mode commands include M-s, M-n, M-i, M-u, M-d, and C-c C-f -which send the GDB commands `step', `next', `stepi', `up', `down' -and `finish'. - -In any source file, the commands C-x SPC tells GDB to set a breakpoint -on the current line. - -* M-x calendar displays a three-month calendar. - -* C-u 0 C-x C-s never makes a backup file. - -This is a way you can explicitly request not to make a backup. - -* `term-setup-hook' is for users only. - -Emacs never uses this variable for internal purposes, so you can freely -set it in your `.emacs' file to make Emacs do something special after -loading any terminal-specific setup file from `lisp/term'. - -* `copy-keymap' now copies recursive submaps. - -* New overlay-arrow feature. - -If you set the variable `overlay-arrow-string' to a string -and `overlay-arrow-position' to a marker, that string is displayed on -the screen at the position of that marker, hiding whatever text would -have appeared there. If that position isn't on the screen, or if -the buffer the marker points into isn't displayed, there is no effect. - -* -batch mode can read from the terminal. - -It now works to use `read-char' to do terminal input in a noninteractive -Emacs run. End of file causes Emacs to exit. - -* Variables `data-bytes-used' and `data-bytes-free' removed. - -These variables cannot really work because the 24-bit range of an -integer in (most ports of) GNU Emacs is not large enough to hold their -values on many systems. - -Changes in version 18.45, since version 18.41. - -* C indentation parameter `c-continued-brace-offset'. - -This parameter's value is added to the indentation of any -line that is in a continuation context and starts with an open-brace. -For example, it applies to the open brace shown here: - - if (x) - { - -The default value is zero. - -* Dabbrev expansion (Meta-/) preserves case. - -When you use Meta-/ to search the buffer for an expansion of an -abbreviation, if the expansion found is all lower case except perhaps -for its first letter, then the case pattern of the abbreviation -is carried over to the expansion that replaces it. - -* TeX-mode syntax. - -\ is no longer given "escape character" syntax in TeX mode. It now -has the syntax of an ordinary punctuation character. As a result, -\[...\] and such like are considered to balance each other. - -* Mail-mode automatic Reply-to field. - -If the variable `mail-default-reply-to' is non-`nil', then each time -you start to compose a message, a Reply-to field is inserted with -its contents taken from the value of `mail-default-reply-to'. - -* Where is your .emacs file? - -If you run Emacs under `su', so your real and effective uids are -different, Emacs uses the home directory associated with the real uid -(the name you actually logged in under) to find the .emacs file. - -Otherwise, Emacs uses the environment variable HOME to find the .emacs -file. - -The .emacs file is not loaded at all if -batch is specified. - -* Prolog mode is the default for ".pl" files. - -* File names are not case-sensitive on VMS. - -On VMS systems, all file names that you specify are converted to upper -case. You can use either upper or lower case indiscriminately. - -* VMS-only function 'define-dcl-symbol'. - -This is a new name for the function formerly called -`define-logical-name'. - -Editing Changes in Emacs 18 - -* Additional systems and machines are supported. - -GNU Emacs now runs on Vax VMS. However, many facilities that are normally -implemented by running subprocesses do not work yet. This includes listing -a directory and sending mail. There are features for running subprocesses -but they are incompatible with those on Unix. I hope that some of -the VMS users can reimplement these features for VMS (compatibly for -the user, if possible). - -VMS wizards are also asked to work on making the subprocess facilities -more upward compatible with those on Unix, and also to rewrite their -internals to use the same Lisp objects that are used on Unix to -represent processes. - -In addition, the TI Nu machine running Unix system V, the AT&T 3b, and -the Wicat, Masscomp, Integrated Solutions, Alliant, Amdahl uts, Mips, -Altos 3068 and Gould Unix systems are now supported. The IBM PC-RT is -supported under 4.2, but not yet under system V. The GEC 93 is close -to working. The port for the Elxsi is partly merged. See the file -MACHINES for full status information and machine-specific installation -advice. - -* Searching is faster. - -Forward search for a text string, or for a regexp that is equivalent -to a text string, is now several times faster. Motion by lines and -counting lines is also faster. - -* Memory usage improvements. - -It is no longer possible to run out of memory during garbage -collection. As a result, running out of memory is never fatal. This -is due to a new garbage collection algorithm which compactifies -strings in place rather than copying them. Another consequence of the -change is a reduction in total memory usage and a slight increase in -garbage collection speed. - -* Display changes. - -** Editing above top of screen. - -When you delete or kill or alter text that reaches to the top of the -screen or above it, so that display would start in the middle of a -line, Emacs will usually attempt to scroll the text so that display -starts at the beginning of a line again. - -** Yanking in the minibuffer. - -The message "Mark Set" is no longer printed when the minibuffer is -active. This is convenient with many commands, including C-y, that -normally print such a message. - -** Cursor appears in last line during y-or-n questions. - -Questions that want a `y' or `n' answer now move the cursor -to the last line, following the question. - -* Library loading changes. - -`load' now considers all possible suffixes (`.elc', `.el' and none) -for each directory in `load-path' before going on to the next directory. -It now accepts an optional fourth argument which, if non-nil, says to -use no suffixes; then the file name must be given in full. The search -of the directories in `load-path' goes on as usual in this case, but -it too can be prevented by passing an absolute file name. - -The value of `load-path' no longer by default includes nil (meaning to -look in the current default directory). The idea is that `load' should -be used to search the path only for libraries to be found in the standard -places. If you want to override system libraries with your own, place -your own libraries in one special directory and add that directory to the -front of `load-path'. - -The function `load' is no longer a command; that is to say, `M-x load' -is no longer allowed. Instead, there are two commands for loading files. -`M-x load-library' is equivalent to the old meaning of `M-x load'. -`M-x load-file' reads a file name with completion and defaulting -and then loads exactly that file, with no searching and no suffixes. - -* Emulation of other editors. - -** `edt-emulation-on' starts emulating DEC's EDT editor. - -Do `edt-emulation-off' to return Emacs to normal. - -** `vi-mode' and `vip-mode' starts emulating vi. - -These are two different vi emulations provided by GNU Emacs users. -We are interested in feedback as to which emulation is preferable. - -See the documentation and source code for these functions -for more information. - -** `set-gosmacs-bindings' emulates Gosling Emacs. - -This command changes many global bindings to resemble those of -Gosling Emacs. The previous bindings are saved and can be restored using -`set-gnu-bindings'. - -* Emulation of a display terminal. - -Within Emacs it is now possible to run programs (such as emacs or -supdup) which expect to do output to a visual display terminal. - -See the function `terminal-emulator' for more information. - -* New support for keypads and function keys. - -There is now a first attempt at terminal-independent support for -keypad and function keys. - -Emacs now defines a standard set of key-names for function and keypad -keys, and provides standard hooks for defining them. Most of the -standard key-names have default definitions built into Emacs; you can -override these in a terminal-independent manner. The default definitions -and the conventions for redefining them are in the file `lisp/keypad.el'. - -These keys on the terminal normally work by sending sequences of -characters starting with ESC. The exact sequences used vary from -terminal to terminal. Emacs interprets them in two stages: -in the first stage, terminal-dependent sequences are mapped into -the standard key-names; then second stage maps the standard key-names -into their definitions in a terminal-independent fashion. - -The terminal-specific file `term/$TERM.el' now is responsible only for -establishing the mapping from the terminal's escape sequences into -standard key-names. It no longer knows what Emacs commands are -assigned to the standard key-names. - -One other change in terminal-specific files: if the value of the TERM -variable contains a hyphen, only the part before the first hyphen is -used in forming the name of the terminal-specific file. Thus, for -terminal type `aaa-48', the file loaded is now `term/aaa.el' rather -than `term/aaa-48.el'. - -* New startup command line options. - -`-i FILE' or `-insert FILE' in the command line to Emacs tells Emacs to -insert the contents of FILE into the current buffer at that point in -command line processing. This is like using the command M-x insert-file. - -`-funcall', `-load', `-user' and `-no-init-file' are new synonyms for -`-f', `-l', `-u' and `-q'. - -`-nw' means don't use a window system. If you are using a terminal -emulator on the X window system and you want to run Emacs to work through -the terminal emulator instead of working directly with the window system, -use this switch. - -* Buffer-sorting commands. - -Various M-x commands whose names start with `sort-' sort parts of -the region: - -sort-lines divides the region into lines and sorts them alphabetically. -sort-pages divides into pages and sorts them alphabetically. -sort-paragraphs divides into paragraphs and sorts them alphabetically. -sort-fields divides into lines and sorts them alphabetically - according to one field in the line. - The numeric argument specifies which field (counting - from field 1 at the beginning of the line). Fields in a line - are separated by whitespace. -sort-numeric-fields - is similar but converts the specified fields to numbers - and sorts them numerically. -sort-columns divides into lines and sorts them according to the contents - of a specified range of columns. - -Refer to the self-documentation of these commands for full usage information. - -* Changes in various commands. - -** `occur' output now serves as a menu. `occur-menu' command deleted. - -`M-x occur' now allows you to move quickly to any of the occurrences -listed. Select the `*Occur*' buffer that contains the output of `occur', -move point to the occurrence you want, and type C-c C-c. -This will move point to the same occurrence in the buffer that the -occurrences were found in. - -The command `occur-menu' is thus obsolete, and has been deleted. - -One way to get a list of matching lines without line numbers is to -copy the text to another buffer and use the command `keep-lines'. - -** Incremental search changes. - -Ordinary and regexp incremental searches now have distinct default -search strings. Thus, regexp searches recall only previous regexp -searches. - -If you exit an incremental search when the search string is empty, -the old default search string is kept. The default does not become -empty. - -Reversing the direction of an incremental search with C-s or C-r -when the search string is empty now does not get the default search -string. It leaves the search string empty. A second C-s or C-r -will get the default search string. As a result, you can do a reverse -incremental regexp search with C-M-s C-r. - -If you add a `*', `?' or `\|' to an incremental search regexp, -point will back up if that is appropriate. For example, if -you have searched for `ab' and add a `*', point moves to the -first match for `ab*', which may be before the match for `ab' -that was previously found. - -If an incremental search is failing and you ask to repeat it, -it will start again from the beginning of the buffer (or the end, -if it is a backward search). - -The search-controlling parameters `isearch-slow-speed' and -`isearch-slow-window-lines' have now been renamed to start with -`search' instead of `isearch'. Now all the parameters' names start -with `search'. - -If `search-slow-window-lines' is negative, the slow search window -is put at the top of the screen, and the absolute value or the -negative number specifies the height of it. - -** Undo changes - -The undo command now will mark the buffer as unmodified only when it is -identical to the contents of the visited file. - -** C-M-v in minibuffer. - -If while in the minibuffer you request help in a way that uses a -window to display something, then until you exit the minibuffer C-M-v -in the minibuffer window scrolls the window of help. - -For example, if you request a list of possible completions, C-M-v can -be used reliably to scroll the completion list. - -** M-TAB command. - -Meta-TAB performs completion on the Emacs Lisp symbol names. The sexp -in the buffer before point is compared against all existing nontrivial -Lisp symbols and completed as far as is uniquely determined by them. -Nontrivial symbols are those with either function definitions, values -or properties. - -If there are multiple possibilities for the very next character, a -list of possible completions is displayed. - -** Dynamic abbreviation package. - -The new command Meta-/ expands an abbreviation in the buffer before point -by searching the buffer for words that start with the abbreviation. - -** Changes in saving kbd macros. - -The commands `write-kbd-macro' and `append-kbd-macro' have been -deleted. The way to save a keyboard macro is to use the new command -`insert-kbd-macro', which inserts Lisp code to define the macro as -it is currently defined into the buffer before point. Visit a Lisp -file such as your Emacs init file `~/.emacs', insert the macro -definition (perhaps deleting an old definition for the same macro) -and then save the file. - -** C-x ' command. - -The new command C-x ' (expand-abbrev) expands the word before point as -an abbrev, even if abbrev-mode is not turned on. - -** Sending to inferior Lisp. - -The command C-M-x in Lisp mode, which sends the current defun to -an inferior Lisp process, now works by writing the text into a temporary -file and actually sending only a `load'-form to load the file. -As a result, it avoids the Unix bugs that used to strike when the -text was above a certain length. - -With a prefix argument, this command now makes the inferior Lisp buffer -appear on the screen and scrolls it so that the bottom is showing. - -Two variables `inferior-lisp-load-command' and `inferior-lisp-prompt', -exist to customize these feature for different Lisp implementations. - -** C-x n p now disabled. - -The command C-x n p, a nonrecomended command which narrows to the current -page, is now initially disabled like C-x n n. - -* Dealing with files. - -** C-x C-v generalized - -This command is now allowed even if the current buffer is not visiting -a file. As usual, it kills the current buffer and replaces it with a -newly found file. - -** M-x recover-file improved; auto save file names changed. - -M-x recover-file now checks whether the last auto-save file is more -recent than the real visited file before offering to read in the -auto-save file. If the auto-save file is newer, a directory listing -containing the two files is displayed while you are asked whether you -want the auto save file. - -Visiting a file also makes this check. If the auto-save file is more recent, -a message is printed suggesting that you consider using M-x recover file. - -Auto save file names now by default have a `#' at the end as well -as at the beginning. This is so that `*.c' in a shell command -will never match auto save files. - -On VMS, auto save file names are made by appending `_$' at the front -and `$' at the end. - -When you change the visited file name of a buffer, the auto save file -is now renamed to belong to the new visited file name. - -You can customize the way auto save file names are made by redefining -the two functions `make-auto-save-file-name' and `auto-save-file-name-p', -both of which are defined in `files.el'. - -** Modifying a buffer whose file is changed on disk is detected instantly. - -On systems where clash detection (locking of files being edited) is -implemented, Emacs also checks the first time you modify a buffer -whether the file has changed on disk since it was last visited or saved. -If it has, you are asked to confirm that you want to change the buffer. - -** Exiting Emacs offers to save `*mail*'. - -Emacs can now know about buffers that it should offer to save on exit -even though they are not visiting files. This is done for any buffer -which has a non-nil local value of `buffer-offer-save'. By default, -Mail mode provides such a local value. - -** Backup file changes. - -If a backup file cannot be written in the directory of the visited file -due to fascist file protection, a backup file is now written in your home -directory as `~/%backup%~'. Only one such file is made, ever, so only -the most recently made such backup is available. - -When backup files are made by copying, the last-modification time of the -original file is now preserved in the backup copy. - -** Visiting remote files. - -On an internet host, you can now visit and save files on any other -internet host directly from Emacs with the commands M-x ftp-find-file -and M-x ftp-write-file. Specify an argument of the form HOST:FILENAME. -Since standard internet FTP is used, the other host may be any kind -of machine and is not required to have any special facilities. - -The first time any one remote host is accessed, you will be asked to -give the user name and password for use on that host. FTP is reinvoked -each time you ask to use it, but previously specified user names and -passwords are remembered automatically. - -** Dired `g' command. - -`g' in Dired mode is equivalent to M-x revert-buffer; it causes the -current contents of the same directory to be read in. - -* Changes in major modes. - -** C mode indentation change. - -The binding of Linefeed is no longer changed by C mode. It once again -has its normal meaning, which is to insert a newline and then indent -afterward. - -The old definition did one additional thing: it reindented the line -before the new newline. This has been removed because it made the -command twice as slow. The only time it was really useful was after the -insertion of an `else', since the fact of starting with `else' may change -the way that line is indented. Now you will have to type TAB again -yourself to reindent the `else' properly. - -If the variable `c-tab-always-indent' is set to `nil', the TAB command -in C mode, with no argument, will just insert a tab character if there -is non-whitespace preceding point on the current line. Giving it a -prefix argument will force reindentation of the line (as well as -of the compound statement that begins after point, if any). - -** Fortran mode now exists. - -This mode provides commands for motion and indentation of Fortran code, -plus built-in abbrevs for Fortran keywords. For details, see the manual -or the on-line documentation of the command `fortran-mode'. - -** Scribe mode now exists. - -This mode does something useful for editing files of Scribe input. -It is used automatically for files with names ending in ".mss". - -** Modula2 and Prolog modes now exist. - -These modes are for editing programs in the languages of the same names. -They can be selected with M-x modula-2-mode and M-x prolog-mode. - -** Telnet mode changes. - -The telnet mode special commands have now been assigned to C-c keys. -Most of them are the same as in Shell mode. - -** Picture mode changes. - -The special picture-mode commands to specify the direction of cursor -motion after insertion have been moved to C-c keys. The commands to -specify diagonal motion were already C-c keys; they are unchanged. -The keys to specify horizontal or vertical motion are now -C-c < (left), C-c > (right), C-c ^ (up) and C-c . (down). - -** Nroff mode comments. - -Comments are now supported in Nroff mode. The standard comment commands -such as M-; and C-x ; know how to insert, align and delete comments -that start with backslash-doublequote. - -** LaTeX mode. - -LaTeX mode now exists. Use M-x latex-mode to select this mode, and -M-x plain-tex-mode to select the previously existing mode for Plain -TeX. M-x tex-mode attempts to examine the contents of the buffer and -choose between latex-mode and plain-tex-mode accordingly; if the -buffer is empty or it cannot tell, the variable `TeX-default-mode' -controls the choice. Its value should be the symbol for the mode to -be used. - -The facilities for running TeX on all or part of the buffer -work with LaTeX as well. - -Some new commands available in both modes: - -C-c C-l recenter the window showing the TeX output buffer - so most recent line of output can be seen. -C-c C-k kill the TeX subprocess. -C-c C-q show the printer queue. -C-c C-f close a block (appropriate for LaTeX only). - If the current line contains a \begin{...}, - this inserts an \end{...} on the following line - and puts point on a blank line between them. - -** Outline mode changes. - -Invisible lines in outline mode are now indicated by `...' at the -end of the previous visible line. - -The special outline heading motion commands are now all on C-c keys. -A few new ones have been added. Here is a full list: - -C-c C-n Move to next visible heading (formerly M-}) -C-c C-p Move to previous visible heading (formerly M-{) -C-c C-f Move to next visible heading at the same level. - Thus, if point is on a level-2 heading line, - this command moves to the next visible level-2 heading. -C-c C-b Move to previous visible heading at the same level. -C-c C-u Move up to previous visible heading at a higher level. - -The variable `outline-regexp' now controls recognition of heading lines. -Any line whose beginning matches this regexp is a heading line. -The depth in outline structure is determined by the length of -the string that matches. - -A line starting with a ^L (formfeed) is now by default considered -a header line. - -* Mail reading and sending. - -** MH-E changes. - -MH-E has been extensively modified and improved since the v17 release. -It contains many new features, including commands to: extracted failed -messages, kill a draft message, undo changes to a mail folder, monitor -delivery of a letter, print multiple messages, page digests backwards, -insert signatures, and burst digests. Also, many commands have been -made to able to deal with named sequences of messages, instead of -single messages. MH-E also has had numerous bugs fixed and commands -made to run faster. Furthermore, its keybindings have been changed to -be compatible with Rmail and the rest of GNU Emacs. - -** Mail mode changes. - -The C-c commands of mail mode have been rearranged: - -C-c s, C-c c, C-c t and C-c b (move point to various header fields) -have been reassigned as C-c C-f C-s, C-c C-f C-c, C-c C-f C-t and C-c -C-f C-b. C-c C-f is for "field". - -C-c y, C-c w and C-c q have been changed to C-c C-y, C-c C-w and C-c C-q. - -Thus, C-c LETTER is always unassigned. - -** Rmail C-r command changed to w. - -The Rmail command to edit the current message is now `w'. This change -has been made because people frequently type C-r while in Rmail hoping -to do a reverse incremental search. That now works. - -* Rnews changes. - -** Caesar rotation added. - -The function news-caesar-buffer-body performs the rot13 code on the -body of a news message. You can also specify the number to rotate by, -as a prefix argument. The function is bound to C-c C-r in both -News mode and News Reply mode. - -** rmail-output command added. - -The C-o command has been bound to rmail-output in news-mode. -This allows one to append an article to a file which is in either Unix -mail or RMAIL format. - -** news-reply-mode changes. - -The C-c commands of news reply mode have been rearranged and changed, -so that C-c LETTER is always unassigned: - -C-c y, C-c w and C-c q have been changed to C-c C-y, C-c C-w and C-c C-q. - -C-c c, C-c t, and C-c b (move to various mail header fields) have been -deleted (they make no sense for posting and replying to USENET). - -C-c s (move to Subject: header field) has been reassigned as C-c C-f -C-s. C-c C-f is for "field". Several additional move to news header -field commands have been added. - -The local news-reply-mode bindings now look like this: - -C-c C-s news-inews (post the message) C-c C-c news-inews -C-c C-f move to a header field (and create it if there isn't): - C-c C-f C-n move to Newsgroups: C-c C-f C-s move to Subj: - C-c C-f C-f move to Followup-To: C-c C-f C-k move to Keywords: - C-c C-f C-d move to Distribution: C-c C-f C-a move to Summary: -C-c C-y news-reply-yank-original (insert current message, in NEWS). -C-c C-q mail-fill-yanked-message (fill what was yanked). -C-c C-r caesar rotate all letters by 13 places in the article's body (rot13). - -* Changes in tags handling. - -** M-. (`find-tag') and similar commands now look first for an exact -match in the tags table, and try substring matches only afterward. - -** The new command `find-tag-regexp' visits successively the tags that -match a specified regular expression. - -** You can now use more than one tags table. Using `visit-tags-table' -to load a new tags table does not discard the other tables previously -loaded. The other tags commands use all the tags tables that are loaded; -the first tags table used is the one that mentions the current visited file. - -** Tags tables can now be told to "include" other tags tables. This means -the tags table gives the file names of other tags tables. Tags command -then search included tags tables after the including table (but before any -other tags tables you have loaded). Included tags tables can make it much -easier and more efficient to maintain a tags table for a large package with -many subdirectories--there is one tags table for each subdirectory, and a -master tags table that includes each subdirectory table. You use `-i' -options to `etags' when creating the tags table to give the file names of -the included tables. - -** You can now use the tags table for completion of names during -ordinary editing. The command M-TAB (except in Emacs Lisp mode) -completes the identifier in the buffer before point, using the set of -all tags as the list of possible completions. - -** `tags-query-replace' and `tags-search' changes. - -These functions no longer permanently create buffers for files that -are searched but that do not contain any matches for the search -pattern. - -* Existing Emacs usable as a server. - -Programs such as mailers that invoke "the editor" as an inferior -to edit some text can now be told to use an existing Emacs process -instead of creating a new editor. - -To do this, you must have an Emacs process running and capable of -doing terminal I/O at the time you want to invoke it. This means that -either you are using a window system and give Emacs a separate window -or you run the other programs as inferiors of Emacs (such as, using -M-x shell). - -First prepare the existing Emacs process by loading the `server' -library and executing M-x server-start. (Your .emacs can do this -automatically.) - -Now tell the other programs to use, as "the editor", the Emacs client -program (etc/emacsclient, located in the same directory as this file). -This can be done by setting the environment variable EDITOR. - -When another program invokes the emacsclient as "the editor", the -client actually transfers the file names to be edited to the existing -Emacs, which automatically visits the files. - -When you are done editing a buffer for a client, do C-x # (server-edit). -This marks that buffer as done, and selects the next buffer that the client -asked for. When all the buffers requested by a client are marked in this -way, Emacs tells the client program to exit, so that the program that -invoked "the editor" will resume execution. - -You can only have one server Emacs at a time, but multiple client programs -can put in requests at the same time. - -The client/server work only on Berkeley Unix, since they use the Berkeley -sockets mechanism for their communication. - -Changes in Lisp programming in Emacs version 18. - -* Init file changes. - -** Suffixes no longer accepted on `.emacs'. - -Emacs will no longer load a file named `.emacs.el' or `emacs.elc' -in place of `.emacs'. This is so that it will take less time to -find `.emacs'. If you want to compile your init file, give it another -name and make `.emacs' a link to the `.elc' file, or make it contain -a call to `load' to load the `.elc' file. - -** `default-profile' renamed to `default', and loaded after `.emacs'. - -It used to be the case that the file `default-profile' was loaded if -and only if `.emacs' was not found. - -Now the name `default-profile' is not used at all. Instead, a library -named `default' is loaded after the `.emacs' file. `default' is loaded -whether the `.emacs' file exists or not. However, loading of `default' -can be prevented if the `.emacs' file sets `inhibit-default-init' to non-nil. - -In fact, you would call the default file `default.el' and probably would -byte-compile it to speed execution. - -Note that for most purposes you are better off using a `site-init' library -since that will be loaded before the runnable Emacs is dumped. By using -a `site-init' library, you avoid taking up time each time Emacs is started. - -** inhibit-command-line has been eliminated. - -This variable used to exist for .emacs files to set. It has been -eliminated because you can get the same effect by setting -command-line-args to nil and setting inhibit-startup-message to t. - -* `apply' is more general. - -`apply' now accepts any number of arguments. The first one is a function; -the rest are individual arguments to pass to that function, except for the -last, which is a list of arguments to pass. - -Previously, `apply' required exactly two arguments. Its old behavior -follows as a special case of the new definition. - -* New code-letter for `interactive'. - -(interactive "NFoo: ") is like (interactive "nFoo: ") in reading -a number using the minibuffer to serve as the argument; however, -if a prefix argument was specified, it uses the prefix argument -value as the argument, and does not use the minibuffer at all. - -This is used by the `goto-line' and `goto-char' commands. - -* Semantics of variables. - -** Built-in per-buffer variables improved. - -Several built-in variables which in the past had a different value in -each buffer now behave exactly as if `make-variable-buffer-local' had -been done to them. - -These variables are `tab-width', `ctl-arrow', `truncate-lines', -`fill-column', `left-margin', `mode-line-format', `abbrev-mode', -`overwrite-mode', `case-fold-search', `auto-fill-hook', -`selective-display', `selective-display-ellipses'. - -To be precise, each variable has a default value which shows through -in most buffers and can be accessed with `default-value' and set with -`set-default'. Setting the variable with `setq' makes the variable -local to the current buffer. Changing the default value has retroactive -effect on all buffers in which the variable is not local. - -The variables `default-case-fold-search', etc., are now obsolete. -They now refer to the default value of the variable, which is not -quite the same behavior as before, but it should enable old init files -to continue to work. - -** New per-buffer variables. - -The variables `fill-prefix', `comment-column' and `indent-tabs-mode' -are now per-buffer. They work just like `fill-column', etc. - -** New function `setq-default'. - -`setq-default' sets the default value of a variable, and uses the -same syntax that `setq' accepts: the variable name is not evaluated -and need not be quoted. - -`(setq-default case-fold-search nil)' would make searches case-sensitive -in all buffers that do not have local values for `case-fold-search'. - -You can set multiple variables sequentially, each with its own value, -in `setq-default' just as in `setq'. - -** Functions `global-set' and `global-value' deleted. - -These functions were never used except by mistake by users expecting -the functionality of `set-default' and `default-value'. - -* Changes in defaulting of major modes. - -When `default-major-mode' is `nil', new buffers are supposed to -get their major mode from the buffer that is current. However, -certain major modes (such as Dired mode, Rmail mode, Rmail Summary mode, -and others) are not reasonable to use in this way. - -Now such modes' names have been given non-`nil' `mode-class' properties. -If the current buffer's mode has such a property, Fundamental mode is -used as the default for newly created buffers. - -* `where-is-internal' requires additional arguments. - -This function now accepts three arguments, two of them required: -DEFINITION, the definition to search for; LOCAL-KEYMAP, the keymap -to use as the local map when doing the searching, and FIRST-ONLY, -which is nonzero to return only the first key found. - -This function returns a list of keys (strings) whose definitions -(in the LOCAL-KEYMAP or the current global map) are DEFINITION. - -If FIRST-ONLY is non-nil, it returns a single key (string). - -This function has changed incompatibly in that now two arguments -are required when previously only one argument was allowed. To get -the old behavior of this function, write `(current-local-map)' as -the expression for the second argument. - -The incompatibility is sad, but `nil' is a legitimate value for the -second argument (it means there is no local keymap), so it cannot also -serve as a default meaning to use the current local keymap. - -* Abbrevs with hooks. - -When an abbrev defined with a hook is expanded, it now performs the -usual replacement of the abbrev with the expansion before running the -hook. Previously the abbrev itself was deleted but the expansion was -not inserted. - -* Function `scan-buffer' deleted. - -Use `search-forward' or `search-backward' in place of `scan-buffer'. -You will have to rearrange the arguments. - -* X window interface improvements. - -** Detect release of mouse buttons. - -Button-up events can now be detected. See the file `lisp/x-mouse.el' -for details. - -** New pop-up menu facility. - -The new function `x-popup-menu' pops up a menu (in a X window) -and returns an indication of which selection the user made. -For more information, see its self-documentation. - -* M-x disassemble. - -This command prints the disassembly of a byte-compiled Emacs Lisp function. - -Would anyone like to interface this to the debugger? - -* `insert-buffer-substring' can insert part of the current buffer. - -The old restriction that the text being inserted had to come from -a different buffer is now lifted. - -When inserting text from the current buffer, the text to be inserted -is determined from the specified bounds before any copying takes place. - -* New function `substitute-key-definition'. - -This is a new way to replace one command with another command as the -binding of whatever keys may happen to refer to it. - -(substitute-key-definition OLDDEF NEWDEF KEYMAP) looks through KEYMAP -for keys defined to run OLDDEF, and rebinds those keys to run NEWDEF -instead. - -* New function `insert-char'. - -Insert a specified character, a specified number of times. - -* `mark-marker' changed. - -When there is no mark, this now returns a marker that points -nowhere, rather than `nil'. - -* `ding' accepts argument. - -When given an argument, the function `ding' does not terminate -execution of a keyboard macro. Normally, `ding' does terminate -all macros that are currently executing. - -* New function `minibuffer-depth'. - -This function returns the current depth in minibuffer activations. -The value is zero when the minibuffer is not in use. -Values greater than one are possible if the user has entered the -minibuffer recursively. - -* New function `documentation-property'. - -(documentation-property SYMBOL PROPNAME) is like (get SYMBOL PROPNAME), -except that if the property value is a number `documentation-property' -will take that number (or its absolute value) as a character position -in the DOC file and return the string found there. - -(documentation-property VAR 'variable-documentation) is the proper -way for a Lisp program to get the documentation of variable VAR. - -* New documentation-string expansion feature. - -If a documentation string (for a variable or function) contains text -of the form `\<FOO>', it means that all command names specified in -`\[COMMAND]' construct from that point on should be turned into keys -using the value of the variable FOO as the local keymap. Thus, for example, - - `\<emacs-lisp-mode-map>\[eval-defun] evaluates the defun containing point.' - -will expand into - - "ESC C-x evaluates the defun containing point." - -regardless of the current major mode, because ESC C-x is defined to -run `eval-defun' in the keymap `emacs-lisp-mode-map'. The effect is -to show the key for `eval-defun' in Emacs Lisp mode regardless of the -current major mode. - -The `\<...>' construct applies to all `\[...]' constructs that follow it, -up to the end of the documentation string or the next `\<...>'. - -Without `\<...>', the keys for commands specified in `\[...]' are found -in the current buffer's local map. - -The current global keymap is always searched second, whether `\<...>' -has been used or not. - -* Multiple hooks allowed in certain contexts. - -The old hook variables `find-file-hook', `find-file-not-found-hook' and -`write-file-hook' have been replaced. - -The replacements are `find-file-hooks', `find-file-not-found-hooks' -and `write-file-hooks'. Each holds a list of functions to be called; -by default, `nil', for no functions. The functions are called in -order of appearance in the list. - -In the case of `find-file-hooks', all the functions are executed. - -In the case of `find-file-not-found-hooks', if any of the functions -returns non-`nil', the rest of the functions are not called. - -In the case of `write-file-hooks', if any of the functions returns -non-`nil', the rest of the functions are not called, and the file is -considered to have been written already; so actual writing in the -usual way is not done. If `write-file-hooks' is local to a buffer, -it is set to its global value if `set-visited-file-name' is called -(and thus by C-x C-w as well). - -`find-file-not-found-hooks' and `write-file-hooks' can be used -together to implement editing of files that are not stored as Unix -files: stored in archives, or inside version control systems, or on -other machines running other operating systems and accessible via ftp. - -* New hooks for suspending Emacs. - -Suspending Emacs runs the hook `suspend-hook' before suspending -and the hook `suspend-resume-hook' if the suspended Emacs is resumed. -Running a hook is done by applying the variable's value to no arguments -if the variable has a non-`nil' value. If `suspend-hook' returns -non-`nil', then suspending is inhibited and so is running the -`suspend-resume-hook'. The non-`nil' value means that the `suspend-hook' -has done whatever suspending is required. - -* Disabling commands can print a special message. - -A command is disabled by giving it a non-`nil' `disabled' property. -Now, if this property is a string, it is included in the message -printed when the user tries to run the command. - -* Emacs can open TCP connections. - -The function `open-network-stream' opens a TCP connection to -a specified host and service. Its value is a Lisp object that represents -the connection. The object is a kind of "subprocess", and I/O are -done like I/O to subprocesses. - -* Display-related changes. - -** New mode-line control features. - -The display of the mode line used to be controlled by a format-string -that was the value of the variable `mode-line-format'. - -This variable still exists, but it now allows more general values, -not just strings. Lists, cons cells and symbols are also meaningful. - -The mode line contents are created by outputting various mode elements -one after the other. Here are the kinds of objects that can be -used as mode elements, and what they do in the display: - - string the contents of the string are output to the mode line, - and %-constructs are replaced by other text. - - t or nil ignored; no output results. - - symbol the symbol's value is used. If the value is a string, - the string is output verbatim to the mode line - (so %-constructs are not interpreted). Otherwise, - the symbol's value is processed as a mode element. - - list (whose first element is a string or list or cons cell) - the elements of the list are treated as as mode elements, - so that the output they generate is concatenated, - - list (whose car is a symbol) - if the symbol's value is non-nil, the second element of the - list is treated as a mode element. Otherwise, the third - element (if any) of the list is treated as a mode element. - - cons (whose car is a positive integer) - the cdr of the cons is used as a mode element, but - the text it produces is padded, if necessary, to have - at least the width specified by the integer. - - cons (whose car is a negative integer) - the cdr of the cons is used as a mode element, but - the text it produces is truncated, if necessary, to have - at most the width specified by the integer. - -There is always one mode element to start with, that being the value of -`mode-line-format', but if this value is a list then it leads to several -more mode elements, which can lead to more, and so on. - -There is one new %-construct for mode elements that are strings: -`%n' displays ` Narrow' for a buffer that is narrowed. - -The default value of `mode-line-format' refers to several other variables. -These variables are `mode-name', `mode-line-buffer-identification', -`mode-line-process', `mode-line-modified', `global-mode-string' and -`minor-mode-alist'. The first four are local in every buffer in which they -are changed from the default. - -mode-name Name of buffer's major mode. Local in every buffer. - -mode-line-buffer-identification - Normally the list ("Emacs: %17b"), it is responsible - for displaying text to indicate what buffer is being shown - and what kind of editing it is doing. `Emacs' means - that a file of characters is being edited. Major modes - such as Info and Dired which edit or view other kinds - of data often change this value. This variables becomes - local to the current buffer if it is setq'd. - -mode-line-process - Normally nil, this variable is responsible for displaying - information about the process running in the current buffer. - M-x shell-mode and M-x compile alter this variable. - -mode-line-modified - This variable is responsible for displaying the indication - of whether the current buffer is modified or read-only. - By default its value is `("--%*%*-")'. - -minor-mode-alist - This variable is responsible for displaying text for those - minor modes that are currently enabled. Its value - is a list of elements of the form (VARIABLE STRING), - where STRING is to be displayed if VARIABLE's value - (in the buffer whose mode line is being displayed) - is non-nil. This variable is not made local to particular - buffers, but loading some libraries may add elements to it. - -global-mode-string - This variable is used to display the time, if you ask - for that. - -The idea of these variables is to eliminate the need for major modes -to alter mode-line-format itself. - -** `window-point' valid for selected window. - -The value returned by `window-point' used to be incorrect when its -argument was the selected window. Now the value is correct. - -** Window configurations may be saved as Lisp objects. - -The function `current-window-configuration' returns a special type of -Lisp object that represents the current layout of windows: the -sizes and positions of windows, which buffers appear in them, and -which parts of the buffers appear on the screen. - -The function `set-window-configuration' takes one argument, which must -be a window configuration object, and restores that configuration. - -** New hook `temp-output-buffer-show-hook'. - -This hook allows you to control how help buffers are displayed. -Whenever `with-output-to-temp-buffer' has executed its body and wants -to display the temp buffer, if this variable is bound and non-`nil' -then its value is called with one argument, the temp buffer. -The hook function is solely responsible for displaying the buffer. -The standard manner of display--making the buffer appear in a window--is -used only if there is no hook function. - -** New function `minibuffer-window'. - -This function returns the window used (sometimes) for displaying -the minibuffer. It can be used even when the minibuffer is not active. - -** New feature to `next-window'. - -If the optional second argument is neither `nil' nor `t', the minibuffer -window is omitted from consideration even when active; if the starting -window was the last non-minibuffer window, the value will be the first -non-minibuffer window. - -** New variable `minibuffer-scroll-window'. - -When this variable is non-`nil', the command `scroll-other-window' -uses it as the window to be scrolled. Displays of completion-lists -set this variable to the window containing the display. - -** New argument to `sit-for'. - -A non-nil second argument to `sit-for' means do not redisplay; -just wait for the specified time or until input is available. - -** Deleted function `set-minor-mode'; minor modes must be changed. - -The function `set-minor-mode' has been eliminated. The display -of minor mode names in the mode line is now controlled by the -variable `minor-mode-alist'. To specify display of a new minor -mode, it is sufficient to add an element to this list. Once that -is done, you can turn the mode on and off just by setting a variable, -and the display will show its status automatically. - -** New variable `cursor-in-echo-area'. - -If this variable is non-nil, the screen cursor appears on the -last line of the screen, at the end of the text displayed there. - -Binding this variable to t is useful at times when reading single -characters of input with `read-char'. - -** New per-buffer variable `selective-display-ellipses'. - -If this variable is non-nil, an ellipsis (`...') appears on the screen -at the end of each text line that is followed by invisible text. - -If this variable is nil, no ellipses appear. Then there is no sign -on the screen that invisible text is present. - -Text is made invisible under the control of the variable -`selective-display'; this is how Outline mode and C-x $ work. - -** New variable `no-redraw-on-reenter'. - -If you set this variable non-nil, Emacs will not clear the screen when -you resume it after suspending it. This is for the sake of terminals -with multiple screens of memory, where the termcap entry has been set -up to switch between screens when Emacs is suspended and resumed. - -** New argument to `set-screen-height' or `set-screen-width'. - -These functions now take an optional second argument which says -what significance the newly specified height or width has. - -If the argument is nil, or absent, it means that Emacs should -believe that the terminal height or width really is as just specified. - -If the argument is t, it means Emacs should not believe that the -terminal really is this high or wide, but it should use the -specific height or width as the number of lines or columns to display. -Thus, you could display only 24 lines on a screen known to have 48 lines. - -What practical difference is there between using only 24 lines for display -and really believing that the terminal has 24 lines? - -1. The "real" height of the terminal says what the terminal command -to move the cursor to the last line will do. - -2. The "real" height of the terminal determines how much padding is -needed. - -* File-related changes. - -** New parameter `backup-by-copying-when-mismatch'. - -If this variable is non-`nil', then when Emacs is about to save a -file, it will create the backup file by copying if that would avoid -changing the file's uid or gid. - -The default value of this variable is `nil', because usually it is -useful to have the uid of a file change according to who edited it -last. I recommend thet this variable be left normally `nil' and -changed with a local variables list in those particular files where -the uid needs to be preserved. - -** New parameter `file-precious-flag'. - -If this variable is non-`nil', saving the buffer tries to avoid -leaving an incomplete file due to disk full or other I/O errors. -It renames the old file before saving. If saving is successful, -the renamed file is deleted; if saving gets an error, the renamed -file is renamed back to the name you visited. - -Backups are always made by copying for such files. - -** New variable `buffer-offer-save'. - -If the value of this variable is non-`nil' in a buffer then exiting -Emacs will offer to save the buffer (if it is modified and nonempty) -even if the buffer is not visiting a file. This variable is -automatically made local to the current buffer whenever it is set. - -** `rename-file', `copy-file', `add-name-to-file' and `make-symbolic-link'. - -The third argument to these functions used to be `t' or `nil'; `t' -meaning go ahead even if the specified new file name already has a file, -and `nil' meaning to get an error. - -Now if the third argument is a number it means to ask the user for -confirmation in this case. - -** New optional argument to `copy-file'. - -If `copy-file' receives a non-nil fourth argument, it attempts -to give the new copy the same time-of-last-modification that the -original file has. - -** New function `file-newer-than-file-p'. - -(file-newer-than-file-p FILE1 FILE2) returns non-nil if FILE1 has been -modified more recently than FILE2. If FILE1 does not exist, the value -is always nil; otherwise, if FILE2 does not exist, the value is t. -This is meant for use when FILE2 depends on FILE1, to see if changes -in FILE1 make it necessary to recompute FILE2 from it. - -** Changed function `file-exists-p'. - -This function is no longer the same as `file-readable-p'. -`file-exists-p' can now return t for a file that exists but which -the fascists won't allow you to read. - -** New function `file-locked-p'. - -This function receives a file name as argument and returns `nil' -if the file is not locked, `t' if locked by this Emacs, or a -string giving the name of the user who has locked it. - -** New function `file-name-sans-versions'. - -(file-name-sans-versions NAME) returns a substring of NAME, with any -version numbers or other backup suffixes deleted from the end. - -** New functions for directory names. - -Although a directory is really a kind of file, specifying a directory -uses a somewhat different syntax from specifying a file. -In Emacs, a directory name is used as part of a file name. - -On Unix, the difference is small: a directory name ends in a slash, -while a file name does not: thus, `/usr/rms/' to name a directory, -while `/usr/rms' names the file which holds that directory. - -On VMS, the difference is considerable: `du:[rms.foo]' specifies a -directory, but the name of the file that holds that directory is -`du:[rms]foo.dir'. - -There are two new functions for converting between directory names -and file names. `directory-file-name' takes a directory name and -returns the name of the file in which that directory's data is stored. -`file-name-as-directory' takes the name of a file and returns -the corresponding directory name. These always understand Unix file name -syntax; on VMS, they understand VMS syntax as well. - -For example, (file-name-as-directory "/usr/rms") returns "/usr/rms/" -and (directory-file-name "/usr/rms/") returns "/usr/rms". -On VMS, (file-name-as-directory "du:[rms]foo.dir") returns "du:[rms.foo]" -and (directory-file-name "du:[rms.foo]") returns "du:[rms]foo.dir". - -** Value of `file-attributes' changed. - -The function file-attributes returns a list containing many kinds of -information about a file. Now the list has eleven elements. - -The tenth element is `t' if deleting the file and creating another -file of the same name would result in a change in the file's group; -`nil' if there would be no change. You can also think of this as -comparing the file's group with the default group for files created in -the same directory by you. - -The eleventh element is the inode number of the file. - -** VMS-only function `file-name-all-versions'. - -This function returns a list of all the completions, including version -number, of a specified version-number-less file name. This is like -`file-name-all-completions', except that the latter returns values -that do not include version numbers. - -** VMS-only variable `vms-stmlf-recfm'. - -On a VMS system, if this variable is non-nil, Emacs will give newly -created files the record format `stmlf'. This is necessary for files -that must contain lines of arbitrary length, such as compiled Emacs -Lisp. - -When writing a new version of an existing file, Emacs always keeps -the same record format as the previous version; so this variable has -no effect. - -This variable has no effect on Unix systems. - -** `insert-file-contents' on an empty file. - -This no longer sets the buffer's "modified" flag. - -** New function (VMS only) `define-logical-name': - -(define-logical-name LOGICAL TRANSLATION) defines a VMS logical name -LOGICAL whose translation is TRANSLATION. The new name applies to -the current process only. - -** Deleted variable `ask-about-buffer-names'. - -If you want buffer names for files to be generated in a special way, -you must redefine `create-file-buffer'. - -* Subprocess-related changes. - -** New function `process-list'. - -This function takes no arguments and returns a list of all -of Emacs's asynchronous subprocesses. - -** New function `process-exit-status'. - -This function, given a process, process name or buffer as argument, -returns the exit status code or signal number of the process. -If the process has not yet exited or died, this function returns 0. - -** Process output ignores `buffer-read-only'. - -Output from a process will go into the process's buffer even if the -buffer is read only. - -** Switching buffers in filter functions and sentinels. - -Emacs no longer saves and restore the current buffer around calling -the filter and sentinel functions, so these functions can now -permanently alter the selected buffer in a straightforward manner. - -** Specifying environment variables for subprocesses. - -When a subprocess is started with `start-process' or `call-process', -the value of the variable `process-environment' is taken to -specify the environment variables to give the subprocess. The -value should be a list of strings, each of the form "VAR=VALUE". - -`process-environment' is initialized when Emacs starts up -based on Emacs's environment. - -** New variable `process-connection-type'. - -If this variable is `nil', when a subprocess is created, Emacs uses -a pipe rather than a pty to communicate with it. Normally this -variable is `t', telling Emacs to use a pty if ptys are supported -and one is available. - -** New function `waiting-for-user-input-p'. - -This function, given a subprocess as argument, returns `t' if that -subprocess appears to be waiting for input sent from Emacs, -or `nil' otherwise. - -** New hook `shell-set-directory-error-hook'. - -The value of this variable is called, with no arguments, whenever -Shell mode gets an error trying to keep track of directory-setting -commands (such as `cd' and `pushd') used in the shell buffer. - -* New functions `user-uid' and `user-real-uid'. - -These functions take no arguments and return, respectively, -the effective uid and the real uid of the Emacs process. -The value in each case is an integer. - -* New variable `print-escape-newlines' controls string printing. - -If this variable is non-`nil', then when a Lisp string is printed -by the Lisp printing function `prin1' or `print', newline characters -are printed as `\n' rather than as a literal newline. - -* New function `sysnetunam' on HPUX. - -This function takes two arguments, a network address PATH and a -login string LOGIN, and executes the system call `netunam'. -It returns `t' if the call succeeds, otherwise `nil'. - -News regarding installation: - -* Many `s-...' file names changed. - -Many `s-...' files have been renamed. All periods in such names, -except the ones just before the final `h', have been changed to -hyphens. Thus, `s-bsd4.2.h' has been renamed to `s-bsd4-2.h'. - -This is so a Unix distribution can be moved mechanically to VMS. - -* `DOCSTR...' file now called `DOC-...'. - -The file of on-line documentation strings, that used to be -`DOCSTR.mm.nn.oo' in this directory, is now called `DOC-mm.nn.oo'. -This is so that it can port to VMS using the standard conventions -for translating filenames for VMS. - -This file also now contains the doc strings for variables as -well as functions. - -* Emacs no longer uses floating point arithmetic. - -This may make it easier to port to some machines. - -* Macros `XPNTR' and `XSETPNTR'; flag `DATA_SEG_BITS'. - -These macros exclusively are used to unpack a pointer from a Lisp_Object -and to insert a pointer into a Lisp_Object. Redefining them may help -port Emacs to machines in which all pointers to data objects have -certain high bits set. - -If `DATA_SEG_BITS' is defined, it should be a number which contains -the high bits to be inclusive or'ed with pointers that are unpacked. - -* New flag `HAVE_X_MENU'. - -Define this flag in `config.h' in addition to `HAVE_X_WINDOWS' -to enable use of the Emacs interface to X Menus. On some operating -systems, the rest of the X interface works properly but X Menus -do not work; hence this separate flag. See the file `src/xmenu.c' -for more information. - -* Macros `ARRAY_MARK_FLAG' and `DONT_COPY_FLAG'. - -* `HAVE_ALLOCA' prevents assembly of `alloca.s'. - -* `SYSTEM_MALLOC' prevents use of GNU `malloc.c'. - -SYSTEM_MALLOC, if defined, means use the system's own `malloc' routines -rather than those that come with Emacs. - -Use this only if absolutely necessary, because if it is used you do -not get warnings when space is getting low. - -* New flags to control unexec. - -See the file `unexec.c' for a long comment on the compilation -switches that suffice to make it work on many machines. - -* `PNTR_COMPARISON_TYPE' - -Pointers that need to be compared for ordering are converted to this type -first. Normally this is `unsigned int'. - -* `HAVE_VFORK', `HAVE_DUP2' and `HAVE_GETTIMEOFDAY'. - -These flags just say whether certain system calls are available. - -* New macros control compiler switches, linker switches and libraries. - -The m- and s- files can now control in a modular fashion the precise -arguments passed to `cc' and `ld'. - -LIBS_STANDARD defines the standard C libraries. Default is `-lc'. -LIBS_DEBUG defines the extra libraries to use when debugging. Default `-lg'. -LIBS_SYSTEM can be defined by the s- file to specify extra libraries. -LIBS_MACHINE can be defined by the m- file to specify extra libraries. -LIBS_TERMCAP defines the libraries for Termcap or Terminfo. - It is defined by default in a complicated fashion but the m- or s- file - can override it. - -LD_SWITCH_SYSTEM can be defined by the s- file to specify extra `ld' switches. - The default is `-X' on BSD systems except those few that use COFF object files. -LD_SWITCH_MACHINE can be defined by the m- file to specify extra `ld' switches. - -C_DEBUG_SWITCH defines the switches to give `cc' when debugging. Default `-g'. -C_OPTIMIZE_SWITCH defines the switches to give `cc' to optimize. Default `-O'. -C_SWITCH_MACHINE can be defined by the m- file to specify extra `cc' switches. - -For older news, see the file ONEWS.3. - ----------------------------------------------------------------------- -Copyright information: - -Copyright (C) 1992 Free Software Foundation, Inc. - - 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 this permission notice are preserved, - thus giving the recipient permission to redistribute in turn. - - 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 changed them. - -Local variables: -mode: text -end: - -arch-tag: 373312be-99a8-46d5-bcb0-a62577ab5045 diff --git a/etc/ORDERS b/etc/ORDERS index c29e6b101f3..55d222c17cb 100644 --- a/etc/ORDERS +++ b/etc/ORDERS @@ -7,3 +7,8 @@ further development of Emacs and other free software programs. You can also make tax-deductable donations to the Free Software Foundation, a not-for-profit organization (assuming you pay US taxes) - see <http://www.gnu.org/help/donate.html>. + +Copyright (c) 2000, 2001, 2006 Free Software Foundation, Inc. + +Verbatim copying and distribution is permitted in any medium +provided this notice is preserved. diff --git a/etc/PROBLEMS b/etc/PROBLEMS index 6435bd2e673..f42f9565cf6 100644 --- a/etc/PROBLEMS +++ b/etc/PROBLEMS @@ -1694,7 +1694,7 @@ keys can serve as Meta. The `xkeycaps' also shows a visual representation of the current keyboard settings. It also allows to modify them. -*** GNU/Linux: low startup on Linux-based GNU systems. +*** GNU/Linux: slow startup on Linux-based GNU systems. People using systems based on the Linux kernel sometimes report that startup takes 10 to 15 seconds longer than `usual'. diff --git a/etc/README b/etc/README index 1d476a0620c..856f8cdfcd4 100644 --- a/etc/README +++ b/etc/README @@ -11,3 +11,19 @@ without installing the modified TeX versions. `termcap.src' is included mainly for VMS. It is a copy of the `/etc/termcap' file used on Unix. + +Copyright (c) 1992, 1995, 2001, 2006 +Free Software Foundation, Inc. + + +COPYING PERMISSIONS: + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this file, to deal in the file without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the file, and to + permit persons to whom the file is furnished to do so, subject to + the following condition: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the file. diff --git a/etc/SERVICE b/etc/SERVICE index 40b12ac4a01..e97196d7c95 100644 --- a/etc/SERVICE +++ b/etc/SERVICE @@ -2,6 +2,8 @@ GNU Service Directory --------------------- +See the end of file for copyright information. + This is a list of people who have asked to be listed as offering support services for GNU software, including GNU Emacs, for a fee or in some cases at no charge. @@ -1365,4 +1367,12 @@ A current version should be available on our web site at http://www.gnu.org. ** Please keep the entries in this file alphabetical ** + +Copyright (c) 2000, 2004, 2005, 2006 +Free Software Foundation + + Verbatim copying and distribution of this document are permitted + worldwide, without royalty, in any medium, provided this notice is + preserved. + arch-tag: 1253ce32-1cbd-428a-ac36-70ed9e3999fc diff --git a/etc/TERMS b/etc/TERMS index dd447259710..4b34a45d676 100644 --- a/etc/TERMS +++ b/etc/TERMS @@ -1,3 +1,7 @@ +Copyright (c) 1999, 2003, 2006 +Free software Foundation, Inc. +See the end of the file for copying permissions. + This file describes what you must or might want to do to termcap entries to make terminals work properly and efficiently with Emacs. Information on likely problems with specific types of terminals appears at the end @@ -227,3 +231,20 @@ AT386|at386|386AT|386at|at/386 console, AT386-UL|at386-ul|386AT-UL|386at-ul|at/386 console, is2=\E[0;10;38m, use=at386, + + +COPYING PERMISSIONS: + + This document 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 2 of the License, or + (at your option) any later version. + + This program 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. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA @@ -1,4 +1,8 @@ - -*-outline-*- +Emacs TODO List -*-outline-*- + +Copyright (c) 2003, 2004, 2005, 2006 +Free software Foundation, Inc. +See the end of the file for copying permissions. If you are ready to start working on any of these TODO items, we appreciate your help; please write to emacs-devel@gnu.org so we can be @@ -9,6 +13,10 @@ to the FSF. * Small but important fixes needed in existing features: +** In C-x d, the default if you type RET should be the directory name, +but if you type M-n you should get the visited file name of the +current buffer. + ** whitespace-cleanup should work only on the region if the region is active. ** Distribute a bar cursor of width > 1 evenly between the two glyphs @@ -135,6 +143,8 @@ to the FSF. * Other features we would like: +** Remove the default toggling behavior of minor modes when called from elisp +rather than interactively. This a trivial one-liner in easy-mode.el. ** Create a category of errors called `user-error' for errors which are typically due to pilot errors and should thus be in debug-ignored-errors. @@ -484,4 +494,16 @@ not be noticed if it appears within a word. ** Fix unexelf.c to handle the .data.rel and .data.rel.local sections made by GCC 3.4 on IRIX. +COPYING PERMISSIONS: + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this file, to deal in the file without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the file, and to + permit persons to whom the file is furnished to do so, subject to + the following condition: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the file. + ;;; arch-tag: b0a3e40b-726a-457d-9999-ba848321b036 diff --git a/etc/Xkeymap.txt b/etc/Xkeymap.txt index fcdbbf43215..dca688bd701 100644 --- a/etc/Xkeymap.txt +++ b/etc/Xkeymap.txt @@ -1,5 +1,10 @@ # -*-Mode: Fundamental-*- # X keymap file for rlk with some emacsified bindings +# +# Copyright (c) 1999, 2003, 2006 +# Free software Foundation, Inc. +# See the end of the file for copying conditions. +# # This file contains the default keyboard mapping. The first column contains a X keyboard code; the other # 16 columns contain the mapping of the keycode to a character string, with various combinations # of the SHIFT, LOCK, META, and CONTROL keys down. See the man page for "keycomp" for more information. @@ -96,5 +101,16 @@ # local variables: # tab-width: 4 # End: +# +# COPYING CONDITIONS +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this file, to deal in the file without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the file, and to +# permit persons to whom the file is furnished to do so, subject to +# the following condition: +# +# The above copyright notice and this permission notice shall be +# included in all copies or substantial portions of the file. # arch-tag: cbaa71af-719b-4647-a2c1-cd4d36a4fc64 diff --git a/etc/compilation.txt b/etc/compilation.txt index 72ff5ac5316..2e784000149 100644 --- a/etc/compilation.txt +++ b/etc/compilation.txt @@ -1,4 +1,4 @@ -* Introduction -*-compilation-*- +* Introduction -*-compilation-*- (Copyright information at end of file) This shows the different kinds of messages compile recognizes by default and how they are rendered. It is intended both to help you decide which matchers @@ -401,3 +401,23 @@ Compilation killed at Wed Jul 20 12:20:10 Compilation terminated at Wed Jul 20 12:20:10 Compilation exited abnormally with code 1 at Wed Jul 20 12:21:12 Compilation finished at Thu Jul 21 15:02:15 + + +Copyright (c) 2004, 2005, 2006 +Free software Foundation, Inc. + +COPYING PERMISSIONS: + + This document 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 2 of the License, or + (at your option) any later version. + + This program 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. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA diff --git a/etc/cs-refcard.tex b/etc/cs-refcard.tex index be54da104ad..762b33f3d09 100644 --- a/etc/cs-refcard.tex +++ b/etc/cs-refcard.tex @@ -591,8 +591,9 @@ Pohyb mezi uzly: Dal¹í: \key{spustit {\bf tutoriál} k~Info}{h} -\key{{\bf ukonèit} Info}{q} +% \key{look up a subject in the indices}{i} % FIXME \key{prohledat uzly na øetìzec}{M-s} +\key{{\bf ukonèit} Info}{q} \endindentedkeys diff --git a/etc/de-refcard.tex b/etc/de-refcard.tex index 743e699fd76..7e0df6e378b 100644 --- a/etc/de-refcard.tex +++ b/etc/de-refcard.tex @@ -1,12 +1,28 @@ -% Reference Card for GNU Emacs version 19 on Unix systems +% Reference Card for GNU Emacs version 22 on Unix systems +% +% Translation into German by Sven Joachim <svenjoac@gmx.de> +% %**start of header \newcount\columnsperpage +\newcount\letterpaper % This file can be printed with 1, 2, or 3 columns per page (see below). -% Specify how many you want here. Nothing else needs to be changed. +% Specify how many you want here. + +\columnsperpage=3 + +% Set letterpaper to 0 for A4 paper, 1 for letter (US) paper. Useful +% only when columnsperpage is 2 or 3. + +\letterpaper=0 -\columnsperpage=2 +% If you don't have german.sty, you can either get it from CTAN or +% change the \glqq and \grqq commands below. +\input german.sty +\mdqoff % deactivates the "-char + +% Nothing else needs to be changed below this line. % Copyright (C) 1987, 1993, 1996, 2000, 2002, 2003, 2004, % 2005, 2006 Free Software Foundation, Inc. @@ -43,6 +59,10 @@ % For this you need a dvi device driver that can print sideways. % Which mode to use is controlled by setting \columnsperpage above. % +% To compile and print this document: +% tex de-refcard.tex +% dvips -t landscape de-refcard.dvi +% % Author: % Stephen Gildea % Internet: gildea@stop.mail-abuse.org @@ -52,23 +72,26 @@ % If there were room, it would be nice to see a section on Dired. -\def\versionnumber{2.1} +\def\versionnumber{2.3} \def\year{2006} -\def\version{March \year\ v\versionnumber} \def\shortcopyrightnotice{\vskip 1ex plus 2 fill \centerline{\small \copyright\ \year\ Free Software Foundation, Inc. - Permissions on back. v\versionnumber}} + Bedingungen auf der R\"uckseite. v\versionnumber}} \def\copyrightnotice{\vskip 1ex plus 2 fill\begingroup\small \centerline{Copyright \copyright\ \year\ Free Software Foundation, Inc.} -\centerline{designed by Stephen Gildea, \version} -\centerline{for GNU Emacs version 19 on Unix systems} +\centerline{v\versionnumber{} f\"ur GNU Emacs Version 22, \year} +\centerline{entworfen von Stephen Gildea} +% \centerline{deutsche \"Ubersetzung von Sven Joachim} -Permission is granted to make and distribute copies of -this card provided the copyright notice and this permission notice -are preserved on all copies. +Es ist gestattet, diese Referenzkarte zu vervielf\"altigen und zu +verbreiten, vorausgesetzt dass sich der Copyright-Hinweis und der +Hinweis auf diese Erlaubnis auf allen Kopien befinden. +F\"ur Kopien des Handbuchs zu GNU Emacs schreiben Sie an die Free +Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. \endgroup} @@ -104,9 +127,9 @@ are preserved on all copies. \hsize 3.2in \vsize 7.95in % \hoffset -.75in - \hoffset -.82in + \hoffset -.49in % \voffset -.745in - \voffset -.6in + \voffset -.84in \font\titlefont=cmbx10 \scaledmag2 \font\headingfont=cmbx10 \scaledmag1 \font\smallfont=cmr6 @@ -174,7 +197,7 @@ are preserved on all copies. \chardef\{=`\{ \chardef\}=`\} -\hyphenation{mini-buf-fer} +\hyphenation{Mini-puf-fer} \parindent 0pt \parskip 1ex plus .5ex minus .5ex @@ -190,8 +213,8 @@ are preserved on all copies. % section - new major section. Argument is section name. \outer\def\section#1{\par\filbreak - \vskip 3ex plus 2ex minus 2ex {\headingfont #1}\mark{#1}% - \vskip 2ex plus 1ex minus 1.5ex} + \vskip 2ex plus 1.5ex minus 2.5ex {\headingfont #1}\mark{#1}% + \vskip 1.5ex plus 1ex minus 1.5ex} \newdimen\keyindent @@ -250,142 +273,146 @@ are preserved on all copies. %**end of header -\title{GNU Emacs Referenzkarte} +\title{Referenzkarte zu GNU Emacs} -%\centerline{(fuer version 19)} +\centerline{(f\"ur Version 22)} -\section{Emacs Starten} +\section{Emacs starten} -Um GNU Emacs 19 zu starten, tippen Sie ein: \kbd{emacs} +Um GNU Emacs 22 zu starten, geben Sie \kbd{emacs} ein. -Um eine Datei fuers Editieren zu laden, lesen Sie unten weiter. +% Um eine Datei f\"urs Editieren zu laden, lesen Sie unten weiter. -\section{Emacs Verlassen} +\section{Emacs verlassen} -\key{Emacs pausieren lassen}{C-z} +\key{Emacs unterbrechen (unter X: minimieren)}{C-z} \key{Emacs beenden}{C-x C-c} \section{Dateien} -\key{Datei {\bf oeffnen} }{C-x C-f} -\key{Datei {\bf sichern} }{C-x C-s} -\key{{\bf alle} Dateien sichern}{C-x s} -\key{den Inhalt einer anderen Datei {\bf einfuegen}}{C-x i} +\key{Datei {\bf \"offnen} }{C-x C-f} +\key{Datei {\bf speichern} }{C-x C-s} +\key{{\bf alle} Dateien speichern}{C-x s} +\key{den Inhalt einer anderen Datei {\bf einf\"ugen}}{C-x i} \key{diese Datei durch eine andere ersetzen}{C-x C-v} -\key{Datei neu anlegen und speichern}{C-x C-w} -\key{version control ein/auschecken}{C-x C-q} +\key{Puffer in neuer Datei speichern}{C-x C-w} +\key{Nur-Lesen-Modus des Puffers wechseln}{C-x C-q} \section{Hilfe} -Das Hilfesystem ist einfach zu bedienen. Tippen Sie \kbd{C-h} (oder \kbd{F1}). Neulinge tippen \kbd{C-h t} um ein {\bf tutorial} zu starten. +Das Hilfesystem ist einfach zu bedienen. Dr\"ucken Sie \kbd{C-h} (oder +\kbd{F1}). Neulinge dr\"ucken \kbd{C-h t}, um eine {\bf Einf\"uhrung} zu +starten. -\key{Hilfe Fenster entfernen}{C-x 1} -\key{Hilfe Fenster scrollen}{C-M-v} +\key{Hilfefenster entfernen}{C-x 1} +\key{Hilfefenster scrollen}{C-M-v} -\key{apropos: zeigt alle Befehle mit dem Muster}{C-h a} -\key{zeigt die Funktion mit dieser Tastenkomb.}{C-h c} -\key{beschreibt die Funktion}{C-h f} -\key{modusspezifische Information}{C-h m} +\key{Befehle zeigen, die Zeichenkette enthalten}{C-h a} +\key{Tastenkombination beschreiben}{C-h k} +\key{eine Funktion beschreiben}{C-h f} +\key{modusspezifische Informationen}{C-h m} -\section{Was tun wenn nichts mehr geht} +\section{Fehlerbehandlung} \key{{\bf Abbrechen} eines Vorgangs}{C-g} -\metax{{\bf Wiederherstellung} von Dateien}{M-x recover-file} -\key{{\bf rueckgaengig} machen}{C-x u} +\metax{{\bf Wiederherstellung} von Dateien}{M-x recover-session} +\metax{{\"Anderungen \bf r\"uckg\"angig} machen}{C-x u, C-_ {\rm oder} C-/} \metax{Puffer in Ursprungszustand bringen}{M-x revert-buffer} \key{Bildschirmanzeige in Ordnung bringen}{C-l} \section{Inkrementelle Suche} -\key{Suche vorwaerts}{C-s} -\key{Suche rueckwaerts}{C-r} -\key{Suche mit regulaeren Ausdruecken}{C-M-s} -\key{Rueckwaertssuche mit reg. Ausdruecken}{C-M-r} -\key{letzten Suchausdruck auswaehlen}{M-p} -\key{spaeteren Suchausdruck auswaehlen}{M-n} +\key{Suche vorw\"arts}{C-s} +\key{Suche r\"uckw\"arts}{C-r} +\key{Suche mit regul\"aren Ausdr\"ucken}{C-M-s} +\key{R\"uckw\"artssuche mit regul\"aren Ausdr\"ucken}{C-M-r} + +\key{fr\"uheren Suchausdruck ausw\"ahlen}{M-p} +\key{sp\"ateren Suchausdruck ausw\"ahlen}{M-n} \key{inkrementelle Suche beenden}{RET} -\key{ein Suchzeichen zurueckgehen}{DEL} +\key{ein Suchzeichen zur\"uckgehen}{DEL} \key{Suche abbrechen}{C-g} -Wiederholtes Druecken von \kbd{C-s} oder \kbd{C-r} sucht weitere Treffer. +Wiederholtes Dr\"ucken von \kbd{C-s} oder \kbd{C-r} sucht weitere Treffer. Wenn Emacs sucht, unterbricht \kbd{C-g} nur die jeweils letzte Suche. \shortcopyrightnotice -\section{Cursor Bewegung} +\section{Cursor-Bewegung} \paralign to \hsize{#\tabskip=10pt plus 1 fil&#\tabskip=0pt&#\cr -\threecol{{\bf Textteile ueberspringen}}{{\bf rueckw.}}{{\bf vorw.}} +\threecol{{\bf Textteile \"uberspringen}}{{\bf r\"uckw.}}{{\bf vorw.}} \threecol{Zeichen}{C-b}{C-f} \threecol{Wort}{M-b}{M-f} \threecol{Zeile}{C-p}{C-n} -\threecol{zum Zeilenende springen}{C-a}{C-e} +\threecol{zum Zeilenanfang (oder -ende) springen}{C-a}{C-e} \threecol{Satz}{M-a}{M-e} \threecol{Paragraph}{M-\{}{M-\}} \threecol{Seite}{C-x [}{C-x ]} \threecol{Lisp-s-expression}{C-M-b}{C-M-f} \threecol{Funktion}{C-M-a}{C-M-e} -\threecol{zum Pufferanfang (oder Ende)springen}{M-<}{M->} +\threecol{zum Pufferanfang (oder -ende) springen}{M-<}{M->} } -\key{eine Bildschirmseite runter scrollen}{C-v} +\key{eine Bildschirmseite herunter scrollen}{C-v} \key{eine Bildschirmseite hoch scrollen}{M-v} \key{nach links scrollen}{C-x <} \key{nach rechts scrollen}{C-x >} -\key{Cursorzeile in die Bildschirmmitte scrollen}{C-u C-l} +\key{Cursor-Zeile in die Bildschirmmitte scrollen}{C-u C-l} -\section{Loeschen} +\section{L\"oschen und Ausschneiden} \paralign to \hsize{#\tabskip=10pt plus 1 fil&#\tabskip=0pt&#\cr -\threecol{{\bf Textteile }}{{\bf rueckwaerts}}{{\bf vorwaerts}} -\threecol{Zeichen (loeschen)}{DEL}{C-d} +\threecol{{\bf Textteile ausschneiden}}{{\bf r\"uckw.}}{{\bf vorw.}} +\threecol{Zeichen (l\"oschen, nicht ausschneiden)}{DEL}{C-d} \threecol{Wort}{M-DEL}{M-d} \threecol{Zeile (bis zum Ende)}{M-0 C-k}{C-k} \threecol{Satz}{C-x DEL}{M-k} \threecol{Lisp-s-expression}{M-- C-M-k}{C-M-k} } -\key{{\bf Bereiche} loeschen}{C-w} +\key{{\bf Bereich} ausschneiden}{C-w} \key{Bereich in die Ablage kopieren}{M-w} -\key{Bis zum {\it Zeichen} loeschen }{M-z {\it Zeichen}} -\key{letztes geloeschtes Zeichen einsetzen}{C-y} -\key{eins davor einsetzen}{M-y} +\key{bis zum {\it Zeichen} ausschneiden }{M-z {\it Zeichen}} +\key{zuletzt ausgeschnittenen Text einf\"ugen}{C-y} +\key{vorher ausgeschnittenen Text einf\"ugen}{M-y} \section{Markieren} -\key{Marke setzen}{C-@ {\rm or} C-SPC} -\key{zwischen Cursor und Marke wechseln}{C-x C-x} +\key{Marke setzen}{C-@ {\rm oder}\thinspace\thinspace{}C-SPC} % H\"asslich, aber +% Leerzeichen statt \thinspace erzeugt overfull \hbox. @#$?*&! +\key{Cursor und Marke austauschen}{C-x C-x} \key{Marke {\it Argument\/} {\bf Worte} entfernt setzen}{M-@} \key{{\bf Paragraph} markieren}{M-h} \key{{\bf Seite} markieren}{C-x C-p} \key{{\bf Lisp-s-expression} markieren}{C-M-@} -\key{{\bf Funktion} markiern}{C-M-h} +\key{{\bf Funktion} markieren}{C-M-h} \key{den ganzen {\bf Puffer} markieren}{C-x h} \section{Interaktives Ersetzen} \key{Zeichenkette interaktiv ersetzen}{M-\%} -\metax{mit regulaeren Ausdruecken}{M-x query-replace-regexp} +\metax{mit regul\"aren Ausdr\"ucken}{M-x query-replace-regexp} -Moegliche Antworten in diesem Modus: +M\"ogliche Antworten in diesem Modus: -\key{dies {\bf ersetzten} und zum naechsten gehen}{SPC} -\key{dies ersetzen}{,} -\key{dies {\bf ueberspringen}, zum naechsten gehen}{DEL} +\key{dies {\bf ersetzen} und zum n\"achsten gehen}{SPC} +\key{dies ersetzen und nicht weitergehen}{,} +\key{dies {\bf \"uberspringen}, zum n\"achsten gehen}{DEL} \key{alle verbleibenden Treffer ersetzen}{!} -\key{eine Ersetzung{\bf rueckgaengig} machen }{^} -\key{interaktiven Modus{\bf verlassen}}{RET} -\key{rekursiven Modus starten (\kbd{C-M-c} verlassen)}{C-r} +\key{zum vorherigen Treffer {\bf zur\"uckgehen} }{^} +\key{interaktives Ersetzen {\bf beenden}}{RET} +\key{rekursives Editieren starten (\kbd{C-M-c} beendet)}{C-r} \section{Mehrere Fenster} -Die zweite Tastenk. bezieht sich immer auf das andere Fenster: - -\key{alle anderen Fenster in den Hintergrund}{C-x 1} +Wenn zwei Befehle angezeigt werden, ist der zweite ein \"ahn\-li\-cher f\"ur +einen Rahmen statt eines Fensters. {\setbox0=\hbox{\kbd{0}}\advance\hsize by 0\wd0 \paralign to \hsize{#\tabskip=10pt plus 1 fil&#\tabskip=0pt&#\cr +\threecol{alle anderen Fenster schlie\ss{}en}{C-x 1\ \ \ \ }{C-x 5 1} \threecol{Fenster vertikal teilen}{C-x 2\ \ \ \ }{C-x 5 2} -\threecol{dieses Fenster loeschen}{C-x 0\ \ \ \ }{C-x 5 0} +\threecol{dieses Fenster schlie\ss{}en}{C-x 0\ \ \ \ }{C-x 5 0} }} \key{Fenster horizontal teilen}{C-x 3} @@ -393,252 +420,273 @@ Die zweite Tastenk. bezieht sich immer auf das andere Fenster: {\setbox0=\hbox{\kbd{0}}\advance\hsize by 2\wd0 \paralign to \hsize{#\tabskip=10pt plus 1 fil&#\tabskip=0pt&#\cr -\threecol{ins andere Fenster wechseln}{C-x o}{C-x 5 o} - -\threecol{Puffer in ein anderes Fenster bringen}{C-x 4 b}{C-x 5 b} -\threecol{Puffer in einem anderen Fenster darstellen}{C-x 4 C-o}{C-x 5 C-o} -\threecol{Datei in ein anderes Fenster oeffnen}{C-x 4 f}{C-x 5 f} -\threecol{Datei im Ansichtmodus in anderem Fenster oeffnen}{C-x 4 r}{C-x 5 r} -\threecol{Dired in einem anderen Fenster oeffnen}{C-x 4 d}{C-x 5 d} -\threecol{Tag in einem anderen Fenster finden}{C-x 4 .}{C-x 5 .} +\threecol{in anderes Fenster wechseln}{C-x o}{C-x 5 o} + +\threecol{Puffer in and. Fenster ausw\"ahlen}{C-x 4 b}{C-x 5 b} +\threecol{Puffer in anderem Fenster anzeigen}{C-x 4 C-o}{C-x 5 C-o} +\threecol{Datei in anderem Fenster \"offnen}{C-x 4 f}{C-x 5 f} +\threecol{Datei in anderem Fenster anzeigen}{C-x 4 r}{C-x 5 r} +\threecol{Dired in anderem Fenster starten}{C-x 4 d}{C-x 5 d} +\threecol{Tag in anderem Fenster finden}{C-x 4 .}{C-x 5 .} }} -\key{Fenster vergroessern}{C-x ^} -\key{Fenster schmaler machen}{C-x \{} -\key{Fenster breiter machen}{C-x \}} +\key{Fenster vergr\"o\ss{}ern}{C-x ^} +\key{Fenster verengen}{C-x \{} +\key{Fenster verbreitern}{C-x \}} -\section{Formattierung} +\section{Formatierung} -\key{{\bf Zeile} (modusabhaengig) einruecken}{TAB} -\key{{\bf Bereich} (modusabh.) einruecken}{C-M-\\} -\key{{\bf Lisp-s-expression} (modusabh.) einruecken}{C-M-q} -\key{Bereich {\it Argument\/} Spalten einruecken}{C-x TAB} -\key{Zeilenumbruch nach Cursor einfuegen}{C-o} +\key{{\bf Zeile} (modusabh\"angig) einr\"ucken}{TAB} +\key{{\bf Bereich} (modusabh\"angig) einr\"ucken}{C-M-\\} +\key{{\bf Lisp-s-expression} (modusabh.) einr\"ucken}{C-M-q} +\key{Bereich {\it Argument\/} Spalten einr\"ucken}{C-x TAB} + +\key{Zeilenumbruch nach Cursor einf\"ugen}{C-o} \key{Zeilenrest vertikal nach unten verschieben}{C-M-o} -\key{Leerzeilen um Cursorposition loeschen}{C-x C-o} -\key{Zeile mit letzter verbinden (Arg. naechster)}{M-^} -\key{Leerzeichen an Cursorposition loeschen}{M-\\} -\key{ein Leerzeichen an Cursorposition setzen}{M-SPC} -\key{Paragraph auffuellen}{M-q} -\key{Fuell Spalte setzen}{C-x f} -\key{Praefix setzen fuer jede Zeile}{C-x .} -\key{Zeichendarstellung setzen}{M-g} - -\section{Gross-Kleinbuchstaben} - -\key{Wort in Grossbuchstaben}{M-u} +\key{Leerzeilen um Cursor-Position l\"oschen}{C-x C-o} +\key{Zeile mit voriger verbinden (Arg. n\"achste)}{M-^} +\key{alle Leerzeichen um Cursor-Position l\"oschen}{M-\\} +\key{genau ein Leerzeichen an Cursor-Position}{M-SPC} + +\key{Paragraph auff\"ullen}{M-q} +\key{Spalte f\"ur Umbruch setzen}{C-x f} +\key{Pr\"afix f\"ur jede Zeile setzen}{C-x .} + +\key{Face setzen}{M-o} + +\section{Gro\ss{}- und Kleinschreibung} + +\key{Wort in Gro\ss{}buchstaben}{M-u} \key{Wort in Kleinbuchstaben}{M-l} -\key{Word mit grossen Anfangsbuchstaben}{M-c} +\key{Wort mit gro\ss{}em Anfangsbuchstaben}{M-c} -\key{Bereich in Grossbuchstaben}{C-x C-u} +\key{Bereich in Gro\ss{}buchstaben}{C-x C-u} \key{Bereich in Kleinbuchstaben}{C-x C-l} \section{Der Minipuffer} -Die folgenden Tastenkombination gelten im Minipuffer: +Die folgenden Tastenkombinationen gelten im Minipuffer: -\key{so viel wie moeglich ergaenzen}{TAB} -\key{ein Wort ergaenzen}{SPC} -\key{ergaenzen und ausfuehren}{RET} -\key{moegliche Ergaenzungen zeigen}{?} -\key{letzte Eingabe wiederanzeigen}{M-p} -\key{spaetere Eingabe wiederanzeigen}{M-n} -\key{reg. Ausd. rueckwaerts in History suchen}{M-r} -\key{reg. Ausd. vorwaerts in History suchen}{M-s} -\key{Vorgang unterbrechen}{C-g} +\key{so weit wie m\"oglich erg\"anzen}{TAB} +\key{ein Wort erg\"anzen}{SPC} +\key{erg\"anzen und ausf\"uhren}{RET} +\key{m\"ogliche Erg\"anzungen zeigen}{?} +\key{letzte Eingabe zur\"uckholen}{M-p} +\key{sp\"atere Eingabe zur\"uckholen}{M-n} +\key{reg. Ausd. r\"uckw\"arts in History suchen}{M-r} +\key{reg. Ausd. vorw\"arts in History suchen}{M-s} +\key{Befehl abbrechen}{C-g} -Tippen Sie \kbd{C-x ESC ESC} um den letzten Befehl zu editieren und zu wiederholen der im Minipuffer ausgefuehrt wurde. +Dr\"ucken Sie \kbd{C-x ESC ESC}, um den letzten Befehl zu bearbeiten +und zu wiederholen, der im Minipuffer aus\-gef\"uhrt wurde. Dr\"u\-cken Sie +\kbd{F10}, um die Men\"u\-zei\-le im Minipuffer zu aktivieren. \newcolumn -\title{GNU Emacs Referenzkarte} +\title{Referenzkarte zu GNU Emacs} \section{Puffer} -\key{anderen Puffer auswaehlen}{C-x b} -\key{alle Puffer anzeigen}{C-x C-b} -\key{Puffer loeschen}{C-x k} +\key{anderen Puffer ausw\"ahlen}{C-x b} +\key{Liste aller Puffer anzeigen}{C-x C-b} +\key{einen Puffer schlie\ss{}en}{C-x k} \section{Vertauschen} -\key{ {\bf Zeichen} vertauschen}{C-t} -\key{ {\bf Worte} vertauschen}{M-t} -\key{ {\bf Zeilen} vertauschen}{C-x C-t} -\key{ {\bf Lisp-s-expressions} vertauschen}{C-M-t} +\key{{\bf Zeichen} vertauschen}{C-t} +\key{{\bf Worte} vertauschen}{M-t} +\key{{\bf Zeilen} vertauschen}{C-x C-t} +\key{{\bf Lisp-s-expressions} vertauschen}{C-M-t} -\section{Rechtschreibkorrrektur} +\section{Rechtschreibpr\"ufung} -\key{Ueberpruefe aktuelles Wort}{M-\$} -\metax{Ueberpruefe alle Woerter in Bereich}{M-x ispell-region} -\metax{Ueberpruefe den gesamten Bereich}{M-x ispell-buffer} +\key{aktuelles Wort \"uberpr\"ufen}{M-\$} +\metax{alle W\"orter im Bereich \"uberpr\"ufen}{M-x ispell-region} +\metax{gesamten Puffer \"uberpr\"ufen}{M-x ispell-buffer} \section{Tags} \key{Tag finden (Definition)}{M-.} -\key{Naechstes Vorkommen von Tag finden}{C-u M-.} -\metax{Neue Tags Datei angeben}{M-x visit-tags-table} -\metax{Regulaere Ausdruck Suche in Dateien}{M-x tags-search} -\metax{Interakt. Ersetzen in allen Dateien}{M-x tags-query-replace} -\key{Letzte Tag Suche oder Ersetzen nochmal}{M-,} +\key{n\"achstes Vorkommen von Tag finden}{C-u M-.} +\metax{neue Tagsdatei angeben}{M-x visit-tags-table} + +\metax{regul\"aren Ausdruck in Dateien suchen}{M-x tags-search} +\metax{interakt. Ersetzen in allen Dateien}{M-x tags-query-replace} +\key{letztes Suchen oder Ersetzen fortsetzen}{M-,} \section{Shells} -\key{Shell Kommando ausfuehren}{M-!} -\key{Shell Kommando fuer bereich ausfuehren}{M-|} -\key{Bereich durch Shell Kommando filtern}{C-u M-|} -\metax{Shell im Fenster \kbd{*shell*} starten}{M-x shell} +\key{Shellbefehl ausf\"uhren}{M-!} +\key{Shellbefehl f\"ur Bereich ausf\"uhren}{M-|} +\key{Bereich durch Shellbefehl filtern}{C-u M-|} +\metax{eine Shell im Fenster \kbd{*shell*} starten}{M-x shell} \section{Rechtecke} -\key{Kopiere Rechteck in Register}{C-x r r} -\key{Loesche Rechteck}{C-x r k} -\key{Rechteck einsetzen}{C-x r y} -\key{Rechteck aufmachen, Text nach rechts}{C-x r o} -\key{Rechteck mit Leerzeichen ueberschreiben}{C-x r c} -\key{Praefix vor jede Zeile setzen}{C-x r t} - -\section{Abkuerzungen} - -\key{globale Abkuerzung hinzufuegen}{C-x a g} -\key{modusabhaengige Abkuerzung hinzufuegen}{C-x a l} -\key{globale Expansion fuer Abk. definieren}{C-x a i g} -\key{modusabhaengige Abkuerzung definieren}{C-x a i l} -\key{explizites Expandieren}{C-x a e} -\key{letztes Wort dynamisch expandieren}{M-/} - -\section{Regulaere Ausdruecke} - -\key{jedes Zeichen ausser Zeilenumbruch}{. {\rm(Punkt)}} -\key{Null oder mehr Wiederholungen}{*} -\key{Eine oder mehr Wiederholungen}{+} -\key{Null oder eine Wiederholung}{?} -\key{jedes Zeichen in der Menge}{[ {\rm$\ldots$} ]} -\key{jedes Zeichen nicht in der Menge}{[^ {\rm$\ldots$} ]} -\key{Zeilenanfang}{^} -\key{Zeilenende}{\$} -\key{spezielles Zeichen maskieren {\it c\/}}{\\{\it c}} -\key{Alternative (``oder'')}{\\|} +\key{Rechteck in Register kopieren}{C-x r r} +\key{Rechteck ausschneiden}{C-x r k} +\key{Rechteck einf\"ugen}{C-x r y} +\key{Rechteck \"offnen, Text nach rechts}{C-x r o} +\key{Rechteck mit Leerzeichen \"uberschreiben}{C-x r c} +\key{Pr\"afix vor jede Zeile setzen}{C-x r t} + +\section{Abk\"urzungen} + +\key{globale Abk\"urzung hinzuf\"ugen}{C-x a g} +\key{modusabh\"angige Abk\"urzung hinzuf\"ugen}{C-x a l} +\key{globalen Ersetzungstext f\"ur Abk. definieren}{C-x a i g} +\key{modusabh. Ersetzungstext f\"ur Abk. def.}{C-x a i l} +\key{Abk\"urzung explizit ausschreiben}{C-x a e} + +\key{letztes Wort dynamisch ausschreiben}{M-/} + +\section{Regul\"are Ausdr\"ucke} + +\key{jedes einzelne Zeichen au\ss{}er Zeilenumbruch}{. {\rm(Punkt)}} +\key{null oder mehr Wiederholungen}{*} +\key{eine oder mehr Wiederholungen}{+} +\key{null oder eine Wiederholung}{?} +\key{Spezialzeichen {\it c\/} maskieren}{\\{\it c}} +\key{Alternative (\glqq oder\grqq )}{\\|} \key{Gruppe}{\\( {\rm$\ldots$} \\)} -\key{{\it n\/}te Gruppe}{\\{\it n}} -\key{Pufferanfang}{\\`} -\key{Pufferende}{\\'} -\key{Wortzwischenraum}{\\b} -\key{Weder Anfang noch Ende eines Wortes}{\\B} -\key{Wortanfang}{\\<} -\key{Wortende}{\\>} -\key{jedes Wort-Syntax Zeichen}{\\w} -\key{jedes Nicht-Wort-Syntax Zeichen}{\\W} -\key{Zeichen mit Syntax {\it c}}{\\s{\it c}} -\key{Zeichen nicht mit Syntax {\it c}}{\\S{\it c}} +\key{gleicher Text wie {\it n\/}te Gruppe}{\\{\it n}} +\key{Anfang oder Ende eines Wortes}{\\b} +\key{weder Anfang noch Ende eines Wortes}{\\B} + +% \paralign to \hsize{#\tabskip=10pt plus 1 fil&#\tabskip=0pt&#\cr +% \threecol{{\bf Einheit}}{{\bf passt am Anfang}\hskip-1.5ex}{{\bf passt am Ende}} +% \threecol{Zeile}{^}{\$} +% \threecol{Wort}{\\<}{\\>} +% \threecol{Puffer}{\\`}{\\'} + +% \threecol{{\bf Zeichenklasse}}{{\bf passt auf diese}}{{\bf passt auf andere}} +% \threecol{Explizite Menge}{[ {\rm$\ldots$} ]}{[^ {\rm$\ldots$} ]} +% \threecol{Wortsyntax-Zeichen\hskip-10ex}{\\w}{\\W} +% \threecol{Zeichen mit Syntax {\it c}\hskip-2.5ex}{\\s{\it c}}{\\S{\it c}} +% } -\section{Register} +\paralign to \hsize{#\tabskip=10pt plus 1 fil&#\tabskip=0pt&#\cr +\threecol{{\bf Einheit}}{{\bf passt am Anf.}}{{\bf passt am Ende}} +\threecol{Zeile}{^}{\$} +\threecol{Wort}{\\<}{\\>} +\threecol{Puffer}{\\`}{\\'} + +\threecol{{\bf Zeichenklasse}}{{\bf passt auf diese}}{{\bf passt auf and.}} +\threecol{Explizite Menge}{[ {\rm$\ldots$} ]}{[^ {\rm$\ldots$} ]} +\threecol{Wortsyntax-Zeichen}{\\w}{\\W} +\threecol{Zeichen mit Syntax {\it c}}{\\s{\it c}}{\\S{\it c}} +} -\key{Region in Register speichern}{C-x r s} -\key{Register Inhalt in Puffer einfuegen}{C-x r i} -\key{Cursorposition in Register speichern}{C-x r SPC} -\key{Springe zur abgespeicherten Position}{C-x r j} +\section{Internationale Zeichens\"atze} + +\key{Hauptsprache einstellen}{C-x RET l} +\metax{Alle Eingabemethoden anzeigen}{M-x list-input-methods} +\key{Eingabemethode in oder au\ss{}er Kraft setzen}{C-\\} +\key{Kodierung f\"ur n\"achsten Befehl setzen}{C-x RET c} +\metax{Alle Kodierungen anzeigen}{M-x list-coding-systems} +\metax{bevorzugte Kodierung ausw\"ahlen}{M-x prefer-coding-system} \section{Info} -\key{Info starten}{C-h i} +\key{Info-Betrachter starten}{C-h i} +\key{Funktion oder Variable in Info finden}{C-h S} \beginindentedkeys Bewegung innerhalb eines Knotens: -\key{vorwaerts scrollen}{SPC} -\key{rueckwaerts scrollen}{DEL} -\key{zum Anfang eines Knotens}{. {\rm (dot)}} +\key{vorw\"arts scrollen}{SPC} +\key{r\"uckw\"arts scrollen}{DEL} +\key{zum Anfang eines Knotens}{. {\rm (Punkt)}} Bewegung zwischen Knoten: -\key{{\bf naechster} Knoten}{n} +\key{{\bf n\"achster} Knoten}{n} \key{{\bf vorheriger} Knoten}{p} \key{nach {\bf oben}}{u} -\key{Menue Element ueber Namen auswaehlen}{m} -\key{{\it n\/}ten Menueeintrag auswaehlen (1--9)}{{\it n}} -\key{Kreuzverweis folgen (zurueck mit \kbd{l})}{f} -\key{zurueck zum letzten gesehenen Knoten}{l} -\key{zurueck zum Verzeichnisknoten}{d} -\key{Knoten ueber Namen auswaehlen}{g} - -Sonstige: - -\key{Info {\bf Tutorial} starten}{h} -\key{Info Befehle zeigen}{?} +\key{Men\"ueintrag \"uber Namen ausw\"ahlen}{m} +\key{{\it n\/}ten Men\"ueintrag ausw\"ahlen (1--9)}{{\it n}} +\key{Querverweis folgen (zur\"uck mit \kbd{l})}{f} +\key{zur\"uck zum letzten gesehenen Knoten}{l} +\key{zur\"uck zum Verzeichnisknoten}{d} +\key{zum Anfangsknoten der aktuellen Datei}{t} +\key{beliebigen Knoten \"uber Namen ausw\"ahlen}{g} + +Sonstiges: + +\key{{\bf Einf\"uhrung} in Info starten}{h} +\key{Begriff in den Indizes suchen}{i} +\key{nach regul\"aren Ausdr\"ucken suchen}{s} \key{Info {\bf verlassen} }{q} -\key{Knoten nach reg. Ausd. durchsuchen}{M-s} \endindentedkeys -\section{Tastatur Makros} +\section{Register} + +\key{Region in Register speichern}{C-x r s} +\key{Registerinhalt in Puffer einf\"ugen}{C-x r i} +\key{Cursor-Position in Register speichern}{C-x r SPC} +\key{zu abgespeicherter Position springen}{C-x r j} -\key{Tastatur Makro Definition {\bf starten} }{C-x (} -\key{Tastatur Makro Definition {\bf beenden} }{C-x )} -\key{zuletzt definiertes Tast. Makro {\bf ausfuehren}}{C-x e} -\key{an letztes Tastatur Makro anhaengen}{C-u C-x (} -\metax{letztes Tastatur Makro benennen}{M-x name-last-kbd-macro} -\metax{Lisp Definition in Puffer einfuegen}{M-x insert-kbd-macro} +\section{Tastaturmakros} -\section{Kommandos fuer Emacs Lisp} +\key{Makrodefinition {\bf starten} }{C-x (} +\key{Makrodefinition {\bf beenden} }{C-x )} +\key{zuletzt definiertes Makro {\bf ausf\"uhren}}{C-x e} +\key{an letztes Makro anh\"angen}{C-u C-x (} +\metax{letztes Makro benennen}{M-x name-last-kbd-macro} +\metax{Lispcode f\"ur Makro in Puffer einf\"ugen}{M-x insert-kbd-macro} -\key{{\bf Lisp-s-expression} vor Cursor laden}{C-x C-e} +\section{Befehle f\"ur Emacs-Lisp} + +\key{{\bf Lisp-s-expression} vor Cursor auswerten}{C-x C-e} \key{aktuelle {\bf Definition} auswerten}{C-M-x} \metax{{\bf Bereich} auswerten}{M-x eval-region} -\metax{gesamten {\bf Puffer} auswerten}{M-x eval-current-buffer} -\key{Lispausdruck im Minipuffer auswerten}{M-:} -\key{letztes Minipufferkommando auswerten}{C-x ESC ESC} -\metax{Emacs Lisp Datei lesen und auswerten}{M-x load-file} -\metax{aus Standard Systemverzeichnis laden}{M-x load-library} +\key{Lisp-Ausdruck im Minipuffer auswerten}{M-:} +\metax{Datei aus Standardverzeichnis laden}{M-x load-library} + +\section{Einfache Anpassungen} -\section{Einfaches Konfigurieren} +\metax{Variablen und Faces anpassen}{M-x customize} -% Das ist nur was fuer Leute die Lisp beherrschen +% Das ist nur was f\"ur Leute die Lisp beherrschen -Ein Beispiel dafuer, wie man Tastenkombinationen definiert: +Tastenkombinationen definieren (Beispiele): \beginexample% (global-set-key "\\C-cg" 'goto-line) -(global-set-key "\\C-x\\C-k" 'kill-region) (global-set-key "\\M-\#" 'query-replace-regexp) \endexample -So weist man in Emacs Lisp einer Variablen Werte zu: - -\beginexample% -(setq backup-by-copying-when-linked t) -\endexample - -\section{Selbst Kommandos schreiben} +\section{Eigene Befehle schreiben} \beginexample% -(defun \<Commando-Name> (\<args>) - "\<Documentation>" - (interactive "\<template>") - \<body>) +(defun \<Befehlsname> (\<Argumente>) + "\<Dokumentation>" + (interactive "\<Vorlage>") + \<Rumpf>) \endexample Ein Beispiel: \beginexample% (defun diese-Zeile-zum-Fensteranfang (Zeile) - "Zeile an Cursorposition zum Fensteranfang bewegen" -Mit numerischem Argument n, zur Zeile n -Mit negativem Argument zum Fensterende + "Zeile an Cursor-Position zum Fensteranfang bewegen. +Mit ARGUMENT, Cursor in Zeile ARGUMENT bewegen." (interactive "P") (recenter (if (null Zeile) 0 (prefix-numeric-value Zeile)))) \endexample -Das Argument fuer \kbd{interactive} ist eine Zeichenkette, die spe\-zi\-fi\-ziert, wie die -Ar\-gu\-men\-te be\-reit\-ge\-stellt wer\-den, wenn die Funktion inter\-aktiv auf\-ge\-ru\-fen wird. -\kbd{C-h f interactive} fuer mehr Informationen. +Die Spezifikation zu \kbd{interactive} gibt an, wie die Argumente +gelesen werden, wenn die Funktion inter\-aktiv auf\-ge\-ru\-fen +wird. F\"ur n\"ahere Details geben Sie \kbd{C-h f interactive} ein. \copyrightnotice \bye % Local variables: -% compile-command: "tex refcard" +% compile-command: "tex de-refcard" % End: % arch-tag: af0a2666-f289-49f1-a9cc-cedab9783314 diff --git a/etc/emacs.csh b/etc/emacs.csh index 411feedaef5..3de336b8075 100644 --- a/etc/emacs.csh +++ b/etc/emacs.csh @@ -1,3 +1,6 @@ +# Copyright (c) 1999, 2003, 2006 +# Free software Foundation, Inc. +# # This defines a csh command named `edit' which resumes an # existing Emacs or starts a new one if none exists. # One way or another, any arguments are passed to Emacs to specify files @@ -24,4 +27,17 @@ alias edit 'set emacs_command=("emacs -nw \!*" "fg %emacs" "emacs -i \!* &"\ test -S ~/.emacs_server && emacsclient \!* \ || echo `pwd` \!* >! ~/.emacs_args && eval $emacs_command[$whichjob]' +#COPYING PERMISSIONS: +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this file, to deal in the file without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the file, and to +# permit persons to whom the file is furnished to do so, subject to +# the following condition: +# +# The above copyright notice and this permission notice shall be +# included in all copies or substantial portions of the file. + + # arch-tag: 433d58df-15b9-446f-ad37-f0393e3a23d4 diff --git a/etc/enriched.doc b/etc/enriched.doc index 122652f005a..0b83bbcabfe 100644 --- a/etc/enriched.doc +++ b/etc/enriched.doc @@ -254,3 +254,24 @@ bug reports are welcome.</indent> </x-color><x-bg-color><param>blue</param><x-color><param>white</param>April 1995; updated August 1997</x-color></x-bg-color> + + +Copyright (c) 1995, 1997, 2006 +Free software Foundation, Inc. + +COPYING PERMISSIONS: + + This document 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 2 of the License, or + (at your option) any later version. + + This program 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. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + diff --git a/etc/fr-refcard.tex b/etc/fr-refcard.tex index 54d73ca6312..c8c8fd8cd9a 100644 --- a/etc/fr-refcard.tex +++ b/etc/fr-refcard.tex @@ -588,8 +588,9 @@ Passer de n\oe{}ud en n\oe{}ud : Autres : \key{lancer le {\bf didacticiel} Info}{h} +\key{chercher dans l'index}{i} +\key{rechercher les n\oe{}uds avec une expression rationnelle}{s} \key{{\bf quitter} Info}{q} -\key{rechercher les n\oe{}uds avec une expression rationnelle}{M-s} \endindentedkeys diff --git a/etc/grep.txt b/etc/grep.txt index 8acfc4fc644..d2a934fbeff 100644 --- a/etc/grep.txt +++ b/etc/grep.txt @@ -1,4 +1,4 @@ -* Introduction -*-grep-*- +* Introduction -*-grep-*- (See the end of file for copyright information) This shows the different kinds of messages grep recognizes by default and how they are rendered. It is intended both to help you decide which matchers @@ -85,3 +85,25 @@ grep -nH -e "xyzxyz" ../info/* ;;; Local Variables: ;;; buffer-read-only: t ;;; End: + + + +Copyright (c) 2005, 2006 +Free software Foundation, Inc. + +COPYING PERMISSIONS: + + This document 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 2 of the License, or + (at your option) any later version. + + This program 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. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + diff --git a/etc/ledit.l b/etc/ledit.l deleted file mode 100644 index d53c5d26011..00000000000 --- a/etc/ledit.l +++ /dev/null @@ -1,152 +0,0 @@ -;;; -*- Mode: lisp -*- - -; load in the c functions - -(removeaddress '_signal) -(removeaddress '_switch_to_proc) -(removeaddress '_set_proc_str) - -(cfasl "/src/mdc/ledit/leditcfns.o" '_switch_to_proc 'emacs) - -(getaddress '_set_proc_str 'set_proc_str) - -(declare (special *ledit-infile* ; emacs->lisp tempfile - *ledit-outfile* ; lisp->emacs tempfile - *ledit-ppfile* ; pp->emacs tempfile - *ledit-lisztfile* ; compiler input - *ledit-objfile* ; compiler output - *ledit-initialized*) ; flag - ) - -(setq *ledit-initialized* nil) - -;;; INIT-LEDIT - -(defun init-ledit () - (let ((user (getenv '|USER|))) ;USER must be uppercase - (setq - *ledit-outfile* (concat "/tmp/" user ".l2") ; lisp -> emacs - *ledit-infile* (concat "/tmp/" user ".l1") ; emacs -> lisp - *ledit-ppfile* (concat "/tmp/" user ".l3") ; pp output to emacs. - *ledit-lisztfile* (concat "/tmp/" user ".l4") - *ledit-objfile* (concat "/tmp/" user ".o") - *ledit-initialized* t))) - -;;; LEDIT -; if 1 arg, arg is taken as a tag name to pass to emacs. -; if 2 args, second arg is a keyword. If 2nd arg is pp, -; pp is applied to first arg, and result is sent to emacs -; to put in a buffer called LEDIT (which is first erased.) - -(defun ledit fexpr (args) - (apply #'ledit* args)) - -;;; LEDIT* - -(defun ledit* n - (if (not *ledit-initialized*) (init-ledit)) - (ledit-output (listify n)) - (syscall 10. *ledit-infile*) ; syscall 10 is "delete" - (syscall 10. *ledit-lisztfile*) - (emacs) - (ledit-input) - (syscall 10. *ledit-outfile*) - (syscall 10. *ledit-ppfile*) - t) - -;;; LEDIT-OUTPUT -;;; Egad, what a mess! Doesn't work for XEMACS yet. -;;; Here's an example from Mocklisp: -;;; -> (defun bar (nothing) (bar nothing)) -;;; bar -;;; -> (ledit bar) -;;; should produce... -;;; (progn) (progn tag (setq tag "bar") (&goto-tag)) -;;; and -;;; -> (ledit bar pp) -;;; should stuff this to emacs... -;;; (progn) (switch-to-buffer "LEDIT") (erase-buffer) -;;; (insert-file "/tmp/walter.l3") (lisp-mode) -;;; and this... -;;; (def bar -;;; (lambda (x) -;;; (bar nothing))) -;;; into *LEDIT* - -(defun ledit-output (args) - (if args - (let ((ofile (outfile *ledit-outfile*))) - (format ofile "(progn)") ; this is necessary. - - (cond ((null (cdr args)) ; no keyword -> arg is a tag. - (format ofile "(progn tag (setq tag \"~A\"~ - (&goto-tag))" - (car args))) - ((eq (cadr args) 'pp) ; pp-> pp first arg to emacs - (apply 'pp `((|F| ,*ledit-ppfile*) ,(car args))) - (format ofile "(switch-to-buffer \"LEDIT\")~ - (erase-buffer)") - (format ofile "(insert-file \"~A\")" - *ledit-ppfile*) - (format ofile "(lisp-mode)")) - - (t (format t "~&~A -- unknown option~%" (cdr args)))) - (close ofile)))) - -;;; LISZT* -;;; Need this guy to do compile-input. -;;; Liszt returns 0 if all was well. -;;; Note that in ordinary use the user will have to get used to looking -;;; at "%Warning: ... Compiler declared *foo* special" messages, since -;;; you don't usually want to hunt around in your file, zap in the -;;; declarations, then go back to what you were doing. -;;; Fortunately this doesn't cause the compiler to bomb. -;;; Some sleepless night I will think of a way to get around this. - -(defun liszt* (&rest args) - (apply #'liszt args)) - -;;; LEDIT-INPUT -;;; Although there are two cases here, in practice -;;; it is never the case that there is both input to be -;;; interpreted and input to be compiled. - -(defun ledit-input () - (if (probef *ledit-lisztfile*) - (cond ((getd #'liszt) - (format t ";Compiling LEDIT:") - (and (zerop (liszt* *ledit-lisztfile* '-o *ledit-objfile*)) - (load *ledit-objfile*))) - (t (format t ";Can't compile LEDIT: No liszt.~%;Reading instead:") - (let ((ifile (infile *ledit-lisztfile*))) - (ledit-load ifile) - (close ifile))))) - - (if (probef *ledit-infile*) - (let ((ifile (infile *ledit-infile*))) - (format t ";Reading from LEDIT:~%") - (ledit-load ifile) - (close ifile)))) - -;;; LEDIT-LOAD -;;; A generally useful form of load - -(defun ledit-load (ifile) - (let ((eof-form (list 'eof-form))) - (do ((form (read ifile eof-form) (read ifile eof-form))) - ((eq form eof-form)) - (format t "; ~A~%" (eval form))))) - -(setsyntax #/ 'macro 'ledit) ; make ^E = (ledit)<return> - -;; more robust version of the c function set_proc_str. Does argument checking. -;; set_proc_str sets the string that is stuffed to the tty after franz pauses -;; and the csh wakes up. It is usually "%emacs" or "%vemacs" or "%?emacs" -(defun set-proc-str (arg) - (if (stringp arg) - (set_proc_str arg) - (if (symbolp arg) - (set_proc_str (get-pname arg)) - (error arg " is illegal argument to set-proc-str")))) - -;;; arch-tag: 2e76c01f-8d6a-4d04-b9ab-0eaabec96aee diff --git a/etc/ms-7bkermit b/etc/ms-7bkermit index 28847b06136..b239e942293 100644 --- a/etc/ms-7bkermit +++ b/etc/ms-7bkermit @@ -1,3 +1,6 @@ +;;; Copyright (c) 1999, 2003, 2006 +;;; Free Software Foundation, Inc. + ;;; This file is designed for 7-bit connections. ;;; Use the file ms-kermit if you have an 8-bit connection. @@ -311,4 +314,20 @@ set key \2463 \kendscn set key \2457 \kupscn set key \2465 \kdnscn +;;; COPYING PERMISSIONS: +;;; +;;; This document 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 2 of the License, or +;;; (at your option) any later version. +;;; +;;; This program 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. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with this program; if not, write to the Free Software +;;; Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + ;;; arch-tag: b066a884-e956-4f46-9d9c-13502f6cf7a6 diff --git a/etc/orgcard.tex b/etc/orgcard.tex index 45608ac1795..5a019328a1f 100644 --- a/etc/orgcard.tex +++ b/etc/orgcard.tex @@ -1,5 +1,5 @@ % Reference Card for Org Mode -\def\orgversionnumber{4.26} +\def\orgversionnumber{4.36} \def\year{2006} % %**start of header @@ -269,19 +269,11 @@ are preserved on all copies. \section{Getting Started} % -%Put the following in your \kbd{~/.emacs}$^1$ \vskip -1mm \beginexample% -%(autoload 'org-mode "org" "Org mode" t) -%(autoload 'org-diary "org" "Org mode diary entries") -%(autoload 'org-agenda "org" "Agenda from Org files" t) -%(autoload 'org-todo-list "org" "Global TODO list" t) -%(autoload 'org-store-link "org" "Store org link" t) -%(autoload 'orgtbl-mode "org" "Orgtbl minor mode" t) -%(autoload 'turn-on-orgtbl "org" "Orgtbl minor mode") (add-to-list 'auto-mode-alist '("\\\\.org\$" . org-mode)) -(define-key global-map "\\C-cl" 'org-store-link)$^2$ -(define-key global-map "\\C-ca" 'org-agenda)$^2$ +(define-key global-map "\\C-cl" 'org-store-link)$^1$ +(define-key global-map "\\C-ca" 'org-agenda)$^1$ \endexample % \metax{For the many customization options try}{M-x org-customize} @@ -302,6 +294,7 @@ are preserved on all copies. \key{previous heading, same level}{C-c C-b} \key{backward to higher level heading}{C-c C-u} \key{jump to another place in document}{C-c C-j} +\key{previous/next plain list item}{S-UP/DOWN$^3$} \section{Structure Editing} @@ -320,7 +313,7 @@ are preserved on all copies. \key{yank subtree}{C-c C-x C-y} \key{archive subtree}{C-c \$} -To set archive location for current file, add a line like$^3$: +To set archive location for current file, add a line like$^2$: \vskip -1mm \beginexample% \#+ARCHIVE: archfile::* Archived Tasks @@ -330,10 +323,10 @@ To set archive location for current file, add a line like$^3$: \key{show sparse tree for all matches of a regexp}{C-c /} \key{view TODO's in sparse tree}{C-c C-v} -\key{global TODO list in agenda mode}{C-c t$^2$} +\key{global TODO list in agenda mode}{C-c t$^1$} \key{create sparse tree with all deadlines due}{C-c C-w} \key{time sorted view of current org file}{C-c C-r} -%\key{agenda for the week}{C-c a$^2$} +%\key{agenda for the week}{C-c a$^1$} %\key{agenda for date at cursor}{C-c C-o} \section{Tags} @@ -351,8 +344,8 @@ To set archive location for current file, add a line like$^3$: \key{set the priority of the current item}{C-c , [ABC]} \key{remove priority cookie from current item}{C-c , SPC} -\key{raise priority of current item}{S-UP$^4$} -\key{lower priority of current item}{S-DOWN$^4$} +\key{raise priority of current item}{S-UP$^3$} +\key{lower priority of current item}{S-DOWN$^3$} \key{\kbd{\#+SEQ_TODO: TODO TRY BLUFF DONE}}{\rm todo workflow} \key{\kbd{\#+TYP_TODO: Phil home work DONE}}{\rm todo types} @@ -366,8 +359,8 @@ To set archive location for current file, add a line like$^3$: \key{insert SCHEDULED timestamp}{C-c C-s} \key{create sparse tree with all deadlines due}{C-c C-w} \key{the time between 2 dates in a time range}{C-c C-y} -\key{change timestamp at cursor by $\pm 1$ day}{S-RIGHT/LEFT$^4$} -\key{change year/month/day at cursor by $\pm 1$}{S-UP/DOWN$^4$} +\key{change timestamp at cursor by $\pm 1$ day}{S-RIGHT/LEFT$^3$} +\key{change year/month/day at cursor by $\pm 1$}{S-UP/DOWN$^3$} \key{access the calendar for the current date}{C-c >} \key{insert timestamp matching date in calendar}{C-c <} \key{access agenda for current date}{C-c C-o} @@ -380,7 +373,7 @@ To set archive location for current file, add a line like$^3$: \section{Links} -\key{globally store link to the current location}{C-c l$^2$} +\key{globally store link to the current location}{C-c l$^1$} \key{insert a link (TAB completes stored links)}{C-c C-l} \key{insert file link with file name completion}{C-u C-c C-l} \key{edit (also hidden part of) link at point}{C-c C-l} @@ -388,13 +381,13 @@ To set archive location for current file, add a line like$^3$: \key{open file links in emacs (\kbd{C-u} : in emacs)}{C-c C-o} \key{open link at point (3: in emacs)}{mouse-2/3} %\key{open file links in emacs}{mouse-3} -\key{record a position in mark ring}{C-c \%} +%\key{record a position in mark ring}{C-c \%} \key{jump back to last followed link(s)}{C-c \&} {\bf Internal Links} \key{\kbd{<<My Target>>}}{\rm target} -\key{\kbd{<<<My Target>>>}}{\rm radio target$^3$} +\key{\kbd{<<<My Target>>>}}{\rm radio target$^2$} \key{\kbd{[[*this text]]}}{\rm find headline} \metax{\kbd{[[this text]]}}{\rm find target or text in buffer} \metax{\kbd{[[this text][description]]}}{\rm optional link text} @@ -405,16 +398,18 @@ To set archive location for current file, add a line like$^3$: \key{\kbd{file:papers/last.pdf}}{\rm file, relative} \key{\kbd{file:projects.org::*that text}}{\rm find headline} \key{\kbd{file:projects.org::find me}}{\rm find tgt/string} -\key{\kbd{file:projects.org::/regexp/}}{\rm regexp search} +%\key{\kbd{file:projects.org::/regexp/}}{\rm regexp search} \key{\kbd{http://www.astro.uva.nl/~dominik}}{\rm on the web} \key{\kbd{mailto:adent@galaxy.net}}{\rm EMail address} \key{\kbd{news:comp.emacs}}{\rm Usenet group} \key{\kbd{bbdb:Richard Stallman}}{\rm BBDB person} -\key{\kbd{shell:ls *.org}}{\rm shell command} \key{\kbd{gnus:group}}{\rm GNUS group} \key{\kbd{gnus:group\#id}}{\rm GNUS message} \key{\kbd{vm|wl|mhe|rmail:folder}}{\rm Mail folder} \key{\kbd{vm|wl|mhe|rmail:folder\#id}}{\rm Mail message} +\key{\kbd{info:emacs:Regexps}}{\rm Info file:node} +\key{\kbd{shell:ls *.org}}{\rm shell command} +\key{\kbd{elisp:(calendar)}}{\rm elisp form} \metax{\kbd{[[external link][description]]}}{\rm optional link text} %\key{\kbd{vm://myself@some.where.org/folder\#id}}{\rm VM remote} @@ -479,7 +474,7 @@ Outside of tables, the same keys may have other functionality. \key{display column number cursor is in}{C-c ?} \key{sum numbers in current column/rectangle}{C-c +} -\key{copy down with increment}{S-RET$^4$} +\key{copy down with increment}{S-RET$^3$} Formulas typed in field are executed by \kbd{TAB}, \kbd{RET} and \kbd{C-c C-c}. \kbd{=} introduces a column @@ -516,15 +511,15 @@ formula, \kbd{:=} a named-field formula. \key{remove current file from your agenda}{C-c ]} \key{cycle through agenda file list}{C-,} -\key{compile agenda for the current week}{C-c a a$^2$} -\key{compile global TODO list}{C-c a t$^2$} -\key{compile TODO list for specific keyword}{C-c a T$^2$} -\key{match tags in agenda files}{C-c a m$^2$} +\key{compile agenda for the current week}{C-c a a$^1$} +\key{compile global TODO list}{C-c a t$^1$} +\key{compile TODO list for specific keyword}{C-c a T$^1$} +\key{match tags in agenda files}{C-c a m$^1$} \key{agenda for date at cursor}{C-c C-o} \key{show timeline of current org file}{C-c C-r} \vskip 1mm -To set categories, add lines like$^3$: +To set categories, add lines like$^2$: \vskip -1mm \beginexample% \#+CATEGORY: MyCateg @@ -561,12 +556,10 @@ To set categories, add lines like$^3$: \key{show tags of current headline}{T} \key{set tags for current headline}{:} \key{set priority of current item}{p} -\key{raise/lower priority of current item}{S-UP/DOWN$^4$} -%\key{lower priority of current item}{S-DOWN$^4$} +\key{raise/lower priority of current item}{S-UP/DOWN$^3$} \key{display weighted priority of current item}{P} -\key{change timestamp to one day earlier/later}{S-LEFT/RIGHT$^4$} -%\key{change timestamp to one day earlier}{S-LEFT$^4$} -%\key{change timestamp to one day later}{S-RIGHT$^4$} +\key{schedule/set deadline for this item}{C-c C-s/d} +\key{change timestamp to one day earlier/later}{S-LEFT/RIGHT$^3$} \key{change timestamp to today}{>} \key{insert new entry into diary}{i} @@ -629,8 +622,6 @@ keywords. {\tt M-TAB} again just after keyword is complete inserts examples. \key{... which can carry over multiple lines}{\#+TEXT:} \key{settings for the export process - see below}{\#+OPTIONS:} -{\bf Settings for the OPTIONS line} - \key{set number of headline levels for export}{H:2} \key{turn on/off section numbers}{num:t} \key{turn on/off table of contents}{toc:t} @@ -651,6 +642,13 @@ Subtrees whose header starts with COMMENT are never exported. \key{toggle COMMENT keyword on entry}{C-c ;} + +\section{Publishing (requires org-publish.el)} +\key{publishcurrent file}{C-c C-e C-f} +\key{publish current project}{C-c C-e C-p} +\key{publish project (prompted for)}{C-c C-e C-c} +\key{publish all projects}{C-c C-e C-a} + \section{Completion} In-buffer completion completes TODO keywords at headline start, TeX @@ -659,8 +657,6 @@ after ``{\tt :}'', and dictionary words elsewhere. \key{Complete word at point}{M-TAB} -\newcolumn - \section{Calendar and Diary Integration} To include entries from the Emacs diary in your Org-mode agenda: @@ -668,26 +664,6 @@ To include entries from the Emacs diary in your Org-mode agenda: (setq org-agenda-include-diary t) \endexample -To include the Org-mode agenda in the normal diary, make sure you're -using the fancy diary display -% -%\beginexample% -%(add-hook 'diary-display-hook 'fancy-diary-display) -%\endexample -% -and in the \kbd{~/diary} file add - -\beginexample% -\&\%\%(org-diary) -\endexample - -to include all the files listed in \kbd{org-agenda-files}. For more -selective file inclusion use a line for each file: - -\beginexample% -\&\%\%(org-diary) ~/path/to/some/org-file.org -\endexample - \section{Remember-mode Integration} See the manual for how to make remember.el use Org-mode links and @@ -712,7 +688,7 @@ Insert the note with one of the following: Configure the variable {\tt org-CUA-compatibility} to make Org-mode avoid the \kbd{S-<cursor>} bindings used by these modes. When set, Org-mode will change the following keybindings (also in the agenda -buffer, but not during date selection). See note mark four$^4$ +buffer, but not during date selection). See note mark four$^3$ throughout the reference card. %\vskip-mm \beginexample @@ -722,16 +698,13 @@ S-RET $\to$ C-S-RET \endexample \section{Notes} -$^1$ The six autoload forms are only needed if Org-mode is not part of -Emacs, or an XEmacs package. - -$^2$ This is only a suggestion for a binding of this command. Choose +$^1$ This is only a suggestion for a binding of this command. Choose you own key as shown under INSTALLATION. -$^3$ After changing a \kbd{\#+KEYWORD} or \kbd{<<<target>>>} line, +$^2$ After changing a \kbd{\#+KEYWORD} or \kbd{<<<target>>>} line, press \kbd{C-c C-c} with the cursor still in the line to update. -$^4$ Keybinding affected by {\tt org-CUA-compatibility}. +$^3$ Keybinding affected by {\tt org-CUA-compatibility}. \copyrightnotice diff --git a/etc/pl-refcard.tex b/etc/pl-refcard.tex index 0d5f008378e..c0d242c01a3 100644 --- a/etc/pl-refcard.tex +++ b/etc/pl-refcard.tex @@ -898,9 +898,10 @@ Pozosta/le polecenia: %\key{{\bf quit} Info}{q} %\key{search nodes for regexp}{M-s} \key{wywo/laj {\bf samouczek} Info}{h} -\key{{\bf zako/ncz} Info}{q} +\key{wyszukaj zagadnienie w indeksach}{i} \key{wyszukuj w~w/ez/lach tekst zgodny\newline - z~podanym wyra/zeniem regularnym}{M-s} + z~podanym wyra/zeniem regularnym}{s} +\key{{\bf zako/ncz} Info}{q} \endindentedkeys @@ -990,5 +991,9 @@ przez wywo/lanie \kbd{C-h f interactive}. \copyrightnotice \bye + +% Local variables: +% compile-command: "tex pl-refcard" +% End: % arch-tag: 19d15a16-70be-40c8-ad91-88899aac32a9 diff --git a/etc/pt-br-refcard.ps b/etc/pt-br-refcard.ps new file mode 100644 index 00000000000..376315aa30b --- /dev/null +++ b/etc/pt-br-refcard.ps @@ -0,0 +1,2527 @@ +%!PS-Adobe-2.0 +%%Creator: dvips(k) 5.92b Copyright 2002 Radical Eye Software +%%Title: refcard.dvi +%%Pages: 2 +%%PageOrder: Ascend +%%Orientation: Landscape +%%BoundingBox: 0 0 596 842 +%%DocumentFonts: CMBX10 CMR8 CMTT8 CMBX8 CMR6 CMSY6 CMTI8 CMMI8 +%%EndComments +%DVIPSWebPage: (www.radicaleye.com) +%DVIPSCommandLine: dvips -t landscape refcard.dvi +%DVIPSParameters: dpi=600, compressed +%DVIPSSource: TeX output 2006.05.10:0849 +%%BeginProcSet: texc.pro +%! +/TeXDict 300 dict def TeXDict begin/N{def}def/B{bind def}N/S{exch}N/X{S +N}B/A{dup}B/TR{translate}N/isls false N/vsize 11 72 mul N/hsize 8.5 72 +mul N/landplus90{false}def/@rigin{isls{[0 landplus90{1 -1}{-1 1}ifelse 0 +0 0]concat}if 72 Resolution div 72 VResolution div neg scale isls{ +landplus90{VResolution 72 div vsize mul 0 exch}{Resolution -72 div hsize +mul 0}ifelse TR}if Resolution VResolution vsize -72 div 1 add mul TR[ +matrix currentmatrix{A A round sub abs 0.00001 lt{round}if}forall round +exch round exch]setmatrix}N/@landscape{/isls true N}B/@manualfeed{ +statusdict/manualfeed true put}B/@copies{/#copies X}B/FMat[1 0 0 -1 0 0] +N/FBB[0 0 0 0]N/nn 0 N/IEn 0 N/ctr 0 N/df-tail{/nn 8 dict N nn begin +/FontType 3 N/FontMatrix fntrx N/FontBBox FBB N string/base X array +/BitMaps X/BuildChar{CharBuilder}N/Encoding IEn N end A{/foo setfont}2 +array copy cvx N load 0 nn put/ctr 0 N[}B/sf 0 N/df{/sf 1 N/fntrx FMat N +df-tail}B/dfs{div/sf X/fntrx[sf 0 0 sf neg 0 0]N df-tail}B/E{pop nn A +definefont setfont}B/Cw{Cd A length 5 sub get}B/Ch{Cd A length 4 sub get +}B/Cx{128 Cd A length 3 sub get sub}B/Cy{Cd A length 2 sub get 127 sub} +B/Cdx{Cd A length 1 sub get}B/Ci{Cd A type/stringtype ne{ctr get/ctr ctr +1 add N}if}B/id 0 N/rw 0 N/rc 0 N/gp 0 N/cp 0 N/G 0 N/CharBuilder{save 3 +1 roll S A/base get 2 index get S/BitMaps get S get/Cd X pop/ctr 0 N Cdx +0 Cx Cy Ch sub Cx Cw add Cy setcachedevice Cw Ch true[1 0 0 -1 -.1 Cx +sub Cy .1 sub]/id Ci N/rw Cw 7 add 8 idiv string N/rc 0 N/gp 0 N/cp 0 N{ +rc 0 ne{rc 1 sub/rc X rw}{G}ifelse}imagemask restore}B/G{{id gp get/gp +gp 1 add N A 18 mod S 18 idiv pl S get exec}loop}B/adv{cp add/cp X}B +/chg{rw cp id gp 4 index getinterval putinterval A gp add/gp X adv}B/nd{ +/cp 0 N rw exit}B/lsh{rw cp 2 copy get A 0 eq{pop 1}{A 255 eq{pop 254}{ +A A add 255 and S 1 and or}ifelse}ifelse put 1 adv}B/rsh{rw cp 2 copy +get A 0 eq{pop 128}{A 255 eq{pop 127}{A 2 idiv S 128 and or}ifelse} +ifelse put 1 adv}B/clr{rw cp 2 index string putinterval adv}B/set{rw cp +fillstr 0 4 index getinterval putinterval adv}B/fillstr 18 string 0 1 17 +{2 copy 255 put pop}for N/pl[{adv 1 chg}{adv 1 chg nd}{1 add chg}{1 add +chg nd}{adv lsh}{adv lsh nd}{adv rsh}{adv rsh nd}{1 add adv}{/rc X nd}{ +1 add set}{1 add clr}{adv 2 chg}{adv 2 chg nd}{pop nd}]A{bind pop} +forall N/D{/cc X A type/stringtype ne{]}if nn/base get cc ctr put nn +/BitMaps get S ctr S sf 1 ne{A A length 1 sub A 2 index S get sf div put +}if put/ctr ctr 1 add N}B/I{cc 1 add D}B/bop{userdict/bop-hook known{ +bop-hook}if/SI save N @rigin 0 0 moveto/V matrix currentmatrix A 1 get A +mul exch 0 get A mul add .99 lt{/QV}{/RV}ifelse load def pop pop}N/eop{ +SI restore userdict/eop-hook known{eop-hook}if showpage}N/@start{ +userdict/start-hook known{start-hook}if pop/VResolution X/Resolution X +1000 div/DVImag X/IEn 256 array N 2 string 0 1 255{IEn S A 360 add 36 4 +index cvrs cvn put}for pop 65781.76 div/vsize X 65781.76 div/hsize X}N +/p{show}N/RMat[1 0 0 -1 0 0]N/BDot 260 string N/Rx 0 N/Ry 0 N/V{}B/RV/v{ +/Ry X/Rx X V}B statusdict begin/product where{pop false[(Display)(NeXT) +(LaserWriter 16/600)]{A length product length le{A length product exch 0 +exch getinterval eq{pop true exit}if}{pop}ifelse}forall}{false}ifelse +end{{gsave TR -.1 .1 TR 1 1 scale Rx Ry false RMat{BDot}imagemask +grestore}}{{gsave TR -.1 .1 TR Rx Ry scale 1 1 false RMat{BDot} +imagemask grestore}}ifelse B/QV{gsave newpath transform round exch round +exch itransform moveto Rx 0 rlineto 0 Ry neg rlineto Rx neg 0 rlineto +fill grestore}B/a{moveto}B/delta 0 N/tail{A/delta X 0 rmoveto}B/M{S p +delta add tail}B/b{S p tail}B/c{-4 M}B/d{-3 M}B/e{-2 M}B/f{-1 M}B/g{0 M} +B/h{1 M}B/i{2 M}B/j{3 M}B/k{4 M}B/w{0 rmoveto}B/l{p -4 w}B/m{p -3 w}B/n{ +p -2 w}B/o{p -1 w}B/q{p 1 w}B/r{p 2 w}B/s{p 3 w}B/t{p 4 w}B/x{0 S +rmoveto}B/y{3 2 roll p a}B/bos{/SS save N}B/eos{SS restore}B end + +%%EndProcSet +%%BeginProcSet: f7b6d320.enc +% Thomas Esser, Dec 2002. public domain +% +% Encoding for: +% cmb10 cmbx10 cmbx12 cmbx5 cmbx6 cmbx7 cmbx8 cmbx9 cmbxsl10 +% cmdunh10 cmr10 cmr12 cmr17cmr6 cmr7 cmr8 cmr9 cmsl10 cmsl12 cmsl8 +% cmsl9 cmss10cmss12 cmss17 cmss8 cmss9 cmssbx10 cmssdc10 cmssi10 +% cmssi12 cmssi17 cmssi8cmssi9 cmssq8 cmssqi8 cmvtt10 +% +/TeXf7b6d320Encoding [ +/Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon /Phi /Psi /Omega +/ff /fi /fl /ffi /ffl /dotlessi /dotlessj /grave /acute /caron /breve +/macron /ring /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash +/suppress /exclam /quotedblright /numbersign /dollar /percent /ampersand +/quoteright /parenleft /parenright /asterisk /plus /comma /hyphen +/period /slash /zero /one /two /three /four /five /six /seven /eight +/nine /colon /semicolon /exclamdown /equal /questiondown /question /at +/A /B /C /D /E /F /G /H /I /J /K /L /M /N /O /P /Q /R /S /T /U /V /W /X +/Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent +/quoteleft /a /b /c /d /e /f /g /h /i /j /k /l /m /n /o /p /q /r /s /t /u +/v /w /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis /suppress +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /space +/Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon /Phi /Psi /.notdef +/.notdef /Omega /ff /fi /fl /ffi /ffl /dotlessi /dotlessj /grave /acute +/caron /breve /macron /ring /cedilla /germandbls /ae /oe /oslash /AE +/OE /Oslash /suppress /dieresis /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +] def + +%%EndProcSet +%%BeginProcSet: 09fbbfac.enc +% Thomas Esser, Dec 2002. public domain +% +% Encoding for: +% cmsltt10 cmtt10 cmtt12 cmtt8 cmtt9 +/TeX09fbbfacEncoding [ +/Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon /Phi /Psi +/Omega /arrowup /arrowdown /quotesingle /exclamdown /questiondown +/dotlessi /dotlessj /grave /acute /caron /breve /macron /ring /cedilla +/germandbls /ae /oe /oslash /AE /OE /Oslash /visiblespace /exclam +/quotedbl /numbersign /dollar /percent /ampersand /quoteright /parenleft +/parenright /asterisk /plus /comma /hyphen /period /slash /zero /one +/two /three /four /five /six /seven /eight /nine /colon /semicolon /less +/equal /greater /question /at /A /B /C /D /E /F /G /H /I /J /K /L /M /N +/O /P /Q /R /S /T /U /V /W /X /Y /Z /bracketleft /backslash /bracketright +/asciicircum /underscore /quoteleft /a /b /c /d /e /f /g /h /i /j /k /l +/m /n /o /p /q /r /s /t /u /v /w /x /y /z /braceleft /bar /braceright +/asciitilde /dieresis /visiblespace /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /space /Gamma /Delta /Theta /Lambda /Xi /Pi +/Sigma /Upsilon /Phi /Psi /.notdef /.notdef /Omega /arrowup /arrowdown +/quotesingle /exclamdown /questiondown /dotlessi /dotlessj /grave /acute +/caron /breve /macron /ring /cedilla /germandbls /ae /oe /oslash /AE +/OE /Oslash /visiblespace /dieresis /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +] def + +%%EndProcSet +%%BeginProcSet: bbad153f.enc +% Thomas Esser, Dec 2002. public domain +% +% Encoding for: +% cmsy10 cmsy5 cmsy6 cmsy7 cmsy8 cmsy9 +% +/TeXbbad153fEncoding [ +/minus /periodcentered /multiply /asteriskmath /divide /diamondmath +/plusminus /minusplus /circleplus /circleminus /circlemultiply +/circledivide /circledot /circlecopyrt /openbullet /bullet +/equivasymptotic /equivalence /reflexsubset /reflexsuperset /lessequal +/greaterequal /precedesequal /followsequal /similar /approxequal +/propersubset /propersuperset /lessmuch /greatermuch /precedes /follows +/arrowleft /arrowright /arrowup /arrowdown /arrowboth /arrownortheast +/arrowsoutheast /similarequal /arrowdblleft /arrowdblright /arrowdblup +/arrowdbldown /arrowdblboth /arrownorthwest /arrowsouthwest /proportional +/prime /infinity /element /owner /triangle /triangleinv /negationslash +/mapsto /universal /existential /logicalnot /emptyset /Rfractur /Ifractur +/latticetop /perpendicular /aleph /A /B /C /D /E /F /G /H /I /J /K +/L /M /N /O /P /Q /R /S /T /U /V /W /X /Y /Z /union /intersection +/unionmulti /logicaland /logicalor /turnstileleft /turnstileright +/floorleft /floorright /ceilingleft /ceilingright /braceleft /braceright +/angbracketleft /angbracketright /bar /bardbl /arrowbothv /arrowdblbothv +/backslash /wreathproduct /radical /coproduct /nabla /integral +/unionsq /intersectionsq /subsetsqequal /supersetsqequal /section +/dagger /daggerdbl /paragraph /club /diamond /heart /spade /arrowleft +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/minus /periodcentered /multiply /asteriskmath /divide /diamondmath +/plusminus /minusplus /circleplus /circleminus /.notdef /.notdef +/circlemultiply /circledivide /circledot /circlecopyrt /openbullet +/bullet /equivasymptotic /equivalence /reflexsubset /reflexsuperset +/lessequal /greaterequal /precedesequal /followsequal /similar +/approxequal /propersubset /propersuperset /lessmuch /greatermuch +/precedes /follows /arrowleft /spade /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +] def + +%%EndProcSet +%%BeginProcSet: 74afc74c.enc +% Thomas Esser, Dec 2002. public domain +% +% Encoding for: +% cmbxti10 cmff10 cmfi10 cmfib8 cmti10 cmti12 cmti7 cmti8cmti9 cmu10 +% +/TeX74afc74cEncoding [ +/Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon /Phi /Psi /Omega +/ff /fi /fl /ffi /ffl /dotlessi /dotlessj /grave /acute /caron /breve +/macron /ring /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash +/suppress /exclam /quotedblright /numbersign /sterling /percent +/ampersand /quoteright /parenleft /parenright /asterisk /plus /comma +/hyphen /period /slash /zero /one /two /three /four /five /six /seven +/eight /nine /colon /semicolon /exclamdown /equal /questiondown /question +/at /A /B /C /D /E /F /G /H /I /J /K /L /M /N /O /P /Q /R /S /T /U /V /W +/X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent +/quoteleft /a /b /c /d /e /f /g /h /i /j /k /l /m /n /o /p /q /r /s /t /u +/v /w /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis /suppress +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /space +/Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon /Phi /Psi /.notdef +/.notdef /Omega /ff /fi /fl /ffi /ffl /dotlessi /dotlessj /grave /acute +/caron /breve /macron /ring /cedilla /germandbls /ae /oe /oslash /AE +/OE /Oslash /suppress /dieresis /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +] def + +%%EndProcSet +%%BeginProcSet: aae443f0.enc +% Thomas Esser, Dec 2002. public domain +% +% Encoding for: +% cmmi10 cmmi12 cmmi5 cmmi6 cmmi7 cmmi8 cmmi9 cmmib10 +% +/TeXaae443f0Encoding [ +/Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon /Phi /Psi /Omega +/alpha /beta /gamma /delta /epsilon1 /zeta /eta /theta /iota /kappa +/lambda /mu /nu /xi /pi /rho /sigma /tau /upsilon /phi /chi /psi +/omega /epsilon /theta1 /pi1 /rho1 /sigma1 /phi1 /arrowlefttophalf +/arrowleftbothalf /arrowrighttophalf /arrowrightbothalf /arrowhookleft +/arrowhookright /triangleright /triangleleft /zerooldstyle /oneoldstyle +/twooldstyle /threeoldstyle /fouroldstyle /fiveoldstyle /sixoldstyle +/sevenoldstyle /eightoldstyle /nineoldstyle /period /comma /less /slash +/greater /star /partialdiff /A /B /C /D /E /F /G /H /I /J /K /L /M /N +/O /P /Q /R /S /T /U /V /W /X /Y /Z /flat /natural /sharp /slurbelow +/slurabove /lscript /a /b /c /d /e /f /g /h /i /j /k /l /m /n /o /p +/q /r /s /t /u /v /w /x /y /z /dotlessi /dotlessj /weierstrass /vector +/tie /psi /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/space /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon /Phi /Psi +/.notdef /.notdef /Omega /alpha /beta /gamma /delta /epsilon1 /zeta /eta +/theta /iota /kappa /lambda /mu /nu /xi /pi /rho /sigma /tau /upsilon +/phi /chi /psi /tie /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef +] def + +%%EndProcSet +%%BeginProcSet: texps.pro +%! +TeXDict begin/rf{findfont dup length 1 add dict begin{1 index/FID ne 2 +index/UniqueID ne and{def}{pop pop}ifelse}forall[1 index 0 6 -1 roll +exec 0 exch 5 -1 roll VResolution Resolution div mul neg 0 0]FontType 0 +ne{/Metrics exch def dict begin Encoding{exch dup type/integertype ne{ +pop pop 1 sub dup 0 le{pop}{[}ifelse}{FontMatrix 0 get div Metrics 0 get +div def}ifelse}forall Metrics/Metrics currentdict end def}{{1 index type +/nametype eq{exit}if exch pop}loop}ifelse[2 index currentdict end +definefont 3 -1 roll makefont/setfont cvx]cvx def}def/ObliqueSlant{dup +sin S cos div neg}B/SlantFont{4 index mul add}def/ExtendFont{3 -1 roll +mul exch}def/ReEncodeFont{CharStrings rcheck{/Encoding false def dup[ +exch{dup CharStrings exch known not{pop/.notdef/Encoding true def}if} +forall Encoding{]exch pop}{cleartomark}ifelse}if/Encoding exch def}def +end + +%%EndProcSet +%%BeginFont: CMMI8 +%!PS-AdobeFont-1.1: CMMI8 1.100 +%%CreationDate: 1996 Jul 23 07:53:54 +% Copyright (C) 1997 American Mathematical Society. All Rights Reserved. +11 dict begin +/FontInfo 7 dict dup begin +/version (1.100) readonly def +/Notice (Copyright (C) 1997 American Mathematical Society. All Rights Reserved) readonly def +/FullName (CMMI8) readonly def +/FamilyName (Computer Modern) readonly def +/Weight (Medium) readonly def +/ItalicAngle -14.04 def +/isFixedPitch false def +end readonly def +/FontName /CMMI8 def +/PaintType 0 def +/FontType 1 def +/FontMatrix [0.001 0 0 0.001 0 0] readonly def +/Encoding 256 array +0 1 255 {1 index exch /.notdef put} for +dup 0 /.notdef put +readonly def +/FontBBox{-24 -250 1110 750}readonly def +/UniqueID 5087383 def +currentdict end +currentfile eexec +D9D66F633B846A97B686A97E45A3D0AA0529731C99A784CCBE85B4993B2EEBDE +3B12D472B7CF54651EF21185116A69AB1096ED4BAD2F646635E019B6417CC77B +532F85D811C70D1429A19A5307EF63EB5C5E02C89FC6C20F6D9D89E7D91FE470 +B72BEFDA23F5DF76BE05AF4CE93137A219ED8A04A9D7D6FDF37E6B7FCDE0D90B +986423E5960A5D9FBB4C956556E8DF90CBFAEC476FA36FD9A5C8175C9AF513FE +D919C2DDD26BDC0D99398B9F4D03D6A8F05B47AF95EF28A9C561DBDC98C47CF5 +5250011D19E9366EB6FD153D3A100CAA6212E3D5D93990737F8D326D347B7EDC +4391C9DF440285B8FC159D0E98D4258FC57892DDF753642CD526A96ACEDA4120 +788F22B1D09F149794E66DD1AC2C2B3BC6FEC59D626F427CD5AE9C54C7F78F62 +C36F49B3C2E5E62AFB56DCEE87445A12A942C14AE618D1FE1B11A9CF9FAA1F32 +617B598CE5058715EF3051E228F72F651040AD99A741F247C68007E68C84E9D1 +D0BF99AA5D777D88A7D3CED2EA67F4AE61E8BC0495E7DA382E82DDB2B009DD63 +532C74E3BE5EC555A014BCBB6AB31B8286D7712E0E926F8696830672B8214E9B +5D0740C16ADF0AFD47C4938F373575C6CA91E46D88DE24E682DEC44B57EA8AF8 +4E57D45646073250D82C4B50CBBB0B369932618301F3D4186277103B53B3C9E6 +DB42D6B30115F67B9D078220D5752644930643BDF9FACF684EBE13E39B65055E +B1BD054C324962025EC79E1D155936FE32D9F2224353F2A46C3558EF216F6BB2 +A304BAF752BEEC36C4440B556AEFECF454BA7CBBA7537BCB10EBC21047333A89 +8936419D857CD9F59EBA20B0A3D9BA4A0D3395336B4CDA4BA6451B6E4D1370FA +D9BDABB7F271BC1C6C48D9DF1E5A6FAE788F5609DE3C48D47A67097C547D9817 +AD3A7CCE2B771843D69F860DA4059A71494281C0AD8D4BAB3F67BB6739723C04 +AE05F9E35B2B2CB9C7874C114F57A185C8563C0DCCA93F8096384D71A2994748 +A3C7C8B8AF54961A8838AD279441D9A5EB6C1FE26C98BD025F353124DA68A827 +AE2AF8D25CA48031C242AA433EEEBB8ABA4B96821786C38BACB5F58C3D5DA011 +85B385124C2B6534F3CD1866AF92009D93B97F763AA3D16684AA65F029E776DA +3BFB75EDD46D562E6A284DB4F2FDBF7CDE7C1F3772CD7B6FD372842A0E07E3EF +68A98AB9278ADC2D35891543F57ED6DCFE8923368D556F1A8B3E35863112F409 +FBE67FC270328312BAA43A9A372C510717B50AAB01A1E02A9982113E2D7C601C +B0BDA1C0E081E546A97647B74EE5194C57ACD62502B329FED4D966BDEB4028F0 +F082EDD5DFC8387653D620E9E73FDCE3C155347D5929C3A24D6121AEA46BBF3A +B1C8A4793FB7F21C84400912C27D9AB0845537103553BF8F +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +cleartomark +%%EndFont +%%BeginFont: CMTI8 +%!PS-AdobeFont-1.1: CMTI8 1.0 +%%CreationDate: 1991 Aug 18 21:07:42 +% Copyright (C) 1997 American Mathematical Society. All Rights Reserved. +11 dict begin +/FontInfo 7 dict dup begin +/version (1.0) readonly def +/Notice (Copyright (C) 1997 American Mathematical Society. All Rights Reserved) readonly def +/FullName (CMTI8) readonly def +/FamilyName (Computer Modern) readonly def +/Weight (Medium) readonly def +/ItalicAngle -14.04 def +/isFixedPitch false def +end readonly def +/FontName /CMTI8 def +/PaintType 0 def +/FontType 1 def +/FontMatrix [0.001 0 0 0.001 0 0] readonly def +/Encoding 256 array +0 1 255 {1 index exch /.notdef put} for +dup 0 /.notdef put +readonly def +/FontBBox{-35 -250 1190 750}readonly def +/UniqueID 5000826 def +currentdict end +currentfile eexec +D9D66F633B846A97B686A97E45A3D0AA0529731C99A784CCBE85B4993B2EEBDE +3B12D472B7CF54651EF21185116A69AB1096ED4BAD2F646635E019B6417CC77B +532F85D811C70D1429A19A5307EF63EB5C5E02C89FC6C20F6D9D89E7D91FE470 +B72BEFDA23F5DF76BE05AF4CE93137A219ED8A04A9D7D6FDF37E6B7FCDE0D90B +986423E5960A5D9FBB4C956556E8DF90CBFAEC476FA36FD9A5C8175C9AF513FE +D919C2DDD26BDC0D99398B9F4D03D6A8F05B47AF95EF28A9C561DBDC98C47CF5 +525003F3DAD7933EB57E7DB1462E9D906F6D8F5BF740206C1EC5F36E00AAFF68 +F3EF6F3A2540E5F9564D1C215BC1E7E69C7D04DA5DB1CF195613C9CBF4BAA360 +84AEF3E10E24877FBE36AD731DC97305BDE6DB1F934909FAF60B8E28561FBC57 +0F5B6225425BFDE8F0C71CD4507B82FF803E9A301397975E38A259DE1E1B4FC0 +06BB1DC2D45B987A2268A77CE8DC025CB0D1B39788BBEE149103950650171C94 +5FED1063050A90BD38605BD9365D1C2AE42A7DA3DDB9A263FE10BD487F63D908 +D4F02758BD9D7BE53E6353A25BEFA29E42B50C1D078A8B3A746EEDB381CCE36C +93FC4BD1A8D1D6ACD0D355E948CFE397B74D243EB51597D251D0BAE6884D70E8 +FEE119462E1939A9783414DF59EEA5FF1529F13869D1FF0A44935C5198CC5DAA +E1FD2A17AEEBF4974052D06734A409E26C457C06700C55896C90BB33E044A737 +46590D9FA242819B9527FD59818D8829D4EB2D26A34CC05A2CC063E66F2DF193 +8E4F9670014BC243180E45B51DDB05AD1E6A7F619EE1CE09CFC1A4F02CB7270E +4482FEDF673EDED38EF3173C475C34BFB3F6623C5E942A7797FEDDD0EF1D54E9 +1D90D7076C0A9687E334907C22F2E7C603388D8D626B0E5A62B7543DCBB575D7 +9A6BE1528EC9BC18570001092524E4FBB02F3B29293BCB4F0EF14A2DD9DB22A5 +BB33455799E8120D2A4862424AA4A382972E2845E042506FC8F6E201D11DD0F2 +09FAD8DC29C3E12B66293ACBFB13FA0F26238981F2CD52B47A8CDE6DF5CDFAAF +3113E1A6366B806EABA9C34E5D41167CD10D7B639021FB4CFDAE28CE72A93F3C +E8929A4813956AAB24BE7C20FCF9196E8E2F30816FE2279CE3E6067667A39E44 +488D58BFD17606AE885FA06F478D359A6ECF5564C095FE0E5038425D8B152750 +F72F41B3D1E7420EE91CF4A9ED5BBE8C2275624AE257D2BDF5752E803B426F40 +924CB5C29460BC09EC84F3F3A95F6900836F0ECCF6A7BB85A3F8D650017E5FE0 +503A73644EC6C6B0254F0259F8DD4AB3945950974CEB34521881A2506E76EBB3 +7DBA7812E0186DE2C0AD3E6D42BCA320014368DD738408C54AE2CAAA9C05612B +E7F33218F2FECCE8DB2E4B3A3BCD9D8D0BAD7EDDCCAE45F6A15FD2B8ED263E45 +14AF0CC7B58EF52D5FE73023EE9DAB8249D1EB3B795C7B42BFD2A2852D2D16BF +CD71056F412571F41CF7EE80AA916EA4FF1630B1E226F474CC3195006043B1AB +915DA8A9484B930F1F00028287EA3802DA3C3F99961952E04B736CDEC7768307 +879B4D2D553518FBBA727266F94C3A607FFD5D85CD0FB802CA51E6A3792C80F9 +A637D47C13A787F5D9C5BAC24E843DA198B7CC898AD786DEAC0BA9B6EF955ECC +72DA3A8CCCF7F3B69597A2F868AE359737A9714AE6D81989B4152DA33095DAB8 +5759080AA156DF1F3767120018CE81D296D813DC52786586CF3F38EE3CE181D3 +9D79439EE13D4E5799E03338E93315C3F6BA8ADC731A0D8282637E524C1E9736 +29C594C6F19B49C859D7CCA98148215F7E6943637797641D44DC9FB8FA403FCA +BD581E477C7BBDBC84048141760B4EE0D181D585C519D02DEB7D1C650BB49874 +A75E95E6A17D8024346AF3288A32A7EDFFAE15BACD436CC76850F2EAC7EFF565 +C4273160FC5DC7434DB94BFA01D1648421FCFEF66D786CFF60F0031B649B6F14 +E9139B27185E6E9A70E439AA8D68C6535A42634FFDA55DE86BDEDDF3D6B73015 +37C7437A96CDAC620A29942E834F714D82774AED0A83771A152EAC0CC043CB09 +02574AFC4CA006FC0D24C3DAAF4D681CC1D2D7870F273773171A4977AD05A082 +0DF3F50C8A36D7D8AA96E82387AAFB48D048CFAE2CBAA88F1865B84CFBBC1731 +A212A44EB98265A8D4A8C118E038A0C3503B27D8B58846C4F3E8112C8B05A41A +9F8B0E1513528F5D7E509EE847F7224AA06819954974F8065AF49F21840E972D +C1B028B541BA1364045E814A9F8FB299B6B62CA150245D92588056992FE6D71B +FB16F2B42A3DE425B302051FCC4A2AA76F6146BAA385614913D2B11191CA6A09 +BAE8567DCAC342D013C7830A0F03D848397110F021C63C9D6AFA90ABBC2DE4C9 +69EDFEE42C028640F9784E8CA11B83B4E7AB58F8335FA294DD68BA87FFFCC743 +67239D7FF1C54B725D53581832F5307FF1995D8273EBA54372AC82B7D5EC5773 +8F52B55255502008E0EDA0646D4D71137D822A57C0E9E05F3D61B91436B5FFE5 +CD90CABEA89420F4ADD844733B9B0F0C72688B9184A2EF69966411DF2B23A25A +11F009C6F23E452854B77AA33129C531C2C7A8666D550A83CBA6F251CB016F0C +940EC74FF62C721F3D854404F431DB39548F0785C5140A9D406C06306CBB0C99 +B7AA0E4680D8DE074B369A7481F0C12BCEDB787A1A9E4C71C869F5022447E317 +E6B851B8D89144BEE028D2352745CB0C081A7E806482F74E7EDDB5F1601A58D9 +EC5B92F7DAD1B462B0EB9DF22604BB2D617AC6056E723110CEBACFB0F6ADFC92 +F64C98F9910F91A8C4B39EF508A1AA01656C41247E1E8280A97089C515A1792B +509D2DBD3C5B6972F6829B60135247B75DFA7C067675B7010FB2F116B5009B12 +1F139A8A3E25FF52BE00D9C4AE67496958CA3D1D4568218542B77C865056E45A +0A07947C4E7D16D24E07A77ED01F10226CBBC21E0DF75293CED54214149619A2 +4A591F3F99EB14032AE840BEC7313CF1F24250BD8D6BDDBE85883D35D6907C77 +FCF01A7E8DAA9BF8E47DA3225623B645891455874BA99ABF9AC9CFABC083127E +CA636C8673A1ECF967BABDABF1A569319A4E382E7C593CB954522CC9DF04BEA6 +57297331734B3959805B89F96DD23C38DC8CE17C7373EE5F7A9035557E40C310 +7D1DA91F87F0CF45E54518B549DDC5F91851E2899E9756A069CBAE8E63A42974 +299781A390072C7E59B9433F9D47111900DEF4E4F10913BAEE90794333454574 +37B7A46664522983EADBAF6155C6A8624CC7FF1A850313072EF5B066059CC840 +C4A1DA2BAC6DD27D3D3BC9653003D5B25405492BB64FE4A1C294F06492093093 +A4B0175F6DBFE6C4C28C310F71010F97035774250EE0468E54A7CCF54465C7FE +7A70ADA08BB5B6A4AEBB3F60FA39FB810E6D7B1FBF169DEF45FD7E7EEC4B273E +A11269ED5BC9F8250F8D29BCBB656105FF2D71FB624F7A67C899828D3A563491 +9CCE8EF268F2A8986577C3A752F91B650DC9717A89F76DBAC254DF1BC705308B +2E4C7C55A152ED1AE945337B93E411B46DF56DD8F0942DD8403ED15FA515079C +A1035F3C7A2648761792E241C6710503F7A6093FAD8BCA34C0378700928762E7 +FC371BDA7488C95F69518E1DB63068E740942234A79478DF18C5752490DF199F +95C654423257DE301117F3C379DA5C90392A7BA173BA19BF2C35C9A0EE180098 +C228CED65FD5241B5DA3D318891994D363AE49E3B0FFDE091C82DB4BE7B240EB +159050F74BD181337EE202011BC96EB74C68E8BBB26E46020355378E6EC2B9D8 +89DB7907378B83FDC294B134E69D5AC1B2CBC821420EE28CEE8681EA3EC902F8 +3E8503A833B675E21679D6C5B7041701FC553B95D2DB82987EB4A010C8DCD9A9 +C0FB4C048617716CEA638CE3A16C90E55DBF76408A71B3B7FB784820EC3971EF +726DBE12A1098F350D9FF84E1846CD57B6DDAEF32C6B839644F57EE6B256090E +C711154CB95AB2910587E15E3F16D402943157E9CBA2174BE93B820951499A42 +F797664141F9F2698166395DF7116293B6557266C7DA28E2FC1F8BDA4B00C07B +6F7FE6AD4937A694EA423A2B90F9EBD30B8D3710E7E6D7BE15BA631E6991EE2B +1A28A02C4CC51889C37702E57F13F1E54295D77148C7EBB6B006DD232EF94D83 +20FFCB794B221BDEB84DCD737D301A44B8414B4591BD1D184C85B09BC5E28A0D +7DB0830419C1D92775DBFAD72F2D7E581EB08E516B0DE87BFF2DC167EBACE23B +73A3E770832A7A22B28AD12CA07DD15D22FF5EE53C48C55CEE77BD2D429571F8 +9DC52FC92A2D4F7BEDC0F27C39E7BFBBE38721E56234E9AF5FF1EFC753C8E281 +4EAF702CA8F08D3407FEF7E177FDE6177F6604B47872CD9EC22A6644C5A78CDA +FE3C51033C45BC1BE224F09EAF923B058E13ACDC61A0E7CB5C999DB0C8543BFC +4D65815338F65AA12BDDFC1EF5A249270D84BF1377FA064F62F41787F3D875D3 +0E4EBD38E30D593389ED01180CA5AD540A89B31933BCEC4DEEA2CFA94C03FD0D +290573BB3162C80FA9783A66AF33F11CD9437A7EE16812BBC32D80DC10057A97 +C83152905B954CBE464EF39D40056FF3047D9D57B9088A7FAD48E997B5096D20 +E21F9FF5858FC241EC16527F66DE8B403281A8FCA32AF1408D05387C3BFF79CF +25C5E6EE231B17287ACC5643C94E54A6962CE33246F7D03060042B623CB80C2C +2E2AC47CB431B64828D8D35426810074E1B98188A866406D24B8020D2082961A +A4AA27528B60C098CC0F8D34FF1DC6C5A4836C028B2295A4D8281278264283A9 +ABE23AC0A2EC42562FFD6F5FAFA72C8A029F333C26D8CC5B972073019BFB320A +966156DEF26E9AE303FB4E20EEC86A48468755EB228C5BDAB00714F96797F5D7 +E099755C8F80F0E3331B038527D5743345DDB65784D8234292AEB642C74D95AB +8927727F73AF12F8B189BDA6BE8BE6A08333ED0E2F6F95CE8367174E0280565A +97E1F70518E142D658D2335C2FF8C7C401322D6405D0964966EAC8341F34BB5D +1C654BD9D3489E6F730BB646EDE9F8607F401C5DD1B310D7D422703F305ADDE4 +BC45DD88E798C4F4286B117962E210BB9EFDC968BEE0A9C3EB6B35D1C2E8E50F +9B9A8D965B63255791A17BF7E7596DDB15B617B98A8E838DE92775EE9338421C +9A4C9BF5B8E78E475E814EB117719239075BA70DC806DCEF05ACC948AEB8378F +DBAFC9D998270678435EE7F8E262C2341B173AEE3F9A2EBC2C74CB158BE302D7 +A4FE57E744271A24F3714DF24DDC103687754CFC72ADDED342B5FD5CF9D13D98 +1A13712D09148EF593050E8099035C6B9AE8CFD59948E786E3EC4E1F426FA3A7 +9082E10E79CE44C2D9FA830113503944F8D23CDB9C27A3570907FEAEF76D3ED7 +C8E1F81DA7A51CF5B723F0E4C42E3ECAC298B3E1ACB9679A1250633C373805E5 +C9496CF87FA7A858656D4A663D3EE3218D9792CF705C361994B69461026D8CCC +130FB9D34293701A137E393F5AE79DE677D13DF5AE9EDDC545496A8C5456A860 +B36397BCC78EF754B6965D22004B978B4A55409F73C44B9FF02801D524740B9C +E4F45750CD7E45235F376CC2CDCD3BC1B8C7658F52A5EB185EFDB6A0884FF0AF +1958FAA5FDF4595D6EDFE28FB5249A40BDE8BA11AB0E997E9876CA0A0CD05A5B +A26F60316F61DBF6E65F43089BDA2D57F00EC72BA3666952E730B14C79FFADB5 +7448ACE6463BD29995D6F6F571BF3D0B426897E457BD30FE76D6CDD6151A94D3 +3D53801608A7E865A01A2FF3D915CAC2614DFDA0A931E009FD1CB63FCEFD0A3D +B26711BE84286E389805941573E02841C8E653FD3131316E768E2D096E5BA648 +9F03F9825333B2DAC376A79850AC29CEABC8BB1E7D4E34F37D6E9F388124A9E1 +9981131FE0F6718FFC580E678C9D8C1AED790D0C0D78407050D5FF315E605C73 +A16D6868E5DE5E8C1F63A88E159CC44DC0BB3E5CEC35CCBB7493975DC55F52BB +A33709E5AE3066894885728EE784142B492056EF876521DA69BE39FF4E2BB95E +C60688678B37692CD40A8BCD585240B0AA809328CEC0F954F0D50DA10DF61A21 +EADE286E22F67227CA286D9A0512EC909DC28518994C6D6E207D4D00514B0EF9 +5DCDA5965D827642072E6DB4B23D1F6C3250081B4D8E66084AEFD663C5F26E7C +E19A4F3C9A100FC4AADA76F9E4AD474D033819801F7444B51203366CC709AD98 +F62722F700E13DB42D80041014AFCA8D12B23B85BB2302AB944C437FE0FAADF3 +E86291BA50463C32C29FC7D8E4B5EFED49EC40947016D0846AC79E3776E62388 +372568D2AD0DAADAFECEFBC4F7E6A8B47C214A +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +cleartomark +%%EndFont +%%BeginFont: CMSY6 +%!PS-AdobeFont-1.1: CMSY6 1.0 +%%CreationDate: 1991 Aug 15 07:21:34 +% Copyright (C) 1997 American Mathematical Society. All Rights Reserved. +11 dict begin +/FontInfo 7 dict dup begin +/version (1.0) readonly def +/Notice (Copyright (C) 1997 American Mathematical Society. All Rights Reserved) readonly def +/FullName (CMSY6) readonly def +/FamilyName (Computer Modern) readonly def +/Weight (Medium) readonly def +/ItalicAngle -14.035 def +/isFixedPitch false def +end readonly def +/FontName /CMSY6 def +/PaintType 0 def +/FontType 1 def +/FontMatrix [0.001 0 0 0.001 0 0] readonly def +/Encoding 256 array +0 1 255 {1 index exch /.notdef put} for +dup 0 /.notdef put +readonly def +/FontBBox{-4 -948 1329 786}readonly def +/UniqueID 5000816 def +currentdict end +currentfile eexec +D9D66F633B846A97B686A97E45A3D0AA052F09F9C8ADE9D907C058B87E9B6964 +7D53359E51216774A4EAA1E2B58EC3176BD1184A633B951372B4198D4E8C5EF4 +A213ACB58AA0A658908035BF2ED8531779838A960DFE2B27EA49C37156989C85 +E21B3ABF72E39A89232CD9F4237FC80C9E64E8425AA3BEF7DED60B122A52922A +221A37D9A807DD01161779DDE7D5FC1B2109839E5B52DFB7605D7BA557CC35D6 +49F6EB651B83771034BA0C39DB8D426A24543EF4529E2D939125B5157482688E +9045C2242F4AFA4C489D975C029177CD6497EACD181FF151A45F521A4C4043C2 +1F3E76EF5B3291A941583E27DFC68B9211105827590393ABFB8AA4D1623D1761 +6AC0DF1D3154B0277BE821712BE7B33385E7A4105E8F3370F981B8FE9E3CF3E0 +007B8C9F2D934F24D591C330487DDF179CECEC5258C47E4B32538F948AB00673 +F9D549C971B0822056B339600FC1E3A5E51844CC8A75B857F15E7276260ED115 +C5FD550F53CE5583743B50B0F9B7C4F836DEF7499F439A6EBE9BF559D2EE0571 +CE54AEC461D354A32E69F39DD0C017BD6576F1E9500DC0328E8AF6EAB528FD7B +85132A2A9995EB211FCE849216BF6D663AD649AE92DA953C4D520AB9A22D27B5 +6C34121FD688F9E17FE39B939D8DCED9EDDE5AF6DD7DC2297F2A3E1287E5AF45 +0306EDBA3C843FB8234D0DDEC7595CDE6657E499324DA260BACAE9D6DB126FD9 +AAA7368F7164F6BBBBE11EFFFB65660DA0961A97D51ADAF2136A085FDC16C199 +72BC2CA210B330C03F4252A275FEAADC95CFBC79C3B7285C4C7B5C9665909A56 +4176C37DCB569C8EED1B59C58B5EBD3ADD31010DCFD59411FC2020E238A07B83 +2439DEB653AFF1CF197533724E45EDA9810B6793E27943CF51484A5BC7DC61C5 +E97F71E04BB623E0BC9C +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +cleartomark +%%EndFont +%%BeginFont: CMR6 +%!PS-AdobeFont-1.1: CMR6 1.0 +%%CreationDate: 1991 Aug 20 16:39:02 +% Copyright (C) 1997 American Mathematical Society. All Rights Reserved. +11 dict begin +/FontInfo 7 dict dup begin +/version (1.0) readonly def +/Notice (Copyright (C) 1997 American Mathematical Society. All Rights Reserved) readonly def +/FullName (CMR6) readonly def +/FamilyName (Computer Modern) readonly def +/Weight (Medium) readonly def +/ItalicAngle 0 def +/isFixedPitch false def +end readonly def +/FontName /CMR6 def +/PaintType 0 def +/FontType 1 def +/FontMatrix [0.001 0 0 0.001 0 0] readonly def +/Encoding 256 array +0 1 255 {1 index exch /.notdef put} for +dup 0 /.notdef put +readonly def +/FontBBox{-20 -250 1193 750}readonly def +/UniqueID 5000789 def +currentdict end +currentfile eexec +D9D66F633B846A97B686A97E45A3D0AA052A014267B7904EB3C0D3BD0B83D891 +016CA6CA4B712ADEB258FAAB9A130EE605E61F77FC1B738ABC7C51CD46EF8171 +9098D5FEE67660E69A7AB91B58F29A4D79E57022F783EB0FBBB6D4F4EC35014F +D2DECBA99459A4C59DF0C6EBA150284454E707DC2100C15B76B4C19B84363758 +469A6C558785B226332152109871A9883487DD7710949204DDCF837E6A8708B8 +2BDBF16FBC7512FAA308A093FE5CF4E9D2405B169CD5365D6ECED5D768D66D6C +68618B8C482B341F8CA38E9BB9BAFCFAAD9C2F3FD033B62690986ED43D9C9361 +3645B82392D5CAE11A7CB49D7E2E82DCD485CBA17D1AFFF95F4224CF7ECEE45C +BFB7C8C77C22A01C345078D28D3ECBF804CDC2FE5025FA0D05CCC5EFC0C4F87E +CBED13DDDF8F34E404F471C6DD2E43331D73E89BBC71E7BF889F6293793FEF5A +C9DD3792F032E37A364C70914843F7AA314413D022AE3238730B420A7E9D0CF5 +D0E24F501451F9CDECE10AF7E14FF15C4F12F3FCA47DD9CD3C7AEA8D1551017D +23131C09ED104C052054520268A4FA3C6338BA6CF14C3DE3BAF2EA35296EE3D8 +D6496277E11DFF6076FE64C8A8C3419FA774473D63223FFA41CBAE609C3D976B +93DFB4079ADC7C4EF07303F93808DDA9F651F61BCCF79555059A44CBAF84A711 +6D98083CEF58230D54AD486C74C4A257FC703ACF918219D0A597A5F680B606E4 +EF94ADF8BF91A5096A806DB64EC96636A98397D22A74932EB7346A9C4B5EE953 +CB3C80AA634BFC28AA938C704BDA8DC4D13551CCFE2B2784BE8BF54502EBA9AF +D49B79237B9C56310550BC30E9108BB06EAC755D6AA4E688EFE2A0AAB17F20FE +00CD0BFF1B9CB6BDA0FA3A29A3117388B6686657A150CE6421FD5D420F4F7FB5 +B0DAA1BA19D638676E9CF159AC7325EF17B9F74E082BEF75E10A31C7011C0FFA +99B797CE549B5C45238DD0FADD6B99D233AC69282DF0D91EA2DBD08CE0083904 +A6D968D5AE3BD159D01BDFF42D16111BC0A517C66B43972080D9DD4F3B9AE7FB +11B035CE715C1218B2D779761D8D7E9DEBE277531BD58F313EBD27E33BEF9DC5 +50C7821A8BBC3B9FDF899D7EAA0B94493B97AFEAC503EB5ED7A7AB600A22D03B +86A088CED7AE528182D2EBF4D351FD835B5DAB2036F44604002D0E21510DDCEA +F8DD36174C2CFEBAE2D183407AAC7D4D52D51D5B2890CD3B23A88228089D26BD +6E7ED4B31A60C45C7D8C00274A812ECF682228F241C13C41497BEAE1DB58C3B8 +3EED1B4F48D1A4706D71EB098C4FD67CC7890957724C12067CA54A2140855928 +E6197231734CB46E3EF820A1C19A6AE55A2547EDAA9994B59311C2D02BAF4950 +2A8739E2E60A1490884101F56392D67FBCB271783118B2568E2DD484465B899A +8312F466470B4A490266852CA56F7F56991A746CCD5A365EAFD700D47D11860E +2E2B21C90AA8B3F9915F81F0E2C2DF98D942F3CEA2300F2B9F6BC99FE21F2966 +AA932F222C35EECC2520F10C110D6FF9A32EF56A812D3760B54B451C79D6FE5F +3F93D3E5F9E4D56096A92B9E953F160551BB6FE26206D6A317219222AA58FE76 +6C758416537175D1F7DDA512DAE5A4794216C90B561F6C29C44FAAA5EB719F20 +43333A0605C0A095D8AAC862DE53BFE3EA97A756193E9E74E7604AB5EEFC1E7C +00888CF0F286073143ABD034A1BD66E81E588FF34930DA0421D01B48A71EF115 +BD68ECA6C15DB673CF17821A79484DA091B0FD42820B35ACBCC4E2873C3B4950 +F76EFCE8F0A80EAE5086450D76847F299FFEFAFB731C72B63DE42CDB342B1691 +0CAF1AD419B1B3102894D78C3ADE69C39ACD063566B0118C0E127D4A7C013D93 +C3F3A8D55B3A6BCFA37FC6796CB40EA156958F27435A2832A5FE55A08B76E258 +9440C4741B30E211BD4216DF1EDEE02D168A398B6769F8D165B7D7225D278BA8 +994DDDE391F57EB890156023E6E3D56E22843F3DCC582F7E6C571EF2BB436631 +A7E7738ADDAE7A0433C43A8A3B90AD8952E976F348973F79797E5B68469542DE +D610798FAFF13B24AFA2574BF898DBD661417C41BD0FB6D448CE99BFABB91117 +E8CDCADFAD71D882E51DF28B7D04624615C826CBFA745CD903E2303337AAA886 +DF481C65C7D914DE22A026BA75D232481DC320B89A9A2F6DA1D9E54C48CDCDF3 +F657A66DFEEA1FEB0E98A71666F115BAC1286D5E0273BE8A67ECEDAA1BFA4921 +E96E67138F28919D708719107D48D8F0C4E4DDBDFE6DEC21C27F260DF7A46327 +D924F8918E2F0837760BEC3666C7D5D60A9F2A7EB0DFAECA1AE4A79C15CEBDA9 +7592B665DFC923D1C6ECB7A3444016A1F9760493BA1D71232BF2576DB84CF966 +7A7466A55FDF764D4BD7810541055B989E8A8189ACA63014CF403E3926C4F455 +81E25361FE1339777B597EFF1CD63F007EE735B9049315DE035415170248B359 +EF4A0BD6960E23D3318A59E11190AFF749ECEBC81B0D3E26795B6369309ABA76 +C1E2EA4EC1DB3065E4618BFDE7729263920EFE5236EA355BC30C95C62718EDDC +69C3824B6A450B37974FE23553D0E1ECA572155E53DFCAD1E4F7C40FCCEB42F0 +8A41A4F516B5937D75FBB86BF290BB6548FF327853DC5A25D002A381A13DBAE8 +6CFD76979CBD26A4F4D97A791BC1E65AC1B34F43AA12D9F5E66E85E368AC33DA +2626EE4E399623D6449037D555E35E0A22E4AABC91B360D7A961FD335E37FAD1 +46DB866561D431B05A65BE91077FEBAD52EA5587D5DB86CBD753EB270B4AFDA6 +68C0F1232BDBC07B5D7E2B58AD4FCE8D004149EA212653A83BCA85A1BC8E5AD7 +D15D165521AB6377FA20A09413403C79B1266F49D983AD0BC50AB766F1CEC782 +4609F22694540DBCF5FD113626C89BDCAA59F4905D07BABD08BA49F976C0A79F +94A77AD26783AA9BC47B8A11CAA11090D09A88BA948844A45BCEDD3CDE0EF114 +2E16ABAC0D90E7B7345C04B53577218009E67C7B7010AD8DB0FF1073DE31C770 +670C6619622031490EA2A2D1A9FB80DD21A5ACC526C2BF0D999651B8E22A28FD +47B4708B288F5BED8E5DFBE57FB3FB33F00657B8544CDF6CAFE1A3BBDA9F2296 +3C5BEC4351412CCB9AB6F450188D307B9AC70CA7D9DD184414833868B27BCF62 +C8CDDF23A7D796D0A1F8155E66EC9D7B35BF0FBE185103A37EC12981EADBD16D +70CDB2D685FC168F08AE39F375739ADFC915A63C6A7246D164A12569155B956D +A7A5795A6EA9D4FDB0AFE54C63CBC01D5C338B68DAC3D23B110527B91BC0527A +30D7E8B7DB2A6CA19B7C71D78D71C41AE0557E0A9CF2F3285F53CEF69DC3C91A +B3EE632FC1416B4B36CD2FDB8BAE850FAC5E9E0B7B57534A8D86948074AB123B +B39EBA873F819AA42D36D4E07E2507EDBB3144337A743FB436545938E4DEABF7 +03EF9E9752B4DF79396023282325AC3AD52F42430A97C54287C94C3C910D025E +B6C40DC9A11D864614393CE973DE186B99F4B3C0F33CA18E1D30F8E8EA70223A +36853FEC29C0F96B59A6F59C0A33712B7053001FD554D23D0FF848FEB3C7EC9F +7455645E42209FD5B8CC08A4A882E34275F6EEC5B16E7A7DE6C9D8941EB6BB46 +ABA35AA067E0439AFFF7DF7A660D66C8503BF35EC83C32270E04512FFA90618F +6825695BB8ED9F97C4FA706BB84B66A9BB210628EBE19ADB36D679CF9E7B3BFA +4D4764BBB31682A14FD537266E2CE1F4640131D324382542FF8B8CD9BB108B69 +6655FE8FCFB277A88C58A7E2AFAC9B740D840EDF1DFC50747CD3EA1DC24B050F +B12404954E42E14DB6092B38F32CBAB9546A9784BFF7FB16FC0F3D2875A35A16 +75EEEA82FDD3DE0BAFF2C26BD37D229CA06A002529D27EAB41E20818ADFBBB5F +0AAA37BB95CAD96A3F700C2E5B7DD988E89049051077CBDC2DDA592E2B99C090 +53C7D459D85A72B01880F10F9919777AAC2A3133B8A7CC5926ACB6C87B0552BE +D310D8E86E5F4B142850D45664F2CB087C0E7546DA66214DE18E67D1BF098A30 +137068F9E9735933B96B4242E805B0D4E58FC9EDE7330D4217C9315BF6317608 +ECEE1BFED5BE0CBCDBE36119465AF20A6D7A3244652112A1E602C358D5271595 +213FC19C6562678CA6B38A817C0E7CD65FE588A1D9307FACB838C6F5461C0ED0 +888437043743899769E94B7EFD49B022E3A663EB0A00479B5C291937407B52DB +36E71F524C1C6F4A91BB99E1A824A25C3917DDD42FC2F9DF16BB14C4D28CFFA3 +BBA2BD381C27AD1885F7DECA566B15C763B3B4B3F3EAF3806275D8600FBE4B42 +D1FEBC74147DB1CF64549C9C7DBEED10F44F4D585371BBA5357ACE0BF864231A +436FEC2C90C94ED01324D5946B89CC05C087CEB96AF03E350BDF44683BDD566F +0B2C48C4041411EF91A57119C9ADB0F2523477F46F72FEA57ADBB2AC25D3135F +4F0BD460DC6D8E29830341C64BAB91275E9CA08B713955A5D344EDAEF871DCC1 +B50F30858C3C3666597B73A752E93DF128546D1A1812C5B916AE1F44CB36DBC5 +A26B5C3ECFE3A3E2A013B5BAD5722A8943BD678F651528ED340EBBF59FE47E0F +D7BC565E44C38FF7697C3F1569C241D339EBC685E7C4D7BBD318B74E6AAFC97C +49EECA3B147E485F1F2475AE983A18395063BFDE981F51E6A2CDBF1906E499CE +6C6403DBD85E65E44839011D7E3F62B7504A9CFBF6A5D3C9AFD6BA64E636D7AA +E43BD83ED14C6EFB36A5233A5D795622583AFAA09000C8557848705231B6ED8E +5E3FA79173C172763C70AD176F4F3DB0054F144F661F9F028B596107DDA43168 +11B6A56CE4D375EB9F3DACC6EC06F632CAD1D994217FA7DA1C56F681FE7CD0AC +6CA60BCD21FF4950D20D4A3F11E0662BC1D3CBD8AFE2DFF3DA1C609E0B337B88 +87B6FC6E735DDEFC00C491916F69D0478BA2C346608AECD337AA80031A269380 +45E450ED7BEAADFCBED412595BAC771ED3C1BFA4459A6278EA1F00CF89C9EBDB +0A43F9CDF70A0AF808CB329CE9907FD5B36C3AF5D1C475AC99A6D6F22596CD42 +1CB7B14123D38D8FD9109438D9F49EC8AF29176204C0A776C60009AA148697B7 +F5496C6FA123F9ADAC59400E139A0B886E110425839B747241A0FD2DCA8621E4 +AC3B71FFB6FF1BD4FC5DF726DA5F383D573640774EC6327F772290930F2656C3 +3D3B1FD3F6B321E0919720F03F3C6EC09D05629549549CAF621EF916071CB6F1 +22625657C27985471E16B21714100F8B80A2C4035C5905C54FF95AB7358117C0 +DE70C0FDA8187FA316189D13A9176C1171A318A81D6A77F0E54D6DE37E5D81C2 +5BF1C7EFFEB8D130DDEA4250C4FF4F1BD1B535A20C3FEF972323F114A9FE90D8 +48162CD532AA3423FDA9AB00AD6754C8216253CE936DAD6AED5BAFAA64921186 +E217F709A73D6083A8D04F11FFF49D2D8AD5A55415043A8EFB32A478B9D70F95 +D9E63A92B53EFAABD9BE62461FEAA541F5CA67FC137E3AAEECB5BE50FF74DAB4 +18BAAE0A7244F072B33F3AF7474EBC681DDB09F4A11663EDA56268CEE9E653D7 +4C068E233BD3F142653DCAEB01E2825AFD6ACC54659F66B21AEE64F66727F033 +B3D7D17C051B17B4BF41DAC5D8FCAB88A36DEB62BCB5D248854EEB8A9EB2672A +391013A66539BDAAD4189563B45C2FB57EBB9B02BA6845FE2E7D66CED6098014 +2831ED864C366FD3D2A36D9823E84C686D401BF9F01B71CB9864AE245E34D554 +4DE79FEE3B5C74846967D0512CC9FC103DCA3DF48D0D491E70C8A102AB9A92AD +E868509AEC8134C6587B505139FC438FA994819CD17F108C754DF744F31B0731 +E07BB4F12389EA058127E75F5AC024595CD8477F5FEC80AE9EF2109D0FF15326 +808FC436888B98938234E93EBFB0BB009F8FACC9D0BC0058E37040CED69EDA45 +D08942E834665C0595737BD2C4B18CEF53BE576C03427D0EBD25D335ACCB2473 +63B2FC3FF036BEF8DE2CAA9308E089C591C331DE41017E36914FBC5426358701 +151572CE393FABA2C55D67E7CDC90C78CC6D58C3C6DF6524E5A9804D0D9A0E3B +DE85F7D0057D2ADBB04FC0077E0080DB404726A8AF5029FAFC05589D835F9ABF +ABAB4C3B3F66384368D4A2B6B3D6C1EC0FB4121C59D1C5C50CE8E65E988D06AD +7D03BDC5B095F3BB54A1E4E7DE57601A28BDF6D1C8A26268FE2A8B510CC62B10 +A2F69EF9E8A766BE982C9D791B42C10502F3BE4516D103DE941633F021DDC99E +4C6BB01CAFD7B886E677897C775485878943292F8592C4DED879058D96EF9F10 +B89C8BFB5567EB7D53B13F1C9893A60D22246DE121C993E9EA563EF972E433BD +DA1119607CEC7C89145164BBF82194A31932BFA6EA40A2466EF148E9EF09209B +973714C0DADAD79BC4DC8F767D948AA227F9A12F46262ADC3FC80BD464EB3750 +51CDE98239A728AFBA32DFCDF0E04F1364399121FBA23EA9660E71F1BD2BF976 +F6DB04FE31B3D89112C8EACEC00D8BC0834D63025580AA2A77588FEF5F95BE78 +7AB5A9BBD218B94A7D7E14AE6FC65A615D39058DE4644A126ED9AA1EA03B0A90 +9B8162D84A883D5BA85B83BE8E7EE7B3EFB9F50ACFBFDE4178C4D12D6054A046 +7CC57C142E055B9B822422C9F6E3F2323278AD2299BF211302CAD720BD980980 +4D4EBA8BCE79BC6613EB227A233BF4E0C5B73FD1C424689FECC8949C19E581B5 +9B4534060BB017C315E46E102F9C54830C11CF867846427AFF0293B6EF11970F +A5E75BB89A8937512FAE083F1BA63BECF2B5ADCF9618F092F461096C565B55B8 +714F9AEAB4F76920A80BB74538CAE55A617C3B265F64E1B1EB19D96DEE120581 +7FDB28B9823C6F5241ED566AA02650CEEA40E6E1A2C6DB55590C5B5572D8F57B +6AEB288D7869B6A7A50B27E496905CE770852E9BE460CD2D1C723FC7236F92DD +727B27FAF82E9E7F32BADB7911ED3C6525D913BFA333EBDC18573F1441624892 +EB53FDBB6A945B38FC9C376C3D534127720420E20DF513EF381E2B6B5D5E5C23 +83412BD67435CD6BCE407B8FDFCE4F0A0C35E5DF9DDBB2D1D5D7CB2A45D886DD +58F908A07FC48C245DC31F28D30FFAD477A1D1AC593FFE8086D05B285C700996 +2CB06125A817D4850B6D3DD246D671554AC1F513932BFACF92A15B75F87DB140 +F5225D5B066A913E6E3631F160CF60F54709FA0DECEBF1BB203F4D902B4351EA +6369E4872617A98DDA8BFD29E8933D201A09149077EC934C0B082B92244DBBA5 +0E70943FE5E1E8823E0620C857D8A3CE3F857FA05A0DE16D7673E9CF27C847A7 +C8A8DC1F7B8E80A652C47C0AD748A60D76724354AE6D98D37E164B8DF1AA36C3 +04975386BD0C356DE67AF3AF9A2A7C5AB957994A588CD1BF864C64C2D00F8D07 +CCD30A5BEED0371BD23A4622BA3B8EFC35FF8A552E770FB899BFDD7A924F228B +95B56FDDF795C0D469B399FD0DDC140CDCB61C6A6E30561CA594D7A7A0E86CE6 +B8B4A04D3651CEAF4D11F86CC71A66DA5D66555E27B1D3503E92E368352A0501 +FD045A7D79716CA26C601CA2888B9E57DED1163C821C10EAFE81CF0461A92413 +BB96D2CBD385D17430F3DD50B260F58DB83423E826B9F55FE96ADC290621D17C +8E4BD1A39007D3EFFB5EC104D2FFC18DF08E16753C26836752BCA0F190882433 +00D86B38E658215741C887494D161A56FDEC75FD5C4E3802318C3D2B72987F3C +2DD3B75F669F2808F2A9C0880852A4A6236FE8A4AA4FFF753FB8E0403A9926F2 +73A342837512D46102279CC3B105A959516C9CD4FF86C704BD81A2DB5FC1BA55 +4798041822419EE5B201F48A1C182EEB9530D6205677136F81D3D911C98FB220 +C04E1532CBB717A68A5AE74FC5F6ACCFFE1ADBF194551F4E9E8C481C32345FDD +4615B1EF62FB11C900DF204485616A9D37EA2B41E81EB1854570A07B76C7A064 +2C897C81FF81F703AD989D304CF7AD99F9B900681C935A9FD79C0188B3E2B50F +19B15C3D95D0319406F917A31676DB06839E0180EB5AF09ACB81A4493CEF52FE +F606841668FF02BBA4492216D789B6A3C4D9C3FA1310305E9878D7457D7791E2 +4F4749102F501AFF64C3EAF5A90B7B85DF090316D74ACAC512B040C19BBC61CC +2534597944221052369729EDFF43EDAB917F2117353A8E76A6ED790FAEFD58CD +7B0F694B156BDCDA89DDF6DCF2B47B71CCC037111432C562AF9C6B6CA1D1BA78 +FCD24F49127731799F7A0C29786E2DAFBE0A24DBFBAE0E9A0DCD44E4649DCB7D +2916659DB0C65232B5CDCB015827F31A5530489B79A6BB45D68E19E3ED13D3B5 +31DC8454C68CF35E3E8FD307CB301884BDC0A03EDC4F08D4142E20494C59F6EA +8CE8046D29869C7DDCA98EC906411C57957D1C8FC5404434250881714434B1A4 +5E368208D33D37066855A8BA7318DBEAABC15A83F2E1E50362142A67E443CF03 +E31904E3AC02993022789C3A1638A2056A0D94EC8D64E2A13CED8014C4F4FA51 +8F54801B2BDE7F9F2D0F656A09EB713E8A97793DC5E7F7005241AC5D45BF297E +429C0CB733F1B86A28AE15CB627C98548AA0DFC81E7F62817989E325324AF65E +C44FB6A9E42A270D789463D125EEEAFDA57DFD09C94F1354D5FB7B10D8F9F47E +B6F581CFB243A6B634647EB496F2884CF4DEA98503F4EE906A38173D2A6BDADC +A21B3C206B15BC842DC7FFB7022AF0F963177F310E971319B9DD3BCE508D4B92 +AB9B051FDB2851502D383EE103C4B0B232E32642E305838BD2D3936387816961 +762185C7152062F990585E9055F94BDBF7BCF46EE1E5D30558BCCB4C996F27B9 +05F40807866C255B81A55D0739041B5275A66F58FC149778AF1D2D90BD83397A +33AAE594FF0A34FE74F524FEB43A223F8E29D7ACEB1E8838EB0AEE7A5AA401CC +9D93AA03026E0879E9B7C7BB3FED71492BDDBB28EEE6860FC9E453B0A73982DD +7AEA950B45736DB924A67B8E88945C2FD9CD01AEAABDFA43D12083AF7D4EB987 +FCD27CA7EDE61E5707AB481BC4B566887884C33C89A2D0B234D6135BBE98ADD7 +90BB22D3BCF19B4C69FAAF0F7946A8E3ACE5C933E2AB65511E861E3C5F9428B7 +B6B61DE712F224237AC705913D0C15E717D00F1913ACF411528D7A0BA81ECC2C +EE9C5A09F0414B01AA880EAF1776C3C4C965FDA4FF258C2C10ED0C0F894F67DC +1EC0876ED390CE114D4635F1F7837381CC94F52F4DA12FB9C700B94D75E282BA +C68B284F09331DCA78387C2F262FFC436FFE0B62F304CBC8BA5C287736ED17EB +7ACE389AC473AD84A72438FD57D3F8BC75E058F0ABCB016BE01ABC26E1F2EAF1 +406809EE7F30883E006C5D62FE0D92AF0FF209B881537F7B5A34443B9A94A6D4 +4C6749230716E53A28B429458A485D1C1530527C869EAC3DB8E0928515CA5370 +83D760905152AE563F58CD82D46F80BBD9D6CA797FC8720CBE190D7264D4C754 +4590D83891A2A01C4D43AE46AECFB938899BBFDD5A0719AB0B51BD705B33446F +24DCFD6C9D7CEC05CBC7084CFC316B0370E9F9C5F3808822C8D29CF927C76BDC +E6C31B044951C7F455686689CF06E8138A7B19B7CE1DFDE3343136DE9287DF1E +81778DDC3BCEF0D6DA8DBD4D56D3E06FD6AE0B51EABDB7B52024636DDC0A2396 +D34630D3E3F47889DB84CBEFB6270B85E448E02F6E81A338AE0230551D629FF4 +94A5859462DCEBE89BA8E57E107F6AC587F79CF8B427C493A5C14AF7BB045176 +A9FEE5E34663AB3AF9A8CF714DD1DD50E18889D04110634B15674D68601C4ED3 +BC8B95B927E5B2E16880E1BC5CE1FE385A2D416973B52C1A2FE4332E964074E2 +94A69FC4946F579CCBC12BD381A80B5F2B1C662CB98138B58EBB93BCA99564B0 +98CF2EB381B04F005343633B163C4DDE8A98500B447D2BEB878AFE8982510794 +D276A4A6DF3D36B0ECF8CFE7D3ED4B364B08AF5012B5AD4BA29FF5886BDF1BB0 +72378D823C1929FB02BF7C9E41B483EE3D18817B056E8FA98FB9863D79EAB517 +54BECBF7579400AC5DF7EDE80E202AF75E66C48257A50390A9784BD6077C8FDB +CBE3D17F8BAD802E97087A8353D3412C24B0F886AFF91D101A5833CDADF898B6 +DE548E996DAFF04D6CF8668A5CFCE8400C2737D0124A97083CC808CB80B24BD5 +0162448072D97FCD1FACC4146559DFFFA11BDDE0E2698D92A9733C10BFD23E38 +73151FA9C0D030872CFA02208A31647E1A7DD2C182044D90F90D48A9C4C422A0 +FB5A3A88331168A296EEDFAA02AEAEBFCA1A698BF8A01F109EF2FB767B4F679D +6A39AFF1972E93364E5FC5E52CCB76B06560A8FCEFEA58BE9893F9B20ED2CDA0 +F0A2EFF2C9142A50B73A1EB3547C2B7954BFA47C590FC35260C75BA557A36AD8 +18CBBC03CC65C597F432FA0F0F27DB31EEE7F754781BFCD4EFF6570BE397BFFC +35A7C0443A8172ED4FCB128DAA55D7A0AC14F9FFF97A43538C005ED8A1FB1760 +8D01F3440420FFFDEE149F036E278E481C35007888431CA712097362CFA27134 +36FCB600FD4C4541659571FC17B8136CF3860E2A41177C4E0B6B5E39B51ABC5D +5B5D6D732DD3D122B956D4B4328F15252762249F5D50EE7E37FBBFCFE28B12ED +48285FF811045768B7893A838F0E02536912157475D473DBB14CB666A00B400C +276DB1129A8D68681CED61F7E21C5761AE13FC383F55BB6FF75579CC533AB682 +E2811BC342AD6E899EBB2B16632CCEDE09B05F9DEBD65591D8CE0B6EF0FEC4DA +10A55429C85B679511962DB373C41EFAC813C0674DA0C2B02BFD0DC1CF82E26E +15BD338FC3236CA8DA4FB3437442EFC077549ED51208497C6B074DFB6D386333 +C0DA4772232A367AC13665201336B291E8F08BB7B30F88A3959B21C0303EAC16 +BF5BA8B4F051B58028544D56A13B171BC76F3854974A0632E262C2B90763593C +D85BA7A24030561D968C05E641F3A72EB769B4 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +cleartomark +%%EndFont +%%BeginFont: CMBX8 +%!PS-AdobeFont-1.1: CMBX8 1.0 +%%CreationDate: 1991 Aug 20 16:36:07 +% Copyright (C) 1997 American Mathematical Society. All Rights Reserved. +11 dict begin +/FontInfo 7 dict dup begin +/version (1.0) readonly def +/Notice (Copyright (C) 1997 American Mathematical Society. All Rights Reserved) readonly def +/FullName (CMBX8) readonly def +/FamilyName (Computer Modern) readonly def +/Weight (Bold) readonly def +/ItalicAngle 0 def +/isFixedPitch false def +end readonly def +/FontName /CMBX8 def +/PaintType 0 def +/FontType 1 def +/FontMatrix [0.001 0 0 0.001 0 0] readonly def +/Encoding 256 array +0 1 255 {1 index exch /.notdef put} for +dup 0 /.notdef put +readonly def +/FontBBox{-59 -250 1235 750}readonly def +/UniqueID 5000766 def +currentdict end +currentfile eexec +D9D66F633B846A97B686A97E45A3D0AA052A014267B7904EB3C0D3BD0B83D891 +016CA6CA4B712ADEB258FAAB9A130EE605E61F77FC1B738ABC7C51CD46EF8171 +9098D5FEE67660E69A7AB91B58F29A4D79E57022F783EB0FBBB6D4F4EC35014F +D2DECBA99459A4C59DF0C6EBA150284454E707DC2100C15B76B4C19B84363758 +469A6C558785B226332152109871A9883487DD7710949204DDCF837E6A8708B8 +2BDBF16FBC7512FAA308A093FE5F05C11F9A72F5DA508C30BC4BF52C8B1EC5FB +7F9DDDD0964A6D59193A389D490DAA6F6ACD02CF71C06802F3AE5A001F2B3A6D +EEB60E9DD26DBCE1D29C825A9BEFE3A6572E70DC7B60344C3E0C9C77ABE1804C +7ED61C544F0B4A3D6C7662DE8575C07BED3F6DBA7D64A9C8613AA152B74A140E +AAD9B66E0FAEED6AF9D1820F361C1269A5E90519A3E6D40782E06778C0AFAA30 +E8CEAB87054C4D156C1B14B4E8471D78648FDAC70A3B8ED474FA356393A77420 +4211F60E397D2FEFC6A8D91A80C84EB9E38E663249FB91D5C8A5CBA68BA04272 +5D5D42497E1CF5CA1E62EC2B139F5CD4D6318EBBA7AE28614D2D88709C2A3762 +611524B8A1FFC7B0FCBAF77AD8159C354F4887DB1A27781DE0A4BA7DF2CE2025 +D9278CED48584E8E6BDF30BFD24284BA1DF828B637BF84A02908BBCED67372C9 +EF44711BC2B1DA343C8D9D27A9745525C774F5D639B7AEC197CEEDD06FD27923 +35ED0D402AEEB51134665A47847429D91CF419CA9B09DC905F610F8DFC54E606 +ADCDA19D5CC68A7BC7108EC9236C64205B23CE68B9BC38EF3E5BF9E0E6ADF404 +7365C8D0436609438C82EEB2F356F79186DDF6C1C797D3C278108B1767D15178 +C4C3E8ADC2482BAB9536AE8419E5CF3EE1B6E53BDCE2A83E2E485F496A562C10 +B3F5A131BB19D1E5414C86C5F995521076340536E10613E42779FA15EFDB451F +53495CE8EFF239E4EC442E1439594549D45F5276F93D496C9AC712D762D0B702 +E894290BA028837304AFDDD8BAA6564E9DC307A14A7A206550FADDC7784DE3BF +3390188BBCDDD929C82B1D7B529553BA75ACF5B385D31EE3902D96B2B5DDFFF1 +9F0F90FD791E54128C1717F313486896868A34FAFF22E23CEF046D02C1419BA3 +4389DED48DFDE7F78F8ABE3DA17968B0FEE61D27AB43F61978CC300F2924EA14 +BA6FC2FB5CD4E01313B34CEC99B77A3D837EE53D274DC3BB04EBB9EF0EEC5A69 +962A0F4F2A482166A52E809D5C4888EC688BD43E5A099D9FA7035129CA7C2722 +844491DE966335021F4012ABC14F978ED81748F0538178EA4C9D7A0B35351EDE +6807474C509D11DAB19B297536ABBC95CE452FB95A95A704B50458BFA68E30D8 +BC5CF97BCD247877760E3D6214BC148EC97E11DAF733750448223DAC2431D482 +63AB82145EA5F9ABBDCC991DB40F5DD4D5F484954C2E595E477F986444F55AEE +401B565D0FE39818DB83ED1702301ED4A36C26B64CBB6C061D6D0D15E5BBA146 +B302DD3E988B4A55409F36929DF832640D9E53100AA7ED1D1B256F255CCC0690 +C3CF605410317820B3E03ECB0B9EB0127613DD7816D649EF409EB9C1EDEA9D8B +54F7AE88DD345B7E37076A9009EEF28BF01F3A1C854881D99A29D9034BAAFDD8 +C3F2FAD2A47CB69009B4352F69FDC78C225C69B3A637A26065954A38329AF9B5 +29A7F6932FD992D80292F2CD1597FA436D0DE7C91407D1CC2AFEB98F55478094 +2741CBAEB447D55DEFC2B7C49D020B6EB50616F4BF5063D30EE5838E4FC2E147 +715C3B6416075E9AEB71E42569A9ECEFF9A2AE2AA55C500BED59B9C1F6A1F66F +38AE40AA742517E379E65283EE626156AF35FE4A26E1CBA0073A738709F54B4D +B9BDAA4EE057E728D0B461687C9975DACDF3690605C2D98EE0B7BA127114E52C +23C542E8D2EF39D2C9E4B793EA50A934110C51066DF92D7B38C3480777D07EAB +49B84B4CEDEE7158CFE26EC882F1A5E4B28441561FD2D13647AB40792DD4A970 +25B7F1A23EF4EBDCDFF405B122646895FB3E8E628027E34A72E67020D5E62A87 +38C223A0F1BA730FB4FAC3112FEC9111997301529D41598F4A40249E083ACB42 +ADE41AC53ABBD8717429106AF10DE43B659A6BBA8A235107E1CB2FE299511AB7 +6CFDA174E57BB46991370ADD818E0BC0C54A8C66E4C97AF12E038FDA89110237 +F214F4D582705CE5B3315FA281E35AE58953F8D70457CADDD552CDD364C90FBD +DA811ECABA00498EECC9094A28B5E198058D7E2D4D76EA6D75959FB832FB7034 +989D3059DF980833CB801F53DB5E1117FF0BFF172BA5821D83A2A3D669F39A29 +B85B33884FD0240588A9894FC06E395193E97179B9DEC65AB5F823757547945D +863733D848BF0FA705C52606455D8A3541ECD15C42A0FFA699FF350DB28EE378 +3467202A90B7ABBDE00DB651874F6D60CC26909C7618D4C741ACE9180A572632 +BFCE0C6C9021E1ABCFAD7824095B19DF5B849A293E7F1795806DF7FC89A8A91B +27E3908645DEE3E6468BE5356ED95832591900216DFF2BF9316A474B7BD36214 +8EEB23E9AD6FC316076B051DD9C90C7D632120F972FC285632F12367C5ED1560 +9B2918D03B72B9B551D2177E700EEEE3377B8CCC1AB270255D90A81C3183457E +4358C0F074367D9A555149559B8A6038B2F3E740215847A92DB817B98DB070A4 +6B92C8C8A0746319DF9E9FCF25E73789ECA755D28959F89621F315608ECE9029 +BB685128C8D22BED5500D1886C7A677C985DDF465869866E2F725F6BDE7FCE2C +C819498AE0DEA811D77FD1C7431BFA72BA2ACE9656A7B947B698B95EC35D9A1B +E9E908B2E47F213C7780BA017D3F52E3A65ECD58002A40B9BB01A7A9D9B05484 +AC1831899684A68B28CC9DE6C37514A815145B7B13990DCC49D8C28642496457 +B23819CDF607DBFD58F09E920CB72E0C971D883DBB5C8CB563BC09F096F20EAC +4F2E6391A8736AEDF56B60A4FBAAD9E2126C42FD8C71B5AAEC21B6206E7547E7 +0B0CECC2EFE5734F00EF5CFF7F35F4A49F2F5BB6E3B5260A9FF0C8FEBFDCD944 +F797069CE01E2CD7CAA31A8297142C8BEC67C912248931C6256BECE7D7EC08D8 +2F81BE0558DC9C80E7E9B4E60BFD3ABB8F33BD62CDD74C78272833D88A13116F +1999901D3D02A3AB6DBAB0059C475931B9C2C7A99CE5CDDB388D95B2682DF46C +AAB2DE828CC5A4D2F41B7689C83E30D4BD80B9909FEF97441664290119C8C36F +E3C16D55AC2E121675137F4BEAB59765CC5C85C1B7EB918ACA2CB44EB0B06CE9 +BE34C937A8AE8122BB93773F6F411F7A759AD4811874D72F7E3F75EA52109914 +7D00EA70A4DBF354EEBCF2E8AE0CABEF155ACDC24E6797AC20B388675E8CB391 +FBA2122CB835176E241899C7F13F534DBF8DB886A6F83F126BF019DBF9FC5C8D +E4C95FACEADD7E7B6A1755C1CEF78D7AA92286BF4837EDA2E794EE2E2277D58F +E66DAE65897E32BF653F4AACBE2B17AB3AA7FE117E029436F8F6059069B74ACF +1EC7B1302AFF42B38C72A96141B21FEEB4F4FFFAECEC4F2C2FC1068D831DA3D6 +7BE531812DE4307FFFE8A98B6C4AB5F9E5A1F6956AE39807CD6A18A12AF22992 +35D43F2A274D6D081E8D530C8BBA1CA5B5F8AA11E0E05036B272D9CD053C615A +9DEA172685B70429A9A8308E9C16B95E6E06789B1E3DD22A7289F05D13BF0789 +F50D6608835CADDDA11676597736C41E7DA9A948C857439F0B6F39845FB1679D +3C8C14F3C8C5131A469EAC144B44DD3F3DC1315FB627A80587F37A42B211064F +9780A45ECEBB176CE484A8018D41896F6FDB4E4F4257A60E869F280DE1CAD45F +BB478526395FC993C9CA6A566D3FAB84B678D7E0F591A8E7D009DA0952A44632 +DC4277D08D56B5E81103DF31BF466629EA658C190EFC1DFADC75D272E7DCE4A0 +C6309F2563AB76640643CCF0A905614A3EED3426DC172A4FE55B76640B415A10 +951883D8FCE87FFD8E1987E93475DA0435344EC33709FDEEA16D732B9BF323CB +FFDC2F308FAB7D76D431713478E922BD9CA32CF958B8E6B82B8ED9B81CB06BCB +3AF17A9CB807F8FB2A963450667F7CD93E292E13916FC07B976E7FBD978D10EB +685D7160102AA8359E260454D8C094C2BD04648FDC58E14A075B6EBE0E861E3D +6117DA938A1215B0790E7F46B7EEC0AB98C37FF9A54A7D3A6DD83759FE9716D6 +80F4AADC28AA151DC0E7916146343B2229FEBBE04E4650018BB3D3172C2E1455 +3080E67ADF626201FECF58201BC5FAEE3C01E8EBF8781A4F8595CF80B013ABA7 +A2842C6AAC9BB76FCD645F0B5A081B69B5A641886826EEB75C8ABAE54E7FA7D4 +39875A9ED06053C61A330ACBF818BE56FEC992BD5A30CEB78D8CA54FB1CABC63 +02E052501B309D157571BB3BF7E27493D6C2BB197064E1E26DC2FF85D5549B03 +5D53346C86588A0980DD26175314898BD7288FDFA33E44FC77AF2AF116D39543 +13B45BCFFDC83E8B9E2C9AAA46AC3ECCFB07E17B35DE3070818B648E2A69D438 +FCCD284A6955A8D50CCA3C46ED33F8C3A3D686311BBEECBA3CCA1206D01B955B +A805244D4E5D4F02E346B408F838264C5A056413D25326FF1AADBD21C2130B87 +CB6F9C91420B9594309F002215ECA7A5BCE554CABBB1A43CBD3E76372A48D95A +2F1237DAE67566A6BFF200E263345D4FBD5A1B7266BC04F85EAF6DEE32ED2D01 +D15F80DD5D8C1EF7E614BB629990C440C0B964B39104F82CD5D0CBB0BC376ACD +0E2E75D06E65C92D163E7498EB7B0F9A7A6BD9C8483B0CC801C30A31A4DB8DFA +2DDF2F1EF87634ACC600B066E017BDA91917569E9AD59F33D7564C875EF596AF +A953F2226C410FB2CEAB7A508A666CA3D94F2C25A931ED9518DF783AEF44DE3C +733875511D5E6E4E06E3C430D979208B60445757CAF3EEB3B63C29751E3C5C34 +D120E62F4868D87828D191221FA26BF60F4DC9741991EE948B413587CBF50520 +FF5F296B9483EB0E056F548E82E9DFECC2B90DCD5D5EA0958C62A48B1784716A +859C863592EC99195BEECEB6AA64C2A870D34903722AA7B19B1C7F5126BB74FF +763EC2285CCB52F13A2D1E95D8875DEECF34DDFD5CC3F18F27E925C9BF9690C6 +263CC22381F06042F0AC415A28EA5302DE6F35F1215B04C098AA18277F23EB63 +E08951EF3059C4A3C606E548DAC4CEF42D2A116C02EED4270D1334B3C7813820 +054DC6639A3C4B25A398D5354F57B7C556A5A95D20FA6FBF3406E3CFA512648F +6680ED47767E80A0F0F1EA0603CB441476A81B8BB278584E747369C88E4A9A27 +202C3688C3C2162AECCCB65FEF5314F81E0953BA98E833F84134502BA2C4F0DB +CBCD65A0EB3DEADFD9584FFFC9948571038249749CE13A9FF0969100DB588B09 +901964577D93D0856FF3A078C4DC79FE5B6C1B5A5B35FD22B214BC16E2D7A5FE +9B34197D4A24A1DC48240C6CBEE2F4FF5A1353A1E8F83209B0310166B96FF31D +56CC9EB5BC1206BFAD846CD174304627F81638FDE11A6BDE75CA9F346859E578 +85F334A455BE91A56B9413EE7D8AA01FF35499934773CAEA0D32041B04933C9F +51AAC647AD00541885B774AD4D3634D409DADF2004D8EE731A3E6134D79F0954 +CAE30C6A6CDD2BA4A9F93C10C94C1F9934917627E4FE44965AE2DDE0B415E0AB +EB5D1624171C7D55769F616F73D7812DC4222C2E4D65DF04EFE406BC4835F746 +BCF26D09314490CA27CA888713E8EA68C130EBB4CC5E23F2468220AA157D6803 +6811FC79435982D29E09A43F7707B821B3FD44738EC3993797469052AA9C0AAA +F21AEC2E1D2DB7AF0F65B4C3736FAD9C3A4DE9E72CC92B53B74AD4343D244EA9 +EC06AD54D945040A6F160A6E1D9F4B5902601647A2811F9D2312FAFEFBB31BD8 +0D0B39593E10DD94B862FF81B35649FB16178D80C9F6F027C2CC3BEEFB474A17 +EF1C77A9247B0D550BD314240C2BCF0A37DDFF8BAB723B153970CE2849897844 +29D3C6ACC315198B15CD9D3FF34A8E283A5137C42474BFABD43B7C7181409831 +3BC0F8BF0506CC5FFE145289105E80854503FD574F37608D176B4F9B60B05222 +6F4D14D97B85F27066D0E19999AD9EF9B657B24136FDF9061411735629D48504 +1171A1A9186630275E705D61390E2BE3D33D0D97902096587FEA4E7DB365AD54 +0393E3A46D605A3B6EA413D14465B7B8E21106C8938A67E51FE9B1BE16637E15 +763DBE8BF1D9A10E28389421AE48C8D31A6F424350E7F10804F4626331AFC871 +69CAB26391A66A12BD07B8D761380F5717B207850257E97EA23ABEF5BB35BE49 +A09FA8CE4B0C101F614AFB6C4EFEBF1254D3B86F55F8B56D9AECC8E381CF1421 +FBE59AC373352296D8F33468BBCC19EB3185406A09528BEB811C190B99FA86E5 +AFD86E94A12C600D267F5F43D0DCE259D6D191E425B1CA0DE9175FEF448C9F3D +EA82033212ED917388CDBD31A6658960E6CB45B6D7F40653C4802BE6C26ED167 +EDB3D361647B157A7AB0C0CED73DE07685BC674C59A7CE9CE049DE8DC1B5459F +8F9C54441B994483FE30A024CC33F093D6FE259626A436F4DD28F37B297295E3 +22AC3F9976E7ED86D6C3C7483971D456883A62A63BB59F3CDF5E1AD6BA381B9F +B4D042F69B7B6415B641E569FBF1A127256CE296DBB5629CB8B37AC47C93804D +FB58DF99F70611FB2631BB84BD7E34F671EBE84325C35C4529E75239339B09FA +313CFDF6AADA +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +cleartomark +%%EndFont +%%BeginFont: CMTT8 +%!PS-AdobeFont-1.1: CMTT8 1.0 +%%CreationDate: 1991 Aug 20 16:46:05 +% Copyright (C) 1997 American Mathematical Society. All Rights Reserved. +11 dict begin +/FontInfo 7 dict dup begin +/version (1.0) readonly def +/Notice (Copyright (C) 1997 American Mathematical Society. All Rights Reserved) readonly def +/FullName (CMTT8) readonly def +/FamilyName (Computer Modern) readonly def +/Weight (Medium) readonly def +/ItalicAngle 0 def +/isFixedPitch true def +end readonly def +/FontName /CMTT8 def +/PaintType 0 def +/FontType 1 def +/FontMatrix [0.001 0 0 0.001 0 0] readonly def +/Encoding 256 array +0 1 255 {1 index exch /.notdef put} for +dup 0 /.notdef put +readonly def +/FontBBox{-5 -232 545 699}readonly def +/UniqueID 5000830 def +currentdict end +currentfile eexec +D9D66F633B846A97B686A97E45A3D0AA052A014267B7904EB3C0D3BD0B83D891 +016CA6CA4B712ADEB258FAAB9A130EE605E61F77FC1B738ABC7C51CD46EF8171 +9098D5FEE67660E69A7AB91B58F29A4D79E57022F783EB0FBBB6D4F4EC35014F +D2DECBA99459A4C59DF0C6EBA150284454E707DC2100C15B76B4C19B84363758 +469A6C558785B226332152109871A9883487DD7710949204DDCF837E6A8708B8 +2BDBF16FBC7512FAA308A093FE5F0187316F83DDE3E2D27FCDF6C5CE4F95B6EE +3317BD91B7921F3039DD35FEA387D5CFB6C6E9DC84C178F3432994FC7FAC6E5A +ED41A1E2EBA350178FBFEB45944511731BA827167DDAC238FC69A5486B995477 +C469E2E27493B0B711DF8E267D3D5613B450011921685147114106C9472580BD +F531022F6DF5432B2A4EBC51A8032C7F9689B6FA942D849B29709631613DA68D +4DF7B6F059A19304F40A3C3580CE3B51D79D42984194D4F178801720892FB6E7 +61FF43C63F9256B5E9F4227B1378222BAAD4D52C77462DF01892220E11129C16 +6C9E45BB9F01ED7C1AD5D8B4D72BE0E12969AFEA90FEF170603CDB91CB243173 +B19A56084D10293B80A35275F41BF78A054DDC98F4A1FFF592463D944960FB31 +6BE5F03960F9B1F213CBCC7FD448657FE388F10104D42B0715FC9571CC60CF23 +C72560CBB8835A0CA208FE06676B3B48B093CB7FB2C0C53AF17EC5B372A9771B +BFD52FFB7062B4FE0106A01A2A1A1DD4EF5C8C7623EC9324A2CB3B402FCC1FCE +52BFC8662F8A39D5F1B41C97E7CE34E16AC28A1E94007AEA7D4C519399F1B7A9 +48FA7DDB671067244F09C29F95DD60668223F45BBDA8B1C452E930A9F3F341C5 +351D59EA87462FFB30277D3B24E2104D4AAB873BB2B16DA5B23BEE25BE2C8128 +C4CF2F4F438A4E520CD864F3EAFB5363753B82978F6FD664A14E5D6F3A929348 +5839EA752FD635619C4FABF1E1454510BD9D6B538A343BE748AE05B47F917367 +1BA5EDB15F1BDBE806E51B294257D7087334165419A6520462D794D670A1D6E1 +3BB03BF689391D056D55AD660D15A386E6D222C9572BDC4DC8A46EEC75124BB5 +F0E8978FD6031A90E4768CCBF62A5ED8C8087FD66D2033011947634878BDC0AB +6501DA7E6D96E227068E993DBB0072F037CA4111CDD092DD0CAEC1DC6D0CEEC3 +B291B4AF285DBA243A3457A855171EA0527DFBF10E34A60D3BE2092B3218365F +07271A0CFA3AD15205D0D0886AAE1C89807C74C6BB23F55F0405A522BE78D4C3 +0E6C7A2C17EF66CDDD65AB75D03526DBD692FF1557B689A200BB5A593E92DA77 +01E5A82004AEF4402C06C65B21971E8240F87BE60F5F7E0B56D3024B7D49B9A7 +724C55353C362CB35B720A5405B2B9301A1A0083802E8766ADB7856925D45001 +1FA451AA61F72022FF0419B1650CE94208DEEC7EE3B53ED7F9E995F883338936 +EA6FCE2E2466BE5C04B46FC7DD9E80E6F1ECDF77599D3AB9E61C00D7E425636A +E0AAD63D341CE31564C7882916EC35366208A3C06435BF1F55086D627E06B996 +7C49FF12CC6D0E793EB19C4972C3904ED0FA9FE0C4E05140CBAB2C41EC148B05 +43A9AD2CA401532FE0045933AE0B08BC1F16D94D85420A26A9D32A9F2486BD9F +EA2553F2E8B6950F63A1102E9E8DE227BD756612412DB1520358DDB08CFFAEF4 +AC3597978F43E982BEDBAD042738D05AD42348840F9D0122535E6CE711AB2898 +9F1003DB762D3B15BF35F3B7F593C40282FCDA0CFB1DD0B2B3A8DB68E326251A +E4B6B6C559E735EEA2CB221ED8B8E2366B1BFAFAA234FCAB5F94F7134DB434C9 +7033F5ED902DE94FAB29392934E8DFFB00C5D27505CFDB2F1BDC7B10C9379B1B +8533F17A4369203D2C65B5C75975A65D20BF6880FFDF8043435779F26127B38E +09399EBB27BC2CC481594BEAF8A749445805A6EDA1DCDD02D7F23038B6EF99C3 +18918626F164B6F9FB32CFFB0D936C11AE7E2AC80543864A65EA8575DE49848B +B09FDE687FA8AD27D0221315119A0EF7CB87E6C72A232B51E48F4AA67AB0FE6F +36C4BA99B3C0C343EEBF2C0E5905E71FB897C0E80C9A3B15A9CBE81994D24580 +EC447198E94134154F103060C6CCEEC2006A2F7B8A01457493EDB59205B0194F +F4859CB75EAF60F98B0A213864DD8407DE4DF86AE6EDC5147FBED02C022B26D4 +158A8313188C7BFA5F185AF65FA75F0A17DE6A5CA276DCBDB01CF410114E8B17 +5DCCB1486455DDA266A778A9EEB6B41B9DE0F79021D241FEB9E9496DDEEB6558 +7145D3540032DD2F1848CF4AD9F88E67C4B77339BFA9EE3CF75FD78A63ADB40E +68B3D693AEB0E7AA4E46B84BAF08CDC361A106C566D01FE63AF40D245B717B92 +FD7391F92B159830ACA6303C8E96AFA4780DCD4963BD98AF67D8511E4E6C6E7A +32616CE5F6CB270F01B6AC4EE342610E0CA1AF1DFE51CECFF133AD714F5EE89E +978C4BF5EA08125733CFE4B0C3853429E910677D568EA9A4A0800AA5D391A772 +E8114BC600B2D6B2651BBF987CC3509B00CEEBDDBDD82330A9181D209271073F +B37241398D70D049B9FF607A41AC70E64B928DEAB1A0B4745D98ADEFB18F2D04 +0C44BD18F8687967984B9D48A5BF27E09CEFFD7953E6D9881A197CD09B8C75AE +31C9ED0FEF539E4D71E4DE6E65D106975A0F9C57966D50E678AE5EA9FB83EC80 +0020420E2FDB7F4234A3DF285B9D761E1F0A21018BDD9EB84934B808E345BF4E +91556AE5779EADC1BD02E198C73D1D10A56A0F09F01302BB91879DBB084C488C +972D39D4212AAD28F9B24C164F18CAAF595BB6F9EA9DB90C3AC98D0F37C36830 +F28A9DDAFBD9E3C84928E9EA230FBC0F3C3D05DE4084621B65D26AF4F07F74E6 +183E59EAAE390C8AC834DC662B06E83A9CADC8B891B3EDB56FCA7252600082BB +DCE150610319A3861811339A621DEEAD6D619D475BA86984561F489D052BAA18 +7AF5FF29298168AC79B1626F882CB19F6AF7DCC4E28124ECE52599C51890E580 +132273798D3013CF390A8569A8618258D3570D2F1E538E96793E4A939293BCAB +A9EAB62579E456B5C80CB9B79A70EB36080A6AAECB786FBDC7F19E6543F67B8B +39D24FF379D8C6C257C2E361FDB384C822DB095DA0F10211D6572E4DE6D4E8BD +1770868E2752631376DEDD29CC784ECD374D72232026BDF4650B9E2712190D39 +4C0748743D7EE4706B7B31C90E5743E85DAB062B01DA4960E0314D9D51293BEA +9DC2DA2C67DF7186F9346CA769A0C7C6E6DE1BD9B48709EB87C6E6139BDFB245 +69A02887DF104549CFDDD7FFD86E9822FFFD2DF186512BB81BEE95253FB15FEA +01E04ED643D2C7ED7B43AF1919ED54C69908A87FEF3C46BE979787C79F885451 +3C658541A8E388297ACE1CE31AF3DC7DE205B72F27EA432387A609D9401C0FA7 +B53EF719D0BA60B400DD9D02C7D9626799D39C51039B3D0408CBCFEBB0B2EF81 +220B69B2953E00666BB31C73F11F1E6108C62F4F54138631B9FAAC2C9F92935C +2B3D9989D3D78AE5CB66BB48F669178200ECEECAAF28DC0D5378238DFB8C4DEE +D337C8F28BBAC0840F950DF373EE8C3A59568D95648E33802210A3A563B5819B +14C059E7F4AC6F426CD4E7B3F1A2F6F4C2FC19C2C3E9DA7D2C8F950D7564C282 +860C60EADC8F9B71B90DAAD27095804884289E914F0BF17C555A91FD07B13DA0 +66232C27711289C4D5E20A39A4660BFC00566BB31FA6511B763EFBF1CF95AC91 +CCC63FB618BB886C3B7318CC8301E323EDB4E016F0F7889C4FEDE858094C23E2 +8429D32F5C52CAA03CFD74820F2B956E61560B64CCA58607B300CA9166864F66 +49FC01C8848EE25857AD731386858093E9F87299D452D9C13D06F90E9FEF2C9C +B9B78EA3D3F31785364D36B1650A567AE8CF30A7A5E5C6686B614DFFF65EE9E1 +04211CFDD13B3F021E5D9C965BB56FA136C0B14761ADEB5C8092088990E8D0D6 +B92F39F4E85E71FA38904C93EFB4D7FFA8012920C2445339BEEFC621CD4765D7 +01A9C397BDA9C3C0D0E6B15297BA0BBF6169BF10162524EA71D7CA539FC209BF +375314A88500ECFB9C7363C5AE0D7FB44D0D1AFA09F34E57AAEA2EA67E2888A0 +1B202C2FC4017AB742D5437E8BC89CB24A4A1B0DF2453026E69B60AD3AC8EEAF +ABCC24A1F4C628D67BBC03985396C05E5DFFDD98A0CD615D37EE0FC2C9173D91 +7F20B0964E1FACA7FEF48DDF1ABD76716E06B403998530C15C434F1FD2BBB250 +4B95E75486B54604D3687C2320FDF083A23C01A79363A225733925DBB954D366 +3C535E17565ACB00D3ACB5116996A172743511888EAA2D69B180A4C4FECCF034 +BBB539DCD94510B84AB82E9154C93F025FE50BF00B325A6CC4B6974BC3B67596 +CF605CC04A14625DB25A6EB9E9F9BE93066E34A285CDC45ED330AD2073A9DDF4 +8D3A6739CBF4E846C3BB01B9DC7F01055BD43AA0022FFFB2B93DC850419B4BF7 +97451F057CC0BC68C208DF288E8A1310A015BDD1019C17EBDB42CDCA2509CE3C +E74D55C55630B10A7F042F260D0B285DE8399D11D079E91F348317AA3DDE0CC2 +A8DAC75318B5FEA8A6359EE3765E6F75E58D354B9607034F6A8BF0B22C9F770A +F537347806E5FB7C0A6A9325D0519B02A0E7CA47946561B848BFB1C00B5AC67F +BE25853D147950FB70854C7F4C8D7C503850F1748DDA6210DDA2BDA36DE9AF9E +7D4DD3152165C9AFE4CAD15D146B71F0B7F2DEAA5EB3E1637A9CB5C3CF60ACB0 +7E6A11244B3FE758DF42E346A847B6FDCA6B6FCD7F02BE7D467CDC4AA2435E5E +34647FB8C7EFCBFD144895C0AECD5E0F2AA6375C005C75535C0833FCC123A07A +C841157D68C80ED5341FBCA8C83274C751016C40FB73A5EA4C6ABE1ADB730CC5 +1CD781A616C79C2B99EB1F13115FB00A8994DF8017791E23CCC269D90D49B402 +E1AEEF2326CB2AB44079CE18A1FFA08195CA2AFAD0ED73D907F4FC6422B882BE +F7CE67E17EE720B1767BB925E432CDE667B4D3F0483DBCA9EEF9A41A786DBC81 +AC9A52114892FB6D2FA892B6FDD27DDDB9E173AB1DB7FD612506E2D0338D1747 +1ABEB8BA78BF7127FEBBA18A70DAEEB612B7E48885C76CBB9DB5786C17B286C8 +A955C89B3DC4FBC16C3DA027D10148F5A2C685255F2D165570BF8BB7EF72A0C9 +F90C740E57BA036C38B3FD04BDE1119FD3582FAF9F254220CC20532D8C839CCD +ADB7ED9483CB784126475CDE0E8B2C602A14D13486C214AD6B53E14779E7DCD0 +59A4C4D62A704B4EFA896439CB66B953822B492265FFA6BE2367DE24DA97CD5E +31D715A3320B7D0E1EEC35EA1828A218BF3B2B4EFDADCF91DDF152D4E4F92155 +757446DD8D122A22AC3C02D9FB49D31732A03F9AAC36B0494F234466B3C239AB +4D41488FFB5EE503F69942287348E09637CCE28F1A6671B06E8F700A2276B2E9 +60BCDD1CBAECFE816F6A4A1277569D6EF85BB49503708F56A8411F76E53148F8 +A49C0623E3EC3DE32B280F5BD47AE3F759589C2E4DF29ED5DFC587E8241F559B +4B6A1F8646D292D966CBCF651D751E5C92751B289BB75A8058E9B19C375013AC +5B810252BF23FF9C7A0A568C6B4E329F5B71003118F3DE19F99760B525AC3D51 +AC85F6E4E47F1EB7589AC39379C35DE27F4FC5B79B8F5D33049D4BF72A8FAD0D +04A1C77795B44EDC59FEC22A5843F86D18FD4415FAC8AD44AA7520392D57B7B6 +2C755EF3AE81A83D965E65EE8583F575AE1CC4F50A37F0B3C007771A5B60B01C +19FF8858951E0E7CAC7D157D3F5BC7F0E453738DC33EB390F31D38781CDA8578 +F9555EA83FA8BF8BDF55740882D9140C9596ABD438E903B366ADF71304E81E58 +FF9B51BA19FE3EB5599C6D1787569B44BF26D4E14FE79C1D47F3FD4E573CCECC +BA3F8FD36B608D87CAAC3686BE994B252287AEFD9A14AB3051CD4D751F27DB18 +BED214064F065F20D3FE097DF160C63EA5CD01B3C27788A927C79A21C4F2164C +EEE8F38C79A7C68B1C1958F7B6F0F696A203C93918B3C23DBBEECCCB2EF2D96A +EF6BA2A7AE40979ACEEFF78FC82EA9B34F6126F515C307783045FE80587D0FD4 +D0F81422E0B82CCC82BEE3D4189536E2C08B35AFAF3FAE2D5D009DE9BB99598A +A91B9B58964B4CC7CB625084C0DC42ED14D685C25C85181A8735C4EA6BA9CFD2 +B7C8E67977D047470C7A778166FF42BC4B9A8F33C5451FD16878F6D65A47617C +543A1E51AC939FB97235FDCD67962AD3CB5985DFA5737B28AD2E24DFA5921B3A +CF2CF5FF6687C7EC9C66C4DF80C039DD5965CB1B49D0091ACAC40AA078DF781E +55A2457EE55B1E0422C5F8074A9D475E194E5742857BD6544A636AE573FD8E68 +70BF3858E463E94E5F5D956B9859DCF1917516005364779BB9DDB66F5DA107E4 +2B5BC512D0F9C32FDC34794BA631A0731CED84706E2FB9AF7CBD4ECD53B6157F +7B01BFFB519C87689E2A489833D22F3C1D812849B656E6C91088880F135DEE39 +FBE71EB03E6B5AD77280112F6C3E2636D22A38AD1D34F33B7C327122B9F4BE2E +791FED7545D52ABF2ACBDFCF770F8F874806DE0D1977776B330FB8D84A52834B +0D2BC3FC18BC1885959B65A2B395202A8BE49350C1E133EBAEDF41D36345C24F +86E4576E68E81EB707EEFED92F6F09FA46F2F54BA766E3B20F1CFBD6677B59EB +73778BADEBB3783A5CFA9138815187A86694E8965FABF1DF6960865AE363D418 +4C3401F3854DD5C241F3667E2CB34EBBE9A74D890283DCA529E1B63DEA16898E +FD241DAA19EECE2869780A8A03BE546819B3C82762F5757E72C0FA749F90050B +BDDE78E6D01685F6DCEB9A6F45E7EC9D253ED34D2EBCB98FDE257FE1AE7D39C7 +1171F5425F3604B93531EBD0DFF691A905ACAB90F760AF4A674C500119B91549 +0566246482F9454E3D3927239AD8DEEE6D4E9ECB56748D2965D7D4C59E358307 +F936122ECCF570568F9C8C8FE5F135AAE916CED51041840BC4B1F403FA632FD1 +E694065B7F48EE00FE1E6ACAD8B86A11F3ECCA19B5ADB114D0980766991F8AC1 +573EA9B5C8FB5669574CC0426377764CF911BD316C8A7D772F78F47524112BB2 +A32F11FA6A6D1B295D96456A0D621C2B8F284DBD8FEA152D9EDE6A68B9CE8CED +65E380ADEA02DD9C06733A4984AB4F7F8C5E87E58C9AEC65CD3490C87C04DCA3 +42AC5CFFDAF21995432D0115B425B20DFC3AF8206354267FD0A8242BE0B23B24 +7B8BFE5CB5A2340838F3BD77B6ED26A6E43D2F732F5036807505B5E8C155D194 +03E57F31DB974254F3CE52708587825117D646942431DC4A29E99E7DF8193B3F +2C9FA9049DF511A48E405A3B798F0855493AA0A2777BF1F9F55B6797F27B8711 +5B34A0C897B7B13543477D159232939A052E46DF470936A8479BCA8ED9F97F88 +A9D77E43F19DBDD737EA504D94AC6DDAF29AF0DFB73AF8B7681E501AE88A6264 +B879436A69BD0DCF3465BE9D480A31B9702B2BDDB87D647E5A03B7E931505CD6 +7FF4595F44DA7EC3B1BE6C3E713AB806A1737D026A890E77AD137A9317779D08 +B84026855E4D84BFF2B50ACD7E4E23A50B888916681BE1FFD83128E9C36029BB +AB6225DECF2F6DFE22E12A084C27F809F53074A272735FA977D783ADFA5555C5 +F2FF03C670E2018C9388CA3034414402C60E0D49E121FA06B54E649E73E65E2E +3376B59F3E3221FF238488418E7B969795938996B506C9CCAE529C1AD10CBCBD +B2DC727D9722C198F7BAA1BF583AEE1B88740668CC1E9EC960B33820981700CC +01F5AB0586DEA46B96A72EBA2568E8A3774935B4A17BB2DF361B4E4D30814CAE +7C6BABE324FE7FCC67E32F773924E8C995A025948E253CA14FD35DB48A4C9869 +10ADFBFEA18E729FE71A53584FF7CC8E50D04A3700181E0218558C262873C7D8 +DF424F5457D76FE99ACDF797E542433AAF9E811516AC28698A179E17915BB3E1 +368DC25C96394147D0483ECB7EC5543595AD8903BEBFB250C76ACC782BBA59DD +36D393AB25D84A09E19F7788CAA4A9110997581DCA6EA82B149660101B9DA10C +66A13ACB601596B68CBDEB3F8AAAB3DE33874C0B07B71BCB6E4BF05CA47A7AD0 +69B6F516E4ED20D017CE5D324FE97D7FD2412A73B92D8601B8D716AD4C87891B +53D9E95DFAC1F27A582CCA123096B12BC1BFD68F432956606CAAD9752102B925 +555EB728A26DCB480AFA1E87F2990585E477E5E83C045A72FB2DD04D0AFC8512 +640086008CD6989676719D94E4646EA41508A6A4C25E93E84B3928E9F875186D +B2C6079FA73A221FADDED66AA88F5B49208D10C2E1E91E25DB3818D69E69F10D +197A16CF687E74CDE885CB876C185F19D120D916E66F88D03B308ECD3BF2010C +7530AC389495B4E63B70999149C463F46DC3FBB0E77E74ACA0E0CE17172AEFB5 +F3D559DA122B384EC940CD845E8B5271D2859A12F5E913BA6CCF8576ED7F5C04 +9C4FE5B7DF849BBD08DB1B44A71A59CD1769853CF9E49A3425D48D19233988AC +3263BD7D1861EE4E99C9D33FCDE02854B0A9CCC24F337F04F9AA4F0292F5613B +0DC69AFFD972B2EA03B018057A588936F7868AC2FF5474B9A9584F2AB70A6813 +23571813A6B3B48ABA4CB44F6C14E9DD5EBC97D9A705F215B31352711E6DDC25 +27B5CF2AB2C4A1B2310A91711D39A4BB8EDC93361A18A38487F8D2E3C91E5D80 +53C2B713BB837DE72556FA3D1E797EB6A90D83DA02DE424D074B6A8EFF11BE23 +D9E905B15C4860FEC665B2182CA30293A86B5D1BB1F7230D7ACF88D7C53317F2 +57FABDDDC049CA2CF03E8F0FE9FD160736418DDAD7809A85D3F3CAE9F7C51E3D +2238449F781D61AE69614F0B307558D4423C86EE67C353E9B49DBEB7B060D7F5 +25AE5A7F64F20D22B4932E86D5F70632334D3F08F22B81472545ADD27C389FAE +F619E9FF87185F0F54BDDD40430CC44576CA2A2F3F4C115D3C82E53689203F93 +36421BCAEB7FE999BF2EA19D3B126C073EEEEDE1E841BA512B2A4D8E1BFB3A8C +B2272496B09DD88CC7C37EE8E06BB92797FEA48E4845D7EDB60A61206C581894 +1FB3FFFFA610E81026A7AFF8D400EF068D1797F8512F05223DDA51FE18DFDD7D +79FA8754A79D501826F705CC5450BE63C2390764D2AF32BDEF3E45940774C9AF +E869BCF5D5C028278DA373F0B0B6ADA106DBF419FFD5ECA3C60A6C1AD46C6C25 +5C3DC971BB07A23E3F3180DD9DEAEDFC2A96DF506424C5EFA695150D5B550AF8 +E60CDEA33876B075EF693883F6FB70EF5676B4552318E1EBBD4050B2BAD9273B +FA895B3DAB65E4202AB0EBBC633A0810F852824D3FA83865E505F0A226A85D26 +C7D69739B671A64FDAA895F7C98660E43B18923702C6E02C3B0806BC375AC535 +527265D76CAB05110C7854CB477F1ED55D0B876CF2421E3FD0F21337AFBEC2BD +24E8E304B141B878DDF0A9F692E1481FCE9FE8734E6FE9CC2114F0F341AB9E03 +8E4118316EEA0985914711F52F7D2CA2FF11FD9D79C5CBC12807B5992B8485DC +494FC91F87A7A8731CE88752D02E4527597BD7485D4B88BADA367D516EE4069E +12625CD755DE031815AE82EEABBFF8563BD74A2A5430F4B084D7F10CAB27224B +8A8ACAB00DD8B88D7A3B9F05D769D8328E46C1345B7BA0DAD75302227CE54C2C +AB035F296ADF6F7F7E7CDE3EA657F1244C2370C6D95EE876257AD318A92D90D9 +4249B2EF5F001B88C41BF9C9424E9904A28951038318B55BEDDD504F111622D0 +0F9D23CDB090D27E1A7B0B7DEF03C71D5F90523852FB2530A4832382EC10EDDD +EAA73D2C1CC08A53F1262BF636D56748631DEBE79B173EBF76B6E2334BF0D855 +74430668E6E49160A25FDE5DB59FE6320B10D00AFDAA328324572B6F767D98D5 +ABFF8B9418D51864EAAAAAA2872BEDBA9ADDD7F24012DDCD6200E5B322B2FBF2 +3A37639CBD9918FBAC813DDFF7A330CEAF3BBEC787D6B404C88E22F2EA4B0F88 +1260BC45253FDDB713D260F72F074FF766A841C7B258F281C092CF643013ED6D +F4C3DB7750E93E405958FD2DFB84FE26FB582A61A029088B6193560370751546 +230789365755CF9412EE72731564C80661E5D607DB15823CFD57DC71DB65996A +3093A3328998FC86ED7E2214BDAA5D70F0DF0D54D0E2380B71B9E321131F247D +37AB1EE17FEC0ABCFC5906695B15B21CF44DE062BDBC4B9088844D4F0E39E071 +0B33110F36C709E62F7129C3089F2C235F2EFCB1820B54FFA88F157C0CE08271 +AF58E9BEDEEB16F461B77596D9FCA92F3ED5B751FC0C0312769C23E85DB83BA1 +A1F8D74BC27276BD842D5856664582B3F5414E2213E382DDD8EC2EEF31E79B95 +C2497A33906574377E7FAF03CE9131A925189213E7BA883D30BDA2D03A696FDC +E62DC5B68FC604FC6E612BCDB18482FDAD3EE1E2E0ED7F93C91C81176D33BA53 +6CEBA5D8ECDF838640ED67372D1B2943A94D82DC93AC338C57CDE651DAE7C234 +03630634D5C816277DBC9EC71DC0A862F19B1756A11703DF5DB91E110FDC7271 +C2EBBC42F233B575752573E7C3DDC8EFC73A6B8DE7E6B8D48352C3733CB9635C +ECAD66C97F2DD346865CF018F46B4565883834D989216E3CA25556E1F9E98930 +394B985ECF798743D8277C2AB8DCAC16B483610DB7C3C90F71680D807BFD5493 +FBEA7F3FA4293659AE976D036FAD43D509C2DBA3992DD24DE8A99BF1FEEE7431 +31705015A098AD47A51E6D955DAA1A4B03CEA003E0273BA5671F7F1998238D88 +D0DA4262B134AC9003BCE375A75AC93715F8F2F8A628409CAE9FF9D119301B3E +E8147F1DE16649984430EC4BA948BF5C74111D0F8056383D444F6524C7FAD4F8 +6A4FDF445CF8EEDFED560A6C262E24C0444B2AF705926A9E0805A1911F0230ED +5B2030D956CEC14A102CF4F8E8C3DAC74ADC16C169BC4A4DE75DB3CE82376254 +00FA86DB89265200CEB4CC133B2A993AD95C5AE5A695DEBB05624CEE6DDA6B5E +A089344AFA90ACA83A413762F0153EAF7DE15333BF9AF6E75EFEB3964D59E183 +42C5E52A77C87E85E2B3049508C00ADA5D6F0A8EEB2A4D71DF16F3DACD580DD5 +68C68834C0778B469ED2F8C833A1BA9CD0DB2D6AD88C506F5BB23CFEF461D30C +ABF3164B702B433E0156590C1FD699268144766D3AE1F8E582ADC19B2D4FEC59 +0DDC8270512D3318D854BE1BA7F545AF9D9A0F3B59710609AD7A624CDCE04DAB +095A54E8FBBBB1987D01EB7CD1B6BEDCCAA46A07077655A73707D6902BE02565 +EC7C6145AF4E52D1073E3DAC7C087A14E9631570901BEE1FF3255B8D501384A4 +0658B67909EC2F6B90A1BCEFFA9D74C1CF5570D7EA96391CAB7CA4E0CFDDB3FB +C3591EEB49AB7B154973F0EEB9879D53DE90351F0F76BD90764ADE187C68FEB5 +AF1B4B290F2F0AA66E1D138B21C1D4EE491ED26EE44CE490F326A0407B0FA267 +1707218CA4EE1FDE220835476614DD67C7845DFB243FD2C5D856ABC7E97671AD +B85BCAABD214B9D9BA81B4E925A726A122F1FFF11F9581A3F08645BBC4197B27 +D40D2A95EE1DAFA9C8A6157E0E79866BA40C0702B26210725AA2239785D9D9F5 +017047AB62B57F6744B2D4A5D642E971074A2FB1F8809AB65A52E96C51415FC1 +A5286427DE8C81BBFB5A218090595CC14A86A40ED9709D5752157EA673A4084A +93BD7E215DBD1148BC140DDC68FF8F3C1AE10894D8BA9C4A3AE55992F88429C8 +DD9B8247EB0D653FFE69165BE6827825C1F88FB36E69F2A8A3CDB6D72FF96DDA +072C65F51A898EE82590678C43FC184B532ABBEEB801F0143111C9941F2B1C3A +484DF4C0AA7E738EB2063278EB7B70E1BAAA88C50BC462ED449B66E4E0978C1F +7DB04568AF5EB412C3E41BA22E8273C1996042DFF01F9702B676E858F4FDD430 +F6B417197D8999945E9A82DA43969580863825D31F9D59A0D87D0F313FE2C28B +C6B97A98DB142B88A45943DD49471C3424BEB1DB482E9650B0B92AC70FE8845C +DA7716D68C9C2A14BD68F379E2C9DBFF92DBACFA705F328AC2D196F472A24ACA +244A17F00C82EF653DCB067E0F3762CA52E58A5604D29EB1D56B2EB40417E2E7 +9406035A253BC2F539D5B09ACABB048EF1D689A5889B9C5FA6B2E0E2EDB9599B +F6F4B355E3733E6BF9B21DBF7580E52526F2900F980B3C28062A33A25CE7F6A7 +4F13D6AAD9327ECC7F3F97BF15C3BEDE1A0DE042E749F648354D061C3E52E7D9 +F376216E4BD2B782A5AA0D9FDC5551CF660285E4CA7363858C51DCC79F66072A +2FFD59D6799BC84EDC0C5DC09D9E40056A4608B235F1357D454ED3028322AB8F +DAF5CC60F8B5EF4E01A8ECE97C491D828A87CB85D50CD56E4A7BB6DE2315CB0B +D0113AE20B4EF27FC486B648C3C0E6F69C1FFAE0C766DFB8B16611CB504FCAD3 +06B8169190CC5F836CB68D7CC34A8434BDDBBEF33E2B778884A8070654378FB3 +744459C9FFD348B2059652D47335D7C864619700681D45A39F068430F8DBC4F0 +D1122FCC17182216F62C82A2800FEAB2247A07413B3809DBAD5A03E1F1968BBD +B41B98142B9B0403D882A3A70B334F0365353E51A7FE4309DE4EA9BE3B695601 +3CF86249952A437666BDFACB7D272F200A64B9C09A125287FE2779E950687EBB +3EB747653C8D95758407DC3AD8C95AC3D2E18994156FD13CC03A6653EC7A2993 +F9893778089FA63708B0E3942A226A5289090412CBED2CD71BE93DD4CC56F095 +2E41EB41DE3CA0F8953C28C3285C57B75C13CB8A7E588054BDBF3B5AD6E86965 +4BAC32C54CC88E2BA882A887BD84BBC8F15DE986DC2118D2DD0A0E154EE11815 +65B18565F5C97BA8F5753324CCB5CD8D40463D909E832CAD28E62AA2250D8DC3 +120252A10404200CEA8A2B67CF44676E6003B7FC2AC00ADDE1227724B9E8999E +B5A4E94223504B52575111E828E4AC03833844683B64101AB5D91EFB4CC8A822 +72C394436D8930F1541359194EAB8F44403958F415678D3EACC777022271EBA2 +2A76DC2E2E833B426A15D5AE648101CDB8116D353A837D466E4311DD86F1D921 +64EF76C5CB35B5B0E4B8B1B93861E03C1B635391276D77ECFCF247E714CC67EF +72209891C418D1472541D68A6761EBB440E360881E993D3FA4E29CADBFE733AA +7C260797DFE27403E70F6B1D2E493A1C55B2381AF9A815808B5081231FDF30D7 +CB3A1D091A4B6887F9EF692C736AB5770BA5921D48DB3F196A4515FEFD4317D5 +BCBE5394CB5EFDB4C4A972B669C294966E5D76171CE5B903E4D8E6AE50C5C075 +37C42B59E74CF491556B618191C3489D11288587FF05713B18529C7C7DE1B9FC +CEA7667AA32EC4F02F452F9F20E54C89E071ABFC4155ACDB4DF3900EAEC25386 +E14C88BB174890A966703ABE3B6EE4E229882DD0543C3E33025F072EECAC34A7 +7945C2D58A721E42FE71F1A2CBC59EE8278EE39F6BFDAE2AABA5562E0970991B +75A3AE1B2B0CE3B8BA0E32F6D281990054BB095B9E9B128D54E3492C08380208 +B6FD878894DE6F487363C826F26F5B810314E48E86C933B885D21887ECFC7FA7 +711F256D819274209A0E08AB6E147F7642D07C97F92E70699D88ADDFFC941A17 +E521A3D5E3596491CF5D9BB95E483C353441CC4748A59F9E49C79968AAD58F19 +38FE5E275EA22403CC4A287A30F7B616CD4B31519AAB4DD7237916906B59CBCB +C275E1E993B33AD6F76E945DD4CFC3CAC1BA88E5CF9D15F03212207182AA054E +9B53A2469E76F128006747A7E3E95720EC90B43BAF6E016205435EA4AC8C8303 +E1E41BF20358CDA809B88C72AB0C2011A6C91A884D542D92971327564E175217 +A40ED9EDA6B45192C46B648215A556591A5C8AFB8468947B8BEBFAB854983A44 +CB88DD24D3C8920383944E2FE13C18A45D4A5507110C61FBA11945DDE8F0E5C6 +265F450C30BDF5D3C95F40573B139857539F01E8C804BDC8DA9306C133E7FC0B +66F52013A1D7C4BBF2B2E1EBF80EC769D802C7117C06AE917206ED17D13A3E95 +5C987FBAFDF8B1B49E00376E8B4D60E9F2B140267A587BE8D14B1A0249C2B1DF +003533FDA36B565ED493CD1A807E139F6C2CE7148B6FE62615731CDFF1EFD40A +A79DCDDD7F4F4CA0D00DF277E7A38556B684A32AC4A8B6998EF6C1693F043E31 +374B86213BF7CAEE905D239D358FFCF91EF2F34DF7E0A1A16832A54640D42610 +8C77E6BDB82B862426F153B0C87170D31DA509ADAC29EE7A614EF359D584CA36 +787DA85840A14036378E25A53F907D10F7416D5334705DB9A111553FAF2EE20F +9C3A0BFE2D3BE88C28899043C8293D012CD8E2752F30A883C2287D5AE64D00D7 +443218C7F45449B4C9B2BCEBCEEBAE0AC8934549F5E27BC01AED860754AB4962 +12C42C1E066CE0B5726331F64A1B6A738F4D79388076AF52C46CE481988B5341 +85A8CFC7F9ACB1F0647D33B762CCC7C34F91BF607940DFC09040775AFC3FAF6A +41E89010D5700942F78D5F6E159CD13806F1F62C28EC0BD6F40E4E812B50F088 +A20C82231D47C911A9F4213077793947F6C8EA53BF2763F75779BBFA65A75E27 +791959727522E48FC28B9C649BB0AA1DFF96D7681CE5C8A42632EEC5CB7405FC +167DAB24900FF3CDFA2FADEB8829283B73CBA2B1A95B483CD3E6F02C693AAFF9 +9C09D3D2DC196A6EAF720FDFE7C060FECB0392610B17EC0AE65C72D89D892694 +99CADF5E3F60F6571E29EBA897831B8AB7253557713BA2529465C615D848A1CB +57633090AF2993CF37E19A97094B8686238056F22AAAC0CD81034661B9BFF73B +18151C4DDCFCBA332283CB1970BF1830DB778E626626DE94E0A8004E5FD830CA +93E4BC3607809BD56C75B558196999C92E7325ECDF73AA32B49C49C3C5FE4B95 +7F50AC40FD642A52CF12F3547ACAC754EB8F7164FE5624BEF7160B14258EDAD8 +E26A181219321F2AA523CFCA7B2E12878A5E242BB7BA5C9F22D0C5722766C564 +306F713ED39E883D2A7ED68A0D7C7EFD64EB39FC189A0C7FF8111660A188E19C +DE642C8F2B0D284AC2B52405206A5E1A449319D94B3DFA20DBCBC522B5D67431 +E3A072463B59BF356F924434B5AEA53BD49298D25738AA79AB1E274F0A7E9330 +2982789B56EE39AEE8DF359C968C704C7D3B8FCB09FFC69587EEFA7E39DD5370 +FF513753E7518954525B083BFA191115CF310A98EF5CF0C2540265031BCC9694 +8C6A3F1A053753838516389F26ED5D57BE285F92938D59B0DBC6047C0439E127 +55CF071FE044451EC5C557F6CC29D8C5256EB48AFB23A0CCA88307B7E8EE1E45 +91B46854300FF369C6D84072D4D1625A0613CD330AB55B0B326554909D57C7DD +73422A8588FAEA378B917785E75F25E4F4183A36AE15C7FC2C3E2C6E890B113E +0B3FEACB2A3C5ED2F7E5BFF91E8E273869D4143A954E6A5C1012A2FC7839A878 +B86D878370EF71ED0A7555E8858C68B1468E130C1CE3A6199D93FAD963AC0877 +1981237BF431B598966143C8DC7F3B802729DF288A39EDD5B06F0F808741C6AC +4D59EEDEE8655A6CB5FFFD911D8A942590E4BA2709403D0741C70B0FF9FBFA7C +C3FD928B5B265DEE100172E5E917F273918C7941AB9071E1C3EC631AC555CE9F +35F88068E213C0F9A4BA7D133755EFB674717B4FF225AA16BB0B7A930D7F4474 +F2C9C784CB7C8C0A2F2201B57541D25DB2C2C8EB11D172306F7F912149C2E61B +40B0A570CF8A47F792860E4CDCBEB9A05B511E4903921CB80EAEB5A3B6567E14 +71229E7AE16210B7F307E1FEB739554261547BFF5B559B88CB5BDD64124817D1 +AAE0DEDA95D830BBCFE0AE34A90A70E42BE5E9A54D420B7F15D678425F1F7408 +B0A45ED88BBC61FFF2433D65AEBC21CC21A454F416913AF8B4272F7E20CAE1E6 +0AFB2D16F862DFB2861CCDFE73BA66BA95636004349740C2E9292EA3C326F077 +1A69BE963D955A35B72920D063127E3C8DB8655C089312F094231517A9198B70 +CEB0F01B22DD451966D72B2152947AE928D38F39C34EA1A6DCAA758EE660700E +351A8E433028CD6ACD63B6745E0F501E72E3E3A001696B500F83B67E027E47C4 +36B251893D87A5B646C1BFCC94F2516C5A82CA364FCD3F128289F1DBBD0E1BD2 +8D641FBA92924ECDB132C1F89BA3650DAE6E68BAD856CDAC195A70FBB0D9ADD4 +BFE9194C5C2C525337AC29B8A55D56BB2BF90C004F1B5B3842DB2581E728BFE7 +4112D349EF2FD56CD145DC9CCE9F8364830E466E60F6F437EEE13DFC07D8009C +ECF876BCF50BF9C60CC60544EBD3BC42EE61F0DB1ED1EB920CD367149B52B2FD +353B4ADB2C18A087AA670E492BA5FAB513AFBE786F2A729D93F28D282A2A1945 +3A0D2565D395FB4A07E97F04E1A50AEA7EBCAB7D5DABA2603BDCA8FE770A4012 +114B736C19E1649153A74C74E7218A0A031EAAFD8420A712DEB1233036455045 +18F9902DB6390E82EF280BF3C104B4E25EDAD22880D74EE456D1E5225D683D5F +13E8DA2C4D1A8A1F456D9A3887EB3D9ED71BBE682C7FA3AD06CE4F2C554DBB72 +71FCCF5A8D945387E9FA42BE9D774C44FD296270FB67B1004273051EFB74C2AC +2E215CCEA6F18AADA4EE6B94915242B113F094ACC5D837566D5B49C51FA2012A +792357BA0162EA6D04C7106B60E25EDC02CC4FDDC90FA314E4D9DD972536C486 +7A772B06B55C1545C98E90E8104FD7AA76B0DC12C7331859B6DFD01FF9022F05 +34FCF3DB906EDDF0E8 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +cleartomark +%%EndFont +%%BeginFont: CMBX10 +%!PS-AdobeFont-1.1: CMBX10 1.00B +%%CreationDate: 1992 Feb 19 19:54:06 +% Copyright (C) 1997 American Mathematical Society. All Rights Reserved. +11 dict begin +/FontInfo 7 dict dup begin +/version (1.00B) readonly def +/Notice (Copyright (C) 1997 American Mathematical Society. All Rights Reserved) readonly def +/FullName (CMBX10) readonly def +/FamilyName (Computer Modern) readonly def +/Weight (Bold) readonly def +/ItalicAngle 0 def +/isFixedPitch false def +end readonly def +/FontName /CMBX10 def +/PaintType 0 def +/FontType 1 def +/FontMatrix [0.001 0 0 0.001 0 0] readonly def +/Encoding 256 array +0 1 255 {1 index exch /.notdef put} for +dup 0 /.notdef put +readonly def +/FontBBox{-301 -250 1164 946}readonly def +/UniqueID 5000768 def +currentdict end +currentfile eexec +D9D66F633B846A97B686A97E45A3D0AA052A014267B7904EB3C0D3BD0B83D891 +016CA6CA4B712ADEB258FAAB9A130EE605E61F77FC1B738ABC7C51CD46EF8171 +9098D5FEE67660E69A7AB91B58F29A4D79E57022F783EB0FBBB6D4F4EC35014F +D2DECBA99459A4C59DF0C6EBA150284454E707DC2100C15B76B4C19B84363758 +469A6C558785B226332152109871A9883487DD7710949204DDCF837E6A8708B8 +2BDBF16FBC7512FAA308A093FE5F00F963068B8B731A88D7740B0DDAED1B3F82 +7DB9DFB4372D3935C286E39EE7AC9FB6A9B5CE4D2FAE1BC0E55AE02BFC464378 +77B9F65C23E3BAB41EFAE344DDC9AB1B3CCBC0618290D83DC756F9D5BEFECB18 +2DB0E39997F264D408BD076F65A50E7E94C9C88D849AB2E92005CFA316ACCD91 +FF524AAD7262B10351C50EBAD08FB4CD55D2E369F6E836C82C591606E1E5C73F +DE3FA3CAD272C67C6CBF43B66FE4B8677DAFEEA19288428D07FEB1F4001BAA68 +7AAD6DDBE432714E799CFA49D8A1A128F32E8B280524BC8041F1E64ECE4053C4 +9F0AEC699A75B827002E9F95826DB3F643338F858011008E338A899020962176 +CF66A62E3AEF046D91C88C87DEB03CE6CCDF4FB651990F0E86D17409F121773D +6877DF0085DFB269A3C07AA6660419BD0F0EF3C53DA2318BA1860AB34E28BAC6 +E82DDB1C43E5203AC9DF9277098F2E42C0F7BD03C6D90B629DE97730245B8E8E +8903B9225098079C55A37E4E59AE2A9E36B6349FA2C09BB1F5F4433E4EEFC75E +3F9830EB085E7E6FBE2666AC5A398C2DF228062ACF9FCA5656390A15837C4A99 +EC3740D873CFEF2E248B44CA134693A782594DD0692B4DBF1F16C4CDECA692C4 +0E44FDBEF704101118BC53575BF22731E7F7717934AD715AC33B5D3679B784C9 +4046E6CD3C0AD80ED1F65626B14E33CFDA6EB2825DC444FA6209615BC08173FF +1805BDFCCA4B11F50D6BD483FD8639F9E8D0245B463D65A0F12C26C8A8EE2910 +757696C3F13144D8EA5649816AAD61A949C3A723ABB585990593F20A35CD6B7E +0FA0AD8551CEE41F61924DC36A464A10A1B14C33FAFB04862E30C66C1BC55665 +6D07D93B8C0D596E109EE2B1AAB479F7FAA35279ADB468A624BE26D527BFF5ED +E067598E1B8B78188FA4BCFB0B51692D07B0BEBB930C6F0997B437E2C51B876B +61A563A2673932C2045833FAA35DB22ADE12102335D5DC734AE3AC5EEE6658D7 +92EB62131E1DFBA441F53EFF9021D9D4C491F26BE8F54C61165CAD778CE8695C +EEAF70E3B20C64D4C2B34A084B5770BAB2A974E898F62BFE90F132A37E2DCA4F +43E13DB13C94DFA8ECE2B7374827AE168634FA007F8981ADA046CED3448BF453 +FCD9A4F194FA648F9FC0971734BB69CB75348A88CC361FF06E984C86AF0EA429 +DAA5808CCE3583664AEFE0C59EDA04A147FB51227A5AB0C13942323E9B3733DD +3EE7DF7F774DE5D0D0980DA8C0192983F1E3EF18481EAF1EFEDA0068BCBDB28A +7FC7D9191EFFC574588DEC1E180341DC959F8EF56ED5B19F50AA82A4653649B7 +CDCA11A1FF27AFA7FF189A7E8A7C099AEEE0CAF3E121798B2721ABE8808D20A4 +AB6E704C0C376BD242C4966325D4C939669E28B55BC335405C400A9983B89EBB +B13D8C5F3A148E38E9ABD86D0171C927F1051266CBBD5C5D12522AF7CC17918F +410BABDD5FDD279338E8B17434DBF20B8E06B58D9E13B731E3C07E4CC350C431 +CE2034CB23828A19AE93124011BF053A3C5705D9BEF6D95205FB8360391C84B3 +7C6D719C0FB459A312AAC3C4256EAB293B6DC729CC5070524D1BDA41091E8B42 +2B6C4A092995AFB40CCF35730350CBA197F3D5BC5BB83CEDDBC6FBDE23A885CE +61D416B3A6CEC46474A0F42D5B923A61832262F234001DBCED9A7A00F5511F3D +C2178422A46CA5494AA8C37F51C40339CF9392A7098DF8596EA97C440989CA06 +EEEB5025B29EBF6038EFDDFD6F70989D63440E9C14E2A1040FAF427EB41259E3 +FF3BA255BD4C04BAAC47326181EC7CA1FFB32CBCAB92B1F8CDE6ED0DD3FE6D5F +EE14B739FC25BB13CD94A0C0DD7CEDD886AAC62248C64B8439064D1038886DB3 +187F017A79318B69963296B4812128EACEFBAAE983646E021F24BDAA2B78E8FE +2BCD5BFB302103D7DD28668DA7A60C446A27BFF8D6C66F4FBC61D271B91F0470 +16F567DABCD1E8B04CFBEF602BD9CE44B724B3EB8D30CE573EBB13BAA047F947 +90B24F2E49C20E2474EE9D019565E6FF25BDB3F74DF05BB9E148E1C5883A9EA1 +53AD383463F47D6C1077CB8D8DE48F71A5D42C54BEF4C0058EDAA735809798FB +356002E6B41BC6D5E3D3027540168761334720113FF02B2C734749091BE71BE4 +5DA61AC33554AF15E6F60EBECDED2ED271C80B5C4F943ECFCDA66DB6165620AB +0360CF8DD672B0C03DF892BD397923C6855938CB739FE4B3815D76DBCB1C8A22 +EE4A86AB55FF7994EB31BA410DE548B6276C354EEE51D5BBDBBEF76E9DA42C02 +CCB3729DB2F52BFC06A5A030F32927E2215BC0C86F99D9F39C0C4E342DD816A3 +B51AB73808F2545F9C55CC3D352B263E37D3D6E47854D7508D29BF6B52CDA83B +45C36FD67DCAA7BD22745B1AA86908ADE52BB14B55498AFFB5892A6BC9256571 +575183D73B178FB7B67307222F6165175519E7CF674964F2131FF44528D21025 +3A624A5AB5BD4411386573C91A067186318F266B2EF29918160A5F5AFC3AD9C4 +68F5C559617D890FABCDDDEEAD20FE6658231877FF9B545C2042681D7FE55EE1 +BA15672861CDEAD8D8912E54EC0E7220590889C891E619704210F18E1DDAFECE +E923F177F11CB40633F4B9760709DF4B36D503CB983B2F03F3AFEBC0555EBE77 +6EA688CD50AAE49D66E039C732580CB40AB9DBBB0CF90031855AA61170350429 +4745F6356B0E41CDD4032CAD246852114729067E2304AD100A1A93068EC4CB7C +D607190F2FF5BBFB344D34907EC5240F250807DA5AB47E80F790590286049653 +88286A3CAD9FD12BE3F5D0547A166A0AD59C1EFB41C0093B04737319A2ADF9B0 +312841786B47E9DE8A534A26ACE8E47429430BE234FACC6B012D459D8F204150 +E2CA96A46FBCDBC271639C57D38B0FEBCF6C152369A73FCAB8FF6411585A0CED +B410973B3C0E800320CEF2181F8FFE5FB711464FA52C6D98511C4B33FB9BF5EB +800E3346C8591E5B941F4A20E3266804D728939CF653CF9BB16CE22E987BDA2C +0EE6C0D9E9D1E81392F5E8A5499E97C0105B0F5411809652D406AC8AB76FBE20 +366AB998234BEC5C8BB66ABE2AEADE28BEF7FA5B9C628A7F2C315F5013D15264 +A3EBDD6C1739B3F0B3BB3371B9140AE771AB86CFA74695EB191F81788594F6E2 +C953003ECC01331A8044C1A925FC8B79CC48ABB9609FA9626886AB2AC449A171 +325D08A1B286B46119AD1E2BAAE747D8CAA562ADDF6F432DD9071DBA9645DC59 +09D3903F39A2712AD1BE871D18B8AF9BD38AFAD32B216AEA13BEFD9A0A5D185B +3385DA10D2D42C32E6806826E8947C3E177172ECDD4FA9380AE4F09B23BFB954 +FCFED455EC8BF93CCF7628BADEAD05250F7380EA2AE79A191E65183E7A901FAC +DF333A1D645118CA7FDD838BF35598FA055189A93F3EA6D0AA6AF3F89889725C +845FBE53DF1DDAAA1D67679AF697A570763E122FBA174697A0DBAE2ED8C66637 +248397F01AF8AB4CFD80DCE9F29E0064542F4DE88A2AD15B0FFFD02FA09D8F5C +09DAADD0FF16F547AA17F5DA9768416A4B66887F2B8F39ACAC89743A3A06AAAD +1B1720B5DAD72C09D75AA6F4B78425624500913BDD175204B9647997099AD757 +FC19EBEE8B0E6C40EFEDCEE15D6B5FB820EF4A889B11AE989A23BF390D2D1D96 +A230BA563188B911F17447E331E1AD1D6F2FB13E1B83CADCF22EA3650C94E9F8 +504D1F24E22EDE0A65737C22528FB52072B21759BBA80D390E87A53595AF6899 +98426CA645A7894A60EE88B52F9B55FFB1EE2B0896A421E929B0AB47A5F4A72C +6F4A4C5EB84A5CCE13BE620F7E109C72A196CA073B8192B3980F27D2C4461BB6 +360C074C3BCE043A3DE64024F038835536AF5DC58C1EE004DE6CC7DB1AF7A216 +A85A082CD0522D8E0C896AB309B6BA98E83780B9967BCA5C8BA0D5AF2D7AEB88 +A6C69B01680461A2DC4073F549EC9118212B8125FB2BD5289B4C57B1ABF5B26C +1214D50D335996FED213215561E44C2257B4464A887F333D466E492E44D25584 +83A269EC5F51F5C407E700052B9C349B37B3B6A7E93C1B9B9C3B32F3993DE385 +636D496BE8781D22DE0031F98D6B7FAAEFE76B49460D2CE096AB03878F1EF424 +0A5A160BAC37379476C178884BD55A841F000652A430560610DD781E63C51AE1 +8648A4A3459194B7FC456906DB1177EF405289C2EC496BBD4ABF1A913F31876C +380D3C4A436B3D7CE97E2E538E8837D379D16232F292C7425763AE75482D1372 +68A8160E6A70DF891EB308FD3AB9ABCA346E4FAD5F5CF78A4E3DE21E558ECA72 +098F147E6F87F0F9535C9DD793B5A3C3570A303B9E4A73B4B41A1BFBAD5E8BC5 +E5A9DDB8C63BAA30E474DB44C78FC1F022B54DF5650E71F60FAA8332C9A77FF2 +F31FF3D589D9D39A98A4B454B67D64CA43A8C86207CA3BCE340E65A5113AB662 +10581682ADE7B1599C14E7B4A882A602B031728027EBE6FD135B99CBB5AC2687 +E49228F18BA68C72E325BDBD2861236FBA49358A8B3EA5CB54A8EC2E8ED54A7B +4D66838E41AA8768DBABD5890A70FC402C8682CB4C40959C523CEC82B1555A80 +235EEA1BD2DC28761071BC767A2DE1927973300D5035BB879B56C8C64236201B +ECB15AB9181EFD6A50F96BAAC35A8901F070D9251CBA2EB826994AC95EDAA8E7 +058A702B707C261A1E3700343BFE3585DD1D8DF4863564976F74D16426D44278 +C4DF38CB2ACB8314CF66EA8153610CB4A3A14CADF596EC875105C860D15E06D5 +FAFA54636C90D409EF8E0DAB451DBB2778F9FBEC581BC7E6BFBBADF12E9B239A +F56C5020C05B5399B480BE3FD9B0AACF0AC7B346B48AD3A2EF170C7DEDFDCE06 +45587A0BE775573AB2E57EAA3786CDD2C9861D1226CFF342DC2E5138A629B6CF +0B75FF5C6FD8DB85C547F46EA878F7700903EC8AE67F5907F8397A8A61901574 +4329D8F79C56565FA7DF824BA44E6C22760FDF9DE3107D8883141DB3CEEFC28C +770C9930E982389F2EF279566B2096CA205001CA3E045854C3750E67AB8BFF43 +F8B07F2EE55BCEC65351BC2B085F803FB9BF5D7FABF3401F5B364F83BC8A97AD +B74B10868CA83F97017925021B8F919A1F50AF8CA08753D760D410245DC30E9F +A7E9A19C073E7C9BC7D7FEED4A6B2CBBD781214BEA20BD72A07B701C2066FCA0 +1DF7389F8159596F96778902346D0F40EB3C024372307BB97AE619E42B5C3DA4 +F836F926EC44617B3935C58A28CD67D0E3A438954E915E0BF6172D1CF1F00539 +27AE36704D5B4C1BB7565DE82625267ECFE71FDF2F78E5E083AA64A79BFD5DF8 +017C6BF7D4A991CDFBBC6483BA8DF4DFD414B121B01FDF6F068980D30CC635C3 +36418A8CDA06D1CBE330E751AD061376331BF1F30AB81DC9C673172DABCA64F2 +6DD69606A9B91587B8B57707B36A1C1E734E4C9C738B0F7B430FDBE5919926AF +2E464A8B621898EF381022F04FBAAAD5184B5868B56F105D1DBEE45AADCC3D80 +2C22EBCE143F63E5BA24CFCF22A05ADF1F35DA88C03A759FA9FF867A8E37A821 +AD7089706B432AD35BBFF303D738C5C9654205D95DAC3936AE8363F6C26FF08B +C87C803729A0F44C7A65E0BB3CF2E7A33B7CCC1EF51558D8FC80981B922BE986 +87A641241B0A0BE8D9F09881208EC7D62AB094D00E9F572AE27D536325FD421E +D010EC7684F097E4AEF2E6D203AED5E0D7C42E11FCBC051E56D25DFF8130579A +8D745EB13E6C7AF76C10E81F68471315DCB58E6155A9614F8F0BDD64D37B8456 +7CF46A233A62F1DB9309E29E21660F9648DD1BB14BDDFF43693C1DA4E3B302E9 +15CEB125750544926E0AF982A38A3A4B082C421C0FDF6ECC39C569F97BA229CA +43329F348329BE708C97B98B189CBCB2960D71F1CA73CA1EEB832713E627F870 +69B0DCC3CCD8482EA3EA7FEE339E0566108E46BE17B52C8389E300A41BDEB1F2 +4D9FEEDE1C077A5EF20D8F80AE83BAF2F632D0E4B44AD0D0BAAA968F2B3D2168 +75F939ECEB31D2E7811FA0A73A519FF0CA08992D4FD40E7A2BD53BF94733F41E +789BC5A7008B72255236B3D042996C45E4E1200B314418AA4EEDE6D718567526 +7BC1B992974BA3A8057E2298952B0385D7DD5089E9D7C5B8FACE9B09AA441594 +CE6501B80E7CFBB0DA29C2014AE02080D8D423EDF27FF4328135CF4D494EA175 +9CEE197C2CA22519AB42AFD301E9637FE98A19485F8A2B6D24E05FB13E66A9A2 +C602FF16147AAB158E8DF5A1FF820D8B7ED5A3F387CCDF247252C3D68A5E37BE +3BC5DC42F28C8F776E9ABF518407B2975ED2647B3949B4E199D2F6E174971828 +C7D3BF0FEE47A33C97C98ABFE47E87813722BF3F9B809F6F98D2771B8537A541 +EBBB8405B38BE6865F4E6B7A3D2BB0C783B1B73BA5FDC9EB65065EDA3E1C32F2 +8748BADDE0DCF35BEE32CA8B537DA99007625EC906F8F407912655DA1A05F01E +F6EB582FF37089852921EC8AEEEC1BADD79428965097B82577772E53F18D8B79 +0CBFDAE9F71CB9D66FCBEC1313D7BAE572743C0253470B42805ED77B125BA5A0 +EF873BE7490A3B23231CE6907327E93DDC90B656BD6D089C6DEBA6E0937CD89C +1C831543C9C882E1D6A67AE45E2DEFF0A01EC9FC670F4942192862BEC7247F19 +59D87F0834EF21A434C8E9E9876797A94FA6E8AC226376F822D07CAE909A6FD5 +8630BDE38D97097E32FF6119728D50F88960F740DD78D73B291885748957D025 +219DC96237FE9B64D514EE7C6BF47DC4B49E4F4AD10AEE0D3A779F2D977BE792 +8E15199C8983284D3F6E6824BEA40662EE2289BC4CD6198C8BE88788AE7373B7 +63ADAF8E4D8B78AE39773AA8DDFE87AD7C2059B9D72AFEFD73B85DA2586545D0 +8733C2E16495B7B1F51B31268887EFD3D47DFC5CC038A46ABC88A627DA32BD4E +BA3FC33EC0D95C42609DA3B413001139881D68D5E6693295EADB4C6D56CA04F9 +656774723158F04CF91A963BE122701B89714087D03F331996F4E0F98D758E4B +AA6B3DE1BACFC6C277EBC7CA9DCB09B4D741ACAB3792DB72C8D7AA2553980E0A +39713FD6D3800D82C7003013951E35DC5442A52819F5D2C5EB718D42B1B393D2 +867260222949356C2B1B8CF43D249A5B535089CA0883BC998D7BFBB398926D1C +FE753DDECCF869EB97182F3EBF918197A1BC28448F690E6B0942602D6486DFAA +7EC1D10DA996C972A3E0E0A258F096687DB95BE9376ACAA49C70810C1447FC50 +6213CD7284772C95455283F2A5EBFD4D910AB726B832480A95D156F7313F35F8 +0AEC649B0D6FD7C776D24F3DF345209D80B9BAAE127CAD607E11D199FC8B833C +C6C254388C6FD46D2E8BB6D8D5F186E700457B1842775BF1CA7A1C1F225181EE +ADA71EB7B0491BF23D3D324C3F8265B485906F6D767E2CF449CCD50BC0377B7A +F9618B7C6A52BD93859FE594AB6D4C1ED7D30F8E6D0341E6F49397288A254E5B +0AFC33846C581D2DBAFB8358A3CD88CA1BAE004512EFCB89D726B8A4AAA78925 +67E69B122A7CE8A86C1EEB4B0678AE1CBC2F31F0D033E529A8503AFACCE19D73 +1244EDBC161CC6730009B023DE1AB46A323D4C03E5562410A6B6DC15B97D6AC2 +258C10FDFC17AA4668BCCAEA7392463DBCE1F26430CA44A53680B42A7197800B +574ECF1C1E496429E37DE2C7717A304753BE4E443D6D8B482D2610252C42AA21 +08F9358BC6F57F4840641B2616D3F758AC5B0FD3C69A077B5D8268A11D535915 +5EC3F3E303DD241D5876BDDAA1BE799711AA04EDDADA0353CFFF3E9836DAB250 +325F865FC146CF262039A33F346B18E4AA1641F2B4CCC073492F73F8346268BD +7145ED165FAA332554CA84A82913A259EDD0FC5DFB10959F0E80B6E3F4840668 +4F4EBAE2EE71C942006CA58F45D947ECEBBAAF002098946CB2258E6E71CF0C3A +2A2709CC262C80CA18D2AE777FDD00224BE90CA60D12C6778EE48C6A258885D2 +2698F97B7ACA2142A06AB50131F3C565739D8523E6D0A9CEA0B18B1593764129 +626FD058020E5BBA72468B644AB847A13A87E71907C9F753B41CE36D5670B8A2 +6AA29599751E337387E63FB5099068C876E6AE81D47EF59BB82AF772BDF99948 +14F3E8D90005F6D095AED8C3C47D6F136B888B53CF4341BB1A18DBBE2C155A4B +FAA06FDA4BCEFFE8C2E77782FB062C2FF89FA77C07BF3F39E45DE3EEC32A932E +8AD72191B7A6268726CFCE67A0E7B74D1D105AAD8F6EB5F518FDDC27A218789E +10C6D56B2469C8E9D724075D494FB49FCFA6B1EF250DF13599BBA5B8194197D3 +0F17F383ACAB237905466228CF4DA095671A66012C871480313558E60F40A36B +1C206152EAF398F8DFD8EC7FF80FFFF7A426D335CAB6589CB823D8BE6ED4E5BD +18F60101BC8C85B29A9677F8715F6BF5861E20B0BB8A2C9C12EC0E6A20566777 +A8B1C23A1C1AD7B4705330C254D9F4DB7E2B00B56A93A2ECEED51EF7ABCFF15C +22A92196EED3F0BBEF2ED110152510272026FE777198C3F9406419D92584A7F9 +BCD1DC02148236693B48EED88CDDCFFBEAF7BB26A9983DDDA5A7DFC3B4C1A6D5 +2560BD180419ACFD74D5F66DD31BF1B934E7B64E748CC95151252AD15FAF2005 +6C734D30D26DFC23718D00C9FBE113A40A9DC5685F07A0201FA748A4116D69DD +65E10AF83FA4AD53C4130846C703EAC6748EBA15ECC44BB4E9402CC4C4B75B78 +C0CFD428CD377867C74EDE17833D69F8840F2CFE5A1817A41AEE75C7FF288EBB +31012604E066F8F3E1783A94D81AA9F5F64A749D457A008DB5AB146114221258 +B314DC5738630CDFB4827F9AECCEADD888ECB3A7DF47022A6C629452FF54E360 +70E38E72E4AEB4F4660B3DFF80BBC43F3562BB7B254FA86606E7F83868F9A0D1 +A9B2DCF267B8696F5C70AD811F88A7F16417B3D958AC1DC5AAAB1EEFE04F6FD2 +228DB732D1B4FF62C5C27956C2AC4D9D8664A07B9CD71493D78A3C0F157DEEFB +04E12BFA1A2F4CC6CBB02E4CC5CA3E8BCC3E0E2E1A64A7B1942E95022BDB34E6 +157DEFE50E41C785CF9AC73684BF49A3541FAD59A1A22F17EB6B6523E9397506 +F5DE864EC40EF1EDCDAC5683F0025A2F9ECEC40DB69E03F39C09833162FEEED1 +50211931877DFAFD1AD95FB8B05847AB51C95338DEFF5AE18EB3DDCF2A786F6C +4D38ADCEEB944ECE60B82BB068318306F7598B166962800DFA7CD3518C1EA0D6 +4F5AD48208EEB8F60DD5799203342229E9DE9688DF1AC8B199C5BD8AFACB732A +79081866ED73082CDC6E391F618F36545F59BBE9DECA4BF5BBA8572A66308222 +F3AB21A2FD400E1D5F5AB897307340A274606D15657EA5D19FCB932F9F037F05 +03C9CCD4D9A79339A1157B2D725810E21031FF0B07319666F4154787BE88089C +D08551FF4D7FCBC31E1B1C33585D62D185F0146FEC998E2A16DBFEE0C1C60E5B +E196969E68B35BD6B41CFDF8065B8D483C9797E2F847E81E44ED315EAF1D3C22 +0B61209F1F56A22C1694AD16CE228305986E55661485A005935657DDA8DB7B2E +A5CC38CB5583C0DD1DF29DEBB277B4705BA3BF5391AB57909E8888123AB72080 +CD050ABDA976F4232ED10FFB2D1B321EB14DF3BC16BD3B3B09C763E8AE443859 +80B4F62D888CB482AE32D3C8D81B166107AE507B53B8679DAAE558151FA9B010 +A45CE34B88BD4EB95E7DE41277F03A343114E904AB0827CE9E3ED93E95318BF7 +CF51B3E32AFA4B84249074D7071F5268FE3C8F4A8B58AAA63494CC1CBFA4D7D9 +999251A76D99D261EB8AF8C0D5E9AA59284DCE0C9B6E150662A18F0F601E2519 +6204EBBD240955811392FC1099F5B4DB0782AF4E33F8A2CD594C0A7CF2CCEFD9 +73CF5A6661BFB1F2F437AA86B89BA67B999CF90A38BCF64BDC76276A09F93537 +A288B0898D7E361F90919D272246D4B0C09DBB9960FAA0CC2DC39A14B8282E58 +B1F7243B1AE573C7CBD74A9CDE09A1921F8CF7BE00297D286BC2FD3AA11CB06E +3D7A2C52D10F878E51C9AFE8F16668C0E1FD7F90E2743A65C382B91F4D76AFA7 +AF041C9DE7A83B48D89B770FFB53C1B066682D6A9A1E48E5CDA32A46F8F8B085 +DD0ED34438161EF33711496CC2B8E640793E1E9BFFAABDAC89DCE6833EAA71F7 +578E20D43D3739FF58D41C1EB8C63414CAAE2FC534D677134D218DAA40A13E36 +59EAED3B3648BD7A3607868F43E0C85B2E04B67FB07F564FB9D14CE479B9763E +B0FEA84500D86F75517670F03715A50AC0AFD0B71090E530F6CFBF3E6226C609 +2AC4726F8D1C6C1362524D9F658F7FB532BE1C05D74A3A46CA935EAFC5CD9828 +3511C71910A24B326E2C994A9ECCDA2C4879802B5A2651449E7445E84A9D50D1 +4968CDA95450FE448EEDBD06FD1FE20178A752B95E59CD5729353FD982FDB318 +2DCC5254DF36CC72B4758CBAC3267723627796AB2C3048BA3422679BF381C838 +76F0EFA03CDA22FCA4E6C19D08C849CC1005859796FE8A17E0278CB0D04E6CAE +CDF828F23397B59BF7511624EE4A27730A79250C2B094995660C43230995E255 +02C65BC6C853C981A5EF9EA9A5A5E455477D996005167153638EED63F55B08DB +218C65137F17B871E0F75D9128484A64FD8290BF50914BD98BFEBDF8D689AB0C +D011ACA2B89EFA51396CE71097ABD82EEA261A4E592AEB824DB9E444D25ABA68 +F4B65D5526A6B70A7CC23AE476AB155B0903CECDB2AEDB1BED5537E291F215A2 +2C69E73C4B09A6108A0A1E16A218C1790CF5B4D2E6199F0269DBE62199F9166B +96D6610E3F42F573F9EBF70145A5D0D2D87F7599A56974284F5F92B274F249C4 +3801B3B138140C78ECFC061AA8844A41A029FB1A90CD09222BD9971F9B8C7488 +9A448CDE2D62C2270B34068F87AF5C5CE86A443D5F2F0F9C78D84EDADFC1CAB3 +119F7D3897D89D6D95A2F72DB6AE9D17FDABC7B3D9F1E1EC514EFD82D912569A +7DFF257929A5D0B3B88D7253E11FEEC431C73B9A1D56BB87A2C73B45AE345026 +CC27558FB4A4D34FE528060CE0425C77EFFF57FC6C9C8E9CEE24B78CA06F052B +540BCDB2F118F9A06F708BEC473274C882313BF600050BB6CF36C58F9AB8A701 +502CB618F0FE530A7AFBE9DFAB8B150C787540968A68A5EE07123969C884D7D4 +BC48CE82C27B3B192442508420176E10107EF453B20FF400C12A980C7246B12D +290EBBC3DCDCDF25ACEF0E6470C40890EBDB4285B9A03C7566B45578AC4906C0 +E15029A768A2FD07F7FE0FAE46C92F2BD601BAD9BF06EE83083568BF2F7CE09F +14FDF7394E7CCD99E9D8930FAC99D14AC9FA211A02D4739F48F6541259192098 +3C15DDA136869EBA347F33818A24CC2BBE88FFB74DF8D3BFBC190E191ED351C5 +4B3CAAD0CDA1B9986DABED2991CEB775F51FF106A35647B6FDDAB142705A2113 +14DB6066929B20CC11242374A0833E5208962C9C079E44E9F5FDC6DE87F70DFF +CBA137C67BD1EC78D08C73D0FA138339E5F28363BC3B96351A7BD115958BF4F4 +47DB8EDBDD35B2806B741D1CD31FCE5BDA1BE899AB94B520D8A7749F1B1DA579 +3C408B11BD15075B04E99589D9F6327EC85F1862A754D4FC13C49A82043E9FFE +B5A257C6A87B45386A7125071BF7CD6B3409CDFA9C2BA0DBD61627F9E9160163 +67A8389FC9BE20E1854FCC35C3252E96E687BB0DF1F4CAF4ED4C61FDDB5A3B51 +05213CF547186987D447194A5FEA3243D947B02E80DFF12370FFFC3CC5696371 +B6F1C23A9CD0F6A64E4A019CF6CBAB1FDF44AF866EE19BF59D78BB375280B9CD +A74E328753A560A20A977934E6B58C905DB51AA3C35EFB6B3B49152C288D6683 +535DD175A81F1DAA1F1EEF1007AB605B822B09CCAD1DF39D016A84D8C603200D +086F358D55FCA0EACAAFFC1D76EF864541E519D2DD5BDB7D1EE6C7066C7B42B4 +346A0A3042B354824D0C7EFB4E9DD6D6B4BA7E10694901FE227C7EB9B9615855 +59D6A8FACEC963D2F9A93305FE995A3A83055DB229166826641BCDC83740EF7F +B50AE8171CCD22B230E2784C8CFC1ED22C9C3F5EC90A16603322E2A889CC4DD4 +0FEE8D0DB78FD9B74E2A7FA196AC0AF888A36CE05A899943188920A6DB719076 +CD4B39D3559C992A02DD5B3C47AA1B859F8E6DFAB5F26947A0AB3F30E35FBDE7 +7BC63991C716A54738AFC85A7FC259A874F7619AE7BAE01C1C59A97D595F0AA0 +9CF737C6795EFC15858C11BBA24442B5EE5C6E279C25F022E5D8FA458FE8FDC5 +3FC1C7583963E300B86586F88F42972FC0C56232FC394ED64E275D9889E6FEEC +13F0F853D1D6C390F1242FF327E23370D8D4BFDD2312415FBB25C759DFEBC763 +34C45C85E0E82108F790215F5CCAEC481BF451C34EE685E85270702194A740BC +6697B6BCBFB850E7727D3104702988326DF435C7127C3645E3307C877191955C +84D52B3DBD402013610A3D6EB523C4D98100AC761FF5D8D7081371CBB4235215 +D0507160B45196DFC9C390029D883363DA88226787415541E8CA99A7EA1899CD +B4FB6F6AFEBA08358E7A978AE7E8FC054FD729B735C60BD29C5DEAA39E6CF5BA +01074B51351E0AFB5B9185B7033AA1E410613284DB9299A3B3986E60A2E9C178 +88DDF8444A6C8CD7A140E1E4A84C33F25D184EC3DA1BE13CC019825C19D246EC +7D55C87B8685707E3BCEECA0D6BA729C045B3DF4AAC711C019FF2E8F80CF7BE9 +37BCB4852BEDD366103A4C73C4CDF0F495D9A07E005E98696B863C25BB79086F +281865CEF0EA2E1D8E48FC3966B93C2FC3854AF80225F9CEEDF97F0254F2B419 +DB4BFB43BC0D392E17BFDD433A18F11478D955873277FF45E00DC49C5B7F2DB2 +02E129C246C31320FCA3428D185C0E8F413D4566EEDD044A87D68E75F9FA9A87 +156FC6E2C9223DDD57548508AFBCE5F9D429D156D06D9140954511656027BE45 +F8658279BD85EB6EA1BF7E760226D750C5C6BCEA47D8E5648014431946877B59 +0804F03058E80FB624970E85C40DC80E265DF761CA2646579FC5BF43B706260B +67B0D308A04F0E5950A4BC8A635E1263A60743F59B124E726AEB9F39B44EE7D4 +ECCEDEBA0031272A266E69B90F24403662B09DFB5C6CB855E553B38EED88742E +114A0B159D1A3C41D782818842F567C616EA6751408F89CA8177D1E625D8B2CF +2B6F0EA9DD7003D93ECF7C9665FF1F8ABDAF859D04D208481217300DA1DDFFB7 +654FCE01FA87539AF944F27A9F833D4DD166582850BDC8A54296EB7707DB578C +854FDE7CA891F11B9C82415BA4A4FB9B123D043E86C390576DB5E86EFB220D24 +741EE8A174D30D462700AF8D22083B91167410876185A11FA32469A0B807E249 +B59CE0DC5E01BD846B32575371F4C1308C7229DCAE0849B680D4AA30CC7B8769 +DAA9B72BD93B32D26F11BA8BA05410B57F9A103F941B1170B36E5DB60548FE51 +3369FC3F55785EC754C8A1800414B9E8114601996042AD4F4CEC7CD0AAC679B5 +B5D6D321CDFC4AC16BBC3FE44652767533973DAA76786228A8D0B835F7BDF74E +FCF2F2025E2C4EB5B4009E7965A4DEB180129065FB47A093BAC368BB1FB2766D +0D97AA715BD2C2D692FFC56C18E2333DDDF66FE21E87255B7B50DBB7D79CE1 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +cleartomark +%%EndFont +%%BeginFont: CMR8 +%!PS-AdobeFont-1.1: CMR8 1.0 +%%CreationDate: 1991 Aug 20 16:39:40 +% Copyright (C) 1997 American Mathematical Society. All Rights Reserved. +11 dict begin +/FontInfo 7 dict dup begin +/version (1.0) readonly def +/Notice (Copyright (C) 1997 American Mathematical Society. All Rights Reserved) readonly def +/FullName (CMR8) readonly def +/FamilyName (Computer Modern) readonly def +/Weight (Medium) readonly def +/ItalicAngle 0 def +/isFixedPitch false def +end readonly def +/FontName /CMR8 def +/PaintType 0 def +/FontType 1 def +/FontMatrix [0.001 0 0 0.001 0 0] readonly def +/Encoding 256 array +0 1 255 {1 index exch /.notdef put} for +dup 0 /.notdef put +readonly def +/FontBBox{-36 -250 1070 750}readonly def +/UniqueID 5000791 def +currentdict end +currentfile eexec +D9D66F633B846A97B686A97E45A3D0AA052A014267B7904EB3C0D3BD0B83D891 +016CA6CA4B712ADEB258FAAB9A130EE605E61F77FC1B738ABC7C51CD46EF8171 +9098D5FEE67660E69A7AB91B58F29A4D79E57022F783EB0FBBB6D4F4EC35014F +D2DECBA99459A4C59DF0C6EBA150284454E707DC2100C15B76B4C19B84363758 +469A6C558785B226332152109871A9883487DD7710949204DDCF837E6A8708B8 +2BDBF16FBC7512FAA308A093FE5CF4E9D2405B169CD5365D6ECED5D768D66D6C +68618B8C482B341F8CA38E9BB9BAFCFAAD9C2F3FD033B62690986ED43D9C9361 +3645B82392D5CAE11A7CB49D7E2E82DCD485CBA1772CE422BB1D7283AD675B65 +48A7EA0069A883EC1DAA3E1F9ECE7586D6CF0A128CD557C7E5D7AA3EA97EBAD3 +9619D1BFCF4A6D64768741EDEA0A5B0EFBBF347CDCBE2E03D756967A16B613DB +0FC45FA2A3312E0C46A5FD0466AB097C58FFEEC40601B8395E52775D0AFCD7DB +8AB317333110531E5C44A4CB4B5ACD571A1A60960B15E450948A5EEA14DD330F +EA209265DB8E1A1FC80DCD3860323FD26C113B041A88C88A21655878680A4466 +FA10403D24BB97152A49B842C180E4D258C9D48F21D057782D90623116830BA3 +9902B3C5F2F2DD01433B0D7099C07DBDE268D0FFED5169BCD03D48B2F058AD62 +D8678C626DC7A3F352152C99BA963EF95F8AD11DB8B0D351210A17E4C2C55AD8 +9EB64172935D3C20A398F3EEEEC31551966A7438EF3FEE422C6D4E05337620D5 +ACC7B52BED984BFAAD36EF9D20748B05D07BE4414A63975125D272FAD83F76E6 +10FFF8363014BE526D580873C5A42B70FA911EC7B86905F13AFE55EB0273F582 +83158793B8CC296B8DE1DCCF1250FD57CB0E035C7EDA3B0092ED940D37A05493 +2EC54E09B984FCA4AB7D2EA182BCF1263AA244B07EC0EA912A2BCC6CA6105B29 +044005DDBEAF88E0F05541BBD233977A447B469F013D8535A9D7023CC0FB7B49 +A95CD2B6F18935C37F49E9A73E97A8602C5C26EE13D7A04A188336FCAB4CDEE0 +23DE9D803FD6E8D846B3F729BD36137E834E016242CD2F7BF048959DD45AD413 +19B985D05E5D422F3D0968375EA6A90FBEBF8B42B15F15280469D69629C08A42 +1C298CC027CC288B9C984239ABB96B6A891C1360D08F9ECC22202861E4CE9B39 +8BF147F0B2D22726583618BBD081A7CBB0F10ACEFC161043760929406853BF52 +3EC809222FB195795F19F76FF7541EE3E7A0ABD4F0D9ACD5039881353B0964DE +AA5F4BF19DAC50B2AB87AF57E4384D8E8CA2E26121C778BA9DB6AF926C29B3EC +C51DCAEC6811F219E002EF7EBA102BC5B409BBA3EA06FF63321D004D0FDF986A +4ABA9BF9171846319418EC2DA26255ACEB6B4869FF71CC9027A3F36EE4B98837 +58AEBC43692F20B492410BDD93F6817C48DE242FDF30AD76568E792C3A665C58 +44C54E752A1A87728330533622720E65799B3ED33230FEA1D4C22BC367D9F547 +F667E5A90597799D54BF50BB11337A7DDF67A7FB6F52B15A2876973A8352650C +CF74C4575B0A43BCD33DF8D7961642B509468FB6E92B23263E8FB5615E223AB3 +6CCFD05B612CDE7B555B7FA92AF3E5E7DFF8D973FC3791C97D145D4EA72946AA +89AC3CC4016DD03878383BD5906C224CE197E8126D217114547E4D96E0AD8E65 +A4DC61A106F023AAF1BC47E496F9C9DF8C42DBDAE44E33FB910984F73E5949E9 +99DBE07EF7825C060BFEA997291B25FDAA70B09BB13CD8CF4A480A232E21919A +E9887FD8BC9EF086AA85F50AD7C889DF09696A34CEF35D8CBFABFCD8CF6776E3 +76EE2342139FBC0133E18F11B2F0C6679FF971775F67F937CAB200820AFE75EF +9A589A8FC9E20AC601FA521E3D7915D50FB94F3B39BF46EEE1928A09BA1A6442 +F924B2C1B490A622F67917273E141EDCBE6945244F5A671B8BC2F92AE560EEE0 +975E335B484214FF4F5B15D4700D3208F4844D6AA4B5D67C05D5BDA16C5F1D84 +63E49D9DA5443D596106C094583A83704DAF474505F9EEE80CACDD901BFC8571 +56846DF88902B435C79681E8A508F9CC42C7809A975EB756747E700B28485E1F +FD7E6D86EC9285A095DB0DDE4FC086D5C7AAFAE10A145AF9E3D1E7CAA2AFAC08 +88A23EBDC79670AA8CFFE38DDD204BE3224C4609757633C029BE2509391B80F3 +19FEE5F3AB163506FD274929767D3D3FBC06B5A7DFE7ED1D4A93C3E41689C5AE +A84A914904CDB6D2A60F1ACFE5001268F67DC07634E2F52164C4ACB0BBD16F1A +87E9428A3FAE4A0207C8A1860D8E0696C748A8457403EE1A801CABA8E2D2203C +B8F565B065C449EEE679AB1C1BB241DC14CD367557EE8BAFC76383B7E30F353B +2A1695F7FE392192514F9DF81564C81E282DFE6502C213ECA87A66A5057B72D5 +73A3A848C2BC2FF6A0E0AFB313EA45D7FE2E328AC3016FD8802EE4538AAEA5E8 +947B2DD12CC78E53D47423EBAAA312035B1E6BCD86FF619796B170BF834BDD99 +90169BE96C0EBD84B97C244705525D1D60E88231B825D93B1D700728D8919CA1 +6518CCFA5C2768068D76EDCD7A22A6D4C42FD4CCD3E28C61D3B46C3510B78931 +DB7655923FB7E94062A8955859B0C5A9180F54972CDEC0661D1B6F4DC58EA397 +CD341EE81EB212CE34580EF988CAD9477B119766FFB7D1CB2F1376CCB238C6E8 +EA3C9313F8018CB60DCE502378BB3F49EAA6C680B62E73A01DF8C4347D00D2F5 +863114D3D9B00E9A7E8E6EB7D6F6FA6C10103A641174A6131DCF49CFE1D641C3 +F61B89CC6B2A69C55B691934E1E4B0E8D67E592EC7BFFF841BFF3A4A574EB3E9 +9C3FC6A9B177E2AFCE1D7BAE9AB6B361DA451E88F493702A6A34764D5120BBB9 +210A43932754B18409AA1B5EEA960F3D9EB27FE9D70430DF93ABB6F4B91FC467 +2F5BBA217AA35DBCC7F3E752D847DCA8B85FA0FDC8DCD6825777899CA8FE22BE +BBEF9C8D1A1C8B44DF3016948B9C28B66A287D4410C9650F95607DBECF0BA8FE +FABD6676D359E9552C5BEB2FB2889F5E3D5232B2B5353616EBFC2309B6D4959E +6EF07CB014A149AE040CB5865A9BD3EB34588C9850A93060AF4A056BD4717142 +7F8B25A5ADBD8FFC26701BF936CBF17306B831756D88435DF01B2B875BEE18C3 +456728338AEFE6C9A7CED1384319FA59A743D25C5AA157F7A0D3477A362A0BE4 +17CD9297CE707258B89B88C6C826EA26700A58AE1F5164995EC4DC0E8E1281C4 +000230B6AA110BB6CA46B754E6F8AD09B5355BB515ECB328239362BAD7C59272 +E6932894CBDA403725C583A1009D4996310FDB839BF9B4AEC033E1BE2D35110F +683A33913C2AA953369BE268EDCDAD6C50E38DF26AC3BCA358CDA00F540A1A49 +CE2D47C55DDAF4C24B3B8759238D5D4F9AD4B771D2A33AD905092A95F83B0FB2 +734A420FD1AD12DA80DA11BC469634B6AE4D6F66BB1636384A8C47010E53C401 +E628BA3659089E4921C080C7E05858193D0C40E0C9B05D6DAC0F74B1834925ED +46A45A6983943E2B12E0A8A1CED859BCBC46350968514823198443693CE806DD +28C71ED2E71AFCD8E418E1B2D13B82299D2FFDF346AD454EE37340CE52684FC8 +615AD8E9D2BE0EEA0B8B079C5E48EDB4CA82D2FB1D8684CAC5089379BD833E2F +14F4A81AA27B49EA54DE490D19AE2281BB39474C8AF6A1B9EABE8D9B09E284C8 +483EF3A6F0CAEA501F62799CF1E6DC4B637D02E99FB51E328DC2AE144B3F715C +7A16F9C0F1B6C97A4464C87AA4D113A54A3FC1AF77B5D4CB4EAB75CD9BF22A29 +1A24AA5EA470B632B04984501C4028C197E5E1D1C402284C6B2100DE79FBE6BA +51404E105F0F86F8940E4ABE72B534DA426AD0A8DE5D35B84966C4E99DF0082A +E44F82EBEC804D7ADEA1CBEB134527433A075B2ABB7598D04B673D442874B0DB +9AC93C9FDA219F1D91A1EC35CDD6B3272E1C32539EC6046EE0EA6DD3E4A48987 +162B3AEABA2A42845320CB9E12EFC8E17A72701C38FF5759A2B8592C7935A88C +C7384FC3A9B60CBB3E9E70E49CCFC7F3A116F9903583F51B385FC7DDC0E9A9B9 +CD0B5C38F0D89D490809D449FB3755B8EC83A4DD979EB995376600BFF7F38A0C +604E6BD6A7F033D92400E988725116A2B364ECEBD706FA978315735499EA0C9C +990C15B6B70C2A74960F1FC37B448D61B768E8235BE90A19F9D7DDD3C7135B94 +40B107F1CCBFB04656920E01413C5128B0AB583A26398D82526492583EDFAED9 +B1B953655EF05FA42547467F072E229D7135228A0DBBA87708D07BEA319C6409 +7D48C3CC8BC7B4B1F6D04E3915D79FE4167CC462F2598F1F1606C785FD1E9538 +717B45099C35C3B3894506F898D83C838FD4530A1EE0C11335D74828BEF6E111 +B041AE57F24722ECECABBEB1CCCC9C8AF3BA599688694A8C35581E29D503F089 +B98E96529FC4B1058B8E23782D2F9AF14E7C4105298638A5E29847640A7486D1 +3BB1A79F86FB2DFE5A03C1371E4D7B95B388515DF5A5E50887CF3B29F1984D84 +F75C9EA0D77A925492CE608E90A96C280F7E86AFFC852B058937C948C6BE22A1 +0E28FBDC6167ECD6BF9547135FA62C46B21341EF230079684FE18D96984790ED +908D58AACFBD0830C5D8D3220F2EEEA0FA6B21CE7433B5FC517E64303F7145C4 +22D09ED0758B40F1DAD62DEF3C201BEAA94AA345D0002B809D602E2F89CE8CBA +5DBF38FB7B09EB01A508E655A068E83AD44EF21FB94BF63B017D86F85B3D5BD3 +F2B6BEFCB4E51F264991DD7C60931B55BCA29BCBDE2850333CDD069AAD68E630 +741E8FEA3C880D4D06E2E1BE457FD5CB53432A4A967870C8BCF142821F20E506 +F7A998D034E608CFA62DE8C3B9CA4358DAE3B848F0D437F8A8159B54B4115E07 +22A279338EA0A3C85B72257F0CB7BB210925AC87CDD912959ECDBE86D27336C1 +F6D5A21457DCE672F20358A65A3E40DB43821FECD679131891D89B8B3DC6CDCC +EC6FD74D1ED22D3793E1633A735C20B257C591855F0EB703612C1ECCB179FB15 +A313CB0834F6D16CBDA8B6993C477E765C786AB86E3089E01C4918F2ED9AA149 +694B62BB249E654E2C592CDE345C7D898531EFDBBC95DC95B90DA35A7C1F49B8 +72012676DEAF762E8BA52F2A79B877FA34EBC0D332C9B38930CF47C769F6381B +41BC928EDF77085C3726D0F980EAC0D7E0A32BF70A21AFB4B4A214054A3B9A48 +BF8321ABA58373C6697BCE4D3028BE2F8D8D31A50731A84A09543835422F01EB +CF74436F6C9C8592DB8D9BCCF3674D393F0915DA10F1D8DC218B55ADA7349584 +AF31B0B60BD69047BAA7456571F846FBB7E5E094080E7653ABB8AA29E890085C +38AE13B004E54E1E1B922B08D6D07A086CC533E7ED87FF44B402009098A4D9AA +E4F3930F459AF1A400A7BA85F5F7E0E3AD3E514D29222463DC18DCFBD444E106 +8B335C699B5BCDF254E170CDE093357483E18482DC80E0A54CD500F14F0E7249 +F603D1B462CA94C71B46B6B1FA9D5091E34B8CC2CF599F7435297FB66F5D48FA +7572A000A16E444A83772BF2B05688CE41029FBFA0B17AE1C7CF6D361F257E21 +23CEB2DF1FF2111765E2B34D27800A7349BCABAB2C080F816AFF76CEE128401B +C43F1BEDAF5794DEB1A298ED61633ECC24969169D021FA32EEDB5055226E399A +A7BAFB70A624A7AD76608416ABE23C450D7E70C6959DCBF03B845168C2839166 +493D3355FBC4FB00B96C9B8AE6583D02A1999AE46BC882AA85D66B526F207E5E +0AD5FD3EF0ABA378D56562E9DCD1263D78F8BBADF9EAAEBB52AFB72F348D822B +B82303C874FD3E6187C25990EC297DA7806D2CDF2C1030F137D333CEC7FA4DE8 +41DD9114E582EF366A6DFFC2E01A16F0122718736BF9B1A2D50A3EBD48F0561D +4A391E7FDA3727422F521476E7DBB76FC4AE557D4CB7040C8917A61C17211D68 +2176A97B3B8DC4F6F8A95031B68D00F7D0CBFA6684B5BB7D8A357F5AB6639858 +D730FD5FA1C02E9F97301E42A6CE735435B3BBA80C1B53AC645D2C1F351153FF +D4E4A0EBC453314CA575D5B151A9AA1ADC1A1A5AA79664397F3217E24CD81B3A +ECE0BA0D6F4A6427FBE37320726A841980070C1159C3901E3E8F1C07F7EC7A8B +428FB4423E598ADBD4E22E137D6529C588ACDE86B869B914A1A95318F9B089CD +BA2652842C8AD3E63EEFE546B2F09A3CC465933F8F4FD9882CFFF650DEB06658 +A20B633B3290005B1C1EAD65723A4E6F690311705FD1B0CFDA227D7E7D3B0DEF +59AC88DE4D22D7AEE169F2455C7EB0209D4DAD5CBB9860BA701AB526E4C7FBA7 +FD9B1662E3DE2DCD193EEE7BD18D68EF0328C46D023A7C7AF34FA60D43308F4B +0554F7043C1833B13094C7C72BFEC5108CAB7FF8B65EDDFA0EE11881F3554E29 +583F7CF64267BC470B5C1F170D31E8C7BCAAAEE41586E3BDE7CEB625F4B04120 +76083615F281D011357BFBE006315B2D821F05754FA853C710F459EDCF1F346D +22B569FA4B373962FA2C659196317632B962C84B98BEF32141BC60ABE433459F +920620A5D02631E384B86BDBE056185E5D66C3567715709B905E2A06ABEF89A4 +7C0E2ECC7EA17CDDBC0035AD01A1DE89CB6CA97FC14C3BA6B693120CC6BF8CF9 +44F50B63E69681B859C38ACD3683B2C619E39FCA40E5C12274ACBDCDFE8CC111 +DCA3FB07C11E52D39B3E0394B01723969E0CBF1F104772670363A09F29D7EE87 +77BB82420FA3CCCADC9516F5439D570279F035CBD0B3962BAF7B635965401636 +9EFCDC2FF1B04382DBF5BD2CD19CEC9F3B51CFD446D242454803EB8EBBF1F134 +C8EF82414B204BA307433A05AC5DD19ED2AFF67211193DC6819F10FA9318B157 +C9CB661248C02FE2673D4CABE69A20EB2820283C08DB0922BEE054306748E4B8 +91946D5DF12F3D30EEAAE38F79A65319209B2158837E0D1D39D42DB06444C8CA +5A40F3FD7F42EF6B74765B9D6866AC87D76AC1D1C040D17D3E905AFADFBAF0F8 +7F3978A9A8395979EC07D0BDE80E3D42AE312310247E78446697DB0D3840A51F +3C8F3B529CB8F26AB863CDBDE1E30F97F42A05F58B3E91C4709050674097E01F +21B99F98090288B857675EF4264C36932BD56B99CB22DF90016DC8A69C210B5C +4C34333E2B58014CDA465D73B0ECC2F971D1348751B271167C6BD624917AF015 +213C1AE4EB4D6CD8DDBD0C0BCCEAF3F3E883E4A526DA548E3AE665FC54315436 +EF05026950C500C3ECC1F6064725FD5602F0E892695A6993FC6A87B2ACB96907 +3E44F141A7F55B4964AA281B6E09EAD3D17CA9D5FEC455D0F86AE5BD008751F7 +0D63C9A8627F492E2FD1483370BCD0DF33DDE857E9F8433CDEFCE4B02C60AE1C +3EED2F7BDC50AA172E2FA00291DC71AC2695AC12AC797FF7D15D0E8C5B21FB55 +DC3E109C1AFA49E6D3F30B1C8AEC3CED7B210E9179B57DD5FA9FAA3DE9950C69 +1A7ADD7A9FCD6C17719CF70A0D427F8070229DE9E2894F8759DD71821238816D +594544573EB6C30530DBD16539427A829FE98E711CA5B2740095B9FD36276FD1 +3FDD540ABB094D03ACC45FA9AD01D892FE8CE30FA613DD4FA754880C646DAD8B +93372472D897CA32B84A58164B20BD322FC29594D0930C9406E7B736B74E8766 +CC4DCA58487AF93351E4C0078B38CF7E31B4CB8C223C339D4DA42571119856D2 +F0C68DA2CB254FD6CBEF4FDE3E309B5F6FE8A6D7B44E4AC065C1B79D2B16DAC7 +02E597D73088DFFF688EA96D9E72E3E5419AC7A99D7B58AF8587CB6E853B6131 +95BA5AE058809E32A3D072F50C8FBF4D0DFADD6E992BFEF5CBCF1039A2A7E689 +1BEFDFB04EC241C34629F5AAFC06EEAC05637E2E4792FE142F48CC5145FDDB73 +52708B00611BECB47B94BCB55AFEB796E3E4D3F06EFDB0CE6450F12863E4DD5A +0935240700CAE9B81E4D3D0A5AAF17D0C1A279F6F11742C9FBBA6FFFBA168C55 +735ED654ED3FA24A565DC0B1A9AFA9A44130E5CBF92B82FCCAF73DEDAACFD669 +0605D02EDCCABEA4A227F28A576FEA5B5318B68053E539E86CC18FC55727536E +1CF8B1A7C40291044C17C5C2D8E18C5922887120704B819587B5A33C4528287E +F0A2F9527B997854CD877FDAB96903F4BA8803C9C7D61E724993A0E7BDBCB496 +4F5AD996B519F86009254B081E32E93F282CE95FB0DD281A4973D4D0BFFE68A8 +3F0E199DF122754A557E7B6D73B67E1EFE2E1B219D80B6F2C2AC4C373CA73DFA +B4A993E71143DCFC8CC84C661C672CFE83B8CDB7E28BAB9F230C822682964C5D +2B54037976CED27FABBA43042B38DD96D692E98F6E7A20C435A469EAE880FDAD +768016E39A51B902518F131DB096259CB222AEFC0FDF9CBD82531B34B8295CB3 +B1ECE0F397DB6B4B1D1F2C1ECAEBD71B97CD5B510341611AB5BE4A5EF9CE300F +BD691EAAEDF57B6D585B27345D03147555DF906976C1AC2F95ED3A35853BED76 +554192A5BE7ED25898D8C9728A39CDE39D5E02DD02E9E719A4689AA59FF39B1F +C9D89032E09E5AD8A64EB24BBDFD79AA6BE4659DC05A0568FD808BA7895B4C05 +6C511B8CAC8FFEB08CA271264D61D5C894315055CA842E50710273023EF5D489 +C3BAFDFB601FEE2DA54FA552B2878A0AD8EB5D7E812437F4650F7170F809575E +8D038E35B29C32F707B1BFE57D2AA5DA2AF23FE8B3D8C533B8518CEBEF534E15 +69A01E4D8D69F262B9DC2D15CCE7372C3A76FBE5183106E1036705BCC83F3C3A +FC8AFE4A96C06D0C7781ACB721721B980B87A4C481BB4A656535D9F51C0ED3DD +9854247C788789B9E6341E1BC43BE6B62A8D2D7976BAFEDAAF618DA03C14C961 +77104F6CF1F9D3231BAB1460CBEF935F5FF42B65967702DECED0D02179E9B646 +43BDB7AC41E2316C8D720C15963DC7832454C717A2388EA42127EB01AB80186E +556998759E200CD7FAEE373FD3618435143B198257B9F35BC40E33C3BAF6022A +BEB9D17122C09AA7EE7F58C32160B43E03934ECC65FDED1C3B9BF21858FB7920 +236C832457D298800438531822E1772849E67987B35158F6DA1FD3A3F5A3E564 +B88F98155B678E39BBB8083E8B71E0D4CC0B5FC2B707FE47379FDC040CD5C5CA +D8D730CF6920E772231AA1AA0F1647E6DB488B8721B8D788AFE95CB0C1D461F2 +F47B8E69CB327090A741773714739B898E8831F2476201A345F828C4B4B7861A +C6898325965DBB1F5EAF82D0D76B3B0FD34F2C26AB975AE793B8E442608EEA59 +4FDCE8508CCBC90385ADCB98DDB926E14F5B0E6753A7918A9DBFED088DA9805A +6DE843148B384756AC4A04E2509E290BC9C1C75350799E8917D7D09B922C62E5 +B2F6DB234C0CEB92753C7D4BDA4E146D0B71064BA773969F816ED9B8EB71DB47 +1812AA97E08444EBBF8B365DF86E06747A222A9BF26C72347EC77A24D594D9C2 +1A612033B071CE656D0BAD462322DAAD74083FD761C0EAE10A03620AA6DDB154 +A0CEC3F8987A2FED9F4BFC02D90DDA261885E738771C81DD918A03D633D9003A +3AC8F1337CD0A0AECB63121C76F840F7D9BBF7AF1BBB3678D6C9764CD85E72B6 +14E5E388D616559D2694499FA80D61F5053AEB5E4B55BEB697008D5404497B8F +CC69652DC03A76237FA23D10CB68E5880A7ADE2575B31B54F10C268813F4B0C9 +1FC1E54CC5C37BB4053536C14453CAE6990AE22D3E74E82BB2608D6B4CDB369D +065D18D2813026453CF911CF7C2333230F466C74C87728273F38C2EB6C3FB9E3 +D17634C0C28A76889AC3A2C5693060A5F0AEE214B090C055D52776A53E632404 +0772D2DB1269AF13430C25F51692FF6392137B142D1C3094F53F5AB9FE4CE32B +E758D3AD09FBC4976AD60C457B290874FE7B6ABE54AFCC4F56AED40DDA532465 +AF22CAE2F3EF1CC4B689364F39255AA5BACB5120D8EE8F39D58AB98FB489669A +7800A1B5D13B36FDA95B8053C15C9B66E8B5622174B4D6B01D49888A73BB9DBA +22A3AE699D725021F052B96D2B76E2FF25C61095CA21A1800820183A16D4E2B0 +1968F422C761CF59770D75355811914419E6B9A624C114FC53CED7DD80C92BA3 +267BFDF01CD2D33540F5DB420388EE1EA536F7FB7619D3B00A34AF9ACE09BF60 +BFFCB3EE98F8E751231A94E70F49495BCB5AEC508041FE26F9FCFC38DFB7B7F4 +CAE3D60AF6C656D62F90BA6ABAC3CA1ADBDE709782366475D50ED30F67D9BF2B +EC7105CA22A743D5A7BA4B7B16C0871AC38CDFE9A165920AB712E992BF1F0838 +46BBA68353AA0EB2A3B7851938B5C0BD617A91B47BE536EEE1CF4C9542D184C4 +92A798FAC3452075EC6F931C724EE15C18587F1EEC9EE90DD5F3670E7ADE9B72 +828813D0BC116CD5B39031A20CF5453FAB9B77C40BB9E3401433E9E494E9047E +0E8E2F36B5E8DCB181375CF98506928FDD6F907769D83794E9B663FA26808BFB +A5486D2036DF0283765C35A848E10972A70E0C8DA0A6CDB3224A15C74A9F0A09 +AD75C5807E2CD5BB82E94EDFAF8E4946A60BB63ECC3FD0B03A3B4DA73A875FFD +84590E796DA58AAC47F05DD6BD99986FCCA6EC80985015CC720BAD6DBAF21EA8 +729FB5AA85D91C9AE221DE7C65DD537701F6ECDDEBF4DC7F3E6F8E8A1A917DCE +D53E6BD03C9F9053A3AB7F41B3F152F975D8D55307170C9C61D6EEE56A2D47F3 +8B97728F98B958F2CCF21C86A5765C5FCF1C78B020174628BFA439BBEC241906 +C37520DA9BEC389A3F2F30E19F44EFCEA08B13CD33B5337EE434220EA836F314 +8BB7AD4474A1986F6BD74878198266DA13C489A6D995AA96D7C6D52B0FB3CD7D +CEEF2D2D5823052D675C1B5615E794BB08B01A2B81B49C4D1F56AA31C9B4FEBD +0B26B30E3591B06C3939D57B89698ACEF90AA629138D8CF8914D554462B578A3 +30EF36AFE4E54DA09CBC28E1FA269739E85585B649F2F92F9D8BA67C21BAB667 +9D229DFAFFDAD907F911DA8D92A889CD4EF143DC9C3663135AD73AE2958AAB4E +2ED4C642ADB1D4752077FE0A4D9EFD9BA4FEE0CF063F0825823D9D0625FD8AD6 +693B2DF499255F85C4A927AD9EDC46E1E3E7F9607B689BD1AAB7893B2B0B6BB5 +5D0A3B0DAD7D09117F75B9D149DCE9E139D424F3BAF7051F33F1B7C687BC7CA9 +F18EFE617ECCE79C7D028C7DE780179FCFC26430C46553D378596D7A2ECEC876 +6245F7DAB2DC3303279BC8D48B29C1987586EF5D0ED2380BFC775C39EEEF4AC3 +D37FFD79FBFEF28B59104A06720A04A95CDD63FF80D6BE6580F51D1AA9A5C150 +B7919E0070AE5FD51D0913868F094B0B72E402405EAF9E1B4A5E0F12C694C0B3 +0C27A34DDD703B50BF20E0596163B68BAF57201BFAFC0003CEF86C345670EAF8 +3747D7800ACA9775AF17E86C6934E1839C7DBEFA9B5643A14469CB4D7E899A3D +16990A484A44E6104F075628D26FA0E9D860557D92D700EEB3B0A65EE5CD1608 +60168DD6A7D124608DAEF0E1EA9CF48C9B41DC24FE1AEABD582CF6608D45D3BE +B5E5457520FB95AEBCD716E38C317B8BE48066260EE2E6B2A10FACF46507629A +50C3C81E322FFA26F4110A0799A6AB0C7EF1B7779E295938F4551C715E44B0BD +4969C5B710F510F476FB15ED0CD1D854D3ABE782667066111E0225B0A1C44F59 +47F73C7DCFF60B275CF8537C06DBFE629ACD0C0F3F48D574D388CC2F95B4EF18 +961588BC15842347A1676C7C7F55538967454E065BFEF5C2E270DCB36D80A5D6 +2E1529A9890AF8DFB474B354F39804F48063830587EA4E271079780E84F76860 +B8D4159F8897579A70B4503329979A6EA0FE4B199ACF509363FF184DE28452B8 +7311E849ACE4132ED733B25719DDE36CEF7B29B5707C09927BEAB25FEF52C71D +0C9F7F39F2D08E6669B86EB5CB8D90BC1E7566FBDE0EE87A55D50E733008D457 +2D81631F3599E93C776EB59C620BF118AF3010777B0240CE7DB42A6786723ACE +E54B0AD66D257261041968F88B386126501B16005730CBC68ACDE21B73D16F0A +F15D90BF1ABFEE94F8B862362AF2E36D323F28C2665C57D22F5A718930B14B1E +D8943E10FB9AA3AADC4930A6E78C1FC15F1F1DDA7C832E2163F6CD70FFAC04D2 +8B04C206384BB66E96320C8559452968967EEAB10E9E579C87DCED7AF394F93E +A5F0E9EC82825F2FA364E33040B1B1F294FA4C5E536D012EC0209B72E08FED9C +4948761E0AD756DB78EB1C9E6DE99761BDBDD8BE8CB042112299DF825F68C53E +300EE1AFA59C7FA408092CAB515AEDC9D3873948A4B4B6D78A799DBA9FD3628B +D1947AB0AD9D594DDDD16997BCBFD44DE3F68D556EA982823FB851B381527276 +D0C68AA3EB370BA46F93AF52580932534AB73D609021411A9E0F0009E7821FCF +27181278CB75E994318E0C1B4C84DDA3C52291D2CDE0C45A509DD29518083AF2 +E3EFB3271BBB843080671C2ADD01A0D956EB48FB1166AEB5E8FC92A2D988BA5C +698131A1A6E4C51ABC3CD6D8D7BFE390A70838454BB6AB2CA40B1110575C3AA1 +73523DAF9BCD863A0708854890A24E63A05B272873A1323B00DF14759F78AA5D +453670FD92756E8654D0ED19883758D1B00E78CCE7DECD064907E27CD4167625 +27A0BA98448069C7B3D21FF1F53412ED84364526C3DA1574B175D68BA7626EE5 +6323C7E472614B86D77E2FD6E47C2D01A2F4D755F3307CFC06C094E233FCE72E +4845F7E31652A90B1DC8B940AA48A402281486F2200DE05BDDB5B69DDB965FAB +7BF0CBA38A2E5A7E91084ABE9B12A855F8747400561FD5C368D1997D3411227A +96AADDABF8E558826E73B474FE9E51A967DBE0C44133193EE765B8B224373A32 +7564FBF11B80986534A81D033ED05EE15A77B79493A6D69496D71ECDCFBF1731 +8E2FF0FF0125E3D186A4DDC597E478D525FA8E8058C3F131BC525EFD8B840CDB +EA2A792DF2AD54C513762859E34C3589DE590AE441804FBA07CB25BDA09EA7CF +40AFFEA627E46B1A461E2E5AB9C6B611B7E45C008EA5BC6EABADCC2541786210 +B319320D086BA982E7F6520E8EC957174D159CEB2CF3B858A4B903D9F47F2B8F +7ADCA2C5645447871D264E7FA1C8414CDB12B163C7BAA7533B25536E6DBB68F2 +7C215B25F3CD02163D3F5A562057083F3078F25708A62F627B0BFFF7A5221E6D +46A032EDEA888F00E6A23E59020B2C0A2BDC06322AC1F324D88CFD3B8FF74AE6 +084574963B4A3B06CD39F9CD0403D2D20D5EF4CE271CB18F792E3EFDAEA66B3C +CD2A4FB743E9D8E2DB995125D1F18BDEC5CAD402F4D90B2F8DB7ABC6841664E4 +1486BC2332C4E8F4A6F5B7A20AF10D041C8AA138B5F16EB1778A7485F003287D +01465EC47D5DE48546B13529A708CFAADEA60BFCC6EB1D6EC3DC36B512788BB3 +038125961302DB9761403C3B8016344897C590FC99CE273F2B224C799980FFD2 +3CEFD589FFBDA045E65ED55B9E3FAF327B4818FF9D49518B63EDEDFE31549146 +D971BEC326ED65033E8F +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +cleartomark +%%EndFont +TeXDict begin 55380996 39158280 1000 600 600 (refcard.dvi) +@start /Fa 197[20 58[{ TeXaae443f0Encoding ReEncodeFont }1 +66.4176 /CMMI8 rf /Fb 134[35 3[38 24 29 30 1[36 36 40 +58 18 2[22 36 33 1[33 36 33 33 36 51[26 45[{ + TeX74afc74cEncoding ReEncodeFont }19 66.4176 /CMTI8 +rf /Fc 242[61 13[{ TeXbbad153fEncoding ReEncodeFont }1 +49.8132 /CMSY6 rf /Fd 134[32 1[43 32 34 24 24 24 1[34 +30 34 50 18 32 1[18 34 30 19 27 34 27 34 30 11[45 1[34 +2[41 1[45 54 3[22 1[47 39 41 1[43 42 45 10[30 30 1[30 +30 30 30 1[18 21 18 44[{ TeXf7b6d320Encoding ReEncodeFont }43 +49.8132 /CMR6 rf /Fe 129[41 5[43 1[43 45 32 32 34 1[45 +41 45 68 23 2[23 45 41 25 37 45 36 45 40 72[36 4[41 2[23 +3[45 47 11[{ TeXf7b6d320Encoding ReEncodeFont }26 66.4176 +/CMBX8 rf /Ff 130[35 35 35 35 35 35 35 35 35 35 35 35 +35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 +35 35 35 35 35 3[35 2[35 35 35 1[35 2[35 35 4[35 35 35 +35 35 35 35 35 35 35 1[35 1[35 4[35 35 35 35 35 35 35 +35 35 35 35 35 35 35 35 1[35 35 35 35 35 33[{ + TeX09fbbfacEncoding ReEncodeFont }74 66.4176 /CMTT8 +rf /Fg 129[57 3[51 1[60 1[60 64 45 45 47 60 64 57 64 +95 32 1[35 32 64 57 35 53 64 51 64 56 2[57 9[80 64 86 +1[78 86 1[109 69 1[59 43 90 1[72 75 1[83 81 87 18[32 +38 3[45 45 15[51 4[57 6[64 67 11[{ TeXf7b6d320Encoding ReEncodeFont }48 +99.6264 /CMBX10 rf /Fh 129[35 3[31 1[37 51 37 39 27 28 +28 37 39 35 39 59 20 1[22 20 39 35 22 31 39 31 39 35 +2[35 1[35 6[53 51 39 52 55 48 55 53 65 44 2[25 1[55 46 +48 54 2[53 6[20 7[35 2[35 20 24 20 2[27 27 5[35 9[31 +4[35 2[20 3[39 41 11[{ TeXf7b6d320Encoding ReEncodeFont }57 +66.4176 /CMR8 rf /Fi 129[69 9[53 54 57 2[69 76 115 3[38 +2[42 63 76 61 1[67 2[69 8[106 2[103 3[108 6[108 1[90 +1[99 8[38 58[{ TeXf7b6d320Encoding ReEncodeFont }21 119.552 +/CMBX10 rf end +%%EndProlog +%%BeginSetup +%%Feature: *Resolution 600dpi +TeXDict begin +%%PaperSize: A4 + @landscape end +%%EndSetup +%%Page: 1 1 +TeXDict begin @landscape 1 0 bop -555 -364 a Fi(GNU)45 +b(Emacs:)62 b(Cart)o(~)-68 b(ao)45 b(de)i(Refer)m(^)-66 +b(encia)259 -266 y Fh(\(para)24 b(v)n(ers~)-35 b(ao)24 +b(22\))-450 -59 y Fg(Iniciando)37 b(o)i(Emacs)-450 97 +y Fh(P)n(ara)24 b(en)n(trar)f(no)i(GNU)e(Emacs,)h(digite:)31 +b Ff(emacs)-450 300 y Fg(Saindo)37 b(do)h(Emacs)-450 +455 y Fh(susp)r(ende)25 b(ou)f(minimiza)f(o)g(Emacs)476 +b Ff(C-z)-450 525 y Fh(encerra)24 b(o)g(Emacs)933 b Ff(C-x)36 +b(C-c)-450 709 y Fg(Arquiv)m(os)-450 865 y Fe(abre)23 +b Fh(um)h(arquiv)n(o)910 b Ff(C-x)36 b(C-f)-450 934 y +Fe(salv)-5 b(a)23 b Fh(um)g(arquiv)n(o)h(em)g(disco)603 +b Ff(C-x)36 b(C-s)-450 1004 y Fh(salv)l(a)24 b Fe(to)r(dos)f +Fh(arquiv)n(os)h(ab)r(ertos)543 b Ff(C-x)36 b(s)-450 +1074 y Fe(insere)24 b Fh(outro)g(arquiv)n(o)g(neste)g(bu\013er)409 +b Ff(C-x)36 b(i)-450 1144 y Fh(substitui)24 b(este)g(arquiv)n(o)g(p)r +(or)g(outro)463 b Ff(C-x)36 b(C-v)-450 1213 y Fh(salv)l(a)24 +b(o)g(bu\013er)g(em)f(um)h(arquiv)n(o)g(esp)r(eci\014cado)155 +b Ff(C-x)36 b(C-w)-450 1283 y Fh(alterna)22 b(o)g(estado)g(de)g(somen)n +(te)h(leitura)e(do)h(bu\013er)71 b Ff(C-x)36 b(C-q)-450 +1494 y Fg(Ajuda)h(\(Help\))-450 1661 y Fh(T)-6 b(ecle)24 +b Ff(C-h)h Fh(\(ou)f Ff(F1)p Fh(\))h(e)f(siga)f(as)h(instru\030)-31 +b(c~)c(oes.)-450 1759 y(remo)n(v)n(e)24 b(a)g(janela)g(de)g(a)t(juda) +666 b Ff(C-x)36 b(1)-450 1829 y Fh(rola)23 b(a)h(janela)g(de)g(a)t +(juda)766 b Ff(C-M-v)-450 1927 y Fh(aprop)r(os:)30 b(mostra)22 +b(comandos)g(que)h(casam)e(com)h(a)-450 1997 y(string)990 +1927 y Ff(C-h)36 b(a)-450 2063 y Fh(descrev)n(e)25 b(fun\030)-31 +b(c~)c(ao)24 b(asso)r(ciada)h(a)f(teclas)392 b Ff(C-h)36 +b(k)-450 2132 y Fh(descrev)n(e)25 b(uma)f(fun\030)-31 +b(c~)c(ao)803 b Ff(C-h)36 b(f)-450 2202 y Fh(busca)24 +b(informa\030)-31 b(c~)c(oes)24 b(esp)r(ec)-8 b(\023)-27 +b(\020\014cas)25 b(do)f(mo)r(do)249 b Ff(C-h)36 b(m)-450 +2405 y Fg(Recup)s(erando-se)g(de)h(Erros)-450 2561 y +Fe(ab)r(orta)22 b Fh(uma)i(op)r(era\030)-31 b(c~)c(ao)756 +b Ff(C-g)-450 2631 y Fe(recup)r(era)24 b Fh(arquiv)n(os)f(ap\023)-35 +b(os)25 b(crash)313 b Ff(M-x)36 b(recover-session)-450 +2700 y Fh(desfaz)24 b(uma)g(altera\030)-31 b(c~)c(ao)25 +b(\()p Fe(undo)p Fh(\))400 b Ff(C-x)36 b(u,)g(C-_)g Fh(or)f +Ff(C-/)-450 2770 y Fh(restaura)24 b(um)f(bu\013er)h(para)g(o)g(arquiv)n +(o)252 b Ff(M-x)36 b(revert-buffer)-450 2840 y Fh(redesenha)25 +b(a)f(tela)942 b Ff(C-l)-450 3024 y Fg(Busca)38 b(Incremen)m(tal)-450 +3179 y Fh(busca)24 b(para)g(fren)n(te)907 b Ff(C-s)-450 +3249 y Fh(busca)24 b(para)g(tr\023)-35 b(as)965 b Ff(C-r)-450 +3319 y Fh(busca)24 b(p)r(or)g(express~)-35 b(ao)24 b(regular)584 +b Ff(C-M-s)-450 3389 y Fh(busca)24 b(p)r(or)g(express~)-35 +b(ao)24 b(regular)g(para)f(tr\023)-35 b(as)282 b Ff(C-M-r)-450 +3487 y Fh(seleciona)24 b(a)g(string)g(de)g(p)r(esquisa)g(an)n(terior) +268 b Ff(M-p)-450 3557 y Fh(seleciona)24 b(a)g(string)g(seguin)n(te)h +(de)f(p)r(esquisa)260 b Ff(M-n)-450 3626 y Fh(sai)23 +b(da)h(busca)h(incremen)n(tal)681 b Ff(RET)-450 3696 +y Fh(desfaz)24 b(o)g(efeito)g(do)i(\023)-37 b(ultimo)24 +b(caracter)413 b Ff(DEL)-450 3766 y Fh(encerra)24 b(a)g(busca)962 +b Ff(C-g)-450 3864 y Fh(Use)28 b Ff(C-s)g Fh(ou)h Ff(C-r)f +Fh(no)n(v)l(amen)n(te)i(para)f(rep)r(etir)e(a)h(busca.)45 +b Ff(C-g)29 b Fh(cancela)-450 3934 y(ap)r(enas)c(o)e(que)i(ainda)f(n~) +-35 b(ao)24 b(foi)f(feito.)-358 4131 y Fd(c)-375 4133 +y Fc(\015)e Fd(2006)h(F)-5 b(ree)22 b(Soft)n(w)n(are)g(F)-5 +b(oundation,)20 b(Inc.)27 b(P)n(ermissions)21 b(on)g(bac)n(k.)28 +b(v2.3)1860 -364 y Fg(Mo)m(vimen)m(ta\030)-51 b(c)o(~)-56 +b(ao)1860 -208 y Fe(a)n(v)-5 b(an\030)-36 b(car)1124 +b(tr)o(\023)-40 b(as)109 b(fren)n(te)1860 -139 y Fh(um)24 +b(caracter)1027 b Ff(C-b)142 b(C-f)1860 -69 y Fh(uma)24 +b(pala)n(vra)1011 b Ff(M-b)142 b(M-f)1860 1 y Fh(uma)24 +b(linha)1085 b Ff(C-p)142 b(C-n)1860 71 y Fh(para)24 +b(in)-8 b(\023)-27 b(\020cio)23 b(ou)h(\014m)g(de)g(linha)579 +b Ff(C-a)142 b(C-e)1860 140 y Fh(sen)n(ten\030)-31 b(ca)1136 +b Ff(M-a)142 b(M-e)1860 210 y Fh(par\023)-35 b(agrafo)1103 +b Ff(M-{)142 b(M-})1860 280 y Fh(p\023)-35 b(agina)1192 +b Ff(C-x)36 b([)71 b(C-x)36 b(])1860 349 y Fh(sexp)1260 +b Ff(C-M-b)72 b(C-M-f)1860 419 y Fh(fun\030)-31 b(c~)c(ao)1194 +b Ff(C-M-a)72 b(C-M-e)1860 489 y Fh(para)24 b(in)-8 b(\023)-27 +b(\020cio)23 b(ou)h(\014m)g(do)g(bu\013er)550 b Ff(M-<)142 +b(M->)1860 587 y Fh(rolar)23 b(para)g(pr\023)-35 b(oxima)24 +b(tela)721 b Ff(C-v)1860 657 y Fh(rolar)23 b(para)g(tela)i(an)n(terior) +732 b Ff(M-v)1860 727 y Fh(rolar)23 b(para)g(esquerda)843 +b Ff(C-x)36 b(<)1860 796 y Fh(rolar)23 b(para)g(direita)911 +b Ff(C-x)36 b(>)1860 866 y Fh(rolar)23 b(a)h(linha)f(corren)n(te)i +(para)e(o)h(cen)n(tro)h(da)f(tela)119 b Ff(C-u)36 b(C-l)1860 +1069 y Fg(Cortando)h(e)h(Apagando)1860 1225 y Fe(en)n(tidade)27 +b(a)f(cortar)642 b(tr)o(\023)-40 b(as)250 b(fren)n(te)1860 +1295 y Fh(caracter)25 b(\(apaga,)g(n~)-35 b(ao)24 b(corta\))416 +b Ff(DEL)283 b(C-d)1860 1364 y Fh(pala)n(vra)1027 b Ff(M-DEL)213 +b(M-d)1860 1434 y Fh(linha)23 b(\(at)n(\023)-33 b(e)25 +b(o)f(\014nal\))714 b Ff(M-0)36 b(C-k)142 b(C-k)1860 +1504 y Fh(sen)n(ten\030)-31 b(ca)995 b Ff(C-x)36 b(DEL)142 +b(M-k)1860 1574 y Fh(sexp)1119 b Ff(M--)36 b(C-M-k)72 +b(C-M-k)1860 1672 y Fh(corta)24 b Fe(regi)o(~)-40 b(ao)1044 +b Ff(C-w)1860 1742 y Fh(copia)24 b(a)g Fe(regi)o(~)-40 +b(ao)981 b Ff(M-w)1860 1811 y Fh(cortar)24 b(at)n(\023)-33 +b(e)25 b(a)e(pr\023)-35 b(oxima)24 b(o)r(corr)n(^)-33 +b(encia)24 b(de)g Fb(char)211 b Ff(M-z)36 b Fb(char)1860 +1910 y Fh(colar)24 b(a)h(\023)-37 b(ultima)24 b(coisa)g(cortada)582 +b Ff(C-y)1860 1979 y Fh(substitui)24 b(a)i(\023)-37 b(ult.)31 +b(colagem)24 b(p)r(ela)g(c\023)-35 b(opia)25 b(an)n(terior)106 +b Ff(M-y)1860 2184 y Fg(Marcando)1860 2340 y Fh(p)r(osiciona)24 +b(a)g(marca)g(aqui)730 b Ff(C-@)36 b Fh(or)f Ff(C-SPC)1860 +2410 y Fh(tro)r(ca)24 b(a)g(marca)g(p)r(elo)g(p)r(on)n(to)h(e)f(vice-v) +n(ersa)281 b Ff(C-x)36 b(C-x)1860 2508 y Fh(colo)r(ca)25 +b(a)e(marca)h Fb(ar)l(g)30 b Fe(pala)n(vras)22 b Fh(adian)n(te)290 +b Ff(M-@)1860 2578 y Fh(marca)24 b(o)g Fe(par)o(\023)-40 +b(agrafo)829 b Ff(M-h)1860 2647 y Fh(marca)24 b(a)g Fe(p)o(\023)-40 +b(agina)935 b Ff(C-x)36 b(C-p)1860 2717 y Fh(marca)24 +b(a)g Fe(sexp)1012 b Ff(C-M-@)1860 2787 y Fh(marca)24 +b(uma)g Fe(fun\030)-36 b(c)o(~)c(ao)839 b Ff(C-M-h)1860 +2857 y Fh(marca)24 b(to)r(do)g Fe(bu\013er)858 b Ff(C-x)36 +b(h)1860 3041 y Fg(Busca)i(e)g(Substitui\030)-51 b(c)o(~)-56 +b(ao)1860 3196 y Fh(Substitui)24 b(in)n(terativ)l(amen)n(te)i(uma)e +(string)300 b Ff(M-\045)1860 3266 y Fh(usando)25 b(express~)-35 +b(ao)24 b(regular)301 b Ff(M-x)36 b(query-replace-regexp)1860 +3364 y Fh(Resp)r(ostas)24 b(v\023)-35 b(alidas)24 b(no)g(mo)r(do)g(de)g +(busca)h(e)f(substitui\030)-31 b(c~)c(ao)1860 3463 y +Fe(substitui)23 b Fh(esta,)h(e)g(prossegue)594 b Ff(SPC)1860 +3533 y Fh(substitui)24 b(esta)g(e)g(en)n(trada)h(e)f(n~)-35 +b(ao)24 b(a)n(v)l(an\030)-31 b(ca)298 b Ff(,)1860 3602 +y Fe(pula)23 b Fh(para)h(a)g(pr\023)-35 b(oxima)23 b(sem)h(substituir) +331 b Ff(DEL)1860 3672 y Fh(substitui)24 b(em)g(to)r(do)g(o)g(texto)h +(restan)n(te)388 b Ff(!)1860 3742 y Fe(v)n(olta)22 b +Fh(para)h(a)h(pala)n(vra)g(an)n(terior)530 b Ff(^)1860 +3811 y Fe(encerra)1177 b Ff(RET)1860 3881 y Fh(en)n(tra)24 +b(na)g(edi\030)-31 b(c~)c(ao)25 b(recursiv)l(a)f(\()p +Ff(C-M-c)h Fh(para)f(sair\))121 b Ff(C-r)4241 -364 y +Fg(M)s(\023)-60 b(ultiplas)36 b(Janelas)4241 -223 y Fh(Quando)23 +b(forem)e(mostrados)i(2)g(comandos,)g(o)f(segundo)i(tem)f(comp)r(or-) +4241 -153 y(tamen)n(to)i(similar)d(para)i(frame.)4241 +-59 y(elimina)f(to)r(das)h(outras)g(janelas)351 b Ff(C-x)36 +b(1)212 b(C-x)36 b(5)g(1)4241 11 y Fh(divide)23 b(a)h(janela,)g(acima)f +(e)h(abaixo)261 b Ff(C-x)36 b(2)212 b(C-x)36 b(5)g(2)4241 +81 y Fh(elimina)23 b(esta)h(janela)640 b Ff(C-x)36 b(0)212 +b(C-x)36 b(5)g(0)4241 175 y Fh(divide)23 b(a)h(janela,)g(lado)f(a)h +(lado)606 b Ff(C-x)36 b(3)4241 270 y Fh(rola)23 b(a)h(outra)g(janela) +870 b Ff(C-M-v)4241 365 y Fh(lev)l(a)24 b(o)f(cursor)h(para)f(outra)i +(janela)269 b Ff(C-x)36 b(o)212 b(C-x)36 b(5)g(o)4241 +434 y Fh(seleciona)24 b(um)g(bu\013er)f(em)h(outra)g(janela)113 +b Ff(C-x)36 b(4)g(b)141 b(C-x)36 b(5)g(b)4241 504 y Fh(mostra)23 +b(um)h(bu\013er)g(em)f(outra)i(janela)171 b Ff(C-x)36 +b(4)g(C-o)71 b(C-x)36 b(5)g(C-o)4241 574 y Fh(busca)24 +b(um)g(arquiv)n(o)f(em)h(outra)g(janela)160 b Ff(C-x)36 +b(4)g(f)141 b(C-x)36 b(5)g(f)4241 644 y Fh(busca)24 b(arquiv)n(o)g +(\(ro\))g(em)g(outra)g(janela)140 b Ff(C-x)36 b(4)g(r)141 +b(C-x)36 b(5)g(r)4241 713 y Fh(executa)25 b(Dired)e(em)h(outra)g +(janela)279 b Ff(C-x)36 b(4)g(d)141 b(C-x)36 b(5)g(d)4241 +783 y Fh(busca)24 b(tag)h(em)e(outra)h(janela)413 b Ff(C-x)36 +b(4)g(.)141 b(C-x)36 b(5)g(.)4241 878 y Fh(aumen)n(ta)25 +b(a)f(janela)f(na)h(v)n(ertical)563 b Ff(C-x)36 b(^)4241 +948 y Fh(estreita)24 b(a)g(janela)948 b Ff(C-x)36 b({)4241 +1017 y Fh(alarga)23 b(a)h(janela)988 b Ff(C-x)36 b(})4241 +1202 y Fg(F)-10 b(ormatando)4241 1343 y Fh(iden)n(ta)24 +b(a)g Fe(linha)f Fh(corren)n(te)h(\(mo)r(do\))473 b Ff(TAB)4241 +1413 y Fh(iden)n(ta)24 b(a)g Fe(regi)o(~)-40 b(ao)22 +b Fh(\(mo)r(do\))706 b Ff(C-M-\\)4241 1482 y Fh(iden)n(ta)24 +b(a)g Fe(sexp)g Fh(\(mo)r(do\))763 b Ff(C-M-q)4241 1552 +y Fh(iden)n(ta)24 b(regi~)-35 b(ao)24 b(rigidamen)n(te)g +Fb(ar)l(g)30 b Fh(colunas)281 b Ff(C-x)36 b(TAB)4241 +1647 y Fh(insere)23 b(uma)h(no)n(v)l(a)g(linha)g(ap\023)-35 +b(os)24 b(o)g(p)r(on)n(to)347 b Ff(C-o)4241 1717 y Fh(mo)n(v)n(e)24 +b(o)g(restan)n(te)h(da)f(linha)f(para)h(baixo)329 b Ff(C-M-o)4241 +1786 y Fh(apaga)24 b(linhas)g(em)f(branco)i(em)e(torno)i(do)f(p)r(on)n +(to)112 b Ff(C-x)36 b(C-o)4241 1856 y Fh(jun)n(ta)24 +b(a)g(linha)f(com)h(a)g(an)n(terior)572 b Ff(M-^)4241 +1926 y Fh(apaga)24 b(to)r(dos)h(brancos)f(em)g(torno)g(do)g(p)r(on)n +(to)212 b Ff(M-\\)4241 1995 y Fh(insere)23 b(um)g(espa\030)-31 +b(co)25 b(em)f(branco)574 b Ff(M-SPC)4241 2090 y Fh(preenc)n(he)25 +b(o)f(par\023)-35 b(agrafo)797 b Ff(M-q)4241 2160 y Fh(de\014ne)24 +b(a)g(coluna)h(limite)e(de)h(preenc)n(himen)n(to)215 +b Ff(C-x)36 b(f)4241 2230 y Fh(de\014ne)24 b(um)g(pre\014xo)g(para)g +(cada)h(linha)403 b Ff(C-x)36 b(.)4241 2324 y Fh(formata)23 +b(fon)n(te)1024 b Ff(M-o)4241 2490 y Fg(Mai)s(\023)-60 +b(usculas)36 b(e)i(Min)s(\023)-60 b(usculas)4241 2631 +y Fh(P)n(ala)n(vra)23 b(para)h(mai)r(\023)-37 b(usculas)688 +b Ff(M-u)4241 2701 y Fh(P)n(ala)n(vra)23 b(para)h(min)r(\023)-37 +b(usculas)684 b Ff(M-l)4241 2770 y Fh(Primeira)22 b(letra)h(mai)r(\023) +-37 b(uscula)24 b(\(capitalize\))312 b Ff(M-c)4241 2865 +y Fh(Regi~)-35 b(ao)24 b(para)g(mai)r(\023)-37 b(usculas)713 +b Ff(C-x)36 b(C-u)4241 2935 y Fh(Regi~)-35 b(ao)24 b(para)g(min)r(\023) +-37 b(usculas)709 b Ff(C-x)36 b(C-l)4241 3120 y Fg(O)i(Minibu\013er) +4241 3260 y Fh(As)23 b(teclas)h(seguin)n(tes)h(s~)-35 +b(ao)24 b(de\014nidas)g(no)g(minibu\013er.)4241 3355 +y(complete)h(o)e(m\023)-35 b(aximo)24 b(p)r(ossi)-8 b(\023)-27 +b(\020v)n(el)557 b Ff(TAB)4241 3425 y Fh(complete)25 +b(at)n(\023)-33 b(e)24 b(uma)g(pala)n(vra)641 b Ff(SPC)4241 +3494 y Fh(complete)25 b(e)e(execute)861 b Ff(RET)4241 +3564 y Fh(mostre)23 b(as)h(op\030)-31 b(c~)c(oes)25 b(para)f(completar) +432 b Ff(?)4241 3634 y Fh(busca)24 b(a)g(en)n(trada)h(an)n(terior)e(no) +h(minibu\013er)250 b Ff(M-p)4241 3704 y Fh(busca)25 b(a)h(pr\023)-35 +b(oxima)25 b(en)n(trada)h(no)g(minibu\013er)e(ou)i(o)4241 +3773 y(default)5681 3704 y Ff(M-n)4241 3826 y Fh(busca)e(regexp)g(no)g +(hist\023)-35 b(orico)24 b(para)g(tr\023)-35 b(as)355 +b Ff(M-r)4241 3896 y Fh(busca)24 b(regexp)g(no)g(hist\023)-35 +b(orico)24 b(para)g(fren)n(te)297 b Ff(M-s)4241 3966 +y Fh(encerra)24 b(o)f(comando)862 b Ff(C-g)4241 4060 +y Fh(T)-6 b(ecle)22 b Ff(C-x)37 b(ESC)f(ESC)23 b Fh(para)f(editar)g(e)h +(rep)r(etir)f(o)i(\023)-37 b(ultimo)22 b(comando)i(uti-)4241 +4130 y(lizado.)31 b(T)-6 b(ecle)24 b Ff(F10)h Fh(para)e(ativ)l(ar)h(o)g +(men)n(u.)p eop end +%%Page: 2 2 +TeXDict begin @landscape 2 1 bop -555 -364 a Fi(GNU)45 +b(Emacs:)62 b(Cart)o(~)-68 b(ao)45 b(de)i(Refer)m(^)-66 +b(encia)259 -266 y Fh(\(para)24 b(v)n(ers~)-35 b(ao)24 +b(22\))-450 -61 y Fg(Bu\013ers)-450 93 y Fh(seleciona)g(outro)h +(bu\013er)779 b Ff(C-x)36 b(b)-450 163 y Fh(lista)23 +b(to)r(dos)i(bu\013ers)890 b Ff(C-x)36 b(C-b)-450 233 +y Fh(mata)24 b(um)g(bu\013er)960 b Ff(C-x)36 b(k)-450 +415 y Fg(T)-10 b(ransp)s(osi\030)-51 b(c)o(~)-56 b(ao)-450 +569 y Fh(transp~)-35 b(oe)25 b Fe(caracteres)795 b Ff(C-t)-450 +638 y Fh(transp~)-35 b(oe)25 b Fe(pala)n(vras)858 b Ff(M-t)-450 +708 y Fh(transp~)-35 b(oe)25 b Fe(linhas)945 b Ff(C-x)36 +b(C-t)-450 778 y Fh(transp~)-35 b(oe)25 b Fe(sexps)964 +b Ff(C-M-t)-450 979 y Fg(Corre\030)-51 b(c)o(~)-56 b(ao)38 +b(Ortogr)o(\023)-56 b(a\014ca)-450 1133 y Fh(v)n(eri\014ca)24 +b(a)g(pala)n(vra)g(corren)n(te)639 b Ff(M-$)-450 1203 +y Fh(v)n(eri\014ca)24 b(to)r(das)h(pala)n(vras)e(de)i(uma)e(regi~)-35 +b(ao)152 b Ff(M-x)36 b(ispell-region)-450 1272 y Fh(v)n(eri\014ca)24 +b(to)r(do)h(o)f(bu\013er)656 b Ff(M-x)36 b(ispell-buffer)-450 +1474 y Fg(T)-10 b(ags)-450 1628 y Fh(busca)24 b(uma)g(tag)h(\(uma)f +(de\014ni\030)-31 b(c~)c(ao\))485 b Ff(M-.)-450 1698 +y Fh(encon)n(tra)25 b(a)f(pr\023)-35 b(oxima)23 b(o)r(corr)n(^)-33 +b(encia)25 b(da)f(tag)282 b Ff(C-u)36 b(M-.)-450 1768 +y Fh(esp)r(eci\014ca)25 b(um)f(no)n(v)n(o)g(arquiv)n(o)g(de)g(tags)142 +b Ff(M-x)36 b(visit-tags-table)-450 1866 y Fh(busca)24 +b(p)r(or)g(regexp)g(em)g(to)r(dos)h(arquiv)n(os)188 b +Ff(M-x)36 b(tags-search)-450 1936 y Fh(busca)24 b(e)g(subst.)32 +b(em)23 b(to)r(dos)i(arquiv)n(os)119 b Ff(M-x)36 b(tags-query-replace) +-450 2005 y Fh(con)n(tin)n(ua)c(a)h(\023)-37 b(ultima)31 +b(busca)h(ou)f(busca)h(e)f(substi-)-450 2075 y(tui\030)-31 +b(c~)c(ao)990 2005 y Ff(M-,)-450 2274 y Fg(Shells)-450 +2428 y Fh(executa)26 b(um)d(comando)i(do)f(shell)528 +b Ff(M-!)-450 2498 y Fh(executa)26 b(um)d(comando)i(do)f(shell)f(na)h +(regi~)-35 b(ao)223 b Ff(M-|)-450 2568 y Fh(\014ltra)24 +b(uma)f(regi~)-35 b(ao)24 b(p)r(or)g(um)f(comando)i(do)f(shell)120 +b Ff(C-u)36 b(M-|)-450 2638 y Fh(inicia)23 b(um)h(shell)f(na)h(janela)g +Ff(*shell*)420 b(M-x)36 b(shell)-450 2839 y Fg(Ret)o(^)-56 +b(angulos)-450 2993 y Fh(copia)24 b(o)g(ret^)-35 b(angulo)25 +b(para)f(o)f(registrador)330 b Ff(C-x)36 b(r)g(r)-450 +3062 y Fh(corta)24 b(o)g(ret^)-35 b(angulo)912 b Ff(C-x)36 +b(r)g(k)-450 3132 y Fh(cola)24 b(o)g(ret^)-35 b(angulo)947 +b Ff(C-x)36 b(r)g(y)-450 3202 y Fh(abre)24 b(o)g(ret^)-35 +b(angulo,)24 b(mo)n(v)n(e)g(o)g(texto)h(para)f(direita)107 +b Ff(C-x)36 b(r)g(o)-450 3272 y Fh(tro)r(ca)24 b(p)r(or)g(espa\030)-31 +b(cos)25 b(o)e(con)n(te)r(\023)-37 b(udo)26 b(do)e(ret^)-35 +b(angulo)133 b Ff(C-x)36 b(r)g(c)-450 3341 y Fh(an)n(tep~)-35 +b(oe)26 b(uma)e(linha)f(a)h(string)610 b Ff(C-x)36 b(r)g(t)-450 +3542 y Fg(Abreviaturas)-450 3696 y Fh(adiciona)24 b(uma)g(abreviatura)h +(global)442 b Ff(C-x)36 b(a)g(g)-450 3766 y Fh(adiciona)24 +b(abreviatura)h(ao)f(mo)r(do)g(lo)r(cal)352 b Ff(C-x)36 +b(a)g(l)-450 3836 y Fh(adiciona)24 b(globalmen)n(te)h(expans~)-35 +b(ao)26 b(de)e(abrev.)179 b Ff(C-x)36 b(a)g(i)f(g)-450 +3906 y Fh(adiciona)24 b(lo)r(calmen)n(te)h(expans~)-35 +b(ao)25 b(de)g(abrev.)220 b Ff(C-x)36 b(a)g(i)f(l)-450 +3975 y Fh(explicitamen)n(te)25 b(expande)h(uma)e(abrev)366 +b Ff(C-x)36 b(a)g(e)-450 4073 y Fh(completa)24 b(pala)n(vras)e(com)h +(base)g(em)f(pala)n(vras)g(an-)-450 4143 y(teriores)990 +4073 y Ff(M-/)1860 -364 y Fg(Express~)-57 b(oes)39 b(Regulares)1860 +-208 y Fh(qualquer)24 b(caracter)h(menos)f(no)n(v)l(a)g(linha)346 +b Ff(.)71 b Fh(\(dot\))1860 -139 y(zero)24 b(ou)g(mais)f(rep)r(eti\030) +-31 b(c~)c(oes)725 b Ff(*)1860 -69 y Fh(uma)24 b(ou)g(mais)f(rep)r +(eti\030)-31 b(c~)c(oes)717 b Ff(+)1860 1 y Fh(zero)24 +b(ou)g(uma)g(rep)r(eti\030)-31 b(c~)c(ao)757 b Ff(?)1860 +71 y Fh(protege)25 b(o)f(caracter)g(esp)r(ecial)h Fb(c)565 +b Ff(\\)p Fb(c)1860 140 y Fh(\(\\or"\))1253 b Ff(\\|)1860 +210 y Fh(agrupamen)n(to)1040 b Ff(\\\()36 b Fa(:)11 b(:)h(:)34 +b Ff(\\\))1860 280 y Fh(mesmo)24 b(texto)h(que)f Fb(n)5 +b Fh(-)n(\023)-33 b(esimo)24 b(grup)r(o)447 b Ff(\\)p +Fb(n)1860 349 y Fh(quebra)24 b(de)g(pala)n(vra)886 b +Ff(\\b)1860 419 y Fh(sem)24 b(quebra)g(de)g(pala)n(vra)744 +b Ff(\\B)1860 518 y Fe(en)n(tidade)707 b(casa)26 b(in)-9 +b(\023)-32 b(\020cio)70 b(casa)26 b(\014m)1860 587 y +Fh(linha)856 b Ff(^)400 b($)1860 657 y Fh(pala)n(vra)782 +b Ff(\\<)365 b(\\>)1860 727 y Fh(bu\013er)831 b Ff(\\`)365 +b(\\')1860 796 y Fe(classe)27 b(de)g(caracteres)315 b(casa)26 +b(esses)91 b(casa)26 b(os)h(outros)1860 866 y Fh(conjun)n(to)e(expl)-8 +b(\023)-27 b(\020cito)459 b Ff([)35 b Fa(:)12 b(:)f(:)35 +b Ff(])212 b([^)36 b Fa(:)11 b(:)g(:)35 b Ff(])1860 936 +y Fh(caracter)25 b(de)f(sin)n(taxe)g(de)g(pala)n(vra)84 +b Ff(\\w)365 b(\\W)1860 1006 y Fh(caracter)25 b(de)f(sin)n(taxe)g(de)g +Fb(c)278 b Ff(\\s)p Fb(c)332 b Ff(\\S)p Fb(c)1860 1201 +y Fg(Conjun)m(tos)37 b(de)g(Carac.)50 b(In)m(ternacionais)1860 +1357 y Fh(esp)r(eci\014ca)25 b(uma)f(l)-8 b(\023)-27 +b(\020ngua)24 b(principal)488 b Ff(C-x)36 b(RET)g(l)1860 +1427 y Fh(mostra)24 b(to)r(dos)g(m)n(\023)-33 b(eto)r(dos)25 +b(de)f(inser\030)-31 b(c~)c(ao)96 b Ff(M-x)36 b(list-input-methods)1860 +1496 y Fh(habilita/desabilita)24 b(um)g(m)n(\023)-33 +b(eto)r(do)25 b(de)f(inser\030)-31 b(c~)c(ao)136 b Ff(C-\\)1860 +1566 y Fh(determina)24 b(o)g(sistema)g(de)g(co)r(di\014ca\030)-31 +b(c~)c(ao)369 b Ff(C-x)36 b(RET)g(c)1860 1636 y Fh(mostra)24 +b(sistemas)f(de)h(co)r(di\014ca\030)-31 b(c~)c(ao)166 +b Ff(M-x)37 b(list-coding-systems)1860 1706 y Fh(escolhe)25 +b(a)e(co)r(di\014ca\030)-31 b(c~)c(ao)26 b(preferida)143 +b Ff(M-x)36 b(prefer-coding-system)1860 1911 y Fg(Info)1860 +2066 y Fh(en)n(tra)24 b(no)g(leitor)g(de)g(Info)760 b +Ff(C-h)36 b(i)1860 2136 y Fh(busca)24 b(fun\030)-31 b(c~)c(ao)25 +b(ou)f(arquiv)n(o)g(no)g(Info)448 b Ff(C-h)36 b(S)1860 +2234 y Fh(Mo)n(vimen)n(ta\030)-31 b(c~)c(ao)25 b(em)f(um)g(no)r(do:) +1931 2333 y(rola)f(para)h(fren)n(te)891 b Ff(SPC)1931 +2402 y Fh(rola)23 b(para)h(tr\023)-35 b(as)949 b Ff(DEL)1931 +2472 y Fh(in)-8 b(\023)-27 b(\020cio)23 b(do)h(no)r(do)933 +b Ff(.)71 b Fh(\(dot\))1860 2570 y(Mo)n(vimen)n(ta\030)-31 +b(c~)c(ao)25 b(en)n(tre)g(no)r(dos:)1931 2669 y Fe(pr\023)-41 +b(oximo)22 b Fh(no)r(do)902 b Ff(n)1931 2738 y Fh(no)r(do)24 +b Fe(an)n(terior)911 b Ff(p)1931 2808 y Fh(mo)n(v)n(er)23 +b(cima)h Fe(cima)824 b Ff(u)1931 2878 y Fh(seleciona)24 +b(item)g(do)g(men)n(u)g(p)r(elo)g(nome)311 b Ff(m)1931 +2948 y Fh(seleciona)24 b Fb(n)5 b Fh(-)n(\023)-33 b(esimo)23 +b(item)h(do)g(men)n(u)385 b Fb(n)1931 3017 y Fh(segue)24 +b(refer)n(^)-33 b(encia)24 b(cruzada)h(\(return)f(with)f +Ff(l)p Fh(\))133 b Ff(f)1931 3087 y Fh(retorna)26 b(\023)-37 +b(ultimo)23 b(no)r(do)i(visitado)483 b Ff(l)1931 3157 +y Fh(retorna)24 b(ao)g(diret\023)-35 b(orio)23 b(de)h(no)r(dos)470 +b Ff(d)1931 3227 y Fh(ir)22 b(para)i(o)g(top)r(o)h(do)f(arquiv)n(o)f +(Info)445 b Ff(t)1931 3296 y Fh(ir)22 b(para)i(qualquer)g(no)r(do)h(p)r +(or)e(nome)382 b Ff(g)1860 3395 y Fh(Outros:)1931 3493 +y(executar)25 b Fe(tutorial)c Fh(do)j(Info)575 b Ff(h)1931 +3563 y Fe(sair)22 b Fh(Info)1097 b Ff(q)1931 3633 y Fh(busca)24 +b(p)r(or)f(express~)-35 b(ao)25 b(regular)513 b Ff(M-s)4170 +-364 y Fg(Registrador)4170 -208 y Fh(salv)l(a)24 b(regi~)-35 +b(ao)24 b(em)f(um)h(registrador)488 b Ff(C-x)36 b(r)g(s)4170 +-139 y Fh(insere)23 b(o)h(con)n(te)r(\023)-37 b(udo)26 +b(do)e(registrador)f(no)h(bu\013er)150 b Ff(C-x)36 b(r)g(i)4170 +-40 y Fh(salv)l(a)24 b(v)l(alor)f(do)h(p)r(on)n(to)h(no)f(registrador) +361 b Ff(C-x)36 b(r)g(SPC)4170 29 y Fh(salta)24 b(para)g(o)g(p)r(on)n +(to)h(salv)n(o)e(no)h(registrador)243 b Ff(C-x)36 b(r)g(j)4170 +234 y Fg(Macros)i(de)g(T)-10 b(eclado)4170 390 y Fe(inicia)22 +b Fh(a)i(de\014ni\030)-31 b(c~)c(ao)25 b(de)f(uma)g(macro)436 +b Ff(C-x)36 b(\()4170 460 y Fe(encerra)23 b Fh(a)h(de\014ni\030)-31 +b(c~)c(ao)25 b(de)f(uma)g(macro)362 b Ff(C-x)36 b(\))4170 +529 y Fe(executa)24 b Fh(a)h(\023)-37 b(ultima)24 b(macro)g(de\014nida) +410 b Ff(C-x)36 b(e)4170 599 y Fh(adiciona)24 b(a)i(\023)-37 +b(ultima)24 b(macro)f(de\014nida)426 b Ff(C-u)36 b(C-x)g(\()4170 +669 y Fh(nomeia)24 b(a)i(\023)-37 b(ultima)23 b(macro)h(de\014nida)129 +b Ff(M-x)37 b(name-last-kbd-macro)4170 739 y Fh(insere)23 +b(uma)h(de\014ni\030)-31 b(c~)c(ao)25 b(em)f(Lisp)318 +b Ff(M-x)36 b(insert-kbd-macro)4170 942 y Fg(Lidando)h(com)i(Emacs)f +(Lisp)4170 1097 y Fh(a)n(v)l(alia)24 b Fe(sexp)g Fh(an)n(tes)h(do)f(p)r +(on)n(to)603 b Ff(C-x)36 b(C-e)4170 1167 y Fh(a)n(v)l(alia)24 +b(a)g Fe(defun)g Fh(corren)n(te)712 b Ff(C-M-x)4170 1237 +y Fh(a)n(v)l(alia)24 b(a)g Fe(regi)o(~)-40 b(ao)824 b +Ff(M-x)36 b(eval-region)4170 1306 y Fh(l)n(^)-33 b(e)23 +b(e)h(a)n(v)l(alia)g(o)g(minibu\013er)736 b Ff(M-:)4170 +1376 y Fh(carrega)24 b(do)g(diret\023)-35 b(orio)23 b(padr~)-35 +b(ao)25 b(do)f(sistema)106 b Ff(M-x)36 b(load-library)4170 +1581 y Fg(P)m(ersonaliza\030)-51 b(c)o(~)-56 b(ao)37 +b(Simples)4170 1737 y Fh(p)r(ersonaliza)24 b(v)l(ari\023)-35 +b(av)n(eis)24 b(e)g(fon)n(tes)408 b Ff(M-x)36 b(customize)4170 +1835 y Fh(F)-6 b(azendo)25 b(teclas)g(de)f(atalho)h(globais)e(em)h +(Emacs)g(Lisp)f(\(exemplos\):)4170 1933 y Ff(\(global-set-key)40 +b("\\C-cg")d('goto-line\))4170 2003 y(\(global-set-key)j("\\M-#")d +('query-replace-regexp\))4170 2208 y Fg(Escrev)m(endo)h(Comandos)4170 +2364 y Ff(\(defun)f Fb(c)l(ommand-name)43 b Ff(\()p Fb(ar)l(gs)5 +b Ff(\))4241 2433 y(")p Fb(do)l(cumentation)g Ff(")38 +b(\(interactive)g(")p Fb(template)5 b Ff("\))4241 2503 +y Fb(b)l(o)l(dy)h Ff(\))4170 2601 y Fh(Um)23 b(exemplo:)4170 +2700 y Ff(\(defun)37 b(this-line-to-top-of-win)q(dow)42 +b(\(line\))4241 2769 y("Reposition)c(line)e(point)h(is)f(on)g(to)g(top) +g(of)g(window.)4170 2839 y(With)g(ARG,)h(put)f(point)h(on)f(line)g +(ARG.")4241 2909 y(\(interactive)i("P"\))4241 2979 y(\(recenter)f(\(if) +g(\(null)f(line\))4735 3048 y(0)4664 3118 y(\(prefix-numeric-value)41 +b(line\)\)\)\))4170 3216 y Fh(A)19 b(esp)r(eci\014cao)i +Ff(interactive)i Fh(explica)d(como)g(in)n(terativ)l(amen)n(te)i(ler)d +(ar-)4170 3286 y(gumen)n(tos.)32 b(T)-6 b(ecle)25 b Ff(C-h)36 +b(f)f(interactive)27 b Fh(para)d(mais)f(detalhes.)4463 +3550 y Fd(Cop)n(yrigh)n(t)4766 3548 y(c)4749 3550 y Fc(\015)e +Fd(2006)h(F)-5 b(ree)22 b(Soft)n(w)n(are)h(F)-5 b(oundation,)20 +b(Inc.)4627 3606 y(v2.3)i(for)f(GNU)f(Emacs)h(v)n(ersion)h(22,)f(2006) +4760 3661 y(designed)f(b)n(y)h(Stephen)f(Gildea)4170 +3746 y(P)n(ermission)28 b(is)f(gran)n(ted)i(to)f(mak)n(e)h(and)e +(distribute)f(copies)j(of)f(this)f(card)h(pro-)4170 3802 +y(vided)23 b(the)h(cop)n(yrigh)n(t)h(notice)g(and)f(this)f(p)r +(ermission)h(notice)g(are)h(preserv)n(ed)g(on)4170 3857 +y(all)20 b(copies.)4170 3942 y(F)-5 b(or)21 b(copies)g(of)g(the)g(GNU)e +(Emacs)i(man)n(ual,)f(write)h(to)g(the)f(F)-5 b(ree)22 +b(Soft)n(w)n(are)g(F)-5 b(oun-)4170 3998 y(dation,)29 +b(Inc.,)g(51)g(F)-5 b(ranklin)28 b(Street,)h(Fifth)f(Flo)r(or,)h +(Boston,)i(MA)d(02110-1301)4170 4053 y(USA)p eop end +%%Trailer + +userdict /end-hook known{end-hook}if +%%EOF diff --git a/etc/pt-br-refcard.tex b/etc/pt-br-refcard.tex new file mode 100644 index 00000000000..900855911d7 --- /dev/null +++ b/etc/pt-br-refcard.tex @@ -0,0 +1,686 @@ +% Reference Card for GNU Emacs version 22 on Unix systems +%**start of header +\newcount\columnsperpage +\newcount\letterpaper + +% This file can be printed with 1, 2, or 3 columns per page (see below). +% Specify how many you want here. + +\columnsperpage=3 + +% Set letterpapaer to 0 for A4 paper, 1 for letter (US) paper. Useful +% only when columnsperpage is 2 or 3. + +\letterpaper=0 + +% Nothing else needs to be changed below this line. +% Copyright (C) 1987, 1993, 1996, 1997, 2002, 2003, 2004, +% 2006 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 2, or (at your option) +% any later version. + +% 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. + +% You should have received a copy of the GNU General Public License +% along with GNU Emacs; see the file COPYING. If not, write to +% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +% Boston, MA 02110-1301, USA. + +% This file is intended to be processed by plain TeX (TeX82). +% +% The final reference card has six columns, three on each side. +% This file can be used to produce it in any of three ways: +% 1 column per page +% produces six separate pages, each of which needs to be reduced to 80%. +% This gives the best resolution. +% 2 columns per page +% produces three already-reduced pages. +% You will still need to cut and paste. +% 3 columns per page +% produces two pages which must be printed sideways to make a +% ready-to-use 8.5 x 11 inch reference card. +% For this you need a dvi device driver that can print sideways. +% Which mode to use is controlled by setting \columnsperpage above. +% +% To compile and print this document: +% tex refcard.tex +% dvips -t landscape refcard.dvi +% +% Author: +% Stephen Gildea +% Internet: gildea@stop.mail-abuse.org +% +% Thanks to Paul Rubin, Bob Chassell, Len Tower, and Richard Mlynarik +% for their many good ideas. + +% If there were room, it would be nice to see a section on Dired. + +% Translated from English to Portuguese by Rodrigo Real, send comments +% and suggestions to rreal@ucpel.tche.br. Thanks to Mario Goulart for +% the opinions. + + +\def\versionnumber{2.3} +\def\year{2006} + +\def\shortcopyrightnotice{\vskip 1ex plus 2 fill + \centerline{\small \copyright\ \year\ Free Software Foundation, Inc. + Permissions on back. v\versionnumber}} + +\def\copyrightnotice{ +\vskip 1ex plus 2 fill\begingroup\small +\centerline{Copyright \copyright\ \year\ Free Software Foundation, Inc.} +\centerline{v\versionnumber{} for GNU Emacs version 22, \year} +\centerline{designed by Stephen Gildea} + +Permission is granted to make and distribute copies of +this card provided the copyright notice and this permission notice +are preserved on all copies. + +For copies of the GNU Emacs manual, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +\endgroup} + +% make \bye not \outer so that the \def\bye in the \else clause below +% can be scanned without complaint. +\def\bye{\par\vfill\supereject\end} + +\newdimen\intercolumnskip %horizontal space between columns +\newbox\columna %boxes to hold columns already built +\newbox\columnb + +\def\ncolumns{\the\columnsperpage} + +\message{[\ncolumns\space + column\if 1\ncolumns\else s\fi\space per page]} + +\def\scaledmag#1{ scaled \magstep #1} + +% This multi-way format was designed by Stephen Gildea October 1986. +% Note that the 1-column format is fontfamily-independent. +\if 1\ncolumns %one-column format uses normal size + \hsize 4in + \vsize 10in + \voffset -.7in + \font\titlefont=\fontname\tenbf \scaledmag3 + \font\headingfont=\fontname\tenbf \scaledmag2 + \font\smallfont=\fontname\sevenrm + \font\smallsy=\fontname\sevensy + + \footline{\hss\folio} + \def\makefootline{\baselineskip10pt\hsize6.5in\line{\the\footline}} +\else %2 or 3 columns uses prereduced size + \hsize 3.2in + \if 1\the\letterpaper + \vsize 7.95in + \else + \vsize 7.65in + \fi + \hoffset -.75in + \voffset -.745in + \font\titlefont=cmbx10 \scaledmag2 + \font\headingfont=cmbx10 \scaledmag1 + \font\smallfont=cmr6 + \font\smallsy=cmsy6 + \font\eightrm=cmr8 + \font\eightbf=cmbx8 + \font\eightit=cmti8 + \font\eighttt=cmtt8 + \font\eightmi=cmmi8 + \font\eightsy=cmsy8 + \textfont0=\eightrm + \textfont1=\eightmi + \textfont2=\eightsy + \def\rm{\eightrm} + \def\bf{\eightbf} + \def\it{\eightit} + \def\tt{\eighttt} + \if 1\the\letterpaper + \normalbaselineskip=.8\normalbaselineskip + \else + \normalbaselineskip=.7\normalbaselineskip + \fi + \normallineskip=.8\normallineskip + \normallineskiplimit=.8\normallineskiplimit + \normalbaselines\rm %make definitions take effect + + \if 2\ncolumns + \let\maxcolumn=b + \footline{\hss\rm\folio\hss} + \def\makefootline{\vskip 2in \hsize=6.86in\line{\the\footline}} + \else \if 3\ncolumns + \let\maxcolumn=c + \nopagenumbers + \else + \errhelp{You must set \columnsperpage equal to 1, 2, or 3.} + \errmessage{Illegal number of columns per page} + \fi\fi + +%% \intercolumnskip=.46in + \intercolumnskip=.65in + \def\abc{a} + \output={% %see The TeXbook page 257 + % This next line is useful when designing the layout. + %\immediate\write16{Column \folio\abc\space starts with \firstmark} + \if \maxcolumn\abc \multicolumnformat \global\def\abc{a} + \else\if a\abc + \global\setbox\columna\columnbox \global\def\abc{b} + %% in case we never use \columnb (two-column mode) + \global\setbox\columnb\hbox to -\intercolumnskip{} + \else + \global\setbox\columnb\columnbox \global\def\abc{c}\fi\fi} + \def\multicolumnformat{\shipout\vbox{\makeheadline + \hbox{\box\columna\hskip\intercolumnskip + \box\columnb\hskip\intercolumnskip\columnbox} + \makefootline}\advancepageno} + \def\columnbox{\leftline{\pagebody}} + + \def\bye{\par\vfill\supereject + \if a\abc \else\null\vfill\eject\fi + \if a\abc \else\null\vfill\eject\fi + \end} +\fi + +% we won't be using math mode much, so redefine some of the characters +% we might want to talk about +\catcode`\^=12 +\catcode`\_=12 + +\chardef\\=`\\ +\chardef\{=`\{ +\chardef\}=`\} + +\hyphenation{mini-buf-fer} + +\parindent 0pt +\parskip 1ex plus .5ex minus .5ex + +\def\small{\smallfont\textfont2=\smallsy\baselineskip=.8\baselineskip} + +% newcolumn - force a new column. Use sparingly, probably only for +% the first column of a page, which should have a title anyway. +\outer\def\newcolumn{\vfill\eject} + +% title - page title. Argument is title text. +\outer\def\title#1{{\titlefont\centerline{#1}}\vskip 1ex plus .5ex} + +% section - new major section. Argument is section name. +\outer\def\section#1{\par\filbreak + \vskip 3ex plus 2ex minus 2ex {\headingfont #1}\mark{#1}% + \vskip 2ex plus 1ex minus 1.5ex} + +\newdimen\keyindent + +% beginindentedkeys...endindentedkeys - key definitions will be +% indented, but running text, typically used as headings to group +% definitions, will not. +\def\beginindentedkeys{\keyindent=1em} +\def\endindentedkeys{\keyindent=0em} +\endindentedkeys + +% paralign - begin paragraph containing an alignment. +% If an \halign is entered while in vertical mode, a parskip is never +% inserted. Using \paralign instead of \halign solves this problem. +\def\paralign{\vskip\parskip\halign} + +% \<...> - surrounds a variable name in a code example +\def\<#1>{{\it #1\/}} + +% kbd - argument is characters typed literally. Like the Texinfo command. +\def\kbd#1{{\tt#1}\null} %\null so not an abbrev even if period follows + +% beginexample...endexample - surrounds literal text, such a code example. +% typeset in a typewriter font with line breaks preserved +\def\beginexample{\par\leavevmode\begingroup + \obeylines\obeyspaces\parskip0pt\tt} +{\obeyspaces\global\let =\ } +\def\endexample{\endgroup} + +% key - definition of a key. +% \key{description of key}{key-name} +% prints the description left-justified, and the key-name in a \kbd +% form near the right margin. +\def\key#1#2{\leavevmode\hbox to \hsize{\vtop + {\hsize=.75\hsize\rightskip=1em + \hskip\keyindent\relax#1}\kbd{#2}\hfil}} + +\newbox\metaxbox +\setbox\metaxbox\hbox{\kbd{M-x }} +\newdimen\metaxwidth +\metaxwidth=\wd\metaxbox + +% metax - definition of a M-x command. +% \metax{description of command}{M-x command-name} +% Tries to justify the beginning of the command name at the same place +% as \key starts the key name. (The "M-x " sticks out to the left.) +\def\metax#1#2{\leavevmode\hbox to \hsize{\hbox to .75\hsize + {\hskip\keyindent\relax#1\hfil}% + \hskip -\metaxwidth minus 1fil + \kbd{#2}\hfil}} + +% threecol - like "key" but with two key names. +% for example, one for doing the action backward, and one for forward. +\def\threecol#1#2#3{\hskip\keyindent\relax#1\hfil&\kbd{#2}\hfil\quad + &\kbd{#3}\hfil\quad\cr} + + +%**end of header + + +\title{GNU Emacs: Cart\~ao de Refer\^encia} +\centerline{(para vers\~ao 22)} + +\section{Iniciando o Emacs} + +Para entrar no GNU Emacs, digite: \kbd{emacs} + +\section{Saindo do Emacs} + +\key{suspende ou minimiza o Emacs}{C-z} +\key{encerra o Emacs}{C-x C-c} + +\section{Arquivos} + +\key{{\bf abre} um arquivo}{C-x C-f} +\key{{\bf salva} um arquivo em disco}{C-x C-s} +\key{salva {\bf todos} arquivos abertos}{C-x s} +\key{{\bf insere} outro arquivo neste buffer}{C-x i} +\key{substitui este arquivo por outro}{C-x C-v} +\key{salva o buffer em um arquivo especificado}{C-x C-w} +\key{alterna o estado de somente leitura do buffer}{C-x C-q} + +\section{Ajuda (Help)} + +Tecle \kbd{C-h} (ou \kbd{F1}) e siga as instru{\c{c}}{\~o}es. + +\key{remove a janela de ajuda}{C-x 1} +\key{rola a janela de ajuda}{C-M-v} + +\key{apropos: mostra comandos que casam com a string}{C-h a} +\key{descreve fun{\c{c}}{\~a}o associada a teclas}{C-h k} +\key{descreve uma fun{\c{c}}{\~a}o}{C-h f} +\key{busca informa{\c{c}}{\~o}es espec{\'\i}ficas do modo}{C-h m} + +\section{Recuperando-se de Erros} + +\key{{\bf aborta} uma opera{\c{c}}{\~a}o}{C-g} +\metax{{\bf recupera} arquivos ap{\'o}s crash}{M-x recover-session} +\metax{desfaz uma altera{\c{c}}{\~a}o ({\bf undo})}{C-x u, C-_ {\rm or} C-/} +\metax{restaura um buffer para o arquivo}{M-x revert-buffer} +\key{redesenha a tela}{C-l} + +\section{Busca Incremental} + +\key{busca para frente}{C-s} +\key{busca para tr{\'a}s}{C-r} +\key{busca por express{\~a}o regular}{C-M-s} +\key{busca por express{\~a}o regular para tr{\'a}s}{C-M-r} + +\key{seleciona a string de pesquisa anterior}{M-p} +\key{seleciona a string seguinte de pesquisa}{M-n} +\key{sai da busca incremental}{RET} +\key{desfaz o efeito do {\'u}ltimo caracter}{DEL} +\key{encerra a busca}{C-g} + +Use \kbd{C-s} ou \kbd{C-r} novamente para repetir a busca. +\kbd{C-g} cancela apenas o que ainda n{\~a}o foi feito. + +\shortcopyrightnotice + +\section{Movimenta{\c{c}}{\~a}o} + +\paralign to \hsize{#\tabskip=10pt plus 1 fil&#\tabskip=0pt&#\cr +\threecol{{\bf avan{\c{c}}ar}}{{\bf tr{\'a}s}}{{\bf frente}} +\threecol{um caracter}{C-b}{C-f} +\threecol{uma palavra}{M-b}{M-f} +\threecol{uma linha}{C-p}{C-n} +\threecol{para in{\'\i}cio ou fim de linha}{C-a}{C-e} +\threecol{senten{\c{c}}a}{M-a}{M-e} +\threecol{par{\'a}grafo}{M-\{}{M-\}} +\threecol{p{\'a}gina}{C-x [}{C-x ]} +\threecol{sexp}{C-M-b}{C-M-f} +\threecol{fun{\c{c}}{\~a}o}{C-M-a}{C-M-e} +\threecol{para in{\'\i}cio ou fim do buffer}{M-<}{M->} +} + +\key{rolar para pr{\'o}xima tela}{C-v} +\key{rolar para tela anterior}{M-v} +\key{rolar para esquerda}{C-x <} +\key{rolar para direita}{C-x >} +\key{rolar a linha corrente para o centro da tela}{C-u C-l} + +\section{Cortando e Apagando} + +\paralign to \hsize{#\tabskip=10pt plus 1 fil&#\tabskip=0pt&#\cr +\threecol{{\bf entidade a cortar}}{{\bf tr{\'a}s}}{{\bf frente}} +\threecol{caracter (apaga, n{\~a}o corta)}{DEL}{C-d} +\threecol{palavra}{M-DEL}{M-d} +\threecol{linha (at{\'e} o final)}{M-0 C-k}{C-k} +\threecol{senten{\c{c}}a}{C-x DEL}{M-k} +\threecol{sexp}{M-- C-M-k}{C-M-k} +} + +\key{corta {\bf regi{\~a}o}}{C-w} +\key{copia a {\bf regi{\~a}o}}{M-w} +\key{cortar at{\'e} a pr{\'o}xima ocorr{\^e}ncia de {\it char}}{M-z {\it char}} + +\key{colar a {\'u}ltima coisa cortada}{C-y} +\key{substitui a {\'u}lt. colagem pela c{\'o}pia anterior}{M-y} + +\section{Marcando} + +\key{posiciona a marca aqui}{C-@ {\rm or} C-SPC} +\key{troca a marca pelo ponto e vice-versa}{C-x C-x} + +\key{coloca a marca {\it arg\/} {\bf palavras} adiante}{M-@} +\key{marca o {\bf par{\'a}grafo}}{M-h} +\key{marca a {\bf p{\'a}gina}}{C-x C-p} +\key{marca a {\bf sexp}}{C-M-@} +\key{marca uma {\bf fun{\c{c}}{\~a}o}}{C-M-h} +\key{marca todo {\bf buffer}}{C-x h} + +\section{Busca e Substitui{\c{c}}{\~a}o} + +\key{Substitui interativamente uma string}{M-\%} +% query-replace-regexp is bound to C-M-% but that can't be typed on +% consoles. +\metax{usando express{\~a}o regular}{M-x query-replace-regexp} + +Respostas v{\'a}lidas no modo de busca e substitui{\c{c}}{\~a}o + +\key{{\bf substitui} esta, e prossegue}{SPC} +\key{substitui esta e entrada e n{\~a}o avan{\c{c}}a}{,} +\key{{\bf pula} para a pr{\'o}xima sem substituir}{DEL} +\key{substitui em todo o texto restante}{!} +\key{{\bf volta} para a palavra anterior}{^} +\key{{\bf encerra}}{RET} +\key{entra na edi{\c{c}}{\~a}o recursiva (\kbd{C-M-c} para sair)}{C-r} + + +\section{M{\'u}ltiplas Janelas} + +Quando forem mostrados 2 comandos, o segundo tem comportamento similar +para frame. + +{\setbox0=\hbox{\kbd{0}}\advance\hsize by 0\wd0 +\paralign to \hsize{#\tabskip=10pt plus 1 fil&#\tabskip=0pt&#\cr +\threecol{elimina todas outras janelas}{C-x 1\ \ \ \ }{C-x 5 1} +\threecol{divide a janela, acima e abaixo}{C-x 2\ \ \ \ }{C-x 5 2} +\threecol{elimina esta janela}{C-x 0\ \ \ \ }{C-x 5 0} +}} +\key{divide a janela, lado a lado}{C-x 3} + +\key{rola a outra janela}{C-M-v} + +{\setbox0=\hbox{\kbd{0}}\advance\hsize by 2\wd0 +\paralign to \hsize{#\tabskip=10pt plus 1 fil&#\tabskip=0pt&#\cr +\threecol{leva o cursor para outra janela}{C-x o}{C-x 5 o} + +\threecol{seleciona um buffer em outra janela}{C-x 4 b}{C-x 5 b} +\threecol{mostra um buffer em outra janela}{C-x 4 C-o}{C-x 5 C-o} +\threecol{busca um arquivo em outra janela}{C-x 4 f}{C-x 5 f} +\threecol{busca arquivo (ro) em outra janela}{C-x 4 r}{C-x 5 r} +\threecol{executa Dired em outra janela}{C-x 4 d}{C-x 5 d} +\threecol{busca tag em outra janela}{C-x 4 .}{C-x 5 .} +}} + +\key{aumenta a janela na vertical}{C-x ^} +\key{estreita a janela}{C-x \{} +\key{alarga a janela}{C-x \}} + +\section{Formatando} + +\key{identa a {\bf linha} corrente (modo)}{TAB} +\key{identa a {\bf regi{\~a}o} (modo)}{C-M-\\} +\key{identa a {\bf sexp} (modo)}{C-M-q} +\key{identa regi{\~a}o rigidamente {\it arg\/} colunas}{C-x TAB} + +\key{insere uma nova linha ap{\'o}s o ponto}{C-o} +\key{move o restante da linha para baixo}{C-M-o} +\key{apaga linhas em branco em torno do ponto}{C-x C-o} +\key{junta a linha com a anterior}{M-^} +\key{apaga todos brancos em torno do ponto}{M-\\} +\key{insere um espa{\c{c}}o em branco}{M-SPC} + +\key{preenche o par{\'a}grafo}{M-q} +\key{define a coluna limite de preenchimento}{C-x f} +\key{define um prefixo para cada linha}{C-x .} + +\key{formata fonte}{M-o} + +\section{Mai{\'u}sculas e Min{\'u}sculas} + +\key{Palavra para mai{\'u}sculas}{M-u} +\key{Palavra para min{\'u}sculas}{M-l} +\key{Primeira letra mai{\'u}scula (capitalize)}{M-c} + +\key{Regi{\~a}o para mai{\'u}sculas}{C-x C-u} +\key{Regi{\~a}o para min{\'u}sculas}{C-x C-l} + +\section{O Minibuffer} + +As teclas seguintes s{\~a}o definidas no minibuffer. + +\key{complete o m{\'a}ximo possi{\'\i}vel}{TAB} +\key{complete at{\'e} uma palavra}{SPC} +\key{complete e execute}{RET} +\key{mostre as op{\c{c}}{\~o}es para completar}{?} +\key{busca a entrada anterior no minibuffer}{M-p} +\key{busca a pr{\'o}xima entrada no minibuffer ou o default}{M-n} +\key{busca regexp no hist{\'o}rico para tr{\'a}s}{M-r} +\key{busca regexp no hist{\'o}rico para frente}{M-s} +\key{encerra o comando}{C-g} + +Tecle \kbd{C-x ESC ESC} para editar e repetir o {\'u}ltimo comando +utilizado. Tecle \kbd{F10} para ativar o menu. + +\newcolumn +\title{GNU Emacs: Cart\~ao de Refer\^encia} +\centerline{(para vers\~ao 22)} + +\section{Buffers} + +\key{seleciona outro buffer}{C-x b} +\key{lista todos buffers}{C-x C-b} +\key{mata um buffer}{C-x k} + +\section{Transposi{\c{c}}{\~a}o} + +\key{transp{\~o}e {\bf caracteres}}{C-t} +\key{transp{\~o}e {\bf palavras}}{M-t} +\key{transp{\~o}e {\bf linhas}}{C-x C-t} +\key{transp{\~o}e {\bf sexps}}{C-M-t} + +\section{Verifica{\c{c}}{\~a}o Ortogr{\'a}fica} + +\key{verifica a palavra corrente}{M-\$} +\metax{verifica todas palavras de uma regi{\~a}o}{M-x ispell-region} +\metax{verifica todo o buffer}{M-x ispell-buffer} + +\section{Tags} + +\key{busca uma tag (uma defini{\c{c}}{\~a}o)}{M-.} +\key{encontra a pr{\'o}xima ocorr{\^e}ncia da tag}{C-u M-.} +\metax{especifica um novo arquivo de tags}{M-x visit-tags-table} + +\metax{busca por regexp em todos arquivos}{M-x tags-search} +\metax{busca e subst. em todos arquivos}{M-x tags-query-replace} +\key{continua a {\'u}ltima busca ou busca e substitui{\c{c}}{\~a}o}{M-,} + +\section{Shells} + +\key{executa um comando do shell}{M-!} +\key{executa um comando do shell na regi{\~a}o}{M-|} +\key{filtra uma regi{\~a}o por um comando do shell}{C-u M-|} +\key{inicia um shell na janela \kbd{*shell*}}{M-x shell} + +\section{Ret{\^a}ngulos} + +\key{copia o ret{\^a}ngulo para o registrador}{C-x r r} +\key{corta o ret{\^a}ngulo}{C-x r k} +\key{cola o ret{\^a}ngulo}{C-x r y} +\key{abre o ret{\^a}ngulo, move o texto para direita}{C-x r o} +\key{troca por espa{\c{c}}os o conte{\'u}do do ret{\^a}ngulo}{C-x r c} +\key{antep{\~o}e uma linha a string}{C-x r t} + +\section{Abreviaturas} + +\key{adiciona uma abreviatura global}{C-x a g} +\key{adiciona abreviatura ao modo local}{C-x a l} +\key{adiciona globalmente expans{\~a}o de abrev.}{C-x a i g} +\key{adiciona localmente expans{\~a}o de abrev.}{C-x a i l} +\key{explicitamente expande uma abrev}{C-x a e} + +\key{completa com base em palavras anteriores}{M-/} + + +\section{Express{\~o}es Regulares} + +\key{qualquer caracter exceto nova linha}{. {\rm(dot)}} +\key{zero ou mais repeti{\c{c}}{\~o}es}{*} +\key{uma ou mais repeti{\c{c}}{\~o}es}{+} +\key{zero ou uma repeti{\c{c}}{\~a}o}{?} +\key{protege o caracter especial {\it c\/}}{\\{\it c}} +\key{(``or'')}{\\|} +\key{agrupamento}{\\( {\rm$\ldots$} \\)} +\key{mesmo texto que {\it n\/}-{\'e}simo grupo}{\\{\it n}} +\key{quebra de palavra}{\\b} +\key{sem quebra de palavra}{\\B} + +\paralign to \hsize{#\tabskip=10pt plus 1 fil&#\tabskip=0pt&#\cr +\threecol{{\bf entidade}}{{\bf casa in{\'\i}cio}}{{\bf casa fim}} +\threecol{linha}{^}{\$} +\threecol{palavra}{\\<}{\\>} +\threecol{buffer}{\\`}{\\'} + +\threecol{{\bf classe de caracteres}}{{\bf casa esses}}{{\bf casa os outros}} +\threecol{conjunto expl{\'\i}cito}{[ {\rm$\ldots$} ]}{[^ {\rm$\ldots$} ]} +\threecol{caracter de sintaxe de palavra}{\\w}{\\W} +\threecol{caracter de sintaxe de {\it c}}{\\s{\it c}}{\\S{\it c}} +} + +\section{Conjuntos de Carac. Internacionais} + +\key{especifica uma l{\'\i}ngua principal}{C-x RET l} +\metax{mostra todos m{\'e}todos de inser{\c{c}}{\~a}o}{M-x list-input-methods} +\key{habilita/desabilita um m{\'e}todo de inser{\c{c}}{\~a}o}{C-\\} +\key{determina o sistema de codifica{\c{c}}{\~a}o}{C-x RET c} +\metax{mostra sistemas de codifica{\c{c}}{\~a}o}{M-x list-coding-systems} +\metax{escolhe a codifica{\c{c}}{\~a}o preferida}{M-x prefer-coding-system} + +\section{Info} + +\key{entra no leitor de Info}{C-h i} +\key{busca fun{\c{c}}{\~a}o ou arquivo no Info}{C-h S} +\beginindentedkeys + +Movimenta{\c{c}}{\~a}o em um nodo: + +\key{rola para frente}{SPC} +\key{rola para tr{\'a}s}{DEL} +\key{in{\'\i}cio do nodo}{. {\rm (dot)}} + +Movimenta{\c{c}}{\~a}o entre nodos: + +\key{{\bf pr{\'o}ximo} nodo}{n} +\key{nodo {\bf anterior}}{p} +\key{mover cima {\bf cima}}{u} +\key{seleciona item do menu pelo nome}{m} +\key{seleciona {\it n\/}-{\'e}simo item do menu}{{\it n}} +\key{segue refer{\^e}ncia cruzada (retorna com \kbd{l})}{f} +\key{retorna {\'u}ltimo nodo visitado}{l} +\key{retorna ao diret{\'o}rio de nodos}{d} +\key{ir para o topo do arquivo Info}{t} +\key{ir para qualquer nodo por nome}{g} + +Outros: + +\key{executar {\bf tutorial} do Info}{h} +\key{busca pelo assunto no {\'\i}ndice}{i} +\key{busca por express{\~a}o regular}{s} +\key{{\bf sair} Info}{q} + +\endindentedkeys + +\section{Registrador} + +\key{salva regi{\~a}o em um registrador}{C-x r s} +\key{insere o conte{\'u}do do registrador no buffer}{C-x r i} + +\key{salva valor do ponto no registrador}{C-x r SPC} +\key{salta para o ponto salvo no registrador}{C-x r j} + +\section{Macros de Teclado} + +\key{{\bf inicia} a defini{\c{c}}{\~a}o de uma macro}{C-x (} +\key{{\bf encerra} a defini{\c{c}}{\~a}o de uma macro}{C-x )} +\key{{\bf executa} a {\'u}ltima macro definida}{C-x e} +\key{adiciona a {\'u}ltima macro definida}{C-u C-x (} +\metax{nomeia a {\'u}ltima macro definida}{M-x name-last-kbd-macro} +\metax{insere uma defini{\c{c}}{\~a}o em Lisp}{M-x insert-kbd-macro} + +\section{Lidando com Emacs Lisp} + +\key{avalia {\bf sexp} antes do ponto}{C-x C-e} +\key{avalia a {\bf defun} corrente}{C-M-x} +\metax{avalia a {\bf regi{\~a}o}}{M-x eval-region} +\key{l{\^e} e avalia o minibuffer}{M-:} +\metax{carrega do diret{\'o}rio padr{\~a}o do sistema}{M-x load-library} + +\section{Personaliza{\c{c}}{\~a}o Simples} + +\metax{personaliza vari{\'a}veis e fontes}{M-x customize} + +% The intended audience here is the person who wants to make simple +% customizations and knows Lisp syntax. + +Fazendo teclas de atalho globais em Emacs Lisp (exemplos): + +\beginexample% +(global-set-key "\\C-cg" 'goto-line) +(global-set-key "\\M-\#" 'query-replace-regexp) +\endexample + +\section{Escrevendo Comandos} + +\beginexample% +(defun \<command-name> (\<args>) + "\<documentation>" (interactive "\<template>") + \<body>) +\endexample + +Um exemplo: + +\beginexample% +(defun this-line-to-top-of-window (line) + "Reposition line point is on to top of window. +With ARG, put point on line ARG." + (interactive "P") + (recenter (if (null line) + 0 + (prefix-numeric-value line)))) +\endexample + +A especifica{\c{c}}{\~a}o \kbd{interactive} explica como ler +interativamente argumentos. Tecle \kbd{C-h f interactive} para mais +detalhes. + +\copyrightnotice + +\bye + +% Local variables: +% compile-command: "tex pt-br-refcard" +% coding: iso-latin-1 +% End: + +% arch-tag: 56bf248c-a1f3-443d-93f7-02d7aea67d94 diff --git a/etc/refcard.tex b/etc/refcard.tex index 218a6cc8e36..42a2cba4456 100644 --- a/etc/refcard.tex +++ b/etc/refcard.tex @@ -598,8 +598,9 @@ Moving between nodes: Other: \key{run Info {\bf tutorial}}{h} +\key{look up a subject in the indices}{i} +\key{search nodes for regexp}{s} \key{{\bf quit} Info}{q} -\key{search nodes for regexp}{M-s} \endindentedkeys diff --git a/etc/ru-refcard.tex b/etc/ru-refcard.tex index 72fbe28e86f..b2057f6c884 100644 --- a/etc/ru-refcard.tex +++ b/etc/ru-refcard.tex @@ -436,8 +436,9 @@ apropos: ÐÏËÁÚÁÔØ ËÏÍÁÎÄÙ, ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÅ ÓÔÒÏËÅ & \kbd{C-h a} \\ \begin{tabular}{p{\ColWidth}l} ÚÁÐÕÓÔÉÔØ {\bf ÕÞÅÂÎÉË} ÐÏ ÓÉÓÔÅÍÅ ÄÏËÕÍÅÎÔÁÃÉÉ & \kbd{h} \\ +ÐÏÉÓË × ÕÚÌÁÈ Ó ÐÏÍÏÝØÀ ÒÅÇÕÌÑÒÎÙÈ ×ÙÒÁÖÅÎÉÊ & \kbd{s} \\ +% look up a subject in the indices & \kbd{i} % FIXME {\bf ÐÒÅËÒÁÔÉÔØ ÒÁÂÏÔÕ} Ó ÄÏËÕÍÅÎÔÁÃÉÅÊ & \kbd{q} \\ -ÐÏÉÓË × ÕÚÌÁÈ Ó ÐÏÍÏÝØÀ ÒÅÇÕÌÑÒÎÙÈ ×ÙÒÁÖÅÎÉÊ & \kbd{M-s} \\ \end{tabular} \section{òÅÇÉÓÔÒÙ} @@ -515,5 +516,10 @@ With ARG, put point on line ARG." %\end{multicols} \end{document} + +% Local variables: +% compile-command: "latex ru-refcard" +% coding: cyrillic-koi8 +% End: % arch-tag: 868a12f6-4339-4a14-a56e-4a3937277a9e diff --git a/etc/ses-example.ses b/etc/ses-example.ses index fdbdb0cfca2..d0fb9198e20 100644 --- a/etc/ses-example.ses +++ b/etc/ses-example.ses @@ -206,4 +206,24 @@ Sales summary - Acme fundraising ;;; symbolic-formulas: (("Eastern area") ("West-district") ("North&South") ("Other")) ;;; End: +;;; Copyright (c) 2002, 2006 +;;; Free Software Foundation, Inc. + +;;; COPYING PERMISSIONS: +;;; +;;; This document 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 2 of the License, or +;;; (at your option) any later version. +;;; +;;; This program 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. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with this program; if not, write to the Free Software +;;; Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + ;;; arch-tag: 4fcb0843-e3f9-4270-b8fb-998129190765 diff --git a/etc/sk-refcard.tex b/etc/sk-refcard.tex index 6bc8edb9378..353451ecc27 100644 --- a/etc/sk-refcard.tex +++ b/etc/sk-refcard.tex @@ -592,8 +592,9 @@ Pohyb medzi uzlami: Ïal¹ie: \key{spusti» {\bf tútorial} k~Infu}{h} -\key{{\bf skonèi»} Info}{q} +% \key{look up a subject in the indices}{i} % FIXME \key{vyhµada» re»azec v uzloch}{M-s} +\key{{\bf skonèi»} Info}{q} \endindentedkeys diff --git a/etc/spook.lines b/etc/spook.lines Binary files differindex 9f1f05900a2..d0bda6d12ef 100644 --- a/etc/spook.lines +++ b/etc/spook.lines diff --git a/etc/tree-widget/default/close.png b/etc/tree-widget/default/close.png Binary files differindex 0725def3dee..1c3f6083992 100644 --- a/etc/tree-widget/default/close.png +++ b/etc/tree-widget/default/close.png diff --git a/etc/tree-widget/default/close.xpm b/etc/tree-widget/default/close.xpm index 63a7930fe34..6b0315aa75d 100644 --- a/etc/tree-widget/default/close.xpm +++ b/etc/tree-widget/default/close.xpm @@ -1,284 +1,33 @@ /* XPM */ -static char *close[] = { -/* width height num_colors chars_per_pixel */ -" 16 21 256 2", -/* colors */ -"`` c #840000", -"`. c #942929", -"`# c #9c3131", -"`a c #9c3939", -"`b c #a54242", -"`c c #a54a4a", -"`d c #ad4a4a", -"`e c #ad5252", -"`f c #ad5a5a", -"`g c None", -"`h c #ffffff", -"`i c #ffffff", -"`j c #ffffff", -"`k c #ffffff", -"`l c #ffffff", -"`m c #ffffff", -"`n c #ffffff", -"`o c #ffffff", -"`p c #ffffff", -"`q c #ffffff", -"`r c #ffffff", -"`s c #ffffff", -"`t c #ffffff", -"`u c #ffffff", -"`v c #ffffff", -"`w c #ffffff", -"`x c #ffffff", -"`y c #ffffff", -"`z c #ffffff", -"`A c #ffffff", -"`B c #ffffff", -"`C c #ffffff", -"`D c #ffffff", -"`E c #ffffff", -"`F c #ffffff", -"`G c #ffffff", -"`H c #ffffff", -"`I c #ffffff", -"`J c #ffffff", -"`K c #ffffff", -"`L c #ffffff", -"`M c #ffffff", -"`N c #ffffff", -"`O c #ffffff", -"`P c #ffffff", -"`Q c #ffffff", -"`R c #ffffff", -"`S c #ffffff", -"`T c #ffffff", -"`U c #ffffff", -"`V c #ffffff", -"`W c #ffffff", -"`X c #ffffff", -"`Y c #ffffff", -"`Z c #ffffff", -"`0 c #ffffff", -"`1 c #ffffff", -"`2 c #ffffff", -"`3 c #ffffff", -"`4 c #ffffff", -"`5 c #ffffff", -"`6 c #ffffff", -"`7 c #ffffff", -"`8 c #ffffff", -".` c #ffffff", -".. c #ffffff", -".# c #ffffff", -".a c #ffffff", -".b c #ffffff", -".c c #ffffff", -".d c #ffffff", -".e c #ffffff", -".f c #ffffff", -".g c #ffffff", -".h c #ffffff", -".i c #ffffff", -".j c #ffffff", -".k c #ffffff", -".l c #ffffff", -".m c #ffffff", -".n c #ffffff", -".o c #ffffff", -".p c #ffffff", -".q c #ffffff", -".r c #ffffff", -".s c #ffffff", -".t c #ffffff", -".u c #ffffff", -".v c #ffffff", -".w c #ffffff", -".x c #ffffff", -".y c #ffffff", -".z c #ffffff", -".A c #ffffff", -".B c #ffffff", -".C c #ffffff", -".D c #ffffff", -".E c #ffffff", -".F c #ffffff", -".G c #ffffff", -".H c #ffffff", -".I c #ffffff", -".J c #ffffff", -".K c #ffffff", -".L c #ffffff", -".M c #ffffff", -".N c #ffffff", -".O c #ffffff", -".P c #ffffff", -".Q c #ffffff", -".R c #ffffff", -".S c #ffffff", -".T c #ffffff", -".U c #ffffff", -".V c #ffffff", -".W c #ffffff", -".X c #ffffff", -".Y c #ffffff", -".Z c #ffffff", -".0 c #ffffff", -".1 c #ffffff", -".2 c #ffffff", -".3 c #ffffff", -".4 c #ffffff", -".5 c #ffffff", -".6 c #ffffff", -".7 c #ffffff", -".8 c #ffffff", -"#` c #ffffff", -"#. c #ffffff", -"## c #ffffff", -"#a c #ffffff", -"#b c #ffffff", -"#c c #ffffff", -"#d c #ffffff", -"#e c #ffffff", -"#f c #ffffff", -"#g c #ffffff", -"#h c #ffffff", -"#i c #ffffff", -"#j c #ffffff", -"#k c #ffffff", -"#l c #ffffff", -"#m c #ffffff", -"#n c #ffffff", -"#o c #ffffff", -"#p c #ffffff", -"#q c #ffffff", -"#r c #ffffff", -"#s c #ffffff", -"#t c #ffffff", -"#u c #ffffff", -"#v c #ffffff", -"#w c #ffffff", -"#x c #ffffff", -"#y c #ffffff", -"#z c #ffffff", -"#A c #ffffff", -"#B c #ffffff", -"#C c #ffffff", -"#D c #ffffff", -"#E c #ffffff", -"#F c #ffffff", -"#G c #ffffff", -"#H c #ffffff", -"#I c #ffffff", -"#J c #ffffff", -"#K c #ffffff", -"#L c #ffffff", -"#M c #ffffff", -"#N c #ffffff", -"#O c #ffffff", -"#P c #ffffff", -"#Q c #ffffff", -"#R c #ffffff", -"#S c #ffffff", -"#T c #ffffff", -"#U c #ffffff", -"#V c #ffffff", -"#W c #ffffff", -"#X c #ffffff", -"#Y c #ffffff", -"#Z c #ffffff", -"#0 c #ffffff", -"#1 c #ffffff", -"#2 c #ffffff", -"#3 c #ffffff", -"#4 c #ffffff", -"#5 c #ffffff", -"#6 c #ffffff", -"#7 c #ffffff", -"#8 c #ffffff", -"a` c #ffffff", -"a. c #ffffff", -"a# c #ffffff", -"aa c #ffffff", -"ab c #ffffff", -"ac c #ffffff", -"ad c #ffffff", -"ae c #ffffff", -"af c #ffffff", -"ag c #ffffff", -"ah c #ffffff", -"ai c #ffffff", -"aj c #ffffff", -"ak c #ffffff", -"al c #ffffff", -"am c #ffffff", -"an c #ffffff", -"ao c #ffffff", -"ap c #ffffff", -"aq c #ffffff", -"ar c #ffffff", -"as c #ffffff", -"at c #ffffff", -"au c #ffffff", -"av c #ffffff", -"aw c #ffffff", -"ax c #ffffff", -"ay c #ffffff", -"az c #ffffff", -"aA c #ffffff", -"aB c #ffffff", -"aC c #ffffff", -"aD c #ffffff", -"aE c #ffffff", -"aF c #ffffff", -"aG c #ffffff", -"aH c #ffffff", -"aI c #ffffff", -"aJ c #ffffff", -"aK c #ffffff", -"aL c #ffffff", -"aM c #ffffff", -"aN c #ffffff", -"aO c #ffffff", -"aP c #ffffff", -"aQ c #ffffff", -"aR c #ffffff", -"aS c #ffffff", -"aT c #ffffff", -"aU c #ffffff", -"aV c #ffffff", -"aW c #ffffff", -"aX c #ffffff", -"aY c #ffffff", -"aZ c #ffffff", -"a0 c #ffffff", -"a1 c #ffffff", -"a2 c #ffffff", -"a3 c #ffffff", -"a4 c #ffffff", -"a5 c #ffffff", -"a6 c #ffffff", -"a7 c #ffffff", -"a8 c #ffffff", -/* pixels */ -"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g", -"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g", -"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g", -"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g", -"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g", -"`g`g`g`g```````g`g`g`g`g`g`g`g`g", -"`g`g`g`````.`````g`g`g`g`g`g`g`g", -"`g`g`````.`#`a`````g`g`g`g`g`g`g", -"`g`````.`#`a`a`b`````g`g`g`g`g`g", -"`````.`#`a`a`b`c`e`````g`g`g`g`g", -"```.`#`a`a`b`c`e`e`f```g`g`g`g`g", -"`````a`a`b`c`e`e`f`````g`g`g`g`g", -"`g`````b`c`e`e`f`````g`g`g`g`g`g", -"`g`g`````e`e`f`````g`g`g`g`g`g`g", -"`g`g`g`````f`````g`g`g`g`g`g`g`g", -"`g`g`g`g```````g`g`g`g`g`g`g`g`g", -"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g", -"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g", -"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g", -"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g", -"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g" -}; +static char * close_xpm[] = { +"16 21 9 1", +" c None", +". c #840000", +"+ c #942929", +"@ c #9C3131", +"# c #9C3939", +"$ c #A54242", +"% c #A54A4A", +"& c #AD5252", +"* c #AD5A5A", +" ", +" ", +" ", +" ", +" ", +" ... ", +" ..+.. ", +" ..+@#.. ", +" ..+@##$.. ", +"..+@##$%&.. ", +".+@##$%&&*. ", +"..##$%&&*.. ", +" ..$%&&*.. ", +" ..&&*.. ", +" ..*.. ", +" ... ", +" ", +" ", +" ", +" ", +" "}; diff --git a/etc/tree-widget/default/empty.png b/etc/tree-widget/default/empty.png Binary files differindex 45f464836cc..9837936f3cc 100644 --- a/etc/tree-widget/default/empty.png +++ b/etc/tree-widget/default/empty.png diff --git a/etc/tree-widget/default/empty.xpm b/etc/tree-widget/default/empty.xpm index 6bb0a285dd8..8af9f2f23e1 100644 --- a/etc/tree-widget/default/empty.xpm +++ b/etc/tree-widget/default/empty.xpm @@ -1,284 +1,33 @@ /* XPM */ -static char *empty[] = { -/* width height num_colors chars_per_pixel */ -" 16 21 256 2", -/* colors */ -"`` c #848400", -"`. c #949429", -"`# c #9c9c31", -"`a c #9c9c39", -"`b c #a5a542", -"`c c #a5a54a", -"`d c #adad4a", -"`e c #adad52", -"`f c #adad5a", -"`g c None", -"`h c #ffffff", -"`i c #ffffff", -"`j c #ffffff", -"`k c #ffffff", -"`l c #ffffff", -"`m c #ffffff", -"`n c #ffffff", -"`o c #ffffff", -"`p c #ffffff", -"`q c #ffffff", -"`r c #ffffff", -"`s c #ffffff", -"`t c #ffffff", -"`u c #ffffff", -"`v c #ffffff", -"`w c #ffffff", -"`x c #ffffff", -"`y c #ffffff", -"`z c #ffffff", -"`A c #ffffff", -"`B c #ffffff", -"`C c #ffffff", -"`D c #ffffff", -"`E c #ffffff", -"`F c #ffffff", -"`G c #ffffff", -"`H c #ffffff", -"`I c #ffffff", -"`J c #ffffff", -"`K c #ffffff", -"`L c #ffffff", -"`M c #ffffff", -"`N c #ffffff", -"`O c #ffffff", -"`P c #ffffff", -"`Q c #ffffff", -"`R c #ffffff", -"`S c #ffffff", -"`T c #ffffff", -"`U c #ffffff", -"`V c #ffffff", -"`W c #ffffff", -"`X c #ffffff", -"`Y c #ffffff", -"`Z c #ffffff", -"`0 c #ffffff", -"`1 c #ffffff", -"`2 c #ffffff", -"`3 c #ffffff", -"`4 c #ffffff", -"`5 c #ffffff", -"`6 c #ffffff", -"`7 c #ffffff", -"`8 c #ffffff", -".` c #ffffff", -".. c #ffffff", -".# c #ffffff", -".a c #ffffff", -".b c #ffffff", -".c c #ffffff", -".d c #ffffff", -".e c #ffffff", -".f c #ffffff", -".g c #ffffff", -".h c #ffffff", -".i c #ffffff", -".j c #ffffff", -".k c #ffffff", -".l c #ffffff", -".m c #ffffff", -".n c #ffffff", -".o c #ffffff", -".p c #ffffff", -".q c #ffffff", -".r c #ffffff", -".s c #ffffff", -".t c #ffffff", -".u c #ffffff", -".v c #ffffff", -".w c #ffffff", -".x c #ffffff", -".y c #ffffff", -".z c #ffffff", -".A c #ffffff", -".B c #ffffff", -".C c #ffffff", -".D c #ffffff", -".E c #ffffff", -".F c #ffffff", -".G c #ffffff", -".H c #ffffff", -".I c #ffffff", -".J c #ffffff", -".K c #ffffff", -".L c #ffffff", -".M c #ffffff", -".N c #ffffff", -".O c #ffffff", -".P c #ffffff", -".Q c #ffffff", -".R c #ffffff", -".S c #ffffff", -".T c #ffffff", -".U c #ffffff", -".V c #ffffff", -".W c #ffffff", -".X c #ffffff", -".Y c #ffffff", -".Z c #ffffff", -".0 c #ffffff", -".1 c #ffffff", -".2 c #ffffff", -".3 c #ffffff", -".4 c #ffffff", -".5 c #ffffff", -".6 c #ffffff", -".7 c #ffffff", -".8 c #ffffff", -"#` c #ffffff", -"#. c #ffffff", -"## c #ffffff", -"#a c #ffffff", -"#b c #ffffff", -"#c c #ffffff", -"#d c #ffffff", -"#e c #ffffff", -"#f c #ffffff", -"#g c #ffffff", -"#h c #ffffff", -"#i c #ffffff", -"#j c #ffffff", -"#k c #ffffff", -"#l c #ffffff", -"#m c #ffffff", -"#n c #ffffff", -"#o c #ffffff", -"#p c #ffffff", -"#q c #ffffff", -"#r c #ffffff", -"#s c #ffffff", -"#t c #ffffff", -"#u c #ffffff", -"#v c #ffffff", -"#w c #ffffff", -"#x c #ffffff", -"#y c #ffffff", -"#z c #ffffff", -"#A c #ffffff", -"#B c #ffffff", -"#C c #ffffff", -"#D c #ffffff", -"#E c #ffffff", -"#F c #ffffff", -"#G c #ffffff", -"#H c #ffffff", -"#I c #ffffff", -"#J c #ffffff", -"#K c #ffffff", -"#L c #ffffff", -"#M c #ffffff", -"#N c #ffffff", -"#O c #ffffff", -"#P c #ffffff", -"#Q c #ffffff", -"#R c #ffffff", -"#S c #ffffff", -"#T c #ffffff", -"#U c #ffffff", -"#V c #ffffff", -"#W c #ffffff", -"#X c #ffffff", -"#Y c #ffffff", -"#Z c #ffffff", -"#0 c #ffffff", -"#1 c #ffffff", -"#2 c #ffffff", -"#3 c #ffffff", -"#4 c #ffffff", -"#5 c #ffffff", -"#6 c #ffffff", -"#7 c #ffffff", -"#8 c #ffffff", -"a` c #ffffff", -"a. c #ffffff", -"a# c #ffffff", -"aa c #ffffff", -"ab c #ffffff", -"ac c #ffffff", -"ad c #ffffff", -"ae c #ffffff", -"af c #ffffff", -"ag c #ffffff", -"ah c #ffffff", -"ai c #ffffff", -"aj c #ffffff", -"ak c #ffffff", -"al c #ffffff", -"am c #ffffff", -"an c #ffffff", -"ao c #ffffff", -"ap c #ffffff", -"aq c #ffffff", -"ar c #ffffff", -"as c #ffffff", -"at c #ffffff", -"au c #ffffff", -"av c #ffffff", -"aw c #ffffff", -"ax c #ffffff", -"ay c #ffffff", -"az c #ffffff", -"aA c #ffffff", -"aB c #ffffff", -"aC c #ffffff", -"aD c #ffffff", -"aE c #ffffff", -"aF c #ffffff", -"aG c #ffffff", -"aH c #ffffff", -"aI c #ffffff", -"aJ c #ffffff", -"aK c #ffffff", -"aL c #ffffff", -"aM c #ffffff", -"aN c #ffffff", -"aO c #ffffff", -"aP c #ffffff", -"aQ c #ffffff", -"aR c #ffffff", -"aS c #ffffff", -"aT c #ffffff", -"aU c #ffffff", -"aV c #ffffff", -"aW c #ffffff", -"aX c #ffffff", -"aY c #ffffff", -"aZ c #ffffff", -"a0 c #ffffff", -"a1 c #ffffff", -"a2 c #ffffff", -"a3 c #ffffff", -"a4 c #ffffff", -"a5 c #ffffff", -"a6 c #ffffff", -"a7 c #ffffff", -"a8 c #ffffff", -/* pixels */ -"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g", -"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g", -"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g", -"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g", -"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g", -"`g`g`g`g```````g`g`g`g`g`g`g`g`g", -"`g`g`g`````.`````g`g`g`g`g`g`g`g", -"`g`g`````.`#`a`````g`g`g`g`g`g`g", -"`g`````.`#`a`a`b`````g`g`g`g`g`g", -"`````.`#`a`a`b`c`c`````g`g`g`g`g", -"```.`#`a`a`b`c`c`e`f```g`g`g`g`g", -"`````a`a`b`c`c`e`f`````g`g`g`g`g", -"`g`````b`c`c`e`f`````g`g`g`g`g`g", -"`g`g`````c`e`f`````g`g`g`g`g`g`g", -"`g`g`g`````f`````g`g`g`g`g`g`g`g", -"`g`g`g`g```````g`g`g`g`g`g`g`g`g", -"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g", -"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g", -"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g", -"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g", -"`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g`g" -}; +static char * empty_xpm[] = { +"16 21 9 1", +" c None", +". c #848400", +"+ c #949429", +"@ c #9C9C31", +"# c #9C9C39", +"$ c #A5A542", +"% c #A5A54A", +"& c #ADAD52", +"* c #ADAD5A", +" ", +" ", +" ", +" ", +" ", +" ... ", +" ..+.. ", +" ..+@#.. ", +" ..+@##$.. ", +"..+@##$%%.. ", +".+@##$%%&*. ", +"..##$%%&*.. ", +" ..$%%&*.. ", +" ..%&*.. ", +" ..*.. ", +" ... ", +" ", +" ", +" ", +" ", +" "}; diff --git a/etc/tree-widget/default/end-guide.png b/etc/tree-widget/default/end-guide.png Binary files differindex 908048c4293..72bb67a4513 100644 --- a/etc/tree-widget/default/end-guide.png +++ b/etc/tree-widget/default/end-guide.png diff --git a/etc/tree-widget/default/end-guide.xpm b/etc/tree-widget/default/end-guide.xpm index 8e5d727b440..a8e684ac406 100644 --- a/etc/tree-widget/default/end-guide.xpm +++ b/etc/tree-widget/default/end-guide.xpm @@ -1,284 +1,26 @@ /* XPM */ -static char *end-guide[] = { -/* width height num_colors chars_per_pixel */ -" 6 21 256 2", -/* colors */ -"`` c #000000", -"`. c #a5a5c6", -"`# c #ada5c6", -"`a c #cecee7", -"`b c #ceceff", -"`c c None", -"`d c #ffffff", -"`e c #ffffff", -"`f c #ffffff", -"`g c #ffffff", -"`h c #ffffff", -"`i c #ffffff", -"`j c #ffffff", -"`k c #ffffff", -"`l c #ffffff", -"`m c #ffffff", -"`n c #ffffff", -"`o c #ffffff", -"`p c #ffffff", -"`q c #ffffff", -"`r c #ffffff", -"`s c #ffffff", -"`t c #ffffff", -"`u c #ffffff", -"`v c #ffffff", -"`w c #ffffff", -"`x c #ffffff", -"`y c #ffffff", -"`z c #ffffff", -"`A c #ffffff", -"`B c #ffffff", -"`C c #ffffff", -"`D c #808000", -"`E c #ffffff", -"`F c #ffffff", -"`G c #ffffff", -"`H c #ffffff", -"`I c #ffffff", -"`J c #ffffff", -"`K c #ffffff", -"`L c #ffffff", -"`M c #ffffff", -"`N c #ffffff", -"`O c #ffffff", -"`P c #ffffff", -"`Q c #ffffff", -"`R c #ffffff", -"`S c #ffffff", -"`T c #ffffff", -"`U c #ffffff", -"`V c #ffffff", -"`W c #ffffff", -"`X c #ffffff", -"`Y c #ffffff", -"`Z c #ffffff", -"`0 c #ffffff", -"`1 c #ffffff", -"`2 c #ffffff", -"`3 c #ffffff", -"`4 c #ffffff", -"`5 c #ffffff", -"`6 c #ffffff", -"`7 c #ffffff", -"`8 c #ffffff", -".` c #ffffff", -".. c #ffffff", -".# c #ffffff", -".a c #ffffff", -".b c #ffffff", -".c c #ffffff", -".d c #ffffff", -".e c #ffffff", -".f c #ffffff", -".g c #ffffff", -".h c #ffffff", -".i c #ffffff", -".j c #ffffff", -".k c #ffffff", -".l c #ffffff", -".m c #ffffff", -".n c #ffffff", -".o c #ffffff", -".p c #ffffff", -".q c #ffffff", -".r c #ffffff", -".s c #ffffff", -".t c #ffffff", -".u c #ffffff", -".v c #ffffff", -".w c #ffffff", -".x c #ffffff", -".y c #ffffff", -".z c #ffffff", -".A c #ffffff", -".B c #ffffff", -".C c #ffffff", -".D c #ffffff", -".E c #ffffff", -".F c #ffffff", -".G c #ffffff", -".H c #ffffff", -".I c #ffffff", -".J c #ffffff", -".K c #ffffff", -".L c #ffffff", -".M c #ffffff", -".N c #ffffff", -".O c #ffffff", -".P c #ffffff", -".Q c #ffffff", -".R c #ffffff", -".S c #ffffff", -".T c #ffffff", -".U c #ffffff", -".V c #ffffff", -".W c #ffffff", -".X c #ffffff", -".Y c #ffffff", -".Z c #ffffff", -".0 c #ffffff", -".1 c #ffffff", -".2 c #ffffff", -".3 c #ffffff", -".4 c #ffffff", -".5 c #ffffff", -".6 c #ffffff", -".7 c #ffffff", -".8 c #ffffff", -"#` c #ffffff", -"#. c #ffffff", -"## c #ffffff", -"#a c #ffffff", -"#b c #ffffff", -"#c c #ffffff", -"#d c #ffffff", -"#e c #ffffff", -"#f c #ffffff", -"#g c #ffffff", -"#h c #ffffff", -"#i c #ffffff", -"#j c #ffffff", -"#k c #ffffff", -"#l c #ffffff", -"#m c #ffffff", -"#n c #ffffff", -"#o c #ffffff", -"#p c #ffffff", -"#q c #ffffff", -"#r c #ffffff", -"#s c #ffffff", -"#t c #ffffff", -"#u c #ffffff", -"#v c #ffffff", -"#w c #ffffff", -"#x c #ffffff", -"#y c #ffffff", -"#z c #ffffff", -"#A c #ffffff", -"#B c #ffffff", -"#C c #ffffff", -"#D c #ffffff", -"#E c #ffffff", -"#F c #ffffff", -"#G c #ffffff", -"#H c #ffffff", -"#I c #ffffff", -"#J c #ffffff", -"#K c #ffffff", -"#L c #ffffff", -"#M c #ffffff", -"#N c #ffffff", -"#O c #ffffff", -"#P c #ffffff", -"#Q c #ffffff", -"#R c #ffffff", -"#S c #ffffff", -"#T c #ffffff", -"#U c #ffffff", -"#V c #ffffff", -"#W c #ffffff", -"#X c #ffffff", -"#Y c #ffffff", -"#Z c #ffffff", -"#0 c #ffffff", -"#1 c #ffffff", -"#2 c #ffffff", -"#3 c #ffffff", -"#4 c #ffffff", -"#5 c #ffffff", -"#6 c #ffffff", -"#7 c #ffffff", -"#8 c #ffffff", -"a` c #ffffff", -"a. c #ffffff", -"a# c #ffffff", -"aa c #ffffff", -"ab c #ffffff", -"ac c #ffffff", -"ad c #ffffff", -"ae c #ffffff", -"af c #ffffff", -"ag c #ffffff", -"ah c #ffffff", -"ai c #ffffff", -"aj c #ffffff", -"ak c #ffffff", -"al c #ffffff", -"am c #ffffff", -"an c #ffffff", -"ao c #ffffff", -"ap c #ffffff", -"aq c #ffffff", -"ar c #ffffff", -"as c #ffffff", -"at c #ffffff", -"au c #ffffff", -"av c #ffffff", -"aw c #ffffff", -"ax c #ffffff", -"ay c #ffffff", -"az c #ffffff", -"aA c #ffffff", -"aB c #ffffff", -"aC c #ffffff", -"aD c #ffffff", -"aE c #ffffff", -"aF c #ffffff", -"aG c #ffffff", -"aH c #ffffff", -"aI c #ffffff", -"aJ c #ffffff", -"aK c #ffffff", -"aL c #ffffff", -"aM c #ffffff", -"aN c #ffffff", -"aO c #ffffff", -"aP c #ffffff", -"aQ c #ffffff", -"aR c #ffffff", -"aS c #ffffff", -"aT c #ffffff", -"aU c #ffffff", -"aV c #ffffff", -"aW c #ffffff", -"aX c #ffffff", -"aY c #ffffff", -"aZ c #ffffff", -"a0 c #ffffff", -"a1 c #ffffff", -"a2 c #ffffff", -"a3 c #ffffff", -"a4 c #ffffff", -"a5 c #ffffff", -"a6 c #ffffff", -"a7 c #ffffff", -"a8 c #ffffff", -/* pixels */ -"`c`c`c`c`c`#", -"`c`c`c`c`c`#", -"`c`c`c`c`c`#", -"`c`c`c`c`c`#", -"`c`c`c`c`c`#", -"`c`c`c`c`c`#", -"`c`c`c`c`c`#", -"`c`c`c`c`c`#", -"`c`c`c`c`c`#", -"`c`c`c`c`c`#", -"`c`c`c`c`c`#", -"`c`c`c`c`c`c", -"`c`c`c`c`c`c", -"`c`c`c`c`c`c", -"`c`c`c`c`c`c", -"`c`c`c`c`c`c", -"`c`c`c`c`c`c", -"`c`c`c`c`c`c", -"`c`c`c`c`c`c", -"`c`c`c`c`c`c", -"`c`c`c`c`c`c" -}; +static char * end_guide_xpm[] = { +"6 21 2 1", +" c None", +". c #ADA5C6", +" .", +" .", +" .", +" .", +" .", +" .", +" .", +" .", +" .", +" .", +" .", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" "}; diff --git a/etc/tree-widget/default/guide.png b/etc/tree-widget/default/guide.png Binary files differindex c93b71ef073..85fa0c87b7b 100644 --- a/etc/tree-widget/default/guide.png +++ b/etc/tree-widget/default/guide.png diff --git a/etc/tree-widget/default/guide.xpm b/etc/tree-widget/default/guide.xpm index 56006ee48e0..85b3cec00ce 100644 --- a/etc/tree-widget/default/guide.xpm +++ b/etc/tree-widget/default/guide.xpm @@ -1,284 +1,26 @@ /* XPM */ -static char *guide[] = { -/* width height num_colors chars_per_pixel */ -" 6 21 256 2", -/* colors */ -"`` c #000000", -"`. c #a5a5c6", -"`# c #ada5c6", -"`a c #cecee7", -"`b c #ceceff", -"`c c None", -"`d c #ffffff", -"`e c #ffffff", -"`f c #ffffff", -"`g c #ffffff", -"`h c #ffffff", -"`i c #ffffff", -"`j c #ffffff", -"`k c #ffffff", -"`l c #ffffff", -"`m c #ffffff", -"`n c #ffffff", -"`o c #ffffff", -"`p c #ffffff", -"`q c #ffffff", -"`r c #ffffff", -"`s c #ffffff", -"`t c #ffffff", -"`u c #ffffff", -"`v c #ffffff", -"`w c #ffffff", -"`x c #ffffff", -"`y c #ffffff", -"`z c #ffffff", -"`A c #ffffff", -"`B c #ffffff", -"`C c #ffffff", -"`D c #808000", -"`E c #ffffff", -"`F c #ffffff", -"`G c #ffffff", -"`H c #ffffff", -"`I c #ffffff", -"`J c #ffffff", -"`K c #ffffff", -"`L c #ffffff", -"`M c #ffffff", -"`N c #ffffff", -"`O c #ffffff", -"`P c #ffffff", -"`Q c #ffffff", -"`R c #ffffff", -"`S c #ffffff", -"`T c #ffffff", -"`U c #ffffff", -"`V c #ffffff", -"`W c #ffffff", -"`X c #ffffff", -"`Y c #ffffff", -"`Z c #ffffff", -"`0 c #ffffff", -"`1 c #ffffff", -"`2 c #ffffff", -"`3 c #ffffff", -"`4 c #ffffff", -"`5 c #ffffff", -"`6 c #ffffff", -"`7 c #ffffff", -"`8 c #ffffff", -".` c #ffffff", -".. c #ffffff", -".# c #ffffff", -".a c #ffffff", -".b c #ffffff", -".c c #ffffff", -".d c #ffffff", -".e c #ffffff", -".f c #ffffff", -".g c #ffffff", -".h c #ffffff", -".i c #ffffff", -".j c #ffffff", -".k c #ffffff", -".l c #ffffff", -".m c #ffffff", -".n c #ffffff", -".o c #ffffff", -".p c #ffffff", -".q c #ffffff", -".r c #ffffff", -".s c #ffffff", -".t c #ffffff", -".u c #ffffff", -".v c #ffffff", -".w c #ffffff", -".x c #ffffff", -".y c #ffffff", -".z c #ffffff", -".A c #ffffff", -".B c #ffffff", -".C c #ffffff", -".D c #ffffff", -".E c #ffffff", -".F c #ffffff", -".G c #ffffff", -".H c #ffffff", -".I c #ffffff", -".J c #ffffff", -".K c #ffffff", -".L c #ffffff", -".M c #ffffff", -".N c #ffffff", -".O c #ffffff", -".P c #ffffff", -".Q c #ffffff", -".R c #ffffff", -".S c #ffffff", -".T c #ffffff", -".U c #ffffff", -".V c #ffffff", -".W c #ffffff", -".X c #ffffff", -".Y c #ffffff", -".Z c #ffffff", -".0 c #ffffff", -".1 c #ffffff", -".2 c #ffffff", -".3 c #ffffff", -".4 c #ffffff", -".5 c #ffffff", -".6 c #ffffff", -".7 c #ffffff", -".8 c #ffffff", -"#` c #ffffff", -"#. c #ffffff", -"## c #ffffff", -"#a c #ffffff", -"#b c #ffffff", -"#c c #ffffff", -"#d c #ffffff", -"#e c #ffffff", -"#f c #ffffff", -"#g c #ffffff", -"#h c #ffffff", -"#i c #ffffff", -"#j c #ffffff", -"#k c #ffffff", -"#l c #ffffff", -"#m c #ffffff", -"#n c #ffffff", -"#o c #ffffff", -"#p c #ffffff", -"#q c #ffffff", -"#r c #ffffff", -"#s c #ffffff", -"#t c #ffffff", -"#u c #ffffff", -"#v c #ffffff", -"#w c #ffffff", -"#x c #ffffff", -"#y c #ffffff", -"#z c #ffffff", -"#A c #ffffff", -"#B c #ffffff", -"#C c #ffffff", -"#D c #ffffff", -"#E c #ffffff", -"#F c #ffffff", -"#G c #ffffff", -"#H c #ffffff", -"#I c #ffffff", -"#J c #ffffff", -"#K c #ffffff", -"#L c #ffffff", -"#M c #ffffff", -"#N c #ffffff", -"#O c #ffffff", -"#P c #ffffff", -"#Q c #ffffff", -"#R c #ffffff", -"#S c #ffffff", -"#T c #ffffff", -"#U c #ffffff", -"#V c #ffffff", -"#W c #ffffff", -"#X c #ffffff", -"#Y c #ffffff", -"#Z c #ffffff", -"#0 c #ffffff", -"#1 c #ffffff", -"#2 c #ffffff", -"#3 c #ffffff", -"#4 c #ffffff", -"#5 c #ffffff", -"#6 c #ffffff", -"#7 c #ffffff", -"#8 c #ffffff", -"a` c #ffffff", -"a. c #ffffff", -"a# c #ffffff", -"aa c #ffffff", -"ab c #ffffff", -"ac c #ffffff", -"ad c #ffffff", -"ae c #ffffff", -"af c #ffffff", -"ag c #ffffff", -"ah c #ffffff", -"ai c #ffffff", -"aj c #ffffff", -"ak c #ffffff", -"al c #ffffff", -"am c #ffffff", -"an c #ffffff", -"ao c #ffffff", -"ap c #ffffff", -"aq c #ffffff", -"ar c #ffffff", -"as c #ffffff", -"at c #ffffff", -"au c #ffffff", -"av c #ffffff", -"aw c #ffffff", -"ax c #ffffff", -"ay c #ffffff", -"az c #ffffff", -"aA c #ffffff", -"aB c #ffffff", -"aC c #ffffff", -"aD c #ffffff", -"aE c #ffffff", -"aF c #ffffff", -"aG c #ffffff", -"aH c #ffffff", -"aI c #ffffff", -"aJ c #ffffff", -"aK c #ffffff", -"aL c #ffffff", -"aM c #ffffff", -"aN c #ffffff", -"aO c #ffffff", -"aP c #ffffff", -"aQ c #ffffff", -"aR c #ffffff", -"aS c #ffffff", -"aT c #ffffff", -"aU c #ffffff", -"aV c #ffffff", -"aW c #ffffff", -"aX c #ffffff", -"aY c #ffffff", -"aZ c #ffffff", -"a0 c #ffffff", -"a1 c #ffffff", -"a2 c #ffffff", -"a3 c #ffffff", -"a4 c #ffffff", -"a5 c #ffffff", -"a6 c #ffffff", -"a7 c #ffffff", -"a8 c #ffffff", -/* pixels */ -"`c`c`c`c`c`#", -"`c`c`c`c`c`#", -"`c`c`c`c`c`#", -"`c`c`c`c`c`#", -"`c`c`c`c`c`#", -"`c`c`c`c`c`#", -"`c`c`c`c`c`#", -"`c`c`c`c`c`#", -"`c`c`c`c`c`#", -"`c`c`c`c`c`#", -"`c`c`c`c`c`#", -"`c`c`c`c`c`#", -"`c`c`c`c`c`#", -"`c`c`c`c`c`#", -"`c`c`c`c`c`#", -"`c`c`c`c`c`#", -"`c`c`c`c`c`#", -"`c`c`c`c`c`#", -"`c`c`c`c`c`#", -"`c`c`c`c`c`#", -"`c`c`c`c`c`#" -}; +static char * guide_xpm[] = { +"6 21 2 1", +" c None", +". c #ADA5C6", +" .", +" .", +" .", +" .", +" .", +" .", +" .", +" .", +" .", +" .", +" .", +" .", +" .", +" .", +" .", +" .", +" .", +" .", +" .", +" .", +" ."}; diff --git a/etc/tree-widget/default/handle.png b/etc/tree-widget/default/handle.png Binary files differindex 8411624adaa..8a00d7b3f24 100644 --- a/etc/tree-widget/default/handle.png +++ b/etc/tree-widget/default/handle.png diff --git a/etc/tree-widget/default/handle.xpm b/etc/tree-widget/default/handle.xpm index 11f618b4b25..fcdf2b40920 100644 --- a/etc/tree-widget/default/handle.xpm +++ b/etc/tree-widget/default/handle.xpm @@ -1,284 +1,26 @@ /* XPM */ -static char *handle[] = { -/* width height num_colors chars_per_pixel */ -" 10 21 256 2", -/* colors */ -"`` c #000000", -"`. c #a5a5c6", -"`# c #ada5c6", -"`a c #cecee7", -"`b c #ceceff", -"`c c None", -"`d c #ffffff", -"`e c #ffffff", -"`f c #ffffff", -"`g c #ffffff", -"`h c #ffffff", -"`i c #ffffff", -"`j c #ffffff", -"`k c #ffffff", -"`l c #ffffff", -"`m c #ffffff", -"`n c #ffffff", -"`o c #ffffff", -"`p c #ffffff", -"`q c #ffffff", -"`r c #ffffff", -"`s c #ffffff", -"`t c #ffffff", -"`u c #ffffff", -"`v c #ffffff", -"`w c #ffffff", -"`x c #ffffff", -"`y c #ffffff", -"`z c #ffffff", -"`A c #ffffff", -"`B c #ffffff", -"`C c #ffffff", -"`D c #808000", -"`E c #ffffff", -"`F c #ffffff", -"`G c #ffffff", -"`H c #ffffff", -"`I c #ffffff", -"`J c #ffffff", -"`K c #ffffff", -"`L c #ffffff", -"`M c #ffffff", -"`N c #ffffff", -"`O c #ffffff", -"`P c #ffffff", -"`Q c #ffffff", -"`R c #ffffff", -"`S c #ffffff", -"`T c #ffffff", -"`U c #ffffff", -"`V c #ffffff", -"`W c #ffffff", -"`X c #ffffff", -"`Y c #ffffff", -"`Z c #ffffff", -"`0 c #ffffff", -"`1 c #ffffff", -"`2 c #ffffff", -"`3 c #ffffff", -"`4 c #ffffff", -"`5 c #ffffff", -"`6 c #ffffff", -"`7 c #ffffff", -"`8 c #ffffff", -".` c #ffffff", -".. c #ffffff", -".# c #ffffff", -".a c #ffffff", -".b c #ffffff", -".c c #ffffff", -".d c #ffffff", -".e c #ffffff", -".f c #ffffff", -".g c #ffffff", -".h c #ffffff", -".i c #ffffff", -".j c #ffffff", -".k c #ffffff", -".l c #ffffff", -".m c #ffffff", -".n c #ffffff", -".o c #ffffff", -".p c #ffffff", -".q c #ffffff", -".r c #ffffff", -".s c #ffffff", -".t c #ffffff", -".u c #ffffff", -".v c #ffffff", -".w c #ffffff", -".x c #ffffff", -".y c #ffffff", -".z c #ffffff", -".A c #ffffff", -".B c #ffffff", -".C c #ffffff", -".D c #ffffff", -".E c #ffffff", -".F c #ffffff", -".G c #ffffff", -".H c #ffffff", -".I c #ffffff", -".J c #ffffff", -".K c #ffffff", -".L c #ffffff", -".M c #ffffff", -".N c #ffffff", -".O c #ffffff", -".P c #ffffff", -".Q c #ffffff", -".R c #ffffff", -".S c #ffffff", -".T c #ffffff", -".U c #ffffff", -".V c #ffffff", -".W c #ffffff", -".X c #ffffff", -".Y c #ffffff", -".Z c #ffffff", -".0 c #ffffff", -".1 c #ffffff", -".2 c #ffffff", -".3 c #ffffff", -".4 c #ffffff", -".5 c #ffffff", -".6 c #ffffff", -".7 c #ffffff", -".8 c #ffffff", -"#` c #ffffff", -"#. c #ffffff", -"## c #ffffff", -"#a c #ffffff", -"#b c #ffffff", -"#c c #ffffff", -"#d c #ffffff", -"#e c #ffffff", -"#f c #ffffff", -"#g c #ffffff", -"#h c #ffffff", -"#i c #ffffff", -"#j c #ffffff", -"#k c #ffffff", -"#l c #ffffff", -"#m c #ffffff", -"#n c #ffffff", -"#o c #ffffff", -"#p c #ffffff", -"#q c #ffffff", -"#r c #ffffff", -"#s c #ffffff", -"#t c #ffffff", -"#u c #ffffff", -"#v c #ffffff", -"#w c #ffffff", -"#x c #ffffff", -"#y c #ffffff", -"#z c #ffffff", -"#A c #ffffff", -"#B c #ffffff", -"#C c #ffffff", -"#D c #ffffff", -"#E c #ffffff", -"#F c #ffffff", -"#G c #ffffff", -"#H c #ffffff", -"#I c #ffffff", -"#J c #ffffff", -"#K c #ffffff", -"#L c #ffffff", -"#M c #ffffff", -"#N c #ffffff", -"#O c #ffffff", -"#P c #ffffff", -"#Q c #ffffff", -"#R c #ffffff", -"#S c #ffffff", -"#T c #ffffff", -"#U c #ffffff", -"#V c #ffffff", -"#W c #ffffff", -"#X c #ffffff", -"#Y c #ffffff", -"#Z c #ffffff", -"#0 c #ffffff", -"#1 c #ffffff", -"#2 c #ffffff", -"#3 c #ffffff", -"#4 c #ffffff", -"#5 c #ffffff", -"#6 c #ffffff", -"#7 c #ffffff", -"#8 c #ffffff", -"a` c #ffffff", -"a. c #ffffff", -"a# c #ffffff", -"aa c #ffffff", -"ab c #ffffff", -"ac c #ffffff", -"ad c #ffffff", -"ae c #ffffff", -"af c #ffffff", -"ag c #ffffff", -"ah c #ffffff", -"ai c #ffffff", -"aj c #ffffff", -"ak c #ffffff", -"al c #ffffff", -"am c #ffffff", -"an c #ffffff", -"ao c #ffffff", -"ap c #ffffff", -"aq c #ffffff", -"ar c #ffffff", -"as c #ffffff", -"at c #ffffff", -"au c #ffffff", -"av c #ffffff", -"aw c #ffffff", -"ax c #ffffff", -"ay c #ffffff", -"az c #ffffff", -"aA c #ffffff", -"aB c #ffffff", -"aC c #ffffff", -"aD c #ffffff", -"aE c #ffffff", -"aF c #ffffff", -"aG c #ffffff", -"aH c #ffffff", -"aI c #ffffff", -"aJ c #ffffff", -"aK c #ffffff", -"aL c #ffffff", -"aM c #ffffff", -"aN c #ffffff", -"aO c #ffffff", -"aP c #ffffff", -"aQ c #ffffff", -"aR c #ffffff", -"aS c #ffffff", -"aT c #ffffff", -"aU c #ffffff", -"aV c #ffffff", -"aW c #ffffff", -"aX c #ffffff", -"aY c #ffffff", -"aZ c #ffffff", -"a0 c #ffffff", -"a1 c #ffffff", -"a2 c #ffffff", -"a3 c #ffffff", -"a4 c #ffffff", -"a5 c #ffffff", -"a6 c #ffffff", -"a7 c #ffffff", -"a8 c #ffffff", -/* pixels */ -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`#`#`#`#`#`#`#`#`#`#", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c" -}; +static char * handle_xpm[] = { +"10 21 2 1", +" c None", +". c #ADA5C6", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +"..........", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" "}; diff --git a/etc/tree-widget/default/leaf.png b/etc/tree-widget/default/leaf.png Binary files differindex 0408f38bd5e..ef8cee2c787 100644 --- a/etc/tree-widget/default/leaf.png +++ b/etc/tree-widget/default/leaf.png diff --git a/etc/tree-widget/default/leaf.xpm b/etc/tree-widget/default/leaf.xpm index 8b5db38784a..58d90f2d7ef 100644 --- a/etc/tree-widget/default/leaf.xpm +++ b/etc/tree-widget/default/leaf.xpm @@ -1,284 +1,33 @@ /* XPM */ -static char *leaf[] = { -/* width height num_colors chars_per_pixel */ -" 16 21 256 2", -/* colors */ -"`` c #424242", -"`. c #737373", -"`# c #7b7b7b", -"`a c #848484", -"`b c #8c8c8c", -"`c c #949494", -"`d c #9c9c9c", -"`e c #a5a5a5", -"`f c None", -"`g c #ffffff", -"`h c #ffffff", -"`i c #ffffff", -"`j c #ffffff", -"`k c #ffffff", -"`l c #ffffff", -"`m c #ffffff", -"`n c #ffffff", -"`o c #ffffff", -"`p c #ffffff", -"`q c #ffffff", -"`r c #ffffff", -"`s c #ffffff", -"`t c #ffffff", -"`u c #ffffff", -"`v c #ffffff", -"`w c #ffffff", -"`x c #ffffff", -"`y c #ffffff", -"`z c #ffffff", -"`A c #ffffff", -"`B c #ffffff", -"`C c #ffffff", -"`D c #ffffff", -"`E c #ffffff", -"`F c #ffffff", -"`G c #ffffff", -"`H c #ffffff", -"`I c #ffffff", -"`J c #ffffff", -"`K c #ffffff", -"`L c #ffffff", -"`M c #ffffff", -"`N c #ffffff", -"`O c #ffffff", -"`P c #ffffff", -"`Q c #ffffff", -"`R c #ffffff", -"`S c #ffffff", -"`T c #ffffff", -"`U c #ffffff", -"`V c #ffffff", -"`W c #ffffff", -"`X c #ffffff", -"`Y c #ffffff", -"`Z c #ffffff", -"`0 c #ffffff", -"`1 c #ffffff", -"`2 c #ffffff", -"`3 c #ffffff", -"`4 c #ffffff", -"`5 c #ffffff", -"`6 c #ffffff", -"`7 c #ffffff", -"`8 c #ffffff", -".` c #ffffff", -".. c #ffffff", -".# c #ffffff", -".a c #ffffff", -".b c #ffffff", -".c c #ffffff", -".d c #ffffff", -".e c #ffffff", -".f c #ffffff", -".g c #ffffff", -".h c #ffffff", -".i c #ffffff", -".j c #ffffff", -".k c #ffffff", -".l c #ffffff", -".m c #ffffff", -".n c #ffffff", -".o c #ffffff", -".p c #ffffff", -".q c #ffffff", -".r c #ffffff", -".s c #ffffff", -".t c #ffffff", -".u c #ffffff", -".v c #ffffff", -".w c #ffffff", -".x c #ffffff", -".y c #ffffff", -".z c #ffffff", -".A c #ffffff", -".B c #ffffff", -".C c #ffffff", -".D c #ffffff", -".E c #ffffff", -".F c #ffffff", -".G c #ffffff", -".H c #ffffff", -".I c #ffffff", -".J c #ffffff", -".K c #ffffff", -".L c #ffffff", -".M c #ffffff", -".N c #ffffff", -".O c #ffffff", -".P c #ffffff", -".Q c #ffffff", -".R c #ffffff", -".S c #ffffff", -".T c #ffffff", -".U c #ffffff", -".V c #ffffff", -".W c #ffffff", -".X c #ffffff", -".Y c #ffffff", -".Z c #ffffff", -".0 c #ffffff", -".1 c #ffffff", -".2 c #ffffff", -".3 c #ffffff", -".4 c #ffffff", -".5 c #ffffff", -".6 c #ffffff", -".7 c #ffffff", -".8 c #ffffff", -"#` c #ffffff", -"#. c #ffffff", -"## c #ffffff", -"#a c #ffffff", -"#b c #ffffff", -"#c c #ffffff", -"#d c #ffffff", -"#e c #ffffff", -"#f c #ffffff", -"#g c #ffffff", -"#h c #ffffff", -"#i c #ffffff", -"#j c #ffffff", -"#k c #ffffff", -"#l c #ffffff", -"#m c #ffffff", -"#n c #ffffff", -"#o c #ffffff", -"#p c #ffffff", -"#q c #ffffff", -"#r c #ffffff", -"#s c #ffffff", -"#t c #ffffff", -"#u c #ffffff", -"#v c #ffffff", -"#w c #ffffff", -"#x c #ffffff", -"#y c #ffffff", -"#z c #ffffff", -"#A c #ffffff", -"#B c #ffffff", -"#C c #ffffff", -"#D c #ffffff", -"#E c #ffffff", -"#F c #ffffff", -"#G c #ffffff", -"#H c #ffffff", -"#I c #ffffff", -"#J c #ffffff", -"#K c #ffffff", -"#L c #ffffff", -"#M c #ffffff", -"#N c #ffffff", -"#O c #ffffff", -"#P c #ffffff", -"#Q c #ffffff", -"#R c #ffffff", -"#S c #ffffff", -"#T c #ffffff", -"#U c #ffffff", -"#V c #ffffff", -"#W c #ffffff", -"#X c #ffffff", -"#Y c #ffffff", -"#Z c #ffffff", -"#0 c #ffffff", -"#1 c #ffffff", -"#2 c #ffffff", -"#3 c #ffffff", -"#4 c #ffffff", -"#5 c #ffffff", -"#6 c #ffffff", -"#7 c #ffffff", -"#8 c #ffffff", -"a` c #ffffff", -"a. c #ffffff", -"a# c #ffffff", -"aa c #ffffff", -"ab c #ffffff", -"ac c #ffffff", -"ad c #ffffff", -"ae c #ffffff", -"af c #ffffff", -"ag c #ffffff", -"ah c #ffffff", -"ai c #ffffff", -"aj c #ffffff", -"ak c #ffffff", -"al c #ffffff", -"am c #ffffff", -"an c #ffffff", -"ao c #ffffff", -"ap c #ffffff", -"aq c #ffffff", -"ar c #ffffff", -"as c #ffffff", -"at c #ffffff", -"au c #ffffff", -"av c #ffffff", -"aw c #ffffff", -"ax c #ffffff", -"ay c #ffffff", -"az c #ffffff", -"aA c #ffffff", -"aB c #ffffff", -"aC c #ffffff", -"aD c #ffffff", -"aE c #ffffff", -"aF c #ffffff", -"aG c #ffffff", -"aH c #ffffff", -"aI c #ffffff", -"aJ c #ffffff", -"aK c #ffffff", -"aL c #ffffff", -"aM c #ffffff", -"aN c #ffffff", -"aO c #ffffff", -"aP c #ffffff", -"aQ c #ffffff", -"aR c #ffffff", -"aS c #ffffff", -"aT c #ffffff", -"aU c #ffffff", -"aV c #ffffff", -"aW c #ffffff", -"aX c #ffffff", -"aY c #ffffff", -"aZ c #ffffff", -"a0 c #ffffff", -"a1 c #ffffff", -"a2 c #ffffff", -"a3 c #ffffff", -"a4 c #ffffff", -"a5 c #ffffff", -"a6 c #ffffff", -"a7 c #ffffff", -"a8 c #ffffff", -/* pixels */ -"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f", -"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f", -"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f", -"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f", -"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f", -"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f", -"`f`f`f```````````f`f`f`f`f`f`f`f", -"`f`f```.`#`#`a`a```f`f`f`f`f`f`f", -"`f```.`#`#`a`a`b`b```f`f`f`f`f`f", -"```.`#`#`a`a`b`b`c`c```f`f`f`f`f", -"```#`#`a`a`b`b`c`c`d```f`f`f`f`f", -"```#`a`a`b`b`c`c`d`e```f`f`f`f`f", -"`f```a`b`b`c`c`d`e```f`f`f`f`f`f", -"`f`f```b`c`c`d`e```f`f`f`f`f`f`f", -"`f`f`f```````````f`f`f`f`f`f`f`f", -"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f", -"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f", -"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f", -"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f", -"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f", -"`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f`f" -}; +static char * leaf_xpm[] = { +"16 21 9 1", +" c None", +". c #424242", +"+ c #737373", +"@ c #7B7B7B", +"# c #848484", +"$ c #8C8C8C", +"% c #949494", +"& c #9C9C9C", +"* c #A5A5A5", +" ", +" ", +" ", +" ", +" ", +" ", +" ..... ", +" .+@@##. ", +" .+@@##$$. ", +".+@@##$$%%. ", +".@@##$$%%&. ", +".@##$$%%&*. ", +" .#$$%%&*. ", +" .$%%&*. ", +" ..... ", +" ", +" ", +" ", +" ", +" ", +" "}; diff --git a/etc/tree-widget/default/no-guide.png b/etc/tree-widget/default/no-guide.png Binary files differindex dc4292ea98f..a063d3f2555 100644 --- a/etc/tree-widget/default/no-guide.png +++ b/etc/tree-widget/default/no-guide.png diff --git a/etc/tree-widget/default/no-guide.xpm b/etc/tree-widget/default/no-guide.xpm index 82729cf59b0..d9d93ea7294 100644 --- a/etc/tree-widget/default/no-guide.xpm +++ b/etc/tree-widget/default/no-guide.xpm @@ -1,284 +1,25 @@ /* XPM */ -static char *no-guide[] = { -/* width height num_colors chars_per_pixel */ -" 6 21 256 2", -/* colors */ -"`` c #000000", -"`. c #84849c", -"`# c #8c8ca5", -"`a c #a5a5c6", -"`b c #ada5c6", -"`c c #b5b5ce", -"`d c #cecee7", -"`e c #ceceff", -"`f c #e7e7ff", -"`g c None", -"`h c #808000", -"`i c #ffffff", -"`j c #ffffff", -"`k c #ffffff", -"`l c #ffffff", -"`m c #ffffff", -"`n c #ffffff", -"`o c #ffffff", -"`p c #ffffff", -"`q c #ffffff", -"`r c #ffffff", -"`s c #ffffff", -"`t c #ffffff", -"`u c #ffffff", -"`v c #ffffff", -"`w c #ffffff", -"`x c #ffffff", -"`y c #ffffff", -"`z c #ffffff", -"`A c #ffffff", -"`B c #ffffff", -"`C c #ffffff", -"`D c #ffffff", -"`E c #ffffff", -"`F c #ffffff", -"`G c #ffffff", -"`H c #ffffff", -"`I c #ffffff", -"`J c #ffffff", -"`K c #ffffff", -"`L c #ffffff", -"`M c #ffffff", -"`N c #ffffff", -"`O c #ffffff", -"`P c #ffffff", -"`Q c #ffffff", -"`R c #ffffff", -"`S c #ffffff", -"`T c #ffffff", -"`U c #ffffff", -"`V c #ffffff", -"`W c #ffffff", -"`X c #ffffff", -"`Y c #ffffff", -"`Z c #ffffff", -"`0 c #ffffff", -"`1 c #ffffff", -"`2 c #ffffff", -"`3 c #ffffff", -"`4 c #ffffff", -"`5 c #ffffff", -"`6 c #ffffff", -"`7 c #ffffff", -"`8 c #ffffff", -".` c #ffffff", -".. c #ffffff", -".# c #ffffff", -".a c #ffffff", -".b c #ffffff", -".c c #ffffff", -".d c #ffffff", -".e c #ffffff", -".f c #ffffff", -".g c #ffffff", -".h c #ffffff", -".i c #ffffff", -".j c #ffffff", -".k c #ffffff", -".l c #ffffff", -".m c #ffffff", -".n c #ffffff", -".o c #ffffff", -".p c #ffffff", -".q c #ffffff", -".r c #ffffff", -".s c #ffffff", -".t c #ffffff", -".u c #ffffff", -".v c #ffffff", -".w c #ffffff", -".x c #ffffff", -".y c #ffffff", -".z c #ffffff", -".A c #ffffff", -".B c #ffffff", -".C c #ffffff", -".D c #ffffff", -".E c #ffffff", -".F c #ffffff", -".G c #ffffff", -".H c #ffffff", -".I c #ffffff", -".J c #ffffff", -".K c #ffffff", -".L c #ffffff", -".M c #ffffff", -".N c #ffffff", -".O c #ffffff", -".P c #ffffff", -".Q c #ffffff", -".R c #ffffff", -".S c #ffffff", -".T c #ffffff", -".U c #ffffff", -".V c #ffffff", -".W c #ffffff", -".X c #ffffff", -".Y c #ffffff", -".Z c #ffffff", -".0 c #ffffff", -".1 c #ffffff", -".2 c #ffffff", -".3 c #ffffff", -".4 c #ffffff", -".5 c #ffffff", -".6 c #ffffff", -".7 c #ffffff", -".8 c #ffffff", -"#` c #ffffff", -"#. c #ffffff", -"## c #ffffff", -"#a c #ffffff", -"#b c #ffffff", -"#c c #ffffff", -"#d c #ffffff", -"#e c #ffffff", -"#f c #ffffff", -"#g c #ffffff", -"#h c #ffffff", -"#i c #ffffff", -"#j c #ffffff", -"#k c #ffffff", -"#l c #ffffff", -"#m c #ffffff", -"#n c #ffffff", -"#o c #ffffff", -"#p c #ffffff", -"#q c #ffffff", -"#r c #ffffff", -"#s c #ffffff", -"#t c #ffffff", -"#u c #ffffff", -"#v c #ffffff", -"#w c #ffffff", -"#x c #ffffff", -"#y c #ffffff", -"#z c #ffffff", -"#A c #ffffff", -"#B c #ffffff", -"#C c #ffffff", -"#D c #ffffff", -"#E c #ffffff", -"#F c #ffffff", -"#G c #ffffff", -"#H c #ffffff", -"#I c #ffffff", -"#J c #ffffff", -"#K c #ffffff", -"#L c #ffffff", -"#M c #ffffff", -"#N c #ffffff", -"#O c #ffffff", -"#P c #ffffff", -"#Q c #ffffff", -"#R c #ffffff", -"#S c #ffffff", -"#T c #ffffff", -"#U c #ffffff", -"#V c #ffffff", -"#W c #ffffff", -"#X c #ffffff", -"#Y c #ffffff", -"#Z c #ffffff", -"#0 c #ffffff", -"#1 c #ffffff", -"#2 c #ffffff", -"#3 c #ffffff", -"#4 c #ffffff", -"#5 c #ffffff", -"#6 c #ffffff", -"#7 c #ffffff", -"#8 c #ffffff", -"a` c #ffffff", -"a. c #ffffff", -"a# c #ffffff", -"aa c #ffffff", -"ab c #ffffff", -"ac c #ffffff", -"ad c #ffffff", -"ae c #ffffff", -"af c #ffffff", -"ag c #ffffff", -"ah c #ffffff", -"ai c #ffffff", -"aj c #ffffff", -"ak c #ffffff", -"al c #ffffff", -"am c #ffffff", -"an c #ffffff", -"ao c #ffffff", -"ap c #ffffff", -"aq c #ffffff", -"ar c #ffffff", -"as c #ffffff", -"at c #ffffff", -"au c #ffffff", -"av c #ffffff", -"aw c #ffffff", -"ax c #ffffff", -"ay c #ffffff", -"az c #ffffff", -"aA c #ffffff", -"aB c #ffffff", -"aC c #ffffff", -"aD c #ffffff", -"aE c #ffffff", -"aF c #ffffff", -"aG c #ffffff", -"aH c #ffffff", -"aI c #ffffff", -"aJ c #ffffff", -"aK c #ffffff", -"aL c #ffffff", -"aM c #ffffff", -"aN c #ffffff", -"aO c #ffffff", -"aP c #ffffff", -"aQ c #ffffff", -"aR c #ffffff", -"aS c #ffffff", -"aT c #ffffff", -"aU c #ffffff", -"aV c #ffffff", -"aW c #ffffff", -"aX c #ffffff", -"aY c #ffffff", -"aZ c #ffffff", -"a0 c #ffffff", -"a1 c #ffffff", -"a2 c #ffffff", -"a3 c #ffffff", -"a4 c #ffffff", -"a5 c #ffffff", -"a6 c #ffffff", -"a7 c #ffffff", -"a8 c #ffffff", -/* pixels */ -"`g`g`g`g`g`g", -"`g`g`g`g`g`g", -"`g`g`g`g`g`g", -"`g`g`g`g`g`g", -"`g`g`g`g`g`g", -"`g`g`g`g`g`g", -"`g`g`g`g`g`g", -"`g`g`g`g`g`g", -"`g`g`g`g`g`g", -"`g`g`g`g`g`g", -"`g`g`g`g`g`g", -"`g`g`g`g`g`g", -"`g`g`g`g`g`g", -"`g`g`g`g`g`g", -"`g`g`g`g`g`g", -"`g`g`g`g`g`g", -"`g`g`g`g`g`g", -"`g`g`g`g`g`g", -"`g`g`g`g`g`g", -"`g`g`g`g`g`g", -"`g`g`g`g`g`g" -}; +static char * no_guide_xpm[] = { +"6 21 1 1", +" c None", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" "}; diff --git a/etc/tree-widget/default/no-handle.png b/etc/tree-widget/default/no-handle.png Binary files differindex 00de3c09c26..123cf45fa97 100644 --- a/etc/tree-widget/default/no-handle.png +++ b/etc/tree-widget/default/no-handle.png diff --git a/etc/tree-widget/default/no-handle.xpm b/etc/tree-widget/default/no-handle.xpm index 7ce048c91ea..3eaa2daee32 100644 --- a/etc/tree-widget/default/no-handle.xpm +++ b/etc/tree-widget/default/no-handle.xpm @@ -1,284 +1,25 @@ /* XPM */ -static char *no-handle[] = { -/* width height num_colors chars_per_pixel */ -" 10 21 256 2", -/* colors */ -"`` c #000000", -"`. c #84849c", -"`# c #8c8ca5", -"`a c #a5a5c6", -"`b c #ada5c6", -"`c c #b5b5ce", -"`d c #cecee7", -"`e c #ceceff", -"`f c #e7e7ff", -"`g c None", -"`h c #808000", -"`i c #ffffff", -"`j c #ffffff", -"`k c #ffffff", -"`l c #ffffff", -"`m c #ffffff", -"`n c #ffffff", -"`o c #ffffff", -"`p c #ffffff", -"`q c #ffffff", -"`r c #ffffff", -"`s c #ffffff", -"`t c #ffffff", -"`u c #ffffff", -"`v c #ffffff", -"`w c #ffffff", -"`x c #ffffff", -"`y c #ffffff", -"`z c #ffffff", -"`A c #ffffff", -"`B c #ffffff", -"`C c #ffffff", -"`D c #ffffff", -"`E c #ffffff", -"`F c #ffffff", -"`G c #ffffff", -"`H c #ffffff", -"`I c #ffffff", -"`J c #ffffff", -"`K c #ffffff", -"`L c #ffffff", -"`M c #ffffff", -"`N c #ffffff", -"`O c #ffffff", -"`P c #ffffff", -"`Q c #ffffff", -"`R c #ffffff", -"`S c #ffffff", -"`T c #ffffff", -"`U c #ffffff", -"`V c #ffffff", -"`W c #ffffff", -"`X c #ffffff", -"`Y c #ffffff", -"`Z c #ffffff", -"`0 c #ffffff", -"`1 c #ffffff", -"`2 c #ffffff", -"`3 c #ffffff", -"`4 c #ffffff", -"`5 c #ffffff", -"`6 c #ffffff", -"`7 c #ffffff", -"`8 c #ffffff", -".` c #ffffff", -".. c #ffffff", -".# c #ffffff", -".a c #ffffff", -".b c #ffffff", -".c c #ffffff", -".d c #ffffff", -".e c #ffffff", -".f c #ffffff", -".g c #ffffff", -".h c #ffffff", -".i c #ffffff", -".j c #ffffff", -".k c #ffffff", -".l c #ffffff", -".m c #ffffff", -".n c #ffffff", -".o c #ffffff", -".p c #ffffff", -".q c #ffffff", -".r c #ffffff", -".s c #ffffff", -".t c #ffffff", -".u c #ffffff", -".v c #ffffff", -".w c #ffffff", -".x c #ffffff", -".y c #ffffff", -".z c #ffffff", -".A c #ffffff", -".B c #ffffff", -".C c #ffffff", -".D c #ffffff", -".E c #ffffff", -".F c #ffffff", -".G c #ffffff", -".H c #ffffff", -".I c #ffffff", -".J c #ffffff", -".K c #ffffff", -".L c #ffffff", -".M c #ffffff", -".N c #ffffff", -".O c #ffffff", -".P c #ffffff", -".Q c #ffffff", -".R c #ffffff", -".S c #ffffff", -".T c #ffffff", -".U c #ffffff", -".V c #ffffff", -".W c #ffffff", -".X c #ffffff", -".Y c #ffffff", -".Z c #ffffff", -".0 c #ffffff", -".1 c #ffffff", -".2 c #ffffff", -".3 c #ffffff", -".4 c #ffffff", -".5 c #ffffff", -".6 c #ffffff", -".7 c #ffffff", -".8 c #ffffff", -"#` c #ffffff", -"#. c #ffffff", -"## c #ffffff", -"#a c #ffffff", -"#b c #ffffff", -"#c c #ffffff", -"#d c #ffffff", -"#e c #ffffff", -"#f c #ffffff", -"#g c #ffffff", -"#h c #ffffff", -"#i c #ffffff", -"#j c #ffffff", -"#k c #ffffff", -"#l c #ffffff", -"#m c #ffffff", -"#n c #ffffff", -"#o c #ffffff", -"#p c #ffffff", -"#q c #ffffff", -"#r c #ffffff", -"#s c #ffffff", -"#t c #ffffff", -"#u c #ffffff", -"#v c #ffffff", -"#w c #ffffff", -"#x c #ffffff", -"#y c #ffffff", -"#z c #ffffff", -"#A c #ffffff", -"#B c #ffffff", -"#C c #ffffff", -"#D c #ffffff", -"#E c #ffffff", -"#F c #ffffff", -"#G c #ffffff", -"#H c #ffffff", -"#I c #ffffff", -"#J c #ffffff", -"#K c #ffffff", -"#L c #ffffff", -"#M c #ffffff", -"#N c #ffffff", -"#O c #ffffff", -"#P c #ffffff", -"#Q c #ffffff", -"#R c #ffffff", -"#S c #ffffff", -"#T c #ffffff", -"#U c #ffffff", -"#V c #ffffff", -"#W c #ffffff", -"#X c #ffffff", -"#Y c #ffffff", -"#Z c #ffffff", -"#0 c #ffffff", -"#1 c #ffffff", -"#2 c #ffffff", -"#3 c #ffffff", -"#4 c #ffffff", -"#5 c #ffffff", -"#6 c #ffffff", -"#7 c #ffffff", -"#8 c #ffffff", -"a` c #ffffff", -"a. c #ffffff", -"a# c #ffffff", -"aa c #ffffff", -"ab c #ffffff", -"ac c #ffffff", -"ad c #ffffff", -"ae c #ffffff", -"af c #ffffff", -"ag c #ffffff", -"ah c #ffffff", -"ai c #ffffff", -"aj c #ffffff", -"ak c #ffffff", -"al c #ffffff", -"am c #ffffff", -"an c #ffffff", -"ao c #ffffff", -"ap c #ffffff", -"aq c #ffffff", -"ar c #ffffff", -"as c #ffffff", -"at c #ffffff", -"au c #ffffff", -"av c #ffffff", -"aw c #ffffff", -"ax c #ffffff", -"ay c #ffffff", -"az c #ffffff", -"aA c #ffffff", -"aB c #ffffff", -"aC c #ffffff", -"aD c #ffffff", -"aE c #ffffff", -"aF c #ffffff", -"aG c #ffffff", -"aH c #ffffff", -"aI c #ffffff", -"aJ c #ffffff", -"aK c #ffffff", -"aL c #ffffff", -"aM c #ffffff", -"aN c #ffffff", -"aO c #ffffff", -"aP c #ffffff", -"aQ c #ffffff", -"aR c #ffffff", -"aS c #ffffff", -"aT c #ffffff", -"aU c #ffffff", -"aV c #ffffff", -"aW c #ffffff", -"aX c #ffffff", -"aY c #ffffff", -"aZ c #ffffff", -"a0 c #ffffff", -"a1 c #ffffff", -"a2 c #ffffff", -"a3 c #ffffff", -"a4 c #ffffff", -"a5 c #ffffff", -"a6 c #ffffff", -"a7 c #ffffff", -"a8 c #ffffff", -/* pixels */ -"`g`g`g`g`g`g`g`g`g`g", -"`g`g`g`g`g`g`g`g`g`g", -"`g`g`g`g`g`g`g`g`g`g", -"`g`g`g`g`g`g`g`g`g`g", -"`g`g`g`g`g`g`g`g`g`g", -"`g`g`g`g`g`g`g`g`g`g", -"`g`g`g`g`g`g`g`g`g`g", -"`g`g`g`g`g`g`g`g`g`g", -"`g`g`g`g`g`g`g`g`g`g", -"`g`g`g`g`g`g`g`g`g`g", -"`g`g`g`g`g`g`g`g`g`g", -"`g`g`g`g`g`g`g`g`g`g", -"`g`g`g`g`g`g`g`g`g`g", -"`g`g`g`g`g`g`g`g`g`g", -"`g`g`g`g`g`g`g`g`g`g", -"`g`g`g`g`g`g`g`g`g`g", -"`g`g`g`g`g`g`g`g`g`g", -"`g`g`g`g`g`g`g`g`g`g", -"`g`g`g`g`g`g`g`g`g`g", -"`g`g`g`g`g`g`g`g`g`g", -"`g`g`g`g`g`g`g`g`g`g" -}; +static char * no_handle_xpm[] = { +"10 21 1 1", +" c None", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" "}; diff --git a/etc/tree-widget/default/open.png b/etc/tree-widget/default/open.png Binary files differindex d234ecadf39..ea2a8dba00d 100644 --- a/etc/tree-widget/default/open.png +++ b/etc/tree-widget/default/open.png diff --git a/etc/tree-widget/default/open.xpm b/etc/tree-widget/default/open.xpm index 4c5c7b065b8..a216a3f5ab4 100644 --- a/etc/tree-widget/default/open.xpm +++ b/etc/tree-widget/default/open.xpm @@ -1,284 +1,35 @@ /* XPM */ -static char *open[] = { -/* width height num_colors chars_per_pixel */ -" 16 21 256 2", -/* colors */ -"`` c #004200", -"`. c #296329", -"`# c #316331", -"`a c #316b31", -"`b c #396b39", -"`c c #427342", -"`d c #4a734a", -"`e c #4a7b4a", -"`f c #528452", -"`g c #5a845a", -"`h c #a5a5c6", -"`i c None", -"`j c #ffffff", -"`k c #ffffff", -"`l c #ffffff", -"`m c #ffffff", -"`n c #ffffff", -"`o c #ffffff", -"`p c #ffffff", -"`q c #ffffff", -"`r c #ffffff", -"`s c #ffffff", -"`t c #ffffff", -"`u c #ffffff", -"`v c #ffffff", -"`w c #ffffff", -"`x c #ffffff", -"`y c #ffffff", -"`z c #ffffff", -"`A c #ffffff", -"`B c #ffffff", -"`C c #ffffff", -"`D c #ffffff", -"`E c #ffffff", -"`F c #ffffff", -"`G c #ffffff", -"`H c #ffffff", -"`I c #ffffff", -"`J c #ffffff", -"`K c #ffffff", -"`L c #ffffff", -"`M c #ffffff", -"`N c #ffffff", -"`O c #ffffff", -"`P c #ffffff", -"`Q c #ffffff", -"`R c #ffffff", -"`S c #ffffff", -"`T c #ffffff", -"`U c #ffffff", -"`V c #ffffff", -"`W c #ffffff", -"`X c #ffffff", -"`Y c #ffffff", -"`Z c #ffffff", -"`0 c #ffffff", -"`1 c #ffffff", -"`2 c #ffffff", -"`3 c #ffffff", -"`4 c #ffffff", -"`5 c #ffffff", -"`6 c #ffffff", -"`7 c #ffffff", -"`8 c #ffffff", -".` c #ffffff", -".. c #ffffff", -".# c #ffffff", -".a c #ffffff", -".b c #ffffff", -".c c #ffffff", -".d c #ffffff", -".e c #ffffff", -".f c #ffffff", -".g c #ffffff", -".h c #ffffff", -".i c #ffffff", -".j c #ffffff", -".k c #ffffff", -".l c #ffffff", -".m c #ffffff", -".n c #ffffff", -".o c #ffffff", -".p c #ffffff", -".q c #ffffff", -".r c #ffffff", -".s c #ffffff", -".t c #ffffff", -".u c #ffffff", -".v c #ffffff", -".w c #ffffff", -".x c #ffffff", -".y c #ffffff", -".z c #ffffff", -".A c #ffffff", -".B c #ffffff", -".C c #ffffff", -".D c #ffffff", -".E c #ffffff", -".F c #ffffff", -".G c #ffffff", -".H c #ffffff", -".I c #ffffff", -".J c #ffffff", -".K c #ffffff", -".L c #ffffff", -".M c #ffffff", -".N c #ffffff", -".O c #ffffff", -".P c #ffffff", -".Q c #ffffff", -".R c #ffffff", -".S c #ffffff", -".T c #ffffff", -".U c #ffffff", -".V c #ffffff", -".W c #ffffff", -".X c #ffffff", -".Y c #ffffff", -".Z c #ffffff", -".0 c #ffffff", -".1 c #ffffff", -".2 c #ffffff", -".3 c #ffffff", -".4 c #ffffff", -".5 c #ffffff", -".6 c #ffffff", -".7 c #ffffff", -".8 c #ffffff", -"#` c #ffffff", -"#. c #ffffff", -"## c #ffffff", -"#a c #ffffff", -"#b c #ffffff", -"#c c #ffffff", -"#d c #ffffff", -"#e c #ffffff", -"#f c #ffffff", -"#g c #ffffff", -"#h c #ffffff", -"#i c #ffffff", -"#j c #ffffff", -"#k c #ffffff", -"#l c #ffffff", -"#m c #ffffff", -"#n c #ffffff", -"#o c #ffffff", -"#p c #ffffff", -"#q c #ffffff", -"#r c #ffffff", -"#s c #ffffff", -"#t c #ffffff", -"#u c #ffffff", -"#v c #ffffff", -"#w c #ffffff", -"#x c #ffffff", -"#y c #ffffff", -"#z c #ffffff", -"#A c #ffffff", -"#B c #ffffff", -"#C c #ffffff", -"#D c #ffffff", -"#E c #ffffff", -"#F c #ffffff", -"#G c #ffffff", -"#H c #ffffff", -"#I c #ffffff", -"#J c #ffffff", -"#K c #ffffff", -"#L c #ffffff", -"#M c #ffffff", -"#N c #ffffff", -"#O c #ffffff", -"#P c #ffffff", -"#Q c #ffffff", -"#R c #ffffff", -"#S c #ffffff", -"#T c #ffffff", -"#U c #ffffff", -"#V c #ffffff", -"#W c #ffffff", -"#X c #ffffff", -"#Y c #ffffff", -"#Z c #ffffff", -"#0 c #ffffff", -"#1 c #ffffff", -"#2 c #ffffff", -"#3 c #ffffff", -"#4 c #ffffff", -"#5 c #ffffff", -"#6 c #ffffff", -"#7 c #ffffff", -"#8 c #ffffff", -"a` c #ffffff", -"a. c #ffffff", -"a# c #ffffff", -"aa c #ffffff", -"ab c #ffffff", -"ac c #ffffff", -"ad c #ffffff", -"ae c #ffffff", -"af c #ffffff", -"ag c #ffffff", -"ah c #ffffff", -"ai c #ffffff", -"aj c #ffffff", -"ak c #ffffff", -"al c #ffffff", -"am c #ffffff", -"an c #ffffff", -"ao c #ffffff", -"ap c #ffffff", -"aq c #ffffff", -"ar c #ffffff", -"as c #ffffff", -"at c #ffffff", -"au c #ffffff", -"av c #ffffff", -"aw c #ffffff", -"ax c #ffffff", -"ay c #ffffff", -"az c #ffffff", -"aA c #ffffff", -"aB c #ffffff", -"aC c #ffffff", -"aD c #ffffff", -"aE c #ffffff", -"aF c #ffffff", -"aG c #ffffff", -"aH c #ffffff", -"aI c #ffffff", -"aJ c #ffffff", -"aK c #ffffff", -"aL c #ffffff", -"aM c #ffffff", -"aN c #ffffff", -"aO c #ffffff", -"aP c #ffffff", -"aQ c #ffffff", -"aR c #ffffff", -"aS c #ffffff", -"aT c #ffffff", -"aU c #ffffff", -"aV c #ffffff", -"aW c #ffffff", -"aX c #ffffff", -"aY c #ffffff", -"aZ c #ffffff", -"a0 c #ffffff", -"a1 c #ffffff", -"a2 c #ffffff", -"a3 c #ffffff", -"a4 c #ffffff", -"a5 c #ffffff", -"a6 c #ffffff", -"a7 c #ffffff", -"a8 c #ffffff", -/* pixels */ -"`i`i`i`i`i`i`i`i`i`i`i`i`i`i`i`i", -"`i`i`i`i`i`i`i`i`i`i`i`i`i`i`i`i", -"`i`i`i`i`i`i`i`i`i`i`i`i`i`i`i`i", -"`i`i`i`i`i`i`i`i`i`i`i`i`i`i`i`i", -"`i`i`i`i`i`i`i`i`i`i`i`i`i`i`i`i", -"`i`i`i`i```````i`i`i`i`i`i`i`i`i", -"`i`i`i`````.`````i`i`i`i`i`i`i`i", -"`i`i`````.`#`b`````i`i`i`i`i`i`i", -"`i`````.`#`b`b`c`````i`i`i`i`i`i", -"`````.`#`b`b`c`d`e`````i`i`i`i`i", -"```.`#`b`b`c`d`e`f`g```i`i`i`i`i", -"`````b`b`c`d`e`f`g`````i`i`i`i`i", -"`i`````c`d`e`f`g`````i`i`i`i`i`i", -"`i`i`````e`f`g`````i`i`i`i`i`i`i", -"`i`i`i`````g`````i`i`i`i`i`i`i`i", -"`i`i`i`i```````i`i`i`i`i`i`i`i`i", -"`i`i`i`i`i`h`i`i`i`i`i`i`i`i`i`i", -"`i`i`i`i`i`h`i`i`i`i`i`i`i`i`i`i", -"`i`i`i`i`i`h`i`i`i`i`i`i`i`i`i`i", -"`i`i`i`i`i`h`i`i`i`i`i`i`i`i`i`i", -"`i`i`i`i`i`h`i`i`i`i`i`i`i`i`i`i" -}; +static char * open_xpm[] = { +"16 21 11 1", +" c None", +". c #004200", +"+ c #296329", +"@ c #316331", +"# c #396B39", +"$ c #427342", +"% c #4A734A", +"& c #4A7B4A", +"* c #528452", +"= c #5A845A", +"- c #A5A5C6", +" ", +" ", +" ", +" ", +" ", +" ... ", +" ..+.. ", +" ..+@#.. ", +" ..+@##$.. ", +"..+@##$%&.. ", +".+@##$%&*=. ", +"..##$%&*=.. ", +" ..$%&*=.. ", +" ..&*=.. ", +" ..=.. ", +" ... ", +" - ", +" - ", +" - ", +" - ", +" - "}; diff --git a/etc/tree-widget/folder/close.png b/etc/tree-widget/folder/close.png Binary files differindex f840ba89a4e..3a509b095f8 100644 --- a/etc/tree-widget/folder/close.png +++ b/etc/tree-widget/folder/close.png diff --git a/etc/tree-widget/folder/close.xpm b/etc/tree-widget/folder/close.xpm index 1bd40ae6e94..116c1db37d8 100644 --- a/etc/tree-widget/folder/close.xpm +++ b/etc/tree-widget/folder/close.xpm @@ -1,285 +1,40 @@ /* XPM */ -static char *close[] = { -/* width height num_colors chars_per_pixel */ -" 16 22 256 2", -/* colors */ -"`` c #848400", -"`. c #9c9c29", -"`# c #a5a531", -"`a c #adad39", -"`b c #adad42", -"`c c #b5b54a", -"`d c #b5b552", -"`e c #bdbd52", -"`f c #bdbd5a", -"`g c #c6c663", -"`h c #c6c66b", -"`i c #cece6b", -"`j c #cece73", -"`k c #dede8c", -"`l c #e7e794", -"`m c #e7e79c", -"`n c #efef9c", -"`o c None", -"`p c #ffffff", -"`q c #ffffff", -"`r c #ffffff", -"`s c #ffffff", -"`t c #ffffff", -"`u c #ffffff", -"`v c #ffffff", -"`w c #ffffff", -"`x c #ffffff", -"`y c #ffffff", -"`z c #ffffff", -"`A c #ffffff", -"`B c #ffffff", -"`C c #ffffff", -"`D c #ffffff", -"`E c #ffffff", -"`F c #ffffff", -"`G c #ffffff", -"`H c #ffffff", -"`I c #ffffff", -"`J c #ffffff", -"`K c #ffffff", -"`L c #ffffff", -"`M c #ffffff", -"`N c #ffffff", -"`O c #ffffff", -"`P c #ffffff", -"`Q c #ffffff", -"`R c #ffffff", -"`S c #ffffff", -"`T c #ffffff", -"`U c #ffffff", -"`V c #ffffff", -"`W c #ffffff", -"`X c #ffffff", -"`Y c #ffffff", -"`Z c #ffffff", -"`0 c #ffffff", -"`1 c #ffffff", -"`2 c #ffffff", -"`3 c #ffffff", -"`4 c #ffffff", -"`5 c #ffffff", -"`6 c #ffffff", -"`7 c #ffffff", -"`8 c #ffffff", -".` c #ffffff", -".. c #ffffff", -".# c #ffffff", -".a c #ffffff", -".b c #ffffff", -".c c #ffffff", -".d c #ffffff", -".e c #ffffff", -".f c #ffffff", -".g c #ffffff", -".h c #ffffff", -".i c #ffffff", -".j c #ffffff", -".k c #ffffff", -".l c #ffffff", -".m c #ffffff", -".n c #ffffff", -".o c #ffffff", -".p c #ffffff", -".q c #ffffff", -".r c #ffffff", -".s c #ffffff", -".t c #ffffff", -".u c #ffffff", -".v c #ffffff", -".w c #ffffff", -".x c #ffffff", -".y c #ffffff", -".z c #ffffff", -".A c #ffffff", -".B c #ffffff", -".C c #ffffff", -".D c #ffffff", -".E c #ffffff", -".F c #ffffff", -".G c #ffffff", -".H c #ffffff", -".I c #ffffff", -".J c #ffffff", -".K c #ffffff", -".L c #ffffff", -".M c #ffffff", -".N c #ffffff", -".O c #ffffff", -".P c #ffffff", -".Q c #ffffff", -".R c #ffffff", -".S c #ffffff", -".T c #ffffff", -".U c #ffffff", -".V c #ffffff", -".W c #ffffff", -".X c #ffffff", -".Y c #ffffff", -".Z c #ffffff", -".0 c #ffffff", -".1 c #ffffff", -".2 c #ffffff", -".3 c #ffffff", -".4 c #ffffff", -".5 c #ffffff", -".6 c #ffffff", -".7 c #ffffff", -".8 c #ffffff", -"#` c #ffffff", -"#. c #ffffff", -"## c #ffffff", -"#a c #ffffff", -"#b c #ffffff", -"#c c #ffffff", -"#d c #ffffff", -"#e c #ffffff", -"#f c #ffffff", -"#g c #ffffff", -"#h c #ffffff", -"#i c #ffffff", -"#j c #ffffff", -"#k c #ffffff", -"#l c #ffffff", -"#m c #ffffff", -"#n c #ffffff", -"#o c #ffffff", -"#p c #ffffff", -"#q c #ffffff", -"#r c #ffffff", -"#s c #ffffff", -"#t c #ffffff", -"#u c #ffffff", -"#v c #ffffff", -"#w c #ffffff", -"#x c #ffffff", -"#y c #ffffff", -"#z c #ffffff", -"#A c #ffffff", -"#B c #ffffff", -"#C c #ffffff", -"#D c #ffffff", -"#E c #ffffff", -"#F c #ffffff", -"#G c #ffffff", -"#H c #ffffff", -"#I c #ffffff", -"#J c #ffffff", -"#K c #ffffff", -"#L c #ffffff", -"#M c #ffffff", -"#N c #ffffff", -"#O c #ffffff", -"#P c #ffffff", -"#Q c #ffffff", -"#R c #ffffff", -"#S c #ffffff", -"#T c #ffffff", -"#U c #ffffff", -"#V c #ffffff", -"#W c #ffffff", -"#X c #ffffff", -"#Y c #ffffff", -"#Z c #ffffff", -"#0 c #ffffff", -"#1 c #ffffff", -"#2 c #ffffff", -"#3 c #ffffff", -"#4 c #ffffff", -"#5 c #ffffff", -"#6 c #ffffff", -"#7 c #ffffff", -"#8 c #ffffff", -"a` c #ffffff", -"a. c #ffffff", -"a# c #ffffff", -"aa c #ffffff", -"ab c #ffffff", -"ac c #ffffff", -"ad c #ffffff", -"ae c #ffffff", -"af c #ffffff", -"ag c #ffffff", -"ah c #ffffff", -"ai c #ffffff", -"aj c #ffffff", -"ak c #ffffff", -"al c #ffffff", -"am c #ffffff", -"an c #ffffff", -"ao c #ffffff", -"ap c #ffffff", -"aq c #ffffff", -"ar c #ffffff", -"as c #ffffff", -"at c #ffffff", -"au c #ffffff", -"av c #ffffff", -"aw c #ffffff", -"ax c #ffffff", -"ay c #ffffff", -"az c #ffffff", -"aA c #ffffff", -"aB c #ffffff", -"aC c #ffffff", -"aD c #ffffff", -"aE c #ffffff", -"aF c #ffffff", -"aG c #ffffff", -"aH c #ffffff", -"aI c #ffffff", -"aJ c #ffffff", -"aK c #ffffff", -"aL c #ffffff", -"aM c #ffffff", -"aN c #ffffff", -"aO c #ffffff", -"aP c #ffffff", -"aQ c #ffffff", -"aR c #ffffff", -"aS c #ffffff", -"aT c #ffffff", -"aU c #ffffff", -"aV c #ffffff", -"aW c #ffffff", -"aX c #ffffff", -"aY c #ffffff", -"aZ c #ffffff", -"a0 c #ffffff", -"a1 c #ffffff", -"a2 c #ffffff", -"a3 c #ffffff", -"a4 c #ffffff", -"a5 c #ffffff", -"a6 c #ffffff", -"a7 c #ffffff", -"a8 c #ffffff", -/* pixels */ -"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o", -"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o", -"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o", -"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o", -"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o", -"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o", -"`o`````````o`o`o`o`o`o`o`o`o`o`o", -"```m`l`l`k```````````````o`o`o`o", -"```````````a`b`b`c`c`d`f```o`o`o", -"```.`#`#`a`b`b`c`c`d`f`f```o`o`o", -"```#`#`a`b`b`c`c`d`f`f`f```o`o`o", -"```#`a`b`b`c`c`d`f`f`f`g```o`o`o", -"```a`b`b`c`c`d`f`f`f`g`h```o`o`o", -"```b`b`c`c`d`f`f`f`g`h`h```o`o`o", -"```b`c`c`d`f`f`f`g`h`h`j```o`o`o", -"```````````````````````````o`o`o", -"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o", -"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o", -"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o", -"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o", -"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o", -"`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o`o" -}; +static char * close_xpm[] = { +"16 22 15 1", +" c None", +". c #848400", +"+ c #E7E79C", +"@ c #E7E794", +"# c #DEDE8C", +"$ c #ADAD39", +"% c #ADAD42", +"& c #B5B54A", +"* c #B5B552", +"= c #BDBD5A", +"- c #9C9C29", +"; c #A5A531", +"> c #C6C663", +", c #C6C66B", +"' c #CECE73", +" ", +" ", +" ", +" ", +" ", +" ", +" .... ", +".+@@#....... ", +".....$%%&&*=. ", +".-;;$%%&&*==. ", +".;;$%%&&*===. ", +".;$%%&&*===>. ", +".$%%&&*===>,. ", +".%%&&*===>,,. ", +".%&&*===>,,'. ", +"............. ", +" ", +" ", +" ", +" ", +" ", +" "}; diff --git a/etc/tree-widget/folder/empty.png b/etc/tree-widget/folder/empty.png Binary files differindex 712af9747c6..3f89471828d 100644 --- a/etc/tree-widget/folder/empty.png +++ b/etc/tree-widget/folder/empty.png diff --git a/etc/tree-widget/folder/empty.xpm b/etc/tree-widget/folder/empty.xpm index df92fd22008..598401ab413 100644 --- a/etc/tree-widget/folder/empty.xpm +++ b/etc/tree-widget/folder/empty.xpm @@ -1,285 +1,35 @@ /* XPM */ -static char *empty[] = { -/* width height num_colors chars_per_pixel */ -" 16 22 256 2", -/* colors */ -"`` c #424242", -"`. c #6b6b6b", -"`# c #737373", -"`a c #7b7b7b", -"`b c #848484", -"`c c #8c8c8c", -"`d c #949494", -"`e c #9c9c9c", -"`f c #a5a5a5", -"`g c #adadad", -"`h c None", -"`i c #ffffff", -"`j c #ffffff", -"`k c #ffffff", -"`l c #ffffff", -"`m c #ffffff", -"`n c #ffffff", -"`o c #ffffff", -"`p c #ffffff", -"`q c #ffffff", -"`r c #ffffff", -"`s c #ffffff", -"`t c #ffffff", -"`u c #ffffff", -"`v c #ffffff", -"`w c #ffffff", -"`x c #ffffff", -"`y c #ffffff", -"`z c #ffffff", -"`A c #ffffff", -"`B c #ffffff", -"`C c #ffffff", -"`D c #ffffff", -"`E c #ffffff", -"`F c #ffffff", -"`G c #ffffff", -"`H c #ffffff", -"`I c #ffffff", -"`J c #ffffff", -"`K c #ffffff", -"`L c #ffffff", -"`M c #ffffff", -"`N c #ffffff", -"`O c #ffffff", -"`P c #ffffff", -"`Q c #ffffff", -"`R c #ffffff", -"`S c #ffffff", -"`T c #ffffff", -"`U c #ffffff", -"`V c #ffffff", -"`W c #ffffff", -"`X c #ffffff", -"`Y c #ffffff", -"`Z c #ffffff", -"`0 c #ffffff", -"`1 c #ffffff", -"`2 c #ffffff", -"`3 c #ffffff", -"`4 c #ffffff", -"`5 c #ffffff", -"`6 c #ffffff", -"`7 c #ffffff", -"`8 c #ffffff", -".` c #ffffff", -".. c #ffffff", -".# c #ffffff", -".a c #ffffff", -".b c #ffffff", -".c c #ffffff", -".d c #ffffff", -".e c #ffffff", -".f c #ffffff", -".g c #ffffff", -".h c #ffffff", -".i c #ffffff", -".j c #ffffff", -".k c #ffffff", -".l c #ffffff", -".m c #ffffff", -".n c #ffffff", -".o c #ffffff", -".p c #ffffff", -".q c #ffffff", -".r c #ffffff", -".s c #ffffff", -".t c #ffffff", -".u c #ffffff", -".v c #ffffff", -".w c #ffffff", -".x c #ffffff", -".y c #ffffff", -".z c #ffffff", -".A c #ffffff", -".B c #ffffff", -".C c #ffffff", -".D c #ffffff", -".E c #ffffff", -".F c #ffffff", -".G c #ffffff", -".H c #ffffff", -".I c #ffffff", -".J c #ffffff", -".K c #ffffff", -".L c #ffffff", -".M c #ffffff", -".N c #ffffff", -".O c #ffffff", -".P c #ffffff", -".Q c #ffffff", -".R c #ffffff", -".S c #ffffff", -".T c #ffffff", -".U c #ffffff", -".V c #ffffff", -".W c #ffffff", -".X c #ffffff", -".Y c #ffffff", -".Z c #ffffff", -".0 c #ffffff", -".1 c #ffffff", -".2 c #ffffff", -".3 c #ffffff", -".4 c #ffffff", -".5 c #ffffff", -".6 c #ffffff", -".7 c #ffffff", -".8 c #ffffff", -"#` c #ffffff", -"#. c #ffffff", -"## c #ffffff", -"#a c #ffffff", -"#b c #ffffff", -"#c c #ffffff", -"#d c #ffffff", -"#e c #ffffff", -"#f c #ffffff", -"#g c #ffffff", -"#h c #ffffff", -"#i c #ffffff", -"#j c #ffffff", -"#k c #ffffff", -"#l c #ffffff", -"#m c #ffffff", -"#n c #ffffff", -"#o c #ffffff", -"#p c #ffffff", -"#q c #ffffff", -"#r c #ffffff", -"#s c #ffffff", -"#t c #ffffff", -"#u c #ffffff", -"#v c #ffffff", -"#w c #ffffff", -"#x c #ffffff", -"#y c #ffffff", -"#z c #ffffff", -"#A c #ffffff", -"#B c #ffffff", -"#C c #ffffff", -"#D c #ffffff", -"#E c #ffffff", -"#F c #ffffff", -"#G c #ffffff", -"#H c #ffffff", -"#I c #ffffff", -"#J c #ffffff", -"#K c #ffffff", -"#L c #ffffff", -"#M c #ffffff", -"#N c #ffffff", -"#O c #ffffff", -"#P c #ffffff", -"#Q c #ffffff", -"#R c #ffffff", -"#S c #ffffff", -"#T c #ffffff", -"#U c #ffffff", -"#V c #ffffff", -"#W c #ffffff", -"#X c #ffffff", -"#Y c #ffffff", -"#Z c #ffffff", -"#0 c #ffffff", -"#1 c #ffffff", -"#2 c #ffffff", -"#3 c #ffffff", -"#4 c #ffffff", -"#5 c #ffffff", -"#6 c #ffffff", -"#7 c #ffffff", -"#8 c #ffffff", -"a` c #ffffff", -"a. c #ffffff", -"a# c #ffffff", -"aa c #ffffff", -"ab c #ffffff", -"ac c #ffffff", -"ad c #ffffff", -"ae c #ffffff", -"af c #ffffff", -"ag c #ffffff", -"ah c #ffffff", -"ai c #ffffff", -"aj c #ffffff", -"ak c #ffffff", -"al c #ffffff", -"am c #ffffff", -"an c #ffffff", -"ao c #ffffff", -"ap c #ffffff", -"aq c #ffffff", -"ar c #ffffff", -"as c #ffffff", -"at c #ffffff", -"au c #ffffff", -"av c #ffffff", -"aw c #ffffff", -"ax c #ffffff", -"ay c #ffffff", -"az c #ffffff", -"aA c #ffffff", -"aB c #ffffff", -"aC c #ffffff", -"aD c #ffffff", -"aE c #ffffff", -"aF c #ffffff", -"aG c #ffffff", -"aH c #ffffff", -"aI c #ffffff", -"aJ c #ffffff", -"aK c #ffffff", -"aL c #ffffff", -"aM c #ffffff", -"aN c #ffffff", -"aO c #ffffff", -"aP c #ffffff", -"aQ c #ffffff", -"aR c #ffffff", -"aS c #ffffff", -"aT c #ffffff", -"aU c #ffffff", -"aV c #ffffff", -"aW c #ffffff", -"aX c #ffffff", -"aY c #ffffff", -"aZ c #ffffff", -"a0 c #ffffff", -"a1 c #ffffff", -"a2 c #ffffff", -"a3 c #ffffff", -"a4 c #ffffff", -"a5 c #ffffff", -"a6 c #ffffff", -"a7 c #ffffff", -"a8 c #ffffff", -/* pixels */ -"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h", -"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h", -"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h", -"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h", -"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h", -"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h", -"`h`````````h`h`h`h`h`h`h`h`h`h`h", -"```f`f`f`e```````````h`h`h`h`h`h", -"```f`f`e`e`e`d`d`c`c```h`h`h`h`h", -"```f`e`````````````````````h`h`h", -"```e```.`.`.`#`#`#`a`a`b`b```h`h", -"```e```.`.`#`#`#`a`a`b`b```h`h`h", -"`````.`.`#`#`#`a`a`b`b`b```h`h`h", -"`````.`#`#`#`a`a`b`b`b```h`h`h`h", -"```.`#`#`#`a`a`b`b`b`c```h`h`h`h", -"```````````````````````h`h`h`h`h", -"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h", -"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h", -"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h", -"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h", -"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h", -"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h" -}; +static char * empty_xpm[] = { +"16 22 10 1", +" c None", +". c #424242", +"+ c #A5A5A5", +"@ c #9C9C9C", +"# c #949494", +"$ c #8C8C8C", +"% c #6B6B6B", +"& c #737373", +"* c #7B7B7B", +"= c #848484", +" ", +" ", +" ", +" ", +" ", +" ", +" .... ", +".+++@..... ", +".++@@@##$$. ", +".+@.......... ", +".@.%%%&&&**==. ", +".@.%%&&&**==. ", +"..%%&&&**===. ", +"..%&&&**===. ", +".%&&&**===$. ", +"........... ", +" ", +" ", +" ", +" ", +" ", +" "}; diff --git a/etc/tree-widget/folder/end-guide.png b/etc/tree-widget/folder/end-guide.png Binary files differindex 994c8bbf10a..b1290f31e6f 100644 --- a/etc/tree-widget/folder/end-guide.png +++ b/etc/tree-widget/folder/end-guide.png diff --git a/etc/tree-widget/folder/end-guide.xpm b/etc/tree-widget/folder/end-guide.xpm index 3cdb2332c55..6788538c7ab 100644 --- a/etc/tree-widget/folder/end-guide.xpm +++ b/etc/tree-widget/folder/end-guide.xpm @@ -1,285 +1,27 @@ /* XPM */ -static char *end-guide[] = { -/* width height num_colors chars_per_pixel */ -" 6 22 256 2", -/* colors */ -"`` c #ada5c6", -"`. c None", -"`# c #ffffff", -"`a c #ffffff", -"`b c #ffffff", -"`c c #ffffff", -"`d c #ffffff", -"`e c #ffffff", -"`f c #ffffff", -"`g c #ffffff", -"`h c #ffffff", -"`i c #ffffff", -"`j c #ffffff", -"`k c #ffffff", -"`l c #ffffff", -"`m c #ffffff", -"`n c #ffffff", -"`o c #ffffff", -"`p c #ffffff", -"`q c #ffffff", -"`r c #ffffff", -"`s c #ffffff", -"`t c #ffffff", -"`u c #ffffff", -"`v c #ffffff", -"`w c #ffffff", -"`x c #ffffff", -"`y c #ffffff", -"`z c #ffffff", -"`A c #ffffff", -"`B c #ffffff", -"`C c #ffffff", -"`D c #ffffff", -"`E c #ffffff", -"`F c #ffffff", -"`G c #ffffff", -"`H c #ffffff", -"`I c #ffffff", -"`J c #ffffff", -"`K c #ffffff", -"`L c #ffffff", -"`M c #ffffff", -"`N c #ffffff", -"`O c #ffffff", -"`P c #ffffff", -"`Q c #ffffff", -"`R c #ffffff", -"`S c #ffffff", -"`T c #ffffff", -"`U c #ffffff", -"`V c #ffffff", -"`W c #ffffff", -"`X c #ffffff", -"`Y c #ffffff", -"`Z c #ffffff", -"`0 c #ffffff", -"`1 c #ffffff", -"`2 c #ffffff", -"`3 c #ffffff", -"`4 c #ffffff", -"`5 c #ffffff", -"`6 c #ffffff", -"`7 c #ffffff", -"`8 c #ffffff", -".` c #ffffff", -".. c #ffffff", -".# c #ffffff", -".a c #ffffff", -".b c #ffffff", -".c c #ffffff", -".d c #ffffff", -".e c #ffffff", -".f c #ffffff", -".g c #ffffff", -".h c #ffffff", -".i c #ffffff", -".j c #ffffff", -".k c #ffffff", -".l c #ffffff", -".m c #ffffff", -".n c #ffffff", -".o c #ffffff", -".p c #ffffff", -".q c #ffffff", -".r c #ffffff", -".s c #ffffff", -".t c #ffffff", -".u c #ffffff", -".v c #ffffff", -".w c #ffffff", -".x c #ffffff", -".y c #ffffff", -".z c #ffffff", -".A c #ffffff", -".B c #ffffff", -".C c #ffffff", -".D c #ffffff", -".E c #ffffff", -".F c #ffffff", -".G c #ffffff", -".H c #ffffff", -".I c #ffffff", -".J c #ffffff", -".K c #ffffff", -".L c #ffffff", -".M c #ffffff", -".N c #ffffff", -".O c #ffffff", -".P c #ffffff", -".Q c #ffffff", -".R c #ffffff", -".S c #ffffff", -".T c #ffffff", -".U c #ffffff", -".V c #ffffff", -".W c #ffffff", -".X c #ffffff", -".Y c #ffffff", -".Z c #ffffff", -".0 c #ffffff", -".1 c #ffffff", -".2 c #ffffff", -".3 c #ffffff", -".4 c #ffffff", -".5 c #ffffff", -".6 c #ffffff", -".7 c #ffffff", -".8 c #ffffff", -"#` c #ffffff", -"#. c #ffffff", -"## c #ffffff", -"#a c #ffffff", -"#b c #ffffff", -"#c c #ffffff", -"#d c #ffffff", -"#e c #ffffff", -"#f c #ffffff", -"#g c #ffffff", -"#h c #ffffff", -"#i c #ffffff", -"#j c #ffffff", -"#k c #ffffff", -"#l c #ffffff", -"#m c #ffffff", -"#n c #ffffff", -"#o c #ffffff", -"#p c #ffffff", -"#q c #ffffff", -"#r c #ffffff", -"#s c #ffffff", -"#t c #ffffff", -"#u c #ffffff", -"#v c #ffffff", -"#w c #ffffff", -"#x c #ffffff", -"#y c #ffffff", -"#z c #ffffff", -"#A c #ffffff", -"#B c #ffffff", -"#C c #ffffff", -"#D c #ffffff", -"#E c #ffffff", -"#F c #ffffff", -"#G c #ffffff", -"#H c #ffffff", -"#I c #ffffff", -"#J c #ffffff", -"#K c #ffffff", -"#L c #ffffff", -"#M c #ffffff", -"#N c #ffffff", -"#O c #ffffff", -"#P c #ffffff", -"#Q c #ffffff", -"#R c #ffffff", -"#S c #ffffff", -"#T c #ffffff", -"#U c #ffffff", -"#V c #ffffff", -"#W c #ffffff", -"#X c #ffffff", -"#Y c #ffffff", -"#Z c #ffffff", -"#0 c #ffffff", -"#1 c #ffffff", -"#2 c #ffffff", -"#3 c #ffffff", -"#4 c #ffffff", -"#5 c #ffffff", -"#6 c #ffffff", -"#7 c #ffffff", -"#8 c #ffffff", -"a` c #ffffff", -"a. c #ffffff", -"a# c #ffffff", -"aa c #ffffff", -"ab c #ffffff", -"ac c #ffffff", -"ad c #ffffff", -"ae c #ffffff", -"af c #ffffff", -"ag c #ffffff", -"ah c #ffffff", -"ai c #ffffff", -"aj c #ffffff", -"ak c #ffffff", -"al c #ffffff", -"am c #ffffff", -"an c #ffffff", -"ao c #ffffff", -"ap c #ffffff", -"aq c #ffffff", -"ar c #ffffff", -"as c #ffffff", -"at c #ffffff", -"au c #ffffff", -"av c #ffffff", -"aw c #ffffff", -"ax c #ffffff", -"ay c #ffffff", -"az c #ffffff", -"aA c #ffffff", -"aB c #ffffff", -"aC c #ffffff", -"aD c #ffffff", -"aE c #ffffff", -"aF c #ffffff", -"aG c #ffffff", -"aH c #ffffff", -"aI c #ffffff", -"aJ c #ffffff", -"aK c #ffffff", -"aL c #ffffff", -"aM c #ffffff", -"aN c #ffffff", -"aO c #ffffff", -"aP c #ffffff", -"aQ c #ffffff", -"aR c #ffffff", -"aS c #ffffff", -"aT c #ffffff", -"aU c #ffffff", -"aV c #ffffff", -"aW c #ffffff", -"aX c #ffffff", -"aY c #ffffff", -"aZ c #ffffff", -"a0 c #ffffff", -"a1 c #ffffff", -"a2 c #ffffff", -"a3 c #ffffff", -"a4 c #ffffff", -"a5 c #ffffff", -"a6 c #ffffff", -"a7 c #ffffff", -"a8 c #ffffff", -/* pixels */ -"`.`.`.`.`.`.", -"`.`.`.`.`.``", -"`.`.`.`.`.`.", -"`.`.`.`.`.``", -"`.`.`.`.`.`.", -"`.`.`.`.`.``", -"`.`.`.`.`.`.", -"`.`.`.`.`.``", -"`.`.`.`.`.`.", -"`.`.`.`.`.``", -"`.`.`.`.`.`.", -"`.`.`.`.`.``", -"`.`.`.`.`.`.", -"`.`.`.`.`.`.", -"`.`.`.`.`.`.", -"`.`.`.`.`.`.", -"`.`.`.`.`.`.", -"`.`.`.`.`.`.", -"`.`.`.`.`.`.", -"`.`.`.`.`.`.", -"`.`.`.`.`.`.", -"`.`.`.`.`.`." -}; +static char * end_guide_xpm[] = { +"6 22 2 1", +" c None", +". c #ADA5C6", +" ", +" .", +" ", +" .", +" ", +" .", +" ", +" .", +" ", +" .", +" ", +" .", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" "}; diff --git a/etc/tree-widget/folder/guide.png b/etc/tree-widget/folder/guide.png Binary files differindex 5a4d4f0b751..8535f86f3bf 100644 --- a/etc/tree-widget/folder/guide.png +++ b/etc/tree-widget/folder/guide.png diff --git a/etc/tree-widget/folder/guide.xpm b/etc/tree-widget/folder/guide.xpm index 5d23ef64eeb..647d0590173 100644 --- a/etc/tree-widget/folder/guide.xpm +++ b/etc/tree-widget/folder/guide.xpm @@ -1,285 +1,27 @@ /* XPM */ -static char *guide[] = { -/* width height num_colors chars_per_pixel */ -" 6 22 256 2", -/* colors */ -"`` c #ada5c6", -"`. c None", -"`# c #ffffff", -"`a c #ffffff", -"`b c #ffffff", -"`c c #ffffff", -"`d c #ffffff", -"`e c #ffffff", -"`f c #ffffff", -"`g c #ffffff", -"`h c #ffffff", -"`i c #ffffff", -"`j c #ffffff", -"`k c #ffffff", -"`l c #ffffff", -"`m c #ffffff", -"`n c #ffffff", -"`o c #ffffff", -"`p c #ffffff", -"`q c #ffffff", -"`r c #ffffff", -"`s c #ffffff", -"`t c #ffffff", -"`u c #ffffff", -"`v c #ffffff", -"`w c #ffffff", -"`x c #ffffff", -"`y c #ffffff", -"`z c #ffffff", -"`A c #ffffff", -"`B c #ffffff", -"`C c #ffffff", -"`D c #ffffff", -"`E c #ffffff", -"`F c #ffffff", -"`G c #ffffff", -"`H c #ffffff", -"`I c #ffffff", -"`J c #ffffff", -"`K c #ffffff", -"`L c #ffffff", -"`M c #ffffff", -"`N c #ffffff", -"`O c #ffffff", -"`P c #ffffff", -"`Q c #ffffff", -"`R c #ffffff", -"`S c #ffffff", -"`T c #ffffff", -"`U c #ffffff", -"`V c #ffffff", -"`W c #ffffff", -"`X c #ffffff", -"`Y c #ffffff", -"`Z c #ffffff", -"`0 c #ffffff", -"`1 c #ffffff", -"`2 c #ffffff", -"`3 c #ffffff", -"`4 c #ffffff", -"`5 c #ffffff", -"`6 c #ffffff", -"`7 c #ffffff", -"`8 c #ffffff", -".` c #ffffff", -".. c #ffffff", -".# c #ffffff", -".a c #ffffff", -".b c #ffffff", -".c c #ffffff", -".d c #ffffff", -".e c #ffffff", -".f c #ffffff", -".g c #ffffff", -".h c #ffffff", -".i c #ffffff", -".j c #ffffff", -".k c #ffffff", -".l c #ffffff", -".m c #ffffff", -".n c #ffffff", -".o c #ffffff", -".p c #ffffff", -".q c #ffffff", -".r c #ffffff", -".s c #ffffff", -".t c #ffffff", -".u c #ffffff", -".v c #ffffff", -".w c #ffffff", -".x c #ffffff", -".y c #ffffff", -".z c #ffffff", -".A c #ffffff", -".B c #ffffff", -".C c #ffffff", -".D c #ffffff", -".E c #ffffff", -".F c #ffffff", -".G c #ffffff", -".H c #ffffff", -".I c #ffffff", -".J c #ffffff", -".K c #ffffff", -".L c #ffffff", -".M c #ffffff", -".N c #ffffff", -".O c #ffffff", -".P c #ffffff", -".Q c #ffffff", -".R c #ffffff", -".S c #ffffff", -".T c #ffffff", -".U c #ffffff", -".V c #ffffff", -".W c #ffffff", -".X c #ffffff", -".Y c #ffffff", -".Z c #ffffff", -".0 c #ffffff", -".1 c #ffffff", -".2 c #ffffff", -".3 c #ffffff", -".4 c #ffffff", -".5 c #ffffff", -".6 c #ffffff", -".7 c #ffffff", -".8 c #ffffff", -"#` c #ffffff", -"#. c #ffffff", -"## c #ffffff", -"#a c #ffffff", -"#b c #ffffff", -"#c c #ffffff", -"#d c #ffffff", -"#e c #ffffff", -"#f c #ffffff", -"#g c #ffffff", -"#h c #ffffff", -"#i c #ffffff", -"#j c #ffffff", -"#k c #ffffff", -"#l c #ffffff", -"#m c #ffffff", -"#n c #ffffff", -"#o c #ffffff", -"#p c #ffffff", -"#q c #ffffff", -"#r c #ffffff", -"#s c #ffffff", -"#t c #ffffff", -"#u c #ffffff", -"#v c #ffffff", -"#w c #ffffff", -"#x c #ffffff", -"#y c #ffffff", -"#z c #ffffff", -"#A c #ffffff", -"#B c #ffffff", -"#C c #ffffff", -"#D c #ffffff", -"#E c #ffffff", -"#F c #ffffff", -"#G c #ffffff", -"#H c #ffffff", -"#I c #ffffff", -"#J c #ffffff", -"#K c #ffffff", -"#L c #ffffff", -"#M c #ffffff", -"#N c #ffffff", -"#O c #ffffff", -"#P c #ffffff", -"#Q c #ffffff", -"#R c #ffffff", -"#S c #ffffff", -"#T c #ffffff", -"#U c #ffffff", -"#V c #ffffff", -"#W c #ffffff", -"#X c #ffffff", -"#Y c #ffffff", -"#Z c #ffffff", -"#0 c #ffffff", -"#1 c #ffffff", -"#2 c #ffffff", -"#3 c #ffffff", -"#4 c #ffffff", -"#5 c #ffffff", -"#6 c #ffffff", -"#7 c #ffffff", -"#8 c #ffffff", -"a` c #ffffff", -"a. c #ffffff", -"a# c #ffffff", -"aa c #ffffff", -"ab c #ffffff", -"ac c #ffffff", -"ad c #ffffff", -"ae c #ffffff", -"af c #ffffff", -"ag c #ffffff", -"ah c #ffffff", -"ai c #ffffff", -"aj c #ffffff", -"ak c #ffffff", -"al c #ffffff", -"am c #ffffff", -"an c #ffffff", -"ao c #ffffff", -"ap c #ffffff", -"aq c #ffffff", -"ar c #ffffff", -"as c #ffffff", -"at c #ffffff", -"au c #ffffff", -"av c #ffffff", -"aw c #ffffff", -"ax c #ffffff", -"ay c #ffffff", -"az c #ffffff", -"aA c #ffffff", -"aB c #ffffff", -"aC c #ffffff", -"aD c #ffffff", -"aE c #ffffff", -"aF c #ffffff", -"aG c #ffffff", -"aH c #ffffff", -"aI c #ffffff", -"aJ c #ffffff", -"aK c #ffffff", -"aL c #ffffff", -"aM c #ffffff", -"aN c #ffffff", -"aO c #ffffff", -"aP c #ffffff", -"aQ c #ffffff", -"aR c #ffffff", -"aS c #ffffff", -"aT c #ffffff", -"aU c #ffffff", -"aV c #ffffff", -"aW c #ffffff", -"aX c #ffffff", -"aY c #ffffff", -"aZ c #ffffff", -"a0 c #ffffff", -"a1 c #ffffff", -"a2 c #ffffff", -"a3 c #ffffff", -"a4 c #ffffff", -"a5 c #ffffff", -"a6 c #ffffff", -"a7 c #ffffff", -"a8 c #ffffff", -/* pixels */ -"`.`.`.`.`.`.", -"`.`.`.`.`.``", -"`.`.`.`.`.`.", -"`.`.`.`.`.``", -"`.`.`.`.`.`.", -"`.`.`.`.`.``", -"`.`.`.`.`.`.", -"`.`.`.`.`.``", -"`.`.`.`.`.`.", -"`.`.`.`.`.``", -"`.`.`.`.`.`.", -"`.`.`.`.`.``", -"`.`.`.`.`.`.", -"`.`.`.`.`.``", -"`.`.`.`.`.`.", -"`.`.`.`.`.``", -"`.`.`.`.`.`.", -"`.`.`.`.`.``", -"`.`.`.`.`.`.", -"`.`.`.`.`.``", -"`.`.`.`.`.`.", -"`.`.`.`.`.``" -}; +static char * guide_xpm[] = { +"6 22 2 1", +" c None", +". c #ADA5C6", +" ", +" .", +" ", +" .", +" ", +" .", +" ", +" .", +" ", +" .", +" ", +" .", +" ", +" .", +" ", +" .", +" ", +" .", +" ", +" .", +" ", +" ."}; diff --git a/etc/tree-widget/folder/handle.png b/etc/tree-widget/folder/handle.png Binary files differindex 87058b7cc4d..cc5aa61b860 100644 --- a/etc/tree-widget/folder/handle.png +++ b/etc/tree-widget/folder/handle.png diff --git a/etc/tree-widget/folder/handle.xpm b/etc/tree-widget/folder/handle.xpm index 40d0ca417e9..d3eb5f387b3 100644 --- a/etc/tree-widget/folder/handle.xpm +++ b/etc/tree-widget/folder/handle.xpm @@ -1,285 +1,27 @@ /* XPM */ -static char *handle[] = { -/* width height num_colors chars_per_pixel */ -" 10 22 256 2", -/* colors */ -"`` c #000000", -"`. c #a5a5c6", -"`# c #ada5c6", -"`a c #cecee7", -"`b c #ceceff", -"`c c None", -"`d c #ffffff", -"`e c #ffffff", -"`f c #ffffff", -"`g c #ffffff", -"`h c #ffffff", -"`i c #ffffff", -"`j c #ffffff", -"`k c #ffffff", -"`l c #ffffff", -"`m c #ffffff", -"`n c #ffffff", -"`o c #ffffff", -"`p c #ffffff", -"`q c #ffffff", -"`r c #ffffff", -"`s c #ffffff", -"`t c #ffffff", -"`u c #ffffff", -"`v c #ffffff", -"`w c #ffffff", -"`x c #ffffff", -"`y c #ffffff", -"`z c #ffffff", -"`A c #ffffff", -"`B c #ffffff", -"`C c #ffffff", -"`D c #808000", -"`E c #ffffff", -"`F c #ffffff", -"`G c #ffffff", -"`H c #ffffff", -"`I c #ffffff", -"`J c #ffffff", -"`K c #ffffff", -"`L c #ffffff", -"`M c #ffffff", -"`N c #ffffff", -"`O c #ffffff", -"`P c #ffffff", -"`Q c #ffffff", -"`R c #ffffff", -"`S c #ffffff", -"`T c #ffffff", -"`U c #ffffff", -"`V c #ffffff", -"`W c #ffffff", -"`X c #ffffff", -"`Y c #ffffff", -"`Z c #ffffff", -"`0 c #ffffff", -"`1 c #ffffff", -"`2 c #ffffff", -"`3 c #ffffff", -"`4 c #ffffff", -"`5 c #ffffff", -"`6 c #ffffff", -"`7 c #ffffff", -"`8 c #ffffff", -".` c #ffffff", -".. c #ffffff", -".# c #ffffff", -".a c #ffffff", -".b c #ffffff", -".c c #ffffff", -".d c #ffffff", -".e c #ffffff", -".f c #ffffff", -".g c #ffffff", -".h c #ffffff", -".i c #ffffff", -".j c #ffffff", -".k c #ffffff", -".l c #ffffff", -".m c #ffffff", -".n c #ffffff", -".o c #ffffff", -".p c #ffffff", -".q c #ffffff", -".r c #ffffff", -".s c #ffffff", -".t c #ffffff", -".u c #ffffff", -".v c #ffffff", -".w c #ffffff", -".x c #ffffff", -".y c #ffffff", -".z c #ffffff", -".A c #ffffff", -".B c #ffffff", -".C c #ffffff", -".D c #ffffff", -".E c #ffffff", -".F c #ffffff", -".G c #ffffff", -".H c #ffffff", -".I c #ffffff", -".J c #ffffff", -".K c #ffffff", -".L c #ffffff", -".M c #ffffff", -".N c #ffffff", -".O c #ffffff", -".P c #ffffff", -".Q c #ffffff", -".R c #ffffff", -".S c #ffffff", -".T c #ffffff", -".U c #ffffff", -".V c #ffffff", -".W c #ffffff", -".X c #ffffff", -".Y c #ffffff", -".Z c #ffffff", -".0 c #ffffff", -".1 c #ffffff", -".2 c #ffffff", -".3 c #ffffff", -".4 c #ffffff", -".5 c #ffffff", -".6 c #ffffff", -".7 c #ffffff", -".8 c #ffffff", -"#` c #ffffff", -"#. c #ffffff", -"## c #ffffff", -"#a c #ffffff", -"#b c #ffffff", -"#c c #ffffff", -"#d c #ffffff", -"#e c #ffffff", -"#f c #ffffff", -"#g c #ffffff", -"#h c #ffffff", -"#i c #ffffff", -"#j c #ffffff", -"#k c #ffffff", -"#l c #ffffff", -"#m c #ffffff", -"#n c #ffffff", -"#o c #ffffff", -"#p c #ffffff", -"#q c #ffffff", -"#r c #ffffff", -"#s c #ffffff", -"#t c #ffffff", -"#u c #ffffff", -"#v c #ffffff", -"#w c #ffffff", -"#x c #ffffff", -"#y c #ffffff", -"#z c #ffffff", -"#A c #ffffff", -"#B c #ffffff", -"#C c #ffffff", -"#D c #ffffff", -"#E c #ffffff", -"#F c #ffffff", -"#G c #ffffff", -"#H c #ffffff", -"#I c #ffffff", -"#J c #ffffff", -"#K c #ffffff", -"#L c #ffffff", -"#M c #ffffff", -"#N c #ffffff", -"#O c #ffffff", -"#P c #ffffff", -"#Q c #ffffff", -"#R c #ffffff", -"#S c #ffffff", -"#T c #ffffff", -"#U c #ffffff", -"#V c #ffffff", -"#W c #ffffff", -"#X c #ffffff", -"#Y c #ffffff", -"#Z c #ffffff", -"#0 c #ffffff", -"#1 c #ffffff", -"#2 c #ffffff", -"#3 c #ffffff", -"#4 c #ffffff", -"#5 c #ffffff", -"#6 c #ffffff", -"#7 c #ffffff", -"#8 c #ffffff", -"a` c #ffffff", -"a. c #ffffff", -"a# c #ffffff", -"aa c #ffffff", -"ab c #ffffff", -"ac c #ffffff", -"ad c #ffffff", -"ae c #ffffff", -"af c #ffffff", -"ag c #ffffff", -"ah c #ffffff", -"ai c #ffffff", -"aj c #ffffff", -"ak c #ffffff", -"al c #ffffff", -"am c #ffffff", -"an c #ffffff", -"ao c #ffffff", -"ap c #ffffff", -"aq c #ffffff", -"ar c #ffffff", -"as c #ffffff", -"at c #ffffff", -"au c #ffffff", -"av c #ffffff", -"aw c #ffffff", -"ax c #ffffff", -"ay c #ffffff", -"az c #ffffff", -"aA c #ffffff", -"aB c #ffffff", -"aC c #ffffff", -"aD c #ffffff", -"aE c #ffffff", -"aF c #ffffff", -"aG c #ffffff", -"aH c #ffffff", -"aI c #ffffff", -"aJ c #ffffff", -"aK c #ffffff", -"aL c #ffffff", -"aM c #ffffff", -"aN c #ffffff", -"aO c #ffffff", -"aP c #ffffff", -"aQ c #ffffff", -"aR c #ffffff", -"aS c #ffffff", -"aT c #ffffff", -"aU c #ffffff", -"aV c #ffffff", -"aW c #ffffff", -"aX c #ffffff", -"aY c #ffffff", -"aZ c #ffffff", -"a0 c #ffffff", -"a1 c #ffffff", -"a2 c #ffffff", -"a3 c #ffffff", -"a4 c #ffffff", -"a5 c #ffffff", -"a6 c #ffffff", -"a7 c #ffffff", -"a8 c #ffffff", -/* pixels */ -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`#`c`#`c`#`c`#`c`#", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c" -}; +static char * handle_xpm[] = { +"10 22 2 1", +" c None", +". c #ADA5C6", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" . . . . .", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" "}; diff --git a/etc/tree-widget/folder/leaf.png b/etc/tree-widget/folder/leaf.png Binary files differindex 6abb6036f52..c15762b6570 100644 --- a/etc/tree-widget/folder/leaf.png +++ b/etc/tree-widget/folder/leaf.png diff --git a/etc/tree-widget/folder/leaf.xpm b/etc/tree-widget/folder/leaf.xpm index c353cb2cdf8..53a86c75d64 100644 --- a/etc/tree-widget/folder/leaf.xpm +++ b/etc/tree-widget/folder/leaf.xpm @@ -1,285 +1,34 @@ /* XPM */ -static char *leaf[] = { -/* width height num_colors chars_per_pixel */ -" 16 22 256 2", -/* colors */ -"`` c #000000", -"`. c #424242", -"`# c #848484", -"`a c #949494", -"`b c #9c9c9c", -"`c c #a5a5a5", -"`d c #adadad", -"`e c #b5b5b5", -"`f c #bdbdbd", -"`g c #c6c6c6", -"`h c None", -"`i c #ffffff", -"`j c #ffffff", -"`k c #ffffff", -"`l c #ffffff", -"`m c #ffffff", -"`n c #ffffff", -"`o c #ffffff", -"`p c #ffffff", -"`q c #ffffff", -"`r c #ffffff", -"`s c #ffffff", -"`t c #ffffff", -"`u c #ffffff", -"`v c #ffffff", -"`w c #ffffff", -"`x c #ffffff", -"`y c #ffffff", -"`z c #ffffff", -"`A c #ffffff", -"`B c #ffffff", -"`C c #ffffff", -"`D c #ffffff", -"`E c #ffffff", -"`F c #ffffff", -"`G c #ffffff", -"`H c #ffffff", -"`I c #ffffff", -"`J c #ffffff", -"`K c #ffffff", -"`L c #ffffff", -"`M c #ffffff", -"`N c #ffffff", -"`O c #ffffff", -"`P c #ffffff", -"`Q c #ffffff", -"`R c #ffffff", -"`S c #ffffff", -"`T c #ffffff", -"`U c #ffffff", -"`V c #ffffff", -"`W c #ffffff", -"`X c #ffffff", -"`Y c #ffffff", -"`Z c #ffffff", -"`0 c #ffffff", -"`1 c #ffffff", -"`2 c #ffffff", -"`3 c #ffffff", -"`4 c #ffffff", -"`5 c #ffffff", -"`6 c #ffffff", -"`7 c #ffffff", -"`8 c #ffffff", -".` c #ffffff", -".. c #ffffff", -".# c #ffffff", -".a c #ffffff", -".b c #ffffff", -".c c #ffffff", -".d c #ffffff", -".e c #ffffff", -".f c #ffffff", -".g c #ffffff", -".h c #ffffff", -".i c #ffffff", -".j c #ffffff", -".k c #ffffff", -".l c #ffffff", -".m c #ffffff", -".n c #ffffff", -".o c #ffffff", -".p c #ffffff", -".q c #ffffff", -".r c #ffffff", -".s c #ffffff", -".t c #ffffff", -".u c #ffffff", -".v c #ffffff", -".w c #ffffff", -".x c #ffffff", -".y c #ffffff", -".z c #ffffff", -".A c #ffffff", -".B c #ffffff", -".C c #ffffff", -".D c #ffffff", -".E c #ffffff", -".F c #ffffff", -".G c #ffffff", -".H c #ffffff", -".I c #ffffff", -".J c #ffffff", -".K c #ffffff", -".L c #ffffff", -".M c #ffffff", -".N c #ffffff", -".O c #ffffff", -".P c #ffffff", -".Q c #ffffff", -".R c #ffffff", -".S c #ffffff", -".T c #ffffff", -".U c #ffffff", -".V c #ffffff", -".W c #ffffff", -".X c #ffffff", -".Y c #ffffff", -".Z c #ffffff", -".0 c #ffffff", -".1 c #ffffff", -".2 c #ffffff", -".3 c #ffffff", -".4 c #ffffff", -".5 c #ffffff", -".6 c #ffffff", -".7 c #ffffff", -".8 c #ffffff", -"#` c #ffffff", -"#. c #ffffff", -"## c #ffffff", -"#a c #ffffff", -"#b c #ffffff", -"#c c #ffffff", -"#d c #ffffff", -"#e c #ffffff", -"#f c #ffffff", -"#g c #ffffff", -"#h c #ffffff", -"#i c #ffffff", -"#j c #ffffff", -"#k c #ffffff", -"#l c #ffffff", -"#m c #ffffff", -"#n c #ffffff", -"#o c #ffffff", -"#p c #ffffff", -"#q c #ffffff", -"#r c #ffffff", -"#s c #ffffff", -"#t c #ffffff", -"#u c #ffffff", -"#v c #ffffff", -"#w c #ffffff", -"#x c #ffffff", -"#y c #ffffff", -"#z c #ffffff", -"#A c #ffffff", -"#B c #ffffff", -"#C c #ffffff", -"#D c #ffffff", -"#E c #ffffff", -"#F c #ffffff", -"#G c #ffffff", -"#H c #ffffff", -"#I c #ffffff", -"#J c #ffffff", -"#K c #ffffff", -"#L c #ffffff", -"#M c #ffffff", -"#N c #ffffff", -"#O c #ffffff", -"#P c #ffffff", -"#Q c #ffffff", -"#R c #ffffff", -"#S c #ffffff", -"#T c #ffffff", -"#U c #ffffff", -"#V c #ffffff", -"#W c #ffffff", -"#X c #ffffff", -"#Y c #ffffff", -"#Z c #ffffff", -"#0 c #ffffff", -"#1 c #ffffff", -"#2 c #ffffff", -"#3 c #ffffff", -"#4 c #ffffff", -"#5 c #ffffff", -"#6 c #ffffff", -"#7 c #ffffff", -"#8 c #ffffff", -"a` c #ffffff", -"a. c #ffffff", -"a# c #ffffff", -"aa c #ffffff", -"ab c #ffffff", -"ac c #ffffff", -"ad c #ffffff", -"ae c #ffffff", -"af c #ffffff", -"ag c #ffffff", -"ah c #ffffff", -"ai c #ffffff", -"aj c #ffffff", -"ak c #ffffff", -"al c #ffffff", -"am c #ffffff", -"an c #ffffff", -"ao c #ffffff", -"ap c #ffffff", -"aq c #ffffff", -"ar c #ffffff", -"as c #ffffff", -"at c #ffffff", -"au c #ffffff", -"av c #ffffff", -"aw c #ffffff", -"ax c #ffffff", -"ay c #ffffff", -"az c #ffffff", -"aA c #ffffff", -"aB c #ffffff", -"aC c #ffffff", -"aD c #ffffff", -"aE c #ffffff", -"aF c #ffffff", -"aG c #ffffff", -"aH c #ffffff", -"aI c #ffffff", -"aJ c #ffffff", -"aK c #ffffff", -"aL c #ffffff", -"aM c #ffffff", -"aN c #ffffff", -"aO c #ffffff", -"aP c #ffffff", -"aQ c #ffffff", -"aR c #ffffff", -"aS c #ffffff", -"aT c #ffffff", -"aU c #ffffff", -"aV c #ffffff", -"aW c #ffffff", -"aX c #ffffff", -"aY c #ffffff", -"aZ c #ffffff", -"a0 c #ffffff", -"a1 c #ffffff", -"a2 c #ffffff", -"a3 c #ffffff", -"a4 c #ffffff", -"a5 c #ffffff", -"a6 c #ffffff", -"a7 c #ffffff", -"a8 c #ffffff", -/* pixels */ -"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h", -"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h", -"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h", -"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h", -"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h", -"`.`.`.`.`.`.`.`h`h`h`h`h`h`h`h`h", -"`.`a`a`b`b`c`.`.`h`h`h`h`h`h`h`h", -"`.`a`b`b`c`c`.`d`.`h`h`h`h`h`h`h", -"`.`b`b`c`c`c`.`.`.`.`h`h`h`h`h`h", -"`.`b`#`#`#`a`#`d`e`.`h`h`h`h`h`h", -"`.`c`c`c`d`d`d`e`e`.`h`h`h`h`h`h", -"`.`c`#`a`#`#`#`e`f`.`h`h`h`h`h`h", -"`.`c`d`d`d`e`e`f`f`.`h`h`h`h`h`h", -"`.`d`#`#`a`#`#`f`f`.`h`h`h`h`h`h", -"`.`d`d`e`e`f`f`f`f`.`h`h`h`h`h`h", -"`.`d`e`e`f`f`f`f`f`.`h`h`h`h`h`h", -"`.`.`.`.`.`.`.`.`.`.`h`h`h`h`h`h", -"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h", -"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h", -"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h", -"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h", -"`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h`h" -}; +static char * leaf_xpm[] = { +"16 22 9 1", +" c None", +". c #424242", +"+ c #949494", +"@ c #9C9C9C", +"# c #A5A5A5", +"$ c #ADADAD", +"% c #848484", +"& c #B5B5B5", +"* c #BDBDBD", +" ", +" ", +" ", +" ", +" ", +"....... ", +".++@@#.. ", +".+@@##.$. ", +".@@###.... ", +".@%%%+%$&. ", +".###$$$&&. ", +".#%+%%%&*. ", +".#$$$&&**. ", +".$%%+%%**. ", +".$$&&****. ", +".$&&*****. ", +".......... ", +" ", +" ", +" ", +" ", +" "}; diff --git a/etc/tree-widget/folder/no-guide.png b/etc/tree-widget/folder/no-guide.png Binary files differindex 5705cc83cf4..81999263b2c 100644 --- a/etc/tree-widget/folder/no-guide.png +++ b/etc/tree-widget/folder/no-guide.png diff --git a/etc/tree-widget/folder/no-guide.xpm b/etc/tree-widget/folder/no-guide.xpm index 2d3e1e7c099..a74b84061ca 100644 --- a/etc/tree-widget/folder/no-guide.xpm +++ b/etc/tree-widget/folder/no-guide.xpm @@ -1,285 +1,26 @@ /* XPM */ -static char *no-guide[] = { -/* width height num_colors chars_per_pixel */ -" 6 22 256 2", -/* colors */ -"`` c None", -"`. c #ffffff", -"`# c #ffffff", -"`a c #ffffff", -"`b c #ffffff", -"`c c #ffffff", -"`d c #ffffff", -"`e c #ffffff", -"`f c #ffffff", -"`g c #ffffff", -"`h c #ffffff", -"`i c #ffffff", -"`j c #ffffff", -"`k c #ffffff", -"`l c #ffffff", -"`m c #ffffff", -"`n c #ffffff", -"`o c #ffffff", -"`p c #ffffff", -"`q c #ffffff", -"`r c #ffffff", -"`s c #ffffff", -"`t c #ffffff", -"`u c #ffffff", -"`v c #ffffff", -"`w c #ffffff", -"`x c #ffffff", -"`y c #ffffff", -"`z c #ffffff", -"`A c #ffffff", -"`B c #ffffff", -"`C c #ffffff", -"`D c #ffffff", -"`E c #ffffff", -"`F c #ffffff", -"`G c #ffffff", -"`H c #ffffff", -"`I c #ffffff", -"`J c #ffffff", -"`K c #ffffff", -"`L c #ffffff", -"`M c #ffffff", -"`N c #ffffff", -"`O c #ffffff", -"`P c #ffffff", -"`Q c #ffffff", -"`R c #ffffff", -"`S c #ffffff", -"`T c #ffffff", -"`U c #ffffff", -"`V c #ffffff", -"`W c #ffffff", -"`X c #ffffff", -"`Y c #ffffff", -"`Z c #ffffff", -"`0 c #ffffff", -"`1 c #ffffff", -"`2 c #ffffff", -"`3 c #ffffff", -"`4 c #ffffff", -"`5 c #ffffff", -"`6 c #ffffff", -"`7 c #ffffff", -"`8 c #ffffff", -".` c #ffffff", -".. c #ffffff", -".# c #ffffff", -".a c #ffffff", -".b c #ffffff", -".c c #ffffff", -".d c #ffffff", -".e c #ffffff", -".f c #ffffff", -".g c #ffffff", -".h c #ffffff", -".i c #ffffff", -".j c #ffffff", -".k c #ffffff", -".l c #ffffff", -".m c #ffffff", -".n c #ffffff", -".o c #ffffff", -".p c #ffffff", -".q c #ffffff", -".r c #ffffff", -".s c #ffffff", -".t c #ffffff", -".u c #ffffff", -".v c #ffffff", -".w c #ffffff", -".x c #ffffff", -".y c #ffffff", -".z c #ffffff", -".A c #ffffff", -".B c #ffffff", -".C c #ffffff", -".D c #ffffff", -".E c #ffffff", -".F c #ffffff", -".G c #ffffff", -".H c #ffffff", -".I c #ffffff", -".J c #ffffff", -".K c #ffffff", -".L c #ffffff", -".M c #ffffff", -".N c #ffffff", -".O c #ffffff", -".P c #ffffff", -".Q c #ffffff", -".R c #ffffff", -".S c #ffffff", -".T c #ffffff", -".U c #ffffff", -".V c #ffffff", -".W c #ffffff", -".X c #ffffff", -".Y c #ffffff", -".Z c #ffffff", -".0 c #ffffff", -".1 c #ffffff", -".2 c #ffffff", -".3 c #ffffff", -".4 c #ffffff", -".5 c #ffffff", -".6 c #ffffff", -".7 c #ffffff", -".8 c #ffffff", -"#` c #ffffff", -"#. c #ffffff", -"## c #ffffff", -"#a c #ffffff", -"#b c #ffffff", -"#c c #ffffff", -"#d c #ffffff", -"#e c #ffffff", -"#f c #ffffff", -"#g c #ffffff", -"#h c #ffffff", -"#i c #ffffff", -"#j c #ffffff", -"#k c #ffffff", -"#l c #ffffff", -"#m c #ffffff", -"#n c #ffffff", -"#o c #ffffff", -"#p c #ffffff", -"#q c #ffffff", -"#r c #ffffff", -"#s c #ffffff", -"#t c #ffffff", -"#u c #ffffff", -"#v c #ffffff", -"#w c #ffffff", -"#x c #ffffff", -"#y c #ffffff", -"#z c #ffffff", -"#A c #ffffff", -"#B c #ffffff", -"#C c #ffffff", -"#D c #ffffff", -"#E c #ffffff", -"#F c #ffffff", -"#G c #ffffff", -"#H c #ffffff", -"#I c #ffffff", -"#J c #ffffff", -"#K c #ffffff", -"#L c #ffffff", -"#M c #ffffff", -"#N c #ffffff", -"#O c #ffffff", -"#P c #ffffff", -"#Q c #ffffff", -"#R c #ffffff", -"#S c #ffffff", -"#T c #ffffff", -"#U c #ffffff", -"#V c #ffffff", -"#W c #ffffff", -"#X c #ffffff", -"#Y c #ffffff", -"#Z c #ffffff", -"#0 c #ffffff", -"#1 c #ffffff", -"#2 c #ffffff", -"#3 c #ffffff", -"#4 c #ffffff", -"#5 c #ffffff", -"#6 c #ffffff", -"#7 c #ffffff", -"#8 c #ffffff", -"a` c #ffffff", -"a. c #ffffff", -"a# c #ffffff", -"aa c #ffffff", -"ab c #ffffff", -"ac c #ffffff", -"ad c #ffffff", -"ae c #ffffff", -"af c #ffffff", -"ag c #ffffff", -"ah c #ffffff", -"ai c #ffffff", -"aj c #ffffff", -"ak c #ffffff", -"al c #ffffff", -"am c #ffffff", -"an c #ffffff", -"ao c #ffffff", -"ap c #ffffff", -"aq c #ffffff", -"ar c #ffffff", -"as c #ffffff", -"at c #ffffff", -"au c #ffffff", -"av c #ffffff", -"aw c #ffffff", -"ax c #ffffff", -"ay c #ffffff", -"az c #ffffff", -"aA c #ffffff", -"aB c #ffffff", -"aC c #ffffff", -"aD c #ffffff", -"aE c #ffffff", -"aF c #ffffff", -"aG c #ffffff", -"aH c #ffffff", -"aI c #ffffff", -"aJ c #ffffff", -"aK c #ffffff", -"aL c #ffffff", -"aM c #ffffff", -"aN c #ffffff", -"aO c #ffffff", -"aP c #ffffff", -"aQ c #ffffff", -"aR c #ffffff", -"aS c #ffffff", -"aT c #ffffff", -"aU c #ffffff", -"aV c #ffffff", -"aW c #ffffff", -"aX c #ffffff", -"aY c #ffffff", -"aZ c #ffffff", -"a0 c #ffffff", -"a1 c #ffffff", -"a2 c #ffffff", -"a3 c #ffffff", -"a4 c #ffffff", -"a5 c #ffffff", -"a6 c #ffffff", -"a7 c #ffffff", -"a8 c #ffffff", -/* pixels */ -"````````````", -"````````````", -"````````````", -"````````````", -"````````````", -"````````````", -"````````````", -"````````````", -"````````````", -"````````````", -"````````````", -"````````````", -"````````````", -"````````````", -"````````````", -"````````````", -"````````````", -"````````````", -"````````````", -"````````````", -"````````````", -"````````````" -}; +static char * no_guide_xpm[] = { +"6 22 1 1", +" c None", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" "}; diff --git a/etc/tree-widget/folder/no-handle.png b/etc/tree-widget/folder/no-handle.png Binary files differindex c335dd938ac..3055803a595 100644 --- a/etc/tree-widget/folder/no-handle.png +++ b/etc/tree-widget/folder/no-handle.png diff --git a/etc/tree-widget/folder/no-handle.xpm b/etc/tree-widget/folder/no-handle.xpm index fa3e4c5874b..cea559fd763 100644 --- a/etc/tree-widget/folder/no-handle.xpm +++ b/etc/tree-widget/folder/no-handle.xpm @@ -1,285 +1,26 @@ /* XPM */ -static char *no-handle[] = { -/* width height num_colors chars_per_pixel */ -" 10 22 256 2", -/* colors */ -"`` c #000000", -"`. c #a5a5c6", -"`# c #ada5c6", -"`a c #cecee7", -"`b c #ceceff", -"`c c None", -"`d c #ffffff", -"`e c #ffffff", -"`f c #ffffff", -"`g c #ffffff", -"`h c #ffffff", -"`i c #ffffff", -"`j c #ffffff", -"`k c #ffffff", -"`l c #ffffff", -"`m c #ffffff", -"`n c #ffffff", -"`o c #ffffff", -"`p c #ffffff", -"`q c #ffffff", -"`r c #ffffff", -"`s c #ffffff", -"`t c #ffffff", -"`u c #ffffff", -"`v c #ffffff", -"`w c #ffffff", -"`x c #ffffff", -"`y c #ffffff", -"`z c #ffffff", -"`A c #ffffff", -"`B c #ffffff", -"`C c #ffffff", -"`D c #808000", -"`E c #ffffff", -"`F c #ffffff", -"`G c #ffffff", -"`H c #ffffff", -"`I c #ffffff", -"`J c #ffffff", -"`K c #ffffff", -"`L c #ffffff", -"`M c #ffffff", -"`N c #ffffff", -"`O c #ffffff", -"`P c #ffffff", -"`Q c #ffffff", -"`R c #ffffff", -"`S c #ffffff", -"`T c #ffffff", -"`U c #ffffff", -"`V c #ffffff", -"`W c #ffffff", -"`X c #ffffff", -"`Y c #ffffff", -"`Z c #ffffff", -"`0 c #ffffff", -"`1 c #ffffff", -"`2 c #ffffff", -"`3 c #ffffff", -"`4 c #ffffff", -"`5 c #ffffff", -"`6 c #ffffff", -"`7 c #ffffff", -"`8 c #ffffff", -".` c #ffffff", -".. c #ffffff", -".# c #ffffff", -".a c #ffffff", -".b c #ffffff", -".c c #ffffff", -".d c #ffffff", -".e c #ffffff", -".f c #ffffff", -".g c #ffffff", -".h c #ffffff", -".i c #ffffff", -".j c #ffffff", -".k c #ffffff", -".l c #ffffff", -".m c #ffffff", -".n c #ffffff", -".o c #ffffff", -".p c #ffffff", -".q c #ffffff", -".r c #ffffff", -".s c #ffffff", -".t c #ffffff", -".u c #ffffff", -".v c #ffffff", -".w c #ffffff", -".x c #ffffff", -".y c #ffffff", -".z c #ffffff", -".A c #ffffff", -".B c #ffffff", -".C c #ffffff", -".D c #ffffff", -".E c #ffffff", -".F c #ffffff", -".G c #ffffff", -".H c #ffffff", -".I c #ffffff", -".J c #ffffff", -".K c #ffffff", -".L c #ffffff", -".M c #ffffff", -".N c #ffffff", -".O c #ffffff", -".P c #ffffff", -".Q c #ffffff", -".R c #ffffff", -".S c #ffffff", -".T c #ffffff", -".U c #ffffff", -".V c #ffffff", -".W c #ffffff", -".X c #ffffff", -".Y c #ffffff", -".Z c #ffffff", -".0 c #ffffff", -".1 c #ffffff", -".2 c #ffffff", -".3 c #ffffff", -".4 c #ffffff", -".5 c #ffffff", -".6 c #ffffff", -".7 c #ffffff", -".8 c #ffffff", -"#` c #ffffff", -"#. c #ffffff", -"## c #ffffff", -"#a c #ffffff", -"#b c #ffffff", -"#c c #ffffff", -"#d c #ffffff", -"#e c #ffffff", -"#f c #ffffff", -"#g c #ffffff", -"#h c #ffffff", -"#i c #ffffff", -"#j c #ffffff", -"#k c #ffffff", -"#l c #ffffff", -"#m c #ffffff", -"#n c #ffffff", -"#o c #ffffff", -"#p c #ffffff", -"#q c #ffffff", -"#r c #ffffff", -"#s c #ffffff", -"#t c #ffffff", -"#u c #ffffff", -"#v c #ffffff", -"#w c #ffffff", -"#x c #ffffff", -"#y c #ffffff", -"#z c #ffffff", -"#A c #ffffff", -"#B c #ffffff", -"#C c #ffffff", -"#D c #ffffff", -"#E c #ffffff", -"#F c #ffffff", -"#G c #ffffff", -"#H c #ffffff", -"#I c #ffffff", -"#J c #ffffff", -"#K c #ffffff", -"#L c #ffffff", -"#M c #ffffff", -"#N c #ffffff", -"#O c #ffffff", -"#P c #ffffff", -"#Q c #ffffff", -"#R c #ffffff", -"#S c #ffffff", -"#T c #ffffff", -"#U c #ffffff", -"#V c #ffffff", -"#W c #ffffff", -"#X c #ffffff", -"#Y c #ffffff", -"#Z c #ffffff", -"#0 c #ffffff", -"#1 c #ffffff", -"#2 c #ffffff", -"#3 c #ffffff", -"#4 c #ffffff", -"#5 c #ffffff", -"#6 c #ffffff", -"#7 c #ffffff", -"#8 c #ffffff", -"a` c #ffffff", -"a. c #ffffff", -"a# c #ffffff", -"aa c #ffffff", -"ab c #ffffff", -"ac c #ffffff", -"ad c #ffffff", -"ae c #ffffff", -"af c #ffffff", -"ag c #ffffff", -"ah c #ffffff", -"ai c #ffffff", -"aj c #ffffff", -"ak c #ffffff", -"al c #ffffff", -"am c #ffffff", -"an c #ffffff", -"ao c #ffffff", -"ap c #ffffff", -"aq c #ffffff", -"ar c #ffffff", -"as c #ffffff", -"at c #ffffff", -"au c #ffffff", -"av c #ffffff", -"aw c #ffffff", -"ax c #ffffff", -"ay c #ffffff", -"az c #ffffff", -"aA c #ffffff", -"aB c #ffffff", -"aC c #ffffff", -"aD c #ffffff", -"aE c #ffffff", -"aF c #ffffff", -"aG c #ffffff", -"aH c #ffffff", -"aI c #ffffff", -"aJ c #ffffff", -"aK c #ffffff", -"aL c #ffffff", -"aM c #ffffff", -"aN c #ffffff", -"aO c #ffffff", -"aP c #ffffff", -"aQ c #ffffff", -"aR c #ffffff", -"aS c #ffffff", -"aT c #ffffff", -"aU c #ffffff", -"aV c #ffffff", -"aW c #ffffff", -"aX c #ffffff", -"aY c #ffffff", -"aZ c #ffffff", -"a0 c #ffffff", -"a1 c #ffffff", -"a2 c #ffffff", -"a3 c #ffffff", -"a4 c #ffffff", -"a5 c #ffffff", -"a6 c #ffffff", -"a7 c #ffffff", -"a8 c #ffffff", -/* pixels */ -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c", -"`c`c`c`c`c`c`c`c`c`c" -}; +static char * no_handle_xpm[] = { +"10 22 1 1", +" c None", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" "}; diff --git a/etc/tree-widget/folder/open.png b/etc/tree-widget/folder/open.png Binary files differindex 4237d3aa648..6696a43c09c 100644 --- a/etc/tree-widget/folder/open.png +++ b/etc/tree-widget/folder/open.png diff --git a/etc/tree-widget/folder/open.xpm b/etc/tree-widget/folder/open.xpm index 720f79fa94b..dfbf758dd8f 100644 --- a/etc/tree-widget/folder/open.xpm +++ b/etc/tree-widget/folder/open.xpm @@ -1,285 +1,39 @@ /* XPM */ -static char *open[] = { -/* width height num_colors chars_per_pixel */ -" 16 22 256 2", -/* colors */ -"`` c #848400", -"`. c #a5a5c6", -"`# c #adad39", -"`a c #adad42", -"`b c #b5b54a", -"`c c #bdbd52", -"`d c #bdbd5a", -"`e c #c6c663", -"`f c #c6c66b", -"`g c #cece6b", -"`h c #cece73", -"`i c #cece7b", -"`j c #d6d67b", -"`k c None", -"`l c #ffffff", -"`m c #ffffff", -"`n c #ffffff", -"`o c #ffffff", -"`p c #ffffff", -"`q c #ffffff", -"`r c #ffffff", -"`s c #ffffff", -"`t c #ffffff", -"`u c #ffffff", -"`v c #ffffff", -"`w c #ffffff", -"`x c #ffffff", -"`y c #ffffff", -"`z c #ffffff", -"`A c #ffffff", -"`B c #ffffff", -"`C c #ffffff", -"`D c #ffffff", -"`E c #ffffff", -"`F c #ffffff", -"`G c #ffffff", -"`H c #ffffff", -"`I c #ffffff", -"`J c #ffffff", -"`K c #ffffff", -"`L c #ffffff", -"`M c #ffffff", -"`N c #ffffff", -"`O c #ffffff", -"`P c #ffffff", -"`Q c #ffffff", -"`R c #ffffff", -"`S c #ffffff", -"`T c #ffffff", -"`U c #ffffff", -"`V c #ffffff", -"`W c #ffffff", -"`X c #ffffff", -"`Y c #ffffff", -"`Z c #ffffff", -"`0 c #ffffff", -"`1 c #ffffff", -"`2 c #ffffff", -"`3 c #ffffff", -"`4 c #ffffff", -"`5 c #ffffff", -"`6 c #ffffff", -"`7 c #ffffff", -"`8 c #ffffff", -".` c #ffffff", -".. c #ffffff", -".# c #ffffff", -".a c #ffffff", -".b c #ffffff", -".c c #ffffff", -".d c #ffffff", -".e c #ffffff", -".f c #ffffff", -".g c #ffffff", -".h c #ffffff", -".i c #ffffff", -".j c #ffffff", -".k c #ffffff", -".l c #ffffff", -".m c #ffffff", -".n c #ffffff", -".o c #ffffff", -".p c #ffffff", -".q c #ffffff", -".r c #ffffff", -".s c #ffffff", -".t c #ffffff", -".u c #ffffff", -".v c #ffffff", -".w c #ffffff", -".x c #ffffff", -".y c #ffffff", -".z c #ffffff", -".A c #ffffff", -".B c #ffffff", -".C c #ffffff", -".D c #ffffff", -".E c #ffffff", -".F c #ffffff", -".G c #ffffff", -".H c #ffffff", -".I c #ffffff", -".J c #ffffff", -".K c #ffffff", -".L c #ffffff", -".M c #ffffff", -".N c #ffffff", -".O c #ffffff", -".P c #ffffff", -".Q c #ffffff", -".R c #ffffff", -".S c #ffffff", -".T c #ffffff", -".U c #ffffff", -".V c #ffffff", -".W c #ffffff", -".X c #ffffff", -".Y c #ffffff", -".Z c #ffffff", -".0 c #ffffff", -".1 c #ffffff", -".2 c #ffffff", -".3 c #ffffff", -".4 c #ffffff", -".5 c #ffffff", -".6 c #ffffff", -".7 c #ffffff", -".8 c #ffffff", -"#` c #ffffff", -"#. c #ffffff", -"## c #ffffff", -"#a c #ffffff", -"#b c #ffffff", -"#c c #ffffff", -"#d c #ffffff", -"#e c #ffffff", -"#f c #ffffff", -"#g c #ffffff", -"#h c #ffffff", -"#i c #ffffff", -"#j c #ffffff", -"#k c #ffffff", -"#l c #ffffff", -"#m c #ffffff", -"#n c #ffffff", -"#o c #ffffff", -"#p c #ffffff", -"#q c #ffffff", -"#r c #ffffff", -"#s c #ffffff", -"#t c #ffffff", -"#u c #ffffff", -"#v c #ffffff", -"#w c #ffffff", -"#x c #ffffff", -"#y c #ffffff", -"#z c #ffffff", -"#A c #ffffff", -"#B c #ffffff", -"#C c #ffffff", -"#D c #ffffff", -"#E c #ffffff", -"#F c #ffffff", -"#G c #ffffff", -"#H c #ffffff", -"#I c #ffffff", -"#J c #ffffff", -"#K c #ffffff", -"#L c #ffffff", -"#M c #ffffff", -"#N c #ffffff", -"#O c #ffffff", -"#P c #ffffff", -"#Q c #ffffff", -"#R c #ffffff", -"#S c #ffffff", -"#T c #ffffff", -"#U c #ffffff", -"#V c #ffffff", -"#W c #ffffff", -"#X c #ffffff", -"#Y c #ffffff", -"#Z c #ffffff", -"#0 c #ffffff", -"#1 c #ffffff", -"#2 c #ffffff", -"#3 c #ffffff", -"#4 c #ffffff", -"#5 c #ffffff", -"#6 c #ffffff", -"#7 c #ffffff", -"#8 c #ffffff", -"a` c #ffffff", -"a. c #ffffff", -"a# c #ffffff", -"aa c #ffffff", -"ab c #ffffff", -"ac c #ffffff", -"ad c #ffffff", -"ae c #ffffff", -"af c #ffffff", -"ag c #ffffff", -"ah c #ffffff", -"ai c #ffffff", -"aj c #ffffff", -"ak c #ffffff", -"al c #ffffff", -"am c #ffffff", -"an c #ffffff", -"ao c #ffffff", -"ap c #ffffff", -"aq c #ffffff", -"ar c #ffffff", -"as c #ffffff", -"at c #ffffff", -"au c #ffffff", -"av c #ffffff", -"aw c #ffffff", -"ax c #ffffff", -"ay c #ffffff", -"az c #ffffff", -"aA c #ffffff", -"aB c #ffffff", -"aC c #ffffff", -"aD c #ffffff", -"aE c #ffffff", -"aF c #ffffff", -"aG c #ffffff", -"aH c #ffffff", -"aI c #ffffff", -"aJ c #ffffff", -"aK c #ffffff", -"aL c #ffffff", -"aM c #ffffff", -"aN c #ffffff", -"aO c #ffffff", -"aP c #ffffff", -"aQ c #ffffff", -"aR c #ffffff", -"aS c #ffffff", -"aT c #ffffff", -"aU c #ffffff", -"aV c #ffffff", -"aW c #ffffff", -"aX c #ffffff", -"aY c #ffffff", -"aZ c #ffffff", -"a0 c #ffffff", -"a1 c #ffffff", -"a2 c #ffffff", -"a3 c #ffffff", -"a4 c #ffffff", -"a5 c #ffffff", -"a6 c #ffffff", -"a7 c #ffffff", -"a8 c #ffffff", -/* pixels */ -"`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k", -"`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k", -"`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k", -"`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k", -"`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k", -"`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k", -"`k`````````k`k`k`k`k`k`k`k`k`k`k", -"```j`i`i`h```````````k`k`k`k`k`k", -"```i`i`h`h`f`f`d`d`c```k`k`k`k`k", -"```i`h`````````````````````k`k`k", -"```h```#`a`a`b`b`c`d`d`e`e```k`k", -"```h```a`a`b`b`c`d`d`e`e```k`k`k", -"`````a`a`b`b`c`d`d`e`e`f```k`k`k", -"`````a`b`b`c`d`d`e`e`f```k`k`k`k", -"```a`b`b`c`d`d`e`e`f`g```k`k`k`k", -"```````````````````````k`k`k`k`k", -"`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k", -"`k`k`k`k`k`.`k`k`k`k`k`k`k`k`k`k", -"`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k", -"`k`k`k`k`k`.`k`k`k`k`k`k`k`k`k`k", -"`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k`k", -"`k`k`k`k`k`.`k`k`k`k`k`k`k`k`k`k" -}; +static char * open_xpm[] = { +"16 22 14 1", +" c None", +". c #848400", +"+ c #D6D67B", +"@ c #CECE7B", +"# c #CECE73", +"$ c #C6C66B", +"% c #BDBD5A", +"& c #BDBD52", +"* c #ADAD39", +"= c #ADAD42", +"- c #B5B54A", +"; c #C6C663", +"> c #CECE6B", +", c #A5A5C6", +" ", +" ", +" ", +" ", +" ", +" ", +" .... ", +".+@@#..... ", +".@@##$$%%&. ", +".@#.......... ", +".#.*==--&%%;;. ", +".#.==--&%%;;. ", +"..==--&%%;;$. ", +"..=--&%%;;$. ", +".=--&%%;;$>. ", +"........... ", +" ", +" , ", +" ", +" , ", +" ", +" , "}; diff --git a/etc/ulimit.hack b/etc/ulimit.hack index 17105158c42..d804459ba0b 100644 --- a/etc/ulimit.hack +++ b/etc/ulimit.hack @@ -37,4 +37,23 @@ exit 0 # # Upon system reboot, all processes will inherit the new large ulimit. +# Copyright (c) 1999, 2003, 2006 +# Free Software Foundation, Inc. + +# COPYING PERMISSIONS: +# +# This document 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 2 of the License, or +# (at your option) any later version. +# +# This program 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. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + # arch-tag: 6f9a7072-9d07-4431-b0bb-e867648ad0b4 diff --git a/leim/ChangeLog b/leim/ChangeLog index 589024ba860..e792141aff7 100644 --- a/leim/ChangeLog +++ b/leim/ChangeLog @@ -263,7 +263,7 @@ * quail/pypunct-b5.el ("chinese-py-punct-b5"): Change the title Chinese characters from GB to Big5. -2003-05-01 Bzyl Wlodzimierz <matwb@julia.univ.gda.pl> (tiny change) +2003-05-01 Wlodzimierz Bzyl <matwb@julia.univ.gda.pl> (tiny change) * quail/latin-pre.el ("polish-slash"): Add the rule "//"->?/. diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 16c4e538939..557d8a2d492 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,36 @@ +2006-06-04 Masatake YAMATO <jet@gyve.org> + + * ebrowse.c (main): Exit with EXIT_FAILURE if BROWSE file + doesn't exist, is not seekable, not is failed in ftall. + +2006-06-03 Eli Zaretskii <eliz@gnu.org> + + * makefile.w32-in (ALL): Add sorted-doc and digest-doc. + ($(BLD)/sorted-doc.exe, $(BLD)/digest-doc.exe) + ($(BLD)/test-distrib.exe): New targets. + (sorted-doc, digest-doc, test-distrib): New targets. + (install): Install sorted-doc.exe and digest-doc.exe. + ($(BLD)/sorted-doc.$(O)): Update dependencies. + + * digest-doc.c [DOS_NT] <top level>: Include fcntl.h and io.h. + (main) [DOS_NT]: Switch stdin to binary mode, if it is not a + terminal device. + + * sorted-doc.c [DOS_NT] <top level>: Include fcntl.h and io.h. + [WINDOWSNT] <top level>: Don't redeclare malloc. + (main) [DOS_NT]: Switch stdin to binary mode, if it is not a + terminal device. + (main): Initialize bp, to avoid compiler warnings + + * makefile.w32-in: Delete traces of leditcfns.c. + + * leditcfns.c: Remove file. + +2006-05-23 Francesco Potort,Al(B <pot@gnu.org> + + * pop.c (pop_open, socket_connection, KPOP_SERVICE): Added + comments explaining why the "kpop" service is never used. + 2006-05-13 Eli Zaretskii <eliz@gnu.org> * makefile.w32-in (lisp1): Add fringe.elc. diff --git a/lib-src/digest-doc.c b/lib-src/digest-doc.c index 7b5a9677e7c..7787d422e39 100644 --- a/lib-src/digest-doc.c +++ b/lib-src/digest-doc.c @@ -26,12 +26,23 @@ #include <stdio.h> +#ifdef DOS_NT +#include <fcntl.h> /* for O_BINARY */ +#include <io.h> /* for setmode */ +#endif + int main () { register int ch; register int notfirst = 0; +#ifdef DOS_NT + /* DOC is a binary file. */ + if (!isatty (fileno (stdin))) + setmode (fileno (stdin), O_BINARY); +#endif + printf (".TL\n"); printf ("Command Summary for GNU Emacs\n"); printf (".AU\nRichard M. Stallman\n"); diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c index 94fa9114d23..398dd10896e 100644 --- a/lib-src/ebrowse.c +++ b/lib-src/ebrowse.c @@ -3909,17 +3909,31 @@ main (argc, argv) fp = fopen (out_filename, "r"); if (fp == NULL) - yyerror ("file `%s' must exist for --append", out_filename); + { + yyerror ("file `%s' must exist for --append", out_filename); + exit (EXIT_FAILURE); + } rc = fseek (fp, 0, SEEK_END); if (rc == -1) - yyerror ("error seeking in file `%s'", out_filename); + { + yyerror ("error seeking in file `%s'", out_filename); + exit (EXIT_FAILURE); + } rc = ftell (fp); if (rc == -1) - yyerror ("error getting size of file `%s'", out_filename); + { + yyerror ("error getting size of file `%s'", out_filename); + exit (EXIT_FAILURE); + } + else if (rc == 0) - yyerror ("file `%s' is empty", out_filename); + { + yyerror ("file `%s' is empty", out_filename); + /* It may be ok to use an empty file for appending. + exit (EXIT_FAILURE); */ + } fclose (fp); } diff --git a/lib-src/leditcfns.c b/lib-src/leditcfns.c deleted file mode 100644 index 239db1cd1fa..00000000000 --- a/lib-src/leditcfns.c +++ /dev/null @@ -1,21 +0,0 @@ -#include <sgtty.h> -#include <signal.h> -#define STRLEN 100 -static char str[STRLEN+1] = "%?emacs"; /* extra char for the null */ - -switch_to_proc(){ - char *ptr = str; - while (*ptr) ioctl(0, TIOCSTI, ptr++); - ioctl(0, TIOCSTI, "\n"); - kill(getpid(), SIGTSTP); - } - -set_proc_str(ptr) char *ptr; { - if (strlen(ptr) <= STRLEN) - strcpy(str, ptr); - else - printf("string too long for set-proc-str: %s\n", ptr); - } - -/* arch-tag: eb7ae804-0d6e-4077-ab42-7173821410c3 - (do not change this comment) */ diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in index c145e47f197..f941e862514 100644 --- a/lib-src/makefile.w32-in +++ b/lib-src/makefile.w32-in @@ -20,7 +20,7 @@ # Boston, MA 02110-1301, USA. # -ALL = make-docfile hexl ctags etags movemail ebrowse +ALL = make-docfile hexl ctags etags movemail ebrowse sorted-doc digest-doc .PHONY: $(ALL) @@ -30,15 +30,10 @@ LOCAL_FLAGS = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \ # don't know what (if) to do with these yet... # -# $(BLD)/sorted-doc.exe \ -# $(BLD)/env.exe \ # $(BLD)/server.exe \ # $(BLD)/emacstool.exe \ -# $(BLD)/leditcfns.exe \ # $(BLD)/emacsclient.exe \ # $(BLD)/cvtmail.exe \ -# $(BLD)/digest-doc.exe \ -# $(BLD)/test-distrib.exe \ LIBS = $(BASE_LIBS) $(ADVAPI32) @@ -48,6 +43,12 @@ $(BLD)/hexl.exe: $(BLD)/hexl.$(O) $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(BLD)/hexl.$(O) $(LIBS) $(BLD)/fakemail.exe: $(BLD)/fakemail.$(O) $(BLD)/ntlib.$(O) $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(BLD)/fakemail.$(O) $(BLD)/ntlib.$(O) $(LIBS) +$(BLD)/sorted-doc.exe: $(BLD)/sorted-doc.$(O) + $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(BLD)/sorted-doc.$(O) $(LIBS) +$(BLD)/digest-doc.exe: $(BLD)/digest-doc.$(O) + $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(BLD)/digest-doc.$(O) $(LIBS) +$(BLD)/test-distrib.exe: $(BLD)/test-distrib.$(O) + $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(BLD)/test-distrib.$(O) $(LIBS) make-docfile: $(BLD) $(BLD)/make-docfile.exe ctags: $(BLD) $(BLD)/ctags.exe @@ -56,6 +57,11 @@ ebrowse: $(BLD) $(BLD)/ebrowse.exe hexl: $(BLD) $(BLD)/hexl.exe movemail: $(BLD) $(BLD)/movemail.exe fakemail: $(BLD) $(BLD)/fakemail.exe +sorted-doc: $(BLD) $(BLD)/sorted-doc.exe +digest-doc: $(BLD) $(BLD)/digest-doc.exe + +test-distrib: $(BLD) $(BLD)/test-distrib.exe + "$(BLD)/test-distrib.exe" "$(SRC)/testfile" GETOPTOBJS = $(BLD)/getopt.$(O) $(BLD)/getopt1.$(O) GETOPTDEPS = $(GETOPTOBJS) getopt.h @@ -114,15 +120,11 @@ $(BLD)/ctags.$(O): ctags.c # # don't know what to do with these yet... # -# $(BLD)/sorted-doc.exe: $(BLD)/sorted-doc.$(O) # $(BLD)/yow.exe: $(BLD)/yow.$(O) # $(BLD)/emacstool.exe: $(BLD)/emacstool.$(O) -# $(BLD)/leditcfns.exe: $(BLD)/leditcfns.$(O) # $(BLD)/server.exe: $(BLD)/server.$(O) # $(BLD)/cvtmail.exe: $(BLD)/cvtmail.$(O) -# $(BLD)/digest-doc.exe: $(BLD)/digest-doc.$(O) # $(BLD)/emacsclient.exe: $(BLD)/emacsclient.$(O) -# $(BLD)/test-distrib.exe: $(BLD)/test-distrib.$(O) # # From ..\src\Makefile.in @@ -283,6 +285,8 @@ install: $(INSTALL_FILES) $(CP) $(BLD)/ctags.exe $(INSTALL_DIR)/bin $(CP) $(BLD)/hexl.exe $(INSTALL_DIR)/bin $(CP) $(BLD)/movemail.exe $(INSTALL_DIR)/bin + $(CP) $(BLD)/sorted-doc.exe $(INSTALL_DIR)/bin + $(CP) $(BLD)/digest-doc.exe $(INSTALL_DIR)/bin - mkdir "$(INSTALL_DIR)/etc" $(CP) $(DOC) $(INSTALL_DIR)/etc @@ -438,7 +442,10 @@ $(BLD)/qsort.$(O) : \ $(SRC)/qsort.c $(BLD)/sorted-doc.$(O) : \ - $(SRC)/sorted-doc.c + $(SRC)/sorted-doc.c \ + $(EMACS_ROOT)/src/s/ms-w32.h \ + $(EMACS_ROOT)/src/m/intel386.h \ + $(EMACS_ROOT)/src/config.h \ $(BLD)/tcp.$(O) : \ $(SRC)/tcp.c diff --git a/lib-src/pop.c b/lib-src/pop.c index 7d6bcc5cdc9..5dcbf2d2483 100644 --- a/lib-src/pop.c +++ b/lib-src/pop.c @@ -135,7 +135,7 @@ static char *find_crlf __P((char *, int)); #define KPOP_PORT 1109 #define POP_SERVICE "pop3" /* we don't want the POP2 port! */ #ifdef KERBEROS -#define KPOP_SERVICE "kpop" +#define KPOP_SERVICE "kpop" /* never used: look for 20060515 to see why */ #endif char pop_error[ERROR_MAX]; @@ -264,10 +264,11 @@ pop_open (host, username, password, flags) return (0); } } - if (password) + if (password) /* always true, detected 20060515 */ flags |= POP_NO_KERBEROS; else - password = username; + password = username; /* dead code, detected 20060515 */ + /** "kpop" service is never used: look for 20060515 to see why **/ sock = socket_connection (host, flags); if (sock == -1) @@ -1047,6 +1048,7 @@ socket_connection (host, flags) bzero ((char *) &addr, sizeof (addr)); addr.sin_family = AF_INET; + /** "kpop" service is never used: look for 20060515 to see why **/ #ifdef KERBEROS service = (flags & POP_NO_KERBEROS) ? POP_SERVICE : KPOP_SERVICE; #else @@ -1073,6 +1075,7 @@ socket_connection (host, flags) } else { + /** "kpop" service is never used: look for 20060515 to see why **/ #ifdef KERBEROS addr.sin_port = htons ((flags & POP_NO_KERBEROS) ? POP_PORT : KPOP_PORT); diff --git a/lib-src/sorted-doc.c b/lib-src/sorted-doc.c index 0a06aa2c984..a8b2d441f9a 100644 --- a/lib-src/sorted-doc.c +++ b/lib-src/sorted-doc.c @@ -29,9 +29,15 @@ #include <stdio.h> #include <ctype.h> +#ifdef DOS_NT +#include <fcntl.h> /* for O_BINARY */ +#include <io.h> /* for setmode */ +#endif #ifndef HAVE_STDLIB_H /* config.h includes stdlib. */ +#ifndef WINDOWSNT /* src/s/ms-w32.h includes stdlib.h */ extern char *malloc (); #endif +#endif #define NUL '\0' #define MARKER '\037' @@ -134,6 +140,14 @@ main () DOCSTR *docs = NULL; /* chain of allocated DOCSTRS */ char buf[512]; /* line buffer */ +#ifdef DOS_NT + /* DOC is a binary file. */ + if (!isatty (fileno (stdin))) + setmode (fileno (stdin), O_BINARY); +#endif + + bp = buf; + while (1) /* process one char at a time */ { /* this char from the DOCSTR file */ diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d2a569fa76a..24e371c2240 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,8 +1,899 @@ +2006-06-07 Kenichi Handa <handa@m17n.org> + + * international/mule.el (find-auto-coding): Don't handle the short + name `char-trans'. + + * files.el (hack-local-variables-prop-line) + (hack-local-variables): Cancel the previous change. + +2006-06-06 Jesper Harder <harder@phys.au.dk> + + * ediff-diff.el (ediff-test-utility): Protect against + file-error. + +2006-06-06 Chong Yidong <cyd@stupidchicken.com> + + * diff-mode.el (diff-mode): Set buffer-read-only to t when + diff-default-read-only is non-nill. + (diff-hunk-kill, diff-file-kill, diff-split-hunk) + (diff-refine-hunk): Set inhibit-read-only to t. + + * diff.el (diff-sentinel, diff): Set inhibit-read-only to t when + modifying the *Diff* buffer. + (diff-process-filter): New filter function for diff process that + sets inhibit-read-only to t when modifying the *Diff* buffer. + +2006-06-06 Carsten Dominik <dominik@science.uva.nl> + + * textmodes/org.el: (org-archive-subtree): Use end-of-subtree as + insertion point and control the number of empty lines. + (org-paste-subtree): Limit the number of empty lines at the end of + the inserted tree. + (org-agenda): Use buffer name of current file for narrowing. + (org-export-as-xml): Command removed. + (org-export-xml-type): Option removed. + (org-mode-map): Call `org-export-as-xoxo' directly. + (org-get-indentation): New optional argument LINE. + (org-fix-indentation, org-remove-tabs): New functions. + (org-export-as-ascii, org-ascii-level-start): Determine and apply + correct indentation for headlines that are converted it items. + (org-skip-comments): Remove table lines that contain narrowing + cookies but no other non-empty fields. + (org-set-tags): Allow groups of mutually exclusive tags. + (org-cmp-time): Sort 24:21 before items without time. + (org-get-time-of-day): Fixed the interpretation of 12pm and 12am. + (org-open-at-point): Require double colon also for numbers. + +2006-06-06 Kim F. Storm <storm@cua.dk> + + * ido.el (ido-default-file-method, ido-default-buffer-method): + Make choice values consistent with corresponding command names. + (ido-visit-buffer): Update accordingly. Default to selected-window. + +2006-06-06 Nick Roberts <nickrob@snap.net.nz> + + * progmodes/gud.el (gud-running): Fix doc string. + (gud-menu-map): Use :visible instead fo :enable for debugger test. + (gud-tooltip-modes): Add python-mode. + (gud-tooltip-print-command): Add pdb. Remove perldb. + +2006-06-05 Eli Zaretskii <eliz@gnu.org> + + * makefile.w32-in (bootstrap, $(lisp)/mh-e/mh-loaddefs.el): + Quote $(EMACS). + +2006-06-05 Richard Stallman <rms@gnu.org> + + * faces.el (defined-colors): Doc fix. + +2006-06-05 Thien-Thi Nguyen <ttn@gnu.org> + + * vc.el (vc-process-filter): Inhibit undo info collection around + call to insert. + (vc-setup-buffer): Likewise for call to erase-buffer. + (vc-do-command): Likewise for call to process-file. + +2006-06-05 Nick Roberts <nickrob@snap.net.nz> + + * progmodes/gud.el (gud-menu-map): Use a conditional help echo + for gud-go. + (gud-common-init): Other debuggers may trigger error. + +2006-06-05 Kenichi Handa <handa@m17n.org> + + * international/mule.el (find-auto-coding): Handle + enable-character-translation in file header. + +2006-06-04 Kim F. Storm <storm@cua.dk> + + * emacs-lisp/authors.el (authors-aliases): Add mode aliases. + (authors-fixed-entries): Fix spelling. + (authors-canonical-file-name): Don't report error for wildcards. + + * help.el (view-emacs-news): Rewrite to support new NEWS, + NEWS.major, and NEWS.1-17 file naming. Add more intelligense, + e.g. version 10 matches 1.10, and don't be confused by version 1.1 + begin a prefix of 1.12 (etc). A numeric prefix arg also works. + +2006-06-03 Vivek Dasmohapatra <vivek@etla.org> + + * progmodes/sh-script.el (sh-quoted-exec): New face for quoted + exec constructs like `foo bar`. + (sh-quoted-subshell): New helper function to search for a possibly + nested subshell (like `` or $()) within a "" quoted string. + (sh-font-lock-keywords-var): Add sh-quoted-exec for Bash. + (sh-apply-quoted-subshell): Flag quote characters inside a + subshell, which is itself already in a quoted region, as + punctuation, since this is the closest to what they actually are. + (sh-font-lock-syntactic-keywords): Add sh-quoted-subshell and + sh-apply-quoted-subshell. + (sh-font-lock-syntactic-face-function): Apply the new face for + text inside `` instead of the old font-lock-string-face. + +2006-06-03 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * term/mac-win.el (mac-ts-active-input-overlay): Add defvar. + (mac-ae-number, mac-ae-frame, mac-ae-script-language) + (mac-bytes-to-text-range, mac-ae-text-range-array) + (mac-ts-update-active-input-buf, mac-split-string-by-property-change) + (mac-replace-untranslated-utf-8-chars, mac-ts-update-active-input-area) + (mac-ts-unicode-for-key-event): New functions. + (mac-handle-toolbar-switch-mode): Use mac-ae-frame. + (mac-handle-font-selection): Use mac-ae-number. + (mac-ts-active-input-buf, mac-ts-update-active-input-area-seqno): + New variables. + (mac-ts-caret-position, mac-ts-raw-text, mac-ts-selected-raw-text) + (mac-ts-converted-text, mac-ts-selected-converted-text) + (mac-ts-block-fill-text, mac-ts-outline-text) + (mac-ts-selected-text, mac-ts-no-hilite): New faces. + (mac-ts-hilite-style-faces): New constant. + (mac-apple-event-map): Bind text input events. + (mac-dispatch-apple-event): Use command-execute instead of + call-interactively. + (global-map): Don't bind mac-apple-event. + (special-event-map): Bind mac-apple-event. + +2006-06-02 Eli Zaretskii <eliz@gnu.org> + + * makefile.w32-in (EMACS): Remove quotes from the Emacs executable + file name. + (emacs): Enclose the value of $(EMACS) in quotes. + +2006-06-02 Juri Linkov <juri@jurta.org> + + * international/mule.el (sgml-html-meta-auto-coding-function): + Remove the condition `(search-forward "<html" size t)'. + Replace `\"' with `[\"']?' in `re-search-forward'. + +2006-06-02 Kenichi Handa <handa@m17n.org> + + * files.el (hack-local-variables-prop-line): Ignore `char-trans' + as well as `coding'. + (hack-local-variables): Likewise. + + * international/mule.el (enable-character-translation): Put + permanent-local and safe-local-variable properties. + (find-auto-coding): Handle char-trans: tag. + +2006-06-02 Juri Linkov <juri@jurta.org> + + * international/mule.el (sgml-html-meta-auto-coding-function): + Limit the search by the end of the HTML header (if any). + +2006-06-01 Richard Stallman <rms@gnu.org> + + * subr.el (with-current-buffer): Doc fix. + +2006-06-02 Masatake YAMATO <jet@gyve.org> + + * progmodes/compile.el (compilation-error-regexp-alist-alist::gcov-*): + Almost rewrite. Underlines over all lines of gcov output are too + uncomfortable to read. Suggested by Dan Nicolaescu. + +2006-06-01 Luc Teirlinck <teirllm@auburn.edu> + + * progmodes/inf-lisp.el (inferior-lisp-mode): Doc fixes. + + * shell.el (shell-mode): Use shell-mode-map in docstring. + + * comint.el (comint-send-input): Do not add help-echo and + mouse-face to input if `comint-use-prompt-regexp' is non-nil. + +2006-06-01 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> + + * term/x-win.el: Change x-menu-bar-start to menu-bar-open. + +2006-06-01 Nick Roberts <nickrob@snap.net.nz> + + * progmodes/gdb-ui.el (gdb-look-up-stack): New variable. + (gdb-stopped, gdb-info-stack-custom): If there is no source info + look up the stack and pop up GUD buffer if necessary. + (gdb-frames-select): Remove redundant call to gud-display-frame. + (gdb-info-threads-custom): Keep point at start of buffer. + (gdb-find-file-hook): Make it work for pre-GDB 6.4. + +2006-05-31 Juri Linkov <juri@jurta.org> + + * replace.el (query-replace-read-from, query-replace-read-to): + Bind `history-add-new-input' to nil. Call `add-to-history'. + +2006-05-31 Takaaki Ota <Takaaki.Ota@am.sony.com> + + * textmodes/table.el: Convert all HTML tags to lower case for + XHTML compatibility. + +2006-05-31 Masatake YAMATO <jet@gyve.org> + + * progmodes/compile.el: + (compilation-error-regexp-alist-alist::gcov-called-line): + Don't put face on `-' lines in gcov file. Suggested by Dan Nicolaescu. + +2006-05-31 Nick Roberts <nickrob@snap.net.nz> + + * progmodes/gud.el (gud-query-cmdline, gud-common-init): + Revert inadvertant changes made with last commit. + +2006-05-30 Reiner Steib <Reiner.Steib@gmx.de> + + * textmodes/flyspell.el (turn-on-flyspell, turn-off-flyspell): + New functions. + + * textmodes/text-mode.el (text-mode-hook): Use turn-on-flyspell. + +2006-05-30 Carsten Dominik <dominik@science.uva.nl> + + * textmodes/org.el: (org-agenda-highlight-todo): Make sure regexp + only matches in the right place. + (org-upcoming-deadline): New face. + (org-agenda-get-deadlines): Use new face `org-upcoming-deadline'. + (org-export-ascii-underline): Rename constant `org-ascii-underline' + and make it an option. + (org-export-ascii-bullets): New option. + (org-export-as-html): Many changes to emit valid XHTML. + (org-par-open): New variable. + (org-open-par, org-close-par-maybe, org-close-li-maybe): New functions. + (org-html-do-expand, org-section-number): Fixedcase in `replace-match'. + (org-timeline): Pass `org-timeline-show-empty-dates' to + `org-get-all-dates'. Interpret empty dates returned by `org-get-all-dates'. + (org-get-all-dates): New argument EMPTY. Add dates without + entries to the list, mark large ranges of empty dates. + (org-point-in-group, org-context): New functions. + +2006-05-30 Nick Roberts <nickrob@snap.net.nz> + + * progmodes/gud.el (gud-stop-subjob): Make it work in all buffers. + + * progmodes/gdb-ui.el: Move gdb-mouse-toggle-breakpoint-* to + C-mouse-1. Move gdb-mouse-until to mouse-3, gdb-mouse-jump + to C-mouse-3 (for 2 button mice). + (gdb-send): Do the right thing for C-d. + + * speedbar.el (speedbar-detach): Delete. + (speedbar-easymenu-definition-trailer): Remove speedbar-detach as + it breaks things. + (speedbar-reconfigure-keymaps): Always add extra items to pop up menu. + +2006-05-30 Daniel Pfeiffer <occitan@esperanto.org> + + * files.el (auto-mode-alist): Add makepp suffix and optional mk on + Makeppfile. + + * progmodes/compile.el (compilation-error-regexp-alist-alist): + Add makepp diagnostic. + +2006-05-29 Richard Stallman <rms@gnu.org> + + * window.el (fit-window-to-buffer): Doc fix. + + * help.el (temp-buffer-max-height): Doc fix. + + * subr.el (with-current-buffer): Doc fix. + +2006-05-29 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> + + * term/x-win.el: Bind F10 to menu-bar-start if available. + +2006-05-28 Dan Nicolaescu <dann@ics.uci.edu> + + * term.el (term-if-xemacs, term-ifnot-xemacs): Delete, replace + uses with a simple test. + (term-set-escape-char, term-mode, term-check-kill-echo-list) + (term-send-raw-string, term-send-raw, term-mouse-paste) + (term-char-mode, term-line-mode, term-exec, term-sentinel) + (term-handle-exit, term-read-input-ring) + (term-previous-matching-input-string) + (term-previous-matching-input-string-position) + (term-previous-matching-input-from-input) + (term-replace-by-expanded-history, term-send-input) + (term-skip-prompt, term-bol, term-send-invisible) + (term-kill-input, term-delchar-or-maybe-eof) + (term-backward-matching-input, term-check-source) + (term-proc-query, term-emulate-terminal) + (term-handle-colors-array, term-process-pager, term-pager-line) + (term-pager-bob, term-unwrap-line, term-word) + (term-dynamic-complete-filename) + (term-dynamic-complete-as-filename) + (term-dynamic-simple-complete): Replace one arm ifs with whens or + unlesses. + +2006-05-29 Stefan Monnier <monnier@iro.umontreal.ca> + + * files.el (hack-one-local-variable-eval-safep): Don't burp if used + during bootstrapping. + + * emacs-lisp/ewoc.el (ewoc--current-dll): Remove. + Basically undo the change of 2006-05-26: use extra arguments instead of + dynamic scoping. + (ewoc-locate): Remove unused var `footer'. + +2006-05-28 Stefan Monnier <monnier@iro.umontreal.ca> + + * emacs-lisp/ewoc.el (ewoc--insert-new-node): Use ewoc--refresh-node. + + * emacs-lisp/autoload.el (no-update-autoloads): Declare. + (generate-file-autoloads): Obey it. Return whether autoloads were + added at point or not. + (update-file-autoloads): Use this new return value. + Remove redundant test for the presence of an autoload cookie. + + * emacs-lisp/autoload.el (autoload-find-file): New fun. + This one calls hack-local-variables. + (generate-file-autoloads, update-file-autoloads): Use it. + + * textmodes/bibtex.el (bibtex-autokey-name-case-convert-function) + (bibtex-sort-entry-class): Add safe-local-variable predicate. + (bibtex-sort-entry-class-alist): Don't set the global value. + (bibtex-init-sort-entry-class-alist): New fun. + (bibtex-sort-buffer, bibtex-prepare-new-entry): Call it to compute + bibtex-init-sort-entry-class-alist from the buffer-local value (if any) + of bibtex-init-sort-entry-class. + +2006-05-28 Richard Stallman <rms@gnu.org> + + * subr.el (load-history-regexp): If FILE is relative, insist + entire last name component must match it. + (load-history-filename-element, load-history-regexp): Doc fixes. + +2006-05-29 Kim F. Storm <storm@cua.dk> + + * emacs-lisp/bindat.el (bindat-idx, bindat-raw): Rename dynamic vars + `pos' and `raw-data' for clarity, as eval forms may access these. + +2006-05-28 Kim F. Storm <storm@cua.dk> + + * emacs-lisp/bindat.el (bindat--unpack-u8): Use aref also for strings. + +2006-05-28 Stefan Monnier <monnier@iro.umontreal.ca> + + * progmodes/make-mode.el (makefile-browser-map) + (makefile-mode-syntax-table): Move initialization inside declaration. + (makefile-fill-paragraph): Use the default comment-filling code. + +2006-05-28 Chong Yidong <cyd@stupidchicken.com> + + * replace.el (query-replace-defaults): New variable. + (query-replace-read-from): Use `query-replace-defaults' for + default value, instead of history list. + (query-replace-read-to): Update `query-replace-defaults'. + +2006-05-27 Chong Yidong <cyd@stupidchicken.com> + + * msb.el (mouse-select-buffer): Minor fix to make popup menu work + with no X toolkit. + +2006-05-28 Nick Roberts <nickrob@snap.net.nz> + + * tumme.el (tumme-show-all-from-dir-max-files): Fix typo. + (tumme-show-all-from-dir): Add autoload. + +2006-05-27 Mathias Dahl <mathias.dahl@gmail.com> + + * tumme.el: Change a lot of `(if .. (progn ..)' to `(when ..)'. + (tumme-remove-tag): Fix bug. + +2006-05-27 Thien-Thi Nguyen <ttn@gnu.org> + + * emacs-lisp/ewoc.el (ewoc--create): No longer take HEADER and + FOOTER args. Update unique caller. + (ewoc-delete): Compute last node once before looping. + (ewoc--node-branch): Merge into unique caller. + (ewoc--node): Don't define constructor make-ewoc--node for this + structure. + (ewoc): Add member `hf-pp' to this structure. + (ewoc--wrap): New func. + (ewoc-create): Take additional arg NOSEP. If nil, wrap node and + header/footer pretty-printers. Save header/footer pretty-printer. + (ewoc-set-hf): Use ewoc's header/footer pretty-printer. * + + * pcvs.el (cvs-make-cvs-buffer): Specify NOSEP to `ewoc-create'. + +2006-05-27 Mathias Dahl <mathias.dahl@gmail.com> + + * dired.el (dired-mode-map): Change `tumme-tag-remove' to + `tumme-delete-tag'. Rename `Remove Image Tag' to `Delete Image + Tag'. Change "Compare directories..." to "Change Directories...". + Move tumme commands to Operate, Regexp and Immediate menus. + Change "Add Comment" to "Add Image Comment". Change "Add Image + Tag" to "Add Image Tags". + + * tumme.el (tumme-delete-tag): Rename from `tumme-tag-remove'. + (tumme-setup-dired-keybindings): Change `tumme-add-remove' to + `tumme-delete-tag'. + +2006-05-26 Luc Teirlinck <teirllm@auburn.edu> + + * shell.el (shell-mode): Call shell-dirtrack-mode after + list-buffers-directory is made a local variable, to avoid setting + the default value. + +2006-05-26 Kevin Ryde <user42@zip.com.au> + + * info.el (Info-index-next): Use where-is-internal to report + actual binding of Info-index-next, rather than hard-coded `,'. + +2006-05-26 Eli Zaretskii <eliz@gnu.org> + + * menu-bar.el (menu-bar-apropos-menu): Move "Find Key in Manual" + and "Find Command in Manual" to here. + + * buff-menu.el (list-buffers-noselect): For Info buffers, use + Info-current-file as the file name. + +2006-05-26 Jonathan Yavner <jyavner@member.fsf.org> + + * ses.el (defadvice undo-more): Delete this defadvice. The undo + overrides will now be done a different way. + (ses-set-parameter): Reapply this function for undo. + (ses-set-header-row): Reconstruct header row during undo. + (ses-widen): New function. + (ses-goto-data, ses-reconstruct-all): Use new function. + (ses-command-hook): Widen buffer during undo, before unupdating + the cells. + (ses-insert-row, ses-delete-row): Widen buffer during undo. + (ses-load, ses-header-row): Permit empty (zero-row) spreadsheets. + (ses-read-cell): Avoid stupid warning for RET RET on a cell whose + formula hasn't been executed yet. + +2006-05-26 Reiner Steib <Reiner.Steib@gmx.de> + + * comint.el (comint-kill-whole-line): Rename arg to count. + Fix doc string. + +2006-05-26 Chong Yidong <cyd@stupidchicken.com> + + * files.el (backup-buffer-copy): Remove deleted MUSTBENEW argument + to copy-file. + +2006-05-26 Reiner Steib <Reiner.Steib@gmx.de> + + * simple.el (toggle-truncate-lines): Make arg optional for + backward compatibility. + +2006-05-26 Thien-Thi Nguyen <ttn@gnu.org> + + * emacs-lisp/ewoc.el (ewoc--current-dll): New var. + (ewoc--node-next, ewoc--node-prev, ewoc--node-nth): Don't take + DLL arg. Instead, use ewoc--current-dll. Update all callers. + (ewoc--set-buffer-bind-dll-let*): Bind ewoc--current-dll, not `dll'. + (ewoc--adjust): Use ewoc--current-dll. + (ewoc-next, ewoc-prev, ewoc-nth): Bind ewoc--current-dll. + +2006-05-26 Carsten Dominik <dominik@science.uva.nl> + + * textmodes/org.el: (org-next-item, org-previous-item): Emit more + compact error message. + (org-tags-view): Refresh category table in each file. + (org-table-justify-field-maybe): Remove superfluous arguments to + `format'. + (org-export-as-html): Insert "<p>" before postamble. + (org-paste-subtree, org-kill-is-subtree-p): Check for empty kill ring. + +2006-05-26 Kenichi Handa <handa@m17n.org> + + * textmodes/po.el (po-find-charset): Pay attention to the case + FILENAME is a cons (NAME . BUFFER). + (po-find-file-coding-system-guts): Likewise. + + * arc-mode.el (archive-set-buffer-as-visiting-file): + Call find-operation-coding-system with (FILENAME . BUFFER). + + * tar-mode.el (tar-extract): Call find-operation-coding-system + with (FILENAME . BUFFER). + + * international/mule.el (decode-coding-inserted-region): + Call find-operation-coding-system with (FILENAME . BUFFER). + +2006-05-25 Chong Yidong <cyd@stupidchicken.com> + + * image-mode.el (image-toggle-display): Use buffer contents to + generate image for a remote file. + +2006-05-25 Juri Linkov <juri@jurta.org> + + * replace.el (query-replace-read-from, query-replace-read-to): + Remove 8th arg KEEP-ALL in read-from-minibuffer. + +2006-05-25 Rajesh Vaidheeswarran <rv@gnu.org> + + * whitespace.el (whitespace-cleanup): Change to cleanup + region if one is active. + * whitespace.el (whitespace-cleanup-internal): New internal method. + +2006-05-25 Mathias Dahl <mathias.dahl@gmail.com> + + * dired.el (dired-mode-map): Add help-echo strings to tumme + commands. Bind `tumme-dired-display-image' to C-t i. + + * tumme.el (tumme-display-image): Change documentation string slightly. + (tumme-dired-display-image): Add call to `display-buffer'. + +2006-05-25 Thien-Thi Nguyen <ttn@gnu.org> + + * emacs-lisp/bindat.el (bindat-unpack, bindat-pack): + Signal error if RAW-DATA is a multibyte string. + +2006-05-24 Richard Stallman <rms@gnu.org> + + * subr.el (with-local-quit): When handling `quit' signal, + make a chance for quit-flag to cause a quit. + + * emacs-lisp/advice.el (ad-enable-advice, ad-activate) + (ad-disable-advice): Add autoloads. + + * subr.el (read-passwd): Copy PROMPT before changing its properties. + +2006-05-25 Mathias Dahl <mathias.dahl@gmail.com> + + * dired.el (dired-mode-map): Change menu items for tumme as per + suggestions in emacs-devel. + +2006-05-25 Nick Roberts <nickrob@snap.net.nz> + + * dired.el (dired-mode-map): Fix breakage. + +2006-05-25 Mathias Dahl <mathias.dahl@gmail.com> + + * tumme.el (tumme-display-dired-image): Rename to... + (tumme-dired-display-image): ...this. + (tumme-track-movement): Change default value to t. + (tumme-display-thumbs): Add new optional parameter DO-NOT-POP, + used from `tumme-next-line-and-display' and similar commands. + + * dired.el (dired-mode-map): Add Thumbnail submenu under the + Immediate menu. Add some tumme commands there. + +2006-05-24 Luc Teirlinck <teirllm@auburn.edu> + + * loadup.el ("jka-cmpr-hook"): Load it before it is needed. + +2006-05-24 Chong Yidong <cyd@mit.edu> + + * menu-bar.el, international/mule-cmds.el: Remove tooltips for + menu entries that open submenus. + +2006-05-24 Alan Mackenzie <acm@muc.de> + + * startup.el (command-line): For names of preloaded files, don't + append ".elc" (now done in Fload), and call file-truename on the + lisp directory. + + * subr.el (eval-after-load): Fix the doc-string. Allow FILE to + match ANY loaded file with the right name, not just those in + load-path. Put a regexp matching the file name into + after-load-alist, rather than the name itself. + + * subr.el: New functions load-history-regexp, + load-history-filename-element, do-after-load-evaluation. + + * international/mule.el (load-with-code-conversion): Do the + eval-after-load stuff by calling do-after-load-evaluation. + +2006-05-25 Nick Roberts <nickrob@snap.net.nz> + + * progmodes/gud.el (gud-sentinel): Condition on GUD buffer if it + has not been killed. + +2006-05-24 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * term/mac-win.el: Set idle timer to clean up expired Apple events. + (mac-ae-get-url): Redispatch Apple event on unknown scheme. + (mac-dispatch-apple-event): Resume Apple event if it is suspended. + Optionally set error message in reply. + +2006-05-24 Carsten Dominik <dominik@science.uva.nl> + + * textmodes/org.el: (org-open-at-point): Use renamed variable + `org-confirm-shell-link-function'. + (org-confirm-shell-link-function): Rename from + `org-confirm-shell-links'. + (org-export-directory): New function. + (org-export-as-ascii, org-export-as-html, org-export-as-xoxo) + (org-export-icalendar): Use `org-export-directory'. + (org-indent-item): Keep cursor position. + (org-link-file-path-type): New option. + (org-export-as-html): Fix bug with plain lists starting in + column 0. + (org-export-as-html): Remove deadline formatting, this happens + now already in `org-html-handle-time-stamps'. + (org-export-html-style): Deadline class removed. + (org-insert-labeled-timestamps-at-point): New option. + (org-cycle, org-occur, org-scan-tags): Use `org-overview' instead + of `hide-sublevels 1', in case the first headline is not level 1. + (org-overview, org-content): New fuction. + (org-cycle-global-status, org-cycle-subtree-status): Make these + variables buffer-local. + (org-global-cycle): New command. + (org-shifttab): Use `org-global-cycle'. + (org-insert-heading, org-insert-item): Go to end of new + headline/item after creating it. + (org-export-visible): Rename from `org-export-copy-visible'. + Now creates a temporary org-file and applies an exporting command + to it. + (org-table-eval-formula): Support for lisp forms. + (org-agenda-todo-ignore-scheduled): New option. + (org-agenda-get-todos): Use new option + `org-agenda-todo-ignore-scheduled'. + (org-export-html-inline-images): New value `maybe'. + (org-export-as-html): Inlining of images dependent on link description. + (org-archive-subtree): Check for end-of-buffer before trying + `kill-line'. + (org-agenda-follow-mode): New option. + (org-export-with-tags, org-export-with-timestamps): New options. + (org-html-handle-time-stamps): New function. + (org-keyword-time-regexp): New variable. + (org-agenda-get-todos): Use `org-agenda-todo-list-sublevels'. + (org-agenda-todo-list-sublevels): New option. + (org-html-level-start): When TITLE is nil, just close all levels. + (org-parse-key-lines, org-parse-export-options): Remove functions, + replaced by `org-infile-export-plist'. + (org-combine-plists, org-infile-export-plist) + (org-default-export-plist): New functions. + (org-export-html-preamble, org-export-html-postamble) + (org-export-html-auto-preamble, org-export-html-auto-postamble): + New variables. + (org-export-publishing-directory): New option. + (org-export-as-html, org-export-as-ascii): Use the new property + lists for settings. + (org-export-copy-visible, org-export-as-xoxo): + Respect `org-export-publishing-directory'. + (org-link-search, org-store-link, org-file-apps): Support for + links to BibTeX database entries.. + (org-get-current-options, org-set-regexps-and-options): + Implement logging as a startup option. + (org-store-link): Make sure context string is never empty + (org-insert-link): Use relative path when possible. + (org-at-item-checklet-p): New function. + (org-shifttab, org-shiftmetaleft, org-shiftmetaright) + (org-shiftmetaup, org-shiftmetadown, org-metaleft) + (org-metaright, org-metaup, org-metadown, org-shiftup) + (org-shiftdown, org-shiftright, org-shiftleft) + (org-ctrl-c-ctrl-c, org-cycle, org-return, org-meta-return): + Dispatch using `call-interactively'. + (org-call-with-arg): New defsubst. + (org-tag-alist, org-use-fast-tag-selection): New options. + (org-complete): Use `org-tag-alist'. + (org-fast-tag-insert, org-fast-tag-selection): New functions. + (org-next-item, org-previous-item): New commands. + (org-beginning-of-item, org-end-of-item): Add (interactive) to + make command. + (org-shiftup, org-shiftdown): Accommodate the item-navigation commands. + + +2006-05-23 Thien-Thi Nguyen <ttn@gnu.org> + + * emacs-lisp/ewoc.el (ewoc-delete): New function. + (ewoc-filter): Use `ewoc-delete'. + + * emacs-lisp/bindat.el (bindat-pack): Doc fix. + +2006-05-22 Stefan Monnier <monnier@iro.umontreal.ca> + + * textmodes/bibtex.el (bibtex-format-entry, bibtex-clean-entry): + Signal more user-friendly error messages. + + * complete.el (PC-do-completion): Undo the addition of implicit + wildcards if they did not lead to finding any match. + (read-file-name-internal): Don't add the final > if the completion is + not finished. + +2006-05-22 Reiner Steib <Reiner.Steib@gmx.de> + + * textmodes/bibtex.el (bibtex-maintain-sorted-entries): + Quote safe-local-variable predicate. + +2006-05-22 Thien-Thi Nguyen <ttn@gnu.org> + + * emacs-lisp/ewoc.el (ewoc-set-data): New function. + +2006-05-21 Roland Winkler <Roland.Winkler@physik.uni-erlangen.de> + + * textmodes/bibtex.el (bibtex-maintain-sorted-entries): Mark as safe. + + * progmodes/make-mode.el (makefile-special-targets-list) + (makefile-macro-table, makefile-target-table): Mark as risky. + (makefile-query-one-target-method): Make this the alias for the + following variable. + (makefile-query-one-target-method-function): Make this the real name. + + * textmodes/artist.el (artist-text-renderer): Make this the alias + for the following variable. + (artist-text-renderer-function): Make this the real name. + + * textmodes/flyspell.el (flyspell-generic-check-word-p): Make this + the alias for the following variable. + (flyspell-generic-check-word-predicate): Make this the real name. + + * textmodes/ispell.el (ispell-format-word): Make this the alias + for the following variable. + (ispell-format-word-function): Make this the real name. + (ispell-message-text-end): Mark as risky. + + * skeleton.el (skeleton-transformation, skeleton-filter) + (skeleton-pair-filter): Make these the aliases for the following + variables. + (skeleton-transformation-function, skeleton-filter-function) + (skeleton-pair-filter-function): Make these the real names. + + * progmodes/sh-script.el (sh-mode): Use skeleton-filter-function + and skeleton-pair-filter-function. + + * textmodes/sgml-mode.el (sgml-transformation): Make this the + alias for the following variable. + (sgml-transformation-function): Make this the real name. + (sgml-tag-alist): Mark as risky. + +2006-05-21 Richard Stallman <rms@gnu.org> + + * simple.el (kill-region): Interactively, pass point, then mark. + +2006-05-22 Thien-Thi Nguyen <ttn@gnu.org> + + * emacs-lisp/ewoc.el (ewoc-create): Add autoload cookie. + +2006-05-21 Romain Francoise <romain@orebokech.com> + + * dired-x.el (dired-mode-map): Don't bind M-g. + +2006-05-20 Richard Stallman <rms@gnu.org> + + * dired.el (dired-mode-map): Put dired-goto-file on j, not M-g. + (dired-goto-file): Doc fix. + +2006-05-21 Kim F. Storm <storm@cua.dk> + + * emulation/cua-base.el: Mention customizing cua-mode as alternative + way to enable built-in cua-mode if user loads older CUA-mode package. + + * ido.el (ido-read-file-name): Bind ido-show-dot-for-dired to nil + if default-filename is specified. + +2006-05-20 Eli Zaretskii <eliz@gnu.org> + + * menu-bar.el (menu-bar-manuals-menu) <info-apropos>: New menu item. + + * info.el (info-apropos): Make sure current-file and current-node + have non-nil values. Speed up by using add-to-list instead of + manual consing. + +2006-05-20 Micha,Ak(Bl Cadilhac <michael.cadilhac@lrde.org> + + * progmodes/make-mode.el (makefile-mode): Doc fix. + +2006-05-20 Eli Zaretskii <eliz@gnu.org> + + * dired-aux.el (dired-do-shell-command): Doc fix. + +2006-05-20 Kevin Ryde <user42@zip.com.au> + + * info-xref.el (info-xref-check-all-custom): Skip :tag part of + ``(custom-manual :tag "Foo" "(foo)Node")''. + +2006-05-20 Karl Chen <quarl@cs.berkeley.edu> + + * progmodes/cc-vars.el (c-backslash-column): Mark as safe if its + value is an integer. + +2006-05-20 Eli Zaretskii <eliz@gnu.org> + + * mail/rmail.el (rmail-mime-charset-pattern): Add "?:" before + "format". + (rmail-convert-to-babyl-format): Undo the change from 2006-04-19. + +2006-05-20 Martin Rudalics <rudalics@gmx.at> + + * progmodes/hideif.el (show-ifdef-block): Fix bug where parts of + a hidden block remained hidden if `hide-ifdef-lines' is non-nil. + +2006-05-20 Stefan Monnier <monnier@iro.umontreal.ca> + + * progmodes/gud.el (gdb-script-font-lock-keywords): Use a stricter + regexp for keywords. + +2006-05-20 Masayuki FUJII <boochang@m4.kcn.ne.jp> (tiny change) + + * dnd.el (dnd-get-local-file-name): Specify LITERAL in + replace-regexp-in-string. + + * term/w32-win.el (w32-drag-n-drop): Substitute '/' for '\', + encode, and escape file name on conversion to URL. + +2006-05-20 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * dnd.el (dnd-handle-one-url): Change 3rd arg ARG to URL. + Don't unescape URL. + (dnd-get-local-file-name): Unescape URL on conversion to file name. + + * x-dnd.el (x-dnd-handle-file-name): Encode and escape file names + on conversion to URLs. + + * net/browse-url.el (browse-url-file-url): Encode file name on + conversion to URL. + + * term/mac-win.el (mac-ae-open-documents): Escape file name on + conversion to URL. + +2006-05-19 Eli Zaretskii <eliz@gnu.org> + + * progmodes/cc-styles.el (c-style-alist): Doc fix. + +2006-05-19 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * term/mac-win.el (mac-bytes-to-digits): Remove function. + (mac-handle-toolbar-switch-mode): Use coercion instead of it. + +2006-05-19 Glenn Morris <rgm@gnu.org> + + * calendar/diary-lib.el (diary-bahai-date) + (list-bahai-diary-entries, mark-bahai-diary-entries) + (mark-bahai-calendar-date-pattern): Not interactive. + (add-to-diary-list): New optional arg LITERAL. Doc fix. + (diary-entries-list): Change format of 4th element in each entry. + (diary-list-entries): Use add-to-diary-list. + (diary-goto-entry): Handle the case where the buffer visiting the + diary has been killed. + (fancy-diary-display): Add 'locator to button rather than 'marker. + Only generate temp-face when there are marks to apply. + (list-sexp-diary-entries): Pass literal to add-to-diary-list. + (diary-fancy-date-pattern): New variable. + (diary-time-regexp): Doc fix. + (diary-anniversary, diary-time): New faces. + (fancy-diary-font-lock-keywords): Use diary-fancy-date-pattern and + diary-time-regexp. Add font-lock-multiline property where needed. + Use new faces diary-anniversary and diary-time. + (diary-fancy-font-lock-fontify-region-function): New function, to + handle multiline font-lock pattern in fancy diary. + (fancy-diary-display-mode): Set font-lock-fontify-region-function. + (diary-font-lock-keywords): Tweak time regexp. Use new face + diary-time. + +2006-05-19 Alexander Shopov <ash@contact.bg> (tiny change) + + * international/code-pages.el (mik): Table corrected. + +2006-05-18 Kim F. Storm <storm@cua.dk> + + * progmodes/grep.el (grep-find): Don't check grep-find-command + before running command (breaks non-interactive usage). + +2006-05-18 Thien-Thi Nguyen <ttn@gnu.org> + + * emacs-lisp/ewoc.el (ewoc--adjust): New func. + (ewoc--insert-new-node): Don't insert trailing newline. + Instead, adjust successor nodes's start markers. + (ewoc--refresh-node): Delete all text from current node's start + marker to the next one's; adjust successor nodes's start markers. + (ewoc--create): Doc fixes. + (ewoc--refresh): Don't insert newline. + (ewoc--set-hf): Use `ewoc--set-buffer-bind-dll-let*'. + * pcvs.el (cvs-make-cvs-buffer): + Specify extra newline for ewoc's header and footer. + (cvs-update-header): Update initial header recognition. + Append newline to final header and footer values. + * pcvs-info.el (cvs-fileinfo-pp): Insert trailing newline. + +2006-05-17 Richard Stallman <rms@gnu.org> + + * files.el (file-name-extension): Doc fix. + +2006-05-17 Stefan Monnier <monnier@iro.umontreal.ca> + + * shell.el (shell-dirtrack-mode): Make it into a proper minor mode, so + we can explicitly enable/disable rather than toggle. + (shell-mode): Use it. + (shell-cd): Don't try to reproduce what `cd' does. + +2006-05-17 Kim F. Storm <storm@cua.dk> + + * ido.el (ido-read-internal): Use only nondirectory part of + default item. + 2006-05-17 Thien-Thi Nguyen <ttn@gnu.org> * emacs-lisp/ewoc.el (ewoc-data): Add docstring. (ewoc-nth): Doc fix. + (ewoc-map, ewoc-invalidate): Compute PP before looping. + 2006-05-16 Eli Zaretskii <eliz@gnu.org> * international/mule.el (auto-coding-alist): Add .lha to files @@ -161,8 +1052,7 @@ Move `safe-local-variable' declarations to the respective files. * help-fns.el (describe-variable): Don't print safe-var if it is - byte-code. Improve wording as suggested by Luc Teirlinck - <teirllm@auburn.edu>. + byte-code. Improve wording as suggested by Luc Teirlinck. 2006-05-11 Nick Roberts <nickrob@snap.net.nz> @@ -1289,7 +2179,7 @@ * files.el (hack-local-variables-confirm) <offer-save>: Clarify message text. Suggested by Ralf Angeli. -2006-04-08 Michael Cadilhac <michael.cadilhac@lrde.org> (tiny change) +2006-04-08 Michael Cadilhac <michael.cadilhac@lrde.org> * rect.el (kill-rectangle): Don't barf if `kill-read-only-ok' is set. (delete-extract-rectangle-line): Use `filter-buffer-substring' @@ -8117,7 +9007,7 @@ since the last ping. (rcirc-mode): Give rcirc-topic a local binding here. -2005-11-19 Michael Cadilhac <michael.cadilhac@lrde.org> (tiny change) +2005-11-19 Michael Cadilhac <michael.cadilhac@lrde.org> * subr.el (read-passwd): Fontify the prompt as we do with other prompts. @@ -9728,7 +10618,7 @@ * dired-x.el (dired-virtual): Don't use `dired-insert-headerline'. -2005-10-25 Michael Cadilhac <michael.cadilhac-@t-lrde.epita.fr> (tiny change) +2005-10-25 Michael Cadilhac <michael.cadilhac-@t-lrde.epita.fr> * play/blackbox.el (blackbox-redefine-key): New function. (blackbox-mode-map): Use it to remap existing bindings for cursor @@ -10992,7 +11882,7 @@ * progmodes/gdb-ui.el (gdb-fringe-width -> gdb-buffer-fringe-width): Typo. -2005-10-06 Michael Cadilhac <michael.cadilhac-@t-lrde.epita.fr> (tiny change) +2005-10-06 Michael Cadilhac <michael.cadilhac-@t-lrde.epita.fr> * play/zone.el (zone): Wrap body with save-window-excursion. @@ -11787,7 +12677,7 @@ * calendar/diary-lib.el (mark-diary-entries): Rearrange to wrap with-current-buffer form in save-excursion. -2005-09-18 D Goel <deego@gnufans.org> +2005-09-18 Deepak Goel <deego@gnufans.org> * apropos.el (apropos-command): Fix `message' call: first arg should be a format spec. In this and all other cases that appear @@ -21214,7 +22104,7 @@ * simple.el (goto-line): Doc fix. -2005-03-19 Aaron Hawley <Aaron.Hawley@uvm.edu> (tiny change) +2005-03-19 Aaron S. Hawley <Aaron.Hawley@uvm.edu> * files.el (save-buffer): Doc fix. diff --git a/lisp/ChangeLog.5 b/lisp/ChangeLog.5 index dad524ed851..5aedc76efed 100644 --- a/lisp/ChangeLog.5 +++ b/lisp/ChangeLog.5 @@ -2779,7 +2779,7 @@ continuations, don't go to line beg; perl-backward-to-start-of-continued-exp gives the right place. -1995-03-07 Enami Tsugutomo <enami@sys.ptg.sony.co.jp> +1995-03-07 Tsugutomo ENAMI <enami@sys.ptg.sony.co.jp> * simple.el (indent-new-comment-line): Clean up handling of \(...\) in comment-start-skip. diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el index 5b08182b7ee..2db56d0450a 100644 --- a/lisp/arc-mode.el +++ b/lisp/arc-mode.el @@ -898,8 +898,9 @@ using `make-temp-file', and the generated name is returned." ;; extracted file existed. (let ((file-name-handler-alist '(("" . archive-file-name-handler)))) - (car (find-operation-coding-system 'insert-file-contents - filename t)))))) + (car (find-operation-coding-system + 'insert-file-contents + (cons filename (current-buffer)) t)))))) (if (and (not coding-system-for-read) (not enable-multibyte-characters)) (setq coding diff --git a/lisp/buff-menu.el b/lisp/buff-menu.el index 3094da3bfe8..4998c1edf07 100644 --- a/lisp/buff-menu.el +++ b/lisp/buff-menu.el @@ -116,6 +116,8 @@ This variable determines whether reverting the buffer lists only file buffers. It affects both manual reverting and reverting by Auto Revert Mode.") +(defvar Info-current-file) ;; from info.el + (make-variable-buffer-local 'Buffer-menu-files-only) (if Buffer-menu-mode-map @@ -767,10 +769,24 @@ For more information, see the function `buffer-menu'." ?\s))) (unless file ;; No visited file. Check local value of - ;; list-buffers-directory. - (when (and (boundp 'list-buffers-directory) - list-buffers-directory) - (setq file list-buffers-directory))) + ;; list-buffers-directory and, for Info buffers, + ;; Info-current-file. + (cond ((and (boundp 'list-buffers-directory) + list-buffers-directory) + (setq file list-buffers-directory)) + ((eq major-mode 'Info-mode) + (setq file Info-current-file) + (cond + ((eq file t) + (setq file "*Info Directory*")) + ((eq file 'apropos) + (setq file "*Info Apropos*")) + ((eq file 'history) + (setq file "*Info History*")) + ((eq file 'toc) + (setq file "*Info TOC*")) + ((not (stringp file)) ;; avoid errors + (setq file nil)))))) (push (list buffer bits name (buffer-size) mode file) list)))))) ;; Preserve the original buffer-list ordering, just in case. diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el index c27939b8075..95588fccd92 100644 --- a/lisp/calendar/diary-lib.el +++ b/lisp/calendar/diary-lib.el @@ -121,20 +121,16 @@ The holidays are those in the list `calendar-holidays'.") "Mark dates in calendar window that conform to Islamic date MONTH/DAY/YEAR.") (autoload 'diary-bahai-date "cal-bahai" - "Baha'i calendar equivalent of date diary entry." - t) + "Baha'i calendar equivalent of date diary entry.") (autoload 'list-bahai-diary-entries "cal-bahai" - "Add any Baha'i date entries from the diary file to `diary-entries-list'." - t) + "Add any Baha'i date entries from the diary file to `diary-entries-list'.") (autoload 'mark-bahai-diary-entries "cal-bahai" - "Mark days in the calendar window that have Baha'i date diary entries." - t) + "Mark days in the calendar window that have Baha'i date diary entries.") (autoload 'mark-bahai-calendar-date-pattern "cal-bahai" - "Mark dates in calendar window that conform to Baha'i date MONTH/DAY/YEAR." - t) + "Mark dates in calendar window that conform to Baha'i date MONTH/DAY/YEAR.") (autoload 'diary-hebrew-date "cal-hebrew" "Hebrew calendar equivalent of date diary entry.") @@ -323,6 +319,42 @@ number of days of diary entries displayed." (integer :tag "Saturday"))) :group 'diary) + +(defvar diary-modify-entry-list-string-function nil + "Function applied to entry string before putting it into the entries list. +Can be used by programs integrating a diary list into other buffers (e.g. +org.el and planner.el) to modify the string or add properties to it. +The function takes a string argument and must return a string.") + +(defun add-to-diary-list (date string specifier &optional marker + globcolor literal) + "Add an entry to `diary-entries-list'. +Do nothing if DATE or STRING is nil. DATE is the (MONTH DAY +YEAR) for which the entry applies; STRING is the text of the +entry as it will appear in the diary (i.e. with any format +strings such as \"%d\" expanded); SPECIFIER is the date part of +the entry as it appears in the diary-file; LITERAL is the entry +as it appears in the diary-file (i.e. before expansion). If +LITERAL is nil, it is taken to be the same as STRING. + +The entry is added to the list as (DATE STRING SPECIFIER LOCATOR +GLOBCOLOR), where LOCATOR has the form (MARKER FILENAME LITERAL), +FILENAME being the file containing the diary entry." + (when (and date string) + (if diary-file-name-prefix + (let ((prefix (funcall diary-file-name-prefix-function + (buffer-file-name)))) + (or (string= prefix "") + (setq string (format "[%s] %s" prefix string))))) + (and diary-modify-entry-list-string-function + (setq string (funcall diary-modify-entry-list-string-function + string))) + (setq diary-entries-list + (append diary-entries-list + (list (list date string specifier + (list marker (buffer-file-name) literal) + globcolor)))))) + (define-obsolete-function-alias 'list-diary-entries 'diary-list-entries) (defun diary-list-entries (date number &optional list-only) "Create and display a buffer containing the relevant lines in `diary-file'. @@ -468,9 +500,7 @@ If LIST-ONLY is non-nil don't modify or display the buffer, only return a list." (copy-marker entry-start) (nth 1 temp))))))) (or entry-found (not diary-list-include-blanks) - (setq diary-entries-list - (append diary-entries-list - (list (list date "" "" "" ""))))) + (add-to-diary-list date "" "" "" "")) (setq date (calendar-gregorian-from-absolute (1+ (calendar-absolute-from-gregorian date)))) @@ -577,10 +607,27 @@ changing the variable `diary-include-string'." 'face 'diary-button) (defun diary-goto-entry (button) - (let ((marker (button-get button 'marker))) - (when marker - (pop-to-buffer (marker-buffer marker)) - (goto-char (marker-position marker))))) + (let* ((locator (button-get button 'locator)) + (marker (car locator)) + markbuf file) + ;; If marker pointing to diary location is valid, use that. + (if (and marker (setq markbuf (marker-buffer marker))) + (progn + (pop-to-buffer markbuf) + (goto-char (marker-position marker))) + ;; Marker is invalid (eg buffer has been killed). + (or (and (setq file (cadr locator)) + (file-exists-p file) + (find-file-other-window file) + (progn + (when (eq major-mode default-major-mode) (diary-mode)) + (goto-char (point-min)) + (if (re-search-forward (format "%s.*\\(%s\\)" + (regexp-quote (nth 2 locator)) + (regexp-quote (nth 3 locator))) + nil t) + (goto-char (match-beginning 1))))) + (message "Unable to locate this diary entry"))))) (defun fancy-diary-display () "Prepare a diary buffer with relevant entries in a fancy, noneditable form. @@ -666,37 +713,45 @@ This function is provided for optional use as the `diary-display-hook'." (setq entry (car (cdr (car entry-list)))) (if (< 0 (length entry)) - (progn - (if (nth 3 (car entry-list)) + (let ((this-entry (car entry-list)) + this-loc) + (if (setq this-loc (nth 3 this-entry)) (insert-button (concat entry "\n") - 'marker (nth 3 (car entry-list)) + ;; (MARKER FILENAME SPECIFIER LITERAL) + 'locator (list (car this-loc) + (cadr this-loc) + (nth 2 this-entry) + (or (nth 2 this-loc) + (nth 1 this-entry))) :type 'diary-entry) (insert entry ?\n)) (save-excursion - (let* ((marks (nth 4 (car entry-list))) - (temp-face (make-symbol - (apply - 'concat "temp-face-" - (mapcar (lambda (sym) - (if (stringp sym) - sym - (symbol-name sym))) - marks)))) - (faceinfo marks)) - (make-face temp-face) - ;; Remove :face info from the marks, - ;; copy the face info into temp-face - (while (setq faceinfo (memq :face faceinfo)) - (copy-face (read (nth 1 faceinfo)) temp-face) - (setcar faceinfo nil) - (setcar (cdr faceinfo) nil)) - (setq marks (delq nil marks)) - ;; Apply the font aspects. - (apply 'set-face-attribute temp-face nil marks) - (search-backward entry) - (overlay-put - (make-overlay (match-beginning 0) (match-end 0)) - 'face temp-face))))) + (let* ((marks (nth 4 this-entry)) + (faceinfo marks) + temp-face) + (when marks + (setq temp-face (make-symbol + (apply + 'concat "temp-face-" + (mapcar (lambda (sym) + (if (stringp sym) + sym + (symbol-name sym))) + marks)))) + (make-face temp-face) + ;; Remove :face info from the marks, + ;; copy the face info into temp-face + (while (setq faceinfo (memq :face faceinfo)) + (copy-face (read (nth 1 faceinfo)) temp-face) + (setcar faceinfo nil) + (setcar (cdr faceinfo) nil)) + (setq marks (delq nil marks)) + ;; Apply the font aspects. + (apply 'set-face-attribute temp-face nil marks) + (search-backward entry) + (overlay-put + (make-overlay (match-beginning 0) (match-end 0)) + 'face temp-face)))))) (setq entry-list (cdr entry-list)))) (set-buffer-modified-p nil) (goto-char (point-min)) @@ -1350,7 +1405,7 @@ best if they are nonmarking." (setq line-start (point))) (setq specifier (buffer-substring-no-properties (1+ line-start) (point)) - entry-start (1+ line-start)) + entry-start (1+ line-start)) (forward-char 1) (if (and (or (char-equal (preceding-char) ?\^M) (char-equal (preceding-char) ?\n)) @@ -1367,24 +1422,26 @@ best if they are nonmarking." (while (string-match "[\^M]" entry) (aset entry (match-beginning 0) ?\n ))) (let ((diary-entry (diary-sexp-entry sexp entry date)) - temp) - (setq entry (if (consp diary-entry) - (cdr diary-entry) - diary-entry)) + temp literal) + (setq literal entry ; before evaluation + entry (if (consp diary-entry) + (cdr diary-entry) + diary-entry)) (if diary-entry - (progn + (progn (remove-overlays line-start (point) 'invisible 'diary) - (if (< 0 (length entry)) - (setq temp (diary-pull-attrs entry file-glob-attrs) - entry (nth 0 temp) - marks (nth 1 temp))))) - (add-to-diary-list date - entry - specifier - (if entry-start (copy-marker entry-start) - nil) - marks) - (setq entry-found (or entry-found diary-entry))))) + (if (< 0 (length entry)) + (setq temp (diary-pull-attrs entry file-glob-attrs) + entry (nth 0 temp) + marks (nth 1 temp))))) + (add-to-diary-list date + entry + specifier + (if entry-start (copy-marker entry-start) + nil) + marks + literal) + (setq entry-found (or entry-found diary-entry))))) entry-found)) (defun diary-sexp-entry (sexp entry date) @@ -1636,28 +1693,6 @@ marked on the calendar." (or (diary-remind sexp (car days) marking) (diary-remind sexp (cdr days) marking)))))) -(defvar diary-modify-entry-list-string-function nil - "Function applied to entry string before putting it into the entries list. -Can be used by programs integrating a diary list into other buffers (e.g. -org.el and planner.el) to modify the string or add properties to it. -The function takes a string argument and must return a string.") - -(defun add-to-diary-list (date string specifier &optional marker globcolor) - "Add the entry (DATE STRING SPECIFIER MARKER GLOBCOLOR) to `diary-entries-list'. -Do nothing if DATE or STRING is nil." - (when (and date string) - (if diary-file-name-prefix - (let ((prefix (funcall diary-file-name-prefix-function - (buffer-file-name)))) - (or (string= prefix "") - (setq string (format "[%s] %s" prefix string))))) - (and diary-modify-entry-list-string-function - (setq string (funcall diary-modify-entry-list-string-function - string))) - (setq diary-entries-list - (append diary-entries-list - (list (list date string specifier marker globcolor)))))) - (defun diary-redraw-calendar () "If `calendar-buffer' is live and diary entries are marked, redraw it." (and mark-diary-entries-in-calendar @@ -1796,36 +1831,86 @@ Prefix arg will make the entry nonmarking." (if diary-header-line-flag (setq header-line-format diary-header-line-format))) -(define-derived-mode fancy-diary-display-mode fundamental-mode - "Diary" - "Major mode used while displaying diary entries using Fancy Display." - (set (make-local-variable 'font-lock-defaults) - '(fancy-diary-font-lock-keywords t)) - (local-set-key "q" 'quit-window)) +(defvar diary-fancy-date-pattern + (concat + (let ((dayname (diary-name-pattern calendar-day-name-array nil t)) + (monthname (diary-name-pattern calendar-month-name-array nil t)) + (day "[0-9]+") + (month "[0-9]+") + (year "-?[0-9]+")) + (mapconcat 'eval calendar-date-display-form "")) + ;; Optional ": holiday name" after the date. + "\\(: .*\\)?") + "Regular expression matching a date header in Fancy Diary.") + +(defconst diary-time-regexp + ;; Accepted formats: 10:00 10.00 10h00 10h 10am 10:00am 10.00am + ;; Use of "." as a separator annoyingly matches numbers, eg "123.45". + ;; Hence often prefix this with "\\(^\\|\\s-\\)." + (concat "[0-9]?[0-9]\\([AaPp][mM]\\|\\(" + "[Hh]\\([0-9][0-9]\\)?\\|[:.][0-9][0-9]" + "\\)\\([AaPp][Mm]\\)?\\)") + "Regular expression matching a time of day.") + +(defface diary-anniversary '((t :inherit font-lock-keyword-face)) + "Face used for anniversaries in the diary." + :version "22.1" + :group 'diary) + +(defface diary-time '((t :inherit font-lock-variable-name-face)) + "Face used for times of day in the diary." + :version "22.1" + :group 'diary) (defvar fancy-diary-font-lock-keywords (list - (cons - (concat - (let ((dayname (diary-name-pattern calendar-day-name-array nil t)) - (monthname (diary-name-pattern calendar-month-name-array nil t)) - (day "[0-9]+") - (month "[0-9]+") - (year "-?[0-9]+")) - (mapconcat 'eval calendar-date-display-form "")) - "\\(\\(: .*\\)\\|\\(\n +.*\\)\\)*\n=+$") - 'diary-face) - '("^.*anniversary.*$" . font-lock-keyword-face) - '("^.*birthday.*$" . font-lock-keyword-face) + (list + ;; Any number of " other holiday name" lines, followed by "==" line. + (concat diary-fancy-date-pattern "\\(\n +.*\\)*\n=+$") + '(0 (progn (put-text-property (match-beginning 0) (match-end 0) + 'font-lock-multiline t) + diary-face))) + '("^.*\\([aA]nniversary\\|[bB]irthday\\).*$" . 'diary-anniversary) '("^.*Yahrzeit.*$" . font-lock-reference-face) '("^\\(Erev \\)?Rosh Hodesh.*" . font-lock-function-name-face) '("^Day.*omer.*$" . font-lock-builtin-face) '("^Parashat.*$" . font-lock-comment-face) - '("^[ \t]*[0-9]?[0-9]\\([:.]?[0-9][0-9]\\)?\\(am\\|pm\\|AM\\|PM\\)?\\(-[0-9]?[0-9]\\([:.]?[0-9][0-9]\\)?\\(am\\|pm\\|AM\\|PM\\)?\\)?" - . font-lock-variable-name-face)) + `(,(format "\\(^\\|\\s-\\)%s\\(-%s\\)?" diary-time-regexp + diary-time-regexp) . 'diary-time)) "Keywords to highlight in fancy diary display") +;; If region looks like it might start or end in the middle of a +;; multiline pattern, extend the region to encompass the whole pattern. +(defun diary-fancy-font-lock-fontify-region-function (beg end &optional verbose) + "Function to use for `font-lock-fontify-region-function' in Fancy Diary. +Needed to handle multiline keyword in `fancy-diary-font-lock-keywords'." + (goto-char beg) + (forward-line 0) + (if (looking-at "=+$") (forward-line -1)) + (while (and (looking-at " +[^ ]") + (zerop (forward-line -1)))) + ;; This check not essential. + (if (looking-at diary-fancy-date-pattern) + (setq beg (line-beginning-position))) + (goto-char end) + (forward-line 0) + (while (and (looking-at " +[^ ]") + (zerop (forward-line 1)))) + (if (looking-at "=+$") + (setq end (line-beginning-position 2))) + (font-lock-default-fontify-region beg end verbose)) + +(define-derived-mode fancy-diary-display-mode fundamental-mode + "Diary" + "Major mode used while displaying diary entries using Fancy Display." + (set (make-local-variable 'font-lock-defaults) + '(fancy-diary-font-lock-keywords + t nil nil nil + (font-lock-fontify-region-function + . diary-fancy-font-lock-fontify-region-function))) + (local-set-key "q" 'quit-window)) + (defun diary-font-lock-sexps (limit) "Recognize sexp diary entry for font-locking." @@ -1877,13 +1962,6 @@ names." (eval-when-compile (require 'cal-hebrew) (require 'cal-islam)) -(defconst diary-time-regexp - ;; Formats that should be accepted: - ;; 10:00 10.00 10h00 10h 10am 10:00am 10.00am - (concat "[0-9]?[0-9]\\([AaPp][mM]\\|\\(" - "[Hh]\\([0-9][0-9]\\)?\\|[:.][0-9][0-9]" - "\\)\\([AaPp][Mm]\\)?\\)")) - (defvar diary-font-lock-keywords (append (diary-font-lock-date-forms calendar-month-name-array @@ -1924,10 +2002,9 @@ names." "?\\(" (regexp-quote islamic-diary-entry-symbol) "\\)") '(1 font-lock-reference-face)) '(diary-font-lock-sexps . font-lock-keyword-face) - (cons - (concat ;; "^[ \t]+" - diary-time-regexp "\\(-" diary-time-regexp "\\)?") - 'font-lock-function-name-face))) + `(,(concat "\\(^\\|\\s-\\)" + diary-time-regexp "\\(-" diary-time-regexp "\\)?") + . 'diary-time))) "Forms to highlight in `diary-mode'.") diff --git a/lisp/comint.el b/lisp/comint.el index 1b9d8df738f..eb5c9f28a4e 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -1047,12 +1047,12 @@ Moves relative to `comint-input-ring-index'." (defun comint-previous-input (arg) "Cycle backwards through input history, saving input." (interactive "*p") - (if (and comint-input-ring-index + (if (and comint-input-ring-index (or ;; leaving the "end" of the ring (and (< arg 0) ; going down (eq comint-input-ring-index 0)) (and (> arg 0) ; going up - (eq comint-input-ring-index + (eq comint-input-ring-index (1- (ring-length comint-input-ring))))) comint-stored-incomplete-input) (comint-restore-input) @@ -1510,23 +1510,23 @@ Similarly for Soar, Scheme, etc." (concat input "\n"))) (let ((beg (marker-position pmark)) - (end (if no-newline (point) (1- (point)))) - (inhibit-modification-hooks t)) + (end (if no-newline (point) (1- (point)))) + (inhibit-modification-hooks t)) (when (> end beg) - ;; Set text-properties for the input field - (add-text-properties - beg end - '(front-sticky t - font-lock-face comint-highlight-input - mouse-face highlight - help-echo "mouse-2: insert after prompt as new input")) + (add-text-properties beg end + '(front-sticky t + font-lock-face comint-highlight-input)) (unless comint-use-prompt-regexp ;; Give old user input a field property of `input', to ;; distinguish it from both process output and unsent ;; input. The terminating newline is put into a special ;; `boundary' field to make cursor movement between input ;; and output fields smoother. - (put-text-property beg end 'field 'input))) + (add-text-properties + beg end + '(mouse-face highlight + help-echo "mouse-2: insert after prompt as new input" + field input)))) (unless (or no-newline comint-use-prompt-regexp) ;; Cover the terminating newline (add-text-properties end (1+ end) @@ -2357,19 +2357,19 @@ preceding newline is removed." (when (eq (get-text-property (1- pt) 'read-only) 'fence) (remove-list-of-text-properties (1- pt) pt '(read-only))))))) -(defun comint-kill-whole-line (&optional arg) +(defun comint-kill-whole-line (&optional count) "Kill current line, ignoring read-only and field properties. -With prefix arg, kill that many lines starting from the current line. -If arg is negative, kill backward. Also kill the preceding newline, +With prefix arg COUNT, kill that many lines starting from the current line. +If COUNT is negative, kill backward. Also kill the preceding newline, instead of the trailing one. \(This is meant to make \\[repeat] work well with negative arguments.) -If arg is zero, kill current line but exclude the trailing newline. +If COUNT is zero, kill current line but exclude the trailing newline. The read-only status of newlines is updated with `comint-update-fence', if necessary." (interactive "p") (let ((inhibit-read-only t) (inhibit-field-text-motion t)) - (kill-whole-line arg) - (when (>= arg 0) (comint-update-fence)))) + (kill-whole-line count) + (when (>= count 0) (comint-update-fence)))) (defun comint-kill-region (beg end &optional yank-handler) "Like `kill-region', but ignores read-only properties, if safe. diff --git a/lisp/complete.el b/lisp/complete.el index 6620db860c3..d0e3fbe8ddf 100644 --- a/lisp/complete.el +++ b/lisp/complete.el @@ -369,7 +369,7 @@ of `minibuffer-completion-table' and the minibuffer contents.") (str (buffer-substring beg end)) (incname (and filename (string-match "<\\([^\"<>]*\\)>?$" str))) (ambig nil) - basestr + basestr origstr env-on regex p offset @@ -415,7 +415,7 @@ of `minibuffer-completion-table' and the minibuffer contents.") (file-name-nondirectory dir)) "*/" file)) (setq dir (file-name-directory dir))) - (setq str (concat dir file)))) + (setq origstr str str (concat dir file)))) ;; Look for wildcard expansions in directory name (and filename @@ -443,7 +443,14 @@ of `minibuffer-completion-table' and the minibuffer contents.") (setq str (concat dir (file-name-nondirectory str))) (insert str) (setq end (+ beg (length str))))) - (setq filename nil table nil pred nil)))) + (if origstr + ;; If the wildcards were introduced by us, it's possible + ;; that read-file-name-internal (especially our + ;; PC-include-file advice) can still find matches for the + ;; original string even if we couldn't, so remove the + ;; added wildcards. + (setq str origstr) + (setq filename nil table nil pred nil))))) ;; Strip directory name if appropriate (if filename @@ -943,10 +950,11 @@ absolute rather than relative to some directory on the SEARCH-PATH." (if (string-match "<\\([^\"<>]*\\)>?\\'" (ad-get-arg 0)) (let* ((string (ad-get-arg 0)) (action (ad-get-arg 2)) - (name (substring string (match-beginning 1) (match-end 1))) + (name (match-string 1 string)) (str2 (substring string (match-beginning 0))) (completion-table - (mapcar (lambda (x) (format "<%s>" x)) + (mapcar (lambda (x) + (format (if (string-match "/\\'" x) "<%s" "<%s>") x)) (PC-include-file-all-completions name (PC-include-file-path))))) (setq ad-return-value diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el index 1a8402e06c4..7ea02352b0b 100644 --- a/lisp/diff-mode.el +++ b/lisp/diff-mode.el @@ -438,7 +438,8 @@ If the prefix ARG is given, restrict the view to the current file instead." (firsthunk (ignore-errors (goto-char start) (diff-beginning-of-file) (diff-hunk-next) (point))) - (nextfile (ignore-errors (diff-file-next) (point)))) + (nextfile (ignore-errors (diff-file-next) (point))) + (inhibit-read-only t)) (goto-char start) (if (and firsthunk (= firsthunk start) (or (null nexthunk) @@ -457,7 +458,8 @@ If the prefix ARG is given, restrict the view to the current file instead." (ignore-errors (diff-hunk-prev) (point)))) (index (save-excursion - (re-search-backward "^Index: " prevhunk t)))) + (re-search-backward "^Index: " prevhunk t))) + (inhibit-read-only t)) (when index (setq start index)) (diff-end-of-file) (if (looking-at "^\n") (forward-char 1)) ;`tla' generates such diffs. @@ -497,7 +499,8 @@ If the prefix ARG is given, restrict the view to the current file instead." (let* ((start1 (string-to-number (match-string 1))) (start2 (string-to-number (match-string 2))) (newstart1 (+ start1 (diff-count-matches "^[- \t]" (point) pos))) - (newstart2 (+ start2 (diff-count-matches "^[+ \t]" (point) pos)))) + (newstart2 (+ start2 (diff-count-matches "^[+ \t]" (point) pos))) + (inhibit-read-only t)) (goto-char pos) ;; Hopefully the after-change-function will not screw us over. (insert "@@ -" (number-to-string newstart1) ",1 +" @@ -993,8 +996,7 @@ a diff with \\[diff-reverse-direction]." ;; compile support (set (make-local-variable 'next-error-function) 'diff-next-error) - (when (and (> (point-max) (point-min)) diff-default-read-only) - (toggle-read-only t)) + (setq buffer-read-only diff-default-read-only) ;; setup change hooks (if (not diff-update-on-the-fly) (add-hook 'write-contents-functions 'diff-write-contents-hooks nil t) @@ -1355,6 +1357,7 @@ For use in `add-log-current-defun-function'." (file1 (make-temp-file "diff1")) (file2 (make-temp-file "diff2")) (coding-system-for-read buffer-file-coding-system) + (inhibit-read-only t) old new) (unwind-protect (save-excursion diff --git a/lisp/diff.el b/lisp/diff.el index 221d7b2e363..534a84d4317 100644 --- a/lisp/diff.el +++ b/lisp/diff.el @@ -67,9 +67,10 @@ CODE is the exit code of the process. It should be 0 iff no diffs were found." (if diff-new-temp-file (delete-file diff-new-temp-file)) (save-excursion (goto-char (point-max)) - (insert (format "\nDiff finished%s. %s\n" - (if (equal 0 code) " (no differences)" "") - (current-time-string))))) + (let ((inhibit-read-only t)) + (insert (format "\nDiff finished%s. %s\n" + (if (equal 0 code) " (no differences)" "") + (current-time-string)))))) ;;;###autoload (defun diff (old new &optional switches no-async) @@ -119,7 +120,8 @@ With prefix arg, prompt for diff switches." (set-buffer buf) (setq buffer-read-only nil) (buffer-disable-undo (current-buffer)) - (erase-buffer) + (let ((inhibit-read-only t)) + (erase-buffer)) (buffer-enable-undo (current-buffer)) (diff-mode) (set (make-local-variable 'revert-buffer-function) @@ -128,21 +130,35 @@ With prefix arg, prompt for diff switches." (set (make-local-variable 'diff-old-temp-file) old-alt) (set (make-local-variable 'diff-new-temp-file) new-alt) (setq default-directory thisdir) - (insert command "\n") + (let ((inhibit-read-only t)) + (insert command "\n")) (if (and (not no-async) (fboundp 'start-process)) (progn (setq proc (start-process "Diff" buf shell-file-name shell-command-switch command)) + (set-process-filter proc 'diff-process-filter) (set-process-sentinel proc (lambda (proc msg) (with-current-buffer (process-buffer proc) (diff-sentinel (process-exit-status proc)))))) ;; Async processes aren't available. - (diff-sentinel - (call-process shell-file-name nil buf nil - shell-command-switch command)))) + (let ((inhibit-read-only t)) + (diff-sentinel + (call-process shell-file-name nil buf nil + shell-command-switch command))))) buf)) +(defun diff-process-filter (proc string) + (with-current-buffer (process-buffer proc) + (let ((moving (= (point) (process-mark proc)))) + (save-excursion + ;; Insert the text, advancing the process marker. + (goto-char (process-mark proc)) + (let ((inhibit-read-only t)) + (insert string)) + (set-marker (process-mark proc) (point))) + (if moving (goto-char (process-mark proc)))))) + ;;;###autoload (defun diff-backup (file &optional switches) "Diff this file with its backup file or vice versa. diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el index e07689973e4..b4cb8933194 100644 --- a/lisp/dired-aux.el +++ b/lisp/dired-aux.el @@ -493,7 +493,8 @@ the Dired buffer, so output files usually are created there instead of in a subdir. In a noninteractive call (from Lisp code), you must specify -the list of file names explicitly with the FILE-LIST argument." +the list of file names explicitly with the FILE-LIST argument, which +can be produced by `dired-get-marked-files', for example." ;;Functions dired-run-shell-command and dired-shell-stuff-it do the ;;actual work and can be redefined for customization. (interactive diff --git a/lisp/dired-x.el b/lisp/dired-x.el index 0a467920f11..4d3734bbd5a 100644 --- a/lisp/dired-x.el +++ b/lisp/dired-x.el @@ -251,7 +251,6 @@ to nil: a pipe using `zcat' or `gunzip -c' will be used." (define-key dired-mode-map "*." 'dired-mark-extension) (define-key dired-mode-map "\M-!" 'dired-smart-shell-command) (define-key dired-mode-map "w" 'dired-copy-filename-as-kill) -(define-key dired-mode-map "\M-g" 'dired-goto-file) (define-key dired-mode-map "\M-G" 'dired-goto-subdir) (define-key dired-mode-map "F" 'dired-do-find-marked-files) (define-key dired-mode-map "Y" 'dired-do-relsymlink) diff --git a/lisp/dired.el b/lisp/dired.el index 7209248a75a..64b73184397 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -1212,9 +1212,9 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST." (define-key map "f" 'dired-find-file) (define-key map "\C-m" 'dired-advertised-find-file) (define-key map "g" 'revert-buffer) - (define-key map "\M-g" 'dired-goto-file) (define-key map "h" 'describe-mode) (define-key map "i" 'dired-maybe-insert-subdir) + (define-key map "j" 'dired-goto-file) (define-key map "k" 'dired-do-kill-lines) (define-key map "l" 'dired-do-redisplay) (define-key map "m" 'dired-mark) @@ -1251,9 +1251,9 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST." ;; thumbnail manipulation (tumme) (define-key map "\C-td" 'tumme-display-thumbs) (define-key map "\C-tt" 'tumme-tag-files) - (define-key map "\C-tr" 'tumme-tag-remove) + (define-key map "\C-tr" 'tumme-delete-tag) (define-key map "\C-tj" 'tumme-jump-thumbnail-buffer) - (define-key map "\C-ti" 'tumme-display-dired-image) + (define-key map "\C-ti" 'tumme-dired-display-image) (define-key map "\C-tx" 'tumme-dired-display-external) (define-key map "\C-ta" 'tumme-display-thumbs-append) (define-key map "\C-t." 'tumme-display-thumb) @@ -1305,6 +1305,18 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST." (define-key map [menu-bar immediate] (cons "Immediate" (make-sparse-keymap "Immediate"))) + (define-key map + [menu-bar immediate tumme-dired-display-external] + '(menu-item "Display Image Externally" tumme-dired-display-external + :help "Display image in external viewer")) + (define-key map + [menu-bar immediate tumme-dired-display-image] + '(menu-item "Display Image" tumme-dired-display-image + :help "Display sized image in a separate window")) + + (define-key map [menu-bar immediate dashes-4] + '("--")) + (define-key map [menu-bar immediate revert-buffer] '(menu-item "Refresh" revert-buffer :help "Update contents of shown directories")) @@ -1313,7 +1325,7 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST." '("--")) (define-key map [menu-bar immediate compare-directories] - '(menu-item "Compare directories..." dired-compare-directories + '(menu-item "Compare Directories..." dired-compare-directories :help "Mark files with different attributes in two dired buffers")) (define-key map [menu-bar immediate backup-diff] '(menu-item "Compare with Backup" dired-backup-diff @@ -1341,6 +1353,14 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST." (define-key map [menu-bar regexp] (cons "Regexp" (make-sparse-keymap "Regexp"))) + (define-key map + [menu-bar regexp tumme-mark-tagged-files] + '(menu-item "Mark From Image Tag..." tumme-mark-tagged-files + :help "Mark files whose image tags matches regexp")) + + (define-key map [menu-bar regexp dashes-1] + '("--")) + (define-key map [menu-bar regexp downcase] '(menu-item "Downcase" dired-downcase ;; When running on plain MS-DOS, there's only one @@ -1428,6 +1448,29 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST." (define-key map [menu-bar operate] (cons "Operate" (make-sparse-keymap "Operate"))) + (define-key map [menu-bar operate dashes-2] + '("--")) + + (define-key map + [menu-bar operate tumme-delete-tag] + '(menu-item "Delete Image Tag..." tumme-delete-tag + :help "Delete image tag from current or marked files")) + (define-key map + [menu-bar operate tumme-tag-files] + '(menu-item "Add Image Tags..." tumme-tag-files + :help "Add image tags to current or marked files")) + (define-key map + [menu-bar operate tumme-dired-comment-files] + '(menu-item "Add Image Comment..." tumme-dired-comment-files + :help "Add image comment to current or marked files")) + (define-key map + [menu-bar operate tumme-display-thumbs] + '(menu-item "Display Thumbnails" tumme-display-thumbs + :help "Display thumbnails for current or marked image files")) + + (define-key map [menu-bar operate dashes-3] + '("--")) + (define-key map [menu-bar operate query-replace] '(menu-item "Query Replace in Files..." dired-do-query-replace-regexp :help "Replace regexp in marked files")) @@ -2218,7 +2261,7 @@ instead of `dired-actual-switches'." (forward-line 1)))) (defun dired-goto-file (file) - "Go to file line of FILE in this dired buffer." + "Go to line describing file FILE in this dired buffer." ;; Return value of point on success, else nil. ;; FILE must be an absolute file name. ;; Loses if FILE contains control chars like "\007" for which ls diff --git a/lisp/dnd.el b/lisp/dnd.el index dec57481570..85881b3261f 100644 --- a/lisp/dnd.el +++ b/lisp/dnd.el @@ -69,39 +69,34 @@ if some action was made, or nil if the URL is ignored." ;; Functions -(defun dnd-handle-one-url (window action arg) +(defun dnd-handle-one-url (window action url) "Handle one dropped url by calling the appropriate handler. The handler is first located by looking at `dnd-protocol-alist'. If no match is found here, and the value of `browse-url-browser-function' is a pair of (REGEXP . FUNCTION), those regexps are tried for a match. If no match is found, just call `dnd-insert-text'. WINDOW is where the drop happend, ACTION is the action for the drop, -ARG is the URL that has been dropped. +URL is what has been dropped. Returns ACTION." (require 'browse-url) - (let* ((uri (replace-regexp-in-string - "%[A-Z0-9][A-Z0-9]" - (lambda (arg) - (format "%c" (string-to-number (substring arg 1) 16))) - arg)) - ret) + (let (ret) (or (catch 'done (dolist (bf dnd-protocol-alist) - (when (string-match (car bf) uri) - (setq ret (funcall (cdr bf) uri action)) + (when (string-match (car bf) url) + (setq ret (funcall (cdr bf) url action)) (throw 'done t))) nil) (when (not (functionp browse-url-browser-function)) (catch 'done (dolist (bf browse-url-browser-function) - (when (string-match (car bf) uri) + (when (string-match (car bf) url) (setq ret 'private) - (funcall (cdr bf) uri action) + (funcall (cdr bf) url action) (throw 'done t))) nil)) (progn - (dnd-insert-text window action uri) + (dnd-insert-text window action url) (setq ret 'private))) ret)) @@ -134,6 +129,11 @@ Return nil if URI is not a local file." ((string-match "^file:" uri) ; Old KDE, Motif, Sun (substring uri (match-end 0)))))) (when (and f must-exist) + (setq f (replace-regexp-in-string + "%[A-Z0-9][A-Z0-9]" + (lambda (arg) + (format "%c" (string-to-number (substring arg 1) 16))) + f nil t)) (let* ((decoded-f (decode-coding-string f (or file-name-coding-system diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el index 013ed9073db..7746954292d 100644 --- a/lisp/ediff-diff.el +++ b/lisp/ediff-diff.el @@ -65,8 +65,10 @@ Must produce output compatible with Unix's diff3 program." ;; The following functions needed for setting diff/diff3 options ;; test if diff supports the --binary option (defsubst ediff-test-utility (diff-util option &optional files) - (eq 0 (apply 'call-process - (append (list diff-util nil nil nil option) files)))) + (condition-case () + (eq 0 (apply 'call-process + (append (list diff-util nil nil nil option) files))) + (file-error nil))) (defun ediff-diff-mandatory-option (diff-util) (let ((file (if (boundp 'null-device) null-device "/dev/null"))) @@ -128,10 +130,10 @@ are `-I REGEXP', to ignore changes whose lines match the REGEXP." (defcustom ediff-diff-options "" "*Options to pass to `ediff-diff-program'. -If Unix diff is used as `ediff-diff-program', then a useful option is -`-w', to ignore space, and `-i', to ignore case of letters. -Options `-c' and `-i' are not allowed. Case sensitivity can be toggled -interactively using [ediff-toggle-ignore-case]" +If Unix diff is used as `ediff-diff-program', + then a useful option is `-w', to ignore space. +Options `-c' and `-i' are not allowed. Case sensitivity can be + toggled interactively using \\[ediff-toggle-ignore-case]." :set 'ediff-reset-diff-options :type 'string :group 'ediff-diff) @@ -399,7 +401,7 @@ one optional arguments, diff-number to refine.") (c-prev-pt nil) diff-list shift-A shift-B ) - + ;; diff list contains word numbers, unless changed later (setq diff-list (cons (if word-mode 'words 'points) diff-list)) @@ -411,7 +413,7 @@ one optional arguments, diff-number to refine.") shift-B (ediff-overlay-start (ediff-get-value-according-to-buffer-type 'B bounds)))) - + ;; reset point in buffers A/B/C (ediff-with-current-buffer A-buffer (goto-char (if shift-A shift-A (point-min)))) @@ -1525,7 +1527,7 @@ affects only files whose names match the expression." (ediff-barf-if-not-control-buffer) (setq ediff-ignore-case (not ediff-ignore-case)) (cond (ediff-ignore-case - (setq ediff-actual-diff-options + (setq ediff-actual-diff-options (concat ediff-diff-options " " ediff-ignore-case-option) ediff-actual-diff3-options (concat ediff-diff3-options " " ediff-ignore-case-option3)) diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el index 486a3b049ae..d03245bf452 100644 --- a/lisp/emacs-lisp/advice.el +++ b/lisp/emacs-lisp/advice.el @@ -2350,6 +2350,7 @@ FUNCTION was not advised)." (ad-advice-set-enabled advice flag)))))) matched-advices))) +;;;###autoload (defun ad-enable-advice (function class name) "Enables the advice of FUNCTION with CLASS and NAME." (interactive (ad-read-advice-specification "Enable advice of")) @@ -2359,6 +2360,7 @@ FUNCTION was not advised)." function class name)) (error "ad-enable-advice: `%s' is not advised" function))) +;;;###autoload (defun ad-disable-advice (function class name) "Disable the advice of FUNCTION with CLASS and NAME." (interactive (ad-read-advice-specification "Disable advice of")) @@ -3585,6 +3587,7 @@ the value of `ad-redefinition-action' and de/activate again." ;; @@ The top-level advice interface: ;; ================================== +;;;###autoload (defun ad-activate (function &optional compile) "Activate all the advice information of an advised FUNCTION. If FUNCTION has a proper original definition then an advised diff --git a/lisp/emacs-lisp/authors.el b/lisp/emacs-lisp/authors.el index 0d38ba03241..7ab0101b2a5 100644 --- a/lisp/emacs-lisp/authors.el +++ b/lisp/emacs-lisp/authors.el @@ -42,6 +42,7 @@ files.") (defconst authors-aliases '( + ("Andrew Csillag" "Drew Csillag") ("Barry A. Warsaw" "Barry A. Warsaw, Century Computing, Inc." "Barry A. Warsaw, ITB" "Barry Warsaw") ("Bj,Av(Brn Torkelsson" "Bjorn Torkelsson") @@ -118,6 +119,7 @@ files.") ("Roland B. Roberts" "Roland B Roberts" "Roland Roberts") ("Rui-Tao Dong" "Rui-Tao Dong ~{6-Hpln~}") ("Sam Steingold" "Sam Shteingold") + ("Satyaki Das" "Indexed search by Satyaki Das") ("Stefan Monnier" "Stefan") ("Stephen A. Wood" "(saw@cebaf.gov)") ("Steven L. Baur" "SL Baur" "Steven L Baur") @@ -128,6 +130,7 @@ files.") ("Torbj,Av(Brn Einarsson" "Torbj.*rn Einarsson") ("Toru Tomabechi" "Toru Tomabechi,") ("Vincent Del Vecchio" "Vince Del Vecchio") + ("William M. Perry" "Bill Perry") ("Wlodzimierz Bzyl" "W.*dek Bzyl") ("Yutaka NIIBE" "NIIBE Yutaka") ) @@ -269,7 +272,7 @@ Changes to files in this list are not listed.") ("Morten Welinder" :wrote "dosfns.c" "[many MSDOS files]" "msdos.h") ("Pace Willisson" :wrote "ispell.el") ("Garrett Wollman" :changed "sendmail.el") - ("Dale Worley" :changed "mail-extr.el") + ("Dale R. Worley" :changed "mail-extr.el") ("Jamie Zawinski" :changed "bytecode.c" :wrote "disass.el" "tar-mode.el")) "Actions taken from the original, manually (un)maintained AUTHORS file.") @@ -355,7 +358,9 @@ the file name." (setq rules (cdr rules)))))) (setq authors-checked-files-alist (cons (cons file valid) authors-checked-files-alist)) - (unless valid + (unless (or valid + (string-match "[*]" file) + (string-match "^[0-9.]+$" file)) (setq authors-invalid-file-names (cons (format "%s:%d: unrecognized `%s' for %s" log-file diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el index ee2d74c5646..76699f10df8 100644 --- a/lisp/emacs-lisp/autoload.el +++ b/lisp/emacs-lisp/autoload.el @@ -273,12 +273,30 @@ which lists the file name and which functions are in it, etc." (or (eolp) (insert "\n" generate-autoload-section-continuation)))))) +(defun autoload-find-file (file) + "Fetch file and put it in a temp buffer. Return the buffer." + ;; It is faster to avoid visiting the file. + (with-current-buffer (get-buffer-create " *autoload-file*") + (kill-all-local-variables) + (erase-buffer) + (setq buffer-undo-list t + buffer-read-only nil) + (emacs-lisp-mode) + (insert-file-contents file nil) + (let ((enable-local-variables :safe)) + (hack-local-variables)) + (current-buffer))) + +(defvar no-update-autoloads nil + "File local variable to prevent scanning this file for autoload cookies.") + (defun generate-file-autoloads (file) "Insert at point a loaddefs autoload section for FILE. -autoloads are generated for defuns and defmacros in FILE +Autoloads are generated for defuns and defmacros in FILE marked by `generate-autoload-cookie' (which see). If FILE is being visited in a buffer, the contents of the buffer -are used." +are used. +Return non-nil in the case where no autoloads were added at point." (interactive "fGenerate autoloads for file: ") (let ((outbuf (current-buffer)) (autoloads-done '()) @@ -291,7 +309,7 @@ are used." (float-output-format nil) (done-any nil) (visited (get-file-buffer file)) - output-end) + output-start) ;; If the autoload section we create here uses an absolute ;; file name for FILE in its header, and then Emacs is installed @@ -309,76 +327,70 @@ are used." (string= dir-truename (substring source-truename 0 len))) (setq file (substring source-truename len)))) - (message "Generating autoloads for %s..." file) - (save-excursion - (unwind-protect - (progn - (if visited - (set-buffer visited) - ;; It is faster to avoid visiting the file. - (set-buffer (get-buffer-create " *generate-autoload-file*")) - (kill-all-local-variables) - (erase-buffer) - (setq buffer-undo-list t - buffer-read-only nil) - (emacs-lisp-mode) - (insert-file-contents file nil)) - (save-excursion - (save-restriction - (widen) - (goto-char (point-min)) - (while (not (eobp)) - (skip-chars-forward " \t\n\f") - (cond - ((looking-at (regexp-quote generate-autoload-cookie)) - (search-forward generate-autoload-cookie) - (skip-chars-forward " \t") - (setq done-any t) - (if (eolp) - ;; Read the next form and make an autoload. - (let* ((form (prog1 (read (current-buffer)) - (or (bolp) (forward-line 1)))) - (autoload (make-autoload form load-name))) - (if autoload - (setq autoloads-done (cons (nth 1 form) - autoloads-done)) - (setq autoload form)) - (let ((autoload-print-form-outbuf outbuf)) - (autoload-print-form autoload))) - - ;; Copy the rest of the line to the output. - (princ (buffer-substring - (progn - ;; Back up over whitespace, to preserve it. - (skip-chars-backward " \f\t") - (if (= (char-after (1+ (point))) ? ) - ;; Eat one space. - (forward-char 1)) - (point)) - (progn (forward-line 1) (point))) - outbuf))) - ((looking-at ";") - ;; Don't read the comment. - (forward-line 1)) - (t - (forward-sexp 1) - (forward-line 1))))))) - (or visited - ;; We created this buffer, so we should kill it. - (kill-buffer (current-buffer))) - (set-buffer outbuf) - (setq output-end (point-marker)))) - (if done-any - (progn - ;; Insert the section-header line - ;; which lists the file name and which functions are in it, etc. - (autoload-insert-section-header outbuf autoloads-done load-name file - (nth 5 (file-attributes file))) - (insert ";;; Generated autoloads from " - (autoload-trim-file-name file) "\n") - (goto-char output-end) - (insert generate-autoload-section-trailer))) - (message "Generating autoloads for %s...done" file))) + (with-current-buffer (or visited + ;; It is faster to avoid visiting the file. + (autoload-find-file file)) + ;; Obey the no-update-autoloads file local variable. + (unless no-update-autoloads + (message "Generating autoloads for %s..." file) + (setq output-start (with-current-buffer outbuf (point))) + (save-excursion + (save-restriction + (widen) + (goto-char (point-min)) + (while (not (eobp)) + (skip-chars-forward " \t\n\f") + (cond + ((looking-at (regexp-quote generate-autoload-cookie)) + (search-forward generate-autoload-cookie) + (skip-chars-forward " \t") + (setq done-any t) + (if (eolp) + ;; Read the next form and make an autoload. + (let* ((form (prog1 (read (current-buffer)) + (or (bolp) (forward-line 1)))) + (autoload (make-autoload form load-name))) + (if autoload + (push (nth 1 form) autoloads-done) + (setq autoload form)) + (let ((autoload-print-form-outbuf outbuf)) + (autoload-print-form autoload))) + + ;; Copy the rest of the line to the output. + (princ (buffer-substring + (progn + ;; Back up over whitespace, to preserve it. + (skip-chars-backward " \f\t") + (if (= (char-after (1+ (point))) ? ) + ;; Eat one space. + (forward-char 1)) + (point)) + (progn (forward-line 1) (point))) + outbuf))) + ((looking-at ";") + ;; Don't read the comment. + (forward-line 1)) + (t + (forward-sexp 1) + (forward-line 1)))))) + + (when done-any + (with-current-buffer outbuf + (save-excursion + ;; Insert the section-header line which lists the file name + ;; and which functions are in it, etc. + (goto-char output-start) + (autoload-insert-section-header + outbuf autoloads-done load-name file + (nth 5 (file-attributes file))) + (insert ";;; Generated autoloads from " + (autoload-trim-file-name file) "\n")) + (insert generate-autoload-section-trailer))) + (message "Generating autoloads for %s...done" file)) + (or visited + ;; We created this buffer, so we should kill it. + (kill-buffer (current-buffer)))) + (not done-any))) ;;;###autoload (defun update-file-autoloads (file &optional save-after) @@ -457,37 +469,7 @@ Autoload section for %s is up to date." (goto-char (point-max)) (search-backward "\f" nil t))) (or (eq found 'up-to-date) - (and (eq found 'new) - ;; Check that FILE has any cookies before generating a - ;; new section for it. - (save-excursion - (if existing-buffer - (set-buffer existing-buffer) - ;; It is faster to avoid visiting the file. - (set-buffer (get-buffer-create " *autoload-file*")) - (kill-all-local-variables) - (erase-buffer) - (setq buffer-undo-list t - buffer-read-only nil) - (emacs-lisp-mode) - (insert-file-contents file nil)) - (save-excursion - (save-restriction - (widen) - (goto-char (point-min)) - (prog1 - (if (re-search-forward - (concat "^" (regexp-quote - generate-autoload-cookie)) - nil t) - nil - (if (interactive-p) - (message "%s has no autoloads" file)) - (setq no-autoloads t) - t) - (or existing-buffer - (kill-buffer (current-buffer)))))))) - (generate-file-autoloads file)))) + (setq no-autoloads (generate-file-autoloads file))))) (and save-after (buffer-modified-p) (save-buffer)) diff --git a/lisp/emacs-lisp/bindat.el b/lisp/emacs-lisp/bindat.el index 455b049dc8a..d05eed2c4a2 100644 --- a/lisp/emacs-lisp/bindat.el +++ b/lisp/emacs-lisp/bindat.el @@ -171,8 +171,8 @@ ;; | INTEGER_CONSTANT ;; | DEREF -;; DEREF ::= ( [NAME | INTEGER]... ) -- Field NAME or Array index relative to -;; current structure spec. +;; DEREF ::= ( [NAME | INTEGER]... ) -- Field NAME or Array index relative +;; to current structure spec. ;; -- see bindat-get-field ;; A `union' specification @@ -188,23 +188,20 @@ ;; ([FIELD] eval FORM) ;; is interpreted by evalling FORM for its side effects only. ;; If FIELD is specified, the value is bound to that field. -;; The FORM may access and update `raw-data' and `pos' (see `bindat-unpack'), -;; as well as the lisp data structure in `struct'. +;; The FORM may access and update `bindat-raw' and `bindat-idx' (see `bindat-unpack'). ;;; Code: ;; Helper functions for structure unpacking. -;; Relies on dynamic binding of RAW-DATA and POS +;; Relies on dynamic binding of BINDAT-RAW and BINDAT-IDX -(defvar raw-data) -(defvar pos) +(defvar bindat-raw) +(defvar bindat-idx) (defun bindat--unpack-u8 () (prog1 - (if (stringp raw-data) - (string-to-char (substring raw-data pos (1+ pos))) - (aref raw-data pos)) - (setq pos (1+ pos)))) + (aref bindat-raw bindat-idx) + (setq bindat-idx (1+ bindat-idx)))) (defun bindat--unpack-u16 () (let* ((a (bindat--unpack-u8)) (b (bindat--unpack-u8))) @@ -261,16 +258,16 @@ j (lsh j -1))))) bits)) ((eq type 'str) - (let ((s (substring raw-data pos (+ pos len)))) - (setq pos (+ pos len)) + (let ((s (substring bindat-raw bindat-idx (+ bindat-idx len)))) + (setq bindat-idx (+ bindat-idx len)) (if (stringp s) s (string-make-unibyte (concat s))))) ((eq type 'strz) (let ((i 0) s) - (while (and (< i len) (/= (aref raw-data (+ pos i)) 0)) + (while (and (< i len) (/= (aref bindat-raw (+ bindat-idx i)) 0)) (setq i (1+ i))) - (setq s (substring raw-data pos (+ pos i))) - (setq pos (+ pos len)) + (setq s (substring bindat-raw bindat-idx (+ bindat-idx i))) + (setq bindat-idx (+ bindat-idx len)) (if (stringp s) s (string-make-unibyte (concat s))))) ((eq type 'vec) @@ -312,10 +309,10 @@ (setq data (eval len)) (eval len))) ((eq type 'fill) - (setq pos (+ pos len))) + (setq bindat-idx (+ bindat-idx len))) ((eq type 'align) - (while (/= (% pos len) 0) - (setq pos (1+ pos)))) + (while (/= (% bindat-idx len) 0) + (setq bindat-idx (1+ bindat-idx)))) ((eq type 'struct) (setq data (bindat--unpack-group (eval len)))) ((eq type 'repeat) @@ -343,11 +340,13 @@ (setq struct (append data struct)))))) struct)) -(defun bindat-unpack (spec raw-data &optional pos) - "Return structured data according to SPEC for binary data in RAW-DATA. -RAW-DATA is a string or vector. Optional third arg POS specifies the -starting offset in RAW-DATA." - (unless pos (setq pos 0)) +(defun bindat-unpack (spec bindat-raw &optional bindat-idx) + "Return structured data according to SPEC for binary data in BINDAT-RAW. +BINDAT-RAW is a unibyte string or vector. Optional third arg BINDAT-IDX specifies +the starting offset in BINDAT-RAW." + (when (multibyte-string-p bindat-raw) + (error "String is multibyte")) + (unless bindat-idx (setq bindat-idx 0)) (bindat--unpack-group spec)) (defun bindat-get-field (struct &rest field) @@ -366,7 +365,7 @@ e.g. corresponding to STRUCT.FIELD1[INDEX2].FIELD3..." struct) -;; Calculate raw-data length of structured data +;; Calculate bindat-raw length of structured data (defvar bindat--fixed-length-alist '((u8 . 1) (byte . 1) @@ -405,17 +404,19 @@ e.g. corresponding to STRUCT.FIELD1[INDEX2].FIELD3..." (setq struct (cons (cons field (eval len)) struct)) (eval len))) ((eq type 'fill) - (setq pos (+ pos len))) + (setq bindat-idx (+ bindat-idx len))) ((eq type 'align) - (while (/= (% pos len) 0) - (setq pos (1+ pos)))) + (while (/= (% bindat-idx len) 0) + (setq bindat-idx (1+ bindat-idx)))) ((eq type 'struct) (bindat--length-group (if field (bindat-get-field struct field) struct) (eval len))) ((eq type 'repeat) (let ((index 0)) (while (< index len) - (bindat--length-group (nth index (bindat-get-field struct field)) (nthcdr tail item)) + (bindat--length-group + (nth index (bindat-get-field struct field)) + (nthcdr tail item)) (setq index (1+ index))))) ((eq type 'union) (let ((tag len) (cases (nthcdr tail item)) case cc) @@ -433,25 +434,25 @@ e.g. corresponding to STRUCT.FIELD1[INDEX2].FIELD3..." (setq len (cdr type))) (if field (setq last (bindat-get-field struct field))) - (setq pos (+ pos len)))))))) + (setq bindat-idx (+ bindat-idx len)))))))) (defun bindat-length (spec struct) - "Calculate raw-data length for STRUCT according to bindat specification SPEC." - (let ((pos 0)) + "Calculate bindat-raw length for STRUCT according to bindat SPEC." + (let ((bindat-idx 0)) (bindat--length-group struct spec) - pos)) + bindat-idx)) -;; Pack structured data into raw-data +;; Pack structured data into bindat-raw (defun bindat--pack-u8 (v) - (aset raw-data pos (logand v 255)) - (setq pos (1+ pos))) + (aset bindat-raw bindat-idx (logand v 255)) + (setq bindat-idx (1+ bindat-idx))) (defun bindat--pack-u16 (v) - (aset raw-data pos (logand (lsh v -8) 255)) - (aset raw-data (1+ pos) (logand v 255)) - (setq pos (+ pos 2))) + (aset bindat-raw bindat-idx (logand (lsh v -8) 255)) + (aset bindat-raw (1+ bindat-idx) (logand v 255)) + (setq bindat-idx (+ bindat-idx 2))) (defun bindat--pack-u24 (v) (bindat--pack-u8 (lsh v -16)) @@ -462,9 +463,9 @@ e.g. corresponding to STRUCT.FIELD1[INDEX2].FIELD3..." (bindat--pack-u16 v)) (defun bindat--pack-u16r (v) - (aset raw-data (1+ pos) (logand (lsh v -8) 255)) - (aset raw-data pos (logand v 255)) - (setq pos (+ pos 2))) + (aset bindat-raw (1+ bindat-idx) (logand (lsh v -8) 255)) + (aset bindat-raw bindat-idx (logand v 255)) + (setq bindat-idx (+ bindat-idx 2))) (defun bindat--pack-u24r (v) (bindat--pack-u16r v) @@ -479,7 +480,7 @@ e.g. corresponding to STRUCT.FIELD1[INDEX2].FIELD3..." (setq type 'vec len 4)) (cond ((null v) - (setq pos (+ pos len))) + (setq bindat-idx (+ bindat-idx len))) ((memq type '(u8 byte)) (bindat--pack-u8 v)) ((memq type '(u16 word short)) @@ -511,11 +512,11 @@ e.g. corresponding to STRUCT.FIELD1[INDEX2].FIELD3..." (let ((l (length v)) (i 0)) (if (> l len) (setq l len)) (while (< i l) - (aset raw-data (+ pos i) (aref v i)) + (aset bindat-raw (+ bindat-idx i) (aref v i)) (setq i (1+ i))) - (setq pos (+ pos len)))) + (setq bindat-idx (+ bindat-idx len)))) (t - (setq pos (+ pos len))))) + (setq bindat-idx (+ bindat-idx len))))) (defun bindat--pack-group (struct spec) (let (last) @@ -547,17 +548,19 @@ e.g. corresponding to STRUCT.FIELD1[INDEX2].FIELD3..." (setq struct (cons (cons field (eval len)) struct)) (eval len))) ((eq type 'fill) - (setq pos (+ pos len))) + (setq bindat-idx (+ bindat-idx len))) ((eq type 'align) - (while (/= (% pos len) 0) - (setq pos (1+ pos)))) + (while (/= (% bindat-idx len) 0) + (setq bindat-idx (1+ bindat-idx)))) ((eq type 'struct) (bindat--pack-group (if field (bindat-get-field struct field) struct) (eval len))) ((eq type 'repeat) (let ((index 0)) (while (< index len) - (bindat--pack-group (nth index (bindat-get-field struct field)) (nthcdr tail item)) + (bindat--pack-group + (nth index (bindat-get-field struct field)) + (nthcdr tail item)) (setq index (1+ index))))) ((eq type 'union) (let ((tag len) (cases (nthcdr tail item)) case cc) @@ -575,17 +578,19 @@ e.g. corresponding to STRUCT.FIELD1[INDEX2].FIELD3..." (bindat--pack-item last type len) )))))) -(defun bindat-pack (spec struct &optional raw-data pos) +(defun bindat-pack (spec struct &optional bindat-raw bindat-idx) "Return binary data packed according to SPEC for structured data STRUCT. -Optional third arg RAW-DATA is a pre-allocated string or vector to unpack into. -Optional fourth arg POS is the starting offset into RAW-DATA. -Note: The result is a multibyte string; use `string-make-unibyte' on it -to make it unibyte if necessary." - (let ((no-return raw-data)) - (unless pos (setq pos 0)) - (unless raw-data (setq raw-data (make-vector (+ pos (bindat-length spec struct)) 0))) +Optional third arg BINDAT-RAW is a pre-allocated unibyte string or vector to +pack into. +Optional fourth arg BINDAT-IDX is the starting offset into BINDAT-RAW." + (when (multibyte-string-p bindat-raw) + (error "Pre-allocated string is multibyte")) + (let ((no-return bindat-raw)) + (unless bindat-idx (setq bindat-idx 0)) + (unless bindat-raw + (setq bindat-raw (make-vector (+ bindat-idx (bindat-length spec struct)) 0))) (bindat--pack-group struct spec) - (if no-return nil (concat raw-data)))) + (if no-return nil (concat bindat-raw)))) ;; Misc. format conversions diff --git a/lisp/emacs-lisp/ewoc.el b/lisp/emacs-lisp/ewoc.el index fa85ce21fb0..b4857f4310d 100644 --- a/lisp/emacs-lisp/ewoc.el +++ b/lisp/emacs-lisp/ewoc.el @@ -88,34 +88,7 @@ ;; limit! It is even possible to have another ewoc as an ;; element. In that way some kind of tree hierarchy can be created. ;; -;; Full documentation will, God willing, soon be available in a -;; Texinfo manual. - -;; In the mean time `grep '^(.*ewoc-[^-]' emacs-lisp/ewoc.el' can help -;; you find all the exported functions: -;; -;; (defun ewoc-create (pretty-printer &optional header footer) -;; (defalias 'ewoc-data 'ewoc--node-data) -;; (defun ewoc-location (node) -;; (defun ewoc-enter-first (ewoc data) -;; (defun ewoc-enter-last (ewoc data) -;; (defun ewoc-enter-after (ewoc node data) -;; (defun ewoc-enter-before (ewoc node data) -;; (defun ewoc-next (ewoc node) -;; (defun ewoc-prev (ewoc node) -;; (defun ewoc-nth (ewoc n) -;; (defun ewoc-map (map-function ewoc &rest args) -;; (defun ewoc-filter (ewoc predicate &rest args) -;; (defun ewoc-locate (ewoc &optional pos guess) -;; (defun ewoc-invalidate (ewoc &rest nodes) -;; (defun ewoc-goto-prev (ewoc arg) -;; (defun ewoc-goto-next (ewoc arg) -;; (defun ewoc-goto-node (ewoc node) -;; (defun ewoc-refresh (ewoc) -;; (defun ewoc-collect (ewoc predicate &rest args) -;; (defun ewoc-buffer (ewoc) -;; (defun ewoc-get-hf (ewoc) -;; (defun ewoc-set-hf (ewoc header footer) +;; The Emacs Lisp Reference Manual documents ewoc.el's "public interface". ;; Coding conventions ;; ================== @@ -123,48 +96,43 @@ ;; All functions of course start with `ewoc'. Functions and macros ;; starting with the prefix `ewoc--' are meant for internal use, ;; while those starting with `ewoc-' are exported for public use. -;; There are currently no global or buffer-local variables used. - ;;; Code: -(eval-when-compile (require 'cl)) ;because of CL compiler macros - -;; The doubly linked list is implemented as a circular list -;; with a dummy node first and last. The dummy node is used as -;; "the dll" (or rather is the dll handle passed around). +(eval-when-compile (require 'cl)) +;; The doubly linked list is implemented as a circular list with a dummy +;; node first and last. The dummy node is used as "the dll". (defstruct (ewoc--node - (:type vector) ;required for ewoc--node-branch hack + (:type vector) ;ewoc--node-nth needs this + (:constructor nil) (:constructor ewoc--node-create (start-marker data))) left right data start-marker) -(defalias 'ewoc--node-branch 'aref - "Get the left (CHILD=0) or right (CHILD=1) child of the NODE. - -\(fn NODE CHILD)") - (defun ewoc--node-next (dll node) "Return the node after NODE, or nil if NODE is the last node." - (unless (eq (ewoc--node-right node) dll) (ewoc--node-right node))) + (let ((R (ewoc--node-right node))) + (unless (eq dll R) R))) (defun ewoc--node-prev (dll node) "Return the node before NODE, or nil if NODE is the first node." - (unless (eq (ewoc--node-left node) dll) (ewoc--node-left node))) + (let ((L (ewoc--node-left node))) + (unless (eq dll L) L))) (defun ewoc--node-nth (dll n) - "Return the Nth node from the doubly linked list DLL. -N counts from zero. If DLL is not that long, nil is returned. -If N is negative, return the -(N+1)th last element. + "Return the Nth node from the doubly linked list `dll'. +N counts from zero. If N is negative, return the -(N+1)th last element. +If N is out of range, return nil. Thus, (ewoc--node-nth dll 0) returns the first node, and (ewoc--node-nth dll -1) returns the last node." + ;; Presuming a node is ":type vector", starting with `left' and `right': ;; Branch 0 ("follow left pointer") is used when n is negative. ;; Branch 1 ("follow right pointer") is used otherwise. (let* ((branch (if (< n 0) 0 1)) - (node (ewoc--node-branch dll branch))) + (node (aref dll branch))) (if (< n 0) (setq n (- -1 n))) (while (and (not (eq dll node)) (> n 0)) - (setq node (ewoc--node-branch node branch)) + (setq node (aref node branch)) (setq n (1- n))) (unless (eq dll node) node))) @@ -177,16 +145,15 @@ and (ewoc--node-nth dll -1) returns the last node." (defstruct (ewoc (:constructor nil) - (:constructor ewoc--create - (buffer pretty-printer header footer dll)) + (:constructor ewoc--create (buffer pretty-printer dll)) (:conc-name ewoc--)) - buffer pretty-printer header footer dll last-node) + buffer pretty-printer header footer dll last-node hf-pp) (defmacro ewoc--set-buffer-bind-dll-let* (ewoc varlist &rest forms) "Execute FORMS with ewoc--buffer selected as current buffer, -dll bound to ewoc--dll, and VARLIST bound as in a let*. -dll will be bound when VARLIST is initialized, but the current -buffer will *not* have been changed. +`dll' bound to the dll, and VARLIST bound as in a let*. +`dll' will be bound when VARLIST is initialized, but +the current buffer will *not* have been changed. Return value of last form in FORMS." (let ((hnd (make-symbol "ewoc"))) `(let* ((,hnd ,ewoc) @@ -205,45 +172,63 @@ BUT if it is the header or the footer in EWOC return nil instead." (eq node (ewoc--footer ewoc))) node)) +(defun ewoc--adjust (beg end node dll) + ;; "Manually reseat" markers for NODE and its successors (including footer + ;; and dll), in the case where they originally shared start position with + ;; BEG, to END. BEG and END are buffer positions describing NODE's left + ;; neighbor. This operation is functionally equivalent to temporarily + ;; setting these nodes' markers' insertion type to t around the pretty-print + ;; call that precedes the call to `ewoc--adjust', and then changing them back + ;; to nil. + (when (< beg end) + (let (m) + (while (and (= beg (setq m (ewoc--node-start-marker node))) + ;; The "dummy" node `dll' actually holds the marker that + ;; points to the end of the footer, so we check `dll' + ;; *after* reseating the marker. + (progn + (set-marker m end) + (not (eq dll node)))) + (setq node (ewoc--node-right node)))))) + (defun ewoc--insert-new-node (node data pretty-printer) "Insert before NODE a new node for DATA, displayed by PRETTY-PRINTER. Call PRETTY-PRINTER with point at NODE's start, thus pushing back NODE and leaving the new node's start there. Return the new node." (save-excursion - (let* ((inhibit-read-only t) - (m (copy-marker (ewoc--node-start-marker node))) - (pos (marker-position m)) - (elemnode (ewoc--node-create m data))) - (goto-char pos) - ;; Insert the trailing newline using insert-before-markers - ;; so that the start position for the next element is updated. - (insert-before-markers ?\n) - ;; Move back, and call the pretty-printer. - (backward-char 1) - (funcall pretty-printer data) - (setf (marker-position m) pos - (ewoc--node-left elemnode) (ewoc--node-left node) + (let ((elemnode (ewoc--node-create + (copy-marker (ewoc--node-start-marker node)) data))) + (setf (ewoc--node-left elemnode) (ewoc--node-left node) (ewoc--node-right elemnode) node (ewoc--node-right (ewoc--node-left node)) elemnode (ewoc--node-left node) elemnode) + (ewoc--refresh-node pretty-printer elemnode dll) elemnode))) -(defun ewoc--refresh-node (pp node) +(defun ewoc--refresh-node (pp node dll) "Redisplay the element represented by NODE using the pretty-printer PP." - (let ((inhibit-read-only t)) + (let ((inhibit-read-only t) + (m (ewoc--node-start-marker node)) + (R (ewoc--node-right node))) ;; First, remove the string from the buffer: - (delete-region (ewoc--node-start-marker node) - (1- (marker-position - (ewoc--node-start-marker (ewoc--node-right node))))) + (delete-region m (ewoc--node-start-marker R)) ;; Calculate and insert the string. - (goto-char (ewoc--node-start-marker node)) - (funcall pp (ewoc--node-data node)))) + (goto-char m) + (funcall pp (ewoc--node-data node)) + (ewoc--adjust m (point) R dll))) + +(defun ewoc--wrap (func) + (lexical-let ((ewoc--user-pp func)) + (lambda (data) + (funcall ewoc--user-pp data) + (insert "\n")))) + ;;; =========================================================================== ;;; Public members of the Ewoc package - -(defun ewoc-create (pretty-printer &optional header footer) +;;;###autoload +(defun ewoc-create (pretty-printer &optional header footer nosep) "Create an empty ewoc. The ewoc will be inserted in the current buffer at the current position. @@ -251,21 +236,25 @@ The ewoc will be inserted in the current buffer at the current position. PRETTY-PRINTER should be a function that takes one argument, an element, and inserts a string representing it in the buffer (at point). The string PRETTY-PRINTER inserts may be empty or span -several lines. A trailing newline will always be inserted -automatically. The PRETTY-PRINTER should use `insert', and not +several lines. The PRETTY-PRINTER should use `insert', and not `insert-before-markers'. -Optional second argument HEADER is a string that will always be -present at the top of the ewoc. HEADER should end with a -newline. Optional third argument FOOTER is similar, and will -be inserted at the bottom of the ewoc." +Optional second and third arguments HEADER and FOOTER are strings, +possibly empty, that will always be present at the top and bottom, +respectively, of the ewoc. + +Normally, a newline is automatically inserted after the header, +the footer and every node's printed representation. Optional +fourth arg NOSEP non-nil inhibits this." (let* ((dummy-node (ewoc--node-create 'DL-LIST 'DL-LIST)) (dll (progn (setf (ewoc--node-right dummy-node) dummy-node) (setf (ewoc--node-left dummy-node) dummy-node) dummy-node)) - (new-ewoc - (ewoc--create (current-buffer) - pretty-printer nil nil dll)) + (wrap (if nosep 'identity 'ewoc--wrap)) + (new-ewoc (ewoc--create (current-buffer) + (funcall wrap pretty-printer) + dll)) + (hf-pp (funcall wrap 'insert)) (pos (point)) head foot) (ewoc--set-buffer-bind-dll new-ewoc @@ -273,8 +262,9 @@ be inserted at the bottom of the ewoc." (unless header (setq header "")) (unless footer (setq footer "")) (setf (ewoc--node-start-marker dll) (copy-marker pos) - foot (ewoc--insert-new-node dll footer 'insert) - head (ewoc--insert-new-node foot header 'insert) + foot (ewoc--insert-new-node dll footer hf-pp) + head (ewoc--insert-new-node foot header hf-pp) + (ewoc--hf-pp new-ewoc) hf-pp (ewoc--footer new-ewoc) foot (ewoc--header new-ewoc) head)) ;; Return the ewoc @@ -285,6 +275,10 @@ be inserted at the bottom of the ewoc." \(fn NODE)") +(defun ewoc-set-data (node data) + "Set NODE to encapsulate DATA." + (setf (ewoc--node-data node) data)) + (defun ewoc-enter-first (ewoc data) "Enter DATA first in EWOC. Return the new node." @@ -297,7 +291,6 @@ Return the new node." (ewoc--set-buffer-bind-dll ewoc (ewoc-enter-before ewoc (ewoc--node-nth dll -1) data))) - (defun ewoc-enter-after (ewoc node data) "Enter a new element DATA after NODE in EWOC. Return the new node." @@ -322,21 +315,19 @@ Return nil if NODE is nil or the last element." Return nil if NODE is nil or the first element." (when node (ewoc--filter-hf-nodes - ewoc - (ewoc--node-prev (ewoc--dll ewoc) node)))) - + ewoc (ewoc--node-prev (ewoc--dll ewoc) node)))) (defun ewoc-nth (ewoc n) "Return the Nth node. N counts from zero. Return nil if there is less than N elements. If N is negative, return the -(N+1)th last element. -Thus, (ewoc-nth dll 0) returns the first node, -and (ewoc-nth dll -1) returns the last node. +Thus, (ewoc-nth ewoc 0) returns the first node, +and (ewoc-nth ewoc -1) returns the last node. Use `ewoc-data' to extract the data from the node." ;; Skip the header (or footer, if n is negative). (setq n (if (< n 0) (1- n) (1+ n))) (ewoc--filter-hf-nodes ewoc - (ewoc--node-nth (ewoc--dll ewoc) n))) + (ewoc--node-nth (ewoc--dll ewoc) n))) (defun ewoc-map (map-function ewoc &rest args) "Apply MAP-FUNCTION to all elements in EWOC. @@ -352,13 +343,35 @@ If more than two arguments are given, the remaining arguments will be passed to MAP-FUNCTION." (ewoc--set-buffer-bind-dll-let* ewoc ((footer (ewoc--footer ewoc)) + (pp (ewoc--pretty-printer ewoc)) (node (ewoc--node-nth dll 1))) (save-excursion (while (not (eq node footer)) (if (apply map-function (ewoc--node-data node) args) - (ewoc--refresh-node (ewoc--pretty-printer ewoc) node)) + (ewoc--refresh-node pp node dll)) (setq node (ewoc--node-next dll node)))))) +(defun ewoc-delete (ewoc &rest nodes) + "Delete NODES from EWOC." + (ewoc--set-buffer-bind-dll-let* ewoc + ((L nil) (R nil) (last (ewoc--last-node ewoc))) + (dolist (node nodes) + ;; If we are about to delete the node pointed at by last-node, + ;; set last-node to nil. + (when (eq last node) + (setf last nil (ewoc--last-node ewoc) nil)) + (delete-region (ewoc--node-start-marker node) + (ewoc--node-start-marker (ewoc--node-next dll node))) + (set-marker (ewoc--node-start-marker node) nil) + (setf L (ewoc--node-left node) + R (ewoc--node-right node) + ;; Link neighbors to each other. + (ewoc--node-right L) R + (ewoc--node-left R) L + ;; Forget neighbors. + (ewoc--node-left node) nil + (ewoc--node-right node) nil)))) + (defun ewoc-filter (ewoc predicate &rest args) "Remove all elements in EWOC for which PREDICATE returns nil. Note that the buffer for EWOC will be current-buffer when PREDICATE @@ -369,28 +382,13 @@ ARGS are given they will be passed to the PREDICATE." (ewoc--set-buffer-bind-dll-let* ewoc ((node (ewoc--node-nth dll 1)) (footer (ewoc--footer ewoc)) - (next nil) - (L nil) (R nil) + (goodbye nil) (inhibit-read-only t)) (while (not (eq node footer)) - (setq next (ewoc--node-next dll node)) (unless (apply predicate (ewoc--node-data node) args) - ;; If we are about to delete the node pointed at by last-node, - ;; set last-node to nil. - (if (eq (ewoc--last-node ewoc) node) - (setf (ewoc--last-node ewoc) nil)) - (delete-region (ewoc--node-start-marker node) - (ewoc--node-start-marker (ewoc--node-next dll node))) - (set-marker (ewoc--node-start-marker node) nil) - (setf L (ewoc--node-left node) - R (ewoc--node-right node) - ;; Link neighbors to each other. - (ewoc--node-right L) R - (ewoc--node-left R) L - ;; Forget neighbors. - (ewoc--node-left node) nil - (ewoc--node-right node) nil)) - (setq node next)))) + (push node goodbye)) + (setq node (ewoc--node-next dll node))) + (apply 'ewoc-delete ewoc goodbye))) (defun ewoc-locate (ewoc &optional pos guess) "Return the node that POS (a buffer position) is within. @@ -401,8 +399,7 @@ If POS points before the first element, the first node is returned. If POS points after the last element, the last node is returned. If the EWOC is empty, nil is returned." (unless pos (setq pos (point))) - (ewoc--set-buffer-bind-dll-let* ewoc - ((footer (ewoc--footer ewoc))) + (ewoc--set-buffer-bind-dll ewoc (cond ;; Nothing present? @@ -435,7 +432,7 @@ If the EWOC is empty, nil is returned." (setq distance d) (setq best-guess g))) - (when (ewoc--last-node ewoc) ;Check "previous". + (when (ewoc--last-node ewoc) ;Check "previous". (let* ((g (ewoc--last-node ewoc)) (d (abs (- pos (ewoc--node-start-marker g))))) (when (< d distance) @@ -465,10 +462,11 @@ If the EWOC is empty, nil is returned." (defun ewoc-invalidate (ewoc &rest nodes) "Call EWOC's pretty-printer for each element in NODES. Delete current text first, thus effecting a \"refresh\"." - (ewoc--set-buffer-bind-dll ewoc + (ewoc--set-buffer-bind-dll-let* ewoc + ((pp (ewoc--pretty-printer ewoc))) (save-excursion (dolist (node nodes) - (ewoc--refresh-node (ewoc--pretty-printer ewoc) node))))) + (ewoc--refresh-node pp node dll))))) (defun ewoc-goto-prev (ewoc arg) "Move point to the ARGth previous element in EWOC. @@ -525,7 +523,6 @@ number of elements needs to be refreshed." (while (not (eq node footer)) (set-marker (ewoc--node-start-marker node) (point)) (funcall pp (ewoc--node-data node)) - (insert "\n") (setq node (ewoc--node-next dll node))))) (set-marker (ewoc--node-start-marker footer) (point)))) @@ -564,19 +561,23 @@ Return nil if the buffer has been deleted." (defun ewoc-set-hf (ewoc header footer) "Set the HEADER and FOOTER of EWOC." - (setf (ewoc--node-data (ewoc--header ewoc)) header) - (setf (ewoc--node-data (ewoc--footer ewoc)) footer) - (save-excursion - (ewoc--refresh-node 'insert (ewoc--header ewoc)) - (ewoc--refresh-node 'insert (ewoc--footer ewoc)))) + (ewoc--set-buffer-bind-dll-let* ewoc + ((head (ewoc--header ewoc)) + (foot (ewoc--footer ewoc)) + (hf-pp (ewoc--hf-pp ewoc))) + (setf (ewoc--node-data head) header + (ewoc--node-data foot) footer) + (save-excursion + (ewoc--refresh-node hf-pp head dll) + (ewoc--refresh-node hf-pp foot dll)))) (provide 'ewoc) -;;; Local Variables: -;;; eval: (put 'ewoc--set-buffer-bind-dll 'lisp-indent-hook 1) -;;; eval: (put 'ewoc--set-buffer-bind-dll-let* 'lisp-indent-hook 2) -;;; End: +;; Local Variables: +;; eval: (put 'ewoc--set-buffer-bind-dll 'lisp-indent-hook 1) +;; eval: (put 'ewoc--set-buffer-bind-dll-let* 'lisp-indent-hook 2) +;; End: -;;; arch-tag: d78915b9-9a07-44bf-aac6-04a1fc1bd6d4 +;; arch-tag: d78915b9-9a07-44bf-aac6-04a1fc1bd6d4 ;;; ewoc.el ends here diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el index 2d169e889cd..7a11d6318a9 100644 --- a/lisp/emulation/cua-base.el +++ b/lisp/emulation/cua-base.el @@ -1498,8 +1498,8 @@ shifted movement key, set `cua-highlight-region-shift-only'." ;;;###autoload (eval-after-load 'CUA-mode ;;;###autoload '(error (concat "\n\n" -;;;###autoload "CUA-mode is now part of the standard GNU Emacs distribution,\n" -;;;###autoload "so you may now enable and customize CUA via the Options menu.\n\n" +;;;###autoload "CUA-mode is now part of the standard GNU Emacs distribution, so you may\n" +;;;###autoload "now enable CUA via the Options menu or by customizing option `cua-mode'.\n\n" ;;;###autoload "You have loaded an older version of CUA-mode which does\n" ;;;###autoload "not work correctly with this version of GNU Emacs.\n\n" ;;;###autoload (if user-init-file (concat diff --git a/lisp/faces.el b/lisp/faces.el index c4b86b5b402..828cbf860d9 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -1576,7 +1576,8 @@ If there is neither a user setting nor a default for FACE, return nil." "Return a list of colors supported for a particular frame. The argument FRAME specifies which frame to try. The value may be different for frames on different display types. -If FRAME doesn't support colors, the value is nil." +If FRAME doesn't support colors, the value is nil. +If FRAME is nil, that stands for the selected frame." (if (memq (framep (or frame (selected-frame))) '(x w32 mac)) (xw-defined-colors frame) (mapcar 'car (tty-color-alist frame)))) diff --git a/lisp/files.el b/lisp/files.el index 16df2661fcf..b4bc8f9ffec 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -1847,13 +1847,14 @@ in that case, this function acts as if `enable-local-variables' were t." ("\\.ad[bs].dg\\'" . ada-mode) ("\\.\\([pP]\\([Llm]\\|erl\\|od\\)\\|al\\)\\'" . perl-mode) ("Imakefile\\'" . makefile-imake-mode) + ("Makeppfile\\(?:\\.mk\\)?\\'" . makefile-makepp-mode) ; Put this before .mk + ("\\.makepp\\'" . makefile-makepp-mode) ,@(if (memq system-type '(berkeley-unix next-mach darwin)) '(("\\.mk\\'" . makefile-bsdmake-mode) ("GNUmakefile\\'" . makefile-gmake-mode) ("[Mm]akefile\\'" . makefile-bsdmake-mode)) '(("\\.mk\\'" . makefile-gmake-mode) ; Might be any make, give Gnu the host advantage ("[Mm]akefile\\'" . makefile-gmake-mode))) - ("Makeppfile\\'" . makefile-makepp-mode) ("\\.am\\'" . makefile-automake-mode) ;; Less common extensions come here ;; so more common ones above are found faster. @@ -2689,7 +2690,10 @@ It is dangerous if either of these conditions are met: (or (numberp val) (equal val ''defun))) ((eq prop 'edebug-form-spec) ;; Only allow indirect form specs. - (edebug-basic-spec val))))) + ;; During bootstrapping, edebug-basic-spec might not be + ;; defined yet. + (and (fboundp 'edebug-basic-spec) + (edebug-basic-spec val)))))) ;; Allow expressions that the user requested. (member exp safe-local-eval-forms) ;; Certain functions can be allowed with safe arguments @@ -2994,7 +2998,7 @@ BACKUPNAME is the backup file name, which is the old file renamed." (condition-case nil (delete-file to-name) (file-error nil)) - (copy-file from-name to-name t t 'excl) + (copy-file from-name to-name nil t) nil) (file-already-exists t)) ;; The file was somehow created by someone else between @@ -3062,6 +3066,7 @@ except that a leading `.', if any, doesn't count." (defun file-name-extension (filename &optional period) "Return FILENAME's final \"extension\". The extension, in a file name, is the part that follows the last `.', +excluding version numbers and backup suffixes, except that a leading `.', if any, doesn't count. Return nil for extensionless file names such as `foo'. Return the empty string for file names such as `foo.'. diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 7f0f248c7cf..71aa3654da6 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,96 @@ +2006-06-06 Katsumi Yamaoka <yamaoka@jpl.org> + + * mm-util.el (mm-mime-mule-charset-alist): Use unicode-precedence-list + to fill the utf-8 entry. + +2006-06-05 Dan Christensen <jdc@uwo.ca> + + * gnus-sum.el (gnus-summary-read-group-1): When summary is unthreaded, + respect display group parameter and gnus-summary-expunge-below. + (gnus-articles-to-read): Remove unused reference to display group + parameter. + [ Merge 2004-07-06 change from the trunk. ] + +2006-05-29 Reiner Steib <Reiner.Steib@gmx.de> + + * gnus-ml.el (gnus-mailing-list-subscribe) + (gnus-mailing-list-unsubscribe, gnus-mailing-list-owner) + (gnus-mailing-list-message): Fix doc strings. + +2006-05-29 Andreas Seltenreich <uwi7@rz.uni-karlsruhe.de> + + * gnus-ml.el (gnus-mailing-list-message): Use gnus-url-mailto instead + of doing it manually. + +2006-05-29 Kevin Greiner <kevin.greiner@compsol.cc> + + * gnus-agent.el (gnus-agent-possibly-synchronize-flags): A server + must be explicitly online rather than "not explicitly offline" for + its flags to be synchronized. + (gnus-agent-read-local): All symbols allocated in my-obarray + (gnus-agent-set-local): Skip invalid entries (min and/or max is nil). + (gnus-agent-regenerate-group): Check numeric names to see if they are + messages or groups. + +2006-05-29 Katsumi Yamaoka <yamaoka@jpl.org> + + * gnus-art.el (gnus-save-all-headers): Mention it might be overridden. + (gnus-saved-headers): Ditto. + (gnus-default-article-saver): Doc fix; add + gnus-summary-write-body-to-file; mention functions may have properties. + (gnus-article-save-coding-system): New variable. + (gnus-article-save): Override gnus-save-all-headers and + gnus-saved-headers by :headers property which saver function may have. + (gnus-read-save-file-name): Add optional `dir-var' argument which + specifies directory in which files are saved; work even if optional + `variable' argument is not specified. + (gnus-summary-save-in-file): Add properties :decode and :headers. + (gnus-summary-write-to-file): Add properties :decode, :function, and + :headers; read file name. + (gnus-summary-save-body-in-file): Add :decode property; add optional + `overwrite' argument. + (gnus-summary-write-body-to-file): New function; add properties + :decode and :function. + (gnus-output-to-file): Add coding cookie and encode text according + to gnus-article-save-coding-system; don't use mm-append-to-file. + + * gnus-sum.el (gnus-newsgroup-last-directory): New variable. + (gnus-summary-local-variables): Add it. + (gnus-summary-save-map): Add gnus-summary-write-article-body-file. + (gnus-summary-save-article): Require gnus-art; save decoded articles + if function that gnus-default-article-saver specifies has `:decode' + property; bind gnus-prompt-before-saving to t when saving many + articles in a file; move point to article which will be saved. + (gnus-summary-write-article-body-file): New function. + +2006-05-26 Reiner Steib <Reiner.Steib@gmx.de> + + * uudecode.el (uudecode-decode-region-external): Fix previous commit. + +2006-05-26 Katsumi Yamaoka <yamaoka@jpl.org> + + * mm-util.el (mm-enrich-utf-8-by-mule-ucs): Don't edit + after-load-alist. + +2006-05-22 Reiner Steib <Reiner.Steib@gmx.de> + + * uudecode.el (uudecode-decode-region-external): nil isn't a valid + coding system in XEmacs, use binary. + + * mail-source.el (mail-sources): Fix custom type. + + * imap.el (Commentary): Fix typo. + +2006-05-18 Reiner Steib <Reiner.Steib@gmx.de> + + * gnus-sum.el (gnus-summary-save-article-mail): Clarify doc string. + (gnus-summary-expire-articles-now): Shorten prompt. + + * gmm-utils.el (wid-edit): Require. + (defun-gmm): Renamed from `gmm-defun-compat'. + (gmm-image-search-load-path): Use it. + (gmm-image-load-path-for-library): Use it. Sync with `mh-compat.el'. + 2006-05-04 Stefan Monnier <monnier@iro.umontreal.ca> * mm-decode.el (mm-dissect-buffer): Remove spurious double assignment. @@ -2865,7 +2958,7 @@ article buffer with a draft file. This is a temporary measure against the 2004-08-22 change to gnus-article-edit-mode. -2004-11-02 From Ilya N. Golubev <gin@mo.msk.ru>. +2004-11-02 Ilya N. Golubev <gin@mo.msk.ru>. * mm-util.el (mm-mime-mule-charset-alist): Add the windows-1251 entry. @@ -3725,7 +3818,7 @@ * flow-fill.el (fill-flowed-display-column) (fill-flowed-encode-column): Ditto. -2004-09-06 Stefan <monnier@iro.umontreal.ca> +2004-09-06 Stefan Monnier <monnier@iro.umontreal.ca> * message.el (message-tokenize-header, message-send-mail-with-qmail): Use point-min rather than 1. @@ -4112,6 +4205,7 @@ See ChangeLog.2 for earlier changes. ;; Local Variables: ;; coding: iso-2022-7bit +;; fill-column: 79 ;; End: ;;; arch-tag: 3f33a3e7-090d-492b-bedd-02a1417d32b4 diff --git a/lisp/gnus/ChangeLog.1 b/lisp/gnus/ChangeLog.1 index bb4da4dbcad..f917d0cbf73 100644 --- a/lisp/gnus/ChangeLog.1 +++ b/lisp/gnus/ChangeLog.1 @@ -2437,7 +2437,7 @@ * gnus-topic.el (gnus-topic-rename): Check whether the new name exists. -1998-02-10 dave edmondson <dme@sco.com> +1998-02-10 David Edmondson <dme@sco.com> * message.el (message-font-lock-keywords): Allow : as a citation ending. diff --git a/lisp/gnus/gmm-utils.el b/lisp/gnus/gmm-utils.el index 4db811053ec..f314d0e81d7 100644 --- a/lisp/gnus/gmm-utils.el +++ b/lisp/gnus/gmm-utils.el @@ -30,7 +30,7 @@ ;;; Code: -;; (require 'wid-edit) +(require 'wid-edit) (defgroup gmm nil "Utility functions for Gnus, Message and MML" @@ -279,11 +279,7 @@ DEFAULT-MAP specifies the default key map for ICON-LIST." icon-list)) tool-bar-map)) -;; WARNING: The following is subject to change. Don't rely on it yet. - -;; From MH-E without modifications: - -(defmacro gmm-defun-compat (name function arg-list &rest body) +(defmacro defun-gmm (name function arg-list &rest body) "Create function NAME. If FUNCTION exists, then NAME becomes an alias for FUNCTION. Otherwise, create function NAME with ARG-LIST and BODY." @@ -292,21 +288,19 @@ Otherwise, create function NAME with ARG-LIST and BODY." `(defalias ',name ',function) `(defun ,name ,arg-list ,@body)))) -(gmm-defun-compat gmm-image-search-load-path +(defun-gmm gmm-image-search-load-path image-search-load-path (file &optional path) "Emacs 21 and XEmacs don't have `image-search-load-path'. This function returns nil on those systems." nil) -;; From MH-E with modifications: - -;; Don't use `gmm-defun-compat' until API changes in -;; `image-load-path-for-library' in Emacs CVS are completed. +;; Cf. `mh-image-load-path-for-library' in `mh-compat.el'. -(defun gmm-image-load-path-for-library (library image &optional path no-error) - "Return a suitable search path for images relative to LIBRARY. +(defun-gmm gmm-image-load-path-for-library + image-load-path-for-library (library image &optional path no-error) + "Return a suitable search path for images used by LIBRARY. -First it searches for IMAGE in `image-load-path' (excluding +It searches for IMAGE in `image-load-path' (excluding \"`data-directory'/images\") and `load-path', followed by a path suitable for LIBRARY, which includes \"../../etc/images\" and \"../etc/images\" relative to the library file itself, and then diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el index 123ad340ae1..f4e9f2e3dc9 100644 --- a/lisp/gnus/gnus-agent.el +++ b/lisp/gnus/gnus-agent.el @@ -825,7 +825,7 @@ be a select method." (save-excursion (dolist (gnus-command-method (gnus-agent-covered-methods)) (when (and (file-exists-p (gnus-agent-lib-file "flags")) - (not (eq (gnus-server-status gnus-command-method) 'offline))) + (eq (gnus-server-status gnus-command-method) 'ok)) (gnus-agent-possibly-synchronize-flags-server gnus-command-method))))) (defun gnus-agent-synchronize-flags-server (method) @@ -2133,7 +2133,8 @@ modified) original contents, they are first saved to their own file." (let (group min max - (cur (current-buffer))) + (cur (current-buffer)) + (obarray my-obarray)) (setq group (read cur) min (read cur) max (read cur)) @@ -2214,7 +2215,9 @@ modified) original contents, they are first saved to their own file." (if (cond ((and minmax (or (not (eq min (car minmax))) - (not (eq max (cdr minmax))))) + (not (eq max (cdr minmax)))) + min + max) (setcar minmax min) (setcdr minmax max) t) @@ -3743,8 +3746,10 @@ If REREAD is not nil, downloaded articles are marked as unread." (dir (file-name-directory file)) point (downloaded (if (file-exists-p dir) - (sort (mapcar (lambda (name) (string-to-number name)) - (directory-files dir nil "^[0-9]+$" t)) + (sort (delq nil (mapcar (lambda (name) + (and (not (file-directory-p (nnheader-concat dir name))) + (string-to-number name))) + (directory-files dir nil "^[0-9]+$" t))) '>) (progn (gnus-make-directory dir) nil))) dl nov-arts diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index 208103f805d..4722e98ef19 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el @@ -492,7 +492,10 @@ be fed to `format-time-string'." :group 'gnus-article-washing) (defcustom gnus-save-all-headers t - "*If non-nil, don't remove any headers before saving." + "*If non-nil, don't remove any headers before saving. +This will be overridden by the `:headers' property that the symbol of +the saver function, which is specified by `gnus-default-article-saver', +might have." :group 'gnus-article-saving :type 'boolean) @@ -513,14 +516,17 @@ each invocation of the saving commands." "Headers to keep if `gnus-save-all-headers' is nil. If `gnus-save-all-headers' is non-nil, this variable will be ignored. If that variable is nil, however, all headers that match this regexp -will be kept while the rest will be deleted before saving." +will be kept while the rest will be deleted before saving. This and +`gnus-save-all-headers' will be overridden by the `:headers' property +that the symbol of the saver function, which is specified by +`gnus-default-article-saver', might have." :group 'gnus-article-saving :type 'regexp) (defcustom gnus-default-article-saver 'gnus-summary-save-in-rmail "A function to save articles in your favourite format. -The function must be interactively callable (in other words, it must -be an Emacs command). +The function will be called by way of the `gnus-summary-save-article' +command, and friends such as `gnus-summary-save-article-rmail'. Gnus provides the following functions: @@ -530,7 +536,28 @@ Gnus provides the following functions: * gnus-summary-save-in-file (article format) * gnus-summary-save-body-in-file (article body) * gnus-summary-save-in-vm (use VM's folder format) -* gnus-summary-write-to-file (article format -- overwrite)." +* gnus-summary-write-to-file (article format -- overwrite) +* gnus-summary-write-body-to-file (article body -- overwrite) + +The symbol of each function may have the following properties: + +* :decode +The value non-nil means save decoded articles. This is meaningful +only with `gnus-summary-save-in-file', `gnus-summary-save-body-in-file', +`gnus-summary-write-to-file', and `gnus-summary-write-body-to-file'. + +* :function +The value specifies an alternative function which appends, not +overwrites, articles to a file. This implies that when saving many +articles at a time, `gnus-prompt-before-saving' is bound to t and all +articles are saved in a single file. This is meaningful only with +`gnus-summary-write-to-file' and `gnus-summary-write-body-to-file'. + +* :headers +The value specifies the symbol of a variable of which the value +specifies headers to be saved. If it is omitted, +`gnus-save-all-headers' and `gnus-saved-headers' control what +headers should be saved." :group 'gnus-article-saving :type '(radio (function-item gnus-summary-save-in-rmail) (function-item gnus-summary-save-in-mail) @@ -539,8 +566,49 @@ Gnus provides the following functions: (function-item gnus-summary-save-body-in-file) (function-item gnus-summary-save-in-vm) (function-item gnus-summary-write-to-file) + (function-item gnus-summary-write-body-to-file) (function))) +(defcustom gnus-article-save-coding-system + (or (and (mm-coding-system-p 'utf-8) 'utf-8) + (and (mm-coding-system-p 'iso-2022-7bit) 'iso-2022-7bit) + (and (mm-coding-system-p 'emacs-mule) 'emacs-mule) + (and (mm-coding-system-p 'escape-quoted) 'escape-quoted)) + "Coding system used to save decoded articles to a file. + +The recommended coding systems are `utf-8', `iso-2022-7bit' and so on, +which can safely encode any characters in text. This is used by the +commands including: + +* gnus-summary-save-article-file +* gnus-summary-save-article-body-file +* gnus-summary-write-article-file +* gnus-summary-write-article-body-file + +and the functions to which you may set `gnus-default-article-saver': + +* gnus-summary-save-in-file +* gnus-summary-save-body-in-file +* gnus-summary-write-to-file +* gnus-summary-write-body-to-file + +Those commands and functions save just text displayed in the article +buffer to a file if the value of this variable is non-nil. Note that +buttonized MIME parts will be lost in a saved file in that case. +Otherwise, raw articles will be saved." + :group 'gnus-article-saving + :type `(choice + :format "%{%t%}:\n %[Value Menu%] %v" + (const :tag "Save raw articles" nil) + ,@(delq nil + (mapcar + (lambda (arg) (if (mm-coding-system-p (nth 3 arg)) arg)) + '((const :tag "UTF-8" utf-8) + (const :tag "iso-2022-7bit" iso-2022-7bit) + (const :tag "Emacs internal" emacs-mule) + (const :tag "escape-quoted" escape-quoted)))) + (symbol :tag "Coding system"))) + (defcustom gnus-rmail-save-name 'gnus-plain-save-name "A function generating a file name to save articles in Rmail format. The function is called with NEWSGROUP, HEADERS, and optional LAST-FILE." @@ -3249,10 +3317,13 @@ This format is defined by the `gnus-article-time-format' variable." (defun gnus-article-save (save-buffer file &optional num) "Save the currently selected article." - (unless gnus-save-all-headers - ;; Remove headers according to `gnus-saved-headers'. + (when (or (get gnus-default-article-saver :headers) + (not gnus-save-all-headers)) + ;; Remove headers according to `gnus-saved-headers' or the value + ;; of the `:headers' property that the saver function might have. (let ((gnus-visible-headers - (or gnus-saved-headers gnus-visible-headers)) + (or (symbol-value (get gnus-default-article-saver :headers)) + gnus-saved-headers gnus-visible-headers)) (gnus-article-buffer save-buffer)) (save-excursion (set-buffer save-buffer) @@ -3277,7 +3348,8 @@ This format is defined by the `gnus-article-time-format' variable." (funcall gnus-default-article-saver filename))))) (defun gnus-read-save-file-name (prompt &optional filename - function group headers variable) + function group headers variable + dir-var) (let ((default-name (funcall function group headers (symbol-value variable))) result) @@ -3290,6 +3362,10 @@ This format is defined by the `gnus-article-time-format' variable." default-name) (filename filename) (t + (when (symbol-value dir-var) + (setq default-name (expand-file-name + (file-name-nondirectory default-name) + (symbol-value dir-var)))) (let* ((split-name (gnus-get-split-value gnus-split-methods)) (prompt (format prompt @@ -3354,7 +3430,11 @@ This format is defined by the `gnus-article-time-format' variable." ;; Possibly translate some characters. (nnheader-translate-file-chars file)))))) (gnus-make-directory (file-name-directory result)) - (set variable result))) + (when variable + (set variable result)) + (when dir-var + (set dir-var (file-name-directory result))) + result)) (defun gnus-article-archive-name (group) "Return the first instance of an \"Archive-name\" in the current buffer." @@ -3402,6 +3482,8 @@ Directory to save to is default to `gnus-article-save-directory'." (gnus-output-to-mail filename))))) filename) +(put 'gnus-summary-save-in-file :decode t) +(put 'gnus-summary-save-in-file :headers 'gnus-saved-headers) (defun gnus-summary-save-in-file (&optional filename overwrite) "Append this article to file. Optional argument FILENAME specifies file name. @@ -3420,13 +3502,21 @@ Directory to save to is default to `gnus-article-save-directory'." (gnus-output-to-file filename)))) filename) +(put 'gnus-summary-write-to-file :decode t) +(put 'gnus-summary-write-to-file :function 'gnus-summary-save-in-file) +(put 'gnus-summary-write-to-file :headers 'gnus-saved-headers) (defun gnus-summary-write-to-file (&optional filename) "Write this article to a file, overwriting it if the file exists. Optional argument FILENAME specifies file name. The directory to save in defaults to `gnus-article-save-directory'." - (gnus-summary-save-in-file nil t)) + (setq filename (gnus-read-save-file-name + "Save %s in file" filename + gnus-file-save-name gnus-newsgroup-name + gnus-current-headers nil 'gnus-newsgroup-last-directory)) + (gnus-summary-save-in-file filename t)) -(defun gnus-summary-save-body-in-file (&optional filename) +(put 'gnus-summary-save-body-in-file :decode t) +(defun gnus-summary-save-body-in-file (&optional filename overwrite) "Append this article body to a file. Optional argument FILENAME specifies file name. The directory to save in defaults to `gnus-article-save-directory'." @@ -3440,9 +3530,25 @@ The directory to save in defaults to `gnus-article-save-directory'." (widen) (when (article-goto-body) (narrow-to-region (point) (point-max))) + (when (and overwrite + (file-exists-p filename)) + (delete-file filename)) (gnus-output-to-file filename)))) filename) +(put 'gnus-summary-write-body-to-file :decode t) +(put 'gnus-summary-write-body-to-file + :function 'gnus-summary-save-body-in-file) +(defun gnus-summary-write-body-to-file (&optional filename) + "Write this article body to a file, overwriting it if the file exists. +Optional argument FILENAME specifies file name. +The directory to save in defaults to `gnus-article-save-directory'." + (setq filename (gnus-read-save-file-name + "Save %s body in file" filename + gnus-file-save-name gnus-newsgroup-name + gnus-current-headers nil 'gnus-newsgroup-last-directory)) + (gnus-summary-save-body-in-file filename t)) + (defun gnus-summary-save-in-pipe (&optional command) "Pipe this article to subprocess." (setq command @@ -5182,17 +5288,55 @@ Provided for backwards compatibility." ;;; Article savers. (defun gnus-output-to-file (file-name) - "Append the current article to a file named FILE-NAME." - (let ((artbuf (current-buffer))) + "Append the current article to a file named FILE-NAME. +If `gnus-article-save-coding-system' is non-nil, it is used to encode +text and used as the value of the coding cookie which is added to the +top of a file. Otherwise, this function saves a raw article without +the coding cookie." + (let* ((artbuf (current-buffer)) + (file-name-coding-system nnmail-pathname-coding-system) + (coding gnus-article-save-coding-system) + (coding-system-for-read (if coding + nil ;; Rely on the coding cookie. + mm-text-coding-system)) + (coding-system-for-write (or coding + mm-text-coding-system-for-write + mm-text-coding-system)) + (exists (file-exists-p file-name))) (with-temp-buffer + (when exists + (insert-file-contents file-name) + (goto-char (point-min)) + ;; Remove the existing coding cookie. + (when (looking-at "X-Gnus-Coding-System: .+\n\n") + (delete-region (match-beginning 0) (match-end 0)))) + (goto-char (point-max)) (insert-buffer-substring artbuf) ;; Append newline at end of the buffer as separator, and then ;; save it to file. (goto-char (point-max)) (insert "\n") - (let ((file-name-coding-system nnmail-pathname-coding-system)) - (mm-append-to-file (point-min) (point-max) file-name)) - t))) + (when coding + ;; If the coding system is not suitable to encode the text, + ;; ask a user for a proper one. + (when (fboundp 'select-safe-coding-system) + (setq coding (coding-system-base + (save-window-excursion + (select-safe-coding-system (point-min) (point-max) + coding)))) + (setq coding-system-for-write + (or (cdr (assq coding '((mule-utf-8 . utf-8)))) + coding))) + (goto-char (point-min)) + ;; Add the coding cookie. + (insert (format "X-Gnus-Coding-System: -*- coding: %s; -*-\n\n" + coding-system-for-write))) + (if exists + (progn + (write-region (point-min) (point-max) file-name nil 'no-message) + (message "Appended to %s" file-name)) + (write-region (point-min) (point-max) file-name)))) + t) (defun gnus-narrow-to-page (&optional arg) "Narrow the article buffer to a page. diff --git a/lisp/gnus/gnus-ml.el b/lisp/gnus/gnus-ml.el index cde039d03c0..8d475f968d7 100644 --- a/lisp/gnus/gnus-ml.el +++ b/lisp/gnus/gnus-ml.el @@ -4,7 +4,7 @@ ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Julien Gilles <jgilles@free.fr> -;; Keywords: news +;; Keywords: news, mail ;; This file is part of GNU Emacs. @@ -51,8 +51,7 @@ "\C-c\C-nu" gnus-mailing-list-unsubscribe "\C-c\C-np" gnus-mailing-list-post "\C-c\C-no" gnus-mailing-list-owner - "\C-c\C-na" gnus-mailing-list-archive - )) + "\C-c\C-na" gnus-mailing-list-archive)) (defun gnus-mailing-list-make-menu-bar () (unless (boundp 'gnus-mailing-list-menu) @@ -103,7 +102,8 @@ If FORCE is non-nil, replace the old ones." ;; Set up the menu. (when (gnus-visual-p 'mailing-list-menu 'menu) (gnus-mailing-list-make-menu-bar)) - (gnus-add-minor-mode 'gnus-mailing-list-mode " Mailing-List" gnus-mailing-list-mode-map) + (gnus-add-minor-mode 'gnus-mailing-list-mode " Mailing-List" + gnus-mailing-list-mode-map) (gnus-run-hooks 'gnus-mailing-list-mode-hook)))) ;;; Commands @@ -118,7 +118,7 @@ If FORCE is non-nil, replace the old ones." (t (gnus-message 1 "no list-help in this group"))))) (defun gnus-mailing-list-subscribe () - "Subscribe" + "Subscribe to mailing list." (interactive) (let ((list-subscribe (with-current-buffer gnus-original-article-buffer @@ -127,7 +127,7 @@ If FORCE is non-nil, replace the old ones." (t (gnus-message 1 "no list-subscribe in this group"))))) (defun gnus-mailing-list-unsubscribe () - "Unsubscribe" + "Unsubscribe from mailing list." (interactive) (let ((list-unsubscribe (with-current-buffer gnus-original-article-buffer @@ -145,7 +145,7 @@ If FORCE is non-nil, replace the old ones." (t (gnus-message 1 "no list-post in this group"))))) (defun gnus-mailing-list-owner () - "Mail to the owner" + "Mail to the mailing list owner." (interactive) (let ((list-owner (with-current-buffer gnus-original-article-buffer @@ -154,7 +154,7 @@ If FORCE is non-nil, replace the old ones." (t (gnus-message 1 "no list-owner in this group"))))) (defun gnus-mailing-list-archive () - "Browse archive" + "Browse archive." (interactive) (require 'browse-url) (let ((list-archive @@ -169,33 +169,14 @@ If FORCE is non-nil, replace the old ones." ;;; Utility functions (defun gnus-mailing-list-message (address) - "" - (let ((mailto "") - (to ()) - (subject "None") - (body "") - ) - (cond - ((string-match "<mailto:\\([^>]*\\)>" address) - (let ((args (match-string 1 address))) - (cond ; with param - ((string-match "\\(.*\\)\\?\\(.*\\)" args) - (setq mailto (match-string 1 args)) - (let ((param (match-string 2 args))) - (if (string-match "subject=\\([^&]*\\)" param) - (setq subject (match-string 1 param))) - (if (string-match "body=\\([^&]*\\)" param) - (setq body (match-string 1 param))) - (if (string-match "to=\\([^&]*\\)" param) - (push (match-string 1 param) to)) - )) - (t (setq mailto args))))) ; without param - - ; other case <http://... to be done. - (t nil)) - (gnus-setup-message 'message (message-mail mailto subject)) - (insert body) - )) + "Send message to ADDRESS. +ADDRESS is specified by a \"mailto:\" URL." + (cond + ((string-match "<\\(mailto:[^>]*\\)>" address) + (require 'gnus-art) + (gnus-url-mailto (match-string 1 address))) + ;; other case <http://...> to be done. + (t nil))) (provide 'gnus-ml) diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el index daecb1701cd..66ab41950d1 100644 --- a/lisp/gnus/gnus-sum.el +++ b/lisp/gnus/gnus-sum.el @@ -1249,6 +1249,7 @@ the type of the variable (string, integer, character, etc).") (defvar gnus-newsgroup-last-mail nil) (defvar gnus-newsgroup-last-folder nil) (defvar gnus-newsgroup-last-file nil) +(defvar gnus-newsgroup-last-directory nil) (defvar gnus-newsgroup-auto-expire nil) (defvar gnus-newsgroup-active nil) @@ -1364,6 +1365,7 @@ This list will always be a subset of gnus-newsgroup-undownloaded.") gnus-newsgroup-begin gnus-newsgroup-end gnus-newsgroup-last-rmail gnus-newsgroup-last-mail gnus-newsgroup-last-folder gnus-newsgroup-last-file + gnus-newsgroup-last-directory gnus-newsgroup-auto-expire gnus-newsgroup-unreads gnus-newsgroup-unselected gnus-newsgroup-marked gnus-newsgroup-spam-marked @@ -1991,6 +1993,7 @@ increase the score of each group you read." "r" gnus-summary-save-article-rmail "f" gnus-summary-save-article-file "b" gnus-summary-save-article-body-file + "B" gnus-summary-write-article-body-file "h" gnus-summary-save-article-folder "v" gnus-summary-save-article-vm "p" gnus-summary-pipe-output @@ -3709,16 +3712,10 @@ If NO-DISPLAY, don't generate a summary buffer." (when gnus-build-sparse-threads (gnus-build-sparse-threads)) ;; Find the initial limit. - (if gnus-show-threads - (if show-all - (let ((gnus-newsgroup-dormant nil)) - (gnus-summary-initial-limit show-all)) + (if show-all + (let ((gnus-newsgroup-dormant nil)) (gnus-summary-initial-limit show-all)) - ;; When unthreaded, all articles are always shown. - (setq gnus-newsgroup-limit - (mapcar - (lambda (header) (mail-header-number header)) - gnus-newsgroup-headers))) + (gnus-summary-initial-limit show-all)) ;; Generate the summary buffer. (unless no-display (gnus-summary-prepare)) @@ -5419,8 +5416,7 @@ If SELECT-ARTICLES, only select those articles from GROUP." (defun gnus-articles-to-read (group &optional read-all) "Find out what articles the user wants to read." - (let* ((display (gnus-group-find-parameter group 'display)) - (articles + (let* ((articles ;; Select all articles if `read-all' is non-nil, or if there ;; are no unread articles. (if (or read-all @@ -9507,7 +9503,7 @@ deleted forever, right now." (interactive) (or gnus-expert-user (gnus-yes-or-no-p - "Are you really, really, really sure you want to delete all these messages? ") + "Are you really, really sure you want to delete all expirable messages? ") (error "Phew!")) (gnus-summary-expire-articles t)) @@ -10993,12 +10989,26 @@ If N is a positive number, save the N next articles. If N is a negative number, save the N previous articles. If N is nil and any articles have been marked with the process mark, save those articles instead. -The variable `gnus-default-article-saver' specifies the saver function." +The variable `gnus-default-article-saver' specifies the saver function. + +If the optional second argument NOT-SAVED is non-nil, articles saved +will not be marked as saved." (interactive "P") + (require 'gnus-art) (let* ((articles (gnus-summary-work-articles n)) (save-buffer (save-excursion (nnheader-set-temp-buffer " *Gnus Save*"))) (num (length articles)) + ;; Whether to save decoded articles or raw articles. + (decode (when gnus-article-save-coding-system + (get gnus-default-article-saver :decode))) + ;; When saving many articles in a single file, use the other + ;; function to save articles other than the first one. + (saver2 (get gnus-default-article-saver :function)) + (gnus-prompt-before-saving (if saver2 + t + gnus-prompt-before-saving)) + (gnus-default-article-saver gnus-default-article-saver) header file) (dolist (article articles) (setq header (gnus-summary-article-header article)) @@ -11009,17 +11019,25 @@ The variable `gnus-default-article-saver' specifies the saver function." (gnus-message 1 "Article %d is unsaveable" article)) ;; This is a real article. (save-window-excursion - (let ((gnus-display-mime-function nil) - (gnus-article-prepare-hook nil)) - (gnus-summary-select-article t nil nil article))) + (let ((gnus-display-mime-function (when decode + gnus-display-mime-function)) + (gnus-article-prepare-hook (when decode + gnus-article-prepare-hook))) + (gnus-summary-select-article t nil nil article) + (gnus-summary-goto-subject article))) (save-excursion (set-buffer save-buffer) (erase-buffer) - (insert-buffer-substring gnus-original-article-buffer)) + (insert-buffer-substring (if decode + gnus-article-buffer + gnus-original-article-buffer))) (setq file (gnus-article-save save-buffer file num)) (gnus-summary-remove-process-mark article) (unless not-saved - (gnus-summary-set-saved-mark article)))) + (gnus-summary-set-saved-mark article))) + (when saver2 + (setq gnus-default-article-saver saver2 + saver2 nil))) (gnus-kill-buffer save-buffer) (gnus-summary-position-point) (gnus-set-mode-line 'summary) @@ -11043,7 +11061,7 @@ If HEADERS (the symbolic prefix), include the headers, too." (gnus-configure-windows 'pipe)))) (defun gnus-summary-save-article-mail (&optional arg) - "Append the current article to an mail file. + "Append the current article to a Unix mail box file. If N is a positive number, save the N next articles. If N is a negative number, save the N previous articles. If N is nil and any articles have been marked with the process mark, @@ -11097,6 +11115,17 @@ save those articles instead." (let ((gnus-default-article-saver 'gnus-summary-save-body-in-file)) (gnus-summary-save-article arg))) +(defun gnus-summary-write-article-body-file (&optional arg) + "Write the current article body to a file, deleting the previous file. +If N is a positive number, save the N next articles. +If N is a negative number, save the N previous articles. +If N is nil and any articles have been marked with the process mark, +save those articles instead." + (interactive "P") + (require 'gnus-art) + (let ((gnus-default-article-saver 'gnus-summary-write-body-to-file)) + (gnus-summary-save-article arg))) + (defun gnus-summary-muttprint (&optional arg) "Print the current article using Muttprint. If N is a positive number, save the N next articles. diff --git a/lisp/gnus/imap.el b/lisp/gnus/imap.el index 7b40773ca06..16fce1843db 100644 --- a/lisp/gnus/imap.el +++ b/lisp/gnus/imap.el @@ -79,7 +79,7 @@ ;; (NAMESPACE), RFC2359 (UIDPLUS), the IMAP-part of RFC2595 (STARTTLS, ;; LOGINDISABLED) (with use of external library starttls.el and ;; program starttls) and the GSSAPI / kerberos V4 sections of RFC1731 -;; (with use of external program `imtest'). It also take advantage +;; (with use of external program `imtest'). It also takes advantage of ;; the UNSELECT extension in Cyrus IMAPD. ;; ;; Without the work of John McClary Prevost and Jim Radford this library diff --git a/lisp/gnus/mail-source.el b/lisp/gnus/mail-source.el index 9683f28154b..e350468bea4 100644 --- a/lisp/gnus/mail-source.el +++ b/lisp/gnus/mail-source.el @@ -63,175 +63,177 @@ This variable is a list of mail source specifiers. See Info node `(gnus)Mail Source Specifiers'." :group 'mail-source :link '(custom-manual "(gnus)Mail Source Specifiers") - :type `(repeat - (choice :format "%[Value Menu%] %v" - :value (file) - (cons :tag "Spool file" - (const :format "" file) - (checklist :tag "Options" :greedy t - (group :inline t - (const :format "" :value :path) - file))) - (cons :tag "Several files in a directory" - (const :format "" directory) - (checklist :tag "Options" :greedy t - (group :inline t - (const :format "" :value :path) - (directory :tag "Path")) - (group :inline t - (const :format "" :value :suffix) - (string :tag "Suffix")) - (group :inline t - (const :format "" :value :predicate) - (function :tag "Predicate")) - (group :inline t - (const :format "" :value :prescript) - (choice :tag "Prescript" - :value nil - (string :format "%v") - (function :format "%v"))) - (group :inline t - (const :format "" :value :postscript) - (choice :tag "Postscript" - :value nil - (string :format "%v") - (function :format "%v"))) - (group :inline t - (const :format "" :value :plugged) - (boolean :tag "Plugged")))) - (cons :tag "POP3 server" - (const :format "" pop) - (checklist :tag "Options" :greedy t - (group :inline t - (const :format "" :value :server) - (string :tag "Server")) - (group :inline t - (const :format "" :value :port) - (choice :tag "Port" - :value "pop3" - (number :format "%v") - (string :format "%v"))) - (group :inline t - (const :format "" :value :user) - (string :tag "User")) - (group :inline t - (const :format "" :value :password) - (string :tag "Password")) - (group :inline t - (const :format "" :value :program) - (string :tag "Program")) - (group :inline t - (const :format "" :value :prescript) - (choice :tag "Prescript" - :value nil - (string :format "%v") - (function :format "%v"))) - (group :inline t - (const :format "" :value :postscript) - (choice :tag "Postscript" - :value nil - (string :format "%v") - (function :format "%v"))) - (group :inline t - (const :format "" :value :function) - (function :tag "Function")) - (group :inline t - (const :format "" - :value :authentication) - (choice :tag "Authentication" - :value apop - (const password) - (const apop))) - (group :inline t - (const :format "" :value :plugged) - (boolean :tag "Plugged")))) - (cons :tag "Maildir (qmail, postfix...)" - (const :format "" maildir) - (checklist :tag "Options" :greedy t - (group :inline t - (const :format "" :value :path) - (directory :tag "Path")) - (group :inline t - (const :format "" :value :plugged) - (boolean :tag "Plugged")))) - (cons :tag "IMAP server" - (const :format "" imap) - (checklist :tag "Options" :greedy t - (group :inline t - (const :format "" :value :server) - (string :tag "Server")) - (group :inline t - (const :format "" :value :port) - (choice :tag "Port" - :value 143 - number string)) - (group :inline t - (const :format "" :value :user) - (string :tag "User")) - (group :inline t - (const :format "" :value :password) - (string :tag "Password")) - (group :inline t - (const :format "" :value :stream) - (choice :tag "Stream" - :value network - ,@mail-source-imap-streams)) - (group :inline t - (const :format "" :value :program) - (string :tag "Program")) - (group :inline t - (const :format "" - :value :authenticator) - (choice :tag "Authenticator" - :value login - ,@mail-source-imap-authenticators)) - (group :inline t - (const :format "" :value :mailbox) - (string :tag "Mailbox" - :value "INBOX")) - (group :inline t - (const :format "" :value :predicate) - (string :tag "Predicate" - :value "UNSEEN UNDELETED")) - (group :inline t - (const :format "" :value :fetchflag) - (string :tag "Fetchflag" - :value "\\Deleted")) - (group :inline t - (const :format "" - :value :dontexpunge) - (boolean :tag "Dontexpunge")) - (group :inline t - (const :format "" :value :plugged) - (boolean :tag "Plugged")))) - (cons :tag "Webmail server" - (const :format "" webmail) - (checklist :tag "Options" :greedy t - (group :inline t - (const :format "" :value :subtype) - ;; Should be generated from - ;; `webmail-type-definition', but we - ;; can't require webmail without W3. - (choice :tag "Subtype" - :value hotmail - (const hotmail) - (const yahoo) - (const netaddress) - (const netscape) - (const my-deja))) - (group :inline t - (const :format "" :value :user) - (string :tag "User")) - (group :inline t - (const :format "" :value :password) - (string :tag "Password")) - (group :inline t - (const :format "" - :value :dontexpunge) - (boolean :tag "Dontexpunge")) - (group :inline t - (const :format "" :value :plugged) - (boolean :tag "Plugged"))))))) + :type `(choice + (const nil) + (repeat + (choice :format "%[Value Menu%] %v" + :value (file) + (cons :tag "Spool file" + (const :format "" file) + (checklist :tag "Options" :greedy t + (group :inline t + (const :format "" :value :path) + file))) + (cons :tag "Several files in a directory" + (const :format "" directory) + (checklist :tag "Options" :greedy t + (group :inline t + (const :format "" :value :path) + (directory :tag "Path")) + (group :inline t + (const :format "" :value :suffix) + (string :tag "Suffix")) + (group :inline t + (const :format "" :value :predicate) + (function :tag "Predicate")) + (group :inline t + (const :format "" :value :prescript) + (choice :tag "Prescript" + :value nil + (string :format "%v") + (function :format "%v"))) + (group :inline t + (const :format "" :value :postscript) + (choice :tag "Postscript" + :value nil + (string :format "%v") + (function :format "%v"))) + (group :inline t + (const :format "" :value :plugged) + (boolean :tag "Plugged")))) + (cons :tag "POP3 server" + (const :format "" pop) + (checklist :tag "Options" :greedy t + (group :inline t + (const :format "" :value :server) + (string :tag "Server")) + (group :inline t + (const :format "" :value :port) + (choice :tag "Port" + :value "pop3" + (number :format "%v") + (string :format "%v"))) + (group :inline t + (const :format "" :value :user) + (string :tag "User")) + (group :inline t + (const :format "" :value :password) + (string :tag "Password")) + (group :inline t + (const :format "" :value :program) + (string :tag "Program")) + (group :inline t + (const :format "" :value :prescript) + (choice :tag "Prescript" + :value nil + (string :format "%v") + (function :format "%v"))) + (group :inline t + (const :format "" :value :postscript) + (choice :tag "Postscript" + :value nil + (string :format "%v") + (function :format "%v"))) + (group :inline t + (const :format "" :value :function) + (function :tag "Function")) + (group :inline t + (const :format "" + :value :authentication) + (choice :tag "Authentication" + :value apop + (const password) + (const apop))) + (group :inline t + (const :format "" :value :plugged) + (boolean :tag "Plugged")))) + (cons :tag "Maildir (qmail, postfix...)" + (const :format "" maildir) + (checklist :tag "Options" :greedy t + (group :inline t + (const :format "" :value :path) + (directory :tag "Path")) + (group :inline t + (const :format "" :value :plugged) + (boolean :tag "Plugged")))) + (cons :tag "IMAP server" + (const :format "" imap) + (checklist :tag "Options" :greedy t + (group :inline t + (const :format "" :value :server) + (string :tag "Server")) + (group :inline t + (const :format "" :value :port) + (choice :tag "Port" + :value 143 + number string)) + (group :inline t + (const :format "" :value :user) + (string :tag "User")) + (group :inline t + (const :format "" :value :password) + (string :tag "Password")) + (group :inline t + (const :format "" :value :stream) + (choice :tag "Stream" + :value network + ,@mail-source-imap-streams)) + (group :inline t + (const :format "" :value :program) + (string :tag "Program")) + (group :inline t + (const :format "" + :value :authenticator) + (choice :tag "Authenticator" + :value login + ,@mail-source-imap-authenticators)) + (group :inline t + (const :format "" :value :mailbox) + (string :tag "Mailbox" + :value "INBOX")) + (group :inline t + (const :format "" :value :predicate) + (string :tag "Predicate" + :value "UNSEEN UNDELETED")) + (group :inline t + (const :format "" :value :fetchflag) + (string :tag "Fetchflag" + :value "\\Deleted")) + (group :inline t + (const :format "" + :value :dontexpunge) + (boolean :tag "Dontexpunge")) + (group :inline t + (const :format "" :value :plugged) + (boolean :tag "Plugged")))) + (cons :tag "Webmail server" + (const :format "" webmail) + (checklist :tag "Options" :greedy t + (group :inline t + (const :format "" :value :subtype) + ;; Should be generated from + ;; `webmail-type-definition', but we + ;; can't require webmail without W3. + (choice :tag "Subtype" + :value hotmail + (const hotmail) + (const yahoo) + (const netaddress) + (const netscape) + (const my-deja))) + (group :inline t + (const :format "" :value :user) + (string :tag "User")) + (group :inline t + (const :format "" :value :password) + (string :tag "Password")) + (group :inline t + (const :format "" + :value :dontexpunge) + (boolean :tag "Dontexpunge")) + (group :inline t + (const :format "" :value :plugged) + (boolean :tag "Plugged")))))))) (defcustom mail-source-ignore-errors nil "*Ignore errors when querying mail sources. diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el index 9a0464be958..5803df7d419 100644 --- a/lisp/gnus/mm-util.el +++ b/lisp/gnus/mm-util.el @@ -364,14 +364,17 @@ could use `autoload-coding-system' here." (iso-2022-jp-3 latin-jisx0201 japanese-jisx0208-1978 japanese-jisx0208 japanese-jisx0213-1 japanese-jisx0213-2) (shift_jis latin-jisx0201 katakana-jisx0201 japanese-jisx0208) - ,(if (or (not (fboundp 'charsetp)) ;; non-Mule case - (charsetp 'unicode-a) - (not (mm-coding-system-p 'mule-utf-8))) - '(utf-8 unicode-a unicode-b unicode-c unicode-d unicode-e) - ;; If we have utf-8 we're in Mule 5+. - (append '(utf-8) - (delete 'ascii - (coding-system-get 'mule-utf-8 'safe-charsets))))) + ,(cond ((fboundp 'unicode-precedence-list) + (cons 'utf-8 (delq 'ascii (mapcar 'charset-name + (unicode-precedence-list))))) + ((or (not (fboundp 'charsetp)) ;; non-Mule case + (charsetp 'unicode-a) + (not (mm-coding-system-p 'mule-utf-8))) + '(utf-8 unicode-a unicode-b unicode-c unicode-d unicode-e)) + (t ;; If we have utf-8 we're in Mule 5+. + (append '(utf-8) + (delete 'ascii + (coding-system-get 'mule-utf-8 'safe-charsets)))))) "Alist of MIME-charset/MULE-charsets.") (defun mm-enrich-utf-8-by-mule-ucs () @@ -379,10 +382,6 @@ could use `autoload-coding-system' here." This function will run when the `un-define' module is loaded under XEmacs, and fill the `utf-8' entry in `mm-mime-mule-charset-alist' with Mule charsets. It is completely useless for Emacs." - (unless (cdr (delete '(mm-enrich-utf-8-by-mule-ucs) - (assoc "un-define" after-load-alist))) - (setq after-load-alist - (delete '("un-define") after-load-alist))) (when (boundp 'unicode-basic-translation-charset-order-list) (condition-case nil (let ((val (delq diff --git a/lisp/gnus/uudecode.el b/lisp/gnus/uudecode.el index f47a8e90c3a..616348e899f 100644 --- a/lisp/gnus/uudecode.el +++ b/lisp/gnus/uudecode.el @@ -100,7 +100,11 @@ used is specified by `uudecode-decoder-program'." (make-temp-name "uu") uudecode-temporary-file-directory)))) (let ((cdir default-directory) - default-process-coding-system) + (default-process-coding-system + (if (featurep 'xemacs) + ;; In XEmacs, `nil' is not a valid coding system. + '(binary . binary) + nil))) (unwind-protect (with-temp-buffer (insert "begin 600 " (file-name-nondirectory tempfile) "\n") diff --git a/lisp/help.el b/lisp/help.el index 1661779ca74..d9a48a0a4cf 100644 --- a/lisp/help.el +++ b/lisp/help.el @@ -326,63 +326,76 @@ of the key sequence that ran this command." ;; run describe-prefix-bindings. (setq prefix-help-command 'describe-prefix-bindings) -(defun view-emacs-news (&optional arg) +(defun view-emacs-news (&optional version) "Display info on recent changes to Emacs. With argument, display info only for the selected version." (interactive "P") - (if (not arg) - (view-file (expand-file-name "NEWS" data-directory)) - (let* ((map (sort - (delete-dups - (apply - 'nconc - (mapcar - (lambda (file) - (with-temp-buffer - (insert-file-contents - (expand-file-name file data-directory)) - (let (res) - (while (re-search-forward - (if (string-match "^ONEWS\\.[0-9]+$" file) - "Changes in \\(?:Emacs\\|version\\)?[ \t]*\\([0-9]+\\(?:\\.[0-9]+\\)?\\)" - "^\* [^0-9\n]*\\([0-9]+\\.[0-9]+\\)") nil t) - (setq res (cons (list (match-string-no-properties 1) - file) res))) - res))) - (append '("NEWS" "ONEWS") - (directory-files data-directory nil - "^ONEWS\\.[0-9]+$" nil))))) - (lambda (a b) - (string< (car b) (car a))))) - (current (caar map)) - (version (completing-read - (format "Read NEWS for the version (default %s): " current) - (mapcar 'car map) nil nil nil nil current)) - (file (cadr (assoc version map))) - res) - (if (not file) - (error "No news is good news") - (view-file (expand-file-name file data-directory)) - (widen) - (goto-char (point-min)) - (when (re-search-forward - (concat (if (string-match "^ONEWS\\.[0-9]+$" file) - "Changes in \\(?:Emacs\\|version\\)?[ \t]*" - "^\* [^0-9\n]*") version) - nil t) - (beginning-of-line) - (narrow-to-region - (point) - (save-excursion - (while (and (setq res - (re-search-forward - (if (string-match "^ONEWS\\.[0-9]+$" file) - "Changes in \\(?:Emacs\\|version\\)?[ \t]*\\([0-9]+\\(?:\\.[0-9]+\\)?\\)" - "^\* [^0-9\n]*\\([0-9]+\\.[0-9]+\\)") nil t)) - (equal (match-string-no-properties 1) version))) - (or res (goto-char (point-max))) - (beginning-of-line) - (point)))))))) + (unless version + (setq version emacs-major-version)) + (when (consp version) + (let* ((all-versions + (let (res) + (mapcar + (lambda (file) + (with-temp-buffer + (insert-file-contents + (expand-file-name file data-directory)) + (while (re-search-forward + (if (member file '("NEWS.18" "NEWS.1-17")) + "Changes in \\(?:Emacs\\|version\\)?[ \t]*\\([0-9]+\\(?:\\.[0-9]+\\)?\\)" + "^\* [^0-9\n]*\\([0-9]+\\.[0-9]+\\)") nil t) + (setq res (cons (match-string-no-properties 1) res))))) + (cons "NEWS" + (directory-files data-directory nil + "^NEWS\\.[0-9][-0-9]*$" nil))) + (sort (delete-dups res) (lambda (a b) (string< b a))))) + (current (car all-versions)) + res) + (setq version (completing-read + (format "Read NEWS for the version (default %s): " current) + all-versions nil nil nil nil current)) + (if (integerp (string-to-number version)) + (setq version (string-to-number version)) + (unless (or (member version all-versions) + (<= (string-to-number version) (string-to-number current))) + (error "No news about version %s" version))))) + (when (integerp version) + (cond ((<= version 12) + (setq version (format "1.%d" version))) + ((<= version 18) + (setq version (format "%d" version))) + ((> version emacs-major-version) + (error "No news about emacs %d (yet)" version)))) + (let* ((vn (if (stringp version) + (string-to-number version) + version)) + (file (cond + ((>= vn emacs-major-version) "NEWS") + ((< vn 18) "NEWS.1-17") + (t (format "NEWS.%d" vn))))) + (view-file (expand-file-name file data-directory)) + (widen) + (goto-char (point-min)) + (when (stringp version) + (when (re-search-forward + (concat (if (< vn 19) + "Changes in Emacs[ \t]*" + "^\* [^0-9\n]*") version "$") + nil t) + (beginning-of-line) + (narrow-to-region + (point) + (save-excursion + (while (and (setq res + (re-search-forward + (if (< vn 19) + "Changes in \\(?:Emacs\\|version\\)?[ \t]*\\([0-9]+\\(?:\\.[0-9]+\\)?\\)" + "^\* [^0-9\n]*\\([0-9]+\\.[0-9]+\\)") nil t)) + (equal (match-string-no-properties 1) version))) + (or res (goto-char (point-max))) + (beginning-of-line) + (point))))))) + (defun view-todo (&optional arg) "Display the Emacs TODO list." @@ -942,11 +955,11 @@ is currently activated with completion." (defcustom temp-buffer-max-height (lambda (buffer) (/ (- (frame-height) 2) 2)) "Maximum height of a window displaying a temporary buffer. -This is the maximum height (in text lines) which `resize-temp-buffer-window' +This is effective only when Temp Buffer Resize mode is enabled. +The value is the maximum height (in lines) which `resize-temp-buffer-window' will give to a window displaying a temporary buffer. -It can also be a function which will be called with the object corresponding -to the buffer to be displayed as argument and should return an integer -positive number." +It can also be a function to be called to choose the height for such a buffer. +It gets one argumemt, the buffer, and should return a positive integer." :type '(choice integer function) :group 'help :version "20.4") diff --git a/lisp/ido.el b/lisp/ido.el index a622a7e6275..344f8a667a1 100644 --- a/lisp/ido.el +++ b/lisp/ido.el @@ -448,35 +448,41 @@ in merged file and directory lists." ;;; Examples for setting the value of ido-ignore-files ;(setq ido-ignore-files '("^ " "\\.c$" "\\.h$")) -(defcustom ido-default-file-method 'always-frame - "*How to switch to new file when using `ido-find-file'. +(defcustom ido-default-file-method 'raise-frame + "*How to visit a new file when using `ido-find-file'. Possible values: -`samewindow' Show new file in same window -`otherwindow' Show new file in another window (same frame) -`display' Display file in another window without switching to it -`otherframe' Show new file in another frame -`maybe-frame' If a file is visible in another frame, prompt to ask if you - you want to see the file in the same window of the current - frame or in the other frame -`always-frame' If a file is visible in another frame, raise that - frame; otherwise, visit the file in the same window" - :type '(choice (const samewindow) - (const otherwindow) - (const display) - (const otherframe) - (const maybe-frame) - (const always-frame)) +`selected-window' Show new file in selected window +`other-window' Show new file in another window (same frame) +`display' Display file in another window without selecting to it +`other-frame' Show new file in another frame +`maybe-frame' If a file is visible in another frame, prompt to ask if you + you want to see the file in the same window of the current + frame or in the other frame +`raise-frame' If a file is visible in another frame, raise that + frame; otherwise, visit the file in the same window" + :type '(choice (const :tag "Visit in selected window" selected-window) + (const :tag "Visit in other window" other-window) + (const :tag "Display (no select) in other window" display) + (const :tag "Visit in other frame" other-frame) + (const :tag "Ask to visit in other frame" maybe-frame) + (const :tag "Raise frame if already visited" raise-frame)) :group 'ido) -(defcustom ido-default-buffer-method 'always-frame +(defcustom ido-default-buffer-method 'raise-frame "*How to switch to new buffer when using `ido-switch-buffer'. See `ido-default-file-method' for details." - :type '(choice (const samewindow) - (const otherwindow) + :type '(choice (const :tag "Show in selected window" selected-window) + (const :tag "Show in other window" other-window) + (const :tag "Display (no select) in other window" display) + (const :tag "Show in other frame" other-frame) + (const :tag "Ask to show in other frame" maybe-frame) + (const :tag "Raise frame if already shown" raise-frame)) + :type '(choice (const selected-window) + (const other-window) (const display) - (const otherframe) + (const other-frame) (const maybe-frame) - (const always-frame)) + (const raise-frame)) :group 'ido) (defcustom ido-enable-flex-matching nil @@ -1778,7 +1784,7 @@ With ARG, turn ido speed-up on if arg is positive, off otherwise." "Perform the `ido-read-buffer' and `ido-read-file-name' functions. Return the name of a buffer or file selected. PROMPT is the prompt to give to the user. -DEFAULT if given is the default directory to start with. +DEFAULT if given is the default item to start with. If REQUIRE-MATCH is non-nil, an existing file must be selected. If INITIAL is non-nil, it specifies the initial input string." (let @@ -1822,7 +1828,10 @@ If INITIAL is non-nil, it specifies the initial input string." (cond ((eq item 'buffer) (if (bufferp default) (buffer-name default) default)) - ((stringp default) default) + ((stringp default) + (if (memq item '(file dir)) + (file-name-nondirectory default) + default)) ((eq item 'file) (and ido-enable-last-directory-history (let ((d (assoc ido-current-directory ido-last-directory-list))) @@ -3739,7 +3748,7 @@ for first matching file." ;;; VISIT CHOSEN BUFFER (defun ido-visit-buffer (buffer method &optional record) - "Visit file named FILE according to METHOD. + "Switch to BUFFER according to METHOD. Record command in `command-history' if optional RECORD is non-nil." (let (win newframe) @@ -3749,33 +3758,7 @@ Record command in `command-history' if optional RECORD is non-nil." (ido-record-command 'kill-buffer buffer)) (kill-buffer buffer)) - ((eq method 'samewindow) - (if record - (ido-record-command 'switch-to-buffer buffer)) - (switch-to-buffer buffer)) - - ((memq method '(always-frame maybe-frame)) - (cond - ((and window-system - (setq win (ido-window-buffer-p buffer)) - (or (eq method 'always-frame) - (y-or-n-p "Jump to frame? "))) - (setq newframe (window-frame win)) - (if (fboundp 'select-frame-set-input-focus) - (select-frame-set-input-focus newframe) - (raise-frame newframe) - (select-frame newframe) - (unless (featurep 'xemacs) - (set-mouse-position (selected-frame) (1- (frame-width)) 0))) - (select-window win)) - (t - ;; No buffer in other frames... - (if record - (ido-record-command 'switch-to-buffer buffer)) - (switch-to-buffer buffer) - ))) - - ((eq method 'otherwindow) + ((eq method 'other-window) (if record (ido-record-command 'switch-to-buffer buffer)) (switch-to-buffer-other-window buffer)) @@ -3783,14 +3766,29 @@ Record command in `command-history' if optional RECORD is non-nil." ((eq method 'display) (display-buffer buffer)) - ((eq method 'otherframe) + ((eq method 'other-frame) (switch-to-buffer-other-frame buffer) - (unless (featurep 'xemacs) - (select-frame-set-input-focus (selected-frame))) + (select-frame-set-input-focus (selected-frame))) + + ((and (memq method '(raise-frame maybe-frame)) + window-system + (setq win (ido-buffer-window-other-frame buffer)) + (or (eq method 'raise-frame) + (y-or-n-p "Jump to frame? "))) + (setq newframe (window-frame win)) + (select-frame-set-input-focus newframe) + (select-window win)) + + ;; (eq method 'selected-window) + (t + ;; No buffer in other frames... + (if record + (ido-record-command 'switch-to-buffer buffer)) + (switch-to-buffer buffer) )))) -(defun ido-window-buffer-p (buffer) +(defun ido-buffer-window-other-frame (buffer) ;; Return window pointer if BUFFER is visible in another frame. ;; If BUFFER is visible in the current frame, return nil. (let ((blist (ido-get-buffers-in-frames 'current))) @@ -3847,7 +3845,7 @@ in a separate window. The buffer name is selected interactively by typing a substring. For details of keybindings, do `\\[describe-function] ido'." (interactive) - (ido-buffer-internal 'otherwindow 'switch-to-buffer-other-window)) + (ido-buffer-internal 'other-window 'switch-to-buffer-other-window)) ;;;###autoload (defun ido-display-buffer () @@ -3880,7 +3878,7 @@ The buffer name is selected interactively by typing a substring. For details of keybindings, do `\\[describe-function] ido'." (interactive) (if ido-mode - (ido-buffer-internal 'otherframe) + (ido-buffer-internal 'other-frame) (call-interactively 'switch-to-buffer-other-frame))) ;;;###autoload @@ -3942,7 +3940,7 @@ in a separate window. The file name is selected interactively by typing a substring. For details of keybindings, do `\\[describe-function] ido-find-file'." (interactive) - (ido-file-internal 'otherwindow 'find-file-other-window)) + (ido-file-internal 'other-window 'find-file-other-window)) ;;;###autoload (defun ido-find-alternate-file () @@ -3990,7 +3988,7 @@ For details of keybindings, do `\\[describe-function] ido-find-file'." The file name is selected interactively by typing a substring. For details of keybindings, do `\\[describe-function] ido-find-file'." (interactive) - (ido-file-internal 'otherframe 'find-file-other-frame)) + (ido-file-internal 'other-frame 'find-file-other-frame)) ;;;###autoload (defun ido-write-file () @@ -4472,6 +4470,8 @@ See `read-file-name' for additional parameters." (ido-directory-too-big (and (not ido-directory-nonreadable) (ido-directory-too-big-p ido-current-directory))) (ido-work-directory-index -1) + (ido-show-dot-for-dired (and ido-show-dot-for-dired + (not default-filename))) (ido-work-file-index -1) (ido-find-literal nil)) (setq ido-exit nil) diff --git a/lisp/image-mode.el b/lisp/image-mode.el index 1a55676e3c7..66d7fb6c16a 100644 --- a/lisp/image-mode.el +++ b/lisp/image-mode.el @@ -139,6 +139,7 @@ and showing the image as an image." ;; was inserted (let* ((image (if (and (buffer-file-name) + (not (file-remote-p (buffer-file-name))) (not (buffer-modified-p)) (not (and (boundp 'archive-superior-buffer) archive-superior-buffer)) diff --git a/lisp/info-xref.el b/lisp/info-xref.el index 75bc72f25b4..a6acfa8021c 100644 --- a/lisp/info-xref.el +++ b/lisp/info-xref.el @@ -301,7 +301,10 @@ quite a while." (lambda (symbol) (dolist (link (get symbol 'custom-links)) (when (memq (car link) '(custom-manual info-link)) - (if (info-xref-goto-node-p (cadr link)) + ;; skip :tag part of (custom-manual :tag "Foo" "(foo)Node") + (if (eq :tag (cadr link)) + (setq link (cddr link))) + (if (info-xref-goto-node-p (cadr link)) (setq good (1+ good)) (setq bad (1+ bad)) ;; symbol-file gives nil for preloaded variables, would need diff --git a/lisp/info.el b/lisp/info.el index d12b7a01866..107dbb72d95 100644 --- a/lisp/info.el +++ b/lisp/info.el @@ -2866,8 +2866,11 @@ Give an empty topic name to go to the Index node itself." (car (car Info-index-alternatives)) (nth 2 (car Info-index-alternatives)) (if (cdr Info-index-alternatives) - (format "(%s total; use `,' for next)" - (length Info-index-alternatives)) + (format "(%s total; use `%s' for next)" + (length Info-index-alternatives) + (key-description (where-is-internal + 'Info-index-next overriding-local-map + t))) "(Only match)"))) (defun Info-find-index-name (name) @@ -2907,11 +2910,20 @@ Build a menu of the possible matches." manuals matches node nodes) (let ((Info-fontify-maximum-menu-size nil)) (Info-directory) + ;; current-node and current-file are nil when they invoke info-apropos + ;; as the first Info command, i.e. info-apropos loads info.el. In that + ;; case, we use (DIR)Top instead, to avoid signalling an error after + ;; the search is complete. + (when (null current-node) + (setq current-file Info-current-file) + (setq current-node Info-current-node)) (message "Searching indices...") (goto-char (point-min)) (re-search-forward "\\* Menu: *\n" nil t) (while (re-search-forward "\\*.*: *(\\([^)]+\\))" nil t) - (setq manuals (cons (match-string 1) manuals))) + ;; add-to-list makes sure we don't have duplicates in `manuals', + ;; so that the following dolist loop runs faster. + (add-to-list 'manuals (match-string 1))) (dolist (manual (nreverse manuals)) (message "Searching %s" manual) (condition-case err diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index b0ad3cd5ec8..77ef9f07d59 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@ -73,8 +73,7 @@ (make-sparse-keymap "Set Coding System")) (define-key-after mule-menu-keymap [set-language-environment] - (list 'menu-item "Set Language Environment" setup-language-environment-map - :help "Multilingual environment suitable for a specific language")) + (list 'menu-item "Set Language Environment" setup-language-environment-map)) (define-key-after mule-menu-keymap [separator-mule] '("--") t) diff --git a/lisp/international/mule.el b/lisp/international/mule.el index 9e0edb75f29..ae3301e24a9 100644 --- a/lisp/international/mule.el +++ b/lisp/international/mule.el @@ -356,9 +356,9 @@ Return t if file exists." )) (let (kill-buffer-hook kill-buffer-query-functions) (kill-buffer buffer))) - (let ((hook (assoc file after-load-alist))) - (when hook - (mapcar (function eval) (cdr hook)))) + (unless purify-flag + (do-after-load-evaluation fullname)) + (unless (or nomessage noninteractive) (if source (message "Loading %s (source)...done" file) @@ -1649,6 +1649,9 @@ This is used for loading and byte-compiling Emacs Lisp files.") (setq alist (cdr alist)))) coding-system)) +(put 'enable-character-translation 'permanent-local t) +(put 'enable-character-translation 'safe-local-variable 'booleanp) + (defun find-auto-coding (filename size) "Find a coding system for a file FILENAME of which SIZE bytes follow point. These bytes should include at least the first 1k of the file @@ -1686,17 +1689,21 @@ If nothing is specified, the return value is nil." (head-end (+ head-start (min size 1024))) (tail-start (+ head-start (max (- size 3072) 0))) (tail-end (+ head-start size)) - coding-system head-found tail-found pos) + coding-system head-found tail-found pos char-trans) ;; Try a short cut by searching for the string "coding:" ;; and for "unibyte:" at the head and tail of SIZE bytes. (setq head-found (or (search-forward "coding:" head-end t) - (search-forward "unibyte:" head-end t))) + (search-forward "unibyte:" head-end t) + (search-forward "enable-character-translation:" + head-end t))) (if (and head-found (> head-found tail-start)) ;; Head and tail are overlapped. (setq tail-found head-found) (goto-char tail-start) (setq tail-found (or (search-forward "coding:" tail-end t) - (search-forward "unibyte:" tail-end t)))) + (search-forward "unibyte:" tail-end t) + (search-forward "enable-character-translation:" + tail-end t)))) ;; At first check the head. (when head-found @@ -1714,12 +1721,16 @@ If nothing is specified, the return value is nil." (re-search-forward "\\(.*;\\)?[ \t]*coding:[ \t]*\\([^ ;]+\\)" head-end t)) - (setq coding-system (intern (match-string 2)))))) + (setq coding-system (intern (match-string 2)))) + (when (re-search-forward + "\\(.*;\\)?[ \t]*enable-character-translation:[ \t]*\\([^ ;]+\\)" + head-end t) + (setq char-trans (match-string 2))))) ;; If no coding: tag in the head, check the tail. ;; Here we must pay attention to the case that the end-of-line ;; is just "\r" and we can't use "^" nor "$" in regexp. - (when (and tail-found (not coding-system)) + (when (and tail-found (or (not coding-system) (not char-trans))) (goto-char tail-start) (re-search-forward "[\r\n]\^L" nil t) (if (re-search-forward @@ -1742,6 +1753,11 @@ If nothing is specified, the return value is nil." "[\r\n]" prefix "[ \t]*unibyte[ \t]*:[ \t]*\\([^ \t\r\n]+\\)[ \t]*" suffix "[\r\n]")) + (re-char-trans + (concat + "[\r\n]" prefix + "[ \t]*enable-character-translation[ \t]*:[ \t]*\\([^ \t\r\n]+\\)[ \t]*" + suffix "[\r\n]")) (re-end (concat "[\r\n]" prefix "[ \t]*End *:[ \t]*" suffix "[\r\n]?")) @@ -1755,7 +1771,21 @@ If nothing is specified, the return value is nil." (setq coding-system 'raw-text)) (when (and (not coding-system) (re-search-forward re-coding tail-end t)) - (setq coding-system (intern (match-string 1))))))) + (setq coding-system (intern (match-string 1)))) + (when (and (not char-trans) + (re-search-forward re-char-trans tail-end t)) + (setq char-trans (match-string 1)))))) + (if coding-system + ;; If the coding-system name ends with "!", remove it and + ;; set char-trans to "nil". + (let ((name (symbol-name coding-system))) + (if (= (aref name (1- (length name))) ?!) + (setq coding-system (intern (substring name 0 -1)) + char-trans "nil")))) + (when (and char-trans + (not (setq char-trans (intern char-trans)))) + (make-local-variable 'enable-character-translation) + (setq enable-character-translation nil)) (if coding-system (cons coding-system :coding))) ;; Finally, try all the `auto-coding-functions'. @@ -1962,7 +1992,8 @@ Part of the job of this function is setting `buffer-undo-list' appropriately." (or coding (setq coding (car (find-operation-coding-system 'insert-file-contents - filename visit beg end replace)))) + (cons filename (current-buffer)) + visit beg end replace)))) (if (coding-system-p coding) (or enable-multibyte-characters (setq coding @@ -2246,18 +2277,19 @@ This function is intended to be added to `auto-coding-functions'." "If the buffer has an HTML meta tag, use it to determine encoding. This function is intended to be added to `auto-coding-functions'." (setq size (min (+ (point) size) - ;; Only search forward 10 lines (save-excursion - (forward-line 10) + ;; Limit the search by the end of the HTML header. + (or (search-forward "</head>" size t) + ;; In case of no header, search only 10 lines. + (forward-line 10)) (point)))) - (when (and (search-forward "<html" size t) - (re-search-forward "<meta\\s-+http-equiv=\"content-type\"\\s-+content=\"text/\\sw+;\\s-*charset=\\(.+?\\)\"" size t)) - (let* ((match (match-string 1)) - (sym (intern (downcase match)))) - (if (coding-system-p sym) - sym - (message "Warning: unknown coding system \"%s\"" match) - nil)))) + (when (re-search-forward "<meta\\s-+http-equiv=[\"']?content-type[\"']?\\s-+content=[\"']text/\\sw+;\\s-*charset=\\(.+?\\)[\"']" size t) + (let* ((match (match-string 1)) + (sym (intern (downcase match)))) + (if (coding-system-p sym) + sym + (message "Warning: unknown coding system \"%s\"" match) + nil)))) ;;; (provide 'mule) diff --git a/lisp/loadup.el b/lisp/loadup.el index 00e9e35ff60..7691482f4e7 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -83,6 +83,7 @@ (load "help") +(load "jka-cmpr-hook") ;; Any Emacs Lisp source file (*.el) loaded here after can contain ;; multilingual text. (load "international/mule-cmds") @@ -201,7 +202,6 @@ (message "%s" (garbage-collect)) (load "vc-hooks") -(load "jka-cmpr-hook") (load "ediff-hook") (if (fboundp 'x-show-tip) (load "tooltip")) diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index 97ada1942bc..4abbd164fec 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -624,7 +624,7 @@ the variable `rmail-mime-feature'.") ;;;###autoload (defvar rmail-mime-charset-pattern (concat "^content-type:[ ]*text/plain;" - "\\(?:[ \t\n]*\\(format\\|delsp\\)=\"?[-a-z0-9]+\"?;\\)*" + "\\(?:[ \t\n]*\\(?:format\\|delsp\\)=\"?[-a-z0-9]+\"?;\\)*" "[ \t\n]*charset=\"?\\([^ \t\n\";]+\\)\"?") "Regexp to match MIME-charset specification in a header of message. The first parenthesized expression should match the MIME-charset name.") @@ -1994,7 +1994,7 @@ is non-nil if the user has supplied the password interactively. (re-search-backward rmail-mime-charset-pattern start t)))) - (intern (downcase (match-string 2)))))) + (intern (downcase (match-string 1)))))) (rmail-decode-region start (point) mime-charset))))) ;; Add an X-Coding-System: header if we don't have one. (save-excursion @@ -2155,7 +2155,7 @@ is non-nil if the user has supplied the password interactively. (re-search-backward rmail-mime-charset-pattern start t)))) - (intern (downcase (match-string 2)))))) + (intern (downcase (match-string 1)))))) (rmail-decode-region start (point) mime-charset))) (save-excursion (goto-char start) diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in index aea34ed1474..93e9141f4cc 100644 --- a/lisp/makefile.w32-in +++ b/lisp/makefile.w32-in @@ -33,7 +33,7 @@ srcdir = $(CURDIR)/.. # You can specify a different executable on the make command line, # e.g. "make EMACS=../src/emacs ...". -EMACS = "$(THISDIR)/../bin/emacs.exe" +EMACS = $(THISDIR)/../bin/emacs.exe # Command line flags for Emacs. This must include --multibyte, # otherwise some files will not compile. @@ -64,8 +64,11 @@ COMPILE_FIRST = \ $(lisp)/progmodes/cc-vars.el # The actual Emacs command run in the targets below. +# The quotes around $(EMACS) are here because the user could type +# it with forward slashes and without quotes, which will fail if +# the shell is cmd.exe. -emacs = $(EMACS) $(EMACSOPT) +emacs = "$(EMACS)" $(EMACSOPT) # Common command to find subdirectories @@ -320,7 +323,7 @@ $(lisp)/mh-e/mh-loaddefs.el: $(MH_E_SRC) $(MAKE) $(MFLAGS) pre-mh-loaddefs.el-$(SHELLTYPE) cp pre-mh-loaddefs.el-$(SHELLTYPE) $@ rm pre-mh-loaddefs.el-$(SHELLTYPE) - $(EMACS) $(EMACSOPT) \ + "$(EMACS)" $(EMACSOPT) \ -l autoload \ --eval "(setq generate-autoload-cookie \";;;###mh-autoload\")" \ --eval "(setq find-file-suppress-same-file-warnings t)" \ @@ -381,12 +384,12 @@ pre-mh-loaddefs.el-CMD: bootstrap-clean: bootstrap-clean-$(SHELLTYPE) $(lisp)/loaddefs.el bootstrap-clean-CMD: -# if exist $(EMACS) $(MAKE) $(MFLAGS) autoloads +# if exist "$(EMACS)" $(MAKE) $(MFLAGS) autoloads cp $(lisp)/ldefs-boot.el $(lisp)/loaddefs.el -for %%f in (. $(WINS)) do for %%g in (%%f\*.elc) do @$(DEL) %%g bootstrap-clean-SH: -# if test -f $(EMACS); then $(MAKE) $(MFLAGS) autoloads; fi +# if test -f "$(EMACS)"; then $(MAKE) $(MFLAGS) autoloads; fi # -rm -f $(lisp)/*.elc $(lisp)/*/*.elc cp $(lisp)/ldefs-boot.el $(lisp)/loaddefs.el -for dir in . $(WINS); do rm -f $$dir/*.elc; done @@ -396,7 +399,7 @@ bootstrap-clean-SH: # it will not be mistaken for an installed binary. bootstrap: update-subdirs autoloads mh-autoloads compile finder-data custom-deps - - $(DEL) $(EMACS) + - $(DEL) "$(EMACS)" # # Assuming INSTALL_DIR is defined, copy the elisp files to it diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index 0ec4339f822..cc1351b9032 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el @@ -300,8 +300,7 @@ A large number or nil slows down menu responsiveness." (define-key menu-bar-search-menu [i-search] - (list 'menu-item "Incremental Search" menu-bar-i-search-menu - :help "Incremental Search finds partial matches while you type the search string.\nIt is most convenient from the keyboard. Try it!")) + (list 'menu-item "Incremental Search" menu-bar-i-search-menu)) (define-key menu-bar-search-menu [separator-tag-isearch] '(menu-item "--")) @@ -369,8 +368,7 @@ A large number or nil slows down menu responsiveness." ;;; Assemble the top-level Edit menu items. (define-key menu-bar-edit-menu [props] - '(menu-item "Text Properties" facemenu-menu - :help "Change properties of text in region")) + '(menu-item "Text Properties" facemenu-menu)) (define-key menu-bar-edit-menu [fill] '(menu-item "Fill" fill-region @@ -382,8 +380,7 @@ A large number or nil slows down menu responsiveness." '(menu-item "--")) (define-key menu-bar-edit-menu [bookmark] - '(menu-item "Bookmarks" menu-bar-bookmark-map - :help "Record positions and jump between them")) + '(menu-item "Bookmarks" menu-bar-bookmark-map)) (defvar menu-bar-goto-menu (make-sparse-keymap "Go To")) @@ -467,8 +464,7 @@ A large number or nil slows down menu responsiveness." (fset 'yank-menu (cons 'keymap yank-menu)) (define-key menu-bar-edit-menu [select-paste] '(menu-item "Select and Paste" yank-menu - :enable (and (cdr yank-menu) (not buffer-read-only)) - :help "Paste (yank) text cut or copied earlier")) + :enable (and (cdr yank-menu) (not buffer-read-only)))) (define-key menu-bar-edit-menu [paste] '(menu-item "Paste" yank :enable (and @@ -641,8 +637,7 @@ by \"Save Options\" in Custom buffers.") ;;; Assemble all the top-level items of the "Options" menu (define-key menu-bar-options-menu [customize] - (list 'menu-item "Customize Emacs" menu-bar-custom-menu - :help "Full customization of every Emacs feature")) + (list 'menu-item "Customize Emacs" menu-bar-custom-menu)) (defun menu-bar-options-save () "Save current values of Options menu items using Custom." @@ -880,8 +875,7 @@ mail status in mode line")) (define-key menu-bar-showhide-menu [showhide-fringe] (list 'menu-item "Fringe" menu-bar-showhide-fringe-menu - :visible `(display-graphic-p) - :help "Select fringe mode")) + :visible `(display-graphic-p))) (defvar menu-bar-showhide-scroll-bar-menu (make-sparse-keymap "Scroll-bar")) @@ -925,8 +919,7 @@ mail status in mode line")) (define-key menu-bar-showhide-menu [showhide-scroll-bar] (list 'menu-item "Scroll-bar" menu-bar-showhide-scroll-bar-menu - :visible `(display-graphic-p) - :help "Select scroll-bar mode")) + :visible `(display-graphic-p))) (define-key menu-bar-showhide-menu [showhide-tooltip-mode] (list 'menu-item "Tooltips" 'tooltip-mode @@ -946,8 +939,7 @@ mail status in mode line")) :button `(:toggle . tool-bar-mode))) (define-key menu-bar-options-menu [showhide] - (list 'menu-item "Show/Hide" menu-bar-showhide-menu - :help "Toggle on/off various display features")) + (list 'menu-item "Show/Hide" menu-bar-showhide-menu)) (define-key menu-bar-options-menu [showhide-separator] '("--")) @@ -960,7 +952,7 @@ mail status in mode line")) ;; Most of the MULE menu actually does make sense in unibyte mode, ;; e.g. language selection. ;;; ':visible 'default-enable-multibyte-characters - ':help "Default language, encodings, input method")) + )) ;(setq menu-bar-final-items (cons 'mule menu-bar-final-items)) ;(define-key menu-bar-options-menu [preferences] ; (list 'menu-item "Preferences" menu-bar-preferences-menu @@ -1137,14 +1129,13 @@ mail status in mode line")) '(menu-item "Programmable Calculator" calc :help "Invoke the Emacs built-in full scientific calculator")) (define-key menu-bar-tools-menu [calendar] - '(menu-item "Display Calendar" calendar)) + '(menu-item "Calendar" calendar)) (define-key menu-bar-tools-menu [separator-net] '("--")) (define-key menu-bar-tools-menu [directory-search] - '(menu-item "Directory Search" eudc-tools-menu - :help "Query directory servers via LDAP, CCSO PH/QI or BBDB")) + '(menu-item "Directory Search" eudc-tools-menu)) (define-key menu-bar-tools-menu [compose-mail] (list 'menu-item `(format "Send Mail (with %s)" (send-mail-item-name)) @@ -1172,27 +1163,21 @@ mail status in mode line")) (defvar vc-menu-map (make-sparse-keymap "Version Control")) (define-key menu-bar-tools-menu [pcl-cvs] - '(menu-item "PCL-CVS" cvs-global-menu - :help "Module-level interface to CVS")) + '(menu-item "PCL-CVS" cvs-global-menu)) (define-key menu-bar-tools-menu [vc] - (list 'menu-item "Version Control" vc-menu-map - :help "Interface to RCS, CVS, SCCS")) + (list 'menu-item "Version Control" vc-menu-map)) (define-key menu-bar-tools-menu [separator-compare] '("--")) (define-key menu-bar-tools-menu [ediff-misc] - '(menu-item "Ediff Miscellanea" menu-bar-ediff-misc-menu - :help "Ediff manual, customization, sessions, etc.")) + '(menu-item "Ediff Miscellanea" menu-bar-ediff-misc-menu)) (define-key menu-bar-tools-menu [epatch] '(menu-item "Apply Patch" menu-bar-epatch-menu)) (define-key menu-bar-tools-menu [ediff-merge] - '(menu-item "Merge" menu-bar-ediff-merge-menu - :help "Merge different revisions of files/directories")) + '(menu-item "Merge" menu-bar-ediff-merge-menu)) (define-key menu-bar-tools-menu [compare] - '(menu-item "Compare (Ediff)" menu-bar-ediff-menu - :help "Display differences between files/directories")) - + '(menu-item "Compare (Ediff)" menu-bar-ediff-menu)) (define-key menu-bar-tools-menu [separator-spell] '("--")) @@ -1242,8 +1227,7 @@ mail status in mode line")) :help "Keyboard layout for specific input method")) (define-key menu-bar-describe-menu [describe-language-environment] (list 'menu-item "Describe Language Environment" - describe-language-environment-map - :help "Show multilingual settings for a specific language")) + describe-language-environment-map)) (define-key menu-bar-describe-menu [separator-desc-mule] '("--")) @@ -1318,6 +1302,12 @@ key, a click, or a menu-item")) :help "Find commands whose names match a regexp")) (define-key menu-bar-apropos-menu [sep1] '("--")) +(define-key menu-bar-apropos-menu [emacs-command-node] + '(menu-item "Look Up Command in User Manual..." Info-goto-emacs-command-node + :help "Display manual section that describes a command")) +(define-key menu-bar-apropos-menu [emacs-key-command-node] + '(menu-item "Look Up Key in User Manual..." Info-goto-emacs-key-command-node + :help "Display manual section that describes a key")) (define-key menu-bar-apropos-menu [elisp-index-search] '(menu-item "Look Up Subject in ELisp Manual..." elisp-index-search :help "Find description of a subject in Emacs Lisp manual")) @@ -1338,6 +1328,9 @@ key, a click, or a menu-item")) (define-key menu-bar-manuals-menu [order-emacs-manuals] '(menu-item "Ordering Manuals" view-order-manuals :help "How to order manuals from the Free Software Foundation")) +(define-key menu-bar-manuals-menu [info-apropos] + '(menu-item "Lookup Subject in all manuals..." info-apropos + :help "Find description of a subject in all installed manuals")) (define-key menu-bar-manuals-menu [info] '(menu-item "All Other Manuals (Info)" Info-directory :help "Read any of the installed manuals")) @@ -1347,14 +1340,6 @@ key, a click, or a menu-item")) (define-key menu-bar-manuals-menu [info-elintro] '(menu-item "Introduction to Emacs Lisp" menu-bar-read-lispintro :help "Read the Introduction to Emacs Lisp Programming")) -(define-key menu-bar-manuals-menu [sep3] - '("--")) -(define-key menu-bar-manuals-menu [command] - '(menu-item "Find Command in Manual..." Info-goto-emacs-command-node - :help "Display manual section that describes a command")) -(define-key menu-bar-manuals-menu [key] - '(menu-item "Find Key in Manual..." Info-goto-emacs-key-command-node - :help "Display manual section that describes a key")) (define-key menu-bar-help-menu [eliza] '(menu-item "Emacs Psychotherapist" doctor @@ -1389,17 +1374,14 @@ key, a click, or a menu-item")) '(menu-item "Find Emacs Packages" finder-by-keyword :help "Find packages and features by keyword")) (define-key menu-bar-help-menu [manuals] - (list 'menu-item "More Manuals" menu-bar-manuals-menu - :help "Search and browse on-line manuals")) + (list 'menu-item "More Manuals" menu-bar-manuals-menu)) (define-key menu-bar-help-menu [emacs-manual] '(menu-item "Read the Emacs Manual" info-emacs-manual :help "Full documentation of Emacs features")) (define-key menu-bar-help-menu [describe] - (list 'menu-item "Describe" menu-bar-describe-menu - :help "Describe commands, variables, keys")) + (list 'menu-item "Describe" menu-bar-describe-menu)) (define-key menu-bar-help-menu [apropos] - (list 'menu-item "Search Documentation" menu-bar-apropos-menu - :help "Look up terms, find commands, options, etc. (Apropos)")) + (list 'menu-item "Search Documentation" menu-bar-apropos-menu)) (define-key menu-bar-help-menu [sep1] '("--")) (define-key menu-bar-help-menu [report-emacs-bug] diff --git a/lisp/mh-e/mh-search.el b/lisp/mh-e/mh-search.el index 14891204fad..b6f8dd71d9a 100644 --- a/lisp/mh-e/mh-search.el +++ b/lisp/mh-e/mh-search.el @@ -1524,7 +1524,7 @@ construct the base name." (with-temp-buffer (mh-exec-cmd-output "folder" nil "-fast" "-nocreate" folder) (goto-char (point-min)) - (not (eobp)))))) + (looking-at (format "+?%s" folder)))))) (defun mh-msg-exists-p (msg folder) "Check if MSG exists in FOLDER." diff --git a/lisp/msb.el b/lisp/msb.el index 61ddce5dae0..d5f32486971 100644 --- a/lisp/msb.el +++ b/lisp/msb.el @@ -1007,7 +1007,7 @@ variable `msb-menu-cond'." (mouse-select-buffer event)) ((and (numberp (car choice)) (null (cdr choice))) - (let ((msb--last-buffer-menu (nthcdr 3 (assq (car choice) + (let ((msb--last-buffer-menu (nthcdr 2 (assq (car choice) msb--last-buffer-menu)))) (mouse-select-buffer event))) ((while (numberp (car choice)) diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el index 101b9cf210d..3f514a2aaab 100644 --- a/lisp/net/browse-url.el +++ b/lisp/net/browse-url.el @@ -680,6 +680,10 @@ interactively. Turn the filename into a URL with function (defun browse-url-file-url (file) "Return the URL corresponding to FILE. Use variable `browse-url-filename-alist' to map filenames to URLs." + (let ((coding (and default-enable-multibyte-characters + (or file-name-coding-system + default-file-name-coding-system)))) + (if coding (setq file (encode-coding-string file coding)))) ;; URL-encode special chars, do % first (let ((s 0)) (while (setq s (string-match "%" file s)) diff --git a/lisp/pcvs-info.el b/lisp/pcvs-info.el index 4aaa5add58d..085f294e6fb 100644 --- a/lisp/pcvs-info.el +++ b/lisp/pcvs-info.el @@ -379,7 +379,8 @@ For use by the cookie package." ;; or nothing ""))) (format "%-11s %s %-11s %-11s %s" - side status type base file))))))) + side status type base file)))) + "\n"))) (defun cvs-fileinfo-update (fi fi-new) diff --git a/lisp/pcvs.el b/lisp/pcvs.el index b9d04522181..5e322b9276a 100644 --- a/lisp/pcvs.el +++ b/lisp/pcvs.el @@ -467,7 +467,7 @@ If non-nil, NEW means to create a new buffer no matter what." (cvs-mode) (set (make-local-variable 'list-buffers-directory) buffer-name) ;;(set (make-local-variable 'cvs-temp-buffer) (cvs-temp-buffer)) - (let ((cookies (ewoc-create 'cvs-fileinfo-pp "\n" ""))) + (let ((cookies (ewoc-create 'cvs-fileinfo-pp "\n\n" "\n" t))) (set (make-local-variable 'cvs-cookies) cookies) (add-hook 'kill-buffer-hook (lambda () @@ -618,7 +618,7 @@ If non-nil, NEW means to create a new buffer no matter what." (str (car hf)) (done "") (tin (ewoc-nth cvs-cookies 0))) - (if (eq (length str) 1) (setq str "")) + (if (eq (length str) 2) (setq str "")) ;; look for the first *real* fileinfo (to determine emptyness) (while (and tin @@ -633,6 +633,7 @@ If non-nil, NEW means to create a new buffer no matter what." (setq str (replace-match "" t t str)) (if (zerop (length str)) (setq str "\n")) (setq done (concat "-- last cmd: " cmd " --")))) + (setq str (concat str "\n") done (concat done "\n")) ;; set the new header and footer (ewoc-set-hf cvs-cookies str (concat "\n--------------------- " diff --git a/lisp/pgg-pgp.el b/lisp/pgg-pgp.el index f58fd0d3c6d..e53a0c2c867 100644 --- a/lisp/pgg-pgp.el +++ b/lisp/pgg-pgp.el @@ -136,21 +136,21 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"." "Encrypt the current region between START and END." (let* ((pgg-pgp-user-id (or pgg-pgp-user-id pgg-default-user-id)) (passphrase (or passphrase - (when sign - (pgg-read-passphrase - (format "PGP passphrase for %s: " - pgg-pgp-user-id) - pgg-pgp-user-id)))) + (when sign + (pgg-read-passphrase + (format "PGP passphrase for %s: " + pgg-pgp-user-id) + pgg-pgp-user-id)))) (args - (append - `("+encrypttoself=off +verbose=1" "+batchmode" - "+language=us" "-fate" - ,@(if recipients - (mapcar (lambda (rcpt) (concat "\"" rcpt "\"")) - (append recipients - (if pgg-encrypt-for-me - (list pgg-pgp-user-id)))))) - (if sign '("-s" "-u" pgg-pgp-user-id))))) + (append + `("+encrypttoself=off +verbose=1" "+batchmode" + "+language=us" "-fate" + ,@(if recipients + (mapcar (lambda (rcpt) (concat "\"" rcpt "\"")) + (append recipients + (if pgg-encrypt-for-me + (list pgg-pgp-user-id)))))) + (if sign '("-s" "-u" pgg-pgp-user-id))))) (pgg-pgp-process-region start end nil pgg-pgp-program args) (pgg-process-when-success nil))) @@ -162,11 +162,11 @@ passphrase cache or user." (let* ((pgg-pgp-user-id (or pgg-pgp-user-id pgg-default-user-id)) (key (pgg-pgp-lookup-key pgg-pgp-user-id 'encrypt)) (passphrase - (or passphrase - (pgg-read-passphrase - (format "PGP passphrase for %s: " pgg-pgp-user-id) key))) + (or passphrase + (pgg-read-passphrase + (format "PGP passphrase for %s: " pgg-pgp-user-id) key))) (args - '("+verbose=1" "+batchmode" "+language=us" "-f"))) + '("+verbose=1" "+batchmode" "+language=us" "-f"))) (pgg-pgp-process-region start end passphrase pgg-pgp-program args) (pgg-process-when-success (if pgg-cache-passphrase @@ -179,10 +179,10 @@ If optional PASSPHRASE is not specified, it will be obtained from the passphrase cache or user." (let* ((pgg-pgp-user-id (or pgg-pgp-user-id pgg-default-user-id)) (passphrase - (or passphrase - (pgg-read-passphrase - (format "PGP passphrase for %s: " pgg-pgp-user-id) - (pgg-pgp-lookup-key pgg-pgp-user-id 'sign)))) + (or passphrase + (pgg-read-passphrase + (format "PGP passphrase for %s: " pgg-pgp-user-id) + (pgg-pgp-lookup-key pgg-pgp-user-id 'sign)))) (args (list (if clearsign "-fast" "-fbast") "+verbose=1" "+language=us" "+batchmode" diff --git a/lisp/pgg-pgp5.el b/lisp/pgg-pgp5.el index 3cba59916e5..75c96e59909 100644 --- a/lisp/pgg-pgp5.el +++ b/lisp/pgg-pgp5.el @@ -147,23 +147,23 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"." "Encrypt the current region between START and END." (let* ((pgg-pgp5-user-id (or pgg-pgp5-user-id pgg-default-user-id)) (passphrase (or passphrase - (when sign - (pgg-read-passphrase - (format "PGP passphrase for %s: " - pgg-pgp5-user-id) - pgg-pgp5-user-id)))) + (when sign + (pgg-read-passphrase + (format "PGP passphrase for %s: " + pgg-pgp5-user-id) + pgg-pgp5-user-id)))) (args - (append - `("+NoBatchInvalidKeys=off" "-fat" "+batchmode=1" - ,@(if recipients - (apply #'append - (mapcar (lambda (rcpt) - (list "-r" - (concat "\"" rcpt "\""))) - (append recipients - (if pgg-encrypt-for-me - (list pgg-pgp5-user-id))))))) - (if sign '("-s" "-u" pgg-pgp5-user-id))))) + (append + `("+NoBatchInvalidKeys=off" "-fat" "+batchmode=1" + ,@(if recipients + (apply #'append + (mapcar (lambda (rcpt) + (list "-r" + (concat "\"" rcpt "\""))) + (append recipients + (if pgg-encrypt-for-me + (list pgg-pgp5-user-id))))))) + (if sign '("-s" "-u" pgg-pgp5-user-id))))) (pgg-pgp5-process-region start end nil pgg-pgp5-pgpe-program args) (pgg-process-when-success nil))) @@ -171,10 +171,10 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"." "Decrypt the current region between START and END." (let* ((pgg-pgp5-user-id (or pgg-pgp5-user-id pgg-default-user-id)) (passphrase - (or passphrase - (pgg-read-passphrase - (format "PGP passphrase for %s: " pgg-pgp5-user-id) - (pgg-pgp5-lookup-key pgg-pgp5-user-id 'encrypt)))) + (or passphrase + (pgg-read-passphrase + (format "PGP passphrase for %s: " pgg-pgp5-user-id) + (pgg-pgp5-lookup-key pgg-pgp5-user-id 'encrypt)))) (args '("+verbose=1" "+batchmode=1" "+language=us" "-f"))) (pgg-pgp5-process-region start end passphrase pgg-pgp5-pgpv-program args) @@ -184,10 +184,10 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"." "Make detached signature from text between START and END." (let* ((pgg-pgp5-user-id (or pgg-pgp5-user-id pgg-default-user-id)) (passphrase - (or passphrase - (pgg-read-passphrase - (format "PGP passphrase for %s: " pgg-pgp5-user-id) - (pgg-pgp5-lookup-key pgg-pgp5-user-id 'sign)))) + (or passphrase + (pgg-read-passphrase + (format "PGP passphrase for %s: " pgg-pgp5-user-id) + (pgg-pgp5-lookup-key pgg-pgp5-user-id 'sign)))) (args (list (if clearsign "-fat" "-fbat") "+verbose=1" "+language=us" "+batchmode=1" diff --git a/lisp/progmodes/cc-styles.el b/lisp/progmodes/cc-styles.el index 6f623623535..c2b9b435e4c 100644 --- a/lisp/progmodes/cc-styles.el +++ b/lisp/progmodes/cc-styles.el @@ -264,7 +264,7 @@ element of the list is added with `add-hook'. Do not change this variable directly. Use the function `c-add-style' to add new styles or modify existing styles (it is not a good idea to modify existing styles -- you should create a new style that inherits -the existing style.") +the existing style).") ;; Functions that manipulate styles diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el index 64e38be62d0..0e6738710c5 100644 --- a/lisp/progmodes/cc-vars.el +++ b/lisp/progmodes/cc-vars.el @@ -812,6 +812,7 @@ macro exceeds this column then the next tab stop from that line is used as alignment column instead." :type 'integer :group 'c) +;;;###autoload(put 'c-backslash-column 'safe-local-variable 'integerp) (defcustom-c-stylevar c-backslash-max-column 72 "*Maximum alignment column for line continuation backslashes. diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index 527624bfc4e..5da86972ec5 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -228,7 +228,7 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1)) \\([0-9]+\\)\\([.:]?\\)\\([0-9]+\\)?\ \\(?:-\\(?:\\([0-9]+\\)\\3\\)?\\.?\\([0-9]+\\)?\\)?:\ \\(?: *\\(\\(?:Future\\|Runtime\\)?[Ww]arning\\|W:\\)\\|\ - *\\([Ii]nfo\\(?:\\>\\|rmationa?l?\\)\\|I:\\)\\)?" + *\\([Ii]nfo\\(?:\\>\\|rmationa?l?\\)\\|I:\\|instantiated from\\)\\)?" 1 (2 . 5) (4 . 6) (7 . 8)) (lcc @@ -236,7 +236,7 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1)) 2 3 4 (1)) (makepp - "^makepp: \\(?:\\(?:warning\\(:\\).*?\\|\\(Scanning\\|[LR]e?l?oading makefile\\) \\|.*?\\)\ + "^makepp: \\(?:\\(?:warning\\(:\\).*?\\|\\(Scanning\\|[LR]e?l?oading makefile\\|Imported\\) \\|.*?\\)\ `\\(\\(\\S +?\\)\\(?::\\([0-9]+\\)\\)?\\)['(]\\)" 4 5 nil (1 . 2) 3 ("`\\(\\(\\S +?\\)\\(?::\\([0-9]+\\)\\)?\\)['(]" nil nil @@ -293,15 +293,34 @@ File = \\(.+\\), Line = \\([0-9]+\\)\\(?:, Column = \\([0-9]+\\)\\)?" \\(?:: \\(warning:\\)?\\|$\\| ),\\)" 1 2 nil (3)) (gcov-file - "^ +-: \\(0\\):Source:\\(.+\\)$" 2 1 nil 0) - (gcov-bb-file - "^ +-: \\(0\\):Object:\\(?:.+\\)$" nil 1 nil 0) - (gcov-never-called-line - "^ +\\(#####\\): +\\([0-9]+\\):.+$" nil 2 nil 2 nil - (1 compilation-error-face)) + "^ *-: *\\(0\\):Source:\\(.+\\)$" + 2 1 nil 0 nil + (1 compilation-line-face prepend) (2 compilation-info-face prepend)) + (gcov-header + "^ *-: *\\(0\\):\\(?:Object\\|Graph\\|Data\\|Runs\\|Programs\\):.+$" + nil 1 nil 0 nil + (1 compilation-line-face prepend)) + ;; Underlines over all lines of gcov output are too uncomfortable to read. + ;; However, hyperlinks embedded in the lines are useful. + ;; So I put default face on the lines; and then put + ;; compilation-*-face by manually to eliminate the underlines. + ;; The hyperlinks are still effective. + (gcov-nomark + "^ *-: *\\([1-9]\\|[0-9]\\{2,\\}\\):.*$" + nil 1 nil 0 nil + (0 'default t) + (1 compilation-line-face prepend)) (gcov-called-line - "^ +[-0-9]+: +\\([1-9]\\|[0-9]\\{2,\\}\\):.*$" nil 1 nil 0) -) + "^ *\\([0-9]+\\): *\\([0-9]+\\):.*$" + nil 2 nil 0 nil + (0 'default t) + (1 compilation-info-face prepend) (2 compilation-line-face prepend)) + (gcov-never-called + "^ *\\(#####\\): *\\([0-9]+\\):.*$" + nil 2 nil 2 nil + (0 'default t) + (1 compilation-error-face prepend) (2 compilation-line-face prepend)) + ) "Alist of values for `compilation-error-regexp-alist'.") (defcustom compilation-error-regexp-alist diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el index f5d08d533fd..0f92523e306 100644 --- a/lisp/progmodes/gdb-ui.el +++ b/lisp/progmodes/gdb-ui.el @@ -71,11 +71,11 @@ ;;; Known Bugs: ;; 1) Strings that are watched don't update in the speedbar when their -;; contents change unless the first character changes. +;; contents change unless the first character changes. ;; 2) Cannot handle multiple debug sessions. -;; 3) Initially, the assembler buffer does not display the cursor at the -;; current line if the line is not visible in the window (but when testing -;; gdb-assembler-custom with a lisp debugger it does!). +;; 3) M-x gdb doesn't work with "run" command in .gdbinit, use M-x gdba instead. +;; 4) M-x gdb doesn't work if the corefile is specified in the command in the +;; minibuffer, use M-x gdba instead (or specify the core in the GUD buffer). ;;; Problems with watch expressions, GDB/MI: ;; 1) They go out of scope when the inferior is re-run. @@ -83,15 +83,10 @@ ;; 3) VARNUM increments even when variable object is not created ;; (maybe trivial). -;; Known Bugs: -;; 1) M-x gdb doesn't work with "run" command in .gdbinit, use M-x gdba instead. - ;;; TODO: ;; 1) Use MI command -data-read-memory for memory window. ;; 2) Use tree-widget.el instead of the speedbar for watch-expressions? ;; 3) Mark breakpoint locations on scroll-bar of source buffer? -;; 4) With gud-print and gud-pstar, print the variable name in the GUD -;; buffer instead of the value's history number. ;;; Code: @@ -130,6 +125,7 @@ and #define directives otherwise.") (defvar gdb-source-window nil) (defvar gdb-inferior-status nil) (defvar gdb-continuation nil) +(defvar gdb-look-up-stack nil) (defvar gdb-buffer-type nil "One of the symbols bound in `gdb-buffer-rules'.") @@ -493,26 +489,28 @@ With arg, use separate IO iff arg is positive." 'gdb-mouse-set-clear-breakpoint) (define-key gud-minor-mode-map [left-fringe mouse-1] 'gdb-mouse-set-clear-breakpoint) - (define-key gud-minor-mode-map [left-fringe mouse-2] - 'gdb-mouse-until) + (define-key gud-minor-mode-map [left-margin C-mouse-1] + 'gdb-mouse-toggle-breakpoint-margin) + (define-key gud-minor-mode-map [left-fringe C-mouse-1] + 'gdb-mouse-toggle-breakpoint-fringe) + (define-key gud-minor-mode-map [left-margin drag-mouse-1] 'gdb-mouse-until) (define-key gud-minor-mode-map [left-fringe drag-mouse-1] 'gdb-mouse-until) - (define-key gud-minor-mode-map [left-margin mouse-2] + (define-key gud-minor-mode-map [left-margin mouse-3] + 'gdb-mouse-until) + (define-key gud-minor-mode-map [left-fringe mouse-3] 'gdb-mouse-until) + (define-key gud-minor-mode-map [left-margin C-drag-mouse-1] 'gdb-mouse-jump) (define-key gud-minor-mode-map [left-fringe C-drag-mouse-1] 'gdb-mouse-jump) - (define-key gud-minor-mode-map [left-fringe C-mouse-2] + (define-key gud-minor-mode-map [left-fringe C-mouse-3] 'gdb-mouse-jump) - (define-key gud-minor-mode-map [left-margin C-mouse-2] + (define-key gud-minor-mode-map [left-margin C-mouse-3] 'gdb-mouse-jump) - (define-key gud-minor-mode-map [left-margin mouse-3] - 'gdb-mouse-toggle-breakpoint-margin) - (define-key gud-minor-mode-map [left-fringe mouse-3] - 'gdb-mouse-toggle-breakpoint-fringe) (setq comint-input-sender 'gdb-send) @@ -543,7 +541,8 @@ With arg, use separate IO iff arg is positive." gdb-signalled nil gdb-source-window nil gdb-inferior-status nil - gdb-continuation nil) + gdb-continuation nil + gdb-look-up-stack nil) (setq gdb-buffer-type 'gdba) @@ -738,7 +737,7 @@ With arg, enter name of variable to be watched in the minibuffer." `(lambda () (gdb-var-evaluate-expression-handler ,(car var) nil))))) (if (search-forward "Undefined command" nil t) - (message-box "Watching expressions requires gdb 6.0 onwards") + (message-box "Watching expressions requires GDB 6.0 onwards") (message-box "No symbol \"%s\" in current context." expr)))) (defun gdb-speedbar-update () @@ -1106,7 +1105,8 @@ This filter may simply queue input for a later time." (let ((item (concat string "\n"))) (if gdb-enable-debug (push (cons 'send item) gdb-debug-ring)) (process-send-string proc item))) - (if (string-match "\\\\$" string) + (if (and (string-match "\\\\$" string) + (not comint-input-sender-no-newline)) ;;Try to catch C-d. (setq gdb-continuation (concat gdb-continuation string "\n")) (let ((item (concat gdb-continuation string "\n"))) (gdb-enqueue-input item) @@ -1334,9 +1334,20 @@ directives." It is just like `gdb-stopping', except that if we already set the output sink to `user' in `gdb-stopping', that is fine." (setq gud-running nil) - (unless (or gud-overlay-arrow-position gud-last-frame - (not gud-last-last-frame)) - (gud-display-line (car gud-last-last-frame) (cdr gud-last-last-frame))) + (unless (or gud-overlay-arrow-position gud-last-frame) + ;;Pop up GUD buffer to display current frame when it doesn't have source + ;;information i.e id not compiled with -g as with libc routines generally. + (let ((special-display-regexps (append special-display-regexps '(".*"))) + (special-display-frame-alist gdb-frame-parameters) + (same-window-regexps nil)) + (display-buffer gud-comint-buffer)) + ;;Try to find source further up stack e.g after signal. + (setq gdb-look-up-stack + (if (gdb-get-buffer 'gdb-stack-buffer) 'keep + (progn + (gdb-get-buffer-create 'gdb-stack-buffer) + (gdb-invalidate-frames) + 'delete)))) (unless (member gdb-inferior-status '("exited" "signal")) (setq gdb-inferior-status "stopped") (gdb-force-mode-line-update gdb-inferior-status)) @@ -1945,36 +1956,57 @@ static char *magick[] = { (defun gdb-info-stack-custom () (with-current-buffer (gdb-get-buffer 'gdb-stack-buffer) (save-excursion - (let ((buffer-read-only nil) - bl el) - (goto-char (point-min)) - (while (< (point) (point-max)) - (setq bl (line-beginning-position) - el (line-end-position)) - (when (looking-at "#") - (add-text-properties bl el - '(mouse-face highlight - help-echo "mouse-2, RET: Select frame"))) - (goto-char bl) - (when (looking-at "^#\\([0-9]+\\)") - (when (string-equal (match-string 1) gdb-frame-number) + (unless (eq gdb-look-up-stack 'delete) + (let ((buffer-read-only nil) + bl el) + (goto-char (point-min)) + (while (< (point) (point-max)) + (setq bl (line-beginning-position) + el (line-end-position)) + (when (looking-at "#") + (add-text-properties bl el + '(mouse-face highlight + help-echo "mouse-2, RET: Select frame"))) + (goto-char bl) + (when (looking-at "^#\\([0-9]+\\)") + (when (string-equal (match-string 1) gdb-frame-number) (put-text-property bl (+ bl 4) 'face '(:inverse-video t))) - (when (re-search-forward - (concat - (if (string-equal (match-string 1) "0") "" " in ") - "\\([^ ]+\\) (") el t) - (put-text-property (match-beginning 1) (match-end 1) - 'face font-lock-function-name-face) - (setq bl (match-end 0)) - (while (re-search-forward "<\\([^>]+\\)>" el t) + (when (re-search-forward + (concat + (if (string-equal (match-string 1) "0") "" " in ") + "\\([^ ]+\\) (") el t) (put-text-property (match-beginning 1) (match-end 1) + 'face font-lock-function-name-face) + (setq bl (match-end 0)) + (while (re-search-forward "<\\([^>]+\\)>" el t) + (put-text-property (match-beginning 1) (match-end 1) 'face font-lock-function-name-face)) - (goto-char bl) - (while (re-search-forward "\\(\\(\\sw\\|[_.]\\)+\\)=" el t) - (put-text-property (match-beginning 1) (match-end 1) - 'face font-lock-variable-name-face)))) - (forward-line 1)))))) + (goto-char bl) + (while (re-search-forward "\\(\\(\\sw\\|[_.]\\)+\\)=" el t) + (put-text-property (match-beginning 1) (match-end 1) + 'face font-lock-variable-name-face)))) + (forward-line 1)))) + (when gdb-look-up-stack + (goto-char (point-min)) + (when (re-search-forward "\\(\\S-+?\\):\\([0-9]+\\)" nil t) + (let ((start (line-beginning-position)) + (file (match-string 1)) + (line (match-string 2))) + (re-search-backward "^#*\\([0-9]+\\)" start t) + (gdb-enqueue-input + (list (concat gdb-server-prefix "frame " + (match-string 1) "\n") 'gdb-set-hollow)) + (gdb-enqueue-input + (list (concat gdb-server-prefix "frame 0\n") 'ignore))))))) + (if (eq gdb-look-up-stack 'delete) + (kill-buffer (gdb-get-buffer 'gdb-stack-buffer))) + (setq gdb-look-up-stack nil)) + +(defun gdb-set-hollow () + (with-current-buffer (gud-find-file (car gud-last-last-frame)) + (setq fringe-indicator-alist + '((overlay-arrow . hollow-right-triangle))))) (defun gdb-stack-buffer-name () (with-current-buffer gud-comint-buffer @@ -2030,8 +2062,7 @@ static char *magick[] = { (if event (posn-set-point (event-end event))) (gdb-enqueue-input (list (concat gdb-server-prefix "frame " - (gdb-get-frame-number) "\n") 'ignore)) - (gud-display-frame)) + (gdb-get-frame-number) "\n") 'ignore))) ;; Threads buffer. This displays a selectable thread list. @@ -2049,13 +2080,14 @@ static char *magick[] = { (defun gdb-info-threads-custom () (with-current-buffer (gdb-get-buffer 'gdb-threads-buffer) (let ((buffer-read-only nil)) - (goto-char (point-min)) - (while (< (point) (point-max)) - (unless (looking-at "No ") - (add-text-properties (line-beginning-position) (line-end-position) - '(mouse-face highlight + (save-excursion + (goto-char (point-min)) + (while (< (point) (point-max)) + (unless (looking-at "No ") + (add-text-properties (line-beginning-position) (line-end-position) + '(mouse-face highlight help-echo "mouse-2, RET: select thread"))) - (forward-line 1))))) + (forward-line 1)))))) (defun gdb-threads-buffer-name () (with-current-buffer gud-comint-buffer @@ -2868,7 +2900,11 @@ of the current session." gud-comint-buffer (memq (buffer-local-value 'gud-minor-mode gud-comint-buffer) '(gdba gdbmi))) - (if (member buffer-file-name gdb-source-file-list) + ;;Pre GDB 6.3 "info sources" doesn't give absolute file name. + (if (member (if (string-equal gdb-version "pre-6.4") + (file-name-nondirectory buffer-file-name) + buffer-file-name) + gdb-source-file-list) (with-current-buffer (find-buffer-visiting buffer-file-name) (set (make-local-variable 'gud-minor-mode) (buffer-local-value 'gud-minor-mode gud-comint-buffer)) diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el index 410a973d1b4..d207094cafe 100644 --- a/lisp/progmodes/grep.el +++ b/lisp/progmodes/grep.el @@ -553,7 +553,7 @@ easily repeat a find command." (read-string "compile.el: No `grep-find-command' command available. Press RET.") (list nil)))) - (when (and grep-find-command command-args) + (when command-args (let ((null-device nil)) ; see grep (grep command-args)))) diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el index d2e6cfc4ae4..1ce5d404a80 100644 --- a/lisp/progmodes/gud.el +++ b/lisp/progmodes/gud.el @@ -101,8 +101,8 @@ If SOFT is non-nil, returns nil if the symbol doesn't already exist." (if (boundp sym) (symbol-value sym)))) (defvar gud-running nil - "Non-nil if debuggee is running. -Used to grey out relevant togolbar icons.") + "Non-nil if debugged program is running. +Used to grey out relevant toolbar icons.") ;; Use existing Info buffer, if possible. (defun gud-goto-info () @@ -130,10 +130,10 @@ Used to grey out relevant togolbar icons.") (defun gud-stop-subjob () (interactive) - (if (string-equal - (buffer-local-value 'gud-target-name gud-comint-buffer) "emacs") - (comint-stop-subjob) - (comint-interrupt-subjob))) + (with-current-buffer gud-comint-buffer + (if (string-equal gud-target-name "emacs") + (comint-stop-subjob) + (comint-interrupt-subjob)))) (easy-mmode-defmap gud-menu-map '(([help] "Info" . gud-goto-info) @@ -141,13 +141,15 @@ Used to grey out relevant togolbar icons.") :enable (and (not emacs-basic-display) (display-graphic-p) (fboundp 'x-show-tip)) + :visible (memq gud-minor-mode + '(gdbmi gdba dbx sdb xdb pdb)) :button (:toggle . gud-tooltip-mode)) ([refresh] "Refresh" . gud-refresh) ([run] menu-item "Run" gud-run - :enable (and (not gud-running) - (memq gud-minor-mode '(gdbmi gdb dbx jdb))) - :visible (not (eq gud-minor-mode 'gdba))) - ([go] menu-item "Run/Continue" gud-go + :enable (not gud-running) + :visible (and (memq gud-minor-mode '(gdbmi gdb dbx jdb)) + (not (eq gud-minor-mode 'gdba)))) + ([go] menu-item (if gdb-active-process "Continue" "Run") gud-go :visible (and (not gud-running) (eq gud-minor-mode 'gdba))) ([stop] menu-item "Stop" gud-stop-subjob @@ -155,26 +157,27 @@ Used to grey out relevant togolbar icons.") (and gud-running (eq gud-minor-mode 'gdba)))) ([until] menu-item "Continue to selection" gud-until - :enable (and (not gud-running) - (memq gud-minor-mode '(gdbmi gdba gdb perldb))) - :visible (gud-tool-bar-item-visible-no-fringe)) + :enable (not gud-running) + :visible (and (memq gud-minor-mode '(gdbmi gdba gdb perldb)) + (gud-tool-bar-item-visible-no-fringe))) ([remove] menu-item "Remove Breakpoint" gud-remove :enable (not gud-running) :visible (gud-tool-bar-item-visible-no-fringe)) ([tbreak] menu-item "Temporary Breakpoint" gud-tbreak - :enable (memq gud-minor-mode + :enable (not gud-running) + :visible (memq gud-minor-mode '(gdbmi gdba gdb sdb xdb bashdb))) ([break] menu-item "Set Breakpoint" gud-break :enable (not gud-running) :visible (gud-tool-bar-item-visible-no-fringe)) ([up] menu-item "Up Stack" gud-up - :enable (and (not gud-running) - (memq gud-minor-mode - '(gdbmi gdba gdb dbx xdb jdb pdb bashdb)))) + :enable (not gud-running) + :visible (memq gud-minor-mode + '(gdbmi gdba gdb dbx xdb jdb pdb bashdb))) ([down] menu-item "Down Stack" gud-down - :enable (and (not gud-running) - (memq gud-minor-mode - '(gdbmi gdba gdb dbx xdb jdb pdb bashdb)))) + :enable (not gud-running) + :visible (memq gud-minor-mode + '(gdbmi gdba gdb dbx xdb jdb pdb bashdb))) ([pp] menu-item "Print S-expression" gud-pp :enable (and (not gud-running) gdb-active-process) @@ -183,23 +186,23 @@ Used to grey out relevant togolbar icons.") 'gud-target-name gud-comint-buffer) "emacs") (eq gud-minor-mode 'gdba))) ([print*] menu-item "Print Dereference" gud-pstar - :enable (and (not gud-running) - (memq gud-minor-mode '(gdbmi gdba gdb)))) + :enable (not gud-running) + :visible (memq gud-minor-mode '(gdbmi gdba gdb))) ([print] menu-item "Print Expression" gud-print :enable (not gud-running)) ([watch] menu-item "Watch Expression" gud-watch - :enable (and (not gud-running) - (memq gud-minor-mode '(gdbmi gdba)))) + :enable (not gud-running) + :visible (memq gud-minor-mode '(gdbmi gdba))) ([finish] menu-item "Finish Function" gud-finish - :enable (and (not gud-running) - (memq gud-minor-mode - '(gdbmi gdba gdb xdb jdb pdb bashdb)))) + :enable (not gud-running) + :visible (memq gud-minor-mode + '(gdbmi gdba gdb xdb jdb pdb bashdb))) ([stepi] menu-item "Step Instruction" gud-stepi - :enable (and (not gud-running) - (memq gud-minor-mode '(gdbmi gdba gdb dbx)))) + :enable (not gud-running) + :visible (memq gud-minor-mode '(gdbmi gdba gdb dbx))) ([nexti] menu-item "Next Instruction" gud-nexti - :enable (and (not gud-running) - (memq gud-minor-mode '(gdbmi gdba gdb dbx)))) + :enable (not gud-running) + :visible (memq gud-minor-mode '(gdbmi gdba gdb dbx))) ([step] menu-item "Step Line" gud-step :enable (not gud-running)) ([next] menu-item "Next Line" gud-next @@ -2565,7 +2568,7 @@ comint mode, which see." (existing-buffer (get-buffer (concat "*gud" filepart "*")))) (pop-to-buffer (concat "*gud" filepart "*")) (when (and existing-buffer (get-buffer-process existing-buffer)) - (error "This program is already running under gdb")) + (error "This program is already being debugged")) ;; Set the dir, in case the buffer already existed with a different dir. (setq default-directory dir) ;; Set default-directory to the file's directory. @@ -2693,10 +2696,10 @@ It is saved for when this flag is not set.") ((memq (process-status proc) '(signal exit)) ;; Stop displaying an arrow in a source file. (setq gud-overlay-arrow-position nil) - (with-current-buffer gud-comint-buffer - (if (memq gud-minor-mode-type '(gdbmi gdba)) - (gdb-reset) - (gud-reset))) + (if (memq (buffer-local-value 'gud-minor-mode gud-comint-buffer) + '(gdba gdbmi)) + (gdb-reset) + (gud-reset)) (let* ((obuf (current-buffer))) ;; save-excursion isn't the right thing if ;; process-buffer is current-buffer @@ -3166,7 +3169,7 @@ class of the file (using s to separate nested class ids)." (defvar gdb-script-font-lock-keywords '(("^define\\s-+\\(\\(\\w\\|\\s_\\)+\\)" (1 font-lock-function-name-face)) ("\\$\\(\\w+\\)" (1 font-lock-variable-name-face)) - ("^\\s-*\\(\\(\\w\\|\\s_\\)+\\)" (1 font-lock-keyword-face)))) + ("^\\s-*\\(\\w\\(\\w\\|\\s_\\)*\\)" (1 font-lock-keyword-face)))) ;; FIXME: The keyword "end" associated with "document" ;; should have font-lock-keyword-face (currently font-lock-doc-face). @@ -3313,7 +3316,8 @@ Treats actions as defuns." (kill-local-variable 'gdb-define-alist) (remove-hook 'after-save-hook 'gdb-create-define-alist t)))) -(defcustom gud-tooltip-modes '(gud-mode c-mode c++-mode fortran-mode) +(defcustom gud-tooltip-modes '(gud-mode c-mode c++-mode fortran-mode + python-mode) "List of modes for which to enable GUD tooltips." :type 'sexp :group 'gud @@ -3427,9 +3431,8 @@ With arg, dereference expr iff arg is positive." (case gud-minor-mode (gdba (concat "server print " expr)) ((dbx gdbmi) (concat "print " expr)) - (xdb (concat "p " expr)) - (sdb (concat expr "/")) - (perldb expr))) + ((xdb pdb) (concat "p " expr)) + (sdb (concat expr "/")))) (defun gud-tooltip-tips (event) "Show tip for identifier or selection under the mouse. diff --git a/lisp/progmodes/hideif.el b/lisp/progmodes/hideif.el index 04e44e2dac1..a100424108d 100644 --- a/lisp/progmodes/hideif.el +++ b/lisp/progmodes/hideif.el @@ -928,15 +928,17 @@ Return as (TOP . BOTTOM) the extent of ifdef block." (setq hide-ifdef-hiding t)) (setq buffer-read-only (or hide-ifdef-read-only hif-outside-read-only))) - (defun show-ifdef-block () "Show the ifdef block (true or false part) enclosing or before the cursor." (interactive) - (if hide-ifdef-lines - (save-excursion - (beginning-of-line) - (hif-show-ifdef-region (1- (point)) (progn (end-of-line) (point)))) - (let ((top-bottom (hif-find-ifdef-block))) + (let ((top-bottom (hif-find-ifdef-block))) + (if hide-ifdef-lines + (hif-show-ifdef-region + (save-excursion + (goto-char (car top-bottom)) (line-beginning-position)) + (save-excursion + (goto-char (1+ (cdr top-bottom))) + (hif-end-of-line) (point))) (hif-show-ifdef-region (1- (car top-bottom)) (cdr top-bottom))))) diff --git a/lisp/progmodes/inf-lisp.el b/lisp/progmodes/inf-lisp.el index 092c7736c27..4a50e00063c 100644 --- a/lisp/progmodes/inf-lisp.el +++ b/lisp/progmodes/inf-lisp.el @@ -233,30 +233,37 @@ documentation for variable `inferior-lisp-buffer'. \\{inferior-lisp-mode-map} -Customisation: Entry to this mode runs the hooks on `comint-mode-hook' and +Customization: Entry to this mode runs the hooks on `comint-mode-hook' and `inferior-lisp-mode-hook' (in that order). You can send text to the inferior Lisp process from other buffers containing Lisp source. - switch-to-lisp switches the current buffer to the Lisp process buffer. - lisp-eval-defun sends the current defun to the Lisp process. - lisp-compile-defun compiles the current defun. - lisp-eval-region sends the current region to the Lisp process. - lisp-compile-region compiles the current region. + `switch-to-lisp' switches the current buffer to the Lisp process buffer. + `lisp-eval-defun' sends the current defun to the Lisp process. + `lisp-compile-defun' compiles the current defun. + `lisp-eval-region' sends the current region to the Lisp process. + `lisp-compile-region' compiles the current region. Prefixing the lisp-eval/compile-defun/region commands with a \\[universal-argument] causes a switch to the Lisp process buffer after sending the text. -Commands: -Return after the end of the process' output sends the text from the +Commands:\\<inferior-lisp-mode-map> +\\[comint-send-input] after the end of the process' output sends the text from the end of process to point. -Return before the end of the process' output copies the sexp ending at point +\\[comint-send-input] before the end of the process' output copies the sexp ending at point to the end of the process' output, and sends it. -Delete converts tabs to spaces as it moves back. -Tab indents for Lisp; with argument, shifts rest +\\[comint-copy-old-input] copies the sexp ending at point to the end of the process' output, + allowing you to edit it before sending it. +If `comint-use-prompt-regexp' is nil (the default), \\[comint-insert-input] on old input + copies the entire old input to the end of the process' output, allowing + you to edit it before sending it. When not used on old input, or if + `comint-use-prompt-regexp' is non-nil, \\[comint-insert-input] behaves according to + its global binding. +\\[backward-delete-char-untabify] converts tabs to spaces as it moves back. +\\[lisp-indent-line] indents for Lisp; with argument, shifts rest of expression rigidly with the current line. -C-M-q does Tab on each line starting within following expression. +\\[indent-sexp] does \\[lisp-indent-line] on each line starting within following expression. Paragraphs are separated only by blank lines. Semicolons start comments. If you accidentally suspend your process, use \\[comint-continue-subjob] to continue it." diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el index 3bbfeaac683..d22aedb6058 100644 --- a/lisp/progmodes/make-mode.el +++ b/lisp/progmodes/make-mode.el @@ -246,6 +246,7 @@ You will be offered to complete on one of those in the minibuffer whenever you enter a \".\" at the beginning of a line in `makefile-mode'." :type '(repeat (list string)) :group 'makefile) +(put 'makefile-special-targets-list 'risky-local-variable t) (defcustom makefile-runtime-macros-list '(("@") ("&") (">") ("<") ("*") ("^") ("+") ("?") ("%") ("$")) @@ -290,6 +291,9 @@ not be enclosed in { } or ( )." ;; that if you change this regexp you might have to fix the imenu index in ;; makefile-imenu-generic-expression. (defconst makefile-macroassign-regex + ;; We used to match not just the varname but also the whole value + ;; (spanning potentially several lines). + ;; "^ *\\([^ \n\t][^:#= \t\n]*\\)[ \t]*\\(?:!=[ \t]*\\(\\(?:.+\\\\\n\\)*.+\\)\\|[*:+]?[:?]?=[ \t]*\\(\\(?:.*\\\\\n\\)*.*\\)\\)" "^ *\\([^ \n\t][^:#= \t\n]*\\)[ \t]*\\(?:!=\\|[*:+]?[:?]?=\\)" "Regex used to find macro assignment lines in a makefile.") @@ -544,7 +548,8 @@ This should identify a `make' command that can handle the `-q' option." :type 'string :group 'makefile) -(defcustom makefile-query-one-target-method 'makefile-query-by-make-minus-q +(defcustom makefile-query-one-target-method-function + 'makefile-query-by-make-minus-q "*Function to call to determine whether a make target is up to date. The function must satisfy this calling convention: @@ -560,6 +565,8 @@ The function must satisfy this calling convention: makefile, any nonzero integer value otherwise." :type 'function :group 'makefile) +(defvaralias 'makefile-query-one-target-method + 'makefile-query-one-target-method-function) (defcustom makefile-up-to-date-buffer-name "*Makefile Up-to-date overview*" "*Name of the Up-to-date overview buffer." @@ -619,39 +626,38 @@ The function must satisfy this calling convention: map) "The keymap that is used in Makefile mode.") -(defvar makefile-browser-map nil + +(defvar makefile-browser-map + (let ((map (make-sparse-keymap))) + (define-key map "n" 'makefile-browser-next-line) + (define-key map "\C-n" 'makefile-browser-next-line) + (define-key map "p" 'makefile-browser-previous-line) + (define-key map "\C-p" 'makefile-browser-previous-line) + (define-key map " " 'makefile-browser-toggle) + (define-key map "i" 'makefile-browser-insert-selection) + (define-key map "I" 'makefile-browser-insert-selection-and-quit) + (define-key map "\C-c\C-m" 'makefile-browser-insert-continuation) + (define-key map "q" 'makefile-browser-quit) + ;; disable horizontal movement + (define-key map "\C-b" 'undefined) + (define-key map "\C-f" 'undefined) + map) "The keymap that is used in the macro- and target browser.") -(if makefile-browser-map - () - (setq makefile-browser-map (make-sparse-keymap)) - (define-key makefile-browser-map "n" 'makefile-browser-next-line) - (define-key makefile-browser-map "\C-n" 'makefile-browser-next-line) - (define-key makefile-browser-map "p" 'makefile-browser-previous-line) - (define-key makefile-browser-map "\C-p" 'makefile-browser-previous-line) - (define-key makefile-browser-map " " 'makefile-browser-toggle) - (define-key makefile-browser-map "i" 'makefile-browser-insert-selection) - (define-key makefile-browser-map "I" 'makefile-browser-insert-selection-and-quit) - (define-key makefile-browser-map "\C-c\C-m" 'makefile-browser-insert-continuation) - (define-key makefile-browser-map "q" 'makefile-browser-quit) - ;; disable horizontal movement - (define-key makefile-browser-map "\C-b" 'undefined) - (define-key makefile-browser-map "\C-f" 'undefined)) - - -(defvar makefile-mode-syntax-table nil) -(if makefile-mode-syntax-table - () - (setq makefile-mode-syntax-table (make-syntax-table)) - (modify-syntax-entry ?\( "() " makefile-mode-syntax-table) - (modify-syntax-entry ?\) ")( " makefile-mode-syntax-table) - (modify-syntax-entry ?\[ "(] " makefile-mode-syntax-table) - (modify-syntax-entry ?\] ")[ " makefile-mode-syntax-table) - (modify-syntax-entry ?\{ "(} " makefile-mode-syntax-table) - (modify-syntax-entry ?\} "){ " makefile-mode-syntax-table) - (modify-syntax-entry ?\' "\" " makefile-mode-syntax-table) - (modify-syntax-entry ?\` "\" " makefile-mode-syntax-table) - (modify-syntax-entry ?# "< " makefile-mode-syntax-table) - (modify-syntax-entry ?\n "> " makefile-mode-syntax-table)) + + +(defvar makefile-mode-syntax-table + (let ((st (make-syntax-table))) + (modify-syntax-entry ?\( "() " st) + (modify-syntax-entry ?\) ")( " st) + (modify-syntax-entry ?\[ "(] " st) + (modify-syntax-entry ?\] ")[ " st) + (modify-syntax-entry ?\{ "(} " st) + (modify-syntax-entry ?\} "){ " st) + (modify-syntax-entry ?\' "\" " st) + (modify-syntax-entry ?\` "\" " st) + (modify-syntax-entry ?# "< " st) + (modify-syntax-entry ?\n "> " st) + st)) (defvar makefile-imake-mode-syntax-table (copy-syntax-table makefile-mode-syntax-table)) @@ -670,9 +676,11 @@ The function must satisfy this calling convention: (defvar makefile-target-table nil "Table of all target names known for this buffer.") +(put 'makefile-target-table 'risky-local-variable t) (defvar makefile-macro-table nil "Table of all macro names known for this buffer.") +(put 'makefile-macro-table 'risky-local-variable t) (defvar makefile-browser-client "A buffer in Makefile mode that is currently using the browser.") @@ -724,11 +732,10 @@ The function must satisfy this calling convention: If you are editing a file for a different make, try one of the variants `makefile-automake-mode', `makefile-gmake-mode', -`makefile-makepp-mode', `makefile-bsdmake-mode' or, -`makefile-imake-mode'All but the -last should be correctly chosen based on the file name, except if -it is *.mk. This function ends by invoking the function(s) -`makefile-mode-hook'. +`makefile-makepp-mode', `makefile-bsdmake-mode' or, +`makefile-imake-mode'. All but the last should be correctly +chosen based on the file name, except if it is *.mk. This +function ends by invoking the function(s) `makefile-mode-hook'. It is strongly recommended to use `font-lock-mode', because that provides additional parsing information. This is used for @@ -1298,29 +1305,8 @@ definition and conveniently use this command." (beginning-of-line) (cond ((looking-at "^#+") - ;; Found a comment. Set the fill prefix, and find the paragraph - ;; boundaries by searching for lines that look like comment-only - ;; lines. - (let ((fill-prefix (match-string-no-properties 0)) - (fill-paragraph-function nil)) - (save-excursion - (save-restriction - (narrow-to-region - ;; Search backwards. - (save-excursion - (while (and (zerop (forward-line -1)) - (looking-at "^#"))) - ;; We may have gone too far. Go forward again. - (or (looking-at "^#") - (forward-line 1)) - (point)) - ;; Search forwards. - (save-excursion - (while (looking-at "^#") - (forward-line)) - (point))) - (fill-paragraph nil) - t)))) + ;; Found a comment. Return nil to let normal filling take place. + nil) ;; Must look for backslashed-region before looking for variable ;; assignment. @@ -1349,7 +1335,9 @@ definition and conveniently use this command." (makefile-backslash-region (point-min) (point-max) nil) (goto-char (point-max)) (if (< (skip-chars-backward "\n") 0) - (delete-region (point) (point-max)))))) + (delete-region (point) (point-max))))) + ;; Return non-nil to indicate it's been filled. + t) ((looking-at makefile-macroassign-regex) ;; Have a macro assign. Fill just this line, and then backslash @@ -1358,10 +1346,13 @@ definition and conveniently use this command." (narrow-to-region (point) (line-beginning-position 2)) (let ((fill-paragraph-function nil)) (fill-paragraph nil)) - (makefile-backslash-region (point-min) (point-max) nil))))) + (makefile-backslash-region (point-min) (point-max) nil)) + ;; Return non-nil to indicate it's been filled. + t) - ;; Always return non-nil so we don't fill anything else. - t) + (t + ;; Return non-nil so we don't fill anything else. + t)))) @@ -1616,7 +1607,8 @@ with the generated name!" (defun makefile-query-targets (filename target-table prereq-list) "Fill the up-to-date overview buffer. -Checks each target in TARGET-TABLE using `makefile-query-one-target-method' +Checks each target in TARGET-TABLE using +`makefile-query-one-target-method-function' and generates the overview, one line per target name." (insert (mapconcat @@ -1625,7 +1617,7 @@ and generates the overview, one line per target name." (no-prereqs (not (member target-name prereq-list))) (needs-rebuild (or no-prereqs (funcall - makefile-query-one-target-method + makefile-query-one-target-method-function target-name filename)))) (format "\t%s%s" @@ -1876,5 +1868,5 @@ If it isn't in one, return nil." (provide 'make-mode) -;;; arch-tag: bd23545a-de91-44fb-b1b2-feafbb2635a0 +;; arch-tag: bd23545a-de91-44fb-b1b2-feafbb2635a0 ;;; make-mode.el ends here diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index 0e73427a33c..b80fe4c0fbc 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el @@ -814,6 +814,18 @@ See `sh-feature'.") (:weight bold))) "Face to show a here-document" :group 'sh-indentation) + +;; These colours are probably icky. It's just a placeholder though. +(defface sh-quoted-exec + '((((class color) (background dark)) + (:foreground "salmon")) + (((class color) (background light)) + (:foreground "magenta")) + (t + (:weight bold))) + "Face to show quoted execs like ``" + :group 'sh-indentation) + ;; backward-compatibility alias (put 'sh-heredoc-face 'face-alias 'sh-heredoc) (defvar sh-heredoc-face 'sh-heredoc) @@ -833,7 +845,7 @@ See `sh-feature'.") font-lock-variable-name-face)) (rc sh-append es) - + (bash sh-append shell ("\\$(\\(\\sw+\\)" (1 'sh-quoted-exec t) )) (sh sh-append shell ;; Variable names. ("\\$\\({#?\\)?\\([A-Za-z_][A-Za-z0-9_]*\\|[-#?@!]\\)" 2 @@ -967,6 +979,49 @@ Point is at the beginning of the next line." ;; This looks silly, but it's because `sh-here-doc-re' keeps changing. (re-search-forward sh-here-doc-re limit t)) +(defun sh-quoted-subshell (limit) + "Search for a subshell embedded in a string. Find all the unescaped +\" characters within said subshell, remembering that subshells can nest." + (if (re-search-forward "\"\\(?:.\\|\n\\)*?\\(\\$(\\|`\\)" limit t) + ;; bingo we have a $( or a ` inside a "" + (let ((char (char-after (point))) + (continue t) + (pos (point)) + (data nil) ;; value to put into match-data (and return) + (last nil) ;; last char seen + (bq (equal (match-string 1) "`")) ;; ` state flip-flop + (seen nil) ;; list of important positions + (nest 1)) ;; subshell nesting level + (while (and continue char (<= pos limit)) + ;; unescaped " inside a $( ... ) construct. + ;; state machine time... + ;; \ => ignore next char; + ;; ` => increase or decrease nesting level based on bq flag + ;; ) [where nesting > 0] => decrease nesting + ;; ( [where nesting > 0] => increase nesting + ;; ( [preceeded by $ ] => increase nesting + ;; " [nesting <= 0 ] => terminate, we're done. + ;; " [nesting > 0 ] => remember this, it's not a proper " + (if (eq ?\\ last) nil + (if (eq ?\` char) (setq nest (+ nest (if bq -1 1)) bq (not bq)) + (if (and (> nest 0) (eq ?\) char)) (setq nest (1- nest)) + (if (and (eq ?$ last) (eq ?\( char)) (setq nest (1+ nest)) + (if (and (> nest 0) (eq ?\( char)) (setq nest (1+ nest)) + (if (eq char ?\") + (if (>= 0 nest) (setq continue nil) + (setq seen (cons pos seen)) ) )))))) + ;;(message "POS: %d [%d]" pos nest) + (setq last char + pos (1+ pos) + char (char-after pos)) ) + (when seen + ;;(message "SEEN: %S" seen) + (setq data (list (current-buffer))) + (mapc (lambda (P) + (setq data (cons P (cons (1+ P) data)) ) ) seen) + (store-match-data data)) + data) )) + (defun sh-is-quoted-p (pos) (and (eq (char-before pos) ?\\) (not (sh-is-quoted-p (1- pos))))) @@ -997,6 +1052,17 @@ Point is at the beginning of the next line." (when (save-excursion (backward-char 2) (looking-at ";;\\|in")) sh-st-punc))) +(defun sh-apply-quoted-subshell () + "Apply the `sh-st-punc' syntax to all the matches in `match-data'. +This is used to flag quote characters in subshell constructs inside strings +\(which should therefore not be treated as normal quote characters\)" + (let ((m (match-data)) a b) + (while m + (setq a (car m) + b (cadr m) + m (cddr m)) + (put-text-property a b 'syntax-table sh-st-punc))) sh-st-punc) + (defconst sh-font-lock-syntactic-keywords ;; A `#' begins a comment when it is unquoted and at the beginning of a ;; word. In the shell, words are separated by metacharacters. @@ -1007,6 +1073,9 @@ Point is at the beginning of the next line." ("\\(\\\\\\)'" 1 ,sh-st-punc) ;; Make sure $@ and @? are correctly recognized as sexps. ("\\$\\([?@]\\)" 1 ,sh-st-symbol) + ;; highlight (possibly nested) subshells inside "" quoted regions correctly. + (sh-quoted-subshell + (1 (sh-apply-quoted-subshell) t t)) ;; Find HEREDOC starters and add a corresponding rule for the ender. (sh-font-lock-here-doc (2 (sh-font-lock-open-heredoc @@ -1019,11 +1088,12 @@ Point is at the beginning of the next line." (")" 0 (sh-font-lock-paren (match-beginning 0))))) (defun sh-font-lock-syntactic-face-function (state) - (if (nth 3 state) - (if (characterp (nth 3 state)) - font-lock-string-face - sh-heredoc-face) - font-lock-comment-face)) + (let ((q (nth 3 state))) + (if q + (if (characterp q) + (if (eq q ?\`) 'sh-quoted-exec font-lock-string-face) + sh-heredoc-face) + font-lock-comment-face))) (defgroup sh-indentation nil "Variables controlling indentation in shell scripts. @@ -1390,11 +1460,11 @@ with your script for an edit-interpret-debug cycle." (make-local-variable 'sh-shell-file) (make-local-variable 'sh-shell) (make-local-variable 'skeleton-pair-alist) - (make-local-variable 'skeleton-pair-filter) + (make-local-variable 'skeleton-pair-filter-function) (make-local-variable 'comint-dynamic-complete-functions) (make-local-variable 'comint-prompt-regexp) (make-local-variable 'font-lock-defaults) - (make-local-variable 'skeleton-filter) + (make-local-variable 'skeleton-filter-function) (make-local-variable 'skeleton-newline-indent-rigidly) (make-local-variable 'sh-shell-variables) (make-local-variable 'sh-shell-variables-initialized) @@ -1422,10 +1492,10 @@ with your script for an edit-interpret-debug cycle." (font-lock-syntactic-face-function . sh-font-lock-syntactic-face-function)) skeleton-pair-alist '((?` _ ?`)) - skeleton-pair-filter 'sh-quoted-p + skeleton-pair-filter-function 'sh-quoted-p skeleton-further-elements '((< '(- (min sh-indentation (current-column))))) - skeleton-filter 'sh-feature + skeleton-filter-function 'sh-feature skeleton-newline-indent-rigidly t sh-indent-supported-here nil) (set (make-local-variable 'parse-sexp-ignore-comments) t) diff --git a/lisp/replace.el b/lisp/replace.el index f1792b499fc..2f8fe86860c 100644 --- a/lisp/replace.el +++ b/lisp/replace.el @@ -36,6 +36,11 @@ (defvar query-replace-history nil) +(defvar query-replace-defaults nil + "Default values of FROM-STRING and TO-STRING for `query-replace'. +This is a cons cell (FROM-STRING . TO-STRING), or nil if there is +no default value.") + (defvar query-replace-interactive nil "Non-nil means `query-replace' uses the last search string. That becomes the \"string to replace\".") @@ -94,32 +99,26 @@ The return value can also be a pair (FROM . TO) indicating that the user wants to replace FROM with TO." (if query-replace-interactive (car (if regexp-flag regexp-search-ring search-ring)) - (let* ((lastfrom (car (symbol-value query-replace-from-history-variable))) - (lastto (car (symbol-value query-replace-to-history-variable))) + (let* ((history-add-new-input nil) (from ;; The save-excursion here is in case the user marks and copies ;; a region in order to specify the minibuffer input. ;; That should not clobber the region for the query-replace itself. (save-excursion - (when (equal lastfrom lastto) - ;; Typically, this is because the two histlists are shared. - (setq lastfrom (cadr (symbol-value - query-replace-from-history-variable)))) (read-from-minibuffer - (if (and lastto lastfrom) + (if query-replace-defaults (format "%s (default %s -> %s): " prompt - (query-replace-descr lastfrom) - (query-replace-descr lastto)) + (query-replace-descr (car query-replace-defaults)) + (query-replace-descr (cdr query-replace-defaults))) (format "%s: " prompt)) nil nil nil query-replace-from-history-variable - nil t t)))) - (if (and (zerop (length from)) lastto lastfrom) - (progn - (set query-replace-from-history-variable - (cdr (symbol-value query-replace-from-history-variable))) - (cons lastfrom - (query-replace-compile-replacement lastto regexp-flag))) + nil t)))) + (if (and (zerop (length from)) query-replace-defaults) + (cons (car query-replace-defaults) + (query-replace-compile-replacement + (cdr query-replace-defaults) regexp-flag)) + (add-to-history query-replace-from-history-variable from nil t) ;; Warn if user types \n or \t, but don't reject the input. (and regexp-flag (string-match "\\(\\`\\|[^\\]\\)\\(\\\\\\\\\\)*\\(\\\\[nt]\\)" from) @@ -177,10 +176,14 @@ the original string if not." "Query and return the `to' argument of a query-replace operation." (query-replace-compile-replacement (save-excursion - (read-from-minibuffer - (format "%s %s with: " prompt (query-replace-descr from)) - nil nil nil - query-replace-to-history-variable from t t)) + (let* ((history-add-new-input nil) + (to (read-from-minibuffer + (format "%s %s with: " prompt (query-replace-descr from)) + nil nil nil + query-replace-to-history-variable from t))) + (add-to-history query-replace-to-history-variable to nil t) + (setq query-replace-defaults (cons from to)) + to)) regexp-flag)) (defun query-replace-read-args (prompt regexp-flag &optional noerror) diff --git a/lisp/ses.el b/lisp/ses.el index debb22d84db..fc594167187 100644 --- a/lisp/ses.el +++ b/lisp/ses.el @@ -399,7 +399,7 @@ for safety. This is a macro to prevent propagate-on-load viruses." (defmacro ses-header-row (row) "Load the header row from the spreadsheet file and checks it for safety. This is a macro to prevent propagate-on-load viruses." - (or (and (wholenump row) (< row ses--numrows)) + (or (and (wholenump row) (or (zerop ses--numrows) (< row ses--numrows))) (error "Bad header-row")) (setq ses--header-row row) t) @@ -940,14 +940,18 @@ cell (ROW,COL) has changed." (defun ses-narrowed-p () (/= (- (point-max) (point-min)) (buffer-size))) +(defun ses-widen () + "Turn off narrowing, to be reenabled at end of command loop." + (if (ses-narrowed-p) + (setq ses--deferred-narrow t)) + (widen)) + (defun ses-goto-data (def &optional col) "Move point to data area for (DEF,COL). If DEF is a row number, COL is the column number for a data cell -- otherwise DEF is one of the symbols ses--col-widths, ses--col-printers, ses--default-printer, ses--numrows, or ses--numcols." - (if (ses-narrowed-p) - (setq ses--deferred-narrow t)) - (widen) + (ses-widen) (let ((inhibit-point-motion-hooks t)) ;In case intangible attrs are wrong (goto-char (point-min)) (if col @@ -966,9 +970,6 @@ If ELEM is specified, it is the array subscript within DEF to be set to VALUE." ;;We call ses-goto-data early, using the old values of numrows and ;;numcols in case one of them is being changed. (ses-goto-data def) - (if elem - (ses-aset-with-undo (symbol-value def) elem value) - (ses-set-with-undo def value)) (let ((inhibit-read-only t) (fmt (plist-get '(ses--col-widths "(ses-column-widths %S)" ses--col-printers "(ses-column-printers %S)" @@ -977,9 +978,20 @@ If ELEM is specified, it is the array subscript within DEF to be set to VALUE." ses--file-format " %S ;SES file-format" ses--numrows " %S ;numrows" ses--numcols " %S ;numcols") - def))) - (delete-region (point) (line-end-position)) - (insert (format fmt (symbol-value def)))))) + def)) + oldval) + (if elem + (progn + (setq oldval (aref (symbol-value def) elem)) + (aset (symbol-value def) elem value)) + (setq oldval (symbol-value def)) + (set def value)) + ;;Special undo since it's outside the narrowed buffer + (let (buffer-undo-list) + (delete-region (point) (line-end-position)) + (insert (format fmt (symbol-value def)))) + (push `(apply ses-set-parameter ,def ,oldval ,elem) buffer-undo-list)))) + (defun ses-write-cells () "Write cells in `ses--deferred-write' from local variables to data area. @@ -1278,23 +1290,6 @@ to each symbol." ;; Undo control ;;---------------------------------------------------------------------------- -;; This should be unnecessary, because the feature is now built in. - -(defadvice undo-more (around ses-undo-more activate preactivate) - "For SES mode, allow undo outside of narrowed buffer range." - (if (not (eq major-mode 'ses-mode)) - ad-do-it - ;;Here is some extra code for SES mode. - (setq ses--deferred-narrow - (or ses--deferred-narrow (ses-narrowed-p))) - (widen) - (condition-case x - ad-do-it - (error - ;;Restore narrow if appropriate - (ses-command-hook) - (signal (car x) (cdr x)))))) - (defun ses-begin-change () "For undo, remember point before we start changing hidden stuff." (let ((inhibit-read-only t)) @@ -1303,7 +1298,7 @@ to each symbol." (defun ses-set-with-undo (sym newval) "Like set, but undoable. Result is t if value has changed." - ;;We avoid adding redundant entries to the undo list, but this is + ;;We try to avoid adding redundant entries to the undo list, but this is ;;unavoidable for strings because equal ignores text properties and there's ;;no easy way to get the whole property list to see if it's different! (unless (and (boundp sym) @@ -1346,7 +1341,7 @@ execute cell formulas or print functions." (or (and (= (safe-length params) 3) (numberp (car params)) (numberp (cadr params)) - (> (cadr params) 0) + (>= (cadr params) 0) (numberp (nth 2 params)) (> (nth 2 params) 0)) (error "Invalid SES file")) @@ -1568,11 +1563,12 @@ narrows the buffer now." (let ((old ses--deferred-recalc)) (setq ses--deferred-recalc nil) (ses-update-cells old))) - (if ses--deferred-write - ;;We don't reset the deferred list before starting -- the most - ;;likely error is keyboard-quit, and we do want to keep trying - ;;these writes after a quit. - (ses-write-cells)) + (when ses--deferred-write + ;;We don't reset the deferred list before starting -- the most + ;;likely error is keyboard-quit, and we do want to keep trying + ;;these writes after a quit. + (ses-write-cells) + (push '(apply ses-widen) buffer-undo-list)) (when ses--deferred-narrow ;;We're not allowed to narrow the buffer until after-find-file has ;;read the local variables at the end of the file. Now it's safe to @@ -1794,9 +1790,7 @@ cells." (cons (ses-cell-symbol row col) (ses-cell-references yrow ycol))))))) ;;Delete everything and reconstruct basic data area - (if (ses-narrowed-p) - (setq ses--deferred-narrow t)) - (widen) + (ses-widen) (let ((inhibit-read-only t)) (goto-char (point-max)) (if (search-backward ";; Local Variables:\n" nil t) @@ -1877,7 +1871,9 @@ cell formula was unsafe and user declined confirmation." ses-mode-edit-map t ;Convert to Lisp object 'ses-read-cell-history - (prin1-to-string curval))))) + (prin1-to-string (if (eq (car-safe curval) 'ses-safe-formula) + (cadr curval) + curval)))))) (when (ses-edit-cell row col newval) (ses-command-hook) ;Update cell widths before movement (dolist (x ses-after-entry-functions) @@ -2073,6 +2069,8 @@ before current one." (ses-reset-header-string))) ;;Reconstruct text attributes (ses-setup) + ;;Prepare for undo + (push '(apply ses-widen) buffer-undo-list) ;;Return to current cell (if ses--curcell (ses-jump-safe ses--curcell) @@ -2109,6 +2107,8 @@ current one." (ses-reset-header-string))) ;;Reconstruct attributes (ses-setup) + ;;Prepare for undo + (push '(apply ses-widen) buffer-undo-list) (ses-jump-safe ses--curcell)) (defun ses-insert-column (count &optional col width printer) @@ -2643,7 +2643,10 @@ The top row is row 1. Selecting row 0 displays the default header row." (if (or (< row 0) (> row ses--numrows)) (error "Invalid header-row")) (ses-begin-change) - (ses-set-parameter 'ses--header-row row) + (let ((oldval ses--header-row)) + (let (buffer-undo-list) + (ses-set-parameter 'ses--header-row row)) + (push `(apply ses-set-header-row ,oldval) buffer-undo-list)) (ses-reset-header-string)) (defun ses-mark-row () diff --git a/lisp/shell.el b/lisp/shell.el index 71b5862feb6..6b22ac79238 100644 --- a/lisp/shell.el +++ b/lisp/shell.el @@ -150,7 +150,7 @@ This is a fine thing to set in your `.emacs' file." :group 'shell) (defcustom shell-completion-fignore nil - "*List of suffixes to be disregarded during file/command completion. + "List of suffixes to be disregarded during file/command completion. This variable is used to initialize `comint-completion-fignore' in the shell buffer. The default is nil, for compatibility with most shells. Some people like (\"~\" \"#\" \"%\"). @@ -199,19 +199,19 @@ shell buffer. This is a fine thing to set in your `.emacs' file.") (defcustom shell-command-regexp "[^;&|\n]+" - "*Regexp to match a single command within a pipeline. + "Regexp to match a single command within a pipeline. This is used for directory tracking and does not do a perfect job." :type 'regexp :group 'shell) (defcustom shell-command-separator-regexp "[;&|\n \t]*" - "*Regexp to match a single command within a pipeline. + "Regexp to match a single command within a pipeline. This is used for directory tracking and does not do a perfect job." :type 'regexp :group 'shell) (defcustom shell-completion-execonly t - "*If non-nil, use executable files only for completion candidates. + "If non-nil, use executable files only for completion candidates. This mirrors the optional behavior of tcsh. Detecting executability of files may slow command completion considerably." @@ -219,35 +219,35 @@ Detecting executability of files may slow command completion considerably." :group 'shell) (defcustom shell-popd-regexp "popd" - "*Regexp to match subshell commands equivalent to popd." + "Regexp to match subshell commands equivalent to popd." :type 'regexp :group 'shell-directories) (defcustom shell-pushd-regexp "pushd" - "*Regexp to match subshell commands equivalent to pushd." + "Regexp to match subshell commands equivalent to pushd." :type 'regexp :group 'shell-directories) (defcustom shell-pushd-tohome nil - "*If non-nil, make pushd with no arg behave as \"pushd ~\" (like cd). + "If non-nil, make pushd with no arg behave as \"pushd ~\" (like cd). This mirrors the optional behavior of tcsh." :type 'boolean :group 'shell-directories) (defcustom shell-pushd-dextract nil - "*If non-nil, make \"pushd +n\" pop the nth dir to the stack top. + "If non-nil, make \"pushd +n\" pop the nth dir to the stack top. This mirrors the optional behavior of tcsh." :type 'boolean :group 'shell-directories) (defcustom shell-pushd-dunique nil - "*If non-nil, make pushd only add unique directories to the stack. + "If non-nil, make pushd only add unique directories to the stack. This mirrors the optional behavior of tcsh." :type 'boolean :group 'shell-directories) (defcustom shell-cd-regexp "cd" - "*Regexp to match subshell commands equivalent to cd." + "Regexp to match subshell commands equivalent to cd." :type 'regexp :group 'shell-directories) @@ -256,19 +256,19 @@ This mirrors the optional behavior of tcsh." ; NetWare allows the five chars between upper and lower alphabetics. "[]a-zA-Z^_`\\[\\\\]:" nil) - "*If non-nil, is regexp used to track drive changes." + "If non-nil, is regexp used to track drive changes." :type '(choice regexp (const nil)) :group 'shell-directories) (defcustom shell-dirtrack-verbose t - "*If non-nil, show the directory stack following directory change. + "If non-nil, show the directory stack following directory change. This is effective only if directory tracking is enabled." :type 'boolean :group 'shell-directories) (defcustom explicit-shell-file-name nil - "*If non-nil, is file name to use for explicitly requested inferior shell." + "If non-nil, is file name to use for explicitly requested inferior shell." :type '(choice (const :tag "None" nil) file) :group 'shell) @@ -278,7 +278,7 @@ This is effective only if directory tracking is enabled." ;; than us about what terminal modes to use. '("-i" "-T") '("-i")) - "*Args passed to inferior shell by M-x shell, if the shell is csh. + "Args passed to inferior shell by \\[shell], if the shell is csh. Value is a list of strings, which may be nil." :type '(repeat (string :tag "Argument")) :group 'shell) @@ -296,13 +296,13 @@ Value is a list of strings, which may be nil." (shell-command-to-string (concat prog " --noediting")))) '("-i") '("--noediting" "-i"))) - "*Args passed to inferior shell by M-x shell, if the shell is bash. + "Args passed to inferior shell by \\[shell], if the shell is bash. Value is a list of strings, which may be nil." :type '(repeat (string :tag "Argument")) :group 'shell) (defcustom shell-input-autoexpand 'history - "*If non-nil, expand input command history references on completion. + "If non-nil, expand input command history references on completion. This mirrors the optional behavior of tcsh (its autoexpand and histlit). If the value is `input', then the expansion is seen on input. @@ -367,7 +367,7 @@ Thus, this does not include the shell's current directory.") (put 'shell-mode 'mode-class 'special) (define-derived-mode shell-mode comint-mode "Shell" - "Major mode for interacting with an inferior shell. + "Major mode for interacting with an inferior shell.\\<shell-mode-map> \\[comint-send-input] after the end of the process' output sends the text from the end of process to the end of the current line. \\[comint-send-input] before end of process output copies the current line minus the prompt to @@ -433,13 +433,11 @@ buffer." (setq shell-dirstack nil) (make-local-variable 'shell-last-dir) (setq shell-last-dir nil) - (make-local-variable 'shell-dirtrackp) - (setq shell-dirtrackp t) - (add-hook 'comint-input-filter-functions 'shell-directory-tracker nil t) (setq comint-input-autoexpand shell-input-autoexpand) ;; This is not really correct, since the shell buffer does not really ;; edit this directory. But it is useful in the buffer list and menus. (make-local-variable 'list-buffers-directory) + (shell-dirtrack-mode 1) (setq list-buffers-directory (expand-file-name default-directory)) ;; shell-dependent assignments. (when (ring-empty-p comint-input-ring) @@ -558,48 +556,48 @@ Otherwise, one argument `-i' is passed to the shell. (shell-mode))) buffer) -;;; Don't do this when shell.el is loaded, only while dumping. +;; Don't do this when shell.el is loaded, only while dumping. ;;;###autoload (add-hook 'same-window-buffer-names "*shell*") ;;; Directory tracking -;;; -;;; This code provides the shell mode input sentinel -;;; SHELL-DIRECTORY-TRACKER -;;; that tracks cd, pushd, and popd commands issued to the shell, and -;;; changes the current directory of the shell buffer accordingly. -;;; -;;; This is basically a fragile hack, although it's more accurate than -;;; the version in Emacs 18's shell.el. It has the following failings: -;;; 1. It doesn't know about the cdpath shell variable. -;;; 2. It cannot infallibly deal with command sequences, though it does well -;;; with these and with ignoring commands forked in another shell with ()s. -;;; 3. More generally, any complex command is going to throw it. Otherwise, -;;; you'd have to build an entire shell interpreter in Emacs Lisp. Failing -;;; that, there's no way to catch shell commands where cd's are buried -;;; inside conditional expressions, aliases, and so forth. -;;; -;;; The whole approach is a crock. Shell aliases mess it up. File sourcing -;;; messes it up. You run other processes under the shell; these each have -;;; separate working directories, and some have commands for manipulating -;;; their w.d.'s (e.g., the lcd command in ftp). Some of these programs have -;;; commands that do *not* affect the current w.d. at all, but look like they -;;; do (e.g., the cd command in ftp). In shells that allow you job -;;; control, you can switch between jobs, all having different w.d.'s. So -;;; simply saying %3 can shift your w.d.. -;;; -;;; The solution is to relax, not stress out about it, and settle for -;;; a hack that works pretty well in typical circumstances. Remember -;;; that a half-assed solution is more in keeping with the spirit of Unix, -;;; anyway. Blech. -;;; -;;; One good hack not implemented here for users of programmable shells -;;; is to program up the shell w.d. manipulation commands to output -;;; a coded command sequence to the tty. Something like -;;; ESC | <cwd> | -;;; where <cwd> is the new current working directory. Then trash the -;;; directory tracking machinery currently used in this package, and -;;; replace it with a process filter that watches for and strips out -;;; these messages. +;; +;; This code provides the shell mode input sentinel +;; SHELL-DIRECTORY-TRACKER +;; that tracks cd, pushd, and popd commands issued to the shell, and +;; changes the current directory of the shell buffer accordingly. +;; +;; This is basically a fragile hack, although it's more accurate than +;; the version in Emacs 18's shell.el. It has the following failings: +;; 1. It doesn't know about the cdpath shell variable. +;; 2. It cannot infallibly deal with command sequences, though it does well +;; with these and with ignoring commands forked in another shell with ()s. +;; 3. More generally, any complex command is going to throw it. Otherwise, +;; you'd have to build an entire shell interpreter in Emacs Lisp. Failing +;; that, there's no way to catch shell commands where cd's are buried +;; inside conditional expressions, aliases, and so forth. +;; +;; The whole approach is a crock. Shell aliases mess it up. File sourcing +;; messes it up. You run other processes under the shell; these each have +;; separate working directories, and some have commands for manipulating +;; their w.d.'s (e.g., the lcd command in ftp). Some of these programs have +;; commands that do *not* affect the current w.d. at all, but look like they +;; do (e.g., the cd command in ftp). In shells that allow you job +;; control, you can switch between jobs, all having different w.d.'s. So +;; simply saying %3 can shift your w.d.. +;; +;; The solution is to relax, not stress out about it, and settle for +;; a hack that works pretty well in typical circumstances. Remember +;; that a half-assed solution is more in keeping with the spirit of Unix, +;; anyway. Blech. +;; +;; One good hack not implemented here for users of programmable shells +;; is to program up the shell w.d. manipulation commands to output +;; a coded command sequence to the tty. Something like +;; ESC | <cwd> | +;; where <cwd> is the new current working directory. Then trash the +;; directory tracking machinery currently used in this package, and +;; replace it with a process filter that watches for and strips out +;; these messages. (defun shell-directory-tracker (str) "Tracks cd, pushd and popd commands issued to the shell. @@ -607,8 +605,8 @@ This function is called on each input passed to the shell. It watches for cd, pushd and popd commands and sets the buffer's default directory to track these commands. -You may toggle this tracking on and off with M-x dirtrack-mode. -If Emacs gets confused, you can resync with the shell with M-x dirs. +You may toggle this tracking on and off with \\[dirtrack-mode]. +If Emacs gets confused, you can resync with the shell with \\[dirs]. See variables `shell-cd-regexp', `shell-chdrive-regexp', `shell-pushd-regexp', and `shell-popd-regexp', while `shell-pushd-tohome', `shell-pushd-dextract', @@ -677,7 +675,7 @@ Environment variables are expanded, see function `substitute-in-file-name'." (setq string (replace-match "" nil nil string))))) string))) -;;; popd [+n] +;; popd [+n] (defun shell-process-popd (arg) (let ((num (or (shell-extract-num arg) 0))) (cond ((and num (= num 0) shell-dirstack) @@ -703,7 +701,7 @@ Environment variables are expanded, see function `substitute-in-file-name'." ;; For relative name we assume default-directory already has the prefix. (expand-file-name dir)))) -;;; cd [dir] +;; cd [dir] (defun shell-process-cd (arg) (let ((new-dir (cond ((zerop (length arg)) (concat comint-file-name-prefix "~")) @@ -713,7 +711,7 @@ Environment variables are expanded, see function `substitute-in-file-name'." (shell-cd new-dir) (shell-dirstack-message))) -;;; pushd [+n | dir] +;; pushd [+n | dir] (defun shell-process-pushd (arg) (let ((num (shell-extract-num arg))) (cond ((zerop (length arg)) @@ -762,26 +760,25 @@ Environment variables are expanded, see function `substitute-in-file-name'." (and (string-match "^\\+[1-9][0-9]*$" str) (string-to-number str))) - -(defun shell-dirtrack-mode () +(defvaralias 'shell-dirtrack-mode 'shell-dirtrackp) +(define-minor-mode shell-dirtrack-mode "Turn directory tracking on and off in a shell buffer." - (interactive) - (if (setq shell-dirtrackp (not shell-dirtrackp)) - (setq list-buffers-directory default-directory) - (setq list-buffers-directory nil)) - (message "Directory tracking %s" (if shell-dirtrackp "ON" "OFF"))) - -;;; For your typing convenience: -(defalias 'shell-dirtrack-toggle 'shell-dirtrack-mode) + nil nil nil + (setq list-buffers-directory (if shell-dirtrack-mode default-directory)) + (if shell-dirtrack-mode + (add-hook 'comint-input-filter-functions 'shell-directory-tracker nil t) + (remove-hook 'comint-input-filter-functions 'shell-directory-tracker t))) + +;; For your typing convenience: +(defalias 'shell-dirtrack-toggle 'shell-dirtrack-mode) ;??Convenience?? (defalias 'dirtrack-toggle 'shell-dirtrack-mode) (defalias 'dirtrack-mode 'shell-dirtrack-mode) (defun shell-cd (dir) "Do normal `cd' to DIR, and set `list-buffers-directory'." + (cd dir) (if shell-dirtrackp - (setq list-buffers-directory (file-name-as-directory - (expand-file-name dir)))) - (cd dir)) + (setq list-buffers-directory default-directory))) (defun shell-resync-dirs () "Resync the buffer's idea of the current directory stack. @@ -841,15 +838,15 @@ command again." (shell-dirstack-message)) (error (message "Couldn't cd"))))))) -;;; For your typing convenience: +;; For your typing convenience: (defalias 'dirs 'shell-resync-dirs) -;;; Show the current dirstack on the message line. -;;; Pretty up dirs a bit by changing "/usr/jqr/foo" to "~/foo". -;;; (This isn't necessary if the dirlisting is generated with a simple "dirs".) -;;; All the commands that mung the buffer's dirstack finish by calling -;;; this guy. +;; Show the current dirstack on the message line. +;; Pretty up dirs a bit by changing "/usr/jqr/foo" to "~/foo". +;; (This isn't necessary if the dirlisting is generated with a simple "dirs".) +;; All the commands that mung the buffer's dirstack finish by calling +;; this guy. (defun shell-dirstack-message () (when shell-dirtrack-verbose (let* ((msg "") @@ -1076,5 +1073,5 @@ Returns t if successful." (provide 'shell) -;;; arch-tag: bcb5f12a-c1f4-4aea-a809-2504bd5bd797 +;; arch-tag: bcb5f12a-c1f4-4aea-a809-2504bd5bd797 ;;; shell.el ends here diff --git a/lisp/simple.el b/lisp/simple.el index 6d7e3d0a3d9..b023a7b780f 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -2549,7 +2549,9 @@ to make one entry in the kill ring. In Lisp code, optional third arg YANK-HANDLER, if non-nil, specifies the yank-handler text property to be set on the killed text. See `insert-for-yank'." - (interactive "r") + ;; Pass point first, then mark, because the order matters + ;; when calling kill-append. + (interactive (list (point) (mark))) (condition-case nil (let ((string (filter-buffer-substring beg end t))) (when string ;STRING is nil if BEG = END @@ -3643,10 +3645,14 @@ Outline mode sets this." (setq new (point)) ;; Process intangibility within a line. - ;; Move to the chosen destination position from above, - ;; with intangibility processing enabled. - - ;; Avoid calling point-entered and point-left. + ;; With inhibit-point-motion-hooks bound to nil, a call to + ;; goto-char moves point past intangible text. + + ;; However, inhibit-point-motion-hooks controls both the + ;; intangibility and the point-entered/point-left hooks. The + ;; following hack avoids calling the point-* hooks + ;; unnecessarily. Note that we move *forward* past intangible + ;; text when the initial and final points are the same. (goto-char new) (let ((inhibit-point-motion-hooks nil)) (goto-char new) @@ -4241,7 +4247,7 @@ The variable `selective-display' has a separate value for each buffer." (defvaralias 'indicate-unused-lines 'indicate-empty-lines) (defvaralias 'default-indicate-unused-lines 'default-indicate-empty-lines) -(defun toggle-truncate-lines (arg) +(defun toggle-truncate-lines (&optional arg) "Toggle whether to fold or truncate long lines on the screen. With arg, truncate long lines iff arg is positive. Note that in side-by-side windows, truncation is always enabled." diff --git a/lisp/skeleton.el b/lisp/skeleton.el index 0b3fc82f025..d51fd91c3b4 100644 --- a/lisp/skeleton.el +++ b/lisp/skeleton.el @@ -39,14 +39,15 @@ ;; page 3: mirror-mode, an example for setting up paired insertion -(defvar skeleton-transformation 'identity +(defvar skeleton-transformation-function 'identity "*If non-nil, function applied to literal strings before they are inserted. It should take strings and characters and return them transformed, or nil which means no transformation. Typical examples might be `upcase' or `capitalize'.") +(defvaralias 'skeleton-transformation 'skeleton-transformation-function) ; this should be a fourth argument to defvar -(put 'skeleton-transformation 'variable-interactive +(put 'skeleton-transformation-function 'variable-interactive "aTransformation function: ") @@ -75,8 +76,9 @@ The variables `v1' and `v2' are still set when calling this.") ;;;###autoload -(defvar skeleton-filter 'identity +(defvar skeleton-filter-function 'identity "Function for transforming a skeleton proxy's aliases' variable value.") +(defvaralias 'skeleton-filter 'skeleton-filter-function) (defvar skeleton-untabify t "When non-nil untabifies when deleting backwards with element -ARG.") @@ -157,7 +159,7 @@ This command can also be an abbrev expansion (3rd and 4th columns in Optional second argument STR may also be a string which will be the value of `str' whereas the skeleton's interactor is then ignored." - (skeleton-insert (funcall skeleton-filter skeleton) + (skeleton-insert (funcall skeleton-filter-function skeleton) ;; Pretend C-x a e passed its prefix arg to us (if (or arg current-prefix-arg) (prefix-numeric-value (or arg @@ -199,7 +201,7 @@ SKELETON is made up as (INTERACTOR ELEMENT ...). INTERACTOR may be nil if not needed, a prompt-string or an expression for complex read functions. If ELEMENT is a string or a character it gets inserted (see also -`skeleton-transformation'). Other possibilities are: +`skeleton-transformation-function'). Other possibilities are: \\n go to next line and indent according to mode _ interesting point, interregion here @@ -360,7 +362,7 @@ automatically, and you are prompted to fill in the variable parts."))) (backward-delete-char-untabify (- element)) (delete-backward-char (- element))) (insert (if (not literal) - (funcall skeleton-transformation element) + (funcall skeleton-transformation-function element) element)))) ((or (eq element '\n) ; actually (eq '\n 'n) ;; The sequence `> \n' is handled specially so as to indent the first @@ -464,7 +466,7 @@ will attempt to insert pairs of matching characters.") "*If this is nil, paired insertion is inhibited before or inside a word.") -(defvar skeleton-pair-filter (lambda () nil) +(defvar skeleton-pair-filter-function (lambda () nil) "Attempt paired insertion if this function returns nil, before inserting. This allows for context-sensitive checking whether pairing is appropriate.") @@ -490,7 +492,7 @@ Elements might be (?` ?` _ \"''\"), (?\\( ? _ \" )\") or (?{ \\n > _ \\n ?} >). With no ARG, if `skeleton-pair' is non-nil, pairing can occur. If the region is visible the pair is wrapped around it depending on `skeleton-autowrap'. Else, if `skeleton-pair-on-word' is non-nil or we are not before or inside a -word, and if `skeleton-pair-filter' returns nil, pairing is performed. +word, and if `skeleton-pair-filter-function' returns nil, pairing is performed. Pairing is also prohibited if we are right after a quoting character such as backslash. @@ -512,7 +514,7 @@ symmetrical ones, and the same character twice for the others." (and (not mark) (or overwrite-mode (if (not skeleton-pair-on-word) (looking-at "\\w")) - (funcall skeleton-pair-filter)))) + (funcall skeleton-pair-filter-function)))) (self-insert-command (prefix-numeric-value arg)) (skeleton-insert (cons nil skeleton) (if mark -1)))))) @@ -526,13 +528,13 @@ symmetrical ones, and the same character twice for the others." ;; (kill-all-local-variables) ;; (make-local-variable 'skeleton-pair) ;; (make-local-variable 'skeleton-pair-on-word) -;; (make-local-variable 'skeleton-pair-filter) +;; (make-local-variable 'skeleton-pair-filter-function) ;; (make-local-variable 'skeleton-pair-alist) ;; (setq major-mode 'mirror-mode ;; mode-name "Mirror" ;; skeleton-pair-on-word t ;; ;; in the middle column insert one or none if odd window-width -;; skeleton-pair-filter (lambda () +;; skeleton-pair-filter-function (lambda () ;; (if (>= (current-column) ;; (/ (window-width) 2)) ;; ;; insert both on next line diff --git a/lisp/speedbar.el b/lisp/speedbar.el index b3913f6f6c6..e5ab181e8c6 100644 --- a/lisp/speedbar.el +++ b/lisp/speedbar.el @@ -921,8 +921,6 @@ This basically creates a sparse keymap, and makes it's parent be (if (and (featurep 'custom) (fboundp 'custom-declare-variable)) (list ["Customize..." speedbar-customize t])) (list - ["Detach" speedbar-detach (and speedbar-frame - (eq (selected-frame) speedbar-frame)) ] ["Close" dframe-close-frame t] ["Quit" delete-frame t] )) "Menu items appearing at the end of the speedbar menu.") @@ -1047,21 +1045,6 @@ supported at a time. (dframe-attached-frame speedbar-frame) speedbar-default-position)))) -(defun speedbar-detach () - "Detach the current Speedbar from auto-updating. -Doing this allows the creation of a second speedbar." - (interactive) - (let ((buffer speedbar-buffer)) - (dframe-detach 'speedbar-frame 'speedbar-cached-frame 'speedbar-buffer) - (save-excursion - (set-buffer buffer) - ;; Permanently disable auto-updating in this speedbar buffer. - (set (make-local-variable 'speedbar-update-flag) nil) - (set (make-local-variable 'speedbar-update-flag-disable) t) - ;; Make local copies of all the different variables to prevent - ;; funny stuff later... - ))) - (defsubst speedbar-current-frame () "Return the frame to use for speedbar based on current context." (dframe-current-frame 'speedbar-frame 'speedbar-mode)) @@ -1224,11 +1207,8 @@ and the existence of packages." (speedbar-initial-menu) (save-excursion (dframe-select-attached-frame speedbar-frame) - (if (local-variable-p - 'speedbar-easymenu-definition-special - (current-buffer)) - ;; If bound locally, we can use it - speedbar-easymenu-definition-special))) + (eval (nth 1 (assoc speedbar-initial-expansion-list-name + speedbar-initial-expansion-mode-alist))))) ;; Dynamic menu stuff '("-") (list (cons "Displays" diff --git a/lisp/startup.el b/lisp/startup.el index f1a68fd8509..33138ef3875 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -644,18 +644,17 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'." ;; Convert preloaded file names to absolute. (let ((lisp-dir - (file-name-directory - (locate-file "simple" load-path - (get-load-suffixes))))) + (file-truename + (file-name-directory + (locate-file "simple" load-path + (get-load-suffixes)))))) (setq load-history (mapcar (lambda (elt) (if (and (stringp (car elt)) (not (file-name-absolute-p (car elt)))) (cons (concat lisp-dir - (car elt) - (if (string-match "[.]el$" (car elt)) - "" ".elc")) + (car elt)) (cdr elt)) elt)) load-history))) diff --git a/lisp/subr.el b/lisp/subr.el index cd0ce2d3f33..387228fbb8c 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -1393,32 +1393,94 @@ That function's doc string says which file created it." t)) nil)) +(defun load-history-regexp (file) + "Form a regexp to find FILE in `load-history'. +FILE, a string, is described in the function `eval-after-load'." + (if (file-name-absolute-p file) + (setq file (file-truename file))) + (concat (if (file-name-absolute-p file) "\\`" "\\(\\`\\|/\\)") + (regexp-quote file) + (if (file-name-extension file) + "" + ;; Note: regexp-opt can't be used here, since we need to call + ;; this before Emacs has been fully started. 2006-05-21 + (concat "\\(" (mapconcat 'regexp-quote load-suffixes "\\|") "\\)?")) + "\\(" (mapconcat 'regexp-quote jka-compr-load-suffixes "\\|") + "\\)?\\'")) + +(defun load-history-filename-element (file-regexp) + "Get the first elt of `load-history' whose car matches FILE-REGEXP. +Return nil if there isn't one." + (let* ((loads load-history) + (load-elt (and loads (car loads)))) + (save-match-data + (while (and loads + (or (null (car load-elt)) + (not (string-match file-regexp (car load-elt))))) + (setq loads (cdr loads) + load-elt (and loads (car loads))))) + load-elt)) + (defun eval-after-load (file form) "Arrange that, if FILE is ever loaded, FORM will be run at that time. -This makes or adds to an entry on `after-load-alist'. If FILE is already loaded, evaluate FORM right now. -It does nothing if FORM is already on the list for FILE. -FILE must match exactly. Normally FILE is the name of a library, -with no directory or extension specified, since that is how `load' -is normally called. -FILE can also be a feature (i.e. a symbol), in which case FORM is -evaluated whenever that feature is `provide'd." - (let ((elt (assoc file after-load-alist))) - ;; Make sure there is an element for FILE. - (unless elt (setq elt (list file)) (push elt after-load-alist)) - ;; Add FORM to the element if it isn't there. + +If a matching file is loaded again, FORM will be evaluated again. + +If FILE is a string, it may be either an absolute or a relative file +name, and may have an extension \(e.g. \".el\") or may lack one, and +additionally may or may not have an extension denoting a compressed +format \(e.g. \".gz\"). + +When FILE is absolute, this first converts it to a true name by chasing +symbolic links. Only a file of this name \(see next paragraph regarding +extensions) will trigger the evaluation of FORM. When FILE is relative, +a file whose absolute true name ends in FILE will trigger evaluation. + +When FILE lacks an extension, a file name with any extension will trigger +evaluation. Otherwise, its extension must match FILE's. A further +extension for a compressed format \(e.g. \".gz\") on FILE will not affect +this name matching. + +Alternatively, FILE can be a feature (i.e. a symbol), in which case FORM +is evaluated whenever that feature is `provide'd. + +Usually FILE is just a library name like \"font-lock\" or a feature name +like 'font-lock. + +This function makes or adds to an entry on `after-load-alist'." + ;; Add this FORM into after-load-alist (regardless of whether we'll be + ;; evaluating it now). + (let* ((regexp-or-feature + (if (stringp file) (load-history-regexp file) file)) + (elt (assoc regexp-or-feature after-load-alist))) + (unless elt + (setq elt (list regexp-or-feature)) + (push elt after-load-alist)) + ;; Add FORM to the element unless it's already there. (unless (member form (cdr elt)) - (nconc elt (list form)) - ;; If the file has been loaded already, run FORM right away. - (if (if (symbolp file) - (featurep file) - ;; Make sure `load-history' contains the files dumped with - ;; Emacs for the case that FILE is one of them. - ;; (load-symbol-file-load-history) - (when (locate-library file) - (assoc (locate-library file) load-history))) - (eval form)))) - form) + (nconc elt (list form))) + + ;; Is there an already loaded file whose name (or `provide' name) + ;; matches FILE? + (if (if (stringp file) + (load-history-filename-element regexp-or-feature) + (featurep file)) + (eval form)))) + +(defun do-after-load-evaluation (abs-file) + "Evaluate all `eval-after-load' forms, if any, for ABS-FILE. +ABS-FILE, a string, should be the absolute true name of a file just loaded." + (let ((after-load-elts after-load-alist) + a-l-element file-elements file-element form) + (while after-load-elts + (setq a-l-element (car after-load-elts) + after-load-elts (cdr after-load-elts)) + (when (and (stringp (car a-l-element)) + (string-match (car a-l-element) abs-file)) + (while (setq a-l-element (cdr a-l-element)) ; discard the file name + (setq form (car a-l-element)) + (eval form)))))) (defun eval-next-after-load (file) "Read the following input sexp, and run it whenever FILE is loaded. @@ -1555,7 +1617,7 @@ Optional DEFAULT is a default password to use instead of empty input. This function echoes `.' for each character that the user types. The user ends with RET, LFD, or ESC. DEL or C-h rubs out. C-u kills line. C-g quits; if `inhibit-quit' was non-nil around this function, -then it returns nil if the user types C-g. +then it returns nil if the user types C-g, but quit-flag remains set. Once the caller uses the password, it can erase the password by doing (clear-string STRING)." @@ -1575,6 +1637,9 @@ by doing (clear-string STRING)." (sit-for 1)))) success) (let ((pass nil) + ;; Copy it so that add-text-properties won't modify + ;; the object that was passed in by the caller. + (prompt (copy-sequence prompt)) (c 0) (echo-keystrokes 0) (cursor-in-echo-area t) @@ -2137,7 +2202,8 @@ If you quit, the process is killed with SIGINT, or SIGKILL if you quit again." ;;;; Lisp macros to do various things temporarily. (defmacro with-current-buffer (buffer &rest body) - "Execute the forms in BODY with BUFFER as the current buffer. + "Execute the forms in BODY with BUFFER temporarily current. +BUFFER can be a buffer or a buffer name. The value returned is the value of the last form in BODY. See also `with-temp-buffer'." (declare (indent 1) (debug t)) @@ -2250,13 +2316,19 @@ See also `with-temp-file' and `with-output-to-string'." (defmacro with-local-quit (&rest body) "Execute BODY, allowing quits to terminate BODY but not escape further. When a quit terminates BODY, `with-local-quit' returns nil but -requests another quit. That quit will be processed, the next time quitting -is allowed once again." +requests another quit. That quit will be processed as soon as quitting +is allowed once again. (Immediately, if `inhibit-quit' is nil.)" (declare (debug t) (indent 0)) `(condition-case nil (let ((inhibit-quit nil)) ,@body) - (quit (setq quit-flag t) nil))) + (quit (setq quit-flag t) + ;; This call is to give a chance to handle quit-flag + ;; in case inhibit-quit is nil. + ;; Without this, it will not be handled until the next function + ;; call, and that might allow it to exit thru a condition-case + ;; that intends to handle the quit signal next time. + (eval '(ignore nil))))) (defmacro while-no-input (&rest body) "Execute BODY only as long as there's no pending input. diff --git a/lisp/term.el b/lisp/term.el index 64f0efc767b..9ecb1efa948 100644 --- a/lisp/term.el +++ b/lisp/term.el @@ -660,13 +660,6 @@ Buffer local variable.") (put 'term-scroll-show-maximum-output 'permanent-local t) (put 'term-ptyp 'permanent-local t) -;; Do FORM if running under XEmacs (previously Lucid Emacs). -(defmacro term-if-xemacs (&rest forms) - (if (featurep 'xemacs) (cons 'progn forms))) -;; Do FORM if NOT running under XEmacs (previously Lucid Emacs). -(defmacro term-ifnot-xemacs (&rest forms) - (if (not (featurep 'xemacs)) (cons 'progn forms))) - (defmacro term-in-char-mode () '(eq (current-local-map) term-raw-map)) (defmacro term-in-line-mode () '(not (term-in-char-mode))) ;; True if currently doing PAGER handling. @@ -725,13 +718,13 @@ Notice that a setting of 0 means 'don't truncate anything'. This variable is buffer-local.") ;;; -(term-if-xemacs - (defvar term-terminal-menu - '("Terminal" - [ "Character mode" term-char-mode (term-in-line-mode)] - [ "Line mode" term-line-mode (term-in-char-mode)] - [ "Enable paging" term-pager-toggle (not term-pager-count)] - [ "Disable paging" term-pager-toggle term-pager-count]))) +(when (featurep 'xemacs) + (defvar term-terminal-menu + '("Terminal" + [ "Character mode" term-char-mode (term-in-line-mode)] + [ "Line mode" term-line-mode (term-in-char-mode)] + [ "Enable paging" term-pager-toggle (not term-pager-count)] + [ "Disable paging" term-pager-toggle term-pager-count]))) (unless term-mode-map (setq term-mode-map (make-sparse-keymap)) @@ -739,10 +732,10 @@ is buffer-local.") (define-key term-mode-map "\en" 'term-next-input) (define-key term-mode-map "\er" 'term-previous-matching-input) (define-key term-mode-map "\es" 'term-next-matching-input) - (term-ifnot-xemacs - (define-key term-mode-map [?\A-\M-r] - 'term-previous-matching-input-from-input) - (define-key term-mode-map [?\A-\M-s] 'term-next-matching-input-from-input)) + (unless (featurep 'xemacs) + (define-key term-mode-map [?\A-\M-r] + 'term-previous-matching-input-from-input) + (define-key term-mode-map [?\A-\M-s] 'term-next-matching-input-from-input)) (define-key term-mode-map "\e\C-l" 'term-show-output) (define-key term-mode-map "\C-m" 'term-send-input) (define-key term-mode-map "\C-d" 'term-delchar-or-maybe-eof) @@ -781,9 +774,7 @@ is buffer-local.") ) ;; Menu bars: -(term-ifnot-xemacs - (progn - +(unless (featurep 'xemacs) ;; terminal: (let (newmap) (setq newmap (make-sparse-keymap "Terminal")) @@ -860,14 +851,14 @@ is buffer-local.") (define-key newmap [] '("BREAK" . term-interrupt-subjob)) (define-key term-mode-map [menu-bar signals] (setq term-signals-menu (cons "Signals" newmap))) - ))) + )) ;; Set up term-raw-map, etc. (defun term-set-escape-char (c) "Change term-escape-char and keymaps that depend on it." - (if term-escape-char - (define-key term-raw-map term-escape-char 'term-send-raw)) + (when term-escape-char + (define-key term-raw-map term-escape-char 'term-send-raw)) (setq c (make-string 1 c)) (define-key term-raw-map c term-raw-escape-map) ;; Define standard bindings in term-raw-escape-map @@ -899,28 +890,26 @@ is buffer-local.") ;;; Added nearly all the 'grey keys' -mm - (progn - (term-if-xemacs - (define-key term-raw-map [button2] 'term-mouse-paste)) - (term-ifnot-xemacs - (define-key term-raw-map [mouse-2] 'term-mouse-paste) - (define-key term-raw-map [menu-bar terminal] term-terminal-menu) - (define-key term-raw-map [menu-bar signals] term-signals-menu)) - (define-key term-raw-map [up] 'term-send-up) - (define-key term-raw-map [down] 'term-send-down) - (define-key term-raw-map [right] 'term-send-right) - (define-key term-raw-map [left] 'term-send-left) - (define-key term-raw-map [delete] 'term-send-del) - (define-key term-raw-map [deletechar] 'term-send-del) - (define-key term-raw-map [backspace] 'term-send-backspace) - (define-key term-raw-map [home] 'term-send-home) - (define-key term-raw-map [end] 'term-send-end) - (define-key term-raw-map [insert] 'term-send-insert) - (define-key term-raw-map [S-prior] 'scroll-down) - (define-key term-raw-map [S-next] 'scroll-up) - (define-key term-raw-map [S-insert] 'term-paste) - (define-key term-raw-map [prior] 'term-send-prior) - (define-key term-raw-map [next] 'term-send-next))) + (if (featurep 'xemacs) + (define-key term-raw-map [button2] 'term-mouse-paste) + (define-key term-raw-map [mouse-2] 'term-mouse-paste) + (define-key term-raw-map [menu-bar terminal] term-terminal-menu) + (define-key term-raw-map [menu-bar signals] term-signals-menu)) + (define-key term-raw-map [up] 'term-send-up) + (define-key term-raw-map [down] 'term-send-down) + (define-key term-raw-map [right] 'term-send-right) + (define-key term-raw-map [left] 'term-send-left) + (define-key term-raw-map [delete] 'term-send-del) + (define-key term-raw-map [deletechar] 'term-send-del) + (define-key term-raw-map [backspace] 'term-send-backspace) + (define-key term-raw-map [home] 'term-send-home) + (define-key term-raw-map [end] 'term-send-end) + (define-key term-raw-map [insert] 'term-send-insert) + (define-key term-raw-map [S-prior] 'scroll-down) + (define-key term-raw-map [S-next] 'scroll-up) + (define-key term-raw-map [S-insert] 'term-paste) + (define-key term-raw-map [prior] 'term-send-prior) + (define-key term-raw-map [next] 'term-send-next)) (term-set-escape-char ?\C-c) @@ -1112,9 +1101,9 @@ Entry to this mode runs the hooks on `term-mode-hook'." ;; Cua-mode's keybindings interfere with the term keybindings, disable it. (set (make-local-variable 'cua-mode) nil) (run-mode-hooks 'term-mode-hook) - (term-if-xemacs - (set-buffer-menubar - (append current-menubar (list term-terminal-menu)))) + (when (featurep 'xemacs) + (set-buffer-menubar + (append current-menubar (list term-terminal-menu)))) (or term-input-ring (setq term-input-ring (make-ring term-input-ring-size))) (term-update-mode-line)) @@ -1151,16 +1140,15 @@ Entry to this mode runs the hooks on `term-mode-hook'." (setq term-start-line-column nil) (setq cur nil found t)) (setq cur (cdr cur)))))) - (if (not found) - (goto-char save-point))) + (when (not found) + (goto-char save-point))) found)) (defun term-check-size (process) - (if (or (/= term-height (1- (window-height))) - (/= term-width (term-window-width))) - (progn - (term-reset-size (1- (window-height)) (term-window-width)) - (set-process-window-size process term-height term-width)))) + (when (or (/= term-height (1- (window-height))) + (/= term-width (term-window-width))) + (term-reset-size (1- (window-height)) (term-window-width)) + (set-process-window-size process term-height term-width))) (defun term-send-raw-string (chars) (let ((proc (get-buffer-process (current-buffer)))) @@ -1169,8 +1157,8 @@ Entry to this mode runs the hooks on `term-mode-hook'." ;; Note that (term-current-row) must be called *after* ;; (point) has been updated to (process-mark proc). (goto-char (process-mark proc)) - (if (term-pager-enabled) - (setq term-pager-count (term-current-row))) + (when (term-pager-enabled) + (setq term-pager-count (term-current-row))) (process-send-string proc chars)))) (defun term-send-raw () @@ -1178,9 +1166,9 @@ Entry to this mode runs the hooks on `term-mode-hook'." without any interpretation." (interactive) ;; Convert `return' to C-m, etc. - (if (and (symbolp last-input-char) - (get last-input-char 'ascii-character)) - (setq last-input-char (get last-input-char 'ascii-character))) + (when (and (symbolp last-input-char) + (get last-input-char 'ascii-character)) + (setq last-input-char (get last-input-char 'ascii-character))) (term-send-raw-string (make-string 1 last-input-char))) (defun term-send-raw-meta () @@ -1205,19 +1193,19 @@ without any interpretation." (defun term-mouse-paste (click arg) "Insert the last stretch of killed text at the position clicked on." (interactive "e\nP") - (term-if-xemacs - (term-send-raw-string (or (condition-case () (x-get-selection) (error ())) - (x-get-cutbuffer) - (error "No selection or cut buffer available")))) - (term-ifnot-xemacs - ;; Give temporary modes such as isearch a chance to turn off. - (run-hooks 'mouse-leave-buffer-hook) - (setq this-command 'yank) - (mouse-set-point click) - (term-send-raw-string (current-kill (cond - ((listp arg) 0) - ((eq arg '-) -1) - (t (1- arg))))))) + (if (featurep 'xemacs) + (term-send-raw-string + (or (condition-case () (x-get-selection) (error ())) + (x-get-cutbuffer) + (error "No selection or cut buffer available"))) + ;; Give temporary modes such as isearch a chance to turn off. + (run-hooks 'mouse-leave-buffer-hook) + (setq this-command 'yank) + (mouse-set-point click) + (term-send-raw-string (current-kill (cond + ((listp arg) 0) + ((eq arg '-) -1) + (t (1- arg))))))) (defun term-paste () "Insert the last stretch of killed text at point." @@ -1246,33 +1234,31 @@ Each character you type is sent directly to the inferior without intervention from Emacs, except for the escape character (usually C-c)." (interactive) ;; FIXME: Emit message? Cfr ilisp-raw-message - (if (term-in-line-mode) - (progn - (setq term-old-mode-map (current-local-map)) - (use-local-map term-raw-map) - - ;; Send existing partial line to inferior (without newline). - (let ((pmark (process-mark (get-buffer-process (current-buffer)))) - (save-input-sender term-input-sender)) - (if (> (point) pmark) - (unwind-protect - (progn - (setq term-input-sender - (symbol-function 'term-send-string)) - (end-of-line) - (term-send-input)) - (setq term-input-sender save-input-sender)))) - (term-update-mode-line)))) + (when (term-in-line-mode) + (setq term-old-mode-map (current-local-map)) + (use-local-map term-raw-map) + + ;; Send existing partial line to inferior (without newline). + (let ((pmark (process-mark (get-buffer-process (current-buffer)))) + (save-input-sender term-input-sender)) + (when (> (point) pmark) + (unwind-protect + (progn + (setq term-input-sender + (symbol-function 'term-send-string)) + (end-of-line) + (term-send-input)) + (setq term-input-sender save-input-sender)))) + (term-update-mode-line))) (defun term-line-mode () "Switch to line (\"cooked\") sub-mode of term mode. This means that Emacs editing commands work as normally, until you type \\[term-send-input] which sends the current line to the inferior." (interactive) - (if (term-in-char-mode) - (progn - (use-local-map term-old-mode-map) - (term-update-mode-line)))) + (when (term-in-char-mode) + (use-local-map term-old-mode-map) + (term-update-mode-line))) (defun term-update-mode-line () (setq mode-line-process @@ -1330,7 +1316,7 @@ buffer. The hook term-exec-hook is run after each exec." (save-excursion (set-buffer buffer) (let ((proc (get-buffer-process buffer))) ; Blast any old process. - (if proc (delete-process proc))) + (when proc (delete-process proc))) ;; Crank up a new process (let ((proc (term-exec-1 name buffer command switches))) (make-local-variable 'term-ptyp) @@ -1360,29 +1346,28 @@ buffer. The hook term-exec-hook is run after each exec." "Sentinel for term buffers. The main purpose is to get rid of the local keymap." (let ((buffer (process-buffer proc))) - (if (memq (process-status proc) '(signal exit)) - (progn - (if (null (buffer-name buffer)) - ;; buffer killed - (set-process-buffer proc nil) - (let ((obuf (current-buffer))) - ;; save-excursion isn't the right thing if - ;; process-buffer is current-buffer - (unwind-protect - (progn - ;; Write something in the compilation buffer - ;; and hack its mode line. - (set-buffer buffer) - ;; Get rid of local keymap. - (use-local-map nil) - (term-handle-exit (process-name proc) - msg) - ;; Since the buffer and mode line will show that the - ;; process is dead, we can delete it now. Otherwise it - ;; will stay around until M-x list-processes. - (delete-process proc)) - (set-buffer obuf)))) - )))) + (when (memq (process-status proc) '(signal exit)) + (if (null (buffer-name buffer)) + ;; buffer killed + (set-process-buffer proc nil) + (let ((obuf (current-buffer))) + ;; save-excursion isn't the right thing if + ;; process-buffer is current-buffer + (unwind-protect + (progn + ;; Write something in the compilation buffer + ;; and hack its mode line. + (set-buffer buffer) + ;; Get rid of local keymap. + (use-local-map nil) + (term-handle-exit (process-name proc) + msg) + ;; Since the buffer and mode line will show that the + ;; process is dead, we can delete it now. Otherwise it + ;; will stay around until M-x list-processes. + (delete-process proc)) + (set-buffer obuf))) + )))) (defun term-handle-exit (process-name msg) "Write process exit (or other change) message MSG in the current buffer." @@ -1395,8 +1380,8 @@ The main purpose is to get rid of the local keymap." (insert ?\n "Process " process-name " " msg) ;; Force mode line redisplay soon. (force-mode-line-update) - (if (and opoint (< opoint omax)) - (goto-char opoint)))) + (when (and opoint (< opoint omax)) + (goto-char opoint)))) ;;; Name to use for TERM. @@ -1519,9 +1504,9 @@ See also `term-input-ignoredups' and `term-write-input-ring'." nil t)) (let ((history (buffer-substring (match-beginning 1) (match-end 1)))) - (if (or (null term-input-ignoredups) - (ring-empty-p ring) - (not (string-equal (ring-ref ring 0) history))) + (when (or (null term-input-ignoredups) + (ring-empty-p ring) + (not (string-equal (ring-ref ring 0) history))) (ring-insert-at-beginning ring history))) (setq count (1+ count)))) (kill-buffer history-buf)) @@ -1649,15 +1634,15 @@ Moves relative to `term-input-ring-index'." "Return the string matching REGEXP ARG places along the input ring. Moves relative to `term-input-ring-index'." (let* ((pos (term-previous-matching-input-string-position regexp arg))) - (if pos (ring-ref term-input-ring pos)))) + (when pos (ring-ref term-input-ring pos)))) (defun term-previous-matching-input-string-position (regexp arg &optional start) "Return the index matching REGEXP ARG places along the input ring. Moves relative to START, or `term-input-ring-index'." - (if (or (not (ring-p term-input-ring)) - (ring-empty-p term-input-ring)) - (error "No history")) + (when (or (not (ring-p term-input-ring)) + (ring-empty-p term-input-ring)) + (error "No history")) (let* ((len (ring-length term-input-ring)) (motion (if (> arg 0) 1 -1)) (n (mod (- (or start (term-search-start arg)) motion) len)) @@ -1676,8 +1661,8 @@ Moves relative to START, or `term-input-ring-index'." tried-each-ring-item (= n prev))) (setq arg (if (> arg 0) (1- arg) (1+ arg)))) ;; Now that we know which ring element to use, if we found it, return that. - (if (string-match regexp (ring-ref term-input-ring n)) - n))) + (when (string-match regexp (ring-ref term-input-ring n)) + n))) (defun term-previous-matching-input (regexp arg) "Search backwards through input history for match for REGEXP. @@ -1711,14 +1696,14 @@ If N is negative, find the previous or Nth previous match." With prefix argument N, search for Nth previous match. If N is negative, search forwards for the -Nth following match." (interactive "p") - (if (not (memq last-command '(term-previous-matching-input-from-input + (when (not (memq last-command '(term-previous-matching-input-from-input term-next-matching-input-from-input))) - ;; Starting a new search - (setq term-matching-input-from-input-string - (buffer-substring - (process-mark (get-buffer-process (current-buffer))) - (point)) - term-input-ring-index nil)) + ;; Starting a new search + (setq term-matching-input-from-input-string + (buffer-substring + (process-mark (get-buffer-process (current-buffer))) + (point)) + term-input-ring-index nil)) (term-previous-matching-input (concat "^" (regexp-quote term-matching-input-from-input-string)) arg)) @@ -1750,15 +1735,15 @@ See `term-magic-space' and `term-replace-by-expanded-history-before-point'. Returns t if successful." (interactive) - (if (and term-input-autoexpand - (string-match "[!^]" (funcall term-get-old-input)) - (save-excursion (beginning-of-line) - (looking-at term-prompt-regexp))) - ;; Looks like there might be history references in the command. - (let ((previous-modified-tick (buffer-modified-tick))) - (message "Expanding history references...") - (term-replace-by-expanded-history-before-point silent) - (/= previous-modified-tick (buffer-modified-tick))))) + (when (and term-input-autoexpand + (string-match "[!^]" (funcall term-get-old-input)) + (save-excursion (beginning-of-line) + (looking-at term-prompt-regexp))) + ;; Looks like there might be history references in the command. + (let ((previous-modified-tick (buffer-modified-tick))) + (message "Expanding history references...") + (term-replace-by-expanded-history-before-point silent) + (/= previous-modified-tick (buffer-modified-tick))))) (defun term-replace-by-expanded-history-before-point (silent) @@ -2024,17 +2009,17 @@ Similarly for Soar, Scheme, etc." (delete-region pmark (point)) (insert input) copy)))) - (if (term-pager-enabled) - (save-excursion - (goto-char (process-mark proc)) - (setq term-pager-count (term-current-row)))) - (if (and (funcall term-input-filter history) - (or (null term-input-ignoredups) - (not (ring-p term-input-ring)) - (ring-empty-p term-input-ring) - (not (string-equal (ring-ref term-input-ring 0) - history)))) - (ring-insert term-input-ring history)) + (when (term-pager-enabled) + (save-excursion + (goto-char (process-mark proc)) + (setq term-pager-count (term-current-row)))) + (when (and (funcall term-input-filter history) + (or (null term-input-ignoredups) + (not (ring-p term-input-ring)) + (ring-empty-p term-input-ring) + (not (string-equal (ring-ref term-input-ring 0) + history)))) + (ring-insert term-input-ring history)) (let ((functions term-input-filter-functions)) (while functions (funcall (car functions) (concat input "\n")) @@ -2045,13 +2030,12 @@ Similarly for Soar, Scheme, etc." ;; in case we get output amidst sending the input. (set-marker term-last-input-start pmark) (set-marker term-last-input-end (point)) - (if input-is-new - (progn - ;; Set up to delete, because inferior should echo. - (if (marker-buffer term-pending-delete-marker) - (delete-region term-pending-delete-marker pmark)) - (set-marker term-pending-delete-marker pmark-val) - (set-marker (process-mark proc) (point)))) + (when input-is-new + ;; Set up to delete, because inferior should echo. + (when (marker-buffer term-pending-delete-marker) + (delete-region term-pending-delete-marker pmark)) + (set-marker term-pending-delete-marker pmark-val) + (set-marker (process-mark proc) (point))) (goto-char pmark) (funcall term-input-sender proc input))))) @@ -2081,9 +2065,9 @@ Calls `term-get-old-input' to get old input." "Skip past the text matching regexp term-prompt-regexp. If this takes us past the end of the current line, don't skip at all." (let ((eol (save-excursion (end-of-line) (point)))) - (if (and (looking-at term-prompt-regexp) - (<= (match-end 0) eol)) - (goto-char (match-end 0))))) + (when (and (looking-at term-prompt-regexp) + (<= (match-end 0) eol)) + (goto-char (match-end 0))))) (defun term-after-pmark-p () @@ -2112,7 +2096,7 @@ The prompt skip is done by skipping text matching the regular expression term-prompt-regexp, a buffer local variable." (interactive "P") (beginning-of-line) - (if (null arg) (term-skip-prompt))) + (when (null arg) (term-skip-prompt))) ;;; These two functions are for entering text you don't want echoed or ;;; saved -- typically passwords to ftp, telnet, or somesuch. @@ -2173,10 +2157,10 @@ is additionally sent. String is not saved on term input history list. Security bug: your string can still be temporarily recovered with \\[view-lossage]." (interactive "P") ; Defeat snooping via C-x esc - (if (not (stringp str)) - (setq str (term-read-noecho "Non-echoed text: " t))) - (if (not proc) - (setq proc (get-buffer-process (current-buffer)))) + (when (not (stringp str)) + (setq str (term-read-noecho "Non-echoed text: " t))) + (when (not proc) + (setq proc (get-buffer-process (current-buffer)))) (if (not proc) (error "Current buffer has no process") (setq term-kill-echo-list (nconc term-kill-echo-list (cons str nil))) @@ -2268,8 +2252,8 @@ Useful if you accidentally suspend the top-level process." (interactive) (let* ((pmark (process-mark (get-buffer-process (current-buffer)))) (p-pos (marker-position pmark))) - (if (> (point) p-pos) - (kill-region pmark (point))))) + (when (> (point) p-pos) + (kill-region pmark (point))))) (defun term-delchar-or-maybe-eof (arg) "Delete ARG characters forward, or send an EOF to process if at end of @@ -2277,7 +2261,7 @@ buffer." (interactive "p") (if (eobp) (process-send-eof) - (delete-char arg))) + (delete-char arg))) (defun term-send-eof () "Send an EOF to the current buffer's process." @@ -2292,8 +2276,8 @@ If N is negative, find the next or Nth next match." (interactive (term-regexp-arg "Backward input matching (regexp): ")) (let* ((re (concat term-prompt-regexp ".*" regexp)) (pos (save-excursion (end-of-line (if (> arg 0) 0 1)) - (if (re-search-backward re nil t arg) - (point))))) + (when (re-search-backward re nil t arg) + (point))))) (if (null pos) (progn (message "Not found") (ding)) @@ -2405,15 +2389,15 @@ See `term-prompt-regexp'." (defun term-check-source (fname) (let ((buff (get-file-buffer fname))) - (if (and buff - (buffer-modified-p buff) - (y-or-n-p (format "Save buffer %s first? " - (buffer-name buff)))) - ;; save BUFF. - (let ((old-buffer (current-buffer))) - (set-buffer buff) - (save-buffer) - (set-buffer old-buffer))))) + (when (and buff + (buffer-modified-p buff) + (y-or-n-p (format "Save buffer %s first? " + (buffer-name buff)))) + ;; save BUFF. + (let ((old-buffer (current-buffer))) + (set-buffer buff) + (save-buffer) + (set-buffer old-buffer))))) ;;; (TERM-GET-SOURCE prompt prev-dir/file source-modes mustmatch-p) @@ -2508,12 +2492,12 @@ See `term-prompt-regexp'." ;; Try to position the proc window so you can see the answer. ;; This is bogus code. If you delete the (sit-for 0), it breaks. ;; I don't know why. Wizards invited to improve it. - (if (not (pos-visible-in-window-p proc-pt proc-win)) - (let ((opoint (window-point proc-win))) - (set-window-point proc-win proc-mark) (sit-for 0) - (if (not (pos-visible-in-window-p opoint proc-win)) - (push-mark opoint) - (set-window-point proc-win opoint))))))) + (when (not (pos-visible-in-window-p proc-pt proc-win)) + (let ((opoint (window-point proc-win))) + (set-window-point proc-win proc-mark) (sit-for 0) + (if (not (pos-visible-in-window-p opoint proc-win)) + (push-mark opoint) + (set-window-point proc-win opoint))))))) ;;; Returns the current column in the current screen line. ;;; Note: (current-column) yields column in buffer line. @@ -2701,16 +2685,15 @@ See `term-prompt-regexp'." ;; Let's handle the messages. -mm (let* ((newstr (term-handle-ansi-terminal-messages str))) - (if (not (eq str newstr)) - (setq handled-ansi-message t - str newstr))) + (when (not (eq str newstr)) + (setq handled-ansi-message t + str newstr))) (setq str-length (length str)) - (if (marker-buffer term-pending-delete-marker) - (progn - ;; Delete text following term-pending-delete-marker. - (delete-region term-pending-delete-marker (process-mark proc)) - (set-marker term-pending-delete-marker nil))) + (when (marker-buffer term-pending-delete-marker) + ;; Delete text following term-pending-delete-marker. + (delete-region term-pending-delete-marker (process-mark proc)) + (set-marker term-pending-delete-marker nil)) (if (eq (window-buffer) (current-buffer)) (progn @@ -2721,20 +2704,20 @@ See `term-prompt-regexp'." (setq save-marker (copy-marker (process-mark proc))) - (if (/= (point) (process-mark proc)) - (progn (setq save-point (point-marker)) - (goto-char (process-mark proc)))) + (when (/= (point) (process-mark proc)) + (setq save-point (point-marker)) + (goto-char (process-mark proc))) (save-restriction ;; If the buffer is in line mode, and there is a partial ;; input line, save the line (by narrowing to leave it ;; outside the restriction ) until we're done with output. - (if (and (> (point-max) (process-mark proc)) - (term-in-line-mode)) - (narrow-to-region (point-min) (process-mark proc))) + (when (and (> (point-max) (process-mark proc)) + (term-in-line-mode)) + (narrow-to-region (point-min) (process-mark proc))) - (if term-log-buffer - (princ str term-log-buffer)) + (when term-log-buffer + (princ str term-log-buffer)) (cond ((eq term-terminal-state 4) ;; Have saved pending output. (setq str (concat term-terminal-parameter str)) (setq term-terminal-parameter nil) @@ -2748,7 +2731,7 @@ See `term-prompt-regexp'." (setq funny (string-match "[\r\n\000\007\033\t\b\032\016\017]" str i)) - (if (not funny) (setq funny str-length)) + (when (not funny) (setq funny str-length)) (cond ((> funny i) (cond ((eq term-terminal-state 1) ;; We are in state 1, we need to wrap @@ -2822,10 +2805,10 @@ See `term-prompt-regexp'." (setq count (min term-width (+ count 8 (- (mod count 8))))) (if (> term-width count) - (progn - (term-move-columns - (- count (term-current-column))) - (setq term-current-column count)) + (progn + (term-move-columns + (- count (term-current-column))) + (setq term-current-column count)) (when (> term-width (term-current-column)) (term-move-columns (1- (- term-width (term-current-column))))) @@ -2967,44 +2950,43 @@ See `term-prompt-regexp'." (setq term-terminal-previous-parameter-2 -1) (setq term-terminal-previous-parameter -1) (setq term-terminal-state 0))))) - (if (term-handling-pager) - ;; Finish stuff to get ready to handle PAGER. - (progn - (if (> (% (current-column) term-width) 0) - (setq term-terminal-parameter - (substring str i)) - ;; We're at column 0. Goto end of buffer; to compensate, - ;; prepend a ?\r for later. This looks more consistent. - (if (zerop i) - (setq term-terminal-parameter - (concat "\r" (substring str i))) - (setq term-terminal-parameter (substring str (1- i))) - (aset term-terminal-parameter 0 ?\r)) - (goto-char (point-max))) - (setq term-terminal-state 4) - (make-local-variable 'term-pager-old-filter) - (setq term-pager-old-filter (process-filter proc)) - (set-process-filter proc term-pager-filter) - (setq i str-length))) + (when (term-handling-pager) + ;; Finish stuff to get ready to handle PAGER. + (if (> (% (current-column) term-width) 0) + (setq term-terminal-parameter + (substring str i)) + ;; We're at column 0. Goto end of buffer; to compensate, + ;; prepend a ?\r for later. This looks more consistent. + (if (zerop i) + (setq term-terminal-parameter + (concat "\r" (substring str i))) + (setq term-terminal-parameter (substring str (1- i))) + (aset term-terminal-parameter 0 ?\r)) + (goto-char (point-max))) + (setq term-terminal-state 4) + (make-local-variable 'term-pager-old-filter) + (setq term-pager-old-filter (process-filter proc)) + (set-process-filter proc term-pager-filter) + (setq i str-length)) (setq i (1+ i)))) - (if (>= (term-current-row) term-height) - (term-handle-deferred-scroll)) + (when (>= (term-current-row) term-height) + (term-handle-deferred-scroll)) (set-marker (process-mark proc) (point)) - (if save-point - (progn (goto-char save-point) - (set-marker save-point nil))) + (when save-point + (goto-char save-point) + (set-marker save-point nil)) ;; Check for a pending filename-and-line number to display. ;; We do this before scrolling, because we might create a new window. - (if (and term-pending-frame - (eq (window-buffer selected) (current-buffer))) - (progn (term-display-line (car term-pending-frame) - (cdr term-pending-frame)) - (setq term-pending-frame nil) - ;; We have created a new window, so check the window size. - (term-check-size proc))) + (when (and term-pending-frame + (eq (window-buffer selected) (current-buffer))) + (term-display-line (car term-pending-frame) + (cdr term-pending-frame)) + (setq term-pending-frame nil) + ;; We have created a new window, so check the window size. + (term-check-size proc)) ;; Scroll each window displaying the buffer but (by default) ;; only if the point matches the process-mark we started with. @@ -3016,50 +2998,47 @@ See `term-prompt-regexp'." (setq last-win win) (while (progn (setq win (next-window win nil t)) - (if (eq (window-buffer win) (process-buffer proc)) - (let ((scroll term-scroll-to-bottom-on-output)) - (select-window win) - (if (or (= (point) save-marker) + (when (eq (window-buffer win) (process-buffer proc)) + (let ((scroll term-scroll-to-bottom-on-output)) + (select-window win) + (when (or (= (point) save-marker) (eq scroll t) (eq scroll 'all) ;; Maybe user wants point to jump to the end. (and (eq selected win) (or (eq scroll 'this) (not save-point))) (and (eq scroll 'others) (not (eq selected win)))) - (progn - (goto-char term-home-marker) - (recenter 0) - (goto-char (process-mark proc)) - (if (not (pos-visible-in-window-p (point) win)) - (recenter -1)))) - ;; Optionally scroll so that the text - ;; ends at the bottom of the window. - (if (and term-scroll-show-maximum-output + (goto-char term-home-marker) + (recenter 0) + (goto-char (process-mark proc)) + (if (not (pos-visible-in-window-p (point) win)) + (recenter -1))) + ;; Optionally scroll so that the text + ;; ends at the bottom of the window. + (when (and term-scroll-show-maximum-output (>= (point) (process-mark proc))) - (save-excursion - (goto-char (point-max)) - (recenter -1))))) + (save-excursion + (goto-char (point-max)) + (recenter -1))))) (not (eq win last-win)))) ;;; Stolen from comint.el and adapted -mm - (if (> term-buffer-maximum-size 0) - (save-excursion - (goto-char (process-mark (get-buffer-process (current-buffer)))) - (forward-line (- term-buffer-maximum-size)) - (beginning-of-line) - (delete-region (point-min) (point)))) -;;; - + (when (> term-buffer-maximum-size 0) + (save-excursion + (goto-char (process-mark (get-buffer-process (current-buffer)))) + (forward-line (- term-buffer-maximum-size)) + (beginning-of-line) + (delete-region (point-min) (point)))) (set-marker save-marker nil))))) (defun term-handle-deferred-scroll () (let ((count (- (term-current-row) term-height))) - (if (>= count 0) - (save-excursion - (goto-char term-home-marker) - (term-vertical-motion (1+ count)) - (set-marker term-home-marker (point)) - (setq term-current-row (1- term-height)))))) + (when (>= count 0) + (save-excursion + (goto-char term-home-marker) + (term-vertical-motion (1+ count)) + (set-marker term-home-marker (point)) + (setq term-current-row (1- term-height)))))) ;;; Reset the terminal, delete all the content and set the face to the ;;; default one. @@ -3170,17 +3149,17 @@ See `term-prompt-regexp'." (list :background (if (= term-ansi-current-color 0) (face-foreground 'default) - (elt ansi-term-color-vector term-ansi-current-color)) + (elt ansi-term-color-vector term-ansi-current-color)) :foreground (if (= term-ansi-current-bg-color 0) (face-background 'default) - (elt ansi-term-color-vector term-ansi-current-bg-color)))) + (elt ansi-term-color-vector term-ansi-current-bg-color)))) (when term-ansi-current-bold - (setq term-current-face - (append '(:weight bold) term-current-face))) + (setq term-current-face + (append '(:weight bold) term-current-face))) (when term-ansi-current-underline - (setq term-current-face - (append '(:underline t) term-current-face)))) + (setq term-current-face + (append '(:underline t) term-current-face)))) (if term-ansi-current-invisible (setq term-current-face (if (= term-ansi-current-bg-color 0) @@ -3200,12 +3179,12 @@ See `term-prompt-regexp'." :background (elt ansi-term-color-vector term-ansi-current-bg-color))) (when term-ansi-current-bold - (setq term-current-face - (append '(:weight bold) term-current-face))) + (setq term-current-face + (append '(:weight bold) term-current-face))) (when term-ansi-current-underline - (setq term-current-face - (append '(:underline t) term-current-face)))))) - + (setq term-current-face + (append '(:underline t) term-current-face)))))) + ;;; (message "Debug %S" term-current-face) (setq term-ansi-face-already-done nil)) @@ -3219,14 +3198,14 @@ See `term-prompt-regexp'." ;; (eq char ?f) ;; xterm seems to handle this sequence too, not ;; needed for now ) - (if (<= term-terminal-parameter 0) - (setq term-terminal-parameter 1)) - (if (<= term-terminal-previous-parameter 0) - (setq term-terminal-previous-parameter 1)) - (if (> term-terminal-previous-parameter term-height) - (setq term-terminal-previous-parameter term-height)) - (if (> term-terminal-parameter term-width) - (setq term-terminal-parameter term-width)) + (when (<= term-terminal-parameter 0) + (setq term-terminal-parameter 1)) + (when (<= term-terminal-previous-parameter 0) + (setq term-terminal-previous-parameter 1)) + (when (> term-terminal-previous-parameter term-height) + (setq term-terminal-previous-parameter term-height)) + (when (> term-terminal-parameter term-width) + (setq term-terminal-parameter term-width)) (term-goto (1- term-terminal-previous-parameter) (1- term-terminal-parameter))) @@ -3443,50 +3422,49 @@ The top-most line is line 0." ; The page is full, so enter "pager" mode, and wait for input. (defun term-process-pager () - (if (not term-pager-break-map) - (let* ((map (make-keymap)) - (i 0) tmp) + (when (not term-pager-break-map) + (let* ((map (make-keymap)) + (i 0) tmp) ; (while (< i 128) ; (define-key map (make-string 1 i) 'term-send-raw) ; (setq i (1+ i))) - (define-key map "\e" - (lookup-key (current-global-map) "\e")) - (define-key map "\C-x" - (lookup-key (current-global-map) "\C-x")) - (define-key map "\C-u" - (lookup-key (current-global-map) "\C-u")) - (define-key map " " 'term-pager-page) - (define-key map "\r" 'term-pager-line) - (define-key map "?" 'term-pager-help) - (define-key map "h" 'term-pager-help) - (define-key map "b" 'term-pager-back-page) - (define-key map "\177" 'term-pager-back-line) - (define-key map "q" 'term-pager-discard) - (define-key map "D" 'term-pager-disable) - (define-key map "<" 'term-pager-bob) - (define-key map ">" 'term-pager-eob) - - ;; Add menu bar. - (progn - (term-ifnot-xemacs - (define-key map [menu-bar terminal] term-terminal-menu) - (define-key map [menu-bar signals] term-signals-menu) - (setq tmp (make-sparse-keymap "More pages?")) - (define-key tmp [help] '("Help" . term-pager-help)) - (define-key tmp [disable] - '("Disable paging" . term-fake-pager-disable)) - (define-key tmp [discard] - '("Discard remaining output" . term-pager-discard)) - (define-key tmp [eob] '("Goto to end" . term-pager-eob)) - (define-key tmp [bob] '("Goto to beginning" . term-pager-bob)) - (define-key tmp [line] '("1 line forwards" . term-pager-line)) - (define-key tmp [bline] '("1 line backwards" . term-pager-back-line)) - (define-key tmp [back] '("1 page backwards" . term-pager-back-page)) - (define-key tmp [page] '("1 page forwards" . term-pager-page)) - (define-key map [menu-bar page] (cons "More pages?" tmp)) - )) + (define-key map "\e" + (lookup-key (current-global-map) "\e")) + (define-key map "\C-x" + (lookup-key (current-global-map) "\C-x")) + (define-key map "\C-u" + (lookup-key (current-global-map) "\C-u")) + (define-key map " " 'term-pager-page) + (define-key map "\r" 'term-pager-line) + (define-key map "?" 'term-pager-help) + (define-key map "h" 'term-pager-help) + (define-key map "b" 'term-pager-back-page) + (define-key map "\177" 'term-pager-back-line) + (define-key map "q" 'term-pager-discard) + (define-key map "D" 'term-pager-disable) + (define-key map "<" 'term-pager-bob) + (define-key map ">" 'term-pager-eob) + + ;; Add menu bar. + (unless (featurep 'xemacs) + (define-key map [menu-bar terminal] term-terminal-menu) + (define-key map [menu-bar signals] term-signals-menu) + (setq tmp (make-sparse-keymap "More pages?")) + (define-key tmp [help] '("Help" . term-pager-help)) + (define-key tmp [disable] + '("Disable paging" . term-fake-pager-disable)) + (define-key tmp [discard] + '("Discard remaining output" . term-pager-discard)) + (define-key tmp [eob] '("Goto to end" . term-pager-eob)) + (define-key tmp [bob] '("Goto to beginning" . term-pager-bob)) + (define-key tmp [line] '("1 line forwards" . term-pager-line)) + (define-key tmp [bline] '("1 line backwards" . term-pager-back-line)) + (define-key tmp [back] '("1 page backwards" . term-pager-back-page)) + (define-key tmp [page] '("1 page forwards" . term-pager-page)) + (define-key map [menu-bar page] (cons "More pages?" tmp)) + ) - (setq term-pager-break-map map))) + (setq term-pager-break-map map))) ; (let ((process (get-buffer-process (current-buffer)))) ; (stop-process process)) (setq term-pager-old-local-map (current-local-map)) @@ -3504,8 +3482,8 @@ The top-most line is line 0." (interactive "p") (let* ((moved (vertical-motion (1+ lines))) (deficit (- lines moved))) - (if (> moved lines) - (backward-char)) + (when (> moved lines) + (backward-char)) (cond ((<= deficit 0) ;; OK, had enough in the buffer for request. (recenter (1- term-height))) ((term-pager-continue deficit))))) @@ -3519,8 +3497,8 @@ The top-most line is line 0." (defun term-pager-bob () (interactive) (goto-char (point-min)) - (if (= (vertical-motion term-height) term-height) - (backward-char)) + (when (= (vertical-motion term-height) term-height) + (backward-char)) (recenter (1- term-height))) ; pager mode command to go to end of buffer @@ -3571,7 +3549,7 @@ The top-most line is line 0." (interactive) (if (term-pager-enabled) (term-pager-disable) (term-pager-enable))) -(term-ifnot-xemacs +(unless (featurep 'xemacs) (defalias 'term-fake-pager-enable 'term-pager-toggle) (defalias 'term-fake-pager-disable 'term-pager-toggle) (put 'term-char-mode 'menu-enable '(term-in-line-mode)) @@ -3624,45 +3602,45 @@ all pending output has been dealt with.")) (let ((scroll-needed (- (+ (term-current-row) down) (if (< down 0) term-scroll-start term-scroll-end)))) - (if (or (and (< down 0) (< scroll-needed 0)) - (and (> down 0) (> scroll-needed 0))) - (let ((save-point (copy-marker (point))) (save-top)) - (goto-char term-home-marker) - (cond (term-scroll-with-delete - (if (< down 0) - (progn - ;; Delete scroll-needed lines at term-scroll-end, - ;; then insert scroll-needed lines. - (term-vertical-motion (1- term-scroll-end)) - (end-of-line) - (setq save-top (point)) - (term-vertical-motion scroll-needed) - (end-of-line) - (delete-region save-top (point)) - (goto-char save-point) - (setq down (- scroll-needed down)) - (term-vertical-motion down)) - ;; Delete scroll-needed lines at term-scroll-start. - (term-vertical-motion term-scroll-start) - (setq save-top (point)) - (term-vertical-motion scroll-needed) - (delete-region save-top (point)) - (goto-char save-point) - (term-vertical-motion down) - (term-adjust-current-row-cache (- scroll-needed))) - (setq term-current-column nil) - (term-insert-char ?\n (abs scroll-needed))) - ((and (numberp term-pager-count) - (< (setq term-pager-count (- term-pager-count down)) - 0)) - (setq down 0) - (term-process-pager)) - (t - (term-adjust-current-row-cache (- scroll-needed)) + (when (or (and (< down 0) (< scroll-needed 0)) + (and (> down 0) (> scroll-needed 0))) + (let ((save-point (copy-marker (point))) (save-top)) + (goto-char term-home-marker) + (cond (term-scroll-with-delete + (if (< down 0) + (progn + ;; Delete scroll-needed lines at term-scroll-end, + ;; then insert scroll-needed lines. + (term-vertical-motion (1- term-scroll-end)) + (end-of-line) + (setq save-top (point)) + (term-vertical-motion scroll-needed) + (end-of-line) + (delete-region save-top (point)) + (goto-char save-point) + (setq down (- scroll-needed down)) + (term-vertical-motion down)) + ;; Delete scroll-needed lines at term-scroll-start. + (term-vertical-motion term-scroll-start) + (setq save-top (point)) (term-vertical-motion scroll-needed) - (set-marker term-home-marker (point)))) - (goto-char save-point) - (set-marker save-point nil)))) + (delete-region save-top (point)) + (goto-char save-point) + (term-vertical-motion down) + (term-adjust-current-row-cache (- scroll-needed))) + (setq term-current-column nil) + (term-insert-char ?\n (abs scroll-needed))) + ((and (numberp term-pager-count) + (< (setq term-pager-count (- term-pager-count down)) + 0)) + (setq down 0) + (term-process-pager)) + (t + (term-adjust-current-row-cache (- scroll-needed)) + (term-vertical-motion scroll-needed) + (set-marker term-home-marker (point)))) + (goto-char save-point) + (set-marker save-point nil)))) down) (defun term-down (down &optional check-for-scroll) @@ -3699,34 +3677,34 @@ all pending output has been dealt with.")) ;; if the line above point wraps around, add a ?\n to undo the wrapping. ;; FIXME: Probably should be called more than it is. (defun term-unwrap-line () - (if (not (bolp)) (insert-before-markers ?\n))) + (when (not (bolp)) (insert-before-markers ?\n))) (defun term-erase-in-line (kind) - (if (= kind 1) ;; erase left of point - (let ((cols (term-horizontal-column)) (saved-point (point))) - (term-vertical-motion 0) - (delete-region (point) saved-point) - (term-insert-char ? cols))) - (if (not (eq kind 1)) ;; erase right of point - (let ((saved-point (point)) - (wrapped (and (zerop (term-horizontal-column)) - (not (zerop (term-current-column)))))) - (term-vertical-motion 1) - (delete-region saved-point (point)) - ;; wrapped is true if we're at the beginning of screen line, - ;; but not a buffer line. If we delete the current screen line - ;; that will make the previous line no longer wrap, and (because - ;; of the way Emacs display works) point will be at the end of - ;; the previous screen line rather then the beginning of the - ;; current one. To avoid that, we make sure that current line - ;; contain a space, to force the previous line to continue to wrap. - ;; We could do this always, but it seems preferable to not add the - ;; extra space when wrapped is false. - (if wrapped - (insert ? )) - (insert ?\n) - (put-text-property saved-point (point) 'face 'default) - (goto-char saved-point)))) + (when (= kind 1) ;; erase left of point + (let ((cols (term-horizontal-column)) (saved-point (point))) + (term-vertical-motion 0) + (delete-region (point) saved-point) + (term-insert-char ? cols))) + (when (not (eq kind 1)) ;; erase right of point + (let ((saved-point (point)) + (wrapped (and (zerop (term-horizontal-column)) + (not (zerop (term-current-column)))))) + (term-vertical-motion 1) + (delete-region saved-point (point)) + ;; wrapped is true if we're at the beginning of screen line, + ;; but not a buffer line. If we delete the current screen line + ;; that will make the previous line no longer wrap, and (because + ;; of the way Emacs display works) point will be at the end of + ;; the previous screen line rather then the beginning of the + ;; current one. To avoid that, we make sure that current line + ;; contain a space, to force the previous line to continue to wrap. + ;; We could do this always, but it seems preferable to not add the + ;; extra space when wrapped is false. + (when wrapped + (insert ? )) + (insert ?\n) + (put-text-property saved-point (point) 'face 'default) + (goto-char saved-point)))) (defun term-erase-in-display (kind) "Erases (that is blanks out) part of the window. @@ -3932,8 +3910,8 @@ inside of a \"[...]\" (see `skip-chars-forward')." (let ((limit (point)) (word (concat "[" word-chars "]")) (non-word (concat "[^" word-chars "]"))) - (if (re-search-backward non-word nil 'move) - (forward-char 1)) + (when (re-search-backward non-word nil 'move) + (forward-char 1)) ;; Anchor the search forwards. (if (or (eolp) (looking-at non-word)) nil @@ -3974,10 +3952,10 @@ completions listing is dependent on the value of `term-completion-autolist'. Returns t if successful." (interactive) - (if (term-match-partial-filename) - (prog2 (or (eq (selected-window) (minibuffer-window)) - (message "Completing file name...")) - (term-dynamic-complete-as-filename)))) + (when (term-match-partial-filename) + (prog2 (or (eq (selected-window) (minibuffer-window)) + (message "Completing file name...")) + (term-dynamic-complete-as-filename)))) (defun term-dynamic-complete-as-filename () "Dynamically complete at point as a filename. @@ -4001,7 +3979,7 @@ See `term-dynamic-complete-filename'. Returns t if successful." (message "No completions of %s" filename) (setq success nil)) ((eq completion t) ; Means already completed "file". - (if term-completion-addsuffix (insert " ")) + (when term-completion-addsuffix (insert " ")) (or mini-flag (message "Sole completion"))) ((string-equal completion "") ; Means completion on "directory/". (term-dynamic-list-filename-completions)) @@ -4066,7 +4044,7 @@ See also `term-dynamic-complete-filename'." (message "Sole completion") (insert (substring completion (length stub))) (message "Completed")) - (if term-completion-addsuffix (insert " ")) + (when term-completion-addsuffix (insert " ")) 'sole)) (t ; There's no unique completion. (let ((completion (try-completion stub candidates))) diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el index b40e021d42d..b5dc01ff9bf 100644 --- a/lisp/term/mac-win.el +++ b/lisp/term/mac-win.el @@ -84,6 +84,7 @@ (defvar mac-apple-event-map) (defvar mac-atsu-font-table) (defvar mac-font-panel-mode) +(defvar mac-ts-active-input-overlay) (defvar x-invocation-args) (defvar x-command-line-resources nil) @@ -1620,6 +1621,15 @@ in `selection-converter-alist', which see." (mac-coerce-ae-data (car type-data) (cdr type-data) type)) (cdr desc))))))) +(defun mac-ae-number (ae keyword) + (let ((type-data (mac-ae-parameter ae keyword)) + str) + (if (and type-data + (setq str (mac-coerce-ae-data (car type-data) + (cdr type-data) "TEXT"))) + (string-to-number str) + nil))) + (defun mac-bytes-to-integer (bytes &optional from to) (or from (setq from 0)) (or to (setq to (length bytes))) @@ -1635,17 +1645,6 @@ in `selection-converter-alist', which see." (ash (lsh result extended-sign-len) (- extended-sign-len)) result))) -(defun mac-bytes-to-digits (bytes &optional from to) - (or from (setq from 0)) - (or to (setq to (length bytes))) - (let ((len (- to from)) - (val 0.0)) - (dotimes (i len) - (setq val (+ (* val 256.0) - (aref bytes (+ from (if (eq (byteorder) ?B) i - (- len i 1))))))) - (format "%.0f" val))) - (defun mac-ae-selection-range (ae) ;; #pragma options align=mac68k ;; typedef struct SelectionRange { @@ -1671,13 +1670,75 @@ in `selection-converter-alist', which see." (and utf8-text (decode-coding-string utf8-text 'utf-8)))) +(defun mac-ae-text (ae) + (or (cdr (mac-ae-parameter ae nil "TEXT")) + (error "No text in Apple event."))) + +(defun mac-ae-frame (ae &optional keyword type) + (let ((bytes (cdr (mac-ae-parameter ae keyword type)))) + (if (or (null bytes) (/= (length bytes) 4)) + (error "No window reference in Apple event.") + (let ((window-id (mac-coerce-ae-data "long" bytes "TEXT")) + (rest (frame-list)) + frame) + (while (and (null frame) rest) + (if (string= (frame-parameter (car rest) 'window-id) window-id) + (setq frame (car rest))) + (setq rest (cdr rest))) + frame)))) + +(defun mac-ae-script-language (ae keyword) +;; struct WritingCode { +;; ScriptCode theScriptCode; +;; LangCode theLangCode; +;; }; + (let ((bytes (cdr (mac-ae-parameter ae keyword "intl")))) + (and bytes + (cons (mac-bytes-to-integer bytes 0 2) + (mac-bytes-to-integer bytes 2 4))))) + +(defun mac-bytes-to-text-range (bytes &optional from to) +;; struct TextRange { +;; long fStart; +;; long fEnd; +;; short fHiliteStyle; +;; }; + (or from (setq from 0)) + (or to (setq to (length bytes))) + (and (= (- to from) (+ 4 4 2)) + (list (mac-bytes-to-integer bytes from (+ from 4)) + (mac-bytes-to-integer bytes (+ from 4) (+ from 8)) + (mac-bytes-to-integer bytes (+ from 8) to)))) + +(defun mac-ae-text-range-array (ae keyword) +;; struct TextRangeArray { +;; short fNumOfRanges; +;; TextRange fRange[1]; +;; }; + (let* ((bytes (cdr (mac-ae-parameter ae keyword "tray"))) + (len (length bytes)) + nranges result) + (when (and bytes (>= len 2) + (progn + (setq nranges (mac-bytes-to-integer bytes 0 2)) + (= len (+ 2 (* nranges 10))))) + (setq result (make-vector nranges nil)) + (dotimes (i nranges) + (aset result i + (mac-bytes-to-text-range bytes (+ (* i 10) 2) + (+ (* i 10) 12))))) + result)) + (defun mac-ae-open-documents (event) "Open the documents specified by the Apple event EVENT." (interactive "e") (let ((ae (mac-event-ae event))) (dolist (file-name (mac-ae-list ae nil 'undecoded-file-name)) (if file-name - (dnd-open-local-file (concat "file:" file-name) nil))) + (dnd-open-local-file + (concat "file://" + (mapconcat 'url-hexify-string + (split-string file-name "/") "/")) nil))) (let ((selection-range (mac-ae-selection-range ae)) (search-text (mac-ae-text-for-search ae))) (cond (selection-range @@ -1695,10 +1756,6 @@ in `selection-converter-alist', which see." nil t))))) (select-frame-set-input-focus (selected-frame))) -(defun mac-ae-text (ae) - (or (cdr (mac-ae-parameter ae nil "TEXT")) - (error "No text in Apple event."))) - (defun mac-ae-get-url (event) "Open the URL specified by the Apple event EVENT. Currently the `mailto' scheme is supported." @@ -1707,7 +1764,7 @@ Currently the `mailto' scheme is supported." (parsed-url (url-generic-parse-url (mac-ae-text ae)))) (if (string= (url-type parsed-url) "mailto") (url-mailto parsed-url) - (error "Unsupported URL scheme: %s" (url-type parsed-url))))) + (mac-resume-apple-event ae t)))) (setq mac-apple-event-map (make-sparse-keymap)) @@ -1743,13 +1800,7 @@ modifiers, it changes global tool-bar visibility setting." (if (and modifiers (not (string= modifiers "\000\000\000\000"))) ;; Globally toggle tool-bar-mode if some modifier key is pressed. (tool-bar-mode) - (let ((window-id (mac-bytes-to-digits (cdr (mac-ae-parameter ae)))) - (rest (frame-list)) - frame) - (while (and (null frame) rest) - (if (string= (frame-parameter (car rest) 'window-id) window-id) - (setq frame (car rest))) - (setq rest (cdr rest))) + (let ((frame (mac-ae-frame ae))) (set-frame-parameter frame 'tool-bar-lines (if (= (frame-parameter frame 'tool-bar-lines) 0) 1 0)))))) @@ -1779,13 +1830,12 @@ With numeric ARG, display the font panel if and only if ARG is positive." "Change default face attributes according to font selection EVENT." (interactive "e") (let* ((ae (mac-event-ae event)) - (fm-font-size (cdr (mac-ae-parameter ae "fmsz"))) + (fm-font-size (mac-ae-number ae "fmsz")) (atsu-font-id (cdr (mac-ae-parameter ae "auid"))) (attribute-values (gethash atsu-font-id mac-atsu-font-table))) (if fm-font-size (setq attribute-values - `(:height ,(* 10 (mac-bytes-to-integer fm-font-size)) - ,@attribute-values))) + `(:height ,(* 10 fm-font-size) ,@attribute-values))) (apply 'set-face-attribute 'default (selected-frame) attribute-values))) ;; kEventClassFont/kEventFontPanelClosed @@ -1802,6 +1852,258 @@ With numeric ARG, display the font panel if and only if ARG is positive." ) ;; (fboundp 'mac-set-font-panel-visibility) +;;; Text Services +(defvar mac-ts-active-input-buf "" + "Byte sequence of the current Mac TSM active input area.") +(defvar mac-ts-update-active-input-area-seqno 0 + "Number of processed update-active-input-area events.") +(setq mac-ts-active-input-overlay (make-overlay 0 0)) + +(defface mac-ts-caret-position + '((t :inverse-video t)) + "Face for caret position in Mac TSM active input area. +This is used only when the active input area is displayed in the +echo area." + :group 'mac) + +(defface mac-ts-raw-text + '((t :underline t)) + "Face for raw text in Mac TSM active input area." + :group 'mac) + +(defface mac-ts-selected-raw-text + '((t :underline t)) + "Face for selected raw text in Mac TSM active input area." + :group 'mac) + +(defface mac-ts-converted-text + '((((background dark)) :underline "gray20") + (t :underline "gray80")) + "Face for converted text in Mac TSM active input area." + :group 'mac) + +(defface mac-ts-selected-converted-text + '((t :underline t)) + "Face for selected converted text in Mac TSM active input area." + :group 'mac) + +(defface mac-ts-block-fill-text + '((t :underline t)) + "Face for block fill text in Mac TSM active input area." + :group 'mac) + +(defface mac-ts-outline-text + '((t :underline t)) + "Face for outline text in Mac TSM active input area." + :group 'mac) + +(defface mac-ts-selected-text + '((t :underline t)) + "Face for selected text in Mac TSM active input area." + :group 'mac) + +(defface mac-ts-no-hilite + '((t :inherit default)) + "Face for no hilite in Mac TSM active input area." + :group 'mac) + +(defconst mac-ts-hilite-style-faces + '((2 . mac-ts-raw-text) ; kTSMHiliteRawText + (3 . mac-ts-selected-raw-text) ; kTSMHiliteSelectedRawText + (4 . mac-ts-converted-text) ; kTSMHiliteConvertedText + (5 . mac-ts-selected-converted-text) ; kTSMHiliteSelectedConvertedText + (6 . mac-ts-block-fill-text) ; kTSMHiliteBlockFillText + (7 . mac-ts-outline-text) ; kTSMHiliteOutlineText + (8 . mac-ts-selected-text) ; kTSMHiliteSelectedText + (9 . mac-ts-no-hilite)) ; kTSMHiliteNoHilite + "Alist of Mac TSM hilite style vs Emacs face.") + +(defun mac-ts-update-active-input-buf (text fix-len hilite-rng update-rng) + (let ((buf-len (length mac-ts-active-input-buf)) + confirmed) + (if (or (null update-rng) + (/= (% (length update-rng) 2) 0)) + ;; The parameter is missing (or in a bad format). The + ;; existing inline input session is completely replaced with + ;; the new text. + (setq mac-ts-active-input-buf text) + ;; Otherwise, the current subtext specified by the (2*j)-th + ;; range is replaced with the new subtext specified by the + ;; (2*j+1)-th range. + (let ((tail buf-len) + (i (length update-rng)) + segments rng) + (while (> i 0) + (setq i (- i 2)) + (setq rng (aref update-rng i)) + (if (and (<= 0 (cadr rng)) (< (cadr rng) tail) + (<= tail buf-len)) + (setq segments + (cons (substring mac-ts-active-input-buf (cadr rng) tail) + segments))) + (setq tail (car rng)) + (setq rng (aref update-rng (1+ i))) + (if (and (<= 0 (car rng)) (< (car rng) (cadr rng)) + (<= (cadr rng) (length text))) + (setq segments + (cons (substring text (car rng) (cadr rng)) + segments)))) + (if (and (< 0 tail) (<= tail buf-len)) + (setq segments + (cons (substring mac-ts-active-input-buf 0 tail) + segments))) + (setq mac-ts-active-input-buf (apply 'concat segments)))) + (setq buf-len (length mac-ts-active-input-buf)) + ;; Confirm (a part of) inline input session. + (cond ((< fix-len 0) + ;; Entire inline session is being confirmed. + (setq confirmed mac-ts-active-input-buf) + (setq mac-ts-active-input-buf "")) + ((= fix-len 0) + ;; None of the text is being confirmed (yet). + (setq confirmed "")) + (t + (if (> fix-len buf-len) + (setq fix-len buf-len)) + (setq confirmed (substring mac-ts-active-input-buf 0 fix-len)) + (setq mac-ts-active-input-buf + (substring mac-ts-active-input-buf fix-len)))) + (setq buf-len (length mac-ts-active-input-buf)) + ;; Update highlighting and the caret position in the new inline + ;; input session. + (remove-text-properties 0 buf-len '(cursor nil) mac-ts-active-input-buf) + (mapc (lambda (rng) + (cond ((and (= (nth 2 rng) 1) ; kTSMHiliteCaretPosition + (<= 0 (car rng)) (< (car rng) buf-len)) + (put-text-property (car rng) buf-len + 'cursor t mac-ts-active-input-buf)) + ((and (<= 0 (car rng)) (< (car rng) (cadr rng)) + (<= (cadr rng) buf-len)) + (put-text-property (car rng) (cadr rng) 'face + (cdr (assq (nth 2 rng) + mac-ts-hilite-style-faces)) + mac-ts-active-input-buf)))) + hilite-rng) + confirmed)) + +(defun mac-split-string-by-property-change (string) + (let ((tail (length string)) + head result) + (unless (= tail 0) + (while (setq head (previous-property-change tail string) + result (cons (substring string (or head 0) tail) result) + tail head))) + result)) + +(defun mac-replace-untranslated-utf-8-chars (string &optional to-string) + (or to-string (setq to-string "$,3u=(B")) + (mapconcat + (lambda (str) + (if (get-text-property 0 'untranslated-utf-8 str) to-string str)) + (mac-split-string-by-property-change string) + "")) + +(defun mac-ts-update-active-input-area (event) + "Update Mac TSM active input area according to EVENT. +The confirmed text is converted to Emacs input events and pushed +into `unread-command-events'. The unconfirmed text is displayed +either in the current buffer or in the echo area." + (interactive "e") + (let* ((ae (mac-event-ae event)) + (text (or (cdr (mac-ae-parameter ae "tstx" "utxt")) "")) + (script-language (mac-ae-script-language ae "tssl")) + (coding (or (cdr (assq (car script-language) + mac-script-code-coding-systems)) + 'mac-roman)) + (fix-len (mac-bytes-to-integer + (cdr (mac-ae-parameter ae "tsfx" "long")))) + ;; Optional parameters + (hilite-rng (mac-ae-text-range-array ae "tshi")) + (update-rng (mac-ae-text-range-array ae "tsup")) + ;;(pin-rng (mac-bytes-to-text-range (cdr (mac-ae-parameter ae "tspn" "txrn")))) + ;;(clause-offsets (cdr (mac-ae-parameter ae "tscl" "ofay"))) + (seqno (mac-ae-number ae "tsSn")) + confirmed) + (unless (= seqno mac-ts-update-active-input-area-seqno) + ;; Reset internal states if sequence number is out of sync. + (setq mac-ts-active-input-buf "")) + (setq confirmed + (mac-ts-update-active-input-buf text fix-len hilite-rng update-rng)) + (let ((use-echo-area + (or isearch-mode + (and cursor-in-echo-area (current-message)) + ;; Overlay strings are not shown in some cases. + (get-char-property (point) 'display) + (get-char-property (point) 'invisible) + (get-char-property (point) 'composition))) + active-input-string caret-seen) + ;; Decode the active input area text with inheriting faces and + ;; the caret position. + (setq active-input-string + (mapconcat + (lambda (str) + (let ((decoded (mac-utxt-to-string str coding))) + (put-text-property 0 (length decoded) 'face + (get-text-property 0 'face str) decoded) + (when (and (not caret-seen) + (get-text-property 0 'cursor str)) + (setq caret-seen t) + (if use-echo-area + (put-text-property 0 1 'face 'mac-ts-caret-position + decoded) + (put-text-property 0 1 'cursor t decoded))) + decoded)) + (mac-split-string-by-property-change mac-ts-active-input-buf) + "")) + (put-text-property 0 (length active-input-string) + 'mac-ts-active-input-string t active-input-string) + (if use-echo-area + (let (msg message-log-max) + (if (and (current-message) + ;; Don't get confused by previously displayed + ;; `active-input-string'. + (null (get-text-property 0 'mac-ts-active-input-string + (current-message)))) + (setq msg (propertize (current-message) 'display + (concat (current-message) + active-input-string))) + (setq msg active-input-string)) + (message "%s" msg) + (overlay-put mac-ts-active-input-overlay 'before-string nil)) + (move-overlay mac-ts-active-input-overlay + (point) (point) (current-buffer)) + (overlay-put mac-ts-active-input-overlay 'before-string + active-input-string)) + ;; Unread confirmed characters and insert them in a keyboard + ;; macro being defined. + (apply 'isearch-unread + (append (mac-replace-untranslated-utf-8-chars + (mac-utxt-to-string confirmed coding)) '()))) + ;; The event is successfully processed. Sync the sequence number. + (setq mac-ts-update-active-input-area-seqno (1+ seqno)))) + +(defun mac-ts-unicode-for-key-event (event) + "Convert Unicode key EVENT to Emacs key events and unread them." + (interactive "e") + (let* ((ae (mac-event-ae event)) + (text (cdr (mac-ae-parameter ae "tstx" "utxt"))) + (script-language (mac-ae-script-language ae "tssl")) + (coding (or (cdr (assq (car script-language) + mac-script-code-coding-systems)) + 'mac-roman))) + ;; Unread characters and insert them in a keyboard macro being + ;; defined. + (apply 'isearch-unread + (append (mac-replace-untranslated-utf-8-chars + (mac-utxt-to-string text coding)) '())))) + +;; kEventClassTextInput/kEventTextInputUpdateActiveInputArea +(define-key mac-apple-event-map [text-input update-active-input-area] + 'mac-ts-update-active-input-area) +;; kEventClassTextInput/kEventTextInputUnicodeForKeyEvent +(define-key mac-apple-event-map [text-input unicode-for-key-event] + 'mac-ts-unicode-for-key-event) + ;;; Services (defun mac-service-open-file () "Open the file specified by the selection value for Services." @@ -1857,9 +2159,9 @@ With numeric ARG, display the font panel if and only if ARG is positive." "Dispatch EVENT according to the keymap `mac-apple-event-map'." (interactive "e") (let* ((binding (lookup-key mac-apple-event-map (mac-event-spec event))) - (service-message - (and (keymapp binding) - (cdr (mac-ae-parameter (mac-event-ae event) "svmg"))))) + (ae (mac-event-ae event)) + (service-message (and (keymapp binding) + (cdr (mac-ae-parameter ae "svmg"))))) (when service-message (setq service-message (intern (decode-coding-string service-message 'utf-8))) @@ -1867,9 +2169,18 @@ With numeric ARG, display the font panel if and only if ARG is positive." ;; Replace (cadr event) with a dummy position so that event-start ;; returns it. (setcar (cdr event) (list (selected-window) (point) '(0 . 0) 0)) - (call-interactively binding))) + (if (null (mac-ae-parameter ae 'emacs-suspension-id)) + (command-execute binding nil (vector event) t) + (condition-case err + (progn + (command-execute binding nil (vector event) t) + (mac-resume-apple-event ae)) + (error + (mac-ae-set-reply-parameter ae "errs" + (cons "TEXT" (error-message-string err))) + (mac-resume-apple-event ae -10000)))))) ; errAEEventFailed -(global-set-key [mac-apple-event] 'mac-dispatch-apple-event) +(define-key special-event-map [mac-apple-event] 'mac-dispatch-apple-event) ;; Processing of Apple events are deferred at the startup time. For ;; example, files dropped onto the Emacs application icon can only be @@ -1877,6 +2188,8 @@ With numeric ARG, display the font panel if and only if ARG is positive." ;; the files should be opened. (add-hook 'after-init-hook 'mac-process-deferred-apple-events) +(run-with-idle-timer 5 t 'mac-cleanup-expired-apple-events) + ;;;; Drag and drop diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el index 6061c3eb0dc..f3c32011349 100644 --- a/lisp/term/w32-win.el +++ b/lisp/term/w32-win.el @@ -112,6 +112,14 @@ Switch to a buffer editing the last file dropped." (if (and (> x 0) (> y 0)) (set-frame-selected-window nil window)) (mapcar (lambda (file-name) + (let ((f (subst-char-in-string ?\\ ?/ file-name)) + (coding (or file-name-coding-system + default-file-name-coding-system))) + (setq file-name + (mapconcat 'url-hexify-string + (split-string (encode-coding-string f coding) + "/") + "/"))) (dnd-handle-one-url window 'private (concat "file:" file-name))) (car (cdr (cdr event))))) diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el index 5bc93b47fe9..c6b3c4d1ba3 100644 --- a/lisp/term/x-win.el +++ b/lisp/term/x-win.el @@ -2495,5 +2495,9 @@ order until succeed.") (add-hook 'after-make-frame-functions 'x-dnd-init-frame) (global-set-key [drag-n-drop] 'x-dnd-handle-drag-n-drop-event) +;; Let F10 do menu bar navigation. +(and (fboundp 'menu-bar-open) + (global-set-key [f10] 'menu-bar-open)) + ;; arch-tag: f1501302-db8b-4d95-88e3-116697d89f78 ;;; x-win.el ends here diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el index 9305bdbf9bc..d5dcdd0d9ef 100644 --- a/lisp/textmodes/artist.el +++ b/lisp/textmodes/artist.el @@ -365,10 +365,11 @@ Example: "*If in X Windows, use this pointer shape while drawing with the mouse.") -(defcustom artist-text-renderer 'artist-figlet +(defcustom artist-text-renderer-function 'artist-figlet "Function for doing text rendering." :group 'artist-text :type 'symbol) +(defvaralias 'artist-text-renderer 'artist-text-renderer-function) (defcustom artist-figlet-program "figlet" @@ -2910,23 +2911,25 @@ Let blanks in TEXT overwrite any text already in the buffer." (defun artist-text-see-thru (x y) "Prompt for text to render, render it at X,Y. -This is done by calling the function specified by `artist-text-renderer', -which must return a list of strings, to be inserted in the buffer. +This is done by calling the function specified by +`artist-text-renderer-function', which must return a list of strings, +to be inserted in the buffer. Text already in the buffer ``shines thru'' blanks in the rendered text." (let* ((input-text (read-string "Type text to render: ")) - (rendered-text (artist-funcall artist-text-renderer input-text))) + (rendered-text (artist-funcall artist-text-renderer-function input-text))) (artist-text-insert-see-thru x y rendered-text))) (defun artist-text-overwrite (x y) "Prompt for text to render, render it at X,Y. -This is done by calling the function specified by `artist-text-renderer', -which must return a list of strings, to be inserted in the buffer. +This is done by calling the function specified by +`artist-text-renderer-function', which must return a list of strings, +to be inserted in the buffer. Blanks in the rendered text overwrites any text in the buffer." (let* ((input-text (read-string "Type text to render: ")) - (rendered-text (artist-funcall artist-text-renderer input-text))) + (rendered-text (artist-funcall artist-text-renderer-function input-text))) (artist-text-insert-overwrite x y rendered-text))) ;; diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el index e4f0a3db545..c82f2dcf3d0 100644 --- a/lisp/textmodes/bibtex.el +++ b/lisp/textmodes/bibtex.el @@ -87,7 +87,7 @@ If this is a function, call it to generate the initial field text." :type '(choice (const :tag "None" nil) (string :tag "Initial text") (function :tag "Initialize Function" :value fun) - (other :tag "Default" t))) + (const :tag "Default" t))) (put 'bibtex-include-OPTkey 'risky-local-variable t) (defcustom bibtex-user-optional-fields @@ -153,7 +153,7 @@ narrowed to just the entry." (defcustom bibtex-maintain-sorted-entries nil "If non-nil, BibTeX mode maintains all entries in sorted order. Allowed non-nil values are: -plain All entries are sorted alphabetically. +plain or t All entries are sorted alphabetically. crossref All entries are sorted alphabetically unless an entry has a crossref field. These crossrefed entries are placed in alphabetical order immediately preceding the main entry. @@ -165,7 +165,10 @@ See also `bibtex-sort-ignore-string-entries'." :type '(choice (const nil) (const plain) (const crossref) - (const entry-class))) + (const entry-class) + (const t))) +(put 'bibtex-maintain-sorted-entries 'safe-local-variable + '(lambda (a) (memq a '(nil t plain crossref entry-class)))) (defcustom bibtex-sort-entry-class '(("String") @@ -180,6 +183,17 @@ to all entries not explicitly mentioned." :type '(repeat (choice :tag "Class" (const :tag "catch-all" (catch-all)) (repeat :tag "Entry name" string)))) +(put 'bibtex-sort-entry-class 'safe-local-variable + (lambda (x) (let ((OK t)) + (while (consp x) + (let ((y (pop x))) + (while (consp y) + (let ((z (pop y))) + (unless (or (stringp z) (eq z 'catch-all)) + (setq OK nil)))) + (unless (null y) (setq OK nil)))) + (unless (null x) (setq OK nil)) + OK))) (defcustom bibtex-sort-ignore-string-entries t "If non-nil, BibTeX @String entries are not sort-significant. @@ -607,6 +621,8 @@ See `bibtex-generate-autokey' for details." (const :tag "Capitalize" capitalize) (const :tag "Upcase" upcase) (function :tag "Conversion function"))) +(put 'bibtex-autokey-name-case-convert-function 'safe-local-variable + (lambda (x) (memq x '(upcase downcase capitalize identity)))) (defvaralias 'bibtex-autokey-name-case-convert 'bibtex-autokey-name-case-convert-function) @@ -1185,13 +1201,7 @@ The CDRs of the elements are t for header keys and nil for crossref keys.") (defvar bibtex-string-empty-key nil "If non-nil, `bibtex-parse-string' accepts empty key.") -(defvar bibtex-sort-entry-class-alist - (let ((i -1) alist) - (dolist (class bibtex-sort-entry-class alist) - (setq i (1+ i)) - (dolist (entry class) - ;; all entry names should be downcase (for ease of comparison) - (push (cons (if (stringp entry) (downcase entry) entry) i) alist)))) +(defvar bibtex-sort-entry-class-alist nil "Alist mapping entry types to their sorting index. Auto-generated from `bibtex-sort-entry-class'. Used when `bibtex-maintain-sorted-entries' is `entry-class'.") @@ -1800,7 +1810,8 @@ Formats current entry according to variable `bibtex-entry-format'." ;; identify entry type (goto-char (point-min)) - (re-search-forward bibtex-entry-type) + (or (re-search-forward bibtex-entry-type nil t) + (error "Not inside a BibTeX entry")) (let ((beg-type (1+ (match-beginning 0))) (end-type (match-end 0))) (setq entry-list (assoc-string (buffer-substring-no-properties @@ -3184,6 +3195,17 @@ of the head of the entry found. Return nil if no entry found." entry-name)) (list key nil entry-name)))))) +(defun bibtex-init-sort-entry-class-alist () + (unless (local-variable-p 'bibtex-sort-entry-class-alist) + (set (make-local-variable 'bibtex-sort-entry-class-alist) + (let ((i -1) alist) + (dolist (class bibtex-sort-entry-class alist) + (setq i (1+ i)) + (dolist (entry class) + ;; All entry names should be downcase (for ease of comparison). + (push (cons (if (stringp entry) (downcase entry) entry) i) + alist))))))) + (defun bibtex-lessp (index1 index2) "Predicate for sorting BibTeX entries with indices INDEX1 and INDEX2. Each index is a list (KEY CROSSREF-KEY ENTRY-NAME). @@ -3221,13 +3243,14 @@ If its value is nil use plain sorting. Text outside of BibTeX entries is not affected. If `bibtex-sort-ignore-string-entries' is non-nil, @String entries are ignored." (interactive) - (bibtex-beginning-of-first-entry) ;; needed by `sort-subr' - (sort-subr nil - 'bibtex-skip-to-valid-entry ; NEXTREC function - 'bibtex-end-of-entry ; ENDREC function - 'bibtex-entry-index ; STARTKEY function - nil ; ENDKEY function - 'bibtex-lessp)) ; PREDICATE + (bibtex-beginning-of-first-entry) ; Needed by `sort-subr' + (bibtex-init-sort-entry-class-alist) ; Needed by `bibtex-lessp'. + (sort-subr nil + 'bibtex-skip-to-valid-entry ; NEXTREC function + 'bibtex-end-of-entry ; ENDREC function + 'bibtex-entry-index ; STARTKEY function + nil ; ENDKEY function + 'bibtex-lessp)) ; PREDICATE (defun bibtex-find-crossref (crossref-key &optional pnt split) "Move point to the beginning of BibTeX entry CROSSREF-KEY. @@ -3328,6 +3351,7 @@ If `bibtex-maintain-sorted-entries' is non-nil, perform a binary search to look for place for KEY. This requires that buffer is sorted, see `bibtex-validate'. Return t if preparation was successful or nil if entry KEY already exists." + (bibtex-init-sort-entry-class-alist) ; Needed by `bibtex-lessp'. (let ((key (nth 0 index)) key-exist) (cond ((or (null key) @@ -3876,7 +3900,8 @@ At end of the cleaning process, the functions in (interactive "P") (let ((case-fold-search t) (start (bibtex-beginning-of-entry)) - (_ (looking-at bibtex-any-entry-maybe-empty-head)) + (_ (or (looking-at bibtex-any-entry-maybe-empty-head) + (error "Not inside a BibTeX entry"))) (entry-type (bibtex-type-in-head)) (key (bibtex-key-in-head))) ;; formatting diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el index 54b67a258a6..23f4756f4a7 100644 --- a/lisp/textmodes/flyspell.el +++ b/lisp/textmodes/flyspell.el @@ -271,21 +271,23 @@ If `flyspell-large-region' is nil, all regions are treated as small." ;;* using flyspell with mail-mode add the following expression */ ;;* in your .emacs file: */ ;;* (add-hook 'mail-mode */ -;;* '(lambda () (setq flyspell-generic-check-word-p */ -;;* 'mail-mode-flyspell-verify))) */ +;;* '(lambda () (setq flyspell-generic-check-word-predicate */ +;;* 'mail-mode-flyspell-verify))) */ ;;*---------------------------------------------------------------------*/ -(defvar flyspell-generic-check-word-p nil +(defvar flyspell-generic-check-word-predicate nil "Function providing per-mode customization over which words are flyspelled. Returns t to continue checking, nil otherwise. Flyspell mode sets this variable to whatever is the `flyspell-mode-predicate' property of the major mode name.") -(make-variable-buffer-local 'flyspell-generic-check-word-p) +(make-variable-buffer-local 'flyspell-generic-check-word-predicate) +(defvaralias 'flyspell-generic-check-word-p + 'flyspell-generic-check-word-predicate) ;;*--- mail mode -------------------------------------------------------*/ (put 'mail-mode 'flyspell-mode-predicate 'mail-mode-flyspell-verify) (put 'message-mode 'flyspell-mode-predicate 'mail-mode-flyspell-verify) (defun mail-mode-flyspell-verify () - "This function is used for `flyspell-generic-check-word-p' in Mail mode." + "Function used for `flyspell-generic-check-word-predicate' in Mail mode." (let ((header-end (save-excursion (goto-char (point-min)) (re-search-forward @@ -313,7 +315,7 @@ property of the major mode name.") ;;*--- texinfo mode ----------------------------------------------------*/ (put 'texinfo-mode 'flyspell-mode-predicate 'texinfo-mode-flyspell-verify) (defun texinfo-mode-flyspell-verify () - "This function is used for `flyspell-generic-check-word-p' in Texinfo mode." + "Function used for `flyspell-generic-check-word-predicate' in Texinfo mode." (save-excursion (forward-word -1) (not (looking-at "@")))) @@ -321,7 +323,7 @@ property of the major mode name.") ;;*--- tex mode --------------------------------------------------------*/ (put 'tex-mode 'flyspell-mode-predicate 'tex-mode-flyspell-verify) (defun tex-mode-flyspell-verify () - "This function is used for `flyspell-generic-check-word-p' in LaTeX mode." + "Function used for `flyspell-generic-check-word-predicate' in LaTeX mode." (and (not (save-excursion (re-search-backward "^[ \t]*%%%[ \t]+Local" nil t))) @@ -338,7 +340,7 @@ property of the major mode name.") (put 'html-mode 'flyspell-mode-predicate 'sgml-mode-flyspell-verify) (defun sgml-mode-flyspell-verify () - "This function is used for `flyspell-generic-check-word-p' in SGML mode." + "Function used for `flyspell-generic-check-word-predicate' in SGML mode." (not (save-excursion (let ((this (point-marker)) (s (progn (beginning-of-line) (point-marker))) @@ -368,7 +370,7 @@ property of the major mode name.") "Faces corresponding to text in programming-mode buffers.") (defun flyspell-generic-progmode-verify () - "Used for `flyspell-generic-check-word-p' in programming modes." + "Used for `flyspell-generic-check-word-predicate' in programming modes." (let ((f (get-text-property (point) 'face))) (memq f flyspell-prog-text-faces))) @@ -376,7 +378,8 @@ property of the major mode name.") (defun flyspell-prog-mode () "Turn on `flyspell-mode' for comments and strings." (interactive) - (setq flyspell-generic-check-word-p 'flyspell-generic-progmode-verify) + (setq flyspell-generic-check-word-predicate + 'flyspell-generic-progmode-verify) (flyspell-mode 1) (run-hooks 'flyspell-prog-mode-hook)) @@ -483,6 +486,18 @@ in your .emacs file. (flyspell-mode-on) (flyspell-mode-off))) +;;;###autoload +(defun turn-on-flyspell () + "Unconditionally turn on Flyspell mode." + (flyspell-mode 1)) + +;;;###autoload +(defun turn-off-flyspell () + "Unconditionally turn off Flyspell mode." + (flyspell-mode -1)) + +(custom-add-option 'text-mode-hook 'turn-on-flyspell) + ;;*---------------------------------------------------------------------*/ ;;* flyspell-buffers ... */ ;;* ------------------------------------------------------------- */ @@ -563,10 +578,10 @@ in your .emacs file. (add-hook 'pre-command-hook (function flyspell-pre-command-hook) t t) ;; we bound flyspell action to after-change hook (add-hook 'after-change-functions 'flyspell-after-change-function nil t) - ;; set flyspell-generic-check-word-p based on the major mode + ;; set flyspell-generic-check-word-predicate based on the major mode (let ((mode-predicate (get major-mode 'flyspell-mode-predicate))) (if mode-predicate - (setq flyspell-generic-check-word-p mode-predicate))) + (setq flyspell-generic-check-word-predicate mode-predicate))) ;; the welcome message (if (and flyspell-issue-message-flag flyspell-issue-welcome-flag @@ -979,8 +994,8 @@ Mostly we check word delimiters." (flyspell-word (flyspell-get-word following)) start end poss word) (if (or (eq flyspell-word nil) - (and (fboundp flyspell-generic-check-word-p) - (not (funcall flyspell-generic-check-word-p)))) + (and (fboundp flyspell-generic-check-word-predicate) + (not (funcall flyspell-generic-check-word-predicate)))) t (progn ;; destructure return flyspell-word info list. diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el index 5629e8feb31..00a757d68bd 100644 --- a/lisp/textmodes/ispell.el +++ b/lisp/textmodes/ispell.el @@ -416,11 +416,12 @@ The following values are supported: :type 'boolean :group 'ispell) -(defcustom ispell-format-word (function upcase) +(defcustom ispell-format-word-function (function upcase) "*Formatting function for displaying word being spell checked. The function must take one string argument and return a string." :type 'function :group 'ispell) +(defvaralias 'ispell-format-word 'ispell-format-word-function) (defcustom ispell-use-framepop-p nil "When non-nil ispell uses framepop to display choices in a dedicated frame. @@ -1565,7 +1566,7 @@ quit spell session exited." ;; But that is silly; if the user asks for it, we should do it. - rms. (or quietly (message "Checking spelling of %s..." - (funcall ispell-format-word word))) + (funcall ispell-format-word-function word))) (ispell-send-string "%\n") ; put in verbose mode (ispell-send-string (concat "^" word "\n")) ;; wait until ispell has processed word @@ -1581,7 +1582,7 @@ quit spell session exited." (cond ((eq poss t) (or quietly (message "%s is correct" - (funcall ispell-format-word word))) + (funcall ispell-format-word-function word))) (and (fboundp 'extent-at) (extent-at start) (and (fboundp 'delete-extent) @@ -1589,8 +1590,8 @@ quit spell session exited." ((stringp poss) (or quietly (message "%s is correct because of root %s" - (funcall ispell-format-word word) - (funcall ispell-format-word poss))) + (funcall ispell-format-word-function word) + (funcall ispell-format-word-function poss))) (and (fboundp 'extent-at) (extent-at start) (and (fboundp 'delete-extent) @@ -1603,7 +1604,8 @@ quit spell session exited." (set-extent-property ext 'face ispell-highlight-face) (set-extent-property ext 'priority 2000))) (beep) - (message "%s is incorrect"(funcall ispell-format-word word)))) + (message "%s is incorrect" + (funcall ispell-format-word-function word)))) (t ; prompt for correct word. (save-window-excursion (setq replace (ispell-command-loop @@ -3329,6 +3331,7 @@ Don't read buffer-local settings or word lists." "*End of text which will be checked in `ispell-message'. If it is a string, limit at first occurrence of that regular expression. Otherwise, it must be a function which is called to get the limit.") +(put 'ispell-message-text-end 'risky-local-variable t) (defun ispell-mime-multipartp (&optional limit) diff --git a/lisp/textmodes/org.el b/lisp/textmodes/org.el index ea9aa4448ee..853c28f5565 100644 --- a/lisp/textmodes/org.el +++ b/lisp/textmodes/org.el @@ -5,7 +5,7 @@ ;; Author: Carsten Dominik <dominik at science dot uva dot nl> ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://www.astro.uva.nl/~dominik/Tools/org/ -;; Version: 4.26 +;; Version: 4.36 ;; ;; This file is part of GNU Emacs. ;; @@ -30,16 +30,21 @@ ;; Org-mode is a mode for keeping notes, maintaining ToDo lists, and doing ;; project planning with a fast and effective plain-text system. ;; -;; Org-mode develops organizational tasks around a NOTES file that contains -;; information about projects as plain text. Org-mode is implemented on top -;; of outline-mode - ideal to keep the content of large files well structured. -;; It supports ToDo items, deadlines and time stamps, which can be extracted -;; to create a daily/weekly agenda that also integrates the diary of the Emacs -;; calendar. Tables are easily created with a built-in table editor. Plain -;; text URL-like links connect to websites, emails (VM, RMAIL, WANDERLUST), -;; Usenet messages (Gnus), BBDB entries, and any files related to the -;; projects. For printing and sharing of notes, an Org-mode file (or a part -;; of it) can be exported as a structured ASCII file, or as HTML. +;; Org-mode develops organizational tasks around NOTES files that contain +;; information about projects as plain text. Org-mode is implemented on +;; top of outline-mode, which makes it possible to keep the content of +;; large files well structured. Visibility cycling and structure editing +;; help to work with the tree. Tables are easily created with a built-in +;; table editor. Org-mode supports ToDo items, deadlines, time stamps, +;; and scheduling. It dynamically compiles entries into an agenda that +;; utilizes and smoothly integrates much of the Emacs calendar and diary. +;; Plain text URL-like links connect to websites, emails, Usenet +;; messages, BBDB entries, and any files related to the projects. For +;; printing and sharing of notes, an Org-mode file can be exported as a +;; structured ASCII file, as HTML, or (todo and agenda items only) as an +;; iCalendar file. It can also serve as a publishing tool for a set of +;; linked webpages. +;; ;; ;; Installation ;; ------------ @@ -52,19 +57,23 @@ ;; (define-key global-map "\C-cl" 'org-store-link) ;; (define-key global-map "\C-ca" 'org-agenda) ;; -;; If you have downloaded Org-mode from the Web, you must byte-compile -;; org.el and put it on your load path. In addition to the Emacs Lisp -;; lines above, you also need to add the following lines to .emacs: +;; Furthermore you need to activate font-lock-mode in org-mode buffers. +;; either of the following two lins will do the trick: +;; +;; (global-font-lock-mode 1) ; for all buffers +;; (add-hook 'org-mode-hook 'turn-on-font-lock) ; org-mode buffers only +;; +;; If you have downloaded Org-mode from the Web, you have to take additional +;; action: Byte-compile org.el and org-publish.el and put them together with +;; org-install.el on your load path. Then also add to your .emacs file: +;; +;; (require 'org-install) ;; -;; (autoload 'org-mode "org" "Org mode" t) -;; (autoload 'org-diary "org" "Diary entries from Org mode") -;; (autoload 'org-agenda "org" "Multi-file agenda from Org mode" t) -;; (autoload 'org-store-link "org" "Store a link to the current location" t) -;; (autoload 'orgtbl-mode "org" "Org tables as a minor mode" t) -;; (autoload 'turn-on-orgtbl "org" "Org tables as a minor mode") ;; -;; This setup will put all files with extension ".org" into Org-mode. As -;; an alternative, make the first line of a file look like this: +;; Activation +;; ---------- +;; The setup above will put all files with extension ".org" into Org-mode. +;; As an alternative, make the first line of a file look like this: ;; ;; MY PROJECTS -*- mode: org; -*- ;; @@ -79,48 +88,78 @@ ;; excellent reference card made by Philip Rooke. This card can be found ;; in the etc/ directory of Emacs 22. ;; -;; Changes since version 4.10: -;; --------------------------- -;; Version 4.26 +;; Recent changes +;; -------------- +;; Version 4.36 +;; - Improved indentation of ASCII export, when headlines become items. +;; - Handling of 12am and 12pm fixed. Times beyond 24:00 can be used +;; and will not lead to conflicts. +;; - Support for mutually exclusive TAGS with the fast tags interface. ;; - Bug fixes. ;; -;; Version 4.25 -;; - Revision of the font-lock faces section, with better tty support. -;; - TODO keywords in Agenda buffer are fontified. -;; - Export converts links between .org files to links between .html files. -;; - Better support for bold/italic/underline emphasis. +;; Version 4.35 +;; - HTML export is now valid XHTML. +;; - Timeline can also show dates without entries. See new option +;; `org-timeline-show-empty-dates'. +;; - The bullets created by the ASCII exporter can now be configured. +;; See the new option `org-export-ascii-bullets'. +;; - New face `org-upcoming-deadline' (was `org-scheduled-previously'). +;; - New function `org-context' to allow testing for local context. ;; -;; Version 4.24 +;; Version 4.34 ;; - Bug fixes. ;; -;; Version 4.23 -;; - Bug fixes. +;; Version 4.33 +;; - New commands to move through plain lists: S-up and S-down. +;; - Bug fixes and documentation update. ;; -;; Version 4.22 +;; Version 4.32 +;; - Fast (single-key-per-tag) interface for setting TAGS. +;; - The list of legal tags can be configured globally and locally. +;; - Elisp and Info links (thanks to Todd Neal). +;; - `org-export-publishing-directory' can be an alist, with different +;; directories for different export types. +;; - All context-sensitive commands use `call-interactively' to dispatch. +;; - `org-confirm-shell-links' renamed to `org-confirm-shell-link-function'. ;; - Bug fixes. -;; - In agenda buffer, mouse-1 no longer follows link. -;; See `org-agenda-mouse-1-follows-link' and `org-mouse-1-follows-link'. -;; -;; Version 4.20 -;; - Links use now the [[link][description]] format by default. -;; When inserting links, the user is prompted for a description. -;; - If a link has a description, only the description is displayed -;; the link part is hidden. Use C-c C-l to edit the link part. -;; - TAGS are now bold, but in the same color as the headline. -;; - The width of a table column can be limited by using a field "<N>". -;; - New structure for the customization tree. +;; +;; Version 4.31 ;; - Bug fixes. ;; -;; Version 4.13 -;; - The list of agenda files can be maintainted in an external file. +;; Version 4.30 +;; - Modified installation: Autoloads have been collected in org-install.el. +;; - Logging (org-log-done) is now a #+STARTUP option. +;; - Checkboxes in plain list items, following up on Frank Ruell's idea. +;; - File links inserted with C-c C-l will use relative paths if the linked +;; file is in the current directory or a subdirectory of it. +;; - New variable `org-link-file-path-type' to specify preference for +;; relative and absolute paths. +;; - New CSS classes for tags, timestamps, timestamp keywords. +;; - Bug and typo fixes. +;; +;; Version 4.29 +;; - Inlining images in HTML export now depends on wheather the link +;; contains a description or not. +;; - TODO items can be scheduled from the global TODO list using C-c C-s. +;; - TODO items already scheduled can be made to disappear from the global +;; todo list, see `org-agenda-todo-ignore-scheduled'. +;; - In Tables, formulas may also be Lisp forms. +;; - Exporting the visible part of an outline with `C-c C-x v' works now +;; for all available exporters. +;; - Bug fixes, lots of them :-( +;; +;; Version 4.28 ;; - Bug fixes. ;; -;; Version 4.12 -;; - Templates for remember buffer. Note that the remember setup changes. -;; To set up templates, see `org-remember-templates'. -;; - The time in new time stamps can be rounded, see new option -;; `org-time-stamp-rounding-minutes'. -;; - Bug fixes (there are *always* more bugs). +;; Version 4.27 +;; - HTML exporter generalized to receive external options. +;; As part of the process, author, email and date have been moved to the +;; end of the HTML file. +;; - Support for customizable file search in file links. +;; - BibTeX database links as first application of the above. +;; - New option `org-agenda-todo-list-sublevels' to turn off listing TODO +;; entries that are sublevels of another TODO entry. +;; ;; ;;; Code: @@ -131,13 +170,9 @@ (require 'time-date) (require 'easymenu) -(defvar calc-embedded-close-formula) ; defined by the calc package -(defvar calc-embedded-open-formula) ; defined by the calc package -(defvar font-lock-unfontify-region-function) ; defined by font-lock.el - ;;; Customization variables -(defvar org-version "4.26" +(defvar org-version "4.36" "The version number of the file org.el.") (defun org-version () (interactive) @@ -325,14 +360,30 @@ An entry can be toggled between QUOTE and normal with :tag "Org Cycle" :group 'org-structure) +(defcustom org-cycle-global-at-bob t + "Cycle globally if cursor is at beginning of buffer and not at a headline. +This makes it possible to do global cycling without having to use S-TAB or +C-u TAB. For this special case to work, the first line of the buffer +must not be a headline - it may be empty ot some other text. When used in +this way, `org-cycle-hook' is disables temporarily, to make sure the +cursor stays at the beginning of the buffer. +When this option is nil, don't do anything special at the beginning +of the buffer." + :group 'org-cycle + :type 'boolean) + (defcustom org-cycle-emulate-tab t "Where should `org-cycle' emulate TAB. -nil Never -white Only in completely white lines -t Everywhere except in headlines" +nil Never +white Only in completely white lines +whitestart Only at the beginning of lines, before the first non-white char. +t Everywhere except in headlines +If TAB is used in a place where it does not emulate TAB, the current subtree +visibility is cycled." :group 'org-cycle :type '(choice (const :tag "Never" nil) (const :tag "Only in completely white lines" white) + (const :tag "Before first char in a line" whitestart) (const :tag "Everywhere except in headlines" t) )) @@ -376,6 +427,11 @@ body starts at column 0, indentation is not changed at all." :group 'org-edit-structure :type 'boolean) +(defcustom org-insert-heading-hook nil + "Hook being run after inserting a new heading." + :group 'org-edit-structure + :type 'boolean) + (defcustom org-enable-fixed-width-editor t "Non-nil means, lines starting with \":\" are treated as fixed-width. This currently only means, they are never auto-wrapped. @@ -756,6 +812,23 @@ additional URL: prefix, so the format would be \"<URL:%s>\"." (const :tag "\"<URL:%s>\" (e.g. <URL:http://www.there.com>)" "<URL:%s>") (string :tag "Other" :value "<%s>"))) +(defcustom org-link-file-path-type 'adaptive + "How the path name in file links should be stored. +Valid values are: + +relative relative to the current directory, i.e. the directory of the file + into which the link is being inserted. +absolute absolute path, if possible with ~ for home directory. +noabbrev absolute path, no abbreviation of home directory. +adaptive Use relative path for files in the current directory and sub- + directories of it. For other files, use an absolute path." + :group 'org-link + :type '(choice + (const relative) + (const absolute) + (const noabbrev) + (const adaptive))) + (defcustom org-activate-links '(bracket angle plain radio tag date) "Types of links that should be activated in Org-mode files. This is a list of symbols, each leading to the activation of a certain link @@ -898,15 +971,32 @@ When nil, an error will be generated." :group 'org-link-follow :type 'boolean) -(defcustom org-confirm-shell-links 'yes-or-no-p +(defcustom org-confirm-shell-link-function 'yes-or-no-p "Non-nil means, ask for confirmation before executing shell links. Shell links can be dangerous, just thing about a link [[shell:rm -rf ~/*][Google Search]] This link would show up in your Org-mode document as \"Google Search\" -but really it would remove your entire home directory. Dangerous indeed. -Therefore I *definitely* advise agains setting this varaiable to nil. +but really it would remove your entire home directory. +Therefore I *definitely* advise against setting this variable to nil. +Just change it to `y-or-n-p' of you want to confirm with a single key press +rather than having to type \"yes\"." + :group 'org-link-follow + :type '(choice + (const :tag "with yes-or-no (safer)" yes-or-no-p) + (const :tag "with y-or-n (faster)" y-or-n-p) + (const :tag "no confirmation (dangerous)" nil))) + +(defcustom org-confirm-elisp-link-function 'yes-or-no-p + "Non-nil means, ask for confirmation before executing elisp links. +Elisp links can be dangerous, just thing about a link + + [[elisp:(shell-command \"rm -rf ~/*\")][Google Search]] + +This link would show up in your Org-mode document as \"Google Search\" +but really it would remove your entire home directory. +Therefore I *definitely* advise against setting this variable to nil. Just change it to `y-or-n-p' of you want to confirm with a single key press rather than having to type \"yes\"." :group 'org-link-follow @@ -934,7 +1024,11 @@ for some files for which the OS does not have a good default. See `org-file-apps'.") (defconst org-file-apps-defaults-windowsnt - '((t . (w32-shell-execute "open" file))) + (list (cons t + (list (if (featurep 'xemacs) + 'mswindows-shell-execute + 'w32-shell-execute) + "open" 'file))) "Default file applications on a Windows NT system. The system \"open\" is used for most files. See `org-file-apps'.") @@ -946,18 +1040,25 @@ See `org-file-apps'.") ("ltx" . emacs) ("org" . emacs) ("el" . emacs) + ("bib" . emacs) ) "External applications for opening `file:path' items in a document. Org-mode uses system defaults for different file types, but you can use this variable to set the application for a given file -extension. The entries in this list are cons cells with a file extension -and the corresponding command. Possible values for the command are: - `emacs' The file will be visited by the current Emacs process. - `default' Use the default application for this file type. - string A command to be executed by a shell; %s will be replaced - by the path to the file. - sexp A Lisp form which will be evaluated. The file path will - be available in the Lisp variable `file'. +extension. The entries in this list are cons cells where the car identifies +files and the cdr the corresponding command. Possible values for the +file identifier are + \"ext\" A string identifying an extension + `directory' Matches a directory + t Default for all remaining files + +Possible values for the command are: + `emacs' The file will be visited by the current Emacs process. + `default' Use the default application for this file type. + string A command to be executed by a shell; %s will be replaced + by the path to the file. + sexp A Lisp form which will be evaluated. The file path will + be available in the Lisp variable `file'. For more examples, see the system specific constants `org-file-apps-defaults-macosx' `org-file-apps-defaults-windowsnt' @@ -1085,7 +1186,12 @@ Lisp variable `state'." (defcustom org-log-done nil "When set, insert a (non-active) time stamp when TODO entry is marked DONE. When the state of an entry is changed from nothing to TODO, remove a previous -closing date." +closing date. +This can also be configured on a per-file basis by adding one of +the following lines anywhere in the buffer: + + #+STARTUP: logging + #+STARTUP: nologging" :group 'org-todo :type 'boolean) @@ -1110,6 +1216,14 @@ This is the priority an item get if no explicit priority is given." :tag "Org Time" :group 'org) +(defcustom org-insert-labeled-timestamps-at-point nil + "Non-nil means, SCHEDULED and DEADLINE timestamps are inserted at point. +When nil, these labeled time stamps are forces into the second line of an +entry, just after the headline. When scheduling from the global TODO list, +the time stamp will always be forced into the second line." + :group 'org-time + :type 'boolean) + (defconst org-time-stamp-formats '("<%Y-%m-%d %a>" . "<%Y-%m-%d %a %H:%M>") "Formats for `format-time-string' which are used for time stamps. It is not recommended to change this constant.") @@ -1149,6 +1263,36 @@ moved to the new date." :tag "Org Tags" :group 'org) +(defcustom org-tag-alist nil + "List of tags allowed in Org-mode files. +When this list is nil, Org-mode will base TAG input on what is already in the +buffer. +The value of this variable is an alist, the car may be (and should) be a +character that is used to select that tag through the fast-tag-selection +interface. See the manual for details." + :group 'org-tags + :type '(repeat + (choice + (cons (string :tag "Tag name") + (character :tag "Access char")) + (const :tag "Start radio group" (:startgroup)) + (const :tag "End radio group" (:endgroup))))) + +(defcustom org-use-fast-tag-selection 'auto + "Non-nil means, use fast tag selection scheme. +This is a special interface to select and deselect tags with single keys. +When nil, fast selection is never used. +When the symbol `auto', fast selection is used if and only if selection +characters for tags have been configured, either through the variable +`org-tag-alist' or through a #+TAGS line in the buffer. +When t, fast selection is always used and selection keys are assigned +automatically if necessary." + :group 'org-tags + :type '(choice + (const :tag "Always" t) + (const :tag "Never" nil) + (const :tag "When selection characters are configured" 'auto))) + (defcustom org-tags-column 48 "The column to which tags should be indented in a headline. If this number is positive, it specifies the column. If it is negative, @@ -1234,6 +1378,7 @@ key The key (a single char as a string) to be associated with the command. type The command type, any of the following symbols: todo Entries with a specific TODO keyword, in all agenda files. tags Tags match in all agenda files. + tags-todo Tags match in all agenda files, TODO entries only. todo-tree Sparse tree of specific TODO keyword in *current* file. tags-tree Sparse tree with all tags matches in *current* file. occur-tree Occur sparse tree for current file. @@ -1246,13 +1391,30 @@ match What to search for: (list (string :tag "Key") (choice :tag "Type" (const :tag "Tags search in all agenda files" tags) + (const :tag "Tags search of TODO entries, all agenda files" tags-todo) (const :tag "TODO keyword search in all agenda files" todo) (const :tag "Tags sparse tree in current buffer" tags-tree) (const :tag "TODO keyword tree in current buffer" todo-tree) (const :tag "Occur tree in current buffer" occur-tree)) (string :tag "Match")))) -(defcustom org-agenda-include-all-todo t +(defcustom org-agenda-todo-list-sublevels t + "Non-nil means, check also the sublevels of a TODO entry for TODO entries. +When nil, the sublevels of a TODO entry are not checked, resulting in +potentially much shorter TODO lists." + :group 'org-agenda + :group 'org-todo + :type 'boolean) + +(defcustom org-agenda-todo-ignore-scheduled nil + "Non-nil means, don't show scheduled entries in the global todo list. +The idea behind this is that by scheduling it, you have already taken care +of this item." + :group 'org-agenda + :group 'org-todo + :type 'boolean) + +(defcustom org-agenda-include-all-todo nil "Non-nil means, the agenda will always contain all TODO entries. When nil, date-less entries will only be shown if `org-agenda' is called with a prefix argument. @@ -1274,7 +1436,7 @@ forth between agenda and calendar." :group 'org-agenda :type 'sexp) -(defgroup org-agenda-window-setup nil +(defgroup org-agenda-setup nil "Options concerning setting up the Agenda window in Org Mode." :tag "Org Agenda Window Setup" :group 'org-agenda) @@ -1286,9 +1448,8 @@ Needs to be set before org.el is loaded." :group 'org-agenda-setup :type 'boolean) -(defcustom org-select-timeline-window t - "Non-nil means, after creating a timeline, move cursor into Timeline window. -When nil, cursor will remain in the current window." +(defcustom org-agenda-start-with-follow-mode nil + "The initial value of follwo-mode in a newly created agenda window." :group 'org-agenda-setup :type 'boolean) @@ -1411,7 +1572,7 @@ categories by priority." (defcustom org-sort-agenda-notime-is-late t "Non-nil means, items without time are considered late. This is only relevant for sorting. When t, items which have no explicit -time like 15:30 will be considered as 24:01, i.e. later than any items which +time like 15:30 will be considered as 99:01, i.e. later than any items which do have a time. When nil, the default time is before 0:00. You can use this option to decide if the schedule for today should come before or after timeless agenda entries." @@ -1472,17 +1633,11 @@ See also the variables `org-agenda-remove-times-when-in-prefix' and :type 'string :group 'org-agenda-prefix) -(defcustom org-timeline-prefix-format " % s" - "Like `org-agenda-prefix-format', but for the timeline of a single file." - :type 'string - :group 'org-agenda-prefix) - (defvar org-prefix-format-compiled nil "The compiled version of the most recently used prefix format. Depending on which command was used last, this may be the compiled version of `org-agenda-prefix-format' or `org-timeline-prefix-format'.") -;; FIXME: There seem to be situations where this does no work. (defcustom org-agenda-remove-times-when-in-prefix t "Non-nil means, remove duplicate time specifications in agenda items. When the format `org-agenda-prefix-format' contains a `%t' specifier, a @@ -1510,6 +1665,34 @@ When this is the symbol `prefix', only remove tags when (const :tag "Never" nil) (const :tag "When prefix format contains %T" prefix))) +(defgroup org-agenda-timeline nil + "Options concerning the timeline buffer in Org Mode." + :tag "Org Agenda Timeline" + :group 'org-agenda) + +(defcustom org-timeline-prefix-format " % s" + "Like `org-agenda-prefix-format', but for the timeline of a single file." + :type 'string + :group 'org-agenda-timeline) + +(defcustom org-select-timeline-window t + "Non-nil means, after creating a timeline, move cursor into Timeline window. +When nil, cursor will remain in the current window." + :group 'org-agenda-timeline + :type 'boolean) + +(defcustom org-timeline-show-empty-dates 3 + "Non-nil means, `org-timeline' also shows dates without an entry. +When nil, only the days which actually have entries are shown. +When t, all days between the first and the last date are shown. +When an integer, show also empty dates, but if there is a gap of more than +N days, just insert a special line indicating the size of the gap." + :group 'org-agenda-timeline + :type '(choice + (const :tag "None" nil) + (const :tag "All" t) + (number :tag "at most"))) + (defgroup org-export nil "Options for exporting org-listings." :tag "Org Export" @@ -1520,6 +1703,23 @@ When this is the symbol `prefix', only remove tags when :tag "Org Export General" :group 'org-export) +(defcustom org-export-publishing-directory "." + "Path to the location where exported files should be located. +This path may be relative to the directory where the Org-mode file lives. +The default is to put them into the same directory as the Org-mode file. +The variable may also be an alist with export types `:html', `:ascii', +`:ical', or `:xoxo' and the corresponding directories. If a direcoty path +is relative, it is interpreted relative to the directory where the exported +Org-mode files lives." + :group 'org-export-general + :type '(choice + (directory) + (repeat + (cons + (choice :tag "Type" + (const :html) (const :ascii) (const :ical) (const :xoxo)) + (directory))))) + (defcustom org-export-language-setup '(("en" "Author" "Date" "Table of Contents") ("da" "Ophavsmand" "Dato" "Indhold") @@ -1591,6 +1791,21 @@ This option can also be set with the +OPTIONS line, e.g. \"\\n:t\"." :group 'org-export-general :type 'boolean) +(defcustom org-export-with-timestamps t + "Nil means, do not export time stamps and associated keywords." + :group 'org-export + :type 'boolean) + +(defcustom org-export-with-tags t + "Nil means, do not export tags, just remove them from headlines." + :group 'org-export-general + :type 'boolean) + +(defcustom org-export-with-timestamps t + "Nil means, do not export timestamps and associated keywords." + :group 'org-export-general + :type 'boolean) + (defgroup org-export-translation nil "Options for translating special ascii sequences for the export backends." :tag "Org Export Translation" @@ -1714,6 +1929,22 @@ much faster." :tag "Org Export ASCII" :group 'org-export) +(defcustom org-export-ascii-underline '(?\$ ?\# ?^ ?\~ ?\= ?\-) + "Characters for underlining headings in ASCII export. +In the given sequence, these characters will be used for level 1, 2, ..." + :group 'org-export-ascii + :type '(repeat character)) + +(defcustom org-export-ascii-bullets '(?* ?+ ?-) + "Bullet characters for headlines converted to lists in ASCII export. +The first character is is used for the first lest level generated in this +way, and so on. If there are more levels than characters given here, +the list will be repeated. +Note that plain lists will keep the same bullets as the have in the +Org-mode file." + :group 'org-export-ascii + :type '(repeat character)) + (defcustom org-export-ascii-show-new-buffer t "Non-nil means, popup buffer containing the exported ASCII text. Otherwise the buffer will just be saved to a file and stay hidden." @@ -1725,14 +1956,6 @@ Otherwise the buffer will just be saved to a file and stay hidden." :tag "Org Export XML" :group 'org-export) -(defcustom org-export-xml-type 'xoxo ;kw, if we have only one. - "The kind of XML to be produced by the XML exporter. -Allowed values are: -xoxo The XOXO exporter." - :group 'org-export-xml - :type '(choice - (const :tag "XOXO" xoxo))) - (defgroup org-export-html nil "Options specific for HTML export of Org-mode files." :tag "Org Export HTML" @@ -1745,8 +1968,11 @@ xoxo The XOXO exporter." font-size: 12pt; } .title { text-align: center; } - .todo, .deadline { color: red; } + .todo { color: red; } .done { color: green; } + .timestamp { color: grey } + .timestamp-kwd { color: CadetBlue } + .tag { background-color:lightblue; font-weight:normal } .target { background-color: lavender; } pre { border: 1pt solid #AEBDCC; @@ -1796,13 +2022,16 @@ When nil, the links still point to the plain `.org' file." :group 'org-export-html :type 'boolean) -(defcustom org-export-html-inline-images t +(defcustom org-export-html-inline-images 'maybe "Non-nil means, inline images into exported HTML pages. -The link will still be to the original location of the image file. -So if you are moving the page, lets say to your public HTML site, -you will have to move the image and maybe change the link." +This is done using an <img> tag. When nil, an anchor with href is used to +link to the image. If this option is `maybe', then images in links with +an empty description will be inlined, while images with a description will +be linked only." :group 'org-export-html - :type 'boolean) + :type '(choice (const :tag "Never" nil) + (const :tag "Always" t) + (const :tag "When there is no description" maybe))) (defcustom org-export-html-expand t "Non-nil means, for HTML export, treat @<...> as HTML tag. @@ -1814,7 +2043,7 @@ This option can also be set with the +OPTIONS line, e.g. \"@:nil\"." :type 'boolean) (defcustom org-export-html-table-tag - "<table border=1 cellspacing=0 cellpadding=6>" + "<table border=\"1\" cellspacing=\"0\" cellpadding=\"6\">" "The HTML tag used to start a table. This must be a <table> tag, but you may change the options like borders and spacing." @@ -1829,7 +2058,7 @@ to a file." :type 'boolean) (defcustom org-export-html-html-helper-timestamp - "<br><br><hr><p><!-- hhmts start --> <!-- hhmts end -->\n" + "<br/><br/><hr><p><!-- hhmts start --> <!-- hhmts end --></p>\n" "The HTML tag used as timestamp delimiter for HTML-helper-mode." :group 'org-export-html :type 'string) @@ -1847,7 +2076,8 @@ Otherwise, the buffer will just be saved to a file and stay hidden." (defcustom org-combined-agenda-icalendar-file "~/org.ics" "The file name for the iCalendar file covering all agenda files. -This file is created with the command \\[org-export-icalendar-all-agenda-files]." +This file is created with the command \\[org-export-icalendar-all-agenda-files]. +The file name should be absolute." :group 'org-export-icalendar :type 'file) @@ -2003,7 +2233,7 @@ color of the frame." (org-compatible-face '((((class color) (min-colors 16) (background light)) (:foreground "Orchid")) (((class color) (min-colors 16) (background dark)) (:foreground "LightSteelBlue")) - (((class color) (min-colors 8)) (:foreground "blue")))) ;; FIXME: for dark bg? + (((class color) (min-colors 8)) (:foreground "blue")))) "Face used for level 7 headlines." :group 'org-faces) @@ -2120,11 +2350,21 @@ This face is only used if `org-fontify-done-headline' is set." "Face for items scheduled previously, and not yet done." :group 'org-faces) +(defface org-upcoming-deadline + (org-compatible-face + '((((class color) (min-colors 88) (background light)) (:foreground "Firebrick")) + (((class color) (min-colors 88) (background dark)) (:foreground "chocolate1")) + (((class color) (min-colors 8) (background light)) (:foreground "red")) + (((class color) (min-colors 8) (background dark)) (:foreground "red" :bold t)) + (t (:bold t)))) + "Face for items scheduled previously, and not yet done." + :group 'org-faces) + (defface org-time-grid ;; font-lock-variable-name-face (org-compatible-face '((((class color) (min-colors 16) (background light)) (:foreground "DarkGoldenrod")) (((class color) (min-colors 16) (background dark)) (:foreground "LightGoldenrod")) - (((class color) (min-colors 8)) (:foreground "yellow" :weight light)))) ; FIXME: turn off??? + (((class color) (min-colors 8)) (:foreground "yellow" :weight light)))) "Face used for time grids." :group 'org-faces) @@ -2163,6 +2403,10 @@ This face is only used if `org-fontify-done-headline' is set." (defvar org-todo-line-regexp nil "Matches a headline and puts TODO state into group 2 if present.") (make-variable-buffer-local 'org-todo-line-regexp) +(defvar org-todo-line-tags-regexp nil + "Matches a headline and puts TODO state into group 2 if present. +Also put tags into group 4 if tags are present.") +(make-variable-buffer-local 'org-todo-line-tags-regexp) (defvar org-nl-done-regexp nil "Matches newline followed by a headline with the DONE keyword.") (make-variable-buffer-local 'org-nl-done-regexp) @@ -2193,21 +2437,46 @@ This face is only used if `org-fontify-done-headline' is set." (defvar org-scheduled-time-regexp nil "Matches the SCHEDULED keyword together with a time stamp.") (make-variable-buffer-local 'org-scheduled-time-regexp) +(defvar org-closed-time-regexp nil + "Matches the CLOSED keyword together with a time stamp.") +(make-variable-buffer-local 'org-closed-time-regexp) + +(defvar org-keyword-time-regexp nil + "Matches any of the 3 keywords, together with the time stamp.") +(make-variable-buffer-local 'org-keyword-time-regexp) +(defvar org-maybe-keyword-time-regexp nil + "Matches a timestamp, possibly preceeded by a keyword.") +(make-variable-buffer-local 'org-keyword-time-regexp) + +(defconst org-rm-props '(invisible t face t keymap t intangible t mouse-face t + mouse-map t) + "Properties to remove when a string without properties is wanted.") + +(defsubst org-match-string-no-properties (num &optional string) + (if (featurep 'xemacs) + (let ((s (match-string num string))) + (remove-text-properties 0 (length s) org-rm-props s) + s) + (match-string-no-properties num string))) + +(defsubst org-no-properties (s) + (remove-text-properties 0 (length s) org-rm-props s) + s) (defun org-set-regexps-and-options () "Precompute regular expressions for current buffer." (when (eq major-mode 'org-mode) (let ((re (org-make-options-regexp '("CATEGORY" "SEQ_TODO" "PRI_TODO" "TYP_TODO" - "STARTUP" "ARCHIVE"))) + "STARTUP" "ARCHIVE" "TAGS"))) (splitre "[ \t]+") - kwds int key value cat arch) + kwds int key value cat arch tags) (save-excursion (save-restriction (widen) (goto-char (point-min)) (while (re-search-forward re nil t) - (setq key (match-string 1) value (match-string 2)) + (setq key (match-string 1) value (org-match-string-no-properties 2)) (cond ((equal key "CATEGORY") (if (string-match "[ \t]+$" value) @@ -2222,6 +2491,8 @@ This face is only used if `org-fontify-done-headline' is set." ((equal key "TYP_TODO") (setq int 'type kwds (append kwds (org-split-string value splitre)))) + ((equal key "TAGS") + (setq tags (append tags (org-split-string value splitre)))) ((equal key "STARTUP") (let ((opts (org-split-string value splitre)) (set '(("fold" org-startup-folded t) @@ -2235,6 +2506,8 @@ This face is only used if `org-fontify-done-headline' is set." ("oddeven" org-odd-levels-only nil) ("align" org-startup-align-all-tables t) ("noalign" org-startup-align-all-tables nil) + ("logging" org-log-done t) + ("nologging" org-log-done nil) ("dlcheck" org-startup-with-deadline-check t) ("nodlcheck" org-startup-with-deadline-check nil))) l var val) @@ -2250,7 +2523,24 @@ This face is only used if `org-fontify-done-headline' is set." (and cat (set (make-local-variable 'org-category) cat)) (and kwds (set (make-local-variable 'org-todo-keywords) kwds)) (and arch (set (make-local-variable 'org-archive-location) arch)) - (and int (set (make-local-variable 'org-todo-interpretation) int))) + (and int (set (make-local-variable 'org-todo-interpretation) int)) + (when tags + (let (e tg c tgs) + (while (setq e (pop tags)) + (cond + ((equal e "{") (push '(:startgroup) tgs)) + ((equal e "}") (push '(:endgroup) tgs)) + ((string-match "^\\([0-9a-zA-Z_@]+\\)(\\(.\\))$" e) + (push (cons (match-string 1 e) + (string-to-char (match-string 2 e))) + tgs)) + (t (push (list e) tgs)))) + (set (make-local-variable 'org-tag-alist) nil) + (while (setq e (pop tgs)) + (or (and (stringp (car e)) + (assoc (car e) org-tag-alist)) + (push e org-tag-alist)))))) + ;; Compute the regular expressions and other local variables (setq org-todo-kwd-priority-p (equal org-todo-interpretation 'priority) org-todo-kwd-max-priority (1- (length org-todo-keywords)) @@ -2273,6 +2563,10 @@ This face is only used if `org-fontify-done-headline' is set." "\\)? *\\(.*\\)") org-nl-done-regexp (concat "[\r\n]\\*+[ \t]+" org-done-string "\\>") + org-todo-line-tags-regexp + (concat "^\\(\\*+\\)[ \t]*\\(" + (mapconcat 'regexp-quote org-todo-keywords "\\|") + "\\)? *\\(.*?\\([ \t]:[a-zA-Z0-9:_@]+:[ \t]*\\)?$\\)") org-looking-at-done-regexp (concat "^" org-done-string "\\>") org-deadline-regexp (concat "\\<" org-deadline-string) org-deadline-time-regexp @@ -2282,11 +2576,27 @@ This face is only used if `org-fontify-done-headline' is set." org-scheduled-regexp (concat "\\<" org-scheduled-string) org-scheduled-time-regexp - (concat "\\<" org-scheduled-string " *<\\([^>]+\\)>")) + (concat "\\<" org-scheduled-string " *<\\([^>]+\\)>") + org-closed-time-regexp + (concat "\\<" org-closed-string " *\\[\\([^]]+\\)\\]") + org-keyword-time-regexp + (concat "\\<\\(" org-scheduled-string + "\\|" org-deadline-string + "\\|" org-closed-string "\\)" + " *[[<]\\([^]>]+\\)[]>]") + org-maybe-keyword-time-regexp + (concat "\\(\\<\\(" org-scheduled-string + "\\|" org-deadline-string + "\\|" org-closed-string "\\)\\)?" + " *\\([[<][0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}[^]\r\n>]*?[]>]\\)")) + (org-set-font-lock-defaults))) ;; Tell the compiler about dynamically scoped variables, ;; and variables from other packages +(defvar calc-embedded-close-formula) ; defined by the calc package +(defvar calc-embedded-open-formula) ; defined by the calc package +(defvar font-lock-unfontify-region-function) ; defined by font-lock.el (defvar zmacs-regions) ; XEmacs regions (defvar original-date) ; dynamically scoped in calendar (defvar org-old-auto-fill-inhibit-regexp) ; local variable used by `orgtbl-mode' @@ -2298,14 +2608,9 @@ This face is only used if `org-fontify-done-headline' is set." (defvar mark-active) ; Emacs only, not available in XEmacs. (defvar timecnt) ; dynamically scoped parameter (defvar levels-open) ; dynamically scoped parameter -(defvar title) ; dynamically scoped parameter -(defvar author) ; dynamically scoped parameter -(defvar email) ; dynamically scoped parameter -(defvar text) ; dynamically scoped parameter (defvar entry) ; dynamically scoped parameter (defvar date) ; dynamically scoped parameter -(defvar language) ; dynamically scoped parameter -(defvar options) ; dynamically scoped parameter +(defvar description) ; dynamically scoped parameter (defvar ans1) ; dynamically scoped parameter (defvar ans2) ; dynamically scoped parameter (defvar starting-day) ; local variable @@ -2330,6 +2635,9 @@ This face is only used if `org-fontify-done-headline' is set." (defvar annotation) ; from remember.el, dynamically scoped in `remember-mode' (defvar initial) ; from remember.el, dynamically scoped in `remember-mode' (defvar orgtbl-mode) ; defined later in this file +(defvar Info-current-file) ; from info.el +(defvar Info-current-node) ; from info.el + ;;; Define the mode (defvar org-mode-map @@ -2372,11 +2680,31 @@ can be exported as a structured ASCII or HTML file. The following commands are available: \\{org-mode-map}" + + ;; Get rid of Outline menus, they are not needed + ;; Need to do this here because define-derived-mode sets up + ;; the keymap so late. + (if (featurep 'xemacs) + (if org-noutline-p + (progn + (easy-menu-remove outline-mode-menu-heading) + (easy-menu-remove outline-mode-menu-show) + (easy-menu-remove outline-mode-menu-hide)) + (delete-menu-item '("Headings")) + (delete-menu-item '("Show")) + (delete-menu-item '("Hide")) + (set-menubar-dirty-flag)) + (define-key org-mode-map [menu-bar headings] 'undefined) + (define-key org-mode-map [menu-bar hide] 'undefined) + (define-key org-mode-map [menu-bar show] 'undefined)) + (easy-menu-add org-org-menu) (easy-menu-add org-tbl-menu) (org-install-agenda-files-menu) (if org-descriptive-links (org-add-to-invisibility-spec '(org-link))) (org-add-to-invisibility-spec '(org-cwidth)) + (when (featurep 'xemacs) + (set (make-local-variable 'line-move-ignore-invisible) t)) (setq outline-regexp "\\*+") ;;(setq outline-regexp "\\(?:\\*+\\|[ \t]*\\(?:[-+*]\\|[0-9]+[.)]\\) \\)") (setq outline-level 'org-outline-level) @@ -2405,19 +2733,6 @@ The following commands are available: (= (point-min) (point-max))) (insert " -*- mode: org -*-\n\n")) - ;; Get rid of Outline menus, they are not needed - ;; Need to do this here because define-derived-mode sets up - ;; the keymap so late. - (if (featurep 'xemacs) - (progn - (delete-menu-item '("Headings")) - (delete-menu-item '("Show")) - (delete-menu-item '("Hide")) - (set-menubar-dirty-flag)) - (define-key org-mode-map [menu-bar headings] 'undefined) - (define-key org-mode-map [menu-bar hide] 'undefined) - (define-key org-mode-map [menu-bar show] 'undefined)) - (unless org-inhibit-startup (if org-startup-align-all-tables (org-table-map-tables 'org-table-align)) @@ -2430,24 +2745,13 @@ The following commands are available: (let ((this-command 'org-cycle) (last-command 'org-cycle)) (org-cycle '(4)) (org-cycle '(4)))))))) +(defsubst org-call-with-arg (command arg) + "Call COMMAND interactively, but pretend prefix are was ARG." + (let ((current-prefix-arg arg)) (call-interactively command))) + (defsubst org-current-line (&optional pos) (+ (if (bolp) 1 0) (count-lines (point-min) (or pos (point))))) -(defconst org-rm-props '(invisible t face t keymap t intangible t mouse-face t - mouse-map t) - "Properties to remove when a string without properties is wanted.") - -(defsubst org-match-string-no-properties (num &optional string) - (if (featurep 'xemacs) - (let ((s (match-string num string))) - (remove-text-properties 0 (length s) org-rm-props s) - s) - (match-string-no-properties num string))) - -(defsubst org-no-properties (s) - (remove-text-properties 0 (length s) org-rm-props s) - s) - (defun org-current-time () "Current time, possibly rounded to `org-time-stamp-rounding-minutes'." (if (> org-time-stamp-rounding-minutes 0) @@ -2488,7 +2792,7 @@ that will be added to PLIST. Returns the string that was modified." (defconst org-non-link-chars "]\t\n\r<>") (defconst org-link-types '("https?" "ftp" "mailto" "file" "news" "bbdb" "vm" - "wl" "mhe" "rmail" "gnus" "shell")) + "wl" "mhe" "rmail" "gnus" "shell" "info" "elisp")) (defconst org-link-re-with-space (concat "<?\\(" (mapconcat 'identity org-link-types "\\|") "\\):" @@ -2581,6 +2885,8 @@ that will be added to PLIST. Returns the string that was modified." (let* ((help (concat "LINK: " (org-match-string-no-properties 1))) ;; FIXME: above we should remove the escapes. + ;; but that requires another match, protecting match data, + ;; a lot of overhead for font-lock. (ip (list 'invisible 'org-link 'intangible t 'rear-nonsticky t 'keymap org-mouse-map 'mouse-face 'highlight 'help-echo help)) @@ -2719,11 +3025,13 @@ between words." (let* ((em org-fontify-emphasized-text) (lk org-activate-links) (org-font-lock-extra-keywords + ;; Headlines (list '("^\\(\\**\\)\\(\\*\\)\\(.*\\)" (1 (org-get-level-face 1)) (2 (org-get-level-face 2)) (3 (org-get-level-face 3))) '("^[ \t]*\\(\\(|\\|\\+-[-+]\\).*\\S-\\)" (1 'org-table)) + ;; Links (if (memq 'angle lk) '(org-activate-angle-links (0 'org-link t))) (if (memq 'plain lk) '(org-activate-plain-links (0 'org-link t))) (if (memq 'bracket lk) '(org-activate-bracket-links (0 'org-link t))) @@ -2733,27 +3041,34 @@ between words." (if (memq 'tag lk) '(org-activate-tags (1 'org-tag prepend))) (if org-table-limit-column-width '(org-hide-wide-columns (0 nil append))) + ;; TODO lines (list (concat "^\\*+[ \t]*" org-not-done-regexp) '(1 'org-todo t)) + ;; Priorities (list (concat "\\[#[A-Z]\\]") '(0 'org-special-keyword t)) + ;; Special keywords (list (concat "\\<" org-deadline-string) '(0 'org-special-keyword t)) (list (concat "\\<" org-scheduled-string) '(0 'org-special-keyword t)) (list (concat "\\<" org-closed-string) '(0 'org-special-keyword t)) -; (if em '("\\(\\W\\|^\\)\\(\\*\\w+\\*\\)\\(\\W\\|$\\)" 2 'bold prepend)) -; (if em '("\\(\\W\\|^\\)\\(/\\w+/\\)\\(\\W\\|$\\)" 2 'italic prepend)) -; (if em '("\\(\\W\\|^\\)\\(_\\w+_\\)\\(\\W\\|$\\)" 2 'underline prepend)) + ;; Emphasis (if em (list org-bold-re 2 ''bold 'prepend)) (if em (list org-italic-re 2 ''italic 'prepend)) (if em (list org-underline-re 2 ''underline 'prepend)) + ;; Checkboxes, similar to Frank Ruell's org-checklet.el + '("^[ \t]*\\([-+*]\\|[0-9]+[.)]\\) +\\(\\[[ X]\\]\\)" + 2 'bold prepend) + ;; COMMENT (list (concat "^\\*+[ \t]*\\<\\(" org-comment-string "\\|" org-quote-string "\\)\\>") '(1 'org-special-keyword t)) '("^#.*" (0 'font-lock-comment-face t)) + ;; DONE (if org-fontify-done-headline (list (concat "^[*]+ +\\<\\(" org-done-string "\\)\\(.*\\)\\>") '(1 'org-done t) '(2 'org-headline-done t)) (list (concat "^[*]+ +\\<\\(" org-done-string "\\)\\>") '(1 'org-done t))) + ;; Table stuff '("^[ \t]*\\(:.*\\)" (1 'org-table t)) '("| *\\(:?=[^|\n]*\\)" (1 'org-formula t)) '("^[ \t]*| *\\([#!$*_^]\\) *|" (1 'org-formula t)) @@ -2795,7 +3110,11 @@ between words." ;;; Visibility cycling (defvar org-cycle-global-status nil) +(make-variable-buffer-local 'org-cycle-global-status) (defvar org-cycle-subtree-status nil) +(make-variable-buffer-local 'org-cycle-subtree-status) + +;;;###autoload (defun org-cycle (&optional arg) "Visibility cycling for Org-mode. @@ -2825,15 +3144,18 @@ between words." no headline in line 1, this function will act as if called with prefix arg." (interactive "P") - (if (or (and (bobp) (not (looking-at outline-regexp))) - (equal arg '(4))) - ;; special case: use global cycling - (setq arg t)) + (let* ((outline-regexp + (if org-cycle-include-plain-lists + "\\*+\\|\\([ \t]*\\)\\([-+*]\\|[0-9]+[.)]\\) " + outline-regexp)) + (bob-special (and org-cycle-global-at-bob (bobp) + (not (looking-at outline-regexp)))) + (org-cycle-hook (if bob-special nil org-cycle-hook)) + (pos (point))) - (let ((outline-regexp - (if org-cycle-include-plain-lists - "\\*+\\|\\([ \t]*\\)\\([-+*]\\|[0-9]+[.)]\\) " - outline-regexp))) + (if (or bob-special (equal arg '(4))) + ;; special case: use global cycling + (setq arg t)) (cond @@ -2843,7 +3165,7 @@ between words." (progn (if arg (org-table-edit-field t) (org-table-justify-field-maybe) - (org-table-next-field))))) + (call-interactively 'org-table-next-field))))) ((eq arg t) ;; Global cycling @@ -2853,18 +3175,8 @@ between words." ;; We just created the overview - now do table of contents ;; This can be slow in very large buffers, so indicate action (message "CONTENTS...") - (save-excursion - ;; Visit all headings and show their offspring - (goto-char (point-max)) - (catch 'exit - (while (and (progn (condition-case nil - (outline-previous-visible-heading 1) - (error (goto-char (point-min)))) - t) - (looking-at outline-regexp)) - (show-branches) - (if (bobp) (throw 'exit nil)))) - (message "CONTENTS...done")) + (org-content) + (message "CONTENTS...done") (setq org-cycle-global-status 'contents) (run-hook-with-args 'org-cycle-hook 'contents)) @@ -2878,7 +3190,7 @@ between words." (t ;; Default action: go to overview - (hide-sublevels 1) + (org-overview) (message "OVERVIEW") (setq org-cycle-global-status 'overview) (run-hook-with-args 'org-cycle-hook 'overview)))) @@ -2908,10 +3220,10 @@ between words." (outline-next-heading)) ;; Find out what to do next and set `this-command' (cond - ((= eos eoh) + ((and (= eos eoh) ;; Nothing is hidden behind this heading (message "EMPTY ENTRY") - (setq org-cycle-subtree-status nil)) + (setq org-cycle-subtree-status nil))) ((>= eol eos) ;; Entire subtree is hidden in one line: open it (org-show-entry) @@ -2935,8 +3247,12 @@ between words." ;; TAB emulation (buffer-read-only (org-back-to-heading)) - ((if (and (eq org-cycle-emulate-tab 'white) - (save-excursion (beginning-of-line 1) (looking-at "[ \t]+$"))) + ((if (and (memq org-cycle-emulate-tab '(white whitestart)) + (save-excursion (beginning-of-line 1) (looking-at "[ \t]*")) + (or (and (eq org-cycle-emulate-tab 'white) + (= (match-end 0) (point-at-eol))) + (and (eq org-cycle-emulate-tab 'whitestart) + (>= (match-end 0) pos)))) t (eq org-cycle-emulate-tab t)) (if (and (looking-at "[ \n\r\t]") @@ -2951,6 +3267,44 @@ between words." (org-back-to-heading) (org-cycle)))))) +;;;###autoload +(defun org-global-cycle () + "Cycle the global visibility. For details see `org-cycle'." + (interactive) + (org-cycle '(4))) + +(defun org-overview () + "Switch to overview mode, shoing only top-level headlines. +Really, this shows all headlines with level equal or greater than the level +of the first headline in the buffer. This is important, because if the +first headline is not level one, then (hide-sublevels 1) gives confusing +results." + (interactive) + (hide-sublevels (save-excursion + (goto-char (point-min)) + (if (re-search-forward (concat "^" outline-regexp) nil t) + (progn + (goto-char (match-beginning 0)) + (funcall outline-level)) + 1)))) + +;; FIXME: allow an argument to give a limiting level for this. +(defun org-content () + "Show all headlines in the buffer, like a table of contents" + (interactive) + (save-excursion + ;; Visit all headings and show their offspring + (goto-char (point-max)) + (catch 'exit + (while (and (progn (condition-case nil + (outline-previous-visible-heading 1) + (error (goto-char (point-min)))) + t) + (looking-at outline-regexp)) + (show-branches) + (if (bobp) (throw 'exit nil)))))) + + (defun org-optimize-window-after-visibility-change (state) "Adjust the window after a change in outline visibility. This function is the default value of the hook `org-cycle-hook'." @@ -3071,7 +3425,6 @@ or nil." (kill-buffer "*org-goto*") org-selected-point)) -;; FIXME: It may not be a good idea to temper with the prefix argument... (defun org-goto-ret (&optional arg) "Finish `org-goto' by going to the new location." (interactive "P") @@ -3114,26 +3467,36 @@ or nil." "To temporarily disable the active region.") (defun org-insert-heading (&optional force-heading) - "Insert a new heading or item with same depth at point." + "Insert a new heading or item with same depth at point. +If point is in a plain list and FORCE-HEADING is nil, create a new list item. +If point is at the beginning of a headline, insert a sibling before the +current headline. If point is in the middle of a headline, split the headline +at that position and make the rest of the headline part of the sibling below +the current headline." (interactive "P") - (when (or force-heading (not (org-insert-item))) - (let* ((head (save-excursion - (condition-case nil - (org-back-to-heading) - (error (outline-next-heading))) - (prog1 (match-string 0) - (funcall outline-level))))) - (cond - ((and (org-on-heading-p) (bolp) - (save-excursion (backward-char 1) (not (org-invisible-p)))) - (open-line 1)) - ((bolp) nil) - (t (newline))) - (insert head) - (just-one-space) - (run-hooks 'org-insert-heading-hook)))) - -(defun org-insert-item () + (if (= (buffer-size) 0) + (insert "\n* ") + (when (or force-heading (not (org-insert-item))) + (let* ((head (save-excursion + (condition-case nil + (progn + (org-back-to-heading) + (match-string 0)) + (error "*")))) + pos) + (cond + ((and (org-on-heading-p) (bolp) + (save-excursion (backward-char 1) (not (org-invisible-p)))) + (open-line 1)) + ((bolp) nil) + (t (newline))) + (insert head) (just-one-space) + (setq pos (point)) + (end-of-line 1) + (unless (= (point) pos) (just-one-space) (backward-delete-char 1)) + (run-hooks 'org-insert-heading-hook))))) + +(defun org-insert-item (&optional checkbox) "Insert a new item at the current level. Return t when things worked, nil when we are not in an item." (when (save-excursion @@ -3144,9 +3507,11 @@ Return t when things worked, nil when we are not in an item." t) (error nil))) (let* ((bul (match-string 0)) + (end (match-end 0)) (eow (save-excursion (beginning-of-line 1) (looking-at "[ \t]*") (match-end 0))) - (eowcol (save-excursion (goto-char eow) (current-column)))) + (eowcol (save-excursion (goto-char eow) (current-column))) + pos) (cond ((and (org-at-item-p) (<= (point) eow)) ;; before the bullet @@ -3155,8 +3520,11 @@ Return t when things worked, nil when we are not in an item." ((<= (point) eow) (beginning-of-line 1)) (t (newline))) - (insert bul) - (just-one-space)) + (insert bul (if checkbox "[ ]" "")) + (just-one-space) + (setq pos (point)) + (end-of-line 1) + (unless (= (point) pos) (just-one-space) (backward-delete-char 1))) (org-maybe-renumber-ordered-list) t)) @@ -3165,16 +3533,19 @@ Return t when things worked, nil when we are not in an item." If the heading has no TODO state, or if the state is DONE, use the first state (TODO by default). Also with prefix arg, force first state." (interactive "P") - (org-insert-heading) - (save-excursion - (org-back-to-heading) - (outline-previous-heading) - (looking-at org-todo-line-regexp)) - (if (or arg - (not (match-beginning 2)) - (equal (match-string 2) org-done-string)) - (insert (car org-todo-keywords) " ") - (insert (match-string 2) " "))) + (when (not (org-insert-item 'checkbox)) + (org-insert-heading) + (save-excursion + (org-back-to-heading) + (if org-noutline-p + (outline-previous-heading) + (outline-previous-visible-heading t)) + (looking-at org-todo-line-regexp)) + (if (or arg + (not (match-beginning 2)) + (equal (match-string 2) org-done-string)) + (insert (car org-todo-keywords) " ") + (insert (match-string 2) " ")))) (defun org-promote-subtree () "Promote the entire subtree. @@ -3408,7 +3779,7 @@ If optional TREE is given, use this text instead of the kill ring." (error (substitute-command-keys "The kill is not a (set of) tree(s) - please use \\[yank] to yank anyway"))) - (let* ((txt (or tree (current-kill 0))) + (let* ((txt (or tree (and kill-ring (current-kill 0)))) (^re (concat "^\\(" outline-regexp "\\)")) (re (concat "\\(" outline-regexp "\\)")) (^re_ (concat "\\(" outline-regexp "\\)[ \t]*")) @@ -3457,8 +3828,12 @@ If optional TREE is given, use this text instead of the kill ring." (progn (insert "\n") (backward-char 1))) ;; Paste (setq beg (point)) + (if (string-match "[ \t\r\n]+\\'" txt) + (setq txt (replace-match "\n" t t txt))) (insert txt) (setq end (point)) + (if (looking-at "[ \t\r\n]+") + (replace-match "\n")) (goto-char beg) ;; Shift if necessary (if (= shift 0) @@ -3471,7 +3846,8 @@ If optional TREE is given, use this text instead of the kill ring." (goto-char (point-min)) (message "Pasted at level %d, with shift by %d levels" new-level shift1))) - (if (and (eq org-subtree-clip (current-kill 0)) + (if (and kill-ring + (eq org-subtree-clip (current-kill 0)) org-subtree-clip-folded) ;; The tree was folded before it was killed/copied (hide-subtree)))) @@ -3483,8 +3859,9 @@ headline level is not the largest headline level in the tree. So this will actually accept several entries of equal levels as well, which is OK for `org-paste-subtree'. If optional TXT is given, check this string instead of the current kill." - (let* ((kill (or txt (current-kill 0) "")) - (start-level (and (string-match (concat "\\`" outline-regexp) kill) + (let* ((kill (or txt (and kill-ring (current-kill 0)) "")) + (start-level (and kill + (string-match (concat "\\`" outline-regexp) kill) (- (match-end 0) (match-beginning 0)))) (re (concat "^" outline-regexp)) (start 1)) @@ -3510,16 +3887,60 @@ If optional TXT is given, check this string instead of the current kill." ((= llt ?\)) "\\([ \t]*\\([-+]\\|\\([0-9]+)\\)\\)\\|[ \t]+\\*\\)\\( \\|$\\)") (t (error "Invalid value of `org-plain-list-ordered-item-terminator'"))))))) -(defun org-get-indentation () - "Get the indentation of the current line, interpreting tabs." +(defun org-at-item-checkbox-p () + "Is point at a line starting a plain-list item with a checklet?" + (and (org-at-item-p) + (save-excursion + (goto-char (match-end 0)) + (skip-chars-forward " \t") + (looking-at "\\[[ X]\\]")))) + +(defun org-toggle-checkbox () + "Toggle the checkbox in the current line." + (interactive) (save-excursion - (beginning-of-line 1) - (skip-chars-forward " \t") - (current-column))) + (if (org-at-item-checkbox-p) + (replace-match (if (equal (match-string 0) "[ ]") "[X]" "[ ]") t t)))) + +(defun org-get-indentation (&optional line) + "Get the indentation of the current line, interpreting tabs. +When LINE is given, assume it represents a line and compute its indentation." + (if line + (if (string-match "^ *" (org-remove-tabs line)) + (match-end 0)) + (save-excursion + (beginning-of-line 1) + (skip-chars-forward " \t") + (current-column)))) + +(defun org-remove-tabs (s &optional width) + "Replace tabulators in S with spaces. +Assumes that s is a single line, starting in column 0." + (setq width (or width tab-width)) + (while (string-match "\t" s) + (setq s (replace-match + (make-string + (- (* width (/ (+ (match-beginning 0) width) width)) + (match-beginning 0)) ?\ ) + t t s))) + s) + +;; FIXME: document properly. +(defun org-fix-indentation (line ind) + "If the current indenation is smaller than ind1, leave it alone. +If it is larger than ind, reduce it by ind." + (let* ((l (org-remove-tabs line)) + (i (org-get-indentation l)) + (i1 (car ind)) (i2 (cdr ind))) + (if (>= i i2) (setq l (substring line i2))) + (if (> i1 0) + (concat (make-string i1 ?\ ) l) + l))) (defun org-beginning-of-item () "Go to the beginning of the current hand-formatted item. If the cursor is not in an item, throw an error." + (interactive) (let ((pos (point)) (limit (save-excursion (org-back-to-heading) (beginning-of-line 2) (point))) @@ -3545,6 +3966,7 @@ If the cursor is not in an item, throw an error." (defun org-end-of-item () "Go to the end of the current hand-formatted item. If the cursor is not in an item, throw an error." + (interactive) (let ((pos (point)) (limit (save-excursion (outline-next-heading) (point))) (ind (save-excursion @@ -3564,11 +3986,47 @@ If the cursor is not in an item, throw an error." (goto-char pos) (error "Not in an item")))) -(defun org-move-item-down (arg) +(defun org-next-item () + "Move to the beginning of the next item in the current plain list. +Error if not at a plain list, or if this is the last item in the list." + (interactive) + (let (beg end ind ind1 (pos (point)) txt) + (org-beginning-of-item) + (setq beg (point)) + (setq ind (org-get-indentation)) + (org-end-of-item) + (setq end (point)) + (setq ind1 (org-get-indentation)) + (unless (and (org-at-item-p) (= ind ind1)) + (goto-char pos) + (error "On last item")))) + +(defun org-previous-item () + "Move to the beginning of the previous item in the current plain list. +Error if not at a plain list, or if this is the last item in the list." + (interactive) + (let (beg end ind ind1 (pos (point)) txt) + (org-beginning-of-item) + (setq beg (point)) + (setq ind (org-get-indentation)) + (goto-char beg) + (catch 'exit + (while t + (beginning-of-line 0) + (if (looking-at "[ \t]*$") + nil + (if (<= (setq ind1 (org-get-indentation)) ind) + (throw 'exit t))))) + (condition-case nil + (org-beginning-of-item) + (error (goto-char pos) + (error "On first item"))))) + +(defun org-move-item-down () "Move the plain list item at point down, i.e. swap with following item. Subitems (items with larger indentation) are considered part of the item, so this really moves item trees." - (interactive "p") + (interactive) (let (beg end ind ind1 (pos (point)) txt) (org-beginning-of-item) (setq beg (point)) @@ -3647,7 +4105,7 @@ doing the renumbering." (defun org-renumber-ordered-list (arg) "Renumber an ordered plain list. -Cursor next to be in the first line of an item, the line that starts +Cursor needs to be in the first line of an item, the line that starts with something like \"1.\" or \"2)\"." (interactive "p") (unless (and (org-at-item-p) @@ -3702,24 +4160,24 @@ with something like \"1.\" or \"2)\"." (interactive "p") (unless (org-at-item-p) (error "Not on an item")) - (let (beg end ind ind1) - (if (memq last-command '(org-shiftmetaright org-shiftmetaleft)) + (save-excursion + (let (beg end ind ind1) + (if (memq last-command '(org-shiftmetaright org-shiftmetaleft)) (setq beg org-last-indent-begin-marker end org-last-indent-end-marker) - (org-beginning-of-item) - (setq beg (move-marker org-last-indent-begin-marker (point))) - (org-end-of-item) - (setq end (move-marker org-last-indent-end-marker (point)))) - (goto-char beg) - (skip-chars-forward " \t") (setq ind (current-column)) - (if (< (+ arg ind) 0) (error "Cannot outdent beyond margin")) - (while (< (point) end) - (beginning-of-line 1) - (skip-chars-forward " \t") (setq ind1 (current-column)) - (delete-region (point-at-bol) (point)) - (indent-to-column (+ ind1 arg)) - (beginning-of-line 2)) - (goto-char beg))) + (org-beginning-of-item) + (setq beg (move-marker org-last-indent-begin-marker (point))) + (org-end-of-item) + (setq end (move-marker org-last-indent-end-marker (point)))) + (goto-char beg) + (skip-chars-forward " \t") (setq ind (current-column)) + (if (< (+ arg ind) 0) (error "Cannot outdent beyond margin")) + (while (< (point) end) + (beginning-of-line 1) + (skip-chars-forward " \t") (setq ind1 (current-column)) + (delete-region (point-at-bol) (point)) + (indent-to-column (+ ind1 arg)) + (beginning-of-line 2))))) ;;; Archiving @@ -3789,14 +4247,13 @@ heading be marked DONE, and the current time will be added." (or (bolp) (insert "\n")) (insert "\n" heading "\n") (end-of-line 0)) - ;; Make the heading visible, and the following as well - (let ((org-show-following-heading t)) (org-show-hierarchy-above)) - (if (re-search-forward - (concat "^" (regexp-quote (make-string level ?*)) "[ \t]") - nil t) - (progn (goto-char (match-beginning 0)) (insert "\n") - (beginning-of-line 0)) - (goto-char (point-max)) (insert "\n"))) + ;; Make the subtree visible + (show-subtree) + (org-end-of-subtree t) + (skip-chars-backward " \t\r\n]") + (and (looking-at "[ \t\r\n]*") + (replace-match "\n\n"))) + ;; No specific heading, just go to end of file. (goto-char (point-max)) (insert "\n")) ;; Paste (org-paste-subtree (1+ level)) @@ -3816,7 +4273,7 @@ heading be marked DONE, and the current time will be added." ;; Here we are back in the original buffer. Everything seems to have ;; worked. So now cut the tree and finish up. (let (this-command) (org-cut-subtree)) - (if (looking-at "[ \t]*$") (kill-line)) + (if (and (not (eobp)) (looking-at "[ \t]*$")) (kill-line)) (message "Subtree archived %s" (if (eq this-buffer buffer) (concat "under heading: " heading) @@ -3844,6 +4301,7 @@ At all other locations, this simply calls `ispell-complete-word'." (if (equal (char-before (point)) ?\ ) (backward-char 1)) (skip-chars-backward "a-zA-Z0-9_:$") (point))) + (confirm (lambda (x) (stringp (car x)))) (camel (equal (char-before beg) ?*)) (tag (equal (char-before beg1) ?:)) (texp (equal (char-before beg) ?\\)) @@ -3880,10 +4338,10 @@ At all other locations, this simply calls `ispell-complete-word'." tbl))) tbl) (tag (setq type :tag beg beg1) - (org-get-buffer-tags)) + (or org-tag-alist (org-get-buffer-tags))) (t (progn (ispell-complete-word arg) (throw 'exit nil))))) (pattern (buffer-substring-no-properties beg end)) - (completion (try-completion pattern table))) + (completion (try-completion pattern table confirm))) (cond ((eq completion t) (if (equal type :opt) (insert (substring (cdr (assoc (upcase pattern) table)) @@ -3906,7 +4364,8 @@ At all other locations, this simply calls `ispell-complete-word'." "Press \\[org-complete] again to insert example settings")))) (t (message "Making completion list...") - (let ((list (sort (all-completions pattern table) 'string<))) + (let ((list (sort (all-completions pattern table confirm) + 'string<))) (with-output-to-temp-buffer "*Completions*" (condition-case nil ;; Protection needed for XEmacs and emacs 21 @@ -3960,44 +4419,44 @@ prefix arg, switch to that state." (member (member this org-todo-keywords)) (tail (cdr member)) (state (cond - ((equal arg '(4)) - ;; Read a state with completion - (completing-read "State: " (mapcar (lambda(x) (list x)) - org-todo-keywords) - nil t)) - ((eq arg 'right) - (if this - (if tail (car tail) nil) - (car org-todo-keywords))) - ((eq arg 'left) - (if (equal member org-todo-keywords) - nil - (if this - (nth (- (length org-todo-keywords) (length tail) 2) - org-todo-keywords) - org-done-string))) - (arg - ;; user requests a specific state - (nth (1- (prefix-numeric-value arg)) - org-todo-keywords)) - ((null member) (car org-todo-keywords)) - ((null tail) nil) ;; -> first entry - ((eq org-todo-interpretation 'sequence) - (car tail)) - ((memq org-todo-interpretation '(type priority)) - (if (eq this-command last-command) - (car tail) - (if (> (length tail) 0) org-done-string nil))) - (t nil))) + ((equal arg '(4)) + ;; Read a state with completion + (completing-read "State: " (mapcar (lambda(x) (list x)) + org-todo-keywords) + nil t)) + ((eq arg 'right) + (if this + (if tail (car tail) nil) + (car org-todo-keywords))) + ((eq arg 'left) + (if (equal member org-todo-keywords) + nil + (if this + (nth (- (length org-todo-keywords) (length tail) 2) + org-todo-keywords) + org-done-string))) + (arg + ;; user requests a specific state + (nth (1- (prefix-numeric-value arg)) + org-todo-keywords)) + ((null member) (car org-todo-keywords)) + ((null tail) nil) ;; -> first entry + ((eq org-todo-interpretation 'sequence) + (car tail)) + ((memq org-todo-interpretation '(type priority)) + (if (eq this-command last-command) + (car tail) + (if (> (length tail) 0) org-done-string nil))) + (t nil))) (next (if state (concat " " state " ") " "))) (replace-match next t t) (setq org-last-todo-state-is-todo (not (equal state org-done-string))) (when org-log-done (if (equal state org-done-string) - (org-log-done) + (org-add-planning-info 'closed (current-time) 'scheduled) (if (not this) - (org-log-done t)))) + (org-add-planning-info nil nil 'closed)))) ;; Fixup tag positioning (and org-auto-align-tags (org-set-tags nil t)) (run-hooks 'org-after-todo-state-change-hook))) @@ -4067,25 +4526,79 @@ of `org-todo-keywords'." A timestamp is also inserted - use \\[org-timestamp-up] and \\[org-timestamp-down] to modify it to the correct date." (interactive) - (insert - org-deadline-string " " - (format-time-string (car org-time-stamp-formats) - (org-read-date nil 'to-time))) - (message "%s" (substitute-command-keys - "Use \\[org-timestamp-up-day] and \\[org-timestamp-down-day] to change the date."))) + (org-add-planning-info 'deadline nil 'closed)) (defun org-schedule () "Insert the SCHEDULED: string to schedule a TODO item. A timestamp is also inserted - use \\[org-timestamp-up] and \\[org-timestamp-down] to modify it to the correct date." (interactive) - (insert - org-scheduled-string " " - (format-time-string (car org-time-stamp-formats) - (org-read-date nil 'to-time))) - (message "%s" (substitute-command-keys - "Use \\[org-timestamp-up-day] and \\[org-timestamp-down-day] to change the date."))) - + (org-add-planning-info 'scheduled nil 'closed)) + +(defun org-add-planning-info (what &optional time &rest remove) + "Insert new timestamp with keyword in the line directly after the headline. +WHAT indicates what kind of time stamp to add. TIME indicated the time to use. +If non is given, the user is prompted for a date. +REMOVE indicates what kind of entries to remove. An old WHAT entry will also +be removed." + (interactive) + (when what (setq time (or time (org-read-date nil 'to-time)))) + (when (and org-insert-labeled-timestamps-at-point + (member what '(scheduled deadline))) + (insert + (if (eq what 'scheduled) org-scheduled-string org-deadline-string) + " " + (format-time-string (car org-time-stamp-formats) time)) + (setq what nil)) + (save-excursion + (let (beg end col list elt (buffer-invisibility-spec nil) ts) + (org-back-to-heading t) + (setq beg (point)) + (looking-at (concat outline-regexp "\\( *\\)[^\r\n]*")) + (goto-char (match-end 1)) + (setq col (current-column)) + (goto-char (1+ (match-end 0))) + (if (and (not (looking-at outline-regexp)) + (looking-at (concat "[^\r\n]*?" org-keyword-time-regexp + "[^\r\n]*"))) + (narrow-to-region (match-beginning 0) (match-end 0)) + (insert "\n") + (backward-char 1) + (narrow-to-region (point) (point)) + (indent-to-column col)) + ;; Check if we have to remove something. + (setq list (cons what remove)) + (while list + (setq elt (pop list)) + (goto-char (point-min)) + (when (or (and (eq elt 'scheduled) + (re-search-forward org-scheduled-time-regexp nil t)) + (and (eq elt 'deadline) + (re-search-forward org-deadline-time-regexp nil t)) + (and (eq elt 'closed) + (re-search-forward org-closed-time-regexp nil t))) + (replace-match "") + (if (looking-at " +") (replace-match "")))) + (goto-char (point-max)) + (when what + (insert + (if (not (equal (char-before) ?\ )) " " "") + (cond ((eq what 'scheduled) org-scheduled-string) + ((eq what 'deadline) org-deadline-string) + ((eq what 'closed) org-closed-string)) + " ") + (insert + (setq ts + (format-time-string + (if (eq what 'closed) + (concat "[" (substring (cdr org-time-stamp-formats) 1 -1) "]") + (car org-time-stamp-formats)) + time)))) + (goto-char (point-min)) + (widen) + (if (looking-at "[ \t]+\r?\n") + (replace-match "")) + ts))) (defun org-occur (regexp &optional callback) "Make a compact tree which shows all matches of REGEXP. @@ -4100,7 +4613,7 @@ that the match should indeed be shown." (let ((cnt 0)) (save-excursion (goto-char (point-min)) - (hide-sublevels 1) + (org-overview) (while (re-search-forward regexp nil t) (when (or (not callback) (save-match-data (funcall callback))) @@ -4340,7 +4853,7 @@ used to insert the time stamp into the buffer to include the time." ;; the range start. (if (save-excursion (re-search-backward - (concat org-ts-regexp "--\\=") ; FIXME: exactly two minuses? + (concat org-ts-regexp "--?-?\\=") ; 1-3 minuses (- (point) 20) t)) (apply 'encode-time @@ -4348,8 +4861,8 @@ used to insert the time stamp into the buffer to include the time." (parse-time-string (match-string 1)))) ct)) (calendar-move-hook nil) - (view-calendar-holidays-initially nil) (view-diary-entries-initially nil) + (view-calendar-holidays-initially nil) (timestr (format-time-string (if with-time "%Y-%m-%d %H:%M" "%Y-%m-%d") default-time)) (prompt (format "YYYY-MM-DD [%s]: " timestr)) @@ -4761,7 +5274,6 @@ If there is already a time stamp at the cursor position, update it." (defvar org-agenda-type nil) (defvar org-agenda-force-single-file nil) -;;;###autoload (defun org-agenda-mode () "Mode for time-sorted view on action items in Org-mode files. @@ -4778,7 +5290,7 @@ The following commands are available: (org-add-hook 'post-command-hook 'org-agenda-post-command-hook nil 'local) (org-add-hook 'pre-command-hook 'org-unhighlight nil 'local) (unless org-agenda-keep-modes - (setq org-agenda-follow-mode nil + (setq org-agenda-follow-mode org-agenda-start-with-follow-mode org-agenda-show-log nil)) (easy-menu-change '("Agenda") "Agenda Files" @@ -4815,6 +5327,8 @@ The following commands are available: (define-key org-agenda-mode-map [?\C-c ?\C-x (left)] 'org-agenda-date-earlier) (define-key org-agenda-mode-map ">" 'org-agenda-date-prompt) +(define-key org-agenda-mode-map "\C-c\C-s" 'org-agenda-schedule) +(define-key org-agenda-mode-map "\C-c\C-d" 'org-agenda-deadline) (let ((l '(1 2 3 4 5 6 7 8 9 0))) (while l (define-key org-agenda-mode-map (int-to-string (pop l)) 'digit-argument))) @@ -4878,10 +5392,12 @@ The following commands are available: ("Tags" ["Show all Tags" org-agenda-show-tags t] ["Set Tags" org-agenda-set-tags t]) - ("Reschedule" + ("Schedule" + ["Schedule" org-agenda-schedule t] + ["Set Deadline" org-agenda-deadline t] + "--" ["Reschedule +1 day" org-agenda-date-later (org-agenda-check-type nil 'agenda 'timeline)] ["Reschedule -1 day" org-agenda-date-earlier (org-agenda-check-type nil 'agenda 'timeline)] - "--" ["Reschedule to ..." org-agenda-date-prompt (org-agenda-check-type nil 'agenda 'timeline)]) ("Priority" ["Set Priority" org-agenda-priority t] @@ -4945,6 +5461,7 @@ next use of \\[org-agenda]) restricted to the current file." (interactive "P") (catch 'exit (let ((restrict-ok (and buffer-file-name (eq major-mode 'org-mode))) + (bfn buffer-file-name) (custom org-agenda-custom-commands) c entry key type string) (put 'org-agenda-files 'org-restrict nil) @@ -4979,7 +5496,7 @@ C Configure your own agenda commands") (message "") (when (equal c ?1) (if restrict-ok - (put 'org-agenda-files 'org-restrict (list buffer-file-name)) + (put 'org-agenda-files 'org-restrict (list bfn)) (error "Cannot restrict agenda to current buffer")) (message "Press key for agenda command%s" (if restrict-ok " (restricted to current file)" "")) @@ -4991,18 +5508,16 @@ C Configure your own agenda commands") ((equal c ?C) (customize-variable 'org-agenda-custom-commands)) ((equal c ?a) (call-interactively 'org-agenda-list)) ((equal c ?t) (call-interactively 'org-todo-list)) - ((equal c ?T) - (setq current-prefix-arg (or arg '(4))) - (call-interactively 'org-todo-list)) + ((equal c ?T) (org-call-with-arg 'org-todo-list (or arg '(4)))) ((equal c ?m) (call-interactively 'org-tags-view)) - ((equal c ?M) - (setq current-prefix-arg (or arg '(4))) - (call-interactively 'org-tags-view)) + ((equal c ?M) (org-call-with-arg 'org-tags-view (or arg '(4)))) ((setq entry (assoc (char-to-string c) org-agenda-custom-commands)) (setq type (nth 1 entry) string (nth 2 entry)) (cond ((eq type 'tags) (org-tags-view current-prefix-arg string)) + ((eq type 'tags-todo) + (org-tags-view '(4) string)) ((eq type 'todo) (org-todo-list string)) ((eq type 'tags-tree) @@ -5159,12 +5674,13 @@ dates." (beg (if (org-region-active-p) (region-beginning) (point-min))) (end (if (org-region-active-p) (region-end) (point-max))) (day-numbers (org-get-all-dates beg end 'no-ranges - t doclosed)) ; always include today + t doclosed ; always include today + org-timeline-show-empty-dates)) (today (time-to-days (current-time))) (org-respect-restriction t) (past t) args - s e rtn d) + s e rtn d emptyp) (setq org-agenda-redo-command (list 'progn (list 'switch-to-buffer-other-window (current-buffer)) @@ -5184,28 +5700,35 @@ dates." (push :timestamp args) (if dotodo (push :todo args)) (while (setq d (pop day-numbers)) - (if (and (>= d today) - dopast - past) - (progn - (setq past nil) - (insert (make-string 79 ?-) "\n"))) - (setq date (calendar-gregorian-from-absolute d)) - (setq s (point)) - (setq rtn (apply 'org-agenda-get-day-entries - entry date args)) - (if (or rtn (equal d today)) + (if (and (listp d) (eq (car d) :omitted)) (progn - (insert (calendar-day-name date) " " - (number-to-string (extract-calendar-day date)) " " - (calendar-month-name (extract-calendar-month date)) " " - (number-to-string (extract-calendar-year date)) "\n") - (put-text-property s (1- (point)) 'face - 'org-level-3) - (if (equal d today) - (put-text-property s (1- (point)) 'org-today t)) - (insert (org-finalize-agenda-entries rtn) "\n") - (put-text-property s (1- (point)) 'day d)))) + (setq s (point)) + (insert (format "\n[... %d empty days omitted]\n\n" (cdr d))) + (put-text-property s (1- (point)) 'face 'org-level-3)) + (if (listp d) (setq d (car d) emptyp t) (setq emptyp nil)) + (if (and (>= d today) + dopast + past) + (progn + (setq past nil) + (insert (make-string 79 ?-) "\n"))) + (setq date (calendar-gregorian-from-absolute d)) + (setq s (point)) + (setq rtn (and (not emptyp) + (apply 'org-agenda-get-day-entries + entry date args))) + (if (or rtn (equal d today) org-timeline-show-empty-dates) + (progn + (insert (calendar-day-name date) " " + (number-to-string (extract-calendar-day date)) " " + (calendar-month-name (extract-calendar-month date)) " " + (number-to-string (extract-calendar-year date)) "\n") + (put-text-property s (1- (point)) 'face + 'org-level-3) + (if (equal d today) + (put-text-property s (1- (point)) 'org-today t)) + (and rtn (insert (org-finalize-agenda-entries rtn) "\n")) + (put-text-property s (1- (point)) 'day d))))) (goto-char (point-min)) (setq buffer-read-only t) (goto-char (or (text-property-any (point-min) (point-max) 'org-today t) @@ -5432,7 +5955,7 @@ If ERROR is non-nil, throw an error, otherwise just return nil." (if (memq org-agenda-type types) t (if error - (error "Now allowed in %s-type agenda buffers" org-agenda-type) + (error "Not allowed in %s-type agenda buffers" org-agenda-type) nil))) (defun org-agenda-quit () @@ -5768,14 +6291,15 @@ Optional argument FILE means, use this file instead of the current." (defun org-file-menu-entry (file) (vector file (list 'find-file file) t)) -(defun org-get-all-dates (beg end &optional no-ranges force-today inactive) +(defun org-get-all-dates (beg end &optional no-ranges force-today inactive empty) "Return a list of all relevant day numbers from BEG to END buffer positions. If NO-RANGES is non-nil, include only the start and end dates of a range, not every single day in the range. If FORCE-TODAY is non-nil, make sure that TODAY is included in the list. If INACTIVE is non-nil, also -inactive time stamps (those in square brackets) are included." +inactive time stamps (those in square brackets) are included. +When EMPTY is non-nil, also include days without any entries." (let ((re (if inactive org-ts-regexp-both org-ts-regexp)) - dates date day day1 day2 ts1 ts2) + dates dates1 date day day1 day2 ts1 ts2) (if force-today (setq dates (list (time-to-days (current-time))))) (save-excursion @@ -5793,7 +6317,19 @@ inactive time stamps (those in square brackets) are included." day2 (time-to-days (org-time-string-to-time ts2))) (while (< (setq day1 (1+ day1)) day2) (or (memq day1 dates) (push day1 dates))))) - (sort dates '<)))) + (setq dates (sort dates '<)) + (when empty + (while (setq day (pop dates)) + (setq day2 (car dates)) + (push day dates1) + (when (and day2 empty) + (if (or (eq empty t) + (and (numberp empty) (<= (- day2 day) empty))) + (while (< (setq day (1+ day)) day2) + (push (list day) dates1)) + (push (cons :omitted (- day2 day)) dates1)))) + (setq dates (nreverse dates1))) + dates))) ;;;###autoload (defun org-diary (&rest args) @@ -5977,27 +6513,32 @@ the documentation of `org-diary'." "\\)\\>") org-not-done-regexp) "[^\n\r]*\\)")) + (sched-re (concat ".*\n?.*?" org-scheduled-time-regexp)) marker priority category tags ee txt) (goto-char (point-min)) (while (re-search-forward regexp nil t) - (goto-char (match-beginning 1)) - (setq marker (org-agenda-new-marker (1+ (match-beginning 0))) - category (org-get-category) - tags (org-get-tags-at (point)) - txt (org-format-agenda-item "" (match-string 1) category tags) - priority - (+ (org-get-priority txt) - (if org-todo-kwd-priority-p - (- org-todo-kwd-max-priority -2 - (length - (member (match-string 2) org-todo-keywords))) - 1))) - (org-add-props txt props - 'org-marker marker 'org-hd-marker marker - 'priority priority 'category category) - (push txt ee) - (goto-char (match-end 1))) + (when (not (and org-agenda-todo-ignore-scheduled + (save-match-data (looking-at sched-re)))) + (goto-char (match-beginning 1)) + (setq marker (org-agenda-new-marker (1+ (match-beginning 0))) + category (org-get-category) + tags (org-get-tags-at (point)) + txt (org-format-agenda-item "" (match-string 1) category tags) + priority + (+ (org-get-priority txt) + (if org-todo-kwd-priority-p + (- org-todo-kwd-max-priority -2 + (length + (member (match-string 2) org-todo-keywords))) + 1))) + (org-add-props txt props + 'org-marker marker 'org-hd-marker marker + 'priority priority 'category category) + (push txt ee)) + (if org-agenda-todo-list-sublevels + (goto-char (match-end 1)) + (org-end-of-subtree 'invisible))) (nreverse ee))) (defconst org-agenda-no-heading-message @@ -6133,7 +6674,7 @@ the documentation of `org-diary'." (todayp (equal date (calendar-current-date))) ; DATE bound by calendar (d1 (calendar-absolute-from-gregorian date)) ; DATE bound by calendar d2 diff pos pos1 category tags - ee txt head) + ee txt head face) (goto-char (point-min)) (while (re-search-forward regexp nil t) (setq pos (1- (match-beginning 1)) @@ -6160,20 +6701,16 @@ the documentation of `org-diary'." (setq txt (org-format-agenda-item (format "In %3d d.: " diff) head category tags)))) (setq txt org-agenda-no-heading-message)) - (when txt + (when txt + (setq face (cond ((<= diff 0) 'org-warning) + ((<= diff 5) 'org-upcoming-deadline) + (t nil))) (org-add-props txt props 'org-marker (org-agenda-new-marker pos) 'org-hd-marker (org-agenda-new-marker pos1) 'priority (+ (- 10 diff) (org-get-priority txt)) 'category category - 'face (cond ((<= diff 0) 'org-warning) - ((<= diff 5) 'org-scheduled-previously) - (t nil)) - 'undone-face (cond - ((<= diff 0) 'org-warning) - ((<= diff 5) 'org-scheduled-previously) - (t nil)) - 'done-face 'org-done) + 'face face 'undone-face face 'done-face 'org-done) (push txt ee))))) ee)) @@ -6351,14 +6888,19 @@ only the correctly processes TXT should be returned - this is used by t)) (setq txt (replace-match "" nil nil txt)))) ;; Normalize the time(s) to 24 hour - (if s1 (setq s1 (org-get-time-of-day s1 'string))) - (if s2 (setq s2 (org-get-time-of-day s2 'string)))) - - (when (and (or (eq org-agenda-remove-tags-when-in-prefix t) - (and org-agenda-remove-tags-when-in-prefix - org-prefix-has-tag)) - (string-match ":[a-zA-Z_@0-9:]+:[ \t]*$" txt)) - (setq txt (replace-match "" t t txt))) + (if s1 (setq s1 (org-get-time-of-day s1 'string t))) + (if s2 (setq s2 (org-get-time-of-day s2 'string t)))) + + (when (string-match "\\([ \t]+\\)\\(:[a-zA-Z_@0-9:]+:\\)[ \t]*$" txt) + ;; Tags are in the string + (if (or (eq org-agenda-remove-tags-when-in-prefix t) + (and org-agenda-remove-tags-when-in-prefix + org-prefix-has-tag)) + (setq txt (replace-match "" t t txt)) + (setq txt (replace-match + (concat (make-string (max (- 50 (length txt)) 1) ?\ ) + (match-string 2 txt)) + t t txt)))) ;; Create the final string (if noprefix @@ -6438,7 +6980,7 @@ The resulting form is returned and stored in the variable (setq vars (nreverse vars)) (setq org-prefix-format-compiled `(format ,s ,@vars)))) -(defun org-get-time-of-day (s &optional string) +(defun org-get-time-of-day (s &optional string mod24) "Check string S for a time of day. If found, return it as a military time number between 0 and 2400. If not found, return nil. @@ -6451,16 +6993,19 @@ HH:MM." "\\<\\([012]?[0-9]\\)\\(:\\([0-5][0-9]\\)\\)\\([AaPp][Mm]\\)?\\> *" s) (string-match "\\<\\([012]?[0-9]\\)\\(:\\([0-5][0-9]\\)\\)?\\([AaPp][Mm]\\)\\> *" s)) - (let* ((t0 (+ (* 100 - (+ (string-to-number (match-string 1 s)) - (if (and (match-beginning 4) - (equal (downcase (match-string 4 s)) "pm")) - 12 0))) - (if (match-beginning 3) - (string-to-number (match-string 3 s)) - 0))) - (t1 (concat " " - (if (< t0 100) "0" "") (if (< t0 10) "0" "") + (let* ((h (string-to-number (match-string 1 s))) + (m (if (match-end 3) (string-to-number (match-string 3 s)) 0)) + (ampm (if (match-end 4) (downcase (match-string 4 s)))) + (am-p (equal ampm "am")) + (h1 (cond ((not ampm) h) + ((= h 12) (if am-p 0 12)) + (t (+ h (if am-p 0 12))))) + (h2 (if (and string mod24 (not (and (= m 0) (= h1 24)))) + (mod h1 24) h1)) + (t0 (+ (* 100 h2) m)) + (t1 (concat (if (>= h1 24) "+" " ") + (if (< t0 100) "0" "") + (if (< t0 10) "0" "") (int-to-string t0)))) (if string (concat (substring t1 -4 -2) ":" (substring t1 -2)) t0))))) @@ -6470,7 +7015,7 @@ HH:MM." (mapconcat 'identity (sort list 'org-entries-lessp) "\n")) (defun org-agenda-highlight-todo (x) - (let (re) + (let (re pl) (if (eq x 'line) (save-excursion (beginning-of-line 1) @@ -6479,8 +7024,9 @@ HH:MM." (and (looking-at (concat "[ \t]*" re)) (add-text-properties (match-beginning 0) (match-end 0) '(face org-todo)))) - (setq re (get-text-property 0 'org-not-done-regexp x)) - (and re (string-match re x) + (setq re (get-text-property 0 'org-not-done-regexp x) + pl (get-text-property 0 'prefix-length x)) + (and re (equal (string-match re x pl) pl) (add-text-properties (match-beginning 0) (match-end 0) '(face org-todo) x)) x))) @@ -6503,7 +7049,7 @@ HH:MM." (defsubst org-cmp-time (a b) "Compare the time-of-day values of strings A and B." - (let* ((def (if org-sort-agenda-notime-is-late 2401 -1)) + (let* ((def (if org-sort-agenda-notime-is-late 9901 -1)) (ta (or (get-text-property 1 'time-of-day a) def)) (tb (or (get-text-property 1 'time-of-day b) def))) (cond ((< ta tb) -1) @@ -6537,7 +7083,8 @@ and by additional input from the age of a schedules or deadline entry." (interactive) (let* ((tags (get-text-property (point-at-bol) 'tags))) (if tags - (message "Tags are :%s:" (mapconcat 'identity tags ":")) + (message "Tags are :%s:" + (org-no-properties (mapconcat 'identity tags ":"))) (message "No tags associated with this line")))) (defun org-agenda-goto (&optional highlight) @@ -6723,7 +7270,7 @@ the same tree node, and the headline of the tree node in the Org-mode file." (beginning-of-line 1))) (defun org-get-tags-at (&optional pos) - "Get a list of all headline targs applicable at POS. + "Get a list of all headline tags applicable at POS. POS defaults to point. If tags are inherited, the list contains the targets in the same sequence as the headlines appear, i.e. the tags of the current headline come last." @@ -6736,7 +7283,9 @@ the tags of the current headline come last." (condition-case nil (while t (if (looking-at "[^\r\n]+?:\\([a-zA-Z_@0-9:]+\\):[ \t]*\\([\n\r]\\|\\'\\)") - (setq tags (append (org-split-string (match-string 1) ":") tags))) + (setq tags (append (org-split-string + (org-match-string-no-properties 1) ":") + tags))) (or org-use-tag-inheritance (error "")) (org-up-heading-all 1)) (error nil)))) @@ -6808,6 +7357,40 @@ be used to request time specification in the time stamp." (org-time-stamp arg) (message "Time stamp changed to %s" org-last-changed-timestamp)))) +(defun org-agenda-schedule (arg) + "Schedule the item at point." + (interactive "P") + (org-agenda-check-type t 'agenda 'timeline 'todo 'tags) + (org-agenda-check-no-diary) + (let* ((marker (or (get-text-property (point) 'org-marker) + (org-agenda-error))) + (buffer (marker-buffer marker)) + (pos (marker-position marker)) + (org-insert-labeled-timestamps-at-point nil) + ts) + (with-current-buffer buffer + (widen) + (goto-char pos) + (setq ts (org-schedule)) + (message "Item scheduled for %s" ts)))) + +(defun org-agenda-deadline (arg) + "Schedule the item at point." + (interactive "P") + (org-agenda-check-type t 'agenda 'timeline 'todo 'tags) + (org-agenda-check-no-diary) + (let* ((marker (or (get-text-property (point) 'org-marker) + (org-agenda-error))) + (buffer (marker-buffer marker)) + (pos (marker-position marker)) + (org-insert-labeled-timestamps-at-point nil) + ts) + (with-current-buffer buffer + (widen) + (goto-char pos) + (setq ts (org-deadline)) + (message "Deadline for this item set to %s" ts)))) + (defun org-get-heading () "Return the heading of the current entry, without the stars." (save-excursion @@ -6980,7 +7563,7 @@ are included in the output." (save-excursion (goto-char (point-min)) - (when (eq action 'sparse-tree) (hide-sublevels 1)) + (when (eq action 'sparse-tree) (org-overview)) (while (re-search-forward re nil t) (setq todo (if (match-end 1) (match-string 2)) tags (if (match-end 4) (match-string 4))) @@ -7108,6 +7691,7 @@ The prefix arg TODO-ONLY limits the search to TODO entries." (with-current-buffer buffer (unless (eq major-mode 'org-mode) (error "Agenda file %s is not in `org-mode'" file)) + (setq org-category-table (org-get-category-table)) (save-excursion (save-restriction (if org-respect-restriction @@ -7139,11 +7723,11 @@ The prefix arg TODO-ONLY limits the search to TODO entries." (defun org-set-tags (&optional arg just-align) "Set the tags for the current headline. With prefix ARG, realign all tags in headings in the current buffer." - (interactive) - (let* (;(inherit (org-get-inherited-tags)) - (re (concat "^" outline-regexp)) + (interactive "P") + (let* ((re (concat "^" outline-regexp)) (col (current-column)) (current (org-get-tags)) + table current-tags inherited-tags ; computed below when needed tags hd empty invis) (if arg (save-excursion @@ -7153,16 +7737,23 @@ With prefix ARG, realign all tags in headings in the current buffer." (message "All tags realigned to column %d" org-tags-column)) (if just-align (setq tags current) - (setq org-last-tags-completion-table - (or (org-get-buffer-tags) - org-last-tags-completion-table)) - (setq tags - (let ((org-add-colon-after-tag-completion t)) - (completing-read "Tags: " 'org-tags-completion-function - nil nil current 'org-tags-history))) + (setq table (or org-tag-alist (org-get-buffer-tags)) + org-last-tags-completion-table table + current-tags (org-split-string current ":") + inherited-tags (nreverse + (nthcdr (length current-tags) + (nreverse (org-get-tags-at)))) + tags + (if (or (eq t org-use-fast-tag-selection) + (and org-use-fast-tag-selection + (delq nil (mapcar 'cdr table)))) + (org-fast-tag-selection current-tags inherited-tags table) + (let ((org-add-colon-after-tag-completion t)) + (completing-read "Tags: " 'org-tags-completion-function + nil nil current 'org-tags-history)))) (while (string-match "[-+&]+" tags) (setq tags (replace-match ":" t t tags)))) - ;; FIXME: still optimize this by not checking when JUST-ALIGN? + (unless (setq empty (string-match "\\`[\t ]*\\'" tags)) (unless (string-match ":$" tags) (setq tags (concat tags ":"))) (unless (string-match "^:" tags) (setq tags (concat ":" tags)))) @@ -7188,7 +7779,8 @@ With prefix ARG, realign all tags in headings in the current buffer." (move-to-column col)))) (defun org-tags-completion-function (string predicate &optional flag) - (let (s1 s2 rtn (ctable org-last-tags-completion-table)) + (let (s1 s2 rtn (ctable org-last-tags-completion-table) + (confirm (lambda (x) (stringp (car x))))) (if (string-match "^\\(.*[-+:&|]\\)\\([^-+:&|]*\\)$" string) (setq s1 (match-string 1 string) s2 (match-string 2 string)) @@ -7196,7 +7788,7 @@ With prefix ARG, realign all tags in headings in the current buffer." (cond ((eq flag nil) ;; try completion - (setq rtn (try-completion s2 ctable)) + (setq rtn (try-completion s2 ctable confirm)) (if (stringp rtn) (concat s1 s2 (substring rtn (length s2)) (if (and org-add-colon-after-tag-completion @@ -7205,13 +7797,133 @@ With prefix ARG, realign all tags in headings in the current buffer." ) ((eq flag t) ;; all-completions - (all-completions s2 ctable) + (all-completions s2 ctable confirm) ) ((eq flag 'lambda) ;; exact match? (assoc s2 ctable))) )) +(defun org-fast-tag-insert (kwd tags face &optional end) + "Insert KDW, and the TAGS, the latter with face FACE. Also inser END." + (insert (format "%-12s" (concat kwd ":")) + (org-add-props (mapconcat 'identity tags " ") nil 'face face) + (or end ""))) + +(defun org-fast-tag-selection (current inherited table) + "Fast tag selection with single keys. +CURRENT is the current list of tags in the headline, INHERITED is the +list of inherited tags, and TABLE is an alist of tags and corresponding keys, +possibly with grouping information. +If the keys are nil, a-z are automatically assigned. +Returns the new tags string, or nil to not change the current settings." + (let* ((maxlen (apply 'max (mapcar + (lambda (x) + (if (stringp (car x)) (string-width (car x)) 0)) + table))) + (fwidth (+ maxlen 3 1 3)) + (ncol (/ (- (window-width) 4) fwidth)) + (i-face 'org-done) + (c-face 'org-tag) + tg cnt e c char c1 c2 ntable tbl rtn + groups ingroup) + (save-window-excursion + (delete-other-windows) + (split-window-vertically) + (switch-to-buffer-other-window (get-buffer-create " *Org tags*")) + (erase-buffer) + (org-fast-tag-insert "Inherited" inherited i-face "\n") + (org-fast-tag-insert "Current" current c-face "\n\n") + (setq tbl table char ?a cnt 0) + (while (setq e (pop tbl)) + (cond + ((equal e '(:startgroup)) + (push '() groups) (setq ingroup t) + (when (not (= cnt 0)) + (setq cnt 0) + (insert "\n")) + (insert "{ ")) + ((equal e '(:endgroup)) + (setq ingroup nil cnt 0) + (insert "}\n")) + (t + (setq tg (car e) c2 nil) + (if (cdr e) + (setq c (cdr e)) + ;; automatically assign a character. + (setq c1 (string-to-char + (downcase (substring + tg (if (= (string-to-char tg) ?@) 1 0))))) + (if (or (rassoc c1 ntable) (rassoc c1 table)) + (while (or (rassoc char ntable) (rassoc char table)) + (setq char (1+ char))) + (setq c2 c1)) + (setq c (or c2 char))) + (if ingroup (push tg (car groups))) + (setq tg (org-add-props tg nil 'face + (cond + ((member tg current) c-face) + ((member tg inherited) i-face) + (t nil)))) + (if (and (= cnt 0) (not ingroup)) (insert " ")) + (insert "[" c "] " tg (make-string + (- fwidth 4 (length tg)) ?\ )) + (push (cons tg c) ntable) + (when (= (setq cnt (1+ cnt)) ncol) + (insert "\n") + (if ingroup (insert " ")) + (setq cnt 0))))) + (setq ntable (nreverse ntable)) + (insert "\n") + (goto-char (point-min)) + (if (fboundp 'fit-window-to-buffer) (fit-window-to-buffer)) + (setq rtn + (catch 'exit + (while t + (message "[key]:Toggle SPC: clear current RET accept%s" + (if groups " [!] ignore goups" "")) + (setq c (read-char-exclusive)) + (cond + ((= c ?\r) (throw 'exit t)) + ((= c ?!) + (setq groups nil) + (goto-char (point-min)) + (while (re-search-forward "[{}]" nil t) (replace-match " "))) + ((or (= c ?\C-g) + (and (= c ?q) (not (rassoc c ntable)))) + (setq quit-flag t)) + ((= c ?\ ) (setq current nil)) + ((setq e (rassoc c ntable) tg (car e)) + (if (member tg current) + (setq current (delete tg current)) + (loop for g in groups do + (if (member tg g) + (mapcar (lambda (x) + (setq current (delete x current))) + g))) + (setq current (cons tg current))))) + ;; Create a sorted list + (setq current + (sort current + (lambda (a b) + (assoc b (cdr (memq (assoc a ntable) ntable)))))) + (goto-char (point-min)) + (beginning-of-line 2) + (delete-region (point) (point-at-eol)) + (org-fast-tag-insert "Current" current c-face) + (while (re-search-forward "\\[.\\] \\([a-zA-Z0-9_@]+\\)" nil t) + (setq tg (match-string 1)) + (add-text-properties (match-beginning 1) (match-end 1) + (list 'face + (cond + ((member tg current) c-face) + ((member tg inherited) i-face) + (t nil))))) + (goto-char (point-min))))) + (if rtn + (mapconcat 'identity current ":") + nil)))) + (defun org-get-tags () "Get the TAGS string in the current headline." (unless (org-on-heading-p) @@ -7234,6 +7946,50 @@ With prefix ARG, realign all tags in headings in the current buffer." ;;; Link Stuff +(defvar org-create-file-search-functions nil + "List of functions to construct the right search string for a file link. +These functions are called in turn with point at the location to +which the link should point. + +A function in the hook should first test if it would like to +handle this file type, for example by checking the major-mode or +the file extension. If it decides not to handle this file, it +should just return nil to give other functions a chance. If it +does handle the file, it must return the search string to be used +when following the link. The search string will be part of the +file link, given after a double colon, and `org-open-at-point' +will automatically search for it. If special measures must be +taken to make the search successful, another function should be +added to the companion hook `org-execute-file-search-functions', +which see. + +A function in this hook may also use `setq' to set the variable +`description' to provide a suggestion for the descriptive text to +be used for this link when it gets inserted into an Org-mode +buffer with \\[org-insert-link].") + +(defvar org-execute-file-search-functions nil + "List of functions to execute a file search triggered by a link. + +Functions added to this hook must accept a single argument, the +search string that was part of the file link, the part after the +double colon. The function must first check if it would like to +handle this search, for example by checking the major-mode or the +file extension. If it decides not to handle this search, it +should just return nil to give other functions a chance. If it +does handle the search, it must return a non-nil value to keep +other functions from trying. + +Each function can access the current prefix argument through the +variable `current-prefix-argument'. Note that a single prefix is +used to force opening a link in Emacs, so it may be good to only +use a numeric or double prefix to guide the search function. + +In case this is needed, a function in this hook can also restore +the window configuration before `org-open-at-point' was called using: + + (set-window-configuration org-window-config-before-follow-link)") + (defun org-find-file-at-mouse (ev) "Open file link or URL at mouse." (interactive "e") @@ -7246,6 +8002,10 @@ With prefix ARG, realign all tags in headings in the current buffer." (mouse-set-point ev) (org-open-at-point)) +(defvar org-window-config-before-follow-link nil + "The window configuration before following a link. +This is saved in case the need arises to restore it.") + (defun org-open-at-point (&optional in-emacs) "Open link at or after point. If there is no link at point, this function will search forward up to @@ -7253,6 +8013,7 @@ the end of the current subtree. Normally, files will be opened by an appropriate application. If the optional argument IN-EMACS is non-nil, Emacs will visit the file." (interactive "P") + (setq org-window-config-before-follow-link (current-window-configuration)) (org-remove-occur-highlights nil nil t) (if (org-at-timestamp-p) (org-agenda-list nil (time-to-days (org-time-string-to-time @@ -7336,7 +8097,7 @@ optional argument IN-EMACS is non-nil, Emacs will visit the file." (t nil)))) ((string= type "file") - (if (string-match "::?\\([0-9]+\\)\\'" path) ;; second : optional + (if (string-match "::\\([0-9]+\\)\\'" path) (setq line (string-to-number (match-string 1 path)) path (substring path 0 (match-beginning 0))) (if (string-match "::\\(.+\\)\\'" path) @@ -7350,6 +8111,9 @@ optional argument IN-EMACS is non-nil, Emacs will visit the file." ((string= type "bbdb") (org-follow-bbdb-link path)) + ((string= type "info") + (org-follow-info-link path)) + ((string= type "gnus") (let (group article) (if (not (string-match "\\`\\([^#]+\\)\\(#\\(.*\\)\\)?" path)) @@ -7397,8 +8161,8 @@ optional argument IN-EMACS is non-nil, Emacs will visit the file." (setq cmd (replace-match "<" t t cmd))) (while (string-match "@}" cmd) (setq cmd (replace-match ">" t t cmd))) - (if (or (not org-confirm-shell-links) - (funcall org-confirm-shell-links + (if (or (not org-confirm-shell-link-function) + (funcall org-confirm-shell-link-function (format "Execute \"%s\" in shell? " (org-add-props cmd nil 'face 'org-warning)))) @@ -7407,6 +8171,16 @@ optional argument IN-EMACS is non-nil, Emacs will visit the file." (shell-command cmd)) (error "Abort")))) + ((string= type "elisp") + (let ((cmd path)) + (if (or (not org-confirm-elisp-link-function) + (funcall org-confirm-elisp-link-function + (format "Execute \"%s\" as elisp? " + (org-add-props cmd nil + 'face 'org-warning)))) + (message "%s => %s" cmd (eval (read cmd))) + (error "Abort")))) + (t (browse-url-at-point)))))) @@ -7423,73 +8197,77 @@ in all files." (pos (point)) (pre "") (post "") words re0 re1 re2 re3 re4 re5 re2a reall camel) - (cond ((save-excursion - (goto-char (point-min)) - (and - (re-search-forward - (concat "<<" (regexp-quote s0) ">>") nil t) - (setq pos (match-beginning 0)))) - ;; There is an exact target for this - (goto-char pos)) - ((string-match "^/\\(.*\\)/$" s) - ;; A regular expression - (cond - ((eq major-mode 'org-mode) - (org-occur (match-string 1 s))) - ;;((eq major-mode 'dired-mode) - ;; (grep (concat "grep -n -e '" (match-string 1 s) "' *"))) - (t (org-do-occur (match-string 1 s))))) - ((or (setq camel (string-match (concat "^" org-camel-regexp "$") s)) - t) - ;; A camel or a normal search string - (when (equal (string-to-char s) ?*) - ;; Anchor on headlines, post may include tags. - (setq pre "^\\*+[ \t]*\\(\\sw+\\)?[ \t]*" - post "[ \t]*\\([ \t]+:[a-zA-Z_@0-9:+]:[ \t]*\\)?$" - s (substring s 1))) - (remove-text-properties - 0 (length s) - '(face nil mouse-face nil keymap nil fontified nil) s) - ;; Make a series of regular expressions to find a match - (setq words - (if camel - (org-camel-to-words s) - (org-split-string s "[ \n\r\t]+")) - re0 (concat "<<" (regexp-quote s0) ">>") - re2 (concat "\\<" (mapconcat 'downcase words "[ \t]+") "\\>") - re2a (concat "\\<" (mapconcat 'downcase words "[ \t\r\n]+") "\\>") - re4 (concat "\\<" (mapconcat 'downcase words "[^a-zA-Z_\r\n]+") "\\>") - re1 (concat pre re2 post) - re3 (concat pre re4 post) - re5 (concat pre ".*" re4) - re2 (concat pre re2) - re2a (concat pre re2a) - re4 (concat pre re4) - reall (concat "\\(" re0 "\\)\\|\\(" re1 "\\)\\|\\(" re2 - "\\)\\|\\(" re3 "\\)\\|\\(" re4 "\\)\\|\\(" - re5 "\\)" - )) - (cond - ((eq type 'org-occur) (org-occur reall)) - ((eq type 'occur) (org-do-occur (downcase reall) 'cleanup)) - (t (goto-char (point-min)) - (if (or (org-search-not-link re0 nil t) - (org-search-not-link re1 nil t) - (org-search-not-link re2 nil t) - (org-search-not-link re2a nil t) - (org-search-not-link re3 nil t) - (org-search-not-link re4 nil t) - (org-search-not-link re5 nil t) - ) - (goto-char (match-beginning 0)) - (goto-char pos) - (error "No match"))))) - (t - ;; Normal string-search - (goto-char (point-min)) - (if (search-forward s nil t) - (goto-char (match-beginning 0)) - (error "No match")))) + (cond + ;; First check if there are any special + ((run-hook-with-args-until-success 'org-execute-file-search-functions s)) + ;; Now try the builtin stuff + ((save-excursion + (goto-char (point-min)) + (and + (re-search-forward + (concat "<<" (regexp-quote s0) ">>") nil t) + (setq pos (match-beginning 0)))) + ;; There is an exact target for this + (goto-char pos)) + ((string-match "^/\\(.*\\)/$" s) + ;; A regular expression + (cond + ((eq major-mode 'org-mode) + (org-occur (match-string 1 s))) + ;;((eq major-mode 'dired-mode) + ;; (grep (concat "grep -n -e '" (match-string 1 s) "' *"))) + (t (org-do-occur (match-string 1 s))))) + ((or (setq camel (string-match (concat "^" org-camel-regexp "$") s)) + t) + ;; A camel or a normal search string + (when (equal (string-to-char s) ?*) + ;; Anchor on headlines, post may include tags. + (setq pre "^\\*+[ \t]*\\(?:\\sw+\\)?[ \t]*" + post "[ \t]*\\(?:[ \t]+:[a-zA-Z_@0-9:+]:[ \t]*\\)?$" + s (substring s 1))) + (remove-text-properties + 0 (length s) + '(face nil mouse-face nil keymap nil fontified nil) s) + ;; Make a series of regular expressions to find a match + (setq words + (if camel + (org-camel-to-words s) + (org-split-string s "[ \n\r\t]+")) + re0 (concat "\\(<<" (regexp-quote s0) ">>\\)") + re2 (concat "[ \t\r\n]\\(" (mapconcat 'downcase words "[ \t]+") "\\)[ \t\r\n]") + re2a (concat "[ \t\r\n]\\(" (mapconcat 'downcase words "[ \t\r\n]+") "\\)[ \t\r\n]") + re4 (concat "[^a-zA-Z_]\\(" (mapconcat 'downcase words "[^a-zA-Z_\r\n]+") "\\)[^a-zA-Z_]") + re1 (concat pre re2 post) + re3 (concat pre re4 post) + re5 (concat pre ".*" re4) + re2 (concat pre re2) + re2a (concat pre re2a) + re4 (concat pre re4) + reall (concat "\\(" re0 "\\)\\|\\(" re1 "\\)\\|\\(" re2 + "\\)\\|\\(" re3 "\\)\\|\\(" re4 "\\)\\|\\(" + re5 "\\)" + )) + (cond + ((eq type 'org-occur) (org-occur reall)) + ((eq type 'occur) (org-do-occur (downcase reall) 'cleanup)) + (t (goto-char (point-min)) + (if (or (org-search-not-link re0 nil t) + (org-search-not-link re1 nil t) + (org-search-not-link re2 nil t) + (org-search-not-link re2a nil t) + (org-search-not-link re3 nil t) + (org-search-not-link re4 nil t) + (org-search-not-link re5 nil t) + ) + (goto-char (match-beginning 1)) + (goto-char pos) + (error "No match"))))) + (t + ;; Normal string-search + (goto-char (point-min)) + (if (search-forward s nil t) + (goto-char (match-beginning 0)) + (error "No match")))) (and (eq major-mode 'org-mode) (org-show-hierarchy-above)))) (defun org-search-not-link (&rest args) @@ -7609,6 +8387,18 @@ onto the ring." (delete-window (get-buffer-window "*BBDB*")) (error "No matching BBDB record"))))) + +(defun org-follow-info-link (name) + "Follow an info file & node link to NAME." + (if (or (string-match "\\(.*\\)::?\\(.*\\)" name) + (string-match "\\(.*\\)" name)) + (progn + (require 'info) + (if (match-string 2 name) ; If there isn't a node, choose "Top" + (Info-find-node (match-string 1 name) (match-string 2 name)) + (Info-find-node (match-string 1 name) "Top"))) + (message (concat "Could not open: " name)))) + (defun org-follow-gnus-link (&optional group article) "Follow a Gnus link to GROUP and ARTICLE." (require 'gnus) @@ -7792,6 +8582,61 @@ folders." (kill-this-buffer) (error "Message not found")))) +;; BibTeX links + +;; Use the custom search meachnism to construct and use search strings for +;; file links to BibTeX database entries. + +(defun org-create-file-search-in-bibtex () + "Create the search string and description for a BibTeX database entry." + (when (eq major-mode 'bibtex-mode) + ;; yes, we want to construct this search string. + ;; Make a good description for this entry, using names, year and the title + ;; Put it into the `description' variable which is dynamically scoped. + (let ((bibtex-autokey-names 1) + (bibtex-autokey-names-stretch 1) + (bibtex-autokey-name-case-convert-function 'identity) + (bibtex-autokey-name-separator " & ") + (bibtex-autokey-additional-names " et al.") + (bibtex-autokey-year-length 4) + (bibtex-autokey-name-year-separator " ") + (bibtex-autokey-titlewords 3) + (bibtex-autokey-titleword-separator " ") + (bibtex-autokey-titleword-case-convert-function 'identity) + (bibtex-autokey-titleword-length 'infty) + (bibtex-autokey-year-title-separator ": ")) + (setq description (bibtex-generate-autokey))) + ;; Now parse the entry, get the key and return it. + (save-excursion + (bibtex-beginning-of-entry) + (cdr (assoc "=key=" (bibtex-parse-entry)))))) + +(defun org-execute-file-search-in-bibtex (s) + "Find the link search string S as a key for a database entry." + (when (eq major-mode 'bibtex-mode) + ;; Yes, we want to do the search in this file. + ;; We construct a regexp that searches for "@entrytype{" followed by the key + (goto-char (point-min)) + (and (re-search-forward (concat "@[a-zA-Z]+[ \t\n]*{[ \t\n]*" + (regexp-quote s) "[ \t\n]*,") nil t) + (goto-char (match-beginning 0))) + (if (and (match-beginning 0) (equal current-prefix-arg '(16))) + ;; Use double prefix to indicate that any web link should be browsed + (let ((b (current-buffer)) (p (point))) + ;; Restore the window configuration because we just use the web link + (set-window-configuration org-window-config-before-follow-link) + (save-excursion (set-buffer b) (goto-char p) + (bibtex-url))) + (recenter 0)) ; Move entry start to beginning of window + ;; return t to indicate that the search is done. + t)) + +;; Finally add the functions to the right hooks. +(add-hook 'org-create-file-search-functions 'org-create-file-search-in-bibtex) +(add-hook 'org-execute-file-search-functions 'org-execute-file-search-in-bibtex) + +;; end of Bibtex link setup + (defun org-upgrade-old-links (&optional query-description) "Transfer old <...> style links to new [[...]] style links. With arg query-description, ask at each match for a description text to use @@ -7907,7 +8752,7 @@ For some link types, a prefix arg is interpreted: For links to usenet articles, arg negates `org-usenet-links-prefer-google'. For file links, arg negates `org-context-in-file-links'." (interactive "P") - (let (link cpltxt desc txt (pos (point))) + (let (link cpltxt desc description search txt (pos (point))) (cond ((eq major-mode 'bbdb-mode) @@ -7917,6 +8762,13 @@ For file links, arg negates `org-context-in-file-links'." (bbdb-record-company (bbdb-current-record)))) link (org-make-link cpltxt))) + ((eq major-mode 'Info-mode) + (setq link (org-make-link "info:" + (file-name-nondirectory Info-current-file) + ":" Info-current-node)) + (setq cpltxt (concat (file-name-nondirectory Info-current-file) + ":" Info-current-node))) + ((eq major-mode 'calendar-mode) (let ((cd (calendar-cursor-to-date))) (setq link @@ -8020,6 +8872,12 @@ For file links, arg negates `org-context-in-file-links'." (setq cpltxt w3m-current-url link (org-make-link cpltxt))) + ((setq search (run-hook-with-args-until-success + 'org-create-file-search-functions)) + (setq link (concat "file:" (abbreviate-file-name buffer-file-name) + "::" search)) + (setq cpltxt (or description link))) + ((eq major-mode 'org-mode) ;; Just link to current headline (setq cpltxt (concat "file:" @@ -8039,12 +8897,13 @@ For file links, arg negates `org-context-in-file-links'." ((org-region-active-p) (buffer-substring (region-beginning) (region-end))) (t (buffer-substring (point-at-bol) (point-at-eol))))) - (setq cpltxt - (concat cpltxt "::" - (if org-file-link-context-use-camel-case - (org-make-org-heading-camel txt) - (org-make-org-heading-search-string txt))) - desc "NONE"))) + (when (or (null txt) (string-match "\\S-" txt)) + (setq cpltxt + (concat cpltxt "::" + (if org-file-link-context-use-camel-case + (org-make-org-heading-camel txt) + (org-make-org-heading-search-string txt))) + desc "NONE")))) (if (string-match "::\\'" cpltxt) (setq cpltxt (substring cpltxt 0 -2))) (setq link (org-make-link cpltxt))) @@ -8058,12 +8917,14 @@ For file links, arg negates `org-context-in-file-links'." (setq txt (if (org-region-active-p) (buffer-substring (region-beginning) (region-end)) (buffer-substring (point-at-bol) (point-at-eol)))) - (setq cpltxt - (concat cpltxt "::" - (if org-file-link-context-use-camel-case - (org-make-org-heading-camel txt) - (org-make-org-heading-search-string txt))) - desc "NONE")) + ;; Only use search option if there is some text. + (when (string-match "\\S-" txt) + (setq cpltxt + (concat cpltxt "::" + (if org-file-link-context-use-camel-case + (org-make-org-heading-camel txt) + (org-make-org-heading-search-string txt))) + desc "NONE"))) (setq link (org-make-link cpltxt))) ((interactive-p) @@ -8287,16 +9148,39 @@ is in the current directory or below." ;; URL-like link, normalize the use of angular brackets. (setq link (org-make-link (org-remove-angle-brackets link)))) - ;; Check if we are linking to the current file. If yes, simplify the link. + ;; Check if we are linking to the current file with a search option + ;; If yes, simplify the link by using only the search option. (when (string-match "\\<file:\\(.+?\\)::\\([^>]+\\)" link) (let* ((path (match-string 1 link)) (case-fold-search nil) (search (match-string 2 link))) - (when (save-match-data - (equal (file-truename buffer-file-name) - (file-truename path))) - ;; We are linking to this same file, with a search option - (setq link search)))) + (save-match-data + (if (equal (file-truename buffer-file-name) (file-truename path)) + ;; We are linking to this same file, with a search option + (setq link search))))) + + ;; Check if we can/should use a relative path. If yes, simplify the link + (when (string-match "\\<file:\\(.*\\)" link) + (let* ((path (match-string 1 link)) + (case-fold-search nil)) + (cond + ((eq org-link-file-path-type 'absolute) + (setq path (abbreviate-file-name (expand-file-name path)))) + ((eq org-link-file-path-type 'noabbrev) + (setq path (expand-file-name path))) + ((eq org-link-file-path-type 'relative) + (setq path (file-relative-name path))) + (t + (save-match-data + (if (string-match (concat "^" (regexp-quote + (file-name-as-directory + (expand-file-name ".")))) + (expand-file-name path)) + ;; We are linking a file with relative path name. + (setq path (substring (expand-file-name path) + (match-end 0))))))) + (setq link (concat "file:" path)))) + (setq desc (read-string "Description: " desc)) (unless (string-match "\\S-" desc) (setq desc nil)) (if remove (apply 'delete-region remove)) @@ -8329,48 +9213,52 @@ RET on headline -> Store as sublevel entry to current headline ;;;###autoload (defun org-remember-apply-template () - "Initialize *remember* buffer with template, invode `org-mode'. + "Initialize *remember* buffer with template, invoke `org-mode'. This function should be placed into `remember-mode-hook' and in fact requires to be run from that hook to fucntion properly." - (when org-remember-templates - (let* ((entry (if (= (length org-remember-templates) 1) - (cdar org-remember-templates) - (message "Select template: %s" - (mapconcat - (lambda (x) (char-to-string (car x))) - org-remember-templates " ")) - (cdr (assoc (read-char-exclusive) org-remember-templates)))) - (tpl (if (consp (cdr entry)) (cadr entry) (cdr entry))) - (file (if (consp (cdr entry)) (nth 2 entry))) - (v-t (format-time-string (car org-time-stamp-formats) (org-current-time))) - (v-T (format-time-string (cdr org-time-stamp-formats) (org-current-time))) - (v-u (concat "[" (substring v-t 1 -1) "]")) - (v-U (concat "[" (substring v-T 1 -1) "]")) - (v-a annotation) ; defined in `remember-mode' - (v-i initial) ; defined in `remember-mode' - (v-n user-full-name) - ) - (unless tpl (setq tpl "") (message "No template") (ding)) - (insert tpl) (goto-char (point-min)) - (while (re-search-forward "%\\([tTuTai]\\)" nil t) - (when (and initial (equal (match-string 0) "%i")) - (save-match-data - (let* ((lead (buffer-substring - (point-at-bol) (match-beginning 0)))) - (setq v-i (mapconcat 'identity + (if org-remember-templates + + (let* ((entry (if (= (length org-remember-templates) 1) + (cdar org-remember-templates) + (message "Select template: %s" + (mapconcat + (lambda (x) (char-to-string (car x))) + org-remember-templates " ")) + (cdr (assoc (read-char-exclusive) org-remember-templates)))) + (tpl (car entry)) + (file (if (consp (cdr entry)) (nth 1 entry))) + (v-t (format-time-string (car org-time-stamp-formats) (org-current-time))) + (v-T (format-time-string (cdr org-time-stamp-formats) (org-current-time))) + (v-u (concat "[" (substring v-t 1 -1) "]")) + (v-U (concat "[" (substring v-T 1 -1) "]")) + (v-a annotation) ; defined in `remember-mode' + (v-i initial) ; defined in `remember-mode' + (v-n user-full-name) + ) + (unless tpl (setq tpl "") (message "No template") (ding)) + (insert tpl) (goto-char (point-min)) + (while (re-search-forward "%\\([tTuTai]\\)" nil t) + (when (and initial (equal (match-string 0) "%i")) + (save-match-data + (let* ((lead (buffer-substring + (point-at-bol) (match-beginning 0)))) + (setq v-i (mapconcat 'identity (org-split-string initial "\n") (concat "\n" lead)))))) - (replace-match - (or (eval (intern (concat "v-" (match-string 1)))) "") - t t)) - (let ((org-startup-folded nil) - (org-startup-with-deadline-check nil)) - (org-mode)) - (if (and file (string-match "\\S-" file) (not (file-directory-p file))) - (set (make-local-variable 'org-default-notes-file) file)) - (goto-char (point-min)) - (if (re-search-forward "%\\?" nil t) (replace-match "")) - (set (make-local-variable 'org-finish-function) 'remember-buffer)))) + (replace-match + (or (eval (intern (concat "v-" (match-string 1)))) "") + t t)) + (let ((org-startup-folded nil) + (org-startup-with-deadline-check nil)) + (org-mode)) + (if (and file (string-match "\\S-" file) (not (file-directory-p file))) + (set (make-local-variable 'org-default-notes-file) file)) + (goto-char (point-min)) + (if (re-search-forward "%\\?" nil t) (replace-match ""))) + (let ((org-startup-folded nil) + (org-startup-with-deadline-check nil)) + (org-mode))) + (set (make-local-variable 'org-finish-function) 'remember-buffer)) ;;;###autoload (defun org-remember-handler () @@ -8439,6 +9327,9 @@ See also the variable `org-reverse-note-order'." (if (not visiting) (find-file-noselect file)) (with-current-buffer (get-file-buffer file) + (save-excursion (and (goto-char (point-min)) + (not (re-search-forward "^\\* " nil t)) + (insert "\n* Notes\n"))) (setq reversed (org-notes-order-reversed-p)) (save-excursion (save-restriction @@ -8717,7 +9608,7 @@ This is being used to correctly align a single field after TAB or RET.") ;; Check if we have links (goto-char beg) (setq links (re-search-forward org-bracket-link-regexp end t)) - ;; Make sure the link properties are right FIXME: Can this be optimized???? + ;; Make sure the link properties are right (when links (goto-char beg) (while (org-activate-bracket-links end))) ;; Check if we are narrowing any columns (goto-char beg) @@ -8866,7 +9757,7 @@ With argument TABLE-TYPE, go to the beginning of a table.el-type table." (if table-type org-table-any-border-regexp org-table-border-regexp) nil t)) - (error "Can't find beginning of table") + (progn (goto-char (point-min)) (point)) (goto-char (match-beginning 0)) (beginning-of-line 2) (point)))) @@ -8914,7 +9805,7 @@ Optional argument NEW may specify text to replace the current field content." n (format f s)) (if new (if (<= (length new) l) ;; FIXME: length -> str-width? - (setq n (format f new t t)) ;; FIXME: t t? + (setq n (format f new)) (setq n (concat new "|") org-table-may-need-update t))) (or (equal n o) (let (org-table-may-need-update) @@ -9213,7 +10104,7 @@ If TABLE-TYPE is non-nil, also check for table.el-type tables." "Please position cursor in a data line for column operations"))))) (defun org-table-delete-column () - "Delete a column into the table." + "Delete a column from the table." (interactive) (if (not (org-at-table-p)) (error "Not at a table")) @@ -9352,7 +10243,7 @@ With prefix ARG, insert above the current line." In particular, this does handle wide and invisible characters." (if (string-match "^[ \t]*|-" s) ;; It's a hline, just map the characters - (setq s (mapcar (lambda (x) (if (member x '(?| ?+)) ?| ?\ )) s)) + (setq s (mapconcat (lambda (x) (if (member x '(?| ?+)) "|" " ")) s "")) (while (string-match "|\\([ \t]*?[^ \t\r\n|][^\r\n|]*\\)|" s) (setq s (replace-match (concat "|" (make-string (org-string-width (match-string 1 s)) @@ -9401,7 +10292,7 @@ also in table column 3. The command will prompt for the sorting method (lambda (a b) (< (car a) (car b))) (lambda (a b) (string< (car a) (car b))))) (setq lns (mapcar (lambda(x) (cons (org-trim (substring x bcol ecol)) x)) - (split-string (buffer-substring beg end) "\n"))) + (org-split-string (buffer-substring beg end) "\n"))) (if numericp (setq lns (mapcar (lambda(x) (cons (string-to-number (car x)) (cdr x))) @@ -9937,7 +10828,7 @@ the current column, to avoid unnecessary parsing." "\n"))) (defun org-table-get-stored-formulas () - "Return an alist with the t=stored formulas directly after current table." + "Return an alist with the stored formulas directly after current table." (interactive) (let (scol eq eq-alist strings string seen) (save-excursion @@ -10217,7 +11108,7 @@ not overwrite the stored one." (org-table-get-formula equation (equal arg '(4))))) (n0 (org-table-current-column)) (modes (copy-sequence org-calc-default-modes)) - n form fmt x ev orig c) + n form fmt x ev orig c lispp) ;; Parse the format string. Since we have a lot of modes, this is ;; a lot of work. However, I think calc still uses most of the time. (if (string-match ";" formula) @@ -10252,7 +11143,8 @@ not overwrite the stored one." (lambda (x) (number-to-string (string-to-number x))) fields))) (setq ndown (1- ndown)) - (setq form (copy-sequence formula)) + (setq form (copy-sequence formula) + lispp (equal (substring form 0 2) "'(")) ;; Insert the references to fields in same row (while (string-match "\\$\\([0-9]+\\)?" form) (setq n (if (match-beginning 1) @@ -10262,7 +11154,9 @@ not overwrite the stored one." (unless x (error "Invalid field specifier \"%s\"" (match-string 0 form))) (if (equal x "") (setq x "0")) - (setq form (replace-match (concat "(" x ")") t t form))) + (setq form (replace-match + (if lispp x (concat "(" x ")")) + t t form))) ;; Insert ranges in current column (while (string-match "\\&[-I0-9]+" form) (setq form (replace-match @@ -10270,8 +11164,11 @@ not overwrite the stored one." (org-table-get-vertical-vector (match-string 0 form) nil n0)) t t form))) - (setq ev (calc-eval (cons form modes) - (if org-table-formula-numbers-only 'num))) + (if lispp + (setq ev (eval (eval (read form))) + ev (if (numberp ev) (number-to-string ev) ev)) + (setq ev (calc-eval (cons form modes) + (if org-table-formula-numbers-only 'num)))) (when org-table-formula-debug (with-output-to-temp-buffer "*Help*" @@ -10827,6 +11724,109 @@ overwritten, and the table is not marked as requiring realignment." (defconst org-level-max 20) +(defvar org-export-html-preamble nil + "Preamble, to be inserted just after <body>. Set by publishing functions.") +(defvar org-export-html-postamble nil + "Preamble, to be inserted just before </body>. Set by publishing functions.") +(defvar org-export-html-auto-preamble t + "Should default preamble be inserted? Set by publishing functions.") +(defvar org-export-html-auto-postamble t + "Should default postamble be inserted? Set by publishing functions.") + +(defconst org-export-plist-vars + '((:language . org-export-default-language) + (:headline-levels . org-export-headline-levels) + (:section-numbers . org-export-with-section-numbers) + (:table-of-contents . org-export-with-toc) + (:emphasize . org-export-with-emphasize) + (:sub-superscript . org-export-with-sub-superscripts) + (:TeX-macros . org-export-with-TeX-macros) + (:fixed-width . org-export-with-fixed-width) + (:timestamps . org-export-with-timestamps) + (:tables . org-export-with-tables) + (:table-auto-headline . org-export-highlight-first-table-line) + (:style . org-export-html-style) + (:convert-org-links . org-export-html-link-org-files-as-html) + (:inline-images . org-export-html-inline-images) + (:expand-quoted-html . org-export-html-expand) + (:timestamp . org-export-html-with-timestamp) + (:publishing-directory . org-export-publishing-directory) + (:preamble . org-export-html-preamble) + (:postamble . org-export-html-postamble) + (:auto-preamble . org-export-html-auto-preamble) + (:auto-postamble . org-export-html-auto-postamble) + (:author . user-full-name) + (:email . user-mail-address))) + +(defun org-default-export-plist () + "Return the property list with default settings for the export variables." + (let ((l org-export-plist-vars) rtn e) + (while (setq e (pop l)) + (setq rtn (cons (car e) (cons (symbol-value (cdr e)) rtn)))) + rtn)) + +(defun org-infile-export-plist () + "Return the property list with file-local settings for export." + (save-excursion + (goto-char 0) + (let ((re (org-make-options-regexp + '("TITLE" "AUTHOR" "EMAIL" "TEXT" "OPTIONS" "LANGUAGE"))) + (text nil) + p key val text options) + (while (re-search-forward re nil t) + (setq key (org-match-string-no-properties 1) + val (org-match-string-no-properties 2)) + (cond + ((string-equal key "TITLE") (setq p (plist-put p :title val))) + ((string-equal key "AUTHOR")(setq p (plist-put p :author val))) + ((string-equal key "EMAIL") (setq p (plist-put p :email val))) + ((string-equal key "LANGUAGE") (setq p (plist-put p :language val))) + ((string-equal key "TEXT") + (setq text (if text (concat text "\n" val) val))) + ((string-equal key "OPTIONS") (setq options val)))) + (setq p (plist-put p :text text)) + (when options + (let ((op '(("H" . :headline-levels) + ("num" . :section-numbers) + ("toc" . :table-of-contents) + ("\\n" . :preserve-breaks) + ("@" . :expand-quoted-html) + (":" . :fixed-width) + ("|" . :tables) + ("^" . :sub-superscript) + ("*" . :emphasize) + ("TeX" . :TeX-macros))) + o) + (while (setq o (pop op)) + (if (string-match (concat (regexp-quote (car o)) + ":\\([^ \t\n\r;,.]*\\)") + options) + (setq p (plist-put p (cdr o) + (car (read-from-string + (match-string 1 options))))))))) + p))) + +(defun org-combine-plists (&rest plists) + "Create a single property list from all plists in PLISTS. +The process starts by copying the last list, and then setting properties +from the other lists. Settings in the first list are the most significant +ones and overrule settings in the other lists." + (let ((rtn (copy-sequence (pop plists))) + p v ls) + (while plists + (setq ls (pop plists)) + (while ls + (setq p (pop ls) v (pop ls)) + (setq rtn (plist-put rtn p v)))) + rtn)) + +(defun org-export-directory (type plist) + (let* ((val (plist-get plist :publishing-directory)) + (dir (if (listp val) + (or (cdr (assoc type val)) ".") + val))) + dir)) + (defun org-export-find-first-heading-line (list) "Remove all lines from LIST which are before the first headline." (let ((orig-list list) @@ -10854,7 +11854,10 @@ overwritten, and the table is not marked as requiring realignment." ;; an ordinary comment line ) ((and org-export-table-remove-special-lines - (string-match "^[ \t]*| *[!_^] *|" line)) + (string-match "^[ \t]*|" line) + (or (string-match "^[ \t]*| *[!_^] *|" line) + (and (string-match "| *<[0-9]+> *|" line) + (not (string-match "| *[^ <|]" line))))) ;; a special table line that should be removed ) (t (setq rtn (cons line rtn))))) @@ -10862,9 +11865,6 @@ overwritten, and the table is not marked as requiring realignment." ;; ASCII -(defconst org-ascii-underline '(?\$ ?\# ?^ ?\~ ?\= ?\-) - "Characters for underlining headings in ASCII export.") - (defconst org-html-entities '(("nbsp") ("iexcl") @@ -11266,6 +12266,7 @@ is signaled in this case." (if org-odd-levels-only (1+ (/ n 2)) n)) (defvar org-last-level nil) ; dynamically scoped variable +(defvar org-ascii-current-indentation nil) ; For communication (defun org-export-as-ascii (arg) "Export the outline as a pretty ASCII file. @@ -11274,7 +12275,9 @@ The prefix ARG specifies how many levels of the outline should become underlined headlines. The default is 3." (interactive "P") (setq-default org-todo-line-regexp org-todo-line-regexp) - (let* ((region + (let* ((opt-plist (org-combine-plists (org-default-export-plist) + (org-infile-export-plist))) + (region (buffer-substring (if (org-region-active-p) (region-beginning) (point-min)) (if (org-region-active-p) (region-end) (point-max)))) @@ -11283,21 +12286,28 @@ underlined headlines. The default is 3." (org-split-string (org-cleaned-string-for-export region) "[\r\n]")))) + (org-ascii-current-indentation '(0 . 0)) (org-startup-with-deadline-check nil) (level 0) line txt (umax nil) (case-fold-search nil) - (filename (concat (file-name-sans-extension buffer-file-name) + (filename (concat (file-name-as-directory + (org-export-directory :ascii opt-plist)) + (file-name-sans-extension + (file-name-nondirectory buffer-file-name)) ".txt")) (buffer (find-file-noselect filename)) (levels-open (make-vector org-level-max nil)) + (odd org-odd-levels-only) (date (format-time-string "%Y/%m/%d" (current-time))) (time (format-time-string "%X" (org-current-time))) - (author user-full-name) - (title (buffer-name)) + (author (plist-get opt-plist :author)) + (title (or (plist-get opt-plist :title) + (file-name-sans-extension + (file-name-nondirectory buffer-file-name)))) (options nil) - (email user-mail-address) - (language org-export-default-language) + (email (plist-get opt-plist :email)) + (language (plist-get opt-plist :language)) (text nil) (todo nil) (lang-words nil)) @@ -11307,9 +12317,6 @@ underlined headlines. The default is 3." (find-file-noselect filename) - ;; Search for the export key lines - (org-parse-key-lines) - (setq lang-words (or (assoc language org-export-language-setup) (assoc "en" org-export-language-setup))) (if org-export-ascii-show-new-buffer @@ -11317,7 +12324,13 @@ underlined headlines. The default is 3." (set-buffer buffer)) (erase-buffer) (fundamental-mode) - (if options (org-parse-export-options options)) + ;; create local variables for all options, to make sure all called + ;; functions get the correct information + (mapcar (lambda (x) + (set (make-local-variable (cdr x)) + (plist-get opt-plist (car x)))) + org-export-plist-vars) + (set (make-local-variable 'org-odd-levels-only) odd) (setq umax (if arg (prefix-numeric-value arg) org-export-headline-levels)) @@ -11347,7 +12360,8 @@ underlined headlines. The default is 3." level (org-tr-level level) txt (match-string 3 line) todo - (or (and (match-beginning 2) + (or (and org-export-mark-todo-in-toc + (match-beginning 2) (not (equal (match-string 2 line) org-done-string))) ; TODO, not DONE @@ -11386,10 +12400,24 @@ underlined headlines. The default is 3." ;; a Headline (setq level (org-tr-level (- (match-end 1) (match-beginning 1))) txt (match-string 2 line)) - (org-ascii-level-start level txt umax)) - (t (insert line "\n")))) + (org-ascii-level-start level txt umax lines)) + (t + (insert (org-fix-indentation line org-ascii-current-indentation) "\n")))) (normal-mode) (save-buffer) + ;; remove display and invisible chars + (let (beg end s) + (goto-char (point-min)) + (while (setq beg (next-single-property-change (point) 'display)) + (setq end (next-single-property-change beg 'display)) + (delete-region beg end) + (goto-char beg) + (insert "=>")) + (goto-char (point-min)) + (while (setq beg (next-single-property-change (point) 'org-cwidth)) + (setq end (next-single-property-change beg 'org-cwidth)) + (delete-region beg end) + (goto-char beg))) (goto-char (point-min)))) (defun org-search-todo-below (line lines level) @@ -11409,8 +12437,6 @@ underlined headlines. The default is 3." (if (<= lv level) (throw 'exit nil)) (if todo (throw 'exit t)))))))) -;; FIXME: Try to handle <b> and <i> as faces via text properties. -;; We could also implement *bold*,/italic/ and _underline_ for ASCII export (defun org-html-expand-for-ascii (line) "Handle quoted HTML for ASCII export." (if org-export-html-expand @@ -11428,51 +12454,80 @@ underlined headlines. The default is 3." (make-string (string-width s) underline) "\n")))) -(defun org-ascii-level-start (level title umax) +(defun org-ascii-level-start (level title umax &optional lines) "Insert a new level in ASCII export." - (let (char) + (let (char (n (- level umax 1)) (ind 0)) (if (> level umax) - (insert (make-string (* 2 (- level umax 1)) ?\ ) "* " title "\n") + (progn + (insert (make-string (* 2 n) ?\ ) + (char-to-string (nth (% n (length org-export-ascii-bullets)) + org-export-ascii-bullets)) + " " title "\n") + ;; find the indentation of the next non-empty line + (catch 'stop + (while lines + (if (string-match "^\\*" (car lines)) (throw 'stop nil)) + (if (string-match "^\\([ \t]*\\)\\S-" (car lines)) + (throw 'stop (setq ind (org-get-indentation (car lines))))) + (pop lines))) + (setq org-ascii-current-indentation (cons (* 2 (1+ n)) ind))) (if (or (not (equal (char-before) ?\n)) (not (equal (char-before (1- (point))) ?\n))) (insert "\n")) - (setq char (nth (- umax level) (reverse org-ascii-underline))) + (setq char (nth (- umax level) (reverse org-export-ascii-underline))) (if org-export-with-section-numbers (setq title (concat (org-section-number level) " " title))) - (insert title "\n" (make-string (string-width title) char) "\n")))) - -(defun org-export-copy-visible () - "Copy the visible part of the buffer to another buffer, for printing. -Also removes the first line of the buffer if it specifies a mode, -and all options lines." - (interactive) - (let* ((filename (concat (file-name-sans-extension buffer-file-name) - ".txt")) - (buffer (find-file-noselect filename)) - (ore (concat - (org-make-options-regexp - '("CATEGORY" "SEQ_TODO" "PRI_TODO" "TYP_TODO" - "STARTUP" "ARCHIVE" - "TITLE" "AUTHOR" "EMAIL" "TEXT" "OPTIONS" "LANGUAGE")) - (if org-noutline-p "\\(\n\\|$\\)" ""))) + (insert title "\n" (make-string (string-width title) char) "\n") + (setq org-ascii-current-indentation '(0 . 0))))) + +(defun org-export-visible (type arg) + "Create a copy of the visible part of the current buffer, and export it. +The copy is created in a temporary buffer and removed after use. +TYPE is the final key (as a string) of the `C-c C-x' key sequence that will +run the export command - in interactive use, the command prompts for this +key. As a special case, if the you type SPC at the prompt, the temporary +org-mode file will not be removed but presented to you so that you can +continue to use it. The prefix arg ARG is passed through to the exporting +command." + (interactive + (list (progn + (message "Export visible: [a]SCII [h]tml [b]rowse HTML [x]OXO [ ]keep buffer") + (char-to-string (read-char-exclusive))) + current-prefix-arg)) + (if (not (member type '("a" "\C-a" "b" "\C-b" "h" "x" " "))) + (error "Invalid export key")) + (let* ((binding (key-binding (concat "\C-c\C-x" type))) + (keepp (equal type " ")) + (file buffer-file-name) + (buffer (get-buffer-create "*Org Export Visible*")) s e) - (with-current-buffer buffer - (erase-buffer) - (text-mode)) + (with-current-buffer buffer (erase-buffer)) (save-excursion (setq s (goto-char (point-min))) (while (not (= (point) (point-max))) (goto-char (org-find-invisible)) (append-to-buffer buffer s (point)) - (setq s (goto-char (org-find-visible))))) - (switch-to-buffer-other-window buffer) - (newline) - (goto-char (point-min)) - (if (looking-at ".*-\\*- mode:.*\n") - (replace-match "")) - (while (re-search-forward ore nil t) - (replace-match "")) - (goto-char (point-min)))) + (setq s (goto-char (org-find-visible)))) + (goto-char (point-min)) + (unless keepp + ;; Copy all comment lines to the end, to make sure #+ settings are + ;; still available for the second export step. Kind of a hack, but + ;; does do the trick. + (if (looking-at "#[^\r\n]*") + (append-to-buffer buffer (match-beginning 0) (1+ (match-end 0)))) + (while (re-search-forward "[\n\r]#[^\n\r]*" nil t) + (append-to-buffer buffer (1+ (match-beginning 0)) + (min (point-max) (1+ (match-end 0)))))) + (set-buffer buffer) + (let ((buffer-file-name file) + (org-inhibit-startup t)) + (org-mode) + (show-all) + (unless keepp (funcall binding arg)))) + (if (not keepp) + (kill-buffer buffer) + (switch-to-buffer-other-window buffer) + (goto-char (point-min))))) (defun org-find-visible () (if (featurep 'noutline) @@ -11491,6 +12546,7 @@ and all options lines." (skip-chars-forward "^\r") (point))) + ;; HTML (defun org-get-current-options () @@ -11506,7 +12562,8 @@ Does include HTML export options as well as TODO and CATEGORY stuff." #+CATEGORY: %s #+SEQ_TODO: %s #+TYP_TODO: %s -#+STARTUP: %s %s %s %s %s +#+STARTUP: %s %s %s %s %s %s +#+TAGS: %s #+ARCHIVE: %s " (buffer-name) (user-full-name) user-mail-address org-export-default-language @@ -11533,6 +12590,8 @@ Does include HTML export options as well as TODO and CATEGORY stuff." (if org-odd-levels-only "odd" "oddeven") (if org-hide-leading-stars "hidestars" "showstars") (if org-startup-align-all-tables "align" "noalign") + (if org-log-done "logging" "nologging") + (if org-tag-alist (mapconcat 'car org-tag-alist " ") "") org-archive-location )) @@ -11606,16 +12665,23 @@ emacs --batch --visit=MyFile --funcall org-export-as-html-batch" (org-export-as-html org-export-headline-levels 'hidden)) -(defun org-export-as-html (arg &optional hidden) +(defun org-export-as-html (arg &optional hidden ext-plist) "Export the outline as a pretty HTML file. If there is an active region, export only the region. The prefix ARG specifies how many levels of the outline should become -headlines. The default is 3. Lower levels will become bulleted lists." +headlines. The default is 3. Lower levels will become bulleted lists. +When HIDDEN is non-nil, don't display the HTML buffer. +EXT-PLIST is a property list with external parameters overriding +org-mode's default settings, but still inferior to file-local settings." (interactive "P") (setq-default org-todo-line-regexp org-todo-line-regexp) (setq-default org-deadline-line-regexp org-deadline-line-regexp) (setq-default org-done-string org-done-string) - (let* ((style org-export-html-style) + (let* ((opt-plist (org-combine-plists (org-default-export-plist) + ext-plist + (org-infile-export-plist))) + + (style (plist-get opt-plist :style)) (odd org-odd-levels-only) (region-p (org-region-active-p)) (region @@ -11629,30 +12695,34 @@ headlines. The default is 3. Lower levels will become bulleted lists." (lines (org-export-find-first-heading-line all_lines)) (level 0) (line "") (origline "") txt todo (umax nil) - (filename (concat (file-name-sans-extension buffer-file-name) - ".html")) + (filename (concat (file-name-as-directory + (org-export-directory :html opt-plist)) + (file-name-sans-extension + (file-name-nondirectory buffer-file-name)) + ".html")) (buffer (find-file-noselect filename)) (levels-open (make-vector org-level-max nil)) (date (format-time-string "%Y/%m/%d" (current-time))) (time (format-time-string "%X" (org-current-time))) - (author user-full-name) - (title (buffer-name)) - (options nil) - (quote-re (concat "^\\*+[ \t]*" org-quote-string "\\>")) + (author (plist-get opt-plist :author)) + (title (or (plist-get opt-plist :title) + (file-name-sans-extension + (file-name-nondirectory buffer-file-name)))) + (quote-re0 (concat "^[ \t]*" org-quote-string "\\>")) + (quote-re (concat "^\\(\\*+\\)\\([ \t]*" org-quote-string "\\>\\)")) (inquote nil) (infixed nil) (in-local-list nil) (local-list-num nil) (local-list-indent nil) (llt org-plain-list-ordered-item-terminator) - (email user-mail-address) - (language org-export-default-language) - (text nil) - (lang-words nil) + (email (plist-get opt-plist :email)) + (language (plist-get opt-plist :language)) + (text (plist-get opt-plist :text)) + (lang-words nil) (target-alist nil) tg (head-count 0) cnt (start 0) - ;; FIXME: The following returns always nil under XEmacs (coding-system (and (fboundp 'coding-system-get) (boundp 'buffer-file-coding-system) buffer-file-coding-system)) @@ -11663,15 +12733,14 @@ headlines. The default is 3. Lower levels will become bulleted lists." table-open type table-buffer table-orig-buffer ind start-is-num starter - rpl path desc desc1 desc2 link + rpl path desc descp desc1 desc2 link ) (message "Exporting...") (setq org-last-level 1) (org-init-section-numbers) - ;; Search for the export key lines - (org-parse-key-lines) + ;; Get the language-dependent settings (setq lang-words (or (assoc language org-export-language-setup) (assoc "en" org-export-language-setup))) @@ -11683,38 +12752,46 @@ headlines. The default is 3. Lower levels will become bulleted lists." (fundamental-mode) (let ((case-fold-search nil) (org-odd-levels-only odd)) - (if options (org-parse-export-options options)) + ;; create local variables for all options, to make sure all called + ;; functions get the correct information + (mapcar (lambda (x) + (set (make-local-variable (cdr x)) + (plist-get opt-plist (car x)))) + org-export-plist-vars) (setq umax (if arg (prefix-numeric-value arg) org-export-headline-levels)) ;; File header (insert (format - "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\" - \"http://www.w3.org/TR/REC-html40/loose.dtd\"> -<html lang=\"%s\"><head> + "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" + \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\"> +<html xmlns=\"http://www.w3.org/1999/xhtml\" +lang=\"%s\" xml:lang=\"%s\"> +<head> <title>%s</title> -<meta http-equiv=\"Content-Type\" content=\"text/html;charset=%s\"> -<meta name=generator content=\"Org-mode\"> -<meta name=generated content=\"%s %s\"> -<meta name=author content=\"%s\"> +<meta http-equiv=\"Content-Type\" content=\"text/html;charset=%s\"/> +<meta name=\"generator\" content=\"Org-mode\"/> +<meta name=\"generated\" content=\"%s %s\"/> +<meta name=\"author\" content=\"%s\"/> %s </head><body> " - language (org-html-expand title) (or charset "iso-8859-1") + language language (org-html-expand title) (or charset "iso-8859-1") date time author style)) - (if title (insert (concat "<H1 class=\"title\">" - (org-html-expand title) "</H1>\n"))) - (if author (insert (concat (nth 1 lang-words) ": " author "\n"))) - (if email (insert (concat "<a href=\"mailto:" email "\"><" - email "></a>\n"))) - (if (or author email) (insert "<br>\n")) - (if (and date time) (insert (concat (nth 2 lang-words) ": " - date " " time "<br>\n"))) - (if text (insert (concat "<p>\n" (org-html-expand text)))) + + + (insert (or (plist-get opt-plist :preamble) "")) + + (when (plist-get opt-plist :auto-preamble) + (if title (insert (concat "<h1 class=\"title\">" + (org-html-expand title) "</h1>\n"))) + + (if text (insert "<p>\n" (org-html-expand text) "</p>"))) + (if org-export-with-toc (progn - (insert (format "<H2>%s</H2>\n" (nth 3 lang-words))) - (insert "<ul>\n") + (insert (format "<h2>%s</h2>\n" (nth 3 lang-words))) + (insert "<ul>\n<li>") (setq lines (mapcar '(lambda (line) (if (string-match org-todo-line-regexp line) @@ -11724,9 +12801,11 @@ headlines. The default is 3. Lower levels will become bulleted lists." level (org-tr-level level) txt (save-match-data (org-html-expand - (match-string 3 line))) + (org-html-cleanup-toc-line + (match-string 3 line)))) todo - (or (and (match-beginning 2) + (or (and org-export-mark-todo-in-toc + (match-beginning 2) (not (equal (match-string 2 line) org-done-string))) ; TODO, not DONE @@ -11744,13 +12823,13 @@ headlines. The default is 3. Lower levels will become bulleted lists." (progn (setq cnt (- level org-last-level)) (while (>= (setq cnt (1- cnt)) 0) - (insert "<ul>")) + (insert "\n<ul>\n<li>")) (insert "\n"))) (if (< level org-last-level) (progn (setq cnt (- org-last-level level)) (while (>= (setq cnt (1- cnt)) 0) - (insert "</ul>")) + (insert "</li>\n</ul>")) (insert "\n"))) ;; Check for targets (while (string-match org-target-regexp line) @@ -11766,8 +12845,8 @@ headlines. The default is 3. Lower levels will become bulleted lists." (insert (format (if todo - "<li><a href=\"#sec-%d\"><span class=\"todo\">%s</span></a>\n" - "<li><a href=\"#sec-%d\">%s</a>\n") + "</li>\n<li><a href=\"#sec-%d\"><span class=\"todo\">%s</span></a>" + "</li>\n<li><a href=\"#sec-%d\">%s</a>") head-count txt)) (setq org-last-level level)) @@ -11776,7 +12855,7 @@ headlines. The default is 3. Lower levels will become bulleted lists." lines)) (while (> org-last-level 0) (setq org-last-level (1- org-last-level)) - (insert "</ul>\n")) + (insert "</li>\n</ul>\n")) )) (setq head-count 0) (org-init-section-numbers) @@ -11785,7 +12864,7 @@ headlines. The default is 3. Lower levels will become bulleted lists." (catch 'nextline ;; end of quote section? - (when (and inquote (string-match "^\\*+" line)) + (when (and inquote (string-match "^\\*+" line)) (insert "</pre>\n") (setq inquote nil)) ;; inside a quote section? @@ -11829,8 +12908,11 @@ headlines. The default is 3. Lower levels will become bulleted lists." "\" class=\"target\">" (match-string 1 line) "@</a> ") t t line))))) + (setq line (org-html-handle-time-stamps line)) + ;; replace "&" by "&", "<" and ">" by "<" and ">" ;; handle @<..> HTML tags (replace "@>..<" by "<..>") + ;; Also handle sub_superscripts and checkboxes (setq line (org-html-expand line)) ;; Format the links @@ -11841,7 +12923,9 @@ headlines. The default is 3. Lower levels will become bulleted lists." (setq path (match-string 3 line)) (setq desc1 (if (match-end 5) (match-string 5 line)) desc2 (if (match-end 2) (concat type ":" path) path) + descp (and desc1 (not (equal desc1 desc2))) desc (or desc1 desc2)) + ;; FIXME: do we need to unescape here somewhere? (cond ((equal type "internal") (setq rpl @@ -11861,7 +12945,7 @@ headlines. The default is 3. Lower levels will become bulleted lists." (save-match-data (if (string-match "::\\(.*\\)" filename) (setq search (match-string 1 filename) - filename (replace-match "" nil nil filename))) + filename (replace-match "" t nil filename))) (setq file-is-image-p (string-match (org-image-file-name-regexp) filename)) (setq thefile (if abs-p (expand-file-name filename) filename)) @@ -11877,12 +12961,18 @@ headlines. The default is 3. Lower levels will become bulleted lists." (not (string-match "^/.*/$" search))) (setq thefile (concat thefile "#" (org-solidify-link-text - (org-link-unescape search))))))) - (setq rpl (if (and org-export-html-inline-images - file-is-image-p) + (org-link-unescape search))))) + (when (string-match "^file:" desc) + (setq desc (replace-match "" t t desc)) + (if (string-match "\\.org$" desc) + (setq desc (replace-match "" t t desc)))))) + (setq rpl (if (and file-is-image-p + (or (eq t org-export-html-inline-images) + (and org-export-html-inline-images + (not descp)))) (concat "<img src=\"" thefile "\"/>") (concat "<a href=\"" thefile "\">" desc "</a>"))))) - ((member type '("bbdb" "vm" "wl" "mhe" "rmail" "gnus" "shell")) + ((member type '("bbdb" "vm" "wl" "mhe" "rmail" "gnus" "shell" "info" "elisp")) (setq rpl (concat "<i><" type ":" (save-match-data (org-link-unescape path)) "></i>")))) @@ -11894,28 +12984,22 @@ headlines. The default is 3. Lower levels will become bulleted lists." (if (equal (match-string 2 line) org-done-string) (setq line (replace-match "<span class=\"done\">\\2</span>" - nil nil line 2)) + t nil line 2)) (setq line (replace-match "<span class=\"todo\">\\2</span>" - nil nil line 2)))) + t nil line 2)))) - ;; DEADLINES - (if (string-match org-deadline-line-regexp line) - (progn - (if (save-match-data - (string-match "<a href" - (substring line 0 (match-beginning 0)))) - nil ; Don't do the replacement - it is inside a link - (setq line (replace-match "<span class=\"deadline\">\\&</span>" - nil nil line 1))))) (cond ((string-match "^\\(\\*+\\)[ \t]*\\(.*\\)" line) ;; This is a headline (setq level (org-tr-level (- (match-end 1) (match-beginning 1))) txt (match-string 2 line)) + (if (string-match quote-re0 txt) + (setq txt (replace-match "" t t txt))) (if (<= level umax) (setq head-count (+ head-count 1))) (when in-local-list ;; Close any local lists before inserting a new header line (while local-list-num + (org-close-li) (insert (if (car local-list-num) "</ol>\n" "</ul>")) (pop local-list-num)) (setq local-list-indent nil @@ -11942,19 +13026,21 @@ headlines. The default is 3. Lower levels will become bulleted lists." (setq table-open nil table-buffer (nreverse table-buffer) table-orig-buffer (nreverse table-orig-buffer)) + (org-close-par-maybe) (insert (org-format-table-html table-buffer table-orig-buffer)))) (t ;; Normal lines - (when (and (string-match - (cond - ((eq llt t) "^\\([ \t]*\\)\\(\\([-+*]\\)\\|\\([0-9]+[.)]\\)\\)?\\( +[^ \t\n\r]\\|[ \t]*$\\)") - ((= llt ?.) "^\\([ \t]*\\)\\(\\([-+*]\\)\\|\\([0-9]+\\.\\)\\)?\\( +[^ \t\n\r]\\|[ \t]*$\\)") - ((= llt ?\)) "^\\( \t]*\\)\\(\\([-+*]\\)\\|\\([0-9]+)\\)\\)?\\( +[^ \t\n\r]\\|[ \t]*$\\)") - (t (error "Invalid value of `org-plain-list-ordered-item-terminator'"))) - line)) + (when (string-match + (cond + ((eq llt t) "^\\([ \t]*\\)\\(\\([-+*]\\)\\|\\([0-9]+[.)]\\) \\)?\\( *[^ \t\n\r]\\|[ \t]*$\\)") + ((= llt ?.) "^\\([ \t]*\\)\\(\\([-+*]\\)\\|\\([0-9]+\\.\\) \\)?\\( *[^ \t\n\r]\\|[ \t]*$\\)") + ((= llt ?\)) "^\\( \t]*\\)\\(\\([-+*]\\)\\|\\([0-9]+)\\) \\)?\\( *[^ \t\n\r]\\|[ \t]*$\\)") + (t (error "Invalid value of `org-plain-list-ordered-item-terminator'"))) + line) (setq ind (org-get-string-indentation line) start-is-num (match-beginning 4) - starter (if (match-beginning 2) (match-string 2 line)) + starter (if (match-beginning 2) + (substring (match-string 2 line) 0 -1)) line (substring line (match-beginning 5))) (unless (string-match "[^ \t]" line) ;; empty line. Pretend indentation is large. @@ -11963,6 +13049,7 @@ headlines. The default is 3. Lower levels will become bulleted lists." (or (and (= ind (car local-list-indent)) (not starter)) (< ind (car local-list-indent)))) + (org-close-li) (insert (if (car local-list-num) "</ol>\n" "</ul>")) (pop local-list-num) (pop local-list-indent) (setq in-local-list local-list-indent)) @@ -11971,23 +13058,76 @@ headlines. The default is 3. Lower levels will become bulleted lists." (or (not in-local-list) (> ind (car local-list-indent)))) ;; Start new (level of ) list + (org-close-par-maybe) (insert (if start-is-num "<ol>\n<li>\n" "<ul>\n<li>\n")) (push start-is-num local-list-num) (push ind local-list-indent) (setq in-local-list t)) (starter ;; continue current list - (insert "<li>\n")))) + (org-close-li) + (insert "<li>\n"))) + (if (string-match "^[ \t]*\\[\\([X ]\\)\\]" line) + (setq line + (replace-match + (if (equal (match-string 1 line) "X") + "<b>[X]</b>" + "<b>[<span style=\"visibility:hidden;\">X</span>]</b>") + t t line)))) + ;; Empty lines start a new paragraph. If hand-formatted lists ;; are not fully interpreted, lines starting with "-", "+", "*" ;; also start a new paragraph. - (if (string-match "^ [-+*]-\\|^[ \t]*$" line) (insert "<p>")) - (insert line (if org-export-preserve-breaks "<br>\n" "\n")))) - )) + (if (string-match "^ [-+*]-\\|^[ \t]*$" line) (org-open-par)) + + ;; Check if the line break needs to be conserved + (cond + ((string-match "\\\\\\\\[ \t]*$" line) + (setq line (replace-match "<br/>" t t line))) + (org-export-preserve-breaks + (setq line (concat line "<br/>")))) + + (insert line "\n"))))) + + ;; Properly close all local lists and other lists + (when inquote (insert "</pre>\n")) + (when in-local-list + ;; Close any local lists before inserting a new header line + (while local-list-num + (org-close-li) + (insert (if (car local-list-num) "</ol>\n" "</ul>\n")) + (pop local-list-num)) + (setq local-list-indent nil + in-local-list nil)) + (org-html-level-start 1 nil umax + (and org-export-with-toc (<= level umax)) + head-count) + + (when (plist-get opt-plist :auto-postamble) + (when author + (insert "<p class=\"author\"> " + (nth 1 lang-words) ": " author "\n") + (when email + (insert "<a href=\"mailto:" email "\"><" + email "></a>\n")) + (insert "</p>\n")) + (when (and date time) + (insert "<p class=\"date\"> " + (nth 2 lang-words) ": " + date " " time "</p>\n"))) + (if org-export-html-with-timestamp (insert org-export-html-html-helper-timestamp)) + (insert (or (plist-get opt-plist :postamble) "")) (insert "</body>\n</html>\n") (normal-mode) + ;; remove empty paragraphs and lists + (goto-char (point-min)) + (while (re-search-forward "<p>[ \r\n\t]*</p>" nil t) + (replace-match "")) + (goto-char (point-min)) + (while (re-search-forward "<li>[ \r\n\t]*</li>\n?" nil t) + (replace-match "")) (save-buffer) (goto-char (point-min))))) @@ -12091,7 +13231,7 @@ But it has the disadvantage, that no cell- or row-spanning is allowed." fields html empty) (setq html (concat org-export-html-table-tag "\n")) (while (setq line (pop lines)) - (setq empty " ") + (setq empty " ") (catch 'next-line (if (string-match "^[ \t]*\\+-" line) (progn @@ -12117,7 +13257,7 @@ But it has the disadvantage, that no cell- or row-spanning is allowed." (if field-buffer (setq field-buffer (mapcar (lambda (x) - (concat x "<br>" (pop fields))) + (concat x "<br/>" (pop fields))) field-buffer)) (setq field-buffer fields)))) (setq html (concat html "</table>\n")) @@ -12140,6 +13280,30 @@ But it has the disadvantage, that Org-mode's HTML conversions cannot be used." (set-buffer " org-tmp2 ") (buffer-substring (point-min) (point-max)))) +(defun org-html-handle-time-stamps (s) + "Format time stamps in string S, or remove them." + (let (r b) + (while (string-match org-maybe-keyword-time-regexp s) + (or b (setq b (substring s 0 (match-beginning 0)))) + (if (not org-export-with-timestamps) + (setq r (concat r (substring s 0 (match-beginning 0))) + s (substring s (match-end 0))) + (setq r (concat + r (substring s 0 (match-beginning 0)) + (if (match-end 1) + (format "@<span class=\"timestamp-kwd\">%s @</span>" + (match-string 1 s))) + (format " @<span class=\"timestamp\">%s@</span>" + (substring (match-string 3 s) 1 -1))) + s (substring s (match-end 0))))) + ;; Line break of line started and ended with time stamp stuff + (if (not r) + s + (setq r (concat r s)) + (unless (string-match "\\S-" (concat b s)) + (setq r (concat r "@<br/>"))) + r))) + (defun org-html-protect (s) ;; convert & to &, < to < and > to > (let ((start 0)) @@ -12152,6 +13316,14 @@ But it has the disadvantage, that Org-mode's HTML conversions cannot be used." (setq s (replace-match ">" t t s)))) s) +(defun org-html-cleanup-toc-line (s) + "Remove tags and time staps from lines going into the toc." + (if (string-match " +:[a-zA-Z0-9_@:]+: *$" s) + (setq s (replace-match "" t t s))) + (while (string-match org-maybe-keyword-time-regexp s) + (setq s (replace-match "" t t s))) + s) + (defun org-html-expand (string) "Prepare STRING for HTML export. Applies all active conversions. If there are links in the string, don't modify these." @@ -12170,7 +13342,7 @@ If there are links in the string, don't modify these." (setq s (org-html-protect s)) (if org-export-html-expand (while (string-match "@<\\([^&]*\\)>" s) - (setq s (replace-match "<\\1>" nil nil s)))) + (setq s (replace-match "<\\1>" t nil s)))) (if org-export-with-emphasize (setq s (org-export-html-convert-emphasize s))) (if org-export-with-sub-superscripts @@ -12239,49 +13411,30 @@ stacked delimiters is N. Escaping delimiters is not possible." (setq string (replace-match "\\1<u>\\3</u>\\4" t nil string))) string) -(defun org-parse-key-lines () - "Find the special key lines with the information for exporters." - (save-excursion - (goto-char 0) - (let ((re (org-make-options-regexp - '("TITLE" "AUTHOR" "EMAIL" "TEXT" "OPTIONS" "LANGUAGE"))) - key) - (while (re-search-forward re nil t) - (setq key (match-string 1)) - (cond ((string-equal key "TITLE") - (setq title (match-string 2))) - ((string-equal key "AUTHOR") - (setq author (match-string 2))) - ((string-equal key "EMAIL") - (setq email (match-string 2))) - ((string-equal key "LANGUAGE") - (setq language (match-string 2))) - ((string-equal key "TEXT") - (setq text (concat text "\n" (match-string 2)))) - ((string-equal key "OPTIONS") - (setq options (match-string 2)))))))) - -(defun org-parse-export-options (s) - "Parse the export options line." - (let ((op '(("H" . org-export-headline-levels) - ("num" . org-export-with-section-numbers) - ("toc" . org-export-with-toc) - ("\\n" . org-export-preserve-breaks) - ("@" . org-export-html-expand) - (":" . org-export-with-fixed-width) - ("|" . org-export-with-tables) - ("^" . org-export-with-sub-superscripts) - ("*" . org-export-with-emphasize) - ("TeX" . org-export-with-TeX-macros))) - o) - (while (setq o (pop op)) - (if (string-match (concat (regexp-quote (car o)) ":\\([^ \t\n\r;,.]*\\)") - s) - (set (make-local-variable (cdr o)) - (car (read-from-string (match-string 1 s)))))))) +(defvar org-par-open nil) +(defun org-open-par () + "Insert <p>, but first close previous paragraph if any." + (org-close-par-maybe) + (insert "\n<p>") + (setq org-par-open t)) +(defun org-close-par-maybe () + "Close paragraph if there is one open." + (when org-par-open + (insert "</p>") + (setq org-par-open nil))) +(defun org-close-li () + "Close <li> if necessary." + (org-close-par-maybe) + (insert "</li>\n")) +; (when (save-excursion +; (re-search-backward "</?\\(ul\\|ol\\|li\\|[hH][0-9]\\)>" nil t)) +; (if (member (match-string 0) '("</ul>" "</ol>" "<li>")) +; (insert "</li>")))) (defun org-html-level-start (level title umax with-toc head-count) - "Insert a new level in HTML export." + "Insert a new level in HTML export. +When TITLE is nil, just close all open levels." + (org-close-par-maybe) (let ((l (1+ (max level umax)))) (while (<= l org-level-max) (if (aref levels-open (1- l)) @@ -12289,22 +13442,42 @@ stacked delimiters is N. Escaping delimiters is not possible." (org-html-level-close l) (aset levels-open (1- l) nil))) (setq l (1+ l))) - (if (> level umax) - (progn - (if (aref levels-open (1- level)) - (insert "<li>" title "<p>\n") - (aset levels-open (1- level) t) - (insert "<ul><li>" title "<p>\n"))) - (if org-export-with-section-numbers - (setq title (concat (org-section-number level) " " title))) - (setq level (+ level 1)) - (if with-toc - (insert (format "\n<H%d><a name=\"sec-%d\">%s</a></H%d>\n" - level head-count title level)) - (insert (format "\n<H%d>%s</H%d>\n" level title level)))))) + (when title + ;; If title is nil, this means this function is called to close + ;; all levels, so the rest is done only if title is given + (when (string-match "\\(:[a-zA-Z0-9_@:]+:\\)[ \t]*$" title) + (setq title (replace-match + (if org-export-with-tags + (save-match-data + (concat + " <span class=\"tag\">" + (mapconcat 'identity (org-split-string + (match-string 1 title) ":") + " ") + "</span>")) + "") + t t title))) + (if (> level umax) + (progn + (if (aref levels-open (1- level)) + (progn + (org-close-li) + (insert "<li>" title "<br/>\n")) + (aset levels-open (1- level) t) + (org-close-par-maybe) + (insert "<ul>\n<li>" title "<br/>\n"))) + (if org-export-with-section-numbers + (setq title (concat (org-section-number level) " " title))) + (setq level (+ level 1)) + (if with-toc + (insert (format "\n<h%d><a name=\"sec-%d\">%s</a></h%d>\n" + level head-count title level)) + (insert (format "\n<h%d>%s</h%d>\n" level title level))) + (org-open-par))))) (defun org-html-level-close (&rest args) "Terminate one level in HTML export." + (org-close-li) (insert "</ul>")) ;; Variable holding the vector with section numbers @@ -12348,9 +13521,9 @@ When LEVEL is non-nil, increase section numbers on that level." (setq idx (1+ idx))) (save-match-data (if (string-match "\\`\\([@0]\\.\\)+" string) - (setq string (replace-match "" nil nil string))) + (setq string (replace-match "" t nil string))) (if (string-match "\\(\\.0\\)+\\'" string) - (setq string (replace-match "" nil nil string)))) + (setq string (replace-match "" t nil string)))) string)) @@ -12361,12 +13534,6 @@ file, but with extension `.ics'." (interactive) (org-export-icalendar nil buffer-file-name)) -(defun org-export-as-xml () - "Export current buffer as XOXO XML buffer." - (interactive) - (cond ((eq org-export-xml-type 'xoxo) - (org-export-as-xoxo (current-buffer))))) - (defun org-export-as-xoxo-insert-into (buffer &rest output) (with-current-buffer buffer (apply 'insert output))) @@ -12380,8 +13547,13 @@ The XOXO buffer is named *xoxo-<source buffer name>*" ;; Output everything as XOXO (with-current-buffer (get-buffer buffer) (goto-char (point-min)) ;; CD: beginning-of-buffer is not allowed. - (let* ((filename (concat (file-name-sans-extension buffer-file-name) - ".xml")) + (let* ((opt-plist (org-combine-plists (org-default-export-plist) + (org-infile-export-plist))) + (filename (concat (file-name-as-directory + (org-export-directory :xoxo opt-plist)) + (file-name-sans-extension + (file-name-nondirectory buffer-file-name)) + ".html")) (out (find-file-noselect filename)) (last-level 1) (hanging-li nil)) @@ -12464,19 +13636,29 @@ The file is stored under the name `org-combined-agenda-icalendar-file'." If COMBINE is non-nil, combine all calendar entries into a single large file and store it under the name `org-combined-agenda-icalendar-file'." (save-excursion - (let* (file ical-file ical-buffer category started org-agenda-new-buffers) + (let* ((dir (org-export-directory + :ical (list :publishing-directory + org-export-publishing-directory))) + file ical-file ical-buffer category started org-agenda-new-buffers) + (when combine - (setq ical-file org-combined-agenda-icalendar-file + (setq ical-file + (if (file-name-absolute-p org-combined-agenda-icalendar-file) + org-combined-agenda-icalendar-file + (expand-file-name org-combined-agenda-icalendar-file dir)) ical-buffer (org-get-agenda-file-buffer ical-file)) (set-buffer ical-buffer) (erase-buffer)) (while (setq file (pop files)) (catch 'nextfile (org-check-agenda-file file) + (set-buffer (org-get-agenda-file-buffer file)) (unless combine - (setq ical-file (concat (file-name-sans-extension file) ".ics")) + (setq ical-file (concat (file-name-as-directory dir) + (file-name-sans-extension + (file-name-nondirectory buffer-file-name)) + ".ics")) (setq ical-buffer (org-get-agenda-file-buffer ical-file)) - (set-buffer ical-buffer) (erase-buffer)) - (set-buffer (org-get-agenda-file-buffer file)) + (with-current-buffer ical-buffer (erase-buffer))) (setq category (or org-category (file-name-sans-extension (file-name-nondirectory buffer-file-name)))) @@ -12611,6 +13793,7 @@ a time), or the day by one (if it does not contain a time)." ;; Make `C-c C-x' a prefix key (define-key org-mode-map "\C-c\C-x" (make-sparse-keymap)) +(define-key org-mode-map "\C-c\C-e" (make-sparse-keymap)) ;; TAB key with modifiers (define-key org-mode-map "\C-i" 'org-cycle) @@ -12708,8 +13891,8 @@ a time), or the day by one (if it does not contain a time)." (define-key org-mode-map "\C-c\C-q" 'org-table-wrap-region) (define-key org-mode-map "\C-c\C-xa" 'org-export-as-ascii) (define-key org-mode-map "\C-c\C-x\C-a" 'org-export-as-ascii) -(define-key org-mode-map "\C-c\C-xv" 'org-export-copy-visible) -(define-key org-mode-map "\C-c\C-x\C-v" 'org-export-copy-visible) +(define-key org-mode-map "\C-c\C-xv" 'org-export-visible) +(define-key org-mode-map "\C-c\C-x\C-v" 'org-export-visible) ;; OPML support is only an option for the future ;(define-key org-mode-map "\C-c\C-xo" 'org-export-as-opml) ;(define-key org-mode-map "\C-c\C-x\C-o" 'org-export-as-opml) @@ -12720,8 +13903,8 @@ a time), or the day by one (if it does not contain a time)." (define-key org-mode-map "\C-c\C-xt" 'org-insert-export-options-template) (define-key org-mode-map "\C-c:" 'org-toggle-fixed-width-section) (define-key org-mode-map "\C-c\C-xh" 'org-export-as-html) -(define-key org-mode-map "\C-c\C-xx" 'org-export-as-xml) -(define-key org-mode-map "\C-c\C-x\C-x" 'org-export-as-xml) +(define-key org-mode-map "\C-c\C-xx" 'org-export-as-xoxo) +(define-key org-mode-map "\C-c\C-x\C-x" 'org-export-as-xoxo) (define-key org-mode-map "\C-c\C-xb" 'org-export-as-html-and-open) (define-key org-mode-map "\C-c\C-x\C-b" 'org-export-as-html-and-open) @@ -12730,6 +13913,18 @@ a time), or the day by one (if it does not contain a time)." (define-key org-mode-map "\C-c\C-x\M-w" 'org-copy-special) (define-key org-mode-map "\C-c\C-x\C-y" 'org-paste-special) +(define-key org-mode-map "\C-c\C-ef" 'org-publish-current-file) +(define-key org-mode-map "\C-c\C-ep" 'org-publish-current-project) +(define-key org-mode-map "\C-c\C-ec" 'org-publish) +(define-key org-mode-map "\C-c\C-ea" 'org-publish-all) +(define-key org-mode-map "\C-c\C-e\C-f" 'org-publish-current-file) +(define-key org-mode-map "\C-c\C-e\C-p" 'org-publish-current-project) +(define-key org-mode-map "\C-c\C-e\C-c" 'org-publish) +(define-key org-mode-map "\C-c\C-e\C-a" 'org-publish-all) + +(when (featurep 'xemacs) + (define-key org-mode-map 'button3 'popup-mode-menu)) + (defsubst org-table-p () (org-at-table-p)) (defun org-self-insert-command (N) @@ -12803,7 +13998,8 @@ because, in this case the deletion might narrow the column." (goto-char pos) ;; noalign: if there were two spaces at the end, this field ;; does not determine the width of the column. - (if noalign (setq org-table-may-need-update c)))) + (if noalign (setq org-table-may-need-update c))) + (delete-char N)) (delete-char N))) ;; How to do this: Measure non-white length of current string @@ -12834,12 +14030,13 @@ COMMANDS is a list of alternating OLDDEF NEWDEF command names." (defun org-shifttab () "Global visibility cycling or move to previous table field. -Calls `(org-cycle t)' or `org-table-previous-field', depending on context. +Calls `org-cycle' with argument t, or `org-table-previous-field', depending +on context. See the individual commands for more information." (interactive) (cond - ((org-at-table-p) (org-table-previous-field)) - (t (org-cycle '(4))))) + ((org-at-table-p) (call-interactively 'org-table-previous-field)) + (t (call-interactively 'org-global-cycle)))) (defun org-shiftmetaleft () "Promote subtree or delete table column. @@ -12847,8 +14044,8 @@ Calls `org-promote-subtree' or `org-table-delete-column', depending on context. See the individual commands for more information." (interactive) (cond - ((org-at-table-p) (org-table-delete-column)) - ((org-on-heading-p) (org-promote-subtree)) + ((org-at-table-p) (call-interactively 'org-table-delete-column)) + ((org-on-heading-p) (call-interactively 'org-promote-subtree)) ((org-at-item-p) (call-interactively 'org-outdent-item)) (t (org-shiftcursor-error)))) @@ -12858,8 +14055,8 @@ Calls `org-demote-subtree' or `org-table-insert-column', depending on context. See the individual commands for more information." (interactive) (cond - ((org-at-table-p) (org-table-insert-column)) - ((org-on-heading-p) (org-demote-subtree)) + ((org-at-table-p) (call-interactively 'org-table-insert-column)) + ((org-on-heading-p) (call-interactively 'org-demote-subtree)) ((org-at-item-p) (call-interactively 'org-indent-item)) (t (org-shiftcursor-error)))) @@ -12870,9 +14067,9 @@ Calls `org-move-subtree-up' or `org-table-kill-row' or for more information." (interactive "P") (cond - ((org-at-table-p) (org-table-kill-row)) - ((org-on-heading-p) (org-move-subtree-up arg)) - ((org-at-item-p) (org-move-item-up arg)) + ((org-at-table-p) (call-interactively 'org-table-kill-row)) + ((org-on-heading-p) (call-interactively 'org-move-subtree-up)) + ((org-at-item-p) (call-interactively 'org-move-item-up)) (t (org-shiftcursor-error)))) (defun org-shiftmetadown (&optional arg) "Move subtree down or insert table row. @@ -12881,9 +14078,9 @@ Calls `org-move-subtree-down' or `org-table-insert-row' or commands for more information." (interactive "P") (cond - ((org-at-table-p) (org-table-insert-row arg)) - ((org-on-heading-p) (org-move-subtree-down arg)) - ((org-at-item-p) (org-move-item-down arg)) + ((org-at-table-p) (call-interactively 'org-table-insert-row)) + ((org-on-heading-p) (call-interactively 'org-move-subtree-down)) + ((org-at-item-p) (call-interactively 'org-move-item-down)) (t (org-shiftcursor-error)))) (defun org-metaleft (&optional arg) @@ -12893,9 +14090,10 @@ With no specific context, calls the Emacs default `backward-word'. See the individual commands for more information." (interactive "P") (cond - ((org-at-table-p) (org-table-move-column 'left)) - ((or (org-on-heading-p) (org-region-active-p)) (org-do-promote)) - (t (backward-word (prefix-numeric-value arg))))) + ((org-at-table-p) (org-call-with-arg 'org-table-move-column 'left)) + ((or (org-on-heading-p) (org-region-active-p)) + (call-interactively 'org-do-promote)) + (t (call-interactively 'backward-word)))) (defun org-metaright (&optional arg) "Demote subtree or move table column to right. @@ -12904,9 +14102,10 @@ With no specific context, calls the Emacs default `forward-word'. See the individual commands for more information." (interactive "P") (cond - ((org-at-table-p) (org-table-move-column nil)) - ((or (org-on-heading-p) (org-region-active-p)) (org-do-demote)) - (t (forward-word (prefix-numeric-value arg))))) + ((org-at-table-p) (call-interactively 'org-table-move-column)) + ((or (org-on-heading-p) (org-region-active-p)) + (call-interactively 'org-do-demote)) + (t (call-interactively 'forward-word)))) (defun org-metaup (&optional arg) "Move subtree up or move table row up. @@ -12915,9 +14114,9 @@ Calls `org-move-subtree-up' or `org-table-move-row' or for more information." (interactive "P") (cond - ((org-at-table-p) (org-table-move-row 'up)) - ((org-on-heading-p) (org-move-subtree-up arg)) - ((org-at-item-p) (org-move-item-up arg)) + ((org-at-table-p) (org-call-with-arg 'org-table-move-row 'up)) + ((org-on-heading-p) (call-interactively 'org-move-subtree-up)) + ((org-at-item-p) (call-interactively 'org-move-item-up)) (t (org-shiftcursor-error)))) (defun org-metadown (&optional arg) @@ -12927,43 +14126,46 @@ Calls `org-move-subtree-down' or `org-table-move-row' or commands for more information." (interactive "P") (cond - ((org-at-table-p) (org-table-move-row nil)) - ((org-on-heading-p) (org-move-subtree-down arg)) - ((org-at-item-p) (org-move-item-down arg)) + ((org-at-table-p) (call-interactively 'org-table-move-row)) + ((org-on-heading-p) (call-interactively 'org-move-subtree-down)) + ((org-at-item-p) (call-interactively 'org-move-item-down)) (t (org-shiftcursor-error)))) (defun org-shiftup (&optional arg) - "Increase item in timestamp or increase priority of current item. + "Increase item in timestamp or increase priority of current headline. Calls `org-timestamp-up' or `org-priority-up', depending on context. See the individual commands for more information." (interactive "P") (cond - ((org-at-timestamp-p) (org-timestamp-up arg)) - (t (org-priority-up)))) + ((org-at-timestamp-p) (call-interactively 'org-timestamp-up)) + ((org-on-heading-p) (call-interactively 'org-priority-up)) + ((org-at-item-p) (call-interactively 'org-previous-item)) + (t (call-interactively 'org-beginning-of-item) (beginning-of-line 1)))) (defun org-shiftdown (&optional arg) - "Decrease item in timestamp or decrease priority of current item. + "Decrease item in timestamp or decrease priority of current headline. Calls `org-timestamp-down' or `org-priority-down', depending on context. See the individual commands for more information." (interactive "P") (cond - ((org-at-timestamp-p) (org-timestamp-down arg)) - (t (org-priority-down)))) + ((org-at-timestamp-p) (call-interactively 'org-timestamp-down)) + ((org-on-heading-p) (call-interactively 'org-priority-down)) + (t (call-interactively 'org-next-item)))) (defun org-shiftright () "Next TODO keyword or timestamp one day later, depending on context." (interactive) (cond - ((org-at-timestamp-p) (org-timestamp-up-day)) - ((org-on-heading-p) (org-todo 'right)) + ((org-at-timestamp-p) (call-interactively 'org-timestamp-up-day)) + ((org-on-heading-p) (org-call-with-arg 'org-todo 'right)) (t (org-shiftcursor-error)))) (defun org-shiftleft () "Previous TODO keyword or timestamp one day earlier, depending on context." (interactive) (cond - ((org-at-timestamp-p) (org-timestamp-down-day)) - ((org-on-heading-p) (org-todo 'left)) + ((org-at-timestamp-p) (call-interactively 'org-timestamp-down-day)) + ((org-on-heading-p) (org-call-with-arg 'org-todo 'left)) (t (org-shiftcursor-error)))) (defun org-copy-special () @@ -13028,21 +14230,23 @@ This command does many different things, depending on context: ((and (local-variable-p 'org-finish-function (current-buffer)) (fboundp org-finish-function)) (funcall org-finish-function)) - ((org-on-target-p) (org-update-radio-target-regexp)) - ((org-on-heading-p) (org-set-tags arg)) + ((org-on-target-p) (call-interactively 'org-update-radio-target-regexp)) + ((org-on-heading-p) (call-interactively 'org-set-tags)) ((org-at-table.el-p) (require 'table) (beginning-of-line 1) (re-search-forward "|" (save-excursion (end-of-line 2) (point))) - (table-recognize-table)) + (call-interactively 'table-recognize-table)) ((org-at-table-p) (org-table-maybe-eval-formula) (if arg - (org-table-recalculate t) + (call-interactively 'org-table-recalculate) (org-table-maybe-recalculate-line)) - (org-table-align)) + (call-interactively 'org-table-align)) + ((org-at-item-checkbox-p) + (call-interactively 'org-toggle-checkbox)) ((org-at-item-p) - (org-renumber-ordered-list (prefix-numeric-value arg))) + (call-interactively 'org-renumber-ordered-list)) ((save-excursion (beginning-of-line 1) (looking-at "#\\+\\([A-Z]+\\)")) (cond ((equal (match-string 1) "TBLFM") @@ -13050,9 +14254,10 @@ This command does many different things, depending on context: (save-excursion (beginning-of-line 1) (skip-chars-backward " \r\n\t") - (if (org-at-table-p) (org-table-recalculate t)))) + (if (org-at-table-p) + (org-call-with-arg 'org-table-recalculate t)))) (t - (org-mode-restart)))) + (call-interactively 'org-mode-restart)))) (t (error "C-c C-c can do nothing useful at this location."))))) (defun org-mode-restart () @@ -13070,7 +14275,7 @@ See the individual commands for more information." (cond ((org-at-table-p) (org-table-justify-field-maybe) - (org-table-next-row)) + (call-interactively 'org-table-next-row)) (t (newline)))) (defun org-meta-return (&optional arg) @@ -13080,8 +14285,8 @@ See the individual commands for more information." (interactive "P") (cond ((org-at-table-p) - (org-table-wrap-region arg)) - (t (org-insert-heading arg)))) + (call-interactively 'org-table-wrap-region)) + (t (call-interactively 'org-insert-heading)))) ;;; Menu entries @@ -13226,10 +14431,10 @@ See the individual commands for more information." "--" ("Export" ["ASCII" org-export-as-ascii t] - ["Extract Visible Text" org-export-copy-visible t] + ["Export visible part..." org-export-visible t] ["HTML" org-export-as-html t] ["HTML and Open" org-export-as-html-and-open t] - ["XML (XOXO)" org-export-as-xml t] + ["XOXO" org-export-as-xoxo t] "--" ["iCalendar this file" org-export-icalendar-this-file t] ["iCalendar all agenda files" org-export-icalendar-all-agenda-files @@ -13238,6 +14443,11 @@ See the individual commands for more information." "--" ["Option Template" org-insert-export-options-template t] ["Toggle Fixed Width" org-toggle-fixed-width-section t]) + ("Publish" + ["Current File" org-publish-current-file t] + ["Current Project" org-publish-current-project t] + ["Project..." org-publish t] + ["All Projects" org-publish-all t]) "--" ("Documentation" ["Show Version" org-version t] @@ -13303,6 +14513,100 @@ With optional NODE, go directly to that node." ;;; Miscellaneous stuff +(defun org-context () + "Return a list of contexts of the current cursor position. +If several contexts apply, all are returned. +Each context entry is a list with a symbol naming the context, and +two positions indicating start and end of the context. Possible +contexts are: + +:headline anywhere in a headline +:headline-stars on the leading stars in a headline +:todo-keyword on a TODO keyword (including DONE) in a headline +:tags on the TAGS in a headline +:priority on the priority cookie in a headline +:item on the first line of a plain list item +:checkbox on the checkbox in a plain list item +:table in an org-mode table +:table-special on a special filed in a table +:table-table in a table.el table +:link on a hyperline +:keyword on a keyword: SCHEDULED, DEADLINE, CLOSE,COMMENT, QUOTE. +:target on a <<target>> +:radio-target on a <<<radio-target>>> + +This function expects the position to be visible because it uses font-lock +faces as a help to recognize the following contexts: :table-special, :link, +and :keyword." + (let* ((f (get-text-property (point) 'face)) + (faces (if (listp f) f (list f))) + (p (point)) clist) + ;; First the large context + (cond + ((org-on-heading-p) + (push (list :headline (point-at-bol) (point-at-eol)) clist) + (when (progn + (beginning-of-line 1) + (looking-at org-todo-line-tags-regexp)) + (push (org-point-in-group p 1 :headline-stars) clist) + (push (org-point-in-group p 2 :todo-keyword) clist) + (push (org-point-in-group p 4 :tags) clist)) + (goto-char p) + (skip-chars-backward "^[\n\r \t") (or (eobp) (backward-char 1)) + (if (looking-at "\\[#[A-Z]\\]") + (push (org-point-in-group p 0 :priority) clist))) + + ((org-at-item-p) + (push (list :item (point-at-bol) + (save-excursion (org-end-of-item) (point))) + clist) + (and (org-at-item-checkbox-p) + (push (org-point-in-group p 0 :checkbox) clist))) + + ((org-at-table-p) + (push (list :table (org-table-begin) (org-table-end)) clist) + (if (memq 'org-formula faces) + (push (list :table-special + (previous-single-property-change p 'face) + (next-single-property-change p 'face)) clist))) + ((org-at-table-p 'any) + (push (list :table-table) clist))) + (goto-char p) + + ;; Now the small context + (cond + ((org-at-timestamp-p) + (push (org-point-in-group p 0 :timestamp) clist)) + ((memq 'org-link faces) + (push (list :link + (previous-single-property-change p 'face) + (next-single-property-change p 'face)) clist)) + ((memq 'org-special-keyword faces) + (push (list :keyword + (previous-single-property-change p 'face) + (next-single-property-change p 'face)) clist)) + ((org-on-target-p) + (push (org-point-in-group p 0 :target) clist) + (goto-char (1- (match-beginning 0))) + (if (looking-at org-radio-target-regexp) + (push (org-point-in-group p 0 :radio-target) clist)) + (goto-char p))) + + (setq clist (nreverse (delq nil clist))) + clist)) + +(defun org-point-in-group (point group &optional context) + "Check if POINT is in match-group GROUP. +If CONTEXT is non-nil, return a list with CONTEXT and the boundaries of the +match. If the match group does ot exist or point is not inside it, +return nil." + (and (match-beginning group) + (>= point (match-beginning group)) + (<= point (match-end group)) + (if context + (list context (match-beginning group) (match-end group)) + t))) + (defun org-move-line-down (arg) "Move the current line down. With prefix argument, move it past ARG lines." (interactive "p") @@ -13331,8 +14635,6 @@ With optional NODE, go directly to that node." ;; Paragraph filling stuff. ;; We want this to be just right, so use the full arsenal. -;; FIXME: This very likely does not work correctly for XEmacs, because the -;; filladapt package works slightly differently. (defun org-set-autofill-regexps () (interactive) @@ -13451,7 +14753,7 @@ that can be added." ;; The following functions capture almost the entire compatibility code ;; between the different versions of outline-mode. The only other ;; places where this is important are the font-lock-keywords, and in -;; `org-export-copy-visible'. Search for `org-noutline-p' to find them. +;; `org-export-visible'. Search for `org-noutline-p' to find them. ;; C-a should go to the beginning of a *visible* line, also in the ;; new outline.el. I guess this should be patched into Emacs? @@ -13471,8 +14773,6 @@ to a visible line beginning. This makes the function of C-a more intuitive." (when org-noutline-p (define-key org-mode-map "\C-a" 'org-beginning-of-line)) -;; FIXME: should I use substitute-key-definition to reach other bindings -;; of beginning-of-line? (defun org-invisible-p () "Check if point is at a character currently not visible." @@ -13503,15 +14803,15 @@ to a visible line beginning. This makes the function of C-a more intuitive." Only visible heading lines are considered, unless INVISIBLE-OK is non-nil." (if org-noutline-p (outline-back-to-heading invisible-ok) - (if (and (memq (char-before) '(?\n ?\r)) + (if (and (or (bobp) (memq (char-before) '(?\n ?\r))) (looking-at outline-regexp)) t (if (re-search-backward (concat (if invisible-ok "\\([\r\n]\\|^\\)" "^") outline-regexp) nil t) (if invisible-ok - (progn (goto-char (match-end 1)) - (looking-at outline-regexp))) + (progn (goto-char (or (match-end 1) (match-beginning 0))) + (looking-at outline-regexp))) (error "Before first heading"))))) (defun org-on-heading-p (&optional invisible-ok) @@ -13585,10 +14885,9 @@ When ENTRY is non-nil, show the entire entry." (if entry (progn (org-show-entry) - (save-excursion ;; FIXME: Is this the fix for points in the -| - ;; middle of text? | - (and (outline-next-heading) ;; | - (org-flag-heading nil)))) ; show the next heading _| + (save-excursion + (and (outline-next-heading) + (org-flag-heading nil)))) (outline-flag-region (max 1 (1- (point))) (save-excursion (outline-end-of-heading) (point)) (if org-noutline-p @@ -13630,7 +14929,7 @@ Show the heading too, if it is currently invisible." (save-excursion (org-back-to-heading t) (outline-flag-region - (1- (point)) + (max 1 (1- (point))) (save-excursion (re-search-forward (concat "[\r\n]\\(" outline-regexp "\\)") nil 'move) (or (match-beginning 1) (point-max))) @@ -13669,6 +14968,10 @@ Show the heading too, if it is currently invisible." (run-hooks 'org-load-hook) + ;; arch-tag: e77da1a7-acc7-4336-b19e-efa25af3f9fd ;;; org.el ends here + + + diff --git a/lisp/textmodes/po.el b/lisp/textmodes/po.el index 07b9ba1a2b1..eac1cb94105 100644 --- a/lisp/textmodes/po.el +++ b/lisp/textmodes/po.el @@ -41,15 +41,21 @@ Contains canonical charset names that don't correspond to coding systems.") (defun po-find-charset (filename) - "Return PO charset value for FILENAME." + "Return PO charset value for FILENAME. +If FILENAME is a cons, the cdr part is a buffer that already contains +the PO file (but not yet decoded)." (let ((charset-regexp "^\"Content-Type:[ \t]*text/plain;[ \t]*charset=\\(.*\\)\\\\n\"") + (buf (and (consp filename) (cdr filename))) (short-read nil)) + (when buf + (set-buffer buf) + (goto-char (point-min))) ;; Try the first 4096 bytes. In case we cannot find the charset value ;; within the first 4096 bytes (the PO file might start with a long ;; comment) try the next 4096 bytes repeatedly until we'll know for sure ;; we've checked the empty header entry entirely. - (while (not (or short-read (re-search-forward "^msgid" nil t))) + (while (not (or short-read (re-search-forward "^msgid" nil t) buf)) (save-excursion (goto-char (point-max)) (let ((pair (insert-file-contents-literally filename nil @@ -57,7 +63,7 @@ Contains canonical charset names that don't correspond to coding systems.") (1- (+ (point) 4096))))) (setq short-read (< (nth 1 pair) 4096))))) (cond ((re-search-forward charset-regexp nil t) (match-string 1)) - (short-read nil) + ((or short-read buf) nil) ;; We've found the first msgid; maybe, only a part of the msgstr ;; value was loaded. Load the next 1024 bytes; if charset still ;; isn't available, give up. @@ -71,10 +77,13 @@ Contains canonical charset names that don't correspond to coding systems.") (defun po-find-file-coding-system-guts (operation filename) "Return a (DECODING . ENCODING) pair for OPERATION on PO file FILENAME. -Do so according to FILENAME's declared charset." +Do so according to FILENAME's declared charset. +FILENAME may be a cons (NAME . BUFFER). In that case, detect charset +in BUFFER." (and (eq operation 'insert-file-contents) - (file-exists-p filename) + (or (if (consp filename) (buffer-live-p (cdr filename))) + (file-exists-p filename)) (with-temp-buffer (let* ((coding-system-for-read 'no-conversion) (charset (or (po-find-charset filename) "ascii")) diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el index 416a3efb684..18f0c980929 100644 --- a/lisp/textmodes/sgml-mode.el +++ b/lisp/textmodes/sgml-mode.el @@ -49,13 +49,14 @@ :type 'integer :group 'sgml) -(defcustom sgml-transformation 'identity - "*Default value for `skeleton-transformation' (which see) in SGML mode." +(defcustom sgml-transformation-function 'identity + "*Default value for `skeleton-transformation-function' in SGML mode." :type 'function :group 'sgml) -(put 'sgml-transformation 'variable-interactive +(put 'sgml-transformation-function 'variable-interactive "aTransformation function: ") +(defvaralias 'sgml-transformation 'sgml-transformation-function) (defcustom sgml-mode-hook nil "Hook run by command `sgml-mode'. @@ -333,6 +334,7 @@ an optional alist of possible values." :type '(repeat (cons (string :tag "Tag Name") (repeat :tag "Tag Rule" sexp))) :group 'sgml) +(put 'sgml-tag-alist 'risky-local-variable t) (defcustom sgml-tag-help '(("!" . "Empty declaration for comment") @@ -389,7 +391,7 @@ a DOCTYPE or an XML declaration." (defun sgml-mode-facemenu-add-face-function (face end) (if (setq face (cdr (assq face sgml-face-tag-alist))) (progn - (setq face (funcall skeleton-transformation face)) + (setq face (funcall skeleton-transformation-function face)) (setq facemenu-end-add-face (concat "</" face ">")) (concat "<" face ">")) (error "Face not configured for %s mode" mode-name))) @@ -413,8 +415,8 @@ An argument of N to a tag-inserting command means to wrap it around the next N words. In Transient Mark mode, when the mark is active, N defaults to -1, which means to wrap it around the current region. -If you like upcased tags, put (setq sgml-transformation 'upcase) in -your `.emacs' file. +If you like upcased tags, put (setq sgml-transformation-function 'upcase) +in your `.emacs' file. Use \\[sgml-validate] to validate your document with an SGML parser. @@ -458,7 +460,8 @@ Do \\[describe-key] on the following bindings to discover what they do. (sgml-xml-guess) (if sgml-xml-mode (setq mode-name "XML") - (set (make-local-variable 'skeleton-transformation) sgml-transformation)) + (set (make-local-variable 'skeleton-transformation-function) + sgml-transformation-function)) ;; This will allow existing comments within declarations to be ;; recognized. (set (make-local-variable 'comment-start-skip) "\\(?:<!\\)?--[ \t]*") @@ -602,9 +605,9 @@ This only works for Latin-1 input." (if sgml-name-8bit-mode "ON" "OFF"))) ;; When an element of a skeleton is a string "str", it is passed -;; through skeleton-transformation and inserted. If "str" is to be -;; inserted literally, one should obtain it as the return value of a -;; function, e.g. (identity "str"). +;; through `skeleton-transformation-function' and inserted. +;; If "str" is to be inserted literally, one should obtain it as +;; the return value of a function, e.g. (identity "str"). (defvar sgml-tag-last nil) (defvar sgml-tag-history nil) @@ -612,9 +615,10 @@ This only works for Latin-1 input." "Prompt for a tag and insert it, optionally with attributes. Completion and configuration are done according to `sgml-tag-alist'. If you like tags and attributes in uppercase do \\[set-variable] -skeleton-transformation RET upcase RET, or put this in your `.emacs': - (setq sgml-transformation 'upcase)" - (funcall (or skeleton-transformation 'identity) +`skeleton-transformation-function' RET `upcase' RET, or put this +in your `.emacs': + (setq sgml-transformation-function 'upcase)" + (funcall (or skeleton-transformation-function 'identity) (setq sgml-tag-last (completing-read (if (> (length sgml-tag-last) 0) @@ -637,7 +641,7 @@ skeleton-transformation RET upcase RET, or put this in your `.emacs': ;; For xhtml's `tr' tag, we should maybe use \n instead. (if (eq v2 t) (setq v2 nil)) ;; We use `identity' to prevent skeleton from passing - ;; `str' through skeleton-transformation a second time. + ;; `str' through `skeleton-transformation-function' a second time. '(("") v2 _ v2 "</" (identity ',str) ?>)) ((eq (car v2) t) (cons '("") (cdr v2))) @@ -668,12 +672,12 @@ If QUIET, do not print a message when there are no attributes for TAG." (if (stringp (car alist)) (progn (insert (if (eq (preceding-char) ?\s) "" ?\s) - (funcall skeleton-transformation (car alist))) + (funcall skeleton-transformation-function (car alist))) (sgml-value alist)) (setq i (length alist)) (while (> i 0) (insert ?\s) - (insert (funcall skeleton-transformation + (insert (funcall skeleton-transformation-function (setq attribute (skeleton-read '(completing-read "Attribute: " @@ -1979,12 +1983,12 @@ Can be used as a value for `html-mode-hook'." "\" name=\"" (or v1 (setq v1 (skeleton-read "Name: "))) "\" value=\"" str ?\" (when (y-or-n-p "Set \"checked\" attribute? ") - (funcall skeleton-transformation + (funcall skeleton-transformation-function (if sgml-xml-mode " checked=\"checked\"" " checked"))) (if sgml-xml-mode " />" ">") (skeleton-read "Text: " (capitalize str)) (or v2 (setq v2 (if (y-or-n-p "Newline after text? ") - (funcall skeleton-transformation + (funcall skeleton-transformation-function (if sgml-xml-mode "<br />" "<br>")) ""))) \n)) @@ -1999,12 +2003,12 @@ Can be used as a value for `html-mode-hook'." "\" name=\"" (or (car v2) (setcar v2 (skeleton-read "Name: "))) "\" value=\"" str ?\" (when (and (not v1) (setq v1 (y-or-n-p "Set \"checked\" attribute? "))) - (funcall skeleton-transformation + (funcall skeleton-transformation-function (if sgml-xml-mode " checked=\"checked\"" " checked"))) (if sgml-xml-mode " />" ">") (skeleton-read "Text: " (capitalize str)) (or (cdr v2) (setcdr v2 (if (y-or-n-p "Newline after text? ") - (funcall skeleton-transformation + (funcall skeleton-transformation-function (if sgml-xml-mode "<br />" "<br>")) ""))) \n)) diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el index 6c9463fe11e..dab08902769 100644 --- a/lisp/textmodes/table.el +++ b/lisp/textmodes/table.el @@ -6,7 +6,7 @@ ;; Keywords: wp, convenience ;; Author: Takaaki Ota <Takaaki.Ota@am.sony.com> ;; Created: Sat Jul 08 2000 13:28:45 (PST) -;; Revised: Sat Aug 06 2005 19:42:54 (CEST) +;; Revised: Tue May 30 2006 10:01:43 (PDT) ;; This file is part of GNU Emacs. @@ -3104,10 +3104,10 @@ CALS (DocBook DTD): (cond ((eq language 'html) (insert (format "<!-- This HTML table template is generated by emacs %s -->\n" emacs-version) - (format "<TABLE %s>\n" table-html-table-attribute) + (format "<table %s>\n" table-html-table-attribute) (if (and (stringp caption) (not (string= caption ""))) - (format " <CAPTION>%s</CAPTION>\n" caption) + (format " <caption>%s</caption>\n" caption) ""))) ((eq language 'latex) (insert (format "%% This LaTeX table template is generated by emacs %s\n" emacs-version) @@ -3131,7 +3131,7 @@ CALS (DocBook DTD): (with-current-buffer dest-buffer (cond ((eq language 'html) - (insert "</TABLE>\n")) + (insert "</table>\n")) ((eq language 'latex) (insert "\\end{tabular}\n")) ((eq language 'cals) @@ -3152,7 +3152,7 @@ CALS (DocBook DTD): (with-current-buffer dest-buffer (cond ((eq language 'html) - (insert " <TR>\n")) + (insert " <tr>\n")) ((eq language 'cals) (insert " <row>\n")) )) @@ -3160,7 +3160,7 @@ CALS (DocBook DTD): (with-current-buffer dest-buffer (cond ((eq language 'html) - (insert " </TR>\n")) + (insert " </tr>\n")) ((eq language 'cals) (insert " </row>\n") (unless (/= (table-get-source-info 'current-row) table-cals-thead-rows) @@ -3207,7 +3207,7 @@ CALS (DocBook DTD): 'cell-type (if (or (<= (table-get-source-info 'current-row) table-html-th-rows) (<= (table-get-source-info 'current-column) table-html-th-columns)) - "TH" "TD")))) + "th" "td")))) (if (and table-html-cell-attribute (not (string= table-html-cell-attribute ""))) (insert " " table-html-cell-attribute)) (if (> colspan 1) (insert (format " colspan=\"%d\"" colspan))) @@ -3266,7 +3266,7 @@ CALS (DocBook DTD): (goto-char (point-min)) (while (and (re-search-forward "$" nil t) (not (eobp))) - (insert "<BR />") + (insert "<br />") (forward-char 1))) (unless (and table-html-delegate-spacing-to-user-agent (progn diff --git a/lisp/textmodes/text-mode.el b/lisp/textmodes/text-mode.el index a4b67057676..9263c48f18b 100644 --- a/lisp/textmodes/text-mode.el +++ b/lisp/textmodes/text-mode.el @@ -33,7 +33,7 @@ (defcustom text-mode-hook nil "Normal hook run when entering Text mode and many related modes." :type 'hook - :options '(turn-on-auto-fill flyspell-mode) + :options '(turn-on-auto-fill turn-on-flyspell) :group 'data) (defvar text-mode-variant nil diff --git a/lisp/tumme.el b/lisp/tumme.el index 6a53ed16948..d6420bf33d7 100644 --- a/lisp/tumme.el +++ b/lisp/tumme.el @@ -84,46 +84,13 @@ ;; USAGE ;; ===== ;; -;; If you plan to use tumme much, setting up key bindings for it in -;; dired is a good idea: +;; This information has been moved to the manual. Type `C-h r' to open +;; the Emacs manual and go to the node Thumbnails by typing `g +;; Thumbnails RET'. ;; -;; (tumme-setup-dired-keybindings) -;; -;; Next, do M-x tumme-dired RET. This will ask you for a directory -;; where image files are stored, setup a useful window configuration -;; and enable the two special modes that tumme provides. NOTE: If you -;; do not want tumme to split your windows, call it with a prefix -;; argument. -;; -;; Start viewing thumbnails by doing C-S-n and C-S-p to go up and down -;; in the dired buffer while at the same time displaying a thumbnail -;; image. The thumbnail images will be created on the fly, and -;; cached. This means that the first time you browse your images, it -;; will be a bit slow because the thumbnails are created. If you want -;; to avoid this, you can pre-create the thumbnail images by marking -;; all images in dired (% m \.jpg$ RET) and then do M-x -;; tumme-create-thumbs. -;; -;; Next, try `tumme-display-thumbs' (C-t d). If no file is marked, a -;; thumbnail for the file at point will show up in -;; `tumme-thumbnail-buffer'. If one or more files are marked, -;; thumbnails for those files will be displayed. -;; -;; Pressing TAB will switch to the window containing the -;; `tumme-thumbnail-buffer' buffer. In there you can move between -;; thumbnail images and display a semi-sized version in an Emacs -;; buffer (RET), or the original image in an external viewer -;; (C-RET). By pressing SPC or DEL you will navigate back and fort -;; while at the same time displaying each image in Emacs. You can also -;; navigate using arrow keys. Comment a file by pressing "c". Press -;; TAB to get back to dired. -;; -;; While in dired mode, you can tag and comment files, you can tell -;; `tumme' to mark files with a certain tag (using a regexp) etc. -;; -;; The easiest way to see the available commands is to use the Tumme -;; menus added in tumme-thumbnail-mode and dired-mode. +;; Quickstart: M-x tumme RET DIRNAME RET ;; +;; where DIRNAME is a directory containing image files. ;; ;; LIMITATIONS ;; =========== @@ -488,7 +455,7 @@ completely fit)." :type 'integer :group 'tumme) -(defcustom tumme-track-movement nil +(defcustom tumme-track-movement t "The current state of the tracking and mirroring. For more information, see the documentation for `tumme-toggle-movement-tracking'." @@ -541,13 +508,13 @@ Used by `tumme-copy-with-exif-file-name'." :group 'tumme) (defcustom tumme-show-all-from-dir-max-files 50 - "*Maximum number of files to show using`tumme-show-all-from-dir'. + "*Maximum number of files to show using `tumme-show-all-from-dir'. before warning the user." :type 'integer :group 'tumme) (defun tumme-dir () - "Return the current thumbnails directory (from `tumme-dir'). + "Return the current thumbnails directory (from variable `tumme-dir'). Create the thumbnails directory if it does not exist." (let ((tumme-dir (file-name-as-directory (expand-file-name tumme-dir)))) @@ -701,7 +668,7 @@ Otherwise, delete overlays." (interactive) (dired-next-line 1) (tumme-display-thumbs - t (or tumme-append-when-browsing nil)) + t (or tumme-append-when-browsing nil) t) (if tumme-dired-disp-props (tumme-dired-display-properties))) @@ -710,7 +677,7 @@ Otherwise, delete overlays." (interactive) (dired-previous-line 1) (tumme-display-thumbs - t (or tumme-append-when-browsing nil)) + t (or tumme-append-when-browsing nil) t) (if tumme-dired-disp-props (tumme-dired-display-properties))) @@ -729,7 +696,7 @@ Otherwise, delete overlays." (interactive) (dired-mark 1) (tumme-display-thumbs - t (or tumme-append-when-browsing nil)) + t (or tumme-append-when-browsing nil) t) (if tumme-dired-disp-props (tumme-dired-display-properties))) @@ -818,7 +785,7 @@ Restore any changes to the window configuration made by calling (message "No saved window configuration"))) ;;;###autoload -(defun tumme-display-thumbs (&optional arg append) +(defun tumme-display-thumbs (&optional arg append do-not-pop) "Display thumbnails of all marked files, in `tumme-thumbnail-buffer'. If a thumbnail image does not exist for a file, it is created on the fly. With prefix argument ARG, display only thumbnail for file at @@ -830,7 +797,14 @@ you have the dired buffer in the left window and the `tumme-thumbnail-buffer' buffer in the right window. With optional argument APPEND, append thumbnail to thumbnail buffer -instead of erasing it first." +instead of erasing it first. + +Option argument DO-NOT-POP controls if `pop-to-buffer' should be +used or not. If non-nil, use `display-buffer' instead of +`pop-to-buffer'. This is used from functions like +`tumme-next-line-and-display' and +`tumme-previous-line-and-display' where we do not want the +thumbnail buffer to be selected." (interactive "P") (let ((buf (tumme-create-thumbnail-buffer)) curr-file thumb-name files count dired-buf beg) @@ -862,8 +836,11 @@ instead of erasing it first." nil) (t (tumme-line-up-dynamic)))) - (pop-to-buffer tumme-thumbnail-buffer))) + (if do-not-pop + (display-buffer tumme-thumbnail-buffer) + (pop-to-buffer tumme-thumbnail-buffer)))) +;;;###autoload (defun tumme-show-all-from-dir (dir) "Make a preview buffer for all images in DIR and display it. If the number of files in DIR matching `image-file-name-regexp' @@ -905,10 +882,9 @@ displayed." (end-of-line) (setq end (point)) (beginning-of-line) - (if (not (search-forward (format ";%s" tag) end t)) - (progn - (end-of-line) - (insert (format ";%s" tag))))) + (when (not (search-forward (format ";%s" tag) end t)) + (end-of-line) + (insert (format ";%s" tag)))) (goto-char (point-max)) (insert (format "\n%s;%s" file tag)))) files) @@ -927,27 +903,24 @@ displayed." (mapcar (lambda (file) (goto-char (point-min)) - (if (search-forward-regexp - (format "^%s" file) nil t) - (progn - (end-of-line) - (setq end (point)) - (beginning-of-line) - (if (search-forward-regexp (format "\\(;%s\\)" tag) end t) - (progn - (delete-region (match-beginning 1) (match-end 1)) - ;; Check if file should still be in the database. If - ;; it has no tags or comments, it will be removed. - (end-of-line) - (setq end (point)) - (beginning-of-line) - (if (not (search-forward ";" end t)) - (progn - (kill-line 1) - ;; If on empty line at end of buffer - (if (and (eobp) - (looking-at "^$")) - (delete-backward-char 1))))))))) + (when (search-forward-regexp + (format "^%s" file) nil t) + (end-of-line) + (setq end (point)) + (beginning-of-line) + (when (search-forward-regexp (format "\\(;%s\\)" tag) end t) + (delete-region (match-beginning 1) (match-end 1)) + ;; Check if file should still be in the database. If + ;; it has no tags or comments, it will be removed. + (end-of-line) + (setq end (point)) + (beginning-of-line) + (when (not (search-forward ";" end t)) + (kill-line 1) + ;; If on empty line at end of buffer + (when (and (eobp) + (looking-at "^$")) + (delete-backward-char 1)))))) files) (save-buffer) (kill-buffer buf)))) @@ -958,17 +931,16 @@ displayed." (let (end buf (tags "")) (setq buf (find-file tumme-db-file)) (goto-char (point-min)) - (if (search-forward-regexp - (format "^%s" file) nil t) - (progn - (end-of-line) - (setq end (point)) - (beginning-of-line) - (if (search-forward ";" end t) - (if (search-forward "comment:" end t) - (if (search-forward ";" end t) - (setq tags (buffer-substring (point) end))) - (setq tags (buffer-substring (point) end)))))) + (when (search-forward-regexp + (format "^%s" file) nil t) + (end-of-line) + (setq end (point)) + (beginning-of-line) + (if (search-forward ";" end t) + (if (search-forward "comment:" end t) + (if (search-forward ";" end t) + (setq tags (buffer-substring (point) end))) + (setq tags (buffer-substring (point) end))))) (kill-buffer buf) (split-string tags ";")))) @@ -976,7 +948,7 @@ displayed." (defun tumme-tag-files (arg) "Tag marked file(s) in dired. With prefix ARG, tag file at point." (interactive "P") - (let ((tag (read-string "Tag to add: ")) + (let ((tag (read-string "Tags to add (separate tags with a semicolon): ")) curr-file files) (if arg (setq files (dired-get-filename)) @@ -986,13 +958,13 @@ displayed." (defun tumme-tag-thumbnail () "Tag current thumbnail." (interactive) - (let ((tag (read-string "Tag to add: "))) + (let ((tag (read-string "Tags to add (separate tags with a semicolon): "))) (tumme-write-tag (tumme-original-file-name) tag)) (tumme-update-property 'tags (tumme-list-tags (tumme-original-file-name)))) ;;;###autoload -(defun tumme-tag-remove (arg) +(defun tumme-delete-tag (arg) "Remove tag for selected file(s). With prefix argument ARG, remove tag from file at point." (interactive "P") @@ -1034,17 +1006,16 @@ use only useful if `tumme-track-movement' is nil." (let ((old-buf (current-buffer)) (dired-buf (tumme-associated-dired-buffer)) (file-name (tumme-original-file-name))) - (if (and dired-buf file-name) - (progn - (setq file-name (file-name-nondirectory file-name)) - (set-buffer dired-buf) - (goto-char (point-min)) - (if (not (search-forward file-name nil t)) - (message "Could not track file") - (dired-move-to-filename) - (set-window-point - (tumme-get-buffer-window dired-buf) (point))) - (set-buffer old-buf))))) + (when (and dired-buf file-name) + (setq file-name (file-name-nondirectory file-name)) + (set-buffer dired-buf) + (goto-char (point-min)) + (if (not (search-forward file-name nil t)) + (message "Could not track file") + (dired-move-to-filename) + (set-window-point + (tumme-get-buffer-window dired-buf) (point))) + (set-buffer old-buf)))) (defun tumme-toggle-movement-tracking () "Turn on and off `tumme-track-movement'. @@ -1063,24 +1034,22 @@ the other way around." (let ((file (dired-get-filename)) (old-buf (current-buffer)) prop-val found) - (if (get-buffer tumme-thumbnail-buffer) - (progn - (set-buffer tumme-thumbnail-buffer) - (goto-char (point-min)) - (while (and (not (eobp)) - (not found)) - (if (and (setq prop-val - (get-text-property (point) 'original-file-name)) - (string= prop-val file)) - (setq found t)) - (if (not found) - (forward-char 1))) - (if found - (progn - (set-window-point - (tumme-thumbnail-window) (point)) - (tumme-display-thumb-properties))) - (set-buffer old-buf))))) + (when (get-buffer tumme-thumbnail-buffer) + (set-buffer tumme-thumbnail-buffer) + (goto-char (point-min)) + (while (and (not (eobp)) + (not found)) + (if (and (setq prop-val + (get-text-property (point) 'original-file-name)) + (string= prop-val file)) + (setq found t)) + (if (not found) + (forward-char 1))) + (when found + (set-window-point + (tumme-thumbnail-window) (point)) + (tumme-display-thumb-properties)) + (set-buffer old-buf)))) (defun tumme-dired-next-line (&optional arg) "Call `dired-next-line', then track thumbnail. @@ -1105,29 +1074,27 @@ move ARG lines." (interactive) ;; Before we move, make sure that there is an image two positions ;; forward. - (if (save-excursion + (when (save-excursion (forward-char 2) (tumme-image-at-point-p)) - (progn - (forward-char) - (while (and (not (eobp)) - (not (tumme-image-at-point-p))) - (forward-char)) - (if tumme-track-movement - (tumme-track-original-file)))) + (forward-char) + (while (and (not (eobp)) + (not (tumme-image-at-point-p))) + (forward-char)) + (if tumme-track-movement + (tumme-track-original-file))) (tumme-display-thumb-properties)) (defun tumme-backward-char () "Move to previous image and display properties." (interactive) - (if (not (bobp)) - (progn - (backward-char) - (while (and (not (bobp)) - (not (tumme-image-at-point-p))) - (backward-char)) - (if tumme-track-movement - (tumme-track-original-file)))) + (when (not (bobp)) + (backward-char) + (while (and (not (bobp)) + (not (tumme-image-at-point-p))) + (backward-char)) + (if tumme-track-movement + (tumme-track-original-file))) (tumme-display-thumb-properties)) (defun tumme-next-line () @@ -1515,9 +1482,9 @@ Note that n, p and <down> and <up> will be hijacked and bound to (define-key dired-mode-map "\C-td" 'tumme-display-thumbs) (define-key dired-mode-map "\C-tt" 'tumme-tag-files) - (define-key dired-mode-map "\C-tr" 'tumme-tag-remove) + (define-key dired-mode-map "\C-tr" 'tumme-delete-tag) (define-key dired-mode-map [tab] 'tumme-jump-thumbnail-buffer) - (define-key dired-mode-map "\C-ti" 'tumme-display-dired-image) + (define-key dired-mode-map "\C-ti" 'tumme-dired-display-image) (define-key dired-mode-map "\C-tx" 'tumme-dired-display-external) (define-key dired-mode-map "\C-ta" 'tumme-display-thumbs-append) (define-key dired-mode-map "\C-t." 'tumme-display-thumb) @@ -1537,8 +1504,8 @@ Note that n, p and <down> and <up> will be hijacked and bound to (define-key dired-mode-map [menu-bar tumme tumme-mark-tagged-files] '("Mark tagged files" . tumme-mark-tagged-files)) - (define-key dired-mode-map [menu-bar tumme tumme-tag-remove] - '("Remove tag from files" . tumme-tag-remove)) + (define-key dired-mode-map [menu-bar tumme tumme-delete-tag] + '("Remove tag from files" . tumme-delete-tag)) (define-key dired-mode-map [menu-bar tumme tumme-tag-files] '("Tag files" . tumme-tag-files)) @@ -1561,8 +1528,8 @@ Note that n, p and <down> and <up> will be hijacked and bound to [menu-bar tumme tumme-dired-display-external] '("Display in external viewer" . tumme-dired-display-external)) (define-key dired-mode-map - [menu-bar tumme tumme-display-dired-image] - '("Display image" . tumme-display-dired-image)) + [menu-bar tumme tumme-dired-display-image] + '("Display image" . tumme-dired-display-image)) (define-key dired-mode-map [menu-bar tumme tumme-display-thumb] '("Display this thumbnail" . tumme-display-thumb)) @@ -1658,13 +1625,13 @@ Ask user for number of images to show and the delay in between." (defun tumme-display-thumbs-append () "Append thumbnails to `tumme-thumbnail-buffer'." (interactive) - (tumme-display-thumbs nil t)) + (tumme-display-thumbs nil t t)) ;;;###autoload (defun tumme-display-thumb () "Shorthard for `tumme-display-thumbs' with prefix argument." (interactive) - (tumme-display-thumbs t)) + (tumme-display-thumbs t nil t)) (defun tumme-line-up () "Line up thumbnails according to `tumme-thumbs-per-row'. @@ -1688,11 +1655,10 @@ See also `tumme-line-up-dynamic'." (insert "\n") (insert " ") (setq count (1+ count)) - (if (= count (- tumme-thumbs-per-row 1)) - (progn - (forward-char) - (insert "\n") - (setq count 0)))))) + (when (= count (- tumme-thumbs-per-row 1)) + (forward-char) + (insert "\n") + (setq count 0))))) (goto-char (point-min)))) (defun tumme-line-up-dynamic () @@ -1786,13 +1752,11 @@ Ask user how many thumbnails should be displayed per row." (defun tumme-display-image (file &optional original-size) "Display image FILE in image buffer. -Use this when you want to display the image, semi sized, in a window -next to the thumbnail window - typically a three-window configuration -with dired to the left, thumbnail window to the upper right and image -window to the lower right. The image is sized to fit the display -window (using a temporary file, don't worry). Because of this, it -will not be as quick as opening it directly, but on most modern -systems it should feel snappy enough. +Use this when you want to display the image, semi sized, in a new +window. The image is sized to fit the display window (using a +temporary file, don't worry). Because of this, it will not be as +quick as opening it directly, but on most modern systems it +should feel snappy enough. If optional argument ORIGINAL-SIZE is non-nil, display image in its original size." @@ -1841,12 +1805,13 @@ With prefix argument ARG, display image in its original size." (display-buffer tumme-display-image-buffer)))))) ;;;###autoload -(defun tumme-display-dired-image (&optional arg) +(defun tumme-dired-display-image (&optional arg) "Display current image file. See documentation for `tumme-display-image' for more information. With prefix argument ARG, display image in its original size." (interactive "P") - (tumme-display-image (dired-get-filename) arg)) + (tumme-display-image (dired-get-filename) arg) + (display-buffer tumme-display-image-buffer)) (defun tumme-image-at-point-p () "Return true if there is a tumme thumbnail at point." @@ -2122,19 +2087,18 @@ as initial value." (let (end buf comment-beg comment (base-name (file-name-nondirectory file))) (setq buf (find-file tumme-db-file)) (goto-char (point-min)) - (if (search-forward-regexp - (format "^%s" base-name) nil t) - (progn - (end-of-line) - (setq end (point)) - (beginning-of-line) - (cond ((search-forward ";comment:" end t) - (setq comment-beg (point)) - (if (search-forward ";" end t) - (setq comment-end (- (point) 1)) - (setq comment-end end)) - (setq comment (buffer-substring - comment-beg comment-end)))))) + (when (search-forward-regexp + (format "^%s" base-name) nil t) + (end-of-line) + (setq end (point)) + (beginning-of-line) + (cond ((search-forward ";comment:" end t) + (setq comment-beg (point)) + (if (search-forward ";" end t) + (setq comment-end (- (point) 1)) + (setq comment-end end)) + (setq comment (buffer-substring + comment-beg comment-end))))) (kill-buffer buf) comment))) diff --git a/lisp/vc.el b/lisp/vc.el index 61b8aa05a4b..54237800e3c 100644 --- a/lisp/vc.el +++ b/lisp/vc.el @@ -894,10 +894,12 @@ However, before executing BODY, find FILE, and after BODY, save buffer." (defun vc-process-filter (p s) "An alternative output filter for async process P. -The only difference with the default filter is to insert S after markers." +One difference with the default filter is that this inserts S after markers. +Another is that undo information is not kept." (with-current-buffer (process-buffer p) (save-excursion - (let ((inhibit-read-only t)) + (let ((buffer-undo-list t) + (inhibit-read-only t)) (goto-char (process-mark p)) (insert s) (set-marker (process-mark p) (point)))))) @@ -914,7 +916,8 @@ BUF defaults to \"*vc*\", can be a string and will be created if necessary." (set (make-local-variable 'vc-parent-buffer-name) (concat " from " (buffer-name camefrom))) (setq default-directory olddir) - (let ((inhibit-read-only t)) + (let ((buffer-undo-list t) + (inhibit-read-only t)) (erase-buffer)))) (defun vc-exec-after (code) @@ -1003,7 +1006,8 @@ that is inserted into the command line before the filename." (vc-exec-after `(unless (active-minibuffer-window) (message "Running %s in the background... done" ',command)))) - (setq status (apply 'process-file command nil t nil squeezed)) + (let ((buffer-undo-list t)) + (setq status (apply 'process-file command nil t nil squeezed))) (when (and (not (eq t okstatus)) (or (not (integerp status)) (and okstatus (< okstatus status)))) diff --git a/lisp/whitespace.el b/lisp/whitespace.el index 7f3cbd913ca..449606607f6 100644 --- a/lisp/whitespace.el +++ b/lisp/whitespace.el @@ -430,7 +430,7 @@ and: (if buffer-read-only (if (not quiet) (message "Can't cleanup: %s is read-only" (buffer-name))) - (whitespace-cleanup)) + (whitespace-cleanup-internal)) (let ((whitespace-leading (if whitespace-check-buffer-leading (whitespace-buffer-leading) nil)) @@ -520,6 +520,11 @@ and: "Cleanup the five different kinds of whitespace problems. See `whitespace-buffer' docstring for a summary of the problems." (interactive) + (if (and transient-mark-mode mark-active) + (whitespace-cleanup-region (region-beginning) (region-end)) + (whitespace-cleanup-internal))) + +(defun whitespace-cleanup-internal () ;; If this buffer really contains a file, then run, else quit. (whitespace-check-whitespace-mode current-prefix-arg) (if (and buffer-file-name whitespace-mode) @@ -563,7 +568,7 @@ See `whitespace-buffer' docstring for a summary of the problems." ;; Call this recursively till everything is taken care of (if whitespace-any - (whitespace-cleanup) + (whitespace-cleanup-internal) (progn (if (not whitespace-silent) (message "%s clean" buffer-file-name)) @@ -577,7 +582,7 @@ See `whitespace-buffer' docstring for a summary of the problems." (save-excursion (save-restriction (narrow-to-region s e) - (whitespace-cleanup)) + (whitespace-cleanup-internal)) (whitespace-buffer t))) (defun whitespace-buffer-leading () @@ -760,7 +765,7 @@ If timer is not set, then set it to scan the files in (if whitespace-auto-cleanup (progn ;;(message "cleaning up whitespace in %s" bufname) - (whitespace-cleanup)) + (whitespace-cleanup-internal)) (progn ;;(message "whitespace-buffer %s." (buffer-name)) (whitespace-buffer t)))) @@ -806,7 +811,7 @@ This is meant to be added buffer-locally to `write-file-functions'." (interactive) (let ((werr nil)) (if whitespace-auto-cleanup - (whitespace-cleanup) + (whitespace-cleanup-internal) (setq werr (whitespace-buffer))) (if (and whitespace-abort-on-error werr) (error (concat "Abort write due to whitespaces in " diff --git a/lisp/window.el b/lisp/window.el index 4d02390be16..ef9dd5d896d 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -597,7 +597,7 @@ in some window." (1+ (vertical-motion (buffer-size) window)))))) (defun fit-window-to-buffer (&optional window max-height min-height) - "Make WINDOW the right size to display its contents exactly. + "Make WINDOW the right height to display its contents exactly. If WINDOW is omitted or nil, it defaults to the selected window. If the optional argument MAX-HEIGHT is supplied, it is the maximum height the window is allowed to be, defaulting to the frame height. diff --git a/lisp/x-dnd.el b/lisp/x-dnd.el index a5b6d409b87..693a2d7fa4b 100644 --- a/lisp/x-dnd.el +++ b/lisp/x-dnd.el @@ -256,14 +256,20 @@ STRING is the uri-list as a string. The URIs are separated by \r\n." retval)) (defun x-dnd-handle-file-name (window action string) - "Prepend file:// to file names and call `dnd-handle-one-url'. + "Convert file names to URLs and call `dnd-handle-one-url'. WINDOW is the window where the drop happened. STRING is the file names as a string, separated by nulls." (let ((uri-list (split-string string "[\0\r\n]" t)) + (coding (and default-enable-multibyte-characters + (or file-name-coding-system + default-file-name-coding-system))) retval) (dolist (bf uri-list) ;; If one URL is handeled, treat as if the whole drop succeeded. - (let* ((file-uri (concat "file://" bf)) + (if coding (setq bf (encode-coding-string bf coding))) + (let* ((file-uri (concat "file://" + (mapconcat 'url-hexify-string + (split-string bf "/") "/"))) (did-action (dnd-handle-one-url window action file-uri))) (when did-action (setq retval did-action)))) retval)) diff --git a/lispintro/ChangeLog b/lispintro/ChangeLog index 753aec71d80..d2316d59aa6 100644 --- a/lispintro/ChangeLog +++ b/lispintro/ChangeLog @@ -1,3 +1,12 @@ +2006-05-25 David Kastrup <dak@gnu.org> + + * emacs-lisp-intro.texi (setcar): replace an antelope rather than + a giraffe with a hippopotamus. + +2006-05-19 Thien-Thi Nguyen <ttn@gnu.org> + + * emacs-lisp-intro.texi (Digression concerning error): Fix typo. + 2005-09-16 Romain Francoise <romain@orebokech.com> * emacs-lisp-intro.texi (GNU Free Documentation License): diff --git a/lispintro/emacs-lisp-intro.texi b/lispintro/emacs-lisp-intro.texi index c7fef17061f..5d513256daf 100644 --- a/lispintro/emacs-lisp-intro.texi +++ b/lispintro/emacs-lisp-intro.texi @@ -7061,7 +7061,7 @@ The first element on the list, @code{antelope} is replaced by @code{hippopotamus}. So we can see that @code{setcar} did not add a new element to the list -as @code{cons} would have; it replaced @code{giraffe} with +as @code{cons} would have; it replaced @code{antelope} with @code{hippopotamus}; it @emph{changed} the list. @node setcdr, cons Exercise, setcar, car cdr & cons @@ -18278,7 +18278,7 @@ But a human expects to attempt this sort of thing, if only to find out whether the kill ring is full or empty. This is an act of exploration. -(From the human point of view, the act of exploration and discovery is +From the human point of view, the act of exploration and discovery is not necessarily an error, and therefore should not be labelled as one, even in the bowels of a computer. As it is, the code in Emacs implies that a human who is acting virtuously, by exploring his or her diff --git a/lispref/ChangeLog b/lispref/ChangeLog index caf04b086a7..d8c8480c6d3 100644 --- a/lispref/ChangeLog +++ b/lispref/ChangeLog @@ -1,3 +1,153 @@ +2006-06-04 Thien-Thi Nguyen <ttn@gnu.org> + + * display.texi (Abstract Display): Fix typo. + +2006-06-03 Eli Zaretskii <eliz@gnu.org> + + * minibuf.texi (Minibuffer History) <history-add-new-input>: + Reword variable's description. + +2006-06-01 Richard Stallman <rms@gnu.org> + + * windows.texi (Splitting Windows): Clarify splitting nonselected + window. + +2006-05-31 Juri Linkov <juri@jurta.org> + + * minibuf.texi (Minibuffer History): Add history-add-new-input. + +2006-05-30 Richard Stallman <rms@gnu.org> + + * display.texi (Line Height): Fix errors in description of + default line height and line-height properyty. + + * nonascii.texi (Default Coding Systems): Further clarification. + +2006-05-29 Luc Teirlinck <teirllm@auburn.edu> + + * internals.texi (Pure Storage): Mention that an overflow in pure + space causes a memory leak. + (Garbage Collection): If there was an overflow in pure space, + `garbage-collect' returns nil. + +2006-05-30 Eli Zaretskii <eliz@gnu.org> + + * nonascii.texi (Default Coding Systems): Fix it some more. + +2006-05-29 Eli Zaretskii <eliz@gnu.org> + + * nonascii.texi (Default Coding Systems): Fix last change. + +2006-05-29 Kenichi Handa <handa@m17n.org> + + * nonascii.texi (find-operation-coding-system): Describe the new + argument format (FILENAME . BUFFER). + +2006-05-28 Richard Stallman <rms@gnu.org> + + * tips.texi (Coding Conventions): Better explain reasons not to + advise other packages or use `eval-after-load'. + +2006-05-29 Kim F. Storm <storm@cua.dk> + + * processes.texi (Bindat Functions): Rename `pos' and `raw-data' to + `bindat-idx' and `bindat-raw' for clarity. + +2006-05-27 Thien-Thi Nguyen <ttn@gnu.org> + + * processes.texi (Bindat Spec): Expand on `repeat' handler. + + * display.texi (Display): Add "Abstract Display" to menu. + (Abstract Display, Abstract Display Functions) + (Abstract Display Example): New nodes. + * elisp.texi (Top): Add "Abstract Display" to menu. + +2006-05-27 Chong Yidong <cyd@stupidchicken.com> + + * keymaps.texi (Key Sequences): Link to input events definition. + (Format of Keymaps): Delete material duplicated in Keymap Basics. + + * files.texi (Changing Files): Document updated argument list for + copy-file. + +2006-05-27 Thien-Thi Nguyen <ttn@gnu.org> + + * processes.texi (Bindat Functions): Explain term "total length". + Use it in bindat-length and bindat-pack descriptions. + +2006-05-26 Eli Zaretskii <eliz@gnu.org> + + * tips.texi (Coding Conventions): Advise against using + eval-after-load in packages. Add an index entry. + +2006-05-25 Juri Linkov <juri@jurta.org> + + * minibuf.texi (Text from Minibuffer): Undocument keep-all. + + * modes.texi (%-Constructs): Add %e, %z, %Z. + +2006-05-25 Richard Stallman <rms@gnu.org> + + * elisp.texi (Top): Update subnode menu. + + * keymaps.texi (Keymap Basics): New node, split out of Key Sequences. + (Keymaps): Update menu. + +2006-05-25 Chong Yidong <cyd@stupidchicken.com> + + * keymaps.texi (Key Sequences): Some clarifications. + +2006-05-25 Thien-Thi Nguyen <ttn@gnu.org> + + * processes.texi (Bindat Functions): Say "unibyte string" + explicitly for bindat-unpack and bindat-pack descriptions. + (Bindat Examples): Don't call `string-make-unibyte' in example. + +2006-05-25 Chong Yidong <cyd@stupidchicken.com> + + * keymaps.texi (Key Sequences): Renamed from Keymap Terminology. + Explain string and vector representations of key sequences + + * keymaps.texi (Changing Key Bindings): + * commands.texi (Interactive Codes, Interactive Codes): + * help.texi (Describing Characters): Refer to it. + +2006-05-23 Luc Teirlinck <teirllm@auburn.edu> + + * frames.texi (Pointer Shape): @end table -> @end defvar. + +2006-05-22 Richard Stallman <rms@gnu.org> + + * elisp.texi (Top): Update subnode menus. + + * frames.texi (Pointer Shape): Node renamed from Pointer Shapes. + Contents rewritten; material from old Pointer Shape node moved here. + + * display.texi (Pointer Shape): Node deleted. + (Image Descriptors): Minor cleanup. + +2006-05-21 Richard Stallman <rms@gnu.org> + + * syntax.texi (Parsing Expressions): Update info on which STATE + elements are ignored. + +2006-05-19 Luc Teirlinck <teirllm@auburn.edu> + + * hooks.texi (Standard Hooks): Correct typo. + + * gpl.texi (GPL): ifinfo -> ifnottex. + +2006-05-19 Michael Ernst <mernst@alum.mit.edu> (tiny change) + + * searching.texi (Simple Match Data): Warn about match data being + set anew by every search. + +2006-05-17 Richard Stallman <rms@gnu.org> + + * minibuf.texi (Minibuffer History): Clarify. + + * searching.texi (Regexp Special): Clarify nested regexp warning. + 2006-05-16 Kim F. Storm <storm@cua.dk> * minibuf.texi (Minibuffer History): Update add-to-history. @@ -473,7 +623,7 @@ 2005-12-23 Eli Zaretskii <eliz@gnu.org> - * text.texi (Undo): Remove dupliate descriptions of `apply + * text.texi (Undo): Remove duplicate descriptions of `apply funname' and `apply delta' elements of the undo list. 2005-12-20 Richard M. Stallman <rms@gnu.org> diff --git a/lispref/commands.texi b/lispref/commands.texi index fa5d95f0408..0723c368bba 100644 --- a/lispref/commands.texi +++ b/lispref/commands.texi @@ -362,7 +362,7 @@ An irrelevant argument. This code always supplies @code{nil} as the argument's value. No I/O. @item k -A key sequence (@pxref{Keymap Terminology}). This keeps reading events +A key sequence (@pxref{Key Sequences}). This keeps reading events until a command (or undefined command) is found in the current key maps. The key sequence argument is represented as a string or vector. The cursor does not move into the echo area. Prompt. diff --git a/lispref/display.texi b/lispref/display.texi index b9051f5ca6e..21277d1c587 100644 --- a/lispref/display.texi +++ b/lispref/display.texi @@ -26,10 +26,10 @@ that Emacs presents to the user. font, colors, etc. * Fringes:: Controlling window fringes. * Scroll Bars:: Controlling vertical scroll bars. -* Pointer Shape:: Controlling the mouse pointer shape. * Display Property:: Enabling special display features. * Images:: Displaying images in Emacs buffers. * Buttons:: Adding clickable buttons to Emacs buffers. +* Abstract Display:: Emacs' Widget for Object Collections. * Blinking:: How Emacs shows the matching open parenthesis. * Usual Display:: The usual conventions for displaying nonprinting chars. * Display Tables:: How to specify other conventions. @@ -1582,41 +1582,41 @@ equal to or less than the display width of @var{ellipsis}. If @cindex line height The total height of each display line consists of the height of the -contents of the line, and additional vertical line spacing below the -display row. +contents of the line, plus optional additional vertical line spacing +above or below the display line. - The height of the line contents is normally determined from the -maximum height of any character or image on that display line, -including the final newline if there is one. (A line that is -continued doesn't include a final newline.) In the most common case, -the line height equals the height of the default frame font. + The height of the line contents is the maximum height of any +character or image on that display line, including the final newline +if there is one. (A display line that is continued doesn't include a +final newline.) That is the default line height, if you do nothing to +specify a greater height. (In the most common case, this equals the +height of the default frame font.) - There are several ways to explicitly control or change the line -height, either by specifying an absolute height for the display line, -or by adding additional vertical space below one or all lines. + There are several ways to explicitly specify a larger line height, +either by specifying an absolute height for the display line, or by +specifying vertical space. However, no matter what you specify, the +actual line height can never be less than the default. @kindex line-height @r{(text property)} A newline can have a @code{line-height} text or overlay property that controls the total height of the display line ending in that newline. - If the property value is a list @code{(@var{height} @var{total})}, -then @var{height} is used as the actual property value for the -@code{line-height}, and @var{total} specifies the total displayed -height of the line, so the line spacing added below the line equals -the @var{total} height minus the actual line height. In this case, -the other ways to specify the line spacing are ignored. + If the property value is @code{t}, the newline character has no +effect on the displayed height of the line---the visible contents +alone determine the height. This is useful for tiling small images +(or image slices) without adding blank areas between the images. - If the property value is @code{t}, the displayed height of the -line is exactly what its contents demand; no line-spacing is added. -This case is useful for tiling small images or image slices without -adding blank areas between the images. + If the property value is a list of the form @code{(@var{height} +@var{total})}, that adds extra space @emph{below} the display line. +First Emacs uses @var{height} as a height spec to control extra space +@emph{above} the line; then it adds enough space @emph{below} the line +to bring the total line height up to @var{total}. In this case, the +other ways to specify the line spacing are ignored. - If the property value is not @code{t}, it is a height spec. A height -spec stands for a numeric height value; this height spec specifies the -actual line height, @var{line-height}. There are several ways to -write a height spec; here's how each of them translates into a numeric -height: + Any other kind of property value is a height spec, which translates +into a number---the specified line height. There are several ways to +write a height spec; here's how each of them translates into a number: @table @code @item @var{integer} @@ -1634,11 +1634,10 @@ If the height spec is a cons of the format shown, the numeric height is @var{ratio} times the height of the contents of the line. @end table - Thus, any valid non-@code{t} property value specifies a height in pixels, -@var{line-height}, one way or another. If the line contents' height -is less than @var{line-height}, Emacs adds extra vertical space above -the line to achieve the total height @var{line-height}. Otherwise, -@var{line-height} has no effect. + Thus, any valid height spec determines the height in pixels, one way +or another. If the line contents' height is less than that, Emacs +adds extra vertical space above the line to achieve the specified +total height. If you don't specify the @code{line-height} property, the line's height consists of the contents' height plus the line spacing. @@ -1663,9 +1662,9 @@ height. This overrides line spacings specified for the frame. @kindex line-spacing @r{(text property)} Finally, a newline can have a @code{line-spacing} text or overlay -property that controls the height of the display line ending with that -newline. The property value overrides the default frame line spacing -and the buffer local @code{line-spacing} variable. +property that overrides the default frame line spacing and the buffer +local @code{line-spacing} variable, for the display line ending in +that newline. One way or another, these mechanisms specify a Lisp value for the spacing of each line. The value is a height spec, and it translates @@ -3193,26 +3192,6 @@ buffer's scroll bars, measured in pixels. A value of @code{nil} means to use the value specified by the frame. @end defvar -@node Pointer Shape -@section Pointer Shape - - Normally, the mouse pointer has the @code{text} shape over text and -the @code{arrow} shape over window areas which do not correspond to -any buffer text. You can specify the mouse pointer shape over text or -images via the @code{pointer} text property, and for images with the -@code{:pointer} and @code{:map} image properties. - - The available pointer shapes are: @code{text} (or @code{nil}), -@code{arrow}, @code{hand}, @code{vdrag}, @code{hdrag}, -@code{modeline}, and @code{hourglass}. - -@defvar void-text-area-pointer -@tindex void-text-area-pointer -This variable specifies the mouse pointer shape in void text areas, -i.e. the areas after the end of a line or below the last line in the -buffer. The default is to use the @code{arrow} (non-text) pointer. -@end defvar - @node Display Property @section The @code{display} Property @cindex display specification @@ -3841,11 +3820,11 @@ A polygon is a cons @code{(poly . [@var{x0} @var{y0} @var{x1} @var{y1} ...])} where each pair in the vector describes one corner in the polygon. -When the mouse pointer is above a hot-spot area of an image, the +When the mouse pointer lies on a hot-spot area of an image, the @var{plist} of that hot-spot is consulted; if it contains a @code{help-echo} -property it defines a tool-tip for the hot-spot, and if it contains -a @code{pointer} property, it defines the shape of the mouse cursor when -it is over the hot-spot. +property, that defines a tool-tip for the hot-spot, and if it contains +a @code{pointer} property, that defines the shape of the mouse cursor when +it is on the hot-spot. @xref{Pointer Shape}, for available pointer shapes. When you click the mouse when the mouse pointer is over a hot-spot, an @@ -4642,6 +4621,339 @@ buffer. If @var{count-current} is non-@code{nil}, count any button at @var{pos} in the search, instead of starting at the next button. @end defun +@node Abstract Display +@section Abstract Display +@cindex ewoc +@cindex display, abstract +@cindex display, arbitrary objects +@cindex model/view/controller +@cindex view part, model/view/controller + + The Ewoc package constructs buffer text that represents a structure +of Lisp objects, and updates the text to follow changes in that +structure. This is like the ``view'' component in the +``model/view/controller'' design paradigm. + + An @dfn{ewoc} is a structure that organizes information required to +construct buffer text that represents certain Lisp data. The buffer +text of the ewoc has three parts, in order: first, fixed @dfn{header} +text; next, textual descriptions of a series of data elements (Lisp +objects that you specify); and last, fixed @dfn{footer} text. +Specifically, an ewoc contains information on: + +@itemize @bullet +@item +The buffer which its text is generated in. + +@item +The text's start position in the buffer. + +@item +The header and footer strings. + +@item +A doubly-linked chain of @dfn{nodes}, each of which contains: + +@itemize +@item +A @dfn{data element}, a single Lisp object. + +@item +Links to the preceding and following nodes in the chain. +@end itemize + +@item +A @dfn{pretty-printer} function which is responsible for +inserting the textual representation of a data +element value into the current buffer. +@end itemize + + Typically, you define an ewoc with @code{ewoc-create}, and then pass +the resulting ewoc structure to other functions in the Ewoc package to +build nodes within it, and display it in the buffer. Once it is +displayed in the buffer, other functions determine the correspondance +between buffer positions and nodes, move point from one node's textual +representation to another, and so forth. @xref{Abstract Display +Functions}. + + A node @dfn{encapsulates} a data element much the way a variable +holds a value. Normally, encapsulation occurs as a part of adding a +node to the ewoc. You can retrieve the data element value and place a +new value in its place, like so: + +@lisp +(ewoc-data @var{node}) +@result{} value + +(ewoc-set-data @var{node} @var{new-value}) +@result{} @var{new-value} +@end lisp + +@noindent +You can also use, as the data element value, a Lisp object (list or +vector) that is a container for the ``real'' value, or an index into +some other structure. The example (@pxref{Abstract Display Example}) +uses the latter approach. + + When the data changes, you will want to update the text in the +buffer. You can update all nodes by calling @code{ewoc-refresh}, or +just specific nodes using @code{ewoc-invalidate}, or all nodes +satisfying a predicate using @code{ewoc-map}. Alternatively, you can +delete invalid nodes using @code{ewoc-delete} or @code{ewoc-filter}, +and add new nodes in their place. Deleting a node from an ewoc deletes +its associated textual description from buffer, as well. + +@menu +* Abstract Display Functions:: +* Abstract Display Example:: +@end menu + +@node Abstract Display Functions +@subsection Abstract Display Functions + + In this subsection, @var{ewoc} and @var{node} stand for the +structures described above (@pxref{Abstract Display}), while +@var{data} stands for an arbitrary Lisp object used as a data element. + +@defun ewoc-create pretty-printer &optional header footer nosep +This constructs and returns a new ewoc, with no nodes (and thus no data +elements). @var{pretty-printer} should be a function that takes one +argument, a data element of the sort you plan to use in this ewoc, and +inserts its textual description at point using @code{insert} (and never +@code{insert-before-markers}, because that would interfere with the +Ewoc package's internal mechanisms). + +Normally, a newline is automatically inserted after the header, +the footer and every node's textual description. If @var{nosep} +is non-@code{nil}, no newline is inserted. This may be useful for +displaying an entire ewoc on a single line, for example, or for +making nodes ``invisible'' by arranging for @var{pretty-printer} +to do nothing for those nodes. + +An ewoc maintains its text in the buffer that is current when +you create it, so switch to the intended buffer before calling +@code{ewoc-create}. +@end defun + +@defun ewoc-buffer ewoc +This returns the buffer where @var{ewoc} maintains its text. +@end defun + +@defun ewoc-get-hf ewoc +This returns a cons cell @code{(@var{header} . @var{footer})} +made from @var{ewoc}'s header and footer. +@end defun + +@defun ewoc-set-hf ewoc header footer +This sets the header and footer of @var{ewoc} to the strings +@var{header} and @var{footer}, respectively. +@end defun + +@defun ewoc-enter-first ewoc data +@defunx ewoc-enter-last ewoc data +These add a new node encapsulating @var{data}, putting it, respectively, +at the beginning or end of @var{ewoc}'s chain of nodes. +@end defun + +@defun ewoc-enter-before ewoc node data +@defunx ewoc-enter-after ewoc node data +These add a new node encapsulating @var{data}, adding it to +@var{ewoc} before or after @var{node}, respectively. +@end defun + +@defun ewoc-prev ewoc node +@defunx ewoc-next ewoc node +These return, respectively, the previous node and the next node of @var{node} +in @var{ewoc}. +@end defun + +@defun ewoc-nth ewoc n +This returns the node in @var{ewoc} found at zero-based index @var{n}. +A negative @var{n} means count from the end. @code{ewoc-nth} returns +@code{nil} if @var{n} is out of range. +@end defun + +@defun ewoc-data node +This extracts the data encapsulated by @var{node} and returns it. +@end defun + +@defun ewoc-set-data node data +This sets the data encapsulated by @var{node} to @var{data}. +@end defun + +@defun ewoc-locate ewoc &optional pos guess +This determines the node in @var{ewoc} which contains point (or +@var{pos} if specified), and returns that node. If @var{ewoc} has no +nodes, it returns @code{nil}. If @var{pos} is before the first node, +it returns the first node; if @var{pos} is after the last node, it returns +the last node. The optional third arg @var{guess} +should be a node that is likely to be near @var{pos}; this doesn't +alter the result, but makes the function run faster. +@end defun + +@defun ewoc-location node +This returns the start position of @var{node}. +@end defun + +@defun ewoc-goto-prev ewoc arg +@defunx ewoc-goto-next ewoc arg +These move point to the previous or next, respectively, @var{arg}th node +in @var{ewoc}. @code{ewoc-goto-prev} does not move if it is already at +the first node or if @var{ewoc} is empty, whereas @code{ewoc-goto-next} +moves past the last node, returning @code{nil}. Excepting this special +case, these functions return the node moved to. +@end defun + +@defun ewoc-goto-node ewoc node +This moves point to the start of @var{node} in @var{ewoc}. +@end defun + +@defun ewoc-refresh ewoc +This function regenerates the text of @var{ewoc}. It works by +deleting the text between the header and the footer, i.e., all the +data elements' representations, and then calling the pretty-printer +function for each node, one by one, in order. +@end defun + +@defun ewoc-invalidate ewoc &rest nodes +This is similar to @code{ewoc-refresh}, except that only @var{nodes} in +@var{ewoc} are updated instead of the entire set. +@end defun + +@defun ewoc-delete ewoc &rest nodes +This deletes each node in @var{nodes} from @var{ewoc}. +@end defun + +@defun ewoc-filter ewoc predicate &rest args +This calls @var{predicate} for each data element in @var{ewoc} and +deletes those nodes for which @var{predicate} returns @code{nil}. +Any @var{args} are passed to @var{predicate}. +@end defun + +@defun ewoc-collect ewoc predicate &rest args +This calls @var{predicate} for each data element in @var{ewoc} +and returns a list of those elements for which @var{predicate} +returns non-@code{nil}. The elements in the list are ordered +as in the buffer. Any @var{args} are passed to @var{predicate}. +@end defun + +@defun ewoc-map map-function ewoc &rest args +This calls @var{map-function} for each data element in @var{ewoc} and +updates those nodes for which @var{map-function} returns non-@code{nil}. +Any @var{args} are passed to @var{map-function}. +@end defun + +@node Abstract Display Example +@subsection Abstract Display Example + + Here is a simple example using functions of the ewoc package to +implement a ``color components display'', an area in a buffer that +represents a vector of three integers (itself representing a 24-bit RGB +value) in various ways. + +@example +(setq colorcomp-ewoc nil + colorcomp-data nil + colorcomp-mode-map nil + colorcomp-labels ["Red" "Green" "Blue"]) + +(defun colorcomp-pp (data) + (if data + (let ((comp (aref colorcomp-data data))) + (insert (aref colorcomp-labels data) "\t: #x" + (format "%02X" comp) " " + (make-string (ash comp -2) ?#) "\n")) + (let ((cstr (format "#%02X%02X%02X" + (aref colorcomp-data 0) + (aref colorcomp-data 1) + (aref colorcomp-data 2))) + (samp " (sample text) ")) + (insert "Color\t: " + (propertize samp 'face `(foreground-color . ,cstr)) + (propertize samp 'face `(background-color . ,cstr)) + "\n")))) + +(defun colorcomp (color) + "Allow fiddling with COLOR in a new buffer. +The buffer is in Color Components mode." + (interactive "sColor (name or #RGB or #RRGGBB): ") + (when (string= "" color) + (setq color "green")) + (unless (color-values color) + (error "No such color: %S" color)) + (switch-to-buffer + (generate-new-buffer (format "originally: %s" color))) + (kill-all-local-variables) + (setq major-mode 'colorcomp-mode + mode-name "Color Components") + (use-local-map colorcomp-mode-map) + (erase-buffer) + (buffer-disable-undo) + (let ((data (apply 'vector (mapcar (lambda (n) (ash n -8)) + (color-values color)))) + (ewoc (ewoc-create 'colorcomp-pp + "\nColor Components\n\n" + (substitute-command-keys + "\n\\@{colorcomp-mode-map@}")))) + (set (make-local-variable 'colorcomp-data) data) + (set (make-local-variable 'colorcomp-ewoc) ewoc) + (ewoc-enter-last ewoc 0) + (ewoc-enter-last ewoc 1) + (ewoc-enter-last ewoc 2) + (ewoc-enter-last ewoc nil))) +@end example + +@cindex controller part, model/view/controller + This example can be extended to be a ``color selection widget'' (in +other words, the controller part of the ``model/view/controller'' +design paradigm) by defining commands to modify @code{colorcomp-data} +and to ``finish'' the selection process, and a keymap to tie it all +together conveniently. + +@example +(defun colorcomp-mod (index limit delta) + (let ((cur (aref colorcomp-data index))) + (unless (= limit cur) + (aset colorcomp-data index (+ cur delta))) + (ewoc-invalidate + colorcomp-ewoc + (ewoc-nth colorcomp-ewoc index) + (ewoc-nth colorcomp-ewoc -1)))) + +(defun colorcomp-R-more () (interactive) (colorcomp-mod 0 255 1)) +(defun colorcomp-G-more () (interactive) (colorcomp-mod 1 255 1)) +(defun colorcomp-B-more () (interactive) (colorcomp-mod 2 255 1)) +(defun colorcomp-R-less () (interactive) (colorcomp-mod 0 0 -1)) +(defun colorcomp-G-less () (interactive) (colorcomp-mod 1 0 -1)) +(defun colorcomp-B-less () (interactive) (colorcomp-mod 2 0 -1)) + +(defun colorcomp-copy-as-kill-and-exit () + "Copy the color components into the kill ring and kill the buffer. +The string is formatted #RRGGBB (hash followed by six hex digits)." + (interactive) + (kill-new (format "#%02X%02X%02X" + (aref colorcomp-data 0) + (aref colorcomp-data 1) + (aref colorcomp-data 2))) + (kill-buffer nil)) + +(setq colorcomp-mode-map + (let ((m (make-sparse-keymap))) + (suppress-keymap m) + (define-key m "i" 'colorcomp-R-less) + (define-key m "o" 'colorcomp-R-more) + (define-key m "k" 'colorcomp-G-less) + (define-key m "l" 'colorcomp-G-more) + (define-key m "," 'colorcomp-B-less) + (define-key m "." 'colorcomp-B-more) + (define-key m " " 'colorcomp-copy-as-kill-and-exit) + m)) +@end example + +Note that we never modify the data in each node, which is fixed when the +ewoc is created to be either @code{nil} or an index into the vector +@code{colorcomp-data}, the actual color components. + @node Blinking @section Blinking Parentheses @cindex parenthesis matching diff --git a/lispref/elisp.texi b/lispref/elisp.texi index bd2cbee4796..3def70e9868 100644 --- a/lispref/elisp.texi +++ b/lispref/elisp.texi @@ -590,7 +590,8 @@ Defining Commands Keymaps -* Keymap Terminology:: Definitions of terms pertaining to keymaps. +* Key Sequences:: Key sequences as Lisp objects. +* Keymap Basics:: Basic concepts of keymaps. * Format of Keymaps:: What a keymap looks like as a Lisp object. * Creating Keymaps:: Functions to create and copy keymaps. * Inheritance and Keymaps:: How one keymap can inherit the bindings @@ -784,7 +785,7 @@ Frames * Mouse Position:: Asking where the mouse is, or moving it. * Pop-Up Menus:: Displaying a menu for the user to select from. * Dialog Boxes:: Displaying a box to ask yes or no. -* Pointer Shapes:: Specifying the shape of the mouse pointer. +* Pointer Shape:: Specifying the shape of the mouse pointer. * Window System Selections::Transferring text to and from other windows. * Color Names:: Getting the definitions of color names. * Text Terminal Colors:: Defining colors for text-only terminals. @@ -1003,10 +1004,10 @@ Emacs Display for text characters: font, colors, etc. * Fringes:: Controlling window fringes. * Scroll Bars:: Controlling vertical scroll bars. -* Pointer Shape:: Controlling the mouse pointer shape. * Display Property:: Enabling special display features. * Images:: Displaying images in Emacs buffers. * Buttons:: Adding clickable buttons to Emacs buffers. +* Abstract Display:: Emacs' Widget for Object Collections. * Blinking:: How Emacs shows the matching open parenthesis. * Usual Display:: The usual conventions for displaying nonprinting chars. * Display Tables:: How to specify other conventions. diff --git a/lispref/files.texi b/lispref/files.texi index 0d944771a2e..f7af725f191 100644 --- a/lispref/files.texi +++ b/lispref/files.texi @@ -1431,7 +1431,7 @@ with @code{add-name-to-file} and then deleting @var{filename} has the same effect as renaming, aside from momentary intermediate states. @end deffn -@deffn Command copy-file oldname newname &optional ok-if-exists time mustbenew +@deffn Command copy-file oldname newname &optional ok-if-exists time preserve-uid-gid This command copies the file @var{oldname} to @var{newname}. An error is signaled if @var{oldname} does not exist. If @var{newname} names a directory, it copies @var{oldname} into that directory, @@ -1440,16 +1440,18 @@ preserving its final name component. If @var{time} is non-@code{nil}, then this function gives the new file the same last-modified time that the old one has. (This works on only some operating systems.) If setting the time gets an error, -@code{copy-file} signals a @code{file-date-error} error. +@code{copy-file} signals a @code{file-date-error} error. In an +interactive call, a prefix argument specifies a non-@code{nil} value +for @var{time}. This function copies the file modes, too. -In an interactive call, a prefix argument specifies a non-@code{nil} -value for @var{time}. - -The argument @var{mustbenew} controls whether an existing file can be -overwritten. It works like the similarly-named argument of -@code{write-region} (@pxref{Writing to Files, mustbenew}). +If argument @var{preserve-uid-gid} is @code{nil}, we let the operating +system decide the user and group ownership of the new file (this is +usually set to the user running Emacs). If @var{preserve-uid-gid} is +non-@code{nil}, we attempt to copy the user and group ownership of the +file. This works only on some operating systems, and only if you have +the correct permissions to do so. @end deffn @deffn Command make-symbolic-link filename newname &optional ok-if-exists diff --git a/lispref/frames.texi b/lispref/frames.texi index 2c2b8e10641..a433203a93e 100644 --- a/lispref/frames.texi +++ b/lispref/frames.texi @@ -62,7 +62,7 @@ The frame is displayed on an MS-DOS terminal. * Mouse Position:: Asking where the mouse is, or moving it. * Pop-Up Menus:: Displaying a menu for the user to select from. * Dialog Boxes:: Displaying a box to ask yes or no. -* Pointer Shapes:: Specifying the shape of the mouse pointer. +* Pointer Shape:: Specifying the shape of the mouse pointer. * Window System Selections:: Transferring text to and from other X clients. * Drag and Drop:: Internals of Drag-and-Drop implementation. * Color Names:: Getting the definitions of color names. @@ -1564,30 +1564,49 @@ for instance using the window manager, then this produces a quit and @code{x-popup-dialog} does not return. @end defun -@node Pointer Shapes -@section Pointer Shapes +@node Pointer Shape +@section Pointer Shape @cindex pointer shape @cindex mouse pointer shape - These variables specify which shape to use for the mouse pointer in -various situations, when using the X Window System: + You can specify the mouse pointer style for particular text or +images using the @code{pointer} text property, and for images with the +@code{:pointer} and @code{:map} image properties. The values you can +use in these properties are @code{text} (or @code{nil}), @code{arrow}, +@code{hand}, @code{vdrag}, @code{hdrag}, @code{modeline}, and +@code{hourglass}. @code{text} stands for the usual mouse pointer +style used over text. + + Over void parts of the window (parts that do not correspond to any +of the buffer contents), the mouse pointer usually uses the +@code{arrow} style, but you can specify a different style (one of +those above) by setting @code{void-text-area-pointer}. + +@defvar void-text-area-pointer +@tindex void-text-area-pointer +This variable specifies the mouse pointer style for void text areas. +These include the areas after the end of a line or below the last line +in the buffer. The default is to use the @code{arrow} (non-text) +pointer style. +@end defvar -@table @code -@item x-pointer-shape -@vindex x-pointer-shape -This variable specifies the pointer shape to use ordinarily in the Emacs -frame. + You can specify what the @code{text} pointer style really looks like +by setting the variable @code{x-pointer-shape}. -@item x-sensitive-text-pointer-shape -@vindex x-sensitive-text-pointer-shape +@defvar x-pointer-shape +This variable specifies the pointer shape to use ordinarily in the +Emacs frame, for the @code{text} pointer style. +@end defvar + +@defvar x-sensitive-text-pointer-shape This variable specifies the pointer shape to use when the mouse is over mouse-sensitive text. -@end table +@end defvar These variables affect newly created frames. They do not normally -affect existing frames; however, if you set the mouse color of a frame, -that also updates its pointer shapes based on the current values of -these variables. @xref{Color Parameters}. +affect existing frames; however, if you set the mouse color of a +frame, that also installs the current value of those two variables. +@xref{Color Parameters}. The values you can use, to specify either of these pointer shapes, are defined in the file @file{lisp/term/x-win.el}. Use @kbd{M-x apropos diff --git a/lispref/gpl.texi b/lispref/gpl.texi index efd43cdefcf..d3ffb26719b 100644 --- a/lispref/gpl.texi +++ b/lispref/gpl.texi @@ -67,9 +67,9 @@ modification follow. @iftex @unnumberedsec Terms and Conditions for Copying, Distribution and Modification @end iftex -@ifinfo +@ifnottex @center TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION -@end ifinfo +@end ifnottex @enumerate 0 @item @@ -292,9 +292,9 @@ of promoting the sharing and reuse of software generally. @iftex @heading NO WARRANTY @end iftex -@ifinfo +@ifnottex @center NO WARRANTY -@end ifinfo +@end ifnottex @item BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY @@ -322,9 +322,9 @@ POSSIBILITY OF SUCH DAMAGES. @iftex @heading END OF TERMS AND CONDITIONS @end iftex -@ifinfo +@ifnottex @center END OF TERMS AND CONDITIONS -@end ifinfo +@end ifnottex @page @unnumberedsec How to Apply These Terms to Your New Programs diff --git a/lispref/help.texi b/lispref/help.texi index 0fe996dfd7c..6173c746d1e 100644 --- a/lispref/help.texi +++ b/lispref/help.texi @@ -497,7 +497,7 @@ can also be used as a rough inverse for @code{key-description}. You call it with a string containing key descriptions, separated by spaces; it returns a string or vector containing the corresponding events. (This may or may not be a single valid key sequence, depending on what -events you use; @pxref{Keymap Terminology}.) If @var{need-vector} is +events you use; @pxref{Key Sequences}.) If @var{need-vector} is non-@code{nil}, the return value is always a vector. @end defun diff --git a/lispref/hooks.texi b/lispref/hooks.texi index 410e975ad57..842211d6be5 100644 --- a/lispref/hooks.texi +++ b/lispref/hooks.texi @@ -305,7 +305,7 @@ Manual}. @item today-invisible-calendar-hook @iftex -@infref{Calendar Customizing,, emacs-xtra}. +@inforef{Calendar Customizing,, emacs-xtra}. @end iftex @ifnottex @xref{Calendar Customizing,,, emacs}. diff --git a/lispref/internals.texi b/lispref/internals.texi index bc35e215574..fa96687d1d8 100644 --- a/lispref/internals.texi +++ b/lispref/internals.texi @@ -160,7 +160,8 @@ the preloaded libraries, @file{temacs} allocates dynamic memory for the part that didn't fit. If that happens, you should increase the compilation parameter @code{PURESIZE} in the file @file{src/puresize.h} and rebuild Emacs, even though the resulting -image will work. Such an overflow normally won't happen unless you +image will work: garbage collection is disabled in this situation, +causing a memory leak. Such an overflow normally won't happen unless you try to preload additional libraries or add features to the standard ones. Emacs will display a warning about the overflow when it starts. @@ -348,6 +349,10 @@ operating system, but which are currently not in use. (A string object consists of a header and the storage for the string text itself; the latter is only allocated when the string is created.) @end table + +If there was overflow in pure space (see the previous section), +@code{garbage-collect} returns @code{nil}, because a real garbage +collection can not be done in this situation. @end deffn @defopt garbage-collection-messages diff --git a/lispref/keymaps.texi b/lispref/keymaps.texi index 39a57eddf13..f6779b247d0 100644 --- a/lispref/keymaps.texi +++ b/lispref/keymaps.texi @@ -16,7 +16,8 @@ to look up the next input event; this continues until a command is found. The whole process is called @dfn{key lookup}. @menu -* Keymap Terminology:: Definitions of terms pertaining to keymaps. +* Key Sequences:: Key sequences as Lisp objects. +* Keymap Basics:: Basic concepts of keymaps. * Format of Keymaps:: What a keymap looks like as a Lisp object. * Creating Keymaps:: Functions to create and copy keymaps. * Inheritance and Keymaps:: How one keymap can inherit the bindings @@ -37,32 +38,80 @@ found. The whole process is called @dfn{key lookup}. * Menu Keymaps:: Defining a menu as a keymap. @end menu -@node Keymap Terminology -@section Keymap Terminology +@node Key Sequences +@section Key Sequences @cindex key @cindex keystroke +@cindex key sequence + + A @dfn{key sequence}, or @dfn{key} for short, is a sequence of one +or more input events that form a unit. Input events include +characters, function keys, and mouse actions (@pxref{Input Events}). +The Emacs Lisp representation for a key sequence is a string or +vector. Unless otherwise stated, any Emacs Lisp function that accepts +a key sequence as an argument can handle both representations. + + In the string representation, alphanumeric characters ordinarily +stand for themselves; for example, @code{"a"} represents @kbd{a} and +and @code{"2"} represents @kbd{2}. Control character events are +prefixed by the substring @code{"\C-"}, and meta characters by +@code{"\M-"}; for example, @code{"\C-x"} represents the key @kbd{C-x}. +In addition, the @key{TAB}, @key{RET}, @key{ESC}, and @key{DEL} events +are represented by @code{"\t"}, @code{"\r"}, @code{"\e"}, and +@code{"\d"} respectively. The string representation of a complete key +sequence is the concatenation of the string representations of the +constituent events; thus, @code{"\C-xl"} represents the key sequence +@kbd{C-x l}. + + Key sequences containing function keys, mouse button events, or +non-ASCII characters such as @kbd{C-=} or @kbd{H-a} cannot be +represented as strings; they have to be represented as vectors. + + In the vector representation, each element of the vector represents +an input event, in its Lisp form. @xref{Input Events}. For example, +the vector @code{[?\C-x ?l]} represents the key sequence @kbd{C-x l}. + + For examples of key sequences written in string and vector +representations, @ref{Init Rebinding,,, emacs, The GNU Emacs Manual}. + +@defmac kbd keyseq-text +This macro converts the text @var{keyseq-text} (a string constant) +into a key sequence (a string or vector constant). The contents of +@var{keyseq-text} should describe the key sequence using almost the same +syntax used in this manual. More precisely, it uses the same syntax +that Edit Macro mode uses for editing keyboard macros (@pxref{Edit +Keyboard Macro,,, emacs, The GNU Emacs Manual}); you must surround +function key names with @samp{<@dots{}>}. + +@example +(kbd "C-x") @result{} "\C-x" +(kbd "C-x C-f") @result{} "\C-x\C-f" +(kbd "C-x 4 C-f") @result{} "\C-x4\C-f" +(kbd "X") @result{} "X" +(kbd "RET") @result{} "\^M" +(kbd "C-c SPC") @result{} "\C-c@ " +(kbd "<f1> SPC") @result{} [f1 32] +(kbd "C-M-<down>") @result{} [C-M-down] +@end example +@end defmac + +@node Keymap Basics +@section Keymap Basics @cindex key binding @cindex binding of a key @cindex complete key @cindex undefined key - A @dfn{keymap} is a table mapping event types to definitions (which -can be any Lisp objects, though only certain types are meaningful for -execution by the command loop). Given an event (or an event type) and a -keymap, Emacs can get the event's definition. Events include -characters, function keys, and mouse actions (@pxref{Input Events}). - - A sequence of input events that form a unit is called a -@dfn{key sequence}, or @dfn{key} for short. A sequence of one event -is always a key sequence, and so are some multi-event sequences. + A keymap is a Lisp data structure that specifies @dfn{key bindings} +for various key sequences. - A keymap determines a binding or definition for any key sequence. If -the key sequence is a single event, its binding is the definition of the -event in the keymap. The binding of a key sequence of more than one -event is found by an iterative process: the binding of the first event -is found, and must be a keymap; then the second event's binding is found -in that keymap, and so on until all the events in the key sequence are -used up. + A single keymap directly specifies definitions for individual +events. When a key sequence consists of a single event, its binding +in a keymap is the keymap's definition for that event. The binding of +a longer key sequence is found by an iterative process: first find the +definition of the first event (which must itself be a keymap); then +find the second event's definition in that keymap, and so on until all +the events in the key sequence have been processed. If the binding of a key sequence is a keymap, we call the key sequence a @dfn{prefix key}. Otherwise, we call it a @dfn{complete key} (because @@ -98,30 +147,6 @@ precedence over) the corresponding global bindings. The minor mode keymaps shadow both local and global keymaps. @xref{Active Keymaps}, for details. - The Emacs Lisp representation for a key sequence is a string or vector. -You can enter key sequence constants using the ordinary string or vector -representation; it is also convenient to use @code{kbd}: - -@defmac kbd keyseq-text -This macro converts the text @var{keyseq-text} (a string constant) -into a key sequence (a string or vector constant). The contents -of @var{keyseq-text} should describe the key sequence using the syntax -used in this manual. More precisely, it uses the same syntax that -Edit Macro mode uses for editing keyboard macros (@pxref{Edit Keyboard -Macro,,, emacs, The GNU Emacs Manual}). - -@example -(kbd "C-x") @result{} "\C-x" -(kbd "C-x C-f") @result{} "\C-x\C-f" -(kbd "C-x 4 C-f") @result{} "\C-x4\C-f" -(kbd "X") @result{} "X" -(kbd "RET") @result{} "\^M" -(kbd "C-c SPC") @result{} "\C-c@ " -(kbd "<f1> SPC") @result{} [f1 32] -(kbd "C-M-<down>") @result{} [C-M-down] -@end example -@end defmac - @node Format of Keymaps @section Format of Keymaps @cindex format of keymaps @@ -129,7 +154,7 @@ Macro,,, emacs, The GNU Emacs Manual}). @cindex full keymap @cindex sparse keymap - A keymap is a list whose @sc{car} is the symbol @code{keymap}. The + Each keymap is a list whose @sc{car} is the symbol @code{keymap}. The remaining elements of the list define the key bindings of the keymap. A symbol whose function definition is a keymap is also a keymap. Use the function @code{keymapp} (see below) to test whether an object is a @@ -1197,8 +1222,8 @@ numeric codes for the modifier bits don't appear in compiled files. For the functions below, an error is signaled if @var{keymap} is not a keymap or if @var{key} is not a string or vector representing a key sequence. You can use event types (symbols) as shorthand for events -that are lists. The @code{kbd} macro (@pxref{Keymap Terminology}) is -a convenient way to specify the key sequence. +that are lists. The @code{kbd} macro (@pxref{Key Sequences}) is a +convenient way to specify the key sequence. @defun define-key keymap key binding This function sets the binding for @var{key} in @var{keymap}. (If diff --git a/lispref/minibuf.texi b/lispref/minibuf.texi index 73cc0817d9b..20a049f037b 100644 --- a/lispref/minibuf.texi +++ b/lispref/minibuf.texi @@ -110,7 +110,7 @@ middle of a Lisp function. Instead, do all minibuffer input as part of reading the arguments for a command, in the @code{interactive} specification. @xref{Defining Commands}. -@defun read-from-minibuffer prompt-string &optional initial-contents keymap read hist default inherit-input-method keep-all +@defun read-from-minibuffer prompt-string &optional initial-contents keymap read hist default inherit-input-method This function is the most general way to get input through the minibuffer. By default, it accepts arbitrary text and returns it as a string; however, if @var{read} is non-@code{nil}, then it uses @@ -162,9 +162,6 @@ the setting of @code{enable-multibyte-characters} (@pxref{Text Representations}) from whichever buffer was current before entering the minibuffer. -If @var{keep-all} is non-@code{nil}, even empty and duplicate inputs -are added to the history list. - Use of @var{initial-contents} is mostly deprecated; we recommend using a non-@code{nil} value only in conjunction with specifying a cons cell for @var{hist}. @xref{Initial Input}. @@ -450,21 +447,27 @@ history list symbol. The variable @code{history-delete-duplicates} specifies whether to delete duplicates in history. @defun add-to-history history-var newelt &optional maxelt keep-all -This function adds a new element @var{newelt}, if non-empty, to the -history list stored in the variable @var{history-var}, and returns the -updated history list. By default, the list length is limited by the -value specified by @code{history-length} (described below), but the -optional argument @var{maxelt} overrides that. The possible values of -@var{maxelt} have the same meaning as the values of -@code{history-length}. - -Duplicate members are removed from the history list, if -@code{history-delete-duplicates} is non-@code{nil}. - -If @var{keep-all} is non-@code{nil}, even an empty or duplicate -@var{newelt} element is added to the history list. +This function adds a new element @var{newelt}, if it isn't the empty +string, to the history list stored in the variable @var{history-var}, +and returns the updated history list. It limits the list length to +the value of @var{maxelt} (if non-@code{nil}) or @code{history-length} +(described below). The possible values of @var{maxelt} have the same +meaning as the values of @code{history-length}. + +Normally, @code{add-to-history} removes duplicate members from the +history list if @code{history-delete-duplicates} is non-@code{nil}. +However, if @var{keep-all} is non-@code{nil}, that says not to remove +duplicates, and to add @var{newelt} to the list even if it is empty. @end defun +@defvar history-add-new-input +If the value of this variable is @code{nil}, standard functions that +read from the minibuffer don't add new elements to the history list. +This lets Lisp programs explicitly manage input history by using +@code{add-to-history}. By default, @code{history-add-new-input} is +set to a non-@code{nil} value. +@end defvar + @defvar history-length The value of this variable specifies the maximum length for all history lists that don't specify their own maximum lengths. If the diff --git a/lispref/modes.texi b/lispref/modes.texi index 9e55ca847fc..7c4896d9532 100644 --- a/lispref/modes.texi +++ b/lispref/modes.texi @@ -1927,6 +1927,10 @@ The current buffer name, obtained with the @code{buffer-name} function. @item %c The current column number of point. +@item %e +When Emacs is nearly out of memory for Lisp objects, a brief message +saying so. Otherwise, this is empty. + @item %f The visited file name, obtained with the @code{buffer-file-name} function. @xref{Buffer File Name}. @@ -1972,6 +1976,12 @@ Whether the visited file is a text file or a binary file. This is a meaningful distinction only on certain operating systems (@pxref{MS-DOS File Types}). +@item %z +The mnemonics of buffer, terminal, and keyboard coding systems. + +@item %Z +Like @samp{%z}, but including the end-of-line format. + @item %* @samp{%} if the buffer is read only (see @code{buffer-read-only}); @* @samp{*} if the buffer is modified (see @code{buffer-modified-p}); @* diff --git a/lispref/nonascii.texi b/lispref/nonascii.texi index 0f4a70404af..2224fdbd436 100644 --- a/lispref/nonascii.texi +++ b/lispref/nonascii.texi @@ -1103,11 +1103,11 @@ The argument @var{operation} should be a symbol, any one of @code{insert-file-contents}, @code{write-region}, @code{start-process}, @code{call-process}, @code{call-process-region}, or @code{open-network-stream}. These are the names of the Emacs I/O -primitives that can do coding system conversion. +primitives that can do character code and eol conversion. The remaining arguments should be the same arguments that might be given -to that I/O primitive. Depending on the primitive, one of those -arguments is selected as the @dfn{target}. For example, if +to the corresponding I/O primitive. Depending on the primitive, one +of those arguments is selected as the @dfn{target}. For example, if @var{operation} does file I/O, whichever argument specifies the file name is the target. For subprocess primitives, the process name is the target. For @code{open-network-stream}, the target is the service name @@ -1115,7 +1115,19 @@ or port number. Depending on @var{operation}, this function looks up the target in @code{file-coding-system-alist}, @code{process-coding-system-alist}, -or @code{network-coding-system-alist}. +or @code{network-coding-system-alist}. If the target is found in the +alist, @code{find-operation-coding-system} returns its association in +the alist; otherwise it returns @code{nil}. + +If @var{operation} is @code{insert-file-contents}, the argument +corresponding to the target may be a cons cell of the form +@code{(@var{filename} . @var{buffer})}). In that case, @var{filename} +is a file name to look up in @code{file-coding-system-alist}, and +@var{buffer} is a buffer that contains the file's contents (not yet +decoded). If @code{file-coding-system-alist} specifies a function to +call for this file, and that function needs to examine the file's +contents (as it usually does), it should examine the contents of +@var{buffer} instead of reading the file. @end defun @node Specifying Coding Systems diff --git a/lispref/processes.texi b/lispref/processes.texi index 9eb733236a9..0f0b617e36c 100644 --- a/lispref/processes.texi +++ b/lispref/processes.texi @@ -2185,11 +2185,11 @@ field name is specified, the value is bound to that field name. @var{form} can access and update these dynamically bound variables: @table @code -@item raw-data +@item bindat-raw The data as a byte array. -@item pos -Current position of the unpacking or packing operation. +@item bindat-idx +Current index into bindat-raw of the unpacking or packing operation. @item struct Alist. @@ -2231,23 +2231,26 @@ of @var{form}. A non-@code{nil} result indicates a match. @end itemize @item repeat @var{count} @var{field-spec}@dots{} +Process the set of @var{field-spec}s recursively, in order, and loop +starting from the first one, for @var{count} times overall (looping +@code{@var{count} @minus{} 1} times). @var{count} may be an integer, or a list of one element naming a previous field. For correct operation, each @var{field-spec} must include a name. -@c ??? What does it MEAN? @end table @node Bindat Functions @subsection Functions to Unpack and Pack Bytes In the following documentation, @var{spec} refers to a data layout -specification, @code{raw-data} to a byte array, and @var{struct} to an +specification, @code{bindat-raw} to a byte array, and @var{struct} to an alist representing unpacked field data. -@defun bindat-unpack spec raw-data &optional pos -This function unpacks data from the byte array @code{raw-data} +@defun bindat-unpack spec bindat-raw &optional bindat-idx +This function unpacks data from the unibyte string or byte +array @code{bindat-raw} according to @var{spec}. Normally this starts unpacking at the -beginning of the byte array, but if @var{pos} is non-@code{nil}, it +beginning of the byte array, but if @var{bindat-idx} is non-@code{nil}, it specifies a zero-based starting position to use instead. The value is an alist or nested alist in which each element describes @@ -2267,23 +2270,29 @@ field @code{c} in the third element of subfield @code{b} of field @code{a}. (This corresponds to @code{struct.a.b[2].c} in C.) @end defun + Although packing and unpacking operations change the organization of +data (in memory), they preserve the data's @dfn{total length}, which is +the sum of all the fields' lengths, in bytes. This value is not +generally inherent in either the specification or alist alone; instead, +both pieces of information contribute to its calculation. Likewise, the +length of a string or array being unpacked may be longer than the data's +total length as described by the specification. + @defun bindat-length spec struct -@c ??? I don't understand this at all -- rms -This function returns the length in bytes of @var{struct}, according -to @var{spec}. +This function returns the total length of the data in @var{struct}, +according to @var{spec}. @end defun -@defun bindat-pack spec struct &optional raw-data pos +@defun bindat-pack spec struct &optional bindat-raw bindat-idx This function returns a byte array packed according to @var{spec} from the data in the alist @var{struct}. Normally it creates and fills a -new byte array starting at the beginning. However, if @var{raw-data} -is non-@code{nil}, it specifies a pre-allocated string or vector to -pack into. If @var{pos} is non-@code{nil}, it specifies the starting -offset for packing into @code{raw-data}. +new byte array starting at the beginning. However, if @var{bindat-raw} +is non-@code{nil}, it specifies a pre-allocated unibyte string or vector to +pack into. If @var{bindat-idx} is non-@code{nil}, it specifies the starting +offset for packing into @code{bindat-raw}. -@c ??? Isn't this a bug? Shouldn't it always be unibyte? -Note: The result is a multibyte string; use @code{string-make-unibyte} -on it to make it unibyte if necessary. +When pre-allocating, you should make sure @code{(length @var{bindat-raw})} +meets or exceeds the total length to avoid an out-of-range error. @end defun @defun bindat-ip-to-string ip @@ -2367,18 +2376,17 @@ COOKIES, indicates the border between entries." (with-temp-buffer (set-buffer-multibyte nil) (insert - (string-make-unibyte - (bindat-pack - fcookie-index-spec - `((:version . 2) - (:count . ,count) - (:longest . ,max) - (:shortest . ,min) - (:flags . 0) - (:delim . ,delim) - (:offset . ,(mapcar (lambda (o) - (list (cons :foo o))) - (nreverse offsets))))))) + (bindat-pack + fcookie-index-spec + `((:version . 2) + (:count . ,count) + (:longest . ,max) + (:shortest . ,min) + (:flags . 0) + (:delim . ,delim) + (:offset . ,(mapcar (lambda (o) + (list (cons :foo o))) + (nreverse offsets)))))) (let ((coding-system-for-write 'raw-text-unix)) (write-file (or index (concat cookies ".dat"))))))) @end lisp diff --git a/lispref/searching.texi b/lispref/searching.texi index 644376f5cdd..e93cee42a3b 100644 --- a/lispref/searching.texi +++ b/lispref/searching.texi @@ -306,9 +306,10 @@ matching @samp{ca*ar} against the string @samp{caaar}, the @samp{a*} first tries to match all three @samp{a}s; but the rest of the pattern is @samp{ar} and there is only @samp{r} left to match, so this try fails. The next alternative is for @samp{a*} to match only two @samp{a}s. With -this choice, the rest of the regexp matches successfully.@refill +this choice, the rest of the regexp matches successfully. -Nested repetition operators take a long time, or even forever, if they +@strong{Warning:} Nested repetition operators take a long time, +or even forever, if they lead to ambiguous matching. For example, trying to match the regular expression @samp{\(x+y*\)*a} against the string @samp{xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxz} could take hours before it @@ -316,7 +317,8 @@ ultimately fails. Emacs must try each way of grouping the 35 @samp{x}s before concluding that none of them can work. Even worse, @samp{\(x*\)*} can match the null string in infinitely many ways, so it causes an infinite loop. To avoid these problems, check nested -repetitions carefully. +repetitions carefully, to make sure that they do not cause combinatorial +explosions in backtracking. @item @samp{+} @cindex @samp{+} in regexp @@ -1262,6 +1264,12 @@ subexpression is numbered 1, the second 2, and so on. Only regular expressions can have subexpressions---after a simple string search, the only information available is about the entire match. + Every successful search sets the match data. Therefore, you should +query the match data immediately after searching, before calling any +other function that might perform another search. Alternatively, you +may save and restore the match data (@pxref{Saving Match Data}) around +the call to functions that could perform another search. + A search which fails may or may not alter the match data. In the past, a failing search did not do this, but we may change it in the future. So don't try to rely on the value of the match data after diff --git a/lispref/syntax.texi b/lispref/syntax.texi index 1575ebeb850..9a763b7357a 100644 --- a/lispref/syntax.texi +++ b/lispref/syntax.texi @@ -662,10 +662,9 @@ string, or the end of a comment or a string, whichever comes first. @cindex parse state The fifth argument @var{state} is a ten-element list of the same form -as the value of this function, described below. (It is OK to omit the -last two elements of this list.) The return value of one call may be -used to initialize the state of the parse on another call to -@code{parse-partial-sexp}. +as the value of this function, described below. The return value of +one call may be used to initialize the state of the parse on another +call to @code{parse-partial-sexp}. The result is a list of ten elements describing the final state of the parse: @@ -721,11 +720,13 @@ this element is @code{nil}. Internal data for continuing the parsing. The meaning of this data is subject to change; it is used if you pass this list as the @var{state} argument to another call. - @end enumerate -Elements 0, 3, 4, 5, 7 and 9 are significant in the argument -@var{state}. +Elements 1, 2, and 6 are ignored in the argument @var{state}. Element +8 is used only to set the corresponding element of the return value, +in certain simple cases. Element 9 is used only to set element 1 of +the return value, in trivial cases where parsing starts and stops +within the same pair of parentheses. @cindex indenting with parentheses This function is most often used to compute indentation for languages diff --git a/lispref/text.texi b/lispref/text.texi index c9f1a83a74c..426ec1ef00f 100644 --- a/lispref/text.texi +++ b/lispref/text.texi @@ -2967,7 +2967,8 @@ time you want to specify a particular attribute for certain text. @item A cons cell of the form @code{(foreground-color . @var{color-name})} or @code{(background-color . @var{color-name})}. These elements specify -just the foreground color or just the background color. +just the foreground color or just the background color. @xref{Color +Names}, for the supported forms of @var{color-name}. @code{(foreground-color . @var{color-name})} is equivalent to specifying @code{(:foreground @var{color-name})}, and likewise for the diff --git a/lispref/tips.texi b/lispref/tips.texi index 889ac3e6a6d..d2060a942bf 100644 --- a/lispref/tips.texi +++ b/lispref/tips.texi @@ -35,6 +35,7 @@ all. @node Coding Conventions @section Emacs Lisp Coding Conventions +@cindex coding conventions in Emacs Lisp Here are conventions that you should follow when writing Emacs Lisp code intended for widespread use: @@ -52,9 +53,9 @@ don't postpone it. @item Since all global variables share the same name space, and all functions share another name space, you should choose a short word to -distinguish your program from other Lisp programs.@footnote{The +distinguish your program from other Lisp programs@footnote{The benefits of a Common Lisp-style package system are considered not to -outweigh the costs.} Then take care to begin the names of all global +outweigh the costs.}. Then take care to begin the names of all global variables, constants, and functions in your program with the chosen prefix. This helps avoid name conflicts. @@ -173,9 +174,28 @@ compatibility issues. @end example @item -Redefining (or advising) an Emacs primitive is discouraged. It may do +Redefining (or advising) an Emacs primitive is a bad idea. It may do the right thing for a particular program, but there is no telling what -other programs might break as a result. +other programs might break as a result. In any case, it is a problem +for debugging, because the two advised function doesn't do what its +source code says it does. If the programmer investigating the problem +is unaware that there is advice on the function, the experience can be +very frustrating. + +We hope to remove all the places in Emacs that advise primitives. +In the mean time, please don't add any more. + +@item +It is likewise a bad idea for one Lisp package to advise a function +in another Lisp package. + +@item +Likewise, avoid using @code{eval-after-load} (@pxref{Hooks for +Loading}) in libraries and packages. This feature is meant for +personal customizations; using it in a Lisp program is unclean because +it modifies the behavior of another Lisp file in an invisible way. +This is an obstacle for debugging, much like advising a function in +the other package. @item If a file does replace any of the functions or library programs of diff --git a/lispref/windows.texi b/lispref/windows.texi index a2746889633..af73339a311 100644 --- a/lispref/windows.texi +++ b/lispref/windows.texi @@ -161,10 +161,8 @@ The two ``halves'' of the split window initially display the same buffer previously visible in the window that was split. @deffn Command split-window &optional window size horizontal -This function splits @var{window} into two windows. The original -window @var{window} remains the selected window, but occupies only -part of its former screen area. The rest is occupied by a newly created -window which is returned as the value of this function. +This function splits a new window out of @var{window}'s screen area. +It returns the new window. If @var{horizontal} is non-@code{nil}, then @var{window} splits into two side by side windows. The original window @var{window} keeps the @@ -175,11 +173,13 @@ lines to the new window. The original window is therefore the left-hand or upper of the two, and the new window is the right-hand or lower. -If @var{window} is omitted or @code{nil}, then the selected window is -split. If @var{size} is omitted or @code{nil}, then @var{window} is -divided evenly into two parts. (If there is an odd line, it is -allocated to the new window.) When @code{split-window} is called -interactively, all its arguments are @code{nil}. +If @var{window} is omitted or @code{nil}, that stands for the selected +window. When you split the selected window, it remains selected. + +If @var{size} is omitted or @code{nil}, then @var{window} is divided +evenly into two parts. (If there is an odd line, it is allocated to +the new window.) When @code{split-window} is called interactively, +all its arguments are @code{nil}. If splitting would result in making a window that is smaller than @code{window-min-height} or @code{window-min-width}, the function diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog index 0bd79a323c7..0a8480b7724 100644 --- a/lwlib/ChangeLog +++ b/lwlib/ChangeLog @@ -1,3 +1,13 @@ +2006-05-23 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> + + * xlwmenu.c: Include xterm.h if emacs instead of declaring functions + used. + (string_width): Declare as static. + (Start, pop_up_menu): Set is_hint to 0 before calling + handle_motion_event. + (pop_up_menu): Return value and parameters for x_catch_errors and + x_uncatch_errors changed. + 2005-09-27 Dan Nicolaescu <dann@ics.uci.edu> * xlwmenu.c (find_next_selectable): diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c index 0a5d82c4671..77cc50e9d7a 100644 --- a/lwlib/xlwmenu.c +++ b/lwlib/xlwmenu.c @@ -53,21 +53,8 @@ extern int gray_bitmap_width; extern int gray_bitmap_height; extern char *gray_bitmap_bits; -/* Defined in xterm.c. */ -extern int x_alloc_nearest_color_for_widget __P ((Widget, Colormap, XColor*)); -extern int x_alloc_lighter_color_for_widget __P ((Widget, Display*, Colormap, - unsigned long *, - double, int)); -extern int x_catch_errors __P ((Display*)); -extern void x_uncatch_errors P_ ((Display *, int)); -extern int x_had_errors_p __P ((Display*)); -extern void x_clear_errors __P ((Display*)); -extern unsigned long x_copy_dpy_color __P ((Display *, Colormap, - unsigned long)); - -/* Defined in xfaces.c. */ -extern void x_free_dpy_colors __P ((Display *, Screen *, Colormap, - unsigned long *pixels, int npixels)); +#include "xterm.h" + #else /* not emacs */ #include <X11/bitmaps/gray> @@ -352,7 +339,7 @@ make_old_stack_space (mw, n) } /* Size code */ -int +static int string_width (mw, s) XlwMenuWidget mw; char *s; @@ -2088,6 +2075,7 @@ Start (w, ev, params, num_params) mw->menu.windows [0].y = ev->xmotion.y_root - ev->xmotion.y; /* handles the down like a move, slots are compatible */ + ev->xmotion.is_hint = 0; handle_motion_event (mw, &ev->xmotion); } } @@ -2425,7 +2413,6 @@ pop_up_menu (mw, event) int borderwidth = mw->menu.shadow_thickness; Screen* screen = XtScreen (mw); Display *display = XtDisplay (mw); - int count; next_release_must_exit = 0; @@ -2472,7 +2459,7 @@ pop_up_menu (mw, event) } #ifdef emacs - count = x_catch_errors (display); + x_catch_errors (display); #endif if (XtGrabPointer ((Widget)mw, False, (PointerMotionMask @@ -2500,9 +2487,10 @@ pop_up_menu (mw, event) pointer_grabbed = 0; XtUngrabPointer ((Widget)mw, event->time); } - x_uncatch_errors (display, count); + x_uncatch_errors (); #endif + ((XMotionEvent*)event)->is_hint = 0; handle_motion_event (mw, (XMotionEvent*)event); } diff --git a/mac/ChangeLog b/mac/ChangeLog index 80e30045dda..a17f456ae6f 100644 --- a/mac/ChangeLog +++ b/mac/ChangeLog @@ -1,3 +1,7 @@ +2006-05-19 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * makefile.MPW (SOME_MACHINE_LISP): Add fringe.elc. + 2006-04-12 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> * inc/config.h (pid_t): Define to int. diff --git a/mac/makefile.MPW b/mac/makefile.MPW index 4d0986ea60f..18866c2979d 100644 --- a/mac/makefile.MPW +++ b/mac/makefile.MPW @@ -1100,8 +1100,8 @@ SOME_MACHINE_LISP = {Lisp}mouse.elc ¶ {Lisp}w32-fns.elc {Lisp}dos-w32.elc ¶ {Lisp}disp-table.elc {Lisp}dos-vars.elc ¶ {Lisp}tooltip.elc {Lisp}image.elc ¶ - {Lisp}dnd.elc {Lisp}mwheel.elc ¶ - {Lisp}tool-bar.elc ¶ + {Lisp}fringe.elc {Lisp}dnd.elc ¶ + {Lisp}mwheel.elc {Lisp}tool-bar.elc ¶ {Lisp}x-dnd.elc ¶ {Lisp}international:ccl.elc ¶ {Lisp}international:codepage.elc ¶ diff --git a/man/ChangeLog b/man/ChangeLog index 90f3f8a0a27..1e491962d61 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,175 @@ +2006-05-18 Reiner Steib <Reiner.Steib@gmx.de> + + * gnus.texi (Saving Articles): Clarify gnus-summary-save-article-mail. + +2006-06-07 Nick Roberts <nickrob@snap.net.nz> + + * building.texi (Watch Expressions): Move node to end. + (GDB Graphical Interface): Move description of clicks in fringe... + (GDB commands in the Fringe): ...to here. New node. + +2006-06-06 Carsten Dominik <dominik@science.uva.nl> + + * org.texi: (ASCII export): Document indentation adaptation. + (Setting tags): Document mutually-exclusive tags. + +2006-06-05 Romain Francoise <romain@orebokech.com> + + * url.texi (irc): Mention new funs `url-irc-rcirc' and `url-irc-erc'. + Fix typo. + + * gnus-faq.texi (Question 8.6): Update reference to the Gnus + channel (#gnus@irc.freenode.net). + Fix typos. Update copyright notice. + + * cc-mode.texi (Getting Started, Indentation Commands, Config Basics) + (Custom Filling and Breaking, Custom Braces, Syntactic Symbols) + (Line-Up Functions, Custom Macros): + * ediff.texi (Window and Frame Configuration) + (Highlighting Difference Regions, Highlighting Difference Regions): + * emacs-mime.texi (Display Customization): + * erc.texi (History): + * eshell.texi (Known problems): + * eudc.texi (Overview, BBDB): + * gnus.texi (NNTP, IMAP, Advanced Scoring Examples) + (The problem of spam, SpamOracle, Extending the Spam package) + (Conformity, Terminology): + * idlwave.texi (Routine Info, Routine Info) + (Class and Keyword Inheritance, Padding Operators) + (Breakpoints and Stepping, Electric Debug Mode) + (Examining Variables, Troubleshooting): + * org.texi (Creating timestamps): + * reftex.texi (Commands, Options, Changes): + * tramp.texi (Inline methods, Password caching) + (Auto-save and Backup, Issues): + * vip.texi (Files, Commands in Insert Mode): + * viper.texi (Emacs Preliminaries, States in Viper) + (Packages that Change Keymaps, Viper Specials, Groundwork): + * xresmini.texi (GTK resources): + Fix various typos. + +2006-06-05 Nick Roberts <nickrob@snap.net.nz> + + * building.texi (GDB Graphical Interface): Update bindings. + (Commands of GUD): Add gud-print. Remove gud-run. Restate + availability more generally. + +2006-06-03 Ted Zlatanov <tzz@lifelogs.com> + + * mini.texi: Lots of cleanups. + +2006-06-01 Luc Teirlinck <teirllm@auburn.edu> + + * misc.texi (Shell History Copying): Update descriptions of `C-c RET' + and Mouse-2. + +2006-06-01 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> + + * screen.texi (Menu Bar): Change menu-bar-start to menu-bar-open. + +2006-05-31 Michael Ernst <mernst@alum.mit.edu> + + * ediff.texi: Fix typos. + +2006-05-31 Richard Stallman <rms@gnu.org> + + * basic.texi (Moving Point): Fix previous change. + +2006-05-30 Carsten Dominik <dominik@science.uva.nl> + + * org.texi: Small typo fixes. + +2006-05-29 Michael Albinus <michael.albinus@gmx.de> + + * tramp.texi (Frequently Asked Questions): Disable zsh zle. + +2006-05-29 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> + + * screen.texi (Menu Bar): F10 for Gtk+/Lesstif/Lucid menus. + +2006-05-28 Ted Zlatanov <tzz@lifelogs.com> + + * basic.texi: Many simplifications and improvements in wording. + +2006-05-27 Thien-Thi Nguyen <ttn@gnu.org> + + * pcl-cvs.texi: Fix typos. + (Customization): Say "us". + +2006-05-26 Eli Zaretskii <eliz@gnu.org> + + * org.texi: Remove bogus @setfilename. + +2006-05-26 Carsten Dominik <dominik@science.uva.nl> + + * org.texi (ASCII export): Omit command name. + (HTML export): Add prefix to all lines in Local Variable example. + (Acknowledgments): Typeset names in italics. + +2006-05-26 Nick Roberts <nickrob@snap.net.nz> + + * anti.texi (Antinews): Create a node for gdb-ui. + +2006-05-24 Carsten Dominik <dominik@science.uva.nl> + + * org.texi: (Plain lists): Added new item navigation commands. + (External links): Documented elisp and info links. + (Custom searches): New section. + (Publishing): New chapter. + (HTML export): Include a list of supported CSS classes. + (Setting tags): Describe the fast-tag-setting interface. + +2006-05-22 Reiner Steib <Reiner.Steib@gmx.de> + + * frames.texi (Menu Bars, Tool Bars): Add index entries. + +2006-05-20 Richard Stallman <rms@gnu.org> + + * dired.texi (Dired Navigation): dired-goto-file is now j. + +2006-05-20 Luc Teirlinck <teirllm@auburn.edu> + + * dired-x.texi: ifinfo -> ifnottex. + +2006-05-20 Eli Zaretskii <eliz@gnu.org> + + * mule.texi (Coding Systems): Mention the undecided-* coding systems + and their aliases. + + * msdog.texi (Windows Printing): Mention non-support of plain text + printing with some el-cheapo printers, and suggest a workaround. + +2006-05-20 Kevin Ryde <user42@zip.com.au> + + * text.texi (TeX Print): tex-dvi-view-command has a default value, + remove the bit saying you must set it. + +2006-05-19 Luc Teirlinck <teirllm@auburn.edu> + + * trouble.texi (Checklist): + * text.texi (Text, Auto Fill, Text Mode): + * search.texi (Nonincremental Search): + * rmail.texi (Rmail Labels): + * mule.texi (Input Methods, Multibyte Conversion): + * misc.texi (Gnus, Where to Look, PostScript): + * maintaining.texi (Create Tags Table): + * indent.texi (Indentation Commands): + * fixit.texi (Spelling): + * emacs.texi (Copying): + * custom.texi (Init File): ifinfo -> ifnottex. + +2006-05-18 Reiner Steib <Reiner.Steib@gmx.de> + + * gnus.texi (Saving Articles): Clarify gnus-summary-save-article-mail. + +2006-05-17 Richard Stallman <rms@gnu.org> + + * files.texi (Diff Mode): Mention C-x `. + +2006-05-08 Richard Stallman <rms@gnu.org> + + * custom.texi (Disabling): Textual cleanups. + 2006-05-12 Reiner Steib <Reiner.Steib@gmx.de> * message.texi (Interface): Add tool bar customization. @@ -22,8 +194,8 @@ 2006-05-12 Eli Zaretskii <eliz@gnu.org> * calendar.texi (Calendar/Diary, Holidays, Displaying the Diary) - (Displaying the Diary, Special Diary Entries, Importing Diary): - * building.texi (Compilation Shell): + (Displaying the Diary, Special Diary Entries, Importing Diary): + * building.texi (Compilation Shell): * buffers.texi (Several Buffers) [iftex]: Replace @xref's to emacs-xtra with @inforef's. @@ -566,7 +738,7 @@ * custom.texi: Many cleanups. (Minor Modes): Don't mention ISO Accents Mode. (Examining): Update C-h v output example. - (Hooks): Add index and xref for add-hook. + (Hooks): Add index and xref for add-hook. (Locals): Delete list of vars that are always per-buffer. Rearrange. (Local Keymaps): Don't mention lisp-mode-map, c-mode-map. @@ -1789,7 +1961,7 @@ * mini.texi (Minibuffer File): Clarify previous change. Add @findex. -2005-11-08 Aaron S. Hawley <Aaron.Hawley@uvm.edu> (tiny change) +2005-11-08 Aaron S. Hawley <Aaron.Hawley@uvm.edu> * files.texi (Renaming and VC): Some back-ends don't handle renaming. @@ -6222,6 +6394,7 @@ ;; Local Variables: ;; coding: iso-2022-7bit +;; fill-column: 79 ;; End: Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, diff --git a/man/anti.texi b/man/anti.texi index bfcd8badae0..0706bdda650 100644 --- a/man/anti.texi +++ b/man/anti.texi @@ -263,7 +263,13 @@ macro. Use @kbd{M-x name-last-kbd-macro} to name the most recently defined macro. @item -The Calc, CUA, GDB-UI, Ibuffer, Ido, Password, Printing, Reveal, +Emacs no longer displays your breakpoints in the source buffer, so you +have to remember where you left them. It can be difficult to inspect +the state of your debugged program from the command line, so Emacs +tries to demonstrate this in the GUD buffer. + +@item +The Calc, CUA, Ibuffer, Ido, Password, Printing, Reveal, Ruler-mode, SES, Table, Tramp, and URL packages have been removed. The Benchmark, Cfengine, Conf, Dns, Flymake, Python, Thumbs, and Wdired modes have also been removed. diff --git a/man/basic.texi b/man/basic.texi index f4d15f9171b..26b3137d632 100644 --- a/man/basic.texi +++ b/man/basic.texi @@ -7,28 +7,27 @@ @kindex C-h t @findex help-with-tutorial - We now give the basics of how to enter text, make corrections, and -save the text in a file. If this material is new to you, you might -learn it more easily by running the Emacs learn-by-doing tutorial. To -use the tutorial, run Emacs and type @kbd{Control-h t} -(@code{help-with-tutorial}). + Here we explain the basics of how to enter text, make corrections, +and save the text in a file. If this material is new to you, we +suggest you first run the Emacs learn-by-doing tutorial, by typing +@kbd{Control-h t} inside Emacs. (@code{help-with-tutorial}). - To clear the screen and redisplay, type @kbd{C-l} (@code{recenter}). + To clear and redisplay the screen, type @kbd{C-l} (@code{recenter}). @menu * Inserting Text:: Inserting text by simply typing it. -* Moving Point:: How to move the cursor to the place where you want to +* Moving Point:: Moving the cursor to the place where you want to change something. * Erasing:: Deleting and killing text. * Basic Undo:: Undoing recent changes in the text. * Files: Basic Files. Visiting, creating, and saving files. * Help: Basic Help. Asking what a character does. -* Blank Lines:: Commands to make or delete blank lines. -* Continuation Lines:: Lines too wide for the screen. +* Blank Lines:: Making and deleting blank lines. +* Continuation Lines:: How Emacs displays lines too wide for the screen. * Position Info:: What page, line, row, or column is point on? -* Arguments:: Numeric arguments for repeating a command. -* Repeating:: A short-cut for repeating the previous command. +* Arguments:: Numeric arguments for repeating a command N times. +* Repeating:: Repeating the previous command quickly. @end menu @node Inserting Text @@ -36,66 +35,71 @@ use the tutorial, run Emacs and type @kbd{Control-h t} @cindex insertion @cindex graphic characters - To insert printing characters into the text you are editing, just type -them. This inserts the characters you type into the buffer at the -cursor (that is, at @dfn{point}; @pxref{Point}). The cursor moves -forward, and any text after the cursor moves forward too. If the text -in the buffer is @samp{FOOBAR}, with the cursor before the @samp{B}, -then if you type @kbd{XX}, you get @samp{FOOXXBAR}, with the cursor -still before the @samp{B}. + Typing printing characters inserts them into the text you are +editing. It inserts them into the buffer at the cursor; more +precisely, it inserts them at @dfn{point}, but the cursor normally +shows where point is. @xref{Point}. + + Insertion moves the cursor forward, and the following text moves +forward with the cursor. If the text in the buffer is @samp{FOOBAR}, +with the cursor before the @samp{B}, and you type @kbd{XX}, you get +@samp{FOOXXBAR}, with the cursor still before the @samp{B}. To @dfn{delete} text you have just inserted, use the large key labeled @key{DEL}, @key{BACKSPACE} or @key{DELETE} which is a short -distance above the @key{RET} or @key{ENTER} key. This is the key you -normally use, outside Emacs, for erasing the last character that you -typed. Regardless of the label on that key, Emacs thinks of it as -@key{DEL}, and that's what we call it in this manual. +distance above the @key{RET} or @key{ENTER} key. Regardless of the +label on that key, Emacs thinks of it as @key{DEL}, and that's what we +call it in this manual. @key{DEL} is the key you normally use outside +Emacs to erase the last character that you typed. The @key{DEL} key deletes the character @emph{before} the cursor. As a consequence, the cursor and all the characters after it move backwards. If you type a printing character and then type @key{DEL}, they cancel out. - On most computers, Emacs recognizes automatically which key ought to -be @key{DEL}, and sets it up that way. But in some cases, especially -with text-only terminals, you will need to tell Emacs which key to use -for that purpose. If the large key not far above the @key{RET} or -@key{ENTER} key doesn't delete backwards, you need to do this. -@xref{DEL Does Not Delete}, for an explanation of how. + On most computers, Emacs sets up @key{DEL} automatically. In some +cases, especially with text-only terminals, Emacs may guess wrong. If +the key that ought to erase the last character doesn't do it in Emacs, +see @ref{DEL Does Not Delete}. - Most PC keyboards have both a @key{BACKSPACE} key not far above -@key{RET} or @key{ENTER}, and a @key{DELETE} key elsewhere. On these -keyboards, Emacs supports when possible the usual convention that the -@key{BACKSPACE} key deletes backwards (it is @key{DEL}), while the -@key{DELETE} key deletes ``forwards,'' deleting the character after -point, the one underneath the cursor, like @kbd{C-d} (see below). + Most PC keyboards have both a @key{BACKSPACE} key a little ways +above @key{RET} or @key{ENTER}, and a @key{DELETE} key elsewhere. On +these keyboards, Emacs tries to set up @key{BACKSPACE} as @key{DEL}. +The @key{DELETE} key deletes ``forwards'' like @kbd{C-d} (see below), +which means it deletes the character underneath the cursor (after +point). @kindex RET @cindex newline - To end a line and start typing a new one, type @key{RET}. This -inserts a newline character in the buffer. If point is in the middle of -a line, the effect is to split the line. Typing @key{DEL} when the cursor is -at the beginning of a line deletes the preceding newline, thus joining -the line with the preceding line. - - Emacs can split lines automatically when they become too long, if you -turn on a special minor mode called @dfn{Auto Fill} mode. -@xref{Filling}, for how to use Auto Fill mode and other modes for -@dfn{filling} text. - - If you prefer to have text characters replace (overwrite) existing -text rather than shove it to the right, you can enable Overwrite mode, -a minor mode. @xref{Minor Modes}. + To end a line and start typing a new one, type @key{RET}. (This +key may be labeled @key{RETURN} or @key{ENTER}, but in Emacs we call +it @key{RET}.) This inserts a newline character in the buffer. If +point is at the end of the line, this creates a new blank line after +it. If point is in the middle of a line, the effect is to split that +line. Typing @key{DEL} when the cursor is at the beginning of a line +deletes the preceding newline character, thus joining the line with +the one before it. + + Emacs can split lines automatically when they become too long, if +you turn on a special minor mode called @dfn{Auto Fill} mode. +@xref{Filling}, for Auto Fill mode and other methods of @dfn{filling} +text. + + If you prefer printing characters to replace (overwrite) existing +text, rather than shove it to the right, you should enable Overwrite +mode, a minor mode. @xref{Minor Modes}. @cindex quoting @kindex C-q @findex quoted-insert - Direct insertion works for printing characters and @key{SPC}, but other -characters act as editing commands and do not insert themselves. If you -need to insert a control character or a character whose code is above 200 -octal, you must @dfn{quote} it by typing the character @kbd{Control-q} -(@code{quoted-insert}) first. (This character's name is normally written -@kbd{C-q} for short.) There are two ways to use @kbd{C-q}:@refill + Only printing characters and @key{SPC} insert themselves in Emacs. +Other characters act as editing commands and do not insert themselves. +These include control characters, and characters with codes above 200 +octal. If you need to insert one of these characters in the buffer, +you must @dfn{quote} it by typing the character @kbd{Control-q} +(@code{quoted-insert}) first. (This character's name is normally +written @kbd{C-q} for short.) There are two ways to use +@kbd{C-q}: @itemize @bullet @item @@ -131,16 +135,16 @@ To use decimal or hexadecimal instead of octal, set the variable 10, some letters starting with @kbd{a} serve as part of a character code, just like digits. -A numeric argument to @kbd{C-q} specifies how many copies of the -quoted character should be inserted (@pxref{Arguments}). +A numeric argument tells @kbd{C-q} how many copies of the quoted +character to insert (@pxref{Arguments}). @findex newline @findex self-insert Customization information: @key{DEL} in most modes runs the command -@code{delete-backward-char}; @key{RET} runs the command @code{newline}, and -self-inserting printing characters run the command @code{self-insert}, -which inserts whatever character was typed to invoke it. Some major modes -rebind @key{DEL} to other commands. +@code{delete-backward-char}; @key{RET} runs the command +@code{newline}, and self-inserting printing characters run the command +@code{self-insert}, which inserts whatever character you typed. Some +major modes rebind @key{DEL} to other commands. @node Moving Point @section Changing the Location of Point @@ -199,21 +203,21 @@ Move forward one word (@code{forward-word}). @item M-b Move backward one word (@code{backward-word}). @item C-n -Move down one line, vertically (@code{next-line}). This command +Move down one line vertically (@code{next-line}). This command attempts to keep the horizontal position unchanged, so if you start in -the middle of one line, you end in the middle of the next. The +the middle of one line, you move to the middle of the next. The down-arrow key does the same thing. @item C-p Move up one line, vertically (@code{previous-line}). The up-arrow key -has the same effect. +has the same effect. This command preserves position within the line, +like @kbd{C-n}. @item M-r Move point to left margin, vertically centered in the window (@code{move-to-window-line}). Text does not move on the screen. - -A numeric argument says which screen line to place point on. It counts -screen lines down from the top of the window (zero for the top line). A -negative argument counts lines from the bottom (@minus{}1 for the bottom -line). +A numeric argument says which screen line to place point on, counting +downward from the top of the window (zero means the top line). A +negative argument counts lines up from the bottom (@minus{}1 means the +bottom line). @item M-< Move to the top of the buffer (@code{beginning-of-buffer}). With numeric argument @var{n}, move to @var{n}/10 of the way from the top. @@ -228,7 +232,7 @@ put it on the screen (@code{scroll-up}). This doesn't always move point, but it is commonly used to do so. If your keyboard has a @key{PAGEDOWN} or @key{PRIOR} key, it does the same thing. -Scrolling commands are further described in @ref{Scrolling}. +Scrolling commands are described further in @ref{Scrolling}. @item M-v @itemx @key{PAGEUP} @itemx @key{NEXT} @@ -244,19 +248,19 @@ Position 1 is the beginning of the buffer. @itemx M-x goto-line Read a number @var{n} and move point to the beginning of line number @var{n}. Line 1 is the beginning of the buffer. If point is on or -just after a number, then that is the default for @var{n}, if you just -press @key{RET} with an empty minibuffer. +just after a number in the buffer, and you type @key{RET} with the +minibuffer empty, that number is used for @var{n}. @item C-x C-n @findex set-goal-column @kindex C-x C-n -Use the current column of point as the @dfn{semipermanent goal column} for -@kbd{C-n} and @kbd{C-p} (@code{set-goal-column}). Henceforth, those -commands always move to this column in each line moved into, or as -close as possible given the contents of the line. This goal column remains -in effect until canceled. +Use the current column of point as the @dfn{semipermanent goal column} +for @kbd{C-n} and @kbd{C-p} (@code{set-goal-column}). When a +semipermanent goal column is in effect, those commands always try to +move to this column, or as close as possible to it, after moving +vertically. The goal column remains in effect until canceled. @item C-u C-x C-n -Cancel the goal column. Henceforth, @kbd{C-n} and @kbd{C-p} once -again try to stick to a fixed horizontal position, as usual. +Cancel the goal column. Henceforth, @kbd{C-n} and @kbd{C-p} try to +preserve the horizontal position, as usual. @end table @vindex track-eol @@ -267,10 +271,10 @@ to the end of another line. Normally, @code{track-eol} is @code{nil}. @vindex next-line-add-newlines @kbd{C-n} normally stops at the end of the buffer when you use it on -the last line of the buffer. But if you set the variable +the last line of the buffer. However, if you set the variable @code{next-line-add-newlines} to a non-@code{nil} value, @kbd{C-n} on the last line of a buffer creates an additional line at the end and -moves down onto it. +moves down into it. @node Erasing @section Erasing Text @@ -303,12 +307,13 @@ before point (that is, before the cursor). Another key, @kbd{Control-d} (@kbd{C-d} for short), deletes the character after point (that is, the character that the cursor is on). This shifts the rest of the text on the line to the left. If you type @kbd{C-d} at the end of a line, it -joins together that line and the next line. +joins that line with the following line. - To erase a larger amount of text, use the @kbd{C-k} key, which kills a -line at a time. If you type @kbd{C-k} at the beginning or middle of a -line, it kills all the text up to the end of the line. If you type -@kbd{C-k} at the end of a line, it joins that line and the next line. + To erase a larger amount of text, use the @kbd{C-k} key, which +erases (kills) a line at a time. If you type @kbd{C-k} at the +beginning or middle of a line, it kills all the text up to the end of +the line. If you type @kbd{C-k} at the end of a line, it joins that +line with the following line. @xref{Killing}, for more flexible ways of killing text. @@ -316,7 +321,7 @@ line, it kills all the text up to the end of the line. If you type @section Undoing Changes Emacs records a list of changes made in the buffer text, so you can -you can undo all the recent changes, as far as the records go. +you can undo recent changes, as far as the records go. Usually each editing command makes a separate entry in the undo records, but sometimes an entry covers just part of a command, and very simple commands may be grouped. @@ -331,12 +336,11 @@ The same. @end table The command @kbd{C-x u} (or @kbd{C-_} or @kbd{C-/}) is how you undo. -The first time you give this command, it undoes the last change. -Point moves back to where it was before the command that made the -change. +Normally this command undoes the last change, and moves point back to +where it was before the change. - Consecutive repetitions of @kbd{C-x u} (or its aliases) undo earlier -and earlier changes, back to the limit of the undo information + If you repeat @kbd{C-x u} (or its aliases), each repetition undoes +another, earlier change, back to the limit of the undo information available. If all recorded changes have already been undone, the undo command displays an error message and does nothing. @@ -349,16 +353,15 @@ popping the mark ring (@pxref{Mark Ring}). @node Basic Files @section Files - The commands described above are sufficient for creating and altering -text in an Emacs buffer; the more advanced Emacs commands just make -things easier. However, to keep any text permanently you must put it in a + Text that you insert in an Emacs buffer lasts only as long as the +Emacs session. To keep any text permanently you must put it in a @dfn{file}. Files are named units of text which are stored by the -operating system for you to retrieve later by name. To look at or use -the contents of a file in any way, including editing the file with -Emacs, you must specify the file name. +operating system for you to retrieve later by name. To use the +contents of a file in any way, you must specify the file name. That +includes editing the file with Emacs. - Consider a file named @file{test.emacs}. (We can assume it is in -your home directory.) In Emacs, to begin editing this file, type + Suppose there is a file named @file{test.emacs} in your home +directory. To begin editing this file in Emacs, type @example C-x C-f test.emacs @key{RET} @@ -368,22 +371,23 @@ C-x C-f test.emacs @key{RET} Here the file name is given as an @dfn{argument} to the command @kbd{C-x C-f} (@code{find-file}). That command uses the @dfn{minibuffer} to read the argument, and you type @key{RET} to terminate the argument -(@pxref{Minibuffer}).@refill +(@pxref{Minibuffer}). - Emacs obeys the command by @dfn{visiting} the file: creating a buffer, -copying the contents of the file into the buffer, and then displaying -the buffer for you to edit. If you alter the text, you can @dfn{save} -the new text in the file by typing @kbd{C-x C-s} (@code{save-buffer}). -This makes the changes permanent by copying the altered buffer contents -back into the file @file{test.emacs}. Until you save, the changes -exist only inside Emacs, and the file @file{test.emacs} is unaltered. + Emacs obeys this command by @dfn{visiting} the file: it creates a +buffer, it copies the contents of the file into the buffer, and then +displays the buffer for editing. If you alter the text, you can +@dfn{save} the new text in the file by typing @kbd{C-x C-s} +(@code{save-buffer}). This copies the altered buffer contents back +into the file @file{test.emacs}, making them permanent. Until you +save, the changed text exists only inside Emacs, and the file +@file{test.emacs} is unaltered. - To create a file, just visit the file with @kbd{C-x C-f} as if it -already existed. This creates an empty buffer in which you can insert -the text you want to put in the file. The file is actually created when -you save this buffer with @kbd{C-x C-s}. + To create a file, just visit it with @kbd{C-x C-f} as if it already +existed. This creates an empty buffer, in which you can insert the +text you want to put in the file. Emacs actually creates the file the +first time you save this buffer with @kbd{C-x C-s}. - Of course, there is a lot more to learn about using files. @xref{Files}. + To learn more about using files in Emacs, see @ref{Files}. @node Basic Help @section Help @@ -391,19 +395,19 @@ you save this buffer with @kbd{C-x C-s}. @cindex getting help with keys If you forget what a key does, you can find out with the Help character, which is @kbd{C-h} (or @key{F1}, which is an alias for -@kbd{C-h}). Type @kbd{C-h k} followed by the key you want to know -about; for example, @kbd{C-h k C-n} tells you all about what @kbd{C-n} -does. @kbd{C-h} is a prefix key; @kbd{C-h k} is just one of its -subcommands (the command @code{describe-key}). The other subcommands of -@kbd{C-h} provide different kinds of help. Type @kbd{C-h} twice to get -a description of all the help facilities. @xref{Help}.@refill +@kbd{C-h}). Type @kbd{C-h k} followed by the key of interest; for +example, @kbd{C-h k C-n} tells you what @kbd{C-n} does. @kbd{C-h} is +a prefix key; @kbd{C-h k} is just one of its subcommands (the command +@code{describe-key}). The other subcommands of @kbd{C-h} provide +different kinds of help. Type @kbd{C-h} twice to get a description of +all the help facilities. @xref{Help}. @node Blank Lines @section Blank Lines @cindex inserting blank lines @cindex deleting blank lines - Here are special commands and techniques for putting in and taking out + Here are special commands and techniques for inserting and deleting blank lines. @table @kbd @@ -419,8 +423,8 @@ Delete all but one of many consecutive blank lines @cindex blank lines @findex open-line @findex delete-blank-lines - When you want to insert a new line of text before an existing line, you -can do it by typing the new line of text, followed by @key{RET}. + To insert a new line of text before an existing line, +type the new line of text, followed by @key{RET}. However, it may be easier to see what you are doing if you first make a blank line and then insert the desired text into it. This is easy to do using the key @kbd{C-o} (@code{open-line}), which inserts a newline @@ -429,17 +433,16 @@ type the text for the new line. @kbd{C-o F O O} has the same effect as @w{@kbd{F O O @key{RET}}}, except for the final location of point. You can make several blank lines by typing @kbd{C-o} several times, or -by giving it a numeric argument to tell it how many blank lines to make. +by giving it a numeric argument specifying how many blank lines to make. @xref{Arguments}, for how. If you have a fill prefix, the @kbd{C-o} -command inserts the fill prefix on the new line, when you use it at the +command inserts the fill prefix on the new line, if typed at the beginning of a line. @xref{Fill Prefix}. The easy way to get rid of extra blank lines is with the command @kbd{C-x C-o} (@code{delete-blank-lines}). @kbd{C-x C-o} in a run of several blank lines deletes all but one of them. @kbd{C-x C-o} on a -solitary blank line deletes that blank line. When point is on a -nonblank line, @kbd{C-x C-o} deletes any blank lines following that -nonblank line. +lone blank line deletes that one. When point is on a nonblank line, +@kbd{C-x C-o} deletes all following blank lines (if any). @node Continuation Lines @section Continuation Lines @@ -448,40 +451,37 @@ nonblank line. @cindex wrapping @cindex line wrapping @cindex fringes, and continuation lines - If you add too many characters to one line without breaking it with -@key{RET}, the line grows to occupy two (or more) lines on the screen. -On graphical displays, Emacs indicates line wrapping with small bent -arrows in the fringes to the left and right of the window. On -text-only terminals, Emacs displays a @samp{\} character at the right -margin of a screen line if it is not the last in its text line. This -@samp{\} character says that the following screen line is not really a -distinct line in the text, just a @dfn{continuation} of a line too -long to fit the screen. Continuation is also called @dfn{line -wrapping}. - - When line wrapping occurs before a character that is wider than one + When a text line is too long to fit in one screen line, Emacs +displays it on two or more screen lines. This is called +@dfn{continuation} or @dfn{line wrapping}. On graphical displays, +Emacs indicates line wrapping with small bent arrows in the left and +right window fringes. On text-only terminals, Emacs displays a +@samp{\} character at the right margin of a screen line if it is not +the last in its text line. This @samp{\} character says that the +following screen line is not really a new text line. + + When line wrapping occurs just before a character that is wider than one column, some columns at the end of the previous screen line may be ``empty.'' In this case, Emacs displays additional @samp{\} -characters in the ``empty'' columns, just before the @samp{\} +characters in the ``empty'' columns before the @samp{\} character that indicates continuation. - Continued lines can be rather difficult to read, since each line is -typically broken in the middle of a word. You can have Emacs insert a + Continued lines can be difficult to read, since lines can break in +the middle of a word. If you prefer, you can make Emacs insert a newline automatically when a line gets too long, by using Auto Fill -mode. Another approach, intermediate between continued lines and Auto -Fill mode, is Long Lines mode, which ensures that wrapping only occurs -in the spaces between words. @xref{Filling}. +mode. Or enable Long Lines mode, which ensures that wrapping only +occurs between words. @xref{Filling}. @cindex truncation @cindex line truncation, and fringes - Emacs can also display long lines by @dfn{truncation}. This means -that all the characters that do not fit in the width of the screen or -window do not appear at all. @samp{$} in the last column or a small -straight arrow in the fringe to the right of the window indicates a -truncated line. + Emacs can optionally @dfn{truncate} long lines---this means +displaying just one screen line worth, and the rest of the long line +does not appear at all. @samp{$} in the last column or a small +straight arrow in the window's right fringe indicates a truncated +line. - @xref{Display Custom}, for more information about line truncation, -and other variables that affect how text is displayed. + @xref{Display Custom}, for more about line truncation, +and other variables that control how text is displayed. @node Position Info @section Cursor Position Information @@ -491,12 +491,12 @@ parts of the buffer, and to count lines. @table @kbd @item M-x what-page -Display the page number of point, and the line number within the page. +Display the page number of point, and the line number within that page. @item M-x what-line -Display the line number of point in the buffer. +Display the line number of point in the whole buffer. @item M-x line-number-mode @itemx M-x column-number-mode -Toggle automatic display of current line number or column number. +Toggle automatic display of the current line number or column number. @xref{Optional Mode Line}. @item M-= Display the number of lines in the current region (@code{count-lines-region}). @@ -518,9 +518,9 @@ Toggle automatic display of the size of the buffer. @cindex location of point @cindex cursor location @cindex point location - @kbd{M-x what-line} computes the current line number and displays it + @kbd{M-x what-line} displays the current line number in the echo area. You can also see the current line number in the -mode line; see @ref{Mode Line}. If you narrow the buffer, then the +mode line; see @ref{Mode Line}; but if you narrow the buffer, the line number in the mode line is relative to the accessible portion (@pxref{Narrowing}). By contrast, @code{what-line} shows both the line number relative to the narrowed region and the line number @@ -532,17 +532,16 @@ counts lines within the page, showing both numbers in the echo area. @kindex M-= @findex count-lines-region - While on this subject, we might as well mention @kbd{M-=} (@code{count-lines-region}), -which displays the number of lines in the region (@pxref{Mark}). -@xref{Pages}, for the command @kbd{C-x l} which counts the lines in the -current page. + Use @kbd{M-=} (@code{count-lines-region}) to displays the number of +lines in the region (@pxref{Mark}). @xref{Pages}, for the command +@kbd{C-x l} which counts the lines in the current page. @kindex C-x = @findex what-cursor-position The command @kbd{C-x =} (@code{what-cursor-position}) shows what -column the cursor is in, and other miscellaneous information about -point and the character after it. It displays a line in the echo area -that looks like this: +cursor's column position, and other information about point and the +character after it. It displays a line in the echo area that looks +like this: @smallexample Char: c (99, #o143, #x63) point=28062 of 36168 (78%) column=53 @@ -563,11 +562,11 @@ characters, but all of them together display as the original invalid byte, in octal code. In this case, @kbd{C-x =} shows @samp{part of display ...} instead of @samp{file}. - @samp{point=} is followed by the position of point expressed as a character -count. The front of the buffer counts as position 1, one character later -as 2, and so on. The next, larger, number is the total number of characters -in the buffer. Afterward in parentheses comes the position expressed as a -percentage of the total size. + @samp{point=} is followed by the position of point expressed as a +character count. The start of the buffer is position 1, one character +later is position 2, and so on. The next, larger, number is the total +number of characters in the buffer. Afterward in parentheses comes +the position expressed as a percentage of the total size. @samp{column=} is followed by the horizontal position of point, in columns from the left edge of the window. @@ -614,7 +613,7 @@ The character's encodings, both internally in the buffer, and externally if you were to save the file. @item -What to type to input the character in the current input method +What keys to type to input the character in the current input method (if it supports the character). @item @@ -656,7 +655,7 @@ There are text properties here: @cindex prefix arguments @cindex arguments to commands - In mathematics and computer usage, the word @dfn{argument} means + In mathematics and computer usage, @dfn{argument} means ``data provided to a function or operation.'' You can give any Emacs command a @dfn{numeric argument} (also called a @dfn{prefix argument}). Some commands interpret the argument as a repetition count. For @@ -679,37 +678,37 @@ M-5 C-n @end example @noindent -would move down five lines. The characters @kbd{Meta-1}, @kbd{Meta-2}, +moves down five lines. The characters @kbd{Meta-1}, @kbd{Meta-2}, and so on, as well as @kbd{Meta--}, do this because they are keys bound to commands (@code{digit-argument} and @code{negative-argument}) that -are defined to contribute to an argument for the next command. +are defined to set up an argument for the next command. @kbd{Meta--} without digits normally means @minus{}1. Digits and @kbd{-} modified with Control, or Control and Meta, also specify numeric arguments. @kindex C-u @findex universal-argument - Another way of specifying an argument is to use the @kbd{C-u} -(@code{universal-argument}) command followed by the digits of the -argument. With @kbd{C-u}, you can type the argument digits without -holding down modifier keys; @kbd{C-u} works on all terminals. To type a -negative argument, type a minus sign after @kbd{C-u}. Just a minus sign -without digits normally means @minus{}1. - - @kbd{C-u} without digits or minus sign has the special meaning of + You can also specify a numeric argument by typing @kbd{C-u} +(@code{universal-argument}) followed by the digits. The advantage of +@kbd{C-u} is that you can type the digits without modifier keys; thus, +@kbd{C-u} works on all terminals. For a negative argument, type a +minus sign after @kbd{C-u}. A minus sign without digits normally +means @minus{}1. + + @kbd{C-u} alone has the special meaning of ``four times'': it multiplies the argument for the next command by four. @kbd{C-u C-u} multiplies it by sixteen. Thus, @kbd{C-u C-u C-f} moves forward sixteen characters. This is a good way to move forward ``fast,'' since it moves about 1/5 of a line in the usual size screen. Other useful combinations are @kbd{C-u C-n}, @kbd{C-u C-u C-n} (move down a good fraction of a screen), @kbd{C-u C-u C-o} (make -``a lot'' of blank lines), and @kbd{C-u C-k} (kill four lines).@refill +``a lot'' of blank lines), and @kbd{C-u C-k} (kill four lines). - Some commands care only about whether there is an argument, and not about -its value. For example, the command @kbd{M-q} (@code{fill-paragraph}) with -no argument fills text; with an argument, it justifies the text as well. -(@xref{Filling}, for more information on @kbd{M-q}.) Plain @kbd{C-u} is a -handy way of providing an argument for such commands. + Some commands care whether there is an argument, but ignore its +value. For example, the command @kbd{M-q} (@code{fill-paragraph}) +fills text; with an argument, it justifies the text as well. +(@xref{Filling}, for more information on @kbd{M-q}.) Plain @kbd{C-u} +is a handy way of providing an argument for such commands. Some commands use the value of the argument as a repeat count, but do something peculiar when there is no argument. For example, the command @@ -719,27 +718,28 @@ special: it kills the text up to the next newline, or, if point is right at the end of the line, it kills the newline itself. Thus, two @kbd{C-k} commands with no arguments can kill a nonblank line, just like @kbd{C-k} with an argument of one. (@xref{Killing}, for more information on -@kbd{C-k}.)@refill +@kbd{C-k}.) A few commands treat a plain @kbd{C-u} differently from an ordinary argument. A few others may treat an argument of just a minus sign differently from an argument of @minus{}1. These unusual cases are -described when they come up; they are always for reasons of -convenience of use of the individual command, and they are documented -in the command's documentation string. - - You can use a numeric argument to insert multiple copies of a -character. This is straightforward unless the character is a digit; for -example, @kbd{C-u 6 4 a} inserts 64 copies of the character @samp{a}. -But this does not work for inserting digits; @kbd{C-u 6 4 1} specifies -an argument of 641, rather than inserting anything. To separate the -digit to insert from the argument, type another @kbd{C-u}; for example, -@kbd{C-u 6 4 C-u 1} does insert 64 copies of the character @samp{1}. - - We use the term ``prefix argument'' as well as ``numeric argument'' to -emphasize that you type the argument before the command, and to -distinguish these arguments from minibuffer arguments that come after -the command. +described when they come up; they exist to make an individual command +more convenient, and they are documented in that command's +documentation string. + + You can use a numeric argument before a self-inserting character to +insert multiple copies of it. This is straightforward when the +character is not a digit; for example, @kbd{C-u 6 4 a} inserts 64 +copies of the character @samp{a}. But this does not work for +inserting digits; @kbd{C-u 6 4 1} specifies an argument of 641. You +can separate the argument from the digit to insert with another +@kbd{C-u}; for example, @kbd{C-u 6 4 C-u 1} does insert 64 copies of +the character @samp{1}. + + We use the term ``prefix argument'' as well as ``numeric argument'', +to emphasize that you type these argument before the command, and to +distinguish them from minibuffer arguments that come after the +command. @node Repeating @section Repeating a Command @@ -749,8 +749,8 @@ the command. with @kbd{M-x @var{command-name} @key{RET}}, can be repeated by invoking them with a numeric argument that serves as a repeat count (@pxref{Arguments}). However, if the command you want to repeat -prompts for some input, or uses a numeric argument in another way, -repetition using a numeric argument might be problematical. +prompts for input, or uses a numeric argument in another way, that +method won't work. @kindex C-x z @findex repeat diff --git a/man/building.texi b/man/building.texi index 82dd4cb7d46..b55fc1e47c6 100644 --- a/man/building.texi +++ b/man/building.texi @@ -599,8 +599,9 @@ Set a breakpoint on the source line that point is on. @kindex C-x C-a @r{(GUD)} Here are the other special commands provided by GUD@. The keys starting with @kbd{C-c} are available only in the GUD interaction -buffer. The key bindings that start with @kbd{C-x C-a} are available in -the GUD interaction buffer and also in source files. +buffer. The key bindings that start with @kbd{C-x C-a} are available +in the GUD interaction buffer and also in source files. Some of these +commands are not available to all the supported debuggers. @table @kbd @item C-c C-l @@ -631,6 +632,14 @@ at full speed (@code{gud-next}). @findex gud-stepi Execute a single machine instruction (@code{gud-stepi}). +@item C-c C-p +@kindex C-c C-p @r{(GUD)} +@itemx C-x C-a C-p +@findex gud-print +Evaluate the expression at point (@code{gud-print}). If Emacs +does not print the exact expression that you want, mark it as a region +first. + @need 3000 @item C-c C-r @kindex C-c C-r @r{(GUD)} @@ -656,12 +665,7 @@ buffer, it applies to the line where the program last stopped. Set a temporary breakpoint on the current source line, if any (@code{gud-tbreak}). If you use this command in the GUD interaction buffer, it applies to the line where the program last stopped. -@end table - - The above commands are common to all supported debuggers. If you are -using GDB or (some versions of) DBX, these additional commands are available: -@table @kbd @item C-c < @kindex C-c < @r{(GUD)} @itemx C-x C-a < @@ -675,16 +679,6 @@ equivalent to the GDB command @samp{up}. @findex gud-down Select the next inner stack frame (@code{gud-down}). This is equivalent to the GDB command @samp{down}. -@end table - - If you are using GDB, these additional key bindings are available: - -@table @kbd -@item C-c C-r -@kindex C-c C-r @r{(GUD)} -@itemx C-x C-a C-r -@findex gud-run -Start execution of the program (@code{gud-run}). @item C-c C-u @kindex C-c C-u @r{(GUD)} @@ -695,19 +689,17 @@ program will run until it hits a breakpoint, terminates, gets a signal that the debugger is checking for, or reaches the line on which the cursor currently sits. -@item @key{TAB} -@kindex TAB @r{(GUD)} -@findex gud-gdb-complete-command -With GDB, complete a symbol name (@code{gud-gdb-complete-command}). -This key is available only in the GUD interaction buffer. - @item C-c C-f @kindex C-c C-f @r{(GUD)} @itemx C-x C-a C-f @findex gud-finish Run the program until the selected stack frame returns or stops for some other reason (@code{gud-finish}). +@end table + If you are using GDB, these additional key bindings are available: + +@table @kbd @item C-x C-a C-j @kindex C-x C-a C-j @r{(GUD)} @findex gud-jump @@ -718,6 +710,12 @@ command. If the new execution line is in a different function from the previously one, GDB prompts for confirmation since the results may be bizarre. See the GDB manual entry regarding @code{jump} for details. + +@item @key{TAB} +@kindex TAB @r{(GUD)} +@findex gud-gdb-complete-command +With GDB, complete a symbol name (@code{gud-gdb-complete-command}). +This key is available only in the GUD interaction buffer. @end table These commands interpret a numeric argument as a repeat count, when @@ -809,20 +807,9 @@ Fully qualified class name derived from the expression surrounding point interface, using Emacs windows for display program state information. In effect, this makes Emacs into an IDE (interactive development environment). With it, you do not need to use textual GDB commands; -you can control the debugging session with the mouse. - -@c @findex gdb-mouse-set-clear-breakpoint -@c @findex gdb-mouse-toggle-breakpoint - For example, you can click @kbd{Mouse-1} in the fringe or display -margin of a source buffer to set a breakpoint there and, on a -graphical display, a red bullet will appear on that line. If a -breakpoint already exists on that line, the same click will remove it. -You can also enable or disable a breakpoint by clicking @kbd{Mouse-3} -on the bullet. If you drag the debugger arrow in the fringe with -@kbd{Mouse-1} (@code{gdb-mouse-until}), execution will continue to the -line where you release the button, provided it is still in the same -frame. Alternatively, you can click @kbd{Mouse-2} at some point in -the fringe of this buffer and execution will advance to there. +you can control the debugging session with the mouse. For example, +you can click in the fringe of a source buffer to set a breakpoint +there, or on a stack frame in the stack buffer to select that frame. This mode requires telling GDB that its ``screen size'' is unlimited, so it sets the height and width accordingly. For correct @@ -841,9 +828,11 @@ that way, you can use @kbd{M-x gdba} to invoke GDB in graphical mode. * GDB User Interface Layout:: Control the number of displayed buffers. * Breakpoints Buffer:: A breakpoint control panel. * Stack Buffer:: Select a frame from the call stack. -* Watch Expressions:: Monitor variable values in the speedbar. * Other GDB User Interface Buffers:: Input/output, locals, registers, assembler, threads and memory buffers. +* GDB commands in the Fringe:: Use the mouse in the fringe/margin to + control your program. +* Watch Expressions:: Monitor variable values in the speedbar. @end menu @node GDB User Interface Layout @@ -960,62 +949,6 @@ frame and type @key{RET} (@code{gdb-frames-select}), or click selecting a stack frame updates it to display the local variables of the new frame. -@node Watch Expressions -@subsubsection Watch Expressions -@cindex Watching expressions in GDB - -@findex gud-watch -@kindex C-x C-a C-w @r{(GUD)} - If you want to see how a variable changes each time your program -stops, move point into the variable name and click on the watch icon -in the tool bar (@code{gud-watch}) or type @kbd{C-x C-a C-w}. If you -specify a prefix argument, you can enter the variable name in the -minibuffer. - - Each watch expression is displayed in the speedbar. Complex data -types, such as arrays, structures and unions are represented in a tree -format. Leaves and simple data types show the name of the expression -and its value and, when the speedbar frame is selected, display the -type as a tooltip. Higher levels show the name, type and address -value for pointers and just the name and type otherwise. Root expressions -also display the frame address as a tooltip to help identify the frame -in which they were defined. - - To expand or contract a complex data type, click @kbd{Mouse-2} -on the tag to the left of the expression. - -@kindex D @r{(GDB speedbar)} -@findex gdb-var-delete - To delete a complex watch expression, move point to the root -expression in the speedbar and type @kbd{D} (@code{gdb-var-delete}). - -@kindex RET @r{(GDB speedbar)} -@findex gdb-edit-value - To edit a variable with a simple data type, or a simple element of a -complex data type, move point there in the speedbar and type @key{RET} -(@code{gdb-edit-value}). Or you can click @kbd{Mouse-2} on a value to -edit it. Either way, this reads the new value using the minibuffer. - -@vindex gdb-show-changed-values - If you set the variable @code{gdb-show-changed-values} to -non-@code{nil} (the default value), Emacs uses -@code{font-lock-warning-face} to highlight values that have recently -changed and @code{shadow} face to make variables which have gone out of -scope less noticeable. When a variable goes out of scope you can't -edit its value. - -@vindex gdb-use-colon-colon-notation - If the variable @code{gdb-use-colon-colon-notation} is -non-@code{nil}, Emacs uses the @samp{@var{function}::@var{variable}} -format. This allows the user to display watch expressions which share -the same variable name. The default value is @code{nil}. - -@vindex gdb-speedbar-auto-raise -To automatically raise the speedbar every time the display of watch -expressions updates, set @code{gdb-speedbar-auto-raise} to -non-@code{nil}. This can be useful if you are debugging with a full -screen Emacs frame. - @node Other GDB User Interface Buffers @subsubsection Other Buffers @@ -1078,9 +1011,107 @@ Click @kbd{Mouse-1} on the appropriate part of the header line to change the starting address or number of data items that the buffer displays. Click @kbd{Mouse-3} on the header line to select the display format or unit size for these data items. +@end table + +@node GDB commands in the Fringe +@subsubsection GDB commands in the Fringe +@cindex GDB commands in the Fringe + +@c @findex gdb-mouse-set-clear-breakpoint +@c @findex gdb-mouse-toggle-breakpoint +Many GDB commands can be entered using keybindings or the tool bar but +sometimes it is quicker to use the fringe. These commands either +manipulate breakpoints or control program execution. When there is no +fringe, you can use the margin but this is only present when the +source file already has a breakpoint. + +You can click @kbd{Mouse-1} in the fringe or display margin of a +source buffer to set a breakpoint there and, on a graphical display, a +red bullet will appear on that line. If a breakpoint already exists +on that line, the same click will remove it. You can also enable or +disable a breakpoint by clicking @kbd{C-Mouse-1} on the bullet. + +If you drag the debugger arrow in the fringe with @kbd{Mouse-1} +(@code{gdb-mouse-until}), execution will continue to the line where +you release the button, provided it is still in the same frame. +Alternatively, you can click @kbd{Mouse-3} at some point in the fringe +of this buffer and execution will advance to there. A similar command +(@code{gdb-mouse-jump}) allows you to jump to a source line without +executing the intermediate lines by clicking @kbd{C-Mouse-3}. This +command allows you to go backwards which can be useful for running +through code that has already executed, in order to examine its +execution in more detail. + +@table @kbd +@item Mouse-1 +Set or clear a breakpoint. + +@item C-Mouse-1 +Enable or disable a breakpoint. +@item Mouse-3 +Continue execution to here. + +@item C-Mouse-3 +Jump to here. @end table +@node Watch Expressions +@subsubsection Watch Expressions +@cindex Watching expressions in GDB + +@findex gud-watch +@kindex C-x C-a C-w @r{(GUD)} + If you want to see how a variable changes each time your program +stops, move point into the variable name and click on the watch icon +in the tool bar (@code{gud-watch}) or type @kbd{C-x C-a C-w}. If you +specify a prefix argument, you can enter the variable name in the +minibuffer. + + Each watch expression is displayed in the speedbar. Complex data +types, such as arrays, structures and unions are represented in a tree +format. Leaves and simple data types show the name of the expression +and its value and, when the speedbar frame is selected, display the +type as a tooltip. Higher levels show the name, type and address +value for pointers and just the name and type otherwise. Root expressions +also display the frame address as a tooltip to help identify the frame +in which they were defined. + + To expand or contract a complex data type, click @kbd{Mouse-2} +on the tag to the left of the expression. + +@kindex D @r{(GDB speedbar)} +@findex gdb-var-delete + To delete a complex watch expression, move point to the root +expression in the speedbar and type @kbd{D} (@code{gdb-var-delete}). + +@kindex RET @r{(GDB speedbar)} +@findex gdb-edit-value + To edit a variable with a simple data type, or a simple element of a +complex data type, move point there in the speedbar and type @key{RET} +(@code{gdb-edit-value}). Or you can click @kbd{Mouse-2} on a value to +edit it. Either way, this reads the new value using the minibuffer. + +@vindex gdb-show-changed-values + If you set the variable @code{gdb-show-changed-values} to +non-@code{nil} (the default value), Emacs uses +@code{font-lock-warning-face} to highlight values that have recently +changed and @code{shadow} face to make variables which have gone out of +scope less noticeable. When a variable goes out of scope you can't +edit its value. + +@vindex gdb-use-colon-colon-notation + If the variable @code{gdb-use-colon-colon-notation} is +non-@code{nil}, Emacs uses the @samp{@var{function}::@var{variable}} +format. This allows the user to display watch expressions which share +the same variable name. The default value is @code{nil}. + +@vindex gdb-speedbar-auto-raise +To automatically raise the speedbar every time the display of watch +expressions updates, set @code{gdb-speedbar-auto-raise} to +non-@code{nil}. This can be useful if you are debugging with a full +screen Emacs frame. + @node Executing Lisp @section Executing Lisp Expressions diff --git a/man/cc-mode.texi b/man/cc-mode.texi index 83ed16459aa..699283528a9 100644 --- a/man/cc-mode.texi +++ b/man/cc-mode.texi @@ -507,7 +507,7 @@ indents nested code. To set this value to 6, customize @item The (indentation) style The basic ``shape'' of indentation created by @ccmode{}---by default, this is @code{gnu} style (except for Java and AWK buffers). A list of -the availables styles and their descriptions can be found in +the available styles and their descriptions can be found in @ref{Built-in Styles}. A complete specification of the @ccmode{} style system, including how to create your own style, can be found in the chapter @ref{Styles}. To set your style to @code{linux}, either @@ -672,7 +672,7 @@ This command indents the current line. That is all you need to know about it for normal use. @code{c-indent-command} does different things, depending on the -settting of @code{c-syntactic-indentation} (@pxref{Indentation Engine +setting of @code{c-syntactic-indentation} (@pxref{Indentation Engine Basics}): @itemize @bullet @@ -2128,7 +2128,7 @@ escaped newline. The @samp{\} is highlighted. @chapter Configuration Basics @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -@cindex Emacs Initiliazation File +@cindex Emacs Initialization File @cindex Configuration You configure @ccmode{} by setting Lisp variables and calling (and perhaps writing) Lisp functions@footnote{DON'T PANIC!!! This isn't @@ -2914,7 +2914,7 @@ variable@footnote{In versions before 5.26, this variable was called @ccmode{} still uses the value on that variable if it's set.} is used then as the comment prefix. It defaults to @samp{* }@footnote{Actually, this default setting of -@code{c-block-comment-prefix} typically gets overriden by the default +@code{c-block-comment-prefix} typically gets overridden by the default style @code{gnu}, which sets it to blank. You can see the line splitting effect described here by setting a different style, e.g. @code{k&r} @xref{Choosing a Style}.}, which makes a comment @@ -3209,7 +3209,7 @@ Syntactic symbols aren't the only place where you can customize that @var{action}s are usually a list containing some combination of the symbols @code{before} and @code{after} (@pxref{Hanging Braces}). For more flexibility, you can instead specify brace ``hanginess'' by -giving a synctactic symbol an @dfn{action function} in +giving a syntactic symbol an @dfn{action function} in @code{c-hanging-braces-alist}; this function determines the ``hanginess'' of a brace, usually by looking at the code near it. @@ -4024,7 +4024,7 @@ The line is nested inside a class definition. @ref{Class Symbols}. @item cpp-macro The start of a preprocessor macro definition. @ref{Literal Symbols}. @item cpp-define-intro -The first line inside a multiline preproprocessor macro if +The first line inside a multiline preprocessor macro if @code{c-syntactic-indentation-in-macros} is set. @ref{Multiline Macro Symbols}. @item cpp-macro-cont @@ -5311,7 +5311,7 @@ meaning ``this function is inappropriate in this case - try a different one''. @xref{c-offsets-alist}. The subsections below describe all the standard line-up functions, -categorized by the sort of token the lining-up centres around. For +categorized by the sort of token the lining-up centers around. For each of these functions there is a ``works with'' list that indicates which syntactic symbols the function is intended to be used with. @@ -6433,7 +6433,7 @@ functions to this hook, not remove them. @xref{Style Variables}. @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! Normally, the lines in a multi-line macro are indented relative to -eachother as though they were code. You can suppress this behaviour +each other as though they were code. You can suppress this behaviour by setting the following user option: @defopt c-syntactic-indentation-in-macros diff --git a/man/custom.texi b/man/custom.texi index 78a51716031..fc9fb51c0d6 100644 --- a/man/custom.texi +++ b/man/custom.texi @@ -2111,10 +2111,10 @@ for more information about compiling Emacs Lisp programs. If you are going to write actual Emacs Lisp programs that go beyond minor customization, you should read the @cite{Emacs Lisp Reference Manual}. -@ifinfo +@ifnottex @xref{Top, Emacs Lisp, Emacs Lisp, elisp, the Emacs Lisp Reference Manual}. -@end ifinfo +@end ifnottex @menu * Init Syntax:: Syntax of constants in Emacs Lisp. diff --git a/man/dired-x.texi b/man/dired-x.texi index 54069716797..157ec168d8c 100644 --- a/man/dired-x.texi +++ b/man/dired-x.texi @@ -94,7 +94,7 @@ notice identical to this one except for the removal of this paragraph @page -@ifinfo +@ifnottex @node Top @comment node-name, next, previous, up @@ -145,7 +145,7 @@ For @file{dired-x.el} revision 2 @end menu -@end ifinfo +@end ifnottex @node Introduction, Installation, Top, Top @comment node-name, next, previous, up @@ -162,12 +162,12 @@ the code using @code{gmhist} history functions was replaced with code using the mini-buffer history now built into GNU Emacs. Finally, a few other features have been added and a few more functions have been bound to keys. -@ifinfo +@ifnottex @menu * Features:: * Technical Details:: @end menu -@end ifinfo +@end ifnottex @node Features, Technical Details, , Introduction @comment node-name, next, previous, up @@ -279,12 +279,12 @@ initialization file @file{default.el} in the @file{site-lisp} directory, put This will load @file{dired-x.el} when Dired is first invoked (for example, when you first type @kbd{C-x d}). -@ifinfo +@ifnottex @menu * Optional Installation Dired Jump:: * Optional Installation File At Point:: @end menu -@end ifinfo +@end ifnottex @node Optional Installation Dired Jump, Optional Installation File At Point, , Installation @comment node-name, next, previous, up @@ -409,13 +409,13 @@ In order to make Dired Omit work you first need to load @file{dired-x.el} inside @code{dired-load-hook} (@pxref{Installation}) and then evaluate @code{(dired-omit-mode 1)} in some way (@pxref{Omitting Variables}). -@ifinfo +@ifnottex @menu * Omitting Variables:: * Omitting Examples:: * Omitting Technical:: @end menu -@end ifinfo +@end ifnottex @node Omitting Variables, Omitting Examples, , Omitting Files in Dired @comment node-name, next, previous, up @@ -839,13 +839,13 @@ Flag all files with a certain extension for deletion. A @samp{.} is @emph{not} automatically prepended to the string entered. @end table -@ifinfo +@ifnottex @menu * Advanced Cleaning Functions:: * Advanced Cleaning Variables:: * Special Marking Function:: @end menu -@end ifinfo +@end ifnottex @node Advanced Cleaning Functions, Advanced Cleaning Variables, , Advanced Mark Commands @comment node-name, next, previous, up diff --git a/man/dired.texi b/man/dired.texi index 1e3582bebb0..9bb57b38279 100644 --- a/man/dired.texi +++ b/man/dired.texi @@ -96,8 +96,8 @@ so common in Dired that it deserves to be easy to type.) @key{DEL} (move up and unflag) is often useful simply for moving up. @findex dired-goto-file -@kindex M-g @r{(Dired)} - @kbd{M-g} (@code{dired-goto-file}) moves point to the line that +@kindex j @r{(Dired)} + @kbd{j} (@code{dired-goto-file}) moves point to the line that describes a specified file or directory. Some additional navigation commands are available when the Dired diff --git a/man/ediff.texi b/man/ediff.texi index 3179447fd9a..c9778ce90f9 100644 --- a/man/ediff.texi +++ b/man/ediff.texi @@ -135,7 +135,7 @@ The architecture and the interface are, of course, drastically different. @chapter Major Entry Points When Ediff starts up, it displays a small control window, which accepts the -Ediff commands and two or three windows displaying the files to be compared +Ediff commands, and two or three windows displaying the files to be compared or merged. The control window can be in its own small frame or it can be part of a bigger frame that displays other buffers. In any case, it is important that the control window be active (i.e., be the one receiving the @@ -829,7 +829,7 @@ identical to its default setting, as originally decided by Ediff. For instance, if Ediff is merging according to the `combined' policy, then the merge region is skipped over if it is different from the combination of the regions in buffers A and B. (Warning: swapping buffers A and B will confuse -things in this respect). If the merge region is marked as `prefer-A' then +things in this respect.) If the merge region is marked as `prefer-A' then this region will be skipped if it differs from the current difference region in buffer A, etc. @@ -1455,7 +1455,7 @@ the control frame. To start Ediff with an iconified Control Panel, you should set this variable to @code{t} and @code{ediff-prefer-long-help-message} to @code{nil} (@pxref{Quick Help Customization}). This behavior is useful -only if icons are allowed to accept keybord input (which depend on the +only if icons are allowed to accept keyboard input (which depends on the window manager and other factors). @end table @@ -1599,8 +1599,6 @@ problem. @vindex ediff-ignore-case Finally, Ediff can be told to ignore the case of the letters. This behavior can be toggled with @kbd{#c} and it is controlled with three variables: -Toggle case sensitivity in the diff program. All diffs are recomputed. -Case sensitivity is controlled by the variables @code{ediff-ignore-case-option}, @code{ediff-ignore-case-option3}, and @code{ediff-ignore-case}. @@ -1682,7 +1680,7 @@ Ediff uses faces to highlight differences. @item ediff-highlight-all-diffs @vindex ediff-highlight-all-diffs -Indicates whether---on a windowind display---Ediff should highlight +Indicates whether---on a windowing display---Ediff should highlight differences using inserted strings (as on text-only terminals) or using colors and highlighting. Normally, Ediff highlights all differences, but the selected difference is highlighted more visibly. One can cycle through @@ -1721,7 +1719,7 @@ some Lisp code in @file{~/.emacs}. For instance, @end example @noindent -would use the pre-defined fase @code{bold-italic} to highlight the current +would use the pre-defined face @code{bold-italic} to highlight the current difference region in buffer A (this face is not a good choice, by the way). If you are unhappy with just @emph{some} of the aspects of the default diff --git a/man/emacs-mime.texi b/man/emacs-mime.texi index aec55bd9a01..9ce7e168dcf 100644 --- a/man/emacs-mime.texi +++ b/man/emacs-mime.texi @@ -323,7 +323,7 @@ you could say something like: @end lisp Adding @code{"image/.*"} might also be useful. Spammers use images as -the prefered part of @samp{multipart/alternative} messages, so you might +the preferred part of @samp{multipart/alternative} messages, so you might not notice there are other parts. See also @code{gnus-buttonized-mime-types}, @ref{MIME Commands, ,MIME Commands, gnus, Gnus Manual}. After adding @code{"multipart/alternative"} to diff --git a/man/emacs.texi b/man/emacs.texi index 94ec0cc52a6..fe95b74e759 100644 --- a/man/emacs.texi +++ b/man/emacs.texi @@ -1227,9 +1227,9 @@ modification follow. @iftex @unnumberedsec TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION @end iftex -@ifinfo +@ifnottex @center TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION -@end ifinfo +@end ifnottex @enumerate 0 @item @@ -1452,9 +1452,9 @@ of promoting the sharing and reuse of software generally. @iftex @heading NO WARRANTY @end iftex -@ifinfo +@ifnottex @center NO WARRANTY -@end ifinfo +@end ifnottex @item BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY @@ -1482,9 +1482,9 @@ POSSIBILITY OF SUCH DAMAGES. @iftex @heading END OF TERMS AND CONDITIONS @end iftex -@ifinfo +@ifnottex @center END OF TERMS AND CONDITIONS -@end ifinfo +@end ifnottex @page @unnumberedsec How to Apply These Terms to Your New Programs diff --git a/man/erc.texi b/man/erc.texi index b1bea814168..cc264aa4127 100644 --- a/man/erc.texi +++ b/man/erc.texi @@ -561,7 +561,7 @@ questions. ERC was originally written by Alexander L. Belikoff @email{abel@@bfr.co.il} and Sergey Berezin @email{sergey.berezin@@cs.cmu.edu}. They stopped development around -december 1999. Their last released version was ERC 2.0. +December 1999. Their last released version was ERC 2.0. P.S.: If one of the original developers of ERC reads this, we'd like to receive additional information for this file and hear comments in @@ -580,12 +580,12 @@ there. The thing is, I do not have free time and enough incentive anymore to work on ERC, so I would be happy if you guys take over the project entirely." -So we happily hacked away on ERC, and soon after (september 2001) +So we happily hacked away on ERC, and soon after (September 2001) released the next "stable" version, 2.1. -Most of the development of the new ERC happend on #emacs on +Most of the development of the new ERC happened on #emacs on irc.openprojects.net. Over time, many people contributed code, ideas, -bugfixes. And not to forget alot of alpha/beta/gamma testing. +bugfixes. And not to forget a lot of alpha/beta/gamma testing. See the @file{CREDITS} file for a list of contributors. diff --git a/man/eshell.texi b/man/eshell.texi index 51f3fb8ae7a..ea603daee7f 100644 --- a/man/eshell.texi +++ b/man/eshell.texi @@ -848,7 +848,7 @@ a file in the Windows Explorer). It would move point to the end of the buffer, and then turns on auto-revert mode in that buffer at frequent intervals---and a -@command{head} alias which assums an upper limit of +@command{head} alias which assumes an upper limit of @code{eshell-maximum-line-length} characters per line. @item Make @command{dgrep} load @code{dired}, mark everything, then invoke @code{dired-do-search} diff --git a/man/eudc.texi b/man/eudc.texi index 3a1f93dec7c..b23cada3ac8 100644 --- a/man/eudc.texi +++ b/man/eudc.texi @@ -94,7 +94,7 @@ LDAP, Lightweight Directory Access Protocol @item CCSO PH/QI @item -BBDB, Big Brother's Insiduous Database +BBDB, Big Brother's Insidious Database @end itemize The main features of the EUDC interface are: @@ -179,7 +179,7 @@ EUDC. @comment node-name, next, previous, up @section BBDB -BBDB is the @dfn{Big Brother's Insiduous Database}, a package for Emacs +BBDB is the @dfn{Big Brother's Insidious Database}, a package for Emacs originally written by Jamie Zawinski which provides rolodex-like database functionality featuring tight integration with the Emacs mail and news readers. diff --git a/man/files.texi b/man/files.texi index 6f38f18b1cb..3eb413b4687 100644 --- a/man/files.texi +++ b/man/files.texi @@ -261,17 +261,17 @@ copies the file into the displayed directory. For details, see you had visited an existing empty file. If you make any changes and save them, the file is created. - Emacs recognizes from the contents of a file which convention it uses -to separate lines---newline (used on GNU/Linux and on Unix), -carriage-return linefeed (used on Microsoft systems), or just -carriage-return (used on the Macintosh)---and automatically converts the -contents to the normal Emacs convention, which is that the newline -character separates lines. This is a part of the general feature of -coding system conversion (@pxref{Coding Systems}), and makes it possible -to edit files imported from different operating systems with -equal convenience. If you change the text and save the file, Emacs -performs the inverse conversion, changing newlines back into -carriage-return linefeed or just carriage-return if appropriate. + Emacs recognizes from the contents of a file which end-of-line +convention it uses to separate lines---newline (used on GNU/Linux and +on Unix), carriage-return linefeed (used on Microsoft systems), or +just carriage-return (used on the Macintosh)---and automatically +converts the contents to the normal Emacs convention, which is that +the newline character separates lines. This is a part of the general +feature of coding system conversion (@pxref{Coding Systems}), and +makes it possible to edit files imported from different operating +systems with equal convenience. If you change the text and save the +file, Emacs performs the inverse conversion, changing newlines back +into carriage-return linefeed or just carriage-return if appropriate. @vindex find-file-run-dired If the file you specify is actually a directory, @kbd{C-x C-f} invokes @@ -2333,8 +2333,10 @@ diff-mode}. One general feature of Diff mode is that manual edits to the patch automatically correct line numbers, including those in the hunk header, so that you can actually apply the edited patch. Diff mode -also provides the following commands to navigate, manipulate and apply -parts of patches: +treats each hunk location as an ``error message'', so that you can use +commands such as @kbd{C-x '} to visit the corresponding source +locations. It also provides the following commands to navigate, +manipulate and apply parts of patches: @table @kbd @item M-n diff --git a/man/fixit.texi b/man/fixit.texi index fed37ce9705..1d7c1b6eb41 100644 --- a/man/fixit.texi +++ b/man/fixit.texi @@ -267,9 +267,9 @@ case-convert it and go on typing. @xref{Case}.@refill This section describes the commands to check the spelling of a single word or of a portion of a buffer. These commands work with the spelling checker programs Aspell and Ispell, which are not part of Emacs. -@ifinfo +@ifnottex @xref{Top, Aspell,, aspell, The Aspell Manual}. -@end ifinfo +@end ifnottex @table @kbd @item M-x flyspell-mode diff --git a/man/frames.texi b/man/frames.texi index 227aab7559d..2b53bd58d2d 100644 --- a/man/frames.texi +++ b/man/frames.texi @@ -865,6 +865,8 @@ protocol, are currently supported. @section Menu Bars @cindex Menu Bar mode @cindex mode, Menu Bar +@findex menu-bar-mode +@vindex menu-bar-mode You can turn display of menu bars on or off with @kbd{M-x menu-bar-mode} or by customizing the variable @code{menu-bar-mode}. @@ -904,6 +906,8 @@ global tool bar. XPM icons if Emacs was built with XPM support. Otherwise, the tool bar uses monochrome icons (PBM or XBM format). +@findex tool-bar-mode +@vindex tool-bar-mode You can turn display of tool bars on or off with @kbd{M-x tool-bar-mode} or by customizing the option @code{tool-bar-mode}. diff --git a/man/gnus-faq.texi b/man/gnus-faq.texi index a85a36c2d22..e94036dc503 100644 --- a/man/gnus-faq.texi +++ b/man/gnus-faq.texi @@ -1,7 +1,7 @@ @c \input texinfo @c -*-texinfo-*- @c Uncomment 1st line before texing this file alone. @c %**start of header -@c Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +@c Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @c @c Do not modify this file, it was generated from gnus-faq.xml, available from @c <URL:http://my.gnus.org/FAQ/>. @@ -676,7 +676,7 @@ this (you don't really want to do this) add the following to @noindent You might have to tweak the values for stream and/or -authentification, see the Gnus manual node "Mail Source +authentication, see the Gnus manual node "Mail Source Specifiers" for possible values. If you want to use IMAP the way it's intended, you've got to @@ -1654,7 +1654,7 @@ by saying: @end example @noindent -in ~/.gnus.el. If you use Gnus 5.9 or ealier, you can use this +in ~/.gnus.el. If you use Gnus 5.9 or earlier, you can use this instead (works for newer versions a well): @example @@ -2164,10 +2164,7 @@ I need real-time help, where to find it? @subsubheading Answer -Point your IRC client to irc.my.gnus.org channel -#mygnus. Don't be afraid if people there speak German, -they are willing and capable of switching to -English when people from outside Germany enter. +Point your IRC client to irc.freenode.net, channel #gnus. @node FAQ 9 - Tuning Gnus @subsection Tuning Gnus diff --git a/man/gnus.texi b/man/gnus.texi index 9623bc468d9..91c223155b1 100644 --- a/man/gnus.texi +++ b/man/gnus.texi @@ -7377,7 +7377,7 @@ Save the current article using the default article saver @item O m @kindex O m (Summary) @findex gnus-summary-save-article-mail -Save the current article in mail format +Save the current article in a Unix mail box (mbox) file (@code{gnus-summary-save-article-mail}). @item O r @@ -7456,7 +7456,7 @@ files. @vindex gnus-default-article-saver You can customize the @code{gnus-default-article-saver} variable to make -Gnus do what you want it to. You can use any of the six ready-made +Gnus do what you want it to. You can use any of the eight ready-made functions below, or you can create your own. @table @code @@ -7497,6 +7497,13 @@ Append the article body to an ordinary file. Uses the function in the @code{gnus-file-save-name} variable to get a file name to save the article in. The default is @code{gnus-numeric-save-name}. +@item gnus-summary-write-body-to-file +@findex gnus-summary-write-body-to-file +Write the article body straight to an ordinary file. The file is +overwritten if it exists. Uses the function in the +@code{gnus-file-save-name} variable to get a file name to save the +article in. The default is @code{gnus-numeric-save-name}. + @item gnus-summary-save-in-folder @findex gnus-summary-save-in-folder @findex gnus-folder-save-name @@ -7516,6 +7523,31 @@ Save the article in a VM folder. You have to have the VM mail reader to use this setting. @end table +The symbol of each function may have the following properties: + +@table @code +@item :decode +The value non-@code{nil} means save decoded articles. This is +meaningful only with @code{gnus-summary-save-in-file}, +@code{gnus-summary-save-body-in-file}, +@code{gnus-summary-write-to-file}, and +@code{gnus-summary-write-body-to-file}. + +@item :function +The value specifies an alternative function which appends, not +overwrites, articles to a file. This implies that when saving many +articles at a time, @code{gnus-prompt-before-saving} is bound to +@code{t} and all articles are saved in a single file. This is +meaningful only with @code{gnus-summary-write-to-file} and +@code{gnus-summary-write-body-to-file}. + +@item :headers +The value specifies the symbol of a variable of which the value +specifies headers to be saved. If it is omitted, +@code{gnus-save-all-headers} and @code{gnus-saved-headers} control what +headers should be saved. +@end table + @vindex gnus-article-save-directory All of these functions, except for the last one, will save the article in the @code{gnus-article-save-directory}, which is initialized from the @@ -12660,8 +12692,8 @@ server: @vindex nntp-server-opened-hook @cindex @sc{mode reader} @cindex authinfo -@cindex authentification -@cindex nntp authentification +@cindex authentication +@cindex nntp authentication @findex nntp-send-authinfo @findex nntp-send-mode-reader is run after a connection has been made. It can be used to send @@ -16397,7 +16429,7 @@ articles stand out, just like ticked articles, in other @acronym{IMAP} clients. (In other words, Gnus has two ``Tick'' marks and @acronym{IMAP} has only one.) -Probably the only reason for frobing this would be if you're trying +Probably the only reason for frobbing this would be if you're trying enable per-user persistent dormant flags, using something like: @lisp @@ -20635,7 +20667,7 @@ really don't want to read what he's written: @example ((& ("from" "Lars Ingebrigtsen") - (1- ("from" "Reig Eigir Logge"))) + (1- ("from" "Reig Eigil Logge"))) -100000) @end example @@ -22569,7 +22601,7 @@ words or 3-word combinations thrown into the mix. Statistical analysis of spam works very well in most of the cases, but it can classify legitimate e-mail as spam in some cases. It takes time to run the analysis, the full message must be analyzed, and the user has -to store the database of spam analyses. Statistical analysis on the +to store the database of spam analysis. Statistical analysis on the server is gaining popularity. This has the advantage of letting the user Just Read Mail, but has the disadvantage that it's harder to tell the server that it has misclassified mail. @@ -23972,7 +24004,7 @@ can be customized. @defvar spam-spamoracle-database By default, SpamOracle uses the file @file{~/.spamoracle.db} as a database to -store its analyses. This is controlled by the variable +store its analysis. This is controlled by the variable @code{spam-spamoracle-database} which defaults to @code{nil}. That means the default SpamOracle database will be used. In case you want your database to live somewhere special, set @@ -24080,7 +24112,7 @@ Add to @code{spam-registration-functions}. Write the register/unregister routines using the bogofilter register/unregister routines as a -start, or other restister/unregister routines more appropriate to +start, or other register/unregister routines more appropriate to Blackbox. @item @@ -24877,7 +24909,7 @@ decryption). @item PGP/MIME - RFC 2015/3156 RFC 2015 (superseded by 3156 which references RFC 2440 instead of RFC -1991) describes the @acronym{MIME}-wrapping around the RF 1991/2440 format. +1991) describes the @acronym{MIME}-wrapping around the RFC 1991/2440 format. Gnus supports both encoding and decoding. @item S/MIME - RFC 2633 @@ -26977,7 +27009,7 @@ A collection of messages in one file. The most common digest format is specified by RFC 1153. @item splitting -@cindex splitting, terminolgy +@cindex splitting, terminology @cindex mail sorting @cindex mail filtering (splitting) The action of sorting your emails according to certain rules. Sometimes diff --git a/man/idlwave.texi b/man/idlwave.texi index 8d77cab4baa..eb2f8619ad0 100644 --- a/man/idlwave.texi +++ b/man/idlwave.texi @@ -1133,7 +1133,7 @@ When you ask for routine information about an object method, and the method exists in several classes, IDLWAVE queries for the class of the object, unless the class is already known through a text property on the @samp{->} operator (@pxref{Object Method Completion and Class -Ambiguity}), or by having been explicity included in the call +Ambiguity}), or by having been explicitly included in the call (e.g. @code{a->myclass::Foo}). @cindex Calling sequences @@ -1185,7 +1185,7 @@ will automatically split into the next two. @item @i{Other} @tab Any other routine with a file not known to be on the search path. @item @i{Unresolved} -@tab An otherwise unkown routine the shell lists as unresolved +@tab An otherwise unknown routine the shell lists as unresolved (referenced, but not compiled). @end multitable @@ -1779,12 +1779,12 @@ entire class inheritance chain. This is often referred to as @emph{chaining}, and is characterized by chained method calls like @w{@code{self->MySuperClass::SetProperty,_EXTRA=e}}. -IDLWAVE can accomodate this special synergy between class and keyword +IDLWAVE can accommodate this special synergy between class and keyword inheritance: if @code{_EXTRA} or @code{_REF_EXTRA} is detected among a method's keyword parameters, all keywords of superclass versions of the method being considered can be included in completion. There is of course no guarantee that this type of keyword chaining actually -occurrs, but for some methods it's a very convenient assumption. The +occurs, but for some methods it's a very convenient assumption. The variable @code{idlwave-keyword-class-inheritance} can be used to configure which methods have keyword inheritance treated in this simple, class-driven way. By default, only @code{Init} and @@ -2207,7 +2207,7 @@ operators (outside of strings and comments, of course), try this in Note that the modified assignment operators which begin with a word (@samp{AND=}, @samp{OR=}, @samp{NOT=}, etc.) require a leading space to -be recognized (e.g @code{vAND=4} would be intepreted as a variable +be recognized (e.g @code{vAND=4} would be interpreted as a variable @code{vAND}). Also note that, since e.g., @code{>} and @code{>=} are both valid operators, it is impossible to surround both by blanks while they are being typed. Similarly with @code{&} and @code{&&}. For @@ -2811,7 +2811,7 @@ prefix arg of 1 (i.e. @kbd{C-1 C-c C-d C-b}), the breakpoint gets a With a numeric prefix greater than one (e.g. @kbd{C-4 C-c C-d C-b}), the breakpoint will only be active the @code{nth} time it is hit. With a single non-numeric prefix (i.e. @kbd{C-u C-c C-d C-b}), prompt -for a condition --- an IDL expression to be evaulated and trigger the +for a condition --- an IDL expression to be evaluated and trigger the breakpoint only if true. To clear the breakpoint in the current line, use @kbd{C-c C-d C-d} (@code{idlwave-clear-current-bp}). When executed from the shell window, the breakpoint where IDL is currently @@ -3068,7 +3068,7 @@ as it did with @kbd{C-u C-c C-d C-b}. You can toggle the electric debug mode at any time in a buffer using @kbd{C-c C-d C-v} (@kbd{v} to turn it off while in the mode), or from the Debug menu. Normally the mode will be enabled and disabled at the -appropriate times, but occassionally you might want to edit a file +appropriate times, but occasionally you might want to edit a file while still debugging it, or switch to the mode for conveniently setting lots of breakpoints. @@ -3136,7 +3136,7 @@ execution is stopped in a buffer due to a triggered breakpoint or error, or while composing a long command in the IDLWAVE shell. In the latter case, the command is sent to the shell and its output is visible, but point remains unmoved in the command being composed --- you can inspect -the contituents of a command you're building without interrupting the +the constituents of a command you're building without interrupting the process of building it! You can even print arbitrary expressions from older input or output further up in the shell window --- any expression, variable, number, or function you see can be examined. @@ -4266,7 +4266,7 @@ some browsers: @xref{HTML Help Browser Tips}. @item @strong{In the shell, my long commands are truncated at 256 characters!} This actually happens when running IDL in an XTerm as well. There are -a couple of work arounds: @code{define_key,/control,'^d'} (e.g. in +a couple of workarounds: @code{define_key,/control,'^d'} (e.g. in your @file{$IDL_STARTUP} file) will disable the @samp{EOF} character and give you a 512 character limit. You won't be able to use @key{C-d} to quit the shell, however. Another possibility is @@ -4281,7 +4281,7 @@ is loaded is one page off, e.g. for @code{CONVERT_COORD}, I get You have a mismatch between your help index and the HTML help package you downloaded. You need to ensure you download a ``downgrade kit'' if you are using anything older than the latest HTML help package. A new -help package apppears with each IDL release (assuming the documentation +help package appears with each IDL release (assuming the documentation is updated). Starting with IDL 6.2, the HTML help and its catalog are distributed with IDL, and so should never be inconsistent. diff --git a/man/indent.texi b/man/indent.texi index 319244bface..d5c69daa192 100644 --- a/man/indent.texi +++ b/man/indent.texi @@ -154,9 +154,9 @@ point, until it is underneath the next indentation point in the previous line. An indentation point is the end of a sequence of whitespace or the end of the line. If point is farther right than any indentation point in the previous line, @code{indent-relative} runs @code{tab-to-tab-stop} -@ifinfo +@ifnottex (@pxref{Tab Stops}), -@end ifinfo +@end ifnottex @iftex (see next section), @end iftex diff --git a/man/maintaining.texi b/man/maintaining.texi index 1307ce6a229..42af2f93aeb 100644 --- a/man/maintaining.texi +++ b/man/maintaining.texi @@ -355,9 +355,9 @@ the syntax of several languages, as described in @iftex the previous section. @end iftex -@ifinfo +@ifnottex @ref{Tag Syntax}. -@end ifinfo +@end ifnottex Here is how to run @code{etags}: @example diff --git a/man/mini.texi b/man/mini.texi index 4c3748a78f1..e0a851cfc9a 100644 --- a/man/mini.texi +++ b/man/mini.texi @@ -6,55 +6,53 @@ @chapter The Minibuffer @cindex minibuffer - The @dfn{minibuffer} is the facility used by Emacs commands to read -arguments more complicated than a single number. Minibuffer arguments -can be file names, buffer names, Lisp function names, Emacs command -names, Lisp expressions, and many other things, depending on the command -reading the argument. You can use the usual Emacs editing commands in -the minibuffer to edit the argument text. + The @dfn{minibuffer} is where Emacs commands read complicated +arguments (anything more a single number). We call it the +``minibuffer'' because it's a special-purpose buffer with a small +amount of screen space. Minibuffer arguments can be file names, +buffer names, Lisp function names, Emacs command names, Lisp +expressions, and many other things---whatever the command wants to +read. You can use the usual Emacs editing commands in the minibuffer +to edit the argument text. @cindex prompt - When the minibuffer is in use, it appears in the echo area, and the -terminal's cursor moves there. The beginning of the minibuffer line -displays a @dfn{prompt} in a special color, to say what kind of input -you should supply and how it will be used. Often this prompt is -derived from the name of the command that the argument is for. The -prompt normally ends with a colon. + When the minibuffer is in use, it appears in the echo area, with a +cursor. The minibuffer display starts with a @dfn{prompt} in a +distinct color; it says what kind of input is expected and how it will +be used. Often the prompt is derived from the name of the command +that is reading the argument. The prompt normally ends with a colon. @cindex default argument - Sometimes a @dfn{default argument} appears in parentheses before the -colon; it too is part of the prompt. The default will be used as the -argument value if you enter an empty argument (that is, just type -@key{RET}). For example, commands that read buffer names always show a -default, which is the name of the buffer that will be used if you type -just @key{RET}. - - The simplest way to enter a minibuffer argument is to type the text -you want, terminated by @key{RET} which exits the minibuffer. You can -cancel the command that wants the argument, and get out of the -minibuffer, by typing @kbd{C-g}. - - Since the minibuffer uses the screen space of the echo area, it can -conflict with other ways Emacs customarily uses the echo area. Here is how -Emacs handles such conflicts: + Sometimes a @dfn{default argument} appears in the prompt, inside +parentheses before the colon. The default will be used as the +argument value if you just type @key{RET}. For example, commands that +read buffer names show a buffer name as the default. You can type +@key{RET} to operate on that default buffer. + + The simplest way to enter a minibuffer argument is to type the text, +then @key{RET} to exit the minibuffer. You can cancel the minibuffer, +and the command that wants the argument, by typing @kbd{C-g}. + + Since the minibuffer appears in the echo area, it can conflict with +other uses of the echo area. Here is how Emacs handles such +conflicts: @itemize @bullet @item -If a command gets an error while you are in the minibuffer, this does -not cancel the minibuffer. However, the echo area is needed for the -error message and therefore the minibuffer itself is hidden for a -while. It comes back after a few seconds, or as soon as you type -anything. +An error occurs while the minibuffer is active. + +The error message hides the minibuffer for a few seconds, or until you +type something. Then the minibuffer comes back. @item -If in the minibuffer you use a command whose purpose is to display a -message in the echo area, such as @kbd{C-x =}, the message hides the -minibuffer for a while. The minibuffer contents come back after a few -seconds, or as soon as you type anything. +A command such as @kbd{C-x =} needs to display a message in the echo +area. + +The message hides the minibuffer for a few seconds, or until you type +something. Then the minibuffer comes back. @item -Echoing of keystrokes does not take place while the minibuffer is in -use. +Keystrokes don't echo while the minibuffer is in use. @end itemize @menu @@ -68,34 +66,32 @@ use. @node Minibuffer File @section Minibuffers for File Names - Sometimes the minibuffer starts out with text in it. For example, when -you are supposed to give a file name, the minibuffer starts out containing -the @dfn{default directory}, which ends with a slash. This is to inform -you which directory the file will be found in if you do not specify a -directory. + When you use the minibuffer to enter a file name, it starts out with +some initial text---the @dfn{default directory}, ending in a slash. +The file you specify will be in this directory unless you alter or +replace it. @c Separate paragraph to clean up ugly page break--rms @need 1500 - For example, the minibuffer might start out with these contents: + For example, if the minibuffer starts out with these contents: @example Find File: /u2/emacs/src/ @end example @noindent -where @samp{Find File:@: } is the prompt. Typing @kbd{buffer.c} as -input specifies the file @file{/u2/emacs/src/buffer.c}. To find files -in nearby directories, use @kbd{..}; thus, if you type -@kbd{../lisp/simple.el}, you will get the file named -@file{/u2/emacs/lisp/simple.el}. Alternatively, you can kill with -@kbd{M-@key{DEL}} the directory names you don't want (@pxref{Words}). - - If you don't want any of the default, you can kill it with @kbd{C-a -C-k}. But you don't need to kill the default; you can simply ignore it. -Insert an absolute file name, one starting with a slash or a tilde, -after the default directory. For example, to specify the file -@file{/etc/termcap}, just insert that name, giving these minibuffer -contents: +(where @samp{Find File:@: } is the prompt), and you type +@kbd{buffer.c} as input, that specifies the file +@file{/u2/emacs/src/buffer.c}. You can specify the parent directory +by adding @file{..}; thus, if you type @kbd{../lisp/simple.el}, you +will get @file{/u2/emacs/lisp/simple.el}. Alternatively, you can use +@kbd{M-@key{DEL}} to kill the directory names you don't want +(@pxref{Words}). + + You can kill it the entire default with @kbd{C-a C-k}, but there's +no need. You can simply ignore it and give an absolute file name +starting with a slash or a tilde after the default directory. For +example, to specify @file{/etc/termcap}, just type that name: @example Find File: /u2/emacs/src//etc/termcap @@ -106,59 +102,55 @@ Find File: /u2/emacs/src//etc/termcap @cindex double slash in file name @cindex slashes repeated in file name @findex file-name-shadow-mode -GNU Emacs gives a special meaning to a double slash (which is not -normally a useful thing to write): it means, ``ignore everything -before the second slash in the pair.'' Thus, @samp{/u2/emacs/src/} is -ignored in the example above, and you get the file -@file{/etc/termcap}. The ignored part of the file name is dimmed if -the terminal allows it; to disable this, turn off -@code{file-name-shadow-mode} minor mode. - - If you set @code{insert-default-directory} to @code{nil}, the +GNU Emacs interprets a double slash (which is not normally useful in +file names) as, ``ignore everything before the second slash in the +pair.'' In the example above. @samp{/u2/emacs/src/} is ignored, so +you get @file{/etc/termcap}. The ignored part of the file name is +dimmed if the terminal allows it; to disable this dimming, turn off +File Name Shadow mode (a minor mode) with the command +@kbd{M-x file-name-shadow-mode}. + + If the variable @code{insert-default-directory} is @code{nil}, the default directory is never inserted in the minibuffer---so the -minibuffer starts out empty. But the name you type, if relative, is -still interpreted with respect to the same default directory. +minibuffer starts out empty. Nonetheless, relative file name +arguments are still interpreted based on the same default directory. @node Minibuffer Edit @section Editing in the Minibuffer - The minibuffer is an Emacs buffer (albeit a peculiar one), and the usual -Emacs commands are available for editing the text of an argument you are -entering. + The minibuffer is an Emacs buffer (albeit a peculiar one), and the +usual Emacs commands are available for editing the argument text. Since @key{RET} in the minibuffer is defined to exit the minibuffer, you can't use it to insert a newline in the minibuffer. To do that, type @kbd{C-o} or @kbd{C-q C-j}. (The newline character is really the @acronym{ASCII} character control-J.) - The minibuffer has its own window, which normally has space on the -Emacs frame at all times, but it only acts like an Emacs window when -the minibuffer is really in use. At those times, its window is much -like any other Emacs window; you can switch from the minibuffer window -to another window with @kbd{C-x o}, and edit text in other windows, -before returning to the minibuffer to submit the argument. You can -kill text in another window, return to the minibuffer window, and then -yank the text to use it in the argument. @xref{Windows}. + The minibuffer has its own window, which normally has space in the +frame at all times, but it only acts like an Emacs window when the +minibuffer is active. When active, this window is much like any other +Emacs window; for instance, you can switch to another window (with +@kbd{C-x o}), edit text there, then return to the minibuffer window to +finish the argument. You can even kill text in another window, return +to the minibuffer window, and then yank the text into the argument. +@xref{Windows}. @cindex height of minibuffer @cindex size of minibuffer @cindex growing minibuffer @cindex resizing minibuffer - There are some restrictions on the use of the minibuffer window, -however. You cannot switch buffers in it---the minibuffer and its -window are permanently attached. Also, you cannot split or kill the -minibuffer window. But you can make it taller in the normal fashion -with @kbd{C-x ^}. + There are some restrictions on the minibuffer window, however: you +cannot kill it, or split it, or switch buffers in it---the minibuffer +and its window are permanently attached. @vindex resize-mini-windows The minibuffer window expands vertically as necessary to hold the text that you put in the minibuffer. If @code{resize-mini-windows} is -@code{t} (the default), the window is always resized to fit the size -of the text it displays. If its value is the symbol @code{grow-only}, -the window grows when the size of displayed text increases, but -shrinks (back to the normal size) only when the minibuffer becomes -inactive. If its value is @code{nil}, you have to adjust the height -yourself. +@code{t} (the default), the window always resizes as needed by its +contents. If its value is the symbol @code{grow-only}, the window +grows automatically as needed, but shrinks (back to the normal size) +only when the minibuffer becomes inactive. If its value is +@code{nil}, you have to adjust the height yourself. @vindex max-mini-window-height The variable @code{max-mini-window-height} controls the maximum @@ -167,52 +159,47 @@ specifies a fraction of the frame's height; an integer specifies the maximum number of lines; @code{nil} means do not resize the minibuffer window automatically. The default value is 0.25. - If, while in the minibuffer, you issue a command that displays help -text of any sort in another window, you can use the @kbd{C-M-v} -command while in the minibuffer to scroll the help text. -(@kbd{M-@key{PAGEUP}} and @kbd{M-@key{PAGEDOWN}} also operate on that -help text.) This lasts until you exit the minibuffer. This feature -is especially useful when you display a buffer listing possible + The @kbd{C-M-v} command in the minibuffer scrolls the help text from +commands that display help text of any sort in another window. +@kbd{M-@key{PAGEUP}} and @kbd{M-@key{PAGEDOWN}} also operate on that +help text. This is especially useful with long lists of possible completions. @xref{Other Window}. @vindex enable-recursive-minibuffers Emacs normally disallows most commands that use the minibuffer while -the minibuffer is active. This rule is to prevent recursive minibuffers -from confusing novice users. If you want to be able to use such -commands in the minibuffer, set the variable -@code{enable-recursive-minibuffers} to a non-@code{nil} value. +the minibuffer is active. (Entering the minibuffer from the +minibuffer can be confusing.) To allow such commands in the +minibuffer, set the variable @code{enable-recursive-minibuffers} to +@code{t}. @node Completion @section Completion @cindex completion - - For certain kinds of arguments, you can use @dfn{completion} to enter -the argument value. Completion means that you type part of the -argument, then Emacs visibly fills in the rest, or as much as -can be determined from the part you have typed. - - When completion is available, certain keys---@key{TAB}, @key{RET}, and -@key{SPC}---are rebound to complete the text in the minibuffer before point -into a longer string that it stands for, by matching it against a set of -@dfn{completion alternatives} provided by the command reading the -argument. @kbd{?} is defined to display a list of possible completions -of what you have inserted. - - For example, when @kbd{M-x} uses the minibuffer to read the name of -a command, it provides a list of all available Emacs command names to -complete against. The completion keys match the minibuffer text -against all the command names, find any additional name characters -implied by the ones already present in the minibuffer, and add those -characters to the ones you have given. This is what makes it possible -to type @kbd{M-x ins @key{SPC} b @key{RET}} instead of @kbd{M-x -insert-buffer @key{RET}} (for example). (@key{SPC} does not do -completion in reading file names, because it is common to use spaces -in file names on some systems.) - - Case is normally significant in completion, because it is significant -in most of the names that you can complete (buffer names, file names and -command names). Thus, @samp{fo} does not complete to @samp{Foo}. -Completion does ignore case distinctions for certain arguments in which + + Some arguments allow @dfn{completion} to enter their value. This +means that after you type part of the argument, Emacs can fill in the +rest, or some of it, based on what you have typed so far. + + When completion is available, certain keys---@key{TAB}, @key{RET}, +and @key{SPC}---are rebound to complete the text in the minibuffer +before point into a longer string chosen from a set of @dfn{completion +alternatives} provided by the command that requested the argument. +(@key{SPC} does not do completion in reading file names, because it is +common to use spaces in file names on some systems.) @kbd{?} displays +a list of the possible completions at any time. + + For example, @kbd{M-x} uses the minibuffer to read the name of a +command, so it provides a list of all Emacs command names for +completion candidates. The completion keys match the minibuffer text +against these candidates, find any additional name characters implied +by the the text already present in the minibuffer, and add those +characters. This makes it possible to type @kbd{M-x ins @key{SPC} b +@key{RET}} instead of @kbd{M-x insert-buffer @key{RET}}, for example. + + Case is significant in completion when it is significant in the +argument you are entering (buffer names, file names, command names, +for instance). Thus, @samp{fo} does not complete to @samp{Foo}. +Completion ignores case distinctions for certain arguments in which case does not matter. Completion acts only on the text before point. If there is text in @@ -230,42 +217,39 @@ typing some text into the minibuffer---it remains unchanged. @subsection Completion Example @kindex TAB @r{(completion)} -@findex minibuffer-complete - A concrete example may help here. If you type @kbd{M-x au @key{TAB}}, -the @key{TAB} looks for alternatives (in this case, command names) that -start with @samp{au}. There are several, including -@code{auto-fill-mode} and @code{auto-save-mode}---but they are all the -same as far as @code{auto-}, so the @samp{au} in the minibuffer changes -to @samp{auto-}.@refill - - If you type @key{TAB} again immediately, there are multiple -possibilities for the very next character---it could be any of -@samp{cfilrs}---so no more characters are added; instead, @key{TAB} -displays a list of all possible completions in another window. - - If you go on to type @kbd{f @key{TAB}}, this @key{TAB} sees -@samp{auto-f}. The only command name starting this way is -@code{auto-fill-mode}, so completion fills in the rest of that. You now -have @samp{auto-fill-mode} in the minibuffer after typing just @kbd{au -@key{TAB} f @key{TAB}}. Note that @key{TAB} has this effect because in -the minibuffer it is bound to the command @code{minibuffer-complete} -when completion is available. + A concrete example may help here. If you type @kbd{M-x au +@key{TAB}}, the @key{TAB} looks for alternatives (in this case, +command names) that start with @samp{au}. There are several, +including @code{auto-fill-mode} and @code{auto-save-mode}, but they +all begin with @code{auto-}, so the @samp{au} in the minibuffer +completes to @samp{auto-}. + + If you type @key{TAB} again immediately, it cannot determine the +next character; it could be any of @samp{cfilrs}. So it does not add +any characters; instead, @key{TAB} displays a list of all possible +completions in another window. + + Now type @kbd{f @key{TAB}}. This @key{TAB} sees @samp{auto-f}. The +only command name starting with that is @code{auto-fill-mode}, so +completion fills in the rest of that. You have been able to enter +@samp{auto-fill-mode} by typing just @kbd{au @key{TAB} f @key{TAB}}. @node Completion Commands @subsection Completion Commands Here is a list of the completion commands defined in the minibuffer -when completion is available. +when completion is allowed. @table @kbd @item @key{TAB} +@findex minibuffer-complete Complete the text before point in the minibuffer as much as possible (@code{minibuffer-complete}). @item @key{SPC} -Complete the minibuffer text before point, but don't go beyond one -word (@code{minibuffer-complete-word}). @key{SPC} for completion is -not available when entering a file name, since some users often put -spaces in filenames. +Complete up to one word from the minibuffer text before point +(@code{minibuffer-complete-word}). @key{SPC} for completion is not +available when entering a file name, since file names often include +spaces. @item @key{RET} Submit the text in the minibuffer as the argument, possibly completing first as described @@ -277,31 +261,30 @@ in the next node (@code{minibuffer-complete-and-exit}). @xref{Strict Completion}. @end ifnottex @item ? -Display a list of all possible completions of the text in the minibuffer +Display a list of possible completions of the text before point (@code{minibuffer-completion-help}). @end table @kindex SPC @findex minibuffer-complete-word - @key{SPC} completes much like @key{TAB}, but never goes beyond the -next hyphen or space. If you have @samp{auto-f} in the minibuffer and -type @key{SPC}, it finds that the completion is @samp{auto-fill-mode}, -but it stops completing after @samp{fill-}. This gives -@samp{auto-fill-}. Another @key{SPC} at this point completes all the -way to @samp{auto-fill-mode}. The command that implements this -behavior is called @code{minibuffer-complete-word}. + @key{SPC} completes like @key{TAB}, but only up to the next hyphen +or space. If you have @samp{auto-f} in the minibuffer and type +@key{SPC}, it finds that the completion is @samp{auto-fill-mode}, but +it only inserts @samp{ill-}, giving @samp{auto-fill-}. Another +@key{SPC} at this point completes all the way to +@samp{auto-fill-mode}. The command that implements this behavior is +called @code{minibuffer-complete-word}. - Here are some commands you can use to choose a completion from a -window that displays a list of completions: + When you display a list of possible completions, you can choose +one from it: @table @kbd @findex mouse-choose-completion @item Mouse-1 @itemx Mouse-2 -Clicking mouse button 1 or 2 on a completion in the list of possible -completions chooses that completion (@code{mouse-choose-completion}). -You normally use this command while point is in the minibuffer, but you -must click in the list of completions, not in the minibuffer itself. +Clicking mouse button 1 or 2 on a completion possibility chooses that +completion (@code{mouse-choose-completion}). You must click in the +list of completions, not in the minibuffer. @findex switch-to-completions @item @key{PRIOR} @@ -309,98 +292,91 @@ must click in the list of completions, not in the minibuffer itself. Typing @key{PRIOR} or @key{PAGE-UP}, or @kbd{M-v}, while in the minibuffer, selects the window showing the completion list buffer (@code{switch-to-completions}). This paves the way for using the -commands below. (Selecting that window in the usual ways has the same -effect, but this way is more convenient.) +commands below. (Selecting that window in other ways has the same +effect.) @findex choose-completion @item @key{RET} Typing @key{RET} @emph{in the completion list buffer} chooses the completion that point is in or next to (@code{choose-completion}). To -use this command, you must first switch windows to the window that shows -the list of completions. +use this command, you must first switch to the completion list window. @findex next-completion @item @key{RIGHT} Typing the right-arrow key @key{RIGHT} @emph{in the completion list -buffer} moves point to the following completion (@code{next-completion}). +buffer} moves point to the following completion possibility +(@code{next-completion}). @findex previous-completion @item @key{LEFT} Typing the left-arrow key @key{LEFT} @emph{in the completion list -buffer} moves point toward the beginning of the buffer, to the previous -completion (@code{previous-completion}). +buffer} moves point to the previous completion possibility +(@code{previous-completion}). @end table @node Strict Completion @subsection Strict Completion - There are three different ways that @key{RET} can work in completing -minibuffers, depending on how the argument will be used. + There are three different ways that @key{RET} can do completion, +depending on how the argument will be used. @itemize @bullet @item -@dfn{Strict} completion is used when it is meaningless to give any -argument except one of the known alternatives. For example, when -@kbd{C-x k} reads the name of a buffer to kill, it is meaningless to -give anything but the name of an existing buffer. In strict -completion, @key{RET} refuses to exit if the text in the minibuffer -does not complete to an exact match. +@dfn{Strict} completion accepts only known completion candidates. For +example, when @kbd{C-x k} reads the name of a buffer to kill, only the +name of an existing buffer makes sense. In strict completion, +@key{RET} refuses to exit if the text in the minibuffer does not +complete to an exact match. @item @dfn{Cautious} completion is similar to strict completion, except that -@key{RET} exits only if the text was an exact match already, not -needing completion. If the text is not an exact match, @key{RET} does -not exit, but it does complete the text. If it completes to an exact -match, a second @key{RET} will exit. +@key{RET} exits only if the text is an already exact match. +Otherwise, @key{RET} does not exit, but it does complete the text. If +that completes to an exact match, a second @key{RET} will exit. Cautious completion is used for reading file names for files that must -already exist. +already exist, for example. @item -@dfn{Permissive} completion is used when any string whatever is -meaningful, and the list of completion alternatives is just a guide. -For example, when @kbd{C-x C-f} reads the name of a file to visit, any -file name is allowed, in case you want to create a file. In -permissive completion, @key{RET} takes the text in the minibuffer -exactly as given, without completing it. +@dfn{Permissive} completion allows any input; the completion +candidates are just suggestions. For example, when @kbd{C-x C-f} +reads the name of a file to visit, any file name is allowed, including +nonexistent file (in case you want to create a file). In permissive +completion, @key{RET} does not complete, it just submits the argument +as you have entered it. @end itemize - The completion commands display a list of all possible completions in -a window whenever there is more than one possibility for the very next -character. Also, typing @kbd{?} explicitly requests such a list. If -the list of completions is long, you can scroll it with @kbd{C-M-v} -(@pxref{Other Window}). + The completion commands display a list of all possible completions +whenever they can't determine even one more character by completion. +Also, typing @kbd{?} explicitly requests such a list. You can scroll +the list with @kbd{C-M-v} (@pxref{Other Window}). @node Completion Options @subsection Completion Options @vindex completion-ignored-extensions @cindex ignored file names, in completion - When completion is done on file names, certain file names are usually -ignored. The variable @code{completion-ignored-extensions} contains a -list of strings; a file whose name ends in any of those strings is -ignored as a possible completion. The standard value of this variable -has several elements including @code{".o"}, @code{".elc"}, @code{".dvi"} -and @code{"~"}. The effect is that, for example, @samp{foo} can -complete to @samp{foo.c} even though @samp{foo.o} exists as well. -However, if @emph{all} the possible completions end in ``ignored'' -strings, then they are not ignored. Ignored extensions do not apply to -lists of completions---those always mention all possible completions. - - If an element of the list in @code{completion-ignored-extensions} ends -in a slash @file{/}, it indicates a subdirectory that should be ignored -when completing file names. Elements of + When completing file names, certain file names are usually ignored. +The variable @code{completion-ignored-extensions} contains a list of +strings; a file name ending in any of those strings is ignored as a +completion candidate. The standard value of this variable has several +elements including @code{".o"}, @code{".elc"}, @code{".dvi"} and +@code{"~"}. The effect is that, for example, @samp{foo} can complete +to @samp{foo.c} even though @samp{foo.o} exists as well. However, if +@emph{all} the possible completions end in ``ignored'' strings, then +they are not ignored. Displaying a list of possible completions +disregards @code{completion-ignored-extensions}; it shows them all. + + If an element of @code{completion-ignored-extensions} ends in a +slash (@file{/}), it's a subdirectory name; then that directory and +its contents are ignored. Elements of @code{completion-ignored-extensions} which do not end in a slash are -never considered when a completion candidate is a directory; thus, -completion returns directories whose names end in @file{.elc} even -though there's an element @code{".elc"} in the list. +ordinary file names, and do not apply to names of directories. @vindex completion-auto-help - Normally, a completion command that cannot determine even one -additional character automatically displays a list of all possible -completions. If the variable @code{completion-auto-help} is set to -@code{nil}, this automatic display is disabled, so you must type -@kbd{?} to display the list of completions. + If @code{completion-auto-help} is set to @code{nil}, the completion +commands never display a list of possibilities; you must type @kbd{?} +to display the list. @cindex Partial Completion mode @vindex partial-completion-mode @@ -408,30 +384,29 @@ completions. If the variable @code{completion-auto-help} is set to Partial Completion mode implements a more powerful kind of completion that can complete multiple words in parallel. For example, it can complete the command name abbreviation @code{p-b} into -@code{print-buffer}, because no other command starts with two words -whose initials are @samp{p} and @samp{b}. +@code{print-buffer} if no other command starts with two words whose +initials are @samp{p} and @samp{b}. + + To enable this mode, use @kbd{M-x partial-completion-mode}, or +customize the variable @code{partial-completion-mode}. This mode +binds special partial completion commands to @key{TAB}, @key{SPC}, +@key{RET}, and @kbd{?} in the minibuffer. The usual completion +commands are available on @kbd{M-@key{TAB}} (or @kbd{C-M-i}), +@kbd{M-@key{SPC}}, @kbd{M-@key{RET}} and @kbd{M-?}. Partial completion of directories in file names uses @samp{*} to indicate the places for completion; thus, @file{/u*/b*/f*} might -complete to @file{/usr/bin/foo}. - - For remote files, partial completion enables completion of methods, -user names and host names. @xref{Remote Files}. - - To enable this mode, use the command @kbd{M-x -partial-completion-mode}, or customize the variable -@code{partial-completion-mode}. This binds the partial completion -commands to @key{TAB}, @key{SPC}, @key{RET}, and @kbd{?}. The usual -completion commands are available on @kbd{M-@key{TAB}} (or -@kbd{C-M-i}), @kbd{M-@key{SPC}}, @kbd{M-@key{RET}} and @kbd{M-?}. +complete to @file{/usr/bin/foo}. For remote files, partial completion +enables completion of methods, user names and host names. +@xref{Remote Files}. @vindex PC-include-file-path @vindex PC-disable-includes - Another feature of Partial Completion mode is to extend -@code{find-file} so that @samp{<@var{include}>} stands for the -file named @var{include} in some directory in the path -@code{PC-include-file-path}. If you set @code{PC-disable-includes} to -non-@code{nil}, this feature is disabled. + Partial Completion mode also extends @code{find-file} so that +@samp{<@var{include}>} looks for the file named @var{include} in the +directories in the path @code{PC-include-file-path}. If you set +@code{PC-disable-includes} to non-@code{nil}, this feature is +disabled. @cindex Icomplete mode @findex icomplete-mode @@ -446,52 +421,50 @@ icomplete-mode}. @cindex history of minibuffer input Every argument that you enter with the minibuffer is saved on a -@dfn{minibuffer history list} so that you can use it again later in -another argument. Special commands load the text of an earlier argument -in the minibuffer. They discard the old minibuffer contents, so you can -think of them as moving through the history of previous arguments. +@dfn{minibuffer history list} so you can easily use it again later. +Special commands fetch the text of an earlier argument into the +minibuffer, replacing the old minibuffer contents. You can think of +them as moving through the history of previous arguments. @table @kbd @item @key{UP} @itemx M-p -Move to the next earlier argument string saved in the minibuffer history +Move to the previous item in the minibuffer history, an earlier argument (@code{previous-history-element}). @item @key{DOWN} @itemx M-n -Move to the next later argument string saved in the minibuffer history +Move to the next item in the minibuffer history (@code{next-history-element}). @item M-r @var{regexp} @key{RET} -Move to an earlier saved argument in the minibuffer history that has a -match for @var{regexp} (@code{previous-matching-history-element}). +Move to an earlier item in the minibuffer history that +matches @var{regexp} (@code{previous-matching-history-element}). @item M-s @var{regexp} @key{RET} -Move to a later saved argument in the minibuffer history that has a -match for @var{regexp} (@code{next-matching-history-element}). +Move to a later item in the minibuffer history that matches +@var{regexp} (@code{next-matching-history-element}). @end table @kindex M-p @r{(minibuffer history)} @kindex M-n @r{(minibuffer history)} @findex next-history-element @findex previous-history-element - The simplest way to reuse the saved arguments in the history list is -to move through the history list one element at a time. While in the -minibuffer, use @kbd{M-p} or up-arrow -(@code{previous-history-element}) to ``move to'' the next earlier -minibuffer input, and use @kbd{M-n} or down-arrow -(@code{next-history-element}) to ``move to'' the next later input. -These commands don't move the cursor, they bring different saved -strings into the minibuffer. But you can think of them as ``moving'' -through the history list. - - The previous input that you fetch from the history entirely replaces -the contents of the minibuffer. To use it as the argument, exit the -minibuffer as usual with @key{RET}. You can also edit the text before -you reuse it; this does not change the history element that you -``moved'' to, but your new argument does go at the end of the history -list in its own right. - - For many minibuffer arguments there is a ``default'' value. Then -you can insert the default value into the minibuffer as text by using -@kbd{M-n} to move ``into the future'' in the history. + To move through the minibuffer history list one item at a time, use +@kbd{M-p} or up-arrow (@code{previous-history-element}) to fetch the +next earlier minibuffer input, and use @kbd{M-n} or down-arrow +(@code{next-history-element}) to fetch the next later input. These +commands don't move the cursor, they pull different saved strings into +the minibuffer. But you can think of them as ``moving'' through the +history list. + + The input that you fetch from the history entirely replaces the +contents of the minibuffer. To use it again unchanged, just type +@key{RET}. You can also edit the text before you reuse it; this does +not change the history element that you ``moved'' to, but your new +argument does go at the end of the history list in its own right. + + For many minibuffer arguments there is a ``default'' value. You can +insert the default value into the minibuffer as text by using +@kbd{M-n}. You can think of this as moving ``into the future'' in the +history. @findex previous-matching-history-element @findex next-matching-history-element @@ -499,14 +472,13 @@ you can insert the default value into the minibuffer as text by using @kindex M-s @r{(minibuffer history)} There are also commands to search forward or backward through the history; they search for history elements that match a regular -expression that you specify with the minibuffer. @kbd{M-r} -(@code{previous-matching-history-element}) searches older elements in -the history, while @kbd{M-s} (@code{next-matching-history-element}) -searches newer elements. By special dispensation, these commands can -use the minibuffer to read their arguments even though you are already -in the minibuffer when you issue them. As with incremental searching, -an upper-case letter in the regular expression makes the search -case-sensitive (@pxref{Search Case}). +expression. @kbd{M-r} (@code{previous-matching-history-element}) +searches older elements in the history, while @kbd{M-s} +(@code{next-matching-history-element}) searches newer elements. These +commands are unusual; they use the minibuffer to read the regular +expression even though they are invoked from the minibuffer. As with +incremental searching, an upper-case letter in the regular expression +makes the search case-sensitive (@pxref{Search Case}). @ignore We may change the precise way these commands read their arguments. @@ -519,46 +491,45 @@ actually available, type @kbd{C-h f previous-matching-history-element}. @end ignore All uses of the minibuffer record your input on a history list, but -there are separate history lists for different kinds of arguments. For -example, there is a list for file names, used by all the commands that -read file names. (As a special feature, this history list records -the absolute file name, no more and no less, even if that is not how -you entered the file name.) - - There are several other very specific history lists, including one for -command names read by @kbd{M-x}, one for buffer names, one for arguments -of commands like @code{query-replace}, and one for compilation commands -read by @code{compile}. Finally, there is one ``miscellaneous'' history -list that most minibuffer arguments use. +there are separate history lists for different kinds of arguments. +For example, there is a list for file names, used by all the commands +that read file names. (As a special feature, this history list +records the absolute file name, even if the name you entered was not +absolute.) + + There are several other specific history lists, including one for +buffer names, one for arguments of commands like @code{query-replace}, +one used by @kbd{M-x} for command names, and one used by +@code{compile} for compilation commands. Finally, there is one +``miscellaneous'' history list that most minibuffer arguments use. @vindex history-length The variable @code{history-length} specifies the maximum length of a -minibuffer history list; once a list gets that long, the oldest element -is deleted each time an element is added. If the value of -@code{history-length} is @code{t}, though, there is no maximum length -and elements are never deleted. +minibuffer history list; adding a new element deletes the oldest +element if the list gets too long. If the value of +@code{history-length} is @code{t}, though, there is no maximum length. @vindex history-delete-duplicates The variable @code{history-delete-duplicates} specifies whether to -delete duplicates in history. If the value of @code{history-delete-duplicates} -is @code{t}, that means when adding a new history element, all -previous identical elements are deleted. +delete duplicates in history. If it is @code{t}, adding a new element +deletes from the list all other elements that are equal to it. @node Repetition @section Repeating Minibuffer Commands @cindex command history @cindex history of commands - Every command that uses the minibuffer at least once is recorded on a -special history list, together with the values of its arguments, so that -you can repeat the entire command. In particular, every use of -@kbd{M-x} is recorded there, since @kbd{M-x} uses the minibuffer to read -the command name. + Every command that uses the minibuffer once is recorded on a special +history list, the @dfn{command history}, together with the values of +its arguments, so that you can repeat the entire command. In +particular, every use of @kbd{M-x} is recorded there, since @kbd{M-x} +uses the minibuffer to read the command name. @findex list-command-history @table @kbd @item C-x @key{ESC} @key{ESC} -Re-execute a recent minibuffer command (@code{repeat-complex-command}). +Re-execute a recent minibuffer command from the command history + (@code{repeat-complex-command}). @item M-x list-command-history Display the entire command history, showing all the commands @kbd{C-x @key{ESC} @key{ESC}} can repeat, most recent first. @@ -566,36 +537,33 @@ Display the entire command history, showing all the commands @kindex C-x ESC ESC @findex repeat-complex-command - @kbd{C-x @key{ESC} @key{ESC}} is used to re-execute a recent -minibuffer-using command. With no argument, it repeats the last such -command. A numeric argument specifies which command to repeat; one -means the last one, and larger numbers specify earlier ones. + @kbd{C-x @key{ESC} @key{ESC}} is used to re-execute a recent command +that used the minibuffer. With no argument, it repeats the last such +command. A numeric argument specifies which command to repeat; 1 +means the last one, 2 the previous, and so on. @kbd{C-x @key{ESC} @key{ESC}} works by turning the previous command into a Lisp expression and then entering a minibuffer initialized with -the text for that expression. If you type just @key{RET}, the command -is repeated as before. You can also change the command by editing the -Lisp expression. Whatever expression you finally submit is what will be -executed. The repeated command is added to the front of the command -history unless it is identical to the most recently executed command -already there. - - Even if you don't understand Lisp syntax, it will probably be obvious -which command is displayed for repetition. If you do not change the -text, it will repeat exactly as before. +the text for that expression. Even if you don't understand Lisp +syntax, it will probably be obvious which command is displayed for +repetition. If you type just @key{RET}, that repeats the command +unchanged. You can also change the command by editing the Lisp +expression before you execute it. The repeated command is added to +the front of the command history unless it is identical to the most +recently item. Once inside the minibuffer for @kbd{C-x @key{ESC} @key{ESC}}, you can use the minibuffer history commands (@kbd{M-p}, @kbd{M-n}, @kbd{M-r}, @kbd{M-s}; @pxref{Minibuffer History}) to move through the history list of saved entire commands. After finding the desired previous command, -you can edit its expression as usual and then resubmit it by typing -@key{RET} as usual. +you can edit its expression as usual and then repeat it by typing +@key{RET}. @vindex isearch-resume-in-command-history - Incremental search does not, strictly speaking, use the minibuffer, -but it does something similar. Although it behaves like a complex command, -it normally does not appear in the history list for @kbd{C-x -@key{ESC} @key{ESC}}. You can make it appear in the history by + Incremental search does not, strictly speaking, use the minibuffer. +Therefore, although it behaves like a complex command, it normally +does not appear in the history list for @kbd{C-x @key{ESC} @key{ESC}}. +You can make incremental search commands appear in the history by setting @code{isearch-resume-in-command-history} to a non-@code{nil} value. @xref{Incremental Search}. diff --git a/man/misc.texi b/man/misc.texi index 9e5d2835e20..88659aa4528 100644 --- a/man/misc.texi +++ b/man/misc.texi @@ -30,9 +30,9 @@ Usenet news. It can also be used to read and respond to messages from a number of other sources---mail, remote directories, digests, and so on. Here we introduce Gnus and describe several basic features. -@ifinfo +@ifnottex For full details, see @ref{Top, Gnus,, gnus, The Gnus Manual}. -@end ifinfo +@end ifnottex @iftex For full details on Gnus, type @kbd{M-x info} and then select the Gnus manual. @@ -238,10 +238,10 @@ for @var{regexp}. @c Too many references to the name of the manual if done with xref in TeX! Gnus is powerful and customizable. Here are references to a few -@ifinfo +@ifnottex additional topics: -@end ifinfo +@end ifnottex @iftex additional topics in @cite{The Gnus Manual}: @@ -274,7 +274,7 @@ Send an article to a newsgroup.@* See section ``Composing Messages.'' @end itemize @end iftex -@ifinfo +@ifnottex @itemize @bullet @item Follow discussions on specific topics.@* @@ -304,7 +304,7 @@ name, subject, or string in the body of the articles.@* Send an article to a newsgroup.@* @xref{Composing Messages, , , gnus, The Gnus Manual}. @end itemize -@end ifinfo +@end ifnottex @end ignore @node Shell, Emacs Server, Gnus, Top @@ -873,17 +873,21 @@ Move point to the previous prompt (@code{comint-previous-prompt}). Move point to the following prompt (@code{comint-next-prompt}). @kindex C-c RET @r{(Shell mode)} -@findex comint-insert-input +@findex comint-copy-old-input @item C-c @key{RET} Copy the input command which point is in, inserting the copy at the end -of the buffer (@code{comint-insert-input}). This is useful if you +of the buffer (@code{comint-copy-old-input}). This is useful if you move point back to a previous command. After you copy the command, you can submit the copy as input with @key{RET}. If you wish, you can -edit the copy before resubmitting it. +edit the copy before resubmitting it. If you use this command on an +output line, it copies that line to the end of the buffer. @item Mouse-2 -Copy the input command that you click on, inserting the copy at the end -of the buffer. +If @code{comint-use-prompt-regexp} is @code{nil} (the default), copy +the old input command that you click on, inserting the copy at the end +of the buffer (@code{comint-insert-input}). If +@code{comint-use-prompt-regexp} is non-@code{nil}, or if the click is +not over old input, just yank as usual. @end table Moving to a previous input and then copying it with @kbd{C-c @@ -1503,9 +1507,9 @@ rendition of the current buffer as a cursive handwritten document. It can be customized in group @code{handwrite}. This function only supports ISO 8859-1 characters. -@ifinfo +@ifnottex The following section describes variables for customizing these commands. -@end ifinfo +@end ifnottex @node PostScript Variables, Printing Package, PostScript, Printing @section Variables for PostScript Hardcopy diff --git a/man/msdog.texi b/man/msdog.texi index 0dfb57ffdc9..17185e952a0 100644 --- a/man/msdog.texi +++ b/man/msdog.texi @@ -328,6 +328,12 @@ the default directory of the current buffer, so if the file name in files, each one in the directory of the buffer from which the printing was done. + If the value of @code{printer-name} is correct, but printing does +not produce the hardcopy on your printer, it is possible that your +printer does not support printing plain text (some cheap printers omit +this functionality). In that case, as a workaround, try the +PostScript print commands, described below, to the same printer + @findex print-buffer @r{(MS-DOS)} @findex print-region @r{(MS-DOS)} @vindex lpr-headers-switches @r{(MS-DOS)} diff --git a/man/mule.texi b/man/mule.texi index e2dd270c772..c2f789ec800 100644 --- a/man/mule.texi +++ b/man/mule.texi @@ -429,9 +429,9 @@ immediately delete it. For example, you could type @kbd{e e @key{DEL} Another method, more general but not quite as easy to type, is to use @kbd{C-\ C-\} between two characters to stop them from combining. This is the command @kbd{C-\} (@code{toggle-input-method}) used twice. -@ifinfo +@ifnottex @xref{Select Input Method}. -@end ifinfo +@end ifnottex @cindex incremental search, input method interference @kbd{C-\ C-\} is especially useful inside an incremental search, @@ -563,9 +563,9 @@ through your choice of language environment @iftex (see above). @end iftex -@ifinfo +@ifnottex (@pxref{Language Environments}). -@end ifinfo +@end ifnottex If you do not specify a choice, the default is Latin-1. If you insert a character in the range 0200 through 0237, which @@ -679,6 +679,13 @@ predictable. For example, the coding system @code{iso-latin-1} has variants @code{iso-latin-1-unix}, @code{iso-latin-1-dos} and @code{iso-latin-1-mac}. +@cindex @code{undecided}, coding system + The coding systems @code{unix}, @code{dos}, and @code{mac} are +aliases for @code{undecided-unix}, @code{undecided-dos}, and +@code{undecided-mac}, respectively. These coding systems specify only +the end-of-line conversion, and leave the character code conversion to +be deduced from the text itself. + The coding system @code{raw-text} is good for a file which is mainly @acronym{ASCII} text, but may contain byte values above 127 which are not meant to encode non-@acronym{ASCII} characters. With diff --git a/man/org.texi b/man/org.texi index 40e24d30146..27970a1aea8 100644 --- a/man/org.texi +++ b/man/org.texi @@ -1,11 +1,11 @@ \input texinfo + @c %**start of header -@c @setfilename org @setfilename ../info/org @settitle Org Mode Manual -@set VERSION 4.26 -@set DATE April 2006 +@set VERSION 4.36 +@set DATE June 2006 @dircategory Emacs @direntry @@ -14,6 +14,7 @@ @c Version and Contact Info @set MAINTAINERSITE @uref{http://www.astro.uva.nl/~dominik/Tools/org/,maintainers webpage} +@set AUTHOR Carsten Dominik @set MAINTAINER Carsten Dominik @set MAINTAINEREMAIL @email{dominik@@science.uva.nl} @set MAINTAINERCONTACT @uref{mailto:dominik@@science.uva.nl,contact the maintainer} @@ -84,6 +85,7 @@ Software Foundation raise funds for GNU development.'' * Tags:: Tagging headlines and matching sets of tags * Agenda views:: Collecting information into views * Exporting:: Sharing and publishing of notes +* Publishing:: Create a web site of linked Org-mode files * Miscellaneous:: All the rest which did not fit elsewhere * Index:: The fast road to specific information * Key Index:: Key bindings and where they are described @@ -97,7 +99,7 @@ Introduction * Installation and activation:: How to install Org-mode * Feedback:: Bug reports, ideas, patches etc. -Document structure +Document Structure * Outlines:: Org-mode is based on outline-mode * Headlines:: How to typeset org-tree headlines @@ -119,6 +121,7 @@ Tables Calculations in tables * Formula syntax:: How to write a formula +* Lisp formulas:: An alternative way to write formulas * Column formulas:: Formulas valid for all fields in a column * Advanced features:: Field names, parameters and automatic recalc * Named-field formulas:: Formulas valid in single fields @@ -131,7 +134,8 @@ Hyperlinks * Internal links:: Links to other places in the current file * External links:: URL-like links to the world * Handling links:: Creating, inserting and following -* Search Options:: Linking to a specific location +* Search options:: Linking to a specific location +* Custom searches:: When the default search is not enough * Remember:: Org-trees store quick notes Internal links @@ -163,7 +167,7 @@ Tags * Setting tags:: How to assign tags to a headline * Tag searches:: Searching for combinations of tags -Agenda views +Agenda Views * Agenda files:: Files being searched for agenda information * Agenda dispatcher:: Keyboard access to agenda views @@ -184,7 +188,7 @@ Exporting * ASCII export:: Exporting to plain ASCII * HTML export:: Exporting to HTML -* XML export:: Exporting to XML +* XOXO export:: Exporting to XOXO * iCalendar export:: Exporting in iCalendar format * Text interpretation:: How the exporter looks at the file @@ -194,6 +198,27 @@ Text interpretation by the exporter * Enhancing text:: Subscripts, symbols and more * Export options:: How to influence the export settings +Publishing + +* Configuration:: Defining projects +* Sample configuration:: Example projects +* Triggering publication:: Publication commands + +Configuration + +* Project alist:: The central configuration variable +* File sources and destinations:: From here to there +* Selecting files:: What files are part of the project? +* Publishing action:: Setting the function doing the publishing +* Publishing options:: Tweaking HTML export +* Publishing links:: Which links keep working after publishing? +* Project page index:: Publishing a list of project files + +Sample configuration + +* Simple example:: One-component publishing +* Complex example:: A multi-component publishing example + Miscellaneous * Completion:: M-TAB knows what you need @@ -207,6 +232,12 @@ Miscellaneous * Bugs:: Things which do not work perfectly * Acknowledgments:: These people provided feedback and more +Interaction with other packages + +* Extensions:: Third-party extensions for Org-mode +* Cooperation:: Packages Org-mode cooperates with +* Conflicts:: Packages that lead to conflicts + @end detailmenu @end menu @@ -239,21 +270,23 @@ Plain text URL-like links connect to websites, emails, Usenet messages, BBDB entries, and any files related to the projects. For printing and sharing of notes, an Org-mode file can be exported as a structured ASCII file, as HTML, or (todo and agenda items only) as an -iCalendar file. +iCalendar file. It can also serve as a publishing tool for a set of +linked webpages. Org-mode keeps simple things simple. When first fired up, it should -feel like a simple, easy to use outliner. Complexity is not imposed, -but a large amount of functionality is available when you need it. -Org-mode can be used on different levels and in different ways, for +feel like a straightforward, easy to use outliner. Complexity is not +imposed, but a large amount of functionality is available when you need +it. Org-mode can be used on different levels and in different ways, for example: @example @r{@bullet{} as an outline extension with visibility cycling and structure editing} @r{@bullet{} as an ASCII system and table editor for taking structured notes} @r{@bullet{} as an ASCII table editor with spreadsheet-like capabilities} -@r{@bullet{} as a simple hypertext system, with HTML export} @r{@bullet{} as a TODO list editor} @r{@bullet{} as a full agenda and planner with deadlines and work scheduling} +@r{@bullet{} as a simple hypertext system, with HTML export} +@r{@bullet{} as a publishing tool to create a set of interlinked webpages} @end example The Org-mode table editor can be integrated into any major mode by @@ -286,19 +319,22 @@ choose suitable keys yourself. (define-key global-map "\C-ca" 'org-agenda) @end lisp -If you have downloaded Org-mode from the Web, you must byte-compile -@file{org.el} and put it on your load path. In addition to the Emacs -Lisp lines above, you also need to add the following lines to +Furthermore, you must activate @code{font-lock-mode} in org-mode +buffers, because significant functionality depends on font-locking being +active. You can do this with either one of the following two lines: +@lisp +(global-font-lock-mode 1) ; for all buffers +(add-hook 'org-mode-hook 'turn-on-font-lock) ; org-mode buffers only +@end lisp + +If you have downloaded Org-mode from the Web, you must take additional +action: Byte-compile @file{org.el} and @file{org-publish.el} and put +them together with @file{org-install.el} on your load path. Then add to @file{.emacs}: @lisp -;; These lines only if org-mode is not part of the X/Emacs distribution. -(autoload 'org-mode "org" "Org mode" t) -(autoload 'org-diary "org" "Diary entries from Org mode") -(autoload 'org-agenda "org" "Multi-file agenda from Org mode" t) -(autoload 'org-store-link "org" "Store a link to the current location" t) -(autoload 'orgtbl-mode "org" "Org tables as a minor mode" t) -(autoload 'turn-on-orgtbl "org" "Org tables as a minor mode") +;; This line only if org-mode is not part of the X/Emacs distribution. +(require 'org-install) @end lisp @cindex org-mode, turning on @@ -322,7 +358,7 @@ the file's name is. See also the variable @cindex author If you find problems with Org-mode, or if you have questions, remarks, -or ideas about it, please contact the maintainer Carsten Dominik at +or ideas about it, please contact the maintainer @value{MAINTAINER} at @value{MAINTAINEREMAIL}. For bug reports, please provide as much information as possible, @@ -405,33 +441,40 @@ starters. @ref{Clean view} describes a setup to realize this. @cindex hide text Outlines make it possible to hide parts of the text in the buffer. -Org-mode uses a single command bound to the @key{TAB} key to change -the visibility in the buffer. +Org-mode uses just two commands, bound to @key{TAB} and +@kbd{S-@key{TAB}} to change the visibility in the buffer. @cindex subtree visibility states +@cindex subtree cycling @cindex folded, subtree visibility state @cindex children, subtree visibility state @cindex subtree, subtree visibility state @table @kbd @kindex @key{TAB} @item @key{TAB} -Rotate current subtree between the states +@emph{Subtree cycling}: Rotate current subtree between the states @example ,-> FOLDED -> CHILDREN -> SUBTREE --. '-----------------------------------' @end example -At the beginning of the buffer (or when called with @kbd{C-u}), this does -the same as the command @kbd{S-@key{TAB}} below. +The cursor must be on a headline for this to work@footnote{see, however, +the option @code{org-cycle-emulate-tab}.}. When the cursor is at the +beginning of the buffer and the first line is not a headline, then +@key{TAB} actually runs global cycling (see below)@footnote{see the +option @code{org-cycle-global-at-bob}.}. Also when called with a prefix +argument (@kbd{C-u @key{TAB}}), global cycling is invoked. @cindex global visibility states +@cindex global cycling @cindex overview, global visibility state @cindex contents, global visibility state @cindex show all, global visibility state @kindex S-@key{TAB} @item S-@key{TAB} -Rotate the entire buffer between the states +@itemx C-u @key{TAB} +@emph{Global cycling}: Rotate the entire buffer between the states @example ,-> OVERVIEW -> CONTENTS -> SHOW ALL --. @@ -512,7 +555,7 @@ creation of a new headline, use a prefix arg, or first press @key{RET} to get to the beginning of the next line. When this command is used in the middle of a line, the line is split and the rest of the line becomes the new headline. If the command is used at the beginning of a -headline, the new headline is created before the current line. It at +headline, the new headline is created before the current line. If at the beginning of any other line, the content of that line is made the new heading. @kindex M-S-@key{RET} @@ -615,7 +658,7 @@ If the match is in a headline, the headline is made visible. If the match is in the body of an entry, headline and body are made visible. In order to provide minimal context, also the full hierarchy of headlines above the match is shown, as well as the headline following -the match. Each match is also highlighted, the highlights disappear +the match. Each match is also highlighted; the highlights disappear when the buffer is changed with an editing command. @end table @noindent @@ -633,7 +676,7 @@ For example: @noindent will define the key @kbd{C-c a f} as a shortcut for creating a sparse tree matching the string @samp{FIXME}. -Other commands are using sparse trees as well. For example @kbd{C-c +Other commands use sparse trees as well. For example @kbd{C-c C-v} creates a sparse TODO tree (@pxref{TODO basics}). @kindex C-c C-x v @@ -643,9 +686,8 @@ To print a sparse tree, you can use the Emacs command @code{ps-print-buffer-with-faces} which does not print invisible parts of the document @footnote{This does not work under XEmacs, because XEmacs uses selective display for outlining, not text properties.}. -Or you can use the command @kbd{C-c C-x v} to copy the visible part of -the document to another file (extension @file{.txt}) which can then be -printed in any desired way. +Or you can use the command @kbd{C-c C-x v} to export only the visible +part of the document and print the resulting file. @node Plain lists, , Sparse trees, Document structure @@ -657,7 +699,7 @@ printed in any desired way. Headlines define both the structure of the Org-mode file, and also lists (for example, TODO items (@pxref{TODO items}) should be created using -headline levels). However, when taking notes, the plain text is +headline levels). When taking notes, however, the plain text is sometimes easier to read with hand-formatted lists. Org-mode supports editing such lists, and the HTML exporter (@pxref{Exporting}) does parse and format them. @@ -668,7 +710,7 @@ bullet, lines must be indented or they will be seen as top-level headlines. Also, when you are hiding leading stars to get a clean outline view, plain list items starting with a star are visually indistinguishable from true headlines. In short: even though @samp{*} -is supported, it may be better to not use it for plain list items} as +is supported, it may be better not to use it for plain list items} as bullets. Ordered list items start with @samp{1.} or @samp{1)}. Items belonging to the same list must have the same indentation on the first line. In particular, if an ordered list reaches number @samp{10.}, then @@ -693,17 +735,30 @@ But in the end, not individual scenes matter but the film as a whole. @end example Org-mode supports these lists by tuning filling and wrapping commands -to correctly deal with them. Furthermore, the following commands act -on items when the cursor is in the first line of an item (the line -with the bullet or number). +to deal with them correctly. + +@cindex checkboxes +Every item in a plain list can be made a checkbox by starting it with +the string @samp{[ ]}. The checkbox status can conveniently be toggled +with @kbd{C-c C-c}. + +@example +* Stupid mistakes when distributing a new version + - [ ] update also Emacs CVS + - [X] forget to update index.html on the website + - [X] leaving a `(debug)' form in the code +@end example + +The following commands act on items when the cursor is in the first line +of an item (the line with the bullet or number). @table @kbd @kindex @key{TAB} @item @key{TAB} Items can be folded just like headline levels if you set the variable @code{org-cycle-include-plain-lists}. The level of an item is then -given by the indentation of the bullet/number. However, items are -always subordinate to real headlines, the hierarchies remain +given by the indentation of the bullet/number. Items are always +subordinate to real headlines, however; the hierarchies remain completely separated. @kindex M-@key{RET} @item M-@key{RET} @@ -715,6 +770,14 @@ number}, the new item is created @emph{before} the current item. If the command is executed in the white space before the text that is part of an item but does not contain the bullet, a bullet is added to the current line. +@kindex M-S-@key{RET} +@item M-S-@key{RET} +Insert a new item with a checkbox. +@kindex S-@key{up} +@kindex S-@key{down} +@item S-@key{up} +@itemx S-@key{down} +Jump to the previous/next item in the current list. @kindex M-S-@key{up} @kindex M-S-@key{down} @item M-S-@key{up} @@ -734,7 +797,9 @@ would imply a different hierarchy. To use the new hierarchy, break the command chain with a cursor motion or so. @kindex C-c C-c @item C-c C-c -Renumber the ordered list at the cursor. +If there is a checkbox in the item line, toggle the state of the +checkbox. Otherwise, if this is an ordered list, renumber the ordered +list at the cursor. @end table @node Tables, Hyperlinks, Document structure, Top @@ -806,7 +871,7 @@ If not, lines are split at whitespace into fields. You can use a prefix argument to indicate the minimum number of consecutive spaces required to identify a field separator (default: just one).@* If there is no active region, this command creates an empty Org-mode -table. However, it's easier to just start typing, like +table. But it's easier just to start typing, like @kbd{|Name|Phone|Age @key{RET} |- @key{TAB}}. @tsubheading{Re-aligning and field motion} @@ -953,7 +1018,7 @@ When not empty, copy current field down to next row and move cursor along with it. Depending on the variable @code{org-table-copy-increment}, integer field values will be incremented during copy. This key is also used by CUA-mode -(@pxref{Interaction}). +(@pxref{Cooperation}). @tsubheading{Miscellaneous} @kindex C-c ` @@ -990,7 +1055,7 @@ it off with (setq org-enable-table-editor nil) @end lisp -@noindent The only table command which then still works is +@noindent Then the only table command that still works is @kbd{C-c C-c} to do a manual re-align. @node Narrow columns, Table calculations, Built-in table editor, Tables @@ -1043,19 +1108,20 @@ on a per-file basis with: @cindex spreadsheet capabilities @cindex @file{calc} package -The table editor makes use of the Emacs @file{calc} package to -implement spreadsheet-like capabilities. Org-mode has two levels of -complexity for table calculations. On the basic level, tables do only -horizontal computations, so a field can be computed from other fields -@emph{in the same row}, and Org-mode assumes that there is only one -formula for each column. This is very efficient to work with and -enough for many tasks. On the complex level, columns and individual -fields can be named for easier referencing in formulas, individual -named fields can have their own formula associated with them, and -recalculation can be automated. +The table editor makes use of the Emacs @file{calc} package to implement +spreadsheet-like capabilities. It can also evaluate Emacs Lisp forms to +derive fields from other fields. Org-mode has two levels of complexity +for table calculations. On the basic level, tables do only horizontal +computations, so a field can be computed from other fields @emph{in the +same row}, and Org-mode assumes that there is only one formula for each +column. This is very efficient to work with and enough for many tasks. +On the complex level, columns and individual fields can be named for +easier referencing in formulas, individual named fields can have their +own formula associated with them, and recalculation can be automated. @menu * Formula syntax:: How to write a formula +* Lisp formulas:: An alternative way to write formulas * Column formulas:: Formulas valid for all fields in a column * Advanced features:: Field names, parameters and automatic recalc * Named-field formulas:: Formulas valid in single fields @@ -1063,7 +1129,7 @@ recalculation can be automated. * Appetizer:: Taste the power of calc @end menu -@node Formula syntax, Column formulas, Table calculations, Table calculations +@node Formula syntax, Lisp formulas, Table calculations, Table calculations @subsection Formula syntax @cindex formula syntax @cindex syntax, of formulas @@ -1108,8 +1174,8 @@ described below, see @ref{Advanced features}. A formula can contain an optional mode string after a semicolon. This string consists of flags to influence calc's modes@footnote{By default, Org-mode uses the standard calc modes (precision 12, angular -units degrees, fraction and symbolic modes off). However, the display -format has been changed to @code{(float 5)} to keep tables compact. +units degrees, fraction and symbolic modes off). The display format, +however, has been changed to @code{(float 5)} to keep tables compact. The default settings can be configured using the variable @code{org-calc-default-modes}.} during execution, e.g. @samp{p20} to switch the internal precision to 20 digits, @samp{n3}, @samp{s3}, @@ -1120,20 +1186,38 @@ respectively. In addition, you may provide a @code{printf} format specifier to reformat the final result. A few examples: @example - $1+$2 @r{Sum of first and second field} - $1+$2;%.2f @r{Same, format result to two decimals} - exp($2)+exp($1) @r{Math functions can be used} - $;%.1f @r{Reformat current cell to 1 decimal} - ($3-32)*5/9 @r{Degrees F -> C conversion} - $c/$1/$cm @r{Hz -> cm conversion, using @file{constants.el}} - tan($1);Dp3s1 @r{Compute in degrees, precision 3, display SCI 1} - sin($1);Dp3%.1e @r{Same, but use printf specifier for display} - vmean($2..$7) @r{Compute column range mean, using vector function} - vsum(&III) @r{Sum numbers from 3rd hline above, up to here} - taylor($3,x=7,2) @r{taylor series of $3, at x=7, second degree} +$1+$2 @r{Sum of first and second field} +$1+$2;%.2f @r{Same, format result to two decimals} +exp($2)+exp($1) @r{Math functions can be used} +$;%.1f @r{Reformat current cell to 1 decimal} +($3-32)*5/9 @r{Degrees F -> C conversion} +$c/$1/$cm @r{Hz -> cm conversion, using @file{constants.el}} +tan($1);Dp3s1 @r{Compute in degrees, precision 3, display SCI 1} +sin($1);Dp3%.1e @r{Same, but use printf specifier for display} +vmean($2..$7) @r{Compute column range mean, using vector function} +vsum(&III) @r{Sum numbers from 3rd hline above, up to here} +taylor($3,x=7,2) @r{taylor series of $3, at x=7, second degree} @end example -@node Column formulas, Advanced features, Formula syntax, Table calculations +@node Lisp formulas, Column formulas, Formula syntax, Table calculations +@subsection Emacs Lisp forms as formulas +@cindex Lisp forms, as table formulas + +It is also possible to write a formula in Emacs lisp; this can be useful +for string manipulation and control structures. If a formula starts +with a single quote followed by an opening parenthesis, then it is +evaluated as a lisp form. The evaluation should return either a string +or a number. Just as with @file{calc} formulas, you can provide a +format specifier after a semicolon. A few examples: + +@example +@r{swap the first two characters of the content of column 1} +'(concat (substring "$1" 1 2) (substring "$1" 0 1) (substring "$1" 2)) +@r{Add columns 1 and 2, equivalent to the calc's @code{$1+$2}} +'(+ $1 $2) +@end example + +@node Column formulas, Advanced features, Lisp formulas, Table calculations @subsection Column formulas @cindex column formula @cindex formula, for table column @@ -1158,7 +1242,7 @@ Instead of typing an equation into the field, you may also use the command @kbd{C-c =}. It prompts for a formula (with default taken from the @samp{#+TBLFM:} line) and applies it to the current field. A numerical prefix (e.g. @kbd{C-5 C-c =}) will apply it to that many -subsequent fields in the current column. +consecutive fields in the current column. @cindex recomputing table fields To recompute all the fields in a line, use the command @kbd{C-c *}. @@ -1203,7 +1287,7 @@ features: @noindent @b{Important}: Please note that for these special tables, recalculating the table with @kbd{C-u C-c *} will only affect rows -which are marked @samp{#} or @samp{*}, and named fields. The column +that are marked @samp{#} or @samp{*}, and named fields. The column formulas are not applied in rows with empty first field. @cindex marking characters, tables @@ -1300,7 +1384,7 @@ Detailed information will be displayed. @node Appetizer, , Editing/debugging formulas, Table calculations @subsection Appetizer -Finally, just to wet your appetite on what can be done with the fantastic +Finally, just to whet your appetite on what can be done with the fantastic @file{calc} package, here is a table that computes the Taylor series for a couple of functions (homework: try that with Excel :-) @@ -1326,7 +1410,7 @@ for a couple of functions (homework: try that with Excel :-) @cindex minor mode for tables If you like the intuitive way the Org-mode table editor works, you -might want to use it also in other modes like text-mode or mail-mode. +might also want to use it in other modes like text-mode or mail-mode. The minor mode Orgtbl-mode makes this possible. You can always toggle the mode with @kbd{M-x orgtbl-mode}. To turn it on by default, for example in mail mode, use @@ -1369,15 +1453,16 @@ possible. @chapter Hyperlinks @cindex hyperlinks -Just like HMTL, Org-mode provides links inside a file, and external -links to other files, Usenet articles, emails and much more. +Just like HTML, Org-mode provides links inside a file, and external +links to other files, Usenet articles, emails, and much more. @menu * Link format:: How links in Org-mode are formatted * Internal links:: Links to other places in the current file * External links:: URL-like links to the world * Handling links:: Creating, inserting and following -* Search Options:: Linking to a specific location +* Search options:: Linking to a specific location +* Custom searches:: When the default search is not enough * Remember:: Org-trees store quick notes @end menu @@ -1387,7 +1472,7 @@ links to other files, Usenet articles, emails and much more. @cindex format, of links Org-mode will recognize plain URL-like links and activate them as -clickable links. However, the general link format looks like this: +clickable links. The general link format, however, looks like this: @example [[link][description]] @r{or alternatively} [[link]] @@ -1399,7 +1484,7 @@ of @samp{[[link][description]]} and @samp{link} is displayed instead of @samp{[[link]]}. Links will be highlighted in the face @code{org-link}, which by default is an underlined face. You can directly edit the visible part of a link. Note that this can be either the @samp{link} -part (if there is not description) or the @samp{description} part. To +part (if there is no description) or the @samp{description} part. To edit also the invisible @samp{link} part, use @kbd{C-c C-l} with the cursor on the link. @@ -1407,7 +1492,7 @@ If you place the cursor at the beginning or just behind the end of the displayed text and press @key{BACKSPACE}, you will remove the (invisible) bracket at that location. This makes the link incomplete and the internals are again displayed as plain text. Inserting the -missing bracket does hide the link internals again. To show the +missing bracket hides the link internals again. To show the internal structure of all links, use the menu entry @code{Org->Hyperlinks->Literal links}. @@ -1422,16 +1507,18 @@ the current file. Links such as @samp{[[My Target]]} or @samp{[[My Target][Find my target]]} lead to a text search in the current file. The link can be followed with @kbd{C-c C-o} when the cursor is on the link, or with a mouse click (@pxref{Handling links}). The preferred -match for such a link is a dedicated target: The same string in double -angular brackets. Targets may be located anywhere, often it is -convenient to put them into a comment line, for example +match for such a link is a dedicated target: the same string in double +angular brackets. Targets may be located anywhere; often it is +convenient to put them into a comment line. For example @example # <<My Target>> @end example @noindent In HTML export (@pxref{HTML export}), such targets will become -named anchors for direct access through @samp{http} links. +named anchors for direct access through @samp{http} links@footnote{Note +that text before the first headline will never be exported, so the first +such target must be after the first headline.}. If no dedicated target exists, Org-mode will search for the words in the link. In the above example the search would be for @samp{my target}. @@ -1502,30 +1589,35 @@ text search such that @samp{CamelCaseLink} is equivalent to @cindex MH-E links @cindex USENET links @cindex SHELL links +@cindex Info links +@cindex elisp links -Org-mode supports links to files, websites, Usenet and email messages; -and BBDB database entries. External links are URL-like locators. The -following list shows examples for each link type. - -@example -http://www.astro.uva.nl/~dominik @r{on the web} -file:/home/dominik/images/jupiter.jpg @r{file, absolute path} -file:papers/last.pdf @r{file, relative path} -news:comp.emacs @r{Usenet link} -mailto:adent@@galaxy.net @r{Mail link} -vm:folder @r{VM folder link} -vm:folder#id @r{VM message link} -vm://myself@@some.where.org/folder#id @r{VM on remote machine} -wl:folder @r{WANDERLUST folder link} -wl:folder#id @r{WANDERLUST message link} -mhe:folder @r{MH-E folder link} -mhe:folder#id @r{MH-E message link} -rmail:folder @r{RMAIL folder link} -rmail:folder#id @r{RMAIL message link} -gnus:group @r{GNUS group link} -gnus:group#id @r{GNUS article link} -bbdb:Richard Stallman @r{BBDB link} -shell:ls *.org @r{A shell command} +Org-mode supports links to files, websites, Usenet and email messages, +and BBDB database entries. External links are URL-like locators. They +start with a short identifying string followed by a colon. There can be +no space after the colon. The following list shows examples for each +link type. + +@example +http://www.astro.uva.nl/~dominik @r{on the web} +file:/home/dominik/images/jupiter.jpg @r{file, absolute path} +file:papers/last.pdf @r{file, relative path} +news:comp.emacs @r{Usenet link} +mailto:adent@@galaxy.net @r{Mail link} +vm:folder @r{VM folder link} +vm:folder#id @r{VM message link} +vm://myself@@some.where.org/folder#id @r{VM on remote machine} +wl:folder @r{WANDERLUST folder link} +wl:folder#id @r{WANDERLUST message link} +mhe:folder @r{MH-E folder link} +mhe:folder#id @r{MH-E message link} +rmail:folder @r{RMAIL folder link} +rmail:folder#id @r{RMAIL message link} +gnus:group @r{GNUS group link} +gnus:group#id @r{GNUS article link} +bbdb:Richard Stallman @r{BBDB link} +shell:ls *.org @r{A shell command} +elisp:(find-file-other-frame "Elisp.org") @r{An elisp form to evaluate} @end example A link should be enclosed in double brackets and may contain a @@ -1540,10 +1632,10 @@ format}), for example: @cindex plain text external links Org-mode also finds external links in the normal text and activates them as links. If spaces must be part of the link (for example in -@samp{bbdb:Richard Stallman}) or to remove ambiguities about the end of +@samp{bbdb:Richard Stallman}), or you need to remove ambiguities about the end of the link, enclose them in angular brackets. -@node Handling links, Search Options, External links, Hyperlinks +@node Handling links, Search options, External links, Hyperlinks @section Handling links Org-mode provides methods to create a link in the correct syntax, to @@ -1559,13 +1651,16 @@ stored for later insertion into an Org-mode buffer (see below). For Org-mode files, if there is a @samp{<<target>>} at the cursor, the link points to the target. Otherwise it points to the current headline. For VM, RMAIL, WANDERLUST, MH-E, GNUS and BBDB buffers, the link will -indicate to the current article/entry. For W3 and W3M buffers, the link +indicate the current article/entry. For W3 and W3M buffers, the link goes to the current URL. For any other files, the link will point to -the file, with a search string (@pxref{Search Options}) pointing to the +the file, with a search string (@pxref{Search options}) pointing to the contents of the current line. If there is an active region, the -selected words will form the basis of the search string. The key -binding @kbd{C-c l} is only a suggestion - see @ref{Installation and -activation}. +selected words will form the basis of the search string. If the +automatically created link is not working correctly or accurately +enough, you can write custom functions to select the search string and +to do the search for particular file types - see @ref{Custom searches}. +The key binding @kbd{C-c l} is only a suggestion - see @ref{Installation +and activation}. @kindex C-c C-l @cindex link completion @@ -1581,7 +1676,9 @@ that you don't have to use this command to insert a link. Links in Org-mode are plain text, and you can type or paste them straight into the buffer. By using this command, the links are automatically enclosed in double brackets, and you will be asked for the optional descriptive -text. +text. If the link is a @samp{file:} link and the linked file is located +in the same directory as the current file or a subdirectory of it, the +path of the file will be inserted relative to the current directory. @kindex C-u C-c C-l @cindex file name completion @@ -1597,7 +1694,7 @@ is used, if possible with @samp{~/} for your home directory. You can force an absolute path with two @kbd{C-u} prefixes. @item C-c C-l @r{with cursor on existing link} -When the cursor is on an existing link, @kbd{C-c C-l} allows to edit the +When the cursor is on an existing link, @kbd{C-c C-l} allows you to edit the link and description parts of the link. @cindex following links @@ -1607,7 +1704,7 @@ Open link at point. This will launch a web browser for URLs (using @command{browse-url-at-point}), run vm/mh-e/wanderlust/rmail/gnus/bbdb for the corresponding links, and execute the command in a shell link. When the cursor is on an internal link, this commands runs the -corresponding search. When the cursor is on a TAGS list in a headline, +corresponding search. When the cursor is on a TAG list in a headline, it creates the corresponding TAGS view. If the cursor is on a time stamp, it compiles the agenda for that date. Furthermore, it will visit text files in @samp{file:} links with Emacs and select a suitable @@ -1620,7 +1717,7 @@ override the default application and visit the file with Emacs, use a @kindex mouse-1 @item mouse-2 @itemx mouse-1 -On links, @kbd{mouse-2} will open the link just like @kbd{C-c C-o} +On links, @kbd{mouse-2} will open the link just as @kbd{C-c C-o} would. Under Emacs 22, also @kbd{mouse-1} will follow a link. @kindex mouse-3 @@ -1643,7 +1740,7 @@ previously recorded positions. @end table -@node Search Options, Remember, Handling links, Hyperlinks +@node Search options, Custom searches, Handling links, Hyperlinks @section Search options in file links @cindex search option in file links @cindex file links, searching @@ -1651,8 +1748,14 @@ previously recorded positions. File links can contain additional information to make Emacs jump to a particular location in the file when following a link. This can be a line number or a search option after a double@footnote{For backward -compatibility, line numbers can also follow a single colon.} colon. -For example: +compatibility, line numbers can also follow a single colon.} colon. For +example, when the command @kbd{C-c l} creates a link (@pxref{Handling +links}) to a file, it encodes the words in the current line as a search +string that can be used to find this line back later when following the +link with @kbd{C-c C-o}. + +Here is the syntax of the different ways to attach a search to a file +link, together with an explanation: @example [[file:~/code/main.c::255]] @@ -1661,8 +1764,6 @@ For example: [[file:~/xx.org::/regexp/]] @end example -@noindent Here is what these options do. - @table @code @item 255 Jump to line 255. @@ -1670,7 +1771,7 @@ Jump to line 255. Search for a link target @samp{<<My Target>>}, or do a text search for @samp{my target}, similar to the search in internal links, see @ref{Internal links}. In HTML export (@pxref{HTML export}), such a file -link will become an html reference to the corresponding named anchor in +link will become an HTML reference to the corresponding named anchor in the linked file. @item *My Target In an Org-mode file, restrict search to headlines. @@ -1685,10 +1786,33 @@ sparse tree with the matches. As a degenerate case, a file link with an empty file name can be used to search the current file. For example, @code{<file:::find me>} does -a search for @samp{find me} in the current file, just like +a search for @samp{find me} in the current file, just as @samp{[[find me]]} would. -@node Remember, , Search Options, Hyperlinks +@node Custom searches, Remember, Search options, Hyperlinks +@section Custom Searches +@cindex custom search strings + +The default mechanism for creating search strings and for doing the +actual search related to a file link may not work correctly in all +cases. For example, BibTeX database files have many entries like +@samp{year="1993"} which would not result in good search strings, +because the only unique identification for a BibTeX entry is the +citation key. + +If you come across such a problem, you can write custom functions to set +the right search string for a particular file type, and to do the search +for the string in the file. Using @code{add-hook}, these functions need +to be added to the hook variables +@code{org-create-file-search-functions} and +@code{org-execute-file-search-functions}. See the docstring for these +variables for more information. Org-mode actually uses this mechanism +for Bib@TeX{} database files, and you can use the corresponding code as +an implementation example. Search for @samp{BibTeX links} in the source +file. + + +@node Remember, , Custom searches, Hyperlinks @section Remember @cindex @file{remember.el} @@ -1698,19 +1822,14 @@ store quick notes with little interruption of your work flow. See @uref{http://www.emacswiki.org/cgi-bin/wiki/RememberMode} for more information. The notes produced by @emph{Remember} can be stored in different ways, and Org-mode files are a good target. Org-mode allows -to file away notes either to a default file, or directly to the -correct location in your Org-mode outline tree. The following -customization@footnote{The three autoload forms are only necessary if -@file{org.el} is not part of the Emacs distribution or an XEmacs -package.} will tell @emph{Remember} to use org files as target, and to -create annotations compatible with Org-mode links. +you to file away notes either to a default file, or directly to the correct +location in your Org-mode outline tree. The following customization +will tell @emph{Remember} to use org files as target, and to create +annotations compatible with Org-mode links. @example (setq org-directory "~/path/to/my/orgfiles/") (setq org-default-notes-file "~/.notes") -(autoload 'org-remember-annotation "org") -(autoload 'org-remember-apply-template "org") -(autoload 'org-remember-handler "org") (setq remember-annotation-functions '(org-remember-annotation)) (setq remember-handler-functions '(org-remember-handler)) (add-hook 'remember-mode-hook 'org-remember-apply-template) @@ -1833,6 +1952,12 @@ Rotate the TODO state of the current item between The same rotation can also be done ``remotely'' from the timeline and agenda buffers with the @kbd{t} command key (@pxref{Agenda commands}). +@kindex S-@key{right} +@kindex S-@key{left} +@item S-@key{right} +@itemx S-@key{left} +Select the following/preceding TODO state, similar to cycling. Mostly +useful if more than two TODO states are possible (@pxref{TODO extensions}). @kindex C-c C-v @cindex sparse tree, for TODO @item C-c C-v @@ -1907,7 +2032,7 @@ of working on an item, for example: @end lisp @cindex completion, of TODO keywords -Changing these variables becomes only effective in a new Emacs session. +Changing these variables only becomes effective in a new Emacs session. With this setup, the command @kbd{C-c C-t} will cycle an entry from TODO to FEEDBACK, then to VERIFY, and finally to DONE. You may also use a prefix argument to quickly select a specific state. For example @@ -1976,7 +2101,7 @@ anywhere in the file: @cindex DONE, final TODO keyword Remember that the last keyword must always mean that the item is DONE -(you may use a different word, though). Also note that in each file, +(although you may use a different word). Also note that in each file, only one of the two aspects of TODO keywords can be used. After changing one of these lines, use @kbd{C-c C-c} with the cursor still in the line to make the changes known to Org-mode@footnote{Org-mode @@ -2017,7 +2142,7 @@ difference only in the agenda (@pxref{Weekly/Daily agenda}). @table @kbd @kindex @kbd{C-c ,} @item @kbd{C-c ,} -Set the priority of the current item. The command prompts for a +Set the priority of the current headline. The command prompts for a priority character @samp{A}, @samp{B} or @samp{C}. When you press @key{SPC} instead, the priority cookie is removed from the headline. The priorities can also be changed ``remotely'' from the timeline and @@ -2027,10 +2152,9 @@ agenda buffer with the @kbd{,} command (@pxref{Agenda commands}). @kindex S-@key{down} @item S-@key{up} @itemx S-@key{down} -Increase/decrease priority of current item. Note that these keys are -also used to modify time stamps (@pxref{Creating timestamps}). -Furthermore, these keys are also used by CUA-mode -(@pxref{Interaction}). +Increase/decrease priority of current headline. Note that these keys +are also used to modify time stamps (@pxref{Creating timestamps}). +Furthermore, these keys are also used by CUA-mode (@pxref{Conflicts}). @end table @node Timestamps, Tags, TODO items, Top @@ -2060,15 +2184,15 @@ of an org-tree entry. Its presence allows entries to be shown on specific dates in the agenda (@pxref{Weekly/Daily agenda}). We distinguish: @table @var +@item Plain time stamp @cindex timestamp -@item TIMESTAMP A simple time stamp just assigns a date/time to an item. This is just like writing down an appointment in a paper agenda, or like writing down -an event in a diary, when you want to take not of when something +an event in a diary, when you want to take note of when something happened. In the timeline and agenda displays, the headline of an entry associated with a plain time stamp will be shown exactly on that date. -@item TIMERANGE +@item Time stamp range @cindex timerange Two time stamps connected by @samp{--} denote a time range. The headline will be shown on the first and last day of the range, and on @@ -2080,7 +2204,7 @@ example: <2004-08-23 Mon>--<2004-08-26 Thu> @end example -@item SCHEDULED +@item Time stamp with SCHEDULED keyword @cindex SCHEDULED keyword If a time stamp is preceded by the word @samp{SCHEDULED:}, it means you are planning to start working on that task on the given date. So this is @@ -2095,7 +2219,7 @@ automatically be forwarded until completed. SCHEDULED: <2004-12-25 Sat> @end example -@item DEADLINE +@item Time stamp with DEADLINE keyword @cindex DEADLINE keyword If a time stamp is preceded by the word @samp{DEADLINE:}, the task (most likely a TODO item) is supposed to be finished on that date, and @@ -2109,6 +2233,12 @@ continuing until the entry is marked DONE. An example: The editor in charge is <bbdb:Ford Prefect> DEADLINE: <2004-02-29 Sun> @end example +@item Time stamp with CLOSED keyword +@cindex CLOSED keyword +When @code{org-log-done} is non-nil, Org-mode will automatically insert +a special time stamp each time a TODO entry is marked done +(@pxref{Progress logging}). This time stamp is enclosed in square +brackets instead of angular brackets. @end table @node Creating timestamps, , Time stamps, Timestamps @@ -2155,7 +2285,10 @@ Access the agenda for the date given by the time stamp at point @kindex C-c C-d @item C-c C-d -Insert @samp{DEADLINE} keyword along with a stamp. +Insert @samp{DEADLINE} keyword along with a stamp. The insertion will +happen in the line directly following the headline. +@c FIXME Any CLOSED timestamp will be removed.???????? + @kindex C-c C-w @cindex sparse tree, for deadlines @item C-c C-w @@ -2167,14 +2300,16 @@ all deadlines due tomorrow. @kindex C-c C-s @item C-c C-s -Insert @samp{SCHEDULED} keyword along with a stamp. +Insert @samp{SCHEDULED} keyword along with a stamp. The insertion will +happen in the line directly following the headline. Any CLOSED +timestamp will be removed. @kindex S-@key{left} @kindex S-@key{right} @item S-@key{left} @itemx S-@key{right} Change date at cursor by one day. These key bindings conflict with -CUA-mode (@pxref{Interaction}). +CUA-mode (@pxref{Conflicts}). @kindex S-@key{up} @kindex S-@key{down} @@ -2184,7 +2319,7 @@ Change the item under the cursor in a timestamp. The cursor can be on a year, month, day, hour or minute. Note that if the cursor is not at a time stamp, these same keys modify the priority of an item. (@pxref{Priorities}). The key bindings also conflict with CUA-mode -(@pxref{Interaction}). +(@pxref{Conflicts}). @kindex C-c C-y @@ -2245,9 +2380,9 @@ Choose date in calendar (only if nothing typed into minibuffer). @cindex matching, tags @cindex sparse tree, tag based -If you wish to implement a system to cross-correlate information, an -excellent way is to assign @i{tags} to headline. Org-mode has -extensive support for using tags. +If you wish to implement a system of labels and contexts for +cross-correlating information, an excellent way is to assign @i{tags} to +headlines. Org-mode has extensive support for using tags. Every headline can contain a list of tags, at the end of the headline. Tags are normal words containing letters, numbers, @samp{_}, and @@ -2279,8 +2414,8 @@ the final heading will have the tags @samp{:WORK:}, @samp{:BOSS:}, @samp{:NOTES:}, and @samp{:ACTION:}. When executing tag searches and Org-mode finds that a certain headline matches the search criterion, it will not check any sublevel headline, assuming that these likely also -match, and that the list of matches can become very long. However, this -may not be what you want, and you can influence inheritance and +match, and that the list of matches can become very long. This may +not be what you want, however, and you can influence inheritance and searching using the variables @code{org-use-tag-inheritance} and @code{org-tags-match-list-sublevels}. @@ -2289,25 +2424,92 @@ searching using the variables @code{org-use-tag-inheritance} and @cindex setting tags @kindex M-@key{TAB} -As Org-mode deals with plain text files, tags can simply be typed into -the buffer. After a colon, @kbd{M-@key{TAB}} offers completion on all -tags being used in the current buffer. There is also a special command -for inserting tags: +Tags can simply be typed into the buffer at the end of a headline. +After a colon, @kbd{M-@key{TAB}} offers completion on tags. There is +also a special command for inserting tags: @table @kbd @kindex C-c C-c @item C-c C-c @cindex completion, of tags -Enter new tags for the current headline. The minibuffer will prompt for -a list of tags and offer completion with respect to all other tags used -in the current buffer. Several tags, separated by colons, may be -specified at the prompt. After pressing @key{RET}, the tags will be -inserted and aligned to @code{org-tags-column}. When called with a -@kbd{C-u} prefix, all tags in the current buffer will be aligned to that -column, just to make things look nice. TAGS are automatically realigned -after promotion, demotion, and TODO state changes (@pxref{TODO basics}). +Enter new tags for the current headline. Org-mode will either offer +completion or a special single-key interface for setting tags, see +below. After pressing @key{RET}, the tags will be inserted and aligned +to @code{org-tags-column}. When called with a @kbd{C-u} prefix, all +tags in the current buffer will be aligned to that column, just to make +things look nice. TAGS are automatically realigned after promotion, +demotion, and TODO state changes (@pxref{TODO basics}). @end table +Org will support tag insertion based on a @emph{list of tags}. By +default this list is constructed dynamically, containing all tags +currently used in the buffer. You may also globally specify a hard list +of tags with the variable @code{org-tag-alist}. Finally you can set +the allowed tags for a given file with lines like + +@example +#+TAGS: @@WORK @@HOME @@TENNISCLUB +#+TAGS: Laptop Car PC Sailboat +@end example + +The default support method is minibuffer completion. However, Org-mode +also implements a much better method: @emph{fast tag selection}. This +method allows to select and deselect tags with a single key per tag. To +function efficiently, you should assign unique keys to all tags. This +can be done globally with + +@lisp +(setq org-tag-alist '(("@@WORK" . ?w) ("@@HOME" . ?h) ("Laptop" . ?l))) +@end lisp + +@noindent or on a per-file basis with + +@example +#+TAGS: @@WORK(w) @@HOME(h) @@TENNISCLUB(t) Laptop(l) PC(p) +@end example + +@noindent +You can also group together tags that are mutually exclusive. With +curly braces@footnote{In @code{org-mode-alist} use +@code{'(:startgroup)} and @code{'(:endgroup)}, respectively. Several +groups are allowed.} + +@example +#+TAGS: @{ @@WORK(w) @@HOME(h) @@TENNISCLUB(t) @} Laptop(l) PC(p) +@end example + +@noindent you indicate that at most one of @samp{@@WORK}, @samp{@@HOME}, +and @samp{@@SAILBOAT} should be selected. + +@noindent Don't forget to press @kbd{C-c C-c} with the cursor in one of +these lines to activate any changes. + +If at least one tag has a selection key, pressing @kbd{C-c C-c} will +automatically present you with a special interface, listing inherited +tags, the tags of the current headline, and a list of all legal tags +with corresponding keys@footnote{Keys will automatically assigned to +tags which have no configured keys.}. Pressing keys for the tags will +add or remove them from the list of tags in the current line. Selecting +a tag in a group of mutually exclusive tags will turn off any other tags +from that group. @key{SPC} clears all tags for this line, @kbd{RET} +accepts the modified set, and @kbd{C-g} aborts without installing +changes. This method lets you assign tags to a headline with very few +keys. With the above setup, you could clear the current tags and set +@samp{@@HOME}, @samp{Laptop} and @samp{PC} tags with just the following +keys: @kbd{C-c C-c @key{SPC} h l p @key{RET}}. Switching from +@samp{@@HOME} to @samp{@@WORK} would be done with @kbd{C-c C-c w +@key{RET}}. + +What if you have globally defined your preferred set of tags using the +variable @code{org-tag-alist}, but would like to use a dynamic tag list +in a specific file? Just add an empty TAGS option line to that file: + +@example +#+TAGS: +@end example + + + @node Tag searches, , Setting tags, Tags @section Tag searches @cindex tag searches @@ -2629,7 +2831,6 @@ Show the global TODO list. This collects the TODO items from all agenda files (@pxref{Agenda views}) into a single buffer. The buffer is in @code{agenda-mode}, so there are commands to examine and manipulate the TODO entries directly from that buffer (@pxref{Agenda commands}). -@xref{Global TODO list}, for more information. @kindex C-c a T @item C-c a T Like the above, but allows selection of a specific TODO keyword. You can @@ -2750,7 +2951,9 @@ Go to the original location of the item and delete other windows. @item f Toggle Follow mode. In Follow mode, as you move the cursor through the agenda buffer, the other window always shows the corresponding -location in the org file. +location in the org file. The initial setting for this mode in new +agenda buffers can be set with the variable +@code{org-agenda-start-with-follow-mode}. @kindex l @item l @@ -2844,6 +3047,14 @@ key for this. @itemx S-@key{down} Decrease the priority of the current item. +@kindex C-c C-s +@item C-c C-s +Schedule this item + +@kindex C-c C-d +@item C-c C-d +Set a deadline for this item. + @kindex S-@key{right} @item S-@key{right} Change the time stamp associated with the current line by one day into @@ -2869,7 +3080,7 @@ on my keyboard. @item i Insert a new entry into the diary. Prompts for the type of entry (day, weekly, monthly, yearly, anniversary, cyclic) and creates a new -entry in the diary, just like @kbd{i d} etc. would do in the calendar. +entry in the diary, just as @kbd{i d} etc. would do in the calendar. The date is taken from the cursor position. @tsubheading{Calendar commands} @@ -2917,14 +3128,14 @@ visit org files will not be removed. @end table -@node Exporting, Miscellaneous, Agenda views, Top +@node Exporting, Publishing, Agenda views, Top @chapter Exporting @cindex exporting Org-mode documents can be exported into a variety of other formats. For printing and sharing of notes, ASCII export produces a readable and -simple version of an Org-mode file. HTML export allows to publish a -notes file on the web, while the XML format provides a solid base for +simple version of an Org-mode file. HTML export allows you to publish a +notes file on the web, while the XOXO format provides a solid base for exchange with a broad range of other applications. To incorporate entries with associated times like deadlines or appointments into a desktop calendar program like iCal, Org-mode can also produce extracts @@ -2937,7 +3148,7 @@ produced. @xref{Text interpretation}, for more details. @menu * ASCII export:: Exporting to plain ASCII * HTML export:: Exporting to HTML -* XML export:: Exporting to XML +* XOXO export:: Exporting to XOXO * iCalendar export:: Exporting in iCalendar format * Text interpretation:: How the exporter looks at the file @end menu @@ -2946,7 +3157,7 @@ produced. @xref{Text interpretation}, for more details. @section ASCII export @cindex ASCII export -ASCII export produces an simple and very readable version of an Org-mode +ASCII export produces a simple and very readable version of an Org-mode file. @cindex region, active @@ -2959,6 +3170,9 @@ Export as ASCII file. If there is an active region, only the region will be exported. For an org file @file{myfile.org}, the ASCII file will be @file{myfile.txt}. The file will be overwritten without warning. +@kindex C-c C-x v a +@item C-c C-x v a +Export only the visible part of the document. @end table @cindex headline levels, for exporting @@ -2968,19 +3182,25 @@ will be exported as itemized lists. If you want that transition to occur at a different level, specify it with a prefix argument. For example, @example -@kbd{C-1 C-c C-x a org-export-as-ascii} +@kbd{C-1 C-c C-x a} @end example @noindent -creates only top level headlines and does the rest as items. - -@node HTML export, XML export, ASCII export, Exporting +creates only top level headlines and does the rest as items. When +headlines are converted to items, the indentation of the text following +the headline is changed to fit nicely under the item. This is done with +the assumption that the first bodyline indicates the base indenation of +the body text. Any indenation larger than this is adjusted to preserve +the layout relative to the first line. Should there be lines with less +indentation than the first, these are left alone. + +@node HTML export, XOXO export, ASCII export, Exporting @section HTML export @cindex HTML export -Org-mode contains an HTML exporter with extensive HTML formatting, in -ways similar to John Grubers @emph{markdown} language, but with -additional support for tables. +Org-mode contains an HTML (XHTML 1.0 strict) exporter with extensive +HTML formatting, in ways similar to John Grubers @emph{markdown} +language, but with additional support for tables. @cindex region, active @cindex active region @@ -2992,6 +3212,11 @@ Export as HTML file @file{myfile.html}. @kindex C-c C-x b @item C-c C-x b Export as HTML file and open it with a browser. +@kindex C-c C-x v h +@kindex C-c C-x v b +@item C-c C-x v h +@item C-c C-x v b +Export only the visible part of the document. @end table @cindex headline levels, for exporting @@ -3008,12 +3233,36 @@ at a different level, specify it with a prefix argument. For example, creates two levels of headings and does the rest as items. If you want to include HTML tags which should be interpreted as such, -mark them with a @samp{@@} like in @samp{@@<b>bold text@@</b>}. +mark them with @samp{@@} as in @samp{@@<b>bold text@@</b>}. Plain @samp{<} and @samp{>} are always transformed to @samp{<} and @samp{>} in HTML export. -You can also give style information for the exported file. The -default specification can be configured through the option +@cindex links, in HTML export +@cindex internal links, in HTML export +@cindex external links, in HTML export +Internal links (@pxref{Internal links}) will continue to work in HTML +files only if they match a dedicated @samp{<<target>>}. Automatic links +created by radio targets (@pxref{Radio targets}) will also work in the +HTML file. Links to external files will still work if the HTML file is +in the same directory as the Org-mode file. Links to other @file{.org} +files will be translated into HTML links under the assumption that an +HTML version also exists of the linked file. For information related to +linking files while publishing them to a publishing directory see +@ref{Publishing links}. + +You can also give style information for the exported file. The HTML +exporter assigns the following CSS classes to appropriate parts of the +document - your style specifications may change these: +@example +.todo @r{TODO keywords} +.done @r{the DONE keyword} +.timestamp @r{time stamp} +.timestamp-kwd @r{keyword associated with a time stamp, like SCHEDULED} +.tag @r{tag in a headline} +.target @r{target for links} +@end example + +The default style specification can be configured through the option @code{org-export-html-style}. If you want to use a file-local style, you may use file variables, best wrapped into a COMMENT section at the end of the outline tree. For example: @@ -3023,10 +3272,10 @@ end of the outline tree. For example: # Local Variables: # org-export-html-style: " <style type=\"text/css\"> - p @{font-weight: normal; color: gray; @} - h1 @{color: black; @} - </style>" -# End: *** +# p @{font-weight: normal; color: gray; @} +# h1 @{color: black; @} +# </style>" +# End: @end example Remember to execute @kbd{M-x normal-mode} after changing this to make @@ -3037,21 +3286,24 @@ section in the buffer. @c FIXME: More about header and footer styles @c FIXME: Talk about links and targets. -@node XML export, iCalendar export, HTML export, Exporting -@section XML export -@cindex XML export +@node XOXO export, iCalendar export, HTML export, Exporting +@section XOXO export +@cindex XOXO export -Org-mode contains an XML exporter that produces XOXO-style XML. +Org-mode contains an exporter that produces XOXO-style output. Currently, this exporter only handles the general outline structure and does not interpret any additional Org-mode features. @table @kbd @kindex C-c C-x C-x @item C-c C-x C-x -Export as XML file @file{myfile.xml}. +Export as XOXO file @file{myfile.html}. +@kindex C-c C-x v +@item C-c C-x v x +Export only the visible part of the document. @end table -@node iCalendar export, Text interpretation, XML export, Exporting +@node iCalendar export, Text interpretation, XOXO export, Exporting @section iCalendar export @cindex iCalendar export @@ -3128,8 +3380,6 @@ the first headline will not be exported either. Toggle the COMMENT keyword at the beginning of an entry. @end table - - @node Enhancing text, Export options, Comment lines, Text interpretation @subsection Enhancing text for export @cindex enhancing text @@ -3188,6 +3438,11 @@ fixed-width font. @item C-c : Toggle fixed-width for entry (QUOTE) or region, see below. @end table + +@cindex linebreak, forced +@item +A double backslash @emph{at the end of a line} enforces a line break at +this position. @end itemize If these conversions conflict with your habits of typing ASCII text, @@ -3231,7 +3486,7 @@ you can: @cindex section-numbers @cindex table of contents @cindex linebreak preservation -@cindex quoted html tags +@cindex quoted HTML tags @cindex fixed-width sections @cindex tables @cindex @TeX{}-like syntax for sub- and superscripts @@ -3242,7 +3497,7 @@ H: @r{set the number of headline levels for export} num: @r{turn on/off section-numbers} toc: @r{turn on/off table of contents} \n: @r{turn on/off linebreak-preservation} -@@: @r{turn on/off quoted html tags} +@@: @r{turn on/off quoted HTML tags} :: @r{turn on/off fixed-width sections} |: @r{turn on/off tables} ^: @r{turn on/off @TeX{}-like syntax for sub- and superscripts.} @@ -3250,7 +3505,313 @@ toc: @r{turn on/off table of contents} TeX: @r{turn on/off @TeX{} macros} @end example -@node Miscellaneous, Index, Exporting, Top +@node Publishing, Miscellaneous, Exporting, Top +@chapter Publishing + +Org-mode includes@footnote{@file{org-publish.el} is not yet part of +emacs, so if you are using @file{org.el} as it comes with Emacs, you +need to download this file separately. Also make sure org.el is at +least version 4.27.} a publishing management system +that allows you to configure automatic HTML conversion of +@emph{projects} composed of interlinked org files. This system is +called @emph{org-publish}. You can also configure org-publish to +automatically upload your exported HTML pages and related attachments, +such as images and source code files, to a web server. Org-publish turns +org-mode into a web-site authoring tool. + +Org-publish has been contributed to Org-mode by David O'Toole. + +@menu +* Configuration:: Defining projects +* Sample configuration:: Example projects +* Triggering publication:: Publication commands +@end menu + +@node Configuration, Sample configuration, Publishing, Publishing +@section Configuration + +Publishing needs significant configuration to specify files, destination +and many other properties of a project. + +@menu +* Project alist:: The central configuration variable +* File sources and destinations:: From here to there +* Selecting files:: What files are part of the project? +* Publishing action:: Setting the function doing the publishing +* Publishing options:: Tweaking HTML export +* Publishing links:: Which links keep working after publishing? +* Project page index:: Publishing a list of project files +@end menu + +@node Project alist, File sources and destinations, Configuration, Configuration +@subsection The variable @code{org-publish-project-alist} + +Org-publish is configured almost entirely through setting the value of +one variable, called @code{org-publish-project-alist}. +Each element of the list configures one project, and may be in one of +the two following forms: + +@lisp +("project-name" :property value :property value ...) + +@r{or} + +("project-name" :components ("project-name" "project-name" ...)) + +@end lisp + +In both cases, projects are configured by specifying property values. +A project defines the set of files that will be published, as well as +the publishing configuration to use when publishing those files. When +a project takes the second form listed above, the individual members +of the ``components'' property are taken to be components of the +project, which group together files requiring different publishing +options. When you publish such a ``meta-project'' all the components +will also publish. + +@node File sources and destinations, Selecting files, Project alist, Configuration +@subsection Sources and destinations for files + +Most properties are optional, but some should always be set. In +particular, org-publish needs to know where to look for source files, +and where to put published files. + +@multitable @columnfractions 0.3 0.7 +@item @code{:base-directory} +@tab Directory containing publishing source files +@item @code{:publishing-directory} +@tab Directory (possibly remote) where output files will be published. +@end multitable +@noindent + +@node Selecting files, Publishing action, File sources and destinations, Configuration +@subsection Selecting files + +By default, all files with extension @file{.org} in the base directory +are considered part of the project. This can be modified by setting the +properties +@multitable @columnfractions 0.25 0.75 +@item @code{:base-extension} +@tab Extension (without the dot!) of source files. This actually is a +regular expression. + +@item @code{:exclude} +@tab Regular expression to match file names that should not be +published, even though they have been selected on the basis of their +extension. + +@item @code{:include} +@tab List of files to be included regardless of @code{:base-extension} +and @code{:exclude}. +@end multitable + +@node Publishing action, Publishing options, Selecting files, Configuration +@subsection Publishing Action + +Publishing means that a file is copied to the destination directory and +possibly transformed in the process. The default transformation is to +export Org-mode files as HTML files, and this is done by the function +@code{org-publish-org-to-html} which calls the HTML exporter +(@pxref{HTML export}). Other files like images only need to be copied +to the publishing destination. For non-Org-mode files, you need to +specify the publishing function. + +@multitable @columnfractions 0.3 0.7 +@item @code{:publishing-function} +@tab Function executing the publication of a file. +@end multitable + +The function must accept two arguments: a property list containing at +least a @code{:publishing-directory} property, and the name of the file +to be published. It should take the specified file, make the necessary +transformation (if any) and place the result into the destination folder. +You can write your own publishing function, but @code{org-publish} +provides one for attachments (files that only need to be copied): +@code{org-publish-attachment}. + +@node Publishing options, Publishing links, Publishing action, Configuration +@subsection Options for the HTML exporter + +The property list can be used to set many export options for the HTML +exporter. In most cases, these properties correspond to user variables +in Org-mode. The table below lists these properties along with the +variable they belong to. See the documentation string for the +respective variable for details. + +@multitable @columnfractions 0.3 0.7 +@item @code{:language} @tab @code{org-export-default-language} +@item @code{:headline-levels} @tab @code{org-export-headline-levels} +@item @code{:section-numbers} @tab @code{org-export-with-section-numbers} +@item @code{:table-of-contents} @tab @code{org-export-with-toc} +@item @code{:emphasize} @tab @code{org-export-with-emphasize} +@item @code{:sub-superscript} @tab @code{org-export-with-sub-superscripts} +@item @code{:TeX-macros} @tab @code{org-export-with-TeX-macros} +@item @code{:fixed-width} @tab @code{org-export-with-fixed-width} +@item @code{:timestamps} .@tab @code{org-export-with-timestamps} +@item @code{:tags} .@tab @code{org-export-with-tags} +@item @code{:tables} @tab @code{org-export-with-tables} +@item @code{:table-auto-headline} @tab @code{org-export-highlight-first-table-line} +@item @code{:style} @tab @code{org-export-html-style} +@item @code{:convert-org-links} @tab @code{org-export-html-link-org-files-as-html} +@item @code{:inline-images} @tab @code{org-export-html-inline-images} +@item @code{:expand-quoted-html} @tab @code{org-export-html-expand} +@item @code{:timestamp} @tab @code{org-export-html-with-timestamp} +@item @code{:publishing-directory} @tab @code{org-export-publishing-directory} +@item @code{:preamble} @tab @code{org-export-html-preamble} +@item @code{:postamble} @tab @code{org-export-html-postamble} +@item @code{:auto-preamble} @tab @code{org-export-html-auto-preamble} +@item @code{:auto-postamble} @tab @code{org-export-html-auto-postamble} +@item @code{:author} @tab @code{user-full-name} +@item @code{:email} @tab @code{user-mail-address} +@end multitable + +When a property is given a value in org-publish-project-alist, its +setting overrides the value of the corresponding user variable (if any) +during publishing. options set within a file (@pxref{Export +options}), however, override everything. + +@node Publishing links, Project page index, Publishing options, Configuration +@subsection Links between published files + +To create a link from one Org-mode file to another, you would use +something like @samp{[[file:foo.org][The foo]]} or simply +@samp{file:foo.org.} (@pxref{Hyperlinks}). Upon publishing this link +becomes a link to @file{foo.html}. In this way, you can interlink the +pages of your "org web" project and the links will work as expected when +you publish them to HTML. + +You may also link to related files, such as images. Provided you are +careful with relative pathnames, and provided you have also configured +org-publish to upload the related files, these links will work +too. @ref{Complex example} for an example of this usage. + +@node Project page index, , Publishing links, Configuration +@subsection Project page index + +The following properties may be used to control publishing of an +index of files or summary page for a given project. + +@multitable @columnfractions 0.25 0.75 +@item @code{:auto-index} +@tab When non-nil, publish an index during org-publish-current-project or +org-publish-all. + +@item @code{:index-filename} +@tab Filename for output of index. Defaults to @file{index.org} (which +becomes @file{index.html}). + +@item @code{:index-title} +@tab Title of index page. Defaults to name of file. + +@item @code{:index-function} +@tab Plugin function to use for generation of index. +Defaults to @code{org-publish-org-index}, which generates a plain list +of links to all files in the project. +@end multitable + +@node Sample configuration, Triggering publication, Configuration, Publishing +@section Sample configuration + +Below we provide two example configurations. The first one is a simple +project publishing only a set of Org-mode files. The second example is +more complex, with a multi-component project. + +@menu +* Simple example:: One-component publishing +* Complex example:: A multi-component publishing example +@end menu + +@node Simple example, Complex example, Sample configuration, Sample configuration +@subsection Example: simple publishing configuration + +This example publishes a set of Org-mode files to the @file{public_html} +directory on the local machine. + +@lisp +(setq org-publish-project-alist + '(("org" + :base-directory "~/org/" + :publishing-directory "~/public_html" + :section-numbers nil + :table-of-contents nil + :style "<link rel=stylesheet + href=\"../other/mystyle.css\" + type=\"text/css\">"))) +@end lisp + +@node Complex example, , Simple example, Sample configuration +@subsection Example: complex publishing configuration + +This more complicated example publishes an entire website, including +org files converted to HTML, image files, emacs lisp source code, and +stylesheets. The publishing-directory is remote and private files are +excluded. + +To ensure that links are preserved, care should be taken to replicate +your directory structure on the web server, and to use relative file +paths. For example, if your org files are kept in @file{~/org} and your +publishable images in @file{~/images}, you'd link to an image with +@c +@example +file:../images/myimage.png +@end example +@c +On the web server, the relative path to the image should be the +same. You can accomplish this by setting up an "images" folder in the +right place on the webserver, and publishing images to it. + +@lisp +(setq org-publish-project-alist + '(("orgfiles" + :base-directory "~/org/" + :base-extension "org" + :publishing-directory "/ssh:user@@host:~/html/notebook/" + :publishing-function org-publish-org-to-html + :exclude "PrivatePage.org" ;; regexp + :headline-levels 3 + :section-numbers nil + :table-of-contents nil + :style "<link rel=stylesheet + href=\"../other/mystyle.css\" type=\"text/css\">" + :auto-preamble t + :auto-postamble nil) + + ("images" + :base-directory "~/images/" + :base-extension "jpg\\|gif\\|png" + :publishing-directory "/ssh:user@@host:~/html/images/" + :publishing-function org-publish-attachment) + + ("other" + :base-directory "~/other/" + :base-extension "css\\|el" + :publishing-directory "/ssh:user@@host:~/html/other/" + :publishing-function org-publish-attachment) + ("website" :components ("orgfiles" "images" "other")))) +@end lisp + +@node Triggering publication, , Sample configuration, Publishing +@section Triggering publication + +Once org-publish is properly configured, you can publish with the +following functions: + +@table @kbd +@item C-c C-e c +Prompts for a specific project to publish. +@item C-c C-e p +Publishes the project the current file is part of. +@item C-c C-e f +Publishes only the current file. +@item C-c C-e a +Publish all projects. +@end table + +Org uses timestamps to track when a file has changed. The above +functions normally only publish changed files. You can override this and +force publishing of all files by giving a prefix argument. + +@node Miscellaneous, Index, Publishing, Top @chapter Miscellaneous @menu @@ -3332,7 +3893,7 @@ lines into the buffer (@pxref{Summary of in-buffer settings}). Org-mode uses special lines in the buffer to define settings on a per-file basis. These lines start with a @samp{#+} followed by a keyword, a colon, and then individual words defining a setting. Several -settings words con be in the same line, but you can also have multiple +setting words can be in the same line, but you can also have multiple lines for the keyword. While these settings are described throughout the manual, here is a summary. After changing any of those lines in the buffer, press @kbd{C-c C-c} with the cursor still in the line to @@ -3359,6 +3920,12 @@ variable is @code{org-startup-align-all-tables}, with a default value align @r{align all tables} noalign @r{don't align tables on startup} @end example +Logging when a TODO item is marked DONE (variable @code{org-log-done}) +can be configured using these options. +@example +logging @r{record a timestamp when an item is marked DONE} +nologging @r{don't record when items are marked DONE} +@end example Here are the options for hiding leading stars in outline headings. The corresponding variables are @code{org-hide-leading-stars} and @code{org-odd-levels-only}, both with a default setting @code{nil} @@ -3370,9 +3937,13 @@ odd @r{allow only odd outline levels (1,3,...)} oddeven @r{allow all outline levels} @end example @item #+SEQ_TODO: #+TYP_TODO: -These lines that the TODO keywords and their interpretation in the +These lines set the TODO keywords and their interpretation in the current file. The corresponding variables are @code{org-todo-keywords} and @code{org-todo-interpretation}. +@item #+TAGS: TAG1(c1) TAG2(c2) +These lines (several such lines are allowed) specify the legal tags in +this file, and (potentially) the corresponding @emph{fast tag selection} +keys. The corresponding variable is @code{org-tag-alist}. @item #+CATEGORY: This line sets the category for the agenda file. The category applies for all subsequent lines until the next @samp{#+CATEGORY} line, or the @@ -3380,7 +3951,7 @@ end of the file. @item #+TBLFM: This line contains the formulas for the table directly above the line. @item #+TITLE:, #+AUTHOR:, #+EMAIL:, #+LANGUAGE:, #+TEXT:, #+OPTIONS: -These lines provide setting for exporting files. For more details see +These lines provide settings for exporting files. For more details see @ref{Export options}. @end table @@ -3392,7 +3963,7 @@ The key @kbd{C-c C-c} has many purposes in org-mode, which are all mentioned scattered throughout this manual. One specific function of this key is to add @emph{tags} to a headline (@pxref{Tags}). In many other circumstances it means something like @emph{Hey Org-mode, look -here and update according to what you see here}. Here is a summary what +here and update according to what you see here}. Here is a summary of what this means in different contexts. @itemize @minus @@ -3401,14 +3972,14 @@ this means in different contexts. @c into the current line, aligned to `org-tags-column'. When called @c with prefix arg, realign all tags in the current buffer. @item -If the cursor is in one of the special #+KEYWORD lines, this +If the cursor is in one of the special @code{#+KEYWORD} lines, this triggers scanning the buffer for these lines and updating the information. @item If the cursor is inside a table, realign the table. This command works even if the automatic table editor has been turned off. @item -If the cursor is on a #+TBLFM line, re-apply the formulas to +If the cursor is on a @code{#+TBLFM} line, re-apply the formulas to the entire table. @item If the cursor is inside a table created by the @file{table.el} package, @@ -3418,8 +3989,11 @@ If the current buffer is a remember buffer, close note and file it. with a prefix argument, file it without further interaction to the default location. @item -If the cursor is on a <<<target>>>, update radio targets and corresponding -links in this buffer. +If the cursor is on a @code{<<<target>>>}, update radio targets and +corresponding links in this buffer. +@item +If the cursor is in a plain list item with a checkbox, toggle the status +of the checkbox. @item If the cursor is on a numbered item in a plain list, renumber the ordered list. @@ -3568,27 +4142,50 @@ rather use @kbd{C-c .} to re-insert the timestamp. @cindex FAQ @enumerate - -@cindex allout.el, conflict with @cindex @code{keymapp nil} error @item @b{When I try to use Org-mode, I always get @code{(wrong-type-argument keymapp nil)}}.@* -This is a conflict with an outdated version of the @file{allout.el} -package which pretends to be also the standard outline-mode but is not. -This happens with older versions of @file{allout.el}, for example the -one distributed with Emacs 21. Upgrade to Emacs 22 and this problem -will disappear. If for some reason you cannot do this, make sure that -org.el is loaded @emph{before} @file{allout.el}, for example by putting -@code{(require 'org)} early enough into your @file{.emacs} file. +@cindex allout.el, conflict with +This is a conflict with an outdated version of the @file{allout.el}. +See @ref{Conflicts}. @item @b{Org-mode seems to be a useful default mode for the various @file{README} files I have scattered through my directories. How do I turn it on for all @file{README} files?} -@c @* -@example +@lisp (add-to-list 'auto-mode-alist '("README$" . org-mode)) -@end example +@end lisp + +@item @b{I would like to use editing features of org-mode in other +modes, is this possible?}@* +@c +Not really. For tables there is @code{orgtbl-mode} which implements the +table editor as a minor mode. For other features you need to switch to +Org-mode temporarily, or prepare text in a different buffer. + +@item @b{Can I get the visibility-cycling features in outline-mode and +outline-minor-mode?}@* +@c +Yes, these functions are written in a way that they are independent of +the outline setup. The following setup provides standard Org-mode +functionality in outline-mode on @key{TAB} and @kbd{S-@key{TAB}}. For +outline-minor-mode, we use @kbd{C-@key{TAB}} instead of @key{TAB}, +because @key{TAB} usually has mode-specific tasks. +@lisp +(add-hook 'outline-minor-mode-hook + (lambda () + (define-key outline-minor-mode-map [(control tab)] 'org-cycle) + (define-key outline-minor-mode-map [(shift tab)] 'org-global-cycle))) +(add-hook 'outline-mode-hook + (lambda () + (define-key outline-mode-map [(tab)] 'org-cycle) + (define-key outline-mode-map [(shift tab)] 'org-global-cycle))) +@end lisp + +Or check out @file{outline-magic.el}, which does this and also provides +promotion and demotion functionality. @file{outline-magic.el} is +available at @url{http://www.astro.uva.nl/~dominik/Tools/OutlineMagic}. @item @b{Some of my links stopped working after I upgraded to a version 4.20 or later. Why is this, and how can I fix it?}@* @@ -3617,8 +4214,8 @@ Would I let you down like that? If you must, you can do this org-link-format "<%s>") @end lisp -@item @b{When I am executing shell links I always get a -confirmation prompt and need to type @kbd{yes @key{RET}}, thats 4 key +@item @b{When I am executing shell/elisp links I always get a +confirmation prompt and need to type @kbd{yes @key{RET}}, that's 4 key presses! Can I get rid of this?}@* @c @cindex shell links, confirmation @@ -3628,10 +4225,11 @@ potentially dangerous commands. For example, imagine a link @samp{[[shell:rm -rf ~/*][Google Search]]}. In an Org-mode buffer, this command would look like @samp{Google Search}, but really it would remove your home directory. If you wish, you can make it easier to respond to -the query by setting @code{org-confirm-shell-links} to @code{y-or-n-p}. -Then a single @kbd{y} keypress will be enough to confirm shell links. -It is also possible to turn off this check entirely, but I do not -recommend to do this. Be warned. +the query by setting @code{org-confirm-shell-link-function} and/or +@code{org-confirm-elisp-link-function} to @code{y-or-n-p}. Then a +single @kbd{y} keypress will be enough to confirm those links. It is +also possible to turn off this check entirely, but I do not recommend to +do this. Be warned. @item @b{All these stars are driving me mad, I just find the Emacs outlines unreadable. Can't you just put white space and a single star as a @@ -3681,7 +4279,7 @@ export. Marking can be done with @kbd{C-c @@ C-x C-x}, for example. @item @b{Org-mode takes over the S-cursor keys. I also want to use CUA-mode, is there a way to fix this conflict?}@* -Yes, see @ref{Interaction}. +Yes, see @ref{Conflicts}. @item @b{One of my table columns has started to fill up with @samp{#ERROR}. What is going on?}@* @@ -3712,10 +4310,8 @@ emacs diary?}@* Since the org-mode agenda is much more powerful and can contain the diary (@pxref{Calendar/Diary integration}), you should think twice before deciding to do this. Integrating Org-mode information into the -diary is, however, possible. The following steps are necessary: -Autoload the function @command{org-diary} as shown above under -@ref{Installation and activation}. You also need to use @emph{fancy -diary display} by setting in @file{.emacs}: +diary is, however, possible. You need to turn on @emph{fancy diary +display} by setting in @file{.emacs}: @lisp (add-hook 'diary-display-hook 'fancy-diary-display) @@ -3738,7 +4334,7 @@ You may also select specific files with If you now launch the calendar and press @kbd{d} to display a diary, the headlines of entries containing a timestamp, date range, schedule, or -deadline referring to the selected date will be listed. Just like in +deadline referring to the selected date will be listed. Just like Org-mode's agenda view, the diary for @emph{today} contains additional entries for overdue deadlines and scheduled items. See also the documentation of the @command{org-diary} function. Under XEmacs, it is @@ -3751,7 +4347,19 @@ the agenda buffer. @node Interaction, Bugs, FAQ, Miscellaneous @section Interaction with other packages @cindex packages, interaction with other -Org-mode can cooperate with the following packages: +Org-mode lives in the world of GNU Emacs and interacts in various ways +with other code out there. + +@menu +* Extensions:: Third-party extensions for Org-mode +* Cooperation:: Packages Org-mode cooperates with +* Conflicts:: Packages that lead to conflicts +@end menu + +@node Extensions, Cooperation, Interaction, Interaction +@subsection Third-party extensions for Org-mode + +The following extensions for Org-mode have been written by other people: @table @asis @cindex @file{org-mouse.el} @@ -3760,11 +4368,23 @@ This package implements extended mouse functionality for Org-mode. It allows you to cycle visibility and to edit the document structure with the mouse. Best of all, it provides a context-sensitive menu on @key{mouse-3} that changes depending on the context of a mouse-click. -Use a search engine to find this package on the web. -@cindex @file{table.el} -@item @file{table.el} by Takaaki Ota -Org mode cooperates with table.el, see @ref{table.el}. @file{table.el} -is part of Emacs 22. +@file{org-mouse.el} is freely available at @url{http://www.cl.cam.ac.uk/~pz215/files/org-mouse.el}. +@cindex @file{org-publish.el} +@item @file{org-publish.el} by David O'Toole +This package provides facilities for publishing related sets of Org-mode +files together with linked files like images as a webpages. It is +highly configurable and can be used for other publishing purposes as +well. As of Org-mode version 4.30, @file{org-publish.el} is part of +the Org-mode distribution. It is not yet part of Emacs, however, due to +a pending copyright assignment. In the mean time, @file{org-publish.el} +can be downloaded from David's site: +@url{http://dto.freeshell.org/e/org-publish.el}. +@end table + +@node Cooperation, Conflicts, Extensions, Interaction +@subsection Packages that Org-mode cooperates with + +@table @asis @cindex @file{calc.el} @item @file{calc.el} by Dave Gillespie Org-mode uses the calc package for implementing spreadsheet @@ -3787,7 +4407,31 @@ at @url{http://www.astro.uva.nl/~dominik/Tools}. Org-mode checks for the function @code{constants-get}, which has to be autoloaded in your setup. See the installation instructions in the file @file{constants.el}. +@item @file{remember.el} by John Wiegley @cindex @file{remember.el} +Org mode cooperates with remember, see @ref{Remember}. +@file{Remember.el} is not part of Emacs, find it on the web. +@cindex @file{table.el} +@item @file{table.el} by Takaaki Ota +Org mode cooperates with table.el, see @ref{table.el}. @file{table.el} +is part of Emacs 22. +@end table + +@node Conflicts, , Cooperation, Interaction +@subsection Packages that lead to conflicts with Org-mode + +@table @asis + +@cindex @file{allout.el} +@item @file{allout.el} by Ken Manheimer +Startup of Org-mode may fail with the error message +@code{(wrong-type-argument keymapp nil)} when there is an outdated +version @file{allout.el} on the load path, for example the version +distributed with Emacs 21.x. Upgrade to Emacs 22 and this problem will +disappear. If for some reason you cannot do this, make sure that org.el +is loaded @emph{before} @file{allout.el}, for example by putting +@code{(require 'org)} early enough into your @file{.emacs} file. + @cindex @file{CUA.el} @item @file{CUA.el} by Kim. F. Storm Keybindings in Org-mode conflict with the @kbd{S-<cursor>} keys @@ -3807,11 +4451,13 @@ S-RET -> C-S-RET Yes, these are unfortunately more difficult to remember. If you want to have other replacement keys, look at the variable @code{org-disputed-keys}. -@item @file{remember.el} by John Wiegley -Org mode cooperates with remember, see @ref{Remember}. -@file{Remember.el} is not part of Emacs, find it on the web. +@item @file{windmove.el} by Hovav Shacham +@cindex @file{windmove.el} +Also this package uses the @kbd{S-<cursor>} keys, so everything written +in the paragraph above about CUA mode also applies here. @end table + @node Bugs, Acknowledgments, Interaction, Miscellaneous @section Bugs @cindex bugs @@ -3835,7 +4481,7 @@ Text in an entry protected with the @samp{QUOTE} keyword should not autowrap. @item When the application called by @kbd{C-c C-o} to open a file link fails -(for example because the application does not exits or refuses to open +(for example because the application does not exist or refuses to open the file), it does so silently. No error message is displayed. @item Plain list items should be able to hold a TODO item. Unfortunately this @@ -3851,9 +4497,8 @@ Recalculating a table line applies the formulas from left to right. If a formula uses @emph{calculated} fields further down the row, multiple recalculation may be needed to get all fields consistent. @item -You can only make a single word boldface or italic. To emphasize -several words in a row, each must have the emphasize markers, like in -@samp{*three* *bold* *words*}. +Several words in a row may @b{*be made bold*}, but this does not work if +the string is distributed over two lines. @item The exporters work well, but could be made more efficient. @end itemize @@ -3863,7 +4508,7 @@ The exporters work well, but could be made more efficient. @cindex acknowledgments @cindex thanks -Org-mode was written by Carsten Dominik, who still maintains it at the +Org-mode was created by @value{AUTHOR}, who still maintains it at the Org-mode homepage @uref{http://www.astro.uva.nl/~dominik/Tools/org/}. The following people (in alphabetic order) have helped the development along with ideas, suggestions and patches. Many thanks to all of you, @@ -3871,78 +4516,93 @@ Org-mode would not be what it is without your input. @itemize @bullet @item -Thomas Baumann contributed the code for links to the MH-E email system. +@i{Thomas Baumann} contributed the code for links to the MH-E email +system. @item -Alex Bochannek provided a patch for rounding time stamps. +@i{Alex Bochannek} provided a patch for rounding time stamps. @item -Charles Caves' suggestion sparked the implementation of templates for -Remember. +@i{Charles Cave}'s suggestion sparked the implementation of templates +for Remember. @item -Pavel Chalmoviansky influenced the agenda treatment of items with +@i{Pavel Chalmoviansky} influenced the agenda treatment of items with specified time. @item -Sacha Chua suggested to copy some linking code from Planner. +@i{Gregory Chenov} patched support for lisp forms into table +calculations and improved XEmacs compatibility. +@item +@i{Sacha Chua} suggested to copy some linking code from Planner. +@item +@i{Kees Dullemond} inspired the use of narrowed tabled columns. @item -Kees Dullemond inspired the use of narrowed tabled columns. +@i{Christian Egli} converted the documentation into TeXInfo format, +patched CSS formatting into the HTML exporter, and inspired the agenda. @item -Christian Egli converted the documentation into TeXInfo format, patched -CSS formatting into the HTML exporter, and inspired the agenda. +@i{Nic Ferrier} contributed mailcap and XOXO support. @item -Nic Ferrier contributed mailcap and XML support. +@i{Kai Grossjohann} pointed out key-binding conflicts caused by +Org-mode. @item -Kai Grossjohann pointed out key-binding conflicts caused by Org-mode. +@i{Stefan Monnier} provided a patch to keep the Emacs-Lisp compiler +happy. @item -Stefan Monnier provided a patch to keep the Emacs-Lisp compiler happy. +@i{Todd Neal} provided patches for links to Info files and elisp forms. @item -Tim O'Callaghan suggested in-file links, search options for -general file links, and TAGS. +@i{Tim O'Callaghan} suggested in-file links, search options for general +file links, and TAGS. @item -Oliver Oppitz suggested multi-state TODO items. +@i{Oliver Oppitz} suggested multi-state TODO items. @item -Scott Otterson sparked the introduction of descriptive text for links, -among other things. +@i{Scott Otterson} sparked the introduction of descriptive text for +links, among other things. @item -Pete Phillips helped the development of the TAGS feature. +@i{Pete Phillips} helped the development of the TAGS feature. @item -Matthias Rempe (Oelde) provided ideas, Windows support, and quality +@i{T.V. Raman} reported bugs and suggested improvements. +@item +@i{Matthias Rempe} (Oelde) provided ideas, Windows support, and quality control. @item -Kevin Rogers contributed code to access VM files on remote hosts. +@i{Kevin Rogers} contributed code to access VM files on remote hosts. @item -Frank Ruell solved the mystery of the @code{keymapp nil} bug, a conflict -with @file{allout.el}. +@i{Frank Ruell} solved the mystery of the @code{keymapp nil} bug, a +conflict with @file{allout.el}. @item -Philip Rooke created the Org-mode reference card and provided lots of feedback. +@i{Philip Rooke} created the Org-mode reference card and provided lots +of feedback. @item -Christian Schlauer proposed angular brackets around links, among other -things. +@i{Christian Schlauer} proposed angular brackets around links, among +other things. @item -Linking to VM/BBDB/GNUS was inspired by Tom Shannon's +Linking to VM/BBDB/GNUS was inspired by @i{Tom Shannon}'s @file{organizer-mode.el}. @item -J@"urgen Vollmer contributed code generating the table of contents +@i{David O'Toole} wrote @file{org-publish.el} and drafted the manual +chapter about publishing. +@item +@i{J@"urgen Vollmer} contributed code generating the table of contents in HTML output. @item -Chris Wallace provided a patch implementing the @samp{QUOTE} keyword. +@i{Chris Wallace} provided a patch implementing the @samp{QUOTE} +keyword. @item -David Wainberg suggested archiving, and improvements to the linking +@i{David Wainberg} suggested archiving, and improvements to the linking system. @item -John Wiegley wrote @file{emacs-wiki.el} and @file{planner.el}. The +@i{John Wiegley} wrote @file{emacs-wiki.el} and @file{planner.el}. The development of Org-mode was fully independent, and both systems are really different beasts in their basic ideas and implementation details. -However, I have later looked at John's code and learned from his +I later looked at John's code, however, and learned from his implementation of (i) links where the link itself is hidden and only a description is shown, and (ii) popping up a calendar to select a date. @item -Carsten Wimmer suggested some changes and helped fix a bug in linking -to GNUS. +@i{Carsten Wimmer} suggested some changes and helped fix a bug in +linking to GNUS. @item -Roland Winkler requested additional keybindings to make Org-mode +@i{Roland Winkler} requested additional keybindings to make Org-mode work on a tty. @item -Piotr Zielinski wrote @file{org-mouse.el} and showed how to follow links -with mouse-1. +@i{Piotr Zielinski} wrote @file{org-mouse.el} and showed how to follow +links with mouse-1. @end itemize @node Index, Key Index, Miscellaneous, Top diff --git a/man/pcl-cvs.texi b/man/pcl-cvs.texi index b66585b4883..0039b26fd74 100644 --- a/man/pcl-cvs.texi +++ b/man/pcl-cvs.texi @@ -719,12 +719,12 @@ You can mark and unmark files with these commands: @table @kbd @item m This marks the file that the cursor is positioned on. If the cursor is -positioned on a directory all files in that directory are marked. +positioned on a directory all files in that directory are marked (@code{cvs-mode-mark}).@refill @item u Unmark the file that the cursor is positioned on. If the cursor is on a -directory, all files in that directory are unmarked. +directory, all files in that directory are unmarked (@code{cvs-mode-unmark}).@refill @item M @@ -743,7 +743,7 @@ Mark all files matching a regular expression @item S Mark all files in a particular state, such as ``Modified'' or -``Removed''. (@code{cvs-mode-mark-on-state}). +``Removed'' (@code{cvs-mode-mark-on-state}). @item T Toggle use of marks for the next command (@code{cvs-mode-toggle-marks}). @@ -804,7 +804,7 @@ If you are editing the files in your Emacs, an automatic @samp{revert-buffer} will be performed. (If the file contains @samp{$@asis{Id}$} keywords, @samp{cvs commit} will write a new file with the new values substituted. The auto-revert makes sure that you get -them into your buffer). The revert will not occur if you have modified +them into your buffer.) The revert will not occur if you have modified your buffer, or if @samp{cvs-auto-revert} is set to @samp{nil}. @@ -842,7 +842,7 @@ Like @kbd{f}, but use another window Invoke @samp{add-change-log-entry-other-window} to edit a @file{ChangeLog} file. The @file{ChangeLog} file will be found in the directory of the file the cursor points to, or in a parent of that -directory. (@code{cvs-mode-add-change-log-entry-other-window}).@refill +directory (@code{cvs-mode-add-change-log-entry-other-window}).@refill @end table @@ -924,7 +924,7 @@ The command that is run is @code{cvs-mode-remove-file}. If you have modified a file, and for some reason decide that you don't want to keep the changes, you can undo them with this command. It works by removing your working copy of the file and then getting the latest -version from the repository (@code{cvs-mode-undo-local-changes}. +version from the repository (@code{cvs-mode-undo-local-changes}). @end table @@ -1003,7 +1003,7 @@ This runs @code{cvs-mode-ignore}. @item = @itemx d = Display a @samp{cvs diff} between the selected files and the version -that they are based on. (@code{cvs-mode-diff}).@refill +that they are based on (@code{cvs-mode-diff}).@refill @item d b If CVS finds a conflict while merging two versions of a file (during a @@ -1017,24 +1017,24 @@ With the @kbd{d b} command you can run a @samp{diff} on the files @item d h Display a @samp{cvs diff} between the selected files and the head -revision in the repository (the most recent version on the current -branch) (@code{cvs-mode-diff-head}).@refill +revision (the most recent version on the current +branch) in the repository (@code{cvs-mode-diff-head}).@refill @item d r Display a @samp{cvs diff} between the base revision of the selected files and the head revision in the repository. This displays the changes anyone has committed to the repository since you last executed -"checkout", "update" or "commit". +"checkout", "update" or "commit" (@code{cvs-mode-diff-repository}).@refill @item d v Display a @samp{cvs diff} between the selected files and the head -revision of the vendor branch in the repository. +revision of the vendor branch in the repository (@code{cvs-mode-diff-vendor}).@refill @item d y Display a @samp{cvs diff} between the selected files and yesterday's -head revision in the repository. +head revision in the repository (@code{cvs-mode-diff-yesterday}).@refill @end table @@ -1082,7 +1082,7 @@ created will be overwritten.@refill @table @kbd @item O Update all selected files with status @samp{Need-update} by running -@samp{cvs update} on them. (@code{cvs-mode-update}). +@samp{cvs update} on them (@code{cvs-mode-update}). @end table @@ -1237,8 +1237,8 @@ argument, these commands move that many messages of files. @cindex @samp{CVSROOT}, overriding If you have an idea about any customization that would be handy but -isn't present in this list, please tell me! -For info on how to reach me, see @ref{Bugs}.@refill +isn't present in this list, please tell us! +For info on how to reach us, see @ref{Bugs}.@refill @table @samp @item cvs-auto-remove-handled diff --git a/man/reftex.texi b/man/reftex.texi index 0586c5851bd..b08b0d25d9f 100644 --- a/man/reftex.texi +++ b/man/reftex.texi @@ -25,7 +25,7 @@ citations and indices for LaTeX documents with Emacs. 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, 2004, 2005 +Copyright @copyright{} 1997, 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Free Software Foundation, Inc. @quotation @@ -3572,7 +3572,7 @@ expression, scans the buffers with BibTeX entries (taken from the and offers the matching entries for selection. The selected entry is formatted according to @code{reftex-cite-format} and inserted into the buffer. @* -When called with a @kbd{C-u} prefixe, prompt for optional arguments in +When called with a @kbd{C-u} prefix, prompt for optional arguments in cite macros. When called with a numeric prefix, make that many citations. When called with point inside the braces of a @code{\cite} command, it will add another key, ignoring the value of @@ -3780,7 +3780,7 @@ Commands and levels used for defining sections in the document. The @code{cdr} is a number indicating its level. A negative level means the same as the positive value, but the section will never get a number. The @code{cdr} may also be a function which then has to return the -level. This list is also used for promotion and demption of sectioning +level. This list is also used for promotion and demotion of sectioning commands. If you are using a document class which has several sets of sectioning commands, promotion only works correctly if this list is sorted first by set, then within each set by level. The promotion @@ -5193,7 +5193,7 @@ Fixed bug in @code{reftex-create-bibtex-file} when @code{reftex-comment-citation is non-nil. @item Fixed bugs in indexing: Case-sensitive search, quotes before and/or -after words. Disabbled indexing in comment lines. +after words. Disabled indexing in comment lines. @end itemize @noindent @b{Version 4.22} diff --git a/man/rmail.texi b/man/rmail.texi index 3ad50ff3b71..5c6c2e5011b 100644 --- a/man/rmail.texi +++ b/man/rmail.texi @@ -550,9 +550,9 @@ labels. Any given label is either present or absent on a particular message. A few label names have standard meanings and are given to messages automatically by Rmail when appropriate; these special labels are called @dfn{attributes}. -@ifinfo +@ifnottex (@xref{Rmail Attributes}.) -@end ifinfo +@end ifnottex All other labels are assigned only by users. @table @kbd diff --git a/man/screen.texi b/man/screen.texi index b1b37be6239..f641001579a 100644 --- a/man/screen.texi +++ b/man/screen.texi @@ -320,12 +320,18 @@ here, as you can more easily see them yourself. @kindex M-` @kindex F10 @findex tmm-menubar +@findex menu-bar-open On a graphical display, you can use the mouse to choose a command from the menu bar. A right-arrow at the end of the menu item means it leads to a subsidiary menu; @samp{...} at the end means that the command invoked will read arguments (further input from you) before it actually does anything. + You can also invoke the first menu bar item by pressing @key{F10} (to run +the command @code{menu-bar-open}). You can then navigate the menus with +the arrow keys. You select an item by pressing @key{RET} and cancel menu +navigation with @key{ESC}. + To view the full command name and documentation for a menu item, type @kbd{C-h k}, and then select the menu bar with the mouse in the usual way (@pxref{Key Help}). diff --git a/man/search.texi b/man/search.texi index 4ea3053dea7..88c31d5fc0b 100644 --- a/man/search.texi +++ b/man/search.texi @@ -372,9 +372,9 @@ specify is empty. (Such an empty argument would otherwise be useless.) But it does not call @code{search-forward} right away. First it checks the next input character to see if is @kbd{C-w}, which specifies a word search. -@ifinfo +@ifnottex @xref{Word Search}. -@end ifinfo +@end ifnottex @kbd{C-r @key{RET}} does likewise, for a reverse incremental search. @findex search-forward diff --git a/man/texinfo.tex b/man/texinfo.tex index fcddd268999..c7784bd94af 100644 --- a/man/texinfo.tex +++ b/man/texinfo.tex @@ -3,7 +3,7 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2006-05-07.15} +\def\texinfoversion{2006-05-28.17} % % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free @@ -1084,15 +1084,24 @@ where each line of input produces a line of output.} \def\minus{$-$} % @dots{} outputs an ellipsis using the current font. -% We do .5em per period so that it has the same spacing in a typewriter -% font as three actual period characters. +% We do .5em per period so that it has the same spacing in the cm +% typewriter fonts as three actual period characters; on the other hand, +% in other typewriter fonts three periods are wider than 1.5em. So do +% whichever is larger. % \def\dots{% \leavevmode - \hbox to 1.5em{% - \hskip 0pt plus 0.25fil - .\hfil.\hfil.% - \hskip 0pt plus 0.5fil + \setbox0=\hbox{...}% get width of three periods + \ifdim\wd0 > 1.5em + \dimen0 = \wd0 + \else + \dimen0 = 1.5em + \fi + \hbox to \dimen0{% + \hskip 0pt plus.25fil + .\hskip 0pt plus1fil + .\hskip 0pt plus1fil + .\hskip 0pt plus.5fil }% } @@ -3391,12 +3400,39 @@ where each line of input produces a line of output.} \escapechar = `\\ % use backslash in output files. \def\@{@}% change to @@ when we switch to @ as escape char in index files. \def\ {\realbackslash\space }% + % % Need these in case \tex is in effect and \{ is a \delimiter again. % But can't use \lbracecmd and \rbracecmd because texindex assumes % braces and backslashes are used only as delimiters. \let\{ = \mylbrace \let\} = \myrbrace % + % I don't entirely understand this, but when an index entry is + % generated from a macro call, the \endinput which \scanmacro inserts + % causes processing to be prematurely terminated. This is, + % apparently, because \indexsorttmp is fully expanded, and \endinput + % is an expandable command. The redefinition below makes \endinput + % disappear altogether for that purpose -- although logging shows that + % processing continues to some further point. On the other hand, it + % seems \endinput does not hurt in the printed index arg, since that + % is still getting written without apparent harm. + % + % Sample source (mac-idx3.tex, reported by Graham Percival to + % help-texinfo, 22may06): + % @macro funindex {WORD} + % @findex xyz + % @end macro + % ... + % @funindex commtest + % + % The above is not enough to reproduce the bug, but it gives the flavor. + % + % Sample whatsit resulting: + % .@write3{\entry{xyz}{@folio }{@code {xyz@endinput }}} + % + % So: + \let\endinput = \empty + % % Do the redefinitions. \commondummies } @@ -5827,7 +5863,6 @@ where each line of input produces a line of output.} \spaceisspace % % Append \endinput to make sure that TeX does not see the ending newline. - % % I've verified that it is necessary both for e-TeX and for ordinary TeX % --kasal, 29nov03 \scantokens{#1\endinput}% diff --git a/man/text.texi b/man/text.texi index f9b1d312453..07ccac4b9a5 100644 --- a/man/text.texi +++ b/man/text.texi @@ -39,9 +39,9 @@ input to @TeX{}, you would use @TeX{} @iftex mode (@pxref{TeX Mode}). @end iftex -@ifinfo +@ifnottex mode. -@end ifinfo +@end ifnottex For input to groff or nroff, use Nroff mode. Instead of using a text formatter, you can edit formatted text in @@ -473,9 +473,9 @@ automatically from the second or first line of a paragraph. cannot merge lines. So editing in the middle of a paragraph can result in a paragraph that is not correctly filled. The easiest way to make the paragraph properly filled again is usually with the explicit fill commands. -@ifinfo +@ifnottex @xref{Fill Commands}. -@end ifinfo +@end ifnottex Many users like Auto Fill mode and want to use it in all text files. The section on init files says how to arrange this permanently for yourself. @@ -934,7 +934,7 @@ mode, Outline mode, and Mail mode. Hook functions on @code{text-mode-hook} can look at the value of @code{major-mode} to see which of these modes is actually being entered. @xref{Hooks}. -@ifinfo +@ifnottex Emacs provides two other modes for editing text that is to be passed through a text formatter to produce fancy formatted printed output. @xref{Nroff Mode}, for editing input to the formatter nroff. @@ -945,7 +945,7 @@ text at various levels of detail. You can view either the outline headings alone or both headings and text; you can also hide some of the headings at lower levels from view to make the high level structure more visible. @xref{Outline Mode}. -@end ifinfo +@end ifnottex @node Outline Mode @section Outline Mode @@ -1596,9 +1596,7 @@ directory, such as @code{"/tmp"}. you can do so by setting the values of the variables @code{tex-run-command}, @code{latex-run-command}, @code{slitex-run-command}, @code{tex-dvi-print-command}, @code{tex-dvi-view-command}, and -@code{tex-show-queue-command}. You @emph{must} set the value of -@code{tex-dvi-view-command} for your particular terminal; this variable -has no default value. The other variables have default values that may +@code{tex-show-queue-command}. The default values may (or may not) be appropriate for your system. Normally, the file name given to these commands comes at the end of diff --git a/man/tramp.texi b/man/tramp.texi index acee8ce7321..e7d7b3d6b8d 100644 --- a/man/tramp.texi +++ b/man/tramp.texi @@ -698,7 +698,7 @@ remote host. Additionally, the method @option{plink1} is provided, which calls @samp{plink -1 -ssh} in order to use SSH protocol version 1 -explicitely. +explicitly. CCC: Do we have to connect to the remote host once from the command line to accept the SSH key? Maybe this can be made automatic? @@ -1261,12 +1261,12 @@ Example: Sometimes it is necessary to connect to the same remote host several times. Reentering passwords again and again would be annoying, when -the choosen method does not support access without password prompt -throught own configuration. +the chosen method does not support access without password prompt +through own configuration. By default, @value{tramp} caches the passwords entered by you. They will be reused next time if a connection needs them for the same user name -and host name, independant of the connection method. +and host name, independently of the connection method. @vindex password-cache-expiry Passwords are not saved permanently, that means the password caching @@ -1524,7 +1524,7 @@ When @end ifset is @code{nil} (the default), such problems do not occur. -Therefore, it is usefull to set special values for @value{tramp} +Therefore, it is useful to set special values for @value{tramp} files. For example, the following statement effectively `turns off' the effect of @ifset emacs @@ -2028,6 +2028,11 @@ contains unknown characters like escape sequences for coloring. This should be avoided on the remote side. @xref{Remote shell setup}. for setting the regular expression detecting the prompt. +A special problem is the zsh, which uses left-hand side and right-hand +side prompts in parallel. Therefore, it is necessary to disable the +zsh line editor on the remote host. You shall add to @file{~/.zshrc} +the following command: @command{[ $TERM = "dumb" ] && unsetopt zle}. + @item @value{tramp} doesn't transfer strings with more than 500 characters correctly @@ -2360,7 +2365,7 @@ installed from the start. If the filenames were unified, @value{tramp} would have to be installed from the start, too. @ifset xemacs -@strong{Note:} If you'ld like to use a similar syntax like +@strong{Note:} If you'd like to use a similar syntax like @value{ftppackagename}, you need the following settings in your init file: diff --git a/man/trouble.texi b/man/trouble.texi index 9e09dac4d43..a462c2468b7 100644 --- a/man/trouble.texi +++ b/man/trouble.texi @@ -890,10 +890,10 @@ understand it at all. And if we can't understand what bug you are trying to fix, or why your patch should be an improvement, we mustn't install it. -@ifinfo +@ifnottex @xref{Sending Patches}, for guidelines on how to make it easy for us to understand and install your patches. -@end ifinfo +@end ifnottex @item A guess about what the bug is or what it depends on. diff --git a/man/url.texi b/man/url.texi index 7bda54a577f..453ae4a206f 100644 --- a/man/url.texi +++ b/man/url.texi @@ -559,6 +559,8 @@ Well-known ports are used if the URL does not specify a port. @cindex IRC @cindex Internet Relay Chat @cindex ZEN IRC +@cindex ERC +@cindex rcirc @c Fixme: reference (was http://www.w3.org/Addressing/draft-mirashi-url-irc-01.txt) @dfn{Internet Relay Chat} (IRC) is handled by handing off the @sc{irc} session to a function named in @code{url-irc-function}. @@ -569,8 +571,14 @@ This function must take five arguments, @var{host}, @var{port}, @var{channel}, @var{user} and @var{password}. The @var{channel} argument specifies the channel to join immediately, this can be @code{nil}. By default this is -@code{url-irc-zenirc}. +@code{url-irc-rcirc}. @end defopt +@defun url-irc-rcirc host port channel user password +Processes the arguments and lets @code{rcirc} handle the session. +@end defun +@defun url-irc-erc host port channel user password +Processes the arguments and lets @code{ERC} handle the session. +@end defun @defun url-irc-zenirc host port channel user password Processes the arguments and lets @code{zenirc} handle the session. @end defun @@ -934,7 +942,7 @@ This is a regular expression that matches the shell prompt. Host to @samp{rlogin} to before telnetting out. @end defopt @defopt url-gateway-rlogin-parameters -Parametres to pass to @samp{rsh}. +Parameters to pass to @samp{rsh}. @end defopt @defopt url-gateway-rlogin-user-name User name to use when logging in to the gateway. diff --git a/man/vip.texi b/man/vip.texi index c8d21c3c533..39bd96618a1 100644 --- a/man/vip.texi +++ b/man/vip.texi @@ -914,7 +914,7 @@ Use @kbd{V} instead of @kbd{v}, if you wish to visit a file in another window. You can verify which file you are editing by typing @kbd{g}. (You can also -type @kbd{X B} to get nformation on other buffers too.) If you type +type @kbd{X B} to get information on other buffers too.) If you type @kbd{g} you will get an information like below in the echo area:@refill @example "/usr/masahiko/man/vip.texinfo" line 921 of 1949 @@ -1665,7 +1665,7 @@ Delete previous word (@code{vip-delete-backward-word}). @item C-z @kindex 032 @kbd{C-z} (@code{vip-ESC}) (insert mode) This key simulates @key{ESC} key in emacs mode. For instance, typing -@kbd{C-z x} in insert mode iw the same as typing @kbd{ESC x} in emacs mode +@kbd{C-z x} in insert mode is the same as typing @kbd{ESC x} in emacs mode (@code{vip-ESC}). @end table @noindent diff --git a/man/viper.texi b/man/viper.texi index 7f67f0970fd..b1206c42c85 100644 --- a/man/viper.texi +++ b/man/viper.texi @@ -236,7 +236,7 @@ etc. Furthermore, Viper lets Ex-style commands to work on the current region. This is done by typing a digit argument before @kbd{:}. For instance, -typing @kbd{1:} will propmt you with something like @emph{:123,135}, +typing @kbd{1:} will prompt you with something like @emph{:123,135}, assuming that the current region starts at line 123 and ends at line 135. There is no need to type the line numbers, since Viper inserts them automatically in front of the Ex command. @@ -417,7 +417,7 @@ should start them with a @kbd{:}, e.g., @kbd{:WW}. In Viper, Ex commands can be made to work on the current Emacs region. This is done by typing a digit argument before @kbd{:}. -For instance, typing @kbd{1:} will propmt you with something like +For instance, typing @kbd{1:} will prompt you with something like @emph{:123,135}, assuming that the current region starts at line 123 and ends at line 135. There is no need to type the line numbers, since Viper inserts them automatically in front of the Ex command. @@ -2292,7 +2292,7 @@ the Shell mode by changing the bindings for @kbd{C-m} and @kbd{C-d} using (@pxref{Customization}). In some cases, some @emph{minor} modes might override certain essential -bindings in Vi command state. This is not a big priblem because this +bindings in Vi command state. This is not a big problem because this can happen only in the beginning, when the minor mode kicks in. Typing @code{M-x viper-mode} will correct the situation. Viper knows about several such minor modes and takes care of them, so the above trick @@ -2670,7 +2670,7 @@ placing this command in @code{~/.viper}: (setq viper-mouse-insert-key '(meta 2)) @end lisp If you want to bind mouse-insert to an action even if this action is -already taked for other purposes in Emacs, then you should add this command +already taken for other purposes in Emacs, then you should add this command to @code{~/.viper}, after setting @code{viper-mouse-insert-key}: @lisp (viper-bind-mouse-insert-key 'force) @@ -3236,7 +3236,7 @@ Control character. Finally, we note that Viper's Ex-style commands can be made to work on the current Emacs region. This is done by typing a digit argument before -@kbd{:}. For instance, typing @kbd{1:} will propmt you with something like +@kbd{:}. For instance, typing @kbd{1:} will prompt you with something like @emph{:123,135}, assuming that the current region starts at line 123 and ends at line 135. There is no need to type the line numbers, since Viper inserts them automatically in front of the Ex command. diff --git a/man/xresmini.texi b/man/xresmini.texi index 7445028e0be..7dc66d1e185 100644 --- a/man/xresmini.texi +++ b/man/xresmini.texi @@ -347,7 +347,7 @@ widget "Emacs.pane.menubar" style "my_style" widget "Emacs.pane.emacs.verticalScrollBar" style "my_style" @end smallexample -But to aoid having to type it all, wildcards are often used. @samp{*} +But to avoid having to type it all, wildcards are often used. @samp{*} matches zero or more characters and @samp{?} matches one character. So "*" matches all widgets. diff --git a/nt/ChangeLog b/nt/ChangeLog index e0a5a417528..96594144135 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,8 @@ +2006-06-02 Eli Zaretskii <eliz@gnu.org> + + * INSTALL: Add Make 3.81 to the list of Make & shell combinations + known to work. + 2006-03-12 Jason Rumney <jasonr@gnu.org> * addpm.c (add_registry): Don't change the registry unless keys diff --git a/nt/INSTALL b/nt/INSTALL index f9231d4b704..dc289531472 100644 --- a/nt/INSTALL +++ b/nt/INSTALL @@ -127,6 +127,7 @@ cygwin compiled make 3.79.1: fails[3, 5] fails[2?, 5] mingw32 compiled make 3.79.1: okay okay mingw32 compiled make 3.80: okay unknown[6] + mingw32 compiled make 3.81: okay okay[7] Notes: diff --git a/src/ChangeLog b/src/ChangeLog index 61fca56c357..d0ad63de10d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,441 @@ +2006-06-06 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * macterm.c [USE_MAC_TSM] (mac_handle_text_input_event): Exclude + 0x7f from ASCII range. + +2006-06-05 Jason Rumney <jasonr@gnu.org> + + * w32term.c (w32_set_scroll_bar_thumb, x_scroll_bar_create) + (w32_set_vertical_scroll_bar, w32_scroll_bar_handle_click) + (x_scroll_bar_report_motion): Remove workarounds for + versions of Windows NT < 3.51. + [!SIF_ALL]: Remove. + (pfnSetScrollInfo, pfnGetScrollInfo): Remove. + (w32_initialize): Don't dynamically load Get/SetScrollInfo. + +2006-06-04 David Kastrup <dak@gnu.org> + + * dispnew.c: Mention `redisplay-dont-pause' in doc string of + `sit-for'. + +2006-06-03 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * macfns.c (x_set_icon_name): Apply 2006-06-02 change for xfns.c. + + * macgui.h (USE_MAC_TSM): Set default to 1 on Mac OS X. + + * macterm.c (tsm_document_id) [USE_MAC_TSM]: New variable. + (Qtext_input, Qupdate_active_input_area, Qunicode_for_key_event) + [USE_MAC_TSM]: Likewise. + (syms_of_macterm) [USE_MAC_TSM]: Intern and staticpro them. + (Qbefore_string) [USE_MAC_TSM]: Add extern. + (do_app_resume, do_app_suspend) [USE_MAC_TSM]: Call + ActivateTSMDocument/DeactivateTSMDocument. + (mac_store_event_ref_as_apple_event): Call mac_post_mouse_moved_event. + (mac_handle_window_event) [USE_MAC_TSM]: Handle + kEventWindowFocusAcquired/kEventWindowFocusRelinquish. + (mac_handle_text_input_event) [USE_MAC_TSM]: New function. + (install_window_handler) [USE_MAC_TSM]: Install it. Register + kEventWindowFocusAcquired/kEventWindowFocusRelinquish. + (keycode_to_xkeysym_table): Add entry for f16. + (XTread_socket) [USE_MAC_TSM]: Set/reset read_socket_inev + before/after passing keystroke event to toolbox dispatcher. + (init_tsm) [USE_MAC_TSM]: New function. + (mac_initialize) [USE_MAC_TSM]: Call it. + (Vmac_ts_active_input_overlay) [USE_MAC_TSM]: New defvar. + + * macterm.h (EVENT_PARAM_TEXT_INPUT_SEQUENCE_NUMBER): New enumerator. + +2006-06-02 John Paul Wallington <jpw@gnu.org> + + * xfns.c (x_set_name_internal): Set icon to `text', derived from + name, when frame's icon_name isn't a string rather than only when + it is nil. + +2006-06-03 Eli Zaretskii <eliz@gnu.org> + + * w32fns.c (x_set_icon_name): Don't use arg if it's not a string + and not nil. + +2006-06-02 Chong Yidong <cyd@stupidchicken.com> + + * xfns.c (x_set_icon_name): No-op if arg is non-nil and not a + string. + +2006-06-02 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * xdisp.c (next_element_from_composition): Set it->object to + it->string if composition is coming from string. + (set_cursor_from_row): Don't return 0 unless row displays a + continued line. + (dump_glyph): Dump composite glyph. + +2006-06-02 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> + + * gtkutil.c (menu_nav_ended): Check that menubar_widget is not NULL. + +2006-06-01 Richard Stallman <rms@gnu.org> + + * window.c (Fsplit_window): Doc fix. + +2006-06-01 Micha,Ak(Bl Cadilhac <michael.cadilhac@lrde.org> + + * process.c (deleted_pid_list): New variable to store the pids + of deleted processes. Declare it only if SIGCHLD is defined. + (init_process): Initialize it. + (syms_of_process): Staticpro it. + (Fdelete_process): Add pid of the deleted process to it. Check after + the addition and before the kill if the process is already stopped, + in which case it is deleted from the list and not killed. + (sigchld_handler): Define it only if SIGCHLD is. Search the process + that signaled Emacs in `deleted_pid_list' before `Vprocess_alist'. + Original idea by Stefan Monnier. + +2006-06-01 Kim F. Storm <storm@cua.dk> + + * dispnew.c (sit_for): Perform redisplay even if input is pending + when redisplay-dont-pause is non-nil. + +2006-06-01 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * macterm.c (mac_handle_visibility_change): Set buf.arg to Qnil. + (XTread_socket): Remove obsolete comment. + +2006-06-01 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> + + * xmenu.c (syms_of_xmenu): Make accelerate-menu an alias for + menu-bar-open. + +2006-06-01 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> + + * xmenu.c (Fmenu_bar_open, syms_of_xmenu): Change menu-bar-start to + menu-bar-open. + + * gtkutil.c (menu_nav_ended): Change x-menu-bar-start to menu-bar-open. + +2006-05-31 Juri Linkov <juri@jurta.org> + + * minibuf.c (Vhistory_add_new_input): New variable. + (read_minibuf): Use it. + (syms_of_minibuf) <history-add-new-input>: New Lisp variable. + (syms_of_minibuf) <history-delete-duplicates>: Doc fix. + +2006-05-31 Kim F. Storm <storm@cua.dk> + + * process.c (select_wrapper): Add wrapper around select to work around + "incomplete backtrace" bug in gdb 5.3, when emacs is stopped inside + select called from wait_reading_process_output. + +2006-05-30 Andreas Schwab <schwab@suse.de> + + * xmenu.c (Fmenu_bar_start): Return a value. + +2006-05-30 Richard Stallman <rms@gnu.org> + + * coding.c (Ffind_operation_coding_system): Doc fix. + +2006-05-30 Eli Zaretskii <eliz@gnu.org> + + * w32term.c (x_draw_hollow_cursor): Fix last change. + +2006-05-29 Kim F. Storm <storm@cua.dk> + + * w32term.c (x_draw_stretch_glyph_string): Fix last change. + +2006-05-29 Eli Zaretskii <eliz@gnu.org> + + * coding.c (Ffind_operation_coding_system): Doc fix. + +2006-05-29 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * macfns.c [USE_MAC_FONT_PANEL] (Fmac_set_font_panel_visibility): + Call mac_set_font_info_for_selection if font panel is made visible. + + * macterm.c (font_panel_shown_p) [USE_MAC_FONT_PANEL]: New variable. + (mac_font_panel_visible_p, mac_show_hide_font_panel) + [USE_MAC_FONT_PANEL]: New functions. + [USE_MAC_FONT_PANEL] (mac_set_font_info_for_selection): Return + immediately if font panel is not visible. + + * macterm.h (mac_font_panel_visible_p, mac_show_hide_font_panel): + Add externs. + +2006-05-29 Dan Nicolaescu <dann@ics.uci.edu> + + * search.c (matcher_overflow): Mark as NO_RETURN. + + * xterm.c (x_connection_closed): Likewise. + + * sysdep.c (croak): Likewise. + + * sound.c (sound_perror, alsa_sound_perror): Likewise. + + * lisp.h (die, nsberror): Likewise. + +2006-05-29 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> + + * sound.c (alsa_open, alsa_configure, alsa_write): Move + assignment to err out of if-statement. + + * gtkutil.c (menu_nav_ended): New function. + (create_menus): Connect menu_nav_ended to "selection-done" to fix + grabs. + + * xmenu.c (Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT. + +2006-05-28 Dan Nicolaescu <dann@ics.uci.edu> + + * charset.h (invalid_character): Mark as NO_RETURN. + +2006-05-29 Kenichi Handa <handa@m17n.org> + + * coding.c (Ffind_operation_coding_system): Call a function by + safe_call1 instead of call1. + +2006-05-28 Stefan Monnier <monnier@iro.umontreal.ca> + + * window.c (struct saved_window): Add `dedicated'. + (Fset_window_configuration, save_window_save): Save/restore the + `dedicated' flag. + +2006-05-28 Kim F. Storm <storm@cua.dk> + + * xdisp.c (set_cursor_from_row): If cursor cannot be set in row, + don't update w->cursor and return 0. Return 1 on success. + (try_cursor_movement): Repeat set_cursor_from_row on successive rows + until it succeeds. + + * dispextern.h (set_cursor_from_row): Update prototype. + +2006-05-28 Kim F. Storm <storm@cua.dk> + + * xdisp.c (get_phys_cursor_geometry): Return computed x and y through + parameters. Adjust x and width in case cursor in on a partially + visible stretch glyph on the left edge. + (erase_phys_cursor): Don't erase into left fringe/margin in case + previous cursor glyph is a partially visible stretch glyph on left. + + * dispextern.h (get_phys_cursor_geometry): Update prototype. + + * xterm.c (x_draw_stretch_glyph_string): Fix problems with invisible + cursor and erasing cursor on partially visible stretch glyph on left. + (x_draw_hollow_cursor): Compute x via get_phys_cursor_geometry. + + * macterm.c: Likewise. + + * w32term.c: Likewise. + +2006-05-27 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * macselect.c (mac_handle_apple_event): + Return errAEEventNotHandled if key binding is not found. + +2006-05-26 Eli Zaretskii <eliz@gnu.org> + + * emacs.c (main) [PROFILING]: Enable also for __MINGW32__. + [__MINGW32__]: MinGW-specific declaration of `etext'. + + * w32heap.c (etext, edata): Remove unused definitions. + +2006-05-26 Chong Yidong <cyd@stupidchicken.com> + + * fileio.c (Fcopy_file): Delete argument MUSTBENEW. + Incorporate the exclusive file-opening functionality into the behavior + when OK-IF-ALREADY-EXISTS is nil. + (Frename_file): Call Fcopy_file without MUSTBENEW argument. + +2006-05-26 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> + + * sound.c (alsa_configure): Move get period/buffer_size after + setting hwparams. + +2006-05-26 Kenichi Handa <handa@m17n.org> + + * coding.c (Ffind_operation_coding_system): Allow (FILENAME + . BUFFER) in TARGET. + +2006-05-25 Chong Yidong <cyd@stupidchicken.com> + + * image.c (png_load): Don't call fclose on NULL. + +2006-05-25 Luc Teirlinck <teirllm@auburn.edu> + + * fns.c (Fyes_or_no_p): + * callint.c (Fcall_interactively): Fread_from_minibuffer now takes + only seven args. + +2006-05-25 Juri Linkov <juri@jurta.org> + + * lisp.h (Fread_from_minibuffer): Decrement number of args. + + * minibuf.c (read_minibuf): Remove arg KEEP_ALL. Callers changed. + (Fread_from_minibuffer): Remove arg KEEP_ALL. Callers changed. + + * buffer.c (mode-line-format): Fix docstring. + +2006-05-25 Richard Stallman <rms@gnu.org> + + * emacs.c (main, Fdump_emacs): Don't test __linux or __linux__. + +2006-05-24 Luc Teirlinck <teirllm@auburn.edu> + + * puresize.h (BASE_PURESIZE): Increase to 1210000. + +2006-05-24 Alan Mackenzie <acm@muc.de> + + * lread.c (Vload_history): Enhance doc-string to say that the file + is the absolute truename of the loaded file. + + * lread.c (Vafter_load_alist): doc-string: state that an element + now has a regexp to match file names, not a file name as such. + + * lread.c (readevalloop): Call file-truename on the name for + load-history, except at preloading time. + + * lread.c (Fload): At preloading time, preserve the extension of + the filename which goes into load-history. New var hist_file_name. + + * lread.c (Fload): Do eval-after-load stuff by calling the lisp + function do-after-load-evaluation. + +2006-05-24 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * mac.c (ae_attr_table): New variable. + (syms_of_mac): Intern and staticpro its elements. + (mac_aelist_to_lisp): Also convert Apple event attributes. + (mac_ae_put_lisp): New function. + (create_apple_event_from_event_ref) [MAC_OSX]: Use typeUTF8Text. + + * macfns.c (Fx_server_version): Use gestaltSystemVersionMajor etc. + + * macselect.c (Qemacs_suspension_id): New variable. + (syms_of_macselect): Intern and staticpro it. + (struct suspended_ae_info): New struct. + (deferred_apple_events, defer_apple_events) + (Fmac_process_deferred_apple_events): Use it. + (suspended_apple_events): New variable. + (mac_handle_apple_event_1): New function. + (mac_handle_apple_event): Use it. Don't process previously + suspended events. + (cleanup_suspended_apple_events, get_suspension_id) + (cleanup_all_suspended_apple_events): New functions. + (init_apple_event_handler): Call cleanup_all_suspended_apple_events + at exit. + (Fmac_cleanup_expired_apple_events, Fmac_ae_set_reply_parameter) + (Fmac_resume_apple_event): New defuns. + (syms_of_macselect): Defsubr them. + + * macterm.c (fn_keycode_to_keycode_table, XTread_socket) [MAC_OSX]: + Fix last change. Don't map `fn' modifier if pressed with F1 ... F12. + + * macterm.h (TYPE_FILE_NAME): Change from macro to enumerator. + (KEY_EMACS_SUSPENSION_ID_ATTR): New enumerator. + (keyReplyRequestedAttr) [MAC_OS_X_VERSION_MAX_ALLOWED < 1030]: Likewise. + (gestaltSystemVersionMajor, gestaltSystemVersionMinor) + (gestaltSystemVersionBugFix) [MAC_OS_X_VERSION_MAX_ALLOWED < 1040]: + Likewise. + (typeUTF8Text, kEventParamWindowMouseLocation) + [MAC_OSX && MAC_OS_X_VERSION_MAX_ALLOWED < 1020]: Likewise. + (x_get_focus_frame, mac_ae_put_lisp): Add externs. + +2006-05-23 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * macterm.c (fn_keycode_to_xkeysym_table, convert_fn_keycode): Remove. + (fn_keycode_to_keycode_table) [MAC_OSX]: New variable. + (mac_set_unicode_keystroke_event) [TARGET_API_MAC_CARBON]: New function. + (XTread_socket) [TARGET_API_MAC_CARBON]: Use it. + (XTread_socket) [MAC_OSX]: Try 'uchr' Unicode keyboard-layout + resource to backtranslate key with modifiers. + (XTread_socket): Don't set read_socket_inev around AEProcessAppleEvent. + +2006-05-23 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> + + * xterm.c: Remove declarations already in xterm.h + + * xterm.h: Add extern declarations for x_clear_errors, + x_fully_uncatch_errors, x_catching_errors and + x_alloc_lighter_color_for_widget. Remove duplicated declarations. + +2006-05-21 Richard Stallman <rms@gnu.org> + + * xfaces.c (best_matching_font): Abort for best == NULL + before we start to use it. + + * buffer.c (syms_of_buffer, Fmake_overlay): Doc fixes. + +2006-05-20 Kim F. Storm <storm@cua.dk> + + * xfaces.c (best_matching_font): Fix crash in 2006-05-17 change. + +2006-05-20 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * macterm.c (convert_fn_keycode): Fix last change. + +2006-05-19 Eli Zaretskii <eliz@gnu.org> + + * w32.c (init_environment): Perform the processing of environment + variables on a copy of default variables and their values, not on + the original. Simplify code that calls ExpandEnvironmentStrings + and make buf1[] and buf2[] more visible for easier debugging. + +2006-05-19 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * frame.c (x_set_border_width): Remove #ifndef MAC_OS. + + * image.c [MAC_OS] (gif_load): Allocate Lisp string first. + + * macfns.c (Fx_focus_frame): Don't check dpyinfo->x_focus_frame. + + * macterm.c (XTread_socket) [TARGET_API_MAC_CARBON && MAC_OSX]: + Forward keyUp events to toolbox_dispatcher. + + * window.c (foreach_window): Check WINDOWP (FRAME_ROOT_WINDOW (f)). + +2006-05-18 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> + + * config.in: Regenerated (HAVE_ALSA). + + * sound.c (alsa_sound_perror, alsa_open, alsa_period_size) + (alsa_configure, alsa_close, alsa_choose_format, alsa_write) + (snd_error_quiet, alsa_init): New functions. + (vox_init): Return 0 if unable to open device. + (Fplay_sound_internal): Test for alsa first and use vox (oss) as + a fallback. + (struct sound_device): Add period_size. + (wav_play, au_play): Use period_size if set. + + * Makefile.in (CFLAGS_SOUND): New flags for ALSA + (ALL_CFLAGS): Add CFLAGS_SOUND + +2006-05-18 Kenichi Handa <handa@m17n.org> + + * callproc.c (Fcall_process): Reject encoding arguments by + ascii-incompatible coding systems (e.g. utf-16). + + * coding.c (Qascii_incompatible): New variable. + (syms_of_coding): Setup Qascii_incompatible. + (setup_coding_system): Be sure to initialize coding->common_flags. + Check `ascii-incompatible' property of the coding system. + + * coding.h (CODING_ASCII_INCOMPATIBLE_MASK): New macro. + +2006-05-18 Kim F. Storm <storm@cua.dk> + + * xdisp.c (display_tool_bar_line): Restore entire tool-bar geometry when + backtracking in case last image doesn't fit on line. + +2006-05-18 MIYOSHI Masanori <miyoshi@meadowy.org> (tiny change) + + * xdisp.c (display_tool_bar_line): Don't adjust tool-bar height by more than + height of one frame default line. + +2006-05-17 Richard Stallman <rms@gnu.org> + + * xfaces.c (better_font_p): Any font beats no font. + (best_matching_font): Simplify based on above change. + + * buffer.c (Fprevious_overlay_change, Fnext_overlay_change): Doc fixes. + 2006-05-16 Kim F. Storm <storm@cua.dk> * xterm.c (handle_one_xevent): Check that f is not NULL before @@ -62,7 +500,7 @@ [MAC_OS] (gif_load): Emulate Graphic Control Extension block. * macfns.c (x_to_mac_color): Fix shift amount change. - [USE_MAC_FONT_PANEL] (mac_set_font): Use x_get_focus_frame. + (mac_set_font) [USE_MAC_FONT_PANEL]: Use x_get_focus_frame. [USE_MAC_FONT_PANEL] (Fmac_set_font_panel_visibility): Doc fix. * macselect.c (Vmac_service_selection) [MAC_OSX]: Rename from @@ -490,7 +928,7 @@ * puresize.h (BASE_PURESIZE): Increment to 1210000. -2006-04-13 Micha,Ak(Bl Cadilhac <michael.cadilhac@lrde.org> (tiny change) +2006-04-13 Micha,Ak(Bl Cadilhac <michael.cadilhac@lrde.org> * print.c (Fprin1_to_string): Mention in the `doc' that the behavior is modified by `print-level' and `print-length'. @@ -611,7 +1049,7 @@ * xfaces.c (Finternal_merge_in_global_face, try_font_list): Add explicit braces to avoid ambiguous `else'. -2006-04-11 Micha,Ak(Bl Cadilhac <michael.cadilhac@lrde.org> (tiny change) +2006-04-11 Micha,Ak(Bl Cadilhac <michael.cadilhac@lrde.org> * dispnew.c (init_display): Don't init X display if the user asked for a non-X display. @@ -8477,7 +8915,7 @@ * xfns.c (xic_create_xfontset): Initialize missing_list to NULL. -2004-10-21 K,Ba(Broly L,Bu(Brentey <lorentey@elte.hu> +2004-10-21 K,Aa(Broly L$,1 q(Brentey <lorentey@elte.hu> * xterm.h (x_output): New member `xic_base_fontname'. (FRAME_XIC_BASE_FONTNAME): New macro. @@ -9421,7 +9859,7 @@ * fileio.c (Fvisited_file_modtime): Return a list of two integers, instead of a cons. -2004-07-14 K,Ba(Broly L,Bu(Brentey <lorentey@elte.hu> +2004-07-14 K,Aa(Broly L$,1 q(Brentey <lorentey@elte.hu> * keyboard.c (echo_dash): Do nothing if there already is a dash at the end of the echo string. @@ -9758,7 +10196,7 @@ * keyboard.c (cmd_error): Don't call any_kboard_state if inside a recursive edit level. -2004-06-13 K,Ba(Broly L,Bu(Brentey <lorentey@elte.hu> +2004-06-13 K,Aa(Broly L$,1 q(Brentey <lorentey@elte.hu> * keyboard.c (command_loop): Call any_kboard_state before command_loop_2 when at top level. @@ -10071,7 +10509,7 @@ before actually accepting connection in case it has already been accepted due to recursion. -2004-05-23 K,Ba(Broly L,Bu(Brentey <lorentey@elte.hu> +2004-05-23 K,Aa(Broly L$,1 q(Brentey <lorentey@elte.hu> * coding.c (Fset_safe_terminal_coding_system_internal): Set suppress_error in safe_terminal_coding, not terminal_coding. @@ -17007,8 +17445,7 @@ (Fapropos_internal): Initialize them and clear them out. Don't GCPRO them. - * buffer.c (syms_of_buffer) <scroll-up-aggressively, scroll-down-aggressively>: - Doc fixes. + * buffer.c (syms_of_buffer) <scroll-up|down-aggressively>: Doc fixes. * lisp.h: New misc type Lisp_Save_Value. (enum Lisp_Misc_Type): Add Lisp_Misc_Save_Value. diff --git a/src/Makefile.in b/src/Makefile.in index 049a4c5bc17..342540df7be 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -281,7 +281,7 @@ TOOLKIT_DEFINES = /* C_SWITCH_X_SITE must come before C_SWITCH_X_MACHINE and C_SWITCH_X_SYSTEM since it may have -I options that should override those two. */ -ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(TOOLKIT_DEFINES) $(MYCPPFLAGS) -I. -I${srcdir} C_SWITCH_MACHINE C_SWITCH_SYSTEM C_SWITCH_SITE C_SWITCH_X_SITE C_SWITCH_X_MACHINE C_SWITCH_X_SYSTEM C_SWITCH_SYSTEM_TEMACS ${CFLAGS} @FREETYPE_CFLAGS@ @FONTCONFIG_CFLAGS@ @LIBOTF_CFLAGS@ +ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(TOOLKIT_DEFINES) $(MYCPPFLAGS) -I. -I${srcdir} C_SWITCH_MACHINE C_SWITCH_SYSTEM C_SWITCH_SITE C_SWITCH_X_SITE C_SWITCH_X_MACHINE C_SWITCH_X_SYSTEM C_SWITCH_SYSTEM_TEMACS ${CFLAGS_SOUND} ${CFLAGS} @FREETYPE_CFLAGS@ @FONTCONFIG_CFLAGS@ @LIBOTF_CFLAGS@ .c.o: $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< @@ -459,6 +459,7 @@ LIBX= $(LIBXMENU) LD_SWITCH_X_SITE -lX10 LIBX10_MACHINE LIBX10_SYSTEM #endif /* not HAVE_X_WINDOWS */ LIBSOUND= @LIBSOUND@ +CFLAGS_SOUND= @CFLAGS_SOUND@ #ifndef ORDINARY_LINK /* Fix linking if compiled with GCC. */ diff --git a/src/buffer.c b/src/buffer.c index e4d846c8093..5bdfe737767 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -2481,10 +2481,10 @@ swap_out_buffer_local_variables (b) Return the number found, and store them in a vector in *VEC_PTR. Store in *LEN_PTR the size allocated for the vector. Store in *NEXT_PTR the next position after POS where an overlay starts, - or ZV if there are no more overlays. + or ZV if there are no more overlays between POS and ZV. Store in *PREV_PTR the previous position before POS where an overlay ends, or where an overlay starts which ends at or after POS; - or BEGV if there are no such overlays. + or BEGV if there are no such overlays from BEGV to POS. NEXT_PTR and/or PREV_PTR may be 0, meaning don't store that info. *VEC_PTR and *LEN_PTR should contain a valid vector and size @@ -3570,10 +3570,10 @@ If omitted, BUFFER defaults to the current buffer. BEG and END may be integers or markers. The fourth arg FRONT-ADVANCE, if non-nil, makes the marker for the front of the overlay advance when text is inserted there -(which means the text *is not* included in the overlay). +\(which means the text *is not* included in the overlay). The fifth arg REAR-ADVANCE, if non-nil, makes the marker for the rear of the overlay advance when text is inserted there -(which means the text *is* included in the overlay). */) +\(which means the text *is* included in the overlay). */) (beg, end, buffer, front_advance, rear_advance) Lisp_Object beg, end, buffer; Lisp_Object front_advance, rear_advance; @@ -3955,7 +3955,8 @@ or between BEG and END. */) DEFUN ("next-overlay-change", Fnext_overlay_change, Snext_overlay_change, 1, 1, 0, doc: /* Return the next position after POS where an overlay starts or ends. -If there are no more overlay boundaries after POS, return (point-max). */) +If there are no overlay boundaries from POS to (point-max), +the value is (point-max). */) (pos) Lisp_Object pos; { @@ -3996,7 +3997,8 @@ If there are no more overlay boundaries after POS, return (point-max). */) DEFUN ("previous-overlay-change", Fprevious_overlay_change, Sprevious_overlay_change, 1, 1, 0, doc: /* Return the previous position before POS where an overlay starts or ends. -If there are no more overlay boundaries before POS, return (point-min). */) +If there are no overlay boundaries from (point-min) to POS, +the value is (point-min). */) (pos) Lisp_Object pos; { @@ -5454,10 +5456,11 @@ A string is printed verbatim in the mode line except for %-constructs: %p -- print percent of buffer above top of window, or Top, Bot or All. %P -- print percent of buffer above bottom of window, perhaps plus Top, or print Bottom or All. - %m -- print the mode name. %n -- print Narrow if appropriate. + %t -- visited file is text or binary (if OS supports this distinction). %z -- print mnemonics of buffer, terminal, and keyboard coding systems. %Z -- like %z, but including the end-of-line format. + %e -- print error message about full memory. %[ -- print one [ for each recursive editing level. %] similar. %% -- print %. %- -- print infinitely many dashes. Decimal digits after the % specify field width to which to pad. */); @@ -5753,7 +5756,7 @@ the actual bitmap shown in the left or right fringe for the logical indicator. LEFT and RIGHT are the bitmaps shown in the left and/or right fringe for the specific indicator. The LEFT1 or RIGHT1 bitmaps are used only for the `bottom' and `one-line' indicators when the last -(only) line in has no final newline. BITMAPS may also be a single +\(only) line in has no final newline. BITMAPS may also be a single symbol which is used in both left and right fringes. */); DEFVAR_PER_BUFFER ("fringe-cursor-alist", @@ -6000,7 +6003,7 @@ this variable has no effect; the cursor appears as a hollow box. */); doc: /* Additional space to put between lines when displaying a buffer. The space is measured in pixels, and put below lines on window systems. If value is a floating point number, it specifies the spacing relative -to the default frame line height. */); +to the default frame line height. nil means add no extra space. */); DEFVAR_PER_BUFFER ("cursor-in-non-selected-windows", ¤t_buffer->cursor_in_non_selected_windows, Qnil, diff --git a/src/callint.c b/src/callint.c index 4789fb5582d..ae10e64e1de 100644 --- a/src/callint.c +++ b/src/callint.c @@ -730,7 +730,7 @@ If KEYS is omitted or nil, the return value of `this-command-keys' is used. */) tem = Fread_from_minibuffer (build_string (callint_message), Qnil, Qnil, Qnil, Qnil, Qnil, - Qnil, Qnil); + Qnil); if (! STRINGP (tem) || SCHARS (tem) == 0) args[i] = Qnil; else diff --git a/src/coding.c b/src/coding.c index debb2f27ffc..9f95c2c6777 100644 --- a/src/coding.c +++ b/src/coding.c @@ -8315,7 +8315,7 @@ is selected as the TARGET. For example, if OPERATION does file I/O, whichever argument specifies the file name is TARGET. TARGET has a meaning which depends on OPERATION: - For file I/O, TARGET is a file name. + For file I/O, TARGET is a file name (except for the special case below). For process I/O, TARGET is a process name. For network I/O, TARGET is a service name or a port number @@ -8327,6 +8327,13 @@ or a function symbol to call. In the last case, we call the function with one argument, which is a list of all the arguments given to this function. +If OPERATION is `insert-file-contents', the argument corresponding to +TARGET may be a cons (FILENAME . BUFFER). In that case, FILENAME is a +file name to look up, and BUFFER is a buffer that contains the file's +contents (not yet decoded). If `file-coding-system-alist' specifies a +function to call for FILENAME, that function should examine the +contents of BUFFER instead of reading the file. + usage: (find-operation-coding-system OPERATION ARGUMENTS ...) */) (nargs, args) int nargs; @@ -8380,7 +8387,7 @@ usage: (find-operation-coding-system OPERATION ARGUMENTS ...) */) return Fcons (val, val); if (! NILP (Ffboundp (val))) { - val = call1 (val, Flist (nargs, args)); + val = safe_call1 (val, Flist (nargs, args)); if (CONSP (val)) return val; if (SYMBOLP (val) && ! NILP (Fcoding_system_p (val))) diff --git a/src/config.in b/src/config.in index 9c1abadd283..106aeea920c 100644 --- a/src/config.in +++ b/src/config.in @@ -87,6 +87,9 @@ Boston, MA 02110-1301, USA. */ */ #undef HAVE_ALLOCA_H +/* Define to 1 if ALSA is available. */ +#undef HAVE_ALSA + /* Define to 1 if you have the `bcmp' function. */ #undef HAVE_BCMP @@ -955,6 +958,9 @@ Boston, MA 02110-1301, USA. */ #ifdef HAVE_SOUNDCARD_H #define HAVE_SOUND 1 #endif +#ifdef HAVE_ALSA +#define HAVE_SOUND 1 +#endif #endif /* __FreeBSD__ || __NetBSD__ || __linux__ */ /* If using GNU, then support inline function declarations. */ diff --git a/src/dispextern.h b/src/dispextern.h index 0aac78f9557..92005e6b149 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -2642,8 +2642,8 @@ void remember_mouse_glyph P_ ((struct frame *, int, int, NativeRectangle *)); void mark_window_display_accurate P_ ((Lisp_Object, int)); void redisplay_preserve_echo_area P_ ((int)); -void set_cursor_from_row P_ ((struct window *, struct glyph_row *, - struct glyph_matrix *, int, int, int, int)); +int set_cursor_from_row P_ ((struct window *, struct glyph_row *, + struct glyph_matrix *, int, int, int, int)); void init_iterator P_ ((struct it *, struct window *, int, int, struct glyph_row *, enum face_id)); void init_iterator_to_row_start P_ ((struct it *, struct window *, @@ -2703,8 +2703,8 @@ extern void x_fix_overlapping_area P_ ((struct window *, struct glyph_row *, extern void draw_phys_cursor_glyph P_ ((struct window *, struct glyph_row *, enum draw_glyphs_face)); -extern int get_phys_cursor_geometry P_ ((struct window *, struct glyph_row *, - struct glyph *, int *)); +extern void get_phys_cursor_geometry P_ ((struct window *, struct glyph_row *, + struct glyph *, int *, int *, int *)); extern void erase_phys_cursor P_ ((struct window *)); extern void display_and_set_cursor P_ ((struct window *, int, int, int, int, int)); diff --git a/src/dispnew.c b/src/dispnew.c index e8833376701..f239d6969f4 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -355,8 +355,7 @@ static unsigned history_tick; static void add_frame_display_history P_ ((struct frame *, int)); static void add_window_display_history P_ ((struct window *, char *, int)); - - + /* Add to the redisplay history how window W has been displayed. MSG is a trace containing the information how W's glyph matrix has been constructed. PAUSED_P non-zero means that the update @@ -6391,7 +6390,9 @@ sit_for (sec, usec, reading, display, initial_display) { swallow_events (display); - if (detect_input_pending_run_timers (display) || !NILP (Vexecuting_kbd_macro)) + if ((detect_input_pending_run_timers (display) + && !redisplay_dont_pause) + || !NILP (Vexecuting_kbd_macro)) return Qnil; if (initial_display) @@ -6421,6 +6422,9 @@ Redisplay is preempted as always if input arrives, and does not happen if input is available before it starts. Value is t if waited the full time with no input arriving. +Redisplay will occur even when input is available if you bind +`redisplay-dont-pause' to a non-nil value. + An obsolete but still supported form is \(sit-for SECONDS &optional MILLISECONDS NODISP) Where the optional arg MILLISECONDS specifies an additional wait period, diff --git a/src/emacs.c b/src/emacs.c index 27e349c637f..4bbbf84ebab 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -1770,16 +1770,21 @@ main (argc, argv #endif } - /* Set up for profiling. This is known to work on FreeBSD and - GNU/Linux. It might work on some other systems too. Give it a - try and tell us if it works on your system. To compile for - profiling use something like `make CFLAGS="-pg -g -O -DPROFILING=1'. */ -#if defined (__FreeBSD__) || defined (__linux) + /* Set up for profiling. This is known to work on FreeBSD, + GNU/Linux and MinGW. It might work on some other systems too. + Give it a try and tell us if it works on your system. To compile + for profiling use something like: + `make CFLAGS="-pg -g -O -DPROFILING=1'. */ +#if defined (__FreeBSD__) || defined (GNU_LINUX) || defined(__MINGW32__) #ifdef PROFILING if (initialized) { extern void _mcleanup (); +#ifdef __MINGW32__ + extern unsigned char etext asm ("etext"); +#else extern char etext; +#endif extern void safe_bcopy (); extern void dump_opcode_frequencies (); @@ -2253,7 +2258,7 @@ You must run Emacs in batch mode in order to dump it. */) if (! noninteractive) error ("Dumping Emacs works only in batch mode"); -#ifdef __linux__ +#ifdef GNU_LINUX if (heap_bss_diff > MAX_HEAP_BSS_DIFF) { fprintf (stderr, "**************************************************\n"); @@ -2265,7 +2270,7 @@ You must run Emacs in batch mode in order to dump it. */) fprintf (stderr, "exec-shield in etc/PROBLEMS for more information.\n"); fprintf (stderr, "**************************************************\n"); } -#endif /* __linux__ */ +#endif /* GNU_LINUX */ /* Bind `command-line-processed' to nil before dumping, so that the dumped Emacs will process its command line diff --git a/src/fileio.c b/src/fileio.c index 84b32f8dda9..8ce89ba23f3 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -2409,32 +2409,31 @@ barf_or_query_if_file_exists (absname, querystring, interactive, statptr, quick) return; } -DEFUN ("copy-file", Fcopy_file, Scopy_file, 2, 6, +DEFUN ("copy-file", Fcopy_file, Scopy_file, 2, 5, "fCopy file: \nGCopy %s to file: \np\nP", doc: /* Copy FILE to NEWNAME. Both args must be strings. If NEWNAME names a directory, copy FILE there. -Signals a `file-already-exists' error if file NEWNAME already exists, -unless a third argument OK-IF-ALREADY-EXISTS is supplied and non-nil. -A number as third arg means request confirmation if NEWNAME already exists. -This is what happens in interactive use with M-x. -Always sets the file modes of the output file to match the input file. + +This function always sets the file modes of the output file to match +the input file. + +The optional third argument OK-IF-ALREADY-EXISTS specifies what to do +if file NEWNAME already exists. If OK-IF-ALREADY-EXISTS is nil, we +signal a `file-already-exists' error without overwriting. If +OK-IF-ALREADY-EXISTS is a number, we request confirmation from the user +about overwriting; this is what happens in interactive use with M-x. +Any other value for OK-IF-ALREADY-EXISTS means to overwrite the +existing file. Fourth arg KEEP-TIME non-nil means give the output file the same last-modified time as the old one. (This works on only some systems.) A prefix arg makes KEEP-TIME non-nil. -The optional fifth arg MUSTBENEW, if non-nil, insists on a check -for an existing file with the same name. If MUSTBENEW is `excl', -that means to get an error if the file already exists; never overwrite. -If MUSTBENEW is neither nil nor `excl', that means ask for -confirmation before overwriting, but do go ahead and overwrite the file -if the user confirms. - If PRESERVE-UID-GID is non-nil, we try to transfer the uid and gid of FILE to NEWNAME. */) - (file, newname, ok_if_already_exists, keep_time, mustbenew, preserve_uid_gid) - Lisp_Object file, newname, ok_if_already_exists, keep_time, mustbenew; + (file, newname, ok_if_already_exists, keep_time, preserve_uid_gid) + Lisp_Object file, newname, ok_if_already_exists, keep_time; Lisp_Object preserve_uid_gid; { int ifd, ofd, n; @@ -2451,9 +2450,6 @@ uid and gid of FILE to NEWNAME. */) CHECK_STRING (file); CHECK_STRING (newname); - if (!NILP (mustbenew) && !EQ (mustbenew, Qexcl)) - barf_or_query_if_file_exists (newname, "overwrite", 1, 0, 1); - if (!NILP (Ffile_directory_p (newname))) newname = Fexpand_file_name (Ffile_name_nondirectory (file), newname); else @@ -2556,12 +2552,12 @@ uid and gid of FILE to NEWNAME. */) /* System's default file type was set to binary by _fmode in emacs.c. */ ofd = emacs_open (SDATA (encoded_newname), O_WRONLY | O_TRUNC | O_CREAT - | (EQ (mustbenew, Qexcl) ? O_EXCL : 0), + | (NILP (ok_if_already_exists) ? O_EXCL : 0), S_IREAD | S_IWRITE); #else /* not MSDOS */ ofd = emacs_open (SDATA (encoded_newname), O_WRONLY | O_TRUNC | O_CREAT - | (EQ (mustbenew, Qexcl) ? O_EXCL : 0), + | (NILP (ok_if_already_exists) ? O_EXCL : 0), 0666); #endif /* not MSDOS */ #endif /* VMS */ @@ -2806,7 +2802,7 @@ This is what happens in interactive use with M-x. */) /* We have already prompted if it was an integer, so don't have copy-file prompt again. */ NILP (ok_if_already_exists) ? Qnil : Qt, - Qt, Qnil, Qt); + Qt, Qt); Fdelete_file (file); } diff --git a/src/fns.c b/src/fns.c index 545b4d7b0ea..3b4b3e5149b 100644 --- a/src/fns.c +++ b/src/fns.c @@ -2798,7 +2798,7 @@ is nil, and `use-dialog-box' is non-nil. */) { ans = Fdowncase (Fread_from_minibuffer (prompt, Qnil, Qnil, Qnil, Qyes_or_no_p_history, Qnil, - Qnil, Qnil)); + Qnil)); if (SCHARS (ans) == 3 && !strcmp (SDATA (ans), "yes")) { UNGCPRO; diff --git a/src/frame.c b/src/frame.c index 1606f195f90..cafa9b655d4 100644 --- a/src/frame.c +++ b/src/frame.c @@ -3156,10 +3156,8 @@ x_set_border_width (f, arg, oldval) if (XINT (arg) == f->border_width) return; -#ifndef MAC_OS if (FRAME_X_WINDOW (f) != 0) error ("Cannot change the border width of a frame"); -#endif /* MAC_TODO */ f->border_width = XINT (arg); } diff --git a/src/gtkutil.c b/src/gtkutil.c index b8d37df2214..2a6ed9d1524 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -1970,6 +1970,34 @@ xg_create_one_menuitem (item, f, select_cb, highlight_cb, cl_data, group) return w; } +/* Callback called when keyboard traversal (started by menu-bar-open) ends. + WMENU is the menu for which traversal has been done. DATA points to the + frame for WMENU. We must release grabs, some bad interaction between GTK + and Emacs makes the menus keep the grabs. */ + +static void +menu_nav_ended (wmenu, data) + GtkMenuShell *wmenu; + gpointer data; +{ + FRAME_PTR f = (FRAME_PTR) data; + + if (FRAME_X_OUTPUT (f)->menubar_widget) + { + GtkMenuShell *w = GTK_MENU_SHELL (FRAME_X_OUTPUT (f)->menubar_widget); + Display *dpy = FRAME_X_DISPLAY (f); + + BLOCK_INPUT; + gtk_menu_shell_deactivate (w); + gtk_menu_shell_deselect (w); + + XUngrabKeyboard (dpy, CurrentTime); + XUngrabPointer (dpy, CurrentTime); + UNBLOCK_INPUT; + } +} + + static GtkWidget *create_menus P_ ((widget_value *, FRAME_PTR, GCallback, GCallback, GCallback, int, int, int, GtkWidget *, xg_menu_cb_data *, char *)); @@ -2024,6 +2052,12 @@ create_menus (data, f, select_cb, deactivate_cb, highlight_cb, } else wmenu = gtk_menu_bar_new (); + /* Fix up grabs after keyboard traversal ends. */ + g_signal_connect (G_OBJECT (wmenu), + "selection-done", + G_CALLBACK (menu_nav_ended), + f); + /* Put cl_data on the top menu for easier access. */ cl_data = make_cl_data (cl_data, f, highlight_cb); g_object_set_data (G_OBJECT (wmenu), XG_FRAME_DATA, (gpointer)cl_data); diff --git a/src/image.c b/src/image.c index f309a401139..70ffabc1937 100644 --- a/src/image.c +++ b/src/image.c @@ -6104,7 +6104,6 @@ png_load (f, img) { image_error ("Cannot open image file `%s'", file, Qnil); UNGCPRO; - fclose (fp); return 0; } @@ -8067,18 +8066,18 @@ gif_load (f, img) /* Save GIF image extension data for `image-extension-data'. Format is (count IMAGES 0xf9 GRAPHIC_CONTROL_EXTENSION_BLOCK). */ { - unsigned char gce[4]; + Lisp_Object gce = make_uninit_string (4); int centisec = ((float)duration / time_scale) * 100.0f + 0.5f; /* Fill the delay time field. */ - gce[1] = centisec & 0xff; - gce[2] = (centisec >> 8) & 0xff; + SSET (gce, 1, centisec & 0xff); + SSET (gce, 2, (centisec >> 8) & 0xff); /* We don't know about other fields. */ - gce[0] = gce[3] = 0; + SSET (gce, 0, 0); + SSET (gce, 3, 0); img->data.lisp_val = list4 (Qcount, make_number (nsamples), - make_number (0xf9), - make_unibyte_string (gce, 4)); + make_number (0xf9), gce); } /* Maybe fill in the background field while we have ximg handy. */ diff --git a/src/intervals.c b/src/intervals.c index 21e60c96d3f..fecd1d181dc 100644 --- a/src/intervals.c +++ b/src/intervals.c @@ -2016,6 +2016,10 @@ set_point_both (buffer, charpos, bytepos) register INTERVAL to, from, toprev, fromprev; int buffer_point; int old_position = BUF_PT (buffer); + /* This ensures that we move forward past intangible text when the + initial position is the same as the destination, in the rare + instances where this is important, e.g. in line-move-finish + (simple.el). */ int backwards = (charpos < old_position ? 1 : 0); int have_overlays; int original_position; diff --git a/src/lisp.h b/src/lisp.h index bf2426e25a7..af7fae52eaf 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -80,7 +80,7 @@ Boston, MA 02110-1301, USA. */ /* Extra internal type checking? */ extern int suppress_checking; -extern void die P_((const char *, const char *, int)); +extern void die P_((const char *, const char *, int)) NO_RETURN; #ifdef ENABLE_CHECKING @@ -2816,7 +2816,7 @@ extern void set_time_zone_rule P_ ((char *)); /* defined in buffer.c */ extern int mouse_face_overlay_overlaps P_ ((Lisp_Object)); -extern void nsberror P_ ((Lisp_Object)); +extern void nsberror P_ ((Lisp_Object)) NO_RETURN; extern char *no_switch_window P_ ((Lisp_Object window)); EXFUN (Fset_buffer_multibyte, 1); EXFUN (Foverlay_start, 1); @@ -2936,7 +2936,7 @@ extern void syms_of_search P_ ((void)); extern Lisp_Object last_minibuf_string; extern void choose_minibuf_frame P_ ((void)); EXFUN (Fcompleting_read, 8); -EXFUN (Fread_from_minibuffer, 8); +EXFUN (Fread_from_minibuffer, 7); EXFUN (Fread_variable, 2); EXFUN (Fread_buffer, 3); EXFUN (Fread_minibuffer, 2); diff --git a/src/lread.c b/src/lread.c index b6161ebedaa..d8abde1c458 100644 --- a/src/lread.c +++ b/src/lread.c @@ -89,6 +89,7 @@ Lisp_Object Qascii_character, Qload, Qload_file_name; Lisp_Object Qbackquote, Qcomma, Qcomma_at, Qcomma_dot, Qfunction; Lisp_Object Qinhibit_file_name_operation; Lisp_Object Qeval_buffer_list, Veval_buffer_list; +Lisp_Object Qfile_truename, Qdo_after_load_evaluation; /* ACM 2006/5/16 */ /* Used instead of Qget_file_char while loading *.elc files compiled by Emacs 21 or older. */ @@ -897,8 +898,8 @@ Return t if the file exists and loads successfully. */) register int fd = -1; int count = SPECPDL_INDEX (); Lisp_Object temp; - struct gcpro gcpro1, gcpro2; - Lisp_Object found, efound; + struct gcpro gcpro1, gcpro2, gcpro3; + Lisp_Object found, efound, hist_file_name; /* 1 means we printed the ".el is newer" message. */ int newer = 0; /* 1 means we are loading a compiled file. */ @@ -906,6 +907,7 @@ Return t if the file exists and loads successfully. */) Lisp_Object handler; int safe_p = 1; char *fmode = "r"; + Lisp_Object tmp[2]; int version; #ifdef DOS_NT @@ -924,7 +926,7 @@ Return t if the file exists and loads successfully. */) the need to gcpro noerror, nomessage and nosuffix. (Below here, we care only whether they are nil or not.) The presence of this call is the result of a historical accident: - it used to be in every file-operations and when it got removed + it used to be in every file-operation and when it got removed everywhere, it accidentally stayed here. Since then, enough people supposedly have things like (load "$PROJECT/foo.el") in their .emacs that it seemed risky to remove. */ @@ -944,7 +946,6 @@ Return t if the file exists and loads successfully. */) if (SCHARS (file) > 0) { int size = SBYTES (file); - Lisp_Object tmp[2]; found = Qnil; GCPRO2 (file, found); @@ -1028,6 +1029,13 @@ Return t if the file exists and loads successfully. */) Vloads_in_progress = Fcons (found, Vloads_in_progress); } + /* Get the name for load-history. */ + hist_file_name = (! NILP (Vpurify_flag) + ? Fconcat (2, (tmp[0] = Ffile_name_directory (file), + tmp[1] = Ffile_name_nondirectory (found), + tmp)) + : found) ; + version = -1; if (!bcmp (SDATA (found) + SBYTES (found) - 4, ".elc", 4) @@ -1040,7 +1048,7 @@ Return t if the file exists and loads successfully. */) struct stat s1, s2; int result; - GCPRO2 (file, found); + GCPRO3 (file, found, hist_file_name); if (version < 0 && ! (version = safe_to_load_p (fd))) @@ -1095,14 +1103,14 @@ Return t if the file exists and loads successfully. */) if (fd >= 0) emacs_close (fd); - val = call4 (Vload_source_file_function, found, file, + val = call4 (Vload_source_file_function, found, hist_file_name, NILP (noerror) ? Qnil : Qt, NILP (nomessage) ? Qnil : Qt); return unbind_to (count, val); } } - GCPRO2 (file, found); + GCPRO3 (file, found, hist_file_name); #ifdef WINDOWSNT emacs_close (fd); @@ -1142,23 +1150,23 @@ Return t if the file exists and loads successfully. */) = Fcons (make_number (fileno (stream)), load_descriptor_list); load_in_progress++; if (! version || version >= 22) - readevalloop (Qget_file_char, stream, - (! NILP (Vpurify_flag) ? file : found), + readevalloop (Qget_file_char, stream, hist_file_name, Feval, 0, Qnil, Qnil, Qnil, Qnil); else { /* We can't handle a file which was compiled with byte-compile-dynamic by older version of Emacs. */ specbind (Qload_force_doc_strings, Qt); - readevalloop (Qget_emacs_mule_file_char, stream, file, Feval, + readevalloop (Qget_emacs_mule_file_char, stream, hist_file_name, Feval, 0, Qnil, Qnil, Qnil, Qnil); } unbind_to (count, Qnil); - /* Run any load-hooks for this file. */ - temp = Fassoc (file, Vafter_load_alist); - if (!NILP (temp)) - Fprogn (Fcdr (temp)); + /* Run any eval-after-load forms for this file */ + if (NILP (Vpurify_flag) + && (!NILP (Ffboundp (Qdo_after_load_evaluation)))) + call1 (Qdo_after_load_evaluation, hist_file_name) ; + UNGCPRO; if (saved_doc_string) @@ -1583,6 +1591,12 @@ readevalloop (readcharfun, stream, sourcename, evalfun, GCPRO4 (sourcename, readfun, start, end); + /* Try to ensure sourcename is a truename, except whilst preloading. */ + if (NILP (Vpurify_flag) + && !NILP (sourcename) && Ffile_name_absolute_p (sourcename) + && (!NILP (Ffboundp (Qfile_truename)))) + sourcename = call1 (Qfile_truename, sourcename) ; + LOADHIST_ATTACH (sourcename); continue_reading_p = 1; @@ -4110,16 +4124,17 @@ customize `jka-compr-load-suffixes' rather than the present variable. */); DEFVAR_LISP ("after-load-alist", &Vafter_load_alist, doc: /* An alist of expressions to be evalled when particular files are loaded. -Each element looks like (FILENAME FORMS...). -When `load' is run and the file-name argument is FILENAME, -the FORMS in the corresponding element are executed at the end of loading. - -FILENAME must match exactly! Normally FILENAME is the name of a library, -with no directory specified, since that is how `load' is normally called. -An error in FORMS does not undo the load, -but does prevent execution of the rest of the FORMS. -FILENAME can also be a symbol (a feature) and FORMS are then executed -when the corresponding call to `provide' is made. */); +Each element looks like (REGEXP-OR-FEATURE FORMS...). + +REGEXP-OR-FEATURE is either a regular expression to match file names, or +a symbol \(a feature name). + +When `load' is run and the file-name argument matches an element's +REGEXP-OR-FEATURE, or when `provide' is run and provides the symbol +REGEXP-OR-FEATURE, the FORMS in the element are executed. + +An error in FORMS does not undo the load, but does prevent execution of +the rest of the FORMS. */); Vafter_load_alist = Qnil; DEFVAR_LISP ("load-history", &Vload_history, @@ -4127,6 +4142,10 @@ when the corresponding call to `provide' is made. */); Each alist element is a list that starts with a file name, except for one element (optional) that starts with nil and describes definitions evaluated from buffers not visiting files. + +The file name is absolute and is the true file name (i.e. it doesn't +contain symbolic links) of the loaded file. + The remaining elements of each list are symbols defined as variables and cons cells of the form `(provide . FEATURE)', `(require . FEATURE)', `(defun . FUNCTION)', `(autoload . SYMBOL)', and `(t . SYMBOL)'. @@ -4263,6 +4282,12 @@ to load. See also `load-dangerous-libraries'. */); Qeval_buffer_list = intern ("eval-buffer-list"); staticpro (&Qeval_buffer_list); + Qfile_truename = intern ("file-truename"); + staticpro (&Qfile_truename) ; + + Qdo_after_load_evaluation = intern ("do-after-load-evaluation"); + staticpro (&Qdo_after_load_evaluation) ; + staticpro (&dump_path); staticpro (&read_objects); diff --git a/src/mac.c b/src/mac.c index f7fcbe9ac88..5fc9ea4ee28 100644 --- a/src/mac.c +++ b/src/mac.c @@ -270,6 +270,26 @@ posix_to_mac_pathname (const char *ufn, char *mfn, int mfnbuflen) static Lisp_Object Qundecoded_file_name; +static struct { + AEKeyword keyword; + char *name; + Lisp_Object symbol; +} ae_attr_table [] = + {{keyTransactionIDAttr, "transaction-id"}, + {keyReturnIDAttr, "return-id"}, + {keyEventClassAttr, "event-class"}, + {keyEventIDAttr, "event-id"}, + {keyAddressAttr, "address"}, + {keyOptionalKeywordAttr, "optional-keyword"}, + {keyTimeoutAttr, "timeout"}, + {keyInteractLevelAttr, "interact-level"}, + {keyEventSourceAttr, "event-source"}, + /* {keyMissedKeywordAttr, "missed-keyword"}, */ + {keyOriginalAddressAttr, "original-address"}, + {keyReplyRequestedAttr, "reply-requested"}, + {KEY_EMACS_SUSPENSION_ID_ATTR, "emacs-suspension-id"} + }; + static Lisp_Object mac_aelist_to_lisp (desc_list) const AEDescList *desc_list; @@ -281,22 +301,36 @@ mac_aelist_to_lisp (desc_list) Size size; AEKeyword keyword; AEDesc desc; + int attribute_p = 0; err = AECountItems (desc_list, &count); if (err != noErr) return Qnil; result = Qnil; + + again: while (count > 0) { - err = AESizeOfNthItem (desc_list, count, &desc_type, &size); + if (attribute_p) + { + keyword = ae_attr_table[count - 1].keyword; + err = AESizeOfAttribute (desc_list, keyword, &desc_type, &size); + } + else + err = AESizeOfNthItem (desc_list, count, &desc_type, &size); + if (err == noErr) switch (desc_type) { case typeAEList: case typeAERecord: case typeAppleEvent: - err = AEGetNthDesc (desc_list, count, typeWildCard, - &keyword, &desc); + if (attribute_p) + err = AEGetAttributeDesc (desc_list, keyword, typeWildCard, + &desc); + else + err = AEGetNthDesc (desc_list, count, typeWildCard, + &keyword, &desc); if (err != noErr) break; elem = mac_aelist_to_lisp (&desc); @@ -309,8 +343,13 @@ mac_aelist_to_lisp (desc_list) else { elem = make_uninit_string (size); - err = AEGetNthPtr (desc_list, count, typeWildCard, &keyword, - &desc_type, SDATA (elem), size, &size); + if (attribute_p) + err = AEGetAttributePtr (desc_list, keyword, typeWildCard, + &desc_type, SDATA (elem), + size, &size); + else + err = AEGetNthPtr (desc_list, count, typeWildCard, &keyword, + &desc_type, SDATA (elem), size, &size); } if (err != noErr) break; @@ -319,18 +358,35 @@ mac_aelist_to_lisp (desc_list) break; } - if (err != noErr) - elem = Qnil; - else if (desc_list->descriptorType != typeAEList) + if (err == noErr || desc_list->descriptorType == typeAEList) { - keyword = EndianU32_NtoB (keyword); - elem = Fcons (make_unibyte_string ((char *) &keyword, 4), elem); + if (err != noErr) + elem = Qnil; /* Don't skip elements in AEList. */ + else if (desc_list->descriptorType != typeAEList) + { + if (attribute_p) + elem = Fcons (ae_attr_table[count-1].symbol, elem); + else + { + keyword = EndianU32_NtoB (keyword); + elem = Fcons (make_unibyte_string ((char *) &keyword, 4), + elem); + } + } + + result = Fcons (elem, result); } - result = Fcons (elem, result); count--; } + if (desc_list->descriptorType == typeAppleEvent && !attribute_p) + { + attribute_p = 1; + count = sizeof (ae_attr_table) / sizeof (ae_attr_table[0]); + goto again; + } + desc_type = EndianU32_NtoB (desc_list->descriptorType); return Fcons (make_unibyte_string ((char *) &desc_type, 4), result); } @@ -403,6 +459,93 @@ mac_aedesc_to_lisp (desc) return Fcons (make_unibyte_string ((char *) &desc_type, 4), result); } +OSErr +mac_ae_put_lisp (desc, keyword_or_index, obj) + AEDescList *desc; + UInt32 keyword_or_index; + Lisp_Object obj; +{ + OSErr err; + + if (!(desc->descriptorType == typeAppleEvent + || desc->descriptorType == typeAERecord + || desc->descriptorType == typeAEList)) + return errAEWrongDataType; + + if (CONSP (obj) && STRINGP (XCAR (obj)) && SBYTES (XCAR (obj)) == 4) + { + DescType desc_type1 = EndianU32_BtoN (*((UInt32 *) SDATA (XCAR (obj)))); + Lisp_Object data = XCDR (obj), rest; + AEDesc desc1; + + switch (desc_type1) + { + case typeNull: + case typeAppleEvent: + break; + + case typeAEList: + case typeAERecord: + err = AECreateList (NULL, 0, desc_type1 == typeAERecord, &desc1); + if (err == noErr) + { + for (rest = data; CONSP (rest); rest = XCDR (rest)) + { + UInt32 keyword_or_index1 = 0; + Lisp_Object elem = XCAR (rest); + + if (desc_type1 == typeAERecord) + { + if (CONSP (elem) && STRINGP (XCAR (elem)) + && SBYTES (XCAR (elem)) == 4) + { + keyword_or_index1 = + EndianU32_BtoN (*((UInt32 *) + SDATA (XCAR (elem)))); + elem = XCDR (elem); + } + else + continue; + } + + err = mac_ae_put_lisp (&desc1, keyword_or_index1, elem); + if (err != noErr) + break; + } + + if (err == noErr) + { + if (desc->descriptorType == typeAEList) + err = AEPutDesc (desc, keyword_or_index, &desc1); + else + err = AEPutParamDesc (desc, keyword_or_index, &desc1); + } + + AEDisposeDesc (&desc1); + } + return err; + + default: + if (!STRINGP (data)) + break; + if (desc->descriptorType == typeAEList) + err = AEPutPtr (desc, keyword_or_index, desc_type1, + SDATA (data), SBYTES (data)); + else + err = AEPutParamPtr (desc, keyword_or_index, desc_type1, + SDATA (data), SBYTES (data)); + return err; + } + } + + if (desc->descriptorType == typeAEList) + err = AEPutPtr (desc, keyword_or_index, typeNull, NULL, 0); + else + err = AEPutParamPtr (desc, keyword_or_index, typeNull, NULL, 0); + + return err; +} + static pascal OSErr mac_coerce_file_name_ptr (type_code, data_ptr, data_size, to_type, handler_refcon, result) @@ -722,8 +865,7 @@ create_apple_event_from_event_ref (event, num_params, names, types, result) '?'); if (data == NULL) break; - /* typeUTF8Text is not available on Mac OS X 10.1. */ - AEPutParamPtr (result, names[i], 'utf8', + AEPutParamPtr (result, names[i], typeUTF8Text, CFDataGetBytePtr (data), CFDataGetLength (data)); CFRelease (data); break; @@ -4661,7 +4803,7 @@ cfstring_create_normalized (str, symbol) } if (in_text) - err = CreateUnicodeToTextInfo(&map, &uni); + err = CreateUnicodeToTextInfo (&map, &uni); while (err == noErr) { out_buf = xmalloc (out_size); @@ -5234,6 +5376,16 @@ syms_of_mac () QHFS_plus_C = intern ("HFS+C"); staticpro (&QHFS_plus_C); #endif + { + int i; + + for (i = 0; i < sizeof (ae_attr_table) / sizeof (ae_attr_table[0]); i++) + { + ae_attr_table[i].symbol = intern (ae_attr_table[i].name); + staticpro (&ae_attr_table[i].symbol); + } + } + defsubr (&Smac_coerce_ae_data); #if TARGET_API_MAC_CARBON defsubr (&Smac_get_preference); diff --git a/src/macfns.c b/src/macfns.c index 8e0d5153034..1c774f8ade2 100644 --- a/src/macfns.c +++ b/src/macfns.c @@ -1592,7 +1592,7 @@ x_set_icon_name (f, arg, oldval) if (STRINGP (oldval) && EQ (Fstring_equal (oldval, arg), Qt)) return; } - else if (!STRINGP (oldval) && EQ (oldval, Qnil) == EQ (arg, Qnil)) + else if (!NILP (arg) || NILP (oldval)) return; f->icon_name = arg; @@ -2829,26 +2829,22 @@ FRAME nil means use the selected frame. */) Lisp_Object frame; { struct frame *f = check_x_frame (frame); - struct mac_display_info *dpyinfo = FRAME_MAC_DISPLAY_INFO (f); - if (dpyinfo->x_focus_frame != f) - { - BLOCK_INPUT; + BLOCK_INPUT; #ifdef MAC_OSX - ActivateWindow (ActiveNonFloatingWindow (), false); - ActivateWindow (FRAME_MAC_WINDOW (f), true); + ActivateWindow (ActiveNonFloatingWindow (), false); + ActivateWindow (FRAME_MAC_WINDOW (f), true); #else #if !TARGET_API_MAC_CARBON - /* SelectWindow (Non-Carbon) does not issue deactivate events if - the possibly inactive window that is to be selected is - already the frontmost one. */ - SendBehind (FRAME_MAC_WINDOW (f), NULL); + /* SelectWindow (Non-Carbon) does not issue deactivate events if the + possibly inactive window that is to be selected is already the + frontmost one. */ + SendBehind (FRAME_MAC_WINDOW (f), NULL); #endif - /* This brings the window to the front. */ - SelectWindow (FRAME_MAC_WINDOW (f)); + /* This brings the window to the front. */ + SelectWindow (FRAME_MAC_WINDOW (f)); #endif - UNBLOCK_INPUT; - } + UNBLOCK_INPUT; return Qnil; } @@ -3028,11 +3024,11 @@ If omitted or nil, that stands for the selected frame's display. */) { if (response >= 0x00001040) { - err = Gestalt ('sys1', &major); /* gestaltSystemVersionMajor */ + err = Gestalt (gestaltSystemVersionMajor, &major); if (err == noErr) - err = Gestalt ('sys2', &minor); /* gestaltSystemVersionMinor */ + err = Gestalt (gestaltSystemVersionMinor, &minor); if (err == noErr) - err = Gestalt ('sys3', &bugfix); /* gestaltSystemVersionBugFix */ + err = Gestalt (gestaltSystemVersionBugFix, &bugfix); } else { @@ -4518,8 +4514,18 @@ This is for internal use only. Use `mac-font-panel-mode' instead. */) check_mac (); BLOCK_INPUT; - if (NILP (visible) == (FPIsFontPanelVisible () == true)) - err = FPShowHideFontPanel (); + if (NILP (visible) != !mac_font_panel_visible_p ()) + { + err = mac_show_hide_font_panel (); + if (err == noErr && !NILP (visible)) + { + Lisp_Object focus_frame = x_get_focus_frame (SELECTED_FRAME ()); + struct frame *f = (NILP (focus_frame) ? SELECTED_FRAME () + : XFRAME (focus_frame)); + + mac_set_font_info_for_selection (f, DEFAULT_FACE_ID, 0); + } + } UNBLOCK_INPUT; if (err != noErr) diff --git a/src/macgui.h b/src/macgui.h index 690840c6c33..90688e5703e 100644 --- a/src/macgui.h +++ b/src/macgui.h @@ -112,6 +112,13 @@ typedef unsigned long Time; #endif #endif +/* Whether to use Text Services Manager. */ +#ifndef USE_MAC_TSM +#ifdef MAC_OSX +#define USE_MAC_TSM 1 +#endif +#endif + typedef WindowPtr Window; typedef GWorldPtr Pixmap; diff --git a/src/macselect.c b/src/macselect.c index 1b6a1a46cc3..3afea1e9813 100644 --- a/src/macselect.c +++ b/src/macselect.c @@ -909,14 +909,13 @@ and t is the same as `SECONDARY'. */) } +/*********************************************************************** + Apple event support +***********************************************************************/ int mac_ready_for_apple_events = 0; static Lisp_Object Vmac_apple_event_map; static Lisp_Object Qmac_apple_event_class, Qmac_apple_event_id; -static struct -{ - AppleEvent *buf; - int size, count; -} deferred_apple_events; +static Lisp_Object Qemacs_suspension_id; extern Lisp_Object Qundefined; extern void mac_store_apple_event P_ ((Lisp_Object, Lisp_Object, const AEDesc *)); @@ -927,6 +926,19 @@ struct apple_event_binding Lisp_Object key, binding; }; +struct suspended_ae_info +{ + UInt32 expiration_tick, suspension_id; + AppleEvent apple_event, reply; + struct suspended_ae_info *next; +}; + +/* List of deferred apple events at the startup time. */ +static struct suspended_ae_info *deferred_apple_events = NULL; + +/* List of suspended apple events, in order of expiration_tick. */ +static struct suspended_ae_info *suspended_apple_events = NULL; + static void find_event_binding_fun (key, binding, args, data) Lisp_Object key, binding, args; @@ -1003,6 +1015,12 @@ defer_apple_events (apple_event, reply) const AppleEvent *apple_event, *reply; { OSErr err; + struct suspended_ae_info *new; + + new = xmalloc (sizeof (struct suspended_ae_info)); + bzero (new, sizeof (struct suspended_ae_info)); + new->apple_event.descriptorType = typeNull; + new->reply.descriptorType = typeNull; err = AESuspendTheCurrentEvent (apple_event); @@ -1011,30 +1029,88 @@ defer_apple_events (apple_event, reply) manual says it doesn't. Anyway we create copies of them and save them in `deferred_apple_events'. */ if (err == noErr) + err = AEDuplicateDesc (apple_event, &new->apple_event); + if (err == noErr) + err = AEDuplicateDesc (reply, &new->reply); + if (err == noErr) { - if (deferred_apple_events.buf == NULL) - { - deferred_apple_events.size = 16; - deferred_apple_events.count = 0; - deferred_apple_events.buf = - xmalloc (sizeof (AppleEvent) * deferred_apple_events.size); - } - else if (deferred_apple_events.count == deferred_apple_events.size) + new->next = deferred_apple_events; + deferred_apple_events = new; + } + else + { + AEDisposeDesc (&new->apple_event); + AEDisposeDesc (&new->reply); + xfree (new); + } + + return err; +} + +static OSErr +mac_handle_apple_event_1 (class, id, apple_event, reply) + Lisp_Object class, id; + const AppleEvent *apple_event; + AppleEvent *reply; +{ + OSErr err; + static UInt32 suspension_id = 0; + struct suspended_ae_info *new; + + new = xmalloc (sizeof (struct suspended_ae_info)); + bzero (new, sizeof (struct suspended_ae_info)); + new->apple_event.descriptorType = typeNull; + new->reply.descriptorType = typeNull; + + err = AESuspendTheCurrentEvent (apple_event); + if (err == noErr) + err = AEDuplicateDesc (apple_event, &new->apple_event); + if (err == noErr) + err = AEDuplicateDesc (reply, &new->reply); + if (err == noErr) + err = AEPutAttributePtr (&new->apple_event, KEY_EMACS_SUSPENSION_ID_ATTR, + typeUInt32, &suspension_id, sizeof (UInt32)); + if (err == noErr) + { + OSErr err1; + SInt32 reply_requested; + + err1 = AEGetAttributePtr (&new->apple_event, keyReplyRequestedAttr, + typeSInt32, NULL, &reply_requested, + sizeof (SInt32), NULL); + if (err1 != noErr) { - deferred_apple_events.size *= 2; - deferred_apple_events.buf - = xrealloc (deferred_apple_events.buf, - sizeof (AppleEvent) * deferred_apple_events.size); + /* Emulate keyReplyRequestedAttr in older versions. */ + reply_requested = reply->descriptorType != typeNull; + err = AEPutAttributePtr (&new->apple_event, keyReplyRequestedAttr, + typeSInt32, &reply_requested, + sizeof (SInt32)); } } - if (err == noErr) { - int count = deferred_apple_events.count; + SInt32 timeout = 0; + struct suspended_ae_info **p; + + new->suspension_id = suspension_id; + suspension_id++; + err = AEGetAttributePtr (apple_event, keyTimeoutAttr, typeSInt32, + NULL, &timeout, sizeof (SInt32), NULL); + new->expiration_tick = TickCount () + timeout; + + for (p = &suspended_apple_events; *p; p = &(*p)->next) + if ((*p)->expiration_tick >= new->expiration_tick) + break; + new->next = *p; + *p = new; - AEDuplicateDesc (apple_event, deferred_apple_events.buf + count); - AEDuplicateDesc (reply, deferred_apple_events.buf + count + 1); - deferred_apple_events.count += 2; + mac_store_apple_event (class, id, &new->apple_event); + } + else + { + AEDisposeDesc (&new->reply); + AEDisposeDesc (&new->apple_event); + xfree (new); } return err; @@ -1047,17 +1123,11 @@ mac_handle_apple_event (apple_event, reply, refcon) SInt32 refcon; { OSErr err; + UInt32 suspension_id; AEEventClass event_class; AEEventID event_id; Lisp_Object class_key, id_key, binding; - /* We can't handle an Apple event that requests a reply, but this - seems to be too restrictive. */ -#if 0 - if (reply->descriptorType != typeNull) - return errAEEventNotHandled; -#endif - if (!mac_ready_for_apple_events) { err = defer_apple_events (apple_event, reply); @@ -1066,6 +1136,13 @@ mac_handle_apple_event (apple_event, reply, refcon) return noErr; } + err = AEGetAttributePtr (apple_event, KEY_EMACS_SUSPENSION_ID_ATTR, + typeUInt32, NULL, + &suspension_id, sizeof (UInt32), NULL); + if (err == noErr) + /* Previously suspended event. Pass it to the next handler. */ + return errAEEventNotHandled; + err = AEGetAttributePtr (apple_event, keyEventClassAttr, typeType, NULL, &event_class, sizeof (AEEventClass), NULL); if (err == noErr) @@ -1079,11 +1156,49 @@ mac_handle_apple_event (apple_event, reply, refcon) { if (INTEGERP (binding)) return XINT (binding); - mac_store_apple_event (class_key, id_key, apple_event); - return noErr; + err = mac_handle_apple_event_1 (class_key, id_key, + apple_event, reply); } + else + err = errAEEventNotHandled; + } + if (err == noErr) + return noErr; + else + return errAEEventNotHandled; +} + +static int +cleanup_suspended_apple_events (head, all_p) + struct suspended_ae_info **head; + int all_p; +{ + UInt32 current_tick = TickCount (), nresumed = 0; + struct suspended_ae_info *p, *next; + + for (p = *head; p; p = next) + { + if (!all_p && p->expiration_tick > current_tick) + break; + AESetTheCurrentEvent (&p->apple_event); + AEResumeTheCurrentEvent (&p->apple_event, &p->reply, + (AEEventHandlerUPP) kAENoDispatch, 0); + AEDisposeDesc (&p->reply); + AEDisposeDesc (&p->apple_event); + nresumed++; + next = p->next; + xfree (p); } - return errAEEventNotHandled; + *head = p; + + return nresumed; +} + +static void +cleanup_all_suspended_apple_events () +{ + cleanup_suspended_apple_events (&deferred_apple_events, 1); + cleanup_suspended_apple_events (&suspended_apple_events, 1); } void @@ -1109,34 +1224,190 @@ init_apple_event_handler () 0L, false); if (err != noErr) abort (); + + atexit (cleanup_all_suspended_apple_events); } +static UInt32 +get_suspension_id (apple_event) + Lisp_Object apple_event; +{ + Lisp_Object tem; + + CHECK_CONS (apple_event); + CHECK_STRING_CAR (apple_event); + if (SBYTES (XCAR (apple_event)) != 4 + || strcmp (SDATA (XCAR (apple_event)), "aevt") != 0) + error ("Not an apple event"); + + tem = assq_no_quit (Qemacs_suspension_id, XCDR (apple_event)); + if (NILP (tem)) + error ("Suspension ID not available"); + + tem = XCDR (tem); + if (!(CONSP (tem) + && STRINGP (XCAR (tem)) && SBYTES (XCAR (tem)) == 4 + && strcmp (SDATA (XCAR (tem)), "magn") == 0 + && STRINGP (XCDR (tem)) && SBYTES (XCDR (tem)) == 4)) + error ("Bad suspension ID format"); + + return *((UInt32 *) SDATA (XCDR (tem))); +} + + DEFUN ("mac-process-deferred-apple-events", Fmac_process_deferred_apple_events, Smac_process_deferred_apple_events, 0, 0, 0, doc: /* Process Apple events that are deferred at the startup time. */) () { - Lisp_Object result = Qnil; - long i; - if (mac_ready_for_apple_events) return Qnil; BLOCK_INPUT; mac_ready_for_apple_events = 1; - if (deferred_apple_events.buf) + if (deferred_apple_events) { - for (i = 0; i < deferred_apple_events.count; i += 2) + struct suspended_ae_info *prev, *tail, *next; + + /* `nreverse' deferred_apple_events. */ + prev = NULL; + for (tail = deferred_apple_events; tail; tail = next) { - AEResumeTheCurrentEvent (deferred_apple_events.buf + i, - deferred_apple_events.buf + i + 1, + next = tail->next; + tail->next = prev; + prev = tail; + } + + /* Now `prev' points to the first cell. */ + for (tail = prev; tail; tail = next) + { + next = tail->next; + AEResumeTheCurrentEvent (&tail->apple_event, &tail->reply, ((AEEventHandlerUPP) kAEUseStandardDispatch), 0); - AEDisposeDesc (deferred_apple_events.buf + i); - AEDisposeDesc (deferred_apple_events.buf + i + 1); + AEDisposeDesc (&tail->reply); + AEDisposeDesc (&tail->apple_event); + xfree (tail); } - xfree (deferred_apple_events.buf); - bzero (&deferred_apple_events, sizeof (deferred_apple_events)); + deferred_apple_events = NULL; + } + UNBLOCK_INPUT; + + return Qt; +} + +DEFUN ("mac-cleanup-expired-apple-events", Fmac_cleanup_expired_apple_events, Smac_cleanup_expired_apple_events, 0, 0, 0, + doc: /* Clean up expired Apple events. +Return the number of expired events. */) + () +{ + int nexpired; + + BLOCK_INPUT; + nexpired = cleanup_suspended_apple_events (&suspended_apple_events, 0); + UNBLOCK_INPUT; + + return make_number (nexpired); +} + +DEFUN ("mac-ae-set-reply-parameter", Fmac_ae_set_reply_parameter, Smac_ae_set_reply_parameter, 3, 3, 0, + doc: /* Set parameter KEYWORD to DESCRIPTOR on reply of APPLE-EVENT. +KEYWORD is a 4-byte string. DESCRIPTOR is a Lisp representation of an +Apple event descriptor. It has the form of (TYPE . DATA), where TYPE +is a 4-byte string. Valid format of DATA is as follows: + + * If TYPE is "null", then DATA is nil. + * If TYPE is "list", then DATA is a list (DESCRIPTOR1 ... DESCRIPTORn). + * If TYPE is "reco", then DATA is a list ((KEYWORD1 . DESCRIPTOR1) + ... (KEYWORDn . DESCRIPTORn)). + * If TYPE is "aevt", then DATA is ignored and the descriptor is + treated as null. + * Otherwise, DATA is a string. + +If a (sub-)descriptor is in an invalid format, it is silently treated +as null. + +Return t if the parameter is successfully set. Otherwise return nil. */) + (apple_event, keyword, descriptor) + Lisp_Object apple_event, keyword, descriptor; +{ + Lisp_Object result = Qnil; + UInt32 suspension_id; + struct suspended_ae_info *p; + + suspension_id = get_suspension_id (apple_event); + + CHECK_STRING (keyword); + if (SBYTES (keyword) != 4) + error ("Apple event keyword must be a 4-byte string: %s", + SDATA (keyword)); + + BLOCK_INPUT; + for (p = suspended_apple_events; p; p = p->next) + if (p->suspension_id == suspension_id) + break; + if (p && p->reply.descriptorType != typeNull) + { + OSErr err; + + err = mac_ae_put_lisp (&p->reply, + EndianU32_BtoN (*((UInt32 *) SDATA (keyword))), + descriptor); + if (err == noErr) + result = Qt; + } + UNBLOCK_INPUT; + + return result; +} + +DEFUN ("mac-resume-apple-event", Fmac_resume_apple_event, Smac_resume_apple_event, 1, 2, 0, + doc: /* Resume handling of APPLE-EVENT. +Every Apple event handled by the Lisp interpreter is suspended first. +This function resumes such a suspended event either to complete Apple +event handling to give a reply, or to redispatch it to other handlers. + +If optional ERROR-CODE is an integer, it specifies the error number +that is set in the reply. If ERROR-CODE is t, the resumed event is +handled with the standard dispatching mechanism, but it is not handled +by Emacs again, thus it is redispatched to other handlers. + +Return t if APPLE-EVENT is successfully resumed. Otherwise return +nil, which means the event is already resumed or expired. */) + (apple_event, error_code) + Lisp_Object apple_event, error_code; +{ + Lisp_Object result = Qnil; + UInt32 suspension_id; + struct suspended_ae_info **p, *ae; + + suspension_id = get_suspension_id (apple_event); + + BLOCK_INPUT; + for (p = &suspended_apple_events; *p; p = &(*p)->next) + if ((*p)->suspension_id == suspension_id) + break; + if (*p) + { + ae = *p; + *p = (*p)->next; + if (INTEGERP (error_code) + && ae->apple_event.descriptorType != typeNull) + { + SInt32 errn = XINT (error_code); + + AEPutParamPtr (&ae->reply, keyErrorNumber, typeSInt32, + &errn, sizeof (SInt32)); + } + AESetTheCurrentEvent (&ae->apple_event); + AEResumeTheCurrentEvent (&ae->apple_event, &ae->reply, + ((AEEventHandlerUPP) + (EQ (error_code, Qt) ? + kAEUseStandardDispatch : kAENoDispatch)), + 0); + AEDisposeDesc (&ae->reply); + AEDisposeDesc (&ae->apple_event); + xfree (ae); result = Qt; } UNBLOCK_INPUT; @@ -1145,6 +1416,9 @@ DEFUN ("mac-process-deferred-apple-events", Fmac_process_deferred_apple_events, } +/*********************************************************************** + Drag and drop support +***********************************************************************/ #if TARGET_API_MAC_CARBON static Lisp_Object Vmac_dnd_known_types; static pascal OSErr mac_do_track_drag P_ ((DragTrackingMessage, WindowRef, @@ -1337,6 +1611,9 @@ remove_drag_handler (window) } +/*********************************************************************** + Services menu support +***********************************************************************/ #ifdef MAC_OSX void init_service_handler () @@ -1554,6 +1831,9 @@ syms_of_macselect () defsubr (&Sx_selection_owner_p); defsubr (&Sx_selection_exists_p); defsubr (&Smac_process_deferred_apple_events); + defsubr (&Smac_cleanup_expired_apple_events); + defsubr (&Smac_resume_apple_event); + defsubr (&Smac_ae_set_reply_parameter); Vselection_alist = Qnil; staticpro (&Vselection_alist); @@ -1635,6 +1915,9 @@ The types are chosen in the order they appear in the list. */); Qmac_apple_event_id = intern ("mac-apple-event-id"); staticpro (&Qmac_apple_event_id); + + Qemacs_suspension_id = intern ("emacs-suspension-id"); + staticpro (&Qemacs_suspension_id); } /* arch-tag: f3c91ad8-99e0-4bd6-9eef-251b2f848732 diff --git a/src/macterm.c b/src/macterm.c index e3b8b3b5881..549e1e7977b 100644 --- a/src/macterm.c +++ b/src/macterm.c @@ -3531,19 +3531,28 @@ x_draw_stretch_glyph_string (s) { /* If `x-stretch-block-cursor' is nil, don't draw a block cursor as wide as the stretch glyph. */ - int width = min (FRAME_COLUMN_WIDTH (s->f), s->background_width); + int width, background_width = s->background_width; + int x = s->x, left_x = window_box_left_offset (s->w, TEXT_AREA); + + if (x < left_x) + { + background_width -= left_x - x; + x = left_x; + } + width = min (FRAME_COLUMN_WIDTH (s->f), background_width); /* Draw cursor. */ - x_draw_glyph_string_bg_rect (s, s->x, s->y, width, s->height); + x_draw_glyph_string_bg_rect (s, x, s->y, width, s->height); /* Clear rest using the GC of the original non-cursor face. */ - if (width < s->background_width) + if (width < background_width) { - int x = s->x + width, y = s->y; - int w = s->background_width - width, h = s->height; + int y = s->y; + int w = background_width - width, h = s->height; Rect r; GC gc; + x += width; if (s->row->mouse_face_p && cursor_in_mouse_face_p (s->w)) { @@ -3570,8 +3579,18 @@ x_draw_stretch_glyph_string (s) } } else if (!s->background_filled_p) - x_draw_glyph_string_bg_rect (s, s->x, s->y, s->background_width, - s->height); + { + int background_width = s->background_width; + int x = s->x, left_x = window_box_left_offset (s->w, TEXT_AREA); + + if (x < left_x) + { + background_width -= left_x - x; + x = left_x; + } + if (background_width > 0) + x_draw_glyph_string_bg_rect (s, x, s->y, background_width, s->height); + } s->background_filled_p = 1; } @@ -5398,8 +5417,7 @@ x_draw_hollow_cursor (w, row) return; /* Compute frame-relative coordinates for phys cursor. */ - x = WINDOW_TEXT_TO_FRAME_PIXEL_X (w, w->phys_cursor.x); - y = get_phys_cursor_geometry (w, row, cursor_glyph, &h); + get_phys_cursor_geometry (w, row, cursor_glyph, &x, &y, &h); wd = w->phys_cursor_width; /* The foreground of cursor_gc is typically the same as the normal @@ -6135,6 +6153,7 @@ mac_handle_visibility_change (f) EVENT_INIT (buf); buf.kind = DEICONIFY_EVENT; XSETFRAME (buf.frame_or_window, f); + buf.arg = Qnil; kbd_buffer_store_event (&buf); } else if (! NILP (Vframe_list) && ! NILP (XCDR (Vframe_list))) @@ -6148,6 +6167,7 @@ mac_handle_visibility_change (f) EVENT_INIT (buf); buf.kind = ICONIFY_EVENT; XSETFRAME (buf.frame_or_window, f); + buf.arg = Qnil; kbd_buffer_store_event (&buf); } @@ -8341,6 +8361,26 @@ x_find_ccl_program (fontp) } #if USE_MAC_FONT_PANEL +/* Whether Font Panel has been shown before. The first call to font + panel functions (FPIsFontPanelVisible, SetFontInfoForSelection) is + slow. This variable is used for deferring such a call as much as + possible. */ +static int font_panel_shown_p = 0; + +int +mac_font_panel_visible_p () +{ + return font_panel_shown_p && FPIsFontPanelVisible (); +} + +OSStatus +mac_show_hide_font_panel () +{ + font_panel_shown_p = 1; + + return FPShowHideFontPanel (); +} + OSStatus mac_set_font_info_for_selection (f, face_id, c) struct frame *f; @@ -8350,6 +8390,9 @@ mac_set_font_info_for_selection (f, face_id, c) EventTargetRef target = NULL; XFontStruct *font = NULL; + if (!mac_font_panel_visible_p ()) + return noErr; + if (f) { target = GetWindowEventTarget (FRAME_MAC_WINDOW (f)); @@ -8484,6 +8527,13 @@ static Lisp_Object Qtoolbar_switch_mode; extern Lisp_Object Qfont; static Lisp_Object Qpanel_closed, Qselection; #endif +#if USE_MAC_TSM +static TSMDocumentID tsm_document_id; +static Lisp_Object Qtext_input; +static Lisp_Object Qupdate_active_input_area, Qunicode_for_key_event; +static Lisp_Object Vmac_ts_active_input_overlay; +extern Lisp_Object Qbefore_string; +#endif #endif extern int mac_ready_for_apple_events; extern Lisp_Object Qundefined; @@ -8835,13 +8885,17 @@ is_emacs_window (WindowPtr win) static void do_app_resume () { - /* Window-activate events will do the job. */ +#if USE_MAC_TSM + ActivateTSMDocument (tsm_document_id); +#endif } static void do_app_suspend () { - /* Window-deactivate events will do the job. */ +#if USE_MAC_TSM + DeactivateTSMDocument (tsm_document_id); +#endif } @@ -9101,6 +9155,9 @@ mac_store_event_ref_as_apple_event (class, id, class_key, id_key, { mac_store_apple_event (class_key, id_key, &apple_event); AEDisposeDesc (&apple_event); + /* Post a harmless event so as to wake up from + ReceiveNextEvent. */ + mac_post_mouse_moved_event (); } } } @@ -9290,6 +9347,18 @@ mac_handle_window_event (next_handler, event, data) } return err == noErr ? noErr : result; #endif + +#if USE_MAC_TSM + case kEventWindowFocusAcquired: + result = CallNextEventHandler (next_handler, event); + err = ActivateTSMDocument (tsm_document_id); + return err == noErr ? noErr : result; + + case kEventWindowFocusRelinquish: + result = CallNextEventHandler (next_handler, event); + err = DeactivateTSMDocument (tsm_document_id); + return err == noErr ? noErr : result; +#endif } return eventNotHandledErr; @@ -9416,6 +9485,183 @@ mac_handle_font_event (next_handler, event, data) } #endif +#if USE_MAC_TSM +static pascal OSStatus +mac_handle_text_input_event (next_handler, event, data) + EventHandlerCallRef next_handler; + EventRef event; + void *data; +{ + OSStatus result, err = noErr; + Lisp_Object id_key = Qnil; + int num_params; + EventParamName *names; + EventParamType *types; + static UInt32 seqno_uaia = 0; + static EventParamName names_uaia[] = + {kEventParamTextInputSendComponentInstance, + kEventParamTextInputSendRefCon, + kEventParamTextInputSendSLRec, + kEventParamTextInputSendFixLen, + kEventParamTextInputSendText, + kEventParamTextInputSendUpdateRng, + kEventParamTextInputSendHiliteRng, + kEventParamTextInputSendClauseRng, + kEventParamTextInputSendPinRng, + kEventParamTextInputSendTextServiceEncoding, + kEventParamTextInputSendTextServiceMacEncoding, + EVENT_PARAM_TEXT_INPUT_SEQUENCE_NUMBER}; + static EventParamType types_uaia[] = + {typeComponentInstance, + typeLongInteger, + typeIntlWritingCode, + typeLongInteger, + typeUnicodeText, + typeTextRangeArray, + typeTextRangeArray, + typeOffsetArray, + typeTextRange, + typeUInt32, + typeUInt32, + typeUInt32}; + static EventParamName names_ufke[] = + {kEventParamTextInputSendComponentInstance, + kEventParamTextInputSendRefCon, + kEventParamTextInputSendSLRec, + kEventParamTextInputSendText}; + static EventParamType types_ufke[] = + {typeComponentInstance, + typeLongInteger, + typeIntlWritingCode, + typeUnicodeText}; + + result = CallNextEventHandler (next_handler, event); + + switch (GetEventKind (event)) + { + case kEventTextInputUpdateActiveInputArea: + id_key = Qupdate_active_input_area; + num_params = sizeof (names_uaia) / sizeof (names_uaia[0]); + names = names_uaia; + types = types_uaia; + SetEventParameter (event, EVENT_PARAM_TEXT_INPUT_SEQUENCE_NUMBER, + typeUInt32, sizeof (UInt32), &seqno_uaia); + seqno_uaia++; + break; + + case kEventTextInputUnicodeForKeyEvent: + { + EventRef kbd_event; + UInt32 actual_size, modifiers, mapped_modifiers; + UniChar code; + + err = GetEventParameter (event, kEventParamTextInputSendKeyboardEvent, + typeEventRef, NULL, sizeof (EventRef), NULL, + &kbd_event); + if (err == noErr) + err = GetEventParameter (kbd_event, kEventParamKeyModifiers, + typeUInt32, NULL, + sizeof (UInt32), NULL, &modifiers); + if (err == noErr) + { + mapped_modifiers = + (NILP (Vmac_control_modifier) ? 0 : controlKey) + | (NILP (Vmac_option_modifier) ? 0 : optionKey) + | (NILP (Vmac_command_modifier) ? 0 : cmdKey); +#ifdef MAC_OSX + mapped_modifiers |= + (NILP (Vmac_function_modifier) ? 0 : kEventKeyModifierFnMask); +#endif + if (modifiers & mapped_modifiers) + /* There're mapped modifier keys. Process it in + XTread_socket. */ + return eventNotHandledErr; + } + if (err == noErr) + err = GetEventParameter (kbd_event, kEventParamKeyUnicodes, + typeUnicodeText, NULL, 0, &actual_size, + NULL); + if (err == noErr) + { + if (actual_size == sizeof (UniChar)) + err = GetEventParameter (kbd_event, kEventParamKeyUnicodes, + typeUnicodeText, NULL, + sizeof (UniChar), NULL, &code); + if (err == noErr && code < 0x80) + { + /* ASCII character. Process it in XTread_socket. */ + if (read_socket_inev && code >= 0x20 && code <= 0x7e) + { + struct frame *f = mac_focus_frame (&one_mac_display_info); + + read_socket_inev->kind = ASCII_KEYSTROKE_EVENT; + read_socket_inev->code = code; + read_socket_inev->modifiers = + (extra_keyboard_modifiers + & (meta_modifier | alt_modifier + | hyper_modifier | super_modifier)); + XSETFRAME (read_socket_inev->frame_or_window, f); + } + return eventNotHandledErr; + } + } + } + /* Non-ASCII keystrokes without mapped modifiers are processed + at the Lisp level. */ + id_key = Qunicode_for_key_event; + num_params = sizeof (names_ufke) / sizeof (names_ufke[0]); + names = names_ufke; + types = types_ufke; + break; + + case kEventTextInputOffsetToPos: + { + struct frame *f; + struct window *w; + Point p; + + if (!OVERLAYP (Vmac_ts_active_input_overlay)) + return eventNotHandledErr; + + /* Strictly speaking, this is not always correct because + previous events may change some states about display. */ + if (NILP (Foverlay_get (Vmac_ts_active_input_overlay, Qbefore_string))) + { + /* Active input area is displayed in the echo area. */ + w = XWINDOW (echo_area_window); + f = WINDOW_XFRAME (w); + } + else + { + /* Active input area is displayed around the current point. */ + f = SELECTED_FRAME (); + w = XWINDOW (f->selected_window); + } + + p.h = (WINDOW_TO_FRAME_PIXEL_X (w, w->cursor.x) + + WINDOW_LEFT_FRINGE_WIDTH (w)); + p.v = (WINDOW_TO_FRAME_PIXEL_Y (w, w->cursor.y) + + FONT_BASE (FRAME_FONT (f))); + SetPortWindowPort (FRAME_MAC_WINDOW (f)); + LocalToGlobal (&p); + err = SetEventParameter (event, kEventParamTextInputReplyPoint, + typeQDPoint, sizeof (typeQDPoint), &p); + } + break; + + default: + abort (); + } + + if (!NILP (id_key)) + err = mac_store_event_ref_as_apple_event (0, 0, Qtext_input, id_key, + event, num_params, + names, types); + + return err == noErr ? noErr : result; +} +#endif + #ifdef MAC_OSX OSStatus mac_store_service_event (event) @@ -9477,6 +9723,10 @@ install_window_handler (window) #ifdef MAC_OSX {kEventClassWindow, kEventWindowToolbarSwitchMode}, #endif +#if USE_MAC_TSM + {kEventClassWindow, kEventWindowFocusAcquired}, + {kEventClassWindow, kEventWindowFocusRelinquish}, +#endif }; EventTypeSpec specs_mouse[] = {{kEventClassMouse, kEventMouseWheelMoved}}; static EventHandlerUPP handle_window_eventUPP = NULL; @@ -9486,6 +9736,13 @@ install_window_handler (window) {kEventClassFont, kEventFontSelection}}; static EventHandlerUPP handle_font_eventUPP = NULL; #endif +#if USE_MAC_TSM + EventTypeSpec specs_text_input[] = + {{kEventClassTextInput, kEventTextInputUpdateActiveInputArea}, + {kEventClassTextInput, kEventTextInputUnicodeForKeyEvent}, + {kEventClassTextInput, kEventTextInputOffsetToPos}}; + static EventHandlerUPP handle_text_input_eventUPP = NULL; +#endif if (handle_window_eventUPP == NULL) handle_window_eventUPP = NewEventHandlerUPP (mac_handle_window_event); @@ -9495,6 +9752,11 @@ install_window_handler (window) if (handle_font_eventUPP == NULL) handle_font_eventUPP = NewEventHandlerUPP (mac_handle_font_event); #endif +#if USE_MAC_TSM + if (handle_text_input_eventUPP == NULL) + handle_text_input_eventUPP = + NewEventHandlerUPP (mac_handle_text_input_event); +#endif err = InstallWindowEventHandler (window, handle_window_eventUPP, GetEventTypeCount (specs_window), specs_window, NULL, NULL); @@ -9508,6 +9770,12 @@ install_window_handler (window) GetEventTypeCount (specs_font), specs_font, NULL, NULL); #endif +#if USE_MAC_TSM + if (err == noErr) + err = InstallWindowEventHandler (window, handle_text_input_eventUPP, + GetEventTypeCount (specs_text_input), + specs_text_input, window, NULL); +#endif #endif if (err == noErr) err = install_drag_handler (window); @@ -9633,7 +9901,7 @@ static unsigned char keycode_to_xkeysym_table[] = { /*0x60*/ 0xc2 /*f5*/, 0xc3 /*f6*/, 0xc4 /*f7*/, 0xc0 /*f3*/, /*0x64*/ 0xc5 /*f8*/, 0xc6 /*f9*/, 0, 0xc8 /*f11*/, - /*0x68*/ 0, 0xca /*f13*/, 0, 0xcb /*f14*/, + /*0x68*/ 0, 0xca /*f13*/, 0xcd /*f16*/, 0xcb /*f14*/, /*0x6C*/ 0, 0xc7 /*f10*/, 0x0a /*fn+enter on laptops*/, 0xc9 /*f12*/, /*0x70*/ 0, 0xcc /*f15*/, 0x6a /*help*/, 0x50 /*home*/, @@ -9650,7 +9918,13 @@ keycode_to_xkeysym (int keyCode, int *xKeySym) return *xKeySym != 0; } -static unsigned char fn_keycode_to_xkeysym_table[] = { +#ifdef MAC_OSX +/* Table for translating Mac keycode with the laptop `fn' key to that + without it. Destination symbols in comments are keys on US + keyboard, and they may not be the same on other types of keyboards. + If the destination is identical to the source (f1 ... f12), it + doesn't map `fn' key to a modifier. */ +static unsigned char fn_keycode_to_keycode_table[] = { /*0x00*/ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /*0x10*/ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /*0x20*/ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -9660,113 +9934,27 @@ static unsigned char fn_keycode_to_xkeysym_table[] = { /*0x38*/ 0, 0, 0, 0, /*0x3C*/ 0, 0, 0, 0, - /*0x40*/ 0, 0x2e /*kp-. = .*/, 0, 0x50 /*kp-* = 'p'*/, - /*0x44*/ 0, '/' /*kp-+*/, 0, 0, - /*0x48*/ 0, 0, 0, 0x30 /*kp-/ = '0'*/, - /*0x4C*/ 0, 0, 0x3b /*kp-- = ';'*/, 0, + /*0x40*/ 0, 0x2f /*kp-. -> '.'*/, 0, 0x23 /*kp-* -> 'p'*/, + /*0x44*/ 0, 0x2c /*kp-+ -> '/'*/, 0, 0x16 /*clear -> '6'*/, + /*0x48*/ 0, 0, 0, 0x1d /*kp-/ -> '0'*/, + /*0x4C*/ 0x24 /*kp-enter -> return*/, 0, 0x29 /*kp-- -> ';'*/, 0, - /*0x50*/ 0, 0x2d /*kp-= = '-'*/, 0x6d /*kp-0 = 'm'*/, 0x6a /*kp-1 = 'j'*/, - /*0x54*/ 0x6b /*kp-2 = 'k'*/, 0x6c /*kp-3 = 'l'*/, 'u' /*kp-4*/, 'i' /*kp-5*/, - /*0x58*/ 'o' /*kp-6*/, '7' /*kp-7*/, 0, '8' /*kp-8*/, - /*0x5C*/ '9' /*kp-9*/, 0, 0, 0, + /*0x50*/ 0, 0x1b /*kp-= -> '-'*/, 0x2e /*kp-0 -> 'm'*/, 0x26 /*kp-1 -> 'j'*/, + /*0x54*/ 0x28 /*kp-2 -> 'k'*/, 0x25 /*kp-3 -> 'l'*/, 0x20 /*kp-4 -> 'u'*/, 0x22 /*kp-5 ->'i'*/, + /*0x58*/ 0x1f /*kp-6 -> 'o'*/, 0x1a /*kp-7 -> '7'*/, 0, 0x1c /*kp-8 -> '8'*/, + /*0x5C*/ 0x19 /*kp-9 -> '9'*/, 0, 0, 0, - /*0x60*/ 0, 0, 0, 0, - /*0x64*/ 0, 0, 0, 0, + /*0x60*/ 0x60 /*f5 = f5*/, 0x61 /*f6 = f6*/, 0x62 /*f7 = f7*/, 0x63 /*f3 = f3*/, + /*0x64*/ 0x64 /*f8 = f8*/, 0x65 /*f9 = f9*/, 0, 0x67 /*f11 = f11*/, /*0x68*/ 0, 0, 0, 0, - /*0x6C*/ 0, 0, 0, 0, + /*0x6C*/ 0, 0x6d /*f10 = f10*/, 0, 0x6f /*f12 = f12*/, - /*0x70*/ 0, 0, 0, 0, - /*0x74*/ 0, 0, 0, 0, - /*0x78*/ 0, 0, 0, 0, + /*0x70*/ 0, 0, 0, 0x7b /*home -> left*/, + /*0x74*/ 0x7e /*pgup -> up*/, 0x33 /*delete -> backspace*/, 0x76 /*f4 = f4*/, 0x7c /*end -> right*/, + /*0x78*/ 0x78 /*f2 = f2*/, 0x7d /*pgdown -> down*/, 0x7a /*f1 = f1*/, 0, /*0x7C*/ 0, 0, 0, 0 }; -static int -convert_fn_keycode (EventRef eventRef, int keyCode, int *newCode) -{ -#ifdef MAC_OSX - /* Use the special map to translate keys when function modifier is - to be caught. KeyTranslate can't be used in that case. - We can't detect the function key using the input_event.modifiers, - because this uses the high word of an UInt32. Therefore, - we'll just read it out of the original eventRef. - */ - - - /* TODO / known issues - - - Fn-Shift-j is regonized as Fn-j and not Fn-J. - The above table always translates to lower characters. We need to use - the KCHR keyboard resource (KeyTranslate() ) to map k->K and 8->*. - - - The table is meant for English language keyboards, and it will work - for many others with the exception of key combinations like Fn-ö on - a German keyboard, which is currently mapped to Fn-;. - How to solve this without keeping separate tables for all keyboards - around? KeyTranslate isn't of much help here, as it only takes a 16-bit - value for keycode with the modifiers in he high byte, i.e. no room for the - Fn modifier. That's why we need the table. - - */ - OSStatus err; - UInt32 mods = 0; - if (!NILP(Vmac_function_modifier)) - { - err = GetEventParameter (eventRef, kEventParamKeyModifiers, typeUInt32, - NULL, sizeof (UInt32), NULL, &mods); - if (err != noErr && mods & kEventKeyModifierFnMask) - { *newCode = fn_keycode_to_xkeysym_table [keyCode & 0x7f]; - - return (*newCode != 0); - } - } -#endif - return false; -} - -static int -backtranslate_modified_keycode(int mods, int keycode, int def) -{ - EventModifiers mapped_modifiers = - (NILP (Vmac_control_modifier) ? 0 : controlKey) - | (NILP (Vmac_option_modifier) ? 0 : optionKey) - | (NILP (Vmac_command_modifier) ? 0 : cmdKey); - - if (mods & mapped_modifiers) - { - /* This code comes from Keyboard Resource, - Appendix C of IM - Text. This is necessary - since shift is ignored in KCHR table - translation when option or command is pressed. - It also does not translate correctly - control-shift chars like C-% so mask off shift - here also. - - Not done for combinations with the option key (alt) - unless it is to be caught by Emacs: this is - to preserve key combinations translated by the OS - such as Alt-3. - */ - /* Mask off modifier keys that are mapped to some Emacs - modifiers. */ - int new_modifiers = mods & ~mapped_modifiers; - /* set high byte of keycode to modifier high byte*/ - int new_keycode = keycode | new_modifiers; - Ptr kchr_ptr = (Ptr) GetScriptManagerVariable (smKCHRCache); - unsigned long some_state = 0; - return (int) KeyTranslate (kchr_ptr, new_keycode, - &some_state) & 0xff; - /* TO DO: Recognize two separate resulting characters, "for - example, when the user presses Option-E followed by N, you - can map this through the KeyTranslate function using the - U.S. 'KCHR' resource to produce ´n, which KeyTranslate - returns as two characters in the bytes labeled Character code - 1 and Character code 2." (from Carbon API doc) */ - - } - else - return def; -} - +#endif /* MAC_OSX */ #if !USE_CARBON_EVENTS static RgnHandle mouse_region = NULL; @@ -9840,6 +10028,44 @@ mac_post_mouse_moved_event () return err; } + +static void +mac_set_unicode_keystroke_event (code, buf) + UniChar code; + struct input_event *buf; +{ + int charset_id, c1, c2; + + if (code < 0x80) + { + buf->kind = ASCII_KEYSTROKE_EVENT; + buf->code = code; + } + else if (code < 0x100) + { + if (code < 0xA0) + charset_id = CHARSET_8_BIT_CONTROL; + else + charset_id = charset_latin_iso8859_1; + buf->kind = MULTIBYTE_CHAR_KEYSTROKE_EVENT; + buf->code = MAKE_CHAR (charset_id, code, 0); + } + else + { + if (code < 0x2500) + charset_id = charset_mule_unicode_0100_24ff, + code -= 0x100; + else if (code < 0x33FF) + charset_id = charset_mule_unicode_2500_33ff, + code -= 0x2500; + else if (code >= 0xE000) + charset_id = charset_mule_unicode_e000_ffff, + code -= 0xE000; + c1 = (code / 96) + 32, c2 = (code % 96) + 32; + buf->kind = MULTIBYTE_CHAR_KEYSTROKE_EVENT; + buf->code = MAKE_CHAR (charset_id, c1, c2); + } +} #endif /* Emacs calls this whenever it wants to read an input event from the @@ -9889,10 +10115,6 @@ XTread_socket (sd, expected, hold_quit) struct frame *f; unsigned long timestamp; - /* It is necessary to set this (additional) argument slot of an - event to nil because keyboard.c protects incompletely - processed event from being garbage collected by placing them - in the kbd_buffer_gcpro vector. */ EVENT_INIT (inev); inev.kind = NO_EVENT; inev.arg = Qnil; @@ -10354,10 +10576,29 @@ XTread_socket (sd, expected, hold_quit) break; case keyDown: + case keyUp: case autoKey: { int keycode = (er.message & keyCodeMask) >> 8; int xkeysym; + static SInt16 last_key_script = -1; + SInt16 current_key_script; + UInt32 modifiers = er.modifiers, mapped_modifiers; + + mapped_modifiers = + (NILP (Vmac_control_modifier) ? 0 : controlKey) + | (NILP (Vmac_option_modifier) ? 0 : optionKey) + | (NILP (Vmac_command_modifier) ? 0 : cmdKey); + +#if USE_CARBON_EVENTS && defined (MAC_OSX) + mapped_modifiers |= + (NILP (Vmac_function_modifier) ? 0 : kEventKeyModifierFnMask); + + GetEventParameter (eventRef, kEventParamKeyModifiers, + typeUInt32, NULL, + sizeof (UInt32), NULL, &modifiers); +#endif + mapped_modifiers &= modifiers; #if USE_CARBON_EVENTS && defined (MAC_OSX) /* When using Carbon Events, we need to pass raw keyboard @@ -10365,45 +10606,21 @@ XTread_socket (sd, expected, hold_quit) will pass back noErr, otherwise it will pass back "eventNotHandledErr" and we can process it normally. */ - if ((mac_pass_command_to_system - || !(er.modifiers & cmdKey)) - && (mac_pass_control_to_system - || !(er.modifiers & controlKey)) - && (NILP (Vmac_option_modifier) - || !(er.modifiers & optionKey))) - if (SendEventToEventTarget (eventRef, toolbox_dispatcher) - != eventNotHandledErr) - break; -#endif - -#if 0 - if (dpyinfo->x_focus_frame == NULL) + if (!(mapped_modifiers + & ~(mac_pass_command_to_system ? cmdKey : 0) + & ~(mac_pass_control_to_system ? controlKey : 0))) { - /* Beep if keyboard input occurs when all the frames - are invisible. */ - SysBeep (1); - break; + OSStatus err; + + read_socket_inev = &inev; + err = SendEventToEventTarget (eventRef, toolbox_dispatcher); + read_socket_inev = NULL; + if (err != eventNotHandledErr) + break; } #endif - - { - static SInt16 last_key_script = -1; - SInt16 current_key_script = GetScriptManagerVariable (smKeyScript); - - if (last_key_script != current_key_script) - { - struct input_event event; - - EVENT_INIT (event); - event.kind = LANGUAGE_CHANGE_EVENT; - event.arg = Qnil; - event.code = current_key_script; - event.timestamp = timestamp; - kbd_buffer_store_event (&event); - count++; - } - last_key_script = current_key_script; - } + if (er.what == keyUp) + break; ObscureCursor (); @@ -10416,51 +10633,163 @@ XTread_socket (sd, expected, hold_quit) dpyinfo->mouse_face_hidden = 1; } - /* translate the keycode back to determine the original key */ - /* Convert key code if function key is pressed. - Otherwise, if non-ASCII-event, take care of that - without re-translating the key code. */ -#if USE_CARBON_EVENTS - if (convert_fn_keycode (eventRef, keycode, &xkeysym)) + current_key_script = GetScriptManagerVariable (smKeyScript); + if (last_key_script != current_key_script) { - inev.code = xkeysym; - /* this doesn't work - tried to add shift modifiers */ - inev.code = - backtranslate_modified_keycode(er.modifiers & (~0x2200), - xkeysym | 0x80, xkeysym); - inev.kind = ASCII_KEYSTROKE_EVENT; + struct input_event event; + + EVENT_INIT (event); + event.kind = LANGUAGE_CHANGE_EVENT; + event.arg = Qnil; + event.code = current_key_script; + event.timestamp = timestamp; + kbd_buffer_store_event (&event); + count++; + last_key_script = current_key_script; } - else + +#if USE_MAC_TSM + if (inev.kind != NO_EVENT) + break; #endif - if (keycode_to_xkeysym (keycode, &xkeysym)) - { - inev.code = 0xff00 | xkeysym; - inev.kind = NON_ASCII_KEYSTROKE_EVENT; - } - else - { - inev.code = - backtranslate_modified_keycode(er.modifiers, keycode, - er.message & charCodeMask); - inev.kind = ASCII_KEYSTROKE_EVENT; - } - } -#if USE_CARBON_EVENTS - inev.modifiers = mac_event_to_emacs_modifiers (eventRef); -#else - inev.modifiers = mac_to_emacs_modifiers (er.modifiers); +#ifdef MAC_OSX + if (mapped_modifiers & kEventKeyModifierFnMask + && keycode <= 0x7f + && fn_keycode_to_keycode_table[keycode]) + keycode = fn_keycode_to_keycode_table[keycode]; #endif - inev.modifiers |= (extra_keyboard_modifiers - & (meta_modifier | alt_modifier - | hyper_modifier | super_modifier)); - XSETFRAME (inev.frame_or_window, f); + if (keycode_to_xkeysym (keycode, &xkeysym)) + { + inev.kind = NON_ASCII_KEYSTROKE_EVENT; + inev.code = 0xff00 | xkeysym; +#ifdef MAC_OSX + if (modifiers & kEventKeyModifierFnMask + && keycode <= 0x7f + && fn_keycode_to_keycode_table[keycode] == keycode) + modifiers &= ~kEventKeyModifierFnMask; +#endif + } + else if (mapped_modifiers) + { + /* translate the keycode back to determine the + original key */ +#ifdef MAC_OSX + static SInt16 last_key_layout_id = 0; + static Handle uchr_handle = (Handle)-1; + SInt16 current_key_layout_id = + GetScriptVariable (current_key_script, smScriptKeys); + + if (uchr_handle == (Handle)-1 + || last_key_layout_id != current_key_layout_id) + { + uchr_handle = GetResource ('uchr', current_key_layout_id); + last_key_layout_id = current_key_layout_id; + } + + if (uchr_handle) + { + OSStatus status; + UInt16 key_action = er.what - keyDown; + UInt32 modifier_key_state = + (modifiers & ~mapped_modifiers) >> 8; + UInt32 keyboard_type = LMGetKbdType (); + SInt32 dead_key_state = 0; + UniChar code; + UniCharCount actual_length; + + status = UCKeyTranslate ((UCKeyboardLayout *)*uchr_handle, + keycode, key_action, + modifier_key_state, + keyboard_type, + kUCKeyTranslateNoDeadKeysMask, + &dead_key_state, + 1, &actual_length, &code); + if (status == noErr && actual_length == 1) + mac_set_unicode_keystroke_event (code, &inev); + } +#endif /* MAC_OSX */ + + if (inev.kind == NO_EVENT) + { + /* This code comes from Keyboard Resource, + Appendix C of IM - Text. This is necessary + since shift is ignored in KCHR table + translation when option or command is pressed. + It also does not translate correctly + control-shift chars like C-% so mask off shift + here also. */ + /* Mask off modifier keys that are mapped to some + Emacs modifiers. */ + int new_modifiers = er.modifiers & ~mapped_modifiers; + /* set high byte of keycode to modifier high byte*/ + int new_keycode = keycode | new_modifiers; + Ptr kchr_ptr = (Ptr) GetScriptManagerVariable (smKCHRCache); + unsigned long some_state = 0; + UInt32 new_char_code; + + new_char_code = KeyTranslate (kchr_ptr, new_keycode, + &some_state); + if (new_char_code == 0) + /* Seems like a dead key. Append up-stroke. */ + new_char_code = KeyTranslate (kchr_ptr, + new_keycode | 0x80, + &some_state); + if (new_char_code) + { + inev.kind = ASCII_KEYSTROKE_EVENT; + inev.code = new_char_code & 0xff; + } + } + } + + if (inev.kind == NO_EVENT) + { + inev.kind = ASCII_KEYSTROKE_EVENT; + inev.code = er.message & charCodeMask; + } + + inev.modifiers = mac_to_emacs_modifiers (modifiers); + inev.modifiers |= (extra_keyboard_modifiers + & (meta_modifier | alt_modifier + | hyper_modifier | super_modifier)); + XSETFRAME (inev.frame_or_window, f); + +#if TARGET_API_MAC_CARBON + if (inev.kind == ASCII_KEYSTROKE_EVENT + && inev.code >= 0x80 && inev.modifiers) + { + OSStatus err; + TextEncoding encoding = kTextEncodingMacRoman; + TextToUnicodeInfo ttu_info; + + UpgradeScriptInfoToTextEncoding (current_key_script, + kTextLanguageDontCare, + kTextRegionDontCare, + NULL, &encoding); + err = CreateTextToUnicodeInfoByEncoding (encoding, &ttu_info); + if (err == noErr) + { + UniChar code; + Str255 pstr; + ByteCount unicode_len; + + pstr[0] = 1; + pstr[1] = inev.code; + err = ConvertFromPStringToUnicode (ttu_info, pstr, + sizeof (UniChar), + &unicode_len, &code); + if (err == noErr && unicode_len == sizeof (UniChar)) + mac_set_unicode_keystroke_event (code, &inev); + DisposeTextToUnicodeInfo (&ttu_info); + } + } +#endif + } break; case kHighLevelEvent: - read_socket_inev = &inev; AEProcessAppleEvent (&er); - read_socket_inev = NULL; break; default: @@ -10932,6 +11261,16 @@ init_menu_bar () #endif } +#if USE_MAC_TSM +static void +init_tsm () +{ + static InterfaceTypeList types = {kUnicodeDocument}; + + NewTSMDocument (sizeof (types) / sizeof (types[0]), types, + &tsm_document_id, 0); +} +#endif /* Set up use of X before we make the first connection. */ @@ -11026,6 +11365,10 @@ mac_initialize () init_command_handler (); init_menu_bar (); + +#if USE_MAC_TSM + init_tsm (); +#endif #endif /* USE_CARBON_EVENTS */ #ifdef MAC_OSX @@ -11082,6 +11425,13 @@ syms_of_macterm () Qpaste = intern ("paste"); staticpro (&Qpaste); Qperform = intern ("perform"); staticpro (&Qperform); #endif +#if USE_MAC_TSM + Qtext_input = intern ("text-input"); staticpro (&Qtext_input); + Qupdate_active_input_area = intern ("update-active-input-area"); + staticpro (&Qupdate_active_input_area); + Qunicode_for_key_event = intern ("unicode-for-key-event"); + staticpro (&Qunicode_for_key_event); +#endif #endif #ifdef MAC_OSX @@ -11224,6 +11574,11 @@ order. */); make_float (DEFAULT_REHASH_THRESHOLD), Qnil, Qnil, Qnil); #endif +#if USE_MAC_TSM + DEFVAR_LISP ("mac-ts-active-input-overlay", &Vmac_ts_active_input_overlay, + doc: /* Overlay used to display Mac TSM active input area. */); + Vmac_ts_active_input_overlay = Qnil; +#endif } /* arch-tag: f2259165-4454-4c04-a029-a133c8af7b5b diff --git a/src/macterm.h b/src/macterm.h index 8b45777e546..55bf583c214 100644 --- a/src/macterm.h +++ b/src/macterm.h @@ -539,6 +539,53 @@ struct scroll_bar { #define HOURGLASS_WIDTH 16 #define HOURGLASS_HEIGHT 16 +/* Some constants that are used locally. */ +/* Apple event descriptor types */ +enum { + TYPE_FILE_NAME = 'fNam' +}; + +/* Keywords for Apple event attributes */ +enum { + KEY_EMACS_SUSPENSION_ID_ATTR = 'esId' /* typeUInt32 */ +}; + +/* Carbon event parameter names. */ +enum { + EVENT_PARAM_TEXT_INPUT_SEQUENCE_NUMBER = 'tsSn' /* typeUInt32 */ +}; + +/* Some constants that are not defined in older versions. */ +#if MAC_OS_X_VERSION_MAX_ALLOWED < 1030 +/* Keywords for Apple event attributes */ +enum { + keyReplyRequestedAttr = 'repq' +}; +#endif + +#if MAC_OS_X_VERSION_MAX_ALLOWED < 1040 +/* Gestalt selectors */ +enum { + gestaltSystemVersionMajor = 'sys1', + gestaltSystemVersionMinor = 'sys2', + gestaltSystemVersionBugFix = 'sys3' +}; +#endif + +#ifdef MAC_OSX +#if MAC_OS_X_VERSION_MAX_ALLOWED < 1020 +/* Apple event descriptor types */ +enum { + typeUTF8Text = 'utf8' +}; + +/* Carbon event parameter names */ +enum { + kEventParamWindowMouseLocation = 'wmou' +}; +#endif +#endif + struct frame; struct face; struct image; @@ -584,6 +631,8 @@ extern void mac_draw_line_to_pixmap P_ ((Display *, Pixmap, GC, int, int, extern void mac_clear_area P_ ((struct frame *, int, int, unsigned int, unsigned int)); extern void mac_unload_font P_ ((struct mac_display_info *, XFontStruct *)); +extern int mac_font_panel_visible_p P_ ((void)); +extern OSStatus mac_show_hide_font_panel P_ ((void)); extern OSStatus mac_set_font_info_for_selection P_ ((struct frame *, int, int)); extern OSErr install_window_handler P_ ((WindowPtr)); extern void remove_window_handler P_ ((WindowPtr)); @@ -596,8 +645,6 @@ extern void mac_prepare_for_quickdraw P_ ((struct frame *)); #define FONT_TYPE_FOR_UNIBYTE(font, ch) 0 #define FONT_TYPE_FOR_MULTIBYTE(font, ch) 0 -#define TYPE_FILE_NAME 'fNam' - /* Defined in macselect.c */ extern void x_clear_frame_selections P_ ((struct frame *)); @@ -615,6 +662,7 @@ extern int x_char_height P_ ((struct frame *)); extern void x_sync P_ ((struct frame *)); extern void x_set_tool_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object)); extern void mac_update_title_bar P_ ((struct frame *, int)); +extern Lisp_Object x_get_focus_frame P_ ((struct frame *)); /* Defined in macmenu.c */ @@ -625,6 +673,7 @@ extern void free_frame_menubar P_ ((struct frame *)); extern void mac_clear_font_name_table P_ ((void)); extern Lisp_Object mac_aedesc_to_lisp P_ ((const AEDesc *)); +extern OSErr mac_ae_put_lisp P_ ((AEDescList *, UInt32, Lisp_Object)); #if TARGET_API_MAC_CARBON extern OSErr create_apple_event_from_event_ref P_ ((EventRef, UInt32, EventParamName *, diff --git a/src/minibuf.c b/src/minibuf.c index d37f82c9dcd..c5910b1771f 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -66,6 +66,10 @@ Lisp_Object Qhistory_length, Vhistory_length; int history_delete_duplicates; +/* Non-nil means add new input to history. */ + +Lisp_Object Vhistory_add_new_input; + /* Fread_minibuffer leaves the input here as a string. */ Lisp_Object last_minibuf_string; @@ -219,7 +223,7 @@ static Lisp_Object read_minibuf P_ ((Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, int, Lisp_Object, Lisp_Object, Lisp_Object, - int, int, int)); + int, int)); static Lisp_Object read_minibuf_noninteractive P_ ((Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, int, Lisp_Object, @@ -440,8 +444,7 @@ The current buffer must be a minibuffer. */) static Lisp_Object read_minibuf (map, initial, prompt, backup_n, expflag, - histvar, histpos, defalt, allow_props, inherit_input_method, - keep_all) + histvar, histpos, defalt, allow_props, inherit_input_method) Lisp_Object map; Lisp_Object initial; Lisp_Object prompt; @@ -452,7 +455,6 @@ read_minibuf (map, initial, prompt, backup_n, expflag, Lisp_Object defalt; int allow_props; int inherit_input_method; - int keep_all; { Lisp_Object val; int count = SPECPDL_INDEX (); @@ -747,7 +749,7 @@ read_minibuf (map, initial, prompt, backup_n, expflag, last_minibuf_string = val; /* Choose the string to add to the history. */ - if (SCHARS (val) != 0 || keep_all) + if (SCHARS (val) != 0) histstring = val; else if (STRINGP (defalt)) histstring = defalt; @@ -755,7 +757,8 @@ read_minibuf (map, initial, prompt, backup_n, expflag, histstring = Qnil; /* Add the value to the appropriate history list, if any. */ - if (SYMBOLP (Vminibuffer_history_variable) + if (!NILP (Vhistory_add_new_input) + && SYMBOLP (Vminibuffer_history_variable) && !NILP (histstring)) { /* If the caller wanted to save the value read on a history list, @@ -774,8 +777,7 @@ read_minibuf (map, initial, prompt, backup_n, expflag, if (NILP (histval) || (CONSP (histval) /* Don't duplicate the most recent entry in the history. */ - && (keep_all - || NILP (Fequal (histstring, Fcar (histval)))))) + && (NILP (Fequal (histstring, Fcar (histval)))))) { Lisp_Object length; @@ -937,7 +939,7 @@ read_minibuf_unwind (data) } -DEFUN ("read-from-minibuffer", Fread_from_minibuffer, Sread_from_minibuffer, 1, 8, 0, +DEFUN ("read-from-minibuffer", Fread_from_minibuffer, Sread_from_minibuffer, 1, 7, 0, doc: /* Read a string from the minibuffer, prompting with string PROMPT. The optional second arg INITIAL-CONTENTS is an obsolete alternative to DEFAULT-VALUE. It normally should be nil in new code, except when @@ -961,8 +963,6 @@ Sixth arg DEFAULT-VALUE is the default value. If non-nil, it is available the empty string. Seventh arg INHERIT-INPUT-METHOD, if non-nil, means the minibuffer inherits the current input method and the setting of `enable-multibyte-characters'. -Eight arg KEEP-ALL, if non-nil, says to put all inputs in the history list, - even empty or duplicate inputs. If the variable `minibuffer-allow-text-properties' is non-nil, then the string which is returned includes whatever text properties were present in the minibuffer. Otherwise the value has no text properties. @@ -978,9 +978,9 @@ POSITION in the minibuffer. Any integer value less than or equal to one puts point at the beginning of the string. *Note* that this behavior differs from the way such arguments are used in `completing-read' and some related functions, which use zero-indexing for POSITION. */) - (prompt, initial_contents, keymap, read, hist, default_value, inherit_input_method, keep_all) +(prompt, initial_contents, keymap, read, hist, default_value, inherit_input_method) Lisp_Object prompt, initial_contents, keymap, read, hist, default_value; - Lisp_Object inherit_input_method, keep_all; + Lisp_Object inherit_input_method; { Lisp_Object histvar, histpos, val; struct gcpro gcpro1; @@ -1011,8 +1011,7 @@ and some related functions, which use zero-indexing for POSITION. */) Qnil, !NILP (read), histvar, histpos, default_value, minibuffer_allow_text_properties, - !NILP (inherit_input_method), - !NILP (keep_all)); + !NILP (inherit_input_method)); UNGCPRO; return val; } @@ -1029,7 +1028,7 @@ arguments are used as in `read-from-minibuffer') */) CHECK_STRING (prompt); return read_minibuf (Vminibuffer_local_map, initial_contents, prompt, Qnil, 1, Qminibuffer_history, - make_number (0), Qnil, 0, 0, 0); + make_number (0), Qnil, 0, 0); } DEFUN ("eval-minibuffer", Feval_minibuffer, Seval_minibuffer, 1, 2, 0, @@ -1067,7 +1066,7 @@ Fifth arg INHERIT-INPUT-METHOD, if non-nil, means the minibuffer inherits Lisp_Object val; val = Fread_from_minibuffer (prompt, initial_input, Qnil, Qnil, history, default_value, - inherit_input_method, Qnil); + inherit_input_method); if (STRINGP (val) && SCHARS (val) == 0 && ! NILP (default_value)) val = default_value; return val; @@ -1089,7 +1088,7 @@ the current input method and the setting of`enable-multibyte-characters'. */) CHECK_STRING (prompt); return read_minibuf (Vminibuffer_local_ns_map, initial, prompt, Qnil, 0, Qminibuffer_history, make_number (0), Qnil, 0, - !NILP (inherit_input_method), 0); + !NILP (inherit_input_method)); } DEFUN ("read-command", Fread_command, Sread_command, 1, 2, 0, @@ -1778,7 +1777,7 @@ Completion ignores case if the ambient value of : Vminibuffer_local_must_match_filename_map), init, prompt, make_number (pos), 0, histvar, histpos, def, 0, - !NILP (inherit_input_method), 0); + !NILP (inherit_input_method)); if (STRINGP (val) && SCHARS (val) == 0 && ! NILP (def)) val = def; @@ -2797,9 +2796,16 @@ property of a history variable overrides this default. */); DEFVAR_BOOL ("history-delete-duplicates", &history_delete_duplicates, doc: /* *Non-nil means to delete duplicates in history. If set to t when adding a new history element, all previous identical -elements are deleted. */); +elements are deleted from the history list. */); history_delete_duplicates = 0; + DEFVAR_LISP ("history-add-new-input", &Vhistory_add_new_input, + doc: /* *Non-nil means to add new elements in history. +If set to nil, minibuffer reading functions don't add new elements to the +history list, so it is possible to do this afterwards by calling +`add-to-history' explicitly. */); + Vhistory_add_new_input = Qt; + DEFVAR_LISP ("completion-auto-help", &Vcompletion_auto_help, doc: /* *Non-nil means automatically provide help for invalid completion input. Under Partial Completion mode, a non-nil, non-t value has a special meaning; diff --git a/src/process.c b/src/process.c index 1960e6a914c..2281f1ce3f6 100644 --- a/src/process.c +++ b/src/process.c @@ -777,6 +777,16 @@ get_process (name) return proc; } + +#ifdef SIGCHLD +/* Fdelete_process promises to immediately forget about the process, but in + reality, Emacs needs to remember those processes until they have been + treated by sigchld_handler; otherwise this handler would consider the + process as being synchronous and say that the synchronous process is + dead. */ +static Lisp_Object deleted_pid_list; +#endif + DEFUN ("delete-process", Fdelete_process, Sdelete_process, 1, 1, 0, doc: /* Delete PROCESS: kill it and forget about it immediately. PROCESS may be a process, a buffer, the name of a process or buffer, or @@ -798,12 +808,31 @@ nil, indicating the current buffer's process. */) } else if (XINT (p->infd) >= 0) { - Fkill_process (process, Qnil); - /* Do this now, since remove_process will make sigchld_handler do nothing. */ - p->status - = Fcons (Qsignal, Fcons (make_number (SIGKILL), Qnil)); - XSETINT (p->tick, ++process_tick); - status_notify (p); +#ifdef SIGCHLD + Lisp_Object symbol; + + /* No problem storing the pid here, as it is still in Vprocess_alist. */ + deleted_pid_list = Fcons (make_fixnum_or_float (p->pid), + /* GC treated elements set to nil. */ + Fdelq (Qnil, deleted_pid_list)); + /* If the process has already signaled, remove it from the list. */ + if (p->raw_status_new) + update_status (p); + symbol = p->status; + if (CONSP (p->status)) + symbol = XCAR (p->status); + if (EQ (symbol, Qsignal) || EQ (symbol, Qexit)) + Fdelete (make_fixnum_or_float (p->pid), deleted_pid_list); + else +#endif + { + Fkill_process (process, Qnil); + /* Do this now, since remove_process will make sigchld_handler do nothing. */ + p->status + = Fcons (Qsignal, Fcons (make_number (SIGKILL), Qnil)); + XSETINT (p->tick, ++process_tick); + status_notify (p); + } } remove_process (process); return Qnil; @@ -4134,6 +4163,25 @@ wait_reading_process_output_1 () { } +/* Use a wrapper around select to work around a bug in gdb 5.3. + Normally, the wrapper is optimzed away by inlining. + + If emacs is stopped inside select, the gdb backtrace doesn't + show the function which called select, so it is practically + impossible to step through wait_reading_process_output. */ + +#ifndef select +static INLINE int +select_wrapper (n, rfd, wfd, xfd, tmo) + int n; + SELECT_TYPE *rfd, *wfd, *xfd; + EMACS_TIME *tmo; +{ + return select (n, rfd, wfd, xfd, tmo); +} +#define select select_wrapper +#endif + /* Read and dispose of subprocess output while waiting for timeout to elapse and/or keyboard input to be available. @@ -6304,6 +6352,7 @@ kill_buffer_processes (buffer) ** Malloc WARNING: This should never call malloc either directly or indirectly; if it does, that is a bug */ +#ifdef SIGCHLD SIGTYPE sigchld_handler (signo) int signo; @@ -6361,6 +6410,15 @@ sigchld_handler (signo) /* Find the process that signaled us, and record its status. */ + /* The process can have been deleted by Fdelete_process. */ + tail = Fmember (make_fixnum_or_float (pid), deleted_pid_list); + if (!NILP (tail)) + { + Fsetcar (tail, Qnil); + goto sigchld_end_of_loop; + } + + /* Otherwise, if it is asynchronous, it is in Vprocess_alist. */ p = 0; for (tail = Vprocess_alist; GC_CONSP (tail); tail = XCDR (tail)) { @@ -6412,8 +6470,8 @@ sigchld_handler (signo) EMACS_SET_SECS_USECS (*input_available_clear_time, 0, 0); } - /* There was no asynchronous process found for that id. Check - if we have a synchronous process. */ + /* There was no asynchronous process found for that pid: we have + a synchronous process. */ else { synch_process_alive = 0; @@ -6430,6 +6488,9 @@ sigchld_handler (signo) EMACS_SET_SECS_USECS (*input_available_clear_time, 0, 0); } + sigchld_end_of_loop: + ; + /* On some systems, we must return right away. If any more processes want to signal us, we will get another signal. @@ -6446,6 +6507,7 @@ sigchld_handler (signo) #endif /* USG, but not HPUX with WNOHANG */ } } +#endif /* SIGCHLD */ static Lisp_Object @@ -6831,6 +6893,9 @@ init_process () FD_SET (0, &input_wait_mask); Vprocess_alist = Qnil; +#ifdef SIGCHLD + deleted_pid_list = Qnil; +#endif for (i = 0; i < MAXDESC; i++) { chan_process[i] = Qnil; @@ -6969,6 +7034,9 @@ syms_of_process () staticpro (&Qlast_nonmenu_event); staticpro (&Vprocess_alist); +#ifdef SIGCHLD + staticpro (&deleted_pid_list); +#endif DEFVAR_BOOL ("delete-exited-processes", &delete_exited_processes, doc: /* *Non-nil means delete processes immediately when they exit. diff --git a/src/puresize.h b/src/puresize.h index 1288feff151..67e758ae799 100644 --- a/src/puresize.h +++ b/src/puresize.h @@ -43,7 +43,7 @@ Boston, MA 02110-1301, USA. */ #endif #ifndef BASE_PURESIZE -#define BASE_PURESIZE (1205000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA) +#define BASE_PURESIZE (1210000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA) #endif /* Increase BASE_PURESIZE by a ratio depending on the machine's word size. */ diff --git a/src/search.c b/src/search.c index f613630eaf9..15cc51cb511 100644 --- a/src/search.c +++ b/src/search.c @@ -90,6 +90,7 @@ static void save_search_regs (); static int simple_search (); static int boyer_moore (); static int search_buffer (); +static void matcher_overflow () NO_RETURN; static void matcher_overflow () diff --git a/src/sound.c b/src/sound.c index 0fbeceb4b9e..af2369040cc 100644 --- a/src/sound.c +++ b/src/sound.c @@ -73,6 +73,10 @@ Boston, MA 02110-1301, USA. */ #ifdef HAVE_SOUNDCARD_H #include <soundcard.h> #endif +#ifdef HAVE_ALSA +#include <asoundlib.h> +#endif + /* END: Non Windows Includes */ #else /* WINDOWSNT */ @@ -109,7 +113,8 @@ enum sound_attr SOUND_ATTR_SENTINEL }; -static void sound_perror P_ ((char *)); +static void alsa_sound_perror P_ ((char *, int)) NO_RETURN; +static void sound_perror P_ ((char *)) NO_RETURN; static void sound_warning P_ ((char *)); static int parse_sound P_ ((Lisp_Object, Lisp_Object *)); @@ -121,6 +126,9 @@ static int parse_sound P_ ((Lisp_Object, Lisp_Object *)); #ifndef DEFAULT_SOUND_DEVICE #define DEFAULT_SOUND_DEVICE "/dev/dsp" #endif +#ifndef DEFAULT_ALSA_SOUND_DEVICE +#define DEFAULT_ALSA_SOUND_DEVICE "default" +#endif /* Structure forward declarations. */ @@ -227,6 +235,10 @@ struct sound_device void (* choose_format) P_ ((struct sound_device *sd, struct sound *s)); + /* Return a preferred data size in bytes to be sent to write (below) + each time. 2048 is used if this is NULL. */ + int (* period_size) P_ ((struct sound_device *sd)); + /* Write NYBTES bytes from BUFFER to device SD. */ void (* write) P_ ((struct sound_device *sd, const char *buffer, int nbytes)); @@ -280,7 +292,7 @@ static void vox_open P_ ((struct sound_device *)); static void vox_configure P_ ((struct sound_device *)); static void vox_close P_ ((struct sound_device *sd)); static void vox_choose_format P_ ((struct sound_device *, struct sound *)); -static void vox_init P_ ((struct sound_device *)); +static int vox_init P_ ((struct sound_device *)); static void vox_write P_ ((struct sound_device *, const char *, int)); static void find_sound_type P_ ((struct sound *)); static u_int32_t le2hl P_ ((u_int32_t)); @@ -604,7 +616,7 @@ wav_play (s, sd) { char *buffer; int nbytes; - int blksize = 2048; + int blksize = sd->period_size ? sd->period_size (sd) : 2048; buffer = (char *) alloca (blksize); lseek (s->fd, sizeof *header, SEEK_SET); @@ -633,7 +645,8 @@ enum au_encoding AU_ENCODING_32, AU_ENCODING_IEEE32, AU_ENCODING_IEEE64, - AU_COMPRESSED = 23 + AU_COMPRESSED = 23, + AU_ENCODING_ALAW_8 = 27 }; @@ -689,7 +702,7 @@ au_play (s, sd) SBYTES (s->data) - header->data_offset); else { - int blksize = 2048; + int blksize = sd->period_size ? sd->period_size (sd) : 2048; char *buffer; int nbytes; @@ -868,16 +881,33 @@ vox_choose_format (sd, s) /* Initialize device SD. Set up the interface functions in the device structure. */ -static void +static int vox_init (sd) struct sound_device *sd; { + char *file; + int fd; + + /* Open the sound device. Default is /dev/dsp. */ + if (sd->file) + file = sd->file; + else + file = DEFAULT_SOUND_DEVICE; + fd = emacs_open (file, O_WRONLY, 0); + if (fd >= 0) + emacs_close (fd); + else + return 0; + sd->fd = -1; sd->open = vox_open; sd->close = vox_close; sd->configure = vox_configure; sd->choose_format = vox_choose_format; sd->write = vox_write; + sd->period_size = NULL; + + return 1; } /* Write NBYTES bytes from BUFFER to device SD. */ @@ -893,6 +923,368 @@ vox_write (sd, buffer, nbytes) sound_perror ("Error writing to sound device"); } +#ifdef HAVE_ALSA +/*********************************************************************** + ALSA Driver Interface + ***********************************************************************/ + +/* This driver is available on GNU/Linux. */ + +static void +alsa_sound_perror (msg, err) + char *msg; + int err; +{ + error ("%s: %s", msg, snd_strerror (err)); +} + +struct alsa_params +{ + snd_pcm_t *handle; + snd_pcm_hw_params_t *hwparams; + snd_pcm_sw_params_t *swparams; + snd_pcm_uframes_t period_size; +}; + +/* Open device SD. If SD->file is non-null, open that device, + otherwise use a default device name. */ + +static void +alsa_open (sd) + struct sound_device *sd; +{ + char *file; + struct alsa_params *p; + int err; + + /* Open the sound device. Default is "default". */ + if (sd->file) + file = sd->file; + else + file = DEFAULT_ALSA_SOUND_DEVICE; + + p = xmalloc (sizeof (*p)); + p->handle = NULL; + p->hwparams = NULL; + p->swparams = NULL; + + sd->fd = -1; + sd->data = p; + + + err = snd_pcm_open (&p->handle, file, SND_PCM_STREAM_PLAYBACK, 0); + if (err < 0) + alsa_sound_perror (file, err); +} + +static int +alsa_period_size (sd) + struct sound_device *sd; +{ + struct alsa_params *p = (struct alsa_params *) sd->data; + return p->period_size; +} + +static void +alsa_configure (sd) + struct sound_device *sd; +{ + int val, err, dir; + struct alsa_params *p = (struct alsa_params *) sd->data; + snd_pcm_uframes_t buffer_size; + + xassert (p->handle != 0); + + err = snd_pcm_hw_params_malloc (&p->hwparams); + if (err < 0) + alsa_sound_perror ("Could not allocate hardware parameter structure", err); + + err = snd_pcm_sw_params_malloc (&p->swparams); + if (err < 0) + alsa_sound_perror ("Could not allocate software parameter structure", err); + + err = snd_pcm_hw_params_any (p->handle, p->hwparams); + if (err < 0) + alsa_sound_perror ("Could not initialize hardware parameter structure", err); + + err = snd_pcm_hw_params_set_access (p->handle, p->hwparams, + SND_PCM_ACCESS_RW_INTERLEAVED); + if (err < 0) + alsa_sound_perror ("Could not set access type", err); + + val = sd->format; + err = snd_pcm_hw_params_set_format (p->handle, p->hwparams, val); + if (err < 0) + alsa_sound_perror ("Could not set sound format", err); + + val = sd->sample_rate; + err = snd_pcm_hw_params_set_rate_near (p->handle, p->hwparams, &val, 0); + if (err < 0) + alsa_sound_perror ("Could not set sample rate", err); + + val = sd->channels; + err = snd_pcm_hw_params_set_channels (p->handle, p->hwparams, val); + if (err < 0) + alsa_sound_perror ("Could not set channel count", err); + + err = snd_pcm_hw_params (p->handle, p->hwparams); + if (err < 0) + alsa_sound_perror ("Could not set parameters", err); + + + err = snd_pcm_hw_params_get_period_size (p->hwparams, &p->period_size, &dir); + if (err < 0) + alsa_sound_perror ("Unable to get period size for playback", err); + + err = snd_pcm_hw_params_get_buffer_size (p->hwparams, &buffer_size); + if (err < 0) + alsa_sound_perror("Unable to get buffer size for playback", err); + + err = snd_pcm_sw_params_current (p->handle, p->swparams); + if (err < 0) + alsa_sound_perror ("Unable to determine current swparams for playback", + err); + + /* Start the transfer when the buffer is almost full */ + err = snd_pcm_sw_params_set_start_threshold (p->handle, p->swparams, + (buffer_size / p->period_size) + * p->period_size); + if (err < 0) + alsa_sound_perror ("Unable to set start threshold mode for playback", err); + + /* Allow the transfer when at least period_size samples can be processed */ + err = snd_pcm_sw_params_set_avail_min (p->handle, p->swparams, p->period_size); + if (err < 0) + alsa_sound_perror ("Unable to set avail min for playback", err); + + /* Align all transfers to 1 period */ + err = snd_pcm_sw_params_set_xfer_align (p->handle, p->swparams, + p->period_size); + if (err < 0) + alsa_sound_perror ("Unable to set transfer align for playback", err); + + err = snd_pcm_sw_params (p->handle, p->swparams); + if (err < 0) + alsa_sound_perror ("Unable to set sw params for playback\n", err); + + snd_pcm_hw_params_free (p->hwparams); + p->hwparams = NULL; + snd_pcm_sw_params_free (p->swparams); + p->swparams = NULL; + + err = snd_pcm_prepare (p->handle); + if (err < 0) + alsa_sound_perror ("Could not prepare audio interface for use", err); + + if (sd->volume > 0) + { + int chn; + snd_mixer_t *handle; + snd_mixer_elem_t *e; + char *file = sd->file ? sd->file : DEFAULT_ALSA_SOUND_DEVICE; + + if (snd_mixer_open (&handle, 0) >= 0) + { + if (snd_mixer_attach (handle, file) >= 0 + && snd_mixer_load (handle) >= 0 + && snd_mixer_selem_register (handle, NULL, NULL) >= 0) + for (e = snd_mixer_first_elem (handle); + e; + e = snd_mixer_elem_next (e)) + { + if (snd_mixer_selem_has_playback_volume (e)) + { + long pmin, pmax; + snd_mixer_selem_get_playback_volume_range (e, &pmin, &pmax); + long vol = pmin + (sd->volume * (pmax - pmin)) / 100; + + for (chn = 0; chn <= SND_MIXER_SCHN_LAST; chn++) + snd_mixer_selem_set_playback_volume (e, chn, vol); + } + } + snd_mixer_close(handle); + } + } +} + + +/* Close device SD if it is open. */ + +static void +alsa_close (sd) + struct sound_device *sd; +{ + struct alsa_params *p = (struct alsa_params *) sd->data; + if (p) + { + if (p->hwparams) + snd_pcm_hw_params_free (p->hwparams); + if (p->swparams) + snd_pcm_sw_params_free (p->swparams); + if (p->handle) + { + snd_pcm_drain(p->handle); + snd_pcm_close (p->handle); + } + free (p); + } +} + +/* Choose device-dependent format for device SD from sound file S. */ + +static void +alsa_choose_format (sd, s) + struct sound_device *sd; + struct sound *s; +{ + struct alsa_params *p = (struct alsa_params *) sd->data; + if (s->type == RIFF) + { + struct wav_header *h = (struct wav_header *) s->header; + if (h->precision == 8) + sd->format = SND_PCM_FORMAT_U8; + else if (h->precision == 16) + sd->format = SND_PCM_FORMAT_S16_LE; + else + error ("Unsupported WAV file format"); + } + else if (s->type == SUN_AUDIO) + { + struct au_header *header = (struct au_header *) s->header; + switch (header->encoding) + { + case AU_ENCODING_ULAW_8: + sd->format = SND_PCM_FORMAT_MU_LAW; + break; + case AU_ENCODING_ALAW_8: + sd->format = SND_PCM_FORMAT_A_LAW; + break; + case AU_ENCODING_IEEE32: + sd->format = SND_PCM_FORMAT_FLOAT_BE; + break; + case AU_ENCODING_IEEE64: + sd->format = SND_PCM_FORMAT_FLOAT64_BE; + break; + case AU_ENCODING_8: + sd->format = SND_PCM_FORMAT_S8; + break; + case AU_ENCODING_16: + sd->format = SND_PCM_FORMAT_S16_BE; + break; + case AU_ENCODING_24: + sd->format = SND_PCM_FORMAT_S24_BE; + break; + case AU_ENCODING_32: + sd->format = SND_PCM_FORMAT_S32_BE; + break; + + default: + error ("Unsupported AU file format"); + } + } + else + abort (); +} + + +/* Write NBYTES bytes from BUFFER to device SD. */ + +static void +alsa_write (sd, buffer, nbytes) + struct sound_device *sd; + const char *buffer; + int nbytes; +{ + struct alsa_params *p = (struct alsa_params *) sd->data; + + /* The the third parameter to snd_pcm_writei is frames, not bytes. */ + int fact = snd_pcm_format_size (sd->format, 1) * sd->channels; + int nwritten = 0; + int err; + + while (nwritten < nbytes) + { + err = snd_pcm_writei (p->handle, + buffer + nwritten, + (nbytes - nwritten)/fact); + if (err < 0) + { + if (err == -EPIPE) + { /* under-run */ + err = snd_pcm_prepare (p->handle); + if (err < 0) + alsa_sound_perror ("Can't recover from underrun, prepare failed", + err); + } + else if (err == -ESTRPIPE) + { + while ((err = snd_pcm_resume (p->handle)) == -EAGAIN) + sleep(1); /* wait until the suspend flag is released */ + if (err < 0) + { + err = snd_pcm_prepare (p->handle); + if (err < 0) + alsa_sound_perror ("Can't recover from suspend, " + "prepare failed", + err); + } + } + else + alsa_sound_perror ("Error writing to sound device", err); + + } + else + nwritten += err * fact; + } +} + +static void +snd_error_quiet (file, line, function, err, fmt) + const char *file; + int line; + const char *function; + int err; + const char *fmt; +{ +} + +/* Initialize device SD. Set up the interface functions in the device + structure. */ + +static int +alsa_init (sd) + struct sound_device *sd; +{ + char *file; + snd_pcm_t *handle; + int err; + + /* Open the sound device. Default is "default". */ + if (sd->file) + file = sd->file; + else + file = DEFAULT_ALSA_SOUND_DEVICE; + + snd_lib_error_set_handler ((snd_lib_error_handler_t) snd_error_quiet); + err = snd_pcm_open (&handle, file, SND_PCM_STREAM_PLAYBACK, 0); + snd_lib_error_set_handler (NULL); + if (err < 0) + return 0; + + sd->fd = -1; + sd->open = alsa_open; + sd->close = alsa_close; + sd->configure = alsa_configure; + sd->choose_format = alsa_choose_format; + sd->write = alsa_write; + sd->period_size = alsa_period_size; + + return 1; +} + +#endif /* HAVE_ALSA */ + + /* END: Non Windows functions */ #else /* WINDOWSNT */ @@ -1056,10 +1448,11 @@ Internal use only, use `play-sound' instead.\n */) args[1] = sound; Frun_hook_with_args (2, args); - /* There is only one type of device we currently support, the VOX - sound driver. Set up the device interface functions for that - device. */ - vox_init (current_sound_device); +#ifdef HAVE_ALSA + if (!alsa_init (current_sound_device)) +#endif + if (!vox_init (current_sound_device)) + error ("No usable sound device driver found"); /* Open the device. */ current_sound_device->open (current_sound_device); diff --git a/src/sysdep.c b/src/sysdep.c index 3e06170e721..307f69290d6 100644 --- a/src/sysdep.c +++ b/src/sysdep.c @@ -244,7 +244,7 @@ int emacs_ospeed; under VMS, we place the input channel number here. */ int input_fd; -void croak P_ ((char *)); +void croak P_ ((char *)) NO_RETURN; #ifdef AIXHFT void hft_init (); diff --git a/src/w32.c b/src/w32.c index 71799befdbb..f11ffb7a785 100644 --- a/src/w32.c +++ b/src/w32.c @@ -950,11 +950,11 @@ init_environment (char ** argv) struct stat ignored; char default_home[MAX_PATH]; - static struct env_entry + static const struct env_entry { char * name; char * def_value; - } env_vars[] = + } dflt_envvars[] = { {"HOME", "C:/"}, {"PRELOAD_WINSOCK", NULL}, @@ -971,6 +971,17 @@ init_environment (char ** argv) {"LANG", NULL}, }; +#define N_ENV_VARS sizeof(dflt_envvars)/sizeof(dflt_envvars[0]) + + /* We need to copy dflt_envvars[] and work on the copy because we + don't want the dumped Emacs to inherit the values of + environment variables we saw during dumping (which could be on + a different system). The defaults above must be left intact. */ + struct env_entry env_vars[N_ENV_VARS]; + + for (i = 0; i < N_ENV_VARS; i++) + env_vars[i] = dflt_envvars[i]; + /* For backwards compatibility, check if a .emacs file exists in C:/ If not, then we can try to default to the appdata directory under the user's profile, which is more likely to be writable. */ @@ -1005,7 +1016,7 @@ init_environment (char ** argv) LOCALE_SABBREVLANGNAME | LOCALE_USE_CP_ACP, locale_name, sizeof (locale_name))) { - for (i = 0; i < (sizeof (env_vars) / sizeof (env_vars[0])); i++) + for (i = 0; i < N_ENV_VARS; i++) { if (strcmp (env_vars[i].name, "LANG") == 0) { @@ -1069,7 +1080,7 @@ init_environment (char ** argv) } } - for (i = 0; i < (sizeof (env_vars) / sizeof (env_vars[0])); i++) + for (i = 0; i < N_ENV_VARS; i++) { if (!getenv (env_vars[i].name)) { @@ -1084,20 +1095,17 @@ init_environment (char ** argv) if (lpval) { - if (dwType == REG_EXPAND_SZ) - { - char buf1[SET_ENV_BUF_SIZE], buf2[SET_ENV_BUF_SIZE]; + char buf1[SET_ENV_BUF_SIZE], buf2[SET_ENV_BUF_SIZE]; - ExpandEnvironmentStrings ((LPSTR) lpval, buf1, sizeof(buf1)); - _snprintf (buf2, sizeof(buf2)-1, "%s=%s", env_vars[i].name, buf1); - _putenv (strdup (buf2)); - } + if (dwType == REG_EXPAND_SZ) + ExpandEnvironmentStrings ((LPSTR) lpval, buf1, sizeof(buf1)); else if (dwType == REG_SZ) + strcpy (buf1, lpval); + if (dwType == REG_EXPAND_SZ || dwType == REG_SZ) { - char buf[SET_ENV_BUF_SIZE]; - - _snprintf (buf, sizeof(buf)-1, "%s=%s", env_vars[i].name, lpval); - _putenv (strdup (buf)); + _snprintf (buf2, sizeof(buf2)-1, "%s=%s", env_vars[i].name, + buf1); + _putenv (strdup (buf2)); } if (!dont_free) diff --git a/src/w32fns.c b/src/w32fns.c index 4da5271c870..aa83e006194 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -1684,7 +1684,7 @@ x_set_icon_name (f, arg, oldval) if (STRINGP (oldval) && EQ (Fstring_equal (oldval, arg), Qt)) return; } - else if (!STRINGP (oldval) && EQ (oldval, Qnil) == EQ (arg, Qnil)) + else if (!NILP (arg) || NILP (oldval)) return; f->icon_name = arg; diff --git a/src/w32heap.c b/src/w32heap.c index f1fa196abe7..e1bdd867721 100644 --- a/src/w32heap.c +++ b/src/w32heap.c @@ -42,10 +42,6 @@ OSVERSIONINFO osinfo_cache; unsigned long syspage_mask = 0; -/* These are defined to get Emacs to compile, but are not used. */ -int edata; -int etext; - /* The major and minor versions of NT. */ int w32_major_version; int w32_minor_version; diff --git a/src/w32term.c b/src/w32term.c index 305527946fb..0a7007cc8f4 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -173,32 +173,6 @@ HANDLE hWindowsThread = NULL; DWORD dwMainThreadId = 0; HANDLE hMainThread = NULL; -#ifndef SIF_ALL -/* These definitions are new with Windows 95. */ -#define SIF_RANGE 0x0001 -#define SIF_PAGE 0x0002 -#define SIF_POS 0x0004 -#define SIF_DISABLENOSCROLL 0x0008 -#define SIF_TRACKPOS 0x0010 -#define SIF_ALL (SIF_RANGE | SIF_PAGE | SIF_POS | SIF_TRACKPOS) - -typedef struct tagSCROLLINFO -{ - UINT cbSize; - UINT fMask; - int nMin; - int nMax; - UINT nPage; - int nPos; - int nTrackPos; -} SCROLLINFO, FAR *LPSCROLLINFO; -typedef SCROLLINFO CONST FAR *LPCSCROLLINFO; -#endif /* SIF_ALL */ - -/* Dynamic linking to new proportional scroll bar functions. */ -int (PASCAL *pfnSetScrollInfo) (HWND hwnd, int fnBar, LPSCROLLINFO lpsi, BOOL fRedraw); -BOOL (PASCAL *pfnGetScrollInfo) (HWND hwnd, int fnBar, LPSCROLLINFO lpsi); - int vertical_scroll_bar_min_handle; int vertical_scroll_bar_top_border; int vertical_scroll_bar_bottom_border; @@ -2540,20 +2514,29 @@ x_draw_stretch_glyph_string (s) { /* If `x-stretch-block-cursor' is nil, don't draw a block cursor as wide as the stretch glyph. */ - int width = min (FRAME_COLUMN_WIDTH (s->f), s->background_width); + int width, background_width = s->background_width; + int x = s->x, left_x = window_box_left_offset (s->w, TEXT_AREA); + + if (x < left_x) + { + background_width -= left_x - x; + x = left_x; + } + width = min (FRAME_COLUMN_WIDTH (s->f), background_width); /* Draw cursor. */ - x_draw_glyph_string_bg_rect (s, s->x, s->y, width, s->height); + x_draw_glyph_string_bg_rect (s, x, s->y, width, s->height); /* Clear rest using the GC of the original non-cursor face. */ - if (width < s->background_width) + if (width < background_width) { XGCValues *gc = s->face->gc; - int x = s->x + width, y = s->y; - int w = s->background_width - width, h = s->height; + int y = s->y; + int w = background_width - width, h = s->height; RECT r; HDC hdc = s->hdc; + x += width; if (s->row->mouse_face_p && cursor_in_mouse_face_p (s->w)) { @@ -2582,8 +2565,18 @@ x_draw_stretch_glyph_string (s) } } else if (!s->background_filled_p) - x_draw_glyph_string_bg_rect (s, s->x, s->y, s->background_width, - s->height); + { + int background_width = s->background_width; + int x = s->x, left_x = window_box_left_offset (s->w, TEXT_AREA); + + if (x < left_x) + { + background_width -= left_x - x; + x = left_x; + } + if (background_width > 0) + x_draw_glyph_string_bg_rect (s, x, s->y, background_width, s->height); + } s->background_filled_p = 1; } @@ -3619,6 +3612,7 @@ w32_set_scroll_bar_thumb (bar, portion, position, whole) double range = VERTICAL_SCROLL_BAR_TOP_RANGE (f, XINT (bar->height)); int sb_page, sb_pos; BOOL draggingp = !NILP (bar->dragging) ? TRUE : FALSE; + SCROLLINFO si; if (whole) { @@ -3643,24 +3637,17 @@ w32_set_scroll_bar_thumb (bar, portion, position, whole) BLOCK_INPUT; - if (pfnSetScrollInfo) - { - SCROLLINFO si; - - si.cbSize = sizeof (si); - /* Only update page size if currently dragging, to reduce - flicker effects. */ - if (draggingp) - si.fMask = SIF_PAGE; - else - si.fMask = SIF_PAGE | SIF_POS; - si.nPage = sb_page; - si.nPos = sb_pos; - - pfnSetScrollInfo (w, SB_CTL, &si, !draggingp); - } + si.cbSize = sizeof (si); + /* Only update page size if currently dragging, to reduce + flicker effects. */ + if (draggingp) + si.fMask = SIF_PAGE; else - SetScrollPos (w, SB_CTL, sb_pos, !draggingp); + si.fMask = SIF_PAGE | SIF_POS; + si.nPage = sb_page; + si.nPos = sb_pos; + + SetScrollInfo (w, SB_CTL, &si, !draggingp); UNBLOCK_INPUT; } @@ -3749,6 +3736,7 @@ x_scroll_bar_create (w, top, left, width, height) { struct frame *f = XFRAME (WINDOW_FRAME (w)); HWND hwnd; + SCROLLINFO si; struct scroll_bar *bar = XSCROLL_BAR (Fmake_vector (make_number (SCROLL_BAR_VEC_SIZE), Qnil)); @@ -3767,26 +3755,15 @@ x_scroll_bar_create (w, top, left, width, height) hwnd = my_create_scrollbar (f, bar); - if (pfnSetScrollInfo) - { - SCROLLINFO si; + si.cbSize = sizeof (si); + si.fMask = SIF_ALL; + si.nMin = 0; + si.nMax = VERTICAL_SCROLL_BAR_TOP_RANGE (f, height) + + VERTICAL_SCROLL_BAR_MIN_HANDLE; + si.nPage = si.nMax; + si.nPos = 0; - si.cbSize = sizeof (si); - si.fMask = SIF_ALL; - si.nMin = 0; - si.nMax = VERTICAL_SCROLL_BAR_TOP_RANGE (f, height) - + VERTICAL_SCROLL_BAR_MIN_HANDLE; - si.nPage = si.nMax; - si.nPos = 0; - - pfnSetScrollInfo (hwnd, SB_CTL, &si, FALSE); - } - else - { - SetScrollRange (hwnd, SB_CTL, 0, - VERTICAL_SCROLL_BAR_TOP_RANGE (f, height), FALSE); - SetScrollPos (hwnd, SB_CTL, 0, FALSE); - } + SetScrollInfo (hwnd, SB_CTL, &si, FALSE); SET_SCROLL_BAR_W32_WINDOW (bar, hwnd); @@ -3895,6 +3872,8 @@ w32_set_vertical_scroll_bar (w, portion, whole, position) else { HDC hdc; + SCROLLINFO si; + BLOCK_INPUT; if (width && height) { @@ -3914,21 +3893,15 @@ w32_set_vertical_scroll_bar (w, portion, whole, position) MoveWindow (hwnd, sb_left + VERTICAL_SCROLL_BAR_WIDTH_TRIM, top, sb_width - VERTICAL_SCROLL_BAR_WIDTH_TRIM * 2, max (height, 1), TRUE); - if (pfnSetScrollInfo) - { - SCROLLINFO si; - si.cbSize = sizeof (si); - si.fMask = SIF_RANGE; - si.nMin = 0; - si.nMax = VERTICAL_SCROLL_BAR_TOP_RANGE (f, height) - + VERTICAL_SCROLL_BAR_MIN_HANDLE; + si.cbSize = sizeof (si); + si.fMask = SIF_RANGE; + si.nMin = 0; + si.nMax = VERTICAL_SCROLL_BAR_TOP_RANGE (f, height) + + VERTICAL_SCROLL_BAR_MIN_HANDLE; + + SetScrollInfo (hwnd, SB_CTL, &si, FALSE); - pfnSetScrollInfo (hwnd, SB_CTL, &si, FALSE); - } - else - SetScrollRange (hwnd, SB_CTL, 0, - VERTICAL_SCROLL_BAR_TOP_RANGE (f, height), FALSE); my_show_window (f, hwnd, SW_NORMAL); /* InvalidateRect (w, NULL, FALSE); */ @@ -4080,19 +4053,13 @@ w32_scroll_bar_handle_click (bar, msg, emacs_event) int top_range = VERTICAL_SCROLL_BAR_TOP_RANGE (f, XINT (bar->height)); int y; int dragging = !NILP (bar->dragging); + SCROLLINFO si; - if (pfnGetScrollInfo) - { - SCROLLINFO si; - - si.cbSize = sizeof (si); - si.fMask = SIF_POS; + si.cbSize = sizeof (si); + si.fMask = SIF_POS; - pfnGetScrollInfo ((HWND) msg->msg.lParam, SB_CTL, &si); - y = si.nPos; - } - else - y = GetScrollPos ((HWND) msg->msg.lParam, SB_CTL); + GetScrollInfo ((HWND) msg->msg.lParam, SB_CTL, &si); + y = si.nPos; bar->dragging = Qnil; @@ -4129,21 +4096,18 @@ w32_scroll_bar_handle_click (bar, msg, emacs_event) emacs_event->part = scroll_bar_handle; /* "Silently" update current position. */ - if (pfnSetScrollInfo) - { - SCROLLINFO si; + { + SCROLLINFO si; - si.cbSize = sizeof (si); - si.fMask = SIF_POS; - si.nPos = y; - /* Remember apparent position (we actually lag behind the real - position, so don't set that directly. */ - last_scroll_bar_drag_pos = y; + si.cbSize = sizeof (si); + si.fMask = SIF_POS; + si.nPos = y; + /* Remember apparent position (we actually lag behind the real + position, so don't set that directly. */ + last_scroll_bar_drag_pos = y; - pfnSetScrollInfo (SCROLL_BAR_W32_WINDOW (bar), SB_CTL, &si, FALSE); - } - else - SetScrollPos (SCROLL_BAR_W32_WINDOW (bar), SB_CTL, y, FALSE); + SetScrollInfo (SCROLL_BAR_W32_WINDOW (bar), SB_CTL, &si, FALSE); + } break; case SB_ENDSCROLL: /* If this is the end of a drag sequence, then reset the scroll @@ -4151,20 +4115,15 @@ w32_scroll_bar_handle_click (bar, msg, emacs_event) nothing. */ if (dragging) { - if (pfnSetScrollInfo) - { - SCROLLINFO si; - int start = XINT (bar->start); - int end = XINT (bar->end); - - si.cbSize = sizeof (si); - si.fMask = SIF_PAGE | SIF_POS; - si.nPage = end - start + VERTICAL_SCROLL_BAR_MIN_HANDLE; - si.nPos = last_scroll_bar_drag_pos; - pfnSetScrollInfo (SCROLL_BAR_W32_WINDOW (bar), SB_CTL, &si, TRUE); - } - else - SetScrollPos (SCROLL_BAR_W32_WINDOW (bar), SB_CTL, y, TRUE); + SCROLLINFO si; + int start = XINT (bar->start); + int end = XINT (bar->end); + + si.cbSize = sizeof (si); + si.fMask = SIF_PAGE | SIF_POS; + si.nPage = end - start + VERTICAL_SCROLL_BAR_MIN_HANDLE; + si.nPos = last_scroll_bar_drag_pos; + SetScrollInfo (SCROLL_BAR_W32_WINDOW (bar), SB_CTL, &si, TRUE); } /* fall through */ default: @@ -4195,25 +4154,19 @@ x_scroll_bar_report_motion (fp, bar_window, part, x, y, time) FRAME_PTR f = XFRAME (WINDOW_FRAME (XWINDOW (bar->window))); int pos; int top_range = VERTICAL_SCROLL_BAR_TOP_RANGE (f, XINT (bar->height)); + SCROLLINFO si; BLOCK_INPUT; *fp = f; *bar_window = bar->window; - if (pfnGetScrollInfo) - { - SCROLLINFO si; - - si.cbSize = sizeof (si); - si.fMask = SIF_POS | SIF_PAGE | SIF_RANGE; + si.cbSize = sizeof (si); + si.fMask = SIF_POS | SIF_PAGE | SIF_RANGE; - pfnGetScrollInfo (w, SB_CTL, &si); - pos = si.nPos; - top_range = si.nMax - si.nPage + 1; - } - else - pos = GetScrollPos (w, SB_CTL); + GetScrollInfo (w, SB_CTL, &si); + pos = si.nPos; + top_range = si.nMax - si.nPage + 1; switch (LOWORD (last_mouse_scroll_bar_pos)) { @@ -5082,7 +5035,7 @@ x_draw_hollow_cursor (w, row) struct frame *f = XFRAME (WINDOW_FRAME (w)); HDC hdc; RECT rect; - int h; + int left, top, h; struct glyph *cursor_glyph; HBRUSH hb = CreateSolidBrush (f->output_data.w32->cursor_pixel); @@ -5093,8 +5046,9 @@ x_draw_hollow_cursor (w, row) return; /* Compute frame-relative coordinates for phys cursor. */ - rect.left = WINDOW_TEXT_TO_FRAME_PIXEL_X (w, w->phys_cursor.x); - rect.top = get_phys_cursor_geometry (w, row, cursor_glyph, &h); + get_phys_cursor_geometry (w, row, cursor_glyph, &left, &top, &h); + rect.left = left; + rect.top = top; rect.bottom = rect.top + h; rect.right = rect.left + w->phys_cursor_width; diff --git a/src/window.c b/src/window.c index 1abeec92367..59c223b4a8f 100644 --- a/src/window.c +++ b/src/window.c @@ -3778,7 +3778,9 @@ SIZE includes that window's scroll bar, or the divider column to its right. Interactively, all arguments are nil. Returns the newly created window (which is the lower or rightmost one). -The upper or leftmost window is the original one and remains selected. +The upper or leftmost window is the original one, and remains selected +if it was selected before. + See Info node `(elisp)Splitting Windows' for more details and examples.*/) (window, size, horflag) Lisp_Object window, size, horflag; @@ -5794,6 +5796,7 @@ struct saved_window Lisp_Object left_margin_cols, right_margin_cols; Lisp_Object left_fringe_width, right_fringe_width, fringes_outside_margins; Lisp_Object scroll_bar_width, vertical_scroll_bar_type; + Lisp_Object dedicated; }; #define SAVED_WINDOW_N(swv,n) \ @@ -5804,9 +5807,7 @@ DEFUN ("window-configuration-p", Fwindow_configuration_p, Swindow_configuration_ (object) Lisp_Object object; { - if (WINDOW_CONFIGURATIONP (object)) - return Qt; - return Qnil; + return WINDOW_CONFIGURATIONP (object) ? Qt : Qnil; } DEFUN ("window-configuration-frame", Fwindow_configuration_frame, Swindow_configuration_frame, 1, 1, 0, @@ -6028,6 +6029,7 @@ the return value is nil. Otherwise the value is t. */) w->fringes_outside_margins = p->fringes_outside_margins; w->scroll_bar_width = p->scroll_bar_width; w->vertical_scroll_bar_type = p->vertical_scroll_bar_type; + w->dedicated = p->dedicated; XSETFASTINT (w->last_modified, 0); XSETFASTINT (w->last_overlay_modified, 0); @@ -6297,6 +6299,7 @@ save_window_save (window, vector, i) p->fringes_outside_margins = w->fringes_outside_margins; p->scroll_bar_width = w->scroll_bar_width; p->vertical_scroll_bar_type = w->vertical_scroll_bar_type; + p->dedicated = w->dedicated; if (!NILP (w->buffer)) { /* Save w's value of point in the window configuration. @@ -6796,7 +6799,9 @@ foreach_window (f, fn, user_data) int (* fn) P_ ((struct window *, void *)); void *user_data; { - foreach_window_1 (XWINDOW (FRAME_ROOT_WINDOW (f)), fn, user_data); + /* Fdelete_frame may set FRAME_ROOT_WINDOW (f) to Qnil. */ + if (WINDOWP (FRAME_ROOT_WINDOW (f))) + foreach_window_1 (XWINDOW (FRAME_ROOT_WINDOW (f)), fn, user_data); } diff --git a/src/xdisp.c b/src/xdisp.c index 9b5b913938b..0cb34a2fef8 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -1995,15 +1995,15 @@ get_glyph_string_clip_rect (s, nr) Set w->phys_cursor_width to width of phys cursor. */ -int -get_phys_cursor_geometry (w, row, glyph, heightp) +void +get_phys_cursor_geometry (w, row, glyph, xp, yp, heightp) struct window *w; struct glyph_row *row; struct glyph *glyph; - int *heightp; + int *xp, *yp, *heightp; { struct frame *f = XFRAME (WINDOW_FRAME (w)); - int y, wd, h, h0, y0; + int x, y, wd, h, h0, y0; /* Compute the width of the rectangle to draw. If on a stretch glyph, and `x-stretch-block-cursor' is nil, don't draw a @@ -2013,6 +2013,14 @@ get_phys_cursor_geometry (w, row, glyph, heightp) #ifdef HAVE_NTGUI wd++; /* Why? */ #endif + + x = w->phys_cursor.x; + if (x < 0) + { + wd += x; + x = 0; + } + if (glyph->type == STRETCH_GLYPH && !x_stretch_cursor_p) wd = min (FRAME_COLUMN_WIDTH (f), wd); @@ -2042,8 +2050,9 @@ get_phys_cursor_geometry (w, row, glyph, heightp) } } + *xp = WINDOW_TEXT_TO_FRAME_PIXEL_X (w, x); + *yp = WINDOW_TO_FRAME_PIXEL_Y (w, y); *heightp = h; - return WINDOW_TO_FRAME_PIXEL_Y (w, y); } /* @@ -6334,6 +6343,8 @@ next_element_from_composition (it) it->position = (STRINGP (it->string) ? it->current.string_pos : it->current.pos); + if (STRINGP (it->string)) + it->object = it->string; return 1; } @@ -9608,7 +9619,8 @@ display_tool_bar_line (it, height) while (it->current_x < max_x) { - int x_before, x, n_glyphs_before, i, nglyphs; + int x, n_glyphs_before, i, nglyphs; + struct it it_before; /* Get the next display element. */ if (!get_next_display_element (it)) @@ -9620,22 +9632,23 @@ display_tool_bar_line (it, height) } /* Produce glyphs. */ - x_before = it->current_x; - n_glyphs_before = it->glyph_row->used[TEXT_AREA]; + n_glyphs_before = row->used[TEXT_AREA]; + it_before = *it; + PRODUCE_GLYPHS (it); - nglyphs = it->glyph_row->used[TEXT_AREA] - n_glyphs_before; + nglyphs = row->used[TEXT_AREA] - n_glyphs_before; i = 0; - x = x_before; + x = it_before.current_x; while (i < nglyphs) { struct glyph *glyph = row->glyphs[TEXT_AREA] + n_glyphs_before + i; if (x + glyph->pixel_width > max_x) { - /* Glyph doesn't fit on line. */ - it->glyph_row->used[TEXT_AREA] = n_glyphs_before + i; - it->current_x = x; + /* Glyph doesn't fit on line. Backtrack. */ + row->used[TEXT_AREA] = n_glyphs_before; + *it = it_before; goto out; } @@ -9666,6 +9679,8 @@ display_tool_bar_line (it, height) /* Make line the desired height and center it vertically. */ if ((height -= it->max_ascent + it->max_descent) > 0) { + /* Don't add more than one line height. */ + height %= FRAME_LINE_HEIGHT (it->f); it->max_ascent += height / 2; it->max_descent += (height + 1) / 2; } @@ -11713,9 +11728,11 @@ redisplay_window_1 (window) /* Set cursor position of W. PT is assumed to be displayed in ROW. DELTA is the number of bytes by which positions recorded in ROW - differ from current buffer positions. */ + differ from current buffer positions. -void + Return 0 if cursor is not on this row. 1 otherwise. */ + +int set_cursor_from_row (w, row, matrix, delta, delta_bytes, dy, dvpos) struct window *w; struct glyph_row *row; @@ -11865,6 +11882,11 @@ set_cursor_from_row (w, row, matrix, delta, delta_bytes, dy, dvpos) SKIP_GLYPHS (glyph, end, x, EQ (glyph->object, string)); } } + + /* If we reached the end of the line, and end was from a string, + cursor is not on this line. */ + if (glyph == end && row->continued_p) + return 0; } w->cursor.hpos = glyph - row->glyphs[TEXT_AREA]; @@ -11898,6 +11920,8 @@ set_cursor_from_row (w, row, matrix, delta, delta_bytes, dy, dvpos) else CHARPOS (this_line_start_pos) = 0; } + + return 1; } @@ -12581,8 +12605,18 @@ try_cursor_movement (window, startp, scroll_step) rc = CURSOR_MOVEMENT_MUST_SCROLL; else { - set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0); - rc = CURSOR_MOVEMENT_SUCCESS; + do + { + if (set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0)) + { + rc = CURSOR_MOVEMENT_SUCCESS; + break; + } + ++row; + } + while (MATRIX_ROW_BOTTOM_Y (row) < last_y + && MATRIX_ROW_START_CHARPOS (row) == PT + && cursor_row_p (w, row)); } } } @@ -15035,6 +15069,25 @@ dump_glyph (row, glyph, area) glyph->left_box_line_p, glyph->right_box_line_p); } + else if (glyph->type == COMPOSITE_GLYPH) + { + fprintf (stderr, + " %5d %4c %6d %c %3d 0x%05x %c %4d %1.1d%1.1d\n", + glyph - row->glyphs[TEXT_AREA], + '+', + glyph->charpos, + (BUFFERP (glyph->object) + ? 'B' + : (STRINGP (glyph->object) + ? 'S' + : '-')), + glyph->pixel_width, + glyph->u.cmp_id, + '.', + glyph->face_id, + glyph->left_box_line_p, + glyph->right_box_line_p); + } } @@ -21603,7 +21656,7 @@ erase_phys_cursor (w) /* Maybe clear the display under the cursor. */ if (w->phys_cursor_type == HOLLOW_BOX_CURSOR) { - int x, y; + int x, y, left_x; int header_line_height = WINDOW_HEADER_LINE_HEIGHT (w); int width; @@ -21611,11 +21664,16 @@ erase_phys_cursor (w) if (cursor_glyph == NULL) goto mark_cursor_off; - x = WINDOW_TEXT_TO_FRAME_PIXEL_X (w, w->phys_cursor.x); + width = cursor_glyph->pixel_width; + left_x = window_box_left_offset (w, TEXT_AREA); + x = w->phys_cursor.x; + if (x < left_x) + width -= left_x - x; + width = min (width, window_box_width (w, TEXT_AREA) - x); y = WINDOW_TO_FRAME_PIXEL_Y (w, max (header_line_height, cursor_row->y)); - width = min (cursor_glyph->pixel_width, - window_box_width (w, TEXT_AREA) - w->phys_cursor.x); + x = WINDOW_TEXT_TO_FRAME_PIXEL_X (w, max (x, left_x)); + if (width > 0) rif->clear_frame_area (f, x, y, width, cursor_row->visible_height); } diff --git a/src/xfaces.c b/src/xfaces.c index 2b2f1620133..9adc9218f6d 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -6762,6 +6762,12 @@ better_font_p (values, font1, font2, compare_pt_p, avgwidth) { int i; + /* Any font is better than no font. */ + if (! font1) + return 0; + if (! font2) + return 1; + for (i = 0; i < DIM (font_sort_order); ++i) { int xlfd_idx = font_sort_order[i]; @@ -7012,29 +7018,19 @@ best_matching_font (f, attrs, fonts, nfonts, width_ratio, needs_overstrike) if (needs_overstrike) *needs_overstrike = 0; - /* Start with the first non-scalable font in the list. */ - for (i = 0; i < nfonts; ++i) - if (!font_scalable_p (fonts + i)) - break; + best = NULL; /* Find the best match among the non-scalable fonts. */ - if (i < nfonts) - { - best = fonts + i; - - for (i = 1; i < nfonts; ++i) - if (!font_scalable_p (fonts + i) - && better_font_p (specified, fonts + i, best, 1, avgwidth)) - { - best = fonts + i; + for (i = 0; i < nfonts; ++i) + if (!font_scalable_p (fonts + i) + && better_font_p (specified, fonts + i, best, 1, avgwidth)) + { + best = fonts + i; - exact_p = exact_face_match_p (specified, best, avgwidth); - if (exact_p) - break; - } - } - else - best = NULL; + exact_p = exact_face_match_p (specified, best, avgwidth); + if (exact_p) + break; + } /* Unless we found an exact match among non-scalable fonts, see if we can find a better match among scalable fonts. */ @@ -7058,8 +7054,7 @@ best_matching_font (f, attrs, fonts, nfonts, width_ratio, needs_overstrike) for (i = 0; i < nfonts; ++i) if (font_scalable_p (fonts + i)) { - if (best == NULL - || better_font_p (specified, fonts + i, best, 0, 0) + if (better_font_p (specified, fonts + i, best, 0, 0) || (!non_scalable_has_exact_height_p && !better_font_p (specified, best, fonts + i, 0, 0))) { @@ -7067,23 +7062,27 @@ best_matching_font (f, attrs, fonts, nfonts, width_ratio, needs_overstrike) best = fonts + i; } } + } - if (needs_overstrike) - { - enum xlfd_weight want_weight = specified[XLFD_WEIGHT]; - enum xlfd_weight got_weight = best->numeric[XLFD_WEIGHT]; + /* We should have found SOME font. */ + if (best == NULL) + abort (); - if (want_weight > XLFD_WEIGHT_MEDIUM && want_weight > got_weight) - { - /* We want a bold font, but didn't get one; try to use - overstriking instead to simulate bold-face. However, - don't overstrike an already-bold fontn unless the - desired weight grossly exceeds the available weight. */ - if (got_weight > XLFD_WEIGHT_MEDIUM) - *needs_overstrike = (got_weight - want_weight) > 2; - else - *needs_overstrike = 1; - } + if (! exact_p && needs_overstrike) + { + enum xlfd_weight want_weight = specified[XLFD_WEIGHT]; + enum xlfd_weight got_weight = best->numeric[XLFD_WEIGHT]; + + if (want_weight > XLFD_WEIGHT_MEDIUM && want_weight > got_weight) + { + /* We want a bold font, but didn't get one; try to use + overstriking instead to simulate bold-face. However, + don't overstrike an already-bold fontn unless the + desired weight grossly exceeds the available weight. */ + if (got_weight > XLFD_WEIGHT_MEDIUM) + *needs_overstrike = (got_weight - want_weight) > 2; + else + *needs_overstrike = 1; } } @@ -7488,7 +7487,7 @@ realize_default_face (f) face = realize_face (c, attrs, DEFAULT_FACE_ID); #ifdef HAVE_WINDOW_SYSTEM -#ifdef HAVE_X_WINDOWS +#ifdef HAVE_X_WINDOWS if (face->font != FRAME_FONT (f)) /* As the font specified for the frame was not acceptable as a font for the default face (perhaps because auto-scaled fonts diff --git a/src/xfns.c b/src/xfns.c index ed6d00d0325..b4d16615fb0 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -1256,7 +1256,7 @@ x_set_icon_name (f, arg, oldval) if (STRINGP (oldval) && EQ (Fstring_equal (oldval, arg), Qt)) return; } - else if (!STRINGP (oldval) && EQ (oldval, Qnil) == EQ (arg, Qnil)) + else if (!NILP (arg) || NILP (oldval)) return; f->icon_name = arg; @@ -1612,7 +1612,7 @@ x_set_name_internal (f, name) text.format = 8; text.nitems = bytes; - if (NILP (f->icon_name)) + if (!STRINGP (f->icon_name)) { icon = text; } diff --git a/src/xmenu.c b/src/xmenu.c index 2abf0a48319..8e994ac5efb 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -1301,9 +1301,119 @@ popup_get_selection (initial_event, dpyinfo, id, do_timers) } } +DEFUN ("menu-bar-open", Fmenu_bar_open, Smenu_bar_open, 0, 1, "i", + doc: /* Start key navigation of the menu bar in FRAME. +This initially opens the first menu bar item and you can then navigate with the +arrow keys, select a menu entry with the return key or cancel with the +escape key. If FRAME has no menu bar this function does nothing. + +If FRAME is nil or not given, use the selected frame. */) + (frame) + Lisp_Object frame; +{ + XEvent ev; + FRAME_PTR f = check_x_frame (frame); + Widget menubar; + BLOCK_INPUT; + + if (FRAME_EXTERNAL_MENU_BAR (f)) + set_frame_menubar (f, 0, 1); + + menubar = FRAME_X_OUTPUT (f)->menubar_widget; + if (menubar) + { + Window child; + int error_p = 0; + + x_catch_errors (FRAME_X_DISPLAY (f)); + memset (&ev, 0, sizeof ev); + ev.xbutton.display = FRAME_X_DISPLAY (f); + ev.xbutton.window = XtWindow (menubar); + ev.xbutton.root = FRAME_X_DISPLAY_INFO (f)->root_window; + ev.xbutton.time = XtLastTimestampProcessed (FRAME_X_DISPLAY (f)); + ev.xbutton.button = Button1; + ev.xbutton.x = ev.xbutton.y = FRAME_MENUBAR_HEIGHT (f) / 2; + ev.xbutton.same_screen = True; + +#ifdef USE_MOTIF + { + Arg al[2]; + WidgetList list; + Cardinal nr; + XtSetArg (al[0], XtNchildren, &list); + XtSetArg (al[1], XtNnumChildren, &nr); + XtGetValues (menubar, al, 2); + ev.xbutton.window = XtWindow (list[0]); + } +#endif + + XTranslateCoordinates (FRAME_X_DISPLAY (f), + /* From-window, to-window. */ + ev.xbutton.window, ev.xbutton.root, + + /* From-position, to-position. */ + ev.xbutton.x, ev.xbutton.y, + &ev.xbutton.x_root, &ev.xbutton.y_root, + + /* Child of win. */ + &child); + error_p = x_had_errors_p (FRAME_X_DISPLAY (f)); + x_uncatch_errors (); + + if (! error_p) + { + ev.type = ButtonPress; + ev.xbutton.state = 0; + + XtDispatchEvent (&ev); + ev.xbutton.type = ButtonRelease; + ev.xbutton.state = Button1Mask; + XtDispatchEvent (&ev); + } + } + + UNBLOCK_INPUT; + + return Qnil; +} #endif /* USE_X_TOOLKIT */ + #ifdef USE_GTK +DEFUN ("menu-bar-open", Fmenu_bar_open, Smenu_bar_open, 0, 1, "i", + doc: /* Start key navigation of the menu bar in FRAME. +This initially opens the first menu bar item and you can then navigate with the +arrow keys, select a menu entry with the return key or cancel with the +escape key. If FRAME has no menu bar this function does nothing. + +If FRAME is nil or not given, use the selected frame. */) + (frame) + Lisp_Object frame; +{ + GtkWidget *menubar; + BLOCK_INPUT; + FRAME_PTR f = check_x_frame (frame); + + if (FRAME_EXTERNAL_MENU_BAR (f)) + set_frame_menubar (f, 0, 1); + + menubar = FRAME_X_OUTPUT (f)->menubar_widget; + if (menubar) + { + /* Activate the first menu. */ + GList *children = gtk_container_get_children (GTK_CONTAINER (menubar)); + + gtk_menu_shell_select_item (GTK_MENU_SHELL (menubar), + GTK_WIDGET (children->data)); + + popup_activated_flag = 1; + g_list_free (children); + } + UNBLOCK_INPUT; + + return Qnil; +} + /* Loop util popup_activated_flag is set to zero in a callback. Used for popup menus and dialogs. */ @@ -3659,6 +3769,13 @@ The enable predicate for a menu command should check this variable. */); #endif defsubr (&Sx_popup_menu); + +#if defined (USE_GTK) || defined (USE_X_TOOLKIT) + defsubr (&Smenu_bar_open); + Fdefalias (intern ("accelerate-menu"), intern (Smenu_bar_open.symbol_name), + Qnil); +#endif + #ifdef HAVE_MENUS defsubr (&Sx_popup_dialog); #endif diff --git a/src/xterm.c b/src/xterm.c index c25f23cc573..7407585ebf0 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -326,20 +326,8 @@ static int x_alloc_nearest_color_1 P_ ((Display *, Colormap, XColor *)); static void x_set_window_size_1 P_ ((struct frame *, int, int, int)); static const XColor *x_color_cells P_ ((Display *, int *)); static void x_update_window_end P_ ((struct window *, int, int)); -void x_delete_display P_ ((struct x_display_info *)); static int x_io_error_quitter P_ ((Display *)); -void x_catch_errors P_ ((Display *)); -void x_uncatch_errors P_ ((void)); -void x_lower_frame P_ ((struct frame *)); -void x_scroll_bar_clear P_ ((struct frame *)); -int x_had_errors_p P_ ((Display *)); -void x_wm_set_size_hint P_ ((struct frame *, long, int)); -void x_raise_frame P_ ((struct frame *)); -void x_set_window_size P_ ((struct frame *, int, int, int)); -void x_wm_set_window_state P_ ((struct frame *, int)); -void x_wm_set_icon_pixmap P_ ((struct frame *, int)); -void x_initialize P_ ((void)); static void x_font_min_bounds P_ ((XFontStruct *, int *, int *)); static int x_compute_min_glyph_bounds P_ ((struct frame *)); static void x_update_end P_ ((struct frame *)); @@ -374,6 +362,7 @@ static void x_check_fullscreen P_ ((struct frame *)); static void x_check_expected_move P_ ((struct frame *)); static int handle_one_xevent P_ ((struct x_display_info *, XEvent *, int *, struct input_event *)); +static SIGTYPE x_connection_closed P_ ((Display *, char *)); /* Flush display of frame F, or of all frames if F is null. */ @@ -2694,19 +2683,28 @@ x_draw_stretch_glyph_string (s) { /* If `x-stretch-block-cursor' is nil, don't draw a block cursor as wide as the stretch glyph. */ - int width = min (FRAME_COLUMN_WIDTH (s->f), s->background_width); + int width, background_width = s->background_width; + int x = s->x, left_x = window_box_left_offset (s->w, TEXT_AREA); + + if (x < left_x) + { + background_width -= left_x - x; + x = left_x; + } + width = min (FRAME_COLUMN_WIDTH (s->f), background_width); /* Draw cursor. */ - x_draw_glyph_string_bg_rect (s, s->x, s->y, width, s->height); + x_draw_glyph_string_bg_rect (s, x, s->y, width, s->height); /* Clear rest using the GC of the original non-cursor face. */ - if (width < s->background_width) + if (width < background_width) { - int x = s->x + width, y = s->y; - int w = s->background_width - width, h = s->height; + int y = s->y; + int w = background_width - width, h = s->height; XRectangle r; GC gc; + x += width; if (s->row->mouse_face_p && cursor_in_mouse_face_p (s->w)) { @@ -2737,8 +2735,18 @@ x_draw_stretch_glyph_string (s) } } else if (!s->background_filled_p) - x_draw_glyph_string_bg_rect (s, s->x, s->y, s->background_width, - s->height); + { + int background_width = s->background_width; + int x = s->x, left_x = window_box_left_offset (s->w, TEXT_AREA); + + if (x < left_x) + { + background_width -= left_x - x; + x = left_x; + } + if (background_width > 0) + x_draw_glyph_string_bg_rect (s, x, s->y, background_width, s->height); + } s->background_filled_p = 1; } @@ -6320,6 +6328,8 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit) f = x_any_window_to_frame (dpyinfo, event.xkey.window); + /* If mouse-highlight is an integer, input clears out + mouse highlighting. */ if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight) && (f == 0 || !EQ (f->tool_bar_window, dpyinfo->mouse_face_window))) @@ -7375,8 +7385,7 @@ x_draw_hollow_cursor (w, row) return; /* Compute frame-relative coordinates for phys cursor. */ - x = WINDOW_TEXT_TO_FRAME_PIXEL_X (w, w->phys_cursor.x); - y = get_phys_cursor_geometry (w, row, cursor_glyph, &h); + get_phys_cursor_geometry (w, row, cursor_glyph, &x, &y, &h); wd = w->phys_cursor_width; /* The foreground of cursor_gc is typically the same as the normal diff --git a/src/xterm.h b/src/xterm.h index 8e1e06097a8..1d1319fca31 100644 --- a/src/xterm.h +++ b/src/xterm.h @@ -962,10 +962,6 @@ void x_delete_display P_ ((struct x_display_info *)); void x_make_frame_visible P_ ((struct frame *)); void x_iconify_frame P_ ((struct frame *)); void x_wm_set_size_hint P_ ((struct frame *, long, int)); -void x_catch_errors P_ ((Display *)); -int x_had_errors_p P_ ((Display *)); -void x_uncatch_errors P_ ((void)); -void x_check_errors P_ ((Display *, char *)); int x_text_icon P_ ((struct frame *, char *)); int x_bitmap_icon P_ ((struct frame *, Lisp_Object)); void x_set_window_size P_ ((struct frame *, int, int, int)); @@ -981,7 +977,10 @@ extern int x_bitmap_icon P_ ((struct frame *, Lisp_Object)); extern void x_catch_errors P_ ((Display *)); extern void x_check_errors P_ ((Display *, char *)); extern int x_had_errors_p P_ ((Display *)); +extern int x_catching_errors P_ ((void)); extern void x_uncatch_errors P_ ((void)); +extern void x_clear_errors P_ ((Display *)); +extern void x_fully_uncatch_errors P_ ((void)); extern void x_set_window_size P_ ((struct frame *, int, int, int)); extern void x_set_mouse_position P_ ((struct frame *, int, int)); extern void x_set_mouse_pixel_position P_ ((struct frame *, int, int)); @@ -1000,6 +999,9 @@ extern void x_initialize P_ ((void)); extern unsigned long x_copy_color P_ ((struct frame *, unsigned long)); #ifdef USE_X_TOOLKIT extern XtAppContext Xt_app_con; +extern int x_alloc_lighter_color_for_widget __P ((Widget, Display*, Colormap, + unsigned long *, + double, int)); #endif extern void x_query_colors P_ ((struct frame *f, XColor *, int)); extern void x_query_color P_ ((struct frame *f, XColor *)); |
