[elpa] externals/el-job 5fcadfaf96: Release version 2.4.1

[ELPA Syncer]

branch: externals/el-job
commit 5fcadfaf967afd6bf4e2cc0c64576f72c4b9cf65
Author: Martin Edström 
Commit: Martin Edström 

Release version 2.4.1
---
 el-job.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/el-job.el b/el-job.el
index 0244d96fe6..f48c219c45 100644
--- a/el-job.el
+++ b/el-job.el
@@ -19,7 +19,7 @@
 ;; URL:  https://github.com/meedstrom/el-job
 ;; Created:  2024-10-30
 ;; Keywords: processes
-;; Package-Version:  2.4.0
+;; Package-Version:  2.4.1
 ;; Package-Requires: ((emacs "29.1"))
 
 ;;; Commentary:

[nongnu] elpa/dirvish 5a3cf2b0a6: refactor: set `window-size-fixed` during redisplay (#317 #329)

[ELPA Syncer]

branch: elpa/dirvish
commit 5a3cf2b0a655c841a492f59fd1af4bbb1e6857f5
Author: Alex Lu 
Commit: Alex Lu 

refactor: set `window-size-fixed` during redisplay (#317 #329)

This patch prevents *zoom-mode* from altering the initial width of
the *dirvish-side* window.

However, enabling `zoom-mode` currently disrupts the window layout (defined 
by
`dirvish-default-layout` and `dirvish-layout-recipes`) in a full-frame
Dirvish. There is no simple solution to this because `zoom--update`
unconditionally calls `balance-windows`.

Ref: https://github.com/cyrus-and/zoom/issues/40
Ref: https://github.com/cyrus-and/zoom/issues/45

closes: #317
closes: #329
---
 dirvish.el |  9 -
 extensions/dirvish-side.el | 23 +++
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/dirvish.el b/dirvish.el
index 9bdee60bd4..641c8b58b4 100644
--- a/dirvish.el
+++ b/dirvish.el
@@ -1108,7 +1108,9 @@ Optionally, use CURSOR as the enabled cursor type."
 (defun dirvish-pre-redisplay-h (window)
   "Record root WINDOW and redisplay sessions in selected frame."
   (setq dirvish--selected-window (frame-selected-window))
-  (when-let* ((dv (dirvish-curr))) (setf (dv-root-window dv) window))
+  (let* ((dv (dirvish-curr)) (lyt (dv-curr-layout dv)) (sf (dv-size-fixed dv)))
+(setf (dv-root-window dv) window)
+(when (and (not lyt) sf) (setq window-size-fixed sf)))
   (dirvish--redisplay))
 
 (defun dirvish-post-command-h ()
@@ -1377,14 +1379,11 @@ Dirvish sets `revert-buffer-function' to this function."
  (lh (line-pixel-height)) (gui? (display-graphic-p))
  (mh (dirvish--mode-line-height t)) (hh (dirvish--mode-line-height t 
t)))
 (setf (dv-index dv) (cons (dirvish-prop :root) (current-buffer)))
-;; only record window config before creating fullframe layout
+;; only refresh window config before creating fullframe layout
 (setf (dv-winconf dv) (when layout (or conf 
(current-window-configuration
-;; `dired' and `dired-jump' delete the old root window, so reset it
-(setf (dv-root-window dv) (selected-window))
 (when layout (dirvish--init-special-buffers dv))
 (dirvish--setup-mode-line dv)
 (when w-order (let ((ignore-window-parameters t)) (delete-other-windows)))
-(when-let* ((fixed (dv-size-fixed dv))) (setq window-size-fixed fixed))
 (when (or (dv-curr-layout dv) (dv-dedicated dv))
   (set-window-dedicated-p nil t))
 ;; ensure a positive fringe on both sides for `dirvish-subtree' (#311)
diff --git a/extensions/dirvish-side.el b/extensions/dirvish-side.el
index 7c8c5d10dd..0b6e65c33d 100644
--- a/extensions/dirvish-side.el
+++ b/extensions/dirvish-side.el
@@ -70,6 +70,7 @@ filename until the project root when opening a side session."
   "Create root window of DV according to `dirvish-side-display-alist'."
   (let* ((buf (with-current-buffer (get-buffer-create " *dirvish-temp*")
 ;; set the :dv prop for `dirvish-curr'
+(setq window-size-fixed 'width)
 (dirvish-prop :dv (dv-id dv))
 (current-buffer)))
  (win (display-buffer-in-side-window
@@ -136,18 +137,16 @@ filename until the project root when opening a side 
session."
 
 (defun dirvish-side--new (path)
   "Open a side session in PATH."
-  (let* ((bname buffer-file-name)
- (dv (or (dirvish--get-session 'type 'side)
- (dirvish--new
-  :type 'side
-  :size-fixed 'width
-  :dedicated t
-  :root-conf #'dirvish-side-root-conf
-  :root-window-fn #'dirvish-side-root-window-fn
-  :open-file #'dirvish-side-open-file)))
- (r-win (dv-root-window dv)))
-(setq r-win (dirvish--create-root-window dv))
-(with-selected-window r-win
+  (let ((bname buffer-file-name)
+(dv (or (dirvish--get-session 'type 'side)
+(dirvish--new
+ :type 'side
+ :size-fixed 'width
+ :dedicated t
+ :root-conf #'dirvish-side-root-conf
+ :root-window-fn #'dirvish-side-root-window-fn
+ :open-file #'dirvish-side-open-file
+(with-selected-window (dirvish--create-root-window dv)
   (dirvish--find-entry 'find-alternate-file path)
   (cond ((not bname) nil)
 (dirvish-side-auto-expand

[elpa] externals/org-modern 0e0756f319: org-habit progress graph prettification

[ELPA Syncer]

branch: externals/org-modern
commit 0e0756f319c637abf424cef96ee35617a7d8c320
Author: Daniel Mendler 
Commit: Daniel Mendler 

org-habit progress graph prettification
---
 CHANGELOG.org |  1 +
 org-modern.el | 47 +++
 2 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.org b/CHANGELOG.org
index 7906603cca..5789ecb364 100644
--- a/CHANGELOG.org
+++ b/CHANGELOG.org
@@ -6,6 +6,7 @@
 
 - Fix fontification of ellipsis.
 - Check that ~org-modern-label-border~ is an integer.
+- Add ~org-modern-habit~ face to improve habit progress fontification.
 
 * Version 1.6 (2024-12-22)
 
diff --git a/org-modern.el b/org-modern.el
index 47cc97b50a..22b3cba928 100644
--- a/org-modern.el
+++ b/org-modern.el
@@ -284,6 +284,9 @@ on their font, e.g., the :width or :height parameters.  
Themes
 should not override this face, since themes usually don't control
 the font.")
 
+(defface org-modern-habit nil
+  "Parent face for habits.")
+
 (defface org-modern-block-name
   '((t :height 0.8 :weight light))
   "Face used for block keywords.")
@@ -659,7 +662,7 @@ whole buffer; otherwise, for the line at point."
(face-attribute 'org-modern-label :box nil t
 (unless (equal (and (listp box) (plist-get box :color))
(face-attribute 'default :background nil t))
-  (org-modern--update-label-face)))
+  (org-modern--update-faces)))
   (let ((face-remapping-alist
  `((default org-table
 ,@(or (ensure-list (cdr (assq 'default face-remapping-alist)))
@@ -668,24 +671,22 @@ whole buffer; otherwise, for the line at point."
 (setq org-modern--table-sp-width (default-font-width)))
   (setf (cadr org-modern--table-overline) (face-attribute 'org-table 
:foreground nil t)))
 
-(defun org-modern--update-label-face ()
+(defun org-modern--update-faces ()
   "Update border of the `org-modern-label' face."
-  (set-face-attribute
-   'org-modern-label nil
-   :box
-   (when org-modern-label-border
- (let ((border (if (integerp org-modern-label-border)
-   org-modern-label-border
- (max 2 (cond
- ((integerp line-spacing)
-  line-spacing)
- ((floatp line-spacing)
-  (ceiling (* line-spacing (frame-char-height
- (t (/ (frame-char-height) 10)))
-   (list :color (face-attribute 'default :background nil t)
- :line-width (cons -1 (- border)))
-
-(defun org-modern--update-fringe-bitmaps ()
+  (let* ((border (if (integerp org-modern-label-border)
+ org-modern-label-border
+   (max 2 (cond
+   ((integerp line-spacing)
+line-spacing)
+   ((floatp line-spacing)
+(ceiling (* line-spacing (frame-char-height
+   (t (/ (frame-char-height) 10))
+ (box (list :color (face-attribute 'default :background nil t)
+:line-width (cons -1 (- border)
+(set-face-attribute 'org-modern-label nil :box box)
+(set-face-attribute 'org-modern-habit nil :box box)))
+
+(defun org-modern--update-bitmaps ()
   "Update fringe bitmaps."
   (when (and org-modern-block-fringe
  (fboundp 'fringe-bitmap-p)
@@ -860,8 +861,8 @@ whole buffer; otherwise, for the line at point."
 (add-hook 'org-after-demote-entry-hook #'org-modern--unfontify-line nil 
'local)
 (when (eq org-modern-star 'fold)
   (add-hook 'org-cycle-hook #'org-modern--cycle nil 'local))
-(org-modern--update-label-face)
-(org-modern--update-fringe-bitmaps))
+(org-modern--update-faces)
+(org-modern--update-bitmaps))
(t
 (remove-from-invisibility-spec 'org-modern)
 (font-lock-remove-keywords nil org-modern--font-lock-keywords)
@@ -898,6 +899,12 @@ whole buffer; otherwise, for the line at point."
   (remove-from-invisibility-spec 'org-modern)
   (add-to-invisibility-spec 'org-modern) ;; Not idempotent?!
   (add-hook 'pre-redisplay-functions #'org-modern--pre-redisplay nil 'local)
+  (setq-local face-remapping-alist (copy-tree face-remapping-alist))
+  (maphash (lambda (face _spec)
+ (when (string-prefix-p "org-habit-" (symbol-name face))
+   (setf (alist-get face face-remapping-alist nil 'remove)
+ (and org-modern-label-border `(org-modern-habit ,face)
+   face--new-frame-defaults)
   (save-excursion
 (save-match-data
   (let (case-fold-search)

[elpa] externals/emms 338462506d 5/6: bump to version 22

[ELPA Syncer]

branch: externals/emms
commit 338462506d7de508f7f74a01d15753f9113cd3cb
Author: Yoni Rabkin 
Commit: Yoni Rabkin 

bump to version 22
---
 AUTHORS| 2 +-
 NEWS   | 9 +
 emms-volume-mpv.el | 2 ++
 emms-volume.el | 2 +-
 emms.el| 6 +++---
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index fd9f57c13d..95cf0e5b38 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -43,6 +43,7 @@ Ye Wenbin  
 Yoni (Johnathan) Rabkin  
 mathias.dahl
 Rasmus Pank Roulund  
+Richard Sent
 Sean McAfee  
 ZHANG Weiyi 
 Mike Kazantsev   
@@ -76,7 +77,6 @@ Mandar Mitra
 Maxim Cournoyer
 Pavel Korytov
 Rehan Daphedar
-Richard Sent
 Rufus Segar  
 Ryan Van Wagoner
 Sascha Wilde
diff --git a/NEWS b/NEWS
index d450a5b3a4..865ff199ec 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+New in 22
+
+* emms-volume-mpv.el: raise or lower the volume of mpv (new file).
+* emms-player-mpd.el: Match HTTPS URLs in MPD player.
+* emms-mode-line.el: Use character width to display the track description.
+* emms-info-exiftool.el: ensure numeric album titles and info are strings.
+* Exanded documentation for playlist lock functions.
+
+
 New in 21
 
 * emms.el: new function `emms-playlist-length' and 
`emms-playlist-total-playing-time'.
diff --git a/emms-volume-mpv.el b/emms-volume-mpv.el
index 3be993f152..debb26a9fa 100644
--- a/emms-volume-mpv.el
+++ b/emms-volume-mpv.el
@@ -1,5 +1,7 @@
 ;;; emms-volume-mpv.el --- Volume function to adjust mpv volume easily  -*- 
lexical-binding: t; -*-
 
+;; Copyright (C) 2025  Free Software Foundation, Inc.
+
 ;; Author: Richard Sent 
 
 ;; This file is part of EMMS.
diff --git a/emms-volume.el b/emms-volume.el
index dffae71994..8d15766a41 100644
--- a/emms-volume.el
+++ b/emms-volume.el
@@ -1,6 +1,6 @@
 ;;; emms-volume.el --- Volume functions and a minor mode to adjust volume 
easily  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2006-2023  Free Software Foundation, Inc.
+;; Copyright (C) 2006-2023, 2025  Free Software Foundation, Inc.
 
 ;; Author: Martin Schoenmakers 
 ;; Bruno Félix Rezende Ribeiro 
diff --git a/emms.el b/emms.el
index 1308264d8f..40c167785e 100644
--- a/emms.el
+++ b/emms.el
@@ -1,10 +1,10 @@
 ;;; emms.el --- The Emacs Multimedia System  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2003-2022  Free Software Foundation, Inc.
+;; Copyright (C) 2003-2025  Free Software Foundation, Inc.
 
 ;; Author: Jorgen Schäfer , the Emms developers (see AUTHORS 
file)
 ;; Maintainer: Yoni Rabkin 
-;; Version: 21
+;; Version: 22
 ;; Keywords: emms, mp3, ogg, flac, music, mpeg, video, multimedia
 ;; Package-Type: multi
 ;; Package-Requires: ((cl-lib "0.5") (nadvice "0.3") (seq))
@@ -46,7 +46,7 @@
 (require 'emms-compat)
 (require 'seq)
 
-(defvar emms-version "21"
+(defvar emms-version "22"
   "EMMS version string.")
 
 ;;; User Customization

[elpa] externals/emms updated (7e51080b09 -> 8713a0ee98)

[ELPA Syncer]

elpasync pushed a change to branch externals/emms.

  from  7e51080b09 Fix compiler warnings.
   new  ae30732443 * emms-volume-mpv.el: New file.
   new  d8c1a7c602 * emms-volume-mpv.el: Add missing emms-player-mpv 
dependency
   new  b2ccd522cc * emms-volume.el: Add emms-volume-mpv option, with 
example in documentation
   new  a242b01c51 * emms-volume-mpv.el: cleanup resolved FIXME comment at 
the top
   new  338462506d bump to version 22
   new  8713a0ee98 * doc/devel/developer-release.txt: clarify order of 
pushing


Summary of changes:
 AUTHORS |   2 +-
 NEWS|   9 +++
 doc/devel/developer-release.txt |   3 +-
 doc/emms.texinfo|  14 ++--
 emms-volume-mpv.el  | 161 
 emms-volume.el  |   8 +-
 emms.el |   6 +-
 7 files changed, 190 insertions(+), 13 deletions(-)
 create mode 100644 emms-volume-mpv.el

[elpa] externals/emms a242b01c51 4/6: * emms-volume-mpv.el: cleanup resolved FIXME comment at the top

[ELPA Syncer]

branch: externals/emms
commit a242b01c517b097c1fd7044d48c097da54d5bbd7
Author: Mike Kazantsev 
Commit: fraggod@malediction 

* emms-volume-mpv.el: cleanup resolved FIXME comment at the top
---
 emms-volume-mpv.el | 2 --
 1 file changed, 2 deletions(-)

diff --git a/emms-volume-mpv.el b/emms-volume-mpv.el
index 5f5998e3e8..3be993f152 100644
--- a/emms-volume-mpv.el
+++ b/emms-volume-mpv.el
@@ -1,7 +1,5 @@
 ;;; emms-volume-mpv.el --- Volume function to adjust mpv volume easily  -*- 
lexical-binding: t; -*-
 
-;; FIXME Copyright assignment
-
 ;; Author: Richard Sent 
 
 ;; This file is part of EMMS.

[elpa] externals/emms d8c1a7c602 2/6: * emms-volume-mpv.el: Add missing emms-player-mpv dependency

[ELPA Syncer]

branch: externals/emms
commit d8c1a7c6021f196c3261475d90d31b624f66b55c
Author: Mike Kazantsev 
Commit: fraggod@malediction 

* emms-volume-mpv.el: Add missing emms-player-mpv dependency
---
 emms-volume-mpv.el | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/emms-volume-mpv.el b/emms-volume-mpv.el
index 5f4711f5e4..5f5998e3e8 100644
--- a/emms-volume-mpv.el
+++ b/emms-volume-mpv.el
@@ -37,6 +37,8 @@
 
 ;;; Code:
 
+(require 'emms-player-mpv)
+
 (defcustom emms-volume-mpv-method 'native
   "How Emms should attempt to adjust mpv's volume.
 
@@ -64,10 +66,10 @@ changed.
 Additionally, the percentage provided by and set for ao-volume
 and thus this module may not match what is reported by the system
 audio program."
-  :type
-  '(choice (const :tag "MPV Volume" native)
-   (const :tag "System Volume" system)
-   (const :tag "Smart" smart)))
+  :type '(choice (const :tag "MPV Volume" native)
+ (const :tag "System Volume" system)
+ (const :tag "Smart" smart))
+  :group 'emms-volume)
 
 (defvar emms-volume-mpv--volume-sync (make-mutex 
"emms-volume-mpv--volume-sync")
   "Ensure only one volume-change function runs to completion at a

[elpa] externals/emms ae30732443 1/6: * emms-volume-mpv.el: New file.

[ELPA Syncer]

branch: externals/emms
commit ae30732443f61a97362353c63a3764e4f19e962e
Author: Richard Sent 
Commit: fraggod@malediction 

* emms-volume-mpv.el: New file.
---
 emms-volume-mpv.el | 159 +
 1 file changed, 159 insertions(+)

diff --git a/emms-volume-mpv.el b/emms-volume-mpv.el
new file mode 100644
index 00..5f4711f5e4
--- /dev/null
+++ b/emms-volume-mpv.el
@@ -0,0 +1,159 @@
+;;; emms-volume-mpv.el --- Volume function to adjust mpv volume easily  -*- 
lexical-binding: t; -*-
+
+;; FIXME Copyright assignment
+
+;; Author: Richard Sent 
+
+;; This file is part of EMMS.
+
+;; EMMS 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, or (at your option)
+;; any later version.
+;;
+;; EMMS 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 EMMS; see the file COPYING. If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;;
+;; This file defines a function to raise or lower the volume of mpv.
+;; It can be used stand-alone by passing a process object, though it
+;; is meant for usage with Emms, particularly with emms-volume.el and
+;; emms-player-mpv.el.
+;;
+;; To use add the following to your Emms configuration
+;; (setq emms-volume-change-function 'emms-volume-mpv-change)
+
+;;; History:
+
+;; January 2025: First release, partly based on emms-volume-pulse.el.
+
+;;; Code:
+
+(defcustom emms-volume-mpv-method 'native
+  "How Emms should attempt to adjust mpv's volume.
+
+If `native', Emms will adjust mpv's volume property. This
+provides the same experience as adjusting the volume slider in
+mpv.
+
+If `system', Emms will adjust mpv's ao-volume property, which
+adjusts the volume using the system audio service, such as
+Pulseaudio. Depending on what audio service is being used this
+may either change the mpv application's volume or global volume.
+
+If `smart', Emms will adjust both mpv's volume and ao-volume
+properties. When raising volume, the native volume will be raised
+to 100. Emms will then switch to adjusting system volume to 100
+before raising the native volume again. When lowering volume,
+Emms will lower the software volume to 100, then lower system
+volume to 0.
+
+Both `system' and `smart' require mpv to expose the ao-volume
+property. This property is only available while mpv audio output
+is active. If audio output is not active, the volume will not be
+changed.
+
+Additionally, the percentage provided by and set for ao-volume
+and thus this module may not match what is reported by the system
+audio program."
+  :type
+  '(choice (const :tag "MPV Volume" native)
+   (const :tag "System Volume" system)
+   (const :tag "Smart" smart)))
+
+(defvar emms-volume-mpv--volume-sync (make-mutex 
"emms-volume-mpv--volume-sync")
+  "Ensure only one volume-change function runs to completion at a
+time.")
+
+(defun emms-volume-mpv-synchronous-ipc (cmd &optional proc)
+  "Run mpv command and get result synchronously for current thread.
+
+This must not be run by the main thread. The handler for
+emms-player-mpv-ipc-req-send runs in the main thread, potentially
+causing a deadlock."
+  (when (eq main-thread (current-thread))
+(error "This function cannot be invoked by the main thread"))
+  (let* ((emms-volume-mpv--ipc-sync (make-mutex "emms-volume-mpv--ipc-sync"))
+ (emms-volume-mpv--ipc-sync-check (make-condition-variable 
emms-volume-mpv--ipc-sync
+   
"emms-volume-mpv--ipc-sync-check"))
+ (emms-volume-mpv--ipc-sync-reply nil))
+(with-mutex emms-volume-mpv--ipc-sync
+  (emms-player-mpv-ipc-req-send
+   cmd
+   #'(lambda (data err)
+   (with-mutex emms-volume-mpv--ipc-sync
+ (setq emms-volume-mpv--ipc-sync-reply (list data err))
+ (condition-notify emms-volume-mpv--ipc-sync-check)))
+   proc)
+  (while (not emms-volume-mpv--ipc-sync-reply)
+(condition-wait emms-volume-mpv--ipc-sync-check))
+  (cl-multiple-value-bind (data err) emms-volume-mpv--ipc-sync-reply
+(if err (error "Failed to run %s, %s" cmd err) data)
+
+(defun emms-volume-mpv-limit (vol volume-max &optional volume-min)
+  "Limit VOL to the range [0 - volume-max]."
+  (max (min vol volume-max) (or volume-min 0)))
+
+(defun emms-volume-mpv--smart-increment (native-old system-old amount 
native-max)
+  (cond
+   ((< native-old 100)
+(list (emms-volume-mpv-limit (+ native-old amount) 100) system-old))
+   ((< system-old 100)
+(li

[elpa] externals/emms 8713a0ee98 6/6: * doc/devel/developer-release.txt: clarify order of pushing

[ELPA Syncer]

branch: externals/emms
commit 8713a0ee985cd171103528cb607609aaf12346a1
Author: Yoni Rabkin 
Commit: Yoni Rabkin 

* doc/devel/developer-release.txt: clarify order of pushing
---
 doc/devel/developer-release.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/devel/developer-release.txt b/doc/devel/developer-release.txt
index a7fef2c667..e2e60753b8 100644
--- a/doc/devel/developer-release.txt
+++ b/doc/devel/developer-release.txt
@@ -49,7 +49,8 @@ version of the manual if it has changed in this release:
 
 
 * tag release and push the tag
-Tag the release in git, for example:
+Commit and push all of the above changes, then tag the release in git,
+for example:
 
 $ git tag -a 4.2 -m "4.2"
 $ git push --tags origin "4.2"

[nongnu] elpa/gptel 5caa292bbf: gptel-rewrite: Use correct form of `with-demoted-errors' (#745)

[ELPA Syncer]

branch: elpa/gptel
commit 5caa292bbfd291cd4583ab9937224ee40873cf3b
Author: Henrik Ahlgren 
Commit: GitHub 

gptel-rewrite: Use correct form of `with-demoted-errors' (#745)

Avoid these warnings:
Warning: Missing format argument in ‘with-demoted-errors’

* gptel-rewrite.el (gptel--rewrite-callback): Add the required FORMAT
argument to `with-demoted-errors'.
---
 gptel-rewrite.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gptel-rewrite.el b/gptel-rewrite.el
index 29a94a8dfe..e66b15f0ce 100644
--- a/gptel-rewrite.el
+++ b/gptel-rewrite.el
@@ -419,8 +419,8 @@ INFO is the async communication channel for the rewrite 
request."
 (let ((inhibit-read-only t))
   (delete-region (point) (point-max))
   ;; Run post-rewrite-functions on rewritten text in its buffer
-  (with-demoted-errors
-  (run-hook-with-args 'gptel-post-rewrite-functions 
(point-min) (point-max)))
+  (with-demoted-errors "gptel-post-rewrite-functions: %S"
+(run-hook-with-args 'gptel-post-rewrite-functions (point-min) 
(point-max)))
   (when (and (plist-get info :newline)
  (not (eq (char-before (point-max)) ?\n)))
 (insert "\n"))

[elpa] externals/el-job 73eea0da43 2/2: Polish (mostly comments)

[ELPA Syncer]

branch: externals/el-job
commit 73eea0da430f6f424b5a958760e00a6c05cba0ed
Author: Martin Edström 
Commit: Martin Edström 

Polish (mostly comments)
---
 el-job.el | 92 +++
 1 file changed, 46 insertions(+), 46 deletions(-)

diff --git a/el-job.el b/el-job.el
index f88a086979..13de74b498 100644
--- a/el-job.el
+++ b/el-job.el
@@ -71,14 +71,12 @@
   "Increase this to 1 or 2 to see more debug messages.")
 
 (defun el-job--dbg (level fmt &rest args)
-  "If debugging is enabled, format FMT with ARGS and print as message.
-LEVEL is the threshold for `el-job--debug-level' to unlock this warning.
-At LEVEL 0, don't just print a message, display a warning."
+  "Maybe pass FMT and ARGS to `message'.
+LEVEL is the threshold that `el-job--debug-level' should meet or exceed
+to unlock this message."
   (declare (indent 2))
-  (if (<= level el-job--debug-level)
-  (if (> level 0)
-  (apply #'message fmt args)
-(display-warning 'el-job (apply #'format-message fmt args)
+  (when (<= level el-job--debug-level)
+(apply #'message fmt args)))
 
 (defun el-job--locate-lib-in-load-history (feature)
   "Look for the .eln, .elc or .el file corresponding to FEATURE.
@@ -138,7 +136,7 @@ that file of source code and use \\[eval-buffer] to ensure 
this will
 find the correct file."
   (let ((loaded (el-job--locate-lib-in-load-history feature)))
 (unless loaded
-  (error "Current Lisp definitions must come from a file %S[.el/.elc/.eln]"
+  (error "el-job: Current Lisp definitions must come from a file 
%S[.el/.elc/.eln]"
  feature))
 ;; HACK: Sometimes comp.el makes freefn- temp files.  It sounds like we
 ;; would not normally see it unless user is evalling defuns in a scratch
@@ -147,7 +145,7 @@ find the correct file."
 (when (string-search "freefn-" loaded)
   (unless el-job--onetime-canary
 (setq el-job--onetime-canary t)
-(error "Could not find real file for feature %S, found %s"
+(error "el-job: Could not find real file for feature %S, found %s"
feature loaded))
   (setq loaded
 (locate-file (symbol-name feature) load-path '(".el" ".el.gz"
@@ -169,17 +167,18 @@ find the correct file."
(byte-compile-dest-file-function
 `(lambda (&rest _) ,elc)))
   (when (native-comp-available-p)
-;; FIXME: Guix strips the hash from the .eln filename, so
-;; compiling now can result in an .eln in ~/.emacs.d/ that will
-;; always take precedence over the one shipped by Guix.
-;; If we want to cover for that, it'd be safer to compile into
-;; /tmp with a filename based on e.g. `after-init-time'.
-;; Users who install FEATURE purely thru Guix are prolly safe.
+;; FIXME: Guix overrides `comp-el-to-eln-rel-filename' to
+;; output filenames with NO HASH!  So compiling now can result
+;; in an .eln in ~/.emacs.d/ that will always take precedence
+;; over the one shipped by Guix.  If we want to cover for that,
+;; it'd be safer to compile into /tmp with a filename based on
+;; e.g. `after-init-time'.  Users who install FEATURE purely
+;; thru Guix are prolly safe.
 ;; https://github.com/meedstrom/org-node/issues/68
 (native-compile-async (list loaded)))
   ;; Native comp may take a while, so build and return .elc this
-  ;; time.  We should not pick a preexisting .elc from load path if
-  ;; Emacs is now running interpreted code, since that currently
+  ;; time.  We should not pick a preexisting .elc from `load-path'
+  ;; if Emacs is now running interpreted code, since that currently
   ;; running code is likely newer.
   (if (or (file-newer-than-file-p elc loaded)
   (byte-compile-file loaded))
@@ -191,10 +190,11 @@ find the correct file."
 loaded)))
   ;; Either .eln or .elc was loaded, so return the same.
   ;; We should not opportunistically build an .eln if current Emacs process
-  ;; is using code from an .elc, because we cannot assume the source .el is
-  ;; equivalent code.  It could be in-development, newer than the .elc,
-  ;; so children should also use the .elc for compatibility right up until
-  ;; the point the developer actually evals the .el buffer.
+  ;; is using an .elc, because we cannot assume the source .el is the
+  ;; version that produced that .elc.  It could be in-development, newer
+  ;; than the .elc, so our child processes should also use the .elc for
+  ;; compatibility right up until the point the developer actually evals
+  ;; the .el buffer.
   loaded)))
 
 (defun el-job--split-evenly

[elpa] externals/llm 14af3e3aae 2/2: Add Gemini 2.5 Pro model support (#179)

[ELPA Syncer]

branch: externals/llm
commit 14af3e3aae33e8c9320f296bcadfa7ee22517e78
Author: Andrew Hyatt 
Commit: GitHub 

Add Gemini 2.5 Pro model support (#179)
---
 NEWS.org  | 1 +
 llm-models.el | 5 +
 2 files changed, 6 insertions(+)

diff --git a/NEWS.org b/NEWS.org
index 33c0cbda90..5412ce31f7 100644
--- a/NEWS.org
+++ b/NEWS.org
@@ -1,6 +1,7 @@
 * Version 0.24.2
 - Fix issue with some Open AI compatible providers needing models to be passed 
by giving a non-nil default.
 * Version 0.24.1
+- Add Gemini 2.5 Pro
 - Fix issue with Ollama incorrect requests when passing non-standard params.
 - Fix issue with JSON return specs which pass booleans
 * Version 0.24.0
diff --git a/llm-models.el b/llm-models.el
index 8015dbac54..dbedeced80 100644
--- a/llm-models.el
+++ b/llm-models.el
@@ -142,6 +142,11 @@ REGEX is a regular expression that can be used to identify 
the model, uniquely (
 :capabilities '(generation)
 :context-length 32768
 :regex "gemini-2\\.0-flash-thinking")
+   (make-llm-model
+:name "Gemini 2.5 Pro" :symbol 'gemini-2.5-pro
+:capabilities '(generation tool-use image-input audio-input video-input)
+:context-length 1048576
+:regex "gemini-2\\.5-pro")
(make-llm-model
 :name "Gemini 2.0 Pro" :symbol 'gemini-2.0-pro
 :capabilities '(generation tool-use image-input audio-input video-input)

[elpa] externals/llm updated (8fbb242585 -> 14af3e3aae)

[ELPA Syncer]

elpasync pushed a change to branch externals/llm.

  from  8fbb242585 Defaut Open AI compatible models to "unset" (#177)
   new  94b2cbf07d Handle special boolean values in JSON requests (#178)
   new  14af3e3aae Add Gemini 2.5 Pro model support (#179)


Summary of changes:
 NEWS.org  | 2 ++
 llm-models.el | 5 +
 llm-provider-utils.el | 8 +++-
 3 files changed, 14 insertions(+), 1 deletion(-)

[elpa] externals/el-job updated (cdcc1d9afe -> 73eea0da43)

[ELPA Syncer]

elpasync pushed a change to branch externals/el-job.

  from  cdcc1d9afe Release version 2.4.2
   new  5b5438d5bc Cope with comp deleting eln
   new  73eea0da43 Polish (mostly comments)


Summary of changes:
 el-job.el | 103 --
 1 file changed, 54 insertions(+), 49 deletions(-)

[elpa] externals/el-job 5b5438d5bc 1/2: Cope with comp deleting eln

[ELPA Syncer]

branch: externals/el-job
commit 5b5438d5bc6a393c3e4f8cfe45013826ef7aa727
Author: Martin Edström 
Commit: Martin Edström 

Cope with comp deleting eln
---
 el-job.el | 11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/el-job.el b/el-job.el
index ecc310e2c3..f88a086979 100644
--- a/el-job.el
+++ b/el-job.el
@@ -112,9 +112,14 @@ an .eln anyway, without your having to recompile on save."
;; overriding some other file's definition)
(string-prefix-p (symbol-name feature)
 (symbol-name (cdr elem
- return (native-comp-unit-file
- (subr-native-comp-unit
-  (symbol-function (cdr elem))
+ return (let ((eln (native-comp-unit-file
+(subr-native-comp-unit
+ (symbol-function (cdr elem))
+  ;; FIXME: comp sometimes deletes old eln during
+  ;; recompilation, but does not load the new eln,
+  ;; at least not in a way that updates 
load-history
+  (when (file-exists-p eln)
+eln
file)))
 
 (defvar el-job--onetime-canary nil)

[elpa] externals/minuet 80bb9de797 36/97: Merge pull request #10 from mwolson/feat/ignore-elc-files

[ELPA Syncer]

branch: externals/minuet
commit 80bb9de7972f47a8578f19456b2de0c578d9a88e
Merge: 6a7f5a2c4a 3ac83dc334
Author: milanglacier 
Commit: GitHub 

Merge pull request #10 from mwolson/feat/ignore-elc-files

gitignore: Ignore *.elc files from byte-compilation
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index ea84c42f8c..cc7ca80deb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 .tags
 .DS_Store
 .aider*
+*.elc

[nongnu] elpa/rpm-spec-mode df6fb6a3d9 34/67: Fix documentation strings and error output

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit df6fb6a3d9a33fee4e650557ffc3503be3db0d7a
Author: Mark A. Hershberger 
Commit: Björn Bidar 

Fix documentation strings and error output
---
 rpm-spec-mode.el | 54 ++
 1 file changed, 34 insertions(+), 20 deletions(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index 70fcc84e6e..7bd4cc5530 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -87,7 +87,7 @@
 
 (defcustom rpm-spec-short-circuit nil
   "Skip straight to specified stage.
-(ie, skip all stages leading up to the specified stage).  Only valid
+\(ie, skip all stages leading up to the specified stage).  Only valid
 in \"%build\" and \"%install\" stage."
   :type 'boolean
   :group 'rpm-spec)
@@ -746,7 +746,7 @@ with no args, if that value is non-nil."
   (run-hooks 'rpm-spec-mode-hook))
 
 (defun rpm-command-filter (process string)
-  "Filter to process normal output."
+  "Filter to PROCESS normal output.  Add STRING as starting boundary."
   (with-current-buffer (process-buffer process)
 (save-excursion
   (goto-char (process-mark process))
@@ -767,7 +767,7 @@ If `rpm-change-log-uses-utc' is nil, \"today\" means the 
local time zone."
   (format-time-string "%a %b %d %Y" nil rpm-change-log-uses-utc))
 
 (defun rpm-goto-add-change-log-header ()
-  "Find change log and add header (if needed) for today"
+  "Find change log and add header (if needed) for today."
 (rpm-goto-section "changelog")
 (let* ((address (rpm-spec-user-mail-address))
(fullname (or rpm-spec-user-full-name (user-full-name)))
@@ -781,7 +781,8 @@ If `rpm-change-log-uses-utc' is nil, \"today\" means the 
local time zone."
 (forward-line 2
 
 (defun rpm-add-change-log-entry (&optional change-log-entry)
-  "Find change log and add an entry for today."
+  "Find change log and add an entry for today.
+CHANGE-LOG-ENTRY will be used if provided."
   (interactive "sChange log entry: ")
   (save-excursion
 (rpm-goto-add-change-log-header)
@@ -801,7 +802,9 @@ If `rpm-change-log-uses-utc' is nil, \"today\" means the 
local time zone."
 ;;
 
 (defun rpm-insert-f (&optional filetype filename)
-  "Insert new \"%files\" entry."
+  "Insert new \"%files\" entry.
+If FILENAME is 1 or is not provided, it will be prompted for
+using FILETYPE to prompt the user."
   (save-excursion
 (and (rpm-goto-section "files") (rpm-end-of-section))
 (if (or (eq filename 1) (not filename))
@@ -816,32 +819,38 @@ If `rpm-change-log-uses-utc' is nil, \"today\" means the 
local time zone."
 (insert filetype)))
 
 (defun rpm-insert-file (&optional filename)
-  "Insert regular file."
+  "Insert regular file.
+Use FILENAME or, if interactive, prompt."
   (interactive "p")
   (rpm-insert-f "" filename))
 
 (defun rpm-insert-config (&optional filename)
-  "Insert config file."
+  "Insert config file.
+FILENAME is the config file."
   (interactive "p")
   (rpm-insert-f "%config " filename))
 
 (defun rpm-insert-doc (&optional filename)
-  "Insert doc file."
+  "Insert doc file.
+FILENAME is the doc file."
   (interactive "p")
   (rpm-insert-f "%doc " filename))
 
 (defun rpm-insert-ghost (&optional filename)
-  "Insert ghost file."
+  "Insert ghost file.
+FILENAME is the ghost file."
   (interactive "p")
   (rpm-insert-f "%ghost " filename))
 
 (defun rpm-insert-dir (&optional dirname)
-  "Insert directory."
+  "Insert directory.
+DIRNAME is the directory."
   (interactive "p")
   (rpm-insert-f "%dir " dirname))
 
 (defun rpm-insert-docdir (&optional dirname)
-  "Insert doc directory."
+  "Insert doc directory.
+DIRNAME is the directory."
   (interactive "p")
   (rpm-insert-f "%docdir " dirname))
 
@@ -854,7 +863,8 @@ controls whether case is significant."
 (completing-read prompt table pred require init hist)))
 
 (defun rpm-insert (&optional what file-completion)
-  "Insert given tag.  Use file-completion if argument is t."
+  "Insert given tag.  Use FILE-COMPLETION if argument is t.
+WHAT is the tag used."
   (beginning-of-line)
   (if (not what)
   (setq what (rpm-completing-read "Tag: " rpm-tags-list)))
@@ -877,6 +887,7 @@ controls whether case is significant."
 (insert insert-text (read-from-minibuffer (concat read-text)) 
"\n"))
 
 (defun rpm-topdir ()
+  "Use environment to get the topdir for RPMs."
   (or
(getenv "RPM")
(getenv "rpm")
@@ -886,7 +897,7 @@ controls whether case is significant."
"/usr/src/RPM"))
 
 (defun rpm-insert-n (what &optional arg)
-  "Insert given tag with possible number."
+  "Insert given tag (WHAT) with possible number."
   (save-excursion
 (goto-char (point-max))
 (if (search-backward-regexp (concat "^" what "\\([0-9]*\\):") nil t)
@@ -900,7 +911,7 @@ controls whether case is significant."
   (insert what ": " (read-from-minibuffer (concat what "file: ")) "\n"
 
 (defun rpm-change (&optional what arg)
-  "Update given tag."
+  "Update g

[nongnu] elpa/rpm-spec-mode e31b6957e5 04/67: Updated mail address and bumped version to 0.14.

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit e31b6957e55657b29c5d2176f005ec7169f470b6
Author: stig 
Commit: stig 

Updated mail address and bumped version to 0.14.
---
 rpm-spec-mode.el | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index 7f8c242bf3..073129d316 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -1,10 +1,10 @@
 ;;; rpm-spec-mode.el --- RPM spec file editing commands for Emacs/XEmacs
 
-;; Copyright (C) 1997-2002 Stig Bj�rlykke, 
+;; Copyright (C) 1997-2013 Stig Bj�rlykke, 
 
-;; Author:   Stig Bj�rlykke, 
+;; Author:   Stig Bj�rlykke, 
 ;; Keywords: unix, languages
-;; Version:  0.12
+;; Version:  0.14
 
 ;; This file is part of XEmacs.
 
@@ -50,7 +50,7 @@
 ;; This mode is used for editing spec files used for building RPM packages.
 ;;
 ;; Most recent version is available from:
-;;  http://www.tihlde.org/~stigb/rpm-spec-mode.el>
+;;  
 ;;
 ;; Put this in your .emacs file to enable autoloading of rpm-spec-mode,
 ;; and auto-recognition of ".spec" files:
@@ -64,7 +64,7 @@
 ;;; Code:
 (require 'compile)
 
-(defconst rpm-spec-mode-version "0.12" "Version of `rpm-spec-mode'.")
+(defconst rpm-spec-mode-version "0.14" "Version of `rpm-spec-mode'.")
 
 (defgroup rpm-spec nil
   "RPM spec mode with Emacs/XEmacs enhancements."
@@ -1442,7 +1442,7 @@ if one is present in the file."
   (message
(concat "rpm-spec-mode version "
rpm-spec-mode-version
-   " by Stig Bj�rlykke, ")))
+   " by Stig Bj�rlykke, ")))
 
 ;;;###autoload(add-to-list 'auto-mode-alist '("\\.spec\\(\\.in\\)?$" . 
rpm-spec-mode))
 

[nongnu] elpa/rpm-spec-mode 796114105f 12/67: add myself to contributor list

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit 796114105fa5186cad787276d0767a4709a4daa9
Author: Adam Spiers 
Commit: Adam Spiers 

add myself to contributor list
---
 rpm-spec-mode.el | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index 568b9e8bb8..d2fb41484b 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -34,6 +34,8 @@
 ;;   for Red Hat adaptions and some fixes.
 ;; Chmouel Boudjnah  for Mandrake fixes.
 ;; Ville Skytt�   for some fixes.
+;; Adam Spiers  for GNU emacs compilation
+;;  and other misc fixes.
 
 ;;; ToDo:
 

[nongnu] elpa/rpm-spec-mode e050606029 30/67: Merge branch 'pr-17'

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit e0506060291bd7c45b1bf79c7588057b700c845c
Merge: afe4307679 e95001cf4e
Author: Björn Bidar 
Commit: Björn Bidar 

Merge branch 'pr-17'
---
 rpm-spec-mode.el | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index f67c13f932..5a854ed179 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -112,7 +112,7 @@ Set the macros _target, _target_arch and _target_os 
accordingly"
   :group 'rpm-spec)
 
 (define-obsolete-variable-alias
-  'rpm-completion-ignore-case 'rpm-spec-completion-ignore-case)
+  'rpm-completion-ignore-case 'rpm-spec-completion-ignore-case "0.12")
 
 (defcustom rpm-spec-completion-ignore-case t
   "*Non-nil means that case differences are ignored during completion.
@@ -132,7 +132,7 @@ This is used during Tempo template completion."
   :group 'rpm-spec)
 
 (define-obsolete-variable-alias
-  'rpm-spec-test 'rpm-spec-nobuild)
+  'rpm-spec-test 'rpm-spec-nobuild "0.12")
 
 (defcustom rpm-spec-nobuild nil
   "Do not execute any build stages.  Useful for testing out spec files."
@@ -158,7 +158,7 @@ the package."
   :group 'rpm-spec)
 
 (define-obsolete-variable-alias
-  'rpm-initialize-sections 'rpm-spec-initialize-sections)
+  'rpm-initialize-sections 'rpm-spec-initialize-sections "0.12")
 
 (defcustom rpm-spec-initialize-sections t
   "Automatically add empty section headings to new spec files."
@@ -166,7 +166,7 @@ the package."
   :group 'rpm-spec)
 
 (define-obsolete-variable-alias
-  'rpm-insert-version 'rpm-spec-insert-changelog-version)
+  'rpm-insert-version 'rpm-spec-insert-changelog-version "0.12")
 
 (defcustom rpm-spec-insert-changelog-version t
   "Automatically add version in a new change log entry."

[nongnu] elpa/rpm-spec-mode 9e4fcfe7cd 53/67: Quote/unquote macros when commenting/uncommenting

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit 9e4fcfe7cd58008fbb8db2cfbef02474dbcc779a
Author: Peter Oliver 
Commit: Björn Bidar 

Quote/unquote macros when commenting/uncommenting

If we don’t do this, the user will get warnings about macro expansion in 
comments.
---
 rpm-spec-mode.el | 17 +
 1 file changed, 17 insertions(+)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index 681e781d4c..bb8cf5ee5c 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -692,6 +692,21 @@ value returned by function `user-mail-address'."
   "Additional expressions to highlight in `rpm-spec-mode'.")
 
 
+(defun rpm-spec-mode-comment-region (beg end &optional arg)
+  "Comment between BEG and END, replacing % with %% to prevent macro expansion.
+ARG is passed on to `comment-region-default'."
+  (comment-region-default beg
+  (+ end (replace-string-in-region "%" "%%" beg end))
+  arg))
+
+(defun rpm-spec-mode-uncomment-region (beg end &optional arg)
+  "Uncomment between BEG and END, replacing %% with % to reenable macro 
expansion.
+ARG is passed on to `uncomment-region-default'."
+  (uncomment-region-default beg
+(- end (replace-string-in-region "%%" "%" beg end))
+arg))
+
+
 (defvar rpm-spec-mode-abbrev-table nil
   "Abbrev table in use in `rpm-spec-mode' buffers.")
 (define-abbrev-table 'rpm-spec-mode-abbrev-table ())
@@ -765,6 +780,8 @@ with no args, if that value is non-nil."
   (setq-local comment-column 32)
   (setq-local comment-start-skip "#+ *")
 ;  (setq-local comment-indent-function 'c-comment-indent)
+  (setq-local comment-region-function #'rpm-spec-mode-comment-region)
+  (setq-local uncomment-region-function #'rpm-spec-mode-uncomment-region)
   ;;Initialize font lock for GNU emacs.
   (make-local-variable 'font-lock-defaults)
   (font-lock-add-keywords nil rpm-spec-font-lock-keywords)

[nongnu] elpa/rpm-spec-mode 5d8bc10065 38/67: Refactor to define mode using derived-mode

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit 5d8bc10065808eba97254da74342e8c86609c57a
Author: Björn Bidar 
Commit: Björn Bidar 

Refactor to define mode using derived-mode

Doing so removes a lot of boilerplate.
Also fix fontification on Emacs 30.

Signed-off-by: Björn Bidar 
---
 rpm-spec-mode.el | 149 +--
 1 file changed, 67 insertions(+), 82 deletions(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index 62b7a63f77..d292fff097 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -65,6 +65,9 @@
 
 ;;; Code:
 (require 'compile)
+(require 'sh-script)
+(require 'cc-mode)
+(require 'easymenu)
 
 (defconst rpm-spec-mode-version "0.16" "Version of `rpm-spec-mode'.")
 
@@ -536,69 +539,69 @@ value returned by function `user-mail-address'."
   ;;(define-key rpm-spec-mode-map "\t" #'sh-indent-line)
   )
 
-(defconst rpm-spec-mode-menu
-  (purecopy '("RPM spec"
-  ["Insert Tag..."   rpm-insert-tagt]
-  ["Change Tag..."   rpm-change-tagt]
-  "---"
-  ["Go to section..."rpm-mouse-goto-section  :keys "C-c 
C-o"]
-  ["Forward section" rpm-forward-section   t]
-  ["Backward section"rpm-backward-section  t]
-  "---"
-  ["Add change log entry..." rpm-add-change-log-entry  t]
-  ["Increase release tag"rpm-increase-release-tag  t]
-  "---"
-  ("Add file entry"
-   ["Regular file..."rpm-insert-file   t]
-   ["Config file..." rpm-insert-config t]
-   ["Document file..."   rpm-insert-doct]
-   ["Ghost file..."  rpm-insert-ghost  t]
-   "---"
-   ["Directory..."   rpm-insert-dirt]
-   ["Document directory..."  rpm-insert-docdir t]
-   "---"
-   ["Insert %{prefix}"   rpm-insert-true-prefixt]
-   "---"
-   ["Default add \"%attr\" entry" rpm-toggle-add-attr
-:style toggle :selected rpm-spec-add-attr]
-   ["Change default umask for files..."  rpm-files-umask   t]
-   ["Change default owner for files..."  rpm-files-owner   t]
-   ["Change default group for files..."  rpm-files-group   t])
-  ("Build Options"
-   ["Short circuit" rpm-toggle-short-circuit
-:style toggle :selected rpm-spec-short-circuit]
-   ["Remove source" rpm-toggle-rmsource
-:style toggle :selected rpm-spec-rmsource]
-   ["Clean" rpm-toggle-clean
-:style toggle :selected rpm-spec-clean]
-   ["No build"  rpm-toggle-nobuild
-:style toggle :selected rpm-spec-nobuild]
-   ["Quiet" rpm-toggle-quiet
-:style toggle :selected rpm-spec-quiet]
-   ["GPG sign"  rpm-toggle-sign-gpg
-:style toggle :selected rpm-spec-sign-gpg]
-   ["Ignore dependencies" rpm-toggle-nodeps
-:style toggle :selected rpm-spec-nodeps]
-   "---"
-   ["Change timecheck value..."  rpm-change-timecheck-option   t]
-   ["Change buildroot value..."  rpm-change-buildroot-option   t]
-   ["Change target value..." rpm-change-target-option  t])
-  ("RPM Build"
-   ["Execute \"%prep\" stage"rpm-build-prepare t]
-   ["Do a \"list check\""rpm-list-checkt]
-   ["Do the \"%build\" stage"rpm-build-compile t]
-   ["Do the \"%install\" stage"  rpm-build-install t]
-   "---"
-   ["Build binary package"   rpm-build-binary  t]
-   ["Build source package"   rpm-build-source  t]
-   ["Build binary and source"rpm-build-all t])
-  "---"
-  ["About rpm-spec-mode" rpm-about-rpm-spec-mode   t]
-  )))
+(easy-menu-define rpm-spec-mode-menu rpm-spec-mode-map
+  "Post menu for `rpm-spec-mode'."
+  '("RPM spec"
+["Insert Tag..."   rpm-insert-tagt]
+["Change Tag..."   rpm-change-tagt]
+"---"
+["Go to section..."rpm-mouse-goto-section  :keys "C-c C-o"]
+["Forward section" rpm-forward-section   t]
+["Backward section"rpm-backward-section  t]
+"---"
+["Add change log entry..." rpm-add-change-log-entry  t]
+["Increase release tag"rpm-increase-release-tag  t]
+"---"
+("Add file entry"
+ ["Regular file..."rpm-insert-file 

[nongnu] elpa/rpm-spec-mode 51824f5810 05/67: add %verify-script

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit 51824f58106016369ecfb908cea11a5896861e91
Author: Adam Spiers 
Commit: Adam Spiers 

add %verify-script
---
 rpm-spec-mode.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index 073129d316..bf1de195c3 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -246,7 +246,7 @@ value returned by function `user-mail-address'."
 (defconst rpm-scripts
   '("pre" "post" "preun" "postun"
 "trigger" "triggerin" "triggerprein" "triggerun" "triggerpostun"
-"pretrans" "posttrans")
+"pretrans" "posttrans" "verifyscript")
   "List of rpm scripts.")
 (defconst rpm-section-seperate "^%\\(\\w+\\)\\s-")
 (defconst rpm-section-regexp

[nongnu] elpa/rpm-spec-mode 739f45912a 42/67: Replace list->string with mapconcat

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit 739f45912ac1054f71bbd1c224be61fbdebaae26
Author: Jerry James 
Commit: Björn Bidar 

Replace list->string with mapconcat

Signed-off-by: Jerry James 
---
 rpm-spec-mode.el | 7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index d2c050246a..6da799b558 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -1106,12 +1106,7 @@ leave point at previous location."
   "\"")
   buildoptions)
 
-  (progn
-(defun list->string (lst)
-  (if (cdr lst)
- (concat (car lst) " " (list->string (cdr lst)))
-   (car lst)))
-(compilation-start (list->string (cons rpm-spec-build-command 
buildoptions)) 'rpmbuild-mode))
+  (compilation-start (mapconcat #'identity (cons rpm-spec-build-command 
buildoptions) " ") 'rpmbuild-mode)
 
   (if (and rpm-spec-sign-gpg (not rpm-no-gpg))
   (let ((build-proc (get-buffer-process

[nongnu] elpa/rpm-spec-mode fa1dd6b5bd 10/67: avoid compilation warning for set-keymap-name

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit fa1dd6b5bdabff54cfa312526b8ffd1715746b6f
Author: Adam Spiers 
Commit: Adam Spiers 

avoid compilation warning for set-keymap-name
---
 rpm-spec-mode.el | 4 
 1 file changed, 4 insertions(+)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index bcf7cf5dbf..089ba7749f 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -66,6 +66,8 @@
 
 (defconst rpm-spec-mode-version "0.14" "Version of `rpm-spec-mode'.")
 
+(eval-and-compile (defvar running-xemacs nil))
+
 (defgroup rpm-spec nil
   "RPM spec mode with Emacs/XEmacs enhancements."
   :prefix "rpm-spec-"
@@ -482,6 +484,8 @@ value returned by function `user-mail-address'."
   (modify-syntax-entry ?| "." rpm-spec-mode-syntax-table)
   (modify-syntax-entry ?\' "." rpm-spec-mode-syntax-table))
 
+(eval-when-compile (or running-xemacs (defun set-keymap-name (a b
+
 (defvar rpm-spec-mode-map nil
   "Keymap used in `rpm-spec-mode'.")
 (unless rpm-spec-mode-map

[nongnu] elpa/rpm-spec-mode ebe3d4d9ba 48/67: Update keywords for RPM 4.20.

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit ebe3d4d9ba2f689cc5d3979d780fa358f9c49639
Author: Peter Oliver 
Commit: Björn Bidar 

Update keywords for RPM 4.20.
---
 rpm-spec-mode.el | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index d36c92df3c..fab875eca0 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -350,13 +350,14 @@ value returned by function `user-mail-address'."
 (defvar rpm-spec-nobuild-option "--nobuild" "Option for no build.")
 
 (defvar rpm-tags-list
-  ;; From RPM 4.16.1.3 sources, file build/parsePreamble.c: preambleList[]:
+  ;; From RPM 4.20.0 sources, file build/parsePreamble.c: preambleList[]:
   '(("Name")
 ("Version")
 ("Release")
 ("Epoch")
 ("Summary")
 ("License")
+("SourceLicense")
 ("Distribution")
 ("DistURL")
 ("Vendor")
@@ -388,14 +389,18 @@ value returned by function `user-mail-address'."
 ("BuildArchitectures")
 ("BuildArch")
 ("BuildConflicts")
+("BuildOption")
 ("BuildPreReq")
 ("BuildRequires")
+("BuildSystem")
 ("AutoReqProv")
 ("AutoReq")
 ("AutoProv")
 ("DocDir")
 ("DistTag")
 ("BugURL")
+("TranslationURL")
+("UpstreamReleases")
 ("OrderWithRequires")
 ("RemovePathPostFixes")
 ("ModularityLabel")

[nongnu] elpa/rpm-spec-mode 61c6272773 02/67: Added existing version 0.12.

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit 61c627277377673f99d23109afc6548427b8d2ea
Author: stig 
Commit: stig 

Added existing version 0.12.
---
 rpm-spec-mode.el | 1240 ++
 1 file changed, 1240 insertions(+)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
new file mode 100644
index 00..bc147b4907
--- /dev/null
+++ b/rpm-spec-mode.el
@@ -0,0 +1,1240 @@
+;;; rpm-spec-mode.el --- RPM spec file editing commands for Emacs/XEmacs
+
+;; Copyright (C) 1997-2002 Stig Bj�rlykke, 
+
+;; Author:   Stig Bj�rlykke, 
+;; Keywords: unix, languages
+;; Version:  0.12
+
+;; This file is part of XEmacs.
+
+;; XEmacs 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 2, or (at your option)
+;; any later version.
+
+;; XEmacs 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 XEmacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+;; MA 02111-1307, USA.
+
+;;; Synched up with: not in GNU Emacs.
+
+;;; Thanx to:
+
+;; Tore Olsen  for some general fixes.
+;; Steve Sanbeg  for navigation functions and
+;;  some Emacs fixes.
+;; Tim Powers  and Trond Eivind Glomsr�d
+;;   for Red Hat adaptions and some fixes.
+;; Chmouel Boudjnah  for Mandrake fixes.
+
+;;; ToDo:
+
+;; - rewrite function names.
+;; - autofill changelog entries.
+;; - customize rpm-tags-list and rpm-group-tags-list.
+;; - get values from `rpm --showrc'.
+;; - ssh/rsh for compile.
+;; - finish integrating the new navigation functions in with existing stuff.
+;; - use a single prefix consistently (internal)
+
+;;; Commentary:
+
+;; This mode is used for editing spec files used for building RPM packages.
+;;
+;; Most recent version is available from:
+;;  http://www.tihlde.org/~stigb/rpm-spec-mode.el>
+;;
+;; Put this in your .emacs file to enable autoloading of rpm-spec-mode,
+;; and auto-recognition of ".spec" files:
+;;
+;;  (autoload 'rpm-spec-mode "rpm-spec-mode.el" "RPM spec mode." t)
+;;  (setq auto-mode-alist (append '(("\\.spec" . rpm-spec-mode))
+;;auto-mode-alist))
+;;
+;;
+
+;;; Code:
+
+(defconst rpm-spec-mode-version "0.12" "Version of `rpm-spec-mode'.")
+
+(defgroup rpm-spec nil
+  "RPM spec mode with Emacs/XEmacs enhancements."
+  :prefix "rpm-spec-"
+  :group 'languages)
+
+(defcustom rpm-spec-build-command "rpmbuild"
+  "Command for building a RPM package."
+  :type 'string
+  :group 'rpm-spec)
+
+(defcustom rpm-spec-add-attr nil
+  "Add \"%attr\" entry for file listings or not."
+  :type 'boolean
+  :group 'rpm-spec)
+
+(defcustom rpm-spec-short-circuit nil
+  "Skip straight to specified stage.
+(ie, skip all stages leading up to the specified stage).  Only valid
+in \"%build\" and \"%install\" stage."
+  :type 'boolean
+  :group 'rpm-spec)
+
+(defcustom rpm-spec-timecheck "0"
+  "Set the \"timecheck\" age (0 to disable).
+The timecheck value expresses, in seconds, the maximum age of a file
+being packaged.  Warnings will be printed for all files beyond the
+timecheck age."
+  :type 'integer
+  :group 'rpm-spec)
+
+(defcustom rpm-spec-buildroot ""
+  "Override the BuildRoot tag with directory ."
+  :type 'string
+  :group 'rpm-spec)
+
+(defcustom rpm-spec-target ""
+  "Interpret given string as `arch-vendor-os'.
+Set the macros _target, _target_arch and _target_os accordingly"
+  :type 'string
+  :group 'rpm-spec)
+
+(define-obsolete-variable-alias
+  'rpm-completion-ignore-case 'rpm-spec-completion-ignore-case)
+
+(defcustom rpm-spec-completion-ignore-case t
+  "*Non-nil means that case differences are ignored during completion.
+A value of nil means that case is significant.
+This is used during Tempo template completion."
+  :type 'boolean
+  :group 'rpm-spec)
+
+(defcustom rpm-spec-clean nil
+  "Remove the build tree after the packages are made."
+  :type 'boolean
+  :group 'rpm-spec)
+
+(defcustom rpm-spec-rmsource nil
+  "Remove the source and spec file after the packages are made."
+  :type 'boolean
+  :group 'rpm-spec)
+
+(defcustom rpm-spec-nobuild nil
+  "Do not execute any build stages.  Useful for testing out spec files."
+  :type 'boolean
+  :group 'rpm-spec)
+
+(defcustom rpm-spec-sign-gpg nil
+  "Embed a GPG signature in the package.
+This signature can be used to verify the integrity and the origin of
+the package."
+  :type 'boolean
+  :group 'rpm-spec)
+
+(defcustom rpm-spec-nodeps nil
+  "Do not verify build dependencies."
+  :type 'boolean
+  :group 'rpm-spec)
+
+(defcustom rpm-spec-old-rpm ni

[nongnu] elpa/rpm-spec-mode 2276b05457 25/67: Sync script and tag lists with rpm 4.12.90

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit 2276b054578708bb476c9bbfaaec6035470d9091
Author: Ville Skyttä 
Commit: Ville Skyttä 

Sync script and tag lists with rpm 4.12.90
---
 rpm-spec-mode.el | 14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index ac9d797614..299eb68ccf 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -250,18 +250,23 @@ value returned by function `user-mail-address'."
 (defconst rpm-scripts
   '("pre" "post" "preun" "postun"
 "trigger" "triggerin" "triggerprein" "triggerun" "triggerpostun"
-"pretrans" "posttrans" "verifyscript")
+"pretrans" "posttrans" "verifyscript" "filetriggerin" "filetrigger"
+"filetriggerun" "filetriggerpostun" "transfiletriggerin" "transfiletrigger"
+"transfiletriggerun" "transfiletriggerun" "transfiletriggerpostun")
   "List of rpm scripts.")
 (defconst rpm-section-seperate "^%\\(\\w+\\)\\s-")
 (defconst rpm-section-regexp
   (eval-when-compile
 (concat "^%"
 (regexp-opt
- ;; From RPM 4.12.0 sources, file build/parseSpec.c: partList[].
+ ;; From RPM 4.12.90 sources, file build/parseSpec.c: partList[].
  '("package" "prep" "build" "install" "check" "clean" "preun"
"postun" "pretrans" "posttrans" "pre" "post" "files" "changelog"
"description" "triggerpostun" "triggerprein" "triggerun"
-   "triggerin" "trigger" "verifyscript" "sepolicy") t)
+   "triggerin" "trigger" "verifyscript" "sepolicy" "filetriggerin"
+   "filetrigger" "filetriggerun" "filetriggerpostun"
+   "transfiletriggerin" "transfiletrigger" "transfiletriggerun"
+   "transfiletriggerun" "transfiletriggerpostun") t)
 "\\b"))
   "Regular expression to match beginning of a section.")
 
@@ -353,7 +358,7 @@ value returned by function `user-mail-address'."
 (defvar rpm-spec-nobuild-option "--nobuild" "Option for no build.")
 
 (defvar rpm-tags-list
-  ;; From RPM 4.12.0 sources, file build/parsePreamble.c: preambleList[]:
+  ;; From RPM 4.12.90 sources, file build/parsePreamble.c: preambleList[]:
   '(("Name")
 ("Version")
 ("Release")
@@ -400,6 +405,7 @@ value returned by function `user-mail-address'."
 ("DistTag")
 ("BugURL")
 ("OrderWithRequires")
+("RemovePathPostFixes")
 ;; ...plus some from rpm5.org:
 ("CVSId")
 ("SVNId")

[nongnu] elpa/rpm-spec-mode c1c38050c4 26/67: Merge pull request #9 from scop/rpm-4.12.90

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit c1c38050c48ea330c7cea632b8785d66daeefb2b
Merge: 7d06d19a31 2276b05457
Author: Stig 
Commit: GitHub 

Merge pull request #9 from scop/rpm-4.12.90

Sync script and tag lists with rpm 4.12.90
---
 rpm-spec-mode.el | 14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index ac9d797614..299eb68ccf 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -250,18 +250,23 @@ value returned by function `user-mail-address'."
 (defconst rpm-scripts
   '("pre" "post" "preun" "postun"
 "trigger" "triggerin" "triggerprein" "triggerun" "triggerpostun"
-"pretrans" "posttrans" "verifyscript")
+"pretrans" "posttrans" "verifyscript" "filetriggerin" "filetrigger"
+"filetriggerun" "filetriggerpostun" "transfiletriggerin" "transfiletrigger"
+"transfiletriggerun" "transfiletriggerun" "transfiletriggerpostun")
   "List of rpm scripts.")
 (defconst rpm-section-seperate "^%\\(\\w+\\)\\s-")
 (defconst rpm-section-regexp
   (eval-when-compile
 (concat "^%"
 (regexp-opt
- ;; From RPM 4.12.0 sources, file build/parseSpec.c: partList[].
+ ;; From RPM 4.12.90 sources, file build/parseSpec.c: partList[].
  '("package" "prep" "build" "install" "check" "clean" "preun"
"postun" "pretrans" "posttrans" "pre" "post" "files" "changelog"
"description" "triggerpostun" "triggerprein" "triggerun"
-   "triggerin" "trigger" "verifyscript" "sepolicy") t)
+   "triggerin" "trigger" "verifyscript" "sepolicy" "filetriggerin"
+   "filetrigger" "filetriggerun" "filetriggerpostun"
+   "transfiletriggerin" "transfiletrigger" "transfiletriggerun"
+   "transfiletriggerun" "transfiletriggerpostun") t)
 "\\b"))
   "Regular expression to match beginning of a section.")
 
@@ -353,7 +358,7 @@ value returned by function `user-mail-address'."
 (defvar rpm-spec-nobuild-option "--nobuild" "Option for no build.")
 
 (defvar rpm-tags-list
-  ;; From RPM 4.12.0 sources, file build/parsePreamble.c: preambleList[]:
+  ;; From RPM 4.12.90 sources, file build/parsePreamble.c: preambleList[]:
   '(("Name")
 ("Version")
 ("Release")
@@ -400,6 +405,7 @@ value returned by function `user-mail-address'."
 ("DistTag")
 ("BugURL")
 ("OrderWithRequires")
+("RemovePathPostFixes")
 ;; ...plus some from rpm5.org:
 ("CVSId")
 ("SVNId")

[nongnu] elpa/rpm-spec-mode 1c4ee0187e 61/67: Add MELPA badges to README.org.

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit 1c4ee0187eab5f240f2de2dbf7e5c9ed5258fec2
Author: Peter Oliver 
Commit: Björn Bidar 

Add MELPA badges to README.org.
---
 README.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.org b/README.org
index 7f0bbe9f75..720920c785 100644
--- a/README.org
+++ b/README.org
@@ -1,4 +1,4 @@
-#+TITLE: rpm-spec-mode
+#+TITLE: rpm-spec-mode 
[[https://stable.melpa.org/#/rpm-spec-mode][https://stable.melpa.org/packages/rpm-spec-mode-badge.svg]]
 
[[https://melpa.org/#/rpm-spec-mode][https://melpa.org/packages/rpm-spec-mode-badge.svg]]
 
 A major-mode for editing RPM spec files.
 

[nongnu] elpa/rpm-spec-mode 85bf4e9711 49/67: Update sections for RPM 4.20.

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit 85bf4e97114fe9123c19f10764b1a5e17a12aeac
Author: Peter Oliver 
Commit: Björn Bidar 

Update sections for RPM 4.20.
---
 rpm-spec-mode.el | 91 +---
 1 file changed, 74 insertions(+), 17 deletions(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index fab875eca0..dc0706f1db 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -241,32 +241,89 @@ value returned by function `user-mail-address'."
 ;; variables used by navigation functions.
 
 (defconst rpm-sections
-  '("preamble" "description" "prep" "setup" "build" "install" "check" "clean"
-"changelog" "files")
+  '("preamble"
+"description"
+"prep"
+"generate_buildrequires"
+"conf"
+"build"
+"install"
+"check"
+"clean"
+"changelog"
+"files")
   "Partial list of section names.")
 (defconst rpm-scripts
   ;; trigger, filetrigger, transfiletrigger no found in build/parseScript.c
-  '("pre" "post" "preun" "postun"
-"trigger" "triggerin" "triggerprein" "triggerun" "triggerpostun"
-"pretrans" "posttrans" "verifyscript" "filetriggerin" "filetrigger"
-"filetriggerun" "filetriggerpostun" "transfiletriggerin" "transfiletrigger"
-"transfiletriggerun" "transfiletriggerun" "transfiletriggerpostun")
+  '("pre"
+"post"
+"preun"
+"postun"
+"trigger"
+"triggerin"
+"triggerprein"
+"triggerun"
+"triggerpostun"
+"pretrans"
+"posttrans"
+"preuntrans"
+"postuntrans"
+"verifyscript"
+"filetriggerin"
+"filetrigger"
+"filetriggerun"
+"filetriggerpostun"
+"transfiletriggerin"
+"transfiletrigger"
+"transfiletriggerun"
+"transfiletriggerun"
+"transfiletriggerpostun")
   "List of rpm scripts.")
 (defconst rpm-section-seperate "^%\\(\\w+\\)\\s-")
 (defconst rpm-section-regexp
   (eval-when-compile
 (concat "^%"
 (regexp-opt
- ;; From RPM 4.16.1.3 sources, file build/parseSpec.c: partList[].
- '("package" "prep" "generate_buildrequires" "build" "install"
-   "check" "clean" "preun" "postun" "pretrans" "posttrans"
-   "pre" "post" "files" "changelog" "description"
-   "triggerpostun" "triggerprein" "triggerun" "triggerin"
-   "trigger" "verifyscript" "sepolicy" "filetriggerin"
-   "filetrigger" "filetriggerun" "filetriggerpostun"
-   "transfiletriggerin" "transfiletrigger" "transfiletriggerun"
-   "transfiletriggerun" "transfiletriggerpostun" "end"
-   "patchlist" "sourcelist") t)
+ ;; From RPM 4.20.0 sources, file build/parseSpec.c: partList[].
+ '("package"
+   "prep"
+   "generate_buildrequires"
+   "conf"
+   "build"
+   "install"
+   "check"
+   "clean"
+   "preun"
+   "postun"
+   "pretrans"
+   "posttrans"
+   "preuntrans"
+   "postuntrans"
+   "pre"
+   "post"
+   "files"
+   "changelog"
+   "description"
+   "triggerpostun"
+   "triggerprein"
+   "triggerun"
+   "triggerin"
+   "trigger"
+   "verifyscript"
+   "sepolicy"
+   "filetriggerin"
+   "filetrigger"
+   "filetriggerun"
+   "filetriggerpostun"
+   "transfiletriggerin"
+   "transfiletrigger"
+   "transfiletriggerun"
+   "transfiletriggerun"
+   "transfiletriggerpostun"
+   "end"
+   "patchlist"
+   "sourcelist")
+ t)
 "\\b"))
   "Regular expression to match beginning of a section.")
 

[nongnu] elpa/rpm-spec-mode 9050a2f9ca 07/67: fix compilation warnings due to variable scoping

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit 9050a2f9ca49b6ab43a902bb6090d370e6bf8fae
Author: Adam Spiers 
Commit: Adam Spiers 

fix compilation warnings due to variable scoping
---
 rpm-spec-mode.el | 93 
 1 file changed, 47 insertions(+), 46 deletions(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index 09cdd4d8dc..18193383fb 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -811,22 +811,23 @@ controls whether case is significant."
   (beginning-of-line)
   (if (not what)
   (setq what (rpm-completing-read "Tag: " rpm-tags-list)))
-  (if (string-match "^%" what)
-  (setq read-text (concat "Packagename for " what ": ")
-insert-text (concat what " "))
-(setq read-text (concat what ": ")
-  insert-text (concat what ": ")))
-  (cond
-   ((string-equal what "Group")
-(rpm-insert-group))
-   ((string-equal what "Source")
-(rpm-insert-n "Source"))
-   ((string-equal what "Patch")
-(rpm-insert-n "Patch"))
-   (t
-(if file-completion
-(insert insert-text (read-file-name (concat read-text) "" "" nil) "\n")
-  (insert insert-text (read-from-minibuffer (concat read-text)) "\n")
+  (let (read-text insert-text)
+(if (string-match "^%" what)
+(setq read-text (concat "Packagename for " what ": ")
+  insert-text (concat what " "))
+  (setq read-text (concat what ": ")
+insert-text (concat what ": ")))
+(cond
+ ((string-equal what "Group")
+  (rpm-insert-group))
+ ((string-equal what "Source")
+  (rpm-insert-n "Source"))
+ ((string-equal what "Patch")
+  (rpm-insert-n "Patch"))
+ (t
+  (if file-completion
+  (insert insert-text (read-file-name (concat read-text) "" "" nil) 
"\n")
+(insert insert-text (read-from-minibuffer (concat read-text)) 
"\n"))
 
 (defun rpm-topdir ()
   (or
@@ -1018,14 +1019,14 @@ leave point at previous location."
   (if (and (buffer-modified-p)
(y-or-n-p (format "Buffer %s modified, save it? " (buffer-name
   (save-buffer))
-  (setq rpm-buffer-name
-(concat "*" rpm-spec-build-command " " buildoptions " "
-(file-name-nondirectory buffer-file-name) "*"))
-  (rpm-process-check rpm-buffer-name)
-  (if (get-buffer rpm-buffer-name)
-  (kill-buffer rpm-buffer-name))
-  (create-file-buffer rpm-buffer-name)
-  (display-buffer rpm-buffer-name)
+  (let ((rpm-buffer-name
+ (concat "*" rpm-spec-build-command " " buildoptions " "
+ (file-name-nondirectory buffer-file-name) "*")))
+(rpm-process-check rpm-buffer-name)
+(if (get-buffer rpm-buffer-name)
+(kill-buffer rpm-buffer-name))
+(create-file-buffer rpm-buffer-name)
+(display-buffer rpm-buffer-name))
   (setq buildoptions (list buildoptions buffer-file-name))
   (if (or rpm-spec-short-circuit rpm-spec-nobuild)
   (setq rpm-no-gpg t))
@@ -1215,17 +1216,17 @@ command."
 (defun rpm-update-mode-name ()
   "Update `mode-name' according to values set."
   (setq mode-name "RPM-SPEC")
-  (setq modes (concat (if rpm-spec-add-attr  "A")
-  (if rpm-spec-clean "C")
-  (if rpm-spec-nodeps"D")
-  (if rpm-spec-sign-gpg  "G")
-  (if rpm-spec-nobuild   "N")
-  (if rpm-spec-rmsource  "R")
-  (if rpm-spec-short-circuit "S")
- (if rpm-spec-quiet "Q")
-  ))
-  (if (not (equal modes ""))
-  (setq mode-name (concat mode-name ":" modes
+  (let ((modes (concat (if rpm-spec-add-attr  "A")
+   (if rpm-spec-clean "C")
+   (if rpm-spec-nodeps"D")
+   (if rpm-spec-sign-gpg  "G")
+   (if rpm-spec-nobuild   "N")
+   (if rpm-spec-rmsource  "R")
+   (if rpm-spec-short-circuit "S")
+   (if rpm-spec-quiet "Q")
+   )))
+(if (not (equal modes ""))
+(setq mode-name (concat mode-name ":" modes)
 
 ;;
 
@@ -1343,18 +1344,18 @@ if one is present in the file."
  (if (string-match "%{?\\([^}]*\\)}?$" str)
  (progn
(goto-char (point-min))
-   (setq macros (substring str (match-beginning 1)
-   (match-end 1)))
-   (search-forward-regexp
-(concat "%define[ \t]+" macros
-"[ \t]+\\(\\([0-9]\\|\\.\\)+\\)\\(.*\\)"))
-   (concat macros " " (int-to-string (1+ (string-to-number
-  (match-string 1
-   (match-string 3)))
+   (let ((macros (substr

[nongnu] elpa/rpm-spec-mode e87fc081c1 63/67: Clarify the defaults of the user-name and mail settings

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit e87fc081c1608e9436a7d0d61c874933a314047d
Author: Björn Bidar 
Commit: Björn Bidar 

Clarify the defaults of the user-name and mail settings

The documentation string was wrong after my recent change and the
meaning of the settings wasn't exactly clear.
Now that the defaults are explicitly set from nil to the actual value
used if not set otherwise.

Also make it possible for both settings to be a function.
---
 rpm-spec-mode.el | 38 +-
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index 0608ae62ad..8618982798 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -184,19 +184,17 @@ the package."
   :type 'boolean
   :group 'rpm-spec)
 
-(defcustom rpm-spec-user-full-name nil
-  "*Full name of the user.
-This is used in the change log and the Packager tag.  It defaults to the
-value returned by function `user-full-name'."
-  :type '(choice (const :tag "Use `user-full-name'" nil)
- string)
+(defcustom rpm-spec-user-full-name user-full-name
+  "Full name of the user in the change log and Packager tag.
+Can be either a string or a function."
+  :type '(choice function
+string)
   :group 'rpm-spec)
 
-(defcustom rpm-spec-user-mail-address nil
-  "*Email address of the user.
-This is used in the change log and the Packager tag.  It defaults to the
-value returned by function `user-mail-address'."
-  :type '(choice (const :tag "Use `user-mail-address'" nil)
+(defcustom rpm-spec-user-mail-address user-mail-address
+  "Email address of the user used in the change log and the Packager tag.
+Can be either a string or a function."
+  :type '(choice function
  string)
   :group 'rpm-spec)
 
@@ -830,9 +828,12 @@ If `rpm-change-log-uses-utc' is nil, \"today\" means the 
local time zone."
 (defun rpm-goto-add-change-log-header ()
   "Find change log and add header (if needed) for today."
 (rpm-goto-section "changelog")
-(let* ((address (or rpm-spec-user-mail-address
-user-mail-address))
-   (fullname (or rpm-spec-user-full-name (user-full-name)))
+(let* ((address (if (functionp rpm-spec-user-mail-address)
+(funcall rpm-spec-user-mail-address)
+ rpm-spec-user-mail-address))
+   (fullname (if (functionp rpm-spec-user-full-name)
+(funcall 
rpm-spec-user-full-name)
+  rpm-spec-user-full-name))
(system-time-locale "C")
(string (concat "* " (rpm-change-log-date-string) " "
fullname " <" address ">"
@@ -1041,9 +1042,12 @@ WHAT is the tag used."
   "Insert Packager tag."
   (beginning-of-line)
   (insert (format "Packager: %s <%s>\n"
-  (or rpm-spec-user-full-name (user-full-name))
-  (or rpm-spec-user-mail-address
-  user-mail-address
+  (if (functionp rpm-spec-user-full-name)
+ (funcall rpm-spec-user-full-name)
+   rpm-spec-user-full-name)
+  (if (functionp rpm-spec-user-mail-address)
+  (funcall rpm-spec-user-mail-address)
+   rpm-spec-user-mail-address
 
 (defun rpm-change-packager ()
   "Update Packager tag."

[nongnu] elpa/rpm-spec-mode 1896c1e52d 60/67: Fix some checkdoc warnings

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit 1896c1e52d2a9f1d3e217b665198461503fa1906
Author: Björn Bidar 
Commit: Björn Bidar 

Fix some checkdoc warnings
---
 rpm-spec-mode.el | 50 +-
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index f33f2b4404..3de0c26abf 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -726,15 +726,14 @@ ARG is passed on to `uncomment-region-default'."
 ;;
 ;; Imenu support
 (defun rpm-spec-mode-imenu-setup ()
-  "An all-in-one setup function to add `imenu' support to
-`rpm-spec-mode'."
+  "An all-in-one setup function to add `imenu' support to `rpm-spec-mode'."
   (setq imenu-create-index-function
 #'rpm-spec-mode-imenu-create-index-function))
 
 (defun rpm-spec-mode-imenu-create-index-function ()
-  "Creating a buffer index for `rpm-spec-mode' The function
-should take no arguments, and return an index alist for the
-current buffer. It is called within `save-excursion', so where it
+  "Creating a buffer index for `rpm-spec-mode'.
+The function should take no arguments, and return an index alist for the
+current buffer.  It is called within `save-excursion', so where it
 leaves point makes no difference."
   (goto-char (point-min))
   (let (rpm-imenu-index
@@ -918,9 +917,10 @@ DIRNAME is the directory."
 
 ;;
 (defun rpm-completing-read (prompt table &optional pred require init hist)
-  "Read from the minibuffer, with completion.
-Like `completing-read', but the variable `rpm-spec-completion-ignore-case'
-controls whether case is significant."
+  "Read from the minibuffer like `completing-read' but for rpms-spec-mode.
+Take `rpm-spec-completion-ignore-case' into account and forward
+all arguments i.e. PROMPT, TABLE, PRED, REQUIRE, INIT and HIST.
+Call `completing-read' accordingly."
   (let ((completion-ignore-case rpm-spec-completion-ignore-case))
 (completing-read prompt table pred require init hist)))
 
@@ -992,19 +992,19 @@ WHAT is the tag used."
   (concat "New " what ": ") (match-string 1
 (message "%s tag not found..." what))
 
-(defun rpm-change-n (what)
-  "Change given tag with possible number."
+(defun rpm-change-n (tag)
+  "Change given TAG with possible number."
   (save-excursion
 (goto-char (point-min))
-(let ((number (read-from-minibuffer (concat what " number: "
+(let ((number (read-from-minibuffer (concat tag " number: "
   (if (search-forward-regexp
-   (concat "^" what number ":\\s-*\\(.*\\)") nil t)
+   (concat "^" tag number ":\\s-*\\(.*\\)") nil t)
   (let ((default-directory (concat (rpm-topdir) "/SOURCES/")))
 (replace-match
- (concat what number ": "
- (read-file-name (concat "New " what number " file: ")
+ (concat tag number ": "
+ (read-file-name (concat "New " tag number " file: ")
  "" "" nil (match-string 1)
-(message "%s number \"%s\" not found..." what number)
+(message "%s number \"%s\" not found..." tag number)
 
 (defun rpm-insert-group (group)
   "Insert GROUP tag."
@@ -1024,17 +1024,17 @@ WHAT is the tag used."
   nil nil (match-string 1)
   (message "Group tag not found..."
 
-(defun rpm-insert-tag (&optional arg)
-  "Insert or change a tag."
+(defun rpm-insert-tag (&optional tag)
+  "Insert or change a TAG."
   (interactive "p")
   (if current-prefix-arg
-  (rpm-change arg)
+  (rpm-change tag)
 (rpm-insert)))
 
-(defun rpm-change-tag (&optional arg)
-  "Change a tag."
+(defun rpm-change-tag (&optional tag)
+  "Change a TAG."
   (interactive "p")
-  (rpm-change arg))
+  (rpm-change tag))
 
 (defun rpm-insert-packager ()
   "Insert Packager tag."
@@ -1132,7 +1132,7 @@ leave point at previous location."
  (goto-char (point-max))
 
 (defun rpm-insert-true-prefix ()
-  "Insert %{prefix}"
+  "Insert %{prefix}."
   (interactive)
   (insert "%{prefix}"))
 
@@ -1453,8 +1453,8 @@ if one is present in the file."
 (and release (concat "-" release)))
 
 (defun rpm-increase-release-with-macros (&optional increment)
-  "Increase release in spec
-If ARG is non-nil increase by ARG or 1 if not"
+  "Increase release in spec.
+Either by INCREMENT or 1 if not given."
   (let ((increment (or increment 1)))
   (save-excursion
 (let ((str
@@ -1559,7 +1559,7 @@ If ARG is non-nil increase by ARG or 1 if not"
 
 (provide 'rpm-spec-mode)
 ;;;###autoload
-(define-compilation-mode rpmbuild-mode "RPM build" ""
+(define-compilation-mode rpmbuild-mode "RPM build"
   (setq-local compilation-disable-input t))
 
 ;;; rpm-spec-mode.el ends here

[nongnu] elpa/cider 65383b8d1e 3/3: [completion] Disable client-side sorting

[ELPA Syncer]

branch: elpa/cider
commit 65383b8d1ec0ccacea913176a9398a7abc68edb7
Author: Oleksandr Yakushev 
Commit: Bozhidar Batsov 

[completion] Disable client-side sorting
---
 CHANGELOG.md| 1 +
 cider-client.el | 1 +
 cider-completion.el | 5 -
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9660d3a2c0..9fa7a0d9fd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@
 - [#3784](https://github.com/clojure-emacs/cider/issues/3784): Inspector: make 
point less erratic when navigating between inspector screens.
 - [#3790](https://github.com/clojure-emacs/cider/issues/3790): Stacktrace: 
show messages and data for all exception causes by default.
 - [#3789](https://github.com/clojure-emacs/cider/issues/3789): Refactor and 
simplify exception handling.
+- [#3789](https://github.com/clojure-emacs/cider/issues/3796): Completion: 
disable client-side sorting (defer to backend-provided candidate order).
 
 ## 1.17.1 (2025-02-25)
 
diff --git a/cider-client.el b/cider-client.el
index d03bb39572..225a43dee0 100644
--- a/cider-client.el
+++ b/cider-client.el
@@ -672,6 +672,7 @@ CONTEXT represents a completion context for compliment."
 "ns" ,(cider-current-ns)
 "prefix" ,prefix
 "context" ,context
+"sort-order" "by-name"
 ,@(when cider-enhanced-cljs-completion-p 
'("enhanced-cljs-completion?" "t")))
   (cider-nrepl-send-sync-request 
(cider-current-repl)
  
'abort-on-input
diff --git a/cider-completion.el b/cider-completion.el
index 78e64fd107..325a3868a2 100644
--- a/cider-completion.el
+++ b/cider-completion.el
@@ -211,7 +211,10 @@ performed by `cider-annotate-completion-function'."
 ;;
 ;; This api is better described in the section
 ;; '21.6.7 Programmed Completion' of the elisp manual.
-(cond ((eq action 'metadata) `(metadata (category . cider))) 
;; defines a completion category named 'cider, used later in our 
`completion-category-overrides` logic.
+(cond ((eq action 'metadata)
+   `(metadata
+ (category . cider) ;; defines a completion category 
named 'cider, used later in our `completion-category-overrides` logic.
+ (display-sort-function . identity))) ;; don't 
override sorting done by backend
   ((eq (car-safe action) 'boundaries) nil)
   (t (with-current-buffer (current-buffer)
(complete-with-action action (funcall complete) 
prefix pred)

[nongnu] elpa/rpm-spec-mode 2a9ba31f75 35/67: Use push rather than add-to-list for rpm-imenu-index

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit 2a9ba31f756557ca8bdb1a24f0ae6d47f2034ae8
Author: Björn Bidar 
Commit: Björn Bidar 

Use push rather than add-to-list for rpm-imenu-index

See build log:
lib/rpm-spec-mode/rpm-spec-mode.el:682:8: Error: ‘add-to-list’ can’t use 
lexical var ‘rpm-imenu-index’; use ‘push’ or ‘cl-pushnew’

Signed-off-by: Björn Bidar 
---
 rpm-spec-mode.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index 7bd4cc5530..a45d75513c 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -678,7 +678,7 @@ leaves point makes no difference."
   (if (setq submenu (assoc section rpm-imenu-index))
   (setf (cdr submenu)
 (cons new-index (cdr submenu)))
-(add-to-list 'rpm-imenu-index
+(push 'rpm-imenu-index
  (list section new-index
 rpm-imenu-index))
 

[nongnu] elpa/rpm-spec-mode 8c2d32191f 01/67: Initial commit

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit 8c2d32191f0455a5b72034c29257566296ec8258
Author: Stig 
Commit: Stig 

Initial commit
---
 LICENSE   | 339 ++
 README.md |   4 +
 2 files changed, 343 insertions(+)

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 00..5aa52e020c
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,339 @@
+GNU GENERAL PUBLIC LICENSE
+   Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offe

[nongnu] elpa/rpm-spec-mode de2e15d1e0 19/67: rpm-tags-list: Sync with rpm 4.12.0, order for easier sync checking

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit de2e15d1e0b81ed86e2d9aa8309f5d45eb9df70e
Author: Ville Skyttä 
Commit: Ville Skyttä 

rpm-tags-list: Sync with rpm 4.12.0, order for easier sync checking
---
 rpm-spec-mode.el | 98 ++--
 1 file changed, 52 insertions(+), 46 deletions(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index ef43ff16a5..7111ffa9a4 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -353,65 +353,71 @@ value returned by function `user-mail-address'."
 (defvar rpm-spec-nobuild-option "--nobuild" "Option for no build.")
 
 (defvar rpm-tags-list
-  ;; From RPM 4.4.9 sources, file build/parsePreamble.c: preambleList[], and
-  ;; a few macros that aren't tags, but useful here.
-  '(("AutoProv")
-("AutoReq")
-("AutoReqProv")
-("BuildArch")
-("BuildArchitectures")
-("BuildConflicts")
-("BuildEnhances")
-("BuildPlatforms")
-("BuildPreReq")
-("BuildRequires")
-("BuildRoot")
-("BuildSuggests")
-("Conflicts")
-("CVSId")
-("%description")
+  ;; From RPM 4.12.0 sources, file build/parsePreamble.c: preambleList[]:
+  '(("Name")
+("Version")
+("Release")
+("Epoch")
+("Summary")
+("License")
 ("Distribution")
-("DistTag")
 ("DistURL")
-("DocDir")
-("Enhances")
-("Epoch")
+("Vendor")
+("Group")
+("Packager")
+("URL")
+("VCS")
+("Source")
+("Patch")
+("NoSource")
+("NoPatch")
 ("ExcludeArch")
-("ExcludeOS")
 ("ExclusiveArch")
+("ExcludeOS")
 ("ExclusiveOS")
-("%files")
-("Group")
 ("Icon")
-("%ifarch")
-("Keyword")
-("Keywords")
-("License")
-("Name")
-("NoPatch")
-("NoSource")
-("Obsoletes")
-("%package")
-("Packager")
-("Patch")
-("Prefix")
-("Prefixes")
-("PreReq")
 ("Provides")
-("Release")
 ("Requires")
-("RepoTag")
-("Source")
+("Recommends")
 ("Suggests")
-("Summary")
+("Supplements")
+("Enhances")
+("PreReq")
+("Conflicts")
+("Obsoletes")
+("Prefixes")
+("Prefix")
+("BuildRoot")
+("BuildArchitectures")
+("BuildArch")
+("BuildConflicts")
+("BuildPreReq")
+("BuildRequires")
+("AutoReqProv")
+("AutoReq")
+("AutoProv")
+("DocDir")
+("DistTag")
+("BugURL")
+("OrderWithRequires")
+;; ...plus some from rpm5.org:
+("CVSId")
 ("SVNId")
-("URL")
-("Variant")
+("BuildSuggests")
+("BuildEnhances")
 ("Variants")
-("Vendor")
-("Version")
+("Variant")
 ("XMajor")
 ("XMinor")
+("RepoTag")
+("Keywords")
+("Keyword")
+("BuildPlatforms")
+;; ...plus a few macros that aren't tags but useful here.
+("%description")
+("%files")
+("%ifarch")
+("%package")
 )
   "List of elements that are valid tags.")
 

[nongnu] elpa/rpm-spec-mode c5c04c4d3c 40/67: Remove unused variable

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit c5c04c4d3c1f823467f9cbd4f532af108e24b28a
Author: Björn Bidar 
Commit: Björn Bidar 

Remove unused variable

Signed-off-by: Björn Bidar 
---
 rpm-spec-mode.el | 1 -
 1 file changed, 1 deletion(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index e3e572f8f9..369dded242 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -657,7 +657,6 @@ leaves point makes no difference."
   (goto-char (point-min))
   (let (rpm-imenu-index
 (sub-package-name-regexp 
"[[:space:]]+-n[[:space:]]+\\([-_[:alnum:]]+\\)")
-rpm-spec-imenu-index-alist
 section
 pos-marker
 subpkg-name

[elpa] externals/el-job bddf5f373e 054/143: Fix a missing reference, and replace slot "results" w two new slots

[ELPA Syncer]

branch: externals/el-job
commit bddf5f373e5f0c7b8ac91d2ed6213589195f53b5
Author: Martin Edström 
Commit: Martin Edström 

Fix a missing reference, and replace slot "results" w two new slots
---
 el-job.el | 49 -
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/el-job.el b/el-job.el
index 10b4e59482..543b1d3a9b 100644
--- a/el-job.el
+++ b/el-job.el
@@ -347,7 +347,8 @@ with one character of your choosing, such as a dot."
   spawn-args
   input-sets
   queue
-  results)
+  result-sets
+  merged-results)
 
 ;;;###autoload
 (cl-defun el-job-launch (&key load
@@ -478,7 +479,7 @@ still at work.  IF-BUSY may take on one of three symbols:
   (respawn nil)
   (exec nil))
   (el-job--with job
-  (.queue .busy .ready .sig .cores .method .spawn-args)
+  (.queue .busy .ready .sig .cores .method .spawn-args .callback)
 (unless (and .busy (eq if-busy 'noop))
   (when (functionp inputs)
 (setq inputs (funcall inputs)))
@@ -589,11 +590,11 @@ This puts them to work.  Each successful child will print 
output
 \(even nil output) to its associated process buffer, whereupon something
 should trigger `el-job--handle-output'."
   (el-job--with job
-  ( .ready .busy .input-sets .results .queue .cores .past-elapsed
+  ( .ready .busy .input-sets .result-sets .queue .cores .past-elapsed
 .timestamps .poll-timer .finish-times .anonymous .method
 .id .timeout )
 (cancel-timer .timeout)
-(setf .results nil)
+(setf .result-sets nil)
 (setf .finish-times nil)
 (let ((splits (el-job--split-optimally .queue .cores .past-elapsed)))
   (unless (length< splits (1+ (length .ready)))
@@ -690,28 +691,33 @@ If nil, infer it from the buffer, if process is still 
alive."
   (let* ((inhibit-quit t)
  (proc (or proc (get-buffer-process (current-buffer
  (job el-job-here)
- (output (condition-case err (read (buffer-string))
-   (( error )
-(el-job--unhide-buffer (el-job:stderr job))
-(dolist (proc (el-job--all-processes job))
-  (el-job--unhide-buffer (process-buffer proc))
-  (el-job--kill-quietly-keep-buffer proc))
-(error "In buffer %S: problems reading child output: %S"
-   (current-buffer) err)
-(when output
+ finish-time
+ durations
+ results)
+(condition-case err (let ((output (read (buffer-string
+  (setq finish-time (caar output))
+  (setq durations (cdar output))
+  (setq results (cdr output)))
+  (( error )
+   (el-job--unhide-buffer (el-job:stderr job))
+   (dolist (proc (el-job--all-processes job))
+ (el-job--unhide-buffer (process-buffer proc))
+ (el-job--kill-quietly-keep-buffer proc))
+   (error "In buffer %S: problems reading child output: %S"
+  (current-buffer) err)))
+(when results
   (el-job--with job
-  ( .busy .ready .input-sets .past-elapsed .results .queue
+  ( .busy .ready .input-sets .past-elapsed .result-sets .queue
 .timestamps .id .temp-hook .anonymous .method .finish-times
-.timeout )
-(push (caar output) .finish-times)
+.timeout .callback .merged-results )
+(push finish-time .finish-times)
 ;; Record time spent by FUNCALL on each item in INPUTS,
 ;; for a better `el-job--split-optimally' in the future.
-(let ((durations (cdar output))
-  (input (alist-get proc .input-sets)))
+(let ((input (alist-get proc .input-sets)))
   (while durations
 (puthash (pop input) (pop durations) .past-elapsed)))
 ;; The `car' was just this library's metadata
-(push (cdr output) .results)
+(push results .result-sets)
 (setf .busy (delq proc .busy))
 (unless (eq .method 'reap)
   (push proc .ready))
@@ -730,8 +736,9 @@ If nil, infer it from the buffer, if process is still 
alive."
 (remhash .id el-jobs))
   ;; Finally the purpose of it all.
   ;; Did this really take 700 lines of code?
-  (setf .results (el-job--zip-all .results))
-  (when .callback (funcall .callback .results job))
+  (setf .merged-results (el-job--zip-all .result-sets))
+  (when .callback
+(funcall .callback .merged-results job))
   (when .queue
 ;; There's more in the queue, run again at next good opportunity.
 (when (eq .method 'reap)

[nongnu] elpa/cider 8276e8b19b 2/3: Bump cider-nrepl to 0.53.2

[ELPA Syncer]

branch: elpa/cider
commit 8276e8b19b540c704f818fc38feb7dabc4e43cd4
Author: Oleksandr Yakushev 
Commit: Bozhidar Batsov 

Bump cider-nrepl to 0.53.2
---
 CHANGELOG.md   |  1 +
 cider.el   |  2 +-
 dev/docker-sample-project/project.clj  |  2 +-
 dev/tramp-sample-project/project.clj   |  2 +-
 .../ROOT/pages/basics/middleware_setup.adoc| 10 ++---
 doc/modules/ROOT/pages/basics/up_and_running.adoc  |  4 +-
 doc/modules/ROOT/pages/cljs/shadow-cljs.adoc   |  2 +-
 doc/modules/ROOT/pages/cljs/up_and_running.adoc|  2 +-
 test/cider-tests.el| 44 +++---
 9 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0b650c0c6..9660d3a2c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
   - `cider-stacktrace-analyze-string` and `cider-stacktrace-analyze-at-point` 
functions.
   - Automatic stacktrace parsing in log viewer.
 - Bump the injected `cider-nrepl` to 
[0.53.1](https://github.com/clojure-emacs/cider-nrepl/blob/master/CHANGELOG.md#0531-2025-03-26).
+- Bump the injected `cider-nrepl` to 
[0.53.2](https://github.com/clojure-emacs/cider-nrepl/blob/master/CHANGELOG.md#0532-2025-03-26).
   - Info: recognize printed Java classes/methods and munged Clojure functions 
in stacktrace outputs.
   - Inspector: add dedicated view for Exceptions.
   - Stop vendoring Haystack dependency.
diff --git a/cider.el b/cider.el
index 1ad952ff57..30b5a97b27 100644
--- a/cider.el
+++ b/cider.el
@@ -573,7 +573,7 @@ the artifact.")
 
 Used when `cider-jack-in-auto-inject-clojure' is set to `latest'.")
 
-(defconst cider-required-middleware-version "0.53.1"
+(defconst cider-required-middleware-version "0.53.2"
   "The CIDER nREPL version that's known to work properly with CIDER.")
 
 (defcustom cider-injected-middleware-version cider-required-middleware-version
diff --git a/dev/docker-sample-project/project.clj 
b/dev/docker-sample-project/project.clj
index ba3b18322c..b073e0db48 100644
--- a/dev/docker-sample-project/project.clj
+++ b/dev/docker-sample-project/project.clj
@@ -2,4 +2,4 @@
   :dependencies [[org.clojure/clojure "1.11.1"]
  [clj-http "3.12.3"]]
   :source-paths ["src"]
-  :plugins [[cider/cider-nrepl "0.53.1"]])
+  :plugins [[cider/cider-nrepl "0.53.2"]])
diff --git a/dev/tramp-sample-project/project.clj 
b/dev/tramp-sample-project/project.clj
index bc6f647754..d874cbe4e8 100644
--- a/dev/tramp-sample-project/project.clj
+++ b/dev/tramp-sample-project/project.clj
@@ -2,5 +2,5 @@
   :dependencies [[org.clojure/clojure "1.11.1"]
  [clj-http "3.12.3"]]
   :source-paths ["src"]
-  :plugins [[cider/cider-nrepl "0.53.1"]
+  :plugins [[cider/cider-nrepl "0.53.2"]
 [refactor-nrepl "3.9.0"]])
diff --git a/doc/modules/ROOT/pages/basics/middleware_setup.adoc 
b/doc/modules/ROOT/pages/basics/middleware_setup.adoc
index 36202e26bb..c6075de990 100644
--- a/doc/modules/ROOT/pages/basics/middleware_setup.adoc
+++ b/doc/modules/ROOT/pages/basics/middleware_setup.adoc
@@ -20,14 +20,14 @@ Use the convenient plugin for defaults, either in your 
project's
 
 [source,clojure]
 
-:plugins [[cider/cider-nrepl "0.53.1"]]
+:plugins [[cider/cider-nrepl "0.53.2"]]
 
 
 A minimal `profiles.clj` for CIDER would be:
 
 [source,clojure]
 
-{:repl {:plugins [[cider/cider-nrepl "0.53.1"]]}}
+{:repl {:plugins [[cider/cider-nrepl "0.53.2"]]}}
 
 
 WARNING: Be careful not to place this in the `:user` profile, as this way 
CIDER's
@@ -43,11 +43,11 @@ run `cider-connect` or `cider-connect-cljs`.
 
 [source,clojure]
 
-  :cider-clj {:extra-deps {cider/cider-nrepl {:mvn/version "0.53.1"}}
+  :cider-clj {:extra-deps {cider/cider-nrepl {:mvn/version "0.53.2"}}
   :main-opts ["-m" "nrepl.cmdline" "--middleware" 
"[cider.nrepl/cider-middleware]"]}
 
   :cider-cljs {:extra-deps {org.clojure/clojurescript {:mvn/version "1.10.339"}
-cider/cider-nrepl {:mvn/version "0.53.1"}
+cider/cider-nrepl {:mvn/version "0.53.2"}
 cider/piggieback {:mvn/version "0.6.0"}}
:main-opts ["-m" "nrepl.cmdline" "--middleware"

"[cider.nrepl/cider-middleware,cider.piggieback/wrap-cljs-repl]"]}
@@ -66,7 +66,7 @@ NOTE: Make sure you're using 
https://github.com/clojurephant/clojurephant[Clojur
 
 dependencies {
   devImplementation 'nrepl:nrepl:0.9.0'
-  devImplementation 'cider:cider-nrepl:0.53.1'
+  devImplementation 'cider:cider-nrepl:0.53.2'
 }
 
 tasks.named('clojureRepl') {
diff --git a/doc/modules/ROOT/pages/basics/up_and_running.adoc 
b/doc/modules/ROOT/pages/basics/up_and_running.adoc
index 16a82ec969..d69a18fe48 100644
--- a/doc/modules/ROOT/pages/basics/up_and_running.adoc
+++ b/doc/modules/ROOT/pages/basics/up_and_running.adoc
@@ -72,7 +72,7 @@ simple - CIDER pass

[nongnu] elpa/cider updated (ee6ad0ed2a -> 65383b8d1e)

[ELPA Syncer]

elpasync pushed a change to branch elpa/cider.

  from  ee6ad0ed2a Bump cider-nrepl to 0.53.1
   new  2865e6652d Remove features that relied on printed exception parsing
   new  8276e8b19b Bump cider-nrepl to 0.53.2
   new  65383b8d1e [completion] Disable client-side sorting


Summary of changes:
 CHANGELOG.md   |  5 ++
 cider-client.el|  1 +
 cider-completion.el|  5 +-
 cider-log.el   | 48 ++--
 cider-stacktrace.el| 50 +++--
 cider.el   |  2 +-
 dev/docker-sample-project/project.clj  |  2 +-
 dev/tramp-sample-project/project.clj   |  2 +-
 .../ROOT/pages/basics/middleware_setup.adoc| 10 +--
 doc/modules/ROOT/pages/basics/up_and_running.adoc  |  4 +-
 doc/modules/ROOT/pages/cljs/shadow-cljs.adoc   |  2 +-
 doc/modules/ROOT/pages/cljs/up_and_running.adoc|  2 +-
 doc/modules/ROOT/pages/debugging/logging.adoc  | 21 ++
 .../ROOT/pages/usage/dealing_with_errors.adoc  | 86 --
 test/cider-stacktrace-tests.el | 54 --
 test/cider-tests.el| 44 +--
 16 files changed, 67 insertions(+), 271 deletions(-)

[nongnu] elpa/gptel 97934261f2: gptel: Run tools in request buffer (#748)

[ELPA Syncer]

branch: elpa/gptel
commit 97934261f2418d69996b7cba78a3c63ab301e5a1
Author: Karthik Chikmagalur 
Commit: Karthik Chikmagalur 

gptel: Run tools in request buffer (#748)

* gptel.el (gptel--handle-tool-use): Currently tools run at
toplevel without setting the buffer. Run tools in the buffer from
which the request originates instead.  This is required for tools
that make use of the buffer-local context.  An example is when a
tool runs `(project-current)'. (#748)

* NEWS: Add entry about the change.
---
 NEWS |   8 +
 gptel.el | 109 +++
 2 files changed, 62 insertions(+), 55 deletions(-)

diff --git a/NEWS b/NEWS
index dda92bc0ee..45ca70d2eb 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,10 @@
 
 * 0.9.9
 
+** Breaking changes
+
+** New models and backends
+
 ** New features and UI changes
 
 - The new option ~gptel-curl-extra-args~ can be used to specify extra
@@ -10,6 +14,10 @@
   which can be used to specify Curl arguments when using a specific
   backend.
 
+- Tools now run in the buffer from which the request originates.
+
+** Notable Bug fixes
+
 * 0.9.8 2025-03-13
 
 Version 0.9.8 adds support for new Gemini, Anthropic, OpenAI,
diff --git a/gptel.el b/gptel.el
index e6ce76ec26..2e3d0ed8b2 100644
--- a/gptel.el
+++ b/gptel.el
@@ -2068,63 +2068,62 @@ Run post-response hooks."
 (with-current-buffer (plist-get info :buffer)
   (when gptel-mode
 (gptel--update-status
- (format " Calling tool..." ) 'mode-line-emphasis)))
-
-(let ((result-alist) (pending-calls))
-  (mapc ; Construct function calls
-   (lambda (tool-call)
- (letrec ((args (plist-get tool-call :args))
-  (name (plist-get tool-call :name))
-  (arg-values)
-  (tool-spec
-   (cl-find-if
-(lambda (ts) (equal (gptel-tool-name ts) name))
-(plist-get info :tools)))
-  (process-tool-result
-   (lambda (result)
- (plist-put info :tool-success t)
- (let ((result (gptel--to-string result)))
-   (plist-put tool-call :result result)
-   (push (list tool-spec args result) result-alist))
- (cl-incf tool-idx)
- (when (>= tool-idx ntools) ; All tools have run
-   (gptel--inject-prompt
-backend (plist-get info :data)
-(gptel--parse-tool-results
- backend (plist-get info :tool-use)))
-   (funcall (plist-get info :callback)
-(cons 'tool-result result-alist) info)
-   (gptel--fsm-transition fsm)
-   (if (null tool-spec)
-   (message "Unknown tool called by model: %s" name)
- (setq arg-values
-   (mapcar
-(lambda (arg)
-  (let ((key (intern (concat ":" (plist-get arg :name)
-(plist-get args key)))
-(gptel-tool-args tool-spec)))
- ;; Check if tool requires confirmation
- (if (and gptel-confirm-tool-calls (or (eq 
gptel-confirm-tool-calls t)
-   (gptel-tool-confirm 
tool-spec)))
- (push (list tool-spec arg-values process-tool-result)
-   pending-calls)
-   ;; If not, run the tool
-   (if (gptel-tool-async tool-spec)
-   (apply (gptel-tool-function tool-spec)
-  process-tool-result arg-values)
- (let ((result
-(condition-case errdata
-(apply (gptel-tool-function tool-spec) arg-values)
-  (error (mapconcat #'gptel--to-string errdata " ")
-   (funcall process-tool-result result)))
-   tool-use)
-  (when pending-calls
-(with-current-buffer (plist-get info :buffer)
+ (format " Calling tool..." ) 'mode-line-emphasis))
+
+  (let ((result-alist) (pending-calls))
+(mapc   ; Construct function calls
+ (lambda (tool-call)
+   (letrec ((args (plist-get tool-call :args))
+(name (plist-get tool-call :name))
+(arg-values)
+(tool-spec
+ (cl-find-if
+  (lambda (ts) (equal (gptel-tool-name ts) name))
+  (plist-get info :tools)))
+(process-tool-result
+ (lambda (result)
+   (plist-put info :tool-success t)
+   (let ((result (gptel--to-string result)))
+ (plist-put tool-call :result result)
+ 

[nongnu] elpa/helm 20bb1dd9b8: Add update-directory-autoloads action to HFF

[ELPA Syncer]

branch: elpa/helm
commit 20bb1dd9b8272fb44c75987583f0c3dd7c70fbff
Author: Thierry Volpiatto 
Commit: Thierry Volpiatto 

Add update-directory-autoloads action to HFF
---
 helm-files.el | 18 +-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/helm-files.el b/helm-files.el
index c2286fa40c..d1478856fe 100644
--- a/helm-files.el
+++ b/helm-files.el
@@ -113,6 +113,7 @@
 (defvar helm-fd-executable)
 (defvar wfnames-buffer)
 (defvar Info-current-file)
+(defvar generated-autoload-file)
 
 ;;; Internal vars
 ;;
@@ -4535,6 +4536,20 @@ Arg FILE is the real part of candidate, a filename with 
no props."
   (setq rep (make-string (/ count 2) ?!))
   (replace-regexp-in-string "[!]+" rep (buffer-string)
 
+(defun helm-ff-update-directory-autoloads (_candidate)
+  "Action to update or create autoloads file in current directory."
+  (let ((default-directory helm-ff-default-directory)
+(file
+ (read-file-name "Write autoload definitions to file: "
+ helm-ff-default-directory
+ nil nil nil
+ (lambda (f)
+   (string-match "autoloads\\|loaddefs" f)
+(if (fboundp 'loaddefs-generate)
+(loaddefs-generate default-directory file)
+  (let ((generated-autoload-file file))
+(update-directory-autoloads default-directory)
+
 (defun helm-find-files-action-transformer (actions candidate)
   "Action transformer for `helm-source-find-files'."
   (let ((str-at-point (with-helm-current-buffer
@@ -4589,7 +4604,8 @@ Arg FILE is the real part of candidate, a filename with 
no props."
. ,(lambda (_)
 (async-byte-recompile-directory
  helm-ff-default-directory)))
-  ("Load File(s) `M-L'" . helm-find-files-load-files))
+  ("Load File(s) `M-L'" . helm-find-files-load-files)
+  ("Update directory autoloads" . 
helm-ff-update-directory-autoloads))
 2))
   ((string-match (concat (regexp-opt load-suffixes) "\\'") candidate)
(helm-append-at-nth

[nongnu] main 0ef91e3285: elpa-packages (rpm-spec-mode): New package

[Stefan Monnier via]

branch: main
commit 0ef91e3285d0a55b9783ee12c7d346d99aa4af56
Author: Stefan Monnier 
Commit: Stefan Monnier 

elpa-packages (rpm-spec-mode): New package
---
 elpa-packages | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/elpa-packages b/elpa-packages
index 5cf1cbd29c..4a5f54e7e5 100644
--- a/elpa-packages
+++ b/elpa-packages
@@ -762,6 +762,8 @@
   :readme "README.md"
   :news "changelog.org")
 
+ (rpm-spec-mode:url "https://github.com/Thaodan/rpm-spec-mode";)
+
  ;; (rocket-chat   :url "https://github.com/4hiziri/rocket-chat";)
 
  (rubocop  :url "https://github.com/rubocop/rubocop-emacs";)

[nongnu] elpa/rpm-spec-mode eb541f8c0c 13/67: Merge pull request #1 from aspiers/master

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit eb541f8c0c7245aa242d791191225a45ba37814a
Merge: e31b6957e5 796114105f
Author: Stig 
Commit: Stig 

Merge pull request #1 from aspiers/master

compilation fixes and other misc tweaks
---
 rpm-spec-mode.el | 110 +--
 1 file changed, 58 insertions(+), 52 deletions(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index 073129d316..d2fb41484b 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -34,6 +34,8 @@
 ;;   for Red Hat adaptions and some fixes.
 ;; Chmouel Boudjnah  for Mandrake fixes.
 ;; Ville Skytt�   for some fixes.
+;; Adam Spiers  for GNU emacs compilation
+;;  and other misc fixes.
 
 ;;; ToDo:
 
@@ -66,6 +68,8 @@
 
 (defconst rpm-spec-mode-version "0.14" "Version of `rpm-spec-mode'.")
 
+(eval-and-compile (defvar running-xemacs nil))
+
 (defgroup rpm-spec nil
   "RPM spec mode with Emacs/XEmacs enhancements."
   :prefix "rpm-spec-"
@@ -246,7 +250,7 @@ value returned by function `user-mail-address'."
 (defconst rpm-scripts
   '("pre" "post" "preun" "postun"
 "trigger" "triggerin" "triggerprein" "triggerun" "triggerpostun"
-"pretrans" "posttrans")
+"pretrans" "posttrans" "verifyscript")
   "List of rpm scripts.")
 (defconst rpm-section-seperate "^%\\(\\w+\\)\\s-")
 (defconst rpm-section-regexp
@@ -482,6 +486,8 @@ value returned by function `user-mail-address'."
   (modify-syntax-entry ?| "." rpm-spec-mode-syntax-table)
   (modify-syntax-entry ?\' "." rpm-spec-mode-syntax-table))
 
+(eval-when-compile (or running-xemacs (defun set-keymap-name (a b
+
 (defvar rpm-spec-mode-map nil
   "Keymap used in `rpm-spec-mode'.")
 (unless rpm-spec-mode-map
@@ -604,7 +610,7 @@ value returned by function `user-mail-address'."
  '(1 'rpm-spec-tag-face))
'("%\\(de\\(fine\\|scription\\)\\|files\\|global\\|package\\)[ 
\t]+\\([^-][^ \t\n]*\\)"
  (3 rpm-spec-package-face))
-   '("%p\\(ost\\|re\\)\\(un\\|trans\\)?[ \t]+\\([^-][^ \t\n]*\\)"
+   '("^%p\\(ost\\|re\\)\\(un\\|trans\\)?[ \t]+\\([^-][^ \t\n]*\\)"
  (3 rpm-spec-package-face))
'("%configure " 0 rpm-spec-macro-face)
'("%dir[ \t]+\\([^ \t\n]+\\)[ \t]*" 1 rpm-spec-dir-face)
@@ -699,8 +705,7 @@ with no args, if that value is non-nil."
 
 (defun rpm-command-filter (process string)
   "Filter to process normal output."
-  (save-excursion
-(set-buffer (process-buffer process))
+  (with-current-buffer (process-buffer process)
 (save-excursion
   (goto-char (process-mark process))
   (insert-before-markers string)
@@ -811,22 +816,23 @@ controls whether case is significant."
   (beginning-of-line)
   (if (not what)
   (setq what (rpm-completing-read "Tag: " rpm-tags-list)))
-  (if (string-match "^%" what)
-  (setq read-text (concat "Packagename for " what ": ")
-insert-text (concat what " "))
-(setq read-text (concat what ": ")
-  insert-text (concat what ": ")))
-  (cond
-   ((string-equal what "Group")
-(rpm-insert-group))
-   ((string-equal what "Source")
-(rpm-insert-n "Source"))
-   ((string-equal what "Patch")
-(rpm-insert-n "Patch"))
-   (t
-(if file-completion
-(insert insert-text (read-file-name (concat read-text) "" "" nil) "\n")
-  (insert insert-text (read-from-minibuffer (concat read-text)) "\n")
+  (let (read-text insert-text)
+(if (string-match "^%" what)
+(setq read-text (concat "Packagename for " what ": ")
+  insert-text (concat what " "))
+  (setq read-text (concat what ": ")
+insert-text (concat what ": ")))
+(cond
+ ((string-equal what "Group")
+  (call-interactively 'rpm-insert-group))
+ ((string-equal what "Source")
+  (rpm-insert-n "Source"))
+ ((string-equal what "Patch")
+  (rpm-insert-n "Patch"))
+ (t
+  (if file-completion
+  (insert insert-text (read-file-name (concat read-text) "" "" nil) 
"\n")
+(insert insert-text (read-from-minibuffer (concat read-text)) 
"\n"))
 
 (defun rpm-topdir ()
   (or
@@ -842,7 +848,7 @@ controls whether case is significant."
   (save-excursion
 (goto-char (point-max))
 (if (search-backward-regexp (concat "^" what "\\([0-9]*\\):") nil t)
-(let ((release (1+ (string-to-int (match-string 1)
+(let ((release (1+ (string-to-number (match-string 1)
   (forward-line 1)
   (let ((default-directory (concat (rpm-topdir) "/SOURCES/")))
 (insert what (int-to-string release) ": "
@@ -1018,14 +1024,14 @@ leave point at previous location."
   (if (and (buffer-modified-p)
(y-or-n-p (format "Buffer %s modified, save it? " (buffer-name
   (save-buffer))
-  (setq rpm-buffer-name
-(concat "*" rpm-spec-build-command " " buildoptions " "
-(file-name-nondirectory buffer-file-name) "*"))
-  (rpm-process-check rpm-buffer-name)
-  (if (get-buffer rpm-buffer-name)
-  (kill-buffer rpm-buff

[nongnu] elpa/rpm-spec-mode c34dfd343d 59/67: Improve package metadata replaces references to XEmacs

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit c34dfd343dcc69b53c8200321659f3fe8a98c377
Author: Björn Bidar 
Commit: Björn Bidar 

Improve package metadata replaces references to XEmacs
---
 rpm-spec-mode.el | 21 +++--
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index cd5913bde0..f33f2b4404 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -3,23 +3,32 @@
 ;; Copyright (C) 1997-2015 Stig Bjørlykke, 
 
 ;; Author:   Stig Bjørlykke, 
-;; Keywords: unix, languages
+;; Tore Olsen 
+;; Steve Sanbeg 
+;; Tim Powers 
+;; Trond Eivind Glomsrød 
+;; Chmouel Boudjnah 
+;; Ville Skyttä 
+;; Adam Spiers 
+
+;; Keywords: unix languages rpm
 ;; Version:  0.16
+;; URL: https://github.com/Thaodan/rpm-spec-mode/
+;; Package-Requires: ((emacs "27.1"))
 
-;; This file is part of XEmacs.
-
-;; XEmacs is free software; you can redistribute it and/or modify
+;; This file was part of XEmacs.
+;; RPM-Spec-Mode 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 2, or (at your option)
 ;; any later version.
 
-;; XEmacs is distributed in the hope that it will be useful,
+;; RPM-Spec-Mode 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 XEmacs; see the file COPYING.  If not, write to the
+;; along with RPM-Spec-Mode; see the file COPYING.  If not, write to the
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301 USA.
 

[nongnu] elpa/rpm-spec-mode c03a1ead2a 56/67: Import ChangeLog from XEmacs

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit c03a1ead2ab30b68f2ba25745df2a4b8de7dea52
Author: Björn Bidar 
Commit: Björn Bidar 

Import ChangeLog from XEmacs

Take the relevant entries from XEmacs's ChangeLog prog-modes repository
where this mode originated from.
---
 ChangeLog | 200 ++
 1 file changed, 200 insertions(+)

diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 00..b4718edb5d
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,200 @@
+2009-02-20  Ville Skytt  
+
+   * rpm-spec-mode.el (rpm-spec-font-lock-keywords): Fontify
+   package names after %pretrans and %posttrans.
+   (rpm-spec-mode-version): Set to 0.12.3x.
+
+2008-10-10  Ville Skytt  
+
+   * rpm-spec-mode.el (rpm-increase-release-with-macros): Anchor
+   another tag search regexp at beginning of line, drop unneeded concat.
+   (rpm-spec-mode-version): Set to 0.12.2x.
+
+2008-10-10  Jens Petersen 
+
+   * rpm-spec-mode.el (rpm-spec-field-value): Tags must start at
+   beginning of line, anchor search regexp there.
+
+2008-02-10  Ville Skytt  
+
+   * rpm-spec-mode.el (rpm-increase-release-tag): Increase last digit
+   of the release tag instead of the first (eg. Y of X.Y, not X), with
+   some heuristics in deciding what the desired "last" digit is.
+   (rpm-spec-mode-version): Set to 0.12.1x.
+
+2007-11-01  Ville Skytt  
+
+   * rpm-spec-mode.el (rpm-spec-user-mail-address): New compatibility
+   wrapper function, takes care eg. of `user-mail-address' not being
+   a function in GNU Emacs.
+
+2007-05-27  Ville Skytt  
+
+   * rpm-spec-mode.el (rpm-spec-field-value): Use `condition-case'
+   instead of `ignore-errors' (not autoloaded in GNU Emacs).
+
+2007-05-09  Ville Skytt  
+
+   * rpm-spec-mode.el: Update FSF's address in comments.
+   (rpm-spec-mode-version): 0.12x.
+   (rpm-tags-list): Sync with rpm 4.4.9.
+   (rpm-section-regexp): Ditto.
+   (rpm-scripts): Ditto.
+   (rpm-change): `message' format string usage fix.
+   (rpm-change-n): Ditto.
+   (rpm-build-prepare): Ditto.
+   (rpm-list-check): Ditto.
+   (rpm-build-binary): Ditto.
+   (rpm-build-source): Ditto.
+   (rpm-build-all): Ditto.
+   (rpm-increase-release-tag): Ditto.
+   (rpm-increase-release-with-macros): Ditto.
+   (rpm-tags-regexp): New; regexp for matching valid tags.
+   (rpm-obsolete-tags-list): New; list of obsolete tags.
+   (rpm-obsolete-tags-regexp): New; regexp for matching obsolete tags.
+   (rpm-spec-obsolete-tag-face): New; face for obsolete tags.
+   (rpm-spec-font-lock-keywords): Use `rpm-tags-regexp',
+   `rpm-obsolete-tags-regexp' and `rpm-spec-obsolete-tag-face'.
+   (rpm-increase-release-tag): Permit whitespace between tag and colon.
+   (rpm-increase-release-with-macros): Ditto.
+   (rpm-spec-font-lock-keywords): Ditto.
+   (rpm-spec-font-lock-keywords): Treat %global like %define.
+
+2005-07-08  Ville Skytt  
+
+   * rpm-spec-mode.el (rpm-spec-build-command): Sync with upstream.
+   (rpm-section-regexp): Sync with rpm 4.4.1.
+   (rpm-tags-list): Ditto.
+   (rpm-spec-field-value): Improve macro expansion.
+
+   * rpm-spec-mode.el.upstream: Sync with upstream.
+
+2003-09-02  Ville Skytt  
+
+   * rpm-spec-mode.el (rpm-spec-intitialize): Integer concatenation
+   fix for default-epoch != nil, avoid extra newline at the end.
+   Thanks to Enrico Scholz.
+
+2003-08-18  Ville Skytt  
+
+   * rpm-spec-mode.el: Add %check section (rpm >= 4.1.1).
+   Fix/sync XEmacs/GNU -style face docstrings.
+   Add support for highlighting specfile section markers.
+
+2003-08-03  Ville Skytt  
+
+   * rpm-spec-mode.el (rpm-build): Set EMACS=t in environment
+   to emulate `compilation-mode'.
+   (rpm-spec-faces): Add "rpm-spec-" prefix.
+
+2003-06-27  Damien Nad  
+
+   * rpm-spec-mode.el (rpm-spec-field-value): Fix macro expansion.
+
+2003-06-27  Damien Nad  
+
+   * rpm-spec-mode.el: New customization options.
+   (rpm-spec-default-release): New.
+   (rpm-spec-default-epoch): New.
+   (rpm-spec-default-build-section): New.
+   (rpm-spec-default-install-section): New.
+   (rpm-spec-default-clean-section): New.
+   (rpm-spec-default-buildroot): New.
+   (rpm-spec-mode-new-file-hook): New.
+
+2003-06-27  Ville Skytt  
+
+   * rpm-spec-mode.el (rpm-spec-font-lock-keywords):
+   Allow underscores in tags (eg. for Summary(en_US)).
+   (auto-mode-alist): Use rpm-spec-mode for *.spec.in too.
+
+2003-01-19  Ville Skytt  
+
+   * rpm-spec-mode.el (rpm-spec-use-compilation-mode): New.
+   (rpm-build): Prompt for saving if buffer modified, build
+   in compilation-mode if it's available and
+   rpm-spec-use-compilation-mode is non-nil.
+
+2003-01-06  Ville Skytt  
+
+   * rpm-spec-mode.el: Make auto-mode and interpreter-mode

[nongnu] elpa/rpm-spec-mode 04ccfdbe97 36/67: Update RPM related stuff to 4.16.1.3

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit 04ccfdbe9711fe7622784f121a1f489476c3a2c5
Author: zzndb <20870493+zz...@users.noreply.github.com>
Commit: Björn Bidar 

Update RPM related stuff to 4.16.1.3

* clean file follow flycheck

(cherry picked from commit ​4fdad909b8d2d47b9d776d4fadecb38a6f6bc6be)

Signed-off-by: Björn Bidar 
(cherry picked from commit 367033211f87e68e3a6d7c1fb3ab878cfa9d1283)
---
 rpm-spec-mode.el | 20 
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index a45d75513c..ccc1645eab 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -1,4 +1,4 @@
-;;; rpm-spec-mode.el --- RPM spec file editing commands for Emacs/XEmacs
+;;; rpm-spec-mode.el --- RPM spec mode for Emacs/XEmacs -*- lexical-binding:t 
-*-
 
 ;; Copyright (C) 1997-2015 Stig Bjørlykke, 
 
@@ -248,6 +248,7 @@ value returned by function `user-mail-address'."
 ("check") ("clean") ("changelog") ("files"))
   "Partial list of section names.")
 (defconst rpm-scripts
+  ;; trigger, filetrigger, transfiletrigger no found in build/parseScript.c
   '("pre" "post" "preun" "postun"
 "trigger" "triggerin" "triggerprein" "triggerun" "triggerpostun"
 "pretrans" "posttrans" "verifyscript" "filetriggerin" "filetrigger"
@@ -259,14 +260,16 @@ value returned by function `user-mail-address'."
   (eval-when-compile
 (concat "^%"
 (regexp-opt
- ;; From RPM 4.12.90 sources, file build/parseSpec.c: partList[].
- '("package" "prep" "build" "install" "check" "clean" "preun"
-   "postun" "pretrans" "posttrans" "pre" "post" "files" "changelog"
-   "description" "triggerpostun" "triggerprein" "triggerun"
-   "triggerin" "trigger" "verifyscript" "sepolicy" "filetriggerin"
+ ;; From RPM 4.16.1.3 sources, file build/parseSpec.c: partList[].
+ '("package" "prep" "generate_buildrequires" "build" "install"
+   "check" "clean" "preun" "postun" "pretrans" "posttrans"
+   "pre" "post" "files" "changelog" "description"
+   "triggerpostun" "triggerprein" "triggerun" "triggerin"
+   "trigger" "verifyscript" "sepolicy" "filetriggerin"
"filetrigger" "filetriggerun" "filetriggerpostun"
"transfiletriggerin" "transfiletrigger" "transfiletriggerun"
-   "transfiletriggerun" "transfiletriggerpostun") t)
+   "transfiletriggerun" "transfiletriggerpostun" "end"
+   "patchlist" "sourcelist") t)
 "\\b"))
   "Regular expression to match beginning of a section.")
 
@@ -350,7 +353,7 @@ value returned by function `user-mail-address'."
 (defvar rpm-spec-nobuild-option "--nobuild" "Option for no build.")
 
 (defvar rpm-tags-list
-  ;; From RPM 4.12.90 sources, file build/parsePreamble.c: preambleList[]:
+  ;; From RPM 4.16.1.3 sources, file build/parsePreamble.c: preambleList[]:
   '(("Name")
 ("Version")
 ("Release")
@@ -398,6 +401,7 @@ value returned by function `user-mail-address'."
 ("BugURL")
 ("OrderWithRequires")
 ("RemovePathPostFixes")
+("ModularityLabel")
 ;; ...plus some from rpm5.org:
 ("CVSId")
 ("SVNId")

[nongnu] elpa/rpm-spec-mode c20a6f0160 52/67: Merge RPM 4.20 changes into thaodan/personal_merger [#3]

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit c20a6f0160a1272a579392b329c0e1eed5f937e7
Merge: c69847de7a 582463111a
Author: Björn Bidar 
Commit: Björn Bidar 

Merge RPM 4.20 changes into thaodan/personal_merger [#3]
---
 rpm-spec-mode.el | 96 +---
 1 file changed, 78 insertions(+), 18 deletions(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index d36c92df3c..681e781d4c 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -241,32 +241,87 @@ value returned by function `user-mail-address'."
 ;; variables used by navigation functions.
 
 (defconst rpm-sections
-  '("preamble" "description" "prep" "setup" "build" "install" "check" "clean"
-"changelog" "files")
+  '("preamble"
+"description"
+"prep"
+"generate_buildrequires"
+"conf"
+"build"
+"install"
+"check"
+"clean"
+"files"
+"changelog")
   "Partial list of section names.")
 (defconst rpm-scripts
   ;; trigger, filetrigger, transfiletrigger no found in build/parseScript.c
-  '("pre" "post" "preun" "postun"
-"trigger" "triggerin" "triggerprein" "triggerun" "triggerpostun"
-"pretrans" "posttrans" "verifyscript" "filetriggerin" "filetrigger"
-"filetriggerun" "filetriggerpostun" "transfiletriggerin" "transfiletrigger"
-"transfiletriggerun" "transfiletriggerun" "transfiletriggerpostun")
+  '("pre"
+"post"
+"preun"
+"postun"
+"trigger"
+"triggerin"
+"triggerprein"
+"triggerun"
+"triggerpostun"
+"pretrans"
+"posttrans"
+"preuntrans"
+"postuntrans"
+"verifyscript"
+"filetriggerin"
+"filetrigger"
+"filetriggerun"
+"filetriggerpostun"
+"transfiletriggerin"
+"transfiletrigger"
+"transfiletriggerun"
+"transfiletriggerpostun")
   "List of rpm scripts.")
 (defconst rpm-section-seperate "^%\\(\\w+\\)\\s-")
 (defconst rpm-section-regexp
   (eval-when-compile
 (concat "^%"
 (regexp-opt
- ;; From RPM 4.16.1.3 sources, file build/parseSpec.c: partList[].
- '("package" "prep" "generate_buildrequires" "build" "install"
-   "check" "clean" "preun" "postun" "pretrans" "posttrans"
-   "pre" "post" "files" "changelog" "description"
-   "triggerpostun" "triggerprein" "triggerun" "triggerin"
-   "trigger" "verifyscript" "sepolicy" "filetriggerin"
-   "filetrigger" "filetriggerun" "filetriggerpostun"
-   "transfiletriggerin" "transfiletrigger" "transfiletriggerun"
-   "transfiletriggerun" "transfiletriggerpostun" "end"
-   "patchlist" "sourcelist") t)
+ ;; From RPM 4.20.0 sources, file build/parseSpec.c: partList[].
+ '("package"
+   "prep"
+   "generate_buildrequires"
+   "conf"
+   "build"
+   "install"
+   "check"
+   "clean"
+   "preun"
+   "postun"
+   "pretrans"
+   "posttrans"
+   "preuntrans"
+   "postuntrans"
+   "pre"
+   "post"
+   "files"
+   "changelog"
+   "description"
+   "triggerpostun"
+   "triggerprein"
+   "triggerun"
+   "triggerin"
+   "trigger"
+   "verifyscript"
+   "sepolicy"
+   "filetriggerin"
+   "filetrigger"
+   "filetriggerun"
+   "filetriggerpostun"
+   "transfiletriggerin"
+   "transfiletrigger"
+   "transfiletriggerun"
+   "transfiletriggerpostun"
+   "end"
+   "patchlist"
+   "sourcelist")
+ t)
 "\\b"))
   "Regular expression to match beginning of a section.")
 
@@ -350,13 +405,14 @@ value returned by function `user-mail-address'."
 (defvar rpm-spec-nobuild-option "--nobuild" "Option for no build.")
 
 (defvar rpm-tags-list
-  ;; From RPM 4.16.1.3 sources, file build/parsePreamble.c: preambleList[]:
+  ;; From RPM 4.20.0 sources, file build/parsePreamble.c: preambleList[]:
   '(("Name")
 ("Version")
 ("Release")
 ("Epoch")
 ("Summary")
 ("License")
+("SourceLicense")
 ("Distribution")
 ("DistURL")
 ("Vendor")
@@ -388,14 +444,18 @@ value returned by function `user-mail-address'."
 ("BuildArchitectures")
 ("BuildArch")
 ("BuildConflicts")
+("BuildOption")
 ("BuildPreReq")
 ("BuildRequires")
+("BuildSystem")
 ("AutoReqProv")
 ("AutoReq")
 ("AutoProv")
 ("DocDir")
 ("DistTag")
 ("BugURL")
+("TranslationURL")
+("UpstreamReleases")
 ("OrderWithRequires")
 ("RemovePathPostFixes")
 ("ModularityLabel")

[nongnu] elpa/rpm-spec-mode e2421d4f91 50/67: Eliminate duplicate transfiletriggerun entries

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit e2421d4f91657bcc335b4028c1eb6ca730a848f4
Author: Peter Oliver 
Commit: Björn Bidar 

Eliminate duplicate transfiletriggerun entries
---
 rpm-spec-mode.el | 2 --
 1 file changed, 2 deletions(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index dc0706f1db..03ed125c9a 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -276,7 +276,6 @@ value returned by function `user-mail-address'."
 "transfiletriggerin"
 "transfiletrigger"
 "transfiletriggerun"
-"transfiletriggerun"
 "transfiletriggerpostun")
   "List of rpm scripts.")
 (defconst rpm-section-seperate "^%\\(\\w+\\)\\s-")
@@ -318,7 +317,6 @@ value returned by function `user-mail-address'."
"transfiletriggerin"
"transfiletrigger"
"transfiletriggerun"
-   "transfiletriggerun"
"transfiletriggerpostun"
"end"
"patchlist"

[nongnu] elpa/rpm-spec-mode 9e9c89fb89 21/67: Merge pull request #4 from scop/email-address

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit 9e9c89fb89c4fceb4afce6cda0d67f4ce25cf202
Merge: 405805ef46 3a1cf3d4a9
Author: Stig 
Commit: Stig 

Merge pull request #4 from scop/email-address

Update my email address
---
 rpm-spec-mode.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index 7111ffa9a4..caa0ea158a 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -33,7 +33,7 @@
 ;; Tim Powers  and Trond Eivind Glomsr�d
 ;;   for Red Hat adaptions and some fixes.
 ;; Chmouel Boudjnah  for Mandrake fixes.
-;; Ville Skytt�   for some fixes.
+;; Ville Skytt�   for some fixes.
 ;; Adam Spiers  for GNU emacs compilation
 ;;  and other misc fixes.
 

[nongnu] elpa/rpm-spec-mode 53c90b5404 15/67: Update rpm-spec-mode-version to current version.

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit 53c90b5404f97e888057c75c6c40da65372ffe85
Author: stig 
Commit: stig 

Update rpm-spec-mode-version to current version.
---
 rpm-spec-mode.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index c232d35f55..d4e4a4ff8b 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -66,7 +66,7 @@
 ;;; Code:
 (require 'compile)
 
-(defconst rpm-spec-mode-version "0.14" "Version of `rpm-spec-mode'.")
+(defconst rpm-spec-mode-version "0.15" "Version of `rpm-spec-mode'.")
 
 (eval-and-compile (defvar running-xemacs nil))
 

[nongnu] elpa/rpm-spec-mode d3537f8f6d 11/67: prevent %pre etc. being highlighted in comments

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit d3537f8f6d4e59639d059b3c010d24e71918519f
Author: Adam Spiers 
Commit: Adam Spiers 

prevent %pre etc. being highlighted in comments
---
 rpm-spec-mode.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index 089ba7749f..568b9e8bb8 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -608,7 +608,7 @@ value returned by function `user-mail-address'."
  '(1 'rpm-spec-tag-face))
'("%\\(de\\(fine\\|scription\\)\\|files\\|global\\|package\\)[ 
\t]+\\([^-][^ \t\n]*\\)"
  (3 rpm-spec-package-face))
-   '("%p\\(ost\\|re\\)\\(un\\|trans\\)?[ \t]+\\([^-][^ \t\n]*\\)"
+   '("^%p\\(ost\\|re\\)\\(un\\|trans\\)?[ \t]+\\([^-][^ \t\n]*\\)"
  (3 rpm-spec-package-face))
'("%configure " 0 rpm-spec-macro-face)
'("%dir[ \t]+\\([^ \t\n]+\\)[ \t]*" 1 rpm-spec-dir-face)

[nongnu] elpa/rpm-spec-mode 3a1cf3d4a9 17/67: Update my email address

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit 3a1cf3d4a961b4f63105d4adc4e71993125e3b92
Author: Ville Skyttä 
Commit: Ville Skyttä 

Update my email address
---
 rpm-spec-mode.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index d4e4a4ff8b..f8af4221e1 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -33,7 +33,7 @@
 ;; Tim Powers  and Trond Eivind Glomsr�d
 ;;   for Red Hat adaptions and some fixes.
 ;; Chmouel Boudjnah  for Mandrake fixes.
-;; Ville Skytt�   for some fixes.
+;; Ville Skytt�   for some fixes.
 ;; Adam Spiers  for GNU emacs compilation
 ;;  and other misc fixes.
 

[nongnu] elpa/rpm-spec-mode e9d164f35a 18/67: rpm-section-regexp: Sync with rpm 4.12.0, order for easier sync checking

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit e9d164f35ab01cca78634669ccd35c392331fbb6
Author: Ville Skyttä 
Commit: Ville Skyttä 

rpm-section-regexp: Sync with rpm 4.12.0, order for easier sync checking
---
 rpm-spec-mode.el | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index d4e4a4ff8b..ef43ff16a5 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -257,11 +257,11 @@ value returned by function `user-mail-address'."
   (eval-when-compile
 (concat "^%"
 (regexp-opt
- ;; From RPM 4.6.0 sources, file build/parseSpec.c: partList[].
- '("build" "changelog" "check" "clean" "description" "files"
-   "install" "package" "post" "postun" "pretrans" "posttrans"
-   "pre" "prep" "preun" "trigger" "triggerin" "triggerpostun"
-   "triggerprein" "triggerun" "verifyscript") t)
+ ;; From RPM 4.12.0 sources, file build/parseSpec.c: partList[].
+ '("package" "prep" "build" "install" "check" "clean" "preun"
+   "postun" "pretrans" "posttrans" "pre" "post" "files" "changelog"
+   "description" "triggerpostun" "triggerprein" "triggerun"
+   "triggerin" "trigger" "verifyscript" "sepolicy") t)
 "\\b"))
   "Regular expression to match beginning of a section.")
 

[nongnu] elpa/rpm-spec-mode 2c00614768 55/67: Revert Improve rpm-spec-mode GNU compat (condition-case instead of ignore-errors)

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit 2c006147680de4e24a2298470e6860112be093a4
Author: Björn Bidar 
Commit: Björn Bidar 

Revert Improve rpm-spec-mode GNU compat (condition-case instead of 
ignore-errors)

ignore-errors is autoloaded these days.
---
 rpm-spec-mode.el | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index 42999ffab6..54829cf4b4 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -1398,7 +1398,7 @@ command."
   "Get the value of FIELD, searching up to buffer position MAX.
 See `search-forward-regexp'."
   (save-excursion
-(condition-case nil
+(ignore-errors
   (let ((str
  (progn
(goto-char (point-min))
@@ -1422,8 +1422,7 @@ See `search-forward-regexp'."
 (concat start-string end-string)
   ;; Leave as is.
   str)))
-  str))
-  (error nil
+  str)
 
 (defun rpm-find-spec-version (&optional with-epoch)
   "Get the version string.

[nongnu] elpa/rpm-spec-mode 8603ea1d45 64/67: Fix interactive functions

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit 8603ea1d45c4430f73a733db7b3973ef353298e0
Author: Björn Bidar 
Commit: Björn Bidar 

Fix interactive functions

Functions that don't make use of the prefix argument (C-u)
simply should not have the "p" arg in (interactive),
instead of always passing an unused optional arg.

Incidentally, removing the "p" also fixes
rpm-insert-{file,config,doc,ghost,dir,docdir}
which were wrongly passing the prefix arg as the filename/dirname.
E.g. C-u 5 M-x rpm-insert-file was wrongly inserting "5" as the filename.

Th commit message is the same since purpose of the commit is still the
same however I complete replaced the original commit by using
interactive prompts for the mandatory arguments.

(cherry picked from commit 9de017d728e459a19124bd6a4a365ec96c228849)
---
 rpm-spec-mode.el | 61 +++-
 1 file changed, 29 insertions(+), 32 deletions(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index 8618982798..b4a71ffe8c 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -881,40 +881,34 @@ using FILETYPE to prompt the user."
   rpm-default-group ") ")))
 (insert filetype)))
 
-(defun rpm-insert-file (&optional filename)
-  "Insert regular file.
-Use FILENAME or, if interactive, prompt."
-  (interactive "p")
+(defun rpm-insert-file (filename)
+  "Insert file FILENAME."
+  (interactive "FFilename: ")
   (rpm-insert-f "" filename))
 
-(defun rpm-insert-config (&optional filename)
-  "Insert config file.
-FILENAME is the config file."
-  (interactive "p")
+(defun rpm-insert-config (filename)
+  "Insert config file FILENAME."
+  (interactive "FFilename: ")
   (rpm-insert-f "%config " filename))
 
-(defun rpm-insert-doc (&optional filename)
-  "Insert doc file.
-FILENAME is the doc file."
-  (interactive "p")
+(defun rpm-insert-doc (filename)
+  "Insert doc file FILENAME."
+  (interactive "FFilename: ")
   (rpm-insert-f "%doc " filename))
 
-(defun rpm-insert-ghost (&optional filename)
-  "Insert ghost file.
-FILENAME is the ghost file."
-  (interactive "p")
+(defun rpm-insert-ghost (filename)
+  "Insert ghost file FILENAME."
+  (interactive "FFilename: ")
   (rpm-insert-f "%ghost " filename))
 
-(defun rpm-insert-dir (&optional dirname)
-  "Insert directory.
-DIRNAME is the directory."
-  (interactive "p")
+(defun rpm-insert-dir (dirname)
+  "Insert directory DIRNAME."
+  (interactive "GDirectory: ")
   (rpm-insert-f "%dir " dirname))
 
-(defun rpm-insert-docdir (&optional dirname)
-  "Insert doc directory.
-DIRNAME is the directory."
-  (interactive "p")
+(defun rpm-insert-docdir (dirname)
+  "Insert doc directory DIRNAME."
+  (interactive "GDirectory: ")
   (rpm-insert-f "%docdir " dirname))
 
 ;;
@@ -978,6 +972,7 @@ WHAT is the tag used."
   "Update given tag (WHAT)."
   (save-excursion
 (if (not what)
+   ;; interactive
 (setq what (rpm-completing-read "Tag: " rpm-tags-list)))
 (cond
  ((string-equal what "Group")
@@ -995,7 +990,7 @@ WHAT is the tag used."
 (message "%s tag not found..." what))
 
 (defun rpm-change-n (tag)
-  "Change given TAG with possible number."
+  "Change given tag TAG with possible number."
   (save-excursion
 (goto-char (point-min))
 (let ((number (read-from-minibuffer (concat tag " number: "
@@ -1026,20 +1021,22 @@ WHAT is the tag used."
   nil nil (match-string 1)
   (message "Group tag not found..."
 
-(defun rpm-insert-tag (&optional tag)
-  "Insert or change a TAG."
-  (interactive "p")
+(defun rpm-insert-tag (tag)
+  "Insert or change a TAG.
+With a prefix argument, change an existing tag."
+  (interactive (list (completing-read "Tag: " rpm-tags-list)))
   (if current-prefix-arg
   (rpm-change tag)
-(rpm-insert)))
+(rpm-insert tag)))
 
-(defun rpm-change-tag (&optional tag)
-  "Change a TAG."
-  (interactive "p")
+(defun rpm-change-tag (tag)
+  "Change an existing tag."
+  (interactive (list (completing-read "Tag: " rpm-tags-list)))
   (rpm-change tag))
 
 (defun rpm-insert-packager ()
   "Insert Packager tag."
+  (interactive)
   (beginning-of-line)
   (insert (format "Packager: %s <%s>\n"
   (if (functionp rpm-spec-user-full-name)

[nongnu] elpa/rpm-spec-mode e05d885db2 57/67: Expand readme

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit e05d885db264644efa26365572280a1773a9a6d5
Author: Björn Bidar 
Commit: Björn Bidar 

Expand readme

Explain origin and relationship with the upstream.
Mention historic changelog entries.
---
 README.org | 12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/README.org b/README.org
index 4fb6fd0fad..7f0bbe9f75 100644
--- a/README.org
+++ b/README.org
@@ -1,3 +1,13 @@
 #+TITLE: rpm-spec-mode
 
-RPM spec file editing commands for Emacs/XEmacs
+A major-mode for editing RPM spec files.
+
+The mode originated from XEmacs's prog-modes but diverged after sometime when
+Stig Bjørlykke took over the development.
+
+At some point the fork became the effective upstream.
+For reference the historic ChangeLog entries from XEmacs are included in this
+repository (see [[file:ChangeLog]]).
+
+A copy of the original upstream prog-modes can be found below:
+[[https://foss.heptapod.net/xemacs/prog-modes][xemacs / prog-modes · GitLab]]

[nongnu] branch elpa/rpm-spec-mode created (now 283d2aac4e)

[ELPA Syncer]

elpasync pushed a change to branch elpa/rpm-spec-mode.

at  283d2aac4e Use format instead of concat where it makes sense

This branch includes the following new commits:

   new  8c2d32191f Initial commit
   new  61c6272773 Added existing version 0.12.
   new  d628b77f9d Added 5 patches from Fedora emacs-rpm-spec-mode.
   new  e31b6957e5 Updated mail address and bumped version to 0.14.
   new  51824f5810 add %verify-script
   new  f7f708210b replace deprecated string-to-int
   new  9050a2f9ca fix compilation warnings due to variable scoping
   new  3cc996f665 use `with-current-buffer' to avoid compilation warning
   new  abbe4ae0e7 call rpm-insert-group interactively to avoid compilation 
warning
   new  fa1dd6b5bd avoid compilation warning for set-keymap-name
   new  d3537f8f6d prevent %pre etc. being highlighted in comments
   new  796114105f add myself to contributor list
   new  eb541f8c0c Merge pull request #1 from aspiers/master
   new  722fd80fb6 Bump to version 0.15
   new  53c90b5404 Update rpm-spec-mode-version to current version.
   new  c6586dd80e Use rpm-spec-doc-face for %license entries in %files
   new  3a1cf3d4a9 Update my email address
   new  e9d164f35a rpm-section-regexp: Sync with rpm 4.12.0, order for 
easier sync checking
   new  de2e15d1e0 rpm-tags-list: Sync with rpm 4.12.0, order for easier 
sync checking
   new  405805ef46 Merge pull request #7 from scop/update-to-4120
   new  9e9c89fb89 Merge pull request #4 from scop/email-address
   new  d04ef6afd4 Merge pull request #3 from scop/license-face
   new  7d06d19a31 Bump to version 0.16
   new  594a2c588d Add basic Imenu support for easy navigation.
   new  2276b05457 Sync script and tag lists with rpm 4.12.90
   new  c1c38050c4 Merge pull request #9 from scop/rpm-4.12.90
   new  2f6240df9e Use zero-padded date (%d) instead of space-padded date 
(%e)
   new  afe4307679 Convert to UTF-8
   new  e95001cf4e Fix compatibility with Emacs 28.1
   new  e050606029 Merge branch 'pr-17'
   new  fabbd5cacc Replace custom font lock face defaults with inheritance 
from common names.
   new  7bdf0d224e Merge branch 'add-imenu-support' into 
thaodan/personal_merger
   new  a7c4ece3e8 Remove obsolete use of (easy-menu-add)
   new  df6fb6a3d9 Fix documentation strings and error output
   new  2a9ba31f75 Use push rather than add-to-list for rpm-imenu-index
   new  04ccfdbe97 Update RPM related stuff to 4.16.1.3
   new  50ce453a83 Define keymap using defvar-keymap rather than our own 
logic
   new  5d8bc10065 Refactor to define mode using derived-mode
   new  f5ca6aeb12 Only have function args for functions that use them
   new  c5c04c4d3c Remove unused variable
   new  d3c7d70f22 Fix push index
   new  739f45912a Replace list->string with mapconcat
   new  f099e01fdb Fix font-lock
   new  bc5c240faa Use setq-local rather than make-localvariable and setq
   new  73f4abb50b Tell shell-script-mode that the shell is always rpm
   new  d1331ab0e5 Recreate Readme with org-mode
   new  c69847de7a Eliminate redundant variable `rpm-section-list`.
   new  ebe3d4d9ba Update keywords for RPM 4.20.
   new  85bf4e9711 Update sections for RPM 4.20.
   new  e2421d4f91 Eliminate duplicate transfiletriggerun entries
   new  582463111a Order rpm-sections by typical position in spec file.
   new  c20a6f0160 Merge RPM 4.20 changes into thaodan/personal_merger [#3]
   new  9e4fcfe7cd Quote/unquote macros when commenting/uncommenting
   new  4438caf37f Align docstring of comment-region functions with 
newcomment.el
   new  2c00614768 Revert Improve rpm-spec-mode GNU compat (condition-case 
instead of ignore-errors)
   new  c03a1ead2a Import ChangeLog from XEmacs
   new  e05d885db2 Expand readme
   new  020b924eb1 Remove mail-address wrapper that was used for 
compability between Emacsen
   new  c34dfd343d Improve package metadata replaces references to XEmacs
   new  1896c1e52d Fix some checkdoc warnings
   new  1c4ee0187e Add MELPA badges to README.org.
   new  077c9501b2 Add Maintainer header.
   new  e87fc081c1 Clarify the defaults of the user-name and mail settings
   new  8603ea1d45 Fix interactive functions
   new  ded4b7620f Rename args to match completing-read
   new  5d23bbf0d3 Add defcustom variable for rpm _topdir insteado existing 
the list further
   new  283d2aac4e Use format instead of concat where it makes sense

[nongnu] elpa/rpm-spec-mode a7c4ece3e8 33/67: Remove obsolete use of (easy-menu-add)

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit a7c4ece3e86d0fc4a1377b76591a3e99adc5ccac
Author: Björn Bidar 
Commit: Björn Bidar 

Remove obsolete use of (easy-menu-add)

See Emacs's note on it:

>This function is obsolete since 28.1; this was always a no-op in Emacs
>and can be safely removed.
>
>(easy-menu-add &rest ARGUMENTS)
>
>Do nothing and return nil.
>This function accepts any number of ARGUMENTS, but ignores them.
>Also see ‘always’.

Signed-off-by: Björn Bidar 
---
 rpm-spec-mode.el | 1 -
 1 file changed, 1 deletion(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index 21c3ee82f1..70fcc84e6e 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -710,7 +710,6 @@ with no args, if that value is non-nil."
   (require 'easymenu)
   (easy-menu-define rpm-spec-call-menu rpm-spec-mode-map
 "Post menu for `rpm-spec-mode'." rpm-spec-mode-menu)
-  (easy-menu-add rpm-spec-mode-menu)
 
   (if (and (= (buffer-size) 0) rpm-spec-initialize-sections)
   (run-hooks 'rpm-spec-mode-new-file-hook))

[nongnu] elpa/rpm-spec-mode 582463111a 51/67: Order rpm-sections by typical position in spec file.

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit 582463111a92729e1662f76d184647264333e3d1
Author: Peter Oliver 
Commit: Björn Bidar 

Order rpm-sections by typical position in spec file.
---
 rpm-spec-mode.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index 03ed125c9a..681e781d4c 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -250,8 +250,8 @@ value returned by function `user-mail-address'."
 "install"
 "check"
 "clean"
-"changelog"
-"files")
+"files"
+"changelog")
   "Partial list of section names.")
 (defconst rpm-scripts
   ;; trigger, filetrigger, transfiletrigger no found in build/parseScript.c

[nongnu] elpa/rpm-spec-mode c6586dd80e 16/67: Use rpm-spec-doc-face for %license entries in %files

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit c6586dd80e7960701325a122c01676e81b73db02
Author: Ville Skyttä 
Commit: Ville Skyttä 

Use rpm-spec-doc-face for %license entries in %files
---
 rpm-spec-mode.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index d4e4a4ff8b..0fef28fd57 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -293,7 +293,7 @@ value returned by function `user-mail-address'."
 (defface rpm-spec-doc-face
   '(( ((class color) (background light)) (:foreground "magenta3") )
 ( ((class color) (background dark)) (:foreground "magenta") ))
-  "*Face for %doc entries in %files."
+  "*Face for %doc and %license entries in %files."
   :group 'rpm-spec-faces)
 
 (defface rpm-spec-dir-face
@@ -334,7 +334,7 @@ value returned by function `user-mail-address'."
 (defvar rpm-spec-dir-face
   'rpm-spec-dir-face "*Face for %dir entries in %files.")
 (defvar rpm-spec-doc-face
-  'rpm-spec-doc-face "*Face for %doc entries in %files.")
+  'rpm-spec-doc-face "*Face for %doc and %license entries in %files.")
 (defvar rpm-spec-ghost-face
   'rpm-spec-ghost-face "*Face for %ghost and %config entries in %files.")
 (defvar rpm-spec-section-face
@@ -614,7 +614,7 @@ value returned by function `user-mail-address'."
  (3 rpm-spec-package-face))
'("%configure " 0 rpm-spec-macro-face)
'("%dir[ \t]+\\([^ \t\n]+\\)[ \t]*" 1 rpm-spec-dir-face)
-   '("%doc\\(dir\\)?[ \t]+\\(.*\\)\n" 2 rpm-spec-doc-face)
+   '("%\\(doc\\(dir\\)?\\|license\\)[ \t]+\\(.*\\)\n" 3 rpm-spec-doc-face)
'("%\\(ghost\\|config\\([ \t]*(.*)\\)?\\)[ \t]+\\(.*\\)\n"
  3 rpm-spec-ghost-face)
'("^%.+-[a-zA-Z][ \t]+\\([a-zA-Z0-9\.-]+\\)" 1 rpm-spec-doc-face)

[nongnu] elpa/rpm-spec-mode 722fd80fb6 14/67: Bump to version 0.15

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit 722fd80fb61021fe8bb7552e4edf03847806e40c
Author: stig 
Commit: stig 

Bump to version 0.15
---
 rpm-spec-mode.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index d2fb41484b..c232d35f55 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -4,7 +4,7 @@
 
 ;; Author:   Stig Bj�rlykke, 
 ;; Keywords: unix, languages
-;; Version:  0.14
+;; Version:  0.15
 
 ;; This file is part of XEmacs.
 

[nongnu] elpa/rpm-spec-mode f5ca6aeb12 39/67: Only have function args for functions that use them

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit f5ca6aeb121812a16ab53136c83d96781d8e0808
Author: Björn Bidar 
Commit: Björn Bidar 

Only have function args for functions that use them

Signed-off-by: Björn Bidar 
---
 rpm-spec-mode.el | 125 ---
 1 file changed, 64 insertions(+), 61 deletions(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index d292fff097..e3e572f8f9 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -879,7 +879,7 @@ WHAT is the tag used."
(if (file-directory-p "/usr/src/redhat/") "/usr/src/redhat/")
"/usr/src/RPM"))
 
-(defun rpm-insert-n (what &optional arg)
+(defun rpm-insert-n (what)
   "Insert given tag (WHAT) with possible number."
   (save-excursion
 (goto-char (point-max))
@@ -893,7 +893,7 @@ WHAT is the tag used."
   (rpm-end-of-section)
   (insert what ": " (read-from-minibuffer (concat what "file: ")) "\n"
 
-(defun rpm-change (&optional what arg)
+(defun rpm-change (&optional what)
   "Update given tag (WHAT)."
   (save-excursion
 (if (not what)
@@ -913,7 +913,7 @@ WHAT is the tag used."
   (concat "New " what ": ") (match-string 1
 (message "%s tag not found..." what))
 
-(defun rpm-change-n (what &optional arg)
+(defun rpm-change-n (what)
   "Change given tag with possible number."
   (save-excursion
 (goto-char (point-min))
@@ -933,9 +933,9 @@ WHAT is the tag used."
   (beginning-of-line)
   (insert "Group: " group "\n"))
 
-(defun rpm-change-group (&optional arg)
+(defun rpm-change-group ()
   "Update Group tag."
-  (interactive "p")
+  (interactive)
   (save-excursion
 (goto-char (point-min))
 (if (search-forward-regexp "^Group: \\(.*\\)$" nil t)
@@ -949,24 +949,23 @@ WHAT is the tag used."
   "Insert or change a tag."
   (interactive "p")
   (if current-prefix-arg
-  (rpm-change)
+  (rpm-change arg)
 (rpm-insert)))
 
 (defun rpm-change-tag (&optional arg)
   "Change a tag."
   (interactive "p")
-  (rpm-change))
+  (rpm-change arg))
 
-(defun rpm-insert-packager (&optional arg)
+(defun rpm-insert-packager ()
   "Insert Packager tag."
-  (interactive "p")
   (beginning-of-line)
   (insert "Packager: " (or rpm-spec-user-full-name (user-full-name))
   " <" (rpm-spec-user-mail-address) ">\n"))
 
-(defun rpm-change-packager (&optional arg)
+(defun rpm-change-packager ()
   "Update Packager tag."
-  (interactive "p")
+  (interactive)
   (rpm-change "Packager"))
 
 ;;
@@ -1123,57 +1122,57 @@ leave point at previous location."
(rpm-passwd-cache (read-passwd "GPG passphrase: ")))
(process-send-string build-proc (concat rpm-passwd-cache "\n")
 
-(defun rpm-build-prepare (&optional arg)
+(defun rpm-build-prepare ()
   "Run a `rpmbuild -bp'."
-  (interactive "p")
+  (interactive)
   (if rpm-spec-short-circuit
   (message "Cannot run `%s -bp' with --short-circuit"
   rpm-spec-build-command)
 (setq rpm-no-gpg t)
 (rpm-build "-bp")))
 
-(defun rpm-list-check (&optional arg)
+(defun rpm-list-check ()
   "Run a `rpmbuild -bl'."
-  (interactive "p")
+  (interactive)
   (if rpm-spec-short-circuit
   (message "Cannot run `%s -bl' with --short-circuit"
   rpm-spec-build-command)
 (setq rpm-no-gpg t)
 (rpm-build "-bl")))
 
-(defun rpm-build-compile (&optional arg)
+(defun rpm-build-compile ()
   "Run a `rpmbuild -bc'."
-  (interactive "p")
+  (interactive)
   (setq rpm-no-gpg t)
   (rpm-build "-bc"))
 
-(defun rpm-build-install (&optional arg)
+(defun rpm-build-install ()
   "Run a `rpmbuild -bi'."
-  (interactive "p")
+  (interactive)
   (setq rpm-no-gpg t)
   (rpm-build "-bi"))
 
-(defun rpm-build-binary (&optional arg)
+(defun rpm-build-binary ()
   "Run a `rpmbuild -bb'."
-  (interactive "p")
+  (interactive)
   (if rpm-spec-short-circuit
   (message "Cannot run `%s -bb' with --short-circuit"
   rpm-spec-build-command)
 (setq rpm-no-gpg nil)
 (rpm-build "-bb")))
 
-(defun rpm-build-source (&optional arg)
+(defun rpm-build-source ()
   "Run a `rpmbuild -bs'."
-  (interactive "p")
+  (interactive)
   (if rpm-spec-short-circuit
   (message "Cannot run `%s -bs' with --short-circuit"
   rpm-spec-build-command)
 (setq rpm-no-gpg nil)
 (rpm-build "-bs")))
 
-(defun rpm-build-all (&optional arg)
+(defun rpm-build-all ()
   "Run a `rpmbuild -ba'."
-  (interactive "p")
+  (interactive)
   (if rpm-spec-short-circuit
   (message "Cannot run `%s -ba' with --short-circuit"
   rpm-spec-build-command)
@@ -1193,65 +1192,65 @@ command."
 
 ;;
 
-(defun rpm-toggle-short-circuit (&optional arg)
+(defun rpm-toggle-short-circuit ()
   "Toggle `rpm-spec-short-circuit'."
-  (interactive "p")
+  (interactive)
   (setq rpm-spec-short-circuit (not rpm-spec-short-circuit))
   (rpm-update-mode-name)
   (mes

[nongnu] elpa/rpm-spec-mode e95001cf4e 29/67: Fix compatibility with Emacs 28.1

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit e95001cf4e85d9d67a43a5c5f8f088fbf4492c15
Author: Bhavin Gandhi 
Commit: Bhavin Gandhi 

Fix compatibility with Emacs 28.1

Functions without WHEN were deprecated in 23.1
https://git.savannah.gnu.org/cgit/emacs.git/tree/etc/NEWS.28#n3063

I wasn't able to find any history of rpm-spec-mode prior 0.12, so
setting the WHEN to 0.12.

Signed-off-by: Bhavin Gandhi 
---
 rpm-spec-mode.el | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index 299eb68ccf..d0bde54af3 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -112,7 +112,7 @@ Set the macros _target, _target_arch and _target_os 
accordingly"
   :group 'rpm-spec)
 
 (define-obsolete-variable-alias
-  'rpm-completion-ignore-case 'rpm-spec-completion-ignore-case)
+  'rpm-completion-ignore-case 'rpm-spec-completion-ignore-case "0.12")
 
 (defcustom rpm-spec-completion-ignore-case t
   "*Non-nil means that case differences are ignored during completion.
@@ -132,7 +132,7 @@ This is used during Tempo template completion."
   :group 'rpm-spec)
 
 (define-obsolete-variable-alias
-  'rpm-spec-test 'rpm-spec-nobuild)
+  'rpm-spec-test 'rpm-spec-nobuild "0.12")
 
 (defcustom rpm-spec-nobuild nil
   "Do not execute any build stages.  Useful for testing out spec files."
@@ -158,7 +158,7 @@ the package."
   :group 'rpm-spec)
 
 (define-obsolete-variable-alias
-  'rpm-initialize-sections 'rpm-spec-initialize-sections)
+  'rpm-initialize-sections 'rpm-spec-initialize-sections "0.12")
 
 (defcustom rpm-spec-initialize-sections t
   "Automatically add empty section headings to new spec files."
@@ -166,7 +166,7 @@ the package."
   :group 'rpm-spec)
 
 (define-obsolete-variable-alias
-  'rpm-insert-version 'rpm-spec-insert-changelog-version)
+  'rpm-insert-version 'rpm-spec-insert-changelog-version "0.12")
 
 (defcustom rpm-spec-insert-changelog-version t
   "Automatically add version in a new change log entry."

[nongnu] elpa/rpm-spec-mode 5d23bbf0d3 66/67: Add defcustom variable for rpm _topdir insteado existing the list further

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit 5d23bbf0d310111c493d9150cea7d973ac071aaf
Author: Björn Bidar 
Commit: Björn Bidar 

Add defcustom variable for rpm _topdir insteado existing the list further
---
 rpm-spec-mode.el | 27 ---
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index 421215762c..d2dc0477a4 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -239,6 +239,13 @@ Can be either a string or a function."
   :type 'boolean
   :group 'rpm-spec)
 
+(defcustom rpm-build-topdir "~/rpmbuild"
+  "Rpm _topdir directory to be used when calling rpmbuild."
+  :type 'directory
+  :safe t
+  :package-version '(rpm-spec . 0.17.0)
+  :group 'rpm-spec)
+
 (defgroup rpm-spec-faces nil
   "Font lock faces for `rpm-spec-mode'."
   :prefix "rpm-spec-"
@@ -944,15 +951,13 @@ WHAT is the tag used."
   (insert insert-text (read-file-name (concat read-text) "" "" nil) 
"\n")
 (insert insert-text (read-from-minibuffer (concat read-text)) 
"\n"))
 
-(defun rpm-topdir ()
-  "Use environment to get the topdir for RPMs."
-  (or
-   (getenv "RPM")
-   (getenv "rpm")
-   (if (file-directory-p "~/rpm") "~/rpm/")
-   (if (file-directory-p "~/RPM") "~/RPM/")
-   (if (file-directory-p "/usr/src/redhat/") "/usr/src/redhat/")
-   "/usr/src/RPM"))
+(defun rpm--topdir ()
+  "Try user environment for rpmbuild topdir or default to custom setting."
+  (let ((rpm-envdir (or (getenv "RPM")
+ (getenv "rpm"
+(if (file-directory-p rpm-envdir)
+rpm-envdir
+  rpm-build-topdir)))
 
 (defun rpm-insert-n (what)
   "Insert given tag (WHAT) with possible number."
@@ -961,7 +966,7 @@ WHAT is the tag used."
 (if (search-backward-regexp (concat "^" what "\\([0-9]*\\):") nil t)
 (let ((release (1+ (string-to-number (match-string 1)
   (forward-line 1)
-  (let ((default-directory (concat (rpm-topdir) "/SOURCES/")))
+  (let ((default-directory (concat (rpm--topdir) "/SOURCES/")))
 (insert what (int-to-string release) ": "
 (read-file-name (concat what "file: ") "" "" nil) "\n")))
   (goto-char (point-min))
@@ -996,7 +1001,7 @@ WHAT is the tag used."
 (let ((number (read-from-minibuffer (concat tag " number: "
   (if (search-forward-regexp
(concat "^" tag number ":\\s-*\\(.*\\)") nil t)
-  (let ((default-directory (concat (rpm-topdir) "/SOURCES/")))
+  (let ((default-directory (concat (rpm--topdir) "/SOURCES/")))
 (replace-match
  (concat tag number ": "
  (read-file-name (concat "New " tag number " file: ")

[nongnu] elpa/rpm-spec-mode 4438caf37f 54/67: Align docstring of comment-region functions with newcomment.el

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit 4438caf37f7955bee453527feee5d9c31fa9eef3
Author: Björn Bidar 
Commit: Björn Bidar 

Align docstring of comment-region functions with newcomment.el
---
 rpm-spec-mode.el | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index bb8cf5ee5c..42999ffab6 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -693,14 +693,17 @@ value returned by function `user-mail-address'."
 
 
 (defun rpm-spec-mode-comment-region (beg end &optional arg)
-  "Comment between BEG and END, replacing % with %% to prevent macro expansion.
+  "Comment each line between BEG ... END region.
+But also escape the % character by duplicating it to prevent macro expansion.
 ARG is passed on to `comment-region-default'."
   (comment-region-default beg
   (+ end (replace-string-in-region "%" "%%" beg end))
   arg))
 
 (defun rpm-spec-mode-uncomment-region (beg end &optional arg)
-  "Uncomment between BEG and END, replacing %% with % to reenable macro 
expansion.
+  "Uncomment each line between the BEG .. END region.
+But also revert the escape of the % character by deduplicating it which
+reenables macro expansion.
 ARG is passed on to `uncomment-region-default'."
   (uncomment-region-default beg
 (- end (replace-string-in-region "%%" "%" beg end))

[nongnu] elpa/rpm-spec-mode 594a2c588d 24/67: Add basic Imenu support for easy navigation.

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit 594a2c588d38a7e9d63e287ed55257d8a68290c2
Author: Carl Xiong 
Commit: Carl Xiong 

Add basic Imenu support for easy navigation.
---
 rpm-spec-mode.el | 39 +++
 1 file changed, 39 insertions(+)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index ac9d797614..1b9cbce8d8 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -646,7 +646,45 @@ value returned by function `user-mail-address'."
 (define-abbrev-table 'rpm-spec-mode-abbrev-table ())
 
 ;;
+;; Imenu support
+(defun rpm-spec-mode-imenu-setup ()
+  "An all-in-one setup function to add `imenu' support to
+`rpm-spec-mode'."
+  (setq imenu-create-index-function
+#'rpm-spec-mode-imenu-create-index-function))
+
+(defun rpm-spec-mode-imenu-create-index-function ()
+  "Creating a buffer index for `rpm-spec-mode' The function
+should take no arguments, and return an index alist for the
+current buffer. It is called within `save-excursion', so where it
+leaves point makes no difference."
+  (goto-char (point-min))
+  (let (rpm-imenu-index
+(sub-package-name-regexp 
"[[:space:]]+-n[[:space:]]+\\([-_[:alnum:]]+\\)")
+rpm-spec-imenu-index-alist
+section
+pos-marker
+subpkg-name
+submenu
+new-index)
+(while (re-search-forward rpm-section-regexp nil t)
+  (setq pos-marker (point-marker))
+  (setq section (match-string-no-properties 1))
+  ;; try to extract sub package name
+  (if (re-search-forward sub-package-name-regexp
+ (line-end-position) t)
+  (setq subpkg-name (match-string-no-properties 1))
+(setq subpkg-name "__default"))
+  ;; create/add the matched item to the index list
+  (setq new-index (cons subpkg-name pos-marker))
+  (if (setq submenu (assoc section rpm-imenu-index))
+  (setf (cdr submenu)
+(cons new-index (cdr submenu)))
+(add-to-list 'rpm-imenu-index
+ (list section new-index
+rpm-imenu-index))
 
+;;
 (add-hook 'rpm-spec-mode-new-file-hook 'rpm-spec-initialize)
 
 ;;;###autoload
@@ -707,6 +745,7 @@ with no args, if that value is non-nil."
   ;;Initialize font lock for GNU emacs.
   (make-local-variable 'font-lock-defaults)
   (setq font-lock-defaults '(rpm-spec-font-lock-keywords nil t))
+  (rpm-spec-mode-imenu-setup)
   (run-hooks 'rpm-spec-mode-hook))
 
 (defun rpm-command-filter (process string)

[nongnu] elpa/rpm-spec-mode c69847de7a 47/67: Eliminate redundant variable `rpm-section-list`.

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit c69847de7a49c092b4462c9a6d37cf348fa4d69a
Author: Peter Oliver 
Commit: Björn Bidar 

Eliminate redundant variable `rpm-section-list`.
---
 rpm-spec-mode.el | 6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index 26217e2aaf..d36c92df3c 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -244,10 +244,6 @@ value returned by function `user-mail-address'."
   '("preamble" "description" "prep" "setup" "build" "install" "check" "clean"
 "changelog" "files")
   "Partial list of section names.")
-(defvar rpm-section-list
-  '(("preamble") ("description") ("prep") ("setup") ("build") ("install")
-("check") ("clean") ("changelog") ("files"))
-  "Partial list of section names.")
 (defconst rpm-scripts
   ;; trigger, filetrigger, transfiletrigger no found in build/parseScript.c
   '("pre" "post" "preun" "postun"
@@ -1011,7 +1007,7 @@ Go to beginning of current section."
 (defun rpm-goto-section (section)
   "Move point to the beginning of the specified SECTION.
 leave point at previous location."
-  (interactive (list (rpm-completing-read "Section: " rpm-section-list)))
+  (interactive (list (rpm-completing-read "Section: " rpm-sections)))
   (push-mark)
   (goto-char (point-min))
   (or

[nongnu] elpa/rpm-spec-mode 73f4abb50b 45/67: Tell shell-script-mode that the shell is always rpm

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit 73f4abb50bf0f9b19106f394afcdfeb1a41d4d5a
Author: Björn Bidar 
Commit: Björn Bidar 

Tell shell-script-mode that the shell is always rpm

Only have to take into account when '%_buildshell' isn't  '/bin/sh'.

Signed-off-by: Björn Bidar 
---
 rpm-spec-mode.el | 14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index fff5d62bca..26217e2aaf 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -71,10 +71,8 @@
 
 (defconst rpm-spec-mode-version "0.16" "Version of `rpm-spec-mode'.")
 
-(eval-and-compile (defvar running-xemacs nil))
-
 (defgroup rpm-spec nil
-  "RPM spec mode with Emacs/XEmacs enhancements."
+  "RPM spec mode with Emacs enhancements."
   :prefix "rpm-spec-"
   :group 'languages)
 
@@ -714,8 +712,14 @@ with no args, if that value is non-nil."
   ;;Initialize font lock for GNU emacs.
   (make-local-variable 'font-lock-defaults)
   (font-lock-add-keywords nil rpm-spec-font-lock-keywords)
-  (rpm-spec-mode-imenu-setup)
-  (run-hooks 'rpm-spec-mode-hook))
+  ;; shell-script-mode would try to detect the shell type to accommodate
+  ;; to the target shell. The shell type should always be RPM in this
+  ;; instance
+  ;; FIXME: set `sh-ancestors' list based on '%_buildshell'.
+  ;; call a custom version of `sh--guess-shell' which compares against
+  ;; the macro.
+  (sh-set-shell "rpm" nil nil)
+  (rpm-spec-mode-imenu-setup))
 
 (defun rpm-command-filter (process string)
   "Filter to PROCESS normal output.  Add STRING as starting boundary."

[nongnu] elpa/rpm-spec-mode afe4307679 28/67: Convert to UTF-8

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit afe4307679850bec0c131e913c419b3ce74ee0a4
Author: Mattias Ellert 
Commit: Mattias Ellert 

Convert to UTF-8
---
 rpm-spec-mode.el | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index be5bccec72..f67c13f932 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -1,8 +1,8 @@
 ;;; rpm-spec-mode.el --- RPM spec file editing commands for Emacs/XEmacs
 
-;; Copyright (C) 1997-2015 Stig Bj�rlykke, 
+;; Copyright (C) 1997-2015 Stig Bjørlykke, 
 
-;; Author:   Stig Bj�rlykke, 
+;; Author:   Stig Bjørlykke, 
 ;; Keywords: unix, languages
 ;; Version:  0.16
 
@@ -30,10 +30,10 @@
 ;; Tore Olsen  for some general fixes.
 ;; Steve Sanbeg  for navigation functions and
 ;;  some Emacs fixes.
-;; Tim Powers  and Trond Eivind Glomsr�d
+;; Tim Powers  and Trond Eivind Glomsrød
 ;;   for Red Hat adaptions and some fixes.
 ;; Chmouel Boudjnah  for Mandrake fixes.
-;; Ville Skytt�   for some fixes.
+;; Ville Skyttä   for some fixes.
 ;; Adam Spiers  for GNU emacs compilation
 ;;  and other misc fixes.
 
@@ -1460,7 +1460,7 @@ if one is present in the file."
   (message
(concat "rpm-spec-mode version "
rpm-spec-mode-version
-   " by Stig Bj�rlykke, ")))
+   " by Stig Bjørlykke, ")))
 
 ;;;###autoload(add-to-list 'auto-mode-alist '("\\.spec\\(\\.in\\)?$" . 
rpm-spec-mode))
 

[nongnu] elpa/rpm-spec-mode f099e01fdb 43/67: Fix font-lock

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit f099e01fdb74cf4c18d7846572cb4b4d15c95fdc
Author: Björn Bidar 
Commit: Björn Bidar 

Fix font-lock

Instead of manually setting font-lock-defaults manually which fixes
the font-lock-display and allows ruse the font-lock keywords from 
shell-script-mode.

Signed-off-by: Björn Bidar 
---
 rpm-spec-mode.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index 6da799b558..7cf756b5fa 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -601,7 +601,8 @@ value returned by function `user-mail-address'."
 
 
 (defvar rpm-spec-font-lock-keywords
-  `((cons rpm-section-regexp rpm-spec-section-face)
+  (list
+   (cons rpm-section-regexp rpm-spec-section-face)
'("%[a-zA-Z0-9_]+" 0 rpm-spec-macro-face)
(cons (concat "^" rpm-obsolete-tags-regexp "\\(\([a-zA-Z0-9,_]+\)\\)[ 
\t]*:")
  '((1 'rpm-spec-obsolete-tag-face)
@@ -722,7 +723,7 @@ with no args, if that value is non-nil."
 ;  (setq comment-indent-function 'c-comment-indent)
   ;;Initialize font lock for GNU emacs.
   (make-local-variable 'font-lock-defaults)
-  (setq font-lock-defaults '(rpm-spec-font-lock-keywords nil))
+  (font-lock-add-keywords nil rpm-spec-font-lock-keywords)
   (rpm-spec-mode-imenu-setup)
   (run-hooks 'rpm-spec-mode-hook))
 

[nongnu] elpa/rpm-spec-mode 077c9501b2 62/67: Add Maintainer header.

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit 077c9501b2f5e3e1d7c9248a13a271f550303cef
Author: Peter Oliver 
Commit: Björn Bidar 

Add Maintainer header.
---
 rpm-spec-mode.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index 3de0c26abf..0608ae62ad 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -10,6 +10,7 @@
 ;; Chmouel Boudjnah 
 ;; Ville Skyttä 
 ;; Adam Spiers 
+;; Maintainer: Björn Bidar 
 
 ;; Keywords: unix languages rpm
 ;; Version:  0.16

[nongnu] elpa/rpm-spec-mode abbe4ae0e7 09/67: call rpm-insert-group interactively to avoid compilation warning

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit abbe4ae0e7f5808f78830e7c7503c3d8c41929fa
Author: Adam Spiers 
Commit: Adam Spiers 

call rpm-insert-group interactively to avoid compilation warning

Warning was "rpm-insert-group being defined to take 1 arg, but was
previously called with 0"
---
 rpm-spec-mode.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index 6da1716e7c..bcf7cf5dbf 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -818,7 +818,7 @@ controls whether case is significant."
 insert-text (concat what ": ")))
 (cond
  ((string-equal what "Group")
-  (rpm-insert-group))
+  (call-interactively 'rpm-insert-group))
  ((string-equal what "Source")
   (rpm-insert-n "Source"))
  ((string-equal what "Patch")

[nongnu] elpa/annotate updated (f29c91db0b -> 7b1c5aa531)

[ELPA Syncer]

elpasync pushed a change to branch elpa/annotate.

  from  f29c91db0b Merge pull request #166 from 
cage2/updating-documentation-after-autosave-patch
   new  d8f8505d28 - optimized 'annotate-annotations-overlay-in-range' by 
jumping from an annotation to another, instead of scanning every single 
character of the buffer.
   new  3413c20594 - increased version number;
   new  7b1c5aa531 Merge pull request #168 from 
cage2/optimize-searching-for-annotations


Summary of changes:
 Changelog   | 28 
 NEWS.org|  4 
 annotate.el | 33 ++---
 3 files changed, 46 insertions(+), 19 deletions(-)

[nongnu] elpa/rpm-spec-mode d04ef6afd4 22/67: Merge pull request #3 from scop/license-face

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit d04ef6afd4de647cc7de3afa062992a31632c8d6
Merge: 9e9c89fb89 c6586dd80e
Author: Stig 
Commit: Stig 

Merge pull request #3 from scop/license-face

Use rpm-spec-doc-face for %license entries in %files
---
 rpm-spec-mode.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index caa0ea158a..432151378d 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -293,7 +293,7 @@ value returned by function `user-mail-address'."
 (defface rpm-spec-doc-face
   '(( ((class color) (background light)) (:foreground "magenta3") )
 ( ((class color) (background dark)) (:foreground "magenta") ))
-  "*Face for %doc entries in %files."
+  "*Face for %doc and %license entries in %files."
   :group 'rpm-spec-faces)
 
 (defface rpm-spec-dir-face
@@ -334,7 +334,7 @@ value returned by function `user-mail-address'."
 (defvar rpm-spec-dir-face
   'rpm-spec-dir-face "*Face for %dir entries in %files.")
 (defvar rpm-spec-doc-face
-  'rpm-spec-doc-face "*Face for %doc entries in %files.")
+  'rpm-spec-doc-face "*Face for %doc and %license entries in %files.")
 (defvar rpm-spec-ghost-face
   'rpm-spec-ghost-face "*Face for %ghost and %config entries in %files.")
 (defvar rpm-spec-section-face
@@ -620,7 +620,7 @@ value returned by function `user-mail-address'."
  (3 rpm-spec-package-face))
'("%configure " 0 rpm-spec-macro-face)
'("%dir[ \t]+\\([^ \t\n]+\\)[ \t]*" 1 rpm-spec-dir-face)
-   '("%doc\\(dir\\)?[ \t]+\\(.*\\)\n" 2 rpm-spec-doc-face)
+   '("%\\(doc\\(dir\\)?\\|license\\)[ \t]+\\(.*\\)\n" 3 rpm-spec-doc-face)
'("%\\(ghost\\|config\\([ \t]*(.*)\\)?\\)[ \t]+\\(.*\\)\n"
  3 rpm-spec-ghost-face)
'("^%.+-[a-zA-Z][ \t]+\\([a-zA-Z0-9\.-]+\\)" 1 rpm-spec-doc-face)

[nongnu] elpa/rpm-spec-mode 7bdf0d224e 32/67: Merge branch 'add-imenu-support' into thaodan/personal_merger

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit 7bdf0d224edb963e5ba75a57827365fef3ce031e
Merge: fabbd5cacc 594a2c588d
Author: Björn Bidar 
Commit: Björn Bidar 

Merge branch 'add-imenu-support' into thaodan/personal_merger
---
 rpm-spec-mode.el | 39 +++
 1 file changed, 39 insertions(+)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index 68032ff751..21c3ee82f1 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -644,7 +644,45 @@ value returned by function `user-mail-address'."
 (define-abbrev-table 'rpm-spec-mode-abbrev-table ())
 
 ;;
+;; Imenu support
+(defun rpm-spec-mode-imenu-setup ()
+  "An all-in-one setup function to add `imenu' support to
+`rpm-spec-mode'."
+  (setq imenu-create-index-function
+#'rpm-spec-mode-imenu-create-index-function))
+
+(defun rpm-spec-mode-imenu-create-index-function ()
+  "Creating a buffer index for `rpm-spec-mode' The function
+should take no arguments, and return an index alist for the
+current buffer. It is called within `save-excursion', so where it
+leaves point makes no difference."
+  (goto-char (point-min))
+  (let (rpm-imenu-index
+(sub-package-name-regexp 
"[[:space:]]+-n[[:space:]]+\\([-_[:alnum:]]+\\)")
+rpm-spec-imenu-index-alist
+section
+pos-marker
+subpkg-name
+submenu
+new-index)
+(while (re-search-forward rpm-section-regexp nil t)
+  (setq pos-marker (point-marker))
+  (setq section (match-string-no-properties 1))
+  ;; try to extract sub package name
+  (if (re-search-forward sub-package-name-regexp
+ (line-end-position) t)
+  (setq subpkg-name (match-string-no-properties 1))
+(setq subpkg-name "__default"))
+  ;; create/add the matched item to the index list
+  (setq new-index (cons subpkg-name pos-marker))
+  (if (setq submenu (assoc section rpm-imenu-index))
+  (setf (cdr submenu)
+(cons new-index (cdr submenu)))
+(add-to-list 'rpm-imenu-index
+ (list section new-index
+rpm-imenu-index))
 
+;;
 (add-hook 'rpm-spec-mode-new-file-hook 'rpm-spec-initialize)
 
 ;;;###autoload
@@ -705,6 +743,7 @@ with no args, if that value is non-nil."
   ;;Initialize font lock for GNU emacs.
   (make-local-variable 'font-lock-defaults)
   (setq font-lock-defaults '(rpm-spec-font-lock-keywords nil t))
+  (rpm-spec-mode-imenu-setup)
   (run-hooks 'rpm-spec-mode-hook))
 
 (defun rpm-command-filter (process string)

[nongnu] elpa/rpm-spec-mode 283d2aac4e 67/67: Use format instead of concat where it makes sense

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit 283d2aac4ede343586a1fb9e9d2a5917f34809a1
Author: Björn Bidar 
Commit: Björn Bidar 

Use format instead of concat where it makes sense

Also retrieve metadata from lisp instead of hard coding it.
---
 rpm-spec-mode.el | 95 +++-
 1 file changed, 53 insertions(+), 42 deletions(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index d2dc0477a4..1512cca900 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -79,6 +79,9 @@
 (require 'cc-mode)
 (require 'easymenu)
 
+(declare-function lm-version "lisp-mnt")
+(declare-function lm-maintainers "lisp-mnt")
+
 (defconst rpm-spec-mode-version "0.16" "Version of `rpm-spec-mode'.")
 
 (defgroup rpm-spec nil
@@ -834,21 +837,22 @@ If `rpm-change-log-uses-utc' is nil, \"today\" means the 
local time zone."
 
 (defun rpm-goto-add-change-log-header ()
   "Find change log and add header (if needed) for today."
-(rpm-goto-section "changelog")
-(let* ((address (if (functionp rpm-spec-user-mail-address)
-(funcall rpm-spec-user-mail-address)
- rpm-spec-user-mail-address))
-   (fullname (if (functionp rpm-spec-user-full-name)
-(funcall 
rpm-spec-user-full-name)
-  rpm-spec-user-full-name))
-   (system-time-locale "C")
-   (string (concat "* " (rpm-change-log-date-string) " "
-   fullname " <" address ">"
-   (and rpm-spec-insert-changelog-version
-(concat " - " (rpm-find-spec-version t))
-  (if (not (search-forward string nil t))
-  (insert "\n" string "\n")
-(forward-line 2
+  (rpm-goto-section "changelog")
+  (let* ((address (if (functionp rpm-spec-user-mail-address)
+  (funcall rpm-spec-user-mail-address)
+   rpm-spec-user-mail-address))
+ (fullname (if (functionp rpm-spec-user-full-name)
+  (funcall rpm-spec-user-full-name)
+rpm-spec-user-full-name))
+ (system-time-locale "C")
+ (change-log-header (format "* %s %s  <%s> - %s"
+(rpm-change-log-date-string)
+fullname
+address
+(rpm-find-spec-version t
+(if (not (search-forward change-log-header nil t))
+(insert "\n" change-log-header "\n")
+  (forward-line 2
 
 (defun rpm-add-change-log-entry (&optional change-log-entry)
   "Find change log and add an entry for today.
@@ -935,7 +939,7 @@ WHAT is the tag used."
   (setq what (rpm-completing-read "Tag: " rpm-tags-list)))
   (let (read-text insert-text)
 (if (string-match "^%" what)
-(setq read-text (concat "Packagename for " what ": ")
+(setq read-text (format "Packagename for %s: " what)
   insert-text (concat what " "))
   (setq read-text (concat what ": ")
 insert-text (concat what ": ")))
@@ -966,7 +970,7 @@ WHAT is the tag used."
 (if (search-backward-regexp (concat "^" what "\\([0-9]*\\):") nil t)
 (let ((release (1+ (string-to-number (match-string 1)
   (forward-line 1)
-  (let ((default-directory (concat (rpm--topdir) "/SOURCES/")))
+  (let ((default-directory (expand-file-name "/SOURCES/" 
(rpm--topdir
 (insert what (int-to-string release) ": "
 (read-file-name (concat what "file: ") "" "" nil) "\n")))
   (goto-char (point-min))
@@ -991,7 +995,7 @@ WHAT is the tag used."
   (if (search-forward-regexp (concat "^" what ":\\s-*\\(.*\\)$") nil t)
   (replace-match
(concat what ": " (read-from-minibuffer
-  (concat "New " what ": ") (match-string 1
+  (format "New %s:"  what) (match-string 1
 (message "%s tag not found..." what))
 
 (defun rpm-change-n (tag)
@@ -1004,7 +1008,7 @@ WHAT is the tag used."
   (let ((default-directory (concat (rpm--topdir) "/SOURCES/")))
 (replace-match
  (concat tag number ": "
- (read-file-name (concat "New " tag number " file: ")
+ (read-file-name (format "New %s%i file: " tag number)
  "" "" nil (match-string 1)
 (message "%s number \"%s\" not found..." tag number)
 
@@ -1151,8 +1155,10 @@ leave point at previous location."
(y-or-n-p (format "Buffer %s modified, save it? " (buffer-name
   (save-buffer))
   (let ((rpm-buffer-name
- (concat "*" rpm-spec-build-command " " buildoptions " "
- (file-name-nondirectory buffer-file-name) "*")))
+ 

[nongnu] elpa/rpm-spec-mode 2f6240df9e 27/67: Use zero-padded date (%d) instead of space-padded date (%e)

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit 2f6240df9ed355ea19dfd7cc1ff8190634866b15
Author: Mattias Ellert 
Commit: Mattias Ellert 

Use zero-padded date (%d) instead of space-padded date (%e)
---
 rpm-spec-mode.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index 299eb68ccf..be5bccec72 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -734,7 +734,7 @@ This variable is global by default, but you can make it 
buffer-local.")
 (defsubst rpm-change-log-date-string ()
   "Return the date string for today, inserted by \\[rpm-add-change-log-entry].
 If `rpm-change-log-uses-utc' is nil, \"today\" means the local time zone."
-  (format-time-string "%a %b %e %Y" nil rpm-change-log-uses-utc))
+  (format-time-string "%a %b %d %Y" nil rpm-change-log-uses-utc))
 
 (defun rpm-goto-add-change-log-header ()
   "Find change log and add header (if needed) for today"

[nongnu] elpa/rpm-spec-mode d1331ab0e5 46/67: Recreate Readme with org-mode

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit d1331ab0e56464dfa4b13aabbfb913b3edfe5a34
Author: Björn Bidar 
Commit: Björn Bidar 

Recreate Readme with org-mode

Signed-off-by: Björn Bidar 
---
 README.md => README.org | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.org
similarity index 63%
rename from README.md
rename to README.org
index 6c84ea551e..4fb6fd0fad 100644
--- a/README.md
+++ b/README.org
@@ -1,4 +1,3 @@
-rpm-spec-mode
-=
+#+TITLE: rpm-spec-mode
 
 RPM spec file editing commands for Emacs/XEmacs

[nongnu] elpa/rpm-spec-mode 7d06d19a31 23/67: Bump to version 0.16

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit 7d06d19a31e888b932da6c8202ff2c73f42703a1
Author: Stig Bjørlykke 
Commit: Stig Bjørlykke 

Bump to version 0.16
---
 rpm-spec-mode.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index 432151378d..ac9d797614 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -1,10 +1,10 @@
 ;;; rpm-spec-mode.el --- RPM spec file editing commands for Emacs/XEmacs
 
-;; Copyright (C) 1997-2013 Stig Bj�rlykke, 
+;; Copyright (C) 1997-2015 Stig Bj�rlykke, 
 
 ;; Author:   Stig Bj�rlykke, 
 ;; Keywords: unix, languages
-;; Version:  0.15
+;; Version:  0.16
 
 ;; This file is part of XEmacs.
 
@@ -66,7 +66,7 @@
 ;;; Code:
 (require 'compile)
 
-(defconst rpm-spec-mode-version "0.15" "Version of `rpm-spec-mode'.")
+(defconst rpm-spec-mode-version "0.16" "Version of `rpm-spec-mode'.")
 
 (eval-and-compile (defvar running-xemacs nil))
 

[nongnu] elpa/rpm-spec-mode 3cc996f665 08/67: use `with-current-buffer' to avoid compilation warning

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit 3cc996f66580cff77871c74f881907b1ca7e91d0
Author: Adam Spiers 
Commit: Adam Spiers 

use `with-current-buffer' to avoid compilation warning
---
 rpm-spec-mode.el | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index 18193383fb..6da1716e7c 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -699,8 +699,7 @@ with no args, if that value is non-nil."
 
 (defun rpm-command-filter (process string)
   "Filter to process normal output."
-  (save-excursion
-(set-buffer (process-buffer process))
+  (with-current-buffer (process-buffer process)
 (save-excursion
   (goto-char (process-mark process))
   (insert-before-markers string)

[nongnu] elpa/rpm-spec-mode d628b77f9d 03/67: Added 5 patches from Fedora emacs-rpm-spec-mode.

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit d628b77f9d39aa44340eb5975abbc59286509ba6
Author: stig 
Commit: stig 

Added 5 patches from Fedora emacs-rpm-spec-mode.

The patches was marked xemacs, compilation, utc, changelog and
goto-add-changelog-entry, and has been contributed over time.
---
 rpm-spec-mode.el | 496 +++
 1 file changed, 355 insertions(+), 141 deletions(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index bc147b4907..7f8c242bf3 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with XEmacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-;; MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301 USA.
 
 ;;; Synched up with: not in GNU Emacs.
 
@@ -33,12 +33,13 @@
 ;; Tim Powers  and Trond Eivind Glomsr�d
 ;;   for Red Hat adaptions and some fixes.
 ;; Chmouel Boudjnah  for Mandrake fixes.
+;; Ville Skytt�   for some fixes.
 
 ;;; ToDo:
 
 ;; - rewrite function names.
 ;; - autofill changelog entries.
-;; - customize rpm-tags-list and rpm-group-tags-list.
+;; - customize rpm-tags-list, rpm-obsolete-tags-list and rpm-group-tags-list.
 ;; - get values from `rpm --showrc'.
 ;; - ssh/rsh for compile.
 ;; - finish integrating the new navigation functions in with existing stuff.
@@ -61,6 +62,7 @@
 ;;
 
 ;;; Code:
+(require 'compile)
 
 (defconst rpm-spec-mode-version "0.12" "Version of `rpm-spec-mode'.")
 
@@ -70,7 +72,7 @@
   :group 'languages)
 
 (defcustom rpm-spec-build-command "rpmbuild"
-  "Command for building a RPM package."
+  "Command for building an RPM package."
   :type 'string
   :group 'rpm-spec)
 
@@ -95,7 +97,7 @@ timecheck age."
   :group 'rpm-spec)
 
 (defcustom rpm-spec-buildroot ""
-  "Override the BuildRoot tag with directory ."
+  "When building, override the BuildRoot tag with directory ."
   :type 'string
   :group 'rpm-spec)
 
@@ -125,11 +127,20 @@ This is used during Tempo template completion."
   :type 'boolean
   :group 'rpm-spec)
 
+(define-obsolete-variable-alias
+  'rpm-spec-test 'rpm-spec-nobuild)
+
 (defcustom rpm-spec-nobuild nil
   "Do not execute any build stages.  Useful for testing out spec files."
   :type 'boolean
   :group 'rpm-spec)
 
+(defcustom rpm-spec-quiet nil
+  "Print as little as possible.
+Normally only error messages will be displayed."
+  :type 'boolean
+  :group 'rpm-spec)
+
 (defcustom rpm-spec-sign-gpg nil
   "Embed a GPG signature in the package.
 This signature can be used to verify the integrity and the origin of
@@ -142,11 +153,6 @@ the package."
   :type 'boolean
   :group 'rpm-spec)
 
-(defcustom rpm-spec-old-rpm nil
-  "Set if using `rpm' as command for building packages."
-  :type 'boolean
-  :group 'rpm-spec)
-
 (define-obsolete-variable-alias
   'rpm-initialize-sections 'rpm-spec-initialize-sections)
 
@@ -179,8 +185,50 @@ value returned by function `user-mail-address'."
  string)
   :group 'rpm-spec)
 
+(defcustom rpm-spec-indent-heading-values nil
+  "*Indent values for all tags in the \"heading\" of the spec file."
+  :type 'boolean
+  :group 'rpm-spec)
+
+(defcustom rpm-spec-default-release "1"
+  "*Default value for the Release tag in new spec files."
+  :type 'string
+  :group 'rpm-spec)
+
+(defcustom rpm-spec-default-epoch nil
+  "*If non-nil, default value for the Epoch tag in new spec files."
+  :type '(choice (const :tag "No Epoch" nil) integer)
+  :group 'rpm-spec)
+
+(defcustom rpm-spec-default-buildroot
+  "%{_tmppath}/%{name}-%{version}-%{release}-root"
+  "*Default value for the BuildRoot tag in new spec files."
+  :type 'integer
+  :group 'rpm-spec)
+
+(defcustom rpm-spec-default-build-section ""
+  "*Default %build section in new spec files."
+  :type 'string
+  :group 'rpm-spec)
+
+(defcustom rpm-spec-default-install-section "rm -rf $RPM_BUILD_ROOT\n"
+  "*Default %install section in new spec files."
+  :type 'string
+  :group 'rpm-spec)
+
+(defcustom rpm-spec-default-clean-section "rm -rf $RPM_BUILD_ROOT\n"
+  "*Default %clean section in new spec files."
+  :type 'string
+  :group 'rpm-spec)
+
+(defcustom rpm-spec-auto-topdir nil
+  "*Automatically detect an rpm build directory tree and define _topdir."
+  :type 'boolean
+  :group 'rpm-spec)
+
 (defgroup rpm-spec-faces nil
   "Font lock faces for `rpm-spec-mode'."
+  :prefix "rpm-spec-"
   :group 'rpm-spec
   :group 'faces)
 
@@ -188,88 +236,105 @@ value returned by function `user-mail-address'."
 ;; variables used by navigation functions.
 
 (defconst rpm-sections
-  '("preamble" "description" "prep" "setup" "build" "install" "clean"
+  '("preamble" "description" "prep" "setup" "build" "install" "check" "clean"
 "changelog" "files")
   "Partial list of section names.")
 (defvar rpm-section-list
   '(("preamble") ("description") ("prep

[nongnu] elpa/rpm-spec-mode fabbd5cacc 31/67: Replace custom font lock face defaults with inheritance from common names.

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit fabbd5cacc2aff91e034c5d5d1579386502bebb3
Author: Sean Perry 
Commit: Björn Bidar 

Replace custom font lock face defaults with inheritance from common names.
---
 rpm-spec-mode.el | 26 +-
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index 5a854ed179..68032ff751 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -273,55 +273,47 @@ value returned by function `user-mail-address'."
 ;;
 
 (defface rpm-spec-tag-face
-  '(( ((class color) (background light)) (:foreground "blue3") )
-( ((class color) (background dark)) (:foreground "blue") ))
+  '((t (:inherit font-lock-keyword-face)))
   "*Face for tags."
   :group 'rpm-spec-faces)
 
 (defface rpm-spec-obsolete-tag-face
-  '(( ((class color)) (:foreground "white" :background "red") ))
+  '((t (:inherit font-lock-warning-face)))
   "*Face for obsolete tags."
   :group 'rpm-spec-faces)
 
 (defface rpm-spec-macro-face
-  '(( ((class color) (background light)) (:foreground "purple") )
-( ((class color) (background dark)) (:foreground "yellow") ))
+  '((t (:inherit font-lock-preprocessor-face)))
   "*Face for RPM macros and variables."
   :group 'rpm-spec-faces)
 
 (defface rpm-spec-var-face
-  '(( ((class color) (background light)) (:foreground "maroon") )
-( ((class color) (background dark)) (:foreground "maroon") ))
+  '((t (:inherit font-lock-variable-name-face)))
   "*Face for environment variables."
   :group 'rpm-spec-faces)
 
 (defface rpm-spec-doc-face
-  '(( ((class color) (background light)) (:foreground "magenta3") )
-( ((class color) (background dark)) (:foreground "magenta") ))
+  '((t (:inherit font-lock-doc-face)))
   "*Face for %doc and %license entries in %files."
   :group 'rpm-spec-faces)
 
 (defface rpm-spec-dir-face
-  '(( ((class color) (background light)) (:foreground "green4") )
-( ((class color) (background dark)) (:foreground "green") ))
+  '((t (:inherit font-lock-string-face)))
   "*Face for %dir entries in %files."
   :group 'rpm-spec-faces)
 
 (defface rpm-spec-package-face
-  '(( ((class color) (background light)) (:foreground "red3") )
-( ((class color) (background dark)) (:foreground "red") ))
+  '((t (:inherit font-lock-function-name-face)))
   "*Face for package tag."
   :group 'rpm-spec-faces)
 
 (defface rpm-spec-ghost-face
-  '(( ((class color) (background light)) (:foreground "gray50") )
-( ((class color) (background dark)) (:foreground "red") ))
+  '((t (:inherit font-lock-string-face)))
   "*Face for %ghost and %config entries in %files."
   :group 'rpm-spec-faces)
 
 (defface rpm-spec-section-face
-  '(( ((class color) (background light)) (:foreground "purple" :underline t) )
-( ((class color) (background dark)) (:foreground "yellow" :underline t) ))
+  '((t (:inherit font-lock-function-name-face)))
   "*Face for section markers."
   :group 'rpm-spec-faces)
 

[nongnu] elpa/rpm-spec-mode d3c7d70f22 41/67: Fix push index

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit d3c7d70f224d002d029aeccc19fb9885745d6f1c
Author: Björn Bidar 
Commit: Björn Bidar 

Fix push index
---
 rpm-spec-mode.el | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index 369dded242..d2c050246a 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -675,8 +675,7 @@ leaves point makes no difference."
   (if (setq submenu (assoc section rpm-imenu-index))
   (setf (cdr submenu)
 (cons new-index (cdr submenu)))
-(push 'rpm-imenu-index
- (list section new-index
+(push (list section new-index) rpm-imenu-index)))
 rpm-imenu-index))
 
 ;;

[nongnu] elpa/rpm-spec-mode 020b924eb1 58/67: Remove mail-address wrapper that was used for compability between Emacsen

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit 020b924eb13829552aedae41e657c627a386dafd
Author: Björn Bidar 
Commit: Björn Bidar 

Remove mail-address wrapper that was used for compability between Emacsen
---
 rpm-spec-mode.el | 21 ++---
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index 54829cf4b4..cd5913bde0 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -821,7 +821,8 @@ If `rpm-change-log-uses-utc' is nil, \"today\" means the 
local time zone."
 (defun rpm-goto-add-change-log-header ()
   "Find change log and add header (if needed) for today."
 (rpm-goto-section "changelog")
-(let* ((address (rpm-spec-user-mail-address))
+(let* ((address (or rpm-spec-user-mail-address
+user-mail-address))
(fullname (or rpm-spec-user-full-name (user-full-name)))
(system-time-locale "C")
(string (concat "* " (rpm-change-log-date-string) " "
@@ -1029,8 +1030,10 @@ WHAT is the tag used."
 (defun rpm-insert-packager ()
   "Insert Packager tag."
   (beginning-of-line)
-  (insert "Packager: " (or rpm-spec-user-full-name (user-full-name))
-  " <" (rpm-spec-user-mail-address) ">\n"))
+  (insert (format "Packager: %s <%s>\n"
+  (or rpm-spec-user-full-name (user-full-name))
+  (or rpm-spec-user-mail-address
+  user-mail-address
 
 (defun rpm-change-packager ()
   "Update Packager tag."
@@ -1535,18 +1538,6 @@ If ARG is non-nil increase by ARG or 1 if not"
 
 ;;
 
-(defun rpm-spec-user-mail-address ()
-  "User mail address helper."
-  (cond
-   (rpm-spec-user-mail-address
-rpm-spec-user-mail-address)
-   ((fboundp 'user-mail-address)
-(user-mail-address))
-   (t
-user-mail-address)))
-
-;;
-
 (defun rpm-about-rpm-spec-mode ()
   "About `rpm-spec-mode'."
   (interactive)

[nongnu] elpa/rpm-spec-mode ded4b7620f 65/67: Rename args to match completing-read

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit ded4b7620fad38ef6fc5f391aa7ba3d98146a544
Author: Justin Koh 
Commit: Björn Bidar 

Rename args to match completing-read

(cherry picked from commit 7dbebc24a59dd7f612555aaf679c2c4743b13bdb)
---
 rpm-spec-mode.el | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index b4a71ffe8c..421215762c 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -911,14 +911,14 @@ using FILETYPE to prompt the user."
   (interactive "GDirectory: ")
   (rpm-insert-f "%docdir " dirname))
 
-;;
-(defun rpm-completing-read (prompt table &optional pred require init hist)
-  "Read from the minibuffer like `completing-read' but for rpms-spec-mode.
-Take `rpm-spec-completion-ignore-case' into account and forward
-all arguments i.e. PROMPT, TABLE, PRED, REQUIRE, INIT and HIST.
-Call `completing-read' accordingly."
+(defun rpm-completing-read (prompt collection &optional predicate
+   require-match initial-input hist)
+  "Take `rpm-spec-completion-ignore-case' into account call `completion-read'.
+Forward all arguments i.e. PROMPT, COLLECTION, PREDICATE, REQUIRE-MATCH,
+INITIAL-INPUT and HIST to `completing-read'."
   (let ((completion-ignore-case rpm-spec-completion-ignore-case))
-(completing-read prompt table pred require init hist)))
+(completing-read prompt collection predicate
+ require-match initial-input hist)))
 
 (defun rpm-insert (&optional what file-completion)
   "Insert given tag.  Use FILE-COMPLETION if argument is t.

[nongnu] elpa/cider 2865e6652d 1/3: Remove features that relied on printed exception parsing

[ELPA Syncer]

branch: elpa/cider
commit 2865e6652d16da2c5e00921a6cf7bbe80f8d24d2
Author: Oleksandr Yakushev 
Commit: Oleksandr Yakushev 

Remove features that relied on printed exception parsing
---
 CHANGELOG.md   |  3 +
 cider-log.el   | 48 ++--
 cider-stacktrace.el| 50 +++--
 doc/modules/ROOT/pages/debugging/logging.adoc  | 21 ++
 .../ROOT/pages/usage/dealing_with_errors.adoc  | 86 --
 test/cider-stacktrace-tests.el | 54 --
 6 files changed, 26 insertions(+), 236 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 08dd68d987..f0b650c0c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,9 @@
 ### Changes
 
 - [#3782](https://github.com/clojure-emacs/cider/issues/3782): **(Breaking)** 
Drop official support for Emacs 26.
+- [#3793](https://github.com/clojure-emacs/cider/issues/3793): **(Breaking)** 
Remove features that relied on printed exception parsing:
+  - `cider-stacktrace-analyze-string` and `cider-stacktrace-analyze-at-point` 
functions.
+  - Automatic stacktrace parsing in log viewer.
 - Bump the injected `cider-nrepl` to 
[0.53.1](https://github.com/clojure-emacs/cider-nrepl/blob/master/CHANGELOG.md#0531-2025-03-26).
   - Info: recognize printed Java classes/methods and munged Clojure functions 
in stacktrace outputs.
   - Inspector: add dedicated view for Exceptions.
diff --git a/cider-log.el b/cider-log.el
index fab84ea6df..af57952cb2 100644
--- a/cider-log.el
+++ b/cider-log.el
@@ -215,15 +215,6 @@ It will not be used if the package hasn't been installed."
   "filters" ,(cider-log-consumer-filters consumer))
 (cider-nrepl-send-request callback)))
 
-(defun cider-request:log-analyze-stacktrace (framework appender event 
&optional callback)
-  "Analyze the EVENT stacktrace of the APPENDER of FRAMEWORK and call 
CALLBACK."
-  (cider-ensure-op-supported "cider/log-analyze-stacktrace")
-  (thread-first `("op" "cider/log-analyze-stacktrace"
-  "framework" ,(cider-log-framework-id framework)
-  "appender" ,(cider-log-appender-id appender)
-  "event" ,(cider-log-event-id event))
-(cider-nrepl-send-request callback)))
-
 (defun cider-sync-request:log-update-consumer (framework appender consumer)
   "Add CONSUMER to the APPENDER of FRAMEWORK and call CALLBACK on log events."
   (cider-ensure-op-supported "cider/log-update-consumer")
@@ -690,24 +681,6 @@ The KEYS are used to lookup the values and are joined by 
SEPARATOR."
   (seq-doseq (window windows)
 (set-window-point window (point-max))
 
-(defun cider-log-event--show-stacktrace (framework appender event)
-  "Show the stacktrace of the log EVENT of FRAMEWORK and APPENDER."
-  (when (and framework appender event (cider-log-event-exception event))
-(let ((auto-select-buffer cider-auto-select-error-buffer)
-  (causes nil))
-  (cider-request:log-analyze-stacktrace
-   framework appender event
-   (lambda (response)
- (nrepl-dbind-response response (class status)
-   (cond (class  (setq causes (cons response causes)))
- (status (when causes
-   (cider-stacktrace-render
-(cider-popup-buffer cider-error-buffer
-auto-select-buffer
-#'cider-stacktrace-mode
-'ancillary)
-(reverse causes)))
-
 (defun cider-log-event-next-line (&optional n)
   "Move N lines forward."
   (interactive "p")
@@ -719,8 +692,6 @@ The KEYS are used to lookup the values and are joined by 
SEPARATOR."
(event (cider-log-event-at-point)))
   (let ((cider-auto-select-error-buffer nil))
 (save-window-excursion
-  (when (get-buffer-window cider-error-buffer)
-(cider-log-event--show-stacktrace framework appender event))
   (when (get-buffer-window cider-inspector-buffer)
 (cider-log-event--inspect framework appender event))
   (when (get-buffer-window cider-log-event-buffer)
@@ -856,7 +827,6 @@ The KEYS are used to lookup the values and are joined by 
SEPARATOR."
 (define-key map (kbd "C-c M-l f") #'cider-log-framework)
 (define-key map (kbd "C-c M-l i") #'cider-log-info)
 (define-key map (kbd "C-c M-l l") #'cider-log)
-(define-key map (kbd "E") 'cider-log-show-stacktrace)
 (define-key map (kbd "F") 'cider-log-print-event)
 (define-key map (kbd "I") 'cider-log-inspect-event)
 (define-key map (kbd "RET") 'cider-log-inspect-event)
@@ -1173,16 +1143,12 @@ the CIDER Inspector and the CIDER stacktrace mode.
(cider-log-appender-display-name appender)))
 
 ;; Event actions
-
-(transient-define-suffix cider-

[nongnu] elpa/rpm-spec-mode bc5c240faa 44/67: Use setq-local rather than make-localvariable and setq

[ELPA Syncer]

branch: elpa/rpm-spec-mode
commit bc5c240faaba118c619135d0bc3dd1cec13b42b7
Author: Björn Bidar 
Commit: Björn Bidar 

Use setq-local rather than make-localvariable and setq

Signed-off-by: Björn Bidar 
---
 rpm-spec-mode.el | 32 +++-
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index 7cf756b5fa..fff5d62bca 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -701,26 +701,16 @@ with no args, if that value is non-nil."
(setq rpm-spec-build-command "rpm")
(setq rpm-spec-nobuild-option "--test")))
   
-  (make-local-variable 'paragraph-start)
-  (setq paragraph-start (concat "$\\|" page-delimiter))
-  (make-local-variable 'paragraph-separate)
-  (setq paragraph-separate paragraph-start)
-  (make-local-variable 'paragraph-ignore-fill-prefix)
-  (setq paragraph-ignore-fill-prefix t)
-;  (make-local-variable 'indent-line-function)
-;  (setq indent-line-function 'c-indent-line)
-  (make-local-variable 'require-final-newline)
-  (setq require-final-newline t)
-  (make-local-variable 'comment-start)
-  (setq comment-start "# ")
-  (make-local-variable 'comment-end)
-  (setq comment-end "")
-  (make-local-variable 'comment-column)
-  (setq comment-column 32)
-  (make-local-variable 'comment-start-skip)
-  (setq comment-start-skip "#+ *")
-;  (make-local-variable 'comment-indent-function)
-;  (setq comment-indent-function 'c-comment-indent)
+  (setq-local paragraph-start (concat "$\\|" page-delimiter))
+  (setq-local paragraph-separate paragraph-start)
+  (setq-local paragraph-ignore-fill-prefix t)
+;  (setq-local indent-line-function 'c-indent-line)
+  (setq-local require-final-newline t)
+  (setq-local comment-start "# ")
+  (setq-local comment-end "")
+  (setq-local comment-column 32)
+  (setq-local comment-start-skip "#+ *")
+;  (setq-local comment-indent-function 'c-comment-indent)
   ;;Initialize font lock for GNU emacs.
   (make-local-variable 'font-lock-defaults)
   (font-lock-add-keywords nil rpm-spec-font-lock-keywords)
@@ -1491,6 +1481,6 @@ If ARG is non-nil increase by ARG or 1 if not"
 (provide 'rpm-spec-mode)
 ;;;###autoload
 (define-compilation-mode rpmbuild-mode "RPM build" ""
-  (set (make-local-variable 'compilation-disable-input) t))
+  (setq-local compilation-disable-input t))
 
 ;;; rpm-spec-mode.el ends here

[elpa] externals/el-job 6fa04dae03 2/3: Fix some cases of "void function"

[ELPA Syncer]

branch: externals/el-job
commit 6fa04dae03f577a212ac5cd2c69e3fb4f6bf3d07
Author: Martin Edström 
Commit: Martin Edström 

Fix some cases of "void function"

Case study: indexed-org-parser.el has a stub definition of
`org-mode`, so when el-job--locate-lib-in-load-history looks for
the feature `indexed-org-parser`, it sometimes thinks the feature
comes from org.el, because a definition for `org-mode` is also
found there.
---
 el-job.el | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/el-job.el b/el-job.el
index f48c219c45..de4fbde371 100644
--- a/el-job.el
+++ b/el-job.el
@@ -107,7 +107,11 @@ an .eln anyway, without your having to recompile on save."
  when (and (consp elem)
(eq 'defun (car elem))
(symbolp (cdr elem))
-   (subrp (symbol-function (cdr elem
+   (subrp (symbol-function (cdr elem)))
+   ;; Extra safety (sometimes files contain a patch
+   ;; overriding some other file's definition)
+   (string-prefix-p (symbol-name feature)
+(symbol-name (cdr elem
  return (native-comp-unit-file
  (subr-native-comp-unit
   (symbol-function (cdr elem))

[elpa] externals/el-job cdcc1d9afe 3/3: Release version 2.4.2

[ELPA Syncer]

branch: externals/el-job
commit cdcc1d9afeb7c8588ba57650f5af05e309963ed8
Author: Martin Edström 
Commit: Martin Edström 

Release version 2.4.2
---
 el-job.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/el-job.el b/el-job.el
index de4fbde371..ecc310e2c3 100644
--- a/el-job.el
+++ b/el-job.el
@@ -19,7 +19,7 @@
 ;; URL:  https://github.com/meedstrom/el-job
 ;; Created:  2024-10-30
 ;; Keywords: processes
-;; Package-Version:  2.4.1
+;; Package-Version:  2.4.2
 ;; Package-Requires: ((emacs "29.1"))
 
 ;;; Commentary:

[elpa] externals/el-job 467cf80d6c 1/3: Delete dir-locals

[ELPA Syncer]

branch: externals/el-job
commit 467cf80d6cffa65472bf4b55c4c0c0cf410d7ce9
Author: Martin Edström 
Commit: Martin Edström 

Delete dir-locals
---
 .dir-locals.el | 15 ---
 1 file changed, 15 deletions(-)

diff --git a/.dir-locals.el b/.dir-locals.el
deleted file mode 100644
index edcc9ba211..00
--- a/.dir-locals.el
+++ /dev/null
@@ -1,15 +0,0 @@
-(;; Emacs 31 new default
- (emacs-lisp-mode . ((emacs-lisp-docstring-fill-column . 72)))
- ;; See makem.sh
- (ispell-buffer-session-localwords . '("eln"
-   "elc"
-   "el"
-   "deregister"
-   "rebalance"
-   "accessors"
-   "eieio"
-   "prepended"
-   "elisp"
-   "subprocess"
-   "subprocesses"
-   "minibuffer")))

[nongnu] elpa/dracula-theme ab09e8532c 3/3: Merge pull request #109 from greg19/auctex

[ELPA Syncer]

branch: elpa/dracula-theme
commit ab09e8532c70bf73caed55ab9ce52ba3fb14583e
Merge: 793591c3d6 9c4f2d176b
Author: Étienne Deparis 
Commit: Étienne Deparis 

Merge pull request #109 from greg19/auctex
---
 dracula-theme.el | 25 -
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/dracula-theme.el b/dracula-theme.el
index 78b9033cbd..bbec2d3151 100644
--- a/dracula-theme.el
+++ b/dracula-theme.el
@@ -411,12 +411,31 @@ read it before opening a new issue about your will.")
;; flyspell
(flyspell-duplicate :underline (:style wave :color 
,dracula-orange))
(flyspell-incorrect :underline (:style wave :color 
,dracula-red))
-   ;; font-latex
+   ;; font-latex (auctex)
(font-latex-bold-face :foreground ,dracula-purple)
(font-latex-italic-face :foreground ,dracula-pink :slant italic)
(font-latex-match-reference-keywords :foreground ,dracula-cyan)
(font-latex-match-variable-keywords :foreground ,dracula-fg)
+   (font-latex-math-face :foreground ,dracula-orange)
+   (font-latex-script-char-face :inherit font-latex-math-face)
+   (font-latex-sectioning-0-face :foreground ,dracula-pink :weight 
bold
+ ,@(when dracula-enlarge-headings
+ (list :height 
dracula-height-title-1)))
+   (font-latex-sectioning-1-face :foreground ,dracula-purple 
:weight bold
+ ,@(when dracula-enlarge-headings
+ (list :height 
dracula-height-title-1)))
+   (font-latex-sectioning-2-face :foreground ,dracula-green 
:weight bold
+ ,@(when dracula-enlarge-headings
+ (list :height 
dracula-height-title-2)))
+   (font-latex-sectioning-3-face :foreground ,dracula-yellow 
:weight bold
+ ,@(when dracula-enlarge-headings
+ (list :height 
dracula-height-title-3)))
+   (font-latex-sectioning-4-face :foreground ,dracula-cyan :weight 
bold)
+   (font-latex-sectioning-5-face :foreground ,dracula-orange 
:weight bold)
+   (font-latex-sedate-face :foreground ,dracula-pink)
(font-latex-string-face :foreground ,dracula-yellow)
+   (font-latex-verbatim-face :foreground ,dracula-orange)
+   (font-latex-warning-face :foreground ,dracula-red)
;; gemini
(gemini-heading-face-1 :inherit bold :foreground ,dracula-pink
   ,@(when dracula-enlarge-headings
@@ -939,6 +958,10 @@ read it before opening a new issue about your will.")
(term-color-red :foreground ,dracula-red :background 
,dracula-red)
(term-color-white :foreground ,dracula-fg :background 
,dracula-fg)
(term-color-yellow :foreground ,dracula-yellow :background 
,dracula-yellow)
+   ;; TeX (auctex)
+   (TeX-error-description-error :inherit error)
+   (TeX-error-description-tex-said :foreground ,dracula-cyan)
+   (TeX-error-description-warning :inherit warning)
;; tree-sitter
(tree-sitter-hl-face:attribute :inherit font-lock-constant-face)
(tree-sitter-hl-face:comment :inherit font-lock-comment-face)

[nongnu] elpa/magit 38aef4eab4 6/6: magit-which-function: Tweak docstring

[Jonas Bernoulli via]

branch: elpa/magit
commit 38aef4eab4c2665c0bce0376491fd31f6a157401
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

magit-which-function: Tweak docstring

Do so that user can immediately see what the difference between
this function and `which-function' is when customizing
`magit-log-trace-definition-function'.
---
 lisp/magit-base.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/magit-base.el b/lisp/magit-base.el
index a2e8d07957..5a967a2e33 100644
--- a/lisp/magit-base.el
+++ b/lisp/magit-base.el
@@ -1047,7 +1047,7 @@ This function should be named `version>=' and be part of 
Emacs."
 ;;; Kludges for Emacs Bugs
 
 (defun magit-which-function ()
-  "Return current function name based on point.
+  "Return current function name based on point, without caching.
 
 This is a simple wrapper around `which-function', that resets
 Imenu's potentially outdated and therefore unreliable cache by

[nongnu] elpa/magit 280fa3ddab 3/6: magit-merge-into: Rename to magit-merge-dissolve and change binding

[Jonas Bernoulli via]

branch: elpa/magit
commit 280fa3ddab5da375ed977660674cfa1db680c901
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

magit-merge-into: Rename to magit-merge-dissolve and change binding

Use the term "dissolve" because that makes it clear that the branch that
is being merged is also deleted afterwards.  Also change the key binding
in the `magit-merge' menu, to keep it mnemonic.  At least the latter was
planned since [1: 4c096921fd].  Do not define `magit-merge-into' as an
obsolete alias, since that would prolong the period during which some
users would by take by surprise.

Re #4386.

1: 2021-07-01 4c096921fda97ebdff656a35a257910fca9e5aad
   magit-merge: Change magit-merge-into's description
---
 docs/magit.org  | 2 +-
 docs/magit.texi | 6 +++---
 lisp/magit-merge.el | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/magit.org b/docs/magit.org
index 6e54a5f9e9..19d86ad731 100644
--- a/docs/magit.org
+++ b/docs/magit.org
@@ -5768,7 +5768,7 @@ following suffix commands.
   Finally, if ~magit-branch-pull-request~ was used to create the merged
   branch, then the respective remote branch is also removed.
 
-- Key: m i (magit-merge-into) ::
+- Key: m d (magit-merge-dissolve) ::
 
   This command merges the current branch into another local branch and
   then removes the former.  The latter becomes the new current branch.
diff --git a/docs/magit.texi b/docs/magit.texi
index 9c7061145c..eced27f465 100644
--- a/docs/magit.texi
+++ b/docs/magit.texi
@@ -6819,9 +6819,9 @@ stuck on some obsolete version of the commits that are 
being merged.
 Finally, if @code{magit-branch-pull-request} was used to create the merged
 branch, then the respective remote branch is also removed.
 
-@item @kbd{m i} (@code{magit-merge-into})
-@kindex m i
-@findex magit-merge-into
+@item @kbd{m d} (@code{magit-merge-dissolve})
+@kindex m d
+@findex magit-merge-dissolve
 This command merges the current branch into another local branch and
 then removes the former.  The latter becomes the new current branch.
 
diff --git a/lisp/magit-merge.el b/lisp/magit-merge.el
index 779bda5fe9..2d82ceeda1 100644
--- a/lisp/magit-merge.el
+++ b/lisp/magit-merge.el
@@ -58,7 +58,7 @@
[("p" "Preview merge"  magit-merge-preview)
 ""
 ("s" "Squash merge"   magit-merge-squash)
-("i" "Dissolve"   magit-merge-into)]]
+("d" "Dissolve"   magit-merge-dissolve)]]
   ["Actions"
:if magit-merge-in-progress-p
("m" "Commit merge" magit-commit-create)
@@ -129,7 +129,7 @@ inspect the merge and change the commit message.
   (magit-run-git-async "merge" "--no-commit" args rev))
 
 ;;;###autoload
-(defun magit-merge-into (branch &optional args)
+(defun magit-merge-dissolve (branch &optional args)
   "Merge the current branch into BRANCH and remove the former.
 
 Before merging, force push the source branch to its push-remote,

[nongnu] elpa/magit 83780a2805 2/6: magit-format-file-function: Improve custom type

[Jonas Bernoulli via]

branch: elpa/magit
commit 83780a2805d01c08849d40602958dcad215983ff
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

magit-format-file-function: Improve custom type

Also add docstrings to the proposed functions.  Together this should
make it more likely that users realize, that they have to install the
desired icons package.

Closes #5345.
---
 lisp/magit-diff.el | 15 +++
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/lisp/magit-diff.el b/lisp/magit-diff.el
index cf98b2a07c..baefff3738 100644
--- a/lisp/magit-diff.el
+++ b/lisp/magit-diff.el
@@ -332,10 +332,10 @@ it receives either three or five arguments; the signature 
has to be
 `module', `stat' and `list'."
   :package-version '(magit . "4.3.1")
   :group 'magit-diff
-  :type `(choice (function-item ,#'magit-format-file-default)
- (function-item ,#'magit-format-file-all-the-icons)
- (function-item ,#'magit-format-file-nerd-icons)
- function))
+  :type `(radio (function-item ,#'magit-format-file-default)
+(function-item ,#'magit-format-file-all-the-icons)
+(function-item ,#'magit-format-file-nerd-icons)
+function))
 
  File Diff
 
@@ -2498,11 +2498,15 @@ keymap is the parent of their keymaps."
   (funcall magit-format-file-function kind file face status orig))
 
 (defun magit-format-file-default (_kind file face &optional status orig)
+  "Show only the Git status and the filename."
   (propertize (concat (and status (format "%-11s" status))
   (if orig (format "%s -> %s" orig file) file))
   'font-lock-face face))
 
 (defun magit-format-file-all-the-icons (kind file face &optional status orig)
+  "Show the status, filename and icon (using the `all-the-icons' package).
+You have to explicitly install the `all-the-icons' package, else this
+function errors."
   (cl-flet ((icon (if (or (eq kind 'module) (string-suffix-p "/" file))
   'all-the-icons-icon-for-dir
 'all-the-icons-icon-for-file)))
@@ -2519,6 +2523,9 @@ keymap is the parent of their keymaps."
   'font-lock-face face
 
 (defun magit-format-file-nerd-icons (kind file face &optional status orig)
+  "Show the status, filename and icon (using the `nerd-icons' package).
+You have to explicitly install the `nerd-icons' package, else this
+function errors."
   (cl-flet ((icon (if (or (eq kind 'module) (string-suffix-p "/" file))
   'nerd-icons-icon-for-dir
 'nerd-icons-icon-for-file)))

[nongnu] elpa/magit 6a695e68eb 4/6: Use radio custom type to allow selecting a function

[Jonas Bernoulli via]

branch: elpa/magit
commit 6a695e68eb4de8775af09ebf24da08ea809f8abd
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Use radio custom type to allow selecting a function
---
 lisp/git-commit.el | 16 
 lisp/magit-log.el  | 14 +++---
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/lisp/git-commit.el b/lisp/git-commit.el
index fbd5aa3175..e9e4c14c78 100644
--- a/lisp/git-commit.el
+++ b/lisp/git-commit.el
@@ -174,14 +174,14 @@ full loading."
 The major mode configured here is turned on by the minor mode
 `git-commit-mode'."
   :group 'git-commit
-  :type '(choice (function-item text-mode)
- (function-item markdown-mode)
- (function-item org-mode)
- (function-item fundamental-mode)
- (function-item log-edit-mode)
- (function-item git-commit-elisp-text-mode)
- (function :tag "Another mode")
- (const :tag "No major mode")))
+  :type '(radio (function-item text-mode)
+(function-item markdown-mode)
+(function-item org-mode)
+(function-item fundamental-mode)
+(function-item log-edit-mode)
+(function-item git-commit-elisp-text-mode)
+(function :tag "Another major mode")
+(const :tag "No major mode")))
 ;;;###autoload(put 'git-commit-major-mode 'safe-local-variable
 ;;;###autoload (lambda (val)
 ;;;###autoload   (memq val '(text-mode
diff --git a/lisp/magit-log.el b/lisp/magit-log.el
index 92b5f8b32d..6dbf8b4e4c 100644
--- a/lisp/magit-log.el
+++ b/lisp/magit-log.el
@@ -174,9 +174,9 @@ want to use the same functions for both hooks."
   "Function used to generate text shown in header line of log buffers."
   :package-version '(magit . "2.12.0")
   :group 'magit-log
-  :type `(choice (function-item ,#'magit-log-header-line-arguments)
- (function-item ,#'magit-log-header-line-sentence)
- function))
+  :type `(radio (function-item ,#'magit-log-header-line-arguments)
+(function-item ,#'magit-log-header-line-sentence)
+function))
 
 (defcustom magit-log-trace-definition-function #'magit-which-function
   "Function used to determine the function at point.
@@ -185,10 +185,10 @@ You should prefer `magit-which-function' over 
`which-function'
 because the latter may make use of Imenu's outdated cache."
   :package-version '(magit . "3.0.0")
   :group 'magit-log
-  :type `(choice (function-item ,#'magit-which-function)
- (function-item ,#'which-function)
- (function-item ,#'add-log-current-defun)
- function))
+  :type `(radio (function-item ,#'magit-which-function)
+(function-item ,#'which-function)
+(function-item ,#'add-log-current-defun)
+function))
 
 (defcustom magit-log-color-graph-limit 256
   "Number of commits over which log graphs are not colored.

[nongnu] elpa/magit 1883877d4c 5/6: git-commit-major-mode: Tweak a choice description

[Jonas Bernoulli via]

branch: elpa/magit
commit 1883877d4cba39218589cb35c9ebc6bc6ee41836
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

git-commit-major-mode: Tweak a choice description
---
 lisp/git-commit.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/git-commit.el b/lisp/git-commit.el
index e9e4c14c78..7218168aa9 100644
--- a/lisp/git-commit.el
+++ b/lisp/git-commit.el
@@ -180,7 +180,7 @@ The major mode configured here is turned on by the minor 
mode
 (function-item fundamental-mode)
 (function-item log-edit-mode)
 (function-item git-commit-elisp-text-mode)
-(function :tag "Another major mode")
+(function :tag "Another mode")
 (const :tag "No major mode")))
 ;;;###autoload(put 'git-commit-major-mode 'safe-local-variable
 ;;;###autoload (lambda (val)

[nongnu] elpa/magit 7a6074d337 1/6: Fix autoload for magit-log-current

[Jonas Bernoulli via]

branch: elpa/magit
commit 7a6074d337844a768cd5ac7c44a03eb0343e215a
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Fix autoload for magit-log-current

Older Emacs releases need the long `autoload' form to load commands
defined using `transient-define-suffix'.

Closes #5344.
---
 lisp/magit-log.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/magit-log.el b/lisp/magit-log.el
index 3035684f2a..92b5f8b32d 100644
--- a/lisp/magit-log.el
+++ b/lisp/magit-log.el
@@ -651,7 +651,7 @@ commits before and half after."
   "Read a string from the user to pass as parameter to OPTION."
   (magit-read-string (format "Type a pattern to pass to %s" option)))
 
-;;;###autoload
+;;;###autoload (autoload 'magit-log-current "magit-log" nil t)
 (transient-define-suffix magit-log-current (&optional args files)
   "Show log for the current branch, or `HEAD' if no branch is checked out."
   :description (##if (magit-get-current-branch) "current" "HEAD")