Mercurial > emacs
changeset 90645:7eeafaaa9eab
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 476-489)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 153-160)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-127
line wrap: on
line diff
--- a/AUTHORS Mon Oct 30 06:52:47 2006 +0000 +++ b/AUTHORS Mon Oct 30 08:54:41 2006 +0000 @@ -13,10 +13,11 @@ 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 etags.c + gnus-score.el Adrian Colley: changed aix3-2.h -Adrian Lanz: changed mail-source.el +Adrian Lanz: changed mail-source.el spam.el Agustin Martin: changed flyspell.el ispell.el @@ -57,7 +58,7 @@ 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 rcirc.texi comint.el custom.el erc-bbdb.el erc-chess.el erc-ezbounce.el - erc-imenu.el and 24 other files + erc-imenu.el and 26 other files Alexander Klimov: changed man.el @@ -94,7 +95,10 @@ 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 +Andre Srinivasan: changed gnus-group.el gnus-sum.el gnus.texi + mm-decode.el mml.el nnmail.el + +Andrea Russo: changed info-look.el Andreas B,A|(Bsching: changed emacsclient.c @@ -103,9 +107,11 @@ 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 + erc-speedbar.el erc-track.el erc-xdcc.el gnus-registry.el mml-sec.el + mml2015.el Andreas Jaeger: changed gnus-msg.el gnus-start.el gnus-xmas.el + nnfolder.el nnml.el Andreas Leue: changed artist.el @@ -116,9 +122,9 @@ fileio.c simple.el buffer.c minibuf.c xterm.c emacs.c keyboard.c process.c and 444 other files -Andreas Seltenreich: changed nnweb.el gnus-art.el gnus-ml.el gnus-srvr.el - gnus-start.el gnus-util.el gnus.el gnus.texi mm-url.el nnslashdot.el - url-cookie.el url-http.el +Andreas Seltenreich: changed nnweb.el gnus.texi gnus-art.el gnus-ml.el + gnus-srvr.el gnus-start.el gnus-util.el gnus.el mm-url.el mm-uu.el + nnslashdot.el url-cookie.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 @@ -146,6 +152,8 @@ Andy Petrusenco: changed w32term.c +Anna M. Bigatti: wrote cal-html.el + Ari Roponen: changed atimer.c startup.el Arisawa Akihiro: changed mm-decode.el mm-view.el ps-print.el time.el @@ -189,8 +197,8 @@ Benjamin Riefenstahl: changed emacs.c mac-win.el macterm.c ms-w32.h mule-cmds.el runemacs.c tcl.el w32.c w32.h w32select.c -Benjamin Rutt: changed vc.el diff-mode.el ffap.el nnmbox.el simple.el - vc-cvs.el +Benjamin Rutt: changed vc.el gnus-msg.el message.el diff-mode.el ffap.el + gnus-dired.el nnimap.el nnmbox.el simple.el vc-cvs.el Bill Atkins: changed wdired.el @@ -210,6 +218,8 @@ Bill Rozas: wrote scheme.el and changed xscheme.el +Bill White: changed gnus-start.el + 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 @@ -227,6 +237,8 @@ gnus-agent.el gnus-cus.el gnus-gl.el gnus-nocem.el gnus-score.el gnus-topic.el gnus.el mail-source.el nnmail.el +Bj,Ax(Brn Mork: changed gnus-agent.el message.el mml2015.el + Blitz Product Development Corporation: wrote ispell.el Boaz Ben-Zvi: wrote profile.el @@ -311,11 +323,11 @@ 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 cus-edit.el custom.el simple.el display.texi - longlines.el files.el text.texi custom.texi files.texi wid-edit.el - cus-theme.el info.el keyboard.c xterm.c compile.el frames.texi +Chong Yidong: changed cus-edit.el simple.el custom.el display.texi + longlines.el files.el text.texi custom.texi files.texi keyboard.c + wid-edit.el cus-theme.el frames.texi info.el xterm.c compile.el image-mode.el keymaps.texi misc.texi mouse.el sendmail.el - and 156 other files + and 162 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 @@ -341,7 +353,7 @@ Christoph Bauer: changed configure.in -Christoph Conrad: changed qp.el +Christoph Conrad: changed gnus-agent.el gnus-score.el qp.el Christoph Wedler: wrote antlr-mode.el and changed format.el gnus-art.el gnus-picon.el message.el register.el @@ -350,7 +362,7 @@ Christopher J. Madsen: wrote decipher.el and changed files.el ispell.el replace.el time.el -Chunyu Wang: changed pcl-cvs.texi +Chunyu Wang: changed gnus-art.el pcl-cvs.texi Claudio Fontana: changed Makefile.in @@ -369,7 +381,7 @@ Daiki Ueno: wrote pgg-def.el pgg-gpg.el pgg-parse.el pgg-pgp.el pgg-pgp5.el pgg.el starttls.el -and changed mml2015.el gnus-agent.el mml1991.el +and changed mml2015.el gnus-agent.el gnus-srvr.el gnus-sum.el mml1991.el Dale Hagglund: changed unexelf.c @@ -383,7 +395,7 @@ Damon Anton Permezel: wrote hanoi.el (public domain) Dan Christensen: changed gnus-sum.el nnfolder.el gnus-art.el - gnus-group.el gnus-score.el nnmail.el + gnus-group.el gnus-registry.el gnus-score.el nndoc.el nnmail.el Dan Nicolaescu: wrote iris-ansi.el romanian.el and changed term.el xterm.el hideshow.el isearch.el icon.el lisp.h @@ -411,7 +423,7 @@ 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 nnimap.el +and changed gnus-spec.el gnus-sum.el nnimap.el Daniel Quinlan: changed dired.el info.el @@ -449,6 +461,7 @@ David Casperson: changed menu-bar.el tex-mode.el David Edmondson: changed message.el gnus-cite.el imap.el mm-view.el + nnfolder.el nnml.el David Gillespie: wrote calc-aent.el calc-alg.el calc-arith.el calc-bin.el calc-comb.el calc-cplx.el calc-embed.el calc-ext.el calc-fin.el @@ -479,8 +492,8 @@ David Kastrup: changed greek.el replace.el search.c ange-ftp.el faq.texi help.el mouse.el Makefile.in calc.el desktop.el keymaps.texi - meta-mode.el process.c search.texi DEBUG MAILINGLISTS autoload.el - browse-url.el buffer.c building.texi calc-alg.el and 30 other files + meta-mode.el process.c search.texi DEBUG DEVEL.HUMOR MAILINGLISTS + autoload.el browse-url.el buffer.c building.texi and 32 other files David K,Ae(Bgedal: wrote tempo.el and changed sendmail.el xmenu.c @@ -523,8 +536,12 @@ David Robinson: changed menu-bar.el x-win.el +David S Goldberg: changed message.el + David S. Goldberg: changed gnus-art.el +David Z Maze: changed nnml.el + David Z. Maze: changed nnrss.el Decklin Foster: changed nngateway.el @@ -608,9 +625,9 @@ 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 makefile.w32-in info.el fileio.c +and changed msdos.c Makefile.in makefile.w32-in files.el info.el fileio.c startup.el mainmake.v2 config.bat menu-bar.el pc-win.el simple.el - internal.el msdos.h xfaces.c frame.c rmail.el dosfns.c faces.el + internal.el msdos.h rmail.el xfaces.c frame.c dosfns.c faces.el frame.el emacs.c and 517 other files Emanuele Giaquinta: changed rxvt.el configure.in etags.c frame.el @@ -637,9 +654,15 @@ Eric Ding: wrote goto-addr.el and changed mh-utils.el mh-e.el mh-comp.el mh-mime.el +Eric Eide: changed gnus-xmas.el + Eric Hanchrow: changed TUTORIAL.es abbrev.el autorevert.el delphi.el dired.el emacsclient.c ispell.el make-dist +,AI(Bric Jacoboni: changed fr-refcard.tex + +Eric Knauel: changed gnus.el spam-report.el spam.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 @@ -648,7 +671,7 @@ sb-file.xpm sb-mail.xpm sb-pg-minus.xpm sb-pg-plus.xpm and 10 other files -Eric Marsden: changed url-util.el +Eric Marsden: changed gnus-cache.el url-util.el Eric S. Raymond: wrote AT386.el asm-mode.el cookie1.el finder.el gud.el keyswap.el lisp-mnt.el loadhist.el @@ -685,6 +708,8 @@ Fabrice Popineau: changed etags.c gnus-cache.el +Faried Nawaz: changed message.el + Felix Lee: changed flyspell.el outline.el compile.el data.c gud.el nntp.el process.c vc.el xdisp.c @@ -692,8 +717,7 @@ Flemming Hoejstrup Hansen: changed forms.el -Florian Weimer: changed message.el coding.c gnus-art.el gnus.el gnus.texi - mm-util.el +Florian Weimer: changed message.el gnus.el coding.c gnus.texi mm-util.el Francesc Rocher: changed cus-start.el macterm.c w32term.c xdisp.c xterm.c @@ -709,8 +733,8 @@ 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 w32term.c and 3 other files + erc-nickserv.el erc-page.el erc-speedbar.el gnus-util.el keymaps.texi + message.el os.texi saveplace.el and 4 other files Francois Felix Ingrand: changed gnus-salt.el @@ -718,7 +742,7 @@ Frank Bresz: wrote diff.el -Frank Schmitt: changed gnus-sum.el +Frank Schmitt: changed gnus-sum.el gnus-util.el Frank Weinberg: changed gnus-art.el @@ -768,7 +792,11 @@ Gary Wong: changed termcap.c tparam.c -Gaute B Strokkenes: changed process.c +Gaute B Strokkenes: changed imap.el gnus-fun.el process.c + +Gaute Strokkenes: changed mail-source.el + +Geoff Greene: changed message.el Geoff Voelker: wrote lisp/makefile.nt nt.c nt.h ntheap.c ntheap.h ntinevt.c ntproc.c ntterm.c src/makefile.nt w32-fns.el windowsnt.h @@ -788,7 +816,9 @@ 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 618 other files + and 619 other files + +Gerd M,Av(Bllmann: changed gnus-ems.el gnus-srvr.el mm-uu.el Gergely Nagy: changed erc.el @@ -796,8 +826,8 @@ Gernot Heiser: changed refer.el -Giorgos Keramidas: changed amdx86-64.h configure.in display.texi fringe.c - fringe.el lisp.h windows.texi +Giorgos Keramidas: changed amdx86-64.h apropos.el configure.in + display.texi fringe.c fringe.el lisp.h windows.texi Giuseppe Scrivano: changed buffer.c configure configure.in sysdep.c xsmfns.c @@ -851,15 +881,21 @@ Hans Chalupsky: wrote advice.el trace.el and changed bytecomp.el +Hans De Graaff: changed mml.el + Hans Henrik Eriksen: wrote simula.el Harald Maier: changed w32heap.c +Harald Meland: changed gnus-art.el gnus-salt.el gnus-score.el + gnus-util.el gnus-win.el + Heiko Muenkel: changed b2m.c Helmut Waitzmann: changed gnus-sum.el gnus.texi -Henrik Enberg: changed lread.c rmailout.el xfaces.c +Henrik Enberg: changed gnus-art.el gnus-msg.el lread.c rmailout.el + xfaces.c Henry Guillaume: wrote find-file.el @@ -878,6 +914,7 @@ Hoan Ton-That: changed erc-log.el Holger Schauer: wrote fortune.el +and changed message-utils.el Hovav Shacham: wrote windmove.el @@ -909,7 +946,7 @@ 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 +and changed cperl-mode.el syntax.c syntax.h textprop.c dired.c font-lock.el interval.c intervals.c intervals.h regex.c regex.h search.c @@ -931,6 +968,8 @@ Istvan Marko: changed gnus-agent.el xfns.c +Ivan Boldyrev: changed mml1991.el + Ivan Zakharyaschev: changed codepage.el lread.c Ivar Rummelhoff: wrote winner.el @@ -941,6 +980,8 @@ idlw-toolbar.el idlw-help.el vc.el bibtex.el comint.el files.texi idlw-complete-structtag.el idlwave.texi misc.texi mouse.el +Jaap-Henk Hoepman: changed mm-decode.el + Jack Repenning: changed unexelfsgi.c Jack Twilley: changed message.el @@ -970,13 +1011,15 @@ 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 keyboard.c Makefile.in config.in frames.texi configure - x-win.el emacs.c xselect.c alloc.c xlwmenu.c startup.el xdisp.c + configure.in keyboard.c Makefile.in config.in frames.texi x-win.el + configure xselect.c emacs.c alloc.c xlwmenu.c startup.el xdisp.c xresources.texi cus-start.el and 172 other files Jan Nieuwenhuizen: changed info.el TUTORIAL.nl emacs.c emacsclient.c gnus-start.el gud.el nnmh.el server.el startup.el +Jan Rychter: changed gnus-msg.el + Jan Schormann: wrote solitaire.el Jan Vroonhof: changed gnus-cite.el gnus-msg.el nntp.el @@ -988,7 +1031,7 @@ 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 +Jason Merrill: changed gnus-sum.el gnus-salt.el imap.el nnfolder.el Jason Rumney: wrote w32-vars.el and changed w32fns.c w32term.c w32menu.c w32-win.el w32term.h @@ -1040,13 +1083,13 @@ Jerry Frain: changed systime.h usg5-4.h -Jerry James: changed format.el +Jerry James: changed format.el dns.el gnus-util.el gnus-xmas.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-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 179 other files + gnus-group.el mm-bodies.el gnus-util.el mm-util.el mm-decode.el mml.el + rfc2047.el mailcap.el mm-uu.el mml1991.el pgg-gpg.el smtpmail.el + gnus-srvr.el info.el nnmail.el pgg.el and 178 other files Jhair Tocancipa Triana: changed gnus-audio.el @@ -1079,6 +1122,8 @@ Joanna Pluta: changed TUTORIAL.pl +Jochen Hein: changed gnus-art.el + Jochen K,A|(Bpper: changed calc-units.el gnus.texi Joe Buehler: changed Makefile.in cygwin.h MACHINES browse-url.el @@ -1087,6 +1132,8 @@ gnus-util.el hippie-exp.el keyboard.c lastfile.c loadup.el and 12 other files +Joe Casadonte: changed gnus-srvr.el + Joe Corneli: changed subr.el Joe Edmonds: changed lisp-mode.el @@ -1110,7 +1157,7 @@ erc-nickserv.el erc-ring.el erc-speak.el erc-track.el simple.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 and 10 other files + erc-log.el and 11 other files Johan Vromans: wrote forms-d2.el forms.el iso-acc.el and changed complete.el @@ -1121,6 +1168,8 @@ John F. Whitehead: changed mule-cmds.el mule-diag.el +John Fremlin: changed gnus-msg.el message.el + John Grabowski: changed xfaces.c xfns.c John H. Palmieri: changed gnus-fun.el @@ -1156,10 +1205,12 @@ 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 erc-speak.el - and 9 other files + and 11 other files John Williams: changed etags.el +Jon Ericson: changed gnus.el spam-report.el + Jon K Hellan: wrote utf7.el Jonathan I. Kamens: changed pop.c movemail.c rmail.el configure.in @@ -1197,7 +1248,7 @@ nnmail.el ChangeLog ChangeLog.1 gnus-cite.el gnus-delay.el gnus-spec.el mml1991.el nnultimate.el nnwfm.el gnus-cus.el gnus-smiley.el gnus-start.el gnus-topic.el gnus.el nnbabyl.el nndiary.el - and 7 other files + and 8 other files Joshua Varner: changed intro.texi @@ -1208,13 +1259,15 @@ 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 - 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 + sh-script.el vhdl-mode.el ada-mode.el comint.el org.el w32-win.el + xdisp.c allout.el bs.el desktop.el idlwave.el and 554 other files Juergen Hoetzel: changed url-handlers.el Juergen Nickelsen: wrote ws-mode.el +Julien Avarre: changed gnus-fun.el + Julien Gilles: wrote gnus-ml.el Junio Hamano: changed window.el @@ -1242,14 +1295,16 @@ Kai Gro,A_(Bjohann: wrote gnus-delay.el tramp-util.el tramp-uu.el tramp.el trampver.el -and changed message.el gnus-agent.el gnus-sum.el gnus-art.el nnmail.el - files.el tramp.texi gnus.el simple.el ange-ftp.el gnus-group.el - gnus-msg.el Makefile.in dired.el nnml.el paragraphs.el bindings.el - files.texi gnus-start.el imap.el man.el and 56 other files +and changed gnus-agent.el message.el gnus-sum.el files.el nnmail.el + tramp.texi gnus.el simple.el ange-ftp.el Makefile.in dired.el + paragraphs.el bindings.el files.texi gnus-art.el gnus-group.el man.el + nntp.el INSTALL crisp.el fileio.c and 45 other files Kailash C. Chowksey: changed HELLO Makefile.in ind-util.el kannada.el knd-util.el loadup.el makefile.w32-in +Kanematsu Daiji: changed nnimap.el + Karl Berry: changed info.texi emacs.texi elisp.texi emacs-xtra.texi filelock.c anti.texi building.texi cmdargs.texi copyright.el custom.texi customize.texi dired.c display.texi faq.texi frames.texi @@ -1272,20 +1327,21 @@ editfns.c fns.c process.c fileio.c simple.el keymap.c indent.c sysdep.c and 444 other files -Karl Kleinpaste: changed gnus-art.el gnus-picon.el gnus-score.el - gnus-sum.el gnus-uu.el gnus-xmas.el mm-uu.el mml.el nnmail.el smiley.el +Karl Kleinpaste: changed gnus-sum.el gnus-art.el gnus-picon.el + gnus-score.el gnus-uu.el gnus-xmas.el gnus.el mm-uu.el mml.el nnmail.el + smiley.el Karl M. Hegbloom: changed gnus.el -Karl Pfl,Ad(Bsterer: changed spam-stat.el - -Katsuhiro Hermit Endo: changed gnus-spec.el +Karl Pfl,Ad(Bsterer: changed gnus-art.el gnus-score.el spam-stat.el + +Katsuhiro Hermit Endo: changed gnus-group.el gnus-spec.el Katsumi Yamaoka: wrote canlock.el 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 mm-util.el lpath.el - gnus-start.el rfc2047.el gnus-group.el mm-uu.el dgnushack.el - gnus-agent.el nntp.el mml.el nnrss.el nnheader.el and 71 other files + mm-view.el gnus-util.el gnus-msg.el mm-util.el gnus.el lpath.el + gnus-group.el gnus-start.el rfc2047.el dgnushack.el mm-uu.el + gnus-agent.el nntp.el mml.el nnrss.el rfc2231.el and 71 other files Kaveh R. Ghazi: changed delta88k.h xterm.c @@ -1324,7 +1380,7 @@ and changed coding.c mule-cmds.el mule.el charset.c fileio.c xterm.c fns.c ccl.c Makefile.in mule-conf.el fontset.c charset.h coding.h fontset.el mule-diag.el xdisp.c editfns.c process.c insdel.c - japanese.el characters.el and 277 other files + japanese.el characters.el and 278 other files Kenneth Stailey: changed alpha.h configure.in ns32000.h openbsd.h pmax.h sparc.h unexalpha.c unexelf.c @@ -1347,7 +1403,7 @@ Kevin Greiner: changed gnus-agent.el gnus-start.el gnus-sum.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-range.el legacy-gnus-agent.el gnus-art.el gnus-cache.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 @@ -1363,14 +1419,14 @@ os.texi text.texi MORE.STUFF cc-align.el cmdargs.texi 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 - and 12 other files - -Kim F. Storm: wrote bindat.el cua-base.el cua-gmrk.el cua-rect.el - ido.el keypad.el kmacro.el + and 14 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 window.c xterm.c keyboard.c - process.c w32term.c dispnew.c subr.el lisp.h fringe.c macterm.c + process.c subr.el w32term.c dispnew.c lisp.h fringe.c macterm.c display.texi fns.c alloc.c xfaces.c xfns.c xterm.h keymap.c .gdbinit - and 238 other files + and 240 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 @@ -1393,6 +1449,8 @@ Koseki Yoshinori: wrote iimage.el and changed nnmail.el +Kurt B. Kaiser: changed message.el + Kurt Hornik: wrote octave-hlp.el octave-inf.el octave-mod.el and changed battery.el ielm.el term.el @@ -1443,6 +1501,8 @@ Lasse Rasinen: changed gnus-start.el +Laurent Martelli: changed mm-decode.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 @@ -1457,8 +1517,8 @@ Leigh Stoller: changed emacsclient.c emacsserver.c server.el -Lennart Borgman: changed window.el mouse.el recentf.el texinfmt.el - w32term.c w32term.h +Lennart Borgman: changed window.el ada-xref.el filesets.el flymake.el + mouse.el recentf.el shell.el texinfmt.el w32term.c w32term.h Lennart Staflin: changed dired.el diary-ins.el diary-lib.el tq.el xdisp.c @@ -1485,6 +1545,8 @@ Lynn Slater: wrote help-macro.el +L,Bu(Brentey K,Ba(Broly: changed spam.el gnus-sum.el + 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 @@ -1492,7 +1554,8 @@ Maciek Pasternacki: changed nnrss.el -Magnus Henoch: changed ispell.el rcirc.el +Magnus Henoch: changed ispell.el url-http.el autoinsert.el rcirc.el + url-gw.el url-https.el url-parse.el url.el Manuel Serrano: wrote flyspell.el @@ -1500,6 +1563,8 @@ Marc Girod: changed informat.el rmail.el rmailsum.el sendmail.el +Marc Lefranc: changed gnus-art.el + Marc Shapiro: changed bibtex.el Marcelo Toledo: changed TUTORIAL.pt_BR TUTORIAL.cn TUTORIAL.cs @@ -1529,7 +1594,7 @@ diff.el erc-ezbounce.el erc-identd.el erc-lang.el erc-log.el erc-macs.el and 5 other files -Mark A. Hershberger: changed xml.el nnrss.el cperl-mode.el mm-url.el +Mark A. Hershberger: changed xml.el nnrss.el mm-url.el cperl-mode.el gnus-group.el Mark D. Baushke: changed mh-e.el mh-utils.el mh-mime.el mh-comp.el @@ -1541,6 +1606,8 @@ Mark H. Weaver: changed comint.el +Mark Hood: changed gnus-uu.el + Mark Lambert: changed process.c process.h Mark Mitchell: changed font-lock.el @@ -1551,6 +1618,8 @@ Mark Plaksin: changed nnrss.el term.el +Mark Thomas: changed gnus-util.el nnmail.el + Mark W Maimone: changed mpuz.el Mark W. Eichin: changed keyboard.c xterm.c @@ -1581,7 +1650,7 @@ Martin J. Reed: changed ldap.el -Martin Kretzschmar: changed gnus-spec.el +Martin Kretzschmar: changed gnus-spec.el gnus-sum.el Martin Larose: changed message.el @@ -1590,10 +1659,10 @@ Martin Neitzel: changed sc.el -Martin Rudalics: changed cus-edit.el wid-edit.el cus-start.el files.el - font-lock.el insdel.c syntax.c buffer.c buffer.h casefiddle.c custom.el - dispextern.h editfns.c eldoc.el fileio.c find-func.el hideif.el info.el - jit-lock.el lisp-mode.el lisp.h and 13 other files +Martin Rudalics: changed cus-edit.el wid-edit.el flyspell.el cus-start.el + files.el font-lock.el insdel.c syntax.c buffer.c buffer.h casefiddle.c + cperl-mode.el custom.el dispextern.h dnd.el editfns.c eldoc.el fileio.c + find-func.el help-at-pt.el hideif.el and 20 other files Martin Stjernholm: wrote cc-bytecomp.el and changed cc-engine.el cc-cmds.el cc-langs.el cc-defs.el cc-mode.el @@ -1601,6 +1670,8 @@ 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 +Martin Thornquist: changed gnus-group.el gnus-topic.el + Masahiko Sato: wrote vip.el Masanobu Umeda: wrote gnus-kill.el gnus-mh.el gnus-msg.el gnus.el @@ -1612,7 +1683,7 @@ and changed etags.el asm-mode.el xdisp.c bindings.el hexl.el man.el simple.el wid-edit.el add-log.el compile.el faces.el pcvs.el register.el ruler-mode.el buffer.c cus-face.el dired-x.el display.texi - etags.c font-lock.el gdb-ui.el and 57 other files + etags.c font-lock.el gdb-ui.el and 58 other files Masayuki Ataka: changed texinfmt.el texinfo.el characters.el make-mode.el @@ -1623,7 +1694,7 @@ Mathias Megyei: changed Makefile.in -Mats Lidell: changed TUTORIAL.sv european.el +Mats Lidell: changed TUTORIAL.sv european.el gnus-art.el Matt Hodges: changed em-pred.el icon.el paragraphs.el simple.el table.el telnet.el @@ -1647,21 +1718,23 @@ Matthieu Devin: wrote delsel.el -Matthieu Moy: changed message.el +Matthieu Moy: changed gnus-msg.el message.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 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 rcompile.el tramp*.el trampver.el - woman.el + files.el files.texi nnml.el tramp-uu.el vc.el dired-x.el dired.el + faq.texi find-dired.el locate.el mini.texi rcompile.el 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 Cook: changed gnus-sum.el + Michael D. Ernst: wrote reposition.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 @@ -1697,9 +1770,9 @@ erc-stamp.el erc-log.el erc-autoaway.el erc-identd.el erc-track.el erc-match.el erc-dcc.el erc-notify.el erc-goodies.el erc-ibuffer.el erc-list.el erc-pcomplete.el erc-spelling.el erc-bbdb.el erc-compat.el - erc-nicklist.el and 42 other files - -Michael Piotrowski: changed ps-print.el + erc-nicklist.el erc-*.el and 42 other files + +Michael Piotrowski: changed gnus-sum.el ps-print.el Michael R. Cook: changed gnus-topic.el gnus-art.el gnus-sum.el @@ -1712,8 +1785,8 @@ Michael Schmidt: wrote modula2.el (public domain) -Michael Shields: changed gnus-art.el gnus-cite.el gnus-sum.el intel386.h - nndraft.el +Michael Shields: changed spam.el gnus-art.el gnus-sum.el gnus-cite.el + gnus-group.el gnus.el intel386.h nndraft.el pgg-def.el Michael Sperber [Mr. Preprocessor]: changed aix3-1.h aix4-2.h @@ -1727,7 +1800,7 @@ Michal Nazarewicz: changed ispell.el -Micha,Ak(Bl Cadilhac: changed ispell.el cus-edit.el dispnew.c ido.el info.el +Micha,Ak(Bl Cadilhac: changed ido.el ispell.el cus-edit.el dispnew.c info.el life.el lpr.el make-mode.el pong.el print.c process.c startup.el uni-input.el @@ -1794,7 +1867,7 @@ Nachum Dershowitz: wrote cal-hebrew.el Nagy Andras: wrote gnus-sieve.el -and changed imap.el +and changed imap.el gnus.el Nakaji Hiroyuki: changed mm-util.el @@ -1812,19 +1885,21 @@ Nelson Jose Dos Santos Ferreira: changed nnsoup.el -Nevin Kapur: changed nnmail.el gnus-group.el gnus-sum.el gnus.el - nnbabyl.el nnfolder.el nnimap.el nnmbox.el nnmh.el nnml.el +Nevin Kapur: changed nnmail.el gnus-sum.el nnimap.el gnus-group.el + gnus.el nnbabyl.el nnfolder.el nnmbox.el nnmh.el nnml.el Niall Mansfield: changed etags.c Nick Roberts: wrote gdb-ui.el -and changed gud.el building.texi tooltip.el speedbar.el thumbs.el DEBUG - cc-mode.el frames.texi subr.el xt-mouse.el .gdbinit bindings.el +and changed gud.el building.texi tooltip.el speedbar.el bindings.el + thumbs.el DEBUG cc-mode.el frames.texi subr.el xt-mouse.el .gdbinit comint.el display.texi help-mode.el descr-text.el gud-display.pbm speedbar.texi tumme.el xdisp.c byte-run.el and 112 other files Nico Francois: changed w32fns.c w32inevt.c w32menu.c +Niklas Morberg: changed nnweb.el gnus-art.el nnimap.el spam.el + Noah Friedman: wrote eldoc.el rlogin.el rsz-mini.el type-break.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 @@ -1838,7 +1913,7 @@ Nozomu Ando: changed buffer.c mips.h pmax.h smtpmail.el sysselect.h unexelf.c unexmacosx.c -Nuutti Kotivuori: changed gnus-cache.el +Nuutti Kotivuori: changed gnus-sum.el flow-fill.el gnus-cache.el Odd Gripenstam: wrote dcl-mode.el @@ -1920,7 +1995,7 @@ Pavel Jan,Bm(Bk: changed COPYING keyboard.c xterm.c xdisp.c Makefile.in process.c emacs.c lisp.h menu-bar.el ldap.el make-dist xfns.c buffer.c coding.c eval.c fileio.c flyspell.el fns.c indent.c callint.c - cus-start.el and 693 other files + cus-start.el and 703 other files Pavel Kobiakov: wrote flymake.el and changed flymake.texi @@ -1980,6 +2055,8 @@ Peter Stephenson: wrote vcursor.el +Peter Von Der Ahe: changed gnus-ems.el + Peter Whaite: changed data.c Petri Kaurinkoski: changed configure.in iris4d.h irix6-0.h irix6-5.h @@ -2010,6 +2087,8 @@ Raja R Harinath: changed nnml.el +Raja R. Harinath: changed gnus-salt.el + Rajappa Iyer: changed gnus-salt.el Rajesh Vaidheeswarran: wrote whitespace.el @@ -2037,16 +2116,19 @@ Raymond Scholz: wrote deuglify.el and changed gnus-art.el gnus-msg.el gnus.texi message.el nnmail.el + pgg-gpg.el Reiner Steib: wrote gmm-utils.el and changed gnus-art.el message.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 mm-util.el files.el - spam-report.el nnweb.el spam.el deuglify.el mm-decode.el - and 161 other files + gnus-group.el gnus-faq.texi mml.el gnus-start.el gnus-util.el + gnus-msg.el gnus-score.el message.texi mm-util.el files.el + gnus-agent.el spam-report.el mm-decode.el nnweb.el spam.el deuglify.el + and 162 other files Remek Trzaska: changed gnus-ems.el +Remi Letot: changed nnmaildir.el + Renaud Rioboo: changed nnmail.el Ren,Ai(B Kyllingstad: changed pcomplete.el @@ -2072,7 +2154,7 @@ 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 startup.el emacs.c editfns.c sendmail.el info.el - dispnew.c and 1334 other files + dispnew.c and 1335 other files Richard Mlynarik: wrote cl-indent.el ebuff-menu.el ehelp.el env.c rfc822.el terminal.el yow.el @@ -2108,6 +2190,8 @@ Robert Thorpe: changed cus-start.el +Roberto Rodr,Am(Bguez: changed ada-mode.texi widget.texi + Roderick Schertler: changed dgux.h dgux4.h gud.el sysdep.c Rodrigo Real: changed pt-br-refcard.tex pt-br-refcard.ps @@ -2137,7 +2221,7 @@ message.el puresize.h replace.el files.texi gnus-fun.el gnus.texi help-fns.el make-dist rcirc.el subr.el Makefile.in antlr-mode.el bookmark.el buffer.c comint.el diary-lib.el dired.el - and 121 other files + and 124 other files Roman Belenov: changed which-func.el @@ -2171,7 +2255,9 @@ and changed cl-indent.el font-lock.el ange-ftp.el mouse.el tex-mode.el vc-cvs.el add-log.el bindings.el bookmark.el debug.el diary-lib.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 + bytecomp.el cc-mode.el compile.el etags.el and 95 other files + +Samuel Tardieu: changed smime.el Sanghyuk Suh: changed mac-win.el macterm.c @@ -2190,12 +2276,16 @@ Schlumberger Technology Corporation: changed gud.el +Scott A Crosby: changed gnus-logic.el + Scott Byer: changed gnus-sum.el Scott Draves: wrote tq.el Scott M. Meyers: changed cmacexp.el +Sean Neakums: changed gnus-msg.el gnus-uu.el + Sean O'rourke: changed ibuf-ext.el Sebastian Kremer: wrote dired-aux.el dired-x.el dired.el ls-lisp.el @@ -2216,11 +2306,11 @@ Shenghuo Zhu: wrote binhex.el mm-extern.el mm-partial.el mm-url.el mm-uu.el mml2015.el nnrss.el nnwarchive.el rfc1843.el uudecode.el webmail.el -and changed message.el gnus-art.el gnus-sum.el gnus-msg.el gnus.el +and changed gnus-art.el message.el gnus-sum.el gnus-msg.el gnus.el gnus-agent.el mm-decode.el mm-util.el gnus-group.el mml.el - gnus-start.el gnus-util.el nnfolder.el mm-view.el nnmail.el - nnslashdot.el gnus-xmas.el nntp.el gnus-topic.el rfc2047.el - dgnushack.el and 103 other files + gnus-start.el gnus-util.el nnfolder.el mm-view.el nnslashdot.el + nnmail.el nntp.el gnus-topic.el gnus-xmas.el rfc2047.el dgnushack.el + and 101 other files Shinichirou Sugou: changed etags.c @@ -2236,10 +2326,10 @@ 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.el - pgg-gpg.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 pgg-parse.el - and 91 other files + mml2015.el pgg-gpg.el gnus-agent.el mml.el mm-decode.el mml1991.el + gnus-group.el gnus-msg.el pgg-pgp5.el gnus-sieve.el gnus.el + browse-url.el gnus-int.el pgg-parse.el gnus-cache.el mail-source.el + and 89 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 @@ -2259,6 +2349,8 @@ Spencer Thomas: changed dabbrev.el emacsclient.c emacsserver.c gnus.texi server.el tcp.c unexec.c +Sriram Karra: changed message.el + Stanislav Shalunov: wrote uce.el Stefan Monnier: wrote bibtex.el cvs-status.el diff-mode.el log-edit.el @@ -2266,8 +2358,10 @@ reveal.el smerge-mode.el and changed vc.el font-lock.el pcvs.el newcomment.el subr.el lisp.h keyboard.c keymap.c tex-mode.el fill.el alloc.c compile.el files.el - regex.c easy-mmode.el simple.el info.el syntax.c xdisp.c vc-hooks.el - sh-script.el and 511 other files + regex.c easy-mmode.el simple.el info.el syntax.c vc-hooks.el xdisp.c + sh-script.el and 512 other files + +Steinar Bang: changed imap.el Stephan Stahl: changed which-func.el buff-menu.el buffer.c dired-x.texi ediff-mult.el @@ -2296,11 +2390,13 @@ 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 mail-source.el + mh-customize.el mh-e.el mh-comp.el mh-mime.el Makefile Makefile.in + browse-url.el gnus-art.el gnus-sum.el gnus-xmas.el lpath.el mh-seq.el + .cvsignore dns.el em-unix.el gnus-async.el gnus-util.el mail-source.el and 15 other files +Steven E. Harris: changed nnheader.el + Steven Huwig: changed emacs.py python.el Steven L. Baur: wrote earcon.el footnote.el gnus-audio.el gnus-setup.el @@ -2317,7 +2413,7 @@ Stewart M. Clamen: wrote cal-mayan.el -Stuart D. Herring: changed minibuf.c +Stuart D. Herring: changed minibuf.c widget.texi Stuart Herring: changed isearch.el align.el allout.el comint.el edebug.el files.el @@ -2360,10 +2456,10 @@ Ted Phelps: changed mh-search.el mh-tool-bar.el 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 basic.texi - building.texi commands.texi compile.el and 11 other files +and changed spam.el gnus.el gnus-sum.el nnmail.el gnus-start.el + spam-stat.el gnus.texi lpath.el nnbabyl.el nnfolder.el nnimap.el + nnmbox.el nnmh.el nnml.el replace.el simple.el basic.texi building.texi + commands.texi compile.el dig.el and 12 other files Terje Rosten: changed xfns.c version.el xterm.c xterm.h @@ -2431,7 +2527,7 @@ Tomas Abrahamsson: wrote artist.el -Tommi Vainikainen: changed gnus-sum.el +Tommi Vainikainen: changed gnus-sum.el message.el Tomohiko Morioka: changed gnus-sum.el nnfolder.el nnmail.el nnmh.el nnml.el coding.c gnus-art.el gnus-ems.el gnus-mule.el nnheader.el @@ -2455,10 +2551,10 @@ Trung Tran-Duc: changed nntp.el -Tsuchiya Masatoshi: changed gnus-art.el nneething.el mm-view.el - gnus-sum.el nnheader.el nnml.el gnus-agent.el gnus-cache.el gnus-msg.el - lpath.el nndiary.el nnfolder.el nnimap.el nnmaildir.el pgg.el - rfc2047.el +Tsuchiya Masatoshi: changed gnus-art.el gnus-sum.el nneething.el + mm-view.el gnus-group.el nnheader.el nnml.el gnus-agent.el + gnus-cache.el gnus-msg.el lpath.el nndiary.el nnfolder.el nnimap.el + nnmaildir.el pgg.el rfc2047.el Tsugutomo Enami: changed nnheader.el regex.c regex.h simple.el @@ -2479,6 +2575,8 @@ Vadim Nasardinov: changed allout.el +Vagn Johansen: changed gnus-cache.el + Valery Alexeev: changed cyril-util.el cyrillic.el Vasily Korytov: changed cperl-mode.el gnus-art.el gnus-dired.el @@ -2502,6 +2600,8 @@ Vladimir Alexiev: changed arc-mode.el nnvirtual.el tmm.el +Vladimir Volovich: changed smime.el + Walter C. Pelissero: changed browse-url.el url-methods.el Wayne Mesard: wrote hscroll.el @@ -2555,14 +2655,14 @@ Wolfram Gloger: changed emacs.c -Xavier Maillard: changed gnus-faq.texi gnus-score.el +Xavier Maillard: changed gnus-faq.texi gnus-score.el spam.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 image.c macmenu.c macselect.c keyboard.c makefile.MPW xdisp.c + macgui.h image.c macmenu.c macselect.c keyboard.c xdisp.c makefile.MPW emacs.c config.h macos.texi xfaces.c Makefile.in darwin.h dispextern.h - w32term.c INSTALL and 66 other files + dispnew.c w32term.c and 69 other files Yann Dirson: changed imenu.el @@ -2584,8 +2684,6 @@ Zoran Milojevic: changed avoid.el -,AI(Bric Jacoboni: changed fr-refcard.tex - Local Variables: coding: iso-2022-7bit End:
--- a/ChangeLog Mon Oct 30 06:52:47 2006 +0000 +++ b/ChangeLog Mon Oct 30 08:54:41 2006 +0000 @@ -1,3 +1,46 @@ +2006-10-29 Chong Yidong <cyd@stupidchicken.com> + + * configure: Regenerate using autoconf 2.59. + +2006-10-29 Jeramey Crawford <jeramey@jeramey.com> + + * configure.in: Enable x86-64 OpenBSD compilation. + +2006-10-28 Glenn Morris <rgm@gnu.org> + + * AUTHORS: Add cal-html.el author. + +2006-10-28 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * make-dist: Make links to mac/make-package and + mac/Emacs.app/Contents/Resources/Emacs.icns. + +2006-10-27 Chong Yidong <cyd@stupidchicken.com> + + * README: Bump version number to 22.0.90. + + * AUTHORS: Regenerate. + + * configure: Regenerate. + +2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu> + + * viper-cmd.el (viper-prefix-arg-com): define gg as G0 + + * viper-ex.el (ex-read): quote file argument. + + * ediff-diff.el (ediff-same-file-contents): expand file names. + + * ediff-mult.el (ediff-append-custom-diff): quote shell file arguments. + +2006-10-23 Andreas Schwab <schwab@suse.de> + + * configure.in: Make sure x_default_search_path is always set even + when x_libraries is empty, and look in .../share as well for each + library directory. + + * configure: Regenerate. + 2006-10-03 Kim F. Storm <storm@cua.dk> * AUTHORS: Regenerate.
--- a/README Mon Oct 30 06:52:47 2006 +0000 +++ b/README Mon Oct 30 08:54:41 2006 +0000 @@ -1,4 +1,4 @@ -This directory tree holds version 22.0.50 of GNU Emacs, the extensible, +This directory tree holds version 22.0.90 of GNU Emacs, the extensible, customizable, self-documenting real-time display editor. You may encounter bugs in this release. If you do, please report
--- a/admin/ChangeLog Mon Oct 30 06:52:47 2006 +0000 +++ b/admin/ChangeLog Mon Oct 30 08:54:41 2006 +0000 @@ -1,3 +1,12 @@ +2006-10-28 Chong Yidong <cyd@stupidchicken.com> + + * make-announcement (OLD): Remove LEIM references in announcement + since it is now built-in. + +2006-10-15 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * admin.el (set-version): Set version numbers in "mac" subdirectory. + 2006-10-03 Kenichi Handa <handa@m17n.org> * FOR-RELEASE (BUGS): "An iso-8859-6 cannot be saved" fixed.
--- a/admin/FOR-RELEASE Mon Oct 30 06:52:47 2006 +0000 +++ b/admin/FOR-RELEASE Mon Oct 30 08:54:41 2006 +0000 @@ -36,15 +36,14 @@ ** Drew Adams 12 Aug bug rpt: overlay display artifact: trace left behind Windows only bug. Bug appears only when Cleartype enabled, probably related -to the hack introduced on 2005-07-01 to fix some other Cleartype problem. +to the hack introduced on 2005-07-01 to fix some other Cleartype problem. ** henman@it.to-be.co.jp 09 Aug 2006: ispell.el problem on Cygwin. (Did we decide that is unreproducible?) * BUGS -** hashiz@tomba.meridiani.jp, Oct 6: bootstrap failure on FreeBSD 6.2 -Can't be reproduced on GNU/Linux. +** david.reitter@gmail.com, Oct 16: url-retrieve may cause hang * DOCUMENTATION
--- a/admin/admin.el Mon Oct 30 06:52:47 2006 +0000 +++ b/admin/admin.el Mon Oct 30 08:54:41 2006 +0000 @@ -97,12 +97,12 @@ (comma-version (concat (car version-components) "," (cadr version-components) "," - (cadr (cdr version-components)) "," + (cadr (cdr version-components)) "," (cadr (cdr (cdr version-components))))) (comma-space-version (concat (car version-components) ", " (cadr version-components) ", " - (cadr (cdr version-components)) ", " + (cadr (cdr version-components)) ", " (cadr (cdr (cdr version-components)))))) (set-version-in-file root "nt/emacs.rc" comma-version (rx (and "FILEVERSION" (1+ space) @@ -116,7 +116,43 @@ (set-version-in-file root "nt/emacs.rc" comma-space-version (rx (and "\"ProductVersion\"" (0+ space) ?, (0+ space) ?\" (submatch (1+ (in "0-9, "))) - "\\0\""))))) + "\\0\""))) + ;; Some files in the "mac" subdirectory also contain the version + ;; number. + (set-version-in-file + root "mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings" + version (rx (and "CFBundleShortVersionString" (0+ space) ?= (0+ space) ?\" + (submatch (1+ (in "0-9.")))))) + (set-version-in-file + root "mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings" + version (rx (and "CFBundleGetInfoString" (0+ space) ?= (0+ space) ?\" + (submatch (1+ (in "0-9.")))))) + (set-version-in-file root "mac/src/Emacs.r" (car version-components) + (rx (and "GNU Emacs " (submatch (1+ (in "0-9"))) + " for Mac OS"))) + (set-version-in-file root "mac/src/Emacs.r" (car version-components) + (rx (and (submatch (1+ (in "0-9"))) (0+ space) ?\, + (0+ space) "/* Major revision in BCD */"))) + (set-version-in-file root "mac/src/Emacs.r" (cadr version-components) + (rx (and (submatch (1+ (in "0-9"))) (0+ space) ?\, + (0+ space) "/* Minor revision in BCD */"))) + (set-version-in-file root "mac/src/Emacs.r" (cadr (cdr version-components)) + (rx (and (submatch (1+ (in "0-9"))) (0+ space) ?\, + (0+ space) "/* Non-final release # */"))) + (set-version-in-file root "mac/src/Emacs.r" version + (rx (and (submatch (1+ (in "0-9."))) (0+ space) ?\" ?\, + (0+ space) "/* Short version number */"))) + (set-version-in-file root "mac/src/Emacs.r" version + (rx (and "/* Short version number */" (0+ space) ?\" + (submatch (1+ (in "0-9.")))))) + (let* ((third-component (string-to-number (cadr (cdr version-components)))) + (release (cond ((>= third-component 90) "alpha") + ((>= third-component 50) "development") + (t "final")))) + (set-version-in-file + root "mac/src/Emacs.r" release + (rx (and (submatch (1+ (in "a-z"))) (0+ space) ?\, (0+ space) + "/* development, alpha, beta, or final (release) */")))))) ;;; arch-tag: 4ea83636-2293-408b-884e-ad64f22a3bf5 ;; admin.el ends here.
--- a/admin/make-announcement Mon Oct 30 06:52:47 2006 +0000 +++ b/admin/make-announcement Mon Oct 30 08:54:41 2006 +0000 @@ -34,18 +34,15 @@ There is a new pretest available in <ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-$NEW.tar.gz> - <ftp://alpha.gnu.org/gnu/emacs/pretest/leim-$NEW.tar.gz> Please report results from compiling and running the pretest to <emacs-pretest-bug@gnu.org>. Your feedback is necessary for us to know on which platforms the pretest has been tried. -Please say whether you built with LEIM or not. If you have the tars from the previous pretest, and you have the \`xdelta' utility, you can instead download the much smaller <ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-$OLD-$NEW.xdelta> - <ftp://alpha.gnu.org/gnu/emacs/pretest/leim-$OLD-$NEW.xdelta> You can use a command like
--- a/configure Mon Oct 30 06:52:47 2006 +0000 +++ b/configure Mon Oct 30 08:54:41 2006 +0000 @@ -991,7 +991,7 @@ else echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi - cd $ac_popdir + cd "$ac_popdir" done fi @@ -1780,6 +1780,7 @@ case "${canonical}" in alpha*-*-openbsd*) machine=alpha ;; i386-*-openbsd*) machine=intel386 ;; + x86_64-*-openbsd*) machine=amdx86-64 ;; m68k-*-openbsd*) machine=hp9000s300 ;; mipsel-*-openbsd*) machine=pmax ;; ns32k-*-openbsd*) machine=ns32000 ;; @@ -3306,8 +3307,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3365,8 +3365,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3482,8 +3481,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3537,8 +3535,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3583,8 +3580,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3628,8 +3624,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4017,8 +4012,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4646,8 +4640,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4873,8 +4866,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4903,8 +4895,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4974,8 +4965,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5027,8 +5017,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5099,8 +5088,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5152,8 +5140,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5227,8 +5214,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5398,8 +5384,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5468,8 +5453,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5623,8 +5607,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5831,8 +5814,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5974,8 +5956,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6094,8 +6075,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6260,8 +6240,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6324,8 +6303,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6398,8 +6376,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6485,8 +6462,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6559,8 +6535,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6630,8 +6605,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6690,8 +6664,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6760,8 +6733,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6822,8 +6794,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6889,8 +6860,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7036,8 +7006,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7101,8 +7070,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7167,8 +7135,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7214,8 +7181,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7289,8 +7255,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7355,8 +7320,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7400,8 +7364,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7472,8 +7435,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7523,8 +7485,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7595,8 +7556,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7646,8 +7606,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7718,8 +7677,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7769,8 +7727,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7841,8 +7798,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7892,8 +7848,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7964,8 +7919,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8015,8 +7969,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8103,8 +8056,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8210,8 +8162,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8271,8 +8222,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8396,6 +8346,7 @@ echo "$as_me:$LINENO: checking for X" >&5 echo $ECHO_N "checking for X... $ECHO_C" >&6 +ac_path_x_has_been_run=yes # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -8488,7 +8439,7 @@ /usr/openwin/share/include' if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for Intrinsic.h. + # Guess where to find include files, by looking for a specified header file. # First, try using that file with no special directory specified. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -8562,8 +8513,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8623,8 +8573,12 @@ # Update the cache value to reflect the command line values. ac_cv_have_x="have_x=yes \ ac_x_includes=$x_includes ac_x_libraries=$x_libraries" - echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 -echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 + # It might be that x_includes is empty (headers are found in the + # standard search path. Then output the corresponding message + ac_out_x_includes=$x_includes + test "x$x_includes" = x && ac_out_x_includes="in standard search path" + echo "$as_me:$LINENO: result: libraries $x_libraries, headers $ac_out_x_includes" >&5 +echo "${ECHO_T}libraries $x_libraries, headers $ac_out_x_includes" >&6 fi if test "$no_x" = yes; then @@ -8633,11 +8587,18 @@ window_system=x11 fi -if test "${x_libraries}" != NONE && test -n "${x_libraries}"; then - LD_SWITCH_X_SITE=-L`echo ${x_libraries} | sed -e "s/:/ -L/g"` - LD_SWITCH_X_SITE_AUX=-R`echo ${x_libraries} | sed -e "s/:/ -R/g"` +if test "${x_libraries}" != NONE; then + if test -n "${x_libraries}"; then + LD_SWITCH_X_SITE=-L`echo ${x_libraries} | sed -e "s/:/ -L/g"` + LD_SWITCH_X_SITE_AUX=-R`echo ${x_libraries} | sed -e "s/:/ -R/g"` + fi x_default_search_path="" - for x_library in `echo ${x_libraries} | sed -e "s/:/ /g"`; do + x_search_path=${x_libraries} + if test -z "${x_search_path}"; then + x_search_path=/usr/lib + fi + for x_library in `echo ${x_search_path}: | \ + sed -e "s/:/ /g" -e p -e "s:/lib[^ /]* :/share :g"`; do x_search_path="\ ${x_library}/X11/%L/%T/%N%C%S:\ ${x_library}/X11/%l/%T/%N%C%S:\ @@ -8706,8 +8667,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8943,8 +8903,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9039,8 +8998,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9099,8 +9057,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9184,8 +9141,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9369,8 +9325,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9622,8 +9577,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9690,8 +9644,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9760,8 +9713,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9846,8 +9798,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9924,8 +9875,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9979,8 +9929,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -10049,8 +9998,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -10154,8 +10102,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -10222,8 +10169,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -10293,8 +10239,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -10535,8 +10480,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -10645,8 +10589,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -10749,8 +10692,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -10828,8 +10770,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -10983,8 +10924,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11058,8 +10998,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11131,8 +11070,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11214,8 +11152,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11294,8 +11231,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11366,8 +11302,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11436,8 +11371,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11510,8 +11444,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11634,8 +11567,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11737,8 +11669,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11818,8 +11749,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12007,8 +11937,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12153,8 +12082,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12506,8 +12434,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12652,8 +12579,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12762,8 +12688,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12908,8 +12833,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -13016,8 +12940,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -13171,8 +13094,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -13247,8 +13169,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -13396,8 +13317,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -13474,8 +13394,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -13696,8 +13615,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -13898,8 +13816,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -13972,8 +13889,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14118,8 +14034,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14195,8 +14110,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14259,8 +14173,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14341,8 +14254,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14483,8 +14395,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14629,8 +14540,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14706,8 +14616,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14936,8 +14845,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -15003,8 +14911,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -15264,8 +15171,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -15332,8 +15238,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -15485,8 +15390,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -15670,8 +15574,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -15998,8 +15901,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16100,8 +16002,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16174,8 +16075,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16254,8 +16154,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16324,8 +16223,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16393,8 +16291,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16468,8 +16365,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16573,8 +16469,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16649,8 +16544,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16802,8 +16696,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16871,8 +16764,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17049,8 +16941,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17126,8 +17017,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17281,8 +17171,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17433,8 +17322,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17585,8 +17473,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17728,8 +17615,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17773,8 +17659,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17920,8 +17805,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17965,8 +17849,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18031,8 +17914,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18122,8 +18004,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18310,8 +18191,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18381,8 +18261,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18451,8 +18330,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18584,8 +18462,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18687,8 +18564,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18757,8 +18633,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18865,8 +18740,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18969,8 +18843,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19046,8 +18919,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19151,8 +19023,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19244,8 +19115,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19310,8 +19180,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19377,8 +19246,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19488,8 +19356,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19554,8 +19421,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19635,8 +19501,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19709,8 +19574,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19783,8 +19647,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19857,8 +19720,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19932,8 +19794,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20005,8 +19866,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20081,8 +19941,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20154,8 +20013,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20228,8 +20086,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20379,8 +20236,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20526,8 +20382,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20673,8 +20528,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20831,8 +20685,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20978,8 +20831,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21125,8 +20977,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21284,8 +21135,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21443,8 +21293,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21633,8 +21482,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21707,8 +21555,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21776,8 +21623,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21823,8 +21669,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21898,8 +21743,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21963,8 +21807,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22102,8 +21945,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22164,8 +22006,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22310,8 +22151,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22467,8 +22307,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22639,8 +22478,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22708,8 +22546,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22894,8 +22731,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -23188,8 +23024,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -23254,8 +23089,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -23318,8 +23152,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -23385,8 +23218,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -23427,8 +23259,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -23495,8 +23326,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -24625,11 +24455,6 @@ *) ac_INSTALL=$ac_top_builddir$INSTALL ;; esac - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ @@ -24668,6 +24493,12 @@ fi;; esac done` || { (exit 1); exit 1; } + + if test x"$ac_file" != x-; then + { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub
--- a/configure.in Mon Oct 30 06:52:47 2006 +0000 +++ b/configure.in Mon Oct 30 08:54:41 2006 +0000 @@ -284,6 +284,7 @@ case "${canonical}" in alpha*-*-openbsd*) machine=alpha ;; i386-*-openbsd*) machine=intel386 ;; + x86_64-*-openbsd*) machine=amdx86-64 ;; m68k-*-openbsd*) machine=hp9000s300 ;; mipsel-*-openbsd*) machine=pmax ;; ns32k-*-openbsd*) machine=ns32000 ;; @@ -1729,11 +1730,18 @@ window_system=x11 fi -if test "${x_libraries}" != NONE && test -n "${x_libraries}"; then - LD_SWITCH_X_SITE=-L`echo ${x_libraries} | sed -e "s/:/ -L/g"` - LD_SWITCH_X_SITE_AUX=-R`echo ${x_libraries} | sed -e "s/:/ -R/g"` +if test "${x_libraries}" != NONE; then + if test -n "${x_libraries}"; then + LD_SWITCH_X_SITE=-L`echo ${x_libraries} | sed -e "s/:/ -L/g"` + LD_SWITCH_X_SITE_AUX=-R`echo ${x_libraries} | sed -e "s/:/ -R/g"` + fi x_default_search_path="" - for x_library in `echo ${x_libraries} | sed -e "s/:/ /g"`; do + x_search_path=${x_libraries} + if test -z "${x_search_path}"; then + x_search_path=/usr/lib + fi + for x_library in `echo ${x_search_path}: | \ + sed -e "s/:/ /g" -e p -e "s:/lib[[^ /]]* :/share :g"`; do x_search_path="\ ${x_library}/X11/%L/%T/%N%C%S:\ ${x_library}/X11/%l/%T/%N%C%S:\
--- a/etc/ChangeLog Mon Oct 30 06:52:47 2006 +0000 +++ b/etc/ChangeLog Mon Oct 30 08:54:41 2006 +0000 @@ -1,3 +1,8 @@ +2006-10-22 Chong Yidong <cyd@stupidchicken.com> + + * emacs.py (eargs): Return expected _emacs_out string even if + errors occur. + 2006-10-09 David Kastrup <dak@gnu.org> * DEVEL.HUMOR: Add the topic line for last entry since that was
--- a/etc/NEWS Mon Oct 30 06:52:47 2006 +0000 +++ b/etc/NEWS Mon Oct 30 08:54:41 2006 +0000 @@ -3368,6 +3368,10 @@ convert Emacs diary entries to/from the iCalendar format. +++ +*** The new package cal-html.el writes HTML files with calendar and +diary entries. + ++++ *** Diary sexp entries can have custom marking in the calendar. Diary sexp functions which only apply to certain days (such as `diary-block' or `diary-cyclic') now take an optional parameter MARK,
--- a/etc/emacs.py Mon Oct 30 06:52:47 2006 +0000 +++ b/etc/emacs.py Mon Oct 30 08:54:41 2006 +0000 @@ -59,13 +59,16 @@ return if inspect.ismethod (func): func = func.im_func - if not inspect.isfunction (func): return + if not inspect.isfunction (func): + print '_emacs_out ' + return (args, varargs, varkw, defaults) = inspect.getargspec (func) # No space between name and arglist for consistency with builtins. print '_emacs_out', \ func.__name__ + inspect.formatargspec (args, varargs, varkw, defaults) - except: pass + except: + print "_emacs_out " def all_names (object): """Return (an approximation to) a list of all possible attribute
--- a/lisp/ChangeLog Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/ChangeLog Mon Oct 30 08:54:41 2006 +0000 @@ -1,3 +1,228 @@ +2006-10-29 Stephen Leake <stephen_leake@stephe_leake.org> + + * progmodes/ada-mode.el: Change maintainer, apply + whitespace-clean, checkdoc. Minor improvements to many doc + strings. + (ada-mode-version): New function. + (ada-create-menu): Menu operations are available for all supported + compilers. + +2006-10-29 Lars Hansen <larsh@soem.dk> + * net/tramp.el (with-parsed-tramp-file-name): Correct debug + spec. Highlight as keyword. + (tramp-do-copy-or-rename-file): Correct data for 'file-already-exists. + Don't call tramp-method-out-of-band-p for local files. + (tramp-touch): Quote file name. + +2006-10-28 Glenn Morris <rgm@gnu.org> + + * calendar/calendar.el (cal-html-cursor-month) + (cal-html-cursor-year): Add autoloads for this new package. + (calendar-mode-map): Bind cal-html-cursor-month, + cal-html-cursor-year. + +2006-10-28 Anna Bigatti <bigatti@dima.unige.it> + + * calendar/cal-html.el: New file. + +2006-10-28 Chong Yidong <cyd@stupidchicken.com> + + * emacs-lisp/authors.el (authors-aliases): Update. + +2006-10-27 Chong Yidong <cyd@stupidchicken.com> + + * version.el (emacs-version): Bump version number to 22.0.90. + +2006-10-26 John W. Eaton <jwe@octave.org> + + * progmodes/octave-inf.el (inferior-octave-has-built-in-variables): + New defvar. + (inferior-octave-resync-dirs): Check to see whether Octave has + built-in variables and set inferior-octave-has-built-in-variables. + Check inferior-octave-has-built-in-variables to decide whether to + send commands that set built-in variables or call functions to + change Octave's behavior. + Send "disp (pwd ())" to Octave instead of just "pwd". + (inferior-octave-startup): Send "more off" to Octave instead of + "page_screen_output = 0". + +2006-10-26 Chong Yidong <cyd@stupidchicken.com> + + * emacs-lisp/cl-indent.el (lisp-indent-259): Indent nil's in the + pattern normally. + +2006-10-26 Nick Roberts <nickrob@snap.net.nz> + + * bindings.el (mode-line-mode-menu): Remove bindings for global + minor modes (line/column number) as they are on the menubar. + +2006-10-25 Juanma Barranquero <lekktu@gmail.com> + + * term/w32-win.el (x-handle-name-switch): Doc fix. + (w32-standard-fontset-spec): Fix typo in docstring. + + * midnight.el (midnight-buffer-display-time): Doc fix. + (clean-buffer-list-kill-never-buffer-names): Add "*server*". + +2006-10-22 martin rudalics <rudalics@gmx.at> + + * textmodes/flyspell.el (flyspell-check-region-doublons): + Fix last fix. + +2006-10-23 Nick Roberts <nickrob@snap.net.nz> + + * bindings.el (mode-line-mode-menu): List global minor modes + before local ones. + +2006-10-23 Kim F. Storm <storm@cua.dk> + + * subr.el (add-to-list): Optimize if compare-fn is `eq' or `eql'. + (sit-for): If last command was a prefix arg, add the read-ahead + event to unread-command-events as (t . EVENT) so it will be added + to this-command-keys by read-key-sequence. + +2006-10-22 martin rudalics <rudalics@gmx.at> + + * textmodes/flyspell.el (flyspell-word): Skip past all previous + whitespace when checking doublons. + (flyspell-check-region-doublons): Fix doublon regexp. + (flyspell-highlight-incorrect-region): Highlight doublons using + flyspell-duplicate face. + + * progmodes/cperl-mode.el (cperl-invalid-face): Fix defcustom. + +2006-10-22 John Wiegley <johnw@newartisans.com> + + * progmodes/python.el (python-use-skeletons): python-mode was + auto-inserting templates (for those with abbrev-mode on), not only + by default -- *but without a configuration variable to disable + it*. This rendered python-mode completely useless for me, so I + have added `python-use-skeletons', which is now off by default. + +2006-10-22 Chong Yidong <cyd@stupidchicken.com> + + * progmodes/cperl-mode.el (cperl-mode): Don't assume + font-lock-multiline is auto-local (it's not). + (cperl-windowed-init): Ensure that cperl-font-lock-multiline is + initialized before calling cperl-init-faces. + +2006-10-22 Nick Roberts <nickrob@snap.net.nz> + + * progmodes/gdb-ui.el (gdb-info-stack-custom): Don't try to give + gdb-stack-position a value when there is no fringe. + + * bindings.el (mode-line-mode-menu): Disable auto-revert-tail-mode + indicator if not visiting a file. + +2006-10-20 David Kastrup <dak@gnu.org> + + * window.el (kill-buffer-and-window): Fix a bug where an aborted + operation would still cause some window to collapse later. + +2006-10-20 Stefan Monnier <monnier@iro.umontreal.ca> + + * vc.el (vc-switch-backend): Try to be more careful with unwanted + side-effect due to mixing various backends's file properties. + + * vc-svn.el (vc-svn-parse-status): Remove unused arg `localp'. + Add arg `filename' instead. Don't set vc-backend if `filename' is set. + Return `filename's status if applicable. Update callers. + +2006-10-19 Kenichi Handa <handa@m17n.org> + + * international/kkc.el (kkc-region): When a key sequence is not + defined, append (this-single-command-raw-keys) to + unread-input-method-events. + +2006-10-19 Juanma Barranquero <lekktu@gmail.com> + + * progmodes/ada-mode.el (ada-in-string-p): Doc fix. + +2006-10-19 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * version.el (emacs-version): Use mac-carbon-version-string. + + * term/macterm.el (res-geometry): Apply 2006-10-18 change for x-win.el. + +2006-10-19 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> + + * select.el (ccl-check-utf-8, string-utf-8-p): New functions + (by Kenichi Handa). + (xselect-convert-to-string): Decline requests for UTF8_STRING if + the selection is not UTF-8. + +2006-10-18 Juanma Barranquero <lekktu@gmail.com> + + * progmodes/ada-mode.el (ada-83-string-keywords) + (ada-last-which-function-line ada-no-auto-case, ada-indent-region) + (ada-which-compiler, ada-align-modes, ada-adjust-case-buffer) + (ada-looking-at-semi-private, ada-get-body-name): + Fix typos in docstrings. + (ada-create-case-exception, ada-create-case-exception-substring): + Fix typos in error messages. + (ada-goto-matching-end, ada-narrow-to-defun): Doc fixes. + +2006-10-18 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> + + * term/x-win.el (res-geometry): Don't set geometry from Xresources + to default-frame-alist if default-frame-alist already contains + width/height. + +2006-10-18 Richard Stallman <rms@gnu.org> + + * emacs-lisp/pp.el (pp-eval-expression): Use `X' to read value. + Non-interactive arg is the value, not the expression. + + * simple.el (read-expression-map): Just set it, no defvar. + + * subr.el (insert-for-yank-1): If last inserted char has + properties, mark them as rear-nonsticky. + + * recentf.el (recentf-mode): Doc fix. + + * facemenu.el (facemenu-add-new-face): Defend against symbol + that isn't a face name. + + * dired-aux.el (dired-do-copy): Doc fix. + +2006-10-18 Chong Yidong <cyd@stupidchicken.com> + + * simple.el (line-move-1): Ignore fields when moving to the + beginning of line to avoid getting point stuck. + +2006-10-18 Martin Rudalics <rudalics@gmx.at> + + * textmodes/flyspell.el (flyspell-word-search-backward): + Set inhibit-point-motion-hooks to avoid looping due to intangibile + text. + +2006-10-16 Richard Stallman <rms@gnu.org> + + * help-fns.el (describe-function-1): Special case optimization + for self-insert-command. + +2006-10-16 Kim F. Storm <storm@cua.dk> + + * ido.el (ido-reread-directory): Work in `dir' mode too. + +2006-10-15 Martin Rudalics <rudalics@gmx.at> + + * textmodes/table.el: Require 'regexp-opt. + +2006-10-15 Lennart Borgman <lennart.borgman.073@student.lu.se> + + * progmodes/flymake.el (flymake-get-project-include-dirs-imp): + Use shell-quote-argument. + + * shell.el (explicit-bash-args): Likewise. + + * progmodes/ada-xref.el (ada-find-in-src-path): Likewise. + Use grep -E rather than egrep. + +2006-10-15 Micha,Ak(Bl Cadilhac <michael.cadilhac@lrde.org> + + * ido.el (ido-exhibit): Allow `-', `_', and trailing `$' in user id. + 2006-10-15 Kim F. Storm <storm@cua.dk> * filesets.el (filesets-run-cmd--repl-fn): Use shell-quote-argument. @@ -9,8 +234,7 @@ 2006-10-13 Giorgos Keramidas <keramida@ceid.upatras.gr> (tiny change) - * apropos.el (apropos-pattern-quoted): Fix a typo in a doc - string. + * apropos.el (apropos-pattern-quoted): Fix a typo in a doc string. 2006-10-13 Eli Zaretskii <eliz@gnu.org> @@ -33,8 +257,8 @@ 2006-10-12 Carsten Dominik <dominik@science.uva.nl> - * textmodes/reftex-global.el (reftex-create-tags-file): Quote file - arguments. + * textmodes/reftex-global.el (reftex-create-tags-file): + Quote file arguments. 2006-10-12 Richard Stallman <rms@gnu.org> @@ -230,7 +454,7 @@ After 5.10: - This code may lock Emacs hard!!! Use on your own risk! + This code may lock Emacs hard!!! Use at your own risk! (cperl-font-locking): New internal variable. (cperl-beginning-of-property): New function. @@ -244,7 +468,7 @@ recursively. Bound `next-single-property-change' via `point-max'. (cperl-unwind-to-safe): Bound likewise - (cperl-font-lock-fontify-region-function): Likewise + (cperl-font-lock-fontify-region-function): Likewise. (cperl-find-pods-heres): Mark as recursive for `cperl-to-comment-or-eol' Initialization of `cperl-font-lock-multiline-start' could be missed if the "main" fontification did not run due to the @@ -399,7 +623,7 @@ was inverted; Support `comment-column' = 0. -2006-10-11 Martin Rudalics <rudalics@gmx.at> +2006-10-11 Martin Rudalics <rudalics@gmx.at> * dnd.el (dnd-handle-one-url): Fix typo in doc-string. * help-at-pt.el (scan-buf-move-to-region): Likewise. @@ -443,8 +667,8 @@ 2006-10-08 Nick Roberts <nickrob@snap.net.nz> - * progmodes/gdb-ui.el (gdb-speedbar-expand-node): Burp if - GUD buffer has been killed. + * progmodes/gdb-ui.el (gdb-speedbar-expand-node): + Burp if GUD buffer has been killed. 2006-10-07 Stefan Monnier <monnier@iro.umontreal.ca> @@ -471,7 +695,7 @@ * autoinsert.el (auto-insert-alist): Doc fix. -2006-10-07 Johan Bockg,be(Brd <bojohan@dd.chalmers.se> +2006-10-07 Johan Bockg,Ae(Brd <bojohan@dd.chalmers.se> * mouse-sel.el (mouse-insert-selection-internal): Use insert-for-yank, so that yank handlers are run. @@ -1972,7 +2196,7 @@ (python-symbol-completions): Use python-imports. (python-module-path, ffap-alist): Add support for ffap. (python-skeletons, python-mode-abbrev-table, def-python-skeleton) - (pythin-insert-*, python-default-template, python-expand-template): + (python-insert-*, python-default-template, python-expand-template): Add templates/skeletons. (python-setup-brm): Support for Bicycle Repair Man. (python-abbrev-syntax-table): New var. @@ -26846,7 +27070,7 @@ * emacs-lisp/lisp-mode.el (lisp-mode-variables): Add ;;;###autoload to `outline-regexp'. Suggested by Stefan Monnier - <monnier@iro.umontreal.ca> + <monnier@iro.umontreal.ca>. (lisp-outline-level): Improve efficiency. Suggested by David Kastrup <dak@gnu.org>. @@ -27258,7 +27482,7 @@ * progmodes/gdb-ui.el (gdb-info-breakpoints-custom) (gdb-goto-breakpoint): Make breakpoint handling work on template - functions in C++. Reported by Martin Reed <mjreed@essex.ac.uk> + functions in C++. Reported by Martin Reed <mjreed@essex.ac.uk>. (gdb-assembler-custom): Update to recognize breakpoint information added on 2005-01-19. @@ -27531,10 +27755,10 @@ (tramp-do-copy-or-rename-file-directly): Mask `cp -p' error. Call `set-file-modes' when appropriate. (tramp-action-out-of-band): Mask `scp -p' error. Reported by Isak - Johnsson <isak@hypergene.com> + Johnsson <isak@hypergene.com>. (tramp-get-buffer, tramp-get-debug-buffer): Discard the undo list of both Tramp buffer and debug buffer. Reported by Joakim Verona - <joakim@verona.se> + <joakim@verona.se>. (tramp-file-name-for-operation): Mark `shell-command' as magic for Emacs only. @@ -27580,7 +27804,7 @@ * simple.el (eval-expression-print-format): Avoid warning about edebug-active. -2005-01-15 James R. Van Zandt <jrvz@comcast.net> (Tiny change) +2005-01-15 James R. Van Zandt <jrvz@comcast.net> (tiny change) * progmodes/sh-script.el: Code copied from make-mode.el with small changes,
--- a/lisp/bindings.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/bindings.el Mon Oct 30 08:54:41 2006 +0000 @@ -426,15 +426,14 @@ "Return the value of symbol VAR if it is bound, else nil." `(and (boundp (quote ,var)) ,var)) +;; Use mode-line-mode-menu for local minor-modes only. +;; Global ones can go on the menubar (Options --> Show/Hide). (define-key mode-line-mode-menu [overwrite-mode] `(menu-item ,(purecopy "Overwrite (Ovwrt)") overwrite-mode :button (:toggle . overwrite-mode))) (define-key mode-line-mode-menu [outline-minor-mode] `(menu-item ,(purecopy "Outline (Outl)") outline-minor-mode :button (:toggle . (bound-and-true-p outline-minor-mode)))) -(define-key mode-line-mode-menu [line-number-mode] - `(menu-item ,(purecopy "Line number") line-number-mode - :button (:toggle . line-number-mode))) (define-key mode-line-mode-menu [highlight-changes-mode] `(menu-item ,(purecopy "Highlight changes (Chg)") highlight-changes-mode :button (:toggle . (bound-and-true-p highlight-changes-mode)))) @@ -450,11 +449,9 @@ (define-key mode-line-mode-menu [flyspell-mode] `(menu-item ,(purecopy "Flyspell (Fly)") flyspell-mode :button (:toggle . (bound-and-true-p flyspell-mode)))) -(define-key mode-line-mode-menu [column-number-mode] - `(menu-item ,(purecopy "Column number") column-number-mode - :button (:toggle . column-number-mode))) (define-key mode-line-mode-menu [auto-revert-tail-mode] `(menu-item ,(purecopy "Auto revert tail (Tail)") auto-revert-tail-mode + :enable (buffer-file-name) :button (:toggle . (bound-and-true-p auto-revert-tail-mode)))) (define-key mode-line-mode-menu [auto-revert-mode] `(menu-item ,(purecopy "Auto revert (ARev)") auto-revert-mode
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/lisp/calendar/cal-html.el Mon Oct 30 08:54:41 2006 +0000 @@ -0,0 +1,445 @@ +;;; cal-html.el --- functions for printing HTML calendars + +;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + +;; Author: Anna M. Bigatti <bigatti@dima.unige.it> +;; Keywords: calendar +;; Human-Keywords: calendar, diary, HTML +;; Created: 23 Aug 2002 + +;; 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. + +;;; Commentary: + +;; This package writes HTML calendar files using the user's diary +;; file. See the Emacs manual for details. + + +;;; Code: + +(require 'calendar) + + +(defgroup calendar-html nil + "Options for HTML calendars." + :prefix "cal-html-" + :group 'calendar) + +(defcustom cal-html-directory "~/public_html" + "Directory for HTML pages generated by cal-html." + :type 'string + :group 'calendar-html) + +(defcustom cal-html-print-day-number-flag nil + "Non-nil means print the day-of-the-year number in the monthly cal-html page." + :type 'boolean + :group 'calendar-html) + +(defcustom cal-html-year-index-cols 3 + "Number of columns in the cal-html yearly index page." + :type 'integer + :group 'calendar-html) + +(defcustom cal-html-day-abbrev-array + (calendar-abbrev-construct calendar-day-abbrev-array + calendar-day-name-array) + "Array of seven strings for abbreviated day names (starting with Sunday)." + :type '(vector string string string string string string string) + :group 'calendar-html) + +(defcustom cal-html-css-default + (concat + "<STYLE TYPE=\"text/css\">\n" + " BODY { background: #bde; }\n" + " H1 { text-align: center; }\n" + " TABLE { padding: 2pt; }\n" + " TH { background: #dee; }\n" + " TABLE.year { width: 100%; }\n" + " TABLE.agenda { width: 100%; }\n" + " TABLE.header { width: 100%; text-align: center; }\n" + " TABLE.minical TD { background: white; text-align: center; }\n" + " TABLE.agenda TD { background: white; text-align: left; }\n" + " TABLE.agenda TH { text-align: left; width: 20%; }\n" + " SPAN.NO-YEAR { color: #0b3; font-weight: bold; }\n" + " SPAN.ANN { color: #0bb; font-weight: bold; }\n" + " SPAN.BLOCK { color: #048; font-style: italic; }\n" + "</STYLE>\n\n") + "Default cal-html css style. You can override this with a \"cal.css\" file." + :type 'string + :group 'calendar-html) + +;;; End customizable variables. + + +;;; HTML and CSS code constants. + +(defconst cal-html-e-document-string "<BR><BR>\n</BODY>\n</HTML>" + "HTML code for end of page.") + +(defconst cal-html-b-tablerow-string "<TR>\n" + "HTML code for beginning of table row.") + +(defconst cal-html-e-tablerow-string "</TR>\n" + "HTML code for end of table row.") + +(defconst cal-html-b-tabledata-string " <TD>" + "HTML code for beginning of table data.") + +(defconst cal-html-e-tabledata-string " </TD>\n" + "HTML code for end of table data.") + +(defconst cal-html-b-tableheader-string " <TH>" + "HTML code for beginning of table header.") + +(defconst cal-html-e-tableheader-string " </TH>\n" + "HTML code for end of table header.") + +(defconst cal-html-e-table-string + "</TABLE>\n<!-- ================================================== -->\n" + "HTML code for end of table.") + +(defconst cal-html-minical-day-format " <TD><a href=%s#%d>%d</TD>\n" + "HTML code for a day in the minical - links NUM to month-page#NUM.") + +(defconst cal-html-b-document-string + (concat + "<HTML>\n" + "<HEAD>\n" + "<TITLE>Calendar</TITLE>\n" + "<!--This buffer was produced by cal-html.el-->\n\n" + cal-html-css-default + "<LINK REL=\"stylesheet\" TYPE=\"text/css\" HREF=\"cal.css\">\n" + "</HEAD>\n\n" + "<BODY>\n\n") + "Initial block for html page.") + +(defconst cal-html-html-subst-list + '(("&" . "&") + ("\n" . "<BR>\n")) + "Alist of symbols and their HTML replacements.") + + + +(defun cal-html-comment (string) + "Return STRING as html comment." + (format "<!-- ====== %s ====== -->\n" + (replace-regexp-in-string "--" "++" string))) + +(defun cal-html-href (link string) + "Return a hyperlink to url LINK with text STRING." + (format "<A HREF=\"%s\">%s</A>" link string)) + +(defun cal-html-h3 (string) + "Return STRING as html header h3." + (format "\n <H3>%s</H3>\n" string)) + +(defun cal-html-h1 (string) + "Return STRING as html header h1." + (format "\n <H1>%s</H1>\n" string)) + +(defun cal-html-th (string) + "Return STRING as html table header." + (format "%s%s%s" cal-html-b-tableheader-string string + cal-html-e-tableheader-string)) + +(defun cal-html-b-table (arg) + "Return table tag with attribute ARG." + (format "\n<TABLE %s>\n" arg)) + +(defun cal-html-monthpage-name (month year) + "Return name of html page for numeric MONTH and four-digit YEAR. +For example, \"2006-08.html\" for 8 2006." + (format "%d-%.2d.html" year month)) + + +(defun cal-html-insert-link-monthpage (month year &optional change-dir) + "Insert a link to the html page for numeric MONTH and four-digit YEAR. +If optional argument CHANGE-DIR is non-nil and MONTH is 1 or 2, +the link points to a different year and so has a directory part." + (insert (cal-html-h3 + (cal-html-href + (concat (and change-dir + (member month '(1 12)) + (format "../%d/" year)) + (cal-html-monthpage-name month year)) + (calendar-month-name month))))) + + +(defun cal-html-insert-link-yearpage (month year) + "Insert a link to index page for four-digit YEAR, tagged using MONTH name." + (insert (cal-html-h1 + (format "%s %s" + (calendar-month-name month) + (cal-html-href "index.html" (number-to-string year)))))) + + +(defun cal-html-year-dir-ask-user (year) + "Prompt for the html calendar output directory for four-digit YEAR. +Return the expanded directory name, which is based on +`cal-html-directory' by default." + (expand-file-name (read-directory-name + "Enter HTML calendar directory name: " + (expand-file-name (format "%d" year) + cal-html-directory)))) + +;;------------------------------------------------------------ +;; page header +;;------------------------------------------------------------ +(defun cal-html-insert-month-header (month year) + "Insert the header for the numeric MONTH page for four-digit YEAR. +Contains links to previous and next month and year, and current minical." + (insert (cal-html-b-table "class=header")) + (insert cal-html-b-tablerow-string) + (insert cal-html-b-tabledata-string) ; month links + (increment-calendar-month month year -1) ; previous month + (cal-html-insert-link-monthpage month year t) ; t --> change-dir + (increment-calendar-month month year 1) ; current month + (cal-html-insert-link-yearpage month year) + (increment-calendar-month month year 1) ; next month + (cal-html-insert-link-monthpage month year t) ; t --> change-dir + (insert cal-html-e-tabledata-string) + (insert cal-html-b-tabledata-string) ; minical + (increment-calendar-month month year -1) + (cal-html-insert-minical month year) + (insert cal-html-e-tabledata-string) + (insert cal-html-e-tablerow-string) ; end + (insert cal-html-e-table-string)) + +;;------------------------------------------------------------ +;; minical: a small month calendar with links +;;------------------------------------------------------------ +(defun cal-html-insert-minical (month year) + "Insert a minical for numeric MONTH of YEAR." + (let* ((blank-days ; at start of month + (mod (- (calendar-day-of-week (list month 1 year)) + calendar-week-start-day) + 7)) + (last (calendar-last-day-of-month month year)) + (end-blank-days ; at end of month + (mod (- 6 (- (calendar-day-of-week (list month last year)) + calendar-week-start-day)) + 7)) + (monthpage-name (cal-html-monthpage-name month year)) + date) + ;; Start writing table. + (insert (cal-html-comment "MINICAL") + (cal-html-b-table "class=minical border=1 align=center")) + ;; Weekdays row. + (insert cal-html-b-tablerow-string) + (dotimes (i 7) + (insert (cal-html-th + (aref cal-html-day-abbrev-array + (mod (+ i calendar-week-start-day) 7))))) + (insert cal-html-e-tablerow-string) + ;; Initial empty slots. + (insert cal-html-b-tablerow-string) + (dotimes (i blank-days) + (insert + cal-html-b-tabledata-string + cal-html-e-tabledata-string)) + ;; Numbers. + (dotimes (i last) + (insert (format cal-html-minical-day-format monthpage-name i (1+ i))) + ;; New row? + (if (and (zerop (mod (+ i 1 blank-days) 7)) + (/= (1+ i) last)) + (insert cal-html-e-tablerow-string + cal-html-b-tablerow-string))) + ;; End empty slots (for some browsers like konqueror). + (dotimes (i end-blank-days) + (insert + cal-html-b-tabledata-string + cal-html-e-tabledata-string))) + (insert cal-html-e-tablerow-string + cal-html-e-table-string + (cal-html-comment "MINICAL end"))) + + +;;------------------------------------------------------------ +;; year index page with minicals +;;------------------------------------------------------------ +(defun cal-html-insert-year-minicals (year cols) + "Make a one page yearly mini-calendar for four-digit YEAR. +There are 12/cols rows of COLS months each." + (insert cal-html-b-document-string) + (insert (cal-html-h1 (number-to-string year))) + (insert (cal-html-b-table "class=year") + cal-html-b-tablerow-string) + (dotimes (i 12) + (insert cal-html-b-tabledata-string) + (cal-html-insert-link-monthpage (1+ i) year) + (cal-html-insert-minical (1+ i) year) + (insert cal-html-e-tabledata-string) + (if (zerop (mod (1+ i) cols)) + (insert cal-html-e-tablerow-string + cal-html-b-tablerow-string))) + (insert cal-html-e-tablerow-string + cal-html-e-table-string + cal-html-e-document-string)) + + +;;------------------------------------------------------------ +;; HTMLify +;;------------------------------------------------------------ + +(defun cal-html-htmlify-string (string) + "Protect special characters in STRING from HTML. +Characters are replaced according to `cal-html-html-subst-list'." + (if (stringp string) + (replace-regexp-in-string + (regexp-opt (mapcar 'car cal-html-html-subst-list)) + (lambda (x) + (cdr (assoc x cal-html-html-subst-list))) + string) + "")) + + +(defun cal-html-htmlify-entry (entry) + "Convert a diary entry ENTRY to html with the appropriate class specifier." + (let ((start + (cond + ((string-match "block" (car (cddr entry))) "BLOCK") + ((string-match "anniversary" (car (cddr entry))) "ANN") + ((not (string-match + (number-to-string (car (cddr (car entry)))) + (car (cddr entry)))) + "NO-YEAR") + (t "NORMAL")))) + (format "<span class=%s>%s</span>" start + (cal-html-htmlify-string (cadr entry))))) + + +(defun cal-html-htmlify-list (date-list date) + "Return a string of concatenated, HTMLified diary entries. +DATE-LIST is a list of diary entries. Return only those matching DATE." + (mapconcat (lambda (x) (cal-html-htmlify-entry x)) + (let (result) + (dolist (p date-list (reverse result)) + (and (car p) + (calendar-date-equal date (car p)) + (setq result (cons p result))))) + "<BR>\n ")) + + +;;------------------------------------------------------------ +;; Monthly calendar +;;------------------------------------------------------------ + +(autoload 'diary-list-entries "diary-lib" nil t) + +(defun cal-html-list-diary-entries (d1 d2) + "Generate a list of all diary-entries from absolute date D1 to D2." + (let (diary-display-hook) + (diary-list-entries + (calendar-gregorian-from-absolute d1) + (1+ (- d2 d1))))) + + +(defun cal-html-insert-agenda-days (month year diary-list) + "Insert HTML commands for a range of days in monthly calendars. +HTML commands are inserted for the days of the numeric MONTH in +four-digit YEAR. Diary entries in DIARY-LIST are included." + (let ((blank-days ; at start of month + (mod (- (calendar-day-of-week (list month 1 year)) + calendar-week-start-day) + 7)) + (last (calendar-last-day-of-month month year)) + date) + (insert "<a name=0>\n") + (insert (cal-html-b-table "class=agenda border=1")) + (dotimes (i last) + (setq date (list month (1+ i) year)) + (insert + (format "<a name=%d></a>\n" (1+ i)) ; link + cal-html-b-tablerow-string + ;; Number & day name. + cal-html-b-tableheader-string + (if cal-html-print-day-number-flag + (format "<em>%d</em> " + (calendar-day-number date)) + "") + (format "%d %s" (1+ i) + (aref calendar-day-name-array + (calendar-day-of-week date))) + cal-html-e-tableheader-string + ;; Diary entries. + cal-html-b-tabledata-string + (cal-html-htmlify-list diary-list date) + cal-html-e-tabledata-string + cal-html-e-tablerow-string) + ;; If end of week and not end of month, make new table. + (if (and (zerop (mod (+ i 1 blank-days) 7)) + (/= (1+ i) last)) + (insert cal-html-e-table-string + (cal-html-b-table + "class=agenda border=1"))))) + (insert cal-html-e-table-string)) + + +(defun cal-html-one-month (month year dir) + "Write an HTML calendar file for numeric MONTH of YEAR in directory DIR." + (let ((diary-list (cal-html-list-diary-entries + (calendar-absolute-from-gregorian (list month 1 year)) + (calendar-absolute-from-gregorian + (list month + (calendar-last-day-of-month month year) + year))))) + (with-temp-buffer + (insert cal-html-b-document-string) + (cal-html-insert-month-header month year) + (cal-html-insert-agenda-days month year diary-list) + (insert cal-html-e-document-string) + (write-file (expand-file-name + (cal-html-monthpage-name month year) dir))))) + + +;;; User commands. + +(defun cal-html-cursor-month (month year dir) + "Write an HTML calendar file for numeric MONTH of four-digit YEAR. +The output directory DIR is created if necessary. Interactively, +MONTH and YEAR are taken from the calendar cursor position. Note +that any existing output files are overwritten." + (interactive (let* ((date (calendar-cursor-to-date t)) + (month (extract-calendar-month date)) + (year (extract-calendar-year date))) + (list month year (cal-html-year-dir-ask-user year)))) + (make-directory dir t) + (cal-html-one-month month year dir)) + +(defun cal-html-cursor-year (year dir) + "Write HTML calendar files (index and monthly pages) for four-digit YEAR. +The output directory DIR is created if necessary. Interactively, +YEAR is taken from the calendar cursor position. Note that any +existing output files are overwritten." + (interactive (let ((year (extract-calendar-year + (calendar-cursor-to-date t)))) + (list year (cal-html-year-dir-ask-user year)))) + (make-directory dir t) + (with-temp-buffer + (cal-html-insert-year-minicals year cal-html-year-index-cols) + (write-file (expand-file-name "index.html" dir))) + (dotimes (i 12) + (cal-html-one-month (1+ i) year dir))) + + +(provide 'cal-html) + + +;; arch-tag: 4e73377d-d2c1-46ea-a103-02c111da5f57 +;;; cal-html.el ends here
--- a/lisp/calendar/calendar.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/calendar/calendar.el Mon Oct 30 08:54:41 2006 +0000 @@ -2012,6 +2012,18 @@ "Make a buffer with LaTeX commands for a year's calendar (Filofax). Optional prefix argument specifies number of years." t) +(autoload 'cal-html-cursor-month "cal-html" + "Write an HTML calendar file for numeric MONTH of four-digit YEAR. +The output directory DIR is created if necessary. Interactively, +MONTH and YEAR are taken from the calendar cursor position. Note +that any existing output files are overwritten." t) + +(autoload 'cal-html-cursor-year "cal-html" + "Write HTML calendar files (index and monthly pages) for four-digit YEAR. +The output directory DIR is created if necessary. Interactively, +YEAR is taken from the calendar cursor position. Note that any +existing output files are overwritten." t) + (autoload 'mark-calendar-holidays "holidays" "Mark notable days in the calendar window." t) @@ -2288,6 +2300,8 @@ (define-key map "iBm" 'insert-monthly-bahai-diary-entry) (define-key map "iBy" 'insert-yearly-bahai-diary-entry) (define-key map "?" 'calendar-goto-info-node) + (define-key map "Hm" 'cal-html-cursor-month) + (define-key map "Hy" 'cal-html-cursor-year) (define-key map "tm" 'cal-tex-cursor-month) (define-key map "tM" 'cal-tex-cursor-month-landscape) (define-key map "td" 'cal-tex-cursor-day)
--- a/lisp/dired-aux.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/dired-aux.el Mon Oct 30 08:54:41 2006 +0000 @@ -1560,7 +1560,10 @@ and new copies of these files are made in that directory with the same names that the files currently have. The default suggested for the target directory depends on the value of -`dired-dwim-target', which see." +`dired-dwim-target', which see. + +This command copies symbolic links by creating new ones, +like `cp -d'." (interactive "P") (let ((dired-recursive-copies dired-recursive-copies)) (dired-do-create-files 'copy (function dired-copy-file)
--- a/lisp/ediff-diff.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/ediff-diff.el Mon Oct 30 08:54:41 2006 +0000 @@ -1450,7 +1450,9 @@ (condition-case nil (let ((res (apply 'call-process ediff-cmp-program nil nil nil - (append ediff-cmp-options (list f1 f2))))) + (append ediff-cmp-options (list (expand-file-name f1) + (expand-file-name f2)))) + )) (and (numberp res) (eq res 0))) (error (format "Cannot execute program %S." ediff-cmp-program))) ))
--- a/lisp/ediff-mult.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/ediff-mult.el Mon Oct 30 08:54:41 2006 +0000 @@ -1637,11 +1637,15 @@ (set-buffer (setq tmp-buf (get-buffer-create ediff-tmp-buffer))) (erase-buffer) (shell-command - (format "%s %s %s %s" - ediff-custom-diff-program ediff-custom-diff-options - (ediff-get-session-objA-name session) - (ediff-get-session-objB-name session)) - t)) + (format + "%s %s %s %s" + (shell-quote-argument ediff-custom-diff-program) + ediff-custom-diff-options + (shell-quote-argument (ediff-get-session-objA-name session)) + (shell-quote-argument (ediff-get-session-objB-name session)) + ) + t) + ) (save-excursion (set-buffer meta-diff-buff) (goto-char (point-max))
--- a/lisp/ediff.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/ediff.el Mon Oct 30 08:54:41 2006 +0000 @@ -8,7 +8,7 @@ ;; Keywords: comparing, merging, patching, tools, unix (defconst ediff-version "2.81.1" "The current version of Ediff") -(defconst ediff-date "September 18, 2006" "Date of last update") +(defconst ediff-date "October 23, 2006" "Date of last update") ;; This file is part of GNU Emacs.
--- a/lisp/emacs-lisp/authors.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/emacs-lisp/authors.el Mon Oct 30 08:54:41 2006 +0000 @@ -105,6 +105,7 @@ ("Matt Swift" "Matthew Swift") ("Michael R. Mauger" "Michael Mauger") ("Michael D. Ernst" "Michael Ernst") + ("Micha,Ak(Bl Cadilhac" "Michael Cadilhac") ("Michael I. Bushnell" "Michael I Bushnell" "Michael I. Bushnell, P/Bsg") ("Mikio Nakajima" "Nakajima Mikio") ("Paul Eggert" "eggert")
--- a/lisp/emacs-lisp/cl-indent.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/emacs-lisp/cl-indent.el Mon Oct 30 08:54:41 2006 +0000 @@ -373,14 +373,16 @@ ;; Too few elements in pattern. (throw 'exit normal-indent))) ((eq tem 'nil) - (throw 'exit (list normal-indent containing-form-start))) - ((eq tem '&lambda) - (throw 'exit - (cond ((null p) - (list (+ sexp-column 4) containing-form-start)) - ((null (cdr p)) - (+ sexp-column 1)) - (t normal-indent)))) + (throw 'exit (if (consp normal-indent) + normal-indent + (list normal-indent containing-form-start)))) + ((eq tem '&lambda) + (throw 'exit + (cond ((null p) + (list (+ sexp-column 4) containing-form-start)) + ((null (cdr p)) + (+ sexp-column 1)) + (t normal-indent)))) ((integerp tem) (throw 'exit (if (null p) ;not in subforms
--- a/lisp/emacs-lisp/pp.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/emacs-lisp/pp.el Mon Oct 30 08:54:41 2006 +0000 @@ -97,13 +97,16 @@ (princ (pp-to-string object) (or stream standard-output))) ;;;###autoload -(defun pp-eval-expression (expression) - "Evaluate EXPRESSION and pretty-print value into a new display buffer. -If the pretty-printed value fits on one line, the message line is used -instead. The value is also consed onto the front of the list -in the variable `values'." - (interactive "xPp-eval: ") - (setq values (cons (eval expression) values)) +(defun pp-eval-expression (expval) + "Evaluate an expression, then pretty-print value EXPVAL into a new buffer. +If pretty-printed EXPVAL fits on one line, display it in the echo +area instead. Also add EXPVAL to the front of the list +in the variable `values'. + +Non-interactively, the argument is the value, EXPVAL, not the expression +to evaluate." + (interactive "XPp-eval: ") + (setq values (cons expval values)) (let* ((old-show-function temp-buffer-show-function) ;; Use this function to display the buffer. ;; This function either decides not to display it at all
--- a/lisp/emulation/viper-cmd.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/emulation/viper-cmd.el Mon Oct 30 08:54:41 2006 +0000 @@ -408,7 +408,6 @@ ) - (defun viper-adjust-keys-for (state) "Make necessary adjustments to keymaps before entering STATE." (cond ((memq state '(insert-state replace-state)) @@ -1263,65 +1262,69 @@ (setq com char) (setq char (read-char)))))) - (if (atom com) - ;; `com' is a single char, so we construct the command argument - ;; and if `char' is `?', we describe the arg; otherwise - ;; we prepare the command that will be executed at the end. - (progn - (setq cmd-info (cons value com)) - (while (viper= char ?U) - (viper-describe-arg cmd-info) - (setq char (read-char))) - ;; `char' is a movement cmd, a digit arg cmd, or a register cmd---so we - ;; execute it at the very end - (or (viper-movement-command-p char) - (viper-digit-command-p char) - (viper-regsuffix-command-p char) - (viper= char ?!) ; bang command - (error "")) - (setq cmd-to-exec-at-end - (viper-exec-form-in-vi - `(key-binding (char-to-string ,char))))) - - ;; as com is non-nil, this means that we have a command to execute - (if (viper-memq-char (car com) '(?r ?R)) - ;; execute apropriate region command. - (let ((char (car com)) (com (cdr com))) - (setq prefix-arg (cons value com)) - (if (viper= char ?r) - (viper-region prefix-arg) - (viper-Region prefix-arg)) - ;; reset prefix-arg - (setq prefix-arg nil)) - ;; otherwise, reset prefix arg and call appropriate command - (setq value (if (null value) 1 value)) - (setq prefix-arg nil) - (cond - ;; If we change ?C to ?c here, then cc will enter replacement mode - ;; rather than deleting lines. However, it will affect 1 less line than - ;; normal. We decided to not use replacement mode here and follow Vi, - ;; since replacement mode on n full lines can be achieved with nC. - ((equal com '(?c . ?c)) (viper-line (cons value ?C))) - ((equal com '(?d . ?d)) (viper-line (cons value ?D))) - ((equal com '(?d . ?y)) (viper-yank-defun)) - ((equal com '(?y . ?y)) (viper-line (cons value ?Y))) - ((equal com '(?< . ?<)) (viper-line (cons value ?<))) - ((equal com '(?> . ?>)) (viper-line (cons value ?>))) - ((equal com '(?! . ?!)) (viper-line (cons value ?!))) - ((equal com '(?= . ?=)) (viper-line (cons value ?=))) - (t (error ""))))) - - (if cmd-to-exec-at-end - (progn - (setq last-command-char char) - (setq last-command-event - (viper-copy-event - (if viper-xemacs-p (character-to-event char) char))) - (condition-case nil - (funcall cmd-to-exec-at-end cmd-info) - (error - (error ""))))) - )) + (if (atom com) + ;; `com' is a single char, so we construct the command argument + ;; and if `char' is `?', we describe the arg; otherwise + ;; we prepare the command that will be executed at the end. + (progn + (setq cmd-info (cons value com)) + (while (viper= char ?U) + (viper-describe-arg cmd-info) + (setq char (read-char))) + ;; `char' is a movement cmd, a digit arg cmd, or a register cmd---so + ;; we execute it at the very end + (or (viper-movement-command-p char) + (viper-digit-command-p char) + (viper-regsuffix-command-p char) + (viper= char ?!) ; bang command + (viper= char ?g) ; the gg command (like G0) + (error "")) + (setq cmd-to-exec-at-end + (viper-exec-form-in-vi + `(key-binding (char-to-string ,char))))) + + ;; as com is non-nil, this means that we have a command to execute + (if (viper-memq-char (car com) '(?r ?R)) + ;; execute apropriate region command. + (let ((char (car com)) (com (cdr com))) + (setq prefix-arg (cons value com)) + (if (viper= char ?r) + (viper-region prefix-arg) + (viper-Region prefix-arg)) + ;; reset prefix-arg + (setq prefix-arg nil)) + ;; otherwise, reset prefix arg and call appropriate command + (setq value (if (null value) 1 value)) + (setq prefix-arg nil) + (cond + ;; If we change ?C to ?c here, then cc will enter replacement mode + ;; rather than deleting lines. However, it will affect 1 less line + ;; than normal. We decided to not use replacement mode here and + ;; follow Vi, since replacement mode on n full lines can be achieved + ;; with nC. + ((equal com '(?c . ?c)) (viper-line (cons value ?C))) + ((equal com '(?d . ?d)) (viper-line (cons value ?D))) + ((equal com '(?d . ?y)) (viper-yank-defun)) + ((equal com '(?y . ?y)) (viper-line (cons value ?Y))) + ((equal com '(?< . ?<)) (viper-line (cons value ?<))) + ((equal com '(?> . ?>)) (viper-line (cons value ?>))) + ((equal com '(?! . ?!)) (viper-line (cons value ?!))) + ((equal com '(?= . ?=)) (viper-line (cons value ?=))) + ;; gg acts as G0 + ((equal (car com) ?g) (viper-goto-line 0)) + (t (error ""))))) + + (if cmd-to-exec-at-end + (progn + (setq last-command-char char) + (setq last-command-event + (viper-copy-event + (if viper-xemacs-p (character-to-event char) char))) + (condition-case nil + (funcall cmd-to-exec-at-end cmd-info) + (error + (error ""))))) + )) (defun viper-describe-arg (arg) (let (val com) @@ -1733,6 +1736,7 @@ (max viper-com-point (point)))) ((viper= char ?g) (push-mark viper-com-point t) + ;; execute the last emacs kbd macro on each line of the region (viper-global-execute)) ((viper= char ?q) (push-mark viper-com-point t) @@ -3996,6 +4000,7 @@ (defun viper-buffer-search-enable (&optional c) (cond (c (setq viper-buffer-search-char c)) ((null viper-buffer-search-char) + ;; ?g acts as a default value for viper-buffer-search-char (setq viper-buffer-search-char ?g))) (define-key viper-vi-basic-map (cond ((viper-characterp viper-buffer-search-char)
--- a/lisp/emulation/viper-ex.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/emulation/viper-ex.el Mon Oct 30 08:54:41 2006 +0000 @@ -1624,8 +1624,9 @@ (progn (setq command ;; replace # and % with the previous/current file - (ex-expand-filsyms (concat ex-file ex-cmdfile-args) - (current-buffer))) + (ex-expand-filsyms + (concat (shell-quote-argument ex-file) ex-cmdfile-args) + (current-buffer))) (shell-command command t)) (insert-file-contents ex-file))) (ex-fixup-history viper-last-ex-prompt ex-file ex-cmdfile-args))
--- a/lisp/emulation/viper.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/emulation/viper.el Mon Oct 30 08:54:41 2006 +0000 @@ -9,7 +9,7 @@ ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> ;; Keywords: emulations -(defconst viper-version "3.13 of September 18, 2006" +(defconst viper-version "3.13.1 of October 23, 2006" "The current version of Viper") ;; This file is part of GNU Emacs.
--- a/lisp/facemenu.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/facemenu.el Mon Oct 30 08:54:41 2006 +0000 @@ -690,6 +690,9 @@ (cond ((facemenu-iterate ; check if equivalent face is already in the menu (lambda (m) (and (listp m) (symbolp (car m)) + ;; Avoid error in face-equal + ;; when a non-face is erroneously present. + (facep (car m)) (face-equal (car m) symbol))) (cdr (symbol-function menu)))) ;; Faces with a keyboard equivalent. These go at the front.
--- a/lisp/gnus/ChangeLog Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/gnus/ChangeLog Mon Oct 30 08:54:41 2006 +0000 @@ -1,3 +1,46 @@ +2006-10-29 Reiner Steib <Reiner.Steib@gmx.de> + + * mm-util.el (mm-codepage-iso-8859-list, mm-codepage-ibm-list): New + variables. + (mm-setup-codepage-iso-8859, mm-setup-codepage-ibm): New functions. + (mm-charset-synonym-alist): Move some entries to + mm-codepage-iso-8859-list. + (mm-charset-synonym-alist, mm-charset-override-alist): Add + iso-8859-8/windows-1255 and iso-8859-9/windows-1254. + +2006-10-29 Katsumi Yamaoka <yamaoka@jpl.org> + + * gnus-sum.el (gnus-set-mode-line): Quote % in group name. + +2006-10-28 Reiner Steib <Reiner.Steib@gmx.de> + + * gnus-agent.el (gnus-agent-make-mode-line-string): Make it compatible + with Emacs 21 and XEmacs. + +2006-10-26 Reiner Steib <Reiner.Steib@gmx.de> + + * mm-view.el: Add interactive arg to html2text autoload. + +2006-10-25 Katsumi Yamaoka <yamaoka@jpl.org> + + * gnus-sum.el (gnus-summary-move-article): Use no-encode for `B B'. + +2006-10-20 Katsumi Yamaoka <yamaoka@jpl.org> + + * gnus-group.el (gnus-group-make-doc-group): Work for non-ASCII group + names. + + * gnus-sum.el (gnus-select-newsgroup): Decode group name. + +2006-10-19 Katsumi Yamaoka <yamaoka@jpl.org> + + * message.el (message-headers-to-generate): Fix typo in docstring. + +2006-10-19 Reiner Steib <Reiner.Steib@gmx.de> + + * gnus.el (gnus-mime): Remove unused custom group. + (gnus-getenv-nntpserver, gnus-select-method): Autoload. + 2006-10-13 Andreas Seltenreich <uwi7@rz.uni-karlsruhe.de> * mm-uu.el (mm-uu-pgp-signed-extract-1): Use RFC 2440 definition of
--- a/lisp/gnus/gnus-agent.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/gnus/gnus-agent.el Mon Oct 30 08:54:41 2006 +0000 @@ -577,7 +577,17 @@ (fboundp 'make-mode-line-mouse-map)) (propertize string 'local-map (make-mode-line-mouse-map mouse-button mouse-func) - 'mouse-face 'mode-line-highlight) + 'mouse-face + (cond ((and (featurep 'xemacs) + ;; XEmacs' `facep' only checks for a face + ;; object, not for a face name, so it's useless + ;; to check with `facep'. + (find-face 'modeline)) + 'modeline) + ((facep 'mode-line-highlight) ;; Emacs 22 + 'mode-line-highlight) + ((facep 'mode-line) ;; Emacs 21 + 'mode-line)) ) string)) (defun gnus-agent-toggle-plugged (set-to)
--- a/lisp/gnus/gnus-group.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/gnus/gnus-group.el Mon Oct 30 08:54:41 2006 +0000 @@ -2680,13 +2680,18 @@ (t (setq err (format "%c unknown. " char)) nil)))) (setq type found))) - (let* ((file (expand-file-name file)) - (name (gnus-generate-new-group-name - (gnus-group-prefixed-name - (file-name-nondirectory file) '(nndoc ""))))) + (setq file (expand-file-name file)) + (let ((name (gnus-generate-new-group-name + (gnus-group-prefixed-name + (file-name-nondirectory file) '(nndoc "")))) + (encodable (mm-coding-system-p 'utf-8))) (gnus-group-make-group - (gnus-group-real-name name) - (list 'nndoc file + (if encodable + (mm-encode-coding-string (gnus-group-real-name name) 'utf-8) + (gnus-group-real-name name)) + (list 'nndoc (if encodable + (mm-encode-coding-string file 'utf-8) + file) (list 'nndoc-address file) (list 'nndoc-article-type (or type 'guess))))))
--- a/lisp/gnus/gnus-sum.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/gnus/gnus-sum.el Mon Oct 30 08:54:41 2006 +0000 @@ -5208,13 +5208,13 @@ (when (equal major-mode 'gnus-summary-mode) (gnus-kill-buffer (current-buffer))) (error "Couldn't activate group %s: %s" - group (gnus-status-message group)))) + (gnus-group-decoded-name group) (gnus-status-message group)))) (unless (gnus-request-group group t) (when (equal major-mode 'gnus-summary-mode) (gnus-kill-buffer (current-buffer))) (error "Couldn't request group %s: %s" - group (gnus-status-message group))) + (gnus-group-decoded-name group) (gnus-status-message group))) (when gnus-agent (gnus-agent-possibly-alter-active group (gnus-active group) info) @@ -5711,8 +5711,9 @@ (let* ((mformat (symbol-value (intern (format "gnus-%s-mode-line-format-spec" where)))) - (gnus-tmp-group-name (gnus-group-decoded-name - gnus-newsgroup-name)) + (gnus-tmp-group-name (gnus-mode-string-quote + (gnus-group-decoded-name + gnus-newsgroup-name))) (gnus-tmp-article-number (or gnus-current-article 0)) (gnus-tmp-unread gnus-newsgroup-unreads) (gnus-tmp-unread-and-unticked (length gnus-newsgroup-unreads)) @@ -9153,7 +9154,7 @@ (gnus-request-article-this-buffer article gnus-newsgroup-name) (when (consp (setq art-group (gnus-request-accept-article - to-newsgroup select-method (not articles)))) + to-newsgroup select-method (not articles) t))) (setq new-xref (concat new-xref " " (car art-group) ":" (number-to-string (cdr art-group)))) @@ -9161,7 +9162,7 @@ ;; it and replace the new article. (nnheader-replace-header "Xref" new-xref) (gnus-request-replace-article - (cdr art-group) to-newsgroup (current-buffer)) + (cdr art-group) to-newsgroup (current-buffer) t) art-group)))))) (cond ((not art-group) @@ -9259,7 +9260,7 @@ (gnus-request-article-this-buffer article gnus-newsgroup-name) (nnheader-replace-header "Xref" new-xref) (gnus-request-replace-article - article gnus-newsgroup-name (current-buffer)))) + article gnus-newsgroup-name (current-buffer) t))) ;; run the move/copy/crosspost/respool hook (run-hook-with-args 'gnus-summary-article-move-hook
--- a/lisp/gnus/gnus.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/gnus/gnus.el Mon Oct 30 08:54:41 2006 +0000 @@ -279,10 +279,6 @@ :link '(custom-manual "(gnus)Various Various") :group 'gnus) -(defgroup gnus-mime nil - "Variables for controlling the Gnus MIME interface." - :group 'gnus) - (defgroup gnus-exit nil "Exiting Gnus." :link '(custom-manual "(gnus)Exiting Gnus") @@ -1243,6 +1239,7 @@ :group 'gnus-server :type 'file) +;;;###autoload (defun gnus-getenv-nntpserver () "Find default nntp server. Check the NNTPSERVER environment variable and the @@ -1254,6 +1251,7 @@ (when (re-search-forward "[^ \t\n\r]+" nil t) (match-string 0)))))) +;;;###autoload (defcustom gnus-select-method (condition-case nil (nconc
--- a/lisp/gnus/message.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/gnus/message.el Mon Oct 30 08:54:41 2006 +0000 @@ -5514,7 +5514,7 @@ (defun message-headers-to-generate (headers included-headers excluded-headers) "Return a list that includes all headers from HEADERS. -If INCLUDED-HEADERS is a list, just include those headers. If if is +If INCLUDED-HEADERS is a list, just include those headers. If it is t, include all headers. In any case, headers from EXCLUDED-HEADERS are not included." (let ((result nil)
--- a/lisp/gnus/mm-util.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/gnus/mm-util.el Mon Oct 30 08:54:41 2006 +0000 @@ -205,39 +205,140 @@ ;; Not in XEmacs, but it's not a proper MIME charset anyhow. ,@(unless (mm-coding-system-p 'x-ctext) '((x-ctext . ctext))) - ;; ISO-8859-15 is very similar to ISO-8859-1. But it's _different_! + ;; ISO-8859-15 is very similar to ISO-8859-1. But it's _different_ in 8 + ;; positions! ,@(unless (mm-coding-system-p 'iso-8859-15) '((iso-8859-15 . iso-8859-1))) ;; BIG-5HKSCS is similar to, but different than, BIG-5. ,@(unless (mm-coding-system-p 'big5-hkscs) '((big5-hkscs . big5))) - ;; Windows-1252 is actually a superset of Latin-1. See also - ;; `gnus-article-dumbquotes-map'. - ,@(unless (mm-coding-system-p 'windows-1252) - (if (mm-coding-system-p 'cp1252) - '((windows-1252 . cp1252)) - '((windows-1252 . iso-8859-1)))) - ;; Windows-1250 is a variant of Latin-2 heavily used by Microsoft - ;; Outlook users in Czech republic. Use this to allow reading of their - ;; e-mails. cp1250 should be defined by M-x codepage-setup. - ,@(if (and (not (mm-coding-system-p 'windows-1250)) - (mm-coding-system-p 'cp1250)) - '((windows-1250 . cp1250))) ;; A Microsoft misunderstanding. - ,@(if (and (not (mm-coding-system-p 'unicode)) - (mm-coding-system-p 'utf-16-le)) - '((unicode . utf-16-le))) + ,@(when (and (not (mm-coding-system-p 'unicode)) + (mm-coding-system-p 'utf-16-le)) + '((unicode . utf-16-le))) ;; A Microsoft misunderstanding. ,@(unless (mm-coding-system-p 'ks_c_5601-1987) (if (mm-coding-system-p 'cp949) '((ks_c_5601-1987 . cp949)) '((ks_c_5601-1987 . euc-kr)))) ;; Windows-31J is Windows Codepage 932. - ,@(if (and (not (mm-coding-system-p 'windows-31j)) - (mm-coding-system-p 'cp932)) - '((windows-31j . cp932))) + ,@(when (and (not (mm-coding-system-p 'windows-31j)) + (mm-coding-system-p 'cp932)) + '((windows-31j . cp932))) ) - "A mapping from unknown or invalid charset names to the real charset names.") + "A mapping from unknown or invalid charset names to the real charset names. + +See `mm-codepage-iso-8859-list' and `mm-codepage-ibm-list'.") + +(defcustom mm-codepage-iso-8859-list + (list 1250 ;; Windows-1250 is a variant of Latin-2 heavily used by Microsoft + ;; Outlook users in Czech republic. Use this to allow reading of + ;; their e-mails. cp1250 should be defined by M-x codepage-setup + ;; (Emacs 21). + '(1252 . 1) ;; Windows-1252 is a superset of iso-8859-1 (West + ;; Europe). See also `gnus-article-dumbquotes-map'. + '(1254 . 9) ;; Windows-1254 is a superset of iso-8859-9 (Turkish). + '(1255 . 8));; Windows-1255 is a superset of iso-8859-8 (Hebrew). + "A list of Windows codepage numbers and iso-8859 charset numbers. + +If an element is a number corresponding to a supported windows +codepage, appropriate entries to `mm-charset-synonym-alist' are +added by `mm-setup-codepage-iso-8859'. An element may also be a +cons cell where the car is a codepage number and the cdr is the +corresponding number of an iso-8859 charset." + :type '(list (set :inline t + (const 1250 :tag "Central and East European") + (const (1252 . 1) :tag "West European") + (const (1254 . 9) :tag "Turkish") + (const (1255 . 8) :tag "Hebrew")) + (repeat :inline t + :tag "Other options" + (choice + (integer :tag "Windows codepage number") + (cons (integer :tag "Windows codepage number") + (integer :tag "iso-8859 charset number"))))) + :version "22.1" ;; Gnus 5.10.9 + :group 'mime) + +(defcustom mm-codepage-ibm-list + (list 437 ;; (US etc.) + 860 ;; (Portugal) + 861 ;; (Iceland) + 862 ;; (Israel) + 863 ;; (Canadian French) + 865 ;; (Nordic) + 852 ;; + 850 ;; (Latin 1) + 855 ;; (Cyrillic) + 866 ;; (Cyrillic - Russian) + 857 ;; (Turkish) + 864 ;; (Arabic) + 869 ;; (Greek) + 874);; (Thai) + ;; In Emacs 23 (unicode), cp... and ibm... are aliases. + ;; Cf. http://thread.gmane.org/v9lkng5nwy.fsf@marauder.physik.uni-ulm.de + "List of IBM codepage numbers. + +The codepage mappings slighly differ between IBM and other vendors. +See \"ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/IBM/README.TXT\". + +If an element is a number corresponding to a supported windows +codepage, appropriate entries to `mm-charset-synonym-alist' are +added by `mm-setup-codepage-ibm'." + :type '(list (set :inline t + (const 437 :tag "US etc.") + (const 860 :tag "Portugal") + (const 861 :tag "Iceland") + (const 862 :tag "Israel") + (const 863 :tag "Canadian French") + (const 865 :tag "Nordic") + (const 852) + (const 850 :tag "Latin 1") + (const 855 :tag "Cyrillic") + (const 866 :tag "Cyrillic - Russian") + (const 857 :tag "Turkish") + (const 864 :tag "Arabic") + (const 869 :tag "Greek") + (const 874 :tag "Thai")) + (repeat :inline t + :tag "Other options" + (integer :tag "Codepage number"))) + :version "22.1" ;; Gnus 5.10.9 + :group 'mime) + +(defun mm-setup-codepage-iso-8859 (&optional list) + "Add appropriate entries to `mm-charset-synonym-alist'. +Unless LIST is given, `mm-codepage-iso-8859-list' is used." + (unless list + (setq list mm-codepage-iso-8859-list)) + (dolist (i list) + (let (cp windows iso) + (if (consp i) + (setq cp (intern (format "cp%d" (car i))) + windows (intern (format "windows-%d" (car i))) + iso (intern (format "iso-8859-%d" (cdr i)))) + (setq cp (intern (format "cp%d" i)) + windows (intern (format "windows-%d" i)))) + (unless (mm-coding-system-p windows) + (if (mm-coding-system-p cp) + (add-to-list 'mm-charset-synonym-alist (cons windows cp)) + (add-to-list 'mm-charset-synonym-alist (cons windows iso))))))) + +(defun mm-setup-codepage-ibm (&optional list) + "Add appropriate entries to `mm-charset-synonym-alist'. +Unless LIST is given, `mm-codepage-ibm-list' is used." + (unless list + (setq list mm-codepage-ibm-list)) + (dolist (number list) + (let ((ibm (intern (format "ibm%d" number))) + (cp (intern (format "cp%d" number)))) + (when (and (not (mm-coding-system-p ibm)) + (mm-coding-system-p cp)) + (add-to-list 'mm-charset-synonym-alist (cons ibm cp)))))) + +;; Initialize: +(mm-setup-codepage-iso-8859) +(mm-setup-codepage-ibm) (defcustom mm-charset-override-alist `((iso-8859-1 . windows-1252))
--- a/lisp/gnus/mm-view.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/gnus/mm-view.el Mon Oct 30 08:54:41 2006 +0000 @@ -36,7 +36,7 @@ (autoload 'vcard-parse-string "vcard") (autoload 'vcard-format-string "vcard") (autoload 'fill-flowed "flow-fill") - (autoload 'html2text "html2text") + (autoload 'html2text "html2text" nil t) (unless (fboundp 'diff-mode) (autoload 'diff-mode "diff-mode" "" t nil)))
--- a/lisp/help-fns.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/help-fns.el Mon Oct 30 08:54:41 2006 +0000 @@ -383,35 +383,40 @@ (princ ".") (terpri) (when (commandp function) - (let* ((remapped (command-remapping function)) - (keys (where-is-internal - (or remapped function) overriding-local-map nil nil)) - non-modified-keys) - ;; Which non-control non-meta keys run this command? - (dolist (key keys) - (if (member (event-modifiers (aref key 0)) '(nil (shift))) - (push key non-modified-keys))) - (when remapped - (princ "It is remapped to `") - (princ (symbol-name remapped)) - (princ "'")) + (if (and (eq function 'self-insert-command) + (eq (key-binding "a") 'self-insert-command) + (eq (key-binding "b") 'self-insert-command) + (eq (key-binding "c") 'self-insert-command)) + (princ "It is bound to many ordinary text characters.\n") + (let* ((remapped (command-remapping function)) + (keys (where-is-internal + (or remapped function) overriding-local-map nil nil)) + non-modified-keys) + ;; Which non-control non-meta keys run this command? + (dolist (key keys) + (if (member (event-modifiers (aref key 0)) '(nil (shift))) + (push key non-modified-keys))) + (when remapped + (princ "It is remapped to `") + (princ (symbol-name remapped)) + (princ "'")) - (when keys - (princ (if remapped " which is bound to " "It is bound to ")) - ;; FIXME: This list can be very long (f.ex. for self-insert-command). - ;; If there are many, remove them from KEYS. - (if (< (length non-modified-keys) 10) - (princ (mapconcat 'key-description keys ", ")) - (dolist (key non-modified-keys) - (setq keys (delq key keys))) - (if keys - (progn - (princ (mapconcat 'key-description keys ", ")) - (princ ", and many ordinary text characters")) - (princ "many ordinary text characters")))) - (when (or remapped keys non-modified-keys) - (princ ".") - (terpri)))) + (when keys + (princ (if remapped " which is bound to " "It is bound to ")) + ;; If lots of ordinary text characters run this command, + ;; don't mention them one by one. + (if (< (length non-modified-keys) 10) + (princ (mapconcat 'key-description keys ", ")) + (dolist (key non-modified-keys) + (setq keys (delq key keys))) + (if keys + (progn + (princ (mapconcat 'key-description keys ", ")) + (princ ", and many ordinary text characters")) + (princ "many ordinary text characters")))) + (when (or remapped keys non-modified-keys) + (princ ".") + (terpri))))) (let* ((arglist (help-function-arglist def)) (doc (documentation function)) (usage (help-split-fundoc doc function)))
--- a/lisp/ido.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/ido.el Mon Oct 30 08:54:41 2006 +0000 @@ -2611,7 +2611,7 @@ May be useful if cached version is no longer valid, but directory timestamp has not changed (e.g. with ftp or on Windows)." (interactive) - (if (and ido-mode (eq ido-cur-item 'file)) + (if (and ido-mode (memq ido-cur-item '(file dir))) (progn (if (ido-is-unc-root) (setq ido-unc-hosts-cache t) @@ -4168,7 +4168,7 @@ (setq refresh t)) ((string-equal contents "./") (setq refresh t)) - ((string-match "\\`~[a-zA-Z0-9]+/\\'" contents) + ((string-match "\\`~[-_a-zA-Z0-9]+[$]?/\\'" contents) (ido-trace "new home" contents) (ido-set-current-home contents) (setq refresh t))
--- a/lisp/ldefs-boot.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/ldefs-boot.el Mon Oct 30 08:54:41 2006 +0000 @@ -4,7 +4,7 @@ ;;;### (autoloads (5x5-crack 5x5-crack-xor-mutate 5x5-crack-mutating-best ;;;;;; 5x5-crack-mutating-current 5x5-crack-randomly 5x5) "5x5" -;;;;;; "play/5x5.el" (17383 32181)) +;;;;;; "play/5x5.el" (17385 8495)) ;;; Generated autoloads from play/5x5.el (autoload (quote 5x5) "5x5" "\ @@ -63,14 +63,14 @@ ;;;*** -;;;### (autoloads nil "abbrev" "abbrev.el" (17494 22057)) +;;;### (autoloads nil "abbrev" "abbrev.el" (17495 43953)) ;;; Generated autoloads from abbrev.el (put 'abbrev-mode 'safe-local-variable 'booleanp) ;;;*** ;;;### (autoloads (list-one-abbrev-table) "abbrevlist" "abbrevlist.el" -;;;;;; (17404 53184)) +;;;;;; (17408 40148)) ;;; Generated autoloads from abbrevlist.el (autoload (quote list-one-abbrev-table) "abbrevlist" "\ @@ -81,7 +81,7 @@ ;;;*** ;;;### (autoloads (ada-mode ada-add-extensions) "ada-mode" "progmodes/ada-mode.el" -;;;;;; (17578 34778)) +;;;;;; (17721 20491)) ;;; Generated autoloads from progmodes/ada-mode.el (autoload (quote ada-add-extensions) "ada-mode" "\ @@ -142,7 +142,7 @@ ;;;*** ;;;### (autoloads (ada-header) "ada-stmt" "progmodes/ada-stmt.el" -;;;;;; (17397 61560)) +;;;;;; (17394 12937)) ;;; Generated autoloads from progmodes/ada-stmt.el (autoload (quote ada-header) "ada-stmt" "\ @@ -153,7 +153,7 @@ ;;;*** ;;;### (autoloads (ada-find-file) "ada-xref" "progmodes/ada-xref.el" -;;;;;; (17397 61560)) +;;;;;; (17717 4883)) ;;; Generated autoloads from progmodes/ada-xref.el (autoload (quote ada-find-file) "ada-xref" "\ @@ -168,7 +168,7 @@ ;;;;;; change-log-mode add-change-log-entry-other-window add-change-log-entry ;;;;;; find-change-log prompt-for-change-log-name add-log-mailing-address ;;;;;; add-log-full-name add-log-current-defun-function) "add-log" -;;;;;; "add-log.el" (17515 39525)) +;;;;;; "add-log.el" (17683 63309)) ;;; Generated autoloads from add-log.el (defvar add-log-current-defun-function nil "\ @@ -176,13 +176,13 @@ It is used by `add-log-current-defun' in preference to built-in rules. Returns function's name as a string, or nil if outside a function.") -(custom-autoload (quote add-log-current-defun-function) "add-log") +(custom-autoload (quote add-log-current-defun-function) "add-log" t) (defvar add-log-full-name nil "\ *Full name of user, for inclusion in ChangeLog daily headers. This defaults to the value returned by the function `user-full-name'.") -(custom-autoload (quote add-log-full-name) "add-log") +(custom-autoload (quote add-log-full-name) "add-log" t) (defvar add-log-mailing-address nil "\ Email addresses of user, for inclusion in ChangeLog headers. @@ -191,7 +191,7 @@ will be recognized as referring to the same user; when creating a new ChangeLog entry, one element will be chosen at random.") -(custom-autoload (quote add-log-mailing-address) "add-log") +(custom-autoload (quote add-log-mailing-address) "add-log" t) (autoload (quote prompt-for-change-log-name) "add-log" "\ Prompt for a change log name. @@ -306,7 +306,7 @@ ;;;### (autoloads (defadvice ad-activate ad-add-advice ad-disable-advice ;;;;;; ad-enable-advice ad-default-compilation-action ad-redefinition-action) -;;;;;; "advice" "emacs-lisp/advice.el" (17578 34774)) +;;;;;; "advice" "emacs-lisp/advice.el" (17701 26815)) ;;; Generated autoloads from emacs-lisp/advice.el (defvar ad-redefinition-action (quote warn) "\ @@ -320,7 +320,7 @@ it additionally prints a warning message. All other values will be interpreted as `error'.") -(custom-autoload (quote ad-redefinition-action) "advice") +(custom-autoload (quote ad-redefinition-action) "advice" t) (defvar ad-default-compilation-action (quote maybe) "\ *Defines whether to compile advised definitions during activation. @@ -331,7 +331,7 @@ be interpreted as `maybe'. This variable will only be considered if the COMPILE argument of `ad-activate' was supplied as nil.") -(custom-autoload (quote ad-default-compilation-action) "advice") +(custom-autoload (quote ad-default-compilation-action) "advice" t) (autoload (quote ad-enable-advice) "advice" "\ Enables the advice of FUNCTION with CLASS and NAME. @@ -434,7 +434,7 @@ ;;;### (autoloads (align-newline-and-indent align-unhighlight-rule ;;;;;; align-highlight-rule align-current align-entire align-regexp -;;;;;; align) "align" "align.el" (17383 32089)) +;;;;;; align) "align" "align.el" (17385 8481)) ;;; Generated autoloads from align.el (autoload (quote align) "align" "\ @@ -524,7 +524,7 @@ ;;;*** ;;;### (autoloads (outlineify-sticky allout-mode) "allout" "allout.el" -;;;;;; (17582 28845)) +;;;;;; (17707 53738)) ;;; Generated autoloads from allout.el (put (quote allout-show-bodies) (quote safe-local-variable) (if (fboundp (quote booleanp)) (quote booleanp) (quote (lambda (x) (member x (quote (t nil))))))) @@ -627,7 +627,9 @@ Topic-oriented Killing and Yanking: ---------------------------------- \\[allout-kill-topic] allout-kill-topic Kill current topic, including offspring. -\\[allout-kill-line] allout-kill-line Like kill-line, but reconciles numbering, etc. +\\[allout-copy-topic-as-kill] allout-copy-topic-as-kill Copy current topic, including offspring. +\\[allout-kill-line] allout-kill-line kill-line, attending to outline structure. +\\[allout-copy-line-as-kill] allout-copy-line-as-kill Copy line but don't delete it. \\[allout-yank] allout-yank Yank, adjusting depth of yanked topic to depth of heading if yanking into bare topic heading (ie, prefix sans text). @@ -778,7 +780,7 @@ ;;;*** ;;;### (autoloads (ange-ftp-hook-function ange-ftp-reread-dir) "ange-ftp" -;;;;;; "net/ange-ftp.el" (17383 32174)) +;;;;;; "net/ange-ftp.el" (17385 8494)) ;;; Generated autoloads from net/ange-ftp.el (defalias (quote ange-ftp-re-read-dir) (quote ange-ftp-reread-dir)) @@ -800,7 +802,7 @@ ;;;*** ;;;### (autoloads (animate-birthday-present animate-sequence animate-string) -;;;;;; "animate" "play/animate.el" (17383 32181)) +;;;;;; "animate" "play/animate.el" (17385 8495)) ;;; Generated autoloads from play/animate.el (autoload (quote animate-string) "animate" "\ @@ -828,7 +830,7 @@ ;;;*** ;;;### (autoloads (ansi-color-process-output ansi-color-for-comint-mode-on) -;;;;;; "ansi-color" "ansi-color.el" (17383 32090)) +;;;;;; "ansi-color" "ansi-color.el" (17385 8481)) ;;; Generated autoloads from ansi-color.el (autoload (quote ansi-color-for-comint-mode-on) "ansi-color" "\ @@ -854,7 +856,7 @@ ;;;*** ;;;### (autoloads (antlr-set-tabs antlr-mode antlr-show-makefile-rules) -;;;;;; "antlr-mode" "progmodes/antlr-mode.el" (17484 52436)) +;;;;;; "antlr-mode" "progmodes/antlr-mode.el" (17485 5461)) ;;; Generated autoloads from progmodes/antlr-mode.el (autoload (quote antlr-show-makefile-rules) "antlr-mode" "\ @@ -893,7 +895,7 @@ ;;;### (autoloads (appt-activate appt-make-list appt-delete appt-add ;;;;;; appt-display-diary appt-display-duration appt-display-mode-line ;;;;;; appt-msg-window appt-visible appt-audible appt-message-warning-time -;;;;;; appt-issue-message) "appt" "calendar/appt.el" (17578 34774)) +;;;;;; appt-issue-message) "appt" "calendar/appt.el" (17686 46252)) ;;; Generated autoloads from calendar/appt.el (defvar appt-issue-message t "\ @@ -901,47 +903,47 @@ To be detected, the diary entry must have the format described in the documentation of the function `appt-check'.") -(custom-autoload (quote appt-issue-message) "appt") +(custom-autoload (quote appt-issue-message) "appt" t) (defvar appt-message-warning-time 12 "\ *Time in minutes before an appointment that the warning begins.") -(custom-autoload (quote appt-message-warning-time) "appt") +(custom-autoload (quote appt-message-warning-time) "appt" t) (defvar appt-audible t "\ *Non-nil means beep to indicate appointment.") -(custom-autoload (quote appt-audible) "appt") +(custom-autoload (quote appt-audible) "appt" t) (defvar appt-visible t "\ *Non-nil means display appointment message in echo area. This variable is only relevant if `appt-msg-window' is nil.") -(custom-autoload (quote appt-visible) "appt") +(custom-autoload (quote appt-visible) "appt" t) (defvar appt-msg-window t "\ *Non-nil means display appointment message in another window. If non-nil, this variable overrides `appt-visible'.") -(custom-autoload (quote appt-msg-window) "appt") +(custom-autoload (quote appt-msg-window) "appt" t) (defvar appt-display-mode-line t "\ *Non-nil means display minutes to appointment and time on the mode line. This is in addition to any other display of appointment messages.") -(custom-autoload (quote appt-display-mode-line) "appt") +(custom-autoload (quote appt-display-mode-line) "appt" t) (defvar appt-display-duration 10 "\ *The number of seconds an appointment message is displayed. Only relevant if reminders are to be displayed in their own window.") -(custom-autoload (quote appt-display-duration) "appt") +(custom-autoload (quote appt-display-duration) "appt" t) (defvar appt-display-diary t "\ *Non-nil displays the diary when the appointment list is first initialized. This will occur at midnight when the appointment list is updated.") -(custom-autoload (quote appt-display-diary) "appt") +(custom-autoload (quote appt-display-diary) "appt" t) (autoload (quote appt-add) "appt" "\ Add an appointment for today at NEW-APPT-TIME with message NEW-APPT-MSG. @@ -981,7 +983,7 @@ ;;;### (autoloads (apropos-documentation apropos-value apropos apropos-documentation-property ;;;;;; apropos-command apropos-variable apropos-read-pattern) "apropos" -;;;;;; "apropos.el" (17484 52422)) +;;;;;; "apropos.el" (17712 850)) ;;; Generated autoloads from apropos.el (autoload (quote apropos-read-pattern) "apropos" "\ @@ -1077,8 +1079,8 @@ ;;;*** -;;;### (autoloads (archive-mode) "arc-mode" "arc-mode.el" (17578 -;;;;;; 34770)) +;;;### (autoloads (archive-mode) "arc-mode" "arc-mode.el" (17601 +;;;;;; 9091)) ;;; Generated autoloads from arc-mode.el (autoload (quote archive-mode) "arc-mode" "\ @@ -1098,7 +1100,7 @@ ;;;*** -;;;### (autoloads (array-mode) "array" "array.el" (17358 42654)) +;;;### (autoloads (array-mode) "array" "array.el" (17360 11432)) ;;; Generated autoloads from array.el (autoload (quote array-mode) "array" "\ @@ -1169,8 +1171,8 @@ ;;;*** -;;;### (autoloads (artist-mode) "artist" "textmodes/artist.el" (17521 -;;;;;; 64539)) +;;;### (autoloads (artist-mode) "artist" "textmodes/artist.el" (17520 +;;;;;; 49737)) ;;; Generated autoloads from textmodes/artist.el (autoload (quote artist-mode) "artist" "\ @@ -1375,8 +1377,8 @@ ;;;*** -;;;### (autoloads (asm-mode) "asm-mode" "progmodes/asm-mode.el" (17487 -;;;;;; 53546)) +;;;### (autoloads (asm-mode) "asm-mode" "progmodes/asm-mode.el" (17495 +;;;;;; 43955)) ;;; Generated autoloads from progmodes/asm-mode.el (autoload (quote asm-mode) "asm-mode" "\ @@ -1404,7 +1406,7 @@ ;;;*** ;;;### (autoloads (auto-show-mode auto-show-mode) "auto-show" "obsolete/auto-show.el" -;;;;;; (16221 3779)) +;;;;;; (17075 55468)) ;;; Generated autoloads from obsolete/auto-show.el (defvar auto-show-mode nil "\ @@ -1420,7 +1422,7 @@ ;;;*** ;;;### (autoloads (autoarg-kp-mode autoarg-mode) "autoarg" "autoarg.el" -;;;;;; (17383 32090)) +;;;;;; (17385 8482)) ;;; Generated autoloads from autoarg.el (defvar autoarg-mode nil "\ @@ -1429,6 +1431,8 @@ (custom-autoload (quote autoarg-mode) "autoarg") +(put (quote autoarg-mode) (quote custom-set) (quote custom-set-minor-mode)) + (autoload (quote autoarg-mode) "autoarg" "\ Toggle Autoarg minor mode globally. With ARG, turn Autoarg mode on if ARG is positive, off otherwise. @@ -1459,6 +1463,8 @@ (custom-autoload (quote autoarg-kp-mode) "autoarg") +(put (quote autoarg-kp-mode) (quote custom-set) (quote custom-set-minor-mode)) + (autoload (quote autoarg-kp-mode) "autoarg" "\ Toggle Autoarg-KP minor mode globally. With ARG, turn Autoarg mode on if ARG is positive, off otherwise. @@ -1473,7 +1479,7 @@ ;;;*** ;;;### (autoloads (autoconf-mode) "autoconf" "progmodes/autoconf.el" -;;;;;; (17397 61561)) +;;;;;; (17394 12937)) ;;; Generated autoloads from progmodes/autoconf.el (autoload (quote autoconf-mode) "autoconf" "\ @@ -1484,7 +1490,7 @@ ;;;*** ;;;### (autoloads (auto-insert-mode define-auto-insert auto-insert) -;;;;;; "autoinsert" "autoinsert.el" (17383 32090)) +;;;;;; "autoinsert" "autoinsert.el" (17704 4325)) ;;; Generated autoloads from autoinsert.el (autoload (quote auto-insert) "autoinsert" "\ @@ -1504,9 +1510,10 @@ Non-nil if Auto-Insert mode is enabled. See the command `auto-insert-mode' for a description of this minor-mode. Setting this variable directly does not take effect; -use either \\[customize] or the function `auto-insert-mode'.") - -(custom-autoload (quote auto-insert-mode) "autoinsert") +either customize it (see the info node `Easy Customization') +or call the function `auto-insert-mode'.") + +(custom-autoload (quote auto-insert-mode) "autoinsert" nil) (autoload (quote auto-insert-mode) "autoinsert" "\ Toggle Auto-insert mode. @@ -1522,7 +1529,7 @@ ;;;### (autoloads (batch-update-autoloads update-directory-autoloads ;;;;;; update-file-autoloads) "autoload" "emacs-lisp/autoload.el" -;;;;;; (17590 36007)) +;;;;;; (17601 9092)) ;;; Generated autoloads from emacs-lisp/autoload.el (autoload (quote update-file-autoloads) "autoload" "\ @@ -1557,7 +1564,7 @@ ;;;### (autoloads (global-auto-revert-mode turn-on-auto-revert-tail-mode ;;;;;; auto-revert-tail-mode turn-on-auto-revert-mode auto-revert-mode) -;;;;;; "autorevert" "autorevert.el" (17503 24305)) +;;;;;; "autorevert" "autorevert.el" (17515 24179)) ;;; Generated autoloads from autorevert.el (autoload (quote auto-revert-mode) "autorevert" "\ @@ -1613,6 +1620,8 @@ (custom-autoload (quote global-auto-revert-mode) "autorevert") +(put (quote global-auto-revert-mode) (quote custom-set) (quote custom-set-minor-mode)) + (autoload (quote global-auto-revert-mode) "autorevert" "\ Revert any buffer when file on disk changes. @@ -1625,7 +1634,7 @@ ;;;*** ;;;### (autoloads (mouse-avoidance-mode mouse-avoidance-mode) "avoid" -;;;;;; "avoid.el" (17503 24305)) +;;;;;; "avoid.el" (17632 41885)) ;;; Generated autoloads from avoid.el (defvar mouse-avoidance-mode nil "\ @@ -1634,7 +1643,7 @@ Setting this variable directly does not take effect; use either \\[customize] or the function `mouse-avoidance-mode'.") -(custom-autoload (quote mouse-avoidance-mode) "avoid") +(custom-autoload (quote mouse-avoidance-mode) "avoid" nil) (autoload (quote mouse-avoidance-mode) "avoid" "\ Set cursor avoidance mode to MODE. @@ -1666,7 +1675,7 @@ ;;;*** ;;;### (autoloads (backquote) "backquote" "emacs-lisp/backquote.el" -;;;;;; (17383 32135)) +;;;;;; (17385 8489)) ;;; Generated autoloads from emacs-lisp/backquote.el (autoload (quote backquote) "backquote" "\ @@ -1691,7 +1700,7 @@ ;;;*** ;;;### (autoloads (display-battery-mode battery) "battery" "battery.el" -;;;;;; (17515 39525)) +;;;;;; (17515 24179)) ;;; Generated autoloads from battery.el (put 'battery-mode-line-string 'risky-local-variable t) @@ -1710,6 +1719,8 @@ (custom-autoload (quote display-battery-mode) "battery") +(put (quote display-battery-mode) (quote custom-set) (quote custom-set-minor-mode)) + (autoload (quote display-battery-mode) "battery" "\ Display battery status information in the mode line. The text being displayed in the mode line is controlled by the variables @@ -1722,7 +1733,7 @@ ;;;*** ;;;### (autoloads (benchmark benchmark-run-compiled benchmark-run) -;;;;;; "benchmark" "emacs-lisp/benchmark.el" (17383 32135)) +;;;;;; "benchmark" "emacs-lisp/benchmark.el" (17385 8489)) ;;; Generated autoloads from emacs-lisp/benchmark.el (autoload (quote benchmark-run) "benchmark" "\ @@ -1754,8 +1765,8 @@ ;;;*** -;;;### (autoloads (bibtex-mode) "bibtex" "textmodes/bibtex.el" (17578 -;;;;;; 34779)) +;;;### (autoloads (bibtex-mode) "bibtex" "textmodes/bibtex.el" (17531 +;;;;;; 7385)) ;;; Generated autoloads from textmodes/bibtex.el (autoload (quote bibtex-mode) "bibtex" "\ @@ -1817,7 +1828,7 @@ ;;;### (autoloads (binhex-decode-region binhex-decode-region-external ;;;;;; binhex-decode-region-internal) "binhex" "gnus/binhex.el" -;;;;;; (17383 32153)) +;;;;;; (17385 8492)) ;;; Generated autoloads from gnus/binhex.el (defconst binhex-begin-line "^:...............................................................$") @@ -1840,8 +1851,8 @@ ;;;*** -;;;### (autoloads (blackbox) "blackbox" "play/blackbox.el" (17383 -;;;;;; 32181)) +;;;### (autoloads (blackbox) "blackbox" "play/blackbox.el" (17385 +;;;;;; 8495)) ;;; Generated autoloads from play/blackbox.el (autoload (quote blackbox) "blackbox" "\ @@ -1963,7 +1974,7 @@ ;;;### (autoloads (bookmark-bmenu-list bookmark-load bookmark-save ;;;;;; bookmark-write bookmark-delete bookmark-insert bookmark-rename ;;;;;; bookmark-insert-location bookmark-relocate bookmark-jump -;;;;;; bookmark-set) "bookmark" "bookmark.el" (17383 32091)) +;;;;;; bookmark-set) "bookmark" "bookmark.el" (17385 8482)) ;;; Generated autoloads from bookmark.el (define-key ctl-x-map "rb" 'bookmark-jump) (define-key ctl-x-map "rm" 'bookmark-set) @@ -2153,7 +2164,7 @@ ;;;;;; browse-url browse-url-of-region browse-url-of-dired-file ;;;;;; browse-url-of-buffer browse-url-of-file browse-url-url-at-point ;;;;;; browse-url-galeon-program browse-url-firefox-program browse-url-browser-function) -;;;;;; "browse-url" "net/browse-url.el" (17521 64538)) +;;;;;; "browse-url" "net/browse-url.el" (17520 49736)) ;;; Generated autoloads from net/browse-url.el (defvar browse-url-browser-function (cond ((memq system-type (quote (windows-nt ms-dos cygwin))) (quote browse-url-default-windows-browser)) ((memq system-type (quote (darwin))) (quote browse-url-default-macosx-browser)) (t (quote browse-url-default-browser))) "\ @@ -2484,8 +2495,8 @@ ;;;*** -;;;### (autoloads (snarf-bruces bruce) "bruce" "play/bruce.el" (17383 -;;;;;; 32181)) +;;;### (autoloads (snarf-bruces bruce) "bruce" "play/bruce.el" (17385 +;;;;;; 8495)) ;;; Generated autoloads from play/bruce.el (autoload (quote bruce) "bruce" "\ @@ -2501,7 +2512,7 @@ ;;;*** ;;;### (autoloads (bs-show bs-customize bs-cycle-previous bs-cycle-next) -;;;;;; "bs" "bs.el" (17397 61539)) +;;;;;; "bs" "bs.el" (17395 27411)) ;;; Generated autoloads from bs.el (autoload (quote bs-cycle-next) "bs" "\ @@ -2542,8 +2553,8 @@ ;;;*** ;;;### (autoloads (insert-text-button make-text-button insert-button -;;;;;; make-button define-button-type) "button" "button.el" (17383 -;;;;;; 32092)) +;;;;;; make-button define-button-type) "button" "button.el" (17385 +;;;;;; 8482)) ;;; Generated autoloads from button.el (defvar button-map (let ((map (make-sparse-keymap))) (define-key map " " (quote push-button)) (define-key map [mouse-2] (quote push-button)) map) "\ @@ -2631,7 +2642,7 @@ ;;;;;; batch-byte-compile-if-not-done display-call-tree byte-compile ;;;;;; compile-defun byte-compile-file byte-recompile-directory ;;;;;; byte-force-recompile byte-compile-warnings-safe-p) "bytecomp" -;;;;;; "emacs-lisp/bytecomp.el" (17582 35542)) +;;;;;; "emacs-lisp/bytecomp.el" (17582 40396)) ;;; Generated autoloads from emacs-lisp/bytecomp.el (put 'byte-compile-dynamic 'safe-local-variable 'booleanp) (put 'byte-compile-dynamic-docstrings 'safe-local-variable 'booleanp) @@ -2735,7 +2746,7 @@ ;;;*** -;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (17397 61545)) +;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (17386 33146)) ;;; Generated autoloads from calendar/cal-dst.el (put (quote calendar-daylight-savings-starts) (quote risky-local-variable) t) @@ -2745,7 +2756,7 @@ ;;;*** ;;;### (autoloads (list-yahrzeit-dates) "cal-hebrew" "calendar/cal-hebrew.el" -;;;;;; (17397 61545)) +;;;;;; (17386 33146)) ;;; Generated autoloads from calendar/cal-hebrew.el (autoload (quote list-yahrzeit-dates) "cal-hebrew" "\ @@ -2760,13 +2771,13 @@ ;;;### (autoloads (defmath calc-embedded-activate calc-embedded calc-grab-rectangle ;;;;;; calc-grab-region full-calc-keypad calc-keypad calc-eval quick-calc ;;;;;; full-calc calc calc-dispatch calc-settings-file) "calc" "calc/calc.el" -;;;;;; (17383 32134)) +;;;;;; (17671 12179)) ;;; Generated autoloads from calc/calc.el (defvar calc-settings-file (convert-standard-filename "~/.calc.el") "\ *File in which to record permanent settings.") -(custom-autoload (quote calc-settings-file) "calc") +(custom-autoload (quote calc-settings-file) "calc" t) (define-key ctl-x-map "*" 'calc-dispatch) (autoload (quote calc-dispatch) "calc" "\ @@ -2838,8 +2849,8 @@ ;;;*** -;;;### (autoloads (calculator) "calculator" "calculator.el" (17383 -;;;;;; 32092)) +;;;### (autoloads (calculator) "calculator" "calculator.el" (17385 +;;;;;; 8482)) ;;; Generated autoloads from calculator.el (autoload (quote calculator) "calculator" "\ @@ -2867,7 +2878,7 @@ ;;;;;; mark-holidays-in-calendar view-calendar-holidays-initially ;;;;;; calendar-remove-frame-by-deleting mark-diary-entries-in-calendar ;;;;;; view-diary-entries-initially calendar-offset) "calendar" -;;;;;; "calendar/calendar.el" (17578 34774)) +;;;;;; "calendar/calendar.el" (17694 34727)) ;;; Generated autoloads from calendar/calendar.el (defvar calendar-offset 0 "\ @@ -2876,7 +2887,7 @@ +1 means on the right. Larger (or smaller) values push the principal month off the screen.") -(custom-autoload (quote calendar-offset) "calendar") +(custom-autoload (quote calendar-offset) "calendar" t) (defvar view-diary-entries-initially nil "\ Non-nil means display current date's diary entries on entry to calendar. @@ -2885,32 +2896,32 @@ is governed by the variable `number-of-diary-entries'. This variable can be overridden by the value of `calendar-setup'.") -(custom-autoload (quote view-diary-entries-initially) "calendar") +(custom-autoload (quote view-diary-entries-initially) "calendar" t) (defvar mark-diary-entries-in-calendar nil "\ Non-nil means mark dates with diary entries, in the calendar window. The marking symbol is specified by the variable `diary-entry-marker'.") -(custom-autoload (quote mark-diary-entries-in-calendar) "calendar") +(custom-autoload (quote mark-diary-entries-in-calendar) "calendar" t) (defvar calendar-remove-frame-by-deleting nil "\ Determine how the calendar mode removes a frame no longer needed. If nil, make an icon of the frame. If non-nil, delete the frame.") -(custom-autoload (quote calendar-remove-frame-by-deleting) "calendar") +(custom-autoload (quote calendar-remove-frame-by-deleting) "calendar" t) (defvar view-calendar-holidays-initially nil "\ Non-nil means display holidays for current three month period on entry. The holidays are displayed in another window when the calendar is first displayed.") -(custom-autoload (quote view-calendar-holidays-initially) "calendar") +(custom-autoload (quote view-calendar-holidays-initially) "calendar" t) (defvar mark-holidays-in-calendar nil "\ Non-nil means mark dates of holidays in the calendar window. The marking symbol is specified by the variable `calendar-holiday-marker'.") -(custom-autoload (quote mark-holidays-in-calendar) "calendar") +(custom-autoload (quote mark-holidays-in-calendar) "calendar" t) (defvar all-hebrew-calendar-holidays nil "\ If nil, show only major holidays from the Hebrew calendar. @@ -2918,7 +2929,7 @@ If t, show all the holidays that would appear in a complete Hebrew calendar.") -(custom-autoload (quote all-hebrew-calendar-holidays) "calendar") +(custom-autoload (quote all-hebrew-calendar-holidays) "calendar" t) (defvar all-christian-calendar-holidays nil "\ If nil, show only major holidays from the Christian calendar. @@ -2927,7 +2938,7 @@ If t, show all the holidays that would appear in a complete Christian calendar.") -(custom-autoload (quote all-christian-calendar-holidays) "calendar") +(custom-autoload (quote all-christian-calendar-holidays) "calendar" t) (defvar all-islamic-calendar-holidays nil "\ If nil, show only major holidays from the Islamic calendar. @@ -2936,7 +2947,7 @@ If t, show all the holidays that would appear in a complete Islamic calendar.") -(custom-autoload (quote all-islamic-calendar-holidays) "calendar") +(custom-autoload (quote all-islamic-calendar-holidays) "calendar" t) (defvar all-bahai-calendar-holidays nil "\ If nil, show only major holidays from the Baha'i calendar. @@ -2945,13 +2956,13 @@ If t, show all the holidays that would appear in a complete Baha'i calendar.") -(custom-autoload (quote all-bahai-calendar-holidays) "calendar") +(custom-autoload (quote all-bahai-calendar-holidays) "calendar" t) (defvar calendar-load-hook nil "\ List of functions to be called after the calendar is first loaded. This is the place to add key bindings to `calendar-mode-map'.") -(custom-autoload (quote calendar-load-hook) "calendar") +(custom-autoload (quote calendar-load-hook) "calendar" t) (defvar initial-calendar-window-hook nil "\ List of functions to be called when the calendar window is first opened. @@ -2959,7 +2970,7 @@ once opened is never called again. Leaving the calendar with the `q' command and reentering it will cause these functions to be called again.") -(custom-autoload (quote initial-calendar-window-hook) "calendar") +(custom-autoload (quote initial-calendar-window-hook) "calendar" t) (defvar today-visible-calendar-hook nil "\ List of functions called whenever the current date is visible. @@ -2978,7 +2989,7 @@ characters in the calendar buffer by the hooks may cause the failure of the functions that move by days and weeks.") -(custom-autoload (quote today-visible-calendar-hook) "calendar") +(custom-autoload (quote today-visible-calendar-hook) "calendar" t) (defvar today-invisible-calendar-hook nil "\ List of functions called whenever the current date is not visible. @@ -2991,7 +3002,7 @@ characters in the calendar buffer by the hooks may cause the failure of the functions that move by days and weeks.") -(custom-autoload (quote today-invisible-calendar-hook) "calendar") +(custom-autoload (quote today-invisible-calendar-hook) "calendar" t) (defvar calendar-move-hook nil "\ List of functions called whenever the cursor moves in the calendar. @@ -3002,7 +3013,7 @@ redisplays the diary for whatever date the cursor is moved to.") -(custom-autoload (quote calendar-move-hook) "calendar") +(custom-autoload (quote calendar-move-hook) "calendar" t) (defvar diary-file "~/diary" "\ Name of the file in which one's personal diary of dates is kept. @@ -3109,39 +3120,39 @@ Diary files can contain directives to include the contents of other files; for details, see the documentation for the variable `list-diary-entries-hook'.") -(custom-autoload (quote diary-file) "calendar") +(custom-autoload (quote diary-file) "calendar" t) (defvar diary-nonmarking-symbol "&" "\ Symbol indicating that a diary entry is not to be marked in the calendar.") -(custom-autoload (quote diary-nonmarking-symbol) "calendar") +(custom-autoload (quote diary-nonmarking-symbol) "calendar" t) (defvar hebrew-diary-entry-symbol "H" "\ Symbol indicating a diary entry according to the Hebrew calendar.") -(custom-autoload (quote hebrew-diary-entry-symbol) "calendar") +(custom-autoload (quote hebrew-diary-entry-symbol) "calendar" t) (defvar islamic-diary-entry-symbol "I" "\ Symbol indicating a diary entry according to the Islamic calendar.") -(custom-autoload (quote islamic-diary-entry-symbol) "calendar") +(custom-autoload (quote islamic-diary-entry-symbol) "calendar" t) (defvar bahai-diary-entry-symbol "B" "\ Symbol indicating a diary entry according to the Baha'i calendar.") -(custom-autoload (quote bahai-diary-entry-symbol) "calendar") +(custom-autoload (quote bahai-diary-entry-symbol) "calendar" t) (defvar diary-include-string "#include" "\ The string indicating inclusion of another file of diary entries. See the documentation for the function `include-other-diary-files'.") -(custom-autoload (quote diary-include-string) "calendar") +(custom-autoload (quote diary-include-string) "calendar" t) (defvar sexp-diary-entry-symbol "%%" "\ The string used to indicate a sexp diary entry in `diary-file'. See the documentation for the function `list-sexp-diary-entries'.") -(custom-autoload (quote sexp-diary-entry-symbol) "calendar") +(custom-autoload (quote sexp-diary-entry-symbol) "calendar" t) (defvar abbreviated-calendar-year t "\ Interpret a two-digit year DD in a diary entry as either 19DD or 20DD. @@ -3149,7 +3160,7 @@ Baha'i calendars. If this variable is nil, years must be written in full.") -(custom-autoload (quote abbreviated-calendar-year) "calendar") +(custom-autoload (quote abbreviated-calendar-year) "calendar" t) (defvar european-calendar-style nil "\ Use the European style of dates in the diary and in any displays. @@ -3165,36 +3176,38 @@ Names can be capitalized or not, written in full (as specified by the variable `calendar-day-name-array'), or abbreviated (as specified by -`calendar-day-abbrev-array') with or without a period. To take effect, -this variable should be set before the calendar package and its associates -are loaded. Otherwise, use one of the functions `european-calendar' or -`american-calendar' to force the appropriate update.") - -(custom-autoload (quote european-calendar-style) "calendar") +`calendar-day-abbrev-array') with or without a period. + +Setting this variable directly does not take effect (if the +calendar package is already loaded). Rather, use either +\\[customize] or the functions `european-calendar' and +`american-calendar'.") + +(custom-autoload (quote european-calendar-style) "calendar" nil) (defvar american-date-diary-pattern (quote ((month "/" day "[^/0-9]") (month "/" day "/" year "[^0-9]") (monthname " *" day "[^,0-9]") (monthname " *" day ", *" year "[^0-9]") (dayname "\\W"))) "\ List of pseudo-patterns describing the American patterns of date used. See the documentation of `diary-date-forms' for an explanation.") -(custom-autoload (quote american-date-diary-pattern) "calendar") +(custom-autoload (quote american-date-diary-pattern) "calendar" t) (defvar european-date-diary-pattern (quote ((day "/" month "[^/0-9]") (day "/" month "/" year "[^0-9]") (backup day " *" monthname "\\W+\\<\\([^*0-9]\\|\\([0-9]+[:aApP]\\)\\)") (day " *" monthname " *" year "[^0-9]") (dayname "\\W"))) "\ List of pseudo-patterns describing the European patterns of date used. See the documentation of `diary-date-forms' for an explanation.") -(custom-autoload (quote european-date-diary-pattern) "calendar") +(custom-autoload (quote european-date-diary-pattern) "calendar" t) (defvar european-calendar-display-form (quote ((if dayname (concat dayname ", ")) day " " monthname " " year)) "\ Pseudo-pattern governing the way a date appears in the European style. See the documentation of `calendar-date-display-form' for an explanation.") -(custom-autoload (quote european-calendar-display-form) "calendar") +(custom-autoload (quote european-calendar-display-form) "calendar" t) (defvar american-calendar-display-form (quote ((if dayname (concat dayname ", ")) monthname " " day ", " year)) "\ Pseudo-pattern governing the way a date appears in the American style. See the documentation of `calendar-date-display-form' for an explanation.") -(custom-autoload (quote american-calendar-display-form) "calendar") +(custom-autoload (quote american-calendar-display-form) "calendar" t) (defvar print-diary-entries-hook (quote lpr-buffer) "\ List of functions called after a temporary diary buffer is prepared. @@ -3203,7 +3216,7 @@ example, rearranging the lines into order by day and time, saving the buffer instead of deleting it, or changing the function used to do the printing.") -(custom-autoload (quote print-diary-entries-hook) "calendar") +(custom-autoload (quote print-diary-entries-hook) "calendar" t) (defvar list-diary-entries-hook nil "\ List of functions called after diary file is culled for relevant entries. @@ -3232,13 +3245,13 @@ diary entries from various included files, each day's entries sorted into lexicographic order.") -(custom-autoload (quote list-diary-entries-hook) "calendar") +(custom-autoload (quote list-diary-entries-hook) "calendar" t) (defvar diary-hook nil "\ List of functions called after the display of the diary. Can be used for appointment notification.") -(custom-autoload (quote diary-hook) "calendar") +(custom-autoload (quote diary-hook) "calendar" t) (defvar diary-display-hook nil "\ List of functions that handle the display of the diary. @@ -3262,7 +3275,7 @@ if that day is a holiday; if you want such days to be shown in the fancy diary buffer, set the variable `diary-list-include-blanks' to t.") -(custom-autoload (quote diary-display-hook) "calendar") +(custom-autoload (quote diary-display-hook) "calendar" t) (defvar nongregorian-diary-listing-hook nil "\ List of functions called for listing diary file and included files. @@ -3272,7 +3285,7 @@ `list-bahai-diary-entries'. The documentation for these functions describes the style of such diary entries.") -(custom-autoload (quote nongregorian-diary-listing-hook) "calendar") +(custom-autoload (quote nongregorian-diary-listing-hook) "calendar" t) (defvar mark-diary-entries-hook nil "\ List of functions called after marking diary entries in the calendar. @@ -3288,7 +3301,7 @@ part of the mark-diary-entries-hook, you will probably also want to use the function `include-other-diary-files' as part of `list-diary-entries-hook'.") -(custom-autoload (quote mark-diary-entries-hook) "calendar") +(custom-autoload (quote mark-diary-entries-hook) "calendar" t) (defvar nongregorian-diary-marking-hook nil "\ List of functions called for marking diary file and included files. @@ -3298,14 +3311,14 @@ `mark-bahai-diary-entries'. The documentation for these functions describes the style of such diary entries.") -(custom-autoload (quote nongregorian-diary-marking-hook) "calendar") +(custom-autoload (quote nongregorian-diary-marking-hook) "calendar" t) (defvar diary-list-include-blanks nil "\ If nil, do not include days with no diary entry in the list of diary entries. Such days will then not be shown in the fancy diary buffer, even if they are holidays.") -(custom-autoload (quote diary-list-include-blanks) "calendar") +(custom-autoload (quote diary-list-include-blanks) "calendar" t) (defvar holidays-in-diary-buffer t "\ Non-nil means include holidays in the diary display. @@ -3313,7 +3326,7 @@ fancy diary buffer next to the date. This slows down the diary functions somewhat; setting it to nil makes the diary display faster.") -(custom-autoload (quote holidays-in-diary-buffer) "calendar") +(custom-autoload (quote holidays-in-diary-buffer) "calendar" t) (put (quote general-holidays) (quote risky-local-variable) t) @@ -3321,7 +3334,7 @@ General holidays. Default value is for the United States. See the documentation for `calendar-holidays' for details.") -(custom-autoload (quote general-holidays) "calendar") +(custom-autoload (quote general-holidays) "calendar" t) (put (quote oriental-holidays) (quote risky-local-variable) t) @@ -3329,7 +3342,7 @@ Oriental holidays. See the documentation for `calendar-holidays' for details.") -(custom-autoload (quote oriental-holidays) "calendar") +(custom-autoload (quote oriental-holidays) "calendar" t) (put (quote local-holidays) (quote risky-local-variable) t) @@ -3337,7 +3350,7 @@ Local holidays. See the documentation for `calendar-holidays' for details.") -(custom-autoload (quote local-holidays) "calendar") +(custom-autoload (quote local-holidays) "calendar" t) (put (quote other-holidays) (quote risky-local-variable) t) @@ -3345,7 +3358,7 @@ User defined holidays. See the documentation for `calendar-holidays' for details.") -(custom-autoload (quote other-holidays) "calendar") +(custom-autoload (quote other-holidays) "calendar" t) (put (quote hebrew-holidays-1) (quote risky-local-variable) t) @@ -3369,7 +3382,7 @@ Jewish holidays. See the documentation for `calendar-holidays' for details.") -(custom-autoload (quote hebrew-holidays) "calendar") +(custom-autoload (quote hebrew-holidays) "calendar" t) (put (quote christian-holidays) (quote risky-local-variable) t) @@ -3377,7 +3390,7 @@ Christian holidays. See the documentation for `calendar-holidays' for details.") -(custom-autoload (quote christian-holidays) "calendar") +(custom-autoload (quote christian-holidays) "calendar" t) (put (quote islamic-holidays) (quote risky-local-variable) t) @@ -3385,7 +3398,7 @@ Islamic holidays. See the documentation for `calendar-holidays' for details.") -(custom-autoload (quote islamic-holidays) "calendar") +(custom-autoload (quote islamic-holidays) "calendar" t) (put (quote bahai-holidays) (quote risky-local-variable) t) @@ -3393,7 +3406,7 @@ Baha'i holidays. See the documentation for `calendar-holidays' for details.") -(custom-autoload (quote bahai-holidays) "calendar") +(custom-autoload (quote bahai-holidays) "calendar" t) (put (quote solar-holidays) (quote risky-local-variable) t) @@ -3401,7 +3414,7 @@ Sun-related holidays. See the documentation for `calendar-holidays' for details.") -(custom-autoload (quote solar-holidays) "calendar") +(custom-autoload (quote solar-holidays) "calendar" t) (put (quote calendar-holidays) (quote risky-local-variable) t) @@ -3413,7 +3426,7 @@ any other value the current frame is used. Using any of the first three options overrides the value of `view-diary-entries-initially'.") -(custom-autoload (quote calendar-setup) "calendar") +(custom-autoload (quote calendar-setup) "calendar" t) (autoload (quote calendar) "calendar" "\ Choose between the one frame, two frame, or basic calendar displays. @@ -3433,12 +3446,12 @@ update the calendar display to reflect the change, otherwise movement commands will not work correctly.") -(custom-autoload (quote calendar-week-start-day) "calendar") +(custom-autoload (quote calendar-week-start-day) "calendar" nil) ;;;*** ;;;### (autoloads (canlock-verify canlock-insert-header) "canlock" -;;;;;; "gnus/canlock.el" (17383 32153)) +;;;;;; "gnus/canlock.el" (17385 8492)) ;;; Generated autoloads from gnus/canlock.el (autoload (quote canlock-insert-header) "canlock" "\ @@ -3456,14 +3469,14 @@ ;;;*** ;;;### (autoloads nil "cc-compat" "progmodes/cc-compat.el" (17515 -;;;;;; 39528)) +;;;;;; 24182)) ;;; Generated autoloads from progmodes/cc-compat.el (put 'c-indent-level 'safe-local-variable 'integerp) ;;;*** ;;;### (autoloads (c-guess-basic-syntax) "cc-engine" "progmodes/cc-engine.el" -;;;;;; (17420 36089)) +;;;;;; (17408 40148)) ;;; Generated autoloads from progmodes/cc-engine.el (autoload (quote c-guess-basic-syntax) "cc-engine" "\ @@ -3475,7 +3488,7 @@ ;;;### (autoloads (pike-mode idl-mode java-mode objc-mode c++-mode ;;;;;; c-mode c-initialize-cc-mode) "cc-mode" "progmodes/cc-mode.el" -;;;;;; (17590 36100)) +;;;;;; (17601 9092)) ;;; Generated autoloads from progmodes/cc-mode.el (autoload (quote c-initialize-cc-mode) "cc-mode" "\ @@ -3633,7 +3646,7 @@ ;;;*** ;;;### (autoloads (c-set-offset c-add-style c-set-style) "cc-styles" -;;;;;; "progmodes/cc-styles.el" (17521 64538)) +;;;;;; "progmodes/cc-styles.el" (17520 49736)) ;;; Generated autoloads from progmodes/cc-styles.el (autoload (quote c-set-style) "cc-styles" "\ @@ -3685,13 +3698,13 @@ ;;;*** ;;;### (autoloads nil "cc-subword" "progmodes/cc-subword.el" (17515 -;;;;;; 39528)) +;;;;;; 24182)) ;;; Generated autoloads from progmodes/cc-subword.el (autoload 'c-subword-mode "cc-subword" "Mode enabling subword movement and editing keys." t) ;;;*** -;;;### (autoloads nil "cc-vars" "progmodes/cc-vars.el" (17521 64538)) +;;;### (autoloads nil "cc-vars" "progmodes/cc-vars.el" (17520 49736)) ;;; Generated autoloads from progmodes/cc-vars.el (put 'c-basic-offset 'safe-local-variable 'integerp) (put 'c-backslash-column 'safe-local-variable 'integerp) @@ -3701,7 +3714,7 @@ ;;;### (autoloads (ccl-execute-with-args check-ccl-program define-ccl-program ;;;;;; declare-ccl-program ccl-dump ccl-compile) "ccl" "international/ccl.el" -;;;;;; (17097 33519)) +;;;;;; (17102 18708)) ;;; Generated autoloads from international/ccl.el (autoload (quote ccl-compile) "ccl" "\ @@ -3960,7 +3973,7 @@ ;;;*** ;;;### (autoloads (cfengine-mode) "cfengine" "progmodes/cfengine.el" -;;;;;; (17397 61564)) +;;;;;; (17669 23128)) ;;; Generated autoloads from progmodes/cfengine.el (autoload (quote cfengine-mode) "cfengine" "\ @@ -3982,7 +3995,7 @@ ;;;;;; checkdoc-comments checkdoc-continue checkdoc-start checkdoc-current-buffer ;;;;;; checkdoc-eval-current-buffer checkdoc-message-interactive ;;;;;; checkdoc-interactive checkdoc) "checkdoc" "emacs-lisp/checkdoc.el" -;;;;;; (17383 32136)) +;;;;;; (17651 6799)) ;;; Generated autoloads from emacs-lisp/checkdoc.el (autoload (quote checkdoc) "checkdoc" "\ @@ -4165,8 +4178,8 @@ ;;;*** ;;;### (autoloads (encode-hz-buffer encode-hz-region decode-hz-buffer -;;;;;; decode-hz-region) "china-util" "language/china-util.el" (17097 -;;;;;; 33524)) +;;;;;; decode-hz-region) "china-util" "language/china-util.el" (17246 +;;;;;; 40257)) ;;; Generated autoloads from language/china-util.el (autoload (quote decode-hz-region) "china-util" "\ @@ -4194,7 +4207,7 @@ ;;;*** ;;;### (autoloads (command-history list-command-history repeat-matching-complex-command) -;;;;;; "chistory" "chistory.el" (17383 32092)) +;;;;;; "chistory" "chistory.el" (17385 8482)) ;;; Generated autoloads from chistory.el (autoload (quote repeat-matching-complex-command) "chistory" "\ @@ -4233,7 +4246,7 @@ ;;;*** -;;;### (autoloads nil "cl" "emacs-lisp/cl.el" (17383 32137)) +;;;### (autoloads nil "cl" "emacs-lisp/cl.el" (17698 30385)) ;;; Generated autoloads from emacs-lisp/cl.el (defvar custom-print-functions nil "\ @@ -4249,7 +4262,7 @@ ;;;*** ;;;### (autoloads (common-lisp-indent-function) "cl-indent" "emacs-lisp/cl-indent.el" -;;;;;; (17383 32136)) +;;;;;; (17729 22475)) ;;; Generated autoloads from emacs-lisp/cl-indent.el (autoload (quote common-lisp-indent-function) "cl-indent" "\ @@ -4260,7 +4273,7 @@ ;;;*** ;;;### (autoloads (c-macro-expand) "cmacexp" "progmodes/cmacexp.el" -;;;;;; (17397 61564)) +;;;;;; (17394 12937)) ;;; Generated autoloads from progmodes/cmacexp.el (autoload (quote c-macro-expand) "cmacexp" "\ @@ -4280,8 +4293,8 @@ ;;;*** -;;;### (autoloads (run-scheme) "cmuscheme" "cmuscheme.el" (17383 -;;;;;; 32092)) +;;;### (autoloads (run-scheme) "cmuscheme" "cmuscheme.el" (17385 +;;;;;; 8482)) ;;; Generated autoloads from cmuscheme.el (autoload (quote run-scheme) "cmuscheme" "\ @@ -4303,7 +4316,7 @@ ;;;### (autoloads (codepage-setup cp-supported-codepages cp-offset-for-codepage ;;;;;; cp-language-for-codepage cp-charset-for-codepage cp-make-coding-systems-for-codepage) -;;;;;; "codepage" "international/codepage.el" (17210 47738)) +;;;;;; "codepage" "international/codepage.el" (17669 23128)) ;;; Generated autoloads from international/codepage.el (autoload (quote cp-make-coding-systems-for-codepage) "codepage" "\ @@ -4362,7 +4375,7 @@ ;;;### (autoloads (comint-redirect-results-list-from-process comint-redirect-results-list ;;;;;; comint-redirect-send-command-to-process comint-redirect-send-command ;;;;;; comint-run make-comint make-comint-in-buffer) "comint" "comint.el" -;;;;;; (17578 34770)) +;;;;;; (17692 12587)) ;;; Generated autoloads from comint.el (defvar comint-output-filter-functions (quote (comint-postoutput-scroll-to-bottom comint-watch-for-password-prompt)) "\ @@ -4452,8 +4465,8 @@ ;;;*** -;;;### (autoloads (compare-windows) "compare-w" "compare-w.el" (17420 -;;;;;; 36076)) +;;;### (autoloads (compare-windows) "compare-w" "compare-w.el" (17636 +;;;;;; 60569)) ;;; Generated autoloads from compare-w.el (autoload (quote compare-windows) "compare-w" "\ @@ -4490,18 +4503,18 @@ ;;;;;; compilation-shell-minor-mode compilation-mode compilation-start ;;;;;; compile compilation-disable-input compile-command compilation-search-path ;;;;;; compilation-ask-about-save compilation-window-height compilation-mode-hook) -;;;;;; "compile" "progmodes/compile.el" (17590 36100)) +;;;;;; "compile" "progmodes/compile.el" (17686 65476)) ;;; Generated autoloads from progmodes/compile.el (defvar compilation-mode-hook nil "\ *List of hook functions run by `compilation-mode' (see `run-mode-hooks').") -(custom-autoload (quote compilation-mode-hook) "compile") +(custom-autoload (quote compilation-mode-hook) "compile" t) (defvar compilation-window-height nil "\ *Number of lines in a compilation window. If nil, use Emacs default.") -(custom-autoload (quote compilation-window-height) "compile") +(custom-autoload (quote compilation-window-height) "compile" t) (defvar compilation-process-setup-function nil "\ *Function to call to customize the compilation process. @@ -4531,14 +4544,14 @@ *Non-nil means \\[compile] asks which buffers to save before compiling. Otherwise, it saves all modified buffers without asking.") -(custom-autoload (quote compilation-ask-about-save) "compile") +(custom-autoload (quote compilation-ask-about-save) "compile" t) (defvar compilation-search-path (quote (nil)) "\ *List of directories to search for source files named in error messages. Elements should be directory names, not file names of directories. nil as an element means to try the default directory.") -(custom-autoload (quote compilation-search-path) "compile") +(custom-autoload (quote compilation-search-path) "compile" t) (defvar compile-command "make -k " "\ *Last shell command used to do a compilation; default for next compilation. @@ -4554,7 +4567,7 @@ (concat \"make -k \" (file-name-sans-extension buffer-file-name))))))") -(custom-autoload (quote compile-command) "compile") +(custom-autoload (quote compile-command) "compile" t) (put 'compile-command 'safe-local-variable 'stringp) (defvar compilation-disable-input nil "\ @@ -4562,7 +4575,7 @@ This only affects platforms that support asynchronous processes (see `start-process'); synchronous compilation processes never accept input.") -(custom-autoload (quote compilation-disable-input) "compile") +(custom-autoload (quote compilation-disable-input) "compile" t) (autoload (quote compile) "compile" "\ Compile the program including the current buffer. Default: run `make'. @@ -4652,16 +4665,17 @@ ;;;*** ;;;### (autoloads (partial-completion-mode) "complete" "complete.el" -;;;;;; (17578 34770)) +;;;;;; (17624 52650)) ;;; Generated autoloads from complete.el (defvar partial-completion-mode nil "\ Non-nil if Partial-Completion mode is enabled. See the command `partial-completion-mode' for a description of this minor-mode. Setting this variable directly does not take effect; -use either \\[customize] or the function `partial-completion-mode'.") - -(custom-autoload (quote partial-completion-mode) "complete") +either customize it (see the info node `Easy Customization') +or call the function `partial-completion-mode'.") + +(custom-autoload (quote partial-completion-mode) "complete" nil) (autoload (quote partial-completion-mode) "complete" "\ Toggle Partial Completion mode. @@ -4693,16 +4707,17 @@ ;;;*** ;;;### (autoloads (dynamic-completion-mode) "completion" "completion.el" -;;;;;; (17383 32093)) +;;;;;; (17704 4325)) ;;; Generated autoloads from completion.el (defvar dynamic-completion-mode nil "\ Non-nil if Dynamic-Completion mode is enabled. See the command `dynamic-completion-mode' for a description of this minor-mode. Setting this variable directly does not take effect; -use either \\[customize] or the function `dynamic-completion-mode'.") - -(custom-autoload (quote dynamic-completion-mode) "completion") +either customize it (see the info node `Easy Customization') +or call the function `dynamic-completion-mode'.") + +(custom-autoload (quote dynamic-completion-mode) "completion" nil) (autoload (quote dynamic-completion-mode) "completion" "\ Enable dynamic word-completion. @@ -4714,7 +4729,7 @@ ;;;### (autoloads (decompose-composite-char compose-last-chars compose-chars-after ;;;;;; find-composition compose-chars decompose-string compose-string ;;;;;; decompose-region compose-region encode-composition-rule) -;;;;;; "composite" "composite.el" (17318 53825)) +;;;;;; "composite" "composite.el" (17321 50876)) ;;; Generated autoloads from composite.el (defconst reference-point-alist (quote ((tl . 0) (tc . 1) (tr . 2) (Bl . 3) (Bc . 4) (Br . 5) (bl . 6) (bc . 7) (br . 8) (cl . 9) (cc . 10) (cr . 11) (top-left . 0) (top-center . 1) (top-right . 2) (base-left . 3) (base-center . 4) (base-right . 5) (bottom-left . 6) (bottom-center . 7) (bottom-right . 8) (center-left . 9) (center-center . 10) (center-right . 11) (ml . 3) (mc . 10) (mr . 5) (mid-left . 3) (mid-center . 10) (mid-right . 5))) "\ @@ -4934,8 +4949,9 @@ ;;;*** ;;;### (autoloads (conf-xdefaults-mode conf-ppd-mode conf-colon-mode -;;;;;; conf-space-mode conf-javaprop-mode conf-windows-mode conf-unix-mode -;;;;;; conf-mode) "conf-mode" "textmodes/conf-mode.el" (17383 32186)) +;;;;;; conf-space-keywords conf-space-mode conf-javaprop-mode conf-windows-mode +;;;;;; conf-unix-mode conf-mode) "conf-mode" "textmodes/conf-mode.el" +;;;;;; (17679 3707)) ;;; Generated autoloads from textmodes/conf-mode.el (autoload (quote conf-mode) "conf-mode" "\ @@ -5024,10 +5040,11 @@ (autoload (quote conf-space-mode) "conf-mode" "\ Conf Mode starter for space separated conf files. \"Assignments\" are with ` '. Keywords before the parameters are -recognized according to `conf-space-keywords'. Interactively -with a prefix ARG of `0' no keywords will be recognized. With -any other prefix arg you will be prompted for a regexp to match -the keywords. +recognized according to the variable `conf-space-keywords-alist'. +Alternatively, you can specify a value for the file local variable +`conf-space-keywords'. +Use the function `conf-space-keywords' if you want to specify keywords +in an interactive fashion instead. For details see `conf-mode'. Example: @@ -5045,6 +5062,12 @@ \(fn)" t nil) +(autoload (quote conf-space-keywords) "conf-mode" "\ +Enter Conf Space mode using regexp KEYWORDS to match the keywords. +See `conf-space-mode'. + +\(fn KEYWORDS)" t nil) + (autoload (quote conf-colon-mode) "conf-mode" "\ Conf Mode starter for Colon files. \"Assignments\" are with `:'. @@ -5084,7 +5107,7 @@ ;;;*** ;;;### (autoloads (shuffle-vector cookie-snarf cookie-insert cookie) -;;;;;; "cookie1" "play/cookie1.el" (17578 34778)) +;;;;;; "cookie1" "play/cookie1.el" (17562 61275)) ;;; Generated autoloads from play/cookie1.el (autoload (quote cookie) "cookie1" "\ @@ -5116,7 +5139,7 @@ ;;;*** ;;;### (autoloads (copyright copyright-fix-years copyright-update) -;;;;;; "copyright" "emacs-lisp/copyright.el" (17383 32137)) +;;;;;; "copyright" "emacs-lisp/copyright.el" (17385 8489)) ;;; Generated autoloads from emacs-lisp/copyright.el (autoload (quote copyright-update) "copyright" "\ @@ -5143,8 +5166,8 @@ ;;;*** -;;;### (autoloads (cperl-mode) "cperl-mode" "progmodes/cperl-mode.el" -;;;;;; (17578 34778)) +;;;### (autoloads (cperl-perldoc-at-point cperl-perldoc cperl-mode) +;;;;;; "cperl-mode" "progmodes/cperl-mode.el" (17723 56271)) ;;; Generated autoloads from progmodes/cperl-mode.el (autoload (quote cperl-mode) "cperl-mode" "\ @@ -5290,16 +5313,24 @@ `cperl-min-label-indent' Minimal indentation for line that is a label. -Settings for K&R and BSD indentation styles are - `cperl-indent-level' 5 8 - `cperl-continued-statement-offset' 5 8 - `cperl-brace-offset' -5 -8 - `cperl-label-offset' -5 -8 +Settings for classic indent-styles: K&R BSD=C++ GNU PerlStyle=Whitesmith + `cperl-indent-level' 5 4 2 4 + `cperl-brace-offset' 0 0 0 0 + `cperl-continued-brace-offset' -5 -4 0 0 + `cperl-label-offset' -5 -4 -2 -4 + `cperl-continued-statement-offset' 5 4 2 4 CPerl knows several indentation styles, and may bulk set the corresponding variables. Use \\[cperl-set-style] to do this. Use \\[cperl-set-style-back] to restore the memorized preexisting values -\(both available from menu). +\(both available from menu). See examples in `cperl-style-examples'. + +Part of the indentation style is how different parts of if/elsif/else +statements are broken into lines; in CPerl, this is reflected on how +templates for these constructs are created (controlled by +`cperl-extra-newline-before-brace'), and how reflow-logic should treat \"continuation\" blocks of else/elsif/continue, controlled by the same variable, +and by `cperl-extra-newline-before-brace-multiline', +`cperl-merge-trailing-else', `cperl-indent-region-fix-constructs'. If `cperl-indent-level' is 0, the statement after opening brace in column 0 is indented on @@ -5314,10 +5345,20 @@ \(fn)" t nil) +(autoload (quote cperl-perldoc) "cperl-mode" "\ +Run `perldoc' on WORD. + +\(fn WORD)" t nil) + +(autoload (quote cperl-perldoc-at-point) "cperl-mode" "\ +Run a `perldoc' on the word around point. + +\(fn)" t nil) + ;;;*** ;;;### (autoloads (cpp-parse-edit cpp-highlight-buffer) "cpp" "progmodes/cpp.el" -;;;;;; (17397 61565)) +;;;;;; (17394 12937)) ;;; Generated autoloads from progmodes/cpp.el (autoload (quote cpp-highlight-buffer) "cpp" "\ @@ -5336,7 +5377,7 @@ ;;;*** ;;;### (autoloads (crisp-mode crisp-mode) "crisp" "emulation/crisp.el" -;;;;;; (17383 32142)) +;;;;;; (17385 8490)) ;;; Generated autoloads from emulation/crisp.el (defvar crisp-mode nil "\ @@ -5360,7 +5401,7 @@ ;;;*** ;;;### (autoloads (completing-read-multiple) "crm" "emacs-lisp/crm.el" -;;;;;; (17515 39527)) +;;;;;; (17515 24181)) ;;; Generated autoloads from emacs-lisp/crm.el (autoload (quote completing-read-multiple) "crm" "\ @@ -5396,16 +5437,17 @@ ;;;*** ;;;### (autoloads (cua-selection-mode cua-mode) "cua-base" "emulation/cua-base.el" -;;;;;; (17521 64537)) +;;;;;; (17663 14247)) ;;; Generated autoloads from emulation/cua-base.el (defvar cua-mode nil "\ Non-nil if Cua mode is enabled. See the command `cua-mode' for a description of this minor-mode. Setting this variable directly does not take effect; -use either \\[customize] or the function `cua-mode'.") - -(custom-autoload (quote cua-mode) "cua-base") +either customize it (see the info node `Easy Customization') +or call the function `cua-mode'.") + +(custom-autoload (quote cua-mode) "cua-base" nil) (autoload (quote cua-mode) "cua-base" "\ Toggle CUA key-binding mode. @@ -5461,7 +5503,7 @@ ;;;;;; customize-face customize-changed-options customize-option-other-window ;;;;;; customize-option customize-group-other-window customize-group ;;;;;; customize-mode customize customize-save-variable customize-set-variable -;;;;;; customize-set-value) "cus-edit" "cus-edit.el" (17590 36098)) +;;;;;; customize-set-value) "cus-edit" "cus-edit.el" (17694 37217)) ;;; Generated autoloads from cus-edit.el (add-hook 'same-window-regexps "\\`\\*Customiz.*\\*\\'") @@ -5559,18 +5601,24 @@ \(fn SYMBOL)" t nil) (defvar customize-package-emacs-version-alist nil "\ -Alist mapping versions of Emacs to versions of a package. -These package versions are listed in the :package-version -keyword used in `defcustom', `defgroup', and `defface'. Its -elements look like this: +Alist mapping versions of a package to Emacs versions. +We use this for packages that have their own names, but are released +as part of Emacs itself. + +Each elements looks like this: (PACKAGE (PVERSION . EVERSION)...) -For each PACKAGE, which is a symbol, there are one or more -elements that contain a package version PVERSION with an -associated Emacs version EVERSION. These versions are strings. -For example, the MH-E package updates this alist with the -following: +Here PACKAGE is the name of a package, as a symbol. After +PACKAGE come one or more elements, each associating a +package version PVERSION with the first Emacs version +EVERSION in which it (or a subsequent version of PACKAGE) +was first released. Both PVERSION and EVERSION are strings. +PVERSION should be a string that this package used in +the :package-version keyword for `defcustom', `defgroup', +and `defface'. + +For example, the MH-E package updates this alist as follows: (add-to-list 'customize-package-emacs-version-alist '(MH-E (\"6.0\" . \"22.1\") (\"6.1\" . \"22.1\") @@ -5715,7 +5763,7 @@ file. Otherwise, Emacs will not load the file when it starts up, and hence will not set `custom-file' to that file either.") -(custom-autoload (quote custom-file) "cus-edit") +(custom-autoload (quote custom-file) "cus-edit" t) (autoload (quote custom-save-all) "cus-edit" "\ Save all customizations in `custom-file'. @@ -5744,7 +5792,7 @@ ;;;*** ;;;### (autoloads (custom-reset-faces custom-theme-reset-faces custom-set-faces -;;;;;; custom-declare-face) "cus-face" "cus-face.el" (17383 32094)) +;;;;;; custom-declare-face) "cus-face" "cus-face.el" (17385 8483)) ;;; Generated autoloads from cus-face.el (autoload (quote custom-declare-face) "cus-face" "\ @@ -5814,7 +5862,7 @@ ;;;*** ;;;### (autoloads (customize-create-theme) "cus-theme" "cus-theme.el" -;;;;;; (17397 61539)) +;;;;;; (17632 41885)) ;;; Generated autoloads from cus-theme.el (autoload (quote customize-create-theme) "cus-theme" "\ @@ -5825,7 +5873,7 @@ ;;;*** ;;;### (autoloads (cvs-status-mode) "cvs-status" "cvs-status.el" -;;;;;; (17582 35146)) +;;;;;; (17495 43954)) ;;; Generated autoloads from cvs-status.el (autoload (quote cvs-status-mode) "cvs-status" "\ @@ -5836,7 +5884,7 @@ ;;;*** ;;;### (autoloads (global-cwarn-mode turn-on-cwarn-mode cwarn-mode) -;;;;;; "cwarn" "progmodes/cwarn.el" (17397 61565)) +;;;;;; "cwarn" "progmodes/cwarn.el" (17394 12937)) ;;; Generated autoloads from progmodes/cwarn.el (autoload (quote cwarn-mode) "cwarn" "\ @@ -5866,6 +5914,8 @@ (custom-autoload (quote global-cwarn-mode) "cwarn") +(put (quote global-cwarn-mode) (quote custom-set) (quote custom-set-minor-mode)) + (autoload (quote global-cwarn-mode) "cwarn" "\ Toggle Cwarn mode in every buffer. With prefix ARG, turn Global-Cwarn mode on if and only if ARG is positive. @@ -5878,7 +5928,7 @@ ;;;### (autoloads (standard-display-cyrillic-translit cyrillic-encode-alternativnyj-char ;;;;;; cyrillic-encode-koi8-r-char) "cyril-util" "language/cyril-util.el" -;;;;;; (17097 33524)) +;;;;;; (17102 18767)) ;;; Generated autoloads from language/cyril-util.el (autoload (quote cyrillic-encode-koi8-r-char) "cyril-util" "\ @@ -5907,7 +5957,7 @@ ;;;*** ;;;### (autoloads (dabbrev-expand dabbrev-completion) "dabbrev" "dabbrev.el" -;;;;;; (17383 32095)) +;;;;;; (17385 8483)) ;;; Generated autoloads from dabbrev.el (define-key esc-map "/" 'dabbrev-expand) (define-key esc-map [?\C-/] 'dabbrev-completion) @@ -5951,8 +6001,8 @@ ;;;*** -;;;### (autoloads (dcl-mode) "dcl-mode" "progmodes/dcl-mode.el" (17397 -;;;;;; 61565)) +;;;### (autoloads (dcl-mode) "dcl-mode" "progmodes/dcl-mode.el" (17394 +;;;;;; 12937)) ;;; Generated autoloads from progmodes/dcl-mode.el (autoload (quote dcl-mode) "dcl-mode" "\ @@ -6079,7 +6129,7 @@ ;;;*** ;;;### (autoloads (cancel-debug-on-entry debug-on-entry debug) "debug" -;;;;;; "emacs-lisp/debug.el" (17438 58633)) +;;;;;; "emacs-lisp/debug.el" (17440 13082)) ;;; Generated autoloads from emacs-lisp/debug.el (setq debugger (quote debug)) @@ -6123,7 +6173,7 @@ ;;;*** ;;;### (autoloads (decipher-mode decipher) "decipher" "play/decipher.el" -;;;;;; (17383 32181)) +;;;;;; (17385 8495)) ;;; Generated autoloads from play/decipher.el (autoload (quote decipher) "decipher" "\ @@ -6152,8 +6202,8 @@ ;;;*** ;;;### (autoloads (delimit-columns-rectangle delimit-columns-region -;;;;;; delimit-columns-customize) "delim-col" "delim-col.el" (17383 -;;;;;; 32095)) +;;;;;; delimit-columns-customize) "delim-col" "delim-col.el" (17682 +;;;;;; 43100)) ;;; Generated autoloads from delim-col.el (autoload (quote delimit-columns-customize) "delim-col" "\ @@ -6177,8 +6227,8 @@ ;;;*** -;;;### (autoloads (delphi-mode) "delphi" "progmodes/delphi.el" (17397 -;;;;;; 61565)) +;;;### (autoloads (delphi-mode) "delphi" "progmodes/delphi.el" (17604 +;;;;;; 60390)) ;;; Generated autoloads from progmodes/delphi.el (autoload (quote delphi-mode) "delphi" "\ @@ -6228,8 +6278,8 @@ ;;;*** -;;;### (autoloads (delete-selection-mode) "delsel" "delsel.el" (17383 -;;;;;; 32095)) +;;;### (autoloads (delete-selection-mode) "delsel" "delsel.el" (17385 +;;;;;; 8483)) ;;; Generated autoloads from delsel.el (defalias (quote pending-delete-mode) (quote delete-selection-mode)) @@ -6242,6 +6292,8 @@ (custom-autoload (quote delete-selection-mode) "delsel") +(put (quote delete-selection-mode) (quote custom-set) (quote custom-set-minor-mode)) + (autoload (quote delete-selection-mode) "delsel" "\ Toggle Delete Selection mode. With prefix ARG, turn Delete Selection mode on if and only if ARG is @@ -6257,7 +6309,7 @@ ;;;*** ;;;### (autoloads (derived-mode-init-mode-variables define-derived-mode) -;;;;;; "derived" "emacs-lisp/derived.el" (17383 32137)) +;;;;;; "derived" "emacs-lisp/derived.el" (17385 8489)) ;;; Generated autoloads from emacs-lisp/derived.el (autoload (quote define-derived-mode) "derived" "\ @@ -6322,7 +6374,7 @@ ;;;*** ;;;### (autoloads (describe-char describe-text-properties) "descr-text" -;;;;;; "descr-text.el" (17383 32095)) +;;;;;; "descr-text.el" (17385 8483)) ;;; Generated autoloads from descr-text.el (autoload (quote describe-text-properties) "descr-text" "\ @@ -6348,14 +6400,14 @@ ;;;### (autoloads (desktop-revert desktop-save-in-desktop-dir desktop-change-dir ;;;;;; desktop-load-default desktop-read desktop-remove desktop-save ;;;;;; desktop-clear desktop-locals-to-save desktop-save-mode) "desktop" -;;;;;; "desktop.el" (17578 34771)) +;;;;;; "desktop.el" (17670 57734)) ;;; Generated autoloads from desktop.el (defvar desktop-save-mode nil "\ Non-nil if Desktop-Save mode is enabled. See the command `desktop-save-mode' for a description of this minor-mode.") -(custom-autoload (quote desktop-save-mode) "desktop") +(custom-autoload (quote desktop-save-mode) "desktop" nil) (autoload (quote desktop-save-mode) "desktop" "\ Toggle desktop saving mode. @@ -6371,7 +6423,7 @@ The variables are saved only when they really are local. Conventional minor modes are restored automatically; they should not be listed here.") -(custom-autoload (quote desktop-locals-to-save) "desktop") +(custom-autoload (quote desktop-locals-to-save) "desktop" t) (defvar desktop-save-buffer nil "\ When non-nil, save buffer status in desktop file. @@ -6531,7 +6583,7 @@ ;;;### (autoloads (gnus-article-outlook-deuglify-article gnus-outlook-deuglify-article ;;;;;; gnus-article-outlook-repair-attribution gnus-article-outlook-unwrap-lines) -;;;;;; "deuglify" "gnus/deuglify.el" (17494 22065)) +;;;;;; "deuglify" "gnus/deuglify.el" (17495 43954)) ;;; Generated autoloads from gnus/deuglify.el (autoload (quote gnus-article-outlook-unwrap-lines) "deuglify" "\ @@ -6564,7 +6616,7 @@ ;;;*** ;;;### (autoloads (devanagari-post-read-conversion devanagari-compose-region) -;;;;;; "devan-util" "language/devan-util.el" (17097 33525)) +;;;;;; "devan-util" "language/devan-util.el" (17102 18768)) ;;; Generated autoloads from language/devan-util.el (defconst devanagari-consonant "[\x51ad5-\x51af9\x51b38-\x51b3f]") @@ -6582,7 +6634,7 @@ ;;;*** ;;;### (autoloads (diary-mode diary-mail-entries diary) "diary-lib" -;;;;;; "calendar/diary-lib.el" (17521 64537)) +;;;;;; "calendar/diary-lib.el" (17520 49736)) ;;; Generated autoloads from calendar/diary-lib.el (autoload (quote diary) "diary-lib" "\ @@ -6628,18 +6680,18 @@ ;;;*** ;;;### (autoloads (diff-backup diff diff-command diff-switches) "diff" -;;;;;; "diff.el" (17578 34771)) +;;;;;; "diff.el" (17683 64071)) ;;; Generated autoloads from diff.el (defvar diff-switches "-c" "\ *A string or list of strings specifying switches to be passed to diff.") -(custom-autoload (quote diff-switches) "diff") +(custom-autoload (quote diff-switches) "diff" t) (defvar diff-command "diff" "\ *The command to use to run diff.") -(custom-autoload (quote diff-command) "diff") +(custom-autoload (quote diff-command) "diff" t) (autoload (quote diff) "diff" "\ Find and display the differences between OLD and NEW files. @@ -6662,7 +6714,7 @@ ;;;*** ;;;### (autoloads (diff-minor-mode diff-mode) "diff-mode" "diff-mode.el" -;;;;;; (17578 34771)) +;;;;;; (17670 57734)) ;;; Generated autoloads from diff-mode.el (autoload (quote diff-mode) "diff-mode" "\ @@ -6692,7 +6744,7 @@ ;;;;;; dired dired-copy-preserve-time dired-dwim-target dired-keep-marker-symlink ;;;;;; dired-keep-marker-hardlink dired-keep-marker-copy dired-keep-marker-rename ;;;;;; dired-trivial-filenames dired-ls-F-marks-symlinks dired-listing-switches) -;;;;;; "dired" "dired.el" (17578 34771)) +;;;;;; "dired" "dired.el" (17697 23215)) ;;; Generated autoloads from dired.el (defvar dired-listing-switches "-al" "\ @@ -6704,7 +6756,7 @@ some of the `ls' switches are not supported; see the doc string of `insert-directory' on `ls-lisp.el' for more details.") -(custom-autoload (quote dired-listing-switches) "dired") +(custom-autoload (quote dired-listing-switches) "dired" t) (defvar dired-chown-program (if (memq system-type (quote (hpux dgux usg-unix-v irix linux gnu/linux cygwin))) "chown" (if (file-exists-p "/usr/sbin/chown") "/usr/sbin/chown" "/etc/chown")) "\ Name of chown command (usually `chown' or `/etc/chown').") @@ -6723,14 +6775,14 @@ don't care about symbolic links which really end in a @, you can always set this variable to t.") -(custom-autoload (quote dired-ls-F-marks-symlinks) "dired") +(custom-autoload (quote dired-ls-F-marks-symlinks) "dired" t) (defvar dired-trivial-filenames "^\\.\\.?$\\|^#" "\ *Regexp of files to skip when finding first file of a directory. A value of nil means move to the subdir line. A value of t means move to first file.") -(custom-autoload (quote dired-trivial-filenames) "dired") +(custom-autoload (quote dired-trivial-filenames) "dired" t) (defvar dired-keep-marker-rename t "\ *Controls marking of renamed files. @@ -6738,28 +6790,28 @@ If a character, renamed files (whether previously marked or not) are afterward marked with that character.") -(custom-autoload (quote dired-keep-marker-rename) "dired") +(custom-autoload (quote dired-keep-marker-rename) "dired" t) (defvar dired-keep-marker-copy 67 "\ *Controls marking of copied files. If t, copied files are marked if and as the corresponding original files were. If a character, copied files are unconditionally marked with that character.") -(custom-autoload (quote dired-keep-marker-copy) "dired") +(custom-autoload (quote dired-keep-marker-copy) "dired" t) (defvar dired-keep-marker-hardlink 72 "\ *Controls marking of newly made hard links. If t, they are marked if and as the files linked to were marked. If a character, new links are unconditionally marked with that character.") -(custom-autoload (quote dired-keep-marker-hardlink) "dired") +(custom-autoload (quote dired-keep-marker-hardlink) "dired" t) (defvar dired-keep-marker-symlink 89 "\ *Controls marking of newly made symbolic links. If t, they are marked if and as the files linked to were marked. If a character, new links are unconditionally marked with that character.") -(custom-autoload (quote dired-keep-marker-symlink) "dired") +(custom-autoload (quote dired-keep-marker-symlink) "dired" t) (defvar dired-dwim-target nil "\ *If non-nil, Dired tries to guess a default target directory. @@ -6768,13 +6820,13 @@ The target is used in the prompt for file copy, rename etc.") -(custom-autoload (quote dired-dwim-target) "dired") +(custom-autoload (quote dired-dwim-target) "dired" t) (defvar dired-copy-preserve-time t "\ *If non-nil, Dired preserves the last-modified time in a file copy. \(This works on only some systems.)") -(custom-autoload (quote dired-copy-preserve-time) "dired") +(custom-autoload (quote dired-copy-preserve-time) "dired" t) (defvar dired-directory nil "\ The directory name or wildcard spec that this dired directory lists. @@ -6897,7 +6949,7 @@ ;;;;;; dired-run-shell-command dired-do-shell-command dired-clean-directory ;;;;;; dired-do-print dired-do-touch dired-do-chown dired-do-chgrp ;;;;;; dired-do-chmod dired-compare-directories dired-backup-diff -;;;;;; dired-diff) "dired-aux" "dired-aux.el" (17521 64535)) +;;;;;; dired-diff) "dired-aux" "dired-aux.el" (17718 28532)) ;;; Generated autoloads from dired-aux.el (autoload (quote dired-diff) "dired-aux" "\ @@ -7123,6 +7175,9 @@ suggested for the target directory depends on the value of `dired-dwim-target', which see. +This command copies symbolic links by creating new ones, +like `cp -d'. + \(fn &optional ARG)" t nil) (autoload (quote dired-do-symlink) "dired-aux" "\ @@ -7306,7 +7361,7 @@ ;;;*** -;;;### (autoloads (dired-jump) "dired-x" "dired-x.el" (17521 64536)) +;;;### (autoloads (dired-jump) "dired-x" "dired-x.el" (17656 37701)) ;;; Generated autoloads from dired-x.el (autoload (quote dired-jump) "dired-x" "\ @@ -7320,7 +7375,7 @@ ;;;*** -;;;### (autoloads (dirtrack) "dirtrack" "dirtrack.el" (17582 31039)) +;;;### (autoloads (dirtrack) "dirtrack" "dirtrack.el" (17582 40396)) ;;; Generated autoloads from dirtrack.el (autoload (quote dirtrack) "dirtrack" "\ @@ -7339,8 +7394,8 @@ ;;;*** -;;;### (autoloads (disassemble) "disass" "emacs-lisp/disass.el" (17383 -;;;;;; 32137)) +;;;### (autoloads (disassemble) "disass" "emacs-lisp/disass.el" (17385 +;;;;;; 8489)) ;;; Generated autoloads from emacs-lisp/disass.el (autoload (quote disassemble) "disass" "\ @@ -7358,7 +7413,7 @@ ;;;;;; standard-display-graphic standard-display-g1 standard-display-ascii ;;;;;; standard-display-default standard-display-8bit describe-current-display-table ;;;;;; describe-display-table set-display-table-slot display-table-slot -;;;;;; make-display-table) "disp-table" "disp-table.el" (17383 32097)) +;;;;;; make-display-table) "disp-table" "disp-table.el" (17385 8483)) ;;; Generated autoloads from disp-table.el (autoload (quote make-display-table) "disp-table" "\ @@ -7459,7 +7514,7 @@ ;;;*** ;;;### (autoloads (dissociated-press) "dissociate" "play/dissociate.el" -;;;;;; (17383 32181)) +;;;;;; (17385 8495)) ;;; Generated autoloads from play/dissociate.el (autoload (quote dissociated-press) "dissociate" "\ @@ -7475,10 +7530,10 @@ ;;;*** -;;;### (autoloads (dnd-protocol-alist) "dnd" "dnd.el" (17521 64536)) +;;;### (autoloads (dnd-protocol-alist) "dnd" "dnd.el" (17709 24917)) ;;; Generated autoloads from dnd.el -(defvar dnd-protocol-alist (quote (("^file:///" . dnd-open-local-file) ("^file://" . dnd-open-file) ("^file:" . dnd-open-local-file))) "\ +(defvar dnd-protocol-alist (quote (("^file:///" . dnd-open-local-file) ("^file://" . dnd-open-file) ("^file:" . dnd-open-local-file) ("^\\(https?\\|ftp\\|file\\|nfs\\)://" . dnd-open-file))) "\ The functions to call for different protocols when a drop is made. This variable is used by `dnd-handle-one-url' and `dnd-handle-file-name'. The list contains of (REGEXP . FUNCTION) pairs. @@ -7491,12 +7546,12 @@ The function shall return the action done (move, copy, link or private) if some action was made, or nil if the URL is ignored.") -(custom-autoload (quote dnd-protocol-alist) "dnd") +(custom-autoload (quote dnd-protocol-alist) "dnd" t) ;;;*** ;;;### (autoloads (dns-mode-soa-increment-serial dns-mode) "dns-mode" -;;;;;; "textmodes/dns-mode.el" (17383 32186)) +;;;;;; "textmodes/dns-mode.el" (17632 41886)) ;;; Generated autoloads from textmodes/dns-mode.el (autoload (quote dns-mode) "dns-mode" "\ @@ -7510,6 +7565,7 @@ Turning on DNS mode runs `dns-mode-hook'. \(fn)" t nil) + (defalias 'zone-mode 'dns-mode) (autoload (quote dns-mode-soa-increment-serial) "dns-mode" "\ Locate SOA record and increment the serial field. @@ -7519,7 +7575,7 @@ ;;;*** -;;;### (autoloads (doctor) "doctor" "play/doctor.el" (17365 2741)) +;;;### (autoloads (doctor) "doctor" "play/doctor.el" (17366 25285)) ;;; Generated autoloads from play/doctor.el (autoload (quote doctor) "doctor" "\ @@ -7530,7 +7586,7 @@ ;;;*** ;;;### (autoloads (double-mode double-mode) "double" "double.el" -;;;;;; (17383 32097)) +;;;;;; (17385 8483)) ;;; Generated autoloads from double.el (defvar double-mode nil "\ @@ -7551,7 +7607,7 @@ ;;;*** -;;;### (autoloads (dunnet) "dunnet" "play/dunnet.el" (17582 28846)) +;;;### (autoloads (dunnet) "dunnet" "play/dunnet.el" (17579 53341)) ;;; Generated autoloads from play/dunnet.el (autoload (quote dunnet) "dunnet" "\ @@ -7562,7 +7618,7 @@ ;;;*** ;;;### (autoloads (gnus-earcon-display) "earcon" "gnus/earcon.el" -;;;;;; (17383 32154)) +;;;;;; (17385 8492)) ;;; Generated autoloads from gnus/earcon.el (autoload (quote gnus-earcon-display) "earcon" "\ @@ -7574,7 +7630,7 @@ ;;;### (autoloads (easy-mmode-defsyntax easy-mmode-defmap easy-mmode-define-keymap ;;;;;; define-global-minor-mode define-minor-mode) "easy-mmode" -;;;;;; "emacs-lisp/easy-mmode.el" (17585 4275)) +;;;;;; "emacs-lisp/easy-mmode.el" (17656 37701)) ;;; Generated autoloads from emacs-lisp/easy-mmode.el (defalias (quote easy-mmode-define-minor-mode) (quote define-minor-mode)) @@ -7666,8 +7722,8 @@ ;;;*** ;;;### (autoloads (easy-menu-change easy-menu-create-menu easy-menu-do-define -;;;;;; easy-menu-define) "easymenu" "emacs-lisp/easymenu.el" (17383 -;;;;;; 32138)) +;;;;;; easy-menu-define) "easymenu" "emacs-lisp/easymenu.el" (17385 +;;;;;; 8489)) ;;; Generated autoloads from emacs-lisp/easymenu.el (put (quote easy-menu-define) (quote lisp-indent-function) (quote defun)) @@ -7812,7 +7868,7 @@ ;;;;;; ebnf-eps-directory ebnf-spool-region ebnf-spool-buffer ebnf-spool-file ;;;;;; ebnf-spool-directory ebnf-print-region ebnf-print-buffer ;;;;;; ebnf-print-file ebnf-print-directory ebnf-customize) "ebnf2ps" -;;;;;; "progmodes/ebnf2ps.el" (17397 61566)) +;;;;;; "progmodes/ebnf2ps.el" (17690 51743)) ;;; Generated autoloads from progmodes/ebnf2ps.el (autoload (quote ebnf-customize) "ebnf2ps" "\ @@ -8071,8 +8127,8 @@ ;;;;;; ebrowse-tags-find-declaration-other-window ebrowse-tags-find-definition ;;;;;; ebrowse-tags-view-definition ebrowse-tags-find-declaration ;;;;;; ebrowse-tags-view-declaration ebrowse-member-mode ebrowse-electric-choose-tree -;;;;;; ebrowse-tree-mode) "ebrowse" "progmodes/ebrowse.el" (17590 -;;;;;; 36100)) +;;;;;; ebrowse-tree-mode) "ebrowse" "progmodes/ebrowse.el" (17601 +;;;;;; 9092)) ;;; Generated autoloads from progmodes/ebrowse.el (autoload (quote ebrowse-tree-mode) "ebrowse" "\ @@ -8223,7 +8279,7 @@ ;;;*** ;;;### (autoloads (electric-buffer-list) "ebuff-menu" "ebuff-menu.el" -;;;;;; (17383 32098)) +;;;;;; (17385 8483)) ;;; Generated autoloads from ebuff-menu.el (autoload (quote electric-buffer-list) "ebuff-menu" "\ @@ -8248,7 +8304,7 @@ ;;;*** ;;;### (autoloads (Electric-command-history-redo-expression) "echistory" -;;;;;; "echistory.el" (17383 32098)) +;;;;;; "echistory.el" (17385 8483)) ;;; Generated autoloads from echistory.el (autoload (quote Electric-command-history-redo-expression) "echistory" "\ @@ -8261,7 +8317,7 @@ ;;;### (autoloads (edebug-all-forms edebug-all-defs edebug-eval-top-level-form ;;;;;; edebug-basic-spec edebug-all-forms edebug-all-defs) "edebug" -;;;;;; "emacs-lisp/edebug.el" (17590 36099)) +;;;;;; "emacs-lisp/edebug.el" (17632 41885)) ;;; Generated autoloads from emacs-lisp/edebug.el (defvar edebug-all-defs nil "\ @@ -8275,14 +8331,14 @@ \(make-local-variable 'edebug-all-defs) in your `emacs-lisp-mode-hook'.") -(custom-autoload (quote edebug-all-defs) "edebug") +(custom-autoload (quote edebug-all-defs) "edebug" t) (defvar edebug-all-forms nil "\ *Non-nil evaluation of all forms will instrument for Edebug. This doesn't apply to loading or evaluations in the minibuffer. Use the command `edebug-all-forms' to toggle the value of this option.") -(custom-autoload (quote edebug-all-forms) "edebug") +(custom-autoload (quote edebug-all-forms) "edebug" t) (autoload (quote edebug-basic-spec) "edebug" "\ Return t if SPEC uses only extant spec symbols. @@ -8334,7 +8390,7 @@ ;;;;;; ediff-merge-directory-revisions ediff-merge-directories-with-ancestor ;;;;;; ediff-merge-directories ediff-directories3 ediff-directory-revisions ;;;;;; ediff-directories ediff-buffers3 ediff-buffers ediff-backup -;;;;;; ediff-files3 ediff-files) "ediff" "ediff.el" (17578 34771)) +;;;;;; ediff-files3 ediff-files) "ediff" "ediff.el" (17726 28398)) ;;; Generated autoloads from ediff.el (autoload (quote ediff-files) "ediff" "\ @@ -8572,7 +8628,7 @@ ;;;*** ;;;### (autoloads (ediff-customize) "ediff-help" "ediff-help.el" -;;;;;; (17401 56225)) +;;;;;; (17403 27596)) ;;; Generated autoloads from ediff-help.el (autoload (quote ediff-customize) "ediff-help" "\ @@ -8582,7 +8638,7 @@ ;;;*** -;;;### (autoloads nil "ediff-hook" "ediff-hook.el" (17401 56225)) +;;;### (autoloads nil "ediff-hook" "ediff-hook.el" (17403 27596)) ;;; Generated autoloads from ediff-hook.el (defvar ediff-window-setup-function) @@ -8595,7 +8651,7 @@ ;;;*** ;;;### (autoloads (ediff-show-registry) "ediff-mult" "ediff-mult.el" -;;;;;; (17578 34771)) +;;;;;; (17726 28398)) ;;; Generated autoloads from ediff-mult.el (autoload (quote ediff-show-registry) "ediff-mult" "\ @@ -8608,7 +8664,7 @@ ;;;*** ;;;### (autoloads (ediff-toggle-use-toolbar ediff-toggle-multiframe) -;;;;;; "ediff-util" "ediff-util.el" (17401 56227)) +;;;;;; "ediff-util" "ediff-util.el" (17679 3707)) ;;; Generated autoloads from ediff-util.el (autoload (quote ediff-toggle-multiframe) "ediff-util" "\ @@ -8629,7 +8685,7 @@ ;;;### (autoloads (format-kbd-macro read-kbd-macro edit-named-kbd-macro ;;;;;; edit-last-kbd-macro edit-kbd-macro) "edmacro" "edmacro.el" -;;;;;; (17383 32100)) +;;;;;; (17618 8193)) ;;; Generated autoloads from edmacro.el (defvar edmacro-eight-bits nil "\ @@ -8682,7 +8738,7 @@ ;;;*** ;;;### (autoloads (edt-emulation-on edt-set-scroll-margins) "edt" -;;;;;; "emulation/edt.el" (17383 32143)) +;;;;;; "emulation/edt.el" (17385 8491)) ;;; Generated autoloads from emulation/edt.el (autoload (quote edt-set-scroll-margins) "edt" "\ @@ -8700,7 +8756,7 @@ ;;;*** ;;;### (autoloads (electric-helpify with-electric-help) "ehelp" "ehelp.el" -;;;;;; (17383 32100)) +;;;;;; (17385 8484)) ;;; Generated autoloads from ehelp.el (autoload (quote with-electric-help) "ehelp" "\ @@ -8738,13 +8794,13 @@ ;;;*** ;;;### (autoloads (turn-on-eldoc-mode eldoc-mode eldoc-minor-mode-string) -;;;;;; "eldoc" "emacs-lisp/eldoc.el" (17383 32138)) +;;;;;; "eldoc" "emacs-lisp/eldoc.el" (17665 54136)) ;;; Generated autoloads from emacs-lisp/eldoc.el (defvar eldoc-minor-mode-string " ElDoc" "\ *String to display in mode line when Eldoc Mode is enabled; nil for none.") -(custom-autoload (quote eldoc-minor-mode-string) "eldoc") +(custom-autoload (quote eldoc-minor-mode-string) "eldoc" t) (autoload (quote eldoc-mode) "eldoc" "\ Toggle ElDoc mode on or off. @@ -8776,8 +8832,8 @@ ;;;*** -;;;### (autoloads (elide-head) "elide-head" "elide-head.el" (17383 -;;;;;; 32100)) +;;;### (autoloads (elide-head) "elide-head" "elide-head.el" (17385 +;;;;;; 8484)) ;;; Generated autoloads from elide-head.el (autoload (quote elide-head) "elide-head" "\ @@ -8793,7 +8849,7 @@ ;;;*** ;;;### (autoloads (elint-initialize) "elint" "emacs-lisp/elint.el" -;;;;;; (17383 32138)) +;;;;;; (17385 8490)) ;;; Generated autoloads from emacs-lisp/elint.el (autoload (quote elint-initialize) "elint" "\ @@ -8804,8 +8860,8 @@ ;;;*** ;;;### (autoloads (elp-results elp-instrument-package elp-instrument-list -;;;;;; elp-instrument-function) "elp" "emacs-lisp/elp.el" (17383 -;;;;;; 32138)) +;;;;;; elp-instrument-function) "elp" "emacs-lisp/elp.el" (17385 +;;;;;; 8490)) ;;; Generated autoloads from emacs-lisp/elp.el (autoload (quote elp-instrument-function) "elp" "\ @@ -8839,7 +8895,7 @@ ;;;*** ;;;### (autoloads (report-emacs-bug) "emacsbug" "mail/emacsbug.el" -;;;;;; (17383 32168)) +;;;;;; (17385 8494)) ;;; Generated autoloads from mail/emacsbug.el (autoload (quote report-emacs-bug) "emacsbug" "\ @@ -8854,7 +8910,7 @@ ;;;;;; emerge-revisions emerge-files-with-ancestor-remote emerge-files-remote ;;;;;; emerge-files-with-ancestor-command emerge-files-command emerge-buffers-with-ancestor ;;;;;; emerge-buffers emerge-files-with-ancestor emerge-files) "emerge" -;;;;;; "emerge.el" (17167 12307)) +;;;;;; "emerge.el" (17167 2962)) ;;; Generated autoloads from emerge.el (defvar menu-bar-emerge-menu (make-sparse-keymap "Emerge")) @@ -8932,7 +8988,7 @@ ;;;*** ;;;### (autoloads (encoded-kbd-mode) "encoded-kb" "international/encoded-kb.el" -;;;;;; (17097 33520)) +;;;;;; (17102 18713)) ;;; Generated autoloads from international/encoded-kb.el (defvar encoded-kbd-mode nil "\ @@ -8943,6 +8999,8 @@ (custom-autoload (quote encoded-kbd-mode) "encoded-kb") +(put (quote encoded-kbd-mode) (quote custom-set) (quote custom-set-minor-mode)) + (autoload (quote encoded-kbd-mode) "encoded-kb" "\ Toggle Encoded-kbd minor mode. With arg, turn Encoded-kbd mode on if and only if arg is positive. @@ -8960,7 +9018,7 @@ ;;;*** ;;;### (autoloads (enriched-decode enriched-encode enriched-mode) -;;;;;; "enriched" "textmodes/enriched.el" (17383 32186)) +;;;;;; "enriched" "textmodes/enriched.el" (17385 8496)) ;;; Generated autoloads from textmodes/enriched.el (autoload (quote enriched-mode) "enriched" "\ @@ -8990,8 +9048,8 @@ ;;;*** -;;;### (autoloads (erc-select erc-select-read-args) "erc" "erc/erc.el" -;;;;;; (17484 52428)) +;;;### (autoloads (erc-handle-irc-url erc-select erc-select-read-args) +;;;;;; "erc" "erc/erc.el" (17624 52650)) ;;; Generated autoloads from erc/erc.el (autoload (quote erc-select-read-args) "erc" "\ @@ -9009,23 +9067,32 @@ (full-name (erc-compute-full-name))) That is, if called with + (erc-select :server \"irc.freenode.net\" :full-name \"Harry S Truman\") + server and full-name will be set to those values, whereas -erc-compute-port, erc-compute-nick and erc-compute-full-name will -be invoked for those parameters' values +`erc-compute-port', `erc-compute-nick' and `erc-compute-full-name' will +be invoked for the values of the other parameters. \(fn &key (SERVER (erc-compute-server)) (PORT (erc-compute-port)) (NICK (erc-compute-nick)) PASSWORD (FULL-NAME (erc-compute-full-name)))" t nil) -;;;*** - -;;;### (autoloads nil "erc-autoaway" "erc/erc-autoaway.el" (17397 -;;;;;; 61550)) +(autoload (quote erc-handle-irc-url) "erc" "\ +Use ERC to IRC on HOST:PORT in CHANNEL as USER with PASSWORD. +If ERC is already connected to HOST:PORT, simply /join CHANNEL. +Otherwise, connect to HOST:PORT as USER and /join CHANNEL. + +\(fn HOST PORT CHANNEL USER PASSWORD)" nil nil) + +;;;*** + +;;;### (autoloads nil "erc-autoaway" "erc/erc-autoaway.el" (17601 +;;;;;; 9092)) ;;; Generated autoloads from erc/erc-autoaway.el (autoload 'erc-autoaway-mode "erc-autoaway") ;;;*** -;;;### (autoloads nil "erc-button" "erc/erc-button.el" (17457 37501)) +;;;### (autoloads nil "erc-button" "erc/erc-button.el" (17447 52274)) ;;; Generated autoloads from erc/erc-button.el (autoload 'erc-button-mode "erc-button" nil t) @@ -9038,7 +9105,7 @@ ;;;*** ;;;### (autoloads (erc-ctcp-query-DCC pcomplete/erc-mode/DCC erc-cmd-DCC) -;;;;;; "erc-dcc" "erc/erc-dcc.el" (17397 61550)) +;;;;;; "erc-dcc" "erc/erc-dcc.el" (17393 3826)) ;;; Generated autoloads from erc/erc-dcc.el (autoload (quote erc-cmd-DCC) "erc-dcc" "\ @@ -9070,7 +9137,7 @@ ;;;;;; erc-ezb-add-session erc-ezb-end-of-session-list erc-ezb-init-session-list ;;;;;; erc-ezb-identify erc-ezb-notice-autodetect erc-ezb-lookup-action ;;;;;; erc-ezb-get-login erc-cmd-ezb) "erc-ezbounce" "erc/erc-ezbounce.el" -;;;;;; (17484 52428)) +;;;;;; (17468 10541)) ;;; Generated autoloads from erc/erc-ezbounce.el (autoload (quote erc-cmd-ezb) "erc-ezbounce" "\ @@ -9132,8 +9199,8 @@ ;;;*** -;;;### (autoloads (erc-fill) "erc-fill" "erc/erc-fill.el" (17397 -;;;;;; 61550)) +;;;### (autoloads (erc-fill) "erc-fill" "erc/erc-fill.el" (17391 +;;;;;; 39324)) ;;; Generated autoloads from erc/erc-fill.el (autoload 'erc-fill-mode "erc-fill" nil t) @@ -9153,8 +9220,9 @@ ;;;*** ;;;### (autoloads (erc-identd-stop erc-identd-start) "erc-identd" -;;;;;; "erc/erc-identd.el" (17457 37501)) +;;;;;; "erc/erc-identd.el" (17601 9092)) ;;; Generated autoloads from erc/erc-identd.el + (autoload 'erc-identd-mode "erc-identd") (autoload (quote erc-identd-start) "erc-identd" "\ Start an identd server listening to port 8113. @@ -9174,7 +9242,7 @@ ;;;*** ;;;### (autoloads (erc-create-imenu-index) "erc-imenu" "erc/erc-imenu.el" -;;;;;; (17397 61551)) +;;;;;; (17601 9092)) ;;; Generated autoloads from erc/erc-imenu.el (autoload (quote erc-create-imenu-index) "erc-imenu" "\ @@ -9184,14 +9252,14 @@ ;;;*** -;;;### (autoloads nil "erc-join" "erc/erc-join.el" (17484 52428)) +;;;### (autoloads nil "erc-join" "erc/erc-join.el" (17468 10541)) ;;; Generated autoloads from erc/erc-join.el (autoload 'erc-autojoin-mode "erc-join" nil t) ;;;*** ;;;### (autoloads (erc-chanlist erc-list-channels) "erc-list" "erc/erc-list.el" -;;;;;; (17397 61551)) +;;;;;; (17391 39324)) ;;; Generated autoloads from erc/erc-list.el (autoload 'erc-list-mode "erc-list") @@ -9212,7 +9280,7 @@ ;;;*** ;;;### (autoloads (erc-save-buffer-in-logs erc-logging-enabled) "erc-log" -;;;;;; "erc/erc-log.el" (17397 61551)) +;;;;;; "erc/erc-log.el" (17624 52650)) ;;; Generated autoloads from erc/erc-log.el (autoload 'erc-log-mode "erc-log" nil t) @@ -9244,7 +9312,7 @@ ;;;### (autoloads (erc-delete-dangerous-host erc-add-dangerous-host ;;;;;; erc-delete-keyword erc-add-keyword erc-delete-fool erc-add-fool ;;;;;; erc-delete-pal erc-add-pal) "erc-match" "erc/erc-match.el" -;;;;;; (17397 61551)) +;;;;;; (17632 41885)) ;;; Generated autoloads from erc/erc-match.el (autoload 'erc-match-mode "erc-match") @@ -9291,7 +9359,7 @@ ;;;*** ;;;### (autoloads (erc-cmd-WHOLEFT) "erc-netsplit" "erc/erc-netsplit.el" -;;;;;; (17484 52428)) +;;;;;; (17468 10541)) ;;; Generated autoloads from erc/erc-netsplit.el (autoload 'erc-netsplit-mode "erc-netsplit") @@ -9321,7 +9389,7 @@ ;;;*** ;;;### (autoloads (pcomplete/erc-mode/NOTIFY erc-cmd-NOTIFY) "erc-notify" -;;;;;; "erc/erc-notify.el" (17397 61552)) +;;;;;; "erc/erc-notify.el" (17391 39324)) ;;; Generated autoloads from erc/erc-notify.el (autoload 'erc-notify-mode "erc-notify" nil t) @@ -9339,26 +9407,26 @@ ;;;*** -;;;### (autoloads nil "erc-page" "erc/erc-page.el" (17397 61552)) +;;;### (autoloads nil "erc-page" "erc/erc-page.el" (17391 39324)) ;;; Generated autoloads from erc/erc-page.el (autoload 'erc-page-mode "erc-page") ;;;*** -;;;### (autoloads nil "erc-pcomplete" "erc/erc-pcomplete.el" (17397 -;;;;;; 61552)) +;;;### (autoloads nil "erc-pcomplete" "erc/erc-pcomplete.el" (17601 +;;;;;; 9092)) ;;; Generated autoloads from erc/erc-pcomplete.el (autoload 'erc-completion-mode "erc-pcomplete" nil t) ;;;*** -;;;### (autoloads nil "erc-replace" "erc/erc-replace.el" (17397 61552)) +;;;### (autoloads nil "erc-replace" "erc/erc-replace.el" (17391 39324)) ;;; Generated autoloads from erc/erc-replace.el (autoload 'erc-replace-mode "erc-replace") ;;;*** -;;;### (autoloads nil "erc-ring" "erc/erc-ring.el" (17397 61552)) +;;;### (autoloads nil "erc-ring" "erc/erc-ring.el" (17391 39324)) ;;; Generated autoloads from erc/erc-ring.el (autoload 'erc-ring-mode "erc-ring" nil t) @@ -9382,14 +9450,14 @@ ;;;*** -;;;### (autoloads nil "erc-sound" "erc/erc-sound.el" (17397 61552)) +;;;### (autoloads nil "erc-sound" "erc/erc-sound.el" (17391 39324)) ;;; Generated autoloads from erc/erc-sound.el (autoload 'erc-sound-mode "erc-sound") ;;;*** ;;;### (autoloads (erc-speedbar-browser) "erc-speedbar" "erc/erc-speedbar.el" -;;;;;; (17397 61552)) +;;;;;; (17391 39324)) ;;; Generated autoloads from erc/erc-speedbar.el (autoload (quote erc-speedbar-browser) "erc-speedbar" "\ @@ -9400,20 +9468,20 @@ ;;;*** -;;;### (autoloads nil "erc-spelling" "erc/erc-spelling.el" (17397 -;;;;;; 61552)) +;;;### (autoloads nil "erc-spelling" "erc/erc-spelling.el" (17618 +;;;;;; 8193)) ;;; Generated autoloads from erc/erc-spelling.el (autoload 'erc-spelling-mode "erc-spelling" nil t) ;;;*** -;;;### (autoloads nil "erc-stamp" "erc/erc-stamp.el" (17397 61552)) +;;;### (autoloads nil "erc-stamp" "erc/erc-stamp.el" (17395 55370)) ;;; Generated autoloads from erc/erc-stamp.el (autoload 'erc-timestamp-mode "erc-stamp" nil t) ;;;*** -;;;### (autoloads nil "erc-track" "erc/erc-track.el" (17397 61552)) +;;;### (autoloads nil "erc-track" "erc/erc-track.el" (17601 9092)) ;;; Generated autoloads from erc/erc-track.el (autoload 'erc-track-mode "erc-track" nil t) (autoload 'erc-track-when-inactive-mode "erc-track" nil t) @@ -9421,7 +9489,7 @@ ;;;*** ;;;### (autoloads (erc-truncate-buffer erc-truncate-buffer-to-size) -;;;;;; "erc-truncate" "erc/erc-truncate.el" (17397 61552)) +;;;;;; "erc-truncate" "erc/erc-truncate.el" (17391 39324)) ;;; Generated autoloads from erc/erc-truncate.el (autoload 'erc-truncate-mode "erc-truncate" nil t) @@ -9441,7 +9509,7 @@ ;;;*** ;;;### (autoloads (erc-xdcc-add-file) "erc-xdcc" "erc/erc-xdcc.el" -;;;;;; (17397 61553)) +;;;;;; (17391 39324)) ;;; Generated autoloads from erc/erc-xdcc.el (autoload (quote erc-xdcc-add-file) "erc-xdcc" "\ @@ -9451,8 +9519,8 @@ ;;;*** -;;;### (autoloads (eshell-mode) "esh-mode" "eshell/esh-mode.el" (17383 -;;;;;; 32152)) +;;;### (autoloads (eshell-mode) "esh-mode" "eshell/esh-mode.el" (17385 +;;;;;; 8492)) ;;; Generated autoloads from eshell/esh-mode.el (autoload (quote eshell-mode) "esh-mode" "\ @@ -9464,8 +9532,8 @@ ;;;*** -;;;### (autoloads (eshell-test) "esh-test" "eshell/esh-test.el" (17383 -;;;;;; 32152)) +;;;### (autoloads (eshell-test) "esh-test" "eshell/esh-test.el" (17385 +;;;;;; 8492)) ;;; Generated autoloads from eshell/esh-test.el (autoload (quote eshell-test) "esh-test" "\ @@ -9476,7 +9544,7 @@ ;;;*** ;;;### (autoloads (eshell-report-bug eshell-command-result eshell-command -;;;;;; eshell) "eshell" "eshell/eshell.el" (17432 37360)) +;;;;;; eshell) "eshell" "eshell/eshell.el" (17427 10521)) ;;; Generated autoloads from eshell/eshell.el (autoload (quote eshell) "eshell" "\ @@ -9522,7 +9590,7 @@ ;;;;;; visit-tags-table tags-table-mode find-tag-default-function ;;;;;; find-tag-hook tags-add-tables tags-compression-info-list ;;;;;; tags-table-list tags-case-fold-search) "etags" "progmodes/etags.el" -;;;;;; (17420 36090)) +;;;;;; (17408 40149)) ;;; Generated autoloads from progmodes/etags.el (defvar tags-file-name nil "\ @@ -9824,7 +9892,7 @@ ;;;;;; ethio-fidel-to-sera-buffer ethio-fidel-to-sera-region ethio-sera-to-fidel-marker ;;;;;; ethio-sera-to-fidel-mail ethio-sera-to-fidel-mail-or-marker ;;;;;; ethio-sera-to-fidel-buffer ethio-sera-to-fidel-region setup-ethiopic-environment-internal) -;;;;;; "ethio-util" "language/ethio-util.el" (17578 34777)) +;;;;;; "ethio-util" "language/ethio-util.el" (17551 7908)) ;;; Generated autoloads from language/ethio-util.el (autoload (quote setup-ethiopic-environment-internal) "ethio-util" "\ @@ -10019,7 +10087,7 @@ ;;;### (autoloads (eudc-load-eudc eudc-query-form eudc-expand-inline ;;;;;; eudc-get-phone eudc-get-email eudc-set-server) "eudc" "net/eudc.el" -;;;;;; (17383 32175)) +;;;;;; (17385 8494)) ;;; Generated autoloads from net/eudc.el (autoload (quote eudc-set-server) "eudc" "\ @@ -10075,7 +10143,7 @@ ;;;### (autoloads (eudc-display-jpeg-as-button eudc-display-jpeg-inline ;;;;;; eudc-display-sound eudc-display-mail eudc-display-url eudc-display-generic-binary) -;;;;;; "eudc-bob" "net/eudc-bob.el" (17383 32175)) +;;;;;; "eudc-bob" "net/eudc-bob.el" (17385 8494)) ;;; Generated autoloads from net/eudc-bob.el (autoload (quote eudc-display-generic-binary) "eudc-bob" "\ @@ -10111,7 +10179,7 @@ ;;;*** ;;;### (autoloads (eudc-try-bbdb-insert eudc-insert-record-at-point-into-bbdb) -;;;;;; "eudc-export" "net/eudc-export.el" (17383 32175)) +;;;;;; "eudc-export" "net/eudc-export.el" (17385 8494)) ;;; Generated autoloads from net/eudc-export.el (autoload (quote eudc-insert-record-at-point-into-bbdb) "eudc-export" "\ @@ -10128,7 +10196,7 @@ ;;;*** ;;;### (autoloads (eudc-edit-hotlist) "eudc-hotlist" "net/eudc-hotlist.el" -;;;;;; (17383 32175)) +;;;;;; (17385 8494)) ;;; Generated autoloads from net/eudc-hotlist.el (autoload (quote eudc-edit-hotlist) "eudc-hotlist" "\ @@ -10138,8 +10206,8 @@ ;;;*** -;;;### (autoloads (ewoc-create) "ewoc" "emacs-lisp/ewoc.el" (17578 -;;;;;; 34775)) +;;;### (autoloads (ewoc-create) "ewoc" "emacs-lisp/ewoc.el" (17531 +;;;;;; 7384)) ;;; Generated autoloads from emacs-lisp/ewoc.el (autoload (quote ewoc-create) "ewoc" "\ @@ -10168,7 +10236,7 @@ ;;;### (autoloads (executable-make-buffer-file-executable-if-script-p ;;;;;; executable-self-display executable-set-magic executable-interpret ;;;;;; executable-command-find-posix-p) "executable" "progmodes/executable.el" -;;;;;; (17397 61567)) +;;;;;; (17394 12937)) ;;; Generated autoloads from progmodes/executable.el (autoload (quote executable-command-find-posix-p) "executable" "\ @@ -10210,7 +10278,7 @@ ;;;*** ;;;### (autoloads (expand-jump-to-next-slot expand-jump-to-previous-slot -;;;;;; expand-add-abbrevs) "expand" "expand.el" (17383 32101)) +;;;;;; expand-add-abbrevs) "expand" "expand.el" (17385 8484)) ;;; Generated autoloads from expand.el (autoload (quote expand-add-abbrevs) "expand" "\ @@ -10253,7 +10321,7 @@ ;;;*** -;;;### (autoloads (f90-mode) "f90" "progmodes/f90.el" (17397 61567)) +;;;### (autoloads (f90-mode) "f90" "progmodes/f90.el" (17386 33146)) ;;; Generated autoloads from progmodes/f90.el (autoload (quote f90-mode) "f90" "\ @@ -10320,7 +10388,7 @@ ;;;;;; facemenu-remove-all facemenu-remove-face-props facemenu-set-read-only ;;;;;; facemenu-set-intangible facemenu-set-invisible facemenu-set-face-from-menu ;;;;;; facemenu-set-background facemenu-set-foreground facemenu-set-face) -;;;;;; "facemenu" "facemenu.el" (17578 34771)) +;;;;;; "facemenu" "facemenu.el" (17718 28532)) ;;; Generated autoloads from facemenu.el (define-key global-map "\M-o" 'facemenu-keymap) (autoload 'facemenu-keymap "facemenu" "Keymap for face-changing commands." t 'keymap) @@ -10367,19 +10435,24 @@ (defalias (quote facemenu-menu) facemenu-menu) (autoload (quote facemenu-set-face) "facemenu" "\ -Add FACE to the region or next character typed. -This adds FACE to the top of the face list; any faces lower on the list that -will not show through at all will be removed. - -Interactively, reads the face name with the minibuffer. - -If the region is active (normally true except in Transient Mark mode) -and there is no prefix argument, this command sets the region to the -requested face. - -Otherwise, this command specifies the face for the next character -inserted. Moving point or switching buffers before -typing a character to insert cancels the specification. +Apply FACE to the region or next character typed. + +If the region is active (normally true except in Transient +Mark mode) and nonempty, and there is no prefix argument, +this command applies FACE to the region. Otherwise, it applies FACE +to the faces to use for the next character +inserted. (Moving point or switching buffers before typing +a character to insert cancels the specification.) + +If FACE is `default', to \"apply\" it means clearing +the list of faces to be used. For any other value of FACE, +to \"apply\" it means putting FACE at the front of the list +of faces to be used, and removing any faces further +along in the list that would be completely overridden by +preceding faces (including FACE). + +This command can also add FACE to the menu of faces, +if `facemenu-listed-faces' says to do that. \(fn FACE &optional START END)" t nil) @@ -10483,7 +10556,7 @@ ;;;*** ;;;### (autoloads (turn-on-fast-lock fast-lock-mode) "fast-lock" -;;;;;; "obsolete/fast-lock.el" (17383 32179)) +;;;;;; "obsolete/fast-lock.el" (17676 15926)) ;;; Generated autoloads from obsolete/fast-lock.el (autoload (quote fast-lock-mode) "fast-lock" "\ @@ -10524,7 +10597,7 @@ ;;;### (autoloads (feedmail-queue-reminder feedmail-run-the-queue ;;;;;; feedmail-run-the-queue-global-prompt feedmail-run-the-queue-no-prompts -;;;;;; feedmail-send-it) "feedmail" "mail/feedmail.el" (17259 50162)) +;;;;;; feedmail-send-it) "feedmail" "mail/feedmail.el" (17660 25612)) ;;; Generated autoloads from mail/feedmail.el (autoload (quote feedmail-send-it) "feedmail" "\ @@ -10578,7 +10651,7 @@ ;;;*** ;;;### (autoloads (ffap-bindings dired-at-point ffap-at-mouse ffap-menu -;;;;;; find-file-at-point ffap-next) "ffap" "ffap.el" (17401 56228)) +;;;;;; find-file-at-point ffap-next) "ffap" "ffap.el" (17697 23215)) ;;; Generated autoloads from ffap.el (autoload (quote ffap-next) "ffap" "\ @@ -10634,10 +10707,53 @@ ;;;*** -;;;### (autoloads (file-cache-minibuffer-complete) "filecache" "filecache.el" -;;;;;; (17383 32101)) +;;;### (autoloads (file-cache-minibuffer-complete file-cache-add-directory-recursively +;;;;;; file-cache-add-directory-using-locate file-cache-add-directory-using-find +;;;;;; file-cache-add-file file-cache-add-directory-list file-cache-add-directory) +;;;;;; "filecache" "filecache.el" (17669 23128)) ;;; Generated autoloads from filecache.el +(autoload (quote file-cache-add-directory) "filecache" "\ +Add DIRECTORY to the file cache. +If the optional REGEXP argument is non-nil, only files which match it will +be added to the cache. + +\(fn DIRECTORY &optional REGEXP)" t nil) + +(autoload (quote file-cache-add-directory-list) "filecache" "\ +Add DIRECTORY-LIST (a list of directory names) to the file cache. +If the optional REGEXP argument is non-nil, only files which match it +will be added to the cache. Note that the REGEXP is applied to the files +in each directory, not to the directory list itself. + +\(fn DIRECTORY-LIST &optional REGEXP)" t nil) + +(autoload (quote file-cache-add-file) "filecache" "\ +Add FILE to the file cache. + +\(fn FILE)" t nil) + +(autoload (quote file-cache-add-directory-using-find) "filecache" "\ +Use the `find' command to add files to the file cache. +Find is run in DIRECTORY. + +\(fn DIRECTORY)" t nil) + +(autoload (quote file-cache-add-directory-using-locate) "filecache" "\ +Use the `locate' command to add files to the file cache. +STRING is passed as an argument to the locate command. + +\(fn STRING)" t nil) + +(autoload (quote file-cache-add-directory-recursively) "filecache" "\ +Adds DIR and any subdirectories to the file-cache. +This function does not use any external programs +If the optional REGEXP argument is non-nil, only files which match it +will be added to the cache. Note that the REGEXP is applied to the files +in each directory, not to the directory list itself. + +\(fn DIR &optional REGEXP)" t nil) + (autoload (quote file-cache-minibuffer-complete) "filecache" "\ Complete a filename in the minibuffer using a preloaded cache. Filecache does two kinds of substitution: it completes on names in @@ -10653,8 +10769,8 @@ ;;;*** -;;;### (autoloads (filesets-init) "filesets" "filesets.el" (17383 -;;;;;; 32102)) +;;;### (autoloads (filesets-init) "filesets" "filesets.el" (17714 +;;;;;; 34817)) ;;; Generated autoloads from filesets.el (autoload (quote filesets-init) "filesets" "\ @@ -10665,7 +10781,7 @@ ;;;*** -;;;### (autoloads nil "fill" "textmodes/fill.el" (17585 4276)) +;;;### (autoloads nil "fill" "textmodes/fill.el" (17665 54136)) ;;; Generated autoloads from textmodes/fill.el (put 'colon-double-space 'safe-local-variable 'booleanp) @@ -10673,7 +10789,7 @@ ;;;### (autoloads (find-grep-dired find-name-dired find-dired find-grep-options ;;;;;; find-ls-subdir-switches find-ls-option) "find-dired" "find-dired.el" -;;;;;; (17383 32102)) +;;;;;; (17651 3608)) ;;; Generated autoloads from find-dired.el (defvar find-ls-option (if (eq system-type (quote berkeley-unix)) (quote ("-ls" . "-gilsb")) (quote ("-exec ls -ld {} \\;" . "-ld"))) "\ @@ -10682,7 +10798,7 @@ gives the option (or options) to `find' that produce the desired output. LS-SWITCHES is a list of `ls' switches to tell dired how to parse the output.") -(custom-autoload (quote find-ls-option) "find-dired") +(custom-autoload (quote find-ls-option) "find-dired" t) (defvar find-ls-subdir-switches "-al" "\ `ls' switches for inserting subdirectories in `*Find*' buffers. @@ -10690,14 +10806,14 @@ Use the \"-F\" or \"-b\" switches if and only if you also use them for `find-ls-option'.") -(custom-autoload (quote find-ls-subdir-switches) "find-dired") +(custom-autoload (quote find-ls-subdir-switches) "find-dired" t) (defvar find-grep-options (if (or (eq system-type (quote berkeley-unix)) (string-match "solaris2" system-configuration) (string-match "irix" system-configuration)) "-s" "-q") "\ *Option to grep to be as silent as possible. On Berkeley systems, this is `-s'; on Posix, and with GNU grep, `-q' does it. On other systems, the closest you can come is to use `-l'.") -(custom-autoload (quote find-grep-options) "find-dired") +(custom-autoload (quote find-grep-options) "find-dired" t) (autoload (quote find-dired) "find-dired" "\ Run `find' and go into Dired mode on a buffer of the output. @@ -10734,14 +10850,16 @@ ;;;### (autoloads (ff-mouse-find-other-file-other-window ff-mouse-find-other-file ;;;;;; ff-find-other-file ff-get-other-file) "find-file" "find-file.el" -;;;;;; (17383 32102)) +;;;;;; (17601 9091)) ;;; Generated autoloads from find-file.el -(defvar ff-special-constructs (quote (("^#\\s *\\(include\\|import\\)\\s +[<\"]\\(.*\\)[>\"]" lambda nil (setq fname (buffer-substring (match-beginning 2) (match-end 2)))))) "\ -*A list of regular expressions for `ff-find-file'. -Specifies how to recognize special constructs such as include files -etc. and an associated method for extracting the filename from that -construct.") +(defvar ff-special-constructs (quote (("^#\\s *\\(include\\|import\\)\\s +[<\"]\\(.*\\)[>\"]" lambda nil (buffer-substring (match-beginning 2) (match-end 2))))) "\ +*List of special constructs for `ff-treat-as-special' to recognize. +Each element, tried in order, has the form (REGEXP . EXTRACT). +If REGEXP matches the current line (from the beginning of the line), +`ff-treat-as-special' calls function EXTRACT with no args. +If EXTRACT returns nil, keep trying. Otherwise, return the +filename that EXTRACT returned.") (autoload (quote ff-get-other-file) "find-file" "\ Find the header or source file corresponding to this file. @@ -10826,7 +10944,7 @@ ;;;;;; find-variable find-variable-noselect find-function-other-frame ;;;;;; find-function-other-window find-function find-function-noselect ;;;;;; find-function-search-for-symbol find-library) "find-func" -;;;;;; "emacs-lisp/find-func.el" (17590 36099)) +;;;;;; "emacs-lisp/find-func.el" (17697 23215)) ;;; Generated autoloads from emacs-lisp/find-func.el (autoload (quote find-library) "find-func" "\ @@ -10980,7 +11098,7 @@ ;;;*** ;;;### (autoloads (find-lisp-find-dired-filter find-lisp-find-dired-subdirectories -;;;;;; find-lisp-find-dired) "find-lisp" "find-lisp.el" (17397 61540)) +;;;;;; find-lisp-find-dired) "find-lisp" "find-lisp.el" (17394 12936)) ;;; Generated autoloads from find-lisp.el (autoload (quote find-lisp-find-dired) "find-lisp" "\ @@ -11001,7 +11119,7 @@ ;;;*** ;;;### (autoloads (finder-by-keyword finder-commentary finder-list-keywords) -;;;;;; "finder" "finder.el" (17466 42705)) +;;;;;; "finder" "finder.el" (17476 4797)) ;;; Generated autoloads from finder.el (autoload (quote finder-list-keywords) "finder" "\ @@ -11023,7 +11141,7 @@ ;;;*** ;;;### (autoloads (enable-flow-control-on enable-flow-control) "flow-ctrl" -;;;;;; "flow-ctrl.el" (17383 32103)) +;;;;;; "flow-ctrl.el" (17385 8484)) ;;; Generated autoloads from flow-ctrl.el (autoload (quote enable-flow-control) "flow-ctrl" "\ @@ -11045,7 +11163,7 @@ ;;;*** ;;;### (autoloads (fill-flowed fill-flowed-encode) "flow-fill" "gnus/flow-fill.el" -;;;;;; (17484 52429)) +;;;;;; (17476 4798)) ;;; Generated autoloads from gnus/flow-fill.el (autoload (quote fill-flowed-encode) "flow-fill" "\ @@ -11061,7 +11179,7 @@ ;;;*** ;;;### (autoloads (flymake-mode-off flymake-mode-on flymake-mode) -;;;;;; "flymake" "progmodes/flymake.el" (17397 61567)) +;;;;;; "flymake" "progmodes/flymake.el" (17717 4883)) ;;; Generated autoloads from progmodes/flymake.el (autoload (quote flymake-mode) "flymake" "\ @@ -11085,7 +11203,7 @@ ;;;### (autoloads (flyspell-buffer flyspell-region flyspell-mode-off ;;;;;; turn-off-flyspell turn-on-flyspell flyspell-mode flyspell-prog-mode) -;;;;;; "flyspell" "textmodes/flyspell.el" (17578 34779)) +;;;;;; "flyspell" "textmodes/flyspell.el" (17724 51883)) ;;; Generated autoloads from textmodes/flyspell.el (autoload (quote flyspell-prog-mode) "flyspell" "\ @@ -11154,7 +11272,7 @@ ;;;### (autoloads (follow-delete-other-windows-and-split follow-mode ;;;;;; turn-off-follow-mode turn-on-follow-mode) "follow" "follow.el" -;;;;;; (17487 53545)) +;;;;;; (17495 43954)) ;;; Generated autoloads from follow.el (autoload (quote turn-on-follow-mode) "follow" "\ @@ -11228,8 +11346,8 @@ ;;;*** -;;;### (autoloads (footnote-mode) "footnote" "mail/footnote.el" (17383 -;;;;;; 32168)) +;;;### (autoloads (footnote-mode) "footnote" "mail/footnote.el" (17385 +;;;;;; 8494)) ;;; Generated autoloads from mail/footnote.el (autoload (quote footnote-mode) "footnote" "\ @@ -11250,7 +11368,7 @@ ;;;*** ;;;### (autoloads (forms-find-file-other-window forms-find-file forms-mode) -;;;;;; "forms" "forms.el" (17383 32104)) +;;;;;; "forms" "forms.el" (17385 8485)) ;;; Generated autoloads from forms.el (autoload (quote forms-mode) "forms" "\ @@ -11287,7 +11405,7 @@ ;;;*** ;;;### (autoloads (fortran-mode fortran-tab-mode-default) "fortran" -;;;;;; "progmodes/fortran.el" (17358 25800)) +;;;;;; "progmodes/fortran.el" (17360 11434)) ;;; Generated autoloads from progmodes/fortran.el (defvar fortran-tab-mode-default nil "\ @@ -11373,7 +11491,7 @@ ;;;*** ;;;### (autoloads (fortune fortune-to-signature fortune-compile fortune-from-region -;;;;;; fortune-add-fortune) "fortune" "play/fortune.el" (17383 32182)) +;;;;;; fortune-add-fortune) "fortune" "play/fortune.el" (17385 8495)) ;;; Generated autoloads from play/fortune.el (autoload (quote fortune-add-fortune) "fortune" "\ @@ -11423,7 +11541,7 @@ ;;;*** ;;;### (autoloads (gdb-enable-debug gdba) "gdb-ui" "progmodes/gdb-ui.el" -;;;;;; (17578 34779)) +;;;;;; (17723 56210)) ;;; Generated autoloads from progmodes/gdb-ui.el (autoload (quote gdba) "gdb-ui" "\ @@ -11481,13 +11599,13 @@ (defvar gdb-enable-debug nil "\ Non-nil means record the process input and output in `gdb-debug-ring'.") -(custom-autoload (quote gdb-enable-debug) "gdb-ui") +(custom-autoload (quote gdb-enable-debug) "gdb-ui" t) ;;;*** ;;;### (autoloads (generic-make-keywords-list generic-mode generic-mode-internal -;;;;;; define-generic-mode) "generic" "emacs-lisp/generic.el" (17383 -;;;;;; 32139)) +;;;;;; define-generic-mode) "generic" "emacs-lisp/generic.el" (17385 +;;;;;; 8490)) ;;; Generated autoloads from emacs-lisp/generic.el (defvar generic-mode-list nil "\ @@ -11562,7 +11680,7 @@ ;;;*** ;;;### (autoloads (glasses-mode) "glasses" "progmodes/glasses.el" -;;;;;; (17420 36091)) +;;;;;; (17408 40149)) ;;; Generated autoloads from progmodes/glasses.el (autoload (quote glasses-mode) "glasses" "\ @@ -11575,7 +11693,7 @@ ;;;*** ;;;### (autoloads (gmm-tool-bar-from-list gmm-widget-p gmm-error -;;;;;; gmm-message) "gmm-utils" "gnus/gmm-utils.el" (17521 64537)) +;;;;;; gmm-message) "gmm-utils" "gnus/gmm-utils.el" (17714 34817)) ;;; Generated autoloads from gnus/gmm-utils.el (autoload (quote gmm-message) "gmm-utils" "\ @@ -11622,9 +11740,38 @@ ;;;*** ;;;### (autoloads (gnus gnus-other-frame gnus-slave gnus-no-server -;;;;;; gnus-slave-no-server) "gnus" "gnus/gnus.el" (17432 37362)) +;;;;;; gnus-slave-no-server gnus-select-method gnus-getenv-nntpserver) +;;;;;; "gnus" "gnus/gnus.el" (17726 28398)) ;;; Generated autoloads from gnus/gnus.el +(autoload (quote gnus-getenv-nntpserver) "gnus" "\ +Find default nntp server. +Check the NNTPSERVER environment variable and the +`gnus-nntpserver-file' file. + +\(fn)" nil nil) + +(defvar gnus-select-method (condition-case nil (nconc (list (quote nntp) (or (condition-case nil (gnus-getenv-nntpserver) (error nil)) (when (and gnus-default-nntp-server (not (string= gnus-default-nntp-server ""))) gnus-default-nntp-server) "news")) (if (or (null gnus-nntp-service) (equal gnus-nntp-service "nntp")) nil (list gnus-nntp-service))) (error nil)) "\ +Default method for selecting a newsgroup. +This variable should be a list, where the first element is how the +news is to be fetched, the second is the address. + +For instance, if you want to get your news via \"flab.flab.edu\" using +NNTP, you could say: + +\(setq gnus-select-method '(nntp \"flab.flab.edu\")) + +If you want to use your local spool, say: + +\(setq gnus-select-method (list 'nnspool (system-name))) + +If you use this variable, you must set `gnus-nntp-server' to nil. + +There is a lot more to know about select methods and virtual servers - +see the manual for details.") + +(custom-autoload (quote gnus-select-method) "gnus" t) + (autoload (quote gnus-slave-no-server) "gnus" "\ Read network news as a slave, without connecting to the local server. @@ -11673,7 +11820,7 @@ ;;;;;; gnus-agent-get-undownloaded-list gnus-agent-delete-group ;;;;;; gnus-agent-rename-group gnus-agent-possibly-save-gcc gnus-agentize ;;;;;; gnus-slave-unplugged gnus-plugged gnus-unplugged) "gnus-agent" -;;;;;; "gnus/gnus-agent.el" (17578 34776)) +;;;;;; "gnus/gnus-agent.el" (17551 7908)) ;;; Generated autoloads from gnus/gnus-agent.el (autoload (quote gnus-unplugged) "gnus-agent" "\ @@ -11764,7 +11911,7 @@ ;;;*** ;;;### (autoloads (gnus-article-prepare-display) "gnus-art" "gnus/gnus-art.el" -;;;;;; (17578 34776)) +;;;;;; (17663 14247)) ;;; Generated autoloads from gnus/gnus-art.el (autoload (quote gnus-article-prepare-display) "gnus-art" "\ @@ -11775,7 +11922,7 @@ ;;;*** ;;;### (autoloads (gnus-audio-play) "gnus-audio" "gnus/gnus-audio.el" -;;;;;; (17383 32155)) +;;;;;; (17385 8493)) ;;; Generated autoloads from gnus/gnus-audio.el (autoload (quote gnus-audio-play) "gnus-audio" "\ @@ -11787,8 +11934,8 @@ ;;;### (autoloads (gnus-cache-delete-group gnus-cache-rename-group ;;;;;; gnus-cache-generate-nov-databases gnus-cache-generate-active -;;;;;; gnus-jog-cache) "gnus-cache" "gnus/gnus-cache.el" (17383 -;;;;;; 32155)) +;;;;;; gnus-jog-cache) "gnus-cache" "gnus/gnus-cache.el" (17385 +;;;;;; 8493)) ;;; Generated autoloads from gnus/gnus-cache.el (autoload (quote gnus-jog-cache) "gnus-cache" "\ @@ -11830,7 +11977,7 @@ ;;;*** ;;;### (autoloads (gnus-delay-initialize gnus-delay-send-queue gnus-delay-article) -;;;;;; "gnus-delay" "gnus/gnus-delay.el" (17383 32155)) +;;;;;; "gnus-delay" "gnus/gnus-delay.el" (17385 8493)) ;;; Generated autoloads from gnus/gnus-delay.el (autoload (quote gnus-delay-article) "gnus-delay" "\ @@ -11866,7 +12013,7 @@ ;;;*** ;;;### (autoloads (gnus-user-format-function-D gnus-user-format-function-d) -;;;;;; "gnus-diary" "gnus/gnus-diary.el" (17578 34776)) +;;;;;; "gnus-diary" "gnus/gnus-diary.el" (17577 7322)) ;;; Generated autoloads from gnus/gnus-diary.el (autoload (quote gnus-user-format-function-d) "gnus-diary" "\ @@ -11882,7 +12029,7 @@ ;;;*** ;;;### (autoloads (turn-on-gnus-dired-mode) "gnus-dired" "gnus/gnus-dired.el" -;;;;;; (17383 32155)) +;;;;;; (17385 8493)) ;;; Generated autoloads from gnus/gnus-dired.el (autoload (quote turn-on-gnus-dired-mode) "gnus-dired" "\ @@ -11893,7 +12040,7 @@ ;;;*** ;;;### (autoloads (gnus-draft-reminder) "gnus-draft" "gnus/gnus-draft.el" -;;;;;; (17420 36082)) +;;;;;; (17698 30385)) ;;; Generated autoloads from gnus/gnus-draft.el (autoload (quote gnus-draft-reminder) "gnus-draft" "\ @@ -11905,8 +12052,8 @@ ;;;### (autoloads (gnus-convert-png-to-face gnus-convert-face-to-png ;;;;;; gnus-face-from-file gnus-x-face-from-file gnus-insert-random-x-face-header -;;;;;; gnus-random-x-face) "gnus-fun" "gnus/gnus-fun.el" (17466 -;;;;;; 42710)) +;;;;;; gnus-random-x-face) "gnus-fun" "gnus/gnus-fun.el" (17476 +;;;;;; 4800)) ;;; Generated autoloads from gnus/gnus-fun.el (autoload (quote gnus-random-x-face) "gnus-fun" "\ @@ -11945,7 +12092,7 @@ ;;;*** ;;;### (autoloads (gnus-fetch-group-other-frame gnus-fetch-group) -;;;;;; "gnus-group" "gnus/gnus-group.el" (17578 34776)) +;;;;;; "gnus-group" "gnus/gnus-group.el" (17726 28398)) ;;; Generated autoloads from gnus/gnus-group.el (autoload (quote gnus-fetch-group) "gnus-group" "\ @@ -11962,7 +12109,7 @@ ;;;*** ;;;### (autoloads (gnus-batch-score) "gnus-kill" "gnus/gnus-kill.el" -;;;;;; (17383 32156)) +;;;;;; (17385 8493)) ;;; Generated autoloads from gnus/gnus-kill.el (defalias (quote gnus-batch-kill) (quote gnus-batch-score)) @@ -11977,7 +12124,7 @@ ;;;### (autoloads (gnus-mailing-list-mode gnus-mailing-list-insinuate ;;;;;; turn-on-gnus-mailing-list-mode) "gnus-ml" "gnus/gnus-ml.el" -;;;;;; (17578 34776)) +;;;;;; (17551 7908)) ;;; Generated autoloads from gnus/gnus-ml.el (autoload (quote turn-on-gnus-mailing-list-mode) "gnus-ml" "\ @@ -12002,7 +12149,7 @@ ;;;### (autoloads (gnus-group-split-fancy gnus-group-split gnus-group-split-update ;;;;;; gnus-group-split-setup) "gnus-mlspl" "gnus/gnus-mlspl.el" -;;;;;; (17383 32157)) +;;;;;; (17385 8493)) ;;; Generated autoloads from gnus/gnus-mlspl.el (autoload (quote gnus-group-split-setup) "gnus-mlspl" "\ @@ -12103,7 +12250,7 @@ ;;;*** ;;;### (autoloads (gnus-change-server) "gnus-move" "gnus/gnus-move.el" -;;;;;; (17383 32157)) +;;;;;; (17385 8493)) ;;; Generated autoloads from gnus/gnus-move.el (autoload (quote gnus-change-server) "gnus-move" "\ @@ -12115,7 +12262,7 @@ ;;;*** ;;;### (autoloads (gnus-button-reply gnus-button-mailto gnus-msg-mail) -;;;;;; "gnus-msg" "gnus/gnus-msg.el" (17383 32157)) +;;;;;; "gnus-msg" "gnus/gnus-msg.el" (17385 8493)) ;;; Generated autoloads from gnus/gnus-msg.el (autoload (quote gnus-msg-mail) "gnus-msg" "\ @@ -12140,7 +12287,7 @@ ;;;*** ;;;### (autoloads (gnus-nocem-load-cache gnus-nocem-scan-groups) -;;;;;; "gnus-nocem" "gnus/gnus-nocem.el" (17432 37361)) +;;;;;; "gnus-nocem" "gnus/gnus-nocem.el" (17427 10521)) ;;; Generated autoloads from gnus/gnus-nocem.el (autoload (quote gnus-nocem-scan-groups) "gnus-nocem" "\ @@ -12157,7 +12304,7 @@ ;;;### (autoloads (gnus-treat-newsgroups-picon gnus-treat-mail-picon ;;;;;; gnus-treat-from-picon) "gnus-picon" "gnus/gnus-picon.el" -;;;;;; (17383 32157)) +;;;;;; (17385 8493)) ;;; Generated autoloads from gnus/gnus-picon.el (autoload (quote gnus-treat-from-picon) "gnus-picon" "\ @@ -12184,7 +12331,7 @@ ;;;;;; gnus-sorted-nintersection gnus-sorted-range-intersection ;;;;;; gnus-sorted-intersection gnus-intersection gnus-sorted-complement ;;;;;; gnus-sorted-ndifference gnus-sorted-difference) "gnus-range" -;;;;;; "gnus/gnus-range.el" (17383 32157)) +;;;;;; "gnus/gnus-range.el" (17385 8493)) ;;; Generated autoloads from gnus/gnus-range.el (autoload (quote gnus-sorted-difference) "gnus-range" "\ @@ -12252,7 +12399,7 @@ ;;;*** ;;;### (autoloads (gnus-registry-install-hooks gnus-registry-initialize) -;;;;;; "gnus-registry" "gnus/gnus-registry.el" (17383 32157)) +;;;;;; "gnus-registry" "gnus/gnus-registry.el" (17704 4325)) ;;; Generated autoloads from gnus/gnus-registry.el (autoload (quote gnus-registry-initialize) "gnus-registry" "\ @@ -12268,8 +12415,8 @@ ;;;*** ;;;### (autoloads (gnus-sieve-article-add-rule gnus-sieve-generate -;;;;;; gnus-sieve-update) "gnus-sieve" "gnus/gnus-sieve.el" (17484 -;;;;;; 52430)) +;;;;;; gnus-sieve-update) "gnus-sieve" "gnus/gnus-sieve.el" (17476 +;;;;;; 4800)) ;;; Generated autoloads from gnus/gnus-sieve.el (autoload (quote gnus-sieve-update) "gnus-sieve" "\ @@ -12297,7 +12444,7 @@ ;;;*** ;;;### (autoloads (gnus-batch-brew-soup) "gnus-soup" "gnus/gnus-soup.el" -;;;;;; (17383 32158)) +;;;;;; (17385 8493)) ;;; Generated autoloads from gnus/gnus-soup.el (autoload (quote gnus-batch-brew-soup) "gnus-soup" "\ @@ -12317,7 +12464,7 @@ ;;;*** ;;;### (autoloads (gnus-update-format) "gnus-spec" "gnus/gnus-spec.el" -;;;;;; (17383 32158)) +;;;;;; (17385 8493)) ;;; Generated autoloads from gnus/gnus-spec.el (autoload (quote gnus-update-format) "gnus-spec" "\ @@ -12328,8 +12475,8 @@ ;;;*** ;;;### (autoloads (gnus-fixup-nnimap-unread-after-getting-new-news -;;;;;; gnus-declare-backend) "gnus-start" "gnus/gnus-start.el" (17432 -;;;;;; 37361)) +;;;;;; gnus-declare-backend) "gnus-start" "gnus/gnus-start.el" (17601 +;;;;;; 9092)) ;;; Generated autoloads from gnus/gnus-start.el (autoload (quote gnus-declare-backend) "gnus-start" "\ @@ -12345,7 +12492,7 @@ ;;;*** ;;;### (autoloads (gnus-add-configuration) "gnus-win" "gnus/gnus-win.el" -;;;;;; (17383 32159)) +;;;;;; (17385 8493)) ;;; Generated autoloads from gnus/gnus-win.el (autoload (quote gnus-add-configuration) "gnus-win" "\ @@ -12355,7 +12502,7 @@ ;;;*** -;;;### (autoloads (gomoku) "gomoku" "play/gomoku.el" (17383 32182)) +;;;### (autoloads (gomoku) "gomoku" "play/gomoku.el" (17385 8495)) ;;; Generated autoloads from play/gomoku.el (autoload (quote gomoku) "gomoku" "\ @@ -12382,7 +12529,7 @@ ;;;*** ;;;### (autoloads (goto-address goto-address-at-point) "goto-addr" -;;;;;; "net/goto-addr.el" (17582 28846)) +;;;;;; "net/goto-addr.el" (17579 53341)) ;;; Generated autoloads from net/goto-addr.el (define-obsolete-function-alias (quote goto-address-at-mouse) (quote goto-address-at-point) "22.1") @@ -12412,13 +12559,13 @@ ;;;### (autoloads (rgrep lgrep grep-find grep grep-mode grep-compute-defaults ;;;;;; grep-process-setup grep-setup-hook grep-find-command grep-command -;;;;;; grep-window-height) "grep" "progmodes/grep.el" (17590 36100)) +;;;;;; grep-window-height) "grep" "progmodes/grep.el" (17645 64048)) ;;; Generated autoloads from progmodes/grep.el (defvar grep-window-height nil "\ *Number of lines in a grep window. If nil, use `compilation-window-height'.") -(custom-autoload (quote grep-window-height) "grep") +(custom-autoload (quote grep-window-height) "grep" t) (defvar grep-command nil "\ The default grep command for \\[grep]. @@ -12429,19 +12576,19 @@ The default value of this variable is set up by `grep-compute-defaults'; call that function before using this variable in your program.") -(custom-autoload (quote grep-command) "grep") +(custom-autoload (quote grep-command) "grep" t) (defvar grep-find-command nil "\ The default find command for \\[grep-find]. The default value of this variable is set up by `grep-compute-defaults'; call that function before using this variable in your program.") -(custom-autoload (quote grep-find-command) "grep") +(custom-autoload (quote grep-find-command) "grep" t) (defvar grep-setup-hook nil "\ List of hook functions run by `grep-process-setup' (see `run-hooks').") -(custom-autoload (quote grep-setup-hook) "grep") +(custom-autoload (quote grep-setup-hook) "grep" t) (defvar grep-regexp-alist (quote (("^\\(.+?\\)\\(:[ ]*\\)\\([0-9]+\\)\\2" 1 3) ("^\\(\\(.+?\\):\\([0-9]+\\):\\).*?\\(\\[01;31m\\(?:\\[K\\)?\\)\\(.*?\\)\\(\\[[0-9]*m\\)" 2 3 ((lambda nil (setq compilation-error-screen-columns nil) (- (match-beginning 4) (match-end 1))) lambda nil (- (match-end 5) (match-end 1) (- (match-end 4) (match-beginning 4)))) nil 1) ("^Binary file \\(.+\\) matches$" 1 nil nil 0 1))) "\ Regexp used to match grep hits. See `compilation-error-regexp-alist'.") @@ -12457,7 +12604,7 @@ (defvar grep-find-use-xargs nil "\ Whether \\[grep-find] uses the `xargs' utility by default. -If nil, it uses `find -exec'; if `gnu', it uses `find -print0' and `xargs -0'; +If `exec', it uses `find -exec'; if `gnu', it uses `find -print0' and `xargs -0'; if not nil and not `gnu', it uses `find -print' and `xargs'. This variable's value takes effect when `grep-compute-defaults' is called.") @@ -12549,7 +12696,7 @@ ;;;*** -;;;### (autoloads (gs-load-image) "gs" "gs.el" (17383 32104)) +;;;### (autoloads (gs-load-image) "gs" "gs.el" (17385 8485)) ;;; Generated autoloads from gs.el (autoload (quote gs-load-image) "gs" "\ @@ -12563,7 +12710,7 @@ ;;;*** ;;;### (autoloads (gdb-script-mode bashdb jdb pdb perldb xdb dbx -;;;;;; sdb gdb) "gud" "progmodes/gud.el" (17578 34779)) +;;;;;; sdb gdb) "gud" "progmodes/gud.el" (17661 55157)) ;;; Generated autoloads from progmodes/gud.el (autoload (quote gdb) "gud" "\ @@ -12649,8 +12796,8 @@ ;;;*** -;;;### (autoloads (handwrite) "handwrite" "play/handwrite.el" (17383 -;;;;;; 32182)) +;;;### (autoloads (handwrite) "handwrite" "play/handwrite.el" (17385 +;;;;;; 8495)) ;;; Generated autoloads from play/handwrite.el (autoload (quote handwrite) "handwrite" "\ @@ -12668,7 +12815,7 @@ ;;;*** ;;;### (autoloads (hanoi-unix-64 hanoi-unix hanoi) "hanoi" "play/hanoi.el" -;;;;;; (17590 36100)) +;;;;;; (17586 30575)) ;;; Generated autoloads from play/hanoi.el (autoload (quote hanoi) "hanoi" "\ @@ -12698,7 +12845,7 @@ ;;;### (autoloads (scan-buf-previous-region scan-buf-next-region ;;;;;; scan-buf-move-to-region help-at-pt-display-when-idle help-at-pt-set-timer ;;;;;; help-at-pt-cancel-timer display-local-help help-at-pt-kbd-string -;;;;;; help-at-pt-string) "help-at-pt" "help-at-pt.el" (17383 32104)) +;;;;;; help-at-pt-string) "help-at-pt" "help-at-pt.el" (17709 24917)) ;;; Generated autoloads from help-at-pt.el (autoload (quote help-at-pt-string) "help-at-pt" "\ @@ -12771,12 +12918,12 @@ that disable the feature, which Custom identifies with `never'. The default is `never'.") -(custom-autoload (quote help-at-pt-display-when-idle) "help-at-pt") +(custom-autoload (quote help-at-pt-display-when-idle) "help-at-pt" nil) (autoload (quote scan-buf-move-to-region) "help-at-pt" "\ Go to the start of the next region with non-nil PROP property. Then run HOOK, which should be a quoted symbol that is a normal -hook.variable, or an expression evaluating to such a symbol. +hook variable, or an expression evaluating to such a symbol. Adjacent areas with different non-nil PROP properties are considered different regions. @@ -12828,7 +12975,7 @@ ;;;### (autoloads (describe-categories describe-syntax describe-variable ;;;;;; variable-at-point describe-function-1 describe-simplify-lib-file-name ;;;;;; help-C-file-name describe-function help-with-tutorial) "help-fns" -;;;;;; "help-fns.el" (17590 36098)) +;;;;;; "help-fns.el" (17717 4883)) ;;; Generated autoloads from help-fns.el (autoload (quote help-with-tutorial) "help-fns" "\ @@ -12894,7 +13041,7 @@ ;;;*** ;;;### (autoloads (three-step-help) "help-macro" "help-macro.el" -;;;;;; (17383 32105)) +;;;;;; (17385 8485)) ;;; Generated autoloads from help-macro.el (defvar three-step-help nil "\ @@ -12910,7 +13057,7 @@ ;;;### (autoloads (help-xref-on-pp help-insert-xref-button help-xref-button ;;;;;; help-make-xrefs help-setup-xref help-mode-finish help-mode-setup -;;;;;; help-mode) "help-mode" "help-mode.el" (17590 36098)) +;;;;;; help-mode) "help-mode" "help-mode.el" (17604 60389)) ;;; Generated autoloads from help-mode.el (autoload (quote help-mode) "help-mode" "\ @@ -12993,7 +13140,7 @@ ;;;*** ;;;### (autoloads (Helper-help Helper-describe-bindings) "helper" -;;;;;; "emacs-lisp/helper.el" (17590 36099)) +;;;;;; "emacs-lisp/helper.el" (17585 27776)) ;;; Generated autoloads from emacs-lisp/helper.el (autoload (quote Helper-describe-bindings) "helper" "\ @@ -13009,7 +13156,7 @@ ;;;*** ;;;### (autoloads (hexlify-buffer hexl-find-file hexl-mode) "hexl" -;;;;;; "hexl.el" (17585 4275)) +;;;;;; "hexl.el" (17585 27774)) ;;; Generated autoloads from hexl.el (autoload (quote hexl-mode) "hexl" "\ @@ -13106,7 +13253,7 @@ ;;;### (autoloads (hi-lock-write-interactive-patterns hi-lock-unface-buffer ;;;;;; hi-lock-face-phrase-buffer hi-lock-face-buffer hi-lock-line-face-buffer ;;;;;; global-hi-lock-mode hi-lock-mode) "hi-lock" "hi-lock.el" -;;;;;; (17383 32105)) +;;;;;; (17385 8485)) ;;; Generated autoloads from hi-lock.el (autoload (quote hi-lock-mode) "hi-lock" "\ @@ -13163,6 +13310,8 @@ (custom-autoload (quote global-hi-lock-mode) "hi-lock") +(put (quote global-hi-lock-mode) (quote custom-set) (quote custom-set-minor-mode)) + (autoload (quote global-hi-lock-mode) "hi-lock" "\ Toggle Hi-Lock mode in every buffer. With prefix ARG, turn Global-Hi-Lock mode on if and only if ARG is positive. @@ -13230,7 +13379,7 @@ ;;;*** ;;;### (autoloads (hide-ifdef-lines hide-ifdef-read-only hide-ifdef-initially -;;;;;; hide-ifdef-mode) "hideif" "progmodes/hideif.el" (17521 64539)) +;;;;;; hide-ifdef-mode) "hideif" "progmodes/hideif.el" (17520 49736)) ;;; Generated autoloads from progmodes/hideif.el (autoload (quote hide-ifdef-mode) "hideif" "\ @@ -13285,7 +13434,7 @@ ;;;*** ;;;### (autoloads (hs-minor-mode) "hideshow" "progmodes/hideshow.el" -;;;;;; (17397 61568)) +;;;;;; (17394 12938)) ;;; Generated autoloads from progmodes/hideshow.el (defvar hs-special-modes-alist (quote ((c-mode "{" "}" "/[*/]" nil hs-c-like-adjust-block-beginning) (c++-mode "{" "}" "/[*/]" nil hs-c-like-adjust-block-beginning) (bibtex-mode ("^@\\S(*\\(\\s(\\)" 1)) (java-mode "{" "}" "/[*/]" nil hs-c-like-adjust-block-beginning))) "\ @@ -13343,7 +13492,7 @@ ;;;;;; highlight-compare-buffers highlight-changes-rotate-faces ;;;;;; highlight-changes-previous-change highlight-changes-next-change ;;;;;; highlight-changes-mode highlight-changes-remove-highlight) -;;;;;; "hilit-chg" "hilit-chg.el" (17397 61541)) +;;;;;; "hilit-chg" "hilit-chg.el" (17394 12936)) ;;; Generated autoloads from hilit-chg.el (autoload (quote highlight-changes-remove-highlight) "hilit-chg" "\ @@ -13473,7 +13622,7 @@ ;;;;;; hippie-expand-ignore-buffers hippie-expand-max-buffers hippie-expand-no-restriction ;;;;;; hippie-expand-dabbrev-as-symbol hippie-expand-dabbrev-skip-space ;;;;;; hippie-expand-verbose hippie-expand-try-functions-list) "hippie-exp" -;;;;;; "hippie-exp.el" (17383 32106)) +;;;;;; "hippie-exp.el" (17385 8485)) ;;; Generated autoloads from hippie-exp.el (defvar hippie-expand-try-functions-list (quote (try-complete-file-name-partially try-complete-file-name try-expand-all-abbrevs try-expand-list try-expand-line try-expand-dabbrev try-expand-dabbrev-all-buffers try-expand-dabbrev-from-kill try-complete-lisp-symbol-partially try-complete-lisp-symbol)) "\ @@ -13546,7 +13695,7 @@ ;;;*** ;;;### (autoloads (global-hl-line-mode hl-line-mode) "hl-line" "hl-line.el" -;;;;;; (17365 2729)) +;;;;;; (17656 37701)) ;;; Generated autoloads from hl-line.el (autoload (quote hl-line-mode) "hl-line" "\ @@ -13570,9 +13719,10 @@ Non-nil if Global-Hl-Line mode is enabled. See the command `global-hl-line-mode' for a description of this minor-mode. Setting this variable directly does not take effect; -use either \\[customize] or the function `global-hl-line-mode'.") - -(custom-autoload (quote global-hl-line-mode) "hl-line") +either customize it (see the info node `Easy Customization') +or call the function `global-hl-line-mode'.") + +(custom-autoload (quote global-hl-line-mode) "hl-line" nil) (autoload (quote global-hl-line-mode) "hl-line" "\ Global minor mode to highlight the line about point in the current window. @@ -13586,7 +13736,7 @@ ;;;*** ;;;### (autoloads (list-holidays holidays) "holidays" "calendar/holidays.el" -;;;;;; (17432 37359)) +;;;;;; (17427 10521)) ;;; Generated autoloads from calendar/holidays.el (autoload (quote holidays) "holidays" "\ @@ -13623,7 +13773,7 @@ ;;;*** ;;;### (autoloads (hscroll-global-mode hscroll-mode turn-on-hscroll) -;;;;;; "hscroll" "obsolete/hscroll.el" (17383 32179)) +;;;;;; "hscroll" "obsolete/hscroll.el" (17385 8495)) ;;; Generated autoloads from obsolete/hscroll.el (autoload (quote turn-on-hscroll) "hscroll" "\ @@ -13649,8 +13799,8 @@ ;;;*** -;;;### (autoloads (html2text) "html2text" "gnus/html2text.el" (17397 -;;;;;; 61555)) +;;;### (autoloads (html2text) "html2text" "gnus/html2text.el" (17403 +;;;;;; 27598)) ;;; Generated autoloads from gnus/html2text.el (autoload (quote html2text) "html2text" "\ @@ -13682,7 +13832,7 @@ ;;;;;; ibuffer-backward-filter-group ibuffer-forward-filter-group ;;;;;; ibuffer-toggle-filter-group ibuffer-mouse-toggle-filter-group ;;;;;; ibuffer-interactive-filter-by-mode ibuffer-mouse-filter-by-mode -;;;;;; ibuffer-auto-mode) "ibuf-ext" "ibuf-ext.el" (17457 37498)) +;;;;;; ibuffer-auto-mode) "ibuf-ext" "ibuf-ext.el" (17698 30385)) ;;; Generated autoloads from ibuf-ext.el (autoload (quote ibuffer-auto-mode) "ibuf-ext" "\ @@ -14048,8 +14198,8 @@ ;;;*** ;;;### (autoloads (define-ibuffer-filter define-ibuffer-op define-ibuffer-sorter -;;;;;; define-ibuffer-column) "ibuf-macs" "ibuf-macs.el" (17457 -;;;;;; 37498)) +;;;;;; define-ibuffer-column) "ibuf-macs" "ibuf-macs.el" (17476 +;;;;;; 4797)) ;;; Generated autoloads from ibuf-macs.el (autoload (quote define-ibuffer-column) "ibuf-macs" "\ @@ -14138,7 +14288,7 @@ ;;;*** ;;;### (autoloads (ibuffer ibuffer-other-window ibuffer-list-buffers) -;;;;;; "ibuffer" "ibuffer.el" (17578 34772)) +;;;;;; "ibuffer" "ibuffer.el" (17647 30728)) ;;; Generated autoloads from ibuffer.el (autoload (quote ibuffer-list-buffers) "ibuffer" "\ @@ -14179,7 +14329,7 @@ ;;;### (autoloads (icalendar-import-buffer icalendar-import-file ;;;;;; icalendar-export-region icalendar-export-file) "icalendar" -;;;;;; "calendar/icalendar.el" (17397 61548)) +;;;;;; "calendar/icalendar.el" (17403 27597)) ;;; Generated autoloads from calendar/icalendar.el (autoload (quote icalendar-export-file) "icalendar" "\ @@ -14231,17 +14381,18 @@ ;;;*** -;;;### (autoloads (icomplete-mode) "icomplete" "icomplete.el" (17401 -;;;;;; 56228)) +;;;### (autoloads (icomplete-mode) "icomplete" "icomplete.el" (17686 +;;;;;; 46252)) ;;; Generated autoloads from icomplete.el (defvar icomplete-mode nil "\ Non-nil if Icomplete mode is enabled. See the command `icomplete-mode' for a description of this minor-mode. Setting this variable directly does not take effect; -use either \\[customize] or the function `icomplete-mode'.") - -(custom-autoload (quote icomplete-mode) "icomplete") +either customize it (see the info node `Easy Customization') +or call the function `icomplete-mode'.") + +(custom-autoload (quote icomplete-mode) "icomplete" nil) (autoload (quote icomplete-mode) "icomplete" "\ Toggle incremental minibuffer completion for this Emacs session. @@ -14251,7 +14402,7 @@ ;;;*** -;;;### (autoloads (icon-mode) "icon" "progmodes/icon.el" (17397 61568)) +;;;### (autoloads (icon-mode) "icon" "progmodes/icon.el" (17394 12938)) ;;; Generated autoloads from progmodes/icon.el (autoload (quote icon-mode) "icon" "\ @@ -14292,7 +14443,7 @@ ;;;*** ;;;### (autoloads (idlwave-shell) "idlw-shell" "progmodes/idlw-shell.el" -;;;;;; (17515 39529)) +;;;;;; (17601 9092)) ;;; Generated autoloads from progmodes/idlw-shell.el (autoload (quote idlwave-shell) "idlw-shell" "\ @@ -14318,7 +14469,7 @@ ;;;*** ;;;### (autoloads (idlwave-mode) "idlwave" "progmodes/idlwave.el" -;;;;;; (17515 39529)) +;;;;;; (17670 58701)) ;;; Generated autoloads from progmodes/idlwave.el (autoload (quote idlwave-mode) "idlwave" "\ @@ -14401,7 +14552,7 @@ \\i IF statement template \\elif IF-ELSE statement template \\b BEGIN - + For a full list, use \\[idlwave-list-abbrevs]. Some templates also have direct keybindings - see the list of keybindings below. @@ -14453,8 +14604,8 @@ ;;;;;; ido-find-alternate-file ido-find-file-other-window ido-find-file ;;;;;; ido-find-file-in-dir ido-switch-buffer-other-frame ido-insert-buffer ;;;;;; ido-kill-buffer ido-display-buffer ido-switch-buffer-other-window -;;;;;; ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (17590 -;;;;;; 36098)) +;;;;;; ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (17717 +;;;;;; 4883)) ;;; Generated autoloads from ido.el (defvar ido-mode nil "\ @@ -14469,7 +14620,7 @@ Setting this variable directly does not take effect; use either \\[customize] or the function `ido-mode'.") -(custom-autoload (quote ido-mode) "ido") +(custom-autoload (quote ido-mode) "ido" nil) (autoload (quote ido-mode) "ido" "\ Toggle ido speed-ups on or off. @@ -14715,7 +14866,7 @@ ;;;*** -;;;### (autoloads (ielm) "ielm" "ielm.el" (17383 32107)) +;;;### (autoloads (ielm) "ielm" "ielm.el" (17385 8485)) ;;; Generated autoloads from ielm.el (add-hook 'same-window-buffer-names "*ielm*") @@ -14728,7 +14879,7 @@ ;;;*** ;;;### (autoloads (iimage-mode turn-on-iimage-mode) "iimage" "iimage.el" -;;;;;; (17383 32107)) +;;;;;; (17385 8485)) ;;; Generated autoloads from iimage.el (autoload (quote turn-on-iimage-mode) "iimage" "\ @@ -14747,7 +14898,7 @@ ;;;;;; insert-image put-image create-image image-type-available-p ;;;;;; image-type image-type-from-file-name image-type-from-file-header ;;;;;; image-type-from-buffer image-type-from-data) "image" "image.el" -;;;;;; (17484 52424)) +;;;;;; (17485 5460)) ;;; Generated autoloads from image.el (autoload (quote image-type-from-data) "image" "\ @@ -14909,7 +15060,7 @@ ;;;### (autoloads (auto-image-file-mode insert-image-file image-file-name-regexp ;;;;;; image-file-name-regexps image-file-name-extensions) "image-file" -;;;;;; "image-file.el" (17383 32107)) +;;;;;; "image-file.el" (17385 8485)) ;;; Generated autoloads from image-file.el (defvar image-file-name-extensions (quote ("png" "jpeg" "jpg" "gif" "tiff" "tif" "xbm" "xpm" "pbm" "pgm" "ppm" "pnm")) "\ @@ -14956,6 +15107,8 @@ (custom-autoload (quote auto-image-file-mode) "image-file") +(put (quote auto-image-file-mode) (quote custom-set) (quote custom-set-minor-mode)) + (autoload (quote auto-image-file-mode) "image-file" "\ Toggle visiting of image files as images. With prefix argument ARG, turn on if positive, otherwise off. @@ -14970,7 +15123,7 @@ ;;;*** ;;;### (autoloads (image-mode-maybe image-minor-mode image-mode) -;;;;;; "image-mode" "image-mode.el" (17578 34772)) +;;;;;; "image-mode" "image-mode.el" (17656 37701)) ;;; Generated autoloads from image-mode.el (push '("\\.jpe?g\\'" . image-mode) auto-mode-alist) (push '("\\.png\\'" . image-mode) auto-mode-alist) @@ -15008,7 +15161,7 @@ ;;;*** ;;;### (autoloads (imenu imenu-add-menubar-index imenu-add-to-menubar -;;;;;; imenu-sort-function) "imenu" "imenu.el" (17585 4275)) +;;;;;; imenu-sort-function) "imenu" "imenu.el" (17656 38154)) ;;; Generated autoloads from imenu.el (defvar imenu-sort-function nil "\ @@ -15026,7 +15179,7 @@ element should come before the second. The arguments are cons cells; \(NAME . POSITION). Look at `imenu--sort-by-name' for an example.") -(custom-autoload (quote imenu-sort-function) "imenu") +(custom-autoload (quote imenu-sort-function) "imenu" t) (defvar imenu-generic-expression nil "\ The regex pattern to use for creating a buffer index. @@ -15123,7 +15276,7 @@ ;;;### (autoloads (indian-char-glyph indian-glyph-char in-is13194-pre-write-conversion ;;;;;; in-is13194-post-read-conversion indian-compose-string indian-compose-region) -;;;;;; "ind-util" "language/ind-util.el" (17346 38886)) +;;;;;; "ind-util" "language/ind-util.el" (17340 11482)) ;;; Generated autoloads from language/ind-util.el (autoload (quote indian-compose-region) "ind-util" "\ @@ -15166,7 +15319,7 @@ ;;;### (autoloads (inferior-lisp inferior-lisp-prompt inferior-lisp-load-command ;;;;;; inferior-lisp-program inferior-lisp-filter-regexp) "inf-lisp" -;;;;;; "progmodes/inf-lisp.el" (17578 34779)) +;;;;;; "progmodes/inf-lisp.el" (17536 30816)) ;;; Generated autoloads from progmodes/inf-lisp.el (defvar inferior-lisp-filter-regexp "\\`\\s *\\(:\\(\\w\\|\\s_\\)\\)?\\s *\\'" "\ @@ -15233,7 +15386,7 @@ ;;;### (autoloads (Info-speedbar-browser Info-goto-emacs-key-command-node ;;;;;; Info-goto-emacs-command-node Info-mode info-apropos Info-index ;;;;;; Info-directory Info-on-current-buffer info-standalone info-emacs-manual -;;;;;; info info-other-window) "info" "info.el" (17590 36099)) +;;;;;; info info-other-window) "info" "info.el" (17664 34046)) ;;; Generated autoloads from info.el (autoload (quote info-other-window) "info" "\ @@ -15399,7 +15552,7 @@ ;;;### (autoloads (info-complete-file info-complete-symbol info-lookup-file ;;;;;; info-lookup-symbol info-lookup-reset) "info-look" "info-look.el" -;;;;;; (17383 32108)) +;;;;;; (17712 850)) ;;; Generated autoloads from info-look.el (autoload (quote info-lookup-reset) "info-look" "\ @@ -15447,7 +15600,7 @@ ;;;*** ;;;### (autoloads (info-xref-check-all-custom info-xref-check-all -;;;;;; info-xref-check) "info-xref" "info-xref.el" (17521 64536)) +;;;;;; info-xref-check) "info-xref" "info-xref.el" (17520 49736)) ;;; Generated autoloads from info-xref.el (autoload (quote info-xref-check) "info-xref" "\ @@ -15474,7 +15627,7 @@ ;;;*** ;;;### (autoloads (batch-info-validate Info-validate Info-split Info-tagify) -;;;;;; "informat" "informat.el" (17383 32108)) +;;;;;; "informat" "informat.el" (17385 8485)) ;;; Generated autoloads from informat.el (autoload (quote Info-tagify) "informat" "\ @@ -15515,7 +15668,7 @@ ;;;### (autoloads (isearch-process-search-multibyte-characters isearch-toggle-input-method ;;;;;; isearch-toggle-specified-input-method) "isearch-x" "international/isearch-x.el" -;;;;;; (17116 6720)) +;;;;;; (17120 44797)) ;;; Generated autoloads from international/isearch-x.el (autoload (quote isearch-toggle-specified-input-method) "isearch-x" "\ @@ -15535,8 +15688,8 @@ ;;;*** -;;;### (autoloads (isearchb-activate) "isearchb" "isearchb.el" (17383 -;;;;;; 32108)) +;;;### (autoloads (isearchb-activate) "isearchb" "isearchb.el" (17385 +;;;;;; 8485)) ;;; Generated autoloads from isearchb.el (autoload (quote isearchb-activate) "isearchb" "\ @@ -15550,7 +15703,7 @@ ;;;*** ;;;### (autoloads (iso-accents-mode) "iso-acc" "obsolete/iso-acc.el" -;;;;;; (17383 32179)) +;;;;;; (17385 8495)) ;;; Generated autoloads from obsolete/iso-acc.el (autoload (quote iso-accents-mode) "iso-acc" "\ @@ -15583,7 +15736,7 @@ ;;;### (autoloads (iso-cvt-define-menu iso-cvt-write-only iso-cvt-read-only ;;;;;; iso-sgml2iso iso-iso2sgml iso-iso2duden iso-iso2gtex iso-gtex2iso ;;;;;; iso-tex2iso iso-iso2tex iso-german iso-spanish) "iso-cvt" -;;;;;; "international/iso-cvt.el" (17097 33520)) +;;;;;; "international/iso-cvt.el" (17102 18714)) ;;; Generated autoloads from international/iso-cvt.el (autoload (quote iso-spanish) "iso-cvt" "\ @@ -15667,7 +15820,7 @@ ;;;*** ;;;### (autoloads nil "iso-transl" "international/iso-transl.el" -;;;;;; (17097 33521)) +;;;;;; (17102 18715)) ;;; Generated autoloads from international/iso-transl.el (or key-translation-map (setq key-translation-map (make-sparse-keymap))) (define-key key-translation-map "\C-x8" 'iso-transl-ctl-x-8-map) @@ -15680,7 +15833,7 @@ ;;;;;; ispell-region ispell-change-dictionary ispell-kill-ispell ;;;;;; ispell-help ispell-pdict-save ispell-word ispell-local-dictionary-alist ;;;;;; ispell-personal-dictionary) "ispell" "textmodes/ispell.el" -;;;;;; (17578 34779)) +;;;;;; (17685 33972)) ;;; Generated autoloads from textmodes/ispell.el (put 'ispell-check-comments 'safe-local-variable (lambda (a) (memq a '(nil t exclusive)))) @@ -15689,7 +15842,7 @@ If nil, the default personal dictionary, \"~/.ispell_DICTNAME\" is used, where DICTNAME is the name of your default dictionary.") -(custom-autoload (quote ispell-personal-dictionary) "ispell") +(custom-autoload (quote ispell-personal-dictionary) "ispell" t) (put 'ispell-local-dictionary 'safe-local-variable 'string-or-null-p) (defvar ispell-local-dictionary-alist nil "\ @@ -15700,7 +15853,7 @@ will need to make your changes in this variable, save, and then re-start emacs.") -(custom-autoload (quote ispell-local-dictionary-alist) "ispell") +(custom-autoload (quote ispell-local-dictionary-alist) "ispell" t) (setq ispell-dictionary-alist-1 (quote ((nil "[A-Za-z]" "[^A-Za-z]" "[']" nil ("-B") nil iso-8859-1) ("american" "[A-Za-z]" "[^A-Za-z]" "[']" nil ("-B") nil iso-8859-1) ("brasileiro" "[A-Z\301\311\315\323\332\300\310\314\322\331\303\325\307\334\302\312\324a-z\341\351\355\363\372\340\350\354\362\371\343\365\347\374\342\352\364]" "[^A-Z\301\311\315\323\332\300\310\314\322\331\303\325\307\334\302\312\324a-z\341\351\355\363\372\340\350\354\362\371\343\365\347\374\342\352\364]" "[']" nil nil nil iso-8859-1) ("british" "[A-Za-z]" "[^A-Za-z]" "[']" nil ("-B") nil iso-8859-1) ("castellano" "[A-Z\301\311\315\321\323\332\334a-z\341\351\355\361\363\372\374]" "[^A-Z\301\311\315\321\323\332\334a-z\341\351\355\361\363\372\374]" "[-]" nil ("-B") "~tex" iso-8859-1) ("castellano8" "[A-Z\301\311\315\321\323\332\334a-z\341\351\355\361\363\372\374]" "[^A-Z\301\311\315\321\323\332\334a-z\341\351\355\361\363\372\374]" "[-]" nil ("-B" "-d" "castellano") "~latin1" iso-8859-1)))) @@ -15968,8 +16121,8 @@ ;;;*** -;;;### (autoloads (iswitchb-mode) "iswitchb" "iswitchb.el" (17438 -;;;;;; 58632)) +;;;### (autoloads (iswitchb-mode) "iswitchb" "iswitchb.el" (17440 +;;;;;; 13082)) ;;; Generated autoloads from iswitchb.el (defvar iswitchb-mode nil "\ @@ -15980,6 +16133,8 @@ (custom-autoload (quote iswitchb-mode) "iswitchb") +(put (quote iswitchb-mode) (quote custom-set) (quote custom-set-minor-mode)) + (autoload (quote iswitchb-mode) "iswitchb" "\ Toggle Iswitchb global minor mode. With arg, turn Iswitchb mode on if and only iff ARG is positive. @@ -15993,7 +16148,7 @@ ;;;### (autoloads (read-hiragana-string japanese-zenkaku-region japanese-hankaku-region ;;;;;; japanese-hiragana-region japanese-katakana-region japanese-zenkaku ;;;;;; japanese-hankaku japanese-hiragana japanese-katakana setup-japanese-environment-internal) -;;;;;; "japan-util" "language/japan-util.el" (17097 33526)) +;;;;;; "japan-util" "language/japan-util.el" (17102 18773)) ;;; Generated autoloads from language/japan-util.el (autoload (quote setup-japanese-environment-internal) "japan-util" "\ @@ -16071,7 +16226,7 @@ ;;;*** ;;;### (autoloads (jka-compr-uninstall jka-compr-handler) "jka-compr" -;;;;;; "jka-compr.el" (17420 36078)) +;;;;;; "jka-compr.el" (17411 10839)) ;;; Generated autoloads from jka-compr.el (defvar jka-compr-inhibit nil "\ @@ -16096,7 +16251,7 @@ ;;;### (autoloads (keypad-setup keypad-numlock-shifted-setup keypad-shifted-setup ;;;;;; keypad-numlock-setup keypad-setup) "keypad" "emulation/keypad.el" -;;;;;; (17383 32143)) +;;;;;; (17385 8491)) ;;; Generated autoloads from emulation/keypad.el (defvar keypad-setup nil "\ @@ -16152,7 +16307,7 @@ ;;;*** ;;;### (autoloads (kinsoku) "kinsoku" "international/kinsoku.el" -;;;;;; (17301 45595)) +;;;;;; (17304 45460)) ;;; Generated autoloads from international/kinsoku.el (autoload (quote kinsoku) "kinsoku" "\ @@ -16173,8 +16328,8 @@ ;;;*** -;;;### (autoloads (kkc-region) "kkc" "international/kkc.el" (17097 -;;;;;; 33521)) +;;;### (autoloads (kkc-region) "kkc" "international/kkc.el" (17721 +;;;;;; 20491)) ;;; Generated autoloads from international/kkc.el (defvar kkc-after-update-conversion-functions nil "\ @@ -16199,7 +16354,7 @@ ;;;### (autoloads (kmacro-end-call-mouse kmacro-end-and-call-macro ;;;;;; kmacro-end-or-call-macro kmacro-start-macro-or-insert-counter ;;;;;; kmacro-call-macro kmacro-end-macro kmacro-start-macro) "kmacro" -;;;;;; "kmacro.el" (17503 24306)) +;;;;;; "kmacro.el" (17651 3608)) ;;; Generated autoloads from kmacro.el (global-set-key "\C-x(" 'kmacro-start-macro) (global-set-key "\C-x)" 'kmacro-end-macro) @@ -16306,7 +16461,7 @@ ;;;### (autoloads (kannada-post-read-conversion kannada-compose-string ;;;;;; kannada-compose-region) "knd-util" "language/knd-util.el" -;;;;;; (17097 33526)) +;;;;;; (17102 18774)) ;;; Generated autoloads from language/knd-util.el (defconst kannada-consonant "[\x51f75-\x51fb9]") @@ -16329,7 +16484,7 @@ ;;;*** ;;;### (autoloads (setup-korean-environment-internal) "korea-util" -;;;;;; "language/korea-util.el" (17097 33526)) +;;;;;; "language/korea-util.el" (17102 18775)) ;;; Generated autoloads from language/korea-util.el (defvar default-korean-keyboard (if (string-match "3" (or (getenv "HANGUL_KEYBOARD_TYPE") "")) "3" "") "\ @@ -16344,7 +16499,7 @@ ;;;*** ;;;### (autoloads (lm lm-test-run) "landmark" "play/landmark.el" -;;;;;; (17582 28846)) +;;;;;; (17579 53341)) ;;; Generated autoloads from play/landmark.el (defalias (quote landmark-repeat) (quote lm-test-run)) @@ -16378,8 +16533,8 @@ ;;;### (autoloads (lao-compose-region lao-composition-function lao-post-read-conversion ;;;;;; lao-transcribe-roman-to-lao-string lao-transcribe-single-roman-syllable-to-lao -;;;;;; lao-compose-string) "lao-util" "language/lao-util.el" (17097 -;;;;;; 33526)) +;;;;;; lao-compose-string) "lao-util" "language/lao-util.el" (17102 +;;;;;; 18775)) ;;; Generated autoloads from language/lao-util.el (autoload (quote lao-compose-string) "lao-util" "\ @@ -16428,15 +16583,15 @@ ;;;### (autoloads (latexenc-find-file-coding-system latexenc-coding-system-to-inputenc ;;;;;; latexenc-inputenc-to-coding-system latex-inputenc-coding-alist) -;;;;;; "latexenc" "international/latexenc.el" (17383 32167)) +;;;;;; "latexenc" "international/latexenc.el" (17664 20313)) ;;; Generated autoloads from international/latexenc.el -(defvar latex-inputenc-coding-alist (quote (("ansinew" . windows-1252) ("applemac" . mac-roman) ("ascii" . us-ascii) ("cp1250" . windows-1250) ("cp1252" . windows-1252) ("cp1257" . cp1257) ("cp437de" . cp437) ("cp437" . cp437) ("cp850" . cp850) ("cp852" . cp852) ("cp865" . cp865) ("latin1" . iso-8859-1) ("latin2" . iso-8859-2) ("latin3" . iso-8859-3) ("latin4" . iso-8859-4) ("latin5" . iso-8859-5) ("latin9" . iso-8859-15) ("next" . next) ("utf8" . utf-8) ("utf8x" . utf-8))) "\ +(defvar latex-inputenc-coding-alist (quote (("ansinew" . windows-1252) ("applemac" . mac-roman) ("ascii" . us-ascii) ("cp1250" . windows-1250) ("cp1252" . windows-1252) ("cp1257" . cp1257) ("cp437de" . cp437) ("cp437" . cp437) ("cp850" . cp850) ("cp852" . cp852) ("cp858" . cp858) ("cp865" . cp865) ("latin1" . iso-8859-1) ("latin2" . iso-8859-2) ("latin3" . iso-8859-3) ("latin4" . iso-8859-4) ("latin5" . iso-8859-5) ("latin9" . iso-8859-15) ("next" . next) ("utf8" . utf-8) ("utf8x" . utf-8))) "\ Mapping from LaTeX encodings in \"inputenc.sty\" to Emacs coding systems. LaTeX encodings are specified with \"\\usepackage[encoding]{inputenc}\". Used by the function `latexenc-find-file-coding-system'.") -(custom-autoload (quote latex-inputenc-coding-alist) "latexenc") +(custom-autoload (quote latex-inputenc-coding-alist) "latexenc" t) (autoload (quote latexenc-inputenc-to-coding-system) "latexenc" "\ Return the corresponding coding-system for the specified input encoding. @@ -16460,7 +16615,7 @@ ;;;*** ;;;### (autoloads (latin1-display-ucs-per-lynx latin1-display latin1-display) -;;;;;; "latin1-disp" "international/latin1-disp.el" (17097 33522)) +;;;;;; "latin1-disp" "international/latin1-disp.el" (17102 18720)) ;;; Generated autoloads from international/latin1-disp.el (defvar latin1-display nil "\ @@ -16504,7 +16659,7 @@ ;;;*** ;;;### (autoloads (turn-on-lazy-lock lazy-lock-mode) "lazy-lock" -;;;;;; "obsolete/lazy-lock.el" (17383 32179)) +;;;;;; "obsolete/lazy-lock.el" (17385 8495)) ;;; Generated autoloads from obsolete/lazy-lock.el (autoload (quote lazy-lock-mode) "lazy-lock" "\ @@ -16572,7 +16727,7 @@ ;;;*** ;;;### (autoloads (ld-script-mode) "ld-script" "progmodes/ld-script.el" -;;;;;; (17397 61570)) +;;;;;; (17607 45513)) ;;; Generated autoloads from progmodes/ld-script.el (add-to-list (quote auto-mode-alist) (quote ("\\.ld[si]?\\>" . ld-script-mode))) @@ -16587,7 +16742,7 @@ ;;;*** ;;;### (autoloads (ledit-from-lisp-mode ledit-mode) "ledit" "ledit.el" -;;;;;; (17383 32110)) +;;;;;; (17385 8486)) ;;; Generated autoloads from ledit.el (defconst ledit-save-files t "\ @@ -16621,7 +16776,7 @@ ;;;*** -;;;### (autoloads (life) "life" "play/life.el" (17383 32182)) +;;;### (autoloads (life) "life" "play/life.el" (17674 51268)) ;;; Generated autoloads from play/life.el (autoload (quote life) "life" "\ @@ -16634,8 +16789,8 @@ ;;;*** -;;;### (autoloads (unload-feature) "loadhist" "loadhist.el" (17484 -;;;;;; 52424)) +;;;### (autoloads (unload-feature) "loadhist" "loadhist.el" (17613 +;;;;;; 21909)) ;;; Generated autoloads from loadhist.el (autoload (quote unload-feature) "loadhist" "\ @@ -16658,14 +16813,14 @@ ;;;*** ;;;### (autoloads (locate-with-filter locate locate-ls-subdir-switches) -;;;;;; "locate" "locate.el" (17578 34772)) +;;;;;; "locate" "locate.el" (17669 23128)) ;;; Generated autoloads from locate.el (defvar locate-ls-subdir-switches "-al" "\ `ls' switches for inserting subdirectories in `*Locate*' buffers. This should contain the \"-l\" switch, but not the \"-F\" or \"-b\" switches.") -(custom-autoload (quote locate-ls-subdir-switches) "locate") +(custom-autoload (quote locate-ls-subdir-switches) "locate" t) (autoload (quote locate) "locate" "\ Run the program `locate', putting results in `*Locate*' buffer. @@ -16705,7 +16860,7 @@ ;;;*** -;;;### (autoloads (log-edit) "log-edit" "log-edit.el" (17494 22059)) +;;;### (autoloads (log-edit) "log-edit" "log-edit.el" (17495 43954)) ;;; Generated autoloads from log-edit.el (autoload (quote log-edit) "log-edit" "\ @@ -16726,8 +16881,8 @@ ;;;*** -;;;### (autoloads (log-view-mode) "log-view" "log-view.el" (17494 -;;;;;; 22059)) +;;;### (autoloads (log-view-mode) "log-view" "log-view.el" (17587 +;;;;;; 57939)) ;;; Generated autoloads from log-view.el (autoload (quote log-view-mode) "log-view" "\ @@ -16737,8 +16892,8 @@ ;;;*** -;;;### (autoloads (longlines-mode) "longlines" "longlines.el" (17590 -;;;;;; 36099)) +;;;### (autoloads (longlines-mode) "longlines" "longlines.el" (17709 +;;;;;; 24917)) ;;; Generated autoloads from longlines.el (autoload (quote longlines-mode) "longlines" "\ @@ -16759,8 +16914,8 @@ ;;;*** ;;;### (autoloads (print-region lpr-region print-buffer lpr-buffer -;;;;;; lpr-command lpr-switches printer-name) "lpr" "lpr.el" (17383 -;;;;;; 32111)) +;;;;;; lpr-command lpr-switches printer-name) "lpr" "lpr.el" (17682 +;;;;;; 43101)) ;;; Generated autoloads from lpr.el (defvar lpr-windows-system (memq system-type (quote (emx win32 w32 mswindows ms-dos windows-nt)))) @@ -16782,7 +16937,7 @@ it to the name of a file, in which case the output gets appended to that file. If you want to discard the printed output, set this to \"NUL\".") -(custom-autoload (quote printer-name) "lpr") +(custom-autoload (quote printer-name) "lpr" t) (defvar lpr-switches nil "\ *List of strings to pass as extra options for the printer program. @@ -16790,7 +16945,7 @@ switch on this list. See `lpr-command'.") -(custom-autoload (quote lpr-switches) "lpr") +(custom-autoload (quote lpr-switches) "lpr" t) (defvar lpr-command (cond (lpr-windows-system "") (lpr-lp-system "lp") (t "lpr")) "\ *Name of program for printing a file. @@ -16803,7 +16958,7 @@ treated like `lpr' except that an explicit filename is given as the last argument.") -(custom-autoload (quote lpr-command) "lpr") +(custom-autoload (quote lpr-command) "lpr" t) (autoload (quote lpr-buffer) "lpr" "\ Print buffer contents without pagination or page headers. @@ -16854,7 +17009,7 @@ ;;;*** ;;;### (autoloads (ls-lisp-support-shell-wildcards) "ls-lisp" "ls-lisp.el" -;;;;;; (17383 32111)) +;;;;;; (17385 8487)) ;;; Generated autoloads from ls-lisp.el (defvar ls-lisp-support-shell-wildcards t "\ @@ -16865,8 +17020,8 @@ ;;;*** -;;;### (autoloads (phases-of-moon) "lunar" "calendar/lunar.el" (17397 -;;;;;; 61548)) +;;;### (autoloads (phases-of-moon) "lunar" "calendar/lunar.el" (17386 +;;;;;; 33146)) ;;; Generated autoloads from calendar/lunar.el (autoload (quote phases-of-moon) "lunar" "\ @@ -16879,8 +17034,8 @@ ;;;*** -;;;### (autoloads (m4-mode) "m4-mode" "progmodes/m4-mode.el" (17397 -;;;;;; 61570)) +;;;### (autoloads (m4-mode) "m4-mode" "progmodes/m4-mode.el" (17394 +;;;;;; 12938)) ;;; Generated autoloads from progmodes/m4-mode.el (autoload (quote m4-mode) "m4-mode" "\ @@ -16892,7 +17047,7 @@ ;;;*** ;;;### (autoloads (macroexpand-all) "macroexp" "emacs-lisp/macroexp.el" -;;;;;; (17383 32140)) +;;;;;; (17385 8490)) ;;; Generated autoloads from emacs-lisp/macroexp.el (autoload (quote macroexpand-all) "macroexp" "\ @@ -16906,7 +17061,7 @@ ;;;*** ;;;### (autoloads (apply-macro-to-region-lines kbd-macro-query insert-kbd-macro -;;;;;; name-last-kbd-macro) "macros" "macros.el" (17383 32112)) +;;;;;; name-last-kbd-macro) "macros" "macros.el" (17385 8487)) ;;; Generated autoloads from macros.el (autoload (quote name-last-kbd-macro) "macros" "\ @@ -16995,7 +17150,7 @@ ;;;*** ;;;### (autoloads (what-domain mail-extract-address-components) "mail-extr" -;;;;;; "mail/mail-extr.el" (17383 32168)) +;;;;;; "mail/mail-extr.el" (17385 8494)) ;;; Generated autoloads from mail/mail-extr.el (autoload (quote mail-extract-address-components) "mail-extr" "\ @@ -17027,7 +17182,7 @@ ;;;### (autoloads (mail-hist-put-headers-into-history mail-hist-keep-history ;;;;;; mail-hist-enable mail-hist-define-keys) "mail-hist" "mail/mail-hist.el" -;;;;;; (17383 32168)) +;;;;;; (17385 8494)) ;;; Generated autoloads from mail/mail-hist.el (autoload (quote mail-hist-define-keys) "mail-hist" "\ @@ -17058,8 +17213,8 @@ ;;;### (autoloads (mail-fetch-field mail-unquote-printable-region ;;;;;; mail-unquote-printable mail-quote-printable mail-file-babyl-p -;;;;;; mail-use-rfc822) "mail-utils" "mail/mail-utils.el" (17383 -;;;;;; 32168)) +;;;;;; mail-use-rfc822) "mail-utils" "mail/mail-utils.el" (17385 +;;;;;; 8494)) ;;; Generated autoloads from mail/mail-utils.el (defvar mail-use-rfc822 nil "\ @@ -17111,7 +17266,7 @@ ;;;*** ;;;### (autoloads (define-mail-abbrev build-mail-abbrevs mail-abbrevs-setup) -;;;;;; "mailabbrev" "mail/mailabbrev.el" (17383 32168)) +;;;;;; "mailabbrev" "mail/mailabbrev.el" (17385 8494)) ;;; Generated autoloads from mail/mailabbrev.el (autoload (quote mail-abbrevs-setup) "mailabbrev" "\ @@ -17134,8 +17289,8 @@ ;;;*** ;;;### (autoloads (mail-complete define-mail-alias expand-mail-aliases -;;;;;; mail-complete-style) "mailalias" "mail/mailalias.el" (17383 -;;;;;; 32169)) +;;;;;; mail-complete-style) "mailalias" "mail/mailalias.el" (17385 +;;;;;; 8494)) ;;; Generated autoloads from mail/mailalias.el (defvar mail-complete-style (quote angles) "\ @@ -17181,7 +17336,7 @@ ;;;*** ;;;### (autoloads (mailclient-send-it) "mailclient" "mail/mailclient.el" -;;;;;; (17383 32169)) +;;;;;; (17385 8494)) ;;; Generated autoloads from mail/mailclient.el (autoload (quote mailclient-send-it) "mailclient" "\ @@ -17195,7 +17350,7 @@ ;;;### (autoloads (makefile-imake-mode makefile-bsdmake-mode makefile-makepp-mode ;;;;;; makefile-gmake-mode makefile-automake-mode makefile-mode) -;;;;;; "make-mode" "progmodes/make-mode.el" (17578 34779)) +;;;;;; "make-mode" "progmodes/make-mode.el" (17692 12587)) ;;; Generated autoloads from progmodes/make-mode.el (autoload (quote makefile-mode) "make-mode" "\ @@ -17312,8 +17467,8 @@ ;;;*** -;;;### (autoloads (make-command-summary) "makesum" "makesum.el" (17383 -;;;;;; 32112)) +;;;### (autoloads (make-command-summary) "makesum" "makesum.el" (17385 +;;;;;; 8487)) ;;; Generated autoloads from makesum.el (autoload (quote make-command-summary) "makesum" "\ @@ -17324,7 +17479,7 @@ ;;;*** -;;;### (autoloads (man-follow man) "man" "man.el" (17466 42706)) +;;;### (autoloads (man-follow man) "man" "man.el" (17661 57057)) ;;; Generated autoloads from man.el (defalias (quote manual-entry) (quote man)) @@ -17351,7 +17506,7 @@ ;;;*** -;;;### (autoloads (master-mode) "master" "master.el" (17161 57259)) +;;;### (autoloads (master-mode) "master" "master.el" (17148 25016)) ;;; Generated autoloads from master.el (autoload (quote master-mode) "master" "\ @@ -17373,8 +17528,8 @@ ;;;*** -;;;### (autoloads (menu-bar-mode) "menu-bar" "menu-bar.el" (17578 -;;;;;; 34772)) +;;;### (autoloads (menu-bar-mode) "menu-bar" "menu-bar.el" (17681 +;;;;;; 20649)) ;;; Generated autoloads from menu-bar.el (put (quote menu-bar-mode) (quote standard-value) (quote (t))) @@ -17383,9 +17538,10 @@ Non-nil if Menu-Bar mode is enabled. See the command `menu-bar-mode' for a description of this minor-mode. Setting this variable directly does not take effect; -use either \\[customize] or the function `menu-bar-mode'.") - -(custom-autoload (quote menu-bar-mode) "menu-bar") +either customize it (see the info node `Easy Customization') +or call the function `menu-bar-mode'.") + +(custom-autoload (quote menu-bar-mode) "menu-bar" nil) (autoload (quote menu-bar-mode) "menu-bar" "\ Toggle display of a menu bar on each frame. @@ -17408,7 +17564,7 @@ ;;;;;; message-cite-function message-yank-prefix message-citation-line-function ;;;;;; message-send-mail-function message-user-organization-file ;;;;;; message-signature-separator message-from-style) "message" -;;;;;; "gnus/message.el" (17578 34776)) +;;;;;; "gnus/message.el" (17726 28398)) ;;; Generated autoloads from gnus/message.el (defvar message-from-style (quote default) "\ @@ -17424,17 +17580,17 @@ Otherwise, most addresses look like `angles', but they look like `parens' if `angles' would need quoting and `parens' would not.") -(custom-autoload (quote message-from-style) "message") +(custom-autoload (quote message-from-style) "message" t) (defvar message-signature-separator "^-- *$" "\ Regexp matching the signature separator.") -(custom-autoload (quote message-signature-separator) "message") +(custom-autoload (quote message-signature-separator) "message" t) (defvar message-user-organization-file "/usr/lib/news/organization" "\ *Local news organization file.") -(custom-autoload (quote message-user-organization-file) "message") +(custom-autoload (quote message-user-organization-file) "message" t) (defvar message-send-mail-function (quote message-send-mail-with-sendmail) "\ Function to call to send the current buffer as mail. @@ -17447,7 +17603,7 @@ See also `send-mail-function'.") -(custom-autoload (quote message-send-mail-function) "message") +(custom-autoload (quote message-send-mail-function) "message" t) (defvar message-citation-line-function (quote message-insert-citation-line) "\ *Function called to insert the \"Whomever writes:\" line. @@ -17457,14 +17613,14 @@ people who read your message will have to change their Gnus configuration. See the variable `gnus-cite-attribution-suffix'.") -(custom-autoload (quote message-citation-line-function) "message") +(custom-autoload (quote message-citation-line-function) "message" t) (defvar message-yank-prefix "> " "\ *Prefix inserted on the lines of yanked messages. Fix `message-cite-prefix-regexp' if it is set to an abnormal value. See also `message-yank-cited-prefix'.") -(custom-autoload (quote message-yank-prefix) "message") +(custom-autoload (quote message-yank-prefix) "message" t) (defvar message-cite-function (quote message-cite-original) "\ *Function for citing an original message. @@ -17472,7 +17628,7 @@ `message-cite-original-without-signature'. Note that `message-cite-original' uses `mail-citation-hook' if that is non-nil.") -(custom-autoload (quote message-cite-function) "message") +(custom-autoload (quote message-cite-function) "message" t) (defvar message-indent-citation-function (quote message-indent-citation) "\ *Function for modifying a citation just inserted in the mail buffer. @@ -17480,7 +17636,7 @@ citation between (point) and (mark t). And each function should leave point and mark around the citation text as modified.") -(custom-autoload (quote message-indent-citation-function) "message") +(custom-autoload (quote message-indent-citation-function) "message" t) (defvar message-signature t "\ *String to be inserted at the end of the message buffer. @@ -17488,19 +17644,19 @@ If a function, the result from the function will be used instead. If a form, the result from the form will be used instead.") -(custom-autoload (quote message-signature) "message") +(custom-autoload (quote message-signature) "message" t) (defvar message-signature-file "~/.signature" "\ *Name of file containing the text inserted at end of message buffer. Ignored if the named file doesn't exist. If nil, don't insert a signature.") -(custom-autoload (quote message-signature-file) "message") +(custom-autoload (quote message-signature-file) "message" t) (defvar message-signature-insert-empty-line t "\ *If non-nil, insert an empty line before the signature separator.") -(custom-autoload (quote message-signature-insert-empty-line) "message") +(custom-autoload (quote message-signature-insert-empty-line) "message" t) (define-mail-user-agent (quote message-user-agent) (quote message-mail) (quote message-send-and-exit) (quote message-kill-buffer) (quote message-send-hook)) @@ -17662,7 +17818,7 @@ ;;;*** ;;;### (autoloads (metapost-mode metafont-mode) "meta-mode" "progmodes/meta-mode.el" -;;;;;; (17397 61570)) +;;;;;; (17394 12938)) ;;; Generated autoloads from progmodes/meta-mode.el (autoload (quote metafont-mode) "meta-mode" "\ @@ -17689,7 +17845,7 @@ ;;;### (autoloads (metamail-region metamail-buffer metamail-interpret-body ;;;;;; metamail-interpret-header) "metamail" "mail/metamail.el" -;;;;;; (17383 32169)) +;;;;;; (17385 8494)) ;;; Generated autoloads from mail/metamail.el (autoload (quote metamail-interpret-header) "metamail" "\ @@ -17734,7 +17890,7 @@ ;;;### (autoloads (mh-fully-kill-draft mh-send-letter mh-user-agent-compose ;;;;;; mh-smail-batch mh-smail-other-window mh-smail) "mh-comp" -;;;;;; "mh-e/mh-comp.el" (17578 34777)) +;;;;;; "mh-e/mh-comp.el" (17689 24335)) ;;; Generated autoloads from mh-e/mh-comp.el (autoload (quote mh-smail) "mh-comp" "\ @@ -17821,7 +17977,7 @@ ;;;*** -;;;### (autoloads (mh-version) "mh-e" "mh-e/mh-e.el" (17578 34777)) +;;;### (autoloads (mh-version) "mh-e" "mh-e/mh-e.el" (17578 42698)) ;;; Generated autoloads from mh-e/mh-e.el (put (quote mh-progs) (quote risky-local-variable) t) @@ -17838,7 +17994,7 @@ ;;;*** ;;;### (autoloads (mh-folder-mode mh-nmail mh-rmail) "mh-folder" -;;;;;; "mh-e/mh-folder.el" (17484 52433)) +;;;;;; "mh-e/mh-folder.el" (17485 5461)) ;;; Generated autoloads from mh-e/mh-folder.el (autoload (quote mh-rmail) "mh-folder" "\ @@ -17920,7 +18076,7 @@ ;;;*** ;;;### (autoloads (midnight-delay-set clean-buffer-list) "midnight" -;;;;;; "midnight.el" (17420 36079)) +;;;;;; "midnight.el" (17727 28649)) ;;; Generated autoloads from midnight.el (autoload (quote clean-buffer-list) "midnight" "\ @@ -17947,7 +18103,7 @@ ;;;*** ;;;### (autoloads (minibuffer-electric-default-mode) "minibuf-eldef" -;;;;;; "minibuf-eldef.el" (17383 32112)) +;;;;;; "minibuf-eldef.el" (17385 8487)) ;;; Generated autoloads from minibuf-eldef.el (defvar minibuffer-electric-default-mode nil "\ @@ -17958,6 +18114,8 @@ (custom-autoload (quote minibuffer-electric-default-mode) "minibuf-eldef") +(put (quote minibuffer-electric-default-mode) (quote custom-set) (quote custom-set-minor-mode)) + (autoload (quote minibuffer-electric-default-mode) "minibuf-eldef" "\ Toggle Minibuffer Electric Default mode. When active, minibuffer prompts that show a default value only show the @@ -17974,7 +18132,7 @@ ;;;*** ;;;### (autoloads (mixal-mode) "mixal-mode" "progmodes/mixal-mode.el" -;;;;;; (17397 61570)) +;;;;;; (17394 12938)) ;;; Generated autoloads from progmodes/mixal-mode.el (autoload (quote mixal-mode) "mixal-mode" "\ @@ -17989,7 +18147,7 @@ ;;;### (autoloads (malayalam-composition-function malayalam-post-read-conversion ;;;;;; malayalam-compose-region) "mlm-util" "language/mlm-util.el" -;;;;;; (17346 38886)) +;;;;;; (17340 11482)) ;;; Generated autoloads from language/mlm-util.el (autoload (quote malayalam-compose-region) "mlm-util" "\ @@ -18012,7 +18170,7 @@ ;;;*** ;;;### (autoloads (mm-inline-external-body mm-extern-cache-contents) -;;;;;; "mm-extern" "gnus/mm-extern.el" (17484 52431)) +;;;;;; "mm-extern" "gnus/mm-extern.el" (17632 41885)) ;;; Generated autoloads from gnus/mm-extern.el (autoload (quote mm-extern-cache-contents) "mm-extern" "\ @@ -18031,7 +18189,7 @@ ;;;*** ;;;### (autoloads (mm-inline-partial) "mm-partial" "gnus/mm-partial.el" -;;;;;; (17383 32161)) +;;;;;; (17385 8493)) ;;; Generated autoloads from gnus/mm-partial.el (autoload (quote mm-inline-partial) "mm-partial" "\ @@ -18045,7 +18203,7 @@ ;;;*** ;;;### (autoloads (mm-url-insert-file-contents-external mm-url-insert-file-contents) -;;;;;; "mm-url" "gnus/mm-url.el" (17383 32161)) +;;;;;; "mm-url" "gnus/mm-url.el" (17604 60390)) ;;; Generated autoloads from gnus/mm-url.el (autoload (quote mm-url-insert-file-contents) "mm-url" "\ @@ -18062,7 +18220,7 @@ ;;;*** ;;;### (autoloads (mm-uu-dissect-text-parts mm-uu-dissect) "mm-uu" -;;;;;; "gnus/mm-uu.el" (17498 30595)) +;;;;;; "gnus/mm-uu.el" (17714 34817)) ;;; Generated autoloads from gnus/mm-uu.el (autoload (quote mm-uu-dissect) "mm-uu" "\ @@ -18082,7 +18240,7 @@ ;;;*** ;;;### (autoloads (mml1991-sign mml1991-encrypt) "mml1991" "gnus/mml1991.el" -;;;;;; (17494 22066)) +;;;;;; (17495 43954)) ;;; Generated autoloads from gnus/mml1991.el (autoload (quote mml1991-encrypt) "mml1991" "\ @@ -18099,7 +18257,7 @@ ;;;### (autoloads (mml2015-self-encrypt mml2015-sign mml2015-encrypt ;;;;;; mml2015-verify-test mml2015-verify mml2015-decrypt-test mml2015-decrypt) -;;;;;; "mml2015" "gnus/mml2015.el" (17498 30595)) +;;;;;; "mml2015" "gnus/mml2015.el" (17495 43954)) ;;; Generated autoloads from gnus/mml2015.el (autoload (quote mml2015-decrypt) "mml2015" "\ @@ -18140,7 +18298,7 @@ ;;;*** ;;;### (autoloads (modula-2-mode) "modula2" "progmodes/modula2.el" -;;;;;; (17281 61308)) +;;;;;; (17276 54295)) ;;; Generated autoloads from progmodes/modula2.el (autoload (quote modula-2-mode) "modula2" "\ @@ -18172,7 +18330,7 @@ ;;;*** ;;;### (autoloads (unmorse-region morse-region) "morse" "play/morse.el" -;;;;;; (17383 32182)) +;;;;;; (17385 8495)) ;;; Generated autoloads from play/morse.el (autoload (quote morse-region) "morse" "\ @@ -18187,17 +18345,18 @@ ;;;*** -;;;### (autoloads (mouse-sel-mode) "mouse-sel" "mouse-sel.el" (17383 -;;;;;; 32113)) +;;;### (autoloads (mouse-sel-mode) "mouse-sel" "mouse-sel.el" (17704 +;;;;;; 4325)) ;;; Generated autoloads from mouse-sel.el (defvar mouse-sel-mode nil "\ Non-nil if Mouse-Sel mode is enabled. See the command `mouse-sel-mode' for a description of this minor-mode. Setting this variable directly does not take effect; -use either \\[customize] or the function `mouse-sel-mode'.") - -(custom-autoload (quote mouse-sel-mode) "mouse-sel") +either customize it (see the info node `Easy Customization') +or call the function `mouse-sel-mode'.") + +(custom-autoload (quote mouse-sel-mode) "mouse-sel" nil) (autoload (quote mouse-sel-mode) "mouse-sel" "\ Toggle Mouse Sel mode. @@ -18239,7 +18398,7 @@ ;;;*** -;;;### (autoloads (mpuz) "mpuz" "play/mpuz.el" (17383 32183)) +;;;### (autoloads (mpuz) "mpuz" "play/mpuz.el" (17385 8495)) ;;; Generated autoloads from play/mpuz.el (autoload (quote mpuz) "mpuz" "\ @@ -18249,7 +18408,7 @@ ;;;*** -;;;### (autoloads (msb-mode) "msb" "msb.el" (17578 34773)) +;;;### (autoloads (msb-mode) "msb" "msb.el" (17560 14582)) ;;; Generated autoloads from msb.el (defvar msb-mode nil "\ @@ -18260,6 +18419,8 @@ (custom-autoload (quote msb-mode) "msb") +(put (quote msb-mode) (quote custom-set) (quote custom-set-minor-mode)) + (autoload (quote msb-mode) "msb" "\ Toggle Msb mode. With arg, turn Msb mode on if and only if arg is positive. @@ -18275,7 +18436,7 @@ ;;;;;; describe-current-coding-system describe-current-coding-system-briefly ;;;;;; describe-coding-system describe-character-set list-charset-chars ;;;;;; read-charset list-character-sets) "mule-diag" "international/mule-diag.el" -;;;;;; (17210 47738)) +;;;;;; (17619 27480)) ;;; Generated autoloads from international/mule-diag.el (defvar non-iso-charset-alist (\` ((mac-roman (ascii latin-iso8859-1 mule-unicode-2500-33ff mule-unicode-0100-24ff mule-unicode-e000-ffff) mac-roman-decoder ((0 255))) (viscii (ascii vietnamese-viscii-lower vietnamese-viscii-upper) viet-viscii-nonascii-translation-table ((0 255))) (vietnamese-tcvn (ascii vietnamese-viscii-lower vietnamese-viscii-upper) viet-tcvn-nonascii-translation-table ((0 255))) (koi8-r (ascii cyrillic-iso8859-5) cyrillic-koi8-r-nonascii-translation-table ((32 255))) (alternativnyj (ascii cyrillic-iso8859-5) cyrillic-alternativnyj-nonascii-translation-table ((32 255))) (koi8-u (ascii cyrillic-iso8859-5 mule-unicode-0100-24ff) cyrillic-koi8-u-nonascii-translation-table ((32 255))) (big5 (ascii chinese-big5-1 chinese-big5-2) decode-big5-char ((32 127) ((161 254) 64 126 161 254))) (sjis (ascii katakana-jisx0201 japanese-jisx0208) decode-sjis-char ((32 127 161 223) ((129 159 224 239) 64 126 128 252))))) "\ @@ -18408,7 +18569,8 @@ \(fn)" nil nil) (autoload (quote describe-font) "mule-diag" "\ -Display information about fonts which partially match FONTNAME. +Display information about a font whose name is FONTNAME. +The font must be already used by Emacs. \(fn FONTNAME)" t nil) @@ -18448,7 +18610,7 @@ ;;;;;; coding-system-translation-table-for-decode coding-system-pre-write-conversion ;;;;;; coding-system-post-read-conversion lookup-nested-alist set-nested-alist ;;;;;; truncate-string-to-width store-substring string-to-sequence) -;;;;;; "mule-util" "international/mule-util.el" (17097 33522)) +;;;;;; "mule-util" "international/mule-util.el" (17102 18726)) ;;; Generated autoloads from international/mule-util.el (autoload (quote string-to-sequence) "mule-util" "\ @@ -18577,7 +18739,7 @@ ;;;*** ;;;### (autoloads (mwheel-install mouse-wheel-mode) "mwheel" "mwheel.el" -;;;;;; (17494 22018)) +;;;;;; (17515 24181)) ;;; Generated autoloads from mwheel.el (defvar mouse-wheel-mode nil "\ @@ -18588,6 +18750,8 @@ (custom-autoload (quote mouse-wheel-mode) "mwheel") +(put (quote mouse-wheel-mode) (quote custom-set) (quote custom-set-minor-mode)) + (autoload (quote mouse-wheel-mode) "mwheel" "\ Toggle mouse wheel support. With prefix argument ARG, turn on if positive, otherwise off. @@ -18605,7 +18769,7 @@ ;;;### (autoloads (network-connection network-connection-to-service ;;;;;; whois-reverse-lookup whois finger ftp run-dig dns-lookup-host ;;;;;; nslookup nslookup-host route arp netstat ipconfig ping traceroute) -;;;;;; "net-utils" "net/net-utils.el" (17383 32176)) +;;;;;; "net-utils" "net/net-utils.el" (17385 8495)) ;;; Generated autoloads from net/net-utils.el (autoload (quote traceroute) "net-utils" "\ @@ -18697,11 +18861,11 @@ ;;;*** ;;;### (autoloads (comment-indent-new-line comment-auto-fill-only-comments -;;;;;; comment-dwim comment-or-uncomment-region comment-region uncomment-region -;;;;;; comment-kill comment-set-column comment-indent comment-indent-default -;;;;;; comment-normalize-vars comment-multi-line comment-padding -;;;;;; comment-style comment-column) "newcomment" "newcomment.el" -;;;;;; (17515 39526)) +;;;;;; comment-dwim comment-or-uncomment-region comment-box comment-region +;;;;;; uncomment-region comment-kill comment-set-column comment-indent +;;;;;; comment-indent-default comment-normalize-vars comment-multi-line +;;;;;; comment-padding comment-style comment-column) "newcomment" +;;;;;; "newcomment.el" (17707 53738)) ;;; Generated autoloads from newcomment.el (defalias (quote indent-for-comment) (quote comment-indent)) @@ -18726,7 +18890,7 @@ Comments might be indented to a value smaller than this in order not to go beyond `comment-fill-column'.") -(custom-autoload (quote comment-column) "newcomment") +(custom-autoload (quote comment-column) "newcomment" t) (put 'comment-column 'safe-local-variable 'integerp) (defvar comment-start nil "\ @@ -18766,7 +18930,7 @@ Style to be used for `comment-region'. See `comment-styles' for a list of available styles.") -(custom-autoload (quote comment-style) "newcomment") +(custom-autoload (quote comment-style) "newcomment" t) (defvar comment-padding " " "\ Padding string that `comment-region' puts between comment chars and text. @@ -18776,7 +18940,7 @@ Extra spacing between the comment characters and the comment text makes the comment easier to read. Default is 1. nil means 0.") -(custom-autoload (quote comment-padding) "newcomment") +(custom-autoload (quote comment-padding) "newcomment" t) (defvar comment-multi-line nil "\ Non-nil means `comment-indent-new-line' continues comments. @@ -18787,7 +18951,7 @@ It also affects \\[indent-new-comment-line]. However, if you want this behavior for explicit filling, you might as well use \\[newline-and-indent].") -(custom-autoload (quote comment-multi-line) "newcomment") +(custom-autoload (quote comment-multi-line) "newcomment" t) (autoload (quote comment-normalize-vars) "newcomment" "\ Check and setup the variables needed by other commenting functions. @@ -18844,6 +19008,13 @@ \(fn BEG END &optional ARG)" t nil) +(autoload (quote comment-box) "newcomment" "\ +Comment out the BEG .. END region, putting it inside a box. +The numeric prefix ARG specifies how many characters to add to begin- and +end- comment markers additionally to what `comment-add' already specifies. + +\(fn BEG END &optional ARG)" t nil) + (autoload (quote comment-or-uncomment-region) "newcomment" "\ Call `comment-region', unless the region only consists of comments, in which case call `uncomment-region'. If a prefix arg is given, it @@ -18867,7 +19038,7 @@ Non-nil means to only auto-fill inside comments. This has no effect in modes that do not define a comment syntax.") -(custom-autoload (quote comment-auto-fill-only-comments) "newcomment") +(custom-autoload (quote comment-auto-fill-only-comments) "newcomment" t) (autoload (quote comment-indent-new-line) "newcomment" "\ Break line at point and indent, continuing comment if within one. @@ -18890,7 +19061,7 @@ ;;;### (autoloads (newsticker-show-news newsticker-start-ticker newsticker-start ;;;;;; newsticker-ticker-running-p newsticker-running-p) "newsticker" -;;;;;; "net/newsticker.el" (17383 32176)) +;;;;;; "net/newsticker.el" (17385 8495)) ;;; Generated autoloads from net/newsticker.el (autoload (quote newsticker-running-p) "newsticker" "\ @@ -18932,7 +19103,7 @@ ;;;*** ;;;### (autoloads (nndiary-generate-nov-databases) "nndiary" "gnus/nndiary.el" -;;;;;; (17383 32162)) +;;;;;; (17385 8493)) ;;; Generated autoloads from gnus/nndiary.el (autoload (quote nndiary-generate-nov-databases) "nndiary" "\ @@ -18942,8 +19113,8 @@ ;;;*** -;;;### (autoloads (nndoc-add-type) "nndoc" "gnus/nndoc.el" (17383 -;;;;;; 32162)) +;;;### (autoloads (nndoc-add-type) "nndoc" "gnus/nndoc.el" (17385 +;;;;;; 8494)) ;;; Generated autoloads from gnus/nndoc.el (autoload (quote nndoc-add-type) "nndoc" "\ @@ -18958,7 +19129,7 @@ ;;;*** ;;;### (autoloads (nnfolder-generate-active-file) "nnfolder" "gnus/nnfolder.el" -;;;;;; (17397 61556)) +;;;;;; (17394 12936)) ;;; Generated autoloads from gnus/nnfolder.el (autoload (quote nnfolder-generate-active-file) "nnfolder" "\ @@ -18970,7 +19141,7 @@ ;;;*** ;;;### (autoloads (nnkiboze-generate-groups) "nnkiboze" "gnus/nnkiboze.el" -;;;;;; (17383 32163)) +;;;;;; (17385 8494)) ;;; Generated autoloads from gnus/nnkiboze.el (autoload (quote nnkiboze-generate-groups) "nnkiboze" "\ @@ -18982,7 +19153,7 @@ ;;;*** ;;;### (autoloads (nnml-generate-nov-databases) "nnml" "gnus/nnml.el" -;;;;;; (17383 32164)) +;;;;;; (17385 8494)) ;;; Generated autoloads from gnus/nnml.el (autoload (quote nnml-generate-nov-databases) "nnml" "\ @@ -18993,7 +19164,7 @@ ;;;*** ;;;### (autoloads (nnsoup-revert-variables nnsoup-set-variables nnsoup-pack-replies) -;;;;;; "nnsoup" "gnus/nnsoup.el" (17383 32164)) +;;;;;; "nnsoup" "gnus/nnsoup.el" (17385 8494)) ;;; Generated autoloads from gnus/nnsoup.el (autoload (quote nnsoup-pack-replies) "nnsoup" "\ @@ -19014,7 +19185,7 @@ ;;;*** ;;;### (autoloads (disable-command enable-command disabled-command-function) -;;;;;; "novice" "novice.el" (17383 32114)) +;;;;;; "novice" "novice.el" (17665 54136)) ;;; Generated autoloads from novice.el (defvar disabled-command-function (quote disabled-command-function) "\ @@ -19047,7 +19218,7 @@ ;;;*** ;;;### (autoloads (nroff-mode) "nroff-mode" "textmodes/nroff-mode.el" -;;;;;; (17383 55266)) +;;;;;; (17385 8496)) ;;; Generated autoloads from textmodes/nroff-mode.el (autoload (quote nroff-mode) "nroff-mode" "\ @@ -19062,7 +19233,7 @@ ;;;*** ;;;### (autoloads (octave-help) "octave-hlp" "progmodes/octave-hlp.el" -;;;;;; (17397 61570)) +;;;;;; (17394 12938)) ;;; Generated autoloads from progmodes/octave-hlp.el (autoload (quote octave-help) "octave-hlp" "\ @@ -19076,7 +19247,7 @@ ;;;*** ;;;### (autoloads (inferior-octave) "octave-inf" "progmodes/octave-inf.el" -;;;;;; (17582 29242)) +;;;;;; (17730 6653)) ;;; Generated autoloads from progmodes/octave-inf.el (autoload (quote inferior-octave) "octave-inf" "\ @@ -19099,7 +19270,7 @@ ;;;*** ;;;### (autoloads (octave-mode) "octave-mod" "progmodes/octave-mod.el" -;;;;;; (17432 37364)) +;;;;;; (17427 10522)) ;;; Generated autoloads from progmodes/octave-mod.el (autoload (quote octave-mode) "octave-mod" "\ @@ -19198,7 +19369,7 @@ ;;;*** ;;;### (autoloads (edit-options list-options) "options" "obsolete/options.el" -;;;;;; (17578 34778)) +;;;;;; (17560 6690)) ;;; Generated autoloads from obsolete/options.el (autoload (quote list-options) "options" "\ @@ -19224,7 +19395,7 @@ ;;;;;; org-remember-handler org-remember-apply-template org-remember-annotation ;;;;;; org-store-link org-tags-view org-diary org-todo-list org-agenda-list ;;;;;; org-agenda org-global-cycle org-cycle org-mode) "org" "textmodes/org.el" -;;;;;; (17582 28847)) +;;;;;; (17699 53313)) ;;; Generated autoloads from textmodes/org.el (autoload (quote org-mode) "org" "\ @@ -19476,7 +19647,7 @@ ;;;*** ;;;### (autoloads (outline-minor-mode outline-mode) "outline" "outline.el" -;;;;;; (17515 39526)) +;;;;;; (17515 24181)) ;;; Generated autoloads from outline.el (put 'outline-regexp 'safe-local-variable 'string-or-null-p) @@ -19532,8 +19703,8 @@ ;;;*** -;;;### (autoloads nil "paragraphs" "textmodes/paragraphs.el" (17494 -;;;;;; 22070)) +;;;### (autoloads nil "paragraphs" "textmodes/paragraphs.el" (17495 +;;;;;; 43955)) ;;; Generated autoloads from textmodes/paragraphs.el (put 'paragraph-start 'safe-local-variable 'stringp) (put 'paragraph-separate 'safe-local-variable 'stringp) @@ -19547,7 +19718,7 @@ ;;;*** -;;;### (autoloads (show-paren-mode) "paren" "paren.el" (17383 32114)) +;;;### (autoloads (show-paren-mode) "paren" "paren.el" (17385 8487)) ;;; Generated autoloads from paren.el (defvar show-paren-mode nil "\ @@ -19558,6 +19729,8 @@ (custom-autoload (quote show-paren-mode) "paren") +(put (quote show-paren-mode) (quote custom-set) (quote custom-set-minor-mode)) + (autoload (quote show-paren-mode) "paren" "\ Toggle Show Paren mode. With prefix ARG, turn Show Paren mode on if and only if ARG is positive. @@ -19571,7 +19744,7 @@ ;;;*** ;;;### (autoloads (parse-time-string) "parse-time" "calendar/parse-time.el" -;;;;;; (17397 61548)) +;;;;;; (17386 33146)) ;;; Generated autoloads from calendar/parse-time.el (autoload (quote parse-time-string) "parse-time" "\ @@ -19583,8 +19756,8 @@ ;;;*** -;;;### (autoloads (pascal-mode) "pascal" "progmodes/pascal.el" (17397 -;;;;;; 61571)) +;;;### (autoloads (pascal-mode) "pascal" "progmodes/pascal.el" (17394 +;;;;;; 12938)) ;;; Generated autoloads from progmodes/pascal.el (autoload (quote pascal-mode) "pascal" "\ @@ -19637,7 +19810,7 @@ ;;;*** ;;;### (autoloads (pc-bindings-mode) "pc-mode" "emulation/pc-mode.el" -;;;;;; (17383 32143)) +;;;;;; (17385 8491)) ;;; Generated autoloads from emulation/pc-mode.el (autoload (quote pc-bindings-mode) "pc-mode" "\ @@ -19655,7 +19828,7 @@ ;;;*** ;;;### (autoloads (pc-selection-mode pc-selection-mode) "pc-select" -;;;;;; "emulation/pc-select.el" (17383 32143)) +;;;;;; "emulation/pc-select.el" (17385 8491)) ;;; Generated autoloads from emulation/pc-select.el (defvar pc-selection-mode nil "\ @@ -19666,6 +19839,8 @@ (custom-autoload (quote pc-selection-mode) "pc-select") +(put (quote pc-selection-mode) (quote custom-set) (quote custom-set-minor-mode)) + (autoload (quote pc-selection-mode) "pc-select" "\ Change mark behavior to emulate Motif, MAC or MS-Windows cut and paste style. @@ -19730,8 +19905,8 @@ ;;;*** -;;;### (autoloads (pcomplete/cvs) "pcmpl-cvs" "pcmpl-cvs.el" (17383 -;;;;;; 32114)) +;;;### (autoloads (pcomplete/cvs) "pcmpl-cvs" "pcmpl-cvs.el" (17385 +;;;;;; 8487)) ;;; Generated autoloads from pcmpl-cvs.el (autoload (quote pcomplete/cvs) "pcmpl-cvs" "\ @@ -19742,7 +19917,7 @@ ;;;*** ;;;### (autoloads (pcomplete/tar pcomplete/make pcomplete/bzip2 pcomplete/gzip) -;;;;;; "pcmpl-gnu" "pcmpl-gnu.el" (17383 32115)) +;;;;;; "pcmpl-gnu" "pcmpl-gnu.el" (17385 8487)) ;;; Generated autoloads from pcmpl-gnu.el (autoload (quote pcomplete/gzip) "pcmpl-gnu" "\ @@ -19770,7 +19945,7 @@ ;;;*** ;;;### (autoloads (pcomplete/mount pcomplete/umount pcomplete/kill) -;;;;;; "pcmpl-linux" "pcmpl-linux.el" (17383 32115)) +;;;;;; "pcmpl-linux" "pcmpl-linux.el" (17385 8487)) ;;; Generated autoloads from pcmpl-linux.el (autoload (quote pcomplete/kill) "pcmpl-linux" "\ @@ -19790,8 +19965,8 @@ ;;;*** -;;;### (autoloads (pcomplete/rpm) "pcmpl-rpm" "pcmpl-rpm.el" (17383 -;;;;;; 32115)) +;;;### (autoloads (pcomplete/rpm) "pcmpl-rpm" "pcmpl-rpm.el" (17385 +;;;;;; 8487)) ;;; Generated autoloads from pcmpl-rpm.el (autoload (quote pcomplete/rpm) "pcmpl-rpm" "\ @@ -19807,7 +19982,7 @@ ;;;### (autoloads (pcomplete/chgrp pcomplete/chown pcomplete/which ;;;;;; pcomplete/xargs pcomplete/rm pcomplete/rmdir pcomplete/cd) -;;;;;; "pcmpl-unix" "pcmpl-unix.el" (17383 32115)) +;;;;;; "pcmpl-unix" "pcmpl-unix.el" (17385 8487)) ;;; Generated autoloads from pcmpl-unix.el (autoload (quote pcomplete/cd) "pcmpl-unix" "\ @@ -19853,8 +20028,8 @@ ;;;### (autoloads (pcomplete-shell-setup pcomplete-comint-setup pcomplete-list ;;;;;; pcomplete-help pcomplete-expand pcomplete-continue pcomplete-expand-and-complete -;;;;;; pcomplete-reverse pcomplete) "pcomplete" "pcomplete.el" (17457 -;;;;;; 37500)) +;;;;;; pcomplete-reverse pcomplete) "pcomplete" "pcomplete.el" (17476 +;;;;;; 4798)) ;;; Generated autoloads from pcomplete.el (autoload (quote pcomplete) "pcomplete" "\ @@ -19913,7 +20088,7 @@ ;;;### (autoloads (cvs-dired-use-hook cvs-dired-action cvs-status ;;;;;; cvs-update cvs-examine cvs-quickdir cvs-checkout) "pcvs" -;;;;;; "pcvs.el" (17578 34773)) +;;;;;; "pcvs.el" (17697 23215)) ;;; Generated autoloads from pcvs.el (autoload (quote cvs-checkout) "pcvs" "\ @@ -19973,7 +20148,7 @@ The action to be performed when opening a CVS directory. Sensible values are `cvs-examine', `cvs-status' and `cvs-quickdir'.") -(custom-autoload (quote cvs-dired-action) "pcvs") +(custom-autoload (quote cvs-dired-action) "pcvs" t) (defvar cvs-dired-use-hook (quote (4)) "\ Whether or not opening a CVS directory should run PCL-CVS. @@ -19982,7 +20157,7 @@ command that prompted the opening of the directory. Anything else means to do it only if the prefix arg is equal to this value.") -(custom-autoload (quote cvs-dired-use-hook) "pcvs") +(custom-autoload (quote cvs-dired-use-hook) "pcvs" t) (defun cvs-dired-noselect (dir) "\ Run `cvs-examine' if DIR is a CVS administrative directory. @@ -19990,7 +20165,7 @@ ;;;*** -;;;### (autoloads nil "pcvs-defs" "pcvs-defs.el" (17582 32791)) +;;;### (autoloads nil "pcvs-defs" "pcvs-defs.el" (17670 57734)) ;;; Generated autoloads from pcvs-defs.el (defvar cvs-global-menu (let ((m (make-sparse-keymap "PCL-CVS"))) (define-key m [status] (quote (menu-item "Directory Status" cvs-status :help "A more verbose status of a workarea"))) (define-key m [checkout] (quote (menu-item "Checkout Module" cvs-checkout :help "Check out a module from the repository"))) (define-key m [update] (quote (menu-item "Update Directory" cvs-update :help "Fetch updates from the repository"))) (define-key m [examine] (quote (menu-item "Examine Directory" cvs-examine :help "Examine the current state of a workarea"))) (fset (quote cvs-global-menu) m))) @@ -19998,7 +20173,7 @@ ;;;*** ;;;### (autoloads (perl-mode) "perl-mode" "progmodes/perl-mode.el" -;;;;;; (17498 30499)) +;;;;;; (17515 24182)) ;;; Generated autoloads from progmodes/perl-mode.el (autoload (quote perl-mode) "perl-mode" "\ @@ -20056,7 +20231,7 @@ ;;;### (autoloads (pgg-snarf-keys pgg-snarf-keys-region pgg-insert-key ;;;;;; pgg-verify pgg-verify-region pgg-sign pgg-sign-region pgg-decrypt ;;;;;; pgg-decrypt-region pgg-encrypt pgg-encrypt-symmetric pgg-encrypt-symmetric-region -;;;;;; pgg-encrypt-region) "pgg" "pgg.el" (17383 32117)) +;;;;;; pgg-encrypt-region) "pgg" "pgg.el" (17661 55157)) ;;; Generated autoloads from pgg.el (autoload (quote pgg-encrypt-region) "pgg" "\ @@ -20190,7 +20365,7 @@ ;;;*** ;;;### (autoloads (pgg-gpg-symmetric-key-p) "pgg-gpg" "pgg-gpg.el" -;;;;;; (17466 42707)) +;;;;;; (17664 20313)) ;;; Generated autoloads from pgg-gpg.el (autoload (quote pgg-gpg-symmetric-key-p) "pgg-gpg" "\ @@ -20201,7 +20376,7 @@ ;;;*** ;;;### (autoloads (picture-mode) "picture" "textmodes/picture.el" -;;;;;; (17466 42716)) +;;;;;; (17476 4802)) ;;; Generated autoloads from textmodes/picture.el (autoload (quote picture-mode) "picture" "\ @@ -20282,7 +20457,7 @@ ;;;*** ;;;### (autoloads (po-find-file-coding-system) "po" "textmodes/po.el" -;;;;;; (17578 34780)) +;;;;;; (17601 9092)) ;;; Generated autoloads from textmodes/po.el (autoload (quote po-find-file-coding-system) "po" "\ @@ -20293,7 +20468,7 @@ ;;;*** -;;;### (autoloads (pong) "pong" "play/pong.el" (17578 34778)) +;;;### (autoloads (pong) "pong" "play/pong.el" (17551 7908)) ;;; Generated autoloads from play/pong.el (autoload (quote pong) "pong" "\ @@ -20310,7 +20485,7 @@ ;;;*** ;;;### (autoloads (pp-eval-last-sexp pp-eval-expression pp pp-buffer -;;;;;; pp-to-string) "pp" "emacs-lisp/pp.el" (17383 32140)) +;;;;;; pp-to-string) "pp" "emacs-lisp/pp.el" (17718 28532)) ;;; Generated autoloads from emacs-lisp/pp.el (autoload (quote pp-to-string) "pp" "\ @@ -20334,12 +20509,15 @@ \(fn OBJECT &optional STREAM)" nil nil) (autoload (quote pp-eval-expression) "pp" "\ -Evaluate EXPRESSION and pretty-print value into a new display buffer. -If the pretty-printed value fits on one line, the message line is used -instead. The value is also consed onto the front of the list +Evaluate an expression, then pretty-print value EXPVAL into a new buffer. +If pretty-printed EXPVAL fits on one line, display it in the echo +area instead. Also add EXPVAL to the front of the list in the variable `values'. -\(fn EXPRESSION)" t nil) +Non-interactively, the argument is the value, EXPVAL, not the expression +to evaluate. + +\(fn EXPVAL)" t nil) (autoload (quote pp-eval-last-sexp) "pp" "\ Run `pp-eval-expression' on sexp before point (which see). @@ -20368,7 +20546,7 @@ ;;;;;; pr-ps-buffer-print pr-ps-buffer-using-ghostscript pr-ps-buffer-preview ;;;;;; pr-ps-directory-ps-print pr-ps-directory-print pr-ps-directory-using-ghostscript ;;;;;; pr-ps-directory-preview pr-interface) "printing" "printing.el" -;;;;;; (17383 32117)) +;;;;;; (17682 43101)) ;;; Generated autoloads from printing.el (autoload (quote pr-interface) "printing" "\ @@ -20955,8 +21133,8 @@ ;;;*** -;;;### (autoloads (run-prolog prolog-mode) "prolog" "progmodes/prolog.el" -;;;;;; (17397 61571)) +;;;### (autoloads (switch-to-prolog prolog-mode) "prolog" "progmodes/prolog.el" +;;;;;; (17664 20313)) ;;; Generated autoloads from progmodes/prolog.el (autoload (quote prolog-mode) "prolog" "\ @@ -20969,14 +21147,17 @@ \(fn)" t nil) -(autoload (quote run-prolog) "prolog" "\ +(defalias (quote run-prolog) (quote switch-to-prolog)) + +(autoload (quote switch-to-prolog) "prolog" "\ Run an inferior Prolog process, input and output via buffer *prolog*. - -\(fn)" t nil) - -;;;*** - -;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (17383 32117)) +With prefix argument \\[universal-prefix], prompt for the program to use. + +\(fn &optional NAME)" t nil) + +;;;*** + +;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (17385 8487)) ;;; Generated autoloads from ps-bdf.el (defvar bdf-directory-list (if (memq system-type (quote (ms-dos windows-nt))) (list (expand-file-name "fonts/bdf" installation-directory)) (quote ("/usr/local/share/emacs/fonts/bdf"))) "\ @@ -20985,8 +21166,8 @@ ;;;*** -;;;### (autoloads (ps-mode) "ps-mode" "progmodes/ps-mode.el" (17397 -;;;;;; 61571)) +;;;### (autoloads (ps-mode) "ps-mode" "progmodes/ps-mode.el" (17394 +;;;;;; 12938)) ;;; Generated autoloads from progmodes/ps-mode.el (autoload (quote ps-mode) "ps-mode" "\ @@ -21035,7 +21216,7 @@ ;;;### (autoloads (ps-mule-begin-page ps-mule-begin-job ps-mule-encode-header-string ;;;;;; ps-mule-initialize ps-mule-plot-composition ps-mule-plot-string ;;;;;; ps-mule-set-ascii-font ps-mule-prepare-ascii-font ps-multibyte-buffer) -;;;;;; "ps-mule" "ps-mule.el" (17383 32117)) +;;;;;; "ps-mule" "ps-mule.el" (17385 8487)) ;;; Generated autoloads from ps-mule.el (defvar ps-multibyte-buffer nil "\ @@ -21156,22 +21337,22 @@ ;;;;;; ps-spool-region ps-spool-buffer-with-faces ps-spool-buffer ;;;;;; ps-print-region-with-faces ps-print-region ps-print-buffer-with-faces ;;;;;; ps-print-buffer ps-print-customize ps-print-color-p ps-paper-type -;;;;;; ps-page-dimensions-database) "ps-print" "ps-print.el" (17383 -;;;;;; 32118)) +;;;;;; ps-page-dimensions-database) "ps-print" "ps-print.el" (17682 +;;;;;; 43101)) ;;; Generated autoloads from ps-print.el (defvar ps-page-dimensions-database (list (list (quote a4) (/ (* 72 21.0) 2.54) (/ (* 72 29.7) 2.54) "A4") (list (quote a3) (/ (* 72 29.7) 2.54) (/ (* 72 42.0) 2.54) "A3") (list (quote letter) (* 72 8.5) (* 72 11.0) "Letter") (list (quote legal) (* 72 8.5) (* 72 14.0) "Legal") (list (quote letter-small) (* 72 7.68) (* 72 10.16) "LetterSmall") (list (quote tabloid) (* 72 11.0) (* 72 17.0) "Tabloid") (list (quote ledger) (* 72 17.0) (* 72 11.0) "Ledger") (list (quote statement) (* 72 5.5) (* 72 8.5) "Statement") (list (quote executive) (* 72 7.5) (* 72 10.0) "Executive") (list (quote a4small) (* 72 7.47) (* 72 10.85) "A4Small") (list (quote b4) (* 72 10.125) (* 72 14.33) "B4") (list (quote b5) (* 72 7.16) (* 72 10.125) "B5")) "\ *List associating a symbolic paper type to its width, height and doc media. See `ps-paper-type'.") -(custom-autoload (quote ps-page-dimensions-database) "ps-print") +(custom-autoload (quote ps-page-dimensions-database) "ps-print" t) (defvar ps-paper-type (quote letter) "\ *Specify the size of paper to format for. Should be one of the paper types defined in `ps-page-dimensions-database', for example `letter', `legal' or `a4'.") -(custom-autoload (quote ps-paper-type) "ps-print") +(custom-autoload (quote ps-paper-type) "ps-print" t) (defvar ps-print-color-p (or (fboundp (quote x-color-values)) (fboundp (quote color-instance-rgb-components))) "\ *Specify how buffer's text color is printed. @@ -21187,7 +21368,7 @@ Any other value is treated as t.") -(custom-autoload (quote ps-print-color-p) "ps-print") +(custom-autoload (quote ps-print-color-p) "ps-print" t) (autoload (quote ps-print-customize) "ps-print" "\ Customization of ps-print group. @@ -21354,7 +21535,7 @@ ;;;*** ;;;### (autoloads (jython-mode python-mode run-python) "python" "progmodes/python.el" -;;;;;; (17487 53546)) +;;;;;; (17723 56210)) ;;; Generated autoloads from progmodes/python.el (add-to-list (quote interpreter-mode-alist) (quote ("jython" . jython-mode))) @@ -21367,19 +21548,24 @@ Run an inferior Python process, input and output via buffer *Python*. CMD is the Python command to run. NOSHOW non-nil means don't show the buffer automatically. -If there is a process already running in `*Python*', switch to -that buffer. Interactively, a prefix arg allows you to edit the initial -command line (default is `python-command'); `-i' etc. args will be added -to this as appropriate. Runs the hook `inferior-python-mode-hook' -\(after the `comint-mode-hook' is run). -\(Type \\[describe-mode] in the process buffer for a list of commands.) - -\(fn &optional CMD NOSHOW)" t nil) + +Normally, if there is a process already running in `python-buffer', +switch to that buffer. Interactively, a prefix arg allows you to edit +the initial command line (default is `python-command'); `-i' etc. args +will be added to this as appropriate. A new process is started if: +one isn't running attached to `python-buffer', or interactively the +default `python-command', or argument NEW is non-nil. See also the +documentation for `python-buffer'. + +Runs the hook `inferior-python-mode-hook' (after the +`comint-mode-hook' is run). (Type \\[describe-mode] in the process +buffer for a list of commands.) + +\(fn &optional CMD NOSHOW NEW)" t nil) (autoload (quote python-mode) "python" "\ Major mode for editing Python files. -Turns on Font Lock mode unconditionally since it is required for correct -parsing of the source. +Font Lock mode is currently required for correct parsing of the source. See also `jython-mode', which is actually invoked if the buffer appears to contain Jython code. See also `run-python' and associated Python mode commands for running Python under Emacs. @@ -21393,16 +21579,22 @@ Colon is electric: it outdents the line if appropriate, e.g. for an else statement. \\[python-backspace] at the beginning of an indented statement deletes a level of indentation to close the current block; otherwise it -deletes a charcter backward. TAB indents the current line relative to +deletes a character backward. TAB indents the current line relative to the preceding code. Successive TABs, with no intervening command, cycle through the possibilities for indentation on the basis of enclosing blocks. -\\[fill-paragraph] fills comments and multiline strings appropriately, but has no +\\[fill-paragraph] fills comments and multi-line strings appropriately, but has no effect outside them. Supports Eldoc mode (only for functions, using a Python process), Info-Look and Imenu. In Outline minor mode, `class' and `def' -lines count as headers. +lines count as headers. Symbol completion is available in the +same way as in the Python shell using the `rlcompleter' module +and this is added to the Hippie Expand functions locally if +Hippie Expand mode is turned on. Completion of symbols of the +form x.y only works if the components are literal +module/attribute names, not variables. An abbrev table is set up +with skeleton expansions for compound statement templates. \\{python-mode-map} @@ -21418,7 +21610,7 @@ ;;;*** ;;;### (autoloads (quoted-printable-decode-region) "qp" "gnus/qp.el" -;;;;;; (17420 36085)) +;;;;;; (17408 40148)) ;;; Generated autoloads from gnus/qp.el (autoload (quote quoted-printable-decode-region) "qp" "\ @@ -21441,7 +21633,7 @@ ;;;;;; quail-defrule quail-install-decode-map quail-install-map ;;;;;; quail-define-rules quail-show-keyboard-layout quail-set-keyboard-layout ;;;;;; quail-define-package quail-use-package quail-title) "quail" -;;;;;; "international/quail.el" (17304 24770)) +;;;;;; "international/quail.el" (17660 25612)) ;;; Generated autoloads from international/quail.el (autoload (quote quail-title) "quail" "\ @@ -21672,8 +21864,8 @@ ;;;### (autoloads (quickurl-list quickurl-list-mode quickurl-edit-urls ;;;;;; quickurl-browse-url-ask quickurl-browse-url quickurl-add-url -;;;;;; quickurl-ask quickurl) "quickurl" "net/quickurl.el" (17383 -;;;;;; 32176)) +;;;;;; quickurl-ask quickurl) "quickurl" "net/quickurl.el" (17385 +;;;;;; 8495)) ;;; Generated autoloads from net/quickurl.el (defconst quickurl-reread-hook-postfix "\n;; Local Variables:\n;; eval: (progn (require 'quickurl) (add-hook 'local-write-file-hooks (lambda () (quickurl-read) nil)))\n;; End:\n" "\ @@ -21745,7 +21937,7 @@ ;;;*** ;;;### (autoloads (rcirc-track-minor-mode rcirc-connect rcirc) "rcirc" -;;;;;; "net/rcirc.el" (17578 34778)) +;;;;;; "net/rcirc.el" (17671 12161)) ;;; Generated autoloads from net/rcirc.el (autoload (quote rcirc) "rcirc" "\ @@ -21765,9 +21957,10 @@ Non-nil if Rcirc-Track minor mode is enabled. See the command `rcirc-track-minor-mode' for a description of this minor-mode. Setting this variable directly does not take effect; -use either \\[customize] or the function `rcirc-track-minor-mode'.") - -(custom-autoload (quote rcirc-track-minor-mode) "rcirc") +either customize it (see the info node `Easy Customization') +or call the function `rcirc-track-minor-mode'.") + +(custom-autoload (quote rcirc-track-minor-mode) "rcirc" nil) (autoload (quote rcirc-track-minor-mode) "rcirc" "\ Global minor mode for tracking activity in rcirc buffers. @@ -21776,8 +21969,8 @@ ;;;*** -;;;### (autoloads (remote-compile) "rcompile" "net/rcompile.el" (17578 -;;;;;; 34778)) +;;;### (autoloads (remote-compile) "rcompile" "net/rcompile.el" (17569 +;;;;;; 26652)) ;;; Generated autoloads from net/rcompile.el (autoload (quote remote-compile) "rcompile" "\ @@ -21789,7 +21982,7 @@ ;;;*** ;;;### (autoloads (re-builder) "re-builder" "emacs-lisp/re-builder.el" -;;;;;; (17503 24307)) +;;;;;; (17515 24181)) ;;; Generated autoloads from emacs-lisp/re-builder.el (defalias (quote regexp-builder) (quote re-builder)) @@ -21801,16 +21994,17 @@ ;;;*** -;;;### (autoloads (recentf-mode) "recentf" "recentf.el" (17457 37500)) +;;;### (autoloads (recentf-mode) "recentf" "recentf.el" (17718 28532)) ;;; Generated autoloads from recentf.el (defvar recentf-mode nil "\ Non-nil if Recentf mode is enabled. See the command `recentf-mode' for a description of this minor-mode. Setting this variable directly does not take effect; -use either \\[customize] or the function `recentf-mode'.") - -(custom-autoload (quote recentf-mode) "recentf") +either customize it (see the info node `Easy Customization') +or call the function `recentf-mode'.") + +(custom-autoload (quote recentf-mode) "recentf" nil) (autoload (quote recentf-mode) "recentf" "\ Toggle recentf mode. @@ -21820,8 +22014,6 @@ When recentf mode is enabled, it maintains a menu for visiting files that were operated on recently. -\\{recentf-mode-map} - \(fn &optional ARG)" t nil) ;;;*** @@ -21829,8 +22021,8 @@ ;;;### (autoloads (clear-rectangle string-insert-rectangle string-rectangle ;;;;;; delete-whitespace-rectangle open-rectangle insert-rectangle ;;;;;; yank-rectangle kill-rectangle extract-rectangle delete-extract-rectangle -;;;;;; delete-rectangle move-to-column-force) "rect" "rect.el" (17466 -;;;;;; 42707)) +;;;;;; delete-rectangle move-to-column-force) "rect" "rect.el" (17637 +;;;;;; 59300)) ;;; Generated autoloads from rect.el (autoload (quote move-to-column-force) "rect" "\ @@ -21958,8 +22150,8 @@ ;;;*** -;;;### (autoloads (refill-mode) "refill" "textmodes/refill.el" (17383 -;;;;;; 32188)) +;;;### (autoloads (refill-mode) "refill" "textmodes/refill.el" (17385 +;;;;;; 8496)) ;;; Generated autoloads from textmodes/refill.el (autoload (quote refill-mode) "refill" "\ @@ -21975,7 +22167,7 @@ ;;;*** ;;;### (autoloads (reftex-reset-scanning-information reftex-mode -;;;;;; turn-on-reftex) "reftex" "textmodes/reftex.el" (17404 53188)) +;;;;;; turn-on-reftex) "reftex" "textmodes/reftex.el" (17408 40149)) ;;; Generated autoloads from textmodes/reftex.el (autoload (quote turn-on-reftex) "reftex" "\ @@ -22025,7 +22217,7 @@ ;;;*** ;;;### (autoloads (reftex-citation) "reftex-cite" "textmodes/reftex-cite.el" -;;;;;; (17404 53187)) +;;;;;; (17408 40149)) ;;; Generated autoloads from textmodes/reftex-cite.el (autoload (quote reftex-citation) "reftex-cite" "\ @@ -22055,7 +22247,7 @@ ;;;*** ;;;### (autoloads (reftex-isearch-minor-mode) "reftex-global" "textmodes/reftex-global.el" -;;;;;; (17404 53187)) +;;;;;; (17712 850)) ;;; Generated autoloads from textmodes/reftex-global.el (autoload (quote reftex-isearch-minor-mode) "reftex-global" "\ @@ -22072,7 +22264,7 @@ ;;;*** ;;;### (autoloads (reftex-index-phrases-mode) "reftex-index" "textmodes/reftex-index.el" -;;;;;; (17420 36092)) +;;;;;; (17420 32031)) ;;; Generated autoloads from textmodes/reftex-index.el (autoload (quote reftex-index-phrases-mode) "reftex-index" "\ @@ -22105,7 +22297,7 @@ ;;;*** ;;;### (autoloads (reftex-all-document-files) "reftex-parse" "textmodes/reftex-parse.el" -;;;;;; (17404 53187)) +;;;;;; (17408 40149)) ;;; Generated autoloads from textmodes/reftex-parse.el (autoload (quote reftex-all-document-files) "reftex-parse" "\ @@ -22117,8 +22309,8 @@ ;;;*** -;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (17494 -;;;;;; 22070)) +;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (17704 +;;;;;; 4326)) ;;; Generated autoloads from textmodes/reftex-vars.el (put 'reftex-vref-is-default 'safe-local-variable (lambda (x) (or (stringp x) (symbolp x)))) (put 'reftex-fref-is-default 'safe-local-variable (lambda (x) (or (stringp x) (symbolp x)))) @@ -22128,7 +22320,7 @@ ;;;*** ;;;### (autoloads (regexp-opt-depth regexp-opt) "regexp-opt" "emacs-lisp/regexp-opt.el" -;;;;;; (17383 32141)) +;;;;;; (17385 8490)) ;;; Generated autoloads from emacs-lisp/regexp-opt.el (autoload (quote regexp-opt) "regexp-opt" "\ @@ -22155,7 +22347,7 @@ ;;;*** -;;;### (autoloads (repeat) "repeat" "repeat.el" (17383 32118)) +;;;### (autoloads (repeat) "repeat" "repeat.el" (17385 8487)) ;;; Generated autoloads from repeat.el (autoload (quote repeat) "repeat" "\ @@ -22173,7 +22365,7 @@ ;;;*** ;;;### (autoloads (reporter-submit-bug-report) "reporter" "mail/reporter.el" -;;;;;; (17383 32169)) +;;;;;; (17385 8494)) ;;; Generated autoloads from mail/reporter.el (autoload (quote reporter-submit-bug-report) "reporter" "\ @@ -22205,7 +22397,7 @@ ;;;*** ;;;### (autoloads (reposition-window) "reposition" "reposition.el" -;;;;;; (17383 32119)) +;;;;;; (17385 8487)) ;;; Generated autoloads from reposition.el (autoload (quote reposition-window) "reposition" "\ @@ -22232,8 +22424,8 @@ ;;;*** -;;;### (autoloads (resume-suspend-hook) "resume" "resume.el" (17383 -;;;;;; 32119)) +;;;### (autoloads (resume-suspend-hook) "resume" "resume.el" (17385 +;;;;;; 8487)) ;;; Generated autoloads from resume.el (autoload (quote resume-suspend-hook) "resume" "\ @@ -22244,7 +22436,7 @@ ;;;*** ;;;### (autoloads (global-reveal-mode reveal-mode) "reveal" "reveal.el" -;;;;;; (17494 22060)) +;;;;;; (17495 43954)) ;;; Generated autoloads from reveal.el (autoload (quote reveal-mode) "reveal" "\ @@ -22265,6 +22457,8 @@ (custom-autoload (quote global-reveal-mode) "reveal") +(put (quote global-reveal-mode) (quote custom-set) (quote custom-set-minor-mode)) + (autoload (quote global-reveal-mode) "reveal" "\ Toggle Reveal mode in all buffers on or off. Reveal mode renders invisible text around point visible again. @@ -22278,7 +22472,7 @@ ;;;*** ;;;### (autoloads (make-ring ring-p) "ring" "emacs-lisp/ring.el" -;;;;;; (17383 32141)) +;;;;;; (17385 8490)) ;;; Generated autoloads from emacs-lisp/ring.el (autoload (quote ring-p) "ring" "\ @@ -22293,7 +22487,7 @@ ;;;*** -;;;### (autoloads (rlogin) "rlogin" "net/rlogin.el" (17383 32177)) +;;;### (autoloads (rlogin) "rlogin" "net/rlogin.el" (17385 8495)) ;;; Generated autoloads from net/rlogin.el (add-hook 'same-window-regexps "^\\*rlogin-.*\\*\\(\\|<[0-9]+>\\)") @@ -22344,8 +22538,8 @@ ;;;;;; rmail-mail-new-frame rmail-primary-inbox-list rmail-delete-after-output ;;;;;; rmail-highlight-face rmail-highlighted-headers rmail-retry-ignored-headers ;;;;;; rmail-displayed-headers rmail-ignored-headers rmail-dont-reply-to-names -;;;;;; rmail-movemail-variant-p) "rmail" "mail/rmail.el" (17521 -;;;;;; 64538)) +;;;;;; rmail-movemail-variant-p) "rmail" "mail/rmail.el" (17704 +;;;;;; 4326)) ;;; Generated autoloads from mail/rmail.el (autoload (quote rmail-movemail-variant-p) "rmail" "\ @@ -22359,7 +22553,7 @@ A value of nil means exclude your own email address as an address plus whatever is specified by `rmail-default-dont-reply-to-names'.") -(custom-autoload (quote rmail-dont-reply-to-names) "rmail") +(custom-autoload (quote rmail-dont-reply-to-names) "rmail" t) (defvar rmail-default-dont-reply-to-names "\\`info-" "\ A regular expression specifying part of the default value of the @@ -22378,36 +22572,36 @@ for a message that you have already viewed, go to that message and type \\[rmail-toggle-header] twice.") -(custom-autoload (quote rmail-ignored-headers) "rmail") +(custom-autoload (quote rmail-ignored-headers) "rmail" t) (defvar rmail-displayed-headers nil "\ *Regexp to match Header fields that Rmail should display. If nil, display all header fields except those matched by `rmail-ignored-headers'.") -(custom-autoload (quote rmail-displayed-headers) "rmail") +(custom-autoload (quote rmail-displayed-headers) "rmail" t) (defvar rmail-retry-ignored-headers "^x-authentication-warning:" "\ *Headers that should be stripped when retrying a failed message.") -(custom-autoload (quote rmail-retry-ignored-headers) "rmail") +(custom-autoload (quote rmail-retry-ignored-headers) "rmail" t) (defvar rmail-highlighted-headers "^From:\\|^Subject:" "\ *Regexp to match Header fields that Rmail should normally highlight. A value of nil means don't highlight. See also `rmail-highlight-face'.") -(custom-autoload (quote rmail-highlighted-headers) "rmail") +(custom-autoload (quote rmail-highlighted-headers) "rmail" t) (defvar rmail-highlight-face (quote rmail-highlight) "\ *Face used by Rmail for highlighting headers.") -(custom-autoload (quote rmail-highlight-face) "rmail") +(custom-autoload (quote rmail-highlight-face) "rmail" t) (defvar rmail-delete-after-output nil "\ *Non-nil means automatically delete a message that is copied to a file.") -(custom-autoload (quote rmail-delete-after-output) "rmail") +(custom-autoload (quote rmail-delete-after-output) "rmail" t) (defvar rmail-primary-inbox-list nil "\ *List of files which are inboxes for user's primary mail file `~/RMAIL'. @@ -22415,29 +22609,29 @@ \(the name varies depending on the operating system, and the value of the environment variable MAIL overrides it).") -(custom-autoload (quote rmail-primary-inbox-list) "rmail") +(custom-autoload (quote rmail-primary-inbox-list) "rmail" t) (defvar rmail-mail-new-frame nil "\ *Non-nil means Rmail makes a new frame for composing outgoing mail. This is handy if you want to preserve the window configuration of the frame where you have the RMAIL buffer displayed.") -(custom-autoload (quote rmail-mail-new-frame) "rmail") +(custom-autoload (quote rmail-mail-new-frame) "rmail" t) (defvar rmail-secondary-file-directory "~/" "\ *Directory for additional secondary Rmail files.") -(custom-autoload (quote rmail-secondary-file-directory) "rmail") +(custom-autoload (quote rmail-secondary-file-directory) "rmail" t) (defvar rmail-secondary-file-regexp "\\.xmail$" "\ *Regexp for which files are secondary Rmail files.") -(custom-autoload (quote rmail-secondary-file-regexp) "rmail") +(custom-autoload (quote rmail-secondary-file-regexp) "rmail" t) (defvar rmail-confirm-expunge (quote y-or-n-p) "\ *Whether and how to ask for confirmation before expunging deleted messages.") -(custom-autoload (quote rmail-confirm-expunge) "rmail") +(custom-autoload (quote rmail-confirm-expunge) "rmail" t) (defvar rmail-mode-hook nil "\ List of functions to call when Rmail is invoked.") @@ -22448,7 +22642,7 @@ (defvar rmail-show-message-hook nil "\ List of functions to call when Rmail displays a message.") -(custom-autoload (quote rmail-show-message-hook) "rmail") +(custom-autoload (quote rmail-show-message-hook) "rmail" t) (defvar rmail-quit-hook nil "\ List of functions to call when quitting out of Rmail.") @@ -22473,7 +22667,7 @@ if the feature specified by `rmail-mime-feature' is not available in your session.") -(custom-autoload (quote rmail-enable-mime) "rmail") +(custom-autoload (quote rmail-enable-mime) "rmail" t) (defvar rmail-show-mime-function nil "\ Function to show MIME decoded message of RMAIL file. @@ -22526,7 +22720,7 @@ ignored, and all the decoding work is done by a feature specified by the variable `rmail-mime-feature'.") -(defvar rmail-mime-charset-pattern (concat "^content-type:[ ]*text/plain;" "\\(?:[ \n]*\\(?:format\\|delsp\\)=\"?[-a-z0-9]+\"?;\\)*" "[ \n]*charset=\"?\\([^ \n\";]+\\)\"?") "\ +(defvar rmail-mime-charset-pattern (concat "^content-type:[ ]*text/plain;" "\\(?:[ \n]*\\(?:format\\|delsp\\)=\"?[-a-z0-9]+\"?;\\)*" "[ \n]*charset=\"?\\([^ \n\";]+\\)\"?") "\ Regexp to match MIME-charset specification in a header of message. The first parenthesized expression should match the MIME-charset name.") @@ -22610,7 +22804,7 @@ ;;;*** ;;;### (autoloads (rmail-edit-current-message) "rmailedit" "mail/rmailedit.el" -;;;;;; (17383 32170)) +;;;;;; (17385 8494)) ;;; Generated autoloads from mail/rmailedit.el (autoload (quote rmail-edit-current-message) "rmailedit" "\ @@ -22622,7 +22816,7 @@ ;;;### (autoloads (rmail-next-labeled-message rmail-previous-labeled-message ;;;;;; rmail-read-label rmail-kill-label rmail-add-label) "rmailkwd" -;;;;;; "mail/rmailkwd.el" (17383 32170)) +;;;;;; "mail/rmailkwd.el" (17385 8494)) ;;; Generated autoloads from mail/rmailkwd.el (autoload (quote rmail-add-label) "rmailkwd" "\ @@ -22661,7 +22855,7 @@ ;;;*** ;;;### (autoloads (set-rmail-inbox-list) "rmailmsc" "mail/rmailmsc.el" -;;;;;; (17383 32170)) +;;;;;; (17385 8494)) ;;; Generated autoloads from mail/rmailmsc.el (autoload (quote set-rmail-inbox-list) "rmailmsc" "\ @@ -22675,7 +22869,7 @@ ;;;### (autoloads (rmail-output-body-to-file rmail-output rmail-fields-not-to-output ;;;;;; rmail-output-to-rmail-file rmail-output-file-alist) "rmailout" -;;;;;; "mail/rmailout.el" (17383 32170)) +;;;;;; "mail/rmailout.el" (17385 8494)) ;;; Generated autoloads from mail/rmailout.el (defvar rmail-output-file-alist nil "\ @@ -22742,8 +22936,8 @@ ;;;### (autoloads (rmail-sort-by-labels rmail-sort-by-lines rmail-sort-by-correspondent ;;;;;; rmail-sort-by-recipient rmail-sort-by-author rmail-sort-by-subject -;;;;;; rmail-sort-by-date) "rmailsort" "mail/rmailsort.el" (17383 -;;;;;; 32170)) +;;;;;; rmail-sort-by-date) "rmailsort" "mail/rmailsort.el" (17385 +;;;;;; 8494)) ;;; Generated autoloads from mail/rmailsort.el (autoload (quote rmail-sort-by-date) "rmailsort" "\ @@ -22795,7 +22989,7 @@ ;;;;;; rmail-summary-by-senders rmail-summary-by-topic rmail-summary-by-regexp ;;;;;; rmail-summary-by-recipients rmail-summary-by-labels rmail-summary ;;;;;; rmail-summary-line-count-flag rmail-summary-scroll-between-messages) -;;;;;; "rmailsum" "mail/rmailsum.el" (17432 37362)) +;;;;;; "rmailsum" "mail/rmailsum.el" (17427 10522)) ;;; Generated autoloads from mail/rmailsum.el (defvar rmail-summary-scroll-between-messages t "\ @@ -22877,7 +23071,7 @@ ;;;*** ;;;### (autoloads (news-post-news) "rnewspost" "obsolete/rnewspost.el" -;;;;;; (17383 32180)) +;;;;;; (17385 8495)) ;;; Generated autoloads from obsolete/rnewspost.el (autoload (quote news-post-news) "rnewspost" "\ @@ -22890,7 +23084,7 @@ ;;;*** ;;;### (autoloads (toggle-rot13-mode rot13-other-window rot13-region -;;;;;; rot13-string rot13) "rot13" "rot13.el" (17383 32119)) +;;;;;; rot13-string rot13) "rot13" "rot13.el" (17385 8487)) ;;; Generated autoloads from rot13.el (autoload (quote rot13) "rot13" "\ @@ -22931,7 +23125,7 @@ ;;;;;; resize-minibuffer-frame-max-height resize-minibuffer-frame ;;;;;; resize-minibuffer-window-exactly resize-minibuffer-window-max-height ;;;;;; resize-minibuffer-mode) "rsz-mini" "obsolete/rsz-mini.el" -;;;;;; (17383 32180)) +;;;;;; (17385 8495)) ;;; Generated autoloads from obsolete/rsz-mini.el (defvar resize-minibuffer-mode nil "\ @@ -22971,8 +23165,8 @@ ;;;*** -;;;### (autoloads (ruler-mode) "ruler-mode" "ruler-mode.el" (17383 -;;;;;; 32119)) +;;;### (autoloads (ruler-mode) "ruler-mode" "ruler-mode.el" (17385 +;;;;;; 8487)) ;;; Generated autoloads from ruler-mode.el (autoload (quote ruler-mode) "ruler-mode" "\ @@ -22983,7 +23177,7 @@ ;;;*** ;;;### (autoloads (rx rx-to-string) "rx" "emacs-lisp/rx.el" (17420 -;;;;;; 36082)) +;;;;;; 32030)) ;;; Generated autoloads from emacs-lisp/rx.el (autoload (quote rx-to-string) "rx" "\ @@ -23291,7 +23485,7 @@ ;;;*** ;;;### (autoloads (savehist-mode savehist-mode) "savehist" "savehist.el" -;;;;;; (17457 37500)) +;;;;;; (17476 4798)) ;;; Generated autoloads from savehist.el (defvar savehist-mode nil "\ @@ -23317,7 +23511,7 @@ ;;;*** ;;;### (autoloads (dsssl-mode scheme-mode) "scheme" "progmodes/scheme.el" -;;;;;; (17397 61572)) +;;;;;; (17394 12938)) ;;; Generated autoloads from progmodes/scheme.el (autoload (quote scheme-mode) "scheme" "\ @@ -23359,7 +23553,7 @@ ;;;*** ;;;### (autoloads (gnus-score-mode) "score-mode" "gnus/score-mode.el" -;;;;;; (17383 32165)) +;;;;;; (17385 8494)) ;;; Generated autoloads from gnus/score-mode.el (autoload (quote gnus-score-mode) "score-mode" "\ @@ -23372,8 +23566,8 @@ ;;;*** -;;;### (autoloads (scribe-mode) "scribe" "obsolete/scribe.el" (17383 -;;;;;; 32180)) +;;;### (autoloads (scribe-mode) "scribe" "obsolete/scribe.el" (17385 +;;;;;; 8495)) ;;; Generated autoloads from obsolete/scribe.el (autoload (quote scribe-mode) "scribe" "\ @@ -23398,7 +23592,7 @@ ;;;*** ;;;### (autoloads (scroll-all-mode) "scroll-all" "scroll-all.el" -;;;;;; (17383 32120)) +;;;;;; (17385 8487)) ;;; Generated autoloads from scroll-all.el (defvar scroll-all-mode nil "\ @@ -23409,6 +23603,8 @@ (custom-autoload (quote scroll-all-mode) "scroll-all") +(put (quote scroll-all-mode) (quote custom-set) (quote custom-set-minor-mode)) + (autoload (quote scroll-all-mode) "scroll-all" "\ Toggle Scroll-All minor mode. With ARG, turn Scroll-All minor mode on if ARG is positive, off otherwise. @@ -23420,7 +23616,7 @@ ;;;*** ;;;### (autoloads (scroll-lock-mode) "scroll-lock" "scroll-lock.el" -;;;;;; (17383 32120)) +;;;;;; (17385 8487)) ;;; Generated autoloads from scroll-lock.el (autoload (quote scroll-lock-mode) "scroll-lock" "\ @@ -23442,7 +23638,7 @@ ;;;;;; mail-alias-file mail-default-reply-to mail-archive-file-name ;;;;;; mail-header-separator send-mail-function mail-interactive ;;;;;; mail-self-blind mail-specify-envelope-from mail-from-style) -;;;;;; "sendmail" "mail/sendmail.el" (17578 34777)) +;;;;;; "sendmail" "mail/sendmail.el" (17660 26729)) ;;; Generated autoloads from mail/sendmail.el (defvar mail-from-style (quote angles) "\ @@ -23462,7 +23658,7 @@ to the mailer to specify the envelope-from address. But that is now controlled by a separate variable, `mail-specify-envelope-from'.") -(custom-autoload (quote mail-from-style) "sendmail") +(custom-autoload (quote mail-from-style) "sendmail" t) (defvar mail-specify-envelope-from nil "\ If non-nil, specify the envelope-from address when sending mail. @@ -23474,20 +23670,20 @@ smtpmail -- if you use feedmail to send mail, see instead the variable `feedmail-deduce-envelope-from'.") -(custom-autoload (quote mail-specify-envelope-from) "sendmail") +(custom-autoload (quote mail-specify-envelope-from) "sendmail" t) (defvar mail-self-blind nil "\ Non-nil means insert BCC to self in messages to be sent. This is done when the message is initialized, so you can remove or alter the BCC field to override the default.") -(custom-autoload (quote mail-self-blind) "sendmail") +(custom-autoload (quote mail-self-blind) "sendmail" t) (defvar mail-interactive nil "\ Non-nil means when sending a message wait for and display errors. nil means let mailer mail back a message to report errors.") -(custom-autoload (quote mail-interactive) "sendmail") +(custom-autoload (quote mail-interactive) "sendmail" t) (put (quote send-mail-function) (quote standard-value) (quote ((if (and window-system (memq system-type (quote (darwin windows-nt)))) (quote mailclient-send-it) (quote sendmail-send-it))))) @@ -23499,25 +23695,25 @@ This is used by the default mail-sending commands. See also `message-send-mail-function' for use with the Message package.") -(custom-autoload (quote send-mail-function) "sendmail") +(custom-autoload (quote send-mail-function) "sendmail" t) (defvar mail-header-separator "--text follows this line--" "\ Line used to separate headers from text in messages being composed.") -(custom-autoload (quote mail-header-separator) "sendmail") +(custom-autoload (quote mail-header-separator) "sendmail" t) (defvar mail-archive-file-name nil "\ Name of file to write all outgoing messages in, or nil for none. This can be an inbox file or an Rmail file.") -(custom-autoload (quote mail-archive-file-name) "sendmail") +(custom-autoload (quote mail-archive-file-name) "sendmail" t) (defvar mail-default-reply-to nil "\ Address to insert as default Reply-to field of outgoing messages. If nil, it will be initialized from the REPLYTO environment variable when you first send mail.") -(custom-autoload (quote mail-default-reply-to) "sendmail") +(custom-autoload (quote mail-default-reply-to) "sendmail" t) (defvar mail-alias-file nil "\ If non-nil, the name of a file to use instead of `/usr/lib/aliases'. @@ -23525,7 +23721,7 @@ feature from that of defining aliases in `.mailrc' to be expanded in Emacs. This variable has no effect unless your system uses sendmail as its mailer.") -(custom-autoload (quote mail-alias-file) "sendmail") +(custom-autoload (quote mail-alias-file) "sendmail" t) (defvar mail-personal-alias-file "~/.mailrc" "\ If non-nil, the name of the user's personal mail alias file. @@ -23533,13 +23729,13 @@ the `Mail' or `mailx' program. This file need not actually exist.") -(custom-autoload (quote mail-personal-alias-file) "sendmail") +(custom-autoload (quote mail-personal-alias-file) "sendmail" t) (defvar mail-setup-hook nil "\ Normal hook, run each time a new outgoing mail message is initialized. The function `mail-setup' runs this hook.") -(custom-autoload (quote mail-setup-hook) "sendmail") +(custom-autoload (quote mail-setup-hook) "sendmail" t) (defvar mail-aliases t "\ Alist of mail address aliases, @@ -23553,13 +23749,13 @@ Prefix insert on lines of yanked message being replied to. nil means use indentation.") -(custom-autoload (quote mail-yank-prefix) "sendmail") +(custom-autoload (quote mail-yank-prefix) "sendmail" t) (defvar mail-indentation-spaces 3 "\ Number of spaces to insert at the beginning of each cited line. Used by `mail-yank-original' via `mail-indent-citation'.") -(custom-autoload (quote mail-indentation-spaces) "sendmail") +(custom-autoload (quote mail-indentation-spaces) "sendmail" t) (defvar mail-citation-hook nil "\ Hook for modifying a citation just inserted in the mail buffer. @@ -23572,7 +23768,7 @@ If this hook is entirely empty (nil), a default action is taken instead of no action.") -(custom-autoload (quote mail-citation-hook) "sendmail") +(custom-autoload (quote mail-citation-hook) "sendmail" t) (defvar mail-citation-prefix-regexp "[ ]*[-a-z0-9A-Z]*>+[ ]*\\|[ ]*" "\ Regular expression to match a citation prefix plus whitespace. @@ -23580,7 +23776,7 @@ with whitespace before and after; it should also match just whitespace. The default value matches citations like `foo-bar>' plus whitespace.") -(custom-autoload (quote mail-citation-prefix-regexp) "sendmail") +(custom-autoload (quote mail-citation-prefix-regexp) "sendmail" t) (defvar mail-signature nil "\ Text inserted at end of mail buffer when a message is initialized. @@ -23591,26 +23787,26 @@ Otherwise, it should be an expression; it is evaluated and should insert whatever you want to insert.") -(custom-autoload (quote mail-signature) "sendmail") +(custom-autoload (quote mail-signature) "sendmail" t) (defvar mail-signature-file "~/.signature" "\ File containing the text inserted at end of mail buffer.") -(custom-autoload (quote mail-signature-file) "sendmail") +(custom-autoload (quote mail-signature-file) "sendmail" t) (defvar mail-default-directory "~/" "\ Directory for mail buffers. Value of `default-directory' for mail buffers. This directory is used for auto-save files of mail buffers.") -(custom-autoload (quote mail-default-directory) "sendmail") +(custom-autoload (quote mail-default-directory) "sendmail" t) (defvar mail-default-headers nil "\ A string containing header lines, to be inserted in outgoing messages. It is inserted before you edit the message, so you can edit or delete these lines.") -(custom-autoload (quote mail-default-headers) "sendmail") +(custom-autoload (quote mail-default-headers) "sendmail" t) (defvar mail-bury-selects-summary t "\ If non-nil, try to show RMAIL summary buffer after returning from mail. @@ -23618,7 +23814,7 @@ the RMAIL summary buffer before returning, if it exists and this variable is non-nil.") -(custom-autoload (quote mail-bury-selects-summary) "sendmail") +(custom-autoload (quote mail-bury-selects-summary) "sendmail" t) (defvar mail-send-nonascii (quote mime) "\ Specify whether to allow sending non-ASCII characters in mail. @@ -23629,7 +23825,7 @@ Including non-ASCII characters in a mail message can be problematical for the recipient, who may not know how to decode them properly.") -(custom-autoload (quote mail-send-nonascii) "sendmail") +(custom-autoload (quote mail-send-nonascii) "sendmail" t) (autoload (quote mail-mode) "sendmail" "\ Major mode for editing mail to be sent. @@ -23660,7 +23856,7 @@ The variable is used to trigger insertion of the \"Mail-Followup-To\" header when sending a message to a mailing list.") -(custom-autoload (quote mail-mailing-lists) "sendmail") +(custom-autoload (quote mail-mailing-lists) "sendmail" t) (defvar sendmail-coding-system nil "\ *Coding system for encoding the outgoing mail. @@ -23743,7 +23939,7 @@ ;;;*** ;;;### (autoloads (server-mode server-start) "server" "server.el" -;;;;;; (17582 28846)) +;;;;;; (17581 37625)) ;;; Generated autoloads from server.el (autoload (quote server-start) "server" "\ @@ -23765,6 +23961,8 @@ (custom-autoload (quote server-mode) "server") +(put (quote server-mode) (quote custom-set) (quote custom-set-minor-mode)) + (autoload (quote server-mode) "server" "\ Toggle Server mode. With ARG, turn Server mode on if ARG is positive, off otherwise. @@ -23775,7 +23973,7 @@ ;;;*** -;;;### (autoloads (ses-mode) "ses" "ses.el" (17578 34773)) +;;;### (autoloads (ses-mode) "ses" "ses.el" (17693 24641)) ;;; Generated autoloads from ses.el (autoload (quote ses-mode) "ses" "\ @@ -23794,7 +23992,7 @@ ;;;*** ;;;### (autoloads (html-mode sgml-mode) "sgml-mode" "textmodes/sgml-mode.el" -;;;;;; (17521 64540)) +;;;;;; (17524 25620)) ;;; Generated autoloads from textmodes/sgml-mode.el (autoload (quote sgml-mode) "sgml-mode" "\ @@ -23862,7 +24060,7 @@ ;;;*** ;;;### (autoloads (sh-mode) "sh-script" "progmodes/sh-script.el" -;;;;;; (17590 26287)) +;;;;;; (17709 24918)) ;;; Generated autoloads from progmodes/sh-script.el (put 'sh-shell 'safe-local-variable 'symbolp) @@ -23926,7 +24124,7 @@ ;;;*** -;;;### (autoloads (sha1) "sha1" "gnus/sha1.el" (17383 32165)) +;;;### (autoloads (sha1) "sha1" "gnus/sha1.el" (17385 8494)) ;;; Generated autoloads from gnus/sha1.el (autoload (quote sha1) "sha1" "\ @@ -23941,7 +24139,7 @@ ;;;*** ;;;### (autoloads (list-load-path-shadows) "shadow" "emacs-lisp/shadow.el" -;;;;;; (17383 32141)) +;;;;;; (17385 8490)) ;;; Generated autoloads from emacs-lisp/shadow.el (autoload (quote list-load-path-shadows) "shadow" "\ @@ -23988,8 +24186,8 @@ ;;;*** ;;;### (autoloads (shadow-initialize shadow-define-regexp-group shadow-define-literal-group -;;;;;; shadow-define-cluster) "shadowfile" "shadowfile.el" (17383 -;;;;;; 32120)) +;;;;;; shadow-define-cluster) "shadowfile" "shadowfile.el" (17385 +;;;;;; 8487)) ;;; Generated autoloads from shadowfile.el (autoload (quote shadow-define-cluster) "shadowfile" "\ @@ -24028,7 +24226,7 @@ ;;;*** ;;;### (autoloads (shell shell-dumb-shell-regexp) "shell" "shell.el" -;;;;;; (17582 28833)) +;;;;;; (17717 4883)) ;;; Generated autoloads from shell.el (defvar shell-dumb-shell-regexp "cmd\\(proxy\\)?\\.exe" "\ @@ -24038,7 +24236,7 @@ shell finishes, and won't remove backslashes when it unquotes shell arguments.") -(custom-autoload (quote shell-dumb-shell-regexp) "shell") +(custom-autoload (quote shell-dumb-shell-regexp) "shell" t) (autoload (quote shell) "shell" "\ Run an inferior shell, with I/O through BUFFER (which defaults to `*shell*'). @@ -24075,7 +24273,7 @@ ;;;*** ;;;### (autoloads (sieve-upload-and-bury sieve-upload sieve-manage) -;;;;;; "sieve" "gnus/sieve.el" (17383 32166)) +;;;;;; "sieve" "gnus/sieve.el" (17385 8494)) ;;; Generated autoloads from gnus/sieve.el (autoload (quote sieve-manage) "sieve" "\ @@ -24096,7 +24294,7 @@ ;;;*** ;;;### (autoloads (sieve-mode) "sieve-mode" "gnus/sieve-mode.el" -;;;;;; (17383 32166)) +;;;;;; (17385 8494)) ;;; Generated autoloads from gnus/sieve-mode.el (autoload (quote sieve-mode) "sieve-mode" "\ @@ -24111,14 +24309,14 @@ ;;;*** -;;;### (autoloads nil "simple" "simple.el" (17590 36099)) +;;;### (autoloads nil "simple" "simple.el" (17718 31961)) ;;; Generated autoloads from simple.el (put 'fill-prefix 'safe-local-variable 'string-or-null-p) ;;;*** -;;;### (autoloads (simula-mode) "simula" "progmodes/simula.el" (17397 -;;;;;; 61572)) +;;;### (autoloads (simula-mode) "simula" "progmodes/simula.el" (17394 +;;;;;; 12938)) ;;; Generated autoloads from progmodes/simula.el (autoload (quote simula-mode) "simula" "\ @@ -24167,7 +24365,7 @@ ;;;*** ;;;### (autoloads (skeleton-pair-insert-maybe skeleton-insert skeleton-proxy-new -;;;;;; define-skeleton) "skeleton" "skeleton.el" (17521 64537)) +;;;;;; define-skeleton) "skeleton" "skeleton.el" (17524 25620)) ;;; Generated autoloads from skeleton.el (defvar skeleton-filter-function (quote identity) "\ @@ -24277,7 +24475,7 @@ ;;;*** ;;;### (autoloads (smerge-mode smerge-ediff) "smerge-mode" "smerge-mode.el" -;;;;;; (17494 22060)) +;;;;;; (17495 43954)) ;;; Generated autoloads from smerge-mode.el (autoload (quote smerge-ediff) "smerge-mode" "\ @@ -24296,7 +24494,7 @@ ;;;*** ;;;### (autoloads (smiley-buffer smiley-region) "smiley" "gnus/smiley.el" -;;;;;; (17457 37503)) +;;;;;; (17476 4800)) ;;; Generated autoloads from gnus/smiley.el (autoload (quote smiley-region) "smiley" "\ @@ -24314,7 +24512,7 @@ ;;;*** ;;;### (autoloads (smtpmail-send-queued-mail smtpmail-send-it) "smtpmail" -;;;;;; "mail/smtpmail.el" (17383 32170)) +;;;;;; "mail/smtpmail.el" (17718 28532)) ;;; Generated autoloads from mail/smtpmail.el (autoload (quote smtpmail-send-it) "smtpmail" "\ @@ -24329,7 +24527,7 @@ ;;;*** -;;;### (autoloads (snake) "snake" "play/snake.el" (17383 32183)) +;;;### (autoloads (snake) "snake" "play/snake.el" (17385 8495)) ;;; Generated autoloads from play/snake.el (autoload (quote snake) "snake" "\ @@ -24353,7 +24551,7 @@ ;;;*** ;;;### (autoloads (snmpv2-mode snmp-mode) "snmp-mode" "net/snmp-mode.el" -;;;;;; (17383 32177)) +;;;;;; (17385 8495)) ;;; Generated autoloads from net/snmp-mode.el (autoload (quote snmp-mode) "snmp-mode" "\ @@ -24384,7 +24582,7 @@ ;;;### (autoloads (solar-equinoxes-solstices sunrise-sunset calendar-location-name ;;;;;; calendar-longitude calendar-latitude calendar-time-display-form) -;;;;;; "solar" "calendar/solar.el" (17397 61548)) +;;;;;; "solar" "calendar/solar.el" (17386 33146)) ;;; Generated autoloads from calendar/solar.el (defvar calendar-time-display-form (quote (12-hours ":" minutes am-pm (if time-zone " (") time-zone (if time-zone ")"))) "\ @@ -24455,8 +24653,8 @@ ;;;*** -;;;### (autoloads (solitaire) "solitaire" "play/solitaire.el" (17383 -;;;;;; 32183)) +;;;### (autoloads (solitaire) "solitaire" "play/solitaire.el" (17385 +;;;;;; 8495)) ;;; Generated autoloads from play/solitaire.el (autoload (quote solitaire) "solitaire" "\ @@ -24533,7 +24731,7 @@ ;;;### (autoloads (reverse-region sort-columns sort-regexp-fields ;;;;;; sort-fields sort-numeric-fields sort-pages sort-paragraphs -;;;;;; sort-lines sort-subr) "sort" "sort.el" (17466 42707)) +;;;;;; sort-lines sort-subr) "sort" "sort.el" (17476 4798)) ;;; Generated autoloads from sort.el (autoload (quote sort-subr) "sort" "\ @@ -24675,8 +24873,8 @@ ;;;*** -;;;### (autoloads (spam-initialize) "spam" "gnus/spam.el" (17457 -;;;;;; 37503)) +;;;### (autoloads (spam-initialize) "spam" "gnus/spam.el" (17476 +;;;;;; 4800)) ;;; Generated autoloads from gnus/spam.el (autoload (quote spam-initialize) "spam" "\ @@ -24688,7 +24886,7 @@ ;;;### (autoloads (spam-report-deagentize spam-report-agentize spam-report-url-to-file ;;;;;; spam-report-url-ping-mm-url spam-report-process-queue) "spam-report" -;;;;;; "gnus/spam-report.el" (17397 61557)) +;;;;;; "gnus/spam-report.el" (17386 33146)) ;;; Generated autoloads from gnus/spam-report.el (autoload (quote spam-report-process-queue) "spam-report" "\ @@ -24731,7 +24929,7 @@ ;;;*** ;;;### (autoloads (speedbar-get-focus speedbar-frame-mode) "speedbar" -;;;;;; "speedbar.el" (17578 34773)) +;;;;;; "speedbar.el" (17535 19469)) ;;; Generated autoloads from speedbar.el (defalias (quote speedbar) (quote speedbar-frame-mode)) @@ -24756,7 +24954,7 @@ ;;;*** ;;;### (autoloads (spell-string spell-region spell-word spell-buffer) -;;;;;; "spell" "textmodes/spell.el" (17383 32189)) +;;;;;; "spell" "textmodes/spell.el" (17385 8496)) ;;; Generated autoloads from textmodes/spell.el (put (quote spell-filter) (quote risky-local-variable) t) @@ -24792,8 +24990,8 @@ ;;;*** -;;;### (autoloads (snarf-spooks spook) "spook" "play/spook.el" (17383 -;;;;;; 32183)) +;;;### (autoloads (snarf-spooks spook) "spook" "play/spook.el" (17385 +;;;;;; 8495)) ;;; Generated autoloads from play/spook.el (autoload (quote spook) "spook" "\ @@ -24811,8 +25009,8 @@ ;;;### (autoloads (sql-linter sql-db2 sql-interbase sql-postgres ;;;;;; sql-ms sql-ingres sql-solid sql-mysql sql-sqlite sql-informix ;;;;;; sql-sybase sql-oracle sql-product-interactive sql-mode sql-help -;;;;;; sql-add-product-keywords) "sql" "progmodes/sql.el" (17397 -;;;;;; 61572)) +;;;;;; sql-add-product-keywords) "sql" "progmodes/sql.el" (17394 +;;;;;; 12938)) ;;; Generated autoloads from progmodes/sql.el (autoload (quote sql-add-product-keywords) "sql" "\ @@ -25243,8 +25441,8 @@ ;;;;;; strokes-mode strokes-list-strokes strokes-load-user-strokes ;;;;;; strokes-help strokes-describe-stroke strokes-do-complex-stroke ;;;;;; strokes-do-stroke strokes-read-complex-stroke strokes-read-stroke -;;;;;; strokes-global-set-stroke) "strokes" "strokes.el" (17383 -;;;;;; 32122)) +;;;;;; strokes-global-set-stroke) "strokes" "strokes.el" (17704 +;;;;;; 4325)) ;;; Generated autoloads from strokes.el (autoload (quote strokes-global-set-stroke) "strokes" "\ @@ -25317,9 +25515,10 @@ Non-nil if Strokes mode is enabled. See the command `strokes-mode' for a description of this minor-mode. Setting this variable directly does not take effect; -use either \\[customize] or the function `strokes-mode'.") - -(custom-autoload (quote strokes-mode) "strokes") +either customize it (see the info node `Easy Customization') +or call the function `strokes-mode'.") + +(custom-autoload (quote strokes-mode) "strokes" nil) (autoload (quote strokes-mode) "strokes" "\ Toggle Strokes global minor mode.\\<strokes-mode-map> @@ -25353,7 +25552,7 @@ ;;;*** ;;;### (autoloads (studlify-buffer studlify-word studlify-region) -;;;;;; "studly" "play/studly.el" (16221 3781)) +;;;;;; "studly" "play/studly.el" (17075 55479)) ;;; Generated autoloads from play/studly.el (autoload (quote studlify-region) "studly" "\ @@ -25373,7 +25572,7 @@ ;;;*** -;;;### (autoloads (locate-library) "subr" "subr.el" (17590 36099)) +;;;### (autoloads (locate-library) "subr" "subr.el" (17724 51792)) ;;; Generated autoloads from subr.el (autoload (quote locate-library) "subr" "\ @@ -25395,7 +25594,7 @@ ;;;*** ;;;### (autoloads (sc-cite-original) "supercite" "mail/supercite.el" -;;;;;; (17383 32170)) +;;;;;; (17385 8494)) ;;; Generated autoloads from mail/supercite.el (autoload (quote sc-cite-original) "supercite" "\ @@ -25427,7 +25626,7 @@ ;;;*** -;;;### (autoloads (t-mouse-mode) "t-mouse" "t-mouse.el" (17416 55046)) +;;;### (autoloads (t-mouse-mode) "t-mouse" "t-mouse.el" (17614 9197)) ;;; Generated autoloads from t-mouse.el (defvar t-mouse-mode nil "\ @@ -25436,7 +25635,7 @@ Setting this variable directly does not take effect; use either \\[customize] or the function `t-mouse-mode'.") -(custom-autoload (quote t-mouse-mode) "t-mouse") +(custom-autoload (quote t-mouse-mode) "t-mouse" nil) (autoload (quote t-mouse-mode) "t-mouse" "\ Toggle t-mouse mode. @@ -25448,7 +25647,7 @@ ;;;*** -;;;### (autoloads (tabify untabify) "tabify" "tabify.el" (17383 32122)) +;;;### (autoloads (tabify untabify) "tabify" "tabify.el" (17607 45512)) ;;; Generated autoloads from tabify.el (autoload (quote untabify) "tabify" "\ @@ -25483,29 +25682,29 @@ ;;;;;; table-recognize table-insert-row-column table-insert-column ;;;;;; table-insert-row table-insert table-point-left-cell-hook ;;;;;; table-point-entered-cell-hook table-load-hook table-cell-map-hook) -;;;;;; "table" "textmodes/table.el" (17578 34780)) +;;;;;; "table" "textmodes/table.el" (17717 4883)) ;;; Generated autoloads from textmodes/table.el (defvar table-cell-map-hook nil "\ *Normal hooks run when finishing construction of `table-cell-map'. User can modify `table-cell-map' by adding custom functions here.") -(custom-autoload (quote table-cell-map-hook) "table") +(custom-autoload (quote table-cell-map-hook) "table" t) (defvar table-load-hook nil "\ *List of functions to be called after the table is first loaded.") -(custom-autoload (quote table-load-hook) "table") +(custom-autoload (quote table-load-hook) "table" t) (defvar table-point-entered-cell-hook nil "\ *List of functions to be called after point entered a table cell.") -(custom-autoload (quote table-point-entered-cell-hook) "table") +(custom-autoload (quote table-point-entered-cell-hook) "table" t) (defvar table-point-left-cell-hook nil "\ *List of functions to be called after point left a table cell.") -(custom-autoload (quote table-point-left-cell-hook) "table") +(custom-autoload (quote table-point-left-cell-hook) "table" t) (autoload (quote table-insert) "table" "\ Insert an editable text table. @@ -26071,7 +26270,7 @@ ;;;*** -;;;### (autoloads (talk-connect) "talk" "talk.el" (17383 32122)) +;;;### (autoloads (talk-connect) "talk" "talk.el" (17385 8488)) ;;; Generated autoloads from talk.el (autoload (quote talk-connect) "talk" "\ @@ -26081,7 +26280,7 @@ ;;;*** -;;;### (autoloads (tar-mode) "tar-mode" "tar-mode.el" (17578 34774)) +;;;### (autoloads (tar-mode) "tar-mode" "tar-mode.el" (17528 38000)) ;;; Generated autoloads from tar-mode.el (autoload (quote tar-mode) "tar-mode" "\ @@ -26105,7 +26304,7 @@ ;;;*** ;;;### (autoloads (tcl-help-on-word inferior-tcl tcl-mode) "tcl" -;;;;;; "progmodes/tcl.el" (17484 52437)) +;;;;;; "progmodes/tcl.el" (17485 5461)) ;;; Generated autoloads from progmodes/tcl.el (autoload (quote tcl-mode) "tcl" "\ @@ -26156,7 +26355,7 @@ ;;;*** -;;;### (autoloads (rsh telnet) "telnet" "net/telnet.el" (17383 32177)) +;;;### (autoloads (rsh telnet) "telnet" "net/telnet.el" (17385 8495)) ;;; Generated autoloads from net/telnet.el (add-hook 'same-window-regexps "\\*telnet-.*\\*\\(\\|<[0-9]+>\\)") @@ -26183,8 +26382,8 @@ ;;;*** -;;;### (autoloads (ansi-term term make-term) "term" "term.el" (17578 -;;;;;; 34774)) +;;;### (autoloads (ansi-term term make-term) "term" "term.el" (17560 +;;;;;; 29983)) ;;; Generated autoloads from term.el (autoload (quote make-term) "term" "\ @@ -26212,8 +26411,8 @@ ;;;*** -;;;### (autoloads (terminal-emulator) "terminal" "terminal.el" (17383 -;;;;;; 32123)) +;;;### (autoloads (terminal-emulator) "terminal" "terminal.el" (17385 +;;;;;; 8488)) ;;; Generated autoloads from terminal.el (autoload (quote terminal-emulator) "terminal" "\ @@ -26250,7 +26449,7 @@ ;;;*** ;;;### (autoloads (testcover-this-defun) "testcover" "emacs-lisp/testcover.el" -;;;;;; (17383 32141)) +;;;;;; (17385 8490)) ;;; Generated autoloads from emacs-lisp/testcover.el (autoload (quote testcover-this-defun) "testcover" "\ @@ -26260,7 +26459,7 @@ ;;;*** -;;;### (autoloads (tetris) "tetris" "play/tetris.el" (17383 32183)) +;;;### (autoloads (tetris) "tetris" "play/tetris.el" (17385 8495)) ;;; Generated autoloads from play/tetris.el (autoload (quote tetris) "tetris" "\ @@ -26291,7 +26490,7 @@ ;;;;;; tex-start-commands tex-start-options slitex-run-command latex-run-command ;;;;;; tex-run-command tex-offer-save tex-main-file tex-first-line-header-regexp ;;;;;; tex-directory tex-shell-file-name) "tex-mode" "textmodes/tex-mode.el" -;;;;;; (17578 34780)) +;;;;;; (17560 6690)) ;;; Generated autoloads from textmodes/tex-mode.el (defvar tex-shell-file-name nil "\ @@ -26593,7 +26792,7 @@ ;;;*** ;;;### (autoloads (texi2info texinfo-format-region texinfo-format-buffer) -;;;;;; "texinfmt" "textmodes/texinfmt.el" (17590 36100)) +;;;;;; "texinfmt" "textmodes/texinfmt.el" (17601 9092)) ;;; Generated autoloads from textmodes/texinfmt.el (autoload (quote texinfo-format-buffer) "texinfmt" "\ @@ -26633,7 +26832,7 @@ ;;;*** ;;;### (autoloads (texinfo-mode texinfo-close-quote texinfo-open-quote) -;;;;;; "texinfo" "textmodes/texinfo.el" (17383 32190)) +;;;;;; "texinfo" "textmodes/texinfo.el" (17385 8496)) ;;; Generated autoloads from textmodes/texinfo.el (defvar texinfo-open-quote "``" "\ @@ -26720,7 +26919,7 @@ ;;;### (autoloads (thai-auto-composition-mode thai-composition-function ;;;;;; thai-post-read-conversion thai-compose-buffer thai-compose-string ;;;;;; thai-compose-region) "thai-util" "language/thai-util.el" -;;;;;; (17171 19474)) +;;;;;; (17185 27569)) ;;; Generated autoloads from language/thai-util.el (autoload (quote thai-compose-region) "thai-util" "\ @@ -26764,7 +26963,7 @@ ;;;### (autoloads (list-at-point number-at-point symbol-at-point ;;;;;; sexp-at-point thing-at-point bounds-of-thing-at-point forward-thing) -;;;;;; "thingatpt" "thingatpt.el" (17582 28846)) +;;;;;; "thingatpt" "thingatpt.el" (17672 24041)) ;;; Generated autoloads from thingatpt.el (autoload (quote forward-thing) "thingatpt" "\ @@ -26821,7 +27020,7 @@ ;;;### (autoloads (thumbs-dired-setroot thumbs-dired-show thumbs-dired-show-marked ;;;;;; thumbs-show-from-dir thumbs-find-thumb) "thumbs" "thumbs.el" -;;;;;; (17590 36099)) +;;;;;; (17601 9091)) ;;; Generated autoloads from thumbs.el (autoload (quote thumbs-find-thumb) "thumbs" "\ @@ -26860,7 +27059,7 @@ ;;;;;; tibetan-composition-function tibetan-decompose-string tibetan-decompose-region ;;;;;; tibetan-compose-region tibetan-compose-string tibetan-transcription-to-tibetan ;;;;;; tibetan-tibetan-to-transcription tibetan-char-p) "tibet-util" -;;;;;; "language/tibet-util.el" (17097 33527)) +;;;;;; "language/tibet-util.el" (17102 18781)) ;;; Generated autoloads from language/tibet-util.el (autoload (quote tibetan-char-p) "tibet-util" "\ @@ -26939,7 +27138,7 @@ ;;;*** ;;;### (autoloads (tildify-buffer tildify-region) "tildify" "textmodes/tildify.el" -;;;;;; (17383 32190)) +;;;;;; (17385 8496)) ;;; Generated autoloads from textmodes/tildify.el (autoload (quote tildify-region) "tildify" "\ @@ -26963,13 +27162,13 @@ ;;;*** ;;;### (autoloads (display-time-mode display-time display-time-day-and-date) -;;;;;; "time" "time.el" (17383 32124)) +;;;;;; "time" "time.el" (17674 51268)) ;;; Generated autoloads from time.el (defvar display-time-day-and-date nil "\ *Non-nil means \\[display-time] should display day and date as well as time.") -(custom-autoload (quote display-time-day-and-date) "time") +(custom-autoload (quote display-time-day-and-date) "time" t) (autoload (quote display-time) "time" "\ Enable display of time, load level, and mail flag in mode lines. @@ -26984,9 +27183,10 @@ Non-nil if Display-Time mode is enabled. See the command `display-time-mode' for a description of this minor-mode. Setting this variable directly does not take effect; -use either \\[customize] or the function `display-time-mode'.") - -(custom-autoload (quote display-time-mode) "time") +either customize it (see the info node `Easy Customization') +or call the function `display-time-mode'.") + +(custom-autoload (quote display-time-mode) "time" nil) (autoload (quote display-time-mode) "time" "\ Toggle display of time, load level, and mail flag in mode lines. @@ -27004,8 +27204,8 @@ ;;;### (autoloads (safe-date-to-time time-to-days time-to-day-in-year ;;;;;; date-leap-year-p days-between date-to-day time-add time-subtract ;;;;;; time-since days-to-time time-less-p seconds-to-time time-to-seconds -;;;;;; date-to-time) "time-date" "calendar/time-date.el" (17397 -;;;;;; 61548)) +;;;;;; date-to-time) "time-date" "calendar/time-date.el" (17386 +;;;;;; 33146)) ;;; Generated autoloads from calendar/time-date.el (autoload (quote date-to-time) "time-date" "\ @@ -27091,7 +27291,7 @@ ;;;*** ;;;### (autoloads (time-stamp-toggle-active time-stamp) "time-stamp" -;;;;;; "time-stamp.el" (17487 53545)) +;;;;;; "time-stamp.el" (17495 43954)) ;;; Generated autoloads from time-stamp.el (put 'time-stamp-format 'safe-local-variable 'stringp) (put 'time-stamp-line-limit 'safe-local-variable 'integerp) @@ -27134,7 +27334,7 @@ ;;;;;; timeclock-workday-remaining-string timeclock-reread-log timeclock-query-out ;;;;;; timeclock-change timeclock-status-string timeclock-out timeclock-in ;;;;;; timeclock-modeline-display) "timeclock" "calendar/timeclock.el" -;;;;;; (17397 61548)) +;;;;;; (17632 41885)) ;;; Generated autoloads from calendar/timeclock.el (autoload (quote timeclock-modeline-display) "timeclock" "\ @@ -27235,7 +27435,7 @@ ;;;### (autoloads (with-timeout run-with-idle-timer add-timeout run-with-timer ;;;;;; run-at-time cancel-function-timers cancel-timer) "timer" -;;;;;; "emacs-lisp/timer.el" (17383 32142)) +;;;;;; "emacs-lisp/timer.el" (17686 65476)) ;;; Generated autoloads from emacs-lisp/timer.el (defalias (quote disable-timeout) (quote cancel-timer)) @@ -27246,7 +27446,9 @@ \(fn TIMER)" nil nil) (autoload (quote cancel-function-timers) "timer" "\ -Cancel all timers scheduled by `run-at-time' which would run FUNCTION. +Cancel all timers which would run FUNCTION. +This affects ordinary timers such as are scheduled by `run-at-time', +and idle timers such as are scheduled by `run-with-idle-timer'. \(fn FUNCTION)" t nil) @@ -27283,7 +27485,10 @@ (autoload (quote run-with-idle-timer) "timer" "\ Perform an action the next time Emacs is idle for SECS seconds. The action is to call FUNCTION with arguments ARGS. -SECS may be an integer or a floating point number. +SECS may be an integer, a floating point number, or the internal +time format (HIGH LOW USECS) returned by, e.g., `current-idle-time'. +If Emacs is currently idle, and has been idle for N seconds (N < SECS), +then it will call FUNCTION in SECS - N seconds from now. If REPEAT is non-nil, do the action each time Emacs has been idle for exactly SECS seconds (that is, only once for each time Emacs becomes idle). @@ -27306,7 +27511,7 @@ ;;;*** ;;;### (autoloads (batch-titdic-convert titdic-convert) "titdic-cnv" -;;;;;; "international/titdic-cnv.el" (17106 41306)) +;;;;;; "international/titdic-cnv.el" (17102 18762)) ;;; Generated autoloads from international/titdic-cnv.el (autoload (quote titdic-convert) "titdic-cnv" "\ @@ -27329,8 +27534,8 @@ ;;;*** ;;;### (autoloads (tamil-composition-function tamil-post-read-conversion -;;;;;; tamil-compose-region) "tml-util" "language/tml-util.el" (17097 -;;;;;; 33527)) +;;;;;; tamil-compose-region) "tml-util" "language/tml-util.el" (17102 +;;;;;; 18782)) ;;; Generated autoloads from language/tml-util.el (autoload (quote tamil-compose-region) "tml-util" "\ @@ -27353,7 +27558,7 @@ ;;;*** ;;;### (autoloads (tmm-prompt tmm-menubar-mouse tmm-menubar) "tmm" -;;;;;; "tmm.el" (17383 32124)) +;;;;;; "tmm.el" (17385 8488)) ;;; Generated autoloads from tmm.el (define-key global-map "\M-`" 'tmm-menubar) (define-key global-map [f10] 'tmm-menubar) @@ -27394,7 +27599,7 @@ ;;;### (autoloads (todo-show todo-cp todo-mode todo-print todo-top-priorities ;;;;;; todo-insert-item todo-add-item-non-interactively todo-add-category) -;;;;;; "todo-mode" "calendar/todo-mode.el" (17397 61548)) +;;;;;; "todo-mode" "calendar/todo-mode.el" (17386 33146)) ;;; Generated autoloads from calendar/todo-mode.el (autoload (quote todo-add-category) "todo-mode" "\ @@ -27455,7 +27660,7 @@ ;;;### (autoloads (tool-bar-local-item-from-menu tool-bar-add-item-from-menu ;;;;;; tool-bar-local-item tool-bar-add-item) "tool-bar" "tool-bar.el" -;;;;;; (17498 30594)) +;;;;;; (17495 43954)) ;;; Generated autoloads from tool-bar.el (put (quote tool-bar-mode) (quote standard-value) (quote (t))) @@ -27522,7 +27727,7 @@ ;;;*** ;;;### (autoloads (tpu-edt-on tpu-edt-mode) "tpu-edt" "emulation/tpu-edt.el" -;;;;;; (17383 32144)) +;;;;;; (17385 8491)) ;;; Generated autoloads from emulation/tpu-edt.el (defvar tpu-edt-mode nil "\ @@ -27533,6 +27738,8 @@ (custom-autoload (quote tpu-edt-mode) "tpu-edt") +(put (quote tpu-edt-mode) (quote custom-set) (quote custom-set-minor-mode)) + (autoload (quote tpu-edt-mode) "tpu-edt" "\ TPU/edt emulation. @@ -27548,7 +27755,7 @@ ;;;*** ;;;### (autoloads (tpu-set-cursor-bound tpu-set-cursor-free tpu-set-scroll-margins) -;;;;;; "tpu-extras" "emulation/tpu-extras.el" (17383 32144)) +;;;;;; "tpu-extras" "emulation/tpu-extras.el" (17385 8491)) ;;; Generated autoloads from emulation/tpu-extras.el (autoload (quote tpu-set-scroll-margins) "tpu-extras" "\ @@ -27568,7 +27775,7 @@ ;;;*** -;;;### (autoloads (tq-create) "tq" "emacs-lisp/tq.el" (17484 52427)) +;;;### (autoloads (tq-create) "tq" "emacs-lisp/tq.el" (17651 3608)) ;;; Generated autoloads from emacs-lisp/tq.el (autoload (quote tq-create) "tq" "\ @@ -27582,13 +27789,13 @@ ;;;*** ;;;### (autoloads (trace-function-background trace-function trace-buffer) -;;;;;; "trace" "emacs-lisp/trace.el" (17383 32142)) +;;;;;; "trace" "emacs-lisp/trace.el" (17656 37701)) ;;; Generated autoloads from emacs-lisp/trace.el (defvar trace-buffer "*trace-output*" "\ *Trace output will by default go to that buffer.") -(custom-autoload (quote trace-buffer) "trace") +(custom-autoload (quote trace-buffer) "trace" t) (autoload (quote trace-function) "trace" "\ Traces FUNCTION with trace output going to BUFFER. @@ -27603,11 +27810,14 @@ (autoload (quote trace-function-background) "trace" "\ Traces FUNCTION with trace output going quietly to BUFFER. -For every call of FUNCTION Lisp-style trace messages that display argument -and return values will be inserted into BUFFER. This function generates the -trace advice for FUNCTION and activates it together with any other advice -there might be!! Trace output will quietly go to BUFFER without changing -the window or buffer configuration at all. +When this tracing is enabled, every call to FUNCTION writes +a Lisp-style trace message (showing the arguments and return value) +into BUFFER. This function generates advice to trace FUNCTION +and activates it together with any other advice there might be. +The trace output goes to BUFFER quietly, without changing +the window or buffer configuration. + +BUFFER defaults to `trace-buffer'. \(fn FUNCTION &optional BUFFER)" t nil) @@ -27616,7 +27826,7 @@ ;;;### (autoloads (tramp-unload-tramp tramp-completion-handle-file-name-completion ;;;;;; tramp-completion-handle-file-name-all-completions tramp-unload-file-name-handlers ;;;;;; tramp-file-name-handler tramp-completion-file-name-regexp -;;;;;; tramp-file-name-regexp) "tramp" "net/tramp.el" (17578 34778)) +;;;;;; tramp-file-name-regexp) "tramp" "net/tramp.el" (17656 37701)) ;;; Generated autoloads from net/tramp.el (defvar tramp-unified-filenames (not (featurep (quote xemacs))) "\ @@ -27649,7 +27859,7 @@ Also see `tramp-file-name-structure'.") -(custom-autoload (quote tramp-file-name-regexp) "tramp") +(custom-autoload (quote tramp-file-name-regexp) "tramp" t) (defconst tramp-completion-file-name-regexp-unified "^/$\\|^/[^/:][^/]*$" "\ Value for `tramp-completion-file-name-regexp' for unified remoting. @@ -27672,7 +27882,7 @@ Also see `tramp-file-name-structure'.") -(custom-autoload (quote tramp-completion-file-name-regexp) "tramp") +(custom-autoload (quote tramp-completion-file-name-regexp) "tramp" t) (defconst tramp-completion-file-name-handler-alist (quote ((file-name-all-completions . tramp-completion-handle-file-name-all-completions) (file-name-completion . tramp-completion-handle-file-name-completion))) "\ Alist of completion handler functions. @@ -27701,7 +27911,7 @@ Falls back to normal file name handler if no tramp file name handler exists." (let ((fn (assoc operation tramp-completion-file-name-handler-alist))) (if fn (save-match-data (apply (cdr fn) args)) (tramp-completion-run-real-handler operation args)))) (defsubst tramp-register-file-name-handlers nil "\ -Add tramp file name handlers to `file-name-handler-alist'." (add-to-list (quote file-name-handler-alist) (cons tramp-file-name-regexp (quote tramp-file-name-handler))) (when (or partial-completion-mode (featurep (quote ido))) (add-to-list (quote file-name-handler-alist) (cons tramp-completion-file-name-regexp (quote tramp-completion-file-name-handler))) (put (quote tramp-completion-file-name-handler) (quote safe-magic) t)) (let ((jka (rassoc (quote jka-compr-handler) file-name-handler-alist))) (when jka (setq file-name-handler-alist (cons jka (delete jka file-name-handler-alist)))))) +Add tramp file name handlers to `file-name-handler-alist'." (add-to-list (quote file-name-handler-alist) (cons tramp-file-name-regexp (quote tramp-file-name-handler))) (when (or (not (boundp (quote partial-completion-mode))) (symbol-value (quote partial-completion-mode)) (featurep (quote ido))) (add-to-list (quote file-name-handler-alist) (cons tramp-completion-file-name-regexp (quote tramp-completion-file-name-handler))) (put (quote tramp-completion-file-name-handler) (quote safe-magic) t)) (let ((jka (rassoc (quote jka-compr-handler) file-name-handler-alist))) (when jka (setq file-name-handler-alist (cons jka (delete jka file-name-handler-alist)))))) (add-hook 'after-init-hook '(lambda () (tramp-register-file-name-handlers))) @@ -27729,7 +27939,7 @@ ;;;*** ;;;### (autoloads (tramp-ftp-enable-ange-ftp) "tramp-ftp" "net/tramp-ftp.el" -;;;;;; (17365 2740)) +;;;;;; (17366 25285)) ;;; Generated autoloads from net/tramp-ftp.el (autoload (quote tramp-ftp-enable-ange-ftp) "tramp-ftp" "\ @@ -27739,13 +27949,13 @@ ;;;*** -;;;### (autoloads (tumme-mark-tagged-files tumme-dired-comment-files -;;;;;; tumme-dired-display-image tumme-dired-display-external tumme-display-thumb -;;;;;; tumme-display-thumbs-append tumme-setup-dired-keybindings +;;;### (autoloads (tumme-dired-edit-comment-and-tags tumme-mark-tagged-files +;;;;;; tumme-dired-comment-files tumme-dired-display-image tumme-dired-display-external +;;;;;; tumme-display-thumb tumme-display-thumbs-append tumme-setup-dired-keybindings ;;;;;; tumme-jump-thumbnail-buffer tumme-delete-tag tumme-tag-files ;;;;;; tumme-show-all-from-dir tumme-display-thumbs tumme-dired-with-window-configuration -;;;;;; tumme-dired-insert-marked-thumbs) "tumme" "tumme.el" (17590 -;;;;;; 36099)) +;;;;;; tumme-dired-insert-marked-thumbs) "tumme" "tumme.el" (17645 +;;;;;; 64048)) ;;; Generated autoloads from tumme.el (autoload (quote tumme-dired-insert-marked-thumbs) "tumme" "\ @@ -27866,10 +28076,17 @@ \(fn)" t nil) +(autoload (quote tumme-dired-edit-comment-and-tags) "tumme" "\ +Edit comment and tags of current or marked image files. +Edit comment and tags for all marked image files in an +easy-to-use form. + +\(fn)" t nil) + ;;;*** ;;;### (autoloads (2C-split 2C-associate-buffer 2C-two-columns) "two-column" -;;;;;; "textmodes/two-column.el" (17383 32190)) +;;;;;; "textmodes/two-column.el" (17707 53738)) ;;; Generated autoloads from textmodes/two-column.el (autoload '2C-command "two-column" () t 'keymap) (global-set-key "\C-x6" '2C-command) @@ -27877,9 +28094,9 @@ (autoload (quote 2C-two-columns) "two-column" "\ Split current window vertically for two-column editing. -When called the first time, associates a buffer with the current -buffer in two-column minor mode (see \\[describe-mode] ). -Runs `2C-other-buffer-hook' in the new buffer. +\\<global-map>When called the first time, associates a buffer with the current +buffer in two-column minor mode (use \\[describe-mode] once in the mode, +for details.). It runs `2C-other-buffer-hook' in the new buffer. When called again, restores the screen layout with the current buffer first and the associated buffer to its right. @@ -27920,7 +28137,7 @@ ;;;;;; type-break type-break-mode type-break-keystroke-threshold ;;;;;; type-break-good-break-interval type-break-good-rest-interval ;;;;;; type-break-interval type-break-mode) "type-break" "type-break.el" -;;;;;; (17383 32124)) +;;;;;; (17385 8488)) ;;; Generated autoloads from type-break.el (defvar type-break-mode nil "\ @@ -28103,7 +28320,7 @@ ;;;*** ;;;### (autoloads (ununderline-region underline-region) "underline" -;;;;;; "textmodes/underline.el" (17383 32191)) +;;;;;; "textmodes/underline.el" (17385 8496)) ;;; Generated autoloads from textmodes/underline.el (autoload (quote underline-region) "underline" "\ @@ -28124,7 +28341,7 @@ ;;;*** ;;;### (autoloads (unforward-rmail-message undigestify-rmail-message) -;;;;;; "undigest" "mail/undigest.el" (17383 32171)) +;;;;;; "undigest" "mail/undigest.el" (17385 8494)) ;;; Generated autoloads from mail/undigest.el (autoload (quote undigestify-rmail-message) "undigest" "\ @@ -28143,7 +28360,7 @@ ;;;*** ;;;### (autoloads (unrmail batch-unrmail) "unrmail" "mail/unrmail.el" -;;;;;; (17383 32171)) +;;;;;; (17385 8494)) ;;; Generated autoloads from mail/unrmail.el (autoload (quote batch-unrmail) "unrmail" "\ @@ -28162,8 +28379,8 @@ ;;;*** -;;;### (autoloads (unsafep) "unsafep" "emacs-lisp/unsafep.el" (17404 -;;;;;; 53185)) +;;;### (autoloads (unsafep) "unsafep" "emacs-lisp/unsafep.el" (17408 +;;;;;; 40148)) ;;; Generated autoloads from emacs-lisp/unsafep.el (autoload (quote unsafep) "unsafep" "\ @@ -28176,7 +28393,7 @@ ;;;*** ;;;### (autoloads (url-retrieve-synchronously url-retrieve) "url" -;;;;;; "url/url.el" (17365 14342)) +;;;;;; "url/url.el" (17730 7120)) ;;; Generated autoloads from url/url.el (autoload (quote url-retrieve) "url" "\ @@ -28185,13 +28402,23 @@ CALLBACK is called when the object has been completely retrieved, with the current buffer containing the object, and any MIME headers associated -with it. Normally it gets the arguments in the list CBARGS. -However, if what we find is a redirect, CALLBACK is given -two additional args, `:redirect' and the redirected URL, -followed by CBARGS. +with it. It is called as (apply CALLBACK STATUS CBARGS). +STATUS is a list with an even number of elements representing +what happened during the request, with most recent events first, +or an empty list if no events have occurred. Each pair is one of: + +\(:redirect REDIRECTED-TO) - the request was redirected to this URL +\(:error (ERROR-SYMBOL . DATA)) - an error occurred. The error can be +signaled with (signal ERROR-SYMBOL DATA). Return the buffer URL will load into, or nil if the process has -already completed. +already completed (i.e. URL was a mailto URL or similar; in this case +the callback is not called). + +The variables `url-request-data', `url-request-method' and +`url-request-extra-headers' can be dynamically bound around the +request; dynamic binding of other variables doesn't necessarily +take effect. \(fn URL CALLBACK &optional CBARGS)" nil nil) @@ -28206,7 +28433,7 @@ ;;;*** ;;;### (autoloads (url-register-auth-scheme url-get-authentication) -;;;;;; "url-auth" "url/url-auth.el" (17383 32191)) +;;;;;; "url-auth" "url/url-auth.el" (17729 4745)) ;;; Generated autoloads from url/url-auth.el (autoload (quote url-get-authentication) "url-auth" "\ @@ -28248,8 +28475,8 @@ ;;;*** ;;;### (autoloads (url-cache-expired url-cache-extract url-is-cached -;;;;;; url-store-in-cache) "url-cache" "url/url-cache.el" (17338 -;;;;;; 41822)) +;;;;;; url-store-in-cache) "url-cache" "url/url-cache.el" (17729 +;;;;;; 4745)) ;;; Generated autoloads from url/url-cache.el (autoload (quote url-store-in-cache) "url-cache" "\ @@ -28274,7 +28501,7 @@ ;;;*** -;;;### (autoloads (url-cid) "url-cid" "url/url-cid.el" (17383 32191)) +;;;### (autoloads (url-cid) "url-cid" "url/url-cid.el" (17729 4745)) ;;; Generated autoloads from url/url-cid.el (autoload (quote url-cid) "url-cid" "\ @@ -28285,7 +28512,7 @@ ;;;*** ;;;### (autoloads (url-dav-vc-registered url-dav-supported-p) "url-dav" -;;;;;; "url/url-dav.el" (17383 32191)) +;;;;;; "url/url-dav.el" (17729 4745)) ;;; Generated autoloads from url/url-dav.el (autoload (quote url-dav-supported-p) "url-dav" "\ @@ -28300,8 +28527,8 @@ ;;;*** -;;;### (autoloads (url-file) "url-file" "url/url-file.el" (17383 -;;;;;; 32191)) +;;;### (autoloads (url-file) "url-file" "url/url-file.el" (17729 +;;;;;; 4745)) ;;; Generated autoloads from url/url-file.el (autoload (quote url-file) "url-file" "\ @@ -28312,7 +28539,7 @@ ;;;*** ;;;### (autoloads (url-open-stream url-gateway-nslookup-host) "url-gw" -;;;;;; "url/url-gw.el" (17487 55937)) +;;;;;; "url/url-gw.el" (17730 6972)) ;;; Generated autoloads from url/url-gw.el (autoload (quote url-gateway-nslookup-host) "url-gw" "\ @@ -28324,23 +28551,25 @@ Open a stream to HOST, possibly via a gateway. Args per `open-network-stream'. Will not make a connection if `url-gateway-unplugged' is non-nil. +Might do a non-blocking connection; use `process-status' to check. \(fn NAME BUFFER HOST SERVICE)" nil nil) ;;;*** ;;;### (autoloads (url-insert-file-contents url-file-local-copy url-copy-file -;;;;;; url-handler-mode) "url-handlers" "url/url-handlers.el" (17457 -;;;;;; 37507)) +;;;;;; url-handler-mode) "url-handlers" "url/url-handlers.el" (17729 +;;;;;; 4745)) ;;; Generated autoloads from url/url-handlers.el (defvar url-handler-mode nil "\ Non-nil if Url-Handler mode is enabled. See the command `url-handler-mode' for a description of this minor-mode. Setting this variable directly does not take effect; -use either \\[customize] or the function `url-handler-mode'.") - -(custom-autoload (quote url-handler-mode) "url-handlers") +either customize it (see the info node `Easy Customization') +or call the function `url-handler-mode'.") + +(custom-autoload (quote url-handler-mode) "url-handlers" nil) (autoload (quote url-handler-mode) "url-handlers" "\ Use URL to handle URL-like file names. @@ -28374,7 +28603,7 @@ ;;;*** ;;;### (autoloads (url-http-options url-http-file-attributes url-http-file-exists-p -;;;;;; url-http) "url-http" "url/url-http.el" (17515 39530)) +;;;;;; url-http) "url-http" "url/url-http.el" (17730 6972)) ;;; Generated autoloads from url/url-http.el (autoload (quote url-http) "url-http" "\ @@ -28425,9 +28654,21 @@ \(fn URL)" nil nil) -;;;*** - -;;;### (autoloads (url-irc) "url-irc" "url/url-irc.el" (17457 37507)) +(defconst url-https-default-port 443 "\ +Default HTTPS port.") + +(defconst url-https-asynchronous-p t "\ +HTTPS retrievals are asynchronous.") + +(defalias (quote url-https-expand-file-name) (quote url-http-expand-file-name)) + (autoload 'url-https "url-http") + (autoload 'url-https-file-exists-p "url-http") + (autoload 'url-https-file-readable-p "url-http") + (autoload 'url-https-file-attributes "url-http") + +;;;*** + +;;;### (autoloads (url-irc) "url-irc" "url/url-irc.el" (17729 4745)) ;;; Generated autoloads from url/url-irc.el (autoload (quote url-irc) "url-irc" "\ @@ -28437,8 +28678,8 @@ ;;;*** -;;;### (autoloads (url-ldap) "url-ldap" "url/url-ldap.el" (17383 -;;;;;; 32192)) +;;;### (autoloads (url-ldap) "url-ldap" "url/url-ldap.el" (17729 +;;;;;; 4745)) ;;; Generated autoloads from url/url-ldap.el (autoload (quote url-ldap) "url-ldap" "\ @@ -28452,7 +28693,7 @@ ;;;*** ;;;### (autoloads (url-mailto url-mail) "url-mailto" "url/url-mailto.el" -;;;;;; (17383 32192)) +;;;;;; (17729 4745)) ;;; Generated autoloads from url/url-mailto.el (autoload (quote url-mail) "url-mailto" "\ @@ -28468,7 +28709,7 @@ ;;;*** ;;;### (autoloads (url-data url-generic-emulator-loader url-info -;;;;;; url-man) "url-misc" "url/url-misc.el" (17383 32192)) +;;;;;; url-man) "url-misc" "url/url-misc.el" (17729 4745)) ;;; Generated autoloads from url/url-misc.el (autoload (quote url-man) "url-misc" "\ @@ -28500,7 +28741,7 @@ ;;;*** ;;;### (autoloads (url-snews url-news) "url-news" "url/url-news.el" -;;;;;; (17358 28606)) +;;;;;; (17729 4745)) ;;; Generated autoloads from url/url-news.el (autoload (quote url-news) "url-news" "\ @@ -28517,7 +28758,7 @@ ;;;### (autoloads (url-ns-user-pref url-ns-prefs isInNet isResolvable ;;;;;; dnsResolve dnsDomainIs isPlainHostName) "url-ns" "url/url-ns.el" -;;;;;; (17383 32192)) +;;;;;; (17729 4745)) ;;; Generated autoloads from url/url-ns.el (autoload (quote isPlainHostName) "url-ns" "\ @@ -28558,7 +28799,7 @@ ;;;*** ;;;### (autoloads (url-generic-parse-url url-recreate-url) "url-parse" -;;;;;; "url/url-parse.el" (17383 32192)) +;;;;;; "url/url-parse.el" (17729 4745)) ;;; Generated autoloads from url/url-parse.el (autoload (quote url-recreate-url) "url-parse" "\ @@ -28576,7 +28817,7 @@ ;;;*** ;;;### (autoloads (url-setup-privacy-info) "url-privacy" "url/url-privacy.el" -;;;;;; (17348 1513)) +;;;;;; (17729 4745)) ;;; Generated autoloads from url/url-privacy.el (autoload (quote url-setup-privacy-info) "url-privacy" "\ @@ -28592,7 +28833,7 @@ ;;;;;; url-strip-leading-spaces url-eat-trailing-space url-get-normalized-date ;;;;;; url-lazy-message url-normalize-url url-insert-entities-in-string ;;;;;; url-parse-args url-debug url-debug) "url-util" "url/url-util.el" -;;;;;; (17383 32193)) +;;;;;; (17729 4745)) ;;; Generated autoloads from url/url-util.el (defvar url-debug nil "\ @@ -28603,7 +28844,7 @@ If a number, all messages will be logged, as well shown via `message'. If a list, it is a list of the types of messages to be logged.") -(custom-autoload (quote url-debug) "url-util") +(custom-autoload (quote url-debug) "url-util" t) (autoload (quote url-debug) "url-util" "\ Not documented @@ -28688,9 +28929,13 @@ \(fn STR &optional ALLOW-NEWLINES)" nil nil) (autoload (quote url-hexify-string) "url-util" "\ -Escape characters in a string. - -\(fn STR)" nil nil) +Return a new string that is STRING URI-encoded. +First, STRING is converted to utf-8, if necessary. Then, for each +character in the utf-8 string, those found in `url-unreserved-chars' +are left as-is, all others are represented as a three-character +string: \"%\" followed by two lowercase hex digits. + +\(fn STRING)" nil nil) (autoload (quote url-file-extension) "url-util" "\ Return the filename extension of FNAME. @@ -28717,7 +28962,7 @@ ;;;*** ;;;### (autoloads (ask-user-about-supersession-threat ask-user-about-lock) -;;;;;; "userlock" "userlock.el" (17383 32125)) +;;;;;; "userlock" "userlock.el" (17385 8488)) ;;; Generated autoloads from userlock.el (autoload (quote ask-user-about-lock) "userlock" "\ @@ -28747,7 +28992,7 @@ ;;;### (autoloads (uudecode-decode-region uudecode-decode-region-internal ;;;;;; uudecode-decode-region-external) "uudecode" "gnus/uudecode.el" -;;;;;; (17578 34777)) +;;;;;; (17551 7908)) ;;; Generated autoloads from gnus/uudecode.el (autoload (quote uudecode-decode-region-external) "uudecode" "\ @@ -28777,26 +29022,26 @@ ;;;;;; vc-directory vc-merge vc-insert-headers vc-version-other-window ;;;;;; vc-diff vc-register vc-next-action vc-do-command edit-vc-file ;;;;;; with-vc-file vc-branch-part vc-trunk-p vc-before-checkin-hook -;;;;;; vc-checkin-hook vc-checkout-hook) "vc" "vc.el" (17590 36099)) +;;;;;; vc-checkin-hook vc-checkout-hook) "vc" "vc.el" (17721 20491)) ;;; Generated autoloads from vc.el (defvar vc-checkout-hook nil "\ Normal hook (list of functions) run after checking out a file. See `run-hooks'.") -(custom-autoload (quote vc-checkout-hook) "vc") +(custom-autoload (quote vc-checkout-hook) "vc" t) (defvar vc-checkin-hook nil "\ Normal hook (list of functions) run after a checkin is done. See also `log-edit-done-hook'.") -(custom-autoload (quote vc-checkin-hook) "vc") +(custom-autoload (quote vc-checkin-hook) "vc" t) (defvar vc-before-checkin-hook nil "\ Normal hook (list of functions) run before a file is checked in. See `run-hooks'.") -(custom-autoload (quote vc-before-checkin-hook) "vc") +(custom-autoload (quote vc-before-checkin-hook) "vc" t) (autoload (quote vc-trunk-p) "vc" "\ Return t if REV is a revision on the trunk. @@ -29065,7 +29310,7 @@ ;;;*** -;;;### (autoloads nil "vc-arch" "vc-arch.el" (17383 32125)) +;;;### (autoloads nil "vc-arch" "vc-arch.el" (17385 8488)) ;;; Generated autoloads from vc-arch.el (defun vc-arch-registered (file) (if (vc-find-root file "{arch}/=tagging-method") @@ -29075,7 +29320,7 @@ ;;;*** -;;;### (autoloads nil "vc-cvs" "vc-cvs.el" (17383 32125)) +;;;### (autoloads nil "vc-cvs" "vc-cvs.el" (17587 57307)) ;;; Generated autoloads from vc-cvs.el (defun vc-cvs-registered (f) (when (file-readable-p (expand-file-name @@ -29085,7 +29330,7 @@ ;;;*** -;;;### (autoloads nil "vc-mcvs" "vc-mcvs.el" (17383 32125)) +;;;### (autoloads nil "vc-mcvs" "vc-mcvs.el" (17385 8488)) ;;; Generated autoloads from vc-mcvs.el (defun vc-mcvs-registered (file) (if (vc-find-root file "MCVS/CVS") @@ -29096,7 +29341,7 @@ ;;;*** ;;;### (autoloads (vc-rcs-master-templates) "vc-rcs" "vc-rcs.el" -;;;;;; (17383 32125)) +;;;;;; (17385 8488)) ;;; Generated autoloads from vc-rcs.el (defvar vc-rcs-master-templates (quote ("%sRCS/%s,v" "%s%s,v" "%sRCS/%s")) "\ @@ -29109,7 +29354,7 @@ ;;;*** ;;;### (autoloads (vc-sccs-master-templates) "vc-sccs" "vc-sccs.el" -;;;;;; (17383 32126)) +;;;;;; (17385 8488)) ;;; Generated autoloads from vc-sccs.el (defvar vc-sccs-master-templates (quote ("%sSCCS/s.%s" "%ss.%s" vc-sccs-search-project-dir)) "\ @@ -29126,7 +29371,7 @@ ;;;*** -;;;### (autoloads nil "vc-svn" "vc-svn.el" (17397 61543)) +;;;### (autoloads nil "vc-svn" "vc-svn.el" (17721 20491)) ;;; Generated autoloads from vc-svn.el (defun vc-svn-registered (f) (when (file-readable-p (expand-file-name @@ -29139,7 +29384,7 @@ ;;;*** ;;;### (autoloads (vhdl-mode) "vhdl-mode" "progmodes/vhdl-mode.el" -;;;;;; (17503 24309)) +;;;;;; (17615 27749)) ;;; Generated autoloads from progmodes/vhdl-mode.el (autoload (quote vhdl-mode) "vhdl-mode" "\ @@ -29680,7 +29925,7 @@ ;;;*** -;;;### (autoloads (vi-mode) "vi" "emulation/vi.el" (17097 33503)) +;;;### (autoloads (vi-mode) "vi" "emulation/vi.el" (17102 18541)) ;;; Generated autoloads from emulation/vi.el (autoload (quote vi-mode) "vi" "\ @@ -29735,7 +29980,7 @@ ;;;### (autoloads (viqr-pre-write-conversion viqr-post-read-conversion ;;;;;; viet-encode-viqr-buffer viet-encode-viqr-region viet-decode-viqr-buffer ;;;;;; viet-decode-viqr-region viet-encode-viscii-char) "viet-util" -;;;;;; "language/viet-util.el" (17097 33527)) +;;;;;; "language/viet-util.el" (17102 18783)) ;;; Generated autoloads from language/viet-util.el (autoload (quote viet-encode-viscii-char) "viet-util" "\ @@ -29781,8 +30026,8 @@ ;;;### (autoloads (View-exit-and-edit view-mode-enter view-mode view-buffer-other-frame ;;;;;; view-buffer-other-window view-buffer view-file-other-frame -;;;;;; view-file-other-window view-file) "view" "view.el" (17383 -;;;;;; 32126)) +;;;;;; view-file-other-window view-file) "view" "view.el" (17385 +;;;;;; 8488)) ;;; Generated autoloads from view.el (defvar view-mode nil "\ @@ -29991,8 +30236,8 @@ ;;;*** -;;;### (autoloads (vip-mode vip-setup) "vip" "emulation/vip.el" (17383 -;;;;;; 32144)) +;;;### (autoloads (vip-mode vip-setup) "vip" "emulation/vip.el" (17385 +;;;;;; 8491)) ;;; Generated autoloads from emulation/vip.el (autoload (quote vip-setup) "vip" "\ @@ -30008,7 +30253,7 @@ ;;;*** ;;;### (autoloads (viper-mode toggle-viper-mode) "viper" "emulation/viper.el" -;;;;;; (17578 34775)) +;;;;;; (17726 28398)) ;;; Generated autoloads from emulation/viper.el (autoload (quote toggle-viper-mode) "viper" "\ @@ -30025,7 +30270,7 @@ ;;;*** ;;;### (autoloads (warn lwarn display-warning) "warnings" "emacs-lisp/warnings.el" -;;;;;; (17498 30594)) +;;;;;; (17495 43954)) ;;; Generated autoloads from emacs-lisp/warnings.el (defvar warning-prefix-function nil "\ @@ -30114,7 +30359,7 @@ ;;;*** ;;;### (autoloads (wdired-change-to-wdired-mode) "wdired" "wdired.el" -;;;;;; (17420 36080)) +;;;;;; (17613 21909)) ;;; Generated autoloads from wdired.el (autoload (quote wdired-change-to-wdired-mode) "wdired" "\ @@ -30130,7 +30375,7 @@ ;;;*** -;;;### (autoloads (webjump) "webjump" "net/webjump.el" (17383 32178)) +;;;### (autoloads (webjump) "webjump" "net/webjump.el" (17385 8495)) ;;; Generated autoloads from net/webjump.el (autoload (quote webjump) "webjump" "\ @@ -30147,7 +30392,7 @@ ;;;*** ;;;### (autoloads (which-function-mode) "which-func" "progmodes/which-func.el" -;;;;;; (17397 61573)) +;;;;;; (17608 57530)) ;;; Generated autoloads from progmodes/which-func.el (put 'which-func-format 'risky-local-variable t) (put 'which-func-current 'risky-local-variable t) @@ -30160,7 +30405,7 @@ Setting this variable directly does not take effect; use either \\[customize] or the function `which-function-mode'.") -(custom-autoload (quote which-function-mode) "which-func") +(custom-autoload (quote which-function-mode) "which-func" nil) (autoload (quote which-function-mode) "which-func" "\ Toggle Which Function mode, globally. @@ -30179,7 +30424,7 @@ ;;;;;; whitespace-buffer whitespace-toggle-ateol-check whitespace-toggle-spacetab-check ;;;;;; whitespace-toggle-indent-check whitespace-toggle-trailing-check ;;;;;; whitespace-toggle-leading-check) "whitespace" "whitespace.el" -;;;;;; (17578 34774)) +;;;;;; (17645 64048)) ;;; Generated autoloads from whitespace.el (autoload (quote whitespace-toggle-leading-check) "whitespace" "\ @@ -30230,6 +30475,8 @@ (autoload (quote whitespace-cleanup) "whitespace" "\ Cleanup the five different kinds of whitespace problems. +It normally applies to the whole buffer, but in Transient Mark mode +when the mark is active it applies to the region. See `whitespace-buffer' docstring for a summary of the problems. \(fn)" t nil) @@ -30245,9 +30492,10 @@ Non-nil if Whitespace-Global mode is enabled. See the command `whitespace-global-mode' for a description of this minor-mode. Setting this variable directly does not take effect; -use either \\[customize] or the function `whitespace-global-mode'.") - -(custom-autoload (quote whitespace-global-mode) "whitespace") +either customize it (see the info node `Easy Customization') +or call the function `whitespace-global-mode'.") + +(custom-autoload (quote whitespace-global-mode) "whitespace" nil) (autoload (quote whitespace-global-mode) "whitespace" "\ Toggle using Whitespace mode in new buffers. @@ -30267,7 +30515,7 @@ ;;;*** ;;;### (autoloads (widget-minor-mode widget-browse-other-window widget-browse -;;;;;; widget-browse-at) "wid-browse" "wid-browse.el" (17383 32127)) +;;;;;; widget-browse-at) "wid-browse" "wid-browse.el" (17385 8488)) ;;; Generated autoloads from wid-browse.el (autoload (quote widget-browse-at) "wid-browse" "\ @@ -30294,8 +30542,8 @@ ;;;*** ;;;### (autoloads (widget-setup widget-insert widget-delete widget-create -;;;;;; widget-prompt-value widgetp) "wid-edit" "wid-edit.el" (17397 -;;;;;; 61544)) +;;;;;; widget-prompt-value widgetp) "wid-edit" "wid-edit.el" (17709 +;;;;;; 24917)) ;;; Generated autoloads from wid-edit.el (autoload (quote widgetp) "wid-edit" "\ @@ -30339,8 +30587,8 @@ ;;;*** ;;;### (autoloads (windmove-default-keybindings windmove-down windmove-right -;;;;;; windmove-up windmove-left) "windmove" "windmove.el" (17383 -;;;;;; 32128)) +;;;;;; windmove-up windmove-left) "windmove" "windmove.el" (17385 +;;;;;; 8488)) ;;; Generated autoloads from windmove.el (autoload (quote windmove-left) "windmove" "\ @@ -30393,7 +30641,7 @@ ;;;*** ;;;### (autoloads (winner-mode winner-mode) "winner" "winner.el" -;;;;;; (17383 32128)) +;;;;;; (17385 8488)) ;;; Generated autoloads from winner.el (defvar winner-mode nil "\ @@ -30412,7 +30660,7 @@ ;;;*** ;;;### (autoloads (woman-find-file woman-dired-find-file woman) "woman" -;;;;;; "woman.el" (17466 42708)) +;;;;;; "woman.el" (17714 34820)) ;;; Generated autoloads from woman.el (autoload (quote woman) "woman" "\ @@ -30448,7 +30696,7 @@ ;;;*** ;;;### (autoloads (wordstar-mode) "ws-mode" "emulation/ws-mode.el" -;;;;;; (17383 32145)) +;;;;;; (17385 8492)) ;;; Generated autoloads from emulation/ws-mode.el (autoload (quote wordstar-mode) "ws-mode" "\ @@ -30561,7 +30809,7 @@ ;;;*** ;;;### (autoloads (xml-parse-region xml-parse-file) "xml" "xml.el" -;;;;;; (17383 32129)) +;;;;;; (17607 45512)) ;;; Generated autoloads from xml.el (autoload (quote xml-parse-file) "xml" "\ @@ -30586,8 +30834,8 @@ ;;;*** -;;;### (autoloads (xterm-mouse-mode) "xt-mouse" "xt-mouse.el" (17383 -;;;;;; 32129)) +;;;### (autoloads (xterm-mouse-mode) "xt-mouse" "xt-mouse.el" (17385 +;;;;;; 8488)) ;;; Generated autoloads from xt-mouse.el (defvar xterm-mouse-mode nil "\ @@ -30598,6 +30846,8 @@ (custom-autoload (quote xterm-mouse-mode) "xt-mouse") +(put (quote xterm-mouse-mode) (quote custom-set) (quote custom-set-minor-mode)) + (autoload (quote xterm-mouse-mode) "xt-mouse" "\ Toggle XTerm mouse mode. With prefix arg, turn XTerm mouse mode on iff arg is positive. @@ -30614,7 +30864,7 @@ ;;;*** ;;;### (autoloads (yenc-extract-filename yenc-decode-region) "yenc" -;;;;;; "gnus/yenc.el" (17383 32167)) +;;;;;; "gnus/yenc.el" (17385 8494)) ;;; Generated autoloads from gnus/yenc.el (autoload (quote yenc-decode-region) "yenc" "\ @@ -30630,7 +30880,7 @@ ;;;*** ;;;### (autoloads (psychoanalyze-pinhead apropos-zippy insert-zippyism -;;;;;; yow) "yow" "play/yow.el" (17383 32183)) +;;;;;; yow) "yow" "play/yow.el" (17385 8495)) ;;; Generated autoloads from play/yow.el (autoload (quote yow) "yow" "\ @@ -30656,7 +30906,7 @@ ;;;*** -;;;### (autoloads (zone) "zone" "play/zone.el" (17383 32183)) +;;;### (autoloads (zone) "zone" "play/zone.el" (17385 8495)) ;;; Generated autoloads from play/zone.el (autoload (quote zone) "zone" "\ @@ -30666,29 +30916,6 @@ ;;;*** -;;;### (autoloads (zone-mode zone-mode-update-serial-hook) "zone-mode" -;;;;;; "net/zone-mode.el" (17383 32178)) -;;; Generated autoloads from net/zone-mode.el - -(autoload (quote zone-mode-update-serial-hook) "zone-mode" "\ -Update the serial number in a zone if the file was modified. - -\(fn)" t nil) - -(autoload (quote zone-mode) "zone-mode" "\ -A mode for editing DNS zone files. - -Zone-mode does two things: - - - automatically update the serial number for a zone - when saving the file - - - fontification - -\(fn)" t nil) - -;;;*** - ;;;### (autoloads nil nil ("bindings.el" "buff-menu.el" "calc/calc-aent.el" ;;;;;; "calc/calc-alg.el" "calc/calc-arith.el" "calc/calc-bin.el" ;;;;;; "calc/calc-comb.el" "calc/calc-cplx.el" "calc/calc-embed.el" @@ -30829,11 +31056,11 @@ ;;;;;; "timezone.el" "tooltip.el" "tree-widget.el" "uniquify.el" ;;;;;; "url/url-about.el" "url/url-cookie.el" "url/url-dired.el" ;;;;;; "url/url-expand.el" "url/url-ftp.el" "url/url-history.el" -;;;;;; "url/url-https.el" "url/url-imap.el" "url/url-methods.el" -;;;;;; "url/url-nfs.el" "url/url-proxy.el" "url/url-vars.el" "url/vc-dav.el" -;;;;;; "vc-hooks.el" "vcursor.el" "version.el" "vms-patch.el" "vmsproc.el" -;;;;;; "vt-control.el" "vt100-led.el" "w32-fns.el" "w32-vars.el" -;;;;;; "widget.el" "window.el" "x-dnd.el") (17590 36747 258974)) +;;;;;; "url/url-imap.el" "url/url-methods.el" "url/url-nfs.el" "url/url-proxy.el" +;;;;;; "url/url-vars.el" "url/vc-dav.el" "vc-hooks.el" "vcursor.el" +;;;;;; "version.el" "vms-patch.el" "vmsproc.el" "vt-control.el" +;;;;;; "vt100-led.el" "w32-fns.el" "w32-vars.el" "widget.el" "window.el" +;;;;;; "x-dnd.el") (17730 9235 499010)) ;;;***
--- a/lisp/mail/smtpmail.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/mail/smtpmail.el Mon Oct 30 08:54:41 2006 +0000 @@ -541,6 +541,17 @@ (decoded (base64-decode-string challenge)) (hash (rfc2104-hash 'md5 64 16 passwd decoded)) (response (concat (smtpmail-cred-user cred) " " hash)) + ;; Osamu Yamane <yamane@green.ocn.ne.jp>: + ;; SMTP auth fails because the SMTP server identifies + ;; only the first part of the string (delimited by + ;; new line characters) as a response from the + ;; client, and the rest as distinct commands. + + ;; In my case, the response string is 80 characters + ;; long. Without the no-line-break option for + ;; base64-encode-sting, only the first 76 characters + ;; are taken as a response to the server, and the + ;; authentication fails. (encoded (base64-encode-string response t))) (smtpmail-send-command process (format "%s" encoded)) (if (or (null (car (setq ret (smtpmail-read-response process))))
--- a/lisp/midnight.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/midnight.el Mon Oct 30 08:54:41 2006 +0000 @@ -75,9 +75,9 @@ (list 1st (floor (- num (* (float div) 1st))) (round (* 10000000 (mod num 1)))))) -(defun midnight-buffer-display-time (&optional buf) - "Return the time-stamp of the given buffer, or current buffer, as float." - (with-current-buffer (or buf (current-buffer)) +(defun midnight-buffer-display-time (&optional buffer) + "Return the time-stamp of BUFFER, or current buffer, as float." + (with-current-buffer (or buffer (current-buffer)) (when buffer-display-time (float-time buffer-display-time)))) ;;; clean-buffer-list stuff @@ -128,7 +128,7 @@ :group 'midnight) (defcustom clean-buffer-list-kill-never-buffer-names - '("*scratch*" "*Messages*") + '("*scratch*" "*Messages*" "*server*") "*List of buffer names which will never be killed by `clean-buffer-list'. See also `clean-buffer-list-kill-never-regexps'. Note that this does override `clean-buffer-list-kill-regexps' and @@ -137,7 +137,6 @@ :type '(repeat (string :tag "Buffer Name")) :group 'midnight) - (defcustom clean-buffer-list-kill-never-regexps '("^ \\*Minibuf-.*\\*$") "*List of regexp saying which buffers will never be killed at midnight. See also `clean-buffer-list-kill-never-buffer-names'.
--- a/lisp/net/tramp.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/net/tramp.el Mon Oct 30 08:54:41 2006 +0000 @@ -2018,11 +2018,10 @@ ,@body)) (put 'with-parsed-tramp-file-name 'lisp-indent-function 2) -;; To be activated for debugging containing this macro -;; It works only when VAR is nil. Otherwise, it can be deactivated by -;; (put 'with-parsed-tramp-file-name 'edebug-form-spec 0) -;; I'm too stupid to write a precise SPEC for it. -(put 'with-parsed-tramp-file-name 'edebug-form-spec t) +;; Enable debugging. +(def-edebug-spec with-parsed-tramp-file-name (form symbolp body)) +;; Highlight as keyword. +(font-lock-add-keywords 'emacs-lisp-mode '("\\<with-parsed-tramp-file-name\\>")) (defmacro tramp-let-maybe (variable value &rest body) "Let-bind VARIABLE to VALUE in BODY, but only if VARIABLE is not obsolete. @@ -2905,7 +2904,7 @@ (unless ok-if-already-exists (when (file-exists-p newname) (signal 'file-already-exists - (list newname)))) + (list "File already exists" newname)))) (let ((t1 (tramp-tramp-file-p filename)) (t2 (tramp-tramp-file-p newname)) v1-multi-method v1-method v1-user v1-host v1-localname @@ -2978,10 +2977,10 @@ ;; copy-program can be invoked. (if (and (not v1-multi-method) (not v2-multi-method) - (or (tramp-method-out-of-band-p - v1-multi-method v1-method v1-user v1-host) - (tramp-method-out-of-band-p - v2-multi-method v2-method v2-user v2-host))) + (or (and t1 (tramp-method-out-of-band-p + v1-multi-method v1-method v1-user v1-host)) + (and t2 (tramp-method-out-of-band-p + v2-multi-method v2-method v2-user v2-host)))) (tramp-do-copy-or-rename-file-out-of-band op filename newname keep-date) ;; Use the generic method via a Tramp buffer. @@ -5045,7 +5044,7 @@ multi-method method user host (format "TZ=UTC; export TZ; touch -t %s %s" touch-time - localname) + (tramp-shell-quote-argument localname)) t)) (pop-to-buffer buf) (error "tramp-touch: touch failed, see buffer `%s' for details"
--- a/lisp/progmodes/ada-mode.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/progmodes/ada-mode.el Mon Oct 30 08:54:41 2006 +0000 @@ -6,8 +6,7 @@ ;; Author: Rolf Ebert <ebert@inf.enst.fr> ;; Markus Heritsch <Markus.Heritsch@studbox.uni-stuttgart.de> ;; Emmanuel Briot <briot@gnat.com> -;; Maintainer: Emmanuel Briot <briot@gnat.com> -;; Ada Core Technologies's version: Revision: 1.188 +;; Maintainer: Stephen Leake <stephen_leake@member.fsf.org> ;; Keywords: languages ada ;; This file is part of GNU Emacs. @@ -30,10 +29,10 @@ ;;; Commentary: ;;; This mode is a major mode for editing Ada83 and Ada95 source code. ;;; This is a major rewrite of the file packaged with Emacs-20. The -;;; ada-mode is composed of four lisp files, ada-mode.el, ada-xref.el, -;;; ada-prj.el and ada-stmt.el. Only this file (ada-mode.el) is +;;; ada-mode is composed of four Lisp files, ada-mode.el, ada-xref.el, +;;; ada-prj.el and ada-stmt.el. Only this file (ada-mode.el) is ;;; completely independent from the GNU Ada compiler Gnat, distributed -;;; by Ada Core Technologies. All the other files rely heavily on +;;; by Ada Core Technologies. All the other files rely heavily on ;;; features provided only by Gnat. ;;; ;;; Note: this mode will not work with Emacs 19. If you are on a VMS @@ -79,14 +78,14 @@ ;;; to his version. ;;; ;;; A complete rewrite for Emacs-20 / Gnat-3.11 has been done by Ada Core -;;; Technologies. Please send bugs to briot@gnat.com +;;; Technologies. ;;; Credits: ;;; Many thanks to John McCabe <john@assen.demon.co.uk> for sending so ;;; many patches included in this package. ;;; Christian Egli <Christian.Egli@hcsd.hac.com>: ;;; ada-imenu-generic-expression -;;; Many thanks also to the following persons that have contributed one day +;;; Many thanks also to the following persons that have contributed ;;; to the ada-mode ;;; Philippe Waroquiers (PW) <philippe@cfmu.eurocontrol.be> in particular, ;;; woodruff@stc.llnl.gov (John Woodruff) @@ -142,12 +141,12 @@ "Return t if Emacs's version is greater or equal to MAJOR.MINOR. If IS-XEMACS is non-nil, check for XEmacs instead of Emacs." (let ((xemacs-running (or (string-match "Lucid" emacs-version) - (string-match "XEmacs" emacs-version)))) + (string-match "XEmacs" emacs-version)))) (and (or (and is-xemacs xemacs-running) - (not (or is-xemacs xemacs-running))) - (or (> emacs-major-version major) - (and (= emacs-major-version major) - (>= emacs-minor-version minor))))))) + (not (or is-xemacs xemacs-running))) + (or (> emacs-major-version major) + (and (= emacs-major-version major) + (>= emacs-minor-version minor))))))) ;; This call should not be made in the release that is done for the @@ -155,6 +154,14 @@ ;;(if (not (ada-check-emacs-version 21 1)) ;; (require 'ada-support)) +(defun ada-mode-version () + "Return Ada mode version." + (interactive) + (let ((version-string "3.5")) + (if (interactive-p) + (message version-string) + version-string))) + (defvar ada-mode-hook nil "*List of functions to call when Ada mode is invoked. This hook is automatically executed after the `ada-mode' is @@ -162,7 +169,7 @@ This is a good place to add Ada environment specific bindings.") (defgroup ada nil - "Major mode for editing Ada source in Emacs." + "Major mode for editing and compiling Ada source in Emacs." :link '(custom-group-link :tag "Font Lock Faces group" font-lock-faces) :group 'languages) @@ -178,7 +185,7 @@ An example is : declare A, - >>>>>B : Integer; -- from ada-broken-decl-indent" + >>>>>B : Integer;" :type 'integer :group 'ada) (defcustom ada-broken-indent 2 @@ -186,7 +193,7 @@ An example is : My_Var : My_Type := (Field1 => - >>>>>>>>>Value); -- from ada-broken-indent" + >>>>>>>>>Value);" :type 'integer :group 'ada) (defcustom ada-continuation-indent ada-broken-indent @@ -194,7 +201,7 @@ An example is : Func (Param1, - >>>>>Param2);" + >>>>>Param2);" :type 'integer :group 'ada) (defcustom ada-case-attribute 'ada-capitalize-word @@ -202,10 +209,10 @@ It may be `downcase-word', `upcase-word', `ada-loose-case-word', `ada-capitalize-word' or `ada-no-auto-case'." :type '(choice (const downcase-word) - (const upcase-word) - (const ada-capitalize-word) - (const ada-loose-case-word) - (const ada-no-auto-case)) + (const upcase-word) + (const ada-capitalize-word) + (const ada-loose-case-word) + (const ada-no-auto-case)) :group 'ada) (defcustom ada-case-exception-file @@ -218,8 +225,8 @@ to be used for that word in Ada files. If the line starts with the character *, then the exception will be used for substrings that either start at the beginning of a word or after a _ character, and end either -at the end of the word or at a _ character. Each line can be terminated by -a comment." +at the end of the word or at a _ character. Each line can be terminated +by a comment." :type '(repeat (file)) :group 'ada) @@ -228,10 +235,10 @@ It may be `downcase-word', `upcase-word', `ada-loose-case-word' or `ada-capitalize-word'." :type '(choice (const downcase-word) - (const upcase-word) - (const ada-capitalize-word) - (const ada-loose-case-word) - (const ada-no-auto-case)) + (const upcase-word) + (const ada-capitalize-word) + (const ada-loose-case-word) + (const ada-no-auto-case)) :group 'ada) (defcustom ada-case-identifier 'ada-loose-case-word @@ -239,10 +246,10 @@ It may be `downcase-word', `upcase-word', `ada-loose-case-word' or `ada-capitalize-word'." :type '(choice (const downcase-word) - (const upcase-word) - (const ada-capitalize-word) - (const ada-loose-case-word) - (const ada-no-auto-case)) + (const upcase-word) + (const ada-capitalize-word) + (const ada-loose-case-word) + (const ada-no-auto-case)) :group 'ada) (defcustom ada-clean-buffer-before-saving t @@ -255,7 +262,7 @@ An example is : procedure Foo is begin ->>>>>>>>>>null; -- from ada-indent" +>>>>>>>>>>null;" :type 'integer :group 'ada) (defcustom ada-indent-after-return t @@ -269,7 +276,7 @@ For instance: A := 1; -- A multi-line comment - -- aligned if ada-indent-align-comments is t" + -- aligned if ada-indent-align-comments is t" :type 'boolean :group 'ada) (defcustom ada-indent-comment-as-code t @@ -308,7 +315,7 @@ An example is: type A is - >>>>>>>>>>>record -- from ada-indent-record-rel-type" + >>>>>>>>>>>record" :type 'integer :group 'ada) (defcustom ada-indent-renames ada-broken-indent @@ -318,8 +325,8 @@ An example is: function A (B : Integer) - return C; -- from ada-indent-return - >>>renames Foo; -- from ada-indent-renames" + return C; + >>>renames Foo;" :type 'integer :group 'ada) (defcustom ada-indent-return 0 @@ -329,7 +336,7 @@ An example is: function A (B : Integer) - >>>>>return C; -- from ada-indent-return" + >>>>>return C;" :type 'integer :group 'ada) (defcustom ada-indent-to-open-paren t @@ -353,7 +360,7 @@ An example is: procedure Foo is begin ->>>>>>>>>>>>Label: -- from ada-label-indent +>>>>Label: This is also used for <<..>> labels" :type 'integer :group 'ada) @@ -363,8 +370,7 @@ :type '(choice (const ada83) (const ada95)) :group 'ada) (defcustom ada-move-to-declaration nil - "*Non-nil means `ada-move-to-start' moves point to the subprogram declaration, -not to 'begin'." + "*Non-nil means `ada-move-to-start' moves to the subprogram declaration, not to 'begin'." :type 'boolean :group 'ada) (defcustom ada-popup-key '[down-mouse-3] @@ -378,13 +384,12 @@ (split-string (or (getenv "ADA_INCLUDE_PATH") "") ":") '("/usr/adainclude" "/usr/local/adainclude" "/opt/gnu/adainclude")) - "*List of directories to search for Ada files. + "*Default list of directories to search for Ada files. See the description for the `ff-search-directories' variable. This variable -is the initial value of this variable, and is copied and modified in -`ada-search-directories-internal'." +is the initial value of `ada-search-directories-internal'." :type '(repeat (choice :tag "Directory" - (const :tag "default" nil) - (directory :format "%v"))) + (const :tag "default" nil) + (directory :format "%v"))) :group 'ada) (defvar ada-search-directories-internal ada-search-directories @@ -398,7 +403,7 @@ An example is: if A = B - >>>>>>>>>>>then -- from ada-stmt-end-indent" + >>>>then" :type 'integer :group 'ada) (defcustom ada-tab-policy 'indent-auto @@ -406,10 +411,10 @@ Must be one of : `indent-rigidly' : always adds `ada-indent' blanks at the beginning of the line. `indent-auto' : use indentation functions in this file. -`always-tab' : do indent-relative." +`always-tab' : do `indent-relative'." :type '(choice (const indent-auto) - (const indent-rigidly) - (const always-tab)) + (const indent-rigidly) + (const always-tab)) :group 'ada) (defcustom ada-use-indent ada-broken-indent @@ -417,7 +422,7 @@ An example is: use Ada.Text_IO, - >>>>>Ada.Numerics; -- from ada-use-indent" + >>>>Ada.Numerics;" :type 'integer :group 'ada) (defcustom ada-when-indent 3 @@ -425,7 +430,7 @@ An example is: case A is - >>>>>>>>when B => -- from ada-when-indent" + >>>>when B =>" :type 'integer :group 'ada) (defcustom ada-with-indent ada-broken-indent @@ -433,18 +438,18 @@ An example is: with Ada.Text_IO, - >>>>>Ada.Numerics; -- from ada-with-indent" + >>>>Ada.Numerics;" :type 'integer :group 'ada) (defcustom ada-which-compiler 'gnat "*Name of the compiler to use. This will determine what features are made available through the Ada mode. -The possible choices are : +The possible choices are: `gnat': Use Ada Core Technologies' Gnat compiler. Add some cross-referencing - features -`generic': Use a generic compiler" + features. +`generic': Use a generic compiler." :type '(choice (const gnat) - (const generic)) + (const generic)) :group 'ada) @@ -485,7 +490,7 @@ "reverse" "select" "separate" "subtype" "task" "terminate" "then" "type" "use" "when" "while" "with" "xor") "List of Ada keywords. -This variable is used to define `ada-83-keywords' and `ada-95-keywords'")) +This variable is used to define `ada-83-keywords' and `ada-95-keywords'.")) (defvar ada-ret-binding nil "Variable to save key binding of RET when casing is activated.") @@ -511,7 +516,7 @@ ("[^=]\\(\\s-+\\)=[^=]" 1 t) ("\\(\\s-*\\)use\\s-" 1) ("\\(\\s-*\\)--" 1)) - "Ada support for align.el <= 2.2 + "Ada support for align.el <= 2.2. This variable provides regular expressions on which to align different lines. See `align-mode-alist' for more information.") @@ -532,7 +537,7 @@ (valid . (lambda() (not (ada-in-comment-p)))) (modes . '(ada-mode))) ) - "Ada support for align.el >= 2.8 + "Ada support for align.el >= 2.8. This variable defines several rules to use to align different lines.") (defconst ada-align-region-separate @@ -566,10 +571,10 @@ (defconst ada-95-keywords (eval-when-compile (concat "\\<" (regexp-opt - (append - '("abstract" "aliased" "protected" "requeue" - "tagged" "until") - ada-83-string-keywords) t) "\\>")) + (append + '("abstract" "aliased" "protected" "requeue" + "tagged" "until") + ada-83-string-keywords) t) "\\>")) "Regular expression for looking at Ada95 keywords.") (defvar ada-keywords ada-95-keywords @@ -605,42 +610,42 @@ (defvar ada-block-start-re (eval-when-compile (concat "\\<\\(" (regexp-opt '("begin" "declare" "else" - "exception" "generic" "loop" "or" - "private" "select" )) - "\\|\\(\\(limited\\|abstract\\|tagged\\)[ \t\n]+\\)*record\\)\\>")) + "exception" "generic" "loop" "or" + "private" "select" )) + "\\|\\(\\(limited\\|abstract\\|tagged\\)[ \t\n]+\\)*record\\)\\>")) "Regexp for keywords starting Ada blocks.") (defvar ada-end-stmt-re (eval-when-compile (concat "\\(" - ";" "\\|" - "=>[ \t]*$" "\\|" - "^[ \t]*separate[ \t]*(\\(\\sw\\|[_.]\\)+)" "\\|" - "\\<" (regexp-opt '("begin" "declare" "is" "do" "else" "generic" - "loop" "private" "record" "select" - "then abort" "then") t) "\\>" "\\|" - "^[ \t]*" (regexp-opt '("function" "package" "procedure") - t) "\\>\\(\\sw\\|[ \t_.]\\)+\\<is\\>" "\\|" - "^[ \t]*exception\\>" - "\\)") ) + ";" "\\|" + "=>[ \t]*$" "\\|" + "^[ \t]*separate[ \t]*(\\(\\sw\\|[_.]\\)+)" "\\|" + "\\<" (regexp-opt '("begin" "declare" "is" "do" "else" "generic" + "loop" "private" "record" "select" + "then abort" "then") t) "\\>" "\\|" + "^[ \t]*" (regexp-opt '("function" "package" "procedure") + t) "\\>\\(\\sw\\|[ \t_.]\\)+\\<is\\>" "\\|" + "^[ \t]*exception\\>" + "\\)") ) "Regexp of possible ends for a non-broken statement. A new statement starts after these.") (defvar ada-matching-start-re (eval-when-compile (concat "\\<" - (regexp-opt - '("end" "loop" "select" "begin" "case" "do" - "if" "task" "package" "record" "protected") t) - "\\>")) + (regexp-opt + '("end" "loop" "select" "begin" "case" "do" + "if" "task" "package" "record" "protected") t) + "\\>")) "Regexp used in `ada-goto-matching-start'.") (defvar ada-matching-decl-start-re (eval-when-compile (concat "\\<" - (regexp-opt - '("is" "separate" "end" "declare" "if" "new" "begin" "generic" "when") t) - "\\>")) + (regexp-opt + '("is" "separate" "end" "declare" "if" "new" "begin" "generic" "when") t) + "\\>")) "Regexp used in `ada-goto-matching-decl-start'.") (defvar ada-loop-start-re @@ -650,7 +655,7 @@ (defvar ada-subprog-start-re (eval-when-compile (concat "\\<" (regexp-opt '("accept" "entry" "function" "package" "procedure" - "protected" "task") t) "\\>")) + "protected" "task") t) "\\>")) "Regexp for the start of a subprogram.") (defvar ada-named-block-re @@ -706,13 +711,13 @@ (list (list nil ada-imenu-subprogram-menu-re 2) (list "*Specs*" - (concat - "^[ \t]*\\(procedure\\|function\\)[ \t\n]+\\(\\(\\sw\\|_\\)+\\)" - "\\(" - "\\(" ada-imenu-comment-re "[ \t\n]+\\|[ \t\n]*([^)]+)" + (concat + "^[ \t]*\\(procedure\\|function\\)[ \t\n]+\\(\\(\\sw\\|_\\)+\\)" + "\\(" + "\\(" ada-imenu-comment-re "[ \t\n]+\\|[ \t\n]*([^)]+)" ada-imenu-comment-re "\\)";; parameter list or simple space - "\\([ \t\n]*return[ \t\n]+\\(\\sw\\|[_.]\\)+[ \t\n]*\\)?" - "\\)?;") 2) + "\\([ \t\n]*return[ \t\n]+\\(\\sw\\|[_.]\\)+[ \t\n]*\\)?" + "\\)?;") 2) '("*Tasks*" "^[ \t]*task[ \t]+\\(type[ \t]+\\)?\\(\\(body[ \t]+\\)?\\(\\sw\\|_\\)+\\)" 2) '("*Type Defs*" "^[ \t]*\\(sub\\)?type[ \t]+\\(\\(\\sw\\|_\\)+\\)" 2) '("*Protected*" @@ -738,9 +743,10 @@ "Replace `compile-goto-error' from compile.el. If POS is on a file and line location, go to this position. It adds to compile.el the capacity to go to a reference in an error message. -For instance, on this line: +For instance, on these lines: foo.adb:61:11: [...] in call to size declared at foo.ads:11 -both file locations can be clicked on and jumped to." + foo.adb:61:11: [...] in call to local declared at line 20 +the 4 file locations can be clicked on and jumped to." (interactive "d") (goto-char pos) @@ -748,34 +754,34 @@ (cond ;; special case: looking at a filename:line not at the beginning of a line ((and (not (bolp)) - (looking-at - "\\([-_.a-zA-Z0-9]+\\):\\([0-9]+\\)\\(:\\([0-9]+\\)\\)?")) + (looking-at + "\\([-_.a-zA-Z0-9]+\\):\\([0-9]+\\)\\(:\\([0-9]+\\)\\)?")) (let ((line (match-string 2)) - file - (error-pos (point-marker)) - source) + file + (error-pos (point-marker)) + source) (save-excursion - (save-restriction - (widen) - ;; Use funcall so as to prevent byte-compiler warnings - ;; `ada-find-file' is not defined if ada-xref wasn't loaded. But - ;; if we can find it, we should use it instead of - ;; `compilation-find-file', since the latter doesn't know anything - ;; about source path. - - (if (functionp 'ada-find-file) - (setq file (funcall (symbol-function 'ada-find-file) - (match-string 1))) - (setq file (funcall (symbol-function 'compilation-find-file) - (point-marker) (match-string 1) - "./"))) - (set-buffer file) - - (if (stringp line) - (goto-line (string-to-number line))) - (setq source (point-marker)))) + (save-restriction + (widen) + ;; Use funcall so as to prevent byte-compiler warnings + ;; `ada-find-file' is not defined if ada-xref wasn't loaded. But + ;; if we can find it, we should use it instead of + ;; `compilation-find-file', since the latter doesn't know anything + ;; about source path. + + (if (functionp 'ada-find-file) + (setq file (funcall (symbol-function 'ada-find-file) + (match-string 1))) + (setq file (funcall (symbol-function 'compilation-find-file) + (point-marker) (match-string 1) + "./"))) + (set-buffer file) + + (if (stringp line) + (goto-line (string-to-number line))) + (setq source (point-marker)))) (funcall (symbol-function 'compilation-goto-locus) - (cons source error-pos)) + (cons source error-pos)) )) ;; otherwise, default behavior @@ -879,31 +885,31 @@ (defadvice parse-partial-sexp (around parse-partial-sexp-protect-constants) "Handles special character constants and gnatprep statements." (let (change) - (if (< to from) - (let ((tmp from)) - (setq from to to tmp))) - (save-excursion - (goto-char from) - (while (re-search-forward "'\\([(\")#]\\)'" to t) - (setq change (cons (list (match-beginning 1) - 1 - (match-string 1)) - change)) - (replace-match "'A'")) - (goto-char from) - (while (re-search-forward "\\(#[0-9a-fA-F]*#\\)" to t) - (setq change (cons (list (match-beginning 1) - (length (match-string 1)) - (match-string 1)) - change)) - (replace-match (make-string (length (match-string 1)) ?@)))) - ad-do-it - (save-excursion - (while change - (goto-char (caar change)) - (delete-char (cadar change)) - (insert (caddar change)) - (setq change (cdr change))))))) + (if (< to from) + (let ((tmp from)) + (setq from to to tmp))) + (save-excursion + (goto-char from) + (while (re-search-forward "'\\([(\")#]\\)'" to t) + (setq change (cons (list (match-beginning 1) + 1 + (match-string 1)) + change)) + (replace-match "'A'")) + (goto-char from) + (while (re-search-forward "\\(#[0-9a-fA-F]*#\\)" to t) + (setq change (cons (list (match-beginning 1) + (length (match-string 1)) + (match-string 1)) + change)) + (replace-match (make-string (length (match-string 1)) ?@)))) + ad-do-it + (save-excursion + (while change + (goto-char (caar change)) + (delete-char (cadar change)) + (insert (caddar change)) + (setq change (cdr change))))))) (defun ada-deactivate-properties () "Deactivate Ada mode's properties handling. @@ -919,12 +925,12 @@ (widen) (goto-char (point-min)) (while (re-search-forward "'.'" nil t) - (add-text-properties (match-beginning 0) (match-end 0) - '(syntax-table ("'" . ?\")))) + (add-text-properties (match-beginning 0) (match-end 0) + '(syntax-table ("'" . ?\")))) (goto-char (point-min)) (while (re-search-forward "^[ \t]*#" nil t) - (add-text-properties (match-beginning 0) (match-end 0) - '(syntax-table (11 . 10)))) + (add-text-properties (match-beginning 0) (match-end 0) + '(syntax-table (11 . 10)))) (set-buffer-modified-p nil) ;; Setting this only if font-lock is not set won't work @@ -937,41 +943,43 @@ "Called when the region between BEG and END was changed in the buffer. OLD-LEN indicates what the length of the replaced text was." (let ((inhibit-point-motion-hooks t) - (eol (point))) + (eol (point))) (save-excursion (save-match-data - (beginning-of-line) - (remove-text-properties (point) eol '(syntax-table nil)) - (while (re-search-forward "'.'" eol t) - (add-text-properties (match-beginning 0) (match-end 0) - '(syntax-table ("'" . ?\")))) - (beginning-of-line) - (if (looking-at "^[ \t]*#") - (add-text-properties (match-beginning 0) (match-end 0) - '(syntax-table (11 . 10)))))))) + (beginning-of-line) + (remove-text-properties (point) eol '(syntax-table nil)) + (while (re-search-forward "'.'" eol t) + (add-text-properties (match-beginning 0) (match-end 0) + '(syntax-table ("'" . ?\")))) + (beginning-of-line) + (if (looking-at "^[ \t]*#") + (add-text-properties (match-beginning 0) (match-end 0) + '(syntax-table (11 . 10)))))))) ;;------------------------------------------------------------------ ;; Testing the grammatical context ;;------------------------------------------------------------------ (defsubst ada-in-comment-p (&optional parse-result) - "Return t if inside a comment." + "Return t if inside a comment. +If PARSE-RESULT is non-nil, use it instead of calling `parse-partial-sexp'." (nth 4 (or parse-result - (parse-partial-sexp - (line-beginning-position) (point))))) + (parse-partial-sexp + (line-beginning-position) (point))))) (defsubst ada-in-string-p (&optional parse-result) "Return t if point is inside a string. -If parse-result is non-nil, use is instead of calling `parse-partial-sexp'." +If PARSE-RESULT is non-nil, use it instead of calling `parse-partial-sexp'." (nth 3 (or parse-result - (parse-partial-sexp - (line-beginning-position) (point))))) + (parse-partial-sexp + (line-beginning-position) (point))))) (defsubst ada-in-string-or-comment-p (&optional parse-result) - "Return t if inside a comment or string." + "Return t if inside a comment or string. +If PARSE-RESULT is non-nil, use it instead of calling `parse-partial-sexp'." (setq parse-result (or parse-result - (parse-partial-sexp - (line-beginning-position) (point)))) + (parse-partial-sexp + (line-beginning-position) (point)))) (or (ada-in-string-p parse-result) (ada-in-comment-p parse-result))) @@ -990,7 +998,7 @@ (interactive) (funcall function) (setq ada-contextual-menu-last-point - (list (point) (current-buffer)))) + (list (point) (current-buffer)))) (defun ada-popup-menu (position) "Pops up a contextual menu, depending on where the user clicked. @@ -1005,23 +1013,23 @@ ;; transient-mark-mode. (let ((deactivate-mark nil)) (setq ada-contextual-menu-last-point - (list (point) (current-buffer))) + (list (point) (current-buffer))) (mouse-set-point last-input-event) (setq ada-contextual-menu-on-identifier - (and (char-after) - (or (= (char-syntax (char-after)) ?w) - (= (char-after) ?_)) - (not (ada-in-string-or-comment-p)) - (save-excursion (skip-syntax-forward "w") - (not (ada-after-keyword-p))) - )) + (and (char-after) + (or (= (char-syntax (char-after)) ?w) + (= (char-after) ?_)) + (not (ada-in-string-or-comment-p)) + (save-excursion (skip-syntax-forward "w") + (not (ada-after-keyword-p))) + )) (if (fboundp 'popup-menu) (funcall (symbol-function 'popup-menu) ada-contextual-menu) (let (choice) (setq choice (x-popup-menu position ada-contextual-menu)) - (if choice - (funcall (lookup-key ada-contextual-menu (vector (car choice))))))) + (if choice + (funcall (lookup-key ada-contextual-menu (vector (car choice))))))) (set-buffer (cadr ada-contextual-menu-last-point)) (goto-char (car ada-contextual-menu-last-point)) @@ -1040,15 +1048,15 @@ SPEC and BODY are two regular expressions that must match against the file name." (let* ((reg (concat (regexp-quote body) "$")) - (tmp (assoc reg ada-other-file-alist))) + (tmp (assoc reg ada-other-file-alist))) (if tmp - (setcdr tmp (list (cons spec (cadr tmp)))) + (setcdr tmp (list (cons spec (cadr tmp)))) (add-to-list 'ada-other-file-alist (list reg (list spec))))) (let* ((reg (concat (regexp-quote spec) "$")) - (tmp (assoc reg ada-other-file-alist))) + (tmp (assoc reg ada-other-file-alist))) (if tmp - (setcdr tmp (list (cons body (cadr tmp)))) + (setcdr tmp (list (cons body (cadr tmp)))) (add-to-list 'ada-other-file-alist (list reg (list body))))) (add-to-list 'auto-mode-alist @@ -1063,10 +1071,10 @@ ;; speedbar) (if (fboundp 'speedbar-add-supported-extension) (progn - (funcall (symbol-function 'speedbar-add-supported-extension) - spec) - (funcall (symbol-function 'speedbar-add-supported-extension) - body))) + (funcall (symbol-function 'speedbar-add-supported-extension) + spec) + (funcall (symbol-function 'speedbar-add-supported-extension) + body))) ) @@ -1105,14 +1113,14 @@ If you use find-file.el: Switch to other file (Body <-> Spec) '\\[ff-find-other-file]' - or '\\[ff-mouse-find-other-file] + or '\\[ff-mouse-find-other-file] Switch to other file in other window '\\[ada-ff-other-window]' - or '\\[ff-mouse-find-other-file-other-window] + or '\\[ff-mouse-find-other-file-other-window] If you use this function in a spec and no body is available, it gets created with body stubs. If you use ada-xref.el: Goto declaration: '\\[ada-point-and-xref]' on the identifier - or '\\[ada-goto-declaration]' with point on the identifier + or '\\[ada-goto-declaration]' with point on the identifier Complete identifier: '\\[ada-complete-identifier]'." (interactive) @@ -1139,7 +1147,7 @@ ;; aligned under the latest parameter, not under the declaration start). (set (make-local-variable 'comment-line-break-function) (lambda (&optional soft) (let ((fill-prefix nil)) - (indent-new-comment-line soft)))) + (indent-new-comment-line soft)))) (set (make-local-variable 'indent-line-function) 'ada-indent-current-function) @@ -1152,9 +1160,9 @@ (unless (featurep 'xemacs) (progn (if (ada-check-emacs-version 20 3) - (progn - (set (make-local-variable 'parse-sexp-ignore-comments) t) - (set (make-local-variable 'comment-padding) 0))) + (progn + (set (make-local-variable 'parse-sexp-ignore-comments) t) + (set (make-local-variable 'comment-padding) 0))) (set (make-local-variable 'parse-sexp-lookup-properties) t) )) @@ -1171,7 +1179,7 @@ ;; Support for compile.el ;; We just substitute our own functions to go to the error. (add-hook 'compilation-mode-hook - (lambda() + (lambda() (set (make-local-variable 'compile-auto-highlight) 40) ;; FIXME: This has global impact! -stef (define-key compilation-minor-mode-map [mouse-2] @@ -1188,15 +1196,15 @@ (if (featurep 'xemacs) ;; XEmacs (put 'ada-mode 'font-lock-defaults - '(ada-font-lock-keywords - nil t ((?\_ . "w") (?# . ".")) beginning-of-line)) + '(ada-font-lock-keywords + nil t ((?\_ . "w") (?# . ".")) beginning-of-line)) ;; Emacs (set (make-local-variable 'font-lock-defaults) - '(ada-font-lock-keywords - nil t - ((?\_ . "w") (?# . ".")) - beginning-of-line - (font-lock-syntactic-keywords . ada-font-lock-syntactic-keywords))) + '(ada-font-lock-keywords + nil t + ((?\_ . "w") (?# . ".")) + beginning-of-line + (font-lock-syntactic-keywords . ada-font-lock-syntactic-keywords))) ) ;; Set up support for find-file.el. @@ -1205,39 +1213,39 @@ (set (make-local-variable 'ff-search-directories) 'ada-search-directories-internal) (setq ff-post-load-hook 'ada-set-point-accordingly - ff-file-created-hook 'ada-make-body) + ff-file-created-hook 'ada-make-body) (add-hook 'ff-pre-load-hook 'ada-which-function-are-we-in) ;; Some special constructs for find-file.el. (make-local-variable 'ff-special-constructs) (mapc (lambda (pair) - (add-to-list 'ff-special-constructs pair)) - `( - ;; Go to the parent package. - (,(eval-when-compile - (concat "^\\(private[ \t]\\)?[ \t]*package[ \t]+" - "\\(body[ \t]+\\)?" - "\\(\\(\\sw\\|[_.]\\)+\\)\\.\\(\\sw\\|_\\)+[ \t\n]+is")) - . ,(lambda () - (ff-get-file - ada-search-directories-internal - (ada-make-filename-from-adaname (match-string 3)) - ada-spec-suffixes))) - ;; A "separate" clause. - ("^separate[ \t\n]*(\\(\\(\\sw\\|[_.]\\)+\\))" - . ,(lambda () - (ff-get-file - ada-search-directories-internal - (ada-make-filename-from-adaname (match-string 1)) - ada-spec-suffixes))) - ;; A "with" clause. - ("^with[ \t]+\\([a-zA-Z0-9_\\.]+\\)" - . ,(lambda () - (ff-get-file - ada-search-directories-internal - (ada-make-filename-from-adaname (match-string 1)) - ada-spec-suffixes))) - )) + (add-to-list 'ff-special-constructs pair)) + `( + ;; Go to the parent package. + (,(eval-when-compile + (concat "^\\(private[ \t]\\)?[ \t]*package[ \t]+" + "\\(body[ \t]+\\)?" + "\\(\\(\\sw\\|[_.]\\)+\\)\\.\\(\\sw\\|_\\)+[ \t\n]+is")) + . ,(lambda () + (ff-get-file + ada-search-directories-internal + (ada-make-filename-from-adaname (match-string 3)) + ada-spec-suffixes))) + ;; A "separate" clause. + ("^separate[ \t\n]*(\\(\\(\\sw\\|[_.]\\)+\\))" + . ,(lambda () + (ff-get-file + ada-search-directories-internal + (ada-make-filename-from-adaname (match-string 1)) + ada-spec-suffixes))) + ;; A "with" clause. + ("^with[ \t]+\\([a-zA-Z0-9_\\.]+\\)" + . ,(lambda () + (ff-get-file + ada-search-directories-internal + (ada-make-filename-from-adaname (match-string 1)) + ada-spec-suffixes))) + )) ;; Support for outline-minor-mode (set (make-local-variable 'outline-regexp) @@ -1336,11 +1344,11 @@ (if ada-clean-buffer-before-saving (progn - ;; remove all spaces at the end of lines in the whole buffer. + ;; remove all spaces at the end of lines in the whole buffer. (add-hook 'local-write-file-hooks 'delete-trailing-whitespace) - ;; convert all tabs to the correct number of spaces. - (add-hook 'local-write-file-hooks - (lambda () (untabify (point-min) (point-max)))))) + ;; convert all tabs to the correct number of spaces. + (add-hook 'local-write-file-hooks + (lambda () (untabify (point-min) (point-max)))))) (set (make-local-variable 'skeleton-further-elements) '((< '(backward-delete-char-untabify @@ -1366,12 +1374,12 @@ ;; the following has to be done after running the ada-mode-hook ;; because users might want to set the values of these variable - ;; inside the hook (MH) + ;; inside the hook (cond ((eq ada-language-version 'ada83) - (setq ada-keywords ada-83-keywords)) - ((eq ada-language-version 'ada95) - (setq ada-keywords ada-95-keywords))) + (setq ada-keywords ada-83-keywords)) + ((eq ada-language-version 'ada95) + (setq ada-keywords ada-95-keywords))) (if ada-auto-case (ada-activate-keys-for-case))) @@ -1408,18 +1416,16 @@ ;;----------------------------------------------------------------- (defun ada-save-exceptions-to-file (file-name) - "Save the exception lists `ada-case-exception' and -`ada-case-exception-substring' to the file FILE-NAME." - - ;; Save the list in the file + "Save the casing exception lists to the file FILE-NAME. +Casing exception lists are `ada-case-exception' and `ada-case-exception-substring'." (find-file (expand-file-name file-name)) (erase-buffer) (mapcar (lambda (x) (insert (car x) "\n")) (sort (copy-sequence ada-case-exception) (lambda(a b) (string< (car a) (car b))))) (mapcar (lambda (x) (insert "*" (car x) "\n")) - (sort (copy-sequence ada-case-exception-substring) - (lambda(a b) (string< (car a) (car b))))) + (sort (copy-sequence ada-case-exception-substring) + (lambda(a b) (string< (car a) (car b))))) (save-buffer) (kill-buffer nil) ) @@ -1431,23 +1437,23 @@ The standard casing rules will no longer apply to this word." (interactive) (let ((previous-syntax-table (syntax-table)) - file-name - ) + file-name + ) (cond ((stringp ada-case-exception-file) - (setq file-name ada-case-exception-file)) - ((listp ada-case-exception-file) - (setq file-name (car ada-case-exception-file))) - (t - (error (concat "No exception file specified. " + (setq file-name ada-case-exception-file)) + ((listp ada-case-exception-file) + (setq file-name (car ada-case-exception-file))) + (t + (error (concat "No exception file specified. " "See variable ada-case-exception-file")))) (set-syntax-table ada-mode-symbol-syntax-table) (unless word (save-excursion - (skip-syntax-backward "w") - (setq word (buffer-substring-no-properties - (point) (save-excursion (forward-word 1) (point)))))) + (skip-syntax-backward "w") + (setq word (buffer-substring-no-properties + (point) (save-excursion (forward-word 1) (point)))))) (set-syntax-table previous-syntax-table) ;; Reread the exceptions file, in case it was modified by some other, @@ -1456,8 +1462,8 @@ ;; If the word is already in the list, even with a different casing ;; we simply want to replace it. (if (and (not (equal ada-case-exception '())) - (assoc-string word ada-case-exception t)) - (setcar (assoc-string word ada-case-exception t) word) + (assoc-string word ada-case-exception t)) + (setcar (assoc-string word ada-case-exception t) word) (add-to-list 'ada-case-exception (cons word t)) ) @@ -1478,7 +1484,7 @@ ((listp ada-case-exception-file) (car ada-case-exception-file)) (t - (error (concat "No exception file specified. " + (error (concat "No exception file specified. " "See variable ada-case-exception-file")))))) ;; Find the substring to define as an exception. Order is: the parameter, @@ -1509,8 +1515,8 @@ ;; If the word is already in the list, even with a different casing ;; we simply want to replace it. (if (and (not (equal ada-case-exception-substring '())) - (assoc-string word ada-case-exception-substring t)) - (setcar (assoc-string word ada-case-exception-substring t) word) + (assoc-string word ada-case-exception-substring t)) + (setcar (assoc-string word ada-case-exception-substring t) word) (add-to-list 'ada-case-exception-substring (cons word t)) ) @@ -1522,17 +1528,17 @@ "Read the content of the casing exception file FILE-NAME." (if (file-readable-p (expand-file-name file-name)) (let ((buffer (current-buffer))) - (find-file (expand-file-name file-name)) - (set-syntax-table ada-mode-symbol-syntax-table) - (widen) - (goto-char (point-min)) - (while (not (eobp)) - - ;; If the item is already in the list, even with an other casing, - ;; do not add it again. This way, the user can easily decide which - ;; priority should be applied to each casing exception - (let ((word (buffer-substring-no-properties - (point) (save-excursion (forward-word 1) (point))))) + (find-file (expand-file-name file-name)) + (set-syntax-table ada-mode-symbol-syntax-table) + (widen) + (goto-char (point-min)) + (while (not (eobp)) + + ;; If the item is already in the list, even with an other casing, + ;; do not add it again. This way, the user can easily decide which + ;; priority should be applied to each casing exception + (let ((word (buffer-substring-no-properties + (point) (save-excursion (forward-word 1) (point))))) ;; Handling a substring ? (if (char-equal (string-to-char word) ?*) @@ -1543,9 +1549,9 @@ (unless (assoc-string word ada-case-exception t) (add-to-list 'ada-case-exception (cons word t))))) - (forward-line 1)) - (kill-buffer nil) - (set-buffer buffer))) + (forward-line 1)) + (kill-buffer nil) + (set-buffer buffer))) ) (defun ada-case-read-exceptions () @@ -1557,11 +1563,11 @@ ada-case-exception-substring '()) (cond ((stringp ada-case-exception-file) - (ada-case-read-exceptions-from-file ada-case-exception-file)) - - ((listp ada-case-exception-file) - (mapcar 'ada-case-read-exceptions-from-file - ada-case-exception-file)))) + (ada-case-read-exceptions-from-file ada-case-exception-file)) + + ((listp ada-case-exception-file) + (mapcar 'ada-case-read-exceptions-from-file + ada-case-exception-file)))) (defun ada-adjust-case-substring () "Adjust case of substrings in the previous word." @@ -1593,30 +1599,30 @@ (defun ada-adjust-case-identifier () "Adjust case of the previous identifier. -The auto-casing is done according to the value of `ada-case-identifier' and -the exceptions defined in `ada-case-exception-file'." +The auto-casing is done according to the value of `ada-case-identifier' +and the exceptions defined in `ada-case-exception-file'." (interactive) (if (or (equal ada-case-exception '()) - (equal (char-after) ?_)) + (equal (char-after) ?_)) (progn (funcall ada-case-identifier -1) (ada-adjust-case-substring)) (progn (let ((end (point)) - (start (save-excursion (skip-syntax-backward "w") - (point))) - match) - ;; If we have an exception, replace the word by the correct casing - (if (setq match (assoc-string (buffer-substring start end) + (start (save-excursion (skip-syntax-backward "w") + (point))) + match) + ;; If we have an exception, replace the word by the correct casing + (if (setq match (assoc-string (buffer-substring start end) ada-case-exception t)) - (progn - (delete-region start end) - (insert (car match))) - - ;; Else simply re-case the word - (funcall ada-case-identifier -1) + (progn + (delete-region start end) + (insert (car match))) + + ;; Else simply re-case the word + (funcall ada-case-identifier -1) (ada-adjust-case-substring)))))) (defun ada-after-keyword-p () @@ -1624,9 +1630,9 @@ (save-excursion (forward-word -1) (and (not (and (char-before) - (or (= (char-before) ?_) - (= (char-before) ?'))));; unless we have a _ or ' - (looking-at (concat ada-keywords "[^_]"))))) + (or (= (char-before) ?_) + (= (char-before) ?'))));; unless we have a _ or ' + (looking-at (concat ada-keywords "[^_]"))))) (defun ada-adjust-case (&optional force-identifier) "Adjust the case of the word before the character just typed. @@ -1665,7 +1671,7 @@ (if ada-auto-case (let ((lastk last-command-char) - (previous-syntax-table (syntax-table))) + (previous-syntax-table (syntax-table))) (unwind-protect (progn @@ -1685,7 +1691,7 @@ (funcall ada-ret-binding)))) ((eq lastk ?\C-i) (ada-tab)) ;; Else just insert the character - ((self-insert-command (prefix-numeric-value arg)))) + ((self-insert-command (prefix-numeric-value arg)))) ;; if there is a keyword in front of the underscore ;; then it should be part of an identifier (MH) (if (eq lastk ?_) @@ -1694,7 +1700,7 @@ ) ;; Restore the syntax table (set-syntax-table previous-syntax-table)) - ) + ) ;; Else, no auto-casing (cond @@ -1718,11 +1724,11 @@ ;; Call case modifying function after certain keys. (mapcar (function (lambda(key) (define-key - ada-mode-map - (char-to-string key) - 'ada-adjust-case-interactive))) - '( ?` ?_ ?# ?% ?& ?* ?( ?) ?- ?= ?+ - ?| ?\; ?: ?' ?\" ?< ?, ?. ?> ?/ ?\n 32 ?\r ))) + ada-mode-map + (char-to-string key) + 'ada-adjust-case-interactive))) + '( ?` ?_ ?# ?% ?& ?* ?( ?) ?- ?= ?+ + ?| ?\; ?: ?' ?\" ?< ?, ?. ?> ?/ ?\n 32 ?\r ))) (defun ada-loose-case-word (&optional arg) "Upcase first letter and letters following `_' in the following word. @@ -1731,19 +1737,19 @@ (interactive) (save-excursion (let ((end (save-excursion (skip-syntax-forward "w") (point))) - (first t)) + (first t)) (skip-syntax-backward "w") (while (and (or first (search-forward "_" end t)) - (< (point) end)) - (and first - (setq first nil)) - (insert-char (upcase (following-char)) 1) - (delete-char 1))))) + (< (point) end)) + (and first + (setq first nil)) + (insert-char (upcase (following-char)) 1) + (delete-char 1))))) (defun ada-no-auto-case (&optional arg) - "Do nothing. -This function can be used for the auto-casing variables in the Ada mode, to -adapt to unusal auto-casing schemes. Since it does nothing, you can for + "Do nothing. ARG is ignored. +This function can be used for the auto-casing variables in Ada mode, to +adapt to unusal auto-casing schemes. Since it does nothing, you can for instance use it for `ada-case-identifier' if you don't want any special auto-casing for identifiers, whereas keywords have to be lower-cased. See also `ada-auto-case' to disable auto casing altogether." @@ -1754,7 +1760,7 @@ ARG is ignored, and is there for compatibility with `capitalize-word' only." (interactive) (let ((end (save-excursion (skip-syntax-forward "w") (point))) - (begin (save-excursion (skip-syntax-backward "w") (point)))) + (begin (save-excursion (skip-syntax-backward "w") (point)))) (modify-syntax-entry ?_ "_") (capitalize-region begin end) (modify-syntax-entry ?_ "w"))) @@ -1764,49 +1770,49 @@ Attention: This function might take very long for big regions!" (interactive "*r") (let ((begin nil) - (end nil) - (keywordp nil) - (attribp nil) - (previous-syntax-table (syntax-table))) + (end nil) + (keywordp nil) + (attribp nil) + (previous-syntax-table (syntax-table))) (message "Adjusting case ...") (unwind-protect - (save-excursion - (set-syntax-table ada-mode-symbol-syntax-table) - (goto-char to) - ;; - ;; loop: look for all identifiers, keywords, and attributes - ;; - (while (re-search-backward "\\<\\(\\sw+\\)\\>" from t) - (setq end (match-end 1)) - (setq attribp - (and (> (point) from) - (save-excursion - (forward-char -1) - (setq attribp (looking-at "'.[^']"))))) - (or - ;; do nothing if it is a string or comment - (ada-in-string-or-comment-p) - (progn - ;; - ;; get the identifier or keyword or attribute - ;; - (setq begin (point)) - (setq keywordp (looking-at ada-keywords)) - (goto-char end) - ;; - ;; casing according to user-option - ;; - (if attribp - (funcall ada-case-attribute -1) - (if keywordp - (funcall ada-case-keyword -1) - (ada-adjust-case-identifier))) - (goto-char begin)))) - (message "Adjusting case ... Done")) + (save-excursion + (set-syntax-table ada-mode-symbol-syntax-table) + (goto-char to) + ;; + ;; loop: look for all identifiers, keywords, and attributes + ;; + (while (re-search-backward "\\<\\(\\sw+\\)\\>" from t) + (setq end (match-end 1)) + (setq attribp + (and (> (point) from) + (save-excursion + (forward-char -1) + (setq attribp (looking-at "'.[^']"))))) + (or + ;; do nothing if it is a string or comment + (ada-in-string-or-comment-p) + (progn + ;; + ;; get the identifier or keyword or attribute + ;; + (setq begin (point)) + (setq keywordp (looking-at ada-keywords)) + (goto-char end) + ;; + ;; casing according to user-option + ;; + (if attribp + (funcall ada-case-attribute -1) + (if keywordp + (funcall ada-case-keyword -1) + (ada-adjust-case-identifier))) + (goto-char begin)))) + (message "Adjusting case ... Done")) (set-syntax-table previous-syntax-table)))) (defun ada-adjust-case-buffer () - "Adjusts the case of all words in the whole buffer. + "Adjust the case of all words in the whole buffer. ATTENTION: This function might take very long for big buffers!" (interactive "*") (ada-adjust-case-region (point-min) (point-max))) @@ -1832,44 +1838,44 @@ "Reformat the parameter list point is in." (interactive) (let ((begin nil) - (end nil) - (delend nil) - (paramlist nil) - (previous-syntax-table (syntax-table))) + (end nil) + (delend nil) + (paramlist nil) + (previous-syntax-table (syntax-table))) (unwind-protect - (progn - (set-syntax-table ada-mode-symbol-syntax-table) - - ;; check if really inside parameter list - (or (ada-in-paramlist-p) - (error "Not in parameter list")) - - ;; find start of current parameter-list - (ada-search-ignore-string-comment - (concat ada-subprog-start-re "\\|\\<body\\>" ) t nil) - (down-list 1) - (backward-char 1) - (setq begin (point)) - - ;; find end of parameter-list - (forward-sexp 1) - (setq delend (point)) - (delete-char -1) - (insert "\n") - - ;; find end of last parameter-declaration - (forward-comment -1000) - (setq end (point)) - - ;; build a list of all elements of the parameter-list - (setq paramlist (ada-scan-paramlist (1+ begin) end)) - - ;; delete the original parameter-list - (delete-region begin delend) - - ;; insert the new parameter-list - (goto-char begin) - (ada-insert-paramlist paramlist)) + (progn + (set-syntax-table ada-mode-symbol-syntax-table) + + ;; check if really inside parameter list + (or (ada-in-paramlist-p) + (error "Not in parameter list")) + + ;; find start of current parameter-list + (ada-search-ignore-string-comment + (concat ada-subprog-start-re "\\|\\<body\\>" ) t nil) + (down-list 1) + (backward-char 1) + (setq begin (point)) + + ;; find end of parameter-list + (forward-sexp 1) + (setq delend (point)) + (delete-char -1) + (insert "\n") + + ;; find end of last parameter-declaration + (forward-comment -1000) + (setq end (point)) + + ;; build a list of all elements of the parameter-list + (setq paramlist (ada-scan-paramlist (1+ begin) end)) + + ;; delete the original parameter-list + (delete-region begin delend) + + ;; insert the new parameter-list + (goto-char begin) + (ada-insert-paramlist paramlist)) ;; restore syntax-table (set-syntax-table previous-syntax-table) @@ -1879,12 +1885,12 @@ "Scan the parameter list found in between BEGIN and END. Return the equivalent internal parameter list." (let ((paramlist (list)) - (param (list)) - (notend t) - (apos nil) - (epos nil) - (semipos nil) - (match-cons nil)) + (param (list)) + (notend t) + (apos nil) + (epos nil) + (semipos nil) + (match-cons nil)) (goto-char begin) @@ -1897,11 +1903,11 @@ ;; find last character of parameter-declaration (if (setq match-cons - (ada-search-ignore-string-comment "[ \t\n]*;" nil end t)) - (progn - (setq epos (car match-cons)) - (setq semipos (cdr match-cons))) - (setq epos end)) + (ada-search-ignore-string-comment "[ \t\n]*;" nil end t)) + (progn + (setq epos (car match-cons)) + (setq semipos (cdr match-cons))) + (setq epos end)) ;; read name(s) of parameter(s) (goto-char apos) @@ -1913,76 +1919,76 @@ ;; look for 'in' (setq apos (point)) (setq param - (append param - (list - (consp - (ada-search-ignore-string-comment - "in" nil epos t 'word-search-forward))))) + (append param + (list + (consp + (ada-search-ignore-string-comment + "in" nil epos t 'word-search-forward))))) ;; look for 'out' (goto-char apos) (setq param - (append param - (list - (consp - (ada-search-ignore-string-comment - "out" nil epos t 'word-search-forward))))) + (append param + (list + (consp + (ada-search-ignore-string-comment + "out" nil epos t 'word-search-forward))))) ;; look for 'access' (goto-char apos) (setq param - (append param - (list - (consp - (ada-search-ignore-string-comment - "access" nil epos t 'word-search-forward))))) + (append param + (list + (consp + (ada-search-ignore-string-comment + "access" nil epos t 'word-search-forward))))) ;; skip 'in'/'out'/'access' (goto-char apos) (ada-goto-next-non-ws) (while (looking-at "\\<\\(in\\|out\\|access\\)\\>") - (forward-word 1) - (ada-goto-next-non-ws)) + (forward-word 1) + (ada-goto-next-non-ws)) ;; read type of parameter ;; We accept spaces in the name, since some software like Rose ;; generates something like: "A : B 'Class" (looking-at "\\<\\(\\sw\\|[_.' \t]\\)+\\>") (setq param - (append param - (list (match-string 0)))) + (append param + (list (match-string 0)))) ;; read default-expression, if there is one (goto-char (setq apos (match-end 0))) (setq param - (append param - (list - (if (setq match-cons - (ada-search-ignore-string-comment - ":=" nil epos t 'search-forward)) - (buffer-substring (car match-cons) epos) - nil)))) + (append param + (list + (if (setq match-cons + (ada-search-ignore-string-comment + ":=" nil epos t 'search-forward)) + (buffer-substring (car match-cons) epos) + nil)))) ;; add this parameter-declaration to the list (setq paramlist (append paramlist (list param))) ;; check if it was the last parameter (if (eq epos end) - (setq notend nil) - (goto-char semipos)) + (setq notend nil) + (goto-char semipos)) ) (reverse paramlist))) (defun ada-insert-paramlist (paramlist) "Insert a formatted PARAMLIST in the buffer." (let ((i (length paramlist)) - (parlen 0) - (typlen 0) - (inp nil) - (outp nil) - (accessp nil) - (column nil) - (firstcol nil)) + (parlen 0) + (typlen 0) + (inp nil) + (outp nil) + (accessp nil) + (column nil) + (firstcol nil)) ;; loop until last parameter (while (not (zerop i)) @@ -2006,23 +2012,23 @@ ;; does paramlist already start on a separate line ? (if (save-excursion - (re-search-backward "^.\\|[^ \t]" nil t) - (looking-at "^.")) - ;; yes => re-indent it - (progn - (ada-indent-current) - (save-excursion - (if (looking-at "\\(is\\|return\\)") - (replace-match " \\1")))) + (re-search-backward "^.\\|[^ \t]" nil t) + (looking-at "^.")) + ;; yes => re-indent it + (progn + (ada-indent-current) + (save-excursion + (if (looking-at "\\(is\\|return\\)") + (replace-match " \\1")))) ;; no => insert it where we are after removing any whitespace (fixup-whitespace) (save-excursion - (cond - ((looking-at "[ \t]*\\(\n\\|;\\)") - (replace-match "\\1")) - ((looking-at "[ \t]*\\(is\\|return\\)") - (replace-match " \\1")))) + (cond + ((looking-at "[ \t]*\\(\n\\|;\\)") + (replace-match "\\1")) + ((looking-at "[ \t]*\\(is\\|return\\)") + (replace-match " \\1")))) (insert " ")) (insert "(") @@ -2044,42 +2050,42 @@ ;; insert 'in' or space (if (nth 1 (nth i paramlist)) - (insert "in ") - (if (and - (or inp - accessp) - (not (nth 3 (nth i paramlist)))) - (insert " "))) + (insert "in ") + (if (and + (or inp + accessp) + (not (nth 3 (nth i paramlist)))) + (insert " "))) ;; insert 'out' or space (if (nth 2 (nth i paramlist)) - (insert "out ") - (if (and - (or outp - accessp) - (not (nth 3 (nth i paramlist)))) - (insert " "))) + (insert "out ") + (if (and + (or outp + accessp) + (not (nth 3 (nth i paramlist)))) + (insert " "))) ;; insert 'access' (if (nth 3 (nth i paramlist)) - (insert "access ")) + (insert "access ")) (setq column (current-column)) ;; insert type-name and, if necessary, space and default-expression (insert (nth 4 (nth i paramlist))) (if (nth 5 (nth i paramlist)) - (progn - (indent-to (+ column typlen 1)) - (insert (nth 5 (nth i paramlist))))) + (progn + (indent-to (+ column typlen 1)) + (insert (nth 5 (nth i paramlist))))) ;; check if it was the last parameter (if (zerop i) - (insert ")") - ;; no => insert ';' and newline and indent - (insert ";") - (newline) - (indent-to firstcol)) + (insert ")") + ;; no => insert ';' and newline and indent + (insert ";") + (newline) + (indent-to firstcol)) ) ;; if anything follows, except semicolon, newline, is or return @@ -2123,22 +2129,22 @@ (interactive "*r") (goto-char beg) (let ((block-done 0) - (lines-remaining (count-lines beg end)) - (msg (format "%%4d out of %4d lines remaining ..." - (count-lines beg end))) - (endmark (copy-marker end))) + (lines-remaining (count-lines beg end)) + (msg (format "%%4d out of %4d lines remaining ..." + (count-lines beg end))) + (endmark (copy-marker end))) ;; catch errors while indenting (while (< (point) endmark) (if (> block-done 39) - (progn + (progn (setq lines-remaining (- lines-remaining block-done) block-done 0) (message msg lines-remaining))) (if (= (char-after) ?\n) nil - (ada-indent-current)) + (ada-indent-current)) (forward-line 1) (setq block-done (1+ block-done))) - (message "indenting ... done"))) + (message "Indenting ... done"))) (defun ada-indent-newline-indent () "Indent the current line, insert a newline and then indent the new line." @@ -2149,8 +2155,7 @@ (defun ada-indent-newline-indent-conditional () "Insert a newline and indent it. -The original line is indented first if `ada-indent-after-return' is non-nil. -This function is intended to be bound to the C-m and C-j keys." +The original line is indented first if `ada-indent-after-return' is non-nil." (interactive "*") (if ada-indent-after-return (ada-indent-current)) (newline) @@ -2211,65 +2216,65 @@ offset." (interactive) (let ((previous-syntax-table (syntax-table)) - (orgpoint (point-marker)) - cur-indent tmp-indent - prev-indent) + (orgpoint (point-marker)) + cur-indent tmp-indent + prev-indent) (unwind-protect - (progn - (set-syntax-table ada-mode-symbol-syntax-table) - - ;; This need to be done here so that the advice is not always - ;; activated (this might interact badly with other modes) - (if (featurep 'xemacs) - (ad-activate 'parse-partial-sexp t)) - - (save-excursion - (setq cur-indent - - ;; Not First line in the buffer ? - (if (save-excursion (zerop (forward-line -1))) - (progn - (back-to-indentation) - (ada-get-current-indent)) - - ;; first line in the buffer - (list (point-min) 0)))) - - ;; Evaluate the list to get the column to indent to - ;; prev-indent contains the column to indent to + (progn + (set-syntax-table ada-mode-symbol-syntax-table) + + ;; This need to be done here so that the advice is not always + ;; activated (this might interact badly with other modes) + (if (featurep 'xemacs) + (ad-activate 'parse-partial-sexp t)) + + (save-excursion + (setq cur-indent + + ;; Not First line in the buffer ? + (if (save-excursion (zerop (forward-line -1))) + (progn + (back-to-indentation) + (ada-get-current-indent)) + + ;; first line in the buffer + (list (point-min) 0)))) + + ;; Evaluate the list to get the column to indent to + ;; prev-indent contains the column to indent to (if cur-indent (setq prev-indent (save-excursion (goto-char (car cur-indent)) (current-column)) tmp-indent (cdr cur-indent)) (setq prev-indent 0 tmp-indent '())) - (while (not (null tmp-indent)) - (cond - ((numberp (car tmp-indent)) - (setq prev-indent (+ prev-indent (car tmp-indent)))) - (t - (setq prev-indent (+ prev-indent (eval (car tmp-indent))))) - ) - (setq tmp-indent (cdr tmp-indent))) - - ;; only re-indent if indentation is different then the current - (if (= (save-excursion (back-to-indentation) (current-column)) prev-indent) - nil - (beginning-of-line) - (delete-horizontal-space) - (indent-to prev-indent)) - ;; - ;; restore position of point - ;; - (goto-char orgpoint) - (if (< (current-column) (current-indentation)) - (back-to-indentation))) + (while (not (null tmp-indent)) + (cond + ((numberp (car tmp-indent)) + (setq prev-indent (+ prev-indent (car tmp-indent)))) + (t + (setq prev-indent (+ prev-indent (eval (car tmp-indent))))) + ) + (setq tmp-indent (cdr tmp-indent))) + + ;; only re-indent if indentation is different then the current + (if (= (save-excursion (back-to-indentation) (current-column)) prev-indent) + nil + (beginning-of-line) + (delete-horizontal-space) + (indent-to prev-indent)) + ;; + ;; restore position of point + ;; + (goto-char orgpoint) + (if (< (current-column) (current-indentation)) + (back-to-indentation))) ;; restore syntax-table (set-syntax-table previous-syntax-table) (if (featurep 'xemacs) - (ad-deactivate 'parse-partial-sexp)) + (ad-deactivate 'parse-partial-sexp)) ) cur-indent @@ -2278,14 +2283,14 @@ (defun ada-get-current-indent () "Return the indentation to use for the current line." (let (column - pos - match-cons + pos + match-cons result - (orgpoint (save-excursion - (beginning-of-line) - (forward-comment -10000) - (forward-line 1) - (point)))) + (orgpoint (save-excursion + (beginning-of-line) + (forward-comment -10000) + (forward-line 1) + (point)))) (setq result (cond @@ -2410,8 +2415,8 @@ ;; else ((looking-at "else\\>") - (if (save-excursion (ada-goto-previous-word) - (looking-at "\\<or\\>")) + (if (save-excursion (ada-goto-previous-word) + (looking-at "\\<or\\>")) (ada-indent-on-previous-lines nil orgpoint orgpoint) (save-excursion (ada-goto-matching-start 1 nil t) @@ -2461,16 +2466,16 @@ (looking-at "loop\\>")) (setq pos (point)) (save-excursion - (goto-char (match-end 0)) - (ada-goto-stmt-start) - (if (looking-at "\\<\\(loop\\|if\\)\\>") - (ada-indent-on-previous-lines nil orgpoint orgpoint) - (unless (looking-at ada-loop-start-re) - (ada-search-ignore-string-comment ada-loop-start-re - nil pos)) - (if (looking-at "\\<loop\\>") - (ada-indent-on-previous-lines nil orgpoint orgpoint) - (list (progn (back-to-indentation) (point)) 'ada-stmt-end-indent))))) + (goto-char (match-end 0)) + (ada-goto-stmt-start) + (if (looking-at "\\<\\(loop\\|if\\)\\>") + (ada-indent-on-previous-lines nil orgpoint orgpoint) + (unless (looking-at ada-loop-start-re) + (ada-search-ignore-string-comment ada-loop-start-re + nil pos)) + (if (looking-at "\\<loop\\>") + (ada-indent-on-previous-lines nil orgpoint orgpoint) + (list (progn (back-to-indentation) (point)) 'ada-stmt-end-indent))))) ;;---------------------------- ;; starting with l (limited) or r (record) @@ -2497,9 +2502,9 @@ ((and (= (downcase (char-after)) ?b) (looking-at "begin\\>")) (save-excursion - (if (ada-goto-matching-decl-start t) - (list (progn (back-to-indentation) (point)) 0) - (ada-indent-on-previous-lines nil orgpoint orgpoint)))) + (if (ada-goto-matching-decl-start t) + (list (progn (back-to-indentation) (point)) 0) + (ada-indent-on-previous-lines nil orgpoint orgpoint)))) ;;--------------------------- ;; starting with i (is) @@ -2509,16 +2514,16 @@ (looking-at "is\\>")) (if (and ada-indent-is-separate - (save-excursion - (goto-char (match-end 0)) - (ada-goto-next-non-ws (save-excursion (end-of-line) - (point))) - (looking-at "\\<abstract\\>\\|\\<separate\\>"))) - (save-excursion - (ada-goto-stmt-start) - (list (progn (back-to-indentation) (point)) 'ada-indent)) - (save-excursion - (ada-goto-stmt-start) + (save-excursion + (goto-char (match-end 0)) + (ada-goto-next-non-ws (save-excursion (end-of-line) + (point))) + (looking-at "\\<abstract\\>\\|\\<separate\\>"))) + (save-excursion + (ada-goto-stmt-start) + (list (progn (back-to-indentation) (point)) 'ada-indent)) + (save-excursion + (ada-goto-stmt-start) (if (looking-at "\\<package\\|procedure\\|function\\>") (list (progn (back-to-indentation) (point)) 0) (list (progn (back-to-indentation) (point)) 'ada-indent))))) @@ -2599,8 +2604,8 @@ ((and (= (downcase (char-after)) ?d) (looking-at "do\\>")) (save-excursion - (ada-goto-stmt-start) - (list (progn (back-to-indentation) (point)) 'ada-stmt-end-indent))) + (ada-goto-stmt-start) + (list (progn (back-to-indentation) (point)) 'ada-stmt-end-indent))) ;;-------------------------------- ;; starting with '-' (comment) @@ -2632,7 +2637,7 @@ (ada-indent-on-previous-lines nil orgpoint orgpoint))) ;; Else same indentation as the previous line - (list (save-excursion (back-to-indentation) (point)) 0))) + (list (save-excursion (back-to-indentation) (point)) 0))) ;;-------------------------------- ;; starting with '#' (preprocessor line) @@ -2640,7 +2645,7 @@ ((and (= (char-after) ?#) (equal ada-which-compiler 'gnat) - (looking-at "#[ \t]*\\(if\\|els\\(e\\|if\\)\\|end[ \t]*if\\)")) + (looking-at "#[ \t]*\\(if\\|els\\(e\\|if\\)\\|end[ \t]*if\\)")) (list (save-excursion (beginning-of-line) (point)) 0)) ;;-------------------------------- @@ -2649,9 +2654,9 @@ ((and (not (eobp)) (= (char-after) ?\))) (save-excursion - (forward-char 1) - (backward-sexp 1) - (list (point) 0))) + (forward-char 1) + (backward-sexp 1) + (list (point) 0))) ;;--------------------------------- ;; new/abstract/separate @@ -2689,9 +2694,9 @@ ((looking-at "\\(\\sw\\|_\\)+[ \t\n]*:[^=]") (if (ada-in-decl-p) - (ada-indent-on-previous-lines nil orgpoint orgpoint) - (append (ada-indent-on-previous-lines nil orgpoint orgpoint) - '(ada-label-indent)))) + (ada-indent-on-previous-lines nil orgpoint orgpoint) + (append (ada-indent-on-previous-lines nil orgpoint orgpoint) + '(ada-label-indent)))) )) @@ -2711,60 +2716,60 @@ ;; Is inside a parameter-list ? (if (ada-in-paramlist-p) - (ada-get-indent-paramlist) + (ada-get-indent-paramlist) ;; move to beginning of current statement (unless nomove - (ada-goto-stmt-start)) + (ada-goto-stmt-start)) ;; no beginning found => don't change indentation (if (and (eq oldpoint (point)) - (not nomove)) - (ada-get-indent-nochange) - - (cond - ;; - ((and - ada-indent-to-open-paren - (ada-in-open-paren-p)) - (ada-get-indent-open-paren)) - ;; - ((looking-at "end\\>") - (ada-get-indent-end orgpoint)) - ;; - ((looking-at ada-loop-start-re) - (ada-get-indent-loop orgpoint)) - ;; - ((looking-at ada-subprog-start-re) - (ada-get-indent-subprog orgpoint)) - ;; - ((looking-at ada-block-start-re) - (ada-get-indent-block-start orgpoint)) - ;; - ((looking-at "\\(sub\\)?type\\>") - (ada-get-indent-type orgpoint)) - ;; - ;; "then" has to be included in the case of "select...then abort" - ;; statements, since (goto-stmt-start) at the beginning of - ;; the current function would leave the cursor on that position - ((looking-at "\\(\\(els\\)?if\\>\\)\\|then abort\\\>") - (ada-get-indent-if orgpoint)) - ;; - ((looking-at "case\\>") - (ada-get-indent-case orgpoint)) - ;; - ((looking-at "when\\>") - (ada-get-indent-when orgpoint)) - ;; - ((looking-at "\\(\\sw\\|_\\)+[ \t\n]*:[^=]") - (ada-get-indent-label orgpoint)) - ;; - ((looking-at "separate\\>") - (ada-get-indent-nochange)) + (not nomove)) + (ada-get-indent-nochange) + + (cond + ;; + ((and + ada-indent-to-open-paren + (ada-in-open-paren-p)) + (ada-get-indent-open-paren)) + ;; + ((looking-at "end\\>") + (ada-get-indent-end orgpoint)) + ;; + ((looking-at ada-loop-start-re) + (ada-get-indent-loop orgpoint)) + ;; + ((looking-at ada-subprog-start-re) + (ada-get-indent-subprog orgpoint)) + ;; + ((looking-at ada-block-start-re) + (ada-get-indent-block-start orgpoint)) + ;; + ((looking-at "\\(sub\\)?type\\>") + (ada-get-indent-type orgpoint)) + ;; + ;; "then" has to be included in the case of "select...then abort" + ;; statements, since (goto-stmt-start) at the beginning of + ;; the current function would leave the cursor on that position + ((looking-at "\\(\\(els\\)?if\\>\\)\\|then abort\\\>") + (ada-get-indent-if orgpoint)) + ;; + ((looking-at "case\\>") + (ada-get-indent-case orgpoint)) + ;; + ((looking-at "when\\>") + (ada-get-indent-when orgpoint)) + ;; + ((looking-at "\\(\\sw\\|_\\)+[ \t\n]*:[^=]") + (ada-get-indent-label orgpoint)) + ;; + ((looking-at "separate\\>") + (ada-get-indent-nochange)) ;; A label ((looking-at "<<") - (list (+ (save-excursion (back-to-indentation) (point)) + (list (+ (save-excursion (back-to-indentation) (point)) (- ada-label-indent)))) ;; @@ -2777,8 +2782,8 @@ 'ada-with-indent 'ada-use-indent)))) ;; - (t - (ada-get-indent-noindent orgpoint))))) + (t + (ada-get-indent-noindent orgpoint))))) )) (defun ada-get-indent-open-paren () @@ -2824,146 +2829,146 @@ "Calculate the indentation when point is just before an end statement. ORGPOINT is the limit position used in the calculation." (let ((defun-name nil) - (indent nil)) + (indent nil)) ;; is the line already terminated by ';' ? (if (save-excursion - (ada-search-ignore-string-comment ";" nil orgpoint nil - 'search-forward)) - - ;; yes, look what's following 'end' - (progn - (forward-word 1) - (ada-goto-next-non-ws) - (cond - ((looking-at "\\<\\(loop\\|select\\|if\\|case\\)\\>") - (save-excursion (ada-check-matching-start (match-string 0))) - (list (save-excursion (back-to-indentation) (point)) 0)) - - ;; - ;; loop/select/if/case/record/select - ;; - ((looking-at "\\<record\\>") - (save-excursion - (ada-check-matching-start (match-string 0)) - ;; we are now looking at the matching "record" statement - (forward-word 1) - (ada-goto-stmt-start) - ;; now on the matching type declaration, or use clause - (unless (looking-at "\\(for\\|type\\)\\>") - (ada-search-ignore-string-comment "\\<type\\>" t)) - (list (progn (back-to-indentation) (point)) 0))) - ;; - ;; a named block end - ;; - ((looking-at ada-ident-re) - (setq defun-name (match-string 0)) - (save-excursion - (ada-goto-matching-start 0) - (ada-check-defun-name defun-name)) - (list (progn (back-to-indentation) (point)) 0)) - ;; - ;; a block-end without name - ;; - ((= (char-after) ?\;) - (save-excursion - (ada-goto-matching-start 0) - (if (looking-at "\\<begin\\>") - (progn - (setq indent (list (point) 0)) - (if (ada-goto-matching-decl-start t) - (list (progn (back-to-indentation) (point)) 0) - indent)) + (ada-search-ignore-string-comment ";" nil orgpoint nil + 'search-forward)) + + ;; yes, look what's following 'end' + (progn + (forward-word 1) + (ada-goto-next-non-ws) + (cond + ((looking-at "\\<\\(loop\\|select\\|if\\|case\\)\\>") + (save-excursion (ada-check-matching-start (match-string 0))) + (list (save-excursion (back-to-indentation) (point)) 0)) + + ;; + ;; loop/select/if/case/record/select + ;; + ((looking-at "\\<record\\>") + (save-excursion + (ada-check-matching-start (match-string 0)) + ;; we are now looking at the matching "record" statement + (forward-word 1) + (ada-goto-stmt-start) + ;; now on the matching type declaration, or use clause + (unless (looking-at "\\(for\\|type\\)\\>") + (ada-search-ignore-string-comment "\\<type\\>" t)) + (list (progn (back-to-indentation) (point)) 0))) + ;; + ;; a named block end + ;; + ((looking-at ada-ident-re) + (setq defun-name (match-string 0)) + (save-excursion + (ada-goto-matching-start 0) + (ada-check-defun-name defun-name)) + (list (progn (back-to-indentation) (point)) 0)) + ;; + ;; a block-end without name + ;; + ((= (char-after) ?\;) + (save-excursion + (ada-goto-matching-start 0) + (if (looking-at "\\<begin\\>") + (progn + (setq indent (list (point) 0)) + (if (ada-goto-matching-decl-start t) + (list (progn (back-to-indentation) (point)) 0) + indent)) (list (progn (back-to-indentation) (point)) 0) ))) - ;; - ;; anything else - should maybe signal an error ? - ;; - (t - (list (save-excursion (back-to-indentation) (point)) - 'ada-broken-indent)))) + ;; + ;; anything else - should maybe signal an error ? + ;; + (t + (list (save-excursion (back-to-indentation) (point)) + 'ada-broken-indent)))) (list (save-excursion (back-to-indentation) (point)) - 'ada-broken-indent)))) + 'ada-broken-indent)))) (defun ada-get-indent-case (orgpoint) "Calculate the indentation when point is just before a case statement. ORGPOINT is the limit position used in the calculation." (let ((match-cons nil) - (opos (point))) + (opos (point))) (cond ;; ;; case..is..when..=> ;; ((save-excursion - (setq match-cons (and - ;; the `=>' must be after the keyword `is'. - (ada-search-ignore-string-comment - "is" nil orgpoint nil 'word-search-forward) - (ada-search-ignore-string-comment - "[ \t\n]+=>" nil orgpoint)))) + (setq match-cons (and + ;; the `=>' must be after the keyword `is'. + (ada-search-ignore-string-comment + "is" nil orgpoint nil 'word-search-forward) + (ada-search-ignore-string-comment + "[ \t\n]+=>" nil orgpoint)))) (save-excursion - (goto-char (car match-cons)) - (unless (ada-search-ignore-string-comment "when" t opos) - (error "Missing 'when' between 'case' and '=>'")) - (list (save-excursion (back-to-indentation) (point)) 'ada-indent))) + (goto-char (car match-cons)) + (unless (ada-search-ignore-string-comment "when" t opos) + (error "Missing 'when' between 'case' and '=>'")) + (list (save-excursion (back-to-indentation) (point)) 'ada-indent))) ;; ;; case..is..when ;; ((save-excursion - (setq match-cons (ada-search-ignore-string-comment - "when" nil orgpoint nil 'word-search-forward))) + (setq match-cons (ada-search-ignore-string-comment + "when" nil orgpoint nil 'word-search-forward))) (goto-char (cdr match-cons)) (list (save-excursion (back-to-indentation) (point)) 'ada-broken-indent)) ;; ;; case..is ;; ((save-excursion - (setq match-cons (ada-search-ignore-string-comment - "is" nil orgpoint nil 'word-search-forward))) + (setq match-cons (ada-search-ignore-string-comment + "is" nil orgpoint nil 'word-search-forward))) (list (save-excursion (back-to-indentation) (point)) 'ada-when-indent)) ;; ;; incomplete case ;; (t (list (save-excursion (back-to-indentation) (point)) - 'ada-broken-indent))))) + 'ada-broken-indent))))) (defun ada-get-indent-when (orgpoint) "Calculate the indentation when point is just before a when statement. ORGPOINT is the limit position used in the calculation." (let ((cur-indent (save-excursion (back-to-indentation) (point)))) (if (ada-search-ignore-string-comment "[ \t\n]*=>" nil orgpoint) - (list cur-indent 'ada-indent) + (list cur-indent 'ada-indent) (list cur-indent 'ada-broken-indent)))) (defun ada-get-indent-if (orgpoint) "Calculate the indentation when point is just before an if statement. ORGPOINT is the limit position used in the calculation." (let ((cur-indent (save-excursion (back-to-indentation) (point))) - (match-cons nil)) + (match-cons nil)) ;; ;; Move to the correct then (ignore all "and then") ;; (while (and (setq match-cons (ada-search-ignore-string-comment - "\\<\\(then\\|and[ \t]*then\\)\\>" - nil orgpoint)) - (= (downcase (char-after (car match-cons))) ?a))) + "\\<\\(then\\|and[ \t]*then\\)\\>" + nil orgpoint)) + (= (downcase (char-after (car match-cons))) ?a))) ;; If "then" was found (we are looking at it) (if match-cons - (progn - ;; - ;; 'then' first in separate line ? - ;; => indent according to 'then', - ;; => else indent according to 'if' - ;; - (if (save-excursion - (back-to-indentation) - (looking-at "\\<then\\>")) - (setq cur-indent (save-excursion (back-to-indentation) (point)))) - ;; skip 'then' - (forward-word 1) - (list cur-indent 'ada-indent)) + (progn + ;; + ;; 'then' first in separate line ? + ;; => indent according to 'then', + ;; => else indent according to 'if' + ;; + (if (save-excursion + (back-to-indentation) + (looking-at "\\<then\\>")) + (setq cur-indent (save-excursion (back-to-indentation) (point)))) + ;; skip 'then' + (forward-word 1) + (list cur-indent 'ada-indent)) (list cur-indent 'ada-broken-indent)))) @@ -2973,11 +2978,11 @@ (let ((pos nil)) (cond ((save-excursion - (forward-word 1) - (setq pos (ada-goto-next-non-ws orgpoint))) + (forward-word 1) + (setq pos (ada-goto-next-non-ws orgpoint))) (goto-char pos) (save-excursion - (ada-indent-on-previous-lines t orgpoint))) + (ada-indent-on-previous-lines t orgpoint))) ;; Special case for record types, for instance for: ;; type A is (B : Integer; @@ -3004,27 +3009,27 @@ "Calculate the indentation when point is just before a subprogram. ORGPOINT is the limit position used in the calculation." (let ((match-cons nil) - (cur-indent (save-excursion (back-to-indentation) (point))) - (foundis nil)) + (cur-indent (save-excursion (back-to-indentation) (point))) + (foundis nil)) ;; ;; is there an 'is' in front of point ? ;; (if (save-excursion - (setq match-cons - (ada-search-ignore-string-comment - "\\<\\(is\\|do\\)\\>" nil orgpoint))) - ;; - ;; yes, then skip to its end - ;; - (progn - (setq foundis t) - (goto-char (cdr match-cons))) + (setq match-cons + (ada-search-ignore-string-comment + "\\<\\(is\\|do\\)\\>" nil orgpoint))) + ;; + ;; yes, then skip to its end + ;; + (progn + (setq foundis t) + (goto-char (cdr match-cons))) ;; ;; no, then goto next non-ws, if there is one in front of point ;; (progn - (unless (ada-goto-next-non-ws orgpoint) - (goto-char orgpoint)))) + (unless (ada-goto-next-non-ws orgpoint) + (goto-char orgpoint)))) (cond ;; @@ -3033,8 +3038,8 @@ ((and foundis (save-excursion - (not (ada-search-ignore-string-comment - "[^ \t\n]" nil orgpoint t)))) + (not (ada-search-ignore-string-comment + "[^ \t\n]" nil orgpoint t)))) (list cur-indent 'ada-indent)) ;; ;; is abstract/separate/new ... @@ -3042,10 +3047,10 @@ ((and foundis (save-excursion - (setq match-cons - (ada-search-ignore-string-comment - "\\<\\(separate\\|new\\|abstract\\)\\>" - nil orgpoint)))) + (setq match-cons + (ada-search-ignore-string-comment + "\\<\\(separate\\|new\\|abstract\\)\\>" + nil orgpoint)))) (goto-char (car match-cons)) (ada-search-ignore-string-comment ada-subprog-start-re t) (ada-get-indent-noindent orgpoint)) @@ -3061,7 +3066,7 @@ ;; no 'is' but ';' ;; ((save-excursion - (ada-search-ignore-string-comment ";" nil orgpoint nil 'search-forward)) + (ada-search-ignore-string-comment ";" nil orgpoint nil 'search-forward)) (list cur-indent 0)) ;; ;; no 'is' or ';' @@ -3082,74 +3087,74 @@ ;; subprogram declaration (in that case, we are at this point inside ;; the parameter declaration list) ((ada-in-paramlist-p) - (ada-previous-procedure) - (list (save-excursion (back-to-indentation) (point)) 0)) + (ada-previous-procedure) + (list (save-excursion (back-to-indentation) (point)) 0)) ;; This one is called when indenting the second line of a multi-line ;; declaration section, in a declare block or a record declaration ((looking-at "[ \t]*\\(\\sw\\|_\\)*[ \t]*,[ \t]*$") - (list (save-excursion (back-to-indentation) (point)) - 'ada-broken-decl-indent)) + (list (save-excursion (back-to-indentation) (point)) + 'ada-broken-decl-indent)) ;; This one is called in every over case when indenting a line at the ;; top level (t - (if (looking-at ada-named-block-re) - (setq label (- ada-label-indent)) - - (let (p) - - ;; "with private" or "null record" cases - (if (or (save-excursion - (and (ada-search-ignore-string-comment "\\<private\\>" nil orgpoint) - (setq p (point)) - (save-excursion (forward-char -7);; skip back "private" - (ada-goto-previous-word) - (looking-at "with")))) - (save-excursion - (and (ada-search-ignore-string-comment "\\<record\\>" nil orgpoint) - (setq p (point)) - (save-excursion (forward-char -6);; skip back "record" - (ada-goto-previous-word) - (looking-at "null"))))) - (progn - (goto-char p) - (re-search-backward "\\<\\(type\\|subtype\\)\\>" nil t) - (list (save-excursion (back-to-indentation) (point)) 0))))) - (if (save-excursion - (ada-search-ignore-string-comment ";" nil orgpoint nil - 'search-forward)) - (list (+ (save-excursion (back-to-indentation) (point)) label) 0) - (list (+ (save-excursion (back-to-indentation) (point)) label) - 'ada-broken-indent))))))) + (if (looking-at ada-named-block-re) + (setq label (- ada-label-indent)) + + (let (p) + + ;; "with private" or "null record" cases + (if (or (save-excursion + (and (ada-search-ignore-string-comment "\\<private\\>" nil orgpoint) + (setq p (point)) + (save-excursion (forward-char -7);; skip back "private" + (ada-goto-previous-word) + (looking-at "with")))) + (save-excursion + (and (ada-search-ignore-string-comment "\\<record\\>" nil orgpoint) + (setq p (point)) + (save-excursion (forward-char -6);; skip back "record" + (ada-goto-previous-word) + (looking-at "null"))))) + (progn + (goto-char p) + (re-search-backward "\\<\\(type\\|subtype\\)\\>" nil t) + (list (save-excursion (back-to-indentation) (point)) 0))))) + (if (save-excursion + (ada-search-ignore-string-comment ";" nil orgpoint nil + 'search-forward)) + (list (+ (save-excursion (back-to-indentation) (point)) label) 0) + (list (+ (save-excursion (back-to-indentation) (point)) label) + 'ada-broken-indent))))))) (defun ada-get-indent-label (orgpoint) "Calculate the indentation when before a label or variable declaration. ORGPOINT is the limit position used in the calculation." (let ((match-cons nil) - (cur-indent (save-excursion (back-to-indentation) (point)))) + (cur-indent (save-excursion (back-to-indentation) (point)))) (ada-search-ignore-string-comment ":" nil) (cond ;; loop label ((save-excursion - (setq match-cons (ada-search-ignore-string-comment - ada-loop-start-re nil orgpoint))) + (setq match-cons (ada-search-ignore-string-comment + ada-loop-start-re nil orgpoint))) (goto-char (car match-cons)) (ada-get-indent-loop orgpoint)) ;; declare label ((save-excursion - (setq match-cons (ada-search-ignore-string-comment - "\\<declare\\|begin\\>" nil orgpoint))) + (setq match-cons (ada-search-ignore-string-comment + "\\<declare\\|begin\\>" nil orgpoint))) (goto-char (car match-cons)) (list (save-excursion (back-to-indentation) (point)) 'ada-indent)) ;; variable declaration ((ada-in-decl-p) (if (save-excursion - (ada-search-ignore-string-comment ";" nil orgpoint)) - (list cur-indent 0) - (list cur-indent 'ada-broken-indent))) + (ada-search-ignore-string-comment ";" nil orgpoint)) + (list cur-indent 0) + (list cur-indent 'ada-broken-indent))) ;; nothing follows colon (t @@ -3159,14 +3164,14 @@ "Calculate the indentation when just before a loop or a for ... use. ORGPOINT is the limit position used in the calculation." (let ((match-cons nil) - (pos (point)) - - ;; If looking at a named block, skip the label - (label (save-excursion - (beginning-of-line) - (if (looking-at ada-named-block-re) - (- ada-label-indent) - 0)))) + (pos (point)) + + ;; If looking at a named block, skip the label + (label (save-excursion + (beginning-of-line) + (if (looking-at ada-named-block-re) + (- ada-label-indent) + 0)))) (cond @@ -3174,8 +3179,8 @@ ;; statement complete ;; ((save-excursion - (ada-search-ignore-string-comment ";" nil orgpoint nil - 'search-forward)) + (ada-search-ignore-string-comment ";" nil orgpoint nil + 'search-forward)) (list (+ (save-excursion (back-to-indentation) (point)) label) 0)) ;; ;; simple loop @@ -3183,8 +3188,8 @@ ((looking-at "loop\\>") (setq pos (ada-get-indent-block-start orgpoint)) (if (equal label 0) - pos - (list (+ (car pos) label) (cdr pos)))) + pos + (list (+ (car pos) label) (cdr pos)))) ;; ;; 'for'- loop (or also a for ... use statement) @@ -3195,21 +3200,21 @@ ;; for ... use ;; ((save-excursion - (and - (goto-char (match-end 0)) - (ada-goto-next-non-ws orgpoint) - (forward-word 1) - (if (= (char-after) ?') (forward-word 1) t) - (ada-goto-next-non-ws orgpoint) - (looking-at "\\<use\\>") - ;; - ;; check if there is a 'record' before point - ;; - (progn - (setq match-cons (ada-search-ignore-string-comment - "record" nil orgpoint nil 'word-search-forward)) - t))) - (if match-cons + (and + (goto-char (match-end 0)) + (ada-goto-next-non-ws orgpoint) + (forward-word 1) + (if (= (char-after) ?') (forward-word 1) t) + (ada-goto-next-non-ws orgpoint) + (looking-at "\\<use\\>") + ;; + ;; check if there is a 'record' before point + ;; + (progn + (setq match-cons (ada-search-ignore-string-comment + "record" nil orgpoint nil 'word-search-forward)) + t))) + (if match-cons (progn (goto-char (car match-cons)) (list (save-excursion (back-to-indentation) (point)) 'ada-indent)) @@ -3220,25 +3225,25 @@ ;; for..loop ;; ((save-excursion - (setq match-cons (ada-search-ignore-string-comment - "loop" nil orgpoint nil 'word-search-forward))) - (goto-char (car match-cons)) - ;; - ;; indent according to 'loop', if it's first in the line; - ;; otherwise to 'for' - ;; - (unless (save-excursion - (back-to-indentation) - (looking-at "\\<loop\\>")) - (goto-char pos)) - (list (+ (save-excursion (back-to-indentation) (point)) label) - 'ada-indent)) + (setq match-cons (ada-search-ignore-string-comment + "loop" nil orgpoint nil 'word-search-forward))) + (goto-char (car match-cons)) + ;; + ;; indent according to 'loop', if it's first in the line; + ;; otherwise to 'for' + ;; + (unless (save-excursion + (back-to-indentation) + (looking-at "\\<loop\\>")) + (goto-char pos)) + (list (+ (save-excursion (back-to-indentation) (point)) label) + 'ada-indent)) ;; ;; for-statement is broken ;; (t - (list (+ (save-excursion (back-to-indentation) (point)) label) - 'ada-broken-indent)))) + (list (+ (save-excursion (back-to-indentation) (point)) label) + 'ada-broken-indent)))) ;; ;; 'while'-loop @@ -3248,24 +3253,24 @@ ;; while..loop ? ;; (if (save-excursion - (setq match-cons (ada-search-ignore-string-comment - "loop" nil orgpoint nil 'word-search-forward))) - - (progn - (goto-char (car match-cons)) - ;; - ;; indent according to 'loop', if it's first in the line; - ;; otherwise to 'while'. - ;; - (unless (save-excursion - (back-to-indentation) - (looking-at "\\<loop\\>")) - (goto-char pos)) - (list (+ (save-excursion (back-to-indentation) (point)) label) - 'ada-indent)) - - (list (+ (save-excursion (back-to-indentation) (point)) label) - 'ada-broken-indent)))))) + (setq match-cons (ada-search-ignore-string-comment + "loop" nil orgpoint nil 'word-search-forward))) + + (progn + (goto-char (car match-cons)) + ;; + ;; indent according to 'loop', if it's first in the line; + ;; otherwise to 'while'. + ;; + (unless (save-excursion + (back-to-indentation) + (looking-at "\\<loop\\>")) + (goto-char pos)) + (list (+ (save-excursion (back-to-indentation) (point)) label) + 'ada-indent)) + + (list (+ (save-excursion (back-to-indentation) (point)) label) + 'ada-broken-indent)))))) (defun ada-get-indent-type (orgpoint) "Calculate the indentation when before a type statement. @@ -3276,46 +3281,46 @@ ;; complete record declaration ;; ((save-excursion - (and - (setq match-dat (ada-search-ignore-string-comment - "end" nil orgpoint nil 'word-search-forward)) - (ada-goto-next-non-ws) - (looking-at "\\<record\\>") - (forward-word 1) - (ada-goto-next-non-ws) - (= (char-after) ?\;))) + (and + (setq match-dat (ada-search-ignore-string-comment + "end" nil orgpoint nil 'word-search-forward)) + (ada-goto-next-non-ws) + (looking-at "\\<record\\>") + (forward-word 1) + (ada-goto-next-non-ws) + (= (char-after) ?\;))) (goto-char (car match-dat)) (list (save-excursion (back-to-indentation) (point)) 0)) ;; ;; record type ;; ((save-excursion - (setq match-dat (ada-search-ignore-string-comment - "record" nil orgpoint nil 'word-search-forward))) + (setq match-dat (ada-search-ignore-string-comment + "record" nil orgpoint nil 'word-search-forward))) (goto-char (car match-dat)) (list (save-excursion (back-to-indentation) (point)) 'ada-indent)) ;; ;; complete type declaration ;; ((save-excursion - (ada-search-ignore-string-comment ";" nil orgpoint nil - 'search-forward)) + (ada-search-ignore-string-comment ";" nil orgpoint nil + 'search-forward)) (list (save-excursion (back-to-indentation) (point)) 0)) ;; ;; "type ... is", but not "type ... is ...", which is broken ;; ((save-excursion - (and - (ada-search-ignore-string-comment "is" nil orgpoint nil - 'word-search-forward) - (not (ada-goto-next-non-ws orgpoint)))) + (and + (ada-search-ignore-string-comment "is" nil orgpoint nil + 'word-search-forward) + (not (ada-goto-next-non-ws orgpoint)))) (list (save-excursion (back-to-indentation) (point)) 'ada-broken-indent)) ;; ;; broken statement ;; (t (list (save-excursion (back-to-indentation) (point)) - 'ada-broken-indent))))) + 'ada-broken-indent))))) ;; ----------------------------------------------------------- @@ -3328,7 +3333,7 @@ As a special case, if we are looking at a closing parenthesis, skip to the open parenthesis." (let ((match-dat nil) - (orgpoint (point))) + (orgpoint (point))) (setq match-dat (ada-search-prev-end-stmt)) (if match-dat @@ -3373,14 +3378,14 @@ Return a cons cell whose car is the beginning and whose cdr is the end of the match." (let ((match-dat nil) - (found nil)) + (found nil)) ;; search until found or beginning-of-buffer (while - (and - (not found) - (setq match-dat (ada-search-ignore-string-comment - ada-end-stmt-re t))) + (and + (not found) + (setq match-dat (ada-search-ignore-string-comment + ada-end-stmt-re t))) (goto-char (car match-dat)) (unless (ada-in-open-paren-p) @@ -3395,27 +3400,27 @@ ((looking-at "is") (setq found - (and (save-excursion (ada-goto-previous-word) + (and (save-excursion (ada-goto-previous-word) (ada-goto-previous-word) (not (looking-at "subtype"))) - (save-excursion (goto-char (cdr match-dat)) - (ada-goto-next-non-ws) - ;; words that can go after an 'is' - (not (looking-at - (eval-when-compile - (concat "\\<" - (regexp-opt - '("separate" "access" "array" - "abstract" "new") t) - "\\>\\|(")))))))) + (save-excursion (goto-char (cdr match-dat)) + (ada-goto-next-non-ws) + ;; words that can go after an 'is' + (not (looking-at + (eval-when-compile + (concat "\\<" + (regexp-opt + '("separate" "access" "array" + "abstract" "new") t) + "\\>\\|(")))))))) (t (setq found t)) - ))) + ))) (if found - match-dat + match-dat nil))) @@ -3426,11 +3431,11 @@ (unless limit (setq limit (point-max))) (while (and (<= (point) limit) - (progn (forward-comment 10000) - (if (and (not (eobp)) - (save-excursion (forward-char 1) - (ada-in-string-p))) - (progn (forward-sexp 1) t))))) + (progn (forward-comment 10000) + (if (and (not (eobp)) + (save-excursion (forward-char 1) + (ada-in-string-p))) + (progn (forward-sexp 1) t))))) (if (< (point) limit) (point) nil) @@ -3451,22 +3456,22 @@ If BACKWARD is non-nil, jump to the beginning of the previous word. Return the new position of point or nil if not found." (let ((match-cons nil) - (orgpoint (point)) - (old-syntax (char-to-string (char-syntax ?_)))) + (orgpoint (point)) + (old-syntax (char-to-string (char-syntax ?_)))) (modify-syntax-entry ?_ "w") (unless backward (skip-syntax-forward "w")) (if (setq match-cons - (if backward - (ada-search-ignore-string-comment "\\w" t nil t) - (ada-search-ignore-string-comment "\\w" nil nil t))) - ;; - ;; move to the beginning of the word found - ;; - (progn - (goto-char (car match-cons)) - (skip-syntax-backward "w") - (point)) + (if backward + (ada-search-ignore-string-comment "\\w" t nil t) + (ada-search-ignore-string-comment "\\w" nil nil t))) + ;; + ;; move to the beginning of the word found + ;; + (progn + (goto-char (car match-cons)) + (skip-syntax-backward "w") + (point)) ;; ;; if not found, restore old position of point ;; @@ -3491,8 +3496,8 @@ ;; named block without a `declare' (if (save-excursion - (ada-goto-previous-word) - (looking-at (concat "\\<" defun-name "\\> *:"))) + (ada-goto-previous-word) + (looking-at (concat "\\<" defun-name "\\> *:"))) t ; do nothing ;; ;; 'accept' or 'package' ? @@ -3507,27 +3512,27 @@ ;; a named 'declare'-block ? ;; (if (looking-at "\\<declare\\>") - (ada-goto-stmt-start) - ;; - ;; no, => 'procedure'/'function'/'task'/'protected' - ;; - (progn - (forward-word 2) - (backward-word 1) - ;; - ;; skip 'body' 'type' - ;; - (if (looking-at "\\<\\(body\\|type\\)\\>") - (forward-word 1)) - (forward-sexp 1) - (backward-sexp 1))) + (ada-goto-stmt-start) + ;; + ;; no, => 'procedure'/'function'/'task'/'protected' + ;; + (progn + (forward-word 2) + (backward-word 1) + ;; + ;; skip 'body' 'type' + ;; + (if (looking-at "\\<\\(body\\|type\\)\\>") + (forward-word 1)) + (forward-sexp 1) + (backward-sexp 1))) ;; ;; should be looking-at the correct name ;; (unless (looking-at (concat "\\<" defun-name "\\>")) - (error "Matching defun has different name: %s" - (buffer-substring (point) - (progn (forward-sexp 1) (point)))))))) + (error "Matching defun has different name: %s" + (buffer-substring (point) + (progn (forward-sexp 1) (point)))))))) (defun ada-goto-matching-decl-start (&optional noerror recursive) "Move point to the matching declaration start of the current 'begin'. @@ -3536,10 +3541,10 @@ ;; first should be set to t if we should stop at the first ;; "begin" we encounter. - (first (not recursive)) - (count-generic nil) + (first (not recursive)) + (count-generic nil) (stop-at-when nil) - ) + ) ;; Ignore "when" most of the time, except if we are looking at the ;; beginning of a block (structure: case .. is @@ -3547,65 +3552,65 @@ ;; begin ... ;; exception ... ) (if (looking-at "begin") - (setq stop-at-when t)) + (setq stop-at-when t)) (if (or - (looking-at "\\<\\(package\\|procedure\\|function\\)\\>") - (save-excursion - (ada-search-ignore-string-comment - "\\<\\(package\\|procedure\\|function\\|generic\\)\\>" t) - (looking-at "generic"))) - (setq count-generic t)) + (looking-at "\\<\\(package\\|procedure\\|function\\)\\>") + (save-excursion + (ada-search-ignore-string-comment + "\\<\\(package\\|procedure\\|function\\|generic\\)\\>" t) + (looking-at "generic"))) + (setq count-generic t)) ;; search backward for interesting keywords (while (and - (not (zerop nest-count)) - (ada-search-ignore-string-comment ada-matching-decl-start-re t)) + (not (zerop nest-count)) + (ada-search-ignore-string-comment ada-matching-decl-start-re t)) ;; ;; calculate nest-depth ;; (cond ;; ((looking-at "end") - (ada-goto-matching-start 1 noerror) - - ;; In some case, two begin..end block can follow each other closely, - ;; which we have to detect, as in - ;; procedure P is - ;; procedure Q is - ;; begin - ;; end; - ;; begin -- here we should go to procedure, not begin - ;; end - - (if (looking-at "begin") - (let ((loop-again t)) - (save-excursion - (while loop-again - ;; If begin was just there as the beginning of a block - ;; (with no declare) then do nothing, otherwise just - ;; register that we have to find the statement that - ;; required the begin - - (ada-search-ignore-string-comment - "\\<\\(declare\\|begin\\|end\\|procedure\\|function\\|task\\|package\\)\\>" - t) - - (if (looking-at "end") + (ada-goto-matching-start 1 noerror) + + ;; In some case, two begin..end block can follow each other closely, + ;; which we have to detect, as in + ;; procedure P is + ;; procedure Q is + ;; begin + ;; end; + ;; begin -- here we should go to procedure, not begin + ;; end + + (if (looking-at "begin") + (let ((loop-again t)) + (save-excursion + (while loop-again + ;; If begin was just there as the beginning of a block + ;; (with no declare) then do nothing, otherwise just + ;; register that we have to find the statement that + ;; required the begin + + (ada-search-ignore-string-comment + "\\<\\(declare\\|begin\\|end\\|procedure\\|function\\|task\\|package\\)\\>" + t) + + (if (looking-at "end") (ada-goto-matching-start 1 noerror t) ;; (ada-goto-matching-decl-start noerror t) - (setq loop-again nil) - (unless (looking-at "begin") - (setq nest-count (1+ nest-count)))) - )) - ))) + (setq loop-again nil) + (unless (looking-at "begin") + (setq nest-count (1+ nest-count)))) + )) + ))) ;; ((looking-at "generic") - (if count-generic - (progn - (setq first nil) - (setq nest-count (1- nest-count))))) + (if count-generic + (progn + (setq first nil) + (setq nest-count (1- nest-count))))) ;; ((looking-at "if") (save-excursion @@ -3617,49 +3622,49 @@ ;; ((looking-at "declare\\|generic") - (setq nest-count (1- nest-count)) - (setq first t)) + (setq nest-count (1- nest-count)) + (setq first t)) ;; ((looking-at "is") - ;; check if it is only a type definition, but not a protected - ;; type definition, which should be handled like a procedure. - (if (or (looking-at "is[ \t]+<>") - (save-excursion - (forward-comment -10000) - (forward-char -1) - - ;; Detect if we have a closing parenthesis (Could be - ;; either the end of subprogram parameters or (<>) - ;; in a type definition - (if (= (char-after) ?\)) - (progn - (forward-char 1) - (backward-sexp 1) - (forward-comment -10000) - )) - (skip-chars-backward "a-zA-Z0-9_.'") - (ada-goto-previous-word) - (and - (looking-at "\\<\\(sub\\)?type\\|case\\>") - (save-match-data - (ada-goto-previous-word) - (not (looking-at "\\<protected\\>")))) - )) ; end of `or' - (goto-char (match-beginning 0)) - (progn - (setq nest-count (1- nest-count)) - (setq first nil)))) + ;; check if it is only a type definition, but not a protected + ;; type definition, which should be handled like a procedure. + (if (or (looking-at "is[ \t]+<>") + (save-excursion + (forward-comment -10000) + (forward-char -1) + + ;; Detect if we have a closing parenthesis (Could be + ;; either the end of subprogram parameters or (<>) + ;; in a type definition + (if (= (char-after) ?\)) + (progn + (forward-char 1) + (backward-sexp 1) + (forward-comment -10000) + )) + (skip-chars-backward "a-zA-Z0-9_.'") + (ada-goto-previous-word) + (and + (looking-at "\\<\\(sub\\)?type\\|case\\>") + (save-match-data + (ada-goto-previous-word) + (not (looking-at "\\<protected\\>")))) + )) ; end of `or' + (goto-char (match-beginning 0)) + (progn + (setq nest-count (1- nest-count)) + (setq first nil)))) ;; ((looking-at "new") - (if (save-excursion - (ada-goto-previous-word) - (looking-at "is")) - (goto-char (match-beginning 0)))) + (if (save-excursion + (ada-goto-previous-word) + (looking-at "is")) + (goto-char (match-beginning 0)))) ;; ((and first - (looking-at "begin")) - (setq nest-count 0)) + (looking-at "begin")) + (setq nest-count 0)) ;; ((looking-at "when") (save-excursion @@ -3674,20 +3679,20 @@ (setq first nil)) ;; (t - (setq nest-count (1+ nest-count)) - (setq first nil))) + (setq nest-count (1+ nest-count)) + (setq first nil))) );; end of loop ;; check if declaration-start is really found (if (and - (zerop nest-count) - (if (looking-at "is") - (ada-search-ignore-string-comment ada-subprog-start-re t) - (looking-at "declare\\|generic"))) - t + (zerop nest-count) + (if (looking-at "is") + (ada-search-ignore-string-comment ada-subprog-start-re t) + (looking-at "declare\\|generic"))) + t (if noerror nil - (error "No matching proc/func/task/declare/package/protected"))) + (error "No matching proc/func/task/declare/package/protected"))) )) (defun ada-goto-matching-start (&optional nest-level noerror gotothen) @@ -3696,110 +3701,103 @@ If NOERROR is non-nil, it only returns nil if no matching start was found. If GOTOTHEN is non-nil, point moves to the 'then' following 'if'." (let ((nest-count (if nest-level nest-level 0)) - (found nil) - (pos nil)) - - ;; + (found nil) + (pos nil)) + ;; search backward for interesting keywords - ;; (while (and - (not found) - (ada-search-ignore-string-comment ada-matching-start-re t)) + (not found) + (ada-search-ignore-string-comment ada-matching-start-re t)) (unless (and (looking-at "\\<record\\>") - (save-excursion - (forward-word -1) - (looking-at "\\<null\\>"))) - (progn - ;; - ;; calculate nest-depth - ;; - (cond - ;; found block end => increase nest depth - ((looking-at "end") - (setq nest-count (1+ nest-count))) - - ;; found loop/select/record/case/if => check if it starts or - ;; ends a block - ((looking-at "loop\\|select\\|record\\|case\\|if") - (setq pos (point)) - (save-excursion - ;; - ;; check if keyword follows 'end' - ;; - (ada-goto-previous-word) - (if (looking-at "\\<end\\>[ \t]*[^;]") - ;; it ends a block => increase nest depth + (save-excursion + (forward-word -1) + (looking-at "\\<null\\>"))) + (progn + ;; calculate nest-depth + (cond + ;; found block end => increase nest depth + ((looking-at "end") + (setq nest-count (1+ nest-count))) + + ;; found loop/select/record/case/if => check if it starts or + ;; ends a block + ((looking-at "loop\\|select\\|record\\|case\\|if") + (setq pos (point)) + (save-excursion + ;; check if keyword follows 'end' + (ada-goto-previous-word) + (if (looking-at "\\<end\\>[ \t]*[^;]") + ;; it ends a block => increase nest depth (setq nest-count (1+ nest-count) pos (point)) - ;; it starts a block => decrease nest depth - (setq nest-count (1- nest-count)))) - (goto-char pos)) - - ;; found package start => check if it really is a block - ((looking-at "package") - (save-excursion - ;; ignore if this is just a renames statement - (let ((current (point)) - (pos (ada-search-ignore-string-comment - "\\<\\(is\\|renames\\|;\\)\\>" nil))) - (if pos - (goto-char (car pos)) - (error (concat - "No matching 'is' or 'renames' for 'package' at" - " line " - (number-to-string (count-lines 1 (1+ current))))))) - (unless (looking-at "renames") - (progn - (forward-word 1) - (ada-goto-next-non-ws) - ;; ignore it if it is only a declaration with 'new' + ;; it starts a block => decrease nest depth + (setq nest-count (1- nest-count)))) + (goto-char pos)) + + ;; found package start => check if it really is a block + ((looking-at "package") + (save-excursion + ;; ignore if this is just a renames statement + (let ((current (point)) + (pos (ada-search-ignore-string-comment + "\\<\\(is\\|renames\\|;\\)\\>" nil))) + (if pos + (goto-char (car pos)) + (error (concat + "No matching 'is' or 'renames' for 'package' at" + " line " + (number-to-string (count-lines 1 (1+ current))))))) + (unless (looking-at "renames") + (progn + (forward-word 1) + (ada-goto-next-non-ws) + ;; ignore it if it is only a declaration with 'new' ;; We could have package Foo is new .... ;; or package Foo is separate; ;; or package Foo is begin null; end Foo ;; for elaboration code (elaboration) - (if (not (looking-at "\\<\\(new\\|separate\\|begin\\)\\>")) - (setq nest-count (1- nest-count))))))) - ;; found task start => check if it has a body - ((looking-at "task") - (save-excursion - (forward-word 1) - (ada-goto-next-non-ws) - (cond - ((looking-at "\\<body\\>")) - ((looking-at "\\<type\\>") - ;; In that case, do nothing if there is a "is" - (forward-word 2);; skip "type" - (ada-goto-next-non-ws);; skip type name - - ;; Do nothing if we are simply looking at a simple - ;; "task type name;" statement with no block - (unless (looking-at ";") - (progn - ;; Skip the parameters - (if (looking-at "(") - (ada-search-ignore-string-comment ")" nil)) - (let ((tmp (ada-search-ignore-string-comment - "\\<\\(is\\|;\\)\\>" nil))) - (if tmp - (progn - (goto-char (car tmp)) - (if (looking-at "is") - (setq nest-count (1- nest-count))))))))) - (t - ;; Check if that task declaration had a block attached to - ;; it (i.e do nothing if we have just "task name;") - (unless (progn (forward-word 1) - (looking-at "[ \t]*;")) - (setq nest-count (1- nest-count))))))) - ;; all the other block starts - (t - (setq nest-count (1- nest-count)))) ; end of 'cond' - - ;; match is found, if nest-depth is zero - ;; - (setq found (zerop nest-count))))) ; end of loop + (if (not (looking-at "\\<\\(new\\|separate\\|begin\\)\\>")) + (setq nest-count (1- nest-count))))))) + ;; found task start => check if it has a body + ((looking-at "task") + (save-excursion + (forward-word 1) + (ada-goto-next-non-ws) + (cond + ((looking-at "\\<body\\>")) + ((looking-at "\\<type\\>") + ;; In that case, do nothing if there is a "is" + (forward-word 2);; skip "type" + (ada-goto-next-non-ws);; skip type name + + ;; Do nothing if we are simply looking at a simple + ;; "task type name;" statement with no block + (unless (looking-at ";") + (progn + ;; Skip the parameters + (if (looking-at "(") + (ada-search-ignore-string-comment ")" nil)) + (let ((tmp (ada-search-ignore-string-comment + "\\<\\(is\\|;\\)\\>" nil))) + (if tmp + (progn + (goto-char (car tmp)) + (if (looking-at "is") + (setq nest-count (1- nest-count))))))))) + (t + ;; Check if that task declaration had a block attached to + ;; it (i.e do nothing if we have just "task name;") + (unless (progn (forward-word 1) + (looking-at "[ \t]*;")) + (setq nest-count (1- nest-count))))))) + ;; all the other block starts + (t + (setq nest-count (1- nest-count)))) ; end of 'cond' + + ;; match is found, if nest-depth is zero + (setq found (zerop nest-count))))) ; end of loop (if (bobp) (point) @@ -3841,7 +3839,7 @@ (defun ada-goto-matching-end (&optional nest-level noerror) "Move point to the end of a block. Which block depends on the value of NEST-LEVEL, which defaults to zero. -If NOERROR is non-nil, it only returns nil if found no matching start." +If NOERROR is non-nil, it only returns nil if no matching start found." (let ((nest-count (or nest-level 0)) (regex (eval-when-compile (concat "\\<" @@ -3850,7 +3848,7 @@ "procedure" "function") t) "\\>"))) found - pos + pos ;; First is used for subprograms: they are generally handled ;; recursively, but of course we do not want to do that the @@ -3868,8 +3866,8 @@ ;; search forward for interesting keywords ;; (while (and - (not found) - (ada-search-ignore-string-comment regex nil)) + (not found) + (ada-search-ignore-string-comment regex nil)) ;; ;; calculate nest-depth @@ -3907,9 +3905,9 @@ ;; found block end => decrease nest depth ((looking-at "\\<end\\>") - (setq nest-count (1- nest-count) + (setq nest-count (1- nest-count) found (<= nest-count 0)) - ;; skip the following keyword + ;; skip the following keyword (if (progn (skip-chars-forward "end") (ada-goto-next-non-ws) @@ -3919,13 +3917,13 @@ ;; found package start => check if it really starts a block, and is not ;; in fact a generic instantiation for instance ((looking-at "\\<package\\>") - (ada-search-ignore-string-comment "is" nil nil nil - 'word-search-forward) - (ada-goto-next-non-ws) - ;; ignore and skip it if it is only a 'new' package - (if (looking-at "\\<new\\>") - (goto-char (match-end 0)) - (setq nest-count (1+ nest-count) + (ada-search-ignore-string-comment "is" nil nil nil + 'word-search-forward) + (ada-goto-next-non-ws) + ;; ignore and skip it if it is only a 'new' package + (if (looking-at "\\<new\\>") + (goto-char (match-end 0)) + (setq nest-count (1+ nest-count) found (<= nest-count 0)))) ;; all the other block starts @@ -3933,34 +3931,35 @@ (if (not first) (setq nest-count (1+ nest-count))) (setq found (<= nest-count 0)) - (forward-word 1))) ; end of 'cond' + (forward-word 1))) ; end of 'cond' (setq first nil)) (if found - t + t (if noerror - nil - (error "No matching end"))) + nil + (error "No matching end"))) )) (defun ada-search-ignore-string-comment (search-re &optional backward limit paramlists search-func) "Regexp-search for SEARCH-RE, ignoring comments, strings. -If PARAMLISTS is nil, ignore parameter lists. Returns a cons cell of -begin and end of match data or nil, if not found. -The search is done using SEARCH-FUNC, which should search backward if -BACKWARD is non-nil, forward otherwise. SEARCH-FUNC can be optimized +Returns a cons cell of begin and end of match data or nil, if not found. +If BACKWARD is non-nil, search backward; search forward otherwise. +The search stops at pos LIMIT. +If PARAMLISTS is nil, ignore parameter lists. +The search is done using SEARCH-FUNC. SEARCH-FUNC can be optimized in case we are searching for a constant string. -The search stops at pos LIMIT. Point is moved at the beginning of the SEARCH-RE." (let (found - begin - end - parse-result - (previous-syntax-table (syntax-table))) - + begin + end + parse-result + (previous-syntax-table (syntax-table))) + + ;; FIXME: need to pass BACKWARD to search-func! (unless search-func (setq search-func (if backward 're-search-backward 're-search-forward))) @@ -3970,68 +3969,68 @@ ;; (set-syntax-table ada-mode-symbol-syntax-table) (while (and (not found) - (or (not limit) - (or (and backward (<= limit (point))) - (>= limit (point)))) - (funcall search-func search-re limit 1)) + (or (not limit) + (or (and backward (<= limit (point))) + (>= limit (point)))) + (funcall search-func search-re limit 1)) (setq begin (match-beginning 0)) (setq end (match-end 0)) (setq parse-result (parse-partial-sexp - (save-excursion (beginning-of-line) (point)) - (point))) + (save-excursion (beginning-of-line) (point)) + (point))) (cond ;; ;; If inside a string, skip it (and the following comments) ;; ((ada-in-string-p parse-result) - (if (featurep 'xemacs) - (search-backward "\"" nil t) - (goto-char (nth 8 parse-result))) - (unless backward (forward-sexp 1))) + (if (featurep 'xemacs) + (search-backward "\"" nil t) + (goto-char (nth 8 parse-result))) + (unless backward (forward-sexp 1))) ;; ;; If inside a comment, skip it (and the following comments) ;; There is a special code for comments at the end of the file ;; ((ada-in-comment-p parse-result) - (if (featurep 'xemacs) - (progn - (forward-line 1) - (beginning-of-line) - (forward-comment -1)) - (goto-char (nth 8 parse-result))) - (unless backward - ;; at the end of the file, it is not possible to skip a comment - ;; so we just go at the end of the line - (if (forward-comment 1) - (progn - (forward-comment 1000) - (beginning-of-line)) - (end-of-line)))) + (if (featurep 'xemacs) + (progn + (forward-line 1) + (beginning-of-line) + (forward-comment -1)) + (goto-char (nth 8 parse-result))) + (unless backward + ;; at the end of the file, it is not possible to skip a comment + ;; so we just go at the end of the line + (if (forward-comment 1) + (progn + (forward-comment 1000) + (beginning-of-line)) + (end-of-line)))) ;; ;; directly in front of a comment => skip it, if searching forward ;; ((and (= (char-after begin) ?-) (= (char-after (1+ begin)) ?-)) - (unless backward (progn (forward-char -1) (forward-comment 1000)))) + (unless backward (progn (forward-char -1) (forward-comment 1000)))) ;; ;; found a parameter-list but should ignore it => skip it ;; ((and (not paramlists) (ada-in-paramlist-p)) - (if backward - (search-backward "(" nil t) - (search-forward ")" nil t))) + (if backward + (search-backward "(" nil t) + (search-forward ")" nil t))) ;; ;; found what we were looking for ;; (t - (setq found t)))) ; end of loop + (setq found t)))) ; end of loop (set-syntax-table previous-syntax-table) (if found - (cons begin end) + (cons begin end) nil))) ;; ------------------------------------------------------- @@ -4043,26 +4042,26 @@ Assumes point to be at the end of a statement." (or (ada-in-paramlist-p) (save-excursion - (ada-goto-matching-decl-start t)))) + (ada-goto-matching-decl-start t)))) (defun ada-looking-at-semi-or () "Return t if looking at an 'or' following a semicolon." (save-excursion (and (looking-at "\\<or\\>") - (progn - (forward-word 1) - (ada-goto-stmt-start) - (looking-at "\\<or\\>"))))) + (progn + (forward-word 1) + (ada-goto-stmt-start) + (looking-at "\\<or\\>"))))) (defun ada-looking-at-semi-private () "Return t if looking at the start of a private section in a package. -Returns nil if the private is part of the package name, as in +Return nil if the private is part of the package name, as in 'private package A is...' (this can only happen at top level)." (save-excursion (and (looking-at "\\<private\\>") - (not (looking-at "\\<private[ \t]*\\(package\\|generic\\)")) + (not (looking-at "\\<private[ \t]*\\(package\\|generic\\)")) ;; Make sure this is the start of a private section (ie after ;; a semicolon or just after the package declaration, but not @@ -4093,8 +4092,8 @@ (progn (skip-chars-backward " \t\n") (if (= (char-before) ?\") - (backward-char 3) - (backward-word 1)) + (backward-char 3) + (backward-word 1)) t) ;; and now over the second one @@ -4111,17 +4110,17 @@ ;; right keyword two words before parenthesis ? ;; Type is in this list because of discriminants (looking-at (eval-when-compile - (concat "\\<\\(" - "procedure\\|function\\|body\\|" - "task\\|entry\\|accept\\|" - "access[ \t]+procedure\\|" - "access[ \t]+function\\|" - "pragma\\|" - "type\\)\\>")))))) + (concat "\\<\\(" + "procedure\\|function\\|body\\|" + "task\\|entry\\|accept\\|" + "access[ \t]+procedure\\|" + "access[ \t]+function\\|" + "pragma\\|" + "type\\)\\>")))))) (defun ada-search-ignore-complex-boolean (regexp backwardp) - "Like `ada-search-ignore-string-comment', except that it also ignores -boolean expressions 'and then' and 'or else'." + "Search for REGEXP, ignoring comments, strings, 'and then', 'or else'. +If BACKWARDP is non-nil, search backward; search forward otherwise." (let (result) (while (and (setq result (ada-search-ignore-string-comment regexp backwardp)) (save-excursion (forward-word -1) @@ -4129,19 +4128,20 @@ result)) (defun ada-in-open-paren-p () - "Return the position of the first non-ws behind the last unclosed + "Non-nil if in an open parenthesis. +Return value is the position of the first non-ws behind the last unclosed parenthesis, or nil." (save-excursion (let ((parse (parse-partial-sexp - (point) - (or (car (ada-search-ignore-complex-boolean - "\\<\\(;\\|is\\|then\\|loop\\|begin\\|else\\)\\>" - t)) - (point-min))))) + (point) + (or (car (ada-search-ignore-complex-boolean + "\\<\\(;\\|is\\|then\\|loop\\|begin\\|else\\)\\>" + t)) + (point-min))))) (if (nth 1 parse) - (progn - (goto-char (1+ (nth 1 parse))) + (progn + (goto-char (1+ (nth 1 parse))) ;; Skip blanks, if they are not followed by a comment ;; See: @@ -4152,9 +4152,9 @@ (if (or (not ada-indent-handle-comment-special) (not (looking-at "[ \t]+--"))) - (skip-chars-forward " \t")) - - (point)))))) + (skip-chars-forward " \t")) + + (point)))))) ;; ----------------------------------------------------------- @@ -4167,20 +4167,21 @@ of the region. Otherwise, operate only on the current line." (interactive) (cond ((eq ada-tab-policy 'indent-rigidly) (ada-tab-hard)) - ((eq ada-tab-policy 'indent-auto) + ((eq ada-tab-policy 'indent-auto) (if (ada-region-selected) - (ada-indent-region (region-beginning) (region-end)) - (ada-indent-current))) - ((eq ada-tab-policy 'always-tab) (error "Not implemented")) - )) + (ada-indent-region (region-beginning) (region-end)) + (ada-indent-current))) + ((eq ada-tab-policy 'always-tab) (error "Not implemented")) + )) (defun ada-untab (arg) "Delete leading indenting according to `ada-tab-policy'." + ;; FIXME: ARG is ignored (interactive "P") (cond ((eq ada-tab-policy 'indent-rigidly) (ada-untab-hard)) - ((eq ada-tab-policy 'indent-auto) (error "Not implemented")) - ((eq ada-tab-policy 'always-tab) (error "Not implemented")) - )) + ((eq ada-tab-policy 'indent-auto) (error "Not implemented")) + ((eq ada-tab-policy 'always-tab) (error "Not implemented")) + )) (defun ada-indent-current-function () "Ada mode version of the `indent-line-function'." @@ -4189,7 +4190,7 @@ (beginning-of-line) (ada-tab) (if (< (point) starting-point) - (goto-char starting-point)) + (goto-char starting-point)) (set-marker starting-point nil) )) @@ -4205,9 +4206,9 @@ (defun ada-untab-hard () "Indent current line to previous tab stop." (interactive) - (let ((bol (save-excursion (progn (beginning-of-line) (point)))) - (eol (save-excursion (progn (end-of-line) (point))))) - (indent-rigidly bol eol (- 0 ada-indent)))) + (let ((bol (save-excursion (progn (beginning-of-line) (point)))) + (eol (save-excursion (progn (end-of-line) (point))))) + (indent-rigidly bol eol (- 0 ada-indent)))) @@ -4217,16 +4218,16 @@ ;; Not needed any more for Emacs 21.2, but still needed for backward ;; compatibility -(defun ada-remove-trailing-spaces () +(defun ada-remove-trailing-spaces () "Remove trailing spaces in the whole buffer." (interactive) (save-match-data (save-excursion (save-restriction - (widen) - (goto-char (point-min)) - (while (re-search-forward "[ \t]+$" (point-max) t) - (replace-match "" nil nil)))))) + (widen) + (goto-char (point-min)) + (while (re-search-forward "[ \t]+$" (point-max) t) + (replace-match "" nil nil)))))) (defun ada-gnat-style () "Clean up comments, `(' and `,' for GNAT style checking switch." @@ -4308,40 +4309,40 @@ "Move point to the matching start of the current Ada structure." (interactive) (let ((pos (point)) - (previous-syntax-table (syntax-table))) + (previous-syntax-table (syntax-table))) (unwind-protect - (progn - (set-syntax-table ada-mode-symbol-syntax-table) - - (save-excursion - ;; - ;; do nothing if in string or comment or not on 'end ...;' - ;; or if an error occurs during processing - ;; - (or - (ada-in-string-or-comment-p) - (and (progn - (or (looking-at "[ \t]*\\<end\\>") - (backward-word 1)) - (or (looking-at "[ \t]*\\<end\\>") - (backward-word 1)) - (or (looking-at "[ \t]*\\<end\\>") - (error "Not on end ...;"))) - (ada-goto-matching-start 1) - (setq pos (point)) - - ;; - ;; on 'begin' => go on, according to user option - ;; - ada-move-to-declaration - (looking-at "\\<begin\\>") - (ada-goto-matching-decl-start) - (setq pos (point)))) - - ) ; end of save-excursion - - ;; now really move to the found position - (goto-char pos)) + (progn + (set-syntax-table ada-mode-symbol-syntax-table) + + (save-excursion + ;; + ;; do nothing if in string or comment or not on 'end ...;' + ;; or if an error occurs during processing + ;; + (or + (ada-in-string-or-comment-p) + (and (progn + (or (looking-at "[ \t]*\\<end\\>") + (backward-word 1)) + (or (looking-at "[ \t]*\\<end\\>") + (backward-word 1)) + (or (looking-at "[ \t]*\\<end\\>") + (error "Not on end ...;"))) + (ada-goto-matching-start 1) + (setq pos (point)) + + ;; + ;; on 'begin' => go on, according to user option + ;; + ada-move-to-declaration + (looking-at "\\<begin\\>") + (ada-goto-matching-decl-start) + (setq pos (point)))) + + ) ; end of save-excursion + + ;; now really move to the found position + (goto-char pos)) ;; restore syntax-table (set-syntax-table previous-syntax-table)))) @@ -4352,16 +4353,16 @@ (interactive) (let ((pos (point)) decl-start - (previous-syntax-table (syntax-table))) + (previous-syntax-table (syntax-table))) (unwind-protect - (progn - (set-syntax-table ada-mode-symbol-syntax-table) - - (save-excursion - - (cond - ;; Go to the beginning of the current word, and check if we are - ;; directly on 'begin' + (progn + (set-syntax-table ada-mode-symbol-syntax-table) + + (save-excursion + + (cond + ;; Go to the beginning of the current word, and check if we are + ;; directly on 'begin' ((save-excursion (skip-syntax-backward "w") (looking-at "\\<begin\\>")) @@ -4375,31 +4376,31 @@ ((save-excursion (and (skip-syntax-backward "w") (looking-at "\\<function\\>\\|\\<procedure\\>" ) - (ada-search-ignore-string-comment "is\\|;") - (not (= (char-before) ?\;)) - )) + (ada-search-ignore-string-comment "is\\|;") + (not (= (char-before) ?\;)) + )) (skip-syntax-backward "w") (ada-goto-matching-end 0 t)) - ;; on first line of task declaration - ((save-excursion - (and (ada-goto-stmt-start) - (looking-at "\\<task\\>" ) - (forward-word 1) - (ada-goto-next-non-ws) - (looking-at "\\<body\\>"))) - (ada-search-ignore-string-comment "begin" nil nil nil - 'word-search-forward)) - ;; accept block start - ((save-excursion - (and (ada-goto-stmt-start) - (looking-at "\\<accept\\>" ))) - (ada-goto-matching-end 0)) - ;; package start - ((save-excursion + ;; on first line of task declaration + ((save-excursion + (and (ada-goto-stmt-start) + (looking-at "\\<task\\>" ) + (forward-word 1) + (ada-goto-next-non-ws) + (looking-at "\\<body\\>"))) + (ada-search-ignore-string-comment "begin" nil nil nil + 'word-search-forward)) + ;; accept block start + ((save-excursion + (and (ada-goto-stmt-start) + (looking-at "\\<accept\\>" ))) + (ada-goto-matching-end 0)) + ;; package start + ((save-excursion (setq decl-start (and (ada-goto-matching-decl-start t) (point))) - (and decl-start (looking-at "\\<package\\>"))) - (ada-goto-matching-end 1)) + (and decl-start (looking-at "\\<package\\>"))) + (ada-goto-matching-end 1)) ;; On a "declare" keyword ((save-excursion @@ -4407,19 +4408,19 @@ (looking-at "\\<declare\\>")) (ada-goto-matching-end 0 t)) - ;; inside a 'begin' ... 'end' block - (decl-start + ;; inside a 'begin' ... 'end' block + (decl-start (goto-char decl-start) (ada-goto-matching-end 0 t)) - ;; (hopefully ;-) everything else - (t - (ada-goto-matching-end 1))) - (setq pos (point)) - ) - - ;; now really move to the position found - (goto-char pos)) + ;; (hopefully ;-) everything else + (t + (ada-goto-matching-end 1))) + (setq pos (point)) + ) + + ;; now really move to the position found + (goto-char pos)) ;; restore syntax-table (set-syntax-table previous-syntax-table)))) @@ -4511,8 +4512,8 @@ ;; and activated only if the right compiler is used (if (featurep 'xemacs) (progn - (define-key ada-mode-map '(shift button3) 'ada-point-and-xref) - (define-key ada-mode-map '(control tab) 'ada-complete-identifier)) + (define-key ada-mode-map '(shift button3) 'ada-point-and-xref) + (define-key ada-mode-map '(control tab) 'ada-complete-identifier)) (define-key ada-mode-map [C-tab] 'ada-complete-identifier) (define-key ada-mode-map [S-mouse-3] 'ada-point-and-xref)) @@ -4607,15 +4608,13 @@ :included (string-match "gvd" ada-prj-default-debugger)]) ["Customize" (customize-group 'ada) :included (fboundp 'customize-group)] - ["Check file" ada-check-current (eq ada-which-compiler 'gnat)] - ["Compile file" ada-compile-current (eq ada-which-compiler 'gnat)] - ["Build" ada-compile-application - (eq ada-which-compiler 'gnat)] + ["Check file" ada-check-current t] + ["Compile file" ada-compile-current t] + ["Build" ada-compile-application t] ["Run" ada-run-application t] ["Debug" ada-gdb-application (eq ada-which-compiler 'gnat)] ["------" nil nil] ("Project" - :included (eq ada-which-compiler 'gnat) ["Load..." ada-set-default-project-file t] ["New..." ada-prj-new t] ["Edit..." ada-prj-edit t]) @@ -4678,7 +4677,7 @@ ["----" nil nil] ["Make body for subprogram" ada-make-subprogram-body t] ["-----" nil nil] - ["Narrow to subprogram" ada-narrow-to-defun t]) + ["Narrow to subprogram" ada-narrow-to-defun t]) ("Templates" :included (eq major-mode 'ada-mode) ["Header" ada-header t] @@ -4741,18 +4740,19 @@ (defadvice comment-region (before ada-uncomment-anywhere disable) (if (and arg - (listp arg) ;; a prefix with \C-u is of the form '(4), whereas - ;; \C-u 2 sets arg to '2' (fixed by S.Leake) - (string= mode-name "Ada")) + (listp arg) ;; a prefix with \C-u is of the form '(4), whereas + ;; \C-u 2 sets arg to '2' (fixed by S.Leake) + (string= mode-name "Ada")) (save-excursion - (let ((cs (concat "^[ \t]*" (regexp-quote comment-start)))) - (goto-char beg) - (while (re-search-forward cs end t) - (replace-match comment-start)) - )))) + (let ((cs (concat "^[ \t]*" (regexp-quote comment-start)))) + (goto-char beg) + (while (re-search-forward cs end t) + (replace-match comment-start)) + )))) (defun ada-uncomment-region (beg end &optional arg) - "Delete `comment-start' at the beginning of a line in the region." + "Uncomment region BEG .. END. +ARG gives number of comment characters." (interactive "r\nP") ;; This advice is not needed anymore with Emacs21. However, for older @@ -4786,18 +4786,18 @@ ;; check if inside comment or just in front a comment (if (and (not (ada-in-comment-p)) - (not (looking-at "[ \t]*--"))) + (not (looking-at "[ \t]*--"))) (error "Not inside comment")) (let* (indent from to - (opos (point-marker)) - - ;; Sets this variable to nil, otherwise it prevents - ;; fill-region-as-paragraph to work on Emacs <= 20.2 - (parse-sexp-lookup-properties nil) - - fill-prefix - (fill-column (current-fill-column))) + (opos (point-marker)) + + ;; Sets this variable to nil, otherwise it prevents + ;; fill-region-as-paragraph to work on Emacs <= 20.2 + (parse-sexp-lookup-properties nil) + + fill-prefix + (fill-column (current-fill-column))) ;; Find end of paragraph (back-to-indentation) @@ -4844,32 +4844,32 @@ (setq fill-prefix ada-fill-comment-prefix) (set-left-margin from to indent) (if postfix - (setq fill-column (- fill-column (length ada-fill-comment-postfix)))) + (setq fill-column (- fill-column (length ada-fill-comment-postfix)))) (fill-region-as-paragraph from to justify) ;; Add the postfixes if required (if postfix - (save-restriction - (goto-char from) - (narrow-to-region from to) - (while (not (eobp)) - (end-of-line) - (insert-char ? (- fill-column (current-column))) - (insert ada-fill-comment-postfix) - (forward-line)) - )) + (save-restriction + (goto-char from) + (narrow-to-region from to) + (while (not (eobp)) + (end-of-line) + (insert-char ? (- fill-column (current-column))) + (insert ada-fill-comment-postfix) + (forward-line)) + )) ;; In Emacs <= 20.2 and XEmacs <=20.4, there is a bug, and a newline is ;; inserted at the end. Delete it (if (or (featurep 'xemacs) - (<= emacs-major-version 19) - (and (= emacs-major-version 20) - (<= emacs-minor-version 2))) - (progn - (goto-char to) - (end-of-line) - (delete-char 1))) + (<= emacs-major-version 19) + (and (= emacs-major-version 20) + (<= emacs-minor-version 2))) + (progn + (goto-char to) + (end-of-line) + (delete-char 1))) (goto-char opos))) @@ -4890,7 +4890,8 @@ ;; Overriden when we work with GNAT, to use gnatkrunch (defun ada-make-filename-from-adaname (adaname) "Determine the filename in which ADANAME is found. -This is a generic function, independent from any compiler." +This matches the GNAT default naming convention, except for +pre-defined units." (while (string-match "\\." adaname) (setq adaname (replace-match "-" t t adaname))) (downcase adaname) @@ -4904,7 +4905,7 @@ (let ((is-spec nil) (is-body nil) (suffixes ada-spec-suffixes) - (name (buffer-file-name))) + (name (buffer-file-name))) ;; Guess whether we have a spec or a body, and get the basename of the ;; file. Since the extension may not start with '.', we can not use @@ -4962,13 +4963,13 @@ (save-excursion (end-of-line);; make sure we get the complete name (if (or (re-search-backward ada-procedure-start-regexp nil t) - (re-search-backward ada-package-start-regexp nil t)) - (setq ff-function-name (match-string 0))) + (re-search-backward ada-package-start-regexp nil t)) + (setq ff-function-name (match-string 0))) )) (defvar ada-last-which-function-line -1 - "Last on which `ada-which-function' was called.") + "Last line on which `ada-which-function' was called.") (defvar ada-last-which-function-subprog 0 "Last subprogram name returned by `ada-which-function'.") (make-variable-buffer-local 'ada-last-which-function-subprog) @@ -4982,18 +4983,18 @@ Since the search can be long, the results are cached." (let ((line (count-lines 1 (point))) - (pos (point)) - end-pos - func-name indent - found) + (pos (point)) + end-pos + func-name indent + found) ;; If this is the same line as before, simply return the same result (if (= line ada-last-which-function-line) - ada-last-which-function-subprog + ada-last-which-function-subprog (save-excursion - ;; In case the current line is also the beginning of the body - (end-of-line) + ;; In case the current line is also the beginning of the body + (end-of-line) ;; Are we looking at "function Foo\n (paramlist)" (skip-chars-forward " \t\n(") @@ -5009,39 +5010,39 @@ (skip-chars-forward " \t\n") (skip-chars-forward "a-zA-Z0-9_'"))) - ;; Can't simply do forward-word, in case the "is" is not on the - ;; same line as the closing parenthesis - (skip-chars-forward "is \t\n") - - ;; No look for the closest subprogram body that has not ended yet. - ;; Not that we expect all the bodies to be finished by "end <name>", - ;; or a simple "end;" indented in the same column as the start of + ;; Can't simply do forward-word, in case the "is" is not on the + ;; same line as the closing parenthesis + (skip-chars-forward "is \t\n") + + ;; No look for the closest subprogram body that has not ended yet. + ;; Not that we expect all the bodies to be finished by "end <name>", + ;; or a simple "end;" indented in the same column as the start of ;; the subprogram. The goal is to be as efficient as possible. - (while (and (not found) - (re-search-backward ada-imenu-subprogram-menu-re nil t)) + (while (and (not found) + (re-search-backward ada-imenu-subprogram-menu-re nil t)) ;; Get the function name, but not the properties, or this changes ;; the face in the modeline on Emacs 21 - (setq func-name (match-string-no-properties 2)) - (if (and (not (ada-in-comment-p)) - (not (save-excursion - (goto-char (match-end 0)) - (looking-at "[ \t\n]*new")))) - (save-excursion + (setq func-name (match-string-no-properties 2)) + (if (and (not (ada-in-comment-p)) + (not (save-excursion + (goto-char (match-end 0)) + (looking-at "[ \t\n]*new")))) + (save-excursion (back-to-indentation) (setq indent (current-column)) - (if (ada-search-ignore-string-comment - (concat "end[ \t]+" func-name "[ \t]*;\\|^" + (if (ada-search-ignore-string-comment + (concat "end[ \t]+" func-name "[ \t]*;\\|^" (make-string indent ? ) "end;")) - (setq end-pos (point)) - (setq end-pos (point-max))) - (if (>= end-pos pos) - (setq found func-name)))) - ) - (setq ada-last-which-function-line line - ada-last-which-function-subprog found) - found)))) + (setq end-pos (point)) + (setq end-pos (point-max))) + (if (>= end-pos pos) + (setq found func-name)))) + ) + (setq ada-last-which-function-line line + ada-last-which-function-subprog found) + found)))) (defun ada-ff-other-window () "Find other file in other window using `ff-find-other-file'." @@ -5050,19 +5051,18 @@ (ff-find-other-file t))) (defun ada-set-point-accordingly () - "Move to the function declaration that was set by -`ff-which-function-are-we-in'." + "Move to the function declaration that was set by `ff-which-function-are-we-in'." (if ff-function-name (progn - (goto-char (point-min)) - (unless (ada-search-ignore-string-comment - (concat ff-function-name "\\b") nil) - (goto-char (point-min)))))) + (goto-char (point-min)) + (unless (ada-search-ignore-string-comment + (concat ff-function-name "\\b") nil) + (goto-char (point-min)))))) (defun ada-get-body-name (&optional spec-name) "Return the file name for the body of SPEC-NAME. If SPEC-NAME is nil, return the body for the current package. -Returns nil if no body was found." +Return nil if no body was found." (interactive) (unless spec-name (setq spec-name (buffer-file-name))) @@ -5082,15 +5082,15 @@ ;; If find-file.el was available, use its functions (if (fboundp 'ff-get-file-name) (ff-get-file-name ada-search-directories-internal - (ada-make-filename-from-adaname - (file-name-nondirectory - (file-name-sans-extension spec-name))) - ada-body-suffixes) + (ada-make-filename-from-adaname + (file-name-nondirectory + (file-name-sans-extension spec-name))) + ada-body-suffixes) ;; Else emulate it very simply (concat (ada-make-filename-from-adaname - (file-name-nondirectory - (file-name-sans-extension spec-name))) - ".adb"))) + (file-name-nondirectory + (file-name-sans-extension spec-name))) + ".adb"))) ;; --------------------------------------------------- @@ -5130,44 +5130,44 @@ ;; accept, entry, function, package (body), protected (body|type), ;; pragma, procedure, task (body) plus name. (list (concat - "\\<\\(" - "accept\\|" - "entry\\|" - "function\\|" - "package[ \t]+body\\|" - "package\\|" - "pragma\\|" - "procedure\\|" - "protected[ \t]+body\\|" - "protected[ \t]+type\\|" - "protected\\|" - "task[ \t]+body\\|" - "task[ \t]+type\\|" - "task" - "\\)\\>[ \t]*" - "\\(\\sw+\\(\\.\\sw*\\)*\\)?") - '(1 font-lock-keyword-face) '(2 font-lock-function-name-face nil t)) + "\\<\\(" + "accept\\|" + "entry\\|" + "function\\|" + "package[ \t]+body\\|" + "package\\|" + "pragma\\|" + "procedure\\|" + "protected[ \t]+body\\|" + "protected[ \t]+type\\|" + "protected\\|" + "task[ \t]+body\\|" + "task[ \t]+type\\|" + "task" + "\\)\\>[ \t]*" + "\\(\\sw+\\(\\.\\sw*\\)*\\)?") + '(1 font-lock-keyword-face) '(2 font-lock-function-name-face nil t)) ;; ;; Optional keywords followed by a type name. (list (concat ; ":[ \t]*" - "\\<\\(access[ \t]+all\\|access[ \t]+constant\\|access\\|constant\\|in[ \t]+reverse\\|\\|in[ \t]+out\\|in\\|out\\)\\>" - "[ \t]*" - "\\(\\sw+\\(\\.\\sw*\\)*\\)?") - '(1 font-lock-keyword-face nil t) '(2 font-lock-type-face nil t)) + "\\<\\(access[ \t]+all\\|access[ \t]+constant\\|access\\|constant\\|in[ \t]+reverse\\|\\|in[ \t]+out\\|in\\|out\\)\\>" + "[ \t]*" + "\\(\\sw+\\(\\.\\sw*\\)*\\)?") + '(1 font-lock-keyword-face nil t) '(2 font-lock-type-face nil t)) ;; ;; Main keywords, except those treated specially below. (concat "\\<" - (regexp-opt - '("abort" "abs" "abstract" "accept" "access" "aliased" "all" - "and" "array" "at" "begin" "case" "declare" "delay" "delta" - "digits" "do" "else" "elsif" "entry" "exception" "exit" "for" - "generic" "if" "in" "is" "limited" "loop" "mod" "not" - "null" "or" "others" "private" "protected" "raise" - "range" "record" "rem" "renames" "requeue" "return" "reverse" - "select" "separate" "tagged" "task" "terminate" "then" "until" - "when" "while" "with" "xor") t) - "\\>") + (regexp-opt + '("abort" "abs" "abstract" "accept" "access" "aliased" "all" + "and" "array" "at" "begin" "case" "declare" "delay" "delta" + "digits" "do" "else" "elsif" "entry" "exception" "exit" "for" + "generic" "if" "in" "is" "limited" "loop" "mod" "not" + "null" "or" "others" "private" "protected" "raise" + "range" "record" "rem" "renames" "requeue" "return" "reverse" + "select" "separate" "tagged" "task" "terminate" "then" "until" + "when" "while" "with" "xor") t) + "\\>") ;; ;; Anything following end and not already fontified is a body name. '("\\<\\(end\\)\\>\\([ \t]+\\)?\\(\\(\\sw\\|[_.]\\)+\\)?" @@ -5175,19 +5175,19 @@ ;; ;; Keywords followed by a type or function name. (list (concat "\\<\\(" - "new\\|of\\|subtype\\|type" - "\\)\\>[ \t]*\\(\\sw+\\(\\.\\sw*\\)*\\)?[ \t]*\\((\\)?") - '(1 font-lock-keyword-face) - '(2 (if (match-beginning 4) - font-lock-function-name-face - font-lock-type-face) nil t)) + "new\\|of\\|subtype\\|type" + "\\)\\>[ \t]*\\(\\sw+\\(\\.\\sw*\\)*\\)?[ \t]*\\((\\)?") + '(1 font-lock-keyword-face) + '(2 (if (match-beginning 4) + font-lock-function-name-face + font-lock-type-face) nil t)) ;; ;; Keywords followed by a (comma separated list of) reference. ;; Note that font-lock only works on single lines, thus we can not ;; correctly highlight a with_clause that spans multiple lines. (list (concat "\\<\\(goto\\|raise\\|use\\|with\\)" - "[ \t]+\\([a-zA-Z0-9_., \t]+\\)\\W") - '(1 font-lock-keyword-face) '(2 font-lock-reference-face nil t)) + "[ \t]+\\([a-zA-Z0-9_., \t]+\\)\\W") + '(1 font-lock-keyword-face) '(2 font-lock-reference-face nil t)) ;; ;; Goto tags. @@ -5223,7 +5223,7 @@ "Make text outside current subprogram invisible. The subprogram visible is the one that contains or follow point. Optional ARG is ignored. -Use `M-x widen' to go back to the full visibility for the buffer." +Use \\[widen] to go back to the full visibility for the buffer." (interactive) (save-excursion @@ -5233,8 +5233,8 @@ (ada-previous-procedure) (save-excursion - (beginning-of-line) - (setq end (point))) + (beginning-of-line) + (setq end (point))) (ada-move-to-end) (end-of-line) @@ -5260,7 +5260,7 @@ (let (func-found procname functype) (cond ((or (looking-at "^[ \t]*procedure") - (setq func-found (looking-at "^[ \t]*function"))) + (setq func-found (looking-at "^[ \t]*function"))) ;; treat it as a proc/func (forward-word 2) (forward-word -1) @@ -5271,56 +5271,56 @@ ;; skip over parameterlist (unless (looking-at "[ \t\n]*\\(;\\|return\\)") - (forward-sexp)) + (forward-sexp)) ;; if function, skip over 'return' and result type. (if func-found - (progn - (forward-word 1) - (skip-chars-forward " \t\n") - (setq functype (buffer-substring (point) - (progn - (skip-chars-forward - "a-zA-Z0-9_\.") - (point)))))) + (progn + (forward-word 1) + (skip-chars-forward " \t\n") + (setq functype (buffer-substring (point) + (progn + (skip-chars-forward + "a-zA-Z0-9_\.") + (point)))))) ;; look for next non WS (cond ((looking-at "[ \t]*;") - (delete-region (match-beginning 0) (match-end 0));; delete the ';' - (ada-indent-newline-indent) - (insert "is") - (ada-indent-newline-indent) - (if func-found - (progn - (insert "Result : " functype ";") - (ada-indent-newline-indent))) - (insert "begin") - (ada-indent-newline-indent) - (if func-found - (insert "return Result;") - (insert "null;")) - (ada-indent-newline-indent) - (insert "end " procname ";") - (ada-indent-newline-indent) - ) + (delete-region (match-beginning 0) (match-end 0));; delete the ';' + (ada-indent-newline-indent) + (insert "is") + (ada-indent-newline-indent) + (if func-found + (progn + (insert "Result : " functype ";") + (ada-indent-newline-indent))) + (insert "begin") + (ada-indent-newline-indent) + (if func-found + (insert "return Result;") + (insert "null;")) + (ada-indent-newline-indent) + (insert "end " procname ";") + (ada-indent-newline-indent) + ) ;; else ((looking-at "[ \t\n]*is") - ;; do nothing - ) + ;; do nothing + ) ((looking-at "[ \t\n]*rename") - ;; do nothing - ) + ;; do nothing + ) (t - (message "unknown syntax")))) + (message "unknown syntax")))) (t (if (looking-at "^[ \t]*task") - (progn - (message "Task conversion is not yet implemented") - (forward-word 2) - (if (looking-at "[ \t]*;") - (forward-line) - (ada-move-to-end)) - )))))) + (progn + (message "Task conversion is not yet implemented") + (forward-word 2) + (if (looking-at "[ \t]*;") + (forward-line) + (ada-move-to-end)) + )))))) (defun ada-make-body () "Create an Ada package body in the current buffer. @@ -5335,63 +5335,63 @@ (let (found ada-procedure-or-package-start-regexp) (if (setq found - (ada-search-ignore-string-comment ada-package-start-regexp nil)) - (progn (goto-char (cdr found)) - (insert " body") - ) + (ada-search-ignore-string-comment ada-package-start-regexp nil)) + (progn (goto-char (cdr found)) + (insert " body") + ) (error "No package")) (setq ada-procedure-or-package-start-regexp - (concat ada-procedure-start-regexp - "\\|" - ada-package-start-regexp)) + (concat ada-procedure-start-regexp + "\\|" + ada-package-start-regexp)) (while (setq found - (ada-search-ignore-string-comment - ada-procedure-or-package-start-regexp nil)) + (ada-search-ignore-string-comment + ada-procedure-or-package-start-regexp nil)) (progn - (goto-char (car found)) - (if (looking-at ada-package-start-regexp) - (progn (goto-char (cdr found)) - (insert " body")) - (ada-gen-treat-proc found)))))) + (goto-char (car found)) + (if (looking-at ada-package-start-regexp) + (progn (goto-char (cdr found)) + (insert " body")) + (ada-gen-treat-proc found)))))) (defun ada-make-subprogram-body () "Make one dummy subprogram body from spec surrounding point." (interactive) (let* ((found (re-search-backward ada-procedure-start-regexp nil t)) - (spec (match-beginning 0)) - body-file) + (spec (match-beginning 0)) + body-file) (if found - (progn - (goto-char spec) - (if (and (re-search-forward "(\\|;" nil t) - (= (char-before) ?\()) - (progn - (ada-search-ignore-string-comment ")" nil) - (ada-search-ignore-string-comment ";" nil))) - (setq spec (buffer-substring spec (point))) - - ;; If find-file.el was available, use its functions - (setq body-file (ada-get-body-name)) - (if body-file - (find-file body-file) - (error "No body found for the package. Create it first")) - - (save-restriction - (widen) - (goto-char (point-max)) - (forward-comment -10000) - (re-search-backward "\\<end\\>" nil t) - ;; Move to the beginning of the elaboration part, if any - (re-search-backward "^begin" nil t) - (newline) - (forward-char -1) - (insert spec) - (re-search-backward ada-procedure-start-regexp nil t) - (ada-gen-treat-proc (cons (match-beginning 0) (match-end 0))) - )) + (progn + (goto-char spec) + (if (and (re-search-forward "(\\|;" nil t) + (= (char-before) ?\()) + (progn + (ada-search-ignore-string-comment ")" nil) + (ada-search-ignore-string-comment ";" nil))) + (setq spec (buffer-substring spec (point))) + + ;; If find-file.el was available, use its functions + (setq body-file (ada-get-body-name)) + (if body-file + (find-file body-file) + (error "No body found for the package. Create it first")) + + (save-restriction + (widen) + (goto-char (point-max)) + (forward-comment -10000) + (re-search-backward "\\<end\\>" nil t) + ;; Move to the beginning of the elaboration part, if any + (re-search-backward "^begin" nil t) + (newline) + (forward-char -1) + (insert spec) + (re-search-backward ada-procedure-start-regexp nil t) + (ada-gen-treat-proc (cons (match-beginning 0) (match-end 0))) + )) (error "Not in subprogram spec")))) ;; --------------------------------------------------------
--- a/lisp/progmodes/ada-xref.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/progmodes/ada-xref.el Mon Oct 30 08:54:41 2006 +0000 @@ -1916,8 +1916,12 @@ (set-buffer (get-buffer-create "*grep*")) (while dirs (insert (shell-command-to-string - (concat "egrep -i -h '^X|" regexp "( |$)' " - (file-name-as-directory (car dirs)) "*.ali"))) + (concat + "grep -E -i -h " + (shell-quote-argument (concat "^X|" regexp "( |$)")) + " " + (shell-quote-argument (file-name-as-directory (car dirs))) + "*.ali"))) (set 'dirs (cdr dirs))) ;; Now parse the output
--- a/lisp/progmodes/cperl-mode.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/progmodes/cperl-mode.el Mon Oct 30 08:54:41 2006 +0000 @@ -445,12 +445,8 @@ ;;; Some double-evaluation happened with font-locks... Needed with 21.2... (defvar cperl-singly-quote-face cperl-xemacs-p) -(defcustom cperl-invalid-face ; Does not customize with '' on XEmacs - (if cperl-singly-quote-face - 'underline ''underline) ; On older Emacsen was evaluated by `font-lock' - (if cperl-singly-quote-face - "*This face is used for highlighting trailing whitespace." - "*Face for highlighting trailing whitespace.") +(defcustom cperl-invalid-face 'underline + "*Face for highlighting trailing whitespace." :type 'face :version "21.1" :group 'cperl-faces) @@ -1835,7 +1831,7 @@ (if (boundp 'font-lock-multiline) ; Newer font-lock; use its facilities (progn (setq cperl-font-lock-multiline t) ; Not localized... - (set 'font-lock-multiline t)) ; not present with old Emacs; auto-local + (set (make-local-variable 'font-lock-multiline) t)) (make-local-variable 'font-lock-fontify-region-function) (set 'font-lock-fontify-region-function ; not present with old Emacs 'cperl-font-lock-fontify-region-function)) @@ -5708,19 +5704,22 @@ (defun cperl-windowed-init () "Initialization under windowed version." - (if (or (featurep 'ps-print) cperl-faces-init) - ;; Need to init anyway: - (or cperl-faces-init (cperl-init-faces)) - (add-hook 'font-lock-mode-hook - (function - (lambda () - (if (memq major-mode '(perl-mode cperl-mode)) - (progn - (or cperl-faces-init (cperl-init-faces))))))) - (if (fboundp 'eval-after-load) - (eval-after-load - "ps-print" - '(or cperl-faces-init (cperl-init-faces)))))) + (cond ((featurep 'ps-print) + (unless cperl-faces-init + (if (boundp 'font-lock-multiline) + (setq cperl-font-lock-multiline t)) + (cperl-init-faces))) + ((not cperl-faces-init) + (add-hook 'font-lock-mode-hook + (function + (lambda () + (if (memq major-mode '(perl-mode cperl-mode)) + (progn + (or cperl-faces-init (cperl-init-faces))))))) + (if (fboundp 'eval-after-load) + (eval-after-load + "ps-print" + '(or cperl-faces-init (cperl-init-faces))))))) (defvar cperl-font-lock-keywords-1 nil "Additional expressions to highlight in Perl mode. Minimal set.")
--- a/lisp/progmodes/flymake.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/progmodes/flymake.el Mon Oct 30 08:54:41 2006 +0000 @@ -1021,7 +1021,9 @@ (progn (flymake-get-project-include-dirs-from-cache basedir)) ;;else - (let* ((command-line (concat "make -C\"" basedir "\" DUMPVARS=INCLUDE_DIRS dumpvars")) + (let* ((command-line (concat "make -C " + (shell-quote-argument basedir) + " DUMPVARS=INCLUDE_DIRS dumpvars")) (output (shell-command-to-string command-line)) (lines (flymake-split-string output "\n")) (count (length lines))
--- a/lisp/progmodes/gdb-ui.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/progmodes/gdb-ui.el Mon Oct 30 08:54:41 2006 +0000 @@ -2048,7 +2048,6 @@ (or gdb-stack-position (setq gdb-stack-position (make-marker))) (set-marker gdb-stack-position (point))) - (set-marker gdb-stack-position nil) (put-text-property bl (+ bl 4) 'face '(:inverse-video t)))) (when (re-search-forward
--- a/lisp/progmodes/octave-inf.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/progmodes/octave-inf.el Mon Oct 30 08:54:41 2006 +0000 @@ -113,6 +113,9 @@ (defvar inferior-octave-complete-impossible nil "Non-nil means that `inferior-octave-complete' is impossible.") +(defvar inferior-octave-has-built-in-variables nil + "Non-nil means that Octave has built-in variables.") + (defvar inferior-octave-dynamic-complete-functions '(inferior-octave-complete comint-dynamic-complete-filename) "List of functions called to perform completion for inferior Octave. @@ -218,11 +221,20 @@ 'identity inferior-octave-output-list "\n") "\n")))) + ;; Find out whether Octave has built-in variables. + (inferior-octave-send-list-and-digest + (list "exist \"LOADPATH\"\n")) + (setq inferior-octave-has-built-in-variables + (string-match "101$" (car inferior-octave-output-list))) + ;; An empty secondary prompt, as e.g. obtained by '--braindead', ;; means trouble. (inferior-octave-send-list-and-digest (list "PS2\n")) - (if (string-match "^PS2 = *$" (car inferior-octave-output-list)) - (inferior-octave-send-list-and-digest (list "PS2 = \"> \"\n"))) + (if (string-match "\\(PS2\\|ans\\) = *$" (car inferior-octave-output-list)) + (inferior-octave-send-list-and-digest + (list (if inferior-octave-has-built-in-variables + "PS2 = \"> \"\n" + "PS2 (\"> \");\n")))) ;; O.k., now we are ready for the Inferior Octave startup commands. (let* (commands @@ -230,10 +242,12 @@ (file (or inferior-octave-startup-file (concat "~/.emacs-" program)))) (setq commands - (list "page_screen_output = 0;\n" + (list "more off;\n" (if (not (string-equal inferior-octave-output-string ">> ")) - "PS1=\"\\\\s> \";\n") + (if inferior-octave-has-built-in-variables + "PS1=\"\\\\s> \";\n" + "PS1 (\"\\\\s> \");\n")) (if (file-exists-p file) (format "source (\"%s\");\n" file)))) (inferior-octave-send-list-and-digest commands)) @@ -383,7 +397,7 @@ This command queries the inferior Octave process about its current directory and makes this the current buffer's default directory." (interactive) - (inferior-octave-send-list-and-digest '("pwd\n")) + (inferior-octave-send-list-and-digest '("disp (pwd ())\n")) (cd (car inferior-octave-output-list))) ;;; provide ourself
--- a/lisp/progmodes/python.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/progmodes/python.el Mon Oct 30 08:54:41 2006 +0000 @@ -1969,6 +1969,13 @@ ;;;; Skeletons +(defcustom python-use-skeletons nil + "Non-nil means template skeletons will be automagically inserted. +This happens when pressing \"if<SPACE>\", for example, to prompt for +the if condition." + :type 'boolean + :group 'python) + (defvar python-skeletons nil "Alist of named skeletons for Python mode. Elements are of the form (NAME . EXPANDER-FUNCTION).") @@ -1986,7 +1993,8 @@ (function (intern (concat "python-insert-" name)))) `(progn (add-to-list 'python-skeletons ',(cons name function)) - (define-abbrev python-mode-abbrev-table ,name "" ',function nil t) + (if python-use-skeletons + (define-abbrev python-mode-abbrev-table ,name "" ',function nil t)) (define-skeleton ,function ,(format "Insert Python \"%s\" template." name) ,@elements)))))
--- a/lisp/recentf.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/recentf.el Mon Oct 30 08:54:41 2006 +0000 @@ -1318,9 +1318,7 @@ Returns non-nil if the new state is enabled. When recentf mode is enabled, it maintains a menu for visiting files -that were operated on recently. - -\\{recentf-mode-map}" +that were operated on recently." :global t :group 'recentf :keymap recentf-mode-map
--- a/lisp/select.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/select.el Mon Oct 30 08:54:41 2006 +0000 @@ -152,6 +152,41 @@ ;;; Every selection type that Emacs handles is implemented this way, except ;;; for TIMESTAMP, which is a special case. +(eval-when-compile (require 'ccl)) + +(define-ccl-program ccl-check-utf-8 + '(0 + ((r0 = 1) + (loop + (read-if (r1 < #x80) (repeat) + ((r0 = 0) + (if (r1 < #xC2) (end)) + (read r2) + (if ((r2 & #xC0) != #x80) (end)) + (if (r1 < #xE0) ((r0 = 1) (repeat))) + (read r2) + (if ((r2 & #xC0) != #x80) (end)) + (if (r1 < #xF0) ((r0 = 1) (repeat))) + (read r2) + (if ((r2 & #xC0) != #x80) (end)) + (if (r1 < #xF8) ((r0 = 1) (repeat))) + (read r2) + (if ((r2 & #xC0) != #x80) (end)) + (if (r1 == #xF8) ((r0 = 1) (repeat))) + (end)))))) + "Check if the input unibyte string is a valid UTF-8 sequence or not. +If it is valid, set the register `r0' to 1, else set it to 0.") + +(defun string-utf-8-p (string) + "Return non-nil iff STRING is a unibyte string of valid UTF-8 sequence." + (if (or (not (stringp string)) + (multibyte-string-p string)) + (error "Not a unibyte string: %s" string)) + (let ((status (make-vector 9 0))) + (ccl-execute-on-string ccl-check-utf-8 status string) + (= (aref status 0) 1))) + + (defun xselect-convert-to-string (selection type value) (let (str coding) ;; Get the actual string from VALUE. @@ -223,11 +258,10 @@ (setq str (encode-coding-string str coding)))) ((eq type 'UTF8_STRING) - (let ((charsets (find-charset-string str))) - (if (or (memq 'eight-bit-control charsets) - (memq 'eight-bit-graphic charsets)) - (setq type 'STRING) - (setq str (encode-coding-string str 'utf-8))))) + (if (multibyte-string-p str) + (setq str (encode-coding-string str 'utf-8))) + (if (not (string-utf-8-p str)) + (setq str nil))) ;; Decline request as we don't have UTF-8 data. (t (error "Unknow selection type: %S" type)) )))
--- a/lisp/shell.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/shell.el Mon Oct 30 08:54:41 2006 +0000 @@ -298,7 +298,9 @@ (equal name "bash") (file-executable-p prog) (string-match "bad option" - (shell-command-to-string (concat prog " --noediting")))) + (shell-command-to-string + (concat (shell-quote-argument prog) + " --noediting")))) '("-i") '("--noediting" "-i"))) "Args passed to inferior shell by \\[shell], if the shell is bash.
--- a/lisp/simple.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/simple.el Mon Oct 30 08:54:41 2006 +0000 @@ -997,12 +997,11 @@ (single-key-description char)) encoding-msg pos total percent col hscroll)))))) -(defvar read-expression-map - (let ((m (make-sparse-keymap))) - (define-key m "\M-\t" 'lisp-complete-symbol) - (set-keymap-parent m minibuffer-local-map) - m) - "Minibuffer keymap used for reading Lisp expressions.") +;; Initialize read-expression-map. It is defined at C level. +(let ((m (make-sparse-keymap))) + (define-key m "\M-\t" 'lisp-complete-symbol) + (set-keymap-parent m minibuffer-local-map) + (setq read-expression-map m)) (defvar read-expression-history nil) @@ -3625,7 +3624,14 @@ ;; The logic of this is the same as the loop above, ;; it just goes in the other direction. (while (and (< arg 0) (not done)) - (beginning-of-line) + ;; For completely consistency with the forward-motion + ;; case, we should call beginning-of-line here. + ;; However, if point is inside a field and on a + ;; continued line, the call to (vertical-motion -1) + ;; below won't move us back far enough; then we return + ;; to the same column in line-move-finish, and point + ;; gets stuck -- cyd + (forward-line 0) (cond ((bobp) (if (not noerror)
--- a/lisp/subr.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/subr.el Mon Oct 30 08:54:41 2006 +0000 @@ -1100,13 +1100,19 @@ into a hook function that will be run only after loading the package. `eval-after-load' provides one way to do this. In some cases other hooks, such as major mode hooks, can do the job." - (if (if compare-fn - (let (present) - (dolist (elt (symbol-value list-var)) - (if (funcall compare-fn element elt) - (setq present t))) - present) + (if (cond + ((null compare-fn) (member element (symbol-value list-var))) + ((eq compare-fn 'eq) + (memq element (symbol-value list-var))) + ((eq compare-fn 'eql) + (memql element (symbol-value list-var))) + (t + (let (present) + (dolist (elt (symbol-value list-var)) + (if (funcall compare-fn element elt) + (setq present t))) + present))) (symbol-value list-var) (set list-var (if append @@ -1752,8 +1758,14 @@ (or nodisp (redisplay)) (let ((read (read-event nil nil seconds))) (or (null read) - (progn (push read unread-command-events) - nil)))))) + (progn + ;; If last command was a prefix arg, e.g. C-u, push this event onto + ;; unread-command-events as (t . EVENT) so it will be added to + ;; this-command-keys by read-key-sequence. + (if (eq overriding-terminal-local-map universal-argument-map) + (setq read (cons t read))) + (push read unread-command-events) + nil)))))) ;;; Atomic change groups. @@ -2195,6 +2207,12 @@ (unless (nth 2 handler) ;; NOEXCLUDE (remove-yank-excluded-properties opoint (point))) + + ;; If last inserted char has properties, mark them as rear-nonsticky. + (if (and (> end opoint) + (text-properties-at (1- end))) + (put-text-property (1- end) end 'rear-nonsticky t)) + (if (eq yank-undo-function t) ;; not set by FUNCTION (setq yank-undo-function (nth 3 handler))) ;; UNDO (if (nth 4 handler) ;; COMMAND
--- a/lisp/term/mac-win.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/term/mac-win.el Mon Oct 30 08:54:41 2006 +0000 @@ -2398,12 +2398,15 @@ (cons '(user-size . t) parsed)))) ;; All geometry parms apply to the initial frame. (setq initial-frame-alist (append initial-frame-alist parsed)) - ;; The size parms apply to all frames. - (if (assq 'height parsed) + ;; The size parms apply to all frames. Don't set it if there are + ;; sizes there already (from command line). + (if (and (assq 'height parsed) + (not (assq 'height default-frame-alist))) (setq default-frame-alist (cons (cons 'height (cdr (assq 'height parsed))) default-frame-alist))) - (if (assq 'width parsed) + (if (and (assq 'width parsed) + (not (assq 'width default-frame-alist))) (setq default-frame-alist (cons (cons 'width (cdr (assq 'width parsed))) default-frame-alist))))))
--- a/lisp/term/w32-win.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/term/w32-win.el Mon Oct 30 08:54:41 2006 +0000 @@ -208,7 +208,7 @@ (setq x-invocation-args (cdr x-invocation-args)))) (defun x-handle-name-switch (switch) - "Handle a \"-name\" SWITCH." + "Handle the \"-name\" SWITCH." ;; Handle the -name option. Set the variable x-resource-name ;; to the option's operand; set the name of the initial frame, too. (or (consp x-invocation-args) @@ -1091,7 +1091,7 @@ European languages which are distributed with Windows as \"Multilanguage Support\". -See the documentation of `create-fontset-from-fontset-spec for the format.") +See the documentation of `create-fontset-from-fontset-spec' for the format.") ;; Conditional on new-fontset so bootstrapping works on non-GUI compiles (if (fboundp 'new-fontset)
--- a/lisp/term/x-win.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/term/x-win.el Mon Oct 30 08:54:41 2006 +0000 @@ -2427,12 +2427,15 @@ (cons '(user-size . t) parsed)))) ;; All geometry parms apply to the initial frame. (setq initial-frame-alist (append initial-frame-alist parsed)) - ;; The size parms apply to all frames. - (if (assq 'height parsed) + ;; The size parms apply to all frames. Don't set it if there are + ;; sizes there already (from command line). + (if (and (assq 'height parsed) + (not (assq 'height default-frame-alist))) (setq default-frame-alist (cons (cons 'height (cdr (assq 'height parsed))) default-frame-alist))) - (if (assq 'width parsed) + (if (and (assq 'width parsed) + (not (assq 'width default-frame-alist))) (setq default-frame-alist (cons (cons 'width (cdr (assq 'width parsed))) default-frame-alist))))))
--- a/lisp/textmodes/flyspell.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/textmodes/flyspell.el Mon Oct 30 08:54:41 2006 +0000 @@ -959,6 +959,7 @@ (defun flyspell-word-search-backward (word bound) (save-excursion (let ((r '()) + (inhibit-point-motion-hooks t) p) (while (and (not r) (setq p (search-backward word bound t))) (let ((lw (flyspell-get-word '()))) @@ -973,6 +974,7 @@ (defun flyspell-word-search-forward (word bound) (save-excursion (let ((r '()) + (inhibit-point-motion-hooks t) p) (while (and (not r) (setq p (search-forward word bound t))) (let ((lw (flyspell-get-word '()))) @@ -1009,11 +1011,14 @@ (not (memq (char-after (1- start)) '(?\} ?\\))))) flyspell-mark-duplications-flag (save-excursion - (goto-char (1- start)) - (let ((p (flyspell-word-search-backward - word - (- start (1+ (- end start)))))) - (and p (/= p (1- start)))))) + (goto-char start) + (let* ((bound + (- start + (- end start) + (- (skip-chars-backward " \t\n\f")))) + (p (when (>= bound (point-min)) + (flyspell-word-search-backward word bound)))) + (and p (/= p start))))) ;; yes, this is a doublon (flyspell-highlight-incorrect-region start end 'doublon) nil) @@ -1470,7 +1475,7 @@ (flyspell-word) ; Make sure current word is checked (backward-word 1) (while (and (< (point) end) - (re-search-forward "\\b\\([^ \n\t]+\\)[ \n\t]+\\1\\b" + (re-search-forward "\\<\\(\\w+\\)\\>[ \n\t\f]+\\1\\>" end 'move)) (flyspell-word) (backward-word 1)) @@ -1706,7 +1711,9 @@ ;; now we can use a new overlay (setq flyspell-overlay (make-flyspell-overlay - beg end 'flyspell-incorrect 'highlight))))))) + beg end + (if (eq poss 'doublon) 'flyspell-duplicate 'flyspell-incorrect) + 'highlight))))))) ;;*---------------------------------------------------------------------*/ ;;* flyspell-highlight-duplicate-region ... */
--- a/lisp/textmodes/table.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/textmodes/table.el Mon Oct 30 08:54:41 2006 +0000 @@ -614,6 +614,7 @@ ;;; Code: +(require 'regexp-opt) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;
--- a/lisp/url/ChangeLog Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/url/ChangeLog Mon Oct 30 08:54:41 2006 +0000 @@ -1,3 +1,34 @@ +2006-10-29 Magnus Henoch <mange@freemail.hu> + + * url-gw.el (url-open-stream): Really use asynchronous + connections (accidentally disabled during debugging). + +2006-10-28 Magnus Henoch <mange@freemail.hu> + + * url-http.el (url-http-parse-headers): Fix misplaced paren. + +2006-10-27 Magnus Henoch <mange@freemail.hu> + + * url-http.el (url-http-mark-connection-as-free): Verify that + connection is open before saving it. + (url-http-handle-authentication): Use url-retrieve-internal + instead of url-retrieve. + (url-http-parse-headers): Adapt to new callback interface. + (url-http): Handle non-blocking connections. + (url-http-async-sentinel): Create. + + * url.el (url-retrieve): Update docstring for new callback interface. + Remove all code. + (url-retrieve-internal): Move code from url-retrieve here. + + * url-gw.el (url-open-stream): Use a non-blocking socket for + `native' gateway method, if available. + +2006-10-16 Magnus Henoch <mange@freemail.hu> + + * url-http.el (url-https-create-secure-wrapper): Always use tls + gateway method. + 2006-10-12 Magnus Henoch <mange@freemail.hu> * url-http.el (url-http-find-free-connection): Handle
--- a/lisp/url/url-gw.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/url/url-gw.el Mon Oct 30 08:54:41 2006 +0000 @@ -210,7 +210,8 @@ (defun url-open-stream (name buffer host service) "Open a stream to HOST, possibly via a gateway. Args per `open-network-stream'. -Will not make a connection if `url-gateway-unplugged' is non-nil." +Will not make a connection if `url-gateway-unplugged' is non-nil. +Might do a non-blocking connection; use `process-status' to check." (unless url-gateway-unplugged (let ((gw-method (if (and url-gateway-local-host-regexp (not (eq 'tls url-gateway-method)) @@ -249,7 +250,11 @@ (ssl (open-ssl-stream name buffer host service)) ((native) - (open-network-stream name buffer host service)) + ;; Use non-blocking socket if we can. + (make-network-process :name name :buffer buffer + :host host :service service + :nowait + (featurep 'make-network-process '(:nowait t)))) (socks (socks-open-network-stream name buffer host service)) (telnet
--- a/lisp/url/url-http.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/url/url-http.el Mon Oct 30 08:54:41 2006 +0000 @@ -92,11 +92,12 @@ (defun url-http-mark-connection-as-free (host port proc) (url-http-debug "Marking connection as free: %s:%d %S" host port proc) - (set-process-buffer proc nil) - (set-process-sentinel proc 'url-http-idle-sentinel) - (puthash (cons host port) - (cons proc (gethash (cons host port) url-http-open-connections)) - url-http-open-connections) + (when (memq (process-status proc) '(open run)) + (set-process-buffer proc nil) + (set-process-sentinel proc 'url-http-idle-sentinel) + (puthash (cons host port) + (cons proc (gethash (cons host port) url-http-open-connections)) + url-http-open-connections)) nil) (defun url-http-find-free-connection (host port) @@ -336,8 +337,8 @@ (let ((url-request-method url-http-method) (url-request-data url-http-data) (url-request-extra-headers url-http-extra-headers)) - (url-retrieve url url-callback-function - url-callback-arguments))))))) + (url-retrieve-internal url url-callback-function + url-callback-arguments))))))) (defun url-http-parse-response () "Parse just the response code." @@ -520,18 +521,21 @@ (let ((url-request-method url-http-method) (url-request-data url-http-data) (url-request-extra-headers url-http-extra-headers)) - ;; Put in the current buffer a forwarding pointer to the new - ;; destination buffer. - ;; FIXME: This is a hack to fix url-retrieve-synchronously - ;; without changing the API. Instead url-retrieve should - ;; either simply not return the "destination" buffer, or it - ;; should take an optional `dest-buf' argument. - (set (make-local-variable 'url-redirect-buffer) - (url-retrieve redirect-uri url-callback-function - (cons :redirect - (cons redirect-uri - url-callback-arguments)))) - (url-mark-buffer-as-dead (current-buffer)))))) + ;; Remember that the request was redirected. + (setf (car url-callback-arguments) + (nconc (list :redirect redirect-uri) + (car url-callback-arguments))) + ;; Put in the current buffer a forwarding pointer to the new + ;; destination buffer. + ;; FIXME: This is a hack to fix url-retrieve-synchronously + ;; without changing the API. Instead url-retrieve should + ;; either simply not return the "destination" buffer, or it + ;; should take an optional `dest-buf' argument. + (set (make-local-variable 'url-redirect-buffer) + (url-retrieve-internal + redirect-uri url-callback-function + url-callback-arguments)) + (url-mark-buffer-as-dead (current-buffer)))))) (4 ; Client error ;; 400 Bad Request ;; 401 Unauthorized @@ -653,7 +657,13 @@ ;; The request could not be understood by the server due to ;; malformed syntax. The client SHOULD NOT repeat the ;; request without modifications. - (setq success t)))) + (setq success t))) + ;; Tell the callback that an error occurred, and what the + ;; status code was. + (when success + (setf (car url-callback-arguments) + (nconc (list :error (list 'error 'http url-http-response-status)) + (car url-callback-arguments))))) (5 ;; 500 Internal server error ;; 501 Not implemented @@ -702,7 +712,13 @@ ;; which received this status code was the result of a user ;; action, the request MUST NOT be repeated until it is ;; requested by a separate user action. - nil))) + nil)) + ;; Tell the callback that an error occurred, and what the + ;; status code was. + (when success + (setf (car url-callback-arguments) + (nconc (list :error (list 'error 'http url-http-response-status)) + (car url-callback-arguments))))) (otherwise (error "Unknown class of HTTP response code: %d (%d)" class url-http-response-status))) @@ -1089,11 +1105,38 @@ url-current-object)) (set-process-buffer connection buffer) - (set-process-sentinel connection 'url-http-end-of-document-sentinel) (set-process-filter connection 'url-http-generic-filter) - (process-send-string connection (url-http-create-request url)))) + (let ((status (process-status connection))) + (cond + ((eq status 'connect) + ;; Asynchronous connection + (set-process-sentinel connection 'url-http-async-sentinel)) + ((eq status 'failed) + ;; Asynchronous connection failed + (error "Could not create connection to %s:%d" (url-host url) + (url-port url))) + (t + (set-process-sentinel connection 'url-http-end-of-document-sentinel) + (process-send-string connection (url-http-create-request url))))))) buffer)) +(defun url-http-async-sentinel (proc why) + (declare (special url-callback-arguments)) + ;; We are performing an asynchronous connection, and a status change + ;; has occurred. + (with-current-buffer (process-buffer proc) + (cond + ((string= (substring why 0 4) "open") + (set-process-sentinel proc 'url-http-end-of-document-sentinel) + (process-send-string proc (url-http-create-request url-current-object))) + (t + (setf (car url-callback-arguments) + (nconc (list :error (list 'error 'connection-failed why + :host (url-host url-current-object) + :service (url-port url-current-object))) + (car url-callback-arguments))) + (url-http-activate-callback))))) + ;; Since Emacs 19/20 does not allow you to change the ;; `after-change-functions' hook in the midst of running them, we fake ;; an after change by hooking into the process filter and inserting @@ -1261,9 +1304,7 @@ (defmacro url-https-create-secure-wrapper (method args) `(defun ,(intern (format (if method "url-https-%s" "url-https") method)) ,args ,(format "HTTPS wrapper around `%s' call." (or method "url-http")) - (let ((url-gateway-method (condition-case () - (require 'ssl) - (error 'tls)))) + (let ((url-gateway-method 'tls)) (,(intern (format (if method "url-http-%s" "url-http") method)) ,@(remove '&rest (remove '&optional args))))))
--- a/lisp/url/url.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/url/url.el Mon Oct 30 08:54:41 2006 +0000 @@ -128,13 +128,39 @@ CALLBACK is called when the object has been completely retrieved, with the current buffer containing the object, and any MIME headers associated -with it. Normally it gets the arguments in the list CBARGS. -However, if what we find is a redirect, CALLBACK is given -two additional args, `:redirect' and the redirected URL, -followed by CBARGS. +with it. It is called as (apply CALLBACK STATUS CBARGS). +STATUS is a list with an even number of elements representing +what happened during the request, with most recent events first, +or an empty list if no events have occurred. Each pair is one of: + +\(:redirect REDIRECTED-TO) - the request was redirected to this URL +\(:error (ERROR-SYMBOL . DATA)) - an error occurred. The error can be +signaled with (signal ERROR-SYMBOL DATA). Return the buffer URL will load into, or nil if the process has -already completed." +already completed (i.e. URL was a mailto URL or similar; in this case +the callback is not called). + +The variables `url-request-data', `url-request-method' and +`url-request-extra-headers' can be dynamically bound around the +request; dynamic binding of other variables doesn't necessarily +take effect." +;;; XXX: There is code in Emacs that does dynamic binding +;;; of the following variables around url-retrieve: +;;; url-standalone-mode, url-gateway-unplugged, w3-honor-stylesheets, +;;; url-confirmation-func, url-cookie-multiple-line, +;;; url-cookie-{{,secure-}storage,confirmation} +;;; url-standalone-mode and url-gateway-unplugged should work as +;;; usual. url-confirmation-func is only used in nnwarchive.el and +;;; webmail.el; the latter should be updated. Is +;;; url-cookie-multiple-line needed anymore? The other url-cookie-* +;;; are (for now) only used in synchronous retrievals. + (url-retrieve-internal url callback (cons nil cbargs))) + +(defun url-retrieve-internal (url callback cbargs) + "Internal function; external interface is `url-retrieve'. +CBARGS is what the callback will actually receive - the first item is +the list of events, as described in the docstring of `url-retrieve'." (url-do-setup) (url-gc-dead-buffers) (if (stringp url) @@ -211,6 +237,9 @@ ;; clear that it's a bug, but even then we need to decide how ;; url-http can then warn us that the download has completed. ;; In the mean time, we use this here workaround. + ;; XXX: The callback must always be called. Any + ;; exception is a bug that should be fixed, not worked + ;; around. (setq retrieval-done t)) ;; We used to use `sit-for' here, but in some cases it wouldn't ;; work because apparently pending keyboard input would always
--- a/lisp/vc-svn.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/vc-svn.el Mon Oct 30 08:54:41 2006 +0000 @@ -125,8 +125,7 @@ ;; an `error' by vc-do-command. (error nil)))) (when (eq 0 status) - (vc-svn-parse-status t) - (eq 'SVN (vc-file-getprop file 'vc-backend))))))) + (vc-svn-parse-status file)))))) (defun vc-svn-state (file &optional localp) "SVN-specific version of `vc-state'." @@ -134,8 +133,7 @@ (with-temp-buffer (cd (file-name-directory file)) (vc-svn-command t 0 file "status" (if localp "-v" "-u")) - (vc-svn-parse-status localp) - (vc-file-getprop file 'vc-state))) + (vc-svn-parse-status file))) (defun vc-svn-state-heuristic (file) "SVN-specific state heuristic." @@ -149,7 +147,7 @@ ;; enough. Otherwise it might fail with remote repositories. (with-temp-buffer (vc-svn-command t 0 nil "status" (if localp "-v" "-u")) - (vc-svn-parse-status localp)))) + (vc-svn-parse-status)))) (defun vc-svn-workfile-version (file) "SVN-specific version of `vc-workfile-version'." @@ -488,10 +486,10 @@ ;; behavior for different modules on the same server. (match-string 1)))) -(defun vc-svn-parse-status (localp) +(defun vc-svn-parse-status (&optional filename) "Parse output of \"svn status\" command in the current buffer. -Set file properties accordingly. Unless FULL is t, parse only -essential information." +Set file properties accordingly. Unless FILENAME is non-nil, parse only +information about FILENAME and return its status." (let (file status) (goto-char (point-min)) (while (re-search-forward @@ -500,7 +498,9 @@ (buffer-substring (point) (line-end-position)))) (setq status (char-after (line-beginning-position))) (unless (eq status ??) - (vc-file-setprop file 'vc-backend 'SVN) + ;; `vc-BACKEND-registered' must not set vc-backend, + ;; which is instead set in vc-registered. + (unless filename (vc-file-setprop file 'vc-backend 'SVN)) ;; Use the last-modified revision, so that searching in vc-print-log ;; output works. (vc-file-setprop file 'vc-workfile-version (match-string 3)) @@ -522,7 +522,8 @@ (if (eq (char-after (match-beginning 1)) ?*) 'needs-merge 'edited)) - (t 'edited))))))) + (t 'edited))))) + (if filename (vc-file-getprop filename 'vc-state)))) (defun vc-svn-dir-state-heuristic (dir) "Find the SVN state of all files in DIR, using only local information."
--- a/lisp/vc.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/vc.el Mon Oct 30 08:54:41 2006 +0000 @@ -2682,25 +2682,32 @@ (error "There is no version-controlled file in this buffer")) (let ((backend (vc-backend buffer-file-name)) (backends nil)) - (unless backend - (error "File %s is not under version control" buffer-file-name)) - ;; Find the registered backends. - (dolist (backend vc-handled-backends) - (when (vc-call-backend backend 'registered buffer-file-name) - (push backend backends))) - ;; Find the next backend. - (let ((def (car (delq backend (append (memq backend backends) backends)))) - (others (delete backend backends))) - (cond - ((null others) (error "No other backend to switch to")) - (current-prefix-arg - (intern - (upcase - (completing-read - (format "Switch to backend [%s]: " def) - (mapcar (lambda (b) (list (downcase (symbol-name b)))) backends) - nil t nil nil (downcase (symbol-name def)))))) - (t def)))))) + (unwind-protect + (progn + (unless backend + (error "File %s is not under version control" buffer-file-name)) + ;; Find the registered backends. + (dolist (backend vc-handled-backends) + (when (vc-call-backend backend 'registered buffer-file-name) + (push backend backends))) + ;; Find the next backend. + (let ((def (car (delq backend + (append (memq backend backends) backends)))) + (others (delete backend backends))) + (cond + ((null others) (error "No other backend to switch to")) + (current-prefix-arg + (intern + (upcase + (completing-read + (format "Switch to backend [%s]: " def) + (mapcar (lambda (b) (list (downcase (symbol-name b)))) backends) + nil t nil nil (downcase (symbol-name def)))))) + (t def)))) + ;; Calling the `registered' method can mess up the file + ;; properties, so we want to revert them to what they were. + (if (and backend (delete backend backends)) + (vc-call-backend backend 'registered buffer-file-name)))))) (unless (eq backend (vc-backend file)) (vc-file-clearprops file) (vc-file-setprop file 'vc-backend backend)
--- a/lisp/version.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/version.el Mon Oct 30 08:54:41 2006 +0000 @@ -64,6 +64,8 @@ ((featurep 'gtk) (concat ", GTK+ Version " gtk-version-string)) ((featurep 'x-toolkit) ", X toolkit") + ((boundp 'mac-carbon-version-string) + (concat ", Carbon Version " mac-carbon-version-string)) (t "")) (if (and (boundp 'x-toolkit-scroll-bars) (memq x-toolkit-scroll-bars '(xaw xaw3d)))
--- a/lisp/window.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/window.el Mon Oct 30 08:54:41 2006 +0000 @@ -719,17 +719,25 @@ "Kill the current buffer and delete the selected window." (interactive) (let ((window-to-delete (selected-window)) + (buffer-to-kill (current-buffer)) (delete-window-hook (lambda () (condition-case nil (delete-window) (error nil))))) - (add-hook 'kill-buffer-hook delete-window-hook t t) - (if (kill-buffer (current-buffer)) - ;; If `delete-window' failed before, we rerun it to regenerate - ;; the error so it can be seen in the minibuffer. - (when (eq (selected-window) window-to-delete) - (delete-window)) - (remove-hook 'kill-buffer-hook delete-window-hook t)))) + (unwind-protect + (progn + (add-hook 'kill-buffer-hook delete-window-hook t t) + (if (kill-buffer (current-buffer)) + ;; If `delete-window' failed before, we rerun it to regenerate + ;; the error so it can be seen in the echo area. + (when (eq (selected-window) window-to-delete) + (delete-window)))) + ;; If the buffer is not dead for some reason (probably because + ;; of a `quit' signal), remove the hook again. + (condition-case nil + (with-current-buffer buffer-to-kill + (remove-hook 'kill-buffer-hook delete-window-hook t)) + (error nil))))) (defun quit-window (&optional kill window) "Quit the current buffer. Bury it, and maybe delete the selected frame.
--- a/lisp/woman.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/woman.el Mon Oct 30 08:54:41 2006 +0000 @@ -4121,7 +4121,11 @@ (eolp) (skip-syntax-forward " ") (setq woman-leave-blank-lines 1)) - (beginning-of-line) + ;; This shouldn't happen, but in case it does (e.g. for + ;; badly-formatted manfiles with no terminating newline), + ;; avoid an infinite loop. + (unless (and (eolp) (eobp)) + (beginning-of-line)) ;; If a single short line then just leave it. ;; This is necessary to preserve some table layouts. ;; PROBABLY NOT NECESSARY WITH SQUEEZE MODIFICATION !!!!!
--- a/lispintro/ChangeLog Mon Oct 30 06:52:47 2006 +0000 +++ b/lispintro/ChangeLog Mon Oct 30 08:54:41 2006 +0000 @@ -1,3 +1,10 @@ +2006-10-29 Chong Yidong <cyd@stupidchicken.com> + + * Makefile.in: Use relative paths to avoid advertising filesystem + contents during compilation. + + * makefile.w32-in: Likewise. + 2006-08-21 Robert J. Chassell <bob@rattlesnake.com> * emacs-lisp-intro.texi: deleted in directory copy of texinfo.tex
--- a/lispintro/Makefile.in Mon Oct 30 06:52:47 2006 +0000 +++ b/lispintro/Makefile.in Mon Oct 30 08:54:41 2006 +0000 @@ -25,7 +25,7 @@ srcdir = @srcdir@ VPATH = @srcdir@ -infodir = ${srcdir}/../info +infodir = ../info INFO_SOURCES = ${srcdir}/emacs-lisp-intro.texi # The file name eintr must fit within 5 characters, to allow for @@ -45,7 +45,7 @@ dvi: $(DVI_TARGETS) ${infodir}/eintr: ${INFO_SOURCES} - $(MAKEINFO) -o $@ $(srcdir)/emacs-lisp-intro.texi + cd $(srcdir); $(MAKEINFO) emacs-lisp-intro.texi -o $(infodir)/eintr emacs-lisp-intro.dvi: ${INFO_SOURCES} $(ENVADD) $(TEXI2DVI) $(srcdir)/emacs-lisp-intro.texi
--- a/lispintro/makefile.w32-in Mon Oct 30 06:52:47 2006 +0000 +++ b/lispintro/makefile.w32-in Mon Oct 30 08:54:41 2006 +0000 @@ -21,7 +21,7 @@ srcdir = . -infodir = $(srcdir)/../info +infodir = ../info INFO_SOURCES = $(srcdir)/emacs-lisp-intro.texi # The file name eintr must fit within 5 characters, to allow for @@ -46,7 +46,7 @@ dvi: $(DVI_TARGETS) $(infodir)/eintr: $(INFO_SOURCES) - $(MAKEINFO) -o $@ $(srcdir)/emacs-lisp-intro.texi + cd $(srcdir); $(MAKEINFO) emacs-lisp-intro.texi -o $(infodir)/eintr emacs-lisp-intro.dvi: $(INFO_SOURCES) $(ENVADD) $(TEXI2DVI) $(srcdir)/emacs-lisp-intro.texi
--- a/lispref/ChangeLog Mon Oct 30 06:52:47 2006 +0000 +++ b/lispref/ChangeLog Mon Oct 30 08:54:41 2006 +0000 @@ -1,3 +1,47 @@ +2006-10-29 Chong Yidong <cyd@stupidchicken.com> + + * Makefile.in: Use relative paths to avoid advertising filesystem + contents during compilation. + + * makefile.w32-in: Likewise. + +2006-10-23 Kim F. Storm <storm@cua.dk> + + * commands.texi (Event Input Misc): Update unread-command-events. + +2006-10-23 Nick Roberts <nickrob@snap.net.nz> + + * lists.texi (Sets And Lists): Fix typos. + +2006-10-18 Juanma Barranquero <lekktu@gmail.com> + + * control.texi (Processing of Errors): Use @var for an argument, + not @code. + +2006-10-16 Richard Stallman <rms@gnu.org> + + * edebug.texi (Edebug Recursive Edit): Minor cleanup. + + * keymaps.texi (Format of Keymaps): Show all the keymap element + patterns that result from menu items. + (Key Lookup): Minor cleanups. + + * modes.texi (Precalculated Fontification): Don't say that + not setting font-lock-defaults avoids loading font-lock. + + * help.texi (Documentation): Move xref to Emacs Manual here. + (Documentation Basics): From here. + Also doc emacs-lisp-docstring-fill-column. + + * elisp.texi: Update version and ISBN. + + * commands.texi (Interactive Call): Clarify KEYS arg to + call-interactively is a vector. + (Command Loop Info): Delete anchor in this-command-keys. + Add anchor in this-command-keys-vector. + (Recursive Editing): Document how recursive-edit + handles the current buffer. + 2006-10-13 Chong Yidong <cyd@stupidchicken.com> * frames.texi (Frame Titles): %c and %l are ignored in @@ -2179,7 +2223,7 @@ * elisp.texi (Top): Update detailed menu for node changes. * modes.texi (Modes): Update Menu. - (Hooks): Move to beginning of chapter. + (Hooks): Move to beginning of chapter. Most minor modes run mode hooks too. `add-hook' can handle void hooks or hooks whose value is a single function. @@ -3444,7 +3488,7 @@ (Quoted Character Input): Clarify description of `read-quoted-char' and fix example. (Quitting): Add `with-local-quit'. - (Disabling Commands): Correct and clarify descriptions of + (Disabling Commands): Correct and clarify descriptions of `enable-command' and `disable-command'. Mention what happens if `disabled-command-hook' is nil. (Keyboard Macros): Mention LOOPFUNC arg to `execute-kbd-macro'. @@ -3758,7 +3802,7 @@ 2004-04-04 Luc Teirlinck <teirllm@auburn.edu> - * backups.texi: Various small changes in addition to: + * backups.texi: Various small changes in addition to: (Making Backups): Mention return value of `backup-buffer'. (Auto-Saving): Mention optional FORCE argument to `delete-auto-save-file-if-necessary'. @@ -5339,7 +5383,7 @@ Tue Jun 26 09:57:26 1990 David Lawrence (tale@geech) - * files.texi: Noted that completion-ignored-extensions is ignored + * files.texi: Noted that completion-ignored-extensions is ignored when making *Completions*. Fri Jun 8 16:44:44 EDT 1990 Jay Fenlason (hack@ai.mit.edu) @@ -5374,7 +5418,7 @@ Mon Apr 17 18:56:50 1989 Robert J. Chassell (bob@rice-chex.ai.mit.edu) - * texinfo.tex: temporarily added + * texinfo.tex: Temporarily added \let\result=\dblarrow \def\error{{\it ERROR} \longdblarrow} We need to do this better soon.
--- a/lispref/Makefile.in Mon Oct 30 06:52:47 2006 +0000 +++ b/lispref/Makefile.in Mon Oct 30 08:54:41 2006 +0000 @@ -26,7 +26,7 @@ # Tell make where to find source files; this is needed for the makefiles. VPATH=@srcdir@ -infodir = $(srcdir)/../info +infodir = ../info usermanualdir = $(srcdir)/../man TEXI2DVI = texi2dvi @@ -101,7 +101,7 @@ info: $(infodir)/elisp $(infodir)/elisp: $(srcs) - $(MAKEINFO) -I. -I$(srcdir) $(srcdir)/elisp.texi -o $(infodir)/elisp + cd $(srcdir); $(MAKEINFO) -I. -I$(infodir) elisp.texi -o $(infodir)/elisp elisp.dvi: $(srcs) $(TEXI2DVI) -I $(srcdir) -I $(usermanualdir) $(srcdir)/elisp.texi
--- a/lispref/commands.texi Mon Oct 30 06:52:47 2006 +0000 +++ b/lispref/commands.texi Mon Oct 30 08:54:41 2006 +0000 @@ -575,10 +575,11 @@ Otherwise, the command is added only if it uses the minibuffer to read an argument. @xref{Command History}. -The argument @var{keys}, if given, specifies the sequence of events to -supply if the command inquires which events were used to invoke it. -If @var{keys} is omitted or @code{nil}, the return value of -@code{this-command-keys} is used. @xref{Definition of this-command-keys}. +The argument @var{keys}, if given, should be a vector which specifies +the sequence of events to supply if the command inquires which events +were used to invoke it. If @var{keys} is omitted or @code{nil}, the +default is the return value of @code{this-command-keys-vector}. +@xref{Definition of this-command-keys-vector}. @end defun @defun command-execute command &optional record-flag keys special @@ -785,7 +786,6 @@ @end defvar @defun this-command-keys -@anchor{Definition of this-command-keys} This function returns a string or vector containing the key sequence that invoked the present command, plus any previous commands that generated the prefix argument for this command. Any events read by the @@ -806,6 +806,7 @@ @end defun @defun this-command-keys-vector +@anchor{Definition of this-command-keys-vector} Like @code{this-command-keys}, except that it always returns the events in a vector, so you don't need to deal with the complexities of storing input events in a string (@pxref{Strings of Events}). @@ -2502,6 +2503,13 @@ Normally you add events to the front of this list, so that the events most recently unread will be reread first. + +Events read from this list are not normally added to the current +command's key sequence (as returned by e.g. @code{this-command-keys}), +as the events will already have been added once as they were read for +the first time. An element of the form @code{(@code{t} . @var{event})} +forces @var{event} to be added to the current command's key sequence. + @end defvar @defun listify-key-sequence key @@ -3021,7 +3029,12 @@ editing. When called from a Lisp program, it enters a recursive editing level. - In the following example, the function @code{simple-rec} first +If the current buffer is not the same as the selected window's buffer, +@code{recursive-edit} saves and restores the current buffer. Otherwise, +if you switch buffers, the buffer you switched to is current after +@code{recursive-edit} returns. + +In the following example, the function @code{simple-rec} first advances point one word, then enters a recursive edit, printing out a message in the echo area. The user can then do any editing desired, and then type @kbd{C-M-c} to exit and continue executing @code{simple-rec}.
--- a/lispref/control.texi Mon Oct 30 06:52:47 2006 +0000 +++ b/lispref/control.texi Mon Oct 30 08:54:41 2006 +0000 @@ -862,7 +862,7 @@ function should take three arguments: @var{data}, a list of the same form that @code{condition-case} would bind to its variable; @var{context}, a string describing the situation in which the error -occurred, or (more often) @code{nil}; and @code{caller}, the Lisp +occurred, or (more often) @code{nil}; and @var{caller}, the Lisp function which called the primitive that signaled the error. @end defvar
--- a/lispref/edebug.texi Mon Oct 30 06:52:47 2006 +0000 +++ b/lispref/edebug.texi Mon Oct 30 08:54:41 2006 +0000 @@ -1044,9 +1044,9 @@ @code{track-mouse}. Commands used within Edebug do not affect these variables outside of Edebug. -The key sequence returned by @code{this-command-keys} is changed by -executing commands within Edebug and there is no way to reset -the key sequence from Lisp. +Executing commands within Edebug can change the key sequence that +would be returned by @code{this-command-keys}, and there is no way to +reset the key sequence from Lisp. Edebug cannot save and restore the value of @code{unread-command-events}. Entering Edebug while this variable has a
--- a/lispref/elisp.texi Mon Oct 30 06:52:47 2006 +0000 +++ b/lispref/elisp.texi Mon Oct 30 08:54:41 2006 +0000 @@ -7,7 +7,7 @@ @c Version of the manual and of Emacs. @c Please remember to update the edition number in README as well. @set VERSION 2.9 -@set EMACSVER 22.0.50 +@set EMACSVER 22.0.90 @dircategory Emacs @direntry @@ -74,7 +74,7 @@ 51 Franklin St, Fifth Floor @* Boston, MA 02110-1301 @* USA @* -ISBN 1-882114-73-6 +ISBN 1-882114-74-4 @sp 1 Cover art by Etienne Suvasa.
--- a/lispref/help.texi Mon Oct 30 06:52:47 2006 +0000 +++ b/lispref/help.texi Mon Oct 30 08:54:41 2006 +0000 @@ -22,6 +22,9 @@ manual is not organized in that fashion; it is organized in terms of topics of discussion. + For commands to access documentation strings, see @ref{Help, , +Help, emacs, The GNU Emacs Manual}. + @menu * Documentation Basics:: Good style for doc strings. Where to put them. How Emacs stores them. @@ -63,6 +66,10 @@ to the keys for related commands and be accurate even when a user rearranges the key bindings. (@xref{Keys in Documentation}.) +@vindex emacs-lisp-docstring-fill-column + Emacs Lisp mode fills documentation strings to the width +specified by @code{emacs-lisp-docstring-fill-column}. + In Emacs Lisp, a documentation string is accessible through the function or variable that it describes: @@ -100,9 +107,6 @@ documentation string from the appropriate file; this is transparent to the user. - For information on the uses of documentation strings, see @ref{Help, , -Help, emacs, The GNU Emacs Manual}. - @c Wordy to prevent overfull hbox. --rjc 15mar92 The @file{emacs/lib-src} directory contains two utilities that you can use to print nice-looking hardcopy for the file
--- a/lispref/keymaps.texi Mon Oct 30 06:52:47 2006 +0000 +++ b/lispref/keymaps.texi Mon Oct 30 08:54:41 2006 +0000 @@ -174,13 +174,18 @@ which is always a character or a symbol. @xref{Classifying Events}. In this kind of binding, @var{binding} is a command. -@item (@var{type} @var{item-name} .@: @var{binding}) -This specifies a binding which is also a menu item -named @var{item-name}. @xref{Simple Menu Items}. +@item (@var{type} @var{item-name} @r{[}@var{cache}@r{]} .@: @var{binding}) +This specifies a binding which is also a simple menu item that +displays as @var{item-name} in the menu. @var{cache}, if present, +caches certain information for display in the menu. @xref{Simple Menu +Items}. + +@item (@var{type} @var{item-name} @var{help-string} @r{[}@var{cache}@r{]} .@: @var{binding}) +This is a simple menu item with help string @var{help-string}. @item (@var{type} menu-item .@: @var{details}) -This specifies a binding which is also a menu item and allows use of -other features. @xref{Extended Menu Items}. +This specifies a binding which is also an extended menu item. This +allows use of other features. @xref{Extended Menu Items}. @item (t .@: @var{binding}) @cindex default key binding @@ -203,9 +208,10 @@ @cindex keymap prompt string @cindex overall prompt string @cindex prompt string of keymap -Aside from bindings, a keymap can also have a string as an element. -This is called the @dfn{overall prompt string} and makes it possible to -use the keymap as a menu. @xref{Defining Menus}. +Aside from elements that specify bindings for keys, a keymap can also +have a string as an element. This is called the @dfn{overall prompt +string} and makes it possible to use the keymap as a menu. +@xref{Defining Menus}. @end table When the binding is @code{nil}, it doesn't constitute a definition @@ -932,11 +938,11 @@ Let's use the term @dfn{keymap entry} to describe the value found by looking up an event type in a keymap. (This doesn't include the item -string and other extra elements in menu key bindings, because +string and other extra elements in a keymap element for a menu item, because @code{lookup-key} and other key lookup functions don't include them in -the returned value.) While any Lisp object may be stored in a keymap as -a keymap entry, not all make sense for key lookup. Here is a table of -the meaningful kinds of keymap entries: +the returned value.) While any Lisp object may be stored in a keymap +as a keymap entry, not all make sense for key lookup. Here is a table +of the meaningful types of keymap entries: @table @asis @item @code{nil} @@ -964,7 +970,7 @@ @item @var{list} @cindex list in keymap -The meaning of a list depends on the types of the elements of the list. +The meaning of a list depends on what it contains: @itemize @bullet @item
--- a/lispref/lists.texi Mon Oct 30 06:52:47 2006 +0000 +++ b/lispref/lists.texi Mon Oct 30 08:54:41 2006 +0000 @@ -1396,7 +1396,7 @@ @end defun @defun memql object list -The function @code{member} tests to see whether @var{object} is a member +The function @code{memql} tests to see whether @var{object} is a member of @var{list}, comparing members with @var{object} using @code{eql}, so floating point elements are compared by value. If @var{object} is a member, @code{memql} returns a list starting with @@ -1406,11 +1406,11 @@ @example @group -(memql 1.2 '(1.1 1.2 1.3) ; @r{@code{1.2} and @code{1.2} are @code{eql}.} +(memql 1.2 '(1.1 1.2 1.3)) ; @r{@code{1.2} and @code{1.2} are @code{eql}.} @result{} (1.2 1.3) @end group @group -(memq 1.2 '(1.1 1.2 1.3) ; @r{@code{1.2} and @code{1.2} are not @code{eq}.} +(memq 1.2 '(1.1 1.2 1.3)) ; @r{@code{1.2} and @code{1.2} are not @code{eq}.} @result{} nil @end group @end example
--- a/lispref/makefile.w32-in Mon Oct 30 06:52:47 2006 +0000 +++ b/lispref/makefile.w32-in Mon Oct 30 08:54:41 2006 +0000 @@ -22,7 +22,7 @@ # Standard configure variables. srcdir = . -infodir = $(srcdir)/../info +infodir = ../info usermanualdir = $(srcdir)/../man # Redefine `TEX' if `tex' does not invoke plain TeX. For example: @@ -106,7 +106,7 @@ $(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/elisp $(infodir)/elisp: $(srcs) - $(MAKEINFO) -I. -I$(srcdir) -o $(infodir)/elisp $(srcdir)/elisp.texi + cd $(srcdir); $(MAKEINFO) -I. -I$(infodir) elisp.texi -o $(infodir)/elisp elisp.dvi: $(srcs) $(texinputdir) $(TEX) -I $(usermanualdir) $(srcdir)/elisp.texi
--- a/lispref/modes.texi Mon Oct 30 06:52:47 2006 +0000 +++ b/lispref/modes.texi Mon Oct 30 08:54:41 2006 +0000 @@ -2816,8 +2816,7 @@ If your mode does not use any of the other machinery of Font Lock (i.e. it only uses the @code{font-lock-face} property), it should not -set the variable @code{font-lock-defaults}. That way, it will not -cause loading of the @file{font-lock} library. +set the variable @code{font-lock-defaults}. @node Faces for Font Lock @subsection Faces for Font Lock
--- a/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings Mon Oct 30 06:52:47 2006 +0000 +++ b/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings Mon Oct 30 08:54:41 2006 +0000 @@ -1,5 +1,5 @@ /* Localized versions of Info.plist keys */ CFBundleName = "Emacs"; -CFBundleShortVersionString = "22.0.50"; -CFBundleGetInfoString = "22.0.50, Copyright (C) 2006 Free Software Foundation, Inc."; +CFBundleShortVersionString = "22.0.90"; +CFBundleGetInfoString = "22.0.90, Copyright (C) 2006 Free Software Foundation, Inc.";
--- a/mac/src/Emacs.r Mon Oct 30 06:52:47 2006 +0000 +++ b/mac/src/Emacs.r Mon Oct 30 08:54:41 2006 +0000 @@ -220,11 +220,11 @@ resource 'vers' (1) { 0x22, /* Major revision in BCD */ 0x0, /* Minor revision in BCD */ - development, /* development, alpha, beta, or final (release) */ - 50, /* Non-final release # */ + alpha, /* development, alpha, beta, or final (release) */ + 90, /* Non-final release # */ 0, /* Region code */ - "22.0.50", /* Short version number */ - "22.0.50, Copyright \0xa9 2006 " + "22.0.90", /* Short version number */ + "22.0.90, Copyright \0xa9 2006 " "Free Software Foundation, Inc." /* Long version number */ };
--- a/make-dist Mon Oct 30 06:52:47 2006 +0000 +++ b/make-dist Mon Oct 30 08:54:41 2006 +0000 @@ -522,7 +522,7 @@ echo "Making links to \`mac'" (cd mac - ln ChangeLog INSTALL README *.xml *.MPW ../${tempdir}/mac) + ln ChangeLog INSTALL README make-package *.xml *.MPW ../${tempdir}/mac) echo "Making links to \`mac/inc'" (cd mac/inc @@ -540,6 +540,10 @@ (cd mac/Emacs.app/Contents ln Info.plist PkgInfo ../../../${tempdir}/mac/Emacs.app/Contents) +echo "Making links to \`mac/Emacs.app/Contents/Resources'" +(cd mac/Emacs.app/Contents/Resources + ln Emacs.icns ../../../../${tempdir}/mac/Emacs.app/Contents/Resources) + echo "Making links to \`mac/Emacs.app/Contents/Resources/English.lproj'" (cd mac/Emacs.app/Contents/Resources/English.lproj ln InfoPlist.strings ../../../../../${tempdir}/mac/Emacs.app/Contents/Resources/English.lproj)
--- a/man/ChangeLog Mon Oct 30 06:52:47 2006 +0000 +++ b/man/ChangeLog Mon Oct 30 08:54:41 2006 +0000 @@ -1,12 +1,60 @@ +2006-10-28 Glenn Morris <rgm@gnu.org> + + * ack.texi (Acknowledgments): Add cal-html author. + + * calendar.texi (Writing Calendar Files): Rename section (was "LaTeX + Calendar"). Describe new package cal-html. + * emacs.texi (Top): Rename old node "LaTeX Calendar" to "Writing + Calendar Files." + +2006-10-27 Richard Stallman <rms@gnu.org> + + * woman.texi: Downcase nroff/troff/roff. + (Installation): Chapter deleted. Some xrefs deleted. + (Background): woman doesn't advise man ;-). + +2006-10-26 Roberto Rodr,Am(Bguez <lanubeblanca@googlemail.com> (tiny change) + + * ada-mode.texi (Project files, Identifier completion) + (Automatic Casing, Debugging, Using non-standard file names) + (Working Remotely): Fix typos. + +2006-10-23 Richard Stallman <rms@gnu.org> + + * abbrevs.texi (Expanding Abbrevs): Expansion happens only when + Abbrev mode is enabled. + +2006-10-20 Masatake YAMATO <jet@gyve.org> + + * cc-mode.texi (Sample .emacs File): Added missing `)' in + sample code `my-c-initialization-hook'. + +2006-10-19 Stuart D. Herring <herring@lanl.gov> + + * widget.texi: Fix typos. + +2006-10-19 Michael Albinus <michael.albinus@gmx.de> + + * tramp.texi (Frequently Asked Questions): Remove questions marked with + "???". There have been no complaints for years, so the information + must be appropriate. + +2006-10-16 Richard Stallman <rms@gnu.org> + + * widget.texi: Use @var instead of capitalization. + Clarify many widget type descriptions. + + * emacs.texi: Update ISBN. + 2006-10-13 Andreas Seltenreich <uwi7@rz.uni-karlsruhe.de> * gnus.texi (Other modes): Fix typo. Add alternative index entry for gnus-dired-attach. (Selecting a Group): Fix typo. -2006-10-12 Roberto Rodr,Am(Bguez <lanubeblanca@googlemail.com> - - * widget.texi: Fix typos (tiny change) +2006-10-12 Roberto Rodr,Am(Bguez <lanubeblanca@googlemail.com> (tiny change) + + * widget.texi: Fix typos. 2006-10-11 Kim F. Storm <storm@cua.dk>
--- a/man/abbrevs.texi Mon Oct 30 06:52:47 2006 +0000 +++ b/man/abbrevs.texi Mon Oct 30 08:54:41 2006 +0000 @@ -146,12 +146,13 @@ @node Expanding Abbrevs @section Controlling Abbrev Expansion - An abbrev expands whenever it is present in the buffer just before -point and you type a self-inserting whitespace or punctuation character -(@key{SPC}, comma, etc.@:). More precisely, any character that is not a -word constituent expands an abbrev, and any word-constituent character -can be part of an abbrev. The most common way to use an abbrev is to -insert it and then insert a punctuation or whitespace character to expand it. + When Abbrev mode is enabled, an abbrev expands whenever it is +present in the buffer just before point and you type a self-inserting +whitespace or punctuation character (@key{SPC}, comma, etc.@:). More +precisely, any character that is not a word constituent expands an +abbrev, and any word-constituent character can be part of an abbrev. +The most common way to use an abbrev is to insert it and then insert a +punctuation or whitespace character to expand it. @vindex abbrev-all-caps Abbrev expansion preserves case; thus, @samp{foo} expands into @samp{find
--- a/man/ack.texi Mon Oct 30 06:52:47 2006 +0000 +++ b/man/ack.texi Mon Oct 30 08:54:41 2006 +0000 @@ -75,6 +75,9 @@ Boaz Ben-Zvi wrote @file{profile.el}, to time Emacs Lisp functions. @item +Anna M. Bigatti wrote @file{cal-html.el}, which produces HTML calendars. + +@item Ray Blaak wrote @file{delphi.el}, a major mode for editing Delphi (Object Pascal) source code.
--- a/man/ada-mode.texi Mon Oct 30 06:52:47 2006 +0000 +++ b/man/ada-mode.texi Mon Oct 30 08:54:41 2006 +0000 @@ -283,7 +283,7 @@ To take full advantage of this features, it is possible to create a file in the main directory of your application, with a @samp{.adp} extension. -This file contain all needed information dealing with the way your +This file contains all needed information dealing with the way your application is organized between directories, the commands to compile, run and debug it etc. Creating this file is not mandatory and convenient defaults are automatically provided for simple setups. It only becomes @@ -329,7 +329,7 @@ @end example Note: This has a higher priority than the first variable, so the first -choice is to use this variable settings, and otherwise +choice is to use this variable's settings, and otherwise @code{ada-prj-default-project-file}. @end itemize @@ -601,7 +601,7 @@ Emacs and Ada mode provide two general ways for the completion of identifiers. This is an easy way to type faster: you just have to type -the first few letters of an identifiers, and then loop through all the +the first few letters of an identifier, and then loop through all the possible completions. The first method is general for Emacs. It will work both with Ada @@ -623,7 +623,7 @@ This is a very fast way to do completion, and the casing of words will also be respected. -The second method is specific to Ada buffer, and even to users of the +The second method is specific to Ada buffers, and even to users of the Gnat compiler. Emacs will search the cross-information found in the @samp{.ali} files generated by Gnat for possible completions. @@ -839,7 +839,7 @@ instance @code{My_vARIable} is converted to @code{My_Variable}. @item ada-loose-case-word -No letters is modified in the previous word, except the ones after the +No letters are modified in the previous word, except the ones after the @samp{_} character that are upper cased. For instance @code{My_vARIable} is converted to @code{My_VARIable}. @end table @@ -894,7 +894,8 @@ only. You can not automatically add an exception to one of the other files, although you can of course edit the files by hand at any time. -Automatic casing can be performed on port or whole buffer using: +Automatic casing can be performed on part of the buffer, or on the +whole buffer, using: @table @kbd @item C-c C-b @@ -1108,7 +1109,7 @@ application. Emacs is compatible with a lot of debuggers, and provide an easy interface to them. -This selection will focus on the gdb debugger, and two of the graphical +This section will focus on the gdb debugger, and two of the graphical interfaces that exist for it. In all cases, the main window in Emacs will be split in two: in the @@ -1125,7 +1126,7 @@ You can easily use Emacs as the source window when you are using a graphical interface for the debugger. The interesting thing is that, -whereas you still have the graphical nifties, you can also you the +whereas you still have the graphical nifties, you can also use the cross-references features that Ada mode provides to look at the definition for the identifiers, @enddots{} @@ -1172,7 +1173,7 @@ (ada-add-extensions "_s.ada" "_b.ada") @end example -Note that it is possible to redefine the extension, even if they already +Note that it is possible to redefine the extensions, even if they already exist, as in: @example @@ -1195,7 +1196,7 @@ @chapter Working Remotely @c --------------------------------------------------------------------- -When you work on project that involve a lot of programmers, it is +When you work on a project that involves a lot of programmers, it is generally the case that you will edit the files on your own machine, but you want to compile, run and debug your application in another buffer.
--- a/man/calendar.texi Mon Oct 30 06:52:47 2006 +0000 +++ b/man/calendar.texi Mon Oct 30 08:54:41 2006 +0000 @@ -35,7 +35,7 @@ * Scroll Calendar:: Bringing earlier or later months onto the screen. * Counting Days:: How many days are there between two dates? * General Calendar:: Exiting or recomputing the calendar. -* LaTeX Calendar:: Print a calendar using LaTeX. +* Writing Calendar Files:: Writing calendars to files of various formats. * Holidays:: Displaying dates of holidays. * Sunrise/Sunset:: Displaying local times of sunrise and sunset. * Lunar Phases:: Displaying phases of the moon. @@ -341,11 +341,47 @@ (If a frame contains a dedicated calendar window, exiting from the calendar iconifies that frame.) -@node LaTeX Calendar -@section LaTeX Calendar +@node Writing Calendar Files +@section Writing Calendar Files + + These packages produce files of various formats containing calendar +and diary entries, for display purposes. + +@cindex calendar and HTML + The Calendar HTML commands produce files of HTML code that contain +calendar and diary entries. Each file applies to one month, and has a +name of the format @file{@var{yyyy}-@var{mm}.html}, where @var{yyyy} and +@var{mm} are the four-digit year and two-digit month, respectively. The +variable @code{cal-html-directory} specifies the default output +directory for the HTML files. + +@vindex cal-html-css-default + Diary entries enclosed by @code{<} and @code{>} are interpreted as +HTML tags (for example: this is a diary entry with <font +color=''red''>some red text</font>). You can change the overall +appearance of the displayed HTML pages (for example, the color of +various page elements, header styles) via a stylesheet @file{cal.css} in +the directory containing the HTML files (see the value of the variable +@code{cal-html-css-default} for relevant style settings). + +@kindex t @r{(Calendar mode)} +@table @kbd +@item H m +Generate a one-month calendar (@code{cal-html-cursor-month}). +@item H y +Generate a calendar file for each month of a year, as well as an index +page (@code{cal-html-cursor-year}). By default, this command writes +files to a @var{yyyy} subdirectory - if this is altered some hyperlinks +between years will not work. +@end table + + If the variable @code{cal-html-print-day-number-flag} is +non-@code{nil}, then the monthly calendars show the day-of-the-year +number. The variable @code{cal-html-year-index-cols} specifies the +number of columns in the yearly index page. + @cindex calendar and La@TeX{} - - The Calendar La@TeX{} commands produce a buffer of La@TeX{} code that + The Calendar La@TeX{} commands produce a buffer of La@TeX{} code that prints as a calendar. Depending on the command you use, the printed calendar covers the day, week, month or year that point is in. @@ -401,7 +437,7 @@ calendars only). If the variable @code{cal-tex-rules} is non-@code{nil} (the default is @code{nil}), the calendar displays ruled pages in styles that have sufficient room. You can use the variable -@code{cal-tex-preamble-extra} to insert extra LaTeX commands in the +@code{cal-tex-preamble-extra} to insert extra La@TeX{} commands in the preamble of the generated document if you need to. @node Holidays
--- a/man/cc-mode.texi Mon Oct 30 06:52:47 2006 +0000 +++ b/man/cc-mode.texi Mon Oct 30 08:54:41 2006 +0000 @@ -6560,7 +6560,7 @@ (defun my-c-initialization-hook () (define-key c-mode-base-map "\C-m" 'c-context-line-break) (define-key c-mode-base-map [?\C-\M-a] 'c-beginning-of-defun) - (define-key c-mode-base-map [?\C-\M-e] 'c-end-of-defun) + (define-key c-mode-base-map [?\C-\M-e] 'c-end-of-defun)) (add-hook 'c-initialization-hook 'my-c-initialization-hook) ;; offset customizations not in my-c-style
--- a/man/emacs.texi Mon Oct 30 06:52:47 2006 +0000 +++ b/man/emacs.texi Mon Oct 30 08:54:41 2006 +0000 @@ -5,7 +5,7 @@ @c The edition number appears in several places in this file @set EDITION Sixteenth -@set EMACSVER 22.1 +@set EMACSVER 22.0.90 @copying This is the @value{EDITION} edition of the @cite{GNU Emacs Manual}, @@ -71,7 +71,7 @@ @insertcopying @sp 2 -ISBN 1-882114-06-X @* +ISBN 1-882114-86-8* Published by the Free Software Foundation @* 51 Franklin Street, Fifth Floor @* Boston, MA 02110-1301 USA @@ -714,7 +714,7 @@ * Scroll Calendar:: Bringing earlier or later months onto the screen. * Counting Days:: How many days are there between two dates? * General Calendar:: Exiting or recomputing the calendar. -* LaTeX Calendar:: Print a calendar using LaTeX. +* Writing Calendar Files:: Writing calendars to files of various formats. * Holidays:: Displaying dates of holidays. * Sunrise/Sunset:: Displaying local times of sunrise and sunset. * Lunar Phases:: Displaying phases of the moon.
--- a/man/tramp.texi Mon Oct 30 06:52:47 2006 +0000 +++ b/man/tramp.texi Mon Oct 30 08:54:41 2006 +0000 @@ -2009,11 +2009,6 @@ @uref{http://www4.ncsu.edu/~tlroche/plinkTramp.html} @end ignore -??? Is the XEmacs info correct? - -??? Can somebody provide some information for getting it to work on NT -Emacs? I think there was some issue with @command{ssh}? - @item @value{tramp} does not connect to the remote host
--- a/man/viper.texi Mon Oct 30 06:52:47 2006 +0000 +++ b/man/viper.texi Mon Oct 30 08:54:41 2006 +0000 @@ -178,7 +178,7 @@ <jshawkin@@eecs.umich.edu> has provided a set of customizations, which enables additional Emacs bindings under Viper. These customizations can be included in your @file{~/.viper} file and are found at the following URL: -@file{http://www.eecs.umich.edu/~jshawkin/viper-sample}. +@file{http://traeki.freeshell.org/files/viper-sample}. @menu * Emacs Preliminaries:: Basic concepts in Emacs.
--- a/man/widget.texi Mon Oct 30 06:52:47 2006 +0000 +++ b/man/widget.texi Mon Oct 30 08:54:41 2006 +0000 @@ -480,11 +480,11 @@ @comment node-name, next, previous, up @section Basic Types -The syntax of a type specification is given below: +This is the general syntax of a type specification: @example -NAME ::= (NAME [KEYWORD ARGUMENT]... ARGS) - | NAME +@var{name} ::= (@var{name} [@var{keyword} @var{argument}]... @var{args}) + | @var{name} @end example Where, @var{name} is a widget name, @var{keyword} is the name of a @@ -724,7 +724,7 @@ Syntax: @example -TYPE ::= (link [KEYWORD ARGUMENT]... [ VALUE ]) +@var{type} ::= (link [@var{keyword} @var{argument}]... [ @var{value} ]) @end example The @var{value}, if present, is used to initialize the @code{:value} @@ -749,7 +749,7 @@ Syntax: @example -TYPE ::= (url-link [KEYWORD ARGUMENT]... URL) +@var{type} ::= (url-link [@var{keyword} @var{argument}]... @var{url}) @end example @findex browse-url-browser-function@r{, and @code{url-link} widget} @@ -764,7 +764,7 @@ Syntax: @example -TYPE ::= (info-link [KEYWORD ARGUMENT]... ADDRESS) +@var{type} ::= (info-link [@var{keyword} @var{argument}]... @var{address}) @end example When this link is invoked, the built-in Info reader is started on @@ -778,7 +778,7 @@ Syntax: @example -TYPE ::= (push-button [KEYWORD ARGUMENT]... [ VALUE ]) +@var{type} ::= (push-button [@var{keyword} @var{argument}]... [ @var{value} ]) @end example The @var{value}, if present, is used to initialize the @code{:value} @@ -803,7 +803,7 @@ Syntax: @example -TYPE ::= (editable-field [KEYWORD ARGUMENT]... [ VALUE ]) +@var{type} ::= (editable-field [@var{keyword} @var{argument}]... [ @var{value} ]) @end example The @var{value}, if present, is used to initialize the @code{:value} @@ -863,7 +863,7 @@ Syntax: @example -TYPE ::= (menu-choice [KEYWORD ARGUMENT]... TYPE ... ) +@var{type} ::= (menu-choice [@var{keyword} @var{argument}]... @var{type} ... ) @end example The @var{type} argument represents each possible choice. The widget's @@ -904,13 +904,13 @@ Syntax: @example -TYPE ::= (radio-button-choice [KEYWORD ARGUMENT]... TYPE ... ) +@var{type} ::= (radio-button-choice [@var{keyword} @var{argument}]... @var{type} ... ) @end example -The @var{type} argument represents each possible choice. The widget's -value will be that of the chosen @var{type} argument. This widget will -match any value matching at least one of the specified @var{type} -arguments. +The component types specify the choices, with one radio button for +each. The widget's value will be that of the chosen @var{type} +argument. This widget matches any value that matches at least one of +the specified @var{type} arguments. The following extra properties are recognized. @@ -971,7 +971,7 @@ Syntax: @example -ITEM ::= (item [KEYWORD ARGUMENT]... VALUE) +@var{item} ::= (item [@var{keyword} @var{argument}]... @var{value}) @end example The @var{value}, if present, is used to initialize the @code{:value} @@ -986,7 +986,7 @@ Syntax: @example -ITEM ::= (choice-item [KEYWORD ARGUMENT]... VALUE) +@var{item} ::= (choice-item [@var{keyword} @var{argument}]... @var{value}) @end example The @var{value}, if present, is used to initialize the @code{:value} @@ -1003,7 +1003,7 @@ Syntax: @example -TYPE ::= (toggle [KEYWORD ARGUMENT]...) +@var{type} ::= (toggle [@var{keyword} @var{argument}]...) @end example The widget has two possible states, @samp{on} and @samp{off}, which @@ -1039,7 +1039,7 @@ Syntax: @example -TYPE ::= (checkbox [KEYWORD ARGUMENT]...) +@var{type} ::= (checkbox [@var{keyword} @var{argument}]...) @end example @node checklist, editable-list, checkbox, Basic Types @@ -1050,7 +1050,7 @@ Syntax: @example -TYPE ::= (checklist [KEYWORD ARGUMENT]... TYPE ... ) +@var{type} ::= (checklist [@var{keyword} @var{argument}]... @var{type} ... ) @end example The @var{type} arguments represent each checklist item. The widget's @@ -1108,7 +1108,7 @@ Syntax: @example -TYPE ::= (editable-list [KEYWORD ARGUMENT]... TYPE) +@var{type} ::= (editable-list [@var{keyword} @var{argument}]... @var{type}) @end example The value is a list, where each member represents one widget of type @@ -1168,7 +1168,7 @@ Syntax: @example -TYPE ::= (group [KEYWORD ARGUMENT]... TYPE...) +@var{type} ::= (group [@var{keyword} @var{argument}]... @var{type}...) @end example The value is a list, with one member for each @var{type}. @@ -1201,7 +1201,7 @@ The syntax for the @code{const} widget is: @example -TYPE ::= (const [KEYWORD ARGUMENT]... [ VALUE ]) +@var{type} ::= (const [@var{keyword} @var{argument}]... [ @var{value} ]) @end example The @var{value}, if present, is used to initialize the @code{:value} @@ -1237,7 +1237,7 @@ The syntax for the @code{sexp} widget is: @example -TYPE ::= (sexp [KEYWORD ARGUMENT]... [ VALUE ]) +@var{type} ::= (sexp [@var{keyword} @var{argument}]... [ @var{value} ]) @end example @deffn Widget sexp @@ -1261,7 +1261,7 @@ The syntax for all the atoms are: @example -TYPE ::= (NAME [KEYWORD ARGUMENT]... [ VALUE ]) +@var{type} ::= (@var{construct} [@var{keyword} @var{argument}]... [ @var{value} ]) @end example The @var{value}, if present, is used to initialize the @code{:value} @@ -1331,10 +1331,10 @@ @subsection Composite Sexp Widgets @cindex composite sexp widgets -The syntax for the composite widget is: +The syntax for the composite widget construct is: @example -TYPE ::= (NAME [KEYWORD ARGUMENT]... COMPONENT...) +@var{type} ::= (@var{construct} [@var{keyword} @var{argument}]... @var{component}...) @end example @noindent @@ -1342,30 +1342,54 @@ will be displayed in the buffer, and will be editable by the user. @deffn Widget cons -The value of a @code{cons} widget is a cons-cell where the @sc{car} is -the value of the first component and the @sc{cdr} is the value of the -second component. There must be exactly two components. +The value of a @code{cons} widget must be a cons-cell whose @sc{car} +and @sc{cdr} have two specified types. It uses this syntax: + +@example +@var{type} ::= (cons [@var{keyword} @var{argument}]... @var{car-type} @var{cdr-type}) +@end example +@end deffn + +@deffn Widget choice +The value matched by a @code{choice} widget must have one of a fixed +set of types. The widget's syntax is as follows: + +@example +@var{type} ::= (choice [@var{keyword} @var{argument}]... @var{type} ... ) +@end example + +The value of a @code{choice} widget can be anything that matches any of the +@var{types}. @end deffn @deffn Widget list -The value of a @code{list} widget is a list containing the value of -each of its components. +The value of a @code{list} widget must be a list whose element types +match the specified component types: + +@example +@var{type} ::= (list [@var{keyword} @var{argument}]... @var{component-type}...) +@end example + +Thus, @code{(list string number)} matches lists of two elements, +the first being a string and the second being a number. @end deffn @deffn Widget vector -The value of a @code{vector} widget is a vector containing the value of -each of its component. +The @code{vector} widget is like the @code{list} widget but matches +vectors instead of lists. Thus, @code{(vector string number)} matches +vectors of two elements, the first being a string and the second being +a number. @end deffn The above suffice for specifying fixed size lists and vectors. To get variable length lists and vectors, you can use a @code{choice}, @code{set}, or @code{repeat} widget together with the @code{:inline} -keyword. If any component of a composite widget has the @code{:inline} -keyword set, its value must be a list which will then be spliced into -the composite. For example, to specify a list whose first element must -be a file name, and whose remaining arguments should either be the -symbol @code{t} or two files, you can use the following widget -specification: +keyword. If any component of a composite widget has the +@code{:inline} keyword set, its value must be a list which will then +be spliced into the composite. For example, to specify a list whose +first element must be a file name, and whose remaining elements should +either be the symbol @code{t} or two strings (file names), you can use +the following widget specification: @example (list file @@ -1376,29 +1400,32 @@ @end example The value of a widget of this type will either have the form -@code{(file t)} or @code{(file string string)}. - -This concept of inline is probably hard to understand. It was certainly -hard to implement, so instead of confusing you more by trying to explain -it here, I'll just suggest you meditate over it for a while. +@code{(file t)} or @code{(file @var{string} @var{string})}. -@deffn Widget choice -Allows you to edit a sexp which may have one of a fixed set of types. -It is currently implemented with the @code{choice-menu} basic widget, -and has a similar syntax. -@end deffn +This concept of @code{:inline} may be hard to understand. It was +certainly hard to implement, so instead of confusing you more by +trying to explain it here, I'll just suggest you meditate over it for +a while. @deffn Widget set -Allows you to specify a type which must be a list whose elements all -belong to the given set. The elements of the list are not significant. -This is implemented on top of the @code{checklist} basic widget, and has -a similar syntax. +Specifies a type whose values are the lists whose elements all belong +to a given set. The order of elements of the list is not significant. +Here's the syntax: + +@example +@var{type} ::= (set [@var{keyword} @var{argument}]... @var{permitted-element} ... ) +@end example + +Use @code{const} to specify each permitted element, like this: +@code{(set (const a) (const b))}. @end deffn @deffn Widget repeat -Allows you to specify a variable length list whose members are all of -the same type. Implemented on top of the @code{editable-list} basic -widget, and has a similar syntax. +Specifies a list of any number of elements that fit a certain type. + +@example +@var{type} ::= (repeat [@var{keyword} @var{argument}]... @var{type}) +@end example @end deffn @node Widget Properties, Defining New Widgets, Sexp Types, Top
--- a/man/woman.texi Mon Oct 30 06:52:47 2006 +0000 +++ b/man/woman.texi Mon Oct 30 08:54:41 2006 +0000 @@ -91,7 +91,6 @@ @menu * Introduction:: Introduction * Background:: Background -* Installation:: Installation and Setup * Finding:: Finding and Formatting Man Pages * Browsing:: Browsing Man Pages * Customization:: Customization @@ -127,7 +126,7 @@ @code{man} (or @code{manual-entry}) command to format a Unix-style @dfn{manual page} (usually abbreviated to @dfn{man page}) for display, but without calling any external programs. It is intended to emulate -the whole of the @code{ROFF -man} macro package, plus those @code{ROFF} +the whole of the @code{roff -man} macro package, plus those @code{roff} requests (@pxref{Background, , Background}) that are most commonly used in man pages. However, the emulation is modified to include the reformatting done by the Emacs @code{man} command. No hyphenation is @@ -145,7 +144,7 @@ This browser works quite well on simple well-written man files. It works less well on idiosyncratic files that ``break the rules'' or use -the more obscure @code{ROFF} requests directly. Current test results +the more obscure @code{roff} requests directly. Current test results are available in the file @uref{http://centaur.maths.qmw.ac.uk/Emacs/WoMan/files/woman.status, @file{woman.status}}. @@ -169,7 +168,7 @@ @c =================================================================== -@node Background, Installation, Introduction, Top +@node Background, Finding, Introduction, Top @comment node-name, next, previous, up @chapter Background @cindex background @@ -178,31 +177,31 @@ Each such document is conventionally referred to as a @dfn{manual page}, or @dfn{man page} for short, even though some are very much longer than one page. A man page is a document written using the Unix ``man'' -macros, which are themselves written in the NROFF/TROFF text processing -markup language. @code{NROFF} and @code{TROFF} are text processors +macros, which are themselves written in the nroff/troff text processing +markup language. @code{nroff} and @code{troff} are text processors originally written for the UNIX operating system by Joseph F. Ossanna at Bell Laboratories, Murray Hill, New Jersey, USA@. They are closely related, and except in the few cases where the distinction between them -is important I will refer to them both ambiguously as @dfn{ROFF}. +is important I will refer to them both ambiguously as @code{roff}. -@code{ROFF} markup consists of @dfn{requests} and @dfn{escape +@code{roff} markup consists of @dfn{requests} and @dfn{escape sequences}. A request occupies a complete line and begins with either a period or a single forward quote. An escape sequences is embedded within the input text and begins (by default) with a backslash. The -original man macro package defines 20 new @code{ROFF} requests +original man macro package defines 20 new @code{roff} requests implemented as macros, which were considered to be sufficient for writing man pages. But whilst in principle man pages use only the man -macros, in practice a significant number use many other @code{ROFF} +macros, in practice a significant number use many other @code{roff} requests. -The distinction between @code{TROFF} and @code{NROFF} is that -@code{TROFF} was designed to drive a phototypesetter whereas -@code{NROFF} was designed to produce essentially @acronym{ASCII} output for a +The distinction between @code{troff} and @code{nroff} is that +@code{troff} was designed to drive a phototypesetter whereas +@code{nroff} was designed to produce essentially @acronym{ASCII} output for a character-based device similar to a teletypewriter (usually abbreviated -to ``teletype'' or ``tty''). Hence, @code{TROFF} supports much finer -control over output positioning than does @code{NROFF} and can be seen +to ``teletype'' or ``tty''). Hence, @code{troff} supports much finer +control over output positioning than does @code{nroff} and can be seen as a forerunner of @TeX{}. Traditionally, man pages are either -formatted by @code{TROFF} for typesetting or by @code{NROFF} for +formatted by @code{troff} for typesetting or by @code{nroff} for printing on a character printer or displaying on a screen. Of course, over the last 25 years or so, the distinction between typeset output on paper and characters on a screen has become blurred by the fact that @@ -214,8 +213,8 @@ browsed on screen by running a program called @code{man}. This program looks in a predefined set of directories for the man page matching a specified topic, then either formats the source file by running -@code{NROFF} or recovers a pre-formatted file, and displays it via a -pager such as @code{more}. @code{NROFF} normally formats for a printer, +@code{nroff} or recovers a pre-formatted file, and displays it via a +pager such as @code{more}. @code{nroff} normally formats for a printer, so it paginates the output, numbers the pages, etc., most of which is irrelevant when the document is browsed as a continuous scrollable document on screen. The only concession to on-screen browsing normally @@ -228,7 +227,7 @@ Emacs Manual}. This command runs @code{man} as described above, perhaps in the background, and then post-processes the output to remove much of the -@code{NROFF} pagination such as page headers and footers, and places the +@code{nroff} pagination such as page headers and footers, and places the result into an Emacs buffer. It puts this buffer into a special major mode, which is tailored for man page browsing, and provides a number of useful navigation commands, support for following references, etc. It @@ -236,7 +235,7 @@ menu or mouse support. The Emacs man package appears to have been developed over about 10 years, from the late 1980s to the late 1990s. -There is considerable inefficiency in having @code{NROFF} paginate a +There is considerable inefficiency in having @code{nroff} paginate a document and then removing most of the pagination! WoMan is an Emacs Lisp library that provides an emulation of the @@ -253,22 +252,22 @@ read because ports of the Unix-style @code{man} program can be a little awkward to set up. I decided that it should not be too hard to emulate the 20 @code{man} macros directly, without treating them as macros and -largely ignoring the underlying @code{ROFF} requests, given the text +largely ignoring the underlying @code{roff} requests, given the text processing capabilities of Emacs. This proved to be essentially true, and it did not take a great deal of work to be able to format simple man pages acceptably. One problem arose with the significant number of man pages that use -@code{ROFF} requests in addition to the @code{man} macros, and since +@code{roff} requests in addition to the @code{man} macros, and since releasing the first version of WoMan I have been continually extending -it to support more @code{ROFF} requests. WoMan can now format a +it to support more @code{roff} requests. WoMan can now format a significant proportion of the man pages that I have tested, either well or at least readably. However, I have added capabilities partly by making additional passes through the document, a design that is fundamentally flawed. This can only be solved by a major re-design of WoMan to handle the major formatting within a single recursive pass, rather than the present multiple passes without any significant -recursion. There are some @code{ROFF} requests that cannot be handled +recursion. There are some @code{roff} requests that cannot be handled satisfactorily within the present design. Some of these are currently handled by kludges that ``usually more or less work.'' @@ -288,227 +287,18 @@ WoMan @emph{does not} replace @code{man}, although it does use a number of the facilities implemented in the Emacs @code{man} library. WoMan and man can happily co-exist, which is very useful for comparison and -debugging purposes. The only way in which WoMan affects @code{man} is -that it adds a timer to indicate how long @code{man} has taken to format -a man page. The timing is as compatible as possible with the timing -built into WoMan, for as fair a comparison as possible. The time -comparison seems to depend on the details of the platform, the version -of @code{man} in use, etc, but times are similar and WoMan is never -significantly slower than @code{man}. This is despite the fact that -WoMan is running byte code whereas most of the formatting done by -@code{man} uses machine code, and is a testimony to the quality of the -Emacs Lisp system. +debugging purposes. -@code{NROFF} simulates non-@acronym{ASCII} characters by using one or more +@code{nroff} simulates non-@acronym{ASCII} characters by using one or more @acronym{ASCII} characters. WoMan should be able to do much better than this. I have recently begun to add support for WoMan to use more of the characters in its default font and to use a symbol font, and it is an aspect that I intend to develop further in the near future. It should -be possible to move WoMan from an emulation of @code{NROFF} to an -emulation of @code{TROFF} as GNU Emacs moves to providing bit-mapped +be possible to move WoMan from an emulation of @code{nroff} to an +emulation of @code{troff} as GNU Emacs moves to providing bit-mapped display facilities. -@c =================================================================== - -@node Installation, Finding, Background, Top -@comment node-name, next, previous, up -@chapter Installation and Setup -@cindex installation -@cindex setup - -No installation is necessary if you just want to run the version of -WoMan distributed with GNU Emacs 21 or later, although some additional -setup may still be desirable. - -If you are installing @file{woman.el}, either to update the version -distributed with GNU Emacs or because WoMan was not distributed with -your version of Emacs, then you need to put the file in a directory in -your Emacs load path and byte compile it. A good directory to use is -the @file{site-lisp} directory in your Emacs file tree, e.g.@: -@file{/usr/local/share/emacs/@var{version}/site-lisp/} (where -@var{version} is your Emacs version), provided you have write access to -it. If you use a directory that is not included by default in your -Emacs load path then you need to add something like this to your -@file{.emacs} initialization file: - -@lisp -(add-to-list 'load-path "my-lisp") -@end lisp - -@noindent -where @file{my-lisp} is the pathname of the directory. @xref{Init File, , -The Init File ~/.emacs, emacs, The Emacs Editor}, for further details on -customizing Emacs in general. - -You can byte-compile the file by using the Emacs command -@code{byte-compile-file} or by opening the directory containing the -file, putting point on it and pressing the key @kbd{B}. (In fact, if -the file is compiled then it is only the compiled file that needs to be -in the Emacs load path, but leaving the source file there will do no -harm.) - -@heading Setup - -Setup that is either necessary or desirable consists of adding a small -amount of Emacs Lisp code to your @file{.emacs} initialization file. It -may be necessary (or at least convenient) to make WoMan autoload (if you -are not running GNU Emacs 21 or later) and to set the search path used -by the @code{woman} interface. You may also find it convenient to make -various WoMan menu and key bindings available and to make WoMan -customizable even before WoMan has been loaded. - -It is possible to run WoMan from a command line (from outside or even -from inside Emacs) by suitably configuring your command interpreter. - -@menu -* Autoloading:: Autoloading -* Search Path:: Search Path -* Auto Bindings:: Preloading Menu and Key Bindings -* Auto Customization:: Preloading Customization -* Command Line:: Command Line Access -@end menu - - -@node Autoloading, Search Path, Installation, Installation -@comment node-name, next, previous, up -@section Autoloading -@cindex autoloading - -If you are not running GNU Emacs 21 or later then you are recommended to -add these autoloads to your @file{.emacs} file: - -@lisp -(autoload 'woman "woman" - "Decode and browse a Unix man page." t) -(autoload 'woman-find-file "woman" - "Find, decode and browse a specific Unix man-page file." t) -(autoload 'woman-dired-find-file "woman" - "In dired, run the WoMan man-page browser on this file." t) -@end lisp - -@noindent -(In GNU Emacs 21 and later these autoloads are predefined.) - - -@node Search Path, Auto Bindings, Autoloading, Installation -@comment node-name, next, previous, up -@section Search Path -@cindex search path - -The next step is necessary if you want to use the friendliest WoMan -interface, which is recommended in general. If the @code{MANPATH} -environment variable is set then WoMan will use it; alternatively (or -additionally), if your platform uses a man configuration file (as do -many versions of Linux) then WoMan will use it, provided it can find it. -(This may need configuration. @xref{Interface Options, , Interface -Options}.) If these mechanisms correctly define the search path for man -pages then no further action is required. - -Otherwise you may need to customize the user option -@code{woman-manpath}, and you may also want to customize the user option -@code{woman-path}. @xref{Customization, , Customization}. Now you can -execute the extended command @code{woman} and enter or select a manual -topic using completion, and if necessary select a filename, again using -completion. By default, WoMan suggests the word nearest to point in the -current buffer as the topic. - - -@node Auto Bindings, Auto Customization, Search Path, Installation -@comment node-name, next, previous, up -@section Preloading Menu and Key Bindings -@cindex preloading menu and key bindings -@cindex menu bindings, preloading -@cindex key bindings, preloading -@cindex bindings, preloading - -Once WoMan is loaded it adds an item to the @samp{Help} menu and defines -one or more keys in dired mode to run WoMan on the current file. If you -would like these facilities always to be available, even before WoMan is -loaded, then add the following to your @file{.emacs} file: - -@lisp -(define-key-after menu-bar-manuals-menu [woman] - '(menu-item "Read Man Page (WoMan)..." woman - :help "Man-page documentation Without Man") t) - -(add-hook 'dired-mode-hook - (lambda () - (define-key dired-mode-map "W" 'woman-dired-find-file))) -@end lisp - -(By default, WoMan will automatically define the dired keys @kbd{W} and -@kbd{w} when it loads, but only if they are not already defined. This -behavior is controlled by the user option @code{woman-dired-keys}. -Note that the @code{dired-x} (dired extra) package binds -@code{dired-copy-filename-as-kill} to the key @kbd{w}, although @kbd{W} -appears to be unused. The @code{dired-x} package will over-write the -WoMan binding for @kbd{w}, whereas (by default) WoMan will not overwrite -the @code{dired-x} binding.) - - -@node Auto Customization, Command Line, Auto Bindings, Installation -@comment node-name, next, previous, up -@section Preloading Customization -@cindex preloading customization -@cindex customization, preloading - -WoMan supports the GNU Emacs 20+ customization facility, and puts a -customization group called @code{WoMan} in the @code{Help} group under -the top-level @code{Emacs} group. In order to be able to customize -WoMan without first loading it, add the following to your @file{.emacs} -file: - -@lisp -(defgroup woman nil - "Browse UNIX manual pages `wo (without) man'." - :tag "WoMan" :group 'help :load "woman") -@end lisp - - -@node Command Line, , Auto Customization, Installation -@comment node-name, next, previous, up -@section Command Line Access -@cindex command line access - -If you really want to square the man-woman circle then you can! If you -run the GNU command interpreter @code{bash} then you might care to -define the following @code{bash} function in your @code{bash} -initialization file @file{.bashrc}: - -@example -man() @{ gnudoit -q '(raise-frame (selected-frame)) (woman' \"$1\" ')' ; @} -@end example - -If you use a Microsoft command interpreter (@file{command.com} or -@file{cmd.exe}) then you can create a file called @file{man.bat} -somewhere in your path containing the two lines: - -@example -@@echo off -gnudoit -q (raise-frame (selected-frame)) (woman \"%1\") -@end example - -and then (e.g.@: from a command prompt or the @samp{Run...} option in the -Windows @samp{Start} menu) just execute - -@example -man man_page_name -@end example - -(Of course, if you already have a @code{man} command installed then you -could call these commands @code{woman} instead of @code{man}.) - -The above examples assume that you have the @code{gnuserv} Emacs -client-server package installed (which I recommend). It would be -possible to do something similar by calling Emacs directly, but that is -less satisfactory, because you are likely to end up with multiple copies -of Emacs running, which is generally inelegant, inefficient and -inconvenient. If you run a different command interpreter then something -similar to the above suggestions should be possible. - -@c =================================================================== - -@node Finding, Browsing, Installation, Top +@node Finding, Browsing, Background, Top @comment node-name, next, previous, up @chapter Finding and Formatting Man Pages @cindex using, finding man pages @@ -572,19 +362,18 @@ The topic interface is accessed principally via the command @code{woman}. The same command can be accessed via the menu item -@samp{Help->Manuals->Read Man Page (WoMan)...} either once WoMan has been -loaded or if it is set up specially. @xref{Installation, , Installation -and Setup}. The command reads a manual topic in the minibuffer, which -can be the @dfn{basename} of a man file anywhere in the man file -structure. The ``basename'' in this context means the filename without -any directory component and without any extension or suffix components -that relate to the file type. So, for example, if there is a compressed -source file in Chapter 5 of the UNIX Programmer's Manual with the full -pathname @file{/usr/local/man/man5/man.conf.5.gz} then the topic is -@code{man.conf}. Provided WoMan is configured correctly, this topic -will appear among the completions offered by @code{woman}. If more than -one file has the same topic name then WoMan will prompt for which file -to format. Completion of topics is case insensitive. +@samp{Help->Manuals->Read Man Page (WoMan)...} once WoMan has been +loaded. The command reads a manual topic in the minibuffer, which can +be the @dfn{basename} of a man file anywhere in the man file +structure. The ``basename'' in this context means the filename +without any directory component and without any extension or suffix +components that relate to the file type. So, for example, if there is +a compressed source file in Chapter 5 of the UNIX Programmer's Manual +with the full pathname @file{/usr/local/man/man5/man.conf.5.gz} then +the topic is @code{man.conf}. Provided WoMan is configured correctly, +this topic will appear among the completions offered by @code{woman}. +If more than one file has the same topic name then WoMan will prompt +for which file to format. Completion of topics is case insensitive. Clearly, @code{woman} has to know where to look for man files and there are two customizable user options that store this information: @@ -834,7 +623,7 @@ @cindex fonts @cindex faces -Fonts used by @code{ROFF} are handled by WoMan as faces, the details of +Fonts used by @code{roff} are handled by WoMan as faces, the details of which are customizable. @xref{Faces, , Faces}. WoMan supports both the italic and bold fonts normally used in man pages, together with a single face to represent all unknown fonts (which are occasionally used in @@ -1070,15 +859,12 @@ @chapter Customization @cindex customization -All WoMan user options are customizable, and it is recommended to change -them only via the standard Emacs customization facilities. WoMan -defines a top-level customization group called @code{WoMan} under the -parent group @code{Help}. The WoMan customization group is available -only once WoMan has been loaded unless it is specially set up to be -automatically available. @xref{Auto Customization, , Preloading -Customization}. It can be accessed either via the standard Emacs -facilities, e.g.@: via the @samp{Help->Customize} submenu, or via the -WoMan major mode menu. +All WoMan user options are customizable, and it is recommended to +change them only via the standard Emacs customization facilities. +WoMan defines a top-level customization group called @code{WoMan} +under the parent group @code{Help}. It can be accessed either via the +standard Emacs facilities, e.g.@: via the @samp{Help->Customize} +submenu, or via the WoMan major mode menu. The top-level WoMan group contains only a few general options and three subgroups. The hooks are provided only for special purposes that, for @@ -1385,7 +1171,7 @@ @item woman-ignore A boolean value. If non-@code{nil} then unrecognised requests etc. are -ignored. Default is @code{t}. This gives the standard @code{ROFF} behavior. +ignored. Default is @code{t}. This gives the standard @code{roff} behavior. If @code{nil} then they are left in the buffer, which may aid debugging. @item woman-preserve-ascii @@ -1395,8 +1181,8 @@ saved to a file. Default is @code{nil}. @item woman-emulation -WoMan emulation, currently either @code{NROFF} or @code{TROFF}. Default -is @code{NROFF}. @code{TROFF} emulation is experimental and largely +WoMan emulation, currently either @code{nroff} or @code{troff}. Default +is @code{nroff}. @code{troff} emulation is experimental and largely untested. @end vtable @@ -1417,8 +1203,8 @@ @item woman-italic-face Face for italic font in man pages. Default: italic, underlined, -foreground red. This is overkill! @code{TROFF} uses just italic; -@code{NROFF} uses just underline. You should probably select either +foreground red. This is overkill! @code{troff} uses just italic; +@code{nroff} uses just underline. You should probably select either italic or underline as you prefer, but not both, although italic and underline work together perfectly well! @@ -1494,7 +1280,7 @@ Uninterpreted escape sequences are also logged (in some cases). By resetting the variable @code{woman-ignore} to @code{nil} (by default -it is @code{t}), uninterpreted @code{ROFF} requests can optionally be +it is @code{t}), uninterpreted @code{roff} requests can optionally be left in the formatted buffer to indicate precisely where they occurred. @xref{Interface Options, , Interface Options}. @@ -1514,7 +1300,7 @@ WoMan currently assumes 10 characters per inch horizontally, hence a horizontal resolution of 24 basic units, and 5 lines per inch vertically, hence a vertical resolution of 48 basic units. -(@code{NROFF} uses 240 per inch.) +(@code{nroff} uses 240 per inch.) @heading Vertical spacing and blank lines
--- a/nt/ChangeLog Mon Oct 30 06:52:47 2006 +0000 +++ b/nt/ChangeLog Mon Oct 30 08:54:41 2006 +0000 @@ -1,3 +1,8 @@ +2006-10-29 Juanma Barranquero <lekktu@gmail.com> + + * runemacs.c (WinMain): Process all recognized arguments, not just + the first one. Remove unused variable sec_desc. + 2006-09-24 Eli Zaretskii <eliz@gnu.org> * config.nt (HAVE_LANGINFO_CODESET): Define. @@ -63,7 +68,7 @@ 2005-07-30 Eli Zaretskii <eliz@gnu.org> - * config.nt: (HAVE_GETOPT_H, HAVE_GETOPT_LONG_ONLY): Undefine. + * config.nt (HAVE_GETOPT_H, HAVE_GETOPT_LONG_ONLY): Undefine. 2005-07-29 Juanma Barranquero <lekktu@gmail.com> @@ -437,7 +442,7 @@ 2001-03-26 Eli Zaretskii <eliz@is.elta.co.il> * configure.bat: Make the checkw32api* labels be distinct in the - first 8 characters. + first 8 characters. 2001-03-17 Andrew Innes <andrewi@gnu.org>
--- a/nt/emacs.rc Mon Oct 30 06:52:47 2006 +0000 +++ b/nt/emacs.rc Mon Oct 30 08:54:41 2006 +0000 @@ -6,8 +6,8 @@ #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 22,0,50,0 - PRODUCTVERSION 22,0,50,0 + FILEVERSION 22,0,90,0 + PRODUCTVERSION 22,0,90,0 FILEFLAGSMASK 0x3FL #ifdef EMACSDEBUG FILEFLAGS 0x1L @@ -24,12 +24,12 @@ BEGIN VALUE "CompanyName", "Free Software Foundation\0" VALUE "FileDescription", "GNU Emacs for Windows NT/95/98/2000/ME/XP\0" - VALUE "FileVersion", "22, 0, 50, 0\0" + VALUE "FileVersion", "22, 0, 90, 0\0" VALUE "InternalName", "Emacs\0" VALUE "LegalCopyright", "Copyright (C) 2002, 2003, 2004, 2005, 2006\0" VALUE "OriginalFilename", "emacs.exe" VALUE "ProductName", "Emacs: The extensible self-documenting text editor\0" - VALUE "ProductVersion", "22, 0, 50, 0\0" + VALUE "ProductVersion", "22, 0, 90, 0\0" VALUE "OLESelfRegister", "\0" END END
--- a/nt/runemacs.c Mon Oct 30 06:52:47 2006 +0000 +++ b/nt/runemacs.c Mon Oct 30 08:54:41 2006 +0000 @@ -33,7 +33,7 @@ is running emacs.exe already, you cannot install a newer version. By defining CHOOSE_NEWEST_EXE, you can name your new emacs.exe something else which matches "emacs*.exe", and runemacs will - automatically select the newest emacs executeable in the bin directory. + automatically select the newest emacs executable in the bin directory. (So you'll probably be able to delete the old version some hours/days later). */ @@ -49,7 +49,6 @@ { STARTUPINFO start; SECURITY_ATTRIBUTES sec_attrs; - SECURITY_DESCRIPTOR sec_desc; PROCESS_INFORMATION child; int wait_for_child = FALSE; DWORD priority_class = NORMAL_PRIORITY_CLASS; @@ -85,13 +84,13 @@ goto error; do { - if (wfd.ftLastWriteTime.dwHighDateTime > best_time.dwHighDateTime - || (wfd.ftLastWriteTime.dwHighDateTime == best_time.dwHighDateTime - && wfd.ftLastWriteTime.dwLowDateTime > best_time.dwLowDateTime)) - { - best_time = wfd.ftLastWriteTime; - strcpy (best_name, wfd.cFileName); - } + if (wfd.ftLastWriteTime.dwHighDateTime > best_time.dwHighDateTime + || (wfd.ftLastWriteTime.dwHighDateTime == best_time.dwHighDateTime + && wfd.ftLastWriteTime.dwLowDateTime > best_time.dwLowDateTime)) + { + best_time = wfd.ftLastWriteTime; + strcpy (best_name, wfd.cFileName); + } } while (FindNextFile (fh, &wfd)); FindClose (fh); @@ -109,9 +108,9 @@ { if (strncmp (cmdline+1, "wait", 4) == 0) { - wait_for_child = TRUE; - cmdline += 5; - } + wait_for_child = TRUE; + cmdline += 5; + } else if (strncmp (cmdline+1, "high", 4) == 0) { priority_class = HIGH_PRIORITY_CLASS; @@ -124,7 +123,10 @@ } else break; + /* Look for next argument. */ + while (*++cmdline == ' '); } + strcat (new_cmdline, cmdline); /* Set emacs_dir variable if runemacs was in "%emacs_dir%\bin". */
--- a/src/ChangeLog Mon Oct 30 06:52:47 2006 +0000 +++ b/src/ChangeLog Mon Oct 30 08:54:41 2006 +0000 @@ -1,3 +1,90 @@ +2006-10-29 Mark Davies <mark@mcs.vuw.ac.nz> (tiny change) + + * ralloc.c (relinquish): Use a long for excess space counter to + handle 64-bit case correctly. + +2006-10-29 Jeramey Crawford <jeramey@jeramey.com> + + * m/amdx86-64.h: Add defines for OpenBSD x86-64. + +2006-10-29 Juanma Barranquero <lekktu@gmail.com> + + * window.c (Fdisplay_buffer): Fix typo in docstring. + +2006-10-27 Ben North <ben@redfrontdoor.org> (tiny change) + + * w32term.c (x_draw_glyph_string_foreground): Set background mode + to TRANSPARENT before using overstrike to simulate bold faces. + + * xfaces.c (best_matching_font): Fix logic to decide whether to + use overstriking to simulate bold-face (it was reversed). + +2006-10-23 Kim F. Storm <storm@cua.dk> + + * xdisp.c (remember_mouse_glyph): Do nothing if glyphs are not + initialized. + + * keyboard.c (read_char): Make an element (t . EVENT) in + unread-command-events add EVENT to the current command's key sequence. + (syms_of_keyboard) <unread-command-events>: Update doc. + +2006-10-21 Richard Stallman <rms@gnu.org> + + * minibuf.c (Vread_expression_map): Define here. + (Qread_expression_history): New variable. + (syms_of_minibuf): Initialize them. + (Feval_minibuffer): Use Vread_expression_map and + Qread_expression_history. + +2006-10-21 Kenichi Handa <handa@m17n.org> + + * xfns.c (xic_create_fontsetname): If ADSTYLE field is not a wild + card, change it to "*". + (xic_create_xfontset): Call XCreateFontSet for each single + fontname in fontsetname. + +2006-10-19 Chong Yidong <cyd@stupidchicken.com> + + * callint.c (callint_message): Convert to a Lisp string. + (syms_of_callint): Initialize it. + (callint_message_size): Var deleted. + (Fcall_interactively): Use Fformat instead of doprnt to construct + prompt string. + +2006-10-19 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * xdisp.c (display_mode_line): Clear enabled_p flag on mode-line row. + +2006-10-19 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * macfns.c (Vmac_carbon_version_string) [TARGET_API_MAC_CARBON]: + New variable. + (syms_of_macfns) [TARGET_API_MAC_CARBON]: Defvar it. + +2006-10-19 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> + + * xselect.c (x_handle_selection_request): If the converted_selection + is NIL or XCDR (converted_selection) is NIL, decline the request. + +2006-10-16 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> + + * gtkutil.c (get_utf8_string): Remove warnings with casts. + (xg_tool_bar_button_cb): Ditto + (xg_tool_bar_callback): Ditto. + +2006-10-16 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * dispnew.c (adjust_frame_glyphs_for_frame_redisplay): Remove unused + variable ch_dim. + (adjust_frame_glyphs_for_window_redisplay): Likewise. Don't allocate + menu bar window matrices on non-X systems. + + * mac.c (Fmac_get_preference, Fmac_code_convert_string): Add GCPROs. + + * macterm.c (mac_query_char_extents): Don't return glyph ID if layout + adjustment is needed. + (mac_load_query_font): Check if width and height are positive. + 2006-10-14 Richard Stallman <rms@gnu.org> * sysdep.c (init_sys_modes): Delete DEFVAR_LISP in the wrong place. @@ -48,8 +135,8 @@ (x_draw_glyph_string_foreground): Use overstrike when needed. (x_draw_composite_glyph_string_foreground): Likewise. Use mac_draw_image_string_16 instead of mac_draw_string_16. - (mac_load_query_font): Rename from XLoadQueryFont. Take argument F - instead of DPY. All uses changed. Don't save/restore font. + (mac_load_query_font): Rename from XLoadQueryFont. Take argument + F instead of DPY. All uses changed. Don't save/restore font. 2006-10-07 Ralf Angeli <angeli@caeruleus.net> @@ -92,7 +179,7 @@ 2006-09-30 Eli Zaretskii <eliz@gnu.org> - * config.in Regenerated. + * config.in: Regenerated. 2006-09-29 Juri Linkov <juri@jurta.org> @@ -357,7 +444,7 @@ avoid confusing redisplay by placing the cursor outside the visible window area. -2006-09-13 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> +2006-09-13 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> * xterm.c (x_initialize): Don't install Xt event timer here. (x_timeout_atimer_activated_flag): New var. @@ -2102,7 +2189,7 @@ * 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) +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.
--- a/src/callint.c Mon Oct 30 06:52:47 2006 +0000 +++ b/src/callint.c Mon Oct 30 08:54:41 2006 +0000 @@ -58,11 +58,8 @@ /* Marker used within call-interactively to refer to point. */ static Lisp_Object point_marker; -/* Buffer for the prompt text used in Fcall_interactively. */ -static char *callint_message; - -/* Allocated length of that buffer. */ -static int callint_message_size; +/* String for the prompt text used in Fcall_interactively. */ +static Lisp_Object callint_message; /* ARGSUSED */ DEFUN ("interactive", Finteractive, Sinteractive, 0, UNEVALLED, 0, @@ -266,7 +263,6 @@ Lisp_Object function, record_flag, keys; { Lisp_Object *args, *visargs; - unsigned char **argstrings; Lisp_Object fun; Lisp_Object specs; Lisp_Object filter_specs; @@ -492,7 +488,6 @@ args = (Lisp_Object *) alloca ((count + 1) * sizeof (Lisp_Object)); visargs = (Lisp_Object *) alloca ((count + 1) * sizeof (Lisp_Object)); - argstrings = (unsigned char **) alloca ((count + 1) * sizeof (char *)); varies = (int *) alloca ((count + 1) * sizeof (int)); for (i = 0; i < (count + 1); i++) @@ -516,34 +511,17 @@ prompt1[sizeof prompt1 - 1] = 0; tem1 = (char *) index (prompt1, '\n'); if (tem1) *tem1 = 0; - /* Fill argstrings with a vector of C strings - corresponding to the Lisp strings in visargs. */ - for (j = 1; j < i; j++) - argstrings[j] - = (EQ (visargs[j], Qnil) - ? (unsigned char *) "" - : SDATA (visargs[j])); - /* Process the format-string in prompt1, putting the output - into callint_message. Make callint_message bigger if necessary. - We don't use a buffer on the stack, because the contents - need to stay stable for a while. */ - while (1) - { - int nchars = doprnt (callint_message, callint_message_size, - prompt1, (char *)0, - j - 1, (char **) argstrings + 1); - if (nchars < callint_message_size - 1) - break; - callint_message_size *= 2; - callint_message - = (char *) xrealloc (callint_message, callint_message_size); - } + visargs[0] = build_string (prompt1); + if (index (prompt1, '%')) + callint_message = Fformat (i, visargs); + else + callint_message = visargs[0]; switch (*tem) { case 'a': /* Symbol defined as a function */ - visargs[i] = Fcompleting_read (build_string (callint_message), + visargs[i] = Fcompleting_read (callint_message, Vobarray, Qfboundp, Qt, Qnil, Qnil, Qnil, Qnil); /* Passing args[i] directly stimulates compiler bug */ @@ -555,17 +533,17 @@ args[i] = Fcurrent_buffer (); if (EQ (selected_window, minibuf_window)) args[i] = Fother_buffer (args[i], Qnil, Qnil); - args[i] = Fread_buffer (build_string (callint_message), args[i], Qt); + args[i] = Fread_buffer (callint_message, args[i], Qt); break; case 'B': /* Name of buffer, possibly nonexistent */ - args[i] = Fread_buffer (build_string (callint_message), + args[i] = Fread_buffer (callint_message, Fother_buffer (Fcurrent_buffer (), Qnil, Qnil), Qnil); break; case 'c': /* Character */ - args[i] = Fread_char (build_string (callint_message), Qnil, Qnil); + args[i] = Fread_char (callint_message, Qnil, Qnil); message1_nolog ((char *) 0); /* Passing args[i] directly stimulates compiler bug */ teml = args[i]; @@ -573,7 +551,7 @@ break; case 'C': /* Command: symbol with interactive function */ - visargs[i] = Fcompleting_read (build_string (callint_message), + visargs[i] = Fcompleting_read (callint_message, Vobarray, Qcommandp, Qt, Qnil, Qnil, Qnil, Qnil); /* Passing args[i] directly stimulates compiler bug */ @@ -589,24 +567,24 @@ break; case 'D': /* Directory name. */ - args[i] = Fread_file_name (build_string (callint_message), Qnil, + args[i] = Fread_file_name (callint_message, Qnil, current_buffer->directory, Qlambda, Qnil, Qfile_directory_p); break; case 'f': /* Existing file name. */ - args[i] = Fread_file_name (build_string (callint_message), + args[i] = Fread_file_name (callint_message, Qnil, Qnil, Qlambda, Qnil, Qnil); break; case 'F': /* Possibly nonexistent file name. */ - args[i] = Fread_file_name (build_string (callint_message), + args[i] = Fread_file_name (callint_message, Qnil, Qnil, Qnil, Qnil, Qnil); break; case 'G': /* Possibly nonexistent file name, default to directory alone. */ - args[i] = Fread_file_name (build_string (callint_message), + args[i] = Fread_file_name (callint_message, Qnil, Qnil, Qnil, build_string (""), Qnil); break; @@ -618,7 +596,7 @@ { int speccount1 = SPECPDL_INDEX (); specbind (Qcursor_in_echo_area, Qt); - args[i] = Fread_key_sequence (build_string (callint_message), + args[i] = Fread_key_sequence (callint_message, Qnil, Qnil, Qnil, Qnil); unbind_to (speccount1, Qnil); teml = args[i]; @@ -646,7 +624,7 @@ { int speccount1 = SPECPDL_INDEX (); specbind (Qcursor_in_echo_area, Qt); - args[i] = Fread_key_sequence (build_string (callint_message), + args[i] = Fread_key_sequence (callint_message, Qnil, Qt, Qnil, Qnil); teml = args[i]; visargs[i] = Fkey_description (teml, Qnil); @@ -706,7 +684,7 @@ case 'M': /* String read via minibuffer with inheriting the current input method. */ - args[i] = Fread_string (build_string (callint_message), + args[i] = Fread_string (callint_message, Qnil, Qnil, Qnil, Qt); break; @@ -726,7 +704,7 @@ } first = 0; - tem = Fread_from_minibuffer (build_string (callint_message), + tem = Fread_from_minibuffer (callint_message, Qnil, Qnil, Qnil, Qnil, Qnil, Qnil); if (! STRINGP (tem) || SCHARS (tem) == 0) @@ -736,7 +714,7 @@ } while (! NUMBERP (args[i])); } - visargs[i] = last_minibuf_string; + visargs[i] = args[i]; break; case 'P': /* Prefix arg in raw form. Does no I/O. */ @@ -766,12 +744,12 @@ case 's': /* String read via minibuffer without inheriting the current input method. */ - args[i] = Fread_string (build_string (callint_message), + args[i] = Fread_string (callint_message, Qnil, Qnil, Qnil, Qnil); break; case 'S': /* Any symbol. */ - visargs[i] = Fread_string (build_string (callint_message), + visargs[i] = Fread_string (callint_message, Qnil, Qnil, Qnil, Qnil); /* Passing args[i] directly stimulates compiler bug */ teml = visargs[i]; @@ -780,17 +758,17 @@ case 'v': /* Variable name: symbol that is user-variable-p. */ - args[i] = Fread_variable (build_string (callint_message), Qnil); + args[i] = Fread_variable (callint_message, Qnil); visargs[i] = last_minibuf_string; break; case 'x': /* Lisp expression read but not evaluated */ - args[i] = Fread_minibuffer (build_string (callint_message), Qnil); + args[i] = Fread_minibuffer (callint_message, Qnil); visargs[i] = last_minibuf_string; break; case 'X': /* Lisp expression read and evaluated */ - args[i] = Feval_minibuffer (build_string (callint_message), Qnil); + args[i] = Feval_minibuffer (callint_message, Qnil); visargs[i] = last_minibuf_string; break; @@ -804,13 +782,13 @@ else { args[i] - = Fread_non_nil_coding_system (build_string (callint_message)); + = Fread_non_nil_coding_system (callint_message); visargs[i] = last_minibuf_string; } break; case 'z': /* Coding-system symbol or nil */ - args[i] = Fread_coding_system (build_string (callint_message), Qnil); + args[i] = Fread_coding_system (callint_message, Qnil); visargs[i] = last_minibuf_string; break; @@ -915,6 +893,9 @@ point_marker = Fmake_marker (); staticpro (&point_marker); + callint_message = Qnil; + staticpro (&callint_message); + preserved_fns = Fcons (intern ("region-beginning"), Fcons (intern ("region-end"), Fcons (intern ("point"), @@ -954,10 +935,6 @@ Qmouse_leave_buffer_hook = intern ("mouse-leave-buffer-hook"); staticpro (&Qmouse_leave_buffer_hook); - callint_message_size = 100; - callint_message = (char *) xmalloc (callint_message_size); - - DEFVAR_KBOARD ("prefix-arg", Vprefix_arg, doc: /* The value of the prefix argument for the next editing command. It may be a number, or the symbol `-' for just a minus sign as arg,
--- a/src/dispnew.c Mon Oct 30 06:52:47 2006 +0000 +++ b/src/dispnew.c Mon Oct 30 08:54:41 2006 +0000 @@ -1797,11 +1797,9 @@ X and Y are column/row within the frame glyph matrix where sub-matrices for the window tree rooted at WINDOW must be - allocated. CH_DIM contains the dimensions of the smallest - character that could be used during display. DIM_ONLY_P non-zero - means that the caller of this function is only interested in the - result matrix dimension, and matrix adjustments should not be - performed. + allocated. DIM_ONLY_P non-zero means that the caller of this + function is only interested in the result matrix dimension, and + matrix adjustments should not be performed. The function returns the total width/height of the sub-matrices of the window tree. If called on a frame root window, the computation @@ -2049,8 +2047,7 @@ /* Allocate window matrices for window-based redisplay. W is the - window whose matrices must be allocated/reallocated. CH_DIM is the - size of the smallest character that could potentially be used on W. */ + window whose matrices must be allocated/reallocated. */ static void allocate_matrices_for_window_redisplay (w) @@ -2386,6 +2383,7 @@ /* Allocate/reallocate window matrices. */ allocate_matrices_for_window_redisplay (XWINDOW (FRAME_ROOT_WINDOW (f))); +#ifdef HAVE_X_WINDOWS /* Allocate/ reallocate matrices of the dummy window used to display the menu bar under X when no X toolkit support is available. */ #if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK) @@ -2409,7 +2407,8 @@ XSETFASTINT (w->total_cols, FRAME_TOTAL_COLS (f)); allocate_matrices_for_window_redisplay (w); } -#endif /* not USE_X_TOOLKIT */ +#endif /* not USE_X_TOOLKIT && not USE_GTK */ +#endif /* HAVE_X_WINDOWS */ #ifndef USE_GTK /* Allocate/ reallocate matrices of the tool bar window. If we
--- a/src/gtkutil.c Mon Oct 30 06:52:47 2006 +0000 +++ b/src/gtkutil.c Mon Oct 30 08:54:41 2006 +0000 @@ -523,8 +523,8 @@ char *cp, *up; GError *error = NULL; - while (! (cp = g_locale_to_utf8 (p, -1, &bytes_read, - &bytes_written, &error)) + while (! (cp = g_locale_to_utf8 ((char *)p, -1, &bytes_read, + &bytes_written, &error)) && error->code == G_CONVERT_ERROR_ILLEGAL_SEQUENCE) { ++nr_bad; @@ -541,13 +541,13 @@ if (cp) g_free (cp); up = utf8_str = xmalloc (strlen (str) + nr_bad * 4 + 1); - p = str; - - while (! (cp = g_locale_to_utf8 (p, -1, &bytes_read, + p = (unsigned char *)str; + + while (! (cp = g_locale_to_utf8 ((char *)p, -1, &bytes_read, &bytes_written, &error)) && error->code == G_CONVERT_ERROR_ILLEGAL_SEQUENCE) { - strncpy (up, p, bytes_written); + strncpy (up, (char *)p, bytes_written); sprintf (up + bytes_written, "\\%03o", p[bytes_written]); up[bytes_written+4] = '\0'; up += bytes_written+4; @@ -3362,8 +3362,9 @@ GdkEventButton *event; gpointer user_data; { - g_object_set_data (G_OBJECT (user_data), XG_TOOL_BAR_LAST_MODIFIER, - (gpointer) event->state); + /* Casts to avoid warnings when gpointer is 64 bits and int is 32 bits */ + gpointer ptr = (gpointer) (EMACS_INT) event->state; + g_object_set_data (G_OBJECT (user_data), XG_TOOL_BAR_LAST_MODIFIER, ptr); return FALSE; } @@ -3375,7 +3376,8 @@ { /* The EMACS_INT cast avoids a warning. */ int idx = (int) (EMACS_INT) client_data; - int mod = (int) g_object_get_data (G_OBJECT (w), XG_TOOL_BAR_LAST_MODIFIER); + int mod = (int) (EMACS_INT) g_object_get_data (G_OBJECT (w), + XG_TOOL_BAR_LAST_MODIFIER); FRAME_PTR f = (FRAME_PTR) g_object_get_data (G_OBJECT (w), XG_FRAME_DATA); Lisp_Object key, frame;
--- a/src/keyboard.c Mon Oct 30 06:52:47 2006 +0000 +++ b/src/keyboard.c Mon Oct 30 08:54:41 2006 +0000 @@ -2537,6 +2537,18 @@ c = XCAR (Vunread_command_events); Vunread_command_events = XCDR (Vunread_command_events); + reread = 1; + + /* Undo what sit-for did when it unread additional keys + inside universal-argument. */ + + if (CONSP (c) + && EQ (XCAR (c), Qt)) + { + reread = 0; + c = XCDR (c); + } + /* Undo what read_char_x_menu_prompt did when it unread additional keys returned by Fx_popup_menu. */ if (CONSP (c) @@ -2550,7 +2562,6 @@ && (EQ (c, Qtool_bar) || EQ (c, Qmenu_bar))) *used_mouse_menu = 1; - reread = 1; goto reread_for_input_method; } @@ -11225,7 +11236,10 @@ DEFVAR_LISP ("unread-command-events", &Vunread_command_events, doc: /* List of events to be read as the command input. -These events are processed first, before actual keyboard input. */); +These events are processed first, before actual keyboard input. +Events read from this list are not normally added to `this-command-keys', +as they will already have been added once as they were read for the first time. +An element of the form (t . EVENT) forces EVENT to be added to that list. */); Vunread_command_events = Qnil; DEFVAR_INT ("unread-command-char", &unread_command_char,
--- a/src/m/amdx86-64.h Mon Oct 30 06:52:47 2006 +0000 +++ b/src/m/amdx86-64.h Mon Oct 30 08:54:41 2006 +0000 @@ -118,7 +118,14 @@ #undef LIB_STANDARD #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o -#else /* !__FreeBSD__ */ +#elif defined(__OpenBSD__) + +#undef START_FILES +#define START_FILES pre-crt0.o /usr/lib/crt0.o /usr/lib/crtbegin.o +#undef LIB_STANDARD +#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o + +#else /* !__OpenBSD__ && !__FreeBSD__ */ #undef START_FILES #define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o
--- a/src/mac.c Mon Oct 30 06:52:47 2006 +0000 +++ b/src/mac.c Mon Oct 30 08:54:41 2006 +0000 @@ -4611,6 +4611,7 @@ CFStringRef app_id, key_str; CFPropertyListRef app_plist = NULL, plist; Lisp_Object result = Qnil, tmp; + struct gcpro gcpro1, gcpro2; if (STRINGP (key)) key = Fcons (key, Qnil); @@ -4627,6 +4628,8 @@ if (!NILP (hash_bound)) CHECK_NUMBER (hash_bound); + GCPRO2 (key, format); + BLOCK_INPUT; app_id = kCFPreferencesCurrentApplication; @@ -4681,6 +4684,8 @@ UNBLOCK_INPUT; + UNGCPRO; + return result; } @@ -4846,6 +4851,7 @@ Lisp_Object string, source, target, normalization_form; { Lisp_Object result = Qnil; + struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; CFStringEncoding src_encoding, tgt_encoding; CFStringRef str = NULL; @@ -4856,6 +4862,8 @@ CHECK_SYMBOL (target); CHECK_SYMBOL (normalization_form); + GCPRO4 (string, source, target, normalization_form); + BLOCK_INPUT; src_encoding = get_cfstring_encoding_from_lisp (source); @@ -4896,6 +4904,8 @@ UNBLOCK_INPUT; + UNGCPRO; + return result; }
--- a/src/macfns.c Mon Oct 30 06:52:47 2006 +0000 +++ b/src/macfns.c Mon Oct 30 08:54:41 2006 +0000 @@ -51,6 +51,14 @@ extern void free_frame_menubar (); +#if TARGET_API_MAC_CARBON + +/* Carbon version info */ + +static Lisp_Object Vmac_carbon_version_string; + +#endif /* TARGET_API_MAC_CARBON */ + /* Non-zero means we're allowed to display an hourglass cursor. */ int display_hourglass_p; @@ -4718,6 +4726,22 @@ Chinese, Japanese, and Korean. */); Vx_pixel_size_width_font_regexp = Qnil; +#if TARGET_API_MAC_CARBON + DEFVAR_LISP ("mac-carbon-version-string", &Vmac_carbon_version_string, + doc: /* Version info for Carbon API. */); + { + OSErr err; + UInt32 response; + char carbon_version[16] = "Unknown"; + + err = Gestalt (gestaltCarbonVersion, &response); + if (err == noErr) + sprintf (carbon_version, "%u.%u.%u", + (response >> 8) & 0xf, (response >> 4) & 0xf, response & 0xf); + Vmac_carbon_version_string = build_string (carbon_version); + } +#endif /* TARGET_API_MAC_CARBON */ + /* X window properties. */ defsubr (&Sx_change_window_property); defsubr (&Sx_delete_window_property);
--- a/src/macterm.c Mon Oct 30 06:52:47 2006 +0000 +++ b/src/macterm.c Mon Oct 30 08:54:41 2006 +0000 @@ -1200,7 +1200,12 @@ err1 = ATSUGetGlyphInfo (text_layout, kATSUFromTextBeginning, kATSUToTextEnd, &count, &glyph_info_array); - if (err1 == noErr) + if (err1 == noErr + /* Make sure that we don't have to make layout + adjustments. */ + && glyph_info_array.glyphs[0].deltaY == 0.0f + && glyph_info_array.glyphs[0].idealX == 0.0f + && glyph_info_array.glyphs[0].screenX == 0) { xassert (glyph_info_array.glyphs[0].glyphID); *cg_glyph = glyph_info_array.glyphs[0].glyphID; @@ -7982,7 +7987,8 @@ NULL #endif ); - if (err != noErr) + if (err != noErr + || space_bounds->width <= 0 || FONT_HEIGHT (font) <= 0) { mac_unload_font (&one_mac_display_info, font); return NULL;
--- a/src/minibuf.c Mon Oct 30 06:52:47 2006 +0000 +++ b/src/minibuf.c Mon Oct 30 08:54:41 2006 +0000 @@ -132,7 +132,8 @@ static Lisp_Object last_exact_completion; -extern Lisp_Object Voverriding_local_map; +/* Keymap for reading expressions. */ +Lisp_Object Vread_expression_map; Lisp_Object Quser_variable_p; @@ -142,6 +143,10 @@ Lisp_Object Qcase_fold_search; +Lisp_Object Qread_expression_history; + +extern Lisp_Object Voverriding_local_map; + extern Lisp_Object Qmouse_face; extern Lisp_Object Qfield; @@ -1040,7 +1045,9 @@ (prompt, initial_contents) Lisp_Object prompt, initial_contents; { - return Feval (Fread_minibuffer (prompt, initial_contents)); + return Feval (read_minibuf (Vread_expression_map, initial_contents, + prompt, Qnil, 1, Qread_expression_history, + make_number (0), Qnil, 0, 0)); } /* Functions that use the minibuffer to read various things. */ @@ -2799,6 +2806,9 @@ Qcase_fold_search = intern ("case-fold-search"); staticpro (&Qcase_fold_search); + Qread_expression_history = intern ("read-expression-history"); + staticpro (&Qread_expression_history); + DEFVAR_LISP ("read-buffer-function", &Vread_buffer_function, doc: /* If this is non-nil, `read-buffer' does its work by calling this function. */); Vread_buffer_function = Qnil; @@ -2924,6 +2934,10 @@ Vminibuffer_prompt_properties = Fcons (intern ("read-only"), Fcons (Qt, Qnil)); + DEFVAR_LISP ("read-expression-map", &Vread_expression_map, + doc: /* Minibuffer keymap used for reading Lisp expressions. */); + Vread_expression_map = Qnil; + defsubr (&Sset_minibuffer_window); defsubr (&Sread_from_minibuffer); defsubr (&Seval_minibuffer);
--- a/src/ralloc.c Mon Oct 30 06:52:47 2006 +0000 +++ b/src/ralloc.c Mon Oct 30 08:54:41 2006 +0000 @@ -330,7 +330,7 @@ relinquish () { register heap_ptr h; - int excess = 0; + long excess = 0; /* Add the amount of space beyond break_value in all heaps which have extend beyond break_value at all. */
--- a/src/w32term.c Mon Oct 30 06:52:47 2006 +0000 +++ b/src/w32term.c Mon Oct 30 08:54:41 2006 +0000 @@ -1742,7 +1742,10 @@ { /* For overstriking (to simulate bold-face), draw the characters again shifted to the right by one pixel. */ + int old_BkMode = SetBkMode (s->hdc, TRANSPARENT); w32_text_out (s, x + 1, s->ybase - boff, s->char2b, s->nchars); + if (old_BkMode && old_BkMode != TRANSPARENT) + SetBkMode (s->hdc, old_BkMode); } } if (s->font && s->font->hfont)
--- a/src/window.c Mon Oct 30 06:52:47 2006 +0000 +++ b/src/window.c Mon Oct 30 08:54:41 2006 +0000 @@ -3588,7 +3588,7 @@ DEFUN ("display-buffer", Fdisplay_buffer, Sdisplay_buffer, 1, 3, "BDisplay buffer: \nP", doc: /* Make BUFFER appear in some window but don't select it. -BUFFER must be the name of an existing buffer, or, when called from Lisp, +BUFFER must be the name of an existing buffer, or, when called from Lisp, a buffer. If BUFFER is shown already in some window, just use that one, unless the window is the selected window and the optional second
--- a/src/xdisp.c Mon Oct 30 06:52:47 2006 +0000 +++ b/src/xdisp.c Mon Oct 30 08:54:41 2006 +0000 @@ -2100,8 +2100,9 @@ /* Try to determine frame pixel position and size of the glyph under frame pixel coordinates X/Y on frame F. */ - window = window_from_coordinates (f, gx, gy, &part, &x, &y, 0); - if (NILP (window)) + if (!f->glyphs_initialized_p + || (window = window_from_coordinates (f, gx, gy, &part, &x, &y, 0), + NILP (window))) { width = FRAME_SMALLEST_CHAR_WIDTH (f); height = FRAME_SMALLEST_FONT_HEIGHT (f); @@ -16739,6 +16740,9 @@ int count = SPECPDL_INDEX (); init_iterator (&it, w, -1, -1, NULL, face_id); + /* Don't extend on a previously drawn mode-line. + This may happen if called from pos_visible_p. */ + it.glyph_row->enabled_p = 0; prepare_desired_row (it.glyph_row); it.glyph_row->mode_line_p = 1;
--- a/src/xfaces.c Mon Oct 30 06:52:47 2006 +0000 +++ b/src/xfaces.c Mon Oct 30 08:54:41 2006 +0000 @@ -7107,10 +7107,10 @@ { /* 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 + don't overstrike an already-bold font unless the desired weight grossly exceeds the available weight. */ if (got_weight > XLFD_WEIGHT_MEDIUM) - *needs_overstrike = (got_weight - want_weight) > 2; + *needs_overstrike = (want_weight - got_weight) > 2; else *needs_overstrike = 1; }
--- a/src/xfns.c Mon Oct 30 06:52:47 2006 +0000 +++ b/src/xfns.c Mon Oct 30 08:54:41 2006 +0000 @@ -2006,13 +2006,14 @@ else { int len; - char *p1 = NULL, *p2 = NULL; + char *p1 = NULL, *p2 = NULL, *p3 = NULL; char *font_allcs = NULL; char *font_allfamilies = NULL; char *font_all = NULL; char *allcs = "*-*-*-*-*-*-*"; char *allfamilies = "-*-*-"; char *all = "*-*-*-*-"; + char *base; for (i = 0, p = base_fontname; i < 8; p++) { @@ -2023,8 +2024,27 @@ p1 = p + 1; else if (i == 7) p2 = p + 1; + else if (i == 6) + p3 = p + 1; } } + /* If base_fontname specifies ADSTYLE, make it a + wildcard. */ + if (*p3 != '*') + { + int diff = (p2 - p3) - 2; + + base = alloca (strlen (base_fontname) + 1); + bcopy (base_fontname, base, p3 - base_fontname); + base[p3 - base_fontname] = '*'; + base[(p3 - base_fontname) + 1] = '-'; + strcpy (base + (p3 - base_fontname) + 2, p2); + p = base + (p - base_fontname) - diff; + p1 = base + (p1 - base_fontname); + p2 = base + (p2 - base_fontname) - diff; + base_fontname = base; + } + /* Build the font spec that matches all charsets. */ len = p - base_fontname + strlen (allcs) + 1; font_allcs = (char *) alloca (len); @@ -2032,7 +2052,8 @@ bcopy (base_fontname, font_allcs, p - base_fontname); strcat (font_allcs, allcs); - /* Build the font spec that matches all families. */ + /* Build the font spec that matches all families and + add-styles. */ len = p - p1 + strlen (allcs) + strlen (allfamilies) + 1; font_allfamilies = (char *) alloca (len); bzero (font_allfamilies, len); @@ -2099,13 +2120,28 @@ if (!xfs) { char *fontsetname = xic_create_fontsetname (base_fontname, False); + char *p0 = fontsetname, *p1; /* New fontset. */ - xfs = XCreateFontSet (FRAME_X_DISPLAY (f), - fontsetname, &missing_list, - &missing_count, &def_string); - if (missing_list) - XFreeStringList (missing_list); + /* FONTSETNAME contains a list of font names (specific fonts + first, general fonts last), but giving that to XCreateFontSet + at once occasionally fails (bug of X?). So, we try to call + XCreateFontSet for each fontname. */ + + while (p0) + { + p1 = strchr (p0, ','); + if (p1) + *p1 = '\0'; + xfs = XCreateFontSet (FRAME_X_DISPLAY (f), + p0, &missing_list, + &missing_count, &def_string); + if (missing_list) + XFreeStringList (missing_list); + if (xfs) + break; + p0 = p1 ? p1 + 1 : NULL; + } xfree (fontsetname); }
--- a/src/xselect.c Mon Oct 30 06:52:47 2006 +0000 +++ b/src/xselect.c Mon Oct 30 08:54:41 2006 +0000 @@ -956,6 +956,12 @@ Atom type; int nofree; + if (CONSP (converted_selection) && NILP (XCDR (converted_selection))) + { + x_decline_selection_request (event); + goto DONE2; + } + lisp_data_to_selection_data (SELECTION_EVENT_DISPLAY (event), converted_selection, &data, &type, &size, &format, &nofree); @@ -971,6 +977,8 @@ if (!nofree) xfree (data); } + + DONE2: unbind_to (count, Qnil); DONE: