[ELPA-diffs] /srv/bzr/emacs/elpa r288: Selective merge of trivial font-latex.el fix from AUCTeX CVS

2012-10-30 Thread Glenn Morris

revno: 288
committer: Glenn Morris 
branch nick: elpa
timestamp: Tue 2012-10-30 00:18:50 -0700
message:
  Selective merge of trivial font-latex.el fix from AUCTeX CVS
  
  http://debbugs.gnu.org/11837
  http://lists.gnu.org/archive/html/auctex-diffs/2012-07/msg0.html
  http://lists.gnu.org/archive/html/emacs-devel/2012-10/msg00752.html
modified:
  packages/auctex/font-latex.el
=== modified file 'packages/auctex/font-latex.el'
--- a/packages/auctex/font-latex.el 2010-11-18 18:24:12 +
+++ b/packages/auctex/font-latex.el 2012-10-30 07:18:50 +
@@ -1944,8 +1944,8 @@
(symbol-function 'font-latex-make-built-in-keywords))
   (dolist (elt font-latex-built-in-keyword-classes)
 (let ((name (nth 0 elt)))
-  (byte-compile (intern (concat "font-latex-" name)))
-  (byte-compile (intern (concat "font-latex-" name "-make"))
+  (byte-compile (intern (concat "font-latex-match-" name)))
+  (byte-compile (intern (concat "font-latex-match-" name "-make"))
 
 
 ;; Provide ourselves:



[ELPA-diffs] /srv/bzr/emacs/elpa r289: Clean up copyright notices.

2012-10-30 Thread Stefan Monnier

revno: 289
committer: Stefan Monnier 
branch nick: elpa
timestamp: Tue 2012-10-30 11:41:39 -0400
message:
  Clean up copyright notices.
modified:
  packages/adaptive-wrap/adaptive-wrap.el
  packages/all/all.el
  packages/auctex/style/harvard.el
  packages/auctex/tex-fptex.el
  packages/auctex/tex-jp.el
  packages/auctex/tex.el
  packages/epoch-view/epoch-view.el
  packages/muse/cgi.el
  packages/muse/httpd.el
  packages/uni-confusables/gen-confusables.el
=== modified file 'packages/adaptive-wrap/adaptive-wrap.el'
--- a/packages/adaptive-wrap/adaptive-wrap.el   2012-05-21 04:46:36 +
+++ b/packages/adaptive-wrap/adaptive-wrap.el   2012-10-30 15:41:39 +
@@ -1,6 +1,6 @@
 ;;; adaptive-wrap.el --- Smart line-wrapping with wrap-prefix
 
-;; Copyright (C) 2011  Stefan Monnier
+;; Copyright (C) 2011, 2012  Free Software Foundation, Inc.
 
 ;; Author: Stephen Berman 
 ;; Stefan Monnier 

=== modified file 'packages/all/all.el'
--- a/packages/all/all.el   2011-07-04 19:28:39 +
+++ b/packages/all/all.el   2012-10-30 15:41:39 +
@@ -1,7 +1,6 @@
 ;;; all.el --- Edit all lines matching a given regexp
 
-;; Copyright (C) 1985-1987, 1992, 1994, 2011 Free Software Foundation, Inc.
-;; Copyright (C) 1994 Per Abrahamsen
+;; Copyright (C) 1985-1987,1992,1994,2011-2012 Free Software Foundation, Inc.
 
 ;; Author: Per Abrahamsen 
 ;; Version: 1.0

=== modified file 'packages/auctex/style/harvard.el'
--- a/packages/auctex/style/harvard.el  2010-11-18 18:24:12 +
+++ b/packages/auctex/style/harvard.el  2012-10-30 15:41:39 +
@@ -1,14 +1,13 @@
 ;;; harvard.el --- Support for Harvard Citation style package for AUCTeX.
 
+;; Copyright (C) 1994,1997,2005,2012  Free Software Foundation, Inc.
+
 ;; Harvard citation style is from Peter Williams
 ;; available on the CTAN servers
 
+;; Author: Berwin Turlach 
 ;; Version: $Id: harvard.el,v 1.10 2008/02/03 14:53:30 angeli Exp $
 
-;; Copyright (C) 1994 Berwin Turlach 
-;; Copyright (C) 1997 Berwin Turlach 
-;; Copyright (C) 2005 Free Software Foundation, Inc.
-
 ;; 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 3, or (at your option)

=== modified file 'packages/auctex/tex-fptex.el'
--- a/packages/auctex/tex-fptex.el  2010-11-18 18:24:12 +
+++ b/packages/auctex/tex-fptex.el  2012-10-30 15:41:39 +
@@ -1,7 +1,6 @@
 ;;; tex-fptex.el --- fpTeX support for AUCTeX.
 
-;; Copyright (C) 2000 Fabrice Popineau
-;; Copyright (C) 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2004, 2012 Free Software Foundation, Inc.
 
 ;; Author: Fabrice Popineau 
 ;; Maintainer: auctex-de...@gnu.org

=== modified file 'packages/auctex/tex-jp.el'
--- a/packages/auctex/tex-jp.el 2010-11-18 18:24:12 +
+++ b/packages/auctex/tex-jp.el 2012-10-30 15:41:39 +
@@ -1,9 +1,9 @@
 ;;; tex-jp.el --- Support for Japanese TeX.
 
-;; Copyright (C) 1999, 2001 Hidenobu Nabetani 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation
+;; Copyright (C) 1999, 2001-2007, 2012  Free Software Foundation, Inc.
 
-;; Author: KOBAYASHI Shinji 
+;; Author: KOBAYASHI Shinji ,
+;; Hidenobu Nabetani 
 ;; Maintainer: Masayuki Ataka 
 ;; Keywords: tex
 

=== modified file 'packages/auctex/tex.el'
--- a/packages/auctex/tex.el2010-11-18 18:24:12 +
+++ b/packages/auctex/tex.el2012-10-30 15:41:39 +
@@ -1,7 +1,6 @@
 ;;; tex.el --- Support for TeX documents.
 
-;; Copyright (C) 1985, 1986, 1987, 1991, 1993, 1994, 1996, 1997, 1999,
-;;   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+;; Copyright (C) 1985-1987, 1991, 1993, 1994, 1996, 1997, 1999-2012
 ;;   Free Software Foundation, Inc.
 
 ;; Maintainer: auctex-de...@gnu.org

=== modified file 'packages/epoch-view/epoch-view.el'
--- a/packages/epoch-view/epoch-view.el 2011-07-08 17:01:15 +
+++ b/packages/epoch-view/epoch-view.el 2012-10-30 15:41:39 +
@@ -1,7 +1,6 @@
 ;;; epoch-view.el --- Minor mode to visualize epoch timestamps
 
-;; Copyright (C) 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2010, 2012  Free Software Foundation, Inc.
 
 ;; Author: Ted Zlatanov 
 ;; Keywords: data, timestamp, epoch, unix

=== modified file 'packages/muse/cgi.el'
--- a/packages/muse/cgi.el  2010-11-18 18:24:12 +
+++ b/packages/muse/cgi.el  2012-10-30 15:41:39 +
@@ -1,13 +1,13 @@
-;;; cgi.el -- using Emacs for CGI scripting
-;;;
-;;; Author: Eric Marsden  
-;;; Michael Olson  (slight modifications)
-;;; Keywords: CGI web scripting slow
-;;; Version: 0.3
-;;; Time-stamp: <2001-08-24 emarsden>
-;;; Copyright: (C) 2000  Eric Marsden
-;;; Parts copyright (C) 2006 Free Software Foundation, Inc.
-;;
+;;; cgi.el -- Using Emacs for CGI scripting
+
+;; Copyright (C) 2000, 2006, 2012 Free Software Foundation, Inc.
+
+;; Author: Eric Marsde

[ELPA-diffs] /srv/bzr/emacs/elpa r290: New script for auto-update of GNU ELPA.

2012-10-30 Thread Stefan Monnier

revno: 290
committer: Stefan Monnier 
branch nick: elpa
timestamp: Tue 2012-10-30 13:49:47 -0400
message:
  New script for auto-update of GNU ELPA.
added:
  admin/update-archive.sh
modified:
  Makefile
=== modified file 'Makefile'
--- a/Makefile  2012-10-22 21:56:43 +
+++ b/Makefile  2012-10-30 17:49:47 +
@@ -25,7 +25,7 @@
 
 archive-tmp: packages
mkdir -p $(ARCHIVE_TMP)
-   cp -r packages $(ARCHIVE_TMP)
+   cp -r packages/. $(ARCHIVE_TMP)/packages
 
 process-archive:
cd $(ARCHIVE_TMP)/packages; $(EMACS) -batch -l 
$(CURDIR)/admin/archive-contents.el -f batch-make-archive
@@ -47,13 +47,13 @@
 ## admin scripts:
 archive-full: archive-tmp org-fetch
$(MAKE) $(MFLAGS) process-archive
-   mkdir -p archive/admin
-   cp admin/* archive/admin/
+   #mkdir -p archive/admin
+   #cp admin/* archive/admin/
 
 org-fetch: archive-tmp
-   cd archive-tmp/packages; \
-   pkgname=`curl -s http://orgmode.org/elpa/|perl -ne 'push @f, $1 if 
m/(org-\d{8})\.tar/; END { @f = sort @f; print "$f[-1]\n"}'`; \
-   wget -q http://orgmode.org/elpa/${pkgname}.tar -O ${pkgname}.tar; \
+   cd $(ARCHIVE_TMP)/packages; \
+   pkgname=`curl -s http://orgmode.org/elpa/|perl -ne 'push @f, $$1 if 
m/(org-\d{8})\.tar/; END { @f = sort @f; print "$$f[-1]\n"}'`; \
+   wget -q http://orgmode.org/elpa/$${pkgname}.tar -O $${pkgname}.tar; \
if [ -f $${pkgname}.tar ]; then \
tar xf $${pkgname}.tar; \
rm -f $${pkgname}.tar; \

=== added file 'admin/update-archive.sh'
--- a/admin/update-archive.sh   1970-01-01 00:00:00 +
+++ b/admin/update-archive.sh   2012-10-30 17:49:47 +
@@ -0,0 +1,83 @@
+#!/bin/sh -x
+
+batchmode=no
+
+export LANG=C
+case "$1" in
+"--batch") batchmode=yes ;;
+esac
+
+# Return on STDOUT the files that don't seem to have the needed copyright
+# notice, or that have a copyright notice that looks suspicious.
+copyright_notices () {
+find . -name '*.el' -print0 |
+xargs -0 grep -L 'Free Software Foundation, Inc' |
+grep -v '.-\(pkg\|autoloads\)\.el$'
+
+find . -name '*.el' -print |
+while read f; do
+sed -n -e '/[Cc]opyright.*, *[1-9][-0-9]*,\?$/N' \
+-e '/Free Software Foundation/d' \
+-e "s|^\\(.*[Cc]opyright\\)|$(echo $f | tr '|' '_'):\\1|p" "$f"
+done
+}
+
+# Send an email to warn about a problem.
+# Takes the body on STDIN and the subject as argument.
+signal_error () {
+title="$*"
+if [ "no" = "$batchmode" ]; then
+cat -
+echo "Error: $title"
+else
+set -- $(host -t mx gnu.org);
+mx_gnu_org="$4"
+(cat <
+RCPT TO: 
+DATA
+From: ELPA update 
+To: emacs-elpa-diffs@gnu.org
+ENDDOC
+ echo "Subject: $title"
+ echo
+ cat -
+ echo ".") | telnet "$mx_gnu_org" smtp
+fi
+}
+
+check_copyright () {
+base="copyright_exceptions"
+(cd packages; copyright_notices) >"$base.new"
+if [ -r "$base.old" ] &&
+   ! diff "$base.old" "$base.new" >/dev/null;
+then
+diff -u "$base.old" "$base.new" |
+signal_error "Copyright notices changed"
+exit 1
+else
+mv "$base.new" "$base.old"
+fi
+}
+
+cd ~elpa/build
+
+(cd ~elpa/elpa; bzr up)
+
+check_copyright
+
+rm -rf archive  # In case there's one left over!
+make archive-full >make.log 2>&1 || {
+signal_error "make archive-full failed" 

[ELPA-diffs] /srv/bzr/emacs/elpa r291: * update-archive.sh (signal_error): Fix up sendmail script.

2012-10-30 Thread Stefan Monnier

revno: 291
committer: Stefan Monnier 
branch nick: elpa
timestamp: Tue 2012-10-30 14:20:46 -0400
message:
  * update-archive.sh (signal_error): Fix up sendmail script.
modified:
  admin/update-archive.sh
=== modified file 'admin/update-archive.sh'
--- a/admin/update-archive.sh   2012-10-30 17:49:47 +
+++ b/admin/update-archive.sh   2012-10-30 18:20:46 +
@@ -32,16 +32,16 @@
 else
 set -- $(host -t mx gnu.org);
 mx_gnu_org="$4"
-(cat <
-RCPT TO: 
-DATA
+(sleep 5; echo "HELO elpa.gnu.org"
+ sleep 1; echo "MAIL FROM: "
+ sleep 1; echo "RCPT TO: "
+ sleep 1; echo "DATA"
+ sleep 1; cat <
 To: emacs-elpa-diffs@gnu.org
+Subject: $title
+
 ENDDOC
- echo "Subject: $title"
- echo
  cat -
  echo ".") | telnet "$mx_gnu_org" smtp
 fi