[emacs21 commit] 1218d2fe0087e83d904e3bd8a6aefa1cc12144db

[Jérôme Marant]

commit 1218d2fe0087e83d904e3bd8a6aefa1cc12144db
Author: Jérôme Marant <jerome at marant.org>
Date:   Sat Oct 28 11:09:59 2006 +0200

    Replace yow mode with the one from the CVS trunk in order to
    comply with the yow.lines replacement.

diff --git a/changelog b/changelog
index 5e77647..985884d 100644
--- a/changelog
+++ b/changelog
@@ -6,7 +6,13 @@ emacs21 (21.4a+1-2) unstable; urgency=lo
     - debian/control.in
     - debian/control
 
- -- Jerome Marant <jerome at debian.org>  Thu, 26 Oct 2006 22:36:33 +0200
+  * Grab yow mode from the CVS trunk so it is now compatible with yow.lines
+    replacement which also comes from the CVS trunk.
+    (closes: #395501) [Jérôme Marant]
+    - debian/patches/yow-mode-from-cvs.diff: new patch.
+    - debian/patches/series: updated.
+  
+ -- Jerome Marant <jerome at debian.org>  Fri, 27 Oct 2006 17:45:52 +0200
 
 emacs21 (21.4a+1-1) unstable; urgency=low
 
diff --git a/patches/series b/patches/series
index 036763e..445362e 100644
--- a/patches/series
+++ b/patches/series
@@ -1,3 +1,4 @@
+yow-mode-from-cvs.diff
 xbm-read-erroneous-semicolon.diff
 handle-dfsg-split.diff
 autoconf-updates.diff
diff --git a/patches/yow-mode-from-cvs.diff b/patches/yow-mode-from-cvs.diff
new file mode 100644
index 0000000..b816999
--- /dev/null
+++ b/patches/yow-mode-from-cvs.diff
@@ -0,0 +1,81 @@
+* Yow and cookie1 modes from CVS trunk. These are necessary in order to
+  be able to read the yow.lines replacement which comes from the CVS
+  trunk as well.
+  Patch: yow-mode-from-cvs.diff
+  Added-by: Jerome Marant <jerome at debian.org>
+  Date: Fri, 27 Oct 2006 19:55:36 +0200
+  Status: has been incorporated upstream
+
+Index: emacs21-21.4a+1/lisp/play/cookie1.el
+===================================================================
+--- emacs21-21.4a+1.orig/lisp/play/cookie1.el	2006-10-27 19:24:50.012779300 +0200
++++ emacs21-21.4a+1/lisp/play/cookie1.el	2006-10-27 19:26:05.378697124 +0200
+@@ -73,7 +73,7 @@
+ is read in, display STARTMSG at beginning of load, ENDMSG at end."
+   (let ((cookie-vector (cookie-snarf phrase-file startmsg endmsg)))
+     (shuffle-vector cookie-vector)
+-    (aref cookie-vector 1)))
++    (aref cookie-vector 0)))
+ 
+ ;;;###autoload
+ (defun cookie-insert (phrase-file &optional count startmsg endmsg)
+Index: emacs21-21.4a+1/lisp/play/yow.el
+===================================================================
+--- emacs21-21.4a+1.orig/lisp/play/yow.el	2006-10-27 19:24:41.665009929 +0200
++++ emacs21-21.4a+1/lisp/play/yow.el	2006-10-27 19:25:42.687324028 +0200
+@@ -1,6 +1,7 @@
+ ;;; yow.el --- quote random zippyisms
+ 
+-;; Copyright (C) 1993, 1994, 1995, 2000 Free Software Foundation, Inc.
++;; Copyright (C) 1993, 1994, 1995, 2000, 2002, 2003, 2004,
++;;   2005, 2006 Free Software Foundation, Inc.
+ 
+ ;; Maintainer: FSF
+ ;; Author: Richard Mlynarik
+@@ -20,8 +21,8 @@
+ 
+ ;; You should have received a copy of the GNU General Public License
+ ;; along with GNU Emacs; see the file COPYING.  If not, write to the
+-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-;; Boston, MA 02111-1307, USA.
++;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++;; Boston, MA 02110-1301, USA.
+ 
+ ;;; Commentary:
+ 
+@@ -49,13 +50,13 @@
+ (defconst yow-after-load-message "I have SEEN the CONSING!!")
+ 
+ ;;;###autoload
+-(defun yow (&optional insert)
++(defun yow (&optional insert display)
+   "Return or display a random Zippy quotation.  With prefix arg, insert it."
+-  (interactive "P")
++  (interactive "P\np")
+   (let ((yow (cookie yow-file yow-load-message yow-after-load-message)))
+     (cond (insert
+ 	   (insert yow))
+-	  ((not (interactive-p))
++	  ((not display)
+ 	   yow)
+ 	  (t
+ 	   (message "%s" yow)))))
+@@ -101,7 +102,8 @@
+                     (while l
+                       (princ (car l))
+                       (setq l (cdr l))
+-                      (and l (princ "\n\n"))))))))
++                      (and l (princ "\n\n")))
++		    (print-help-return-message))))))
+     matches))
+ 
+ 
+@@ -119,7 +121,7 @@
+   (switch-to-buffer "*doctor*")
+   (sit-for 0)
+   (while (not (input-pending-p))
+-    (insert-string (yow))
++    (insert (yow))
+     (sit-for 0)
+     (doctor-ret-or-read 1)
+     (doctor-ret-or-read 1)))