From: David Gonzalez Gandara Date: Wed, 2 Dec 2015 09:53:18 +0000 (+0100) Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs/elpa: transcribe.el update X-Git-Url: https://code.delx.au/gnu-emacs-elpa/commitdiff_plain/0c5b757b62d2712a0f7951bce2751be8fed3cf32?hp=c523db391d2bf4c40cf8158efa759bb0e29a7c72 Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs/elpa: transcribe.el update --- diff --git a/GNUmakefile b/GNUmakefile index 010d16585..ad86a7f8d 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -13,20 +13,20 @@ CR_EXCEPTIONS=copyright_exceptions .PHONY: check_copyrights check_copyrights: @echo "Compute exceptions >$(CR_EXCEPTIONS)~" - @export LC_ALL=C; \ - (cd packages && \ - find . -name '.git' -prune -o \ - -name 'test' -prune -o \ - -name '*.el' -print0 | \ - xargs -0 grep -L 'Free Software Foundation, Inc' | \ - grep -v '\(\.dir-locals\|.-\(pkg\|autoloads\)\)\.el$$'; \ - find . -name '.git' -prune -o -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"; \ + @export LC_ALL=C; \ + (cd packages && \ + find . -name '.git' -prune -o \ + -name 'test' -prune -o \ + -name '*.el' -print0 | \ + xargs -0 grep -L 'Free Software Foundation, Inc' | \ + grep -v '\(\.dir-locals\|.-\(pkg\|autoloads\)\)\.el$$'; \ + find . -name '.git' -prune -o -name '*.el' -type f -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)~" diff --git a/externals-list b/externals-list index 94151e4df..d024f974e 100644 --- a/externals-list +++ b/externals-list @@ -56,9 +56,10 @@ ("gnorb" :subtree "https://github.com/girzel/gnorb") ("ioccur" :subtree "https://github.com/thierryvolpiatto/ioccur.git") ("js2-mode" :subtree "https://github.com/mooz/js2-mode.git") + ("let-alist" :core "lisp/emacs-lisp/let-alist.el") ("math-symbol-lists" :subtree "https://github.com/vspinu/math-symbol-lists.git") ("nameless" :subtree "https://github.com/Malabarba/Nameless") - ("names" :subtree "http://github.com/Bruce-Connor/names") + ("names" :subtree "http://github.com/Malabarba/names") ("omn-mode" :external nil) ("ntlm" :core "lisp/net/ntlm.el") ("on-screen" :subtree "https://github.com/michael-heerdegen/on-screen.el.git") diff --git a/packages/beacon/beacon.el b/packages/beacon/beacon.el index 63ebbae1e..66e696401 100644 --- a/packages/beacon/beacon.el +++ b/packages/beacon/beacon.el @@ -149,14 +149,16 @@ For instance, if you want to disable beacon on buffers where (add-hook 'beacon-dont-blink-predicates #'window-minibuffer-p) -(defcustom beacon-dont-blink-major-modes '(magit-status-mode magit-popup-mode) +(defcustom beacon-dont-blink-major-modes '(t magit-status-mode magit-popup-mode + gnus-summary-mode gnus-group-mode) "A list of major-modes where the beacon won't blink. Whenever the current buffer satisfies `derived-mode-p' for one of the major-modes on this list, the beacon will not blink." :type '(repeat symbol)) -(defcustom beacon-dont-blink-commands '(recenter-top-bottom) +(defcustom beacon-dont-blink-commands '(recenter-top-bottom next-line previous-line + forward-line) "A list of commands that should not make the beacon blink. Use this for commands that scroll the window in very predictable ways, when the blink would be more distracting diff --git a/packages/bug-hunter/README.org b/packages/bug-hunter/README.org index 78c622e7e..d8c9463a9 100644 --- a/packages/bug-hunter/README.org +++ b/packages/bug-hunter/README.org @@ -1,6 +1,7 @@ #+OPTIONS: toc:nil num:nil #+TITLE: [[file:hunter.png]] The Bug Hunter [[https://travis-ci.org/Malabarba/elisp-bug-hunter][file:https://travis-ci.org/Malabarba/elisp-bug-hunter.svg?branch=master]] +/Automatically debug and bisect your init (.emacs) file!/ The Bug Hunter is an Emacs library that finds the source of an error or unexpected behavior inside an elisp configuration file (typically diff --git a/packages/bug-hunter/bug-hunter.el b/packages/bug-hunter/bug-hunter.el index 6faa5a18f..041d5bd1b 100644 --- a/packages/bug-hunter/bug-hunter.el +++ b/packages/bug-hunter/bug-hunter.el @@ -1,10 +1,10 @@ -;;; bug-hunter.el --- Hunt down errors in elisp files -*- lexical-binding: t; -*- +;;; bug-hunter.el --- Hunt down errors by bisecting elisp files -*- lexical-binding: t; -*- ;; Copyright (C) 2015 Free Software Foundation, Inc. ;; Author: Artur Malabarba -;; URL: http://github.com/Malabarba/elisp-bug-hunter -;; Version: 1.0 +;; URL: https://github.com/Malabarba/elisp-bug-hunter +;; Version: 1.0.1 ;; Keywords: lisp ;; Package-Requires: ((seq "1.3") (cl-lib "0.5")) @@ -110,7 +110,7 @@ non-nil in your current (problematic) Emacs state, AND that returns nil on a clean Emacs instance. If you're unsure how to write an assertion, you can try the interactive hunt instead, or see some examples in the Readme: - https://github.com/Bruce-Connor/elisp-bug-hunter" + https://github.com/Malabarba/elisp-bug-hunter" "Printed to the user if they provide a bad assertion.") (defvar bug-hunter--current-head nil @@ -416,7 +416,7 @@ If you're looking for something that's not an error, use the interactive hunt instead of the error hunt. If you have some elisp proficiency, you can also use the assertion hunt, see this link for some examples: - https://github.com/Bruce-Connor/elisp-bug-hunter") + https://github.com/Malabarba/elisp-bug-hunter") (or assertion ""))) ;; Make sure we're in a forest, not a volcano. diff --git a/packages/let-alist/let-alist.el b/packages/let-alist/let-alist.el deleted file mode 100644 index ca7a904a0..000000000 --- a/packages/let-alist/let-alist.el +++ /dev/null @@ -1,142 +0,0 @@ -;;; let-alist.el --- Easily let-bind values of an assoc-list by their names -*- lexical-binding: t; -*- - -;; Copyright (C) 2014-2015 Free Software Foundation, Inc. - -;; Author: Artur Malabarba -;; Maintainer: Artur Malabarba -;; Version: 1.0.4 -;; Keywords: extensions lisp -;; Prefix: let-alist -;; Separator: - - -;; 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 . - -;;; Commentary: - -;; This package offers a single macro, `let-alist'. This macro takes a -;; first argument (whose value must be an alist) and a body. -;; -;; The macro expands to a let form containing body, where each dotted -;; symbol inside body is let-bound to their cdrs in the alist. Dotted -;; symbol is any symbol starting with a `.'. Only those present in -;; the body are let-bound and this search is done at compile time. -;; -;; For instance, the following code -;; -;; (let-alist alist -;; (if (and .title .body) -;; .body -;; .site -;; .site.contents)) -;; -;; essentially expands to -;; -;; (let ((.title (cdr (assq 'title alist))) -;; (.body (cdr (assq 'body alist))) -;; (.site (cdr (assq 'site alist))) -;; (.site.contents (cdr (assq 'contents (cdr (assq 'site alist)))))) -;; (if (and .title .body) -;; .body -;; .site -;; .site.contents)) -;; -;; If you nest `let-alist' invocations, the inner one can't access -;; the variables of the outer one. You can, however, access alists -;; inside the original alist by using dots inside the symbol, as -;; displayed in the example above by the `.site.contents'. -;; -;;; Code: - - -(defun let-alist--deep-dot-search (data) - "Return alist of symbols inside DATA that start with a `.'. -Perform a deep search and return an alist where each car is the -symbol, and each cdr is the same symbol without the `.'." - (cond - ((symbolp data) - (let ((name (symbol-name data))) - (when (string-match "\\`\\." name) - ;; Return the cons cell inside a list, so it can be appended - ;; with other results in the clause below. - (list (cons data (intern (replace-match "" nil nil name))))))) - ((not (consp data)) nil) - (t (append (let-alist--deep-dot-search (car data)) - (let-alist--deep-dot-search (cdr data)))))) - -(defun let-alist--access-sexp (symbol variable) - "Return a sexp used to access SYMBOL inside VARIABLE." - (let* ((clean (let-alist--remove-dot symbol)) - (name (symbol-name clean))) - (if (string-match "\\`\\." name) - clean - (let-alist--list-to-sexp - (mapcar #'intern (nreverse (split-string name "\\."))) - variable)))) - -(defun let-alist--list-to-sexp (list var) - "Turn symbols LIST into recursive calls to `cdr' `assq' on VAR." - `(cdr (assq ',(car list) - ,(if (cdr list) (let-alist--list-to-sexp (cdr list) var) - var)))) - -(defun let-alist--remove-dot (symbol) - "Return SYMBOL, sans an initial dot." - (let ((name (symbol-name symbol))) - (if (string-match "\\`\\." name) - (intern (replace-match "" nil nil name)) - symbol))) - - -;;; The actual macro. -;;;###autoload -(defmacro let-alist (alist &rest body) - "Let-bind dotted symbols to their cdrs in ALIST and execute BODY. -Dotted symbol is any symbol starting with a `.'. Only those present -in BODY are let-bound and this search is done at compile time. - -For instance, the following code - - (let-alist alist - (if (and .title .body) - .body - .site - .site.contents)) - -essentially expands to - - (let ((.title (cdr (assq 'title alist))) - (.body (cdr (assq 'body alist))) - (.site (cdr (assq 'site alist))) - (.site.contents (cdr (assq 'contents (cdr (assq 'site alist)))))) - (if (and .title .body) - .body - .site - .site.contents)) - -If you nest `let-alist' invocations, the inner one can't access -the variables of the outer one. You can, however, access alists -inside the original alist by using dots inside the symbol, as -displayed in the example above." - (declare (indent 1) (debug t)) - (let ((var (make-symbol "alist"))) - `(let ((,var ,alist)) - (let ,(mapcar (lambda (x) `(,(car x) ,(let-alist--access-sexp (car x) var))) - (delete-dups (let-alist--deep-dot-search body))) - ,@body)))) - -(provide 'let-alist) - -;;; let-alist.el ends here diff --git a/packages/names/names-dev.el b/packages/names/names-dev.el index 0c2dc2025..c139d6466 100644 --- a/packages/names/names-dev.el +++ b/packages/names/names-dev.el @@ -2,9 +2,6 @@ ;; Copyright (C) 2014 Free Software Foundation, Inc. -;; Author: Artur Malabarba -;; Maintainer: Artur Malabarba -;; URL: http://github.com/Bruce-Connor/names ;; Prefix: names ;; Separator: - diff --git a/packages/names/names.el b/packages/names/names.el index f4ef7bdfd..62aafdf08 100644 --- a/packages/names/names.el +++ b/packages/names/names.el @@ -3,8 +3,8 @@ ;; Copyright (C) 2014-2015 Free Software Foundation, Inc. ;; Author: Artur Malabarba -;; URL: https://github.com/Bruce-Connor/names -;; Version: 20150723.0 +;; URL: https://github.com/Malabarba/names +;; Version: 20151201.0 ;; Package-Requires: ((emacs "24.1") (cl-lib "0.5")) ;; Keywords: extensions lisp @@ -13,7 +13,7 @@ ;; The description is way too large to sanely write here, below is a ;; summary. For a complete description, please visit the package's ;; frontpage with `M-x names-view-manual', or see the Readme file on -;; https://raw.githubusercontent.com/Bruce-Connor/names/master/Readme.org +;; https://raw.githubusercontent.com/Malabarba/names/master/Readme.org ;;; License: ;; @@ -123,7 +123,7 @@ it will set PROP." ;;; --------------------------------------------------------------- ;;; Variables -(defconst names-version "20150723.0" "Version of the names.el package.") +(defconst names-version "20151201.0" "Version of the names.el package.") (defvar names--name nil "Name of the current namespace inside the `define-namespace' macro.") @@ -567,7 +567,7 @@ Either it's an undefined macro, a macro with a bad debug declaration, or we have (defun names-view-manual () "Call `browse-url' to view the manual of the Names package." (interactive) - (browse-url "http://github.com/Bruce-Connor/names")) + (browse-url "http://github.com/Malabarba/names")) (defun names--package-name () "Return the package name as a symbol. diff --git a/packages/rich-minority/rich-minority.el b/packages/rich-minority/rich-minority.el index 864b4d307..78a4166a8 100644 --- a/packages/rich-minority/rich-minority.el +++ b/packages/rich-minority/rich-minority.el @@ -5,7 +5,7 @@ ;; Author: Artur Malabarba ;; URL: https://github.com/Malabarba/rich-minority ;; Package-Requires: ((cl-lib "0.5")) -;; Version: 1.0 +;; Version: 1.0.1 ;; Keywords: mode-line faces ;;; Commentary: @@ -87,7 +87,7 @@ Please include your Emacs and rich-minority versions." (require 'lisp-mnt) (message "Your rm-version is: %s, and your emacs version is: %s.\nPlease include this in your report!" (lm-version "rich-minority.el") emacs-version) - (browse-url "https://github.com/Bruce-Connor/rich-minority/issues/new")) + (browse-url "https://github.com/Malabarba/rich-minority/issues/new")) (defun rm-customize () "Open the customization menu in the `rich-minority' group." (interactive) diff --git a/packages/transcribe/transcribe.el b/packages/transcribe/transcribe.el index 2f4f836eb..de9736e66 100644 --- a/packages/transcribe/transcribe.el +++ b/packages/transcribe/transcribe.el @@ -123,30 +123,6 @@ ([f12] . transcribe-xml-tag-l2)) ) -;;;; ChangeLog: - -;; 2015-11-30 David Gonzalez Gandara -;; -;; Added minor-mode function as suggested -;; -;; 2015-11-29 Stefan Monnier -;; -;; * transcribe.el: Add `provide' statement -;; -;; 2015-11-29 Stefan Monnier -;; -;; * transcribe.el: Fix up formatting and copyright -;; -;; 2015-11-29 David Gonzalez Gandara -;; -;; Added some usage information -;; -;; 2015-11-29 David Gonzalez Gandara -;; -;; Package transcribe added -;; - - (provide 'transcribe) ;;; transcribe.el ends here