[elpa] externals/rt-liberation 86c41fb 13/15: * doc/developer-release.txt:
branch: externals/rt-liberation commit 86c41fb41f23fa6ac453d0af2ca7cbd11f581596 Author: Yoni Rabkin Commit: Yoni Rabkin * doc/developer-release.txt: --- doc/developer-release.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/doc/developer-release.txt b/doc/developer-release.txt index e15282c..ee5945d 100644 --- a/doc/developer-release.txt +++ b/doc/developer-release.txt @@ -27,12 +27,11 @@ Compile an HTML version of the manual and update it on the Website: Push these updates to the git repo. * tag -Tag the release with the ELPA version number: +Tag the release with the ELPA version number, then push that tag to +the VCS: $ git tag -a 2.00 -m "2.00" -Then push that tag to the VCS: - $ git push --tags origin "2.00" * ELPA
[elpa] externals/rt-liberation 2bbaa76 06/15: * rt-liberation.el: last communcation instead of section
branch: externals/rt-liberation
commit 2bbaa7641fbafdc07bea5d965d75cc2d2f831235
Author: Yoni Rabkin
Commit: Yoni Rabkin
* rt-liberation.el: last communcation instead of section
Make "N" jump to the last Comment, Create, or Correspond section,
instead of just the last section.
---
rt-liberation.el | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/rt-liberation.el b/rt-liberation.el
index 913bbeb..4ea72d1 100644
--- a/rt-liberation.el
+++ b/rt-liberation.el
@@ -246,6 +246,9 @@ This variable is made buffer local for the ticket history")
(defvar rt-liber-viewer2-section-regexp "^Ticket [0-9]+ by "
"Regular expression to match a section in the viewer.")
+(defvar rt-liber-viewer2-communicate-regexp (regexp-opt '("[Create]"
"[Correspond]" "[Comment]"))
+ "Regular expression to match ticket communication.")
+
(defvar rt-liber-viewer2-recenter 4
"Argument passed to `recenter' in the viewer.")
@@ -1535,14 +1538,14 @@ ASSOC-BROWSER if non-nil should be a ticket browser."
(recenter rt-liber-viewer2-recenter)))
(goto-char (point-at-bol
-(defun rt-liber-viewer2-last-section-in ()
+(defun rt-liber-viewer2-last-communicate-in ()
(interactive)
(goto-char (point-max))
- (let ((last (re-search-backward rt-liber-viewer2-section-regexp
+ (let ((last (re-search-backward rt-liber-viewer2-communicate-regexp
(point-min)
t)))
(if (not last)
- (error "no sections found")
+ (error "no communcations found")
(recenter rt-liber-viewer2-recenter)
(goto-char (point-at-bol)
@@ -1586,7 +1589,7 @@ ASSOC-BROWSER if non-nil should be a ticket browser."
(defconst rt-liber-viewer2-mode-map
(let ((map (make-sparse-keymap)))
(define-key map (kbd "q") 'rt-liber-viewer2-mode-quit)
-(define-key map (kbd "N") 'rt-liber-viewer2-last-section-in)
+(define-key map (kbd "N") 'rt-liber-viewer2-last-communicate-in)
(define-key map (kbd "n") 'rt-liber-viewer2-next-section-in)
(define-key map (kbd "p") 'rt-liber-viewer2-previous-section-in)
(define-key map (kbd "V") 'rt-liber-viewer-visit-in-browser)
[elpa] externals/rt-liberation ead59e7 12/15: * NEWS: news!
branch: externals/rt-liberation commit ead59e7abb222b775260237f201b15e4022920e4 Author: Yoni Rabkin Commit: Yoni Rabkin * NEWS: news! --- NEWS | 11 ++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 8932364..85900a0 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,15 @@ New in version 2.02 -* ... +* The new viewer now displays meaningful descriptors in + non-commincation sections. + +* New interactive function `rt-liber-display-ticket' asks for a + ticket number and does exactly what you think it does. + +* 'N' now jumps to the last comminication, as opposed to merely + the section. + +* Disable the sub-optimal filling in the new viewer. New in version 2.01
[elpa] externals/rt-liberation f404ae4 04/15: * rt-liberation.el: copyright year update
branch: externals/rt-liberation commit f404ae4f301899f71c232b6b0d8b6a0a49e8e560 Author: Yoni Rabkin Commit: Yoni Rabkin * rt-liberation.el: copyright year update --- rt-liberation.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rt-liberation.el b/rt-liberation.el index 92886c4..ab3c44f 100644 --- a/rt-liberation.el +++ b/rt-liberation.el @@ -1,6 +1,6 @@ ;;; rt-liberation.el --- Emacs interface to RT -*- lexical-binding: t; -*- -;; Copyright (C) 2008-2020 Free Software Foundation, Inc. +;; Copyright (C) 2008-2021 Free Software Foundation, Inc. ;; Author: Yoni Rabkin ;; Authors: Aaron S. Hawley , John Sullivan
[elpa] externals/rt-liberation 2bdd3d4 03/15: * NEWS:
branch: externals/rt-liberation commit 2bdd3d4e5393480b319eed2f64c8889db86a02a5 Author: Yoni Rabkin Commit: Yoni Rabkin * NEWS: --- NEWS | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 2490ea3..8932364 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,9 @@ -New in version ... +New in version 2.02 + +* ... + + +New in version 2.01 * Support getting REST credentials from auth-source.
[elpa] externals/rt-liberation fce45b0 02/15: * rt-liberation.el: disable filling for now
branch: externals/rt-liberation commit fce45b07db87680b982e3afd5df1a7806d41bcba Author: Yoni Rabkin Commit: Yoni Rabkin * rt-liberation.el: disable filling for now See explanation in previous commit. --- rt-liberation.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rt-liberation.el b/rt-liberation.el index 66570ee..92886c4 100644 --- a/rt-liberation.el +++ b/rt-liberation.el @@ -1421,9 +1421,9 @@ ASSOC-BROWSER if non-nil should be a ticket browser." (while (re-search-forward "^" (point-max) t) (replace-match "")) ;; fill -(let ((paragraph-separate ">[[:space:]]+$")) - (fill-region (point-min) - (point-max))) +;; (let ((paragraph-separate ">[[:space:]]+$")) +;; (fill-region (point-min) +;;(point-max))) ;; finally (buffer-substring (point-min) (point-max
[elpa] externals/rt-liberation updated (f682e7b -> 45d1798)
yonirabkin pushed a change to branch externals/rt-liberation. from f682e7b Merge branch 'master' into externals/rt-liberation new 0a24ff9 * rt-liberation.el: disable filling in viewer new fce45b0 * rt-liberation.el: disable filling for now new 2bdd3d4 * NEWS: new f404ae4 * rt-liberation.el: copyright year update new f77c1e4 * rt-liberation.el: new 2bbaa76 * rt-liberation.el: last communcation instead of section new eb21239 * rt-liberation-gnus.el: doc fix new 519184e * rt-liberation.el: new function `rt-liber-display-ticket' new d143f91 * rt-liberation.el: better descriptors new cc42b5e * rt-liberation.el: version bump new 0e2e19d * rt-liberation.el: solve macro compilation problem new ead59e7 * NEWS: news! new 86c41fb * doc/developer-release.txt: new f5d70db * rt-liberation.el: new way of versioning new 45d1798 Merge branch 'master' into externals/rt-liberation Summary of changes: NEWS | 16 ++- doc/developer-release.txt | 5 +- rt-liberation-gnus.el | 2 +- rt-liberation.el | 115 +- 4 files changed, 81 insertions(+), 57 deletions(-)
[elpa] externals/rt-liberation 45d1798 15/15: Merge branch 'master' into externals/rt-liberation
branch: externals/rt-liberation
commit 45d179825b397d688ef5f4629547522567f46436
Merge: f682e7b f5d70db
Author: Yoni Rabkin
Commit: Yoni Rabkin
Merge branch 'master' into externals/rt-liberation
---
NEWS | 16 ++-
doc/developer-release.txt | 5 +-
rt-liberation-gnus.el | 2 +-
rt-liberation.el | 115 +-
4 files changed, 81 insertions(+), 57 deletions(-)
diff --git a/NEWS b/NEWS
index 2490ea3..85900a0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,18 @@
-New in version ...
+New in version 2.02
+
+* The new viewer now displays meaningful descriptors in
+ non-commincation sections.
+
+* New interactive function `rt-liber-display-ticket' asks for a
+ ticket number and does exactly what you think it does.
+
+* 'N' now jumps to the last comminication, as opposed to merely
+ the section.
+
+* Disable the sub-optimal filling in the new viewer.
+
+
+New in version 2.01
* Support getting REST credentials from auth-source.
diff --git a/doc/developer-release.txt b/doc/developer-release.txt
index e15282c..ee5945d 100644
--- a/doc/developer-release.txt
+++ b/doc/developer-release.txt
@@ -27,12 +27,11 @@ Compile an HTML version of the manual and update it on the
Website:
Push these updates to the git repo.
* tag
-Tag the release with the ELPA version number:
+Tag the release with the ELPA version number, then push that tag to
+the VCS:
$ git tag -a 2.00 -m "2.00"
-Then push that tag to the VCS:
-
$ git push --tags origin "2.00"
* ELPA
diff --git a/rt-liberation-gnus.el b/rt-liberation-gnus.el
index 789e482..a9c53f0 100644
--- a/rt-liberation-gnus.el
+++ b/rt-liberation-gnus.el
@@ -208,7 +208,7 @@ OPTIONS association list of options.
(defun rt-liber-gnus-visit-ticket-at-point ()
- "Call `rt-liber-display-ticket' on this ticket."
+ "Display the ticket at point."
(interactive)
(save-excursion
(goto-char (point-at-bol))
diff --git a/rt-liberation.el b/rt-liberation.el
index 4ee51c9..a2b116a 100644
--- a/rt-liberation.el
+++ b/rt-liberation.el
@@ -1,11 +1,11 @@
;;; rt-liberation.el --- Emacs interface to RT -*- lexical-binding: t; -*-
-;; Copyright (C) 2008-2020 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2021 Free Software Foundation, Inc.
;; Author: Yoni Rabkin
;; Authors: Aaron S. Hawley , John Sullivan
;; Maintainer: Yoni Rabkin
-;; Version: 2.01
+;; Version: 2.2
;; Keywords: rt, tickets
;; Package-Type: multi
;; url: http://www.nongnu.org/rtliber/
@@ -246,6 +246,9 @@ This variable is made buffer local for the ticket history")
(defvar rt-liber-viewer2-section-regexp "^Ticket [0-9]+ by "
"Regular expression to match a section in the viewer.")
+(defvar rt-liber-viewer2-communicate-regexp (regexp-opt '("[Create]"
"[Correspond]" "[Comment]"))
+ "Regular expression to match ticket communication.")
+
(defvar rt-liber-viewer2-recenter 4
"Argument passed to `recenter' in the viewer.")
@@ -266,39 +269,40 @@ This variable is made buffer local for the ticket
history")
;;;
;;; TicketSQL compiler
;;;
-(defun rt-liber-bool-p (sym)
- "Return t if SYM is a boolean operator, otherwise nil."
- (member sym '(and or)))
-(defun rt-liber-attrib-p (sym)
- "Return t if SYM is a ticket attribute, otherwise nil."
- (member sym '(id owner status subject content queue lastupdatedby
- email-address)))
-(defun rt-liber-time-p (sym)
- "Return t if SYM is a temporal attribute, otherwise nil."
- (member sym '(created lastupdated resolved)))
-(defun rt-liber-negation-p (sym)
- (member sym '(not)))
-
-(defun rt-liber-reduce (op seq)
- "Reduce-OP with SEQ to a string of \"s0 op s1 op s2..\"."
- (if seq
- (cl-reduce
- #'(lambda (a b)
- (format "%s %s %s" a op b))
- seq)
-""))
-
-(defun rt-liber-make-interval (pred before after)
- "Return a formatted TicketSQL interval.
+(eval-and-compile ;; for use in macro `rt-liber-compile-query'
+ (defun rt-liber-bool-p (sym)
+"Return t if SYM is a boolean operator, otherwise nil."
+(member sym '(and or)))
+ (defun rt-liber-attrib-p (sym)
+"Return t if SYM is a ticket attribute, otherwise nil."
+(member sym '(id owner status subject content queue lastupdatedby
+email-address)))
+ (defun rt-liber-time-p (sym)
+"Return t if SYM is a temporal attribute, otherwise nil."
+(member sym '(created lastupdated resolved)))
+ (defun rt-liber-negation-p (sym)
+(member sym '(not)))
+
+ (defun rt-liber-reduce (op seq)
+"Reduce-OP with SEQ to a string of \"s0 op s1 op s2..\"."
+(if seq
+ (cl-reduce
+#'(lambda (a b)
+(format "%s %s %s" a op b))
+seq)
+ ""))
+
+ (defun rt-liber-make-interval (pred before after)
+"Return a formatted TicketSQL
[elpa] externals/rt-liberation 0e2e19d 11/15: * rt-liberation.el: solve macro compilation problem
branch: externals/rt-liberation commit 0e2e19d2d12154ede1a9f9581a9c26a8ffca86b8 Author: Yoni Rabkin Commit: Yoni Rabkin * rt-liberation.el: solve macro compilation problem --- rt-liberation.el | 80 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/rt-liberation.el b/rt-liberation.el index 38761da..73a6c0a 100644 --- a/rt-liberation.el +++ b/rt-liberation.el @@ -269,39 +269,40 @@ This variable is made buffer local for the ticket history") ;;; ;;; TicketSQL compiler ;;; -(defun rt-liber-bool-p (sym) - "Return t if SYM is a boolean operator, otherwise nil." - (member sym '(and or))) -(defun rt-liber-attrib-p (sym) - "Return t if SYM is a ticket attribute, otherwise nil." - (member sym '(id owner status subject content queue lastupdatedby - email-address))) -(defun rt-liber-time-p (sym) - "Return t if SYM is a temporal attribute, otherwise nil." - (member sym '(created lastupdated resolved))) -(defun rt-liber-negation-p (sym) - (member sym '(not))) - -(defun rt-liber-reduce (op seq) - "Reduce-OP with SEQ to a string of \"s0 op s1 op s2..\"." - (if seq - (cl-reduce - #'(lambda (a b) - (format "%s %s %s" a op b)) - seq) -"")) - -(defun rt-liber-make-interval (pred before after) - "Return a formatted TicketSQL interval. +(eval-and-compile ;; for use in macro `rt-liber-compile-query' + (defun rt-liber-bool-p (sym) +"Return t if SYM is a boolean operator, otherwise nil." +(member sym '(and or))) + (defun rt-liber-attrib-p (sym) +"Return t if SYM is a ticket attribute, otherwise nil." +(member sym '(id owner status subject content queue lastupdatedby +email-address))) + (defun rt-liber-time-p (sym) +"Return t if SYM is a temporal attribute, otherwise nil." +(member sym '(created lastupdated resolved))) + (defun rt-liber-negation-p (sym) +(member sym '(not))) + + (defun rt-liber-reduce (op seq) +"Reduce-OP with SEQ to a string of \"s0 op s1 op s2..\"." +(if seq + (cl-reduce +#'(lambda (a b) +(format "%s %s %s" a op b)) +seq) + "")) + + (defun rt-liber-make-interval (pred before after) +"Return a formatted TicketSQL interval. PRED temporal attribute predicate. BEFORE date before predicate. AFTER date after predicate." - (when (string= before "") (setq before nil)) - (when (string= after "") (setq after nil)) - (concat - (if before (format "%s < '%s'" pred before) "") - (if (and before after) (format " AND ") "") - (if after (format "%s > '%s'" pred after) ""))) +(when (string= before "") (setq before nil)) +(when (string= after "") (setq after nil)) +(concat + (if before (format "%s < '%s'" pred before) "") + (if (and before after) (format " AND ") "") + (if after (format "%s > '%s'" pred after) "" (defmacro rt-liber-compile-query (query n) "Compile sexp-based QUERY into TicketSQL." @@ -493,15 +494,6 @@ AFTER date after predicate." (error "null field symbol")) (cdr (assoc field-symbol rt-liber-field-dictionary))) -(defun rt-liber-display-ticket (ticket-number) - "Display ticket with TICKET-NUMBER." - (interactive "nticket number: ") - (let ((ticket-id (number-to-string ticket-number))) -(rt-liber-browse-query - (rt-liber-compile-query - (id ticket-id)) - (concat "#" ticket-id - ;;; ;;; Ticket browser @@ -1449,7 +1441,6 @@ ASSOC-BROWSER if non-nil should be a ticket browser." (desc (alist-get 'Description section)) (oldvalue (alist-get 'OldValue section)) (newvalue (alist-get 'NewValue section)) - (field (alist-get 'Field section)) (s-content (rt-liber-viewer2-format-content (alist-get 'Content section (when (not (or (string= type "CommentEmailRecord") @@ -1623,6 +1614,15 @@ ASSOC-BROWSER if non-nil should be a ticket browser." (lambda ( _noconfirm) 'slow)) (run-hooks 'rt-liber-viewer-hook)) +(defun rt-liber-display-ticket (ticket-number) + "Display ticket with TICKET-NUMBER." + (interactive "nticket number: ") + (let ((ticket-id (number-to-string ticket-number))) +(rt-liber-browse-query + (rt-liber-compile-query + (id ticket-id)) + (concat "#" ticket-id + (provide 'rt-liberation)
[elpa] externals/rt-liberation f5d70db 14/15: * rt-liberation.el: new way of versioning
branch: externals/rt-liberation commit f5d70db774273650707ad10f2a18bb3b27f00a3c Author: Yoni Rabkin Commit: Yoni Rabkin * rt-liberation.el: new way of versioning Since elpa will mangle it to be that way regardless of what I name it. --- rt-liberation.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rt-liberation.el b/rt-liberation.el index 73a6c0a..a2b116a 100644 --- a/rt-liberation.el +++ b/rt-liberation.el @@ -5,7 +5,7 @@ ;; Author: Yoni Rabkin ;; Authors: Aaron S. Hawley , John Sullivan ;; Maintainer: Yoni Rabkin -;; Version: 2.02 +;; Version: 2.2 ;; Keywords: rt, tickets ;; Package-Type: multi ;; url: http://www.nongnu.org/rtliber/
[elpa] externals/rt-liberation 519184e 08/15: * rt-liberation.el: new function `rt-liber-display-ticket'
branch: externals/rt-liberation commit 519184e7e7816f775c47d86ba1fdf2e8c7afea91 Author: Yoni Rabkin Commit: Yoni Rabkin * rt-liberation.el: new function `rt-liber-display-ticket' --- rt-liberation.el | 9 + 1 file changed, 9 insertions(+) diff --git a/rt-liberation.el b/rt-liberation.el index 4ea72d1..40c11cc 100644 --- a/rt-liberation.el +++ b/rt-liberation.el @@ -493,6 +493,15 @@ AFTER date after predicate." (error "null field symbol")) (cdr (assoc field-symbol rt-liber-field-dictionary))) +(defun rt-liber-display-ticket (ticket-number) + "Display ticket with TICKET-NUMBER." + (interactive "nticket number: ") + (let ((ticket-id (number-to-string ticket-number))) +(rt-liber-browse-query + (rt-liber-compile-query + (id ticket-id)) + (concat "#" ticket-id + ;;; ;;; Ticket browser
[elpa] externals/rt-liberation eb21239 07/15: * rt-liberation-gnus.el: doc fix
branch: externals/rt-liberation commit eb21239bc048090c2e3603e1645608dfe8317c43 Author: Yoni Rabkin Commit: Yoni Rabkin * rt-liberation-gnus.el: doc fix --- rt-liberation-gnus.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rt-liberation-gnus.el b/rt-liberation-gnus.el index 789e482..a9c53f0 100644 --- a/rt-liberation-gnus.el +++ b/rt-liberation-gnus.el @@ -208,7 +208,7 @@ OPTIONS association list of options. (defun rt-liber-gnus-visit-ticket-at-point () - "Call `rt-liber-display-ticket' on this ticket." + "Display the ticket at point." (interactive) (save-excursion (goto-char (point-at-bol))
[elpa] externals/rt-liberation f77c1e4 05/15: * rt-liberation.el:
branch: externals/rt-liberation commit f77c1e495a44272c7936f958e6af631a42295dd1 Author: Yoni Rabkin Commit: Yoni Rabkin * rt-liberation.el: --- rt-liberation.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rt-liberation.el b/rt-liberation.el index ab3c44f..913bbeb 100644 --- a/rt-liberation.el +++ b/rt-liberation.el @@ -1056,8 +1056,8 @@ ASSOC-BROWSER if non-nil should be a ticket browser." (let (latest-point) (save-excursion (goto-char (point-max)) - (when (re-search-backward rt-liber-correspondence-regexp - (point-min) t) + (when (re-search-backward +rt-liber-correspondence-regexp (point-min) t) (setq latest-point (point (if latest-point (progn
[elpa] externals/rt-liberation 0a24ff9 01/15: * rt-liberation.el: disable filling in viewer
branch: externals/rt-liberation commit 0a24ff91660feb188aacf54afa62ea246e6f6836 Author: Yoni Rabkin Commit: Yoni Rabkin * rt-liberation.el: disable filling in viewer The text is going through too many changes from the client's mail system to RT and then to rt-liberation. A lot more work would be required to get it to play nice with filling. --- rt-liberation.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rt-liberation.el b/rt-liberation.el index 4ee51c9..66570ee 100644 --- a/rt-liberation.el +++ b/rt-liberation.el @@ -1405,9 +1405,9 @@ ASSOC-BROWSER if non-nil should be a ticket browser." (while (re-search-forward "^ " (point-max) t) (replace-match "")) ;; fill - (let ((paragraph-separate ">[[:space:]]+$")) - (fill-region (point-min) -(point-max))) + ;; (let ((paragraph-separate ">[[:space:]]+$")) + ;; (fill-region (point-min) + ;;(point-max))) ;; finally (buffer-substring (point-min) (point-max)
[elpa] externals/rt-liberation d143f91 09/15: * rt-liberation.el: better descriptors
branch: externals/rt-liberation commit d143f911f8e8c442da505cda25cdf30b17b09ec3 Author: Yoni Rabkin Commit: Yoni Rabkin * rt-liberation.el: better descriptors Use the Description field for non-communication sections. --- rt-liberation.el | 13 ++--- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/rt-liberation.el b/rt-liberation.el index 40c11cc..6c1da8d 100644 --- a/rt-liberation.el +++ b/rt-liberation.el @@ -1446,6 +1446,7 @@ ASSOC-BROWSER if non-nil should be a ticket browser." (creator (alist-get 'Creator section)) (date (alist-get 'Created section)) (type (alist-get 'Type section)) + (desc (alist-get 'Description section)) (oldvalue (alist-get 'OldValue section)) (newvalue (alist-get 'NewValue section)) (field (alist-get 'Field section)) @@ -1476,14 +1477,12 @@ ASSOC-BROWSER if non-nil should be a ticket browser." (add-text-properties start (point) `(rt-liberation-section-data ,section)) - (cond ((string= type "Status") + (cond ((or (string= type "Status") +(string= type "SetWatcher") +(string= type "Set") +(string= type "AddLink")) (insert - (format "\nStatus change from %s to %s\n\n" oldvalue newvalue))) - ((and (string= type "Set") - (string= field "Owner") - (string= oldvalue "10")) -(insert - (format "\nTicket assigned\n\n"))) + (format "\n%s\n\n" desc))) ;; catch-all (t (insert
[elpa] externals/rt-liberation cc42b5e 10/15: * rt-liberation.el: version bump
branch: externals/rt-liberation commit cc42b5eb3b5d8af4df42c7a4cecbf647ffc89b68 Author: Yoni Rabkin Commit: Yoni Rabkin * rt-liberation.el: version bump --- rt-liberation.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rt-liberation.el b/rt-liberation.el index 6c1da8d..38761da 100644 --- a/rt-liberation.el +++ b/rt-liberation.el @@ -5,7 +5,7 @@ ;; Author: Yoni Rabkin ;; Authors: Aaron S. Hawley , John Sullivan ;; Maintainer: Yoni Rabkin -;; Version: 2.01 +;; Version: 2.02 ;; Keywords: rt, tickets ;; Package-Type: multi ;; url: http://www.nongnu.org/rtliber/
[elpa] externals/xr 647dbaa 1/2: Don't complain about (? (+ X))
branch: externals/xr
commit 647dbaad55d661d89270c4c4c07820953ff61681
Author: Mattias Engdegård
Commit: Mattias Engdegård
Don't complain about (? (+ X))
An optional repetition where the repetition is one-or-more isn't
ambiguous, and was just seen in the wild.
Previously, we only suppressed the warning if there was a group around
the repetition.
---
xr-test.el | 2 ++
xr.el | 88 ++
2 files changed, 44 insertions(+), 46 deletions(-)
diff --git a/xr-test.el b/xr-test.el
index 90e5be2..2d5d885 100644
--- a/xr-test.el
+++ b/xr-test.el
@@ -388,6 +388,8 @@
'((2 . "Repetition of option")
(14 . "Repetition of repetition")
(25 . "Repetition of repetition"
+(should (equal (xr-lint "\\(?:a+\\)?")
+ nil))
(should (equal (xr-lint "\\(a*\\)*\\(b+\\)*\\(c*\\)?\\(d+\\)?")
'((6 . "Repetition of repetition")
(13 . "Repetition of repetition")
diff --git a/xr.el b/xr.el
index f3ffdb8..6b080e1 100644
--- a/xr.el
+++ b/xr.el
@@ -546,53 +546,49 @@ like (* (* X) ... (* X))."
(let ((operator (match-string 0))
(operand (car sequence)))
(when warnings
- (cond
- ((and (consp operand)
- (or
- ;; (* (* X)), for any repetitions *
- (memq (car operand)
-'(opt zero-or-more one-or-more +? *? ??))
- ;; (* (group (* X))), for any repetitions *
- (and
- (eq (car operand) 'group)
- (null (cddr operand))
- (let ((inner (cadr operand)))
- (and (consp inner)
- (memq (car inner)
-'(opt zero-or-more one-or-more
- +? *? ??))
- ;; Except (? (group (+ X))), since that may
- ;; be legitimate.
- (not (and (equal operator "?")
-(memq (car inner)
- '(one-or-more +?)
-(let ((outer-opt (member operator '("?" "??")))
- (inner-opt (or (memq (car operand) '(opt ??))
- (and (eq (car operand) 'group)
- (memq (caadr operand)
-'(opt ??))
- (xr--report warnings (match-beginning 0)
- (if outer-opt
+ ;; Check both (OP (OP X)) and (OP (group (OP X))).
+ (let ((inner-op
+ (and (consp operand)
+ (if (eq (car operand) 'group)
+ (and (null (cddr operand))
+ (let ((inner (cadr operand)))
+ (and (consp inner)
+ (car inner
+(car operand)
+(cond
+ ((and
+ ;; (OP1 (OP2 X)), for any repetitions OP1, OP2
+ (memq inner-op '(opt zero-or-more one-or-more *? +? ??))
+ ;; Except (? (+ X)) which may be legitimate.
+ (not (and (equal operator "?")
+ (consp operand)
+ (memq inner-op '(one-or-more +?)
+ (let ((outer-opt (member operator '("?" "??")))
+(inner-opt (memq inner-op '(opt ??
+(xr--report warnings (match-beginning 0)
+(if outer-opt
+(if inner-opt
+"Optional option"
+ "Optional repetition")
(if inner-opt
- "Optional option"
-"Optional repetition")
-(if inner-opt
-"Repetition of option"
- "Repetition of repetition")
- ((memq operand xr--zero-width-assertions)
-(xr--report warnings (match-beginning 0)
-(if (member operator '("?" "??"))
-"Optional zero-width assertion"
- "Repetition of
[elpa] externals/xr updated (2a82e8d -> 2889b88)
mattiase pushed a change to branch externals/xr. from 2a82e8d Increment version to 1.20 new 647dbaa Don't complain about (? (+ X)) new 2889b88 Increment version to 1.21 Summary of changes: xr-test.el | 2 ++ xr.el | 92 ++ 2 files changed, 47 insertions(+), 47 deletions(-)
[elpa] externals/xr 2889b88 2/2: Increment version to 1.21
branch: externals/xr commit 2889b88cab47109f8ddadf1d2c67cac6a46c9420 Author: Mattias Engdegård Commit: Mattias Engdegård Increment version to 1.21 --- xr.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xr.el b/xr.el index 6b080e1..d43a795 100644 --- a/xr.el +++ b/xr.el @@ -3,7 +3,7 @@ ;; Copyright (C) 2019-2020 Free Software Foundation, Inc. ;; Author: Mattias Engdegård -;; Version: 1.20 +;; Version: 1.21 ;; Package-Requires: ((emacs "26.1")) ;; URL: https://github.com/mattiase/xr ;; Keywords: lisp, regexps @@ -29,6 +29,8 @@ ;;; News: +;; Version 1.21: +;; - Suppress false complaint about (? (+ X)) ;; Version 1.20: ;; - Fix duplication removal in character alternatives, like [aaa] ;; - All diagnostics are now described in the README file
