aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--e-util/ChangeLog6
-rw-r--r--e-util/e-html-utils.c44
2 files changed, 22 insertions, 28 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index d9923c0463..9dfc021ecb 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,9 @@
+2002-08-01 Dan Winship <danw@ximian.com>
+
+ * e-html-utils.c (is_citation): Remove the logic that assumes
+ "Rupert> " is a citation, since it misfires more often than it
+ hits.
+
2002-07-31 Dan Winship <danw@ximian.com>
* e-html-utils.c (is_addr_char, is_trailing_garbage): Don't use
diff --git a/e-util/e-html-utils.c b/e-util/e-html-utils.c
index 958987c475..bc05d26f25 100644
--- a/e-util/e-html-utils.c
+++ b/e-util/e-html-utils.c
@@ -118,41 +118,29 @@ email_address_extract (const unsigned char **cur, char **out, const unsigned cha
static gboolean
is_citation (const unsigned char *c, gboolean saw_citation)
{
- gunichar u;
- gint i;
+ const unsigned char *p;
+
+ if (*c != '>')
+ return FALSE;
/* A line that starts with a ">" is a citation, unless it's
* just mbox From-mangling...
*/
- if (*c == '>') {
- const unsigned char *p;
-
- if (strncmp (c, ">From ", 6) != 0)
- return TRUE;
-
- /* If the previous line was a citation, then say this
- * one is too.
- */
- if (saw_citation)
- return TRUE;
+ if (strncmp (c, ">From ", 6) != 0)
+ return TRUE;
- /* Same if the next line is */
- p = (const unsigned char *)strchr ((const char *)c, '\n');
- if (p && *++p == '>')
- return TRUE;
+ /* If the previous line was a citation, then say this
+ * one is too.
+ */
+ if (saw_citation)
+ return TRUE;
- /* Otherwise, it was just an isolated ">From" line. */
- return FALSE;
- }
+ /* Same if the next line is */
+ p = (const unsigned char *)strchr ((const char *)c, '\n');
+ if (p && *++p == '>')
+ return TRUE;
- /* Check for "Rupert> " and the like... */
- for (i = 0; c && *c && g_unichar_validate (g_utf8_get_char (c)) && *c != '\n' && i < 10; i ++, c = g_utf8_next_char (c)) {
- u = g_utf8_get_char (c);
- if (u == '>')
- return TRUE;
- if (!g_unichar_isalnum (u))
- return FALSE;
- }
+ /* Otherwise, it was just an isolated ">From" line. */
return FALSE;
}
n class='deletions'>-0/+1 | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It has been common practice to have one or more URLs at the end of the ports' pkg-descr files, one per line and prefixed with "WWW:". These URLs should point at a project website or other relevant resources. Access to these URLs required processing of the pkg-descr files, and they have often become stale over time. If more than one such URL was present in a pkg-descr file, only the first one was tarnsfered into the port INDEX, but for many ports only the last line did contain the port specific URL to further information. There have been several proposals to make a project URL available as a macro in the ports' Makefiles, over time. This commit implements such a proposal and moves one of the WWW: entries of each pkg-descr file into the respective port's Makefile. A heuristic attempts to identify the most relevant URL in case there is more than one WWW: entry in some pkg-descr file. URLs that are not moved into the Makefile are prefixed with "See also:" instead of "WWW:" in the pkg-descr files in order to preserve them. There are 1256 ports that had no WWW: entries in pkg-descr files. These ports will not be touched in this commit. The portlint port has been adjusted to expect a WWW entry in each port Makefile, and to flag any remaining "WWW:" lines in pkg-descr files as deprecated. Approved by: portmgr (tcberner) * news: remove 'Created by' linesTobias C. Berner2022-07-201-2/+0 | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A big Thank You to the original contributors of these ports: * Adam David <adam@FreeBSD.org> * Ade Lovett <ade@FreeBSD.org> * Andreas Klemm <andreas@klemm.gtn.com> * Andrey Slusar <anray@FreeBSD.org> * Brian Somers <brian@FreeBSD.org> * Carey Jones <mcj@acquiesce.org> * David O'Brien (obrien@cs.ucdavis.edu) * Denis Shaposhnikov <dsh@vlink.ru> * Don Croyle <croyle@gelemna.org> * Donald Burr <dburr@FreeBSD.org> * Frederic Cambus * George Sorsby <george@crackpipe.net> * James FitzGibbon <jfitz@FreeBSD.org> * Jin-Shan Tseng <tjs@cdpa.nsysu.edu.tw> * Joe Marcus Clarke <marcus@FreeBSD.org> * John Holland <john@zoner.org> * Jun-ichiro itojun Itoh <itojun@itojun.org> * Kirill Ponomarew <ponomarew@oberon.net> * Lasse L. Johnsen (lasse@freebsdcluster.org) * Lewis Thompson <purple@lewiz.net> * Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> * Max Khon * Michael L. Hostbaek <mich@freebsdcluster.org> * Mikolaj Rydzewski <miki@ceti.pl> * Noritaka Ishizumi <graphite@taurus.bekkoame.or.jp> * Oliver Braun <obraun@informatik.unibw-muenchen.de> * Pete Fritchman <petef@databits.net> * Ralf van der Enden <tremere@cainites.net> * Sergey Skvortsov <skv@protey.ru> * Thierry Thomas <tthomas@mail.dotcom.fr> * Tim Welch <ports@thepentagon.org> * Yen-Ming Lee <leeym@FreeBSD.org> * Yen-Ming Lee <leeym@cae.ce.ntu.edu.tw> * adam * asaddi@philosophysw.com * bkhl@elektrubadur.se * gary@hayers.org * ijliao * kbowling * obrien@cs.ucdavis.edu * proff@suburbia.net * smace * torstenb With hat: portmgr * Remove # $FreeBSD$ from Makefiles.Mathieu Arnold2021-04-061-1/+0 | * Convert to UCL & cleanup pkg-message (categories n)Mathieu Arnold2019-08-141-4/+6 | | | | | | | (and missed 3 missed files from previous categories.) Notes: svn path=/head/; revision=508903 * Update `databases/gdbm' to version 1.18.1, an important bugfix releaseAlexey Dokuchaev2018-11-11