Upgrade 1.2.4.

3 files changed, 2 insertions, 41 deletions

diff --git a/editors/psgml/Makefile b/editors/psgml/Makefile
index b02da3dac178..f074d66799c3 100644
--- a/editors/psgml/Makefile
+++ b/editors/psgml/Makefile
@@ -16,7 +16,7 @@ PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 MAINTAINER?=	shige@FreeBSD.org
 
 # distfile version
-PSGML_VER=		1.2.3
+PSGML_VER=		1.2.4
 PSGML_STARTUPEL=	psgml-startup.el
 
 SCRIPTS_ENV=		TARGETS="${PSGML_STARTUPEL}"
diff --git a/editors/psgml/distinfo b/editors/psgml/distinfo
index 18d908d34087..1cc72ec62da4 100644
--- a/editors/psgml/distinfo
+++ b/editors/psgml/distinfo
@@ -1 +1 @@
-MD5 (psgml-1.2.3.tar.gz) = 447e9377439dbf3063febbf7a35b7255
+MD5 (psgml-1.2.4.tar.gz) = 2817cc419befb5641dd5ba3e1e774676
diff --git a/editors/psgml/files/patch-ag b/editors/psgml/files/patch-ag
deleted file mode 100644
index 26cfff5127de..000000000000
--- a/editors/psgml/files/patch-ag
+++ /dev/null
@@ -1,39 +0,0 @@
---- psgml-parse.el.orig	Sat Nov 10 04:26:25 2001
-+++ psgml-parse.el	Fri Nov 23 13:50:26 2001
-@@ -1243,6 +1243,11 @@
-     (sgml-check-dtd-subset)
-     (sgml-pop-entity)
-     (erase-buffer)
-+    ;; For Mule
-+    (if (string-match "Emacs 20\." (emacs-version))
-+	(set-buffer-file-coding-system 'binary)
-+      (if (boundp 'MULE)
-+	  (set-file-coding-system *noconv*)))
-     (sgml-write-dtd sgml-dtd-info to-file)
-     t))
- 
-@@ -1270,6 +1275,10 @@
-   "Merge the binary coded dtd in the current buffer with the current dtd.
- The current dtd is the variable sgml-dtd-info.  Return t if the merge
- was successful or nil if failed."
-+  (if (string-match "Emacs 20\." (emacs-version))
-+      (set-buffer-file-coding-system 'binary)
-+    (if (boundp 'MULE)
-+	(set-file-coding-system *noconv*)))
-   (goto-char (point-min))
-   (sgml-read-sexp)			; skip filev
-   (let ((dependencies (sgml-read-sexp))
-@@ -2489,7 +2498,12 @@
-     (set-buffer sgml-scratch-buffer)
-     ;; For MULE to not misinterpret binary data set the mc-flag
-     ;; (reported by Jeffrey Friedl <jfriedl@nff.ncl.omron.co.jp>)
--    (set 'mc-flag nil)			
-+    (set 'mc-flag nil)
-+    ;; For MULE/Emacs 20 to not misinterpret binary data
-+    (if (string-match "Emacs 20\." (emacs-version))
-+	(set-buffer-file-coding-system 'binary)
-+      (if (boundp 'MULE)
-+	  (set-file-coding-system *noconv*)))
-     (when (eq sgml-scratch-buffer (default-value 'sgml-scratch-buffer))
-       (make-local-variable 'sgml-scratch-buffer)
-       (setq sgml-scratch-buffer nil))