diff --git a/ChangeLog b/ChangeLog index 2973030acc6..42bdbc02971 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-09-15 Ulf Jasper + + * Makefile.in (install-arch-indep, uninstall): + Handle newsticker manual. + (info): Add - to commands. + 2005-09-11 Kim F. Storm * AUTHORS: Regenerate. diff --git a/Makefile.in b/Makefile.in index c8fa29b3439..56551e319ce 100644 --- a/Makefile.in +++ b/Makefile.in @@ -486,7 +486,7 @@ install-arch-indep: mkdir info chmod a+r ${infodir}/dir); \ fi; \ cd ${srcdir}/info ; \ - for f in ada-mode* autotype* calc* ccmode* cl* dired-x* ebrowse* ediff* efaq* eintr* elisp* emacs* emacs-mime* emacs-xtra* eshell* eudc* flymake* forms* gnus* idlwave* info* message* mh-e* org* pcl-cvs* pgg* reftex* sc* ses* sieve* speedbar* tramp* vip* widget* woman* smtpmail* url*; do \ + for f in ada-mode* autotype* calc* ccmode* cl* dired-x* ebrowse* ediff* efaq* eintr* elisp* emacs* emacs-mime* emacs-xtra* eshell* eudc* flymake* forms* gnus* idlwave* info* message* mh-e* newsticker* org* pcl-cvs* pgg* reftex* sc* ses* sieve* speedbar* tramp* vip* widget* woman* smtpmail* url*; do \ (cd $${thisdir}; \ ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f; \ chmod a+r ${infodir}/$$f); \ @@ -496,7 +496,7 @@ install-arch-indep: mkdir info thisdir=`/bin/pwd`; \ if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \ then \ - for f in ada-mode autotype calc ccmode cl dired-x ebrowse ediff efaq elisp eintr emacs emacs-mime emacs-xtra eshell eudc flymake forms gnus idlwave info message mh-e org pcl-cvs pgg reftex sc ses sieve speedbar tramp vip viper widget woman smtpmail url; do \ + for f in ada-mode autotype calc ccmode cl dired-x ebrowse ediff efaq elisp eintr emacs emacs-mime emacs-xtra eshell eudc flymake forms gnus idlwave info message mh-e newsticker org pcl-cvs pgg reftex sc ses sieve speedbar tramp vip viper widget woman smtpmail url; do \ (cd $${thisdir}; \ ${INSTALL_INFO} --info-dir=${infodir} ${infodir}/$$f); \ done; \ @@ -562,7 +562,7 @@ uninstall: done (cd ${archlibdir} && rm -f fns-*) -rm -rf ${libexecdir}/emacs/${version} - (cd ${infodir} && rm -f cl* ada-mode* autotype* calc* ccmode* ebrowse* efaq* eintr elisp* eshell* eudc* idlwave* message* pcl-cvs* reftex* speedbar* tramp* widget* woman* dired-x* ediff* emacs* emacs-xtra* flymake* forms* gnus* info* mh-e* org* sc* ses* vip* smtpmail* url*) + (cd ${infodir} && rm -f cl* ada-mode* autotype* calc* ccmode* ebrowse* efaq* eintr elisp* eshell* eudc* idlwave* message* pcl-cvs* reftex* speedbar* tramp* widget* woman* dired-x* ediff* emacs* emacs-xtra* flymake* forms* gnus* info* mh-e* newsticker* org* sc* ses* vip* smtpmail* url*) (cd ${man1dir} && rm -f emacs${manext} emacsclient${manext} etags${manext} ctags${manext}) (cd ${bindir} && rm -f $(EMACSFULL) $(EMACS)) @@ -721,9 +721,9 @@ force-info: # put the info files in $(srcdir), # so we can do ok running make in the build dir. info: force-info - (cd man; $(MAKE) $(MFLAGS) info) - (cd lispref; $(MAKE) $(MFLAGS) info) - (cd lispintro; $(MAKE) $(MFLAGS) info) + -(cd man; $(MAKE) $(MFLAGS) info) + -(cd lispref; $(MAKE) $(MFLAGS) info) + -(cd lispintro; $(MAKE) $(MFLAGS) info) dvi: (cd man; $(MAKE) $(MFLAGS) dvi) (cd lispref; $(MAKE) $(MFLAGS) elisp.dvi) diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE index fe1bad8241c..1fbb66d2a4e 100644 --- a/admin/FOR-RELEASE +++ b/admin/FOR-RELEASE @@ -46,26 +46,11 @@ and has already been posted on the developers' list, but it is on the back burner waiting for a legal comment or an alternate implementation (around 30 lines of code). +** goeran@uddeborg.se's Sep 13 crash report +about trying to display the invalid gif file poison.gif. + * BUGS -** Fix recognition of shell's `dirs' command. - -Is his change right? - -Date: Wed, 29 Jun 2005 18:21:28 -0500 (CDT) -From: kevin.gal@verizon.net - -When I use tcsh (which echoes command input) in a shell buffer, -entering "M-x dirs" fails because it mistakens the echoed "dirs" -string as the directory string to use as input when changing the -buffers default directory. The attached gziped patch file contains a -fix. The patch also binds the "dirs" command to "\e\C-m" in -shell-mode-map (previously unbound) to make it easy to invoke. -Finally, a test has been added to see if "shell-dirstack-query" is -non-nil. If so, it is not overwritten. - -To enable the fix, the user must set comint-process-echoes to t. - ** TCP server processes do not work on Windows. TCP/IP server processes created with `make-network-process' consume diff --git a/etc/ChangeLog b/etc/ChangeLog index fb751b8ac22..ada960359ff 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,4 +1,17 @@ -2005-09-00 Kevin Ryde +2005-09-17 Romain Francoise + + * gfdl.1: Update to version 1.2. Delete UC macro. + +2005-09-15 Kenichi Handa + + * PROBLEMS: Fix the paragraph describing the limitation of + UTF-8/16/7. + +2005-09-14 Romain Francoise + + * NEWS: Add entry for write-region-inhibit-fsync. + +2005-09-09 Kevin Ryde * MORE.STUFF: Update url for calculator.el. diff --git a/etc/NEWS b/etc/NEWS index b9090c53e54..48c5459e767 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -692,6 +692,12 @@ supplied. This behavior is analogous to `write-file'. controls whether or not the function `make-auto-save-file-name' will attempt to construct a unique auto-save name (e.g. for remote files). ++++ +*** The new option `write-region-inhibit-fsync' disables calls to fsync +in `write-region'. This can be useful on laptops to avoid spinning up +the hard drive upon each file save. Enabling this variable may result +in data loss, use with care. + +++ *** If the user visits a file larger than `large-file-warning-threshold', Emacs asks for confirmation. @@ -1553,6 +1559,14 @@ colors as on X. * New Modes and Packages in Emacs 22.1 +--- +** Newsticker is now part of the Emacs distribution. + +Newsticker asynchronously retrieves headlines (RSS) from a list of news +sites, prepares these headlines for reading, and allows for loading the +corresponding articles in a web browser. Its documentation is in a +separate manual. + +++ ** Filesets are collections of files. You can define a fileset in various ways, such as based on a directory tree or based on @@ -3066,11 +3080,17 @@ updated `skeleton-insert' docstring explains these new features along with other details of skeleton construction. --- -** New variable `hs-set-up-overlay' allows customization of the overlay +** Hideshow mode changes + +*** New variable `hs-set-up-overlay' allows customization of the overlay used to effect hiding for hideshow minor mode. Integration with isearch handles the overlay property `display' specially, preserving it during temporary overlay showing in the course of an isearch operation. +*** New variable `hs-allow-nesting' non-nil means that hiding a block does +not discard the hidden state of any "internal" blocks; when the parent +block is later shown, the internal blocks remain hidden. Default is nil. + +++ ** `hide-ifdef-mode' now uses overlays rather than selective-display to hide its text. This should be mostly transparent but slightly @@ -4661,6 +4681,17 @@ When you click the mouse when the mouse pointer is over a hot-spot, an event is composed by combining the ID of the hot-spot with the mouse event, e.g. [area4 mouse-1] if the hot-spot's ID is `area4'. ++++ +*** The function `find-image' now searches in etc/images/ and etc/. +The new variable `image-load-path' is a list of locations in which to +search for image files. The default is to search in etc/images, then +in etc/, and finally in the directories specified by `load-path'. +Subdirectories of etc/ and etc/images are not recursively searched; if +you put an image file in a subdirectory, you have to specify it +explicitly; for example, if an image is put in etc/images/foo/bar.xpm: + + (defimage foo-image '((:type xpm :file "foo/bar.xpm"))) + ** Mouse pointer features: +++ (lispref) diff --git a/etc/PROBLEMS b/etc/PROBLEMS index 03b2820d035..b9f6236d38f 100644 --- a/etc/PROBLEMS +++ b/etc/PROBLEMS @@ -845,9 +845,16 @@ mule-unicode-0100-24ff:-gnu-unifont-*-iso10646-1 ** The UTF-8/16/7 coding systems don't encode CJK (Far Eastern) characters. -Emacs by default only supports the parts of the Unicode BMP whose code -points are in the ranges 0000-33ff and e000-ffff. This excludes: most -of CJK, Yi and Hangul, as well as everything outside the BMP. +Emacs directly supports the Unicode BMP whose code points are in the +ranges 0000-33ff and e000-ffff, and indirectly supports the parts of +CJK characters belonging to these legacy charsets: + + GB2312, Big5, JISX0208, JISX0212, JISX0213-1, JISX0213-2, KSC5601 + +The latter support is done in Utf-Translate-Cjk mode (turned on by +default). Which Unicode CJK characters are decoded into which Emacs +charset is decided by the current language environment. For instance, +in Chinese-GB, most of them are decoded into chinese-gb2312. If you read UTF-8 data with code points outside these ranges, the characters appear in the buffer as raw bytes of the original UTF-8 @@ -857,13 +864,6 @@ If you read such characters from UTF-16 or UTF-7 data, they are substituted with the Unicode `replacement character', and you lose information. -To edit such UTF data, turn on Utf-Translate-Cjk mode, which makes -many common CJK characters available for encoding and decoding and can -be extended by updating the tables it uses. This also allows you to -save as UTF buffers containing characters decoded by the chinese-, -japanese- and korean- coding systems, e.g. cut and pasted from -elsewhere. - ** Mule-UCS loads very slowly. Changes to Emacs internals interact badly with Mule-UCS's `un-define' diff --git a/etc/gfdl.1 b/etc/gfdl.1 index b8e627971aa..af660f67787 100644 --- a/etc/gfdl.1 +++ b/etc/gfdl.1 @@ -1,10 +1,9 @@ -.TH GFDL 1 "2001 April 23" -.UC 4 +.TH GFDL 1 "2005 September 17" .SH NAME GFDL \- The GNU Free Documentation License .ce -Version 1.1, March 2000 +Version 1.2, November 2002 .hy 0 .na @@ -23,12 +22,12 @@ of this license document, but changing it is not allowed. .SH 0. PREAMBLE The purpose of this License is to make a manual, textbook, or other -written document "free" in the sense of freedom: to assure everyone -the effective freedom to copy and redistribute it, with or without -modifying it, either commercially or noncommercially. Secondarily, -this License preserves for the author and publisher a way to get -credit for their work, while not being considered responsible for -modifications made by others. +functional and useful document "free" in the sense of freedom: to +assure everyone the effective freedom to copy and redistribute it, +with or without modifying it, either commercially or noncommercially. +Secondarily, this License preserves for the author and publisher a way +to get credit for their work, while not being considered responsible +for modifications made by others. This License is a kind of "copyleft", which means that derivative works of the document must themselves be free in the same sense. It @@ -45,11 +44,15 @@ principally for works whose purpose is instruction or reference. .SH 1. APPLICABILITY AND DEFINITIONS -This License applies to any manual or other work that contains a -notice placed by the copyright holder saying it can be distributed -under the terms of this License. The "Document", below, refers to any -such manual or work. Any member of the public is a licensee, and is -addressed as "you." +This License applies to any manual or other work, in any medium, that +contains a notice placed by the copyright holder saying it can be +distributed under the terms of this License. Such a notice grants a +world-wide, royalty-free license, unlimited in duration, to use that +work under the conditions stated herein. The "Document", below, +refers to any such manual or work. Any member of the public is a +licensee, and is addressed as "you". You accept the license if you +copy, modify or distribute the work in a way requiring permission +under copyright law. A "Modified Version" of the Document means any work containing the Document or a portion of it, either copied verbatim, or with @@ -59,7 +62,7 @@ A "Secondary Section" is a named appendix or a front-matter section of the Document that deals exclusively with the relationship of the publishers or authors of the Document to the Document's overall subject (or to related matters) and contains nothing that could fall directly -within that overall subject. (For example, if the Document is in part a +within that overall subject. (Thus, if the Document is in part a textbook of mathematics, a Secondary Section may not explain any mathematics.) The relationship could be a matter of historical connection with the subject or with related matters, or of legal, @@ -68,33 +71,40 @@ them. The "Invariant Sections" are certain Secondary Sections whose titles are designated, as being those of Invariant Sections, in the notice -that says that the Document is released under this License. +that says that the Document is released under this License. If a +section does not fit the above definition of Secondary then it is not +allowed to be designated as Invariant. The Document may contain zero +Invariant Sections. If the Document does not identify any Invariant +Sections then there are none. The "Cover Texts" are certain short passages of text that are listed, as Front-Cover Texts or Back-Cover Texts, in the notice that says that -the Document is released under this License. +the Document is released under this License. A Front-Cover Text may +be at most 5 words, and a Back-Cover Text may be at most 25 words. A "Transparent" copy of the Document means a machine-readable copy, represented in a format whose specification is available to the -general public, whose contents can be viewed and edited directly and +general public, that is suitable for revising the document straightforwardly with generic text editors or (for images composed of pixels) generic paint programs or (for drawings) some widely available drawing editor, and that is suitable for input to text formatters or for automatic translation to a variety of formats suitable for input to text formatters. A copy made in an otherwise Transparent file -format whose markup has been designed to thwart or discourage -subsequent modification by readers is not Transparent. A copy that is -not "Transparent" is called "Opaque." +format whose markup, or absence of markup, has been arranged to thwart +or discourage subsequent modification by readers is not Transparent. +An image format is not Transparent if used for any substantial amount +of text. A copy that is not "Transparent" is called "Opaque". Examples of suitable formats for Transparent copies include plain ASCII without markup, Texinfo input format, LaTeX input format, SGML or XML using a publicly available DTD, and standard-conforming simple -HTML designed for human modification. Opaque formats include -PostScript, PDF, proprietary formats that can be read and edited only -by proprietary word processors, SGML or XML for which the DTD and/or +HTML, PostScript or PDF designed for human modification. Examples of +transparent image formats include PNG, XCF and JPG. Opaque formats +include proprietary formats that can be read and edited only by +proprietary word processors, SGML or XML for which the DTD and/or processing tools are not generally available, and the -machine-generated HTML produced by some word processors for output -purposes only. +machine-generated HTML, PostScript or PDF produced by some word +processors for output purposes only. The "Title Page" means, for a printed book, the title page itself, plus such following pages as are needed to hold, legibly, the material @@ -103,6 +113,21 @@ formats which do not have any title page as such, "Title Page" means the text near the most prominent appearance of the work's title, preceding the beginning of the body of the text. +A section "Entitled XYZ" means a named subunit of the Document whose +title either is precisely XYZ or contains XYZ in parentheses following +text that translates XYZ in another language. (Here XYZ stands for a +specific section name mentioned below, such as "Acknowledgements", +"Dedications", "Endorsements", or "History".) To "Preserve the Title" +of such a section when you modify the Document means that it remains a +section "Entitled XYZ" according to this definition. + +The Document may include Warranty Disclaimers next to the notice which +states that this License applies to the Document. These Warranty +Disclaimers are considered to be included by reference in this +License, but only as regards disclaiming warranties: any other +implication that these Warranty Disclaimers may have is void and has +no effect on the meaning of this License. + .SH 2. VERBATIM COPYING You may copy and distribute the Document in any medium, either @@ -120,9 +145,10 @@ you may publicly display copies. .SH 3. COPYING IN QUANTITY -If you publish printed copies of the Document numbering more than 100, -and the Document's license notice requires Cover Texts, you must enclose -the copies in covers that carry, clearly and legibly, all these Cover +If you publish printed copies (or copies in media that commonly have +printed covers) of the Document, numbering more than 100, and the +Document's license notice requires Cover Texts, you must enclose the +copies in covers that carry, clearly and legibly, all these Cover Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on the back cover. Both covers must also clearly and legibly identify you as the publisher of these copies. The front cover must present @@ -140,16 +166,15 @@ pages. If you publish or distribute Opaque copies of the Document numbering more than 100, you must either include a machine-readable Transparent copy along with each Opaque copy, or state in or with each Opaque copy -a publicly-accessible computer-network location containing a complete -Transparent copy of the Document, free of added material, which the -general network-using public has access to download anonymously at no -charge using public-standard network protocols. If you use the latter -option, you must take reasonably prudent steps, when you begin -distribution of Opaque copies in quantity, to ensure that this -Transparent copy will remain thus accessible at the stated location -until at least one year after the last time you distribute an Opaque -copy (directly or through your agents or retailers) of that edition to -the public. +a computer-network location from which the general network-using +public has access to download using public-standard network protocols +a complete Transparent copy of the Document, free of added material. +If you use the latter option, you must take reasonably prudent steps, +when you begin distribution of Opaque copies in quantity, to ensure +that this Transparent copy will remain thus accessible at the stated +location until at least one year after the last time you distribute an +Opaque copy (directly or through your agents or retailers) of that +edition to the public. It is requested, but not required, that you contact the authors of the Document well before redistributing any large number of copies, to give @@ -165,17 +190,18 @@ and modification of the Modified Version to whoever possesses a copy of it. In addition, you must do these things in the Modified Version: .TP A. -Use in the Title Page (and on the covers, if any) a title distinct -from that of the Document, and from those of previous versions -(which should, if there were any, be listed in the History section -of the Document). You may use the same title as a previous version -if the original publisher of that version gives permission. +Use in the Title Page (and on the covers, if any) a title distinct from +that of the Document, and from those of previous versions (which should, +if there were any, be listed in the History section of the Document). +You may use the same title as a previous version if the original +publisher of that version gives permission. .TP B. List on the Title Page, as authors, one or more persons or entities -responsible for authorship of the modifications in the Modified -Version, together with at least five of the principal authors of the -Document (all of its principal authors, if it has less than five). +responsible for authorship of the modifications in the Modified Version, +together with at least five of the principal authors of the Document +(all of its principal authors, if it has fewer than five), unless they +release you from this requirement. .TP C. State on the Title page the name of the publisher of the @@ -190,8 +216,8 @@ adjacent to the other copyright notices. .TP F. Include, immediately after the copyright notices, a license notice -giving the public permission to use the Modified Version under the -terms of this License, in the form shown in the Addendum below. +giving the public permission to use the Modified Version under the terms +of this License, in the form shown in the Addendum below. .TP G. Preserve in that license notice the full lists of Invariant Sections @@ -201,41 +227,44 @@ H. Include an unaltered copy of this License. .TP I. -Preserve the section entitled "History", and its title, and add to -it an item stating at least the title, year, new authors, and -publisher of the Modified Version as given on the Title Page. If -there is no section entitled "History" in the Document, create one -stating the title, year, authors, and publisher of the Document as -given on its Title Page, then add an item describing the Modified -Version as stated in the previous sentence. +Preserve the section Entitled "History", Preserve its Title, and add to +it an item stating at least the title, year, new authors, and publisher +of the Modified Version as given on the Title Page. If there is no +section Entitled "History" in the Document, create one stating the +title, year, authors, and publisher of the Document as given on its +Title Page, then add an item describing the Modified Version as stated +in the previous sentence. .TP J. -Preserve the network location, if any, given in the Document for -public access to a Transparent copy of the Document, and likewise -the network locations given in the Document for previous versions -it was based on. These may be placed in the "History" section. -You may omit a network location for a work that was published at -least four years before the Document itself, or if the original -publisher of the version it refers to gives permission. +Preserve the network location, if any, given in the Document for public +access to a Transparent copy of the Document, and likewise the network +locations given in the Document for previous versions it was based on. +These may be placed in the "History" section. You may omit a network +location for a work that was published at least four years before the +Document itself, or if the original publisher of the version it refers +to gives permission. .TP K. -In any section entitled "Acknowledgements" or "Dedications", -preserve the section's title, and preserve in the section all the -substance and tone of each of the contributor acknowledgements -and/or dedications given therein. +For any section Entitled "Acknowledgements" or "Dedications", Preserve +the Title of the section, and preserve in the section all the substance +and tone of each of the contributor acknowledgements and/or dedications +given therein. .TP L. -Preserve all the Invariant Sections of the Document, -unaltered in their text and in their titles. Section numbers -or the equivalent are not considered part of the section titles. +Preserve all the Invariant Sections of the Document, unaltered in their +text and in their titles. Section numbers or the equivalent are not +considered part of the section titles. .TP M. -Delete any section entitled "Endorsements." Such a section -may not be included in the Modified Version. +Delete any section Entitled "Endorsements". Such a section may not be +included in the Modified Version. .TP N. -Do not retitle any existing section as "Endorsements" -or to conflict in title with any Invariant Section. +Do not retitle any existing section to be Entitled "Endorsements" or to +conflict in title with any Invariant Section. +.TP +O. +Preserve any Warranty Disclaimers. .PP If the Modified Version includes new front-matter sections or appendices that qualify as Secondary Sections and contain no material @@ -244,7 +273,7 @@ of these sections as invariant. To do this, add their titles to the list of Invariant Sections in the Modified Version's license notice. These titles must be distinct from any other section titles. -You may add a section entitled "Endorsements", provided it contains +You may add a section Entitled "Endorsements", provided it contains nothing but endorsements of your Modified Version by various parties--for example, statements of peer review or that the text has been approved by an organization as the authoritative definition of a @@ -271,7 +300,7 @@ License, under the terms defined in section 4 above for modified versions, provided that you include in the combination all of the Invariant Sections of all of the original documents, unmodified, and list them all as Invariant Sections of your combined work in its -license notice. +license notice, and that you preserve all their Warranty Disclaimers. The combined work need only contain one copy of this License, and multiple identical Invariant Sections may be replaced with a single @@ -282,11 +311,11 @@ author or publisher of that section if known, or else a unique number. Make the same adjustment to the section titles in the list of Invariant Sections in the license notice of the combined work. -In the combination, you must combine any sections entitled "History" -in the various original documents, forming one section entitled -"History"; likewise combine any sections entitled "Acknowledgements", -and any sections entitled "Dedications." You must delete all sections -entitled "Endorsements." +In the combination, you must combine any sections Entitled "History" +in the various original documents, forming one section Entitled +"History"; likewise combine any sections Entitled "Acknowledgements", +and any sections Entitled "Dedications". You must delete all sections +Entitled "Endorsements". .SH 6. COLLECTIONS OF DOCUMENTS @@ -305,18 +334,20 @@ other respects regarding verbatim copying of that document. A compilation of the Document or its derivatives with other separate and independent documents or works, in or on a volume of a storage or -distribution medium, does not as a whole count as a Modified Version -of the Document, provided no compilation copyright is claimed for the -compilation. Such a compilation is called an "aggregate", and this -License does not apply to the other self-contained works thus compiled -with the Document, on account of their being thus compiled, if they -are not themselves derivative works of the Document. +distribution medium, is called an "aggregate" if the copyright +resulting from the compilation is not used to limit the legal rights +of the compilation's users beyond what the individual works permit. +When the Document is included in an aggregate, this License does not +apply to the other works in the aggregate which are not themselves +derivative works of the Document. If the Cover Text requirement of section 3 is applicable to these -copies of the Document, then if the Document is less than one quarter -of the entire aggregate, the Document's Cover Texts may be placed on -covers that surround only the Document within the aggregate. -Otherwise they must appear on covers around the whole aggregate. +copies of the Document, then if the Document is less than one half of +the entire aggregate, the Document's Cover Texts may be placed on +covers that bracket the Document within the aggregate, or the +electronic equivalent of covers if the Document is in electronic form. +Otherwise they must appear on printed covers that bracket the whole +aggregate. .SH 8. TRANSLATION @@ -326,10 +357,17 @@ Replacing Invariant Sections with translations requires special permission from their copyright holders, but you may include translations of some or all Invariant Sections in addition to the original versions of these Invariant Sections. You may include a -translation of this License provided that you also include the -original English version of this License. In case of a disagreement -between the translation and the original English version of this -License, the original English version will prevail. +translation of this License, and all the license notices in the +Document, and any Warranty Disclaimers, provided that you also include +the original English version of this License and the original versions +of those notices and disclaimers. In case of a disagreement between +the translation and the original version of this License or a notice +or disclaimer, the original version will prevail. + +If a section in the Document is Entitled "Acknowledgements", +"Dedications", or "History", the requirement (section 4) to Preserve +its Title (section 1) will typically require changing the actual +title. .SH 9. TERMINATION @@ -358,7 +396,6 @@ Free Software Foundation. If the Document does not specify a version number of this License, you may choose any version ever published (not as a draft) by the Free Software Foundation. - .SH ADDENDUM: How to use this License for your documents To use this License in a document you have written, include a copy of @@ -372,20 +409,28 @@ Copyright .if n (c) [\fIyear\fP] [\fIyour name\fP]. Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 +under the terms of the GNU Free Documentation License, Version 1.2 or any later version published by the Free Software Foundation; -with the Invariant Sections being [\fIlist their titles\fP], with the -Front-Cover Texts being [\fIlist\fP], and with the Back-Cover Texts -being [\fIlist\fP]. +with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled "GNU Free Documentation License." .ad .hy 1 -If you have no Invariant Sections, write "with no Invariant Sections" -instead of saying which ones are invariant. If you have no -Front-Cover Texts, write "no Front-Cover Texts" instead of -"Front-Cover Texts being [\fIlist\fP]"; likewise for Back-Cover Texts. +If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts, +replace the "with...Texts." line with this: + +.hy 0 +.na + with the Invariant Sections being [\fILIST THEIR TITLES\fP], with the + Front-Cover Texts being [\fILIST\fP], and with the Back-Cover Texts being + [\fILIST\fP]. +.ad +.hy 1 + +If you have Invariant Sections without Cover Texts, or some other +combination of the three, merge those two alternatives to suit the +situation. If your document contains nontrivial examples of program code, we recommend releasing these examples in parallel under your choice of diff --git a/info/dir b/info/dir index f0019507481..7a7156591e2 100644 --- a/info/dir +++ b/info/dir @@ -48,6 +48,7 @@ Emacs * Message: (message). Mail and news composition mode that goes with Gnus. * MH-E: (mh-e). Emacs interface to the MH mail system. * MIME: (emacs-mime). Emacs MIME de/composition library. +* Newsticker: (newsticker). A News ticker for Emacs. * PGG: (pgg). Emacs interface to various PGP implementations. * SC: (sc). Supercite lets you cite parts of messages you're replying to, in flexible ways. diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 5767b49aaed..76e56e77e16 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,15 @@ +2005-09-15 Richard M. Stallman + + * Makefile.in (update-game-score.o): New target. + Compile and link this progranm separately. + (update-game-score${EXEEXT}): Use GETOPTDEPTS. + +2005-09-11 Jason Rumney + + * makefile.w32-in (../src/config.h): Don't overwrite. Print a + message instead. + (../src/paths.h): Removed. + 2005-07-27 Juanma Barranquero * .cvsignore: Don't ignore fns-* and fns.el, which are no longer diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index 274bbabe29f..29fc2ec5374 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -460,10 +460,12 @@ emacsclient${EXEEXT}: ${srcdir}/emacsclient.c ../src/config.h $(GETOPTDEPS) hexl${EXEEXT}: ${srcdir}/hexl.c ../src/config.h $(CC) ${ALL_CFLAGS} ${srcdir}/hexl.c $(LOADLIBES) -o hexl -update-game-score${EXEEXT}: ${srcdir}/update-game-score.c ../src/config.h - $(CC) ${ALL_CFLAGS} ${srcdir}/update-game-score.c \ +update-game-score${EXEEXT}: update-game-score.o $(GETOPTDEPS) + $(CC) ${LINK_CFLAGS} ${MOVE_FLAGS} update-game-score.o $(GETOPTOBJS) $(LOADLIBES) -o update-game-score + +update-game-score.o: ${srcdir}/update-game-score.c ../src/config.h $(GETOPT_H) + $(CC) -c ${CPP_CFLAGS} ${srcdir}/update-game-score.c \ -DHAVE_SHARED_GAME_DIR="\"$(gamedir)\"" \ - $(LOADLIBES) -o update-game-score /* These are NOT included in INSTALLABLES or UTILITIES. See ../src/Makefile.in. */ diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in index bfda0f25d5f..a1a96098bd8 100644 --- a/lib-src/makefile.w32-in +++ b/lib-src/makefile.w32-in @@ -300,9 +300,9 @@ cleanall: clean # Headers we would preprocess if we could. # ../src/config.h: ../nt/$(CONFIG_H) - $(CP) $(ALL_DEPS) $@ -../src/paths.h: ../nt/paths.h - $(CP) $(ALL_DEPS) $@ + echo config.h has changed. Re-run configure.bat. + exit -1 + getopt.h: getopt_.h $(CP) $(ALL_DEPS) $@ diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b0e895a3707..88c130a0ecb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,386 @@ +2005-09-18 Michael Albinus + + * net/tramp.el (tramp-login-prompt-regexp): Expand regexp in order + to cover prompts like "login as:". Reported by Slawomir Nowaczyk + . + +2005-09-18 Chong Yidong + + * image.el (image-load-path): Use symbol `data-directory' instead + of its value, for backward compatibility with packages that bind + it during `find-image'. Suggested by Katsumi Yamaoka. + (image-search-load-path): Handle symbols whose values are strings. + +2005-09-18 Romain Francoise + + * calendar/diary-lib.el (mark-diary-entries): Rearrange to wrap + with-current-buffer form in save-excursion. + +2005-09-18 D Goel + + * apropos.el (apropos-command): Fix `message' call: first arg + should be a format spec. In this and all other cases that appear + below and elsewhere in the source code, I made a change only when + two conditions were satisfied: [1] I can think of a possibility + that the arguments would cause an error, for example, the code is + question relies on extarnal variables such as filenames. [2] I was + sure that the arg to `message' could not have been nil in the + code. + + * textmodes/tildify.el (tildify-region): Ditto. + + * textmodes/reftex-index.el (reftex-index-change-entry) + (reftex-index-phrase-selection-or-word) + (reftex-query-index-phrase): Ditto. + + * textmodes/reftex-dcr.el (reftex-echo-ref, reftex-echo-cite): Ditto. + + * textmodes/org.el (org-complete, org-deadline, org-schedule) + (org-priority, org-table-sum): Ditto. + + * textmodes/ispell.el (ispell-check-version) + (ispell-parse-output): Ditto. + + * textmodes/flyspell.el (flyspell-mode-on) + (flyspell-notify-misspell, flyspell-word) + (flyspell-display-next-corrections): Ditto. + + * textmodes/bibtex.el (bibtex-print-help-message): Ditto. + + * textmodes/artist.el (artist-key-set-point-poly): Ditto. + + * term/mac-win.el (mac-services-insert-text): Ditto. + + * progmodes/vhdl-mode.el (vhdl-warning, vhdl-print-warnings) + (vhdl-hooked-abbrev, vhdl-template-insert-fun) + (vhdl-port-paste-testbench, vhdl-compose-new-component) + (vhdl-compose-configuration): Ditto. + + * progmodes/sh-script.el (sh-blink, sh-show-indent) + (sh-set-indent, sh-learn-line-indent): Ditto. + + * progmodes/ps-mode.el (ps-mode-target-column): Ditto. + + * progmodes/idlwave.el (idlwave-make-tags) + (idlwave-scan-library-catalogs): Ditto. + + * progmodes/idlw-shell.el (idlwave-shell-parse-stack-and-display): Ditto. + + * progmodes/gud.el (gud-jdb-analyze-source): Ditto. + + * progmodes/flymake.el (flymake-log): Ditto. + + * progmodes/ebnf2ps.el (ebnf-generate-region): Ditto. + + * progmodes/cmacexp.el (c-macro-expansion): Ditto. + + * progmodes/ada-xref.el (ada-treat-cmd-string): Ditto. + + * progmodes/ada-mode.el (ada-create-case-exception-substring) + (ada-justified-indent-current, ada-batch-reformat): Ditto. + + * play/zone.el (zone): Ditto. + + * play/landmark.el (lm-move): Ditto. + + * play/decipher.el (decipher-show-alphabet): Ditto. + + * net/newsticker.el (newsticker--display-jump) + (newsticker--display-scroll): Ditto. + + * mail/rmail-spam-filter.el (rsf-add-subject-to-spam-list) + (rsf-add-sender-to-spam-list, rsf-add-region-to-spam-list): Ditto. + + * mail/feedmail.el (feedmail-dump-message-to-queue): Ditto. + + * eshell/esh-proc.el (eshell-remove-process-entry): Ditto. + + * emulation/ws-mode.el (ws-last-error): Ditto. + + * emulation/viper-macs.el (ex-map-read-args, ex-unmap-read-args) + (viper-record-kbd-macro): Ditto. + + * emulation/viper-ex.el (ex-pwd, viper-info-on-file): Ditto. + + * emacs-lisp/lisp-mnt.el (lm-report-bug): Ditto. + + * emacs-lisp/find-func.el (find-function-noselect): Ditto. + + * calendar/timeclock.el (timeclock-status-string) + (timeclock-workday-remaining-string) + (timeclock-workday-elapsed-string) + (timeclock-when-to-leave-string): Ditto. + + * calendar/icalendar.el (icalendar--convert-ical-to-diary): Ditto. + + * calc/calc-units.el (calc-enter-units-table): Ditto. + + * calc/calc-mode.el (calc-mode-record-mode): Ditto. + + * woman.el (woman-mini-help): Ditto. + + * wdired.el (wdired-change-to-wdired-mode): Ditto. + + * vc.el (vc-retrieve-snapshot): Ditto. + + * strokes.el (strokes-read-stroke, strokes-read-complex-stroke): Ditto. + + * startup.el (display-startup-echo-area-message): Ditto. + + * simple.el (set-goal-column): Ditto. + + * ses.el (ses-command-hook, ses-recalculate-cell): Ditto. + + * server.el (server-process-filter): Ditto. + + * printing.el (pr-interface-txt-print, pr-interface-printify) + (pr-interface-ps): Ditto. + + * pcvs.el (cvs-help): Ditto. + + * log-edit.el (log-edit, log-edit-mode-help): Ditto. + + * iswitchb.el (iswitchb-possible-new-buffer): Ditto. + + * isearch.el (isearch-edit-string): Ditto. + + * image-mode.el (image-mode, image-minor-mode): Ditto. + + * ibuf-macs.el (define-ibuffer-filter): Ditto. + + * hi-lock.el (hi-lock-find-patterns): Ditto. + + * files.el (toggle-read-only): Ditto. + + * ediff-util.el (ediff-copy-diff) + (ediff-write-merge-buffer-and-maybe-kill): Ditto. + + * echistory.el (Electric-history-undefined): Ditto. + + * dnd.el (dnd-insert-text): Ditto. + + * dired-aux.el (dired-query): Ditto. + + * desktop.el (desktop-restore-file-buffer) + (desktop-lazy-create-buffer): Ditto. + + * bookmark.el (bookmark-bmenu-locate): Ditto. + + * obsolete/fast-lock.el (@top-level): Ditto in the macro + definition of `with-temp-message'. + + * pcomplete.el (pcomplete--help): Fix `message' format spec. Not + having a %s would be weird, though not technically wrong. + +2005-09-18 YAMAMOTO Mitsuharu + + * term/mac-win.el (mac-add-charset-info): Doc fix. + +2005-09-17 Romain Francoise + + * shell.el (shell-resync-dirs): Handle echoing processes more + reliably. Don't insert resync command if `comint-process-echoes' + is non-nil. + +2005-09-17 Magnus Henoch + + * textmodes/ispell.el (ispell-aspell-supports-utf8): New variable. + (ispell-check-version): Set ispell-aspell-supports-utf8 to t for + aspell versions >= 0.60. + (ispell-valid-dictionary-list): Call ispell-find-aspell-dictionaries + only if ispell-aspell-supports-utf8 is non-nil. + +2005-09-17 Johan Bockg,Ae(Brd + + * progmodes/scheme.el (scheme-mode-variables): Use setq to assign + buffer-local value to lisp-indent-function. + +2005-09-17 Milan Zamazal + + * progmodes/glasses.el (glasses-make-readable): If + glasses-separator differs from underscore, put appropriate + overlays over underscore characters. + (glasses-convert-to-unreadable): If glasses-separator differs from + underscore, try to convert glasses-separator characters to + underscores. + +2005-09-16 Stefan Monnier + + * calendar/diary-lib.el (mark-diary-entries): Don't move point. + Use with-syntax-table and dolist. + +2005-09-16 Carsten Dominik + + * textmodes/reftex-auc.el: + * textmodes/reftex-cite.el: + * textmodes/reftex-dcr.el: + * textmodes/reftex-global.el: + * textmodes/reftex-parse.el: + * textmodes/reftex-ref.el: + * textmodes/reftex-sel.el: + * textmodes/reftex-toc.el: + * textmodes/reftex-vars.el: + * textmodes/reftex.el: Small changes to remove compiler warnings. + + * textmodes/reftex-index.el: Likewise. + (reftex-query-index-phrase): More efficient use of markers. + +2005-09-15 Chong Yidong + + * image.el (image-load-path): New variable. + (image-search-load-path): New function. + (find-image): Search for images in `image-load-path'. + +2005-09-15 Richard M. Stallman + + * follow.el: Change Maintainer field. + +2005-09-15 David Ponce + + * recentf.el (recentf-save-file-modes): New option. + (recentf-save-list): Use it. + +2005-09-15 Nick Roberts + + * bindings.el (mode-line-eol-desc, mode-line-coding-system-map) + (mode-line-mule-info, mode-line-modified): Move bindings from + mouse-3 to mouse-1. + +2005-09-15 Chong Yidong + + * simple.el (sendmail-user-agent-compose): Revert last change. + +2005-09-14 Stefan Monnier + + * net/ange-ftp.el (ange-ftp-process-filter): Revert to ^#+$. + Use with-current-buffer. + (ange-ftp-gwp-start): Remove unused var `gw-user'. + (ange-ftp-guess-hash-mark-size): Remove unused var `result'. + (ange-ftp-insert-directory): Remove unused var `short'. + (ange-ftp-file-name-sans-versions): Remove unused var `host-type'. + + * pcvs-defs.el (cvs-version): Recognize CVSNT version string. + (cvs-execute-single-dir): Change default: cvs-1.9 is ancient. + + * calendar/cal-menu.el: Don't require easymenu, since we don't use it. + (check-calendar-holidays, diary-list-entries): Autoload. + Otherwise `emacs -q' followed by "mouse-2 -> diary entries" burps. + (calendar-mouse-holidays, calendar-mouse-view-diary-entries): Simplify. + + * calendar/diary-lib.el (diary-show-all-entries): Fix last change, + which mistakenly removed a call to display-buffer. + +2005-09-14 Juanma Barranquero + + * obsolete/iso-insert.el: Move to obsolete/ from international/. + +2005-09-14 Thien-Thi Nguyen + + * progmodes/hideshow.el + (hs-hide-comments-when-hiding-all): Remove autoload cookie. + (hs-allow-nesting): New user var. + (hs-discard-overlays): Skip "internal" overlays if nesting allowed. + (hs-hide-block-at-point): When nesting allowed, + if there is already an overlay in place, delete it. + (hs-safety-is-job-n): Delete func; remove call sites. + (hs-hide-level-recursive): Don't pre-clean if nesting allowed. + (hs-overlay-at): New func. + (hs-already-hidden-p, hs-show-block): Use it. + (hs-hide-all): Don't pre-clean if nesting allowed. + (hs-show-all): Temporarily disallow + nesting around call to `hs-discard-overlays'. + +2005-09-14 Chong Yidong + + * mouse.el (mouse-major-mode-menu): Make `prefix' optional. + Delete unused local var. + +2005-09-13 Juanma Barranquero + + * help-fns.el (describe-categories): "?\ " -> "?\s". + (help-do-arg-highlight): Recognize also ARG-n, as in + `move-to-left-margin' (ARG+n is already recognized). Simplify. + + * international/codepage.el (dos-unsupported-char-glyph): + * net/newsticker.el (tool-bar-map, w3-mode-map) + (w3m-minor-mode-map): + * progmodes/vhdl-mode.el (conf-alist, conf-entry, conf-key) + (ent-alist): + * textmodes/reftex-vars.el (reftex-tables-dirty): Add defvars. + +2005-09-13 Chong Yidong + + * custom.el (custom-push-theme): Handle the case where a symbol is + bound but face properties have not yet been assigned. + + * mail/sendmail.el (mail): Use new buffer if `noerase' is `new'. + Fix behavior if noerase is `t' and there is no mail buffer. + + * simple.el (sendmail-user-agent-compose): Use a new mail buffer + if `continue' is nil, rather than signal an error. + +2005-09-12 Richard M. Stallman + + * font-lock.el (font-lock-keywords): Add autoload. + + * help-fns.el (describe-variable): Rearrange to put source link + in a predictable place. + + * net/newsticker.el: New file. + +2005-09-12 Stefan Monnier + + * calendar/calendar.el (calendar-for-loop): Add edebug info. + (calendar-basic-setup): Use the new nil arg. + (number-of-diary-entries): Move to diary-lib.el. + + * calendar/diary-lib.el: Use with-current-buffer, match-string. + (diary-list-entries): Use with-syntax-table and dolist. + Rename from list-diary-entries. + Use number-of-diary-entries if `number' is nil. + (diary, diary-view-entries): Use this new name and new nil arg value. + (number-of-diary-entries): Move from calendar.el. + (diary-unhide-everything): New function. + (include-other-diary-files, fancy-diary-display) + (diary-show-all-entries, make-diary-entry): Use it. + (diary-mail-entries): Use buffer-string. + (mark-diary-entries): Fix long standing paren typo. + (diary-sexp-entry): Use count-lines. + (make-diary-entry): Avoid `previous-line'. + (diary-mode-map): New var. + (diary-mode): Redraw cal after saving. Setup header-line. + (fancy-diary-display-mode): Use local-set-key. + + * startup.el (command-line): Try calling various terminal-init-foo-bar + functions by stripping hyphenated suffixes from $TERM. + + * files.el (normal-mode): Check boundness of font-lock-keywords. + +2005-09-12 Richard M. Stallman + + * progmodes/compile.el: Don't decide a file's directory + until the user actually tries to go there. + (compilation-next-error-function): + Pass compilation-find-file the directory from the file-struct. + (compilation-internal-error-properties): Separate local FILE-STRUCT + from FILE. Doc the args better. Rename arg FMT to FMTS. + (compilation-find-file): Arg DIR renamed to DIRECTORY. + Expand it, and if nil, use default-directory. + (compilation-get-file-structure): Don't mix specified directory + with default directory. Put specified directory into + file-struct. Don't make the file name absolute. + + * progmodes/compile.el (compilation-error-regexp-alist): Doc fix. + (compile-command): Add autoload. + (compilation-disable-input): Add autoload. + +2005-09-11 Stephen Gildea + + * time-stamp.el: Mention variable `time-stamp-pattern' in doc + strings of the variables it can override. + (time-stamp): New (as yet undocumented) time-stamp-format escapes + %Q and %q, for fully-qualified domain name and unqualified host name. + 2005-09-11 Kim F. Storm * emacs-lisp/authors.el (authors-aliases): Update list. @@ -15,14 +398,14 @@ 2005-09-10 Pascal Dupuis (tiny change) - * progmodes/octave-inf.el (inferior-octave-startup): Resync - current dir at the end. + * progmodes/octave-inf.el (inferior-octave-startup): + Resync current dir at the end. 2005-09-10 Emilio C. Lopes - * woman.el (woman-topic-at-point-default): Renamed to - woman-use-topic-at-point-default. - (woman-topic-at-point): Renamed to woman-use-topic-at-point. + * woman.el (woman-topic-at-point-default): + Rename to woman-use-topic-at-point-default. + (woman-topic-at-point): Rename to woman-use-topic-at-point. (woman-file-name): Reflect renames above. Automatically use the word at point as topic if woman-use-topic-at-point is non-nil. Otherwise offer it as default but don't insert it in the @@ -40,28 +423,26 @@ (menu-bar-non-minibuffer-window-p): New functions. ("Split Window", "Save As..."): Use them. ("Postscript Print Buffer (B+W)", "Postscript Print Buffer") - ("Print Buffer", "Truncate Long Lines in this Buffer"): Use - menu-bar-menu-frame-live-and-visible-p. + ("Print Buffer", "Truncate Long Lines in this Buffer"): + Use menu-bar-menu-frame-live-and-visible-p. ("Save Buffer", "Insert File", "Open Directory...") - ("Open File...", "Visit New File..."): Use - menu-bar-non-minibuffer-window-p. - (kill-this-buffer-enabled-p, dired ): Use - menu-bar-non-minibuffer-window-p. + ("Open File...", "Visit New File..."): + Use menu-bar-non-minibuffer-window-p. + (kill-this-buffer-enabled-p, dired ): + Use menu-bar-non-minibuffer-window-p. 2005-09-09 Eli Zaretskii * cus-start.el (all): Don't complain about fringe-related built-ins if fringes are not supported. Ditto about - selection-related built-ins. Fix the test for GTK-related - built-ins. + selection-related built-ins. Fix the test for GTK-related built-ins. * menu-bar.el ("Split Window", "Postscript Print Buffer (B+W)") ("Postscript Print Buffer", "Print Region", "Save As...") ("Save", "Insert File...", "Open Directory...") ("Open File...", "Visit New File..."") ("Truncate Long Lines in this Buffer"): Don't look at - menu-updating-frame if this display does not support multiple - frames. + menu-updating-frame if this display does not support multiple frames. 2005-09-09 Frederik Fouvry @@ -94,15 +475,6 @@ * descr-text.el (describe-property-list): Handle non-symbol prop names. -2005-09-06 Stefan Monnier - - * net/ange-ftp.el (ange-ftp-process-filter): Revert to ^#+$. - Use with-current-buffer. - (ange-ftp-gwp-start): Remove unused var `gw-user'. - (ange-ftp-guess-hash-mark-size): Remove unused var `result'. - (ange-ftp-insert-directory): Remove unused var `short'. - (ange-ftp-file-name-sans-versions): Remove unused var `host-type'. - 2005-08-30 Richard M. Stallman * simple.el (blink-matching-open): Get rid of text props from @@ -138,6 +510,13 @@ (recentf-open-files): Use it. (recentf-open-file-with-key): New command. +2005-09-08 Chong Yidong + + * buff-menu.el (Buffer-menu-sort-by-column): New function. + Suggested by Kim F. Storm. + (Buffer-menu-sort-button-map): Global keymap for sort buttons. + (Buffer-menu-make-sort-button): Use global keymap. + 2005-09-07 Michael Albinus * woman.el (top): Remap `man' command by `woman' in `woman-mode-map'. @@ -163,13 +542,6 @@ * calc/calc-poly.el (math-expand-term): Multiply out any powers when in matrix mode. -2005-09-08 Chong Yidong - - * buff-menu.el (Buffer-menu-sort-by-column): New function. - Suggested by Kim F. Storm. - (Buffer-menu-sort-button-map): Global keymap for sort buttons. - (Buffer-menu-make-sort-button): Use global keymap. - 2005-09-06 Stefan Monnier * buff-menu.el (Buffer-menu-make-sort-button): Add docstrings, use diff --git a/lisp/apropos.el b/lisp/apropos.el index fcad5cac0dc..990ad68e5ec 100644 --- a/lisp/apropos.el +++ b/lisp/apropos.el @@ -443,7 +443,7 @@ satisfy the predicate VAR-PREDICATE." (setq p (cdr p)))) (and (apropos-print t nil) message - (message message)))) + (message "%s" message)))) ;;;###autoload diff --git a/lisp/bindings.el b/lisp/bindings.el index fd5ef4de3d9..4a6b352a154 100644 --- a/lisp/bindings.el +++ b/lisp/bindings.el @@ -123,7 +123,7 @@ corresponding to the mode line clicked." (defvar mode-line-coding-system-map (let ((map (make-sparse-keymap))) - (define-key map [mode-line mouse-3] + (define-key map [mode-line mouse-1] (lambda (e) (interactive "e") (save-selected-window @@ -156,7 +156,7 @@ corresponding to the mode line clicked." (setq desc (propertize mnemonic - 'help-echo (format "%s end-of-line; mouse-3 to cycle" + 'help-echo (format "%s end-of-line; mouse-1 to cycle" (if (eq eol 0) "Unix-style LF" (if (eq eol 1) "Dos-style CRLF" (if (eq eol 2) "Mac-style CR" @@ -164,7 +164,7 @@ corresponding to the mode line clicked." 'keymap (eval-when-compile (let ((map (make-sparse-keymap))) - (define-key map [mode-line mouse-3] 'mode-line-change-eol) + (define-key map [mode-line mouse-1] 'mode-line-change-eol) map)) 'mouse-face 'mode-line-highlight)) (push (cons eol (cons mnemonic desc)) mode-line-eol-desc-cache) @@ -190,7 +190,7 @@ corresponding to the mode line clicked." (when buffer-file-coding-system (if enable-multibyte-characters (concat (symbol-name buffer-file-coding-system) - " buffer; mouse-3: describe coding system") + " buffer; mouse-1: describe coding system") (concat "Unibyte " (symbol-name buffer-file-coding-system) " buffer"))))) 'mouse-face 'mode-line-highlight @@ -230,27 +230,27 @@ Normally nil in most modes, since there is no process to display.") (list (propertize "%1*" 'help-echo (purecopy (lambda (window object point) - (format "%sead-only: mouse-3 toggles" + (format "%sead-only: mouse-1 toggles" (save-selected-window (select-window window) (if buffer-read-only "R" "Not r"))))) 'local-map (purecopy (make-mode-line-mouse-map - 'mouse-3 + 'mouse-1 #'mode-line-toggle-read-only)) 'mouse-face 'mode-line-highlight) (propertize "%1+" 'help-echo (purecopy (lambda (window object point) - (format "%sodified: mouse-3 toggles" + (format "%sodified: mouse-1 toggles" (save-selected-window (select-window window) (if (buffer-modified-p) "M" "Not m"))))) 'local-map (purecopy (make-mode-line-mouse-map - 'mouse-3 #'mode-line-toggle-modified)) + 'mouse-1 #'mode-line-toggle-modified)) 'mouse-face 'mode-line-highlight)) "Mode-line control for displaying whether current buffer is modified.") diff --git a/lisp/bookmark.el b/lisp/bookmark.el index 23e1ce11277..8014915a72e 100644 --- a/lisp/bookmark.el +++ b/lisp/bookmark.el @@ -2058,7 +2058,7 @@ To carry out the deletions that you've marked, use \\\\ (interactive) (if (bookmark-bmenu-check-position) (let ((bmrk (bookmark-bmenu-bookmark))) - (message (bookmark-location bmrk))))) + (message "%s" (bookmark-location bmrk))))) (defun bookmark-bmenu-relocate () "Change the file path of the bookmark on the current line, diff --git a/lisp/calc/calc-mode.el b/lisp/calc/calc-mode.el index 5e627203049..41b346ebd5a 100644 --- a/lisp/calc/calc-mode.el +++ b/lisp/calc/calc-mode.el @@ -408,7 +408,8 @@ ((= n 4) 'global) ((= n 5) 'save) (t 'local))) - (message (cond ((and (eq calc-mode-save-mode 'local) calc-embedded-info) + (message "%s" + (cond ((and (eq calc-mode-save-mode 'local) calc-embedded-info) "Recording mode changes with [calc-mode: ...]") ((eq calc-mode-save-mode 'edit) "Recording mode changes with [calc-edit-mode: ...]") diff --git a/lisp/calc/calc-units.el b/lisp/calc/calc-units.el index 7d42fd9ca9a..8fcbe7c0943 100644 --- a/lisp/calc/calc-units.el +++ b/lisp/calc/calc-units.el @@ -515,7 +515,7 @@ Entries are (SYMBOL EXPR DOC-STRING TEMP-TYPE BASE-UNITS).") (interactive "P") (and n (setq math-units-table-buffer-valid nil)) (math-build-units-table-buffer t) - (message (substitute-command-keys "Type \\[calc] to return to the Calculator"))) + (message "%s" (substitute-command-keys "Type \\[calc] to return to the Calculator"))) (defun calc-define-unit (uname desc) (interactive "SDefine unit name: \nsDescription: ") diff --git a/lisp/calendar/cal-menu.el b/lisp/calendar/cal-menu.el index 0291c41c1c6..870e0fb2f7f 100644 --- a/lisp/calendar/cal-menu.el +++ b/lisp/calendar/cal-menu.el @@ -44,7 +44,6 @@ (defvar event) (eval-when-compile (require 'calendar)) -(require 'easymenu) (define-key calendar-mode-map [menu-bar edit] 'undefined) (define-key calendar-mode-map [menu-bar search] 'undefined) @@ -323,12 +322,14 @@ ERROR is t, otherwise just returns nil." (calendar-cursor-to-date (calendar-current-date)) (calendar-cursor-holidays))) +(autoload 'check-calendar-holidays "holidays") +(autoload 'diary-list-entries "diary-lib") + (defun calendar-mouse-holidays () "Pop up menu of holidays for mouse selected date." (interactive) (let* ((date (calendar-event-to-date)) - (l (mapcar '(lambda (x) (list x)) - (check-calendar-holidays date))) + (l (mapcar 'list (check-calendar-holidays date))) (selection (cal-menu-x-popup-menu event @@ -350,11 +351,10 @@ Any holidays are shown if `holidays-in-diary-buffer' is t." (diary-list-include-blanks nil) (diary-display-hook 'ignore) (diary-entries - (mapcar '(lambda (x) (split-string (car (cdr x)) "\^M\\|\n")) - (list-diary-entries date 1))) + (mapcar (lambda (x) (split-string (car (cdr x)) "\^M\\|\n")) + (diary-list-entries date 1))) (holidays (if holidays-in-diary-buffer - (mapcar '(lambda (x) (list x)) - (check-calendar-holidays date)))) + (check-calendar-holidays date))) (title (concat "Diary entries " (if diary (format "from %s " diary) "") "for " @@ -365,9 +365,7 @@ Any holidays are shown if `holidays-in-diary-buffer' is t." (list title (append (list title) - (if holidays - (mapcar '(lambda (x) (list (concat " " (car x)))) - holidays)) + (mapcar (lambda (x) (list (concat " " x))) holidays) (if holidays (list "--shadow-etched-in" "--shadow-etched-in")) (if diary-entries diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el index 3e075b9d6bd..2d2e5256977 100644 --- a/lisp/calendar/calendar.el +++ b/lisp/calendar/calendar.el @@ -163,35 +163,6 @@ be overridden by the value of `calendar-setup'." :type 'boolean :group 'diary) -;;;###autoload -(defcustom number-of-diary-entries 1 - "*Specifies how many days of diary entries are to be displayed initially. -This variable affects the diary display when the command \\[diary] is used, -or if the value of the variable `view-diary-entries-initially' is t. For -example, if the default value 1 is used, then only the current day's diary -entries will be displayed. If the value 2 is used, then both the current -day's and the next day's entries will be displayed. - -The value can also be a vector such as [0 2 2 2 2 4 1]; this value -says to display no diary entries on Sunday, the display the entries -for the current date and the day after on Monday through Thursday, -display Friday through Monday's entries on Friday, and display only -Saturday's entries on Saturday. - -This variable does not affect the diary display with the `d' command -from the calendar; in that case, the prefix argument controls the -number of days of diary entries displayed." - :type '(choice (integer :tag "Entries") - (vector :value [0 0 0 0 0 0 0] - (integer :tag "Sunday") - (integer :tag "Monday") - (integer :tag "Tuesday") - (integer :tag "Wednesday") - (integer :tag "Thursday") - (integer :tag "Friday") - (integer :tag "Saturday"))) - :group 'diary) - ;;;###autoload (defcustom mark-diary-entries-in-calendar nil "*Non-nil means mark dates with diary entries, in the calendar window. @@ -393,7 +364,7 @@ functions that move by days and weeks." For example, - (add-hook 'calendar-move-hook (lambda () (view-diary-entries 1))) + (add-hook 'calendar-move-hook (lambda () (diary-view-entries 1))) redisplays the diary for whatever date the cursor is moved to." :type 'hook @@ -1335,6 +1306,7 @@ A negative YR is interpreted as BC; -1 being 1 BC, and so on." (defmacro calendar-for-loop (var from init to final do &rest body) "Execute a for loop." + (declare (debug (symbolp "from" form "to" form "do" body))) `(let ((,var (1- ,init))) (while (>= ,final (setq ,var (1+ ,var))) ,@body))) @@ -1651,10 +1623,7 @@ to be replaced by asterisks to highlight it whenever it is in the window." (increment-calendar-month month year (- calendar-offset)) (generate-calendar-window month year) (if (and view-diary-entries-initially (calendar-date-is-visible-p date)) - (view-diary-entries - (if (vectorp number-of-diary-entries) - (aref number-of-diary-entries (calendar-day-of-week date)) - number-of-diary-entries)))) + (diary-view-entries))) (let* ((diary-buffer (get-file-buffer diary-file)) (diary-window (if diary-buffer (get-buffer-window diary-buffer))) (split-height-threshold (if diary-window 2 1000))) @@ -1662,7 +1631,7 @@ to be replaced by asterisks to highlight it whenever it is in the window." (list-calendar-holidays))) (run-hooks 'initial-calendar-window-hook)) -(autoload 'view-diary-entries "diary-lib" +(autoload 'diary-view-entries "diary-lib" "Prepare and display a buffer with diary entries. Searches your diary file for entries that match ARG days starting with the date indicated by the cursor position in the displayed three-month @@ -2272,7 +2241,7 @@ movement commands will not work correctly." (define-key calendar-mode-map "x" 'mark-calendar-holidays) (define-key calendar-mode-map "u" 'calendar-unmark) (define-key calendar-mode-map "m" 'mark-diary-entries) - (define-key calendar-mode-map "d" 'view-diary-entries) + (define-key calendar-mode-map "d" 'diary-view-entries) (define-key calendar-mode-map "D" 'view-other-diary-entries) (define-key calendar-mode-map "s" 'show-all-diary-entries) (define-key calendar-mode-map "pd" 'calendar-print-day-of-year) @@ -2493,8 +2462,7 @@ the STRINGS are just concatenated and the result truncated." (defun update-calendar-mode-line () "Update the calendar mode line with the current date and date style." (if (bufferp (get-buffer calendar-buffer)) - (save-excursion - (set-buffer calendar-buffer) + (with-current-buffer calendar-buffer (setq mode-line-format (calendar-string-spread (let ((date (condition-case nil @@ -2589,14 +2557,15 @@ ERROR is t, otherwise just returns nil." (list month (string-to-number (buffer-substring (1+ (point)) (+ 4 (point)))) year)) - (if (looking-at "\\*") - (save-excursion - (re-search-backward "[^*]") - (if (looking-at ".\\*\\*") - (list month calendar-starred-day year) - (if error (error "Not on a date!")))) + (if (and (looking-at "\\*") + (save-excursion + (re-search-backward "[^*]") + (looking-at ".\\*\\*"))) + (list month calendar-starred-day year) (if error (error "Not on a date!")))))) +(add-to-list 'debug-ignored-errors "Not on a date!") + ;; The following version of calendar-gregorian-from-absolute is preferred for ;; reasons of clarity, BUT it's much slower than the version that follows it. @@ -3071,8 +3040,7 @@ Defaults to today's date if DATE is not given." "Show dates on other calendars for date under the cursor." (interactive) (let* ((date (calendar-cursor-to-date t))) - (save-excursion - (set-buffer (get-buffer-create other-calendars-buffer)) + (with-current-buffer (get-buffer-create other-calendars-buffer) (setq buffer-read-only nil) (calendar-set-mode-line (concat (calendar-date-string date) " (Gregorian)")) @@ -3138,9 +3106,9 @@ Defaults to today's date if DATE is not given." (provide 'calendar) -;;; Local variables: -;;; byte-compile-dynamic: t -;;; End: +;; Local variables: +;; byte-compile-dynamic: t +;; End: -;;; arch-tag: 19c61596-c8fb-4c69-bcf1-7dd739919cd8 +;; arch-tag: 19c61596-c8fb-4c69-bcf1-7dd739919cd8 ;;; calendar.el ends here diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el index 1501131c2ae..b748d15e41c 100644 --- a/lisp/calendar/diary-lib.el +++ b/lisp/calendar/diary-lib.el @@ -58,21 +58,17 @@ does nothing. This function is suitable for execution in a `.emacs' file." (interactive "P") (diary-check-diary-file) (let ((date (calendar-current-date))) - (list-diary-entries - date - (cond (arg (prefix-numeric-value arg)) - ((vectorp number-of-diary-entries) - (aref number-of-diary-entries (calendar-day-of-week date))) - (t number-of-diary-entries))))) + (diary-list-entries date (if arg (prefix-numeric-value arg))))) -(defun view-diary-entries (arg) +(define-obsolete-function-alias 'view-diary-entries 'diary-view-entries) +(defun diary-view-entries (&optional arg) "Prepare and display a buffer with diary entries. Searches the file named in `diary-file' for entries that match ARG days starting with the date indicated by the cursor position in the displayed three-month calendar." (interactive "p") (diary-check-diary-file) - (list-diary-entries (calendar-cursor-to-date t) arg)) + (diary-list-entries (calendar-cursor-to-date t) arg)) (defun view-other-diary-entries (arg d-file) "Prepare and display buffer of diary entries from an alternative diary file. @@ -182,14 +178,15 @@ The holidays are those in the list `calendar-holidays'.") "Local time of candle lighting diary entry--applies if date is a Friday. No diary entry if there is no sunset on that date.") -(defvar diary-syntax-table (copy-syntax-table (standard-syntax-table)) +(defvar diary-syntax-table + (let ((st (copy-syntax-table (standard-syntax-table)))) + (modify-syntax-entry ?* "w" st) + (modify-syntax-entry ?: "w" st) + st) "The syntax table used when parsing dates in the diary file. It is the standard syntax table used in Fundamental mode, but with the syntax of `*' and `:' changed to be word constituents.") -(modify-syntax-entry ?* "w" diary-syntax-table) -(modify-syntax-entry ?: "w" diary-syntax-table) - (defvar diary-entries-list) (defvar displayed-year) (defvar displayed-month) @@ -243,9 +240,7 @@ search." regexp (concat diary-glob-file-regexp-prefix regexp)) (setq attrvalue nil) (if (re-search-forward regexp (point-max) t) - (setq attrvalue (buffer-substring-no-properties - (match-beginning regnum) - (match-end regnum)))) + (setq attrvalue (match-string-no-properties regnum))) (if (and attrvalue (setq attrvalue (diary-attrtype-convert attrvalue type))) (setq ret-attr (append ret-attr (list attrname attrvalue)))) @@ -264,9 +259,7 @@ search." (setq attrvalue nil) (if (string-match regexp entry) (progn - (setq attrvalue (substring-no-properties entry - (match-beginning regnum) - (match-end regnum))) + (setq attrvalue (match-string-no-properties regnum entry)) (setq entry (replace-match "" t t entry)))) (if (and attrvalue (setq attrvalue (diary-attrtype-convert attrvalue type))) @@ -299,8 +292,38 @@ Only used if `diary-header-line-flag' is non-nil." (defvar diary-saved-point) ; internal -(defun list-diary-entries (date number) - "Create and display a buffer containing the relevant lines in diary-file. + +(defcustom number-of-diary-entries 1 + "Specifies how many days of diary entries are to be displayed initially. +This variable affects the diary display when the command \\[diary] is used, +or if the value of the variable `view-diary-entries-initially' is t. For +example, if the default value 1 is used, then only the current day's diary +entries will be displayed. If the value 2 is used, then both the current +day's and the next day's entries will be displayed. + +The value can also be a vector such as [0 2 2 2 2 4 1]; this value +says to display no diary entries on Sunday, the display the entries +for the current date and the day after on Monday through Thursday, +display Friday through Monday's entries on Friday, and display only +Saturday's entries on Saturday. + +This variable does not affect the diary display with the `d' command +from the calendar; in that case, the prefix argument controls the +number of days of diary entries displayed." + :type '(choice (integer :tag "Entries") + (vector :value [0 0 0 0 0 0 0] + (integer :tag "Sunday") + (integer :tag "Monday") + (integer :tag "Tuesday") + (integer :tag "Wednesday") + (integer :tag "Thursday") + (integer :tag "Friday") + (integer :tag "Saturday"))) + :group 'diary) + +(define-obsolete-function-alias 'list-diary-entries 'diary-list-entries) +(defun diary-list-entries (date number) + "Create and display a buffer containing the relevant lines in `diary-file'. The arguments are DATE and NUMBER; the entries selected are those for NUMBER days starting with date DATE. The other entries are hidden using selective display. If NUMBER is less than 1, this function does nothing. @@ -332,10 +355,12 @@ These hooks have the following distinct roles: `diary-hook' is run last. This can be used for an appointment notification function." - + (unless number + (setq number (if (vectorp number-of-diary-entries) + (aref number-of-diary-entries (calendar-day-of-week date)) + number-of-diary-entries))) (when (> number 0) (let ((original-date date);; save for possible use in the hooks - old-diary-syntax-table diary-entries-list file-glob-attrs (date-string (calendar-date-string date)) @@ -356,100 +381,94 @@ These hooks have the following distinct roles: (setq selective-display-ellipses nil) (if diary-header-line-flag (setq header-line-format diary-header-line-format)) - (setq old-diary-syntax-table (syntax-table)) - (set-syntax-table diary-syntax-table) - (unwind-protect - (let ((buffer-read-only nil) - (diary-modified (buffer-modified-p)) - (mark (regexp-quote diary-nonmarking-symbol))) - ;; First and last characters must be ^M or \n for - ;; selective display to work properly - (goto-char (1- (point-max))) - (if (not (looking-at "\^M\\|\n")) - (progn - (goto-char (point-max)) - (insert "\^M"))) - (goto-char (point-min)) - (if (not (looking-at "\^M\\|\n")) - (insert "\^M")) - (subst-char-in-region (point-min) (point-max) ?\n ?\^M t) - (calendar-for-loop - i from 1 to number do - (let ((d diary-date-forms) - (month (extract-calendar-month date)) - (day (extract-calendar-day date)) - (year (extract-calendar-year date)) - (entry-found (list-sexp-diary-entries date))) - (while d - (let* - ((date-form (if (equal (car (car d)) 'backup) - (cdr (car d)) - (car d))) - (backup (equal (car (car d)) 'backup)) - (dayname - (format "%s\\|%s\\.?" - (calendar-day-name date) - (calendar-day-name date 'abbrev))) - (monthname - (format "\\*\\|%s\\|%s\\.?" - (calendar-month-name month) - (calendar-month-name month 'abbrev))) - (month (concat "\\*\\|0*" (int-to-string month))) - (day (concat "\\*\\|0*" (int-to-string day))) - (year - (concat - "\\*\\|0*" (int-to-string year) - (if abbreviated-calendar-year - (concat "\\|" (format "%02d" (% year 100))) - ""))) - (regexp - (concat - "\\(\\`\\|\^M\\|\n\\)" mark "?\\(" - (mapconcat 'eval date-form "\\)\\(") - "\\)")) - (case-fold-search t)) - (goto-char (point-min)) - (while (re-search-forward regexp nil t) - (if backup (re-search-backward "\\<" nil t)) - (if (and (or (char-equal (preceding-char) ?\^M) - (char-equal (preceding-char) ?\n)) - (not (looking-at " \\|\^I"))) - ;; Diary entry that consists only of date. - (backward-char 1) - ;; Found a nonempty diary entry--make it - ;; visible and add it to the list. - (setq entry-found t) - (let ((entry-start (point)) - date-start temp) - (re-search-backward "\^M\\|\n\\|\\`") - (setq date-start (point)) - (re-search-forward "\^M\\|\n" nil t 2) - (while (looking-at " \\|\^I") - (re-search-forward "\^M\\|\n" nil t)) - (backward-char 1) - (subst-char-in-region date-start - (point) ?\^M ?\n t) - (setq entry (buffer-substring entry-start (point)) - temp (diary-pull-attrs entry file-glob-attrs) - entry (nth 0 temp)) - (add-to-diary-list - date - entry - (buffer-substring - (1+ date-start) (1- entry-start)) - (copy-marker entry-start) (nth 1 temp)))))) - (setq d (cdr d))) - (or entry-found - (not diary-list-include-blanks) - (setq diary-entries-list - (append diary-entries-list - (list (list date "" "" "" ""))))) - (setq date - (calendar-gregorian-from-absolute - (1+ (calendar-absolute-from-gregorian date)))) - (setq entry-found nil))) - (set-buffer-modified-p diary-modified)) - (set-syntax-table old-diary-syntax-table)) + (with-syntax-table diary-syntax-table + (let ((buffer-read-only nil) + (diary-modified (buffer-modified-p)) + (mark (regexp-quote diary-nonmarking-symbol))) + ;; First and last characters must be ^M or \n for + ;; selective display to work properly + (goto-char (1- (point-max))) + (if (not (looking-at "\^M\\|\n")) + (progn + (goto-char (point-max)) + (insert "\^M"))) + (goto-char (point-min)) + (if (not (looking-at "\^M\\|\n")) + (insert "\^M")) + (subst-char-in-region (point-min) (point-max) ?\n ?\^M t) + (calendar-for-loop + i from 1 to number do + (let ((month (extract-calendar-month date)) + (day (extract-calendar-day date)) + (year (extract-calendar-year date)) + (entry-found (list-sexp-diary-entries date))) + (dolist (date-form diary-date-forms) + (let* + ((backup (when (eq (car date-form) 'backup) + (setq date-form (cdr date-form)) + t)) + (dayname + (format "%s\\|%s\\.?" + (calendar-day-name date) + (calendar-day-name date 'abbrev))) + (monthname + (format "\\*\\|%s\\|%s\\.?" + (calendar-month-name month) + (calendar-month-name month 'abbrev))) + (month (concat "\\*\\|0*" (int-to-string month))) + (day (concat "\\*\\|0*" (int-to-string day))) + (year + (concat + "\\*\\|0*" (int-to-string year) + (if abbreviated-calendar-year + (concat "\\|" (format "%02d" (% year 100))) + ""))) + (regexp + (concat + "\\(\\`\\|\^M\\|\n\\)" mark "?\\(" + (mapconcat 'eval date-form "\\)\\(") + "\\)")) + (case-fold-search t)) + (goto-char (point-min)) + (while (re-search-forward regexp nil t) + (if backup (re-search-backward "\\<" nil t)) + (if (and (or (char-equal (preceding-char) ?\^M) + (char-equal (preceding-char) ?\n)) + (not (looking-at " \\|\^I"))) + ;; Diary entry that consists only of date. + (backward-char 1) + ;; Found a nonempty diary entry--make it + ;; visible and add it to the list. + (setq entry-found t) + (let ((entry-start (point)) + date-start temp) + (re-search-backward "\^M\\|\n\\|\\`") + (setq date-start (point)) + (re-search-forward "\^M\\|\n" nil t 2) + (while (looking-at " \\|\^I") + (re-search-forward "\^M\\|\n" nil t)) + (backward-char 1) + (subst-char-in-region date-start + (point) ?\^M ?\n t) + (setq entry (buffer-substring entry-start (point)) + temp (diary-pull-attrs entry file-glob-attrs) + entry (nth 0 temp)) + (add-to-diary-list + date + entry + (buffer-substring + (1+ date-start) (1- entry-start)) + (copy-marker entry-start) (nth 1 temp))))))) + (or entry-found + (not diary-list-include-blanks) + (setq diary-entries-list + (append diary-entries-list + (list (list date "" "" "" ""))))) + (setq date + (calendar-gregorian-from-absolute + (1+ (calendar-absolute-from-gregorian date)))) + (setq entry-found nil))) + (set-buffer-modified-p diary-modified))) (goto-char (point-min)) (run-hooks 'nongregorian-diary-listing-hook 'list-diary-entries-hook) @@ -459,6 +478,14 @@ These hooks have the following distinct roles: (run-hooks 'diary-hook) diary-entries-list)))))) +(defun diary-unhide-everything () + (setq selective-display nil) + (let ((inhibit-read-only t) + (modified (buffer-modified-p))) + (subst-char-in-region (point-min) (point-max) ?\^M ?\n t) + (set-buffer-modified-p modified)) + (kill-local-variable 'mode-line-format)) + (defun include-other-diary-files () "Include the diary entries from other diary files with those of diary-file. This function is suitable for use in `list-diary-entries-hook'; @@ -471,34 +498,24 @@ changing the variable `diary-include-string'." (goto-char (point-min)) (while (re-search-forward (concat - "\\(\\`\\|\^M\\|\n\\)" + "\\(?:\\`\\|\^M\\|\n\\)" (regexp-quote diary-include-string) " \"\\([^\"]*\\)\"") nil t) (let* ((diary-file (substitute-in-file-name - (buffer-substring-no-properties - (match-beginning 2) (match-end 2)))) + (match-string-no-properties 1))) (diary-list-include-blanks nil) (list-diary-entries-hook 'include-other-diary-files) (diary-display-hook 'ignore) - (diary-hook nil) - (d-buffer (find-buffer-visiting diary-file)) - (diary-modified (if d-buffer - (save-excursion - (set-buffer d-buffer) - (buffer-modified-p))))) + (diary-hook nil)) (if (file-exists-p diary-file) (if (file-readable-p diary-file) (unwind-protect (setq diary-entries-list (append diary-entries-list (list-diary-entries original-date number))) - (save-excursion - (set-buffer (find-buffer-visiting diary-file)) - (let ((inhibit-read-only t)) - (subst-char-in-region (point-min) (point-max) ?\^M ?\n t)) - (setq selective-display nil) - (set-buffer-modified-p diary-modified))) + (with-current-buffer (find-buffer-visiting diary-file) + (diary-unhide-everything))) (beep) (message "Can't read included diary file %s" diary-file) (sleep-for 2)) @@ -564,13 +581,9 @@ changing the variable `diary-include-string'." (defun fancy-diary-display () "Prepare a diary buffer with relevant entries in a fancy, noneditable form. This function is provided for optional use as the `diary-display-hook'." - (save-excursion;; Turn off selective-display in the diary file's buffer. - (set-buffer (find-buffer-visiting (substitute-in-file-name diary-file))) - (let ((diary-modified (buffer-modified-p))) - (subst-char-in-region (point-min) (point-max) ?\^M ?\n t) - (setq selective-display nil) - (kill-local-variable 'mode-line-format) - (set-buffer-modified-p diary-modified))) + (with-current-buffer ;; Turn off selective-display in the diary file's buffer. + (find-buffer-visiting (substitute-in-file-name diary-file)) + (diary-unhide-everything)) (if (or (not diary-entries-list) (and (not (cdr diary-entries-list)) (string-equal (car (cdr (car diary-entries-list))) ""))) @@ -740,7 +753,8 @@ the actual printing." (kill-buffer temp-buffer))) (error "You don't have a diary buffer!"))))) -(defun show-all-diary-entries () +(define-obsolete-function-alias 'show-all-diary-entries 'diary-show-all-entries) +(defun diary-show-all-entries () "Show all of the diary entries in the diary file. This function gets rid of the selective display of the diary file so that all entries, not just some, are visible. If there is no diary buffer, one @@ -748,16 +762,10 @@ is created." (interactive) (let ((d-file (diary-check-diary-file)) (pop-up-frames (window-dedicated-p (selected-window)))) - (save-excursion - (set-buffer (or (find-buffer-visiting d-file) - (find-file-noselect d-file t))) - (let ((buffer-read-only nil) - (diary-modified (buffer-modified-p))) - (subst-char-in-region (point-min) (point-max) ?\^M ?\n t) - (setq selective-display nil - mode-line-format default-mode-line-format) - (display-buffer (current-buffer)) - (set-buffer-modified-p diary-modified))))) + (with-current-buffer (or (find-buffer-visiting d-file) + (find-file-noselect d-file t)) + (diary-unhide-everything) + (display-buffer (current-buffer))))) (defcustom diary-mail-addr (if (boundp 'user-mail-address) user-mail-address "") @@ -807,9 +815,7 @@ to run it every morning at 1am." (calendar-date-string (calendar-current-date)))) (insert (if (get-buffer fancy-diary-buffer) - (save-excursion - (set-buffer fancy-diary-buffer) - (buffer-substring (point-min) (point-max))) + (with-current-buffer fancy-diary-buffer (buffer-string)) "No entries found")) (call-interactively (get mail-user-agent 'sendfunc)))) @@ -844,7 +850,7 @@ marked. After the entries are marked, the hooks `nongregorian-diary-marking-hook' and `mark-diary-entries-hook' are run. If the optional argument REDRAW is non-nil (which is the case interactively, for example) then any existing diary -marks are first removed. This is intended to deal with deleted +marks are first removed. This is intended to deal with deleted diary entries." (interactive "p") ;; To remove any deleted diary entries. Do not redraw when: @@ -859,116 +865,99 @@ diary entries." (let ((marking-diary-entries t) file-glob-attrs marks) (save-excursion - (set-buffer (find-file-noselect (diary-check-diary-file) t)) - (setq mark-diary-entries-in-calendar t) - (message "Marking diary entries...") - (setq file-glob-attrs (nth 1 (diary-pull-attrs nil '()))) - (let ((d diary-date-forms) - (old-diary-syntax-table (syntax-table)) - temp) - (set-syntax-table diary-syntax-table) - (while d - (let* ((date-form (if (equal (car (car d)) 'backup) - (cdr (car d)) - (car d)));; ignore 'backup directive - (dayname - (diary-name-pattern calendar-day-name-array - calendar-day-abbrev-array)) - (monthname - (format "%s\\|\\*" - (diary-name-pattern calendar-month-name-array - calendar-month-abbrev-array))) - (month "[0-9]+\\|\\*") - (day "[0-9]+\\|\\*") - (year "[0-9]+\\|\\*") - (l (length date-form)) - (d-name-pos (- l (length (memq 'dayname date-form)))) - (d-name-pos (if (/= l d-name-pos) (+ 2 d-name-pos))) - (m-name-pos (- l (length (memq 'monthname date-form)))) - (m-name-pos (if (/= l m-name-pos) (+ 2 m-name-pos))) - (d-pos (- l (length (memq 'day date-form)))) - (d-pos (if (/= l d-pos) (+ 2 d-pos))) - (m-pos (- l (length (memq 'month date-form)))) - (m-pos (if (/= l m-pos) (+ 2 m-pos))) - (y-pos (- l (length (memq 'year date-form)))) - (y-pos (if (/= l y-pos) (+ 2 y-pos))) - (regexp - (concat - "\\(\\`\\|\^M\\|\n\\)\\(" - (mapconcat 'eval date-form "\\)\\(") - "\\)")) - (case-fold-search t)) - (goto-char (point-min)) - (while (re-search-forward regexp nil t) - (let* ((dd-name - (if d-name-pos - (buffer-substring-no-properties - (match-beginning d-name-pos) - (match-end d-name-pos)))) - (mm-name - (if m-name-pos - (buffer-substring-no-properties - (match-beginning m-name-pos) - (match-end m-name-pos)))) - (mm (string-to-number - (if m-pos - (buffer-substring-no-properties - (match-beginning m-pos) - (match-end m-pos)) - ""))) - (dd (string-to-number - (if d-pos - (buffer-substring-no-properties - (match-beginning d-pos) - (match-end d-pos)) - ""))) - (y-str (if y-pos - (buffer-substring-no-properties - (match-beginning y-pos) - (match-end y-pos)))) - (yy (if (not y-str) - 0 - (if (and (= (length y-str) 2) - abbreviated-calendar-year) - (let* ((current-y - (extract-calendar-year - (calendar-current-date))) - (y (+ (string-to-number y-str) - (* 100 - (/ current-y 100))))) - (if (> (- y current-y) 50) - (- y 100) - (if (> (- current-y y) 50) - (+ y 100) - y))) - (string-to-number y-str)))) - (save-excursion - (setq entry (buffer-substring-no-properties - (point) (line-end-position)) - temp (diary-pull-attrs entry file-glob-attrs) - entry (nth 0 temp) - marks (nth 1 temp)))) - (if dd-name - (mark-calendar-days-named - (cdr (assoc-string - dd-name - (calendar-make-alist - calendar-day-name-array - 0 nil calendar-day-abbrev-array) t)) marks) - (if mm-name - (setq mm - (if (string-equal mm-name "*") 0 - (cdr (assoc-string - mm-name - (calendar-make-alist - calendar-month-name-array - 1 nil calendar-month-abbrev-array) t))))) - (mark-calendar-date-pattern mm dd yy marks)))) - (setq d (cdr d)))) - (mark-sexp-diary-entries) - (run-hooks 'nongregorian-diary-marking-hook - 'mark-diary-entries-hook) - (set-syntax-table old-diary-syntax-table) + (with-current-buffer (find-file-noselect (diary-check-diary-file) t) + (setq mark-diary-entries-in-calendar t) + (message "Marking diary entries...") + (setq file-glob-attrs (nth 1 (diary-pull-attrs nil '()))) + (with-syntax-table diary-syntax-table + (dolist (date-form diary-date-forms) + (if (eq (car date-form) 'backup) + (setq date-form (cdr date-form))) ;; ignore 'backup directive + (let* ((dayname + (diary-name-pattern calendar-day-name-array + calendar-day-abbrev-array)) + (monthname + (format "%s\\|\\*" + (diary-name-pattern calendar-month-name-array + calendar-month-abbrev-array))) + (month "[0-9]+\\|\\*") + (day "[0-9]+\\|\\*") + (year "[0-9]+\\|\\*") + (l (length date-form)) + (d-name-pos (- l (length (memq 'dayname date-form)))) + (d-name-pos (if (/= l d-name-pos) (+ 2 d-name-pos))) + (m-name-pos (- l (length (memq 'monthname date-form)))) + (m-name-pos (if (/= l m-name-pos) (+ 2 m-name-pos))) + (d-pos (- l (length (memq 'day date-form)))) + (d-pos (if (/= l d-pos) (+ 2 d-pos))) + (m-pos (- l (length (memq 'month date-form)))) + (m-pos (if (/= l m-pos) (+ 2 m-pos))) + (y-pos (- l (length (memq 'year date-form)))) + (y-pos (if (/= l y-pos) (+ 2 y-pos))) + (regexp + (concat + "\\(\\`\\|\^M\\|\n\\)\\(" + (mapconcat 'eval date-form "\\)\\(") + "\\)")) + (case-fold-search t)) + (goto-char (point-min)) + (while (re-search-forward regexp nil t) + (let* ((dd-name + (if d-name-pos + (match-string-no-properties d-name-pos))) + (mm-name + (if m-name-pos + (match-string-no-properties m-name-pos))) + (mm (string-to-number + (if m-pos + (match-string-no-properties m-pos) + ""))) + (dd (string-to-number + (if d-pos + (match-string-no-properties d-pos) + ""))) + (y-str (if y-pos + (match-string-no-properties y-pos))) + (yy (if (not y-str) + 0 + (if (and (= (length y-str) 2) + abbreviated-calendar-year) + (let* ((current-y + (extract-calendar-year + (calendar-current-date))) + (y (+ (string-to-number y-str) + (* 100 + (/ current-y 100))))) + (if (> (- y current-y) 50) + (- y 100) + (if (> (- current-y y) 50) + (+ y 100) + y))) + (string-to-number y-str))))) + (let ((tmp (diary-pull-attrs (buffer-substring-no-properties + (point) (line-end-position)) + file-glob-attrs))) + (setq entry (nth 0 tmp) + marks (nth 1 tmp))) + (if dd-name + (mark-calendar-days-named + (cdr (assoc-string + dd-name + (calendar-make-alist + calendar-day-name-array + 0 nil calendar-day-abbrev-array) t)) marks) + (if mm-name + (setq mm + (if (string-equal mm-name "*") 0 + (cdr (assoc-string + mm-name + (calendar-make-alist + calendar-month-name-array + 1 nil calendar-month-abbrev-array) t))))) + (mark-calendar-date-pattern mm dd yy marks)))))) + (mark-sexp-diary-entries) + (run-hooks 'nongregorian-diary-marking-hook + 'mark-diary-entries-hook)) (message "Marking diary entries...done"))))) (defun mark-sexp-diary-entries () @@ -982,8 +971,7 @@ is marked. See the documentation for the function `list-sexp-diary-entries'." sexp-mark "(diary-remind\\)")) (file-glob-attrs (nth 1 (diary-pull-attrs nil '()))) m y first-date last-date mark file-glob-attrs) - (save-excursion - (set-buffer calendar-buffer) + (with-current-buffer calendar-buffer (setq m displayed-month) (setq y displayed-year)) (increment-calendar-month m y -1) @@ -1048,12 +1036,12 @@ changing the variable `diary-include-string'." (goto-char (point-min)) (while (re-search-forward (concat - "\\(\\`\\|\^M\\|\n\\)" + "\\(?:\\`\\|\^M\\|\n\\)" (regexp-quote diary-include-string) " \"\\([^\"]*\\)\"") nil t) (let* ((diary-file (substitute-in-file-name - (match-string-no-properties 2))) + (match-string-no-properties 1))) (mark-diary-entries-hook 'mark-included-diary-files) (dbuff (find-buffer-visiting diary-file))) (if (file-exists-p diary-file) @@ -1073,8 +1061,7 @@ changing the variable `diary-include-string'." (defun mark-calendar-days-named (dayname &optional color) "Mark all dates in the calendar window that are day DAYNAME of the week. 0 means all Sundays, 1 means all Mondays, and so on." - (save-excursion - (set-buffer calendar-buffer) + (with-current-buffer calendar-buffer (let ((prev-month displayed-month) (prev-year displayed-year) (succ-month displayed-month) @@ -1094,8 +1081,7 @@ changing the variable `diary-include-string'." (defun mark-calendar-date-pattern (month day year &optional color) "Mark all dates in the calendar window that conform to MONTH/DAY/YEAR. A value of 0 in any position is a wildcard." - (save-excursion - (set-buffer calendar-buffer) + (with-current-buffer calendar-buffer (let ((m displayed-month) (y displayed-year)) (increment-calendar-month m y -1) @@ -1152,22 +1138,17 @@ be used instead of a colon (:) to separate the hour and minute parts." (cond ((string-match ; Military time "\\`[ \t\n\\^M]*\\([0-9]?[0-9]\\)[:.]?\\([0-9][0-9]\\)\\(\\>\\|[^ap]\\)" s) - (+ (* 100 (string-to-number - (substring s (match-beginning 1) (match-end 1)))) - (string-to-number (substring s (match-beginning 2) (match-end 2))))) + (+ (* 100 (string-to-number (match-string 1 s))) + (string-to-number (match-string 2 s)))) ((string-match ; Hour only XXam or XXpm "\\`[ \t\n\\^M]*\\([0-9]?[0-9]\\)\\([ap]\\)m\\>" s) - (+ (* 100 (% (string-to-number - (substring s (match-beginning 1) (match-end 1))) - 12)) + (+ (* 100 (% (string-to-number (match-string 1 s)) 12)) (if (equal ?a (downcase (aref s (match-beginning 2)))) 0 1200))) ((string-match ; Hour and minute XX:XXam or XX:XXpm "\\`[ \t\n\\^M]*\\([0-9]?[0-9]\\)[:.]\\([0-9][0-9]\\)\\([ap]\\)m\\>" s) - (+ (* 100 (% (string-to-number - (substring s (match-beginning 1) (match-end 1))) - 12)) - (string-to-number (substring s (match-beginning 2) (match-end 2))) + (+ (* 100 (% (string-to-number (match-string 1 s)) 12)) + (string-to-number (match-string 2 s)) (if (equal ?a (downcase (aref s (match-beginning 3)))) 0 1200))) (t diary-unknown-time)))) ; Unrecognizable @@ -1404,14 +1385,7 @@ best if they are nonmarking." (error (beep) (message "Bad sexp at line %d in %s: %s" - (save-excursion - (save-restriction - (narrow-to-region 1 (point)) - (goto-char (point-min)) - (let ((lines 1)) - (while (re-search-forward "\n\\|\^M" nil t) - (setq lines (1+ lines))) - lines))) + (count-lines (point-min) (point)) diary-file sexp) (sleep-for 2)))))) (cond ((stringp result) result) @@ -1688,12 +1662,9 @@ If omitted, NONMARKING defaults to nil and FILE defaults to redrawn with the new entry marked, if necessary." (let ((pop-up-frames (window-dedicated-p (selected-window)))) (find-file-other-window (substitute-in-file-name (or file diary-file)))) - (add-hook 'write-contents-functions 'diary-redraw-calendar nil t) - (when selective-display - (subst-char-in-region (point-min) (point-max) ?\^M ?\n t) - (setq selective-display nil) - (kill-local-variable 'mode-line-format)) + (add-hook 'after-save-hook 'diary-redraw-calendar nil t) (widen) + (diary-unhide-everything) (goto-char (point-max)) (when (let ((case-fold-search t)) (search-backward "Local Variables:" @@ -1701,7 +1672,7 @@ redrawn with the new entry marked, if necessary." t)) (beginning-of-line) (insert "\n") - (previous-line 1)) + (forward-line -1)) (insert (if (bolp) "" "\n") (if nonmarking diary-nonmarking-symbol "") @@ -1798,19 +1769,29 @@ Prefix arg will make the entry nonmarking." (calendar-date-string (calendar-cursor-to-date t) nil t)) arg))) +(defvar diary-mode-map + (let ((map (make-sparse-keymap))) + (define-key map "\C-c\C-s" 'diary-show-all-entries) + (define-key map "\C-c\C-q" 'quit-window) + map) + "Keymap for `diary-mode'.") + ;;;###autoload -(define-derived-mode diary-mode fundamental-mode - "Diary" +(define-derived-mode diary-mode fundamental-mode "Diary" "Major mode for editing the diary file." (set (make-local-variable 'font-lock-defaults) - '(diary-font-lock-keywords t))) + '(diary-font-lock-keywords t)) + (add-to-invisibility-spec '(diary . nil)) + (add-hook 'after-save-hook 'diary-redraw-calendar nil t) + (if diary-header-line-flag + (setq header-line-format diary-header-line-format))) (define-derived-mode fancy-diary-display-mode fundamental-mode "Diary" "Major mode used while displaying diary entries using Fancy Display." (set (make-local-variable 'font-lock-defaults) '(fancy-diary-font-lock-keywords t)) - (define-key (current-local-map) "q" 'quit-window)) + (local-set-key "q" 'quit-window)) (defvar fancy-diary-font-lock-keywords @@ -1836,7 +1817,7 @@ Prefix arg will make the entry nonmarking." "Keywords to highlight in fancy diary display") -(defun font-lock-diary-sexps (limit) +(defun diary-font-lock-sexps (limit) "Recognize sexp diary entry for font-locking." (if (re-search-forward (concat "^" (regexp-quote diary-nonmarking-symbol) @@ -1851,7 +1832,7 @@ Prefix arg will make the entry nonmarking." t)) (error t)))) -(defun font-lock-diary-date-forms (month-array &optional symbol abbrev-array) +(defun diary-font-lock-date-forms (month-array &optional symbol abbrev-array) "Create font-lock patterns for `diary-date-forms' using MONTH-ARRAY. If given, optional SYMBOL must be a prefix to entries. If optional ABBREV-ARRAY is present, the abbreviations constructed @@ -1865,7 +1846,7 @@ names." (month "\\([0-9]+\\|\\*\\)") (day "\\([0-9]+\\|\\*\\)") (year "-?\\([0-9]+\\|\\*\\)")) - (mapcar '(lambda (x) + (mapcar (lambda (x) (cons (concat "^" (regexp-quote diary-nonmarking-symbol) "?" (if symbol (regexp-quote symbol) "") "\\(" @@ -1873,7 +1854,7 @@ names." ;; If backup, omit first item (backup) ;; and last item (not part of date) (if (equal (car x) 'backup) - (reverse (cdr (reverse (cdr x)))) + (nreverse (cdr (reverse (cdr x)))) x) "") ;; With backup, last item is not part of date @@ -1888,14 +1869,14 @@ names." (defvar diary-font-lock-keywords (append - (font-lock-diary-date-forms calendar-month-name-array + (diary-font-lock-date-forms calendar-month-name-array nil calendar-month-abbrev-array) (when (or (memq 'mark-hebrew-diary-entries nongregorian-diary-marking-hook) (memq 'list-hebrew-diary-entries nongregorian-diary-listing-hook)) (require 'cal-hebrew) - (font-lock-diary-date-forms + (diary-font-lock-date-forms calendar-hebrew-month-name-array-leap-year hebrew-diary-entry-symbol)) (when (or (memq 'mark-islamic-diary-entries @@ -1903,7 +1884,7 @@ names." (memq 'list-islamic-diary-entries nongregorian-diary-listing-hook)) (require 'cal-islam) - (font-lock-diary-date-forms + (diary-font-lock-date-forms calendar-islamic-month-name-array islamic-diary-entry-symbol)) (list @@ -1925,10 +1906,10 @@ names." (concat "^" (regexp-quote diary-nonmarking-symbol) "?\\(" (regexp-quote islamic-diary-entry-symbol) "\\)") '(1 font-lock-reference-face)) - '(font-lock-diary-sexps . font-lock-keyword-face) + '(diary-font-lock-sexps . font-lock-keyword-face) '("[0-9]?[0-9]\\([:.]?[0-9][0-9]\\)?\\(am\\|pm\\|AM\\|PM\\)\\(-[0-9]?[0-9]\\([:.]?[0-9][0-9]\\)?\\(am\\|pm\\|AM\\|PM\\)\\)?" . font-lock-function-name-face))) - "Forms to highlight in diary-mode") + "Forms to highlight in `diary-mode'.") ;; Following code from Dave Love . @@ -2087,5 +2068,5 @@ user is asked to confirm its addition." (provide 'diary-lib) -;;; arch-tag: 22dd506e-2e33-410d-9ae1-095a0c1b2010 +;; arch-tag: 22dd506e-2e33-410d-9ae1-095a0c1b2010 ;;; diary-lib.el ends here diff --git a/lisp/calendar/icalendar.el b/lisp/calendar/icalendar.el index 7e9e44210ef..0e0400bd686 100644 --- a/lisp/calendar/icalendar.el +++ b/lisp/calendar/icalendar.el @@ -1532,7 +1532,7 @@ written into the buffer `*icalendar-errors*'." (setq found-error t) (setq error-string (format "%s\n%s\nCannot handle this event: %s" error-val error-string e)) - (message error-string)))) + (message "%s" error-string)))) (if found-error (save-current-buffer (set-buffer (get-buffer-create "*icalendar-errors*")) diff --git a/lisp/calendar/timeclock.el b/lisp/calendar/timeclock.el index 19191fd84b9..afa7b0e87d9 100644 --- a/lisp/calendar/timeclock.el +++ b/lisp/calendar/timeclock.el @@ -441,7 +441,7 @@ worked today, ignoring the time worked on previous days." "remaining" "over") (timeclock-when-to-leave-string show-seconds today-only))) (if (interactive-p) - (message status) + (message "%s" status) status))) ;;;###autoload @@ -512,7 +512,7 @@ See `timeclock-relative' for more information about the meaning of (timeclock-workday-remaining today-only) show-seconds t))) (if (interactive-p) - (message string) + (message "%s" string) string))) (defsubst timeclock-workday-elapsed () @@ -534,7 +534,7 @@ non-nil, the amount returned will be relative to past time worked." (let ((string (timeclock-seconds-to-string (timeclock-workday-elapsed) show-seconds))) (if (interactive-p) - (message string) + (message "%s" string) string))) (defsubst timeclock-time-to-seconds (time) @@ -579,7 +579,7 @@ relative only to the time worked today, and not to past time." (format-time-string "%-I:%M:%S %p" then) (format-time-string "%-I:%M %p" then)))) (if (interactive-p) - (message string) + (message "%s" string) string))) ;;; Internal Functions: diff --git a/lisp/custom.el b/lisp/custom.el index d634160e534..cf6ef88456e 100644 --- a/lisp/custom.el +++ b/lisp/custom.el @@ -649,17 +649,16 @@ See `custom-known-themes' for a list of known themes." (progn (setcar (cdr setting) mode) (setcar (cddr setting) value)) - (if (and (null old) - (boundp symbol)) - (setq old - (list - (list 'standard 'set - (if (eq prop 'theme-value) - (symbol-value symbol) - (list - (append - '(t) - (custom-face-attributes-get symbol nil)))))))) + ;; If no custom theme has been applied yet, first save the + ;; current values to the 'standard theme. + (if (null old) + (if (and (eq prop 'theme-value) + (boundp symbol)) + (setq old + (list (list 'standard 'set (symbol-value symbol)))) + (if (facep symbol) + (setq old (list (list 'standard 'set (list + (append '(t) (custom-face-attributes-get symbol nil))))))))) (put symbol prop (cons (list theme mode value) old))) ;; Record, for each theme, all its settings. (put theme 'theme-settings diff --git a/lisp/desktop.el b/lisp/desktop.el index 5f0b4c4b3ec..956a14e7b0e 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el @@ -944,7 +944,7 @@ directory DIRNAME." desktop-buffer-file-name))) (if desktop-missing-file-warning (y-or-n-p (concat msg " Re-create? ")) - (message msg) + (message "%s" msg) nil))) (let* ((auto-insert nil) ; Disable auto insertion (coding-system-for-read @@ -1101,7 +1101,7 @@ ARGS must be an argument list for `desktop-create-buffer'." (msg (format "Desktop lazily opening %s (%s remaining)..." buffer-name remaining))) (when desktop-lazy-verbose - (message msg)) + (message "%s" msg)) (let ((desktop-first-buffer nil) (desktop-buffer-ok-count 0) (desktop-buffer-fail-count 0)) diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el index 0d3f6fe125b..17e61792d33 100644 --- a/lisp/dired-aux.el +++ b/lisp/dired-aux.el @@ -845,7 +845,7 @@ Otherwise, the rule is a compression rule, and compression is done with gzip.") (apply 'message qprompt qs-args) (setq char (set qs-var (read-char)))) ;; Display the question with the answer. - (message (concat (apply 'format qprompt qs-args) + (message "%s" (concat (apply 'format qprompt qs-args) (char-to-string char))) (memq (cdr elt) '(t y yes))))))) diff --git a/lisp/dnd.el b/lisp/dnd.el index 1092f4d087f..f85984fb7d8 100644 --- a/lisp/dnd.el +++ b/lisp/dnd.el @@ -179,7 +179,7 @@ TEXT is the text as a string, WINDOW is the window where the drop happened." (not (windowp window))) (progn (kill-new text) - (message + (message "%s" (substitute-command-keys "The dropped text can be accessed with \\[yank]"))) (insert text)) diff --git a/lisp/echistory.el b/lisp/echistory.el index 3b4b8419bd0..6556680f5ca 100644 --- a/lisp/echistory.el +++ b/lisp/echistory.el @@ -140,7 +140,7 @@ The Command History listing is recomputed each time this mode is invoked." (defun Electric-history-undefined () (interactive) (ding) - (message (substitute-command-keys "Type \\[Helper-help] for help, ? for commands, C-c C-c to quit, Space to execute")) + (message "%s" (substitute-command-keys "Type \\[Helper-help] for help, ? for commands, C-c C-c to quit, Space to execute")) (sit-for 4)) (defun Electric-history-quit () diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el index 2e24548dbbe..a28f9d459ff 100644 --- a/lisp/ediff-util.el +++ b/lisp/ediff-util.el @@ -2075,7 +2075,7 @@ ARG is a prefix argument. If nil, copy the current difference region." (ediff-clear-fine-differences n)) ;; Make sure that the message about saving and how to restore is seen ;; by the user - (message messg)) + (message "%s" messg)) )) ;; Save Nth diff of buffer BUF-TYPE \(A, B, or C\). @@ -2720,7 +2720,7 @@ only if this merge job is part of a group, i.e., was invoked from within (format "Another buffer is visiting file %s. Too dangerous to save the merge buffer" file))) (beep) - (message warn-message) + (message "%s" warn-message) (with-output-to-temp-buffer ediff-msg-buffer (princ "\n\n") (princ warn-message) @@ -3286,7 +3286,7 @@ Hit \\[ediff-recenter] to reset the windows afterward." (princ warn-message) (princ "\n\n")) (if (y-or-n-p - (message warn-message)) + (message "%s" warn-message)) (with-current-buffer buff (save-buffer) (kill-buffer (current-buffer))) diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el index d860bfcd598..dea72fc7567 100644 --- a/lisp/emacs-lisp/find-func.el +++ b/lisp/emacs-lisp/find-func.el @@ -260,7 +260,7 @@ in `load-path'." (setq function (symbol-function function) def (symbol-function function))) (if aliases - (message aliases)) + (message "%s" aliases)) (let ((library (cond ((eq (car-safe def) 'autoload) (nth 1 def)) diff --git a/lisp/emacs-lisp/lisp-mnt.el b/lisp/emacs-lisp/lisp-mnt.el index b102b4da581..0fd49024beb 100644 --- a/lisp/emacs-lisp/lisp-mnt.el +++ b/lisp/emacs-lisp/lisp-mnt.el @@ -610,7 +610,7 @@ Prompts for bug subject TOPIC. Leaves you in a mail buffer." (if version (insert " version " version)) (newline 2) - (message + (message "%s" (substitute-command-keys "Type \\[mail-send] to send bug report.")))) (provide 'lisp-mnt) diff --git a/lisp/emulation/viper-ex.el b/lisp/emulation/viper-ex.el index 87d2d7f5d5a..5321228fe29 100644 --- a/lisp/emulation/viper-ex.el +++ b/lisp/emulation/viper-ex.el @@ -1590,7 +1590,7 @@ reversed." ;; Ex print working directory (defun ex-pwd () - (message default-directory)) + (message "%s" default-directory)) ;; Ex quit command (defun ex-quit () @@ -2230,7 +2230,7 @@ Type 'mak ' (including the space) to run make with no args." (if (buffer-modified-p) "[Modified]" "[Unchanged]"))) (if (< (+ 1 (length info) (length file)) (window-width (minibuffer-window))) - (message (concat file " " info)) + (message "%s" (concat file " " info)) (save-window-excursion (with-output-to-temp-buffer " *viper-info*" (princ (concat "\n" file "\n\n\t" info "\n\n"))) diff --git a/lisp/emulation/viper-macs.el b/lisp/emulation/viper-macs.el index edc5cba1bbe..9349a950e97 100644 --- a/lisp/emulation/viper-macs.el +++ b/lisp/emulation/viper-macs.el @@ -186,7 +186,7 @@ a key is a symbol, e.g., `a', `\\1', `f2', etc., or a list, e.g., variant (if (> (length key-seq) 0) (prin1-to-string (viper-display-macro key-seq)) ""))) - (message message) + (message "%s" message) (setq event (viper-read-key)) ;;(setq event (viper-read-event)) (setq key @@ -263,7 +263,7 @@ a key is a symbol, e.g., `a', `\\1', `f2', etc., or a list, e.g., (prin1-to-string (viper-display-macro key-seq)) ""))) - (message message) + (message "%s" message) (setq event (viper-read-key)) ;;(setq event (viper-read-event)) (setq key @@ -442,7 +442,11 @@ If SCOPE is nil, the user is asked to specify the scope." scope) viper-custom-file-name)) - (message msg) + ;; 2005-09-18 T06:41:22-0400 (Sunday) D. Goel + ;; From careful parsing of the above code, it looks like msg + ;; couldn't be nil when we reach here. Since it is a string, + ;; and a complicated one too, we might as well provide it a "%s" + (message "%s" msg) )) (setq new-elt diff --git a/lisp/emulation/ws-mode.el b/lisp/emulation/ws-mode.el index 41e8f5323a5..e677e5a20ff 100644 --- a/lisp/emulation/ws-mode.el +++ b/lisp/emulation/ws-mode.el @@ -691,7 +691,7 @@ in ws-last-errormessage for recovery with C-q w." This will only work for errors raised by WordStar mode functions." (interactive) (if ws-last-errormessage - (message ws-last-errormessage) + (message "%s" ws-last-errormessage) (message "No WordStar error yet."))) (defun ws-kill-eol () diff --git a/lisp/eshell/esh-proc.el b/lisp/eshell/esh-proc.el index 82a0968ae3d..530eb9c900a 100644 --- a/lisp/eshell/esh-proc.el +++ b/lisp/eshell/esh-proc.el @@ -225,8 +225,8 @@ The prompt will be set to PROMPT." (if (and (eshell-processp (car entry)) (nth 2 entry) eshell-done-messages-in-minibuffer) - (message (format "[%s]+ Done %s" (process-name (car entry)) - (process-command (car entry))))) + (message "[%s]+ Done %s" (process-name (car entry)) + (process-command (car entry)))) (setq eshell-process-list (delq entry eshell-process-list))) diff --git a/lisp/files.el b/lisp/files.el index 1ffd17eefd4..3706ad54edf 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -1738,7 +1738,11 @@ in that case, this function acts as if `enable-local-variables' were t." (hack-local-variables))) ;; Turn font lock off and on, to make sure it takes account of ;; whatever file local variables are relevant to it. - (when (and font-lock-mode (eq (car font-lock-keywords) t)) + (when (and font-lock-mode + ;; Font-lock-mode (now in font-core.el) can be ON when + ;; font-lock.el still hasn't been loaded. + (boundp 'font-lock-keywords) + (eq (car font-lock-keywords) t)) (setq font-lock-keywords (cadr font-lock-keywords)) (font-lock-mode 1)) @@ -3576,7 +3580,7 @@ If visiting file read-only and `view-read-only' is non-nil, enter view mode." (t (setq buffer-read-only (not buffer-read-only)) (force-mode-line-update))) (if (vc-backend buffer-file-name) - (message (substitute-command-keys + (message "%s" (substitute-command-keys (concat "File is under version-control; " "use \\[vc-next-action] to check in/out")))))) diff --git a/lisp/follow.el b/lisp/follow.el index 37a157cc406..ef1b2231950 100644 --- a/lisp/follow.el +++ b/lisp/follow.el @@ -4,7 +4,7 @@ ;; 2005 Free Software Foundation, Inc. ;; Author: Anders Lindgren -;; Maintainer: Anders Lindgren +;; Maintainer: FSF (Anders' email bounces, Sep 2005) ;; Created: 1995-05-25 ;; Keywords: display, window, minor-mode, convenience ;; Last Changed: 1999-11-17 diff --git a/lisp/font-lock.el b/lisp/font-lock.el index 21e25ac8a54..d8529fc1fb6 100644 --- a/lisp/font-lock.el +++ b/lisp/font-lock.el @@ -340,6 +340,7 @@ This can be an \"!\" or the \"n\" in \"ifndef\".") ;; Fontification variables: +;;;###autoload (defvar font-lock-keywords nil "A list of the keywords to highlight. There are two kinds of values: user-level, and compiled. diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 96052e04c12..08fd723cf1f 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,22 @@ +2005-09-18 D Goel + + * sieve.el (sieve-help): Fix `message' call: first arg should be a + format spec. + +2005-09-16 Katsumi Yamaoka + + * gnus.el (gnus-group-startup-message): Bind image-load-path. + +2005-09-14 Katsumi Yamaoka + + * gnus-art.el (gnus-mime-display-part): Protect against broken + MIME messages. + +2005-09-13 Katsumi Yamaoka + + * gnus-sum.el (gnus-summary-edit-article-done): Remove text props + before parsing header. + 2005-09-10 Reiner Steib * spam-report.el (spam-report-gmane): Fix generation of spam diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index 3bdc93935bc..3821f9ecf18 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el @@ -4761,6 +4761,8 @@ If displaying \"text/html\" is discouraged \(see (defun gnus-mime-display-part (handle) (cond + ;; Maybe a broken MIME message. + ((null handle)) ;; Single part. ((not (stringp (car handle))) (gnus-mime-display-single handle)) diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el index 73837e21902..88fe21fd5a2 100644 --- a/lisp/gnus/gnus-sum.el +++ b/lisp/gnus/gnus-sum.el @@ -9561,7 +9561,8 @@ groups." (save-excursion (save-restriction (message-narrow-to-head) - (let ((head (buffer-string)) + (let ((head (buffer-substring-no-properties + (point-min) (point-max))) header) (with-temp-buffer (insert (format "211 %d Article retrieved.\n" diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el index d0e199e2d06..5d35137aec6 100644 --- a/lisp/gnus/gnus.el +++ b/lisp/gnus/gnus.el @@ -1006,6 +1006,11 @@ be set in `.emacs' instead." (fboundp 'find-image) (display-graphic-p) (let* ((data-directory (nnheader-find-etc-directory "images/gnus")) + (image-load-path (cond (data-directory + (list data-directory)) + ((boundp 'image-load-path) + (symbol-value 'image-load-path)) + (t load-path))) (image (find-image `((:type xpm :file "gnus.xpm" :color-symbols diff --git a/lisp/gnus/sieve.el b/lisp/gnus/sieve.el index 28fde926c93..5badbe7869a 100644 --- a/lisp/gnus/sieve.el +++ b/lisp/gnus/sieve.el @@ -245,7 +245,7 @@ Used to bracket operations which move point in the sieve-buffer." (if (eq last-command 'sieve-help) ;; would need minor-mode for log-edit-mode (describe-function 'sieve-mode) - (message (substitute-command-keys + (message "%s" (substitute-command-keys "`\\[sieve-edit-script]':edit `\\[sieve-activate]':activate `\\[sieve-deactivate]':deactivate `\\[sieve-remove]':remove")))) (defun sieve-bury-buffer (buf &optional mainbuf) diff --git a/lisp/help-fns.el b/lisp/help-fns.el index ae7a60cf55e..b7820b778d2 100644 --- a/lisp/help-fns.el +++ b/lisp/help-fns.el @@ -269,22 +269,20 @@ face (according to `face-differs-from-default-p')." (defun help-do-arg-highlight (doc args) (with-syntax-table (make-syntax-table emacs-lisp-mode-syntax-table) (modify-syntax-entry ?\- "w") - (while args - (let ((arg (prog1 (car args) (setq args (cdr args))))) - (setq doc (replace-regexp-in-string - ;; This is heuristic, but covers all common cases - ;; except ARG1-ARG2 - (concat "\\<" ; beginning of word - "\\(?:[a-z-]*-\\)?" ; for xxx-ARG - "\\(" - (regexp-quote arg) - "\\)" - "\\(?:es\\|s\\|th\\)?" ; for ARGth, ARGs - "\\(?:-[a-z-]+\\)?" ; for ARG-xxx - "\\>") ; end of word - (help-default-arg-highlight arg) - doc t t 1)))) - doc)) + (dolist (arg args doc) + (setq doc (replace-regexp-in-string + ;; This is heuristic, but covers all common cases + ;; except ARG1-ARG2 + (concat "\\<" ; beginning of word + "\\(?:[a-z-]*-\\)?" ; for xxx-ARG + "\\(" + (regexp-quote arg) + "\\)" + "\\(?:es\\|s\\|th\\)?" ; for ARGth, ARGs + "\\(?:-[a-z0-9-]+\\)?" ; for ARG-xxx, ARG-n + "\\>") ; end of word + (help-default-arg-highlight arg) + doc t t 1))))) (defun help-highlight-arguments (usage doc &rest args) (when usage @@ -522,108 +520,13 @@ it is displayed along with the global value." (let* ((valvoid (not (with-current-buffer buffer (boundp variable)))) ;; Extract the value before setting up the output buffer, ;; in case `buffer' *is* the output buffer. - (val (unless valvoid (buffer-local-value variable buffer)))) + (val (unless valvoid (buffer-local-value variable buffer))) + val-start-pos) (help-setup-xref (list #'describe-variable variable buffer) (interactive-p)) (with-output-to-temp-buffer (help-buffer) (with-current-buffer buffer (prin1 variable) - (if valvoid - (princ " is void") - (with-current-buffer standard-output - (princ "'s value is ") - (terpri) - (let ((from (point))) - (pp val) - ;; Hyperlinks in variable's value are quite frequently - ;; inappropriate e.g C-h v features - ;; (help-xref-on-pp from (point)) - (if (< (point) (+ from 20)) - (delete-region (1- from) from))))) - (terpri) - (when (local-variable-p variable) - (princ (format "%socal in buffer %s; " - (if (get variable 'permanent-local) - "Permanently l" "L") - (buffer-name))) - (if (not (default-boundp variable)) - (princ "globally void") - (let ((val (default-value variable))) - (with-current-buffer standard-output - (princ "global value is ") - (terpri) - ;; Fixme: pp can take an age if you happen to - ;; ask for a very large expression. We should - ;; probably print it raw once and check it's a - ;; sensible size before prettyprinting. -- fx - (let ((from (point))) - (pp val) - ;; See previous comment for this function. - ;; (help-xref-on-pp from (point)) - (if (< (point) (+ from 20)) - (delete-region (1- from) from)))))) - (terpri)) - (terpri) - (with-current-buffer standard-output - (when (> (count-lines (point-min) (point-max)) 10) - ;; Note that setting the syntax table like below - ;; makes forward-sexp move over a `'s' at the end - ;; of a symbol. - (set-syntax-table emacs-lisp-mode-syntax-table) - (goto-char (point-min)) - (if valvoid - (forward-line 1) - (forward-sexp 1) - (delete-region (point) (progn (end-of-line) (point))) - (save-excursion - (insert "\n\nValue:") - (set (make-local-variable 'help-button-cache) - (point-marker))) - (insert " value is shown ") - (insert-button "below" - 'action help-button-cache - 'follow-link t - 'help-echo "mouse-2, RET: show value") - (insert ".\n\n"))) - ;; Add a note for variables that have been make-var-buffer-local. - (when (and (local-variable-if-set-p variable) - (or (not (local-variable-p variable)) - (with-temp-buffer - (local-variable-if-set-p variable)))) - (save-excursion - (forward-line -1) - (insert "Automatically becomes buffer-local when set in any fashion.\n")))) - ;; Mention if it's an alias - (let* ((alias (condition-case nil - (indirect-variable variable) - (error variable))) - (obsolete (get variable 'byte-obsolete-variable)) - (doc (or (documentation-property variable 'variable-documentation) - (documentation-property alias 'variable-documentation)))) - (unless (eq alias variable) - (princ (format "This variable is an alias for `%s'." alias)) - (terpri) - (terpri)) - (when obsolete - (princ "This variable is obsolete") - (if (cdr obsolete) (princ (format " since %s" (cdr obsolete)))) - (princ ";") (terpri) - (princ (if (stringp (car obsolete)) (car obsolete) - (format "use `%s' instead." (car obsolete)))) - (terpri) - (terpri)) - (princ (or doc "Not documented as a variable."))) - ;; Make a link to customize if this variable can be customized. - (if (custom-variable-p variable) - (let ((customize-label "customize")) - (terpri) - (terpri) - (princ (concat "You can " customize-label " this variable.")) - (with-current-buffer standard-output - (save-excursion - (re-search-backward - (concat "\\(" customize-label "\\)") nil t) - (help-xref-button 1 'help-customize-variable variable))))) ;; Make a hyperlink to the library if appropriate. (Don't ;; change the format of the buffer's initial line in case ;; anything expects the current format.) @@ -647,16 +550,115 @@ it is displayed along with the global value." (if (get-buffer " *DOC*") (help-C-file-name variable 'var) 'C-source))) - (when file-name - (princ "\n\nDefined in `") - (princ (if (eq file-name 'C-source) "C source code" file-name)) - (princ "'.") - (with-current-buffer standard-output - (save-excursion - (re-search-backward "`\\([^`']+\\)'" nil t) - (help-xref-button 1 'help-variable-def - variable file-name))))) + (if file-name + (progn + (princ " is a variable defined in `") + (princ (if (eq file-name 'C-source) "C source code" file-name)) + (princ "'.\n") + (with-current-buffer standard-output + (save-excursion + (re-search-backward "`\\([^`']+\\)'" nil t) + (help-xref-button 1 'help-variable-def + variable file-name))) + (if valvoid + (princ "It is void as a variable.\n") + (princ "Its "))) + (if valvoid + (princ " is void as a variable.\n") + (princ "'s ")))) + (if valvoid + nil + (with-current-buffer standard-output + (setq val-start-pos (point)) + (princ "value is ") + (terpri) + (let ((from (point))) + (pp val) + ;; Hyperlinks in variable's value are quite frequently + ;; inappropriate e.g C-h v features + ;; (help-xref-on-pp from (point)) + (if (< (point) (+ from 20)) + (delete-region (1- from) from))))) + (terpri) + (when (local-variable-p variable) + (princ (format "%socal in buffer %s; " + (if (get variable 'permanent-local) + "Permanently l" "L") + (buffer-name))) + (if (not (default-boundp variable)) + (princ "globally void") + (let ((val (default-value variable))) + (with-current-buffer standard-output + (princ "global value is ") + (terpri) + ;; Fixme: pp can take an age if you happen to + ;; ask for a very large expression. We should + ;; probably print it raw once and check it's a + ;; sensible size before prettyprinting. -- fx + (let ((from (point))) + (pp val) + ;; See previous comment for this function. + ;; (help-xref-on-pp from (point)) + (if (< (point) (+ from 20)) + (delete-region (1- from) from))))))) + ;; Add a note for variables that have been make-var-buffer-local. + (when (and (local-variable-if-set-p variable) + (or (not (local-variable-p variable)) + (with-temp-buffer + (local-variable-if-set-p variable)))) + (princ "\nAutomatically becomes buffer-local when set in any fashion.\n")) + (terpri) + + ;; If the value is large, move it to the end. + (with-current-buffer standard-output + (when (> (count-lines (point-min) (point-max)) 10) + ;; Note that setting the syntax table like below + ;; makes forward-sexp move over a `'s' at the end + ;; of a symbol. + (set-syntax-table emacs-lisp-mode-syntax-table) + (goto-char val-start-pos) + (delete-region (point) (progn (end-of-line) (point))) + (save-excursion + (insert "\n\nValue:") + (set (make-local-variable 'help-button-cache) + (point-marker))) + (insert "value is shown ") + (insert-button "below" + 'action help-button-cache + 'follow-link t + 'help-echo "mouse-2, RET: show value") + (insert ".\n\n"))) + + ;; Mention if it's an alias + (let* ((alias (condition-case nil + (indirect-variable variable) + (error variable))) + (obsolete (get variable 'byte-obsolete-variable)) + (doc (or (documentation-property variable 'variable-documentation) + (documentation-property alias 'variable-documentation)))) + (unless (eq alias variable) + (princ (format "\nThis variable is an alias for `%s'.\n" alias))) + (when obsolete + (princ "\nThis variable is obsolete") + (if (cdr obsolete) (princ (format " since %s" (cdr obsolete)))) + (princ ";") (terpri) + (princ (if (stringp (car obsolete)) (car obsolete) + (format "use `%s' instead." (car obsolete)))) + (terpri)) + (princ "Documentation:\n") + (princ (or doc "Not documented as a variable."))) + ;; Make a link to customize if this variable can be customized. + (if (custom-variable-p variable) + (let ((customize-label "customize")) + (terpri) + (terpri) + (princ (concat "You can " customize-label " this variable.")) + (with-current-buffer standard-output + (save-excursion + (re-search-backward + (concat "\\(" customize-label "\\)") nil t) + (help-xref-button 1 'help-customize-variable variable))))) (print-help-return-message) (save-excursion (set-buffer standard-output) @@ -708,7 +710,7 @@ BUFFER should be a buffer or a buffer name." (dotimes (i 95) (let ((elt (aref docs i))) (when elt - (insert (+ i ?\ ) ": " elt "\n")))) + (insert (+ i ?\s) ": " elt "\n")))) (while (setq table (char-table-parent table)) (insert "\nThe parent category table is:") (describe-vector table 'help-describe-category-set)))))))) diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el index 14920cf93c2..84a8cd6284e 100644 --- a/lisp/hi-lock.el +++ b/lisp/hi-lock.el @@ -564,7 +564,7 @@ Optional argument END is maximum excursion." (hi-lock-current-line))))))) (when hi-lock-mode (hi-lock-set-file-patterns all-patterns)) (if (interactive-p) - (message (format "Hi-lock added %d patterns." (length all-patterns))))))) + (message "Hi-lock added %d patterns." (length all-patterns)))))) (defun hi-lock-font-lock-hook () "Add hi lock patterns to font-lock's." diff --git a/lisp/ibuf-macs.el b/lisp/ibuf-macs.el index 5274e3173ef..3e814d4770f 100644 --- a/lisp/ibuf-macs.el +++ b/lisp/ibuf-macs.el @@ -281,7 +281,7 @@ bound to the current value of the filter. ,(concat (or documentation "This filter is not documented.")) (interactive (list ,reader)) (ibuffer-push-filter (cons ',name qualifier)) - (message + (message "%s" (format ,(concat (format "Filter by %s added: " description) " %s") qualifier)) diff --git a/lisp/image-mode.el b/lisp/image-mode.el index 4999a880dfc..67d1bcee995 100644 --- a/lisp/image-mode.el +++ b/lisp/image-mode.el @@ -66,7 +66,7 @@ to toggle between display as an image and display as text." ;; variables were cleared by kill-all-local-variables (setq cursor-type nil truncate-lines t)) (run-mode-hooks 'image-mode-hook) - (message (concat (substitute-command-keys + (message "%s" (concat (substitute-command-keys "Type \\[image-toggle-display] to view the image as ") (if (get-text-property (point-min) 'display) "text" "an image") "."))) @@ -84,7 +84,7 @@ See the command `image-mode' for more information on this mode." (if (get-text-property (point-min) 'display) (setq cursor-type nil truncate-lines t)) (add-hook 'change-major-mode-hook (lambda () (image-minor-mode -1)) nil t) - (message (concat (substitute-command-keys + (message "%s" (concat (substitute-command-keys "Type \\[image-toggle-display] to view the image as ") (if (get-text-property (point-min) 'display) "text" "an image") ".")))) diff --git a/lisp/image.el b/lisp/image.el index b45b23db611..ee188677517 100644 --- a/lisp/image.el +++ b/lisp/image.el @@ -49,6 +49,16 @@ IMAGE-TYPE must be a pair (PREDICATE . TYPE). PREDICATE is called with one argument, a string containing the image data. If PREDICATE returns a non-nil value, TYPE is the image's type.") +(defvar image-load-path + (list (file-name-as-directory (expand-file-name "images" data-directory)) + 'data-directory 'load-path) + "List of locations in which to search for image files. +If an element is a string, it defines a directory to search. +If an element is a variable symbol whose value is a string, that +value defines a directory to search. +If an element is a variable symbol whose value is a list, the +value is used as a list of directories to search.") + (defun image-jpeg-p (data) "Value is non-nil if DATA, a string, consists of JFIF image data. We accept the tag Exif because that is the same format." @@ -269,6 +279,27 @@ BUFFER nil or omitted means use the current buffer." (delete-overlay overlay))) (setq overlays (cdr overlays))))) +(defun image-search-load-path (file path) + (let (element found pathname) + (while (and (not found) (consp path)) + (setq element (car path)) + (cond + ((stringp element) + (setq found + (file-readable-p + (setq pathname (expand-file-name file element))))) + ((and (symbolp element) (boundp element)) + (setq element (symbol-value element)) + (cond + ((stringp element) + (setq found + (file-readable-p + (setq pathname (expand-file-name file element))))) + ((consp element) + (if (setq pathname (image-search-load-path file element)) + (setq found t)))))) + (setq path (cdr path))) + (if found pathname))) ;;;###autoload (defun find-image (specs) @@ -286,7 +317,7 @@ is supported, and FILE exists, is used to construct the image specification to be returned. Return nil if no specification is satisfied. -The image is looked for first on `load-path' and then in `data-directory'." +The image is looked for in `image-load-path'." (let (image) (while (and specs (null image)) (let* ((spec (car specs)) @@ -296,20 +327,11 @@ The image is looked for first on `load-path' and then in `data-directory'." found) (when (image-type-available-p type) (cond ((stringp file) - (let ((path load-path)) - (while (and (not found) path) - (let ((try-file (expand-file-name file (car path)))) - (when (file-readable-p try-file) - (setq found try-file))) - (setq path (cdr path))) - (unless found - (let ((try-file (expand-file-name file data-directory))) - (if (file-readable-p try-file) - (setq found try-file)))) - (if found - (setq image - (cons 'image (plist-put (copy-sequence spec) - :file found)))))) + (if (setq found (image-search-load-path + file image-load-path)) + (setq image + (cons 'image (plist-put (copy-sequence spec) + :file found))))) ((not (null data)) (setq image (cons 'image spec))))) (setq specs (cdr specs)))) diff --git a/lisp/international/codepage.el b/lisp/international/codepage.el index 5051efd2f86..7aab9bd85a8 100644 --- a/lisp/international/codepage.el +++ b/lisp/international/codepage.el @@ -33,6 +33,8 @@ ;;; Code: +(defvar dos-unsupported-char-glyph) + ;; I doubt we need compatibility versions of any of these autoloaded ;; functions apart from codepage-setup, which users may call. diff --git a/lisp/isearch.el b/lisp/isearch.el index 904deffab42..53f617b1f35 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -1012,7 +1012,7 @@ If first char entered is \\[isearch-yank-word-or-char], then do word search inst ;; read a key the normal way. ;; Word search does not apply (yet) to regexp searches, ;; no check is made here. - (message (isearch-message-prefix nil nil t)) + (message "%s" (isearch-message-prefix nil nil t)) (if (memq (lookup-key isearch-mode-map (vector e)) '(isearch-yank-word isearch-yank-word-or-char)) diff --git a/lisp/iswitchb.el b/lisp/iswitchb.el index c2e08d3a466..b13f2d0bb5a 100644 --- a/lisp/iswitchb.el +++ b/lisp/iswitchb.el @@ -1122,7 +1122,7 @@ Return the modified list with the last element prepended to it." (set-buffer-major-mode newbufcreated)) (iswitchb-visit-buffer newbufcreated)) ;; else wont create new buffer - (message (format "no buffer matching `%s'" buf))))) + (message "no buffer matching `%s'" buf)))) (defun iswitchb-window-buffer-p (buffer) "Return window pointer if BUFFER is visible in another frame. diff --git a/lisp/log-edit.el b/lisp/log-edit.el index 2b38dcadf52..4e179ef8bad 100644 --- a/lisp/log-edit.el +++ b/lisp/log-edit.el @@ -331,7 +331,7 @@ If BUFFER is non-nil `log-edit' will jump to that buffer, use it to edit the (set (make-local-variable 'log-edit-initial-files) (log-edit-files)) (when setup (run-hooks 'log-edit-hook)) (goto-char (point-min)) (push-mark (point-max)) - (message (substitute-command-keys + (message "%s" (substitute-command-keys "Press \\[log-edit-done] when you are done editing.")))) (define-derived-mode log-edit-mode text-mode "Log-Edit" @@ -426,7 +426,7 @@ To select default log text, we: (interactive) (if (eq last-command 'log-edit-mode-help) (describe-function major-mode) - (message + (message "%s" (substitute-command-keys "Type `\\[log-edit-done]' to finish commit. Try `\\[describe-function] log-edit-done' for more help.")))) diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el index 7c7265ac8c9..d8740c036f2 100644 --- a/lisp/mail/feedmail.el +++ b/lisp/mail/feedmail.el @@ -1943,7 +1943,7 @@ mapped to mostly alphanumerics for safety." (file-exists-p a-s-file-name) (delete-file a-s-file-name)))) (if feedmail-queue-chatty - (progn (message (concat "FQM: Queued in " filename)) + (progn (message "%s" (concat "FQM: Queued in " filename)) (sit-for feedmail-queue-chatty-sit-for))) (if feedmail-queue-chatty (progn diff --git a/lisp/mail/rmail-spam-filter.el b/lisp/mail/rmail-spam-filter.el index 7be5146f722..525bcd4096b 100644 --- a/lisp/mail/rmail-spam-filter.el +++ b/lisp/mail/rmail-spam-filter.el @@ -449,10 +449,10 @@ it from rmail file. Called for each new message retrieved by (if rsf-autosave-newly-added-definitions (progn (custom-save-all) - (message (concat "added subject \n <<< \n" message-subject + (message "%s" (concat "added subject \n <<< \n" message-subject " \n >>> \n to list of spam definitions. \n" "and saved the spam definitions to file."))) - (message (concat "added subject \n <<< \n" message-subject + (message "%s" (concat "added subject \n <<< \n" message-subject " \n >>> \n to list of spam definitions. \n" "Don't forget to save the spam definitions to file using the spam menu")) @@ -478,10 +478,10 @@ it from rmail file. Called for each new message retrieved by (if rsf-autosave-newly-added-definitions (progn (custom-save-all) - (message (concat "added sender \n <<< \n" message-sender + (message "%s" (concat "added sender \n <<< \n" message-sender " \n >>> \n to list of spam definitions. \n" "and saved the spam definitions to file."))) - (message (concat "added sender \n <<< \n " message-sender + (message "%s" (concat "added sender \n <<< \n " message-sender " \n >>> \n to list of spam definitions." "Don't forget to save the spam definitions to file using the spam menu")) @@ -521,10 +521,10 @@ Added to spam definitions as a contents field." (if rsf-autosave-newly-added-definitions (progn (custom-save-all) - (message (concat "added highlighted text \n <<< \n" region-to-spam-list + (message "%s" (concat "added highlighted text \n <<< \n" region-to-spam-list " \n >>> \n to list of spam definitions. \n" "and saved the spam definitions to file."))) - (message (concat "added highlighted text \n <<< \n " region-to-spam-list + (message "%s" (concat "added highlighted text \n <<< \n " region-to-spam-list " \n >>> \n to list of spam definitions." "Don't forget to save the spam definitions to file using the spam menu")) diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el index 4255788605f..d5566bb3464 100644 --- a/lisp/mail/sendmail.el +++ b/lisp/mail/sendmail.el @@ -1591,8 +1591,13 @@ is inserted. The normal hook `mail-setup-hook' is run after the message is initialized. It can add more default fields to the message. -When calling from a program, the first argument if non-nil says -not to erase the existing contents of the `*mail*' buffer. +The first argument, NOERASE, determines what to do when there is +an existing modified `*mail*' buffer. If NOERASE is nil, the +existing mail buffer is used, and the user is prompted whether to +keep the old contents or to erase them. If NOERASE has the value +`new', a new mail buffer will be created instead of using the old +one. Any other non-nil value means to always select the old +buffer without erasing the contents. The second through fifth arguments, TO, SUBJECT, IN-REPLY-TO and CC, specify if non-nil @@ -1649,7 +1654,14 @@ The seventh argument ACTIONS is a list of actions to take ;;; (file-exists-p buffer-auto-save-file-name)) ;;; (message "Auto save file for draft message exists; consider M-x mail-recover")) ;;; t)) - (pop-to-buffer "*mail*") + + (if (eq noerase 'new) + (pop-to-buffer (generate-new-buffer "*mail*")) + (and noerase + (not (get-buffer "*mail*")) + (setq noerase nil)) + (pop-to-buffer "*mail*")) + ;; Avoid danger that the auto-save file can't be written. (let ((dir (expand-file-name (file-name-as-directory mail-default-directory)))) @@ -1664,7 +1676,8 @@ The seventh argument ACTIONS is a list of actions to take ;; (in case the user has actually visited a file *mail*). ; (set-visited-file-name nil) (let (initialized) - (and (not noerase) + (and (not (and noerase + (not (eq noerase 'new)))) (if buffer-file-name (if (buffer-modified-p) (when (y-or-n-p "Buffer has unsaved changes; reinitialize it and discard them? ") diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog index 28cc6c2a6d0..b1c0dd236f5 100644 --- a/lisp/mh-e/ChangeLog +++ b/lisp/mh-e/ChangeLog @@ -1,3 +1,24 @@ +2005-09-18 D Goel + + + * mh-alias.el (mh-alias-ali): Fix `message' call: first arg + should be a format spec. + + * mh-print.el (mh-ps-spool-buffer, mh-ps-spool-a-msg) + (mh-ps-print-msg, mh-ps-print-msg-show): Ditto. + + * mh-mime.el (mh-toggle-mh-decode-mime-flag): Ditto. + + * mh-index.el (mh-index-sequenced-messages): Ditto. + + + * mh-e.el (mh-refile-or-write-again, mh-page-msg): Ditto. + + * mh-junk.el (mh-junk-blacklist, mh-junk-whitelist) + (mh-spamassassin-blacklist, mh-spamassassin-whitelist): Ditto. + + + 2005-08-15 Dan Nicolaescu * mh-customize.el: Do not use face-alias compatibility for diff --git a/lisp/mh-e/mh-alias.el b/lisp/mh-e/mh-alias.el index ceec6e6556d..ba429f24b9f 100644 --- a/lisp/mh-e/mh-alias.el +++ b/lisp/mh-e/mh-alias.el @@ -251,7 +251,7 @@ ali returns the string unchanged if not defined. The same is done here." (if (looking-at "^$") (delete-backward-char 1)) (buffer-substring (point-min)(point-max))) (error (progn - (message (error-message-string err)) + (message "%s" (error-message-string err)) alias)))) (defun mh-alias-expand (alias) diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el index 3d917c16935..c0f47537c97 100644 --- a/lisp/mh-e/mh-e.el +++ b/lisp/mh-e/mh-e.el @@ -734,7 +734,7 @@ If INTERACTIVE-FLAG is non-nil then the function was called interactively." (apply 'mh-write-msg-to-file msg (cdr mh-last-destination))) (mh-next-msg interactive-flag) (format "Destination: %s" (cdr mh-last-destination))))) - (message output))) + (message "%s" output))) (defun mh-quit () "Quit the current MH-E folder. @@ -778,12 +778,12 @@ bottom of the current message." (if (mh-in-show-buffer (mh-show-buffer) (pos-visible-in-window-p (point-max))) (progn - (message (format - "End of message (Type %s to read %s undeleted message)" - (single-key-description last-input-event) - (if (equal mh-next-direction 'backward) - "previous" - "next"))) + (message + "End of message (Type %s to read %s undeleted message)" + (single-key-description last-input-event) + (if (equal mh-next-direction 'backward) + "previous" + "next")) (setq mh-page-to-next-msg-flag t)) (scroll-other-window arg))) (mh-show))) diff --git a/lisp/mh-e/mh-index.el b/lisp/mh-e/mh-index.el index 28cb0b44fd4..3fef04418f5 100644 --- a/lisp/mh-e/mh-index.el +++ b/lisp/mh-e/mh-index.el @@ -1325,7 +1325,7 @@ space-separated list of folders, or nothing to search all folders." mh-index-sequence-search-flag t mh-index-previous-search (list folders sequence)) (mh-index-write-data) - (when (stringp message) (message message)))) + (when (stringp message) (message "%s" message)))) ;;;###mh-autoload (defun mh-index-new-messages (folders) diff --git a/lisp/mh-e/mh-junk.el b/lisp/mh-e/mh-junk.el index a20117d8582..b78d85410c7 100644 --- a/lisp/mh-e/mh-junk.el +++ b/lisp/mh-e/mh-junk.el @@ -63,9 +63,9 @@ For more information about using your particular spam fighting program, see: (substring mh-junk-disposition 1))) (t (concat "+" mh-junk-disposition))))) (mh-iterate-on-range msg range - (message (format "Blacklisting message %d..." msg)) + (message "Blacklisting message %d..." msg) (funcall (symbol-function blacklist-func) msg) - (message (format "Blacklisting message %d...done" msg)) + (message "Blacklisting message %d...done" msg) (if (not (memq msg mh-seen-list)) (setq mh-seen-list (cons msg mh-seen-list))) (if dest @@ -87,9 +87,9 @@ The `mh-junk-program' option specifies the spam program in use." (unless whitelist-func (error "Customize `mh-junk-program' appropriately")) (mh-iterate-on-range msg range - (message (format "Whitelisting message %d..." msg)) + (message "Whitelisting message %d..." msg) (funcall (symbol-function whitelist-func) msg) - (message (format "Whitelisting message %d...done" msg)) + (message "Whitelisting message %d...done" msg) (mh-refile-a-msg nil (intern mh-inbox))) (mh-next-msg))) @@ -179,7 +179,7 @@ done by adding the following to your crontab: (msg-file (mh-msg-filename msg mh-current-folder)) (sender)) (save-excursion - (message (format "Reporting message %d..." msg)) + (message "Reporting message %d..." msg) (mh-truncate-log-buffer) (call-process mh-spamassassin-executable msg-file mh-log-buffer nil ;;"--report" "--remove-from-whitelist" @@ -188,7 +188,7 @@ done by adding the following to your crontab: (message "Recategorizing this message as spam...") (call-process mh-sa-learn-executable msg-file mh-log-buffer nil "--single" "--spam" "--local" "--no-rebuild")) - (message (format "Blacklisting message %d..." msg)) + (message "Blacklisting message %d..." msg) (set-buffer (get-buffer-create mh-temp-buffer)) (erase-buffer) (call-process (expand-file-name mh-scan-prog mh-progs) @@ -200,8 +200,8 @@ done by adding the following to your crontab: (progn (setq sender (match-string 0)) (mh-spamassassin-add-rule "blacklist_from" sender) - (message (format "Blacklisting message %d...done" msg))) - (message (format "Blacklisting message %d...not done (from my address)" msg)))))) + (message "Blacklisting message %d...done" msg)) + (message "Blacklisting message %d...not done (from my address)" msg))))) (defun mh-spamassassin-whitelist (msg) "Whitelist MSG with SpamAssassin. @@ -230,14 +230,14 @@ See `mh-spamassassin-blacklist' for more information." (message "Recategorizing this message as ham...") (call-process mh-sa-learn-executable msg-file mh-temp-buffer nil "--single" "--ham" "--local --no-rebuild")) - (message (format "Whitelisting message %d..." msg)) + (message "Whitelisting message %d..." msg) (setq from (car (mh-funcall-if-exists ietf-drums-parse-address (mh-get-header-field "From:")))) (kill-buffer nil) (unless (or (null from) (equal from "")) (mh-spamassassin-add-rule "whitelist_from" from)) - (message (format "Whitelisting message %d...done" msg))))) + (message "Whitelisting message %d...done" msg)))) (defun mh-spamassassin-add-rule (rule body) "Add a new rule to `~/.spamassassin/user_prefs'. diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el index 3e5068c7bdc..980942a0f47 100644 --- a/lisp/mh-e/mh-mime.el +++ b/lisp/mh-e/mh-mime.el @@ -858,7 +858,7 @@ If message has been encoded for transfer take that into account." (interactive) (setq mh-decode-mime-flag (not mh-decode-mime-flag)) (mh-show nil t) - (message (format "(setq mh-decode-mime-flag %s)" mh-decode-mime-flag))) + (message "(setq mh-decode-mime-flag %s)" mh-decode-mime-flag)) ;;;###mh-autoload (defun mh-decode-message-header () diff --git a/lisp/mh-e/mh-print.el b/lisp/mh-e/mh-print.el index 814c5e42174..6b2e8a3474e 100644 --- a/lisp/mh-e/mh-print.el +++ b/lisp/mh-e/mh-print.el @@ -64,7 +64,7 @@ Sensible choices are the functions `ps-spool-buffer' and ;; XXX - Default print buffer is bogus (defun mh-ps-spool-buffer (buffer) "Send BUFFER to printer queue." - (message (format "mh-ps-spool-buffer %s" buffer)) + (message "mh-ps-spool-buffer %s" buffer) (save-excursion (set-buffer buffer) (let ((ps-print-color-p mh-ps-print-color-option) @@ -85,8 +85,8 @@ Sensible choices are the functions `ps-spool-buffer' and "Print MSG. First the message is decoded in BUFFER before the results are sent to the printer." - (message (format "mh-ps-spool-a-msg msg %s buffer %s" - msg buffer)) + (message "mh-ps-spool-a-msg msg %s buffer %s" + msg buffer) (let ((mh-show-buffer mh-show-buffer) (folder mh-current-folder) ;; The following is commented out because @@ -113,8 +113,8 @@ printer." Check the documentation of `mh-interactive-range' to see how RANGE is read in interactive use." (interactive (list (mh-interactive-range "Print"))) - (message (format "mh-ps-print-msg range %s keys %s" - range (this-command-keys))) + (message "mh-ps-print-msg range %s keys %s" + range (this-command-keys)) (mh-iterate-on-range msg range (let ((buffer (get-buffer-create mh-temp-buffer))) (unwind-protect @@ -152,8 +152,8 @@ interactive use." (defun mh-ps-print-msg-show (file) "Print current show buffer to FILE." (interactive (list (mh-ps-print-preprint current-prefix-arg))) - (message (format "mh-ps-print-msg-show file %s keys %s mh-show-buffer %s" - file (this-command-keys) mh-show-buffer)) + (message "mh-ps-print-msg-show file %s keys %s mh-show-buffer %s" + file (this-command-keys mh-show-buffer)) (let ((msg (mh-get-msg-num t)) (folder mh-current-folder) (show-buffer mh-show-buffer) diff --git a/lisp/mouse.el b/lisp/mouse.el index 1970fbf1eeb..3b591694cfe 100644 --- a/lisp/mouse.el +++ b/lisp/mouse.el @@ -153,7 +153,7 @@ PREFIX is the prefix argument (if any) to pass to the command." (defvar mouse-major-mode-menu-prefix) ; dynamically bound -(defun mouse-major-mode-menu (event prefix) +(defun mouse-major-mode-menu (event &optional prefix) "Pop up a mode-specific menu of mouse commands. Default to the Edit menu if the major mode doesn't define a menu." ;; Switch to the window clicked on, because otherwise @@ -173,8 +173,7 @@ Default to the Edit menu if the major mode doesn't define a menu." ;; default to the edit menu. (newmap (if ancestor (make-sparse-keymap (concat mode-name " Mode")) - menu-bar-edit-menu)) - result) + menu-bar-edit-menu))) (if ancestor ;; Make our menu inherit from the desired keymap which we want ;; to display as the menu now. diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index 5d205f575b8..152e71e64cb 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -1641,81 +1641,75 @@ good, skip, fatal, or unknown." ;; on to ange-ftp-process-handle-line to deal with. (defun ange-ftp-process-filter (proc str) - (let ((buffer (process-buffer proc)) - (old-buffer (current-buffer))) + ;; Eliminate nulls. + (while (string-match "\000+" str) + (setq str (replace-match "" nil nil str))) - ;; Eliminate nulls. - (while (string-match "\000+" str) - (setq str (replace-match "" nil nil str))) + ;; see if the buffer is still around... it could have been deleted. + (when (buffer-live-p (process-buffer proc)) + (with-current-buffer (process-buffer proc) - ;; see if the buffer is still around... it could have been deleted. - (if (buffer-name buffer) - (unwind-protect - (progn - (set-buffer (process-buffer proc)) + ;; handle hash mark printing + (and ange-ftp-process-busy + (string-match "^#+$" str) + (setq str (ange-ftp-process-handle-hash str))) + (comint-output-filter proc str) + ;; Replace STR by the result of the comint processing. + (setq str (buffer-substring comint-last-output-start + (process-mark proc))) + (if ange-ftp-process-busy + (progn + (setq ange-ftp-process-string (concat ange-ftp-process-string + str)) - ;; handle hash mark printing - (and ange-ftp-process-busy - (string-match "\\`#+\\'" str) - (setq str (ange-ftp-process-handle-hash str))) - (comint-output-filter proc str) - ;; Replace STR by the result of the comint processing. - (setq str (buffer-substring comint-last-output-start - (process-mark proc))) - (if ange-ftp-process-busy - (progn - (setq ange-ftp-process-string (concat ange-ftp-process-string - str)) + ;; if we gave an empty password to the USER command earlier + ;; then we should send a null password now. + (if (string-match "Password: *$" ange-ftp-process-string) + (process-send-string proc "\n")))) + (while (and ange-ftp-process-busy + (string-match "\n" ange-ftp-process-string)) + (let ((line (substring ange-ftp-process-string + 0 + (match-beginning 0))) + (seen-prompt nil)) + (setq ange-ftp-process-string (substring ange-ftp-process-string + (match-end 0))) + (while (string-match "\\`ftp> *" line) + (setq seen-prompt t) + (setq line (substring line (match-end 0)))) + (if (not (and seen-prompt ange-ftp-pending-error-line)) + (ange-ftp-process-handle-line line proc) + ;; If we've seen a potential error message and it + ;; hasn't been cancelled by a good message before + ;; seeing a propt, then the error was real. + (delete-process proc) + (setq ange-ftp-process-busy nil + ange-ftp-process-result-line ange-ftp-pending-error-line)))) - ;; if we gave an empty password to the USER command earlier - ;; then we should send a null password now. - (if (string-match "Password: *$" ange-ftp-process-string) - (process-send-string proc "\n")))) - (while (and ange-ftp-process-busy - (string-match "\n" ange-ftp-process-string)) - (let ((line (substring ange-ftp-process-string - 0 - (match-beginning 0))) - (seen-prompt nil)) - (setq ange-ftp-process-string (substring ange-ftp-process-string - (match-end 0))) - (while (string-match "\\`ftp> *" line) - (setq seen-prompt t) - (setq line (substring line (match-end 0)))) - (if (not (and seen-prompt ange-ftp-pending-error-line)) - (ange-ftp-process-handle-line line proc) - ;; If we've seen a potential error message and it - ;; hasn't been cancelled by a good message before - ;; seeing a propt, then the error was real. - (delete-process proc) - (setq ange-ftp-process-busy nil - ange-ftp-process-result-line ange-ftp-pending-error-line)))) + ;; has the ftp client finished? if so then do some clean-up + ;; actions. + (if (not ange-ftp-process-busy) + (progn + ;; reset the xfer size + (setq ange-ftp-xfer-size 0) - ;; has the ftp client finished? if so then do some clean-up - ;; actions. - (if (not ange-ftp-process-busy) - (progn - ;; reset the xfer size - (setq ange-ftp-xfer-size 0) + ;; issue the "done" message since we've finished. + (if (and ange-ftp-process-msg + ange-ftp-process-verbose + ange-ftp-process-result) + (progn + (ange-ftp-message "%s...done" ange-ftp-process-msg) + (ange-ftp-repaint-minibuffer) + (setq ange-ftp-process-msg nil))) - ;; issue the "done" message since we've finished. - (if (and ange-ftp-process-msg - ange-ftp-process-verbose - ange-ftp-process-result) - (progn - (ange-ftp-message "%s...done" ange-ftp-process-msg) - (ange-ftp-repaint-minibuffer) - (setq ange-ftp-process-msg nil))) - - ;; is there a continuation we should be calling? if so, - ;; we'd better call it, making sure we only call it once. - (if ange-ftp-process-continue - (let ((cont ange-ftp-process-continue)) - (setq ange-ftp-process-continue nil) - (ange-ftp-call-cont cont - ange-ftp-process-result - ange-ftp-process-result-line)))))) - (set-buffer old-buffer))))) + ;; is there a continuation we should be calling? if so, + ;; we'd better call it, making sure we only call it once. + (if ange-ftp-process-continue + (let ((cont ange-ftp-process-continue)) + (setq ange-ftp-process-continue nil) + (ange-ftp-call-cont cont + ange-ftp-process-result + ange-ftp-process-result-line)))))))) (defun ange-ftp-process-sentinel (proc str) "When ftp process changes state, nuke all file-entries in cache." @@ -1795,8 +1789,7 @@ good, skip, fatal, or unknown." (defun ange-ftp-gwp-start (host user name args) "Login to the gateway machine and fire up an ftp process." - (let* ((gw-user (ange-ftp-get-user ange-ftp-gateway-host)) - ;; It would be nice to make process-connection-type nil, + (let* (;; It would be nice to make process-connection-type nil, ;; but that doesn't work: ftp never responds. ;; Can anyone find a fix for that? (proc (let ((process-connection-type t)) @@ -2137,7 +2130,6 @@ suffix of the form #PORT to specify a non-default port" (save-excursion (set-buffer (process-buffer proc)) (let* ((status (ange-ftp-raw-send-cmd proc "hash")) - (result (car status)) (line (cdr status))) (save-match-data (if (string-match ange-ftp-hash-mark-msgs line) @@ -4484,8 +4476,7 @@ NEWNAME should be the name to give the new compressed or uncompressed file.") ;; `ange-ftp-ls' handles this. (defun ange-ftp-insert-directory (file switches &optional wildcard full) - (let ((short (ange-ftp-abbreviate-filename file)) - (parsed (ange-ftp-ftp-name (expand-file-name file))) + (let ((parsed (ange-ftp-ftp-name (expand-file-name file))) tem) (if parsed (if (and (not wildcard) @@ -4511,10 +4502,9 @@ NEWNAME should be the name to give the new compressed or uncompressed file.") (defun ange-ftp-file-name-sans-versions (file keep-backup-version) (let* ((short (ange-ftp-abbreviate-filename file)) (parsed (ange-ftp-ftp-name short)) - host-type func) + func) (if parsed - (setq host-type (ange-ftp-host-type (car parsed)) - func (cdr (assq (ange-ftp-host-type (car parsed)) + (setq func (cdr (assq (ange-ftp-host-type (car parsed)) ange-ftp-sans-version-alist)))) (if func (funcall func file keep-backup-version) (ange-ftp-real-file-name-sans-versions file keep-backup-version)))) diff --git a/lisp/net/newsticker.el b/lisp/net/newsticker.el new file mode 100644 index 00000000000..e84234f70e7 --- /dev/null +++ b/lisp/net/newsticker.el @@ -0,0 +1,4922 @@ +;;; newsticker.el --- A Newsticker for Emacs. + +;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. + +;; This file is part of GNU Emacs. + +;; Author: Ulf Jasper +;; Filename: newsticker.el +;; URL: http://www.nongnu.org/newsticker +;; Created: 17. June 2003 +;; Keywords: News, RSS +;; Time-stamp: "26. August 2005, 16:33:46 (ulf)" +;; CVS-Version: $Id: newsticker.el,v 1.4 2005/09/18 12:36:08 deego Exp $ + +(defconst newsticker-version "1.8" "Version number of newsticker.el.") + +;; ====================================================================== + +;; This program is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2 of the License, or (at +;; your option) any later version. + +;; This program is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with this program; if not, write to the Free Software +;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +;; USA + +;; ====================================================================== +;;; Commentary: + +;; Overview +;; -------- + +;; Newsticker provides a newsticker for Emacs. A newsticker is a thing that +;; asynchronously retrieves headlines from a list of news sites, prepares +;; these headlines for reading, and allows for loading the corresponding +;; articles in a web browser. + +;; Headlines consist of a title and (possibly) a small description. They +;; are contained in RSS (RDF Site Summary) files. Newsticker should work +;; with all RSS files that follow the RDF Rich Site Summary 1.0 +;; specification. It should also work with version 2.0 as well as +;; other/older/alternative RSS formats (like 0.9 or such). In +;; other words: Newsticker is a "RSS reader" or "RSS aggregator". + +;; Newsticker provides several commands for reading headlines, navigating +;; through them, marking them as read/unread, hiding old headlines +;; etc. Headlines can be displayed as plain text or as rendered HTML. + +;; Headlines can be displayed in the echo area, either scrolling like +;; messages in a stock-quote ticker, or just changing. + +;; Newsticker allows for automatic processing of headlines by providing +;; hooks and (sample) functions for automatically downloading images and +;; enclosed files (as delivered by podcasts, e.g.). + + + +;; Requirements +;; ------------ +;; Newsticker can be used with GNU Emacs version 21.1 or later as well as +;; XEmacs. It requires an XML-parser (`xml.el') which is part of GNU +;; Emacs. If you are using XEmacs you want to get the `net-utils' package +;; which contains `xml.el' for XEmacs. + +;; Newsticker requires a program which can retrieve files via http and +;; prints them to stdout. By default Newsticker will use wget for this +;; task. + +;; Installation +;; ------------ +;; Place Newsticker in a directory where Emacs can find it. Add the +;; following line to your Emacs startup file (`~/.emacs'). +;; (add-to-list 'load-path "/path/to/newsticker/") +;; (autoload 'newsticker-start "newsticker" "Emacs Newsticker" t) +;; (autoload 'newsticker-show-news "newsticker" "Emacs Newsticker" t) + +;; Newsticker-mode supports imenu. It allows for navigating with the help +;; of a menu. In order to use this feature you should also add the +;; following. +;; (add-hook 'newsticker-mode-hook 'imenu-add-menubar-index) + +;; That's it. + +;; Usage +;; ----- +;; The command newsticker-show-news will display all available headlines in +;; a special buffer, called `*newsticker*'. It will also start the +;; asynchronous download of headlines. The modeline in the `*newsticker*' +;; buffer informs whenever new headlines have arrived. Clicking +;; mouse-button 2 or pressing RET in this buffer on a headline will call +;; browse-url to load the corresponding news story in your favourite web +;; browser. + +;; The scrolling, or flashing of headlines in the echo area, can be started +;; with the command newsticker-start-ticker. It can be stopped with +;; newsticker-stop-ticker. + +;; If you just want to start the periodic download of headlines use the +;; command newsticker-start. Calling newsticker-stop will stop the periodic +;; download, but will call newsticker-stop-ticker as well. + +;; Configuration +;; ------------- +;; All Newsticker options are customizable, i.e. they can be changed with +;; Emacs customization methods: Call the command customize-group and enter +;; `newsticker' for the customization group. + +;; All Newsticker options have reasonable default values, so that in most +;; cases it is not necessary to customize settings before starting +;; Newsticker for the first time. + +;; Newsticker options are organized in the following groups. + +;; * newsticker-feed contains options that define which news +;; feeds are retrieved and how this is done. +;; o newsticker-url-list defines the list of headlines which are +;; retrieved. +;; o newsticker-retrieval-interval defines how often headlines are +;; retrieved. +;; * newsticker-headline-processing contains options that define how the +;; retrieved headlines are processed. +;; o newsticker-keep-obsolete-items decides whether unread headlines that +;; have been removed from the feed are kept in the Newsticker cache. +;; * newsticker-layout contains options that define how the buffer for +;; reading RSS headlines is formatted. +;; o newsticker-item-format defines how the title of a headline is +;; formatted. +;; * newsticker-ticker contains options that define how headlines are shown +;; in the echo area. +;; o newsticker-display-interval and newsticker-scroll-smoothly define +;; how headlines are shown in the echo area. +;; * newsticker-hooks contains options for hooking other Emacs commands to +;; newsticker functions. +;; o newsticker-new-item-functions allows for automatic processing of +;; headlines. See `newsticker-download-images', and +;; `newsticker-download-enclosures' for sample functions. +;; * newsticker-miscellaneous contains other Newsticker options. + +;; Please have a look at the customization buffers for the complete list of +;; options. + +;; Remarks +;; ------- +;; This newsticker is designed do its job silently in the background +;; without disturbing you. However, it is probably impossible to prevent +;; such a tool from slightly attenuating your Editor's responsiveness every +;; once in a while. + +;; Byte-compiling newsticker.el is recommended. + +;; ====================================================================== +;;; History: + +;; 1.8 (2005-08-26) +;; * Added commands `newsticker-show-extra' and `newsticker-hide-extra' +;; to show and hide extra RSS elements, bound to "sx" and "hx" +;; resp. Changed default value of `newsticker-show-all-rss-elements' +;; to nil. +;; * mode-line: Introduced special mode-line-format for newsticker. +;; * Get feed logos only once every 24 h. +;; * Default faces changed. +;; * Minor fixes. + +;; 1.7 (2005-06-25) +;; * Tool-bar support: most important commands can be called from +;; tool-bar buttons. +;; * Auto-Narrowing introduced: *newsticker* buffer can be narrowed to +;; a single item (bound to key `xi') or a single feed (bound to `xf'). +;; * Enclosure support: enclosed items are shown (see +;; `newsticker-enclosure-face') and can be (automatically) downloaded +;; (see below). For those of you who read "podcasts". +;; * Added variable `newsticker-auto-mark-filter' for automatically +;; marking items as immortal or old. +;; * Added hook variable `newsticker-new-item-functions' for handling +;; new items. Added sample functions `newsticker-download-images', +;; and `newsticker-download-enclosures'. +;; * Added hook variable `newsticker-select-item-hook' which is run +;; after `newsticker-(next|previous)-(new-)?-item'. +;; * Added hook variable `newsticker-select-feed-hook' which is run +;; after `newsticker-(next|previous)-feed'. +;; * Added hook variable `newsticker-buffer-change-hook' which is run +;; after the contents or visibility of the newsticker buffer has +;; changed, e.g. after `newsticker-buffer-update' or +;; `newsticker-show-feed-desc'. +;; * Added command `newsticker-handle-url' for interactively launching +;; arbitrary programs for URLs, bound to `C-RET'. +;; * URLs in extra elements are clickable. +;; * Better support for w3, added command +;; `newsticker-w3m-show-inline-images' for displaying all inline +;; images. +;; * Insert an artificial headline which notifies about failed retrievals. +;; * Use pubDate element (RSS 2.0) instead of retrieval time when +;; available. +;; * Customizable options grouped. +;; * Bugfixes: `newsticker--imenu-create-index'; strip whitespace +;; from links; apply coding-system to extra-elements; time-comparison +;; for obsolete items; and others which I have forgotten. +;; * Workaround for another bug in xml-parse-region -- thanks to anonymous +;; for sending patch. +;; * Renamed invisible buffers ` *wget-newsticker-*' to +;; ` *newsticker-wget-*'. +;; * Tested with GNU Emacs versions 21.3 and 22.0 and XEmacs 21.something. + +;; 1.6 * Support for (some) optional RSS elements: guid, dc:date. See +;; `newsticker-show-all-rss-elements' `newsticker-extra-face'. +;; * Better support for w3m -- `newsticker-default-face' is obsolete +;; now, removed `newsticker-w3m-toggle-inline-image'. +;; * Added `newsticker-desc-comp-max' -- comparison of item descriptions +;; can take quite some time. +;; * Added `newsticker--buffer-make-item-completely-visible' to +;; ensure that the current item is fully visible. +;; * Allow for non-positive retrieval-interval, which make newsticker +;; get news only once. +;; * Use :set for customizable variables. +;; * Added `newsticker-buffer-force-update', bound to key `U'. +;; * Added concept of obsolete items, see +;; `newsticker-keep-obsolete-items', `newsticker-obsolete-item-face', +;; `newsticker-obsolete-item-max-age'. +;; * Added `newsticker-add-url'. +;; * OPML export. +;; * Save pre-formatted titles => even better performance!! +;; * `newsticker-*-new-item' wraps at beginning/end of buffer. +;; * Always sort obsolete items to end of item list. +;; * Bugfixes: +;; - newsticker-hide-entry, +;; - changes of feed-titles led to duplicate feed items, +;; - faces for rendered HTML texts, +;; - length of ticker-text (for "exotic"/multibyte texts), +;; Thanks to Hiroshi Maruyama. +;; - suppress items with empty title and description +;; - newsticker-sort-method was ignored! +;; - prevent call of fill-region on HTML-rendered descriptions. + +;; 1.5 * Rewrote the visibility stuff. newsticker does not inherit +;; outline anymore. Now you have complete freedom for +;; `newsticker-*-format'. +;; * Save pre-formatted descriptions => incredible performance boost!! +;; * Introduced `newsticker-(start|stop)-ticker'. +;; * Introduced statistics for heading-format and +;; `newsticker-statistics-face'. +;; * Introduced `newsticker-enable-logo-manipulations'. +;; * Compare link of items (as well as title and desc). +;; * Added `newsticker-start-hook' and `newsticker-stop-hook', thanks +;; to mace. +;; * Bugfixes -- thanks to Ryan Yeske, Jari Aalto, Bruce Ingalls. +;; * Tested with Emacs 21.3.50, 21.3.1, 21.2, 21.1; XEmacs 21.4.15 + +;; 1.4 * Enabled HTML rendering, added `newsticker-html-renderer' to +;; choose a HTML rendering engine, thanks to Greg Scott for testing +;; * New Outline handling using text properties instead of "**" +;; prefixes. +;; * Added possibility to mark single item as old (bound to key +;; `o' (`newsticker-mark-item-at-point-as-read'). +;; * Added possibility to mark single item as immortal (bound to key +;; `i' (`newsticker-mark-item-at-point-as-immortal'). +;; * Added possibility to display feed logos. +;; * Added `newsticker-heading-format', `newsticker-item-format'. +;; * Added `newsticker-date-format'. +;; * Added `newsticker-justification'. +;; * Added `newsticker-automatically-mark-visited-items-as-old'. +;; * Added `newsticker-w3m-toggle-inline-image' which calls +;; `w3m-toggle-inline-image' if `newsticker-html-renderer' is +;; `w3m-region'. Exists for convenience only (bound to key +;; `RET'). + +;; 1.3 * Compare title AND desc to check whether item is old, except +;; for feed desc +;; * Mark as not-up-to-date only after new items have arrived. +;; * Added XEmacs compatibility code, tested with XEmacs 21.4.13. +;; * Tested with Emacs 21.3.50 and Emacs 21.2.something. +;; * Bugfix: Apply coding-systems to feed title and description, +;; thanks to OHASHI Akira +;; * Bugfix: xml-parser-workaround did not work for japanese texts, +;; thanks to OHASHI Akira +;; * Kill wget-buffers unless newsticker-debug is not nil. +;; * Bugfix: xml-parser-workaround for "DOCTYPE rdf:RDF" + +;; 1.2 Peter S Galbraith +;; * Added `newsticker-url-list-defaults', splitting the URLs into +;; a customizable selection list, and a user add-on list. +;; * Minor checkdoc fixes. + +;; 1.1 * Introduced optional feed-specific wget-arguments. +;; * Keep order of feeds as given in `newsticker-url-list' in +;; *newsticker* buffer. +;; * Ignore unsupported coding systems. + +;; 1.0 * Introduced feed-specific retrieval-timers. +;; * Removed dependency on 'cl (cddddr). +;; * Thanks to Kevin Rodgers and T.V. Raman for their help. +;; * Use utf-8 for reading and writing cache data. +;; * Reported to work with Emacs 21.3.50. + +;; 0.99 * Minor tweaks. +;; * Tested with Emacs 21.3.2 + +;; 0.98 * Check exit status of wget processes. Keep cache data if +;; something went wrong. Throw error when old wget-processes +;; are hanging around. +;; * Introduced newsticker-specific faces. +;; * Added `newsticker-show-descriptions-of-new-items'. +;; * Added `newsticker-hide-old-items-in-newsticker-buffer'. +;; * Added `newsticker-(hide|show)-old-items'. + +;; 0.97 * Minor tweaks. + +;; 0.96 * Added caching. +;; * newsticker-mode inherits outline-mode. +;; * newsticker-mode supports imenu. +;; * Easy buffer-navigation with newsticker-mode's keymap. +;; * Some bugs fixed. +;; * Thanks to Moritz Epple for documentation tips. + +;; 0.95 * Added newsticker-mode -- Thanks to T.V. Raman. +;; * Catch xml-parser errors -- Thanks to T.V. Raman. +;; * Remove stupid newlines in titles (headlines) -- Thanks to +;; Jeff Rancier. + +;; 0.94 * Added clickerability and description for channel headings. +;; * Made it work for (at least some) rss 0.9 feeds. + +;; 0.93 * Added some more sites. +;; * Do not flood the *Messages* buffer. +;; * First attempt at handling coding systems. + +;; 0.92 * Added `newsticker-wget-name'. +;; * Try to display message only if minibuffer and echo area are +;; not in use already. +;; * Dirty workaround for newer versions of xml.el: Remove +;; whitespace in rdf. +;; * Tested with Emacs 21.3.2 and CVS-snapshot of 2003-06-21. + +;; 0.91 * First bugfix: *newsticker* is read-only. + +;; 0.9 * First release. +;; * Tested with Emacs 21.3.2 and wget 1.8.2. + +;; ====================================================================== +;;; To Do: + +;; * Image handling for XEmacs (create-image does not exist) + +;; ====================================================================== +;;; Code: + +(require 'derived) +(require 'xml) + +;; Silence warnings +(defvar tool-bar-map) +(defvar w3-mode-map) +(defvar w3m-minor-mode-map) + +;; ====================================================================== +;;; Customizables +;; ====================================================================== +(defgroup newsticker nil + "RSS aggregator." + :group 'applications) + +(defconst newsticker--raw-url-list-defaults + '(("CNET News.com" + "http://export.cnet.com/export/feeds/news/rss/1,11176,,00.xml") + ("Debian Security Advisories" + "http://www.debian.org/security/dsa.en.rdf") + ("Debian Security Advisories - Long format" + "http://www.debian.org/security/dsa-long.en.rdf") + ("Emacs Wiki" + "http://www.emacswiki.org/cgi-bin/wiki.pl?action=rss" + nil + 3600) + ("Freshmeat.net" + "http://freshmeat.net/backend/fm.rdf") + ("Kuro5hin.org" + "http://www.kuro5hin.org/backend.rdf") + ("LWN (Linux Weekly News)" + "http://lwn.net/headlines/rss") + ("NewsForge" + "http://newsforge.com/index.rss") + ("NY Times: Technology" + "http://partners.userland.com/nytRss/technology.xml") + ("NY Times" + "http://partners.userland.com/nytRss/nytHomepage.xml") + ("Quote of the day" + "http://www.quotationspage.com/data/qotd.rss" + "07:00" + 86400) + ("The Register" + "http://www.theregister.co.uk/tonys/slashdot.rdf") + ("slashdot" + "http://slashdot.org/index.rss" + nil + 3600) ;/. will ban you if under 3600 seconds! + ("Wired News" + "http://www.wired.com/news_drop/netcenter/netcenter.rdf") + ("Heise News (german)" + "http://www.heise.de/newsticker/heise.rdf") + ("Tagesschau (german)" + "http://www.tagesschau.de/newsticker.rdf" + nil + 1800) + ("Telepolis (german)" + "http://www.heise.de/tp/news.rdf")) + "Default URL list in raw form. +This list is fed into defcustom via `newsticker--splicer'.") + +(defun newsticker--splicer (item) + "Convert ITEM for splicing into `newsticker-url-list-defaults'." + (let ((result (list 'list :tag (nth 0 item) (list 'const (nth 0 item)))) + (element (cdr item))) + (while element + (setq result (append result (list (list 'const (car element))))) + (setq element (cdr element))) + result)) + +;; ====================================================================== +;;; Customization +;; ====================================================================== +(defun newsticker--set-customvar (symbol value) + "Set newsticker-variable SYMBOL value to VALUE. + +Calls all necessary actions which are necessary in order to make +the new value effective. Changing `newsticker-url-list', for example, +will re-start the retrieval-timers." + (unless (condition-case nil + (eq (symbol-value symbol) value) + (error nil)) + (set symbol value) + (cond ((eq symbol 'newsticker-sort-method) + (when (fboundp 'newsticker--cache-sort) + (message "Applying new sort method...") + (newsticker--cache-sort) + (newsticker--buffer-set-uptodate nil) + (message "Applying new sort method...done"))) + ((memq symbol '(newsticker-url-list-defaults + newsticker-url-list + newsticker-retrieval-interval)) + (when (and (fboundp 'newsticker-running-p) + (newsticker-running-p)) + (message "Restarting newsticker") + (newsticker-stop) + (newsticker-start))) + ((eq symbol 'newsticker-display-interval) + (when (and (fboundp 'newsticker-running-p) + (newsticker-running-p)) + (message "Restarting ticker") + (newsticker-stop-ticker) + (newsticker-start-ticker) + (message ""))) + ((memq symbol '(newsticker-hide-old-items-in-echo-area + newsticker-hide-obsolete-items-in-echo-area + newsticker-hide-immortal-items-in-echo-area)) + (when (and (fboundp 'newsticker-running-p) + (newsticker-running-p)) + (message "Restarting newsticker") + (newsticker-stop-ticker) + (newsticker--ticker-text-setup) + (newsticker-start-ticker) + (message ""))) + ((memq symbol '(newsticker-hide-old-items-in-newsticker-buffer + newsticker-show-descriptions-of-new-items)) + (when (fboundp 'newsticker--buffer-set-uptodate) + (newsticker--buffer-set-uptodate nil))) + ((memq symbol '(newsticker-heading-format + newsticker-item-format + newsticker-desc-format + newsticker-date-format + newsticker-statistics-format + newsticker-justification + newsticker-use-full-width + newsticker-html-renderer + newsticker-feed-face + newsticker-new-item-face + newsticker-old-item-face + newsticker-immortal-item-face + newsticker-obsolete-item-face + newsticker-date-face + newsticker-statistics-face + ;;newsticker-default-face + )) + (when (fboundp 'newsticker--forget-preformatted) + (newsticker--forget-preformatted))) + (t + (error "Ooops %s" symbol))))) + +;; customization group feed +(defgroup newsticker-feed nil + "Settings for the RSS feeds." + :group 'newsticker) + +(defcustom newsticker-url-list-defaults + '(("Emacs Wiki" + "http://www.emacswiki.org/cgi-bin/wiki.pl?action=rss" + nil + 3600)) + "A customizable list of news feeds to select from. +These were mostly extracted from the Radio Community Server at +http://subhonker6.userland.com/rcsPublic/rssHotlist. + +You may add other entries in `newsticker-url-list'." + :type `(set ,@(mapcar `newsticker--splicer + newsticker--raw-url-list-defaults)) + :set 'newsticker--set-customvar + :group 'newsticker-feed) + +(defcustom newsticker-url-list nil + "The news feeds which you like to watch. + +This alist will be used in addition to selection made customizing +`newsticker-url-list-defaults'. + +This is an alist. Each element consists of two items: a LABEL and a URL, +optionally followed by a START-TIME, INTERVAL specifier and WGET-ARGUMENTS. + +The LABEL gives the name of the news feed. It can be an arbitrary string. + +The URL gives the location of the news feed. It must point to a valid +RSS file. The RSS file is retrieved by calling wget, or whatever you +specify as `newsticker-wget-name'. + +The START-TIME can be either a string, or nil. If it is a string it +specifies a fixed time at which this feed shall be retrieved for the +first time. (Examples: \"11:00pm\", \"23:00\"). If it is nil (or +unspecified), this feed will be retrieved immediately after calling +`newsticker-start'. + +The INTERVAL specifies the time between retrievals for this feed. If it +is nil (or unspecified) the default interval value as set in +`newsticker-retrieval-interval' is used. + +\(newsticker.el calls `run-at-time'. The newsticker-parameters START-TIME +and INTERVAL correspond to the `run-at-time'-parameters TIME and REPEAT.) + +WGET-ARGUMENTS specifies arguments for wget (see `newsticker-wget-name') +which apply for this feed only, overriding the value of +`newsticker-wget-arguments'." + :type '(repeat (list :tag "News feed" + (string :tag "Label") + (string :tag "URI") + (choice :tag "Start" + (const :tag "Default" nil) + (string :tag "Fixed Time")) + (choice :tag "Interval" + (const :tag "Default" nil) + (const :tag "Hourly" 3600) + (const :tag "Daily" 86400) + (integer :tag "Interval")) + (choice :tag "Wget Arguments" + (const :tag "Default arguments" nil) + (repeat :tag "Special arguments" string)))) + :set 'newsticker--set-customvar + :group 'newsticker-feed) + +(defcustom newsticker-wget-name + "wget" + "Name of the program which is called to retrieve news from the web. +The canonical choice is wget but you may take any other program which is +able to return the contents of a news feed file on stdout." + :type 'string + :group 'newsticker-feed) + +(defcustom newsticker-wget-arguments + '("-q" "-O" "-") + "Arguments which are passed to wget. +There is probably no reason to change the default settings, unless you +are living behind a firewall." + :type '(repeat (string :tag "Argument")) + :group 'newsticker-feed) + +(defcustom newsticker-retrieval-interval + 3600 + "Time interval for retrieving new news items (seconds). +If this value is not positive (i.e. less than or equal to 0) +items are retrieved only once! +Please note that some feeds, e.g. Slashdot, will ban you if you +make it less than 1800 seconds (30 minutes)!" + :type '(choice :tag "Interval" + (const :tag "No automatic retrieval" 0) + (const :tag "Hourly" 3600) + (const :tag "Daily" 86400) + (integer :tag "Interval")) + :set 'newsticker--set-customvar + :group 'newsticker-feed) + +(defcustom newsticker-desc-comp-max + 100 + "Relevant length of headline descriptions. +This value gives the maximum number of characters which will be +taken into account when newsticker compares two headline +descriptions." + :type 'integer + :group 'newsticker-feed) + +;; customization group behaviour +(defgroup newsticker-headline-processing nil + "Settings for the automatic processing of RSS headlines." + :group 'newsticker) + +(defcustom newsticker-automatically-mark-items-as-old + t + "Decides whether to automatically mark items as old. +If t a new item is considered as new only after its first retrieval. As +soon as it is retrieved a second time, it becomes old. If not t all +items stay new until you mark them as old. This is done in the +*newsticker* buffer." + :type 'boolean + :group 'newsticker-headline-processing) + +(defcustom newsticker-automatically-mark-visited-items-as-old + t + "Decides whether to automatically mark visited items as old. +If t an item is marked as old as soon as the associated link is +visited, i.e. after pressing RET or mouse2 on the item's +headline." + + :type 'boolean + :group 'newsticker-headline-processing) + +(defcustom newsticker-keep-obsolete-items + t + "Decides whether to keep unread items which have been removed from feed. +If t a new item, which has been removed from the feed, is kept in +the cache until it is marked as read." + :type 'boolean + :group 'newsticker-headline-processing) + +(defcustom newsticker-obsolete-item-max-age + (* 60 60 24) + "Maximal age of obsolete items, in seconds. +Obsolete items which are older than this value will be silently +deleted at the next retrieval." + :type 'integer + :group 'newsticker-headline-processing) + +(defcustom newsticker-auto-mark-filter + nil + "A filter for automatically marking headlines. + +This is an alist of the form (FEED-NAME OLD-LIST IMMORTAL-LIST). I.e. each +element consists of a FEED-NAME and two lists. Each list consists a set of +regular expressions. The first list contains patterns of headlines which +will be marked as old. The second list contains patterns of headlines which +will be marked as immortal. + +This filter is checked after a new headline has been retrieved. If +FEED-NAME matches the name of the corresponding news feed, both sublists +are checked: If the title of the headline matches any of the regular +expressions in OLD-LIST, this headline is marked as old, if it matches any +of the expressions in IMMORTAL-LIST it is marked as immortal. + +If, for example, `newsticker-auto-mark-filter' looks like + \((slashdot (\"^Forget me!$\") (\"^Read me$\" \"important\"))) +then all articles from slashdot are marked as old if they have the title +\"Forget me!\". All articles which have the title \"Read me\" and all +articles which contain the string \"important\" in their title are marked +as immortal." + :type '(repeat (list :tag "Feed filter rule" + (string :tag "Feed name") + ;;(choice ,@(mapcar (lambda (i) + ;; (list :tag (car i) (car i))) + ;; newsticker-url-list)) + (repeat :tag "Mark as old" string) + (repeat :tag "Mark as immortal" string))) + :group 'newsticker-headline-processing) + +;; customization group layout +(defgroup newsticker-layout nil + "Settings for layout of the RSS reader." + :group 'newsticker) + +(defcustom newsticker-sort-method + 'sort-by-original-order + "Sort method for news items. +The following sort methods are available: +* `sort-by-original-order' keeps the order in which the items + appear in the RSS file (please note that for immortal items, + which have been removed from the news feed, there is no original + order), +* `sort-by-time' looks at the time at which an item has been seen + the first time. The most recent item is put at top, +* `sort-by-title' will put the items in an alphabetical order." + :type '(choice + (const :tag "Keep original order" sort-by-original-order) + (const :tag "Sort by time" sort-by-time) + (const :tag "Sort by title" sort-by-title)) + :set 'newsticker--set-customvar + :group 'newsticker-layout) + +(defcustom newsticker-hide-old-items-in-newsticker-buffer + nil + "Decides whether to automatically hide old items in the *newsticker* buffer. +If set to t old items will be completely folded and only new items +will show up in the *newsticker* buffer. Otherwise old as well as new +items will be visible." + :type 'boolean + :set 'newsticker--set-customvar + :group 'newsticker-layout) + +(defcustom newsticker-show-descriptions-of-new-items + t + "Whether to automatically show descriptions of new items in *newsticker*. +If set to t old items will be folded and new items will be +unfolded. Otherwise old as well as new items will be folded." + :type 'boolean + :set 'newsticker--set-customvar + :group 'newsticker-layout) + +(defcustom newsticker-heading-format + "%l +%t %d %s" + "Format string for feed headings. +The following printf-like specifiers can be used: +%d The date the feed was retrieved. See `newsticker-date-format'. +%l The logo (image) of the feed. Most RSS feeds provide a small + image as logo. Newsticker can display them, if Emacs can -- + see `image-types' for a list of supported image types. +%L The logo (image) of the feed. If the logo is not available + the title of the feed is used. +%s The statistical data of the feed. See `newsticker-statistics-format'. +%t The title of the feed, i.e. its name." + :type 'string + :set 'newsticker--set-customvar + :group 'newsticker-layout) + +(defcustom newsticker-item-format + "%t %d" + "Format string for news item headlines. +The following printf-like specifiers can be used: +%d The date the item was (first) retrieved. See `newsticker-date-format'. +%l The logo (image) of the feed. Most RSS feeds provide a small + image as logo. Newsticker can display them, if Emacs can -- + see `image-types' for a list of supported image types. +%L The logo (image) of the feed. If the logo is not available + the title of the feed is used. +%t The title of the item." + :type 'string + :set 'newsticker--set-customvar + :group 'newsticker-layout) + +(defcustom newsticker-desc-format + "%d %c" + "Format string for news descriptions (contents). +The following printf-like specifiers can be used: +%c The contents (description) of the item. +%d The date the item was (first) retrieved. See `newsticker-date-format'." + :type 'string + :set 'newsticker--set-customvar + :group 'newsticker-layout) + +(defcustom newsticker-date-format + "(%A, %H:%M)" + "Format for the date part in item and feed lines. +See `format-time-string' for a list of valid specifiers." + :type 'string + :set 'newsticker--set-customvar + :group 'newsticker-layout) + +(defcustom newsticker-statistics-format + "[%n + %i + %o + %O = %a]" + "Format for the statistics part in feed lines. +The following printf-like specifiers can be used: +%a The number of all items in the feed. +%i The number of immortal items in the feed. +%n The number of new items in the feed. +%o The number of old items in the feed. +%O The number of obsolete items in the feed." + :type 'string + :set 'newsticker--set-customvar + :group 'newsticker-layout) + +(defcustom newsticker-show-all-rss-elements + nil + "Show all RSS elements." + :type 'boolean + ;;:set 'newsticker--set-customvar + :group 'newsticker-layout) + +;; image related things +(defcustom newsticker-enable-logo-manipulations + t + "If non-nil newsticker manipulates logo images. +This enables the following image properties: heuristic mask for all +logos, and laplace-conversion for images without new items." + :type 'boolean + :group 'newsticker-layout) + + +;; rendering +(defcustom newsticker-justification + 'left + "How to fill item descriptions. +If non-nil newsticker calls `fill-region' to wrap long lines in +item descriptions. However, if an item description contains HTML +text and `newsticker-html-renderer' is non-nil, filling is not +done." + :type '(choice :tag "Justification" + (const :tag "No filling" nil) + (const :tag "Left" left) + (const :tag "Right" right) + (const :tag "Center" center) + (const :tag "Full" full)) + :set 'newsticker--set-customvar + :group 'newsticker-layout) + +(defcustom newsticker-use-full-width + t + "Decides whether to use the full window width when filling. +If non-nil newsticker sets `fill-column' so that the whole +window is used when filling. See also `newsticker-justification'." + :type 'boolean + :set 'newsticker--set-customvar + :group 'newsticker-layout) + +(defcustom newsticker-html-renderer + nil + "Function for rendering HTML contents. +If non-nil, newsticker.el will call this function whenever it finds +HTML-like tags in item descriptions. Possible functions are, for +example, `w3m-region', `w3-region', and (if you have htmlr.el installed) +`newsticker-htmlr-render'. + +In order to make sure that the HTML renderer is loaded when you +run newsticker, you should add one of the following statements to +your .emacs. If you use w3m, + + (autoload 'w3m-region \"w3m\" + \"Render region in current buffer and replace with result.\" t) + +or, if you use w3, + + (require 'w3-auto) + +or, if you use htmlr + + (require 'htmlr)" + :type '(choice :tag "Function" + (const :tag "None" nil) + (const :tag "w3" w3-region) + (const :tag "w3m" w3m-region) + (const :tag "htmlr" newsticker-htmlr-render)) + :set 'newsticker--set-customvar + :group 'newsticker-layout) + + +;; faces +(defgroup newsticker-faces nil + "Settings for the faces of the RSS reader." + :group 'newsticker-layout) + +(defface newsticker-feed-face + '((((class color) (background dark)) + (:family "helvetica" :bold t :height 1.2 :foreground "misty rose")) + (((class color) (background light)) + (:family "helvetica" :bold t :height 1.2 :foreground "black"))) + "Face for news feeds." + :group 'newsticker-faces) + +(defface newsticker-new-item-face + '((((class color) (background dark)) + (:family "helvetica" :bold t)) + (((class color) (background light)) + (:family "helvetica" :bold t))) + "Face for old news items." + :group 'newsticker-faces) + +(defface newsticker-old-item-face + '((((class color) (background dark)) + (:family "helvetica" :bold t :foreground "orange3")) + (((class color) (background light)) + (:family "helvetica" :bold t :foreground "red4"))) + "Face for old news items." + :group 'newsticker-faces) + +(defface newsticker-immortal-item-face + '((((class color) (background dark)) + (:family "helvetica" :bold t :italic t :foreground "orange")) + (((class color) (background light)) + (:family "helvetica" :bold t :italic t :foreground "blue"))) + "Face for immortal news items." + :group 'newsticker-faces) + +(defface newsticker-obsolete-item-face + '((((class color) (background dark)) + (:family "helvetica" :bold t :strike-through t)) + (((class color) (background light)) + (:family "helvetica" :bold t :strike-through t))) + "Face for old news items." + :group 'newsticker-faces) + +(defface newsticker-date-face + '((((class color) (background dark)) + (:family "helvetica" :italic t :height 0.8)) + (((class color) (background light)) + (:family "helvetica" :italic t :height 0.8))) + "Face for newsticker dates." + :group 'newsticker-faces) + +(defface newsticker-statistics-face + '((((class color) (background dark)) + (:family "helvetica" :italic t :height 0.8)) + (((class color) (background light)) + (:family "helvetica" :italic t :height 0.8))) + "Face for newsticker dates." + :group 'newsticker-faces) + +(defface newsticker-enclosure-face + '((((class color) (background dark)) + (:bold t :background "orange")) + (((class color) (background light)) + (:bold t :background "orange"))) + "Face for enclosed elements." + :group 'newsticker-faces) + +(defface newsticker-extra-face + '((((class color) (background dark)) + (:italic t :foreground "gray50" :height 0.8)) + (((class color) (background light)) + (:italic t :foreground "gray50" :height 0.8))) + "Face for newsticker dates." + :group 'newsticker-faces) + +;; (defface newsticker-default-face +;; '((((class color) (background dark)) +;; (:inherit default)) +;; (((class color) (background light)) +;; (:inherit default))) +;; "Face for the description of news items." +;; ;;:set 'newsticker--set-customvar +;; :group 'newsticker-faces) + + +;; customization group ticker +(defgroup newsticker-ticker nil + "Settings for the RSS ticker." + :group 'newsticker) + +(defcustom newsticker-display-interval + 0.3 + "Time interval for displaying news items in the echo area (seconds). +If equal or less than 0 no messages are shown in the echo area. For +smooth display (see `newsticker-scroll-smoothly') a value of 0.3 seems +reasonable. For non-smooth display a value of 10 is a good starting +point." + :type 'number + :set 'newsticker--set-customvar + :group 'newsticker-ticker) + +(defcustom newsticker-scroll-smoothly + t + "Decides whether to flash or scroll news items. +If t the news headlines are scrolled (more-or-less) smoothly in the echo +area. If nil one headline after another is displayed in the echo area. +The variable `newsticker-display-interval' determines how fast this +display moves/changes and whether headlines are shown in the echo area +at all. If you change `newsticker-scroll-smoothly' you should also change +`newsticker-display-interval'." + :type 'boolean + :group 'newsticker-ticker) + +(defcustom newsticker-hide-immortal-items-in-echo-area + t + "Decides whether to show immortal/non-expiring news items in the ticker. +If t the echo area will not show immortal items. See also +`newsticker-hide-old-items-in-echo-area." + :type 'boolean + :set 'newsticker--set-customvar + :group 'newsticker-ticker) + +(defcustom newsticker-hide-old-items-in-echo-area + t + "Decides whether to show only the newest news items in the ticker. +If t the echo area will show only new items, i.e. only items which have +been added between the last two retrievals." + :type 'boolean + :set 'newsticker--set-customvar + :group 'newsticker-ticker) + +(defcustom newsticker-hide-obsolete-items-in-echo-area + t + "Decides whether to show obsolete items items in the ticker. +If t the echo area will not show obsolete items. See also +`newsticker-hide-old-items-in-echo-area." + :type 'boolean + :set 'newsticker--set-customvar + :group 'newsticker-ticker) + +(defgroup newsticker-hooks nil + "Settings for newsticker hooks." + :group 'newsticker) + +(defcustom newsticker-start-hook + nil + "Hook run when starting newsticker. +This hook is run at the very end of `newsticker-start'." + :options '(newsticker-start-ticker) + :type 'hook + :group 'newsticker-hooks) + +(defcustom newsticker-stop-hook + nil + "Hook run when stopping newsticker. +This hook is run at the very end of `newsticker-stop'." + :options nil + :type 'hook + :group 'newsticker-hooks) + +(defcustom newsticker-new-item-functions + nil + "List of functions run after a new headline has been retrieved. +Each function is called with the following three arguments: +FEED the name of the corresponding news feed, +TITLE the title of the headline, +DESC the decoded description of the headline. + +See `newsticker-download-images', and +`newsticker-download-enclosures' for sample functions. + +Please note that these functions are called only once for a +headline after it has been retrieved for the first time." + :type 'hook + :options '(newsticker-download-images + newsticker-download-enclosures) + :group 'newsticker-hooks) + +(defcustom newsticker-select-item-hook + 'newsticker--buffer-make-item-completely-visible + "List of functions run after a headline has been selected. +Each function is called after one of `newsticker-next-item', +`newsticker-next-new-item', `newsticker-previous-item', +`newsticker-previous-new-item' has been called. + +The default value 'newsticker--buffer-make-item-completely-visible +assures that the current item is always completely visible." + :type 'hook + :options '(newsticker--buffer-make-item-completely-visible) + :group 'newsticker-hooks) + +(defcustom newsticker-select-feed-hook + 'newsticker--buffer-make-item-completely-visible + "List of functions run after a feed has been selected. +Each function is called after one of `newsticker-next-feed', and +`newsticker-previous-feed' has been called. + +The default value 'newsticker--buffer-make-item-completely-visible +assures that the current feed is completely visible." + :type 'hook + :options '(newsticker--buffer-make-item-completely-visible) + :group 'newsticker-hooks) + +(defcustom newsticker-buffer-change-hook + 'newsticker-w3m-show-inline-images + "List of functions run after the newsticker buffer has been updated. +Each function is called after `newsticker-buffer-update' has been called. + +The default value '`newsticker-w3m-show-inline-images' loads inline +images." + :type 'hook + :group 'newsticker-hooks) + +(defcustom newsticker-narrow-hook + 'newsticker-w3m-show-inline-images + "List of functions run after narrowing in newsticker buffer has changed. +Each function is called after +`newsticker-toggle-auto-narrow-to-feed' or +`newsticker-toggle-auto-narrow-to-item' has been called. + +The default value '`newsticker-w3m-show-inline-images' loads inline +images." + :type 'hook + :group 'newsticker-hooks) + +(defgroup newsticker-miscellaneous nil + "Miscellaneous newsticker settings." + :group 'newsticker) + +(defcustom newsticker-cache-filename + "~/.newsticker-cache" + "Name of the newsticker cache file." + :type 'string + :group 'newsticker-miscellaneous) + +(defcustom newsticker-imagecache-dirname + "~/.newsticker-images" + "Name of the directory where newsticker stores cached images." + :type 'string + :group 'newsticker-miscellaneous) + +;; debugging +(defcustom newsticker-debug + nil + "Enables some features needed for debugging newsticker.el. + +If set to t newsticker.el will print lots of debugging messages, and the +buffers *newsticker-wget-* will not be closed." + :type 'boolean + ;;:set 'newsticker--set-customvar + :group 'newsticker-miscellaneous) + +;; ====================================================================== +;;; Compatibility section, XEmacs, Emacs +;; ====================================================================== +(unless (fboundp 'time-add) + (require 'time-date);;FIXME + (defun time-add (t1 t2) + (seconds-to-time (+ (time-to-seconds t1) (time-to-seconds t2))))) + +(unless (fboundp 'match-string-no-properties) + (defalias 'match-string-no-properties 'match-string)) + +(unless (fboundp 'replace-regexp-in-string) + (defun replace-regexp-in-string (re rp st) + (save-match-data ;; apparently XEmacs needs save-match-data + (replace-in-string st re rp)))) + +;; copied from subr.el +(unless (fboundp 'add-to-invisibility-spec) + (defun add-to-invisibility-spec (arg) + "Add elements to `buffer-invisibility-spec'. +See documentation for `buffer-invisibility-spec' for the kind of elements +that can be added." + (if (eq buffer-invisibility-spec t) + (setq buffer-invisibility-spec (list t))) + (setq buffer-invisibility-spec + (cons arg buffer-invisibility-spec)))) + +;; copied from subr.el +(unless (fboundp 'remove-from-invisibility-spec) + (defun remove-from-invisibility-spec (arg) + "Remove elements from `buffer-invisibility-spec'." + (if (consp buffer-invisibility-spec) + (setq buffer-invisibility-spec (delete arg buffer-invisibility-spec))))) + +;; ====================================================================== +;;; Internal variables +;; ====================================================================== +(defvar newsticker--display-timer nil + "Timer for newsticker display.") +(defvar newsticker--retrieval-timer-list nil + "List of timers for news retrieval. +This is an alist, each element consisting of (feed-name . timer)") +(defvar newsticker--item-list nil + "List of newsticker items.") +(defvar newsticker--item-position 0 + "Actual position in list of newsticker items.") +(defvar newsticker--prev-message "There was no previous message yet!" + "Last message that the newsticker displayed.") +(defvar newsticker--scrollable-text "" + "The text which is scrolled smoothly in the echo area.") +(defvar newsticker--buffer-uptodate-p nil + "Tells whether the newsticker buffer is up to date.") +(defvar newsticker--latest-update-time (current-time) + "The time at which the latest news arrived.") + +(defvar newsticker--cache nil "Cached newsticker data. +This is a list of the form + + ((label1 + (title description link time age index preformatted-contents + preformatted-title) + ...) + (label2 + (title description link time age index preformatted-contents + preformatted-title) + ...) + ...) + +where LABEL is a symbol. TITLE, DESCRIPTION, and LINK are +strings. TIME is a time value as returned by `current-time'. +AGE is a symbol: 'new, 'old, 'immortal, and 'obsolete denote +ordinary news items, whereas 'feed denotes an item which is not a +headline but describes the feed itself. INDEX denotes the +original position of the item -- used for restoring the original +order. PREFORMATTED-CONTENTS and PREFORMATTED-TITLE hold the +formatted contents of the item's description and title. This +speeds things up if HTML rendering is used, which is rather +slow.") + +(defvar newsticker--auto-narrow-to-feed nil + "Automatically narrow to current news feed. +If non-nil only the items of the current news feed are visible.") + +(defvar newsticker--auto-narrow-to-item nil + "Automatically narrow to current news item. +If non-nil only the current headline is visible.") + +(defconst newsticker--error-headline + "[COULD NOT DOWNLOAD HEADLINES!]" + "Title of error headline which will be inserted if news retrieval fails.") + +;; ====================================================================== +;;; Toolbar +;; ====================================================================== +(defconst newsticker--next-item-image + (if (fboundp 'create-image) + (create-image "/* XPM */ +static char * next_xpm[] = { +\"24 24 42 1\", +\" c None\", +\". c #000000\", +\"+ c #7EB6DE\", +\"@ c #82BBE2\", +\"# c #85BEE4\", +\"$ c #88C1E7\", +\"% c #8AC3E8\", +\"& c #87C1E6\", +\"* c #8AC4E9\", +\"= c #8CC6EA\", +\"- c #8CC6EB\", +\"; c #88C2E7\", +\"> c #8BC5E9\", +\", c #8DC7EB\", +\"' c #87C0E6\", +\") c #8AC4E8\", +\"! c #8BC5EA\", +\"~ c #8BC4E9\", +\"{ c #88C1E6\", +\"] c #89C3E8\", +\"^ c #86BFE5\", +\"/ c #83BBE2\", +\"( c #82BBE1\", +\"_ c #86C0E5\", +\": c #87C0E5\", +\"< c #83BCE2\", +\"[ c #81B9E0\", +\"} c #81BAE1\", +\"| c #78B0D9\", +\"1 c #7BB3DB\", +\"2 c #7DB5DD\", +\"3 c #7DB6DD\", +\"4 c #72A9D4\", +\"5 c #75ACD6\", +\"6 c #76AED7\", +\"7 c #77AFD8\", +\"8 c #6BA1CD\", +\"9 c #6EA4CF\", +\"0 c #6FA6D1\", +\"a c #6298C6\", +\"b c #659BC8\", +\"c c #5C91C0\", +\" \", +\" \", +\" . \", +\" .. \", +\" .+. \", +\" .@#. \", +\" .#$%. \", +\" .&*=-. \", +\" .;>,,,. \", +\" .;>,,,=. \", +\" .')!==~;. \", +\" .#{]*%;^/. \", +\" .(#_':#<. \", +\" .+[@ c #8DC7EB\", +\", c #89C3E8\", +\"' c #8AC4E8\", +\") c #8BC5EA\", +\"! c #88C1E6\", +\"~ c #8AC4E9\", +\"{ c #8AC3E8\", +\"] c #86C0E5\", +\"^ c #87C0E6\", +\"/ c #87C0E5\", +\"( c #82BBE2\", +\"_ c #81BAE1\", +\": c #7FB7DF\", +\"< c #7DB6DD\", +\"[ c #7DB5DD\", +\"} c #7CB4DC\", +\"| c #79B1DA\", +\"1 c #76ADD7\", +\"2 c #77AFD8\", +\"3 c #73AAD4\", +\"4 c #70A7D1\", +\"5 c #6EA5D0\", +\"6 c #6CA2CE\", +\"7 c #689ECB\", +\"8 c #6399C7\", +\"9 c #6095C4\", +\"0 c #5C90C0\", +\" \", +\" \", +\" . \", +\" .. \", +\" .+. \", +\" .@#. \", +\" .$%&. \", +\" .*=-;. \", +\" .>>*,%. \", +\" .>>>*,%. \", +\" .')**=-;. \", +\" .;!,~{-%&. \", +\" .;]^/;@#. \", +\" .(@&_:+. \", +\" .<[}|1. \", +\" .2134. \", +\" .567. \", +\" .89. \", +\" .0. \", +\" .. \", +\" . \", +\" \", +\" \", +\" \"}; +" + 'xpm t) + "Image for the previous item button.")) + +(defconst newsticker--previous-feed-image + (if (fboundp 'create-image) + (create-image "/* XPM */ +static char * prev_feed_xpm[] = { +\"24 24 52 1\", +\" c None\", +\". c #000000\", +\"+ c #70A7D2\", +\"@ c #75ADD6\", +\"# c #71A8D3\", +\"$ c #79B1DA\", +\"% c #7BB3DB\", +\"& c #7DB5DD\", +\"* c #83BBE2\", +\"= c #7EB6DE\", +\"- c #78B0D9\", +\"; c #7FB7DE\", +\"> c #88C2E7\", +\", c #85BEE4\", +\"' c #80B9E0\", +\") c #80B8DF\", +\"! c #8CC6EA\", +\"~ c #89C3E8\", +\"{ c #86BFE5\", +\"] c #81BAE1\", +\"^ c #7CB4DC\", +\"/ c #7FB8DF\", +\"( c #8DC7EB\", +\"_ c #7BB3DC\", +\": c #7EB7DE\", +\"< c #8BC4E9\", +\"[ c #8AC4E9\", +\"} c #8AC3E8\", +\"| c #87C0E6\", +\"1 c #87C0E5\", +\"2 c #83BCE2\", +\"3 c #75ACD6\", +\"4 c #7FB7DF\", +\"5 c #77AED8\", +\"6 c #71A8D2\", +\"7 c #70A7D1\", +\"8 c #76ADD7\", +\"9 c #6CA2CE\", +\"0 c #699FCC\", +\"a c #73AAD4\", +\"b c #6BA1CD\", +\"c c #669CC9\", +\"d c #6298C5\", +\"e c #689ECB\", +\"f c #6499C7\", +\"g c #6095C3\", +\"h c #5C91C0\", +\"i c #5E93C2\", +\"j c #5B90C0\", +\"k c #588CBC\", +\"l c #578CBC\", +\"m c #5589BA\", +\" \", +\" \", +\" ... . \", +\" .+. .. \", +\" .@. .#. \", +\" .$. .%@. \", +\" .&. .*=-. \", +\" .;. .>,'%. \", +\" .). .!~{]^. \", +\" ./. .(!~{]_. \", +\" .:. .!!<>,'%. \", +\" .&. .~[}>{*=-. \", +\" .$. .|1,2/%@. \", +\" .3. .*]4%56. \", +\" .7. .^$8#9. \", +\" .0. .a7bc. \", +\" .d. .efg. \", +\" .h. .ij. \", +\" .k. .l. \", +\" .m. .. \", +\" ... . \", +\" \", +\" \", +\" \"}; +" + 'xpm t) + "Image for the previous feed button.")) + +(defconst newsticker--next-feed-image + (if (fboundp 'create-image) + (create-image "/* XPM */ +static char * next_feed_xpm[] = { +\"24 24 57 1\", +\" c None\", +\". c #000000\", +\"+ c #6CA2CE\", +\"@ c #75ADD6\", +\"# c #71A8D3\", +\"$ c #79B1DA\", +\"% c #7EB7DE\", +\"& c #7DB5DD\", +\"* c #81BAE1\", +\"= c #85BEE4\", +\"- c #78B0D9\", +\"; c #7FB7DE\", +\"> c #83BCE3\", +\", c #87C1E6\", +\"' c #8AC4E9\", +\") c #7BB3DB\", +\"! c #80B8DF\", +\"~ c #88C2E7\", +\"{ c #8BC5E9\", +\"] c #8DC7EB\", +\"^ c #7CB4DC\", +\"/ c #7FB8DF\", +\"( c #84BDE3\", +\"_ c #7BB3DC\", +\": c #83BCE2\", +\"< c #87C0E6\", +\"[ c #8AC4E8\", +\"} c #8BC5EA\", +\"| c #8CC6EA\", +\"1 c #88C1E6\", +\"2 c #89C3E8\", +\"3 c #8AC3E8\", +\"4 c #7EB6DE\", +\"5 c #82BBE1\", +\"6 c #86C0E5\", +\"7 c #87C0E5\", +\"8 c #75ACD6\", +\"9 c #7AB2DA\", +\"0 c #81B9E0\", +\"a c #82BBE2\", +\"b c #71A8D2\", +\"c c #70A7D1\", +\"d c #74ACD6\", +\"e c #699FCC\", +\"f c #6EA5D0\", +\"g c #72A9D4\", +\"h c #669CC9\", +\"i c #6298C5\", +\"j c #679DCA\", +\"k c #6BA1CD\", +\"l c #6095C3\", +\"m c #5C91C0\", +\"n c #5F94C2\", +\"o c #5B90C0\", +\"p c #588CBC\", +\"q c #578CBC\", +\"r c #5589BA\", +\" \", +\" \", +\" . ... \", +\" .. .+. \", +\" .@. .#. \", +\" .$%. .@. \", +\" .&*=. .-. \", +\" .;>,'. .). \", +\" .!=~{]. .^. \", +\" ./(~{]]. ._. \", +\" .%:<[}||. .). \", +\" .&*=12'3~. .-. \", +\" .$45=6<7. .@. \", +\" .8940a:. .b. \", +\" .cd-)&. .+. \", +\" .efg8. .h. \", +\" .ijk. .l. \", +\" .mn. .o. \", +\" .p. .q. \", +\" .. .r. \", +\" . ... \", +\" \", +\" \", +\" \"}; +" + 'xpm t) + "Image for the next feed button.")) + +(defconst newsticker--mark-read-image + (if (fboundp 'create-image) + (create-image "/* XPM */ +static char * mark_read_xpm[] = { +\"24 24 44 1\", +\" c None\", +\". c #C20000\", +\"+ c #BE0000\", +\"@ c #C70000\", +\"# c #CE0000\", +\"$ c #C90000\", +\"% c #BD0000\", +\"& c #CB0000\", +\"* c #D10000\", +\"= c #D70000\", +\"- c #D30000\", +\"; c #CD0000\", +\"> c #C60000\", +\", c #D40000\", +\"' c #DA0000\", +\") c #DE0000\", +\"! c #DB0000\", +\"~ c #D60000\", +\"{ c #D00000\", +\"] c #DC0000\", +\"^ c #E00000\", +\"/ c #E40000\", +\"( c #E10000\", +\"_ c #DD0000\", +\": c #D80000\", +\"< c #E50000\", +\"[ c #E70000\", +\"} c #E60000\", +\"| c #E20000\", +\"1 c #E90000\", +\"2 c #E80000\", +\"3 c #E30000\", +\"4 c #DF0000\", +\"5 c #D90000\", +\"6 c #CC0000\", +\"7 c #C10000\", +\"8 c #C30000\", +\"9 c #BF0000\", +\"0 c #B90000\", +\"a c #BC0000\", +\"b c #BB0000\", +\"c c #B80000\", +\"d c #B50000\", +\"e c #B70000\", +\" \", +\" \", +\" \", +\" . + \", +\" +@# $.% \", +\" &*= -;> \", +\" ,') !~{ \", +\" ]^/ (_: \", +\" (<[ }|) \", +\" <[1 2<| \", +\" }222[< \", +\" }}}< \", +\" 333| \", +\" _4^4)] \", +\" ~:' 5=- \", +\" 6{- *#$ \", +\" 7>$ @89 \", +\" 0a+ %bc \", +\" ddc edd \", +\" ddd ddd \", +\" d d \", +\" \", +\" \", +\" \"}; +" + 'xpm t) + "Image for the next feed button.")) + +(defconst newsticker--mark-immortal-image + (if (fboundp 'create-image) + (create-image "/* XPM */ +static char * mark_immortal_xpm[] = { +\"24 24 93 2\", +\" c None\", +\". c #171717\", +\"+ c #030303\", +\"@ c #000000\", +\"# c #181818\", +\"$ c #090909\", +\"% c #FFC960\", +\"& c #FFCB61\", +\"* c #FFCB62\", +\"= c #FFC961\", +\"- c #FFC75F\", +\"; c #FFC65E\", +\"> c #FFCA61\", +\", c #FFCD63\", +\"' c #FFCF65\", +\") c #FFD065\", +\"! c #FFCE64\", +\"~ c #FFC35C\", +\"{ c #FFC45D\", +\"] c #FFD166\", +\"^ c #FFD267\", +\"/ c #FFD368\", +\"( c #FFD167\", +\"_ c #FFC05A\", +\": c #010101\", +\"< c #040404\", +\"[ c #FFCC62\", +\"} c #FFD569\", +\"| c #FFD56A\", +\"1 c #FFC860\", +\"2 c #FFC25B\", +\"3 c #FFBB56\", +\"4 c #020202\", +\"5 c #060606\", +\"6 c #FFC15B\", +\"7 c #FFC85F\", +\"8 c #FFD469\", +\"9 c #FFD66A\", +\"0 c #FFBC57\", +\"a c #1B1B1B\", +\"b c #070707\", +\"c c #FFBA55\", +\"d c #FFB451\", +\"e c #FFB954\", +\"f c #FFB350\", +\"g c #FFB652\", +\"h c #FFBE58\", +\"i c #FFCD64\", +\"j c #FFD066\", +\"k c #FFC059\", +\"l c #FFB14E\", +\"m c #0B0B0B\", +\"n c #FFBB55\", +\"o c #FFC15A\", +\"p c #FFB552\", +\"q c #FFAD4B\", +\"r c #080808\", +\"s c #FFAF4C\", +\"t c #FFB853\", +\"u c #FFA948\", +\"v c #050505\", +\"w c #FFB04E\", +\"x c #FFB753\", +\"y c #FFBC56\", +\"z c #FFC55D\", +\"A c #FFC55E\", +\"B c #FFC45C\", +\"C c #FFBD57\", +\"D c #FFB854\", +\"E c #FFB34F\", +\"F c #FFAB4A\", +\"G c #FFA545\", +\"H c #FFAA49\", +\"I c #FFB04D\", +\"J c #FFB551\", +\"K c #FFBF58\", +\"L c #FFB24F\", +\"M c #FFAC4A\", +\"N c #FFA646\", +\"O c #FFA344\", +\"P c #FFA848\", +\"Q c #FFB14F\", +\"R c #FFAF4D\", +\"S c #FFA546\", +\"T c #FFA243\", +\"U c #FFA445\", +\"V c #FFAE4C\", +\"W c #FFA444\", +\"X c #FFA142\", +\"Y c #FF9F41\", +\"Z c #0A0A0A\", +\"` c #FF9E40\", +\" . c #FF9F40\", +\" \", +\" \", +\" \", +\" . + @ @ + # \", +\" $ @ % & * * = - + + \", +\" @ ; > , ' ) ' ! * - ~ @ \", +\" @ { > ! ] ^ / / ( ' * ; _ : \", +\" < _ ; [ ) / } | } / ] , 1 2 3 4 \", +\" 5 6 7 , ] 8 9 9 9 } ^ ! = ~ 0 a \", +\" b c 6 - , ] 8 9 9 9 } ^ ! % ~ 0 d 5 \", +\" : e _ ; * ) / 8 } } / ] , 1 2 3 f 5 \", +\" : g h { = i j ^ / ^ ] ! * ; k e l m \", +\" : f n o ; > , ' ) ' ! * - 2 0 p q r \", +\" : s g 0 6 ; % > * * = - ~ h t l u r \", +\" v u w x y k ~ z A z B o C D E F G b \", +\" 5 H I J e 0 h K h C c x L M N . \", +\" 4 O P q Q d g x g J L R H S T < \", +\" @ T U P F q V q M H N W X + \", +\" @ Y T O W G G W O X Y @ \", +\" 4 Z ` Y Y Y .` 4 4 \", +\" 5 : : @ @ Z \", +\" \", +\" \", +\" \"}; +" + 'xpm t) + "Image for the next feed button.")) + + +(defconst newsticker--narrow-image + (if (fboundp 'create-image) + (create-image "/* XPM */ +static char * narrow_xpm[] = { +\"24 24 48 1\", +\" c None\", +\". c #000000\", +\"+ c #969696\", +\"@ c #9E9E9E\", +\"# c #A4A4A4\", +\"$ c #AAAAAA\", +\"% c #AEAEAE\", +\"& c #B1B1B1\", +\"* c #B3B3B3\", +\"= c #B4B4B4\", +\"- c #B2B2B2\", +\"; c #AFAFAF\", +\"> c #ABABAB\", +\", c #A6A6A6\", +\"' c #A0A0A0\", +\") c #989898\", +\"! c #909090\", +\"~ c #73AAD4\", +\"{ c #7AB2DA\", +\"] c #7FB8DF\", +\"^ c #84BDE3\", +\"/ c #88C2E7\", +\"( c #8BC5E9\", +\"_ c #8DC7EB\", +\": c #8CC6EA\", +\"< c #89C3E8\", +\"[ c #86BFE5\", +\"} c #81BAE1\", +\"| c #7BB3DC\", +\"1 c #75ACD6\", +\"2 c #6DA4CF\", +\"3 c #979797\", +\"4 c #A3A3A3\", +\"5 c #A8A8A8\", +\"6 c #ADADAD\", +\"7 c #ACACAC\", +\"8 c #A9A9A9\", +\"9 c #A5A5A5\", +\"0 c #9A9A9A\", +\"a c #929292\", +\"b c #8C8C8C\", +\"c c #808080\", +\"d c #818181\", +\"e c #838383\", +\"f c #848484\", +\"g c #858585\", +\"h c #868686\", +\"i c #828282\", +\" \", +\" \", +\" \", +\" .................. \", +\" .+@#$%&*=*-;>,')!. \", +\" .................. \", +\" \", +\" \", +\" .................. \", +\" .~{]^/(___:<[}|12. \", +\" .................. \", +\" \", +\" \", +\" .................. \", +\" .!3@45>666789'0ab. \", +\" .................. \", +\" \", +\" \", +\" .................. \", +\" .cccdefghhgficccc. \", +\" .................. \", +\" \", +\" \", +\" \"}; +" + 'xpm t) + "Image for the next feed button.")) + +(defconst newsticker--get-all-image + (if (fboundp 'create-image) + (create-image "/* XPM */ +static char * get_all_xpm[] = { +\"24 24 70 1\", +\" c None\", +\". c #000000\", +\"+ c #F3DA00\", +\"@ c #F5DF00\", +\"# c #F7E300\", +\"$ c #F9E700\", +\"% c #FAEA00\", +\"& c #FBEC00\", +\"* c #FBED00\", +\"= c #FCEE00\", +\"- c #FAEB00\", +\"; c #F9E800\", +\"> c #F8E500\", +\", c #F6E000\", +\"' c #F4DB00\", +\") c #F1D500\", +\"! c #EFD000\", +\"~ c #B7CA00\", +\"{ c #BFD100\", +\"] c #C5D700\", +\"^ c #CBDB00\", +\"/ c #CFDF00\", +\"( c #D2E200\", +\"_ c #D4E400\", +\": c #D3E300\", +\"< c #D0E000\", +\"[ c #CCDD00\", +\"} c #C7D800\", +\"| c #C1D300\", +\"1 c #BACC00\", +\"2 c #B1C500\", +\"3 c #A8BC00\", +\"4 c #20A900\", +\"5 c #22AF00\", +\"6 c #24B500\", +\"7 c #26B900\", +\"8 c #27BC00\", +\"9 c #27BE00\", +\"0 c #28BF00\", +\"a c #27BD00\", +\"b c #26BA00\", +\"c c #25B600\", +\"d c #23B100\", +\"e c #21AB00\", +\"f c #1FA400\", +\"g c #1C9B00\", +\"h c #21AA00\", +\"i c #24B300\", +\"j c #25B800\", +\"k c #25B700\", +\"l c #24B400\", +\"m c #23B000\", +\"n c #1FA500\", +\"o c #1D9E00\", +\"p c #20A800\", +\"q c #21AC00\", +\"r c #23B200\", +\"s c #22AD00\", +\"t c #1D9F00\", +\"u c #20A700\", +\"v c #1EA100\", +\"w c #1C9C00\", +\"x c #1DA000\", +\"y c #1B9800\", +\"z c #1A9600\", +\"A c #1A9700\", +\"B c #1A9500\", +\"C c #199200\", +\"D c #189100\", +\"E c #178C00\", +\" \", +\" \", +\" \", +\" \", +\" ................... \", +\" .+@#$%&*=*&-;>,')!. \", +\" ................... \", +\" \", +\" ................... \", +\" .~{]^/(___:<[}|123. \", +\" ................... \", +\" \", +\" ................... \", +\" .45678909abcdefg. \", +\" .h5icj7jklmeno. \", +\" .pq5drrmshft. \", +\" .fu4h4pnvw. \", +\" .oxvxtwy. \", +\" .zAAzB. \", +\" .CCD. \", +\" .E. \", +\" . \", +\" \", +\" \"}; +" + 'xpm t) + "Image for the next feed button.")) + + +(defconst newsticker--update-image + (if (fboundp 'create-image) + (create-image "/* XPM */ +static char * update_xpm[] = { +\"24 24 37 1\", +\" c None\", +\". c #076D00\", +\"+ c #0A8600\", +\"@ c #0A8800\", +\"# c #098400\", +\"$ c #087200\", +\"% c #087900\", +\"& c #098500\", +\"* c #098100\", +\"= c #087600\", +\"- c #097E00\", +\"; c #097F00\", +\"> c #0A8700\", +\", c #0A8C00\", +\"' c #097C00\", +\") c #098300\", +\"! c #0A8900\", +\"~ c #0A8E00\", +\"{ c #0B9200\", +\"] c #087700\", +\"^ c #076E00\", +\"/ c #076C00\", +\"( c #076B00\", +\"_ c #076A00\", +\": c #076900\", +\"< c #076800\", +\"[ c #066700\", +\"} c #066500\", +\"| c #066400\", +\"1 c #066300\", +\"2 c #066600\", +\"3 c #066200\", +\"4 c #076700\", +\"5 c #065E00\", +\"6 c #066100\", +\"7 c #065F00\", +\"8 c #066000\", +\" \", +\" \", +\" \", +\" . +@@@+# \", +\" $% &@ +* \", +\" =-# ; \", +\" %*>, ' \", +\" ')!~{ = \", +\" ]$ \", +\" ^ ^ \", +\" . . \", +\" / ( \", +\" _ : \", +\" < [ \", +\" } | \", +\" [[ \", +\" 1 $.:23 \", +\" 3 4}35 \", +\" 6 655 \", +\" 76 85 55 \", +\" 5555555 5 \", +\" \", +\" \", +\" \"}; +" + 'xpm t) + "Image for the update button.")) + +(defconst newsticker--browse-image + (if (fboundp 'create-image) + (create-image "/* XPM */ +static char * visit_xpm[] = { +\"24 24 39 1\", +\" c None\", +\". c #000000\", +\"+ c #FFFFFF\", +\"@ c #00E63D\", +\"# c #00E83E\", +\"$ c #00E73D\", +\"% c #00E93E\", +\"& c #00E63C\", +\"* c #00E53C\", +\"= c #00E23B\", +\"- c #00E33B\", +\"; c #00E83D\", +\"> c #00E13A\", +\", c #00DD38\", +\"' c #00DE38\", +\") c #00E23A\", +\"! c #00E43C\", +\"~ c #00DF39\", +\"{ c #00DB37\", +\"] c #00D634\", +\"^ c #00D734\", +\"/ c #00E039\", +\"( c #00DC37\", +\"_ c #00D835\", +\": c #00D332\", +\"< c #00CD2F\", +\"[ c #00DB36\", +\"} c #00D433\", +\"| c #00CF30\", +\"1 c #00DA36\", +\"2 c #00D936\", +\"3 c #00D533\", +\"4 c #00D131\", +\"5 c #00CE2F\", +\"6 c #00CC2F\", +\"7 c #00CA2D\", +\"8 c #00C62B\", +\"9 c #00C52A\", +\"0 c #00BE27\", +\" \", +\" \", +\" . \", +\" .+. \", +\" .+++. \", +\" .++.++. \", +\" .++.@.++. \", +\" .++.##$.++. \", +\" .++.%%%#&.++. \", +\" .++.$%%%#*=.++. \", +\" .++.-@;##$*>,.++. \", +\" .++.')!&@@*=~{].++. \", +\" .++.^{~>---)/(_:<.++. \", +\" .++.^[,~/~'(_}|.++. \", +\" .++.]_1[12^:|.++. \", +\" .++.:}33:45.++. \", +\" .++.<5567.++. \", +\" .++.889.++. \", +\" .++.0.++. \", +\" .++.++. \", +\" .+++. \", +\" .+. \", +\" . \", +\" \"}; +" + 'xpm t) + "Image for the browse button.")) + + +(defvar newsticker-tool-bar-map + (if (featurep 'xemacs) + nil + (let ((tool-bar-map (make-sparse-keymap))) + (define-key tool-bar-map [newsticker-sep-1] + (list 'menu-item "--double-line")) + (define-key tool-bar-map [newsticker-browse-url] + (list 'menu-item "newsticker-browse-url" 'newsticker-browse-url + :visible t + :help "Browse URL for item at point" + :image newsticker--browse-image)) + (define-key tool-bar-map [newsticker-buffer-force-update] + (list 'menu-item "newsticker-buffer-force-update" + 'newsticker-buffer-force-update + :visible t + :help "Update newsticker buffer" + :image newsticker--update-image + :enable '(not newsticker--buffer-uptodate-p))) + (define-key tool-bar-map [newsticker-get-all-news] + (list 'menu-item "newsticker-get-all-news" 'newsticker-get-all-news + :visible t + :help "Get news for all feeds" + :image newsticker--get-all-image)) + (define-key tool-bar-map [newsticker-mark-item-at-point-as-read] + (list 'menu-item "newsticker-mark-item-at-point-as-read" + 'newsticker-mark-item-at-point-as-read + :visible t + :image newsticker--mark-read-image + :help "Mark current item as read" + :enable '(newsticker-item-not-old-p))) + (define-key tool-bar-map [newsticker-mark-item-at-point-as-immortal] + (list 'menu-item "newsticker-mark-item-at-point-as-immortal" + 'newsticker-mark-item-at-point-as-immortal + :visible t + :image newsticker--mark-immortal-image + :help "Mark current item as immortal" + :enable '(newsticker-item-not-immortal-p))) + (define-key tool-bar-map [newsticker-toggle-auto-narrow-to-feed] + (list 'menu-item "newsticker-toggle-auto-narrow-to-feed" + 'newsticker-toggle-auto-narrow-to-feed + :visible t + :help "Toggle visibility of other feeds" + :image newsticker--narrow-image)) + (define-key tool-bar-map [newsticker-next-feed] + (list 'menu-item "newsticker-next-feed" 'newsticker-next-feed + :visible t + :help "Go to next feed" + :image newsticker--next-feed-image + :enable '(newsticker-next-feed-available-p))) + (define-key tool-bar-map [newsticker-next-item] + (list 'menu-item "newsticker-next-item" 'newsticker-next-item + :visible t + :help "Go to next item" + :image newsticker--next-item-image + :enable '(newsticker-next-item-available-p))) + (define-key tool-bar-map [newsticker-previous-item] + (list 'menu-item "newsticker-previous-item" 'newsticker-previous-item + :visible t + :help "Go to previous item" + :image newsticker--previous-item-image + :enable '(newsticker-previous-item-available-p))) + (define-key tool-bar-map [newsticker-previous-feed] + (list 'menu-item "newsticker-previous-feed" 'newsticker-previous-feed + :visible t + :help "Go to previous feed" + :image newsticker--previous-feed-image + :enable '(newsticker-previous-feed-available-p))) + ;; standard icons / actions + (tool-bar-add-item "close" + 'newsticker-close-buffer + 'newsticker-close-buffer + :help "Close newsticker buffer") + (tool-bar-add-item "preferences" + 'newsticker-customize + 'newsticker-customize + :help "Customize newsticker") + tool-bar-map))) + +;; ====================================================================== +;;; Newsticker mode +;; ====================================================================== + +(define-derived-mode newsticker-mode fundamental-mode + "NewsTicker" + "Viewing RSS news feeds in Emacs." + (set (make-local-variable 'tool-bar-map) newsticker-tool-bar-map) + (set (make-local-variable 'imenu-sort-function) nil) + (set (make-local-variable 'scroll-conservatively) 999) + (setq imenu-create-index-function 'newsticker--imenu-create-index) + (setq imenu-default-goto-function 'newsticker--imenu-goto) + (setq buffer-read-only t) + (auto-fill-mode -1) ;; turn auto-fill off! + (font-lock-mode -1) ;; turn off font-lock!! + (set (make-local-variable 'font-lock-defaults) nil) + (set (make-local-variable 'line-move-ignore-invisible) t) + (setq mode-line-format + (list "-" + 'mode-line-mule-info + 'mode-line-modified + 'mode-line-frame-identification + " Newsticker (" + '(newsticker--buffer-uptodate-p + "up to date" + "NEED UPDATE") + ") -- " + '(:eval (newsticker--buffer-get-feed-title-at-point)) + ": " + '(:eval (newsticker--buffer-get-item-title-at-point)) + " %-")) + (unless newsticker-show-all-rss-elements + (add-to-invisibility-spec 'extra)) + (newsticker--buffer-set-uptodate nil)) + +;; refine its mode-map +(define-key newsticker-mode-map "sO" 'newsticker-show-old-items) +(define-key newsticker-mode-map "hO" 'newsticker-hide-old-items) +(define-key newsticker-mode-map "sa" 'newsticker-show-all-desc) +(define-key newsticker-mode-map "ha" 'newsticker-hide-all-desc) +(define-key newsticker-mode-map "sf" 'newsticker-show-feed-desc) +(define-key newsticker-mode-map "hf" 'newsticker-hide-feed-desc) +(define-key newsticker-mode-map "so" 'newsticker-show-old-item-desc) +(define-key newsticker-mode-map "ho" 'newsticker-hide-old-item-desc) +(define-key newsticker-mode-map "sn" 'newsticker-show-new-item-desc) +(define-key newsticker-mode-map "hn" 'newsticker-hide-new-item-desc) +(define-key newsticker-mode-map "se" 'newsticker-show-entry) +(define-key newsticker-mode-map "he" 'newsticker-hide-entry) +(define-key newsticker-mode-map "sx" 'newsticker-show-extra) +(define-key newsticker-mode-map "hx" 'newsticker-hide-extra) + +(define-key newsticker-mode-map " " 'scroll-up) +(define-key newsticker-mode-map "q" 'newsticker-close-buffer) +(define-key newsticker-mode-map "p" 'newsticker-previous-item) +(define-key newsticker-mode-map "P" 'newsticker-previous-new-item) +(define-key newsticker-mode-map "F" 'newsticker-previous-feed) +(define-key newsticker-mode-map "\t" 'newsticker-next-item) +(define-key newsticker-mode-map "n" 'newsticker-next-item) +(define-key newsticker-mode-map "N" 'newsticker-next-new-item) +(define-key newsticker-mode-map "f" 'newsticker-next-feed) +(define-key newsticker-mode-map "M" 'newsticker-mark-all-items-as-read) +(define-key newsticker-mode-map "m" + 'newsticker-mark-all-items-at-point-as-read) +(define-key newsticker-mode-map "o" 'newsticker-mark-item-at-point-as-read) +(define-key newsticker-mode-map "G" 'newsticker-get-all-news) +(define-key newsticker-mode-map "g" 'newsticker-get-news-at-point) +(define-key newsticker-mode-map "u" 'newsticker-buffer-update) +(define-key newsticker-mode-map "U" 'newsticker-buffer-force-update) +(define-key newsticker-mode-map "a" 'newsticker-add-url) + +(define-key newsticker-mode-map "i" + 'newsticker-mark-item-at-point-as-immortal) + +(define-key newsticker-mode-map "xf" 'newsticker-toggle-auto-narrow-to-feed) +(define-key newsticker-mode-map "xi" 'newsticker-toggle-auto-narrow-to-item) + +;; maps for the clickable portions +(defvar newsticker--url-keymap (make-sparse-keymap) + "Key map for click-able headings in the newsticker buffer.") +(define-key newsticker--url-keymap [mouse-2] + 'newsticker-mouse-browse-url) +(define-key newsticker--url-keymap "\n" + 'newsticker-browse-url) +(define-key newsticker--url-keymap "\C-m" + 'newsticker-browse-url) +(define-key newsticker--url-keymap [(control return)] + 'newsticker-handle-url) + +;; newsticker menu +(defvar newsticker-menu (make-sparse-keymap "Newsticker")) + +(define-key newsticker-menu [newsticker-browse-url] + '("Browse URL for item at point" . newsticker-browse-url)) +(define-key newsticker-menu [newsticker-separator-1] + '("--")) +(define-key newsticker-menu [newsticker-buffer-update] + '("Update buffer" . newsticker-buffer-update)) +(define-key newsticker-menu [newsticker-separator-2] + '("--")) +(define-key newsticker-menu [newsticker-get-all-news] + '("Get news from all feeds" . newsticker-get-all-news)) +(define-key newsticker-menu [newsticker-get-news-at-point] + '("Get news from feed at point" . newsticker-get-news-at-point)) +(define-key newsticker-menu [newsticker-separator-3] + '("--")) +(define-key newsticker-menu [newsticker-mark-all-items-as-read] + '("Mark all items as read" . newsticker-mark-all-items-as-read)) +(define-key newsticker-menu [newsticker-mark-all-items-at-point-as-read] + '("Mark all items in feed at point as read" . + newsticker-mark-all-items-at-point-as-read)) +(define-key newsticker-menu [newsticker-mark-item-at-point-as-read] + '("Mark item at point as read" . + newsticker-mark-item-at-point-as-read)) +(define-key newsticker-menu [newsticker-mark-item-at-point-as-immortal] + '("Toggle immortality for item at point" . + newsticker-mark-item-at-point-as-immortal)) +(define-key newsticker-menu [newsticker-separator-4] + '("--")) +(define-key newsticker-menu [newsticker-hide-old-items] + '("Hide old items" . newsticker-hide-old-items)) +(define-key newsticker-menu [newsticker-show-old-items] + '("Show old items" . newsticker-show-old-items)) +(define-key newsticker-menu [newsticker-next-item] + '("Go to next item" . newsticker-next-item)) +(define-key newsticker-menu [newsticker-previous-item] + '("Go to previous item" . newsticker-previous-item)) + +;; bind menu to mouse +(define-key newsticker-mode-map [down-mouse-3] newsticker-menu) +;; Put menu in menu-bar +(define-key newsticker-mode-map [menu-bar Newsticker] + (cons "Newsticker" newsticker-menu)) + + +;; ====================================================================== +;;; shortcuts +;; ====================================================================== +(defsubst newsticker--title (item) + "Return title of ITEM." + (nth 0 item)) +(defsubst newsticker--desc (item) + "Return description of ITEM." + (nth 1 item)) +(defsubst newsticker--link (item) + "Return link of ITEM." + (nth 2 item)) +(defsubst newsticker--time (item) + "Return time of ITEM." + (nth 3 item)) +(defsubst newsticker--age (item) + "Return age of ITEM." + (nth 4 item)) +(defsubst newsticker--pos (item) + "Return position/index of ITEM." + (nth 5 item)) +(defsubst newsticker--preformatted-contents (item) + "Return pre-formatted text of ITEM." + (nth 6 item)) +(defsubst newsticker--preformatted-title (item) + "Return pre-formatted title of ITEM." + (nth 7 item)) +(defsubst newsticker--extra (item) + "Return extra attributes of ITEM." + (nth 8 item)) +(defsubst newsticker--guid (item) + "Return guid of ITEM." + (let ((guid (assoc 'guid (newsticker--extra item)))) + (if (stringp guid) + guid + (car (xml-node-children guid))))) +(defsubst newsticker--enclosure (item) + "Return enclosure element of ITEM in the form \(...FIXME...\)or nil." + (let ((enclosure (assoc 'enclosure (newsticker--extra item)))) + (if enclosure + (xml-node-attributes enclosure)))) + +;; ====================================================================== +;;; User fun +;; ====================================================================== + +(defun newsticker-start (&optional do-not-complain-if-running) + "Start the newsticker. +Start the timers for display and retrieval. If the newsticker, i.e. the +timers, are running already a warning message is printed unless +DO-NOT-COMPLAIN-IF-RUNNING is not nil. +Run `newsticker-start-hook' if newsticker was not running already." + (interactive) + (let ((running (newsticker-running-p))) + ;; read old cache if it exists and newsticker is not running + (unless running + (let* ((coding-system-for-read 'utf-8) + (buf (find-file-noselect newsticker-cache-filename))) + (when buf + (set-buffer buf) + (goto-char (point-min)) + (condition-case nil + (setq newsticker--cache (read buf)) + (error + (message "Error while reading newsticker cache file!") + (setq newsticker--cache nil)))))) + ;; start retrieval timers -- for sake of simplicity we will start + ;; one timer for each feed + (mapc (lambda (item) + (let* ((feed-name (car item)) + (start-time (nth 2 item)) + (interval (or (nth 3 item) + newsticker-retrieval-interval)) + (timer (assoc (car item) + newsticker--retrieval-timer-list))) + (if timer + (or do-not-complain-if-running + (message "Timer for %s is running already!" + feed-name)) + (newsticker--debug-msg "Starting timer for %s: %s, %d" + feed-name start-time interval) + ;; do not repeat retrieval if interval not positive + (if (<= interval 0) + (setq interval nil)) + ;; Suddenly XEmacs doesn't like start-time 0 + (if (or (not start-time) + (and (numberp start-time) (= start-time 0))) + (setq start-time 1)) + (message "start-time %s" start-time) + (setq timer (run-at-time start-time interval + 'newsticker-get-news feed-name)) + (if interval + (add-to-list 'newsticker--retrieval-timer-list + (cons feed-name timer)))))) + (append newsticker-url-list-defaults newsticker-url-list)) + (unless running + (run-hooks 'newsticker-start-hook) + (message "Newsticker started!")))) + +(defun newsticker-start-ticker () + "Start newsticker's ticker (but not the news retrieval. +Start display timer for the actual ticker if wanted and not +running already." + (interactive) + (if (and (> newsticker-display-interval 0) + (not newsticker--display-timer)) + (setq newsticker--display-timer + (run-at-time newsticker-display-interval + newsticker-display-interval + 'newsticker--display-tick)))) + +(defun newsticker-stop () + "Stop the newsticker and the newsticker-ticker. +Cancel the timers for display and retrieval. Run `newsticker-stop-hook' +if newsticker has been running." + (interactive) + (newsticker--cache-update t) + (newsticker-stop-ticker) + (when (newsticker-running-p) + (mapc (lambda (name-and-timer) + (cancel-timer (cdr name-and-timer))) + newsticker--retrieval-timer-list) + (setq newsticker--retrieval-timer-list nil) + (run-hooks 'newsticker-stop-hook) + (message "Newsticker stopped!"))) + +(defun newsticker-stop-ticker () + "Stop newsticker's ticker (but not the news retrieval)." + (interactive) + (when newsticker--display-timer + (cancel-timer newsticker--display-timer) + (setq newsticker--display-timer nil))) + +;; the functions we need for retrieval and display +(defun newsticker-show-news () + "Switch to newsticker buffer. You may want to bind this to a key." + (interactive) + (newsticker-start t) ;; will start only if not running + (newsticker-buffer-update) + (switch-to-buffer "*newsticker*")) + +(defun newsticker-buffer-force-update () + "Update the newsticker buffer, even if not necessary." + (interactive) + (newsticker-buffer-update t)) + +(defun newsticker-buffer-update (&optional force) + "Update the *newsticker* buffer. +Unless FORCE is t this is donly only if necessary, i.e. when the +*newsticker* buffer is not up-to-date." + (interactive) + ;; bring cache data into proper order.... + (newsticker--cache-sort) + ;; fill buffer + (save-excursion + (let ((buf (get-buffer "*newsticker*"))) + (if buf + (switch-to-buffer buf) + (switch-to-buffer (get-buffer-create "*newsticker*")) + (newsticker--buffer-set-uptodate nil))) + (when (or force + (not newsticker--buffer-uptodate-p)) + (message "Preparing newsticker buffer...") + (setq buffer-undo-list t) + (let ((inhibit-read-only t)) + (set-buffer-modified-p nil) + (erase-buffer) + (newsticker-mode) + ;; Emacs 21.3.50 does not care if we turn off auto-fill in the + ;; definition of newsticker-mode, so we do it here (again) + (auto-fill-mode -1) + + (set-buffer-file-coding-system 'utf-8) + + (if newsticker-use-full-width + (set (make-local-variable 'fill-column) (1- (window-width)))) + (newsticker--buffer-insert-all-items) + + ;; FIXME: needed for methods buffer in ecb + ;; (set-visited-file-name "*newsticker*") + + (set-buffer-modified-p nil) + (newsticker-hide-all-desc) + (if newsticker-hide-old-items-in-newsticker-buffer + (newsticker-hide-old-items)) + (if newsticker-show-descriptions-of-new-items + (newsticker-show-new-item-desc)) + ) + (message "")) + (newsticker--buffer-set-uptodate t) + (run-hooks 'newsticker-buffer-change-hook))) + +(defun newsticker-get-all-news () + "Launch retrieval of news from all configured newsticker sites. +This does NOT start the retrieval timers." + (interactive) + ;; launch retrieval of news + (mapc (lambda (item) + (newsticker-get-news (car item))) + (append newsticker-url-list-defaults newsticker-url-list))) + +(defun newsticker-get-news-at-point () + "Launch retrieval of news for the feed point is in. +This does NOT start the retrieval timers." + (interactive) + ;; launch retrieval of news + (let ((feed (get-text-property (point) 'feed))) + (when feed + (newsticker--debug-msg "Getting news for %s" (symbol-name feed)) + (newsticker-get-news (symbol-name feed))))) + +(defun newsticker-add-url (url name) + "Add given URL under given NAME to `newsticker-url-list'. +If URL is nil it is searched at point." + (interactive + (list + (read-string "URL: " + (save-excursion + (end-of-line) + (and + (re-search-backward + "http://" + (if (> (point) (+ (point-min) 100)) + (- (point) 100) + (point-min)) + t) + (re-search-forward + "http://[-a-zA-Z0-9&/_.]*" + (if (< (point) (- (point-max) 200)) + (+ (point) 200) + (point-max)) + t) + (buffer-substring-no-properties (match-beginning 0) + (match-end 0))))) + (read-string "Name: "))) + (add-to-list 'newsticker-url-list (list name url nil nil nil) t) + (customize-variable 'newsticker-url-list)) + +(defun newsticker-w3m-show-inline-images () + "Show inline images in visible text ranges. +In-line images in invisible text ranges are hidden. This function +calls `w3m-toggle-inline-image'. It works only if +`newsticker-html-renderer' is set to `w3m-region'" + (interactive) + (if (eq newsticker-html-renderer 'w3m-region) + (let ((inhibit-read-only t)) + (save-excursion + (save-restriction + (widen) + (goto-char (point-min)) + (let ((pos (point))) + (while pos + (setq pos (next-single-property-change pos 'w3m-image)) + (when pos + (goto-char pos) + (when (get-text-property pos 'w3m-image) + (let ((invis (newsticker--lists-intersect-p + (get-text-property (1- (point)) 'invisible) + buffer-invisibility-spec))) + (if invis + (w3m-remove-image + pos (next-single-property-change pos 'w3m-image)) + (w3m-toggle-inline-image t)))))))))))) + +;; ====================================================================== +;;; keymap stuff +;; ====================================================================== +(defun newsticker-close-buffer () + "Close the newsticker buffer." + (interactive) + (newsticker--cache-update t) + (bury-buffer)) + +(defun newsticker-next-new-item (&optional do-not-wrap-at-eob) + "Go to next new news item. +If no new item is found behind point, search is continued at +beginning of buffer unless optional argument DO-NOT-WRAP-AT-EOB +is non-nil." + (interactive) + (widen) + (let ((go-ahead t)) + (while go-ahead + (unless (newsticker--buffer-goto '(item) 'new) + ;; found nothing -- wrap + (unless do-not-wrap-at-eob + (goto-char (point-min)) + (newsticker-next-new-item t)) + (setq go-ahead nil)) + (unless (newsticker--lists-intersect-p + (get-text-property (point) 'invisible) + buffer-invisibility-spec) + ;; this item is invisible -- continue search + (setq go-ahead nil)))) + (run-hooks 'newsticker-select-item-hook) + (point)) + +(defun newsticker-previous-new-item (&optional do-not-wrap-at-bob) + "Go to previous new news item. +If no new item is found before point, search is continued at +beginning of buffer unless optional argument DO-NOT-WRAP-AT-BOB +is non-nil." + (interactive) + (widen) + (let ((go-ahead t)) + (while go-ahead + (unless (newsticker--buffer-goto '(item) 'new t) + (unless do-not-wrap-at-bob + (goto-char (point-max)) + (newsticker--buffer-goto '(item) 'new t))) + (unless (newsticker--lists-intersect-p + (get-text-property (point) 'invisible) + buffer-invisibility-spec) + (setq go-ahead nil)))) + (run-hooks 'newsticker-select-item-hook) + (point)) + +(defun newsticker-next-item (&optional do-not-wrap-at-eob) + "Go to next news item. +Return new buffer position. +If no item is found below point, search is continued at beginning +of buffer unless optional argument DO-NOT-WRAP-AT-EOB is +non-nil." + (interactive) + (widen) + (let ((go-ahead t) + (search-list '(item))) + (if newsticker--auto-narrow-to-item + (setq search-list '(item feed))) + (while go-ahead + (unless (newsticker--buffer-goto search-list) + ;; found nothing -- wrap + (unless do-not-wrap-at-eob + (goto-char (point-min))) + (setq go-ahead nil)) + (unless (newsticker--lists-intersect-p + (get-text-property (point) 'invisible) + buffer-invisibility-spec) + (setq go-ahead nil)))) + (run-hooks 'newsticker-select-item-hook) + (point)) + +(defun newsticker-previous-item (&optional do-not-wrap-at-bob) + "Go to previous news item. +Return new buffer position. +If no item is found before point, search is continued at +beginning of buffer unless optional argument DO-NOT-WRAP-AT-BOB +is non-nil." + (interactive) + (widen) + (let ((go-ahead t) + (search-list '(item))) + (if newsticker--auto-narrow-to-item + (setq search-list '(item feed))) + (when (bobp) + (unless do-not-wrap-at-bob + (goto-char (point-max)))) + (while go-ahead + (if (newsticker--buffer-goto search-list nil t) + (unless (newsticker--lists-intersect-p + (get-text-property (point) 'invisible) + buffer-invisibility-spec) + (setq go-ahead nil)) + (goto-char (point-min)) + (setq go-ahead nil)))) + (run-hooks 'newsticker-select-item-hook) + (point)) + +(defun newsticker-next-feed () + "Go to next news feed. +Return new buffer position." + (interactive) + (widen) + (newsticker--buffer-goto '(feed)) + (run-hooks 'newsticker-select-feed-hook) + (point)) + +(defun newsticker-previous-feed () + "Go to previous news feed. +Return new buffer position." + (interactive) + (widen) + (newsticker--buffer-goto '(feed) nil t) + (run-hooks 'newsticker-select-feed-hook) + (point)) + +(defun newsticker-mark-all-items-at-point-as-read () + "Mark all items as read and clear ticker contents." + (interactive) + (when (or newsticker--buffer-uptodate-p + (y-or-n-p + "Buffer is not up to date -- really mark items as read? ")) + (let ((feed (get-text-property (point) 'feed)) + (pos (point))) + (when feed + (message "Marking all items as read for %s" (symbol-name feed)) + (newsticker--cache-replace-age newsticker--cache feed 'new 'old) + (newsticker--cache-replace-age newsticker--cache feed 'obsolete 'old) + (newsticker--cache-update) + (newsticker--buffer-set-uptodate nil) + (newsticker--ticker-text-setup) + (newsticker-buffer-update) + ;; go back to where we came frome + (goto-char pos) + (end-of-line) + (newsticker--buffer-goto '(feed) nil t))))) + +(defun newsticker-mark-item-at-point-as-read (&optional respect-immortality) + "Mark item at point as read. +If optional argument RESPECT-IMMORTALITY is not nil immortal items do +not get changed." + (interactive) + (when (or newsticker--buffer-uptodate-p + (y-or-n-p + "Buffer is not up to date -- really mark this item as read? ")) + (let ((feed (get-text-property (point) 'feed)) + (item nil)) + (when feed + (save-excursion + (newsticker--buffer-beginning-of-item) + (let ((inhibit-read-only t) + (age (get-text-property (point) 'nt-age)) + (title (get-text-property (point) 'nt-title)) + (guid (get-text-property (point) 'nt-guid)) + (nt-desc (get-text-property (point) 'nt-desc)) + (pos (save-excursion (newsticker--buffer-end-of-item)))) + (when (or (eq age 'new) + (eq age 'obsolete) + (and (eq age 'immortal) + (not respect-immortality))) + ;; find item + (setq item (newsticker--cache-contains newsticker--cache + feed title nt-desc + nil nil guid)) + ;; mark as old + (when item + (setcar (nthcdr 4 item) 'old) + (newsticker--do-forget-preformatted item)) + ;; clean up ticker + (if (or (and (eq age 'new) + newsticker-hide-immortal-items-in-echo-area) + (and (memq age '(old immortal)) + (not + (eq newsticker-hide-old-items-in-newsticker-buffer + newsticker-hide-immortal-items-in-echo-area)))) + (newsticker--ticker-text-remove feed title)) + ;; set faces etc. + (save-excursion + (save-restriction + (widen) + (put-text-property (point) pos 'nt-age 'old) + (newsticker--buffer-set-faces (point) pos))) + (set-buffer-modified-p nil)))) + ;; move forward + (newsticker-next-item t))))) + +(defun newsticker-mark-item-at-point-as-immortal () + "Mark item at point as read." + (interactive) + (when (or newsticker--buffer-uptodate-p + (y-or-n-p + "Buffer is not up to date -- really mark this item as read? ")) + (let ((feed (get-text-property (point) 'feed)) + (item nil)) + (when feed + (save-excursion + (newsticker--buffer-beginning-of-item) + (let ((inhibit-read-only t) + (oldage (get-text-property (point) 'nt-age)) + (title (get-text-property (point) 'nt-title)) + (guid (get-text-property (point) 'nt-guid)) + (pos (save-excursion (newsticker--buffer-end-of-item)))) + (let ((newage 'immortal)) + (if (eq oldage 'immortal) + (setq newage 'old)) + (setq item (newsticker--cache-contains newsticker--cache + feed title nil nil nil + guid)) + ;; change age + (when item + (setcar (nthcdr 4 item) newage) + (newsticker--do-forget-preformatted item)) + (if (or (and (eq newage 'immortal) + newsticker-hide-immortal-items-in-echo-area) + (and (eq newage 'obsolete) + newsticker-hide-obsolete-items-in-echo-area) + (and (eq oldage 'immortal) + (not + (eq newsticker-hide-old-items-in-newsticker-buffer + newsticker-hide-immortal-items-in-echo-area)))) + (newsticker--ticker-text-remove feed title) + (newsticker--ticker-text-setup)) + (save-excursion + (save-restriction + (widen) + (put-text-property (point) pos 'nt-age newage) + (if (eq newage 'immortal) + (put-text-property (point) pos 'nt-age 'immortal) + (put-text-property (point) pos 'nt-age 'old)) + (newsticker--buffer-set-faces (point) pos)))))) + (if item + (newsticker-next-item t)))))) + +(defun newsticker-mark-all-items-as-read () + "Mark all items as read and clear ticker contents." + (interactive) + (when (or newsticker--buffer-uptodate-p + (y-or-n-p + "Buffer is not up to date -- really mark items as read? ")) + (newsticker--cache-replace-age newsticker--cache 'any 'new 'old) + (newsticker--buffer-set-uptodate nil) + (newsticker--ticker-text-setup) + (newsticker--cache-update) + (newsticker-buffer-update))) + +(defun newsticker-hide-extra () + "Hide the extra elements of items." + (interactive) + (newsticker--buffer-hideshow 'extra nil) + (newsticker--buffer-redraw)) + +(defun newsticker-show-extra () + "Show the extra elements of items." + (interactive) + (newsticker--buffer-hideshow 'extra t) + (newsticker--buffer-redraw)) + +(defun newsticker-hide-old-item-desc () + "Hide the description of old items." + (interactive) + (newsticker--buffer-hideshow 'desc-old nil) + (newsticker--buffer-redraw)) + +(defun newsticker-show-old-item-desc () + "Show the description of old items." + (interactive) + (newsticker--buffer-hideshow 'item-old t) + (newsticker--buffer-hideshow 'desc-old t) + (newsticker--buffer-redraw)) + +(defun newsticker-hide-new-item-desc () + "Hide the description of new items." + (interactive) + (newsticker--buffer-hideshow 'desc-new nil) + (newsticker--buffer-hideshow 'desc-immortal nil) + (newsticker--buffer-hideshow 'desc-obsolete nil) + (newsticker--buffer-redraw)) + +(defun newsticker-show-new-item-desc () + "Show the description of new items." + (interactive) + (newsticker--buffer-hideshow 'desc-new t) + (newsticker--buffer-hideshow 'desc-immortal t) + (newsticker--buffer-hideshow 'desc-obsolete t) + (newsticker--buffer-redraw)) + +(defun newsticker-hide-feed-desc () + "Hide the description of feeds." + (interactive) + (newsticker--buffer-hideshow 'desc-feed nil) + (newsticker--buffer-redraw)) + +(defun newsticker-show-feed-desc () + "Show the description of old items." + (interactive) + (newsticker--buffer-hideshow 'desc-feed t) + (newsticker--buffer-redraw)) + +(defun newsticker-hide-all-desc () + "Hide the descriptions of feeds and all items." + (interactive) + (newsticker--buffer-hideshow 'desc-feed nil) + (newsticker--buffer-hideshow 'desc-immortal nil) + (newsticker--buffer-hideshow 'desc-obsolete nil) + (newsticker--buffer-hideshow 'desc-new nil) + (newsticker--buffer-hideshow 'desc-old nil) + (newsticker--buffer-redraw)) + +(defun newsticker-show-all-desc () + "Show the descriptions of feeds and all items." + (interactive) + (newsticker--buffer-hideshow 'desc-feed t) + (newsticker--buffer-hideshow 'desc-immortal t) + (newsticker--buffer-hideshow 'desc-obsolete t) + (newsticker--buffer-hideshow 'desc-new t) + (newsticker--buffer-hideshow 'desc-old t) + (newsticker--buffer-redraw)) + +(defun newsticker-hide-old-items () + "Hide old items." + (interactive) + (newsticker--buffer-hideshow 'desc-old nil) + (newsticker--buffer-hideshow 'item-old nil) + (newsticker--buffer-redraw)) + +(defun newsticker-show-old-items () + "Show old items." + (interactive) + (newsticker--buffer-hideshow 'desc-old t) + (newsticker--buffer-hideshow 'item-old t) + (newsticker--buffer-redraw)) + +(defun newsticker-hide-entry () + "Hide description of entry at point." + (interactive) + (save-excursion + (let* (pos1 pos2 + (inhibit-read-only t) + inv-prop org-inv-prop + is-invisible) + (newsticker--buffer-beginning-of-item) + (newsticker--buffer-goto '(desc)) + (setq pos1 (max (point-min) (1- (point)))) + (newsticker--buffer-goto '(extra feed item)) + (setq pos2 (max (point-min) (1- (point)))) + (setq inv-prop (get-text-property pos1 'invisible)) + (setq org-inv-prop (get-text-property pos1 'org-invisible)) + (cond ((eq inv-prop t) + ;; do nothing + ) + ((eq org-inv-prop nil) + (add-text-properties pos1 pos2 (list 'invisible t + 'org-invisible inv-prop))) + (t + ;; toggle + (add-text-properties pos1 pos2 (list 'invisible org-inv-prop)) + (remove-text-properties pos1 pos2 '(org-invisible)))))) + (newsticker--buffer-redraw)) + +(defun newsticker-show-entry () + "Show description of entry at point." + (interactive) + (save-excursion + (let* (pos1 pos2 + (inhibit-read-only t) + inv-prop org-inv-prop + is-invisible) + (newsticker--buffer-beginning-of-item) + (newsticker--buffer-goto '(desc)) + (setq pos1 (max (point-min) (1- (point)))) + (newsticker--buffer-goto '(extra feed item)) + (setq pos2 (max (point-min) (1- (point)))) + (setq inv-prop (get-text-property pos1 'invisible)) + (setq org-inv-prop (get-text-property pos1 'org-invisible)) + (cond ((eq org-inv-prop nil) + (add-text-properties pos1 pos2 (list 'invisible nil + 'org-invisible inv-prop))) + (t + ;; toggle + (add-text-properties pos1 pos2 (list 'invisible org-inv-prop)) + (remove-text-properties pos1 pos2 '(org-invisible)))))) + (newsticker--buffer-redraw)) + +(defun newsticker-toggle-auto-narrow-to-feed () + "Toggle narrowing to current news feed. +If auto-narrowing is active, only news item of the current feed +are visible." + (interactive) + (newsticker-set-auto-narrow-to-feed (not newsticker--auto-narrow-to-feed))) + +(defun newsticker-set-auto-narrow-to-feed (value) + "Turn narrowing to current news feed on or off. +If VALUE is nil, auto-narrowing is turned off, otherwise it is turned on." + (interactive) + (setq newsticker--auto-narrow-to-item nil) + (setq newsticker--auto-narrow-to-feed value) + (widen) + (run-hooks 'newsticker-narrow-hook)) + +(defun newsticker-toggle-auto-narrow-to-item () + "Toggle narrowing to current news item. +If auto-narrowing is active, only one item of the current feed +is visible." + (interactive) + (newsticker-set-auto-narrow-to-item (not newsticker--auto-narrow-to-item))) + +(defun newsticker-set-auto-narrow-to-item (value) + "Turn narrowing to current news item on or off. +If VALUE is nil, auto-narrowing is turned off, otherwise it is turned on." + (interactive) + (setq newsticker--auto-narrow-to-feed nil) + (setq newsticker--auto-narrow-to-item value) + (widen) + (run-hooks 'newsticker-narrow-hook)) + +(defun newsticker-customize () + "Open the newsticker customization group." + (interactive) + (customize-group "newsticker")) + +(defun newsticker-next-feed-available-p () + "Return t if position is before last feed, nil otherwise." + (save-excursion + (let ((p (point))) + (newsticker--buffer-goto '(feed)) + (not (= p (point)))))) + +(defun newsticker-previous-feed-available-p () + "Return t if position is behind first feed, nil otherwise." + (save-excursion + (let ((p (point))) + (newsticker--buffer-goto '(feed) nil t) + (not (= p (point)))))) + +(defun newsticker-next-item-available-p () + "Return t if position is before last feed, nil otherwise." + (save-excursion + (catch 'result + (while (< (point) (point-max)) + (unless (newsticker--buffer-goto '(item)) + (throw 'result nil)) + (unless (newsticker--lists-intersect-p + (get-text-property (point) 'invisible) + buffer-invisibility-spec) + (throw 'result t)))))) + +(defun newsticker-previous-item-available-p () + "Return t if position is behind first item, nil otherwise." + (save-excursion + (catch 'result + (while (> (point) (point-min)) + (unless (newsticker--buffer-goto '(item) nil t) + (throw 'result nil)) + (unless (newsticker--lists-intersect-p + (get-text-property (point) 'invisible) + buffer-invisibility-spec) + (throw 'result t)))))) + +(defun newsticker-item-not-old-p () + "Return t if there is an item at point which is not old, nil otherwise." + (when (get-text-property (point) 'feed) + (save-excursion + (newsticker--buffer-beginning-of-item) + (let ((age (get-text-property (point) 'nt-age))) + (and (memq age '(new immortal obsolete)) t))))) + +(defun newsticker-item-not-immortal-p () + "Return t if there is an item at point which is not immortal, nil otherwise." + (when (get-text-property (point) 'feed) + (save-excursion + (newsticker--buffer-beginning-of-item) + (let ((age (get-text-property (point) 'nt-age))) + (and (memq age '(new old obsolete)) t))))) + +;; ====================================================================== +;;; local stuff +;; ====================================================================== +(defun newsticker-running-p () + "Check whether newsticker is running. +Return t if newsticker is running, nil otherwise. Newsticker is +considered to be running if the newsticker timer list is not empty." + (> (length newsticker--retrieval-timer-list) 0)) + +(defun newsticker-ticker-running-p () + "Check whether newsticker's actual ticker is running. +Return t if ticker is running, nil otherwise. Newsticker is +considered to be running if the newsticker timer list is not +empty." + (timerp newsticker--display-timer)) + +;; ====================================================================== +;;; local stuff +;; ====================================================================== +(defun newsticker-get-news (feed-name) + "Get news from the site FEED-NAME and load feed logo. +FEED-NAME must be a string which occurs as the label (i.e. the first element) +in an element of `newsticker-url-list' or `newsticker-url-list-defaults'." + (newsticker--debug-msg "%s: Getting news for %s" + (format-time-string "%A, %H:%M" (current-time)) + feed-name) + (let* ((buffername (concat " *newsticker-wget-" feed-name "*")) + (item (or (assoc feed-name newsticker-url-list) + (assoc feed-name newsticker-url-list-defaults) + (error + "Cannot get news for %s: Check newsticker-url-list" + feed-name))) + (url (cadr item)) + (wget-arguments (or (car (cdr (cdr (cdr (cdr item))))) + newsticker-wget-arguments))) + (save-excursion + (set-buffer (get-buffer-create buffername)) + (erase-buffer) + ;; throw an error if there is an old wget-process around + (if (get-process feed-name) + (error "Another wget-process is running for %s" feed-name)) + ;; start wget + (let* ((args (append wget-arguments (list url))) + (proc (apply 'start-process feed-name buffername + newsticker-wget-name args))) + (set-process-coding-system proc 'no-conversion 'no-conversion) + (set-process-sentinel proc 'newsticker--sentinel))))) + + +(defun newsticker-mouse-browse-url (event) + "Call `browse-url' for the link of the item at which the EVENT occurred." + (interactive "e") + (save-excursion + (switch-to-buffer (window-buffer (posn-window (event-end event)))) + (let ((url (get-text-property (posn-point (event-end event)) + 'nt-link))) + (when url + (browse-url url) + (save-excursion + (goto-char (posn-point (event-end event))) + (if newsticker-automatically-mark-visited-items-as-old + (newsticker-mark-item-at-point-as-read t))))))) + +(defun newsticker-browse-url () + "Call `browse-url' for the link of the item at point." + (interactive) + (let ((url (get-text-property (point) 'nt-link))) + (when url + (browse-url url) + (if newsticker-automatically-mark-visited-items-as-old + (newsticker-mark-item-at-point-as-read t))))) + +(defvar newsticker-open-url-history + '("wget" "xmms" "realplay") + "...") + +(defun newsticker-handle-url () + "Ask for a program to open the link of the item at point." + (interactive) + (let ((url (get-text-property (point) 'nt-link))) + (when url + (let ((prog (read-string "Open url with: " nil + 'newsticker-open-url-history))) + (when prog + (message "%s %s" prog url) + (start-process prog prog prog url) + (if newsticker-automatically-mark-visited-items-as-old + (newsticker-mark-item-at-point-as-read t))))))) + +(defun newsticker--sentinel (process event) + "Sentinel for extracting news titles from an RDF buffer. +Argument PROCESS is the process which has just changed its state. +Argument EVENT tells what has happened to the process." + (let* ((p-status (process-status process)) + (exit-status (process-exit-status process)) + (time (current-time)) + (name (process-name process)) + (name-symbol (intern name)) + (something-was-added nil)) + ;; catch known errors (zombie processes, rubbish-xml etc. + ;; if an error occurs the news feed is not updated! + (catch 'oops + (unless (and (eq p-status 'exit) + (= exit-status 0)) + (setq newsticker--cache + (newsticker--cache-add + newsticker--cache + name-symbol + newsticker--error-headline + (format + (concat "%s: Newsticker could not retrieve news from %s.\n" + "Return status: `%s'\n" + "Command was `%s'") + (format-time-string "%A, %H:%M" (current-time)) + name event (process-command process)) + "" + (current-time) + 'new + 0 nil)) + (message "%s: Error while retrieving news from %s" + (format-time-string "%A, %H:%M" (current-time)) + (process-name process)) + (throw 'oops nil)) + (let* ((coding-system nil) + (node-list + (save-current-buffer + (set-buffer (process-buffer process)) + ;; a very very dirty workaround to overcome the + ;; problems with the newest (20030621) xml.el: + ;; remove all unnecessary whitespace + (goto-char (point-min)) + (while (re-search-forward ">[ \t\r\n]+<" nil t) + (replace-match "><" nil t)) + ;; and another brutal workaround (20031105)! For some + ;; reason the xml parser does not like the colon in the + ;; doctype name "rdf:RDF" + (goto-char (point-min)) + (if (re-search-forward "" nil t) + (replace-match "" nil t)) + ;; And another one (20050618)! (Fixed in GNU Emacs 22.0.50.18) + ;; Remove comments to avoid this xml-parsing bug: + ;; "XML files can have only one toplevel tag" + (goto-char (point-min)) + (while (search-forward "" nil t) + (error "Can't find end of comment")) + (delete-region start (point)))) + ;; And another one (20050702)! If description is HTML + ;; encoded and starts with a `<', wrap the whole + ;; description in a CDATA expression. This happened for + ;; http://www.thefreedictionary.com/_/WoD/rss.aspx?type=quote + (goto-char (point-min)) + (while (re-search-forward + "\\(" nil t) + (replace-match + "")) + ;; + (set-buffer-modified-p nil) + (goto-char (point-min)) + (if (re-search-forward "encoding=\"\\([^\"]+\\)\"" + nil t) + (setq coding-system (intern + (downcase(match-string 1))))) + (condition-case errordata + ;; The xml parser might fail + ;; or the xml might be bugged + (xml-parse-region (point-min) (point-max)) + (error (message "Could not parse %s: %s" + (buffer-name) (cadr errordata)) + (throw 'oops nil))))) + (topnode (car node-list)) + (channelnode (car (xml-get-children topnode 'channel))) + (imageurl nil) + (position 0)) + ;; mark all items as obsolete + (newsticker--cache-replace-age newsticker--cache + name-symbol + 'new 'obsolete-new) + (newsticker--cache-replace-age newsticker--cache + name-symbol + 'old 'obsolete-old) + (newsticker--cache-replace-age newsticker--cache + name-symbol + 'feed 'obsolete-old) + ;; gather the news + (if (eq (xml-node-name topnode) 'rss) + ;; this is RSS 0.91 or something similar + ;; all items are inside the channel node + (setq topnode channelnode)) + (setq imageurl + (car (xml-node-children + (car (xml-get-children + (car (xml-get-children + topnode + 'image)) + 'url))))) + (let ((title (or (car (xml-node-children (car (xml-get-children + channelnode 'title)))) + "[untitled]")) + (link (or (car (xml-node-children (car (xml-get-children + channelnode 'link)))) + "")) + (desc (or (car (xml-node-children (car (xml-get-children + channelnode + 'content:encoded)))) + (car (xml-node-children (car (xml-get-children + channelnode + 'description)))) + "[No description available]")) + (old-item nil)) + ;; check coding system + (setq coding-system + (condition-case nil + (check-coding-system coding-system) + (coding-system-error + (message "newsticker.el: %s %s %s %s" + "ignoring coding system " + coding-system + " for " + name) + nil))) + ;; apply coding system + (when coding-system + (setq title (newsticker--decode-coding-string title coding-system)) + (if desc + (setq desc (newsticker--decode-coding-string desc + coding-system))) + (setq link (newsticker--decode-coding-string link coding-system))) + ;; decode numeric entities + (setq title (newsticker--decode-numeric-entities title)) + (setq desc (newsticker--decode-numeric-entities desc)) + (setq link (newsticker--decode-numeric-entities link)) + ;; remove whitespace from title, desc, and link + (setq title (newsticker--remove-whitespace title)) + (setq desc (newsticker--remove-whitespace desc)) + (setq link (newsticker--remove-whitespace link)) + + ;; handle the feed itself + (unless (newsticker--cache-contains newsticker--cache + name-symbol title + desc link 'feed) + (setq something-was-added t)) + (setq newsticker--cache + (newsticker--cache-add + newsticker--cache name-symbol + title desc link time 'feed position + (xml-node-children channelnode) + 'feed time)) + ;; gather all items for this feed + (mapc (lambda (node) + (when (eq (xml-node-name node) 'item) + (setq position (1+ position)) + (setq title (or (car (xml-node-children + (car (xml-get-children + node 'title)))) + "[untitled]")) + (setq link (or (car (xml-node-children + (car (xml-get-children + node 'link)))) + "")) + (setq desc (or + (car (xml-node-children + (car (xml-get-children + node 'content:encoded)))) + (car (xml-node-children + (car (xml-get-children + node 'description)))))) + ;; use pubDate value if present + (setq time (or (newsticker--decode-rfc822-date + (car (xml-node-children + (car (xml-get-children + node 'pubDate))))) + time)) + ;; use dc:date value if present + (setq time (or (newsticker--decode-iso8601-date + (car (xml-node-children + (car (xml-get-children + node 'dc:date))))) + time)) + ;; It happened that the title or description + ;; contained evil HTML code that confused the + ;; xml parser. Therefore: + (unless (stringp title) + (setq title (prin1-to-string title))) + (unless (or (stringp desc) (not desc)) + (setq desc (prin1-to-string desc))) + ;; ignore items with empty title AND empty desc + (when (or (> (length title) 0) + (> (length desc) 0)) + ;; apply coding system + (when coding-system + (setq title (newsticker--decode-coding-string + title coding-system)) + (if desc + (setq desc (newsticker--decode-coding-string desc + coding-system))) + (setq link (newsticker--decode-coding-string + link coding-system))) + ;; decode numeric entities + (setq title (newsticker--decode-numeric-entities title)) + (when desc + (setq desc (newsticker--decode-numeric-entities desc))) + (setq link (newsticker--decode-numeric-entities link)) + ;; remove whitespace from title, desc, and link + (setq title (newsticker--remove-whitespace title)) + (setq desc (newsticker--remove-whitespace desc)) + (setq link (newsticker--remove-whitespace link)) + ;; add data to cache + ;; do we have this item already? + (let* ((tguid (assoc 'guid (xml-node-children node))) + (guid (if (stringp tguid) + tguid + (car (xml-node-children tguid))))) + ;;(message "guid=%s" guid) + (setq old-item + (newsticker--cache-contains newsticker--cache + name-symbol title + desc link nil guid))) + ;; add this item, or mark it as old, or do nothing + (let ((age1 'new) + (age2 'old) + (item-new-p nil)) + (if old-item + (let ((prev-age (newsticker--age old-item))) + (unless + newsticker-automatically-mark-items-as-old + (if (eq prev-age 'obsolete-old) + (setq age2 'old) + (setq age2 'new))) + (if (eq prev-age 'immortal) + (setq age2 'immortal))) + ;; item was not there + (setq item-new-p t) + (setq something-was-added t)) + (setq newsticker--cache + (newsticker--cache-add + newsticker--cache name-symbol title desc link + time age1 position (xml-node-children node) + age2)) + (when item-new-p + (let ((item (newsticker--cache-contains + newsticker--cache + name-symbol title + desc link nil))) + (if newsticker-auto-mark-filter + (newsticker--run-auto-mark-filter name item)) + (run-hook-with-args + 'newsticker-new-item-functions name item))))))) + (xml-get-children topnode 'item))) + ;; Remove those old items from cache which have been removed from + ;; the feed + (newsticker--cache-replace-age newsticker--cache + name-symbol 'obsolete-old 'deleteme) + (newsticker--cache-remove newsticker--cache name-symbol + 'deleteme) + ;; Remove those new items from cache which have been removed from + ;; the feed. Or keep them as `obsolete' + (if (not newsticker-keep-obsolete-items) + (newsticker--cache-remove newsticker--cache + name-symbol 'obsolete-new) + (setq newsticker--cache + (newsticker--cache-mark-expired + newsticker--cache name-symbol 'obsolete 'obsolete-expired + newsticker-obsolete-item-max-age)) + (newsticker--cache-remove newsticker--cache + name-symbol 'obsolete-expired) + (newsticker--cache-replace-age newsticker--cache + name-symbol 'obsolete-new + 'obsolete)) + ;; bring cache data into proper order.... + ;; (newsticker--cache-sort) + ;; setup scrollable text + (newsticker--ticker-text-setup) + (setq newsticker--latest-update-time (current-time)) + (when something-was-added + ;; FIXME: should we care about removed items as well? + (newsticker--cache-update) + (newsticker--buffer-set-uptodate nil)) + ;; kill the process buffer if wanted + (unless newsticker-debug + (kill-buffer (process-buffer process))) + ;; launch retrieval of image + (when (and imageurl + (string-match "%l" newsticker-heading-format)) + (newsticker--image-get name imageurl)))))) + +(defun newsticker--display-tick () + "Called from the display timer. +This function calls a display function, according to the variable +`newsticker-scroll-smoothly'." + (if newsticker-scroll-smoothly + (newsticker--display-scroll) + (newsticker--display-jump))) + +(defsubst newsticker--echo-area-clean-p () + "Check whether somebody is using the echo area / minibuffer. +Return t if echo area and minibuffer are unused." + (not (or (active-minibuffer-window) + (and (current-message) + (not (string= (current-message) + newsticker--prev-message)))))) + +(defun newsticker--display-jump () + "Called from the display timer. +This function displays the next ticker item in the echo area, unless +there is another message displayed or the minibuffer is active." + (let ((message-log-max nil));; prevents message text from being logged + (when (newsticker--echo-area-clean-p) + (setq newsticker--item-position (1+ newsticker--item-position)) + (when (>= newsticker--item-position (length newsticker--item-list)) + (setq newsticker--item-position 0)) + (setq newsticker--prev-message + (nth newsticker--item-position newsticker--item-list)) + (message "%s" newsticker--prev-message)))) + +(defun newsticker--display-scroll () + "Called from the display timer. +This function scrolls the ticker items in the echo area, unless +there is another message displayed or the minibuffer is active." + (when (newsticker--echo-area-clean-p) + (let* ((width (- (frame-width) 1)) + (message-log-max nil);; prevents message text from being logged + (i newsticker--item-position) + subtext + (s-text newsticker--scrollable-text) + (l (length s-text))) + ;; don't show anything if there is nothing to show + (unless (< (length s-text) 1) + ;; repeat the ticker string if it is shorter than frame width + (while (< (length s-text) width) + (setq s-text (concat s-text s-text))) + ;; get the width of the printed string + (setq l (length s-text)) + (cond ((< i (- l width)) + (setq subtext (substring s-text i (+ i width)))) + (t + (setq subtext (concat + (substring s-text i l) + (substring s-text 0 (- width (- l i))))))) + ;; Take care of multibyte strings, for which (string-width) is + ;; larger than (length). + ;; Actually, such strings may be smaller than (frame-width) + ;; because return values of (string-width) are too large: + ;; (string-width "") => 2 + (let ((t-width (1- (length subtext)))) + (while (> (string-width subtext) width) + (setq subtext (substring subtext 0 t-width)) + (setq t-width (1- t-width)))) + ;; show the ticker text and save current position + (message "%s" subtext) + (setq newsticker--prev-message subtext) + (setq newsticker--item-position (1+ i)) + (when (>= newsticker--item-position l) + (setq newsticker--item-position 0)))))) + +;; ====================================================================== +;;; misc +;; ====================================================================== +(defun newsticker--decode-coding-string (string coding-system) + "Wrapper around `decode-coding-string'. +This functions passes the arguments STRING and CODING-SYSTEM to +`decode-coding-string'. If the decoding is successful the +decoded string is returned, otherwise the unmodified input string +is returned." + (condition-case nil + (decode-coding-string string coding-system) + (error + (message "Cannot decode encoded string `%s'" string) + string))) + +(defun newsticker--decode-numeric-entities (string) + "Decode SGML numeric entities by their respective utf characters. +This function replaces numeric entities in the input STRING and +returns the modified string. For example \"*\" gets replaced +by \"*\"." + (let ((start 0)) + (while (string-match "&#\\([0-9]+\\);" string start) + (condition-case nil + (setq string (replace-match + (string (read (substring string (match-beginning 1) + (match-end 1)))) + nil nil string)) + (error nil)) + (setq start (1+ (match-beginning 0)))) + string)) + +(defun newsticker--remove-whitespace (string) + "Remove leading and trailing whitespace from STRING." + ;; we must have ...+ but not ...* in the regexps otherwise xemacs loops + ;; endlessly... + (when string + (replace-regexp-in-string + "[ \t\r\n]+$" "" + (replace-regexp-in-string "^[ \t\r\n]+" "" string)))) + +(defun newsticker--do-forget-preformatted (item) + "Forget all cached pre-formatted data. +Remove the pre-formatted from `newsticker--cache'." + (if (nthcdr 7 item) + (setcar (nthcdr 7 item) nil)) + (if (nthcdr 6 item) + (setcar (nthcdr 6 item) nil))) + +(defun newsticker--forget-preformatted () + "Forget all cached pre-formatted data. +Remove the pre-formatted from `newsticker--cache'." + (mapc (lambda (feed) + (mapc 'newsticker--do-forget-preformatted + (cdr feed))) + newsticker--cache) + (newsticker--buffer-set-uptodate nil)) + +(defun newsticker--debug-msg (string &rest args) + "Print newsticker debug messages. +This function calls `message' with arguments STRING and ARGS, if +`newsticker-debug' is non-nil." + (and newsticker-debug + ;;(not (active-minibuffer-window)) + ;;(not (current-message)) + (apply 'message string args))) + +(defun newsticker--decode-iso8601-date (iso8601-string) + "Return ISO8601-STRING in format like `decode-time'. +Converts from ISO-8601 to Emacs representation. If ISO8601-STRING +Examples: +2004-09-17T05:09:49+00:00 +2004-09-17T05:09+00:00 +2004-09-17T05:09:49 +2004-09-17T05:09 +2004-09-17 +2004-09 +2004" + (if iso8601-string + (when (string-match + (concat + "\\([0-9]\\{4\\}\\)" + "\\(-\\([0-9]\\{2\\}\\)" + "\\(-\\([0-9]\\{2\\}\\)" + "\\(T" + "\\([0-9]\\{2\\}\\):\\([0-9]\\{2\\}\\)" + "\\(:\\([0-9]\\{2\\}\\)\\)?" + "\\(\\([-+Z]\\)\\(\\([0-9]\\{2\\}\\):\\([0-9]\\{2\\}\\)\\)?\\)?" + "\\)?\\)?\\)?") + iso8601-string) + (let ((year (read (match-string 1 iso8601-string))) + (month (read (match-string 3 iso8601-string))) + (day (read (match-string 5 iso8601-string))) + (hour (read (or (match-string 7 iso8601-string) + "0"))) + (minute (read (or (match-string 8 iso8601-string) + "0"))) + ;;(second (read (or (match-string 10 iso8601-string) + ;; "0"))) + (sign (match-string 12 iso8601-string)) + (offset-hour (read (or (match-string 14 iso8601-string) + "0"))) + (offset-minute (read (or (match-string 15 iso8601-string) + "0"))) + (second 0)) + (cond ((string= sign "+") + (setq hour (- hour offset-hour)) + (setq minute (- minute offset-minute))) + ((string= sign "-") + (setq hour (+ hour offset-hour)) + (setq minute (+ minute offset-minute)))) + ;; if UTC subtract current-time-zone offset + ;;(setq second (+ (car (current-time-zone)) second))) + + (condition-case nil + (encode-time second minute hour day month year t) + (error + (message "Cannot decode \"%s\"" iso8601-string) + nil)))) + nil)) + +(defun newsticker--decode-rfc822-date (rfc822-string) + "Return RFC822-STRING in format like `decode-time'. +Converts from RFC822 to Emacs representation. +Examples: +Sat, 07 Sep 2002 00:00:01 GMT +07 Sep 2002 00:00:01 GMT" + (if rfc822-string + (when (string-match + (concat + "\\s-*" + ;; week day + "\\(\\(Mon\\|Tue\\|Wed\\|Thu\\|Fri\\|Sat\\|Sun\\)\\s-*,?\\)\\s-+" + ;; day + "\\([0-9]\\{1,2\\}\\)\\s-+" + ;; month + "\\(Jan\\|Feb\\|Mar\\|Apr\\|May\\|Jun\\|Jul\\|Aug\\|" + "Sep\\|Oct\\|Nov\\|Dec\\)\\s-+" + ;; year + "\\([0-9]\\{2,4\\}\\)\\s-+" + ;; hour + "\\([0-9]\\{2\\}\\)" + ;; minute + ":\\([0-9]\\{2\\}\\)" + ;; second + "\\(:\\([0-9]\\{2\\}\\)\\)?" + ;; zone -- fixme + "\\(\\s-+.*\\)?") + rfc822-string) + (let ((day (read (match-string 3 rfc822-string))) + (month-name (match-string 4 rfc822-string)) + (month 0) + (year (read (match-string 5 rfc822-string))) + (hour (read (match-string 6 rfc822-string))) + (minute (read (match-string 7 rfc822-string))) + (second (read (or (match-string 9 rfc822-string) + "0"))) + ;;(zone (match-string 10 rfc822-string)) + ) + (condition-case error-data + (let ((i 1)) + (mapc (lambda (m) + (if (string= month-name m) + (setq month i)) + (setq i (1+ i))) + '("Jan" "Feb" "Mar" "Apr" "May" "Jun" "Jul" "Aug" + "Sep" "Oct" "Nov" "Dec")) + (encode-time second minute hour day month year t)) + (error + (message "Cannot decode \"%s\": %s %s" rfc822-string + (car error-data) (cdr error-data)) + nil)))) + nil)) + +(defun newsticker--lists-intersect-p (list1 list2) + "Return t if LIST1 and LIST2 share elements." + (let ((result nil)) + (mapc (lambda (elt) + (if (memq elt list2) + (setq result t))) + list1) + result)) + +;; ====================================================================== +;;; images +;; ====================================================================== +(defun newsticker--image-get (feed-name url) + "Get image of the news site FEED-NAME from URL. +If the image has been downloaded in the last 24h do nothing." + (let ((image-name (concat newsticker-imagecache-dirname "/" + feed-name))) + (if (and (file-exists-p image-name) + (time-less-p (current-time) + (time-add (nth 5 (file-attributes image-name)) + (seconds-to-time 86400)))) + (newsticker--debug-msg "%s: Getting image for %s skipped" + (format-time-string "%A, %H:%M" (current-time)) + feed-name) + ;; download + (newsticker--debug-msg "%s: Getting image for %s" + (format-time-string "%A, %H:%M" (current-time)) + feed-name) + (let* ((buffername (concat " *newsticker-wget-image-" feed-name "*")) + (item (or (assoc feed-name newsticker-url-list) + (assoc feed-name newsticker-url-list-defaults) + (error + "Cannot get news for %s: Check newsticker-url-list" + feed-name))) + (wget-arguments (or (car (cdr (cdr (cdr (cdr item))))) + newsticker-wget-arguments))) + (save-excursion + (set-buffer (get-buffer-create buffername)) + (erase-buffer) + ;; throw an error if there is an old wget-process around + (if (get-process feed-name) + (error "Another wget-process is running for image %s" + feed-name)) + ;; start wget + (let* ((args (append wget-arguments (list url))) + (proc (apply 'start-process feed-name buffername + newsticker-wget-name args))) + (set-process-coding-system proc 'no-conversion 'no-conversion) + (set-process-sentinel proc 'newsticker--image-sentinel))))))) + +(defun newsticker--image-sentinel (process event) + "Sentinel for image-retrieving PROCESS caused by EVENT." + (let* ((p-status (process-status process)) + (exit-status (process-exit-status process)) + (feed-name (process-name process))) + ;; catch known errors (zombie processes, rubbish-xml etc. + ;; if an error occurs the news feed is not updated! + (catch 'oops + (unless (and (eq p-status 'exit) + (= exit-status 0)) + (message "%s: Error while retrieving image from %s" + (format-time-string "%A, %H:%M" (current-time)) + feed-name) + (throw 'oops nil)) + (let (image-name) + (save-excursion + (set-buffer (process-buffer process)) + (setq image-name (concat newsticker-imagecache-dirname "/" + feed-name)) + (set-buffer-file-coding-system 'no-conversion) + ;; make sure the cache dir exists + (unless (file-directory-p newsticker-imagecache-dirname) + (make-directory newsticker-imagecache-dirname)) + ;; write and close buffer + (let ((require-final-newline nil) + (backup-inhibited t) + (coding-system-for-write 'no-conversion)) + (write-region nil nil image-name nil 'quiet)) + (set-buffer-modified-p nil) + (kill-buffer (current-buffer))))))) + +(defun newsticker--image-read (feed-name-symbol disabled) + "Read the cached image for FEED-NAME-SYMBOL from disk. +If DISABLED is non-nil the image will be converted to a disabled look +\(unless `newsticker-enable-logo-manipulations' is not t\). +Return the image." + (let ((image-name (concat newsticker-imagecache-dirname "/" + (symbol-name feed-name-symbol))) + (img nil)) + (when (file-exists-p image-name) + (condition-case error-data + (setq img (create-image + image-name nil nil + :conversion (and newsticker-enable-logo-manipulations + disabled + 'disabled) + :mask (and newsticker-enable-logo-manipulations + 'heuristic) + :ascent 70)) + (error + (message "Error: cannot create image: %s" + (cadr error-data))))) + img)) + +;; ====================================================================== +;;; imenu stuff +;; ====================================================================== +(defun newsticker--imenu-create-index () + "Scan newsticker buffer and return an index for imenu." + (save-excursion + (goto-char (point-min)) + (let ((index-alist nil) + (feed-list nil) + (go-ahead t)) + (while go-ahead + (let ((type (get-text-property (point) 'nt-type)) + (title (get-text-property (point) 'nt-title))) + (cond ((eq type 'feed) + ;; we're on a feed heading + (when feed-list + (if index-alist + (nconc index-alist (list feed-list)) + (setq index-alist (list feed-list)))) + (setq feed-list (list title))) + (t + (nconc feed-list + (list (cons title (point))))))) + (setq go-ahead (newsticker--buffer-goto '(item feed)))) + (if index-alist + (nconc index-alist (list feed-list)) + (setq index-alist (list feed-list))) + index-alist))) + +(defun newsticker--imenu-goto (name pos &rest args) + "Go item NAME at position POS and show item. +ARGS are ignored." + (goto-char pos) + (newsticker-show-entry)) + +;; ====================================================================== +;;; buffer stuff +;; ====================================================================== +(defun newsticker--buffer-set-uptodate (value) + "Set the uptodate-status of the newsticker buffer to VALUE. +The mode-line is changed accordingly." + (setq newsticker--buffer-uptodate-p value) + (let ((b (get-buffer "*newsticker*"))) + (when b + (save-excursion + (set-buffer b) + (if value + (setq mode-name "Newsticker -- up to date -- ") + (setq mode-name "Newsticker -- NEED UPDATE -- "))) + (sit-for 0)))) + +(defun newsticker--buffer-redraw () + "Sometimes (CVS) Emacs forgets to update the window..." + (if (fboundp 'force-window-update) + (force-window-update (current-buffer)) + (redraw-frame (selected-frame))) + (run-hooks 'newsticker-buffer-change-hook) + (sit-for 0)) + +(defun newsticker--buffer-insert-all-items () + "Insert all cached newsticker items into the current buffer. +Keeps order of feeds as given in `newsticker-url-list' and +`newsticker-url-list-defaults'." + (goto-char (point-min)) + (mapc (lambda (url-item) + (let* ((feed-name (car url-item)) + (feed-name-symbol (intern feed-name)) + (feed (assoc feed-name-symbol newsticker--cache)) + (items (cdr feed)) + (pos (point))) + (when feed + ;; insert the feed description + (mapc (lambda (item) + (when (eq (newsticker--age item) 'feed) + (newsticker--buffer-insert-item item + feed-name-symbol))) + items) + ;;insert the items + (mapc (lambda (item) + (if (memq (newsticker--age item) '(new immortal old + obsolete)) + (newsticker--buffer-insert-item item + feed-name-symbol))) + items) + (put-text-property pos (point) 'feed (car feed)) + + ;; insert empty line between feeds + (let ((p (point))) + (insert "\n") + (put-text-property p (point) 'hard t))))) + (append newsticker-url-list newsticker-url-list-defaults)) + + (newsticker--buffer-set-faces (point-min) (point-max)) + (newsticker--buffer-set-invisibility (point-min) (point-max)) + (goto-char (point-min))) + +(defun newsticker--buffer-insert-item (item &optional feed-name-symbol) + "Insert a news item in the current buffer. +Insert the string PREFIX and a formatted representation of the +ITEM. The optional parameter FEED-NAME-SYMBOL determines how the +item is formatted and whether the item-retrieval time is added as +well." + ;; insert headline + (if (eq (newsticker--age item) 'feed) + (newsticker--buffer-do-insert-text item 'feed feed-name-symbol) + (newsticker--buffer-do-insert-text item 'item feed-name-symbol)) + ;; insert the description + (newsticker--buffer-do-insert-text item 'desc feed-name-symbol)) + +(defun newsticker--buffer-do-insert-text (item type feed-name-symbol) + "Actually insert contents of news item, format it, render it and all that. +ITEM is a news item, TYPE tells which part of the item shall be inserted, +FEED-NAME-SYMBOL tells to which feed this item belongs." + (let* ((pos (point)) + (format newsticker-desc-format) + (pos-date-start nil) + (pos-date-end nil) + (pos-stat-start nil) + (pos-stat-end nil) + (pos-text-start nil) + (pos-text-end nil) + (pos-extra-start nil) + (pos-extra-end nil) + (pos-enclosure-start nil) + (pos-enclosure-end nil) + (age (newsticker--age item)) + (preformatted-contents (newsticker--preformatted-contents item)) + (preformatted-title (newsticker--preformatted-title item))) + (cond ((and preformatted-contents + (not (eq (aref preformatted-contents 0) ?\n));; we must + ;; NOT have a line + ;; break! + (eq type 'desc)) + (insert preformatted-contents)) + ((and preformatted-title + (not (eq (aref preformatted-title 0) ?\n));; we must NOT have a + ;; line break! + (eq type 'item)) + (insert preformatted-title)) + (t + ;; item was not formatted before. + ;; Let's go. + (if (eq type 'item) + (setq format newsticker-item-format) + (if (eq type 'feed) + (setq format newsticker-heading-format))) + + (while (> (length format) 0) + (let ((prefix (if (> (length format) 1) + (substring format 0 2) + ""))) + (cond ((string= "%c" prefix) + ;; contents + (when (newsticker--desc item) + (setq pos-text-start (point-marker)) + (insert (newsticker--desc item)) + (setq pos-text-end (point-marker))) + (setq format (substring format 2))) + ((string= "%d" prefix) + ;; date + (setq pos-date-start (point-marker)) + (if (newsticker--time item) + (insert (format-time-string newsticker-date-format + (newsticker--time item)))) + (setq pos-date-end (point-marker)) + (setq format (substring format 2))) + ((string= "%l" prefix) + ;; logo + (let ((disabled (cond ((eq (newsticker--age item) 'feed) + (= (newsticker--stat-num-items + feed-name-symbol 'new) 0)) + (t + (not (eq (newsticker--age item) + 'new)))))) + (let ((img (newsticker--image-read feed-name-symbol + disabled))) + (when img + (newsticker--insert-image img (car item))))) + (setq format (substring format 2))) + ((string= "%L" prefix) + ;; logo or title + (let ((disabled (cond ((eq (newsticker--age item) 'feed) + (= (newsticker--stat-num-items + feed-name-symbol 'new) 0)) + (t + (not (eq (newsticker--age item) + 'new)))))) + (let ((img (newsticker--image-read feed-name-symbol + disabled))) + (if img + (newsticker--insert-image img (car item)) + (when (car item) + (setq pos-text-start (point-marker)) + (if (eq (newsticker--age item) 'feed) + (insert (newsticker--title item)) + ;; FIXME: This is not the "real" title! + (insert (format "%s" + (car (newsticker--cache-get-feed + feed-name-symbol))))) + (setq pos-text-end (point-marker)))))) + (setq format (substring format 2))) + ((string= "%s" prefix) + ;; statistics + (setq pos-stat-start (point-marker)) + (if (eq (newsticker--age item) 'feed) + (insert (newsticker--buffer-statistics + feed-name-symbol))) + (setq pos-stat-end (point-marker)) + (setq format (substring format 2))) + ((string= "%t" prefix) + ;; title + (when (car item) + (setq pos-text-start (point-marker)) + (insert (car item)) + (setq pos-text-end (point-marker))) + (setq format (substring format 2))) + ((string-match "%." prefix) + ;; unknown specifier! + (insert prefix) + (setq format (substring format 2))) + ((string-match "^\\([^%]*\\)\\(.*\\)" format) ;; FIXME! + ;; everything else + (let ((p (point))) + (insert (substring format + (match-beginning 1) (match-end 1))) + ;; in case that the format string contained newlines + (put-text-property p (point) 'hard t)) + (setq format (substring format (match-beginning 2))))))) + + ;; decode HTML if possible... + (let ((is-rendered-HTML nil)) + (when (and newsticker-html-renderer pos-text-start pos-text-end) + (condition-case error-data + (save-excursion + ;; check whether it is necessary to call html renderer + ;; (regexp inspired by htmlr.el) + (goto-char pos-text-start) + (when (re-search-forward + " pos-enclosure-end pos-enclosure-start)) + (put-text-property pos-enclosure-start (1- pos-enclosure-end) + 'nt-face 'enclosure)) + + ;; left margin + ;;(unless (memq type '(feed item)) + ;;(set-left-margin pos (1- (point)) 1)) + + ;; save rendered stuff + (cond ((eq type 'desc) + ;; preformatted contents + (newsticker--cache-set-preformatted-contents + item (buffer-substring pos (point)))) + ((eq type 'item) + ;; preformatted title + (newsticker--cache-set-preformatted-title + item (buffer-substring pos (point))))))))) + +(defun newsticker--buffer-print-extra-element (extra-element) + "Insert EXTRA-ELEMENT in a pretty form into the current buffer." + (insert (format "%s:\t" (car extra-element))) + (let (;;(attributes (cadr extra-element)) ;FIXME!!!! + (contents (cddr extra-element))) + (cond ((listp contents) + (mapc (lambda (i) + (if (and (stringp i) + (string-match "^http://.*" i)) + (let ((pos (point))) + (insert i " ") ; avoid self-reference from the + ; nt-link thing + (add-text-properties + pos (point) + (list 'mouse-face 'highlight + 'nt-link i + 'help-echo + (format "mouse-2: visit (%s)" i) + 'keymap newsticker--url-keymap))) + (insert (format "%s" i)))) + contents)) + (t + (insert (format "%s" contents)))) + (insert "\n"))) + +(defun newsticker--buffer-insert-enclosure (item) + "Insert enclosure element of an RSS ITEM into the current buffer." + (let ((enclosure (newsticker--enclosure item)) + (beg (point))) + (when enclosure + (let ((url (cdr (assoc 'url enclosure))) + (length (cdr (assoc 'length enclosure))) + (type (cdr (assoc 'type enclosure)))) + (insert (format "Enclosed file (%s, %1.2f kBytes)" type + (/ (string-to-number length) 1024))) + (add-text-properties beg (point) + (list 'mouse-face 'highlight + 'nt-link url + 'help-echo (format + "mouse-2: visit (%s)" url) + 'keymap newsticker--url-keymap + 'nt-face 'enclosure + 'nt-type 'desc)) + (insert "\n"))))) + +(defun newsticker--buffer-statistics (feed-name-symbol) + "Return a statistic string for the feed given by FEED-NAME-SYMBOL. +See `newsticker-statistics-format'." + (let ((case-fold-search nil)) + (replace-regexp-in-string + "%a" + (format "%d" (newsticker--stat-num-items feed-name-symbol)) + (replace-regexp-in-string + "%i" + (format "%d" (newsticker--stat-num-items feed-name-symbol 'immortal)) + (replace-regexp-in-string + "%n" + (format "%d" (newsticker--stat-num-items feed-name-symbol 'new)) + (replace-regexp-in-string + "%o" + (format "%d" (newsticker--stat-num-items feed-name-symbol 'old)) + (replace-regexp-in-string + "%O" + (format "%d" (newsticker--stat-num-items feed-name-symbol 'obsolete)) + newsticker-statistics-format))))))) + +(defun newsticker--buffer-set-faces (start end) + "Add face properties according to mark property. +Scans the buffer between START and END." + (save-excursion + ;;(put-text-property start end 'face 'newsticker-default-face) + (goto-char start) + (let ((pos1 start) + (pos2 1) + (nt-face (get-text-property start 'nt-face)) + (nt-age (get-text-property start 'nt-age))) + (when nt-face + (setq pos2 (next-single-property-change (point) 'nt-face)) + (newsticker--set-face-properties pos1 pos2 nt-face nt-age) + (setq nt-face (get-text-property pos2 'nt-face)) + (setq pos1 pos2)) + (while (and (setq pos2 (next-single-property-change pos1 'nt-face)) + (<= pos2 end) + (> pos2 pos1)) + (newsticker--set-face-properties pos1 pos2 nt-face nt-age) + (setq nt-face (get-text-property pos2 'nt-face)) + (setq nt-age (get-text-property pos2 'nt-age)) + (setq pos1 pos2))))) + +(defun newsticker--buffer-set-invisibility (start end) + "Add invisibility properties according to nt-type property. +Scans the buffer between START and END. Sets the 'invisible +property to '(- )." + (save-excursion + ;; reset invisibility settings + (put-text-property start end 'invisible nil) + ;; let's go + (goto-char start) + (let ((pos1 start) + (pos2 1) + (nt-type (get-text-property start 'nt-type)) + (nt-age (get-text-property start 'nt-age))) + (when nt-type + (setq pos2 (next-single-property-change (point) 'nt-type)) + (put-text-property (max (point-min) pos1) (1- pos2) + 'invisible + (list (intern + (concat + (symbol-name + (if (eq nt-type 'extra) 'desc nt-type)) + "-" + (symbol-name nt-age))) + nt-type + nt-age)) + (setq nt-type (get-text-property pos2 'nt-type)) + (setq pos1 pos2)) + (while (and (setq pos2 (next-single-property-change pos1 'nt-type)) + (<= pos2 end) + (> pos2 pos1)) + ;; must shift one char to the left in order to handle inivisible + ;; newlines, motion in invisible text areas and all that correctly + (put-text-property (1- pos1) (1- pos2) + 'invisible + (list (intern + (concat + (symbol-name + (if (eq nt-type 'extra) 'desc nt-type)) + "-" + (symbol-name nt-age))) + nt-type + nt-age)) + (setq nt-type (get-text-property pos2 'nt-type)) + (setq nt-age (get-text-property pos2 'nt-age)) + (setq pos1 pos2))))) + +(defun newsticker--set-face-properties (pos1 pos2 nt-face age) + "Set the face for the text between the positions POS1 and POS2. +The face is chosen according the values of NT-FACE and AGE." + (let ((face (cond ((eq nt-face 'feed) + 'newsticker-feed-face) + ((eq nt-face 'item) + (cond ((eq age 'new) + 'newsticker-new-item-face) + ((eq age 'old) + 'newsticker-old-item-face) + ((eq age 'immortal) + 'newsticker-immortal-item-face) + ((eq age 'obsolete) + 'newsticker-obsolete-item-face))) + ((eq nt-face 'date) + 'newsticker-date-face) + ((eq nt-face 'stat) + 'newsticker-statistics-face) + ((eq nt-face 'extra) + 'newsticker-extra-face) + ((eq nt-face 'enclosure) + 'newsticker-enclosure-face)))) + (when face + (put-text-property pos1 (max pos1 pos2) 'face face)))) + +(defun newsticker--insert-image (img string) + "Insert IMG with STRING at point. +This is a work-around for a strange behavior of Emacs versions before +21.3.50. Images inserted with `insert-image' vanished after doing +`fill-region'." + ;; This should work: + ;;(insert-image img string) + ;; but it does not. Therefore we do this, which should be equivalent! + (let ((pos (point))) + ;;(insert string) + (insert ":-)") + (add-text-properties pos (point) (list 'display img)))) + +;; ====================================================================== +;;; HTML rendering +;; ====================================================================== +(defun newsticker-htmlr-render (pos1 pos2) ; + "Replacement for `htmlr-render'. +Renders the HTML code in the region POS1 to POS2 using htmlr." + (let ((str (buffer-substring-no-properties pos1 pos2))) + (delete-region pos1 pos2) + (insert + (with-temp-buffer + (insert str) + (goto-char (point-min)) + ;; begin original htmlr-render + (htmlr-reset) + ;; something omitted here... + (while (< (point) (point-max)) + (htmlr-step)) + ;; end original htmlr-render + (newsticker--remove-whitespace (buffer-string)))))) + +;; ====================================================================== +;;; Functions working on the *newsticker* buffer +;; ====================================================================== +(defun newsticker--buffer-make-item-completely-visible () + "Scroll buffer until current item is completely visible." + (switch-to-buffer (get-buffer-create "*newsticker*")) + (when newsticker--auto-narrow-to-feed + (let* ((min (or (save-excursion (newsticker--buffer-beginning-of-feed)) + (point-min))) + (max (or (save-excursion (newsticker--buffer-end-of-feed)) + (point-max)))) + (narrow-to-region min max))) + (when newsticker--auto-narrow-to-item + (let* ((min (or (save-excursion (newsticker--buffer-beginning-of-item)) + (point-min))) + (max (or (save-excursion (newsticker--buffer-end-of-item)) + (point-max)))) + (narrow-to-region min max))) + (sit-for 0) + ;; do not count lines and stuff because that does not work when images + ;; are displayed. Do it the simple way: + (save-excursion + (newsticker--buffer-end-of-item) + (unless (pos-visible-in-window-p) + (recenter -1))) + (unless (pos-visible-in-window-p) + (recenter 0))) + +(defun newsticker--buffer-get-feed-title-at-point () + "Return feed symbol of headline at point." + (format "%s" (or (get-text-property (point) 'feed) " "))) + +(defun newsticker--buffer-get-item-title-at-point () + "Return feed symbol of headline at point." + (format "%s" (or (get-text-property (point) 'nt-title) " "))) + +(defun newsticker--buffer-goto (types &optional age backwards) + "Search next occurrence of TYPES in current buffer. +TYPES is a list of symbols. If TYPES is found point is moved, if +not point is left unchanged. If optional parameter AGE is not +nil, the type AND the age must match. If BACKWARDS is t, search +backwards." + (let ((pos (save-excursion + (save-restriction + (widen) + (catch 'found + (let ((tpos (point))) + (while (setq tpos + (if backwards + (if (eq tpos (point-min)) + nil + (or (previous-single-property-change + tpos 'nt-type) + (point-min))) + (next-single-property-change + tpos 'nt-type))) + (and (memq (get-text-property tpos 'nt-type) types) + (or (not age) + (eq (get-text-property tpos 'nt-age) age)) + (throw 'found tpos))))))))) + (when pos + (goto-char pos)) + pos)) + +(defun newsticker--buffer-hideshow (mark-age onoff ) + "Hide or show items of type MARK-AGE. +If ONOFF is nil the item is hidden, otherwise it is shown." + (if onoff + (remove-from-invisibility-spec mark-age ) + (add-to-invisibility-spec mark-age))) + +(defun newsticker--buffer-beginning-of-item () + "Move point to the beginning of the item at point. +Return new position." + (if (bobp) + (point) + (let ((type (get-text-property (point) 'nt-type)) + (typebefore (get-text-property (1- (point)) 'nt-type))) + (if (and (memq type '(item feed)) + (not (eq type typebefore))) + (point) + (newsticker--buffer-goto '(item feed) nil t) + (point))))) + +(defun newsticker--buffer-beginning-of-feed () + "Move point to the beginning of the feed at point. +Return new position." + (if (bobp) + (point) + (let ((type (get-text-property (point) 'nt-type)) + (typebefore (get-text-property (1- (point)) 'nt-type))) + (if (and (memq type '(feed)) + (not (eq type typebefore))) + (point) + (newsticker--buffer-goto '(feed) nil t) + (point))))) + +(defun newsticker--buffer-end-of-item () + "Move point to the end of the item at point. +Take care: end of item is at the end of its last line!" + (when (newsticker--buffer-goto '(item feed nil)) + (point))) + +(defun newsticker--buffer-end-of-feed () + "Move point to the end of the last item of the feed at point. +Take care: end of item is at the end of its last line!" + (when (newsticker--buffer-goto '(feed nil)) + (backward-char 1) + (point))) + +;; ====================================================================== +;;; manipulation of ticker text +;; ====================================================================== +(defun newsticker--ticker-text-setup () + "Build the ticker text which is scrolled or flashed in the echo area." + ;; reset scrollable text + (setq newsticker--scrollable-text "") + (setq newsticker--item-list nil) + (setq newsticker--item-position 0) + ;; build scrollable text from cache data + (let ((have-something nil)) + (mapc + (lambda (feed) + (let ((feed-name (symbol-name (car feed)))) + (let ((num-new (newsticker--stat-num-items (car feed) 'new)) + (num-old (newsticker--stat-num-items (car feed) 'old)) + (num-imm (newsticker--stat-num-items (car feed) 'immortal)) + (num-obs (newsticker--stat-num-items (car feed) 'obsolete))) + (when (or (> num-new 0) + (and (> num-old 0) + (not newsticker-hide-old-items-in-echo-area)) + (and (> num-imm 0) + (not newsticker-hide-immortal-items-in-echo-area)) + (and (> num-obs 0) + (not newsticker-hide-obsolete-items-in-echo-area))) + (setq have-something t) + (mapc + (lambda (item) + (let ((title (replace-regexp-in-string + "[\r\n]+" " " + (newsticker--title item))) + (age (newsticker--age item))) + (unless (string= title newsticker--error-headline) + (when + (or (eq age 'new) + (and (eq age 'old) + (not newsticker-hide-old-items-in-echo-area)) + (and (eq age 'obsolete) + (not + newsticker-hide-obsolete-items-in-echo-area)) + (and (eq age 'immortal) + (not + newsticker-hide-immortal-items-in-echo-area))) + (setq title (newsticker--remove-whitespace title)) + ;; add to flash list + (add-to-list 'newsticker--item-list + (concat feed-name ": " title) t) + ;; and to the scrollable text + (setq newsticker--scrollable-text + (concat newsticker--scrollable-text + " " feed-name ": " title " +++")))))) + (cdr feed)))))) + newsticker--cache) + (when have-something + (setq newsticker--scrollable-text + (concat "+++ " + (format-time-string "%A, %H:%M" + newsticker--latest-update-time) + " ++++++" newsticker--scrollable-text))))) + +(defun newsticker--ticker-text-remove (feed title) + "Remove the item of FEED with TITLE from the ticker text." + ;; reset scrollable text + (setq newsticker--item-position 0) + (let ((feed-name (symbol-name feed)) + (t-title (replace-regexp-in-string "[\r\n]+" " " title))) + ;; remove from flash list + (setq newsticker--item-list (remove (concat feed-name ": " t-title) + newsticker--item-list)) + ;; and from the scrollable text + (setq newsticker--scrollable-text + (replace-regexp-in-string + (regexp-quote (concat " " feed-name ": " t-title " +++")) + "" + newsticker--scrollable-text)) + (if (string-match (concat "^\\+\\+\\+ [A-Z][a-z]+, " + "[012]?[0-9]:[0-9][0-9] \\+\\+\\+\\+\\+\\+$") + newsticker--scrollable-text) + (setq newsticker--scrollable-text "")))) + +;; ====================================================================== +;;; manipulation of cached data +;; ====================================================================== +(defun newsticker--cache-set-preformatted-contents (item contents) + "Set preformatted contents of ITEM to CONTENTS." + (if (nthcdr 6 item) + (setcar (nthcdr 6 item) contents) + (setcdr (nthcdr 5 item) (list contents)))) + +(defun newsticker--cache-set-preformatted-title (item title) + "Set preformatted title of ITEM to TITLE." + (if (nthcdr 7 item) + (setcar (nthcdr 7 item) title) + (setcdr (nthcdr 6 item) title))) + +(defun newsticker--cache-replace-age (data feed old-age new-age) + "Mark all items in DATA in FEED which carry age OLD-AGE with NEW-AGE. +If FEED is 'any it applies to all feeds. If OLD-AGE is 'any, +all marks are replaced by NEW-AGE. Removes all pre-formatted contents." + (mapc (lambda (a-feed) + (when (or (eq feed 'any) + (eq (car a-feed) feed)) + (let ((items (cdr a-feed))) + (mapc (lambda (item) + (when (or (eq old-age 'any) + (eq (newsticker--age item) old-age)) + (setcar (nthcdr 4 item) new-age) + (newsticker--do-forget-preformatted item))) + items)))) + data) + data) + +(defun newsticker--cache-mark-expired (data feed old-age new-age time) + "Mark all expired entries. +This function sets the age entries in DATA in the feed FEED. If +an item's age is OLD-AGE it is set to NEW-AGE if the item is +older than TIME." + (mapc + (lambda (a-feed) + (when (or (eq feed 'any) + (eq (car a-feed) feed)) + (let ((items (cdr a-feed))) + (mapc + (lambda (item) + (when (eq (newsticker--age item) old-age) + (let ((exp-time (time-add (newsticker--time item) + (seconds-to-time time)))) + (when (time-less-p exp-time (current-time)) + (newsticker--debug-msg + "Item `%s' from %s has expired on %s" + (newsticker--title item) + (format-time-string "%Y-%02m-%d, %H:%M" + (newsticker--time item)) + (format-time-string "%Y-%02m-%d, %H:%M" exp-time)) + (setcar (nthcdr 4 item) new-age))))) + items)))) + data) + data) + +(defun newsticker--cache-contains (data feed title desc link age + &optional guid) + "Check DATA whether FEED contains an item with the given properties. +This function returns the contained item or nil if it is not +contained. +The properties which are checked are TITLE, DESC, LINK, AGE, and +GUID. In general all properties must match in order to return a +certain item, except for the following cases. + +If AGE equals 'feed the TITLE, DESCription and LINK do not +matter. If DESC is nil it is ignored as well. If +`newsticker-desc-comp-max' is non-nil, only the first +`newsticker-desc-comp-max' characters of DESC are taken into +account. + +If GUID is non-nil it is sufficient to match this value, and the +other properties are ignored." + (condition-case nil + (catch 'found + (when (and desc newsticker-desc-comp-max + (> (length desc) newsticker-desc-comp-max)) + (setq desc (substring desc 0 newsticker-desc-comp-max))) + (mapc + (lambda (this-feed) + (when (eq (car this-feed) feed) + (mapc (lambda (anitem) + (when (or + ;; global unique id can match + (and guid + (string= guid (newsticker--guid anitem))) + ;; or title, desc, etc. + (and + ;;(or (not (eq age 'feed)) + ;; (eq (newsticker--age anitem) 'feed)) + (string= (newsticker--title anitem) + title) + (or (not link) + (string= (newsticker--link anitem) + link)) + (or (not desc) + (if (and desc newsticker-desc-comp-max + (> (length (newsticker--desc anitem)) + newsticker-desc-comp-max)) + (string= (substring + (newsticker--desc anitem) + 0 newsticker-desc-comp-max) + desc) + (string= (newsticker--desc anitem) + desc))))) + (throw 'found anitem))) + (cdr this-feed)))) + data) + nil) + (error nil))) + +(defun newsticker--cache-add (data feed-name-symbol title desc link time age + position extra-elements + &optional updated-age updated-time + preformatted-contents + preformatted-title) + "Add another item to cache data. +Add to DATA in the FEED-NAME-SYMBOL an item with TITLE, DESC, +LINK, TIME, AGE, POSITION, and EXTRA-ELEMENTS. If this item is +contained already, its mark is set to UPDATED-AGE, its time is +set to UPDATED-TIME, and its pre-formatted contents is set to +PREFORMATTED-CONTENTS and PREFORMATTED-TITLE. Returns the age +which the item got." + (let ((item (newsticker--cache-contains data feed-name-symbol title + desc link age))) + (if item + ;; does exist already -- change age, update time and position + (progn + (if (nthcdr 5 item) + (setcar (nthcdr 5 item) position) + (setcdr (nthcdr 4 item) (list position))) + (setcar (nthcdr 4 item) updated-age) + (if updated-time + (setcar (nthcdr 3 item) updated-time)) + ;; replace cached pre-formatted contents + (newsticker--cache-set-preformatted-contents + item preformatted-contents) + (newsticker--cache-set-preformatted-title + item preformatted-title)) + ;; did not exist or age equals 'feed-name-symbol + (catch 'found + (mapc (lambda (this-feed) + (when (eq (car this-feed) feed-name-symbol) + (setcdr this-feed (nconc (cdr this-feed) + (list (list title desc link + time age position + preformatted-contents + preformatted-title + extra-elements)))) + (throw 'found this-feed))) + data) + ;; the feed is not contained + (add-to-list 'data (list feed-name-symbol + (list title desc link time age position + preformatted-contents + preformatted-title + extra-elements)) + t)))) + data) + +(defun newsticker--cache-remove (data feed-symbol age) + "Remove all entries from DATA in the feed FEED-SYMBOL with AGE. +FEED-SYMBOL may be 'any. Entries from old feeds, which are no longer in +`newsticker-url-list' or `newsticker-url-list-defaults', are removed as +well." + (let* ((pos data) + (feed (car pos)) + (last-pos nil)) + (while feed + (if (or (assoc (symbol-name (car feed)) newsticker-url-list) + (assoc (symbol-name (car feed)) newsticker-url-list-defaults)) + ;; feed is still valid=active + ;; (message "Keeping feed %s" (car feed)) + (if (or (eq feed-symbol 'any) + (eq feed-symbol (car feed))) + (let* ((item-pos (cdr feed)) + (item (car item-pos)) + (prev-pos nil)) + (while item + ;;(message "%s" (car item)) + (if (eq age (newsticker--age item)) + ;; remove this item + (progn + ;;(message "Removing item %s" (car item)) + (if prev-pos + (setcdr prev-pos (cdr item-pos)) + (setcdr feed (cdr item-pos)))) + ;;(message "Keeping item %s" (car item)) + (setq prev-pos item-pos)) + (setq item-pos (cdr item-pos)) + (setq item (car item-pos))))) + ;; feed is not active anymore + ;; (message "Removing feed %s" (car feed)) + (if last-pos + (setcdr last-pos (cdr pos)) + (setq data (cdr pos)))) + (setq last-pos pos) + (setq pos (cdr pos)) + (setq feed (car pos))))) + +;; ====================================================================== +;;; Sorting +;; ====================================================================== +(defun newsticker--cache-item-compare-by-time (item1 item2) + "Compare two news items ITEM1 and ITEM2 by comparing their time values." + (catch 'result + (let ((age1 (newsticker--age item1)) + (age2 (newsticker--age item2))) + (if (not (eq age1 age2)) + (cond ((eq age1 'obsolete) + (throw 'result nil)) + ((eq age2 'obsolete) + (throw 'result t))))) + (let* ((time1 (newsticker--time item1)) + (time2 (newsticker--time item2))) + (cond ((< (nth 0 time1) (nth 0 time2)) + nil) + ((> (nth 0 time1) (nth 0 time2)) + t) + ((< (nth 1 time1) (nth 1 time2)) + nil) + ((> (nth 1 time1) (nth 1 time2)) + t) + ((< (or (nth 2 time1) 0) (or (nth 2 time2) 0)) + nil) + ((> (or (nth 2 time1) 0) (or (nth 2 time2) 0)) + t) + (t + nil))))) + +(defun newsticker--cache-item-compare-by-title (item1 item2) + "Compare ITEM1 and ITEM2 by comparing their titles." + (catch 'result + (let ((age1 (newsticker--age item1)) + (age2 (newsticker--age item2))) + (if (not (eq age1 age2)) + (cond ((eq age1 'obsolete) + (throw 'result nil)) + ((eq age2 'obsolete) + (throw 'result t))))) + (string< (newsticker--title item1) (newsticker--title item2)))) + +(defun newsticker--cache-item-compare-by-position (item1 item2) + "Compare ITEM1 and ITEM2 by comparing their original positions." + (catch 'result + (let ((age1 (newsticker--age item1)) + (age2 (newsticker--age item2))) + (if (not (eq age1 age2)) + (cond ((eq age1 'obsolete) + (throw 'result nil)) + ((eq age2 'obsolete) + (throw 'result t))))) + (< (or (newsticker--pos item1) 0) (or (newsticker--pos item2) 0)))) + +(defun newsticker--cache-sort () + "Sort the newsticker cache data." + (let ((sort-fun (cond ((eq newsticker-sort-method 'sort-by-time) + 'newsticker--cache-item-compare-by-time) + ((eq newsticker-sort-method 'sort-by-title) + 'newsticker--cache-item-compare-by-title) + ((eq newsticker-sort-method 'sort-by-original-order) + 'newsticker--cache-item-compare-by-position)))) + (mapc (lambda (feed-list) + (setcdr feed-list (sort (cdr feed-list) + sort-fun))) + newsticker--cache))) + +(defun newsticker--cache-update (&optional save) + "Update newsticker cache file. +If optional argument SAVE is not nil the cache file is saved to disk." + (save-excursion + (let ((coding-system-for-write 'utf-8) + (buf (find-file-noselect newsticker-cache-filename))) + (when buf + (set-buffer buf) + (setq buffer-undo-list t) + (erase-buffer) + (insert ";; -*- coding: utf-8 -*-\n") + (insert (prin1-to-string newsticker--cache)) + (when save + (save-buffer)))))) + +(defun newsticker--cache-get-feed (feed) + "Return the cached data for the feed FEED. +FEED is a symbol!" + (assoc feed newsticker--cache)) + +;; ====================================================================== +;;; Statistics +;; ====================================================================== +(defun newsticker--stat-num-items (feed &optional age) + "Return number of items in the given FEED which have the given AGE. +If AGE is nil, the total number items is returned." + (let ((items (cdr (newsticker--cache-get-feed feed))) + (num 0)) + (while items + (if age + (if (eq (newsticker--age (car items)) age) + (setq num (1+ num))) + (if (memq (newsticker--age (car items)) '(new old immortal obsolete)) + (setq num (1+ num)))) + (setq items (cdr items))) + num)) + +;; ====================================================================== +;;; OPML +;; ====================================================================== +(defun newsticker-opml-export () + "OPML subscription export. +Export subscriptions to a buffer in OPML Format." + (interactive) + (with-current-buffer (get-buffer-create "*OPML Export*") + (set-buffer-file-coding-system 'utf-8) + (insert (concat + "\n" + "\n" + "\n" + " \n" + " mySubscriptions\n" + " " (format-time-string "%a, %d %b %Y %T %z") + "\n" + " " user-mail-address "\n" + " " (user-full-name) "\n" + " \n" + " \n")) + (mapc (lambda (sub) + (insert " \n")) + (append newsticker-url-list newsticker-url-list-defaults)) + (insert " \n\n")) + (pop-to-buffer "*OPML Export*") + (when (fboundp 'sgml-mode) + (sgml-mode))) + +(defun newsticker-opml-import (filename) + "Import OPML data from FILENAME." + (interactive "fOPML file: ") + (set-buffer (find-file-noselect filename)) + (goto-char (point-min)) + (let* ((node-list (xml-parse-region (point-min) (point-max))) + (body (car (xml-get-children (car node-list) 'body))) + (outlines (xml-get-children body 'outline))) + (mapc (lambda (outline) + (let ((name (xml-get-attribute outline 'text)) + (url (xml-get-attribute outline 'xmlUrl))) + (add-to-list 'newsticker-url-list + (list name url nil nil nil) t))) + outlines)) + (customize-variable 'newsticker-url-list)) + +;; ====================================================================== +;;; Auto marking +;; ====================================================================== +(defun newsticker--run-auto-mark-filter (feed item) + "Automatically mark an item as old or immortal. +This function checks the variable `newsticker-auto-mark-filter' +for an entry that matches FEED and ITEM." + (let ((case-fold-search t)) + (mapc (lambda (filter) + (let ((filter-feed (car filter)) + (old-list (nth 1 filter)) + (imm-list (nth 2 filter))) + (when (string-match filter-feed feed) + (newsticker--do-run-auto-mark-filter item 'old old-list) + (newsticker--do-run-auto-mark-filter item 'immortal imm-list)))) + newsticker-auto-mark-filter))) + +(defun newsticker--do-run-auto-mark-filter (item age list) + "Actually compare ITEM AGE LIST against `newsticker-auto-mark-filter'." + (mapc (lambda (pattern) + (when (string-match pattern (newsticker--title item)) + (setcar (nthcdr 4 item) age))) + list)) + + +;; ====================================================================== +;;; hook samples +;; ====================================================================== +(defun newsticker-new-item-functions-sample (feed item) + "Demonstrate the use of the `newsticker-new-item-functions' hook. +This function just prints out the values of the FEED and title of the ITEM." + (message (concat "newsticker-new-item-functions-sample: feed=`%s', " + "title=`%s'") + feed (newsticker--title item))) + +(defun newsticker-download-images (feed item) + "Download the first image. +If FEED equals \"imagefeed\" download the first image URL found +in the description=contents of ITEM to the directory +\"~/tmp/newsticker/FEED/TITLE\" where TITLE is the title of the item." + (when (string= feed "imagefeed") + (let ((title (newsticker--title item)) + (desc (newsticker--desc item))) + (when (string-match "= (cdr cvs-version) 10) (> (car cvs-version) 1))) + (if (or (null cvs-version) + (or (>= (cdr cvs-version) 10) (> (car cvs-version) 1))) + ;; Supposedly some recent versions of CVS output some directory info + ;; as they recurse downthe tree, but it's not good enough in the case + ;; where we run "cvs status foo bar/foo". '("status") t) "Whether cvs commands should be executed a directory at a time. @@ -506,7 +512,7 @@ Sadly, even with a new cvs executable, if you connect to an older cvs server a case the sanity check made by pcl-cvs fails and you will have to manually set this variable to t (until the cvs server is upgraded). When the above problem occurs, pcl-cvs should (hopefully) catch cvs' error -message and replace it with a message tell you to change this variable.") +message and replace it with a message telling you to change this variable.") ;; (provide 'pcvs-defs) diff --git a/lisp/pcvs.el b/lisp/pcvs.el index f5564155ff7..c402192c05a 100644 --- a/lisp/pcvs.el +++ b/lisp/pcvs.el @@ -1171,7 +1171,7 @@ Full documentation is in the Texinfo file." (interactive) (if (eq last-command 'cvs-help) (describe-function 'cvs-mode) ; would need minor-mode for log-edit-mode - (message + (message "%s" (substitute-command-keys "`\\[cvs-help]':help `\\[cvs-mode-add]':add `\\[cvs-mode-commit]':commit \ `\\[cvs-mode-diff-map]':diff* `\\[cvs-mode-log]':log \ diff --git a/lisp/play/decipher.el b/lisp/play/decipher.el index 6471e23b5f2..e8850e6fdf4 100644 --- a/lisp/play/decipher.el +++ b/lisp/play/decipher.el @@ -600,7 +600,7 @@ you have determined the keyword." (defun decipher-show-alphabet () "Display the current cipher alphabet in the message line." (interactive) - (message + (message "%s" (mapconcat (lambda (a) (concat (char-to-string (car a)) diff --git a/lisp/play/landmark.el b/lisp/play/landmark.el index 4da291d4505..67c6c0d3021 100644 --- a/lisp/play/landmark.el +++ b/lisp/play/landmark.el @@ -1473,7 +1473,7 @@ After this limit is reached, lm-random-move is called to push him out of it." (lm-plot-square (lm-point-square) 1) (incf lm-number-of-moves) (if lm-output-moves - (message (format "Moves made: %d" lm-number-of-moves)))) + (message "Moves made: %d" lm-number-of-moves))) (defun lm-random-move () diff --git a/lisp/play/zone.el b/lisp/play/zone.el index 876490b1f9a..7441c2b9aa8 100644 --- a/lisp/play/zone.el +++ b/lisp/play/zone.el @@ -179,7 +179,7 @@ If the element is a function or a list of a function and a number, (error (funcall restore) (while (not (input-pending-p)) - (message (format "We were zoning when we wrote %s..." pgm)) + (message "We were zoning when we wrote %s..." pgm) (sit-for 3) (message "...here's hoping we didn't hose your buffer!") (sit-for 3))) diff --git a/lisp/printing.el b/lisp/printing.el index eabca64f085..ec2c8a3cfda 100644 --- a/lisp/printing.el +++ b/lisp/printing.el @@ -4,7 +4,7 @@ ;; Author: Vinicius Jose Latorre ;; Maintainer: Vinicius Jose Latorre -;; Time-stamp: <2005/06/11 19:51:32 vinicius> +;; Time-stamp: <2005-09-18 05:57:14 deego> ;; Keywords: wp, print, PostScript ;; Version: 6.8.4 ;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/ @@ -6424,7 +6424,7 @@ COMMAND.exe, COMMAND.bat and COMMAND.com in this order." ;; handlers ((quit error) (ding) - (message (error-message-string data))))) + (message "%s" (error-message-string data))))) (defun pr-interface-printify (&rest ignore) @@ -6449,7 +6449,7 @@ COMMAND.exe, COMMAND.bat and COMMAND.com in this order." ;; handlers ((quit error) (ding) - (message (error-message-string data))))) + (message "%s" (error-message-string data))))) (defun pr-interface-ps-print (&rest ignore) @@ -6515,7 +6515,7 @@ COMMAND.exe, COMMAND.bat and COMMAND.com in this order." ;; handlers ((quit error) (ding) - (message (error-message-string data))))) + (message "%s" (error-message-string data))))) (defun pr-i-ps-send () diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el index 3b6a6d611d2..6a6d63a169a 100644 --- a/lisp/progmodes/ada-mode.el +++ b/lisp/progmodes/ada-mode.el @@ -1539,7 +1539,7 @@ word itself has a special casing." (ada-save-exceptions-to-file file-name) - (message (concat "Defining " word " as a casing exception")))) + (message "%s" (concat "Defining " word " as a casing exception")))) (defun ada-case-read-exceptions-from-file (file-name) "Read the content of the casing exception file FILE-NAME." @@ -2191,17 +2191,17 @@ This function is intended to be bound to the C-m and C-j keys." (if (equal (cdr cur-indent) '(0)) (message (concat "same indentation as line " (number-to-string line))) - (message (mapconcat (lambda(x) - (cond - ((symbolp x) - (symbol-name x)) - ((numberp x) - (number-to-string x)) - ((listp x) - (concat "- " (symbol-name (cadr x)))) - )) - (cdr cur-indent) - " + ")))) + (message "%s" (mapconcat (lambda(x) + (cond + ((symbolp x) + (symbol-name x)) + ((numberp x) + (number-to-string x)) + ((listp x) + (concat "- " (symbol-name (cadr x)))) + )) + (cdr cur-indent) + " + ")))) (save-excursion (goto-char (car cur-indent)) (sit-for 1)))) @@ -2214,7 +2214,7 @@ command like: (while command-line-args-left (let ((source (car command-line-args-left))) - (message (concat "formating " source)) + (message "Formating %s" source) (find-file source) (ada-indent-region (point-min) (point-max)) (ada-adjust-case-buffer) diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el index 74b5694e8c3..241296d8f67 100644 --- a/lisp/progmodes/ada-xref.el +++ b/lisp/progmodes/ada-xref.el @@ -325,7 +325,7 @@ replaced by the name including the extension." ;; Check if there is an environment variable with the same name (if (null value) (if (not (setq value (getenv name))) - (message (concat "No environment variable " name " found")))) + (message "%s" (concat "No environment variable " name " found")))) (cond ((null value) diff --git a/lisp/progmodes/cmacexp.el b/lisp/progmodes/cmacexp.el index e2bcf984586..b3051f37b9d 100644 --- a/lisp/progmodes/cmacexp.el +++ b/lisp/progmodes/cmacexp.el @@ -346,13 +346,13 @@ Optional arg DISPLAY non-nil means show messages in the echo area." (format "\n#line %d \"%s\"\n" startlinenum filename))) ;; Call the preprocessor. - (if display (message mymsg)) + (if display (message "%s" mymsg)) (setq exit-status (call-process-region 1 (point-max) shell-file-name t (list t tempname) nil "-c" cppcommand)) - (if display (message (concat mymsg "done"))) + (if display (message "%s" (concat mymsg "done"))) (if (= (buffer-size) 0) ;; Empty output is normal after a fatal error. (insert "\nPreprocessor produced no output\n") diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index f0836cbf2b0..f29051ab0b0 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -307,7 +307,7 @@ File = \\(.+\\), Line = \\([0-9]+\\)\\(?:, Column = \\([0-9]+\\)\\)?" (defcustom compilation-error-regexp-alist (mapcar 'car compilation-error-regexp-alist-alist) "Alist that specifies how to match errors in compiler output. -Note that on Unix everything is a valid filename, so these +On GNU and Unix, any string is a valid filename, so these matchers must make some common sense assumptions, which catch normal cases. A shorter list will be lighter on resource usage. @@ -436,6 +436,7 @@ nil as an element means to try the default directory." (string :tag "Directory"))) :group 'compilation) +;;;###autoload (defcustom compile-command "make -k " "*Last shell command used to do a compilation; default for next compilation. @@ -452,6 +453,7 @@ You might also use mode hooks to specify it in certain modes, like this: :type 'string :group 'compilation) +;;;###autoload (defcustom compilation-disable-input nil "*If non-nil, send end-of-file as compilation process input. This only affects platforms that support asynchronous processes (see @@ -664,24 +666,26 @@ just char-counts." (move-to-column col) (goto-char (min (+ (line-beginning-position) col) (line-end-position))))) -(defun compilation-internal-error-properties (file line end-line col end-col type fmt) +(defun compilation-internal-error-properties (file line end-line col end-col type fmts) "Get the meta-info that will be added as text-properties. LINE, END-LINE, COL, END-COL are integers or nil. -TYPE can be 0, 1, or 2. -FILE should be (ABSOLUTE-FILENAME) or (RELATIVE-FILENAME . DIRNAME) or nil." +TYPE can be 0, 1, or 2, meaning error, warning, or just info. +FILE should be (FILENAME) or (RELATIVE-FILENAME . DIRNAME) or nil. +FMTS is a list of format specs for transforming the file name. + (See `compilation-error-regexp-alist'.)" (unless file (setq file '("*unknown*"))) - (setq file (compilation-get-file-structure file fmt)) - ;; Get first already existing marker (if any has one, all have one). - ;; Do this first, as the compilation-assq`s may create new nodes. - (let* ((marker-line (car (cddr file))) ; a line structure + (let* ((file-struct (compilation-get-file-structure file fmts)) + ;; Get first already existing marker (if any has one, all have one). + ;; Do this first, as the compilation-assq`s may create new nodes. + (marker-line (car (cddr file-struct))) ; a line structure (marker (nth 3 (cadr marker-line))) ; its marker (compilation-error-screen-columns compilation-error-screen-columns) end-marker loc end-loc) (if (not (and marker (marker-buffer marker))) - (setq marker) ; no valid marker for this file + (setq marker nil) ; no valid marker for this file (setq loc (or line 1)) ; normalize no linenumber to line 1 (catch 'marker ; find nearest loc, at least one exists - (dolist (x (nthcdr 3 file)) ; loop over remaining lines + (dolist (x (nthcdr 3 file-struct)) ; loop over remaining lines (if (> (car x) loc) ; still bigger (setq marker-line x) (if (> (- (or (car marker-line) 1) loc) @@ -710,17 +714,18 @@ FILE should be (ABSOLUTE-FILENAME) or (RELATIVE-FILENAME . DIRNAME) or nil." (forward-to-indentation 0)) (setq marker (list (point-marker)))))) - (setq loc (compilation-assq line (cdr file))) + (setq loc (compilation-assq line (cdr file-struct))) (if end-line - (setq end-loc (compilation-assq end-line (cdr file)) + (setq end-loc (compilation-assq end-line (cdr file-struct)) end-loc (compilation-assq end-col end-loc)) (if end-col ; use same line element (setq end-loc (compilation-assq end-col loc)))) (setq loc (compilation-assq col loc)) ;; If they are new, make the loc(s) reference the file they point to. - (or (cdr loc) (setcdr loc `(,line ,file ,@marker))) + (or (cdr loc) (setcdr loc `(,line ,file-struct ,@marker))) (if end-loc - (or (cdr end-loc) (setcdr end-loc `(,(or end-line line) ,file ,@end-marker)))) + (or (cdr end-loc) + (setcdr end-loc `(,(or end-line line) ,file-struct ,@end-marker)))) ;; Must start with face `(face ,compilation-message-face @@ -1570,8 +1575,7 @@ This is the value of `next-error-function' in Compilation buffers." ;; markers for that file. (unless (and (nth 3 loc) (marker-buffer (nth 3 loc))) (with-current-buffer (compilation-find-file marker (caar (nth 2 loc)) - (or (cdar (nth 2 loc)) - default-directory)) + (cadr (car (nth 2 loc)))) (save-restriction (widen) (goto-char (point-min)) @@ -1734,16 +1738,21 @@ and overlay is highlighted between MK and END-MK." (copy-marker (line-beginning-position)))))) -(defun compilation-find-file (marker filename dir &rest formats) +(defun compilation-find-file (marker filename directory &rest formats) "Find a buffer for file FILENAME. Search the directories in `compilation-search-path'. A nil in `compilation-search-path' means to try the -current directory, which is passed in DIR. +\"current\" directory, which is passed in DIRECTORY. +If DIRECTORY. is relative, it is combined with `default-directory'. +If DIRECTORY. is nil, that means use `default-directory'. If FILENAME is not found at all, ask the user where to find it. Pop up the buffer containing MARKER and scroll to MARKER if we ask the user." (or formats (setq formats '("%s"))) (save-excursion (let ((dirs compilation-search-path) + (spec-dir (if directory + (expand-file-name directory) + default-directory)) buffer thisdir fmts name) (if (file-name-absolute-p filename) ;; The file name is absolute. Use its explicit directory as @@ -1753,7 +1762,7 @@ Pop up the buffer containing MARKER and scroll to MARKER if we ask the user." filename (file-name-nondirectory filename))) ;; Now search the path. (while (and dirs (null buffer)) - (setq thisdir (or (car dirs) dir) + (setq thisdir (or (car dirs) spec-dir) fmts formats) ;; For each directory, try each format string. (while (and fmts (null buffer)) @@ -1771,7 +1780,7 @@ Pop up the buffer containing MARKER and scroll to MARKER if we ask the user." (read-file-name (format "Find this %s in: (default %s) " compilation-error filename) - dir filename t)))) + spec-dir filename t)))) (if (file-directory-p name) (setq name (expand-file-name filename name))) (setq buffer (and (file-exists-p name) @@ -1785,26 +1794,32 @@ Pop up the buffer containing MARKER and scroll to MARKER if we ask the user." (defun compilation-get-file-structure (file &optional fmt) "Retrieve FILE's file-structure or create a new one. -FILE should be (ABSOLUTE-FILENAME) or (RELATIVE-FILENAME . DIRNAME)." +FILE should be (FILENAME) or (RELATIVE-FILENAME . DIRNAME). +In the former case, FILENAME may be relative or absolute. +The file-structure looks like this: + (list (list FILENAME [DIR-FROM-PREV-MSG]) FMT LINE-STRUCT...) +" (or (gethash file compilation-locs) ;; File was not previously encountered, at least not in the form passed. ;; Let's normalize it and look again. (let ((filename (car file)) - (default-directory (if (cdr file) - (file-truename (cdr file)) - default-directory))) + ;; Get the specified directory from FILE. + (spec-directory (if (cdr file) + (file-truename (cdr file))))) ;; Check for a comint-file-name-prefix and prepend it if appropriate. ;; (This is very useful for compilation-minor-mode in an rlogin-mode ;; buffer.) - (if (boundp 'comint-file-name-prefix) - (if (file-name-absolute-p filename) - (setq filename - (concat (with-no-warnings comint-file-name-prefix) filename)) - (setq default-directory - (file-truename - (concat (with-no-warnings comint-file-name-prefix) default-directory))))) + (when (and (boundp 'comint-file-name-prefix) + (not (equal comint-file-name-prefix ""))) + (if (file-name-absolute-p filename) + (setq filename + (concat comint-file-name-prefix filename)) + (if spec-directory + (setq spec-directory + (file-truename + (concat comint-file-name-prefix spec-directory)))))) ;; If compilation-parse-errors-filename-function is ;; defined, use it to process the filename. @@ -1820,20 +1835,13 @@ FILE should be (ABSOLUTE-FILENAME) or (RELATIVE-FILENAME . DIRNAME)." ;; name and fix them. (setq filename (command-line-normalize-file-name filename)) - ;; Now eliminate any "..", because find-file would get them wrong. - ;; Make relative and absolute filenames, with or without links, the - ;; same. - (setq filename - (list (abbreviate-file-name - (file-truename (if (cdr file) - (expand-file-name filename) - filename))))) - ;; Store it for the possibly unnormalized name (puthash file ;; Retrieve or create file-structure for normalized name - (or (gethash filename compilation-locs) - (puthash filename (list filename fmt) compilation-locs)) + (or (gethash (list filename) compilation-locs) + (puthash (list filename) + (list (list filename spec-directory) fmt) + compilation-locs)) compilation-locs)))) (add-to-list 'debug-ignored-errors "^No more [-a-z ]+s yet$") diff --git a/lisp/progmodes/ebnf2ps.el b/lisp/progmodes/ebnf2ps.el index 72603722dc2..887e856ba1f 100644 --- a/lisp/progmodes/ebnf2ps.el +++ b/lisp/progmodes/ebnf2ps.el @@ -5,7 +5,7 @@ ;; Author: Vinicius Jose Latorre ;; Maintainer: Vinicius Jose Latorre -;; Time-stamp: <2004/11/19 22:30:34 vinicius> +;; Time-stamp: <2005-09-18 07:27:20 deego> ;; Keywords: wp, ebnf, PostScript ;; Version: 4.2 ;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/ @@ -4674,7 +4674,7 @@ killed after process termination." (goto-char the-point) (if ebnf-stop-on-error (error error-msg) - (message error-msg))) + (message "%s" error-msg))) ;; generated output OK (gen-func nil) diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el index e5089d84fb0..9ceee6f6920 100644 --- a/lisp/progmodes/flymake.el +++ b/lisp/progmodes/flymake.el @@ -183,7 +183,7 @@ TEXT is a format control string, and the remaining arguments ARGS are the string substitutions (see `format')." (if (<= level flymake-log-level) (let* ((msg (apply 'format text args))) - (message msg) + (message "%s" msg) ;;(with-temp-buffer ;; (insert msg) ;; (insert "\n") diff --git a/lisp/progmodes/glasses.el b/lisp/progmodes/glasses.el index b32c5eb6d49..2733cb407a4 100644 --- a/lisp/progmodes/glasses.el +++ b/lisp/progmodes/glasses.el @@ -195,6 +195,16 @@ CATEGORY is the overlay category. If it is nil, use the `glasses' category." (looking-at glasses-uncapitalize-regexp)))) (overlay-put o 'invisible t) (overlay-put o 'after-string (downcase (match-string n)))))) + ;; Separator change + (unless (string= glasses-separator "_") + (goto-char beg) + (while (re-search-forward "[a-zA-Z0-9]\\(_+\\)[a-zA-Z0-9]" end t) + (goto-char (match-beginning 1)) + (while (eql (char-after) ?\_) + (let ((o (glasses-make-overlay (point) (1+ (point))))) + ;; `concat' ensures the character properties won't merge + (overlay-put o 'display (concat glasses-separator))) + (forward-char)))) ;; Parentheses (when glasses-separate-parentheses-p (goto-char beg) @@ -227,6 +237,13 @@ recognized according to the current value of the variable `glasses-separator'." (let ((n (if (match-string 1) 1 2))) (replace-match "" t nil nil n) (goto-char (match-end n)))) + (unless (string= glasses-separator "_") + (goto-char (point-min)) + (while (re-search-forward (format "[a-zA-Z0-9]\\(%s+\\)[a-zA-Z0-9]" + separator) + nil t) + (replace-match "_" nil nil nil 1) + (goto-char (match-beginning 1)))) (when glasses-separate-parentheses-p (goto-char (point-min)) (while (re-search-forward "[a-zA-Z]_*\\( \\)\(" nil t) diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el index 1486825b07a..47d74f00aec 100644 --- a/lisp/progmodes/gud.el +++ b/lisp/progmodes/gud.el @@ -1865,7 +1865,7 @@ extension EXTN. Normally EXTN is given as the regular expression ;; Anything else means the input is invalid. (t - (message (format "Error parsing file %s." file)) + (message "Error parsing file %s." file) (throw 'abort nil)))))) l)) diff --git a/lisp/progmodes/hideshow.el b/lisp/progmodes/hideshow.el index 8f08311ceae..ddc0e277200 100644 --- a/lisp/progmodes/hideshow.el +++ b/lisp/progmodes/hideshow.el @@ -1,12 +1,12 @@ ;;; hideshow.el --- minor mode cmds to selectively display code/comment blocks ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -;; 2004, 2005 Free Software Foundation +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Thien-Thi Nguyen ;; Dan Nicolaescu ;; Keywords: C C++ java lisp tools editing comments blocks hiding outlines -;; Maintainer-Version: 5.58.2.4 +;; Maintainer-Version: 5.65.2.2 ;; Time-of-Day-Author-Most-Likely-to-be-Recalcitrant: early morning ;; This file is part of GNU Emacs. @@ -208,11 +208,11 @@ ;; Thanks go to the following people for valuable ideas, code and ;; bug reports. ;; -;; Dean Andrews, Alf-Ivar Holm, Holger Bauer, Christoph Conrad, Dave -;; Love, Dirk Herrmann, Gael Marziou, Jan Djarv, Guillaume Leray, -;; Moody Ahmad, Preston F. Crow, Lars Lindberg, Reto Zimmermann, -;; Keith Sheffield, Chew Meng Kuan, Tony Lam, Pete Ware, François -;; Pinard, Stefan Monnier, Joseph Eydelnant, Michael Ernst +;; Dean Andrews, Alf-Ivar Holm, Holger Bauer, Christoph Conrad, Dave Love, +;; Dirk Herrmann, Gael Marziou, Jan Djarv, Guillaume Leray, Moody Ahmad, +;; Preston F. Crow, Lars Lindberg, Reto Zimmermann, Keith Sheffield, +;; Chew Meng Kuan, Tony Lam, Pete Ware, François Pinard, Stefan Monnier, +;; Joseph Eydelnant, Michael Ernst, Peter Heslin ;; ;; Special thanks go to Dan Nicolaescu, who reimplemented hideshow using ;; overlays (rather than selective display), added isearch magic, folded @@ -243,7 +243,6 @@ :prefix "hs-" :group 'languages) -;;;###autoload (defcustom hs-hide-comments-when-hiding-all t "*Hide the comments too when you do an `hs-hide-all'." :type 'boolean @@ -307,6 +306,11 @@ whitespace. Case does not matter.") (defvar hs-hide-all-non-comment-function nil "*Function called if non-nil when doing `hs-hide-all' for non-comments.") +(defvar hs-allow-nesting nil + "*If non-nil, hiding remembers internal blocks. +This means that when the outer block is shown again, any +previously hidden internal blocks remain hidden.") + (defvar hs-hide-hook nil "*Hook called (with `run-hooks') at the end of commands to hide text. These commands include the toggling commands (when the result is to hide @@ -412,12 +416,19 @@ Note that `mode-line-format' is buffer-local.") ;; support functions (defun hs-discard-overlays (from to) - "Delete hideshow overlays in region defined by FROM and TO." + "Delete hideshow overlays in region defined by FROM and TO. +Skip \"internal\" overlays if `hs-allow-nesting' is non-nil." (when (< to from) (setq from (prog1 to (setq to from)))) - (dolist (ov (overlays-in from to)) - (when (overlay-get ov 'hs) - (delete-overlay ov)))) + (if hs-allow-nesting + (let (ov) + (while (> to (setq from (next-overlay-change from))) + (when (setq ov (hs-overlay-at from)) + (setq from (overlay-end ov)) + (delete-overlay ov)))) + (dolist (ov (overlays-in from to)) + (when (overlay-get ov 'hs) + (delete-overlay ov))))) (defun hs-make-overlay (b e kind &optional b-offset e-offset) "Return a new overlay in region defined by B and E with type KIND. @@ -532,19 +543,16 @@ and then further adjusted to be at the end of the line." ;; `q' is the point at the end of the block (progn (hs-forward-sexp mdata 1) (end-of-line) - (point)))) + (point))) + ov) (when (and (< p (point)) (> (count-lines p q) 1)) - (hs-discard-overlays p q) + (cond ((and hs-allow-nesting (setq ov (hs-overlay-at p))) + (delete-overlay ov)) + ((not hs-allow-nesting) + (hs-discard-overlays p q))) (hs-make-overlay p q 'code (- pure-p p))) (goto-char (if end q (min p pure-p))))))) -(defun hs-safety-is-job-n () - "Warn if `buffer-invisibility-spec' does not contain symbol `hs'." - (unless (and (listp buffer-invisibility-spec) - (assq 'hs buffer-invisibility-spec)) - (message "Warning: `buffer-invisibility-spec' does not contain hs!!") - (sit-for 2))) - (defun hs-inside-comment-p () "Return non-nil if point is inside a comment, otherwise nil. Actually, return a list containing the buffer position of the start @@ -587,7 +595,8 @@ as cdr." (while (and (< (point) q) (> (point) p) (not (looking-at hs-c-start-regexp))) - (setq p (point)) ;; use this to avoid an infinite cycle + ;; avoid an infinite cycle + (setq p (point)) (forward-comment 1) (skip-chars-forward " \t\n\f")) (when (or (not (looking-at hs-c-start-regexp)) @@ -657,7 +666,8 @@ Return point, or nil if original point was not in a block." (setq minp (1+ (point))) (funcall hs-forward-sexp-func 1) (setq maxp (1- (point)))) - (hs-discard-overlays minp maxp) ; eliminate weirdness + (unless hs-allow-nesting + (hs-discard-overlays minp maxp)) (goto-char minp) (while (progn (forward-comment (buffer-size)) @@ -667,7 +677,6 @@ Return point, or nil if original point was not in a block." (hs-hide-level-recursive (1- arg) minp maxp) (goto-char (match-beginning hs-block-start-mdata-select)) (hs-hide-block-at-point t))) - (hs-safety-is-job-n) (goto-char maxp)) (defmacro hs-life-goes-on (&rest body) @@ -681,6 +690,15 @@ and `case-fold-search' are both t." (put 'hs-life-goes-on 'edebug-form-spec '(&rest form)) +(defun hs-overlay-at (position) + "Return hideshow overlay at POSITION, or nil if none to be found." + (let ((overlays (overlays-at position)) + ov found) + (while (and (not found) (setq ov (car overlays))) + (setq found (and (overlay-get ov 'hs) ov) + overlays (cdr overlays))) + found)) + (defun hs-already-hidden-p () "Return non-nil if point is in an already-hidden block, otherwise nil." (save-excursion @@ -694,12 +712,7 @@ and `case-fold-search' are both t." ;; point is inside a block (goto-char (match-end 0))))) (end-of-line) - (let ((overlays (overlays-at (point))) - (found nil)) - (while (and (not found) (overlayp (car overlays))) - (setq found (overlay-get (car overlays) 'hs) - overlays (cdr overlays))) - found))) + (hs-overlay-at (point)))) (defun hs-c-like-adjust-block-beginning (initial) "Adjust INITIAL, the buffer position after `hs-block-start-regexp'. @@ -723,7 +736,8 @@ If `hs-hide-comments-when-hiding-all' is non-nil, also hide the comments." (hs-life-goes-on (message "Hiding all blocks ...") (save-excursion - (hs-discard-overlays (point-min) (point-max)) ; eliminate weirdness + (unless hs-allow-nesting + (hs-discard-overlays (point-min) (point-max))) (goto-char (point-min)) (let ((count 0) (re (concat "\\(" @@ -746,13 +760,12 @@ If `hs-hide-comments-when-hiding-all' is non-nil, also hide the comments." (funcall hs-hide-all-non-comment-function) (hs-hide-block-at-point t))) ;; found a comment, probably - (let ((c-reg (hs-inside-comment-p))) ; blech! + (let ((c-reg (hs-inside-comment-p))) (when (and c-reg (car c-reg)) (if (> (count-lines (car c-reg) (nth 1 c-reg)) 1) (hs-hide-block-at-point t c-reg) (goto-char (nth 1 c-reg)))))) - (message "Hiding ... %d" (setq count (1+ count))))) - (hs-safety-is-job-n)) + (message "Hiding ... %d" (setq count (1+ count)))))) (beginning-of-line) (message "Hiding all blocks ... done") (run-hooks 'hs-hide-hook))) @@ -762,7 +775,8 @@ If `hs-hide-comments-when-hiding-all' is non-nil, also hide the comments." (interactive) (hs-life-goes-on (message "Showing all blocks ...") - (hs-discard-overlays (point-min) (point-max)) + (let ((hs-allow-nesting nil)) + (hs-discard-overlays (point-min) (point-max))) (message "Showing all blocks ... done") (run-hooks 'hs-show-hook))) @@ -781,7 +795,6 @@ Upon completion, point is repositioned and the normal hook (looking-at hs-block-start-regexp) (hs-find-block-beginning)) (hs-hide-block-at-point end c-reg) - (hs-safety-is-job-n) (run-hooks 'hs-hide-hook)))))) (defun hs-show-block (&optional end) @@ -793,17 +806,15 @@ See documentation for functions `hs-hide-block' and `run-hooks'." (hs-life-goes-on (or ;; first see if we have something at the end of the line - (catch 'eol-begins-hidden-region-p - (let ((here (point))) - (dolist (ov (save-excursion (end-of-line) (overlays-at (point)))) - (when (overlay-get ov 'hs) - (goto-char - (cond (end (overlay-end ov)) - ((eq 'comment (overlay-get ov 'hs)) here) - (t (+ (overlay-start ov) (overlay-get ov 'hs-b-offset))))) - (delete-overlay ov) - (throw 'eol-begins-hidden-region-p t))) - nil)) + (let ((ov (hs-overlay-at (save-excursion (end-of-line) (point)))) + (here (point))) + (when ov + (goto-char + (cond (end (overlay-end ov)) + ((eq 'comment (overlay-get ov 'hs)) here) + (t (+ (overlay-start ov) (overlay-get ov 'hs-b-offset))))) + (delete-overlay ov) + t)) ;; not immediately obvious, look for a suitable block (let ((c-reg (hs-inside-comment-p)) p q) @@ -812,13 +823,13 @@ See documentation for functions `hs-hide-block' and `run-hooks'." (setq p (car c-reg) q (cadr c-reg)))) ((and (hs-find-block-beginning) - (looking-at hs-block-start-regexp)) ; fresh match-data, ugh + ;; ugh, fresh match-data + (looking-at hs-block-start-regexp)) (setq p (point) q (progn (hs-forward-sexp (hs-match-data t) 1) (point))))) (when (and p q) (hs-discard-overlays p q) (goto-char (if end q (1+ p))))) - (hs-safety-is-job-n) (run-hooks 'hs-show-hook)))) (defun hs-hide-level (arg) @@ -830,7 +841,6 @@ The hook `hs-hide-hook' is run; see `run-hooks'." (message "Hiding blocks ...") (hs-hide-level-recursive arg (point-min) (point-max)) (message "Hiding blocks ... done")) - (hs-safety-is-job-n) (run-hooks 'hs-hide-hook))) (defun hs-toggle-hiding () diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el index cc706195cc2..7dc12226722 100644 --- a/lisp/progmodes/idlw-shell.el +++ b/lisp/progmodes/idlw-shell.el @@ -2263,7 +2263,7 @@ overlays." (idlwave-shell-display-line (nth idlwave-shell-calling-stack-index stack) nil (unless idlwave-shell-electric-debug-mode 'no-debug)) - (message (or message + (message "%s" (or message (format "In routine %s (stack level %d)" idlwave-shell-calling-stack-routine (- idlwave-shell-calling-stack-index)))))) diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el index 0f1ea571a85..ce689847e9c 100644 --- a/lisp/progmodes/idlwave.el +++ b/lisp/progmodes/idlwave.el @@ -3995,7 +3995,7 @@ you specify /." ;; Call etags (if (not (string-match "^[ \\t]*$" item)) (progn - (message (concat "Tagging " item "...")) + (message "%s" (concat "Tagging " item "...")) (setq errbuf (get-buffer-create "*idltags-error*")) (setq status (+ status (if (eq 0 (call-process @@ -5188,7 +5188,7 @@ be set to nil to disable library catalog scanning." message-base (not (string= idlwave-library-catalog-libname old-libname))) - (message (concat message-base + (message "%s" (concat message-base idlwave-library-catalog-libname)) (setq old-libname idlwave-library-catalog-libname)) (when idlwave-library-catalog-routines diff --git a/lisp/progmodes/ps-mode.el b/lisp/progmodes/ps-mode.el index fecf1f07eb5..b49fcafe186 100644 --- a/lisp/progmodes/ps-mode.el +++ b/lisp/progmodes/ps-mode.el @@ -630,7 +630,7 @@ defines the beginning of a group. These tokens are: { [ <<" (current-column)) (error (ding) - (message (error-message-string err)) + (message "%s" (error-message-string err)) 0)) (let (target) (if (not (re-search-backward "[^ \t\n\r\f][ \t\n\r\f]*\\=" nil t)) diff --git a/lisp/progmodes/scheme.el b/lisp/progmodes/scheme.el index 712f967fcbc..aa50a013585 100644 --- a/lisp/progmodes/scheme.el +++ b/lisp/progmodes/scheme.el @@ -157,7 +157,7 @@ (make-local-variable 'parse-sexp-ignore-comments) (setq parse-sexp-ignore-comments t) (make-local-variable 'lisp-indent-function) - (set lisp-indent-function 'scheme-indent-function) + (setq lisp-indent-function 'scheme-indent-function) (setq mode-line-process '("" scheme-mode-line-process)) (set (make-local-variable 'imenu-case-fold-search) t) (setq imenu-generic-expression scheme-imenu-generic-expression) diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index 663332fb8c6..20af60e8968 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el @@ -2572,9 +2572,9 @@ If INFO is supplied it is used, else it is calculated from current line." (if (numberp blinkpos) (save-excursion (goto-char blinkpos) - (message msg) + (if msg (message "%s" msg) (message nil)) (sit-for blink-matching-delay)) - (message msg))) + (if message (message "%s" msg) (message nil)))) (defun sh-show-indent (arg) "Show the how the currently line would be indented. @@ -2591,7 +2591,7 @@ we are indenting relative to, if applicable." (curr-indent (current-indentation)) val msg) (if (stringp var) - (message (setq msg var)) + (message "%s" (setq msg var)) (setq val (sh-calculate-indent info)) (if (eq curr-indent val) @@ -2610,8 +2610,8 @@ we are indenting relative to, if applicable." (if (and info (listp (car info)) (eq (car (car info)) t)) (sh-blink (nth 1 (car info)) msg) - (message msg))) - (message msg)) + (message "%s" msg))) + (message "%s" msg)) )) (defun sh-set-indent () @@ -2624,7 +2624,7 @@ for a new value for it." (var (sh-get-indent-var-for-line info)) val old-val indent-val) (if (stringp var) - (message (format "Cannot set indent - %s" var)) + (message "Cannot set indent - %s" var) (setq old-val (symbol-value var)) (setq val (sh-read-variable var)) (condition-case nil @@ -2675,7 +2675,7 @@ unless optional argument ARG (the prefix when interactive) is non-nil." (curr-indent (current-indentation))) (cond ((stringp var) - (message (format "Cannot learn line - %s" var))) + (message "Cannot learn line - %s" var)) ((eq var 'sh-indent-comment) ;; This is arbitrary... ;; - if curr-indent is 0, set to curr-indent diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el index 1caaa1f35b6..04ddf7b8fcd 100644 --- a/lisp/progmodes/vhdl-mode.el +++ b/lisp/progmodes/vhdl-mode.el @@ -134,12 +134,15 @@ "Non-nil if GNU Emacs 22, ... is used.") (defvar compilation-file-regexp-alist) +(defvar conf-alist) +(defvar conf-entry) +(defvar conf-key) +(defvar ent-alist) (defvar itimer-version) (defvar lazy-lock-defer-contextually) (defvar lazy-lock-defer-on-scrolling) (defvar lazy-lock-defer-on-the-fly) - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; Variables ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -363,7 +366,7 @@ Unit-to-file name mapping: mapping of library unit names to names of files Case adjustment : adjust case of inserted unit names \(*) The regular expression must match the error message starting from the - beginning of the line (but not necessarily to the end of the line). + beginning of the line (but not necessarily to the end of the line). Compile options allows insertion of the library name (see `vhdl-project-alist') in order to set the compilers library option (e.g. \"vcom -work my_lib\"). @@ -1059,7 +1062,7 @@ begin -- process