[gentoo-commits] gentoo-x86 commit in app-emacs/apel/files: apel-10.8-020_Prevent-fontset-error.patch apel-10.8-040_make-temp-file-for-Emacs-24.3.50.patch apel-10.8-010_ikazuhiro.patch

[Mark Wright (gienah)]

gienah      13/10/03 11:33:27

  Added:                apel-10.8-020_Prevent-fontset-error.patch
                        apel-10.8-040_make-temp-file-for-Emacs-24.3.50.patch
                        apel-10.8-010_ikazuhiro.patch
  Log:
  Add patches, the changes are noted in the ChangeLog diffs included in the patches. Which include fixes for emacs 24, apel is a dep of elscreen, part of fix for bug 425258.
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 618E971F)

Revision  Changes    Path
1.1                  app-emacs/apel/files/apel-10.8-020_Prevent-fontset-error.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/apel/files/apel-10.8-020_Prevent-fontset-error.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/apel/files/apel-10.8-020_Prevent-fontset-error.patch?rev=1.1&content-type=text/plain

Index: apel-10.8-020_Prevent-fontset-error.patch
===================================================================
Description: Prevent an error of fontset-pixel-size for Emacs 23.
Bug-Debian: http://bugs.debian.org/477177
Author: Tatsuya Kinoshita <tats@××××××.org>

--- a/ChangeLog
+++ b/ChangeLog
@@ -0,0 +1,5 @@
[phone]  Tatsuya Kinoshita  <tats@×××××××××××.jp>
+
+	* poem-e20.el (fontset-pixel-size): Don't cause an error. Workaround
+	for Emacs 23.
+
--- a/poem-e20.el
+++ b/poem-e20.el
@@ -25,6 +25,7 @@
 ;;; Code:
 
 (defun fontset-pixel-size (fontset)
+ (condition-case nil
   (let* ((info (fontset-info fontset))
 	 (height (aref info 1))
 	 )
@@ -32,7 +33,8 @@
 	  ((string-match "-\\([0-9]+\\)-" fontset)
 	   (string-to-number
 	    (substring fontset (match-beginning 1)(match-end 1))))
-	  (t 0))))
+	  (t 0)))
+  (error 0)))
 
 
 ;;; @ character set



1.1                  app-emacs/apel/files/apel-10.8-040_make-temp-file-for-Emacs-24.3.50.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/apel/files/apel-10.8-040_make-temp-file-for-Emacs-24.3.50.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/apel/files/apel-10.8-040_make-temp-file-for-Emacs-24.3.50.patch?rev=1.1&content-type=text/plain

Index: apel-10.8-040_make-temp-file-for-Emacs-24.3.50.patch
===================================================================
Subject: Fix wrong type argument on Emacs 24.3.50 to check make-temp-file
From: Tatsuya Kinoshita <tats@××××××.org>
Bug-Debian: http://bugs.debian.org/718765

diff --git a/ChangeLog b/ChangeLog
index 8e96224..9505b2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -0,0 +1,5 @@
[phone]  Tatsuya Kinoshita  <tats@×××××××××××.jp>
+
+	* poe.el: Fix wrong type argument on Emacs 24.3.50 to check
+	`make-temp-file'.
+
diff --git a/poe.el b/poe.el
index be52847..b381f90 100644
--- a/poe.el
+++ b/poe.el
@@ -1667,7 +1667,7 @@ See `walk-windows' for the meaning of MINIBUF and FRAME."
                      )))
       ;; arglist: (prefix &optional dir-flag suffix)
       (cond
-       ((not arglist)
+       ((or (not arglist) (not (listp arglist)))
         ;; `make-temp-file' is a built-in; expects 3-args.
         (put 'make-temp-file 'defun-maybe '3-args))
        ((> (length arglist) 3)



1.1                  app-emacs/apel/files/apel-10.8-010_ikazuhiro.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/apel/files/apel-10.8-010_ikazuhiro.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/apel/files/apel-10.8-010_ikazuhiro.patch?rev=1.1&content-type=text/plain

Index: apel-10.8-010_ikazuhiro.patch
===================================================================
--- apel-10.8-orig/ChangeLog	2013-10-03 18:17:05.176741628 +1000
+++ apel-10.8/ChangeLog	2013-10-03 18:16:54.442741731 +1000
@@ -1,3 +1,56 @@
[phone]  Tatsuya Kinoshita  <tats@×××××××××××.jp>
+
+	* mcs-20.el: Really check whether the mule-vesion variable is defined.
+
[phone]  Kazuhiro Ito  <kzhr@××××××××××.jp>
+
+	* mcs-20.el: Check whether the mule-vesion variable is defined.
+	Cf. https://github.com/ikazuhiro/apel/commit/328c02e022340b36dd7e5f9250c7f86d2bafd793
+
[phone]  Kazuhiro Ito  <kzhr@××××××××××.jp>
+
+	* mcs-20.el (mime-charset-to-coding-system): Display the message
+	and use charset name as coding system when
+	`mime-charset-coding-system-alist' indicates invalid coding
+	system.
+
[phone]  Kazuhiro Ito  <kzhr@××××××××××.jp>
+
+	* mcs-e20.el (coding-system-to-mime-charset): Coding system's
+	setting is preferred to mime-charset-coding-system-alist's value.
+	Detect MIME name from mime-charset-coding-system-alist's value
+	more permissively.
+
[phone]  Kazuhiro Ito  <kzhr@××××××××××.jp>
+
+	* poe.el (next-command-event): Fix that Emacs 21 and later were
+	treated as 'Emacs 19, 20.1 and 20.2'.
+
[phone]  Kazuhiro Ito  <kzhr@××××××××××.jp>
+
+	* mcs-e20.el (charsets-mime-charset-alist): Do not use
+	`iso-2022-jp-2'.
+
[phone]  Kazuhiro Ito  <kzhr@××××××××××.jp>
+
+	* mcs-20.el (detect-mime-charset-string): (Emacs23 and later) New
+	function.
+	(detect-mime-charset-region): Use it.
+
[phone]  Kazuhiro Ito  <kzhr@××××××××××.jp>
+
+	* mcs-20.el (detect-mime-charset-region): (Emacs23 and later) Do
+	not check whether `charsets-mime-charset-alist' contains non
+	charset symbol.
+
+	* mcs-e20.el (charsets-mime-charset-alist): Remove non charset
+	symbol for Emacs 23 and later.
+
[phone]  Kazuhiro Ito  <kzhr@××××××××××.jp>
+
+	* mcs-20.el (detect-mime-charset-region): Do not care priority of
+	charsets on Emacs 23 and later.
+
 2011-07-17  David Maus  <dmaus@××××××.de>
 
 	* tinycustom.el (defcustom): Use new style backquotes.
--- apel-10.8-orig/mcs-20.el	2005-07-06 12:08:52.000000000 +1000
+++ apel-10.8/mcs-20.el	2013-10-03 17:44:42.936760151 +1000
@@ -84,11 +84,13 @@
   (if (stringp charset)
       (setq charset (intern (downcase charset)))
     )
-  (let ((cs (assq charset mime-charset-coding-system-alist)))
-    (setq cs
-	  (if cs
-	      (cdr cs)
-	    charset))
+  (let ((cs (cdr (assq charset mime-charset-coding-system-alist))))
+    (unless (or (null cs) (find-coding-system cs))
+      (message
+       "Invalid coding system: %s.  Confirm mime-charset-coding-system-alist."
+       cs)
+      (setq cs nil))
+    (unless cs (setq cs charset))
     (if lbt
 	(setq cs (intern (format "%s-%s" cs
 				 (cond ((eq lbt 'CRLF) 'dos)
@@ -96,12 +98,11 @@
 				       ((eq lbt 'CR) 'mac)
 				       (t lbt)))))
       )
-    (if (find-coding-system cs)
-	cs
-      (if mime-charset-to-coding-system-default-method
-	  (funcall mime-charset-to-coding-system-default-method
-		   charset lbt cs)
-	))))
+    (or (find-coding-system cs)
+	(if mime-charset-to-coding-system-default-method
+	    (funcall mime-charset-to-coding-system-default-method
+		     charset lbt cs)
+	  ))))
 
 (defalias 'mime-charset-p 'mime-charset-to-coding-system)
 
@@ -209,6 +210,34 @@
 	(setq rest (cdr rest)))
       default-mime-charset-for-write)))
 )
+
+((eval-when-compile (and (boundp 'mule-version)
+			 (null (string< mule-version "6.0"))))
+;; for Emacs 23 and later
+(defun detect-mime-charset-string (string)
+  "Return MIME charset for STRING."
+  (let ((src (string-to-list string))
+	tmp)
+    (setq tmp src)
+    ;; Uniquify the list of characters.
+    (while tmp
+      (setq tmp (setcdr tmp (delq (car tmp) (cdr tmp)))))
+    ;; Detect charset from the list of characters.
+    (catch 'found
+      (mapc (lambda (cons)
+	      (catch 'next
+		(mapc (lambda (ch) (unless (char-charset ch (car cons))
+				     (throw 'next nil)))
+		      src)
+		(throw 'found (cdr cons))))
+	    charsets-mime-charset-alist)
+      default-mime-charset-for-write)))
+
+(defsubst detect-mime-charset-region (start end)
+  "Return MIME charset for region between START and END."
+  (detect-mime-charset-string
+   (buffer-substring-no-properties start end))))
+
 (t
 ;; for legacy Mule
 (defun detect-mime-charset-region (start end)
--- apel-10.8-orig/mcs-e20.el	2005-07-06 12:08:52.000000000 +1000
+++ apel-10.8/mcs-e20.el	2013-10-03 17:44:42.936760151 +1000
@@ -90,11 +90,15 @@
      ((ascii korean-ksc5601)				. euc-kr)
      ((ascii chinese-gb2312)				. gb2312)
      ((ascii chinese-big5-1 chinese-big5-2)		. big5)
-     ((ascii thai-tis620 composition)			. tis-620)
-     ((ascii latin-iso8859-1 greek-iso8859-7
-	     latin-jisx0201 japanese-jisx0208-1978
-	     chinese-gb2312 japanese-jisx0208
-	     korean-ksc5601 japanese-jisx0212)		. iso-2022-jp-2)
+     ,(static-cond
+       ((null (string< mule-version "6.0"))
+	'((ascii thai-tis620)				. tis-620))
+       (t
+	'((ascii thai-tis620 composition)      		. tis-620)))
+     ;; ((ascii latin-iso8859-1 greek-iso8859-7
+     ;; 	     latin-jisx0201 japanese-jisx0208-1978
+     ;; 	     chinese-gb2312 japanese-jisx0208
+     ;; 	     korean-ksc5601 japanese-jisx0212)		. iso-2022-jp-2)
      ;;((ascii latin-iso8859-1 greek-iso8859-7
      ;;        latin-jisx0201 japanese-jisx0208-1978
      ;;        chinese-gb2312 japanese-jisx0208
@@ -119,8 +123,16 @@
 (defun coding-system-to-mime-charset (coding-system)
   "Convert CODING-SYSTEM to a MIME-charset.
 Return nil if corresponding MIME-charset is not found."
-  (or (car (rassq coding-system mime-charset-coding-system-alist))
-      (coding-system-get coding-system 'mime-charset)
+  (or (coding-system-get coding-system 'mime-charset)
+      (let ((coding (coding-system-base coding-system))
+	    (alist mime-charset-coding-system-alist)
+	    result)
+	(while alist
+	  (if (eq (coding-system-base (cdar alist)) coding)
+	      (setq result (caar alist)
+		    alist nil)
+	    (setq alist (cdr alist))))
+	result)
       ))
 
 (defun-maybe-cond mime-charset-list ()
--- apel-10.8-orig/poe.el	2013-10-03 17:43:11.327761025 +1000
+++ apel-10.8/poe.el	2013-10-03 17:44:42.937760151 +1000
@@ -1996,8 +1996,9 @@
 returned.
 If PROMPT is non-nil, it should be a string and will be displayed in
 the echo area while this function is waiting for an event."
-  ((and (>= emacs-major-version 20)
-	(>= emacs-minor-version 4))
+  ((or (>= emacs-major-version 21)
+       (and (>= emacs-major-version 20)
+	    (>= emacs-minor-version 4)))
    ;; Emacs 20.4 and later.
    (read-event prompt))			; should specify 2nd arg?
   ((and (= emacs-major-version 20)