[elpa] master c81ed19: packages/transcribe.el - minor bug corrections
branch: master commit c81ed193103fa7a66beaff73a98d045f642b462d Author: David Gonzalez Gandara Commit: David Gonzalez Gandara packages/transcribe.el - minor bug corrections --- packages/transcribe/transcribe.el | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/transcribe/transcribe.el b/packages/transcribe/transcribe.el index 48497b4..1ae4696 100644 --- a/packages/transcribe/transcribe.el +++ b/packages/transcribe/transcribe.el @@ -3,7 +3,7 @@ ;; Copyright 2014-2016 Free Software Foundation, Inc. ;; Author: David Gonzalez Gandara -;; Version: 1.5.0 +;; Version: 1.5.1 ;; 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 @@ -285,10 +285,11 @@ (transcribe-analyze number participant)) -(defun transcribe-xml-tag-person (xmltag) +(defun transcribe-xml-tag-person (xmltag move) "This function allows the automatic insetion of a speaker xml tag and places the cursor." - (interactive "stag:") - (insert (format "<%s move=\"\">" xmltag xmltag)) + (interactive (list(read-string "Person:")(completing-read "move:" transcribe-move-list))) + ;;(interactive "stag:") + (insert (format "<%s move=\"%s\">" xmltag move xmltag)) (backward-char 3) (backward-char (string-width xmltag))) @@ -311,7 +312,7 @@ (defun transcribe-add-attribute (att val) "Adds a xml attribute at cursor with the name and value specified (autocompletion possible)" - (interactive (list(completing-read "attibute name:" transcribe-attribute-list)(read-string "value:"))) + (interactive (list(completing-read "attribute name:" transcribe-attribute-list)(read-string "value:"))) (insert (format "%s=\"%s\"" att val))) (defun transcribe-add-attribute-function (val)
[elpa] branch externals/hyperbole created (now 5b7b3b3)
monnier pushed a change to branch externals/hyperbole. at 5b7b3b3 Removed -Z option This branch includes the following new commits: new 79812fd Release candidate for version 6.0. new 9a01af4 * .hypb: Added. Lost during initial commit to git. new 6154da5 Use gnu as elpa archive name. new deffc29 Add git ignore file. new 2525049 * MANIFEST: Eliminated hsite-ex.el and included hsite.el in distribution package. Users will use customizations now rather than direct editing of this file. new 83e2b8e * man/hyperbole.texi (Global Key Bindings): Changed from setting the value of hkey-init-override-local-keys in personal init file to using the customize-variable interface. new f6f4717 * hyperbole.el (hkey-override-local-bindings): Fixed case where an invalid key prefix is given and so local-key-binding returns a number rather than nil. new 991c75a * HY-README (Installation): * man/hyperbole.texi (Installation): Made elpa line match the default in Emacs so if it is already there, it won't be added again. new 465cba1 * man/hyperbole.texi: Fixed typos and improved explanations in parts. new 1cab0c6 * hyperbole-pkg.el (hyperbole): Version update in preparation for next release and rebuilt package. new c480343 Fixed one typo. new 64e0a5b * Makefile (help): Added as the default target, explaining major targets. new fbc772f * hibtypes.el (mail-address-regexp): Simplified and modernized address matching to better distinguish from @username social media references. (mail-address-mode-list): Added lisp-interaction-mode and fundamental-mode. (mail-address-tld-regexp): Added to match most common top-level domains to tell if a match is really an email address or not. (mail-address-at-p): Tightened by using mail-address-tld-regexp. DEMO (Emai [...] new 0205138 * hib-social.el (social-reference): hibtypes.el (mail-address-at-p): Let case-fold-search be t since mail-addresses are case-insensitive. new d81c13e .gitignore - added TAGS new 90026c9 * hsettings.el: Renamed this from hsite.el to prevent Hyperbole V4 users from accidentally loading it manually. new 1a85fe8 * hyperbole.el (hyperbole-koutliner group): Moved definition to ensure comes after hversion is loaded. new f65e50f * Makefile (release): Added this target to generate the kotl/kotl-autoloads.el file within the source tree. new b524cab * Makefile (release): Added this target to generate the kotl/kotl-autoloads.el file within the source tree. new 9e26ef4 * Updates from testing 'make release'. new e9a4319 * man/hyperbole.texi (Implicit Buttons): hib-social.el (social-reference): Improved doc for this ibtype. new f200f78 * hui-menu.el (infodock-hyperbole-menu): Commented out InfoDock manual reference out until InfoDock is modernized for Emacs 25. new 53ed881 Rename kotl autoloads and insert copyright notice new bf50f8d Generate new kotl-loaddefs.el new 51b7ce7 * Makefile (hyperbole-$(HYPB_VERSION).tar): Added HY-ABOUT and HY-ANNOUNCE to files installed outside the tar archive for reference. new 38b5534 Patch from Stefan Monnier. Thank you Stefan. new d956115 * README: Renamed this file from HY-README. Moved installation and invocationinstructions to "INSTALL" file. These changes were to eliminate releaseproblems with INSTALL and README being symbolic links. new 9205030 Merged changes from last 2 days. new 2f767bc Updated manual release date. new ee3d77d Removed hyperbole.readme.txt new 656b085 * hyperbole.el: Added Date: header with release date and updated date in man/version.texi used in hyperbole.texi. new b48739f Merged ChangeLog updates. new 033bba0 * hypb.el (hypb:rgrep-command): Removed -S option not supported by GNU/Linux. new 5b7b3b3 Removed -Z option
[elpa] master 7d4771a: * packages/hyperbole: New package
branch: master
commit 7d4771a880ed81bff2a6536fd39c8fa78a9551be
Author: Stefan Monnier
Commit: Stefan Monnier
* packages/hyperbole: New package
---
copyright_exceptions |1 +
externals-list |1 +
2 files changed, 2 insertions(+)
diff --git a/copyright_exceptions b/copyright_exceptions
index 272d7ac..f35c891 100644
--- a/copyright_exceptions
+++ b/copyright_exceptions
@@ -64,6 +64,7 @@
./ergoemacs-mode/ergoemacs-advices.el: emacs-copyright
./ergoemacs-mode/ergoemacs-themes.el: ,(lambda ()
emacs-copyright)
./gnugo/gnugo.el:(CP "Copyright" game simpletext)
+./hyperbole/hib-doc-id.el:;; Copyright:
./math-symbol-lists/math-symbol-lists.el:"columnsep" "columnseprule"
"columnwidth" "contentsline" "copyright"
./muse/htmlize-hack.el
./rudel/rudel-loaddefs.el
diff --git a/externals-list b/externals-list
index 1b65672..8a6c8fa 100644
--- a/externals-list
+++ b/externals-list
@@ -57,6 +57,7 @@
("ggtags" :subtree "https://github.com/leoliu/ggtags";)
("gnome-c-style" :subtree "https://github.com/ueno/gnome-c-style.git";)
("gnorb" :subtree "https://github.com/girzel/gnorb";)
+ ("hyperbole" :external
"http://git.savannah.gnu.org/r/hyperbole.git";)
("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")
[elpa] externals/hyperbole 81e8485: * hyperbole-pkg.el: Remove; autogenerated
branch: externals/hyperbole
commit 81e8485c32ab1bcdccf4a0348e9f770039acfe51
Author: Stefan Monnier
Commit: Stefan Monnier
* hyperbole-pkg.el: Remove; autogenerated
---
hyperbole-pkg.el |8
1 file changed, 8 deletions(-)
diff --git a/hyperbole-pkg.el b/hyperbole-pkg.el
deleted file mode 100644
index 85ced10..000
--- a/hyperbole-pkg.el
+++ /dev/null
@@ -1,8 +0,0 @@
-;; -*- no-byte-compile: t -*-
-(define-package "hyperbole" "6.0.1" "GNU Hyperbole: The Everyday Hypertextual
Information Manager"
- '((emacs "24.4"))
- :url "http://www.gnu.org/software/hyperbole";
- :keywords '("comm" "convenience" "files" "frames" "hypermedia" "languages"
- "mail" "matching" "mouse" "multimedia" "outlines" "tools" "wp"))
-
-(setq byte-compile-warnings '(not interactive-p find-tag))
[elpa] master ebda2a8: * ampc/ampc.el (ampc-views): Add "Search view"
branch: master
commit ebda2a848354c2d86ff60e012dd268c144548823
Author: Stefan Monnier
Commit: Stefan Monnier
* ampc/ampc.el (ampc-views): Add "Search view"
(ampc-search-mode-map, ampc-search-keywords): New var.
(ampc-search-mode): New major mode.
(ampc-post-mark-change-update, ampc-update, ampc-handle-command):
Handle `search' case.
(ampc-handle-search): New function.
(ampc-start-search): New command.
(ampc-buffer-name): New const.
(ampc): Use it.
---
packages/ampc/ampc.el | 73 +
1 file changed, 68 insertions(+), 5 deletions(-)
diff --git a/packages/ampc/ampc.el b/packages/ampc/ampc.el
index 7a28bc7..8134c5c 100644
--- a/packages/ampc/ampc.el
+++ b/packages/ampc/ampc.el
@@ -76,11 +76,11 @@
;; selected window for its window setup, customise `ampc-use-full-frame' to a
;; non-nil value.
;;
-;; ampc offers three independent views which expose different parts of the user
+;; ampc offers independent views which expose different parts of the user
;; interface. The current playlist view, the default view at startup, may be
;; accessed using the `J' key (that is `S-j'). The playlist view may be
;; accessed using the `K' key. The outputs view may be accessed by pressing
-;; `L'.
+;; `L'. The search view may be accessed using the `F' key (find).
;;; *** current playlist view
;; The playlist view looks like this:
@@ -161,6 +161,11 @@
;; MPD. To toggle the enabled property of the selected outputs, press `a'
;; (ampc-toggle-output-enabled) or `'.
+;;; *** search view
+;; The search view contains the result of the last performed search. You can
+;; start a new search with the `s' key while in the search view or use M-x
+;; ampc-start-search. Use the `a' key to add a song displayed in result list.
+
;;; ** tagger
;; To start the tagging subsystem, press `I' (ampc-tagger). This key binding
;; works in every buffer associated with ampc. First, the command tries to
@@ -521,7 +526,11 @@ modified."
(pl-prop '(:properties (("Title" :min 15 :max 40)
("Artist" :min 15 :max 40)
("Album" :min 15 :max 40)
- ("Time" :width 6)
+ ("Time" :width 6
+ (search-view '(1.0 search :properties (("Track" :title "#" :width 4)
+("Title" :min 15 :max 40)
+("Artist" :min 15 :max 40)
+("Album" :min 15 :max 40)
`((tagger
horizontal
(0.65 files-list
@@ -569,6 +578,13 @@ modified."
(0.4 playlist ,@pl-prop)
(1.0 playlists)))
,rs_b)
+ ("Search view"
+ ,(kbd "F")
+ horizontal
+ (0.4 vertical
+(6 status)
+(1.0 current-playlist ,@pl-prop))
+ ,search-view)
("Outputs view"
,(kbd "L")
outputs :properties (("outputname" :title "Name" :min 10 :max 30)
@@ -602,6 +618,7 @@ modified."
(defconst ampc-tagger-version "0.1")
(defconst ampc-tagger-tags '(Title Artist Album Comment Genre Year Track))
+(defconst ampc-buffer-name " *ampc*")
;;; *** mode maps
(defvar ampc-mode-map
@@ -696,6 +713,16 @@ modified."
(define-key map (kbd "") 'ampc-mouse-align-point)
map))
+(defvar ampc-search-mode-map
+ (let ((map (make-sparse-keymap)))
+(suppress-keymap map)
+(define-key map (kbd "a") 'ampc-add)
+(define-key map (kbd "s") 'ampc-start-search)
+(define-key map (kbd "") 'ampc-mouse-add)
+(define-key map (kbd "") 'ampc-mouse-align-point)
+map)
+ "Key map for search view")
+
(defvar ampc-outputs-mode-map
(let ((map (make-sparse-keymap)))
(suppress-keymap map)
@@ -732,6 +759,10 @@ modified."
(define-key map (kbd "C-c C-t") 'ampc-tagger-dired)
map))
+(defvar ampc-search-keywords
+ nil
+ "Ampc last performed search")
+
;;; menu
(easy-menu-define nil ampc-mode-map nil
`("ampc"
@@ -952,6 +983,7 @@ modified."
do (goto-char next)
(defmacro ampc-iterate-source-output (delimiter bindings pad-data &rest body)
+ "DELIMITER is the field that delimit command results in mpd response"
(declare (indent 2) (debug t))
`(let ((output-buffer (current-buffer))
(tags (cl-loop for (tag . props) in
@@ -985,6 +1017,8 @@ modified."
(define-derived-mode ampc-tag-song-mode ampc-item-mode "ampc-ts")
+(define-derived-mode ampc-search-mode ampc-item-mode "ampc-search")
+
(define-derived-mode ampc-current-playlist-mode ampc-playlist-mode "ampc-cpl"
(setq font-lock-defaults `(((ampc-find-current-song
(1 'ampc-current-song-mark-face)
@@ -1311,6 +1345,8 @@ modified."
((current-playlist playlist outputs))
(playlists
(ampc-update-playlist))
+(search
+ (message "Don't know what to do
[elpa] master a2f9d50: * ampc/ampc.el: Add current song time in status display
branch: master
commit a2f9d508d03787bca03649d58b4d050ab0d2be05
Author: Cédric Chépied
Commit: Stefan Monnier
* ampc/ampc.el: Add current song time in status display
(ampc-views): Increase size for `status'.
(ampc-status-timer): New var.
(ampc-status): Add optional `width' argument.
(ampc-fill-status): Use it.
(ampc-handle-current-song): Add "Time".
(ampc-handle-status): Add "elapsed"
(ampc-restart-status-timer, ampc-time-to-progress-bar)
(ampc-current-song-time): New functions.
(ampc-status): Use it.
(ampc-quit): Turn off ampc-status-timer.
(ampc): Turn on ampc-status-timer.
---
packages/ampc/ampc.el | 98 -
1 file changed, 88 insertions(+), 10 deletions(-)
diff --git a/packages/ampc/ampc.el b/packages/ampc/ampc.el
index 8134c5c..0710c70 100644
--- a/packages/ampc/ampc.el
+++ b/packages/ampc/ampc.el
@@ -548,21 +548,21 @@ modified."
,(kbd "J")
horizontal
(0.4 vertical
-(6 status)
+(10 status)
(1.0 current-playlist ,@pl-prop))
,rs_a)
("Current playlist view (Genre|Album|Artist)"
,(kbd "M")
horizontal
(0.4 vertical
-(6 status)
+(10 status)
(1.0 current-playlist ,@pl-prop))
,rs_b)
("Playlist view (Genre|Artist|Album)"
,(kbd "K")
horizontal
(0.4 vertical
-(6 status)
+(10 status)
(1.0 vertical
(0.4 current-playlist ,@pl-prop)
(0.4 playlist ,@pl-prop)
@@ -572,7 +572,7 @@ modified."
,(kbd "<")
horizontal
(0.4 vertical
-(6 status)
+(10 status)
(1.0 vertical
(0.4 current-playlist ,@pl-prop)
(0.4 playlist ,@pl-prop)
@@ -582,7 +582,7 @@ modified."
,(kbd "F")
horizontal
(0.4 vertical
-(6 status)
+(10 status)
(1.0 current-playlist ,@pl-prop))
,search-view)
("Outputs view"
@@ -610,6 +610,7 @@ modified."
(defvar ampc-internal-db nil)
(defvar ampc-status nil)
+(defvar ampc-status-timer nil)
(defvar ampc-tagger-previous-configuration nil)
(defvar ampc-tagger-version-verified nil)
@@ -1860,7 +1861,8 @@ modified."
(erase-buffer)
(funcall (or (plist-get (cadr ampc-type) :filler)
(lambda (_)
- (insert (ampc-status t) "\n")))
+ (insert (ampc-status t (window-width (get-buffer-window)))
+ "\n")))
ampc-status)
(ampc-set-dirty nil)))
@@ -2007,13 +2009,14 @@ modified."
(cl-callf2 assq-delete-all s ampc-status
(defun ampc-handle-current-song ()
- (ampc-fill-status-var (append ampc-status-tags '("Artist" "Title" "file")))
+ (ampc-fill-status-var (append ampc-status-tags
+'("Artist" "Title" "file" "Time")))
(ampc-fill-status)
(run-hook-with-args ampc-status-changed-hook ampc-status))
(defun ampc-handle-status ()
(ampc-fill-status-var '("volume" "repeat" "random" "consume" "xfade" "state"
- "song" "playlistlength"))
+ "song" "playlistlength" "elapsed"))
(ampc-with-buffer 'current-playlist
(if (fboundp 'font-lock-flush)
(font-lock-flush)
@@ -2811,7 +2814,71 @@ If ARG is omitted, use the selected entries in the
current buffer."
(ampc-with-selection arg
(ampc-add-impl)))
-(defun ampc-status (&optional no-print)
+(defun ampc-restart-status-timer ()
+ (when ampc-status-timer
+(cancel-timer ampc-status-timer)
+(setq ampc-status-timer nil))
+ (setq ampc-status-timer
+(run-at-time
+ nil
+ 0.9
+ (lambda ()
+ (when (ampc-on-p)
+ (ampc-send-command 'status))
+
+
+(defun ampc-time-to-progress-bar (elapsed total width)
+ "Creates a progess bar like this: |=>|
+ELAPSED is the number of seconds represented by '=' signs
+TOTAL is the number of seconds represented by the entire bar
+WIDTH is the max width of the bar. If < 2, 2 characters will be used anyway"
+ (setq width (- width 2)) ;; 2 characters for '||'
+
+ (let ((result "|"))
+(when (> width 0)
+ (let* ((e (/ (* elapsed width) total)) ;; number of '=' signs
+ (r (- width e))) ;; number of '-' signs
+(setq result (concat result
+ (make-string (max 0 (1- e)) ?=)
+ ">"
+ (make-string r ?-)
+
+(concat result "|")))
+
+(defun ampc-current-song-time (elapsed total width)
+ "Creates an ASCII representation of elapsed time of the current song.
+ELAPSED is the current time of the song in seconds
+TOTAL is the total time of the song in seconds
+WIDTH is the max desired length of the result"
+ (setq elapsed (truncate elapse
[elpa] master f28019a: * copyright_exceptions: Update for new ada-mode/ada-skel.el
branch: master
commit f28019a4529d914a4407057d904e4b143a661673
Author: Stefan Monnier
Commit: Stefan Monnier
* copyright_exceptions: Update for new ada-mode/ada-skel.el
---
copyright_exceptions |2 ++
1 file changed, 2 insertions(+)
diff --git a/copyright_exceptions b/copyright_exceptions
index f35c891..563cab3 100644
--- a/copyright_exceptions
+++ b/copyright_exceptions
@@ -2,9 +2,11 @@
./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: "-- 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: "Modified GPLv3 copyright/license skeleton, with
automatic year and owner."
./ada-mode/ada-skel.el: "{copyright_license}\n"
./ada-mode/ada-stmt.el
./ada-mode/ada-xref.el
[elpa] master f3c13e5: packages/transcribe.el: interface improvements
branch: master commit f3c13e5b8120cf8eabf97dce7a6d675fee217df9 Author: David Gonzalez Gandara Commit: David Gonzalez Gandara packages/transcribe.el: interface improvements --- packages/transcribe/transcribe.el | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/transcribe/transcribe.el b/packages/transcribe/transcribe.el index 1ae4696..47b7c4a 100644 --- a/packages/transcribe/transcribe.el +++ b/packages/transcribe/transcribe.el @@ -3,7 +3,7 @@ ;; Copyright 2014-2016 Free Software Foundation, Inc. ;; Author: David Gonzalez Gandara -;; Version: 1.5.1 +;; Version: 1.5.2 ;; 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 @@ -286,10 +286,10 @@ (defun transcribe-xml-tag-person (xmltag move) - "This function allows the automatic insetion of a speaker xml tag and places the cursor." + "This function allows the automatic insertion of a speaker xml tag and places the cursor." (interactive (list(read-string "Person:")(completing-read "move:" transcribe-move-list))) - ;;(interactive "stag:") - (insert (format "<%s move=\"%s\">" xmltag move xmltag)) + (end-of-line) + (insert (format "\n<%s move=\"%s\">" xmltag move xmltag)) (backward-char 3) (backward-char (string-width xmltag))) @@ -321,19 +321,21 @@ (insert (format "function=\"%s\"" val))) (defun transcribe-add-attribute-move (val) - "Adds the xml attribute `move' at cursor with the name specified (autocompletion possible" + "Adds the xml attribute `move' at cursor with the name specified (autocompletion possible)" (interactive (list(completing-read "move name:" transcribe-move-list))) (insert (format "move=\"%s\"" val))) (defun transcribe-xml-tag-l1 () "Inserts a l1 tag and places the cursor" (interactive) + (re-search-forward "" (line-end-position) t) (insert "") (backward-char 5)) (defun transcribe-xml-tag-l2 () "Inserts a l2 tag and places the cursor" (interactive) + (re-search-forward "" (line-end-position) t) (insert "") (backward-char 5))
