pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

(apel-git) Fix strict syntax check with emacs 27, old-style backquotes detected!



Module Name:	pkgsrc-wip
Committed By:	Makoto Fujiwara (CF-SX2) <makoto%ki.nu@localhost>
Pushed By:	mef
Date:		Thu Feb 1 19:53:40 2018 +0900
Changeset:	6892dcdb54f6c9666ba6f157d3c813db406ce2b6

Modified Files:
	apel-git/distinfo
	apel-git/patches/patch-poe.el

Log Message:
(apel-git) Fix strict syntax check with emacs 27, old-style backquotes detected!

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6892dcdb54f6c9666ba6f157d3c813db406ce2b6

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 apel-git/distinfo             |  2 +-
 apel-git/patches/patch-poe.el | 94 ++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 93 insertions(+), 3 deletions(-)

diffs:
diff --git a/apel-git/distinfo b/apel-git/distinfo
index 6d6be2c8fd..c422d3a14e 100644
--- a/apel-git/distinfo
+++ b/apel-git/distinfo
@@ -9,7 +9,7 @@ SHA1 (patch-pces-nemacs.el) = 413980cb3f56da122b0be58a1da84efaa2eb6a74
 SHA1 (patch-pces-om.el) = 3983c483823936de9adda4e7a67bc73f657573a2
 SHA1 (patch-pces-raw.el) = f32fccebded96af9faa9de57a2bd048281964f1e
 SHA1 (patch-poe-18.el) = a8ccc7e506922ce2a70952777fce5db73ff0b2ed
-SHA1 (patch-poe.el) = 97818936c4bceae3c009c2429e07d2a225c3bdc8
+SHA1 (patch-poe.el) = 792cf00ef97868ebaaf151e0a9e0f7ef4db38df9
 SHA1 (patch-poem-e20.el) = fda39649f9e1d739d0734b45d5babf6a13f9d3d2
 SHA1 (patch-poem-ltn1.el) = 417c52e5fc3ec10612b5a55d91dbfad30f8207b4
 SHA1 (patch-poem-nemacs.el) = 04f3bb5426990b9f052e48a3a6238de6d653e9f0
diff --git a/apel-git/patches/patch-poe.el b/apel-git/patches/patch-poe.el
index cfa400fb5a..7aafee76bc 100644
--- a/apel-git/patches/patch-poe.el
+++ b/apel-git/patches/patch-poe.el
@@ -19,8 +19,98 @@ Loading `poe': old-style backquotes detected!
 Invalid read syntax: "Expected opening brace after \\N"
 gmake: *** [Makefile:31: elc] Error 255
 
---- poe.el.orig	2016-03-12 23:30:31.000000000 +0900
-+++ poe.el	2016-12-14 19:08:13.000000000 +0900
+--- poe.el.orig	2016-12-26 16:51:28.000000000 +0900
++++ poe.el	2018-02-01 12:51:58.483310399 +0900
+@@ -916,20 +916,20 @@ APEL provides this as dummy for compatib
+ (defmacro-maybe save-current-buffer (&rest body)
+   "Save the current buffer; execute BODY; restore the current buffer.
+ Executes BODY just like `progn'."
+-  (` (let ((orig-buffer (current-buffer)))
++  `(let ((orig-buffer (current-buffer)))
+        (unwind-protect
+ 	   (progn (,@ body))
+ 	 (if (buffer-live-p orig-buffer)
+-	     (set-buffer orig-buffer))))))
++	     (set-buffer orig-buffer)))))
+ 
+ ;; Emacs 20.1/XEmacs 20.3(?) and later: (with-current-buffer BUFFER &rest BODY)
+ (defmacro-maybe with-current-buffer (buffer &rest body)
+   "Execute the forms in BODY with BUFFER as the current buffer.
+ The value returned is the value of the last form in BODY.
+ See also `with-temp-buffer'."
+-  (` (save-current-buffer
++  `(save-current-buffer
+        (set-buffer (, buffer))
+-       (,@ body))))
++       (,@ body)))
+ 
+ ;; Emacs 20.1/XEmacs 20.3(?) and later: (with-temp-file FILE &rest FORMS)
+ (defmacro-maybe with-temp-file (file &rest forms)
+@@ -938,7 +938,7 @@ The value of the last form in FORMS is r
+ See also `with-temp-buffer'."
+   (let ((temp-file (make-symbol "temp-file"))
+ 	(temp-buffer (make-symbol "temp-buffer")))
+-    (` (let (((, temp-file) (, file))
++    `(let (((, temp-file) (, file))
+ 	     ((, temp-buffer)
+ 	      (get-buffer-create (generate-new-buffer-name " *temp file*"))))
+ 	 (unwind-protect
+@@ -949,7 +949,7 @@ See also `with-temp-buffer'."
+ 		 (widen)
+ 		 (write-region (point-min) (point-max) (, temp-file) nil 0)))
+ 	   (and (buffer-name (, temp-buffer))
+-		(kill-buffer (, temp-buffer))))))))
++		(kill-buffer (, temp-buffer)))))))
+ 
+ ;; Emacs 20.4 and later: (with-temp-message MESSAGE &rest BODY)
+ ;; This macro uses `current-message', which appears in v20.
+@@ -965,7 +965,7 @@ If MESSAGE is nil, the echo area and mes
+ Use a MESSAGE of \"\" to temporarily clear the echo area."
+     (let ((current-message (make-symbol "current-message"))
+ 	  (temp-message (make-symbol "with-temp-message")))
+-      (` (let (((, temp-message) (, message))
++      `(let (((, temp-message) (, message))
+ 	       ((, current-message)))
+ 	   (unwind-protect
+ 	       (progn
+@@ -974,32 +974,32 @@ Use a MESSAGE of \"\" to temporarily cle
+ 		   (message "%s" (, temp-message))
+ 		   (,@ body))
+ 		 (and (, temp-message) (, current-message)
+-		      (message "%s" (, current-message))))))))))
++		      (message "%s" (, current-message)))))))))
+ 
+ ;; Emacs 20.1/XEmacs 20.3(?) and later: (with-temp-buffer &rest FORMS)
+ (defmacro-maybe with-temp-buffer (&rest forms)
+   "Create a temporary buffer, and evaluate FORMS there like `progn'.
+ See also `with-temp-file' and `with-output-to-string'."
+   (let ((temp-buffer (make-symbol "temp-buffer")))
+-    (` (let (((, temp-buffer)
++    `(let (((, temp-buffer)
+ 	      (get-buffer-create (generate-new-buffer-name " *temp*"))))
+ 	 (unwind-protect
+ 	     (with-current-buffer (, temp-buffer)
+ 	       (,@ forms))
+ 	   (and (buffer-name (, temp-buffer))
+-		(kill-buffer (, temp-buffer))))))))
++		(kill-buffer (, temp-buffer)))))))
+ 
+ ;; Emacs 20.1/XEmacs 20.3(?) and later: (with-output-to-string &rest BODY)
+ (defmacro-maybe with-output-to-string (&rest body)
+   "Execute BODY, return the text it sent to `standard-output', as a string."
+-  (` (let ((standard-output
++  `(let ((standard-output
+ 	    (get-buffer-create (generate-new-buffer-name " *string-output*"))))
+        (let ((standard-output standard-output))
+ 	 (,@ body))
+        (with-current-buffer standard-output
+ 	 (prog1
+ 	     (buffer-string)
+-	   (kill-buffer nil))))))
++	   (kill-buffer nil)))))
+ 
+ ;; Emacs 20.1 and later: (combine-after-change-calls &rest BODY)
+ (defmacro-maybe combine-after-change-calls (&rest body)
 @@ -1081,7 +1081,7 @@ then capitalize each word in NEWTEXT.
  If third arg LITERAL is non-nil, insert NEWTEXT literally.
  Otherwise treat `\' as special:


Home | Main Index | Thread Index | Old Index