[elpa] externals/eev updated (919129f5e4 -> b63a528a8a)

[ELPA Syncer]

elpasync pushed a change to branch externals/eev.

  from  919129f5e4 Mention (find-dot-emacs-links) in more places.
   new  1379ca71a9 Added (find-newbrowser2-links).
   new  b63a528a8a Small changes in (find-lean4-intro).


Summary of changes:
 ChangeLog | 17 
 VERSION   |  4 +--
 eev-intro.el  | 85 +--
 eev-tlinks.el | 64 +++-
 4 files changed, 141 insertions(+), 29 deletions(-)

[elpa] externals/eev b63a528a8a 2/2: Small changes in (find-lean4-intro).

[ELPA Syncer]

branch: externals/eev
commit b63a528a8acc221f3c8d080082774de9986859c8
Author: Eduardo Ochs 
Commit: Eduardo Ochs 

Small changes in (find-lean4-intro).
---
 ChangeLog|  4 +++
 VERSION  |  4 +--
 eev-intro.el | 87 +++-
 3 files changed, 63 insertions(+), 32 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 62f23fd396..6a68cfcc47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2024-07-22  Eduardo Ochs  
+
+   * eev-intro.el (find-lean4-intro): small changes.
+
 2024-07-21  Eduardo Ochs  
 
* eev-tlinks.el (find-newbrowser-links): marked as obsolete.
diff --git a/VERSION b/VERSION
index eebcb7388d..0d0211ace5 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-Mon Jul 22 05:10:08 GMT 2024
-Mon Jul 22 02:10:08 -03 2024
+Mon Jul 22 05:40:28 GMT 2024
+Mon Jul 22 02:40:28 -03 2024
diff --git a/eev-intro.el b/eev-intro.el
index 9af955c1bb..1b812342a3 100644
--- a/eev-intro.el
+++ b/eev-intro.el
@@ -19,7 +19,7 @@
 ;;
 ;; Author: Eduardo Ochs 
 ;; Maintainer: Eduardo Ochs 
-;; Version:20240719
+;; Version:20240722
 ;; Keywords:   e-scripts
 ;;
 ;; Latest version: <http://anggtwu.net/eev-current/eev-intro.el>
@@ -17811,10 +17811,60 @@ UNFINISHED! UNTESTED!
   (find-windows-beginner-intro)
   (find-windows-beginner-intro \"6. Learn the basics of Emacs and eev\")
 
-(find-eev-quick-intro \"6.1. The main key: \")
-(find-eev-quick-intro \"6.2. Other targets\")
-(find-eev-quick-intro \"6.3. Creating eepitch blocks: `M-T'\")
-(find-eev-quick-intro \"6.4. Red stars\")
+  (find-emacs-keys-intro \"1. Basic keys (eev)\")
+  (find-emacs-keys-intro \"2. Key sequences and how to abort them\")
+  (find-emacs-keys-intro \"3. Cutting & pasting\")
+  (find-emacs-keys-intro \"4. Moving point\")
+  (find-emacs-keys-intro \"5. Undoing\")
+  (find-emacs-keys-intro \"6. Windows\")
+  (find-emacs-keys-intro \"7. Files and buffers\")
+
+  (find-eev-quick-intro \"2. Evaluating Lisp\")
+  (find-eev-quick-intro \"3. Elisp hyperlinks\")
+  (find-eev-quick-intro \"3.1. Non-elisp hyperlinks\")
+  (find-eev-quick-intro \"5. Links to Emacs documentation\")
+  (find-eev-quick-intro \"5.1. Navigating the Emacs manuals\")
+  (find-eev-quick-intro \"5.2. Cutting and pasting\")
+http://anggtwu.net/IMAGES/2024-emacs-cut-copy-and-paste.png
+http://anggtwu.net/2024-find-dot-emacs-links.html
+
+  (find-eev-quick-intro \"6.1. The main key: \")
+  (find-eev-quick-intro \"6.2. Other targets\")
+  (find-eev-quick-intro \"6.3. Creating eepitch blocks: `M-T'\")
+  (find-eev-quick-intro \"6.4. Red stars\")
+http://anggtwu.net/eepitch.html#test-blocks
+http://anggtwu.net/eepitch.html#trying-it
+
+  (find-eev-quick-intro \"7. Quick access to one-liners\")
+  (find-eev-quick-intro \"7.1. `eejump'\")
+  (find-eev-quick-intro \"7.2. The list of eejump targets\")
+  (find-eev-quick-intro \"8. Anchors\")
+  (find-eev-quick-intro \"8.1. Introduction: `to'\")
+  (find-eev-quick-intro \"9. Shorter hyperlinks\")
+  (find-eev-quick-intro \"9.1. `code-c-d'\")
+  (find-eev-quick-intro \"9.2. Extra arguments to `code-c-d'\")
+
+  (find-psne-intro \"1. Local copies of files from the internet\")
+  (find-psne-intro \"3. The new way: `M-x brep'\")
+http://anggtwu.net/eev-videos.html#links-to-videos
+http://anggtwu.net/eev-videos.html#what-are-local-copies
+http://anggtwu.net/eev-videos.html#first-class-videos
+http://anggtwu.net/eev-videos.html#mpv-keys
+
+  (find-pdf-like-intro \"1. PDF-like documents\")
+  (find-pdf-like-intro \"2. Preparation\")
+  (find-pdf-like-intro \"3. Hyperlinks to PDF files\")
+  (find-pdf-like-intro \"4. Hyperlinks to pages of PDF files\")
+  (find-pdf-like-intro \"5. A convention on page numbers\")
+  (find-pdf-like-intro \"6. How the external programs are called\")
+  (find-pdf-like-intro \"7. Shorter hyperlinks to PDF files\")
+  (find-pdf-like-intro \"8. `find-pdf'-pairs\")
+
+  (find-kl-here-intro \"1. Introduction\")
+  (find-kl-here-intro \"2. Try it!\")
+  (find-kl-here-intro \"3. Info\")
+
+
 
 
 
@@ -17833,31 +17883,8 @@ UNFINISHED! UNTESTED!
 
 2. Setup the ~/.emacs
 =
-;;-- (ee-copy-rest-3m nil \";;--end\" \"~/.emacs\")
-
-;; From: (find-dot-emacs-intro \"3. Loading eev by default\")
-;; See: (find-eev-levels-intro)
-(require 'eev-load)   ; (find-eev \"eev-load.el\")
-(require 'eev-aliases); (find-eev \"eev-aliases.el\")

[elpa] externals/eev 1379ca71a9 1/2: Added (find-newbrowser2-links).

[ELPA Syncer]

branch: externals/eev
commit 1379ca71a9dd409d0c28fb1995bbd6a4c252ea07
Author: Eduardo Ochs 
Commit: Eduardo Ochs 

Added (find-newbrowser2-links).
---
 ChangeLog | 13 
 VERSION   |  4 ++--
 eev-intro.el  |  6 ++
 eev-tlinks.el | 64 ++-
 4 files changed, 84 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e7a9ff25df..62f23fd396 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2024-07-21  Eduardo Ochs  
+
+   * eev-tlinks.el (find-newbrowser-links): marked as obsolete.
+   (find-newbrowser2-links): new function.
+
+2024-07-19  Eduardo Ochs  
+
+   * eev-tlinks.el (find-dot-emacs-links): point to
+   .
+
+   * eev-intro.el (find-dot-emacs-intro): point to
+   .
+
 2024-07-18  Eduardo Ochs  
 
* eev-tlinks.el (ee-dot-emacs-melpa, ee-dot-emacs-lean4): new
diff --git a/VERSION b/VERSION
index 633383df5c..eebcb7388d 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-Fri Jul 19 16:13:19 GMT 2024
-Fri Jul 19 13:13:19 -03 2024
+Mon Jul 22 05:10:08 GMT 2024
+Mon Jul 22 02:10:08 -03 2024
diff --git a/eev-intro.el b/eev-intro.el
index 1e57d3497a..9af955c1bb 100644
--- a/eev-intro.el
+++ b/eev-intro.el
@@ -17809,6 +17809,12 @@ UNFINISHED! UNTESTED!
 
   http://anggtwu.net/2024-lean4-oficina-0.html
   (find-windows-beginner-intro)
+  (find-windows-beginner-intro \"6. Learn the basics of Emacs and eev\")
+
+(find-eev-quick-intro \"6.1. The main key: \")
+(find-eev-quick-intro \"6.2. Other targets\")
+(find-eev-quick-intro \"6.3. Creating eepitch blocks: `M-T'\")
+(find-eev-quick-intro \"6.4. Red stars\")
 
 
 
diff --git a/eev-tlinks.el b/eev-tlinks.el
index 9728c62660..a7ab25d6af 100644
--- a/eev-tlinks.el
+++ b/eev-tlinks.el
@@ -19,7 +19,7 @@
 ;;
 ;; Author: Eduardo Ochs 
 ;; Maintainer: Eduardo Ochs 
-;; Version:20240719
+;; Version:20240721
 ;; Keywords:   e-scripts
 ;;
 ;; Latest version: 
@@ -132,6 +132,7 @@
 ;; «.find-eeit-links»  (to "find-eeit-links")
 ;; «.find-texlive-links»   (to "find-texlive-links")
 ;; «.find-newbrowser-links»(to "find-newbrowser-links")
+;; «.find-newbrowser2-links»   (to "find-newbrowser2-links")
 ;; «.find-newpdfviewer-links»  (to "find-newpdfviewer-links")
 ;; «.ee-0x0-upload-region» (to "ee-0x0-upload-region")
 ;; «.find-0x0-links»   (to "find-0x0-links")
@@ -3116,6 +3117,11 @@ sudo ./install-tl -select-repository
  ;; Convention: the first sexp always regenerates the buffer.
  (find-efunction 'find-newbrowser-links)
  ""
+ ";; Important: this function is OBSOLETE!"
+ ";; It was superseded by: (find-newbrowser2-links)"
+ ""
+ ""
+ ""
  ";; See: (find-wconfig-browser-links)"
  ""
  ,(ee-template0 "\
@@ -3200,7 +3206,63 @@ sudo ./install-tl -select-repository
 ;;  (find-youtube-video \"FoAzpGzFCSE\" \"15:14\")
 ;; (find-2022findeevanggvideo \"15:14\")
 (setq ee-find-youtube-video-program 'find-{browser})
+")
+ )
+   pos-spec-list))
+
 
+
+
+;;;  _  
+;;;  _ __   _  _| |__  _ __ _  _  ___ _ _|___ \ 
+;;; | '_ \ / _ \ \ /\ / / '_ \| '__/ _ \ \ /\ / / __|/ _ \ '__|__) |
+;;; | | | |  __/\ V  V /| |_) | | | (_) \ V  V /\__ \  __/ |  / __/ 
+;;; |_| |_|\___| \_/\_/ |_.__/|_|  \___/ \_/\_/ |___/\___|_| |_|
+;;; 
+;; «find-newbrowser2-links»  (to ".find-newbrowser2-links")
+;; Skel: (find-find-links-links-new "newbrowser2" "binary" "")
+;; Test: (find-newbrowser2-links)
+;;
+(defun find-newbrowser2-links (&optional binary &rest pos-spec-list)
+"Visit a temporary buffer with instructions for making `find-googlechrome'
+call BINARY instead of \"google-chrome\"."
+  (interactive)
+  (setq binary (or binary "{binary}"))
+  (apply
+   'find-elinks-elisp
+   `((find-newbrowser2-links ,binary ,@pos-spec-list)
+ (find-newbrowser2-links "{binary}" ,@pos-spec-list)
+ (find-newbrowser2-links "google-chrome" ,@pos-spec-list)
+ (find-newbrowser2-links "chromium" ,@pos-spec-list)
+ ;; Convention: the first sexp always regenerates the buffer.
+ (find-efunction 'find-newbrowser2-links)
+ ""
+ ,(ee-template0 "\
+;; Make `{binary}' the default browser.
+;; This is a hack that makes `find-googlechrome' call `{binary}'!
+
+
+;; Try:
+;;
+(defun find-googlechrome (url) (find-bgprocess `(\"{binary}\" ,url)))
+(find-googlechrome \"https://www.lua.org/\";)
+;;
+;; Then run these tests:
+;;   (find-bgprocess \"{binary} https://www.lua.org/\";)
+;;   (find-googlechrome \"https://www.lua.org/\";)
+;;   (brg \"https://www.lua.org/\";)
+;;   (find-eev-quick-intro \"3.1. Non-elisp

[elpa] externals/org-modern 0798c12bb7 1/2: Better face-remapping-alist when computing table divider

[ELPA Syncer]

branch: externals/org-modern
commit 0798c12bb7e4d8adbeb79605683fc51f1c5a4f2e
Author: Daniel Mendler 
Commit: Daniel Mendler 

Better face-remapping-alist when computing table divider
---
 org-modern.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/org-modern.el b/org-modern.el
index 9bfd78fcc6..09d6ff9458 100644
--- a/org-modern.el
+++ b/org-modern.el
@@ -661,9 +661,9 @@ whole buffer; otherwise, for the line at point."
(face-attribute 'default :background nil t))
   (org-modern--update-label-face)))
   (let ((face-remapping-alist
- (if-let (h (cadr (assq :height (assq 'default face-remapping-alist
- `((default (:inherit org-table :height ,h)))
-   '((default (:inherit org-table))
+ (if-let ((d (cdr (assq 'default face-remapping-alist
+ `((default org-table ,@d default))
+   '((default org-table default)
 (setq org-modern--table-sp-width (default-font-width)))
   (setf (cadr org-modern--table-overline) (face-attribute 'org-table 
:foreground nil t)))
 

[elpa] externals/org-modern updated (63df971a82 -> ba24c9907f)

[ELPA Syncer]

elpasync pushed a change to branch externals/org-modern.

  from  63df971a82 org-modern-agenda: Simplify
   new  0798c12bb7 Better face-remapping-alist when computing table divider
   new  ba24c9907f Handle cons face remappings


Summary of changes:
 org-modern.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

[elpa] externals/org-modern ba24c9907f 2/2: Handle cons face remappings

[ELPA Syncer]

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

Handle cons face remappings
---
 org-modern.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org-modern.el b/org-modern.el
index 09d6ff9458..17a5443644 100644
--- a/org-modern.el
+++ b/org-modern.el
@@ -661,7 +661,7 @@ whole buffer; otherwise, for the line at point."
(face-attribute 'default :background nil t))
   (org-modern--update-label-face)))
   (let ((face-remapping-alist
- (if-let ((d (cdr (assq 'default face-remapping-alist
+ (if-let ((d (ensure-list (cdr (assq 'default face-remapping-alist)
  `((default org-table ,@d default))
'((default org-table default)
 (setq org-modern--table-sp-width (default-font-width)))

[elpa] externals/org-modern 96cd1dc2c8: Fix org agenda todo state highlighting

[ELPA Syncer]

branch: externals/org-modern
commit 96cd1dc2c8f523f1f4f02b927375deaa924368b4
Author: Daniel Mendler 
Commit: Daniel Mendler 

Fix org agenda todo state highlighting
---
 org-modern.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/org-modern.el b/org-modern.el
index 17a5443644..fd299b168c 100644
--- a/org-modern.el
+++ b/org-modern.el
@@ -902,9 +902,10 @@ whole buffer; otherwise, for the line at point."
 (when org-modern-todo
   (goto-char (point-min))
   (while (< (point) (point-max))
-(when-let ((todo (get-text-property (point) 'todo-state))
+(when-let (((get-text-property (point) 'todo-state))
(org-not-done-regexp (get-text-property (point) 
'org-not-done-regexp))
-   (re (concat " \\(" todo "\\) "))
+   (re (get-text-property (point) 'org-todo-regexp))
+   (re (concat " " re " "))
((re-search-forward re (pos-eol) 'noerror)))
   (org-modern--todo))
 (goto-char (min (1+ (pos-eol)) (point-max)

[elpa] externals/cursor-undo 47d8fc0e19: * cursor-undo.el: clean up byte compilation warning messages.

[Luke Lee]

branch: externals/cursor-undo
commit 47d8fc0e19ae852b771bf0ab1a170aea410ab3f4
Author: Luke Lee 
Commit: Luke Lee 

* cursor-undo.el: clean up byte compilation warning messages.
---
 cursor-undo.el | 75 --
 1 file changed, 42 insertions(+), 33 deletions(-)

diff --git a/cursor-undo.el b/cursor-undo.el
index 19088049d1..c12946c7bc 100644
--- a/cursor-undo.el
+++ b/cursor-undo.el
@@ -6,7 +6,6 @@
 ;; Maintainer:   Luke Lee 
 ;; Keywords: undo, cursor
 ;; Version:  1.0
-;; Package-Requires: ((cl-lib "0.5"))
 
 ;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -92,18 +91,24 @@
 
 ;;; Code:
 
-;;;###autoload
-(define-minor-mode cursor-undo
-  "Global minor mode for tracking cursor undo."
-  :lighter " cu"
-  :variable cundo-enable-cursor-tracking)
+(defgroup cursor-undo nil
+  "Cursor movement undo support."
+  :prefix "cundo-"
+  :group 'cursor-undo)
 
 ;; Global enabling control flag
 ;;;###autoload
 (defcustom cundo-enable-cursor-tracking  nil
   "Global control flag to enable cursor undo tracking."
+  :require 'cursor-undo
   :type 'boolean)
 
+;;;###autoload
+(define-minor-mode cursor-undo
+  "Global minor mode for tracking cursor undo."
+  :lighter " cu"
+  :variable cundo-enable-cursor-tracking)
+
 ;; Local disable flag, use reverse logic as NIL is still a list and we can
 ;; pop it again and again
 (defvar-local cundo-disable-local-cursor-tracking nil)
@@ -125,6 +130,11 @@
 ;; (nil (apply cdr nil) nil a b...) -> (nil a b...)
 (setq buffer-undo-list (cddr buffer-undo-list)
 
+;; Note that this `prev-screen-start' is NOT a dynamic binding variable.
+;; It's defined here to make byte compiler not to complain about:
+;; "Warning: Unused lexical variable ‘prev-screen-start’".
+(defvar prev-screen-start)
+
 ;;;###autoload
 (defmacro def-cursor-undo (func-sym &optional no-combine screen-pos no-move)
   "Define an advice for FUNC-SYM to track cursor movements in the undo buffer.
@@ -174,7 +184,7 @@ relative screen position (screen-pos=NIL) nor `point' 
position (no-move=t)."))
 (prev-point (point))
 (prev-screen-start))
,@(when screen-pos
-   '((when cursor-tracking
+   '((if cursor-tracking
(setq prev-screen-start (window-start)
(apply orig-func args)
;; This is a helper for commands that might take long. eg. page-up/
@@ -217,8 +227,8 @@ relative screen position (screen-pos=NIL) nor `point' 
position (no-move=t)."))
 (numberp (cadr buffer-undo-list))
 (= prev-point (cadr buffer-undo-list
  ,@(if screen-pos
-  '((push `(apply cundo-restore-win (,@prev-screen-start))
-  buffer-undo-list)))
+   '((push `(apply cundo-restore-win (,@prev-screen-start))
+   buffer-undo-list)))
  ,@(unless no-move
 '((push prev-point buffer-undo-list)))
  ;;(abbrevmsg (format "c=%S,%S b=%S" last-command this-command
@@ -401,27 +411,26 @@ relative screen position (screen-pos=NIL) nor `point' 
position (no-move=t)."))
 (setf this-command lastcmd)))
 
 ;; Bookmark related
-(eval-after-load 'bookmark+-1 ;; emacswiki bookmark extension
-  '(progn
- (def-cursor-undo bookmark-jump  t  t) ;; C-x b g
- (def-cursor-undo bookmark-jump-other-window t  t) ;; C-x b j
- (disable-cursor-tracking bookmark-save)))
+;; For feature 'bookmark+-1 (emacswiki bookmark extension)
+(def-cursor-undo bookmark-jump  t  t) ;; C-x b g
+(def-cursor-undo bookmark-jump-other-window t  t) ;; C-x b j
+(disable-cursor-tracking bookmark-save)
 
 ;;
 ;; Prevent cursor tracking during semantic parsing
 ;;
-(eval-after-load
+(eval-after-load 'semantic
   '(progn
  (add-hook 'semantic-before-idle-scheduler-reparse-hooks
#'(lambda ()
(push 't cundo-disable-local-cursor-tracking)))
  (add-hook 'semantic-after-idle-scheduler-reparse-hooks
#'(lambda ()
-   (pop cundo-disable-local-cursor-tracking)))
- (disable-cursor-tracking semantic-fetch-tags)
- (disable-cursor-tracking senator-parse)
- (disable-cursor-tracking senator-force-refresh)
- (disable-cursor-tracking semantic-go-to-tag)))
+   (pop cundo-disable-local-cursor-tracking)
+(disable-cursor-tracking semantic-fetch-tags)
+(disable-cursor-tracking senator-parse)
+(disable-cursor-tracking senator-force-refresh)
+(disable-cursor-tracking semantic-go-to-tag)
 
 ;; For feature 'smie
 ;; Need to disable the following, a sample test without disabling this is
@@ -435,21 +444,21 @@ relative screen position (screen-pos=NIL) nor `point' 
position (no-move=t)."))
 ;;
 ;; Disable curs

[elpa] elpa-admin 584bb472c8 2/2: Merge remote-tracking branch 'refs/remotes/origin/elpa-admin' into elpa-admin

[Stefan Monnier via]

branch: elpa-admin
commit 584bb472c85f902e84fd904be4711d6739823c59
Merge: 39d29cfe18 776126005b
Author: Stefan Monnier 
Commit: Stefan Monnier 

Merge remote-tracking branch 'refs/remotes/origin/elpa-admin' into 
elpa-admin
---
 elpa-admin.el | 80 ---
 1 file changed, 44 insertions(+), 36 deletions(-)

diff --git a/elpa-admin.el b/elpa-admin.el
index ced81fb3f9..cb0810c38f 100644
--- a/elpa-admin.el
+++ b/elpa-admin.el
@@ -1659,7 +1659,7 @@ which see."
   (if (executable-find "markdown2")
   ;; Presumably https://github.com/trentm/python-markdown2.
   ;; Stay conservative in the set of extensions we support.
-  '("markdown2" "-x" "code-friendly,tables")
+  '("markdown2" "-x" "code-friendly,tables,fenced-code-blocks,nofollow")
 '("markdown")))
 
 (cl-defmethod elpaa--section-to-html ((section (head text/markdown)))
@@ -2066,7 +2066,7 @@ arbitrary code."
  " " "HTTP/" (+ (or alnum ".")))   ; Protocol
 (* (not (any "\"" " "  ; Garbage
   "\""
-  " " (+ digit); Status code
+  " " (group (+ digit)); Status code
   " " (or (+ digit) "-")   ; Size
   " \"" (* (or (not (any "\"")) "\\\"")) "\" " ; Referrer
   "\"" (* (or (not (any "\"")) "\\\"")) "\""   ; User-Agent
@@ -2080,19 +2080,21 @@ arbitrary code."
   (if (not (looking-at elpaa--wsl-line-re))
   (message "Unrecognized log line: %s"
(buffer-substring (point) (line-end-position)))
-(let* ((timestr (match-string 1))
+(let* ((line (match-string 0))
+   (timestr (match-string 1))
(file (match-string 2))
+   (status (match-string 3))
(timestr
 (if (string-match "/\\([^/]*\\)/\\([^/:]*\\):" timestr)
 (replace-match " \\1 \\2 " t nil timestr)
   (message "Unrecognized timestamp: %s" timestr)
   timestr))
(time (encode-time (parse-time-string timestr
-  (when file
+  (when (and file (not (member status '("404"
 (let ((pkg (if (string-match
 (rx bos "/"
 (or "packages" "devel" "nongnu" "nongnu-devel")
-"/"
+(+ "/")
 (group (+? any))
 (\?
  "-" (or
@@ -2100,56 +2102,62 @@ arbitrary code."
(+ (or digit "."))
(* (or "pre" "beta" "alpha" "snapshot")
   (* (or digit "."
-  "readme"))
+  "readme"
+  "sync-failure"
+  "build-failure"))
 "."
 (or "tar" "txt" "el" "html"))
 file)
(match-string 1 file
-  (funcall fn time pkg file)
+  (funcall fn time pkg file line)
   (forward-line 1
 
 (defun elpaa--wsl-one-file (logfile stats)
   (elpaa--wsl-read
logfile
;; Keep a counter of accesses indexed by package and week.
-   (lambda (time pkg _file)
+   (lambda (time pkg file line)
  (let* ((secs (time-convert time 'integer))
-(week (/ secs 3600 24 7)))
+(week (/ secs 3600 24 7))
+(old (gethash pkg stats)))
+   (unless old
+ (message "New package: %S %S %S %S" time pkg file line))
(cl-incf (alist-get week (gethash pkg stats) 0))
 
 (defvar elpaa--wsl-directory "/var/log/apache2/")
 
 (defun elpaa--wsl-scores (table)
   (let ((scores-by-week ()))
-   (maphash (lambda (pkg data)
-  (when (and pkg (not (string-match "/" pkg)))
-(pcase-dolist (`(,week . ,count) data)
-  (push (cons count pkg) (alist-get week scores-by-week)
-table)
-   ;; For each week, we sort packages by number of downloads, to
-   ;; compute their percentile ranking.
-   ;; FIXME: We don't take into account that several (many?) packages can
-   ;; have the same number of downloads, in which case their relative ranking
-   ;; (within the equiv class) is a lie.
-   (dolist (scores scores-by-week)
- (setf (cdr scores)
-   (nreverse (mapcar #'cdr (sort (cdr scores)
-#'car-less-than-car)
-   (let ((score-table (make-hash-table :test 'equal)))
- (pcase-dolist (`(,week . ,pkgs) scores-by-week)
-  (let* ((total (length pkgs))
- (rest total))
-(dolist (pkg pkgs)
-  (setq rest (1- rest))
-  (let ((percentile (/ (* 10

[elpa] elpa-admin 39d29cfe18 1/2: * elpa-admin.el (elpaa--wsl-collect): Don't get confused by ctime changes

[Stefan Monnier via]

branch: elpa-admin
commit 39d29cfe18974eba65fdd8e39399a43131adaf57
Author: Stefan Monnier 
Commit: Stefan Monnier 

* elpa-admin.el (elpaa--wsl-collect): Don't get confused by ctime changes
---
 elpa-admin.el | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/elpa-admin.el b/elpa-admin.el
index a358b02021..ced81fb3f9 100644
--- a/elpa-admin.el
+++ b/elpa-admin.el
@@ -2156,6 +2156,9 @@ arbitrary code."
 ;; files that may still be modified.
 (dolist (logfile (directory-files elpaa--wsl-directory t "\\.[lgx]z\\'"))
   (let ((attrs (file-attributes logfile)))
+;; The log files get renamed, which changes their `ctime', so let's
+;; throw out this information.
+(setf (nth 6 attrs) nil)
 (cond
  ((string-match "error.log" logfile) nil) ;Ignore the error log files.
  ((member attrs seen) nil);Already processed.

[elpa] externals/cursor-undo 4cb785b161: * cursor-undo.el: clean up legacy codes which are no longer needed.

[Luke Lee]

branch: externals/cursor-undo
commit 4cb785b1618c617666d50dff5a55e89dfef566d0
Author: Luke Lee 
Commit: Luke Lee 

* cursor-undo.el: clean up legacy codes which are no longer needed.
---
 cursor-undo.el | 120 -
 1 file changed, 59 insertions(+), 61 deletions(-)

diff --git a/cursor-undo.el b/cursor-undo.el
index c12946c7bc..09e369de38 100644
--- a/cursor-undo.el
+++ b/cursor-undo.el
@@ -176,64 +176,63 @@ relative screen position (screen-pos=NIL) nor `point' 
position (no-move=t)."))
 (error (message
 (format "Error: Redefining cursor undo advice for `%S'"
 func-sym
-`(progn
-   (define-advice ,func-sym (:around (orig-func &rest args) ,advice-sym)
- (let* ((cursor-tracking cundo-enable-cursor-tracking)
-;; prevent nested calls for complicated compound commands
-(cundo-enable-cursor-tracking nil)
-(prev-point (point))
-(prev-screen-start))
-   ,@(when screen-pos
-   '((if cursor-tracking
+`(define-advice ,func-sym (:around (orig-func &rest args) ,advice-sym)
+   (let* ((cursor-tracking cundo-enable-cursor-tracking)
+  ;; prevent nested calls for complicated compound commands
+  (cundo-enable-cursor-tracking nil)
+  (prev-point (point))
+  (prev-screen-start))
+ ,@(when screen-pos
+ '((if cursor-tracking
(setq prev-screen-start (window-start)
-   (apply orig-func args)
-   ;; This is a helper for commands that might take long. eg. page-up/
-   ;; page-down in big files, or line-up/down in big files when 
marking.
-   (unless
-   (or (not cursor-tracking)
-   ;;[2017-11-15 Wed] Still need to test
-   ;;  `(called-interactively-p 'any)', why?  Maybe it's 
because
-   ;;  too many functions are invoked non-interactively and 
thus
-   ;;  produce a lot of undo records in the undo
-   ;;  buffer. Therefore after a search operation there are 
tons
-   ;;  and tons of cursor undo information to redo.  Therefore,
-   ;;  testing `(called-interactively-p 'any)' will be safer.
-   ;;
-   ;;[2017-11-13 Mon] We've already prevent reentering so there
-   ;;  is really no need to test if this call is called
-   ;;  interactively or not.  When a keyboard command calls
-   ;;  another keyboard command using normal LISP function 
calls
-   ;;  the (called-interactively-p 'any) will return nil unless
-   ;;  they are called using `call-interactively'.  Now we
-   ;;  remove it to allow either case.
-   ;;
-   ;; A sample function is this:
-   ;;  (def-cursor-undo line-bookmark-jump-nearest   t  t)
-   ;;  ;;(def-cursor-undo line-bookmark-nearest-next t  t)
-   ;;  ;;(def-cursor-undo line-bookmark-nearest-prev t  t)
-   ;;
-   ;; `line-bookmark-nearest-next'/`line-bookmark-nearest-prev'
-   ;; calls `line-bookmark-jump-nearest' (non-interactive 
call).
-   ;; By adding cursor-undo to the inner function
-   ;; `line-bookmark-jump-nearest' we don't need to add to both
-   ;; 
`line-bookmark-nearest-next'/`line-bookmark-nearest-prev'.
-   (not (called-interactively-p 'any))
-   (car cundo-disable-local-cursor-tracking)
-   ,@(unless no-combine '((eq last-command this-command)))
-   ;; if NO-MOVE is specified, check if `point' moved
-   ,@(unless no-move '((= prev-point (point
-   ;; Sometimes the buffer-undo-list is t
-   (and (listp buffer-undo-list)
-(numberp (cadr buffer-undo-list))
-(= prev-point (cadr buffer-undo-list
- ,@(if screen-pos
-   '((push `(apply cundo-restore-win (,@prev-screen-start))
-   buffer-undo-list)))
- ,@(unless no-move
-'((push prev-point buffer-undo-list)))
- ;;(abbrevmsg (format "c=%S,%S b=%S" last-command this-command
- ;;   buffer-undo-list) 128) ;; DBG
- (undo-boundary)))
+ (apply orig-func args)
+ ;; This is a helper for commands that might take long. eg. page-up/
+ ;; page-down in big files, or line-up/down in big files when marking.
+ (unless
+ (or (not cursor-tracking)
+ ;;[2017-11-15 Wed] Still need to test
+ ;;  `(called-interactively-p 'any)', why?  Maybe it's bec

[nongnu] elpa/vm afd21a83dd 05/20: Reorder declarations to avoid compiler warnings

[ELPA Syncer]

branch: elpa/vm
commit afd21a83ddcf34da6c73a679c4a4a38534b28f0b
Author: Stefan Monnier 
Commit: Stefan Monnier 

Reorder declarations to avoid compiler warnings

Move `defvaralias` before the definition.
Move var definitions before their first use.
---
 lisp/vm-pcrisis.el  |  28 +++---
 lisp/vm-rfaddons.el |  12 +--
 lisp/vm-vars.el | 244 ++--
 3 files changed, 143 insertions(+), 141 deletions(-)

diff --git a/lisp/vm-pcrisis.el b/lisp/vm-pcrisis.el
index cc042a9700..7ed9075655 100644
--- a/lisp/vm-pcrisis.el
+++ b/lisp/vm-pcrisis.el
@@ -143,58 +143,58 @@ Checks if the condition and all the actions exist."
 ,@(mapcar (lambda (a) `(const ,(car a))) vmpc-actions)
 (string))
 
+(defvaralias 'vmpc-actions-alist 'vmpc-default-rules)
 (defcustom vmpc-default-rules ()
-  "*A default list of condition-action rules used for replying, forwarding,
+  "A default list of condition-action rules used for replying, forwarding,
 resending, composing and automorphing, unless overridden by more
 specific variables such as `vmpc-reply-rules'."
   :type (vmpc-defcustom-rules-type)
 ;  :set 'vmpc-rules-set
   :group 'vmpc)
-(defvaralias 'vmpc-actions-alist 'vmpc-default-rules)
 
+(defvaralias 'vmpc-reply-alist 'vmpc-reply-rules)
 (defcustom vmpc-reply-rules ()
-  "*A list of condition-action rules used during reply."
+  "A list of condition-action rules used during reply."
   :type (vmpc-defcustom-rules-type)
 ;  :set 'vmpc-rules-set
   :group 'vmpc)
-(defvaralias 'vmpc-reply-alist 'vmpc-reply-rules)
 
+(defvaralias 'vmpc-forward-alist 'vmpc-forward-rules)
 (defcustom vmpc-forward-rules ()
-  "*A list of condition-action rules used when forwarding."
+  "A list of condition-action rules used when forwarding."
   :type (vmpc-defcustom-rules-type)
 ;  :set 'vmpc-rules-set
   :group 'vmpc)
-(defvaralias 'vmpc-forward-alist 'vmpc-forward-rules)
 
+(defvaralias 'vmpc-automorph-alist 'vmpc-automorph-rules)
 (defcustom vmpc-automorph-rules ()
-  "*An alist associating conditions with actions from `vmpc-actions' when 
automorphing."
+  "An alist associating conditions with actions from `vmpc-actions' when 
automorphing."
   :type (vmpc-defcustom-rules-type)
 ;  :set 'vmpc-rules-set
   :group 'vmpc)
-(defvaralias 'vmpc-automorph-alist 'vmpc-automorph-rules)
 
+(defvaralias 'vmpc-mail-alist 'vmpc-mail-rules)
 (defcustom vmpc-mail-rules ()
-  "*An alist associating conditions with actions from `vmpc-actions'
+  "An alist associating conditions with actions from `vmpc-actions'
 when composing a message starting from a folder."
   :type (vmpc-defcustom-rules-type)
 ;  :set 'vmpc-rules-set
   :group 'vmpc)
-(defvaralias 'vmpc-mail-alist 'vmpc-mail-rules)
 
+(defvaralias 'vmpc-newmail-alist 'vmpc-newmail-rules)
 (defcustom vmpc-newmail-rules ()
-  "*An alist associating conditions with actions from `vmpc-actions'
+  "An alist associating conditions with actions from `vmpc-actions'
 when composing." 
   :type (vmpc-defcustom-rules-type)
 ;  :set 'vmpc-rules-set
   :group 'vmpc)
-(defvaralias 'vmpc-newmail-alist 'vmpc-newmail-rules)
 
+(defvaralias 'vmpc-resend-alist 'vmpc-resend-rules)
 (defcustom vmpc-resend-rules ()
-  "*An alist associating conditions with actions from `vmpc-actions' when 
resending."
+  "An alist associating conditions with actions from `vmpc-actions' when 
resending."
   :type (vmpc-defcustom-rules-type)
 ;  :set 'vmpc-rules-set
   :group 'vmpc)
-(defvaralias 'vmpc-resend-alist 'vmpc-resend-rules)
 
 (defcustom vmpc-default-profile "default"
   "*The default profile to select if no profile was found."
diff --git a/lisp/vm-rfaddons.el b/lisp/vm-rfaddons.el
index f3cd0ca5a6..b8338e63f0 100644
--- a/lisp/vm-rfaddons.el
+++ b/lisp/vm-rfaddons.el
@@ -825,11 +825,13 @@ See the variable `vm-handle-return-receipt-mode' for 
customization. (Rob F)"
   
 
 ;;
-(defvar vm-attach-files-in-directory-regexps-history nil
-  "Regexp history for matching files. (Rob F)")
 (defvaralias 'vm-mime-attach-files-in-directory-regexps-history
   'vm-attach-files-in-directory-regexps-history)
+(defvar vm-attach-files-in-directory-regexps-history nil
+  "Regexp history for matching files. (Rob F)")
 
+(defvaralias 'vm-mime-attach-files-in-directory-default-type
+  'vm-attach-files-in-directory-default-type)
 (defcustom vm-attach-files-in-directory-default-type nil
   "*The default MIME-type for attached files.
 If set to nil you will be asked for the type if it cannot be guessed.
@@ -837,9 +839,9 @@ For guessing mime-types we use 
`vm-mime-attachment-auto-type-alist'. (Rob F)"
   :group 'vm-rfaddons
   :type '(choice (const :tag "Ask" nil)
  (string "application/octet-stream")))
-(defvaralias 'vm-mime-attach-files-in-directory-default-type
-  'vm-attach-files-in-directory-default-type)
 
+(defvaralias 'vm-mime-attach-files-in-directory-default-c

[nongnu] elpa/vm fbe2f525c5 14/20: Move `defvar`s out of `eval-when-compile`

[ELPA Syncer]

branch: elpa/vm
commit fbe2f525c5e2f72675d8e436229a235c28be8b38
Author: Stefan Monnier 
Commit: Stefan Monnier 

Move `defvar`s out of `eval-when-compile`
---
 lisp/vm-mime.el | 24 +---
 lisp/vm-pgg.el  | 15 ++-
 lisp/vm-vars.el | 13 -
 3 files changed, 15 insertions(+), 37 deletions(-)

diff --git a/lisp/vm-mime.el b/lisp/vm-mime.el
index f9449ad239..b1acbb18aa 100644
--- a/lisp/vm-mime.el
+++ b/lisp/vm-mime.el
@@ -90,10 +90,9 @@
 
 ;; A lot of the more complicated MIME character set processing is only
 ;; practical under MULE.
-(eval-when-compile 
-  (defvar latin-unity-ucs-list)
-  (defvar latin-unity-character-sets)
-  (defvar coding-system-list))
+(defvar latin-unity-ucs-list)
+(defvar latin-unity-character-sets)
+(defvar coding-system-list)
 
 (defun vm-get-coding-system-priorities ()
   "Return the value of `vm-coding-system-priorities', or a reasonable
@@ -141,13 +140,12 @@ default for it if it's nil.  "
 it's nil.  This is used instead of `vm-mime-ucs-list' directly in order to
 allow runtime checks for optional features like `mule-ucs' or
 `latin-unity'.  "
-  (if vm-mime-ucs-list
-  vm-mime-ucs-list
-(if (featurep 'latin-unity)
-   latin-unity-ucs-list
-  (if (vm-coding-system-p 'utf-8)
- '(utf-8 iso-2022-jp ctext escape-quoted)
-   '(iso-2022-jp ctext escape-quoted)
+  (or vm-mime-ucs-list
+  (if (featurep 'latin-unity)
+ latin-unity-ucs-list
+   (if (vm-coding-system-p 'utf-8)
+   '(utf-8 iso-2022-jp ctext escape-quoted)
+ '(iso-2022-jp ctext escape-quoted)
 
 (defun vm-update-mime-charset-maps ()
   "Check for the presence of certain Mule coding systems, and add
@@ -180,10 +178,6 @@ configuration.  "
   (add-to-list 'vm-mime-mule-coding-to-charset-alist 
   '(iso-8859-1 "iso-8859-1")))
 
-(eval-when-compile
-  (when (not (featurep 'xemacs))
-(defvar latin-unity-character-sets nil)))
-
 (when (featurep 'xemacs)
   (require 'vm-vars)
   (vm-update-mime-charset-maps)
diff --git a/lisp/vm-pgg.el b/lisp/vm-pgg.el
index 3988a7b7f3..e8c673b6d6 100644
--- a/lisp/vm-pgg.el
+++ b/lisp/vm-pgg.el
@@ -107,15 +107,12 @@
   
 (declare-function rfc822-addresses "ext:rfc822" (header-text))
 
-(eval-when-compile
-  ;; avoid warnings
-  (defvar vm-mode-line-format)
-  (defvar vm-message-pointer)
-  (defvar vm-presentation-buffer)
-  (defvar vm-summary-buffer)
-  ;; avoid bytecompile warnings
-  (defvar vm-pgg-cleartext-state nil "For interfunction communication.")
-)
+;; avoid warnings
+(defvar vm-mode-line-format)
+(defvar vm-message-pointer)
+(defvar vm-presentation-buffer)
+(defvar vm-summary-buffer)
+(defvar vm-pgg-cleartext-state)
 
 ; group already defined in vm-vars.el
 ;(defgroup vm nil
diff --git a/lisp/vm-vars.el b/lisp/vm-vars.el
index 4507c9fb8a..37228f0ba7 100644
--- a/lisp/vm-vars.el
+++ b/lisp/vm-vars.el
@@ -7116,19 +7116,6 @@ Possible values are
 `inactive' - session is inactive")
 (make-variable-buffer-local 'vm-imap-session-type)
 
-(eval-when-compile
-  (defvar current-itimer nil)
-  (defvar current-menubar nil)
-  (defvar scrollbar-height nil)
-  (defvar top-toolbar nil)
-  (defvar top-toolbar-height nil)
-  (defvar bottom-toolbar nil)
-  (defvar bottom-toolbar-height nil)
-  (defvar right-toolbar nil)
-  (defvar right-toolbar-width nil)
-  (defvar left-toolbar nil)
-  (defvar left-toolbar-width nil))
-
 (defvar vm-fsfemacs-toolbar-installed-p nil)
 ;; this defvar matches the XEmacs one so it doesn't matter if VM
 ;; is loaded before highlight-headers.el

[nongnu] elpa/vm 9df9bb01f5 12/20: Fix some `defcustom` types

[ELPA Syncer]

branch: elpa/vm
commit 9df9bb01f50f612c5e101e8be9370609ff2b9278
Author: Stefan Monnier 
Commit: Stefan Monnier 

Fix some `defcustom` types
---
 lisp/vm-pgg.el  |  5 +++--
 lisp/vm-rfaddons.el |  6 --
 lisp/vm-vars.el | 26 --
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/lisp/vm-pgg.el b/lisp/vm-pgg.el
index aaeda77fed..3988a7b7f3 100644
--- a/lisp/vm-pgg.el
+++ b/lisp/vm-pgg.el
@@ -522,8 +522,9 @@ If STATES is nil, clear it."
 
 (defcustom vm-pgg-cleartext-search-limit 4096
   "Number of bytes to peek into the message for a PGP clear text armor."
-   :group 'vm-pgg
-   :group 'faces)
+  :type 'integer
+  :group 'vm-pgg
+  :group 'faces)
 
 (defun vm-pgg-cleartext-automode-button (label action)
   "Cleartext thing by a button with text LABEL and associate ACTION with it.
diff --git a/lisp/vm-rfaddons.el b/lisp/vm-rfaddons.el
index 8eee2fd743..a26438d8f7 100644
--- a/lisp/vm-rfaddons.el
+++ b/lisp/vm-rfaddons.el
@@ -1511,7 +1511,8 @@ Add this to `vm-mail-mode-hook'. (Rob F)"
   "Flag used by `vm-mail-mode-open-line'. (Rob F)")
 
 (defcustom vm-mail-mode-open-line-regexp "[ \t]*>"
-  "Regexp matching prefix of quoted text at line start. (Rob F)")
+  "Regexp matching prefix of quoted text at line start. (Rob F)"
+  :type 'regexp)
 
 (defun vm-mail-mode-open-line (start end &optional length)
   "Opens a line when inserting into the region of a reply.
@@ -1843,7 +1844,8 @@ Otherwise, overwrite existing date headers (Rob F)"
 ;;
 (defcustom vm-delete-message-action "vm-next-message"
   "Command to do after deleting a message. (Rob F)"
-  :group 'vm-rfaddons)
+  :group 'vm-rfaddons
+  :type 'string) ;; FIXME: `command' would be more useful, no?
 
 ;;;###autoload
 (defun vm-delete-message-action (&optional arg)
diff --git a/lisp/vm-vars.el b/lisp/vm-vars.el
index 1042bccce6..4507c9fb8a 100644
--- a/lisp/vm-vars.el
+++ b/lisp/vm-vars.el
@@ -1797,8 +1797,8 @@ cid: attachments to the content viewer.")
   "*Non-nil value means that VM should attempt to verify signatures
 attached in \"multipart/signed\" parts."
   :group 'vm-mime
-  :type '(choice (const nil :tag "Do not verify")
-(const t :tag "Verify")))
+  :type '(choice (const :tag "Do not verify" nil)
+(const :tag "Verify" t)))
 
 (defcustom vm-mime-text/html-handler 'auto-select
   "*The library used for displaying HTML messages.  The possible
@@ -1811,8 +1811,8 @@ values are:
   nilNo internal display of HTML messages.
 "
   :group 'vm-mime
-  :type '(choice (const nil :tag "Do not display HTML messages.")
- (const auto-select :tag "Autoselect best method")
+  :type '(choice (const :tag "Do not display HTML messages." nil)
+ (const :tag "Autoselect best method" auto-select)
  (const emacs-w3m)
  (const emacs-w3)
  (const w3m)
@@ -2211,8 +2211,7 @@ in a single buffer under MULE, VM will map the file 
coding system
 of the buffer to a single MIME character set that can display all
 the buffer's characters."
   :group 'vm-mime
-  :type '(choice (const nil)
- (string :tag "iso-8859-1" "iso-8859-1")
+  :type '(choice (string :tag "iso-8859-1" "iso-8859-1")
  (string :tag "iso-2022-jp" "iso-2022-jp")
  (string :tag "User defined")
  (const  :tag "Auto select" nil)))
@@ -3326,7 +3325,7 @@ A nil value means to use plain text forwarding."
   (const "mime")
   (const "rfc934")
   (const "rfc1153")
- (const nil :tag "Forward in plain text")))
+ (const :tag "Forward in plain text" nil)))
 
 (defcustom vm-mime-forward-local-external-bodies nil
   "*Non-nil value means that the `message/external-body' MIME
@@ -3442,7 +3441,7 @@ A nil value means to use plain text digests."
   :type '(choice (const "mime")
 (const "rfc934") 
  (const "rfc1153") 
-(const nil "Plain text digests")))
+(const :tag "Plain text digests" nil)))
 
 (defcustom vm-rfc934-digest-headers
   '("Resent-"
@@ -3648,7 +3647,7 @@ the message."
  regexp))
 
 (defcustom vm-resend-headers nil
-  "*List of headers that should be appear in messages resent with
+  "List of headers that should appear in messages resent with
 `vm-resend-message'.  These should be listed in the order you wish them
 to appear in the message.  Regular expressions are allowed.
 There is no need to anchor patterns with \"^\", as searches always
@@ -3668,8 +3667,7 @@ appearance in that case, with headers not matching any in 
the
 `vm-resend-headers' list appearing last in the headers of
 the message."
   :group 'vm-forward
-  :type '(choice (const nil)
- repeat regexp))
+  :type '(repeat regexp))
 
 (defcustom vm-resend-discard-header-regexp 
"\\(\\(X400-\\)?Received:\\|Resent-\\)"
   "*Non-ni

[nongnu] elpa/vm 31b32ce4d2 03/20: Remove Emacs-20 support in vcard.el

[ELPA Syncer]

branch: elpa/vm
commit 31b32ce4d25bb941d96561a20c6897db62d33fe5
Author: Stefan Monnier 
Commit: Stefan Monnier 

Remove Emacs-20 support in vcard.el
---
 lisp/vcard.el | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lisp/vcard.el b/lisp/vcard.el
index 681d8c07ef..2152c6f681 100644
--- a/lisp/vcard.el
+++ b/lisp/vcard.el
@@ -471,9 +471,7 @@ US domestic telephone numbers are replaced with 
international format."
 ;;; Decoding methods.
 
 (defmacro vcard-hexstring-to-ascii (s)
-  (if (string-lessp emacs-version "20")
-  `(format "%c" (car (read-from-string (format "?\\x%s" ,s
-`(format "%c" (string-to-number ,s 16
+  `(format "%c" (string-to-number ,s 16)))
 
 (defun vcard-region-decode-quoted-printable (&optional beg end)
   (save-excursion

[nongnu] elpa/vm bc3907cabe 15/20: Assume Emacs-22 hook names

[ELPA Syncer]

branch: elpa/vm
commit bc3907cabec01b3ca686c80869b0e348219259fd
Author: Stefan Monnier 
Commit: Stefan Monnier 

Assume Emacs-22 hook names
---
 lisp/vm-folder.el | 15 +--
 lisp/vm-misc.el   | 18 --
 2 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/lisp/vm-folder.el b/lisp/vm-folder.el
index dd3829dd31..ac13ba2075 100644
--- a/lisp/vm-folder.el
+++ b/lisp/vm-folder.el
@@ -4027,7 +4027,7 @@ Same as \\[vm-recover-folder]."
 ;; working any more.  Not on GNU Emacs.  USR, 2010-01-23
 
 (defun vm-handle-file-recovery-or-reversion (recovery)
-  (if (and vm-summary-buffer (buffer-name vm-summary-buffer))
+  (if (buffer-live-p vm-summary-buffer)
   (kill-buffer vm-summary-buffer))
   (vm-virtual-quit)
   ;; reset major mode, this will cause vm to start from scratch.
@@ -5260,16 +5260,11 @@ argument GARBAGE."
(error nil))
   (setq vm-message-garbage-alist (cdr vm-message-garbage-alist)
 
-(vm-add-write-file-hook 'vm-write-file-hook)
-(vm-add-find-file-hook 'vm-handle-file-recovery)
-(vm-add-find-file-hook 'vm-handle-file-reversion)
+(add-hook 'before-save-hook #'vm-write-file-hook) ;FIXME: Buffer-local!
+(add-hook 'find-file-hook #'vm-handle-file-recovery)  ;FIXME: Buffer-local!
+(add-hook 'find-file-hook #'vm-handle-file-reversion) ;FIXME: Buffer-local!
 
-;; after-revert-hook is new to FSF v19.23
-(defvar after-revert-hook)
-(if (boundp 'after-revert-hook)
-(setq after-revert-hook
- (cons 'vm-after-revert-buffer-hook after-revert-hook))
-  (setq after-revert-hook (list 'vm-after-revert-buffer-hook)))
+(add-hook 'after-revert-hook #'vm-after-revert-buffer-hook) ;FIXME: 
Buffer-local!
 
 (defun vm-message-can-be-external (m)
   "Check if the message M can be used in external (headers-only) mode."
diff --git a/lisp/vm-misc.el b/lisp/vm-misc.el
index 4c22a97656..0643af83d2 100644
--- a/lisp/vm-misc.el
+++ b/lisp/vm-misc.el
@@ -1708,24 +1708,6 @@ If MODES is nil the take the modes from the variable
   (setq vm-disable-modes-ignore (cons m vm-disable-modes-ignore)))
 nil)
 
-(defun vm-add-write-file-hook (vm-hook-fn)
-  "Add a function to the hook called during write-file.
-
-Emacs changed the name of write-file-hooks to write-file-functions as of 
-Emacs 22.1. This function is used to supress compiler warnings."
-  (if (boundp 'write-file-functions)
-  (add-hook 'write-file-functions vm-hook-fn)
-(add-hook 'write-file-hooks vm-hook-fn)))
-
-(defun vm-add-find-file-hook (vm-hook-fn)
-  "Add a function to the hook called during find-file.
-
-Emacs changed the name of the hook find-file-hooks to find-file-hook in
-Emacs 22.1. This function used to supress compiler warnings."
-  (if (boundp 'find-file-hook)
-  (add-hook 'find-file-hook vm-hook-fn)
-(add-hook 'find-file-hooks vm-hook-fn)))
-
 ;; Aliases for VM functions
 
 

[nongnu] elpa/vm b31b4ec294 16/20: Silence misc warnings

[ELPA Syncer]

branch: elpa/vm
commit b31b4ec294e3afc176412fb901bd659b23b9f3c2
Author: Stefan Monnier 
Commit: Stefan Monnier 

Silence misc warnings
---
 lisp/vm-mime.el| 39 ---
 lisp/vm-pgg.el |  7 ---
 lisp/vm-summary.el |  5 +
 3 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/lisp/vm-mime.el b/lisp/vm-mime.el
index b1acbb18aa..da65286ac2 100644
--- a/lisp/vm-mime.el
+++ b/lisp/vm-mime.el
@@ -3540,24 +3540,23 @@ it to an internal object by retrieving the body.   
USR, 2011-03-28"
   (vm-make-multibyte-work-buffer
(format "*%s mime object*"
(car (vm-mm-layout-type child-layout))
-(unwind-protect
-(let (oldsize)
-  (with-current-buffer work-buffer
-(vm-mime-retrieve-external-body layout))
-  (goto-char (vm-mm-layout-body-start child-layout))
-  (setq oldsize (buffer-size))
-  (condition-case data
-  (insert-buffer-substring work-buffer)
-(error (signal 'vm-mime-error (cdr data
-  ;; This is redundant because insertion moves point
-  ;; (goto-char (+ (point) (- (buffer-size) oldsize)))
-  (if (< (point) (vm-mm-layout-body-end child-layout))
-  (delete-region (point)
- (vm-mm-layout-body-end child-layout))
-(vm-set-mm-layout-body-end child-layout (point-marker)))
-  (delete-region (vm-mm-layout-header-start layout)
- (vm-mm-layout-body-start layout))
-  (vm-mime-copy-layout child-layout layout)))
+(let (oldsize)
+  (with-current-buffer work-buffer
+(vm-mime-retrieve-external-body layout))
+  (goto-char (vm-mm-layout-body-start child-layout))
+  (setq oldsize (buffer-size))
+  (condition-case data
+  (insert-buffer-substring work-buffer)
+(error (signal 'vm-mime-error (cdr data
+  ;; This is redundant because insertion moves point
+  ;; (goto-char (+ (point) (- (buffer-size) oldsize)))
+  (if (< (point) (vm-mm-layout-body-end child-layout))
+  (delete-region (point)
+ (vm-mm-layout-body-end child-layout))
+(vm-set-mm-layout-body-end child-layout (point-marker)))
+  (delete-region (vm-mm-layout-header-start layout)
+ (vm-mm-layout-body-start layout))
+  (vm-mime-copy-layout child-layout layout))
 (when work-buffer (kill-buffer work-buffer)
((vm-mime-composite-type-p (car (vm-mm-layout-type layout)))
 (let ((p (vm-mm-layout-parts layout)))
@@ -6196,7 +6195,9 @@ there is no file name for this object. USR, 
2011-03-07"
 ;; either vm-mime-forward-local-external-bodies is t
 ;; or vm-mime-forward-saved-attachments is nil
;; Otherwise, expand the external-body parts
-   (fb (list (or vm-mime-forward-local-external-bodies
+   (fb (list (or (with-suppressed-warnings
+ ((obsolete vm-mime-forward-local-external-bodies))
+   vm-mime-forward-local-external-bodies)
  (not vm-mime-forward-saved-attachments)
 (cond ((and (stringp object) (not mimed))
   (if (or (vm-mime-types-match "application" type)
diff --git a/lisp/vm-pgg.el b/lisp/vm-pgg.el
index e8c673b6d6..35ca9bc7f1 100644
--- a/lisp/vm-pgg.el
+++ b/lisp/vm-pgg.el
@@ -299,9 +299,10 @@ Switch mode on/off according to ARG.
   (setq vm-pgg-compose-mode
(if (null arg) (not vm-pgg-compose-mode)
  (> (prefix-numeric-value arg) 0)))
-  (if vm-pgg-compose-mode
-  (easy-menu-add vm-pgg-compose-mode-menu)
-(easy-menu-remove vm-pgg-compose-mode-menu)))
+  (when (featurep 'xemacs)
+(if vm-pgg-compose-mode
+(easy-menu-add vm-pgg-compose-mode-menu)
+  (easy-menu-remove vm-pgg-compose-mode-menu
 
 (defvar vm-pgg-compose-mode-string " vm-pgg"
   "*String to put in mode line when function `vm-pgg-compose-mode' is active.")
diff --git a/lisp/vm-summary.el b/lisp/vm-summary.el
index 0d03221b15..9425e1f006 100644
--- a/lisp/vm-summary.el
+++ b/lisp/vm-summary.el
@@ -2051,6 +2051,11 @@ Call this function if you made changes to 
`vm-summary-format'."
 (file-truename
  (expand-file-name folder (or dir vm-folder-directory)))
 
+(declare-function open-database  "ext:berkeley-db")
+(declare-function close-database "ext:berkeley-db")
+(declare-function put-database   "ext:berkeley-db")
+(declare-function get-database   "ext:berkeley-db")
+
 (defun vm-open-folders-summary-database (mode)
   (condition-case data
   (open-database vm-fol

[nongnu] elpa/vm b8abcfe761 04/20: Don't modify immediate constants

[ELPA Syncer]

branch: elpa/vm
commit b8abcfe7611f7433d561278f260bb7a009e22d22
Author: Stefan Monnier 
Commit: Stefan Monnier 

Don't modify immediate constants

* lisp/vm-toolbar.el (vm-toolbar-fsfemacs-install-toolbar):
* lisp/vm-mime.el (vm-get-coding-system-priorities): Don't modify constant.
---
 lisp/vm-mime.el| 16 
 lisp/vm-toolbar.el |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lisp/vm-mime.el b/lisp/vm-mime.el
index 2e07ea54bf..d0387c40c5 100644
--- a/lisp/vm-mime.el
+++ b/lisp/vm-mime.el
@@ -116,14 +116,14 @@
 (defun vm-get-coding-system-priorities ()
   "Return the value of `vm-coding-system-priorities', or a reasonable
 default for it if it's nil.  "
-  (if vm-coding-system-priorities
-  vm-coding-system-priorities
-(let ((res '(iso-8859-1 iso-8859-2 iso-8859-15 iso-8859-16 utf-8)))
-  (dolist (list-item res)
-   ;; Assumes iso-8859-1 is always available, which is reasonable.
-   (unless (vm-coding-system-p list-item)
- (delq list-item res)))
-  res)))
+  (or vm-coding-system-priorities
+  ;; FIXME: `utf-8' should be first nowadays!
+  (let ((res '(iso-8859-1 iso-8859-2 iso-8859-15 iso-8859-16 utf-8)))
+   (dolist (list-item res)
+ ;; Assumes iso-8859-1 is always available, which is reasonable.
+ (unless (vm-coding-system-p list-item)
+   (setq res (remq list-item res
+   res)))
 
 (defun vm-mime-charset-to-coding (charset)
   "Return the Emacs coding system corresonding to the given mime CHARSET."
diff --git a/lisp/vm-toolbar.el b/lisp/vm-toolbar.el
index edda1173c4..f8d6b701f7 100644
--- a/lisp/vm-toolbar.el
+++ b/lisp/vm-toolbar.el
@@ -566,7 +566,7 @@ s-expression like this one in your .vm file:
 (if (and (boundp 'tool-bar-map)
 (consp tool-bar-map))
(let ((map (cdr tool-bar-map))
- (v [tool-bar x]))
+ (v (vector 'tool-bar 'x)))
  (while map
(aset v 1 (car (car map)))
(define-key vm-mode-map v 'undefined)

[nongnu] elpa/vm f5e5717718 02/20: Use `with-current-buffer`; silences compiler warning

[ELPA Syncer]

branch: elpa/vm
commit f5e571771867a7e06b0d23ee05b32d869aca5257
Author: Stefan Monnier 
Commit: Stefan Monnier 

Use `with-current-buffer`; silences compiler warning
---
 contrib/vm-bogofilter.el |  3 +-
 contrib/vm-sumurg.el | 16 +-
 lisp/vcard.el|  3 +-
 lisp/vm-avirtual.el  | 14 +++--
 lisp/vm-biff.el  |  3 +-
 lisp/vm-digest.el| 27 ++---
 lisp/vm-edit.el  |  3 +-
 lisp/vm-folder.el|  6 ++--
 lisp/vm-grepmail.el  |  6 ++--
 lisp/vm-imap.el  | 27 ++---
 lisp/vm-mark.el  |  9 +++---
 lisp/vm-menu.el  |  3 +-
 lisp/vm-message.el   |  3 +-
 lisp/vm-mime.el  | 79 
 lisp/vm-minibuf.el   |  3 +-
 lisp/vm-motion.el|  6 ++--
 lisp/vm-mouse.el |  5 ++-
 lisp/vm-pcrisis.el   | 15 +++--
 lisp/vm-pgg.el   | 31 +++
 lisp/vm-pine.el  | 12 +++-
 lisp/vm-pop.el   | 21 +
 lisp/vm-ps-print.el  |  3 +-
 lisp/vm-reply.el |  3 +-
 lisp/vm-rfaddons.el  | 28 -
 lisp/vm-save.el  | 27 ++---
 lisp/vm-serial.el|  9 ++
 lisp/vm-summary.el   | 39 
 lisp/vm-undo.el  |  5 +--
 lisp/vm-vcard.el |  6 ++--
 lisp/vm-virtual.el   | 11 +++
 lisp/vm-w3m.el   |  8 ++---
 lisp/vm-window.el| 12 +++-
 lisp/vm.el   |  3 +-
 33 files changed, 157 insertions(+), 292 deletions(-)

diff --git a/contrib/vm-bogofilter.el b/contrib/vm-bogofilter.el
index bd8e885505..12d9a84e1d 100644
--- a/contrib/vm-bogofilter.el
+++ b/contrib/vm-bogofilter.el
@@ -338,8 +338,7 @@ vm-retrieved-spooled-mail-hook."
  (buffer (get-buffer-create "*Shell Command Output*"))
  )
   
-  (save-excursion
-   (set-buffer buffer)
+  (with-current-buffer buffer
(erase-buffer))
   (set-buffer (vm-buffer-of message))
   (save-restriction
diff --git a/contrib/vm-sumurg.el b/contrib/vm-sumurg.el
index 054f23cd87..00f76a0da3 100644
--- a/contrib/vm-sumurg.el
+++ b/contrib/vm-sumurg.el
@@ -284,8 +284,7 @@
  ;; to avoid indefinite build-up
  (unintern (concat (vm-su-message-id m) label) 
  vm-sumurg-timer-obarray)
- (save-excursion
-   (set-buffer (vm-buffer-of (vm-real-message-of m)))
+ (with-current-buffer (vm-buffer-of (vm-real-message-of m))
(unintern label vm-label-obarray))
  (save-excursion (vm-sumurg-set-urgency level nil 1 m))
  )
@@ -302,8 +301,8 @@
;; copy it to the other buffer
;; we expect always to be in the summary
;; buffer here, but just in case...
-   (save-excursion
- (set-buffer (or vm-mail-buffer vm-summary-buffer))
+   (with-current-buffer
+   (or vm-mail-buffer vm-summary-buffer)
  (setq vm-sumurg-timer-obarray o
(intern (concat (vm-su-message-id m) label) 
vm-sumurg-timer-obarray)
@@ -491,8 +490,7 @@
  (aref vm-sumurg-facearray
(vm-sumurg-level-of (car vm-message-pointer
 (if vm-presentation-buffer
-   (save-excursion
- (set-buffer vm-presentation-buffer)
+   (with-current-buffer vm-presentation-buffer
  (set-extent-face vm-ml-sumurg-extent 
   (aref vm-sumurg-facearray 
 (vm-sumurg-level-of 
@@ -704,9 +702,9 @@ happens later.)"
(mapcar (lambda (label)
  (when (string-match "^\\*+[-0-9:t]+$" label)
(vm-add-or-delete-message-labels label count nil)
-   (save-excursion
- (set-buffer (vm-buffer-of (vm-real-message-of 
-(car vm-message-pointer
+   (with-current-buffer
+   (vm-buffer-of (vm-real-message-of 
+  (car vm-message-pointer)))
  (unintern label vm-label-obarray
(vm-labels-of (car vm-message-pointer)))
   (if date 
diff --git a/lisp/vcard.el b/lisp/vcard.el
index fe58cf1109..681d8c07ef 100644
--- a/lisp/vcard.el
+++ b/lisp/vcard.el
@@ -202,8 +202,7 @@ would be returned."
   (let ((vcard nil)
 (buf (generate-new-buffer " *vcard parser work*")))
 (unwind-protect
-(save-excursion
-  (set-buffer buf)
+(with-current-buffer buf
   ;; Make sure last line is newline-terminated.
   ;; An extra trailing newline is harmless.
   (insert raw "\n")
diff --git a/lisp/vm-avirtual.el b/lisp/vm-avirtual.el
index 509f

[nongnu] elpa/vm 508752603a 09/20: * lisp/vm-macro.el (vm-interactive-p): Move to top-level. Use everywhere

[ELPA Syncer]

branch: elpa/vm
commit 508752603ace80639a08d33a9ba16079a4c61cf3
Author: Stefan Monnier 
Commit: Stefan Monnier 

* lisp/vm-macro.el (vm-interactive-p): Move to top-level.  Use everywhere
---
 lisp/vm-macro.el   | 17 -
 lisp/vm-pcrisis.el |  9 +
 lisp/vm-vars.el|  5 +++--
 lisp/vm-version.el |  4 +++-
 4 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/lisp/vm-macro.el b/lisp/vm-macro.el
index 767a3138c1..cf241c1e98 100644
--- a/lisp/vm-macro.el
+++ b/lisp/vm-macro.el
@@ -41,15 +41,14 @@
 (defmacro defvaralias (&rest args)))
 
   (unless (fboundp 'declare-function)
-(defmacro declare-function (fn file &optional arglist fileonly)))
-
-  (defmacro vm-interactive-p ()
-(if (featurep 'xemacs)
-   `(interactive-p)
-  (if (> emacs-major-version 23)
- `(called-interactively-p 'interactive)
-   `(interactive-p
-  )
+(defmacro declare-function (fn file &optional arglist fileonly
+
+(defmacro vm-interactive-p ()
+  (if (featurep 'xemacs)
+  `(interactive-p)
+(if (fboundp 'called-interactively-p) ;; (> emacs-major-version 23)
+   `(called-interactively-p 'interactive)
+  `(interactive-p
 
 (declare-function vm-check-for-killed-summary "vm-misc" ())
 (declare-function vm-check-for-killed-presentation "vm-misc" ())
diff --git a/lisp/vm-pcrisis.el b/lisp/vm-pcrisis.el
index bc5fd3f790..1fb5ff2a89 100644
--- a/lisp/vm-pcrisis.el
+++ b/lisp/vm-pcrisis.el
@@ -42,6 +42,7 @@
 (require 'vm-motion)
 (require 'vm-reply)
 (eval-when-compile (vm-load-features '(regexp-opt bbdb bbdb-com)))
+(eval-when-compile (require 'vm-macro))
 
 (declare-function set-extent-face "vm-xemacs" (extent face))
 (declare-function timezone-absolute-from-gregorian "ext:timezone" 
@@ -1526,7 +1527,7 @@ recursion nor concurrent calls."
 (defun vmpc--mail (orig-fun &rest args)
   "Start a new message with pcrisis voodoo."
   (vm-follow-summary-cursor)
-  (vm-select-folder-buffer-and-validate 1 (interactive-p))
+  (vm-select-folder-buffer-and-validate 1 (vm-interactive-p))
   (vmpc-init-vars 'mail)
   (vmpc-build-true-conditions-list)
   (vmpc-build-actions-to-run-list)
@@ -1565,7 +1566,7 @@ recursion nor concurrent calls."
   "Forward a message with pcrisis voodoo."
   ;; this stuff is already done when replying, but not here:
   (vm-follow-summary-cursor)
-  (vm-select-folder-buffer-and-validate 1 (interactive-p))
+  (vm-select-folder-buffer-and-validate 1 (vm-interactive-p))
   ;;  the rest is almost exactly the same as replying:
   (vmpc-init-vars 'forward)
   (vmpc-build-true-conditions-list)
@@ -1581,7 +1582,7 @@ recursion nor concurrent calls."
   "Forward a message in plain text with pcrisis voodoo."
   ;; this stuff is already done when replying, but not here:
   (vm-follow-summary-cursor)
-  (vm-select-folder-buffer-and-validate 1 (interactive-p))
+  (vm-select-folder-buffer-and-validate 1 (vm-interactive-p))
   ;;  the rest is almost exactly the same as replying:
   (vmpc-init-vars 'forward)
   (vmpc-build-true-conditions-list)
@@ -1597,7 +1598,7 @@ recursion nor concurrent calls."
   "Resent a message with pcrisis voodoo."
   ;; this stuff is already done when replying, but not here:
   (vm-follow-summary-cursor)
-  (vm-select-folder-buffer-and-validate 1 (interactive-p))
+  (vm-select-folder-buffer-and-validate 1 (vm-interactive-p))
   ;; the rest is almost exactly the same as replying:
   (vmpc-init-vars 'resend)
   (vmpc-build-true-conditions-list)
diff --git a/lisp/vm-vars.el b/lisp/vm-vars.el
index ed0e50b381..1042bccce6 100644
--- a/lisp/vm-vars.el
+++ b/lisp/vm-vars.el
@@ -22,6 +22,7 @@
 ;;; Code:
 
 (require 'vm-version)
+(require 'vm-macro)
 
 (declare-function vm-parse "vm-misc" (string regexp &optional matchn matches))
 (declare-function vm-delete-directory-names "vm-misc" (list))
@@ -7549,9 +7550,9 @@ preferences file).
 The file names may be customized via the variables `vm-init-file' and
 `vm-preferences-file'. "
   (interactive "P")
-  (when (or (not vm-init-file-loaded) (interactive-p))
+  (when (or (not vm-init-file-loaded) (vm-interactive-p))
 (when vm-init-file
-  (load vm-init-file (not (interactive-p)) (not (interactive-p)) t))
+  (load vm-init-file (not (vm-interactive-p)) (not (vm-interactive-p)) t))
 (when (and vm-preferences-file (not init-only))
   (load vm-preferences-file t t t)))
   (setq vm-init-file-loaded t)
diff --git a/lisp/vm-version.el b/lisp/vm-version.el
index 71ba832dd4..d4fdc82f77 100644
--- a/lisp/vm-version.el
+++ b/lisp/vm-version.el
@@ -19,6 +19,8 @@
 
 ;;; Code:
 
+(require 'vm-macro)
+
 ;; Don't use vm-device-type here because it may not not be loaded yet.
 (declare-function device-type "vm-xemacs" ())
 (declare-function device-matching-specifier-tag-list "vm-xemacs" ())
@@ -37,7 +39,7 @@
 (defun vm-version ()
   "Return the value of the variable `vm-version'."
   (interactive)
-  (when (interactive-p)
+  (when (vm-interactive-p)
 (or (and (stringp vm-version)
   

[nongnu] elpa/vm 9f9eb4ab23 06/20: Improve markup in docstrings according to compiler warnings

[ELPA Syncer]

branch: elpa/vm
commit 9f9eb4ab23bcf1d118897e2c48359f54918e9d30
Author: Stefan Monnier 
Commit: Stefan Monnier 

Improve markup in docstrings according to compiler warnings
---
 contrib/org-html-mail.el|   4 +-
 contrib/vm-bogofilter.el|   4 +-
 contrib/vm-mime-display-internal-application.el |   4 +-
 lisp/u-vm-color.el  |   2 +-
 lisp/vcard.el   |   8 +-
 lisp/vm-avirtual.el |   4 +-
 lisp/vm-delete.el   |   4 +-
 lisp/vm-folder.el   |   4 +-
 lisp/vm-imap.el |  16 +-
 lisp/vm-mime.el |  28 +--
 lisp/vm-misc.el |   6 +-
 lisp/vm-motion.el   |   4 +-
 lisp/vm-pcrisis.el  |  24 +--
 lisp/vm-pgg.el  |   4 +-
 lisp/vm-pine.el |   8 +-
 lisp/vm-pop.el  |   6 +-
 lisp/vm-ps-print.el |   4 +-
 lisp/vm-rfaddons.el |  32 ++--
 lisp/vm-save.el |   8 +-
 lisp/vm-smime.el|   2 +-
 lisp/vm-thread.el   |   2 +-
 lisp/vm-undo.el |   4 +-
 lisp/vm-vars.el | 215 +++-
 23 files changed, 194 insertions(+), 203 deletions(-)

diff --git a/contrib/org-html-mail.el b/contrib/org-html-mail.el
index d026a9523d..b87f96b658 100644
--- a/contrib/org-html-mail.el
+++ b/contrib/org-html-mail.el
@@ -29,8 +29,8 @@
 (defun orgstruct-hijacker-command-21 (arg)
   "In Structure, run `org-ctrl-c-ctrl-c'. Outside of Structure
 check for a prefix argument and if buffer name contains `mail',
-and run orgstruct-send-as-html, or run the binding of
-`\C-c\C-c'."
+and run `orgstruct-send-as-html', or run the binding of
+`C-c C-c'."
   (interactive "p")
   (vm-inform 6 "calling html send mail")
   (save-excursion
diff --git a/contrib/vm-bogofilter.el b/contrib/vm-bogofilter.el
index 12d9a84e1d..e3aa31d01d 100644
--- a/contrib/vm-bogofilter.el
+++ b/contrib/vm-bogofilter.el
@@ -240,8 +240,8 @@ message as spam.
   :type 'string)
 
 (defcustom vm-bogofilter-formail-program-options "-s"
-  "*Options for the 'vm-bogofilter-formail-program'. After this
-arguments, the name of the bogofilter program will be passed."
+  "Options for the `vm-bogofilter-formail-program'.
+After this arguments, the name of the bogofilter program will be passed."
   :group 'vm-bogofilter
   :type 'string)
 
diff --git a/contrib/vm-mime-display-internal-application.el 
b/contrib/vm-mime-display-internal-application.el
index 69e8b2f9af..f65e11581c 100644
--- a/contrib/vm-mime-display-internal-application.el
+++ b/contrib/vm-mime-display-internal-application.el
@@ -72,7 +72,9 @@ If MODE is t, SUBTYPE-mode is used to display 
\"application/SUBTYPE\"
 attachments.")
 
 (defvar vm-mime-internal-application-x-subtypes nil
-  "*If non-nil, display application/x-SUBTYPE attachments the same as 
application/SUBTYPE attachments.
+  "If non-nil, ignore the `x-' in application/x-SUBTYPE.
+This requests to display application/x-SUBTYPE attachments
+the same as application/SUBTYPE attachments.
 See `vm-mime-internal-application-subtypes'.")
 
 (advice-add 'vm-mime-can-display-internal :around
diff --git a/lisp/u-vm-color.el b/lisp/u-vm-color.el
index 9f88872c8d..d931f400ba 100644
--- a/lisp/u-vm-color.el
+++ b/lisp/u-vm-color.el
@@ -632,7 +632,7 @@ subexpressions."
   "Search the buffer for an expression and fontify it.
 Search starts at START and ends at END.  If REGEXP is found, it
 is fontified according to the argument HOW, which is a list of
-the form '((index face)...)."
+the form ((INDEX FACE)...)."
 ;;(message "Searching from %d to %d for %s" start end regexp)
   (let ((inhibit-read-only t))
 (save-excursion
diff --git a/lisp/vcard.el b/lisp/vcard.el
index 2152c6f681..75e84aa279 100644
--- a/lisp/vcard.el
+++ b/lisp/vcard.el
@@ -191,12 +191,12 @@ Vcard data is normally in the form
 prop3a;prop3b:value3a;value3b;value3c
 end:  vcard
 
-\(Whitespace around the `:' separating properties and values is optional.\)
+\(Whitespace around the `:' separating properties and values is optional.)
 If supplied to this function an alist of the form
 
-\(\(\(\"prop1a\"\) \"value1a\"\)
- \(\(\"prop2a\" \"prop2b\" \(\"prop2c\" . \"param2c\"\)\) \"value2a\"\)
- \(\(\"prop3a\" \"prop3b\"\) \"value3a\" \"value3b\" \"value3c\"\)\)
+(((\"prop1a\") \"value1a\")
+ ((\"prop2a\" \"prop2b\" (\"prop2c\" . \"param2c\")) \"value2a\")
+ ((\"prop3a\" \"prop3b\") \"value3a\" \"value3b\" \"value3c\"))
 
 would be returned."
   (let ((vcard nil)
diff --git a/lisp/vm-avirtual.el b/l

[nongnu] elpa/vm 4fd49c3888 10/20: vm-mime.el: Use `base64-(en|de)code-region` unconditionally

[ELPA Syncer]

branch: elpa/vm
commit 4fd49c3888569b4cdd556f7dd76073aff5b6f653
Author: Stefan Monnier 
Commit: Stefan Monnier 

vm-mime.el: Use `base64-(en|de)code-region` unconditionally

These were added back in Emacs-20.4.
---
 lisp/vcard.el   |   2 +
 lisp/vm-mime.el | 200 
 2 files changed, 30 insertions(+), 172 deletions(-)

diff --git a/lisp/vcard.el b/lisp/vcard.el
index 75e84aa279..8c31761bba 100644
--- a/lisp/vcard.el
+++ b/lisp/vcard.el
@@ -473,6 +473,7 @@ US domestic telephone numbers are replaced with 
international format."
 (defmacro vcard-hexstring-to-ascii (s)
   `(format "%c" (string-to-number ,s 16)))
 
+;; FIXME: Use `quoted-printable-decode-region'!
 (defun vcard-region-decode-quoted-printable (&optional beg end)
   (save-excursion
 (save-restriction
@@ -486,6 +487,7 @@ US domestic telephone numbers are replaced with 
international format."
   (let ((s (buffer-substring (1+ (match-beginning 0)) (match-end 0
 (replace-match (vcard-hexstring-to-ascii s) t t)))
 
+;; FIXME: Use `base64-decode-region'!
 (defun vcard-region-decode-base64 (&optional beg end)
   (save-restriction
 (narrow-to-region (or beg (point-min)) (or end (point-max)))
diff --git a/lisp/vm-mime.el b/lisp/vm-mime.el
index 1aeba1070a..5b5c9791f9 100644
--- a/lisp/vm-mime.el
+++ b/lisp/vm-mime.el
@@ -578,88 +578,11 @@ out includes base-64, quoted-printable, uuencode and CRLF 
conversion."
   (or (markerp end) (setq end (vm-marker end)))
   (and (> (- end start) 1)
(vm-emit-mime-decoding-message "Decoding base64..."))
-  (let ((work-buffer nil)
-   (done nil)
-   (counter 0)
-   (bits 0)
-   (lim 0) inputpos
-   (non-data-chars (concat "^=" vm-mime-base64-alphabet)))
-(unwind-protect
-   (save-excursion
- (cond
-  ((and (featurep 'base64)
-(fboundp 'base64-decode-region)
-;; W3 reportedly has a Lisp version of this, and
-;; there's no point running it.
-(subrp (symbol-function 'base64-decode-region))
-;; The FSF Emacs version of this is unforgiving
-;; of errors, which is not in the spirit of the
-;; MIME spec, so avoid using it. - Kyle Jones
-;; Let us try it out now.  USR, 2012-10-19
-;; (not (not (featurep 'xemacs)))
-)
-   (condition-case data
-   (base64-decode-region start end)
- (error (vm-mime-error "%S" data)))
-   (and crlf (vm-mime-crlf-to-lf-region start end)))
-  (t
-   (setq work-buffer (vm-make-work-buffer))
-   (if vm-mime-base64-decoder-program
-   (let* ((binary-process-output t) ; any text already has CRLFs
-  ;; use binary coding system in FSF Emacs/MULE
-  (coding-system-for-read (vm-binary-coding-system))
-  (coding-system-for-write (vm-binary-coding-system))
-  (status (apply 'vm-run-command-on-region
- start end work-buffer
- vm-mime-base64-decoder-program
- vm-mime-base64-decoder-switches)))
- (if (not (eq status t))
- (vm-mime-error "base64-decode failed: %s" (cdr status
- (goto-char start)
- (skip-chars-forward non-data-chars end)
- (while (not done)
-   (setq inputpos (point))
-   (cond
-((> (skip-chars-forward vm-mime-base64-alphabet end) 0)
- (setq lim (point))
- (while (< inputpos lim)
-   (setq bits (+ bits
- (aref vm-mime-base64-alphabet-decoding-vector
-   (char-after inputpos
-   (vm-increment counter)
-   (vm-increment inputpos)
-   (cond ((= counter 4)
-  (vm-insert-char (lsh bits -16) 1 nil work-buffer)
-  (vm-insert-char (logand (lsh bits -8) 255) 1 nil
-  work-buffer)
-  (vm-insert-char (logand bits 255) 1 nil work-buffer)
-  (setq bits 0 counter 0))
- (t (setq bits (lsh bits 6)))
-   (cond
-((= (point) end)
- (if (not (zerop counter))
- (vm-mime-error "at least %d bits missing at end of base64 
encoding"
-(* (- 4 counter) 6)))
- (setq done t))
-((= (char-after (point)) 61) ; 61 is ASCII equals
- (setq done t)
- (cond ((= counter 1)
-(vm-mime-error "at least 2 bits missing at end of 
base64 encoding"))
-

[nongnu] elpa/vm 94077ac519 01/20: lisp/vm-macro.el (vm-save-restriction, vm-save-buffer-excursion): Delete

[ELPA Syncer]

branch: elpa/vm
commit 94077ac519b722b4412b30ffa9bfc5153de92276
Author: Stefan Monnier 
Commit: Stefan Monnier 

lisp/vm-macro.el (vm-save-restriction, vm-save-buffer-excursion): Delete

The first worked around a bug fixed eons ago, and the second
has been available under an another time for about as long.
---
 contrib/vm-bogofilter.el |  6 +++---
 lisp/vm-delete.el|  2 +-
 lisp/vm-digest.el|  6 +++---
 lisp/vm-edit.el  | 10 -
 lisp/vm-folder.el| 54 
 lisp/vm-grepmail.el  |  2 +-
 lisp/vm-imap.el  |  2 +-
 lisp/vm-macro.el | 40 ---
 lisp/vm-mime.el  | 16 +++---
 lisp/vm-misc.el  |  8 +++
 lisp/vm-page.el  | 14 ++---
 lisp/vm-pgg.el   |  2 +-
 lisp/vm-pine.el  |  2 +-
 lisp/vm-pop.el   |  2 +-
 lisp/vm-reply.el |  2 +-
 lisp/vm-rfaddons.el  |  2 +-
 lisp/vm-save.el  |  8 +++
 lisp/vm-sort.el  |  2 +-
 lisp/vm-window.el|  4 ++--
 19 files changed, 72 insertions(+), 112 deletions(-)

diff --git a/contrib/vm-bogofilter.el b/contrib/vm-bogofilter.el
index a8f76cfe29..bd8e885505 100644
--- a/contrib/vm-bogofilter.el
+++ b/contrib/vm-bogofilter.el
@@ -267,7 +267,7 @@ are explicitly marked as spams by the vm-bogofilter-is-spam 
function."
   "The function used to do the actual filtering. It is used as a value for
 vm-retrieved-spooled-mail-hook."
   (save-excursion
-(vm-save-restriction
+(save-restriction
  (let ((tail-cons (vm-last vm-message-list))
   (buffer-read-only nil))
(widen)
@@ -342,8 +342,8 @@ vm-retrieved-spooled-mail-hook."
(set-buffer buffer)
(erase-buffer))
   (set-buffer (vm-buffer-of message))
-  (vm-save-restriction
-   (vm-save-buffer-excursion
+  (save-restriction
+   (save-current-buffer
(widen)
(goto-char (vm-headers-of message))
(narrow-to-region (point) (vm-text-end-of message))
diff --git a/lisp/vm-delete.el b/lisp/vm-delete.el
index b3c54a714b..751a4b7ad0 100644
--- a/lisp/vm-delete.el
+++ b/lisp/vm-delete.el
@@ -471,7 +471,7 @@ ignored."
   'uid)
 vm-imap-retrieved-messages)
(vm-increment vm-modification-counter)
-   (vm-save-restriction
+   (save-restriction
 (widen)
 (let ((buffer-read-only nil))
   (delete-region (vm-start-of real-m)
diff --git a/lisp/vm-digest.el b/lisp/vm-digest.el
index 9a6ab3fb09..2fd1afdf5c 100644
--- a/lisp/vm-digest.el
+++ b/lisp/vm-digest.el
@@ -210,7 +210,7 @@ all of them will be burst."
start part-list
(folder-type vm-folder-type))
 (unwind-protect
-   (vm-save-restriction
+   (save-restriction
 (save-excursion
   (widen)
   (setq work-buffer (vm-make-work-buffer))
@@ -485,7 +485,7 @@ RFC 1153.  Otherwise assume RFC 934 digests."
  separator-regexp "^--\n")
   (setq prologue-separator-regexp "\\(^-[^ ].*\n+\\)+"
separator-regexp "\\(^-[^ ].*\n+\\)+"))
-(vm-save-restriction
+(save-restriction
  (save-excursion
(widen)
(unwind-protect
@@ -795,7 +795,7 @@ burst."
 (vm-delete-message 1
(setq mlist (cdr mlist)))
  (set-buffer-modified-p nil)   ; work-buffer
- (vm-save-buffer-excursion
+ (save-current-buffer
   (vm-goto-new-folder-frame-maybe 'folder)
   (vm-mode)
   (if (vm-should-generate-summary)
diff --git a/lisp/vm-edit.el b/lisp/vm-edit.el
index de65f6008f..5d2233f6ac 100644
--- a/lisp/vm-edit.el
+++ b/lisp/vm-edit.el
@@ -73,7 +73,7 @@ replace the original, use C-c C-] and the edit will be 
aborted."
 :fail t)
   (if (and edit-buf (buffer-name edit-buf))
  (set-buffer edit-buf)
-   (vm-save-restriction
+   (save-restriction
 (widen)
 (setq edit-buf
   (generate-new-buffer
@@ -276,7 +276,7 @@ thread have their cached data discarded."
  (set-buffer (vm-buffer-of (vm-real-message-of (car mp
  (if (not (memq (vm-real-message-of (car mp)) vm-message-list))
  (error "The original copy of this message has been expunged."))
- (vm-save-restriction
+ (save-restriction
   (widen)
   (goto-char (vm-headers-of (vm-real-message-of (car mp
   (let ((vm-message-pointer mp)
@@ -299,11 +299,11 @@ thread have their cached data discarded."
;; window.  This works well for non MIME
;; messages, but the cursor drifts badly for
;; MIME and for refilled messages.
-   (vm-save-buffer-excursion
+   (save-current-buffer

[nongnu] elpa/vm 3535485061 08/20: vm-imap|pop.el (vm-expunge-imap|pop-messages): Fix misuse of `nreverse`

[ELPA Syncer]

branch: elpa/vm
commit 35354850611192e68ddf29b12fb5e9b9e7d4a4b5
Author: Stefan Monnier 
Commit: Stefan Monnier 

vm-imap|pop.el (vm-expunge-imap|pop-messages): Fix misuse of `nreverse`
---
 lisp/vm-imap.el | 2 +-
 lisp/vm-pop.el  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/vm-imap.el b/lisp/vm-imap.el
index 0747439ad0..38730bdca3 100644
--- a/lisp/vm-imap.el
+++ b/lisp/vm-imap.el
@@ -940,7 +940,7 @@ on all the relevant IMAP servers and then immediately 
expunges."
(if (zerop delete-count) "No" delete-count)
(if (= delete-count 1) "" "s")))
(insert "VM had problems expunging messages from:\n")
-   (nreverse trouble)
+   (setq trouble (nreverse trouble))
(setq mp trouble)
(while mp
  (insert "   " (car mp) "\n")
diff --git a/lisp/vm-pop.el b/lisp/vm-pop.el
index 20758e130e..cb0cf3b404 100644
--- a/lisp/vm-pop.el
+++ b/lisp/vm-pop.el
@@ -410,7 +410,7 @@ relevant POP servers to remove the messages."
(if (zerop delete-count) "No" delete-count)
(if (= delete-count 1) "" "s")))
(insert "VM had problems expunging messages from:\n")
-   (nreverse trouble)
+   (setq trouble (nreverse trouble))
(setq mp trouble)
(while mp
  (insert "   " (car mp) "\n")

[nongnu] elpa/vm cdfd325bf9 11/20: Prefer `ash` over `lsh`

[ELPA Syncer]

branch: elpa/vm
commit cdfd325bf9654d3460aa85503bcabfc079d67151
Author: Stefan Monnier 
Commit: Stefan Monnier 

Prefer `ash` over `lsh`

`lsh` is deprecated since Emacs started using bignums, and as long as
`n` is always non-negative and smaller than 2^24, `ash` should give the
same result (except for Emacsen where fixnums are less than 25bits,
like Emacs<19.29).

* lisp/vcard.el (vcard-region-decode-base64): Avoid `lsh`
lisp/vm-mime.el (vm-mime-qp-encode-region): Prefer `ash` to `lsh`
* lisp/vm-mime.el (vm-mime-make-multipart-boundary):
* lisp/vm-pgg.el (vm-pgg-make-multipart-boundary): Simplify.
---
 lisp/vcard.el   | 10 +-
 lisp/vm-mime.el |  6 +++---
 lisp/vm-pgg.el  |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lisp/vcard.el b/lisp/vcard.el
index 8c31761bba..3b3d8e6332 100644
--- a/lisp/vcard.el
+++ b/lisp/vcard.el
@@ -504,21 +504,21 @@ US domestic telephone numbers are replaced with 
international format."
 (delete-char 1)
 (cond ((char-equal c ?=)
(if (= count 2)
-   (insert (lsh n -10))
+   (insert (ash n -10))
  ;; count must be 3
- (insert (lsh n -16) (logand 255 (lsh n -8
+ (insert (ash n -16) (logand 255 (ash n -8
(delete-region (point) (point-max)))
   (t
(setq n (+ n (aref vcard-region-decode-base64-table
   (vcard-char-to-int c
(setq count (1+ count))
(cond ((= count 4)
-  (insert (logand 255 (lsh n -16))
-  (logand 255 (lsh n -8))
+  (insert (logand 255 (ash n -16))
+  (logand 255 (ash n -8))
   (logand 255 n))
   (setq n 0 count 0))
  (t
-  (setq n (lsh n 6))
+  (setq n (ash n 6))
 
 
 (defun vcard-split-string (string &optional separator limit)
diff --git a/lisp/vm-mime.el b/lisp/vm-mime.el
index 5b5c9791f9..f9449ad239 100644
--- a/lisp/vm-mime.el
+++ b/lisp/vm-mime.el
@@ -761,7 +761,7 @@ out includes base-64, quoted-printable, uuencode and CRLF 
conversion."
 (and (= cols 0) (= char ?.)
  (looking-at "\\.\\(\n\\|\\'\\)")))
 (vm-insert-char ?= 1 nil work-buffer)
-(vm-insert-char (car (rassq (lsh (logand char 255) -4)
+(vm-insert-char (car (rassq (ash (logand char 255) -4)
 hex-digit-alist))
 1 nil work-buffer)
 (vm-insert-char (car (rassq (logand char 15)
@@ -5647,8 +5647,8 @@ Returns non-NIL value M is a plain message."
 (random t)
 (while (< i (length boundary))
   (aset boundary i (aref vm-mime-base64-alphabet
-(% (vm-abs (lsh (random) -8))
-   (length vm-mime-base64-alphabet
+(random
+ (length vm-mime-base64-alphabet
   (vm-increment i))
 boundary ))
 
diff --git a/lisp/vm-pgg.el b/lisp/vm-pgg.el
index 6fb98c8634..aaeda77fed 100644
--- a/lisp/vm-pgg.el
+++ b/lisp/vm-pgg.el
@@ -1063,8 +1063,8 @@ seed and thus creates the same boundery when called twice 
in a short period."
 (random)
 (while (< i (length boundary))
   (aset boundary i (aref vm-mime-base64-alphabet
-(% (vm-abs (lsh (random) -8))
-   (length vm-mime-base64-alphabet
+(random
+ (length vm-mime-base64-alphabet
   (vm-increment i))
 boundary))
 

[nongnu] elpa/vm updated (556b5b7d5e -> 89cfe9aa55)

[ELPA Syncer]

elpasync pushed a change to branch elpa/vm.

  from  556b5b7d5e Merge branch 'vm-fix-many-warnings-markd' into 'main'
   new  94077ac519 lisp/vm-macro.el (vm-save-restriction, 
vm-save-buffer-excursion): Delete
   new  f5e5717718 Use `with-current-buffer`; silences compiler warning
   new  31b32ce4d2 Remove Emacs-20 support in vcard.el
   new  b8abcfe761 Don't modify immediate constants
   new  afd21a83dd Reorder declarations to avoid compiler warnings
   new  9f9eb4ab23 Improve markup in docstrings according to compiler 
warnings
   new  ee7f6b8dd2 Tweak `require`s to fix compiler warnings
   new  3535485061 vm-imap|pop.el (vm-expunge-imap|pop-messages): Fix 
misuse of `nreverse`
   new  508752603a * lisp/vm-macro.el (vm-interactive-p): Move to 
top-level.  Use everywhere
   new  4fd49c3888 vm-mime.el: Use `base64-(en|de)code-region` 
unconditionally
   new  cdfd325bf9 Prefer `ash` over `lsh`
   new  9df9bb01f5 Fix some `defcustom` types
   new  7b5009c0e5 Fix "interactive only" warnings
   new  fbe2f525c5 Move `defvar`s out of `eval-when-compile`
   new  bc3907cabe Assume Emacs-22 hook names
   new  b31b4ec294 Silence misc warnings
   new  4fcb1dc734 restore commit history for vm-fix-many-warnings branch
   new  ae8ec0e7f5 Merge branch 'main' into 'main'
   new  5a45e15c4b Activate `lexical-binding`
   new  89cfe9aa55 Merge branch 'activate-lexical-binding' into 'main'


Summary of changes:
 contrib/org-html-mail.el|   7 +-
 contrib/org-vm.el   |   5 +-
 contrib/vm-blueman.el   |  12 ++-
 contrib/vm-bogofilter.el|   5 +-
 contrib/vm-mime-display-internal-application.el |   6 +-
 contrib/vm-sumurg.el|  19 ++--
 lisp/tapestry.el|   2 +-
 lisp/u-vm-color.el  |   2 +-
 lisp/vcard.el   |   4 +-
 lisp/vm-autoload.el |   2 +-
 lisp/vm-avirtual.el |   6 +-
 lisp/vm-biff.el |   2 +-
 lisp/vm-build.el|   5 +-
 lisp/vm-crypto.el   |   2 +-
 lisp/vm-delete.el   |   2 +-
 lisp/vm-digest.el   |  10 +-
 lisp/vm-dired.el|   2 +-
 lisp/vm-edit.el |   6 +-
 lisp/vm-folder.el   |  46 -
 lisp/vm-grepmail.el |  11 ++-
 lisp/vm-imap.el | 120 
 lisp/vm-license.el  |   2 +-
 lisp/vm-macro.el|  34 ++-
 lisp/vm-mark.el |   4 +-
 lisp/vm-menu.el |   4 +-
 lisp/vm-message-history.el  |   5 +-
 lisp/vm-message.el  |   4 +-
 lisp/vm-mime.el | 108 +++--
 lisp/vm-minibuf.el  |   2 +-
 lisp/vm-misc.el |  27 +-
 lisp/vm-motion.el   |   2 +-
 lisp/vm-mouse.el|  10 +-
 lisp/vm-page.el |  12 ++-
 lisp/vm-pcrisis.el  |   4 +-
 lisp/vm-pgg.el  |   4 +-
 lisp/vm-pine.el |   7 +-
 lisp/vm-pop.el  |  22 +++--
 lisp/vm-ps-print.el |   5 +-
 lisp/vm-reply.el|  60 +++-
 lisp/vm-rfaddons.el |  29 +++---
 lisp/vm-save.el |  34 +++
 lisp/vm-search.el   |   2 +-
 lisp/vm-serial.el   |   4 +-
 lisp/vm-smime.el|   4 +-
 lisp/vm-sort.el |   8 +-
 lisp/vm-startup.el  |   2 +-
 lisp/vm-summary-faces.el|   2 +-
 lisp/vm-summary.el  |  42 +
 lisp/vm-thread.el   |  36 +++
 lisp/vm-toolbar.el  |   8 +-
 lisp/vm-undo.el |  10 +-
 lisp/vm-user.el |   2 +-
 lisp/vm-vars.el |   4 +-
 lisp/vm-vcard.el|   2 +-
 lisp/vm-version.el  |   2 +-
 lisp/vm-virtual.el  |  18 ++--
 lisp/vm-w3.el   |   2 +-
 lisp/vm-w3m.el  |   9 +-
 lisp/vm-window.el   

[nongnu] elpa/vm 89cfe9aa55 20/20: Merge branch 'activate-lexical-binding' into 'main'

[ELPA Syncer]

branch: elpa/vm
commit 89cfe9aa550f6938b8f574908055d7c6cf8a40bc
Merge: ae8ec0e7f5 5a45e15c4b
Author: Mark Diekhans 
Commit: Mark Diekhans 

Merge branch 'activate-lexical-binding' into 'main'

Activate `lexical-binding`

See merge request emacs-vm/vm!15
---
 contrib/org-html-mail.el|   7 +-
 contrib/org-vm.el   |   5 +-
 contrib/vm-blueman.el   |  12 ++-
 contrib/vm-bogofilter.el|   5 +-
 contrib/vm-mime-display-internal-application.el |   6 +-
 contrib/vm-sumurg.el|  19 ++--
 lisp/tapestry.el|   2 +-
 lisp/u-vm-color.el  |   2 +-
 lisp/vcard.el   |   4 +-
 lisp/vm-autoload.el |   2 +-
 lisp/vm-avirtual.el |   6 +-
 lisp/vm-biff.el |   2 +-
 lisp/vm-build.el|   5 +-
 lisp/vm-crypto.el   |   2 +-
 lisp/vm-delete.el   |   2 +-
 lisp/vm-digest.el   |  10 +-
 lisp/vm-dired.el|   2 +-
 lisp/vm-edit.el |   6 +-
 lisp/vm-folder.el   |  46 -
 lisp/vm-grepmail.el |  11 ++-
 lisp/vm-imap.el | 120 
 lisp/vm-license.el  |   2 +-
 lisp/vm-macro.el|  34 ++-
 lisp/vm-mark.el |   4 +-
 lisp/vm-menu.el |   4 +-
 lisp/vm-message-history.el  |   5 +-
 lisp/vm-message.el  |   4 +-
 lisp/vm-mime.el | 108 +++--
 lisp/vm-minibuf.el  |   2 +-
 lisp/vm-misc.el |  27 +-
 lisp/vm-motion.el   |   2 +-
 lisp/vm-mouse.el|  10 +-
 lisp/vm-page.el |  12 ++-
 lisp/vm-pcrisis.el  |   4 +-
 lisp/vm-pgg.el  |   4 +-
 lisp/vm-pine.el |   7 +-
 lisp/vm-pop.el  |  22 +++--
 lisp/vm-ps-print.el |   5 +-
 lisp/vm-reply.el|  60 +++-
 lisp/vm-rfaddons.el |  29 +++---
 lisp/vm-save.el |  34 +++
 lisp/vm-search.el   |   2 +-
 lisp/vm-serial.el   |   4 +-
 lisp/vm-smime.el|   4 +-
 lisp/vm-sort.el |   8 +-
 lisp/vm-startup.el  |   2 +-
 lisp/vm-summary-faces.el|   2 +-
 lisp/vm-summary.el  |  42 +
 lisp/vm-thread.el   |  36 +++
 lisp/vm-toolbar.el  |   8 +-
 lisp/vm-undo.el |  10 +-
 lisp/vm-user.el |   2 +-
 lisp/vm-vars.el |   4 +-
 lisp/vm-vcard.el|   2 +-
 lisp/vm-version.el  |   2 +-
 lisp/vm-virtual.el  |  18 ++--
 lisp/vm-w3.el   |   2 +-
 lisp/vm-w3m.el  |   9 +-
 lisp/vm-window.el   |   6 +-
 lisp/vm.el  |   6 +-
 60 files changed, 469 insertions(+), 355 deletions(-)

diff --git a/contrib/org-html-mail.el b/contrib/org-html-mail.el
index 94b67413e3..4a09a11ee3 100644
--- a/contrib/org-html-mail.el
+++ b/contrib/org-html-mail.el
@@ -1,4 +1,4 @@
-;; Copyright © 2008  Eric Schulte
+;; Copyright © 2008  Eric Schulte  -*- lexical-binding: t; -*-
 ;;
 ;; WYSWYG, html mail composition using orgmode
 ;;
@@ -29,6 +29,11 @@
 (require 'org-macs)
 (require 'vm-misc)
 
+(defvar orgstruct-mode)
+(defvar org-export-skip-text-before-1st-heading)
+(defvar org-export-preserve-breaks)
+(defvar org-local-vars)
+
 (defun orgstruct-hijacker-command-21 (arg)
   "In Structure, run `org-ctrl-c-ctrl-c'. Outside of Structure
 check for a prefix argument and if buffer name contains `mail',
diff --git a/contrib/org-vm.el b/contrib/org-vm.el
index e827bcb20b..a21e24eaf1 100644
--- a/contrib/org-vm.el
+++ b/contrib/org-vm.el
@@ -1,7 +1,6 @@
-;;; org-vm.el --- Support for links to VM messages from within Org-mode
+;;; org-vm.el --- Support for links to VM messages from within Org-mode  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 20

[nongnu] elpa/vm ee7f6b8dd2 07/20: Tweak `require`s to fix compiler warnings

[ELPA Syncer]

branch: elpa/vm
commit ee7f6b8dd2177bb13b120af890a9fc00e886a022
Author: Stefan Monnier 
Commit: Stefan Monnier 

Tweak `require`s to fix compiler warnings
---
 contrib/org-html-mail.el   |  5 +++-
 contrib/org-vm.el  |  1 +
 contrib/vm-blueman.el  |  2 ++
 contrib/vm-bogofilter.el   |  4 +++-
 lisp/tapestry.el   |  3 +--
 lisp/u-vm-color.el | 16 ++---
 lisp/vm-avirtual.el| 24 ---
 lisp/vm-biff.el| 11 -
 lisp/vm-crypto.el  |  9 +++
 lisp/vm-delete.el  | 24 +--
 lisp/vm-digest.el  | 22 +++---
 lisp/vm-dired.el   | 31 +
 lisp/vm-edit.el| 17 +++---
 lisp/vm-folder.el  | 32 +++--
 lisp/vm-grepmail.el| 21 +++--
 lisp/vm-imap.el| 31 ++---
 lisp/vm-license.el |  6 ++---
 lisp/vm-macro.el   |  5 ++--
 lisp/vm-mark.el| 23 +++---
 lisp/vm-menu.el|  9 +++
 lisp/vm-message-history.el | 18 ++
 lisp/vm-message.el |  4 ++--
 lisp/vm-mime.el| 29 +--
 lisp/vm-minibuf.el |  9 ++-
 lisp/vm-misc.el|  8 +++
 lisp/vm-motion.el  | 18 --
 lisp/vm-mouse.el   | 15 ++--
 lisp/vm-page.el| 19 ---
 lisp/vm-pcrisis.el | 31 +++--
 lisp/vm-pgg.el | 21 +++--
 lisp/vm-pine.el| 30 +++-
 lisp/vm-pop.el | 25 +++-
 lisp/vm-ps-print.el| 16 +
 lisp/vm-reply.el   | 22 +++---
 lisp/vm-rfaddons.el| 58 +-
 lisp/vm-save.el| 26 +
 lisp/vm-search.el  | 21 +++--
 lisp/vm-serial.el  | 19 ++-
 lisp/vm-smime.el   | 42 +++--
 lisp/vm-sort.el| 22 +++---
 lisp/vm-summary-faces.el   | 12 --
 lisp/vm-summary.el | 20 ++--
 lisp/vm-thread.el  | 15 
 lisp/vm-toolbar.el |  9 +++
 lisp/vm-undo.el| 15 ++--
 lisp/vm-user.el|  4 +++-
 lisp/vm-vars.el|  3 +--
 lisp/vm-vcard.el   |  7 ++
 lisp/vm-version.el |  4 +---
 lisp/vm-virtual.el | 27 +++--
 lisp/vm-w3.el  |  6 ++---
 lisp/vm-w3m.el | 11 +++--
 lisp/vm-window.el  | 10 +++-
 lisp/vm.el | 45 +--
 54 files changed, 318 insertions(+), 619 deletions(-)

diff --git a/contrib/org-html-mail.el b/contrib/org-html-mail.el
index b87f96b658..94b67413e3 100644
--- a/contrib/org-html-mail.el
+++ b/contrib/org-html-mail.el
@@ -1,4 +1,4 @@
-;; Copyright � 2008  Eric Schulte
+;; Copyright © 2008  Eric Schulte
 ;;
 ;; WYSWYG, html mail composition using orgmode
 ;;
@@ -26,6 +26,9 @@
 ;; For discussion see "sending html mail using VM" at
 ;; http://groups.google.com/group/gnu.emacs.vm.info/browse_frm/month/2008-01
 
+(require 'org-macs)
+(require 'vm-misc)
+
 (defun orgstruct-hijacker-command-21 (arg)
   "In Structure, run `org-ctrl-c-ctrl-c'. Outside of Structure
 check for a prefix argument and if buffer name contains `mail',
diff --git a/contrib/org-vm.el b/contrib/org-vm.el
index 6f547c3819..e827bcb20b 100644
--- a/contrib/org-vm.el
+++ b/contrib/org-vm.el
@@ -36,6 +36,7 @@
 ;;; Code:
 
 (require 'org)
+(require 'vm-message)
 
 ;; Declare external functions and variables
 (declare-function vm-preview-current-message "ext:vm-page" ())
diff --git a/contrib/vm-blueman.el b/contrib/vm-blueman.el
index e93771b1ee..d904be827c 100644
--- a/contrib/vm-blueman.el
+++ b/contrib/vm-blueman.el
@@ -6,6 +6,8 @@
 ;Was going through some old code and would like to share this helpful
 ;function..
 
+(require 'vm-mime)
+
 ;; Stretch/Shrink mime image to fit exactly in frame width.
 ;; The shrink functionality is particularly helpful since images displayed
 ;; by emacs look wacked when they extend past a line width
diff --git a/contrib/vm-bogofilter.el b/contrib/vm-bogofilter.el
index e3aa31d01d..ae8cf8b655 100644
--- a/contrib/vm-bogofilter.el
+++ b/contrib/vm-bogofilter.el
@@ -180,7 +180,9 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'vm))
+(require 'vm-vars)
+(require 'vm-message)
+(require 'vm-folder)
 
 ;;; Customisation:
 
diff --git a/lisp/tapestry.el b/lisp/tapestry.el
index 561ec7a43c..b363b619e9 100644
--- a/lisp/tapestry.el
+++ b/lisp/tapestry.el
@@ -20,8 +20,6 @@
 
 ;;; Code:
 
-(provide 'tapestry)
-
 (defvar tapestry-version "1.09")
 
 ;; Pass state information between the tapestry-set-window-map
@@ -616,4 +614,5 @@ ROOT-WINDOW-EDGES will be used."
   (frame-live-p f)
 t ))
 
+(provide 'tapestry)
 ;;; tapes

[nongnu] elpa/vm 5a45e15c4b 17/20: Activate `lexical-binding`

[ELPA Syncer]

branch: elpa/vm
commit 5a45e15c4bf69604ace586f1102380c0353f9922
Author: Stefan Monnier 
Commit: Stefan Monnier 

Activate `lexical-binding`
---
 contrib/org-html-mail.el|   7 +-
 contrib/org-vm.el   |   5 +-
 contrib/vm-blueman.el   |  12 ++-
 contrib/vm-bogofilter.el|   5 +-
 contrib/vm-mime-display-internal-application.el |   6 +-
 contrib/vm-sumurg.el|  19 ++--
 lisp/tapestry.el|   2 +-
 lisp/u-vm-color.el  |   2 +-
 lisp/vcard.el   |   4 +-
 lisp/vm-autoload.el |   2 +-
 lisp/vm-avirtual.el |   6 +-
 lisp/vm-biff.el |   2 +-
 lisp/vm-build.el|   5 +-
 lisp/vm-crypto.el   |   2 +-
 lisp/vm-delete.el   |   2 +-
 lisp/vm-digest.el   |  10 +-
 lisp/vm-dired.el|   2 +-
 lisp/vm-edit.el |   6 +-
 lisp/vm-folder.el   |  46 -
 lisp/vm-grepmail.el |  11 ++-
 lisp/vm-imap.el | 120 
 lisp/vm-license.el  |   2 +-
 lisp/vm-macro.el|  34 ++-
 lisp/vm-mark.el |   4 +-
 lisp/vm-menu.el |   4 +-
 lisp/vm-message-history.el  |   5 +-
 lisp/vm-message.el  |   4 +-
 lisp/vm-mime.el | 108 +++--
 lisp/vm-minibuf.el  |   2 +-
 lisp/vm-misc.el |  27 +-
 lisp/vm-motion.el   |   2 +-
 lisp/vm-mouse.el|  10 +-
 lisp/vm-page.el |  12 ++-
 lisp/vm-pcrisis.el  |   4 +-
 lisp/vm-pgg.el  |   4 +-
 lisp/vm-pine.el |   7 +-
 lisp/vm-pop.el  |  22 +++--
 lisp/vm-ps-print.el |   5 +-
 lisp/vm-reply.el|  60 +++-
 lisp/vm-rfaddons.el |  29 +++---
 lisp/vm-save.el |  34 +++
 lisp/vm-search.el   |   2 +-
 lisp/vm-serial.el   |   4 +-
 lisp/vm-smime.el|   4 +-
 lisp/vm-sort.el |   8 +-
 lisp/vm-startup.el  |   2 +-
 lisp/vm-summary-faces.el|   2 +-
 lisp/vm-summary.el  |  42 +
 lisp/vm-thread.el   |  36 +++
 lisp/vm-toolbar.el  |   8 +-
 lisp/vm-undo.el |  10 +-
 lisp/vm-user.el |   2 +-
 lisp/vm-vars.el |   4 +-
 lisp/vm-vcard.el|   2 +-
 lisp/vm-version.el  |   2 +-
 lisp/vm-virtual.el  |  18 ++--
 lisp/vm-w3.el   |   2 +-
 lisp/vm-w3m.el  |   9 +-
 lisp/vm-window.el   |   6 +-
 lisp/vm.el  |   6 +-
 60 files changed, 469 insertions(+), 355 deletions(-)

diff --git a/contrib/org-html-mail.el b/contrib/org-html-mail.el
index 94b67413e3..4a09a11ee3 100644
--- a/contrib/org-html-mail.el
+++ b/contrib/org-html-mail.el
@@ -1,4 +1,4 @@
-;; Copyright © 2008  Eric Schulte
+;; Copyright © 2008  Eric Schulte  -*- lexical-binding: t; -*-
 ;;
 ;; WYSWYG, html mail composition using orgmode
 ;;
@@ -29,6 +29,11 @@
 (require 'org-macs)
 (require 'vm-misc)
 
+(defvar orgstruct-mode)
+(defvar org-export-skip-text-before-1st-heading)
+(defvar org-export-preserve-breaks)
+(defvar org-local-vars)
+
 (defun orgstruct-hijacker-command-21 (arg)
   "In Structure, run `org-ctrl-c-ctrl-c'. Outside of Structure
 check for a prefix argument and if buffer name contains `mail',
diff --git a/contrib/org-vm.el b/contrib/org-vm.el
index e827bcb20b..a21e24eaf1 100644
--- a/contrib/org-vm.el
+++ b/contrib/org-vm.el
@@ -1,7 +1,6 @@
-;;; org-vm.el --- Support for links to VM messages from within Org-mode
+;;; org-vm.el --- Support for links to VM messages from within Org-mode  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2024  Free Software Foundation, Inc.
 
 ;; Author: Carsten Do

[nongnu] elpa/vm 4fcb1dc734 18/20: restore commit history for vm-fix-many-warnings branch

[ELPA Syncer]

branch: elpa/vm
commit 4fcb1dc7341b8a59f51168d3438d7f402e794679
Merge: 556b5b7d5e b31b4ec294
Author: Mark Diekhans 
Commit: Mark Diekhans 

restore commit history for vm-fix-many-warnings branch

[nongnu] elpa/vm ae8ec0e7f5 19/20: Merge branch 'main' into 'main'

[ELPA Syncer]

branch: elpa/vm
commit ae8ec0e7f5617fc9f221ff928c20a5b1b422a93f
Merge: 556b5b7d5e 4fcb1dc734
Author: Mark Diekhans 
Commit: Mark Diekhans 

Merge branch 'main' into 'main'

restore squished commit history for vm-fix-many-warnings branch

See merge request emacs-vm/vm!16

[nongnu] elpa/vm 7b5009c0e5 13/20: Fix "interactive only" warnings

[ELPA Syncer]

branch: elpa/vm
commit 7b5009c0e56203364aee6e435ccc8b87013fe732
Author: Stefan Monnier 
Commit: Stefan Monnier 

Fix "interactive only" warnings

* lisp/u-vm-color.el (u-vm-color-summary-mode): Avoid
`font-lock-fontify-buffer` on Emacs where it's interactive-only.

* lisp/vm-grepmail.el (vm-grepmail): `set-buffer-process-coding-system`
is for interactive use only.

* lisp/vm-biff.el (vm-biff-popup): `backward-delete-char` is for
interactive use only.
---
 lisp/u-vm-color.el  | 5 ++---
 lisp/vm-biff.el | 2 +-
 lisp/vm-grepmail.el | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/lisp/u-vm-color.el b/lisp/u-vm-color.el
index 1f037c1f05..f83374c7a0 100644
--- a/lisp/u-vm-color.el
+++ b/lisp/u-vm-color.el
@@ -402,7 +402,7 @@ subexpressions."
(count 1)
(t-vm-summary-format vm-summary-format)
(u-vm-color-xemacs-workaround
-(string-match "XEmacs\\|Lucid" emacs-version)))
+(featurep 'xemacs)))
 ;; pick up all elements in the vm-summary-format
 (while (string-match
(concat "%-?\\([0-9]+\\.\\)?-?\\([0-9]+\\)?"
@@ -585,8 +585,7 @@ subexpressions."
 
   ;; apparently emacs expects this statement here...
   (font-lock-mode 1)
-  (cond ((string-match "XEmacs\\|Lucid" emacs-version)
-;; XEmacs
+  (cond ((featurep 'xemacs)
 (setq u-vm-color-summary-keywords
   (list (u-vm-color-make-summary-keywords)))
 (put 'vm-summary-mode 'font-lock-defaults
diff --git a/lisp/vm-biff.el b/lisp/vm-biff.el
index 405f0163a4..2cc4a9f684 100644
--- a/lisp/vm-biff.el
+++ b/lisp/vm-biff.el
@@ -439,7 +439,7 @@ AddToFunc SelectWindow
(or force
(not (equal new-messages vm-biff-message-pointer
   (setq msg (car new-messages))
-  (backward-delete-char 1)
+  (delete-char -1)
   (goto-char (point-min))
  
   (setq truncate-lines t
diff --git a/lisp/vm-grepmail.el b/lisp/vm-grepmail.el
index b95d27c8c8..29d64a2429 100644
--- a/lisp/vm-grepmail.el
+++ b/lisp/vm-grepmail.el
@@ -179,7 +179,7 @@ FOLDERS should be a list of files/directories to search in."
   (error "Cannot start grepmail"))
   ;; set the send-filter
   (if (not (featurep 'xemacs))
-  (set-buffer-process-coding-system 'raw-text-unix 'raw-text-unix))
+  (set-process-coding-system process 'raw-text-unix 'raw-text-unix))
   (set-process-filter process 'vm-grepmail-process-filter)
   (set-process-sentinel process 'vm-grepmail-process-done)
   process)))

[elpa] externals/llm edbad651fb: fix typo (#52)

[ELPA Syncer]

branch: externals/llm
commit edbad651fb0c922e4a5451e28da3406fb99dce71
Author: Naoya Yamashita 
Commit: GitHub 

fix typo (#52)
---
 llm-provider-utils.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/llm-provider-utils.el b/llm-provider-utils.el
index adb5080b81..ad715b9757 100644
--- a/llm-provider-utils.el
+++ b/llm-provider-utils.el
@@ -603,7 +603,7 @@ cons of functions called and their output."
 ;; This is a useful method for getting out of the request buffer when it's time
 ;; to make callbacks.
 (defun llm-provider-utils-callback-in-buffer (buf f &rest args)
-  "Run F with ARSG in the context of BUF.
+  "Run F with ARGS in the context of BUF.
 But if BUF has been killed, use a temporary buffer instead.
 If F is nil, nothing is done."
   (when f

[elpa] externals-release/org 7f2ce8272c 1/6: Update version number for the 9.7.8 release

[ELPA Syncer]

branch: externals-release/org
commit 7f2ce8272cc6cbff5a6780dc74a63c54cfa58e6e
Author: Ihor Radchenko 
Commit: Ihor Radchenko 

Update version number for the 9.7.8 release
---
 lisp/org.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/org.el b/lisp/org.el
index 42a512f45b..434c3f990a 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -9,7 +9,7 @@
 ;; URL: https://orgmode.org
 ;; Package-Requires: ((emacs "26.1"))
 
-;; Version: 9.7.7
+;; Version: 9.7.8
 
 ;; This file is part of GNU Emacs.
 ;;

[elpa] externals-release/org 934dec45b5 3/6: ; Fix typo in etc/ORG-NEWS (Bug#72186)

[ELPA Syncer]

branch: externals-release/org
commit 934dec45b50e567e553a90a7712bc01839623c55
Author: Stefan Kangas 
Commit: Kyle Meyer 

; Fix typo in etc/ORG-NEWS (Bug#72186)
---
 etc/ORG-NEWS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 41818c7646..c5d1e87203 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -560,7 +560,7 @@ The old name is obsolete.
 
 ** New and changed options
 
-# Chanes deadling with changing default values of customizations,
+# Changes dealing with changing default values of customizations,
 # adding new customizations, or changing the interpretation of the
 # existing customizations.
 

[elpa] externals-release/org updated (e269942a35 -> fdf0e067ba)

[ELPA Syncer]

elpasync pushed a change to branch externals-release/org.

  from  e269942a35 org-indent-line: Fix indentation at blank lines at the 
beginning of buffer
   new  7f2ce8272c Update version number for the 9.7.8 release
   new  a97ea4f0b5 Backport commit a6cab228d from Emacs
   new  934dec45b5 ; Fix typo in etc/ORG-NEWS (Bug#72186)
   new  4dfe3db762 Merge branch 'km/from-emacs-30' into bugfix
   new  7832ebe386 Backport commit 00adee897 from Emacs
   new  fdf0e067ba Merge branch 'km/from-emacs-30' into bugfix


Summary of changes:
 doc/org-manual.org| 24 
 etc/ORG-NEWS  |  4 ++--
 lisp/org-agenda.el|  2 +-
 lisp/org-element.el   |  2 +-
 lisp/org-fold-core.el |  2 +-
 lisp/org.el   |  4 ++--
 6 files changed, 19 insertions(+), 19 deletions(-)

[elpa] externals-release/org a97ea4f0b5 2/6: Backport commit a6cab228d from Emacs

[ELPA Syncer]

branch: externals-release/org
commit a97ea4f0b5d3faa2bc0c61fd04916ae4f11644fa
Author: Stefan Kangas 
Commit: Kyle Meyer 

Backport commit a6cab228d from Emacs

; Fix typos
a6cab228d4d1a82a80eac81b057857a230eef0b5
Stefan Kangas
Thu Jul 18 11:46:50 2024 +0200
---
 doc/org-manual.org| 2 +-
 etc/ORG-NEWS  | 2 +-
 lisp/org-agenda.el| 2 +-
 lisp/org-element.el   | 2 +-
 lisp/org-fold-core.el | 2 +-
 lisp/org.el   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/org-manual.org b/doc/org-manual.org
index eb9ab5ead0..2ce4a4dbf5 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -11766,7 +11766,7 @@ example
 : ./img/cat.jpg
 
 If you wish to define a caption for the image (see [[*Captions]]) and
-maybe a label for internal cross references (see [[*Internal Links]]),
+maybe a label for internal cross-references (see [[*Internal Links]]),
 make sure that the link is on a line by itself and precede it with
 =CAPTION= and =NAME= keywords as follows:
 
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index b2c591b67d..41818c7646 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -623,7 +623,7 @@ This new hook runs when a note has been stored.
 Sorting of agenda items, tables, menus, headlines, etc can now be
 controlled using a new custom option ~org-sort-function~.
 
-By default, Org mode sorts things according to the operation system
+By default, Org mode sorts things according to the operating system
 language.  However, language sorting rules may or may not produce good
 results depending on the use case.  For example, multi-language
 documents may be sorted weirdly when sorting rules for system language
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 569da84172..011884d5d5 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -2230,7 +2230,7 @@ This is an internal flag indicating either temporary or 
extended
 agenda restriction.  Specifically, it is set to t if the agenda
 is restricted to an entire file, and is set to the corresponding
 buffer if the agenda is restricted to a part of a file, e.g. a
-region or a substree.  In the latter case,
+region or a subtree.  In the latter case,
 `org-agenda-restrict-begin' and `org-agenda-restrict-end' are set
 to the beginning and the end of the part.
 
diff --git a/lisp/org-element.el b/lisp/org-element.el
index 811d322765..a3fe427403 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -7981,7 +7981,7 @@ the cache."
 (unless (memq granularity '( headline headline+inlinetask
  greater-element element))
   (error "Unsupported granularity: %S" granularity))
-;; Make TO-POS marker.  Otherwise, buffer edits may garble the the
+;; Make TO-POS marker.  Otherwise, buffer edits may garble the
 ;; process.
 (unless (markerp to-pos)
   (let ((mk (make-marker)))
diff --git a/lisp/org-fold-core.el b/lisp/org-fold-core.el
index 4eb875aff2..db8e8078b2 100644
--- a/lisp/org-fold-core.el
+++ b/lisp/org-fold-core.el
@@ -172,7 +172,7 @@
 
 ;; The isearch behavior is controlled on per-folding-spec basis by
 ;; setting `isearch-open' and `isearch-ignore' folding spec
-;; properties.  The the docstring of `org-fold-core--specs' for more details.
+;; properties.  See the docstring of `org-fold-core--specs' for more details.
 
 ;;; Handling edits inside folded text
 
diff --git a/lisp/org.el b/lisp/org.el
index e29a083499..5fc523a764 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -3796,7 +3796,7 @@ You need to reload Org or to restart Emacs after setting 
this.")
   "Alist of characters and faces to emphasize text.
 Text starting and ending with a special character will be emphasized,
 for example *bold*, _underlined_ and /italic/.  This variable sets the
-the face to be used by font-lock for highlighting in Org buffers.
+face to be used by font-lock for highlighting in Org buffers.
 Marker characters must be one of */_=~+.
 
 You need to reload Org or to restart Emacs after customizing this."

[elpa] externals-release/org 7832ebe386 5/6: Backport commit 00adee897 from Emacs

[ELPA Syncer]

branch: externals-release/org
commit 7832ebe38624d57e4231ed0f32ade367fe32728b
Author: Stefan Kangas 
Commit: Kyle Meyer 

Backport commit 00adee897 from Emacs

; Fix punctuation in docs
00adee897ac95912cb9ad6bd8a8d161db71945ac
Stefan Kangas
Sun Jul 21 17:35:13 2024 +0200
---
 doc/org-manual.org | 22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/doc/org-manual.org b/doc/org-manual.org
index 2ce4a4dbf5..1b36fae60f 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -27,7 +27,7 @@ Authoring Org files is best supported by Emacs, but you can 
view,
 understand, and change them with any text editor.
 
 As an authoring tool, Org helps you write structured documents and
-provides exporting facilities. Org files can also be used for literate
+provides exporting facilities.  Org files can also be used for literate
 programming and reproducible research.  As a TODO lists manager, Org
 helps you organize your tasks in a flexible way, from daily needs to
 detailed project-planning, allowing logging, multiple views on your
@@ -16552,7 +16552,7 @@ BACKEND is the export backend being used, as a symbol."
(lambda ()
  (delete-region (point) (line-beginning-position 2))
  ;; We need to tell `org-map-entries' to not skip over heading at
- ;; point. Otherwise, it would continue from _next_ heading. See
+ ;; point.  Otherwise, it would continue from _next_ heading.  See
  ;; the docstring of `org-map-entries' for details.
  (setq org-map-continue-from (point)
 
@@ -17661,7 +17661,7 @@ Org currently includes the following export processors:
   - bibtex :: this export processor uses BibTeX, the historical
 bibliographic processor used with LaTeX, thus allowing the use of
 data and style files compatible with this processor (including a
-large number of publishers' styles). It only supports LaTeX's
+large number of publishers' styles).  It only supports LaTeX's
 =\cite= and =\nocite= commands.
 
   - natbib :: as with the bibtex processor, but using the LaTeX
@@ -17706,15 +17706,15 @@ your LaTeX installation, it won't export to anything 
but PDF.
 #+vindex: org-cite-biblatex-options
 #+texinfo: @noindent
 specifies the =biblatex= export processor with the default =numeric=
-style and the =bibtex= backend. Always define the style first and then
+style and the =bibtex= backend.  Always define the style first and then
 the rest of load-time options for the =biblatex=
-package. Alternatively, you can use the ~key=val,key=val~ format for
+package.  Alternatively, you can use the ~key=val,key=val~ format for
 the options as documented in the =biblatex= package documentation:
 
 : #+cite_export: biblatex backend=bibtex,style=numeric
 
 The ~org-cite-biblatex-options~ variable in your Emacs configuration
-uses this format. It will only export to PDF, since it relies on the
+uses this format.  It will only export to PDF, since it relies on the
 ~biblatex~ processor of your LaTeX installation.
 
 ** Bibliography printing
@@ -19425,10 +19425,10 @@ the tangled file's executable permission.
 The =tangle-mode= header argument specifies what permissions to set
 for tangled files by ~set-file-modes~.  Permissions are given by an
 octal value, which can be provided calling the ~identity~ function on
-an elisp octal value. For instance, to create a read-only file one may
-use =:tangle-mode (identity #o444)=. To reduce the verbosity required,
-a octal shorthand is defined, =oXXX= (=o= for octal). Using this, our
-read-only example is =:tangle-mode o444=. Omitting the =o= prefix will
+an elisp octal value.  For instance, to create a read-only file one may
+use =:tangle-mode (identity #o444)=.  To reduce the verbosity required,
+a octal shorthand is defined, =oXXX= (=o= for octal).  Using this, our
+read-only example is =:tangle-mode o444=.  Omitting the =o= prefix will
 cause the argument to be interpreted as an integer, which can lead to
 unexpected results (=444= is the same as =o674=).
 Two other shorthands are recognized, ls-style strings like
@@ -19437,7 +19437,7 @@ Note that chmod-style permissions are based on
 ~org-babel-tangle-default-file-mode~, which is =#o544= by default.
 
 When =:tangle-mode= and =:shebang= are both specified, the give
-=:tangle-mode= will override the permissions from =:shebang=. When
+=:tangle-mode= will override the permissions from =:shebang=.  When
 multiple source code blocks tangle to a single file with conflicting
 =:tangle-mode= header arguments, Org's behavior is undefined.
 

[elpa] externals/org 190f472227 1/2: org-string-width: Round fractional widths

[ELPA Syncer]

branch: externals/org
commit 190f4722279dcaa7a14efb3ee974a9d6a39fdfa3
Author: Ihor Radchenko 
Commit: Ihor Radchenko 

org-string-width: Round fractional widths

* lisp/org-macs.el (org-string-width): Fix zero-width
spaces (displayed as 1 pixel) being treated and full-width characters.
* testing/lisp/test-org-macs.el (test-org/string-width): Add new test.

Reported-by: Daniel 
Link: https://orgmode.org/list/877cddbfkb@algebra20.de
---
 lisp/org-macs.el  | 2 +-
 testing/lisp/test-org-macs.el | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lisp/org-macs.el b/lisp/org-macs.el
index a6ff0e5451..b15fdbebdc 100644
--- a/lisp/org-macs.el
+++ b/lisp/org-macs.el
@@ -1218,7 +1218,7 @@ STRING width.  When REFERENCE-FACE is nil, `default' face 
is used."
   (setq symbol-width (org-buffer-text-pixel-width
   (if pixels
   pixel-width
-(ceiling pixel-width symbol-width)))
+(round pixel-width symbol-width)))
 
 (defmacro org-current-text-column ()
   "Like `current-column' but ignore display properties.
diff --git a/testing/lisp/test-org-macs.el b/testing/lisp/test-org-macs.el
index 93f00a4c51..5287a7aa5e 100644
--- a/testing/lisp/test-org-macs.el
+++ b/testing/lisp/test-org-macs.el
@@ -43,6 +43,8 @@
   "Test `org-string-width' specifications."
   (should (= 1 (org-string-width "a")))
   (should (= 0 (org-string-width "")))
+  ;; Zero-width space
+  (should (= 0 (org-string-width "​")))
   ;; Ignore invisible characters.
   (should (= 0 (org-string-width #("a" 0 1 (invisible t)
   (should (= 1 (org-string-width #("ab" 0 1 (invisible t)

[elpa] externals-release/org 4dfe3db762 4/6: Merge branch 'km/from-emacs-30' into bugfix

[ELPA Syncer]

branch: externals-release/org
commit 4dfe3db762211422023c71d555e9780f0dc9e08a
Merge: 7f2ce8272c 934dec45b5
Author: Kyle Meyer 
Commit: Kyle Meyer 

Merge branch 'km/from-emacs-30' into bugfix
---
 doc/org-manual.org| 2 +-
 etc/ORG-NEWS  | 4 ++--
 lisp/org-agenda.el| 2 +-
 lisp/org-element.el   | 2 +-
 lisp/org-fold-core.el | 2 +-
 lisp/org.el   | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/org-manual.org b/doc/org-manual.org
index eb9ab5ead0..2ce4a4dbf5 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -11766,7 +11766,7 @@ example
 : ./img/cat.jpg
 
 If you wish to define a caption for the image (see [[*Captions]]) and
-maybe a label for internal cross references (see [[*Internal Links]]),
+maybe a label for internal cross-references (see [[*Internal Links]]),
 make sure that the link is on a line by itself and precede it with
 =CAPTION= and =NAME= keywords as follows:
 
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index b2c591b67d..c5d1e87203 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -560,7 +560,7 @@ The old name is obsolete.
 
 ** New and changed options
 
-# Chanes deadling with changing default values of customizations,
+# Changes dealing with changing default values of customizations,
 # adding new customizations, or changing the interpretation of the
 # existing customizations.
 
@@ -623,7 +623,7 @@ This new hook runs when a note has been stored.
 Sorting of agenda items, tables, menus, headlines, etc can now be
 controlled using a new custom option ~org-sort-function~.
 
-By default, Org mode sorts things according to the operation system
+By default, Org mode sorts things according to the operating system
 language.  However, language sorting rules may or may not produce good
 results depending on the use case.  For example, multi-language
 documents may be sorted weirdly when sorting rules for system language
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 569da84172..011884d5d5 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -2230,7 +2230,7 @@ This is an internal flag indicating either temporary or 
extended
 agenda restriction.  Specifically, it is set to t if the agenda
 is restricted to an entire file, and is set to the corresponding
 buffer if the agenda is restricted to a part of a file, e.g. a
-region or a substree.  In the latter case,
+region or a subtree.  In the latter case,
 `org-agenda-restrict-begin' and `org-agenda-restrict-end' are set
 to the beginning and the end of the part.
 
diff --git a/lisp/org-element.el b/lisp/org-element.el
index 811d322765..a3fe427403 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -7981,7 +7981,7 @@ the cache."
 (unless (memq granularity '( headline headline+inlinetask
  greater-element element))
   (error "Unsupported granularity: %S" granularity))
-;; Make TO-POS marker.  Otherwise, buffer edits may garble the the
+;; Make TO-POS marker.  Otherwise, buffer edits may garble the
 ;; process.
 (unless (markerp to-pos)
   (let ((mk (make-marker)))
diff --git a/lisp/org-fold-core.el b/lisp/org-fold-core.el
index 4eb875aff2..db8e8078b2 100644
--- a/lisp/org-fold-core.el
+++ b/lisp/org-fold-core.el
@@ -172,7 +172,7 @@
 
 ;; The isearch behavior is controlled on per-folding-spec basis by
 ;; setting `isearch-open' and `isearch-ignore' folding spec
-;; properties.  The the docstring of `org-fold-core--specs' for more details.
+;; properties.  See the docstring of `org-fold-core--specs' for more details.
 
 ;;; Handling edits inside folded text
 
diff --git a/lisp/org.el b/lisp/org.el
index 434c3f990a..8ca9a4b716 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -3796,7 +3796,7 @@ You need to reload Org or to restart Emacs after setting 
this.")
   "Alist of characters and faces to emphasize text.
 Text starting and ending with a special character will be emphasized,
 for example *bold*, _underlined_ and /italic/.  This variable sets the
-the face to be used by font-lock for highlighting in Org buffers.
+face to be used by font-lock for highlighting in Org buffers.
 Marker characters must be one of */_=~+.
 
 You need to reload Org or to restart Emacs after customizing this."

[elpa] externals/org updated (f398724bd5 -> 114c764035)

[ELPA Syncer]

elpasync pushed a change to branch externals/org.

  from  f398724bd5 Merge branch 'bugfix'
   new  190f472227 org-string-width: Round fractional widths
   new  114c764035 Remove test introduced in 190f47222


Summary of changes:
 lisp/org-macs.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[elpa] externals-release/org fdf0e067ba 6/6: Merge branch 'km/from-emacs-30' into bugfix

[ELPA Syncer]

branch: externals-release/org
commit fdf0e067ba58b4d155212025a8f233f57a7915ce
Merge: 4dfe3db762 7832ebe386
Author: Kyle Meyer 
Commit: Kyle Meyer 

Merge branch 'km/from-emacs-30' into bugfix
---
 doc/org-manual.org | 22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/doc/org-manual.org b/doc/org-manual.org
index 2ce4a4dbf5..1b36fae60f 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -27,7 +27,7 @@ Authoring Org files is best supported by Emacs, but you can 
view,
 understand, and change them with any text editor.
 
 As an authoring tool, Org helps you write structured documents and
-provides exporting facilities. Org files can also be used for literate
+provides exporting facilities.  Org files can also be used for literate
 programming and reproducible research.  As a TODO lists manager, Org
 helps you organize your tasks in a flexible way, from daily needs to
 detailed project-planning, allowing logging, multiple views on your
@@ -16552,7 +16552,7 @@ BACKEND is the export backend being used, as a symbol."
(lambda ()
  (delete-region (point) (line-beginning-position 2))
  ;; We need to tell `org-map-entries' to not skip over heading at
- ;; point. Otherwise, it would continue from _next_ heading. See
+ ;; point.  Otherwise, it would continue from _next_ heading.  See
  ;; the docstring of `org-map-entries' for details.
  (setq org-map-continue-from (point)
 
@@ -17661,7 +17661,7 @@ Org currently includes the following export processors:
   - bibtex :: this export processor uses BibTeX, the historical
 bibliographic processor used with LaTeX, thus allowing the use of
 data and style files compatible with this processor (including a
-large number of publishers' styles). It only supports LaTeX's
+large number of publishers' styles).  It only supports LaTeX's
 =\cite= and =\nocite= commands.
 
   - natbib :: as with the bibtex processor, but using the LaTeX
@@ -17706,15 +17706,15 @@ your LaTeX installation, it won't export to anything 
but PDF.
 #+vindex: org-cite-biblatex-options
 #+texinfo: @noindent
 specifies the =biblatex= export processor with the default =numeric=
-style and the =bibtex= backend. Always define the style first and then
+style and the =bibtex= backend.  Always define the style first and then
 the rest of load-time options for the =biblatex=
-package. Alternatively, you can use the ~key=val,key=val~ format for
+package.  Alternatively, you can use the ~key=val,key=val~ format for
 the options as documented in the =biblatex= package documentation:
 
 : #+cite_export: biblatex backend=bibtex,style=numeric
 
 The ~org-cite-biblatex-options~ variable in your Emacs configuration
-uses this format. It will only export to PDF, since it relies on the
+uses this format.  It will only export to PDF, since it relies on the
 ~biblatex~ processor of your LaTeX installation.
 
 ** Bibliography printing
@@ -19425,10 +19425,10 @@ the tangled file's executable permission.
 The =tangle-mode= header argument specifies what permissions to set
 for tangled files by ~set-file-modes~.  Permissions are given by an
 octal value, which can be provided calling the ~identity~ function on
-an elisp octal value. For instance, to create a read-only file one may
-use =:tangle-mode (identity #o444)=. To reduce the verbosity required,
-a octal shorthand is defined, =oXXX= (=o= for octal). Using this, our
-read-only example is =:tangle-mode o444=. Omitting the =o= prefix will
+an elisp octal value.  For instance, to create a read-only file one may
+use =:tangle-mode (identity #o444)=.  To reduce the verbosity required,
+a octal shorthand is defined, =oXXX= (=o= for octal).  Using this, our
+read-only example is =:tangle-mode o444=.  Omitting the =o= prefix will
 cause the argument to be interpreted as an integer, which can lead to
 unexpected results (=444= is the same as =o674=).
 Two other shorthands are recognized, ls-style strings like
@@ -19437,7 +19437,7 @@ Note that chmod-style permissions are based on
 ~org-babel-tangle-default-file-mode~, which is =#o544= by default.
 
 When =:tangle-mode= and =:shebang= are both specified, the give
-=:tangle-mode= will override the permissions from =:shebang=. When
+=:tangle-mode= will override the permissions from =:shebang=.  When
 multiple source code blocks tangle to a single file with conflicting
 =:tangle-mode= header arguments, Org's behavior is undefined.
 

[elpa] externals/org 114c764035 2/2: Remove test introduced in 190f47222

[ELPA Syncer]

branch: externals/org
commit 114c7640351c370bb253827758e4bd9b60400e61
Author: Ihor Radchenko 
Commit: Ihor Radchenko 

Remove test introduced in 190f47222

* testing/lisp/test-org-macs.el (test-org/string-width): Remove the
new test.  It is not working in batch mode, where pixel width cannot
be calculated.
---
 testing/lisp/test-org-macs.el | 2 --
 1 file changed, 2 deletions(-)

diff --git a/testing/lisp/test-org-macs.el b/testing/lisp/test-org-macs.el
index 5287a7aa5e..93f00a4c51 100644
--- a/testing/lisp/test-org-macs.el
+++ b/testing/lisp/test-org-macs.el
@@ -43,8 +43,6 @@
   "Test `org-string-width' specifications."
   (should (= 1 (org-string-width "a")))
   (should (= 0 (org-string-width "")))
-  ;; Zero-width space
-  (should (= 0 (org-string-width "​")))
   ;; Ignore invisible characters.
   (should (= 0 (org-string-width #("a" 0 1 (invisible t)
   (should (= 1 (org-string-width #("ab" 0 1 (invisible t)

[nongnu] elpa/vm updated (89cfe9aa55 -> 2551fc27c8)

[ELPA Syncer]

elpasync pushed a change to branch elpa/vm.

  from  89cfe9aa55 Merge branch 'activate-lexical-binding' into 'main'
   new  4a699b0864 Try and fix issue #475 (consequence of `lexical-binding`)
   new  93559506ff Merge branch 'fix-475' into 'main'
   new  728a0bf211 lisp/vm-misc.el: Simplify
   new  2551fc27c8 Merge branch 'simplify-vm-misc' into 'main'


Summary of changes:
 lisp/vm-folder.el   |   5 +-
 lisp/vm-imap.el |  15 +--
 lisp/vm-menu.el |   4 +-
 lisp/vm-misc.el | 350 +---
 lisp/vm-pine.el |   3 -
 lisp/vm-reply.el|   1 -
 lisp/vm-rfaddons.el |   2 -
 lisp/vm-serial.el   |   2 -
 lisp/vm-virtual.el  |   2 +-
 lisp/vm-window.el   |  34 +++--
 lisp/vm.el  |   6 +-
 11 files changed, 149 insertions(+), 275 deletions(-)

[nongnu] elpa/vm 2551fc27c8 4/4: Merge branch 'simplify-vm-misc' into 'main'

[ELPA Syncer]

branch: elpa/vm
commit 2551fc27c88ba7507b7cc7636d88665d18054511
Merge: 93559506ff 728a0bf211
Author: Mark Diekhans 
Commit: Mark Diekhans 

Merge branch 'simplify-vm-misc' into 'main'

lisp/vm-misc.el: Simplify

See merge request emacs-vm/vm!18
---
 lisp/vm-folder.el   |   5 +-
 lisp/vm-imap.el |   4 +-
 lisp/vm-menu.el |   4 +-
 lisp/vm-misc.el | 350 +---
 lisp/vm-pine.el |   3 -
 lisp/vm-reply.el|   1 -
 lisp/vm-rfaddons.el |   2 -
 lisp/vm-serial.el   |   2 -
 lisp/vm-virtual.el  |   2 +-
 lisp/vm.el  |   4 -
 10 files changed, 120 insertions(+), 257 deletions(-)

diff --git a/lisp/vm-folder.el b/lisp/vm-folder.el
index c3efcab644..a85e40e76f 100644
--- a/lisp/vm-folder.el
+++ b/lisp/vm-folder.el
@@ -4100,7 +4100,7 @@ Same as \\[vm-recover-folder]."
 ;;;###autoload
 (defun vm-spool-move-mail (source destination)
   (let ((handler (and (fboundp 'find-file-name-handler)
- (vm-find-file-name-handler source 'vm-spool-move-mail)))
+ (find-file-name-handler source 'vm-spool-move-mail)))
status error-buffer)
 (if handler
(funcall handler 'vm-spool-move-mail source destination)
@@ -4284,7 +4284,7 @@ Same as \\[vm-recover-folder]."
 triples ))
 
 (defun vm-spool-check-mail (source)
-  (let ((handler (vm-find-file-name-handler source 'vm-spool-check-mail)))
+  (let ((handler (find-file-name-handler source 'vm-spool-check-mail)))
 (if handler
(funcall handler 'vm-spool-check-mail source)
   (let ((size (nth 7 (file-attributes source)))
@@ -4987,7 +4987,6 @@ folder-access-data should be preserved."
   (use-local-map vm-mode-map)
   ;; if the user saves after M-x recover-file, let them get new
   ;; mail again.
-  (vm-make-local-hook 'after-save-hook)
   (add-hook 'after-save-hook 'vm-unblock-new-mail nil t)
   (when (vm-menu-support-possible-p)
 (vm-menu-install-menus))
diff --git a/lisp/vm-imap.el b/lisp/vm-imap.el
index 5246bb6313..4a20c6b110 100644
--- a/lisp/vm-imap.el
+++ b/lisp/vm-imap.el
@@ -549,7 +549,7 @@ from which mail is to be moved and DESTINATION is the VM 
folder."
   (let ((process nil)
(m-per-session vm-imap-messages-per-session)
(b-per-session vm-imap-bytes-per-session)
-   (handler (vm-find-file-name-handler source 'vm-imap-move-mail))
+   (handler (find-file-name-handler source 'vm-imap-move-mail))
(folder (or (vm-imap-folder-for-spec source)
(vm-safe-imapdrop-string source)))
(statblob nil)
@@ -722,7 +722,7 @@ Returns a boolean value."
   (vm-buffer-type:set 'folder)
   ;;--
   (let ((process nil)
-   (handler (vm-find-file-name-handler source 'vm-imap-check-mail))
+   (handler (find-file-name-handler source 'vm-imap-check-mail))
(retrieved vm-imap-retrieved-messages)
(imapdrop (vm-imapdrop-sans-password source))
(count 0)
diff --git a/lisp/vm-menu.el b/lisp/vm-menu.el
index 91ab703ff3..fc655e9f23 100644
--- a/lisp/vm-menu.el
+++ b/lisp/vm-menu.el
@@ -1272,7 +1272,7 @@ separate dedicated menu bar, depending on the value of
folders (cdr folders)))
 (and menu (setq menu (nreverse menu)
menu (nconc (list "Visit:" "---") menu)))
-(setq tail (vm-member special vm-menu-virtual-menu))
+(setq tail (member special vm-menu-virtual-menu))
 (if (and menu tail)
(progn
  (setcdr tail menu)
@@ -1335,7 +1335,7 @@ separate dedicated menu bar, depending on the value of
''vm-visit-folder (car folders))
  :suffix (car folders
folders (cdr folders)))
-(setq tail (vm-member special vm-menu-folder-menu))
+(setq tail (member special vm-menu-folder-menu))
 (if (and menu tail)
(progn
  (setcdr tail menu)
diff --git a/lisp/vm-misc.el b/lisp/vm-misc.el
index 5572240248..c231ae4f09 100644
--- a/lisp/vm-misc.el
+++ b/lisp/vm-misc.el
@@ -30,54 +30,20 @@
 (declare-function find-coding-system "vm-xemacs" (coding-system-or-name))
 (declare-function map-extents "vm-xemacs" (function &optional buffer from to))
 
-;; Aliases for xemacs functions
-(declare-function xemacs-abbreviate-file-name "vm-misc.el" 
- (filename &optional hack-homedir))
-(declare-function xemacs-insert-char "vm-misc.el"
- (char &optional count ignored buffer))
 ;; Aliases for xemacs/fsfemacs functions with different arguments
-(declare-function emacs-find-file-name-handler "vm-misc.el"
- (filename &optional operation))
-(declare-function emacs-focus-frame "vm-misc.el"
- (&rest ignore))
-(declare-function emacs-get-buffer-window "vm-misc.el"
- (&optional buffer-or-name frame devices))
-
-(declare-function vm-view-file-other-frame "vm-misc.el"
- (file))
 ;; (declare-function vm-interactive-p 

[nongnu] elpa/vm 728a0bf211 3/4: lisp/vm-misc.el: Simplify

[ELPA Syncer]

branch: elpa/vm
commit 728a0bf21189bcfb7a3bf581f966f98a4d243699
Author: Stefan Monnier 
Commit: Stefan Monnier 

lisp/vm-misc.el: Simplify

Hoist the `fset`s outside of their `if`s
and turn them into `defalias` so the compiler understands the code, making
the corresponding `declare-function` redundant.
(vm-fsfemacs-device-type, xemacs-abbreviate-file-name, emacs-focus-frame)
(emacs-get-buffer-window, vm-xemacs-map-extents, vm-fsfemacs-map-extents):
(xemacs-insert-char, vm-xemacs-compatible-insert-char):
Merge into their sole users so they're lexically
within an `(if (featurep 'xemacs)`.
(vm-make-local-hook): Delete.  It's been a no-op in both Emacs and
XEmacs for ages.
(vm-find-file-name-handler): Delete function, use
`find-file-name-handler` instead.  This was compatibility for Emacs<23.
(vm-get-buffer-window, vm-get-visible-buffer-window):
Use `(featurep 'xemacs)` instead of calling the function and catching
`wrong-number-of-arguments`.  Also, remove support for Emacs<19.20.
(vm-force-mode-line-update): Remove support for ancient Emacsen.
(vm-member-0, vm-member): Delete function: `member` has been standard
since before Emacs-21.
(vm-xemacs-set-face-foreground, vm-fsfemacs-set-face-foreground)
(vm-xemacs-set-face-background, vm-fsfemacs-set-face-background):
Delete, unused.
(longlines-decode-region, longlines-wrap-region): Move declaration
to the place where we have reasonable reasons to believe they're defined.
---
 lisp/vm-folder.el   |   5 +-
 lisp/vm-imap.el |   4 +-
 lisp/vm-menu.el |   4 +-
 lisp/vm-misc.el | 350 +---
 lisp/vm-pine.el |   3 -
 lisp/vm-reply.el|   1 -
 lisp/vm-rfaddons.el |   2 -
 lisp/vm-serial.el   |   2 -
 lisp/vm-virtual.el  |   2 +-
 lisp/vm.el  |   4 -
 10 files changed, 120 insertions(+), 257 deletions(-)

diff --git a/lisp/vm-folder.el b/lisp/vm-folder.el
index c3efcab644..a85e40e76f 100644
--- a/lisp/vm-folder.el
+++ b/lisp/vm-folder.el
@@ -4100,7 +4100,7 @@ Same as \\[vm-recover-folder]."
 ;;;###autoload
 (defun vm-spool-move-mail (source destination)
   (let ((handler (and (fboundp 'find-file-name-handler)
- (vm-find-file-name-handler source 'vm-spool-move-mail)))
+ (find-file-name-handler source 'vm-spool-move-mail)))
status error-buffer)
 (if handler
(funcall handler 'vm-spool-move-mail source destination)
@@ -4284,7 +4284,7 @@ Same as \\[vm-recover-folder]."
 triples ))
 
 (defun vm-spool-check-mail (source)
-  (let ((handler (vm-find-file-name-handler source 'vm-spool-check-mail)))
+  (let ((handler (find-file-name-handler source 'vm-spool-check-mail)))
 (if handler
(funcall handler 'vm-spool-check-mail source)
   (let ((size (nth 7 (file-attributes source)))
@@ -4987,7 +4987,6 @@ folder-access-data should be preserved."
   (use-local-map vm-mode-map)
   ;; if the user saves after M-x recover-file, let them get new
   ;; mail again.
-  (vm-make-local-hook 'after-save-hook)
   (add-hook 'after-save-hook 'vm-unblock-new-mail nil t)
   (when (vm-menu-support-possible-p)
 (vm-menu-install-menus))
diff --git a/lisp/vm-imap.el b/lisp/vm-imap.el
index 5246bb6313..4a20c6b110 100644
--- a/lisp/vm-imap.el
+++ b/lisp/vm-imap.el
@@ -549,7 +549,7 @@ from which mail is to be moved and DESTINATION is the VM 
folder."
   (let ((process nil)
(m-per-session vm-imap-messages-per-session)
(b-per-session vm-imap-bytes-per-session)
-   (handler (vm-find-file-name-handler source 'vm-imap-move-mail))
+   (handler (find-file-name-handler source 'vm-imap-move-mail))
(folder (or (vm-imap-folder-for-spec source)
(vm-safe-imapdrop-string source)))
(statblob nil)
@@ -722,7 +722,7 @@ Returns a boolean value."
   (vm-buffer-type:set 'folder)
   ;;--
   (let ((process nil)
-   (handler (vm-find-file-name-handler source 'vm-imap-check-mail))
+   (handler (find-file-name-handler source 'vm-imap-check-mail))
(retrieved vm-imap-retrieved-messages)
(imapdrop (vm-imapdrop-sans-password source))
(count 0)
diff --git a/lisp/vm-menu.el b/lisp/vm-menu.el
index 91ab703ff3..fc655e9f23 100644
--- a/lisp/vm-menu.el
+++ b/lisp/vm-menu.el
@@ -1272,7 +1272,7 @@ separate dedicated menu bar, depending on the value of
folders (cdr folders)))
 (and menu (setq menu (nreverse menu)
menu (nconc (list "Visit:" "---") menu)))
-(setq tail (vm-member special vm-menu-virtual-menu))
+(setq tail (member special vm-menu-virtual-menu))
 (if (and menu tail)
(progn
  (setcdr tail menu)
@@ -1335,7 +1335,7 @@ separate dedicated menu bar, depending on the value of
''vm-visit-folder (car folders))
  :suffix (car folders

[nongnu] elpa/vm 4a699b0864 1/4: Try and fix issue #475 (consequence of `lexical-binding`)

[ELPA Syncer]

branch: elpa/vm
commit 4a699b0864e738cad092479d0f5b0ff454c2fa9c
Author: Stefan Monnier 
Commit: Stefan Monnier 

Try and fix issue #475 (consequence of `lexical-binding`)

* lisp/vm-imap.el (vm-imap-retrieve-to-target): Use `progn`
to fix blunder in last patch which moved code from one branch of the
`if` to another.

* lisp/vm-window.el (vm-set-window-configuration): Replace `symbol-value`
with an ad-hoc function returning the value of the corresponding
statically-scoped variables.
---
 lisp/vm-imap.el   | 11 ++-
 lisp/vm-window.el | 34 +-
 lisp/vm.el|  2 ++
 3 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/lisp/vm-imap.el b/lisp/vm-imap.el
index e5b4988ca6..5246bb6313 100644
--- a/lisp/vm-imap.el
+++ b/lisp/vm-imap.el
@@ -1904,7 +1904,7 @@ available for the IMAP server."
   (if vm-imap-read-point
   (progn
 (vm-set-imap-status-got statblob (- end ***start))
-(if (zerop (% (random) 10))
+(if (zerop (random 10))
 (vm-imap-report-retrieval-status statblob)))
   ;; this seems to slow things down.  USR, 2008-04-25
   ;; reenabled.  USR, 2010-09-17
@@ -1994,10 +1994,11 @@ available for the IMAP server."
;; the CRLF or the LF newline convention is used on the inbox
;; associated with this crashbox.  This setting assumes the LF
;; newline convention is used.
-   (defvar buffer-file-type) ;; FIXME: Removed in Emacs-24.4.
-   (let ((buffer-file-type t)
- (selective-display nil))
- (write-region ***start end target t 0))
+   (progn
+ (defvar buffer-file-type) ;; FIXME: Removed in Emacs-24.4.
+ (let ((buffer-file-type t)
+   (selective-display nil))
+   (write-region ***start end target t 0)))
   (let ((b (current-buffer)))
(with-current-buffer target
  ;;
diff --git a/lisp/vm-window.el b/lisp/vm-window.el
index 61baa93850..bf77aaee3d 100644
--- a/lisp/vm-window.el
+++ b/lisp/vm-window.el
@@ -225,18 +225,26 @@
   (or summary (setq summary (or vm-summary-buffer nonexistent-summary)))
   (or composition (setq composition nonexistent))
   (or edit (setq edit nonexistent))
-  (tapestry-replace-tapestry-element (nth 1 config) 'buffer-name
-(function
- (lambda (x)
-   (if (symbolp x)
-   (symbol-value x)
- (if (and (stringp x)
-  (get-buffer x)
-  (zerop
-   (with-current-buffer x
- (buffer-size
- nonexistent
-   x )
+  (let ((label-to-buffer ;; The reverse of `vm-buffer-to-label'.
+ (lambda (label)
+   (cl-ecase label
+(summary summary)
+(folders-summary folders-summary)
+(composition composition)
+(message message)
+(edit edit)
+   (tapestry-replace-tapestry-element (nth 1 config) 'buffer-name
+  (function
+   (lambda (x)
+ (if (symbolp x)
+ (funcall label-to-buffer x)
+   (if (and (stringp x)
+(get-buffer x)
+(zerop
+ (with-current-buffer x
+   (buffer-size
+   nonexistent
+ x ))
   (set-tapestry (nth 1 config) 1)
   (and (get-buffer nonexistent)
   (vm-maybe-delete-windows-or-frames-on nonexistent))
@@ -292,7 +300,7 @@ window configurations."
 ;; "unreadable" read syntax appearing in the window
 ;; configuration file by way of frame-parameters.
 (setcar map nil)
-(tapestry-replace-tapestry-element map 'buffer-name 'vm-buffer-to-label)
+(tapestry-replace-tapestry-element map 'buffer-name #'vm-buffer-to-label)
 (tapestry-nullify-tapestry-elements map t nil t t t nil)
 (setq p (assq tag vm-window-configurations))
 (if p
diff --git a/lisp/vm.el b/lisp/vm.el
index 7090642279..c02804d897 100644
--- a/lisp/vm.el
+++ b/lisp/vm.el
@@ -1387,6 +

[nongnu] elpa/vm 93559506ff 2/4: Merge branch 'fix-475' into 'main'

[ELPA Syncer]

branch: elpa/vm
commit 93559506ff873a12a3b74c11b43d0485cc7e4ffb
Merge: 89cfe9aa55 4a699b0864
Author: Mark Diekhans 
Commit: Mark Diekhans 

Merge branch 'fix-475' into 'main'

Try and fix issue #475 (consequence of `lexical-binding`)

Closes #475

See merge request emacs-vm/vm!17
---
 lisp/vm-imap.el   | 11 ++-
 lisp/vm-window.el | 34 +-
 lisp/vm.el|  2 ++
 3 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/lisp/vm-imap.el b/lisp/vm-imap.el
index e5b4988ca6..5246bb6313 100644
--- a/lisp/vm-imap.el
+++ b/lisp/vm-imap.el
@@ -1904,7 +1904,7 @@ available for the IMAP server."
   (if vm-imap-read-point
   (progn
 (vm-set-imap-status-got statblob (- end ***start))
-(if (zerop (% (random) 10))
+(if (zerop (random 10))
 (vm-imap-report-retrieval-status statblob)))
   ;; this seems to slow things down.  USR, 2008-04-25
   ;; reenabled.  USR, 2010-09-17
@@ -1994,10 +1994,11 @@ available for the IMAP server."
;; the CRLF or the LF newline convention is used on the inbox
;; associated with this crashbox.  This setting assumes the LF
;; newline convention is used.
-   (defvar buffer-file-type) ;; FIXME: Removed in Emacs-24.4.
-   (let ((buffer-file-type t)
- (selective-display nil))
- (write-region ***start end target t 0))
+   (progn
+ (defvar buffer-file-type) ;; FIXME: Removed in Emacs-24.4.
+ (let ((buffer-file-type t)
+   (selective-display nil))
+   (write-region ***start end target t 0)))
   (let ((b (current-buffer)))
(with-current-buffer target
  ;;
diff --git a/lisp/vm-window.el b/lisp/vm-window.el
index 61baa93850..bf77aaee3d 100644
--- a/lisp/vm-window.el
+++ b/lisp/vm-window.el
@@ -225,18 +225,26 @@
   (or summary (setq summary (or vm-summary-buffer nonexistent-summary)))
   (or composition (setq composition nonexistent))
   (or edit (setq edit nonexistent))
-  (tapestry-replace-tapestry-element (nth 1 config) 'buffer-name
-(function
- (lambda (x)
-   (if (symbolp x)
-   (symbol-value x)
- (if (and (stringp x)
-  (get-buffer x)
-  (zerop
-   (with-current-buffer x
- (buffer-size
- nonexistent
-   x )
+  (let ((label-to-buffer ;; The reverse of `vm-buffer-to-label'.
+ (lambda (label)
+   (cl-ecase label
+(summary summary)
+(folders-summary folders-summary)
+(composition composition)
+(message message)
+(edit edit)
+   (tapestry-replace-tapestry-element (nth 1 config) 'buffer-name
+  (function
+   (lambda (x)
+ (if (symbolp x)
+ (funcall label-to-buffer x)
+   (if (and (stringp x)
+(get-buffer x)
+(zerop
+ (with-current-buffer x
+   (buffer-size
+   nonexistent
+ x ))
   (set-tapestry (nth 1 config) 1)
   (and (get-buffer nonexistent)
   (vm-maybe-delete-windows-or-frames-on nonexistent))
@@ -292,7 +300,7 @@ window configurations."
 ;; "unreadable" read syntax appearing in the window
 ;; configuration file by way of frame-parameters.
 (setcar map nil)
-(tapestry-replace-tapestry-element map 'buffer-name 'vm-buffer-to-label)
+(tapestry-replace-tapestry-element map 'buffer-name #'vm-buffer-to-label)
 (tapestry-nullify-tapestry-elements map t nil t t t nil)
 (setq p (assq tag vm-window-configurations))
 (if p
diff --git a/lisp/vm.el b/lisp/vm.el
index 7090642279..c02804d897 100644
--- a/lisp/vm.el
+++ b/lisp/vm.el
@@ -1387,6 +1387,8 @@ summary buffer to select a folder."
 (setq varlist (apropos-internal "^\\(vm\\|vmpc\\)-" 'custom-variable-p))
 (setq varlist (vm-delete
   (lambda (v)
+;; FIXME

[nongnu] elpa/php-mode 59814bd80c: ci: Bump Emacs 29.x to 4

[ELPA Syncer]

branch: elpa/php-mode
commit 59814bd80c59894022bc5950fb3bdf02420e8a89
Author: Jen-Chieh Shen 
Commit: GitHub 

 ci: Bump Emacs 29.x to 4
---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6e755ae238..41fa23bbde 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -23,7 +23,7 @@ jobs:
   - "26.3"
   - "27.2"
   - "28.2"
-  - "29.3"
+  - "29.4"
 experimental: [false]
 include:
   - os: ubuntu-latest