[ELPA-diffs] /srv/bzr/emacs/elpa r281: * packages/csv-mode/csv-mode.el (csv-end-of-field): Don't skip TABs.

[Stefan Monnier]

revno: 281
committer: Stefan Monnier 
branch nick: elpa
timestamp: Mon 2012-10-22 17:58:24 -0400
message:
  * packages/csv-mode/csv-mode.el (csv-end-of-field): Don't skip TABs.
  (csv--skip-regexp): Rename from csv-skip-regexp.
modified:
  packages/csv-mode/csv-mode.el
=== modified file 'packages/csv-mode/csv-mode.el'
--- a/packages/csv-mode/csv-mode.el 2012-10-10 17:02:39 +
+++ b/packages/csv-mode/csv-mode.el 2012-10-22 21:58:24 +
@@ -126,7 +126,7 @@
   "Regexp to match a field separator.
 Set by customizing `csv-separators' -- do not set directly!")
 
-(defvar csv-skip-regexp nil
+(defvar csv--skip-regexp nil
   "Regexp used by `skip-chars-forward' etc. to skip fields.
 Set by customizing `csv-separators' -- do not set directly!")
 
@@ -154,7 +154,7 @@
   value)
 (custom-set-default variable value)
 (setq csv-separator-chars (mapcar 'string-to-char value)
-  csv-skip-regexp (apply 'concat "^\n" csv-separators)
+  csv--skip-regexp (apply 'concat "^\n" csv-separators)
   csv-separator-regexp (apply 'concat `("[" ,@value "]"))
   csv-font-lock-keywords
   ;; NB: csv-separator-face variable evaluates to itself.
@@ -597,7 +597,7 @@
   (barf-if-buffer-read-only)
   (csv-sort-fields-1 field beg end
 (lambda () (csv-sort-skip-fields field) nil)
-(lambda () (skip-chars-forward csv-skip-regexp
+(lambda () (skip-chars-forward csv--skip-regexp
 
 (defun csv-sort-numeric-fields (field beg end)
   "Sort lines in region numerically by the ARGth field of each line.
@@ -651,17 +651,17 @@
 
 (defsubst csv-end-of-field ()
   "Skip forward over one field."
-  (skip-syntax-forward " ")
+  (skip-chars-forward " ")
   (if (eq (char-syntax (following-char)) ?\")
   (goto-char (scan-sexps (point) 1)))
-  (skip-chars-forward csv-skip-regexp))
+  (skip-chars-forward csv--skip-regexp))
 
 (defsubst csv-beginning-of-field ()
   "Skip backward over one field."
   (skip-syntax-backward " ")
   (if (eq (char-syntax (preceding-char)) ?\")
   (goto-char (scan-sexps (point) -1)))
-  (skip-chars-backward csv-skip-regexp))
+  (skip-chars-backward csv--skip-regexp))
 
 (defun csv-forward-field (arg)
   "Move forward across one field, cf. `forward-sexp'.

[ELPA-diffs] /srv/bzr/emacs/elpa r280: * admin/archive-contents.el (batch-make-site-package): New function.

[Stefan Monnier]

revno: 280
committer: Stefan Monnier 
branch nick: elpa
timestamp: Mon 2012-10-22 17:56:43 -0400
message:
  * admin/archive-contents.el (batch-make-site-package): New function.
  * Makefile (site/%): Use it.
modified:
  Makefile
  admin/archive-contents.el
=== modified file 'Makefile'
--- a/Makefile  2012-10-08 04:05:54 +
+++ b/Makefile  2012-10-22 21:56:43 +
@@ -5,7 +5,7 @@
 ARCHIVE_TMP=archive-tmp
 SITE_DIR=site
 
-.PHONY: archive-tmp process-archive archive-full org-fetch clean all
+.PHONY: archive-tmp process-archive archive-full org-fetch clean all do-it
 
 ## Set up the source files for direct usage, by pointing
 ## `package-directory-list' to the site/ directory.
@@ -14,6 +14,10 @@
$(EMACS) -batch -l $(CURDIR)/admin/archive-contents.el \
  --eval "(batch-make-site-dir \"packages\" \"$(SITE_DIR)\")"
 
+site/%: do-it
+   $(EMACS) -batch -l $(CURDIR)/admin/archive-contents.el \
+ --eval "(progn (setq debug-on-error t) (batch-make-site-package 
\"$@\"))"
+
 ## Deploy the package archive to archive/, with packages in
 ## archive/packages/:
 archive: archive-tmp

=== modified file 'admin/archive-contents.el'
--- a/admin/archive-contents.el 2012-05-05 05:07:32 +
+++ b/admin/archive-contents.el 2012-10-22 21:56:43 +
@@ -1,6 +1,6 @@
 ;;; archive-contents.el --- Auto-generate an Emacs Lisp package archive.
 
-;; Copyright (C) 2011  Free Software Foundation, Inc
+;; Copyright (C) 2011, 2012  Free Software Foundation, Inc
 
 ;; Author: Stefan Monnier 
 
@@ -22,6 +22,7 @@
 ;;; Code:
 
 (require 'lisp-mnt)
+(require 'package)
 
 (defconst archive-contents-subdirectory-regexp
   
"\\([^.].*?\\)-\\([0-9]+\\(?:[.][0-9]+\\|\\(?:pre\\|beta\\|alpha\\)[0-9]+\\)*\\)")
@@ -187,7 +188,7 @@
   (setq package-dir (expand-file-name package-dir default-directory))
   (setq site-dir (expand-file-name site-dir default-directory))
   (dolist (dir (directory-files package-dir t archive-re-no-dot))
-   (condition-case v
+(condition-case v
(if (not (file-directory-p dir))
(error "Skipping non-package file %s" dir)
  (let* ((pkg (file-name-nondirectory dir))
@@ -218,6 +219,16 @@
  ;; Error handler
  (error (message "%s" (cadr v))
 
+(defun batch-make-site-package (sdir)
+  (let* ((dest (car (file-attributes sdir)))
+ (pkg (file-name-nondirectory (directory-file-name (or dest sdir
+ (dir (or dest sdir)))
+(let ((make-backup-files nil))
+  (package-generate-autoloads pkg dir))
+(let ((load-path (cons dir load-path)))
+  ;; FIXME: Don't compile the -pkg.el files!
+  (byte-recompile-directory dir 0
+
 (defun archive--write-pkg-file (pkg-dir name version desc requires &rest 
ignored)
   (let ((pkg-file (expand-file-name (concat name "-pkg.el") pkg-dir))
(print-level nil)