[ELPA-diffs] /srv/bzr/emacs/elpa r256: Add num3-mode
revno: 256 author: Michal Nazarewicz min...@mina86.com, Felix Lee feli...@gmail.com committer: Stefan Monnier monn...@iro.umontreal.ca branch nick: elpa timestamp: Wed 2012-09-26 15:54:55 -0400 message: Add num3-mode added: packages/num3-mode/ packages/num3-mode/num3-mode.el === added directory 'packages/num3-mode' === added file 'packages/num3-mode/num3-mode.el' --- a/packages/num3-mode/num3-mode.el 1970-01-01 00:00:00 + +++ b/packages/num3-mode/num3-mode.el 2012-09-26 19:54:55 + @@ -0,0 +1,150 @@ +;;; num3-mode.el --- highlight groups of digits in long numbers -*- lexical-binding: t -*- + +;; Copyright (C) 2012 Free Software Foundation, Inc. + +;; Author: Felix Lee feli...@gmail.com, Michal Nazarewicz min...@mina86.com +;; Maintainer: Michal Nazarewicz min...@mina86.com +;; Keywoards: faces, minor-mode +;; Version: 1.0 + +;; GNU Emacs is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs. If not, see http://www.gnu.org/licenses/. + +;;; Commentary: + +;; Num3 is a minor mode that makes long numbers more readable by +;; highlighting groups of 3 (customisable) decimal digits or 4 hex +;; digits when font-lock is on. Highlighting alternates between two +;; faces that can be customised. + +;;; Usage: + +;; M-x num3-mode toggle for current buffer. +;; M-x global-num3-modetoggle for all buffers. +;; +;; Or add the following to your ~/.emacs file: +;; (load path/to/num3) +;; (global-num3-mode) + +;;; Code: + +(defgroup num3 nil + Num3 is a minor mode that makes long numbers more readable by +highlighting groups of decimal digits or 4 hex digits when +font-lock is on. + :group 'text) + +(defcustom num3-group-size 3 + Number of digits to group in decimal numbers.) + +(defcustom num3-threshold 5 + Number must be at least that long to start highlighting.) + +(defface num3-face-odd + '((t)) + Face to add for odd groups of digits. + :group 'num3) + +(defface num3-face-even + '((t :underline t :weight bold :background #ee)) + Face to add for even groups of digits. +The default face uses redundant signaling, because this is in +addition to any other font-lock highlighting. + :group 'num3) + +;;; Implementation: + +;;;###autoload +(define-minor-mode num3-mode + Toggle num3 minor mode in the current buffer. +Num3 minor mode makes long numbers more readable by highlighting +groups of digits when font-lock mode is on. + +If a number is longer than `num3-threshold', the mode will split +it into a group of `num3-group-size' (if number is decimal) or +4 (if number is hexadecimal) digits. Hexadecimal number is +detected as one starting with 0x, 0X or #. + +With decimal numbers, fractions are recognised as well and +grouped from the beginning rathar then from end. For instance, +with group size of 3, a number \12345.12345\ will be split into +groups as follows: \12|345.123|45\. Fractions without integer +part are also recognised, eg. \.12345\. + +The groups are highlighted alternately using `num3-face-odd' and +`num3-face-even' faces. `num3-face-odd' face (which is empty by +default) is the one used for the group closest to the decimal point, +ie. groups are counted starting with one outwards from the (place +where) decimal point (would be) is. + nil num3 nil + (if num3-mode + (unless (assoc '-num3-matcher font-lock-keywords) +(font-lock-add-keywords nil '(-num3-matcher) 'append)) +(font-lock-remove-keywords nil '(-num3-matcher))) + (when font-lock-mode +(font-lock-fontify-buffer))) + +;;;###autoload +(define-globalized-minor-mode global-num3-mode num3-mode num3-mode) + +(defconst -num3-number-re + (concat\\(?:0[xX]\\|#\\)\\([0-9a-fA-F]+\\) ; 1 = hexadecimal + \\|\\([0-9]+\\) ; 2 = decimal + \\|\\.\\([0-9]+\\))); 3 = fraction + +(defun -num3-matcher (lim) + Function used as a font-lock-keywoard handler used in `num3-mode'. +Performs fontification of numbers from point to LIM. + (save-excursion +(while (re-search-forward -num3-number-re lim t) + (-num3-int (match-beginning 1) (match-end 1) 4) + (-num3-int (match-beginning 2) (match-end 2) num3-group-size) + (-num3-frac (match-beginning 3) (match-end 3) num3-group-size))) + nil) + +(defun -num3-int (lo hi n) + Highlight groups of digits in a long number. +LO and HI arguments specify the range where the number
[ELPA-diffs] /srv/bzr/emacs/elpa r273: * csv-mode.el: Bump version number.
revno: 273 committer: Stefan Monnier monn...@iro.umontreal.ca branch nick: elpa timestamp: Wed 2012-10-10 13:02:39 -0400 message: * csv-mode.el: Bump version number. 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:01:57 + +++ b/packages/csv-mode/csv-mode.el 2012-10-10 17:02:39 + @@ -5,7 +5,7 @@ ;; Author: Francis J. Wright F.J.Wright at qmul.ac.uk ;; Time-stamp: 23 August 2004 ;; URL: http://centaur.maths.qmul.ac.uk/Emacs/ -;; Version: 1.0 +;; Version: 1.1 ;; Keywords: convenience ;; This package is free software; you can redistribute it and/or modify
[ELPA-diffs] /srv/bzr/emacs/elpa r280: * admin/archive-contents.el (batch-make-site-package): New function.
revno: 280 committer: Stefan Monnier monn...@iro.umontreal.ca 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 monn...@iro.umontreal.ca @@ -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)
[ELPA-diffs] /srv/bzr/emacs/elpa r301: * trie.el (trie--node-data): Simplify.
revno: 301 committer: Stefan Monnier monn...@iro.umontreal.ca branch nick: elpa timestamp: Fri 2012-11-16 10:58:24 -0500 message: * trie.el (trie--node-data): Simplify. modified: packages/trie/trie.el === modified file 'packages/trie/trie.el' --- a/packages/trie/trie.el 2012-09-11 15:55:45 + +++ b/packages/trie/trie.el 2012-11-16 15:58:24 + @@ -270,8 +270,7 @@ ;; data is stored in the subtree cell of a terminal node (defalias 'trie--node-data 'trie--node-subtree) -(defsetf trie--node-data trie--node-set-data) -(defmacro trie--node-set-data (node data) +(defsetf trie--node-data (node) (data) `(setf (trie--node-subtree ,node) ,data)) (defmacro trie--node-data-p (node)
[ELPA-diffs] /srv/bzr/emacs/elpa r306: * packages/ampc/ampc.el: Add proper file trailer.
revno: 306 committer: Stefan Monnier monn...@iro.umontreal.ca branch nick: elpa timestamp: Thu 2012-11-29 12:06:38 -0500 message: * packages/ampc/ampc.el: Add proper file trailer. modified: packages/ampc/ampc.el === modified file 'packages/ampc/ampc.el' --- a/packages/ampc/ampc.el 2012-08-06 07:06:26 + +++ b/packages/ampc/ampc.el 2012-11-29 17:06:38 + @@ -31,7 +31,7 @@ ;;; ** installation ;; If you use GNU ELPA, install ampc via M-x package-list-packages RET or ;; (package-install 'ampc). Otherwise, grab the files in this repository and -;; put the emacs lisp ones somewhere in your load-path or add the directory the +;; put the Emacs Lisp ones somewhere in your load-path or add the directory the ;; files are in to it, e.g.: ;; ;; (add-to-list 'load-path ~/.emacs.d/ampc) @@ -363,7 +363,7 @@ List of MPD commands that should be executed synchronously. Executing commands that print lots of output synchronously will result in massive performance improvements of ampc. If the car -of this list is `t', execute all commands synchronously other +of this list is t, execute all commands synchronously other than the ones specified by the rest of the list. :type '(repeat symbol)) @@ -3062,7 +3062,7 @@ ;;;###autoload (defun ampc (optional host port suspend) - ampc is an asynchronous client for the MPD media player. + Ampc is an asynchronous client for the MPD media player. This function is the main entry point for ampc. HOST and PORT specify the MPD instance to connect to. The values @@ -3076,9 +3076,9 @@ (unless port (setf port (or (cdr ampc-default-server) (read-string Port: (when (and ampc-connection - (or (not (equal host ampc-host)) - (not (equal port ampc-port)) - (not (ampc-on-p + (not (and (equal host ampc-host) + (equal port ampc-port) + (ampc-on-p (ampc-quit)) (unless ampc-connection (let ((connection (open-network-stream ampc @@ -3115,3 +3115,4 @@ ;; fill-column: 80 ;; indent-tabs-mode: nil ;; End: +;;; ampc.el ends here
[ELPA-diffs] /srv/bzr/emacs/elpa r311: * cl-lib.el: Try and patch things up in case we're hiding the real cl-lib.
revno: 311 committer: Stefan Monnier monn...@iro.umontreal.ca branch nick: elpa timestamp: Fri 2012-11-30 13:27:44 -0500 message: * cl-lib.el: Try and patch things up in case we're hiding the real cl-lib. modified: packages/cl-lib/cl-lib.el === modified file 'packages/cl-lib/cl-lib.el' --- a/packages/cl-lib/cl-lib.el 2012-11-22 21:51:43 + +++ b/packages/cl-lib/cl-lib.el 2012-11-30 18:27:44 + @@ -28,13 +28,39 @@ ;; Make sure this is installed *late* in your `load-path`, i.e. after Emacs's ;; built-in .../lisp/emacs-lisp directory, so that if/when you upgrade to ;; Emacs-24.3, the built-in version of the file will take precedence, otherwise -;; you'll quickly get recursive-load errors. +;; you could get into trouble (although we try to hack our way around the +;; problem in case it happens). ;; This code is largely copied from Emacs-24.3's cl.el, with the alias bindings ;; simply reversed. ;;; Code: +(when (functionp 'macroexp--compiler-macro) + ;; `macroexp--compiler-macro' was introduced as part of the big CL + ;; reorganization which moved/reimplemented some of CL into core (mostly the + ;; setf and compiler-macro support), so its presence indicates we're running + ;; in an Emacs that comes with the new cl-lib.el, where this file should + ;; never be loaded! + (message Real cl-lib shadowed by compatibility cl-lib? (%s) load-file-name) + (when load-file-name +;; (message Let's try to patch things up) +(let ((loaddir (file-name-directory load-file-name)) + load-path-dir) + ;; Find the problematic directory from load-path. + (dolist (dir load-path) +(if (equal loaddir (expand-file-name (file-name-as-directory dir))) +(setq load-path-dir dir))) + (when load-path-dir +;; (message Let's move the offending dir to the end) +(setq load-path (append (remove load-path-dir load-path) +(list load-path-dir))) +;; Here we could manually load cl-lib and then return immediately. +;; But Emacs currently doesn't provide any way for a file to return +;; immediately, so instead we make sure the rest of the file does not +;; throw away any pre-existing definition. + + (require 'cl) ;; Some of Emacs-24.3's cl.el definition are not just aliases, because either @@ -64,7 +90,8 @@ most-positive-float ;; custom-print-functions )) - (defvaralias (intern (format cl-%s var)) var)) + (let ((new (intern (format cl-%s var +(unless (boundp new) (defvaralias new var (dolist (fun '( (get* . cl-get) @@ -274,16 +301,17 @@ )) (let ((new (if (consp fun) (prog1 (cdr fun) (setq fun (car fun))) (intern (format cl-%s fun) -(defalias new fun))) +(unless (fboundp new) (defalias new fun ;; `cl-labels' is not 100% compatible with `labels' when using dynamic scoping ;; (mostly because it does not turn lambdas that refer to those functions into ;; closures). OTOH it is compatible when using lexical scoping. -(defmacro cl-labels (rest args) - (if (and (boundp 'lexical-binding) lexical-binding) - `(labels ,@args) -(error `cl-labels' with dynamic scoping is not implemented))) +(unless (fboundp 'cl-labels) + (defmacro cl-labels (rest args) +(if (and (boundp 'lexical-binding) lexical-binding) +`(labels ,@args) + (error `cl-labels' with dynamic scoping is not implemented (provide 'cl-lib) ;;; cl-lib.el ends here
[ELPA-diffs] /srv/bzr/emacs/elpa r314: * auctex: Shorten copyright year ranges.
revno: 314
committer: Stefan Monnier monn...@iro.umontreal.ca
branch nick: elpa
timestamp: Mon 2012-12-03 15:39:24 -0500
message:
* auctex: Shorten copyright year ranges.
modified:
packages/auctex/context.el
packages/auctex/doc/auctex.texi
packages/auctex/doc/changes.texi
packages/auctex/doc/install.texi
packages/auctex/font-latex.el
packages/auctex/latex.el
packages/auctex/preview.el
packages/auctex/style/letter.el
packages/auctex/tex-fold.el
packages/auctex/tex-jp.el
packages/auctex/tex.el
=== modified file 'packages/auctex/context.el'
--- a/packages/auctex/context.el2012-12-02 18:32:15 +
+++ b/packages/auctex/context.el2012-12-03 20:39:24 +
@@ -1,7 +1,7 @@
;;; context.el --- Support for ConTeXt documents.
-;; Copyright (C) 2003, 2004, 2005, 2006, 2008, 2010 Free Software
-;; Foundation, Inc.
+;; Copyright (C) 2003-2006, 2008, 2010, 2012
+;; Free Software Foundation, Inc.
;; Maintainer: Berend de Boer ber...@pobox.com
;; Keywords: tex
=== modified file 'packages/auctex/doc/auctex.texi'
--- a/packages/auctex/doc/auctex.texi 2012-12-02 18:32:15 +
+++ b/packages/auctex/doc/auctex.texi 2012-12-03 20:39:24 +
@@ -12,8 +12,8 @@
(version @value{VERSION} from @value{UPDATED}),
a sophisticated TeX environment for Emacs.
-Copyright @copyright{} 1992, 1993, 1994, 1995, 2001, 2002, 2004, 2005,
-2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+Copyright @copyright{} 1992-1995, 2001, 2002, 2004-2012
+Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
=== modified file 'packages/auctex/doc/changes.texi'
--- a/packages/auctex/doc/changes.texi 2012-12-02 18:32:15 +
+++ b/packages/auctex/doc/changes.texi 2012-12-03 20:39:24 +
@@ -1,7 +1,5 @@
@c This is part of the AUCTeX manual.
-@c Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@c 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Free Software
-@c Foundation, Inc.
+@c Copyright (C) 1994-2002, 2004-2010, 2012 Free Software Foundation, Inc.
@c See file auctex.texi for copying conditions.
@include macros.texi
@ifset rawfile
=== modified file 'packages/auctex/doc/install.texi'
--- a/packages/auctex/doc/install.texi 2012-12-02 18:32:15 +
+++ b/packages/auctex/doc/install.texi 2012-12-03 20:39:24 +
@@ -1,6 +1,5 @@
@c This is part of the AUCTeX Manual.
-@c Copyright (C) 1994, 1996, 2003, 2004, 2005, 2006, 2007, 2012
-@c Free Software Foundation, Inc.
+@c Copyright (C) 1994, 1996, 2003-2007, 2012 Free Software Foundation, Inc.
@c See the file auctex.texi for copying conditions.
@ifset rawfile
@include macros.texi
=== modified file 'packages/auctex/font-latex.el'
--- a/packages/auctex/font-latex.el 2012-12-02 18:32:15 +
+++ b/packages/auctex/font-latex.el 2012-12-03 20:39:24 +
@@ -1,7 +1,6 @@
;;; font-latex.el --- LaTeX fontification for Font Lock mode.
-;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 1996-2009, 2012 Free Software Foundation, Inc.
;; Authors:Peter S. Galbraith p...@debian.org
;; Simon Marshall simon.marsh...@esrin.esa.it
=== modified file 'packages/auctex/latex.el'
--- a/packages/auctex/latex.el 2012-12-02 18:32:15 +
+++ b/packages/auctex/latex.el 2012-12-03 20:39:24 +
@@ -1,8 +1,7 @@
;;; latex.el --- Support for LaTeX documents.
-;; Copyright (C) 1991, 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2003,
-;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-;; Foundation, Inc.
+;; Copyright (C) 1991, 1993-1997, 1999, 2000, 2003-2012
+;; Free Software Foundation, Inc.
;; Maintainer: auctex-de...@gnu.org
;; Keywords: tex
=== modified file 'packages/auctex/preview.el'
--- a/packages/auctex/preview.el2012-12-02 18:32:15 +
+++ b/packages/auctex/preview.el2012-12-03 20:39:24 +
@@ -1,7 +1,6 @@
;;; preview.el --- embed preview LaTeX images in source buffer
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2010 Free
-;; Software Foundation, Inc.
+;; Copyright (C) 2001-2006, 2010, 2012 Free Software Foundation, Inc.
;; Author: David Kastrup
;; Keywords: tex, wp, convenience
=== modified file 'packages/auctex/style/letter.el'
--- a/packages/auctex/style/letter.el 2012-12-02 18:32:15 +
+++ b/packages/auctex/style/letter.el 2012-12-03 20:39:24 +
@@ -1,6 +1,6 @@
;;; letter.el - Special code for letter style.
-;; Copyright (C) 1993 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 2012 Free Software Foundation, Inc.
;; Author: Per Abrahamsen abra...@dina.kvl.dk
;; Maintainer: auctex-de...@gnu.org
=== modified file 'packages/auctex/tex-fold.el'
--- a/packages/auctex/tex-fold.el 2012-12-02 18:32:15 +
+++ b/packages/auctex/tex-fold.el 2012-12-03
[ELPA-diffs] /srv/bzr/emacs/elpa r322: * update-archive.sh: Allow archive-contents to be updated!
revno: 322 committer: Stefan Monnier monn...@iro.umontreal.ca branch nick: elpa timestamp: Fri 2012-12-07 11:37:50 -0500 message: * update-archive.sh: Allow archive-contents to be updated! modified: admin/update-archive.sh === modified file 'admin/update-archive.sh' --- a/admin/update-archive.sh 2012-12-05 15:31:58 + +++ b/admin/update-archive.sh 2012-12-07 16:37:50 + @@ -81,13 +81,12 @@ # Move new files into place but don't throw out old package versions. for f in build/archive/packages/*; do dst=staging/packages/$(basename $f) - # FIXME: it'd be better to only rebuild the packages that have been - # modified, rather than rely on md5 to try and abort the refresh - # when we don't want it! # Actually, let's never overwrite an existing version. So changes can - # be installed without causing a new package to be build until the - # version field is changed. - if [ -r $dst ] # [ $(md5sum $f) = $(md5sum $dst) ] + # be installed without causing a new package to be built until the + # version field is changed. Some files need to be excluded from the + # immutable policy, most importantly archive-contents. + if [ -r $dst ] +[ ! archive-contents = $(basename $dst) ] then rm $f else mv $f $dst fi
[ELPA-diffs] /srv/bzr/emacs/elpa r361: * packages/sml-mode/sml-mode.el (sml-imenu-regexp): Make it a const.
revno: 361 committer: Stefan Monnier monn...@iro.umontreal.ca branch nick: elpa timestamp: Sun 2013-03-03 20:22:01 -0500 message: * packages/sml-mode/sml-mode.el (sml-imenu-regexp): Make it a const. (sml-imenu-create-index): Don't assume we'll find an = after structure. modified: packages/sml-mode/sml-mode.el === modified file 'packages/sml-mode/sml-mode.el' --- a/packages/sml-mode/sml-mode.el 2013-01-24 23:37:44 + +++ b/packages/sml-mode/sml-mode.el 2013-03-04 01:22:01 + @@ -3,7 +3,7 @@ ;; Copyright (C) 1989,1999,2000,2004,2007,2010-2013 Free Software Foundation, Inc. ;; Maintainer: (Stefan Monnier) monn...@iro.umontreal.ca -;; Version: 6.3 +;; Version: 6.4 ;; Keywords: SML ;; Author: Lars Bo Nielsen ;; Olin Shivers @@ -656,7 +656,7 @@ Imenu support -(defvar sml-imenu-regexp +(defconst sml-imenu-regexp (concat ^[ \t]*\\(let[ \t]+\\)? (regexp-opt (append sml-module-head-syms '(and fun datatype abstype type)) t) @@ -678,9 +678,9 @@ (name (sml-smie-forward-token))) ;; Eliminate trivial renamings. (when (or (not (member kind '(structure signature))) - (progn (search-forward =) - (forward-comment (point-max)) - (looking-at sig\\|struct))) + (when (search-forward = nil t) + (forward-comment (point-max)) + (looking-at sig\\|struct))) (push (cons (concat (make-string (/ column 2) ?\ ) name) location) alist) alist))
[ELPA-diffs] /srv/bzr/emacs/elpa r369: * admin/update-archive.sh (copyright_notices): Ignore .dir-locals.el.
revno: 369
committer: Stefan Monnier monn...@iro.umontreal.ca
branch nick: elpa
timestamp: Wed 2013-03-20 14:14:56 -0400
message:
* admin/update-archive.sh (copyright_notices): Ignore .dir-locals.el.
modified:
admin/update-archive.sh
=== modified file 'admin/update-archive.sh'
--- a/admin/update-archive.sh 2012-12-07 16:37:50 +
+++ b/admin/update-archive.sh 2013-03-20 18:14:56 +
@@ -12,7 +12,7 @@
copyright_notices () {
find . -name '*.el' -print0 |
xargs -0 grep -L 'Free Software Foundation, Inc' |
-grep -v '.-\(pkg\|autoloads\)\.el$'
+grep -v '\(\.dir-locals\|.-\(pkg\|autoloads\)\)\.el$'
find . -name '*.el' -print |
while read f; do
[ELPA-diffs] /srv/bzr/emacs/elpa r378: * update-archive.sh: *-readme.txt files aren't mutable.
revno: 378 fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=14011 committer: Stefan Monnier monn...@iro.umontreal.ca branch nick: elpa timestamp: Mon 2013-04-01 09:44:30 -0400 message: * update-archive.sh: *-readme.txt files aren't mutable. modified: admin/update-archive.sh === modified file 'admin/update-archive.sh' --- a/admin/update-archive.sh 2013-03-20 18:14:56 + +++ b/admin/update-archive.sh 2013-04-01 13:44:30 + @@ -84,12 +84,15 @@ # Actually, let's never overwrite an existing version. So changes can # be installed without causing a new package to be built until the # version field is changed. Some files need to be excluded from the - # immutable policy, most importantly archive-contents. - if [ -r $dst ] -[ ! archive-contents = $(basename $dst) ] - then rm $f - else mv $f $dst - fi + # immutable policy, most importantly archive-contents + # and *-readme.txt. + case $dst in + */archive-contents | *-readme.txt ) mv $f $dst ;; + * ) if [ -r $dst ] + then rm $f + else mv $f $dst + fi ;; + esac done mv build/archive/$latest staging/ rm -rf build/archive)
[ELPA-diffs] /srv/bzr/emacs/elpa r379: * packages/lex/lex-parse-re.el: New file, extracted from lex.el.
revno: 379
committer: Stefan Monnier monn...@iro.umontreal.ca
branch nick: elpa
timestamp: Wed 2013-04-03 20:11:03 -0400
message:
* packages/lex/lex-parse-re.el: New file, extracted from lex.el.
* packages/lex/lex.el: Use it instead of the self-load hack.
(lex--nfa, lex-compile): Use case-table-get-table.
added:
packages/lex/lex-parse-re.el
packages/lex/lex-pkg.el
modified:
packages/lex/lex.el
=== added file 'packages/lex/lex-parse-re.el'
--- a/packages/lex/lex-parse-re.el 1970-01-01 00:00:00 +
+++ b/packages/lex/lex-parse-re.el 2013-04-04 00:11:03 +
@@ -0,0 +1,258 @@
+;;; lex-parse-re.el --- Parse Emacs regexps using Lex
+
+;; Copyright (C) 2008,2013 Free Software Foundation, Inc.
+
+;; Author: Stefan Monnier monn...@iro.umontreal.ca
+;; Keywords:
+
+;; 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 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, see http://www.gnu.org/licenses/.
+
+;;; Commentary:
+
+;; This exports lex-parse-re, but it also defines lex--parse-charset which is
+;; used internally by lex-compile to handle charsets specified as a string.
+
+;;; Code:
+
+(require 'lex)
+
+;;; Regexp parsers.
+
+(defun lex--tokenizer (lex string)
+ (let ((tokens ())
+(i 0)
+tmp)
+(while (and ( i (length string))
+(setq tmp (lex-match-string lex string i)))
+ (push (cons (car tmp) (substring string i (setq i (cadr tmp tokens))
+(nreverse tokens)))
+
+(defun lex--parse-charset (string)
+ (let ((i 0)
+(ranges ()))
+(when (eq (aref string i) ?^)
+ (push 'not ranges)
+ (setq i (1+ i)))
+(let ((op nil)
+ (case-fold-search nil))
+ (while (not (eq op 'stop))
+(lex-case string i
+ ((seq [: (0+ (char (?a . ?z) (?A . ?Z))) :])
+ (push (intern (substring string (+ 2 (match-beginning 0))
+(- (match-end 0) 2)))
+ ranges))
+ ((seq anything - anything)
+ (push (cons (aref string (match-beginning 0))
+ (aref string (1- (match-end 0
+ ranges))
+ (anything (push (aref string (1- (match-end 0))) ranges))
+ (eob (setq op 'stop
+
+ `(char ,@(nreverse ranges)
+
+(defconst lex--parse-re-lexspec
+ '(((or * + ? *? +? ??) . suffix)
+((seq [ (opt ^) (opt ])
+ (0+ (or (seq (char not ?\]) - (char not ?\]))
+ (seq [: (1+ (char (?a . ?z) (?A . ?Z))) :])
+ (char not ?\]))) ]) . charset)
+((seq \\c anything) . category)
+((seq \\C anything) . not-category)
+((seq \\s anything) . syntax)
+((seq \\S anything) . not-syntax)
+((seq \\ (char (?1 . ?9))) . backref)
+(\\' . eob)
+(\\` . bob)
+(. . dot)
+(^ . bol)
+($ . eol)
+(. . dot)
+(\\ . bow)
+(\\ . eow)
+(\\_ . symbol-start)
+(\\_ . symbol-end)
+(\\w . wordchar)
+(\\W . not-wordchar)
+(\\b . word-boundary)
+(\\B . not-word-boundary)
+(\\= . point)
+((or (seq ?\\ anything) anything) . char)))
+
+
+(defconst lex--parse-ere-lexer
+ (let ((case-fold-search nil))
+(lex-compile
+ (append '(((?: . shy-group)
+ (| . or)
+ ((seq { (0+ (char (?0 . ?9)))
+ (opt (seq , (0+ (char (?0 . ?9) }) . repeat)
+ ((or ) eob) . stop)
+ (( . group))
+ lex--parse-re-lexspec
+
+(defconst lex--parse-bre-lexer
+ (let ((case-fold-search nil))
+(lex-compile
+ (append '((\\(?: . shy-group)
+ (\\| . or)
+ ((seq \\{ (0+ (char (?0 . ?9)))
+ (opt (seq , (0+ (char (?0 . ?9) \\}) . repeat)
+ ((or \\) eob) . stop)
+ (\\( . group))
+ lex--parse-re-lexspec
+
+(defun lex--parse-re (string i lexer)
+ (let ((stack ())
+(op nil)
+(res nil)
+tmp)
+(while (and (not (eq op 'stop))
+(setq tmp (lex-match-string lexer string i)))
+ (pcase (car tmp)
+(`shy-group
+ (setq tmp (lex--parse-re string (cadr tmp) lexer))
+ (unless (eq (aref string (1- (cadr tmp))) ?\))
+ (error Unclosed shy-group))
+ (push (car tmp) res))
+(`group
+ (setq tmp (lex--parse-re string (cadr tmp) lexer))
+ (unless (eq (aref string (1- (cadr tmp
[ELPA-diffs] elpa r422: * packages/vlf/vlf.el: Version 0.6
revno: 422 revision-id: monn...@iro.umontreal.ca-20130722054131-81jwcig1lslrhj22 parent: monn...@iro.umontreal.ca-20130722052538-s8ram528f7plz997 author: Andrey Kotlarski m00nati...@gmail.com committer: Stefan Monnier monn...@iro.umontreal.ca branch nick: elpa timestamp: Mon 2013-07-22 01:41:31 -0400 message: * packages/vlf/vlf.el: Version 0.6 (vlf-mode): Setup revert and file write. (vlf-format-buffer-name): Change format to indicate the chunk numbers. (vlf-insert-file): Remove unused arg `file'. (vlf-beginning-of-file, vlf-end-of-file, vlf-jump-to-chunk): New commands. (vlf-mode-map): Use them. Add a `j' binding. (vlf-revert): New function. (vlf-next-batch, vlf-prev-batch, vlf-move-to-batch, vlf-move-to-chunk): Set modtime. Better preserve point. (vlf-file-shift-back, vlf-shift-batch, vlf-file-shift-forward) (vlf-shift-batches): New functions. (vlf-write): Use them when size of saved chunks has changed. Pay attention to modtimes. modified: packages/vlf/vlf.elvlf.el-20120614203028-urlm47rgs71aoaqu-2 === modified file 'packages/vlf/vlf.el' --- a/packages/vlf/vlf.el 2013-07-22 05:25:38 + +++ b/packages/vlf/vlf.el 2013-07-22 05:41:31 + @@ -2,7 +2,7 @@ ;; Copyright (C) 2006, 2012, 2013 Free Software Foundation, Inc. -;; Version: 0.5 +;; Version: 0.6 ;; Keywords: large files, utilities ;; Authors: 2006 Mathias Dahl mathias.d...@gmail.com ;; 2012 Sam Steingold s...@gnu.org @@ -64,13 +64,10 @@ (vlf-change-batch-size t))) (define-key map s 'vlf-re-search-forward) (define-key map r 'vlf-re-search-backward) -(define-key map ] (lambda () Jump to end of file content. - (interactive) - (vlf-insert-file buffer-file-name t))) -(define-key map [ (lambda () Jump to beginning of file content. - (interactive) - (vlf-insert-file buffer-file-name))) +(define-key map [ 'vlf-beginning-of-file) +(define-key map ] 'vlf-end-of-file) (define-key map e 'vlf-edit-mode) +(define-key map j 'vlf-jump-to-chunk) map) Keymap for `vlf-mode'.) @@ -79,6 +76,8 @@ (setq buffer-read-only t) (set-buffer-modified-p nil) (buffer-disable-undo) + (add-hook 'write-contents-functions 'vlf-write) + (setq revert-buffer-function 'vlf-revert) (make-local-variable 'vlf-batch-size) (put 'vlf-batch-size 'permanent-local t) (make-local-variable 'vlf-start-pos) @@ -88,6 +87,75 @@ (make-local-variable 'vlf-file-size) (put 'vlf-file-size 'permanent-local t)) +;;;###autoload +(defun vlf (file optional from-end) + View Large FILE. With FROM-END prefix, view from the back. +Batches of the file data from FILE will be displayed in a read-only +buffer. You can customize number of bytes displayed by customizing +`vlf-batch-size'. + (interactive fFile to open: \nP) + (with-current-buffer (generate-new-buffer *vlf*) +(setq buffer-file-name file + vlf-file-size (nth 7 (file-attributes file))) +(vlf-insert-file from-end) +(vlf-mode) +(switch-to-buffer (current-buffer + +;; +;;; integration with other packages + +;;;###autoload +(defun dired-vlf (from-end) + In Dired, visit the file on this line in VLF mode. +With FROM-END prefix, view from the back. + (interactive P) + (vlf (dired-get-file-for-visit) from-end)) + +;;;###autoload +(eval-after-load dired + '(define-key dired-mode-map V 'dired-vlf)) + +;;;###autoload +(defun vlf-if-file-too-large (size op-type optional filename) + If file SIZE larger than `large-file-warning-threshold', \ +allow user to view file with `vlf', open it normally or abort. +OP-TYPE specifies the file operation being performed over FILENAME. + (and large-file-warning-threshold size + ( size large-file-warning-threshold) + (let ((char nil)) + (while (not (memq (setq char + (read-event + (propertize + (format +File %s is large (%s): \ +%s normally (o), %s with vlf (v) or abort (a) +(if filename +(file-name-nondirectory filename) + ) +(file-size-human-readable size) +op-type op-type) + 'face 'minibuffer-prompt))) + '(?o ?O ?v ?V ?a ?A + (cond ((memq char '(?o ?O))) + ((memq char '(?v ?V)) +(vlf filename nil) +(error )) + ((memq char '(?a ?A)) +(error Aborted)) + +;; hijack `abort-if-file-too-large' +;;;###autoload +(fset 'abort-if-file-too-large 'vlf-if-file
[ELPA-diffs] elpa r423: * packages/vlf/vlf.el: Version 0.7
revno: 423 revision-id: monn...@iro.umontreal.ca-20130722061452-hw4r59ckcsfigjo7 parent: monn...@iro.umontreal.ca-20130722054131-81jwcig1lslrhj22 author: Andrey Kotlarski m00nati...@gmail.com committer: Stefan Monnier monn...@iro.umontreal.ca branch nick: elpa timestamp: Mon 2013-07-22 02:14:52 -0400 message: * packages/vlf/vlf.el: Version 0.7 (vlf-goto-line): New command. (vlf-mode-map): Bind it to `l'. (vlf-mode): Don't affect the global value of revert-buffer-function. (vlf, dired-vlf): Remove `from-end' argument. (scroll-up, scroll-down): Add advice to auto-jump to the next batch during scrolling. (vlf-get-file-size): New macro. (vlf-revert): Try and pay attention to the actual arguments. (vlf-next-batch, vlf-prev-batch, vlf-move-to-batch, vlf-move-to-chunk) (vlf-re-search, vlf-goto-match): Use position-bytes to try and match bytes and chars. (vlf-adjust-chunk): New function. (vlf-file-shift-back): Disable undo. Don't mess with buffer-file-coding-system, use coding-system-for-write instead. (vlf-shift-batch): Check modtime. (vlf-file-shift-forward): Simplify. (vlf-shift-batches): Don't use an auxiliary buffer. modified: packages/vlf/vlf.elvlf.el-20120614203028-urlm47rgs71aoaqu-2 === modified file 'packages/vlf/vlf.el' --- a/packages/vlf/vlf.el 2013-07-22 05:41:31 + +++ b/packages/vlf/vlf.el 2013-07-22 06:14:52 + @@ -2,7 +2,7 @@ ;; Copyright (C) 2006, 2012, 2013 Free Software Foundation, Inc. -;; Version: 0.6 +;; Version: 0.7 ;; Keywords: large files, utilities ;; Authors: 2006 Mathias Dahl mathias.d...@gmail.com ;; 2012 Sam Steingold s...@gnu.org @@ -68,6 +68,7 @@ (define-key map ] 'vlf-end-of-file) (define-key map e 'vlf-edit-mode) (define-key map j 'vlf-jump-to-chunk) +(define-key map l 'vlf-goto-line) map) Keymap for `vlf-mode'.) @@ -77,6 +78,7 @@ (set-buffer-modified-p nil) (buffer-disable-undo) (add-hook 'write-contents-functions 'vlf-write) + (make-local-variable 'revert-buffer-function) (setq revert-buffer-function 'vlf-revert) (make-local-variable 'vlf-batch-size) (put 'vlf-batch-size 'permanent-local t) @@ -88,16 +90,16 @@ (put 'vlf-file-size 'permanent-local t)) ;;;###autoload -(defun vlf (file optional from-end) - View Large FILE. With FROM-END prefix, view from the back. +(defun vlf (file) + View Large FILE. Batches of the file data from FILE will be displayed in a read-only buffer. You can customize number of bytes displayed by customizing `vlf-batch-size'. - (interactive fFile to open: \nP) + (interactive fFile to open: ) (with-current-buffer (generate-new-buffer *vlf*) (setq buffer-file-name file - vlf-file-size (nth 7 (file-attributes file))) -(vlf-insert-file from-end) + vlf-file-size (vlf-get-file-size file)) +(vlf-insert-file) (vlf-mode) (switch-to-buffer (current-buffer @@ -105,11 +107,10 @@ ;;; integration with other packages ;;;###autoload -(defun dired-vlf (from-end) - In Dired, visit the file on this line in VLF mode. -With FROM-END prefix, view from the back. - (interactive P) - (vlf (dired-get-file-for-visit) from-end)) +(defun dired-vlf () + In Dired, visit the file on this line in VLF mode. + (interactive) + (vlf (dired-get-file-for-visit))) ;;;###autoload (eval-after-load dired @@ -138,7 +139,7 @@ '(?o ?O ?v ?V ?a ?A (cond ((memq char '(?o ?O))) ((memq char '(?v ?V)) -(vlf filename nil) +(vlf filename) (error )) ((memq char '(?a ?A)) (error Aborted)) @@ -147,6 +148,25 @@ ;;;###autoload (fset 'abort-if-file-too-large 'vlf-if-file-too-large) +;; scroll auto batching +(defadvice scroll-up (around vlf-scroll-up + activate compile) + Slide to next batch if at end of buffer in `vlf-mode'. + (if (and (eq major-mode 'vlf-mode) + (eobp)) + (progn (vlf-next-batch 1) + (goto-char (point-min))) +ad-do-it)) + +(defadvice scroll-down (around vlf-scroll-down + activate compile) + Slide to previous batch if at beginning of buffer in `vlf-mode'. + (if (and (eq major-mode 'vlf-mode) + (bobp)) + (progn (vlf-prev-batch 1) + (goto-char (point-max))) +ad-do-it)) + ;; non recent Emacs (unless (fboundp 'file-size-human-readable) (defun file-size-human-readable (file-size) @@ -181,6 +201,10 @@ Update the current buffer name. (rename-buffer (vlf-format-buffer-name) t)) +(defmacro vlf-get-file-size (file) + Get size in bytes of FILE. + `(nth 7 (file-attributes ,file))) + (defun vlf-insert-file (optional from-end) Insert first chunk of current file contents in current buffer. With FROM-END prefix, start from the back. @@ -201,10 +225,14
[ELPA-diffs] elpa r424: * packages/vlf/vlf.el: Version 0.8, Add occur-like functionality.
revno: 424 revision-id: monn...@iro.umontreal.ca-20130722061930-ke0ipon9qjukwo17 parent: monn...@iro.umontreal.ca-20130722061452-hw4r59ckcsfigjo7 author: Andrey Kotlarski m00nati...@gmail.com committer: Stefan Monnier monn...@iro.umontreal.ca branch nick: elpa timestamp: Mon 2013-07-22 02:19:30 -0400 message: * packages/vlf/vlf.el: Version 0.8, Add occur-like functionality. (vlf-occur-mode-map): New var. (vlf-occur-mode): New major mode. (vlf-occur-next-match, vlf-occur-prev-match, vlf-occur-visit, vlf-occur): New commands. (vlf-build-occur): New function. (vlf-mode-map): Add `o' binding for vlf-occur. modified: packages/vlf/vlf.elvlf.el-20120614203028-urlm47rgs71aoaqu-2 === modified file 'packages/vlf/vlf.el' --- a/packages/vlf/vlf.el 2013-07-22 06:14:52 + +++ b/packages/vlf/vlf.el 2013-07-22 06:19:30 + @@ -2,7 +2,7 @@ ;; Copyright (C) 2006, 2012, 2013 Free Software Foundation, Inc. -;; Version: 0.7 +;; Version: 0.8 ;; Keywords: large files, utilities ;; Authors: 2006 Mathias Dahl mathias.d...@gmail.com ;; 2012 Sam Steingold s...@gnu.org @@ -64,6 +64,7 @@ (vlf-change-batch-size t))) (define-key map s 'vlf-re-search-forward) (define-key map r 'vlf-re-search-backward) +(define-key map o 'vlf-occur) (define-key map [ 'vlf-beginning-of-file) (define-key map ] 'vlf-end-of-file) (define-key map e 'vlf-edit-mode) @@ -376,12 +377,12 @@ (match-start-pos (+ vlf-start-pos (position-bytes (point (match-end-pos match-start-pos) (to-find count) - (search-reporter (make-progress-reporter - (concat Searching for regexp ...) - (if backward - (- vlf-file-size vlf-end-pos) - vlf-start-pos) - vlf-file-size)) + (reporter (make-progress-reporter +(concat Searching for regexp ...) +(if backward +(- vlf-file-size vlf-end-pos) + vlf-start-pos) +vlf-file-size)) (batch-step (/ vlf-batch-size 8))) ; amount of chunk overlap (unwind-protect (catch 'end-of-file @@ -414,8 +415,8 @@ (point-max)) (point-max))) (progress-reporter-update - search-reporter (- vlf-file-size - vlf-start-pos) + reporter (- vlf-file-size + vlf-start-pos) (while (not (zerop to-find)) (cond ((re-search-forward regexp nil t) (setq to-find (1- to-find) @@ -440,9 +441,9 @@ vlf-start-pos)) (point-max)) (point-min))) - (progress-reporter-update search-reporter + (progress-reporter-update reporter vlf-end-pos) - (progress-reporter-done search-reporter)) + (progress-reporter-done reporter)) (if backward (vlf-goto-match match-chunk-start match-chunk-end match-end-pos match-start-pos @@ -477,7 +478,7 @@ (- match-pos-start vlf-start-pos)) match-end))) -(overlay-put overlay 'face 'region) +(overlay-put overlay 'face 'match) (unless success (goto-char match-end) (message Moved to the %d match which is last @@ -521,6 +522,177 @@ (goto-char pos) ;; +;;; occur + +(defvar vlf-occur-mode-map + (let ((map (make-sparse-keymap))) +(define-key map n 'vlf-occur-next-match) +(define-key map p 'vlf-occur-prev-match) +(define-key map \C-m 'vlf-occur-visit) +(define-key map [mouse-1] 'vlf-occur-visit) +map) + Keymap for command `vlf-occur-mode'.) + +(define-derived-mode vlf-occur-mode special-mode VLF[occur] + Major mode for showing occur matches of VLF opened files.) + +(defun vlf-occur-next-match () + Move cursor to next match. + (interactive) + (if (eq (get-char-property (point) 'face) 'match) + (goto-char (next-single-property-change (point) 'face))) + (goto-char (or (text-property-any (point) (point-max) 'face 'match) + (text-property-any (point-min) (point) +'face 'match + +(defun vlf-occur-prev-match () + Move cursor to previous match. + (interactive) + (if (eq (get-char-property (point) 'face) 'match
[ELPA-diffs] elpa r435: * packages/eldoc-eval/eldoc-eval.el (eldoc-mode-in-minibuffer): Operate on
revno: 435 revision-id: monn...@iro.umontreal.ca-20130809215512-o4fqfx1evtbpnrlv parent: monn...@iro.umontreal.ca-20130809215250-lqyfvls3iqfdbui9 committer: Stefan Monnier monn...@iro.umontreal.ca branch nick: elpa timestamp: Fri 2013-08-09 17:55:12 -0400 message: * packages/eldoc-eval/eldoc-eval.el (eldoc-mode-in-minibuffer): Operate on current buffer rather than minibuffer-completion-contents. modified: packages/eldoc-eval/eldoc-eval.el eldoceval.el-20110925210758-7hzdscr3i29577xr-2 === modified file 'packages/eldoc-eval/eldoc-eval.el' --- a/packages/eldoc-eval/eldoc-eval.el 2013-01-13 20:20:14 + +++ b/packages/eldoc-eval/eldoc-eval.el 2013-08-09 21:55:12 + @@ -149,21 +149,15 @@ (defun eldoc-mode-in-minibuffer () Show eldoc for current minibuffer input. - (let ((buf (with-selected-window (minibuffer-window) - (buffer-name + (let ((buf (window-buffer (minibuffer-window ;; If this minibuffer have been started with ;;`with-eldoc-in-minibuffer' give it eldoc support ;; and update mode-line, otherwise do nothing. (when (member buf eldoc-active-minibuffers-list) - (let* ((str-all (with-current-buffer buf -(minibuffer-completion-contents))) - (sym (when str-all -(with-temp-buffer - (insert str-all) - (goto-char (point-max)) - (unless (looking-back )\\|\) -(forward-char -1)) - (eldoc-current-symbol + (let* ((sym (with-current-buffer buf +(unless (looking-back )\\|\) + (forward-char -1)) +(eldoc-current-symbol))) (info-fn (eldoc-fnsym-in-current-sexp)) (doc (or (eldoc-get-var-docstring sym) (eldoc-get-fnsym-args-string
[ELPA-diffs] UNNAMED PROJECT branch, master, updated. b72e08e1b156722f3149255394d7b8a9f04da685
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project UNNAMED PROJECT. The branch, master has been updated via b72e08e1b156722f3149255394d7b8a9f04da685 (commit) via fe154a977d7f9c0987233b5429a846e61d1d6f82 (commit) from 232a509cd50fdcdc616748dd827dbe3e2cc6e72c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit b72e08e1b156722f3149255394d7b8a9f04da685 Author: Stefan Monnier monn...@iro.umontreal.ca Date: Sat Aug 10 09:56:31 2013 -0400 Get make -k to go through diff --git a/.bzrignore b/.bzrignore index 9c9e22e..74d9174 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1,8 +1,11 @@ *.elc +*~ +ChangeLog archive -site +core +externals-list packages/*/*-autoloads.el packages/*/*-pkg.el -core -ChangeLog packages/.changelog-witness +packages/dismal +site diff --git a/GNUmakefile b/GNUmakefile index 7f2061d..3199fcc 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -9,34 +9,16 @@ SITE_DIR=site all: all-in-place -## Set up the source files for direct usage, by pointing -## `package-directory-list' to the site/ directory. -site: packages - mkdir -p $(SITE_DIR) - $(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 $(MAKE) $(MFLAGS) process-archive -archive-tmp: packages changelogs +archive-tmp: packages -rm -r $(ARCHIVE_TMP) mkdir -p $(ARCHIVE_TMP) cp -a packages/. $(ARCHIVE_TMP)/packages -# Refresh the ChangeLog files. This needs to be done in -# the source tree, because it needs the Bzr data! -changelogs: - cd packages; \ - $(EMACS) -batch -l $(CURDIR)/admin/archive-contents.el \ - -f batch-prepare-packages - process-archive: # FIXME, we could probably speed this up significantly with # rules like %.tar: ../%/ChangeLog so we only rebuild the packages @@ -75,7 +57,7 @@ org-fetch: archive-tmp clean: rm -rf archive $(ARCHIVE_TMP) $(SITE_DIR) -## Rules for in-place installation ## +## Rules for in-place installation pkgs := $(foreach pkg, $(wildcard packages/*), \ $(if $(shell [ -d $(pkg) ] echo true), $(pkg))) @@ -152,3 +134,7 @@ $(extra_elcs):; rm $@ all-in-place: $(extra_elcs) $(autoloads) # $(single_pkgs) # Do them in a sub-make, so that autoloads are done first. $(MAKE) elcs + + +### Rules to prepare the externals + diff --git a/admin/archive-contents.el b/admin/archive-contents.el index 56daa8e..5a5462a 100644 --- a/admin/archive-contents.el +++ b/admin/archive-contents.el @@ -1,4 +1,4 @@ -;;; archive-contents.el --- Auto-generate an Emacs Lisp package archive. +;;; archive-contents.el --- Auto-generate an Emacs Lisp package archive. -*- lexical-binding:t -*- ;; Copyright (C) 2011, 2012, 2013 Free Software Foundation, Inc @@ -24,6 +24,7 @@ (eval-when-compile (require 'cl)) (require 'lisp-mnt) (require 'package) +(require 'pcase) (defconst archive-contents-subdirectory-regexp \\([^.].*?\\)-\\([0-9]+\\(?:[.][0-9]+\\|\\(?:pre\\|beta\\|alpha\\)[0-9]+\\)*\\)) @@ -86,7 +87,7 @@ Delete backup files also. (write-region nil nil archive-contents (defun batch-prepare-packages () - Prepare the `packages' directory inside the Bzr checkout. + Prepare the `packages' directory inside the Git checkout. Expects to be called from within the `packages' directory. \Prepare\ here is for subsequent construction of the packages and archive, so it is meant to refresh any generated files we may need. @@ -218,6 +219,7 @@ package commentary to PKG-readme.txt. Return the descriptor. (if (file-readable-p ChangeLog) (insert-file-contents ChangeLog)) (let ((old-md5 (md5 (current-buffer (erase-buffer) + ;; git --no-pager log --date=short --format=%cd %aN %ae%n%n%w(80,8,8)%B%n | sed 's/^/\t/' (call-process bzr nil (current-buffer) nil log --gnu-changelog .) (if (equal old-md5 (md5 (current-buffer))) @@ -355,40 +357,95 @@ PKG-readme.txt. Return the descriptor. ((= bytes 10) (format %4.1f%s bytes (car units))) (t (format %4.2f%s bytes (car units)) +(defun archive--get-prop (prop name srcdir mainsrcfile) + (let ((kprop (intern (format :%s (downcase prop) +(or + (let ((pkgdescfile
[ELPA-diffs] UNNAMED PROJECT branch, master, updated. c94a27a3ba6fb7d4dd74c80b4f6390a5bd480120
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project UNNAMED PROJECT. The branch, master has been updated via c94a27a3ba6fb7d4dd74c80b4f6390a5bd480120 (commit) via c339792129f96eb9554cd7dcb063cb069efdf90c (commit) via b00707ade8ad89c5f310a4e068b7a5191f7746fd (commit) via eb350a68507dc58085f785bb72e9250df97bf5c4 (commit) from b72e08e1b156722f3149255394d7b8a9f04da685 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit c94a27a3ba6fb7d4dd74c80b4f6390a5bd480120 Merge: b72e08e c339792 Author: Stefan Monnier monn...@iro.umontreal.ca Date: Mon Aug 12 09:48:50 2013 -0400 Merge remote-tracking branch 'repo.or.cz/elpa' commit c339792129f96eb9554cd7dcb063cb069efdf90c Author: Stefan Monnier monn...@iro.umontreal.ca Date: Fri Aug 9 17:55:12 2013 -0400 * packages/eldoc-eval/eldoc-eval.el (eldoc-mode-in-minibuffer): Operate on current buffer rather than minibuffer-completion-contents. diff --git a/packages/eldoc-eval/eldoc-eval.el b/packages/eldoc-eval/eldoc-eval.el index b6c4f59..6d20da2 100644 --- a/packages/eldoc-eval/eldoc-eval.el +++ b/packages/eldoc-eval/eldoc-eval.el @@ -149,21 +149,15 @@ See `with-eldoc-in-minibuffer'. (defun eldoc-mode-in-minibuffer () Show eldoc for current minibuffer input. - (let ((buf (with-selected-window (minibuffer-window) - (buffer-name + (let ((buf (window-buffer (minibuffer-window ;; If this minibuffer have been started with ;;`with-eldoc-in-minibuffer' give it eldoc support ;; and update mode-line, otherwise do nothing. (when (member buf eldoc-active-minibuffers-list) - (let* ((str-all (with-current-buffer buf -(minibuffer-completion-contents))) - (sym (when str-all -(with-temp-buffer - (insert str-all) - (goto-char (point-max)) - (unless (looking-back )\\|\) -(forward-char -1)) - (eldoc-current-symbol + (let* ((sym (with-current-buffer buf +(unless (looking-back )\\|\) + (forward-char -1)) +(eldoc-current-symbol))) (info-fn (eldoc-fnsym-in-current-sexp)) (doc (or (eldoc-get-var-docstring sym) (eldoc-get-fnsym-args-string commit b00707ade8ad89c5f310a4e068b7a5191f7746fd Author: Stefan Monnier monn...@iro.umontreal.ca Date: Fri Aug 9 17:52:50 2013 -0400 * packages/auctex/tex.el (TeX--call-3/2): New auxiliary function. (ConTeXt-Omega-engine, TeX-Omega-mode, TeX-source-specials-mode): Use it to provide the obsolescence version when possible. diff --git a/packages/auctex/tex.el b/packages/auctex/tex.el index e11f16b..0ff821c 100644 --- a/packages/auctex/tex.el +++ b/packages/auctex/tex.el @@ -1,6 +1,6 @@ ;;; tex.el --- Support for TeX documents. -;; Copyright (C) 1985-1987, 1991, 1993, 1994, 1996, 1997, 1999-2012 +;; Copyright (C) 1985-1987, 1991, 1993, 1994, 1996, 1997, 1999-2013 ;; Free Software Foundation, Inc. ;; Maintainer: auctex-de...@gnu.org @@ -39,6 +39,11 @@ (eval-when-compile (require 'cl)) +(defun TeX--call-3/2 (f arg1 arg2 arg3) + (condition-case nil + (funcall f arg1 arg2 arg3) +(wrong-number-of-arguments (funcall f arg1 arg2 + (defgroup TeX-file nil Files used by AUCTeX. :group 'AUCTeX) @@ -121,7 +126,8 @@ If nil, none is specified. :type '(choice (const :tag Unspecified nil) string)) ;; At least in TeXLive 2009 ConTeXt does not support an omega option anymore. -(make-obsolete-variable 'ConTeXt-Omega-engine 'TeX-engine-alist) +(TeX--call-3/2 #'make-obsolete-variable 'ConTeXt-Omega-engine + 'TeX-engine-alist before 11.86) (defcustom TeX-queue-command lpq -P%p *Command used to show the status of a printer queue. @@ -1285,8 +1291,9 @@ TYPE can be one of the following symbols:\n :group 'TeX-command (TeX-engine-set (if TeX-Omega-mode 'omega 'default))) (defalias 'tex-omega-mode 'TeX-Omega-mode) -(make-obsolete 'TeX-Omega-mode 'TeX-engine-set) -(make-obsolete-variable 'TeX-Omega-mode 'TeX-engine) +(TeX--call-3/2 #'make-obsolete 'TeX-Omega-mode 'TeX-engine-set before 11.86) +(TeX--call-3/2 #'make-obsolete-variable 'TeX-Omega-mode + 'TeX-engine before 11.86) ;;; Forward and inverse search @@ -1434,7 +1441,8 @@ SyncTeX are recognized. (when TeX-source-correlate-mode 'TeX-synctex-output-page (defalias 'TeX-source-specials-mode 'TeX-source-correlate-mode) -(make-obsolete 'TeX-source-specials-mode 'TeX-source-correlate
[ELPA-diffs] ELPA tag, v0.1.0, deleted. 2226331d3ce22140556ddbb00febfd99ec50b209
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project ELPA. The tag, v0.1.0 has been deleted was 2226331d3ce22140556ddbb00febfd99ec50b209 --- 2226331d3ce22140556ddbb00febfd99ec50b209 no more debug mode --- hooks/post-receive -- ELPA
[ELPA-diffs] ELPA tag, v0.1, deleted. 5f3ff0edfe25c766e9d7d1af768bb963f0317f7d
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project ELPA. The tag, v0.1 has been deleted was 5f3ff0edfe25c766e9d7d1af768bb963f0317f7d --- 5f3ff0edfe25c766e9d7d1af768bb963f0317f7d Initial commit. --- hooks/post-receive -- ELPA
[ELPA-diffs] ELPA branch, master, updated. 9c123a56704af574567af819193a825c15899d64
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project ELPA.
The branch, master has been updated
via 9c123a56704af574567af819193a825c15899d64 (commit)
via dc6cbe360eb4fed0f639e6c3e86323770c143102 (commit)
from c94a27a3ba6fb7d4dd74c80b4f6390a5bd480120 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 9c123a56704af574567af819193a825c15899d64
Author: Stefan Monnier monn...@iro.umontreal.ca
Date: Tue Aug 13 17:36:47 2013 -0400
Move check_copyright to the makefile
diff --git a/GNUmakefile b/GNUmakefile
index d1baf58..1067e4c 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -9,6 +9,25 @@ SITE_DIR=site
all: all-in-place
+CR_EXCEPTIONS=copyright_exceptions
+.PHONY: check_copyrights
+check_copyrights:
+ @echo Compute exceptions $(CR_EXCEPTIONS)~
+ @(cd packages; \
+ export LANG=C; \
+ find . -name '*.el' -print0 | \
+ xargs -0 grep -L 'Free Software Foundation, Inc' | \
+ grep -v '\(\.dir-locals\|.-\(pkg\|autoloads\)\)\.el$$'; \
+ find . -name '*.el' -print |\
+ while read f; do\
+ fquoted=$$(echo $$f|tr '|' '_'); \
+ sed -n -e '/[Cc]opyright.*, *[1-9][-0-9]*,\?$$/N' \
+ -e '/Free Software Foundation/d'\
+ -e s|^\\(.*[Cc]opyright\\)|$$fquoted:\\1|p\
+ $$f; \
+ done) | sort $(CR_EXCEPTIONS)~
+ diff -u $(CR_EXCEPTIONS) $(CR_EXCEPTIONS)~
+
## Deploy the package archive to archive/, with packages in
## archive/packages/:
archive: archive-tmp
@@ -46,6 +65,8 @@ archive-full: archive-tmp org-fetch
#mkdir -p archive/admin
#cp admin/* archive/admin/
+# FIXME: Turn it into an `external', which will require adding the notion of
+# snapshot packages.
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}'`; \
diff --git a/admin/archive-contents.el b/admin/archive-contents.el
index 8ef73aa..863b13e 100644
--- a/admin/archive-contents.el
+++ b/admin/archive-contents.el
@@ -207,7 +207,7 @@ Rename DIR/PKG.el to PKG-VERS.el, delete DIR, and return
the descriptor.
(while (progn (forward-line -1) (= (point) start))
(insert ;; )))
(set (make-local-variable 'backup-inhibited) t)
- (save-buffer)
+ (basic-save-buffer) ;Less chatty than save-buffer.
(kill-buffer)))
(delete-directory dir t)
(cons (intern pkg) (vector (version-to-list vers) req desc 'single)))
diff --git a/admin/update-archive.sh b/admin/update-archive.sh
index 662d8db..91090ac 100755
--- a/admin/update-archive.sh
+++ b/admin/update-archive.sh
@@ -1,33 +1,20 @@
#!/bin/sh -x
-batchmode=no
+makelog=
+buildir=$(pwd)
export LANG=C
case $1 in
---batch) batchmode=yes ;;
+--batch)
+makelog=$(pwd)/make.log
+exec $makelog 21
+;;
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 '\(\.dir-locals\|.-\(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 -
+if [ = $makelog ]; then
echo Error: $title
else
mx_gnu_org=$(host -t mx gnu.org | sed 's/.*[ ]//')
@@ -41,37 +28,24 @@ To: emacs-elpa-diffs@gnu.org
Subject: $title
ENDDOC
- cat -
+ cat $makelog
echo .; sleep 1) | telnet $mx_gnu_org smtp
fi
+exit 1
}
-check_copyright () {
-base=copyright_exceptions
-(cd $1/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
[ELPA-diffs] ELPA branch, master, updated. f07d31db1757e184493f39012632d232a2b0f7ee
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project ELPA. The branch, master has been updated via f07d31db1757e184493f39012632d232a2b0f7ee (commit) from 023ae6e4aa99df2e46e7de618195d37b02f502ec (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit f07d31db1757e184493f39012632d232a2b0f7ee Author: Stefan Monnier monn...@iro.umontreal.ca Date: Tue Aug 13 22:22:22 2013 -0400 Don't create local branches diff --git a/admin/archive-contents.el b/admin/archive-contents.el index 863b13e..aaedd9b 100644 --- a/admin/archive-contents.el +++ b/admin/archive-contents.el @@ -471,6 +471,8 @@ Rename DIR/ to PKG-VERS/, and return the descriptor. ;;; Maintain external packages. +(defconst archive--elpa-git-url git+ssh://git.sv.gnu.org/srv/git/emacs/elpa) + (defun archive-add/remove/update-externals () (let ((exts (with-current-buffer (find-file-noselect externals-list) (goto-char (point-min)) @@ -502,17 +504,9 @@ Rename DIR/ to PKG-VERS/, and return the descriptor. (output (with-temp-buffer ;; FIXME: Use git-new-workdir! -(call-process git nil t nil branch --track - branch (concat origin/ branch)) (call-process git nil t nil clone - --shared --branch branch ../ dir) -(let ((default-directory (file-name-as-directory - (expand-file-name dir - ;; (call-process git nil t nil branch - ;; -m branch master) - (call-process git nil t nil remote -set-url --push origin - git+ssh://git.sv.gnu.org/srv/git/emacs/elpa.git)) + --reference .. --branch branch + archive--elpa-git-url dir) (buffer-string (message Cloning branch %s:\n%s dir output))) ((not (file-directory-p (concat dir /.git))) --- Summary of changes: admin/archive-contents.el | 14 -- 1 files changed, 4 insertions(+), 10 deletions(-) hooks/post-receive -- ELPA
[ELPA-diffs] ELPA branch, master, updated. 328e8e72efc2d4e073992591627751e2750390e5
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project ELPA. The branch, master has been updated via 328e8e72efc2d4e073992591627751e2750390e5 (commit) from cb753c3ace486a17e1f3fbb3cbee29dfd20ae68d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 328e8e72efc2d4e073992591627751e2750390e5 Author: Stefan Monnier monn...@iro.umontreal.ca Date: Thu Aug 15 11:13:20 2013 -0400 Fix up copyrights and the checking code diff --git a/GNUmakefile b/GNUmakefile index 1067e4c..cc06e48 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -13,8 +13,8 @@ CR_EXCEPTIONS=copyright_exceptions .PHONY: check_copyrights check_copyrights: @echo Compute exceptions $(CR_EXCEPTIONS)~ - @(cd packages; \ - export LANG=C; \ + @export LANG=C; \ + (cd packages; \ find . -name '*.el' -print0 | \ xargs -0 grep -L 'Free Software Foundation, Inc' | \ grep -v '\(\.dir-locals\|.-\(pkg\|autoloads\)\)\.el$$'; \ diff --git a/packages/f90-interface-browser/f90-tests.el b/packages/f90-interface-browser/f90-tests.el index d653882..d55308b 100644 --- a/packages/f90-interface-browser/f90-tests.el +++ b/packages/f90-interface-browser/f90-tests.el @@ -1,3 +1,22 @@ +;;; f90-tests.el --- Tests for f90-interface-browser + +;; Copyright (C) 2013 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 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, see http://www.gnu.org/licenses/. + +;;; Code: + (defvar *test-name* nil) (defvar *test-tests* (make-hash-table :test 'eq)) diff --git a/packages/js2-mode/tests/externs.el b/packages/js2-mode/tests/externs.el index 7860058..d422c74 100644 --- a/packages/js2-mode/tests/externs.el +++ b/packages/js2-mode/tests/externs.el @@ -1,3 +1,22 @@ +;;; externs.el --- Tests of externs for js2-mode + +;; Copyright (C) 2013 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 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, see http://www.gnu.org/licenses/. + +;;; Code: + (require 'ert) (require 'js2-mode) diff --git a/packages/js2-mode/tests/indent.el b/packages/js2-mode/tests/indent.el index 953b8a6..9ee981c 100644 --- a/packages/js2-mode/tests/indent.el +++ b/packages/js2-mode/tests/indent.el @@ -1,3 +1,22 @@ +;;; indent.el --- Tests of indentation for js2-mode + +;; Copyright (C) 2013 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 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, see http://www.gnu.org/licenses/. + +;;; Code: + (require 'ert) (require 'js2-mode) diff --git a/packages/js2-mode/tests/parser.el b/packages/js2-mode/tests/parser.el index 3c05c4b..2f020a6 100644 --- a/packages/js2-mode/tests/parser.el +++ b/packages/js2-mode/tests/parser.el @@ -1,3 +1,22 @@ +;;; parser.el --- Tests of the js2-mode's parser + +;; Copyright (C) 2013 Free Software Foundation, Inc
[ELPA-diffs] ELPA branch, master, updated. 4b34f9d0c918c452cfc0cd4605f3e6d6f2eab50f
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project ELPA. The branch, master has been updated via 4b34f9d0c918c452cfc0cd4605f3e6d6f2eab50f (commit) from 328e8e72efc2d4e073992591627751e2750390e5 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 4b34f9d0c918c452cfc0cd4605f3e6d6f2eab50f Author: Stefan Monnier monn...@iro.umontreal.ca Date: Thu Aug 15 12:20:16 2013 -0400 Fix up deployment script diff --git a/admin/archive-contents.el b/admin/archive-contents.el index e2154df..2d588e9 100644 --- a/admin/archive-contents.el +++ b/admin/archive-contents.el @@ -32,9 +32,16 @@ (defconst archive-re-no-dot \\`\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).* Regular expression matching all files except \.\ and \..\.) +(defun archive--version-to-list (vers) + (when vers +(let ((l (version-to-list vers))) + ;; Signal an error for things like 1.02 which is parsed as 1.2. + (assert (equal vers (package-version-join l))) + l))) + (defun archive--convert-require (elt) (list (car elt) - (version-to-list (car (cdr elt) + (archive--version-to-list (car (cdr elt) (defun archive--strip-rcs-id (str) Strip RCS version ID from the version string STR. @@ -44,7 +51,7 @@ Otherwise return nil. (when (string-match \\`[ \t]*[$]Revision:[ \t]+ str) (setq str (substring str (match-end 0 (condition-case nil - (if (version-to-list str) + (if (archive--version-to-list str) str) (error nil @@ -79,10 +86,12 @@ Delete backup files also. (push (if (car simple-p) (apply #'archive--process-simple-package dir pkg (cdr simple-p)) - (apply 'archive--write-pkg-file dir pkg (cdr simple-p)) + (if simple-p + (apply #'archive--write-pkg-file + dir pkg (cdr simple-p))) (archive--process-multi-file-package dir pkg)) packages))) - (error (error Error in %s: %S dir v + ((debug error) (error Error in %s: %S dir v (with-temp-buffer (pp (nreverse packages) (current-buffer)) (write-region nil nil archive-contents @@ -156,8 +165,7 @@ REQ is a list of requirements. Otherwise, return nil. (let* ((pkg-file (expand-file-name (concat pkg -pkg.el) dir)) (mainfile (expand-file-name (concat pkg .el) dir)) - (files (directory-files dir nil \\.el\\')) -version description req) + (files (directory-files dir nil \\.el\\'))) (setq files (delete (concat pkg -pkg.el) files)) (setq files (delete (concat pkg -autoloads.el) files)) (cond @@ -168,17 +176,20 @@ Otherwise, return nil. (goto-char (point-min)) (if (not (looking-at ;;;.*---[ \t]*\\(.*?\\)[ \t]*\\(-\\*-.*-\\*-[ \t]*\\)?$)) (error Can't parse first line of %s mainfile) - (setq description (match-string 1)) - (setq version -(or (archive--strip-rcs-id (lm-header package-version)) -(archive--strip-rcs-id (lm-header version)) -(error Missing `version' header))) ;; Grab the other fields, which are not mandatory. - (let ((requires-str (lm-header package-requires))) -(if requires-str -(setq req (mapcar 'archive--convert-require - (car (read-from-string requires-str)) - (list (= (length files) 1) version description req + (let* ((description (match-string 1)) + (version + (or (archive--strip-rcs-id (lm-header package-version)) + (archive--strip-rcs-id (lm-header version)) + (error Missing `version' header))) + (requires-str (lm-header package-requires)) + (pt (lm-header package-type)) + (simple (if pt (equal pt simple) (= (length files) 1))) + (req + (if requires-str + (mapcar 'archive--convert-require + (car (read-from-string requires-str)) +(list simple version description req) ((not (file-exists-p pkg-file)) (error Can find single file nor package desc file in %s dir) @@ -207,7 +218,8 @@ Rename DIR/PKG.el to PKG-VERS.el, delete DIR, and return the descriptor. (basic-save-buffer) ;Less chatty than save-buffer. (kill-buffer))) (delete-directory dir t) - (cons (intern pkg) (vector (version-to-list vers) req desc 'single))) + (cons
[ELPA-diffs] ELPA branch, master, updated. f56b573a4fe7147827c3fe33139c12271ec65799
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project ELPA.
The branch, master has been updated
via f56b573a4fe7147827c3fe33139c12271ec65799 (commit)
from 839ab0cf78b9cd4d35dc760bdff92a4d10536781 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit f56b573a4fe7147827c3fe33139c12271ec65799
Author: Stefan Monnier monn...@iro.umontreal.ca
Date: Tue Aug 20 23:59:12 2013 -0400
* packages/js2-mode/js2-mode.el: Remove unused variables. Use posix
character classes. Do a bit of CSE simplification.
(js2-parse-highlight-member-expr-node): Flip test order to simplify code.
(js2-re-search-forward, js2-re-search-backward): Don't quote code.
(js2-echo-help): Defalias applies to symbol, not functions.
diff --git a/packages/js2-mode/js2-mode.el b/packages/js2-mode/js2-mode.el
index 982b794..6820c12 100644
--- a/packages/js2-mode/js2-mode.el
+++ b/packages/js2-mode/js2-mode.el
@@ -1126,8 +1126,7 @@ information.
:group 'js2-mode)
(defvar js2-mode-map
- (let ((map (make-sparse-keymap))
-keys)
+ (let ((map (make-sparse-keymap)))
(define-key map [mouse-1] #'js2-mode-show-node)
(define-key map (kbd M-j) #'js2-line-break)
(define-key map (kbd C-c C-e) #'js2-mode-hide-element)
@@ -1202,7 +1201,7 @@ information.
map)
Keymap used in `js2-mode' buffers.)
-(defconst js2-mode-identifier-re [a-zA-Z_$][a-zA-Z0-9_$]*)
+(defconst js2-mode-identifier-re [[:alpha:]_$][[:alnum:]_$]*)
(defvar js2-mode-//-comment-re ^\\(\\s-*\\)//.+
Matches a //-comment line. Must be first non-whitespace on line.
@@ -1225,7 +1224,7 @@ First match-group is the leading whitespace.)
(js2-deflocal js2-imenu-function-map nil Private variable)
(defvar js2-paragraph-start
- \\(@[a-zA-Z]+|$\\))
+ \\(@[[:alpha:]]+|$\\))
;; Note that we also set a 'c-in-sws text property in html comments,
;; so that `c-forward-sws' and `c-backward-sws' work properly.
@@ -2282,6 +2281,7 @@ NAME can be a Lisp symbol or string. SYMBOL is a
`js2-symbol'.
(:constructor make-js2-script-node (key (type js2-SCRIPT)
(pos js2-token-beg)
len
+ ;; FIXME: What are those?
var-decls
fun-decls)))
functions ; Lisp list of nested functions
@@ -2500,9 +2500,7 @@ NAME can be a Lisp symbol or string. SYMBOL is a
`js2-symbol'.
(insert each ))
(insert ()
(js2-print-ast (js2-for-in-node-iterator n) 0)
-(if forof
-(insert of )
- (insert in ))
+(insert (if forof of in ))
(js2-print-ast (js2-for-in-node-object n) 0)
(insert ) {\n)
(js2-print-body (js2-for-in-node-body n) (1+ i))
@@ -3670,14 +3668,13 @@ as opposed to required parens such as those enclosing
an if-conditional.
(js2-visit-ast (js2-array-comp-loop-node-iterator n) v)
(js2-visit-ast (js2-array-comp-loop-node-object n) v))
-(defun js2-print-array-comp-loop (n i)
+(defun js2-print-array-comp-loop (n _i)
(insert for )
(when (js2-array-comp-loop-node-foreach-p n) (insert each ))
(insert ()
(js2-print-ast (js2-array-comp-loop-node-iterator n) 0)
- (if (js2-array-comp-loop-node-forof-p n)
- (insert of )
-(insert in ))
+ (insert (if (js2-array-comp-loop-node-forof-p n)
+ of in ))
(js2-print-ast (js2-array-comp-loop-node-object n) 0)
(insert )))
@@ -4285,9 +4282,9 @@ Returns nil if no applicable child is found.
(let ((kids (if (js2-function-node-p parent)
(js2-block-node-kids (js2-function-node-body parent))
(js2-node-child-list parent)))
-(beg (if (js2-function-node-p parent)
- (js2-node-abs-pos (js2-function-node-body parent))
- (js2-node-abs-pos parent)))
+(beg (js2-node-abs-pos (if (js2-function-node-p parent)
+ (js2-function-node-body parent)
+ parent)))
kid result fn
(continue t))
(setq fn (if after '= '))
@@ -4295,8 +4292,8 @@ Returns nil if no applicable child is found.
(setq kid (car kids))
(if (funcall fn (+ beg (js2-node-pos kid)) pos)
(setq result kid
-continue (if after nil t))
-(setq continue (if after t nil)))
+continue (not after))
+(setq continue after))
(setq kids (cdr kids)))
result))
@@ -4503,11 +4500,11 @@ If NODE is the ast-root, returns nil.
;;; visitor infrastructure
-(defun js2
[ELPA-diffs] ELPA branch, master, updated. 3aaa9f3043c962c5b2a2473e86fec23cf0d01c20
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project ELPA. The branch, master has been updated via 3aaa9f3043c962c5b2a2473e86fec23cf0d01c20 (commit) via 0fa6f89f0be5805bf1502b5c2359a1b3122d3d11 (commit) via a2d12bc48f8fb8b281dcca38639e1397494ec63b (commit) from 7a47daeb4e9c229c332bf6d270576726b9188367 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 3aaa9f3043c962c5b2a2473e86fec23cf0d01c20 Merge: 7a47dae 0fa6f89 Author: Stefan Monnier monn...@iro.umontreal.ca Date: Wed Aug 21 15:03:39 2013 -0400 Sync from ack/master commit 0fa6f89f0be5805bf1502b5c2359a1b3122d3d11 Author: Leo Liu sdl@gmail.com Date: Sat Jun 8 12:44:14 2013 +0800 Small tweak to last change diff --git a/ack.el b/ack.el index 3e95706..41b6d22 100644 --- a/ack.el +++ b/ack.el @@ -215,7 +215,7 @@ This gets tacked on the end of the generated expressions.) ;; 'Ack started at Thu Jun 6 12:27:53'. (^\\(.+?\\)\\(:\\|-\\)\\([1-9][0-9]*\\)\\2\\(?:\\(?:\\(?4:[1-9][0-9]*\\)\\2\\)\\|[^0-9\n]\\|[0-9][^0-9\n]\\|...\\) 1 3 (ack--column-start . ack--column-end) - nil nil (4 compilation-column-face nil t)) + nil 1 (4 compilation-column-face nil t)) (^Binary file \\(.+\\) matches$ 1 nil nil 0 1)) Ack version of `compilation-error-regexp-alist' (which see).) commit a2d12bc48f8fb8b281dcca38639e1397494ec63b Author: Leo Liu sdl@gmail.com Date: Thu Jun 6 12:30:33 2013 +0800 Tweak ack-mode-font-lock-keywords and error regexps diff --git a/ack.el b/ack.el index 01529d7..3e95706 100644 --- a/ack.el +++ b/ack.el @@ -3,7 +3,7 @@ ;; Copyright (C) 2012-2013 Free Software Foundation, Inc. ;; Author: Leo Liu sdl@gmail.com -;; Version: 1.01 +;; Version: 1.3 ;; Keywords: tools, processes, convenience ;; Created: 2012-03-24 ;; URL: https://github.com/leoliu/ack-el @@ -156,11 +156,7 @@ This function is called from `compilation-filter-hook'. ;; Command output lines. (: \\(.+\\): \\(?:Permission denied\\|No such \\(?:file or directory\\|device or address\\)\\)$ 1 'compilation-error) -;; Remove match from ack-error-regexp-alist before fontifying -(^Ack \\(?:started\\|finished\\) at.* - (0 '(face nil compilation-message nil message nil help-echo nil mouse-face nil) t)) (^Ack \\(exited abnormally\\|interrupt\\|killed\\|terminated\\)\\(?:.*with code \\([0-9]+\\)\\)?.* - (0 '(face nil compilation-message nil message nil help-echo nil mouse-face nil) t) (1 'compilation-error) (2 'compilation-error nil t))) Additional things to highlight in ack output. @@ -211,12 +207,13 @@ This gets tacked on the end of the generated expressions.) ;;; in the regexp alist has already been applied in a region. (defconst ack-error-regexp-alist - `(;; grouping line (--group or --heading) + `(;; Grouping line (--group or --heading). (^\\([1-9][0-9]*\\)\\(:\\|-\\)\\(?:\\(?4:[1-9][0-9]*\\)\\2\\)? ack--file 1 (ack--column-start . ack--column-end) nil nil (4 compilation-column-face nil t)) -;; none grouping line (--nogroup or --noheading) - (^\\(.+?\\)\\(:\\|-\\)\\([1-9][0-9]*\\)\\2\\(?:\\(?4:[1-9][0-9]*\\)\\2\\)? +;; None grouping line (--nogroup or --noheading). Avoid matching +;; 'Ack started at Thu Jun 6 12:27:53'. + (^\\(.+?\\)\\(:\\|-\\)\\([1-9][0-9]*\\)\\2\\(?:\\(?:\\(?4:[1-9][0-9]*\\)\\2\\)\\|[^0-9\n]\\|[0-9][^0-9\n]\\|...\\) 1 3 (ack--column-start . ack--column-end) nil nil (4 compilation-column-face nil t)) (^Binary file \\(.+\\) matches$ 1 nil nil 0 1)) --- Summary of changes: packages/ack/ack.el | 15 ++- 1 files changed, 6 insertions(+), 9 deletions(-) hooks/post-receive -- ELPA
[ELPA-diffs] ELPA branch, master, updated. 7ee028f7e9bb11a80501ed23714cd4aeb7116756
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project ELPA. The branch, master has been updated via 7ee028f7e9bb11a80501ed23714cd4aeb7116756 (commit) via b9e64ec07adfd8afbaf3fbc6d89a069b012f7ad2 (commit) via 85d0fa41222af8413daf4bd2c54d64c8abc2a2f6 (commit) via fac24aa671caabe804a85f00f2030c3b56bec722 (commit) via 5726e141d1c2a5c9993cb05561d8358ae7246e30 (commit) via 66e9b043b82dc18bf66399812af573375b058cd8 (commit) via b9840a3cd477063193ab89dd807acffb3b2df171 (commit) via 15a5062a17805a8d3a7a6b31ce3f3f805ad9b724 (commit) via f23e059ac1dbc663aa03b764bbdbce6b4e8e9cbc (commit) via 35e64f3ae391715d9344265c7afc0ac798239f85 (commit) via 7c76330fceee2b6901e61ce3bedb5b76b253d828 (commit) via 5ad905a6aaf79c4f2a0018cd954e1414e542fff4 (commit) via f6e5180bb1ac5c873885149325e1c63202a26f45 (commit) from d4a3c58f4a518fd11d3d6846d8be14104ee4eeab (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 7ee028f7e9bb11a80501ed23714cd4aeb7116756 Author: Stefan Monnier monn...@iro.umontreal.ca Date: Wed Aug 21 15:38:05 2013 -0400 * packages/company/company-cmake.el: Fix up copyright. Require CL. * packages/company/company-template.el (company-template--buffer-templates): Declare before first use. * packages/company/company-eclim.el (json-array-type): Declare json-array-type. (company-eclim--candidates): Remove unused var `project-name'. diff --git a/packages/company/company-cmake.el b/packages/company/company-cmake.el index 0c96eb6..34359dc 100644 --- a/packages/company/company-cmake.el +++ b/packages/company/company-cmake.el @@ -1,24 +1,22 @@ ;;; company-cmake.el --- company-mode completion back-end for CMake -;; Copyright (C) 2013 Chen Bin +;; Copyright (C) 2013 Free Software Foundation, Inc. ;; Author: Chen Bin chenbin DOT sh AT gmail ;; Version: 0.1 -;; This file is NOT part of GNU Emacs. - -;; GNU Emacs is free software: you can redistribute it and/or modify +;; 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 of the License, or ;; (at your option) any later version. -;; GNU Emacs is distributed in the hope that it will be useful, +;; 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 GNU Emacs. If not, see http://www.gnu.org/licenses/. +;; along with this program. If not, see http://www.gnu.org/licenses/. ;;; Commentary: ;; @@ -26,6 +24,8 @@ ;; commands used by CMake. And their descriptions. ;;; Code: + +(eval-when-compile (require 'cl)) (require 'company) (defgroup company-cmake nil diff --git a/packages/company/company-eclim.el b/packages/company/company-eclim.el index 05e609c..70db7c3 100644 --- a/packages/company/company-eclim.el +++ b/packages/company/company-eclim.el @@ -70,6 +70,7 @@ eclim can only complete correctly when the buffer has been saved. (make-variable-buffer-local 'company-eclim--doc) (declare-function json-read json) +(defvar json-array-type) (defun company-eclim--call-process (rest args) (let ((coding-system-for-read 'utf-8) @@ -109,8 +110,7 @@ eclim can only complete correctly when the buffer has been saved. (defun company-eclim--candidates (prefix) (interactive d) (let ((project-file (file-relative-name buffer-file-name - (company-eclim--project-dir))) -(project-name (company-eclim--project-name))) + (company-eclim--project-dir (when company-eclim-auto-save (when (buffer-modified-p) (basic-save-buffer)) diff --git a/packages/company/company-template.el b/packages/company/company-template.el index 5c72ac8..ea1db86 100644 --- a/packages/company/company-template.el +++ b/packages/company/company-template.el @@ -1,6 +1,6 @@ ;;; company-template.el -;; Copyright (C) 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2009, 2010, 2013 Free Software Foundation, Inc. ;; Author: Nikolaj Schumacher @@ -34,6 +34,9 @@ (define-key keymap [tab] 'company-template-forward-field) keymap)) +(defvar company-template--buffer-templates nil) +(make-variable-buffer-local 'company-template--buffer-templates) + ;; interactive
[ELPA-diffs] ELPA branch, master, updated. fcca4e12b3376d19c55d3290fd976ab342faa238
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project ELPA.
The branch, master has been updated
via fcca4e12b3376d19c55d3290fd976ab342faa238 (commit)
via 26d31f98bb529d036b7235de89c2af2a21a8da48 (commit)
via 4a05529a6d9721805732538db8c41790dd96d7a0 (commit)
via f1409ce5e97e6a0391cc2efe7ba257ec76113930 (commit)
via c4cc459f97ea70ab3fb4a1a89dd16964c931f275 (commit)
via 0baa24510c48e21e014cd252f5ca724d6386434f (commit)
via 7b801add8ae0da34a78960739be36aab703867b7 (commit)
via b32c985e677a5408476333481c2a2bedd4856b6a (commit)
via b5ad48df54975e3857b150456bb8b313be899da1 (commit)
from 7ee028f7e9bb11a80501ed23714cd4aeb7116756 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit fcca4e12b3376d19c55d3290fd976ab342faa238
Merge: 7ee028f 26d31f9
Author: Stefan Monnier monn...@iro.umontreal.ca
Date: Wed Aug 21 15:39:31 2013 -0400
Sync from ggtags/master
commit 26d31f98bb529d036b7235de89c2af2a21a8da48
Author: Leo Liu sdl@gmail.com
Date: Mon Jul 29 11:00:16 2013 +0800
Fix #14: Override key [return] in ggtags-navigation-mode-map
diff --git a/ggtags.el b/ggtags.el
index b344555..3f77656 100644
--- a/ggtags.el
+++ b/ggtags.el
@@ -532,6 +532,7 @@ s: symbols (-s)
(define-key map \M-} 'ggtags-navigation-next-file)
(define-key map \M-{ 'ggtags-navigation-previous-file)
(define-key map \M-o 'ggtags-navigation-visible-mode)
+(define-key map [return] 'ggtags-navigation-mode-done)
(define-key map \r 'ggtags-navigation-mode-done)
;; Intercept M-. and M-* keys
(define-key map [remap pop-tag-mark] 'ggtags-navigation-mode-abort)
commit 4a05529a6d9721805732538db8c41790dd96d7a0
Author: Leo Liu sdl@gmail.com
Date: Fri Jul 5 09:07:30 2013 +0800
Make use of --color if available
diff --git a/ggtags.el b/ggtags.el
index a422f4a..b344555 100644
--- a/ggtags.el
+++ b/ggtags.el
@@ -133,11 +133,15 @@ If nil, use Emacs default.
;; http://thread.gmane.org/gmane.comp.gnu.global.bugs/1518
(defvar ggtags-global-has-path-style; introduced in global 6.2.8
(with-demoted-errors ; in case `global' not found
-(and (string-match-p ^--path-style
- (shell-command-to-string global --help))
- t))
+(zerop (call-process global nil nil nil
+ --path-style shorter --help)))
Non-nil if `global' supports --path-style switch.)
+;; http://thread.gmane.org/gmane.comp.gnu.global.bugs/1542
+(defvar ggtags-global-has-color ; introduced in global 6.2.9
+ (with-demoted-errors
+(zerop (call-process global nil nil nil --color --help
+
(defmacro ggtags-ensure-global-buffer (rest body)
(declare (indent 0))
`(progn
@@ -264,6 +268,7 @@ Return -1 if it does not exist.
(defun ggtags-global-options ()
(concat -v --result=
(symbol-name ggtags-global-output-format)
+ (and ggtags-global-has-color --color)
(and ggtags-global-has-path-style --path-style=shorter)))
;;;###autoload
@@ -475,6 +480,10 @@ s: symbols (-s)
(get-text-property (match-beginning sub)
'compilation-message))
(ggtags-abbreviate-file (match-beginning sub) (match-end sub)))
+(defun ggtags-global-filter ()
+ Called from `compilation-filter-hook' (which see).
+ (ansi-color-apply-on-region compilation-filter-start (point)))
+
(defun ggtags-handle-single-match (buf _how)
(when (and ggtags-auto-jump-to-first-match
;; If exit abnormally keep the window for inspection.
@@ -512,6 +521,7 @@ s: symbols (-s)
'ggtags-global-exit-message-function)
(setq-local truncate-lines t)
(jit-lock-register #'ggtags-abbreviate-files)
+ (add-hook 'compilation-filter-hook 'ggtags-global-filter nil 'local)
(add-hook 'compilation-finish-functions 'ggtags-handle-single-match nil t)
(define-key ggtags-global-mode-map o 'visible-mode))
commit f1409ce5e97e6a0391cc2efe7ba257ec76113930
Author: Leo Liu sdl@gmail.com
Date: Wed Jun 12 13:31:58 2013 +0800
Improve ggtags-next-mark
diff --git a/ggtags.el b/ggtags.el
index a9b5b46..a422f4a 100644
--- a/ggtags.el
+++ b/ggtags.el
@@ -390,14 +390,15 @@ s: symbols (-s)
(defun ggtags-next-mark (optional arg)
Move to the next mark in the tag marker ring.
(interactive)
- (or (= (ring-length find-tag-marker-ring) 1)
+ (or ( (ring-length find-tag-marker-ring) 1)
(user-error No %s mark (if arg previous next)))
(let ((mark (or (and ggtags-current-mark
+ (marker-buffer ggtags-current-mark)
(funcall (if arg #'ring
[ELPA-diffs] ELPA branch, master, updated. bab59120703102088bdcb56141430b5dc97788da
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project ELPA. The branch, master has been updated via bab59120703102088bdcb56141430b5dc97788da (commit) from 86db2a37cacc2eaaab091df714e5cb783861eec1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit bab59120703102088bdcb56141430b5dc97788da Author: Stefan Monnier monn...@iro.umontreal.ca Date: Thu Aug 22 14:53:18 2013 -0400 * register-list.el: Use lexical-binding. Remove redundant :groups. (register-list-preserve-pos): Don't eval `force-line'. Use forward-line to better match line-number-at-pos's behavior. (register-list-refresh): Don't use the line number that happens to be current during macro-expansion. (register-list): Remove unused arg `reg-alist'. Use dolist. Use a closure rather than `(lambda ...). (register-list-edit-value): Remove unused var `new-val'. diff --git a/packages/register-list/register-list.el b/packages/register-list/register-list.el index 9b3e212..d192cc7 100755 --- a/packages/register-list/register-list.el +++ b/packages/register-list/register-list.el @@ -1,4 +1,4 @@ -;;; register-list.el --- Interactively list/edit registers +;;; register-list.el --- Interactively list/edit registers -*- lexical-binding:t -*- ;; ;; Copyright (C) 2011-2013 Free Software Foundation, Inc. ;; @@ -70,13 +70,11 @@ (defcustom register-list-string-width nil Maximum width for the register value string. - :type 'integer - :group 'register-list) + :type 'integer) (defcustom register-list-preserve-fontification nil Non-nil means keep the value strings fontified. - :type 'integer - :group 'register-list) + :type 'integer) (defcustom register-list-default-types [FNMRSW] A regexp matching the default register types to list. @@ -84,13 +82,11 @@ The available types are: [F]rame [N]umber [M]arkers [R]ectangle \[S]string and [W]window. [FW] will list markers, frame and window configuration, [SM] will list strings and markers, etc. - :type 'regexp - :group 'register-list) + :type 'regexp) (defface register-list-off-rectangle '((t (:inverse-video t))) - Face used to show what falls out of a rectangle. - :group 'register-list) + Face used to show what falls out of a rectangle.) ;;; Variables, map, mode @@ -162,11 +158,12 @@ Saved before editing the value of a register.) (defmacro register-list-preserve-pos (force-line rest body) Preserve the position and execute BODY. If FORCE-LINE is non-nil, force moving to this line. - `(let ((line (line-number-at-pos (point))) + (declare (debug t) (indent 1)) + `(let (,@(unless force-line '((line (line-number-at-pos (point) (col (current-column))) ,@body (goto-char (point-min)) - (line-move ,(or (eval force-line) '(1- line)) t) + (forward-line ,(or force-line '(1- line))) (line-move-to-column col))) (defmacro register-list-map-lines (let-vals rest body) @@ -263,10 +260,9 @@ If FORCE-LINE is non-nil, force moving to this line. Refresh the list of registers. An optional TYPE argument restrict the list these types. (interactive P) - (register-list-preserve-pos - (1- (line-number-at-pos (point))) - (register-list (or type register-list-current-type) - register-list-current-fontification))) + (register-list-preserve-pos nil +(register-list (or type register-list-current-type) + register-list-current-fontification))) (defun register-list-quit nil Quit the register list and kill its buffer. @@ -276,12 +272,11 @@ An optional TYPE argument restrict the list these types. (defun register-list-toggle-fontification nil Toggle fontification of the value strings. (interactive) - (register-list-preserve-pos - nil - (setq register-list-current-fontification -(not register-list-current-fontification)) - (register-list register-list-current-type - register-list-current-fontification))) + (register-list-preserve-pos nil +(setq register-list-current-fontification + (not register-list-current-fontification)) +(register-list register-list-current-type + register-list-current-fontification))) (define-derived-mode register-list-mode special-mode Register List Major mode for editing a list of register keys. @@ -359,7 +354,7 @@ The list is displayed in a buffer named `*Register List*' in `register-list-mode', which see. (interactive) (switch-to-buffer (get-buffer-create *Register List*)) - (let ((inhibit-read-only t) reg-alist) + (let ((inhibit-read-only t)) (setq type (or type register-list-default-types)) (setq register-list-current-fontification
[ELPA-diffs] ELPA branch, externals/dismal, updated. 4d302343f97891a9ce6f08e443fa026474b614f0
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project ELPA. The branch, externals/dismal has been updated via 4d302343f97891a9ce6f08e443fa026474b614f0 (commit) from 49827fef61001efc46d800cab4b3b2e80a1e8904 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 4d302343f97891a9ce6f08e443fa026474b614f0 Author: Stefan Monnier monn...@iro.umontreal.ca Date: Thu Aug 22 16:24:56 2013 -0400 Use closures instead of `(lambda ...) diff --git a/.gitignore b/.gitignore index 36eb56c..002e6d9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ *.elc +*-pkg.el *-autoloads.el *~ ChangeLog diff --git a/dismal-menu3.el b/dismal-menu3.el index ed01c5b..e29fa04 100644 --- a/dismal-menu3.el +++ b/dismal-menu3.el @@ -187,7 +187,7 @@ (define-key dismal-map [menu-bar commands 0log] '(Logging-Off . log-quit)) (define-key dismal-map [menu-bar commands 1log] - '(Logging-On . log-initialize)) + '(Logging-On . log-session-mode)) (define-key dismal-map [menu-bar commands deblnk] '(Del Blank Rows . dis-delete-blank-rows)) (define-key dismal-map [menu-bar commands qrep] diff --git a/dismal-simple-menus.el b/dismal-simple-menus.el index 5de9283..92fd298 100644 --- a/dismal-simple-menus.el +++ b/dismal-simple-menus.el @@ -209,7 +209,7 @@ (QRep Query-replace for Dismal. dis-query-replace) (DeBlnk Delete all blank rows in given range. dis-delete-blank-rows) - (1log Turn loggin on. log-initialize) + (1log Turn loggin on. log-session-mode) (0log Turn loggin off. log-quit) (Upd* Update commands. dismal-update-commands-menu) )) diff --git a/dismal.el b/dismal.el index 264f2fc..26d5ea5 100644 --- a/dismal.el +++ b/dismal.el @@ -7,6 +7,7 @@ ;; Maintainer: FSF ;; Created-On: 31 Oct 1991. ;; Version: 1.5 +;; Package-Requires: ((cl-lib 0)) ;; This is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by diff --git a/log.el b/log.el index 20d351a..31cc917 100644 --- a/log.el +++ b/log.el @@ -1,4 +1,4 @@ -;;; log.el --- Command usage log for Michael Hucka +;;; log.el --- Command usage log for Michael Hucka -*- lexical-binding:t -*- ;; Copyright (C) 1991, 2013 Free Software Foundation, Inc. @@ -29,17 +29,7 @@ ;; USE ;; -;; 1. Compile the C code for the timer process (search for main) and -;; set *log-timer-program* to point to the object code. (At CMU, -;; the value of *log-timer-program* below will do for sun3_mach and -;; pmax_mach.) -;; [e.g., cc timer.c -o timer.sun4] -;; -;; 3. Byte-compile (M-x byte-compile log.el). -;; -;; 4. Load (M-x load-library log). -;; -;; 5. Start logging (M-x log-initialize). +;; 5. Start logging (M-x log-session-mode). ;; ;;State is written in Log.type.timestamp, where type is ;;keys (keystrokes), temp-buffers (an accumulation of temp @@ -51,7 +41,7 @@ ;; ;;State files and backups are compressed (end in .Z). ;; -;; 6. Stop logging (exit Emacs) or turn off logging with log-quit. +;; 6. Stop logging (exit Emacs) or turn off logging with log-session-mode. ;; ;; 7. Uncompress and visit a keystroke log file, then run ;; log-time-episodes on the buffer, and log-spread-out on the @@ -134,20 +124,10 @@ ;; Loads either before or after other packages, and loads safely on ;; top of itself. ;; -;; Uses kill-emacs-hook and temp-buffer-show-hook, but tries to be -;; smart about existing hooks (see log-reset-hook). -;; -;; The timer process sucks a little, but Emacs doesn't have a fine- -;; grain timer. A sun3_mach is too slow for this package to keep up -;; with this typist (who's of medium skill). A pmax_mach is ok. -;; Sometimes events appear to happen at the same time. +;; Uses temp-buffer-show-hook, but tries to be +;; smart about existing hooks (??). ;; ;; Doesn't deal with mouse events. -;; -;; The original read-char bypasses keymaps. It's redefined here, -;; but it having a byte code means that compiled functions won't see -;; the new definition. So far reloads only isearch.el. -;; ;;; Code: @@ -182,26 +162,26 @@ ;; entry: ;; sorta more hidden, system globals -(defvar log-initialized nil Has log been initialized?) -(defvar log-running nil Is log currently running?) -(defvar log-auto-save-counter 0) ; set in log-initialize -(defun log-initialize () - Starts logging state information. To stop, M-x log-quit. - (interactive) - (if (and log-initialized log-running) - (message (concat Already logging, to - *log-data-directory*)) -(add-hook 'post-command-hook #'log-stamp-date) -(setq log-running t))) +(defvar log-auto-save-counter 0
[ELPA-diffs] ELPA branch, externals/w3, updated. 1ba24a1bb49e1d9be7e6539cf857c08566d58575
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project ELPA.
The branch, externals/w3 has been updated
via 1ba24a1bb49e1d9be7e6539cf857c08566d58575 (commit)
from efd1e1253639f07dd04ef8b84c14afc74c419cb5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 1ba24a1bb49e1d9be7e6539cf857c08566d58575
Author: Stefan Monnier monn...@iro.umontreal.ca
Date: Sat Aug 24 23:49:04 2013 -0400
Add copyright header to auxiliary Elisp files
diff --git a/contrib/http-tunnel.el b/contrib/http-tunnel.el
index b35b026..fcc975e 100644
--- a/contrib/http-tunnel.el
+++ b/contrib/http-tunnel.el
@@ -1,3 +1,24 @@
+;;; http-tunnel.el --- Tunneling a connection through http?
+
+;; Copyright (c) 2013 Free Software Foundation, Inc.
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs. If not, see http://www.gnu.org/licenses/.
+
+;;; Code:
+
(defvar http-tunnel-host firewallmachine)
(defvar http-tunnel-port 80)
@@ -14,8 +35,7 @@
host service
emacs-major-version
emacs-minor-version))
-(save-excursion
- (set-buffer buffer)
+(with-current-buffer buffer
(while (and (memq (process-status proc) '(open run)) need-to-spin)
(accept-process-output proc 3)
(goto-char (point-min))
diff --git a/contrib/w3-imenu.el b/contrib/w3-imenu.el
index 0040125..1516d8d 100644
--- a/contrib/w3-imenu.el
+++ b/contrib/w3-imenu.el
@@ -1,5 +1,24 @@
-;;;$Id: w3-imenu.el,v 1.1 1998/12/01 22:11:57 wmperry Exp $
-;;;Description: Build up navigation index for W3 documents:
+;;; w3-imenu.el --- Build up navigation index for W3 documents
+
+;; Copyright (c) 2013 Free Software Foundation, Inc.
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs. If not, see http://www.gnu.org/licenses/.
+
+;;; Code:
+
(require 'cl)
(require 'imenu)
;;{{{ Tags to index
@@ -46,7 +65,6 @@ Return nil and leave point at end of buffer if not found.
(defun w3-imenu-create-index ()
Returns an alist suitable for use by imenu
- (declare (special w3-imenu-index-html-elements))
(let ((index nil)
(position nil)
(marker nil))
@@ -67,13 +85,12 @@ Return nil and leave point at end of buffer if not found.
;;}}}
;;{{{ Tell W3 to start using it:
-(declaim (special imenu-create-index-function))
+(defvar imenu-create-index-function)
(add-hook
'w3-mode-hook
- (function
- (lambda ()
-(setq imenu-create-index-function 'w3-imenu-create-index)
-(define-key w3-mode-map j 'imenu
+ (lambda ()
+ (setq imenu-create-index-function 'w3-imenu-create-index)
+ (define-key w3-mode-map j 'imenu)))
;;}}}
(provide 'w3-imenu)
diff --git a/tests/url-test.el b/tests/url-test.el
index 7060172..c7516e3 100644
--- a/tests/url-test.el
+++ b/tests/url-test.el
@@ -1,6 +1,31 @@
+;;; url-test.el --- URL parsing test suite
+
+;; Copyright (c) 2013 Free Software Foundation, Inc.
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU
[ELPA-diffs] ELPA branch, master, updated. 49afed8fcb923cba668de9d4d734cfe49cd415bf
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project ELPA. The branch, master has been updated via 49afed8fcb923cba668de9d4d734cfe49cd415bf (commit) from cad780fdc1758c7b4cd25f5451cfc628f73b037a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 49afed8fcb923cba668de9d4d734cfe49cd415bf Author: Stefan Monnier monn...@iro.umontreal.ca Date: Sat Aug 24 23:55:48 2013 -0400 Add Emacs/W3 as external diff --git a/.gitignore b/.gitignore index 548f54c..70caf06 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ core packages/*/*-autoloads.el packages/*/*-pkg.el packages/dismal +packages/w3 diff --git a/copyright_exceptions b/copyright_exceptions index 7f669a9..4fc04a6 100644 --- a/copyright_exceptions +++ b/copyright_exceptions @@ -47,3 +47,9 @@ ./uni-confusables/uni-confusables.el ./uni-confusables/uni-confusables.el:;; Copyright (C) 1991-2009, 2010 Unicode, Inc. ./uni-confusables/uni-confusables.el:;; for the copyright and permission notice. +./w3/w3-cus.el:copyright bookmark help made contents top) +./w3/w3-cus.el: ;; Glossary, Copyright, Chapter, Section, Subsection, Appendix, +./w3/w3-latex.el:(copy . \\copyright ) +./w3/w3-toolbar.el: Copyright] +./w3/w3-toolbar.el: (w3-fetch (w3-link-is-defined copyright)) +./w3/w3-toolbar.el: (w3-link-is-defined copyright) diff --git a/externals-list b/externals-list index f3cce41..2714f5e 100644 --- a/externals-list +++ b/externals-list @@ -31,6 +31,7 @@ ;;FIXME:(org:external ??) ;; Need to introduce snapshots!! (temp-buffer-browse :subtree https://github.com/leoliu/temp-buffer-browse;) ;;FIXME:(vlf:subtree ??) + (w3 :external nil) (websocket :subtree https://github.com/ahyatt/emacs-websocket.git;) ;;FIXME:(yasnippet :subtree https://github.com/capitaomorte/yasnippet.git;) ) --- Summary of changes: .gitignore |1 + copyright_exceptions |6 ++ externals-list |1 + 3 files changed, 8 insertions(+), 0 deletions(-) hooks/post-receive -- ELPA
[ELPA-diffs] ELPA branch, externals/auctex, updated. 58396710bdcb746de52543695ea386c417050e51
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project ELPA. The branch, externals/auctex has been updated via 58396710bdcb746de52543695ea386c417050e51 (commit) from 8b479fc861135e28d878fd9012b3dd682f00b812 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 58396710bdcb746de52543695ea386c417050e51 Author: Stefan Monnier monn...@iro.umontreal.ca Date: Mon Sep 30 17:12:44 2013 -0400 Load tex-site from autoloads. diff --git a/auctex-pkg.el b/auctex-pkg.el index 62a6b4f..d9462f1 100644 --- a/auctex-pkg.el +++ b/auctex-pkg.el @@ -1 +1 @@ -(define-package auctex 11.87 Integrated environment for *TeX* nil :url http://www.gnu.org/software/auctex/;) +(define-package auctex 11.87.1 Integrated environment for *TeX* nil :url http://www.gnu.org/software/auctex/;) diff --git a/tex-site.el b/tex-site.el index fc7c807..4ee712e 100644 --- a/tex-site.el +++ b/tex-site.el @@ -1,6 +1,6 @@ ;;; tex-site.el - Site specific variables. Don't edit. -;; Copyright (C) 2005 Free Software Foundation, Inc. +;; Copyright (C) 2005, 2013 Free Software Foundation, Inc. ;; ;; completely rewritten. @@ -152,4 +152,15 @@ If not a regular release, the date of the last change.) ;; Store bibitems when saving a BibTeX buffer (add-hook 'bibtex-mode-hook 'BibTeX-auto-store) +;;; Code specific to ELPA packaging: + +;; From preview-latex.el: + +(defvar preview-TeX-style-dir + (expand-file-name latex (file-name-directory load-file-name))) + +;;; Ensure that loading the autoloads file also loads this file. +;;;###autoload (require 'tex-site) + (provide 'tex-site) +;;; tex-site.el ends here --- Summary of changes: auctex-pkg.el |2 +- tex-site.el | 13 - 2 files changed, 13 insertions(+), 2 deletions(-) hooks/post-receive -- ELPA
[ELPA-diffs] ELPA branch, master, updated. 79a85e1b8b029766eb854e3f96788823fed4ff8f
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project ELPA. The branch, master has been updated via 79a85e1b8b029766eb854e3f96788823fed4ff8f (commit) from be19989d597d6c0aec79cfa8ec0401560fdde145 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 79a85e1b8b029766eb854e3f96788823fed4ff8f Author: Stefan Monnier monn...@iro.umontreal.ca Date: Mon Oct 7 00:48:06 2013 -0400 Avoid lm-homepage which is not in Emacs-24.3 diff --git a/admin/archive-contents.el b/admin/archive-contents.el index 219a1f9..7ee9c1c 100644 --- a/admin/archive-contents.el +++ b/admin/archive-contents.el @@ -187,7 +187,7 @@ Otherwise, return nil. (requires-str (lm-header package-requires)) (pt (lm-header package-type)) (simple (if pt (equal pt simple) (= (length files) 1))) - (url (or (lm-homepage) + (url (or (lm-header url) (format http://elpa.gnu.org/packages/%s.html; pkg))) (req (if requires-str @@ -452,7 +452,11 @@ Rename DIR/ to PKG-VERS/, and return the descriptor. (archive--insert-repolinks name srcdir mainsrcfile (cdr (assoc :url (aref (cdr pkg) 4 (let ((rm (archive--get-section - Commentary '(README README.rst README.md README.org) + Commentary '(README README.rst +;; Most README.md files seem to be currently +;; worse than the Commentary: section :-( +;; README.md +README.org) srcdir mainsrcfile))) (when rm (write-region rm nil (concat name -readme.txt)) --- Summary of changes: admin/archive-contents.el |8 ++-- 1 files changed, 6 insertions(+), 2 deletions(-) hooks/post-receive -- ELPA
[ELPA-diffs] ELPA branch, master, updated. f53038303beecf3d28c8fab7833726987f91ec16
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project ELPA. The branch, master has been updated via f53038303beecf3d28c8fab7833726987f91ec16 (commit) from 79a85e1b8b029766eb854e3f96788823fed4ff8f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit f53038303beecf3d28c8fab7833726987f91ec16 Author: Stefan Monnier monn...@iro.umontreal.ca Date: Mon Oct 7 14:55:38 2013 -0400 * coffee-mode.el: Tame electric-indent-mode. (coffee-mode): Derive from prog-mode. Set electric-indent-inhibit. (coffee-mode-map, coffee-mode-syntax-table): Move initialization into declaration. (coffee-comment-dwim): Remove. diff --git a/packages/coffee-mode/coffee-mode.el b/packages/coffee-mode/coffee-mode.el index 427c047..cf8b5a8 100644 --- a/packages/coffee-mode/coffee-mode.el +++ b/packages/coffee-mode/coffee-mode.el @@ -1,8 +1,8 @@ ;;; coffee-mode.el --- Major mode for CoffeeScript files -;; Copyright (C) 2010-2012 Free Software Foundation, Inc. +;; Copyright (C) 2010-2013 Free Software Foundation, Inc. -;; Version: 0.4.1 +;; Version: 0.4.1.1 ;; Keywords: CoffeeScript major mode ;; Author: Chris Wanstrath ch...@ozmm.org ;; URL: http://github.com/defunkt/coffee-mode @@ -155,9 +155,23 @@ with CoffeeScript. :type 'hook :group 'coffee) -(defvar coffee-mode-map (make-keymap) +(defvar coffee-mode-map + (let ((map (make-sparse-keymap))) +(define-key map (kbd A-r) 'coffee-compile-buffer) +(define-key map (kbd A-R) 'coffee-compile-region) +(define-key map (kbd A-M-r) 'coffee-repl) +(define-key map \C-m 'coffee-newline-and-indent) +(define-key map \C-c\C-o\C-s 'coffee-cos-mode) +map) Keymap for CoffeeScript major mode.) +(defvar coffee-mode-syntax-table + (let ((st (make-syntax-table))) +(modify-syntax-entry ?# b st) +(modify-syntax-entry ?\n b st) +(modify-syntax-entry ?' \ st) +st)) + ;; ;; Commands ;; @@ -328,14 +342,6 @@ called `coffee-compiled-buffer-name'. ;; Helper Functions ;; -(defun coffee-comment-dwim (arg) - Comment or uncomment current line or region in a smart way. -For details, see `comment-dwim'. - (interactive *P) - (require 'newcomment) - (let ((deactivate-mark nil) (comment-start #) (comment-end )) -(comment-dwim arg))) - (defun coffee-command-compile (file-name) Run `coffee-command' to compile FILE. (let ((full-file-name (expand-file-name file-name))) @@ -345,8 +351,9 @@ For details, see `comment-dwim'. Run `coffee-command' with the given arguments, and display the output in a compilation buffer. (interactive sArguments: ) - (let ((compilation-buffer-name-function (lambda (this-mode) -(generate-new-buffer-name coffee-compiled-buffer-name + (let ((compilation-buffer-name-function + (lambda (_this-mode) + (generate-new-buffer-name coffee-compiled-buffer-name (compile (concat coffee-command args ;; @@ -464,8 +471,7 @@ output in a compilation buffer. (if (= (point) (point-at-bol)) (insert-tab) (save-excursion - (let ((prev-indent (coffee-previous-indent)) -(cur-indent (current-indentation))) + (let ((prev-indent (coffee-previous-indent))) ;; Shift one column to the left (beginning-of-line) (insert-tab) @@ -495,7 +501,7 @@ output in a compilation buffer. ;; Remember the current line indentation level, ;; insert a newline, and indent the newline to the same ;; level as the previous line. - (let ((prev-indent (current-indentation)) (indent-next nil)) + (let ((prev-indent (current-indentation))) (delete-horizontal-space t) (newline) (insert-tab (/ prev-indent coffee-tab-width)) @@ -576,35 +582,26 @@ previous line. ;; Define Major Mode ;; +(unless (fboundp 'prog-mode) (defalias 'prog-mode 'fundamental-mode)) + +(defvar electric-indent-inhibit) + ;;;###autoload -(define-derived-mode coffee-mode fundamental-mode +(define-derived-mode coffee-mode prog-mode Coffee Major mode for editing CoffeeScript. - ;; key bindings - (define-key coffee-mode-map (kbd A-r) 'coffee-compile-buffer) - (define-key coffee-mode-map (kbd A-R) 'coffee-compile-region) - (define-key coffee-mode-map (kbd A-M-r) 'coffee-repl) - (define-key coffee-mode-map [remap comment-dwim] 'coffee-comment-dwim) - (define-key coffee-mode-map \C-m 'coffee-newline-and-indent) - (define-key coffee-mode-map \C-c\C-o\C-s 'coffee-cos-mode) - ;; code for syntax highlighting (setq font-lock-defaults '((coffee-font-lock-keywords))) ;; perl style comment: # ... - (modify-syntax-entry ?# b coffee-mode-syntax-table) - (modify-syntax-entry ?\n b coffee-mode
[ELPA-diffs] ELPA branch, externals/auctex, updated. f0590b2ea41d1c38a70d2de14ce64c3c4feb3d28
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project ELPA. The branch, externals/auctex has been updated via f0590b2ea41d1c38a70d2de14ce64c3c4feb3d28 (commit) from 58396710bdcb746de52543695ea386c417050e51 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit f0590b2ea41d1c38a70d2de14ce64c3c4feb3d28 Author: Stefan Monnier monn...@iro.umontreal.ca Date: Fri Oct 11 20:48:13 2013 -0400 Regenerate dir in English. diff --git a/GNUmakefile b/GNUmakefile index 347e0cc..7a94e74 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -62,7 +62,6 @@ tex-site.el: tex-site.el.in -e 's|@lispautodir@|(if (file-writable-p /usr/local/var/auctex) /usr/local/var/auctex ~/.emacs.d/auctex)|'\ -e 's|@AUCTEXVERSION@|$(AUCTEXVERSION)|'\ -e 's|@AUCTEXDATE@|$(AUCTEXDATE)|'\ - -e \$$a(provide 'tex-site) \ $ $@ doc/version.texi: ChangeLog diff --git a/auctex-pkg.el b/auctex-pkg.el index d9462f1..ffec66c 100644 --- a/auctex-pkg.el +++ b/auctex-pkg.el @@ -1 +1 @@ -(define-package auctex 11.87.1 Integrated environment for *TeX* nil :url http://www.gnu.org/software/auctex/;) +(define-package auctex 11.87.2 Integrated environment for *TeX* nil :url http://www.gnu.org/software/auctex/;) diff --git a/dir b/dir index ab993b5..0b85f60 100644 --- a/dir +++ b/dir @@ -1,18 +1,16 @@ -Ceci est le fichier .../info/dir, qui contient le nÅud le -plus haut de la hiérarchie Info. Ce nÅud est appelé (dir)Top. -C'est de ce nÅud que vous démarrez la première fois que -vous utilisez Info. +This is the file .../info/dir, which contains the +topmost node of the Info hierarchy, called (dir)Top. +The first time you invoke Info you start off looking at this node. -File: dir, Node: Top Ceci est le haut de l'arborescence INFO +File: dir, Node: Top This is the top of the INFO tree - Ceci (le nÅud Répertoire) fournit un menu des sujets majeurs. - Emtrez « q » pour quitter, « ? » pour afficher toutes les commandes Info, - « d » pour revenir ici ;, « h » affiche un guide d'initiation pour les - nouveaux venus, « mEmacsEntrée » démarre une consultation du manuel - Emacs, et cætera. + This (the Directory node) gives a menu of major topics. + Typing q exits, ? lists all Info commands, d returns here, + h gives a primer for first-timers, + mEmacsReturn visits the Emacs manual, etc. - Dans Emacs, vous pouvez cliquer avec le deuxième bouton de la souris - sur une entrée de menu ou sur un renvoi pour le sélectionner. + In Emacs, you can click mouse button 2 on a menu item or cross reference + to select it. * Menu: diff --git a/tex-site.el.in b/tex-site.el.in index 3c43aae..9340912 100644 --- a/tex-site.el.in +++ b/tex-site.el.in @@ -1,6 +1,6 @@ ;;; tex-site.el - Site specific variables. Don't edit. -;; Copyright (C) 2005 Free Software Foundation, Inc. +;; Copyright (C) 2005, 2013 Free Software Foundation, Inc. ;; ;; completely rewritten. @@ -152,3 +152,15 @@ If not a regular release, the date of the last change.) ;; Store bibitems when saving a BibTeX buffer (add-hook 'bibtex-mode-hook 'BibTeX-auto-store) +;;; Code specific to ELPA packaging: + +;; From preview-latex.el: + +(defvar preview-TeX-style-dir + (expand-file-name latex (file-name-directory load-file-name))) + +;;; Ensure that loading the autoloads file also loads this file. +;;;###autoload (require 'tex-site) + +(provide 'tex-site) +;;; tex-site.el ends here --- Summary of changes: GNUmakefile|1 - auctex-pkg.el |2 +- dir| 22 ++ tex-site.el.in | 14 +- 4 files changed, 24 insertions(+), 15 deletions(-) hooks/post-receive -- ELPA
[ELPA-diffs] ELPA branch, master, updated. 5d9f221106cd5d89361bbebbcabeb5bb4e4b1311
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project ELPA. The branch, master has been updated via 5d9f221106cd5d89361bbebbcabeb5bb4e4b1311 (commit) from fcffdc01b91ee362532fbe74aeb49b691eef44da (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 5d9f221106cd5d89361bbebbcabeb5bb4e4b1311 Author: Stefan Monnier monn...@iro.umontreal.ca Date: Thu Nov 7 14:44:03 2013 -0500 * .bzrignore: Add auctex. diff --git a/.gitignore b/.gitignore index 70caf06..e65f02f 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ packages/*/*-autoloads.el packages/*/*-pkg.el packages/dismal packages/w3 +packages/auctex diff --git a/externals-list b/externals-list index 5a6e2df..b05f150 100644 --- a/externals-list +++ b/externals-list @@ -19,6 +19,7 @@ ((ack:subtree https://github.com/leoliu/ack-el;) (auctex :external git://git.sv.gnu.org/auctex.git) + ;;FIXME:(cedet :external ??) (coffee-mode:subtree https://github.com/defunkt/coffee-mode;) (company:subtree https://github.com/company-mode/company-mode.git;) (dismal :external nil) @@ -33,5 +34,5 @@ ;;FIXME:(vlf:subtree ??) (w3 :external nil) (websocket :subtree https://github.com/ahyatt/emacs-websocket.git;) - ;;FIXME:(yasnippet :subtree https://github.com/capitaomorte/yasnippet.git;) + (yasnippet :subtree https://github.com/capitaomorte/yasnippet.git;) ) --- Summary of changes: .gitignore |1 + externals-list |3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) hooks/post-receive -- ELPA
[ELPA-diffs] ELPA branch, master, updated. a046462aaaec6f4dc2c96396834699081acb98e0
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project ELPA.
The branch, master has been updated
via a046462aaaec6f4dc2c96396834699081acb98e0 (commit)
from b0b9bc8f3e653be406b06ed6298b65629a9ef42c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit a046462aaaec6f4dc2c96396834699081acb98e0
Author: Stefan Monnier monn...@iro.umontreal.ca
Date: Tue Dec 24 10:15:12 2013 -0500
Update copyright exceptions.
diff --git a/copyright_exceptions b/copyright_exceptions
index 450facd..ad366be 100644
--- a/copyright_exceptions
+++ b/copyright_exceptions
@@ -1,3 +1,17 @@
+./ada-mode/ada-skel.el:(copyright_license
+./ada-mode/ada-skel.el: -- Copyright (C) (format-time-string %Y )
user-full-name All Rights Reserved.\n
+./ada-mode/ada-skel.el: -- Copyright (C) (format-time-string %Y )
user-full-name All Rights Reserved.\n
+./ada-mode/ada-skel.el: Example copyright/license skeleton, with automatic
year and owner, GPLv3.
+./ada-mode/ada-skel.el: Example copyright/license skeleton, with automatic
year and owner.
+./ada-mode/ada-skel.el: Insert a file header comment, with automatic
copyright year and prompt for copyright owner/license.
+./ada-mode/ada-skel.el: {copyright_license}\n
+./ada-mode/gpr-skel.el:(copyright_license
+./ada-mode/gpr-skel.el: -- Copyright (C) (format-time-string %Y )
user-full-name All Rights Reserved.\n
+./ada-mode/gpr-skel.el: -- Copyright (C) (format-time-string %Y )
user-full-name All Rights Reserved.\n
+./ada-mode/gpr-skel.el: Example copyright/license skeleton, with automatic
year and owner, GPLv3.
+./ada-mode/gpr-skel.el: Example copyright/license skeleton, with automatic
year and owner.
+./ada-mode/gpr-skel.el: Insert a file header comment, with automatic
copyright year and prompt for copyright owner/license.
+./ada-mode/gpr-skel.el: {copyright_license}\n
./auctex/latex.el: pounds copyright
./auctex/multi-prompt.el
./auctex/plain-tex.el: copyright
---
Summary of changes:
copyright_exceptions | 14 ++
1 files changed, 14 insertions(+), 0 deletions(-)
hooks/post-receive
--
ELPA
[ELPA-diffs] ELPA branch, master, updated. e8744b6525b891a2da8f71a2e98db092a65541fb
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project ELPA. The branch, master has been updated via e8744b6525b891a2da8f71a2e98db092a65541fb (commit) from a046462aaaec6f4dc2c96396834699081acb98e0 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit e8744b6525b891a2da8f71a2e98db092a65541fb Author: Stefan Monnier monn...@iro.umontreal.ca Date: Thu Dec 26 12:57:48 2013 -0500 * wisi: Fix up dependency and sectioning style. diff --git a/packages/wisi/wisi-parse.el b/packages/wisi/wisi-parse.el index e2b3d86..b62b3d6 100755 --- a/packages/wisi/wisi-parse.el +++ b/packages/wisi/wisi-parse.el @@ -27,7 +27,7 @@ ;;; Code: (require 'semantic/wisent) -(eval-when-compile (require 'cl-macs)) +(eval-when-compile (require 'cl-lib)) (cl-defstruct (wisi-parser-state (:copier nil)) diff --git a/packages/wisi/wisi.el b/packages/wisi/wisi.el index e12ce8f..546d718 100755 --- a/packages/wisi/wisi.el +++ b/packages/wisi/wisi.el @@ -4,7 +4,8 @@ ;; ;; Author: Stephen Leake stephen_le...@member.fsf.org ;; Version: 1.0 -;; url: http://stephe-leake.org/emacs/ada-mode/emacs-ada-mode.html +;; URL: http://stephe-leake.org/emacs/ada-mode/emacs-ada-mode.html +;; Package-Requires: ((cl-lib 0)) ;; ;; This file is part of GNU Emacs. ;; @@ -21,9 +22,12 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs. If not, see http://www.gnu.org/licenses/. ;; -;;; History: first experimental version Oct 2012 + +;;; Commentary: + + History: first experimental version Oct 2012 ;; -;;; indentation algorithm overview + indentation algorithm overview ;; ;; This design is inspired in part by experience writing a SMIE ;; indentation engine for Ada, and the wisent parser. @@ -43,71 +47,71 @@ ;; ;; An indentation engine moves text in the buffer, as does user ;; editing, so we can't rely on character positions remaining -;; constant. So the parser actions use markers to store -;; positions. Text properties also move with the text. +;; constant. So the parser actions use markers to store +;; positions. Text properties also move with the text. ;; ;; The stored information includes a marker at each statement indent -;; point. Thus, the indentation algorithm is: find the previous token +;; point. Thus, the indentation algorithm is: find the previous token ;; with cached information, and either indent from it, or fetch from ;; it the marker for a previous statement indent point, and indent ;; relative to that. ;; ;; Since we have a cache (the text properties), we need to consider -;; when to invalidate it. Ideally, we invalidate only when a change to +;; when to invalidate it. Ideally, we invalidate only when a change to ;; the buffer would change the result of a parse that crosses that -;; change, or starts after that change. Changes in whitespace -;; (indentation and newlines) do not affect an Ada parse. Other +;; change, or starts after that change. Changes in whitespace +;; (indentation and newlines) do not affect an Ada parse. Other ;; languages are sensitive to newlines (Bash for example) or -;; indentation (Python). Adding comments does not change a parse, -;; unless code is commented out. For now we invalidate the cache after +;; indentation (Python). Adding comments does not change a parse, +;; unless code is commented out. For now we invalidate the cache after ;; the edit point if the change involves anything other than ;; whitespace. ;; -;;; comparison to the SMIE parser + comparison to the SMIE parser ;; ;; The central problem to be solved in building the SMIE parser is ;; grammar precedence conflicts; the general solution is refining ;; keywords so that each new keyword can be assigned a unique -;; precedence. This means ad hoc code must be written to determine the +;; precedence. This means ad hoc code must be written to determine the ;; correct refinement for each language keyword from the surrounding -;; tokens. In effect, for a complex language like Ada, the knowledge +;; tokens. In effect, for a complex language like Ada, the knowledge ;; of the language grammar is mostly embedded in the refinement code; -;; only a small amount is in the refined grammar. Implementing a SMIE +;; only a small amount is in the refined grammar. Implementing a SMIE ;; parser for a new language involves the same amount of work as the ;; first language. ;; ;; Using a generalized LALR parser avoids that particular problem; ;; assuming the language is already defined by a grammar, it is only a ;; matter of a format change to teach the wisi parser the -;; language. The problem in a wisi indentation engine is caching the +;; language
[ELPA-diffs] ELPA branch, master, updated. f3e9c1684ac53e54db3ed62fae0aebbfd233c45d
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project ELPA. The branch, master has been updated via f3e9c1684ac53e54db3ed62fae0aebbfd233c45d (commit) via b55179e99585524eb420fd374b4750c30904e932 (commit) from 2999b4259708f8d1ac857020f3fae39a670f9bcf (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit f3e9c1684ac53e54db3ed62fae0aebbfd233c45d Merge: b55179e 2999b42 Author: Stefan Monnier monn...@iro.umontreal.ca Date: Fri Dec 27 10:32:34 2013 -0500 Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa commit b55179e99585524eb420fd374b4750c30904e932 Author: Stefan Monnier monn...@iro.umontreal.ca Date: Fri Dec 27 10:31:50 2013 -0500 * sml-mode.el (sml-smie-rules): Adjust for new :close-all rule. diff --git a/packages/sml-mode/sml-mode.el b/packages/sml-mode/sml-mode.el index aee66ba..1c06f16 100644 --- a/packages/sml-mode/sml-mode.el +++ b/packages/sml-mode/sml-mode.el @@ -494,6 +494,7 @@ Regexp match data 0 points to the chars. (basic sml-indent-level) (args sml-indent-args))) (:list-intro (member token '(fn))) +(:close-all t) (:after (cond ((equal token struct) 0) --- Summary of changes: packages/sml-mode/sml-mode.el |1 + 1 files changed, 1 insertions(+), 0 deletions(-) hooks/post-receive -- ELPA
[ELPA-diffs] ELPA branch, master, updated. 48088af58a6e250175242cb1dd81481eec2c19e9
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project ELPA. The branch, master has been updated via 48088af58a6e250175242cb1dd81481eec2c19e9 (commit) from f3e9c1684ac53e54db3ed62fae0aebbfd233c45d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 48088af58a6e250175242cb1dd81481eec2c19e9 Author: Stefan Monnier monn...@iro.umontreal.ca Date: Fri Dec 27 16:31:45 2013 -0500 * wisi: Fix warnings and a few 80-columns overruns diff --git a/packages/wisi/wisi-parse.el b/packages/wisi/wisi-parse.el index b62b3d6..4497b39 100755 --- a/packages/wisi/wisi-parse.el +++ b/packages/wisi/wisi-parse.el @@ -75,6 +75,8 @@ If a file needs more than this, it's probably an indication that the grammar is excessively redundant.) +(defvar wisi-debug) + (defun wisi-parse (automaton lexer) Parse input using the automaton specified in AUTOMATON. @@ -121,14 +123,17 @@ the grammar is excessively redundant.) (let ((j (wisi-free-parser parser-states))) (cond ((= j -1) - ;; add to parser-states; the new parser won't be executed again in this parser-index loop + ;; Add to parser-states; the new parser won't be executed + ;; again in this parser-index loop. (setq parser-states (vconcat parser-states (vector nil))) (setq j (1- (length parser-states (( j parser-index) - ;; the new parser won't be executed again in this parser-index loop; nothing to do + ;; The new parser won't be executed again in this + ;; parser-index loop; nothing to do. ) (t - ;; don't let the new parser execute again in this parser-index loop + ;; Don't let the new parser execute again in this + ;; parser-index loop. (setq some-pending t) (setf (wisi-parser-state-active result) (cl-case (wisi-parser-state-active result) @@ -139,17 +144,20 @@ the grammar is excessively redundant.) (setq active-parser-count (1+ active-parser-count)) (setf (wisi-parser-state-label result) j) (aset parser-states j result)) - (when ( wisi-debug 1) (message spawn parser (%d active) active-parser-count))) + (when ( wisi-debug 1) +(message spawn parser (%d active) active-parser-count))) (when (eq 'error (wisi-parser-state-active parser-state)) (setq active-parser-count (1- active-parser-count)) - (when ( wisi-debug 1) (message terminate parser (%d active) active-parser-count)) + (when ( wisi-debug 1) +(message terminate parser (%d active) active-parser-count)) (cl-case active-parser-count (0 (cond ((= active-parser-count-prev 1) - ;; we were not in a parallel parse; report the error - (let ((state (aref (wisi-parser-state-stack parser-state) (wisi-parser-state-sp parser-state + ;; We were not in a parallel parse; report the error. + (let ((state (aref (wisi-parser-state-stack parser-state) + (wisi-parser-state-sp parser-state (signal 'wisi-parse-error (wisi-error-msg syntax error in grammar state %d; unexpected %s, expecting one of %s state @@ -157,9 +165,9 @@ the grammar is excessively redundant.) (mapcar 'car (aref actions state )) (t - ;; report errors from all parsers that failed on this token + ;; Report errors from all parsers that failed on this token. (let ((msg)) -(dotimes (index (length parser-states)) +(dotimes (_ (length parser-states)) (let* ((parser-state (aref parser-states parser-index)) (state (aref (wisi-parser-state-stack parser-state) (wisi-parser-state-sp parser-state @@ -177,22 +185,22 @@ the grammar is excessively redundant.) )) (1 -(setf (wisi-parser-state-active parser-state) nil); don't save error for later +(setf (wisi-parser-state-active parser-state) nil); Don't save error for later. (wisi-execute-pending (wisi
[ELPA-diffs] [elpa] branch master updated (064a6b7 - 2a94d55)
This is an automated email from the git hooks/post-receive script. monnier pushed a change to branch master in repository elpa. from 064a6b7 bump version number to see if it gets published new 2a94d55 Add new copyright exception. The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: copyright_exceptions |1 + 1 files changed, 1 insertions(+), 0 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.
[ELPA-diffs] [elpa] 01/01: Add new copyright exception.
This is an automated email from the git hooks/post-receive script.
monnier pushed a commit to branch master
in repository elpa.
commit 2a94d555f68e295ea2f32f1c4d7b9f57a56ecffc
Author: Stefan Monnier monn...@iro.umontreal.ca
Date: Wed Jan 15 10:19:34 2014 -0500
Add new copyright exception.
---
copyright_exceptions |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/copyright_exceptions b/copyright_exceptions
index ad366be..c41d0ea 100644
--- a/copyright_exceptions
+++ b/copyright_exceptions
@@ -12,6 +12,7 @@
./ada-mode/gpr-skel.el: Example copyright/license skeleton, with automatic
year and owner.
./ada-mode/gpr-skel.el: Insert a file header comment, with automatic
copyright year and prompt for copyright owner/license.
./ada-mode/gpr-skel.el: {copyright_license}\n
+./ascii-art-to-unicode/ascii-art-to-unicode.el:;; - change copyright to FSF
./auctex/latex.el: pounds copyright
./auctex/multi-prompt.el
./auctex/plain-tex.el: copyright
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
[ELPA-diffs] [elpa] 01/01: * csv-mode (csv-mode-line-help-echo): Remove.
This is an automated email from the git hooks/post-receive script. monnier pushed a commit to branch master in repository elpa. commit c5748a299d000b136f04eaebea3bb1c5eaa75bee Author: Stefan Monnier monn...@iro.umontreal.ca Date: Wed Jan 15 10:21:44 2014 -0500 * csv-mode (csv-mode-line-help-echo): Remove. --- packages/csv-mode/csv-mode.el | 10 ++ 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/packages/csv-mode/csv-mode.el b/packages/csv-mode/csv-mode.el index dbc6182..a8ae4e4 100644 --- a/packages/csv-mode/csv-mode.el +++ b/packages/csv-mode/csv-mode.el @@ -1,6 +1,6 @@ ;;; csv-mode.el --- Major mode for editing comma/char separated values -*- lexical-binding: t -*- -;; Copyright (C) 2003, 2004, 2012, 2013 Free Software Foundation, Inc +;; Copyright (C) 2003, 2004, 2012, 2013, 2014 Free Software Foundation, Inc ;; Author: Francis J. Wright F.J.Wright at qmul.ac.uk ;; Time-stamp: 23 August 2004 @@ -247,10 +247,6 @@ Number of spaces used by `csv-align-fields' after separators. ;;; Mode definition, key bindings and menu ;; -(defconst csv-mode-line-help-echo - ;; See bindings.el for details of `mode-line-format' construction. - (get-text-property 0 'help-echo (car (default-value 'mode-line-format))) - Primary default mode line help echo text.) (defconst csv-mode-line-format ;; See bindings.el for details of `mode-line-format' construction. @@ -260,7 +256,6 @@ Number of spaces used by `csv-align-fields' after separators. (setcdr x (cons `(csv-field-index-string ( csv-field-index-string -;; ,(propertize -- 'help-echo csv-mode-line-help-echo) )) (cdr x ml) @@ -803,8 +798,7 @@ Called by `csv-field-index-idle-timer'. (when (not (eq field csv-field-index-old)) (setq csv-field-index-old field csv-field-index-string - (and field (propertize (format F%d field) -'help-echo csv-mode-line-help-echo))) + (and field (format F%d field))) (force-mode-line-update)) ;; -- To stop receiving notification emails like this one, please contact the administrator of this repository.
[ELPA-diffs] [elpa] branch master updated (2a94d55 - c5748a2)
This is an automated email from the git hooks/post-receive script. monnier pushed a change to branch master in repository elpa. from 2a94d55 Add new copyright exception. new c5748a2 * csv-mode (csv-mode-line-help-echo): Remove. The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: packages/csv-mode/csv-mode.el | 10 ++ 1 files changed, 2 insertions(+), 8 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.
[ELPA-diffs] [elpa] branch master updated (dcabbd2 - 5e13b04)
monnier pushed a change to branch master in repository elpa. from dcabbd2 Merge commit '2badcc6227a88e1aba288f442af5f4e1ce55d366' from company new 5e13b04 * company-capf.el (company--capf-data): Don't get confused by lambda exps. The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: packages/company/company-capf.el |2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
[ELPA-diffs] [elpa] 01/01: * company-capf.el (company--capf-data): Don't get confused by lambda exps.
monnier pushed a commit to branch master in repository elpa. commit 5e13b0468593bcb6bc6fecf0908300254b1508a1 Author: Stefan Monnier monn...@iro.umontreal.ca Date: Fri Jan 24 13:24:09 2014 -0500 * company-capf.el (company--capf-data): Don't get confused by lambda exps. --- packages/company/company-capf.el |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/packages/company/company-capf.el b/packages/company/company-capf.el index 018c6b7..07d792c 100644 --- a/packages/company/company-capf.el +++ b/packages/company/company-capf.el @@ -34,7 +34,7 @@ (data (run-hook-wrapped 'completion-at-point-functions ;; Ignore misbehaving functions. #'completion--capf-wrapper 'optimist))) -(when (consp data) data))) +(when (and (consp data) (numberp (car data))) data))) (defun company-capf (command optional arg rest _args) `company-mode' back-end using `completion-at-point-functions'.
[ELPA-diffs] [elpa] branch master updated (5e13b04 - efce8d3)
monnier pushed a change to branch master in repository elpa. from 5e13b04 * company-capf.el (company--capf-data): Don't get confused by lambda exps. new efce8d3 * packages/sokoban/sokoban.el: Fix version. * packages/sokoban/sokoban-pkg.el: Remove. The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: packages/README | 11 --- packages/sokoban/sokoban-pkg.el |1 - packages/sokoban/sokoban.el |4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) delete mode 100644 packages/sokoban/sokoban-pkg.el
[ELPA-diffs] [elpa] 01/01: * packages/sokoban/sokoban.el: Fix version. * packages/sokoban/sokoban-pkg.el: Remove.
monnier pushed a commit to branch master in repository elpa. commit efce8d39c4b05dd01c5884bd1dad6f1b96ab35c9 Author: Stefan Monnier monn...@iro.umontreal.ca Date: Fri Jan 24 16:09:47 2014 -0500 * packages/sokoban/sokoban.el: Fix version. * packages/sokoban/sokoban-pkg.el: Remove. --- packages/README | 11 --- packages/sokoban/sokoban-pkg.el |1 - packages/sokoban/sokoban.el |4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/packages/README b/packages/README index 5b1c430..d0b2d3e 100644 --- a/packages/README +++ b/packages/README @@ -23,9 +23,14 @@ and the web-pages from this source code: of the package, if it's maintained externally. - A News: section (or NEWS file) can/should be used to list the user-visible changes of each version. -- The Package-Type: simple header can be used to force the creation - of a single-file package even when there are several Elisp files in - the source (the other files will simply be ignored). +- The Package-Type: header can be used to force the type of package + created (can be either `simple' for single-file packages or `multi' for + tarballs). By default the type is decided based on whether there are + several Elisp files in the source (the other files will simply be + ignored). +- If you want some files to not be included in the tarball, you can + put a `.elpaignore' file in the root of your package directory, where you + can list patterns of files to ignore (this file is passed to tar's -X). * External branches diff --git a/packages/sokoban/sokoban-pkg.el b/packages/sokoban/sokoban-pkg.el deleted file mode 100644 index 195179c..000 --- a/packages/sokoban/sokoban-pkg.el +++ /dev/null @@ -1 +0,0 @@ -(define-package sokoban 1.0.4 Sokoban game for emacs) diff --git a/packages/sokoban/sokoban.el b/packages/sokoban/sokoban.el index 73d00ba..6e8bee2 100644 --- a/packages/sokoban/sokoban.el +++ b/packages/sokoban/sokoban.el @@ -2,8 +2,8 @@ ;; Copyright (C) 1998, 2013 Free Software Foundation, Inc. -;; Author: Glynn Clements glynn.cleme...@virgin.net -;; Version: 1.04 +;; Author: Glynn Clements glynn.cleme...@xemacs.org +;; Version: 1.4 ;; Created: 1997-09-11 ;; Keywords: games ;; Package-Type: multi
[ELPA-diffs] [elpa] 01/01: * cl-lib.el: Resolve conflicts with old internal definitions (bug#16353). (dolist fun): Don't skip definitions silently. (define-setf-expander): Remove, not in cl-lib. (cl-p
monnier pushed a commit to branch master in repository elpa. commit 324e25e09600bb57e1b59e15461911443b5f Author: Stefan Monnier monn...@iro.umontreal.ca Date: Sat Jan 25 00:18:33 2014 -0500 * cl-lib.el: Resolve conflicts with old internal definitions (bug#16353). (dolist fun): Don't skip definitions silently. (define-setf-expander): Remove, not in cl-lib. (cl-position, cl-delete-duplicates): Add advice to distinguish the use case. (cl-member): Override old definition. --- packages/cl-lib/cl-lib.el | 55 ++-- 1 files changed, 47 insertions(+), 8 deletions(-) diff --git a/packages/cl-lib/cl-lib.el b/packages/cl-lib/cl-lib.el index 0720afe..1ea22e0 100644 --- a/packages/cl-lib/cl-lib.el +++ b/packages/cl-lib/cl-lib.el @@ -1,10 +1,10 @@ ;;; cl-lib.el --- Properly prefixed CL functions and macros -*- coding: utf-8 -*- -;; Copyright (C) 2012, 2013 Free Software Foundation, Inc. +;; Copyright (C) 2012, 2013, 2014 Free Software Foundation, Inc. ;; Author: Stefan Monnier monn...@iro.umontreal.ca ;; vcomment: Emacs-24.3's version is 1.0 so this has to stay below. -;; Version: 0.3 +;; Version: 0.4 ;; 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 @@ -93,6 +93,17 @@ (let ((new (intern (format cl-%s var (unless (boundp new) (defvaralias new var +;; The following cl-lib functions were already defined in the old cl.el, +;; with a different meaning: +;; - cl-position and cl-delete-duplicates +;; the two meanings are clearly different, but we can distinguish which was +;; meant by looking at the arguments. +;; - cl-member +;; the old meaning hasn't been used for a long time and is a subset of the +;; new, so we can simply override it. +;; - cl-adjoin +;; the old meaning is actually the same as the new except for optimizations. + (dolist (fun '( (get* . cl-get) (random* . cl-random) @@ -104,7 +115,7 @@ (floor* . cl-floor) (rassoc* . cl-rassoc) (assoc* . cl-assoc) - (member* . cl-member) + ;; (member* . cl-member) ;Handle specially below. (delete* . cl-delete) (remove* . cl-remove) (defsubst* . cl-defsubst) @@ -171,7 +182,7 @@ count position-if-not position-if - position + ;; position ;Handle specially via defadvice below. find-if-not find-if find @@ -181,7 +192,7 @@ substitute-if-not substitute-if substitute - delete-duplicates + ;; delete-duplicates ;Handle specially via defadvice below. remove-duplicates delete-if-not delete-if @@ -205,7 +216,6 @@ shiftf remf psetf - (define-setf-method . define-setf-expander) declare the locally @@ -237,7 +247,7 @@ pairlis acons subst - adjoin + ;; adjoin ;It's already defined. copy-list ldiff list* @@ -301,7 +311,36 @@ )) (let ((new (if (consp fun) (prog1 (cdr fun) (setq fun (car fun))) (intern (format cl-%s fun) -(unless (fboundp new) (defalias new fun +(if (fboundp new) +(unless (or (eq (symbol-function new) fun) +(eq new (and (symbolp fun) (fboundp fun) + (symbol-function fun + (message %S already defined, not rebinding new)) + (defalias new fun + +(autoload 'cl-position cl-seq) +(defadvice cl-position (around cl-lib (cl-item cl-seq rest cl-keys) activate) + (let ((argk (ad-get-args 2))) +(if (or (null argk) (keywordp (car argk))) +;; This is a call to cl-lib's `cl-position'. +(setq ad-return-value + (apply #'position (ad-get-arg 0) (ad-get-arg 1) argk)) + ;; Must be a call to cl's old `cl-position'. + ad-do-it))) + +(autoload 'cl-delete-duplicates cl-seq) +(defadvice cl-delete-duplicates (around cl-lib (cl-seq rest cl-keys) activate) + (let ((argk (ad-get-args 1))) +(if (or (null argk) (keywordp (car argk))) +;; This is a call to cl-lib's `cl-delete-duplicates'. +(setq ad-return-value + (apply #'delete-duplicates (ad-get-arg 0) argk)) + ;; Must be a call to cl's old `cl-delete-duplicates'. + ad-do-it))) + +(when (or (not (fboundp 'cl-member)) + (eq (symbol-function 'cl-member) #'memq)) + (defalias 'cl-member #'member*)) ;; `cl-labels' is not 100% compatible with `labels' when using dynamic scoping ;; (mostly because
[ELPA-diffs] [elpa] branch master updated (efce8d3 - 324e000)
monnier pushed a change to branch master in repository elpa. from efce8d3 * packages/sokoban/sokoban.el: Fix version. * packages/sokoban/sokoban-pkg.el: Remove. new 324e000 * cl-lib.el: Resolve conflicts with old internal definitions (bug#16353). (dolist fun): Don't skip definitions silently. (define-setf-expander): Remove, not in cl-lib. (cl-position, cl-delete-duplicates): Add advice to distinguish the use case. (cl-member): Override old definition. The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: packages/cl-lib/cl-lib.el | 55 ++-- 1 files changed, 47 insertions(+), 8 deletions(-)
[ELPA-diffs] [elpa] 01/02: * lmc.el (lmc-asm-indentation): Indent to tab-width by default. (lmc-step): Fix prompt for IN.
monnier pushed a commit to branch master in repository elpa. commit 0bae71283de2e9ad161fa786ad011ece50e99c40 Author: Stefan Monnier monn...@iro.umontreal.ca Date: Tue Jan 28 07:45:52 2014 -0500 * lmc.el (lmc-asm-indentation): Indent to tab-width by default. (lmc-step): Fix prompt for IN. --- packages/lmc/lmc.el |9 + 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/lmc/lmc.el b/packages/lmc/lmc.el index 6eae564..482e14a 100644 --- a/packages/lmc/lmc.el +++ b/packages/lmc/lmc.el @@ -1,9 +1,9 @@ ;;; lmc.el --- Little Man Computer in Elisp -;; Copyright (C) 2011, 2013 Free Software Foundation, Inc. +;; Copyright (C) 2011, 2013, 2014 Free Software Foundation, Inc. ;; Author: Stefan Monnier monn...@iro.umontreal.ca -;; Version: 1.2 +;; Version: 1.3 ;; 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 @@ -576,7 +576,7 @@ Also, when nil, evaluation is interrupted when the user hits a key.) (setq lmc--stopped (lmc--state)) (force-mode-line-update) (message Done.))) - (IN (setq lmc-acc (mod (read-number Enter a number) 1000)) + (IN (setq lmc-acc (mod (read-number Enter a number: ) 1000)) (incf lmc-pc)) (OUT (message Output: %03d lmc-acc) (push (format %03d lmc-acc) lmc-output) @@ -711,7 +711,8 @@ The machine will also stop if the user presses a key. (cond (( (nth 0 (syntax-ppss)) 0) nil) ((looking-at () tab-width) - ((not (looking-at comment-start-skip)) 0) + ((not (looking-at comment-start-skip)) + (if (looking-at [ \t]*$) tab-width 0)) ((not (looking-at \\s\\s)) nil) ((save-excursion (forward-comment (- (point))) (bobp)) 0) (t (forward-comment (point-max)) (lmc-asm-indentation)
[ELPA-diffs] [elpa] 01/02: * packages/uni-confusables/uni-confusables.el: Add ELPA metadata. * packages/uni-confusables/uni-confusables-pkg.el: Delete. * packages/uni-confusables/gen-confusables.el: U
monnier pushed a commit to branch master in repository elpa. commit fe973b18ee7d6ca5c005408b85a684a6c51de800 Author: Stefan Monnier monn...@iro.umontreal.ca Date: Wed Jan 29 21:31:50 2014 -0500 * packages/uni-confusables/uni-confusables.el: Add ELPA metadata. * packages/uni-confusables/uni-confusables-pkg.el: Delete. * packages/uni-confusables/gen-confusables.el: Use cl-lib. (gen-confusables-write): Generate a file header that better complies with the coding conventions (and includes the ELPA metadata). --- packages/uni-confusables/gen-confusables.el | 31 ++- packages/uni-confusables/uni-confusables-pkg.el |1 - packages/uni-confusables/uni-confusables.el |8 +- 3 files changed, 26 insertions(+), 14 deletions(-) diff --git a/packages/uni-confusables/gen-confusables.el b/packages/uni-confusables/gen-confusables.el index b3c2f02..3e17c5e 100644 --- a/packages/uni-confusables/gen-confusables.el +++ b/packages/uni-confusables/gen-confusables.el @@ -1,6 +1,6 @@ ;;; gen-confusables.el --- generate uni-confusables.el from confusables.txt -;; Copyright (C) 2011, 2012 Free Software Foundation, Inc. +;; Copyright (C) 2011, 2012, 2014 Free Software Foundation, Inc. ;; Author: Teodor Zlatanov t...@lifelogs.com @@ -21,14 +21,14 @@ ;;; Code: -(require 'cl) +(require 'cl-lib) (defvar gen-confusables-char-table-single) (defvar gen-confusables-char-table-multiple) (defun gen-confusables-read (file) (interactive fConfusables filename: \n) - (flet ((reader (h) (string-to-number h 16))) + (cl-flet ((reader (h) (string-to-number h 16))) (let ((stable (make-char-table 'confusables-single-script)) (mtable (make-char-table 'confusables-multiple-script)) (count 0) @@ -44,8 +44,8 @@ (insert-file-contents file) (goto-char (point-min)) (while (re-search-forward confusable-line-regexp nil t) - (incf count) - (when (and (called-interactively-p) + (cl-incf count) + (when (and (called-interactively-p 'interactive) (zerop (mod count 100))) (message processed %d lines count)) (let* ((from (match-string 1)) @@ -61,16 +61,21 @@ (interactive FDumped filename: \n) (let ((coding-system-for-write 'utf-8-emacs)) (with-temp-file file - (insert ;; Copyright (C) 1991-2009, 2010 Unicode, Inc. + (insert ;;; uni-confusables.el --- Unicode confusables table +;; Copyright (C) 1991-2009, 2010 Unicode, Inc. ;; This file was generated from the Unicode confusables list at ;; http://www.unicode.org/Public/security/revision-04/confusables.txt. ;; See lisp/international/README in the Emacs trunk -;; for the copyright and permission notice.\n\n) +;; for the copyright and permission notice. + +;; Version: 0.1 +;; Maintainer: Teodor Zlatanov t...@lifelogs.com + +;;; Code:\n\n) (dolist (type '(single multiple)) (let* ((tablesym (intern (format uni-confusables-char-table-%s type))) (oursym (intern (format gen-confusables-char-table-%s type))) (ourtable (symbol-value oursym)) - (ourtablename (symbol-name oursym)) (tablename (symbol-name tablesym)) (prop (format confusables-%s-script type)) props) @@ -98,11 +103,13 @@ (nth (* 2 offset) props) (nth (1+ (* 2 offset)) props (insert )\n\n))) + ;; Use \s escapes in the string, so that this text isn't mis-recognized + ;; as applying to this file, but only to the generated file. (insert -;; Local Variables: -;; coding: utf-8 -;; no-byte-compile: t -;; End: +;;\sLocal\sVariables: +;;\scoding: utf-8 +;;\sno-byte-compile: t +;;\sEnd: ;; uni-confusables.el ends here diff --git a/packages/uni-confusables/uni-confusables-pkg.el b/packages/uni-confusables/uni-confusables-pkg.el deleted file mode 100644 index 53a0295..000 --- a/packages/uni-confusables/uni-confusables-pkg.el +++ /dev/null @@ -1 +0,0 @@ -(define-package uni-confusables 0.1 Unicode confusables table) diff --git a/packages/uni-confusables/uni-confusables.el b/packages/uni-confusables/uni-confusables.el index b324f46..4224bd9 100644 --- a/packages/uni-confusables/uni-confusables.el +++ b/packages/uni-confusables/uni-confusables.el @@ -1,9 +1,15 @@ +;;; uni-confusables.el --- Unicode confusables table ;; Copyright (C) 1991-2009, 2010 Unicode, Inc. ;; This file was generated from the Unicode confusables list at ;; http://www.unicode.org/Public/security/revision-04/confusables.txt. ;; See lisp/international/README in the Emacs trunk ;; for the copyright and permission notice. +;; Version: 0.1 +;; Maintainer: Teodor Zlatanov t...@lifelogs.com + +;;; Code: + (defvar uni-confusables-char-table-single (make-char-table 'confusables-single-script)) (let ((k nil) (v nil) (ranges '(195101 ꘀ 195100 鼻
[ELPA-diffs] [elpa] branch master updated (f29c5e2 - 5874753)
monnier pushed a change to branch master in repository elpa. from f29c5e2 [maint] Describe a way to do public incubation. new fe973b1 * packages/uni-confusables/uni-confusables.el: Add ELPA metadata. * packages/uni-confusables/uni-confusables-pkg.el: Delete. * packages/uni-confusables/gen-confusables.el: Use cl-lib. (gen-confusables-write): Generate a file header that better complies with the coding conventions (and includes the ELPA metadata). new 5874753 Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa The 2 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: packages/uni-confusables/gen-confusables.el | 31 ++- packages/uni-confusables/uni-confusables-pkg.el |1 - packages/uni-confusables/uni-confusables.el |8 +- 3 files changed, 26 insertions(+), 14 deletions(-) delete mode 100644 packages/uni-confusables/uni-confusables-pkg.el
[ELPA-diffs] [elpa] 01/01: Move metadata to autex.el; Remove auctex-pkg.el
monnier pushed a commit to branch externals/auctex in repository elpa. commit a7dc84bfd2aeb422c2cd077cb8ab70d0fc041fb1 Author: Stefan Monnier monn...@iro.umontreal.ca Date: Wed Jan 29 22:22:18 2014 -0500 Move metadata to autex.el; Remove auctex-pkg.el --- .gitignore|2 +- auctex-pkg.el |1 - auctex.el | 17 + 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 657cfce..4c51832 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,7 @@ INSTALL.windows Makefile #README TODO -auctex.el +auctex-pkg.el auto-loads.el autom4te.* config.* diff --git a/auctex-pkg.el b/auctex-pkg.el deleted file mode 100644 index ffec66c..000 --- a/auctex-pkg.el +++ /dev/null @@ -1 +0,0 @@ -(define-package auctex 11.87.2 Integrated environment for *TeX* nil :url http://www.gnu.org/software/auctex/;) diff --git a/auctex.el b/auctex.el new file mode 100644 index 000..1a06fd8 --- /dev/null +++ b/auctex.el @@ -0,0 +1,17 @@ +;;; auctex.el --- Integrated environment for *TeX* + +;; Version: 11.87.2 +;; URL: http://www.gnu.org/software/auctex/ + +;;; Commentary: + +;; This can be used for starting up AUCTeX. The following somewhat +;; strange trick causes tex-site.el to be loaded in a way that can be +;; safely undone using (unload-feature 'tex-site). + +;;; Code: + +(autoload 'TeX-load-hack + (expand-file-name tex-site.el +(file-name-directory load-file-name))) +(TeX-load-hack)
[ELPA-diffs] [elpa] branch externals/auctex updated (f0590b2 - a7dc84b)
monnier pushed a change to branch externals/auctex in repository elpa. from f0590b2 Regenerate dir in English. new a7dc84b Move metadata to autex.el; Remove auctex-pkg.el The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: .gitignore|2 +- auctex-pkg.el |1 - auctex.el | 17 + 3 files changed, 18 insertions(+), 2 deletions(-) delete mode 100644 auctex-pkg.el create mode 100644 auctex.el
[ELPA-diffs] [elpa] branch externals/auctex updated (a7dc84b - e84716e)
monnier pushed a change to branch externals/auctex in repository elpa. from a7dc84b Move metadata to autex.el; Remove auctex-pkg.el new e84716e * auctex.el: Add copyright notice. The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: auctex.el | 17 + 1 files changed, 17 insertions(+), 0 deletions(-)
[ELPA-diffs] [elpa] branch master updated (5874753 - d108f06)
monnier pushed a change to branch master in repository elpa. from 5874753 Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa new d108f06 Merge the two README. Update copyright_exceptions. The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: README | 117 +++-- copyright_exceptions |4 +- packages/README | 61 -- 3 files changed, 95 insertions(+), 87 deletions(-) delete mode 100644 packages/README
[elpa] 01/01: Fixes: debbugs:16671
monnier pushed a commit to branch master in repository elpa. commit 70b8c353e387b08cc05ca22314f90f4c6eed Author: Stefan Monnier monn...@iro.umontreal.ca Date: Tue Feb 25 09:18:51 2014 -0500 Fixes: debbugs:16671 * cl-lib.el (cl-position, cl-delete-duplicate): Don't advise if =24.3. (load-path): Try to make sure we're at the end. --- packages/cl-lib/cl-lib.el | 25 ++--- 1 files changed, 18 insertions(+), 7 deletions(-) diff --git a/packages/cl-lib/cl-lib.el b/packages/cl-lib/cl-lib.el index 1ea22e0..cf13c56 100644 --- a/packages/cl-lib/cl-lib.el +++ b/packages/cl-lib/cl-lib.el @@ -4,7 +4,7 @@ ;; Author: Stefan Monnier monn...@iro.umontreal.ca ;; vcomment: Emacs-24.3's version is 1.0 so this has to stay below. -;; Version: 0.4 +;; Version: 0.5 ;; 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 @@ -36,6 +36,15 @@ ;;; Code: +;; We need to handle the situation where this package is used with an Emacs +;; that comes with a real cl-lib (i.e. ≥24.3). + +;; First line of defense: try to make sure the built-in cl-lib comes earlier in +;; load-path so we never get loaded: +;;;###autoload (let ((d (file-name-directory #$))) +;;;###autoload (when (member d load-path) +;;;###autoload (setq load-path (append (remove d load-path) (list d) + (when (functionp 'macroexp--compiler-macro) ;; `macroexp--compiler-macro' was introduced as part of the big CL ;; reorganization which moved/reimplemented some of CL into core (mostly the @@ -318,25 +327,27 @@ (message %S already defined, not rebinding new)) (defalias new fun -(autoload 'cl-position cl-seq) -(defadvice cl-position (around cl-lib (cl-item cl-seq rest cl-keys) activate) +(unless (symbolp (symbol-function 'position)) + (autoload 'cl-position cl-seq) + (defadvice cl-position (around cl-lib (cl-item cl-seq rest cl-keys) activate) (let ((argk (ad-get-args 2))) (if (or (null argk) (keywordp (car argk))) ;; This is a call to cl-lib's `cl-position'. (setq ad-return-value (apply #'position (ad-get-arg 0) (ad-get-arg 1) argk)) ;; Must be a call to cl's old `cl-position'. - ad-do-it))) + ad-do-it -(autoload 'cl-delete-duplicates cl-seq) -(defadvice cl-delete-duplicates (around cl-lib (cl-seq rest cl-keys) activate) +(unless (symbolp (symbol-function 'delete-duplicates)) + (autoload 'cl-delete-duplicates cl-seq) + (defadvice cl-delete-duplicates (around cl-lib (cl-seq rest cl-keys) activate) (let ((argk (ad-get-args 1))) (if (or (null argk) (keywordp (car argk))) ;; This is a call to cl-lib's `cl-delete-duplicates'. (setq ad-return-value (apply #'delete-duplicates (ad-get-arg 0) argk)) ;; Must be a call to cl's old `cl-delete-duplicates'. - ad-do-it))) + ad-do-it (when (or (not (fboundp 'cl-member)) (eq (symbol-function 'cl-member) #'memq))
[elpa] branch master updated (ec2d5e8 - c979991)
monnier pushed a change to branch master in repository elpa. from ec2d5e8 [gnugo] Bind ‘M-u’ to ‘gnugo-undo-one-move’. new c979991 Fix up copyright headers. The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: packages/web-server/examples/000-hello-world.el|2 ++ .../web-server/examples/001-hello-world-utf8.el|2 ++ .../web-server/examples/002-hello-world-html.el|2 ++ packages/web-server/examples/003-file-server.el|2 ++ packages/web-server/examples/004-url-param-echo.el |2 ++ packages/web-server/examples/005-post-echo.el |2 ++ .../examples/006-basic-authentication.el |2 ++ .../examples/007-org-mode-file-server.el |2 ++ packages/web-server/examples/008-file-upload.el|2 ++ packages/web-server/examples/009-web-socket.el |1 + packages/web-server/examples/010-current-buffer.el |2 ++ packages/web-server/examples/011-org-agenda.el |2 ++ packages/web-server/examples/012-search-bbdb.el|2 ++ .../web-server/examples/013-org-export-service.el |2 ++ packages/web-server/examples/014-org-json.el |2 ++ .../web-server/examples/015-auto-mode-server.el|2 ++ .../examples/016-content-encoding-gzip.el |2 ++ .../examples/017-transfer-encoding-chunked.el |2 ++ packages/web-server/examples/018-web-shell.el | 15 ++- packages/web-server/web-server-status-codes.el | 15 +++ packages/web-server/web-server-test.el | 16 ++-- packages/web-server/web-server.el | 14 +- 22 files changed, 91 insertions(+), 4 deletions(-)
[elpa] branch master updated (a8ef5cd - 63049cd)
monnier pushed a change to branch master in repository elpa. from a8ef5cd [gnugo int] Invert gametree IR to hang by the leaves. new 1e5180b Subject: Fix up quoting of keywords. Remove leftover support for *-pkg.el. new 63049cd Merge git+ssh://git.sv.gnu.org/srv/git/emacs/elpa The 2 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: README|8 +++- admin/archive-contents.el | 94 + 2 files changed, 58 insertions(+), 44 deletions(-)
[elpa] 01/02: Subject: Fix up quoting of keywords. Remove leftover support for *-pkg.el.
monnier pushed a commit to branch master in repository elpa. commit 1e5180b18bc8bab208c5d5b7911c91c19678288a Author: Stefan Monnier monn...@iro.umontreal.ca Date: Mon Mar 24 15:31:17 2014 -0400 Subject: Fix up quoting of keywords. Remove leftover support for *-pkg.el. * admin/archive-contents.el (batch-make-archive, archive--refresh-pkg-file): Remove support for foo-pkg.el files. (archive-prepare-packages): Signal an error for missing .changelog-witness. (archive--alist-to-plist-args): Rename from archive--alist-to-plist, quote elements. (archive--plist-args-to-alist): Rename from archive--plist-to-alist, unquote elements. --- README|8 +++- admin/archive-contents.el | 94 + 2 files changed, 58 insertions(+), 44 deletions(-) diff --git a/README b/README index 9cf7ad7..33e40fc 100644 --- a/README +++ b/README @@ -101,8 +101,11 @@ with the command: If you want to develop a package publicly prior to its first release (to benefit from others' feedback, primarily), but not in an external repo, -you can push to an ephemeral branch -- subject to rebase and eventual -removal upon finishing merge -- for the duration of the incubation. +you have 2 choices: +- you can simply put Version: -1 to indicate that this should not be + released. +- or you can push to an ephemeral branch -- subject to rebase and eventual + removal upon finishing merge -- for the duration of the incubation. * DEPLOYMENT @@ -122,6 +125,7 @@ packages/ directory. You can then add that directory, e.g. with: git clone .../elpa mkdir build cd build + (cd ../elpa; git log --format=%H | tail -n 1) .changelog-witness ln -s ../elpa/admin ln -s ../elpa/GNUmakefile admin/update-archive.sh diff --git a/admin/archive-contents.el b/admin/archive-contents.el index e17883e..241f1ad 100644 --- a/admin/archive-contents.el +++ b/admin/archive-contents.el @@ -1,6 +1,6 @@ ;;; archive-contents.el --- Auto-generate an Emacs Lisp package archive. -*- lexical-binding:t -*- -;; Copyright (C) 2011, 2012, 2013 Free Software Foundation, Inc +;; Copyright (C) 2011-2014 Free Software Foundation, Inc ;; Author: Stefan Monnier monn...@iro.umontreal.ca @@ -76,22 +76,27 @@ Delete backup files also. (if (not (file-directory-p dir)) (message Skipping non-package file %s dir) (let* ((pkg (file-name-nondirectory dir)) - (autoloads-file (expand-file-name (concat pkg -autoloads.el) dir)) - simple-p) + (autoloads-file (expand-file-name (concat pkg -autoloads.el) dir))) ;; Omit autoloads and .elc files from the package. (if (file-exists-p autoloads-file) (delete-file autoloads-file)) (archive--delete-elc-files dir) - ;; Test whether this is a simple or multi-file package. - (setq simple-p (archive--simple-package-p dir pkg)) - (push (if (car simple-p) - (apply #'archive--process-simple-package - dir pkg (cdr simple-p)) - (if simple-p - (apply #'archive--write-pkg-file - dir pkg (cdr simple-p))) - (archive--process-multi-file-package dir pkg)) - packages))) + (let ((metadata (archive--metadata dir pkg))) +;; (nth 1 metadata) is nil for org which is the only package +;; still using the org-pkg.el file to specify the metadata. +(if (and (nth 1 metadata) + ( (string-to-number (nth 1 metadata)) 0)) +(progn ;; Negative version: don't publish this package yet! + (message Package %s not released yet! dir) + (delete-directory dir 'recursive)) + (push (if (car metadata) +(apply #'archive--process-simple-package + dir pkg (cdr metadata)) + (if (nth 1 metadata) + (apply #'archive--write-pkg-file + dir pkg (cdr metadata))) + (archive--process-multi-file-package dir pkg)) +packages) ((debug error) (error Error in %s: %S dir v (with-temp-buffer (pp (nreverse packages) (current-buffer)) @@ -108,7 +113,7 @@ Currently only refreshes the ChangeLog files. (setq srcdir (file-name-as-directory (expand-file-name srcdir))) (let* ((wit .changelog-witness) (prevno (with-temp-buffer - (ignore-errors (insert-file-contents wit)) + (insert-file-contents wit) (if (looking-at (concat archive--revno-re $)) (match-string 0
[elpa] 02/02: Merge git+ssh://git.sv.gnu.org/srv/git/emacs/elpa
monnier pushed a commit to branch master in repository elpa. commit 63049cdbfb7d5764064293d1c24412b93918ec11 Merge: 1e5180b a8ef5cd Author: Stefan Monnier monn...@iro.umontreal.ca Date: Mon Mar 24 15:32:35 2014 -0400 Merge git+ssh://git.sv.gnu.org/srv/git/emacs/elpa packages/ada-mode/README |7 +- packages/ada-mode/ada-build.el|4 + packages/ada-mode/ada-fix-error.el|5 +- packages/ada-mode/ada-gnat-xref.el| 13 +- packages/ada-mode/ada-grammar-wy.el | 2717 + packages/ada-mode/ada-mode.el | 222 ++- packages/ada-mode/ada-mode.info | 1434 +- packages/ada-mode/ada-skel.el |4 +- packages/ada-mode/ada-wisi.el | 252 +++- packages/ada-mode/gnat-core.el|6 +- packages/ada-mode/gnat-inspect.el |6 +- packages/ada-mode/gpr-mode.el |5 +- packages/ada-mode/gpr-wisi.el |4 +- packages/company/.travis.yml | 20 - packages/company/NEWS.md | 16 + packages/company/company-bbdb.el | 49 + packages/company/company-clang.el |4 +- packages/company/company-keywords.el |2 +- packages/company/company-semantic.el | 14 +- packages/company/company-tests.el | 87 +- packages/company/company-yasnippet.el | 94 ++ packages/company/company.el | 196 ++- packages/ggtags/README.rst| 255 +++- packages/ggtags/ggtags.el | 887 packages/gnugo/NEWS | 12 +- packages/gnugo/gnugo.el | 492 --- packages/wisi/wisi-parse.el | 18 +- packages/wisi/wisi.el | 31 +- 28 files changed, 4026 insertions(+), 2830 deletions(-)
[elpa] branch master updated (290b04f - a2d0a2a)
monnier pushed a change to branch master
in repository elpa.
from 290b04f [gnugo int] Drop abstractions:
gnugo--{ERR-wait,gate-game-over}
new a2d0a2a * nlinum.el (nlinum-format): New custom variable.
(nlinum--region): Change calling convention of nlinum-format-function.
(nlinum-format-function): Change default value accordingly; Use nlinum-format;
Try to generate less garbage.
The 1 revisions listed above as new are entirely new to this
repository and will be described in separate emails. The revisions
listed as adds were already present in the repository and have only
been added to this reference.
Summary of changes:
packages/nlinum/nlinum.el | 31 ---
1 files changed, 24 insertions(+), 7 deletions(-)
[elpa] 01/01: * nlinum.el (nlinum-format): New custom variable. (nlinum--region): Change calling convention of nlinum-format-function. (nlinum-format-function): Change default value accordingly; Use n
monnier pushed a commit to branch master in repository elpa. commit a2d0a2a867b6634b6bee3e6dccf8a6ce1d45aa85 Author: Stefan Monnier monn...@iro.umontreal.ca Date: Tue Apr 29 01:13:19 2014 -0400 * nlinum.el (nlinum-format): New custom variable. (nlinum--region): Change calling convention of nlinum-format-function. (nlinum-format-function): Change default value accordingly; Use nlinum-format; Try to generate less garbage. --- packages/nlinum/nlinum.el | 31 --- 1 files changed, 24 insertions(+), 7 deletions(-) diff --git a/packages/nlinum/nlinum.el b/packages/nlinum/nlinum.el index 40d6214..750ebc0 100644 --- a/packages/nlinum/nlinum.el +++ b/packages/nlinum/nlinum.el @@ -4,7 +4,7 @@ ;; Author: Stefan Monnier monn...@iro.umontreal.ca ;; Keywords: convenience -;; Version: 1.2 +;; Version: 1.3 ;; 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 @@ -26,6 +26,10 @@ ;;; News: +;; v1.3: +;; - New custom variable `nlinum-format'. +;; - Change in calling convention of `nlinum-format-function'. + ;; v1.2: ;; - New global mode `global-nlinum-mode'. ;; - New config var `nlinum-format-function'. @@ -77,6 +81,8 @@ Linum mode is a buffer-local minor mode. (lambda (buf) (with-current-buffer buf (with-silent-modifications +;; FIXME: only remove `fontified' on those parts of the +;; buffer that had an nlinum overlay! (remove-text-properties (point-min) (point-max) '(fontified) (current-buffer))) @@ -149,14 +155,24 @@ Linum mode is a buffer-local minor mode. (setq nlinum--line-number-cache (cons (point) pos)) pos)) +(defcustom nlinum-format %d + Format of the line numbers. +Used by the default `nlinum-format-function'. + :type 'string + :group 'linum) + (defvar nlinum-format-function - (lambda (line) -(let* ((fmt (format %%%dd nlinum--width)) - (str (propertize (format fmt line) 'face 'linum))) + (lambda (line width) +(let ((str (format nlinum-format line))) + (when ( (length str) width) +;; Left pad to try and right-align the line-numbers. +(setq str (concat (make-string (- width (length str)) ?\ ) str))) + (put-text-property 0 width 'face 'linum str) str)) Function to build the string representing the line number. -Takes one argument (the line number) and returns a string whose width -should be at least equal to `nlinum--width'.) +Takes 2 arguments LINE and WIDTH, both of them numbers, and should return +a string. WIDTH is the ideal width of the result. If the result is larger, +it may cause the margin to be resized and line numbers to be recomputed.) (defun nlinum--region (start limit) (save-excursion @@ -170,7 +186,8 @@ should be at least equal to `nlinum--width'.) (while (and (not (eobp)) ( (point) limit) (let* ((ol (make-overlay (point) (1+ (point -(str (funcall nlinum-format-function line)) +(str (funcall nlinum-format-function + line nlinum--width)) (width (string-width str))) (when ( nlinum--width width) (setq nlinum--width width)
[elpa] branch master updated (4a86dbd - 52575a7)
monnier pushed a change to branch master in repository elpa. from 4a86dbd fixup! [aa2u] Make weight dynamically customizable. new 52575a7 Update copyright_exceptions The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: copyright_exceptions |1 - 1 files changed, 0 insertions(+), 1 deletions(-)
[elpa] 01/01: Update copyright_exceptions
monnier pushed a commit to branch master
in repository elpa.
commit 52575a702c3cf5684e90df48ece94cdd435c2499
Author: Stefan Monnier monn...@iro.umontreal.ca
Date: Sat May 10 15:14:28 2014 -0400
Update copyright_exceptions
---
copyright_exceptions |1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/copyright_exceptions b/copyright_exceptions
index c5b55f3..9df761a 100644
--- a/copyright_exceptions
+++ b/copyright_exceptions
@@ -12,7 +12,6 @@
./ada-mode/gpr-skel.el: Example copyright/license skeleton, with automatic
year and owner.
./ada-mode/gpr-skel.el: Insert a file header comment, with automatic
copyright year and prompt for copyright owner/license.
./ada-mode/gpr-skel.el: {copyright_license}\n
-./ascii-art-to-unicode/ascii-art-to-unicode.el:;; - change copyright to FSF
./auctex/latex.el: pounds copyright
./auctex/multi-prompt.el
./auctex/plain-tex.el: copyright
[elpa] branch externals/rudel updated (1315b23 - 5e4f147)
monnier pushed a change to branch externals/rudel in repository elpa. from 1315b23 Made rudel icon directory configurable at runtime Patch by ulm; can be found here: https://overlays.gentoo.org/proj/emacs/browser/emacs-overlay/app-emacs/rudel/files/rudel-0.3_pre20110405-icons-dir.patch?rev=1661 * rudel-icons.el (header): updated copyright (rudel-icons-directory): use `defvar' instead of `defconst' (rudel-defimage): dynamically bind `image-load-path' to the value `rudel-icons-directory' new 5e4f147 Fix up headers and compilation The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: .bzrignore |4 +- adopted/adopted-compound.el|2 +- adopted/adopted-delete.el |2 +- adopted/adopted-insert.el |2 +- adopted/adopted-nop.el |2 +- adopted/adopted-operation.el |2 +- adopted/adopted.el |2 +- infinote/rudel-infinote-client.el |2 +- infinote/rudel-infinote-display.el |2 +- infinote/rudel-infinote-document.el|2 +- infinote/rudel-infinote-errors.el |2 +- infinote/rudel-infinote-group-directory.el |2 +- infinote/rudel-infinote-group-document.el |2 +- infinote/rudel-infinote-group-text-document.el |2 +- infinote/rudel-infinote-group.el |2 +- infinote/rudel-infinote-node-directory.el |2 +- infinote/rudel-infinote-node.el|2 +- infinote/rudel-infinote-state.el |2 +- infinote/rudel-infinote-text-document.el |2 +- infinote/rudel-infinote-user.el|2 +- infinote/rudel-infinote-util.el|2 +- infinote/rudel-infinote.el |8 +- jupiter/jupiter-compound.el|2 +- jupiter/jupiter-delete.el |2 +- jupiter/jupiter-insert.el |2 +- jupiter/jupiter-nop.el |2 +- jupiter/jupiter-operation.el |2 +- jupiter/jupiter.el |2 +- obby/rudel-obby-client.el |2 +- obby/rudel-obby-debug.el |2 +- obby/rudel-obby-display.el |2 +- obby/rudel-obby-errors.el |2 +- obby/rudel-obby-server.el |2 +- obby/rudel-obby-state.el |2 +- obby/rudel-obby-util.el|2 +- obby/rudel-obby.el |8 +- rudel-backend.el | 15 ++-- rudel-chat.el |2 +- rudel-color.el |3 +- rudel-compat.el|3 +- rudel-compile.el | 100 rudel-debug.el |2 +- rudel-display.el |2 +- rudel-errors.el|2 +- rudel-hooks.el |2 +- rudel-icons.el |5 +- rudel-interactive.el | 19 +++-- rudel-mode.el | 13 ++- rudel-operations.el|2 +- rudel-operators.el |2 +- rudel-overlay.el |5 +- rudel-protocol.el |2 +- rudel-session-initiation.el| 13 ++-- rudel-speedbar.el |4 +- rudel-state-machine.el |5 +- rudel-transport-util.el|6 +- rudel-transport.el |2 +- rudel-util.el |5 +- rudel-xml.el |3 +- rudel.el | 15 +++- socket/rudel-socket.el |6 +- telepathy/rudel-telepathy.el |6 +- tls/rudel-tls.el |6 +- wave/rudel-wave.el |6 +- xmpp/rudel-xmpp-debug.el |2 +- xmpp/rudel-xmpp-sasl.el|2 +- xmpp/rudel-xmpp-state.el |2 +- xmpp/rudel-xmpp-tls.el |2 +- xmpp/rudel-xmpp-tunnel.el |4 +- xmpp/rudel-xmpp-util.el|2 +- xmpp/rudel-xmpp.el |6 +- zeroconf/rudel-zeroconf.el
[elpa] 01/01: Fix up headers and compilation
monnier pushed a commit to branch externals/rudel in repository elpa. commit 5e4f147f6b23c392505cb0cbb5f13384d6d96304 Author: Stefan Monnier monn...@iro.umontreal.ca Date: Mon May 12 02:23:00 2014 -0400 Fix up headers and compilation --- .bzrignore |4 +- adopted/adopted-compound.el|2 +- adopted/adopted-delete.el |2 +- adopted/adopted-insert.el |2 +- adopted/adopted-nop.el |2 +- adopted/adopted-operation.el |2 +- adopted/adopted.el |2 +- infinote/rudel-infinote-client.el |2 +- infinote/rudel-infinote-display.el |2 +- infinote/rudel-infinote-document.el|2 +- infinote/rudel-infinote-errors.el |2 +- infinote/rudel-infinote-group-directory.el |2 +- infinote/rudel-infinote-group-document.el |2 +- infinote/rudel-infinote-group-text-document.el |2 +- infinote/rudel-infinote-group.el |2 +- infinote/rudel-infinote-node-directory.el |2 +- infinote/rudel-infinote-node.el|2 +- infinote/rudel-infinote-state.el |2 +- infinote/rudel-infinote-text-document.el |2 +- infinote/rudel-infinote-user.el|2 +- infinote/rudel-infinote-util.el|2 +- infinote/rudel-infinote.el |8 +- jupiter/jupiter-compound.el|2 +- jupiter/jupiter-delete.el |2 +- jupiter/jupiter-insert.el |2 +- jupiter/jupiter-nop.el |2 +- jupiter/jupiter-operation.el |2 +- jupiter/jupiter.el |2 +- obby/rudel-obby-client.el |2 +- obby/rudel-obby-debug.el |2 +- obby/rudel-obby-display.el |2 +- obby/rudel-obby-errors.el |2 +- obby/rudel-obby-server.el |2 +- obby/rudel-obby-state.el |2 +- obby/rudel-obby-util.el|2 +- obby/rudel-obby.el |8 +- rudel-backend.el | 15 ++-- rudel-chat.el |2 +- rudel-color.el |3 +- rudel-compat.el|3 +- rudel-compile.el | 100 rudel-debug.el |2 +- rudel-display.el |2 +- rudel-errors.el|2 +- rudel-hooks.el |2 +- rudel-icons.el |5 +- rudel-interactive.el | 19 +++-- rudel-mode.el | 13 ++- rudel-operations.el|2 +- rudel-operators.el |2 +- rudel-overlay.el |5 +- rudel-protocol.el |2 +- rudel-session-initiation.el| 13 ++-- rudel-speedbar.el |4 +- rudel-state-machine.el |5 +- rudel-transport-util.el|6 +- rudel-transport.el |2 +- rudel-util.el |5 +- rudel-xml.el |3 +- rudel.el | 15 +++- socket/rudel-socket.el |6 +- telepathy/rudel-telepathy.el |6 +- tls/rudel-tls.el |6 +- wave/rudel-wave.el |6 +- xmpp/rudel-xmpp-debug.el |2 +- xmpp/rudel-xmpp-sasl.el|2 +- xmpp/rudel-xmpp-state.el |2 +- xmpp/rudel-xmpp-tls.el |2 +- xmpp/rudel-xmpp-tunnel.el |4 +- xmpp/rudel-xmpp-util.el|2 +- xmpp/rudel-xmpp.el |6 +- zeroconf/rudel-zeroconf.el |8 +- 72 files changed, 145 insertions(+), 225 deletions(-) diff --git a/.bzrignore b/.bzrignore index 58a1d5c..a36190d 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1,5 +1,7 @@ +*~ *.elc Makefile -rudel-loaddefs.el +rudel-pkg.el +rudel-autoloads.el *.log doc/auto diff --git a/adopted/adopted-compound.el b/adopted/adopted-compound.el index 02f8d98..e710076 100644 --- a/adopted/adopted-compound.el +++ b/adopted/adopted-compound.el @@ -1,6 +1,6 @@ ;;; adopted-compound.el --- Adopted compound operation ;; -;; Copyright (C) 2009, 2010 Jan
[elpa] 02/02: Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa
monnier pushed a commit to branch master in repository elpa. commit 0403ce538c34d1393ac5c0f4ea67089c21e40f7b Merge: 96db8a5 386a3b0 Author: Stefan Monnier monn...@iro.umontreal.ca Date: Mon May 12 02:27:50 2014 -0400 Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa packages/ascii-art-to-unicode/NEWS |4 ++- .../ascii-art-to-unicode/ascii-art-to-unicode.el | 21 +-- 2 files changed, 21 insertions(+), 4 deletions(-)
[elpa] branch master updated (386a3b0 - 0403ce5)
monnier pushed a change to branch master in repository elpa. from 386a3b0 [aa2u] Release: 1.7 new 96db8a5 Add rudel to the list of externals. new 0403ce5 Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa The 2 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: GNUmakefile |2 +- copyright_exceptions |1 + externals-list |1 + packages/lmc/lmc.el |2 +- 4 files changed, 4 insertions(+), 2 deletions(-)
[elpa] 01/01: * .gitignore: Add rudel.
monnier pushed a commit to branch master in repository elpa. commit f0911f5960169159d389f88ad62432c56350c54c Author: Stefan Monnier monn...@iro.umontreal.ca Date: Mon May 12 02:55:26 2014 -0400 * .gitignore: Add rudel. --- .gitignore |5 - 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/.gitignore b/.gitignore index e65f02f..d77751f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,9 @@ ChangeLog core packages/*/*-autoloads.el packages/*/*-pkg.el + +# External packages with their own .git tree. +packages/auctex packages/dismal +packages/rudel packages/w3 -packages/auctex
[elpa] branch externals/rudel updated (5e4f147 - 6d1b81a)
monnier pushed a change to branch externals/rudel in repository elpa. from 5e4f147 Fix up headers and compilation new 6d1b81a Add missing new files. The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: GNUmakefile | 15 + rudel-loaddefs.el | 180 + 2 files changed, 195 insertions(+), 0 deletions(-) create mode 100644 GNUmakefile create mode 100644 rudel-loaddefs.el
[elpa] 01/01: Add missing new files.
monnier pushed a commit to branch externals/rudel in repository elpa. commit 6d1b81a8181228003626182c5d860891353cc06f Author: Stefan Monnier monn...@iro.umontreal.ca Date: Mon May 12 08:42:43 2014 -0400 Add missing new files. --- GNUmakefile | 15 + rudel-loaddefs.el | 180 + 2 files changed, 195 insertions(+), 0 deletions(-) diff --git a/GNUmakefile b/GNUmakefile new file mode 100644 index 000..db56e2a --- /dev/null +++ b/GNUmakefile @@ -0,0 +1,15 @@ +EMACS = emacs -Q --batch + +# FIXME: We keep rudel-loaddefs.el under VCS control. This is contrary to +# normal and recommended practice, but it's due to the fact that the GNU +# ELPA scripts only generate rudel-autoloads.el and only consider files in +# the top-level directory for that (otherwise, maybe we could rely on +# buffer-locally setting generated-autoload-file in the non-main files). + +rudel-loaddefs.el: $(shell find -name '*.el' -print | \ + egrep -v 'rudel-(pkg|autoloads|loaddefs)') + $(EMACS) \ + --eval '(setq generate-autoload-cookie ;;;###rudel-autoload)' \ + --eval '(setq generated-autoload-file (expand-file-name $@))' \ + -f batch-update-autoloads \ + $$(find . -name '*.el' -print | sed 's|/[^/]*$$||' | sort -u) diff --git a/rudel-loaddefs.el b/rudel-loaddefs.el new file mode 100644 index 000..9afcdce --- /dev/null +++ b/rudel-loaddefs.el @@ -0,0 +1,180 @@ +;;; rudel-loaddefs.el --- automatically extracted autoloads +;; +;;; Code: + + +;;;### (autoloads nil infinote/rudel-infinote infinote/rudel-infinote.el +;; (21360 21635 0 0)) +;;; Generated autoloads from infinote/rudel-infinote.el + +(eieio-defclass-autoload 'rudel-infinote-backend '(rudel-protocol-backend) infinote/rudel-infinote ) + +(rudel-add-backend (rudel-backend-get-factory 'protocol) 'infinote 'rudel-infinote-backend) + +(eval-after-load 'rudel-zeroconf '(rudel-zeroconf-register-service _infinote._tcp 'xmpp 'infinote)) + +;;;*** + +;;;### (autoloads nil obby/rudel-obby obby/rudel-obby.el (21360 +;; 21618 0 0)) +;;; Generated autoloads from obby/rudel-obby.el + +(eieio-defclass-autoload 'rudel-obby-backend '(rudel-protocol-backend) obby/rudel-obby Main class of the Rudel obby backend. Creates obby client\nconnections and creates obby servers.) + +(rudel-add-backend (rudel-backend-get-factory 'protocol) 'obby 'rudel-obby-backend) + +(eval-after-load 'rudel-zeroconf '(rudel-zeroconf-register-service _lobby._tcp 'start-tls 'obby)) + +;;;*** + +;;;### (autoloads nil rudel-backend rudel-backend.el (21360 21376 +;; 0 0)) +;;; Generated autoloads from rudel-backend.el + +(eieio-defclass-autoload 'rudel-backend-factory 'nil rudel-backend Factory class that holds an object for each known backend\ncategory. Objects manage backend implementation for one backend\ncategory each.) + +(defmethod rudel-get-factory :static ((this rudel-backend-factory) category) Return the factory responsible for CATEGORY.\nIf there is no responsible factory, create one and return it. (with-slots (factories) this (or (gethash category factories) (puthash category (rudel-backend-factory category) factories + +(defmethod rudel-add-backend ((this rudel-backend-factory) name class optional replace) \ +Add factory class CLASS with name NAME to THIS. +if REPLACE is non-nil, replace a registered implementation of the +same name. (with-slots (backends) this (when (or (not (gethash name backends)) replace) (puthash name class backends + +(autoload 'rudel-backend-get rudel-backend \ +A shortcut for getting backend NAME of category CATEGORY. +The returned backend is of the form (NAME . OBJECT). + +\(fn CATEGORY NAME) nil nil) + +(autoload 'rudel-backend-get-factory rudel-backend \ +A shortcut for getting the factory object for CATEGORY. + +\(fn CATEGORY) nil nil) + +;;;*** + +;;;### (autoloads nil rudel-session-initiation rudel-session-initiation.el +;; (21360 22136 0 0)) +;;; Generated autoloads from rudel-session-initiation.el + +(eieio-defclass-autoload 'rudel-ask-protocol-backend '(rudel-session-initiation-backend) rudel-session-initiation This fallback backend can \discover\ sessions by letting the\nuser select a suitable backend and asking for connect information\nrequired by the chosen backend.) + +(rudel-add-backend (rudel-backend-get-factory 'session-initiation) 'ask-protocol 'rudel-ask-protocol-backend) + +(eieio-defclass-autoload 'rudel-configured-sessions-backend '(rudel-session-initiation-backend) rudel-session-initiation This fallback backend can \discover\ sessions the user has\nconfigured using customization.) + +(rudel-add-backend (rudel-backend-get-factory 'session-initiation) 'configured-sessions 'rudel-configured-sessions-backend) + +;;;*** + +;;;### (autoloads nil socket/rudel-socket socket/rudel-socket.el +;; (21360 21601 0 0)) +;;; Generated autoloads from socket/rudel-socket.el
[elpa] branch externals/auctex updated (f441f5f - 29d3c7e)
monnier pushed a change to branch externals/auctex in repository elpa. from f441f5f Bump to 11.87.4 new 29d3c7e * tex-site.el (TeX-modes-set): Use advice-add if available. * font-latex.el (font-latex-make-sectioning-faces): Don't rely on dynamic scoping for `num'. (font-latex-make-built-in-keywords): Don't use `eval' needlessly. (font-latex-doctex-syntactic-keywords): Declare before first use. (font-latex-match-command-with-arguments): Stay away from `add-to-list' on let-bound variables. (font-latex-match-command-in-braces): Remove unused var `end'. The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: ChangeLog | 1359 + font-latex.el | 29 +- tex-site.el | 32 +- 3 files changed, 718 insertions(+), 702 deletions(-)
[elpa] branch master updated (3c20bf4 - 4943363)
monnier pushed a change to branch master in repository elpa. from 3c20bf4 [xpm maint] Add some perf ideas to HACKING; nfc. new 4943363 Fix up copyright headers; add cl-lib requirement The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: packages/chess/chess-ai.el|2 +- packages/chess/chess-algebraic.el | 22 +++--- packages/chess/chess-announce.el | 20 ++-- packages/chess/chess-autosave.el | 20 ++-- packages/chess/chess-chat.el | 23 --- packages/chess/chess-clock.el | 20 ++-- packages/chess/chess-common.el| 21 - packages/chess/chess-crafty.el| 20 ++-- packages/chess/chess-database.el | 20 ++-- packages/chess/chess-display.el | 20 ++-- packages/chess/chess-eco.el |4 ++-- packages/chess/chess-engine.el| 18 -- packages/chess/chess-epd.el |4 ++-- packages/chess/chess-fen.el | 22 +++--- packages/chess/chess-file.el | 22 -- packages/chess/chess-fruit.el |2 +- packages/chess/chess-game.el | 18 -- packages/chess/chess-german.el| 20 ++-- packages/chess/chess-glaurung.el |2 +- packages/chess/chess-gnuchess.el | 20 ++-- packages/chess/chess-ics.el | 12 +++- packages/chess/chess-ics1.el | 20 ++-- packages/chess/chess-images.el| 18 -- packages/chess/chess-input.el | 22 +++--- packages/chess/chess-irc.el | 20 ++-- packages/chess/chess-kibitz.el| 22 -- packages/chess/chess-link.el | 22 -- packages/chess/chess-log.el | 18 -- packages/chess/chess-message.el | 20 ++-- packages/chess/chess-module.el| 20 ++-- packages/chess/chess-network.el | 20 ++-- packages/chess/chess-none.el | 22 -- packages/chess/chess-perft.el |2 +- packages/chess/chess-pgn.el | 20 ++-- packages/chess/chess-phalanx.el |4 ++-- packages/chess/chess-plain.el | 20 ++-- packages/chess/chess-ply.el | 16 ++-- packages/chess/chess-polyglot.el |2 +- packages/chess/chess-pos.el | 16 ++-- packages/chess/chess-puzzle.el| 20 ++-- packages/chess/chess-random.el| 22 +++--- packages/chess/chess-scid.el | 22 +++--- packages/chess/chess-sjeng.el |4 ++-- packages/chess/chess-sound.el | 22 -- packages/chess/chess-stockfish.el |2 +- packages/chess/chess-test.el | 23 ++- packages/chess/chess-transport.el | 22 -- packages/chess/chess-tutorial.el | 20 ++-- packages/chess/chess-ucb.el | 22 +++--- packages/chess/chess-uci.el |2 +- packages/chess/chess-var.el | 18 -- packages/chess/chess.el | 11 --- 52 files changed, 736 insertions(+), 110 deletions(-)
[elpa] branch externals/ergoemacs-mode updated (039fe2a - 7d81b60)
monnier pushed a change to branch externals/ergoemacs-mode in repository elpa. from 039fe2a Try to make Issue #213 closer to the bug. new 7d81b60 Fix up copyright headers The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: Readme.org|1 - ergoemacs-advices.el |2 +- ergoemacs-extras.el |2 +- ergoemacs-functions.el|2 +- ergoemacs-layouts.el |2 +- ergoemacs-menus.el|2 +- ergoemacs-modal.el|8 ergoemacs-mode.el |6 +++--- ergoemacs-shortcuts.el|8 ergoemacs-test.el |2 +- ergoemacs-theme-engine.el |8 ergoemacs-themes.el |2 +- ergoemacs-track.el|2 +- ergoemacs-translate.el|8 ergoemacs-unbind.el |2 +- 15 files changed, 28 insertions(+), 29 deletions(-)
[elpa] branch externals/dismal updated (4d30234 - 7366f94)
monnier pushed a change to branch externals/dismal in repository elpa. from 4d30234 Use closures instead of `(lambda ...) new 7366f94 * dismal-menu3.el: Make it loadable. The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: dismal-menu3.el |2 ++ dismal.el |1 + 2 files changed, 3 insertions(+), 0 deletions(-)
[elpa] 01/01: * .gitignore: Add ergoemacs-mode.
monnier pushed a commit to branch master in repository elpa. commit 74183c50c82624b139e51979e2f60a8d828b80ab Author: Stefan Monnier monn...@iro.umontreal.ca Date: Wed May 21 15:21:45 2014 -0400 * .gitignore: Add ergoemacs-mode. --- .gitignore |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index d77751f..c24ae92 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ packages/auctex packages/dismal packages/rudel packages/w3 +packages/ergoemacs-mode
[elpa] branch externals/chess updated (bab74a1 - 588157a)
monnier pushed a change to branch externals/chess in repository elpa. from bab74a1 Add obsolete ChangeLog to .elpaignore. new 588157a * chess-perft.el: Fix up copyright header. The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: chess-perft.el |2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
[elpa] 01/01: * update-archive.sh (announce_new): Avoid eval and don't assume pkg names don't start with -.
monnier pushed a commit to branch master
in repository elpa.
commit 995856a19b691c107b806b8103828f9a01ce32b1
Author: Stefan Monnier monn...@iro.umontreal.ca
Date: Thu May 22 10:39:23 2014 -0400
* update-archive.sh (announce_new): Avoid eval and don't assume pkg names
don't start with -.
---
admin/update-archive.sh |5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/admin/update-archive.sh b/admin/update-archive.sh
index 680298b..de4a0a4 100755
--- a/admin/update-archive.sh
+++ b/admin/update-archive.sh
@@ -50,8 +50,9 @@ signal_error () {
announce_new () {
if [ yes != $announce ]; then return; fi
pv=$1
-eval $(echo $pv | sed -e 's/^\(.*\)-\([^-]*\)$/pkg=\1 ver=\2/')
-test $pkg test $ver || signal_error bad PKG-VER: $pv
+pkg=$(echo $pv | sed -e 's/^\(.*\)-\([^-]*\)\.[^-.]*$/\1/')
+ver=$(echo $pv | sed -e 's/^\(.*\)-\([^-]*\)\.[^-.]*$/\2/')
+if [ -z $pkg ] || [ -z $ver ]; then signal_error bad PKG-VER: $pv; fi
send_mail $a_email [GNU ELPA] $pkg version $ver ENDDOC
Version $ver of GNU ELPA package $pkg has just been released.
You can now find it in M-x package-list RET.
[elpa] branch master updated (5315891 - 995856a)
monnier pushed a change to branch master in repository elpa. from 5315891 [quarter-plane] Fix typo in Commentary. new 995856a * update-archive.sh (announce_new): Avoid eval and don't assume pkg names don't start with -. The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: admin/update-archive.sh |5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
[elpa] branch master updated (995856a - e3826c8)
monnier pushed a change to branch master in repository elpa. from 995856a * update-archive.sh (announce_new): Avoid eval and don't assume pkg names don't start with -. new e3826c8 * README: Update for new Version: 0 convention. * admin/forward-diffs.py: Adapt to different syntax. * admin/archive-contents.el (archive--strip-rcs-id): Remove. (batch-make-archive): Accept Version: 0 to mean don't publish. (archive--metadata): Don't use archive--strip-rcs-id any more. (archive--html-make-pkg): Handle the case where the is no `latest'. (batch-html-make-index): Include unreleased packages. The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: README|4 +- admin/archive-contents.el | 70 +++-- admin/forward-diffs.py| 10 +- 3 files changed, 52 insertions(+), 32 deletions(-)
[elpa] branch externals/chess updated (57e0eb3 - b891e7c)
monnier pushed a change to branch externals/chess in repository elpa. from 57e0eb3 Correct year. new b891e7c * chess.el: Use new Version: 0 convention. The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: chess.el |2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
[elpa] 01/01: * chess.el: Use new Version: 0 convention.
monnier pushed a commit to branch externals/chess in repository elpa. commit b891e7c1d56d3a30f46b0826f00a3c0974a1bb9e Author: Stefan Monnier monn...@iro.umontreal.ca Date: Fri May 23 11:03:50 2014 -0400 * chess.el: Use new Version: 0 convention. --- chess.el |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/chess.el b/chess.el index 9aabf7b..304d821 100644 --- a/chess.el +++ b/chess.el @@ -4,7 +4,7 @@ ;; Emacs Lisp Archive Entry ;; Filename: chess.el -;; Version: -1 +;; Version: 0 ;; Package-Requires: ((cl-lib 0.5)) ;; Keywords: games ;; Author: John Wiegley jo...@gnu.org
[elpa] branch externals/ergoemacs-mode updated (7d81b60 - a36c916)
monnier pushed a change to branch externals/ergoemacs-mode in repository elpa. from 7d81b60 Fix up copyright headers new a36c916 * ergoemacs-mode.el.el: Use new Version: 0 convention. The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: ergoemacs-mode.el |2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
[elpa] branch master updated (790d134 - b531af5)
monnier pushed a change to branch master in repository elpa. from 790d134 release ada-mode 5.1.4 new b531af5 * packages/nlinum/nlinum.el (nlinum-mode): Don't leave overlays around when switching major mode. The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: packages/nlinum/nlinum.el | 13 - 1 files changed, 12 insertions(+), 1 deletions(-)
[elpa] 01/01: * packages/nlinum/nlinum.el (nlinum-mode): Don't leave overlays around when switching major mode.
monnier pushed a commit to branch master in repository elpa. commit b531af546e116b5367586bb65c5d26d11c6e377e Author: Stefan Monnier monn...@iro.umontreal.ca Date: Mon May 26 19:18:05 2014 -0400 * packages/nlinum/nlinum.el (nlinum-mode): Don't leave overlays around when switching major mode. --- packages/nlinum/nlinum.el | 13 - 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/packages/nlinum/nlinum.el b/packages/nlinum/nlinum.el index 750ebc0..41b79b6 100644 --- a/packages/nlinum/nlinum.el +++ b/packages/nlinum/nlinum.el @@ -54,12 +54,15 @@ Linum mode is a buffer-local minor mode. :lighter nil ;; ( NLinum nlinum--desc) (jit-lock-unregister #'nlinum--region) (remove-hook 'window-configuration-change-hook #'nlinum--setup-window t) - (remove-hook 'after-change-functions #'nlinum--after-change) + (remove-hook 'after-change-functions #'nlinum--after-change t) (kill-local-variable 'nlinum--line-number-cache) (remove-overlays (point-min) (point-max) 'nlinum t) ;; (kill-local-variable 'nlinum--ol-counter) (kill-local-variable 'nlinum--width) (when nlinum-mode +;; FIXME: Another approach would be to make the mode permanent-local, +;; which might indeed be preferable. +(add-hook 'change-major-mode-hook (lambda () (nlinum-mode -1))) (add-hook 'window-configuration-change-hook #'nlinum--setup-window nil t) (add-hook 'after-change-functions #'nlinum--after-change nil t) (jit-lock-register #'nlinum--region t)) @@ -136,6 +139,14 @@ Linum mode is a buffer-local minor mode. (defvar nlinum--line-number-cache nil) (make-variable-buffer-local 'nlinum--line-number-cache) +;; We could try and avoid flushing the cache at every change, e.g. with: +;; (defun nlinum--before-change (start _end) +;; (if (and nlinum--line-number-cache +;; ( start (car nlinum--line-number-cache))) +;; (save-excursion (goto-char start) (nlinum--line-number-at-pos +;; But it's far from clear that it's worth the trouble. The current simplistic +;; approach seems to be good enough in practice. + (defun nlinum--after-change (rest _args) (setq nlinum--line-number-cache nil))
[elpa] branch master updated (b531af5 - 2ba7e77)
monnier pushed a change to branch master in repository elpa. from b531af5 * packages/nlinum/nlinum.el (nlinum-mode): Don't leave overlays around when switching major mode. new 6073044 * packages/metar/metar.el (metar-latitude-longitude-distance-haversine): `macrolet' is called `cl-macrolet' in cl-lib. (metar-station-countries): Avoid `add-to-list'. Use dolist. new 2ba7e77 * packages/gnugo: Add `cl-lib' as dependency; require it and use its names. Don't bother with lexical-let since we use lexical-binding. * packages/gnugo/gnugo.el (gnugo-board-mode-map): * packages/gnugo/gnugo-frolic.el (gnugo-frolic-mode-map): Move initialization into declaration. The 2 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: packages/gnugo/gnugo-frolic.el | 114 ++--- packages/gnugo/gnugo-imgen.el | 14 ++-- packages/gnugo/gnugo.el| 213 packages/metar/metar.el| 13 +-- 4 files changed, 173 insertions(+), 181 deletions(-)
[elpa] 01/02: * packages/metar/metar.el (metar-latitude-longitude-distance-haversine): `macrolet' is called `cl-macrolet' in cl-lib. (metar-station-countries): Avoid `add-to-list'. Use dolist.
monnier pushed a commit to branch master in repository elpa. commit 607304435b649bdd1185719f919c53b0e1d0d9a0 Author: Stefan Monnier monn...@iro.umontreal.ca Date: Mon May 26 23:47:26 2014 -0400 * packages/metar/metar.el (metar-latitude-longitude-distance-haversine): `macrolet' is called `cl-macrolet' in cl-lib. (metar-station-countries): Avoid `add-to-list'. Use dolist. --- packages/metar/metar.el | 13 ++--- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/packages/metar/metar.el b/packages/metar/metar.el index cbba5f8..43a72db 100644 --- a/packages/metar/metar.el +++ b/packages/metar/metar.el @@ -120,8 +120,8 @@ LATITUDE2/LONGITUDE2. latitude2 longitude2) Caluclate the distance (in kilometers) between two points on the surface of the earth given as LATITUDE1, LONGITUDE1, LATITUDE2 and LONGITUDE2. - (macrolet ((distance (d1 d2) - `(expt (sin (/ (degrees-to-radians (- ,d2 ,d1)) 2)) 2))) + (cl-macrolet ((distance (d1 d2) + `(expt (sin (/ (degrees-to-radians (- ,d2 ,d1)) 2)) 2))) (let ((a (+ (distance latitude1 latitude2) (* (cos (degrees-to-radians latitude1)) (cos (degrees-to-radians latitude2)) (distance longitude1 longitude2) @@ -456,11 +456,10 @@ Otherwise, determine the best station via latitude/longitude. (message No weather information found, sorry.) (defun metar-station-countries () - (let (countries (stations (metar-stations))) -(while stations - (let ((country (cdr (assq 'country (car stations) - (add-to-list 'countries country)) - (setq stations (cdr stations))) + (let (countries) +(dolist (station (metar-stations)) + (let ((country (cdr (assq 'country station + (cl-pushnew country countries :test #'equal))) countries)) (defun metar-stations-in-country (country)
[elpa] 02/02: * packages/gnugo: Add `cl-lib' as dependency; require it and use its names. Don't bother with lexical-let since we use lexical-binding. * packages/gnugo/gnugo.el (gnugo-board-mode-map):
monnier pushed a commit to branch master
in repository elpa.
commit 2ba7e772cc6ed17a7bf1d2b96aea18b528f922e4
Author: Stefan Monnier monn...@iro.umontreal.ca
Date: Mon May 26 23:58:35 2014 -0400
* packages/gnugo: Add `cl-lib' as dependency; require it and use its names.
Don't bother with lexical-let since we use lexical-binding.
* packages/gnugo/gnugo.el (gnugo-board-mode-map):
* packages/gnugo/gnugo-frolic.el (gnugo-frolic-mode-map): Move
initialization
into declaration.
---
packages/gnugo/gnugo-frolic.el | 114 ++---
packages/gnugo/gnugo-imgen.el | 14 ++--
packages/gnugo/gnugo.el| 213
3 files changed, 167 insertions(+), 174 deletions(-)
diff --git a/packages/gnugo/gnugo-frolic.el b/packages/gnugo/gnugo-frolic.el
index be6b2ac..69373e8 100644
--- a/packages/gnugo/gnugo-frolic.el
+++ b/packages/gnugo/gnugo-frolic.el
@@ -20,19 +20,39 @@
;;; Code:
+(require 'cl-lib)
(require 'gnugo)
(require 'ascii-art-to-unicode) ; for `aa2u'
-(defvar gnugo-frolic-mode-map nil
+(defvar gnugo-frolic-mode-map
+ (let ((map (make-sparse-keymap)))
+(suppress-keymap map)
+(mapc (lambda (pair)
+(define-key map (car pair) (cdr pair)))
+ '((q . gnugo-frolic-quit)
+(Q . gnugo-frolic-quit)
+(\C-q . gnugo-frolic-quit)
+(C . gnugo-frolic-quit) ; like ‘View-kill-and-leave’
+(\C-b . gnugo-frolic-backward-branch)
+(\C-f . gnugo-frolic-forward-branch)
+(\C-p . gnugo-frolic-previous-move)
+(\C-n . gnugo-frolic-next-move)
+(t . gnugo-frolic-tip-move)
+(j . gnugo-frolic-exchange-left)
+(J . gnugo-frolic-rotate-left)
+(k . gnugo-frolic-exchange-right)
+(K . gnugo-frolic-rotate-right)
+(\C-m . gnugo-frolic-set-as-main-line)
+(\C-\M-p. gnugo-frolic-prune-branch)
+(o . gnugo-frolic-return-to-origin)))
+map)
Keymap for GNUGO Frolic mode.)
(defvar gnugo-frolic-parent-buffer nil)
(defvar gnugo-frolic-origin nil)
(define-derived-mode gnugo-frolic-mode special-mode GNUGO Frolic
- A special mode for manipulating a GNUGO gametree.
-
-\\{gnugo-frolic-mode-map}
+ A special mode for manipulating a GNUGO gametree.
(setq truncate-lines t)
(buffer-disable-undo))
@@ -103,7 +123,7 @@ are dimmed. Type \\[describe-mode] in that buffer for
details.
(as-pos (gnugo--as-pos-func))
(at (car (aref monkey 0)))
(bidx (aref monkey 1))
- (valid (map 'vector (lambda (end)
+ (valid (cl-map 'vector (lambda (end)
(gethash (car end) mnum))
ends))
(max-move-num (apply 'max (append valid nil)))
@@ -119,9 +139,9 @@ are dimmed. Type \\[describe-mode] in that buffer for
details.
(apply 'format fmt args)
properties
;; breathe in
- (loop
+ (cl-loop
for bx below width
- do (loop
+ do (cl-loop
with fork
for node in (aref ends bx)
do (if (setq fork (on node))
@@ -130,7 +150,7 @@ are dimmed. Type \\[describe-mode] in that buffer for
details.
;; todo: ignore non-move nodes
(eq node (car (aref ends bix
(link (other)
- (pushnew other (gethash node soil
+ (cl-pushnew other (gethash node soil
(unless (tip-p bx)
(unless (tip-p fork)
(link fork))
@@ -142,12 +162,12 @@ are dimmed. Type \\[describe-mode] in that buffer for
details.
(gnugo-frolic-mode)
(erase-buffer)
(setq header-line-format
-(lexical-let ((full (concat
- (make-string 11 ?\s)
- (mapconcat (lambda (n)
- (format %-5s n))
-lanes
-
+(let ((full (concat
+ (make-string 11 ?\s)
+ (mapconcat (lambda (n)
+ (format %-5s n))
+lanes
+
`((:eval
(funcall
,(lambda ()
@@ -173,13 +193,13 @@ are dimmed. Type \\[describe-mode] in that buffer for
details.
(set (make-local-variable 'gnugo-frolic-parent-buffer) from)
(set (make-local-variable 'gnugo-state)
(buffer-local-value 'gnugo-state from))
- (loop
+ (cl-loop
with props
[elpa] branch master updated (2ba7e77 - bd29e9b)
monnier pushed a change to branch master in repository elpa. from 2ba7e77 * packages/gnugo: Add `cl-lib' as dependency; require it and use its names. Don't bother with lexical-let since we use lexical-binding. * packages/gnugo/gnugo.el (gnugo-board-mode-map): * packages/gnugo/gnugo-frolic.el (gnugo-frolic-mode-map): Move initialization into declaration. new bd29e9b * packages/osc/osc.el (osc-filter): Fix up old `cl' name. (osc--test-transport-equality): Mark `path' as unused. The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: packages/osc/osc.el |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
[elpa] 01/02: * packages/svg-clock/svg-clock.el (svg-clock-do-update, svg-clock-start): Don't call image-mode every second.
monnier pushed a commit to branch master in repository elpa. commit efaba1ee599090187756dc5c57833e6874f7c37b Author: Dieter (tiny change) die...@schoen.or.at Date: Sat May 31 22:03:44 2014 -0400 * packages/svg-clock/svg-clock.el (svg-clock-do-update, svg-clock-start): Don't call image-mode every second. --- packages/svg-clock/svg-clock.el |7 --- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/svg-clock/svg-clock.el b/packages/svg-clock/svg-clock.el index 3897243..9d480e6 100644 --- a/packages/svg-clock/svg-clock.el +++ b/packages/svg-clock/svg-clock.el @@ -1,6 +1,6 @@ ;;; svg-clock.el --- Analog clock using Scalable Vector Graphics -;; Copyright (C) 2011 Free Software Foundation, Inc. +;; Copyright (C) 2011, 2014 Free Software Foundation, Inc. ;; Author: Ulf Jasper ulf.jas...@web.de ;; Created: 22. Sep. 2011 @@ -186,8 +186,8 @@ TIME must have the form (SECOND MINUTE HOUR ...), as returned by `decode-time'. (svg-clock-replace %SIZE% (format %d svg-clock--actual-size)) (svg-clock-replace %SCALE% (format %f (/ svg-clock--actual-size 100.0))) - (image-mode) - (image-toggle-display-image + (when (derived-mode-p 'image-mode) +(image-toggle-display-image) (defun svg-clock-update () Update the clock. @@ -245,6 +245,7 @@ Optionally PERFORM-UPDATE immediately. (setq svg-clock-timer (run-with-timer 0 1 'svg-clock-update)) (svg-clock-mode) +(image-mode) (message Clock started))) (defvar svg-clock-mode-map
[elpa] branch master updated (649b00a - 590892e)
monnier pushed a change to branch master in repository elpa. from 649b00a [metar] Fix metar-convert-temperature to actually DTRT new efaba1e * packages/svg-clock/svg-clock.el (svg-clock-do-update, svg-clock-start): Don't call image-mode every second. new 590892e Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa The 2 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: packages/svg-clock/svg-clock.el |7 --- 1 files changed, 4 insertions(+), 3 deletions(-)
[elpa] 02/02: Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa
monnier pushed a commit to branch master in repository elpa. commit 590892e2edc0811fb977454f0839dec2a880a8e1 Merge: efaba1e 649b00a Author: Stefan Monnier monn...@iro.umontreal.ca Date: Sat May 31 22:04:29 2014 -0400 Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa GNUmakefile|2 +- README |4 +- admin/archive-contents.el | 70 +- admin/forward-diffs.py | 10 +- packages/ada-mode/NEWS | 19 + packages/ada-mode/README |4 +- packages/ada-mode/ada-gnat-xref.el |4 +- packages/ada-mode/ada-grammar-wy.el| 2671 ++-- packages/ada-mode/ada-mode.el | 89 +- packages/ada-mode/ada-mode.info| 81 +- packages/ada-mode/ada-wisi.el |9 +- packages/ada-mode/gnat-core.el | 12 +- packages/ada-mode/gnat-inspect.el | 12 +- packages/ada-mode/gpr-mode.el | 11 - packages/ada-mode/gpr-query.el | 25 +- packages/ascii-art-to-unicode/HACKING |1 + packages/ascii-art-to-unicode/NEWS |4 + .../ascii-art-to-unicode/ascii-art-to-unicode.el | 25 +- packages/gnugo/NEWS|1 + packages/gnugo/gnugo-frolic.el | 203 +- packages/gnugo/gnugo-imgen.el | 91 +- packages/gnugo/gnugo.el| 416 ++-- packages/metar/metar.el| 657 + packages/nlinum/nlinum.el | 13 +- packages/osc/osc.el| 237 ++ packages/xpm/NEWS |3 + packages/xpm/xpm.el|8 +- 27 files changed, 2900 insertions(+), 1782 deletions(-)
[elpa] branch master updated (1585aa0 - 9c22e41)
monnier pushed a change to branch master in repository elpa. from 1585aa0 [metar] Unify station lat/lon conversion. new 9c22e41 * sml-mode/sml-mode.el (sml-smie-grammar): Add includesharing. (sml-smie-rules): Add functor rule. (sml-smie-definitional-equal-p): Use smie-backward-sexp. The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: packages/sml-mode/sml-mode.el | 38 +- packages/sml-mode/testcases.sml | 31 ++- 2 files changed, 39 insertions(+), 30 deletions(-)
[elpa] 01/01: * sml-mode.el (sml--rightalign-and-p): New function.
monnier pushed a commit to branch master in repository elpa. commit 2acab4eeb3a5bf32b013b7365a10f361e40db5ab Author: Stefan Monnier monn...@iro.umontreal.ca Date: Wed Jun 4 10:58:39 2014 -0400 * sml-mode.el (sml--rightalign-and-p): New function. --- packages/sml-mode/sml-mode.el | 26 +- packages/sml-mode/testcases.sml |1 + 2 files changed, 26 insertions(+), 1 deletions(-) diff --git a/packages/sml-mode/sml-mode.el b/packages/sml-mode/sml-mode.el index e9c2477..a46d9ff 100644 --- a/packages/sml-mode/sml-mode.el +++ b/packages/sml-mode/sml-mode.el @@ -487,6 +487,30 @@ Regexp match data 0 points to the chars. (defvar sml-indent-separator-outdent 2) +(defun sml--rightalign-and-p () + (when sml-rightalign-and +;; Only right-align the and if the intervening code is more deeply +;; indented, to avoid things like: +;; datatype foo +;; = Foo of int +;; and bar = Bar of string +(save-excursion + (let ((max (line-end-position 0)) +(data (smie-backward-sexp and)) +(startcol (save-excursion +(forward-comment (- (point))) +(current-column))) +(mincol (current-column))) +(save-excursion + (search-forward = max t) + (forward-line 1) + (if ( (point) max) (setq max (point +(while (and (= (point) max) (not (eobp))) + (skip-chars-forward \t) + (setq mincol (current-column)) + (forward-line 1)) +(= mincol startcol) + (defun sml-smie-rules (kind token) ;; I much preferred the pcase version of the code, especially while ;; edebugging the code. But that will have to wait until we get rid of @@ -528,7 +552,7 @@ Regexp match data 0 points to the chars. ((equal token and) ;; FIXME: maybe and (c|sh)ould be handled as an smie-separator. (cond -((smie-rule-parent-p datatype) (if sml-rightalign-and 5 0)) +((smie-rule-parent-p datatype) (if (sml--rightalign-and-p) 5 0)) ((smie-rule-parent-p fun val) 0))) ((equal token d=) (cond diff --git a/packages/sml-mode/testcases.sml b/packages/sml-mode/testcases.sml index 0e98ed6..14b73d3 100644 --- a/packages/sml-mode/testcases.sml +++ b/packages/sml-mode/testcases.sml @@ -142,6 +142,7 @@ val x = datatype foobar = FooB of int | FooA of bool * int +and baz = QUX of foo datatype foo = FOO | BAR of baz and baz = BAZ | QUUX of foo
[elpa] branch master updated (c30dafe - 69014aa)
monnier pushed a change to branch master in repository elpa. from c30dafe [xpm] Release: 1.0.3 new 69014aa * company/company-capf.el: Don't ignore things like semantic-capf. The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: .gitignore |1 + packages/company/company-capf.el |9 ++--- 2 files changed, 7 insertions(+), 3 deletions(-)
[elpa] 01/01: * company/company-capf.el: Don't ignore things like semantic-capf.
monnier pushed a commit to branch master in repository elpa. commit 69014aa7f585eed4b85b3202146a5c63da58d887 Author: Stefan Monnier monn...@iro.umontreal.ca Date: Sat Jun 14 23:20:16 2014 -0400 * company/company-capf.el: Don't ignore things like semantic-capf. --- .gitignore |1 + packages/company/company-capf.el |9 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5de4b9d..313d9e5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ *.elc +*.orig *~ ChangeLog core diff --git a/packages/company/company-capf.el b/packages/company/company-capf.el index 3aaeb13..be7292a 100644 --- a/packages/company/company-capf.el +++ b/packages/company/company-capf.el @@ -36,9 +36,12 @@ (remove-hook 'company-completion-finished-hook 'company--capf-clear-data t)) (defun company--capf-data () - ;; Ignore tags-completion-at-point-function because it subverts company-etags - ;; in the default value of company-backends, where the latter comes later. - (cl-letf* (((default-value 'completion-at-point-functions) nil) + (cl-letf* (((default-value 'completion-at-point-functions) + ;; Ignore tags-completion-at-point-function because it subverts + ;; company-etags in the default value of company-backends, where + ;; the latter comes later. + (remove 'tags-completion-at-point-function + (default-value 'completion-at-point-functions))) (data (run-hook-wrapped 'completion-at-point-functions ;; Ignore misbehaving functions. #'completion--capf-wrapper 'optimist)))
[elpa] 01/01: * sml-mode/sml-mode.el: Release new version.
monnier pushed a commit to branch master in repository elpa. commit 99dd852a0047d60e1a2dc04e1a0199b86a060daf Author: Stefan Monnier monn...@iro.umontreal.ca Date: Tue Jun 17 09:12:02 2014 -0400 * sml-mode/sml-mode.el: Release new version. --- packages/sml-mode/sml-mode.el |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/packages/sml-mode/sml-mode.el b/packages/sml-mode/sml-mode.el index a46d9ff..ac6ad2f 100644 --- a/packages/sml-mode/sml-mode.el +++ b/packages/sml-mode/sml-mode.el @@ -3,7 +3,7 @@ ;; Copyright (C) 1989,1999,2000,2004,2007,2010-2014 Free Software Foundation, Inc. ;; Maintainer: (Stefan Monnier) monn...@iro.umontreal.ca -;; Version: 6.4 +;; Version: 6.5 ;; Keywords: SML ;; Author: Lars Bo Nielsen ;; Olin Shivers
